disable support for external gsm lib for now until it installs correct libs (pic), bug #192736

Package-Manager: portage-2.1.3.9

4 files changed, 48 insertions, 14 deletions

diff --git a/media-sound/sox/ChangeLog b/media-sound/sox/ChangeLog
index 17992cddc486..d590cc872219 100644
--- a/media-sound/sox/ChangeLog
+++ b/media-sound/sox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/sox
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.66 2007/09/11 21:05:35 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.67 2007/09/18 18:22:04 aballier Exp $
+
+  18 Sep 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/sox-14.0.0-noexternalgsm.patch, sox-14.0.0.ebuild:
+  disable support for external gsm lib for now until it installs correct libs
+  (pic), bug #192736
 
 *sox-14.0.0 (11 Sep 2007)
 
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index 14648e33880c..e3a4fac73ba1 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -21,6 +21,10 @@ AUX sox-13.0.0-oggautomagic.patch 820 RMD160 b4cc247ad85c6c46378fdc44dc22de1f18c
 MD5 0f64e68e81853002ceeecdcb4f70cf5a files/sox-13.0.0-oggautomagic.patch 820
 RMD160 b4cc247ad85c6c46378fdc44dc22de1f18cb8907 files/sox-13.0.0-oggautomagic.patch 820
 SHA256 fd65d7d75ec4b0418451486b02bef5fea90da087f4f11285d6f533da1c91951b files/sox-13.0.0-oggautomagic.patch 820
+AUX sox-14.0.0-noexternalgsm.patch 650 RMD160 bdfb5f06583cde688db6b5e1d18d3a001efd8f1e SHA1 7b4467bf8b7ea561c5753088989d22870bcd0a96 SHA256 ffd19243c82e43885e8e8d7d599148745061293b30980c5c7bfbc3b830a02506
+MD5 6329d7d791524b8973214db02833d8fa files/sox-14.0.0-noexternalgsm.patch 650
+RMD160 bdfb5f06583cde688db6b5e1d18d3a001efd8f1e files/sox-14.0.0-noexternalgsm.patch 650
+SHA256 ffd19243c82e43885e8e8d7d599148745061293b30980c5c7bfbc3b830a02506 files/sox-14.0.0-noexternalgsm.patch 650
 DIST sox-12.17.9.tar.gz 468174 RMD160 1ba76bf5329daafe75158757b7074f8385788353 SHA1 1c20f73a38cc5dfe15102df0565c7f2cea7e0bd8 SHA256 1f0a5495634b3156673111e0ac93084985f5dbac9bd1974630d07c97ac4ddccf
 DIST sox-12.18.2.tar.gz 486814 RMD160 cf85ec4058a66687ad0a39bb85ff062d7c48e7bf SHA1 3f5742cbed98deafbcf80251c29224c9a9ef5c89 SHA256 832bf98c95580af879fe51311c861ba7c57f07a5791628108ef29a027f0271ff
 DIST sox-13.0.0.tar.gz 725259 RMD160 84e7c8dea4f3a9145f9b42f7f03ac2329f3b83f2 SHA1 db0e6a7356b8fcbc72cf0dca1d81782fc3fa48f4 SHA256 c66c52cfa42fe126592563c3d8974007a9858bd35d2c1136389a721eeebb9f8e
@@ -37,14 +41,14 @@ EBUILD sox-13.0.0.ebuild 1634 RMD160 557c72a16eadc4b9f14139ccd51821cbce3ed2f8 SH
 MD5 f6b208dbd0330fee30633123125206f1 sox-13.0.0.ebuild 1634
 RMD160 557c72a16eadc4b9f14139ccd51821cbce3ed2f8 sox-13.0.0.ebuild 1634
 SHA256 4e1584cdb9b9051b0424e5708030ad505c323fc6b3edc50396bf75ee408e8c0e sox-13.0.0.ebuild 1634
-EBUILD sox-14.0.0.ebuild 1752 RMD160 198ca7d2e6b5d0ecdf9598413af505220eaeb12f SHA1 f1ad879e452e534f52443d707110cc17d241162c SHA256 74fdb3f240d8a7ef6b8985abd12eb624536c381ee725e26c4e08e9a260bb02d7
-MD5 38dd41a2ddff2358c07fa779de894d73 sox-14.0.0.ebuild 1752
-RMD160 198ca7d2e6b5d0ecdf9598413af505220eaeb12f sox-14.0.0.ebuild 1752
-SHA256 74fdb3f240d8a7ef6b8985abd12eb624536c381ee725e26c4e08e9a260bb02d7 sox-14.0.0.ebuild 1752
-MISC ChangeLog 9120 RMD160 a0e92fba55d244c92090715ef1086e41aff2cf42 SHA1 a61e6b6bbe42b9b803698c4f4d2c42061574c237 SHA256 725c0817630804b4a2cecc2c5175cd6dcd37e5f9c28d1a5f9da87ff97ff4ee9a
-MD5 fe9de8e3af9a260d75b90f2ec7e51b29 ChangeLog 9120
-RMD160 a0e92fba55d244c92090715ef1086e41aff2cf42 ChangeLog 9120
-SHA256 725c0817630804b4a2cecc2c5175cd6dcd37e5f9c28d1a5f9da87ff97ff4ee9a ChangeLog 9120
+EBUILD sox-14.0.0.ebuild 1960 RMD160 2fea2dfffd508e7979df9f89c802bd2c4f098415 SHA1 d555219b9b98e1ef31981cb39280e31afa0a9844 SHA256 fb0c2cc54caae648e1b67e8cd45c985a3fb36e7014875c01e9c5cd75dfd84eb1
+MD5 8411ea388c8fbf7265a174ceefdcf71c sox-14.0.0.ebuild 1960
+RMD160 2fea2dfffd508e7979df9f89c802bd2c4f098415 sox-14.0.0.ebuild 1960
+SHA256 fb0c2cc54caae648e1b67e8cd45c985a3fb36e7014875c01e9c5cd75dfd84eb1 sox-14.0.0.ebuild 1960
+MISC ChangeLog 9332 RMD160 3966b4edd1eb3c1e074bb1ad16bc41bb84c401bd SHA1 420c4a6fa3a365973c14d3b72624bc9b364bc1b9 SHA256 4fa2293e70bfc1fa2fb53e20b2fe0ee33f2d8da24980e08a8df21e42897fb202
+MD5 874671f5de883ad933e242bab721919f ChangeLog 9332
+RMD160 3966b4edd1eb3c1e074bb1ad16bc41bb84c401bd ChangeLog 9332
+SHA256 4fa2293e70bfc1fa2fb53e20b2fe0ee33f2d8da24980e08a8df21e42897fb202 ChangeLog 9332
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -62,9 +66,9 @@ MD5 20f77215e9e5f34c26110e86ad311726 files/digest-sox-14.0.0 235
 RMD160 e732cd667d762e7aed41f73fc86d1827b0bb3b13 files/digest-sox-14.0.0 235
 SHA256 780d83122d90e501b5ac92048055d9708b8d9762d4e38cee9a98b38c1aa27a4b files/digest-sox-14.0.0 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG5wMmvFcC4BYPU0oRAhCGAKCR7U/2YjNTvUTJa/6uK5NG/aalTQCfecGH
-vKddKNfh0E7VRtT4LnNWdWA=
-=KKQ8
+iD8DBQFG8BdWvFcC4BYPU0oRAhZbAJ4lmbY29ZktVmm8yIQmYec+KIkNkQCfSbHp
+7TLX7KQeRi7El2eVSpsd8L0=
+=gE9/
 -----END PGP SIGNATURE-----
diff --git a/media-sound/sox/files/sox-14.0.0-noexternalgsm.patch b/media-sound/sox/files/sox-14.0.0-noexternalgsm.patch
new file mode 100644
index 000000000000..88091a48153b
--- /dev/null
+++ b/media-sound/sox/files/sox-14.0.0-noexternalgsm.patch
@@ -0,0 +1,15 @@
+Index: sox-14.0.0/configure.ac
+===================================================================
+--- sox-14.0.0.orig/configure.ac
++++ sox-14.0.0/configure.ac
+@@ -186,8 +186,8 @@ fi
+ AM_CONDITIONAL(HAVE_SUN_AUDIO, test x$enable_sun_audio = xyes)
+ 
+ dnl Check for libgsm
+-AC_CHECK_HEADERS(gsm/gsm.h, found_libgsm=yes,
+-    [AC_CHECK_HEADERS(gsm.h, found_libgsm=yes)])
++AC_CHECK_HEADERS(gsm/gsm.h, found_libgsm=blah,
++    [AC_CHECK_HEADERS(gsm.h, found_libgsm=blah)])
+ if test "$found_libgsm" = yes; then
+     AC_CHECK_LIB(gsm, gsm_create, GSM_LIBS="$GSM_LIBS -lgsm")
+     AC_DEFINE(EXTERNAL_GSM, 1, [Define if you are using an external GSM library])
diff --git a/media-sound/sox/sox-14.0.0.ebuild b/media-sound/sox/sox-14.0.0.ebuild
index 943c56b8ba81..0fd3570b1bbf 100644
--- a/media-sound/sox/sox-14.0.0.ebuild
+++ b/media-sound/sox/sox-14.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.0.0.ebuild,v 1.1 2007/09/11 21:05:35 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.0.0.ebuild,v 1.2 2007/09/18 18:22:04 aballier Exp $
 
 inherit flag-o-matic eutils autotools
 
@@ -27,6 +27,16 @@ DEPEND="alsa? ( media-libs/alsa-lib )
 # amrnb? ( media-libs/amrnb )
 # amrwb? ( media-libs/amrwb )
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Disable external gsm lib support until it installs properly the lib
+	# Bug #192736
+	epatch "${FILESDIR}/${P}-noexternalgsm.patch"
+	AT_M4DIR="${S}/m4" eautoreconf
+}
+
 src_compile () {
 	# Fixes wav segfaults. See Bug #35745.
 	append-flags -fsigned-char