Remove old.

(Portage version: 2.2.0_alpha95/cvs/Linux x86_64)

6 files changed, 6 insertions, 326 deletions

diff --git a/net-proxy/dante/ChangeLog b/net-proxy/dante/ChangeLog
index 25730db2b86d..37c54f0c0d5c 100644
--- a/net-proxy/dante/ChangeLog
+++ b/net-proxy/dante/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-proxy/dante
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.62 2012/03/13 12:07:02 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.63 2012/03/25 07:31:10 radhermit Exp $
+
+  25 Mar 2012; Tim Harder <radhermit@gentoo.org> -dante-1.2.3.ebuild,
+  -files/dante-1.2.3-socksify.patch, -dante-1.3.0.ebuild, -dante-1.3.1.ebuild,
+  -dante-1.3.1-r1.ebuild:
+  Remove old.
 
   13 Mar 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> dante-1.1.19-r4.ebuild,
   dante-1.2.3.ebuild, dante-1.3.0.ebuild, dante-1.3.1.ebuild,
diff --git a/net-proxy/dante/dante-1.2.3.ebuild b/net-proxy/dante/dante-1.2.3.ebuild
deleted file mode 100644
index 2ecbc4d09dbd..000000000000
--- a/net-proxy/dante/dante-1.2.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.2.3.ebuild,v 1.2 2012/03/13 12:07:02 phajdan.jr Exp $
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="A free socks4,5 and msproxy implementation"
-HOMEPAGE="http://www.inet.no/dante/"
-SRC_URI="ftp://ftp.inet.no/pub/socks/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug kerberos pam selinux static-libs tcpd"
-
-RDEPEND="pam? ( virtual/pam )
-	kerberos? ( virtual/krb5 )
-	selinux? ( sec-policy/selinux-dante )
-	tcpd? ( sys-apps/tcp-wrappers )
-	userland_GNU? ( virtual/shadow )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison"
-
-DOCS="BUGS CREDITS NEWS README SUPPORT TODO doc/README* doc/*.txt doc/SOCKS4.protocol"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-socksify.patch"
-
-	sed -i \
-		-e 's:/etc/socks\.conf:/etc/socks/socks.conf:' \
-		-e 's:/etc/sockd\.conf:/etc/socks/sockd.conf:' \
-		doc/{socksify.1,socks.conf.5,sockd.conf.5,sockd.8}
-}
-
-src_configure() {
-	econf \
-		--with-socks-conf=/etc/socks/socks.conf \
-		--with-sockd-conf=/etc/socks/sockd.conf \
-		--without-upnp \
-		$(use_enable debug) \
-		$(use_with kerberos gssapi) \
-		$(use_with pam) \
-		$(use_enable static-libs static) \
-		$(use_enable tcpd libwrap)
-}
-
-src_install() {
-	default
-
-	# default configuration files
-	insinto /etc/socks
-	doins "${FILESDIR}"/sock?.conf
-	pushd "${D}/etc/socks" > /dev/null
-	use pam && epatch "${FILESDIR}/sockd.conf-with-pam.patch"
-	use tcpd && epatch "${FILESDIR}/sockd.conf-with-libwrap.patch"
-	popd > /dev/null
-
-	# init script
-	newinitd "${FILESDIR}/dante-sockd-init" dante-sockd
-	newconfd "${FILESDIR}/dante-sockd-conf" dante-sockd
-
-	# example configuration files
-	docinto examples
-	dodoc example/*.conf
-
-	use static-libs || find "${ED}" -name '*.la' -exec rm '{}' +
-}
-
-pkg_postinst() {
-	enewuser sockd -1 -1 /etc/socks daemon
-}
diff --git a/net-proxy/dante/dante-1.3.0.ebuild b/net-proxy/dante/dante-1.3.0.ebuild
deleted file mode 100644
index d24baf0483d8..000000000000
--- a/net-proxy/dante/dante-1.3.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.3.0.ebuild,v 1.2 2012/03/13 12:07:02 phajdan.jr Exp $
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="A free socks4,5 and msproxy implementation"
-HOMEPAGE="http://www.inet.no/dante/"
-SRC_URI="ftp://ftp.inet.no/pub/socks/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug kerberos pam selinux static-libs tcpd"
-
-RDEPEND="pam? ( virtual/pam )
-	kerberos? ( virtual/krb5 )
-	selinux? ( sec-policy/selinux-dante )
-	tcpd? ( sys-apps/tcp-wrappers )
-	userland_GNU? ( virtual/shadow )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison"
-
-DOCS="BUGS CREDITS NEWS README SUPPORT doc/README* doc/*.txt doc/SOCKS4.protocol"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-socksify.patch"
-
-	sed -i \
-		-e 's:/etc/socks\.conf:/etc/socks/socks.conf:' \
-		-e 's:/etc/sockd\.conf:/etc/socks/sockd.conf:' \
-		doc/{socksify.1,socks.conf.5,sockd.conf.5,sockd.8}
-}
-
-src_configure() {
-	econf \
-		--with-socks-conf=/etc/socks/socks.conf \
-		--with-sockd-conf=/etc/socks/sockd.conf \
-		--without-upnp \
-		$(use_enable debug) \
-		$(use_with kerberos gssapi) \
-		$(use_with pam) \
-		$(use_enable static-libs static) \
-		$(use_enable tcpd libwrap)
-}
-
-src_install() {
-	default
-
-	# default configuration files
-	insinto /etc/socks
-	doins "${FILESDIR}"/sock?.conf
-	pushd "${D}/etc/socks" > /dev/null
-	use pam && epatch "${FILESDIR}/sockd.conf-with-pam.patch"
-	use tcpd && epatch "${FILESDIR}/sockd.conf-with-libwrap.patch"
-	popd > /dev/null
-
-	# init script
-	newinitd "${FILESDIR}/dante-sockd-init" dante-sockd
-	newconfd "${FILESDIR}/dante-sockd-conf" dante-sockd
-
-	# example configuration files
-	docinto examples
-	dodoc example/*.conf
-
-	use static-libs || find "${ED}" -name '*.la' -exec rm '{}' +
-}
-
-pkg_postinst() {
-	enewuser sockd -1 -1 /etc/socks daemon
-}
diff --git a/net-proxy/dante/dante-1.3.1-r1.ebuild b/net-proxy/dante/dante-1.3.1-r1.ebuild
deleted file mode 100644
index 1b09ed12a140..000000000000
--- a/net-proxy/dante/dante-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.3.1-r1.ebuild,v 1.2 2012/03/13 12:07:02 phajdan.jr Exp $
-
-EAPI="4"
-
-inherit autotools eutils
-
-DESCRIPTION="A free socks4,5 and msproxy implementation"
-HOMEPAGE="http://www.inet.no/dante/"
-SRC_URI="ftp://ftp.inet.no/pub/socks/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug kerberos pam selinux static-libs tcpd"
-
-RDEPEND="pam? ( virtual/pam )
-	kerberos? ( virtual/krb5 )
-	selinux? ( sec-policy/selinux-dante )
-	tcpd? ( sys-apps/tcp-wrappers )
-	userland_GNU? ( virtual/shadow )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison"
-
-DOCS="BUGS CREDITS NEWS README SUPPORT doc/README* doc/*.txt doc/SOCKS4.protocol"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.3.0-socksify.patch \
-		"${FILESDIR}"/${PN}-1.3.1-flags.patch
-
-	sed -i \
-		-e 's:/etc/socks\.conf:/etc/socks/socks.conf:' \
-		-e 's:/etc/sockd\.conf:/etc/socks/sockd.conf:' \
-		doc/{socksify.1,socks.conf.5,sockd.conf.5,sockd.8} \
-		|| die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-socks-conf=/etc/socks/socks.conf \
-		--with-sockd-conf=/etc/socks/sockd.conf \
-		--without-upnp \
-		$(use_enable debug) \
-		$(use_with kerberos gssapi) \
-		$(use_with pam) \
-		$(use_enable static-libs static) \
-		$(use_enable tcpd libwrap)
-}
-
-src_install() {
-	default
-
-	# default configuration files
-	insinto /etc/socks
-	doins "${FILESDIR}"/sock?.conf
-	pushd "${D}/etc/socks" > /dev/null
-	use pam && epatch "${FILESDIR}/sockd.conf-with-pam.patch"
-	use tcpd && epatch "${FILESDIR}/sockd.conf-with-libwrap.patch"
-	popd > /dev/null
-
-	# init script
-	newinitd "${FILESDIR}/dante-sockd-init" dante-sockd
-	newconfd "${FILESDIR}/dante-sockd-conf" dante-sockd
-
-	# example configuration files
-	docinto examples
-	dodoc example/*.conf
-
-	use static-libs || find "${ED}" -name '*.la' -exec rm '{}' +
-}
-
-pkg_postinst() {
-	enewuser sockd -1 -1 /etc/socks daemon
-}
diff --git a/net-proxy/dante/dante-1.3.1.ebuild b/net-proxy/dante/dante-1.3.1.ebuild
deleted file mode 100644
index 96961bb1c4ae..000000000000
--- a/net-proxy/dante/dante-1.3.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.3.1.ebuild,v 1.2 2012/03/13 12:07:02 phajdan.jr Exp $
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="A free socks4,5 and msproxy implementation"
-HOMEPAGE="http://www.inet.no/dante/"
-SRC_URI="ftp://ftp.inet.no/pub/socks/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug kerberos pam selinux static-libs tcpd"
-
-RDEPEND="pam? ( virtual/pam )
-	kerberos? ( virtual/krb5 )
-	selinux? ( sec-policy/selinux-dante )
-	tcpd? ( sys-apps/tcp-wrappers )
-	userland_GNU? ( virtual/shadow )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison"
-
-DOCS="BUGS CREDITS NEWS README SUPPORT doc/README* doc/*.txt doc/SOCKS4.protocol"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.3.0-socksify.patch"
-
-	sed -i \
-		-e 's:/etc/socks\.conf:/etc/socks/socks.conf:' \
-		-e 's:/etc/sockd\.conf:/etc/socks/sockd.conf:' \
-		doc/{socksify.1,socks.conf.5,sockd.conf.5,sockd.8}
-}
-
-src_configure() {
-	econf \
-		--with-socks-conf=/etc/socks/socks.conf \
-		--with-sockd-conf=/etc/socks/sockd.conf \
-		--without-upnp \
-		$(use_enable debug) \
-		$(use_with kerberos gssapi) \
-		$(use_with pam) \
-		$(use_enable static-libs static) \
-		$(use_enable tcpd libwrap)
-}
-
-src_install() {
-	default
-
-	# default configuration files
-	insinto /etc/socks
-	doins "${FILESDIR}"/sock?.conf
-	pushd "${D}/etc/socks" > /dev/null
-	use pam && epatch "${FILESDIR}/sockd.conf-with-pam.patch"
-	use tcpd && epatch "${FILESDIR}/sockd.conf-with-libwrap.patch"
-	popd > /dev/null
-
-	# init script
-	newinitd "${FILESDIR}/dante-sockd-init" dante-sockd
-	newconfd "${FILESDIR}/dante-sockd-conf" dante-sockd
-
-	# example configuration files
-	docinto examples
-	dodoc example/*.conf
-
-	use static-libs || find "${ED}" -name '*.la' -exec rm '{}' +
-}
-
-pkg_postinst() {
-	enewuser sockd -1 -1 /etc/socks daemon
-}
diff --git a/net-proxy/dante/files/dante-1.2.3-socksify.patch b/net-proxy/dante/files/dante-1.2.3-socksify.patch
deleted file mode 100644
index 9b8f97b32289..000000000000
--- a/net-proxy/dante/files/dante-1.2.3-socksify.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- dante-1.2.3/bin/socksify.in.orig
-+++ dante-1.2.3/bin/socksify.in
-@@ -47,8 +47,6 @@
- #been relinked or recompiled.  This will not work on statically linked
- #binaries.
- 
--SOCKSIFY_PRELOAD_LIBS="@SOCKSIFY_PRELOAD_LIBS@"
--
- LIBDIR="${LIBDIR:-@LIBRARY_PREFIX@}"
- 
- #dlib/Makefile.am libtool flags should produce a predictable library name
-@@ -65,7 +63,11 @@
- @PRELOAD_VARIABLE@="${LIBRARY}${SOCKSIFY_PRELOAD_LIBS:+${PRELOAD_SEPERATOR}}${SOCKSIFY_PRELOAD_LIBS}${PRELOAD_POSTFIX:+${PRELOAD_SEPERATOR}}${PRELOAD_POSTFIX}"
- export @PRELOAD_VARIABLE@
- 
--LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}${LIBDIR}"
--export LD_LIBRARY_PATH
-+# There is no reason to set LD_LIBRARY_PATH, at least on Linux, where
-+# LD_PRELOAD can contain a full path to the library.  Setting the
-+# following breaks socksify on Linux/Alpha at least with
-+# binutils-2.14.90.0.7-r3 (08 Dec 2003 agriffis)
-+#LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}${LIBDIR}"
-+#export LD_LIBRARY_PATH
- 
- exec "$@"