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

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A792A613)

3 files changed, 22 insertions, 24 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/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
 }