Merge ebuild changes from bug 115106, thanks to Chris Mayo.

Package-Manager: portage-2.1.3

6 files changed, 83 insertions, 69 deletions

diff --git a/net-misc/ices/ChangeLog b/net-misc/ices/ChangeLog
index f28a0e475366..be10a1c59f95 100644
--- a/net-misc/ices/ChangeLog
+++ b/net-misc/ices/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/ices
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ices/ChangeLog,v 1.22 2007/02/03 23:27:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ices/ChangeLog,v 1.23 2007/07/29 08:26:44 drac Exp $
+
+*ices-2.0.1-r1 (29 Jul 2007)
+
+  29 Jul 2007; Samuli Suominen <drac@gentoo.org> +files/ices.initd,
+  +ices-2.0.1-r1.ebuild:
+  Merge ebuild changes from bug 115106, thanks to Chris Mayo.
 
   03 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/net-misc/ices/Manifest b/net-misc/ices/Manifest
index c7a99b647884..f34a2dc3d556 100644
--- a/net-misc/ices/Manifest
+++ b/net-misc/ices/Manifest
@@ -1,20 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX ices.initd 327 RMD160 7dfb66005417510711734ece7478bdd7b9888632 SHA1 52e9750b2218e254741f8e94bb3f9de437207910 SHA256 60a8f15b06648deb26fc4779708c4d49691c3843392962decfa9f42440de4fbf
+MD5 682c3b905e9b966d88b296c40459517c files/ices.initd 327
+RMD160 7dfb66005417510711734ece7478bdd7b9888632 files/ices.initd 327
+SHA256 60a8f15b06648deb26fc4779708c4d49691c3843392962decfa9f42440de4fbf files/ices.initd 327
 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
 MD5 78c238ff78ce41a0e5115cab1adc765c ices-2.0.0.ebuild 1282
 RMD160 5c377ad1912cafe1703f9ad6d1a9e7482fb6e189 ices-2.0.0.ebuild 1282
 SHA256 a1009cf77ca68b3026dd983ac5a9594568c91460b05270e3d2c6de038b675753 ices-2.0.0.ebuild 1282
-EBUILD ices-2.0.1.ebuild 1262 RMD160 9212048484c9b8d8ca90fbfdd4877efad6b9d9de SHA1 869c7233e214f3d0624ac48b17594b82537a7103 SHA256 567af9ab74e372af9ce075126c2c1ce7609668b8919374238bfcd2a530753ea4
-MD5 1a4b6236fc64c372badbccc24f536db7 ices-2.0.1.ebuild 1262
-RMD160 9212048484c9b8d8ca90fbfdd4877efad6b9d9de ices-2.0.1.ebuild 1262
-SHA256 567af9ab74e372af9ce075126c2c1ce7609668b8919374238bfcd2a530753ea4 ices-2.0.1.ebuild 1262
-MISC ChangeLog 2711 RMD160 08ff54caed528ad7d86f00842721628e856e0c33 SHA1 8a889d444fdfec3f6d217700d66d34b692152754 SHA256 276089a1c2ac8230e86fe43b4d50aea28338f1bcc0cb6304e24755c6a1417031
-MD5 c2830737c73e3ef7dddc59c290dfe22d ChangeLog 2711
-RMD160 08ff54caed528ad7d86f00842721628e856e0c33 ChangeLog 2711
-SHA256 276089a1c2ac8230e86fe43b4d50aea28338f1bcc0cb6304e24755c6a1417031 ChangeLog 2711
+EBUILD ices-2.0.1-r1.ebuild 1112 RMD160 176dd44a4701137e688556387049d9c2764a82e7 SHA1 289bf7c3d9c1c0101f38ecbdbd4ecb5c00f6b7b1 SHA256 4083974376dac2bf78b68a796b64cf5c1d06040f8286c61b9e9ce6ce5667d4d0
+MD5 81624c176350b3f972c4316c81e586bd ices-2.0.1-r1.ebuild 1112
+RMD160 176dd44a4701137e688556387049d9c2764a82e7 ices-2.0.1-r1.ebuild 1112
+SHA256 4083974376dac2bf78b68a796b64cf5c1d06040f8286c61b9e9ce6ce5667d4d0 ices-2.0.1-r1.ebuild 1112
+MISC ChangeLog 2892 RMD160 8627030d26e0aa132cabb99beebb50df41902c92 SHA1 c085bca8ccd151f3184c35009a5673159ffa0ab5 SHA256 8a695f5ce8ba449aeff619a3558d0bc1ef49d8ed2f16a9332285103c59b4f92f
+MD5 4bbda630c3e3de8de5df9c1f8242bc21 ChangeLog 2892
+RMD160 8627030d26e0aa132cabb99beebb50df41902c92 ChangeLog 2892
+SHA256 8a695f5ce8ba449aeff619a3558d0bc1ef49d8ed2f16a9332285103c59b4f92f ChangeLog 2892
 MISC metadata.xml 160 RMD160 10be84fed28405abd22adc6689e87e5bb77e3501 SHA1 0c1bb16a7cc376ef35b87d8699ec9504718d36b9 SHA256 6bafe4a5c7b42309f124ebc2a9d78ebe5379aec4dcdc88c0bda2ab79c9851a6b
 MD5 05ab4d4775083f0930841e415df18ad6 metadata.xml 160
 RMD160 10be84fed28405abd22adc6689e87e5bb77e3501 metadata.xml 160
@@ -22,13 +23,6 @@ SHA256 6bafe4a5c7b42309f124ebc2a9d78ebe5379aec4dcdc88c0bda2ab79c9851a6b metadata
 MD5 e3f055762c89d85bbf4f4163dde91efb files/digest-ices-2.0.0 232
 RMD160 0f88d4cad860ca5fb0936a43a41766f4fcc5a0bf files/digest-ices-2.0.0 232
 SHA256 4fc815cb80ff47669638cd3433bc793d336bd848d154b093aa7f345012305daa files/digest-ices-2.0.0 232
-MD5 c17cf7b16ca8fb8464b05fdf501054c7 files/digest-ices-2.0.1 235
-RMD160 a8677294a294d9a848aa43cfbf9636c88a0713ab files/digest-ices-2.0.1 235
-SHA256 611f06ceb46980894f785abd56b7e8c7582db5539e6bb43604b4ea98c0d1e716 files/digest-ices-2.0.1 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFFxRp1AiZjviIA2XgRAg1mAJ9n/zvwwx65aic9FB7AKnVUqPSoCgCfQi9/
-3JdBeKqoRfSEOC2PisZ5ayo=
-=Wq8n
------END PGP SIGNATURE-----
+MD5 c17cf7b16ca8fb8464b05fdf501054c7 files/digest-ices-2.0.1-r1 235
+RMD160 a8677294a294d9a848aa43cfbf9636c88a0713ab files/digest-ices-2.0.1-r1 235
+SHA256 611f06ceb46980894f785abd56b7e8c7582db5539e6bb43604b4ea98c0d1e716 files/digest-ices-2.0.1-r1 235
diff --git a/net-misc/ices/files/digest-ices-2.0.1 b/net-misc/ices/files/digest-ices-2.0.1-r1
index 3ebcbcfca23d..3ebcbcfca23d 100644
--- a/net-misc/ices/files/digest-ices-2.0.1
+++ b/net-misc/ices/files/digest-ices-2.0.1-r1
diff --git a/net-misc/ices/files/ices.initd b/net-misc/ices/files/ices.initd
new file mode 100644
index 000000000000..595bfb300019
--- /dev/null
+++ b/net-misc/ices/files/ices.initd
@@ -0,0 +1,17 @@
+#!/sbin/runscript
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting IceS 2"
+	start-stop-daemon --background --start --pidfile /var/run/ices.pid --make-pidfile --exec /usr/bin/ices /etc/ices2/ices.xml
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping IceS 2"
+	start-stop-daemon --stop --pidfile /var/run/ices.pid --name ices
+	eend $?
+}
diff --git a/net-misc/ices/ices-2.0.1-r1.ebuild b/net-misc/ices/ices-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..aadaf36fb59d
--- /dev/null
+++ b/net-misc/ices/ices-2.0.1-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2007 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.1 2007/07/29 08:26:44 drac Exp $
+
+inherit eutils
+
+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"
+IUSE=""
+
+RDEPEND="dev-libs/libxml2
+	>=media-libs/libshout-2.0
+	>=media-libs/libvorbis-1.0"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	enewgroup ices
+	enewuser ices -1 -1 -1 ices
+}
+
+src_compile() {
+	econf --sysconfdir=/etc/ices2
+	emake || die "emake failed."
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS README TODO
+	insinto /etc/ices2
+	doins conf/*.xml
+	dohtml doc/{*.html,*.css}
+	newman debian/ices2.1 ices.1
+	newinitd "${FILESDIR}"/ices.initd ices
+	keepdir /var/log/ices
+	fperms 660 /var/log/ices
+	fowners ices:ices /var/log/ices
+	rm -rf "${D}"/usr/share/ices
+}
diff --git a/net-misc/ices/ices-2.0.1.ebuild b/net-misc/ices/ices-2.0.1.ebuild
deleted file mode 100644
index 2b84726cbb63..000000000000
--- a/net-misc/ices/ices-2.0.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2006 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.ebuild,v 1.3 2006/04/03 19:56:34 tcort Exp $
-
-IUSE=""
-
-DESCRIPTION="icecast OGG streaming client. supports on the fly re-encoding"
-SRC_URI="http://downloads.xiph.org/releases/ices/${P}.tar.bz2"
-HOMEPAGE="http://www.icecast.org/ices.php"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc64 ~sparc ~x86"
-
-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/${P}/html
-	mv ${D}usr/share/ices/*.html ${D}usr/share/doc/${P}/html
-	mv ${D}usr/share/ices/style.css ${D}usr/share/doc/${P}/html
-
-	# Nothing is left here after things are moved...
-	rmdir ${D}usr/share/ices
-}