stfu repoman

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

6 files changed, 17 insertions, 265 deletions

diff --git a/app-pda/libimobiledevice/ChangeLog b/app-pda/libimobiledevice/ChangeLog
index fddbd397098d..bd9493ac4f1b 100644
--- a/app-pda/libimobiledevice/ChangeLog
+++ b/app-pda/libimobiledevice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-pda/libimobiledevice
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/ChangeLog,v 1.45 2013/05/11 21:57:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/ChangeLog,v 1.46 2013/05/11 22:00:19 ssuominen Exp $
+
+  11 May 2013; Samuli Suominen <ssuominen@gentoo.org>
+  -libimobiledevice-1.1.4-r2.ebuild, -libimobiledevice-1.1.4-r3.ebuild,
+  -files/libimobiledevice-1.1.4-cython.patch:
+  old
 
 *libimobiledevice-1.1.5 (11 May 2013)
 
diff --git a/app-pda/libimobiledevice/Manifest b/app-pda/libimobiledevice/Manifest
index 7a005b8037c9..0673355fdf97 100644
--- a/app-pda/libimobiledevice/Manifest
+++ b/app-pda/libimobiledevice/Manifest
@@ -2,25 +2,22 @@
 Hash: SHA256
 
 AUX libimobiledevice-1.1.4-HOME-segfault.patch 405 SHA256 6239658026bb6ccf37d4bffc94aec454a5a56182084020c47c21a450a15cd396 SHA512 c341a75e8221f36482344e1703302ac7015b4549e6e3f5bbe2d5af237b035f89ead5df47f376c7face231d4d5e653451c4bfed499d78809d953b3733a4be2f39 WHIRLPOOL f9c73803ccc1806253051f40de16f6e05b776eacd17a518f4b108c29c7f8d4bc6228be53af194a7f214c2784dcb28bd64096395be4002463c1c703584d100f44
-AUX libimobiledevice-1.1.4-cython.patch 5449 SHA256 f9ae71e6de6199a5f9929d9e880679dec8f9107d592ea159c24d43565e1bacaa SHA512 771c4e80d033323b41ff961534ca91e7b3451fe1f922c87f73601508329d1141eeb469c69745f40eb9dd1ddf1e4643262e0087baef82ef1193859c103c2d3946 WHIRLPOOL a28bbfd402358819ddca34e52ae3f8099e3ecb05daa14b93bb5071cb341bb552edf7cba76f61072785c9e0191756d2268eeec4d4b3cef5c19bf1ee4d179c4885
 AUX libimobiledevice-1.1.4-openssl.patch 1375 SHA256 014125ba0d2638de262c8b2deb86ea3201c90107714cc3af468aaf0f7a720392 SHA512 d1ade98d0c98cb5cdf78ed8c2689824ea697c4812d1ae733582db567ea35f62bb975521a06d51fb2af9d52b62125ae51f088626eace6c134ed421b7f04a308dc WHIRLPOOL 3ac9337adac1c417176e0b605aacae957c8266d1c58a6a3c4abc72edbc3b4d2108e2c53a771f57c0388898e075447263fea703272de0f77367557c93c66408a0
 AUX libimobiledevice-1.1.4-property_list_service-do-not-strip-non-ASCII-charact.patch 1440 SHA256 42d56497015766d947885d2f482d6284160dc846be9e2e29f393e624f52d45c7 SHA512 2d89875211d4946c9cdedfa88257835873749141c17a548423d94f54c383c360aa37ac306f08f2db373570a2bbcb011ac3ed2f065015e4bce38ecb6580df3f13 WHIRLPOOL 8b74495cadde7c8365d642c0bd9e40f1d225ea607f8992915819713162290278440ed94d0131f0f5bc257fc84b5e8d7dd6f12e64b3a290cf1be8d65bb91309f6
 DIST libimobiledevice-1.1.4.tar.bz2 508371 SHA256 67499cfaa6172f566ee6b0783605acffe484fb7ddc3b09881ab7ac58667ee5b8 SHA512 6c48254d70d264c47e141112c25538d2c168284d8277b2e892cd97d48b6670c8d39c89672384e6b83610e8752f8f3fc36af283117cb1a210139b5e6272001be7 WHIRLPOOL a70dc50aad08bbc5f20573c53b8317e9df58c3a279529daa803570d90178e428291cf44a7ac7aed1cc6231ef4b17f8b0add70f97aa2b8babae41889968091d7f
 DIST libimobiledevice-1.1.5.tar.bz2 577138 SHA256 d52ecd069dfc0abe8a81ed0718540df2def2f84b44e88ea783d44312b6f5f33e SHA512 15e5ab90369f58eaa6540011ea7c44d58e7a8e62e3ccf1155ccec6bb977a158725282bb307587e96ccbd042338cdb6b732572ff1c87c9c2936536fdd492c459e WHIRLPOOL 49b457492bfa83f4d760059791ff0b183521be226998f88b6c751156247e57aac3b722aeafe9d1d22ffe88b66ecc6016d6457dbac4f6cf62b7c9662988b82696
-EBUILD libimobiledevice-1.1.4-r2.ebuild 1391 SHA256 b73ac642fd386bfb3be365b2b4c3aa85bca4dd15833e655fa1c7baf9365dd588 SHA512 a451e72e9ab5739a40bc334dc3652bc07ac3227fb22a6b4f93fd057712edd85030105b88872c800c2fe1a307a7851cb46fe77ce2f49d2459935624ffd2d80e44 WHIRLPOOL 1b91836039fcdce11a60238e312a33393638cf9f73b14e260cd2d9782467348be39cf0f9ac93b5cac0ec6dcdc373d3b332721e2f268395233cd1f8b0a6e11549
-EBUILD libimobiledevice-1.1.4-r3.ebuild 1238 SHA256 0b050ca235adc2f474c7447555b1c662dd5d06edfe98ed245685b219efcf056b SHA512 f1e0e0057710845e1d552dbb8ab23e0d3ed98026104ce4825f7e3240950ceeee3063d44c98b7b726b79e72ae6880b5b35be94c6f527ce339ad2843ff387db892 WHIRLPOOL c8149bdd28302aeed6a47099e23f30184cc409d5dfae2a50be9dfb3c02e01f4eb9778b70ed4388bcac02cd3f06489383017a8547fc885cb49b061cb97ba24593
 EBUILD libimobiledevice-1.1.4-r4.ebuild 1317 SHA256 f407d87c83726a0e9320bc1c6d012ce112557a9b743db610574f6eac7e04d649 SHA512 ed9fa4b3d62777b8a5179369a066061729bfd604b4a65ff036d666f77193f5320af84c6b0da0b7f7f7b2c5b7be02699083720d7e8192998976d4f637481d689f WHIRLPOOL 3b7479d79787a7ea77640501edaba34007a6dcb58cbfa4b87a36d0f2a852a8860d29156ecb0e2920505fd49c07938eed8005d4176d64b2a9b091ac7531f04b4a
-EBUILD libimobiledevice-1.1.5.ebuild 1389 SHA256 a0d163b07e5f3ca52e5138cb4c567b8634a27a398c60f5befc11a6d2057ad5d4 SHA512 5fe08b96416aba7442fffc4e39c55608355fa7e0f3a4666cae7b0c301511ed4177842f91767902ced1f7c7b13bb425f1eae8ec98cf69a487c24625d78d95e0a5 WHIRLPOOL e2ffec42d538bfffd3b4d43fcd9f36a703bd65f0138b5c26cd3534e3fdb1465cdea67296a29c0dad7e3d637191ffdff032724de60f68efdd79d26094f483fb10
-MISC ChangeLog 6996 SHA256 693f2572e401e29d7e40172dc55af43498be2b0d4b63d67c84dbe33a9023c68c SHA512 6e5e2d6cad3656db7406177d32831972f301da40903ac56f548c8487a601d6a8e6298fb9d568330b5c974d686114ab71345f1e178939c776008d29f7fe2502a8 WHIRLPOOL 6709b032db53363c2fb248dfa9a1bdbb915d9af1c8754117133b0b3a0ccd70860bec02d0255d705d980379d6deb07373bfd0360c85981c170057003e53dad70b
+EBUILD libimobiledevice-1.1.5.ebuild 1379 SHA256 9b3dffaf0004db1e04b269428cf111057b8e012e612c479d4c9e4c72c6a48444 SHA512 e0fc4e7ccffc77b602c6af2b7778d1675b417d2594e2f7c1beb04602b88faab183402ac5d9cbd5ab47442a8872e76482cec589b9031799769f28ee6920e9e37f WHIRLPOOL 4cd54dd5e6d434447165a59b47e75961d55636edc64ef85be1666a4f80f7c7f17254008491d664035148f29295908d10a4fc91a9f00fd3882fc540227bf30ee8
+MISC ChangeLog 7175 SHA256 bd34e0704154ffe1f477a8d6e82782ac4dde1fd8661c488f5a167cd8f3b47275 SHA512 bceeffff6957e011eb93ccc4d23f34aec8a0dd1bf0c17d682a1a0f4cb87b2a74306fd791713cf2830f51514e80df286eaa2a2b6c0fbcfe01f411f2d0082113d7 WHIRLPOOL 9ea060ae34af25c11a49118e09ce8f7f5aeced1cbe3c4d213e5d53a18f6eaf5f00395baf5b234def8f0391fc515b3f34040a189a69d692e67f2ef47440b7102d
 MISC metadata.xml 156 SHA256 7f72b73f6e0d6e26603d85e52cca524711faddf6b516640104c3b82aab4754fb SHA512 c07d56b6668ae429bd774f35ecae73eb324423aa863c7cc327a511de84d24f099668029fde69132110676115b4763ee96e3e1a7ef1a9db6248d606e65df11d4b WHIRLPOOL 4364f66f79aa67bc6b1762698b41683da5018d08602f509f525bc3e4a3521f2100e0ea92d84bb30617bef9beda48a3cc0ef9b1b9a4219fe05a54559d7423b6d1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRjr6uAAoJEEdUh39IaPFNdJYH/Azmf7c+F6zhD+DxHLQGTmMt
-+M+iUADTp0woRZbP2G91G2nvlfrp1JgF4WNBhGU+K/w9E8XKyJsoKXFQJFOmVAQX
-zZ8+Fa4QLD4G1Ypem9gZHPqDQ46YNE427EdplCiWzegMHWwSA4QPgZflq4OzrHMS
-BZCEgUamaths/4IkH2Uitqp1PURE190Pu/eYy/Xs3k3ioZmcuFkQf+/DBKb5K28q
-yWVkKsDlSkJKsMAgjum1pbFiAoXkHOfmQnmkqMq5U3MdeeB9XR8wJyHD34W7G5MF
-5vjKw3TZ7evjuhis07y/O2sdnLjn5nQNxXQ4NIq0jVwSMxfrzeg9IuJlv13V9v8=
-=mMI8
+iQEcBAEBCAAGBQJRjr9FAAoJEEdUh39IaPFNAMEH/2T9RBPJg9GpVFD2O8G7zd47
+wSfIyq5irajr44mcsurNeUOAVC+vPU8UeL+T6u1y6TeuN2OnCoieAArP7samMuEj
+KWIbhQYZfRJeumvw/z5phJE8b3DdrMnfNFDX+TQuTebzVKvN7/XlxqP3TX2oo58Y
+DtC382E5lB4tngsGyfKkYT6Nqg0amMad7QJRZMOiiVFPheAJCay5mihSxy1cayhg
+VOw03jWRTiezy5EifsIPWat6zewqdfISB3Uo6cX7+Qdu55zHZflfez7CFXaZLxpy
+OGQeA7zrc496aWmWkN9M5reGRVW/rXQcLZnW72w0lD2e+EeZznGwVg/3eNKT8+4=
+=LAKW
 -----END PGP SIGNATURE-----
diff --git a/app-pda/libimobiledevice/files/libimobiledevice-1.1.4-cython.patch b/app-pda/libimobiledevice/files/libimobiledevice-1.1.4-cython.patch
deleted file mode 100644
index d1f351d5928b..000000000000
--- a/app-pda/libimobiledevice/files/libimobiledevice-1.1.4-cython.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-http://bugs.gentoo.org/414063
-
-http://cgit.sukimashita.com/libimobiledevice.git/commit/?id=70dfe8ad1766990386f1db04bbe5a4826bcde4e5
-http://cgit.sukimashita.com/libimobiledevice.git/commit/?id=84235e0834e57551028329723f4510e1dbe7bc11
-http://cgit.sukimashita.com/libimobiledevice.git/commit/?id=849ea066426b8f5f6e6d1aea9804e095edca3b49
-
---- configure.ac
-+++ configure.ac
-@@ -83,10 +83,20 @@
-             CYTHON=false
- fi
- if [test "x$CYTHON" != "xfalse"]; then
--            CYTHON_SUB=cython
-+            AC_MSG_CHECKING([for libplist Cython bindings])
-             CYTHON_PLIST_INCLUDE_DIR=$($PKG_CONFIG --variable=includedir libplist)/plist/cython
--            AC_SUBST([CYTHON_PLIST_INCLUDE_DIR])
--            cython_python_bindings=yes
-+            if [test ! -d "$CYTHON_PLIST_INCLUDE_DIR"]; then
-+                CYTHON=false
-+                CYTHON_SUB=
-+                cython_python_bindings=no
-+                AC_MSG_RESULT([no])
-+                AC_MSG_WARN([cannot find libplist Cython bindings. You should install your distribution specific libplist Cython bindings package.])
-+            else
-+                AC_SUBST([CYTHON_PLIST_INCLUDE_DIR])
-+                AC_MSG_RESULT([$CYTHON_PLIST_INCLUDE_DIR])
-+                CYTHON_SUB=cython
-+                cython_python_bindings=yes
-+            fi
- else
-             CYTHON_SUB=
-             cython_python_bindings=no
---- cython/afc.pxi
-+++ cython/afc.pxi
-@@ -162,7 +162,7 @@
-             err = afc_client_free(self._c_client)
-             self.handle_error(err)
- 
--    cdef inline BaseError _error(self, int16_t ret):
-+    cdef BaseError _error(self, int16_t ret):
-         return AfcError(ret)
- 
-     cpdef list get_device_info(self):
---- cython/imobiledevice.pxd
-+++ cython/imobiledevice.pxd
-@@ -51,8 +51,8 @@
- cdef class PropertyListService(BaseService):
-     cpdef send(self, plist.Node node)
-     cpdef object receive(self)
--    cdef inline int16_t _send(self, plist.plist_t node)
--    cdef inline int16_t _receive(self, plist.plist_t* c_node)
-+    cdef int16_t _send(self, plist.plist_t node)
-+    cdef int16_t _receive(self, plist.plist_t* c_node)
- 
- cdef extern from "libimobiledevice/lockdown.h":
-     cdef struct lockdownd_client_private:
---- cython/imobiledevice.pyx
-+++ cython/imobiledevice.pyx
-@@ -25,9 +25,8 @@
-             return 0
-         cdef BaseError err = self._error(ret)
-         raise err
--        return -1
- 
--    cdef inline BaseError _error(self, int16_t ret): pass
-+    cdef BaseError _error(self, int16_t ret): pass
- 
- cdef extern from "libimobiledevice/libimobiledevice.h":
-     ctypedef enum idevice_error_t:
-@@ -211,10 +210,10 @@
-                 plist.plist_free(c_node)
-             raise
- 
--    cdef inline int16_t _send(self, plist.plist_t node):
-+    cdef int16_t _send(self, plist.plist_t node):
-         raise NotImplementedError("send is not implemented")
- 
--    cdef inline int16_t _receive(self, plist.plist_t* c_node):
-+    cdef int16_t _receive(self, plist.plist_t* c_node):
-         raise NotImplementedError("receive is not implemented")
- 
- cdef class DeviceLinkService(PropertyListService):
---- cython/mobilesync.pxi
-+++ cython/mobilesync.pxi
-@@ -149,10 +149,10 @@
-                 plist.plist_free(remapping)
-             raise
-     
--    cdef inline int16_t _send(self, plist.plist_t node):
-+    cdef int16_t _send(self, plist.plist_t node):
-         return mobilesync_send(self._c_client, node)
- 
--    cdef inline int16_t _receive(self, plist.plist_t* node):
-+    cdef int16_t _receive(self, plist.plist_t* node):
-         return mobilesync_receive(self._c_client, node)
- 
-     cdef inline BaseError _error(self, int16_t ret):
---- m4/ac_pkg_cython.m4
-+++ m4/ac_pkg_cython.m4
-@@ -6,8 +6,11 @@
-                 CYTHON=false
-         elif test -n "$1" ; then
-                 AC_MSG_CHECKING([for Cython version])
--                [cython_version=`$CYTHON --version 2>&1 | grep 'Cython version' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`]
-+                [cython_version=`$CYTHON --version 2>&1 | sed 's/Cython version \(.*\)$/\1/g'`]
-                 AC_MSG_RESULT([$cython_version])
-+
-+                # Setup extra version string for parsing
-+                [cython_version_stripped=`echo $cython_version | sed 's/\([0-9]\+\)\.\([0-9]\+\)[^\.]*\(\.\([0-9]\+\)\)\?.*/0\1.0\2.0\4/g'`]
-                 if test -n "$cython_version" ; then
-                         # Calculate the required version number components
-                         [required=$1]
-@@ -25,8 +28,9 @@
-                         if test -z "$required_patch" ; then
-                                 [required_patch=0]
-                         fi
-+
-                         # Calculate the available version number components
--                        [available=$cython_version]
-+                        [available=$cython_version_stripped]
-                         [available_major=`echo $available | sed 's/[^0-9].*//'`]
-                         if test -z "$available_major" ; then
-                                 [available_major=0]
-@@ -41,6 +45,7 @@
-                         if test -z "$available_patch" ; then
-                                 [available_patch=0]
-                         fi
-+
-                         if test $available_major -gt $required_major || \
-                                 ( test $available_major -eq $required_major && \
-                                       test $available_minor -gt $required_minor ) || \
diff --git a/app-pda/libimobiledevice/libimobiledevice-1.1.4-r2.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.1.4-r2.ebuild
deleted file mode 100644
index 292079cf1749..000000000000
--- a/app-pda/libimobiledevice/libimobiledevice-1.1.4-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2013 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-r2.ebuild,v 1.6 2013/02/02 22:23:16 ago Exp $
-
-EAPI=4
-PYTHON_DEPEND="python? 2:2.7"
-inherit autotools 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 ~arm ~ppc ~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-r1 )"
-
-DOCS="AUTHORS NEWS README"
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-cython.patch \
-		"${FILESDIR}"/${P}-openssl.patch \
-		"${FILESDIR}"/${P}-HOME-segfault.patch
-
-	eautoreconf
-
-	>py-compile
-}
-
-src_configure() {
-	local myconf='--disable-static'
-	use python || myconf+=' --without-cython'
-	use gnutls && myconf+=' --disable-openssl'
-
-	econf ${myconf}
-}
-
-src_install() {
-	default
-	dohtml docs/html/*
-
-	prune_libtool_files --all
-}
diff --git a/app-pda/libimobiledevice/libimobiledevice-1.1.4-r3.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.1.4-r3.ebuild
deleted file mode 100644
index 6f7a27d35a70..000000000000
--- a/app-pda/libimobiledevice/libimobiledevice-1.1.4-r3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2013 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-r3.ebuild,v 1.1 2013/01/16 18:41:10 ssuominen Exp $
-
-EAPI=5
-inherit autotools eutils
-
-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 ~ppc ~ppc64 ~x86"
-IUSE="gnutls"
-
-RDEPEND=">=app-pda/libplist-1.8-r1
-	>=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"
-
-DOCS="AUTHORS NEWS README"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-openssl.patch \
-		"${FILESDIR}"/${P}-HOME-segfault.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	# Disable python support wrt #451044, look at -1.1.4-r2
-	# from Attic if you need to restore it.
-
-	local myconf
-	use gnutls && myconf='--disable-openssl'
-
-	econf \
-		--disable-static \
-		--without-cython \
-		${myconf}
-}
-
-src_install() {
-	default
-	dohtml docs/html/*
-
-	prune_libtool_files --all
-}
diff --git a/app-pda/libimobiledevice/libimobiledevice-1.1.5.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.1.5.ebuild
index 36a8cfc91280..02b87bc96c5d 100644
--- a/app-pda/libimobiledevice/libimobiledevice-1.1.5.ebuild
+++ b/app-pda/libimobiledevice/libimobiledevice-1.1.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/libimobiledevice-1.1.5.ebuild,v 1.1 2013/05/11 21:57:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/libimobiledevice-1.1.5.ebuild,v 1.2 2013/05/11 22:00:19 ssuominen Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
-inherit autotools eutils python-r1 multilib
+inherit eutils python-r1 multilib
 
 DESCRIPTION="Support library to communicate with Apple iPhone/iPod Touch devices"
 HOMEPAGE="http://www.libimobiledevice.org/"