Set RESTRICT=test (bug #276687).

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 23 insertions, 78 deletions

diff --git a/sys-block/parted/ChangeLog b/sys-block/parted/ChangeLog
index d5810574eeb0..01ed8b929e80 100644
--- a/sys-block/parted/ChangeLog
+++ b/sys-block/parted/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-block/parted
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/ChangeLog,v 1.50 2014/11/04 09:28:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/ChangeLog,v 1.51 2014/11/04 09:41:40 jer Exp $
+
+  04 Nov 2014; Jeroen Roovers <jer@gentoo.org> parted-2.4.ebuild,
+  parted-3.2.ebuild:
+  Set RESTRICT=test (bug #276687).
 
   04 Nov 2014; Agostino Sarubbo <ago@gentoo.org> parted-3.2.ebuild:
   Stable for sparc, wrt bug #527846
diff --git a/sys-block/parted/Manifest b/sys-block/parted/Manifest
index de86b5e8c6de..83653c6c7d43 100644
--- a/sys-block/parted/Manifest
+++ b/sys-block/parted/Manifest
@@ -9,25 +9,15 @@ AUX parted-3.2-devmapper.patch 1972 SHA256 a72db7a487b891b19e6b859a6deaa4defe0c6
 DIST parted-2.4.tar.xz 1516412 SHA256 508ff75591b9c8cc9d06f1e0b1db1a082a4b0c1b9d4efaac48b4ca46370d9073 SHA512 1f7ac11079981b176c1157bd6d858e67394bb4be9b622f91d4e78412a41c696809ed60912b8b94f3a2a924b2f43638dd5d6cb6f4c28e8dc63a2d421380cb5477 WHIRLPOOL 688a44c88ffd99523f17eb5c8722cf4ee09bd0af105ab45a7bd08050682345288182f90bbebf6fed8bdbb1a4deac965084a0f430ef6490d154671de58de50574
 DIST parted-3.1.tar.xz 1524344 SHA256 5e9cc1f91eaf016e5033d85b9b893fd6d3ffaca532a48de1082df9b94225ca15 SHA512 f29a67a16cf79f08abbfc5eeb6ad0480d834aa50e715378626dc89e3b12ce71f19202e9f38429e5521ebe877c4e74ff1e08f0b0ecbdbe79ba1c51fdcbef6e852 WHIRLPOOL 8e4c0b3f045405acbf5eab8d72d46450cb5c6adc50b9eba4ad4a9600da9ea203b412cf151d03782b045dc7f6232bd79ace85d01ce9d2faba458ee48b9df00de9
 DIST parted-3.2.tar.xz 1655244 SHA256 858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4 SHA512 4e37dbdd6f5032c9ebfec43704f6882379597d038167b9c4d04053efa083c68a705196713864451fa9e11d32777e16c68982877945c5efd9ea5f8252cb20e1c4 WHIRLPOOL af928177b893150ac6d5e0efcef542b6fa0df6b135f975078f7d8d5f7a4b109ef4c1f8eeaf6afc5c34448ff662ce4cbe5289e084f4ec05257666503a0cd3c93f
-EBUILD parted-2.4.ebuild 2036 SHA256 bdbe3aff61ddfde6a35a6e5d38621aaf3cb34011f659e4787b75acd9d2f9723b SHA512 fbca6311d711aa4503ad79c57b2253333a3ac2d246fed4df036e571929737490177017604ca304bdd88837a137c268cb6df6108d14df31dfb2abdc013dd54792 WHIRLPOOL a34eda0a1d5e12bbc159ae38a325c3dcfda04f7b249a3d43723cf4f75cf1d689e711ca5f1a21f4ac6b0a34c48b87fd932891fb9bbfd6fc3a24b093493a3ed7c0
+EBUILD parted-2.4.ebuild 1387 SHA256 59ae342e7bf71a6c4f7a7def76dd52c31091c0cf2d88689a04c2bdadcfe60345 SHA512 c77e75b495461654140ca4f140111f50c2850d903955d46cd646cafefae893c2f2fab36884b60d377f45fa843269d8ea2a53616f2574412616680ceca5c6fe07 WHIRLPOOL 98d0c4085923c1c20081220c83500428cf1ebebcc7168d584f3c93cd51f02a584efeeed36b2bb4fa79cfab538cce29a9ec29b97376033f59cbbad5c24daaae15
 EBUILD parted-3.1-r1.ebuild 2207 SHA256 71d5c032cca8c270164b18e1b75e0503b253b7b0972844d28fcd4c4f2abc18b6 SHA512 93c42236684890341326850966031a59b15e305f99cd4852a238ca669c6800d5efee9be60ab5ce72d509ee305a6d4f75505749e38f1b8cd5c8938a661141431f WHIRLPOOL f018161c2b9a9a1cb2123f87f1997c5f8801861b79af206a37eaf198fbc091a8c88dbcd6a799929e4372a49b5cc100a79e102afb002d413b09e0297ef2b5ebc8
-EBUILD parted-3.2.ebuild 1982 SHA256 a20293da07424ea0ffacaf261e2f67b0bdc7c0b86be3a09320ae9bbf2fa2f06c SHA512 20ebbe5669e0fd02c26f099ab7258817942a647bf98dbf8ab3c9921e484246898e78e77da48ce5795d16bee5b8c444f1b8815c49215a6bf43da9b62526a16180 WHIRLPOOL d0af2425ddda0955649d8b4c6616d654d24a546445f030c71477f65b4a8bda5a7b4f4f13449c150921874be106fc97c678596bee7a3da622b08891b2d36faa1e
-MISC ChangeLog 28437 SHA256 652a018319945c6e56c586e07c11e2e5c32140b136582514e634c7146f097702 SHA512 f21fd784690ef60e7c20b021630a4f92978350e148131d8cb8dca08f1769d7d0ca49985900f86a29d2fd9ab5771de166357c89a698ffff34b2c134e91774f914 WHIRLPOOL 75b94a0d6a9def747a6405b554013ae04d2a8fe371b100cd752b4076745d8732a6e88ca7b1e0cb9105c97e4e7623d324a92212fd18ac360fb375746066a0c034
+EBUILD parted-3.2.ebuild 1341 SHA256 9fdddadf0f501d0f5d5447742cb7fbdaaeae14f392cdcf9b18e1e01662bf8047 SHA512 d5b481fea2ef19b1822585bbab0d5753feb2675b71cab44290e957ab2138a99b29474c8c2e765db6a7192cc0bb3cdc15179c4290ae75782d96bb0a5d07b96b66 WHIRLPOOL 12e8c07d9d86a41408d8783ae06fb721976bf69e9cdae0196cc06758d9c84e2814e39099f335b597c1ec6e7b39b6f32dd03f2b89e5370db0b39dfe6e2fee2e48
+MISC ChangeLog 28560 SHA256 6be59c778654d55a5e81fe363623bafa17079400e218382690a9363a9f3b9372 SHA512 226ade9f52f80ae96fe58cf0837a506e4ee09e4bf94490e70089ae5ff941e5965bb38c665ff26cb033b840f35f2cafecb9cdd629594951c71c6fc8f6a2a779e8 WHIRLPOOL 93d8056c3591b5f9f207eacaa33545afc3d7d3cf1a1c683c6e519cad9e48970382e0c10c5949725592bf41ec3180d79e4f1be5818eafcd5b2178f2c2ca023430
 MISC metadata.xml 654 SHA256 6e27cdd8e0c516256079e3ad9606e7b660a3fe223e3d769c3a5fc265f5d13bd2 SHA512 4e99dbb6bacc84d5dfccf4f56cd474aa5cd9368f23989b71d38101913702f5670af44f41947158b07662fcbee3ddfc36eb8cdf8c3899387a8cf4efd4c24c6ccf WHIRLPOOL 49366ca8e059614582ec750bd215ef79b2090cb615e85d1d5e5d4093c135ff9a4513862ecf9827318163a622df035855b0795ab6405427c4d48712fe2080e0fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUWJw8AAoJELp701BxlEWfcjgQALLqI3xVxguMjvHk2HENqpM+
-4YOIM7v5fs/16yG5jBipqAGK62JHPLHNEbGOEZnlo42poUVoCJ/viknahURAzNK1
-JD+fglndwrNOHAlw62SMxAscI1yXz7K1qi/6ZAncV6pRWWxlhZq1J7B73IsHlI4N
-nZG9HcEofGijZSHjSN0qUIkJC2H4RADG32tziLf6TOJLde9WR91cGldeeRzwGM1E
-7WNu5TyxjaUDs3omNfvBIQ4Z4m5xFUMNRmfVu8vGYvc1BfOjXmhwELZAxy5FzhNR
-nFDCpG/yu/2laEfrOQy+QSqK2jdLX6567vfrUS5CN6vcABAM+RDJ4esm+t75G6Nt
-vuwwFU5PRskrtYqDJqZlgFFVgUNFUsj9e/lAnndHfnS6vK3TOBOa8RkBWOqXg92E
-wKqcwzwUXNoKicKAxyXjVlTSh1rqsaqvkDwJwe9J2IwthqQYFWuuHkcVFLWnhSOy
-AxjGXsfROSF41ORYDLfvJUXZgot1XsHQuS/d5OLOW+rtDntmTtH1CL0ijjT3dy7k
-DWvNE5BIqw3pJUCRUyBHsJZfKKNqnOla8oMaJypnsaetAhtZ02ZB1KauCOxBwPtE
-CuFkOl4cNzU1OzBSEatSDz/WxrFgRGzplc8ZiFnV0TKA10UEEkAzwI6P4O22MCsm
-C/4xFZwJbqeoDn72Qps+
-=ygl9
+iEYEAREIAAYFAlRYn1YACgkQVWmRsqeSphNYYACbBHJqHjpzLjMg+wcKVYi0GL7q
+ACcAnA9Mc6ArF5bLBHXTZXEr5e3Ja/n9
+=C71m
 -----END PGP SIGNATURE-----
diff --git a/sys-block/parted/parted-2.4.ebuild b/sys-block/parted/parted-2.4.ebuild
index 8cbc4c0acc1c..255955d3736b 100644
--- a/sys-block/parted/parted-2.4.ebuild
+++ b/sys-block/parted/parted-2.4.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/parted-2.4.ebuild,v 1.18 2014/03/04 00:25:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/parted-2.4.ebuild,v 1.19 2014/11/04 09:41:40 jer Exp $
 
-EAPI="3"
-
-inherit autotools eutils
+EAPI=5
+inherit eutils
 
 DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
 HOMEPAGE="http://www.gnu.org/software/parted"
@@ -14,6 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="+debug device-mapper nls readline selinux static-libs"
+RESTRICT="test"
 
 # specific version for gettext needed
 # to fix bug 85999
@@ -33,16 +33,6 @@ DEPEND="
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-no-gets.patch
 	epatch "${FILESDIR}"/${P}-readline.patch
-
-	# Remove tests known to FAIL instead of SKIP without OS/userland support
-	sed -i libparted/tests/Makefile.am \
-		-e 's|t3000-symlink.sh||g' || die "sed failed"
-	sed -i tests/Makefile.am \
-		-e '/t4100-msdos-partition-limits.sh/d' \
-		-e '/t4100-dvh-partition-limits.sh/d' \
-		-e '/t6000-dm.sh/d' || die "sed failed"
-
-	eautoreconf
 }
 
 src_configure() {
@@ -55,23 +45,12 @@ src_configure() {
 		$(use_with readline) \
 		--disable-Werror \
 		--disable-rpath \
-		--disable-silent-rules \
-		|| die
+		--disable-silent-rules
 }
 
-src_test() {
-	if use debug; then
-		# Do not die when tests fail - some requirements are not
-		# properly checked and should not lead to the ebuild failing.
-		emake check
-	else
-		ewarn "Skipping tests because USE=-debug is set."
-	fi
-}
+DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} )
 
 src_install() {
-	emake install DESTDIR="${D}" || die "Install failed"
-	dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
-	dodoc doc/{API,FAT,USER.jp}
-	find "${ED}" -name '*.la' -exec rm -f '{}' +
+	default
+	prune_libtool_files
 }
diff --git a/sys-block/parted/parted-3.2.ebuild b/sys-block/parted/parted-3.2.ebuild
index e987472efde5..34a757c28caf 100644
--- a/sys-block/parted/parted-3.2.ebuild
+++ b/sys-block/parted/parted-3.2.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/parted-3.2.ebuild,v 1.4 2014/11/04 09:28:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/parted-3.2.ebuild,v 1.5 2014/11/04 09:41:40 jer Exp $
 
 EAPI=5
-
-inherit autotools eutils
+inherit eutils
 
 DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
 HOMEPAGE="http://www.gnu.org/software/parted"
@@ -13,7 +12,8 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86"
-IUSE="+debug device-mapper nls readline selinux static-libs test"
+IUSE="+debug device-mapper nls readline selinux static-libs"
+RESTRICT="test"
 
 # specific version for gettext needed
 # to fix bug 85999
@@ -28,31 +28,10 @@ DEPEND="
 	${RDEPEND}
 	nls? ( >=sys-devel/gettext-0.12.1-r2 )
 	virtual/pkgconfig
-	test? (
-		>=dev-libs/check-0.9.3
-		dev-perl/Digest-CRC
-	)
 "
 
 src_prepare() {
-	# Remove tests known to FAIL instead of SKIP without OS/userland support
-	sed -i \
-		-e 's|t3000-symlink.sh||g' \
-		libparted/tests/Makefile.am || die
-
-	sed -i \
-		-e '/t4100-dvh-partition-limits.sh/d' \
-		-e '/t4100-msdos-partition-limits.sh/d' \
-		-e '/t6000-dm.sh/d' \
-		tests/Makefile.am || die
-	# There is no configure flag for controlling the dev-libs/check test
-	sed -i \
-		-e "s:have_check=[a-z]*:have_check=$(usex test):g" \
-		configure.ac || die
-
 	epatch "${FILESDIR}"/${PN}-3.2-devmapper.patch
-
-	eautoreconf
 }
 
 src_configure() {
@@ -67,13 +46,6 @@ src_configure() {
 		--disable-silent-rules
 }
 
-src_test() {
-	if use debug; then
-		emake check
-	else
-		ewarn "Skipping tests because USE=-debug is set"
-	fi
-}
 DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} )
 
 src_install() {