2.0 requires ogg now. Bug #47034.

4 files changed, 16 insertions, 30 deletions

diff --git a/net-misc/ices/ChangeLog b/net-misc/ices/ChangeLog
index 65c7c701bdf1..92af21940cdc 100644
--- a/net-misc/ices/ChangeLog
+++ b/net-misc/ices/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/ices
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ices/ChangeLog,v 1.8 2004/03/26 21:47:41 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ices/ChangeLog,v 1.9 2004/04/07 07:46:09 eradicator Exp $
+
+  07 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> ices-2.0.0.ebuild,
+  ices-2.0_beta4.ebuild:
+  2.0 requires ogg now.  Bug #47034.
 
   26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> ices-0.2.3.ebuild:
   Made aliz's QA script happy.
diff --git a/net-misc/ices/Manifest b/net-misc/ices/Manifest
index c7cac4b4ef9a..eb624d32dc2a 100644
--- a/net-misc/ices/Manifest
+++ b/net-misc/ices/Manifest
@@ -1,8 +1,8 @@
-MD5 1e58b741b7b65d4014664e2a638ea6b1 ices-2.0.0.ebuild 1459
+MD5 9c1d5b127f04e1c22cea9951250d6124 ices-2.0.0.ebuild 1283
 MD5 01c4780ec7b4a80bd3606ad5255aa2e0 ices-0.2.3.ebuild 1094
 MD5 a22a95d1927da153b21f0588d0e8167e ices-0.3.ebuild 1107
-MD5 4580606e800b636a1a0454968093ff77 ices-2.0_beta4.ebuild 1475
-MD5 30266b1c5441479594f1de291bdafc3d ChangeLog 1318
+MD5 4a58f76e39ddf42a75db6b99c26ed2fb ices-2.0_beta4.ebuild 1321
+MD5 70a9e08e7b9531548a3f6fcd78279d09 ChangeLog 1457
 MD5 05ab4d4775083f0930841e415df18ad6 metadata.xml 160
 MD5 7b90256f350052b7ec4122e85edd0758 files/docdir.diff 3909
 MD5 d966b9c189c4f85caca6ec95e1f9b96d files/digest-ices-0.3 60
diff --git a/net-misc/ices/ices-2.0.0.ebuild b/net-misc/ices/ices-2.0.0.ebuild
index 75e5116ffbaa..a4da706ea21f 100644
--- a/net-misc/ices/ices-2.0.0.ebuild
+++ b/net-misc/ices/ices-2.0.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ices/ices-2.0.0.ebuild,v 1.1 2004/03/17 04:22:09 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ices/ices-2.0.0.ebuild,v 1.2 2004/04/07 07:46:09 eradicator Exp $
 
-IUSE="oggvorbis"
+IUSE=""
 
 DESCRIPTION="icecast MP3 streaming client. supports on the fly re-encoding"
 SRC_URI="http://www.icecast.org/files/${P}.tar.gz"
@@ -15,21 +15,11 @@ KEYWORDS="~x86 ~sparc ~amd64"
 DEPEND="dev-libs/libxml2
 	dev-util/pkgconfig
 	>=media-libs/libshout-2.0
-	oggvorbis? ( >=media-libs/libogg-1.0
-		>=media-libs/libvorbis-1.0 )"
-
-S=${WORKDIR}/${P}
+	>=media-libs/libvorbis-1.0"
 
 src_compile ()
 {
-	local myconf=""
-
-	use oggvorbis || \
-		myconf="${myconf} --with-vorbis=no --with-ogg=no"
-
-	econf \
-		--sysconfdir=/etc/ices2 \
-		${myconf} || die "configure failed"
+	econf --sysconfdir=/etc/ices2 || die "configure failed"
 
 	emake || die "make failed"
 }
diff --git a/net-misc/ices/ices-2.0_beta4.ebuild b/net-misc/ices/ices-2.0_beta4.ebuild
index fc2bf902ecd1..de2a8ee5b08e 100644
--- a/net-misc/ices/ices-2.0_beta4.ebuild
+++ b/net-misc/ices/ices-2.0_beta4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ices/ices-2.0_beta4.ebuild,v 1.1 2004/01/21 06:32:07 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ices/ices-2.0_beta4.ebuild,v 1.2 2004/04/07 07:46:09 eradicator Exp $
 
-IUSE="oggvorbis"
+IUSE=""
 
 DESCRIPTION="icecast MP3 streaming client. supports on the fly re-encoding"
 SRC_URI="http://www.icecast.org/files/${PN}-2.0-Beta4.tar.gz"
@@ -15,21 +15,13 @@ KEYWORDS="~x86 ~sparc"
 DEPEND="dev-libs/libxml2
 	dev-util/pkgconfig
 	>=media-libs/libshout-2.0
-	oggvorbis? ( >=media-libs/libogg-1.0
-		>=media-libs/libvorbis-1.0 )"
+	>=media-libs/libvorbis-1.0"
 
 S=${WORKDIR}/${PN}-2.0-Beta4
 
 src_compile ()
 {
-	local myconf=""
-
-	use oggvorbis || \
-		myconf="${myconf} --with-vorbis=no --with-ogg=no"
-
-	econf \
-		--sysconfdir=/etc/ices2 \
-		${myconf} || die "configure failed"
+	econf --sysconfdir=/etc/ices2 || die "configure failed"
 
 	emake || die "make failed"
 }