Version bump, bug #156211

Package-Manager: portage-2.1.2.3

6 files changed, 137 insertions, 10 deletions

diff --git a/media-libs/libshout/ChangeLog b/media-libs/libshout/ChangeLog
index d234bfa0ee78..6f4332f3d078 100644
--- a/media-libs/libshout/ChangeLog
+++ b/media-libs/libshout/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libshout
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libshout/ChangeLog,v 1.25 2006/09/10 16:29:51 the_paya Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libshout/ChangeLog,v 1.26 2007/03/31 13:50:03 aballier Exp $
+
+*libshout-2.2.2 (31 Mar 2007)
+
+  31 Mar 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/libshout-2.2.2-asneeded.patch,
+  +files/libshout-2.2.2-automagic.patch, +libshout-2.2.2.ebuild:
+  Version bump, bug #156211
 
   10 Sep 2006; Javier Villavicencio <the_paya@gentoo.org>
   libshout-2.1.ebuild:
diff --git a/media-libs/libshout/Manifest b/media-libs/libshout/Manifest
index c741c9d4204b..40529c923a6d 100644
--- a/media-libs/libshout/Manifest
+++ b/media-libs/libshout/Manifest
@@ -1,9 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX libshout-2.2.2-asneeded.patch 588 RMD160 ab185a5e3d1c0b40eb3dd039b383993366d48ffa SHA1 01432ec1b0db2b92db633ae3481ee7197fa21911 SHA256 e03f0e81dc63380b7b7d632f0cfdbf4e3cd969dfdf755e0c023abd51f8df9c09
+MD5 56a51984a887defd3cae93dbfccb8243 files/libshout-2.2.2-asneeded.patch 588
+RMD160 ab185a5e3d1c0b40eb3dd039b383993366d48ffa files/libshout-2.2.2-asneeded.patch 588
+SHA256 e03f0e81dc63380b7b7d632f0cfdbf4e3cd969dfdf755e0c023abd51f8df9c09 files/libshout-2.2.2-asneeded.patch 588
+AUX libshout-2.2.2-automagic.patch 1480 RMD160 eec23e8d6da86aeb10a6b37f66a5eb40bc8e87b3 SHA1 b15255c7d9c954dc8d376e2a7e2c93c06fcd1361 SHA256 17a51217b0a5eefa77755fd588b64274c29c019581693be2b0059e06753405b0
+MD5 0a2f14c4ffd43cd0db0dd077e3595777 files/libshout-2.2.2-automagic.patch 1480
+RMD160 eec23e8d6da86aeb10a6b37f66a5eb40bc8e87b3 files/libshout-2.2.2-automagic.patch 1480
+SHA256 17a51217b0a5eefa77755fd588b64274c29c019581693be2b0059e06753405b0 files/libshout-2.2.2-automagic.patch 1480
 DIST libshout-1.0.9.tar.gz 169553 RMD160 b2369212c732bff9565602a47a2a68f9fd4f6e98 SHA1 99c0bad5f1ceed3bda2e6950bd5b405d8e79ea61 SHA256 191215b71ca6b5a6e999e91acd699dbbcdf53c5be1d928a25acb395d8442a426
 DIST libshout-2.0.tar.gz 326556 RMD160 1526622afb97a90057fce266b28f90e6de1038b3 SHA1 06e7843bc3d61670f5c6dd80d0bd8cea5fabeeab SHA256 c54c196e685f45fcd0e041e74938b9bf385581e89f1f688de465c53d1d9a0a13
 DIST libshout-2.1.tar.gz 455243 RMD160 edcbf2c8111bd76ce27734513a4c483986ba2e7e SHA1 c251d0791d807762957235442fa9b777f3f6068c SHA256 786e130d697352cdcf5e20b353286e17b898e486c9ed2b5035c597843f5b859f
+DIST libshout-2.2.2.tar.gz 476564 RMD160 7ea5bc197953cfae6aff53876865909b2f6ac5f1 SHA1 cabc409e63f55383f4d85fac26d3056bf0365aac SHA256 912a1fdb12d31af757e7881db49321e5b5240bd8bd4199e9fb0ce16d66568160
 EBUILD libshout-1.0.9.ebuild 648 RMD160 5ccc9615e46167f001b8c882978b451e6223d3c7 SHA1 0dec1a6d90b4cca8f90fa3d72e7fdfd9379345bc SHA256 e14085efcd579662958d86767c6d3887e3badd0d72210319c288ca6942dcf1d4
 MD5 267fbac2d9c680d801239b2b15df8b7d libshout-1.0.9.ebuild 648
 RMD160 5ccc9615e46167f001b8c882978b451e6223d3c7 libshout-1.0.9.ebuild 648
@@ -16,10 +25,14 @@ EBUILD libshout-2.1.ebuild 741 RMD160 3d88fcc840a3b2dc6bcfce8e1449a7b130fb2920 S
 MD5 ba716c5214cc9654b2f0ec593bce71b4 libshout-2.1.ebuild 741
 RMD160 3d88fcc840a3b2dc6bcfce8e1449a7b130fb2920 libshout-2.1.ebuild 741
 SHA256 80249e72903142283a4b0a5ff484c258be690aa2685c7a610955822af1964000 libshout-2.1.ebuild 741
-MISC ChangeLog 2723 RMD160 6d5e317951ffc7cf5e03af4875b7816a92fbc117 SHA1 57a28fa864afb5d54e2c04f273962ec47c677f30 SHA256 071500245d513f05ab4c7a9c6b4a038090d7985296e470e30eae1a9e8bfde94f
-MD5 b25c3158bbe1fd2e228e1ca991e5800c ChangeLog 2723
-RMD160 6d5e317951ffc7cf5e03af4875b7816a92fbc117 ChangeLog 2723
-SHA256 071500245d513f05ab4c7a9c6b4a038090d7985296e470e30eae1a9e8bfde94f ChangeLog 2723
+EBUILD libshout-2.2.2.ebuild 1135 RMD160 6a292abe36da291938418017849a5940b41352a9 SHA1 2b06bad288042c8ac8107b8bba66885d71a49b91 SHA256 a79f7c50ffe3bf85621cafaf0598fcd4235f12c2fc476a849ec787539f8dc12c
+MD5 66bea2283b503d33fe2b2f8745a7cd91 libshout-2.2.2.ebuild 1135
+RMD160 6a292abe36da291938418017849a5940b41352a9 libshout-2.2.2.ebuild 1135
+SHA256 a79f7c50ffe3bf85621cafaf0598fcd4235f12c2fc476a849ec787539f8dc12c libshout-2.2.2.ebuild 1135
+MISC ChangeLog 2940 RMD160 17236d1a228bf500c02a37af132b486e527c4620 SHA1 a86852e43ed5f5384d53cd50a317a9ac58078dc2 SHA256 5fdff0ac48f3c9c49e15b3c09eebfd83ac66f141f3b43a12450414e0760d2f9c
+MD5 bac30239b508a3d8bff5fd6d53fb9ad4 ChangeLog 2940
+RMD160 17236d1a228bf500c02a37af132b486e527c4620 ChangeLog 2940
+SHA256 5fdff0ac48f3c9c49e15b3c09eebfd83ac66f141f3b43a12450414e0760d2f9c ChangeLog 2940
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -33,10 +46,13 @@ SHA256 29ee761b135e2a5a9be2427c8c5e33c83d6b51d64f4111f12f1c81bb878d592e files/di
 MD5 5fde3980ace9253fafb04df843658829 files/digest-libshout-2.1 238
 RMD160 191ec19f0a31a5730266e9105be951e4ae186d0a files/digest-libshout-2.1 238
 SHA256 a4abbdc5bf6f8befe5bf494db9be5426416feea3798d88938eee7184bad7371d files/digest-libshout-2.1 238
+MD5 d86222a362251502e14fc8598c701816 files/digest-libshout-2.2.2 244
+RMD160 35994085fdaeb1224065d8a16674d3418b419ca1 files/digest-libshout-2.2.2 244
+SHA256 b68c9321f999a101f46f32a72997e0f40ea2a60d48d5828cbe83edadbf97e163 files/digest-libshout-2.2.2 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFzvha8bi6rjpTunYRAlSQAKDcB0wyEa/ClSoB/njqb/T33TT6iQCeJZBe
-86vfAZ+MiN6XZXMldHe8UKM=
-=Ee5d
+iD8DBQFGDmbcvFcC4BYPU0oRAkwvAJ9Vi6UNQ32BbW9HMZVWSJhqthYYmgCfbNrE
+MS7q9/8N044x8/ny5oNlLU0=
+=3OBX
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libshout/files/digest-libshout-2.2.2 b/media-libs/libshout/files/digest-libshout-2.2.2
new file mode 100644
index 000000000000..d7f31a748e2c
--- /dev/null
+++ b/media-libs/libshout/files/digest-libshout-2.2.2
@@ -0,0 +1,3 @@
+MD5 4f75fc9901c724b712c371c9a1e782d3 libshout-2.2.2.tar.gz 476564
+RMD160 7ea5bc197953cfae6aff53876865909b2f6ac5f1 libshout-2.2.2.tar.gz 476564
+SHA256 912a1fdb12d31af757e7881db49321e5b5240bd8bd4199e9fb0ce16d66568160 libshout-2.2.2.tar.gz 476564
diff --git a/media-libs/libshout/files/libshout-2.2.2-asneeded.patch b/media-libs/libshout/files/libshout-2.2.2-asneeded.patch
new file mode 100644
index 000000000000..1655996ce0ad
--- /dev/null
+++ b/media-libs/libshout/files/libshout-2.2.2-asneeded.patch
@@ -0,0 +1,15 @@
+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
new file mode 100644
index 000000000000..6dc28bf77454
--- /dev/null
+++ b/media-libs/libshout/files/libshout-2.2.2-automagic.patch
@@ -0,0 +1,42 @@
+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.2.2.ebuild b/media-libs/libshout/libshout-2.2.2.ebuild
new file mode 100644
index 000000000000..50128a37bdbc
--- /dev/null
+++ b/media-libs/libshout/libshout-2.2.2.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/media-libs/libshout/libshout-2.2.2.ebuild,v 1.1 2007/03/31 13:50:03 aballier 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}
+	dev-util/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
+}