Fixed src_test, #277097

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-util/shunit2/ChangeLog b/dev-util/shunit2/ChangeLog
index bf1eb4b54a6a7f002cbd85323a96cddf2de76ee3..36a6967e14cc68148bf8051ab99f7309afe0619e 100644 (file)
--- a/dev-util/shunit2/ChangeLog
+++ b/dev-util/shunit2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/shunit2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/shunit2/ChangeLog,v 1.3 2010/06/26 07:40:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/shunit2/ChangeLog,v 1.4 2010/06/26 11:02:00 jlec Exp $
+
+  26 Jun 2010; Justin Lecher <jlec@gentoo.org> shunit2-2.1.4.ebuild,
+  shunit2-2.1.5.ebuild, +files/test.patch:
+  Fixed src_test, #277097
 
 *shunit2-2.1.5 (26 Jun 2010)
 

diff --git a/dev-util/shunit2/Manifest b/dev-util/shunit2/Manifest
index 036b4f77a3a96f4a342caa53994816feb6a86bda..b87d8a29d6e2aac89f16be4bb290d610af178583 100644 (file)
--- a/dev-util/shunit2/Manifest
+++ b/dev-util/shunit2/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX test.patch 358 RMD160 2598e871443b2a4969b9eb07f6cc9d3ff9921373 SHA1 1106167fa451d5a7c85cafe03d8c51c69e4529ee SHA256 ce5666605d797c7166dfeaf05dfe5baac078ef8d2a10c92e36fad991485a733a
 DIST shunit2-2.1.4.tgz 49698 RMD160 d2d20d60f84c7974795a9b4087edcada6f419b84 SHA1 f6f2788c74ead24ec55bac5bece53f50ffbc95d6 SHA256 7f911f871fefa9513972dedd5be1b406e2f2d49d19103c6229098957c4cced57
 DIST shunit2-2.1.5.tgz 65021 RMD160 f2998efbf2a128427e2ac1167e96dba0fdac62e8 SHA1 f25ba387e1de9db8638e5deb9a4870d567c482c6 SHA256 87b93a205fe451191937f4e54e6a15457023dd091efa27ea7f1c2e56a35bb0ce
-EBUILD shunit2-2.1.4.ebuild 1020 RMD160 ccf299e8418bad1af355385638fea14f38c69d06 SHA1 52f15f3935e1438f2065b501ea9732cbad41e77c SHA256 23536885604668f9001f8d82f219fa7b24f1a18bcd823c1f9158b99a66ca20cb
-EBUILD shunit2-2.1.5.ebuild 1023 RMD160 e627430240f8c46e123d834df8c1ee255198ed2b SHA1 f263c5a117b737e44ab2aaa0abc3d837278aa8e9 SHA256 1e1fa919497969d9265a74bdd9f395ddb226e6ebdf04f2f3c0ecd454622113f2
-MISC ChangeLog 688 RMD160 df240a44d945fc1fb8d96ba676a111a841438338 SHA1 6f294ed210e74640cfd0cee3e6c6167c9bf16a60 SHA256 3781002b3922751293f95202f67201ff0ae5f4139f335bf3d408614a558095c7
+EBUILD shunit2-2.1.4.ebuild 1035 RMD160 9f6e44959433a41e71db0813b26f35534c068ab2 SHA1 3964afd3f93925088cd4be68479ce827af30906d SHA256 1bae7b0748d86a645eadfcbfcc06caa091bbf285c90f9e5eb122440f63302c81
+EBUILD shunit2-2.1.5.ebuild 1035 RMD160 cfcc11df4eb43731dbde02a1b9c58fa6a9c21e3c SHA1 ab8a54410a5ec8fb111ae473c59ffa0bc8882737 SHA256 f8a07617ffbf3354be2c791905b94394f68cd91718b068b5f1b1eb3b805e2137
+MISC ChangeLog 827 RMD160 021d22b1266a1121543aa6985982467e01ec24dd SHA1 1a2ed6d501707c18a3213791384377004107c603 SHA256 98a90d64a293c5113e77174615eaed7e52d9b8165689c5cab068f565b8ca3b5b
 MISC metadata.xml 557 RMD160 4b11254c1fa726034d49041b28b24a9c4c0ae04d SHA1 6964040c1cc567c8d72e424e0645126476d60468 SHA256 5958062d7f991b468518d748806c22c74f7f0bf5549f551f402ceebba5ffbd0e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwlruAACgkQgAnW8HDreRZQSwCfb4SG6OsrZkNCmOw5O1ShNMvW
-wWMAoJa46BKPtpg9xkJSwBHBtLgsqie+
-=zo0b
+iEYEARECAAYFAkwl3i4ACgkQgAnW8HDreRaOgwCfZtaI1xv3yaJ9W3tpssLl3q2n
+y7sAoM/zUtEbXoJYyES/Jm+ig2CNOsbx
+=r2O9
 -----END PGP SIGNATURE-----

diff --git a/dev-util/shunit2/files/test.patch b/dev-util/shunit2/files/test.patch
new file mode 100644 (file)
index 0000000..a2a7028
--- /dev/null
+++ b/dev-util/shunit2/files/test.patch
@@ -0,0 +1,14 @@
+diff --git a/Makefile b/Makefile
+index 080ba0c..629781e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -70,7 +70,8 @@ docs-docbook-prep:
+         $(BIN_DIR)/docbookPrep.sh "$(DOCBOOK_SHARE_DIR)"; \
+       fi
+ 
+-test: @echo "executing $(PROG) unit tests"
++test:
++      @echo "executing $(PROG) unit tests"
+       ( cd $(TEST_SRC_DIR); ./shunit2_test.sh )
+ 
+ dist: dist-clean build docs

diff --git a/dev-util/shunit2/shunit2-2.1.4.ebuild b/dev-util/shunit2/shunit2-2.1.4.ebuild
index ef91661ddcc3dc46ccd442ff7d42d17aa76e1906..d263f95b310f894f613ab9ef4fc58c66ca4037be 100644 (file)
--- a/dev-util/shunit2/shunit2-2.1.4.ebuild
+++ b/dev-util/shunit2/shunit2-2.1.4.ebuild
@@ -1,8 +1,12 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/shunit2/shunit2-2.1.4.ebuild,v 1.2 2008/10/25 13:15:40 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/shunit2/shunit2-2.1.4.ebuild,v 1.3 2010/06/26 11:02:00 jlec Exp $
 
-DESCRIPTION="shUnit2 is a unit-test framework for Bourne-based shell scripts."
+EAPI="3"
+
+inherit eutils
+
+DESCRIPTION="Unit-test framework for Bourne-based shell scripts."
 HOMEPAGE="http://code.google.com/p/shunit2/wiki/ProjectInfo"
 SRC_URI="http://shunit2.googlecode.com/files/${P}.tgz"
 
@@ -16,16 +20,14 @@ DEPEND="${RDEPEND}
        dev-lang/perl
        net-misc/curl"
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       sed -i -e '/^__SHUNIT_SHELL_FLAGS/s:u::' src/shell/shunit2
+src_prepare() {
+       epatch "${FILESDIR}"/test.patch
+       sed -i -e '/^__SHUNIT_SHELL_FLAGS/s:u::' src/shell/shunit2 || die
 }
 
 src_compile() {
        local myconf="build"
        use doc && myconf="${myconf} docs"
-       use test && myconf="${myconf} test"
 
        emake ${myconf} || die
 }
@@ -39,6 +41,7 @@ src_install() {
        fi
 
        dodoc doc/*.txt || die
+       dohtml doc/*.html || die
 
        insinto /usr/share/${PN}
        doins build/* || die

diff --git a/dev-util/shunit2/shunit2-2.1.5.ebuild b/dev-util/shunit2/shunit2-2.1.5.ebuild
index bacef12cc8c8ec97663c94d21734614f81d6c968..4b301bb9f92e932f86d8b210452e56c77954e510 100644 (file)
--- a/dev-util/shunit2/shunit2-2.1.5.ebuild
+++ b/dev-util/shunit2/shunit2-2.1.5.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/shunit2/shunit2-2.1.5.ebuild,v 1.1 2010/06/26 07:40:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/shunit2/shunit2-2.1.5.ebuild,v 1.2 2010/06/26 11:02:00 jlec Exp $
 
 EAPI="3"
 
+inherit eutils
+
 DESCRIPTION="Unit-test framework for Bourne-based shell scripts."
 HOMEPAGE="http://code.google.com/p/shunit2/wiki/ProjectInfo"
 SRC_URI="http://shunit2.googlecode.com/files/${P}.tgz"
@@ -19,13 +21,13 @@ DEPEND="${RDEPEND}
        net-misc/curl"
 
 src_prepare() {
+       epatch "${FILESDIR}"/test.patch
        sed -i -e '/^__SHUNIT_SHELL_FLAGS/s:u::' src/shell/shunit2 || die
 }
 
 src_compile() {
        local myconf="build"
        use doc && myconf="${myconf} docs"
-       use test && myconf="${myconf} test"
 
        emake ${myconf} || die
 }