diff options
author | Mike Gilbert <floppym@gentoo.org> | 2014-05-19 04:38:53 +0000 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2014-05-19 04:38:53 +0000 |
commit | ee31ba8080fc1f7a0d63309a78de4a50c992989f (patch) | |
tree | d565d8e2810db0c31fcca9e3e340cbb05bafd301 /dev-python/bsddb3 | |
parent | Fix manifest; #510702 (diff) | |
download | historical-ee31ba8080fc1f7a0d63309a78de4a50c992989f.tar.gz historical-ee31ba8080fc1f7a0d63309a78de4a50c992989f.tar.bz2 historical-ee31ba8080fc1f7a0d63309a78de4a50c992989f.zip |
Set BERKELEYDB envvars instead of passing them as arguments to setup.py.
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4
Diffstat (limited to 'dev-python/bsddb3')
-rw-r--r-- | dev-python/bsddb3/ChangeLog | 5 | ||||
-rw-r--r-- | dev-python/bsddb3/Manifest | 10 | ||||
-rw-r--r-- | dev-python/bsddb3/bsddb3-6.0.1.ebuild | 14 |
3 files changed, 18 insertions, 11 deletions
diff --git a/dev-python/bsddb3/ChangeLog b/dev-python/bsddb3/ChangeLog index f5ec805c3c9c..8a3e547adb6a 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.102 2014/05/19 00:43:33 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/ChangeLog,v 1.103 2014/05/19 04:38:50 floppym Exp $ + + 19 May 2014; Mike Gilbert <floppym@gentoo.org> bsddb3-6.0.1.ebuild: + Set BERKELEYDB envvars instead of passing them as arguments to setup.py. 19 May 2014; Mike Gilbert <floppym@gentoo.org> bsddb3-6.0.1.ebuild: Fixup distutils-r1 conversion, and fix build with newer multilib-enabled sys- diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest index e98d17f1123c..b2c197b91ebd 100644 --- a/dev-python/bsddb3/Manifest +++ b/dev-python/bsddb3/Manifest @@ -12,13 +12,13 @@ EBUILD bsddb3-5.2.0.ebuild 1684 SHA256 649130f02f887efde7c23daf7798c067cccaa812b EBUILD bsddb3-5.3.0-r1.ebuild 1928 SHA256 93d755b486528c4e79096affb1732e73c12b060f950a671d6f39594e67d7421c SHA512 c9efb870ccc143b3b4e957e7b7e5de25ede04f9321194be3dace2935f2cf2fe69f614387a707ed6b5bd36cbbd19f2ebf35d695ca20f66bbf2823fa067eb38019 WHIRLPOOL 4c9f994cf7778177b203d812f43f7ab074b4957bf3f312903dc38eff532729ae396c3a213b30dc307a37ea46b7c0518e6d7fe48d651c269f5a7c2e1844fe86e4 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 1716 SHA256 70e75522dabf62faf4268524a423d7b57e3e4db2b131be2d8b891cdaf25ff1aa SHA512 f376b607194d10400bb3d87755af12df6e345903edc7690581f84295c9c302a780b41e6c79cb0f026d6067b22efec20cbd99a956e1ba927aab87c29338439b96 WHIRLPOOL 123d0937cddcdbe499f1de0c05aa522acf6fb3426afe6dc0d64c9161373c50dd42358a98636fe88a74da9e3f942bfdc1c6cf19e724e82ddb95a578f440f7e713 -MISC ChangeLog 12904 SHA256 0342f3fd59d2a9bb1048d9b94b7b2268491ebf3534255ab39dffac8951bdcf14 SHA512 08deb036bedf1c2e328a0a281e9173d626e7561febfbc6da63e06bc9c9a5f07a7c50151e8008ddae436f5e4c4282cb1e9dfdb97ba3693c77d25bbc7b62cf1f8d WHIRLPOOL c956f723b3423f63bd0bc2fca154561109d5f8b53834b469214114b0f295fcc1fea1ef77316e6b3ce3dfe1d977ca7afa26830471cedcabffa005e8a733f6ff0c +EBUILD bsddb3-6.0.1.ebuild 1782 SHA256 f37e17fe39613968ce9f47069b84f381fab1d878b249669292546a8e672a0e52 SHA512 60c3b89c4fa597f1dccd4c143649e89bd3d5fb0fe43f9f55f8d214f7757f984ea098e71dbfbf83ca939c3baec95a9cef78a27b3d637a30d2c14041182c23918e WHIRLPOOL a5309a631944b14457fa2a6e6ab47a9be0966e6823845061dd4d30d051b29d357cc3bd81ec0f494a1186fe6694532dece0d0fef388682ecec4af224afb0c4999 +MISC ChangeLog 13050 SHA256 716cd48e26bc795eb2bbb1846fc3be0bdc39ede4359d57eb401ae8bc6f10d71e SHA512 245b1a48152eec477a5dff179e467d57e1f231e2c94f9fc2ace12260e7de78e3f8df2336498f1e0beb168f7b5074416a31b186175f94c297334f5f4b080e6f8e WHIRLPOOL 99f2b976b45954c0c2cbcfb9461ac7b80509fd4a50c6874e31be1cd1ed33654268699280b0e76124cd2f98b467a7f056cb6d9c4246a5a81d5c5bb21053d69cf7 MISC metadata.xml 229 SHA256 deca31172b77151b3139dfaed2c167a0b52849981f10c7fc8c8ebf8bffdbd1da SHA512 be71168c3d6afae44ec7b2ba090d518feee71b53aeb4291be18a68f71b2d12bc97a600a565066a86194da5f8e448850007f1ac10a9d0b4ae705cbae4f21a5854 WHIRLPOOL c6441aea3df06cffbc9fe3facc2eb5e2b7c880ea9b73ef5e3e84ef49e2a7f5aecd51dcb127dcb2c27c7ddef88eeea473ea971536c923b6f7ba81b05ca5227a87 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iF4EAREIAAYFAlN5U7YACgkQC77qH+pIQ6QJdgD+Oxr0HFp+vTBTo/fUlfrxzlih -sTV0uIFtos6BW6wLdu8BAMM0ZGOjldaXaWBJcEjM65WxC5z0UsYNoTjrnQdOBUf8 -=PdwE +iF4EAREIAAYFAlN5itwACgkQC77qH+pIQ6S6LgEAxt2BjmFki03DfeOC4StgyS2C +jawUrYqmbdLAG2aSd5UBAKDOWM293oK5saig0o3NPmnCfpGI/wWeNK4qktTFy3yu +=5zlf -----END PGP SIGNATURE----- diff --git a/dev-python/bsddb3/bsddb3-6.0.1.ebuild b/dev-python/bsddb3/bsddb3-6.0.1.ebuild index 0033095010ce..e60cf210d112 100644 --- a/dev-python/bsddb3/bsddb3-6.0.1.ebuild +++ b/dev-python/bsddb3/bsddb3-6.0.1.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.0.1.ebuild,v 1.3 2014/05/19 00:43:33 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/bsddb3-6.0.1.ebuild,v 1.4 2014/05/19 04:38:50 floppym Exp $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} ) @@ -41,14 +41,18 @@ src_prepare() { distutils-r1_src_prepare } +src_configure() { + # These are needed for both build and install. + export BERKELEYDB_DIR="${EPREFIX}/usr" + export BERKELEYDB_INCDIR="${EPREFIX}$(db_includedir)" + export BERKELEYDB_LIBDIR="${EPREFIX}/usr/$(get_libdir)" +} + python_compile() { if ! python_is_python3; then local -x CFLAGS="${CFLAGS} -fno-strict-aliasing" fi - distutils-r1_python_compile \ - --berkeley-db="${EPREFIX}/usr" \ - --berkeley-db-incdir="${EPREFIX}$(db_includedir ${DB_VER})" \ - --berkeley-db-libdir="${EPREFIX}/usr/$(get_libdir)" + distutils-r1_python_compile } python_test() { |