Set SUPPORT_PYTHON_ABIS (bug #312203). Respect LDFLAGS during building libstfl.so.

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

diff --git a/dev-libs/stfl/ChangeLog b/dev-libs/stfl/ChangeLog
index 7a47b4fbad8109e2fedee36a63d584431438d160..fcabbfb6910f2cbe97bc609586378c345f30fd50 100644 (file)
--- a/dev-libs/stfl/ChangeLog
+++ b/dev-libs/stfl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/stfl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/stfl/ChangeLog,v 1.27 2010/06/15 16:54:35 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/stfl/ChangeLog,v 1.28 2010/06/15 16:58:00 arfrever Exp $
+
+  15 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  stfl-0.21.ebuild:
+  Set SUPPORT_PYTHON_ABIS (bug #312203). Respect LDFLAGS during building libstfl.so.
 
   15 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   stfl-0.19.ebuild:

diff --git a/dev-libs/stfl/Manifest b/dev-libs/stfl/Manifest
index fd187cbf94d0385e423d0ffe68c8d8a42c4d7259..5eb3652319a20114712048e49b6b54239434c595 100644 (file)
--- a/dev-libs/stfl/Manifest
+++ b/dev-libs/stfl/Manifest
@@ -1,13 +1,9 @@
 AUX stfl-0.18-multilib.patch 1768 RMD160 aee79ca9107e64a4abd0d31ccdc05a3566f1be82 SHA1 cba05ec3cb6a6755f82a64b67ea831d701b0a90c SHA256 346f187e4922e6652a1a0d9d2699948ccaf3ca4412fe05f8a5ae3cb94985f520
 AUX stfl-0.19-multilib.patch 3388 RMD160 7b067311d1c6c35705d04cdd86eb1d69643ebd57 SHA1 18d7b42880ee46250b5febbb734b6e787f67fbc1 SHA256 aaf38835f1263804f0d8732615733bc18185b9489a1d8c8d5daf121c9111547e
 AUX stfl-0.21-python.patch 1936 RMD160 fce9de74ac0cab5abe0e9b2d53c82cad602a5be1 SHA1 1ae240823806120b94c5cda5ba96b57e289bd730 SHA256 905260dbd13b4ce374d95ced9ea5d443fc44de0f14c0f1140fc8c7cead6c1f06
-DIST stfl-0.17.tar.gz 38950 RMD160 dc0fe9e1c1600667251069f9396fa044841d2d85 SHA1 315591618c7125daf3263b510e0e48aa82d73711 SHA256 d34fa8297bf15f13c206ef6eb3669cf3718fbcf0cd5abb47f704511c5f30ea7a
-DIST stfl-0.18.tar.gz 39188 RMD160 d3fc37aa7542c7e89d0957f8e25572f94e789b8d SHA1 d8ce5c7290ff438fcabac0fe4de2d54ae4ad5d49 SHA256 2295378d21596eb4aa5c775bfd0385db82825a18f093a9c0ba2a32c03f423832
 DIST stfl-0.19.tar.gz 40182 RMD160 e0b3b1a1405baf8b530e3d6a47a00f7167a0fa40 SHA1 f3183b3699687b25a602549284ac96122bc56482 SHA256 658aa189ce2751b0d15a1f2ea8f08fe8bf787dbc1049d606cb14885f73c2e33d
 DIST stfl-0.21.tar.gz 41093 RMD160 d8b56cc97b4d76adba8034ce9bbae631e6e9d17e SHA1 0313eafa1fe4dcfea1f2edd34d453baaa46df277 SHA256 bf0ead0a66b635602222bc9089414b99f99081b956c92baf77699d283bcc88eb
-EBUILD stfl-0.17.ebuild 1634 RMD160 0165b5b08e54aa5a7c210208b74b54183c9fa525 SHA1 ce6566797686581d5b9106eeb0fc57bc21b8cff1 SHA256 e99898ad61650b849a2951083b74d4a5533fe2f31b2a7b7dcfa00483db05090d
-EBUILD stfl-0.18.ebuild 1722 RMD160 b62ddfbe2ac590d277976781f00c16f1f094d70f SHA1 b349274199a02595148ac04d7e5043ec8e0c4741 SHA256 eda581b012a93b5881af2423a2ef36efee6f06dfe5dfd04989e000b7f5bdc9ae
-EBUILD stfl-0.19.ebuild 1921 RMD160 32f3535edf2f128a06f40c7a1c05e3a227166606 SHA1 17450de85a9bc3595afae4a26daeaef4a79b5d6e SHA256 9b57e948a20f22f95eaf5541afae753f2d02d3f11b5a7445308ce912aa35cc0b
-EBUILD stfl-0.21.ebuild 1733 RMD160 082d946244f5163221f74dd0fb2e24b8fc5a6cb0 SHA1 4d94ebc56516a20d9abed8f4cc889fc426300850 SHA256 28ff218f8f0c6cef5d1abf10876a8e723f4a656bb7c0cc8c5613c974d7f764c5
-MISC ChangeLog 4255 RMD160 31d273d1283bf79dfd71e6933645a053d5e488ad SHA1 12f078d12088df29512376f6bcd7cbfe7d5e2510 SHA256 420772d3386724de65bded2cda35ee96836a2f20ebcfe9cb11eaf6a1615391ef
+EBUILD stfl-0.19.ebuild 1920 RMD160 a4d5cb82fc0567bc97fbcb69c874885dc60820a2 SHA1 a36f0ac261eaf1803f84db95f688cf51946ef736 SHA256 c1d7568e0b884e2ca69cad57ff3701d0fe6c3713a9b95c9edc58a54ec1a994b9
+EBUILD stfl-0.21.ebuild 2699 RMD160 c2cbde1fa67fac830e9f9c2925a014783e269a3e SHA1 247ba45556b297c6d2c833e698fdf3c15252d0b7 SHA256 2892547fc3314d0c48381a8d2e5a76e2b08aec9bfb27f0e4d8c8b29f9c05611d
+MISC ChangeLog 4557 RMD160 82b7bc0353da4b928e5fbcb2a89d4516c2a04e34 SHA1 997e348edd9e28a9b320c1fa4ddf3cd92eacd787 SHA256 4869a5262dbd5019b57ce06a9fcb8c9b452497b2043e185da3b2ad939227d3de
 MISC metadata.xml 927 RMD160 e15a38f9a7a71b82c3c827454e287f27f201877f SHA1 ba497d4033f331f97d0aae1cf429d0a2cb86fb55 SHA256 0da6ce084b1398632734e5eaf5510cf7beb9e82e92215786c352ac6fb63b74dc

diff --git a/dev-libs/stfl/stfl-0.21.ebuild b/dev-libs/stfl/stfl-0.21.ebuild
index 6accdb737f92f8f3b228e6d984330f6a050f860b..f7b2b58f88cdcd6f9a7c62a601667e02e09df9d9 100644 (file)
--- a/dev-libs/stfl/stfl-0.21.ebuild
+++ b/dev-libs/stfl/stfl-0.21.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/stfl/stfl-0.21.ebuild,v 1.3 2010/06/05 15:30:26 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/stfl/stfl-0.21.ebuild,v 1.4 2010/06/15 16:58:00 arfrever Exp $
 
 EAPI="3"
-inherit eutils multilib perl-module python
+SUPPORT_PYTHON_ABIS="1"
+
+inherit eutils multilib perl-module python toolchain-funcs
 
 DESCRIPTION="A library which implements a curses-based widget set for text terminals"
 HOMEPAGE="http://www.clifford.at/stfl/"
@@ -26,34 +28,64 @@ DEPEND="${COMMON_DEPEND}
 
 RDEPEND="${COMMON_DEPEND}"
 
+pkg_setup() {
+       if use python; then
+               python_pkg_setup
+       fi
+}
+
 src_prepare() {
        sed -i \
-               -e "s!-Os -ggdb!!" \
-               -e "s!^\(all:.*\) example!\1!" \
-               Makefile
+               -e 's/-Os -ggdb//' \
+               -e 's/^\(all:.*\) example/\1/' \
+               -e 's/$(CC) -shared/$(CC) $(LDFLAGS) -shared/' \
+               Makefile || die "sed failed"
 
        epatch "${FILESDIR}/${P}-python.patch"
 
-       if ! use perl; then
-               echo "FOUND_PERL5=0" >>Makefile.cfg
+       if use perl; then
+               echo "FOUND_PERL5=1" >> Makefile.cfg
+       else
+               echo "FOUND_PERL5=0" >> Makefile.cfg
        fi
 
-       if ! use ruby; then
-               echo "FOUND_RUBY=0" >>Makefile.cfg
+       if use ruby; then
+               echo "FOUND_RUBY=1" >> Makefile.cfg
+       else
+               echo "FOUND_RUBY=0" >> Makefile.cfg
        fi
 
-       if ! use python; then
-               echo "FOUND_PYTHON=0" >>Makefile.cfg
-       fi
+       echo "FOUND_PYTHON=0" >> Makefile.cfg
 }
 
 src_compile() {
        emake CC="$(tc-getCC)" || die "make failed"
+
+       if use python; then
+               python_copy_sources python
+
+               # Based on code from python/Makefile.snippet.
+               building() {
+                       echo swig -python -threads stfl.i
+                       swig -python -threads stfl.i
+                       echo "$(tc-getCC)" ${CFLAGS} ${LDFLAGS} -shared -pthread -fPIC stfl_wrap.c -I$(python_get_includedir) -I.. ../libstfl.so.${PV} -lncursesw -o _stfl.so
+                       "$(tc-getCC)" ${CFLAGS} ${LDFLAGS} -shared -pthread -fPIC stfl_wrap.c -I$(python_get_includedir) -I.. ../libstfl.so.${PV} -lncursesw -o _stfl.so
+               }
+               python_execute_function -s --source-dir python building
+       fi
 }
 
 src_install() {
        emake prefix="/usr" DESTDIR="${D}" libdir="$(get_libdir)" install || die "make install failed"
 
+       if use python; then
+               installation() {
+                       insinto $(python_get_sitedir)
+                       doins stfl.py _stfl.so
+               }
+               python_execute_function -s --source-dir python installation
+       fi
+
        dodoc README
 
        local exdir="/usr/share/doc/${PF}/examples"
@@ -80,5 +112,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-       python_mod_cleanup stfl.py
+       use python && python_mod_cleanup stfl.py
 }