summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-04-03 04:35:14 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-04-03 04:35:14 +0000
commitd9f4f355c1b73b7b054333ba42bac7133559b8c2 (patch)
tree50677ccf5c7b9301cdcff880c3db6870e1540a74 /app-pda/libimobiledevice
parentVersion bump. (diff)
downloadgentoo-2-d9f4f355c1b73b7b054333ba42bac7133559b8c2.tar.gz
gentoo-2-d9f4f355c1b73b7b054333ba42bac7133559b8c2.tar.bz2
gentoo-2-d9f4f355c1b73b7b054333ba42bac7133559b8c2.zip
Pull in correct version of libplist for people mixing arch with ~arch.
(Portage version: 2.2.0_alpha96/cvs/Linux x86_64)
Diffstat (limited to 'app-pda/libimobiledevice')
-rw-r--r--app-pda/libimobiledevice/ChangeLog6
-rw-r--r--app-pda/libimobiledevice/libimobiledevice-1.1.1.ebuild7
2 files changed, 9 insertions, 4 deletions
diff --git a/app-pda/libimobiledevice/ChangeLog b/app-pda/libimobiledevice/ChangeLog
index aee82dee518b..3e03c6cf8923 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.23 2012/03/31 15:35:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/ChangeLog,v 1.24 2012/04/03 04:35:14 ssuominen Exp $
+
+ 03 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
+ libimobiledevice-1.1.1.ebuild:
+ Pull in correct version of libplist for people mixing arch with ~arch.
*libimobiledevice-1.1.2 (31 Mar 2012)
diff --git a/app-pda/libimobiledevice/libimobiledevice-1.1.1.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.1.1.ebuild
index e3f647ef6b19..e89c1519eeb5 100644
--- a/app-pda/libimobiledevice/libimobiledevice-1.1.1.ebuild
+++ b/app-pda/libimobiledevice/libimobiledevice-1.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.1.ebuild,v 1.5 2011/11/13 11:37:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/libimobiledevice-1.1.1.ebuild,v 1.6 2012/04/03 04:35:14 ssuominen Exp $
EAPI=3
PYTHON_DEPEND="python? 2:2.6"
@@ -16,7 +16,8 @@ SLOT="0"
KEYWORDS="amd64 ~ppc64 x86"
IUSE="python static-libs"
-RDEPEND=">=app-pda/libplist-1.4[python?]
+RDEPEND=">=app-pda/libplist-1.4
+ python? ( =app-pda/libplist-1.8[python] )
>=app-pda/usbmuxd-0.1.4
>=dev-libs/glib-2.28.6
dev-libs/libgcrypt