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

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

3 files changed, 26 insertions, 9 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/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
+}