Link libshout against $(OGG_LIBS) in src/Makefile.am tbecause the configure.ac is already checking for it, and the code is directly using libogg functions wrt #499458 by Justin Lecher

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 40 insertions, 11 deletions

diff --git a/media-libs/libshout/ChangeLog b/media-libs/libshout/ChangeLog
index 2980e61c8a66..917bd2534950 100644
--- a/media-libs/libshout/ChangeLog
+++ b/media-libs/libshout/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libshout
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libshout/ChangeLog,v 1.48 2013/08/28 18:26:44 aballier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libshout/ChangeLog,v 1.49 2014/03/04 14:37:25 ssuominen Exp $
+
+  04 Mar 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/libshout-2.3.1-underlinking.patch, libshout-2.3.1-r1.ebuild:
+  Link libshout against $(OGG_LIBS) in src/Makefile.am tbecause the configure.ac
+  is already checking for it, and the code is directly using libogg functions
+  wrt #499458 by Justin Lecher
 
   28 Aug 2013; Alexis Ballier <aballier@gentoo.org> libshout-2.3.1-r1.ebuild:
   keyword ~amd64-fbsd
diff --git a/media-libs/libshout/Manifest b/media-libs/libshout/Manifest
index 13de20e647de..a0e4e575b9cc 100644
--- a/media-libs/libshout/Manifest
+++ b/media-libs/libshout/Manifest
@@ -1,15 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX libshout-2.3.1-underlinking.patch 428 SHA256 a78da5dc186877539855e2b866ce8ef097603cd55ae6f549175fc1efc3ef9238 SHA512 555d3b00f051f14b016825e3f76ddf23bf956624480179eb316cf47b4c7cde56dfcbea348bfb16903989033f84465444eea8b0757297fd7483690b75d2eaf27f WHIRLPOOL a69b683e3e6a781a9e94b463fa6bc24d2cb12846143158d69924cf4d5e82bbb55c32035b10a036e5f1771fcc5d020a8063fc9304bc576392d307b7582f63d030
 DIST libshout-2.3.1.tar.gz 464229 SHA256 cf3c5f6b4a5e3fcfbe09fb7024aa88ad4099a9945f7cb037ec06bcee7a23926e SHA512 19c1421e654310ddbc25f343d205d921b7c3f1c9c97f028207deaf1a46150b7f6c8069d52b7a3c9ed72dda276b52237cf1208292fbfa09aa7d09f85072c46a7b WHIRLPOOL 7060612fc19735030d8da4ef340eb51ef6d3cbb44502a64ba68f87cc4031918e304bd1f317dfe5796937ef0eeed2dad13abaa622bdca774d65e23f5ae2a061fa
-EBUILD libshout-2.3.1-r1.ebuild 1218 SHA256 94b4d0dee645ced5415c2b47e8894c825519529950501f61d89011a7df33715d SHA512 91fd3b87e8ffbfe907e2dd4da61fe1f80e2f3064e96dc1c8bf8a96a909e4c80e7215f892ddfcc1770db5e3ec73b5e8913e2a5a288575193d3b4041ae6ef4f61d WHIRLPOOL 418046bb0b950e5ea0206baceb2ca8bd44922aaff2dd9c85466cd32325c91c012eccd20036141997ec2a78831d055e13605277c1ee94ca1a2e61c6db4ac8e171
+EBUILD libshout-2.3.1-r1.ebuild 1307 SHA256 330d9d53fcb57ca2f8f21d031ad9fe98181cb7aa56f8e4d9a39dde1a73e6f7eb SHA512 9e946958c84f30b1c5bd5a16ba0cfe2e0b091ae34b07ec1c52922d7a384dcaab3d4a43439614b08b669b3aee20e511a91dbbd299d0ce27280db6a64d22e151c5 WHIRLPOOL 66840ca1296c2d2aae3776c25635c69c6343c476a80b44aa073f8d925e813b72cdfe9faac1b6e071fc72d83807be11f9bdcc05f6c1cd7372714865c3a2f744f0
 EBUILD libshout-2.3.1.ebuild 957 SHA256 c211b091f1752240ddae060538400aa6bf18e5a559961f2d18b398c18cc9c302 SHA512 f5b8cfdabb87037e11a0ebfac2c47af77f24f89b55e2955a6728924065668592ef9e7eef1ab86b335424bc7a8e3cebb7fd9a15fc9361f1479f8f3efde086232d WHIRLPOOL f7a2593a1a15060380595466350dbfa0e0da73b55cc83a1f38ff5e1ca76a1f8a85ea4f90a0ac5bd7e2e814726c963ff1b43139e27f418e5ccfb52de8bae0f8f7
-MISC ChangeLog 5667 SHA256 86c9e1edcd27802b87e7ca56363209d8720c4090f4f065038cfdf4526b1792b3 SHA512 4b93a463608de09b87769bfea92406164674ff587d97c8ff9cfadb522e14a507a420b811ec20386727fc0cee51ef398c96204db6d888f63fe1f1c65fa26d7ed8 WHIRLPOOL ef27d402d6375dc95400245273946b8c77bf67ef0ae161b05c036666351e823e2425db0ada23e65f80cd8ba536c53cde962a3271d882f853802053032230bbbc
+MISC ChangeLog 5983 SHA256 ace9fbe79d8fd58196b5349763daf7e7293a32cef323165b4399f17795e8f2c5 SHA512 f85019b7b4c8e6a230585cd2b4b55b3338afcbc9bb638118f140ead2348e6aadb5cf65f98c8525c06c1d3f2bbe1cb9b45447910b20154642eabd0a1feec5dc77 WHIRLPOOL d50b9d69502dffe784a4b7b2bc4900dfb5d9cb43e1cff978c5a70349c23ca48b9e734300e279321c65fe09b5e0ca413b60692b5a6a019124f26e93c7dbe4187c
 MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlIeQOUACgkQvFcC4BYPU0rWpQCdFTaKyzRJZcGDaTjbd+ThVrU/
-1igAoJr5TfG6bsIA9ZNiziYIZpACFnFn
-=aG54
+iQEcBAEBCAAGBQJTFeRvAAoJEEdUh39IaPFNklwH/ReaHzwgT5YqjIG+CG11kECx
+D5slLPN4ItmmNhgLXoqB53SdQVJxdB0uxgRHfX8Lfh52RsEXIgiz8Iw68TCKEeAn
+AgQyAjrG6MI9a2WGaJXOW67N44+Ug/dF6KVkmy44thzq9WhQ/oONiY7kCdrVJ9Kd
+0sRYQ6+IaXzw00Tn8AfOxyiZiTmHaiNTa4Ta5H+IdLG8neVMwZ+dc1oQ+8msOXYY
+XssqAXB/UaGSsSYSMlPmD8c/TUbaujStt/+CbNFk4iC2fxkwHyajhO3QjqiDdpts
+RyD2lXulp6fJQO2Q0hCdFj1sGI6ILMrdVtoMgsgAsdgLe/8KGQheB51joUyvSG0=
+=SF8J
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libshout/files/libshout-2.3.1-underlinking.patch b/media-libs/libshout/files/libshout-2.3.1-underlinking.patch
new file mode 100644
index 000000000000..e9bb73678ae4
--- /dev/null
+++ b/media-libs/libshout/files/libshout-2.3.1-underlinking.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/499458
+
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -26,7 +26,7 @@
+ 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) $(SPEEX_LIBS)
++		httpp/libicehttpp.la $(MAYBE_THREAD_LIB) $(OGG_LIBS) $(VORBIS_LIBS) $(THEORA_LIBS) $(SPEEX_LIBS)
+ 
+ INCLUDES = -I$(top_builddir)/include
+ 
diff --git a/media-libs/libshout/libshout-2.3.1-r1.ebuild b/media-libs/libshout/libshout-2.3.1-r1.ebuild
index 6b2c284d030b..1961322a4899 100644
--- a/media-libs/libshout/libshout-2.3.1-r1.ebuild
+++ b/media-libs/libshout/libshout-2.3.1-r1.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/media-libs/libshout/libshout-2.3.1-r1.ebuild,v 1.2 2013/08/28 18:26:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libshout/libshout-2.3.1-r1.ebuild,v 1.3 2014/03/04 14:37:25 ssuominen Exp $
 
 EAPI=5
-inherit eutils multilib-minimal
+inherit autotools eutils multilib-minimal
 
 DESCRIPTION="library for connecting and sending data to icecast servers"
 HOMEPAGE="http://www.icecast.org/"
@@ -23,6 +23,11 @@ RDEPEND="media-libs/libogg[${MULTILIB_USEDEP}]
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-underlinking.patch
+	eautoreconf
+}
+
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
 		$(use_enable static-libs static) \