Drop bindist use flag; BSD and AGPLv3 are compatible.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

3 files changed, 19 insertions, 29 deletions

diff --git a/dev-python/bsddb3/ChangeLog b/dev-python/bsddb3/ChangeLog
index 26859816dd5c..163e826abb6d 100644
--- a/dev-python/bsddb3/ChangeLog
+++ b/dev-python/bsddb3/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/bsddb3
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/ChangeLog,v 1.108 2014/08/03 17:40:12 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/ChangeLog,v 1.109 2014/08/03 19:17:35 floppym Exp $
+
+  03 Aug 2014; Mike Gilbert <floppym@gentoo.org> bsddb3-6.1.0.ebuild:
+  Drop bindist use flag; BSD and AGPLv3 are compatible.
 
   03 Aug 2014; Mike Gilbert <floppym@gentoo.org> bsddb3-6.1.0.ebuild:
   Introduce bindist use flag to control dependency on db-6.x. Bug 494490.
diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest
index 821d2cf68544..3f5126f355cb 100644
--- a/dev-python/bsddb3/Manifest
+++ b/dev-python/bsddb3/Manifest
@@ -14,13 +14,13 @@ EBUILD bsddb3-5.3.0-r1.ebuild 1928 SHA256 93d755b486528c4e79096affb1732e73c12b06
 EBUILD bsddb3-5.3.0.ebuild 1797 SHA256 c22a9969c59694758268c49e7616611cce850ae865d41932716f270d637b3491 SHA512 bf438260898fd7e7d3605af5980beb93c4d1e132e738df5abc1afd496da00877d585e98f68a5da7c016a70c7888da544b6602a1003ba561b23f8a3f20e4974ab WHIRLPOOL e3b4e7f0da87ae85f7398753d927a1f2c9188650ff61f503a7f928c09f07feaf756db8540b1193b5104f3e819df6352ebae4580f329d95283bf77c790227fdf9
 EBUILD bsddb3-6.0.0.ebuild 2071 SHA256 9e1a887f9d57e8669e556c9bcd082144d6b10f2120bf73148287803bb02e9ee6 SHA512 7d6fcc8436dfcf57ea0cc7c00c0d63abda29af293a4916bd305b3747fac618106701d91110ce24dc9f98a34ed85e4e68971fd5ab57a783f0311fad4b855f62d7 WHIRLPOOL e4f5b2796ac37e72fb1a12cc07c2fb47bafbaf50974443898777c63637f70358ebc77133dd86f3131c5e3b62d087e2380df7cccc734f22700566efa614731daa
 EBUILD bsddb3-6.0.1.ebuild 1779 SHA256 b052c772590774b0430282cad4ecd471ad3695f547e8e08b480c2420b1e8f49d SHA512 451a0fd6767ed2f5dba0ddfb64143bee2fa6deceecf57ebc9371e314b13830c330f307cbfc6b257c536c5cd6bcea75c5ac4a3e7db64a5cff0f866f7603827efc WHIRLPOOL 645a391694585794d23a7f5ad3b50b2a76cdbedd45a96ce54b6f63bd0b056f5cab6747fb429502ca658980c86aa9b0d87318c4ce325e778afc4da1ab3e1df8b9
-EBUILD bsddb3-6.1.0.ebuild 2320 SHA256 bc57046e834fbd30e453092e4eb697e3e78f07e2beee4759635bbf0b81fdffd2 SHA512 e062d27991d1de48c6ad47fdd75e22e987effaae4d263708cf5ac60f3e829f2a1a8c802ad7fafb84fe8da1eb28508068680a925b1a06c4039973410b9cd9647f WHIRLPOOL 1e31cded9473e18cca883228626e0c8bb1855fffed50e8d3194294fdac352b89b9d3f0f238ca453002f5e22b096cfa2fe469b91583da121c0a2666d123031802
-MISC ChangeLog 13629 SHA256 1ef3aafe0185db21c9f230992cc4e28100cb8270723407bda13f1aca63841697 SHA512 6194230d9b14a4954532fc6e8eebc1b1d66928eacf65e5dee8e8be5fe61464f84daebdb6ce027972ad17b709a7164ff3ad7a52fef8aa8f88b02a3f0fd621739e WHIRLPOOL fdeb75ac8d9ed4a5b54fdb817e05c815cafca2da31c5a8dc28f21a0cea00bef2399599e33401f6061c53c16fcbd3f952782884637f8cc735751098c464ac6ebb
+EBUILD bsddb3-6.1.0.ebuild 2108 SHA256 bc144d3658f14985ecd8cd42f1912679ecc93dadc79371b4888e6e5d6b2ed2cc SHA512 15a9c2fbfda138a18e61dc2edceccd7e88580e73693acd83cb1f5019c58dedee181f433cd25a3d7a366883408137272e5aa6c5a5c8fc6b8a66129a35132ac5fa WHIRLPOOL 85e7272bd890ec1739cc468d2afb7ba77852226acdc37116fb1c08e01e707c09024b04c034d707b371a8e47a5d84fb573163bd1e46b3a42e0bf8c5961715fda5
+MISC ChangeLog 13756 SHA256 2fb25d1b47dd7b2471eb2842e63f90c31799f3abf52511cc1afe5c7f240dde6d SHA512 234c1bb1d6e7e80727fe730db6bb19de94510df5a7ce984758a2b4b3413039a0f0eb0fbdaefde1c41af8601f116604e86142c4d40dbdbda329507561c9942948 WHIRLPOOL 25ae5ec9e87ec0f3777d17f7ceca9c4c96fb675b20b2d0266855192d5a66bad8d40cf7191869363939fe9a0726ce93f60ceba916558205a46f771032ea7f3a14
 MISC metadata.xml 229 SHA256 deca31172b77151b3139dfaed2c167a0b52849981f10c7fc8c8ebf8bffdbd1da SHA512 be71168c3d6afae44ec7b2ba090d518feee71b53aeb4291be18a68f71b2d12bc97a600a565066a86194da5f8e448850007f1ac10a9d0b4ae705cbae4f21a5854 WHIRLPOOL c6441aea3df06cffbc9fe3facc2eb5e2b7c880ea9b73ef5e3e84ef49e2a7f5aecd51dcb127dcb2c27c7ddef88eeea473ea971536c923b6f7ba81b05ca5227a87
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlPec/4ACgkQC77qH+pIQ6TpuwD9EStFZbI19Uw/ti+Dk/f4HawU
-z6mQVI00Qh1Fg9cF1LEBAJvHVaHuV4Sd2QbPZ2ZmpdfY+v6E8L8xH3T2WWR5cx0f
-=C77U
+iF4EAREIAAYFAlPeitEACgkQC77qH+pIQ6Sb2gEAklmSik29GdCGE0MUcdqd3JNU
+c/XxqKK8naEl68lGDbEBAL17Rh9BntyQAx04lslSJsKgLxownGOTfeQYHSp/fI1x
+=9o27
 -----END PGP SIGNATURE-----
diff --git a/dev-python/bsddb3/bsddb3-6.1.0.ebuild b/dev-python/bsddb3/bsddb3-6.1.0.ebuild
index bd61f02304eb..e17d0da390a7 100644
--- a/dev-python/bsddb3/bsddb3-6.1.0.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.1.0.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-python/bsddb3/bsddb3-6.1.0.ebuild,v 1.2 2014/08/03 17:40:12 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/bsddb3-6.1.0.ebuild,v 1.3 2014/08/03 19:17:35 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
@@ -17,25 +17,14 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-lin
 IUSE="bindist doc"
 
 RDEPEND="
-	bindist? (
-		|| (
-			sys-libs/db:5.3=
-			sys-libs/db:5.2=
-			sys-libs/db:5.1=
-			sys-libs/db:5.0=
-			sys-libs/db:4.8=
-		)
-	)
-	!bindist? (
-		|| (
-			sys-libs/db:6.1=
-			sys-libs/db:6.0=
-			sys-libs/db:5.3=
-			sys-libs/db:5.2=
-			sys-libs/db:5.1=
-			sys-libs/db:5.0=
-			sys-libs/db:4.8=
-		)
+	|| (
+		sys-libs/db:6.1=
+		sys-libs/db:6.0=
+		sys-libs/db:5.3=
+		sys-libs/db:5.2=
+		sys-libs/db:5.1=
+		sys-libs/db:5.0=
+		sys-libs/db:4.8=
 	)
 "
 DEPEND="${RDEPEND}
@@ -45,9 +34,7 @@ DISTUTILS_IN_SOURCE_BUILD=1
 
 src_prepare() {
 	# This list should be kept in sync with setup.py.
-	local db_bindist
-	use bindist || db_bindist="6.1 6.0"
-	for DB_VER in ${db_bindist} 5.3 5.2 5.1 5.0 4.8; do
+	for DB_VER in 6.1 6.0 5.3 5.2 5.1 5.0 4.8; do
 		has_version "sys-libs/db:${DB_VER}" && break
 	done