diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2014-10-27 21:28:47 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2014-10-27 21:28:47 +0000 |
| commit | 599199851244c60765af449e5d3b7987ad36f3ec (patch) | |
| tree | de12fa59e78fc37b0f9fdcb0ab4de2fceb2250de /dev-db | |
| parent | version bump, add SUBSLOT (diff) | |
| download | gentoo-2-599199851244c60765af449e5d3b7987ad36f3ec.tar.gz gentoo-2-599199851244c60765af449e5d3b7987ad36f3ec.tar.bz2 gentoo-2-599199851244c60765af449e5d3b7987ad36f3ec.zip | |
Bug #525126 redux, block the old conflicting openldap.
(Portage version: 2.2.10/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/lmdb/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/lmdb/lmdb-0.9.10.ebuild | 5 | ||||
| -rw-r--r-- | dev-db/lmdb/lmdb-0.9.11.ebuild | 5 | ||||
| -rw-r--r-- | dev-db/lmdb/lmdb-0.9.13.ebuild | 5 | ||||
| -rw-r--r-- | dev-db/lmdb/lmdb-0.9.14.ebuild | 5 |
5 files changed, 17 insertions, 9 deletions
diff --git a/dev-db/lmdb/ChangeLog b/dev-db/lmdb/ChangeLog index af914d9a0099..11ec895fcf66 100644 --- a/dev-db/lmdb/ChangeLog +++ b/dev-db/lmdb/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/lmdb # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/lmdb/ChangeLog,v 1.12 2014/10/27 05:29:53 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/lmdb/ChangeLog,v 1.13 2014/10/27 21:28:47 robbat2 Exp $ + + 27 Oct 2014; Robin H. Johnson <robbat2@gentoo.org> lmdb-0.9.10.ebuild, + lmdb-0.9.11.ebuild, lmdb-0.9.13.ebuild, lmdb-0.9.14.ebuild: + Bug #525126 redux, block the old conflicting openldap. 27 Oct 2014; Robin H. Johnson <robbat2@gentoo.org> lmdb-0.9.14.ebuild: Copy keywords from openldap, because this code came from there. diff --git a/dev-db/lmdb/lmdb-0.9.10.ebuild b/dev-db/lmdb/lmdb-0.9.10.ebuild index ed618335b1ec..a1ac59cb9f33 100644 --- a/dev-db/lmdb/lmdb-0.9.10.ebuild +++ b/dev-db/lmdb/lmdb-0.9.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/lmdb/lmdb-0.9.10.ebuild,v 1.3 2014/08/19 20:24:23 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/lmdb/lmdb-0.9.10.ebuild,v 1.4 2014/10/27 21:28:47 robbat2 Exp $ EAPI=5 inherit toolchain-funcs @@ -17,7 +17,8 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="static-libs" DEPEND="" -RDEPEND="${DEPEND}" +# =net-nds/openldap-2.4.40 installs lmdb files. +RDEPEND="!=net-nds/openldap-2.4.40" S="${WORKDIR}/openldap-${OPENLDAP_VERSION}/libraries/liblmdb" diff --git a/dev-db/lmdb/lmdb-0.9.11.ebuild b/dev-db/lmdb/lmdb-0.9.11.ebuild index d340eff48383..06d91fcb17c6 100644 --- a/dev-db/lmdb/lmdb-0.9.11.ebuild +++ b/dev-db/lmdb/lmdb-0.9.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/lmdb/lmdb-0.9.11.ebuild,v 1.7 2014/08/19 20:24:23 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/lmdb/lmdb-0.9.11.ebuild,v 1.8 2014/10/27 21:28:47 robbat2 Exp $ EAPI=5 inherit toolchain-funcs @@ -18,7 +18,8 @@ KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 x86" IUSE="static-libs" DEPEND="" -RDEPEND="${DEPEND}" +# =net-nds/openldap-2.4.40 installs lmdb files. +RDEPEND="!=net-nds/openldap-2.4.40" S="${WORKDIR}/mdb-mdb/libraries/liblmdb" diff --git a/dev-db/lmdb/lmdb-0.9.13.ebuild b/dev-db/lmdb/lmdb-0.9.13.ebuild index a10d75b65884..c51e7fb9cddc 100644 --- a/dev-db/lmdb/lmdb-0.9.13.ebuild +++ b/dev-db/lmdb/lmdb-0.9.13.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/lmdb/lmdb-0.9.13.ebuild,v 1.2 2014/08/19 20:24:23 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/lmdb/lmdb-0.9.13.ebuild,v 1.3 2014/10/27 21:28:47 robbat2 Exp $ EAPI=5 inherit toolchain-funcs @@ -16,7 +16,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" IUSE="static-libs" DEPEND="" -RDEPEND="${DEPEND}" +# =net-nds/openldap-2.4.40 installs lmdb files. +RDEPEND="!=net-nds/openldap-2.4.40" S="${WORKDIR}/mdb-mdb/libraries/liblmdb" diff --git a/dev-db/lmdb/lmdb-0.9.14.ebuild b/dev-db/lmdb/lmdb-0.9.14.ebuild index c3416ef8cb12..46ba5ca39feb 100644 --- a/dev-db/lmdb/lmdb-0.9.14.ebuild +++ b/dev-db/lmdb/lmdb-0.9.14.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/lmdb/lmdb-0.9.14.ebuild,v 1.2 2014/10/27 05:29:53 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/lmdb/lmdb-0.9.14.ebuild,v 1.3 2014/10/27 21:28:47 robbat2 Exp $ EAPI=5 inherit toolchain-funcs @@ -16,7 +16,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~a IUSE="static-libs" DEPEND="" -RDEPEND="${DEPEND}" +# =net-nds/openldap-2.4.40 installs lmdb files. +RDEPEND="!=net-nds/openldap-2.4.40" S="${WORKDIR}/mdb-mdb/libraries/liblmdb" |