Set SUPPORT_PYTHON_ABIS. Respect CFLAGS and LDFLAGS.

Package-Manager: portage-HEAD/cvs/Linux x86_64

diff --git a/dev-python/psycopg/ChangeLog b/dev-python/psycopg/ChangeLog
index de03a4ccb79b35633689438a1eb3b2f492d70ece..62d515869625f792657b7c4503a83b3ce183bff9 100644 (file)
--- a/dev-python/psycopg/ChangeLog
+++ b/dev-python/psycopg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/psycopg
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/ChangeLog,v 1.102 2010/06/20 18:23:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/ChangeLog,v 1.103 2010/07/02 02:16:10 arfrever Exp $
+
+  02 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  psycopg-1.1.21.ebuild:
+  Set SUPPORT_PYTHON_ABIS. Respect CFLAGS and LDFLAGS.
 
   20 Jun 2010; Raúl Porcel <armin76@gentoo.org> psycopg-2.0.14.ebuild:
   alpha/ia64/sparc stable wrt #320033

diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 4203930bb688bc12144bc905921ec81a9ef02a7d..d143d466874ecb13c3b4b038ca033482724fdda1 100644 (file)
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -3,8 +3,8 @@ AUX psycopg-2.0.9-round-solaris.patch 449 RMD160 1915c539e6ed5341d4b198e404a97a2
 DIST psycopg-1.1.21.tar.gz 213753 RMD160 de74a70b16353f69de7e898059a7a1d8418ad2ee SHA1 02d8a8b5dd682306117896c7c63a9a1b518997b6 SHA256 f487d02e8e8837ec7e62e4e0f50bcb974e73b7765333b032ac50c07bf12ce240
 DIST psycopg2-2.0.13.tar.gz 258399 RMD160 6099f593ea1f05b78b6f2c3c4106b86cbcab7386 SHA1 859725d0c830dc3590cb5666c8465bd29ab167cc SHA256 a15e622e101b16aa8ad44813d8fb1eced91379396c054aacbfa3ad658352332b
 DIST psycopg2-2.0.14.tar.gz 491362 RMD160 fdb4de2b4d73cffc49f76e0d9afa9cfb41022012 SHA1 94c3025bec106dee40dc6afde2ad5da52255c49d SHA256 902607cdbe1195a00694d2b477eed8429eda433caaa0eb6ff7f80883e1c17ac7
-EBUILD psycopg-1.1.21.ebuild 1241 RMD160 550bd7d18ffd77372be38e027bd3fb5a63fe334b SHA1 4ab5d1563d8c08a6f060f0ccc66cfbd9e8809e53 SHA256 172774035e9fed6b28cd39809972db7bfae71e3daf8afd7772e604fed38c4c94
+EBUILD psycopg-1.1.21.ebuild 1369 RMD160 e1f8f98fb94dc36e8a655ade3bcca36715628d2b SHA1 ed1bdfc716d161d0708993f527822eecd503d7d3 SHA256 52f7e0aa3952d90e95f3e59e37e7f584389aceb5a1535486792f51c224330d06
 EBUILD psycopg-2.0.13.ebuild 1356 RMD160 8fe365a073f323adeec472e2a8b30634c6bca362 SHA1 b02c020358286c91fa1198c8f3514a9eed248dd7 SHA256 d400fc05ee3f0a68adc556e035c025c0b7957a18fa292fd573b2c1930372ca8f
 EBUILD psycopg-2.0.14.ebuild 1609 RMD160 ec9da96c05d0baf5086b3f6ff731887a1302798b SHA1 c6e2e6144be234134ec95504d5a55fc7f26c3802 SHA256 68d103f1d97714a6f808ad45592fc2156cb5058df4f04c9ef89d4c51f980465f
-MISC ChangeLog 13455 RMD160 a1031f0e8c6fd6446c1c88fd7f0bd9ea4497aaff SHA1 1481e02d58854defab17dc2ce44a37e76e4ac728 SHA256 52f4c8cc92442bef1a72aa836e0287d2e36d6f59d4cc44efeaeef4d9cc875f7a
+MISC ChangeLog 13610 RMD160 f1b2dc2212ce3584ffc978767093a5180acd6137 SHA1 9e934b740514c78993f50d2374985d29e33eb590 SHA256 f2cc106e0407a3843d7769f1a14422ba52492f39be9f912fbd28d1b731f4a111
 MISC metadata.xml 291 RMD160 317ee3d63279acd6a3cbf6ef622d4b77a2044036 SHA1 0c71c2432c961aa486238f5de43d08d0696d8341 SHA256 9a4e3c2e6caca640df7a6d7b8accbdde21f715f0c98dc6bb09735b5463da7ad9

diff --git a/dev-python/psycopg/psycopg-1.1.21.ebuild b/dev-python/psycopg/psycopg-1.1.21.ebuild
index 7c62d0df0d1b927f2f7bb9a77ea6f743458f0dfd..0fc371e63b57367864dbe36b5972e07f3582d478 100644 (file)
--- a/dev-python/psycopg/psycopg-1.1.21.ebuild
+++ b/dev-python/psycopg/psycopg-1.1.21.ebuild
@@ -1,18 +1,21 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-1.1.21.ebuild,v 1.16 2010/06/17 18:31:16 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-1.1.21.ebuild,v 1.17 2010/07/02 02:16:10 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 
 inherit python
 
-DESCRIPTION="PostgreSQL database adapter for Python" # best one
-SRC_URI="http://initd.org/pub/software/${PN}/${P}.tar.gz"
+DESCRIPTION="PostgreSQL database adapter for Python"
 HOMEPAGE="http://www.initd.org/software/psycopg"
+SRC_URI="http://initd.org/pub/software/${PN}/${P}.tar.gz"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha ~amd64 ia64 ppc ppc64 sparc x86"
-LICENSE="GPL-2"
 IUSE=""
 
 DEPEND=">=dev-python/egenix-mx-base-2.0.3
@@ -22,23 +25,32 @@ RDEPEND="${DEPEND}"
 src_prepare() {
        # fix for bug #134873
        sed -e '1245s/static //' -i cursor.c
+
+       sed -e 's:$(PY_MOD_DIR):$(D)&/$$mod:' -i Makefile.pre.in
+
+       python_copy_sources
 }
 
 src_configure() {
-       econf \
-               --with-mxdatetime-includes="$(python_get_includedir)/mx" \
-               --with-postgres-includes="/usr/include/postgresql/server"
+       configuration() {
+               econf \
+                       --with-mxdatetime-includes="$(python_get_includedir)/mx" \
+                       --with-postgres-includes="/usr/include/postgresql/server" || return 1
+               sed -e 's:$(BLDSHARED):& $(LDFLAGS):' -i Makefile
+       }
+       python_execute_function -s configuration
+}
+
+src_compile() {
+       python_src_compile OPT="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 }
 
 src_install () {
-       sed -e 's:\(echo "  install -m 555 $$mod \)\($(PY_MOD_DIR)\)\("; \\\):\1${D}\2/$$mod\3:' \
-               -e 's:\($(INSTALL)  -m 555 $$mod \)\($(PY_MOD_DIR)\)\(; \\\):\1${D}\2/$$mod\3:' \
-               -i Makefile
-       emake install || die "emake install failed"
+       python_src_install
 
        dodoc AUTHORS ChangeLog CREDITS README NEWS RELEASE-1.0 SUCCESS TODO
        docinto doc
-       dodoc   doc/*
+       dodoc doc/*
        insinto /usr/share/doc/${PF}/examples
-       doins   doc/examples/*
+       doins doc/examples/*
 }