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

Package-Manager: portage-2.1.3.16

5 files changed, 38 insertions, 84 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/Manifest b/app-mobilephone/obexftp/Manifest
index 99e084360192..85abec8e99c5 100644
--- a/app-mobilephone/obexftp/Manifest
+++ b/app-mobilephone/obexftp/Manifest
@@ -18,24 +18,19 @@ MD5 e2616e4310097497d957a6655bab7cbf files/obexftp-0.21-sdp-detection.patch 1014
 RMD160 b6271790593b20880eb20ebb1189f5ab7518fffc files/obexftp-0.21-sdp-detection.patch 1014
 SHA256 3026521a51d1fd6d58ca1e0dcabed609f4d69c6c38454cc90152c4397487d5f4 files/obexftp-0.21-sdp-detection.patch 1014
 DIST obexftp-0.21.tar.bz2 353862 RMD160 e9e404b62cc340a55690316f502dc17d5b3334cf SHA1 8a7ba3d982f3e7e80fb2964f69c9dea76e42090f SHA256 bd542c5ccfe4f70c19f4b8a8a16c635b7cf707ed2ba0cc01e2340f81145df259
-DIST obexftp-0.22-rc7.tar.bz2 400792 RMD160 1bda5b46b2936552125bdb0d72b991d5203a57e3 SHA1 f98bcda38d83ff7f56283e2a95ed0a9325ca6bd0 SHA256 ba58d82a6652d48429692314454ec3e671230bd57603a0b4e1c2a7da75defc89
 DIST obexftp-0.22-rc9.tar.bz2 400616 RMD160 41c0089361f5d2cc589a55a2ed3bad3bb11fc4d2 SHA1 5e05fc5e8b577c36520cc53d2323905ad1182884 SHA256 0c22898285fbe40d36df47bfcc71fe054a478476616835c7ebb2ba39c1545b46
 EBUILD obexftp-0.21.ebuild 1728 RMD160 5fe22e68a96dc8c19d84c63f4d928441dd528667 SHA1 b7179d183b1bcdb38e9281b844effe4196adc6de SHA256 0d2d48cce4419030634e4ed753328663528c4be0c7a06e02181f87da1b2d63e1
 MD5 98f37ae9c5e14adf63154c3e397cb258 obexftp-0.21.ebuild 1728
 RMD160 5fe22e68a96dc8c19d84c63f4d928441dd528667 obexftp-0.21.ebuild 1728
 SHA256 0d2d48cce4419030634e4ed753328663528c4be0c7a06e02181f87da1b2d63e1 obexftp-0.21.ebuild 1728
-EBUILD obexftp-0.22_rc7.ebuild 1632 RMD160 a31fe9040fa58c9b90d03afba7b24e08da464868 SHA1 6ea010d8fde78fb2b854a3a60e86af6ecd671114 SHA256 caedbdf831195baa45dc591c7957fe2066713286a88bddbedac002bc9f7a3a5f
-MD5 5bc43893084913afc38189d99f29d64d obexftp-0.22_rc7.ebuild 1632
-RMD160 a31fe9040fa58c9b90d03afba7b24e08da464868 obexftp-0.22_rc7.ebuild 1632
-SHA256 caedbdf831195baa45dc591c7957fe2066713286a88bddbedac002bc9f7a3a5f obexftp-0.22_rc7.ebuild 1632
-EBUILD obexftp-0.22_rc9.ebuild 1663 RMD160 5c647900b1368cd68b0fae4bd93b5b1cace97f03 SHA1 252967f4b10bdea5c2f82697deeddd8178cd9ebc SHA256 b82834203dd5a0c53071cc70db41c35461e579ce69f932739c8a05d75c3a29de
-MD5 ebd66b93093ee362a73df68f4ef4739d obexftp-0.22_rc9.ebuild 1663
-RMD160 5c647900b1368cd68b0fae4bd93b5b1cace97f03 obexftp-0.22_rc9.ebuild 1663
-SHA256 b82834203dd5a0c53071cc70db41c35461e579ce69f932739c8a05d75c3a29de obexftp-0.22_rc9.ebuild 1663
-MISC ChangeLog 8709 RMD160 0e08520f2e1bbaa7c9592db68475dcf949436558 SHA1 1614a426d8eef878e081dbfb26619fc42ba55289 SHA256 7293ad42304797ba186b844960c72547b1640a360f18c8a2520f6c73535c8805
-MD5 2e58e516c1b5e9a871a4c1d83e53af9b ChangeLog 8709
-RMD160 0e08520f2e1bbaa7c9592db68475dcf949436558 ChangeLog 8709
-SHA256 7293ad42304797ba186b844960c72547b1640a360f18c8a2520f6c73535c8805 ChangeLog 8709
+EBUILD obexftp-0.22_rc9.ebuild 2100 RMD160 9f02d1ee6fb2cf4ad0841643fce1b4a35d687ddc SHA1 cf57f8e5d598c2f6319bef00e0386fe986623d6d SHA256 a2a8849dcf841e585ed849719f81c1d03ee261371900defc24ee0d69ada006ef
+MD5 2163b684d9a0b359df480a74df79bcd6 obexftp-0.22_rc9.ebuild 2100
+RMD160 9f02d1ee6fb2cf4ad0841643fce1b4a35d687ddc obexftp-0.22_rc9.ebuild 2100
+SHA256 a2a8849dcf841e585ed849719f81c1d03ee261371900defc24ee0d69ada006ef obexftp-0.22_rc9.ebuild 2100
+MISC ChangeLog 8893 RMD160 598d6e5dd2da211ac044a21b5b8326793947ed8c SHA1 8987423b901c97edfb2d522fa8f93fd189172d04 SHA256 5240486d8f2d7fba038de575d03d2614704810c086bb34bd841f9fb612c6251d
+MD5 668dc208fbd2ad5ed1e152ff71166ecb ChangeLog 8893
+RMD160 598d6e5dd2da211ac044a21b5b8326793947ed8c ChangeLog 8893
+SHA256 5240486d8f2d7fba038de575d03d2614704810c086bb34bd841f9fb612c6251d ChangeLog 8893
 MISC metadata.xml 336 RMD160 80dacb93f1327adc8cb3578a6ffacea1fc817236 SHA1 2826721776ac855b8539336dbcad0750c1399171 SHA256 ac612b65bbad310c1953486d1ce87c081502ec1c90e3d348ae697dc8d3847aff
 MD5 1a820f941ddbd683086de6d92efbdf5c metadata.xml 336
 RMD160 80dacb93f1327adc8cb3578a6ffacea1fc817236 metadata.xml 336
@@ -43,16 +38,13 @@ SHA256 ac612b65bbad310c1953486d1ce87c081502ec1c90e3d348ae697dc8d3847aff metadata
 MD5 6e9d37752e552868c4233c03c3324d71 files/digest-obexftp-0.21 241
 RMD160 23fa1ace9deaf052e75bc9a8396f6e68d4d53d51 files/digest-obexftp-0.21 241
 SHA256 dd7640ca20ce53410403c1fb5dac6d33a4b75fccebb9cfa96ddff446012239e6 files/digest-obexftp-0.21 241
-MD5 bab7a05be90d88b31725dc749f41127a files/digest-obexftp-0.22_rc7 253
-RMD160 f68c24450de21b90164c4e114cbb3a5a9b3db365 files/digest-obexftp-0.22_rc7 253
-SHA256 b3433c9ee17eab39f925f6a970f3d69a657e38bf05936a2a9cbf3fc7fd981bec files/digest-obexftp-0.22_rc7 253
 MD5 ccf05c08500905be4caad494063251c7 files/digest-obexftp-0.22_rc9 253
 RMD160 ecd9a54b36c3e64e4102a02e4d19bba9ed9425d0 files/digest-obexftp-0.22_rc9 253
 SHA256 f6810027e76a413d44410574b916ec0d3c8f82c496181756769655b68843ccc6 files/digest-obexftp-0.22_rc9 253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHATf9VSA5X31g7/gRAjo2AJ9zsY3GWTR+koD0FF4xCv7i2B384gCcDZKi
-l6WDDuGvYxXEFzvJ5ptsDb8=
-=ePYp
+iD8DBQFHNz35VSA5X31g7/gRAn4PAKCcRIpW8T/4xdzaq4W2AqzKr/QThgCfTkES
+2T8Rsq9Hk4yv/GJiQGpdt3o=
+=Sojv
 -----END PGP SIGNATURE-----
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}
+	}
+}