| 1 |
drac 08/02/01 20:30:21 |
| 2 |
|
| 3 |
Modified: tagtool-0.12.3.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
If both USE flags are disabled, enable vorbis so emerge doesn't stop wrt #205593. |
| 6 |
(Portage version: 2.1.4.1) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.7 media-sound/tagtool/tagtool-0.12.3.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/tagtool/tagtool-0.12.3.ebuild?rev=1.7&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/tagtool/tagtool-0.12.3.ebuild?rev=1.7&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/tagtool/tagtool-0.12.3.ebuild?r1=1.6&r2=1.7 |
| 14 |
|
| 15 |
Index: tagtool-0.12.3.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/tagtool/tagtool-0.12.3.ebuild,v |
| 18 |
retrieving revision 1.6 |
| 19 |
retrieving revision 1.7 |
| 20 |
diff -u -r1.6 -r1.7 |
| 21 |
--- tagtool-0.12.3.ebuild 28 Nov 2007 20:45:05 -0000 1.6 |
| 22 |
+++ tagtool-0.12.3.ebuild 1 Feb 2008 20:30:20 -0000 1.7 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
-# Copyright 1999-2007 Gentoo Foundation |
| 25 |
+# Copyright 1999-2008 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tagtool/tagtool-0.12.3.ebuild,v 1.6 2007/11/28 20:45:05 armin76 Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tagtool/tagtool-0.12.3.ebuild,v 1.7 2008/02/01 20:30:20 drac Exp $ |
| 29 |
|
| 30 |
DESCRIPTION="Audio Tag Tool Ogg/Mp3 Tagger" |
| 31 |
HOMEPAGE="http://pwp.netcabo.pt/paol/tagtool" |
| 32 |
@@ -11,39 +11,32 @@ |
| 33 |
KEYWORDS="amd64 ppc sparc x86" |
| 34 |
IUSE="vorbis mp3" |
| 35 |
|
| 36 |
-DEPEND=">=x11-libs/gtk+-2.4 |
| 37 |
+RDEPEND=">=x11-libs/gtk+-2 |
| 38 |
>=gnome-base/libglade-2.6 |
| 39 |
- dev-util/pkgconfig |
| 40 |
- mp3? ( >=media-libs/id3lib-3.8.3-r3 ) |
| 41 |
- vorbis? ( >=media-libs/libvorbis-1 )" |
| 42 |
+ mp3? ( >=media-libs/id3lib-3.8.3-r6 ) |
| 43 |
+ vorbis? ( >=media-libs/libvorbis-1 ) |
| 44 |
+ !mp3? ( !vorbis? ( >=media-libs/libvorbis-1 ) )" |
| 45 |
+DEPEND="${RDEPEND} |
| 46 |
+ dev-util/pkgconfig" |
| 47 |
|
| 48 |
src_compile() { |
| 49 |
local myconf |
| 50 |
- myconf="" |
| 51 |
|
| 52 |
- # Stupid configure thinks --enable-{mp3,vorbis} disables it. |
| 53 |
- # add some configure logic to prevent a dying ebuild |
| 54 |
- if use !mp3 && use !vorbis |
| 55 |
- then |
| 56 |
- ewarn "Vorbis or mp3 must be selected." |
| 57 |
- ewarn "Defaulting to mp3, please cancel this emerge" |
| 58 |
- ewarn "if you do not want mp3 support." |
| 59 |
- myconf="--disable-vorbis" |
| 60 |
- else |
| 61 |
- use mp3 || myconf="${myconf} --disable-mp3" |
| 62 |
- use vorbis || myconf="${myconf} --disable-vorbis" |
| 63 |
- fi |
| 64 |
+ use mp3 || myconf="${myconf} --disable-mp3" |
| 65 |
+ use vorbis || myconf="${myconf} --disable-vorbis" |
| 66 |
|
| 67 |
- econf ${myconf} || die "econf failed." |
| 68 |
- emake || die "make failed." |
| 69 |
+ if use ! mp3 && ! use vorbis; then |
| 70 |
+ einfo "One of USE flags is required, enabling vorbis for you." |
| 71 |
+ myconf="--disable-mp3" |
| 72 |
+ fi |
| 73 |
+ |
| 74 |
+ econf ${myconf} |
| 75 |
+ emake || die "emake failed." |
| 76 |
} |
| 77 |
|
| 78 |
src_install() { |
| 79 |
- make install \ |
| 80 |
- DESTDIR="${D}" \ |
| 81 |
+ emake DESTDIR="${D}" GNOME_SYSCONFDIR="${D}/etc" \ |
| 82 |
sysdir="${D}/usr/share/applets/Multimedia" \ |
| 83 |
- GNOME_SYSCONFDIR="${D}/etc" \ |
| 84 |
- || die "make install failed." |
| 85 |
- |
| 86 |
+ install || die "emake install failed." |
| 87 |
dodoc ChangeLog NEWS README TODO THANKS |
| 88 |
} |
| 89 |
|
| 90 |
|
| 91 |
|
| 92 |
1.27 media-sound/tagtool/ChangeLog |
| 93 |
|
| 94 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/tagtool/ChangeLog?rev=1.27&view=markup |
| 95 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/tagtool/ChangeLog?rev=1.27&content-type=text/plain |
| 96 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/tagtool/ChangeLog?r1=1.26&r2=1.27 |
| 97 |
|
| 98 |
Index: ChangeLog |
| 99 |
=================================================================== |
| 100 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/tagtool/ChangeLog,v |
| 101 |
retrieving revision 1.26 |
| 102 |
retrieving revision 1.27 |
| 103 |
diff -u -r1.26 -r1.27 |
| 104 |
--- ChangeLog 14 Dec 2007 06:56:28 -0000 1.26 |
| 105 |
+++ ChangeLog 1 Feb 2008 20:30:20 -0000 1.27 |
| 106 |
@@ -1,6 +1,10 @@ |
| 107 |
# ChangeLog for media-sound/tagtool |
| 108 |
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 109 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tagtool/ChangeLog,v 1.26 2007/12/14 06:56:28 opfer Exp $ |
| 110 |
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 111 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tagtool/ChangeLog,v 1.27 2008/02/01 20:30:20 drac Exp $ |
| 112 |
+ |
| 113 |
+ 01 Feb 2008; Samuli Suominen <drac@g.o> tagtool-0.12.3.ebuild: |
| 114 |
+ If both USE flags are disabled, enable vorbis so emerge doesn't stop wrt |
| 115 |
+ #205593. |
| 116 |
|
| 117 |
14 Dec 2007; Christian Faulhammer <opfer@g.o> |
| 118 |
-files/tagtool-gmodule.patch, -tagtool-0.11.1.ebuild, |
| 119 |
|
| 120 |
|
| 121 |
|
| 122 |
-- |
| 123 |
gentoo-commits@l.g.o mailing list |
Archives