Depend on python unconditionally at build time, bug 475370. Patch by Nikoli.

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

4 files changed, 21 insertions, 13 deletions

diff --git a/sys-libs/tdb/ChangeLog b/sys-libs/tdb/ChangeLog
index 792a61f1e71b..f01826d61aa3 100644
--- a/sys-libs/tdb/ChangeLog
+++ b/sys-libs/tdb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/tdb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/ChangeLog,v 1.76 2014/10/11 12:04:11 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/ChangeLog,v 1.77 2014/11/11 22:28:47 floppym Exp $
+
+  11 Nov 2014; Mike Gilbert <floppym@gentoo.org> tdb-1.3.0-r1.ebuild,
+  tdb-1.3.1.ebuild:
+  Depend on python unconditionally at build time, bug 475370. Patch by Nikoli.
 
   11 Oct 2014; Markus Meier <maekke@gentoo.org> tdb-1.3.0-r1.ebuild:
   arm stable, bug #512012
diff --git a/sys-libs/tdb/Manifest b/sys-libs/tdb/Manifest
index 39bc7c6f03b3..8435404954bd 100644
--- a/sys-libs/tdb/Manifest
+++ b/sys-libs/tdb/Manifest
@@ -10,14 +10,14 @@ DIST tdb-1.3.1.tar.gz 480898 SHA256 ff29985ae880c3906ddd7609664a94c64bfe87b2b221
 EBUILD tdb-1.2.10.ebuild 1012 SHA256 cc939f8d4875de45b3ff71d9093ebc015c777d6002f887fbcc5d970d5786ff90 SHA512 ef31aaf7c6cb4706869f638847cdfe5f6361307e40ef50f2c75f6ef994113ecffb0351f3fdd1e0f85768403b38268b05d3ae899adbaa022484ea0201f5917989 WHIRLPOOL f93435fd07f311a425af49a13a81d5fbdf7d83a78937b7c40ae52bb03266bc19a2402125a7a7f178e496826f449ee707af08520b0d7c8e18d38da4e5603cb414
 EBUILD tdb-1.2.11.ebuild 1110 SHA256 44fbc9158b8e89f394edf098e66241f14c59344b3ef192b9758b0fc981aff02c SHA512 91273c7a9e667b2990f28a90078f397aaf0789d6a1fb4d4f5aabd6d382560bd830929a9f8c47f61ae59c2fdab78d6c9694c1c763ff0052eed5b196b280bb37fa WHIRLPOOL 69885e3d76e054cc778ae3aa753d6b228dce1904ce421d8d7a7744913d87f9446a390a3ac6ffa441d3e712b0b07ddec068d4e2ec2cff16e94e3268997ce05065
 EBUILD tdb-1.2.13.ebuild 1048 SHA256 fdbd8cfc7ce57f2192df4746eb7b21c22e42e91c491326ca13e1ed3f881c3857 SHA512 532cc2cd2a64de1675f9df602228c28c1de33b243b31dcb6202732bdfeeadf43f3e85243fe6ff9025c918e126a9221619e4f434bbe9a58fd7436a8759c738f87 WHIRLPOOL 23fffaf163ade73d593a07aa1e64da18948551d86f558be88572bcc09cdf0ba2fb4f839efe49be621f9559a3c18589a17f7470775166bd36efaf46efd3220217
-EBUILD tdb-1.3.0-r1.ebuild 1453 SHA256 2af5270f1fdaad7d724eac582d4d68ec948d75fe2059e2ecbfe85b9396c16032 SHA512 4a6dc3cab2391935b62036d3d8e71a6889592a66539c1ab9645147051aaea7f32d06bf4aef516560008b555331943b76a321bdd19f7214e125733e2d10c3697b WHIRLPOOL 09064ad81ee1a452b24b32ad16b929f1d06944dc1bc112ca3c99cf5e512836bca240ff2bee9756cfbd9762102f5a46ab3ec735f21ad2b987c3f0897c9f172e38
-EBUILD tdb-1.3.1.ebuild 1464 SHA256 04ef149d443ad21397498fe3c78d0a581f86014a2c14080990627873307a44ec SHA512 f325421196d08944e1790c747bdeeb8d74b3f8db283417c1721bb8a16b514f50728d2996fe699124fbb65786c157f021477a7e5d949785262e7e226260a31141 WHIRLPOOL e982e65e3d333130f12399a6296704e07f71fdb82803537cbd2992598bd995f57072c3455e7fd09327f5d605610cf99e9a0db7e6d9449b05bde069faf4836a7b
-MISC ChangeLog 9262 SHA256 36721a288e5a1fc63c3dc1d87b9452b455d67263de867d7aa457a3e5eab11a4c SHA512 e3838ca16f21471ed1cf25123b852d909599ad1c3b4f24cf152e1b563feeaba07906caa6784127231cf455f75b0763fb3c03a792e2e1f63f01b58c59e42c7fd2 WHIRLPOOL 8121649e2ab56d30be7f2a2d1e969a69f6e8111e7473be0a5991c51c211870d5f29f747d84d750b82450b5339882c355fcd219f5d3e282e075d659a0181df3cf
+EBUILD tdb-1.3.0-r1.ebuild 1474 SHA256 dc8d2d3919798ae6b037fa27928332ce5298055b03b010b61f91649408c28b92 SHA512 7d3ac00f0f20af2542441d1214dba8e21124f790fa7ca2623c3586663728f852c717f786eaecabac3ddbbdc2cbba8364b015172ac465522fd5e89c551f241ae8 WHIRLPOOL 3664465ed7e50c9675ac8c79d81b99bce71e3c39ce69fe3fe82a7118ac1996ee07f642a0d9287375d25311b25ed713a3e3672785592fb49e8bfb89957da51530
+EBUILD tdb-1.3.1.ebuild 1479 SHA256 3c7395798c9c3471d8d5eb8051de024362bf5072c9bbe3557563d04e098d6481 SHA512 d3ed6ca67b7289171014b1375e918999de3d12a88254d7e54650cd0f07da66195dcd66f4782af739cb7816283d915db16ff80c77c461abf95d9bbd96f8b4b118 WHIRLPOOL 999b9d40f6010b9a218f91ff05cb94c42c5d22b81af4bf9025b827f4093b856ffdc6537c05807021d1fd73cc02af16f2a8843131fcd75857f302f2946775314c
+MISC ChangeLog 9433 SHA256 dde71e8dc8de9a2720aeda3f8fa94c93d55e1e528d69f3ebc2e03382bcbad7a7 SHA512 495d9b047d7f2323cb633cb84f7ebe9685d112c5425a13403e759f0eb44369672a6137126e11309003fb509077fd693f9564e9b5d6e7d4f2f5fe515aff24393c WHIRLPOOL c89e5bcc92d5819bc23ceedf3e5da1b5cdb1e3e1ee084e52d70380ae257c252b0665d8110f7927103337ac82fb060e7168450cb3ef707d170ca17181967a5ba3
 MISC metadata.xml 260 SHA256 9c67a75d6c6db8d88233eb27271c93874a4b763907a61f189970574fc957e0e6 SHA512 611e0004aba6d842ba71a9b9f74b8301d1a7d8d366208122001f5d164ae34b88c1ba2d41c0b25c760cea155387e5e7a4b3d141d6b21cc997f894a21c519a07c9 WHIRLPOOL 1bf0ee15987eee963adc9506dff9e8e978bcb8b7bdc9381f468fdc92ed39e356c69dc67af161da4eac8b46098a28ab8b6249f0efeb5709f7cd4f3f8a4749b675
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQ5HL0ACgkQkKaRLQcq0GJPNQCfYPh7jiCKISInVB6o+eIytC48
-/VEAn1FRNXLhGl7I30sLqBXAMmi1DXIR
-=NuC+
+iF4EAREIAAYFAlRijaAACgkQC77qH+pIQ6R4BgD/ZJy22zgdWBxJGsVc2VnMlAm7
+pHCFzzIpOPfe70je2hEA/0oT624h61TjL+3sVA8p0DKInTaQ8oUx/MUaDDSemFdX
+=x5ib
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/tdb/tdb-1.3.0-r1.ebuild b/sys-libs/tdb/tdb-1.3.0-r1.ebuild
index 19be6d336fdd..cf0207a7cd7c 100644
--- a/sys-libs/tdb/tdb-1.3.0-r1.ebuild
+++ b/sys-libs/tdb/tdb-1.3.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/tdb-1.3.0-r1.ebuild,v 1.12 2014/10/11 12:04:11 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/tdb-1.3.0-r1.ebuild,v 1.13 2014/11/11 22:28:47 floppym Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 
 inherit waf-utils multilib-minimal python-single-r1 eutils
 
@@ -17,17 +17,19 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="python"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
 DEPEND="
 	${RDEPEND}
+	${PYTHON_DEPS}
 	app-text/docbook-xml-dtd:4.2"
 
 WAF_BINARY="${S}/buildtools/bin/waf"
 
 src_prepare() {
 	epatch "${FILESDIR}/add_missing_stdbool_h_include.patch"
+	python_fix_shebang .
 	multilib_copy_sources
 }
 
diff --git a/sys-libs/tdb/tdb-1.3.1.ebuild b/sys-libs/tdb/tdb-1.3.1.ebuild
index cd8054bf7c52..9295779e5dc0 100644
--- a/sys-libs/tdb/tdb-1.3.1.ebuild
+++ b/sys-libs/tdb/tdb-1.3.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/tdb-1.3.1.ebuild,v 1.1 2014/09/18 19:09:02 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/tdb-1.3.1.ebuild,v 1.2 2014/11/11 22:28:47 floppym Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 
 inherit waf-utils multilib-minimal python-single-r1 eutils
 
@@ -17,17 +17,19 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="python"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
 DEPEND="
 	${RDEPEND}
+	${PYTHON_DEPS}
 	app-text/docbook-xml-dtd:4.2"
 
 WAF_BINARY="${S}/buildtools/bin/waf"
 
 src_prepare() {
 	epatch "${FILESDIR}/add_missing_stdbool_h_include.patch"
+	python_fix_shebang .
 	multilib_copy_sources
 }