diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2014-05-30 18:37:31 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-05-30 18:37:31 +0000 |
commit | 6d1e087d9b4fb7d2f62a709e4d39041999085fc9 (patch) | |
tree | dfacaeba2a38414a6c9cd3009025b2b924111bb8 | |
parent | Version bump. (diff) | |
download | gentoo-2-6d1e087d9b4fb7d2f62a709e4d39041999085fc9.tar.gz gentoo-2-6d1e087d9b4fb7d2f62a709e4d39041999085fc9.tar.bz2 gentoo-2-6d1e087d9b4fb7d2f62a709e4d39041999085fc9.zip |
Remove now useless || ( ) hack that allowed usbmuxd instead of libusbmuxd before the package was moved over.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
-rw-r--r-- | app-pda/libimobiledevice/ChangeLog | 7 | ||||
-rw-r--r-- | app-pda/libimobiledevice/libimobiledevice-1.1.6.ebuild | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/app-pda/libimobiledevice/ChangeLog b/app-pda/libimobiledevice/ChangeLog index 5ff44e318543..eabdcefffc8a 100644 --- a/app-pda/libimobiledevice/ChangeLog +++ b/app-pda/libimobiledevice/ChangeLog @@ -1,6 +1,11 @@ # 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.53 2014/05/30 11:33:13 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/ChangeLog,v 1.54 2014/05/30 18:37:31 ssuominen Exp $ + + 30 May 2014; Samuli Suominen <ssuominen@gentoo.org> + libimobiledevice-1.1.6.ebuild: + Remove now useless || ( ) hack that allowed usbmuxd instead of libusbmuxd + before the package was moved over. 30 May 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 b6c743b3df67..6b157be0b04a 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.3 2014/05/30 11:33:13 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/libimobiledevice-1.1.6.ebuild,v 1.4 2014/05/30 18:37:31 ssuominen Exp $ EAPI=5 PYTHON_COMPAT=( python{2_7,3_2,3_3} ) @@ -17,9 +17,8 @@ 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/libusbmuxd-1.0.9:= =app-pda/usbmuxd-1.0.9 ) + >=app-pda/libusbmuxd-1.0.9:= gnutls? ( dev-libs/libgcrypt:0 >=dev-libs/libtasn1-1.1 |