Don't try to get distro name from /etc/issue, bug #246299 thank Albert W. Hopkins for report.

Package-Manager: portage-2.2_rc15/cvs/Linux 2.6.26-openvz.git-35f41f1 i686

4 files changed, 55 insertions, 15 deletions

diff --git a/media-sound/sox/ChangeLog b/media-sound/sox/ChangeLog
index 8d1e58c2edc6..0091508409b2 100644
--- a/media-sound/sox/ChangeLog
+++ b/media-sound/sox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/sox
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.97 2008/11/14 09:35:12 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.98 2008/11/22 21:11:36 pva Exp $
+
+  22 Nov 2008; Peter Volkov <pva@gentoo.org> +files/sox-14.2.0-distro.patch,
+  sox-14.2.0.ebuild:
+  Don't try to get distro name from /etc/issue, bug #246299 thank Albert W.
+  Hopkins for report.
 
   14 Nov 2008; Alexis Ballier <aballier@gentoo.org>
   +files/sox-14.1.0-runsox.patch, sox-14.1.0.ebuild:
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index ee06c64f9e66..603498ed82d0 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -1,12 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX sox-13.0.0-flac113.patch 19319 RMD160 952b00a3f12c01b9f36f703eeebad3852bc7f34e SHA1 e25b6e87131e21d4e75ac54154ceb7037a320010 SHA256 71898675ddf57d04638cf28336b929636f09eef019d3e57593934efc5a942053
 AUX sox-13.0.0-oggautomagic.patch 820 RMD160 b4cc247ad85c6c46378fdc44dc22de1f18cb8907 SHA1 1edb55e8b8163435bdcec0a699c09c3d608aba56 SHA256 fd65d7d75ec4b0418451486b02bef5fea90da087f4f11285d6f533da1c91951b
 AUX sox-14.0.1-cross.patch 427 RMD160 a4597f73560b4013e7ea26b58d6e79a41d3e5b40 SHA1 85618d48fc98236079939ef930cabc63d8b3a416 SHA256 16c3effde09823c8550594b545e635b3db5d39af6fe8e6841b062ddd5fe2a14b
 AUX sox-14.0.1-ffmpegheaders.patch 1655 RMD160 8ed54b523e16f6a0b1b978f2b584c43ff469b16b SHA1 db09ff70d6503dcc8055ee6cfcf2268347f3ac9a SHA256 3a0286f3c752e1d414517f7f422f187edae9de8ce18564e64021d1670bbec9f8
 AUX sox-14.1.0-lavc.patch 534 RMD160 9088ed507a43c3e0edc97f502a76099e2c425b1f SHA1 d635b8c413c969056c78cf05ba768c8e247bcfe7 SHA256 5713fcbb50c681d7026387d92bfb1a1940e515518b4f57d00b1225addc63ab16
 AUX sox-14.1.0-runsox.patch 517 RMD160 622deff871038c1fa9b9490c322830e38b7367f2 SHA1 1d5b0104d489cdf3fe111b651acbf0e43f66e5e9 SHA256 bc2d682e06f61956995f49e4bdb0bd9cf8581249f4ab568cd20c687611551823
+AUX sox-14.2.0-distro.patch 1245 RMD160 a0ea4f0ab40113d8ffd4f6e5be7b1f2189c6aa76 SHA1 4aba29093e30720e785bac8e51e2a661ad2d9716 SHA256 6bee373206b67fe9040ca34e98d08b32ac45330ec48f68ac665398baab97a9f6
 DIST sox-13.0.0.tar.gz 725259 RMD160 84e7c8dea4f3a9145f9b42f7f03ac2329f3b83f2 SHA1 db0e6a7356b8fcbc72cf0dca1d81782fc3fa48f4 SHA256 c66c52cfa42fe126592563c3d8974007a9858bd35d2c1136389a721eeebb9f8e
 DIST sox-14.0.1.tar.gz 859538 RMD160 b614c3006e9490876c299d768009656704ecfbc8 SHA1 b4b07e9905728209d3c97b9fb0fc65e75b4c45a1 SHA256 52398a49bef64aa6e06b158cb59b3e1790fa1bf94262b896688bcfdcf539ca73
 DIST sox-14.1.0.tar.gz 912057 RMD160 df4067b874b0ff1df594f1986aa350cf40fe5a3f SHA1 897cb68b2b4159f979e6ba33fabaa31b967a1c7e SHA256 319cf07ee06fcbfbcaced7307e23ca567739c278f76bc143a9258a9a23e42101
@@ -14,13 +12,6 @@ DIST sox-14.2.0.tar.gz 964800 RMD160 7c76a2db5c5838fc3d9f8b5402e47d548fd094d5 SH
 EBUILD sox-13.0.0.ebuild 1634 RMD160 557c72a16eadc4b9f14139ccd51821cbce3ed2f8 SHA1 3085199ef73f69e603f9d9802d3561ba530d23b9 SHA256 4e1584cdb9b9051b0424e5708030ad505c323fc6b3edc50396bf75ee408e8c0e
 EBUILD sox-14.0.1.ebuild 1999 RMD160 246a5a7a5c5a958726e3c626a52f6bdd79a5ddea SHA1 36135d2360eac323be162bd33abf988db9e3c091 SHA256 84bd0c2dae1b70c82f1887e5362eaf0aa8b9f566dfc694c30e27629138b51644
 EBUILD sox-14.1.0.ebuild 1989 RMD160 b4b817084343328608eb7c62d1a778cce7b72e17 SHA1 d8e1ac2b2aa68d1c509ea2a12722e4952cf5af38 SHA256 2ddf7aaa77535e754a47f52e6a9e01f50e347273e5db317a3b08bdd3cbb47819
-EBUILD sox-14.2.0.ebuild 1868 RMD160 cc3de437a6bcdfef28ae2b2c85663ff009ac98b6 SHA1 8f772f064162858971bd04763276d4a7dd0d8a19 SHA256 7ddb77a617c5919f038495d42f34ed1ad02bc668ca6cb15dd528d28ccd92313d
-MISC ChangeLog 13054 RMD160 16067f5b67fc76e6eb130e49cb56dd33fbb2398a SHA1 06dee40ada59ede6c8e1117abcd3f6e7790f3122 SHA256 52f27e2af4ee003f4021a3332e5b31bdb1bf539450ba3671966b03d587542ae8
+EBUILD sox-14.2.0.ebuild 1995 RMD160 cd719a658fddda75ab99140566adb607022485dd SHA1 0b4d8483158a69b1c68938fa4a104efd9ddeade4 SHA256 b54a83eb39d0996d48a3cdec7db715ceb4412199feb09f140d8cbcb282e72113
+MISC ChangeLog 13246 RMD160 63a78716b85d1cb418cbf9cfba6c69700dbd4b43 SHA1 3136937b0595f0beec30012e5278ff6e09a8dd97 SHA256 6986491b15761dc03aa56536c627964282cecdef533fdb77b33bdf5a58e68848
 MISC metadata.xml 418 RMD160 1f3867aa79178df758b99750e4a3b7e59f4be0ed SHA1 86e119a86fdcbee68766895c75337677d1e5dc40 SHA256 0548fffd025ccc348006d12685ff30dc59ba6b8f1a2a3e39baf9a2bd8dacf530
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkdRlYACgkQvFcC4BYPU0oGtACfa3pMo7kmaQJfw/DxCjg61Ejg
-rUMAn0QOzAOHYd2FJs5gx34cwWKwSqm2
-=ITYO
------END PGP SIGNATURE-----
diff --git a/media-sound/sox/files/sox-14.2.0-distro.patch b/media-sound/sox/files/sox-14.2.0-distro.patch
new file mode 100644
index 000000000000..2545934d3b9c
--- /dev/null
+++ b/media-sound/sox/files/sox-14.2.0-distro.patch
@@ -0,0 +1,36 @@
+=== modified file 'configure.ac'
+--- configure.ac	2008-11-11 12:27:08 +0000
++++ configure.ac	2008-11-11 12:28:01 +0000
+@@ -117,15 +117,23 @@
+ AC_SUBST(APP_LDFLAGS)
+ AC_SUBST(WARN_CFLAGS)
+ 
+-dnl Get distro name from /etc/issue
+-if test -r /etc/issue; then
+-  AC_MSG_CHECKING([distro name])
+-  DISTRO=`sed -e "s/.[0-9][0-9;]*[mJH]//g" < /etc/issue|tr "\n" " " | sed -e "s/(\\\\?\\\\\\\\.*//" -e "s/  */ /g" -e "s/^ //" -e "s/ $//"`
+-  AC_MSG_RESULT("$DISTRO")
+-  AC_SUBST(DISTRO)
+-  AC_DEFINE(HAVE_DISTRO, 1, [1 if DISTRO is defined])
+-  have_distro=yes
++AC_ARG_WITH(distro,
++    AC_HELP_STRING([--with-distro=distro],
++        [Provide distribution name, by default will try to grep /etc/issue]))
++
++if test "$with_distro" != "no"; then
++  DISTRO=$with_distro
++else
++  dnl Get distro name from /etc/issue
++  if test -r /etc/issue; then
++    AC_MSG_CHECKING([distro name])
++    DISTRO=`sed -e "s/.[0-9][0-9;]*[mJH]//g" < /etc/issue|tr "\n" " " | sed -e "s/(\\\\?\\\\\\\\.*//" -e "s/  */ /g" -e "s/^ //" -e "s/ $//"`
++    AC_MSG_RESULT("$DISTRO")
++  fi
+ fi
++AC_SUBST(DISTRO)
++AC_DEFINE(HAVE_DISTRO, 1, [1 if DISTRO is defined])
++have_distro=yes
+ AM_CONDITIONAL(HAVE_DISTRO, test x$have_distro = xyes)
+ 
+ dnl Check for system dependent features.
+
diff --git a/media-sound/sox/sox-14.2.0.ebuild b/media-sound/sox/sox-14.2.0.ebuild
index 0941f92a6d59..13f8b203747e 100644
--- a/media-sound/sox/sox-14.2.0.ebuild
+++ b/media-sound/sox/sox-14.2.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.2.0.ebuild,v 1.1 2008/11/10 12:11:12 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.2.0.ebuild,v 1.2 2008/11/22 21:11:36 pva Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic autotools
 
 DESCRIPTION="The swiss army knife of sound processing programs"
 HOMEPAGE="http://sox.sourceforge.net"
@@ -30,6 +30,13 @@ DEPEND="alsa? ( media-libs/alsa-lib )
 	png? ( media-libs/libpng )
 	wavpack? ( media-sound/wavpack )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-distro.patch"
+	eautoreconf
+}
+
 src_compile () {
 	# Fixes wav segfaults. See Bug #35745.
 	append-flags -fsigned-char
@@ -51,6 +58,7 @@ src_compile () {
 		$(use_with amrnb amr-nb) \
 		$(use_with png) \
 		$(use_with wavpack) \
+		--with-distro="Gentoo" \
 		--enable-fast-ulaw \
 		--enable-fast-alaw \
 		|| die "configure failed"