Update app-pda/ipheth-pair; add app-pda/libimobiledevice, app-pda/libusbmuxd, and app-pda/usbmuxd for iOS7 compatibility

9 files changed, 178 insertions, 10 deletions

diff --git a/app-pda/ipheth-pair/Manifest b/app-pda/ipheth-pair/Manifest
index eb4e2286..84e1da64 100644
--- a/app-pda/ipheth-pair/Manifest
+++ b/app-pda/ipheth-pair/Manifest
@@ -1,2 +1,2 @@
-AUX Makefile.patch 599 SHA256 5a9f0b45bfe397501d5503ff94fed6f275f9d7567051dd9a8fd60feeeaa519d2 SHA512 d58dfefd8c6f2e8dcbcd26bfee3cbbbec6b4f589f644cb261ce03adc94eae7cd5b2aee82ace091f6d35e24915d0ce712684220bebec22ff0f8479ffb9d4d25ad WHIRLPOOL 9d6ecb2115b26d59d8f1e3b0f0876c25e96a41e10aa313808243a78ef94e43d1b34ee5c0d25e4005ba0f851cae70488c3ae45daddd69136e053f4b2fc5598379
-EBUILD ipheth-pair-9999.ebuild 693 SHA256 148acf77e5e6531a87ea6cb7d0ce7ad8ce02bb945e34a1bf08ee232251fbd9e4 SHA512 1b62e2c9512923590bf3d09433dd33d1d2166e95033446633d6cfa89a259a37cb4baa3cd00fc2bba396eae14cd69255f71cedacde5c1748546ce070990e18a67 WHIRLPOOL b1ee46bc97c0f181f5c89a113736e1b77478588c4b5e2b11dcce2a03331c94dcbf90b02349727dfb3567bc7517a4b417891ab31d8ab8969fe3c5193b9acf31e5
+AUX Makefile.patch 608 SHA256 26c73cdbab10ecd3e6b00618941fa222688df0c31b3f8baaf5db6b66f8541f14 SHA512 2ec07c0474dbcbccd37e828e140d193d615c7e52f3bcc86210fa825d09599845f8025770a199c4846e1a2bdf3fbd8b605baaba1c1a136ff22c08d77473802bb0 WHIRLPOOL dc9267e217184cca2f9c0c2fb216b95c3598ac6a672dcaa3cad1df94c41342a84937046f430993ebdc66d7a8a3452566f48872011b118d9874396ac82afc0a5e
+EBUILD ipheth-pair-9999.ebuild 942 SHA256 8301ae2ee73223da7a972d752b18835b5623bdaa2a33c43df76340f701916a28 SHA512 dbd3c67ffe29e1fb4133796caff8be80408ed8f6ca12522682ea4fb0252a541e156f3549de332a900ae2cf1980116953f850ed867e4d9486c68aa4c7c0ad2e1a WHIRLPOOL a036cccca4e5cc5e108e07da3b233f19d8391965454b3efbb74b7f65d5f9f1ab40e14621d301609d62e07c2c467dab9711eabf63b738ed8f0fa80bf30ea5ff78
diff --git a/app-pda/ipheth-pair/files/Makefile.patch b/app-pda/ipheth-pair/files/Makefile.patch
index 6ec0cd4b..26c7a26e 100644
--- a/app-pda/ipheth-pair/files/Makefile.patch
+++ b/app-pda/ipheth-pair/files/Makefile.patch
@@ -12,8 +12,8 @@
 -	install -m 0755 ipheth-pair /lib/udev/
 -	install -m 0644 90-iphone-tether.rules /etc/udev/rules.d
 -	/sbin/udevadm control --reload-rules
-+	install -D -m 0755 ipheth-pair ${DESTDIR}/lib/udev/ipeth-pair
-+	install -D -m 0644 90-iphone-tether.rules ${DESTDIR}/etc/udev/rules.d/90-iphone-tether.rules
++	install -D -m 0755 ipheth-pair ${DESTDIR}/usr/bin/ipeth-pair
++	install -D -m 0644 90-iphone-tether.rules ${DESTDIR}/${UDEV_RULES_PATH}/rules.d/90-iphone-tether.rules
  
  clean:
  	rm -f *.o ipheth-pair
diff --git a/app-pda/ipheth-pair/ipheth-pair-9999.ebuild b/app-pda/ipheth-pair/ipheth-pair-9999.ebuild
index ab0c5a9b..90ba3201 100644
--- a/app-pda/ipheth-pair/ipheth-pair-9999.ebuild
+++ b/app-pda/ipheth-pair/ipheth-pair-9999.ebuild
@@ -2,31 +2,43 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit git-r3 autotools
+EAPI="4"
+
+inherit autotools eutils git-2 udev
 
 DESCRIPTION="iPhone USB Ethernet Driver for Linux pairing helper"
 HOMEPAGE="http://giagio.com/wiki/moin.cgi/iPhoneEthernetDriver"
+SRC_URI=""
 EGIT_REPO_URI="git://github.com/dgiagio/ipheth.git/"
 EGIT_PROJECT="ipheth"
 
-EGIT_PATCHES="${FILESDIR}/Makefile.patch"
-
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="udev"
 
 RDEPEND="app-pda/libimobiledevice"
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/Makefile.patch
+}
+
 src_compile() {
 	emake -C ipheth-pair || die
 }
 
 src_install() {
-	emake -C ipheth-pair DESTDIR="${D}" install || die
+	emake -C ipheth-pair DESTDIR="${ED}" UDEV_RULES_PATH="$(udev_get_udevdir)" install || die
+
+	if ! use udev; then
+		rm "${ED}"/$(udev_get_udevdir)/rules.d/90-iphone-tether.rules
+		rmdir -p "${ED}"/$(udev_get_udevdir)/rules.d
+	fi
 }
 
 pkg_postinst() {
-	udevadm control --reload-rules && udevadm trigger
+	if use udev; then
+		udevadm control --reload-rules && udevadm trigger
+	fi
 }
diff --git a/app-pda/libimobiledevice/Manifest b/app-pda/libimobiledevice/Manifest
new file mode 100644
index 00000000..8d2e82c2
--- /dev/null
+++ b/app-pda/libimobiledevice/Manifest
@@ -0,0 +1,4 @@
+AUX libimobiledevice-1.1.5-cython.patch 543 SHA256 7fb909254a8cf7ad3327728357f177a094d6751c86c267917f0adc2d8b9a085f SHA512 11707f068752e331dd8f13fb2b3f5840aab2f07d2eba3d6e7a30f4ac2c40a1e1f4c58771075caa85a0d8ea95de2aaa00e44de05b5618c3da72dd2ce9ccdbe5b1 WHIRLPOOL 5ee3d64ed34a48f8a4167e521cb8ac9d13666197becf32e0dbd189ff9869db89ae9c4f9b3b95126025e7ef82f6a592f97f680b9f32f58daf3cc22472d5ecd441
+DIST libimobiledevice-1.1.6.zip 320371 SHA256 f1067eafe397ccd3379987422051458c7e736c20b919e955b81ffaf6e32406aa SHA512 ac276b1cc75118c6cc32a386a6076b11f67a35232de5ee3f3460c14fd4cf2780a1e3a82344dde29b565c08708af5440c1f446dd0043aead3b42d70292e307e64 WHIRLPOOL e0a05b1750119e21ef92b04feef3c97b31765d5f2810524eec6f321241f5e855951fce7014c8d8fe34311fd2c3aa64940c0205e5c5d54a43c01e166afc2c316e
+EBUILD libimobiledevice-1.1.6.ebuild 1501 SHA256 7ae4f64a330ddae6366efa0cfdd4dfa189c8588f8c944ce26c40dcae7cec47f4 SHA512 255130d0c080f5d40c363584c3903f85a395c4b5983f8dc326e34819916f6d91d6617165ce12a5858d443afbb48f5200d6ab67cad53aa532c1fdf38e8e5399ca WHIRLPOOL 7326e4054bc49a542560c5362a2a20d1a03def07523822287c06a50a4c3b152c2996bf47d008a6670c9f1771c17b11c526b9035145d96b7e925cdf599cf76c72
+EBUILD libimobiledevice-9999.ebuild 1418 SHA256 d38712e85fafd38943fc7bfdbc56b006f601ca1fc6e6b662c46acaf5f770ff77 SHA512 1944a133b5960496b35728d1a5cd5c7dfb9b8519a9d4c7e96d3cbc9e0304f908c8d6831c8ef35613606d658b5829e4e46c9278494c34aa6bbbf5f0789ab9182f WHIRLPOOL 7ad7c94115c5b75f9b970e3a72113aa2a155276834205a373d492020bf08f0bf77608411f7e8f0a4646692788605f556a1157fe9ac137aec0ec6bc1ad0e0fbdd
diff --git a/app-pda/libimobiledevice/libimobiledevice-9999.ebuild b/app-pda/libimobiledevice/libimobiledevice-9999.ebuild
new file mode 100644
index 00000000..19f3b767
--- /dev/null
+++ b/app-pda/libimobiledevice/libimobiledevice-9999.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: app-pda/libimobiledevice/libimobiledevice-9999.ebuild,v 1.0 2013/10/31 16:38:49 srcs Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+EGIT_MASTER="master"
+inherit autotools eutils git-2 python-r1 multilib
+
+DESCRIPTION="Support library to communicate with Apple iPhone/iPod Touch devices"
+HOMEPAGE="http://www.libimobiledevice.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/libimobiledevice/libimobiledevice.git"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/6"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="gnutls python"
+
+RDEPEND=">=app-pda/libplist-1.10[python?,${PYTHON_USEDEP}]
+	>=app-pda/libusbmuxd-1.0.9
+	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? (
+		${PYTHON_DEPS}
+		>=dev-python/cython-0.17[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( AUTHORS NEWS README )
+
+pkg_setup() {
+	# Prevent linking to the installed copy
+	if has_version "<${CATEGORY}/${P}"; then
+		rm -f "${EROOT}"/usr/$(get_libdir)/${PN}$(get_libname)
+	fi
+}
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	use python && python_export_best
+
+	local myconf
+	use gnutls && myconf='--disable-openssl'
+	use python || myconf+=' --without-cython'
+
+	econf --disable-static ${myconf}
+}
+
+src_install() {
+	default
+
+	prune_libtool_files --all
+}
diff --git a/app-pda/libusbmuxd/Manifest b/app-pda/libusbmuxd/Manifest
new file mode 100644
index 00000000..62435958
--- /dev/null
+++ b/app-pda/libusbmuxd/Manifest
@@ -0,0 +1 @@
+EBUILD libusbmuxd-9999.ebuild 772 SHA256 b22824365f999cb7954d8750593cca4549032afcfc479c4d5c2d50683d7ad211 SHA512 73e924a4e4cb6a7f5bc6bce9ef035142264f1bd8678537cd667c976412aef8131fec25669a6e41931ccd65c2717932909dbfb4ce7b558ad89401f03d95d0dc84 WHIRLPOOL 1a569144b739a6f04adb1eb915071b041c9b8b178c9a293cade31a1d721b1741468c042c69a2566a3b3b77dbeb3969520ac77b17241ae49e6e7005c59622bc86
diff --git a/app-pda/libusbmuxd/libusbmuxd-9999.ebuild b/app-pda/libusbmuxd/libusbmuxd-9999.ebuild
new file mode 100644
index 00000000..8706af4f
--- /dev/null
+++ b/app-pda/libusbmuxd/libusbmuxd-9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: app-pda/libusbmuxd/libusbmuxd-9999.ebuild,v 1.0 2013/10/31 16:34:12 srcs Exp $
+
+EAPI=4
+EGIT_MASTER="master"
+inherit autotools git-2
+
+DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices"
+HOMEPAGE="http://www.libimobiledevice.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/libimobiledevice/libusbmuxd.git"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+IUSE=""
+
+RDEPEND=">=app-pda/libplist-1.9"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS README README.devel )
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+
+	prune_libtool_files --all
+}
diff --git a/app-pda/usbmuxd/Manifest b/app-pda/usbmuxd/Manifest
new file mode 100644
index 00000000..9c6d8d23
--- /dev/null
+++ b/app-pda/usbmuxd/Manifest
@@ -0,0 +1 @@
+EBUILD usbmuxd-9999.ebuild 1097 SHA256 a2cafb2a1adc5d57f73113dd959ed95ec29878439830acd1e0db048c286df799 SHA512 0ba07fb8ee90c9de5b106190d63c4a5041f46b83b8f4c3414102fd66bba7fbe5fc6d821d753e3aa0d74e8f7538f3c31e4c36fdc08f676a1e5b74ad974d7e4b32 WHIRLPOOL 1f2a36f15b485cff54ce2085267b7b3d71c24c94313b28073dfc068a05e10039252ae149ce4a30826c24a7992d8db3e342bc14c4373debbee67602ace3bfae50
diff --git a/app-pda/usbmuxd/usbmuxd-9999.ebuild b/app-pda/usbmuxd/usbmuxd-9999.ebuild
new file mode 100644
index 00000000..fe1d06b9
--- /dev/null
+++ b/app-pda/usbmuxd/usbmuxd-9999.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: app-pda/usbmuxd/usbmuxd-9999.ebuild,v 1.0 2013/10/31 17:05:12 srcs Exp $
+
+EAPI=4
+EGIT_MASTER="split"
+inherit autotools git-2 udev user
+
+DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices"
+HOMEPAGE="http://www.libimobiledevice.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/libimobiledevice/usbmuxd.git"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+IUSE="udev +worker"
+
+RDEPEND=">=app-pda/libplist-1.9
+	virtual/libusb:1"
+DEPEND="${RDEPEND}
+	worker? ( >=app-pda/libusbmuxd-1.0.9 )
+	>=app-pda/libimobiledevice-1.1.6
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS README )
+
+pkg_setup() {
+	enewgroup plugdev
+	enewuser usbmux -1 -1 -1 "usb,plugdev"
+}
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	use worker || myconf='--without-preflight'
+
+	econf ${myconf}
+}
+
+src_install() {
+	default
+
+	if ! use udev; then
+		rm "${ED}"/$(udev_get_udevdir)/rules.d/39-usbmuxd.rules
+		rmdir -p "${ED}"/$(udev_get_udevdir)/rules.d
+	fi
+}