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

Package-Manager: portage-2.2_rc33/cvs/Linux i686

11 files changed, 42 insertions, 197 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/Manifest b/net-misc/socat/Manifest
index a748cc3fbdd6..ef63d6487799 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,19 +1,13 @@
 AUX socat-1.6.0.0-noptytest.patch 3103 RMD160 2dce43dcb4c886350a086ba55ed6c64e6ad5cead SHA1 17c02371e6d469f7af1809aec4b3efb51ea89504 SHA256 a84e22ec4f08917ed278a569319d2b2c45b642e8336baa74c0053922f3ec65c2
-AUX socat-1.7.1.0-fixsetenv.patch 1161 RMD160 709c66e71ebb3ebe94581b3edc7303c9c69a3900 SHA1 d09d84b0fe383220787441038310f0e09e426a76 SHA256 12e5f580ccb36c8fb79898fff15afb1a677947b90f985641b6f9c084f9a81c63
 DIST socat-1.6.0.1.tar.bz2 375527 RMD160 f2769a1f60c1dcc5a6d66570dc7afc5d5e1c7659 SHA1 9bb850817d41b7628fc0a79c113581c413166530 SHA256 0d1ba82db0f735bf5006844b197ec5c980965980adceb6d1ef722f9b819b87b2
-DIST socat-1.7.0.0.tar.bz2 418842 RMD160 7792dea2a9fe65537de62553d8e7f8690447008f SHA1 6bb42bcb9a1d373ca254717e63ef901442e2ab5d SHA256 827c8ccd508ad12c999208d42867ec8334e39a425d3984eda78a34449d414f25
-DIST socat-1.7.1.0.tar.bz2 421280 RMD160 db7b795df6bf43ed463c201549210a7d527aaa61 SHA1 a158a5285b71c528d683e972352a2c93db4028b1 SHA256 ecbeb80ab2dacea362f908b7d4e33e5fa9e3cbc2d3950fc6876a5c8174230c56
 DIST socat-1.7.1.1.tar.bz2 422947 RMD160 45c75aa0e31a4ed460fe8da3b65e478bc38621fb SHA1 b88dea5d93f56b1e5465937c9756fe3e8bf8962d SHA256 bbdfa139597731d2caf4362a98d85fe92d07b9278498b3b634f965b1e929aa14
 DIST socat-2.0.0-b1.tar.bz2 325120 RMD160 0d8da4cb2fc0e6d041ff114beb24e2d63251748c SHA1 1c4490bb8e69c43591bea09b157c109b092f711a SHA256 d311e2d9295236778302095e19aaf6fb2538753e28cd313208944521b82b6d79
 DIST socat-2.0.0-b2.tar.bz2 442439 RMD160 6ba708faa1c634836dd128a700f7ab8f263eb1a1 SHA1 449e5f07db60df71110041750e3cfea96333dba1 SHA256 50b3cf53d639996e939a4741f8ad25f7f6ed1ad05d612f079a4c1fb725971089
 DIST socat-2.0.0-b3.tar.bz2 457509 RMD160 9a9f30b426aa557b14e4cf81a03fa22a5d9cd83b SHA1 af4f6764825f276299844e357c6ae29efacfcafc SHA256 5d575cf84067907e44cda6a47dfccc610d3f546b5d00ae5b56ec379450459b5c
-EBUILD socat-1.6.0.1.ebuild 1138 RMD160 5bb83e35b466be4305b7505f211d6105a6c53d35 SHA1 9179641705de02d3d27024781384113e989357a6 SHA256 b37a9f67fb9271ffcae25c2c7d1cde8978a84d21f262cfe52d93c2680729af51
-EBUILD socat-1.7.0.0.ebuild 1075 RMD160 66db99c75bbab8f355fb54a31a48672e248be8cc SHA1 5c0f3b4bfed48936c22b83f71cb5e0d718ab5428 SHA256 b82269121148669f4755f6594bc2a1332b7a9ce5a8ce4b4717d24ad199e93865
-EBUILD socat-1.7.1.0-r1.ebuild 1221 RMD160 115c1e722fdef563722958735648f399fa757d5c SHA1 5cb8b4ce747d140260bfd491cf81cf4ad2d401ec SHA256 9707ac706832c7867d13a33d79b41266dd1f2c0befd24eca666a42dc765515a1
-EBUILD socat-1.7.1.0.ebuild 1155 RMD160 9d8d54ef159afbe7b3a8ccd569201afdb697ccb7 SHA1 8e711b62ab1442c0278b128aca4417582b7aa4b3 SHA256 41dd7e1a17472a7439eea761946f863ea67d6c9cd763cd9c144ea187a5c6d047
-EBUILD socat-1.7.1.1.ebuild 1187 RMD160 00c9e852567eb4b5aa5ab1a08be43399cacc624b SHA1 5a6aa4429d104f1d3dac6e1da0d69775ebd1faeb SHA256 17e249888059823ecc14b0feed21030cb1773f21f9fab09c4f9648bca1e05892
-EBUILD socat-2.0.0_beta1.ebuild 1165 RMD160 4ad1f29049f8249547d16ad3b93d7eba7d5f944f SHA1 1ffa864e9047c296fa72bc3f60c1c67c31bab493 SHA256 7a5dff1af59c5680434c197a94d3e47fc12c464a277057fc919c3c27441ad84d
-EBUILD socat-2.0.0_beta2.ebuild 1137 RMD160 3786b171704b37b79dd2b165c5989e7a6a828fe5 SHA1 bb84a445ff546e13ab45a38e198c29885117394b SHA256 546d92f5cee6d2ffc42c35a4e120a57ba94b2dd4a3f71ea3a37f6ae3a5462f6d
-EBUILD socat-2.0.0_beta3.ebuild 1160 RMD160 4cee04834c013c348d096cbdfec1c440e8ed2096 SHA1 43980a2cee5fe03a65c157914107069b09fb668f SHA256 01f17a8fa3c7c34e77f8d1d6f93b2622742109dd33aae1f24ca9014f554a5a63
-MISC ChangeLog 8234 RMD160 61bfd464b4cc70681628ca4fda90ad994b5bce64 SHA1 ec8960b765d9181ce269e605284525f33836c959 SHA256 04165c29f60bd1279c34b4067d2bfc51b42f294a3d53ca0a31a99fa4f62fc648
+EBUILD socat-1.6.0.1.ebuild 1143 RMD160 34509a38125f368c2cd5e4f8dd6771d83d2e922a SHA1 bffe83b94ca0e7846a8cae21e6509362bb1ff897 SHA256 e08a8859d3cf305338d2b1cef29533402acc3e0928b9ef15998c3775ca4e0407
+EBUILD socat-1.7.1.1.ebuild 1192 RMD160 2e98cf1223ebf0a83bc47c026afd34879325cc29 SHA1 20d3106ef4084cfe74d02a8b8229d834cc95d7be SHA256 20af29b430d54d4276bb9824eec76151b09f452c42c00bff403d552281e3cf60
+EBUILD socat-2.0.0_beta1.ebuild 1172 RMD160 ff6e49e05b9eeae9e3850f708a3222a426a9c1d0 SHA1 eaea79b3920c57028ff484694c8e5e73de550ae5 SHA256 d6cc32ee08f304f5a2ab22e9175f9b2af81b33a31d2b908ba298f0a06b9b69fe
+EBUILD socat-2.0.0_beta2.ebuild 1146 RMD160 809cf248296b96b13a54b5cbc585699cb8eeef24 SHA1 a1709ea72d2270f94ada2a2e82772fde0b4cb4fc SHA256 6856ba92b8b5c2c8e67fd58c60be21d5cd1036f98fcdac3056408540b5ed795f
+EBUILD socat-2.0.0_beta3.ebuild 1169 RMD160 a8feca2da40b8165d1fd59a1b4a8e209cfcea32f SHA1 e374c342b10a537d31957679891c3b0d58616d6d SHA256 9e345726da62ee3b2ac952932f51c01cea92e8563ee7c9727aeb766b15f8917e
+MISC ChangeLog 8593 RMD160 8ffdafc7b9e7fe4bba782f7975899a2bf978e3d4 SHA1 121905913881010a4e2e145a6df3846aee47220e SHA256 92f2e64ccf77024d337ad3d22ec6d39ddf6c316c90633204ac59a4014f6a1363
 MISC metadata.xml 224 RMD160 b56e021883688e595b915158a146fb864ef06901 SHA1 68bcf1730fb34e19e6834e2d5390dbd55e4a35de SHA256 214e401ffbfe4cfffdcd14ceda3a264a79df771601a668da0e59c51cb91740dc
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 \