Remove old.

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

4 files changed, 6 insertions, 166 deletions

diff --git a/net-misc/socat/ChangeLog b/net-misc/socat/ChangeLog
index 8d69e458fe7a..79e36174bf20 100644
--- a/net-misc/socat/ChangeLog
+++ b/net-misc/socat/ChangeLog
@@ -1,6 +1,10 @@
 # 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.66 2009/07/13 17:56:09 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/ChangeLog,v 1.67 2009/07/13 18:51:40 jer Exp $
+
+  13 Jul 2009; Jeroen Roovers <jer@gentoo.org>
+  -files/socat-1.6.0.0-noptytest.patch, -socat-1.6.0.1.ebuild:
+  Remove old.
 
   13 Jul 2009; Joseph Jezak <josejx@gentoo.org> socat-1.7.1.1.ebuild:
   Marked ppc stable for bug #270855.
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index ff2bf03b1ef9..9e36660104df 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,23 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX socat-1.6.0.0-noptytest.patch 3103 RMD160 2dce43dcb4c886350a086ba55ed6c64e6ad5cead SHA1 17c02371e6d469f7af1809aec4b3efb51ea89504 SHA256 a84e22ec4f08917ed278a569319d2b2c45b642e8336baa74c0053922f3ec65c2
-DIST socat-1.6.0.1.tar.bz2 375527 RMD160 f2769a1f60c1dcc5a6d66570dc7afc5d5e1c7659 SHA1 9bb850817d41b7628fc0a79c113581c413166530 SHA256 0d1ba82db0f735bf5006844b197ec5c980965980adceb6d1ef722f9b819b87b2
 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 1237 RMD160 80806b9ca2eab0ec4145a3cb8cae4e79a9810183 SHA1 6eeeea02ae7d658160ef737c90c7016c6e7688eb SHA256 aab0dfe55c36e66eb220ab84fc4b0fa1b926fd7a3fd7bde4886387c7017c1330
 EBUILD socat-1.7.1.1.ebuild 1194 RMD160 1bfa7c3f61e8e3958ea1c3a9e986b40bca7eb001 SHA1 a77d5c9e677d7213c41c72fedcd071f4ee78ef5a SHA256 f10e15c8f58566666dab3ca9b321dba2c05a0c8bc4b0f8479f7212cdc3acadd0
 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 8811 RMD160 d9fa69b8b7129d6e168948aea61f5a0e59800c1e SHA1 50d3b5c989ebf06064263d3606e4613477f209df SHA256 2fc732dcbb225c245d348b4e8c1c49f72959a5ac709be641307589368ce25381
+MISC ChangeLog 8933 RMD160 3464a19d55198c27ba4719a5a9500ffa39aa1b85 SHA1 0bc80f3aacd820f5968f63ecc812c0f380c07baa SHA256 2f5b903a2ba66f9459401771e45c6bffa6b2ae714629cb9dd6cb96181d67773a
 MISC metadata.xml 224 RMD160 b56e021883688e595b915158a146fb864ef06901 SHA1 68bcf1730fb34e19e6834e2d5390dbd55e4a35de SHA256 214e401ffbfe4cfffdcd14ceda3a264a79df771601a668da0e59c51cb91740dc
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpbdKEACgkQcsIHjyDViGQWtQCfSSzj6aAb/VDV1dxGccR5I1vU
-FqcAn37QoLYPJ0JN05lLM9dN/P3zQcKL
-=/pg+
------END PGP SIGNATURE-----
diff --git a/net-misc/socat/files/socat-1.6.0.0-noptytest.patch b/net-misc/socat/files/socat-1.6.0.0-noptytest.patch
deleted file mode 100644
index c38c3f9a5961..000000000000
--- a/net-misc/socat/files/socat-1.6.0.0-noptytest.patch
+++ /dev/null
@@ -1,99 +0,0 @@
---- socat-1.6.0.0/test.sh.original	2007-04-05 18:53:07.000000000 +1000
-+++ socat-1.6.0.0/test.sh	2007-04-05 19:06:28.000000000 +1000
-@@ -979,7 +979,7 @@
- #------------------------------------------------------------------------------
- 
- #if false; then
--if true; then
-+if false; then
- for addr in exec system; do
-     ADDR=$(echo "$addr" |tr a-z A-Z)
- 
-@@ -5176,87 +5176,6 @@
- N=$((N+1))
- 
- 
--testptywaitslave () {
--    local N="$1"
--    local TEST="$2"
--    local PTYTYPE="$3"	# ptmx or openpty
--    local opts="$4"
--
--tp="$td/test$N.pty"
--ts="$td/test$N.socket"
--tf="$td/test$N.file"
--tdiff="$td/test$N.diff"
--te1="$td/test$N.stderr1"
--te2="$td/test$N.stderr2"
--te3="$td/test$N.stderr3"
--te4="$td/test$N.stderr4"
--da="test$N.1 $(date) $RANDOM"
--printf "test $F_n $TEST... " $N
--# first generate a pty, then a socket
--($SOCAT $opts -lpsocat1 pty,$PTYTYPE,pty-wait-slave,link="$tp" unix-listen:"$ts" 2>"$te1"; rm -f "$tp") 2>/dev/null &
--pid=$!
--waitfile "$tp"
--# if pty was non-blocking, the socket is active, and socat1 will term
--$SOCAT $opts -T 10 -lpsocat2 file:/dev/null unix-connect:"$ts" 2>"$te2"
--# if pty is blocking, first socat is still active and we get a connection now
--#((echo "$da"; sleep 2) |$SOCAT -lpsocat3 $opts - file:"$tp",$PTYOPTS2 >"$tf" 2>"$te3") &
--( (waitfile "$ts"; echo "$da"; sleep 1) |$SOCAT -lpsocat3 $opts - file:"$tp",$PTYOPTS2 >"$tf" 2>"$te3") &
--waitfile "$ts"
--# but we need an echoer on the socket
--$SOCAT $opts -lpsocat4 unix:"$ts" echo 2>"$te4"
--# now $tf file should contain $da
--#kill $pid 2>/dev/null
--wait
--#
--if echo "$da" |diff - "$tf"> "$tdiff"; then
--    $PRINTF "$OK\n"
--    numOK=$((numOK+1))
--else
--    $PRINTF "${YELLOW}FAILED${NORMAL}\n"
--    cat "$te1"
--    #cat "$te2"	# not of interest
--    cat "$te3"
--    cat "$te4"
--    cat "$tdiff"
--    numCANT=$((numCANT+1))
--fi
--}
--
--NAME=PTMXWAITSLAVE
--PTYTYPE=ptmx
--case "$TESTS" in
--*%functions%*|*%pty%*|*%$NAME%*)
--TEST="$NAME: test if master pty ($PTYTYPE) waits for slave connection"
--if ! feat=$(testaddrs pty); then
--    $PRINTF "test $F_n $TEST... ${YELLOW}$(echo $feat| tr 'a-z' 'A-Z') not available${NORMAL}\n" $N
--    numCANT=$((numCANT+1))
--elif ! feat=$(testoptions "$PTYTYPE" pty-wait-slave); then
--    $PRINTF "test $F_n $TEST... ${YELLOW}option $(echo $feat| tr 'a-z' 'A-Z') not available${NORMAL}\n" $N
--    numCANT=$((numCANT+1))
--else
--   testptywaitslave "$N" "$TEST" "$PTYTYPE" "$opts"
--fi
--esac
--N=$((N+1))
--
--NAME=OPENPTYWAITSLAVE
--PTYTYPE=openpty
--case "$TESTS" in
--*%functions%*|*%pty%*|*%$NAME%*)
--TEST="$NAME: test if master pty ($PTYTYPE) waits for slave connection"
--if ! feat=$(testaddrs pty); then
--    $PRINTF "test $F_n $TEST... ${YELLOW}$(echo $feat| tr 'a-z' 'A-Z') not available${NORMAL}\n" $N
--    numCANT=$((numCANT+1))
--elif ! feat=$(testoptions "$PTYTYPE" pty-wait-slave); then
--    $PRINTF "test $F_n $TEST... ${YELLOW}option $(echo $feat| tr 'a-z' 'A-Z') not available${NORMAL}\n" $N
--    numCANT=$((numCANT+1))
--else
--   testptywaitslave "$N" "$TEST" "$PTYTYPE" "$opts"
--fi
--esac
--N=$((N+1))
--
--
- NAME=CONNECTTIMEOUT
- case "$TESTS" in
- *%functions%*|*%$NAME%*)
diff --git a/net-misc/socat/socat-1.6.0.1.ebuild b/net-misc/socat/socat-1.6.0.1.ebuild
deleted file mode 100644
index f9a1aed6e606..000000000000
--- a/net-misc/socat/socat-1.6.0.1.ebuild
+++ /dev/null
@@ -1,52 +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.6.0.1.ebuild,v 1.8 2009/06/22 16:27:33 jer 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 )
-"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-1.6.0.0-noptytest.patch"
-}
-
-src_compile() {
-	econf \
-		$(use_enable ssl openssl) \
-		$(use_enable readline) \
-		$(use_enable ipv6 ip6) \
-		$(use_enable tcpd libwrap) \
-		|| die "econf failed"
-	emake || die
-}
-
-src_test() {
-	TMPDIR="${T}" make test || die 'self test failed'
-}
-
-src_install() {
-	#dodir /usr/bin /usr/share/man/man1
-	make install DESTDIR="${D}" || die
-
-	dodoc BUGREPORTS CHANGES DEVELOPMENT EXAMPLES \
-		FAQ FILES PORTING README SECURITY VERSION
-	docinto examples
-	dodoc *.sh
-	dohtml socat.html
-}