diff options
| author |   Samuli Suominen <drac@gentoo.org> | 2008-02-01 20:30:20 +0000 |
|---|---|---|
| committer | Samuli Suominen <drac@gentoo.org> | 2008-02-01 20:30:20 +0000 |
| commit | 0d1300e2aa388aa67806c438dccc0d8365a4bb06 (patch) | |
| tree | dfe9c20b6007a77fcc382648722f3b3253d8c270 /media-sound | |
| parent | Remove qemu-0.8 series (diff) | |
| download | gentoo-2-0d1300e2aa388aa67806c438dccc0d8365a4bb06.tar.gz gentoo-2-0d1300e2aa388aa67806c438dccc0d8365a4bb06.tar.bz2 gentoo-2-0d1300e2aa388aa67806c438dccc0d8365a4bb06.zip | |
If both USE flags are disabled, enable vorbis so emerge doesn't stop wrt #205593.
(Portage version: 2.1.4.1)
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/tagtool/ChangeLog | 8 | ||||
| -rw-r--r-- | media-sound/tagtool/tagtool-0.12.3.ebuild | 45 |
2 files changed, 25 insertions, 28 deletions
diff --git a/media-sound/tagtool/ChangeLog b/media-sound/tagtool/ChangeLog index 4cf25d1725b8..14aaebe2cdd4 100644 --- a/media-sound/tagtool/ChangeLog +++ b/media-sound/tagtool/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/tagtool -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/tagtool/ChangeLog,v 1.26 2007/12/14 06:56:28 opfer Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/tagtool/ChangeLog,v 1.27 2008/02/01 20:30:20 drac Exp $ + + 01 Feb 2008; Samuli Suominen <drac@gentoo.org> tagtool-0.12.3.ebuild: + If both USE flags are disabled, enable vorbis so emerge doesn't stop wrt + #205593. 14 Dec 2007; Christian Faulhammer <opfer@gentoo.org> -files/tagtool-gmodule.patch, -tagtool-0.11.1.ebuild, diff --git a/media-sound/tagtool/tagtool-0.12.3.ebuild b/media-sound/tagtool/tagtool-0.12.3.ebuild index 8519cafe5f44..a4323af82db8 100644 --- a/media-sound/tagtool/tagtool-0.12.3.ebuild +++ b/media-sound/tagtool/tagtool-0.12.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/tagtool/tagtool-0.12.3.ebuild,v 1.6 2007/11/28 20:45:05 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/tagtool/tagtool-0.12.3.ebuild,v 1.7 2008/02/01 20:30:20 drac Exp $ DESCRIPTION="Audio Tag Tool Ogg/Mp3 Tagger" HOMEPAGE="http://pwp.netcabo.pt/paol/tagtool" @@ -11,39 +11,32 @@ SLOT="0" KEYWORDS="amd64 ppc sparc x86" IUSE="vorbis mp3" -DEPEND=">=x11-libs/gtk+-2.4 +RDEPEND=">=x11-libs/gtk+-2 >=gnome-base/libglade-2.6 - dev-util/pkgconfig - mp3? ( >=media-libs/id3lib-3.8.3-r3 ) - vorbis? ( >=media-libs/libvorbis-1 )" + mp3? ( >=media-libs/id3lib-3.8.3-r6 ) + vorbis? ( >=media-libs/libvorbis-1 ) + !mp3? ( !vorbis? ( >=media-libs/libvorbis-1 ) )" +DEPEND="${RDEPEND} + dev-util/pkgconfig" src_compile() { local myconf - myconf="" - # Stupid configure thinks --enable-{mp3,vorbis} disables it. - # add some configure logic to prevent a dying ebuild - if use !mp3 && use !vorbis - then - ewarn "Vorbis or mp3 must be selected." - ewarn "Defaulting to mp3, please cancel this emerge" - ewarn "if you do not want mp3 support." - myconf="--disable-vorbis" - else - use mp3 || myconf="${myconf} --disable-mp3" - use vorbis || myconf="${myconf} --disable-vorbis" - fi + use mp3 || myconf="${myconf} --disable-mp3" + use vorbis || myconf="${myconf} --disable-vorbis" - econf ${myconf} || die "econf failed." - emake || die "make failed." + if use ! mp3 && ! use vorbis; then + einfo "One of USE flags is required, enabling vorbis for you." + myconf="--disable-mp3" + fi + + econf ${myconf} + emake || die "emake failed." } src_install() { - make install \ - DESTDIR="${D}" \ + emake DESTDIR="${D}" GNOME_SYSCONFDIR="${D}/etc" \ sysdir="${D}/usr/share/applets/Multimedia" \ - GNOME_SYSCONFDIR="${D}/etc" \ - || die "make install failed." - + install || die "emake install failed." dodoc ChangeLog NEWS README TODO THANKS } |