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

(Portage version: 2.2.0_alpha30_p2/cvs/Linux x86_64)

2 files changed, 35 insertions, 20 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/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
 }