cleanup...

update to new api

13 files changed, 4 insertions, 1034 deletions

diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
deleted file mode 100644
index bf45524..0000000
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.17 2008/05/18 02:08:03 hanno Exp $
-
-inherit git fdo-mime flag-o-matic multilib python
-
-EGIT_REPO_URI="git://git.gnome.org/gimp"
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="http://www.gimp.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT=""
-KEYWORDS=""
-
-IUSE="alsa aalib altivec curl dbus debug doc gtkhtml gnome jpeg lcms mmx mng pdf png python smp sse svg tiff wmf"
-
-RDEPEND=">=dev-libs/glib-2.12.3
-	>=x11-libs/gtk+-2.10.6
-	>=x11-libs/pango-1.12.2
-	>=media-libs/freetype-2.1.7
-	>=media-libs/fontconfig-2.2.0
-	>=media-libs/libart_lgpl-2.3.8-r1
-	>media-libs/babl-0.0.22
-	>media-libs/gegl-0.0.22
-	sys-libs/zlib
-	dev-libs/libxml2
-	dev-libs/libxslt
-	x11-themes/hicolor-icon-theme
-	aalib? ( media-libs/aalib )
-	alsa? ( >=media-libs/alsa-lib-1.0.14a-r1 )
-	curl? ( net-misc/curl )
-	dbus? ( dev-libs/dbus-glib
-		sys-apps/hal )
-	gnome? ( >=gnome-base/gnome-vfs-2.10.0
-		>=gnome-base/libgnomeui-2.10.0
-		>=gnome-base/gnome-keyring-0.4.5 )
-	gtkhtml? ( =gnome-extra/gtkhtml-2* )
-	jpeg? ( >=media-libs/jpeg-6b-r2
-		>=media-libs/libexif-0.6.15 )
-	lcms? ( media-libs/lcms )
-	mng? ( media-libs/libmng )
-	pdf? ( virtual/poppler )
-	png? ( >=media-libs/libpng-1.2.2 )
-	python?	( >=dev-lang/python-2.2.1
-		>=dev-python/pygtk-2.10.4 )
-	tiff? ( >=media-libs/tiff-3.5.7 )
-	svg? ( >=gnome-base/librsvg-2.8.0 )
-	wmf? ( >=media-libs/libwmf-0.2.8 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.31
-	>=sys-devel/gettext-0.17
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-
-src_compile() {
-	# workaround portage variable leakage
-	local AA=
-
-	# gimp uses inline functions (e.g. plug-ins/common/grid.c) (#23078)
-	# gimp uses floating point math, needs accuracy (#98685)
-	filter-flags "-fno-inline" "-ffast-math"
-	# gimp assumes char is signed (fixes preview corruption)
-	if use ppc || use ppc64; then
-		append-flags "-fsigned-char"
-	fi
-
-	sed -i -e 's:\$srcdir/configure:#:g' autogen.sh
-	"${S}"/autogen.sh $(use_enable doc gtk-doc) || die
-
-	econf --enable-default-binary \
-		--with-x \
-		$(use_with aalib aa) \
-		$(use_with alsa) \
-		$(use_enable altivec) \
-		$(use_with curl) \
-		$(use_enable debug) \
-		$(use_enable doc gtk-doc) \
-		$(use_with dbus) \
-		$(use_with gnome) \
-		$(use_with gtkhtml gtkhtml2) \
-		$(use_with jpeg libjpeg) \
-		$(use_with jpeg libexif) \
-		$(use_with lcms) \
-		$(use_enable mmx) \
-		$(use_with mng libmng) \
-		$(use_with pdf poppler) \
-		$(use_with png libpng) \
-		$(use_enable python) \
-		$(use_enable smp mp) \
-		$(use_enable sse) \
-		$(use_with svg librsvg) \
-		$(use_with tiff libtiff) \
-		$(use_with wmf) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS README*
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-
-	elog
-	elog "If you want Postscript file support, emerge ghostscript."
-	elog
-
-	python_mod_optimize /usr/$(get_libdir)/gimp/2.0/python \
-		/usr/$(get_libdir)/gimp/2.0/plug-ins
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \
-		/usr/$(get_libdir)/gimp/2.0/plug-ins
-}
diff --git a/media-libs/gegl/gegl-0.9999.ebuild b/media-libs/gegl/gegl-0.9999.ebuild
deleted file mode 100644
index 82fe8c3..0000000
--- a/media-libs/gegl/gegl-0.9999.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.0.22.ebuild,v 1.6 2009/01/31 09:26:09 mabi Exp $
-
-inherit eutils git
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="http://www.gegl.org/"
-SRC_URI=""
-
-EGIT_REPO_URI="git://git.gnome.org/gegl"
-EGIT_BOOTSTRAP="./autogen.sh"
-
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-SLOT=""
-KEYWORDS=""
-
-IUSE="cairo debug doc ffmpeg jpeg mmx openexr png raw sdl sse svg v4l"
-
-DEPEND=">=media-libs/babl-0.0.20
-	>=dev-libs/glib-2.18.0
-	media-libs/libpng
-	>=x11-libs/gtk+-2.14.0
-	x11-libs/pango
-	cairo? ( x11-libs/cairo )
-	dev-lang/ruby
-	doc? ( app-text/asciidoc
-		>=dev-lang/lua-5.1.0
-		app-text/enscript
-		media-gfx/graphviz
-		media-gfx/imagemagick )
-	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 )
-	jpeg? ( media-libs/jpeg )
-	openexr? ( media-libs/openexr )
-	raw? ( >=media-libs/libopenraw-0.0.5 )
-	sdl? ( media-libs/libsdl )
-	svg? ( >=gnome-base/librsvg-2.14.0 )"
-
-pkg_setup() {
-	if use doc && ! built_with_use 'media-gfx/imagemagick' 'png'; then
-		eerror "You must build imagemagick with png support"
-		die "media-gfx/imagemagick built without png"
-	fi
-}
-
-src_unpack() {
-	#unpack ${A}
-	git_src_unpack
-	cd "${S}"
-#	epatch "${FILESDIR}/${P}-locale_h.diff"
-}
-
-src_compile() {
-	econf --with-gtk --with-pango --with-gdk-pixbuf \
-		$(use_enable debug) \
-		$(use_with cairo) \
-		$(use_with cairo pangocairo) \
-		$(use_with v4l libv4l) \
-		$(use_enable doc docs) \
-		$(use_with doc graphviz) \
-		$(use_with doc lua) \
-		$(use_enable doc workshop) \
-		$(use_with ffmpeg libavformat) \
-		$(use_with jpeg libjpeg) \
-		$(use_enable mmx) \
-		$(use_with openexr) \
-		$(use_with png libpng) \
-		$(use_with raw libopenraw) \
-		$(use_with sdl) \
-		$(use_with svg librsvg) \
-		$(use_enable sse) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	# emake install doesn't install anything
-	einstall || die "einstall failed"
-	find "${D}" -name '*.la' -delete
-#	dodoc ChangeLog INSTALL README NEWS || die "dodoc failed"
-
-	# don't know why einstall omits this?!
-    insinto "/usr/include/${PN}-0.0/${PN}/buffer/"
-    doins "${WORKDIR}/${P}/${PN}"/buffer/*.h || die "doinsbuffer failed"
-    insinto "/usr/include/${PN}-0.0/${PN}/module/"
-    doins "${WORKDIR}/${P}/${PN}"/module/*.h ||	die "doins module failed"
-}
diff --git a/media-sound/gmpc/gmpc-9999.ebuild b/media-sound/gmpc/gmpc-9999.ebuild
deleted file mode 100644
index b68a637..0000000
--- a/media-sound/gmpc/gmpc-9999.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit autotools git gnome2-utils
-
-DESCRIPTION="A GTK+2 client for the Music Player Daemon."
-HOMEPAGE="http://gmpcwiki.sarine.nl/index.php/GMPC"
-EGIT_REPO_URI="git://repo.or.cz/gmpc.git"
-EGIT_BOOTSTRAP="./autogen.sh"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="nls +session xspf"
-
-RDEPEND=">=dev-libs/glib-2.10:2
-	dev-perl/XML-Parser
-	>=gnome-base/libglade-2.3
-	>=media-libs/libmpd-0.17.1
-	net-libs/libsoup:2.4
-	net-misc/curl
-	dev-lang/vala
-	>=x11-libs/gtk+-2.12:2
-	x11-libs/libsexy
-	session? ( x11-libs/libSM )
-	xspf? ( >=media-libs/libxspf-1.2 )"
-DEPEND="${RDEPEND}
-	dev-util/gob
-	dev-util/intltool
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-#src_prepare() {
-#	#einfo "Running intltoolize --automake"
-#	intltoolize --automake || die "intltoolize failed"
-#	#eautoreconf
-#}
-
-src_unpack() {
-	git_src_unpack
-}
-
-src_configure() {
-	econf \
-		$(use_enable session sm) \
-		$(use_enable xspf libxspf)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/mpd/files b/media-sound/mpd/files
deleted file mode 120000
index 8d8d7db..0000000
--- a/media-sound/mpd/files
+++ /dev/null
@@ -1 +0,0 @@
-/usr/portage/media-sound/mpd/files
\ No newline at end of file
diff --git a/media-sound/mpd/mpd-9999.ebuild b/media-sound/mpd/mpd-9999.ebuild
deleted file mode 100644
index 49c49d5..0000000
--- a/media-sound/mpd/mpd-9999.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit git flag-o-matic autotools
-
-EGIT_REPO_URI="git://repo.or.cz/mpd-mk.git"
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-
-LICENSE="GPL-2"
-SLOT=""
-KEYWORDS=""
-IUSE="aac alsa ao audiofile curl debug doc ffmpeg fifo flac icecast id3 ipv6 jack lame libsamplerate mad mikmod musepack ogg oggflac oss pulseaudio sysvipc unicode vorbis wavpack zeroconf"
-
-DEPEND="!sys-cluster/mpich2
-	>=sys-devel/automake-1.9
-	>=dev-libs/glib-2.4:2
-	aac? ( >=media-libs/faad2-2.0_rc2 )
-	alsa? ( media-sound/alsa-utils )
-	ao? ( >=media-libs/libao-0.8.4 )
-	audiofile? ( media-libs/audiofile )
-	curl? ( net-misc/curl )
-	doc? ( app-text/xmlto )
-	ffmpeg? ( media-video/ffmpeg )
-	flac? ( media-libs/flac )
-	jack? ( media-sound/jack-audio-connection-kit )
-	icecast? ( lame? ( media-sound/lame ) )
-	id3? ( media-libs/libid3tag )
-	lame? ( icecast? ( media-libs/libshout ) )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod )
-	musepack? ( media-libs/libmpcdec )
-	oggflac? ( media-libs/flac[ogg] )
-	ogg? ( media-libs/libogg )
-	pulseaudio? ( media-sound/pulseaudio )
-	vorbis? ( media-libs/libvorbis 
-		  icecast? ( media-libs/libshout ) )
-	wavpack? ( media-sound/wavpack )
-	zeroconf? ( net-dns/avahi )"
-
-pkg_setup() {
-	if ! use lame && ! use ogg && ! use icecast; then
-		ewarn "Asking to build without icecast, but also asked to build"
-		ewarn "without an encoder. Building without icecast support".
-	fi
-
-	enewuser mpd "" "" "/var/lib/mpd" audio
-}
-
-src_prepare() {
-	eautoreconf
-#	epatch "${FILESDIR}"/mpdconf.patch || die "epatch for config file failed"
-}
-
-src_configure() {
-	local myconf
-
-	myconf=""
-
-	if use zeroconf; then
-		myconf+=" --with-zeroconf=avahi"
-	else
-		myconf+=" --with-zeroconf=no"
-	fi
-
-	if use icecast; then
-		myconf+=" $(use_enable vorbis shout_ogg) $(use_enable lame shout_mp3)"
-	else
-		myconf+=" --disable-shout_ogg --disable-shout_mp3"
-	fi
-
-	append-lfs-flags
-
-	econf \
-		$(use_enable aac) \
-		$(use_enable alsa) \
-		$(use_enable ao) \
-		$(use_enable audiofile) \
-		$(use_enable curl) \
-		$(use_enable debug) \
-		$(use_enable fifo) \
-		$(use_enable ffmpeg) \
-		$(use_enable flac) \
-		$(use_enable id3) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable libsamplerate lsr) \
-		$(use_enable mad mp3) \
-		$(use_enable mikmod mod) \
-		$(use_enable musepack mpc) \
-		$(use_enable oggflac) \
-		$(use_enable oss) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable sysvipc un) \
-		$(use_enable vorbis oggvorbis) \
-		$(use_enable wavpack) \
-		${myconf} || die "could not configure"
-}
-
-src_install() {
-	dodir /var/run/mpd
-	fowners mpd:audio /var/run/mpd
-	fperms 750 /var/run/mpd
-	keepdir /var/run/mpd
-
-	if [ ! use doc ]; then
-		rm -v doc/protocol.html
-	fi
-
-	emake install DESTDIR="${D}" || die
-	rm -rf "${D}"/usr/share/doc/mpd/
-
-	if [ use doc ]; then
-		dodoc AUTHORS NEWS README TODO UPGRADING
-		dodoc doc/protocol.html doc/mpdconf.example
-	fi
-
-	insinto /etc
-	newins doc/mpdconf.example mpd.conf
-
-	newinitd "${FILESDIR}"/mpd.rc mpd
-
-	if use unicode; then
-		dosed 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' /etc/mpd.conf
-	fi
-
-	diropts -m0755 -o mpd -g audio
-	dodir /var/lib/mpd/music
-	keepdir /var/lib/mpd/music
-	dodir /var/lib/mpd/playlists
-	keepdir /var/lib/mpd/playlists
-	dodir /var/log/mpd
-	keepdir /var/log/mpd
-
-	use alsa && \
-		dosed 's:need :need alsasound :' /etc/init.d/mpd
-}
-
-pkg_postinst() {
-	elog "If you will be starting mpd via /etc/init.d/mpd initscript, please make"
-	elog "sure that MPD's pid_file is set to /var/run/mpd/mpd.pid."
-
-	# also change the homedir if the user has existed before
-	usermod -d "/var/lib/mpd" mpd
-}
diff --git a/net-firewall/iptables/files/libxt_layer7.c b/net-firewall/iptables/files/libxt_layer7.c
deleted file mode 100644
index d9a5a80..0000000
--- a/net-firewall/iptables/files/libxt_layer7.c
+++ /dev/null
@@ -1,368 +0,0 @@
-/* 
-   Shared library add-on to iptables for layer 7 matching support. 
-  
-   By Matthew Strait <quadong@users.sf.net>, Oct 2003-Aug 2008.
-
-   http://l7-filter.sf.net 
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version
-   2 of the License, or (at your option) any later version.
-   http://www.gnu.org/licenses/gpl.txt
-*/
-
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <netdb.h>
-#include <string.h>
-#include <stdlib.h>
-#include <getopt.h>
-#include <ctype.h>
-#include <dirent.h>
-
-#include <xtables.h>
-#include <linux/netfilter/xt_layer7.h>
-
-#define MAX_FN_LEN 256
-
-static char l7dir[MAX_FN_LEN] = "\0";
-
-/* Function which prints out usage message. */
-static void help(void)
-{
-	printf(
-	"layer7 match options:\n"
-	"    --l7dir <directory> : Look for patterns here instead of /etc/l7-protocols/\n"
-	"                          (--l7dir must be specified before --l7proto if used)\n"
-	"[!] --l7proto <name>: Match named protocol using /etc/l7-protocols/.../name.pat\n");
-}
-
-static const struct option opts[] = {
-	{ .name = "l7proto", .has_arg = 1, .val = 'p' },
-	{ .name = "l7dir",   .has_arg = 1, .val = 'd' },
-	{ .name = NULL }
-};
-
-/* reads filename, puts protocol info into layer7_protocol_info, number of protocols to numprotos */
-static int parse_protocol_file(char * filename, const char * protoname, struct xt_layer7_info *info)
-{
-	FILE * f;
-	char * line = NULL;
-	size_t len = 0;
-
-	enum { protocol, pattern, done } datatype = protocol;
-
-	f = fopen(filename, "r");
-
-	if(!f)
-		return 0;
-
-	while(getline(&line, &len, f) != -1)
-	{
-		if(strlen(line) < 2 || line[0] == '#')
-			continue;
-
-		/* strip the pesky newline... */
-		if(line[strlen(line) - 1] == '\n')
-			line[strlen(line) - 1] = '\0';
-
-		if(datatype == protocol)
-		{
-			/* Ignore everything on the line beginning with the 
-			first space or tab . For instance, this allows the 
-			protocol line in http.pat to be "http " (or 
-			"http I am so cool") instead of just "http". */
-			if(strchr(line, ' ')){
-				char * space = strchr(line, ' ');
-				space[0] = '\0';
-			}
-			if(strchr(line, '\t')){
-				char * space = strchr(line, '\t');
-				space[0] = '\0';
-			}
-
-			/* sanity check.  First non-comment non-blank 
-			line must be the same as the file name. */
-			if(strcmp(line, protoname))
-				exit_error(OTHER_PROBLEM, 
-					"Protocol name (%s) doesn't match file name (%s).  Bailing out\n",
-					line, filename);
-
-			if(strlen(line) >= MAX_PROTOCOL_LEN)
-				 exit_error(PARAMETER_PROBLEM, 
-					"Protocol name in %s too long!", filename);
-			strncpy(info->protocol, line, MAX_PROTOCOL_LEN);
-
-			datatype = pattern; 
-		}
-		else if(datatype == pattern)
-		{
-			if(strlen(line) >= MAX_PATTERN_LEN)
-				 exit_error(PARAMETER_PROBLEM, "Pattern in %s too long!", filename);
-			strncpy(info->pattern, line, MAX_PATTERN_LEN);
-			
-			datatype = done;			
-			break;
-		}
-		else
-			exit_error(OTHER_PROBLEM, "Internal error");
-	}
-
-	if(datatype != done)
-		exit_error(OTHER_PROBLEM, "Failed to get all needed data from %s", filename);
-
-	if(line) free(line);
-	fclose(f);
-
-	return 1;
-}
-
-static int hex2dec(char c)
-{
-        switch (c)
-        {
-                case '0' ... '9':
-                        return c - '0';
-                case 'a' ... 'f':
-                        return c - 'a' + 10;
-                case 'A' ... 'F':
-                        return c - 'A' + 10;
-                default:
-                        exit_error(OTHER_PROBLEM, "hex2dec: bad value!\n");
-                        return 0;
-        }
-}
-
-/* takes a string with \xHH escapes and returns one with the characters 
-they stand for */
-static char * pre_process(char * s)
-{
-	char * result = malloc(strlen(s) + 1);
-	int sindex = 0, rrindex = 0;
-        while( sindex < strlen(s) )
-        {
-            if( sindex + 3 < strlen(s) &&
-                s[sindex] == '\\' && s[sindex+1] == 'x' && 
-                isxdigit(s[sindex + 2]) && isxdigit(s[sindex + 3]) ) 
-                {
-                        /* carefully remember to call tolower here... */
-                        result[rrindex] = tolower( hex2dec(s[sindex + 2])*16 +
-                                                  hex2dec(s[sindex + 3] ) );
-
-			switch ( result[rrindex] )
-			{
-			case 0x24:
-			case 0x28:
-			case 0x29:
-			case 0x2a:
-			case 0x2b:
-			case 0x2e:
-			case 0x3f:
-			case 0x5b:
-			case 0x5c:
-			case 0x5d:
-			case 0x5e:
-			case 0x7c:
-				fprintf(stderr, 
-					"Warning: layer7 regexp contains a control character, %c, in hex (\\x%c%c).\n"
-					"I recommend that you write this as %c or \\%c, depending on what you meant.\n",
-					result[rrindex], s[sindex + 2], s[sindex + 3], result[rrindex], result[rrindex]);
-				break;
-			case 0x00:
-				fprintf(stderr, 
-					"Warning: null (\\x00) in layer7 regexp.  A null terminates the regexp string!\n");
-				break;
-			default:
-				break;
-			}
-
-
-                        sindex += 3; /* 4 total */
-                }
-                else
-                        result[rrindex] = tolower(s[sindex]);
-
-		sindex++; 
-		rrindex++;
-        }
-	result[rrindex] = '\0';
-
-	return result;
-}
-
-#define MAX_SUBDIRS 128
-static char ** readl7dir(char * dirname)
-{
-        DIR             * scratchdir;
-        struct dirent   ** namelist;
-	char ** subdirs = malloc(MAX_SUBDIRS * sizeof(char *));
-
-        int n, d = 1;
-	subdirs[0] = "";
-
-        n = scandir(dirname, &namelist, 0, alphasort);
-
-	if (n < 0)
-	{
-            perror("scandir");
-	    exit_error(OTHER_PROBLEM, "Couldn't open %s\n", dirname);
-	}
-        else 
-	{
-            	while(n--) 
-		{
-			char fulldirname[MAX_FN_LEN];
-
-			snprintf(fulldirname, MAX_FN_LEN, "%s/%s", dirname, namelist[n]->d_name);
-
-                	if((scratchdir = opendir(fulldirname)) != NULL)
-			{
-				closedir(scratchdir);
-
-				if(!strcmp(namelist[n]->d_name, ".") || 
-				   !strcmp(namelist[n]->d_name, ".."))
-					/* do nothing */ ;
-				else
-				{
-					subdirs[d] = malloc(strlen(namelist[n]->d_name) + 1);
-					strcpy(subdirs[d], namelist[n]->d_name);
-					d++;
-					if(d >= MAX_SUBDIRS - 1)
-					{
-						fprintf(stderr, 
-						  "Too many subdirectories, skipping the rest!\n");
-						break;
-					}
-				}
-			}
-                	free(namelist[n]);
-            	}
-            	free(namelist);
-        }
-	
-	subdirs[d] = NULL;
-
-	return subdirs;
-}
-
-static void parse_layer7_protocol(const char *s, struct xt_layer7_info *info)
-{
-	char filename[MAX_FN_LEN];
-	char * dir = NULL;
-	char ** subdirs;
-	int n = 0, done = 0;
-
-	if(strlen(l7dir) > 0) dir = l7dir;
-	else                  dir = "/etc/l7-protocols";
-
-	subdirs = readl7dir(dir);
-
-	while(subdirs[n] != NULL)
-	{
-		int c = snprintf(filename, MAX_FN_LEN, "%s/%s/%s.pat", dir, subdirs[n], s);
-
-		if(c > MAX_FN_LEN)
-			exit_error(OTHER_PROBLEM, 
-				"Filename beginning with %s is too long!\n", filename);
-
-		/* read in the pattern from the file */
-		if(parse_protocol_file(filename, s, info)){
-			done = 1;
-			break;
-		}
-		
-		n++;
-	}
-
-	if(!done)
-		exit_error(OTHER_PROBLEM, 
-			"Couldn't find a pattern definition file for %s.\n", s);
-
-	/* process \xHH escapes and tolower everything. (our regex lib has no
-	case insensitivity option.) */
-	strncpy(info->pattern, pre_process(info->pattern), MAX_PATTERN_LEN);
-}
-
-/* Function which parses command options; returns true if it ate an option */
-static int parse(int c, char **argv, int invert, unsigned int *flags,
-      const void *entry, struct xt_entry_match **match)
-{
-	struct xt_layer7_info *layer7info = 
-		(struct xt_layer7_info *)(*match)->data;
-
-	switch (c) {
-	case 'p':
-		parse_layer7_protocol(argv[optind-1], layer7info);
-		if (invert)
-			layer7info->invert = true;
-		*flags = 1;
-		break;
-
-	case 'd':
-		if(strlen(argv[optind-1]) >= MAX_FN_LEN)
-			exit_error(PARAMETER_PROBLEM, "directory name too long\n");
-
-		strncpy(l7dir, argv[optind-1], MAX_FN_LEN);
-
-		*flags = 1;
-		break;
-
-	default:
-		return 0;
-	}
-
-	return 1;
-}
-
-/* Final check; must have specified --l7proto */
-static void final_check(unsigned int flags)
-{
-	if (!flags)
-		exit_error(PARAMETER_PROBLEM,
-			   "LAYER7 match: You must specify `--l7proto'");
-}
-
-static void print_protocol(char s[], int invert, int numeric)
-{
-	fputs("l7proto ", stdout);
-	if (invert) fputc('!', stdout);
-	printf("%s ", s);
-}
-
-/* Prints out the matchinfo. */
-static void print(const void *ip,
-      const struct xt_entry_match *match,
-      int numeric)
-{
-	printf("LAYER7 ");
-	print_protocol(((struct xt_layer7_info *)match->data)->protocol,
-		  ((struct xt_layer7_info *)match->data)->invert, numeric);
-}
-/* Saves the union ipt_matchinfo in parsable form to stdout. */
-static void save(const void *ip, const struct xt_entry_match *match)
-{
-        const struct xt_layer7_info *info =
-            (const struct xt_layer7_info*) match->data;
-
-        printf("--l7proto %s%s ", (info->invert)? "! ":"", info->protocol);
-}
-
-static struct xtables_match layer7 = { 
-    .family        = AF_INET,
-    .name          = "layer7",
-    .version       = XTABLES_VERSION,
-    .size          = XT_ALIGN(sizeof(struct xt_layer7_info)),
-    .userspacesize = XT_ALIGN(sizeof(struct xt_layer7_info)),
-    .help          = &help,
-    .parse         = &parse,
-    .final_check   = &final_check,
-    .print         = &print,
-    .save          = &save,
-    .extra_opts    = opts
-};
-
-void _init(void)
-{
-	xtables_register_match(&layer7);
-}
diff --git a/net-firewall/iptables/files/libxt_layer7.man b/net-firewall/iptables/files/libxt_layer7.man
deleted file mode 100644
index 83a8c53..0000000
--- a/net-firewall/iptables/files/libxt_layer7.man
+++ /dev/null
@@ -1,14 +0,0 @@
-This module matches packets based on the application layer data of 
-their connections.  It uses regular expression matching to compare 
-the application layer data to regular expressions found it the layer7 
-configuration files.  This is an experimental module which can be found at 
-http://l7-filter.sf.net.  It takes two options.
-.TP
-.BI "--l7proto " "\fIprotocol\fP"
-Match the specified protocol.  The protocol name must match a file 
-name in /etc/l7-protocols/ or one of its first-level child directories.
-.TP
-.BI "--l7dir " "\fIdirectory\fP"
-Use \fIdirectory\fP instead of /etc/l7-protocols/.  This option must be 
-specified before --l7proto.
-
diff --git a/net-firewall/iptables/iptables-1.4.3.2-r1.ebuild b/net-firewall/iptables/iptables-1.4.3.2-r1.ebuild
deleted file mode 100644
index 6e776de..0000000
--- a/net-firewall/iptables/iptables-1.4.3.2-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.3.2.ebuild,v 1.1 2009/04/06 18:47:54 pva Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
-HOMEPAGE="http://www.iptables.org/"
-SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="+l7-filter"
-
-DEPEND="virtual/os-headers
-	l7-filter? ( net-misc/l7-filter )
-"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd "${S}"
-
-	local check base=${PORTAGE_CONFIGROOT}/etc/portage/patches
-	for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
-		EPATCH_SOURCE=${base}/${CTARGET}/${check}
-		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
-		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
-		if [[ -d ${EPATCH_SOURCE} ]] ; then
-			EPATCH_SUFFIX="patch"
-			EPATCH_FORCE="yes" \
-			EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
-			epatch
-			break
-		fi
-	done
-	useq l7-filter && ( cp ${FILESDIR}/libxt_layer7.c ${S}/extensions/libxt_layer7.c && cp ${FILESDIR}/libxt_layer7.man ${S}/extensions/libxt_layer7.man )
-}
-
-src_compile() {
-	econf \
-		--sbindir=/sbin \
-		--libexecdir=/$(get_libdir) \
-		--enable-devel \
-		--enable-libipq \
-		--enable-shared \
-		--enable-static
-	emake V=1 || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-
-	insinto /usr/include
-	doins include/iptables.h include/ip6tables.h || die
-	insinto /usr/include/iptables
-	doins include/iptables/internal.h || die
-
-	keepdir /var/lib/iptables
-	newinitd "${FILESDIR}"/${PN}-1.3.2.init iptables || die
-	newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables || die
-	keepdir /var/lib/ip6tables
-	newinitd "${FILESDIR}"/iptables-1.3.2.init ip6tables || die
-	newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables || die
-}
diff --git a/net-firewall/iptables/iptables-9999.ebuild b/net-firewall/iptables/iptables-9999.ebuild
deleted file mode 100644
index 7a17717..0000000
--- a/net-firewall/iptables/iptables-9999.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.3.2.ebuild,v 1.1 2009/04/06 18:47:54 pva Exp $
-
-inherit eutils toolchain-funcs git
-
-DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
-HOMEPAGE="http://www.iptables.org/"
-SRC_URI=""
-
-EGIT_REPO_URI="git://git.netfilter.org/iptables.git"
-EGIT_BOOTSTRAP="./autogen.sh"
-
-LICENSE="GPL-2"
-SLOT=""
-KEYWORDS=""
-IUSE=""
-
-DEPEND="virtual/os-headers"
-RDEPEND=""
-
-src_unpack() {
-#	unpack ${P}.tar.bz2
-	git_src_unpack
-	cd "${S}"
-
-	local check base=${PORTAGE_CONFIGROOT}/etc/portage/patches
-	for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
-		EPATCH_SOURCE=${base}/${CTARGET}/${check}
-		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
-		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
-		if [[ -d ${EPATCH_SOURCE} ]] ; then
-			EPATCH_SUFFIX="patch"
-			EPATCH_FORCE="yes" \
-			EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
-			epatch
-			break
-		fi
-	done
-}
-
-src_compile() {
-	econf \
-		--sbindir=/sbin \
-		--libexecdir=/$(get_libdir) \
-		--enable-devel \
-		--enable-libipq \
-		--enable-shared \
-		--enable-static
-	emake V=1 || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-
-	insinto /usr/include
-	doins include/iptables.h include/ip6tables.h || die
-	insinto /usr/include/iptables
-	doins include/iptables/internal.h || die
-
-	keepdir /var/lib/iptables
-	newinitd "${FILESDIR}"/${PN}-1.3.2.init iptables || die
-	newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables || die
-	keepdir /var/lib/ip6tables
-	newinitd "${FILESDIR}"/iptables-1.3.2.init ip6tables || die
-	newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables || die
-}
diff --git a/net-libs/libtorrent/libtorrent-9999.ebuild b/net-libs/libtorrent/libtorrent-9999.ebuild
index b504de6..02c1dc1 100644
--- a/net-libs/libtorrent/libtorrent-9999.ebuild
+++ b/net-libs/libtorrent/libtorrent-9999.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-libs/libtorrent/libtorrent-0.12.4.ebuild,v 1.6 2009/03/06 00:11:38 jer Exp $
+EAPI=5
 
-inherit base eutils toolchain-funcs flag-o-matic libtool git
+inherit base eutils toolchain-funcs flag-o-matic libtool git-2
 
 DESCRIPTION="LibTorrent is a BitTorrent library written in C++ for *nix."
 HOMEPAGE="http://libtorrent.rakshasa.no/"
diff --git a/net-misc/tor/files b/net-misc/tor/files
deleted file mode 120000
index e2456a6..0000000
--- a/net-misc/tor/files
+++ /dev/null
@@ -1 +0,0 @@
-/usr/portage/net-misc/tor/files
\ No newline at end of file
diff --git a/net-misc/tor/tor-9999.ebuild b/net-misc/tor/tor-9999.ebuild
deleted file mode 100644
index a2f56a0..0000000
--- a/net-misc/tor/tor-9999.ebuild
+++ /dev/null
@@ -1,89 +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/tor/tor-0.2.3.8_alpha.ebuild,v 1.1 2011/11/26 15:05:41 blueness Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic versionator git
-
-#MY_PV="$(replace_version_separator 4 -)"
-#MY_PF="${PN}-${MY_PV}"
-S="${WORKDIR}/${P/_/}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-EGIT_REPO_URI="git://git.torproject.org/git/tor"
-EGIT_BOOTSTRAP="./autogen.sh"
-
-#S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE="+bufferevents doc nat-pmp tor-hardening transparent-proxy threads upnp"
-
-DEPEND="dev-libs/openssl
-	>=dev-libs/libevent-2.0.14
-	nat-pmp? ( net-libs/libnatpmp )
-	upnp? ( <net-libs/miniupnpc-1.6 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_unpack() {
-	git_src_unpack
-	cd "${S}"
-	./autogen.sh
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/torrc.sample.patch
-}
-
-src_configure() {
-	# Upstream isn't sure of all the user provided CFLAGS that
-	# will break tor, but does recommend against -fstrict-aliasing.
-	# We'll filter-flags them here as we encounter them.
-	filter-flags -fstrict-aliasing
-	econf --docdir=/usr/share/doc/${PF} \
-		$(use_enable bufferevents) \
-		$(use_enable doc asciidoc) \
-		$(use_enable nat-pmp) \
-		$(use_enable tor-hardening gcc-hardening) \
-		$(use_enable tor-hardening linker-hardening) \
-		$(use_enable transparent-proxy transparent) \
-		$(use_enable threads) \
-		$(use_enable upnp)
-}
-
-src_install() {
-	newconfd "${FILESDIR}"/tor.confd tor
-	newinitd "${FILESDIR}"/tor.initd-r6 tor
-	emake DESTDIR="${D}" install
-	keepdir /var/lib/tor
-
-	dodoc README ChangeLog ReleaseNotes \
-		doc/{HACKING,TODO} \
-		doc/spec/README
-
-	fperms 750 /var/lib/tor
-	fowners tor:tor /var/lib/tor
-
-	insinto /etc/tor/
-	newins "${FILESDIR}"/torrc-r1 torrc
-}
-
-pkg_postinst() {
-	elog
-	elog "We created a configuration file for tor, /etc/tor/torrc, but you can"
-	elog "change it according to your needs.  Use the torrc.sample that is in"
-	elog "that directory as a guide.  Also, to have privoxy work with tor"
-	elog "just add the following line"
-	elog
-	elog "forward-socks4a / localhost:9050 ."
-	elog
-	elog "to /etc/privoxy/config.  Notice the . at the end!"
-	elog
-}
diff --git a/net-p2p/rtorrent/rtorrent-9999.ebuild b/net-p2p/rtorrent/rtorrent-9999.ebuild
index 36a6a99..03e737c 100644
--- a/net-p2p/rtorrent/rtorrent-9999.ebuild
+++ b/net-p2p/rtorrent/rtorrent-9999.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.8.4-r1.ebuild,v 1.7 2009/03/06 00:13:27 jer Exp $
+EAPI=5
 
-inherit base eutils toolchain-funcs flag-o-matic git
+inherit base eutils toolchain-funcs flag-o-matic git-2
 
 DESCRIPTION="BitTorrent Client using libtorrent"
 HOMEPAGE="http://libtorrent.rakshasa.no/"