summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Swenson <titanofold@gentoo.org>2013-05-03 10:38:11 +0000
committerAaron Swenson <titanofold@gentoo.org>2013-05-03 10:38:11 +0000
commitba9f53284287c1257410f576aac9d949d373e36c (patch)
tree4e93c9a006c11c99ffb582695f17f098ce4bbe7a /dev-libs/libpqxx
parentUpdate tests handling (diff)
downloadhistorical-ba9f53284287c1257410f576aac9d949d373e36c.tar.gz
historical-ba9f53284287c1257410f576aac9d949d373e36c.tar.bz2
historical-ba9f53284287c1257410f576aac9d949d373e36c.zip
Inherit python-any-r1 to pull in a Python 2 interpreter. Use sed to fix
shebangs to call python2 instead of python which could be set to a Python 3 interpreter. Fixes bug 455282. Package-Manager: portage-2.1.11.55/cvs/Linux x86_64 Manifest-Sign-Key: 0xD1BBFDA0
Diffstat (limited to 'dev-libs/libpqxx')
-rw-r--r--dev-libs/libpqxx/ChangeLog7
-rw-r--r--dev-libs/libpqxx/Manifest14
-rw-r--r--dev-libs/libpqxx/libpqxx-4.0.1.ebuild17
3 files changed, 31 insertions, 7 deletions
diff --git a/dev-libs/libpqxx/ChangeLog b/dev-libs/libpqxx/ChangeLog
index 2fe911a9273e..27f51963f218 100644
--- a/dev-libs/libpqxx/ChangeLog
+++ b/dev-libs/libpqxx/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-libs/libpqxx
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpqxx/ChangeLog,v 1.89 2013/02/02 07:58:25 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpqxx/ChangeLog,v 1.90 2013/05/03 10:37:55 titanofold Exp $
+
+ 03 May 2013; Aaron W. Swenson <titanofold@gentoo.org> libpqxx-4.0.1.ebuild:
+ Inherit python-any-r1 to pull in a Python 2 interpreter. Use sed to fix
+ shebangs to call python2 instead of python which could be set to a
+ Python 3 interpreter. Fixes bug 455282.
*libpqxx-4.0.1 (02 Feb 2013)
diff --git a/dev-libs/libpqxx/Manifest b/dev-libs/libpqxx/Manifest
index bd0908c1598a..53e6e01a015b 100644
--- a/dev-libs/libpqxx/Manifest
+++ b/dev-libs/libpqxx/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
DIST libpqxx-4.0.1.tar.gz 1582532 SHA256 097ceda2797761ce517faa5bee186c883df1c407cb2aada613a16773afeedc38 SHA512 00204985097ef8bb0a3376d6ba541dbb471d7c52d7135f6244a9f4acbf6c8e5254d6f813e4411421e49bb56f4a520fc6ac67e300141d724396ce0ac11bd3a95e WHIRLPOOL d377863f9200e7ed235f8a2cf132b554efa4223d5f542eea23d743ffe391a13d44da767ee2f70146558e5b393ba334656c09007241c1aadde750c00c16e25c12
DIST libpqxx-4.0.tar.gz 2631181 SHA256 b160043289cfbf2a186d3b12f9976b6914e76d918d3d4469ff408bd199bbb8ed SHA512 30c955b568a93ba7003a808f42414fd743cc7017fc443d327b55fea732d86ec0ecd34381bdcd4410db85c74287781af021423b5991c3f821fe64db2c9f84c011 WHIRLPOOL a3b0a8629b9f6a33282a8b5a7c6913c7b003dbaa94dcfd811fee74b45a396aa049f358ce399ca1cfdeabbd50a1da0515423c6a510a025773ec8acfd4899c88a5
EBUILD libpqxx-4.0-r1.ebuild 2297 SHA256 7ac0695b9a134b87b925c861357cb520c5c2ed590201f2eae29feaa47919c33e SHA512 08f142d3bd4d78fa2565b31f8e7a8f7aca33f32d1b1e2f5a1b0ba2b04775e05167a795799dbfd2c3ded4d041da1b5e2f23124d3912901828a7ab7610f67ddedf WHIRLPOOL 08be3d122c2d8cdaeba21f3e9ac75dec689cd8ad97eec0506a1f240e7467138114fb2f582e8c9c4019f3846e4356a36850c70badcb27fc0b5b104dbd73916e2d
-EBUILD libpqxx-4.0.1.ebuild 2308 SHA256 081280c5ccce83e6b8edfd1ea03d4e080cebc561f27838d33c04a760f730c144 SHA512 eff8fbfc8dd54356f951864a5c3def4eab5142682556c3b44e6a97d8582f6cb95cf448f2b13e9670cf590e377b58261bb05dea063d918eba108430fa90a7c126 WHIRLPOOL e245000846d3ef3981d706b6aa0815afa4a606bf90b6b990eb0575f3b755991f731f0f13698b9646aa712705e0e36781d03cf12f1de7af40fb34ac875c59ce86
-MISC ChangeLog 11541 SHA256 fd03421e0673af63b7bf0a43299318388ec7096cec5757067ec64991ab438745 SHA512 beeb7e10dc7a9c7635e818bb541de696aa5d1564703bfe0d041aba625f994e9312298d11d9b22aafeb610e3ee75270846576a121b6bd245ee80c9cc13b90b2cd WHIRLPOOL c1ec4ea2784e3b54b392460b4079ee2026a6e68211e8382b460ec43b4ea42609d2043f558cb746da188bd766caf450bd3bb3c728e8e2024d3bbbd7bf4124e26d
+EBUILD libpqxx-4.0.1.ebuild 2503 SHA256 4bd3daf6c8c806d2828fe7a7d236afcc85d70428ca18b01e13b39de6bb92764b SHA512 88c6a4b2fee0fc724612b7bc8089dc27e7e2ca82b61db219a7e97e5f42a4e2bb829121a029edb5c3eb04108816a88f2506523d76de3b39c3c94431ff53a93dc9 WHIRLPOOL 42a771f03e8d4832d5a9b05969645606b65026f57145e186c56b1c0e3ac0608b2b20bcde1ea90f54c7bbfa47b6a0b7b4fbdd7de62af76289bf8d8894f79445f7
+MISC ChangeLog 11808 SHA256 a7a2498a31977b4226cfe977e3574c23d69cc834461f96fffed2afcc3edc4b24 SHA512 d190c0fe6e7c3f52486b700ad0ddfcf94bd3abcbbca8f22e111f2ccf8c610990f4b0b8a8aa05a00d1452881ea4024c8e25503ce2e17a1765dd90a550e778ae05 WHIRLPOOL 2022e828a61768b400b67dc56d5c47754fb21513dcc03e751d9e4a03b073ccd5aaabd01c5c83059ec9f1cdf45ea0355ee1cf9585dbd7ce133f36b1bdae0ce6d2
MISC metadata.xml 479 SHA256 42e814ea6ceb5a7133c3ddbe0afd13a1b97083893405fee6f7984d5c9cbbb938 SHA512 2ea23e10c795fa6f03916b6690321e1145c6e450b845dfdfd4f38dc5893c2bb3956ef80e59330fb1082ff534063389cdf602f1fcc9a947ef17af390d6b2a023a WHIRLPOOL b16c12678f4be4de62e2f2f4688dbcd6b1b721c4ab7b780cc9b66b34594abd686e5917923c542683b580a20836a15e738a755dbccc34bbdf98acd3c635f739d5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlGDk4kACgkQVxOqA9G7/aB3QwD9G3Vmoy5X5Df6QRbsJ8YcnuYP
+Vxc9wDxra/0XCupQYM4A/1GAWnYrSmM14X7/2yUMt/dJrv21aY11fUqi6eSw+hV2
+=D2dY
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libpqxx/libpqxx-4.0.1.ebuild b/dev-libs/libpqxx/libpqxx-4.0.1.ebuild
index 7a08d40d7452..43b56c14efc8 100644
--- a/dev-libs/libpqxx/libpqxx-4.0.1.ebuild
+++ b/dev-libs/libpqxx/libpqxx-4.0.1.ebuild
@@ -1,10 +1,11 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpqxx/libpqxx-4.0.1.ebuild,v 1.1 2013/02/02 07:58:25 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpqxx/libpqxx-4.0.1.ebuild,v 1.2 2013/05/03 10:37:55 titanofold Exp $
EAPI="4"
-inherit eutils
+PYTHON_COMPAT=( python{2_6,2_7} )
+inherit python-any-r1
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
@@ -15,8 +16,16 @@ LICENSE="BSD"
SLOT="0"
IUSE="doc static-libs"
-DEPEND="dev-db/postgresql-base"
-RDEPEND="${DEPEND}"
+RDEPEND="dev-db/postgresql-base"
+DEPEND="${PYTHON_DEPS}
+ ${RDEPEND}
+"
+
+src_prepare() {
+ sed -e 's/python/python2/' \
+ -i tools/{splitconfig,template2mak.py} \
+ || die "Couldn't fix Python shebangs"
+}
src_configure() {
if use static-libs ; then