Install python stuff properly, thanks to Tiziano Müller <dev-zero@gentoo.org>.

(Portage version: 2.1.3.16)

4 files changed, 27 insertions, 65 deletions

diff --git a/app-mobilephone/obexftp/ChangeLog b/app-mobilephone/obexftp/ChangeLog
index 771117babd9c..e571060308af 100644
--- a/app-mobilephone/obexftp/ChangeLog
+++ b/app-mobilephone/obexftp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-mobilephone/obexftp
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.32 2007/10/01 18:09:51 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.33 2007/11/11 17:37:49 mrness Exp $
+
+  11 Nov 2007; Alin Năstac <mrness@gentoo.org> -obexftp-0.22_rc7.ebuild,
+  obexftp-0.22_rc9.ebuild:
+  Install python stuff properly, thanks to Tiziano Müller <dev-zero@gentoo.org>.
 
 *obexftp-0.22_rc9 (01 Oct 2007)
 
diff --git a/app-mobilephone/obexftp/files/digest-obexftp-0.22_rc7 b/app-mobilephone/obexftp/files/digest-obexftp-0.22_rc7
deleted file mode 100644
index d8897f720832..000000000000
--- a/app-mobilephone/obexftp/files/digest-obexftp-0.22_rc7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3c2a9807288fd6c6f564d10fbc2bc8c0 obexftp-0.22-rc7.tar.bz2 400792
-RMD160 1bda5b46b2936552125bdb0d72b991d5203a57e3 obexftp-0.22-rc7.tar.bz2 400792
-SHA256 ba58d82a6652d48429692314454ec3e671230bd57603a0b4e1c2a7da75defc89 obexftp-0.22-rc7.tar.bz2 400792
diff --git a/app-mobilephone/obexftp/obexftp-0.22_rc7.ebuild b/app-mobilephone/obexftp/obexftp-0.22_rc7.ebuild
deleted file mode 100644
index 7c1277699079..000000000000
--- a/app-mobilephone/obexftp/obexftp-0.22_rc7.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.22_rc7.ebuild,v 1.2 2007/09/06 06:23:28 mrness Exp $
-
-inherit eutils perl-module flag-o-matic
-
-DESCRIPTION="File transfer over OBEX for mobile phones"
-HOMEPAGE="http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp"
-SRC_URI="http://triq.net/obexftp/${P/_/-}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="bluetooth debug perl python ruby swig tcl"
-
-RDEPEND=">=dev-libs/openobex-1.3
-	bluetooth? ( >=net-wireless/bluez-libs-2.25 )
-	perl? ( >=dev-lang/perl-5.8.8 )
-	python? ( >=dev-lang/python-2.4.4 )
-	ruby? ( >=dev-lang/ruby-1.8.5 )
-	tcl? ( >=dev-lang/tcl-8.4.14 )"
-DEPEND="${RDEPEND}
-	swig? ( >=dev-lang/swig-1.3.31 )
-	dev-util/pkgconfig"
-
-S="${WORKDIR}"/${P%_*}
-
-src_compile() {
-	if use python || use tcl ; then
-		# These wrappers break strict aliasing rules
-		append-flags -fno-strict-aliasing
-	fi
-	if use debug ; then
-		strip-flags
-		append-flags "-g -DOBEXFTP_DEBUG=5"
-	fi
-	if use ruby && ! use bluetooth ; then
-		sed -i -e "s/^\(.*bluetooth.*\)$/#\1/" swig/ruby/extconf.rb
-	fi
-
-	econf \
-		$(use_enable bluetooth) \
-		$(use_enable swig) \
-		$(use_enable perl) \
-		$(use_enable python) \
-		$(use_enable tcl) \
-		$(use_enable ruby) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README* THANKS TODO
-	dohtml doc/*.html
-	insinto /usr/share/doc/${PF}/examples
-	doins -r apps/*_example.*
-	use perl && fixlocalpod
-}
diff --git a/app-mobilephone/obexftp/obexftp-0.22_rc9.ebuild b/app-mobilephone/obexftp/obexftp-0.22_rc9.ebuild
index f7fa8c342aea..090ba3986ebc 100644
--- a/app-mobilephone/obexftp/obexftp-0.22_rc9.ebuild
+++ b/app-mobilephone/obexftp/obexftp-0.22_rc9.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.22_rc9.ebuild,v 1.1 2007/10/01 18:09:51 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.22_rc9.ebuild,v 1.2 2007/11/11 17:37:49 mrness Exp $
 
-inherit eutils perl-module flag-o-matic
+inherit eutils perl-module flag-o-matic python
 
 DESCRIPTION="File transfer over OBEX for mobile phones"
 HOMEPAGE="http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp"
@@ -26,6 +26,13 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}"/${P%_*}
 
 src_compile() {
+	# 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"
@@ -60,3 +67,16 @@ src_install() {
 
 	use perl && fixlocalpod
 }
+
+pkg_postrm() {
+	use perl && perl-module_pkg_postrm
+	use python && python_mod_cleanup
+}
+
+pkg_postinst() {
+	use perl && perl-module_pkg_postinst
+	use python && {
+		python_version
+		python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
+	}
+}