Remove broken Python and SWIG support wrt #361029.

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

4 files changed, 13 insertions, 51 deletions

diff --git a/app-pda/libimobiledevice/ChangeLog b/app-pda/libimobiledevice/ChangeLog
index 8a133dee1ea1..605a3a46c88e 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.12 2011/03/29 01:06:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/ChangeLog,v 1.13 2011/03/29 01:44:24 ssuominen Exp $
+
+  29 Mar 2011; Samuli Suominen <ssuominen@gentoo.org>
+  libimobiledevice-1.0.6.ebuild:
+  Remove broken Python and SWIG support wrt #361029.
 
 *libimobiledevice-1.0.6 (29 Mar 2011)
 
diff --git a/app-pda/libimobiledevice/Manifest b/app-pda/libimobiledevice/Manifest
index 9a9776a3d830..e7f458eb3ab0 100644
--- a/app-pda/libimobiledevice/Manifest
+++ b/app-pda/libimobiledevice/Manifest
@@ -1,8 +1,6 @@
 DIST libimobiledevice-1.0.2.tar.bz2 416635 RMD160 f79f720071111f36d5ba22f152d739f178a70f67 SHA1 a826d8921b44a66890e1d0a3fdfc8913d0dae1f4 SHA256 ba70db90517d3e7179c105004e189c9ea9bfdba8d888716ee0b0050c32047df1
-DIST libimobiledevice-1.0.4.tar.bz2 413573 RMD160 1f1bfd360f908b398b3fdbb767fb884eeddbfee8 SHA1 829024379c02ff8c52b94accb4315020ff31ea1a SHA256 2b836f09b95c9cf644ac824647b66d823cd135c5e0d4a8fca863d5314734d046
 DIST libimobiledevice-1.0.6.tar.bz2 419075 RMD160 d6b5c30a092cc5b29f8434bb2aea63dda54458c4 SHA1 be67287f73a920b893aba50472a7ebad6c9d5b7d SHA256 116f3d08e61103522267885ef6545519c617000fc4b6a87f69ea719bf395af64
 EBUILD libimobiledevice-1.0.2.ebuild 849 RMD160 10462aae44ed9a98930061edebc574cbee4c2b26 SHA1 912d4c27bb02fdb82e68b0f433b834cc945318ba SHA256 b17e12c6e914b44dde3a39516ce5a90e6b5733dfa8b11f53251fadb8f9b29774
-EBUILD libimobiledevice-1.0.4.ebuild 832 RMD160 724fe7cd686daa049c6c15190dccd1414891a237 SHA1 0e7d4d109671043a3a5cfa624cd553c6307a7e0e SHA256 3bd4868799844b94b74107681eb68134bf42e508a3bc573715bacaafcb297dea
-EBUILD libimobiledevice-1.0.6.ebuild 1166 RMD160 5472d46e9d4c16de25a56a3f83e5bfbdd37426d7 SHA1 6ff2861c69553c59f53854492d9d6668304bada8 SHA256 bbd3cb59312c90e4c934e357976b385235b33a3f77bf8ff765f89c91c7747b78
-MISC ChangeLog 1895 RMD160 853248b7e4416da98eeba68b871a7db0fea77443 SHA1 583cbd03d57ecc559482a7f38b50311e3b073aeb SHA256 cdac11b7afd3ee63cc367c66ef1a42ed920622adc25077b3c79ca76f63dac646
+EBUILD libimobiledevice-1.0.6.ebuild 1092 RMD160 66902a821bdaf8de4a9eb3d189fc5dc481a8438b SHA1 4d6e804ce09a2e9e3b5843160cee33ae5701504e SHA256 02b8ba712f57102bb6a6f544d2d68dcc0434e769f22d0930335100972399c670
+MISC ChangeLog 2036 RMD160 448878c76c9dfe92fdd506d6288fc7976789fa99 SHA1 2cde3602cf2c69d8b0dfb56f68c5d17e512dc71a SHA256 176e4869be69192237a3da97259d8fa5cef377a64821e18cbec2d22fc4ddf7b2
 MISC metadata.xml 222 RMD160 d342873a7670ee948b23c02e32d664c61890147b SHA1 4293498c5319dff0845d6c5668f7329cd83c17c5 SHA256 84d779e4bddf172bed193cce4cafad208ba62317ae9bfc7b26b64e02451496ee
diff --git a/app-pda/libimobiledevice/libimobiledevice-1.0.4.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.0.4.ebuild
deleted file mode 100644
index 1576921a27ba..000000000000
--- a/app-pda/libimobiledevice/libimobiledevice-1.0.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/libimobiledevice-1.0.4.ebuild,v 1.1 2010/11/30 11:01:59 bangert Exp $
-
-EAPI=3
-
-DESCRIPTION="Support library to communicate with Apple iPhone/iPod Touch devices"
-HOMEPAGE="http://www.libimobiledevice.org/"
-SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2"
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="python"
-
-DEPEND="dev-util/pkgconfig
-	${RDEPEND}"
-RDEPEND=">=app-pda/libplist-1.3
-	>=app-pda/usbmuxd-1.0.3
-	>=dev-libs/glib-2.14.1
-	dev-libs/libgcrypt
-	net-libs/gnutls
-	sys-fs/fuse
-	virtual/libusb:1"
-
-src_configure() {
-	econf $(use_with python swig)
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc README NEWS
-}
diff --git a/app-pda/libimobiledevice/libimobiledevice-1.0.6.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.0.6.ebuild
index abd03c441d51..2cf84680a8af 100644
--- a/app-pda/libimobiledevice/libimobiledevice-1.0.6.ebuild
+++ b/app-pda/libimobiledevice/libimobiledevice-1.0.6.ebuild
@@ -1,10 +1,8 @@
 # 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.1 2011/03/29 01:06:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/libimobiledevice-1.0.6.ebuild,v 1.2 2011/03/29 01:44:24 ssuominen Exp $
 
 EAPI=3
-PYTHON_DEPEND="python? 2:2.6"
-inherit python
 
 DESCRIPTION="Support library to communicate with Apple iPhone/iPod Touch devices"
 HOMEPAGE="http://www.libimobiledevice.org/"
@@ -13,7 +11,7 @@ SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="python static-libs"
+IUSE="static-libs"
 
 RDEPEND=">=app-pda/libplist-0.15
 	>=app-pda/usbmuxd-0.1.4
@@ -24,21 +22,15 @@ RDEPEND=">=app-pda/libplist-0.15
 	sys-fs/fuse
 	virtual/libusb:1"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	python? ( dev-lang/swig )"
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
+	dev-util/pkgconfig"
 
 src_configure() {
+	# Be careful when enabling Python, and read this thru:
+	# http://bugs.gentoo.org/show_bug.cgi?id=361029
 	econf \
 		--disable-dependency-tracking \
 		$(use_enable static-libs static) \
-		$(use_with python swig)
+		--without-swig
 }
 
 src_install() {