3 files changed, 5 insertions, 134 deletions
diff --git a/net-misc/socat/ChangeLog b/net-misc/socat/ChangeLog
index c94d23f37d22..c99d2affd60d 100644
--- a/net-misc/socat/ChangeLog
+++ b/net-misc/socat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/socat
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/ChangeLog,v 1.92 2012/02/15 18:32:17 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/ChangeLog,v 1.93 2012/02/15 18:43:47 jer Exp $
+
+  15 Feb 2012; Jeroen Roovers <jer@gentoo.org> -socat-1.7.1.3.ebuild,
+  -files/socat-1.7.1.3-cross-compile.patch:
+  Old.
 
   15 Feb 2012; Brent Baude <ranger@gentoo.org> socat-1.7.2.0.ebuild:
   Marking socat-1.7.2.0 ppc for bug 399187
diff --git a/net-misc/socat/files/socat-1.7.1.3-cross-compile.patch b/net-misc/socat/files/socat-1.7.1.3-cross-compile.patch
deleted file mode 100644
index a86e745b6dbb..000000000000
--- a/net-misc/socat/files/socat-1.7.1.3-cross-compile.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-already sent upstream
-
-From ceff276b495884e0b6904814f2bcc93dc98da132 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 15 Dec 2011 14:16:50 -0500
-Subject: [PATCH] add compile-only tests for shift sizes
-
-We can take advantage of array limits to calculate the shift size
-required for constants.  If we compile to a value we don't like,
-then the array limit will be -1 and trigger a compile error.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- configure.in |   15 ++++++++++++++-
- 1 files changed, 14 insertions(+), 1 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 45cb88a..15c4d7d 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1331,7 +1331,20 @@ AC_CACHE_CHECK(shift offset of $1, $2,
-  ],
-  [$2=`cat $conftestoffset`],
-  [$2=-1],
-- [AC_MSG_RESULT(please determine $1_SHIFT manually)]
-+ [
-+  i=0
-+  $2=-1
-+  while test $i -lt 64 -a $$2 -eq -1; do
-+   AC_TRY_COMPILE([
-+   #include <errno.h>
-+   #include <stdio.h>
-+   #include <termios.h>
-+   #include <string.h>
-+   ],[char c[(($1 >> $i) & 1) - 1];],
-+   [$2=$i])
-+   i=$(( $i + 1 ))
-+  done
-+ ]
- )
-  LIBS="$LIBS1"])
- AC_DEFINE_UNQUOTED($1_SHIFT, ${$2})
--- 
-1.7.6.1
-
-From a3e300ce4cde7e326ecffe1035017874d85d796e Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 15 Dec 2011 15:00:37 -0500
-Subject: [PATCH] let compiler handle ISPEED_OFFSET when cross-compiling
-
-While I can't devise a compile-only test that'll calculate the offset
-(which doesn't involve inspecting the compiled object file), at least
-gcc is good enough with a offsetof()-like value.  So use that in the
-cross-compile fallback case.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- configure.in |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 15c4d7d..87e1029 100644
---- a/configure.in
-+++ b/configure.in
-@@ -918,11 +918,11 @@ AC_CACHE_VAL(ac_cv_ispeed_offset,
-  ],
-  [ac_cv_ispeed_offset=`cat $conftestspeedoff`],
-  [ac_cv_ispeed_offset=-1],
-- [ac_cv_ispeed_offset=-1]	#!
-+ [ac_cv_ispeed_offset="((unsigned long)&((struct termios *)0)->c_ispeed / sizeof(speed_t))"]	#!
- )])
- LIBS="$LIBS1"
- AC_MSG_RESULT($ac_cv_ispeed_offset)
-- if test $ac_cv_ispeed_offset -ge 0; then
-+ if test "$ac_cv_ispeed_offset" != "-1"; then
-    AC_DEFINE_UNQUOTED(ISPEED_OFFSET, $ac_cv_ispeed_offset)
-  fi
- fi
--- 
-1.7.6.1
diff --git a/net-misc/socat/socat-1.7.1.3.ebuild b/net-misc/socat/socat-1.7.1.3.ebuild
deleted file mode 100644
index 58acceab3f45..000000000000
--- a/net-misc/socat/socat-1.7.1.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 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.3.ebuild,v 1.7 2011/12/15 19:33:19 vapier Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic autotools
-
-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 arm hppa ia64 ~mips ppc sparc x86 ~ppc-macos"
-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_prepare() {
-	epatch "${FILESDIR}"/${P}-cross-compile.patch
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -Wno-error*
-	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 \
-		FAQ FILES PORTING README SECURITY VERSION
-	docinto examples
-	dodoc EXAMPLES *.sh
-	dohtml doc/*.html doc/*.css
-}