Dont make use of the deprecated oggvorbis useflag any longer, see #94254. Marked 0.8.3 stable on amd64 and x86.

(Portage version: 2.0.51.22-r1)

4 files changed, 31 insertions, 40 deletions

diff --git a/media-sound/sweep/ChangeLog b/media-sound/sweep/ChangeLog
index 0e3e0826b8f2..5123351a62d0 100644
--- a/media-sound/sweep/ChangeLog
+++ b/media-sound/sweep/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/sweep
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sweep/ChangeLog,v 1.15 2005/05/05 23:59:37 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sweep/ChangeLog,v 1.16 2005/05/28 16:20:33 luckyduck Exp $
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org> sweep-0.8.2-r1.ebuild,
+  sweep-0.8.3.ebuild:
+  Dont make use of the deprecated oggvorbis useflag any longer, see #94254.
+  Marked 0.8.3 stable on amd64 and x86.
 
   05 May 2005; Sven Wegener <swegener@gentoo.org> sweep-0.8.2-r1.ebuild,
   sweep-0.8.3.ebuild:
diff --git a/media-sound/sweep/Manifest b/media-sound/sweep/Manifest
index bc8c1495bc73..ff537cb86323 100644
--- a/media-sound/sweep/Manifest
+++ b/media-sound/sweep/Manifest
@@ -1,7 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0aa19d47a4d2a67db786e37d4477205a sweep-0.8.3.ebuild 1329
+MD5 3769684531dcb2a0c9a48edcb67c8406 sweep-0.8.3.ebuild 1257
 MD5 14cf75e51957ee756843b1761b006dad sweep-0.8.2-r1.ebuild 1329
 MD5 9deeb4304ea33aa74de5d3180704f892 ChangeLog 1962
 MD5 527dcfe3ce0f0b53c6b6aa8b82eb930c metadata.xml 252
@@ -9,10 +6,3 @@ MD5 b161c4813423e2a3c7a1b76b1a59527f files/sweep-0.8.2-alsa.patch 383
 MD5 fa303e73e349b9c125d053c768fccf74 files/digest-sweep-0.8.2-r1 63
 MD5 b161c4813423e2a3c7a1b76b1a59527f files/sweep-0.8.3-alsa.patch 383
 MD5 3eebc576fe853140f8aaf1ca03443223 files/digest-sweep-0.8.3 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCerNxI1lqEGTUzyQRAiAIAKDfCmowRhKhptDm74oy8wyCnPTlLgCgtOCh
-jWFiXzKYkNoEZP6LHs6c02o=
-=BV24
------END PGP SIGNATURE-----
diff --git a/media-sound/sweep/sweep-0.8.2-r1.ebuild b/media-sound/sweep/sweep-0.8.2-r1.ebuild
index ca204a73f213..bba577ae7a25 100644
--- a/media-sound/sweep/sweep-0.8.2-r1.ebuild
+++ b/media-sound/sweep/sweep-0.8.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sweep/sweep-0.8.2-r1.ebuild,v 1.13 2005/05/05 23:59:37 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sweep/sweep-0.8.2-r1.ebuild,v 1.14 2005/05/28 16:20:33 luckyduck Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.metadecks.org/software/sweep/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc sparc ~alpha amd64"
-IUSE="oggvorbis alsa nls"
+IUSE="vorbis alsa nls"
 
 DEPEND=">=media-libs/libsndfile-1.0
 		>=x11-libs/gtk+-1.2
@@ -19,7 +19,7 @@ DEPEND=">=media-libs/libsndfile-1.0
 		dev-libs/tdb
 		media-libs/libsamplerate
 		media-libs/speex
-		oggvorbis? ( media-libs/libogg media-libs/libvorbis )
+		vorbis? ( media-libs/libogg media-libs/libvorbis )
 		alsa? ( media-libs/alsa-lib )
 		nls? ( sys-devel/gettext )"
 
@@ -35,7 +35,7 @@ src_compile() {
 
 	# --enable-experimental       Add to myconf if you want this stuff 
 
-	use oggvorbis || myconf="${myconf} --disable-oggvorbis"
+	use vorbis || myconf="${myconf} --disable-oggvorbis"
 	use alsa && myconf="${myconf} --enable-alsa"
 	use nls  || myconf="${myconf} --disable-nls"
 
diff --git a/media-sound/sweep/sweep-0.8.3.ebuild b/media-sound/sweep/sweep-0.8.3.ebuild
index ec680c3662d9..c7409cf25455 100644
--- a/media-sound/sweep/sweep-0.8.3.ebuild
+++ b/media-sound/sweep/sweep-0.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sweep/sweep-0.8.3.ebuild,v 1.2 2005/05/05 23:59:37 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sweep/sweep-0.8.3.ebuild,v 1.3 2005/05/28 16:20:33 luckyduck Exp $
 
 inherit eutils
 
@@ -10,18 +10,18 @@ SRC_URI="http://www.metadecks.org/software/sweep/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
-IUSE="oggvorbis alsa nls"
-
-DEPEND=">=media-libs/libsndfile-1.0
-		>=x11-libs/gtk+-1.2
-		>=media-sound/madplay-0.14.2b
-		dev-libs/tdb
-		media-libs/libsamplerate
-		media-libs/speex
-		oggvorbis? ( media-libs/libogg media-libs/libvorbis )
-		alsa? ( media-libs/alsa-lib )
-		nls? ( sys-devel/gettext )"
+KEYWORDS="x86 ~ppc ~sparc ~alpha amd64"
+IUSE="alsa nls vorbis"
+
+DEPEND="dev-libs/tdb
+	media-libs/libsamplerate
+	>=media-libs/libsndfile-1.0
+	media-libs/speex
+	>=media-sound/madplay-0.14.2b
+	>=x11-libs/gtk+-1.2
+	alsa? ( media-libs/alsa-lib )
+	nls? ( sys-devel/gettext )
+	vorbis? ( media-libs/libogg media-libs/libvorbis )"
 
 src_unpack() {
 	unpack ${A}
@@ -30,21 +30,17 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf
-	myconf=""
+	econf \
+		$(use_enable alsa) \
+		$(use_enable nls) \
+		$(use_enable vorbis oggvorbis) \
+		|| die "econf failed"
 
-	# --enable-experimental       Add to myconf if you want this stuff 
-
-	use oggvorbis || myconf="${myconf} --disable-oggvorbis"
-	use alsa && myconf="${myconf} --enable-alsa"
-	use nls  || myconf="${myconf} --disable-nls"
-
-	econf ${myconf} || die "econf failed"
-	emake
+	emake || die "make failed"
 }
 
 src_install() {
-	einstall
+	einstall || die "make install failed"
 }
 
 pkg_postinst() {