Drop old.

(Portage version: 2.1.10.16/cvs/Linux x86_64)

4 files changed, 5 insertions, 230 deletions

diff --git a/net-firewall/ipset/ChangeLog b/net-firewall/ipset/ChangeLog
index 88c5db2d1f6d..7078d2a478c1 100644
--- a/net-firewall/ipset/ChangeLog
+++ b/net-firewall/ipset/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-firewall/ipset
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.52 2011/09/16 13:26:44 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.53 2011/09/19 05:49:29 pva Exp $
+
+  17 Sep 2011; Peter Volkov <pva@gentoo.org> -files/ipset-2.4.7-LDFLAGS.patch,
+  -ipset-4.4.ebuild, -ipset-6.7-r1.ebuild:
+  Drop old.
 
   16 Sep 2011; Tony Vroon <chainsaw@gentoo.org> ipset-4.5.ebuild,
   ipset-6.8.ebuild:
diff --git a/net-firewall/ipset/files/ipset-2.4.7-LDFLAGS.patch b/net-firewall/ipset/files/ipset-2.4.7-LDFLAGS.patch
deleted file mode 100644
index 9f8bcaf9e22f..000000000000
--- a/net-firewall/ipset/files/ipset-2.4.7-LDFLAGS.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-=== modified file 'Makefile'
---- Makefile	2009-01-30 16:53:06 +0000
-+++ Makefile	2009-01-30 20:13:44 +0000
-@@ -105,14 +105,14 @@
- 	$(CC) $(CFLAGS) -DIPSET_VERSION=\"$(IPSET_VERSION)\" -DIPSET_LIB_DIR=\"$(IPSET_LIB_DIR)\" -c -o $@ $<
- 
- ipset: ipset.o
--	$(CC) $(CFLAGS) -rdynamic -o $@ $^ -ldl
-+	$(CC) $(CFLAGS) $(LDFLAGS) -rdynamic -o $@ $^ -ldl
- 
- #Pooltypes
- ipset_%.o: ipset_%.c ipset.h
- 	$(CC) $(SH_CFLAGS) -o $@ -c $<
- 
- libipset_%.so: ipset_%.o
--	$(CC) -shared -o $@ $<
-+	$(CC) -shared $(LDFLAGS) -o $@ $<
- 
- $(DESTDIR)$(LIBDIR)/ipset/libipset_%.so: libipset_%.so
- 	@[ -d $(DESTDIR)$(LIBDIR)/ipset ] || mkdir -p $(DESTDIR)$(LIBDIR)/ipset
-
diff --git a/net-firewall/ipset/ipset-4.4.ebuild b/net-firewall/ipset/ipset-4.4.ebuild
deleted file mode 100644
index 8a560584208e..000000000000
--- a/net-firewall/ipset/ipset-4.4.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-4.4.ebuild,v 1.4 2011/03/25 20:19:06 xarthisius Exp $
-
-EAPI="2"
-
-inherit eutils versionator toolchain-funcs linux-mod
-
-DESCRIPTION="IPset tool for iptables, successor to ippool."
-HOMEPAGE="http://ipset.netfilter.org/"
-SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="modules"
-
-RDEPEND=">=net-firewall/iptables-1.4.4"
-DEPEND="${RDEPEND}"
-
-# configurable from outside
-[ -z "${IP_NF_SET_MAX}" ] && IP_NF_SET_MAX=256
-[ -z "${IP_NF_SET_HASHSIZE}" ] && IP_NF_SET_HASHSIZE=1024
-BUILD_PARAMS="IP_NF_SET_MAX=$IP_NF_SET_MAX IP_NF_SET_HASHSIZE=${IP_NF_SET_HASHSIZE}"
-# module fun
-BUILD_TARGETS="all"
-MODULE_NAMES_ARG="kernel/net/ipv4/netfilter:${S}/kernel"
-MODULE_NAMES=""
-for i in ip_set{,_{setlist,{ip,port,macip}map,{ip,net,ipport,ipportip,ipportnet}hash,iptree{,map}}} \
-	ipt_{SET,set}; do
-	MODULE_NAMES="${MODULE_NAMES} ${i}(${MODULE_NAMES_ARG})"
-done
-# sanity
-CONFIG_CHECK="NETFILTER"
-ERROR_CFG="ipset requires netfilter support in your kernel."
-
-pkg_setup() {
-	get_version
-
-	build_modules=0
-	if use modules; then
-		if linux_config_src_exists && linux_chkconfig_builtin "MODULES" ; then
-			if linux_chkconfig_builtin "IP_NF_SET"; then #274577
-				einfo "Modular kernel detected but IP_NF_SET=y, will not build kernel modules"
-			else
-				build_modules=1
-				einfo "Modular kernel detected, will build kernel modules"
-			fi
-		else
-			einfo "Nonmodular kernel detected, will not build kernel modules"
-		fi
-	fi
-
-	[[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup
-	myconf="${myconf} PREFIX="
-	myconf="${myconf} LIBDIR=/$(get_libdir)"
-	myconf="${myconf} BINDIR=/sbin"
-	myconf="${myconf} MANDIR=/usr/share/man"
-	myconf="${myconf} INCDIR=/usr/include"
-	myconf="${myconf} NO_EXTRA_WARN_FLAGS=yes"
-	export myconf
-}
-
-src_prepare() {
-	sed -i \
-		-e 's/KERNELDIR/(KERNELDIR)/g' \
-		-e 's/^(\?KERNEL_\?DIR.*/KERNELDIR ?= /' \
-		-e '/^all::/iV ?= 0' \
-		-e '/^all::/iKBUILD_OUTPUT ?=' \
-		-e '/$(MAKE)/{s/$@/ V=$(V) KBUILD_OUTPUT=$(KBUILD_OUTPUT) modules/}' \
-		"${S}"/kernel/Makefile
-}
-
-src_compile() {
-	einfo "Building userspace"
-	emake \
-		CC="$(tc-getCC)" \
-		COPT_FLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		${myconf} \
-		binaries || die "failed to build"
-
-	if [[ ${build_modules} -eq 1 ]]; then
-		einfo "Building kernel modules"
-		cd "${S}/kernel"
-		export KERNELDIR="${KERNEL_DIR}"
-		linux-mod_src_compile || die "failed to build modules"
-	fi
-}
-
-src_install() {
-	einfo "Installing userspace"
-	emake DESTDIR="${D}" ${myconf} binaries_install || die "failed to package"
-
-	if [[ ${build_modules} -eq 1 ]]; then
-		einfo "Installing kernel modules"
-		cd "${S}/kernel"
-		export KERNELDIR="${KERNEL_DIR}"
-		linux-mod_src_install
-	fi
-}
diff --git a/net-firewall/ipset/ipset-6.7-r1.ebuild b/net-firewall/ipset/ipset-6.7-r1.ebuild
deleted file mode 100644
index e48c8a9aec4e..000000000000
--- a/net-firewall/ipset/ipset-6.7-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-6.7-r1.ebuild,v 1.2 2011/07/02 13:04:17 swegener Exp $
-
-EAPI="4"
-inherit autotools linux-info linux-mod
-
-DESCRIPTION="IPset tool for iptables, successor to ippool."
-HOMEPAGE="http://ipset.netfilter.org/"
-SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="modules"
-
-RDEPEND=">=net-firewall/iptables-1.4.4
-	net-libs/libmnl"
-DEPEND="${RDEPEND}"
-
-# configurable from outside, e.g. /etc/make.conf
-IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
-
-BUILD_TARGETS="modules"
-MODULE_NAMES_ARG="kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/ipset"
-MODULE_NAMES="xt_set(kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/)"
-for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,port{,ip,net}},net,net{port,iface}},_list_set}; do
-	MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})"
-done
-CONFIG_CHECK="NETFILTER IP6_NF_IPTABLES"
-ERROR_CFG="ipset requires netfilter support in your kernel."
-
-check_header_patch() {
-	if ! $(grep -q NFNL_SUBSYS_IPSET "${KV_DIR}/include/linux/netfilter/nfnetlink.h"); then
-		eerror "Sorry, but you have to patch kernel sources with the following patch:"
-		eerror " # cd ${KV_DIR}"
-		eerror " # patch -i ${S}/netlink.patch -p1"
-		eerror "You do not need to recompile your kernel."
-		die "Unpatched kernel"
-	fi
-}
-
-pkg_setup() {
-	get_version
-
-	build_modules=0
-	if use modules; then
-		kernel_is -lt 2 6 35 && die "${PN} requires kernel greater then 2.6.35."
-		if linux_config_src_exists && linux_chkconfig_builtin "MODULES" ; then
-			if linux_chkconfig_builtin "IP_NF_SET"; then #274577
-				einfo "Modular kernel detected but IP_NF_SET=y, will not build kernel modules"
-			else
-				if kernel_is -gt 2 6 39; then
-					einfo "This kernel has modules inside, will not build kernel modules"
-				else
-					einfo "Modular kernel detected, will build kernel modules"
-					build_modules=1
-				fi
-			fi
-		else
-			einfo "Nonmodular kernel detected, will not build kernel modules"
-		fi
-	fi
-
-	[[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup
-}
-
-src_prepare() {
-	[[ ${build_modules} -eq 1 ]] && check_header_patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-maxsets=${IP_NF_SET_MAX} \
-		--libdir="${EPREFIX}"/$(get_libdir) \
-		--with-source="${KV_DIR}" \
-		--with-kbuild="${KV_OUT_DIR}"
-}
-
-src_compile() {
-	einfo "Building userspace"
-	emake
-
-	if [[ ${build_modules} -eq 1 ]]; then
-		einfo "Building kernel modules"
-		set_arch_to_kernel
-		emake modules
-	fi
-}
-
-src_install() {
-	einfo "Installing userspace"
-	emake DESTDIR="${D}" install
-
-	if [[ ${build_modules} -eq 1 ]]; then
-		einfo "Installing kernel modules"
-		linux-mod_src_install
-	fi
-	find "${ED}" \( -name '*.la' -o -name '*.a' \) -exec rm -f '{}' +
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	elog "Note you need to rebuid and run kernel with netlink.patch or you'll get error:"
-	elog "Kernel error received: Invalid argument"
-}