amd64 stable and remove old wrt #217278

Package-Manager: portage-2.1.5_rc6

4 files changed, 13 insertions, 58 deletions

diff --git a/net-misc/ices/ChangeLog b/net-misc/ices/ChangeLog
index ac39c6638d7e..884b378eee5d 100644
--- a/net-misc/ices/ChangeLog
+++ b/net-misc/ices/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/ices
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ices/ChangeLog,v 1.25 2008/02/05 11:08:37 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ices/ChangeLog,v 1.26 2008/04/25 13:57:22 drac Exp $
+
+  25 Apr 2008; Samuli Suominen <drac@gentoo.org> -ices-2.0.0.ebuild,
+  ices-2.0.1-r1.ebuild:
+  amd64 stable and remove old wrt #217278
 
   05 Feb 2008; Markus Rothe <corsair@gentoo.org> ices-2.0.1-r1.ebuild:
   Stable on ppc64
diff --git a/net-misc/ices/Manifest b/net-misc/ices/Manifest
index 7f39794a372f..699bf9e326a3 100644
--- a/net-misc/ices/Manifest
+++ b/net-misc/ices/Manifest
@@ -1,7 +1,5 @@
 AUX ices.initd 327 RMD160 7dfb66005417510711734ece7478bdd7b9888632 SHA1 52e9750b2218e254741f8e94bb3f9de437207910 SHA256 60a8f15b06648deb26fc4779708c4d49691c3843392962decfa9f42440de4fbf
-DIST ices-2.0.0.tar.gz 408155 RMD160 c35f2a229ab40c50ef1775f847d6535b217b1555 SHA1 cd43fc86a0e091883f35fed39f56cec3d3f7db48 SHA256 da9e8acc98f2929b567f50ec021adfcf71db26ce6420062a5a41216f7ab7ff39
 DIST ices-2.0.1.tar.bz2 273805 RMD160 84b1dec5a454244cbd6d3d05cc48839fb006cc69 SHA1 045e8419c494d77162668e8362b3c9ddc4b4974c SHA256 04ec784b5ca6f5a2951631252d61e01c6d16c6fcf17cbe32d702dbe761fc238d
-EBUILD ices-2.0.0.ebuild 1282 RMD160 5c377ad1912cafe1703f9ad6d1a9e7482fb6e189 SHA1 a6c9e8b843c7d2daf12929d1196cf3d9d714c116 SHA256 a1009cf77ca68b3026dd983ac5a9594568c91460b05270e3d2c6de038b675753
-EBUILD ices-2.0.1-r1.ebuild 1112 RMD160 6f3e4a7c8adf99f7ed18b6b6db726911e03f4383 SHA1 8ddac1d8b0d5c65b99bb8e335bf7f5e96cb81892 SHA256 c0b79c23a0e75626940a793dc849b2b46820eb60ebba6e584ff621212bd82f97
-MISC ChangeLog 3076 RMD160 871e76f6796103921fb8342b3e73f6f447c4e689 SHA1 88d34d05aed9d729d15862ab1cfefe25232f4028 SHA256 af24818d18bac9300d11fedef13fa7a36d2bb01cf22cb36f42fb26c13b6859a0
+EBUILD ices-2.0.1-r1.ebuild 1102 RMD160 b7764675bb3989268f928a6aa87677b0da13720f SHA1 2297c23fee060d6ed6e5db65460b4fc89f2aa816 SHA256 b5d496c7657fceed79ff4a5084658c4c2ff7a8384960536cfad8013cb84fef6c
+MISC ChangeLog 3209 RMD160 55a5961e6f977192a3153b5695352ba70a9bd83a SHA1 45a67657e2588ef1bc9bd9374dfc2737d91dcdfe SHA256 c5584f51d0ba2a4506d4d35e33cbb320b7efd80cd25ec1791f9a6c0823582a51
 MISC metadata.xml 160 RMD160 10be84fed28405abd22adc6689e87e5bb77e3501 SHA1 0c1bb16a7cc376ef35b87d8699ec9504718d36b9 SHA256 6bafe4a5c7b42309f124ebc2a9d78ebe5379aec4dcdc88c0bda2ab79c9851a6b
diff --git a/net-misc/ices/ices-2.0.0.ebuild b/net-misc/ices/ices-2.0.0.ebuild
deleted file mode 100644
index 30db9982011c..000000000000
--- a/net-misc/ices/ices-2.0.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# 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.11 2005/02/26 21:54:36 jnc Exp $
-
-IUSE=""
-
-DESCRIPTION="icecast OGG streaming client. supports on the fly re-encoding"
-SRC_URI="http://downloads.xiph.org/releases/ices/${P}.tar.gz"
-HOMEPAGE="http://www.icecast.org/ices.php"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc amd64 ppc64"
-
-DEPEND="dev-libs/libxml2
-	dev-util/pkgconfig
-	>=media-libs/libshout-2.0
-	>=media-libs/libvorbis-1.0"
-
-src_compile ()
-{
-	econf --sysconfdir=/etc/ices2 || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install ()
-{
-	make DESTDIR=${D} install || die "make install failed"
-
-	dodoc AUTHORS README TODO
-
-	# Add the stock configs...
-	dodir /etc/ices2
-	mv ${D}usr/share/ices/ices-live.xml \
-		${D}etc/ices2/ices-live.xml.dist
-	mv ${D}usr/share/ices/ices-playlist.xml \
-		${D}etc/ices2/ices-playlist.xml.dist
-
-	# Move the html to it's proper location...
-	dodir /usr/share/doc/${PN}-2.0_beta4/html
-	mv ${D}usr/share/ices/*.html ${D}usr/share/doc/${PN}-2.0_beta4/html
-	mv ${D}usr/share/ices/style.css ${D}usr/share/doc/${PN}-2.0_beta4/html
-
-	# Nothing is left here after things are moved...
-	rmdir ${D}usr/share/ices
-}
diff --git a/net-misc/ices/ices-2.0.1-r1.ebuild b/net-misc/ices/ices-2.0.1-r1.ebuild
index f6bf0d7e0b5e..5ed19c4955e4 100644
--- a/net-misc/ices/ices-2.0.1-r1.ebuild
+++ b/net-misc/ices/ices-2.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ices/ices-2.0.1-r1.ebuild,v 1.4 2008/02/05 11:08:37 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ices/ices-2.0.1-r1.ebuild,v 1.5 2008/04/25 13:57:22 drac Exp $
 
 inherit eutils
 
@@ -8,14 +8,14 @@ DESCRIPTION="Icecast OGG streaming client, supports on the fly re-encoding."
 HOMEPAGE="http://www.icecast.org/ices.php"
 SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ppc64 sparc x86"
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="dev-libs/libxml2
-	>=media-libs/libshout-2.0
-	>=media-libs/libvorbis-1.0"
+	>=media-libs/libshout-2
+	>=media-libs/libvorbis-1"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
@@ -34,7 +34,7 @@ src_install() {
 	dodoc AUTHORS README TODO
 	insinto /etc/ices2
 	doins conf/*.xml
-	dohtml doc/{*.html,*.css}
+	dohtml doc/*.{html,css}
 	newman debian/ices2.1 ices.1
 	newinitd "${FILESDIR}"/ices.initd ices
 	keepdir /var/log/ices