Fix building with dev-lang/swig >= 2.0.0 wrt #361029.

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

4 files changed, 39 insertions, 12 deletions

diff --git a/app-pda/libimobiledevice/ChangeLog b/app-pda/libimobiledevice/ChangeLog
index 9a07a0a4032d..75d706cbf4c6 100644
--- a/app-pda/libimobiledevice/ChangeLog
+++ b/app-pda/libimobiledevice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-pda/libimobiledevice
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/ChangeLog,v 1.14 2011/03/29 02:03:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/ChangeLog,v 1.15 2011/03/31 21:30:15 ssuominen Exp $
+
+  31 Mar 2011; Samuli Suominen <ssuominen@gentoo.org>
+  libimobiledevice-1.1.0.ebuild:
+  Fix building with dev-lang/swig >= 2.0.0 wrt #361029.
 
 *libimobiledevice-1.1.0 (29 Mar 2011)
 
diff --git a/app-pda/libimobiledevice/Manifest b/app-pda/libimobiledevice/Manifest
index 2ae8172aa083..29a10dd2f6cd 100644
--- a/app-pda/libimobiledevice/Manifest
+++ b/app-pda/libimobiledevice/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST libimobiledevice-1.0.2.tar.bz2 416635 RMD160 f79f720071111f36d5ba22f152d739f178a70f67 SHA1 a826d8921b44a66890e1d0a3fdfc8913d0dae1f4 SHA256 ba70db90517d3e7179c105004e189c9ea9bfdba8d888716ee0b0050c32047df1
 DIST libimobiledevice-1.0.6.tar.bz2 419075 RMD160 d6b5c30a092cc5b29f8434bb2aea63dda54458c4 SHA1 be67287f73a920b893aba50472a7ebad6c9d5b7d SHA256 116f3d08e61103522267885ef6545519c617000fc4b6a87f69ea719bf395af64
 DIST libimobiledevice-1.1.0.tar.bz2 441162 RMD160 3ea37537f1a0dfd90ae43d7becd1750c0056c2f7 SHA1 2be5d58226c9e24728b7b1ad4df93c88ebd68c39 SHA256 00d50e6f375c3270ff5c9fe2a284282f82ff5245c1175f38534848cbd874b606
 EBUILD libimobiledevice-1.0.2.ebuild 849 RMD160 10462aae44ed9a98930061edebc574cbee4c2b26 SHA1 912d4c27bb02fdb82e68b0f433b834cc945318ba SHA256 b17e12c6e914b44dde3a39516ce5a90e6b5733dfa8b11f53251fadb8f9b29774
-EBUILD libimobiledevice-1.0.6.ebuild 1155 RMD160 89303981763d8f586bd5403b6bed0ca699456ed9 SHA1 be50b994d6cb10b26ac53749670ae481e007611f SHA256 3fd11effa073506a41bc22b636ca8ac37c8b478a1d7e99a82b31692b41528d8b
-EBUILD libimobiledevice-1.1.0.ebuild 1281 RMD160 e15187c9764dfbb9934a6e0e9bcea4e9eea73619 SHA1 40ab8a2ed82a0065f68fd2f27814e7e8f28cf4f3 SHA256 e9657f5726bc3a7615998e8407bfdd2a2f8f88ccee6360cd18df70d127000273
-MISC ChangeLog 2278 RMD160 91cc6f684c34b474f6191662dc16bf5a3511a97a SHA1 286d0026236d881922ef0eedab7925d64e7b6cc6 SHA256 037eed8cd3096a4ab2ef9df1f096498ed08eb8b89e622bb0848f6ecc869cf709
+EBUILD libimobiledevice-1.0.6.ebuild 1114 RMD160 ab9ee90e4b67e9de65b37cdd37f074fa4f882124 SHA1 11baa725d07ed2a967984963e222955acd260781 SHA256 c5955af50c470d79e64e5218b3c7036feefa96651a8d69488d8e852446fac011
+EBUILD libimobiledevice-1.1.0.ebuild 1542 RMD160 c442362ae8e40dd3d586667762bd79621b57ed91 SHA1 ce3ef3f9ce279a117a6f78aeb892dc59d610fd91 SHA256 fbafe0820cc86e66bf4bfc4a57ff1600d111761d5c853e250c88fc8514dd914d
+MISC ChangeLog 2422 RMD160 72ddf599872dad31a2408be0ea1f219d9bf26ca0 SHA1 e1851a5cd5f9fc2bb1abb916b6ce3ad134c8734a SHA256 f23f2f56ddca7a8ba2b9f5797e3b1197f684ff8ec0ec8696d8e375b6b301d0c2
 MISC metadata.xml 222 RMD160 d342873a7670ee948b23c02e32d664c61890147b SHA1 4293498c5319dff0845d6c5668f7329cd83c17c5 SHA256 84d779e4bddf172bed193cce4cafad208ba62317ae9bfc7b26b64e02451496ee
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk2U8poACgkQXkR9YqOcLPFv9QD/XN2vovNQ0M2V4URElNMrErTI
+kCa/jPo1DUAf3isfLYQBAKj2GorGMhkRwBMfamO1I2gasSpchP1s2Jc2RHKo4B17
+=xay3
+-----END PGP SIGNATURE-----
diff --git a/app-pda/libimobiledevice/libimobiledevice-1.0.6.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.0.6.ebuild
index 82430862d37e..898777f92565 100644
--- a/app-pda/libimobiledevice/libimobiledevice-1.0.6.ebuild
+++ b/app-pda/libimobiledevice/libimobiledevice-1.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/libimobiledevice-1.0.6.ebuild,v 1.3 2011/03/29 02:05:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/libimobiledevice-1.0.6.ebuild,v 1.4 2011/03/31 21:30:15 ssuominen Exp $
 
 EAPI=3
 
@@ -25,10 +25,8 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_configure() {
-	# Be careful when enabling Python, and read this thru:
-	# http://bugs.gentoo.org/show_bug.cgi?id=361029
-	#
-	# --with-swig is same as --without-swig wrt #361029.
+	# Missing dev-lang/swig >= 2.0.0 support wrt #361029. Keep
+	# disabled for 1.0.x series. Fixed again in 1.1.0's ebuild.
 	econf \
 		--disable-dependency-tracking \
 		$(use_enable static-libs static) \
diff --git a/app-pda/libimobiledevice/libimobiledevice-1.1.0.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.1.0.ebuild
index 7654a0e536f6..dd7ebb631929 100644
--- a/app-pda/libimobiledevice/libimobiledevice-1.1.0.ebuild
+++ b/app-pda/libimobiledevice/libimobiledevice-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/libimobiledevice-1.1.0.ebuild,v 1.2 2011/03/29 02:05:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/libimobiledevice-1.1.0.ebuild,v 1.3 2011/03/31 21:30:15 ssuominen Exp $
 
 EAPI=3
 PYTHON_DEPEND="python? 2:2.6"
@@ -27,7 +27,7 @@ RDEPEND=">=app-pda/libplist-0.15
 	virtual/libusb:1"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	python? ( dev-lang/swig )"
+	python? ( >=dev-lang/swig-2.0.0 )"
 
 pkg_setup() {
 	if use python; then
@@ -36,8 +36,15 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	sed -i -e 's:1.3.21:2.0.0:g' configure || die
+
+	rm -f py-compile
+	ln -s $(type -P true) py-compile
+}
+
 src_configure() {
-	# --with-swig is same as --without-swig wrt #361029.
+	# --with-swig is same as --without-swig wrt #361029
 
 	local myconf
 	use python || myconf="--without-swig"
@@ -54,3 +61,11 @@ src_install() {
 
 	find "${D}" -name '*.la' -exec rm -f {} +
 }
+
+pkg_postinst() {
+	use python && python_mod_optimize imobiledevice
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup imobiledevice
+}