Restrict tests that fail with sandbox enabled, wrt bug #279465. Migrate to EAPI 4.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

3 files changed, 29 insertions, 34 deletions

diff --git a/app-forensics/zzuf/ChangeLog b/app-forensics/zzuf/ChangeLog
index 3fe08e58e097..06825bfcf139 100644
--- a/app-forensics/zzuf/ChangeLog
+++ b/app-forensics/zzuf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-forensics/zzuf
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/zzuf/ChangeLog,v 1.11 2012/05/21 18:35:08 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/zzuf/ChangeLog,v 1.12 2012/10/31 18:25:20 kensington Exp $
+
+  31 Oct 2012; Michael Palimaka <kensington@gentoo.org> zzuf-0.13-r1.ebuild:
+  Restrict tests that fail with sandbox enabled, wrt bug #279465. Migrate to
+  EAPI 4.
 
   21 May 2012; Kacper Kowalik <xarthisius@gentoo.org> zzuf-0.13-r1.ebuild:
   Add missing inheritance of eutils.eclass
@@ -47,4 +51,3 @@
   19 Apr 2008; Diego Pettenò <flameeyes@gentoo.org> +metadata.xml,
   +zzuf-0.10.ebuild:
   Initial import of zzuf. Thanks also to Jakub Moc in bug #188646.
-
diff --git a/app-forensics/zzuf/Manifest b/app-forensics/zzuf/Manifest
index b1c2a178238d..8158260ead7f 100644
--- a/app-forensics/zzuf/Manifest
+++ b/app-forensics/zzuf/Manifest
@@ -1,5 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST zzuf-0.13-zzcat-zzat-rename.patch.bz2 11370 SHA256 33864b8a54fc71464650130c5b2092d969776535f787075119a6750e869d99d3 SHA512 5df3ccc08315c8a983f13294ca3fc38f3b7094a9ba04a46ee7740522ad486318bcf019fec78d60581cb541b5ebdbe1d0751273233d5a54b03f411aef84790529 WHIRLPOOL 87c8561d2eba2626d97600964b7ee8851a1f8a4dc40eda758b5e4854b9149f71b8a26223f36355b707c1e30d559dd1e977292ba2f17d79fa1992a414a573c31d
 DIST zzuf-0.13.tar.gz 461498 SHA256 0842c548522028c3e0d9c9cf7d09f6320b661f33824bb6df19ca209851bdf627 SHA512 e8208dae68b4eee5ebc96775476f616c6822bc9a6a9c753d7f477e9f3e6f527a03e1aec494c2cb8a6666f3159104ea2e221acf8da35efb7d8e357666dbc315ce WHIRLPOOL b4fe880dbd894ee270a847614456536e7d3f615bf3fa01251cbeac863f95704ff766e858fcb037d7e1dcd089acfffb297aea6c8fa01bde4940370288590e8867
-EBUILD zzuf-0.13-r1.ebuild 1878 SHA256 f053479c5b402c87a816301c949ddc30baf417ef61bcad903baa8e4ad23c0565 SHA512 751a90b482aa9bd3cc6723cb5a046d73e2644d5229ee2b4b1e6b7685ee406b9ef854ab7d3186460f64f22047ddb0dec62ed63a37df183b0c1dca2468a5d4165c WHIRLPOOL fa569d1f2deddb57c6410af614dde66ad3f470797a8a51175e3e225ba307ea9760a3064cb3932bda0b4e1554d3c7f6700944a8805b7ccd7320f74798e3f16be7
-MISC ChangeLog 1653 SHA256 58293aed1558726330173ea7b4fd1020fe3fd709ee789dd39c96b8c7973ed367 SHA512 1b4606198f1cdc6396547dc49543e111429e3aa839a7ea068eaff170ffc1a524e56c1a1665c7590807df4bfd9618821f84cff098410e3ee47193ffe38ff665bd WHIRLPOOL 0a203cbcbfeac475b73137deb021df190a95302dd033c77117f869fff37d1c8e8322ba5aab7e72dfb2d848736bb0a0c970f9a2a9583469de282b5a59845f2e1f
+EBUILD zzuf-0.13-r1.ebuild 1274 SHA256 fba0816efb6bbd7c8080eca64c36d6303abf2c48b8f65d346eac3c9c4c8cbb03 SHA512 1f030f21879e044a494b765cc3b5fd4a68090aa859ab4cc5025825fd4dc2c16dc70d140a2e4d656e828e15c98715e60a8278719b931343f0bab5f5cb96e30e63 WHIRLPOOL 46b8a8a5ca9c0d1efb10e6399e085e84161ede9736a699d48a5495c8a0e94225d30c23962d3ce10bbf013da44aa98407647528b146a35762ac3bc50e419e203a
+MISC ChangeLog 1817 SHA256 2bb266a70956de71f2ddfd2020b13f218448025234c3985cb8fe6f57924dbf2b SHA512 5f3ad98a81b746e70ec8727bfd5021dc2ef70b6ec3b432b4b61be8350d9af97581e3ee524cc45040e8d709d6c9b1ec2491899727d500653962e8107abe4ad2ee WHIRLPOOL 8d3d46c3b43dfea926b13776f4f593af8f799a32836326e97920f60ad2175e5a73820daeca096143f7bbbb62518bb9ee8146612cab5b1eae23144e4ceb7e9bef
 MISC metadata.xml 292 SHA256 ed31222caf411bbd2101fd43f6b711048213b7ecf27ce7f1643eff0f0ed5f2b3 SHA512 0ec4134c0758cff77acbf2579a2643ec60918c78442908c6d9fb905aca1ab933dba831c863409d34b535f7f8f20cbd4faaa5f9e9914995814d5192333eaf7497 WHIRLPOOL 5520ce6a1c103e5a91a62a5c3a38a9b2dbae12991be718f2104e7fae4f0122e9a6bee61edb5b9818c0234b908de9481316b0596b9084cd54c2d36774541dcf11
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQkWy4AAoJEMbwO6tnXQ0s+AkH/2Tedvb9SRNdqY/slfRO9q9u
+J5q15Bd/AOm0jlU2K6xotoGmocYbpRd9oniZXIcmo/5+4AxLiTpqqkZXqLmcI34b
+w2zJnvTHHhrj89Os5vHQxS3UUsYqP1xORHHS+WwZ4lP8ky2Mg+7MMkz7VhaDQcuh
+aY0m0bf7D1VZ+Z7RCfXkIQ1/0jP1iSs7FkbJoDUr8vMTxv+p2pChKDuTtBYAGxln
+wcViKMXs1IW+5YCY8CXTgQmWEgSFDS4T06TFdiJCygN8JI6yjQG97zjfxoi9zl2W
+kFxWYOtOY4KYOkK6FQGX/2HC8j5B03GZkTTTXUMv08Lve3Btz5qIt5xRjsRdjh4=
+=l/U6
+-----END PGP SIGNATURE-----
diff --git a/app-forensics/zzuf/zzuf-0.13-r1.ebuild b/app-forensics/zzuf/zzuf-0.13-r1.ebuild
index 33cfe9892fe3..3dbe7ae4e61d 100644
--- a/app-forensics/zzuf/zzuf-0.13-r1.ebuild
+++ b/app-forensics/zzuf/zzuf-0.13-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/zzuf/zzuf-0.13-r1.ebuild,v 1.3 2012/05/21 18:35:08 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/zzuf/zzuf-0.13-r1.ebuild,v 1.4 2012/10/31 18:25:20 kensington Exp $
 
-EAPI="2"
+EAPI=4
 
 inherit autotools eutils
 
@@ -16,8 +16,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~sparc ~x86"
 IUSE=""
 
-DEPEND=""
-RDEPEND=""
+# fails with sandbox enabled
+RESTRICT="test"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
 
 src_prepare() {
 	sed -i -e '/CFLAGS/d' "${S}"/configure.ac \
@@ -35,35 +37,11 @@ src_configure() {
 	# preloading, so there is no reason to build it statically, unless
 	# you want to use zzuf with a static-linked executable, which I'm
 	# not even sure would be a good idea.
-	econf \
-		--disable-dependency-tracking \
-		--disable-static \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-# This could be removed in next versions if my patches will be applied
-# by Sam. -- Diego 'Flameeyes'
-src_test() {
-	if has sandbox ${FEATURES}; then
-		ewarn "zzuf tests don't work correctly when sandbox is enabled,"
-		ewarn "skipping tests. If you want to run the testsuite, please"
-		ewarn "disable sandbox for this build."
-		return
-	fi
-
-	cd "${S}"/test
-	emake check || die "Unable to build tools needed for testsuite"
-
-	./testsuite.sh || die "testsuite failed"
+	econf --disable-static
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
+	default
 
 	find "${D}" -name '*.la' -delete
 }