gentoo resync : 05.01.2018

4 files changed, 2 insertions, 96 deletions

diff --git a/net-misc/proxychains/Manifest b/net-misc/proxychains/Manifest
index f1b2acaef428..644b1a717776 100644
--- a/net-misc/proxychains/Manifest
+++ b/net-misc/proxychains/Manifest
@@ -1,7 +1,4 @@
-AUX proxychains-4.10-makefile.patch 1327 BLAKE2B 60842f593fb113c3427cba729d93a863cfac306374fde3ae543e791da0777e3d589c02fed306a41d11ef3f434e7e27273e027effd275a509a46a0f3435768b0a SHA512 09defd6121aa024311fa27aaaf421ac74edcdd63d4fa3dacadec927cab119663ec77f887e74d4b42b249091237a76e62149124fdc329a7f5f21efa94d75ed081
 AUX proxychains-4.12-makefile.patch 1269 BLAKE2B e52a59dd39e19c063cf37455aef06551bfb93f12b12c39c432237d80552c2833bc40a7aa033548770f3ae921c0a929ddefe8a495b84448bffad13548f307417a SHA512 c25bae5b6d72c496cc4d92b0f8db22a113bd5e138cfccd0c5cebe45788f2dc88a4e2b194a86e635619e5ba575747bbf460b246efb35993544dab06b12009ea04
-DIST proxychains-ng-4.11.tar.bz2 31856 BLAKE2B 6ff8611a9c5d3c38a148e7d3c1109d0a738f95641e61b965d24a7fa71db0a4c803fa98d4b32349c11013858b0a9de83c3754eb8703c969140ea604c6a3f0de06 SHA512 241365e8a8bbcead22c7844a2970f59bfc1ee9ef9a42a3f800823e70008bd976835d705a8b9894980c46307dce3a886514051023bafef113845531cb5d928e1c
 DIST proxychains-ng-4.12.tar.xz 31816 BLAKE2B 1267cd67ca3a21737abe9e510103c35e409a4afebf30c8917b7be8a84f1bb4edc55b6ec633eb5e63682ed2f6c277a464e16adaa52c70c8bac2588cfe7b36f1a6 SHA512 c1319065b2885fb16f1cd10092a25f49c20ace82dc67edcb2e8845fe79274fe63f5214d117eef3bfdffdc6aa8bf6904ea216047bd626043c5ecb36cd15d5560a
-EBUILD proxychains-4.11.ebuild 1053 BLAKE2B e87867f1ca2cf98d7d6243c021be3be76bba4171d837283e3a26cf19d734ae77ee61203a601c87c1508b7d1842635a6cec2bc72cb2bab8ec5fa47302fbdcf7d3 SHA512 7683acabd17b189a2af0fd2b15e2e3ed18064e7dc1d636cf8822a11aa60ac7c7386f352ae6342b23f129d25ee9e51dcdf7cc4cb1145b7f53a9dec043404370a5
-EBUILD proxychains-4.12-r1.ebuild 1056 BLAKE2B 3c5892c1edc3d0af725cc0be75fb927f7da5f21643265929dc5e2c32547859cb2dc94bc821f6227cc352c088b4addd86a7995d6248277f83ce9f5306fca2a9df SHA512 003d70dd53e7ea0c6b7c6e987fab3155425ee691e0cb9e602a495a967460be74bfd55500501d7529169720df1b35754dfdfff1c9aab31a3366e7a5c698ddd3e6
+EBUILD proxychains-4.12-r1.ebuild 1053 BLAKE2B 3a7efc6ab9b696cc44abef396a81c23311c674260dee94e6957c844f6dc7692b53466ca6606766ca53658b00eac1b130410e934ebaa6fb9acb4f91435c1d9526 SHA512 5ec56256c1a1ba7ef38cc47143d6a10adddde05974c14cccc0e85ca2844b103115e02a5740395a1e8b0baab2e5f1e88d48a265c34af64845c66db3887d4bb558
 MISC metadata.xml 332 BLAKE2B ec0a64e6a8b98117123ea94cdea29f12583127fda7ee5e5bb8e538628652971674df48012f8b07cd89994b9bc1badc1f42276dae92d899dd4983109f302ba42a SHA512 fd3dc4c1f4bc62a11a150838c07c619a57dcac24070b56594e73c0fc75551432449da46424b3c1072d24c2c0dbc0ffc02af8473772c4adf5d72da86b68d0e5eb
diff --git a/net-misc/proxychains/files/proxychains-4.10-makefile.patch b/net-misc/proxychains/files/proxychains-4.10-makefile.patch
deleted file mode 100644
index 5a3a2e1a6e8b..000000000000
--- a/net-misc/proxychains/files/proxychains-4.10-makefile.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- proxychains-ng-4.10.orig/Makefile
-+++ proxychains-ng-4.10/Makefile
-@@ -22,11 +22,9 @@
- 
- GENH = src/version.h
- 
--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
--INC     = 
-+CFLAGS  = -Wall -std=c99 -D_GNU_SOURCE
-+LIBS    = -ldl -lpthread
-+INC     =
- PIC     = -fPIC
- AR      = $(CROSS_COMPILE)ar
- RANLIB  = $(CROSS_COMPILE)ranlib
-@@ -35,11 +33,11 @@
- LD_SET_SONAME = -Wl,-soname=
- INSTALL = ./tools/install.sh
- 
--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)
- ALL_CONFIGS = src/proxychains.conf
- 
-@@ -81,11 +79,10 @@
- 	$(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_MAIN) $(INC) $(PIC) -c -o $@ $<
- 
- $(LDSO_PATHNAME): $(LOBJS)
--	$(CC) $(LDFLAGS) $(LD_SET_SONAME)$(LDSO_PATHNAME) $(USER_LDFLAGS) \
--		-o $@ $(LOBJS)
-+	$(CC) $(LDFLAGS) -shared $(PIC) $(LD_SET_SONAME)$(LDSO_PATHNAME) -o $@ $(LOBJS) $(LIBS)
- 
- $(ALL_TOOLS): $(OBJS)
--	$(CC) src/main.o src/common.o $(USER_LDFLAGS) -o $(PXCHAINS)
-+	$(CC) $(LDFLAGS) src/main.o src/common.o -o $(PXCHAINS) $(LIBS)
- 
- 
- .PHONY: all clean install install-config install-libs install-tools
diff --git a/net-misc/proxychains/proxychains-4.11.ebuild b/net-misc/proxychains/proxychains-4.11.ebuild
deleted file mode 100644
index 653885331f48..000000000000
--- a/net-misc/proxychains/proxychains-4.11.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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}/releases/download/v${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.10-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 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.12-r1.ebuild b/net-misc/proxychains/proxychains-4.12-r1.ebuild
index e7dcaf5f22b5..494570b86c0e 100644
--- a/net-misc/proxychains/proxychains-4.12-r1.ebuild
+++ b/net-misc/proxychains/proxychains-4.12-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rofl0r/${MY_PN}/releases/download/v${PV}/${MY_P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 
 S=${WORKDIR}/${MY_P}