Fixed USE flags. Stable in x86.

5 files changed, 22 insertions, 50 deletions

diff --git a/media-sound/cantus/ChangeLog b/media-sound/cantus/ChangeLog
index 1a0bd68a3b1f..76c891429194 100644
--- a/media-sound/cantus/ChangeLog
+++ b/media-sound/cantus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/cantus
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cantus/ChangeLog,v 1.5 2003/10/28 11:05:25 hanno Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cantus/ChangeLog,v 1.6 2004/03/27 02:37:39 eradicator Exp $
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> cantus-1.0.3.ebuild,
+  cantus-1.07.ebuild, cantus-1.99.9.ebuild:
+  Fixed USE flags.  Stable in x86.
 
 *cantus-1.99.9 (28 Oct 2003)
 
diff --git a/media-sound/cantus/cantus-1.0.3.ebuild b/media-sound/cantus/cantus-1.0.3.ebuild
deleted file mode 100644
index a712425ff519..000000000000
--- a/media-sound/cantus/cantus-1.0.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cantus/cantus-1.0.3.ebuild,v 1.7 2004/03/01 05:37:12 eradicator Exp $
-
-DESCRIPTION="easy to use tool for tagging and renaming MP3 and OGG/Vorbis files"
-HOMEPAGE="http://software.manicsadness.com/?site=project&project=1"
-SRC_URI="http://sam.homeunix.com/software.manicsadness.com-step2/releases/cantus/cantus-1.03-1.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="x86"
-
-DEPEND="vorbis? ( media-libs/libvorbis
-		media-libs/libogg )"
-
-S="${WORKDIR}/${PN}-1.03"
-
-src_compile() {
-	econf || die "configure failed"
-	make || die "make failed"
-}
-
-src_install() {
-	einstall || die "Install failed"
-}
diff --git a/media-sound/cantus/cantus-1.07.ebuild b/media-sound/cantus/cantus-1.07.ebuild
index c4df5800094e..df9582425aa2 100644
--- a/media-sound/cantus/cantus-1.07.ebuild
+++ b/media-sound/cantus/cantus-1.07.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cantus/cantus-1.07.ebuild,v 1.6 2004/03/01 05:37:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cantus/cantus-1.07.ebuild,v 1.7 2004/03/27 02:37:39 eradicator Exp $
 
 DESCRIPTION="easy to use tool for tagging and renaming MP3 and OGG/Vorbis files"
 HOMEPAGE="http://software.manicsadness.com/?site=project&project=1"
@@ -8,13 +8,13 @@ SRC_URI="http://sam.homeunix.com/software.manicsadness.com-step3/releases/cantus
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~x86 amd64"
+KEYWORDS="x86 amd64"
+
+IUSE=""
 
 DEPEND="vorbis? ( media-libs/libvorbis
 		media-libs/libogg )"
 
-S="${WORKDIR}/${P}"
-
 src_compile() {
 	econf || die "configure failed"
 	make || die "make failed"
diff --git a/media-sound/cantus/cantus-1.99.9.ebuild b/media-sound/cantus/cantus-1.99.9.ebuild
index 7460a22e84a4..c36cebf8684e 100644
--- a/media-sound/cantus/cantus-1.99.9.ebuild
+++ b/media-sound/cantus/cantus-1.99.9.ebuild
@@ -1,37 +1,31 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cantus/cantus-1.99.9.ebuild,v 1.4 2004/03/01 05:37:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cantus/cantus-1.99.9.ebuild,v 1.5 2004/03/27 02:37:39 eradicator Exp $
 
 DESCRIPTION="Easy to use tool for tagging and renaming MP3 and OGG/Vorbis files"
 HOMEPAGE="http://www.debain.org/?session=&site=project&project=1"
 SRC_URI="http://sam.homeunix.com/software.manicsadness.com-step4/releases/cantus_2/${PN}_2-${PV}-1.tar.gz"
-IUSE="gnome"
+IUSE="oggvorbis"
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~x86 amd64"
+KEYWORDS="x86 amd64"
 
-DEPEND="vorbis? ( media-libs/libvorbis
-		media-libs/libogg )
-		>=x11-libs/gtk+-2.2
-		>=gnome-base/libglade-2.0.1"
-
-RDEPEND="${DEPEND}"
+DEPEND="oggvorbis? ( media-libs/libvorbis media-libs/libogg )
+	>=x11-libs/gtk+-2.2
+	>=gnome-base/libglade-2.0.1"
 
 S="${WORKDIR}/${PN}-2-${PV}"
 
-src_compile() {
-	econf || die
-	emake || die
-}
-
 src_install() {
 	einstall || die
 	rm -rf ${D}/usr/doc
 	dodoc TODO README NEWS INSTALL ChangeLog COPYING AUTHORS ABOUT-NLS
 	insinto /usr/share/pixmaps
 	doins ${FILESDIR}/cantus.png
-	if [ "`use gnome`" ] ; then
-		insinto /usr/share/gnome/apps/Multimedia
-		doins ${FILESDIR}/cantus2.desktop
-	fi
+
+	insinto /usr/share/gnome/apps/Multimedia
+	doins ${FILESDIR}/cantus2.desktop
+
+	insinto /usr/share/applnk/Multimedia
+	doins ${FILESDIR}/cantus2.desktop
 }
diff --git a/media-sound/cantus/files/digest-cantus-1.0.3 b/media-sound/cantus/files/digest-cantus-1.0.3
deleted file mode 100644
index d295bcdea76a..000000000000
--- a/media-sound/cantus/files/digest-cantus-1.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2521035ff0a09287db89d75a1c84bad7 cantus-1.03-1.tar.gz 380323