Remove old.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

5 files changed, 6 insertions, 182 deletions

diff --git a/net-misc/proxychains/ChangeLog b/net-misc/proxychains/ChangeLog
index 5fb43fb2756d..77861ab4e746 100644
--- a/net-misc/proxychains/ChangeLog
+++ b/net-misc/proxychains/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/proxychains
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/proxychains/ChangeLog,v 1.33 2015/05/16 19:28:25 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/proxychains/ChangeLog,v 1.34 2015/05/16 19:29:16 radhermit Exp $
+
+  16 May 2015; Tim Harder <radhermit@gentoo.org> -proxychains-4.2.0.ebuild,
+  -proxychains-4.7.ebuild, -files/proxychains-4.2.0-makefile.patch,
+  -files/proxychains-4.7-makefile.patch:
+  Remove old.
 
   16 May 2015; Tim Harder <radhermit@gentoo.org> proxychains-4.8.1.ebuild:
   amd64 stable wrt bug #535610
diff --git a/net-misc/proxychains/files/proxychains-4.2.0-makefile.patch b/net-misc/proxychains/files/proxychains-4.2.0-makefile.patch
deleted file mode 100644
index ead574ee28ee..000000000000
--- a/net-misc/proxychains/files/proxychains-4.2.0-makefile.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- proxychains-proxychains-4.2.0/configure
-+++ proxychains-proxychains-4.2.0/configure
-@@ -86,6 +86,7 @@
- echo CC?=$CC>config.mak
- [ -z "$CPPFLAGS" ] || echo CPPFLAGS?=$CPPFLAGS>>config.mak
- [ -z "$CFLAGS" ] || echo USER_CFLAGS?=$CFLAGS>>config.mak
-+[ -z "$LDFLAGS" ] || echo USER_LDFLAGS?=$LDFLAGS>>config.mak
- echo prefix=$prefix>>config.mak
- echo exec_prefix=$exec_prefix>>config.mak
- echo bindir=$bindir>>config.mak
---- proxychains-proxychains-4.2.0/Makefile
-+++ proxychains-proxychains-4.2.0/Makefile
-@@ -17,8 +17,8 @@
- OBJS = $(SRCS:.c=.o)
- LOBJS = src/core.o src/common.o src/libproxychains.o
- 
--CCFLAGS  = -Wall -O2 -g -std=c99 -D_GNU_SOURCE -pipe -DTHREAD_SAFE -Werror 
--LDFLAGS = -shared -fPIC -lpthread
-+CCFLAGS = -Wall -std=c99 -D_GNU_SOURCE -DTHREAD_SAFE
-+LIBS    = -lpthread -ldl
- INC     = 
- PIC     = -fPIC
- AR      = $(CROSS_COMPILE)ar
-@@ -30,11 +30,11 @@
- 
- -include config.mak
- 
--LDSO_PATHNAME = libproxychains4.$(LDSO_SUFFIX)
-+LDSO_PATHNAME = libproxychains.$(LDSO_SUFFIX)
- 
- SHARED_LIBS = $(LDSO_PATHNAME)
- ALL_LIBS = $(SHARED_LIBS)
--PXCHAINS = proxychains4
-+PXCHAINS = proxychains
- ALL_TOOLS = $(PXCHAINS)
- 
- CCFLAGS+=$(USER_CFLAGS) $(MAC_CFLAGS)
-@@ -63,9 +63,9 @@
- 	$(CC) $(CCFLAGS) $(CFLAGS_MAIN) $(INC) $(PIC) -c -o $@ $<
- 
- $(LDSO_PATHNAME): $(LOBJS)
--	$(CC) $(LDFLAGS) $(LD_SET_SONAME)$(LDSO_PATHNAME) -o $@ $(LOBJS)
-+	$(CC) $(LDFLAGS) -shared $(LD_SET_SONAME)$(LDSO_PATHNAME) -o $@ $(LOBJS) $(LIBS)
- 
- $(ALL_TOOLS): $(OBJS)
--	$(CC) src/main.o src/common.o -o $(PXCHAINS)
-+	$(CC) $(LDFLAGS) src/main.o src/common.o -o $(PXCHAINS)
- 
- .PHONY: all clean install install-config
diff --git a/net-misc/proxychains/files/proxychains-4.7-makefile.patch b/net-misc/proxychains/files/proxychains-4.7-makefile.patch
deleted file mode 100644
index 4c26d48d326e..000000000000
--- a/net-misc/proxychains/files/proxychains-4.7-makefile.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- proxychains-ng-4.7/Makefile
-+++ proxychains-ng-4.7/Makefile
-@@ -20,10 +20,8 @@
-         src/allocator_thread.o src/ip_type.o src/stringdump.o \
-         src/hostentdb.o src/hash.o src/debug.o
- 
--CFLAGS  += -Wall -O0 -g -std=c99 -D_GNU_SOURCE -pipe
--NO_AS_NEEDED = -Wl,--no-as-needed
--LIBDL   = -ldl
--LDFLAGS = -shared -fPIC $(NO_AS_NEEDED) $(LIBDL) -lpthread
-+CFLAGS  = -Wall -std=c99 -D_GNU_SOURCE
-+LIBS    = -ldl -lpthread
- INC     = 
- PIC     = -fPIC
- AR      = $(CROSS_COMPILE)ar
-@@ -33,11 +31,11 @@
- LD_SET_SONAME = -Wl,-soname=
- INSTALL_FLAGS = -D -m
- 
--LDSO_PATHNAME = libproxychains4.$(LDSO_SUFFIX)
-+LDSO_PATHNAME = libproxychains.$(LDSO_SUFFIX)
- 
- SHARED_LIBS = $(LDSO_PATHNAME)
- ALL_LIBS = $(SHARED_LIBS)
--PXCHAINS = proxychains4
-+PXCHAINS = proxychains
- ALL_TOOLS = $(PXCHAINS)
- 
- -include config.mak
-@@ -63,13 +61,13 @@
- 	rm -f $(OBJS)
- 
- %.o: %.c
--	$(CC) $(CFLAGS) $(CFLAGS_MAIN) $(INC) $(PIC) -c -o $@ $<
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_MAIN) $(INC) $(PIC) -c -o $@ $<
- 
- $(LDSO_PATHNAME): $(LOBJS)
--	$(CC) $(LDFLAGS) $(LD_SET_SONAME)$(LDSO_PATHNAME) -o $@ $(LOBJS)
-+	$(CC) $(LDFLAGS) -shared $(PIC) $(LD_SET_SONAME)$(LDSO_PATHNAME) -o $@ $(LOBJS) $(LIBS)
- 
- $(ALL_TOOLS): $(OBJS)
--	$(CC) src/main.o src/common.o -o $(PXCHAINS)
-+	$(CC) $(LDFLAGS) src/main.o src/common.o -o $(PXCHAINS) $(LIBS)
- 
- 
- .PHONY: all clean install install-config
diff --git a/net-misc/proxychains/proxychains-4.2.0.ebuild b/net-misc/proxychains/proxychains-4.2.0.ebuild
deleted file mode 100644
index b06945a71a18..000000000000
--- a/net-misc/proxychains/proxychains-4.2.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/proxychains/proxychains-4.2.0.ebuild,v 1.4 2013/02/14 22:13:41 ago Exp $
-
-EAPI=5
-
-inherit vcs-snapshot toolchain-funcs eutils multilib
-
-DESCRIPTION="force any tcp connections to flow through a proxy (or proxy chain)"
-HOMEPAGE="http://proxychains.sourceforge.net/ https://github.com/haad/proxychains"
-SRC_URI="https://github.com/haad/proxychains/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	sed -i "s/^\(LDSO_SUFFIX\).*/\1 = so.${PV}/" Makefile || die
-	tc-export CC
-}
-
-src_configure() {
-	# not autotools
-	./configure || die
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc AUTHORS ChangeLog README TODO
-
-	dolib.so lib${PN}.so.${PV}
-	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV:0:1}
-	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so
-
-	insinto /etc
-	doins src/${PN}.conf
-}
diff --git a/net-misc/proxychains/proxychains-4.7.ebuild b/net-misc/proxychains/proxychains-4.7.ebuild
deleted file mode 100644
index ad797de0a1c0..000000000000
--- a/net-misc/proxychains/proxychains-4.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/proxychains/proxychains-4.7.ebuild,v 1.2 2014/06/23 17:39:32 radhermit Exp $
-
-EAPI=5
-
-inherit toolchain-funcs eutils multilib
-
-MY_PN=${PN}-ng
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="force any tcp connections to flow through a proxy (or proxy chain)"
-HOMEPAGE="https://github.com/rofl0r/proxychains-ng/"
-SRC_URI="https://github.com/rofl0r/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	sed -i "s/^\(LDSO_SUFFIX\).*/\1 = so.${PV}/" Makefile || die
-	tc-export CC
-}
-
-src_configure() {
-	# not autotools
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--sysconfdir="${EPREFIX}"/etc \
-		|| die
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc AUTHORS ChangeLog README TODO
-
-	dolib.so lib${PN}.so.${PV}
-	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV:0:1}
-	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so
-
-	insinto /etc
-	doins src/${PN}.conf
-}