diff options
| author |   Alastair Tse <liquidx@gentoo.org> | 2003-09-02 23:13:57 +0000 |
|---|---|---|
| committer | Alastair Tse <liquidx@gentoo.org> | 2003-09-02 23:13:57 +0000 |
| commit | 2af36a8898e8329eb768387df412a248dc5cbaa0 (patch) | |
| tree | 3b88173743576754885d8d23d22aa58102025979 /media-libs/libgphoto2 | |
| parent | fix DESCRIPTION (diff) | |
| download | gentoo-2-2af36a8898e8329eb768387df412a248dc5cbaa0.tar.gz gentoo-2-2af36a8898e8329eb768387df412a248dc5cbaa0.tar.bz2 gentoo-2-2af36a8898e8329eb768387df412a248dc5cbaa0.zip | |
fix usbutils conflicting problems
Diffstat (limited to 'media-libs/libgphoto2')
| -rw-r--r-- | media-libs/libgphoto2/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libgphoto2/Manifest | 4 | ||||
| -rw-r--r-- | media-libs/libgphoto2/libgphoto2-2.1.2.ebuild | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog index b0446bc59808..8d3e66367fb1 100644 --- a/media-libs/libgphoto2/ChangeLog +++ b/media-libs/libgphoto2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libgphoto2 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.9 2003/08/28 03:58:49 liquidx Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.10 2003/09/02 23:13:53 liquidx Exp $ + + 03 Sep 2003; Alastair Tse <liquidx@gentoo.org> libgphoto2-2.1.2.ebuild: + added usbutils dep to make sure we get the latest non-conflicting + version with libusb (#25845). *libgphoto2-2.1.2 (28 Aug 2003) diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest index dd00bd3318ec..cd01cff6de3e 100644 --- a/media-libs/libgphoto2/Manifest +++ b/media-libs/libgphoto2/Manifest @@ -1,7 +1,7 @@ -MD5 871504e5a00b7af0a32ba6d095aaa843 ChangeLog 1771 +MD5 496afbf5d51b7132fb33244265d54c6c ChangeLog 1948 MD5 f3bc84b09c705f02e55251e24c3488a9 libgphoto2-2.1.1-r2.ebuild 1398 MD5 192ed79a1946fdb0ae7b8f5bdcff8cbb libgphoto2-2.1.1-r3.ebuild 1968 -MD5 f8d49d6d9db583007babf3b7fb624823 libgphoto2-2.1.2.ebuild 1965 +MD5 e9cc68302e6463363db48fe924465f96 libgphoto2-2.1.2.ebuild 2077 MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217 MD5 6376376d006db7592d2ed520086e03e7 files/digest-libgphoto2-2.1.1-r2 70 MD5 6376376d006db7592d2ed520086e03e7 files/digest-libgphoto2-2.1.1-r3 70 diff --git a/media-libs/libgphoto2/libgphoto2-2.1.2.ebuild b/media-libs/libgphoto2/libgphoto2-2.1.2.ebuild index 41f8605f932b..791e4adc5662 100644 --- a/media-libs/libgphoto2/libgphoto2-2.1.2.ebuild +++ b/media-libs/libgphoto2/libgphoto2-2.1.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.2.ebuild,v 1.1 2003/08/28 03:58:49 liquidx Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.2.ebuild,v 1.2 2003/09/02 23:13:53 liquidx Exp $ inherit libtool @@ -15,7 +15,9 @@ SLOT="0" KEYWORDS="~x86 ~ppc ~sparc" IUSE="nls doc jpeg" +# needs >usbutils-0.11-r2 to avoid /usr/lib/libusb* conflicts with dev-libs/libusb RDEPEND=">=dev-libs/libusb-0.1.6 + >=sys-apps/usbutils-0.11-r2 sys-apps/hotplug jpeg? ( >=media-libs/libexif-0.5.9 )" |