old

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

4 files changed, 13 insertions, 123 deletions

diff --git a/app-pda/ifuse/ChangeLog b/app-pda/ifuse/ChangeLog
index 3e0dddff7f2e..fcc4b59cf284 100644
--- a/app-pda/ifuse/ChangeLog
+++ b/app-pda/ifuse/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-pda/ifuse
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/ifuse/ChangeLog,v 1.18 2014/08/03 12:09:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/ifuse/ChangeLog,v 1.19 2014/08/03 12:10:21 ssuominen Exp $
+
+  03 Aug 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -files/ifuse-1.1.2-libimobiledevice115.patch, -ifuse-1.1.2-r1.ebuild:
+  old
 
   03 Aug 2014; Samuli Suominen <ssuominen@gentoo.org> ifuse-1.1.3.ebuild:
   amd64/x86 stable wrt #518160
diff --git a/app-pda/ifuse/Manifest b/app-pda/ifuse/Manifest
index 2919ba15e3f1..2f3eaef720d2 100644
--- a/app-pda/ifuse/Manifest
+++ b/app-pda/ifuse/Manifest
@@ -1,21 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX ifuse-1.1.2-libimobiledevice115.patch 2717 SHA256 45125a5019d388a9b0dd335a58f13beac099b21f11aa1db736578a4b3b53b8a4 SHA512 a869bd8e71d17a2058089ef3cd2650f75d3d4dd7eab18e99b588a2f13164e979c924215aa9b2906a0e49640c30bb6a172b92c32c48fe0babf7e6866ccfaf9c65 WHIRLPOOL 5d127da31c751d59d8a1e827cc41c2186eee18c341826b80d6604d91f7207bc92c3be6f4059d859eac10847b041ed5592bdf48770a39016f286d1ce9c6c5dba2
-DIST ifuse-1.1.2.tar.bz2 84645 SHA256 47835c8afb72588b3202fe0b206d7ea37a68663d9aa4eaf73f0a4bcb6215fc05 SHA512 eb2d2340265d9d51ba44b0f24665a648fe4c07dc379563f517b1e1994ff513cabc72a61d77cf13bcf24771ace3716aef55fa40db3c0045539a5b8bc3e6b487ae WHIRLPOOL eda8b8fff0e28688b4adb4b5457f1b1c590b0e16b6fd94470e507609193170441c60c3abf3518ae178023c3ba5393b3c185170f773bbf9b0dc2e6f937c3fe1c5
 DIST ifuse-1.1.3.tar.bz2 90803 SHA256 a788de66fb7720c84a5a775df415f78bbfb7c467a76c732d23292c6986252add SHA512 bacf0b00ebc7681022f6e85daa005ee19c99f3222e5db5c4ea6630c2c46111dd3ccd7efcfdbcfabf06cc18ceb58b054c1adb2d106d9b3b7d60a12f3b79c64a3c WHIRLPOOL 73bf7794dcf0ae00fd0daff6f322bce1e77e27981a7787437869937cbc62554f6ca1e87458c50bb2c39c7415235c7357d4e26ad2403a1bc16c95523e102aa1f2
-EBUILD ifuse-1.1.2-r1.ebuild 1030 SHA256 0f6f8c517b69a406b3573f650aef27cccea509ebc3e83f8f38f6adecd00249c6 SHA512 32b64b7d044d5e61261dca59febb634469da0b163fed4b4cdc74f3c2be5e4db5b752a552bed5d7f451c4ec3a208dd0df15ffbbdf943f90803dd4ec3439375fc9 WHIRLPOOL 456268c54af12c726746676e1a6783c39a0fd43c73c5255df80393f3663cfb405f5d30099d0fb59eec9c7e42d36321069b45ebbe41966b8ac0681c4aa8eb2157
 EBUILD ifuse-1.1.3.ebuild 936 SHA256 ac30929794c20a9e5b26cb26b272f9598b76a30f4e9a67f8f6479c7a5cd9a22c SHA512 2882890c10e250fb6df89e14640654e4198d17841dc6f302f4150c1e32a31f0f0304888dfbab9d881ac5cd7c7938261c0aa5a8cf80f122e30b5294ef71c6a7af WHIRLPOOL 3985fd3cd8817525b0e9b9819423a644aa3eacae1d520b95ab0995d9377dd5158737b5aedee7f75873893bc5ab63cb7c1c40a12b1bc705503d2eb7805dba4aae
-MISC ChangeLog 2512 SHA256 55a1e4fcc4177e144c0d448eb01508176365affdfe51de791b40b8f12a9f3b12 SHA512 cca1c0e37607b1d786134e64633c39d096063c49a394da0bd93c99401e6d3a9c44e324385c2eb45e9d3483fa1917cc29df73a9e78b18624eccf0a482d72c2b05 WHIRLPOOL 32c7daebccf9395ea852772269a8d7d20ca8327649f1cc681dc0d796b05abbc2a65121f8865df3a5a9076cffd1dfe520ee6a17874762cd7296bb2c2893934516
+MISC ChangeLog 2645 SHA256 39933bd90f543ae142e8c232320267c8fee7c960571f1c6251e6abf7f1483fcc SHA512 3dc85257fdfc7e0867b5c7ef4c1d72de23176ecef8d95c8049688043c158947e65b9eb9ee5908db168862678e483f38144ec3059902726cb54e542ef87f0cdde WHIRLPOOL aa4b9e5b651a8dab6598f1e0a5709f4dd7c2b1a3f2cefbdd6857b7eb7149471bad100592aecee170c29781882d9b55c9e64319d8be46ed202a4b8c5b9a88a602
 MISC metadata.xml 158 SHA256 21247a564394680460e294ac138a92903d91b5cafee5cafc38a50656caf965e2 SHA512 1095f62f09baf2c54d8b48f022e8364f73feaa99df7443e770f70e8dd22705ccaaa3f71a946c223c6f1903d0387dfc84693b4f4e3976f65423474221b0b4ac90 WHIRLPOOL 04e0de42ec7067178deb39fc7963229c529b500130ad2757288bc6a2b9e8275fa3e417e7ca290b4cd883d052dffd829aeb4509053e31c38e30bcf8e28270ce3f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT3iZ5AAoJEEdUh39IaPFNmtUH/inkl5oTJurboGThxyhiie2o
-xhUfzqTl15s1USGtiiCm786neNF2R6OS353CZQtFgJrY6moOi85m5n+L0hiukCZC
-ZFDhuU52O+j8maDejTs0YToZjCgrBzpoRI8tmzhQKesyJD+oaNuLoWJcOb6nG+n/
-bmItfGyWIVyHChH1pUvAZuvBGRFl14LMmzUVIvczQYrWd6TGsZb/S2wkDbi4iuLc
-vAQFTHN5axDHNf/5JFZFdoQ3Vj+tYyCh4ksrspk+MMF2qTdpYUQQuW8acyDyjzeE
-h8JjUBWdaevc1xed/ka3po1MMSmTWNB/6ds7SNNPzxTzVeMTzgfaIOUnS1OJhjk=
-=GKmY
+iQEcBAEBCAAGBQJT3iaZAAoJEEdUh39IaPFNx2gH/j+4wXx0fB2G0ZzTSKTL1HdE
+bS4MbVAXXhCMTuMUcmLg7dG+w+MOEyjFdKOnjAdUC6hgebs6Bzsi7oOS+V+25aTE
+RyDS4pAjg8sbJSHAendE6FcobmoYFBkINWrazAUt2xd1aLG1sUU2HpnIdy6IoBCb
+Wh0V3ZsnxHhiFdZSHdjYTdVoGyN1MW2m1TvuF4Yb6w1X2KxeMtgo+BSC0XfCWMSu
+UK3Iel2Z3WYd/8FM0n5Y5Y0DjdbF6nn6dOSI0RWpwj98EuPgM36z9ygAguEIIZLw
+Ks8p4mIzq2Ylrsh+KcQoB8EIerWKpH+iGhklCNMvmSMW5OMMdyTWcyBbLsbxwBA=
+=Fgy0
 -----END PGP SIGNATURE-----
diff --git a/app-pda/ifuse/files/ifuse-1.1.2-libimobiledevice115.patch b/app-pda/ifuse/files/ifuse-1.1.2-libimobiledevice115.patch
deleted file mode 100644
index 8d74cf88f869..000000000000
--- a/app-pda/ifuse/files/ifuse-1.1.2-libimobiledevice115.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 9ac32aa3cb2ed5242c0fe3c58ef5f571bf2b95d7 Mon Sep 17 00:00:00 2001
-From: Nikias Bassen
-Date: Sun, 24 Mar 2013 01:45:23 +0000
-Subject: Updated for libimobiledevice >= 1.1.5
-
----
-diff --git a/configure.ac b/configure.ac
-index 85d131a..ca518ff 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -17,6 +17,10 @@ PKG_CHECK_MODULES(libimobiledevice11, libimobiledevice-1.0 >= 1.1.0, libimobiled
- if test x"$libimobiledevice_1_1" = xyes; then
-   AC_DEFINE([HAVE_LIBIMOBILEDEVICE_1_1], 1, [Define if libimobiledevice is using 1.1.0 API])
- fi
-+PKG_CHECK_MODULES(libimobiledevice11, libimobiledevice-1.0 >= 1.1.5, libimobiledevice_1_1_5=yes, libimobiledevice_1_1_5=no)
-+if test x"$libimobiledevice_1_1_5" = xyes; then
-+  AC_DEFINE([HAVE_LIBIMOBILEDEVICE_1_1_5], 1, [Define if libimobiledevice is using 1.1.5 API])
-+fi
- libimobiledevice_VERSION=`$PKG_CONFIG --modversion "libimobiledevice-1.0" 2>&1`
- PKG_CHECK_MODULES(libfuse, fuse >= 2.7.0)
- PKG_CHECK_MODULES(libplist, libplist)
-diff --git a/src/ifuse.c b/src/ifuse.c
-index b5735ee..9fafb47 100644
---- a/src/ifuse.c
-+++ b/src/ifuse.c
-@@ -71,7 +71,11 @@ static struct {
- 	char *appid;
- #endif
- 	char *service_name;
-+#ifdef HAVE_LIBIMOBILEDEVICE_1_1_5
-+	lockdownd_service_descriptor_t service;
-+#else
- 	uint16_t port;
-+#endif
- } opts;
- 
- enum {
-@@ -402,7 +406,11 @@ void *ifuse_init(struct fuse_conn_info *conn)
- 		afc_client_new_from_house_arrest_client(house_arrest, &afc);
- 	} else { 
- #endif
-+#ifdef HAVE_LIBIMOBILEDEVICE_1_1_5
-+		afc_client_new(phone, opts.service, &afc);
-+#else
- 		afc_client_new(phone, opts.port, &afc);
-+#endif
- #ifdef HAVE_LIBIMOBILEDEVICE_1_1
- 	}
- #endif
-@@ -744,7 +752,13 @@ int main(int argc, char *argv[])
- 		return EXIT_FAILURE;
- 	}
- 
--	if ((lockdownd_start_service(control, opts.service_name, &opts.port) != LOCKDOWN_E_SUCCESS) || !opts.port) {
-+	if (
-+#ifdef HAVE_LIBIMOBILEDEVICE_1_1_5
-+	(lockdownd_start_service(control, opts.service_name, &opts.service) != LOCKDOWN_E_SUCCESS) || !opts.service
-+#else
-+	(lockdownd_start_service(control, opts.service_name, &opts.port) != LOCKDOWN_E_SUCCESS) || !opts.port
-+#endif
-+ 	) {
- 		lockdownd_client_free(control);
- 		idevice_free(phone);
- 		fprintf(stderr, "Failed to start AFC service '%s' on the device.\n", opts.service_name);
-@@ -757,7 +771,11 @@ int main(int argc, char *argv[])
- 
- #ifdef HAVE_LIBIMOBILEDEVICE_1_1
- 	if (!strcmp(opts.service_name, HOUSE_ARREST_SERVICE_NAME)) {
-+#ifdef HAVE_LIBIMOBILEDEVICE_1_1_5
-+		house_arrest_client_new(phone, opts.service, &house_arrest);
-+#else
- 		house_arrest_client_new(phone, opts.port, &house_arrest);
-+#endif
- 		if (!house_arrest) {
- 			fprintf(stderr, "Could not start document sharing service!\n");
- 			return EXIT_FAILURE;
---
-cgit v0.9.1-1-gc6f5
diff --git a/app-pda/ifuse/ifuse-1.1.2-r1.ebuild b/app-pda/ifuse/ifuse-1.1.2-r1.ebuild
deleted file mode 100644
index 6573df184049..000000000000
--- a/app-pda/ifuse/ifuse-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/ifuse/ifuse-1.1.2-r1.ebuild,v 1.3 2014/03/03 23:56:08 pacho Exp $
-
-EAPI=5
-inherit autotools readme.gentoo
-
-DESCRIPTION="Mount Apple iPhone/iPod Touch file systems for backup purposes"
-HOMEPAGE="http://www.libimobiledevice.org/"
-SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=app-pda/libimobiledevice-1.1.4:=
-	>=app-pda/libplist-1.8:=
-	>=sys-fs/fuse-2.7.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS NEWS README"
-
-DOC_CONTENTS="Only use this filesystem driver to create backups of your data.
-The music database is hashed, and attempting to add files will cause the
-iPod/iPhone to consider your database unauthorised.
-It will respond by wiping all media files, requiring a restore through iTunes."
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libimobiledevice115.patch
-	eautoreconf
-}