commit: b82611614a532dde75901dd8e56cbfa710ddf221
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 24 22:36:58 2017 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 24 22:37:19 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8261161
dev-db/redis: fix slotted vs unslotted revisions.
Package-Manager: portage-2.3.3
dev-db/redis/{redis-3.2.5-r2.ebuild => redis-3.2.5-r4.ebuild} | 3 ++-
dev-db/redis/{redis-3.2.5-r2.ebuild => redis-3.2.5-r5.ebuild} | 0
dev-db/redis/{redis-3.2.5-r2.ebuild => redis-3.2.6-r4.ebuild} | 3 ++-
dev-db/redis/{redis-3.2.6-r2.ebuild => redis-3.2.6-r5.ebuild} | 0
profiles/package.mask | 11 ++++++++---
5 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/dev-db/redis/redis-3.2.5-r2.ebuild
b/dev-db/redis/redis-3.2.5-r4.ebuild
similarity index 97%
copy from dev-db/redis/redis-3.2.5-r2.ebuild
copy to dev-db/redis/redis-3.2.5-r4.ebuild
index a637b9f2376..71744849145 100644
--- a/dev-db/redis/redis-3.2.5-r2.ebuild
+++ b/dev-db/redis/redis-3.2.5-r4.ebuild
@@ -15,7 +15,7 @@ IUSE="+jemalloc tcmalloc luajit test"
SLOT="0"
RDEPEND="luajit? ( dev-lang/luajit:2 )
- !luajit? ( dev-lang/lua:5.1 )
+ !luajit? ( >=dev-lang/lua-5.1:* )
tcmalloc? ( dev-util/google-perftools )
jemalloc? ( >=dev-libs/jemalloc-3.2 )"
DEPEND="virtual/pkgconfig
@@ -64,6 +64,7 @@ src_prepare() {
sed -i \
-e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \
-e
"s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
+ -e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,lua,g" \
configure.ac || die "Sed failed for configure.ac"
eautoreconf
}
diff --git a/dev-db/redis/redis-3.2.5-r2.ebuild
b/dev-db/redis/redis-3.2.5-r5.ebuild
similarity index 100%
copy from dev-db/redis/redis-3.2.5-r2.ebuild
copy to dev-db/redis/redis-3.2.5-r5.ebuild
diff --git a/dev-db/redis/redis-3.2.5-r2.ebuild
b/dev-db/redis/redis-3.2.6-r4.ebuild
similarity index 97%
rename from dev-db/redis/redis-3.2.5-r2.ebuild
rename to dev-db/redis/redis-3.2.6-r4.ebuild
index a637b9f2376..71744849145 100644
--- a/dev-db/redis/redis-3.2.5-r2.ebuild
+++ b/dev-db/redis/redis-3.2.6-r4.ebuild
@@ -15,7 +15,7 @@ IUSE="+jemalloc tcmalloc luajit test"
SLOT="0"
RDEPEND="luajit? ( dev-lang/luajit:2 )
- !luajit? ( dev-lang/lua:5.1 )
+ !luajit? ( >=dev-lang/lua-5.1:* )
tcmalloc? ( dev-util/google-perftools )
jemalloc? ( >=dev-libs/jemalloc-3.2 )"
DEPEND="virtual/pkgconfig
@@ -64,6 +64,7 @@ src_prepare() {
sed -i \
-e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \
-e
"s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
+ -e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,lua,g" \
configure.ac || die "Sed failed for configure.ac"
eautoreconf
}
diff --git a/dev-db/redis/redis-3.2.6-r2.ebuild
b/dev-db/redis/redis-3.2.6-r5.ebuild
similarity index 100%
rename from dev-db/redis/redis-3.2.6-r2.ebuild
rename to dev-db/redis/redis-3.2.6-r5.ebuild
diff --git a/profiles/package.mask b/profiles/package.mask
index 25108226d20..512650efcb2 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -366,11 +366,16 @@ x11-libs/gtk+:1
>=dev-perl/Math-BigInt-GMP-1.600.0
# Robin H. Johnson <robb...@gentoo.org> (18 Nov 2016)
-# Depends on slotted lua
+# Depends on slotted lua,
+# odd revisions are slotted lua,
+# even revisions are unslotted lua
=dev-db/redis-3.2.5-r1
-=dev-db/redis-3.2.5-r2
+=dev-db/redis-3.2.5-r2 # except somebody bumped it out of pattern
+=dev-db/redis-3.2.5-r5
=dev-db/redis-3.2.6-r1
-=dev-db/redis-3.2.6-r2
+=dev-db/redis-3.2.6-r2 # except somebody bumped it out of pattern
+=dev-db/redis-3.2.6-r5
+
# Ian Stakenvicius (17 Nov 2016)
# Does not honour LD_LIBRARY_PATH set in the environment, causing
