old

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

3 files changed, 14 insertions, 76 deletions

diff --git a/app-pda/libimobiledevice/ChangeLog b/app-pda/libimobiledevice/ChangeLog
index a85abc5d793a..e838f9210855 100644
--- a/app-pda/libimobiledevice/ChangeLog
+++ b/app-pda/libimobiledevice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-pda/libimobiledevice
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/ChangeLog,v 1.30 2012/05/19 08:18:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/ChangeLog,v 1.31 2012/05/19 08:19:58 ssuominen Exp $
+
+  19 May 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -libimobiledevice-1.1.4.ebuild:
+  old
 
 *libimobiledevice-1.1.4-r1 (19 May 2012)
 
@@ -12,9 +16,7 @@
 
   16 May 2012; Samuli Suominen <ssuominen@gentoo.org>
   libimobiledevice-1.1.4.ebuild, +files/libimobiledevice-1.1.4-openssl.patch:
-  Upstream patch for "fix openssl initialization and handle error to avoid
-  crash". Since Cython 0.16 is not supported yet, avoid bailing out when it's
-  installed wrt #414063.
+  Fix openssl initialization and handle error to avoid crash.
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> libimobiledevice-1.1.1.ebuild,
   libimobiledevice-1.1.4.ebuild:
diff --git a/app-pda/libimobiledevice/Manifest b/app-pda/libimobiledevice/Manifest
index 63214f776159..6c1395a3daf8 100644
--- a/app-pda/libimobiledevice/Manifest
+++ b/app-pda/libimobiledevice/Manifest
@@ -7,17 +7,16 @@ DIST libimobiledevice-1.1.1.tar.bz2 459976 RMD160 7cc2860efc3b7d14686b776e6e9a52
 DIST libimobiledevice-1.1.4.tar.bz2 508371 RMD160 ad90beb4b6deaf211e8ea0a3e7d73e0a5ef9b6d3 SHA1 d59d9751d9f792e8674cd87c91005d431bf56065 SHA256 67499cfaa6172f566ee6b0783605acffe484fb7ddc3b09881ab7ac58667ee5b8
 EBUILD libimobiledevice-1.1.1.ebuild 1586 RMD160 708322ed85351d0fd168827801d5f718e47b16b5 SHA1 fa985809a5fa8fed947fa85add486cd99f149b6a SHA256 c2d54971760a08c5d4e4b12e000f795be8910c107cbb7127f26bd849117551c6
 EBUILD libimobiledevice-1.1.4-r1.ebuild 1363 RMD160 71895dafe3a6c8b7c38ce8292fcc015be1933aaf SHA1 73815d69f0d8e7830f781e495f6f9e75861ee910 SHA256 e9635370e2c0c384f10f8d5cffa08fffd77a7e4535ed51c39075094ffd5da6ec
-EBUILD libimobiledevice-1.1.4.ebuild 1490 RMD160 372199d49e45f89ac8df2505fb133ea472ac7d25 SHA1 fc2ff95d6e4f9838d0ba3b002e3b4287bd9b48a9 SHA256 29efebbeb4e1b6b6e666ed6d11316e3d37b51a21a6b0a533a5225462ea65933b
-MISC ChangeLog 4809 RMD160 c7b421a17bc15f93ba55f0f1c2e1369624fe5925 SHA1 f1bd2d110d6d01520f59f3852ec6c409ee805f8a SHA256 3013ccde335f14ebd8935314de702f35b868ad74066d4d1bbcf700a1d5bcc9f1
+MISC ChangeLog 4788 RMD160 797c241e9744def2101e6484c8099024632b56be SHA1 dc2281e68cf3a042f10bd469e57bd7655047b7c5 SHA256 7a4151d1cfc7a801152b128fe3d14e29f197cb373319bc9cd050e542fe5e31ea
 MISC metadata.xml 156 RMD160 6a6d0f6bfe83e3a54c2d72444564ed6ab19857fe SHA1 5b9cb277159d763c133920e483df8d3d587cf7e2 SHA256 7f72b73f6e0d6e26603d85e52cca524711faddf6b516640104c3b82aab4754fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPt1dVAAoJEEdUh39IaPFNREgH/24n9muHO28FlGSaqXf0vAJo
-a2AgwZWpX/GIhMFlY9grQst+s53o2SD9EohVvbz/UhUE8VsOuKa9OPF/3UHsJ4y8
-QQbbjFexc8g/lCZ1fnlI6k/kS8KiUF9VvZLKpzDZtDt8zwgGjgTOaYupFdSIvAdo
-5sfzf6fMw9mzkA0Jx7dtxPbvh6YtEY35VI4A3t3xp9BeUYGutgnrnctnY2F/yLFR
-0tHANl5G9dv/Wg1NXz4gsmjkSq7DdonAt203R/CrRokun+IkLmoHLponn1yldZdR
-ojwJlvqQuJsABsmoes6VEXI4xx3MASIze2Set98RM15nPlMsNTw2EdqPLQkvM5o=
-=i9T8
+iQEcBAEBAgAGBQJPt1ejAAoJEEdUh39IaPFNn1UH/jMW+JSZPMt57Oc2ci+Z/xmz
+ExUyASsjQ6v6GOZ3nzT92MK4Mj1sJosR+Ooni0NwUxsdgzcN9SaSGqu4H6t4IbKB
+bPaTxNJClHtkUCcbgkhigqtzbpXIAVDNij+D6dGtTmBgf/iZTDAVivka3l+szrBP
+I9+2Y9t+FCL2MttC017DCokB0Hn+yrvAXasmaPZ+uCRYzxAju0Z+8gQlKF0TBLlP
+tYz0y2j5b0NhsHRp7MmgmqNoYatBP3oZfG7kMfvAe27K5w4kPdry+g2gUPi0AQDj
+OplNYiKqxNbawBk3pX85PImBfE3Rh0sJsDNof4XcJa2qVRgv3ZflYGNdy1VGZug=
+=vb0S
 -----END PGP SIGNATURE-----
diff --git a/app-pda/libimobiledevice/libimobiledevice-1.1.4.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.1.4.ebuild
deleted file mode 100644
index 4522ced08211..000000000000
--- a/app-pda/libimobiledevice/libimobiledevice-1.1.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/libimobiledevice-1.1.4.ebuild,v 1.3 2012/05/16 00:48:36 ssuominen Exp $
-
-EAPI=4
-PYTHON_DEPEND="python? 2:2.7"
-inherit eutils python
-
-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="gnutls python"
-
-RDEPEND=">=app-pda/libplist-1.8-r1[python?]
-	>=app-pda/usbmuxd-1.0.8
-	gnutls? (
-		dev-libs/libgcrypt
-		>=dev-libs/libtasn1-1.1
-		>=net-libs/gnutls-2.2.0
-		)
-	!gnutls? ( dev-libs/openssl:0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	python? ( >=dev-python/cython-0.14.1 )"
-
-DOCS="AUTHORS NEWS README"
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-openssl.patch
-
-	>py-compile
-}
-
-src_configure() {
-	local myconf='--disable-static'
-	use python || myconf+=' --without-cython'
-	use gnutls && myconf+=' --disable-openssl'
-
-	if has_version '~dev-python/cython-0.16'; then
-		myconf+=' --without-cython'
-		ewarn "Disabling Cython support because 0.16 is not supported yet."
-		ewarn "See, http://bugs.gentoo.org/414063"
-	fi
-
-	econf ${myconf}
-}
-
-src_install() {
-	default
-	dohtml docs/html/*
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}