remove old. Stabilize everywhere as -r1 differs only in the logrotate script

Package-Manager: portage-2.1.11.53/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2BA7F3C!

5 files changed, 24 insertions, 168 deletions

diff --git a/net-misc/icecast/ChangeLog b/net-misc/icecast/ChangeLog
index 1fed645ab541..450fd5b9e343 100644
--- a/net-misc/icecast/ChangeLog
+++ b/net-misc/icecast/ChangeLog
@@ -1,6 +1,10 @@
 # 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.95 2013/02/22 23:45:38 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/ChangeLog,v 1.96 2013/03/03 23:00:41 hwoarang Exp $
+
+  03 Mar 2013; Markos Chandras <hwoarang@gentoo.org> -icecast-2.3.2.ebuild,
+  -icecast-2.3.3.ebuild, icecast-2.3.3-r1.ebuild:
+  remove old. Stabilize everywhere as -r1 differs only in the logrotate script
 
   22 Feb 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   no-herd should be removed. Bug #382929
diff --git a/net-misc/icecast/Manifest b/net-misc/icecast/Manifest
index 991b61e080d7..fabf677a9d03 100644
--- a/net-misc/icecast/Manifest
+++ b/net-misc/icecast/Manifest
@@ -6,29 +6,26 @@ AUX icecast-2.3.3-libkate.patch 1175 SHA256 880cef8feed886933eae495f547d10b3f946
 AUX icecast.logrotate 140 SHA256 da38b3c3233bf7a4a059100361ecb1083fd74f22dbb5b8200a0eaad699ae1d0d SHA512 8aead6208b97b1d1cbd5d17a61dd3dd2493bdf68bfefc3ab6f9ae3e1acc856435942de7a129ef701c5379450428b9718e50701636e16d9e1ddccc8c752c2ccac WHIRLPOOL 88ae3b16f3e2c0a2e3defc86eabe24a83a94e23267a362652dc6282d04c31b8d33f6d377426c6a45b58fffb5569a7ba1e3303af9cc9d37318ea1d72a2b44c082
 AUX icecast.xml 6810 SHA256 8c9c209797d79153e0995665d08007bc2d59ff564f5e415df77212767b78f3cb SHA512 605628963c989661936249bccf7318f0de40ae65f0122297d7cdce2a21f6db93d127b9b17d695a0218a3eea5bccbc31c3c8ef8c3e3750ac3351c9de1038190b3 WHIRLPOOL 412f9a578f59c2a29deb97451be28e095a3492fff0895cbb867f6a90f7e3c88beee6bd35233b4997b0e9fa5e5cd80321bd73e8915a97726964f92e0adc392482
 AUX init.d.icecast 357 SHA256 bffdb754a923d12fd619b022b94398b609b940214ef012ed8e9cd03ebb2b60e6 SHA512 fa6a738f1ed2c238cdcbd4dd92bce161ea2ed40c8886afe62006f2baa898859285d8a6cf2e2fad780533d35d954fd5dd69b6be6bf4f41bc9bcee475a53c8628d WHIRLPOOL cf79f403af7ee142a4a0199dd09f077e698e15c39ecf8b904f7f70f050a260cd3145d26446f3a14ed52c6cb28424db2153ca14ac08c51129d4a6ef9c9173fd40
-DIST icecast-2.3.2.tar.gz 1152319 SHA256 4742b38fc55b6373895a7c0a35baed49a848fec99f5e8538e3f0157383d0b3f0 SHA512 c971b1ead32e76e493d95de34297084a6c09d6ade1aa3836c36e58290aec294e57b2729c0f9e2765bd3d7a0d728761b7f5174e8abddb72375a8b24f7df45db34 WHIRLPOOL af33bc0c4555c868acaa0c764b2fcb98672fedaa9fbf4adea06392a059c8935df23cd1c07a680bb158f0cd7046a73c35b2ae9197bea1cd7545f4337eaf457357
 DIST icecast-2.3.3.tar.gz 1161774 SHA256 1b1d06f5f83c9a983cd28cc78aa90e4038f933511b3d20d7fd2cfc116645c36d SHA512 e0ae26047744bfcb902dd5418bb83a6e25956109bd410f244fb23dd21216d2d0456c29684c38db99cfa6c5496353a860be776f569964b98286f0deca78156aba WHIRLPOOL 7042eb5f86f03b613e56c9a2362738cde9cf8bb6addfdc36a53b5a476c12edfbf6ff83612de4acba0cec7c62f7b26cf06a7f0b55cde67d81f9dd2a12fa6a8af8
-EBUILD icecast-2.3.2.ebuild 1841 SHA256 3453f7ddf96e1b82385b242cae0e4fdbbf89a5226904244297e97f6133125f50 SHA512 3e595ff7ccdc61cfd511a33add2e6a862ccc3bebc8833eb04fcd54263c3dc061d51ec9106b24c04fed7fd2a2738cbb56c6242cd861484d0d6eeb3412065f7e83 WHIRLPOOL 41256dd41e5328fe4ee7e709e9dc823950cabd9ca88e5b98b28e620c91e69d162c8a59c5f4a0e8e8dc736557d715acf520b94e3e09e1c22d622183a103f8c974
-EBUILD icecast-2.3.3-r1.ebuild 2157 SHA256 d23e118d1c7d8842d5f7e04fb064306d69c533a14191527a7302ec734fe64b21 SHA512 761167b82066d49c7496a2282935485e0dc61bcff7b63b98ced3b57dd3343d3f459e3545ae9daf035a7771873a8afc7a25a04961ecf97cb335397abb1e82c172 WHIRLPOOL 41d47c52051366e970d7129331d91b12d26036d91fc9a3ffb1705852bfaf54ae01353451ae3b53161334ca2b5673ef31b9ea5a042a00b985bae4052cd9bdbbf8
-EBUILD icecast-2.3.3.ebuild 1964 SHA256 fa318be5ace0df29661e42e7384da60af23dd87da22992d8f8e40eae74b3e2ad SHA512 80dd14fdf0ad8f88d7d5caeb33d7f1aec2a0d18c4cc7677d55dbea011cc6e2bb1d1fe2161440c94d6d742e47ce5441a15426bd0b9d15ba30ca0af74f6c3377f4 WHIRLPOOL 940c889bde36c3cf55989148e8a54b8f22183ecb4c73e297253b27fda9f18a74bbaec4a893ac9ff15f909222a39a1e4495922b062a4d4c0dc1a5187d69b69380
-MISC ChangeLog 13645 SHA256 981602c50a012b197bab859fd5b0dc79506e0137ed20fe7e1844f75cb5090ffd SHA512 e0f72f321b7af3686184b9dfb6dc08944060d43efdc043dc89498099e200ff9057a6eb383d7f3d3301e7775a3382fb28de4d909e2db3d7217aefad0a69fee77f WHIRLPOOL 8e387f6e7cb10c7a8bf55942bcd2f7b5452094d3a8b90ac5fc83c531e94487bfa9be09ae0a1b89bd3224cc6b67ae1f651ff011c96d9da289cca85acc66939690
+EBUILD icecast-2.3.3-r1.ebuild 2153 SHA256 ad79b38089d41782aefc4190776d90d0a026e1884f5223a5cb42a6944896a543 SHA512 a5aa4fee82a2217ec7286f81c3ecbbf27a3a2156b73dbd0abcc72d09c20c2b96e3f6f2fdcc7a629ff4e6e87ad7c50f5c58b37bf8b20939f18b49da79e6c36da6 WHIRLPOOL 083e5af4ef9edec2aacec8a44bb2946bd65daa22b6ba9d1e3433260c16d5a3ae35ff4cf363e05a94c81011fc69f48b7ab46132cd9051ce445410bfe4cf690ed8
+MISC ChangeLog 13851 SHA256 a9ee05963ff2147045f539d08c3f83866f25742663cc3c3708b4cc8ef4dfdc2c SHA512 746b712c2cfa0180b6619fcfb879ef066dc44b4e7013be42aeeecaad52298745f12b0d49e9b9942e6b3d76d06e2f1a1b0b0b1a13694bdebbd3a016ff99d46675 WHIRLPOOL 6a909ff2fef576702f049f636b7e4d9f824409483f4ee3dcd2827f9b1bd7bc7fd0bea1954630245f52ca28f92950fa36a7d5469e8dbf9892dffe08e096762446
 MISC metadata.xml 505 SHA256 b42fb502a05321eb38b38fc3ba296c32eb9f7190524efd155d551ca8fb59dd44 SHA512 42107925ca09e3c2fd16084a68a49792a76c382cd75f4e76705d938e3ed6e9b82694eb0959ccf47a23b83b27244d461b34c7287f643c0ff2702ee7fba9b5d874 WHIRLPOOL eefb4e7928068596c55203f5e9c26140c994393688d2f1b3f64978bb7440221259596caaa7b4b7d56293a1747fa20e83557496ef3691cda98ca4ab27b2de4903
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRKAMjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJRM9YXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88XtIP/RH8iHSaaBF2JNTCjtzFJdNN
-Hr3NxRoLmt5M6SekD4FAjDDBZ+sCXbzHoUt0/OrkdOlny2ktjqe+aqLW7Sj382vg
-3SWu8DZPWmQJsPqPiIcTTakfYwakjlougRC+hQg+GQvYvsIhw2rqh8LIDQK6X5qo
-841cgVR0+OGF97hWtxGz1jbt/EEm85AKafNQbM8HXt9zMrzsvM3jB4Fb02cBLpLl
-z92GVeRAAfniTbZwCykUNAQxqf1+NAUCPFo5PLSOnb/dwO8dzy/6TZqyEHOBQ4qC
-qgsbMgsmLu/NWnQugCcwAbWpdZgWJ0XJ4XUBiFE41ps7D/JBxsb0vhuhxPklL45e
-kU2hSVICFo3lVL0QWWUtMqAO02SuwPV/pZL4IRwNZb4ZAKwmFLUmG/TG5cjnzmS4
-U2287gR20R6akyttClhc28xFkAijSVTjtKP5+kBbjgdALbBwOGY6078+fVVt+QeI
-O1AHad3o+3qfzkFMq7mXLcuJZIusWUULgS+cCzobJd1ZuuPMFS7j6xhuwFkm4N0p
-hNyP49IIRBb7AsllJLP5PV+MplfiU9pekNksx0VyPGlkf8Pffyf3XRCCgUdhRmZc
-CFSJDMG1slsbV6F23l5qB8UmL2ZRFnnPtRbyYv9usTMoVXqt9tWXvJQl/tHSBkTf
-DVaxWiRHeENiBtkGL1aE
-=bzlh
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88+OEQAIB0cG7cdXAaHhBoV9+o5RIv
+pHhKFdg/ziCtvv9MYsj9sQadlUvECo6018pqyqdU6UvK3t6Fb7H/MjqRMWXaPsGQ
+fwYKWMpBIg/zwc+NeIYQgM9h5O11HEfWN5j1DIpemHdfwUl2CKwkd+3Gpxk+yetN
+CJDklvbfWKLrsC2rmIv0lt72Ku15IemeN0raILjYtcys8tlLJqe/lJTX81jZ7Itu
+Ej8JrG0sf3oIknvYELJpvIPuM9kop2xx+o3yUS4TDdTRJvhrR2uI5MPo6SqM9hpF
+l5cmRl0FRZodmEOH/wfiKWQnD94jqM0cfLM6pFFdeJO/1wDd6Ih/tZzpnEL4uXK9
+KRH8HC/fcO6oD1Luk+WNuxeHUFmVz0acGt7JQhn6oYDFUclVd/kHYhw4bsyXKBEm
+VubzgjSUV36p4ElOaP0cGPbSWx4/6iZpqgX6gMkZbag3NZqg/b6r+kEyRQXPBf4A
+ceYlzE8bDUOdXFUhYtuL1jdStc+tWduys70hlCSj92m+ZXFehu80CX40jFRG1Mfl
+1ajk999n/Ps2Pbi2Tj51gDJD12lSfIWQj/QpFiIOUIoOoAbtG6zh6IctyK87IHgT
+WEHj2vQdCbiHE5sEAQ4pMw5MdQUY4RWPqRbXsRs67hWdEBBXXs4GCXymwoRgxKN0
+k3HgBYdk3Jhwk95muvNZ
+=2Lsg
 -----END PGP SIGNATURE-----
diff --git a/net-misc/icecast/icecast-2.3.2.ebuild b/net-misc/icecast/icecast-2.3.2.ebuild
deleted file mode 100644
index 1b1da7198ea3..000000000000
--- a/net-misc/icecast/icecast-2.3.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/icecast-2.3.2.ebuild,v 1.11 2012/08/26 14:12:48 armin76 Exp $
-
-EAPI=2
-inherit eutils libtool
-
-DESCRIPTION="An opensource alternative to shoutcast that supports mp3, ogg (vorbis/theora) and aac streaming"
-HOMEPAGE="http://www.icecast.org/"
-SRC_URI="http://downloads.xiph.org/releases/icecast/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE="+speex +ssl +theora +yp"
-
-#Although there is a --with-ogg and --with-orbis configure option, they're
-#only useful for specifying paths, not for disabling.
-DEPEND="dev-libs/libxslt
-	dev-libs/libxml2
-	media-libs/libogg
-	media-libs/libvorbis
-	speex? ( media-libs/speex )
-	theora? ( media-libs/libtheora )
-	yp? ( net-misc/curl )
-	ssl? ( dev-libs/openssl )"
-
-pkg_setup() {
-	enewuser icecast -1 -1 -1 nogroup
-}
-
-src_prepare() {
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--sysconfdir=/etc/icecast2 \
-		$(use_with theora) \
-		$(use_with speex) \
-		$(use_with yp curl) \
-		$(use_with ssl openssl) \
-		$(use_enable yp) || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	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
-
-	insinto /etc/icecast2
-	doins "${FILESDIR}"/icecast.xml
-	fperms 600 /etc/icecast2/icecast.xml
-
-	diropts -m0764 -o icecast -g nogroup
-	dodir /var/log/icecast
-	keepdir /var/log/icecast
-	rm -rf "${D}"/usr/share/doc/icecast
-}
-
-pkg_postinst() {
-	touch "${ROOT}"var/log/icecast/{access,error}.log
-	chown icecast:nogroup "${ROOT}"var/log/icecast/{access,error}.log
-}
diff --git a/net-misc/icecast/icecast-2.3.3-r1.ebuild b/net-misc/icecast/icecast-2.3.3-r1.ebuild
index 6bf9660bc0d4..90c134cac3c5 100644
--- a/net-misc/icecast/icecast-2.3.3-r1.ebuild
+++ b/net-misc/icecast/icecast-2.3.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.1 2012/12/23 19:24:09 hwoarang Exp $
+# $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 $
 
 EAPI=4
 inherit eutils autotools user
@@ -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
diff --git a/net-misc/icecast/icecast-2.3.3.ebuild b/net-misc/icecast/icecast-2.3.3.ebuild
deleted file mode 100644
index 2fedbf8f9798..000000000000
--- a/net-misc/icecast/icecast-2.3.3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2012 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.ebuild,v 1.8 2012/09/18 10:09:10 xarthisius Exp $
-
-EAPI=4
-inherit eutils autotools user
-
-DESCRIPTION="An opensource alternative to shoutcast that supports mp3, ogg (vorbis/theora) and aac streaming"
-HOMEPAGE="http://www.icecast.org/"
-SRC_URI="http://downloads.xiph.org/releases/icecast/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE="kate +speex +ssl +theora +yp"
-
-#Although there is a --with-ogg and --with-orbis configure option, they're
-#only useful for specifying paths, not for disabling.
-DEPEND="dev-libs/libxslt
-	dev-libs/libxml2
-	media-libs/libogg
-	media-libs/libvorbis
-	kate? ( media-libs/libkate )
-	speex? ( media-libs/speex )
-	theora? ( media-libs/libtheora )
-	yp? ( net-misc/curl )
-	ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewuser icecast -1 -1 -1 nogroup
-}
-
-src_prepare() {
-	# bug #368539
-	epatch "${FILESDIR}"/${P}-libkate.patch
-	# bug #430434
-	epatch "${FILESDIR}"/${P}-fix-xiph_openssl.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--sysconfdir=/etc/icecast2 \
-		$(use_enable kate) \
-		$(use_with theora) \
-		$(use_with speex) \
-		$(use_with yp curl) \
-		$(use_with ssl openssl) \
-		$(use_enable yp)
-}
-
-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
-
-	insinto /etc/icecast2
-	doins "${FILESDIR}"/icecast.xml
-	fperms 600 /etc/icecast2/icecast.xml
-
-	diropts -m0764 -o icecast -g nogroup
-	dodir /var/log/icecast
-	keepdir /var/log/icecast
-	rm -rf "${D}"/usr/share/doc/icecast
-}
-
-pkg_postinst() {
-	touch "${ROOT}"var/log/icecast/{access,error}.log
-	chown icecast:nogroup "${ROOT}"var/log/icecast/{access,error}.log
-}