diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2014-05-30 11:33:13 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-05-30 11:33:13 +0000 |
| commit | 0a5118b073362fe34ed9e47285c02d3c323e915b (patch) | |
| tree | d5f8408609abf749eadbf434f193f90d07df5c8e | |
| parent | Semi-initial commit (diff) | |
| download | gentoo-2-0a5118b073362fe34ed9e47285c02d3c323e915b.tar.gz gentoo-2-0a5118b073362fe34ed9e47285c02d3c323e915b.tar.bz2 gentoo-2-0a5118b073362fe34ed9e47285c02d3c323e915b.zip | |
Pull in libusbmuxd instead of usbmuxd wrt #505576
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
| -rw-r--r-- | app-pda/libimobiledevice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-pda/libimobiledevice/libimobiledevice-1.1.6.ebuild | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/app-pda/libimobiledevice/ChangeLog b/app-pda/libimobiledevice/ChangeLog index 9a67ed64e7f1..5ff44e318543 100644 --- a/app-pda/libimobiledevice/ChangeLog +++ b/app-pda/libimobiledevice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-pda/libimobiledevice # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/ChangeLog,v 1.52 2014/04/06 09:11:48 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/ChangeLog,v 1.53 2014/05/30 11:33:13 ssuominen Exp $ + + 30 May 2014; Samuli Suominen <ssuominen@gentoo.org> + libimobiledevice-1.1.6.ebuild: + Pull in libusbmuxd instead of usbmuxd wrt #505576 06 Apr 2014; Samuli Suominen <ssuominen@gentoo.org> libimobiledevice-1.1.6.ebuild: diff --git a/app-pda/libimobiledevice/libimobiledevice-1.1.6.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.1.6.ebuild index ea48c844fb84..b6c743b3df67 100644 --- a/app-pda/libimobiledevice/libimobiledevice-1.1.6.ebuild +++ b/app-pda/libimobiledevice/libimobiledevice-1.1.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/libimobiledevice-1.1.6.ebuild,v 1.2 2014/04/06 09:11:48 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/libimobiledevice-1.1.6.ebuild,v 1.3 2014/05/30 11:33:13 ssuominen Exp $ EAPI=5 PYTHON_COMPAT=( python{2_7,3_2,3_3} ) @@ -17,8 +17,9 @@ SLOT="0/4" # based on SONAME of libimobiledevice.so KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" IUSE="gnutls python static-libs" +# Drop || ( ) and =app-pda/usbmuxd-1.0.9 with next release like 1.1.7, temporary hack RDEPEND=">=app-pda/libplist-1.11:=[python?,${PYTHON_USEDEP}] - >=app-pda/usbmuxd-1.0.9:= + || ( >=app-pda/libusbmuxd-1.0.9:= =app-pda/usbmuxd-1.0.9 ) gnutls? ( dev-libs/libgcrypt:0 >=dev-libs/libtasn1-1.1 |