Set RESTRICT=test (bug #277104). Do not install examples/VERSION.

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

4 files changed, 28 insertions, 30 deletions

diff --git a/net-misc/socat/ChangeLog b/net-misc/socat/ChangeLog
index ce931b634f3d..13d5b8c15db7 100644
--- a/net-misc/socat/ChangeLog
+++ b/net-misc/socat/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/socat
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/ChangeLog,v 1.133 2014/03/18 17:39:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/ChangeLog,v 1.134 2014/03/22 15:32:07 jer Exp $
+
+*socat-2.0.0_beta7-r1 (22 Mar 2014)
+*socat-1.7.2.4-r1 (22 Mar 2014)
+
+  22 Mar 2014; Jeroen Roovers <jer@gentoo.org> -socat-1.7.2.4.ebuild,
+  +socat-1.7.2.4-r1.ebuild, -socat-2.0.0_beta7.ebuild,
+  +socat-2.0.0_beta7-r1.ebuild:
+  Set RESTRICT=test (bug #277104). Do not install examples/VERSION.
 
   18 Mar 2014; Jeroen Roovers <jer@gentoo.org> socat-1.7.2.4.ebuild:
   Do not install VERSION.
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index f19a1838073a..bacf8e0e4a20 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -6,14 +6,14 @@ DIST socat-1.7.2.3.tar.bz2 424461 SHA256 0598ac54af7b138cda9e3c141bcf0cc63eeb2ab
 DIST socat-1.7.2.4.tar.bz2 446644 SHA256 4b7739901c6fad1e460f3e5b1868fb4c2a1427febbba7a510cd2e42fd4941e09 SHA512 256a3fba171544733cbfd6efde884cb9f5ff52e2b5300cebbe712cbb79d3e3bc7142e2e8a93fe4faf944db8326ab2c3673ef37ef76b724f33bf65cc0f9fbf27b WHIRLPOOL 1fdbda03430d4ec7d41f06e71ff5b2dd92ff3ea93eb1a272e05a8691897492679eed2d1974951857e8d674608ecfa657e6496130de9440a9c829c18f9e4118b7
 DIST socat-2.0.0-b7.tar.bz2 466584 SHA256 f3f964e69db2dc9957757185cfed498c6d245af6f5b808e4003c7e9b194bd340 SHA512 1f1e18a901842d98fcc63888ee126bd5d2cc6f2c239589a3b940a10886bc3ec97fef83a1ad3c3436b986e79e2e16e3cc28fd9ba6ac342866a20560b238274b62 WHIRLPOOL 439196b5a560fb859c41d8b2b8881f480168709895fab73b7637c9964c18cf2a1ec4e0dc6273732d783c557a3b0e433356a5c1d37278570aee011f694eec88b2
 EBUILD socat-1.7.2.3.ebuild 1371 SHA256 7911fa6a6fdd940827f8ddaa3cf35e43bd3684e5710048057544210b141ad46f SHA512 357b6bfbbf4855dd2209fc48888a720be108eda105fb1631041f5736ad17a5120456808e17d3f743b543a9de6994d9e7ee1e0b1485f8ae4ab5df9c63393a2319 WHIRLPOOL 95d98c27130e36449bd505cbf0e60ecd4d419ebab225265c6bb44e211e23b342095b7416563ea00ecaeb459bdcfbc9e68bff45e1267df75570ed4e12a3e6f0d9
-EBUILD socat-1.7.2.4.ebuild 1303 SHA256 e57f2f2e9e20826df5f8f32b3df43de2149ff5accbe04d893bfd8c170b8b9faf SHA512 f07f36ad9846c600ad08c8ad8a22a3b0ecb8884e2a36a0fecab2133f32d63f161ea9578844fb3eb11fc24fc90b04015ad4c47a091fecf9f431c30e009b886223 WHIRLPOOL 7b1d8cbeed8b537ff0e2986d4358d3c9474f70eb73dbd8d96e5ccfd412f66155d57db6545b5da89043d4d68c21513fde2bdd8c73e53d6c6041583b259d9d8b61
-EBUILD socat-2.0.0_beta7.ebuild 1299 SHA256 d9367946a9725a4c54f739dae03e31a08369702fb0c104212fb3bed81436164f SHA512 39fd9d036679f1da81ca46223b743025dc9522bdc9be5ecd42a4ce9801c645614ca960b8911689b0197c914756f1e0080974daf71830bfb1f9437a033da94415 WHIRLPOOL 345031ea40e87de1c1af33da47f8b2a5b490b169e90c5ce88636865ce165b3ce5f258a9515c76a43188e2316b03da59b059d1679463e343fb159ce9e15b232ef
-MISC ChangeLog 16787 SHA256 ae96ee4c3d8b82f89094fc18fba009769a0243b6eade16a3ff811d5386c96c4e SHA512 c6745773aae97560b79b011e9f2ffe89263d0f7aa014a49cb030414efd503d1f6d41ea745c23cf39c52b3d56fdd2efe7f282e18596e30e411070b71911af62ed WHIRLPOOL 890353ae75c5bc2d65499c70c3456687e853c755ac48814c25cdbb636081cfd7edf33467235120f3e9ff2d52838e30a4b0083d121f11bed103422314619d5333
+EBUILD socat-1.7.2.4-r1.ebuild 1167 SHA256 b607379d95f48e616de4da979f0adb65fad29fb5a4492c2328dca55f5449e4e1 SHA512 a45099d6e9ca7201feb6ef7c939aa9f3758a6f0d2e2728d136036fd6d69ad6dababa4389d9fa8f5be29809edce4447e14f165090159e8d4226216c97efe43b34 WHIRLPOOL 721f266d00502d3a371c4df81b54497283947040460876ed6607276ca12696e97f1b2d9af49f42ec9df56736b5ed4b2423d14918e65735d527521e37915fbdea
+EBUILD socat-2.0.0_beta7-r1.ebuild 1172 SHA256 08e401e5aebf78c7b21c384a3ede0a49b8bdc1f8b28675f7c15329907399bac3 SHA512 e318c2290515b34538026ebeb61402b15def3226ca4a9ba7a92ccf0b672e2a70362067ae568d1ee747a61d61fa2e258a35f9ca129cf7873bb5b106e941b38ebe WHIRLPOOL 22c94da70526ea0933f880e91612c1d4e4968e70be055b21ef223dffb70324acd8447042d5cedc3a9f429c157fad324caa6e86a2f4ef640b8d430f237e6c92bb
+MISC ChangeLog 17082 SHA256 4d1d3c5ccaa090cf9bcdca2f69aa4566e535259e878dc91cd92feebf82d846c3 SHA512 ed4df75512d9f13c1e6b3b3e3510a14788c5a7fd790e207d607816a1e4d8cf425e5da7c151af69faddf5fb83e67a6f7dd31f8478b1be2aaa6bf6467f98946a1b WHIRLPOOL fd5e07710a1969d76f1d074846ea1bf5b1ac94c15df8cd37f3eae74e3f2604399c1253dcf7c4f58d4d008ad62824dac77c44225964721c42bae62535e71a646c
 MISC metadata.xml 160 SHA256 39e232fc7ec88ca0b077cb3950cb39d15cd990842b88d5bfe14f02f34d72f37b SHA512 3ac3a74a7cdf45b14884d967b10e4752f9cb06c579f6d7baf921f9be5450cbe7536c2e5a480ac3c95156eb6abb32e68f74cecc86b9ac0dcc4e0e1b4b255c3e20 WHIRLPOOL f7504ce9e3e8a58d19bba5448305f806c2ae01d0a8d2cf09d6bc6a089a6e1c28a1b12a80bb6020584b5ed21df94e4936b1695a54548704cb8679660b6b807955
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMohLkACgkQVWmRsqeSphOvBACfYpyfLxrB7RqsAYXoMEQ7rlO7
-SPEAn2lSQ3tAcGcbw4272+ilZRIMlcBk
-=SpuL
+iEYEAREIAAYFAlMtrPgACgkQVWmRsqeSphORmgCfR9TkReJDsKWmQs/p0lGzqluw
+UCMAmwavhaBiW3UBB9TvsBwFe0NBWGjN
+=R/35
 -----END PGP SIGNATURE-----
diff --git a/net-misc/socat/socat-1.7.2.4.ebuild b/net-misc/socat/socat-1.7.2.4-r1.ebuild
index 7ee16d6fc2e3..29f826ed7e78 100644
--- a/net-misc/socat/socat-1.7.2.4.ebuild
+++ b/net-misc/socat/socat-1.7.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.7.2.4.ebuild,v 1.2 2014/03/18 17:39:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.7.2.4-r1.ebuild,v 1.1 2014/03/22 15:32:07 jer Exp $
 
 EAPI=5
 
@@ -24,9 +24,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	sed -i test.sh -e "s|/sbin/ifconfig|$(type -P ifconfig)|g" || die
-}
+RESTRICT="test"
+
+DOCS=(
+	BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY
+)
 
 src_configure() {
 	filter-flags '-Wno-error*' #293324
@@ -38,17 +40,8 @@ src_configure() {
 		$(use_enable tcpd libwrap)
 }
 
-src_test() {
-	TMPDIR="${T}" emake test
-}
-
 src_install() {
 	default
 
-	dodoc BUGREPORTS CHANGES DEVELOPMENT FAQ FILES PORTING README SECURITY
-
-	docinto examples
-	dodoc EXAMPLES *.sh
-
 	dohtml doc/*.html doc/*.css
 }
diff --git a/net-misc/socat/socat-2.0.0_beta7.ebuild b/net-misc/socat/socat-2.0.0_beta7-r1.ebuild
index 1ff6642679d2..7c75ab49a80f 100644
--- a/net-misc/socat/socat-2.0.0_beta7.ebuild
+++ b/net-misc/socat/socat-2.0.0_beta7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-2.0.0_beta7.ebuild,v 1.1 2014/01/29 10:25:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-2.0.0_beta7-r1.ebuild,v 1.1 2014/03/22 15:32:07 jer Exp $
 
 EAPI=5
 
@@ -24,9 +24,14 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+RESTRICT="test"
+
+DOCS=(
+	BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY
+)
+
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.7.2.1-long-long.patch #436164
-	sed -i -e "s|/sbin/ifconfig|$(type -P ifconfig)|g" test.sh || die
 	touch doc/${PN}.1 || die
 }
 
@@ -40,16 +45,8 @@ src_configure() {
 		$(use_enable tcpd libwrap)
 }
 
-src_test() {
-	TMPDIR="${T}" emake test
-}
-
 src_install() {
 	default
 
-	dodoc BUGREPORTS CHANGES DEVELOPMENT \
-		FAQ FILES PORTING README SECURITY VERSION
-	docinto examples
-	dodoc EXAMPLES *.sh
 	dohtml doc/*.html doc/*.css
 }