Fix bug 513942

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

4 files changed, 108 insertions, 9 deletions

diff --git a/media-sound/vorbis-tools/ChangeLog b/media-sound/vorbis-tools/ChangeLog
index 2daef9c5221b..b565fa2ece7f 100644
--- a/media-sound/vorbis-tools/ChangeLog
+++ b/media-sound/vorbis-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/vorbis-tools
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/ChangeLog,v 1.102 2014/02/04 08:40:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/ChangeLog,v 1.103 2014/06/21 08:49:55 ssuominen Exp $
+
+*vorbis-tools-1.4.0-r1 (21 Jun 2014)
+
+  21 Jun 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +vorbis-tools-1.4.0-r1.ebuild, +files/vorbis-tools-1.4.0-underlinking.patch:
+  Fix underlinking issues with USE="-* ogg123" wrt #513942 by Patrick Lauer
+  Revision bump in case eautoreconf has unexpected consequences.
 
   04 Feb 2014; Samuli Suominen <ssuominen@gentoo.org> vorbis-tools-1.4.0.ebuild:
   Use EAPI5
diff --git a/media-sound/vorbis-tools/Manifest b/media-sound/vorbis-tools/Manifest
index d967a699cfe1..b540bc4d573a 100644
--- a/media-sound/vorbis-tools/Manifest
+++ b/media-sound/vorbis-tools/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX vorbis-tools-1.4.0-underlinking.patch 2360 SHA256 cf13f27ce70bfc56f0d78d9c15bfd68832887501502c5279e641fa99532aae36 SHA512 9d93d6bd39ccdcdd90870388022d7c2eea8263cced4d6f140321bee0100215d6db1eef3d379d6a80168c6b1c1703eb0553f976b8fa3b275f663114ede35cca9a WHIRLPOOL 1f7817adb43d6caffc4c7ec734492bda44bd4e385543976f820418a546e40a3ef1b3ac9df48852d69e461e5dcbb5ff60a0e6bdd7bf37c93b8df5688b9515537b
 DIST vorbis-tools-1.4.0.tar.gz 1346532 SHA256 a389395baa43f8e5a796c99daf62397e435a7e73531c9f44d9084055a05d22bc SHA512 d2473f2e8e6726b5a5083f567797ae42bbb7fa3f26aec3f7b83e641e028c64726299f71a9d75258595a53cf29c18acb84841bcbc39509258d2c8df859e4e3b99 WHIRLPOOL 7f9116957dc06dbc40db0cba6a3147cdf575cd0939021fe44c984a7fde0ff9a495ed8b51275001266404e14db5e814d9e1dcc5bc57f4d3e9eaeb06b76be67a08
+EBUILD vorbis-tools-1.4.0-r1.ebuild 1145 SHA256 e99fe12ff7a9f20981cdc7c381bb5ad20a776e03feeced246ade2d6266d270ee SHA512 5a6930c0ef1467bda42ee059b0e5b5fecd19b1e8d81b887773ca5e108899ce3154bf4da7c6d25747dec2dd0540c6f06b70af4e5536c30f61a7c0d430b8ff11e4 WHIRLPOOL 7d252fe4f88f7d5dbe6570ba94654d37d6f71ec2ff5d361dc4aba9b972c73f52981bf9a5ed477d22655f3939d10944a3bb9fa1d96c78c898a90cd50a0a22c9fe
 EBUILD vorbis-tools-1.4.0.ebuild 1028 SHA256 82eb323a36dfe92b8fc637be4c511e600275ebc086e1bf17eee55ada4e1ddda2 SHA512 0e4d2ac198db5903716518a2f9a239a9336a8bcf5e7e3b52ad2e0ab7549864034268fae48b7f7d9e8d0604d1c2914d6b7e79025bc1bab8dddd2e8a1e280b5d5d WHIRLPOOL 4622fa0f57be167a0bab64bb14b9456d59635db23fb377b66e60a6ef2db0e3387699c29e7e27839bb8a82b66abc3cd07c573b1a2a6d5b29139d1daa27e93df20
-MISC ChangeLog 13717 SHA256 8c1923034dd7982df2bad0192865eae1b5a71c2afc1d4d47855917bce332edc1 SHA512 107f95085a0bad9426aafb798a42641dd8ac0e7bd9efbe0e197748ce348cd20376aece7b99c792b61aa7579ca5450b60a158de8c94080b8433838d70b72fd551 WHIRLPOOL 66ca6add955e17a966366b28caf7d30339e312857f540605ea956b125b0cd27f4ee58b831adec530677c3296310d2912ad9000f4910d72aa8b866ed5ab8f52ea
+MISC ChangeLog 14030 SHA256 a535f411328f01f22eee1080e4d9ed8895402e8b728a72584ebd3dd1c7f5c7f4 SHA512 3f8b49e0188baf913d329212e1cb76bd1ae845b7daa24dd58026c8e90d14fe38d56a7257fa5f9a328ec65be093bbfc01b45dd021728687da302d39ac00ee464f WHIRLPOOL e2e3b5ffb2bf57fbada76736d41453fa4388842b2d7e7297c10072e900b57359d9180135d4b12fbded267a772b1eb4dbd6dc3fef207eed19e013ba1dec654444
 MISC metadata.xml 328 SHA256 9ca6cfb906247a39b7d495438ed69d4b8bb986f4541730859a14993ec7c85435 SHA512 113d464efe285ed826150f0a536d35f45a3e7398c0fd439b7b71807783fd4979403ebc92b57fe11f4183919489252272055a5b3838a77d778fc1609ebfc43a15 WHIRLPOOL 1b63a9e71afef0a202de1e31db36ca0682b788446a3426e3c5169920d0b93c0d210785db9d88b5bfb7e078e0532f4560ec8ce984b8b98923c6ddc84e4f106bcf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJS8KdZAAoJEEdUh39IaPFN+swH/REGR21c36pIg6Qq7wtNn+sD
-+YPP5nzf0PA61/XxSJw6XC2CcLlzlcgGKOOeGTB2iIYpKbU4R574tHA+3U1N2kk6
-ytwTFKmI2zdJsZs584JG9nQGDk/GwS9upJiYbCosz9hUA/IJ8ru3JUki3dfCmd6V
-xWKSwzeHWuItsvXkOomNYucg4ozcZW9DjPMJJakTTblfpOP2o0U3y1xlQvm/JN0a
-ixjeJUz2ZR208PZbCRd85iNRrW/Zk0ickamBv0THfeMWf7+pnmdpVIqeWRcqTJ/W
-zqUxmRIudolUIgDYWSvwzDMtN2p5fGaBQTvPsDq5WVxIqjPzjwJWPjGqewWqyuo=
-=hUa2
+iQEcBAEBCAAGBQJTpUZkAAoJEEdUh39IaPFNVYwH/0TNGl3wvmkDECioss/kmD3Y
+suFROsPexyBSli4I5ZVMZbW8/eYR5fVtmkdEobag9u+iGRChduTUdGlbCttv/zCu
+2pa1DN36upUQGogOfmEJuRw0/Jukl1ZshNQbjIFmpSLJX/nruRU6O/+BneoDZnCZ
+9oGNDFixP6kMhimBk9e8C0PllxRnUUy4jah0C35G73+Pn1Dn6cQ1+DiSdzf24EMQ
+zqBnPoUW5NUt5qxDqpXD5O0CCVMlRJmdIvV3ydHTxZmgI9B4PvIzTlfQGfJfqidD
+pSWZ1eRxFVlsEHjlT/OvStLy5Y5O78bou6v8+zN8X7XUh8KB8dm2RdRPwpIpSsc=
+=8ozH
 -----END PGP SIGNATURE-----
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-underlinking.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-underlinking.patch
new file mode 100644
index 000000000000..aaa10fbb54f9
--- /dev/null
+++ b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-underlinking.patch
@@ -0,0 +1,47 @@
+http://bugs.gentoo.org/513942
+
+Fix building with `./configure --enable-ogg123 --without-flac --without-speex --without-kate` and `make`:
+
+libtool: link: gcc -Wall -ffast-math -fsigned-char -O2 -pipe -march=native -Wl,-O1 -Wl,--hash-style=gnu -o oggenc oggenc.o audio.o encode.o platform.o resample.o skeleton.o  -Wl,--as-needed ../share/libutf8.a ../share/libgetopt.a -lvorbisenc -lvorbis -logg
+resample.o:resample.c:function res_init: error: undefined reference to 'sin'
+collect2: error: ld returned 1 exit status
+
+libtool: link: gcc -Wall -ffast-math -fsigned-char -O2 -pipe -march=native -Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu -o ogg123 audio.o buffer.o callbacks.o cfgfile_options.o cmdline_options.o file_transport.o format.o http_transport.o ogg123.o oggvorbis_format.o playlist.o status.o remote.o transport.o vorbis_comments.o vgfilter.o  ../share/libutf8.a ../share/libgetopt.a -lvorbisfile -lvorbis -logg -lao -lnsl -lcurl -lpthread
+vgfilter.o:vgfilter.c:function vg_init: error: undefined reference to '__pow_finite'
+vgfilter.o:vgfilter.c:function vg_init: error: undefined reference to '__pow_finite'
+vgfilter.o:vgfilter.c:function vg_filter: error: undefined reference to 'tanh'
+vgfilter.o:vgfilter.c:function vg_filter: error: undefined reference to 'tanh'
+collect2: error: ld returned 1 exit status
+
+This is using the new GNU gold linker:
+
+$ ld -v
+GNU gold (GNU Binutils 2.24) 1.11
+
+Happens because -lm gets appended to the libraries list only with, for example, --with-flac but vgfilter.c and resample.c are always
+using functions from the mathlib.
+
+Therefore, always link to mathlib:
+
+--- ogg123/Makefile.am
++++ ogg123/Makefile.am
+@@ -30,7 +30,7 @@
+ ogg123_LDADD = @SHARE_LIBS@ \
+ 	       @VORBISFILE_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ @AO_LIBS@ \
+                @SOCKET_LIBS@ @LIBICONV@ @CURL_LIBS@ @PTHREAD_CFLAGS@ \
+-               @PTHREAD_LIBS@ @I18N_LIBS@ @FLAC_LIBS@ @SPEEX_LIBS@
++               @PTHREAD_LIBS@ @I18N_LIBS@ @FLAC_LIBS@ @SPEEX_LIBS@ -lm
+ 
+ ogg123_DEPENDENCIES = @SHARE_LIBS@
+ ogg123_SOURCES = audio.c buffer.c callbacks.c \
+--- oggenc/Makefile.am
++++ oggenc/Makefile.am
+@@ -23,7 +23,7 @@
+ 
+ oggenc_LDADD = @SHARE_LIBS@ \
+ 	       @VORBISENC_LIBS@ @VORBIS_LIBS@ @KATE_LIBS@ @OGG_LIBS@ \
+-	       @LIBICONV@ @I18N_LIBS@ @FLAC_LIBS@
++	       @LIBICONV@ @I18N_LIBS@ @FLAC_LIBS@ -lm
+ 
+ oggenc_DEPENDENCIES = @SHARE_LIBS@
+ 
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r1.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..614405b30924
--- /dev/null
+++ b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/vorbis-tools-1.4.0-r1.ebuild,v 1.1 2014/06/21 08:49:55 ssuominen Exp $
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="tools for using the Ogg Vorbis sound file format"
+HOMEPAGE="http://www.vorbis.com"
+SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="flac kate nls +ogg123 speex"
+
+RDEPEND=">=media-libs/libvorbis-1.3.0
+	flac? ( media-libs/flac )
+	kate? ( media-libs/libkate )
+	ogg123? (
+		>=media-libs/libao-1.0.0
+		net-misc/curl
+	)
+	speex? ( media-libs/speex )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+DOCS="AUTHORS CHANGES README"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-underlinking.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable ogg123) \
+		$(use_with flac) \
+		$(use_with speex) \
+		$(use_with kate)
+}