diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2014-02-09 17:31:54 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2014-02-09 17:31:54 +0000 |
| commit | b2a40141f65acf9615bda14b89e246ba63fd9ee8 (patch) | |
| tree | 23f5f4b8bd74ad36d93255f8bbb4db6bd4871ae3 /app-mobilephone | |
| parent | Stable for amd64 wrt bug #499312 (diff) | |
| download | gentoo-2-b2a40141f65acf9615bda14b89e246ba63fd9ee8.tar.gz gentoo-2-b2a40141f65acf9615bda14b89e246ba63fd9ee8.tar.bz2 gentoo-2-b2a40141f65acf9615bda14b89e246ba63fd9ee8.zip | |
Depend on libusb or libusbx, bug 500764 by Jerome Venturi.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'app-mobilephone')
| -rw-r--r-- | app-mobilephone/heimdall/ChangeLog | 6 | ||||
| -rw-r--r-- | app-mobilephone/heimdall/heimdall-1.4.0.ebuild | 4 | ||||
| -rw-r--r-- | app-mobilephone/heimdall/heimdall-9999.ebuild | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/app-mobilephone/heimdall/ChangeLog b/app-mobilephone/heimdall/ChangeLog index e77e9b606945..7e733dc4c25e 100644 --- a/app-mobilephone/heimdall/ChangeLog +++ b/app-mobilephone/heimdall/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-mobilephone/heimdall # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/heimdall/ChangeLog,v 1.3 2014/01/02 15:29:22 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/heimdall/ChangeLog,v 1.4 2014/02/09 17:31:54 floppym Exp $ + + 09 Feb 2014; Mike Gilbert <floppym@gentoo.org> heimdall-1.4.0.ebuild, + heimdall-9999.ebuild: + Depend on libusb or libusbx, bug 500764 by Jerome Venturi. 02 Jan 2014; Mike Gilbert <floppym@gentoo.org> heimdall-1.4.0.ebuild, heimdall-9999.ebuild: diff --git a/app-mobilephone/heimdall/heimdall-1.4.0.ebuild b/app-mobilephone/heimdall/heimdall-1.4.0.ebuild index 1c87fc1a8611..e8436fea609d 100644 --- a/app-mobilephone/heimdall/heimdall-1.4.0.ebuild +++ b/app-mobilephone/heimdall/heimdall-1.4.0.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-mobilephone/heimdall/heimdall-1.4.0.ebuild,v 1.2 2014/01/02 15:24:25 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/heimdall/heimdall-1.4.0.ebuild,v 1.3 2014/02/09 17:31:54 floppym Exp $ EAPI=5 @@ -24,7 +24,7 @@ SLOT="0" IUSE="qt4" # Fails to build with dev-libs/libusb due to missing macros. -RDEPEND="dev-libs/libusbx:1= +RDEPEND="|| ( >=dev-libs/libusb-1.0.18:1= dev-libs/libusbx:1= ) qt4? ( dev-qt/qtcore:4= dev-qt/qtgui:4= )" DEPEND="${RDEPEND} virtual/pkgconfig" diff --git a/app-mobilephone/heimdall/heimdall-9999.ebuild b/app-mobilephone/heimdall/heimdall-9999.ebuild index 9406ec779e95..a34dcf93a4fc 100644 --- a/app-mobilephone/heimdall/heimdall-9999.ebuild +++ b/app-mobilephone/heimdall/heimdall-9999.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-mobilephone/heimdall/heimdall-9999.ebuild,v 1.2 2014/01/02 15:24:25 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/heimdall/heimdall-9999.ebuild,v 1.3 2014/02/09 17:31:54 floppym Exp $ EAPI=5 @@ -24,7 +24,7 @@ SLOT="0" IUSE="qt4" # Fails to build with dev-libs/libusb due to missing macros. -RDEPEND="dev-libs/libusbx:1= +RDEPEND="|| ( >=dev-libs/libusb-1.0.18:1= dev-libs/libusbx:1= ) qt4? ( dev-qt/qtcore:4= dev-qt/qtgui:4= )" DEPEND="${RDEPEND} virtual/pkgconfig" |