Version bump. Removed old. Added rewritten init script

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 56 insertions, 28 deletions

diff --git a/net-misc/icecast/ChangeLog b/net-misc/icecast/ChangeLog
index e5148b07ea9f..bcb4904b6d1d 100644
--- a/net-misc/icecast/ChangeLog
+++ b/net-misc/icecast/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/icecast
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/ChangeLog,v 1.102 2013/11/26 19:51:40 hwoarang Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/ChangeLog,v 1.103 2014/05/23 17:14:14 polynomial-c Exp $
+
+*icecast-2.4.0 (23 May 2014)
+
+  23 May 2014; Lars Wendler <polynomial-c@gentoo.org> -icecast-2.3.3-r1.ebuild,
+  +icecast-2.4.0.ebuild, +files/init.d.icecast-2:
+  Version bump. Removed old. Added rewritten init script. Permission kindly
+  granted by hwoarang.
 
 *icecast-2.3.3-r3 (26 Nov 2013)
 
diff --git a/net-misc/icecast/Manifest b/net-misc/icecast/Manifest
index 7b14738b4fa3..2fb9e4bdb5e8 100644
--- a/net-misc/icecast/Manifest
+++ b/net-misc/icecast/Manifest
@@ -7,28 +7,28 @@ AUX icecast.logrotate 140 SHA256 da38b3c3233bf7a4a059100361ecb1083fd74f22dbb5b82
 AUX icecast.service 185 SHA256 fbb6dfff2d5075d5921138352c7242742fc1e8f228fa977ea704f0270e8e8817 SHA512 a1e662f9b39ecbd35f28e849c5ae9db314d12e8fcefb152660180e9b51fe538197522c5ddda4908a4012ebe73ac4f9a6c12543a01548e9c41f17b5a17b942f51 WHIRLPOOL 62657838fe2f43cb0a1881b7de58a763cd19541ca14a9ff5d487cd69380eeab0e8f1d061a8b6b7b2230c5f6ef94f98f100d3d014d6be42960ac6ff2df1223340
 AUX icecast.xml 6810 SHA256 8c9c209797d79153e0995665d08007bc2d59ff564f5e415df77212767b78f3cb SHA512 605628963c989661936249bccf7318f0de40ae65f0122297d7cdce2a21f6db93d127b9b17d695a0218a3eea5bccbc31c3c8ef8c3e3750ac3351c9de1038190b3 WHIRLPOOL 412f9a578f59c2a29deb97451be28e095a3492fff0895cbb867f6a90f7e3c88beee6bd35233b4997b0e9fa5e5cd80321bd73e8915a97726964f92e0adc392482
 AUX init.d.icecast 626 SHA256 a2ba2a3713fe056af33ec661d349aaa5e8f7e381e4157c5a16a126472b481cde SHA512 3de3024053e0535d4f8a00e15ed220f39d6e15441cccbbb7b9217c6963e3c81535d5ce58de8ee817efe5db747f744e95a7f05e61d131415828f6dfbc7cf9ea44 WHIRLPOOL 4785f975ed1175d49185d4ff97e9d32d26e7fd7dfeda82ce551636533fc1eb0032491d297655605c68790cc436abacf358568cc5130e1bef208cc6966da1f62b
+AUX init.d.icecast-2 430 SHA256 9f509d6081e556f4579ff91511f17b79a7bffc2a9f5da935eea5ed7ab788d2de SHA512 35110473f5638e41af4098c7ffd5ca79d008a3811351c58a5f9450520ee45fd3bac4b11532412263de21b4e56362a4528ffb0b574cf7e7a424b00423333a491c WHIRLPOOL f37b57cc6c3b85d436adeb047f2bf4b5a27f1008ac1d2645dfab62629c3faf75e91f47b5780322f91a93176540d5fd13e47d9881e355232602ec24a54744c8e5
 DIST icecast-2.3.3.tar.gz 1161774 SHA256 1b1d06f5f83c9a983cd28cc78aa90e4038f933511b3d20d7fd2cfc116645c36d SHA512 e0ae26047744bfcb902dd5418bb83a6e25956109bd410f244fb23dd21216d2d0456c29684c38db99cfa6c5496353a860be776f569964b98286f0deca78156aba WHIRLPOOL 7042eb5f86f03b613e56c9a2362738cde9cf8bb6addfdc36a53b5a476c12edfbf6ff83612de4acba0cec7c62f7b26cf06a7f0b55cde67d81f9dd2a12fa6a8af8
-EBUILD icecast-2.3.3-r1.ebuild 2153 SHA256 ad79b38089d41782aefc4190776d90d0a026e1884f5223a5cb42a6944896a543 SHA512 a5aa4fee82a2217ec7286f81c3ecbbf27a3a2156b73dbd0abcc72d09c20c2b96e3f6f2fdcc7a629ff4e6e87ad7c50f5c58b37bf8b20939f18b49da79e6c36da6 WHIRLPOOL 083e5af4ef9edec2aacec8a44bb2946bd65daa22b6ba9d1e3433260c16d5a3ae35ff4cf363e05a94c81011fc69f48b7ab46132cd9051ce445410bfe4cf690ed8
+DIST icecast-2.4.0.tar.gz 1087795 SHA256 17b7e957e1b16a576efaabd69c15126e84ce98d3791ccee4546b72c0c6460f32 SHA512 eeba87301357fe2b0b77a22e259da2310166974d27067a43fa822bbb6e26ec819e00e8f9202ee3b5411a1aa78951c792370b5a0f70aebf81dd797c11bb6b05a5 WHIRLPOOL 2ddec59eaddec00a0181f4b156847d07edd2a708905a18aa4200744105d6192037e17616a4aaafa5384ee6602d1f642dd2e9c987b2f2aac781bc9b4039098782
 EBUILD icecast-2.3.3-r2.ebuild 2200 SHA256 6bb55a5b48c535e38379a71f172e5418c30aa036c1990bcc3f77032cf129c21d SHA512 876e3208d2fa6fe0090c7826182779fc0b6aa3c96e2ebc7e4bf238aa1b7c7b1a15d0333dbbc30609c74b0ec1ed24d3f20f4df7237269446dd0440a9ddbed58e4 WHIRLPOOL 23fc42855c910a930dcf71073579b0f6239de7a2b58456e1fa692ba2887c30a3c5640306bcb99f072148236db6edd6f86aff803d019072673d3696743cf8a6a0
 EBUILD icecast-2.3.3-r3.ebuild 2209 SHA256 4fa6365af4e770a9a4c9e37418909ff4f9e8525f4b07c7f05f7beab7ad72b138 SHA512 b01d12c84e8602f02fb09069ea959a725e6643f68752f4e78ed15bfc6d894d710da94488670524adc23cfbe698e1c64ccca9d76ca92cc22635709c8748a26346 WHIRLPOOL 463c777bb4fbf686b2738917888d8d34fd4bf25af768379ee06e504b3be4758c91b9813c88556d455ce093d310b85d94b8a3a0f14140b77f2d8f2f65aaaace2b
-MISC ChangeLog 14654 SHA256 687e1ea2902b7bb4c3e208722c229d9b098ad0265aa78a43684260caeceddb4d SHA512 39a77c065d658df445531c6a5c6e3b4eac6424ffc3195aa63168bcb550e9f8cc95c7be6678731c3113470bd3d1d7edc7c0b674505a0592c120787ad8472f905d WHIRLPOOL f3553d71a50530ef47bd24d3094e654ccf2604037fe68f95e073046f667aa5c7f4798fde71f8915b06ecaa4d3277496a2c87e38e6fcc1e6af4e1e2731ba0da40
+EBUILD icecast-2.4.0.ebuild 2235 SHA256 56ae447df9be79f436f012a910ce6ef0ec2d17e21e0569c538e025ad7f86f497 SHA512 2cbbe0f3f60d2b6744d26e08fb48d63385c8081e0cd7f292c6e049ff6b22a7a86a0cbfe455fb511955dc909d482e9b01a1fb10e1490e1b5ff78e243219f3ba82 WHIRLPOOL 9e3328c026df769f9ace54a8eaddff9bec3abe58f268a3f9af189edc9513e967b5ac2b7c30a53285213440d9f58da22b7cdfafb7207c60795041a2b976dab53f
+MISC ChangeLog 14918 SHA256 4d2fd264541439ef820e217da4ca9744068d35912c39b83de48e08bd60735ca4 SHA512 c0ecd232cabeee5b6f0843a106e0d3f6e205b12d7fcce0089d5d03314db365498274228f77ae2aa2075ce682c98c0204447c70b07e3b79f4f1a76eb4d72125d4 WHIRLPOOL 8be2ff8afd7313e6c3d94060d696198ae034fb70850d26fb4948470f639aa942479b770b3fad81385dfbdf7c4281443c7cf14c3d4b611d3af202cbe050b0b4f0
 MISC metadata.xml 505 SHA256 b42fb502a05321eb38b38fc3ba296c32eb9f7190524efd155d551ca8fb59dd44 SHA512 42107925ca09e3c2fd16084a68a49792a76c382cd75f4e76705d938e3ed6e9b82694eb0959ccf47a23b83b27244d461b34c7287f643c0ff2702ee7fba9b5d874 WHIRLPOOL eefb4e7928068596c55203f5e9c26140c994393688d2f1b3f64978bb7440221259596caaa7b4b7d56293a1747fa20e83557496ef3691cda98ca4ab27b2de4903
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSlPvIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88R4gQAMxUg/V9Fxc6lLm44zdvypu+
-GKngh4xYlNcKD/mvP+tVCX83tG9h6ofXIIEe8mCyL1BYsEqTWBvmUAk+ngcNt5pA
-bjmF1whnpNkn8iiBqQJEAhOu+CpMykcFkVlNVV7A0In5AiaCuxmxI5uXTs85v8eW
-UIKcasEFG0fwl3NeGOXY0qcmxvVi/rgFc/ZQJ0UMR40q88fZZpOoFRCxGc/PMwih
-t3yJ0CIobhn8caPfDBYyJhNd4fBve7cHOmfqC4McUvldzhir7big3nF+4UBhy5Fb
-pthIlbEIbYckcmxUslLVba3RzzYpVUCxKbZUYEOBv7CPf+knUXAd3bdGdbvOWfSx
-ylGROjKt5j337Cxej5MLDF2/P+h6YMcDP62ZUf4TGAznz8XWQEy4q9KC49ZeCACs
-HafzQf58JE/e6Ukl8Reoj9Wi/vyLcQWauFZzvVEmYu3zVvYd2z6fYs4vZKirox+6
-htTOzRl2awQcyrrRmtpvMu/Y1On6/fWpuG0Z/XWY3K/3njMDDQFu1eEH1Nvw3q9w
-B5TeX2kcdask6J8AsZ4jlfR4Q16YaG40mbpiy4JmNeDe5WegtPre/LxZtuzowf5v
-1qot2yl7wt5xImyQPrYOddywQtVOnwBbxFitOECDjd/st9DkQDGarKku+yDZ2kdl
-VP/MP0TP+Xl1aFUYRB/P
-=sHuT
+iQIcBAEBCAAGBQJTf4HnAAoJEPiazRVxLXTFhwMP/R5ifMPZe5I3SXlU0wq+2Juy
+QHCJrW4stWob46AadEI5faGzUb7fPPa5fO1keqM60U4bSG/U0xMw+Tn4YfYEg+Uj
+F4Whftcikz/Jz1wlsuZWBahHxFeMa4DkLog/g7wt6bW7qnWggTssnRCHHRcjCHSZ
+iyK7K5fO5crVcefxPaLe6GqQclovNG+qT+3l1cbeJTPqwE7f45OJ/3tbsik0j9Fu
+cgIqYJpOpbtxebrfCzEpdxDcmptzqkFnHBvoQSN5r+4l4VE7/ys41pqB63mEd2AP
+d8grOdVLerQa8k3ibdKOsmZIhIU2u4SJs+h0u01bH/6LubHQWXGQ72Pykfoor+Xb
+tarPd31WmzX8SwgvJgnwe4OW8olVnCbQN8y4+CM/Y8BabBe1PaFWTmpb2U0eaa0J
++Slp0G6wKcf+Isu/R1CN1VT0stvsf9cqgnKj5P8RJ5IYJ8P0QFlMqoqoJcqCTT9o
+4nENxnMqBcecBpf7iyiwyXKWuMgy3X8FhxcsDziMhU+7ZAlkMUyoRVg+vIFB1qUK
+0szuwGJMULHH3WKsbV5P5q9yJnFNLtdIT7zS4wymARQvIicBs789E5Qbwics/+Me
+SSzbDiSRiA/CVReaVtwWchxSUL0oDnieCn9ZvxEQtRWNe0gnTJabrVpOWtyjr4qW
+Vu6Wv1tzhDAbyI/4nKs3
+=aYW0
 -----END PGP SIGNATURE-----
diff --git a/net-misc/icecast/files/init.d.icecast-2 b/net-misc/icecast/files/init.d.icecast-2
new file mode 100644
index 000000000000..bde5877c62b6
--- /dev/null
+++ b/net-misc/icecast/files/init.d.icecast-2
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload"
+
+pidfile="/var/run/icecast.pid"
+command="/usr/bin/icecast"
+command_args="-c /etc/icecast2/icecast.xml"
+command_background="true"
+
+depend() {
+	need net
+}
+
+reload() {
+	ebegin "Reloading Icecast2 configuration"
+	start-stop-daemon --signal HUP --pidfile ${pidfile}
+	eend $?
+}
diff --git a/net-misc/icecast/icecast-2.3.3-r1.ebuild b/net-misc/icecast/icecast-2.4.0.ebuild
index 90c134cac3c5..c797b76b3126 100644
--- a/net-misc/icecast/icecast-2.3.3-r1.ebuild
+++ b/net-misc/icecast/icecast-2.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/icecast-2.3.3-r1.ebuild,v 1.2 2013/03/03 23:00:41 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/icecast-2.4.0.ebuild,v 1.1 2014/05/23 17:14:14 polynomial-c Exp $
 
-EAPI=4
-inherit eutils autotools user
+EAPI=5
+inherit eutils autotools systemd user
 
 DESCRIPTION="An opensource alternative to shoutcast that supports mp3, ogg (vorbis/theora) and aac streaming"
 HOMEPAGE="http://www.icecast.org/"
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/icecast/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="kate logrotate +speex +ssl +theora +yp"
 
 #Although there is a --with-ogg and --with-orbis configure option, they're
@@ -34,15 +34,16 @@ pkg_setup() {
 
 src_prepare() {
 	# bug #368539
-	epatch "${FILESDIR}"/${P}-libkate.patch
+	epatch "${FILESDIR}"/${PN}-2.3.3-libkate.patch
 	# bug #430434
-	epatch "${FILESDIR}"/${P}-fix-xiph_openssl.patch
+	epatch "${FILESDIR}"/${PN}-2.3.3-fix-xiph_openssl.patch
 	eautoreconf
 }
 
 src_configure() {
 	econf \
 		--disable-dependency-tracking \
+		--docdir=/usr/share/doc/${PF} \
 		--sysconfdir=/etc/icecast2 \
 		$(use_enable kate) \
 		$(use_with theora) \
@@ -56,9 +57,9 @@ src_install() {
 	emake DESTDIR="${D}" install
 	dodoc AUTHORS README TODO HACKING NEWS conf/icecast.xml.dist
 	dohtml -A chm,hhc,hhp doc/*
-	doman debian/icecast2.1
 
-	newinitd "${FILESDIR}"/init.d.icecast icecast
+	newinitd "${FILESDIR}"/init.d.icecast-2 icecast
+	systemd_dounit "${FILESDIR}"/${PN}.service
 
 	insinto /etc/icecast2
 	doins "${FILESDIR}"/icecast.xml