Set SUPPORT_PYTHON_ABIS (bug #311665). Delete useless "swig" USE flag.

Package-Manager: portage-2.2.0_alpha30_p2/cvs/Linux x86_64

3 files changed, 50 insertions, 35 deletions

diff --git a/app-mobilephone/obexftp/ChangeLog b/app-mobilephone/obexftp/ChangeLog
index 3b3ecf5a1879..e7925d50d2b1 100644
--- a/app-mobilephone/obexftp/ChangeLog
+++ b/app-mobilephone/obexftp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-mobilephone/obexftp
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.60 2010/07/14 16:12:48 arfrever Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.61 2011/04/25 18:29:23 arfrever Exp $
+
+  25 Apr 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  obexftp-0.23-r1.ebuild:
+  Set SUPPORT_PYTHON_ABIS (bug #311665). Delete useless "swig" USE flag.
 
   14 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   obexftp-0.22.ebuild, obexftp-0.23.ebuild, obexftp-0.23-r1.ebuild:
diff --git a/app-mobilephone/obexftp/Manifest b/app-mobilephone/obexftp/Manifest
index cca30e9a076a..a57dfc3855b7 100644
--- a/app-mobilephone/obexftp/Manifest
+++ b/app-mobilephone/obexftp/Manifest
@@ -4,23 +4,23 @@ Hash: SHA1
 AUX obexftp-0.23-fixruby.patch 654 RMD160 7796074f131a9838e1291a776bc7badd6cfb7577 SHA1 7faf9c6f4abfdf177a0207ca919cf62b0d2835f6 SHA256 b36fe2c6bbee131a617e53cac72d29fdf8db7b0901551ce96229cc571ab902b4
 AUX obexftp-0.23-gentoo.patch 732 RMD160 69db6d5f13b4b954fdd364ecc489ab04a236f639 SHA1 41dd00590b41883205673806cda5f8c0a566af4c SHA256 5811e1cce6947f9b609be8b1290b63fa42e096be85f4f5478b074e71f3254e22
 DIST obexftp-0.23.tar.bz2 402552 RMD160 b91e3815524b1a8042435f2f27fdd19b2b2aec26 SHA1 59a1489bedfc9430c4f4e974762fb78de2b048d5 SHA256 44a74ff288d38c0f75354d6bc2efe7d6dec10112eaff2e7b10e292b0d2105b36
-EBUILD obexftp-0.23-r1.ebuild 2316 RMD160 b20f2c7e0613389d54194c91bdd51f82185c63f2 SHA1 9d6f1114c7043badd21169e4a141be55a7fedbcd SHA256 13c7c647aa37e9f7461b31c1073f26316a3771958c6776425a002f332e77b888
-MISC ChangeLog 13020 RMD160 84a1b2df42e55c5af8e5f98eae9e35b91ebe435f SHA1 ab8d75eb5e1fb0c3c53ec481d5d6c44acf780062 SHA256 4eb2cb5d7c9db930f8256efaf32cb3999c7d06c5cc49a61e5c102b4b12408139
+EBUILD obexftp-0.23-r1.ebuild 2399 RMD160 712359ba04939fa280ec10a856c2681d02078679 SHA1 778f9d0b166b24935689fe4a5bdb5affa25693d5 SHA256 716169877e0c1ec5b410abb9145801a25abfb85b15c1b6957a1714751fbe5d36
+MISC ChangeLog 13193 RMD160 cb5436c60465ccfee6ff357e6164594375fb09f2 SHA1 c28355d3a425e949a22b79df9b071c09d1b80be9 SHA256 d841949bc1948e22089c515bddd43e8beefd87650e9866f344d57b7b9d0927d2
 MISC metadata.xml 428 RMD160 31e70db3d3d4146f97a6dc88f4f791e2bc056221 SHA1 886a0d425a24cca372bd033f776a5c02c47a830c SHA256 c312e7ae5043005d9a54796f062acfe40148799bd55640faee7e07d34839e38e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNtbGMAAoJENgZr6v6gHY0k8AP/24CGkH5ukwGZIb+bkA6p1U4
-zIkUbcPe7241gxyJYhoIovZLPVezLOlSRpynbCgIo5SdLwdremjtq2ygabWXHU4a
-6+tbhv9SyzK+2nGnnGIVsblYz1wMbVpw+AZDEAfPe9LDKlNqEUkb+JmIdbID5gJ7
-+/zKi9rPZH2tAkrX/vGttlHOsojWwdF2pS0x807nMA8gxPtHrlgC2bZdsQgqgqx0
-/EkFN+p6KxGDHlaBWbJVtwRyo9w7QvzhqUZ3MNji05y4ikuWQsd6nQ6Ui5qnXJyJ
-aim+sbYN0CsdAuoOg5obLubstri5QJlyuajZR0hc19jDWwiCdw4p6lNA5ed4Y5RQ
-1TyamtLeSRnlTnEnUqO3EX4oiAw9n3BITLJVt0Aa3IT+WRpHpF+vBQMJDtw1LsD1
-V4RcrW4Ju8nRyp34tdGVAL0Wddf3cSRu7YQg4eEnhlQk5wmiRWFY/nQ++8vWIEVu
-h4CnyzCr2OFq0c++Wjnc+rlZt0ARelJV3iz8CwnfxEpRVrRiJ7V4pOASEG68EClj
-UhvjaPk90kR2GvVdtG7ACQn1Hxnh3lzL4MExMDJHpJbzHVORYFEp6b7QeZzExbIQ
-ORDYhC6IKoyYdsGxOZnsN2bbx0nvo+QK2bmpOHpStUvUxrmtQk7/wGB6aKrpzKlg
-8e8hqO5Oh3/FgXI41zem
-=vsib
+iQIcBAEBAgAGBQJNtb2RAAoJENgZr6v6gHY0RBoP/1waiV+OUoyrdEyZta23GTDL
+20/WODT6w2pu8p8kSU0cP3+OultDSjcQss/a+6EWpsh9alNA2BBMM2oaOm8Kd5+h
+mijwinv3AriqPeV28Sw4p3aF7q2Utdptx0eoVsqZ2uJWqJb+YFg2kvC+japEYDUm
+MrTZb00HzQNX2dmEWFFMFiF2ZbcZtGQsA7cPOUmSrEVFAp2454yDZnrle2X3/P9r
+Nibqpzki6oN/dqJTHYE0EFOOqEi6RU85RlTiMSTlZrQ5NKbnkYXFtynFssgBWQUz
+wA39kDQAwTJwcAj22E60ZiCyjTqJbxoiGY857pV5s9AqPCmc/jacoZmd7pss0NHg
+sOjYXkbqfXjY/N5r3iHPMSB3tVWxSvcSv3ZHlcmPznZ3UHo3Jxr2myFEpX35WUwL
+Xu2bRUBn1e76XuD+2LOuviQMm290inLXOFv0nj8Ym6PSQi4F7GsMA6MWmXv8+fyb
+pF30scj9kq/8rY1WaNFxaLo5reDiOEh2mtqawqsLwSaE1AL2P0eMSC84bYBlpZM+
+ABypjUsHAD0s/BJ0SVdcpevY1ScxsUjwBumbwpEoKF3tUUIUyHicgTlicoMKn9l8
+IMbQNjGfI4G+imCxCuEXoXb33JbTNBzn4mOPN8857bPQjMfXe0xECjkkGjR5mSK+
+55A1xYZ/2dFJNzyGxyKH
+=xiKM
 -----END PGP SIGNATURE-----
diff --git a/app-mobilephone/obexftp/obexftp-0.23-r1.ebuild b/app-mobilephone/obexftp/obexftp-0.23-r1.ebuild
index 264f3f596119..3eeb58b96661 100644
--- a/app-mobilephone/obexftp/obexftp-0.23-r1.ebuild
+++ b/app-mobilephone/obexftp/obexftp-0.23-r1.ebuild
@@ -1,12 +1,16 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.23-r1.ebuild,v 1.11 2010/07/14 16:12:48 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.23-r1.ebuild,v 1.12 2011/04/25 18:29:23 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
 
 WANT_AUTOMAKE=1.9
 
-inherit eutils perl-module flag-o-matic python autotools
+PYTHON_DEPEND="python? 2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+
+inherit distutils eutils perl-module flag-o-matic autotools
 
 DESCRIPTION="File transfer over OBEX for mobile phones"
 HOMEPAGE="http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp"
@@ -14,33 +18,33 @@ SRC_URI="mirror://sourceforge/openobex/${P}.tar.bz2"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="amd64 hppa ppc ~sparc x86"
-IUSE="bluetooth debug perl python ruby swig tcl"
+IUSE="bluetooth debug perl python ruby tcl"
 
 RDEPEND="dev-libs/openobex
 	bluetooth? ( net-wireless/bluez )
 	perl? ( dev-lang/perl )
-	python? ( >=dev-lang/python-2.4.4 )
 	ruby? ( dev-lang/ruby:1.8 )
 	tcl? ( dev-lang/tcl )"
 DEPEND="${RDEPEND}
-	swig? ( dev-lang/swig )
 	dev-util/pkgconfig"
 
+DISTUTILS_SETUP_FILES=("swig/python|setup.py")
+
+pkg_setup() {
+	use python && python_pkg_setup
+}
+
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-fixruby.patch
 	epatch "${FILESDIR}/${P}-gentoo.patch"
 
+	# Python bindings are built/installed manually.
+	sed -e "/MAYBE_PYTHON_ = python/d" -i swig/Makefile.am || die "sed failed"
+
 	eautomake
 }
 
 src_configure() {
-	# do not byte-compile python module
-	if use python; then
-		sed -i \
-			-e 's/\(setup.py install\)/\1 --no-compile/' \
-			swig/python/Makefile.in || die "sed failed"
-	fi
-
 	if use debug ; then
 		strip-flags
 		append-flags "-g -DOBEXFTP_DEBUG=5"
@@ -51,12 +55,17 @@ src_configure() {
 
 	econf \
 		$(use_enable bluetooth) \
-		$(use_enable swig) \
 		$(use_enable perl) \
 		$(use_enable python) \
 		$(use_enable tcl) \
 		$(use_enable ruby) \
-		${MYRUBY} || die "econf failed"
+		${MYRUBY}
+}
+
+src_compile() {
+	default
+
+	use python && distutils_src_compile
 }
 
 src_install() {
@@ -65,6 +74,8 @@ src_install() {
 	# from here in the next version bump
 	emake -j1 DESTDIR="${D}" INSTALLDIRS=vendor install || die "emake install failed"
 
+	use python && distutils_src_install
+
 	dodoc AUTHORS ChangeLog NEWS README* THANKS TODO
 	dohtml doc/*.html
 
@@ -84,10 +95,10 @@ src_install() {
 
 pkg_postinst() {
 	use perl && perl-module_pkg_postinst
-	use python && python_mod_optimize $(python_get_sitedir)/${PN}
+	use python && distutils_pkg_postinst
 }
 
 pkg_postrm() {
 	use perl && perl-module_pkg_postrm
-	use python && python_mod_cleanup $(python_get_sitedir)/${PN}
+	use python && distutils_pkg_postrm
 }