USE="static-libs" and empty dependency_libs in libtool files wrt #386029. Respect environment CFLAGS with USE="debug" wrt #386027. Thanks to Agostino Sarubbo for reporting.

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

3 files changed, 97 insertions, 6 deletions

diff --git a/media-sound/sox/ChangeLog b/media-sound/sox/ChangeLog
index 7b293d3b6017..3f91a1dca930 100644
--- a/media-sound/sox/ChangeLog
+++ b/media-sound/sox/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/sox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.127 2011/08/18 20:43:52 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.128 2011/10/07 15:17:40 ssuominen Exp $
+
+*sox-14.3.2-r1 (07 Oct 2011)
+
+  07 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> +sox-14.3.2-r1.ebuild:
+  USE="static-libs" and empty dependency_libs in libtool files wrt #386029.
+  Respect environment CFLAGS with USE="debug" wrt #386027. Thanks to Agostino
+  Sarubbo for reporting.
 
   18 Aug 2011; Matt Turner <mattst88@gentoo.org> sox-14.3.0.ebuild,
   sox-14.3.1.ebuild, sox-14.3.2.ebuild:
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index 02c01d4e4d36..c8f05d80cd3b 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -10,13 +10,18 @@ DIST sox-14.3.1.tar.gz 1044595 RMD160 d5c44ccb3acbe686af4bd434ce8cb9a7bf3e2dc7 S
 DIST sox-14.3.2.tar.gz 1110175 RMD160 5b8e86bd64ade2d9534993317474c33b41090183 SHA1 ad462114ff47b094078f18148bc9e29e31b42b92 SHA256 0668cc087c346f7c4084ae294c676a11ddefb462974bc3f67be30d789c850e8f
 EBUILD sox-14.3.0.ebuild 1835 RMD160 18a44764b61f98a12e536e8540b3ec5fd579e4a9 SHA1 39927da7e713e1f47ce5803bc3c6bf925d3c6d51 SHA256 d60ef5ec3729c4e8d329361a2c2132111d9d8a3b2da3b693932af183dbedce20
 EBUILD sox-14.3.1.ebuild 2020 RMD160 244573d94640c82aee0e644b7f72b5b3b650481f SHA1 8c26db0f577022417efb90718ed5cf1609c32ea0 SHA256 34ef450a8d0a0b9e91a4d8e10e5775cbbf094af3e5a000719d50bd7a3750f124
+EBUILD sox-14.3.2-r1.ebuild 2348 RMD160 1df800077d866e18558e3c3c7c1667a93bfdf8cf SHA1 17a5b7a701d8aad843b12321e4d9fde717d57dcd SHA256 eae311c2fc41697e1cf453543d73fb86a360737f76ef63cd0ebcd14b29bd12fa
 EBUILD sox-14.3.2.ebuild 2025 RMD160 9f111ad8215af40558b0031bf42a1dbf527b50a0 SHA1 6ff1dc8b72aa80062e42b327cceeb18013797c70 SHA256 80aa068ed99ec69856dcd7c022a30d3385b33971b3db255e50eaf99a42c2e24c
-MISC ChangeLog 16826 RMD160 66fa31b78fd4afe73ae96263f1b9609ec3b55cc6 SHA1 7c6284cfd1c20bd03f02270b6536f35fb882aa22 SHA256 9ec3de92d92dcb1aba26553105e9a10317dc1b3f65434634af693c33eda4035d
+MISC ChangeLog 17114 RMD160 a355bcbae2de44fd9a1e5eabcda697b85e1908df SHA1 b23505238c7371b30da58746b03ad7ad2dcf1c83 SHA256 105364b5f18e67de7128f637cdbd60b31c196cf0c1231b7a08591a5e00a99477
 MISC metadata.xml 318 RMD160 9ed7f56a243d795af858a8269ef4aa6c0b12de10 SHA1 77351e7231619c84672be1f9407a91268c728043 SHA256 cbacb312c7d857414aacc7c5c44d7f0c6c617cc8475feb8371c7174ee5b04f5c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5NeY0ACgkQTVUdg23rv50WbQCfRDoGykm1KVgyDlnl7QsdeSiu
-M18AnjeYLtxANMzjrBG2wtYoJs5Em/63
-=iuQz
+iQEcBAEBAgAGBQJOjxg4AAoJEEdUh39IaPFNKdsH/RkRBjoorFUFRhV3UGXAMZCj
+HV/wJt1/QoXN1JsjZuWIpY+3iPt4q9HIVeM+6VWZqy70TariLKxYMtfZkVPdAt+a
+O+rZxXxvc5OPDPLbOdeBYa6LtPDU91O2VP+bWWyz4MZmx59kYnsiS3igTAykCBtJ
+uw2JBZG0c+WuWY0FMlqWezJVB7/JRkT+i+n6PqZUOZnj1mF5kw9jE1w4T30IlpVF
+PCYDAcyxiHoWO0Dyb6K8nFZYvvHIDC/7xIz67IzySmbxzMGXrVL3FIxDlewuWQSZ
+ewIAO7N68gV8/M2w7GB3k4vkjgaSEc+iU5MPyU47sd/NHnKbwFGPnFbOLP7Pom4=
+=3/S8
 -----END PGP SIGNATURE-----
diff --git a/media-sound/sox/sox-14.3.2-r1.ebuild b/media-sound/sox/sox-14.3.2-r1.ebuild
new file mode 100644
index 000000000000..10ab3ded68a5
--- /dev/null
+++ b/media-sound/sox/sox-14.3.2-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.3.2-r1.ebuild,v 1.1 2011/10/07 15:17:40 ssuominen Exp $
+
+EAPI=4
+inherit eutils flag-o-matic
+
+DESCRIPTION="The swiss army knife of sound processing programs"
+HOMEPAGE="http://sox.sourceforge.net"
+SRC_URI="mirror://sourceforge/sox/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="alsa amr ao debug encode ffmpeg flac id3tag ladspa mad ogg openmp oss png pulseaudio sndfile static-libs wavpack"
+
+# libtool required for libltdl
+RDEPEND=">=sys-devel/libtool-2.2.6b
+	alsa? ( media-libs/alsa-lib )
+	amr? ( media-libs/opencore-amr )
+	encode? ( media-sound/lame )
+	flac? ( media-libs/flac )
+	mad? ( media-libs/libmad )
+	sndfile? ( media-libs/libsndfile )
+	ogg? ( media-libs/libvorbis	media-libs/libogg )
+	ao? ( media-libs/libao )
+	ffmpeg? ( virtual/ffmpeg )
+	ladspa? ( media-libs/ladspa-sdk )
+	>=media-sound/gsm-1.0.12-r1
+	id3tag? ( media-libs/libid3tag )
+	png? ( media-libs/libpng sys-libs/zlib )
+	pulseaudio? ( media-sound/pulseaudio )
+	wavpack? ( media-sound/wavpack )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_prepare() {
+	sed -i -e 's:CFLAGS="-g":CFLAGS="$CFLAGS -g":' configure || die #386027
+
+	epatch \
+		"${FILESDIR}"/${P}-uclibc.patch \
+		"${FILESDIR}"/${P}-ffmpeg.patch
+}
+
+src_configure() {
+	# Fixes wav segfaults. See Bug #35745.
+	append-flags -fsigned-char
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with alsa) \
+		$(use_enable debug) \
+		$(use_enable openmp gomp) \
+		$(use_with ao) \
+		$(use_with oss) \
+		$(use_with encode lame) \
+		$(use_with mad) \
+		$(use_with sndfile) \
+		$(use_with flac) \
+		$(use_with ogg oggvorbis) \
+		$(use_with ffmpeg) \
+		$(use_with ladspa) \
+		$(use_with id3tag) \
+		$(use_with amr amrwb) \
+		$(use_with amr amrnb) \
+		$(use_with png) \
+		$(use_with pulseaudio) \
+		$(use_with wavpack) \
+		--with-distro="Gentoo"
+}
+
+src_install() {
+	default
+	# libltdl is used for loading plugins, keeping libtool files with empty
+	# dependency_libs what otherwise would be -exec rm -f {} +
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+}