Remove old. Do not depend on silly virtual/libc. Set RDEPEND explicitly.

(Portage version: 2.2_rc33/cvs/Linux i686)

10 files changed, 36 insertions, 185 deletions

diff --git a/net-misc/socat/ChangeLog b/net-misc/socat/ChangeLog
index d57465ba97b1..790ac8b1bc38 100644
--- a/net-misc/socat/ChangeLog
+++ b/net-misc/socat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/socat
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/ChangeLog,v 1.63 2009/06/22 14:17:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/ChangeLog,v 1.64 2009/06/22 16:19:30 jer Exp $
+
+  22 Jun 2009; Jeroen Roovers <jer@gentoo.org> socat-1.6.0.1.ebuild,
+  -socat-1.7.0.0.ebuild, -socat-1.7.1.0.ebuild, -socat-1.7.1.0-r1.ebuild,
+  -files/socat-1.7.1.0-fixsetenv.patch, socat-1.7.1.1.ebuild,
+  socat-2.0.0_beta1.ebuild, socat-2.0.0_beta2.ebuild,
+  socat-2.0.0_beta3.ebuild:
+  Remove old. Do not depend on silly virtual/libc. Set RDEPEND explicitly.
 
   22 Jun 2009; Raúl Porcel <armin76@gentoo.org> socat-1.7.1.1.ebuild:
   ia64/sparc stable wrt #270855
diff --git a/net-misc/socat/files/socat-1.7.1.0-fixsetenv.patch b/net-misc/socat/files/socat-1.7.1.0-fixsetenv.patch
deleted file mode 100644
index 79923bdc23fb..000000000000
--- a/net-misc/socat/files/socat-1.7.1.0-fixsetenv.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -r -N -U 3 socat-1.7.1.0/CHANGES socat-1.7.1.0+fixsetenv/CHANGES
---- socat-1.7.1.0/CHANGES	2009-04-02 21:20:24.000000000 +0200
-+++ socat-1.7.1.0+fixsetenv/CHANGES	2009-04-03 08:42:04.000000000 +0200
-@@ -1,4 +1,8 @@
- 
-+corrections:
-+	socat crashed on systems without setenv() (esp. SunOS up to Solaris 9);
-+	thanks to Todd Stansell for reporting this bug
-+
- ####################### V 1.7.1.0:
- 
- new features:
-diff -r -N -U 3 socat-1.7.1.0/VERSION socat-1.7.1.0+fixsetenv/VERSION
---- socat-1.7.1.0/VERSION	2009-04-02 21:18:17.000000000 +0200
-+++ socat-1.7.1.0+fixsetenv/VERSION	2009-04-03 08:38:34.000000000 +0200
-@@ -1 +1 @@
--"1.7.1.0"
-+"1.7.1.0+fixsetenv"
-diff -r -N -U 3 socat-1.7.1.0/utils.c socat-1.7.1.0+fixsetenv/utils.c
---- socat-1.7.1.0/utils.c	2009-04-02 09:32:48.000000000 +0200
-+++ socat-1.7.1.0+fixsetenv/utils.c	2009-04-03 08:37:21.000000000 +0200
-@@ -75,7 +75,7 @@
-    if (!overwrite) {
-       if (getenv(name))  return 0;	/* already exists */
-    }
--   if ((env = Malloc(strlen(name)+strlen(value)+2)) != NULL) {
-+   if ((env = Malloc(strlen(name)+strlen(value)+2)) == NULL) {
-       return -1;
-    }
-    sprintf(env, "%s=%s", name, value);
diff --git a/net-misc/socat/socat-1.6.0.1.ebuild b/net-misc/socat/socat-1.6.0.1.ebuild
index 4c40416fe9f7..e3ccf2d0ddbd 100644
--- a/net-misc/socat/socat-1.6.0.1.ebuild
+++ b/net-misc/socat/socat-1.6.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.6.0.1.ebuild,v 1.6 2008/11/19 09:40:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.6.0.1.ebuild,v 1.7 2009/06/22 16:19:30 jer Exp $
 
 inherit eutils
 
@@ -13,10 +13,12 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
 IUSE="ssl readline ipv6 tcpd"
 
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6 )
+DEPEND="
+	ssl? ( >=dev-libs/openssl-0.9.6 )
 	readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 )
 	tcpd? ( sys-apps/tcp-wrappers )
-	virtual/libc"
+"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	econf \
diff --git a/net-misc/socat/socat-1.7.0.0.ebuild b/net-misc/socat/socat-1.7.0.0.ebuild
deleted file mode 100644
index b9d26ed9c196..000000000000
--- a/net-misc/socat/socat-1.7.0.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.7.0.0.ebuild,v 1.6 2009/05/23 12:36:45 maekke Exp $
-
-inherit eutils
-
-DESCRIPTION="Multipurpose relay (SOcket CAT)"
-HOMEPAGE="http://www.dest-unreach.org/socat/"
-SRC_URI="http://www.dest-unreach.org/socat/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ~ppc sparc x86"
-IUSE="ssl readline ipv6 tcpd"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6 )
-	readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 )
-	tcpd? ( sys-apps/tcp-wrappers )
-	virtual/libc"
-
-src_compile() {
-	econf \
-		$(use_enable ssl openssl) \
-		$(use_enable readline) \
-		$(use_enable ipv6 ip6) \
-		$(use_enable tcpd libwrap)
-	emake || die
-}
-
-src_test() {
-	TMPDIR="${T}" make test || die 'self test failed'
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-
-	dodoc BUGREPORTS CHANGES DEVELOPMENT EXAMPLES \
-		FAQ FILES PORTING README SECURITY VERSION
-	docinto examples
-	dodoc *.sh
-	dohtml socat.html
-}
diff --git a/net-misc/socat/socat-1.7.1.0-r1.ebuild b/net-misc/socat/socat-1.7.1.0-r1.ebuild
deleted file mode 100644
index 82d2ad1f8407..000000000000
--- a/net-misc/socat/socat-1.7.1.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.7.1.0-r1.ebuild,v 1.1 2009/05/02 16:27:01 jer Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="Multipurpose relay (SOcket CAT)"
-HOMEPAGE="http://www.dest-unreach.org/socat/"
-MY_P=${P/_beta/-b}
-S="${WORKDIR}/${MY_P}"
-SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
-IUSE="ssl readline ipv6 tcpd"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6 )
-	readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 )
-	tcpd? ( sys-apps/tcp-wrappers )
-	virtual/libc"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fixsetenv.patch
-}
-
-src_configure() {
-	econf \
-		$(use_enable ssl openssl) \
-		$(use_enable readline) \
-		$(use_enable ipv6 ip6) \
-		$(use_enable tcpd libwrap)
-}
-
-src_test() {
-	TMPDIR="${T}" emake test || die 'self test failed'
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-
-	dodoc BUGREPORTS CHANGES DEVELOPMENT EXAMPLES \
-		FAQ FILES PORTING README SECURITY VERSION
-	docinto examples
-	dodoc *.sh
-	dohtml doc/*.html doc/*.css
-}
diff --git a/net-misc/socat/socat-1.7.1.0.ebuild b/net-misc/socat/socat-1.7.1.0.ebuild
deleted file mode 100644
index 9a911ae7c7db..000000000000
--- a/net-misc/socat/socat-1.7.1.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.7.1.0.ebuild,v 1.6 2009/06/11 17:31:49 klausman Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="Multipurpose relay (SOcket CAT)"
-HOMEPAGE="http://www.dest-unreach.org/socat/"
-MY_P=${P/_beta/-b}
-S="${WORKDIR}/${MY_P}"
-SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ~ppc sparc x86"
-IUSE="ssl readline ipv6 tcpd"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6 )
-	readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 )
-	tcpd? ( sys-apps/tcp-wrappers )
-	virtual/libc"
-
-src_configure() {
-	econf \
-		$(use_enable ssl openssl) \
-		$(use_enable readline) \
-		$(use_enable ipv6 ip6) \
-		$(use_enable tcpd libwrap)
-}
-
-src_test() {
-	TMPDIR="${T}" emake test || die 'self test failed'
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-
-	dodoc BUGREPORTS CHANGES DEVELOPMENT EXAMPLES \
-		FAQ FILES PORTING README SECURITY VERSION
-	docinto examples
-	dodoc *.sh
-	dohtml doc/*.html doc/*.css
-}
diff --git a/net-misc/socat/socat-1.7.1.1.ebuild b/net-misc/socat/socat-1.7.1.1.ebuild
index 169c998ffce9..d78a970fd653 100644
--- a/net-misc/socat/socat-1.7.1.1.ebuild
+++ b/net-misc/socat/socat-1.7.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.7.1.1.ebuild,v 1.7 2009/06/22 14:17:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.7.1.1.ebuild,v 1.8 2009/06/22 16:19:30 jer Exp $
 
 EAPI="2"
 
@@ -17,10 +17,12 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ~ppc sparc x86"
 IUSE="ssl readline ipv6 tcpd"
 
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6 )
+DEPEND="
+	ssl? ( >=dev-libs/openssl-0.9.6 )
 	readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 )
 	tcpd? ( sys-apps/tcp-wrappers )
-	virtual/libc"
+"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	filter-flags -Wall
diff --git a/net-misc/socat/socat-2.0.0_beta1.ebuild b/net-misc/socat/socat-2.0.0_beta1.ebuild
index d15f4766f707..66808b9ef4fb 100644
--- a/net-misc/socat/socat-2.0.0_beta1.ebuild
+++ b/net-misc/socat/socat-2.0.0_beta1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 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_beta1.ebuild,v 1.1 2007/07/26 13:07:19 falco Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-2.0.0_beta1.ebuild,v 1.2 2009/06/22 16:19:30 jer Exp $
 
 inherit eutils
 
@@ -15,10 +15,12 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
 IUSE="ssl readline ipv6 tcpd"
 
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6 )
+DEPEND="
+	ssl? ( >=dev-libs/openssl-0.9.6 )
 	readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 )
 	tcpd? ( sys-apps/tcp-wrappers )
-	virtual/libc"
+"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	econf \
diff --git a/net-misc/socat/socat-2.0.0_beta2.ebuild b/net-misc/socat/socat-2.0.0_beta2.ebuild
index 0b4868b5cece..c2fb09dea274 100644
--- a/net-misc/socat/socat-2.0.0_beta2.ebuild
+++ b/net-misc/socat/socat-2.0.0_beta2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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_beta2.ebuild,v 1.1 2008/11/16 17:04:19 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-2.0.0_beta2.ebuild,v 1.2 2009/06/22 16:19:30 jer Exp $
 
 inherit eutils
 
@@ -15,10 +15,12 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
 IUSE="ssl readline ipv6 tcpd"
 
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6 )
+DEPEND="
+	ssl? ( >=dev-libs/openssl-0.9.6 )
 	readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 )
 	tcpd? ( sys-apps/tcp-wrappers )
-	virtual/libc"
+"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	econf \
diff --git a/net-misc/socat/socat-2.0.0_beta3.ebuild b/net-misc/socat/socat-2.0.0_beta3.ebuild
index ca7886728d25..6333a069053c 100644
--- a/net-misc/socat/socat-2.0.0_beta3.ebuild
+++ b/net-misc/socat/socat-2.0.0_beta3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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_beta3.ebuild,v 1.1 2009/04/29 13:35:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-2.0.0_beta3.ebuild,v 1.2 2009/06/22 16:19:30 jer Exp $
 
 EAPI="2"
 
@@ -17,10 +17,12 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
 IUSE="ssl readline ipv6 tcpd"
 
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6 )
+DEPEND="
+	ssl? ( >=dev-libs/openssl-0.9.6 )
 	readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 )
 	tcpd? ( sys-apps/tcp-wrappers )
-	virtual/libc"
+"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	econf \