Remove tests that try to see if shorten doesn't accept to output to a tty as when run by portage it's not a tty thus shorten tries to output and the test fails, bug #159095

Package-Manager: portage-2.1.2.9

5 files changed, 67 insertions, 17 deletions

diff --git a/media-sound/shorten/ChangeLog b/media-sound/shorten/ChangeLog
index 7873e7cb5049..22b3f53ce272 100644
--- a/media-sound/shorten/ChangeLog
+++ b/media-sound/shorten/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/shorten
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/shorten/ChangeLog,v 1.18 2007/04/27 00:39:02 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/shorten/ChangeLog,v 1.19 2007/06/08 17:04:55 aballier Exp $
+
+  08 Jun 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/shorten-tests.patch, shorten-3.6.0.ebuild, shorten-3.6.1.ebuild:
+  Remove tests that try to see if shorten doesn't accept to output to a tty as
+  when run by portage it's not a tty thus shorten tries to output and the test
+  fails, bug #159095
 
 *shorten-3.6.1 (27 Apr 2007)
 
diff --git a/media-sound/shorten/Manifest b/media-sound/shorten/Manifest
index 1f3ac6ef3997..c756328e74c7 100644
--- a/media-sound/shorten/Manifest
+++ b/media-sound/shorten/Manifest
@@ -1,17 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX shorten-tests.patch 548 RMD160 1011d9b17fb67c83a3c1af7ddc319b1333865fea SHA1 ca7c542e4fbc32b1705a1e2c2a3e569d19e1f3fa SHA256 f9fd03c2e746aab77c1431f536ba66a355d59ad8a8f202894d3729dc0b06baf3
+MD5 b89e774c2054670552ef97eb798b321a files/shorten-tests.patch 548
+RMD160 1011d9b17fb67c83a3c1af7ddc319b1333865fea files/shorten-tests.patch 548
+SHA256 f9fd03c2e746aab77c1431f536ba66a355d59ad8a8f202894d3729dc0b06baf3 files/shorten-tests.patch 548
 DIST shorten-3.6.0.tar.gz 584183 RMD160 f9c98a683c3baa834b22e99ebbeef9fde2206390 SHA1 8d4a0f793acb23ecd29af68bcd9df272b5520b44 SHA256 5d515690aa042795ba1b4d0aa9b9bb5abb9a16562ffdc3d4a0ae890bd5652e9d
 DIST shorten-3.6.1.tar.gz 597581 RMD160 c25d0cf634ea86de2a3f155bc96f494c0a3167a0 SHA1 bd525ced0b9ba99a7a178c11647a853147977fa5 SHA256 ce22e0676c93494ee7d094aed9b27ad018eae5f2478e8862ae1e962346405b66
-EBUILD shorten-3.6.0.ebuild 592 RMD160 e29d33202c43d3623a069d51fef797383a88778e SHA1 5abd027ad38fbea5a8d8ce4065d4386ce7b2cb07 SHA256 e3775f77f7fe64e8bfdb6e058792a47a4f2707a3b99beb0eb64fce532421e0f1
-MD5 8e9e3b47dc75db750c3c00e94aef271e shorten-3.6.0.ebuild 592
-RMD160 e29d33202c43d3623a069d51fef797383a88778e shorten-3.6.0.ebuild 592
-SHA256 e3775f77f7fe64e8bfdb6e058792a47a4f2707a3b99beb0eb64fce532421e0f1 shorten-3.6.0.ebuild 592
-EBUILD shorten-3.6.1.ebuild 613 RMD160 67b85c236ed6520eecabe1e7751bdb9e4b2a1508 SHA1 f75c3494b7b2a3a6944db559dea74b15d0f8a4de SHA256 9f8f6ec8fe9d2605c7da32b6130c66c096c08070b3ee8e69401d10512e436bd9
-MD5 04c253f7b8c37f04591684f49691f86f shorten-3.6.1.ebuild 613
-RMD160 67b85c236ed6520eecabe1e7751bdb9e4b2a1508 shorten-3.6.1.ebuild 613
-SHA256 9f8f6ec8fe9d2605c7da32b6130c66c096c08070b3ee8e69401d10512e436bd9 shorten-3.6.1.ebuild 613
-MISC ChangeLog 2431 RMD160 50b584efd8d91ff5189892c4d944401e02136ec5 SHA1 c2630d18e1c78247bfa6a0d3d06d339980a6f5e3 SHA256 07e8e6733cc59ae3aaa682657b71ff3105dd780ca56dfa46249af1ddfe91cd29
-MD5 c7081691ae3464c30443a4abacc13a0b ChangeLog 2431
-RMD160 50b584efd8d91ff5189892c4d944401e02136ec5 ChangeLog 2431
-SHA256 07e8e6733cc59ae3aaa682657b71ff3105dd780ca56dfa46249af1ddfe91cd29 ChangeLog 2431
+EBUILD shorten-3.6.0.ebuild 689 RMD160 dca2d00b5c468aba86a2b2edb2a83a301b2ebb9c SHA1 317fd23322532b6198fa9b21be0c3177592e3efd SHA256 314613e371d2766c3984bb02540177816a0e4cf0ba43dd7bdbf4fa9cca371f49
+MD5 a80c19f2347548bbb859774ea79aade7 shorten-3.6.0.ebuild 689
+RMD160 dca2d00b5c468aba86a2b2edb2a83a301b2ebb9c shorten-3.6.0.ebuild 689
+SHA256 314613e371d2766c3984bb02540177816a0e4cf0ba43dd7bdbf4fa9cca371f49 shorten-3.6.0.ebuild 689
+EBUILD shorten-3.6.1.ebuild 696 RMD160 4a3ce2e415f6dd7e6b58425cb6b5b473c0df020f SHA1 0ac8bfff0918b66826e06f065c4c5ab3ee68857c SHA256 451143045887becb5bdbf0dfde84b26db8187c278cc35b7d105a3c45aa53ad72
+MD5 185d18167db25a65d777563612f5fc7a shorten-3.6.1.ebuild 696
+RMD160 4a3ce2e415f6dd7e6b58425cb6b5b473c0df020f shorten-3.6.1.ebuild 696
+SHA256 451143045887becb5bdbf0dfde84b26db8187c278cc35b7d105a3c45aa53ad72 shorten-3.6.1.ebuild 696
+MISC ChangeLog 2738 RMD160 7de3358a25b27dff210487110deead2d69309479 SHA1 53e661e616b7c73816db06bbd5feb22935414313 SHA256 caa057b9de035f40ac354b8d5905e3fbf77c801cc898ad745c466a26f9bb585c
+MD5 efdd27360c8dd63d6ba8f7c64a2b703a ChangeLog 2738
+RMD160 7de3358a25b27dff210487110deead2d69309479 ChangeLog 2738
+SHA256 caa057b9de035f40ac354b8d5905e3fbf77c801cc898ad745c466a26f9bb585c ChangeLog 2738
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -22,3 +29,10 @@ SHA256 aba8020484b22c9570a85f3339790ab5833ac2e4cb17e1e69aad71a685cbc0df files/di
 MD5 ead45729cb49932d0614601af5181378 files/digest-shorten-3.6.1 241
 RMD160 f701a2455d83338934ac89f613ca9d1afeacd769 files/digest-shorten-3.6.1 241
 SHA256 b0c06ee5fe61286f255b8006659349d0f98bc43202e48f4f5eb5b132158afc34 files/digest-shorten-3.6.1 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGaYxZvFcC4BYPU0oRAkY8AJ4m/fQdDPF+DYM4HXMALDSrC3XfjgCgsmJb
+QraCR3Y3RNhkEieRFWBPmHw=
+=e3nF
+-----END PGP SIGNATURE-----
diff --git a/media-sound/shorten/files/shorten-tests.patch b/media-sound/shorten/files/shorten-tests.patch
new file mode 100644
index 000000000000..9d067fe3b63c
--- /dev/null
+++ b/media-sound/shorten/files/shorten-tests.patch
@@ -0,0 +1,15 @@
+Index: shorten-3.6.1/tests/test-errors.sh
+===================================================================
+--- shorten-3.6.1.orig/tests/test-errors.sh
++++ shorten-3.6.1/tests/test-errors.sh
+@@ -36,8 +36,8 @@ for testdir in mono stereo; do
+   $SHORTEN - - && exit 1
+   $SHORTEN - test.shn && exit 1
+   $SHORTEN -x - test.wav && exit 1
+-  $SHORTEN test.wav - && exit 1
+-  $SHORTEN -x test.shn - && exit 1
++  #$SHORTEN test.wav - && exit 1
++  #$SHORTEN -x test.shn - && exit 1
+ 
+   # test missing filename with -S
+   $SHORTEN -S test.shn && exit 1
diff --git a/media-sound/shorten/shorten-3.6.0.ebuild b/media-sound/shorten/shorten-3.6.0.ebuild
index 8904ccc22649..6806fa2b51ea 100644
--- a/media-sound/shorten/shorten-3.6.0.ebuild
+++ b/media-sound/shorten/shorten-3.6.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/shorten/shorten-3.6.0.ebuild,v 1.5 2006/12/08 00:42:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/shorten/shorten-3.6.0.ebuild,v 1.6 2007/06/08 17:04:55 aballier Exp $
+
+inherit eutils
 
 IUSE=""
 
@@ -12,6 +14,12 @@ SLOT="0"
 LICENSE="as-is"
 KEYWORDS="alpha amd64 ~ppc sparc x86 ~x86-fbsd"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-tests.patch"
+}
+
 src_install() {
 	make DESTDIR="${D}" install || die
 	dodoc AUTHORS LICENSE ChangeLog NEWS README
diff --git a/media-sound/shorten/shorten-3.6.1.ebuild b/media-sound/shorten/shorten-3.6.1.ebuild
index 6a4b830de6be..780cc90a1430 100644
--- a/media-sound/shorten/shorten-3.6.1.ebuild
+++ b/media-sound/shorten/shorten-3.6.1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/shorten/shorten-3.6.1.ebuild,v 1.1 2007/04/27 00:39:02 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/shorten/shorten-3.6.1.ebuild,v 1.2 2007/06/08 17:04:55 aballier Exp $
+
+inherit eutils
 
 IUSE=""
-RESTRICT="test"
 
 DESCRIPTION="fast, low complexity waveform coder (i.e. audio compressor)"
 HOMEPAGE="http://shnutils.freeshell.org/shorten/"
@@ -13,6 +14,12 @@ SLOT="0"
 LICENSE="as-is"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-tests.patch"
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog NEWS README