old, tidy

Package-Manager: portage-2.2.0_alpha135/cvs/Linux x86_64

8 files changed, 22 insertions, 176 deletions

diff --git a/media-libs/libshout/ChangeLog b/media-libs/libshout/ChangeLog
index b3bd41801bfa..f3da47921cd0 100644
--- a/media-libs/libshout/ChangeLog
+++ b/media-libs/libshout/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libshout
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libshout/ChangeLog,v 1.43 2012/09/30 17:25:24 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libshout/ChangeLog,v 1.44 2012/10/05 09:08:43 ssuominen Exp $
+
+  05 Oct 2012; Samuli Suominen <ssuominen@gentoo.org> -libshout-2.1.ebuild,
+  -libshout-2.2.2.ebuild, -files/libshout-2.2.2-asneeded.patch,
+  -files/libshout-2.2.2-automagic.patch, -libshout-2.3.0.ebuild:
+  old
 
   30 Sep 2012; Raúl Porcel <armin76@gentoo.org> libshout-2.3.1.ebuild:
   alpha/ia64/sh/sparc stable wrt #429126
diff --git a/media-libs/libshout/Manifest b/media-libs/libshout/Manifest
index 3cb852b00f1f..f5eb1a91e632 100644
--- a/media-libs/libshout/Manifest
+++ b/media-libs/libshout/Manifest
@@ -1,22 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX libshout-2.2.2-asneeded.patch 588 SHA256 e03f0e81dc63380b7b7d632f0cfdbf4e3cd969dfdf755e0c023abd51f8df9c09 SHA512 131bc902e32e746bb34b4af0728eba71fccff18eddc035c7e2f4479cb0399923cf615c0a79735277299a1200a3d909cc65a86a18d8374c002a3327023381c805 WHIRLPOOL eae6aadbadb430686b9aab361762af62128ddbc8929ac4dfc0b9855f3cd1a723f4bff1409747d66ab42f522cef7b380558d9869554e607bfb53f4274ff9d9feb
-AUX libshout-2.2.2-automagic.patch 1480 SHA256 17a51217b0a5eefa77755fd588b64274c29c019581693be2b0059e06753405b0 SHA512 fb65d5dba1ff11f0633398f298fb7075b171eec34a15c5f83f7d78586ec43a09ec8f5dee1558bd3fed006a1698f97b84ede95deb5fa605e736f8be4be79b659e WHIRLPOOL d0ed7b34f756a61e50f8f92f0dc1a724ff7aeb77c2c7aa9238ea44c568652296f5811d12acb8ce4ee4687f589bff2895b763b204f0ab0eb77432fc5909a2300d
-DIST libshout-2.1.tar.gz 455243 SHA256 786e130d697352cdcf5e20b353286e17b898e486c9ed2b5035c597843f5b859f SHA512 5e9f2932eba1937b6983dfc85a175a320bc96fe45cdc29be77a48eaf462da6690582106ed8ff0acb9debf2ebd01d26d16f56799a42d46d0f2c8a3eee47e43191 WHIRLPOOL 34e5c74414b5dbf008edb41a8d23e4cd4468e3159589ce069b092fcd86438a06c6200f40dd7b2a92c450e89751d96926f824effdb907f0dbd5ab8a0973c3f7ba
-DIST libshout-2.2.2.tar.gz 476564 SHA256 912a1fdb12d31af757e7881db49321e5b5240bd8bd4199e9fb0ce16d66568160
-DIST libshout-2.3.0.tar.gz 462223 SHA256 a4ed39f3eeaa0bbf1ead0a96d6b072e989acef32a2d00f1798649878c48ca176 SHA512 7654ee2afc29ad537237b8cfdc7f04c4423cd9e9246620fb40b29a273584eec3073b3fe70c6dcb1915bd9a1fa6f076c6751213e5f4923355d2305cd3d50a76cb WHIRLPOOL c6ca8858d9ac8809dda805cf3ca48e90f0f1a058b684c2ff8641071dcd41dda7a421e19a60b19a5c286d79e472827b4cef79b043c31d25b65f5dd56c5ea0f033
 DIST libshout-2.3.1.tar.gz 464229 SHA256 cf3c5f6b4a5e3fcfbe09fb7024aa88ad4099a9945f7cb037ec06bcee7a23926e SHA512 19c1421e654310ddbc25f343d205d921b7c3f1c9c97f028207deaf1a46150b7f6c8069d52b7a3c9ed72dda276b52237cf1208292fbfa09aa7d09f85072c46a7b WHIRLPOOL 7060612fc19735030d8da4ef340eb51ef6d3cbb44502a64ba68f87cc4031918e304bd1f317dfe5796937ef0eeed2dad13abaa622bdca774d65e23f5ae2a061fa
-EBUILD libshout-2.1.ebuild 740 SHA256 f9e52af784ad177298d85232345508ce73f996ce54ff5aeb0549cb2dfd9c9954 SHA512 442861c1f050c0e9b5f762c0bcdb35e2b15c594d8914f712f9633beac87d305058e9ee7ced30a0fcc70be1098a10669abd35a07e7d957c85e5b484b1c15d31ba WHIRLPOOL 2af5ce308bea462d761e0c9e39c5491c716df0e20b1ec9d34b7243f55a9f7e71fa2cd48c2ac337a3b2aca8c1eab0ccd1b6b7b1a3d45ff8e4cfca44fdb85e780e
-EBUILD libshout-2.2.2.ebuild 1132 SHA256 bd8751663732be90ee66c9743f52c204c55d8cd7c39eba73492bc42f9d483626 SHA512 675faa093121e2d833cbdc1963a834cae2f35067db159a7f6ebe4bf8649614f8efc3ddf7bcc615be8c092fd74b509490141c04b407201e7c9767cb93da7f7e6f WHIRLPOOL 570e88ca095f7c9652de3034b5e5176ed2b1f7c67d141380234fdb16c8c746a80be8945a5b048a932c5387171c391b0c9fdb1032d158821a9faf6f622d1940a6
-EBUILD libshout-2.3.0.ebuild 904 SHA256 b0eb025fc69554ee0106365c94e510da708ad6fee60bb2aae942cf1a8e6226ec SHA512 4dde92d8863eb855a015fd07503f346c83e6b23a233556b5482b29e2ea44287cbddf2c82b62b027f4a6c5014195a449cfc86d51cabb70987808846e631da4e48 WHIRLPOOL a66318e49c09c8c426238e57a3ffd18369f4bd7647c8792984d80a0bfa91e77e59f8558c7cc62d28df6ce0cfb12974bdfc582e1d0ab74f227fe4a1006fcf8a26
-EBUILD libshout-2.3.1.ebuild 904 SHA256 0e981bc4c0e1b7ec9cbece76c4a9089eefd5f98d40d96cdd1ba3012ca84859e2 SHA512 685d95bcd4423611e610824562214387c1790d98c8e083643808a73107e4889843ee78a0bf69a98e03c009f990f4963e908a8979dd2f4ab9f891e07354d82836 WHIRLPOOL a27352ba412c17d56bf663df320b535bb7892167c9b6e7fbcf1c8658f3f052e6c9f1698b91a8c17b814580f0b2dbdbc7976f3917800a38a635d119fdadc86fb8
-MISC ChangeLog 4862 SHA256 3086497715484d3621f021b54a3a6b002dcbf2d72009f6e91c058f606c276cfa SHA512 69fb9e7a6ba46396f14c2b7828ba9d2f83ac1f143734628ca0d8b58c9573043179ef858a45b5b79961e9aa88eed2ac739e5b42b6b8ffae8654486c7578ab694c WHIRLPOOL 37d0578519266e68636a492f0f92eeccf3e9d3b3463cbfe34fdb9c9fa87a083883e800b1dd7ecb896fae94328b9d69fdc7060e2aeb491657eeacb5636984c7e8
+EBUILD libshout-2.3.1.ebuild 873 SHA256 b952d9a520f64a5a93d9de0b9c32e92f49273077d136fb1f03177d0e5791490b SHA512 a78c6e7fda6a3924e24f5159ea28fdfff0d5835e7b96acda4f39595ce11a120b4b8a31d52a724636de0acfdde53db9e85642771aa876f4bb9e65341d2ba8dbe4 WHIRLPOOL 746e7356a2f8db429d933b33a9c7f8fafc879883190ea75c2876fc7df40e91ace9aa6f24605d8266eaa542f485f10ddf715ca21bd63591a097711174e77910e1
+MISC ChangeLog 5076 SHA256 ae9161bae73b748ca4ba9a7b801e31cb9dd9541ccefcb2c1d793b23a4d6e0449 SHA512 a828212c70455480f9d6c5e6c4982cac0020c170175f7365b1352702bfda786d2690409281eb781f14d105f2ea320f3eb96b881cd5e57bae1fe3eaef7cbbfe4d WHIRLPOOL 2766fba91973a1e5662b58383ead5162c67c1c89b975d2f029a9cfd023b6872adc65997466a553546e3c9da418b3fecd0ed56c3b1e63fe9da862bf02f852af4a
 MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBogIoACgkQuQc30/atMkDNtQCgtX+CXblrsXrlFfgPFIs9ev8a
-pyoAnAooqsL+NQ5yAKd4LCL09BMxE9ao
-=WCc7
+iQEcBAEBCAAGBQJQbqMDAAoJEEdUh39IaPFNlPkH/0CVZoloi9k4vSBIK4j0O3im
+kBtLMVMtk8+oViN3Ca/lBuVrlLIJJ89D4gjEm+j8HfYocU7cEnRmA+Unx9ubrMii
+mj32sE0bPbGZ41pi3bQwyZc2v/RbWwlEChjdw9zEi1EzU8XUb//ivpJs+YZk/871
++3gK5FAQNRR+ZuAni5HHSKX/Sjfng1vB23MiEQvR80tyADI4iD3C6qY9Xb42husf
+ZfqPkB8qjga+qHmqyipBjg8EbcYXrbSeRwKuAok2leZNeANnKpN2sbbS/Lt6YWJr
+I4fi7VMlJo/wF5ldDtI0eMTRHYAvXvLTVyp4m4N68jp3jsmYF6Xw8/DTlM9G+48=
+=zLrw
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libshout/files/libshout-2.2.2-asneeded.patch b/media-libs/libshout/files/libshout-2.2.2-asneeded.patch
deleted file mode 100644
index 1655996ce0ad..000000000000
--- a/media-libs/libshout/files/libshout-2.2.2-asneeded.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://trac.xiph.org/ticket/1161
-
-Index: libshout-2.2.2/src/Makefile.am
-===================================================================
---- libshout-2.2.2.orig/src/Makefile.am
-+++ libshout-2.2.2/src/Makefile.am
-@@ -26,7 +26,7 @@ libshout_la_SOURCES = shout.c util.c ogg
- AM_CFLAGS = @XIPH_CFLAGS@
- 
- libshout_la_LIBADD = net/libicenet.la timing/libicetiming.la avl/libiceavl.la\
--		httpp/libicehttpp.la $(MAYBE_THREAD_LIB) $(THEORA_LIBS) $(VORBIS_LIBS)
-+		httpp/libicehttpp.la $(MAYBE_THREAD_LIB) $(THEORA_LIBS) $(VORBIS_LIBS) $(SPEEX_LIBS)
- 
- INCLUDES = -I$(top_builddir)/include
- 
diff --git a/media-libs/libshout/files/libshout-2.2.2-automagic.patch b/media-libs/libshout/files/libshout-2.2.2-automagic.patch
deleted file mode 100644
index 6dc28bf77454..000000000000
--- a/media-libs/libshout/files/libshout-2.2.2-automagic.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://trac.xiph.org/ticket/1162
-
-Index: libshout-2.2.2/configure.ac
-===================================================================
---- libshout-2.2.2.orig/configure.ac
-+++ libshout-2.2.2/configure.ac
-@@ -122,12 +122,17 @@ PKG_CHECK_MODULES(VORBIS, vorbis, [
- VORBIS_LIBS="$VORBIS_LDFLAGS $VORBIS_LIBS"
- XIPH_CFLAGS="$XIPH_CFLAGS $VORBIS_CFLAGS"
- 
-+AC_ARG_ENABLE([theora],
-+  AC_HELP_STRING([--disable-theora],[do not build with theora support]))
-+
-+if test "x$enable_theora" != "xno"; then
- PKG_CHECK_MODULES(THEORA, theora, [
-     HAVE_THEORA="yes"
-     SHOUT_REQUIRES="$SHOUT_REQUIRES, theora"
-   ], [
-     XIPH_PATH_THEORA(, [AC_MSG_WARN([Theora library not found, disabling])])
-   ])
-+fi
- XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$THEORA_CFLAGS])
- XIPH_VAR_PREPEND([XIPH_LIBS],[$THEORA LDFLAGS $THEORA_LIBS])
- AM_CONDITIONAL([HAVE_THEORA], [test -n "$THEORA_LIBS"])
-@@ -136,12 +141,17 @@ then
-   AC_DEFINE([HAVE_THEORA], 1, [Define if you want theora streams supported])
- fi
- 
-+AC_ARG_ENABLE([speex],
-+  AC_HELP_STRING([--disable-speex],[do not build with speex support]))
-+
-+if test "x$enable_speex" != "xno"; then
- PKG_CHECK_MODULES(SPEEX, speex, [
-     HAVE_SPEEX="yes"
-     SHOUT_REQUIRES="$SHOUT_REQUIRES, speex"
-   ], [
-     XIPH_PATH_SPEEX(, [AC_MSG_WARN([Speex library not found, disabling])])
-   ])
-+fi
- XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$SPEEX_CFLAGS])
- XIPH_VAR_PREPEND([XIPH_LIBS],[$SPEEX LDFLAGS $SPEEX_LIBS])
- AM_CONDITIONAL([HAVE_SPEEX], [test -n "$SPEEX_LIBS"])
diff --git a/media-libs/libshout/libshout-2.1.ebuild b/media-libs/libshout/libshout-2.1.ebuild
deleted file mode 100644
index 5718823951f5..000000000000
--- a/media-libs/libshout/libshout-2.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libshout/libshout-2.1.ebuild,v 1.12 2012/05/05 08:02:31 jdhore Exp $
-
-DESCRIPTION="library for connecting and sending data to icecast servers"
-HOMEPAGE="http://www.icecast.org/"
-SRC_URI="http://downloads.xiph.org/releases/libshout/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="media-libs/libogg
-	media-libs/libvorbis"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc README examples/example.c
-	rm -rf "${D}"/usr/share/doc/libshout
-}
diff --git a/media-libs/libshout/libshout-2.2.2.ebuild b/media-libs/libshout/libshout-2.2.2.ebuild
deleted file mode 100644
index 0183b3e9a21f..000000000000
--- a/media-libs/libshout/libshout-2.2.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libshout/libshout-2.2.2.ebuild,v 1.2 2012/05/05 08:02:31 jdhore Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="library for connecting and sending data to icecast servers"
-HOMEPAGE="http://www.icecast.org/"
-SRC_URI="http://downloads.xiph.org/releases/libshout/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="speex theora"
-
-RDEPEND="media-libs/libogg
-	media-libs/libvorbis
-	theora? ( media-libs/libtheora )
-	speex? ( media-libs/speex )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-automagic.patch"
-	epatch "${FILESDIR}/${P}-asneeded.patch"
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_compile() {
-	econf $(use_enable theora)\
-		$(use_enable speex)\
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc README examples/example.c
-	rm -rf "${D}"/usr/share/doc/libshout
-}
diff --git a/media-libs/libshout/libshout-2.3.0.ebuild b/media-libs/libshout/libshout-2.3.0.ebuild
deleted file mode 100644
index cc95a0c79768..000000000000
--- a/media-libs/libshout/libshout-2.3.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libshout/libshout-2.3.0.ebuild,v 1.9 2012/07/08 15:20:51 armin76 Exp $
-
-EAPI=4
-
-DESCRIPTION="library for connecting and sending data to icecast servers"
-HOMEPAGE="http://www.icecast.org/"
-SRC_URI="http://downloads.xiph.org/releases/libshout/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="speex theora"
-
-RDEPEND="media-libs/libogg
-	media-libs/libvorbis
-	theora? ( media-libs/libtheora )
-	speex? ( media-libs/speex )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf $(use_enable theora)\
-		$(use_enable speex)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc README examples/example.c
-	rm -rf "${D}"/usr/share/doc/libshout || die
-}
diff --git a/media-libs/libshout/libshout-2.3.1.ebuild b/media-libs/libshout/libshout-2.3.1.ebuild
index 300a86ec46d6..f535c57c70da 100644
--- a/media-libs/libshout/libshout-2.3.1.ebuild
+++ b/media-libs/libshout/libshout-2.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libshout/libshout-2.3.1.ebuild,v 1.7 2012/09/30 17:25:24 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libshout/libshout-2.3.1.ebuild,v 1.8 2012/10/05 09:08:43 ssuominen Exp $
 
 EAPI=4
 
@@ -15,18 +15,19 @@ IUSE="speex theora"
 
 RDEPEND="media-libs/libogg
 	media-libs/libvorbis
-	theora? ( media-libs/libtheora )
-	speex? ( media-libs/speex )"
+	speex? ( media-libs/speex )
+	theora? ( media-libs/libtheora )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_configure() {
-	econf $(use_enable theora)\
+	econf \
+		$(use_enable theora) \
 		$(use_enable speex)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install
 	dodoc README examples/example.c
-	rm -rf "${D}"/usr/share/doc/libshout || die
+	rm -rf "${ED}"/usr/share/doc/${PN}
 }