Remove old.

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

3 files changed, 5 insertions, 152 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/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
-}