uploading my overlay ), initial commit

git-svn-id: http://172.18.13.13/svn/sss_overlay@1 4d9a9b59-111c-4e0b-8f7a-7640551abb98

216 files changed, 13837 insertions, 0 deletions

diff --git a/app-admin/conky/conky-9999.ebuild b/app-admin/conky/conky-9999.ebuild
new file mode 100644
index 0000000..a3d35f3
--- /dev/null
+++ b/app-admin/conky/conky-9999.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.6.2_pre1355.ebuild,v 1.1 2009/01/01 03:46:14 omp Exp $
+
+inherit eutils git
+# used for epause
+
+DESCRIPTION="An advanced, highly configurable system monitor for X"
+HOMEPAGE="http://conky.sourceforge.net/"
+SRC_URI=""
+
+EGIT_REPO_URI="git://git.omp.am/conky.git"
+EGIT_BOOTSTRAP="./autogen.sh"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="audacious bmpx debug hddtemp ipv6 moc mpd nano-syntax nvidia rss truetype vim-syntax smapi wifi X"
+
+DEPEND_COMMON="
+	virtual/libc
+	X? (
+		x11-libs/libICE
+		x11-libs/libXext
+		x11-libs/libX11
+		x11-libs/libSM
+		x11-libs/libXrender
+		x11-libs/libXdamage
+		x11-libs/libXft
+		truetype? ( >=media-libs/freetype-2 )
+		audacious? ( >=media-sound/audacious-1.4.0 )
+		bmpx? ( media-sound/bmpx
+				>=sys-apps/dbus-0.35
+			)
+	)
+	rss? ( dev-libs/libxml2
+			net-misc/curl
+			)
+	wifi? ( net-wireless/wireless-tools )
+	nvidia? ( media-video/nvidia-settings )
+	!ipv6? ( >=dev-libs/glib-2.0 )"
+RDEPEND="${DEPEND_COMMON}
+	hddtemp? ( app-admin/hddtemp )
+	vim-syntax? ( || ( app-editors/vim
+	app-editors/gvim ) )
+	nano-syntax? ( app-editors/nano )"
+DEPEND="
+	${DEPEND_COMMON}
+	dev-util/pkgconfig
+	X? (
+		x11-libs/libXt
+		x11-proto/xextproto
+		x11-proto/xproto
+	)"
+
+pkg_setup() {
+	if use audacious; then
+		if has_version '<media-sound/audacious-1.5.0' && ! built_with_use media-sound/audacious dbus; then
+			eerror "media-sound/audacious is not built with dbus USE flag."
+			eerror "Please add 'dbus' to your USE flags, and re-emerge media-sound/audacious."
+			die "media-sound/audacious needs USE=dbus"
+		fi
+	fi
+}
+
+src_unpack() {
+		git_src_unpack
+		cd "${S}"
+}
+
+src_compile() {
+	local mymake
+	if useq ipv6 ; then
+		ewarn "You have the ipv6 USE flag enabled.  Please note that using"
+		ewarn "the ipv6 USE flag with Conky disables the port monitor."
+		epause
+	else
+		mymake="MPD_NO_IPV6=noipv6"
+	fi
+	local myconf
+	myconf="--enable-proc-uptime"
+	if useq X; then
+		myconf="${myconf} --enable-x11 --enable-double-buffer --enable-xdamage --enable-own-window"
+		myconf="${myconf} $(use_enable truetype xft)"
+	else
+		myconf="${myconf} --disable-x11 --disable-double-buffer --disable-xdamage --disable-own-window"
+		myconf="${myconf} --disable-xft"
+	fi
+	econf \
+		${myconf} \
+		$(use_enable audacious) \
+		$(use_enable bmpx) \
+		$(use_enable debug) \
+		$(use_enable hddtemp ) \
+		$(use_enable moc) \
+		$(use_enable mpd) \
+		$(use_enable nvidia) \
+		$(use_enable rss) \
+		$(use_enable smapi) \
+		$(use_enable wifi wlan) \
+		$(use_enable !ipv6 portmon) || die "econf failed"
+	emake ${mymake} || die "compile failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc ChangeLog AUTHORS README
+	dohtml doc/docs.html doc/config_settings.html doc/variables.html
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${S}"/extras/vim/ftdetect/conkyrc.vim
+
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}"/extras/vim/syntax/conkyrc.vim
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano/
+		doins "${S}"/extras/nano/conky.nanorc
+	fi
+}
+
+pkg_postinst() {
+	elog "You can find the sample configuration file at"
+	elog "/etc/conky/conky.conf.  To customize it, copy"
+	elog "/etc/conky/conky.conf to ~/.conkyrc and edit"
+	elog "it to your liking."
+	elog
+	elog "For more info on Conky's new features,"
+	elog "please look at the README and ChangeLog:"
+	elog "/usr/share/doc/${PF}/README.bz2"
+	elog "/usr/share/doc/${PF}/ChangeLog.bz2"
+	elog "There are also pretty html docs available"
+	elog "on Conky's site or in /usr/share/doc/${PF}"
+	elog
+	elog "Also see http://www.gentoo.org/doc/en/conky-howto.xml"
+	elog
+	elog "Vim syntax highlighting for conkyrc now enabled with"
+	elog "USE=vim-syntax, for Nano with USE=nano-syntax"
+	elog
+}
diff --git a/app-emulation/wine/files/wine-0.9.51-valgrind.patch b/app-emulation/wine/files/wine-0.9.51-valgrind.patch
new file mode 100644
index 0000000..acd0bb1
--- /dev/null
+++ b/app-emulation/wine/files/wine-0.9.51-valgrind.patch
@@ -0,0 +1,56 @@
+http://bugs.gentoo.org/202542
+
+fix from Rafal Muzylo building with newer versions of valgrind
+
+--- dlls/ntdll/heap.c
++++ dlls/ntdll/heap.c
+@@ -142,6 +142,8 @@
+     if (TRACE_ON(heap) || WARN_ON(heap)) memset( ptr, ARENA_FREE_FILLER, size );
+ #ifdef VALGRIND_MAKE_NOACCESS
+     VALGRIND_DISCARD( VALGRIND_MAKE_NOACCESS( ptr, size ));
++#elif defined(VALGRIND_MAKE_MEM_NOACCESS)
++    VALGRIND_DISCARD( VALGRIND_MAKE_MEM_NOACCESS( ptr, size ));
+ #endif
+ }
+ 
+@@ -150,6 +152,8 @@
+ {
+ #ifdef VALGRIND_MAKE_READABLE
+     VALGRIND_DISCARD( VALGRIND_MAKE_READABLE( ptr, size ));
++#elif defined(VALGRIND_MAKE_MEM_DEFINED)
++    VALGRIND_DISCARD( VALGRIND_MAKE_MEM_DEFINED( ptr, size ));
+ #endif
+ }
+ 
+@@ -158,6 +162,8 @@
+ {
+ #ifdef VALGRIND_MAKE_WRITABLE
+     VALGRIND_DISCARD( VALGRIND_MAKE_WRITABLE( ptr, size ));
++#elif defined(VALGRIND_MAKE_MEM_UNDEFINED)
++    VALGRIND_DISCARD( VALGRIND_MAKE_MEM_UNDEFINED( ptr, size ));
+ #endif
+     if (TRACE_ON(heap) || WARN_ON(heap))
+     {
+@@ -165,6 +171,8 @@
+ #ifdef VALGRIND_MAKE_WRITABLE
+         /* make it uninitialized to valgrind again */
+         VALGRIND_DISCARD( VALGRIND_MAKE_WRITABLE( ptr, size ));
++#elif defined(VALGRIND_MAKE_MEM_UNDEFINED)
++	VALGRIND_DISCARD( VALGRIND_MAKE_MEM_UNDEFINED( ptr, size ));
+ #endif
+     }
+ }
+--- dlls/ntdll/signal_i386.c
++++ dlls/ntdll/signal_i386.c
+@@ -936,8 +936,10 @@
+     }
+ 
+     stack--;  /* push the stack_layout structure */
+-#ifdef HAVE_VALGRIND_MEMCHECK_H
++#ifdef VALGRIND_MAKE_WRITABLE
+     VALGRIND_MAKE_WRITABLE(stack, sizeof(*stack));
++#elif defined(VALGRIND_MAKE_MEM_UNDEFINED)
++     VALGRIND_MAKE_MEM_UNDEFINED(stack, sizeof(*stack));
+ #endif
+     stack->ret_addr     = (void *)0xdeadbabe;  /* raise_func must not return */
+     stack->rec_ptr      = &stack->rec;
diff --git a/app-emulation/wine/files/wine-1.0_rc3-openssl.patch b/app-emulation/wine/files/wine-1.0_rc3-openssl.patch
new file mode 100644
index 0000000..b0ef483
--- /dev/null
+++ b/app-emulation/wine/files/wine-1.0_rc3-openssl.patch
@@ -0,0 +1,81 @@
+http://bugs.winehq.org/show_bug.cgi?id=13561
+http://bugs.gentoo.org/224049
+
+commit 7c616799894faa48ee3277bc276a39bed55780e0
+Author: Alexandre Julliard <julliard@winehq.org>
+Date:   Mon Jun 2 12:14:37 2008 +0200
+
+    wininet: Include openssl/ssl.h before Windows headers.
+
+diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
+index 2645686..43b8d8e 100644
+--- a/dlls/wininet/internet.h
++++ b/dlls/wininet/internet.h
+@@ -38,18 +38,6 @@
+ # include <sys/types.h>
+ # include <netinet/in.h>
+ #endif
+-#ifdef HAVE_OPENSSL_SSL_H
+-#define DSA __ssl_DSA  /* avoid conflict with commctrl.h */
+-#undef FAR
+-/* avoid conflict with wincrypt.h */
+-#undef PKCS7_SIGNER_INFO
+-#undef X509_NAME
+-#undef X509_CERT_PAIR
+-# include <openssl/ssl.h>
+-#undef FAR
+-#define FAR do_not_use_this_in_wine
+-#undef DSA
+-#endif
+ #ifdef HAVE_SYS_SOCKET_H
+ # include <sys/socket.h>
+ #endif
+@@ -69,12 +57,10 @@ typedef struct
+ {
+     BOOL useSSL;
+     int socketFD;
+-#ifdef HAVE_OPENSSL_SSL_H
+-    SSL *ssl_s;
++    void *ssl_s;
+     char *peek_msg;
+     char *peek_msg_mem;
+     size_t peek_len;
+-#endif
+ } WININET_NETCONNECTION;
+ 
+ static inline LPWSTR WININET_strdupW( LPCWSTR str )
+diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c
+index 9cd7917..f55fbf2 100644
+--- a/dlls/wininet/netconnection.c
++++ b/dlls/wininet/netconnection.c
+@@ -23,6 +23,7 @@
+ #include "config.h"
+ #include "wine/port.h"
+ 
++#include <sys/types.h>
+ #ifdef HAVE_POLL_H
+ #include <poll.h>
+ #endif
+@@ -42,6 +43,22 @@
+ #ifdef HAVE_SYS_IOCTL_H
+ # include <sys/ioctl.h>
+ #endif
++#include <time.h>
++#ifdef HAVE_NETDB_H
++# include <netdb.h>
++#endif
++#ifdef HAVE_NETINET_IN_H
++# include <netinet/in.h>
++#endif
++#ifdef HAVE_OPENSSL_SSL_H
++# include <openssl/ssl.h>
++#undef FAR
++#undef DSA
++#endif
++#ifdef HAVE_SYS_SOCKET_H
++# include <sys/socket.h>
++#endif
++
+ #include <stdarg.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/app-emulation/wine/files/wine-1.1.4-install-fix.patch b/app-emulation/wine/files/wine-1.1.4-install-fix.patch
new file mode 100644
index 0000000..7ff5771
--- /dev/null
+++ b/app-emulation/wine/files/wine-1.1.4-install-fix.patch
@@ -0,0 +1,22 @@
+From: Alexandre Julliard <julliard@winehq.org>
+Date: Mon, 8 Sep 2008 10:37:56 +0000 (+0200)
+Subject: makefile: Fix dependency for programs install.
+X-Git-Url: http://source.winehq.org/git/wine.git/?a=commitdiff_plain;h=78c79ba349deea39
+
+makefile: Fix dependency for programs install.
+---
+
+diff --git a/Makefile.in b/Makefile.in
+index 0b2c6c0..1dd8ef1 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -96,7 +96,8 @@ include/__install__ include/__install-dev__: include libs tools
+ libs/__install__ libs/__install-lib__ libs/__install-dev__: libs
+ loader/__install__ loader/__install-lib__: libs tools
+ server/__install__ server/__install-lib__: libs tools
+-programs/__install__ programs/__install-lib__: libs tools include dlls/__install-lib__
++programs/__install__: libs tools include dlls/__install__
++programs/__install-lib__: libs tools include dlls/__install-lib__
+ tools/__install__ tools/__install-lib__ tools/__install-dev__: tools
+ 
+ RECURSE_TARGETS = \
diff --git a/app-emulation/wine/files/wine-gentoo-no-ssp.patch b/app-emulation/wine/files/wine-gentoo-no-ssp.patch
new file mode 100644
index 0000000..ee33c4b
--- /dev/null
+++ b/app-emulation/wine/files/wine-gentoo-no-ssp.patch
@@ -0,0 +1,16 @@
+support older ssp (gcc-3.4.x).  this ssp was never in mainline gcc, thus
+upstream wine wont accept it.  can drop once hardened gets a stable gcc-4.x.
+
+http://bugs.gentoo.org/66002
+
+--- loader/preloader.c
++++ loader/preloader.c
+@@ -155,6 +155,8 @@ struct wld_link_map {
+ 
+ /* similar to the above but for -fstack-protector */
+ void *__stack_chk_guard = 0;
++void *__guard = 0;
++void __stack_smash_handler(void) { return; }
+ void __stack_chk_fail(void) { return; }
+ 
+  * The _start function is the entry and exit point of this program
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
new file mode 100644
index 0000000..e1aeff3
--- /dev/null
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.34 2009/03/01 09:05:51 vapier Exp $
+
+EAPI="2"
+
+inherit multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
+	inherit git
+	SRC_URI=""
+	KEYWORDS=""
+else
+	MY_P="${PN}-${PV/_/-}"
+	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	S=${WORKDIR}/${MY_P}
+fi
+
+GV="0.9.1"
+DESCRIPTION="free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	gecko? ( mirror://sourceforge/wine/wine_gecko-${GV}.cab )"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="alsa cups dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 +X xcomposite xinerama xml"
+RESTRICT="test" #72375
+
+RDEPEND=">=media-libs/freetype-2.0.0
+	media-fonts/corefonts
+	ncurses? ( >=sys-libs/ncurses-5.2 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	dbus? ( sys-apps/dbus )
+	gnutls? ( net-libs/gnutls )
+	hal? ( sys-apps/hal )
+	X? (
+		x11-libs/libXcursor
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
+	)
+	alsa? ( media-libs/alsa-lib[midi] )
+	esd? ( media-sound/esound )
+	nas? ( media-libs/nas )
+	cups? ( net-print/cups )
+	opengl? ( virtual/opengl )
+	jpeg? ( media-libs/jpeg )
+	ldap? ( net-nds/openldap )
+	lcms? ( media-libs/lcms )
+	samba? ( >=net-fs/samba-3.0.25 )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
+	scanner? ( media-gfx/sane-backends )
+	ssl? ( dev-libs/openssl )
+	png? ( media-libs/libpng )
+	amd64? (
+		X? (
+			>=app-emulation/emul-linux-x86-xlibs-2.1
+			>=app-emulation/emul-linux-x86-soundlibs-2.1
+		)
+		app-emulation/emul-linux-x86-baselibs
+		>=sys-kernel/linux-headers-2.6
+	)"
+DEPEND="${RDEPEND}
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+	)
+	sys-devel/bison
+	sys-devel/flex"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git_src_unpack
+	else
+		unpack ${MY_P}.tar.bz2
+	fi
+}
+
+src_prepare() {
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
+}
+
+src_configure() {
+	export LDCONFIG=/bin/true
+
+#	use amd64 && ! use win64 && multilib_toolchain_setup x86
+
+	# XXX: should check out these flags too:
+	#	audioio capi fontconfig freetype gphoto
+	econf \
+		--sysconfdir=/etc/wine \
+		$(use_with alsa) \
+		$(use_with cups) \
+		$(use_with esd) \
+		$(use_with gnutls) \
+		$(! use dbus && echo --without-hal || use_with hal) \
+		$(use_with jack) \
+		$(use_with jpeg) \
+		$(use_with lcms cms) \
+		$(use_with ldap) \
+		$(use_with nas) \
+		$(use_with ncurses curses) \
+		$(use_with opengl) \
+		$(use_with oss) \
+		$(use_with png) \
+		$(use_with scanner sane) \
+		$(use_with ssl openssl) \
+		$(use_enable win64) \
+		$(use_with X x) \
+		$(use_with xcomposite) \
+		$(use_with xinerama) \
+		$(use_with xml) \
+		$(use_with xml xslt) \
+		|| die "configure failed"
+
+	emake -j1 depend || die "depend"
+}
+
+src_compile() {
+	emake all || die "all"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ANNOUNCE AUTHORS README
+	if use gecko ; then
+		insinto /usr/share/wine/gecko
+		doins "${DISTDIR}"/wine_gecko-${GV}.cab || die
+	fi
+}
diff --git a/app-pda/gtkpod/gtkpod-9999.ebuild b/app-pda/gtkpod/gtkpod-9999.ebuild
new file mode 100644
index 0000000..6271210
--- /dev/null
+++ b/app-pda/gtkpod/gtkpod-9999.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/gtkpod-0.99.12.ebuild,v 1.4 2008/08/17 16:22:27 maekke Exp $
+
+inherit eutils subversion
+
+DESCRIPTION="GUI for iPod using GTK2"
+HOMEPAGE="http://gtkpod.sourceforge.net/"
+SRC_URI=""
+
+ESVN_REPO_URI="https://gtkpod.svn.sourceforge.net/svnroot/gtkpod/gtkpod/trunk/"
+ESVN_STORE_DIR="${DISTDIR}/svn-src"
+ESVN_PROJECT="${PN/-svn}"
+ESVN_BOOTSTRAP="./autogen.sh"
+
+S="${WORKDIR}/${P/_/}"
+
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+IUSE="aac flac gnome hal ogg"
+
+DEPEND=">=x11-libs/gtk+-2.6.0
+	>=media-libs/libid3tag-0.15
+	>=gnome-base/libglade-2.4
+	>=gnome-base/libgnomecanvas-2.14
+	>=media-libs/libgpod-0.6.0
+	>=net-misc/curl-7.10
+	gnome? ( >=gnome-base/gnome-vfs-2.6 )
+	hal? ( =sys-apps/hal-0.5* )
+	aac? ( media-libs/libmp4v2 )
+	ogg? ( media-libs/libvorbis )
+	flac? ( media-libs/flac )"
+
+src_unpack() {
+	subversion_src_unpack
+	cd "${S}"
+	# Disable aac forcefully if not enabled
+	use aac || sed -i -e s/MP4FileInfo/MP4FileInfoDisabled/g "${S}"/configure
+}
+
+src_compile() {
+	econf \
+		$(use_with hal) \
+		$(use_with aac mp4v2) \
+		$(use_with ogg) \
+		$(use_with flac) \
+		$(use_with gnome gnome-vfs ) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die
+	dodoc README TROUBLESHOOTING
+}
diff --git a/cross-i686-pc-linux-gnu/binutils b/cross-i686-pc-linux-gnu/binutils
new file mode 120000
index 0000000..0f98435
--- /dev/null
+++ b/cross-i686-pc-linux-gnu/binutils
@@ -0,0 +1 @@
+/usr/portage/sys-devel/binutils
\ No newline at end of file
diff --git a/cross-i686-pc-linux-gnu/gcc b/cross-i686-pc-linux-gnu/gcc
new file mode 120000
index 0000000..8e0883f
--- /dev/null
+++ b/cross-i686-pc-linux-gnu/gcc
@@ -0,0 +1 @@
+/usr/portage/sys-devel/gcc
\ No newline at end of file
diff --git a/cross-i686-pc-linux-gnu/gdb b/cross-i686-pc-linux-gnu/gdb
new file mode 120000
index 0000000..0ab6bdc
--- /dev/null
+++ b/cross-i686-pc-linux-gnu/gdb
@@ -0,0 +1 @@
+/usr/portage/sys-devel/gdb
\ No newline at end of file
diff --git a/cross-i686-pc-linux-gnu/glibc b/cross-i686-pc-linux-gnu/glibc
new file mode 120000
index 0000000..a5553b0
--- /dev/null
+++ b/cross-i686-pc-linux-gnu/glibc
@@ -0,0 +1 @@
+/usr/portage/sys-libs/glibc
\ No newline at end of file
diff --git a/cross-i686-pc-linux-gnu/insight b/cross-i686-pc-linux-gnu/insight
new file mode 120000
index 0000000..f7036ec
--- /dev/null
+++ b/cross-i686-pc-linux-gnu/insight
@@ -0,0 +1 @@
+/usr/portage/dev-util/insight
\ No newline at end of file
diff --git a/cross-i686-pc-linux-gnu/linux-headers b/cross-i686-pc-linux-gnu/linux-headers
new file mode 120000
index 0000000..6523839
--- /dev/null
+++ b/cross-i686-pc-linux-gnu/linux-headers
@@ -0,0 +1 @@
+/usr/portage/sys-kernel/linux-headers
\ No newline at end of file
diff --git a/cross-i686-pc-mingw32/binutils b/cross-i686-pc-mingw32/binutils
new file mode 120000
index 0000000..0f98435
--- /dev/null
+++ b/cross-i686-pc-mingw32/binutils
@@ -0,0 +1 @@
+/usr/portage/sys-devel/binutils
\ No newline at end of file
diff --git a/cross-i686-pc-mingw32/gcc b/cross-i686-pc-mingw32/gcc
new file mode 120000
index 0000000..8e0883f
--- /dev/null
+++ b/cross-i686-pc-mingw32/gcc
@@ -0,0 +1 @@
+/usr/portage/sys-devel/gcc
\ No newline at end of file
diff --git a/cross-i686-pc-mingw32/gdb b/cross-i686-pc-mingw32/gdb
new file mode 120000
index 0000000..0ab6bdc
--- /dev/null
+++ b/cross-i686-pc-mingw32/gdb
@@ -0,0 +1 @@
+/usr/portage/sys-devel/gdb
\ No newline at end of file
diff --git a/cross-i686-pc-mingw32/insight b/cross-i686-pc-mingw32/insight
new file mode 120000
index 0000000..f7036ec
--- /dev/null
+++ b/cross-i686-pc-mingw32/insight
@@ -0,0 +1 @@
+/usr/portage/dev-util/insight
\ No newline at end of file
diff --git a/cross-i686-pc-mingw32/mingw-runtime b/cross-i686-pc-mingw32/mingw-runtime
new file mode 120000
index 0000000..68039f2
--- /dev/null
+++ b/cross-i686-pc-mingw32/mingw-runtime
@@ -0,0 +1 @@
+/usr/portage/dev-util/mingw-runtime
\ No newline at end of file
diff --git a/cross-i686-pc-mingw32/w32api b/cross-i686-pc-mingw32/w32api
new file mode 120000
index 0000000..a8cc256
--- /dev/null
+++ b/cross-i686-pc-mingw32/w32api
@@ -0,0 +1 @@
+/usr/portage/dev-util/w32api
\ No newline at end of file
diff --git a/dev-cpp/commoncpp2/commoncpp2-1.6.2.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.6.2.ebuild
new file mode 100644
index 0000000..b54d8c5
--- /dev/null
+++ b/dev-cpp/commoncpp2/commoncpp2-1.6.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/commoncpp2-1.6.2.ebuild,v 1.1 2008/05/07 05:32:39 dev-zero Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="GNU Common C++ is a C++ framework offering portable support for threading, sockets, file access, daemons, persistence, serial I/O, XML parsing, and system services"
+SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
+HOMEPAGE="http://www.gnu.org/software/commoncpp/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug doc examples ipv6 gnutls"
+
+RDEPEND="gnutls? ( dev-libs/libgcrypt
+		net-libs/gnutls )
+	!gnutls? ( dev-libs/openssl )
+	sys-libs/zlib"
+DEPEND="doc? ( >=app-doc/doxygen-1.3.6 )
+	${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/1.6.1-gcc42_atomicity.patch" \
+		"${FILESDIR}/${PV}-autoconf.patch" \
+		"${FILESDIR}/${PV}-configure_detect_netfilter.patch"
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile() {
+	use doc || \
+		sed -i "s/^DOXYGEN=.*/DOXYGEN=no/" configure || die "sed failed"
+
+	local myconf
+	use gnutls || myconf="--with-openssl"
+
+	econf \
+		$(use_enable debug) \
+		$(use_with ipv6 ) \
+		${myconf} || die "econf failed"
+	emake -j1 || die "emake failed"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS NEWS ChangeLog README THANKS TODO COPYING.addendum
+
+	# Only install html docs
+	# man and latex available, but seems a little wasteful
+	use doc && dohtml doc/html/*
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+		cd demo
+		doins *.cpp *.h *.xml README
+	fi
+}
+
+pkg_postinst() {
+	ewarn "There's a change in the ABI between version 1.5.x and 1.6.x, please"
+	ewarn "run the following command to find broken packages and rebuild them:"
+	ewarn "    revdep-rebuild --library=libccext2-1.5.so"
+}
+
+# Some of the tests hang forever
+#src_test() {
+#	cd "${S}/tests"
+#	emake || die "emake tests failed"
+#	./test.sh || die "tests failed"
+#}
diff --git a/dev-cpp/commoncpp2/files/1.6.1-gcc42_atomicity.patch b/dev-cpp/commoncpp2/files/1.6.1-gcc42_atomicity.patch
new file mode 120000
index 0000000..32f9e81
--- /dev/null
+++ b/dev-cpp/commoncpp2/files/1.6.1-gcc42_atomicity.patch
@@ -0,0 +1 @@
+/var/paludis/repositories/gentoo/dev-cpp/commoncpp2/files/1.6.1-gcc42_atomicity.patch
\ No newline at end of file
diff --git a/dev-cpp/commoncpp2/files/1.6.2-autoconf.patch b/dev-cpp/commoncpp2/files/1.6.2-autoconf.patch
new file mode 120000
index 0000000..8ddb051
--- /dev/null
+++ b/dev-cpp/commoncpp2/files/1.6.2-autoconf.patch
@@ -0,0 +1 @@
+/var/paludis/repositories/gentoo/dev-cpp/commoncpp2/files/1.6.2-autoconf.patch
\ No newline at end of file
diff --git a/dev-cpp/commoncpp2/files/1.6.2-configure_detect_netfilter.patch b/dev-cpp/commoncpp2/files/1.6.2-configure_detect_netfilter.patch
new file mode 100644
index 0000000..de532b5
--- /dev/null
+++ b/dev-cpp/commoncpp2/files/1.6.2-configure_detect_netfilter.patch
@@ -0,0 +1,12 @@
+--- m4/ost_socket.m4-orig	2008-11-16 15:24:05.000000000 +0100
++++ m4/ost_socket.m4	2008-11-16 15:24:10.000000000 +0100
+@@ -95,6 +95,9 @@
+ 				AC_CHECK_HEADERS([linux/netfilter_ipv4.h linux/netfilter_ipv6.h],,,
+ 					[#ifdef HAVE_LIMITS_H
+ 					#include <limits.h>
++					#endif
++					#ifdef HAVE_NETINET_IN_H
++					#include <netinet/in.h>
+ 					#endif])
+ 				if test "$ac_cv_header_linux_netfilter_ipv4_h" = "yes" && 
+ 				   [ test "$ac_cv_header_linux_netfilter_ipv6_h" = "yes" &&
diff --git a/dev-libs/glib/files b/dev-libs/glib/files
new file mode 120000
index 0000000..fbba1c6
--- /dev/null
+++ b/dev-libs/glib/files
@@ -0,0 +1 @@
+/var/paludis/repositories/gentoo/dev-libs/glib/files
\ No newline at end of file
diff --git a/dev-libs/glib/glib-2.9999.ebuild b/dev-libs/glib/glib-2.9999.ebuild
new file mode 100644
index 0000000..9139982
--- /dev/null
+++ b/dev-libs/glib/glib-2.9999.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.18.2.ebuild,v 1.1 2008/10/19 02:16:37 leio Exp $
+
+inherit libtool eutils flag-o-matic subversion
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="http://www.gtk.org/"
+
+ESVN_REPO_URI="http://svn.gnome.org/svn/glib/trunk"
+ESVN_STORE_DIR="${DISTDIR}/svn-src"
+ESVN_PROJECT="${PN/-svn}"
+ESVN_BOOTSTRAP="./autogen.sh"
+
+S="${WORKDIR}/${P/_/}"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS=""
+IUSE="debug doc fam hardened selinux xattr"
+
+RDEPEND="virtual/libc
+		 virtual/libiconv
+		 xattr? ( sys-apps/attr )
+		 fam? ( virtual/fam )"
+DEPEND="${RDEPEND}
+		>=dev-util/pkgconfig-0.16
+		>=sys-devel/gettext-0.11
+		dev-util/gtk-doc
+"
+
+src_unpack() {
+	subversion_src_unpack
+	cd "${S}"
+
+	if use ppc64 && use hardened ; then
+		replace-flags -O[2-3] -O1
+		epatch "${FILESDIR}/glib-2.6.3-testglib-ssp.patch"
+	fi
+
+	if use ia64 ; then
+		# Only apply for < 4.1
+		local major=$(gcc-major-version)
+		local minor=$(gcc-minor-version)
+		if (( major < 4 || ( major == 4 && minor == 0 ) )); then
+			epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
+		fi
+	fi
+
+	# Don't fail gio tests when ran without userpriv, upstream bug 552912
+	# This is only a temporary workaround, remove as soon as possible
+	epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch"
+
+	# Fix gmodule issues on fbsd; bug #184301
+	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
+
+	[[ ${CHOST} == *-freebsd* ]] && elibtoolize
+}
+
+src_compile() {
+	local myconf
+
+	epunt_cxx
+
+	# Building with --disable-debug highly unrecommended.  It will build glib in
+	# an unusable form as it disables some commonly used API.  Please do not
+	# convert this to the use_enable form, as it results in a broken build.
+	# -- compnerd (3/27/06)
+	use debug && myconf="--enable-debug"
+
+	# always build static libs, see #153807
+	econf ${myconf}                 \
+		  $(use_enable xattr)       \
+		  $(use_enable doc man)     \
+		  $(use_enable doc gtk-doc) \
+		  $(use_enable fam)         \
+		  $(use_enable selinux)     \
+		  --enable-static           \
+		  --with-threads=posix || die "configure failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Installation failed"
+
+	# Do not install charset.alias even if generated, leave it to libiconv
+	rm -f "${D}/usr/lib/charset.alias"
+
+	dodoc AUTHORS ChangeLog* NEWS* README
+}
diff --git a/dev-libs/ptlib/files/ptlib-2.4.1-instplugins.diff b/dev-libs/ptlib/files/ptlib-2.4.1-instplugins.diff
new file mode 100644
index 0000000..ba1cf35
--- /dev/null
+++ b/dev-libs/ptlib/files/ptlib-2.4.1-instplugins.diff
@@ -0,0 +1,27 @@
+--- Makefile.in.orig	2008-09-22 19:29:30.000000000 -0400
++++ Makefile.in	2008-09-22 19:28:56.000000000 -0400
+@@ -100,14 +100,16 @@
+ 		ln -sf $(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@ $(PTLIB_FILE) \
+ 	)
+ ifeq (1, $(HAS_PLUGINS))
+-	cd $(PT_LIBDIR)/device/ ; \
+-	( for dir in ./* ;\
+-		do mkdir -p $(DESTDIR)$(LIBDIR)/$(DEV_PLUGIN_DIR)/$$dir ; \
+-		chmod 755 $(DESTDIR)$(LIBDIR)/$(DEV_PLUGIN_DIR)/$$dir ; \
+-		(for fn in ./$$dir/*.so ; \
+-			do $(INSTALL) -m 444 $$fn $(DESTDIR)$(LIBDIR)/$(DEV_PLUGIN_DIR)/$$dir; \
+-		done ); \
+-	done )
++	if [ -d $(PT_LIBDIR)/device ] ; then \
++		cd $(PT_LIBDIR)/device/ ; \
++		( for dir in ./* ;\
++			do mkdir -p $(DESTDIR)$(LIBDIR)/$(DEV_PLUGIN_DIR)/$$dir ; \
++			chmod 755 $(DESTDIR)$(LIBDIR)/$(DEV_PLUGIN_DIR)/$$dir ; \
++			(for fn in ./$$dir/*.so ; \
++				do $(INSTALL) -m 444 $$fn $(DESTDIR)$(LIBDIR)/$(DEV_PLUGIN_DIR)/$$dir; \
++			done ); \
++		done ) \
++	fi
+ endif
+ 	$(INSTALL) -m 444 include/ptlib.h                $(DESTDIR)$(PREFIX)/include
+ 	$(INSTALL) -m 444 include/ptbuildopts.h          $(DESTDIR)$(PREFIX)/include
diff --git a/dev-libs/ptlib/files/ptlib-asm.patch b/dev-libs/ptlib/files/ptlib-asm.patch
new file mode 100644
index 0000000..e5d6e9c
--- /dev/null
+++ b/dev-libs/ptlib/files/ptlib-asm.patch
@@ -0,0 +1,15 @@
+--- src/ptlib/common/jidctflt.cxx.orig	2008-09-24 09:13:06.000000000 -0400
++++ src/ptlib/common/jidctflt.cxx	2008-09-24 09:11:49.000000000 -0400
+@@ -110,10 +110,10 @@
+       "\tsar %2,%1\n"
+       "\tsub $-128,%1\n"
+       "\tcmovl %5,%1\n"	/* Use the sub to compare to 0 */
+-      "\tcmpl %4,%1\n" 
++      "\tcmp %4,%1\n" 
+       "\tcmovg %4,%1\n"
+       : "=r"(x) 
+-      : "0"(x), "Ir"(shift), "ir"(1UL<<(shift-1)), "r" (0xff), "r" (0)
++      : "0"((unsigned long)x), "c"((char)shift), "ir"(1UL<<(shift-1)), "r" (0xffUL), "r" (0UL)
+       );
+   return x;
+ }
diff --git a/dev-libs/ptlib/ptlib-2.4.1.ebuild b/dev-libs/ptlib/ptlib-2.4.1.ebuild
new file mode 100644
index 0000000..9e11f51
--- /dev/null
+++ b/dev-libs/ptlib/ptlib-2.4.1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="1"
+
+inherit eutils
+
+DESCRIPTION="Network focused portable C++ class library providing high level functions"
+HOMEPAGE="http://www.ekiga.org/"
+SRC_URI="http://www.ekiga.org/admin/downloads/latest/sources/sources/${P}.tar.gz"
+
+LICENSE="MPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa bsdvideo debug doc esd ieee1394 ipv6 ldap minimal noaudio novideo oss
+sasl sdl ssl sunaudio v4l v4l2 xml"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	esd? ( media-sound/esound )
+	ieee1394? ( media-libs/libdv
+		sys-libs/libavc1394
+		media-libs/libdc1394:1 )
+	ldap? ( net-nds/openldap )
+	sasl? ( dev-libs/cyrus-sasl:2 )
+	sdl? ( media-libs/libsdl )
+	ssl? ( dev-libs/openssl )
+	xml? ( dev-libs/expat )"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	v4l? ( sys-kernel/linux-headers )
+	v4l2? ( sys-kernel/linux-headers )
+	!dev-libs/pwlib"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# filter out -O3, -Os and -mcpu embedded compiler flags
+	sed -i \
+		-e "s:-mcpu=\$(CPUTYPE)::" \
+		-e "s:-O3 -DNDEBUG:-DNDEBUG:" \
+		-e "s:-Os::" \
+		make/unix.mak \
+		|| die "Patching make/unix.mak failed"
+
+	# don't break make install if there are no plugins to install
+	epatch "${FILESDIR}"/${P}-instplugins.diff
+
+	# this patch fixes bugs: #145424 and #140358
+	epatch "${FILESDIR}"/${P}-asm.patch
+}
+
+src_compile() {
+	local myconf=""
+	local makeopts=""
+
+	use noaudio && myconf="${myconf} --disable-audio"
+	use novideo && myconf="${myconf} --disable-video"
+
+	econf \
+		${myconf} \
+		$(use_enable alsa) \
+		$(use_enable bsdvideo) \
+		$(use_enable debug exceptions) \
+		$(use_enable debug memcheck) \
+		$(use_enable esd) \
+		$(use_enable ieee1394 avc) \
+		$(use_enable ieee1394 dc) \
+		$(use_enable ipv6) \
+		$(use_enable ldap openldap) \
+		$(use_enable minimal minsize) \
+		$(use_enable oss) \
+		$(use_enable sasl) \
+		$(use_enable sdl) \
+		$(use_enable ssl openssl) \
+		$(use_enable sunaudio) \
+		$(use_enable v4l) \
+		$(use_enable v4l2) \
+		$(use_enable xml expat) \
+		--enable-plugins \
+		|| die "econf failed"
+
+	if use debug; then
+		makeopts="${makeopts} DEBUG=1 debug"
+	fi
+
+	emake ${makeopts} || die "emake failed"
+}
+
+src_install() {
+	local makeopts
+
+	makeopts="PREFIX=/usr DESTDIR=\"${D}\""
+
+	if use debug; then
+		makeopts="${makeopts} DEBUG=1"
+	fi
+
+	emake ${makeopts} install || die "emake install failed"
+
+	if use doc; then
+		dohtml -r html/* || die "documentation installation failed"
+	fi
+
+	dodoc ReadMe.txt ReadMe_QOS.txt History.txt || die "documentation
+ installation failed"
+}
diff --git a/dev-libs/ptlib/ptlib-2.4.2.ebuild b/dev-libs/ptlib/ptlib-2.4.2.ebuild
new file mode 100644
index 0000000..b3b9f38
--- /dev/null
+++ b/dev-libs/ptlib/ptlib-2.4.2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="1"
+
+inherit eutils
+
+DESCRIPTION="Network focused portable C++ class library providing high level functions"
+HOMEPAGE="http://www.opalvoip.org/"
+SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2"
+
+LICENSE="MPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa bsdvideo debug doc esd ieee1394 ipv6 ldap minimal noaudio novideo oss
+sasl sdl ssl sunaudio v4l v4l2 xml"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	esd? ( media-sound/esound )
+	ieee1394? ( media-libs/libdv
+		sys-libs/libavc1394
+		media-libs/libdc1394:1 )
+	ldap? ( net-nds/openldap )
+	sasl? ( dev-libs/cyrus-sasl:2 )
+	sdl? ( media-libs/libsdl )
+	ssl? ( dev-libs/openssl )
+	xml? ( dev-libs/expat )"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	v4l? ( sys-kernel/linux-headers )
+	v4l2? ( sys-kernel/linux-headers )
+	!dev-libs/pwlib"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# this patch fixes bugs: #145424 and #140358
+	epatch "${FILESDIR}"/${PN}-asm.patch
+}
+
+src_compile() {
+	local myconf=""
+	local makeopts=""
+
+	use noaudio && myconf="${myconf} --disable-audio"
+	use novideo && myconf="${myconf} --disable-video"
+
+	econf \
+		${myconf} \
+		$(use_enable alsa) \
+		$(use_enable bsdvideo) \
+		$(use_enable debug exceptions) \
+		$(use_enable debug memcheck) \
+		$(use_enable esd) \
+		$(use_enable ieee1394 avc) \
+		$(use_enable ieee1394 dc) \
+		$(use_enable ipv6) \
+		$(use_enable ldap openldap) \
+		$(use_enable minimal minsize) \
+		$(use_enable oss) \
+		$(use_enable sasl) \
+		$(use_enable sdl) \
+		$(use_enable ssl openssl) \
+		$(use_enable sunaudio) \
+		$(use_enable v4l) \
+		$(use_enable v4l2) \
+		$(use_enable xml expat) \
+		--enable-plugins \
+		|| die "econf failed"
+
+	if use debug; then
+		makeopts="${makeopts} DEBUG=1 debug"
+	fi
+
+	emake ${makeopts} || die "emake failed"
+}
+
+src_install() {
+	local makeopts
+
+	makeopts="PREFIX=/usr DESTDIR=\"${D}\""
+
+	if use debug; then
+		makeopts="${makeopts} DEBUG=1"
+	fi
+
+	emake ${makeopts} install || die "emake install failed"
+
+	if use doc; then
+		dohtml -r html/* || die "documentation installation failed"
+	fi
+
+	dodoc ReadMe.txt ReadMe_QOS.txt History.txt || die "documentation
+ installation failed"
+}
diff --git a/dev-libs/ptlib/ptlib-2.6.0.ebuild b/dev-libs/ptlib/ptlib-2.6.0.ebuild
new file mode 100644
index 0000000..b3b9f38
--- /dev/null
+++ b/dev-libs/ptlib/ptlib-2.6.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="1"
+
+inherit eutils
+
+DESCRIPTION="Network focused portable C++ class library providing high level functions"
+HOMEPAGE="http://www.opalvoip.org/"
+SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2"
+
+LICENSE="MPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa bsdvideo debug doc esd ieee1394 ipv6 ldap minimal noaudio novideo oss
+sasl sdl ssl sunaudio v4l v4l2 xml"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	esd? ( media-sound/esound )
+	ieee1394? ( media-libs/libdv
+		sys-libs/libavc1394
+		media-libs/libdc1394:1 )
+	ldap? ( net-nds/openldap )
+	sasl? ( dev-libs/cyrus-sasl:2 )
+	sdl? ( media-libs/libsdl )
+	ssl? ( dev-libs/openssl )
+	xml? ( dev-libs/expat )"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	v4l? ( sys-kernel/linux-headers )
+	v4l2? ( sys-kernel/linux-headers )
+	!dev-libs/pwlib"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# this patch fixes bugs: #145424 and #140358
+	epatch "${FILESDIR}"/${PN}-asm.patch
+}
+
+src_compile() {
+	local myconf=""
+	local makeopts=""
+
+	use noaudio && myconf="${myconf} --disable-audio"
+	use novideo && myconf="${myconf} --disable-video"
+
+	econf \
+		${myconf} \
+		$(use_enable alsa) \
+		$(use_enable bsdvideo) \
+		$(use_enable debug exceptions) \
+		$(use_enable debug memcheck) \
+		$(use_enable esd) \
+		$(use_enable ieee1394 avc) \
+		$(use_enable ieee1394 dc) \
+		$(use_enable ipv6) \
+		$(use_enable ldap openldap) \
+		$(use_enable minimal minsize) \
+		$(use_enable oss) \
+		$(use_enable sasl) \
+		$(use_enable sdl) \
+		$(use_enable ssl openssl) \
+		$(use_enable sunaudio) \
+		$(use_enable v4l) \
+		$(use_enable v4l2) \
+		$(use_enable xml expat) \
+		--enable-plugins \
+		|| die "econf failed"
+
+	if use debug; then
+		makeopts="${makeopts} DEBUG=1 debug"
+	fi
+
+	emake ${makeopts} || die "emake failed"
+}
+
+src_install() {
+	local makeopts
+
+	makeopts="PREFIX=/usr DESTDIR=\"${D}\""
+
+	if use debug; then
+		makeopts="${makeopts} DEBUG=1"
+	fi
+
+	emake ${makeopts} install || die "emake install failed"
+
+	if use doc; then
+		dohtml -r html/* || die "documentation installation failed"
+	fi
+
+	dodoc ReadMe.txt ReadMe_QOS.txt History.txt || die "documentation
+ installation failed"
+}
diff --git a/dev-libs/ptlib/ptlib-9999.ebuild b/dev-libs/ptlib/ptlib-9999.ebuild
new file mode 100644
index 0000000..03b8892
--- /dev/null
+++ b/dev-libs/ptlib/ptlib-9999.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="1"
+
+inherit eutils subversion autotools
+
+DESCRIPTION="Network focused portable C++ class library providing high level functions"
+HOMEPAGE="http://www.opalvoip.org/"
+SRC_URI=""
+
+ESVN_REPO_URI="https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/ptlib/trunk"
+ESVN_STORE_DIR="${DISTDIR}/svn-src"
+ESVN_PROJECT="${PN/-svn}"
+#ESVN_BOOTSTRAP="./autogen.sh"
+
+S="${WORKDIR}/${P/_/}"
+
+LICENSE="MPL-1.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="alsa bsdvideo debug doc esd ieee1394 ipv6 ldap minimal noaudio novideo oss
+sasl sdl ssl sunaudio v4l v4l2 xml +exceptions +plugins opal"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	esd? ( media-sound/esound )
+	ieee1394? ( media-libs/libdv
+		sys-libs/libavc1394
+		media-libs/libdc1394:1 )
+	ldap? ( net-nds/openldap )
+	sasl? ( dev-libs/cyrus-sasl:2 )
+	sdl? ( media-libs/libsdl )
+	ssl? ( dev-libs/openssl )
+	xml? ( dev-libs/expat )"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	v4l? ( sys-kernel/linux-headers )
+	v4l2? ( sys-kernel/linux-headers )
+	!dev-libs/pwlib"
+
+src_unpack() {
+	subversion_src_unpack
+	cd "${S}"
+#	eautoreconf
+
+	# this patch fixes bugs: #145424 and #140358
+	epatch "${FILESDIR}"/${PN}-asm.patch
+}
+
+src_compile() {
+	local myconf=""
+	local makeopts=""
+
+	use noaudio && myconf="${myconf} --disable-audio"
+	use novideo && myconf="${myconf} --disable-video"
+
+	econf \
+		${myconf} \
+		$(use_enable alsa) \
+		$(use_enable bsdvideo) \
+		$(use_enable debug exceptions) \
+		$(use_enable debug memcheck) \
+		$(use_enable esd) \
+		$(use_enable ieee1394 avc) \
+		$(use_enable ieee1394 dc) \
+		$(use_enable ipv6) \
+		$(use_enable ldap openldap) \
+		$(use_enable minimal minsize) \
+		$(use_enable oss) \
+		$(use_enable sasl) \
+		$(use_enable sdl) \
+		$(use_enable ssl openssl) \
+		$(use_enable sunaudio) \
+		$(use_enable v4l) \
+		$(use_enable v4l2) \
+		$(use_enable xml expat) \
+		$(use_enable exceptions) \
+		$(use_enable plugins) \
+		$(use_enable opal) \
+		|| die "econf failed"
+
+	if use debug; then
+		makeopts="${makeopts} DEBUG=1 debug"
+	fi
+
+	emake ${makeopts} || die "emake failed"
+}
+
+src_install() {
+	local makeopts
+
+	makeopts="PREFIX=/usr DESTDIR=\"${D}\""
+
+	if use debug; then
+		makeopts="${makeopts} DEBUG=1"
+	fi
+
+	emake ${makeopts} install || die "emake install failed"
+
+#	if use doc; then
+#		dohtml -r html/* || die "documentation installation failed"
+#	fi
+
+#	dodoc ReadMe.txt ReadMe_QOS.txt History.txt || die "documentation
+# installation failed"
+}
diff --git a/dev-util/subversion/files b/dev-util/subversion/files
new file mode 120000
index 0000000..4f5737c
--- /dev/null
+++ b/dev-util/subversion/files
@@ -0,0 +1 @@
+/var/paludis/repositories/gentoo/dev-util/subversion/files
\ No newline at end of file
diff --git a/dev-util/subversion/subversion-9999.ebuild b/dev-util/subversion/subversion-9999.ebuild
new file mode 100644
index 0000000..7824d6e
--- /dev/null
+++ b/dev-util/subversion/subversion-9999.ebuild
@@ -0,0 +1,420 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.5.4.ebuild,v 1.10 2008/11/25 14:25:32 armin76 Exp $
+
+EAPI="1"
+WANT_AUTOMAKE="none"
+
+inherit autotools bash-completion confutils depend.apache elisp-common eutils flag-o-matic java-pkg-opt-2 libtool multilib perl-module python subversion
+
+DESCRIPTION="Advanced version control system"
+HOMEPAGE="http://subversion.tigris.org/"
+SRC_URI=""
+
+ESVN_REPO_URI="http://svn.collab.net/repos/svn/trunk/"
+ESVN_STORE_DIR="${DISTDIR}/svn-src"
+ESVN_PROJECT="${PN/-svn}"
+ESVN_BOOTSTRAP="./autogen.sh"
+
+S="${WORKDIR}/${P/_/}"
+
+LICENSE="Subversion"
+SLOT="0"
+KEYWORDS=""
+IUSE="apache2 berkdb debug doc +dso emacs extras java nls perl python ruby sasl vim-syntax +webdav-neon webdav-serf"
+RESTRICT="test"
+
+CDEPEND=">=dev-libs/apr-1.2.8
+	>=dev-libs/apr-util-1.2.8
+	dev-libs/expat
+	sys-libs/zlib
+	berkdb? ( =sys-libs/db-4* )
+	emacs? ( virtual/emacs )
+	ruby? ( >=dev-lang/ruby-1.8.2 )
+	sasl? ( dev-libs/cyrus-sasl )
+	webdav-neon? ( >=net-misc/neon-0.28 )
+	webdav-serf? ( net-libs/serf )"
+
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.5 )
+	nls? ( virtual/libintl )
+	perl? ( dev-perl/URI )"
+
+DEPEND="${CDEPEND}
+	doc? ( app-doc/doxygen )
+	java? ( >=virtual/jdk-1.5 )
+	nls? ( sys-devel/gettext )
+	dev-lang/swig"
+
+want_apache
+
+S="${WORKDIR}"/${P/_/-}
+
+# Allow for custom repository locations.
+# This can't be in pkg_setup because the variable needs to be available to
+# pkg_config.
+: ${SVN_REPOS_LOC:=/var/svn}
+
+pkg_setup() {
+	confutils_use_depend_built_with_all berkdb dev-libs/apr-util berkdb
+	java-pkg-opt-2_pkg_setup
+
+	if ! use webdav-neon && ! use webdav-serf; then
+		ewarn
+		ewarn "WebDAV support is disabled. You need WebDAV to"
+		ewarn "access repositories through the HTTP protocol."
+		ewarn
+		ewarn "WebDAV support needs one of the following USE flags enabled:"
+		ewarn "  webdav-neon webdav-serf"
+		ewarn
+		ewarn "You can do this by enabling one of these flags in /etc/portage/package.use:"
+		ewarn "    =${CATEGORY}/${PF} webdav-neon webdav-serf"
+		ewarn
+		ebeep
+	fi
+}
+
+src_unpack() {
+	subversion_src_unpack
+	cd "${S}"
+
+#	epatch "${FILESDIR}"/1.5.0/disable-unneeded-linking.patch
+
+	sed -i \
+		-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
+		-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
+
+	sed -e 's:@bindir@/svn-contrib:@libdir@/subversion/bin:' \
+		-e 's:@bindir@/svn-tools:@libdir@/subversion/bin:' \
+		-i Makefile.in
+
+#	eautoconf
+#	elibtoolize
+}
+
+src_compile() {
+	local myconf
+
+	if use python || use perl || use ruby; then
+		myconf="${myconf} --with-swig"
+	else
+		myconf="${myconf} --without-swig"
+	fi
+
+	if use debug; then
+		append-cppflags -DSVN_DEBUG -DAP_DEBUG
+	fi
+
+	append-flags -fno-strict-aliasing
+
+	econf ${myconf} \
+		$(use_with apache2 apxs "${APXS}") \
+		$(use_with berkdb berkeley-db) \
+		$(use_enable dso runtime-module-search) \
+		$(use_enable java javahl) \
+		$(use_with java jdk "${JAVA_HOME}") \
+		$(use_enable nls) \
+		$(use_with sasl) \
+		$(use_with webdav-neon neon /usr) \
+		$(use_with webdav-serf serf /usr) \
+		--with-apr=/usr/bin/apr-1-config \
+		--with-apr-util=/usr/bin/apu-1-config \
+		--disable-experimental-libtool \
+		--without-jikes \
+		--without-junit \
+		--disable-mod-activation
+
+	emake local-all || die "Building of core Subversion failed"
+
+	if use python; then
+		emake swig-py || die "Building of Subversion Python bindings failed"
+	fi
+
+	if use perl; then
+		emake -j1 swig-pl || die "Building of Subversion Perl bindings failed"
+	fi
+
+	if use ruby; then
+		emake swig-rb || die "Building of Subversion Ruby bindings failed"
+	fi
+
+	if use java; then
+		make JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl \
+			|| die "Building of Subversion JavaHL library failed"
+	fi
+
+	if use emacs; then
+		elisp-compile contrib/client-side/emacs/{dsvn,psvn,vc-svn}.el \
+			doc/svn-doc.el doc/tools/svnbook.el \
+			|| die "Compilation of Emacs modules failed"
+	fi
+
+	if use extras; then
+		emake contrib || die "Building of contrib failed"
+		emake tools || die "Building of tools failed"
+	fi
+
+	if use doc; then
+		doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
+
+		if use java; then
+			emake doc-javahl || die "Building of Subversion JavaHL library HTML documentation failed"
+		fi
+	fi
+}
+
+src_install() {
+	python_version
+	PYTHON_DIR=/usr/$(get_libdir)/python${PYVER}
+
+	emake -j1 DESTDIR="${D}" local-install || die "Installation of core of Subversion failed"
+
+	if use python; then
+		emake -j1 DESTDIR="${D}" DISTUTIL_PARAM="--prefix=${D}" LD_LIBRARY_PATH="-L${D}/usr/$(get_libdir)" install-swig-py \
+			|| die "Installation of Subversion Python bindings failed"
+
+		# Move Python bindings.
+		dodir "${PYTHON_DIR}/site-packages"
+		mv "${D}"/usr/$(get_libdir)/svn-python/svn "${D}${PYTHON_DIR}/site-packages"
+		mv "${D}"/usr/$(get_libdir)/svn-python/libsvn "${D}${PYTHON_DIR}/site-packages"
+		rm -Rf "${D}"/usr/$(get_libdir)/svn-python
+	fi
+
+	if use perl; then
+		emake -j1 DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl || die "Installation of Subversion Perl bindings failed"
+		fixlocalpod
+	fi
+
+	if use ruby; then
+		emake -j1 DESTDIR="${D}" install-swig-rb || die "Installation of Subversion Ruby bindings failed"
+	fi
+
+	if use java; then
+		emake -j1 DESTDIR="${D}" install-javahl || die "Installation of Subversion JavaHL library failed"
+		java-pkg_regso "${D}"/usr/$(get_libdir)/libsvnjavahl*.so
+		java-pkg_dojar "${D}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
+		rm -Rf "${D}"/usr/$(get_libdir)/svn-javahl/*.jar
+	fi
+
+	# Install Apache module configuration.
+	if use apache2; then
+		dodir "${APACHE_MODULES_CONFDIR}"
+		cat <<EOF >"${D}/${APACHE_MODULES_CONFDIR}"/47_mod_dav_svn.conf
+<IfDefine SVN>
+LoadModule dav_svn_module modules/mod_dav_svn.so
+<IfDefine SVN_AUTHZ>
+LoadModule authz_svn_module modules/mod_authz_svn.so
+</IfDefine>
+
+# Example configuration:
+#<Location /svn/repos>
+#	DAV svn
+#	SVNPath ${SVN_REPOS_LOC}/repos
+#	AuthType Basic
+#	AuthName "Subversion repository"
+#	AuthUserFile ${SVN_REPOS_LOC}/conf/svnusers
+#	Require valid-user
+#</Location>
+</IfDefine>
+EOF
+	fi
+
+	# Install Bash Completion, bug 43179.
+	dobashcompletion tools/client-side/bash_completion subversion
+	rm -f tools/client-side/bash_completion
+
+	# Install hot backup script, bug 54304.
+	newbin tools/backup/hot-backup.py svn-hot-backup
+	rm -fr tools/backup
+
+	# Install svn_load_dirs.pl.
+	if use perl; then
+		newbin contrib/client-side/svn_load_dirs/svn_load_dirs.pl svn-load-dirs
+	fi
+	rm -f contrib/client-side/svn_load_dirs/svn_load_dirs.pl
+
+	# Install svnserve init-script and xinet.d snippet, bug 43245.
+	newinitd "${FILESDIR}"/svnserve.initd svnserve
+	if use apache2; then
+		newconfd "${FILESDIR}"/svnserve.confd svnserve
+	else
+		newconfd "${FILESDIR}"/svnserve.confd2 svnserve
+	fi
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/svnserve.xinetd svnserve
+
+	# Install documentation.
+	dodoc CHANGES COMMITTERS README
+	dohtml www/hacking.html
+	dodoc tools/xslt/svnindex.{css,xsl}
+	rm -fr tools/xslt
+
+	# Install Vim syntax files.
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins contrib/client-side/vim/svn.vim
+	fi
+	rm -f contrib/client-side/vim/svn.vim
+
+	# Install Emacs Lisps.
+	if use emacs; then
+		elisp-install ${PN} contrib/client-side/emacs/{dsvn,psvn}.{el,elc} \
+			doc/svn-doc.{el,elc} doc/tools/svnbook.{el,elc} \
+			|| die "Installation of Emacs modules failed"
+		elisp-install ${PN}/compat contrib/client-side/emacs/vc-svn.{el,elc} \
+			|| die "Installation of Emacs modules failed"
+		touch "${D}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/1.5.0/70svn-gentoo.el \
+			|| die "Installation of Emacs site-init file failed"
+	fi
+	rm -fr contrib/client-side/emacs
+
+	# Install extra files.
+	if use extras; then
+		doenvd "${FILESDIR}"/1.5.0/80subversion-extras
+
+		emake DESTDIR="${D}" install-contrib || die "Installation of contrib failed"
+		emake DESTDIR="${D}" install-tools || die "Installation of tools failed"
+
+		find contrib tools '(' -name "*.bat" -o -name "*.in" -o -name ".libs" ')' -print0 | xargs -0 rm -fr
+		rm -fr contrib/client-side/{svn-push,svnmucc}
+		rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}*
+		rm -fr tools/{buildbot,dev,diff,po}
+
+		insinto /usr/share/${PN}
+		doins -r contrib tools
+	fi
+
+	if use doc; then
+		dohtml doc/doxygen/html/*
+
+		insinto /usr/share/doc/${PF}
+		doins -r notes
+		ecompressdir /usr/share/doc/${PF}/notes
+
+		if use java; then
+			java-pkg_dojavadoc doc/javadoc
+		fi
+	fi
+}
+
+pkg_preinst() {
+	# Compare versions of Berkeley DB, bug 122877.
+	if use berkdb && [[ -f "${ROOT}usr/bin/svn" ]] ; then
+		OLD_BDB_VERSION="$(scanelf -nq "${ROOT}usr/$(get_libdir)/libsvn_subr-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
+		NEW_BDB_VERSION="$(scanelf -nq "${D}usr/$(get_libdir)/libsvn_subr-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
+		if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then
+			CHANGED_BDB_VERSION=1
+		fi
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	use perl && perl-module_pkg_postinst
+
+	elog "Subversion Server Notes"
+	elog "-----------------------"
+	elog
+	elog "If you intend to run a server, a repository needs to be created using"
+	elog "svnadmin (see man svnadmin) or the following command to create it in"
+	elog "${SVN_REPOS_LOC}:"
+	elog
+	elog "    emerge --config =${CATEGORY}/${PF}"
+	elog
+	elog "Subversion has multiple server types, take your pick:"
+	elog
+	elog " - svnserve daemon: "
+	elog "   1. Edit /etc/conf.d/svnserve"
+	elog "   2. Fix the repository permissions (see \"Fixing the repository permissions\")"
+	elog "   3. Start daemon: /etc/init.d/svnserve start"
+	elog "   4. Make persistent: rc-update add svnserve default"
+	elog
+	elog " - svnserve via xinetd:"
+	elog "   1. Edit /etc/xinetd.d/svnserve (remove disable line)"
+	elog "   2. Fix the repository permissions (see \"Fixing the repository permissions\")"
+	elog "   3. Restart xinetd.d: /etc/init.d/xinetd restart"
+	elog
+	elog " - svn over ssh:"
+	elog "   1. Fix the repository permissions (see \"Fixing the repository permissions\")"
+	elog "      Additionally run:"
+	elog "        groupadd svnusers"
+	elog "        chown -R root:svnusers ${SVN_REPOS_LOC}/repos"
+	elog "   2. Create an svnserve wrapper in /usr/local/bin to set the umask you"
+	elog "      want, for example:"
+	elog "         #!/bin/bash"
+	elog "         . /etc/conf.d/svnserve"
+	elog "         umask 007"
+	elog "         exec /usr/bin/svnserve \${SVNSERVE_OPTS} \"\$@\""
+	elog
+
+	if use apache2; then
+		elog " - http-based server:"
+		elog "   1. Edit /etc/conf.d/apache2 to include both \"-D DAV\" and \"-D SVN\""
+		elog "   2. Create an htpasswd file:"
+		elog "      htpasswd2 -m -c ${SVN_REPOS_LOC}/conf/svnusers USERNAME"
+		elog "   3. Fix the repository permissions (see \"Fixing the repository permissions\")"
+		elog "   4. Restart Apache: /etc/init.d/apache2 restart"
+		elog
+	fi
+
+	elog "   Fixing the repository permissions:"
+	elog "        chmod -Rf go-rwx ${SVN_REPOS_LOC}/conf"
+	elog "        chmod -Rf g-w,o-rwx ${SVN_REPOS_LOC}/repos"
+	elog "        chmod -Rf g+rw ${SVN_REPOS_LOC}/repos/db"
+	elog "        chmod -Rf g+rw ${SVN_REPOS_LOC}/repos/locks"
+	elog
+
+	elog "If you intend to use svn-hot-backup, you can specify the number of"
+	elog "backups to keep per repository by specifying an environment variable."
+	elog "If you want to keep e.g. 2 backups, do the following:"
+	elog "echo '# hot-backup: Keep that many repository backups around' > /etc/env.d/80subversion"
+	elog "echo 'SVN_HOTBACKUP_BACKUPS_NUMBER=2' >> /etc/env.d/80subversion"
+	elog
+
+	if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then
+		ewarn "You upgraded from an older version of Berkeley DB and may experience"
+		ewarn "problems with your repository. Run the following commands as root to fix it:"
+		ewarn "    db4_recover -h ${SVN_REPOS_LOC}/repos"
+		ewarn "    chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use perl && perl-module_pkg_postrm
+}
+
+pkg_config() {
+	if [[ ! -x "${ROOT}usr/bin/svnadmin" ]] ; then
+		die "You seem to only have built the Subversion client"
+	fi
+
+	einfo ">>> Initializing the database in ${ROOT}${SVN_REPOS_LOC} ..."
+	if [[ -e "${ROOT}${SVN_REPOS_LOC}/repos" ]] ; then
+		echo "A Subversion repository already exists and I will not overwrite it."
+		echo "Delete \"${ROOT}${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
+	else
+		mkdir -p "${ROOT}${SVN_REPOS_LOC}/conf"
+
+		einfo ">>> Populating repository directory ..."
+		# Create initial repository.
+		"${ROOT}usr/bin/svnadmin" create "${ROOT}${SVN_REPOS_LOC}/repos"
+
+		einfo ">>> Setting repository permissions ..."
+		SVNSERVE_USER="$(. "${ROOT}etc/conf.d/svnserve" ; echo "${SVNSERVE_USER}")"
+		SVNSERVE_GROUP="$(. "${ROOT}etc/conf.d/svnserve" ; echo "${SVNSERVE_GROUP}")"
+		if use apache2 ; then
+			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
+			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
+		else
+			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn"
+			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers"
+			enewgroup "${SVNSERVE_GROUP}"
+			enewuser "${SVNSERVE_USER}" -1 -1 "${SVN_REPOS_LOC}" "${SVNSERVE_GROUP}"
+		fi
+		chown -Rf "${SVNSERVE_USER}:${SVNSERVE_GROUP}" "${ROOT}${SVN_REPOS_LOC}/repos"
+		chmod -Rf go-rwx "${ROOT}${SVN_REPOS_LOC}/conf"
+		chmod -Rf o-rwx "${ROOT}${SVN_REPOS_LOC}/repos"
+	fi
+}
diff --git a/games-emulation/epsxe/epsxe-1.6.0-r3.ebuild b/games-emulation/epsxe/epsxe-1.6.0-r3.ebuild
new file mode 100644
index 0000000..40a3b05
--- /dev/null
+++ b/games-emulation/epsxe/epsxe-1.6.0-r3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/epsxe/epsxe-1.6.0-r3.ebuild,v 1.5 2004/09/13 04:45:07 mr_bones_ Exp $
+
+inherit games
+
+DESCRIPTION="ePSXe Playstation Emulator"
+HOMEPAGE="http://www.epsxe.com/"
+SRC_URI="http://www.epsxe.com/files/epsxe${PV//.}lin.zip"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="-* x86 ~amd64"
+IUSE="opengl"
+RESTRICT="nostrip" # For some strange reason, strip truncates the whole file
+
+DEPEND="app-arch/unzip"
+RDEPEND="!amd64? ( >=dev-libs/glib-1.2 =x11-libs/gtk+-1.2* =sys-libs/ncurses-5* =sys-libs/zlib-1* net-misc/wget games-emulation/psemu-peopsspu )
+ opengl? ( games-emulation/psemu-gpupetemesagl games-emulation/psemu-peopssoftgpu )
+ amd64? ( app-emulation/emul-linux-x86-gtklibs )"
+
+S="${WORKDIR}"
+
+src_install() {
+	local dir=${GAMES_PREFIX_OPT}/${PN}
+	dogamesbin "${FILESDIR}"/epsxe
+	sed -i \
+		-e "s:GAMES_PREFIX_OPT:${GAMES_PREFIX_OPT}:" \
+		-e "s:GAMES_LIBDIR:$(games_get_libdir):" \
+		"${D}${GAMES_BINDIR}"/epsxe \
+		|| die "sed failed"
+	exeinto "${dir}"
+	doexe epsxe || die "doexe failed"
+	insinto "${dir}"
+	doins keycodes.lst || die "doins failed"
+	insinto "$(games_get_libdir)"/psemu/cheats
+	doins cheats/* || die "doins failed"
+	dodoc docs/*
+	prepgamesdirs
+}
diff --git a/games-emulation/epsxe/files/epsxe b/games-emulation/epsxe/files/epsxe
new file mode 100644
index 0000000..f50f33a
--- /dev/null
+++ b/games-emulation/epsxe/files/epsxe
@@ -0,0 +1,72 @@
+#!/bin/sh
+
+PSEMUDIR=GAMES_LIBDIR/psemu
+EPSXEDIR=GAMES_PREFIX_OPT/epsxe
+
+mkdir -p ~/.epsxe
+cd ~/.epsxe
+cleanlinks
+mkdir -p memcards bios cfg cheats snap sstates patches plugins
+
+shopt -s nullglob
+
+for f in `find "${EPSXEDIR}" -maxdepth 1 -type f -printf '%f '` ; do
+	[[ -e "${f}" ]] && continue
+	ln -s "${EPSXEDIR}/${f}" "${f}" >& /dev/null
+done
+
+if [[ -d "${PSEMUDIR}" ]] ; then
+	if [[ -d "${PSEMUDIR}/plugins" ]] ; then
+		for plugin in `find "${PSEMUDIR}/plugins"  -maxdepth 1 -type f -printf '%f '` ; do
+			if [[ ! -e "plugins/${plugin}" ]] ; then
+				echo "Loading new plugin: ${plugin}"
+				ln -s "${PSEMUDIR}/plugins/${plugin}" "plugins/${plugin}"
+			fi
+		done
+	fi
+
+	if [[ -d "${PSEMUDIR}/cfg" ]] ; then
+		for configlib in `find "${PSEMUDIR}/cfg"  -maxdepth 1 -iname '*.cfg' -prune -o -type f -printf '%f '`; do 
+			if [[ ! -e "cfg/${configlib}" ]] ; then
+				echo "Loading config utility: ${configlib}"
+				ln -s "${PSEMUDIR}/cfg/${configlib}" "cfg/${configlib}"
+			fi
+		done
+
+		for config in `find "${PSEMUDIR}/cfg"  -maxdepth 1 -iname '*.cfg' -type f -printf '%f '`; do 
+			if [[ ! -e "cfg/${config}" ]] ; then
+				echo "Loading default config: ${config}"
+					cp "${PSEMUDIR}/cfg/${config}" "cfg/${config}"
+			fi
+		done
+	fi
+
+	if [[ -d "${PSEMUDIR}/cheats" ]] ; then
+		for cheat in `find "${PSEMUDIR}/cheats"  -maxdepth 1 -type f -printf '%f '`; do 
+			if [[ ! -e "cheats/${cheat}" ]] ; then 
+				ln -s "${PSEMUDIR}/cheats/${cheat}" "cheats/${cheat}"
+			fi
+		done
+	fi
+
+	if [[ -d "${PSEMUDIR}/bios" ]] ; then
+		for bios in `find "${PSEMUDIR}/bios"  -maxdepth 1 -type f -printf '%f '`; do
+			if [[ ! -e "bios/${bios}" ]] ; then
+				ln -s "${PSEMUDIR}/bios/${bios}" "bios/${bios}"
+			fi
+		done
+	fi
+fi
+
+# check for bios
+if [[ -z "`cd bios && ls`" ]] ; then
+	# if the bios directory is empty, then ... well ...
+	echo
+	echo "*** Put your BIOS file into ~/.epsxe/bios/"
+	echo "    or ePSXe may not work!"
+	echo
+fi
+
+# execute program (with args)
+export LD_PRELOAD="libpthread.so.0:${LD_PRELOAD}" # fix for Bug #26121
+exec ./epsxe "$@"
diff --git a/games-emulation/gens/files/gens-2.12b-gcc4.patch b/games-emulation/gens/files/gens-2.12b-gcc4.patch
new file mode 100644
index 0000000..88cf9b0
--- /dev/null
+++ b/games-emulation/gens/files/gens-2.12b-gcc4.patch
@@ -0,0 +1,37 @@
+diff --git a/src/gens/emulator/g_main.c b/src/gens/emulator/g_main.c
+index 1c9f4f5..3ac13eb 100644
+--- a/src/gens/emulator/g_main.c
++++ b/src/gens/emulator/g_main.c
+@@ -5,6 +5,7 @@
+ #include <sys/stat.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <string.h>
+ #include "g_main.h"
+ #include "timer.h"
+ #include "gens.h"
+diff --git a/src/gens/emulator/g_main.h b/src/gens/emulator/g_main.h
+index c7ea4b2..9090766 100644
+--- a/src/gens/emulator/g_main.h
++++ b/src/gens/emulator/g_main.h
+@@ -36,6 +36,8 @@ extern char **language_name;
+ extern unsigned char Keys[];
+ extern unsigned char joystate[];
+ 
++static int Build_Language_String (void);
++
+ void SetWindowText(const char *text);
+ 
+ int Set_Render(int Full, int Num, int Force);
+diff --git a/src/gens/emulator/parse.c b/src/gens/emulator/parse.c
+index 5bece4a..67f8b49 100644
+--- a/src/gens/emulator/parse.c
++++ b/src/gens/emulator/parse.c
+@@ -1,6 +1,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <getopt.h>
++#include <string.h>
+ #include "port.h"
+ #include "save.h"
+ #include "cpu_68k.h"
diff --git a/games-emulation/gens/files/gens-2.12b-romsdir.patch b/games-emulation/gens/files/gens-2.12b-romsdir.patch
new file mode 100644
index 0000000..76b066b
--- /dev/null
+++ b/games-emulation/gens/files/gens-2.12b-romsdir.patch
@@ -0,0 +1,13 @@
+diff -ruN gens-rc3.5-opengl/src/gens/util/rom.c gens-rc3.5-opengl-patched/src/gens/util/rom.c
+--- gens-rc3.5-opengl/src/gens/util/rom.c	2005-01-10 22:24:01.000000000 +0100
++++ gens-rc3.5-opengl-patched/src/gens/util/rom.c	2006-10-29 14:58:14.000000000 +0100
+@@ -411,6 +411,9 @@
+     create_file_chooser_dialog ("Open Rom", GTK_FILE_CHOOSER_ACTION_OPEN);
+ //      fileselection_set_dir (fd.filesel, Rom_Dir);
+   addRomsFilter (widget);
++  
++  gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (widget), Rom_Dir);
++  
+   res = gtk_dialog_run (GTK_DIALOG (widget));
+   if (res == GTK_RESPONSE_OK)
+     {
diff --git a/games-emulation/gens/files/gens-rc3_to_mythgame.patch b/games-emulation/gens/files/gens-rc3_to_mythgame.patch
new file mode 100644
index 0000000..f32897a
--- /dev/null
+++ b/games-emulation/gens/files/gens-rc3_to_mythgame.patch
@@ -0,0 +1,674 @@
+--- old/src/gens/emulator/g_main.h	2004-04-15 16:22:49.000000000 -0400
++++ new/src/gens/emulator/g_main.h	2006-12-30 12:50:37.000000000 -0500
+@@ -22,6 +22,7 @@
+ extern int Intro_Style;
+ extern int SegaCD_Accurate;
+ extern int Active;
++extern int Quick_Exit;
+ 
+ extern POINT Window_Pos;
+ 
+@@ -36,6 +37,8 @@
+ extern unsigned char Keys[];
+ extern unsigned char joystate[];
+ 
++static int Build_Language_String (void);
++
+ void SetWindowText(const char *text);
+ 
+ int Set_Render(int Full, int Num, int Force);
+--- old/src/gens/emulator/g_main.c	2004-05-18 16:34:00.000000000 -0400
++++ new/src/gens/emulator/g_main.c	2006-12-30 13:13:00.000000000 -0500
+@@ -5,6 +5,7 @@
+ #include <sys/stat.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <string.h>
+ #include "g_main.h"
+ #include "timer.h"
+ #include "gens.h"
+@@ -54,6 +55,7 @@
+ int Intro_Style = 2;
+ int SegaCD_Accurate = 0;
+ int Kaillera_Client_Running = 0;
++int Quick_Exit = 0;
+ 
+ static int Gens_Running = 0;
+ 
+@@ -96,6 +98,11 @@
+ 	  switch (event.key.keysym.sym)
+ 	    {
+ 	    case SDLK_ESCAPE:
++	      if (Quick_Exit)
++                {
++		  close_gens();
++		}
++	      
+ 	      if (Debug)
+ 		{
+ 		  Change_Debug (0);
+@@ -427,21 +434,73 @@
+ 	  break;
+ 
+ 	case SDL_JOYAXISMOTION:
+-	  if (event.jaxis.axis < 2)
++	  if (event.jaxis.axis < 6)
++	    {
++	      if (event.jaxis.value < -10000)
++		{
++		  if (event.jaxis.axis == 0)
++		    {
++		      joystate[0x100 * event.jaxis.which + 0x3] = 1;
++		      joystate[0x100 * event.jaxis.which + 0x4] = 0;
++		    }
++		  else if (event.jaxis.axis == 1)
++		    {
++		      joystate[0x100 * event.jaxis.which + 0x1] = 1;
++		      joystate[0x100 * event.jaxis.which + 0x2] = 0;
++		    }
++		  else if (event.jaxis.axis == 2)
++		    {
++		      joystate[0x100 * event.jaxis.which + 0x7] = 1;
++		      joystate[0x100 * event.jaxis.which + 0x8] = 0;
++		    }
++		  else if (event.jaxis.axis == 3)
++		    {
++		      joystate[0x100 * event.jaxis.which + 0x5] = 1;
++		      joystate[0x100 * event.jaxis.which + 0x6] = 0;
++		    }
++		  else if (event.jaxis.axis == 4)
++		    {
++		      joystate[0x100 * event.jaxis.which + 0xB] = 1;
++		      joystate[0x100 * event.jaxis.which + 0xC] = 0;
++		    }
++		  else if (event.jaxis.axis == 5)
++		    {
++		      joystate[0x100 * event.jaxis.which + 0x9] = 1;
++		      joystate[0x100 * event.jaxis.which + 0xA] = 0;
++		    }
++		}
++	      else if (event.jaxis.value > 10000)
++	    {
++		  if (event.jaxis.axis == 0)
++		    {
++		      joystate[0x100 * event.jaxis.which + 0x3] = 0;
++		      joystate[0x100 * event.jaxis.which + 0x4] = 1;
++		    }
++		  else if (event.jaxis.axis == 1)
+ 	    {
+-	      if (event.jaxis.value < -500)
++		      joystate[0x100 * event.jaxis.which + 0x1] = 0;
++		      joystate[0x100 * event.jaxis.which + 0x2] = 1;
++		    }
++		  else if (event.jaxis.axis == 2)
+ 		{
+-		  joystate[0x100 * event.jaxis.which +
+-			   ((event.jaxis.axis == 0) ? 0x3 : 0x1)] = 1;
+-		  joystate[0x100 * event.jaxis.which +
+-			   ((event.jaxis.axis == 0) ? 0x4 : 0x2)] = 0;
++		      joystate[0x100 * event.jaxis.which + 0x7] = 0;
++		      joystate[0x100 * event.jaxis.which + 0x8] = 1;
+ 		}
+-	      else if (event.jaxis.value > 500)
++		  else if (event.jaxis.axis == 3)
+ 		{
+-		  joystate[0x100 * event.jaxis.which +
+-			   ((event.jaxis.axis == 0) ? 0x4 : 0x2)] = 1;
+-		  joystate[0x100 * event.jaxis.which +
+-			   ((event.jaxis.axis == 0) ? 0x3 : 0x1)] = 0;
++		      joystate[0x100 * event.jaxis.which + 0x5] = 0;
++		      joystate[0x100 * event.jaxis.which + 0x6] = 1;
++		    }
++		  else if (event.jaxis.axis == 4)
++		{
++		      joystate[0x100 * event.jaxis.which + 0xB] = 0;
++		      joystate[0x100 * event.jaxis.which + 0xC] = 1;
++		}
++		  else if (event.jaxis.axis == 5)
++		{
++		      joystate[0x100 * event.jaxis.which + 0x9] = 0;
++		      joystate[0x100 * event.jaxis.which + 0xA] = 1;
++		    }
+ 		}
+ 	      else
+ 		{
+@@ -455,7 +514,26 @@
+ 		      joystate[0x100 * event.jaxis.which + 0x2] = 0;
+ 		      joystate[0x100 * event.jaxis.which + 0x1] = 0;
+ 		    }
+-
++		  else if (event.jaxis.axis == 2)
++		    {
++		      joystate[0x100 * event.jaxis.which + 0x8] = 0;
++		      joystate[0x100 * event.jaxis.which + 0x7] = 0;
++		    }
++		  else if (event.jaxis.axis == 3)
++		    {
++		      joystate[0x100 * event.jaxis.which + 0x6] = 0;
++		      joystate[0x100 * event.jaxis.which + 0x5] = 0;
++		    }
++		  else if (event.jaxis.axis == 4)
++		    {
++		      joystate[0x100 * event.jaxis.which + 0xC] = 0;
++		      joystate[0x100 * event.jaxis.which + 0xB] = 0;
++		    }
++		  else if (event.jaxis.axis == 5)
++		    {
++		      joystate[0x100 * event.jaxis.which + 0xA] = 0;
++		      joystate[0x100 * event.jaxis.which + 0x9] = 0;
++		    }
+ 		}
+ 	    }
+ 
+@@ -679,6 +757,24 @@
+   sync_gens_ui ();
+   gtk_widget_show_all (gens_window);
+ 
++  //If a rom is passed in on the command line then open it
++  if (strcmp(Rom_Name, "") != 0)
++    {
++      struct stat buf;
++      char Rom_Path[2048];
++      strcpy (Rom_Path, Rom_Dir);
++      strcat (Rom_Path, Rom_Name);
++      if (stat (Rom_Path, &buf) == 0)
++        {
++          printf("Opening %s\n", Rom_Path);
++          Open_Rom(Rom_Path);
++        }
++        else
++        {
++          printf("%s not found\n", Rom_Path);
++        }
++     }
++  
+   while (is_gens_running ())
+     {
+       update_SDL_events ();
+--- old/src/gens/emulator/parse.h	2004-05-19 15:12:02.000000000 -0400
++++ new/src/gens/emulator/parse.h	2006-12-30 12:40:16.000000000 -0500
+@@ -4,8 +4,8 @@
+ #define MM					"--"
+ #define ENABLE				"enable"
+ #define DISABLE				"disable"
+-// 1 arg option
+ 
++// 1 arg option
+ #define ROMPATH 			"rompath"
+ #define SAVEPATH	       	"savepath"
+ #define SRAMPATH        	"srampath"
+@@ -38,6 +38,7 @@
+ 
+ #define FS        			"fs"
+ #define WINDOW    	   		"window"
++#define QUICKEXIT               "quickexit"
+ 
+ // enable and disable options
+ #define STRETCH				"stretch"
+--- old/src/gens/emulator/parse.c	2004-05-19 15:21:00.000000000 -0400
++++ new/src/gens/emulator/parse.c	2007-01-03 01:29:41.210902112 -0500
+@@ -1,6 +1,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <getopt.h>
++#include <string.h>
+ #include "port.h"
+ #include "save.h"
+ #include "cpu_68k.h"
+@@ -33,67 +34,71 @@
+ #include "support.h"
+ #include "parse.h"
+ 
+-#define print_usage(option, helpmsg) fprintf(stderr, MM option"\n" helpmsg)
+-#define print_usage2(option, helpmsg) fprintf(stderr, MM ENABLE "-" option ", " MM DISABLE "-" option "\n" helpmsg "\n\n")
++#define print_usage(option, helpmsg) fprintf(stderr, MM option"\t" helpmsg"\n")
++#define print_usage2(option, helpmsg) fprintf(stderr, MM "en/disable-" option "\t" helpmsg "\n")
+ 
+ static void _usage()
+ {
+-	fprintf (stderr, "Gens for Linux v2.12-rc3\n");
++	fprintf (stderr, "Gens for Linux v2.12-mythgame\n");
+ 	fprintf (stderr, "Usage : gens [options] romfile\n");
+-	print_usage(  HELP, "print this help");
++	print_usage(  HELP, "\t\tprint this help");
+ 	
+-	print_usage(  ROMPATH ,"path where your roms are stored");
+-	print_usage(  SAVEPATH ,"path where to save your states file");
+-	print_usage(  SRAMPATH ,"path where to save your states file");
+-	print_usage(  BRAMPATH ,"path where to save your states file");	
+-	print_usage(  DUMPPATH ,"path where to save your states file");
+-	print_usage(  DUMPGYMPATH ,"path where to save your states file");
+-	print_usage(  SCRSHTPATH ,"path where to save your states file");
+-	print_usage(  PATPATH ,"path where to save your states file");	
+-	print_usage(  IPSPATH ,"path where to save your states file");
+-	print_usage(  GCOFFPATH ,"path where to save your states file");
+-	print_usage(  GENSMANPATH ,"path where to save your states file");
+-	print_usage(  GENBIOS ,"");	
+-	print_usage(  USABIOS ,"");
+-	print_usage(  EURBIOS ,"");
+-	print_usage(  JAPBIOS ,"");
+-	print_usage(  _32X68kBIOS ,"");	
+-	print_usage(  _32XMBIOS ,"");
+-	print_usage(  _32XSBIOS ,"");
+-	print_usage(  CONTRAST ,"");
+-	print_usage(  BRIGHTNESS ,"");	
+-	print_usage(  WINDOWMODE ,"");
+-	print_usage(  FSMODE ,"");
+-	print_usage(  FRAMESKIP ,"");
+-	print_usage(  SOUNDRATE ,"");	
+-	print_usage(  MSH2SPEED ,"");
+-	print_usage(  SSH2SPEED ,"");
+-	print_usage(  RAMCARTSIZE,"");
+-
+-	print_usage2(  STRETCH,"stretch mode");
+-	print_usage2(  SWBLIT,"software blitting");
+-	print_usage2(  GREYSCALE,"greyscale");
+-	print_usage2(  INVERT,"");
+-	print_usage2(  SPRITELIMIT,"");
+-	print_usage2(  SOUND,"");
+-	print_usage2(  STEREO,"");
+-	print_usage2(  Z80,"");
+-	print_usage2(  YM2612,"");
+-	print_usage2(  PSG,"");
+-	print_usage2(  DAC,"");
+-	print_usage2(  PCM,"");
+-	print_usage2(  PWM,"");
+-	print_usage2(  CDDA,"");
++	print_usage(  ROMPATH ,"\tdirectory roms are located in");
++	print_usage(  SAVEPATH ,"\tpath to save states file");
++	print_usage(  SRAMPATH ,"\tpath to save SRAM (battery backup) files");
++	print_usage(  BRAMPATH ,"\tpath to save BRAM (Sega CD battery backup) files");	
++	print_usage(  DUMPPATH ,"\tpath to save wav sound dumps");
++	print_usage(  DUMPGYMPATH ,"\tpath to save GYM sound dumps");
++	print_usage(  SCRSHTPATH ,"path to save screen shots");
++	print_usage(  PATPATH ,"\tpath for game genie patch files");	
++	print_usage(  IPSPATH ,"\tpath for patch files");
++	print_usage(  GCOFFPATH ,"\tpath to GCOffline (offline version of Genesis Collective)");
++	print_usage(  GENSMANPATH ,"path to Gens manual");
++	print_usage(  GENBIOS ,"\tpath to the Genesis bios");	
++	print_usage(  USABIOS ,"\tpath to the USA Sega CD bios");
++	print_usage(  EURBIOS ,"\tpath to the European Sega CD bios");
++	print_usage(  JAPBIOS ,"\tpath to the Japanese Sega CD bios");
++	print_usage(  _32X68kBIOS ,"\tpath to the 32X 68k bios");	
++	print_usage(  _32XMBIOS ,"\tpath to the 32X Master bios");
++	print_usage(  _32XSBIOS ,"\tpath to the 32X Slave bios");
++	print_usage(  CONTRAST ,"\tadjust contrast up to (0-200, default 100)");
++	print_usage(  BRIGHTNESS ,"\tadjust brightness up to (0-200, default 100)");	
++	print_usage(  FS ,"\t\trun the emulator full screen (0/1)");
++	print_usage(  FSMODE ,"\trendering mode for full screen (1-11)\n\t\t\t  0 - normal\t\t  6 - interpolated scanline\n\t\t\t  1 - double\t\t  7 - interpolated 50%% scanline\n\t\t\t  2 - interpolated\t  8 - interpolated 25%% scanline\n\t\t\t  3 - scanline\t\t  9 - 2xSAI (Kreed)\n\t\t\t  4 - 50%% scanline\t  10 - Scale2x\n\t\t\t  5 - 25%% scanline\t  11 - Hq2x");
++	print_usage(  WINDOW ,"\trun the emulator in a window (0/1)");	
++	print_usage(  WINDOWMODE ,"\trendering mode for window (0-11)\n\t\t\t  same options as fs-mode");
++	print_usage(  FRAMESKIP ,"\tskip frames at this relative rate, useful on slower cpus (0-8, -1 auto)");
++	print_usage(  SOUNDRATE ,"\tthe sound sampling rate (11025, 22050, 44100)");	
++	print_usage(  MSH2SPEED ,"\tmaster SH2 speed (0-200, default 100)");
++	print_usage(  SSH2SPEED ,"\tslave SH2 speed (0-200, default 100)");
++	print_usage(  RAMCARTSIZE ,"\tSega CD SRAM size (-1 = none, 0 = 8k, 1 = 16k, 2 = 32k, 3 = 64k)");
++	print_usage(  QUICKEXIT ,"\tmake the ESC key exit Gens instead of pause (0/1)");
++	fprintf (stderr, "\n");
++	
++	print_usage2(  STRETCH,"\tstretch mode");
++	print_usage2(  SWBLIT,"\tsoftware blitting");
++	print_usage2(  GREYSCALE,"\tdisplay in greyscale mode");
++	print_usage2(  INVERT,"\tdisplay colors inverted");
++	print_usage2(  SPRITELIMIT,"limit the number of sprites on screen");
++	print_usage2(  SOUND,"\tsound is to be enabled");
++	print_usage2(  STEREO,"stereo sound is to be enabled");
++	print_usage2(  Z80,"\tZ80 sound processor");
++	print_usage2(  YM2612,"\tYM2612 sound chip");
++	print_usage2(  PSG,"\tPSG 76489 sound chip");
++	print_usage2(  DAC,"\tpart of YM2612 chip");
++	print_usage2(  PCM,"\tsound chip for Sega CD");
++	print_usage2(  PWM,"\t10-channel PWM mixing for 32X");
++	print_usage2(  CDDA,"\tCDDA data access mode for Sega CD");
+ 	print_usage2(  PSGIMPROVED,"");
+ 	print_usage2(  YMIMPROVED,"");
+ 	print_usage2(  DACIMPROVED,"");
+-	print_usage2(  PERFECTSYNC,"");
+-	print_usage2(  FASTBLUR,"");
+-	print_usage2(  FPS,"");
+-	print_usage2(  MSG,"");
+-	print_usage2(  LED,"");
+-	print_usage2(  FIXCHKSUM,"");
+-	print_usage2(  AUTOPAUSE,"");
++	print_usage2(  PERFECTSYNC,"synch main and sub CPUs for Sega CD");
++	print_usage2(  FASTBLUR,"\tmode to simulate output to tv");
++	print_usage2(  FPS,"\tFPS display");
++	print_usage2(  MSG,"\tGens system messages");
++	print_usage2(  LED,"\tSega CD power and access LEDs");
++	print_usage2(  FIXCHKSUM,"\ttoggle that may fix red screen checksum errors");
++	print_usage2(  AUTOPAUSE,"\tset gens to pause when screen loses focus");
+ 	
+ 	exit (0);	
+ }
+@@ -184,6 +189,7 @@
+ 	{AUTOPAUSE1, no_argument, 0, 0},
+ 	{AUTOPAUSE0, no_argument, 0, 0},
+ 	{RAMCARTSIZE, required_argument, 0, 0},
++	{QUICKEXIT, no_argument, 0, 0},
+ 	{HELP, no_argument, 0, 0},
+ 	{0, 0, 0, 0}
+       };
+@@ -499,6 +505,10 @@
+ 	{
+ 	  BRAM_Ex_Size = strtol (optarg, (char **) NULL, 10);
+ 	}
++      else if (!strcmp (long_options[option_index].name, QUICKEXIT))
++	{
++	  Quick_Exit = 1;
++	}
+       else if (!strcmp (long_options[option_index].name, HELP))
+ 	{
+ 		_usage();
+@@ -510,6 +520,12 @@
+ 
+   if (optind < argc)
+     {
++      //The first non ARGV element is the romfile parameter
++      strcpy (Rom_Name, argv[optind++]);
++    }
++    
++  if (optind < argc)
++    {
+       printf ("non-option ARGV-elements: ");
+       while (optind < argc)
+ 		printf ("%s ", argv[optind++]);
+--- old/src/gens/sdllayer/g_sdlinput.h	2004-05-18 16:45:07.000000000 -0400
++++ new/src/gens/sdllayer/g_sdlinput.h	2006-12-30 12:47:40.000000000 -0500
+@@ -28,7 +28,7 @@
+ void open_joystick();
+ void close_joystick();
+ 
+-extern SDL_Joystick* joy[2];
++extern SDL_Joystick* joy[6];
+ 
+ #define CHECK_BUTTON(player, ctrl, button)				\
+ 	if (Check_Key_Pressed(Keys_Def[player].button)) 	\
+--- old/src/gens/sdllayer/g_sdlinput.c	2004-05-18 16:46:01.000000000 -0400
++++ new/src/gens/sdllayer/g_sdlinput.c	2006-12-30 12:43:35.000000000 -0500
+@@ -16,7 +16,7 @@
+ unsigned char Keys[1024];
+ 
+ unsigned char Kaillera_Keys[16];
+-unsigned char joystate[0x80 + 0x100 + 0x10 * 3 + 0x4];
++unsigned char joystate[0x530];
+ 
+ struct K_Def Keys_Def[8] = {
+   {SDLK_RETURN, SDLK_RSHIFT,
+@@ -29,7 +29,7 @@
+    SDLK_y, SDLK_h, SDLK_g, SDLK_j}
+ };
+ 
+-SDL_Joystick *joy[2] = { NULL, NULL };
++SDL_Joystick *joy[6] = { NULL, NULL, NULL, NULL, NULL, NULL };
+ 
+ void
+ End_Input ()
+@@ -40,28 +40,32 @@
+ void
+ open_joystick ()
+ {
++  int Cur_Joy = 0;
+   Nb_Joys = 0;
+   SDL_JoystickEventState (SDL_ENABLE);
+-  joy[0] = SDL_JoystickOpen (0);
+-  if (joy[0])
+-    Nb_Joys++;
+-  joy[1] = SDL_JoystickOpen (1);
+-  if (joy[1])
++  
++  while (Cur_Joy < 6)
++    {
++      joy[Cur_Joy] = SDL_JoystickOpen (Cur_Joy);
++      if (joy[Cur_Joy])
+     Nb_Joys++;
++      Cur_Joy++;
++    }
+ }
+ 
+ void
+ close_joystick ()
+ {
+-  if (SDL_JoystickOpened (0))
++  int Cur_Joy = 0;
++  
++  while (Cur_Joy < 6)
+     {
+-      SDL_JoystickClose (joy[0]);
+-      joy[0] = NULL;
+-    }
+-  if (SDL_JoystickOpened (1))
++      if (SDL_JoystickOpened (Cur_Joy))
+     {
+-      SDL_JoystickClose (joy[1]);
+-      joy[1] = NULL;
++          SDL_JoystickClose (joy[Cur_Joy]);
++          joy[Cur_Joy] = NULL;
++        }
++      Cur_Joy++;
+     }
+ }
+ 
+@@ -95,7 +99,7 @@
+     {
+       Num_Joy = ((key >> 8) & 0xF);
+ 
+-      if ((Num_Joy < 2) && joy[Num_Joy])
++      if ((Num_Joy < 6) && joy[Num_Joy])
+ 	{
+ 	  if (key & 0x80)	// Test POV Joys
+ 	    {
+@@ -146,6 +150,46 @@
+ 		  if (joystate[0x100 * Num_Joy + 0x4])
+ 		    return 1;
+ 		  break;
++		  
++		case 5:
++		  if (joystate[0x100 * Num_Joy + 0x5])
++		    return 1;
++		  break;
++
++		case 6:
++		  if (joystate[0x100 * Num_Joy + 0x6])
++		    return 1;
++		  break;
++
++		case 7:
++		  if (joystate[0x100 * Num_Joy + 0x7])
++		    return 1;
++		  break;
++
++		case 8:
++		  if (joystate[0x100 * Num_Joy + 0x8])
++		    return 1;
++		  break;
++		  
++		case 9:
++		  if (joystate[0x100 * Num_Joy + 0x9])
++		    return 1;
++		  break;
++
++		case 10:
++		  if (joystate[0x100 * Num_Joy + 0xA])
++		    return 1;
++		  break;
++
++		case 11:
++		  if (joystate[0x100 * Num_Joy + 0xB])
++		    return 1;
++		  break;
++
++		case 12:
++		  if (joystate[0x100 * Num_Joy + 0xC])
++		    return 1;
++		  break;
+ 		}
+ 	    }
+ 	}
+@@ -437,11 +481,15 @@
+ {
+   GdkEvent *event;
+   SDL_Event sdl_event;
+-  SDL_Joystick *js[2];
++  SDL_Joystick *js[6];
+   SDL_JoystickEventState (SDL_ENABLE);
+ 
+   js[0] = SDL_JoystickOpen (0);
+   js[1] = SDL_JoystickOpen (1);
++  js[2] = SDL_JoystickOpen (2);
++  js[3] = SDL_JoystickOpen (3);
++  js[4] = SDL_JoystickOpen (4);
++  js[5] = SDL_JoystickOpen (5);
+ 
+   while (gtk_events_pending ())
+     gtk_main_iteration ();
+@@ -453,19 +501,73 @@
+ 	  switch (sdl_event.type)
+ 	    {
+ 	    case SDL_JOYAXISMOTION:
+-	      if (sdl_event.jaxis.value < -500)
++	      if (sdl_event.jaxis.value < -10000)
++		{
++		  if (sdl_event.jaxis.axis == 0)
++		    {
++		      return (0x1000 +
++			      (0x100 * sdl_event.jaxis.which + 0x3));
++		    }
++		  else if (sdl_event.jaxis.axis == 1)
++		    {
++		      return (0x1000 +
++			      (0x100 * sdl_event.jaxis.which + 0x1));
++		    }
++		  else if (sdl_event.jaxis.axis == 2)
+ 		{
+ 		  return (0x1000 +
+-			  (0x100 * sdl_event.jaxis.which +
+-			   ((sdl_event.jaxis.axis == 0) ? 0x3 : 0x1)));
++			      (0x100 * sdl_event.jaxis.which + 0x7));
+ 		}
+-	      else if (sdl_event.jaxis.value > 500)
++		  else if (sdl_event.jaxis.axis == 3)
+ 		{
+ 		  return (0x1000 +
+-			  (0x100 * sdl_event.jaxis.which +
+-			   ((sdl_event.jaxis.axis == 0) ? 0x4 : 0x2)));
++			      (0x100 * sdl_event.jaxis.which + 0x5));
+ 		}
+-	      else if (sdl_event.jaxis.value == 0)
++		  else if (sdl_event.jaxis.axis == 4)
++		    {
++		      return (0x1000 +
++			      (0x100 * sdl_event.jaxis.which + 0xB));
++		    }
++		  else if (sdl_event.jaxis.axis == 5)
++		    {
++		      return (0x1000 +
++			      (0x100 * sdl_event.jaxis.which + 0x9));
++		    }
++		}
++	      else if (sdl_event.jaxis.value > 10000)
++		{
++		  if (sdl_event.jaxis.axis == 0)
++		    {
++		      return (0x1000 +
++			      (0x100 * sdl_event.jaxis.which + 0x4));
++		    }
++		  else if (sdl_event.jaxis.axis == 1)
++		    {
++		      return (0x1000 +
++			      (0x100 * sdl_event.jaxis.which + 0x2));
++		    }
++		  else if (sdl_event.jaxis.axis == 2)
++		    {
++		      return (0x1000 +
++			      (0x100 * sdl_event.jaxis.which + 0x8));
++		    }
++		  else if (sdl_event.jaxis.axis == 3)
++		    {
++		      return (0x1000 +
++			      (0x100 * sdl_event.jaxis.which + 0x6));
++		    }
++		  else if (sdl_event.jaxis.axis == 4)
++		    {
++		      return (0x1000 +
++			      (0x100 * sdl_event.jaxis.which + 0xC));
++		    }
++		  else if (sdl_event.jaxis.axis == 5)
++		    {
++		      return (0x1000 +
++			      (0x100 * sdl_event.jaxis.which + 0xA));
++		    }
++		}
++	      else
+ 		{
+ 		  return (Get_Key ());
+ 		}
+--- old/src/gens/util/rom.h	2004-03-14 09:33:06.000000000 -0500
++++ new/src/gens/util/rom.h	2006-12-30 17:30:58.000000000 -0500
+@@ -52,7 +52,7 @@
+ int Detect_Format(char *Name);
+ 
+ int Get_Rom(void);
+-
++int Open_Rom(char *Name);
+ int Pre_Load_Rom(char *Name);
+ int Load_Rom_CC(char *Name, int Size);
+ struct Rom *Load_Bios(char *Name);
+--- old/src/gens/util/rom.c	2004-05-18 16:33:59.000000000 -0400
++++ new/src/gens/util/rom.c	2007-01-05 13:23:45.596482516 -0500
+@@ -99,7 +99,7 @@
+ void
+ Update_Rom_Dir (char *Path)
+ {
+-  Get_Dir_From_Path (Path, Rom_Dir);
++  sprintf (Rom_Dir, "%s", Path);;
+ }
+ 
+ 
+@@ -390,11 +390,10 @@
+   gint res;
+   char Name[2048];
+   gchar *filename;
+-  int sys;
+ 
+   widget =
+     create_file_chooser_dialog ("Open Rom", GTK_FILE_CHOOSER_ACTION_OPEN);
+-//      fileselection_set_dir (fd.filesel, Rom_Dir);
++  gtk_file_chooser_set_filename (GTK_FILE_CHOOSER(widget), Rom_Dir);
+   addRomsFilter (widget);
+   res = gtk_dialog_run (GTK_DIALOG (widget));
+   if (res == GTK_RESPONSE_OK)
+@@ -407,6 +406,15 @@
+   g_free (filename);
+   Free_Rom (Game);
+ 
++  return Open_Rom(Name);
++
++}
++
++int 
++Open_Rom(char *Name)
++{
++  int sys;
++
+   sys = Detect_Format (Name);
+ 
+   if (sys < 1)
+@@ -458,6 +466,7 @@
+       break;
+     }
+   return -1;
++  
+ }
+ 
+ int
+--- old/src/gens/gtkui/glade/interface.c	2004-05-19 15:49:28.000000000 -0400
++++ new/src/gens/gtkui/glade/interface.c	2007-01-03 13:13:28.113596925 -0500
+@@ -1825,7 +1825,7 @@
+   gtk_widget_show (image1);
+   gtk_box_pack_start (GTK_BOX (hbox1), image1, TRUE, TRUE, 0);
+ 
+-  label1 = gtk_label_new ("Gens for Linux\nversion 2.12-rc3\n\nSega Genesis / Megadrive,\nSega CD / Mega CD,\nSega 32X emulator");
++  label1 = gtk_label_new ("Gens for Linux\nversion 2.12-mythgame\n\nSega Genesis / Megadrive,\nSega CD / Mega CD,\nSega 32X emulator");
+   gtk_widget_set_name (label1, "label1");
+   gtk_widget_show (label1);
+   gtk_box_pack_start (GTK_BOX (hbox1), label1, FALSE, FALSE, 0);
diff --git a/games-emulation/gens/gens-2.12b.ebuild b/games-emulation/gens/gens-2.12b.ebuild
new file mode 100644
index 0000000..c81a780
--- /dev/null
+++ b/games-emulation/gens/gens-2.12b.ebuild
@@ -0,0 +1,49 @@
+# v-fox's private overlay: dfx.homeftp.net
+
+inherit flag-o-matic eutils games
+
+DESCRIPTION="A Sega Genesis/CD/32X emulator"
+HOMEPAGE="http://gens.consolemul.com/"
+
+SRC_URI="mirror://sourceforge/gens/gens-rc3.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE="vanilla"
+
+RDEPEND="x86? (	>=x11-libs/gtk+-2.4
+		>=media-libs/libsdl-1.2 )
+	amd64? ( app-emulation/emul-linux-x86-sdl 
+		 app-emulation/emul-linux-x86-gtklibs )"
+DEPEND="${RDEPEND}
+	>=dev-lang/nasm-0.98"
+
+S=${WORKDIR}/GensForLinux
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	if use vanilla; then 
+				epatch \
+				"${FILESDIR}"/${P}-gcc4.patch \
+				"${FILESDIR}"/${P}-romsdir.patch
+		else
+				epatch \
+				"${FILESDIR}"/gens-rc3_to_mythgame.patch
+	fi
+	append-ldflags -Wl,-z,noexecstack
+}
+
+src_compile() {
+	use amd64 && multilib_toolchain_setup x86
+	egamesconf \
+		$(use_enable x86 gtktest) || die # shut up and eat emul-linux-x86-gtklibs
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS BUGS README gens.txt history.txt
+	prepgamesdirs
+}
diff --git a/games-emulation/pcsx2/files/pcsx2-0.9.4-add-nls.patch b/games-emulation/pcsx2/files/pcsx2-0.9.4-add-nls.patch
new file mode 100644
index 0000000..7add9fa
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-0.9.4-add-nls.patch
@@ -0,0 +1,21 @@
+--- configure.ac.old	2008-02-23 22:42:48.751259786 +0000
++++ configure.ac	2008-02-23 22:44:38.140260060 +0000
+@@ -107,7 +107,12 @@
+ AC_CHECK_LIB(stdc++,main,[LIBS="$LIBS -lstdc++"])
+ AC_CHECK_LIB(z,main,[LIBS="$LIBS -lz"])
+ 
+-AC_CHECK_HEADER([libintl.h], [AC_DEFINE(ENABLE_NLS,1,[__x86_64__])])
++AC_ARG_ENABLE(nls, AC_HELP_STRING([--disable-nls], [Disable nls support]),
++ nls=$enableval,nls=yes)
++if test "x$nls" == xyes
++then
++ AC_CHECK_HEADER([libintl.h], [AC_DEFINE(ENABLE_NLS,1,[__x86_64__])])
++fi
+ 
+ AC_OUTPUT([
+  Makefile
+@@ -132,3 +137,4 @@
+ echo "  Force sse3?	           $sse3"
+ echo "  Recompilers enabled?   $recbuild"
+ echo "  Virtual memory build?  $vmbuild"
++echo "  nls support?	       $nls"
diff --git a/games-emulation/pcsx2/files/pcsx2-0.9.4-custom-cflags.patch b/games-emulation/pcsx2/files/pcsx2-0.9.4-custom-cflags.patch
new file mode 100644
index 0000000..7bc8df3
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-0.9.4-custom-cflags.patch
@@ -0,0 +1,34 @@
+--- configure.ac.old	2008-03-02 14:49:49.564590000 +0000
++++ configure.ac	2008-03-02 14:52:53.589590315 +0000
+@@ -11,10 +11,9 @@
+ dnl necessary for compiling assembly
+ AM_PROG_AS
+ 
+-CFLAGS=
+-CPPFLAGS=
+-CXXFLAGS=
+-CCASFLAGS=
++CFLAGS="-O1 -finline-functions ${CFLAGS}"
++CXXFLAGS="-O1 -finline-functions ${CXXFLAGS}"
++CCASFLAGS="-O1 -finline-functions ${CCASFLAGS}"
+ 
+ dnl Check for debug build
+ AC_MSG_CHECKING(debug build)
+@@ -23,16 +22,10 @@
+ if test "x$debug" == xyes
+ then
+  AC_DEFINE(_DEBUG,1,[_DEBUG])
+- CFLAGS+=" -g "
+- CPPFLAGS+=" -g "
+- CXXFLAGS+=" -g "
+- CCASFLAGS+=" -D_DEBUG -g "
++ CCASFLAGS+=" -D_DEBUG "
+  MYOBJDIR="Debug"
+ else
+  AC_DEFINE(NDEBUG,1,[NDEBUG])
+- CFLAGS+=" -O3 -fomit-frame-pointer "
+- CPPFLAGS+=" -O3 -fomit-frame-pointer "
+- CXXFLAGS+=" -O3 -fomit-frame-pointer "
+  MYOBJDIR="Release"
+ fi
+ AC_MSG_RESULT($debug)
diff --git a/games-emulation/pcsx2/files/pcsx2-0.9.4-plugin-inis.patch b/games-emulation/pcsx2/files/pcsx2-0.9.4-plugin-inis.patch
new file mode 100644
index 0000000..93d3155
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-0.9.4-plugin-inis.patch
@@ -0,0 +1,15 @@
+--- Linux.old/GtkGui.c	2007-11-19 07:21:55.000000000 +0000
++++ Linux/GtkGui.c	2008-02-25 11:57:37.167773962 +0000
+@@ -723,12 +723,9 @@
+     strcpy(file, Config.PluginsDir); \

+ 	strcat(file, plugin); \

+ 	drv = SysLoadLibrary(file); \

+-    getcwd(file, ARRAYSIZE(file)); /* store current dir */  \

+-    chdir(Config.PluginsDir); /* change dirs so that plugins can find their config file*/  \

+ 	if (drv == NULL) return; \

+ 	conf = (src) SysLoadSym(drv, name); \

+ 	if (SysLibError() == NULL) conf(); \

+-    chdir(file); /* change back*/       \

+     SysCloseLibrary(drv);

+ 

+ #define TestPlugin(src, confs, plugin, name) \

diff --git a/games-emulation/pcsx2/files/pcsx2-add-nls.patch b/games-emulation/pcsx2/files/pcsx2-add-nls.patch
new file mode 100644
index 0000000..7add9fa
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-add-nls.patch
@@ -0,0 +1,21 @@
+--- configure.ac.old	2008-02-23 22:42:48.751259786 +0000
++++ configure.ac	2008-02-23 22:44:38.140260060 +0000
+@@ -107,7 +107,12 @@
+ AC_CHECK_LIB(stdc++,main,[LIBS="$LIBS -lstdc++"])
+ AC_CHECK_LIB(z,main,[LIBS="$LIBS -lz"])
+ 
+-AC_CHECK_HEADER([libintl.h], [AC_DEFINE(ENABLE_NLS,1,[__x86_64__])])
++AC_ARG_ENABLE(nls, AC_HELP_STRING([--disable-nls], [Disable nls support]),
++ nls=$enableval,nls=yes)
++if test "x$nls" == xyes
++then
++ AC_CHECK_HEADER([libintl.h], [AC_DEFINE(ENABLE_NLS,1,[__x86_64__])])
++fi
+ 
+ AC_OUTPUT([
+  Makefile
+@@ -132,3 +137,4 @@
+ echo "  Force sse3?	           $sse3"
+ echo "  Recompilers enabled?   $recbuild"
+ echo "  Virtual memory build?  $vmbuild"
++echo "  nls support?	       $nls"
diff --git a/games-emulation/pcsx2/files/pcsx2-custom-cflags.patch b/games-emulation/pcsx2/files/pcsx2-custom-cflags.patch
new file mode 100644
index 0000000..7bc8df3
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-custom-cflags.patch
@@ -0,0 +1,34 @@
+--- configure.ac.old	2008-03-02 14:49:49.564590000 +0000
++++ configure.ac	2008-03-02 14:52:53.589590315 +0000
+@@ -11,10 +11,9 @@
+ dnl necessary for compiling assembly
+ AM_PROG_AS
+ 
+-CFLAGS=
+-CPPFLAGS=
+-CXXFLAGS=
+-CCASFLAGS=
++CFLAGS="-O1 -finline-functions ${CFLAGS}"
++CXXFLAGS="-O1 -finline-functions ${CXXFLAGS}"
++CCASFLAGS="-O1 -finline-functions ${CCASFLAGS}"
+ 
+ dnl Check for debug build
+ AC_MSG_CHECKING(debug build)
+@@ -23,16 +22,10 @@
+ if test "x$debug" == xyes
+ then
+  AC_DEFINE(_DEBUG,1,[_DEBUG])
+- CFLAGS+=" -g "
+- CPPFLAGS+=" -g "
+- CXXFLAGS+=" -g "
+- CCASFLAGS+=" -D_DEBUG -g "
++ CCASFLAGS+=" -D_DEBUG "
+  MYOBJDIR="Debug"
+ else
+  AC_DEFINE(NDEBUG,1,[NDEBUG])
+- CFLAGS+=" -O3 -fomit-frame-pointer "
+- CPPFLAGS+=" -O3 -fomit-frame-pointer "
+- CXXFLAGS+=" -O3 -fomit-frame-pointer "
+  MYOBJDIR="Release"
+ fi
+ AC_MSG_RESULT($debug)
diff --git a/games-emulation/pcsx2/files/pcsx2-gcc43.patch b/games-emulation/pcsx2/files/pcsx2-gcc43.patch
new file mode 100644
index 0000000..34b89b8
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-gcc43.patch
@@ -0,0 +1,12 @@
+diff -Nur pcsx2.orig/GS.cpp pcsx2/GS.cpp
+--- pcsx2.orig/GS.cpp	2008-06-03 14:26:12.000000000 +0200
++++ pcsx2/GS.cpp	2008-06-03 14:29:17.000000000 +0200
+@@ -28,6 +28,8 @@
+ 
+ #include <vector>
+ #include <list>
++#include <cstring>
++#include <cstdlib>
+ 
+ using namespace std;
+ 
diff --git a/games-emulation/pcsx2/files/pcsx2-plugin-inis.patch b/games-emulation/pcsx2/files/pcsx2-plugin-inis.patch
new file mode 100644
index 0000000..93d3155
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-plugin-inis.patch
@@ -0,0 +1,15 @@
+--- Linux.old/GtkGui.c	2007-11-19 07:21:55.000000000 +0000
++++ Linux/GtkGui.c	2008-02-25 11:57:37.167773962 +0000
+@@ -723,12 +723,9 @@
+     strcpy(file, Config.PluginsDir); \

+ 	strcat(file, plugin); \

+ 	drv = SysLoadLibrary(file); \

+-    getcwd(file, ARRAYSIZE(file)); /* store current dir */  \

+-    chdir(Config.PluginsDir); /* change dirs so that plugins can find their config file*/  \

+ 	if (drv == NULL) return; \

+ 	conf = (src) SysLoadSym(drv, name); \

+ 	if (SysLibError() == NULL) conf(); \

+-    chdir(file); /* change back*/       \

+     SysCloseLibrary(drv);

+ 

+ #define TestPlugin(src, confs, plugin, name) \

diff --git a/games-emulation/pcsx2/pcsx2-0.9.4.ebuild b/games-emulation/pcsx2/pcsx2-0.9.4.ebuild
new file mode 100644
index 0000000..904150d
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-0.9.4.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit games autotools eutils flag-o-matic
+
+DESCRIPTION="PlayStation2 emulator"
+HOMEPAGE="http://www.pcsx2.net/"
+SRC_URI="mirror://sourceforge/pcsx2/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug devbuild nls oss vmbuild"
+
+CDEPEND="sys-libs/zlib
+	>=x11-libs/gtk+-2"
+
+DEPEND="${CDEPEND}
+	x11-proto/xproto"
+
+RDEPEND="${CDEPEND}
+	games-emulation/ps2emu-zerogs
+	games-emulation/ps2emu-zeropad
+	games-emulation/ps2emu-cdvdnull
+	games-emulation/ps2emu-dev9null
+	games-emulation/ps2emu-spu2null
+	games-emulation/ps2emu-fwnull
+	>=games-emulation/ps2emu-usbnull-0.4-r1
+	alsa? ( games-emulation/ps2emu-peopsspu2 )
+	oss? ( games-emulation/ps2emu-peopsspu2 )"
+
+LANGS="ar bg cz de du el es fr hb it ja pe pl po po_BR ro ru sh sw tc tr"
+
+for i in ${LANGS}; do
+	IUSE="${IUSE} linguas_${i}"
+done
+
+S="${WORKDIR}/${P}/${PN}"
+
+pkg_setup() {
+	local x
+
+	if ! use nls; then
+		for x in ${LANGS}; do
+			if [ -n "$(usev linguas_${x})" ]; then
+				eerror "Any language other than English is not supported with USE=\"-nls\""
+				die "Language ${x} not supported with USE=\"-nls\""
+			fi
+		done
+	fi
+
+	if use vmbuild; then
+		ewarn "Warning: Compilation is known to fail with the vmbuild use flag"
+		ewarn "enabled. The recommended use flags are USE=\"sse2 -vmbuild\"."
+		ewarn "Do not file a bug unless you are using the above USE flags."
+		ewarn "If you can get it to compile however, please file a bug or "
+		ewarn "contact me at eatnumber1@gmail.com. (i'll give you a cookie)"
+		ebeep 5
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Preserve custom CFLAGS passed to configure.
+	epatch "${FILESDIR}"/${PN}-custom-cflags.patch
+
+	# Add nls support to the configure script.
+	epatch "${FILESDIR}"/${PN}-add-nls.patch
+
+	# Allow plugin inis to be stored in ~/.pcsx2/inis.
+	epatch "${FILESDIR}"/${PN}-plugin-inis.patch
+
+	epatch "${FILESDIR}"/${PN}-gcc43.patch
+
+	eautoreconf -v --install || die
+}
+
+src_compile() {
+	local myconf
+	filter-flags -O0
+	
+	if ! use x86 && ! use amd64; then
+		einfo "Recompiler not supported on this architecture. Disabling."
+		myconf=" --disable-recbuild"
+	fi
+	
+	egamesconf  \
+		$(use_enable devbuild) \
+		$(use_enable debug) \
+		$(use_enable nls) \
+		$(use_enable vmbuild) \
+		${myconf} \
+		|| die
+
+	emake || die
+}
+
+src_install() {
+	local x
+
+	keepdir "`games_get_libdir`/ps2emu/plugins"
+	dodoc Docs/*.txt || die "dodoc failed"
+	newgamesbin Linux/${PN} ${PN}.bin || die
+
+	sed \
+		-e "s:%GAMES_BINDIR%:${GAMES_BINDIR}:" \
+		-e "s:%GAMES_DATADIR%:${GAMES_DATADIR}:" \
+		-e "s:%GAMES_LIBDIR%:`games_get_libdir`:" \
+		"${FILESDIR}/${PN}" > "${D}${GAMES_BINDIR}/${PN}" || die
+
+	cd ../bin
+	dohtml -r compat_list/* || die
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r *.xml .pixmaps patches || die
+	insinto "${GAMES_DATADIR}/${PN}/Langs"
+
+	for x in ${LANGS}; do
+		if use linguas_${x}; then
+			[[ "${x/_/}" == "${x}" ]] && x=${x}_`echo ${x} | tr 'a-z' 'A-Z'`
+			doins -r Langs/${x} || die "doins for language ${x} failed"
+		fi
+	done
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	if ! use devbuild; then
+		ewarn "If this package exhibits random crashes, recompile ${PN}"
+		ewarn "with the devbuild use flag enabled. If that fixes it, file a bug."
+		echo
+	fi
+
+	elog "Please note that this ebuild does not install all the available plugins."
+	elog "You will need to install other ps2emu plugins in order for the emulator"
+	elog "to be usable."
+}
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
new file mode 100644
index 0000000..3a28c63
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+ESVN_REPO_URI="https://pcsx2.svn.sourceforge.net/svnroot/${PN}/${PN}"
+inherit games autotools eutils flag-o-matic subversion
+
+DESCRIPTION="PlayStation2 emulator"
+HOMEPAGE="http://www.pcsx2.net/"
+SVN_PCSX2_BINDIR="https://pcsx2.svn.sourceforge.net/svnroot/${PN}/bin"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="alsa debug devbuild nls oss vmbuild"
+
+CDEPEND="sys-libs/zlib
+	>=x11-libs/gtk+-2"
+
+DEPEND="${CDEPEND}
+	x11-proto/xproto"
+
+RDEPEND="${CDEPEND}
+	games-emulation/ps2emu-zerogs
+	games-emulation/ps2emu-zeropad
+	games-emulation/ps2emu-cdvdnull
+	games-emulation/ps2emu-dev9null
+	games-emulation/ps2emu-spu2null
+	games-emulation/ps2emu-fwnull
+	>=games-emulation/ps2emu-usbnull-0.4-r1
+	alsa? ( games-emulation/ps2emu-peopsspu2 )
+	oss? ( games-emulation/ps2emu-peopsspu2 )"
+
+LANGS="ar bg cz de du el es fr hb it ja pe pl po po_BR ro ru sh sw tc tr"
+
+for i in ${LANGS}; do
+	IUSE="${IUSE} linguas_${i}"
+done
+
+S="${WORKDIR}/${P}/${PN}"
+
+pkg_setup() {
+	local x
+
+	if ! use nls; then
+		for x in ${LANGS}; do
+			if [ -n "$(usev linguas_${x})" ]; then
+				eerror "Any language other than English is not supported with USE=\"-nls\""
+				die "Language ${x} not supported with USE=\"-nls\""
+			fi
+		done
+	fi
+
+	if use vmbuild; then
+		ewarn "Warning: Compilation is known to fail with the vmbuild use flag"
+		ewarn "enabled. The recommended use flags are USE=\"sse2 -vmbuild\"."
+		ewarn "Do not file a bug unless you are using the above USE flags."
+		ewarn "If you can get it to compile however, please file a bug or "
+		ewarn "contact me at eatnumber1@gmail.com. (i'll give you a cookie)"
+		ebeep 5
+	fi
+}
+
+src_unpack() {
+	subversion_src_unpack
+	subversion_fetch ${SVN_PCSX2_BINDIR} "../bin"
+	cd "${S}"
+
+	# Preserve custom CFLAGS passed to configure.
+	epatch "${FILESDIR}"/${PN}-custom-cflags.patch
+
+	# Add nls support to the configure script.
+	epatch "${FILESDIR}"/${PN}-add-nls.patch
+
+	# Allow plugin inis to be stored in ~/.pcsx2/inis.
+	epatch "${FILESDIR}"/${PN}-plugin-inis.patch
+
+	epatch "${FILESDIR}"/${PN}-gcc43.patch
+
+	eautoreconf -v --install || die
+}
+
+src_compile() {
+	local myconf
+	filter-flags -O0
+	
+	if ! use x86 && ! use amd64; then
+		einfo "Recompiler not supported on this architecture. Disabling."
+		myconf=" --disable-recbuild"
+	fi
+	
+	egamesconf  \
+		$(use_enable devbuild) \
+		$(use_enable debug) \
+		$(use_enable nls) \
+		$(use_enable vmbuild) \
+		${myconf} \
+		|| die
+
+	emake || die
+}
+
+src_install() {
+	local x
+
+	keepdir "$(games_get_libdir)/ps2emu/plugins"
+	dodoc Docs/*.txt || die "dodoc failed"
+	newgamesbin Linux/${PN} ${PN}.bin || die
+
+	sed \
+		-e "s:%GAMES_BINDIR%:${GAMES_BINDIR}:" \
+		-e "s:%GAMES_DATADIR%:${GAMES_DATADIR}:" \
+		-e "s:%GAMES_LIBDIR%:$(games_get_libdir):" \
+		"${FILESDIR}/${PN}" > "${D}${GAMES_BINDIR}/${PN}" || die
+
+	cd ../bin
+	dohtml -r compat_list/* || die
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r *.xml .pixmaps patches || die
+	insinto "${GAMES_DATADIR}/${PN}/Langs"
+
+	for x in ${LANGS}; do
+		if use linguas_${x}; then
+			[[ "${x/_/}" == "${x}" ]] && x=${x}_$(echo ${x} | tr 'a-z' 'A-Z')
+			doins -r Langs/${x} || die "doins for language ${x} failed"
+		fi
+	done
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	if ! use devbuild; then
+		ewarn "If this package exhibits random crashes, recompile ${PN}"
+		ewarn "with the devbuild use flag enabled. If that fixes it, file a bug."
+		echo
+	fi
+
+	elog "Please note that this ebuild does not install all the available plugins."
+	elog "You will need to install other ps2emu plugins in order for the emulator"
+	elog "to be usable."
+}
diff --git a/games-emulation/ps2emu-cdvdiso/ps2emu-cdvdiso-0.7.ebuild b/games-emulation/ps2emu-cdvdiso/ps2emu-cdvdiso-0.7.ebuild
new file mode 100644
index 0000000..e0ad8c0
--- /dev/null
+++ b/games-emulation/ps2emu-cdvdiso/ps2emu-cdvdiso-0.7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit games
+
+PCSX2="pcsx2-0.9.4"
+
+DESCRIPTION="PS2Emu ISO CDVD plugin"
+HOMEPAGE="http://www.pcsx2.net/"
+SRC_URI="mirror://sourceforge/pcsx2/${PCSX2}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-arch/bzip2
+	sys-libs/zlib
+	>=x11-libs/gtk+-2"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PCSX2}/plugins/cdvd/CDVDiso/src/Linux"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	
+	sed -i \
+		-e '/^CC =/d' \
+		-e '/\bstrip\b/d' \
+		-e 's/-g\b//g' \
+		-e 's/CFLAGS =/CFLAGS +=/' \
+		Makefile || die
+}
+
+src_install() {
+	exeinto "`games_get_libdir`/ps2emu/plugins"
+	newexe libCDVDiso.so libCDVDiso.so.${PV} || die
+	exeinto "`games_get_libdir`/ps2emu/plugins/cfg"
+	doexe cfgCDVDiso || die
+	dodoc ../../ReadMe.txt || die
+	prepgamesdirs
+}
diff --git a/games-emulation/ps2emu-cdvdiso/ps2emu-cdvdiso-9999.ebuild b/games-emulation/ps2emu-cdvdiso/ps2emu-cdvdiso-9999.ebuild
new file mode 100644
index 0000000..ba732c2
--- /dev/null
+++ b/games-emulation/ps2emu-cdvdiso/ps2emu-cdvdiso-9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+ESVN_REPO_URI="https://pcsx2.svn.sourceforge.net/svnroot/pcsx2/plugins/cdvd/CDVDiso"
+inherit eutils games subversion
+
+DESCRIPTION="PS2Emu ISO CDVD plugin"
+HOMEPAGE="http://www.pcsx2.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc"
+
+DEPEND=">=app-arch/bzip2-1.0.0
+	>=sys-libs/zlib-1.1.3
+	>=x11-libs/gtk+-1.2.5"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/CDVDiso"
+
+src_unpack() {
+	subversion_src_unpack
+	S="${S}/src/Linux"
+	cd "${S}"
+	
+	sed -i \
+		-e '/^CC =/d' \
+		-e '/\bstrip\b/d' \
+		-e 's/-g\b//g' \
+		-e 's/CFLAGS =/CFLAGS +=/' \
+		Makefile || die
+}
+
+src_install() {
+	exeinto "$(games_get_libdir)/ps2emu/plugins"
+	doexe libCDVDiso.so || die
+	exeinto "$(games_get_libdir)/ps2emu/plugins/cfg"
+	doexe cfgCDVDiso || die
+	use doc && dodoc ../../ReadMe.txt || die
+	prepgamesdirs
+}
diff --git a/games-emulation/ps2emu-cdvdlinuz/ps2emu-cdvdlinuz-0.4.ebuild b/games-emulation/ps2emu-cdvdlinuz/ps2emu-cdvdlinuz-0.4.ebuild
new file mode 100644
index 0000000..d533fb7
--- /dev/null
+++ b/games-emulation/ps2emu-cdvdlinuz/ps2emu-cdvdlinuz-0.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit games
+
+PCSX2="pcsx2-0.9.4"
+
+DESCRIPTION="PS2Emu CDVD plugin"
+HOMEPAGE="http://www.pcsx2.net/"
+SRC_URI="mirror://sourceforge/pcsx2/${PCSX2}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-arch/bzip2
+	sys-libs/zlib
+	>=x11-libs/gtk+-2"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PCSX2}/plugins/cdvd/CDVDlinuz/Src/Linux"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	
+	sed -i \
+		-e '/^CC =/d' \
+		-e '/\bstrip\b/d' \
+		-e 's/-O[0-9]\b//g' \
+		-e 's/-fomit-frame-pointer\b//g' \
+		-e 's/-fPIC/$(CFLAGS) -fPIC/g' \
+		Makefile || die
+}
+
+src_install() {
+	exeinto "`games_get_libdir`/ps2emu/plugins"
+	newexe libCDVDlinuz.so libCDVDlinuz.so.${PV} || die
+	exeinto "`games_get_libdir`/ps2emu/plugins/cfg"
+	doexe cfgCDVDlinuz || die
+	dodoc ../../readme.txt ../../ChangeLog.txt || die
+	prepgamesdirs
+}
diff --git a/games-emulation/ps2emu-cdvdlinuz/ps2emu-cdvdlinuz-9999.ebuild b/games-emulation/ps2emu-cdvdlinuz/ps2emu-cdvdlinuz-9999.ebuild
new file mode 100644
index 0000000..c02b4af
--- /dev/null
+++ b/games-emulation/ps2emu-cdvdlinuz/ps2emu-cdvdlinuz-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+ESVN_REPO_URI="https://pcsx2.svn.sourceforge.net/svnroot/pcsx2/plugins/cdvd/CDVDlinuz"
+inherit eutils games subversion
+
+DESCRIPTION="PS2Emu CDVD plugin"
+HOMEPAGE="http://www.pcsx2.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc"
+
+DEPEND="app-arch/bzip2
+	sys-libs/zlib
+	>=x11-libs/gtk+-2"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/CDVDlinuz"
+
+src_unpack() {
+	subversion_src_unpack
+	S="${S}/Src/Linux"
+	cd "${S}"
+	
+	sed -i \
+		-e '/^CC =/d' \
+		-e '/\bstrip\b/d' \
+		-e 's/-O[0-9]\b//g' \
+		-e 's/-fomit-frame-pointer\b//g' \
+		-e 's/-fPIC/$(CFLAGS) -fPIC/g' \
+		Makefile || die
+}
+
+src_install() {
+	exeinto "$(games_get_libdir)/ps2emu/plugins"
+	doexe libCDVDlinuz.so || die
+	exeinto "$(games_get_libdir)/ps2emu/plugins/cfg"
+	doexe cfgCDVDlinuz || die
+	use doc && dodoc ../../readme.txt ../../ChangeLog.txt || die
+	prepgamesdirs
+}
diff --git a/games-emulation/ps2emu-cdvdnull/ps2emu-cdvdnull-0.6.ebuild b/games-emulation/ps2emu-cdvdnull/ps2emu-cdvdnull-0.6.ebuild
new file mode 100644
index 0000000..473c63b
--- /dev/null
+++ b/games-emulation/ps2emu-cdvdnull/ps2emu-cdvdnull-0.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit games
+
+PCSX2="pcsx2-0.9.4"
+
+DESCRIPTION="PS2Emu null CDVD plugin"
+HOMEPAGE="http://www.pcsx2.net/"
+SRC_URI="mirror://sourceforge/pcsx2/${PCSX2}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${PCSX2}/plugins/cdvd/CDVDnull/Src"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	
+	sed -i \
+		-e '/^CC =/d' \
+		-e '/\${STRIP}/d' \
+		-e 's/-O[0-9]\b//g' \
+		-e 's/-fomit-frame-pointer\b//g' \
+		-e 's/-ffast-math\b//g' \
+		-e "s/^OPTIMIZE = /OPTIMIZE = ${CFLAGS} /" \
+		Makefile || die
+}
+
+src_install() {
+	exeinto "`games_get_libdir`/ps2emu/plugins"
+	newexe libCDVDnull.so libCDVDnull.so.${PV} || die
+	dodoc ../ReadMe.txt || die
+	prepgamesdirs
+}
diff --git a/games-emulation/ps2emu-cdvdnull/ps2emu-cdvdnull-9999.ebuild b/games-emulation/ps2emu-cdvdnull/ps2emu-cdvdnull-9999.ebuild
new file mode 100644
index 0000000..871efde
--- /dev/null
+++ b/games-emulation/ps2emu-cdvdnull/ps2emu-cdvdnull-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+ESVN_REPO_URI="https://pcsx2.svn.sourceforge.net/svnroot/pcsx2/plugins/cdvd/CDVDnull"
+inherit eutils games subversion
+
+DESCRIPTION="PS2Emu null CDVD plugin"
+HOMEPAGE="http://www.pcsx2.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/CDVDnull"
+
+src_unpack() {
+	subversion_src_unpack
+	S="${S}/Src"
+	cd "${S}"
+	
+	sed -i \
+		-e '/^CC =/d' \
+		-e '/\${STRIP}/d' \
+		-e 's/-O[0-9]\b//g' \
+		-e 's/-fomit-frame-pointer\b//g' \
+		-e 's/-ffast-math\b//g' \
+		-e "s/^OPTIMIZE = /OPTIMIZE = ${CFLAGS} /" \
+		Makefile || die
+}
+
+src_install() {
+	exeinto "$(games_get_libdir)/ps2emu/plugins"
+	doexe libCDVDnull.so || die
+	use doc && dodoc ../ReadMe.txt || die
+	prepgamesdirs
+}
diff --git a/games-emulation/ps2emu-dev9null/ps2emu-dev9null-0.3.ebuild b/games-emulation/ps2emu-dev9null/ps2emu-dev9null-0.3.ebuild
new file mode 100644
index 0000000..55ebd64
--- /dev/null
+++ b/games-emulation/ps2emu-dev9null/ps2emu-dev9null-0.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit games
+
+PCSX2="pcsx2-0.9.4"
+
+DESCRIPTION="PS2Emu null DEV9 plugin"
+HOMEPAGE="http://www.pcsx2.net/"
+SRC_URI="mirror://sourceforge/pcsx2/${PCSX2}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${PCSX2}/plugins/dev9/dev9null/src"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	
+	sed -i \
+		-e '/^CC =/d' \
+		-e '/\bstrip\b/d' \
+		-e 's/-O[0-9]\b//g' \
+		-e 's/-fomit-frame-pointer\b//g' \
+		Makefile || die
+}
+
+src_install() {
+	exeinto "`games_get_libdir`/ps2emu/plugins"
+	newexe libDEV9null.so libDEV9null.so.${PV} || die
+	dodoc ../ReadMe.txt || die
+	prepgamesdirs
+}
diff --git a/games-emulation/ps2emu-dev9null/ps2emu-dev9null-9999.ebuild b/games-emulation/ps2emu-dev9null/ps2emu-dev9null-9999.ebuild
new file mode 100644
index 0000000..080bc55
--- /dev/null
+++ b/games-emulation/ps2emu-dev9null/ps2emu-dev9null-9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+ESVN_REPO_URI="https://pcsx2.svn.sourceforge.net/svnroot/pcsx2/plugins/dev9/dev9null"
+inherit eutils games subversion
+
+DESCRIPTION="PS2Emu null DEV9 plugin"
+HOMEPAGE="http://www.pcsx2.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/dev9null"
+
+src_unpack() {
+	subversion_src_unpack
+	S="${S}/src"
+	cd "${S}"
+	
+	sed -i \
+		-e '/^CC =/d' \
+		-e '/\bstrip\b/d' \
+		-e 's/-O[0-9]\b//g' \
+		-e 's/-fomit-frame-pointer\b//g' \
+		Makefile || die
+}
+
+src_install() {
+	exeinto "$(games_get_libdir)/ps2emu/plugins"
+	doexe libDEV9null.so || die
+	use doc && dodoc ../ReadMe.txt || die
+	prepgamesdirs
+}
diff --git a/games-emulation/ps2emu-fwnull/ps2emu-fwnull-0.4.ebuild b/games-emulation/ps2emu-fwnull/ps2emu-fwnull-0.4.ebuild
new file mode 100644
index 0000000..4216282
--- /dev/null
+++ b/games-emulation/ps2emu-fwnull/ps2emu-fwnull-0.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit games
+
+PCSX2="pcsx2-0.9.4"
+
+DESCRIPTION="PS2Emu null FireWire plugin"
+HOMEPAGE="http://www.pcsx2.net/"
+SRC_URI="mirror://sourceforge/pcsx2/${PCSX2}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=x11-libs/gtk+-2"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PCSX2}/plugins/fw/FWnull/Linux"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	
+	sed -i \
+		-e '/^CC =/d' \
+		-e '/\bstrip\b/d' \
+		-e 's/-O[0-9]\b//g' \
+		-e 's/-fomit-frame-pointer\b//g' \
+		Makefile || die
+}
+
+src_install() {
+	exeinto "`games_get_libdir`/ps2emu/plugins"
+	newexe libFWnull.so libFWnull.so.${PV} || die
+	exeinto "`games_get_libdir`/ps2emu/plugins/cfg"
+	doexe cfgFWnull || die
+	dodoc ../ReadMe.txt || die
+	prepgamesdirs
+}
diff --git a/games-emulation/ps2emu-fwnull/ps2emu-fwnull-9999.ebuild b/games-emulation/ps2emu-fwnull/ps2emu-fwnull-9999.ebuild
new file mode 100644
index 0000000..b68493e
--- /dev/null
+++ b/games-emulation/ps2emu-fwnull/ps2emu-fwnull-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+ESVN_REPO_URI="https://pcsx2.svn.sourceforge.net/svnroot/pcsx2/plugins/fw/FWnull"
+inherit eutils games subversion
+
+DESCRIPTION="PS2Emu null FireWire plugin"
+HOMEPAGE="http://www.pcsx2.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc"
+
+DEPEND=">=x11-libs/gtk+-2"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/FWnull"
+
+src_unpack() {
+	subversion_src_unpack
+	S="${S}/Linux"
+	cd "${S}"
+	
+	sed -i \
+		-e '/^CC =/d' \
+		-e '/\bstrip\b/d' \
+		-e 's/-O[0-9]\b//g' \
+		-e 's/-fomit-frame-pointer\b//g' \
+		Makefile || die
+}
+
+src_install() {
+	exeinto "$(games_get_libdir)/ps2emu/plugins"
+	doexe libFWnull.so || die
+	exeinto "$(games_get_libdir)/ps2emu/plugins/cfg"
+	doexe cfgFWnull || die
+	use doc && dodoc ../ReadMe.txt || die
+	prepgamesdirs
+}
diff --git a/games-emulation/ps2emu-peopsspu2/ps2emu-peopsspu2-1.9.0.ebuild b/games-emulation/ps2emu-peopsspu2/ps2emu-peopsspu2-1.9.0.ebuild
new file mode 100644
index 0000000..a13e59e
--- /dev/null
+++ b/games-emulation/ps2emu-peopsspu2/ps2emu-peopsspu2-1.9.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit games
+
+PCSX2="pcsx2-0.9.4"
+
+DESCRIPTION="P.E.Op.S PS2Emu sound plugin"
+HOMEPAGE="http://www.pcsx2.net/"
+SRC_URI="mirror://sourceforge/pcsx2/${PCSX2}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa oss"
+
+DEPEND="alsa? ( media-libs/alsa-lib )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PCSX2}/plugins/spu2/PeopsSPU2"
+
+pkg_setup() {
+	if ! use oss && ! use alsa; then
+		die "Either the alsa or oss USE flag must be enabled!"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i \
+		-e '/^CC =/d' \
+		-e '/\bstrip\b/d' \
+		-e 's/-O[0-9]\b//g' \
+		-e 's/-fomit-frame-pointer\b//g' \
+		-e 's/-ffast-math\b//g' \
+		-e 's/CCFLAGS3 =/CCFLAGS3 = $(CFLAGS)/' \
+		Makefile || die
+}
+
+src_compile() {
+	if use oss; then
+		sed -i 's/USEALSA = .*$/USEALSA = FALSE/' Makefile
+		emake || die
+	fi
+
+	if use alsa; then
+		sed -i 's/USEALSA = .*$/USEALSA = TRUE/' Makefile
+		emake || die
+	fi
+}
+
+src_install() {
+	exeinto "`games_get_libdir`/ps2emu/plugins"
+
+	if use oss; then
+		newexe libspu2PeopsOSS.so.* libspu2PeopsOSS.so.${PV} || die
+	fi
+	
+	if use alsa; then
+		newexe libspu2PeopsALSA.so.* libspu2PeopsALSA.so.${PV} || die
+	fi
+	
+	prepgamesdirs
+}
diff --git a/games-emulation/ps2emu-peopsspu2/ps2emu-peopsspu2-9999.ebuild b/games-emulation/ps2emu-peopsspu2/ps2emu-peopsspu2-9999.ebuild
new file mode 100644
index 0000000..3dc0589
--- /dev/null
+++ b/games-emulation/ps2emu-peopsspu2/ps2emu-peopsspu2-9999.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+ESVN_REPO_URI="https://pcsx2.svn.sourceforge.net/svnroot/pcsx2/plugins/spu2/PeopsSPU2"
+inherit eutils games subversion
+
+DESCRIPTION="P.E.Op.S PS2Emu sound plugin"
+HOMEPAGE="http://www.pcsx2.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="alsa oss"
+
+DEPEND="alsa? ( media-libs/alsa-lib )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/PeopsSPU2"
+
+pkg_setup() {
+	if ! use oss && ! use alsa; then
+		die "Either the alsa or oss USE flag must be enabled!"
+	fi
+}
+
+src_unpack() {
+	subversion_src_unpack
+	cd "${S}"
+
+	sed -i \
+		-e '/^CC =/d' \
+		-e '/\bstrip\b/d' \
+		-e 's/-O[0-9]\b//g' \
+		-e 's/-fomit-frame-pointer\b//g' \
+		-e 's/-ffast-math\b//g' \
+		-e 's/CCFLAGS3 =/CCFLAGS3 = $(CFLAGS)/' \
+		Makefile || die
+}
+
+src_compile() {
+	if use oss; then
+		sed -i 's/USEALSA = .*$/USEALSA = FALSE/' Makefile
+		emake || die
+	fi
+
+	if use alsa; then
+		sed -i 's/USEALSA = .*$/USEALSA = TRUE/' Makefile
+		emake || die
+	fi
+}
+
+src_install() {
+	exeinto "$(games_get_libdir)/ps2emu/plugins"
+
+	if use oss; then
+		doexe libspu2PeopsOSS.so.* || die
+	fi
+	
+	if use alsa; then
+		doexe libspu2PeopsALSA.so.*|| die
+	fi
+	
+	prepgamesdirs
+}
diff --git a/games-emulation/ps2emu-spu2null/ps2emu-spu2null-0.7.1.ebuild b/games-emulation/ps2emu-spu2null/ps2emu-spu2null-0.7.1.ebuild
new file mode 100644
index 0000000..28490d0
--- /dev/null
+++ b/games-emulation/ps2emu-spu2null/ps2emu-spu2null-0.7.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit games
+
+PCSX2="pcsx2-0.9.4"
+
+DESCRIPTION="PS2Emu null sound plugin"
+HOMEPAGE="http://www.pcsx2.net/"
+SRC_URI="mirror://sourceforge/pcsx2/${PCSX2}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=x11-libs/gtk+-2"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PCSX2}/plugins/spu2/SPU2null/Src"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	
+	sed -i \
+		-e '/^CC =/d' \
+		-e '/\bstrip\b/d' \
+		-e 's/-O[0-9]\b//g' \
+		-e 's/-fomit-frame-pointer\b//g' \
+		Makefile || die
+}
+
+src_install() {
+	exeinto "`games_get_libdir`/ps2emu/plugins"
+	newexe libSPU2null.so libSPU2null.so.${PV} || die
+	dodoc ../ReadMe.txt Changelog.txt || die
+	prepgamesdirs
+}
diff --git a/games-emulation/ps2emu-spu2null/ps2emu-spu2null-9999.ebuild b/games-emulation/ps2emu-spu2null/ps2emu-spu2null-9999.ebuild
new file mode 100644
index 0000000..5885bbd
--- /dev/null
+++ b/games-emulation/ps2emu-spu2null/ps2emu-spu2null-9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+ESVN_REPO_URI="https://pcsx2.svn.sourceforge.net/svnroot/pcsx2/plugins/spu2/SPU2null"
+inherit eutils games subversion
+
+DESCRIPTION="PS2Emu null sound plugin"
+HOMEPAGE="http://www.pcsx2.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc"
+
+DEPEND=">=x11-libs/gtk+-2"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PCSX2}/SPU2null"
+
+src_unpack() {
+	subversion_src_unpack
+	S="${S}/Src"
+	cd "${S}"
+	
+	sed -i \
+		-e '/^CC =/d' \
+		-e '/\bstrip\b/d' \
+		-e 's/-O[0-9]\b//g' \
+		-e 's/-fomit-frame-pointer\b//g' \
+		Makefile || die
+}
+
+src_install() {
+	exeinto "$(games_get_libdir)/ps2emu/plugins"
+	doexe libSPU2null.so || die
+	use doc && dodoc ../ReadMe.txt Changelog.txt || die
+	prepgamesdirs
+}
diff --git a/games-emulation/ps2emu-usbnull/ps2emu-usbnull-0.4-r1.ebuild b/games-emulation/ps2emu-usbnull/ps2emu-usbnull-0.4-r1.ebuild
new file mode 100644
index 0000000..8482ed5
--- /dev/null
+++ b/games-emulation/ps2emu-usbnull/ps2emu-usbnull-0.4-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit games
+
+PCSX2="pcsx2-0.9.4"
+
+DESCRIPTION="PS2Emu null USB plugin"
+HOMEPAGE="http://www.pcsx2.net/"
+SRC_URI="mirror://sourceforge/pcsx2/${PCSX2}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=x11-libs/gtk+-2"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PCSX2}/plugins/usb/USBnull/Linux"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	
+	sed -i \
+		-e '/^CC =/d' \
+		-e '/\bstrip\b/d' \
+		-e 's/-O[0-9]\b//g' \
+		-e 's/-fomit-frame-pointer\b//g' \
+		Makefile || die
+}
+
+src_install() {
+	exeinto "`games_get_libdir`/ps2emu/plugins"
+	newexe libUSBnull.so libUSBnull.so.${PV} || die
+	exeinto "`games_get_libdir`/ps2emu/plugins/cfg"
+	doexe cfgUSBnull || die
+	dodoc ../ReadMe.txt || die
+	prepgamesdirs
+}
diff --git a/games-emulation/ps2emu-usbnull/ps2emu-usbnull-9999.ebuild b/games-emulation/ps2emu-usbnull/ps2emu-usbnull-9999.ebuild
new file mode 100644
index 0000000..57a71df
--- /dev/null
+++ b/games-emulation/ps2emu-usbnull/ps2emu-usbnull-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+ESVN_REPO_URI="https://pcsx2.svn.sourceforge.net/svnroot/pcsx2/plugins/usb/USBnull"
+inherit eutils games subversion
+
+DESCRIPTION="PS2Emu null USB plugin"
+HOMEPAGE="http://www.pcsx2.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc"
+
+DEPEND=">=x11-libs/gtk+-2"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/USBnull"
+
+src_unpack() {
+	subversion_src_unpack
+	S="${S}/Linux"
+	cd "${S}"
+	
+	sed -i \
+		-e '/^CC =/d' \
+		-e '/\bstrip\b/d' \
+		-e 's/-O[0-9]\b//g' \
+		-e 's/-fomit-frame-pointer\b//g' \
+		Makefile || die
+}
+
+src_install() {
+	exeinto "$(games_get_libdir)/ps2emu/plugins"
+	doexe libUSBnull.so || die
+	exeinto "$(games_get_libdir)/ps2emu/plugins/cfg"
+	doexe cfgUSBnull || die
+	use doc && dodoc ../ReadMe.txt || die
+	prepgamesdirs
+}
diff --git a/games-emulation/ps2emu-zerogs/files/ps2emu-zerogs-consistent-naming.patch b/games-emulation/ps2emu-zerogs/files/ps2emu-zerogs-consistent-naming.patch
new file mode 100644
index 0000000..bbcf0d6
--- /dev/null
+++ b/games-emulation/ps2emu-zerogs/files/ps2emu-zerogs-consistent-naming.patch
@@ -0,0 +1,14 @@
+--- opengl/Makefile.am.orig	2008-06-08 11:50:59.000000000 -0400
++++ opengl/Makefile.am	2008-06-08 11:51:16.000000000 -0400
+@@ -14,11 +14,6 @@
+ # Create a shared object by faking an exe (thanks to ODE makefiles)
+ traplibdir=$(prefix)
+ 
+-
+-if RELEASE_TO_PUBLIC
+-preext=r
+-endif
+-
+ EXEEXT=$(preext)@so_ext@
+ 
+ traplib_PROGRAMS=libZeroGSogl
diff --git a/games-emulation/ps2emu-zerogs/files/ps2emu-zerogs-devbuild-paths.patch b/games-emulation/ps2emu-zerogs/files/ps2emu-zerogs-devbuild-paths.patch
new file mode 100644
index 0000000..5fce13a
--- /dev/null
+++ b/games-emulation/ps2emu-zerogs/files/ps2emu-zerogs-devbuild-paths.patch
@@ -0,0 +1,44 @@
+--- opengl/zerogs.cpp.orig	2008-06-08 22:12:33.000000000 -0400
++++ opengl/zerogs.cpp	2008-06-08 22:15:37.000000000 -0400
+@@ -112,8 +112,8 @@
+ char* EFFECT_DIR = "C:\\programming\\ps2dev\\zerogs\\opengl\\";

+ char* EFFECT_NAME = "C:\\programming\\ps2dev\\zerogs\\opengl\\ps2hw.fx";

+ #else

+-char EFFECT_DIR[255] = "~/pcsx2/plugins/gs/zerogs/opengl/";

+-char EFFECT_NAME[255] = "~/pcsx2/plugins/gs/zerogs/opengl/ps2hw.fx";

++char EFFECT_DIR[255] = "~/.pcsx2/";

++char EFFECT_NAME[255] = "ps2hw.fx";

+ #endif

+ 

+ #endif

+@@ -1335,25 +1335,17 @@
+     char curwd[255];

+     getcwd(curwd, ARRAY_SIZE(curwd));

+ 

+-    strcpy(tempstr, "../plugins/gs/zerogs/opengl/");

+-    sprintf(EFFECT_NAME, "%sps2hw.fx", tempstr);

++    strcpy(tempstr, curwd);

++    sprintf(EFFECT_NAME, "%s/ps2hw.fx", tempstr);

+     FILE* f = fopen(EFFECT_NAME, "r");

+     if( f == NULL ) {

+-

+-        strcpy(tempstr, "../../plugins/gs/zerogs/opengl/");

+-        sprintf(EFFECT_NAME, "%sps2hw.fx", tempstr);

+-        f = fopen(EFFECT_NAME, "r");

+-

+-        if( f == NULL ) {

+-            ERROR_LOG("Failed to find %s, try compiling a non-devbuild\n", EFFECT_NAME);

+-            return false;

+-        }

++        return false;

+     }

+ 

+     fclose(f);

+ 

+-    sprintf(EFFECT_DIR, "%s/%s", curwd, tempstr);

+-    sprintf(EFFECT_NAME, "%sps2hw.fx", EFFECT_DIR);

++    sprintf(EFFECT_DIR, "%s", tempstr);

++    sprintf(EFFECT_NAME, "%s/ps2hw.fx", EFFECT_DIR);

+ #endif

+ 

+ #endif // RELEASE_TO_PUBLIC

diff --git a/games-emulation/ps2emu-zerogs/files/ps2emu-zerogs-gcc43.patch b/games-emulation/ps2emu-zerogs/files/ps2emu-zerogs-gcc43.patch
new file mode 100644
index 0000000..8d28eea
--- /dev/null
+++ b/games-emulation/ps2emu-zerogs/files/ps2emu-zerogs-gcc43.patch
@@ -0,0 +1,12 @@
+diff -Nur opengl.orig/Mem.h opengl/Mem.h
+--- opengl.orig/Mem.h	2008-06-03 11:28:33.000000000 +0200
++++ opengl/Mem.h	2008-06-03 11:35:17.000000000 +0200
+@@ -21,6 +21,8 @@
+ 

+ #include <assert.h>

+ #include <vector>

++#include <cstring>
++#include <cstdlib>
+ 

+ // works only when base is a power of 2

+ #define ROUND_UPPOW2(val, base)	(((val)+(base-1))&~(base-1))

diff --git a/games-emulation/ps2emu-zerogs/ps2emu-zerogs-0.96.7.ebuild b/games-emulation/ps2emu-zerogs/ps2emu-zerogs-0.96.7.ebuild
new file mode 100644
index 0000000..fc9a801
--- /dev/null
+++ b/games-emulation/ps2emu-zerogs/ps2emu-zerogs-0.96.7.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit games autotools eutils
+
+PCSX2="pcsx2-0.9.4"
+
+DESCRIPTION="PS2Emu ZeroGS OpenGL plugin"
+HOMEPAGE="http://www.pcsx2.net/"
+SRC_URI="mirror://sourceforge/pcsx2/${PCSX2}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+#  I'm seeing better grahics with devbuild on.
+IUSE="debug +devbuild sse2"
+
+RDEPEND="media-gfx/nvidia-cg-toolkit
+	media-libs/glew
+	media-libs/jpeg
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXxf86vm
+	>=x11-libs/gtk+-2"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/xf86vidmodeproto"
+
+S="${WORKDIR}/${PCSX2}/plugins/gs/zerogs/opengl"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-gcc43.patch"
+	epatch "${FILESDIR}/${PN}-devbuild-paths.patch"
+	epatch "${FILESDIR}/${PN}-consistent-naming.patch"
+
+	sed -r -i \
+		-e 's/-O[0-9]\b//g' \
+		-e 's/-fomit-frame-pointer\b//g' \
+		-e 's/C(..)?FLAGS=/C\1FLAGS+=/' \
+		configure.ac || die
+
+	eautoreconf -v --install || die
+	chmod +x configure
+}
+
+src_compile() {
+	egamesconf  \
+		$(use_enable devbuild) \
+		$(use_enable debug) \
+		$(use_enable sse2) \
+		|| die
+
+	emake || die
+}
+
+src_install() {
+	exeinto "$(games_get_libdir)/ps2emu/plugins"
+	insinto "$(games_get_libdir)/ps2emu/plugins"
+	doexe libZeroGSogl.so.* || die
+	if use devbuild; then
+		doins ps2hw.fx || die
+		doins ctx1/ps2hw_ctx.fx || die
+	else
+		doins Win32/ps2hw.dat || die
+	fi
+	prepgamesdirs
+}
diff --git a/games-emulation/ps2emu-zerogs/ps2emu-zerogs-9999.ebuild b/games-emulation/ps2emu-zerogs/ps2emu-zerogs-9999.ebuild
new file mode 100644
index 0000000..51b186e
--- /dev/null
+++ b/games-emulation/ps2emu-zerogs/ps2emu-zerogs-9999.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+ESVN_REPO_URI="https://pcsx2.svn.sourceforge.net/svnroot/pcsx2/plugins/gs/zerogs/opengl"
+inherit eutils games subversion autotools
+
+DESCRIPTION="PS2Emu ZeroGS OpenGL plugin"
+HOMEPAGE="http://www.pcsx2.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+#  I'm seeing better grahics with devbuild on.
+IUSE="debug +devbuild sse2"
+
+RDEPEND="media-gfx/nvidia-cg-toolkit
+	media-libs/glew
+	media-libs/jpeg
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXxf86vm
+	>=x11-libs/gtk+-2"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/xf86vidmodeproto"
+
+S="${WORKDIR}/opengl"
+
+src_unpack() {
+	subversion_src_unpack
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-gcc43.patch"
+	epatch "${FILESDIR}/${PN}-devbuild-paths.patch"
+	epatch "${FILESDIR}/${PN}-consistent-naming.patch"
+
+	sed -r -i \
+		-e 's/-O[0-9]\b//g' \
+		-e 's/-fomit-frame-pointer\b//g' \
+		-e 's/C(..)?FLAGS=/C\1FLAGS+=/' \
+		configure.ac || die
+
+	eautoreconf -v --install || die
+	chmod +x configure
+}
+
+src_compile() {
+	egamesconf  \
+		$(use_enable devbuild) \
+		$(use_enable debug) \
+		$(use_enable sse2) \
+		|| die
+
+	emake || die
+}
+
+src_install() {
+	exeinto "$(games_get_libdir)/ps2emu/plugins"
+	insinto "$(games_get_libdir)/ps2emu/plugins"
+	doexe libZeroGSogl.so.* || die
+	if use devbuild; then
+		doins ps2hw.fx || die
+		doins ctx1/ps2hw_ctx.fx || die
+	else
+		doins Win32/ps2hw.dat || die
+	fi
+	prepgamesdirs
+}
diff --git a/games-emulation/ps2emu-zeropad/files/ps2emu-zeropad-consistent-naming.patch b/games-emulation/ps2emu-zeropad/files/ps2emu-zeropad-consistent-naming.patch
new file mode 100644
index 0000000..834d811
--- /dev/null
+++ b/games-emulation/ps2emu-zeropad/files/ps2emu-zeropad-consistent-naming.patch
@@ -0,0 +1,13 @@
+--- zeropad/Makefile.am.orig	2008-06-08 22:29:35.000000000 -0400
++++ zeropad/Makefile.am	2008-06-08 22:29:45.000000000 -0400
+@@ -13,10 +13,6 @@
+ # Create a shared object by faking an exe (thanks to ODE makefiles)
+ traplibdir=$(prefix)
+ 
+-if DEBUGBUILD
+-preext=d
+-endif
+-
+ EXEEXT=$(preext)@so_ext@
+ 
+ traplib_PROGRAMS=libZeroPAD
diff --git a/games-emulation/ps2emu-zeropad/ps2emu-zeropad-0.1.0.ebuild b/games-emulation/ps2emu-zeropad/ps2emu-zeropad-0.1.0.ebuild
new file mode 100644
index 0000000..aec4e75
--- /dev/null
+++ b/games-emulation/ps2emu-zeropad/ps2emu-zeropad-0.1.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit games autotools
+
+PCSX2="pcsx2-0.9.4"
+
+DESCRIPTION="PS2Emu pad plugin"
+HOMEPAGE="http://www.pcsx2.net/"
+SRC_URI="mirror://sourceforge/pcsx2/${PCSX2}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=x11-libs/gtk+-2"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+S="${WORKDIR}/${PCSX2}/plugins/pad/zeropad"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-consistent-naming.patch"
+	
+	sed -r -i \
+		-e '/C(..)?FLAGS=/d' \
+		-e 's/-O[0-9]\b//g' \
+		-e 's/-fomit-frame-pointer\b//g' \
+		-e 's/C(..)?FLAGS\+="/C\1FLAGS+=" /' \
+		configure.ac || die
+	
+	eautoreconf -v --install || die
+}
+
+src_compile() {
+	egamesconf $(use_enable debug) || die
+	emake || die
+}
+
+src_install() {
+	exeinto "$(games_get_libdir)/ps2emu/plugins"
+	doexe libZeroPAD.so.${PV} || die
+	prepgamesdirs
+}
diff --git a/games-emulation/ps2emu-zeropad/ps2emu-zeropad-9999.ebuild b/games-emulation/ps2emu-zeropad/ps2emu-zeropad-9999.ebuild
new file mode 100644
index 0000000..8459546
--- /dev/null
+++ b/games-emulation/ps2emu-zeropad/ps2emu-zeropad-9999.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+ESVN_REPO_URI="https://pcsx2.svn.sourceforge.net/svnroot/pcsx2/plugins/pad/zeropad"
+inherit eutils games subversion autotools
+
+DESCRIPTION="PS2Emu pad plugin"
+HOMEPAGE="http://www.pcsx2.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug"
+
+RDEPEND=">=x11-libs/gtk+-2"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+S="${WORKDIR}/zeropad"
+
+src_unpack() {
+	subversion_src_unpack
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-consistent-naming.patch"
+	
+	sed -r -i \
+		-e '/C(..)?FLAGS=/d' \
+		-e 's/-O[0-9]\b//g' \
+		-e 's/-fomit-frame-pointer\b//g' \
+		-e 's/C(..)?FLAGS\+="/C\1FLAGS+=" /' \
+		configure.ac || die
+	
+	eautoreconf -v --install || die
+}
+
+src_compile() {
+	egamesconf $(use_enable debug) || die
+	emake || die
+}
+
+src_install() {
+	exeinto "$(games_get_libdir)/ps2emu/plugins"
+	doexe libZeroPAD.so.* || die
+	prepgamesdirs
+}
diff --git a/games-fps/ut2004-bonuspack-ece/Manifest b/games-fps/ut2004-bonuspack-ece/Manifest
new file mode 100644
index 0000000..6820c3c
--- /dev/null
+++ b/games-fps/ut2004-bonuspack-ece/Manifest
@@ -0,0 +1,2 @@
+DIST ut2004megapack-linux.tar.bz2 350042746 RMD160 19b6eab50ecab5a142e0838d938226955d6cc477 SHA1 7d4ee08e4094d661bbf9178a4bd7fa27886784a5 SHA256 38b99572cf174d985b7cb0544b502dcbd7d7b68c4e8370c3f261e513938e7f71
+EBUILD ut2004-bonuspack-ece-1-r3.ebuild 2033 RMD160 2e0852b3e2f78ccf98500899701aaf59bfec7bc5 SHA1 2ad2c9c33b6f7a95762fa53dcfddcac137774a06 SHA256 c0460287c3eb6306d470fb48250b46302e8504f7e5ae5da4520ad0cad1d0b616
diff --git a/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r3.ebuild b/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r3.ebuild
new file mode 100644
index 0000000..d0b509c
--- /dev/null
+++ b/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r3.ebuild,v 1.2 2007/01/10 19:37:56 wolf31o2 Exp $
+
+MOD_DESC="Editor's Choice Edition bonus pack"
+MOD_NAME="Editor's Choice Edition"
+
+inherit games games-mods
+
+MY_P="ut2004megapack-linux.tar.bz2"
+
+HOMEPAGE="http://www.unrealtournament2004.com/"
+SRC_URI="mirror://3dgamers/unrealtourn2k4/Missions/${MY_P}
+	http://0day.icculus.org/ut2004/${MY_P}
+	ftp://ftp.games.skynet.be/pub/misc/${MY_P}
+	http://sonic-lux.net/data/mirror/ut2004/${MY_P}"
+
+LICENSE="ut2003"
+
+RDEPEND="games-fps/ut2004-data"
+
+S=${WORKDIR}/UT2004MegaPack
+dir=${GAMES_PREFIX_OPT}/${GAME}
+Ddir=${D}/${dir}
+
+pkg_setup() {
+	games_pkg_setup
+}
+
+src_unpack() {
+	games-mods_src_unpack
+	cd "${S}"
+	# Remove megapack files which are not in ece
+	rm Animations/ONSNewTank-A.ukx
+	rm Help/ReadMePatch.int.txt
+	# Help/{DebuggerLogo.bmp,InstallerLogo.bmp,Unreal.ico,UnrealEd.ico}
+	# are not in megapack.
+	# Keep new Help/UT2004Logo.bmp
+	# Manual dir does not exist in megapack
+	rm Maps/{AS*,CTF*,DM*}
+	rm Sounds/A_Announcer_BP2.uax
+	rm StaticMeshes/{JumpShipObjects.usx,Ty_RocketSMeshes.usx}
+	rm System/{A*,b*,B*,CacheRecords.ucl,*.det,*.est,*.frt,*.itt,*.kot}
+	rm System/{CTF*,D*,Editor*,G*,I*,L*,ONS-Arc*,Onslaught.*,*.md5}
+	rm System/{u*,U*,V*,X*,Core.u,Engine.u,F*,*.ucl,Sk*}
+	rm Textures/{J*,j*,T*}
+	rm -r Web
+
+	# The file lists of ut2004-3369-r1 and -r2 are identical
+	# Remove files owned by ut2004-3369-r2
+	rm Help/UT2004Logo.bmp
+	# The 2 Manifest files have not changed
+	rm System/{Manifest.in{i,t},OnslaughtFull.int}
+	rm System/{Core.int,Engine.int,Setup.int,Window.int}
+	rm System/{OnslaughtFull.u,OnslaughtBP.u}
+}
+
+src_install() {
+	# Install Editor's Choice Edition
+	for n in {Animations,Help,Maps,Sounds,StaticMeshes,System,Textures}
+	do
+		dodir "${dir}"/${n}
+		cp -r "${S}"/${n}/* "${Ddir}"/${n} \
+			|| die "copying ${n} from Editor's Choice Edition"
+	done
+
+	prepgamesdirs
+}
diff --git a/games-fps/ut2004-bonuspack-mega/Manifest b/games-fps/ut2004-bonuspack-mega/Manifest
new file mode 100644
index 0000000..45d7ce6
--- /dev/null
+++ b/games-fps/ut2004-bonuspack-mega/Manifest
@@ -0,0 +1,2 @@
+DIST ut2004megapack-linux.tar.bz2 350042746 RMD160 19b6eab50ecab5a142e0838d938226955d6cc477 SHA1 7d4ee08e4094d661bbf9178a4bd7fa27886784a5 SHA256 38b99572cf174d985b7cb0544b502dcbd7d7b68c4e8370c3f261e513938e7f71
+EBUILD ut2004-bonuspack-mega-1-r2.ebuild 1943 RMD160 d0e316fdfa10c8ebd225e828ac247a08c81cdc2a SHA1 e6f4bed411674a69302a00b8eaa828894223b0b7 SHA256 f9c2492ecdf22f5577cd9d0b24a6f541d029a04d276836c475182d4926310549
diff --git a/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r2.ebuild b/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r2.ebuild
new file mode 100644
index 0000000..19999fb
--- /dev/null
+++ b/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r2.ebuild,v 1.2 2007/01/10 19:46:44 wolf31o2 Exp $
+
+MOD_DESC="Megapack bonus pack"
+MOD_NAME="Megapack"
+
+inherit games games-mods
+
+MY_P="ut2004megapack-linux.tar.bz2"
+MY_PN="Megapack"
+
+HOMEPAGE="http://www.unrealtournament2004.com/"
+SRC_URI="mirror://3dgamers/unrealtourn2k4/Missions/${MY_P}
+	http://0day.icculus.org/ut2004/${MY_P}
+	ftp://ftp.games.skynet.be/pub/misc/${MY_P}
+	http://sonic-lux.net/data/mirror/ut2004/${MY_P}"
+
+LICENSE="ut2003"
+
+RDEPEND="games-fps/ut2004-data"
+
+S=${WORKDIR}/UT2004MegaPack
+dir=${GAMES_PREFIX_OPT}/ut2004
+Ddir=${D}/${dir}
+
+src_unpack() {
+	games-mods_src_unpack
+	cd "${S}"
+	# Remove files in Megapack which are already installed
+	rm -r Animations Speech Web
+
+	rm Help/{ReadMePatch.int.txt,UT2004Logo.bmp}
+	mv Help/BonusPackReadme.txt Help/${MY_PN}Readme.txt
+
+	rm Maps/ONS-{Adara,IslandHop,Tricky,Urban}.ut2
+	rm Sounds/{CicadaSnds,DistantBooms,ONSBPSounds}.uax
+	rm StaticMeshes/{BenMesh02,BenTropicalSM01,HourAdara,ONS-BPJW1,PC_UrbanStatic}.usx
+
+	# System
+	rm System/{AL,AS-,B,b,C,D,E,F,G,I,L,O,o,S,s,U,V,W,X,x}*
+	rm System/{ucc,ut2004}-bin
+	rm System/{ucc,ut2004}-bin-linux-amd64
+	rm Textures/{AW-2k4XP,BenTex02,BenTropical01,BonusParticles,CicadaTex,Construction_S,HourAdaraTexor,jwfasterfiles,ONSBP_DestroyedVehicles,ONSBPTextures,PC_UrbanTex,UT2004ECEPlayerSkins}.utx
+}
+
+src_install() {
+	# Backup files which a future bonuspack may try to overwrite
+	for n in {Manifest.in{i,t},Packages.md5} ; do
+		cp System/${n} System/${n}-${MY_PN}
+	done
+
+	# Install Megapack
+	for n in {Help,Maps,Music,Sounds,StaticMeshes,System,Textures} ; do
+		# doins is not used because of its unnecessary overhead
+		dodir "${dir}"/${n}
+		cp -r "${S}"/${n}/* "${Ddir}"/${n} \
+			|| die "copying ${n} from ${MY_PN}"
+	done
+
+	prepgamesdirs
+}
diff --git a/games-rpg/tmw/files b/games-rpg/tmw/files
new file mode 120000
index 0000000..d4d4d35
--- /dev/null
+++ b/games-rpg/tmw/files
@@ -0,0 +1 @@
+/var/paludis/repositories/gentoo/games-rpg/tmw/files
\ No newline at end of file
diff --git a/games-rpg/tmw/tmw-9999.ebuild b/games-rpg/tmw/tmw-9999.ebuild
new file mode 100644
index 0000000..ef39f75
--- /dev/null
+++ b/games-rpg/tmw/tmw-9999.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/tmw/tmw-0.0.26.ebuild,v 1.1 2008/10/15 18:22:04 mr_bones_ Exp $
+
+inherit eutils games git cmake-utils
+
+MUSIC=tmwmusic-0.0.20
+DESCRIPTION="A fully free and open source MMORPG game with the looks of \"old-fashioned\" 2D RPG"
+HOMEPAGE="http://themanaworld.org/"
+SRC_URI="mirror://sourceforge/themanaworld/${MUSIC}.tar.gz"
+
+EGIT_REPO_URI="git://gitorious.org/tmw/mainline.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="opengl"
+
+DEPEND=">=dev-games/physfs-1.0.0
+	opengl? ( virtual/opengl )
+	dev-libs/libxml2
+	media-libs/sdl-mixer
+	media-libs/sdl-image
+	media-libs/sdl-net
+	net-misc/curl
+	net-libs/enet
+	>=dev-games/guichan-0.8.1"
+
+pkg_setup() {
+	games_pkg_setup
+	if ! built_with_use dev-games/guichan sdl ; then
+		eerror "dev-games/guichan needs to be built with USE=sdl"
+		die "please re-emerge dev-games/guichan with USE=sdl"
+	fi
+	if ! built_with_use media-libs/sdl-mixer vorbis ; then
+		eerror "media-libs/sdl-mixer needs to be built with USE=vorbis"
+		die "please re-emerge media-libs/sdl-mixer with USE=vorbis"
+	fi
+}
+
+src_unpack() {
+	git_src_unpack
+	unpack ${A}
+	cd "${S}"
+#	epatch "${FILESDIR}"/tmw-0.0.26-desktop.patch
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc AUTHORS ChangeLog NEWS README
+#	cd "${WORKDIR}"
+#	insinto "${GAMES_DATADIR}"/${PN}/data/music
+#	doins ${MUSIC}/data/music/*.ogg || die
+#	newdoc ${MUSIC}/README README.music
+	prepgamesdirs
+}
diff --git a/games-sports/xmoto/xmoto-9999.ebuild b/games-sports/xmoto/xmoto-9999.ebuild
new file mode 100644
index 0000000..ad105fc
--- /dev/null
+++ b/games-sports/xmoto/xmoto-9999.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-sports/xmoto/xmoto-0.4.2.ebuild,v 1.4 2008/09/06 13:29:41 nixnut Exp $
+
+inherit eutils games subversion autotools
+
+LVL="inksmoto-0.4.1" #they unfortunately don't release both at the same time
+DESCRIPTION="A challenging 2D motocross platform game"
+HOMEPAGE="http://xmoto.tuxfamily.org"
+SRC_URI=""
+
+ESVN_REPO_URI="svn://svn.tuxfamily.org/svnroot/xmoto/xmoto/trunk"
+ESVN_STORE_DIR="${DISTDIR}/svn-src"
+ESVN_PROJECT="${PN/-svn}"
+#ESVN_BOOTSTRAP="./reconf"
+
+S="${WORKDIR}/${P/_/}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="X editor nls" #sdl"
+
+RDEPEND="media-libs/jpeg
+	media-libs/libpng
+	media-libs/libsdl
+	media-libs/sdl-mixer
+	media-libs/sdl-ttf
+	net-misc/curl
+	dev-lang/lua
+	dev-games/ode
+	virtual/opengl
+	virtual/glu
+	nls? ( virtual/libintl )
+	editor? ( >=media-gfx/inkscape-0.45 )"
+DEPEND="${RDEPEND}
+	>=dev-db/sqlite-3
+	nls? ( sys-devel/gettext )"
+pkg_setup() {
+	if has_version ">=dev-lang/lua-5.1.3-r1" && ! built_with_use dev-lang/lua deprecated ; then
+		eerror "Re-emerge dev-lang/lua with 'deprecated' USE flag"
+		eerror "Check your USE flags, re-emerge the dependencies and then"
+		eerror "emerge this package."
+		die
+	fi
+	games_pkg_setup
+}
+src_unpack() {
+	subversion_src_unpack
+	cd "${S}"
+	eautoreconf
+	use editor && rm -f "${WORKDIR}"/${LVL}/{bezmisc,inkex}.py
+}
+
+src_compile() {
+	#if use sdl ; then
+	#	ewarn "SDL is known to be broken, if you experience any troubles please"
+	#	ewarn "try again without this useflag"
+	#	RENDERER="--with-renderer-sdlGfx=1 --with-renderer-openGl=0"
+	#else
+		RENDERER="--with-renderer-sdlGfx=0 --with-renderer-openGl=1"
+	#fi
+	if ! use nls ; then
+		NLS="--disable-nls"
+	else
+		NLS="--with-gettext"
+	fi
+	egamesconf \
+		--disable-dependency-tracking \
+		--with-enable-zoom=1 \
+		--enable-threads=posix \
+		--with-gnu-ld \
+		$(use_with X) \
+		--with-localesdir=/usr/share/locale \
+		${RENDERER} \
+		${NLS} \
+		|| die
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	## if it is not working nice way, we'll do it ugly way
+	if use nls ; then
+		dodir /usr/share/locale
+
+		cd "${S}"/po
+		for i in `ls -c1 |grep "\.gmo$"` ; do
+			BASE=$(echo ${i} |sed 's/\.gmo$//g')
+			msgfmt -v -o ${BASE}.mo ${BASE}.po
+
+			insinto /usr/share/locale/${BASE}/LC_MESSAGES
+			newins ${BASE}.gmo xmoto.mo
+		done;
+	fi
+	cd "${S}"
+	dodoc README TODO NEWS ChangeLog
+
+	doicon extra/xmoto.xpm
+	domenu extra/xmoto.desktop
+
+	prepgamesdirs
+
+	if use editor; then
+	  insinto /usr/share/inkscape/extensions
+	  doins "${WORKDIR}"/${LVL}/*.{inx,py,xml} || die "doins failed"
+	fi
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	if use editor; then
+	  elog "If you want to know how to create Xmoto levels"
+	  elog "have a look at this Tutorial:"
+	  elog "http://wiki.xmoto.tuxfamily.org/index.php?title=Inkscape-0.4.0"
+	  elog "You can share your levels on the Xmoto homepage."
+	fi
+}
diff --git a/kde-misc/tork/files b/kde-misc/tork/files
new file mode 120000
index 0000000..2135396
--- /dev/null
+++ b/kde-misc/tork/files
@@ -0,0 +1 @@
+/var/paludis/repositories/gentoo/kde-misc/tork/files
\ No newline at end of file
diff --git a/kde-misc/tork/tork-9999.ebuild b/kde-misc/tork/tork-9999.ebuild
new file mode 100644
index 0000000..842e6b7
--- /dev/null
+++ b/kde-misc/tork/tork-9999.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tork/tork-0.27.ebuild,v 1.3 2008/06/30 01:38:27 carlo Exp $
+
+ARTS_REQUIRED="never"
+
+inherit kde multilib cvs autotools
+
+DESCRIPTION="TorK is a powerful anonymity manager for the KDE and acts as a frontedn to Tor."
+HOMEPAGE="http://tork.sourceforge.net/"
+SRC_URI=""
+
+ECVS_SERVER="tork.cvs.sourceforge.net:/cvsroot/tork"
+ECVS_MODULE="tork"
+ECVS_AUTH="pserver"
+ECVS_USER="anonymous"
+S="${WORKDIR}/${PN}"
+
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="gnutls"
+
+DEPEND="dev-libs/openssl
+	>=dev-libs/geoip-1.4.0
+	gnutls? ( >=net-libs/gnutls-2.2.2 )
+	!gnutls? ( >=dev-libs/openssl-0.9.8g )"
+
+RDEPEND="${DEPEND}
+	>=net-misc/tor-0.1.2.14
+	>=net-proxy/privoxy-3.0.3-r5
+	>=net-proxy/tsocks-1.8_beta5-r2"
+
+need-kde 3.5
+
+#PATCHES=( "${FILESDIR}/${P}-ext_tsocks.patch"
+#	"${FILESDIR}/${P}+gcc-4.3.patch" )
+
+src_compile() {
+	# Fix desktop file
+	cd ${S}
+	sed -i -e "s:^\(Categories=.*\):\1;:" "${S}/src/tork.desktop"
+
+	local myconf="--with-external-geoip --with-conf=/etc/socks/tsocks.conf"
+	use gnutls && myconf="${myconf} --enable-gnutls"
+
+	kde_src_compile
+}
+
+pkg_postinst() {
+	if ! built_with_use --missing false net-proxy/tsocks tordns; then
+		ewarn "WARNING: you have net-proxy/tsocks installed without"
+		ewarn "the patch to avoid DNS leaking while using Tor."
+		ewarn "For better privacy, please emerge again net-proxy/tsocks"
+		ewarn "with the USE flag 'tordns' enabled."
+	fi
+}
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
new file mode 100644
index 0000000..545a305
--- /dev/null
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -0,0 +1,135 @@
+# 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 subversion fdo-mime flag-o-matic multilib python
+
+ESVN_REPO_URI="http://svn.gnome.org/svn/gimp/trunk/"
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="http://www.gimp.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="2"
+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? ( >=app-text/poppler-bindings-0.3.1 )
+	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 )"
+
+pkg_setup() {
+	if use pdf && ! built_with_use app-text/poppler-bindings gtk; then
+		eerror "This package requires app-text/poppler-bindings compiled with GTK+ support."
+		die "Please reemerge app-text/poppler-bindings with USE=\"gtk\"."
+	fi
+	if use alsa && ! built_with_use media-libs/alsa-lib midi; then
+		eerror "This package requires media-libs/alsa-lib compiled with midi support."
+		die "Please reemerge media-libs/alsa-lib with USE=\"midi\"."
+	fi
+}
+
+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/babl/babl-0.0.9999.ebuild b/media-libs/babl/babl-0.0.9999.ebuild
new file mode 100644
index 0000000..36c0b30
--- /dev/null
+++ b/media-libs/babl/babl-0.0.9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/babl/babl-0.0.22.ebuild,v 1.7 2009/01/31 09:11:00 mabi Exp $
+
+inherit subversion
+
+DESCRIPTION="A dynamic, any to any, pixel format conversion library"
+HOMEPAGE="http://www.gegl.org/babl/"
+SRC_URI=""
+
+ESVN_REPO_URI="http://svn.gnome.org/svn/babl/trunk/"
+ESVN_STORE_DIR="${DISTDIR}/svn-src"
+ESVN_PROJECT="${PN/-svn}"
+ESVN_BOOTSTRAP="./autogen.sh"
+
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="sse mmx"
+
+DEPEND="virtual/libc"
+
+src_unpack(){
+	subversion_src_unpack
+}
+
+src_compile() {
+	econf $(use_enable mmx) \
+		$(use_enable sse) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "emake install failed"
+	find "${D}" -name '*.la' -delete
+#	dodoc AUTHORS ChangeLog README NEWS || die "dodoc failed"
+}
diff --git a/media-libs/gegl/gegl-0.0.9999.ebuild b/media-libs/gegl/gegl-0.0.9999.ebuild
new file mode 100644
index 0000000..0d1f3bb
--- /dev/null
+++ b/media-libs/gegl/gegl-0.0.9999.ebuild
@@ -0,0 +1,90 @@
+# 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 subversion
+
+DESCRIPTION="A graph based image processing framework"
+HOMEPAGE="http://www.gegl.org/"
+SRC_URI=""
+
+ESVN_REPO_URI="http://svn.gnome.org/svn/gegl/trunk/"
+ESVN_STORE_DIR="${DISTDIR}/svn-src"
+ESVN_PROJECT="${PN/-svn}"
+ESVN_BOOTSTRAP="./autogen.sh"
+
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+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 )
+	doc? ( app-text/asciidoc
+		dev-lang/ruby
+		>=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}
+	subversion_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-libs/libgpod/libgpod-9999.ebuild b/media-libs/libgpod/libgpod-9999.ebuild
new file mode 100644
index 0000000..5bb194b
--- /dev/null
+++ b/media-libs/libgpod/libgpod-9999.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgpod/libgpod-0.6.0.ebuild,v 1.11 2008/11/01 16:47:41 tester Exp $
+
+inherit eutils subversion autotools
+
+DESCRIPTION="Shared library to access the contents of an iPod"
+HOMEPAGE="http://www.gtkpod.org/libgpod.html"
+SRC_URI=""
+
+ESVN_REPO_URI="https://gtkpod.svn.sourceforge.net/svnroot/gtkpod/libgpod/trunk/"
+ESVN_STORE_DIR="${DISTDIR}/svn-src"
+ESVN_PROJECT="${PN/-svn}"
+ESVN_BOOTSTRAP="./autogen.sh"
+
+S="${WORKDIR}/${P/_/}"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc ppc64 ~sparc x86"
+IUSE="gtk python doc test hal"
+
+RDEPEND=">=dev-libs/glib-2.4
+	hal? ( =sys-apps/hal-0.5* )
+	sys-apps/sg3_utils
+	dev-util/gtk-doc
+	gtk? ( >=x11-libs/gtk+-2 )
+	python? ( >=dev-lang/python-2.3
+		>=x11-libs/gtk+-2
+		media-libs/mutagen
+		gtk? ( >=dev-python/pygobject-2 ) )
+	test? ( media-libs/taglib )"
+DEPEND="${RDEPEND}
+	doc? ( dev-util/gtk-doc )
+	python? ( >=dev-lang/swig-1.3.24 )
+	dev-util/pkgconfig"
+
+src_unpack() {
+	subversion_src_unpack
+	cd "${S}"
+#	eautoreconf
+
+#	epatch "${FILESDIR}/${P}+gcc-4.3.patch"
+
+#	elibtoolize
+}
+
+src_compile() {
+
+	local myconf
+
+	if use gtk; then
+		myconf="--enable-pygobject"
+	else
+		myconf="--disable-pygobject"
+	fi
+
+	econf ${myconf} \
+		$(use_enable doc gtk-doc) \
+		$(use_enable gtk gdk-pixbuf) \
+		$(use_with hal hal) \
+		$(use_with python) || die "configure failed"
+
+	emake || die "make failed"
+
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "install failed"
+	dodoc README TROUBLESHOOTING AUTHORS NEWS README.SysInfo
+}
+
+pkg_postinst() {
+	einfo "If you use a newer Ipod like the Ipod classic, make sure to read"
+	einfo "the information in README.SysInfo in /usr/share/doc/${P}"
+	einfo "This is no needed if HAL is installed and works correctly."
+}
diff --git a/media-sound/amarok/amarok-2.0.2.ebuild b/media-sound/amarok/amarok-2.0.2.ebuild
new file mode 100644
index 0000000..586bfe4
--- /dev/null
+++ b/media-sound/amarok/amarok-2.0.2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+KDE_LINGUAS="ar be bg ca cs csb da de el eo es et eu fi fr ga gl he is it ja km
+			ko ku lt lv nb nds ne nl nn oc pa pl pt pt_BR ro ru se sl si sk sv th tr uk zh_CN zh_TW"
+
+OPENGL_REQUIRED="optional"
+inherit kde4-base
+
+DESCRIPTION="Advanced audio player based on KDE framework."
+HOMEPAGE="http://amarok.kde.org/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+SLOT="2"
+IUSE="cdaudio daap debug ifp ipod mp3tunes mp4 mtp njb +semantic-desktop"
+
+DEPEND="
+	>=app-misc/strigi-0.5.7
+	|| (
+		>=dev-db/mysql-5.0[embedded]
+		>=dev-db/mysql-community-5.0[embedded]
+	)
+	dev-db/sqlite:3
+	>=media-libs/taglib-1.5
+	|| (
+		media-sound/phonon
+		x11-libs/qt-phonon:4
+	)
+	>=kde-base/kdelibs-${KDE_MINIMAL}[kdeprefix=,opengl?,semantic-desktop?]
+	>=kde-base/plasma-workspace-${KDE_MINIMAL}[kdeprefix=]
+	x11-libs/qt-webkit:4
+	cdaudio? (
+		>=kde-base/libkcompactdisc-${KDE_MINIMAL}[kdeprefix=]
+		>=kde-base/libkcddb-${KDE_MINIMAL}[kdeprefix=]
+	)
+	ifp? ( media-libs/libifp )
+	ipod? ( >=media-libs/libgpod-0.4.2 )
+	mp3tunes? (
+		dev-libs/libxml2
+		dev-libs/openssl
+		net-libs/loudmouth
+		net-misc/curl
+	)
+	mp4? ( media-libs/libmp4v2 )
+	mtp? ( >=media-libs/libmtp-0.3.0 )
+	njb? ( >=media-libs/libnjb-2.2.4 )
+"
+RDEPEND="${DEPEND}
+	app-arch/unzip
+	daap? ( www-servers/mongrel )
+	semantic-desktop? ( >=kde-base/nepomuk-${KDE_MINIMAL}[kdeprefix=] )
+"
+
+pkg_setup() {
+	if use amd64 ; then
+		echo
+		ewarn "Compilation will fail if dev-db/mysql[-community] is built without -fPIC in your CFLAGS!"
+		ewarn "Related bug: http://bugs.gentoo.org/show_bug.cgi?id=238487"
+		ewarn
+		ewarn "To fix this, and to avoid using -fPIC globally in your make.conf (which is not recommended),"
+		ewarn "put the following into /etc/portage/env/dev-db/mysql (or mysql-community, depending on which you use;"
+		ewarn "create dirs and the file if they don't exist):"
+		ewarn
+		ewarn "CFLAGS=\"${CFLAGS} -DPIC -fPIC\""
+		ewarn "CXXFLAGS=\"${CXXFLAGS} -DPIC -fPIC\""
+		echo
+	fi
+	kde4-base_pkg_setup
+	
+}
+
+src_configure() {
+
+	
+	if ! use mp3tunes; then
+		sed -e'/mp3tunes/ s:^:#DONOTWANT :' \
+		-i "${S}"/src/services/CMakeLists.txt \
+		|| die "Deactivating mp3tunes failed."
+	fi
+
+	# Remove superfluous QT_WEBKIT
+	sed -e 's/ -DQT_WEBKIT//g' \
+		-i "${S}"/src/scriptengine/generator/generator/CMakeLists.txt \
+		|| die "Removing unnecessary -DQT_WEBKIT failed."
+
+	epatch "${FILESDIR}"/2.0.2-qt4.5.patch
+	mycmakeargs="${mycmakeargs}
+		-DUSE_SYSTEM_SQLITE=ON
+		$(cmake-utils_use_with cdaudio KdeMultimedia)
+		$(cmake-utils_use_with ipod Ipod)
+		$(cmake-utils_use_with ifp Ifp)
+		$(cmake-utils_use_with mp4 Mp4v2)
+		$(cmake-utils_use_with mtp Mtp)
+		$(cmake-utils_use_with njb Njb)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)"
+
+	kde4-base_src_configure
+}
diff --git a/media-sound/amarok/files/2.0.2-qt4.5.patch b/media-sound/amarok/files/2.0.2-qt4.5.patch
new file mode 100644
index 0000000..5b7526e
--- /dev/null
+++ b/media-sound/amarok/files/2.0.2-qt4.5.patch
@@ -0,0 +1,30 @@
+diff -ru amarok-2.0.2.org/src/scriptengine/generator/generator/shellimplgenerator.cpp amarok-2.0.2.patched/src/scriptengine/generator/generator/shellimplgenerator.cpp
+--- amarok-2.0.2.org/src/scriptengine/generator/generator/shellimplgenerator.cpp	2009-01-06 13:50:14.000000000 +0100
++++ amarok-2.0.2.patched/src/scriptengine/generator/generator/shellimplgenerator.cpp	2009-02-20 11:26:14.000000000 +0100
+@@ -105,6 +105,7 @@
+         declareFunctionMetaTypes(s, functions, registeredTypeNames);
+         s << endl;
+     }
++    writeInjectedCode(s, meta_class);
+ 
+     // write constructors
+     foreach (const AbstractMetaFunction *ctor, ctors) {
+diff -ru amarok-2.0.2.org/src/scriptengine/generator/generator/typesystem_gui.xml amarok-2.0.2.patched/src/scriptengine/generator/generator/typesystem_gui.xml
+--- amarok-2.0.2.org/src/scriptengine/generator/generator/typesystem_gui.xml	2009-01-06 13:50:14.000000000 +0100
++++ amarok-2.0.2.patched/src/scriptengine/generator/generator/typesystem_gui.xml	2009-02-20 11:26:08.000000000 +0100
+@@ -5389,8 +5389,13 @@
+   <object-type name="QInputContextPlugin"/>
+   <object-type name="QPictureFormatPlugin"/>
+   <object-type name="QStylePlugin"/>
+-  <object-type name="QTextCodecPlugin"/>
+-     
++  
++  <object-type name="QTextCodecPlugin">
++    <inject-code class="shell" position="beginning">
++Q_DECLARE_METATYPE(QList&lt;int>)
++    </inject-code>
++  </object-type>
++       
+   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QPixmap::QPixmap', unmatched parameter type 'QPixmapData*'"/>
+   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private&amp;'"/>
+   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private\*'"/>
diff --git a/media-sound/mpd/files b/media-sound/mpd/files
new file mode 120000
index 0000000..1e69236
--- /dev/null
+++ b/media-sound/mpd/files
@@ -0,0 +1 @@
+/var/paludis/repositories/mpd/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
new file mode 100644
index 0000000..4a4c7c6
--- /dev/null
+++ b/media-sound/mpd/mpd-9999.ebuild
@@ -0,0 +1,148 @@
+# 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="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+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/media-sound/musepack-tools/ChangeLog b/media-sound/musepack-tools/ChangeLog
new file mode 100644
index 0000000..bedecb7
--- /dev/null
+++ b/media-sound/musepack-tools/ChangeLog
@@ -0,0 +1,172 @@
+# ChangeLog for media-sound/musepack-tools
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.33 2007/05/14 21:21:37 beandog Exp $
+
+  14 May 2007; Steve Dibb <beandog@gentoo.org>
+  musepack-tools-1.15v-r1.ebuild:
+  Only patch Makefile if use esd, bug 178569
+
+*musepack-tools-1.15v-r1 (12 May 2007)
+
+  12 May 2007; Steve Dibb <beandog@gentoo.org>
+  +files/musepack-tools-1.15v-Makefile-esd.patch,
+  +musepack-tools-1.15v-r1.ebuild:
+  esd patch, bug 171694
+
+  26 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/musepack-tools-1.15r-r1-Makefile.patch,
+  -files/musepack-tools-1.15s-Makefile.patch,
+  -files/musepack-tools-1.15t-Makefile.patch,
+  -files/musepack-tools-1.15t-gcc4.patch,
+  -files/musepack-tools-1.15u-Makefile.patch,
+  -files/musepack-tools-1.15u-gcc4.patch, -musepack-tools-1.15s-r2.ebuild,
+  -musepack-tools-1.15t.ebuild, -musepack-tools-1.15u.ebuild,
+  musepack-tools-1.15v.ebuild:
+  Remove old versions (and old patches); fix quoting of patches names; block
+  media-sound/mppenc (the software replacing musepack-tools upstream, coming
+  soon).
+
+  09 Jun 2006; Luis Medinas <metalgod@gentoo.org>
+  musepack-tools-1.15v.ebuild:
+  Stable on amd64.
+
+  12 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/musepack-tools-1.15v-fbsd.patch, musepack-tools-1.15v.ebuild:
+  Add ~x86-fbsd keyword with a patch to build on FreeBSD.
+
+  18 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/musepack-tools-1.15v-execstack.patch, musepack-tools-1.15v.ebuild:
+  Add patch to fix executable stack. Bug #118168.
+
+  18 Oct 2005; Tony Vroon <chainsaw@gentoo.org> musepack-tools-1.15v.ebuild:
+  Do not attempt to redirect output to /dev/tty, this makes no sense. Closes
+  bug #109699.
+
+  04 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  files/musepack-tools-1.15v-Makefile.patch, musepack-tools-1.15v.ebuild:
+  Fixed patch for +esd/-esd handling. See bug #104147.
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  musepack-tools-1.15s-r2.ebuild, musepack-tools-1.15t.ebuild,
+  musepack-tools-1.15u.ebuild, musepack-tools-1.15v.ebuild:
+  Don't install COPYING file.
+
+  23 Aug 2005; Tony Vroon <chainsaw@gentoo.org> musepack-tools-1.15v.ebuild:
+  1.15v stable on x86.
+
+  11 Jun 2005; Diego Pettenò <flameeyes@gentoo.org>
+  musepack-tools-1.15v.ebuild:
+  Fix dependency over esd just when needed. Made it link to libm else it fails
+  to link.
+
+*musepack-tools-1.15v (19 Mar 2005)
+
+  19 Mar 2005; Tony Vroon <chainsaw@gentoo.org>
+  +files/musepack-tools-1.15v-Makefile.patch,
+  +files/musepack-tools-1.15v-gcc4.patch, musepack-tools-1.15s-r2.ebuild,
+  musepack-tools-1.15t.ebuild, musepack-tools-1.15u.ebuild,
+  +musepack-tools-1.15v.ebuild:
+  Version bump, closes bug #83365. Correct LICENSE in all ebuilds.
+
+*musepack-tools-1.15u (08 Mar 2005)
+
+  08 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/musepack-tools-1.15u-Makefile.patch,
+  +files/musepack-tools-1.15u-gcc4.patch, +musepack-tools-1.15u.ebuild:
+  new upstream version, fixes #83528
+
+  09 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  musepack-tools-1.15s-r2.ebuild, musepack-tools-1.15t.ebuild:
+  corrected issue with esound dependency, fixes #81311
+
+  11 Feb 2005; Tony Vroon <chainsaw@gentoo.org>
+  +files/musepack-tools-1.15t-gcc4.patch, musepack-tools-1.15t.ebuild:
+  GCC 4 compatability fix by Radoslaw -AstralStorm- Szkodzinski
+  <astralstorm@gorzow.mm.pl> closes bug #81443.
+
+  07 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  files/musepack-tools-1.15t-Makefile.patch:
+  modified the makefile patch to preserve UNBREAK cflags. see #81033
+
+  07 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  musepack-tools-1.15s-r2.ebuild, musepack-tools-1.15t.ebuild:
+  removed wrong homepage urls, fixes #81157
+
+*musepack-tools-1.15t (07 Feb 2005)
+
+  07 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/musepack-tools-1.15t-Makefile.patch, +musepack-tools-1.15t.ebuild:
+  new upstream release. fixes #81033
+
+*musepack-tools-1.15s-r2 (17 Jan 2005)
+
+  17 Jan 2005; Tony Vroon <chainsaw@gentoo.org>
+  -musepack-tools-1.15s-r1.ebuild, +musepack-tools-1.15s-r2.ebuild:
+  Portability fix, do not try to use x86 asm on amd64. Closes bug #78336,
+  patch by Tom Martin <slarti@gentoo.org>.
+
+  22 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -musepack-tools-1.15r-r2.ebuild:
+  Removing old version.
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  musepack-tools-1.15s-r1.ebuild:
+  Stable amd64, x86.
+
+  04 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  musepack-tools-1.15r-r2.ebuild, musepack-tools-1.15s-r1.ebuild:
+  Added missing esd? around esound DEPEND.  Closes bug #72287.
+
+*musepack-tools-1.15s-r1 (27 Nov 2004)
+
+  27 Nov 2004; Tony Vroon <chainsaw@gentoo.org>
+  +musepack-tools-1.15s-r1.ebuild, -musepack-tools-1.15s.ebuild:
+  Add 16bit local USE-flag, closes bug #72500. Made oss dependency explicit as
+  to never break emerge world.
+
+*musepack-tools-1.15s (26 Nov 2004)
+
+  26 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/musepack-tools-1.15r-Makefile.patch,
+  +files/musepack-tools-1.15s-Makefile.patch, +musepack-tools-1.15s.ebuild:
+  Version bump closes bug #72486.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -musepack-tools-1.15r.ebuild, -musepack-tools-1.15r-r1.ebuild,
+  musepack-tools-1.15r-r2.ebuild:
+  Stable x86.  Removing old ebuilds.
+
+*musepack-tools-1.15r-r2 (05 Sep 2004)
+
+  05 Sep 2004; Patrick Dawson <pkdawson@gentoo.org>
+  +musepack-tools-1.15r-r2.ebuild:
+  Added filters for some mfpmath flags. Thanks to <numlock@freesurf.ch>
+  Closes bug #62224.
+
+*musepack-tools-1.15r-r1 (07 Jul 2004)
+
+  07 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/musepack-tools-1.15r-r1-Makefile.patch,
+  +musepack-tools-1.15r-r1.ebuild:
+  prelink bug fix thanks to 4nykey@nm.ru closes bug #49821. -* because of nasm
+  dep.
+
+  16 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  musepack-tools-1.15r.ebuild:
+  SRC_URI fixed for bug #52148.
+
+  14 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  musepack-tools-1.15r.ebuild:
+  Removed nomirror so we can get source from the gentoo mirror. Added nasm
+  dependency. Added to ~amd64. Removed -mpreferred-stack-boundary=2 from vendor
+  CFLAGS.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> musepack-tools-1.15r.ebuild:
+  Add flag-o-matic for bug 49179
+
+*musepack-tools-1.15r (22 Apr 2004)
+
+  22 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  musepack-tools-1.15r.ebuild, files/musepack-tools-1.15r-Makefile.patch:
+  Initial ebuild provided by 4nykey@nm.ru in bug #47615.
+
diff --git a/media-sound/musepack-tools/Manifest b/media-sound/musepack-tools/Manifest
new file mode 100644
index 0000000..6720c29
--- /dev/null
+++ b/media-sound/musepack-tools/Manifest
@@ -0,0 +1,10 @@
+AUX musepack-tools-1.15v-Makefile-esd.patch 639 RMD160 de870cdf6b082954c766bc98fc42cadd4864ff5d SHA1 014764a198d2a8e91cd2f855549be1a8bf1cdf8f SHA256 33b92e1f06bdef80047225eba85308ae1e2c30b1bf1a744db54372e7baab8b21
+AUX musepack-tools-1.15v-Makefile.patch 572 RMD160 c8402ba8d07c2381759ecb2eda1a38b153b28d94 SHA1 87962aec7e82dbe7e06c897afe9c34f7999b0267 SHA256 12d9fe1a1980d3172128aae22f1c5919730e28925dd0aa12fceca4dfcb3db434
+AUX musepack-tools-1.15v-execstack.patch 1256 RMD160 a4d15a6640db2dedf2790e398c2d5309eee1c416 SHA1 25de758e8982ac83aef017cfe1083985c7b3f4d2 SHA256 655b7945855d7e65bbaa5dee6be854c45c14e19036ab73ee207a939d3bd25277
+AUX musepack-tools-1.15v-fbsd.patch 469 RMD160 e969a4896ec14ca7a02a8b36f616f00977e0bd72 SHA1 0ce936e217d51a878450c7570905a8ca43324d72 SHA256 71b17ca4f444ca08685f3e0838b86b1c252cf6374a054884c6cc13c9809200e3
+AUX musepack-tools-1.15v-gcc4.patch 288 RMD160 6ab9a05d263c628e138f98a9ad72532f7a472543 SHA1 9232afeeab2e8f9ae5175275af3650ff7f71f048 SHA256 9e52b4d1b93538e6525d63aae2ea30fcad8e046f276419b4a2e0f30d714282ff
+DIST mpcsv7-src-1.15v.tar.bz2 416868 RMD160 11b28faab8e23b22366ddd6a7b93aace257838e7 SHA1 4fb6b1a45858638eb6b854b910038baa1b410146 SHA256 ca602ea9d41038bdf7c04371d6f12d0eca5b71c29433633732d607e1b410a4bd
+EBUILD musepack-tools-1.15v-r1.ebuild 1868 RMD160 c527450f0a392d029bd40c6272225b50b88bd89a SHA1 83cc68c26b1d48f8e381a51a27937cfa85935722 SHA256 cd6776ecc39d8ec6f95f0f59d823061ae1ac0c8b9e9d9fccaa17ae8e14ae6857
+EBUILD musepack-tools-1.15v.ebuild 1809 RMD160 69820ea8b2700c94b33ad4b2c43d60e43cf5a579 SHA1 bb1ef8e143dec042fa0b32caa50e535d91092ac6 SHA256 5495da2fdef82ff7eabb5ac30eefa2a1d72a41b0e44444a80880ba6e93934431
+MISC ChangeLog 6611 RMD160 8f07204deac4810b7d8074f511a9d4a9b6fb29c8 SHA1 4a5e7b8a3fc950f8f25d82a9382d7dbb4855a496 SHA256 347a3495623a2955709c1352a110e5450ed4245c2eef0ed3677cb7a3e6f33662
+MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
diff --git a/media-sound/musepack-tools/files/musepack-tools-1.15v-Makefile-esd.patch b/media-sound/musepack-tools/files/musepack-tools-1.15v-Makefile-esd.patch
new file mode 100644
index 0000000..935d281
--- /dev/null
+++ b/media-sound/musepack-tools/files/musepack-tools-1.15v-Makefile-esd.patch
@@ -0,0 +1,15 @@
+--- Makefile.orig	2007-04-24 09:07:22.000000000 -0700
++++ Makefile	2007-04-24 09:07:43.000000000 -0700
+@@ -310,10 +310,10 @@
+ 
+ $(MPPDEC_TARGET): $(MPPDEC_OBJ)
+ ifndef BLD_STATIC
+-	$(CC)         $(CFLAGS) $(MPPDEC_OBJ) -o $(MPPDEC_TARGET)        $(LDADD)
++	$(CC)         $(CFLAGS) $(MPPDEC_OBJ) -o $(MPPDEC_TARGET)        $(LDADD) -lesd
+ #	-$(STRIP)     $(STRIPOPT)                $(MPPDEC_TARGET)
+ else
+-	$(CC) -static $(CFLAGS) $(MPPDEC_OBJ) -o $(MPPDEC_TARGET)-static $(LDADD)
++	$(CC) -static $(CFLAGS) $(MPPDEC_OBJ) -o $(MPPDEC_TARGET)-static $(LDADD) -lesd
+ #	-$(STRIP)     $(STRIPOPT)                $(MPPDEC_TARGET)-static
+ endif
+ 
diff --git a/media-sound/musepack-tools/files/musepack-tools-1.15v-Makefile.patch b/media-sound/musepack-tools/files/musepack-tools-1.15v-Makefile.patch
new file mode 100644
index 0000000..b6e1d16
--- /dev/null
+++ b/media-sound/musepack-tools/files/musepack-tools-1.15v-Makefile.patch
@@ -0,0 +1,23 @@
+--- Makefile.orig	2005-02-07 15:56:48.000000000 +0100
++++ Makefile	2005-02-07 23:23:20.422596896 +0100
+@@ -36,7 +36,7 @@
+ # If unset Intel 386 with optimization for Pentium is selected.
+ 
+ ifndef ARCH
+-ARCH     = -march=i586 -m$(TUNE)=i686
++ARCH     = #-march=i586 -m$(TUNE)=i686
+ endif
+ 
+ ifdef MINGW
+@@ -176,9 +176,9 @@
+ 	-fno-finite-math-only -fno-unsafe-math-optimizations
+ endif
+ 
+-OPTIM_SPEED = -O2 $(FLAGS) $(UNBREAK)
++OPTIM_SPEED = $(UNBREAK)
+ 
+-OPTIM_SIZE = -Os $(FLAGS) $(UNBREAK)
++OPTIM_SIZE = $(UNBREAK)
+ 
+ # Options to generate Assembly code for inspecting
+ 
diff --git a/media-sound/musepack-tools/files/musepack-tools-1.15v-execstack.patch b/media-sound/musepack-tools/files/musepack-tools-1.15v-execstack.patch
new file mode 100644
index 0000000..075fad3
--- /dev/null
+++ b/media-sound/musepack-tools/files/musepack-tools-1.15v-execstack.patch
@@ -0,0 +1,44 @@
+Index: sv7/cpu_feat.nas
+===================================================================
+--- sv7.orig/cpu_feat.nas
++++ sv7/cpu_feat.nas
+@@ -140,3 +140,6 @@ proc    Init_FPU2
+ endproc
+ 
+         end
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
+Index: sv7/fft4gasm.nas
+===================================================================
+--- sv7.orig/fft4gasm.nas
++++ sv7/fft4gasm.nas
+@@ -422,3 +422,6 @@ lbl5:
+ 
+ 
+ ;##################################################################
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
+Index: sv7/list_korr_asm.nas
+===================================================================
+--- sv7.orig/list_korr_asm.nas
++++ sv7/list_korr_asm.nas
+@@ -98,3 +98,6 @@ lbl2:
+         fstp    tword [eax+ 8]          ; x
+         ret
+ ;
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
+Index: sv7/synthasm.nas
+===================================================================
+--- sv7.orig/synthasm.nas
++++ sv7/synthasm.nas
+@@ -2225,3 +2225,6 @@ endproc
+ ;
+ ; end of synthasm.nas
+ ;
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
diff --git a/media-sound/musepack-tools/files/musepack-tools-1.15v-fbsd.patch b/media-sound/musepack-tools/files/musepack-tools-1.15v-fbsd.patch
new file mode 100644
index 0000000..1171b57
--- /dev/null
+++ b/media-sound/musepack-tools/files/musepack-tools-1.15v-fbsd.patch
@@ -0,0 +1,13 @@
+Index: sv7/mppdec.h
+===================================================================
+--- sv7.orig/mppdec.h
++++ sv7/mppdec.h
+@@ -160,7 +160,7 @@
+ # include <sys/time.h>
+ # if   defined __linux__        // the standard is that this file is stored somewhere on the hard disk
+ #  include <linux/soundcard.h>
+-# elif defined __bsdi__
++# elif defined __bsdi__ || __FreeBSD__ >= 5
+ #  include <sys/soundcard.h>
+ # elif defined __FreeBSD__
+ #  include <machine/soundcard.h>
diff --git a/media-sound/musepack-tools/files/musepack-tools-1.15v-gcc4.patch b/media-sound/musepack-tools/files/musepack-tools-1.15v-gcc4.patch
new file mode 100644
index 0000000..ddae02c
--- /dev/null
+++ b/media-sound/musepack-tools/files/musepack-tools-1.15v-gcc4.patch
@@ -0,0 +1,11 @@
+--- sv7/mppenc.c~	2005-02-10 04:44:48.944566440 +0100
++++ sv7/mppenc.c	2005-02-10 04:45:04.464207096 +0100
+@@ -1844,7 +1844,7 @@
+ }
+ 
+ 
+-static void
++void
+ OverdriveReport ( void )
+ {
+     if ( Overflows > 0 ) {                                                // report internal clippings
diff --git a/media-sound/musepack-tools/metadata.xml b/media-sound/musepack-tools/metadata.xml
new file mode 100644
index 0000000..e1774e3
--- /dev/null
+++ b/media-sound/musepack-tools/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/musepack-tools/musepack-tools-1.15v-r1.ebuild b/media-sound/musepack-tools/musepack-tools-1.15v-r1.ebuild
new file mode 100644
index 0000000..4cedf29
--- /dev/null
+++ b/media-sound/musepack-tools/musepack-tools-1.15v-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-1.15v-r1.ebuild,v 1.2 2007/05/14 21:21:37 beandog Exp $
+
+IUSE="static 16bit esd"
+
+inherit eutils flag-o-matic flag-o-matic
+
+S="${WORKDIR}/sv7"
+
+DESCRIPTION="Musepack audio compression tools"
+HOMEPAGE="http://www.musepack.net"
+SRC_URI="http://files.musepack.net/source/mpcsv7-src-${PV}.tar.bz2"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+
+RDEPEND="esd? ( media-sound/esound )
+	media-libs/id3lib
+	!media-sound/mppenc"
+
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )
+	x86-fbsd? ( dev-lang/nasm )
+	amd64? ( dev-lang/nasm )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}/${P}-Makefile.patch"
+	epatch "${FILESDIR}/${P}-gcc4.patch"
+	use esd && epatch "${FILESDIR}/${P}-Makefile-esd.patch"
+
+	sed -i 's/#define USE_IRIX_AUDIO/#undef USE_IRIX_AUDIO/' mpp.h
+
+	if ! use esd ; then
+		sed -i -e 's/#define USE_ESD_AUDIO/#undef USE_ESD_AUDIO/' mpp.h
+	else
+		sed -i -e 's/^LDADD	   = -lm$/LDADD	   = $(shell esd-config --libs)/' \
+			Makefile
+	fi
+
+	if [[ $(tc-arch) != "x86" ]] ; then
+		sed -i 's/#define USE_ASM/#undef USE_ASM/' mpp.h
+	fi
+
+	if [[ "$(tc-arch)" == "amd64" ]] ; then
+		sed -i 's/-f elf$/-f elf64/' Makefile
+	fi
+
+	use 16bit && sed -i 's|//#define MAKE_16BIT|#define MAKE_16BIT|' mpp.h
+
+	# Bug #109699; console redirection to /dev/tty makes no sense
+	sed -i -e 's/$(LDADD) &> $(LOGFILE)/$(LDADD)/' Makefile
+
+	epatch "${FILESDIR}/${P}-execstack.patch"
+	epatch "${FILESDIR}/${P}-fbsd.patch"
+}
+
+src_compile() {
+	filter-flags "-fprefetch-loop-arrays"
+	filter-flags "-mfpmath=sse" "-mfpmath=sse,387"
+	use static && export BLD_STATIC=1
+
+	append-flags "-I${S}"
+
+	emake CC="$(tc-getCC)" clean || die
+
+	ARCH= emake CC="$(tc-getCC)" mppenc mppdec replaygain || die
+}
+
+src_install() {
+	dobin mppenc mppdec replaygain
+	dodoc README doc/ChangeLog doc/MANUAL.TXT doc/NEWS doc/SV7.txt doc/TODO*
+}
diff --git a/media-video/aegisub/aegisub-2.1.6_pre2505.ebuild b/media-video/aegisub/aegisub-2.1.6_pre2505.ebuild
new file mode 100644
index 0000000..1b9893a
--- /dev/null
+++ b/media-video/aegisub/aegisub-2.1.6_pre2505.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+WX_GTK_VER="2.8"
+inherit eutils wxwidgets
+
+DESCRIPTION="Advanced SSA/ASS subtitle editor"
+HOMEPAGE="http://malakith.net/aegiwiki/Main_Page"
+SRC_URI="http://www.mahou.org/~verm/aegisub/aegisub-2.1.6-dev-r2505.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug ffmpeg lua openal perl portaudio pulseaudio spell ruby"
+
+RDEPEND="=x11-libs/wxGTK-2.8*
+	media-libs/libass
+	media-libs/fontconfig
+	media-libs/freetype
+
+	alsa? (	media-libs/alsa-lib )
+	portaudio? ( =media-libs/portaudio-18* )
+	pulseaudio? ( media-sound/pulseaudio )
+	openal? ( media-libs/openal )
+
+	perl? ( dev-lang/perl )
+	ruby? ( dev-lang/ruby )
+	lua? ( dev-lang/lua )
+
+	spell? ( app-text/hunspell )
+	ffmpeg? ( media-video/ffmpeg )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	media-gfx/imagemagick
+	dev-libs/glib"
+
+S="${WORKDIR}/aegisub-2.1.6-dev-r2505"
+
+pkg_setup() {
+	check_wxuse opengl
+}
+
+src_compile() {
+	econf --with-libass --prefix=/usr \
+	$(use_with alsa) \
+	$(use_with portaudio) \
+	$(use_with pulseaudio) \
+	$(use_with openal) \
+	$(use_with lua) \
+	$(use_with ruby) \
+	$(use_with perl) \
+	$(use_with ffmpeg) \
+	$(use_with spell hunspell) \
+	$(use_enable debug)
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	doicon "${FILESDIR}"/${PN}.png
+	make_desktop_entry "${PN}" "Aegisub" "${PN}" "AudioVideo;Video;"
+}
diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild
new file mode 100644
index 0000000..475cd1e
--- /dev/null
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+WX_GTK_VER="2.8"
+inherit eutils subversion wxwidgets
+
+DESCRIPTION="Advanced SSA/ASS subtitle editor"
+HOMEPAGE="http://malakith.net/aegiwiki/Main_Page"
+SRC_URI=""
+
+ESVN_REPO_URI="https://spaceboyz.net/svn/aegisub/trunk"
+ESVN_PROJECT="https://spaceboyz.net/svn/aegisub"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="alsa debug ffmpeg lua openal perl portaudio pulseaudio spell ruby"
+
+RDEPEND="=x11-libs/wxGTK-2.8*
+	media-libs/libass
+	media-libs/fontconfig
+	media-libs/freetype
+
+	alsa? (	media-libs/alsa-lib )
+	portaudio? ( =media-libs/portaudio-18* )
+	pulseaudio? ( media-sound/pulseaudio )
+	openal? ( media-libs/openal )
+
+	perl? ( dev-lang/perl )
+	ruby? ( dev-lang/ruby )
+	lua? ( dev-lang/lua )
+
+	spell? ( app-text/hunspell )
+	ffmpeg? ( media-video/ffmpeg )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	media-gfx/imagemagick
+	dev-libs/glib"
+
+pkg_setup() {
+	check_wxuse opengl
+}
+
+src_compile() {
+	# The provided autogen script executes configure too
+	# I'm using it instead of autotools because it also converts
+	# some image files and do some other stuff.
+	./autogen.sh --with-libass --prefix=/usr \
+		$(use_with alsa) \
+		$(use_with portaudio) \
+		$(use_with pulseaudio) \
+		$(use_with openal) \
+		$(use_with lua) \
+		$(use_with ruby) \
+		$(use_with perl) \
+		$(use_with ffmpeg) \
+		$(use_with spell hunspell) \
+		$(use_enable debug) || die "configure failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	doicon "${FILESDIR}"/${PN}.png
+	make_desktop_entry "${PN}" "Aegisub" "${PN}" "AudioVideo;Video;"
+}
diff --git a/media-video/aegisub/files/aegisub.png b/media-video/aegisub/files/aegisub.png
new file mode 100644
index 0000000..f017ff5
--- /dev/null
+++ b/media-video/aegisub/files/aegisub.png
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
new file mode 100644
index 0000000..5278e05
--- /dev/null
+++ b/media-video/ffmpeg/ChangeLog
@@ -0,0 +1,143 @@
+# ChangeLog for media-video/ffmpeg
+# Copyright 2006-2009 Berkano Overlay; distributed under the GPL version 2
+
+  26 Jan 2009; Ben de Groot <yngwin@gentoo.org>;
+  +files/disable-version-rebranding-2009.01.patch, ffmpeg-20099999.ebuild:
+  Update patch
+
+  06 Jan 2009; Ben de Groot <yngwin@gentoo.org>; ffmpeg-20099999.ebuild:
+  Adding X and gsm useflags
+
+  06 Jan 2009; Ben de Groot <yngwin@gentoo.org>; -ffmpeg-20080908.ebuild,
+  +ffmpeg-20099999.ebuild:
+  Add vdpau useflag
+
+  06 Nov 2008; Ben de Groot <yngwin@gentoo.org>; ffmpeg-20089999-r1.ebuild:
+  Remove ffmpeg-shared-gcc4.1.patch from live svn ebuild
+
+  21 Oct 2008; Ben de Groot <yngwin@gentoo.org>; ffmpeg-20089999-r1.ebuild:
+  Rekeywording live svn ebuild, as newer stuff is also unmasked in portage,
+  and updating the x264 dep.
+
+  09 Oct 2008; Ben de Groot <yngwin@gentoo.org>;
+  +files/disable-version-rebranding-2008.10.patch,
+  files/disable-version-rebranding-2008.patch, ffmpeg-20089999-r1.ebuild:
+  Restoring patch for 20080908 snapshot version. Renaming current patch for
+  20089999 live ebuild.
+
+  08 Oct 2008; Ben de Groot <yngwin@gentoo.org>; ffmpeg-20089999-r1.ebuild:
+  Removing a52 useflag and dep as upstream has dropped support.
+
+  01 Oct 2008; Ben de Groot <yngwin@gentoo.org>;
+  files/disable-version-rebranding-2008.patch:
+  Updating patch
+
+  16 Sep 2008; Ben de Groot <yngwin@gentoo.org>; ffmpeg-20089999-r1.ebuild:
+  Dropping keywords for api/abi breaking version
+
+  16 Sep 2008; Ben de Groot <yngwin@gentoo.org>; +ffmpeg-20080908.ebuild,
+  +files/ffmpeg-x86-pic-fix-20080916.patch, -ffmpeg-20089999.ebuild,
+  +ffmpeg-20089999-r1.ebuild:
+  Adding ffmpeg-20080908 - latest revision before current API/ABI breakage,
+  and updating 20089999 with adjusted x86-pic patch.
+
+  06 Sep 2008; Ben de Groot <yngwin@gentoo.org>; ffmpeg-20089999.ebuild,
+  +files/ffmpeg-icc.patch:
+  Adding icc patch and useflag
+
+  06 Sep 2008; Ben de Groot <yngwin@gentoo.org>; ffmpeg-20089999.ebuild:
+  Removing eac3 patching and useflag, as this is now part of the internal ac3
+  codec.
+
+  22 Aug 2008; Ben de Groot <yngwin@gentoo.org>; ffmpeg-20089999.ebuild:
+  Changing eac3 patch to live svn checkout
+
+  19 Aug 2008; Ben de Groot <yngwin@gentoo.org>;
+  +files/ffmpeg-eac3_decoder-20080817.patch, ffmpeg-20089999.ebuild:
+  Adding new eac3 patch, removed the swscaler useflag and enabled swscale by
+  default. Also (temporarily) adding -D_BSD_SOURCE to fix a compile issue
+  reported on the forums.
+
+  10 Jul 2008; Ben de Groot <yngwin@gentoo.org>; ffmpeg-20089999.ebuild:
+  Added schroedinger useflag and dep for dirac support.
+
+  21 Jun 2008; Ben de Groot <yngwin@gentoo.org>;
+  files/disable-version-rebranding-2008.patch, ffmpeg-20089999.ebuild:
+  New versioning stuff as upstream changed things.
+
+  10 May 2008; Ben de Groot <yngwin@gentoo.org>;
+  files/ffmpeg-x86-pic-fix.patch, -ffmpeg-20079999-r2.ebuild,
+  ffmpeg-20089999.ebuild:
+  Removing old ebuild, rekeywording the new one. Updated pic-fix patch.
+
+  18 Apr 2008; Ben de Groot <yngwin@gentoo.org>; ffmpeg-20089999.ebuild:
+  Current svn no longer needs libdir patch, so removed from ebuild.
+
+  17 Apr 2008; Ben de Groot <yngwin@gentoo.org>; files/ffmpeg-libdir.patch:
+  Fixing libdir patch for current version
+
+  12 Apr 2008; Ben de Groot <yngwin@gentoo.org>;
+  +files/disable-version-rebranding-2008.patch, ffmpeg-20089999.ebuild:
+  New disable-version-rebranding patch
+
+  12 Apr 2008; Ben de Groot <yngwin@gentoo.org>; ffmpeg-20089999.ebuild:
+  Adding hardcoded-tables useflag and broken relocations flag.
+
+  08 Apr 2008; Ben de Groot <yngwin@gentoo.org>; ffmpeg-20079999-r2.ebuild,
+  ffmpeg-20089999.ebuild:
+  Adjust x264 dep.
+
+  29 Mar 2008; Ben de Groot <yngwin@gentoo.org>; ffmpeg-20079999-r2.ebuild,
+  ffmpeg-20089999.ebuild:
+  Fix x264 dep to either in old ebuild. Update disable-stripping option in
+  current ebuild.
+
+  25 Mar 2008; Ben de Groot <yngwin@gentoo.org>; ffmpeg-20089999.ebuild:
+  Changing x264 dep to x264 || x264-svn.
+
+  11 Mar 2008; Ben de Groot <yngwin@gentoo.org>; +ffmpeg-20089999.ebuild:
+  Changed and added current configure options. Dropping keywords because at this
+  point most packages that depend on ffmpeg will not build against current svn.
+
+  17 Nov 2007; Ben de Groot (yngwin) <ben@berkano.net>;
+  ffmpeg-20079999-r2.ebuild:
+  Removed no longer valid libogg configure option. Removed ogg useflag. Libogg
+  is now a dependency with vorbis and theora useflags. Also made a few
+  cosmetic changes.
+
+  13 Sep 2007; Ben de Groot (yngwin) <ben@berkano.net>;
+  -ffmpeg-20069999-r1.ebuild, -ffmpeg-20069999-r2.ebuild,
+  -ffmpeg-20079999.ebuild, -ffmpeg-20079999-r1.ebuild,
+  ffmpeg-20079999-r2.ebuild:
+  Removing older ebuilds. Updating current ebuild with latest changes in
+  configure options. Adding ipv6 useflag.
+
+  07 Jun 2007; Ben de Groot; ffmpeg-20079999-r2.ebuild:
+  Updated renamed configure options for xvid and x264.
+
+  22 May 2007; Ben de Groot; +ffmpeg-20079999-r2.ebuild:
+  Removing dts useflag, as internal libavcodec is now used instead of libdts.
+
+  11 May 2007; Ben de Groot; ffmpeg-20079999-r1.ebuild,
+  +files/ffmpeg-x86-pic-fix.patch:
+  Change x86 PIC fix to a more elegant patch.
+
+  10 May 2007; Ben de Groot; ffmpeg-20079999-r1.ebuild:
+  Adding -fPIC flag for x86 to fix assembly compilation borkage.
+
+  08 May 2007; Ben de Groot; ffmpeg-20079999-r1.ebuild:
+  Updated configure flags for libamr-(nb|wb).
+
+  30 Apr 2007; Ben de Groot; ffmpeg-20079999-r1.ebuild:
+  Removing no longer needed asm-pic patch from ebuild.
+
+  30 Apr 2007; Ben de Groot; +ffmpeg-20079999-r1.ebuild:
+  Recent svn uses external amr libs. Changed ebuild accordingly after adding
+  those external deps. USE-flag amr now replaced by amrnb and amrwb.
+
+  11 Apr 2007; torstenvdb; ffmpeg-20079999.ebuild:
+  Added ~sparc keyword to ffmpeg ebuild.
+
+  09 Apr 2007; Ben de Groot; ChangeLog:
+  Fixed ebuild with asm-pic.patch from official tree.
+
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
new file mode 100644
index 0000000..8acc156
--- /dev/null
+++ b/media-video/ffmpeg/Manifest
@@ -0,0 +1,18 @@
+AUX cabac-asm.patch 296 RMD160 b021017df231da679b83b9b8780ef7dc25af54a5 SHA1 3a391182010bbdb4c4f9651e4af31f8a63ad83be SHA256 5693364fc558ba94e6fe208954006c6d842d97c9be14ba2373429474dd471066
+AUX disable-version-rebranding-2008.10.patch 360 RMD160 61d5deb702fc05cc220877cab780571d91a65011 SHA1 3288b2e8af07ffcabc8f2b5626f34fb5585ebdf6 SHA256 ddd3a457683a53436bbd7286cfe3c8b9a6ebb3a5a4e0fd987021e668523fe9de
+AUX disable-version-rebranding-2008.patch 343 RMD160 a95f4fe8bbfdf4c87948f1c578899a2619a222e0 SHA1 30c1a3656f3c8814fb3a510a3e60e04c519cb7a4 SHA256 b64298ab0e77e2f956e1000b13c62827a492ffd61501c7a273a71abf1da1418a
+AUX disable-version-rebranding-2009.01.patch 376 RMD160 b182165b966c42594540da83b13cbcc7bc2d2939 SHA1 bf0ea92498005309809752d30e8d08e4d370ac49 SHA256 708f3e3ba2615242c0518e3f1132dea16d3bf6ed3e979d0b2b6477d761298d18
+AUX disable-version-rebranding.patch 308 RMD160 bdcc55c92302f0ff0f108038a49c09e4e2c8e907 SHA1 b1c319c16a60190ab4f92909b1d3f3b64dcc8834 SHA256 961a5d3c0b9e96f986de7956aa5a178175aa443684dc74167ef249a32e18efee
+AUX ffmpeg-amr-64bit.patch 1161 RMD160 c3e17a8e8a3e501ae9ce8b8e455063444d1bc15f SHA1 e4f280a2934e238529ca8b0d8d2abec2638d9fb1 SHA256 f993ac1ad11e254d846fbd0b3f73f81043551fce90438fdd196374ca9ece6c9c
+AUX ffmpeg-asm-pic.patch 2111 RMD160 3172d33b3f98933de028a279a55ceea488ab635a SHA1 1a60ea4599324bb29be2de818ee126804203b060 SHA256 a0799a9fda4312c468ec812af67e3a69f7e9f298f877734ce061dfaa4e5b1ce9
+AUX ffmpeg-eac3_decoder-20080817.patch 19284 RMD160 5f50814158a629db213a391c2550baa9fb98f32e SHA1 389dc7bdbfcbb43a9c9e83499366911f0dd5b41b SHA256 9e2eb69baa6e17dfcb151e93fd15a9a92d42cfd2c569ded2b24c82900b615045
+AUX ffmpeg-icc.patch 620 RMD160 9fa3f03b5b1f02f780861e3354907840cb7a885e SHA1 bd8ec19597199b88f4ccc951109bcc40ebf6467f SHA256 84dc49eb291aebf3f2ac1e63c0fee7b9fa7bc72b97e8e24ceb2f60e3dc6f523e
+AUX ffmpeg-libdir-pic.patch 6027 RMD160 f66a87d1ea3662c7ab0b9010e0f19af49638161a SHA1 43be5652bf5dc70d46697e3ff6b1b3f30a02d501 SHA256 30b404aaf936f3ed6fe0a1f94d7f03982fef3524c94e4ca2b98d97133347ecc8
+AUX ffmpeg-libdir.patch 305 RMD160 5663aeafb2f8f078a14529f73375446eb5792c95 SHA1 ba0a90d85c4c2434283b60c97ff45dd4a77bff81 SHA256 3bb2f715b9bd15e30f07ee1481badf0631fe9fc42e1d39ea47ec6bce3274657c
+AUX ffmpeg-shared-gcc4.1.patch 1667 RMD160 cf0318bcb812ad701e8cd55f10f59ca71933cf6c SHA1 0fd4d860efd8a0240fa66443429d8404d28a27dd SHA256 0bd67ed0cc1ea47c36756f5a66e504af4de85ce072c4b92083fb44065b5a3671
+AUX ffmpeg-soname-symlink.patch 4937 RMD160 3a3c83eb3e4bab26d039cd12bba938cf1a3f4f3b SHA1 77dbb66c84bc76dbb1b10b53b708c49f2d4a4c86 SHA256 0dc937f36d55e4c984dac967e1d0a4c261ebd6871f473dc2633a0a15332c5693
+AUX ffmpeg-unknown-options.patch 414 RMD160 46f7d8e81ab42368dabb6e29dec29a02d780055b SHA1 004e49a8461c5bf5923fd206e14d59a3e6b0ff84 SHA256 eb6f32617a42a9f55408ac64afd62c938aadb40bcf72c060a24ef5c426b4981b
+AUX ffmpeg-x86-pic-fix-20080916.patch 349 RMD160 4c5cdce5679f5648f4fba2d997486906ed07d7fa SHA1 c064f92b3f89f8a55c50043ed39db67eb1614221 SHA256 a820a255b398b5d86e66c65defc82037bf17eafa5b7fa43f2e9cfc378a613195
+AUX ffmpeg-x86-pic-fix.patch 281 RMD160 61d334ed06f04836f5e1823e339117ab0c4b4db2 SHA1 27644f0320bb8a89f5ed9fcaedb339eef998173f SHA256 091f94eefa8ffa8cc370e512d362eb8d08338e14cca13f3776c785294d314286
+EBUILD ffmpeg-20099999.ebuild 6010 RMD160 8f54f86fe33a4bd225fb060a486fa6488795a1ec SHA1 f71569b685f57fc024aa3c28ab2a3a5419ff4673 SHA256 09bd40afd193cd3cf706a701954a5a90ef75149dc256bc3b55f14fe4b4028a42
+MISC ChangeLog 5881 RMD160 c96772a6c8180e3e44b11ce554490463c34ce4f5 SHA1 6881e2802771c4dd950e840cdb2c209e0d0df133 SHA256 98131cb6d000177ccddd87a9701539ffa734f36f2ca0da0a65f8d49bbe661e0b
diff --git a/media-video/ffmpeg/ffmpeg-20099999.ebuild b/media-video/ffmpeg/ffmpeg-20099999.ebuild
new file mode 100644
index 0000000..163aa36
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-20099999.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header:  $
+
+EAPI="1"
+inherit subversion eutils flag-o-matic multilib toolchain-funcs
+
+ESVN_REPO_URI="svn://svn.mplayerhq.hu/ffmpeg/trunk"
+DESCRIPTION="Complete solution to record, convert and stream audio and video (source from SVN)"
+HOMEPAGE="http://ffmpeg.org/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+IUSE="+aac altivec amrnb amrwb -bindist -debug dirac doc gsm
+	+hardcoded-tables icc ieee1394 imlib ipv6 mmx +mp3 network oss schroedinger
+	sdl test theora +threads +truetype v4l vdpau +vorbis X +x264 +xvid +zlib"
+
+RDEPEND="aac? ( media-libs/faad2 media-libs/faac )
+	!bindist? (
+		amrnb? ( media-libs/amrnb )
+		amrwb? ( media-libs/amrwb )
+	)
+	dirac? ( media-video/dirac )
+	gsm? ( >=media-sound/gsm-1.0.12-r1 )
+	ieee1394? ( media-libs/libdc1394
+				sys-libs/libraw1394 )
+	imlib? ( media-libs/imlib2 )
+	mp3? ( media-sound/lame )
+	schroedinger? ( media-libs/schroedinger )
+	sdl? ( >=media-libs/libsdl-1.2.10 )
+	theora? ( media-libs/libtheora media-libs/libogg )
+	truetype? ( >=media-libs/freetype-2 )
+	vdpau? ( >=x11-drivers/nvidia-drivers-180.08 )
+	vorbis? ( media-libs/libvorbis media-libs/libogg )
+	X? ( x11-libs/libX11 x11-libs/libXext )
+	x264? ( >=media-libs/x264-0.0.20081006 )
+	xvid? ( >=media-libs/xvid-1.1.0 )
+	zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+	doc? ( app-text/texi2html )
+	mmx? ( dev-lang/yasm )
+	test? ( net-misc/wget )
+	v4l? ( sys-kernel/linux-headers )"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	subversion_src_unpack
+
+	# For Version Branding
+	cd "${ESVN_STORE_DIR}/${ESVN_CO_DIR}/${ESVN_PROJECT}/${ESVN_REPO_URI##*/}"
+	./version.sh . version.h
+	mv version.h "${S}"
+	cd "${S}"
+
+	# disable version rebranding
+#	epatch "${FILESDIR}/disable-version-rebranding-2009.01.patch"
+
+	# Make it use pic always since we don't need textrels
+	sed -i -e "s:LIBOBJFLAGS=\"\":LIBOBJFLAGS=\'\$\(PIC\)\':" configure
+
+	# To make sure the ffserver test will work
+	sed -i -e "s:-e debug=off::" tests/server-regression.sh
+
+	epatch "${FILESDIR}"/ffmpeg-x86-pic-fix-20080916.patch
+	use icc && epatch "${FILESDIR}"/ffmpeg-icc.patch
+}
+
+src_compile() {
+	#Note; library makefiles don't propogate flags from config.mak so
+	#use specified CFLAGS are only used in executables
+	replace-flags -O0 -O2
+	#x86, what a wonderful arch....
+	replace-flags -O1 -O2
+
+	# Append -fomit-frame-pointer to avoid some common issues
+	use debug || append-flags "-fomit-frame-pointer"
+
+	# Append -DBROKEN_RELOCATIONS to build for bug 179872.
+	append-flags "-DBROKEN_RELOCATIONS"
+
+	# temporary fix for bug reported at http://forums.gentoo.org/viewtopic-p-5186627.html#5186627
+	append-flags "-D_BSD_SOURCE"
+
+	local myconf="${EXTRA_ECONF}"
+
+	# disable mmx accelerated code if not requested, or if PIC is required
+	# as the provided asm decidedly is not PIC.
+	if ( gcc-specs-pie || ! use mmx ) && ( ! use amd64 ); then
+		myconf="${myconf} --disable-mmx --disable-mmx2"
+	fi
+
+	if use elibc_FreeBSD; then
+		myconf="${myconf} --enable-memalign-hack"
+	fi
+
+	use amd64 && myconf="${myconf} --arch=x86_64 --cpu=athlon64"
+
+	# enabled by default
+	use altivec || myconf="${myconf} --disable-altivec"
+	use debug || myconf="${myconf} --disable-debug"
+	use network || myconf="${myconf} --disable-network"
+	use ipv6 || myconf="${myconf} --disable-ipv6"
+	use zlib || myconf="${myconf} --disable-zlib"
+	use sdl || myconf="${myconf} --disable-ffplay"
+
+	# disabled by default
+	use mp3 && myconf="${myconf} --enable-libmp3lame"
+	use ieee1394 && myconf="${myconf} --enable-libdc1394"
+	use threads && myconf="${myconf} --enable-pthreads"
+	use xvid && myconf="${myconf} --enable-libxvid"
+	use vorbis && myconf="${myconf} --enable-libvorbis"
+	use x264 && myconf="${myconf} --enable-libx264"
+	use theora && myconf="${myconf} --enable-libtheora"
+	use aac && myconf="${myconf} --enable-libfaad --enable-libfaac"
+	use hardcoded-tables && myconf="${myconf} --enable-hardcoded-tables"
+	use dirac && myconf="${myconf} --enable-libdirac"
+	use schroedinger && myconf="${myconf} --enable-libschroedinger"
+	use vdpau && myconf="${myconf} --enable-vdpau"
+	use X && myconf="${myconf} --enable-x11grab"
+	if use gsm; then
+		myconf="${myconf} --enable-libgsm"
+		append-flags -I/usr/include/gsm
+	fi
+
+	if ! use bindist ; then
+		use amrnb && myconf="${myconf} --enable-libamr-nb --enable-nonfree"
+		use amrwb && myconf="${myconf} --enable-libamr-wb --enable-nonfree"
+	fi
+
+	myconf="${myconf} --enable-gpl --enable-postproc --disable-stripping"
+	myconf="${myconf} --enable-avfilter --enable-avfilter-lavf"
+
+	tc-is-cross-compiler && myconf="${myconf} --cross-compile --arch=$(tc-arch-kernel)"
+
+	# Specific workarounds for too-few-registers arch...
+	if [[ $(tc-arch) == "x86" ]]; then
+		filter-flags -fforce-addr -momit-leaf-frame-pointer
+		append-flags -fomit-frame-pointer
+		is-flag -O? || append-flags -O2
+		if use debug; then
+			# no need to warn about debug if not using debug flag
+			ewarn ""
+			ewarn "Debug information will be almost useless as the frame pointer is omitted."
+			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
+			ewarn "difficult to fix. Please have that in mind."
+			ewarn ""
+		fi
+	fi
+
+	cd "${S}"
+	./configure \
+		--prefix=/usr \
+		--libdir=/usr/$(get_libdir) \
+		--shlibdir=/usr/$(get_libdir) \
+		--mandir=/usr/share/man \
+		--enable-static --enable-shared \
+		"--cc=$(tc-getCC)" \
+		${myconf} || die "configure failed"
+
+	emake -j1 depend || die "depend failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	emake -j1 LDCONFIG=true DESTDIR=${D} install || die "Install Failed"
+
+	use doc && emake -j1 documentation
+	dodoc Changelog README INSTALL
+	dodoc doc/*
+}
+
+# Never die for now...
+src_test() {
+	cd "${S}/tests"
+	for t in "codectest libavtest test-server" ; do
+		make ${t} || ewarn "Some tests in ${t} failed"
+	done
+}
+
+pkg_postinst() {
+	echo
+	ewarn "ffmpeg may have had ABI changes, if ffmpeg based programs"
+	ewarn "like xine-lib or vlc stop working, please rebuild them."
+	echo
+}
diff --git a/media-video/ffmpeg/files/cabac-asm.patch b/media-video/ffmpeg/files/cabac-asm.patch
new file mode 100755
index 0000000..8bbf3a9
--- /dev/null
+++ b/media-video/ffmpeg/files/cabac-asm.patch
@@ -0,0 +1,11 @@
+--- libavcodec/cabac.h.orig	2006-11-19 15:38:01.000000000 +0000
++++ libavcodec/cabac.h	2006-11-19 15:48:57.000000000 +0000
+@@ -659,7 +659,7 @@
+ 
+         :"+c"(val)
+         :"r"(c)
+-        : "%eax", "%"REG_b, "%edx", "memory"
++        : "%eax", "%edx", "memory"
+     );
+     return val;
+ #else
diff --git a/media-video/ffmpeg/files/disable-version-rebranding-2008.10.patch b/media-video/ffmpeg/files/disable-version-rebranding-2008.10.patch
new file mode 100644
index 0000000..ee7e948
--- /dev/null
+++ b/media-video/ffmpeg/files/disable-version-rebranding-2008.10.patch
@@ -0,0 +1,12 @@
+--- src/common.mak.orig	2008-06-22 00:25:48.000000000 +0200
++++ src/common.mak	2008-06-22 00:28:54.000000000 +0200
+@@ -45,9 +45,6 @@
+ $(BUILD_ROOT_REL)/version.h: $(SVN_ENTRIES)
+ endif
+
+-$(BUILD_ROOT_REL)/version.h:
+-	$(SRC_PATH)/version.sh $(SRC_PATH) $@ $(EXTRA_VERSION)
+-
+ install: install-libs install-headers
+
+ uninstall: uninstall-libs uninstall-headers
diff --git a/media-video/ffmpeg/files/disable-version-rebranding-2008.patch b/media-video/ffmpeg/files/disable-version-rebranding-2008.patch
new file mode 100644
index 0000000..d3a9461
--- /dev/null
+++ b/media-video/ffmpeg/files/disable-version-rebranding-2008.patch
@@ -0,0 +1,12 @@
+--- src/common.mak.orig	2008-06-22 00:25:48.000000000 +0200
++++ src/common.mak	2008-06-22 00:28:54.000000000 +0200
+@@ -45,9 +45,6 @@
+ $(BUILD_ROOT_REL)/version.h: $(SVN_ENTRIES)
+ endif
+
+-$(BUILD_ROOT_REL)/version.h:
+-	$(SRC_PATH)/version.sh $(SRC_PATH) $@
+-
+ install: install-libs install-headers
+
+ uninstall: uninstall-libs uninstall-headers
diff --git a/media-video/ffmpeg/files/disable-version-rebranding-2009.01.patch b/media-video/ffmpeg/files/disable-version-rebranding-2009.01.patch
new file mode 100644
index 0000000..9cd7366
--- /dev/null
+++ b/media-video/ffmpeg/files/disable-version-rebranding-2009.01.patch
@@ -0,0 +1,12 @@
+--- ffmpeg/common.mak.orig	2009-01-26 20:24:53.000000000 +0100
++++ ffmpeg/common.mak	2009-01-26 20:25:54.000000000 +0100
+@@ -48,9 +48,6 @@
+ $(BUILD_ROOT_REL)/version.h: $(SVN_ENTRIES)
+ endif
+ 
+-$(BUILD_ROOT_REL)/version.h: $(SRC_PATH_BARE)/version.sh
+-	$< $(SRC_PATH) $@ $(EXTRA_VERSION)
+-
+ install: install-libs install-headers
+ 
+ uninstall: uninstall-libs uninstall-headers
diff --git a/media-video/ffmpeg/files/disable-version-rebranding.patch b/media-video/ffmpeg/files/disable-version-rebranding.patch
new file mode 100755
index 0000000..3763df5
--- /dev/null
+++ b/media-video/ffmpeg/files/disable-version-rebranding.patch
@@ -0,0 +1,12 @@
+--- Makefile.orig	2006-11-08 00:18:09.000000000 +0000
++++ Makefile	2006-11-08 00:19:46.000000000 +0000
+@@ -90,9 +90,6 @@
+ 	cp -p $< $@
+ 	$(STRIP) $@
+ 
+-version.h:
+-	$(SRC_PATH)/version.sh $(SRC_PATH)
+-
+ output_example$(EXESUF): output_example.o .libs
+ 	$(CC) $(LDFLAGS) -o $@ output_example.o $(EXTRALIBS)
+ 
diff --git a/media-video/ffmpeg/files/ffmpeg-amr-64bit.patch b/media-video/ffmpeg/files/ffmpeg-amr-64bit.patch
new file mode 100755
index 0000000..540ef94
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-amr-64bit.patch
@@ -0,0 +1,27 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN ffmpeg-0.4.9-p20060302.orig/libavcodec/amr_float/typedef.h ffmpeg-0.4.9-p20060302/libavcodec/amr_float/typedef.h
+--- ffmpeg-0.4.9-p20060302.orig/libavcodec/amr_float/typedef.h	2003-03-26 14:15:42.000000000 -0500
++++ ffmpeg-0.4.9-p20060302/libavcodec/amr_float/typedef.h	2006-04-19 18:39:20.000000000 -0400
+@@ -16,7 +16,7 @@
+ typedef char Word8;

+ typedef unsigned char UWord8;

+ typedef short Word16;

+-typedef long Word32;

++typedef int Word32;

+ typedef float Float32;

+ typedef double Float64;

+ 

+diff --exclude-from=/home/dang/.diffrc -u -ruN ffmpeg-0.4.9-p20060302.orig/libavcodec/amrwb_float/typedef.h ffmpeg-0.4.9-p20060302/libavcodec/amrwb_float/typedef.h
+--- ffmpeg-0.4.9-p20060302.orig/libavcodec/amrwb_float/typedef.h	2003-02-18 00:00:02.000000000 -0500
++++ ffmpeg-0.4.9-p20060302/libavcodec/amrwb_float/typedef.h	2006-04-19 18:37:30.000000000 -0400
+@@ -11,8 +11,8 @@
+ typedef unsigned char UWord8;

+ typedef short Word16;

+ typedef unsigned short UWord16;

+-typedef long Word32;

++typedef int Word32;

+ typedef double Float64;

+ typedef float Float32;

+ 

+-#endif
+\ No newline at end of file
++#endif

diff --git a/media-video/ffmpeg/files/ffmpeg-asm-pic.patch b/media-video/ffmpeg/files/ffmpeg-asm-pic.patch
new file mode 100644
index 0000000..0cf16c3
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-asm-pic.patch
@@ -0,0 +1,35 @@
+Index: ffmpeg/libavcodec/cabac.h
+===================================================================
+--- ffmpeg.orig/libavcodec/cabac.h
++++ ffmpeg/libavcodec/cabac.h
+@@ -376,7 +376,7 @@ static int av_always_inline get_cabac_in
+ #define BYTE        "16"
+ #define BYTEEND     "20"
+ #endif
+-#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE)
++#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) && !(defined(PIC) && defined(__GNUC__))
+     int bit;
+ 
+ #ifndef BRANCHLESS_CABAC_DECODER
+@@ -680,7 +680,7 @@ static av_always_inline int get_cabac_by
+ 
+ //FIXME the x86 code from this file should be moved into i386/h264 or cabac something.c/h (note ill kill you if you move my code away from under my fingers before iam finished with it!)
+ //FIXME use some macros to avoid duplicatin get_cabac (cant be done yet as that would make optimization work hard)
+-#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE)
++#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) && !(defined(PIC) && defined(__GNUC__))
+ static int decode_significance_x86(CABACContext *c, int max_coeff, uint8_t *significant_coeff_ctx_base, int *index){
+     void *end= significant_coeff_ctx_base + max_coeff - 1;
+     int minusstart= -(int)significant_coeff_ctx_base;
+Index: ffmpeg/libavcodec/h264.c
+===================================================================
+--- ffmpeg.orig/libavcodec/h264.c
++++ ffmpeg/libavcodec/h264.c
+@@ -6111,7 +6111,7 @@ static int decode_cabac_residual( H264Co
+             index[coeff_count++] = last;\
+         }
+         const uint8_t *sig_off = significant_coeff_flag_offset_8x8[MB_FIELD];
+-#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE)
++#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) && !(defined(PIC) && defined(__GNUC__))
+         coeff_count= decode_significance_8x8_x86(CC, significant_coeff_ctx_base, index, sig_off);
+     } else {
+         coeff_count= decode_significance_x86(CC, max_coeff, significant_coeff_ctx_base, index);
diff --git a/media-video/ffmpeg/files/ffmpeg-eac3_decoder-20080817.patch b/media-video/ffmpeg/files/ffmpeg-eac3_decoder-20080817.patch
new file mode 100644
index 0000000..366414b
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-eac3_decoder-20080817.patch
@@ -0,0 +1,506 @@
+Index: libavcodec/ac3dec.c
+===================================================================
+--- libavcodec/ac3dec.c	(revision 14819)
++++ libavcodec/ac3dec.c	(working copy)
+@@ -1,8 +1,10 @@
+ /*
+  * AC-3 Audio Decoder
+- * This code is developed as part of Google Summer of Code 2006 Program.
++ * This code was developed as part of Google Summer of Code 2006.
++ * E-AC-3 support was added as part of Google Summer of Code 2007.
+  *
+  * Copyright (c) 2006 Kartikey Mahendra BHATT (bhattkm at gmail dot com).
++ * Copyright (c) 2007-2008 Bartlomiej Wolowiec <bartek.wolowiec@gmail.com>
+  * Copyright (c) 2007 Justin Ruggles <justin.ruggles@gmail.com>
+  *
+  * Portions of this code are derived from liba52
+@@ -37,8 +39,8 @@
+ #include "ac3dec.h"
+ #include "ac3dec_data.h"
+ 
+-/** Maximum possible frame size when the specification limit is ignored */
+-#define AC3_MAX_FRAME_SIZE 21695
++/** Large enough for maximum possible frame size when the specification limit is ignored */
++#define AC3_FRAME_BUFFER_SIZE 32768
+ 
+ /**
+  * table for ungrouping 3 values in 7 bits.
+@@ -215,7 +217,7 @@
+ 
+     /* allocate context input buffer */
+     if (avctx->error_resilience >= FF_ER_CAREFUL) {
+-        s->input_buffer = av_mallocz(AC3_MAX_FRAME_SIZE + FF_INPUT_BUFFER_PADDING_SIZE);
++        s->input_buffer = av_mallocz(AC3_FRAME_BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE);
+         if (!s->input_buffer)
+             return AVERROR_NOMEM;
+     }
+@@ -302,10 +304,22 @@
+         s->channel_in_cpl[s->lfe_ch] = 0;
+     }
+ 
+-    if(hdr.bitstream_id > 10)
+-        return AC3_PARSE_ERROR_BSID;
+-
++    if (hdr.bitstream_id <= 10) {
++        s->eac3                  = 0;
++        s->snr_offset_strategy   = 2;
++        s->block_switch_syntax   = 1;
++        s->dither_flag_syntax    = 1;
++        s->bit_allocation_syntax = 1;
++        s->fast_gain_syntax      = 0;
++        s->first_cpl_leak        = 0;
++        s->dba_syntax            = 1;
++        s->skip_syntax           = 1;
++        memset(s->channel_uses_aht, 0, sizeof(s->channel_uses_aht));
+     return ac3_parse_header(s);
++    } else {
++        s->eac3 = 1;
++        return ff_eac3_parse_header(s);
++    }
+ }
+ 
+ /**
+@@ -428,7 +442,7 @@
+  * Get the transform coefficients for a particular channel
+  * reference: Section 7.3 Quantization and Decoding of Mantissas
+  */
+-static void get_transform_coeffs_ch(AC3DecodeContext *s, int ch_index, mant_groups *m)
++static void ac3_get_transform_coeffs_ch(AC3DecodeContext *s, int ch_index, mant_groups *m)
+ {
+     GetBitContext *gbc = &s->gbc;
+     int i, gcode, tbap, start, end;
+@@ -533,10 +547,27 @@
+     }
+ }
+ 
++static void get_transform_coeffs_ch(AC3DecodeContext *s, int blk, int ch,
++                                    mant_groups *m)
++{
++    if (!s->channel_uses_aht[ch]) {
++        ac3_get_transform_coeffs_ch(s, ch, m);
++    } else {
++        /* if AHT is used, mantissas for all blocks are encoded in the first
++           block of the frame. */
++        int bin;
++        if (!blk)
++            ff_eac3_get_transform_coeffs_aht_ch(s, ch);
++        for (bin = s->start_freq[ch]; bin < s->end_freq[ch]; bin++) {
++            s->fixed_coeffs[ch][bin] = s->pre_mantissa[ch][bin][blk] >> s->dexps[ch][bin];
++        }
++    }
++}
++
+ /**
+  * Get the transform coefficients.
+  */
+-static void get_transform_coeffs(AC3DecodeContext *s)
++static void get_transform_coeffs(AC3DecodeContext *s, int blk)
+ {
+     int ch, end;
+     int got_cplchan = 0;
+@@ -546,12 +577,12 @@
+ 
+     for (ch = 1; ch <= s->channels; ch++) {
+         /* transform coefficients for full-bandwidth channel */
+-        get_transform_coeffs_ch(s, ch, &m);
++        get_transform_coeffs_ch(s, blk, ch, &m);
+         /* tranform coefficients for coupling channel come right after the
+            coefficients for the first coupled channel*/
+         if (s->channel_in_cpl[ch])  {
+             if (!got_cplchan) {
+-                get_transform_coeffs_ch(s, CPL_CH, &m);
++                get_transform_coeffs_ch(s, blk, CPL_CH, &m);
+                 calc_transform_coeffs_cpl(s);
+                 got_cplchan = 1;
+             }
+@@ -657,7 +688,7 @@
+  */
+ static void ac3_upmix_delay(AC3DecodeContext *s)
+ {
+-    int channel_data_size = 128*sizeof(float);
++    int channel_data_size = sizeof(s->delay[0]);
+     switch(s->channel_mode) {
+         case AC3_CHMODE_DUALMONO:
+         case AC3_CHMODE_STEREO:
+@@ -698,19 +729,23 @@
+ 
+     /* block switch flags */
+     different_transforms = 0;
++    if (s->block_switch_syntax) {
+     for (ch = 1; ch <= fbw_channels; ch++) {
+         s->block_switch[ch] = get_bits1(gbc);
+         if(ch > 1 && s->block_switch[ch] != s->block_switch[1])
+             different_transforms = 1;
+     }
++    }
+ 
+     /* dithering flags */
++    if (s->dither_flag_syntax) {
+     s->dither_all = 1;
+     for (ch = 1; ch <= fbw_channels; ch++) {
+         s->dither_flag[ch] = get_bits1(gbc);
+         if(!s->dither_flag[ch])
+             s->dither_all = 0;
+     }
++    }
+ 
+     /* dynamic range */
+     i = !(s->channel_mode);
+@@ -723,9 +758,23 @@
+         }
+     } while(i--);
+ 
++    /* spectral extension strategy */
++    if (s->eac3 && (!blk || get_bits1(gbc))) {
++        if (get_bits1(gbc)) {
++            av_log_missing_feature(s->avctx, "Spectral extension", 1);
++            return -1;
++        }
++        /* TODO: parse spectral extension strategy info */
++    }
++
++    /* TODO: spectral extension coordinates */
++
+     /* coupling strategy */
+-    if (get_bits1(gbc)) {
++    if (!s->eac3)
++        s->cpl_strategy_exists[blk] = get_bits1(gbc);
++    if (s->cpl_strategy_exists[blk]) {
+         memset(bit_alloc_stages, 3, AC3_MAX_CHANNELS);
++        if (!s->eac3)
+         s->cpl_in_use[blk] = get_bits1(gbc);
+         if (s->cpl_in_use[blk]) {
+             /* coupling in use */
+@@ -736,15 +785,28 @@
+                 return -1;
+             }
+ 
++            /* check for enhanced coupling */
++            if (s->eac3 && get_bits1(gbc)) {
++                /* TODO: parse enhanced coupling strategy info */
++                av_log_missing_feature(s->avctx, "Enhanced coupling", 1);
++                return -1;
++            }
++
+             /* determine which channels are coupled */
++            if (s->eac3 && s->channel_mode == AC3_CHMODE_STEREO) {
++                s->channel_in_cpl[1] = 1;
++                s->channel_in_cpl[2] = 1;
++            } else {
+             for (ch = 1; ch <= fbw_channels; ch++)
+                 s->channel_in_cpl[ch] = get_bits1(gbc);
++            }
+ 
+             /* phase flags in use */
+             if (channel_mode == AC3_CHMODE_STEREO)
+                 s->phase_flags_in_use = get_bits1(gbc);
+ 
+-            /* coupling frequency range and band structure */
++            /* coupling frequency range */
++            /* TODO: modify coupling end freq if spectral extension is used */
+             cpl_begin_freq = get_bits(gbc, 4);
+             cpl_end_freq = get_bits(gbc, 4);
+             if (3 + cpl_end_freq - cpl_begin_freq < 0) {
+@@ -754,24 +816,40 @@
+             s->num_cpl_bands = s->num_cpl_subbands = 3 + cpl_end_freq - cpl_begin_freq;
+             s->start_freq[CPL_CH] = cpl_begin_freq * 12 + 37;
+             s->end_freq[CPL_CH] = cpl_end_freq * 12 + 73;
++
++            /* coupling band structure */
++            if (!s->eac3 || get_bits1(gbc)) {
+             for (bnd = 0; bnd < s->num_cpl_subbands - 1; bnd++) {
+-                if (get_bits1(gbc)) {
+-                    s->cpl_band_struct[bnd] = 1;
+-                    s->num_cpl_bands--;
++                    s->cpl_band_struct[bnd] = get_bits1(gbc);
+                 }
++            } else if (!blk) {
++                for (bnd = 0; bnd < s->num_cpl_subbands - 1; bnd++) {
++                    s->cpl_band_struct[bnd] = ff_eac3_default_cpl_band_struct[bnd+cpl_begin_freq+1];
++                }
+             }
+             s->cpl_band_struct[s->num_cpl_subbands-1] = 0;
++
++            /* calculate number of coupling bands based on band structure */
++            for (bnd = 0; bnd < s->num_cpl_subbands-1; bnd++) {
++                s->num_cpl_bands -= s->cpl_band_struct[bnd];
++            }
+         } else {
+             /* coupling not in use */
+-            for (ch = 1; ch <= fbw_channels; ch++)
++            for (ch = 1; ch <= fbw_channels; ch++) {
+                 s->channel_in_cpl[ch] = 0;
++                s->first_cpl_coords[ch] = 1;
++            }
++            s->first_cpl_leak = 1;
++            s->phase_flags_in_use = 0;
+         }
+-    } else if (!blk) {
++    } else if (!s->eac3) {
++        if(!blk) {
+         av_log(s->avctx, AV_LOG_ERROR, "new coupling strategy must be present in block 0\n");
+         return -1;
+     } else {
+         s->cpl_in_use[blk] = s->cpl_in_use[blk-1];
+     }
++    }
+     cpl_in_use = s->cpl_in_use[blk];
+ 
+     /* coupling coordinates */
+@@ -780,7 +858,17 @@
+ 
+         for (ch = 1; ch <= fbw_channels; ch++) {
+             if (s->channel_in_cpl[ch]) {
+-                if (get_bits1(gbc)) {
++                int new_cpl_coords = 0;
++
++                /* determine if coupling coordinates are new or reused */
++                if (s->eac3 && s->first_cpl_coords[ch]) {
++                    new_cpl_coords = 1;
++                    s->first_cpl_coords[ch] = 0;
++                } else {
++                    new_cpl_coords = get_bits1(gbc);
++                }
++
++                if (new_cpl_coords) {
+                     int master_cpl_coord, cpl_coord_exp, cpl_coord_mant;
+                     cpl_coords_exist = 1;
+                     master_cpl_coord = 3 * get_bits(gbc, 2);
+@@ -797,6 +885,9 @@
+                     av_log(s->avctx, AV_LOG_ERROR, "new coupling coordinates must be present in block 0\n");
+                     return -1;
+                 }
++            } else {
++                /* channel not in coupling */
++                s->first_cpl_coords[ch] = 1;
+             }
+         }
+         /* phase flags */
+@@ -809,7 +900,7 @@
+ 
+     /* stereo rematrixing strategy and band structure */
+     if (channel_mode == AC3_CHMODE_STEREO) {
+-        if (get_bits1(gbc)) {
++        if ((s->eac3 && !blk) || get_bits1(gbc)) {
+             s->num_rematrixing_bands = 4;
+             if(cpl_in_use && s->start_freq[CPL_CH] <= 61)
+                 s->num_rematrixing_bands -= 1 + (s->start_freq[CPL_CH] == 37);
+@@ -822,10 +913,14 @@
+     }
+ 
+     /* exponent strategies for each channel */
+-    s->exp_strategy[blk][CPL_CH] = EXP_REUSE;
+-    s->exp_strategy[blk][s->lfe_ch] = EXP_REUSE;
++    if (!s->eac3) {
++        for (ch = !cpl_in_use; ch <= s->channels; ch++) {
++            s->exp_strategy[blk][ch] = get_bits(gbc, 2 - (ch == s->lfe_ch));
++        }
++    }
++
++    /* check exponent strategies to set bit allocation stages */
+     for (ch = !cpl_in_use; ch <= s->channels; ch++) {
+-        s->exp_strategy[blk][ch] = get_bits(gbc, 2 - (ch == s->lfe_ch));
+         if(s->exp_strategy[blk][ch] != EXP_REUSE)
+             bit_alloc_stages[ch] = 3;
+     }
+@@ -852,7 +947,7 @@
+                 memset(bit_alloc_stages, 3, AC3_MAX_CHANNELS);
+         }
+     }
+-    if (cpl_in_use && s->exp_strategy[blk][CPL_CH] != EXP_REUSE) {
++    if (cpl_in_use) {
+         s->num_exp_groups[CPL_CH] = (s->end_freq[CPL_CH] - s->start_freq[CPL_CH]) /
+                                     (3 << (s->exp_strategy[blk][CPL_CH] - 1));
+     }
+@@ -870,6 +965,7 @@
+     }
+ 
+     /* bit allocation information */
++    if (s->bit_allocation_syntax) {
+     if (get_bits1(gbc)) {
+         s->bit_alloc_params.slow_decay = ff_ac3_slow_decay_tab[get_bits(gbc, 2)] >> s->bit_alloc_params.sr_shift;
+         s->bit_alloc_params.fast_decay = ff_ac3_fast_decay_tab[get_bits(gbc, 2)] >> s->bit_alloc_params.sr_shift;
+@@ -882,35 +978,78 @@
+         av_log(s->avctx, AV_LOG_ERROR, "new bit allocation info must be present in block 0\n");
+         return -1;
+     }
++    }
+ 
+     /* signal-to-noise ratio offsets and fast gains (signal-to-mask ratios) */
+-    if (get_bits1(gbc)) {
++    if (s->snr_offset_strategy && (!s->eac3 || !blk) && get_bits1(gbc)) {
++        int snr = 0;
+         int csnr;
+         csnr = (get_bits(gbc, 6) - 15) << 4;
+-        for (ch = !cpl_in_use; ch <= s->channels; ch++) { /* snr offset and fast gain */
+-            s->snr_offset[ch] = (csnr + get_bits(gbc, 4)) << 2;
+-            s->fast_gain[ch] = ff_ac3_fast_gain_tab[get_bits(gbc, 3)];
++        for (i = ch = !cpl_in_use; ch <= s->channels; ch++) {
++            /* snr offset */
++            if (ch == i || s->snr_offset_strategy == 2)
++                snr = (csnr + get_bits(gbc, 4)) << 2;
++            /* run at least last bit allocation stage if snr offset changes */
++            if(blk && s->snr_offset[ch] != snr) {
++                bit_alloc_stages[ch] = FFMAX(bit_alloc_stages[ch], 1);
++            }
++            s->snr_offset[ch] = snr;
++
++            /* fast gain (normal AC-3 only) */
++            if (!s->eac3) {
++                int prev = s->fast_gain[ch];
++                s->fast_gain[ch] = ff_ac3_fast_gain_tab[get_bits(gbc, 3)];
++                /* run last 2 bit allocation stages if fast gain changes */
++                if(blk && prev != s->fast_gain[ch])
++                    bit_alloc_stages[ch] = FFMAX(bit_alloc_stages[ch], 2);
++            }
+         }
+-        memset(bit_alloc_stages, 3, AC3_MAX_CHANNELS);
+-    } else if (!blk) {
++    } else if (!s->eac3 && !blk) {
+         av_log(s->avctx, AV_LOG_ERROR, "new snr offsets must be present in block 0\n");
+         return -1;
+     }
+ 
++    /* fast gain (E-AC-3 only) */
++    if (s->fast_gain_syntax && get_bits1(gbc)) {
++        for (ch = !cpl_in_use; ch <= s->channels; ch++) {
++            int prev = s->fast_gain[ch];
++            s->fast_gain[ch] = ff_ac3_fast_gain_tab[get_bits(gbc, 3)];
++            /* run last 2 bit allocation stages if fast gain changes */
++            if(blk && prev != s->fast_gain[ch])
++                bit_alloc_stages[ch] = FFMAX(bit_alloc_stages[ch], 2);
++        }
++    } else if (s->eac3 && !blk) {
++        for (ch = !cpl_in_use; ch <= s->channels; ch++)
++            s->fast_gain[ch] = ff_ac3_fast_gain_tab[4];
++    }
++
++    /* E-AC-3 to AC-3 converter SNR offset */
++    if (s->frame_type == EAC3_FRAME_TYPE_INDEPENDENT && get_bits1(gbc)) {
++        skip_bits(gbc, 10); // skip converter snr offset
++    }
++
+     /* coupling leak information */
+     if (cpl_in_use) {
+-        if (get_bits1(gbc)) {
++        if (s->first_cpl_leak || get_bits1(gbc)) {
++            int prev_fl = s->bit_alloc_params.cpl_fast_leak;
++            int prev_sl = s->bit_alloc_params.cpl_slow_leak;
+             s->bit_alloc_params.cpl_fast_leak = get_bits(gbc, 3);
+             s->bit_alloc_params.cpl_slow_leak = get_bits(gbc, 3);
++            /* run last 2 bit allocation stages for coupling channel if
++               coupling leak changes */
++            if(blk && (prev_fl != s->bit_alloc_params.cpl_fast_leak ||
++                    prev_sl != s->bit_alloc_params.cpl_slow_leak)) {
+             bit_alloc_stages[CPL_CH] = FFMAX(bit_alloc_stages[CPL_CH], 2);
+-        } else if (!blk) {
++            }
++        } else if (!s->eac3 && !blk) {
+             av_log(s->avctx, AV_LOG_ERROR, "new coupling leak info must be present in block 0\n");
+             return -1;
+         }
++        s->first_cpl_leak = 0;
+     }
+ 
+     /* delta bit allocation information */
+-    if (get_bits1(gbc)) {
++    if (s->dba_syntax && get_bits1(gbc)) {
+         /* delta bit allocation exists (strategy) */
+         for (ch = !cpl_in_use; ch <= fbw_channels; ch++) {
+             s->dba_mode[ch] = get_bits(gbc, 2);
+@@ -959,16 +1098,18 @@
+         }
+         if(bit_alloc_stages[ch] > 0) {
+             /* Compute bit allocation */
++            const uint8_t *bap_tab = s->channel_uses_aht[ch] ?
++                                     ff_eac3_hebap_tab : ff_ac3_bap_tab;
+             ff_ac3_bit_alloc_calc_bap(s->mask[ch], s->psd[ch],
+                                       s->start_freq[ch], s->end_freq[ch],
+                                       s->snr_offset[ch],
+                                       s->bit_alloc_params.floor,
+-                                      ff_ac3_bap_tab, s->bap[ch]);
++                                      bap_tab, s->bap[ch]);
+         }
+     }
+ 
+     /* unused dummy data */
+-    if (get_bits1(gbc)) {
++    if (s->skip_syntax && get_bits1(gbc)) {
+         int skipl = get_bits(gbc, 9);
+         while(skipl--)
+             skip_bits(gbc, 8);
+@@ -976,8 +1117,12 @@
+ 
+     /* unpack the transform coefficients
+        this also uncouples channels if coupling is in use. */
+-    get_transform_coeffs(s);
++    get_transform_coeffs(s, blk);
+ 
++    /* TODO: generate enhanced coupling coordinates and uncouple */
++
++    /* TODO: apply spectral extension */
++
+     /* recover coefficients if rematrixing is in use */
+     if(s->channel_mode == AC3_CHMODE_STEREO)
+         do_rematrixing(s);
+@@ -1042,7 +1187,7 @@
+     if (s->input_buffer) {
+         /* copy input buffer to decoder context to avoid reading past the end
+            of the buffer, which can be caused by a damaged input stream. */
+-        memcpy(s->input_buffer, buf, FFMIN(buf_size, AC3_MAX_FRAME_SIZE));
++        memcpy(s->input_buffer, buf, FFMIN(buf_size, AC3_FRAME_BUFFER_SIZE));
+         init_get_bits(&s->gbc, s->input_buffer, buf_size * 8);
+     } else {
+         init_get_bits(&s->gbc, buf, buf_size * 8);
+@@ -1161,5 +1306,5 @@
+     .init = ac3_decode_init,
+     .close = ac3_decode_end,
+     .decode = ac3_decode_frame,
+-    .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52 / AC-3"),
++    .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52 (AC-3, E-AC-3)"),
+ };
+Index: libavcodec/ac3dec.h
+===================================================================
+--- libavcodec/ac3dec.h	(revision 14819)
++++ libavcodec/ac3dec.h	(working copy)
+@@ -168,4 +168,16 @@
+ ///@}
+ } AC3DecodeContext;
+ 
++/**
++ * Parse the E-AC-3 frame header.
++ * This parses both the bit stream info and audio frame header.
++ */
++int ff_eac3_parse_header(AC3DecodeContext *s);
++
++/**
++ * Decode mantissas in a single channel for the entire frame.
++ * This is used when AHT mode is enabled.
++ */
++void ff_eac3_get_transform_coeffs_aht_ch(AC3DecodeContext *s, int ch);
++
+ #endif /* FFMPEG_AC3DEC_H */
+Index: libavcodec/Makefile
+===================================================================
+--- libavcodec/Makefile	(revision 14819)
++++ libavcodec/Makefile	(working copy)
+@@ -26,7 +26,7 @@
+ OBJS-$(CONFIG_ENCODERS)                += faandct.o jfdctfst.o jfdctint.o
+ 
+ OBJS-$(CONFIG_AASC_DECODER)            += aasc.o
+-OBJS-$(CONFIG_AC3_DECODER)             += ac3dec.o ac3tab.o ac3dec_data.o ac3.o mdct.o fft.o
++OBJS-$(CONFIG_AC3_DECODER)             += eac3dec.o ac3dec.o ac3tab.o ac3dec_data.o ac3.o mdct.o fft.o
+ OBJS-$(CONFIG_AC3_ENCODER)             += ac3enc.o ac3tab.o ac3.o
+ OBJS-$(CONFIG_ALAC_DECODER)            += alac.o
+ OBJS-$(CONFIG_AMV_DECODER)             += sp5xdec.o mjpegdec.o mjpeg.o
+Index: libavcodec/ac3enc.c
+===================================================================
+--- libavcodec/ac3enc.c	(revision 14819)
++++ libavcodec/ac3enc.c	(working copy)
+@@ -1365,5 +1365,5 @@
+     AC3_encode_close,
+     NULL,
+     .sample_fmts = (enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE},
+-    .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52 / AC-3"),
++    .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52 (AC-3, E-AC-3)"),
+ };
diff --git a/media-video/ffmpeg/files/ffmpeg-icc.patch b/media-video/ffmpeg/files/ffmpeg-icc.patch
new file mode 100644
index 0000000..18be12a
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-icc.patch
@@ -0,0 +1,14 @@
+Index: libswscale/yuv2rgb.c
+===================================================================
+--- libswscale/yuv2rgb.c        (Revision 27482)
++++ libswscale/yuv2rgb.c        (Arbeitskopie)
+@@ -157,6 +157,9 @@
+
+ // The volatile is required because gcc otherwise optimizes some writes away
+ // not knowing that these are read in the ASM block.
++#ifdef __ICC
++#define static
++#endif
+ static volatile uint64_t attribute_used __attribute__((aligned(8))) b5Dither;
+ static volatile uint64_t attribute_used __attribute__((aligned(8))) g5Dither;
+ static volatile uint64_t attribute_used __attribute__((aligned(8))) g6Dither;
diff --git a/media-video/ffmpeg/files/ffmpeg-libdir-pic.patch b/media-video/ffmpeg/files/ffmpeg-libdir-pic.patch
new file mode 100755
index 0000000..7a0e42d
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-libdir-pic.patch
@@ -0,0 +1,169 @@
+Index: configure
+===================================================================
+RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v
+retrieving revision 1.164
+diff -u -b -B -u -r1.164 configure
+--- configure	9 Mar 2005 03:04:55 -0000	1.164
++++ configure	15 Mar 2005 23:40:10 -0000
+@@ -13,6 +13,7 @@
+ echo "Standard options:"
+ echo "  --help                   print this message"
+ echo "  --prefix=PREFIX          install in PREFIX [$prefix]"
++echo "  --libdir=DIR             install libs in DIR [PREFIX/lib]"
+ echo "  --mandir=DIR             man documentation in DIR [PREFIX/man]"
+ echo "  --enable-mp3lame         enable mp3 encoding via libmp3lame [default=no]"
+ echo "  --enable-ogg             enable ogg support via libogg [default=no]"
+@@ -91,6 +92,7 @@
+ 
+ # default parameters
+ prefix="/usr/local"
++libdir=""
+ mandir=""
+ bindir=""
+ cross_prefix=""
+@@ -376,6 +378,8 @@
+   case "$opt" in
+   --prefix=*) prefix=`echo $opt | cut -d '=' -f 2`
+   ;;
++  --libdir=*) libdir=`echo $opt | cut -d '=' -f 2`
++  ;;
+   --mandir=*) mandir=`echo $opt | cut -d '=' -f 2`
+   ;;
+   --source-path=*) source_path=`echo $opt | cut -d '=' -f 2`
+@@ -1062,6 +1066,10 @@
+ bindir="${prefix}/bin"
+ fi
+ 
++if test x"$libdir" = x""; then
++libdir="${prefix}/lib"
++fi
++
+ if test x"$mandir" = x""; then
+ mandir="${prefix}/man"
+ fi
+@@ -1138,6 +1146,7 @@
+ echo "#define FFMPEG_CONFIGURATION "'"'"$FFMPEG_CONFIGURATION"'"' >> $TMPH
+ 
+ echo "prefix=$prefix" >> config.mak
++echo "libdir=$libdir" >> config.mak
+ echo "bindir=$bindir" >> config.mak
+ echo "mandir=$mandir" >> config.mak
+ echo "MAKE=$make" >> config.mak
+Index: libavcodec/Makefile
+===================================================================
+RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/Makefile,v
+retrieving revision 1.177
+diff -u -b -B -u -r1.177 Makefile
+--- libavcodec/Makefile	9 Mar 2005 19:46:31 -0000	1.177
++++ libavcodec/Makefile	15 Mar 2005 23:40:10 -0000
+@@ -302,9 +302,9 @@
+ ifeq ($(CONFIG_WIN32),yes)
+ 	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
+ else
+-	install -d $(prefix)/lib
+-	install $(INSTALLSTRIP) -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION).so
+-	ln -sf libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so
++	install -d $(libdir)
++	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavcodec-$(VERSION).so
++	ln -sf libavcodec-$(VERSION).so $(libdir)/libavcodec.so
+ 	ldconfig || true
+ endif
+ ifeq ($(CONFIG_PP),yes)
+@@ -315,7 +315,7 @@
+ endif
+ 
+ installlib: all install-headers
+-	install -m 644 $(LIB) "$(prefix)/lib"
++	install -m 644 $(LIB) "$(libdir)"
+ 
+ install-headers:
+ 	mkdir -p "$(prefix)/include/ffmpeg"
+Index: libavcodec/libpostproc/Makefile
+===================================================================
+RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/libpostproc/Makefile,v
+retrieving revision 1.19
+diff -u -b -B -u -r1.19 Makefile
+--- libavcodec/libpostproc/Makefile	4 Feb 2005 03:29:50 -0000	1.19
++++ libavcodec/libpostproc/Makefile	15 Mar 2005 23:40:11 -0000
+@@ -54,9 +54,9 @@
+ ifeq ($(CONFIG_WIN32),yes)
+        install $(INSTALLSTRIP) -m 755 $(SPPLIB) "$(prefix)"
+ else
+-	install -d $(prefix)/lib
+-	install $(INSTALLSTRIP) -m 755 $(SPPLIB) $(prefix)/lib/$(SPPLIB).$(SPPVERSION)
+-	ln -sf $(SPPLIB).$(SPPVERSION) $(prefix)/lib/$(SPPLIB)
++	install -d $(libdir)
++	install $(INSTALLSTRIP) -m 755 $(SPPLIB) $(libdir)/$(SPPLIB).$(SPPVERSION)
++	ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB)
+ 	ldconfig || true
+ endif
+ endif
+Index: libavformat/Makefile
+===================================================================
+RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/Makefile,v
+retrieving revision 1.84
+diff -u -b -B -u -r1.84 Makefile
+--- libavformat/Makefile	15 Mar 2005 12:37:39 -0000	1.84
++++ libavformat/Makefile	15 Mar 2005 23:40:11 -0000
+@@ -108,9 +108,9 @@
+ ifeq ($(CONFIG_WIN32),yes)
+ 	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
+ else
+-	install -d $(prefix)/lib
+-	install $(INSTALLSTRIP) -m 755 $(SLIB) $(prefix)/lib/libavformat-$(VERSION).so
+-	ln -sf libavformat-$(VERSION).so $(prefix)/lib/libavformat.so
++	install -d $(libdir)
++	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavformat-$(VERSION).so
++	ln -sf libavformat-$(VERSION).so $(libdir)/libavformat.so
+ 	ldconfig || true
+ endif
+ else
+@@ -118,7 +118,7 @@
+ endif
+ 
+ installlib: all install-headers
+-	install -m 644 $(LIB) "$(prefix)/lib"
++	install -m 644 $(LIB) "$(libdir)"
+ 
+ install-headers:
+ 	mkdir -p "$(prefix)/include/ffmpeg"
+Index: vhook/Makefile
+===================================================================
+RCS file: /cvsroot/ffmpeg/ffmpeg/vhook/Makefile,v
+retrieving revision 1.19
+diff -u -b -B -u -r1.19 Makefile
+--- vhook/Makefile	25 Feb 2005 22:22:20 -0000	1.19
++++ vhook/Makefile	15 Mar 2005 23:40:11 -0000
+@@ -26,8 +26,8 @@
+ 	$(CC) -MM $(CFLAGS) $^ 1>.depend
+ 
+ install:
+-	install -d "$(prefix)/lib/vhook"
+-	install -m 755 $(HOOKS) "$(prefix)/lib/vhook"
++	install -d "$(libdir)/vhook"
++	install -m 755 $(HOOKS) "$(libdir)/vhook"
+ 
+ imlib2.so: imlib2.o
+ 	$(CC) -g -o $@ $(SHFLAGS) $< -lImlib2
+--- libavcodec/Makefile.orig	2005-03-18 06:10:21.000000000 +0900
++++ libavcodec/Makefile	2005-03-18 06:17:04.000000000 +0900
+@@ -7,7 +7,7 @@
+ VPATH=$(SRC_PATH)/libavcodec
+ 
+ # NOTE: -I.. is needed to include config.h
+-CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
++CFLAGS=$(OPTFLAGS) $(PIC) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+ 
+ OBJS= bitstream.o utils.o mem.o allcodecs.o \
+       mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\
+--- libavformat/Makefile.orig	2005-02-25 00:18:02.000000000 +0900
++++ libavformat/Makefile	2005-03-18 06:17:22.000000000 +0900
+@@ -6,7 +6,7 @@
+ 
+ VPATH=$(SRC_PATH)/libavformat
+ 
+-CFLAGS=$(OPTFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
++CFLAGS=$(OPTFLAGS) $(PIC) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+ 
+ OBJS= utils.o cutils.o os_support.o allformats.o
+ PPOBJS=
diff --git a/media-video/ffmpeg/files/ffmpeg-libdir.patch b/media-video/ffmpeg/files/ffmpeg-libdir.patch
new file mode 100755
index 0000000..82b8838
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-libdir.patch
@@ -0,0 +1,11 @@
+--- configure.orig      2007-01-20 10:18:40.000000000 -0800
++++ configure   2007-01-20 10:20:31.000000000 -0800
+@@ -2093,7 +2093,7 @@
+ cat <<EOF >$name.pc
+ prefix=$prefix
+ exec_prefix=\${prefix}
+-libdir=\${exec_prefix}/lib
++libdir=\${exec_prefix}/GENTOOLIBDIR
+ includedir=\${prefix}/include
+
+ Name: $name
diff --git a/media-video/ffmpeg/files/ffmpeg-shared-gcc4.1.patch b/media-video/ffmpeg/files/ffmpeg-shared-gcc4.1.patch
new file mode 100755
index 0000000..680c755
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-shared-gcc4.1.patch
@@ -0,0 +1,40 @@
+--- ffmpeg.orig/libavcodec/i386/dsputil_mmx.c	2006-03-04 07:50:27.000000000 +0100
++++ ffmpeg/libavcodec/i386/dsputil_mmx.c	2006-03-04 07:49:04.000000000 +0100
+@@ -619,10 +619,22 @@
+ 
+ static inline void transpose4x4(uint8_t *dst, uint8_t *src, int dst_stride, int src_stride){
+     asm volatile( //FIXME could save 1 instruction if done as 8x4 ...
+-        "movd  %4, %%mm0                \n\t"
+-        "movd  %5, %%mm1                \n\t"
+-        "movd  %6, %%mm2                \n\t"
+-        "movd  %7, %%mm3                \n\t"
++        "movd  %0, %%mm0                \n\t"
++        "movd  %1, %%mm1                \n\t"
++        "movd  %2, %%mm2                \n\t"
++        
++        :
++        :  "m" (*(uint32_t*)(src + 0*src_stride)),
++           "m" (*(uint32_t*)(src + 1*src_stride)),
++           "m" (*(uint32_t*)(src + 2*src_stride))
++    );
++    asm volatile( //FIXME could save 1 instruction if done as 8x4 ...
++        "movd  %0, %%mm3                \n\t"
++        
++        :
++        :  "m" (*(uint32_t*)(src + 3*src_stride))
++    );
++    asm volatile( //FIXME could save 1 instruction if done as 8x4 ...
+         "punpcklbw %%mm1, %%mm0         \n\t"
+         "punpcklbw %%mm3, %%mm2         \n\t"
+         "movq %%mm0, %%mm1              \n\t"
+@@ -639,10 +651,6 @@
+           "=m" (*(uint32_t*)(dst + 1*dst_stride)),
+           "=m" (*(uint32_t*)(dst + 2*dst_stride)),
+           "=m" (*(uint32_t*)(dst + 3*dst_stride))
+-        :  "m" (*(uint32_t*)(src + 0*src_stride)),
+-           "m" (*(uint32_t*)(src + 1*src_stride)),
+-           "m" (*(uint32_t*)(src + 2*src_stride)),
+-           "m" (*(uint32_t*)(src + 3*src_stride))
+     );
+ }
+ 
diff --git a/media-video/ffmpeg/files/ffmpeg-soname-symlink.patch b/media-video/ffmpeg/files/ffmpeg-soname-symlink.patch
new file mode 100755
index 0000000..9fd7713
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-soname-symlink.patch
@@ -0,0 +1,146 @@
+Index: configure
+===================================================================
+RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v
+retrieving revision 1.219
+diff -u -r1.219 configure
+--- configure	11 Dec 2005 00:45:33 -0000	1.219
++++ configure	13 Dec 2005 16:16:02 -0000
+@@ -215,12 +215,12 @@
+ dlfcn="no"
+ dlopen="no"
+ mpegaudio_hp="yes"
+-SHFLAGS='-shared -Wl,-soname,$@.$(LIBVERSION)'
++SHFLAGS='-shared -Wl,-soname,$@.$(LIBMAJOR)'
+ netserver="no"
+ need_inet_aton="no"
+ ffserver="yes"
+ ffplay="yes"
+-LIBOBJFLAGS=""
++LIBOBJFLAGS='$(PIC)'
+ LDFLAGS=-Wl,--warn-common
+ FFSLDFLAGS=-Wl,-E
+ LDCONFIG="ldconfig"
+@@ -228,6 +228,8 @@
+ LIBSUF=".a"
+ SLIBPREF="lib"
+ SLIBSUF=".so"
++SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)$(SLIBSUF).$(LIBVERSION)'
++SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)$(SLIBSUF).$(LIBMAJOR)'
+ EXESUF=""
+ BUILDSUF=""
+ amr_nb="no"
+@@ -339,6 +341,8 @@
+ installstrip=""
+ LDFLAGS="-Wl,-dynamic,-search_paths_first"
+ SLIBSUF=".dylib"
++SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME).$(LIBVERSION)$(SLIBSUF)'
++SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME).$(LIBMAJOR)$(SLIBSUF)'
+ FFSLDFLAGS=-Wl,-bind_at_load
+ ;;
+ MINGW32*)
+@@ -1465,6 +1467,8 @@
+   echo "LAVFVERSION=$lavf_version" >> config.mak
+   echo "LAVUMAJOR=${lavu_version/.*/}" >> config.mak
+   echo "LAVUVERSION=$lavu_version" >> config.mak
++  echo "SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak
++  echo "SLIBNAME_WITH_MAJOR=${SLIBNAME_WITH_MAJOR}" >> config.mak
+ fi
+ echo "EXTRALIBS=$extralibs" >> config.mak
+ version=`grep '#define FFMPEG_VERSION ' "$source_path/libavcodec/avcodec.h" |
+Index: libavcodec/Makefile
+===================================================================
+RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/Makefile,v
+retrieving revision 1.215
+diff -u -r1.215 Makefile
+--- libavcodec/Makefile	10 Dec 2005 17:14:23 -0000	1.215
++++ libavcodec/Makefile	13 Dec 2005 16:16:03 -0000
+@@ -488,14 +488,20 @@
+ 	$(CC) -o $@ $^ $(LIBAVUTIL) -lm
+ 
+ ifeq ($(BUILD_SHARED),yes)
+-LIBVERSION=$(LAVCMAJOR)
++LIBVERSION=$(LAVCVERSION)
++LIBMAJOR=$(LAVCMAJOR)
++NAME=avcodec
+ install: all install-headers
+ ifeq ($(CONFIG_WIN32),yes)
+ 	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
+ else
+ 	install -d $(libdir)
+-	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) $(libdir)/libavcodec-$(VERSION)$(SLIBSUF)
+-	ln -sf libavcodec-$(VERSION)$(SLIBSUF) $(libdir)/libavcodec$(SLIBSUF)
++	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
++		$(libdir)/$(SLIBNAME_WITH_VERSION)
++	ln -sf $(SLIBNAME_WITH_VERSION) \
++		$(libdir)/$(SLIBNAME_WITH_MAJOR)
++	ln -sf $(SLIBNAME_WITH_VERSION) \
++		$(libdir)/$(SLIBNAME)
+ 	$(LDCONFIG) || true
+ endif
+ ifeq ($(CONFIG_PP),yes)
+Index: libavformat/Makefile
+===================================================================
+RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/Makefile,v
+retrieving revision 1.103
+diff -u -r1.103 Makefile
+--- libavformat/Makefile	10 Dec 2005 17:14:23 -0000	1.103
++++ libavformat/Makefile	13 Dec 2005 16:16:03 -0000
+@@ -80,7 +80,9 @@
+ 
+ LIB= $(LIBPREF)avformat$(LIBSUF)
+ ifeq ($(BUILD_SHARED),yes)
+-LIBVERSION=$(LAVFMAJOR)
++LIBVERSION=$(LAVFVERSION)
++LIBMAJOR=$(LAVFMAJOR)
++NAME=avformat
+ SLIBNAME= $(SLIBPREF)avformat$(SLIBSUF)
+ AVCLIBS+=-lavcodec$(BUILDSUF) -L../libavcodec -lavutil$(BUILDSUF) -L../libavutil
+ ifeq ($(CONFIG_DARWIN),yes)
+@@ -114,8 +116,12 @@
+ 	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
+ else
+ 	install -d $(libdir)
+-	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) $(libdir)/$(SLIBPREF)avformat-$(VERSION)$(SLIBSUF)
+-	ln -sf $(SLIBPREF)avformat-$(VERSION)$(SLIBSUF) $(libdir)/$(SLIBNAME)
++	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
++		$(libdir)/$(SLIBNAME_WITH_VERSION)
++	ln -sf $(SLIBNAME_WITH_VERSION) \
++		$(libdir)/$(SLIBNAME_WITH_MAJOR)
++	ln -sf $(SLIBNAME_WITH_VERSION) \
++		$(libdir)/$(SLIBNAME)
+ 	$(LDCONFIG) || true
+ endif
+ else
+Index: libavutil/Makefile
+===================================================================
+RCS file: /cvsroot/ffmpeg/ffmpeg/libavutil/Makefile,v
+retrieving revision 1.5
+diff -u -r1.5 Makefile
+--- libavutil/Makefile	10 Dec 2005 17:14:24 -0000	1.5
++++ libavutil/Makefile	13 Dec 2005 16:16:05 -0000
+@@ -22,7 +22,9 @@
+ 
+ LIB= $(LIBPREF)avutil$(LIBSUF)
+ ifeq ($(BUILD_SHARED),yes)
+-LIBVERSION=$(LAVUMAJOR)
++LIBVERSION=$(LAVUVERSION)
++LIBMAJOR=$(LAVUMAJOR)
++NAME=avutil
+ SLIBNAME= $(SLIBPREF)avutil$(SLIBSUF)
+ ifeq ($(CONFIG_DARWIN),yes)
+ SHFLAGS += -Wl,-install_name,$(libdir)/$(SLIBNAME),-current_version,$(SPPVERSION),-compatibility_version,$(SPPVERSION)
+@@ -65,8 +67,12 @@
+ 	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
+ else
+ 	install -d $(libdir)
+-	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) $(libdir)/libavutil-$(VERSION)$(SLIBSUF)
+-	ln -sf libavutil-$(VERSION)$(SLIBSUF) $(libdir)/$(SLIBNAME)
++	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
++		$(libdir)/$(SLIBNAME_WITH_VERSION)
++	ln -sf $(SLIBNAME_WITH_VERSION) \
++		$(libdir)/$(SLIBNAME_WITH_MAJOR)
++	ln -sf $(SLIBNAME_WITH_VERSION) \
++		$(libdir)/$(SLIBNAME)
+ 	$(LDCONFIG) || true
+ endif
+ else
diff --git a/media-video/ffmpeg/files/ffmpeg-unknown-options.patch b/media-video/ffmpeg/files/ffmpeg-unknown-options.patch
new file mode 100755
index 0000000..ca02e9b
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-unknown-options.patch
@@ -0,0 +1,16 @@
+Index: configure
+===================================================================
+RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v
+retrieving revision 1.215
+diff -u -r1.215 configure
+--- configure	22 Oct 2005 19:17:39 -0000	1.215
++++ configure	20 Nov 2005 17:07:53 -0000
+@@ -580,8 +580,6 @@
+   ;;
+   *)
+   echo "Unknown option \"$opt\"."
+-  echo "See $0 --help for available options."
+-  exit 1
+   ;;
+   esac
+ done
diff --git a/media-video/ffmpeg/files/ffmpeg-x86-pic-fix-20080916.patch b/media-video/ffmpeg/files/ffmpeg-x86-pic-fix-20080916.patch
new file mode 100644
index 0000000..58799b9
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-x86-pic-fix-20080916.patch
@@ -0,0 +1,11 @@
+--- orig/libavcodec/cabac.h	2008-09-16 21:49:38.000000000 +0200
++++ ffmpeg/libavcodec/cabac.h	2008-09-16 21:49:03.000000000 +0200
+@@ -32,7 +32,7 @@
+ //#undef NDEBUG
+ #include <assert.h>
+ #include "libavutil/x86_cpu.h"
+-
++#define BROKEN_RELOCATIONS 1
+ #define CABAC_BITS 16
+ #define CABAC_MASK ((1<<CABAC_BITS)-1)
+ #define BRANCHLESS_CABAC_DECODER 1
diff --git a/media-video/ffmpeg/files/ffmpeg-x86-pic-fix.patch b/media-video/ffmpeg/files/ffmpeg-x86-pic-fix.patch
new file mode 100644
index 0000000..8bcda2a
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-x86-pic-fix.patch
@@ -0,0 +1,10 @@
+--- orig/libavcodec/cabac.h	2008-05-10 17:28:08.000000000 +0200
++++ ffmpeg/libavcodec/cabac.h	2008-05-10 17:29:24.000000000 +0200
+@@ -33,6 +33,7 @@
+ #include <assert.h>
+ #ifdef ARCH_X86
+ #include "libavutil/x86_cpu.h"
++#define BROKEN_RELOCATIONS 1
+ #endif
+ 
+ #define CABAC_BITS 16
diff --git a/net-analyzer/libnasl/ChangeLog b/net-analyzer/libnasl/ChangeLog
new file mode 100644
index 0000000..37a7ec9
--- /dev/null
+++ b/net-analyzer/libnasl/ChangeLog
@@ -0,0 +1,333 @@
+# ChangeLog for net-analyzer/libnasl
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/libnasl/ChangeLog,v 1.84 2007/04/11 13:50:23 welp Exp $
+
+  11 Apr 2007; Peter Weller <welp@gentoo.org> libnasl-2.2.9.ebuild:
+  Keyworded ~x86-fbsd wrt bug 172890
+
+*libnasl-2.2.9 (03 Apr 2007)
+
+  03 Apr 2007; Marcelo Goes <vanquirius@gentoo.org> +libnasl-2.2.9.ebuild:
+  2.2.9 version bump for bug 169466. Thanks to Jared Breland <nitro322 at
+  gmail dot com>.
+
+  26 Mar 2007; Fabian Groffen <grobian@gentoo.org> libnasl-2.3.1.ebuild:
+  Dropped ppc-macos keyword, see you in prefix
+
+  01 Feb 2007; Markus Ullmann <jokey@gentoo.org> -libnasl-2.2.7.ebuild,
+  -libnasl-2.2.8.ebuild:
+  cleanup
+
+*libnasl-2.2.8 (01 Jun 2006)
+
+  01 Jun 2006; Markus Ullmann <jokey@gentoo.org> +libnasl-2.2.8.ebuild:
+  Version bump wrt bug #134036
+
+*libnasl-2.2.7 (09 Mar 2006)
+
+  09 Mar 2006; Marcelo Goes <vanquirius@gentoo.org> +libnasl-2.2.7.ebuild:
+  2.2.7 version bump for bug 125519. Thanks to ChazeFroy <chazefroy at gmail
+  dot com>.
+
+  05 Mar 2006; Markus Ullmann <jokey@gentoo.org> libnasl-2.3.1.ebuild:
+  COPYING cleanup
+
+  19 Feb 2006; Marcelo Goes <vanquirius@gentoo.org> -libnasl-2.2.4.ebuild:
+  Remove 2.2.4 ebuild.
+
+  18 Feb 2006; Fabian Groffen <grobian@gentoo.org> libnasl-2.3.1.ebuild:
+  Marked ~ppc-macos (bug #123308)
+
+  12 Feb 2006; Marcelo Goes <vanquirius@gentoo.org> -libnasl-2.2.5.ebuild:
+  Remove old ebuilds.
+
+  07 Feb 2006; Simon Stelling <blubb@gentoo.org> libnasl-2.2.6.ebuild:
+  stable on amd64
+
+  24 Dec 2005; Michael Hanselmann <hansmi@gentoo.org> libnasl-2.2.6.ebuild:
+  Stable on ppc.
+
+  20 Dec 2005; Bryan Østergaard <kloeri@gentoo.org libnasl-2.2.6.ebuild:
+  Stable on alpha.
+
+  18 Dec 2005; Markus Rothe <corsair@gentoo.org> libnasl-2.2.6.ebuild:
+  Stable on ppc64
+
+  16 Dec 2005; Gustavo Zacarias <gustavoz@gentoo.org> libnasl-2.2.6.ebuild:
+  Stable on sparc
+
+  15 Dec 2005; Marcelo Goes <vanquirius@gentoo.org> libnasl-2.2.6.ebuild:
+  Marking nessus suite 2.2.6 x86 stable.
+
+  04 Dec 2005; Tom Gall <tgall@gentoo.org> libnasl-2.2.5.ebuild:
+  stable on ppc64
+
+*libnasl-2.2.6 (09 Nov 2005)
+
+  09 Nov 2005; Marcelo Goes <vanquirius@gentoo.org> +libnasl-2.2.6.ebuild:
+  2.2.6 version bump. Fixes bug 111973. Thanks to ChazeFroy <chazefroy at
+  gmail dot com>.
+
+  05 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> libnasl-2.2.5.ebuild:
+  Stable on sparc
+
+  02 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> libnasl-2.2.5.ebuild:
+  Stable on ppc.
+
+  01 Oct 2005; Luis Medinas <metalgod@gentoo.org> libnasl-2.2.5.ebuild:
+  Marked Stable on amd64.
+
+  26 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> libnasl-2.2.5.ebuild:
+  nessus 2.2.5 series x86 stable.
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  04 Aug 2005; Fabian Groffen <grobian@gentoo.org> libnasl-2.2.4.ebuild:
+  Marking ~ppc-macos
+
+*libnasl-2.2.5 (24 Jul 2005)
+
+  24 Jul 2005; Marcelo Goes <vanquirius@gentoo.org> +libnasl-2.2.5.ebuild:
+  Version bump for bug 100024. Thanks to ChazeFroy <chazefroy@gmail.com>.
+
+  19 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> -libnasl-2.0.12.ebuild,
+  -libnasl-2.2.0.ebuild, -libnasl-2.3.0.ebuild:
+  Remove old ebuilds.
+
+  09 Jun 2005; Olivier Crête <tester@gentoo.org> libnasl-2.2.4.ebuild:
+  Marking stable on amd64
+
+  02 Jun 2005; Joseph Jezak <josejx@gentoo.org> libnasl-2.2.4.ebuild:
+  Marked ppc stable.
+
+  22 May 2005; Bryan Østergaard <kloeri@gentoo.org> libnasl-2.2.4.ebuild:
+  Stable on alpha.
+
+*libnasl-2.3.1 (15 May 2005)
+
+  15 May 2005; Aaron Walker <ka0ttic@gentoo.org> +libnasl-2.3.1.ebuild:
+  Version bump for bug 78497
+
+  02 May 2005; Jason Wever <weeve@gentoo.org> libnasl-2.2.4.ebuild:
+  Stable on SPARC.
+
+  24 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> -libnasl-2.2.2a.ebuild,
+  -libnasl-2.2.3.ebuild, libnasl-2.2.4.ebuild:
+  Removing ebuild clutter, marking 2.2.4 x86 stable.
+
+  24 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> libnasl-2.2.2a.ebuild,
+  libnasl-2.2.3.ebuild, libnasl-2.2.4.ebuild, libnasl-2.3.0.ebuild:
+  Use make install instead of emake install.
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> libnasl-2.2.4.ebuild:
+  Stable on ppc64
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> libnasl-2.2.0.ebuild:
+  Stable on ppc.
+
+  31 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> libnasl-2.2.0.ebuild:
+  Stable on alpha.
+
+  27 Mar 2005; Jason Wever <weeve@gentoo.org> libnasl-2.2.0.ebuild:
+  Stable on SPARC.
+
+  24 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> libnasl-2.2.0.ebuild:
+  Marking 2.2.0 x86 stable
+
+*libnasl-2.2.4 (23 Mar 2005)
+
+  23 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> +libnasl-2.2.4.ebuild:
+  Version bump, bug 86392. Thanks to Omkhar Arasaratnam <omkhar@rogers.com> for
+  reporting.
+
+*libnasl-2.2.3 (26 Feb 2005)
+
+  26 Feb 2005; Daniel Black <dragonheart@gentoo.org> +libnasl-2.2.3.ebuild,
+  libnasl-2.3.0.ebuild:
+  Version bump as per bug #81580. Thanks to ChazeFroy <chazefroy@gmail.com>.
+
+  19 Feb 2005; Daniel Black <dragonheart@gentoo.org> libnasl-2.0.12.ebuild,
+  libnasl-2.2.0.ebuild:
+  Fixed broken install routines as per bug #82364. Thanks to mrgoby
+  <mrgoby@gmail.com>
+
+  15 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> libnasl-2.3.0.ebuild:
+  Use virtual/tetex rather than app-text/tetex for bug 82072.
+
+  14 Feb 2005; Daniel Black <dragonheart@gentoo.org> libnasl-2.0.12.ebuild,
+  libnasl-2.3.0.ebuild:
+  Compile fault and doc flag added as per bug #81962 and bug #81975. Thanks to
+  Nguyen Thai Ngoc Duy <pclouds@gentoo.org>
+
+*libnasl-2.2.2a (28 Jan 2005)
+
+  28 Jan 2005; Daniel Black <dragonheart@gentoo.org> libnasl-2.2.0.ebuild,
+  +libnasl-2.2.2a.ebuild, libnasl-2.3.0.ebuild:
+  Add latest stable version (bug #78789). 2.3.0 uses correct CC now. Added
+  missing ppc64 keywords
+
+  13 Jan 2005; Daniel Black <dragonheart@gentoo.org> libnasl-2.3.0.ebuild:
+  Parallel make disabled as per bug #77685
+
+*libnasl-2.3.0 (12 Jan 2005)
+
+  12 Jan 2005; Daniel Black <dragonheart@gentoo.org> +libnasl-2.3.0.ebuild:
+  Version bump as per bug #73780. Thanks to Holger Hoffstätte <holger@wizards.de>
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*libnasl-2.2.0 (28 Oct 2004)
+
+  28 Oct 2004; Eldad Zack <eldad@gentoo.org> -libnasl-2.1.1.ebuild,
+  +libnasl-2.2.0.ebuild:
+  Version bump: new stable series. Removed 2.1.x development series.
+
+  25 Sep 2004; Tom Gall <tgall@gentoo.org> libnasl-2.0.12.ebuild:
+  stable on ppc64, bug #58014
+
+  28 Aug 2004; Eldad Zack <eldad@gentoo.org> libnasl-2.1.1.ebuild:
+  x86 stable
+
+  13 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> libnasl-2.0.12.ebuild:
+  Stable on alpha, bug 58014.
+
+  12 Aug 2004; Eldad Zack <eldad@gentoo.org> libnasl-2.0.10a.ebuild:
+  GLSA 200408-11: masking 2.0.10a for all archs besides alpha until 2.0.12 will
+  be stable on alpha
+
+  12 Aug 2004; Eldad Zack <eldad@gentoo.org>
+  -files/libnasl-2.0.7-gentoo.patch, -files/libnasl-2.0.8a-gentoo.patch,
+  -files/libnasl.patch, -libnasl-2.0.11.ebuild, -libnasl-2.0.7.ebuild,
+  -libnasl-2.0.8a.ebuild, -libnasl-2.0.9.ebuild, -libnasl-2.1.0.ebuild:
+  GLSA 200408-11 (Bug #58014) ebuild purging. ppc64 -> ~ppc64, and moved to
+  2.0.12. wrt bug #57456.
+
+  12 Aug 2004; <SeJo@gentoo.org> libnasl-2.0.12.ebuild:
+  stable masking ppc for bug 58014
+
+  31 Jul 2004; Tom Gall <tgall@gentoo.org> libnasl-2.0.11.ebuild:
+  stable on ppc64, bug #57454
+
+*libnasl-2.1.1 (24 Jul 2004)
+
+  24 Jul 2004; Eldad Zack <eldad@gentoo.org> +libnasl-2.1.1.ebuild:
+  Version bump.
+
+  23 Jul 2004; Jason Wever <weeve@gentoo.org> libnasl-2.0.12.ebuild:
+  Stable on sparc wrt security bug #58014.
+
+*libnasl-2.0.12 (23 Jul 2004)
+
+  23 Jul 2004; Eldad Zack <eldad@gentoo.org> +libnasl-2.0.12.ebuild:
+  Version bump - Security update (x86 stable). Bug 58014.
+
+*libnasl-2.0.11 (21 Jul 2004)
+
+  21 Jul 2004; Eldad Zack <eldad@gentoo.org> +libnasl-2.0.11.ebuild:
+  Version bump.
+
+  19 Jul 2004; Jason Wever <weeve@gentoo.org> libnasl-2.0.10a.ebuild:
+  Stable on sparc.
+
+*libnasl-2.1.0 (16 Jul 2004)
+
+  16 Jul 2004; Eldad Zack <eldad@gentoo.org> +libnasl-2.1.0.ebuild:
+  Added development series 2.1.0 (hard-masked). Closes #56436
+
+  13 Jul 2004; Eldad Zack <eldad@gentoo.org> libnasl-2.0.10a.ebuild:
+  marked x86 stable
+
+*libnasl-2.0.8a (10 Jul 2004)
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  libnasl-2.0.10a.ebuild, libnasl-2.0.7.ebuild, libnasl-2.0.8a.ebuild,
+  libnasl-2.0.9.ebuild:
+  Added metadata, missing IUSEs
+
+  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> libnasl-2.0.10a.ebuild:
+  Stable on alpha.
+
+*libnasl-2.0.10a (09 Feb 2004)
+
+  09 Feb 2004; Patrick Kursawe <phosphan@gentoo.org> libnasl-2.0.10a.ebuild:
+  Version bump. Patch no longer needed.
+
+*libnasl-2.0.9 (19 Nov 2003)
+
+  19 Nov 2003; Patrick Kursawe <phosphan@gentoo.org> libnasl-2.0.6a.ebuild,
+  libnasl-2.0.9.ebuild, files/libnasl-2.0.4-gentoo.patch,
+  files/libnasl-2.0.6a-gentoo.patch, files/libnasl.patch:
+  Version bump and cleanup.
+
+  15 Sep 2003; Jason Wever <weeve@gentoo.org> libnasl-2.0.7.ebuild:
+  Added ~sparc keyword.
+
+*libnasl-2.0.7 (10 Jul 2003)
+
+  10 Jul 2003; Patrick Kursawe <phosphan@gentoo.org> libnasl-2.0.7.ebuild,
+  files/libnasl-2.0.7-gentoo.patch:
+  Version bump
+
+*libnasl-2.0.6a (23 May 2003)
+
+  23 May 2003; Patrick Kursawe <phosphan@gentoo.org> libnasl-2.0.6a.ebuild,
+  files/libnasl-2.0.6a-gentoo.patch:
+  Version bump, should fix bug 21529
+
+*libnasl-2.0.5 (13 May 2003)
+
+  13 May 2003; Patrick Kursawe <phosphan@gentoo.org> libnasl-2.0.5.ebuild,
+  files/libnasl-2.0.5-gentoo.patch:
+  Version bump, bug #20901.
+
+*libnasl-2.0.4 (23 Apr 2003)
+
+  23 Apr 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Found in #18978.
+
+*libnasl-2.0.0 (25 Feb 2003)
+
+  05 Mar 2003; Alastair Tse <liquidx@gentoo.org> libnasl-2.0.0.ebuild :
+  using make instead of emake. resolves #16471.
+
+  25 Feb 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Ebuild submitted by Blu3 <david+gentoo.org@blue-labs.org> in #16310.
+
+*libnasl-1.2.7 (04 Jan 2003)
+
+  16 Jan 2003; Nick Hadaway <raker@gentoo.org> libnasl-1.2.7.ebuild :
+  Fixed doc location.  Changed to epatch.  Changed to DEBUGBUILD.
+  Marked stable for x86.
+
+  04 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Found by Raskasi <raskasi@gmx.net>.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*libnasl-1.2.6 (05 Nov 2002)
+
+  12 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> libnasl-1.2.6.ebuild :
+  Fixed #10521.
+
+  05 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
+
+*libnasl-1.2.4 (22 Aug 2002)
+
+  12 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> libnasl-1.2.4.ebuild :
+  Fixed #10521.
+
+  22 Aug 2002; Nick Hadaway <raker@gentoo.org>
+  libnasl-1.2.4.ebuild, files/digest-libnasl-1.2.4 :
+  Version bump.
+
+*libnasl-1.2.3 (26 Jul 2002)
+
+  26 Jul 2002; Nick Hadaway <raker@gentoo.org>
+  libnasl-1.2.3.ebuild, files/digest-libnasl-1.2.3, files/nasl.diff :
+  Split out the "nessus" ebuild to the individual nessues components
+  to allow pieces to build and install properly.  "nessus" is still
+  an installable ebuild, it just pulls in the individual components.
+  libnasl is the second of those components.
diff --git a/net-analyzer/libnasl/Manifest b/net-analyzer/libnasl/Manifest
new file mode 100644
index 0000000..8b77ef4
--- /dev/null
+++ b/net-analyzer/libnasl/Manifest
@@ -0,0 +1,4 @@
+DIST libnasl-2.2.11.tar.gz 367829 RMD160 2c6bc0d608451e8e82bce22baa7bf5b4d7f55d51 SHA1 21db689dec510fb1f18eabb0ac00696e676069d0 SHA256 612287da1f9f77650772610355daa95f10c416daa6a942482d6c8db3d058945e
+EBUILD libnasl-2.2.11.ebuild 1022 RMD160 193f48a13bdcc8919eb932ad32837cf52ff7587f SHA1 528a6660fac2ba64ffe09721e77ef9057e17c3c4 SHA256 2bdd09a2ef41f6013e9726a2b32221eaba5ab6318627810ee6cafeada6b7e1db
+MISC ChangeLog 11185 RMD160 dc509bf8f571cb63aa36498b4394050d35601a7c SHA1 37777b52887b2a6a8816a2ea119890246a982f02 SHA256 377818e400892f2529b97f5afe9b1484468cbe7e42da9cb672df8bdcb10f98e9
+MISC metadata.xml 240 RMD160 7bdcc5cfea4c1a1748de7666ba9e63ce744c0116 SHA1 17ad69d1731a7764f5ba2b382d5c0075ec54cc68 SHA256 0139c026bc2e3da56a4d05c483239ad8fc90fb5381ff8f6337eab72518c6e9b1
diff --git a/net-analyzer/libnasl/files/digest-libnasl-2.2.10 b/net-analyzer/libnasl/files/digest-libnasl-2.2.10
new file mode 100644
index 0000000..9dbdb09
--- /dev/null
+++ b/net-analyzer/libnasl/files/digest-libnasl-2.2.10
@@ -0,0 +1,3 @@
+MD5 a4ccf81607b0af677b279f634a90d3e0 libnasl-2.2.10.tar.gz 367771
+RMD160 d9868cc065ab2fcd97af1f1994a98dde3863c1e6 libnasl-2.2.10.tar.gz 367771
+SHA256 8dc8e83f10ac7d07bf592167bc68e186f17f31beadcf3ed658329c14a743f6a6 libnasl-2.2.10.tar.gz 367771
diff --git a/net-analyzer/libnasl/libnasl-2.2.11.ebuild b/net-analyzer/libnasl/libnasl-2.2.11.ebuild
new file mode 100644
index 0000000..15fe245
--- /dev/null
+++ b/net-analyzer/libnasl/libnasl-2.2.11.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/libnasl/libnasl-2.2.9.ebuild,v 1.2 2007/04/11 13:50:23 welp Exp $
+
+inherit toolchain-funcs
+
+DESCRIPTION="A remote security scanner for Linux (libnasl)"
+HOMEPAGE="http://www.nessus.org/"
+#SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/${P}.tar.gz"
+SRC_URI="${P}.tar.gz"
+RESTRICT="mirror fetch strip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="=net-analyzer/nessus-libraries-${PV}"
+
+S="${WORKDIR}/${PN}"
+
+pkg_nofetch() {
+    einfo "Please download ${P}.tar.gz from ${HOMEPAGE}/download"
+	einfo "The archive should then be placed into ${DISTDIR}."
+}
+
+src_compile() {
+	export CC="$(tc-getCC)"
+	econf || die "configuration failed"
+	# emake fails for >= -j2. bug #16471.
+	emake -C nasl cflags
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Install failed libnasl"
+}
diff --git a/net-analyzer/libnasl/metadata.xml b/net-analyzer/libnasl/metadata.xml
new file mode 100644
index 0000000..eff4d12
--- /dev/null
+++ b/net-analyzer/libnasl/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>netmon</herd>
+<longdescription>A remote security scanner for Linux (libnasl)</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/nessus-core/ChangeLog b/net-analyzer/nessus-core/ChangeLog
new file mode 100644
index 0000000..cbba21c
--- /dev/null
+++ b/net-analyzer/nessus-core/ChangeLog
@@ -0,0 +1,488 @@
+# ChangeLog for net-analyzer/nessus-core
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/ChangeLog,v 1.112 2007/04/28 18:57:39 tove Exp $
+
+  28 Apr 2007; Torsten Veller <tove@gentoo.org> nessus-core-2.2.6.ebuild,
+  nessus-core-2.2.9.ebuild:
+  Fix *initd, *confd and *envd calls (#173884, #174266)
+
+  11 Apr 2007; Peter Weller <welp@gentoo.org> nessus-core-2.2.9.ebuild:
+  Keyworded ~x86-fbsd wrt bug 172890
+
+*nessus-core-2.2.9 (03 Apr 2007)
+
+  03 Apr 2007; Marcelo Goes <vanquirius@gentoo.org>
+  +nessus-core-2.2.9.ebuild:
+  2.2.9 version bump for bug 169466. Thanks to Jared Breland <nitro322 at
+  gmail dot com>.
+
+  26 Mar 2007; Fabian Groffen <grobian@gentoo.org> nessus-core-2.3.1.ebuild:
+  Dropped ppc-macos keyword, see you in prefix
+
+  01 Feb 2007; Markus Ullmann <jokey@gentoo.org>
+  -files/nessus-core-2.0.7.patch, -files/patch_1.nessus-core.2.0.7,
+  -files/nessusd-r6, -nessus-core-2.2.7.ebuild, -nessus-core-2.2.8.ebuild:
+  cleanup
+
+  05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  nessus-core-2.2.6.ebuild, nessus-core-2.2.7.ebuild,
+  nessus-core-2.2.8.ebuild:
+  Remove gnuconfig_update usage, leave it to econf.
+
+*nessus-core-2.2.8 (01 Jun 2006)
+
+  01 Jun 2006; Markus Ullmann <jokey@gentoo.org> +nessus-core-2.2.8.ebuild:
+  Version bump wrt bug #134036
+
+*nessus-core-2.2.7 (09 Mar 2006)
+
+  09 Mar 2006; Marcelo Goes <vanquirius@gentoo.org>
+  +nessus-core-2.2.7.ebuild:
+  2.2.7 version bump for bug 125519. Thanks to ChazeFroy <chazefroy at gmail
+  dot com>.
+
+  18 Feb 2006; Fabian Groffen <grobian@gentoo.org> nessus-core-2.3.1.ebuild:
+  Marked ~ppc-macos (bug #123308)
+
+  12 Feb 2006; Marcelo Goes <vanquirius@gentoo.org>
+  -nessus-core-2.2.4-r1.ebuild, -nessus-core-2.2.5.ebuild:
+  Remove old ebuilds.
+
+  07 Feb 2006; Simon Stelling <blubb@gentoo.org> nessus-core-2.2.6.ebuild:
+  stable on amd64
+
+  04 Feb 2006; Marcelo Goes <vanquirius@gentoo.org> +files/nessusd-r8,
+  nessus-core-2.3.1.ebuild:
+  Add --quiet to initscript for bug 117728. Thanks to Toralf Forster <toralf
+  dot foerster at gmx dot de>.
+
+  04 Feb 2006; Marcelo Goes <vanquirius@gentoo.org>
+  nessus-core-2.2.4-r1.ebuild, nessus-core-2.2.5.ebuild,
+  nessus-core-2.2.6.ebuild, nessus-core-2.3.1.ebuild:
+  Block net-analyzer/nessus-client.
+
+  25 Dec 2005; Marcelo Goes <vanquirius@gentoo.org>
+  nessus-core-2.2.4-r1.ebuild, nessus-core-2.2.5.ebuild,
+  nessus-core-2.2.6.ebuild:
+  Make rest of nessus-core's ebuilds modular X friendly.
+
+  24 Dec 2005; Michael Hanselmann <hansmi@gentoo.org>
+  nessus-core-2.2.6.ebuild:
+  Stable on ppc.
+
+  20 Dec 2005; Bryan Østergaard <kloeri@gentoo.org
+  nessus-core-2.2.6.ebuild:
+  Stable on alpha.
+
+  18 Dec 2005; Markus Rothe <corsair@gentoo.org> nessus-core-2.2.6.ebuild:
+  Stable on ppc64
+
+  16 Dec 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  nessus-core-2.2.6.ebuild:
+  Stable on sparc
+
+  15 Dec 2005; Marcelo Goes <vanquirius@gentoo.org>
+  nessus-core-2.2.6.ebuild:
+  Marking nessus suite 2.2.6 x86 stable.
+
+  12 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  nessus-core-2.3.1.ebuild:
+  Update dependencies for modular X.
+
+  04 Dec 2005; Tom Gall <tgall@gentoo.org> 
+  nessus-core-2.2.5.ebuild:
+  stable on ppc64
+
+*nessus-core-2.2.6 (09 Nov 2005)
+
+  09 Nov 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +nessus-core-2.2.6.ebuild:
+  2.2.6 version bump. Fixes bug 111973. Thanks to ChazeFroy <chazefroy at
+  gmail dot com>.
+
+  05 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  nessus-core-2.2.5.ebuild:
+  Stable on sparc
+
+  02 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  nessus-core-2.2.5.ebuild:
+  Stable on ppc.
+
+  01 Oct 2005; Luis Medinas <metalgod@gentoo.org> nessus-core-2.2.5.ebuild:
+  Marked Stable on amd64.
+
+  26 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -nessus-core-2.2.4.ebuild, nessus-core-2.2.5.ebuild:
+  nessus 2.2.5 series x86 stable.
+
+  19 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  nessus-core-2.2.4.ebuild, nessus-core-2.2.4-r1.ebuild,
+  nessus-core-2.2.5.ebuild, nessus-core-2.3.1.ebuild:
+  Kill gtk2 USE flag for bug 106560.
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  14 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  nessus-core-2.2.4-r1.ebuild:
+  Stable on ppc.
+
+  28 Jul 2005; Marcelo Goes <vanquirius@gentoo.org>
+  nessus-core-2.2.4.ebuild, nessus-core-2.2.4-r1.ebuild,
+  nessus-core-2.3.1.ebuild:
+  Propagate -j1 through other ebuilds for bug 100193. Thanks to Jakub Moc
+  <jakub@gentoo.org> for pointing it out.
+
+  25 Jul 2005; Marcelo Goes <vanquirius@gentoo.org>
+  nessus-core-2.2.5.ebuild:
+  Add -j1 to emake since parallel compilation fails. Fixes bug 100193. Thanks
+  to Triffid Hunter <triffid_hunter@funkmunch.net>.
+
+*nessus-core-2.2.5 (24 Jul 2005)
+
+  24 Jul 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +nessus-core-2.2.5.ebuild:
+  Version bump for bug 100024. Thanks to ChazeFroy <chazefroy@gmail.com>.
+
+  02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  nessus-core-2.2.4-r1.ebuild:
+  Stable on alpha.
+
+  21 Jun 2005; Markus Rothe <corsair@gentoo.org>
+  nessus-core-2.2.4-r1.ebuild:
+  Stable on ppc64
+
+  19 Jun 2005; Marcelo Goes <vanquirius@gentoo.org>
+  nessus-core-2.2.4.ebuild, nessus-core-2.2.4-r1.ebuild:
+  Fix file conflict with includes from nessus-libraries.
+
+  19 Jun 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -nessus-core-2.0.12.ebuild, -nessus-core-2.2.0.ebuild,
+  nessus-core-2.2.4-r1.ebuild, -nessus-core-2.3.0.ebuild:
+  Remove old ebuilds, mark 2.2.4-r1 x86 stable.
+
+  10 Jun 2005; Jason Wever <weeve@gentoo.org> nessus-core-2.2.4-r1.ebuild:
+  Marked stable on SPARC wrt bug #94827.
+
+  09 Jun 2005; Olivier Crête <tester@gentoo.org>
+  nessus-core-2.2.4-r1.ebuild:
+  Marking stable on amd64
+
+  07 Jun 2005; <omkhar@gentoo.org> -files/nessus-core-conf.patch,
+  nessus-core-2.2.4-r1.ebuild:
+  Got rid of the big ugly conf patch and used the eclass
+
+*nessus-core-2.2.4-r1 (02 Jun 2005)
+
+  02 Jun 2005; Omkhar Arasaratnam <omkhar@gentoo.org>
+  +files/nessus-core-conf.patch, +nessus-core-2.2.4-r1.ebuild:
+  updated some configs to allow clean compile on ppc64. Added ~ARCH to 
+  ensure no breakage on other archs.
+
+  02 Jun 2005; Joseph Jezak <josejx@gentoo.org> nessus-core-2.2.4.ebuild:
+  Marked ppc stable.
+
+  22 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  nessus-core-2.2.4.ebuild:
+  Stable on alpha.
+
+*nessus-core-2.3.1 (15 May 2005)
+
+  15 May 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/nessus-core-2.3.1-gcc4.diff, +nessus-core-2.3.1.ebuild:
+  Version bump.
+
+  02 May 2005; Jason Wever <weeve@gentoo.org> nessus-core-2.2.4.ebuild:
+  Stable on SPARC.
+
+  24 Apr 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -nessus-core-2.2.2a.ebuild, -nessus-core-2.2.3.ebuild,
+  nessus-core-2.2.4.ebuild:
+  Removing ebuild clutter, marking 2.2.4 x86 stable.
+
+  24 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> nessus-core-2.2.2a.ebuild,
+  nessus-core-2.2.3.ebuild, nessus-core-2.2.4.ebuild:
+  Use make install instead of emake install.
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> nessus-core-2.2.4.ebuild:
+  Stable on ppc64
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  nessus-core-2.2.0.ebuild:
+  Stable on ppc.
+
+  31 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> files/nessusd-r6:
+  Init script fix, bug 86664. Thanks to Eric Brown <bigwhitecow@hotmail.com> and
+  Marco Morales <soulse@gmail.com>.
+
+  31 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
+  nessus-core-2.2.0.ebuild:
+  Stable on alpha.
+
+  27 Mar 2005; Jason Wever <weeve@gentoo.org> nessus-core-2.2.0.ebuild:
+  Stable on SPARC.
+
+  24 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> nessus-core-2.2.0.ebuild:
+  Marking 2.2.0 x86 stable
+
+*nessus-core-2.2.4 (23 Mar 2005)
+
+  23 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> +nessus-core-2.2.4.ebuild:
+  Version bump, bug 86392. Thanks to Omkhar Arasaratnam <omkhar@rogers.com> for
+  reporting.
+
+  21 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> nessus-core-2.3.0.ebuild:
+  Fix X/gtk USE flag stuff for bug 84885; also, don't install
+  /usr/include/nessus/includes.h since it is provided by nessus-libraries.
+
+*nessus-core-2.2.3 (26 Feb 2005)
+
+  26 Feb 2005; Daniel Black <dragonheart@gentoo.org>
+  +nessus-core-2.2.3.ebuild:
+  Version bump as per bug #81580. Thanks to ChazeFroy <chazefroy@gmail.com>.
+
+  20 Feb 2005; Daniel Black <dragonheart@gentoo.org>
+  nessus-core-2.0.12.ebuild, nessus-core-2.2.0.ebuild:
+  Fixed broken install as per bug #82573. Thanks to Daniel Herzog
+  <expose@luftgetrock.net>
+
+*nessus-core-2.2.2a (28 Jan 2005)
+
+  28 Jan 2005; Daniel Black <dragonheart@gentoo.org> nessus-core-2.2.0.ebuild,
+  +nessus-core-2.2.2a.ebuild, nessus-core-2.3.0.ebuild:
+  Add latest stable version (bug #78789). 2.3.0 uses correct CC now. Added
+  dropped ~ppc64 keywords
+
+  26 Jan 2005; Otavio R. Piske <angusyoung@gentoo.org> +files/nessusd-r7,
+  nessus-core-2.3.0.ebuild:
+  Added a new init script for nessus that should solve bug #77735 by checking
+  whether the process is running before finishing the shutdown.
+
+  13 Jan 2005; Daniel Black <dragonheart@gentoo.org> nessus-core-2.3.0.ebuild:
+  Prelude patch disabled as per bug #77710. Thanks to Tuan Van
+  <langthang@gentoo.org>
+
+*nessus-core-2.3.0 (12 Jan 2005)
+
+  12 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  +nessus-core-2.3.0.ebuild:
+  Version bump as per bug #73780. Thanks to Holger Hoffstätte <holger@wizards.de>
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  29 Oct 2004; Eldad Zack <eldad@gentoo.org> nessus-core-2.2.0.ebuild:
+  Parallel build problem, fixed to emake -j1. Closes #69386.
+
+*nessus-core-2.2.0 (28 Oct 2004)
+
+  28 Oct 2004; Eldad Zack <eldad@gentoo.org> -nessus-core-2.1.1.ebuild,
+  +nessus-core-2.2.0.ebuild:
+  Version bump: new stable series. Removed 2.1.x development series.
+
+  25 Sep 2004; Tom Gall <tgall@gentoo.org> nessus-core-2.0.12.ebuild:
+  stable on ppc64, bug #58014
+
+  01 Sep 2004; Eldad Zack <eldad@gentoo.org> nessus-core-2.0.12.ebuild,
+  nessus-core-2.1.1.ebuild:
+  nessus-core depends on nessus-libraries. Closes #62462. Thanks to Nathan
+  Sullivan <nathan@nightsys.net>
+
+  28 Aug 2004; Eldad Zack <eldad@gentoo.org> nessus-core-2.1.1.ebuild:
+  x86 stable
+
+  13 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> nessus-core-2.0.12.ebuild:
+  Stable on alpha, bug 58014.
+
+  12 Aug 2004; Eldad Zack <eldad@gentoo.org> nessus-core-2.0.10a.ebuild:
+  GLSA 200408-11: masking 2.0.10a for all archs besides alpha until 2.0.12 will
+  be stable on alpha
+
+  12 Aug 2004; Eldad Zack <eldad@gentoo.org> -nessus-core-2.0.11.ebuild,
+  nessus-core-2.0.12.ebuild, -nessus-core-2.0.7-r1.ebuild:
+  GLSA 200408-11 (Bug #58014) ebuild purging. ppc64 -> ~ppc64, and moved to
+  2.0.12. wrt bug #57456.
+
+  12 Aug 2004; <SeJo@gentoo.org> nessus-core-2.0.12.ebuild:
+  stable masking ppc for bug 58014
+
+  01 Aug 2004; Tom Gall <tgall@gentoo.org> nessus-core-2.0.11.ebuild:
+  stable on ppc64, bug #57456
+
+*nessus-core-2.1.1 (24 Jul 2004)
+
+  24 Jul 2004; Eldad Zack <eldad@gentoo.org> +nessus-core-2.1.1.ebuild:
+  Version bump.
+
+  23 Jul 2004; Jason Wever <weeve@gentoo.org> nessus-core-2.0.12.ebuild:
+  Stable on sparc wrt security bug #58014.
+
+*nessus-core-2.0.12 (23 Jul 2004)
+
+  23 Jul 2004; Eldad Zack <eldad@gentoo.org> +nessus-core-2.0.12.ebuild:
+  Version bump - Security update (x86 stable). Bug 58014.
+
+*nessus-core-2.0.11 (21 Jul 2004)
+
+  21 Jul 2004; Eldad Zack <eldad@gentoo.org> +nessus-core-2.0.11.ebuild:
+  Version bump
+
+  19 Jul 2004; Jason Wever <weeve@gentoo.org> nessus-core-2.0.10a.ebuild:
+  Stable on sparc.
+
+*nessus-core-2.1.0 (16 Jul 2004)
+
+  16 Jul 2004; Eldad Zack <eldad@gentoo.org> +nessus-core-2.1.0.ebuild:
+  Added development series 2.1.0 (hard-masked). Closes #56436
+
+  13 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  nessus-core-2.0.10a.ebuild:
+  marked x86 stable
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> nessus-core-2.0.10a.ebuild,
+  nessus-core-2.0.7-r1.ebuild, nessus-core-2.0.7.ebuild,
+  nessus-core-2.0.8a.ebuild, nessus-core-2.0.9.ebuild:
+  Fix use invocation and don't run epatch in a subshell because then it can't die
+
+  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org>
+  nessus-core-2.0.10a.ebuild:
+  Stable on alpha.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> nessus-core-2.0.10a.ebuild,
+  nessus-core-2.0.7-r1.ebuild, nessus-core-2.0.7.ebuild,
+  nessus-core-2.0.8a.ebuild, nessus-core-2.0.9.ebuild:
+  Add inherit eutils
+
+*nessus-core-2.0.10a (09 Feb 2004)
+
+  09 Feb 2004; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-core-2.0.10a.ebuild:
+  Version bump.
+
+  09 Dec 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-core-2.0.8a.ebuild:
+  Backporting new dependencies from 2.0.9
+
+  01 Dec 2003; Patrick Kursawe <phosphan@gentoo.org> nessus-core-2.0.9.ebuild:
+  Making USE="+-X" work again, the last comment is wrong.
+
+  24 Nov 2003; Patrick Kursawe <phosphan@gentoo.org> nessus-core-2.0.9.ebuild:
+  While fixing a gtk/gtk2 problem I noticed that the GUI is not optional.
+
+*nessus-core-2.0.9 (19 Nov 2003)
+
+  19 Nov 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-core-2.0.6a-r1.ebuild, nessus-core-2.0.9.ebuild,
+  files/nessus-core-2.0.6a.patch, files/nessus-core-2.0.8a.patch:
+  Version bump, cleanup
+
+  22 Oct 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-core-2.0.8a.ebuild:
+  Fixing bug 31670, tcpd was not disabled correctly when not in USE
+
+*nessus-core-2.0.8a (13 Oct 2003)
+
+  13 Oct 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-core-2.0.8a.ebuild, files/nessus-core-2.0.8a.patch:
+  Version bump. The prelude patches seem to apply cleanly with this version.
+
+  15 Sep 2003; Jason Wever <weeve@gentoo.org> nessus-core-2.0.7-r1.ebuild:
+  Added ~sparc keyword.
+
+*nessus-core-2.0.7-r1 (26 Aug 2003)
+
+  26 Aug 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-core-2.0.7-r1.ebuild, files/patch_1.nessus-core.2.0.7:
+  Included prelude patch from bug 19673 with minor changes.
+
+*nessus-core-2.0.6a-r1 (17 Jul 2003)
+
+  17 Jul 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-core-2.0.6a-r1.ebuild:
+  Fixing bug 23106
+
+  17 Jul 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-core-2.0.6a.ebuild:
+  Did always --enable-tcpwrappers, fixed that. Closes bug #23667.
+
+  09 Jul 2003; Martin Holzer <mholzer@gentoo.org> nessus-core-1.2.7.ebuild,
+  nessus-core-2.0.0.ebuild, nessus-core-2.0.4.ebuild,
+  nessus-core-2.0.5.ebuild, nessus-core-2.0.6a.ebuild:
+  Fixing typo. Closes #24161
+
+*nessus-core-2.0.7 (10 Jul 2003)
+
+  10 Jul 2003; Patrick Kursawe <phosphan@gentoo.org> nessus-core-2.0.7.ebuild,
+  files/nessus-core-2.0.7.patch:
+  Version bump. Changed tcpd use flag handling (see bug 24055) and added a fix
+  for http://bugs.nessus.org/show_bug.cgi?id=464 - should be able to remove the
+  patch in the next release.
+
+*nessus-core-2.0.6a (23 May 2003)
+
+  23 May 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-core-2.0.6a.ebuild:
+  Version bump, should fix bug 21529
+
+*nessus-core-2.0.5 (13 May 2003)
+
+  13 May 2003; Patrick Kursawe <phosphan@gentoo.org> nessus-core-2.0.5.ebuild:
+  Version bump, bug #20901.
+
+*nessus-core-2.0.4 (23 Apr 2003)
+
+  23 Apr 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Found in #18978.
+
+*nessus-core-2.0.0 (25 Feb 2003)
+
+  25 Feb 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Ebuild submitted by Blu3 <david+gentoo.org@blue-labs.org> in #16310.
+
+*nessus-core-1.2.7 (04 Jan 2003)
+
+  16 Jan 2003; Nick Hadaway <raker@gentoo.org> nessus-core-1.2.7.ebuild :
+  Added support for tcpd and gtk2 use variables.  gtk takes precedence
+  over gtk2 has the latter is unstable.  Properly disables the gtk
+  portion if neither gtk nor gtk2 is specified in use.  Marked stable
+  for x86.
+
+  04 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Found by Raskasi <raskasi@gmx.net>.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*nessus-core-1.2.6 (05 Nov 2002)
+
+  15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> nessus-core-1.2.6.ebuild :
+  Add ~alpha to KEYWORDS
+
+  05 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
+
+*nessus-core-1.2.4 (22 Aug 2002)
+
+  15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> nessus-core-1.2.4.ebuild :
+  Add alpha to KEYWORDS
+
+  23 Sep 2002; Mike Frysinger <vapier@gentoo.org> :
+  Set dependencies to require libraries of version 1.2.4
+
+  26 Aug 2002; Nick Hadaway <raker@gentoo.org> nessus-core-1.2.4.ebuild :
+  fixed SRC_URI path to nessus-${PV} for future upgrade ease.
+
+  24 Aug 2002; Bruce A. Locke <blocke@shivan.org> nessus-core-1.2.4.ebuild:
+  Nessus needs /var/lib/nessus/users and /var/lib/nessus/logs
+  
+  22 Aug 2002; Nick Hadaway <raker@gentoo.org> nessus-core-1.2.4.ebuild, files/digest-nessus-core-1.2.4 :
+  Version bump.
+
+*nessus-core-1.2.3 (26 Jul 2002)
+
+  26 Jul 2002; Nick Hadaway <raker@gentoo.org>
+  nessus-core-1.2.3.ebuild, files/digest-nessus-core-1.2.3 :
+
+  Split out the "nessus" ebuild to the individual nessues components
+  to allow pieces to build and install properly.  "nessus" is still
+  an installable ebuild, it just pulls in the individual components.
+  nessus-core is the third of those components.
diff --git a/net-analyzer/nessus-core/Manifest b/net-analyzer/nessus-core/Manifest
new file mode 100644
index 0000000..863c8a3
--- /dev/null
+++ b/net-analyzer/nessus-core/Manifest
@@ -0,0 +1,7 @@
+AUX nessus-core-2.3.1-gcc4.diff 325 RMD160 595f11acb9b5a83ecff75924f50b3de4c51526a0 SHA1 b7e089d1fa575287ef1b945077d938d0f1cdda3f SHA256 020a160721bcf23142f38b4fe8d914ae7cfae830b8dafaa654604091017363e1
+AUX nessusd-r7 647 RMD160 35dffe93c92db49d5e32df848461813c7387d091 SHA1 7b5cd47b7251444fe80a6f98eeb72a72e8438ca0 SHA256 36ecfe6a2f71490e6123b1fbdae8a71cb3a24d503adb92ee50dd602b649b5262
+AUX nessusd-r8 655 RMD160 5aa32dccd94763954dff77dc55bdef711ff8a1b8 SHA1 703d74e2ee19ba7ab5e51618b6e3d4c6c35f6709 SHA256 634741d3cae1bec7a9eec6a0e04f086d71b5e13685e8c43a6583684ef01994fc
+DIST nessus-core-2.2.11.tar.gz 680220 RMD160 f10b87454bb526e518e1a0a5c319a2b5d11efeab SHA1 7cd1caef7fae6219e4f4604224f753e71015b5cf SHA256 d2607d012a9e89d7b4424173d51e9b09a577a1b4e079af23f2c39073512fb761
+EBUILD nessus-core-2.2.11.ebuild 1557 RMD160 5eb0bc6f4c56f634e68fce1800be966ef85a5f44 SHA1 d897ec90ceb4d32a364534f311ee4b4003ee3a91 SHA256 f3ee2a1b88f34a20b6c71cb0c42d1e96ac2a420d183c9d68a3f4e8ba4153ec08
+MISC ChangeLog 17102 RMD160 99db9d7a10d3e5fc5fdd5fd13de9f5fe9fc35a6f SHA1 cf3017c2d5ced451a2ceccbbe0a054f084d872f5 SHA256 228ef95e6117af163883eb6343b6f106e3791279d78572cb8ff8bc68978a0788
+MISC metadata.xml 244 RMD160 dcd2bcdadd5f72b4674006adb8241495d91e23b7 SHA1 33de92ec7574e4f3d3b4c5bd0a368b42f80996be SHA256 ffab1a869f9dad1f7e917015ad31e5c00a2047997e76ba050a6898c71e11b991
diff --git a/net-analyzer/nessus-core/files/digest-nessus-core-2.2.10 b/net-analyzer/nessus-core/files/digest-nessus-core-2.2.10
new file mode 100644
index 0000000..b10574f
--- /dev/null
+++ b/net-analyzer/nessus-core/files/digest-nessus-core-2.2.10
@@ -0,0 +1,3 @@
+MD5 ab7a9f1009bd2adcdbea09851dc64a9d nessus-core-2.2.10.tar.gz 680325
+RMD160 adaf79e780c8cccaf685f8426a13d7b0413881e7 nessus-core-2.2.10.tar.gz 680325
+SHA256 ac992f19f2c5b641b93027a225e160283f639716ecc0639750ace41cd58801c3 nessus-core-2.2.10.tar.gz 680325
diff --git a/net-analyzer/nessus-core/files/nessus-core-2.3.1-gcc4.diff b/net-analyzer/nessus-core/files/nessus-core-2.3.1-gcc4.diff
new file mode 100644
index 0000000..5d0447c
--- /dev/null
+++ b/net-analyzer/nessus-core/files/nessus-core-2.3.1-gcc4.diff
@@ -0,0 +1,11 @@
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN nessus-core.orig/nessus/comm.c nessus-core/nessus/comm.c
+--- nessus-core.orig/nessus/comm.c	2005-05-15 09:36:41.000000000 -0400
++++ nessus-core/nessus/comm.c	2005-05-15 09:37:48.000000000 -0400
+@@ -96,6 +96,7 @@
+ 	limit = PBAR_MAX;
+ 	break;
+       default:
++	;
+     }
+   }
+ 
diff --git a/net-analyzer/nessus-core/files/nessusd-r7 b/net-analyzer/nessus-core/files/nessusd-r7
new file mode 100644
index 0000000..057a6d6
--- /dev/null
+++ b/net-analyzer/nessus-core/files/nessusd-r7
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/files/nessusd-r7,v 1.1 2005/01/26 11:06:56 angusyoung Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting nessusd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/nessusd -- -D
+	eend $? 
+}
+
+stop() {
+	ebegin "Stop nessusd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/nessusd
+	einfo "Waiting for the environment to be sane"
+	while [ -n "$RUNNING" ] ; do
+		sleep 1
+		RUNNING=$(ps aux | grep -m 1 nessusd: | grep -v grep)
+	done
+	sleep 3
+	eend $?
+}
diff --git a/net-analyzer/nessus-core/files/nessusd-r8 b/net-analyzer/nessus-core/files/nessusd-r8
new file mode 100644
index 0000000..63cb61d
--- /dev/null
+++ b/net-analyzer/nessus-core/files/nessusd-r8
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/files/nessusd-r8,v 1.1 2006/02/04 14:57:30 vanquirius Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting nessusd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/nessusd -- -D --quiet
+	eend $? 
+}
+
+stop() {
+	ebegin "Stop nessusd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/nessusd
+	einfo "Waiting for the environment to be sane"
+	while [ -n "$RUNNING" ] ; do
+		sleep 1
+		RUNNING=$(ps aux | grep -m 1 nessusd: | grep -v grep)
+	done
+	sleep 3
+	eend $?
+}
diff --git a/net-analyzer/nessus-core/metadata.xml b/net-analyzer/nessus-core/metadata.xml
new file mode 100644
index 0000000..b4c5e4a
--- /dev/null
+++ b/net-analyzer/nessus-core/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>netmon</herd>
+<longdescription>A remote security scanner for Linux (nessus-core)</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/nessus-core/nessus-core-2.2.11.ebuild b/net-analyzer/nessus-core/nessus-core-2.2.11.ebuild
new file mode 100644
index 0000000..0c96d63
--- /dev/null
+++ b/net-analyzer/nessus-core/nessus-core-2.2.11.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/nessus-core-2.2.9.ebuild,v 1.3 2007/04/28 18:57:39 tove Exp $
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="A remote security scanner for Linux (nessus-core)"
+HOMEPAGE="http://www.nessus.org/"
+#SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/${P}.tar.gz"
+SRC_URI="${P}.tar.gz"
+RESTRICT="mirror fetch strip"
+
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="X tcpd debug prelude"
+DEPEND="=net-analyzer/nessus-libraries-${PV}
+	=net-analyzer/libnasl-${PV}
+	tcpd? ( sys-apps/tcp-wrappers )
+	X? ( =x11-libs/gtk+-2* )
+	prelude? ( dev-libs/libprelude )
+	!net-analyzer/nessus-client"
+
+S="${WORKDIR}/${PN}"
+
+pkg_nofetch() {
+    einfo "Please download ${P}.tar.gz from ${HOMEPAGE}/download"
+	einfo "The archive should then be placed into ${DISTDIR}."
+}
+
+src_compile() {
+
+	export CC="$(tc-getCC)"
+	econf `use_enable tcpd tcpwrappers` \
+		`use_enable debug` \
+		`use_enable X gtk` \
+		|| die "configure failed"
+	emake -j1 || die "emake failed"
+
+}
+
+src_install() {
+	make DESTDIR="${D}" \
+		install || die "Install failed nessus-core"
+	cd "${S}"
+	dodoc README* UPGRADE_README CHANGES
+	dodoc doc/*.txt doc/ntp/*
+	newinitd "${FILESDIR}"/nessusd-r7 nessusd
+	keepdir /var/lib/nessus/logs
+	keepdir /var/lib/nessus/users
+	# newer version is provided by nessus-libraries
+	# should be fixed upstream in version 2.2.6
+	rm "${D}"/usr/include/nessus/includes.h
+}
diff --git a/net-analyzer/nessus-libraries/ChangeLog b/net-analyzer/nessus-libraries/ChangeLog
new file mode 100644
index 0000000..dfab8bf
--- /dev/null
+++ b/net-analyzer/nessus-libraries/ChangeLog
@@ -0,0 +1,381 @@
+# ChangeLog for net-analyzer/nessus-libraries
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-libraries/ChangeLog,v 1.87 2007/04/11 13:41:07 welp Exp $
+
+  11 Apr 2007; Peter Weller <welp@gentoo.org> nessus-libraries-2.2.9.ebuild:
+  Keyworded ~x86-fbsd wrt bug 172890
+
+*nessus-libraries-2.2.9 (03 Apr 2007)
+
+  03 Apr 2007; Marcelo Goes <vanquirius@gentoo.org>
+  +nessus-libraries-2.2.9.ebuild:
+  2.2.9 version bump for bug 169466. Thanks to Jared Breland <nitro322 at
+  gmail dot com>.
+
+  26 Mar 2007; Fabian Groffen <grobian@gentoo.org>
+  nessus-libraries-2.3.1-r1.ebuild:
+  Dropped ppc-macos keyword, see you in prefix
+
+*nessus-libraries-2.3.1-r1 (01 Feb 2007)
+
+  01 Feb 2007; Markus Ullmann <jokey@gentoo.org> -files/linux26.patch,
+  -nessus-libraries-2.2.7.ebuild, -nessus-libraries-2.2.8.ebuild,
+  -nessus-libraries-2.3.1.ebuild, +nessus-libraries-2.3.1-r1.ebuild:
+  Fix pcap dependency issue wrt bug #163928
+
+  21 Jan 2007; Cedric Krier <cedk@gentoo.org>
+  +files/nessus-libraries-2.3.1-ldflags.patch,
+  nessus-libraries-2.3.1.ebuild:
+  Add patch for bug #161968
+
+*nessus-libraries-2.2.8 (01 Jun 2006)
+
+  01 Jun 2006; Markus Ullmann <jokey@gentoo.org>
+  +nessus-libraries-2.2.8.ebuild:
+  Version bump wrt bug #134036
+
+*nessus-libraries-2.2.7 (09 Mar 2006)
+
+  09 Mar 2006; Marcelo Goes <vanquirius@gentoo.org>
+  +nessus-libraries-2.2.7.ebuild:
+  2.2.7 version bump for bug 125519. Thanks to ChazeFroy <chazefroy at gmail
+  dot com>.
+
+  19 Feb 2006; Marcelo Goes <vanquirius@gentoo.org>
+  -nessus-libraries-2.2.4.ebuild:
+  Remove 2.2.4 ebuild.
+
+  18 Feb 2006; Fabian Groffen <grobian@gentoo.org>
+  nessus-libraries-2.3.1.ebuild:
+  Marked ~ppc-macos (bug #123308)
+
+  12 Feb 2006; Marcelo Goes <vanquirius@gentoo.org>
+  -nessus-libraries-2.2.5.ebuild:
+  Remove old ebuilds.
+
+  07 Feb 2006; Simon Stelling <blubb@gentoo.org>
+  nessus-libraries-2.2.6.ebuild:
+  stable on amd64
+
+  24 Dec 2005; Michael Hanselmann <hansmi@gentoo.org>
+  nessus-libraries-2.2.6.ebuild:
+  Stable on ppc.
+
+  20 Dec 2005; Bryan Østergaard <kloeri@gentoo.org
+  nessus-libraries-2.2.6.ebuild:
+  Stable on alpha.
+
+  18 Dec 2005; Markus Rothe <corsair@gentoo.org>
+  nessus-libraries-2.2.6.ebuild:
+  Stable on ppc64
+
+  16 Dec 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  nessus-libraries-2.2.6.ebuild:
+  Stable on sparc
+
+  15 Dec 2005; Marcelo Goes <vanquirius@gentoo.org>
+  nessus-libraries-2.2.6.ebuild:
+  Marking nessus suite 2.2.6 x86 stable.
+
+  04 Dec 2005; Tom Gall <tgall@gentoo.org> nessus-libraries-2.2.5.ebuild:
+  stable on ppc64
+
+*nessus-libraries-2.2.6 (09 Nov 2005)
+
+  09 Nov 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +nessus-libraries-2.2.6.ebuild:
+  2.2.6 version bump. Fixes bug 111973. Thanks to ChazeFroy <chazefroy at
+  gmail dot com>.
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org>
+  nessus-libraries-2.2.5.ebuild:
+  Mark 2.2.5 stable on alpha
+
+  05 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  nessus-libraries-2.2.5.ebuild:
+  Stable on sparc
+
+  04 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  nessus-libraries-2.2.5.ebuild:
+  Stable on ppc.
+
+  01 Oct 2005; Luis Medinas <metalgod@gentoo.org>
+  nessus-libraries-2.2.5.ebuild:
+  Marked Stable on amd64.
+
+  26 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  nessus-libraries-2.2.5.ebuild:
+  nessus 2.2.5 series x86 stable.
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  03 Aug 2005; Fabian Groffen <grobian@gentoo.org>
+  nessus-libraries-2.2.4.ebuild:
+  Markin ~ppc-macos
+
+*nessus-libraries-2.2.5 (24 Jul 2005)
+
+  24 Jul 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +nessus-libraries-2.2.5.ebuild:
+  Version bump for bug 100024. Thanks to ChazeFroy <chazefroy@gmail.com>.
+
+  19 Jun 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -nessus-libraries-2.0.12.ebuild, -nessus-libraries-2.2.0.ebuild,
+  -nessus-libraries-2.3.0.ebuild:
+  Remove old ebuilds.
+
+  09 Jun 2005; Olivier Crête <tester@gentoo.org>
+  nessus-libraries-2.2.4.ebuild:
+  Marking stable on amd64
+
+  02 Jun 2005; Joseph Jezak <josejx@gentoo.org>
+  nessus-libraries-2.2.4.ebuild:
+  Marked ppc stable.
+
+  22 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  nessus-libraries-2.2.4.ebuild:
+  Stable on alpha.
+
+*nessus-libraries-2.3.1 (15 May 2005)
+
+  15 May 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +nessus-libraries-2.3.1.ebuild:
+  Version bump for bug 78497
+
+  02 May 2005; Jason Wever <weeve@gentoo.org> nessus-libraries-2.2.4.ebuild:
+  Stable on SPARC.
+
+  24 Apr 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -nessus-libraries-2.2.2a.ebuild, -nessus-libraries-2.2.3.ebuild,
+  nessus-libraries-2.2.4.ebuild:
+  Removing ebuild clutter, marking 2.2.4 x86 stable.
+
+  24 Apr 2005; Marcelo Goes <vanquirius@gentoo.org>
+  nessus-libraries-2.2.2a.ebuild, nessus-libraries-2.2.3.ebuild,
+  nessus-libraries-2.2.4.ebuild, nessus-libraries-2.3.0.ebuild:
+  Use make install instead of emake install.
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  nessus-libraries-2.2.4.ebuild:
+  Stable on ppc64
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  nessus-libraries-2.2.0.ebuild:
+  Stable on ppc.
+
+  31 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
+  nessus-libraries-2.2.0.ebuild:
+  Stable on alpha.
+
+  27 Mar 2005; Jason Wever <weeve@gentoo.org> nessus-libraries-2.2.0.ebuild:
+  Stable on SPARC.
+
+  24 Mar 2005; Marcelo Goes <vanquirius@gentoo.org>
+  nessus-libraries-2.2.0.ebuild:
+  Marking 2.2.0 x86 stable
+
+*nessus-libraries-2.2.4 (23 Mar 2005)
+
+  23 Mar 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +nessus-libraries-2.2.4.ebuild:
+  Version bump, bug 86392. Thanks to Omkhar Arasaratnam <omkhar@rogers.com> for
+  reporting.
+
+*nessus-libraries-2.2.3 (26 Feb 2005)
+
+  26 Feb 2005; Daniel Black <dragonheart@gentoo.org>
+  +nessus-libraries-2.2.3.ebuild:
+  Version bump as per bug #81580. Thanks to ChazeFroy <chazefroy@gmail.com>.
+
+*nessus-libraries-2.2.2a (28 Jan 2005)
+
+  28 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  nessus-libraries-2.2.0.ebuild, +nessus-libraries-2.2.2a.ebuild,
+  nessus-libraries-2.3.0.ebuild:
+  Add latest stable version (bug #78789). 2.3.0 uses correct CC now. Added
+  dropped ~ppc64 keywords
+
+  26 Jan 2005; Daniel Black <dragonheart@gentoo.org> +files/linux26.patch,
+  nessus-libraries-2.3.0.ebuild:
+  Added patch for conflict with linux-headers - bug #71657 with patch by Torsten
+  Kaiser <Storklerk@ariolc.dyndns.org>
+
+*nessus-libraries-2.3.0 (12 Jan 2005)
+
+  12 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  +nessus-libraries-2.3.0.ebuild:
+  Version bump as per bug #73780. Thanks to Holger Hoffstätte <holger@wizards.de>
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*nessus-libraries-2.2.0 (28 Oct 2004)
+
+  28 Oct 2004; Eldad Zack <eldad@gentoo.org> -nessus-libraries-2.1.1.ebuild,
+  +nessus-libraries-2.2.0.ebuild:
+  Version bump: new stable series. Removed 2.1.x development series.
+
+  25 Sep 2004; Tom Gall <tgall@gentoo.org> nessus-libraries-2.0.12.ebuild:
+  stable on ppc64, bug #58014
+
+  28 Aug 2004; Eldad Zack <eldad@gentoo.org> nessus-libraries-2.1.1.ebuild:
+  x86 stable
+
+  13 Aug 2004; Eldad Zack <eldad@gentoo.org> nessus-libraries-2.0.12.ebuild,
+  nessus-libraries-2.1.1.ebuild:
+  Changed optional ssl support to mandatory, since without it libnasl will not
+  compile.
+
+  13 Aug 2004; Bryan Østergaard <kloeri@gentoo.org>
+  nessus-libraries-2.0.12.ebuild:
+  Stable on alpha, bug 58014.
+
+  12 Aug 2004; Eldad Zack <eldad@gentoo.org> nessus-libraries-2.0.10a.ebuild:
+  GLSA 200408-11: masking 2.0.10a for all archs besides alpha until 2.0.12 will
+  be stable on alpha
+
+  12 Aug 2004; Eldad Zack <eldad@gentoo.org> -nessus-libraries-2.0.11.ebuild,
+  nessus-libraries-2.0.12.ebuild, -nessus-libraries-2.0.7.ebuild,
+  -nessus-libraries-2.0.8a.ebuild, -nessus-libraries-2.0.9.ebuild,
+  -nessus-libraries-2.1.0.ebuild:
+  GLSA 200408-11 (Bug #58014) ebuild purging. ppc64 -> ~ppc64, and moved to
+  2.0.12. wrt bug #57456.
+
+  12 Aug 2004; <SeJo@gentoo.org> nessus-libraries-2.0.12.ebuild:
+  stable masking ppc for bug 58014
+
+  07 Aug 2004; Tom Martin <slarti@gentoo.org> nessus-libraries-2.0.12.ebuild:
+  Reverted to testing on amd64 - security@gentoo.org had a change of mind.
+	
+  07 Aug 2004; Tom Martin <slarti@gentoo.org> nessus-libraries-2.0.12.ebuild:
+  Stable on amd64 for bug 58014.
+
+  31 Jul 2004; Tom Gall <tgall@gentoo.org> nessus-libraries-2.0.11.ebuild:
+  stable on ppc64, bug #57456
+
+*nessus-libraries-2.1.1 (24 Jul 2004)
+
+  24 Jul 2004; Eldad Zack <eldad@gentoo.org> +nessus-libraries-2.1.1.ebuild:
+  Version bump.
+
+  23 Jul 2004; Jason Wever <weeve@gentoo.org> nessus-libraries-2.0.12.ebuild:
+  Stable on sparc wrt security bug #58014.
+
+*nessus-libraries-2.0.12 (23 Jul 2004)
+
+  23 Jul 2004; Eldad Zack <eldad@gentoo.org> +nessus-libraries-2.0.12.ebuild:
+  Version bump - Security update (x86 stable). Bug 58014.
+
+*nessus-libraries-2.0.11 (21 Jul 2004)
+
+  21 Jul 2004; Eldad Zack <eldad@gentoo.org> +nessus-libraries-2.0.11.ebuild:
+  Version bump
+
+  19 Jul 2004; Jason Wever <weeve@gentoo.org> nessus-libraries-2.0.10a.ebuild:
+  Stable on sparc.
+
+*nessus-libraries-2.1.0 (16 Jul 2004)
+
+  16 Jul 2004; Eldad Zack <eldad@gentoo.org> +nessus-libraries-2.1.0.ebuild:
+  Added development series 2.1.0 (hard-masked). Closes #56436
+
+  13 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  nessus-libraries-2.0.10a.ebuild:
+  marked x86 stable
+
+  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org>
+  nessus-libraries-2.0.10a.ebuild:
+  Stable on alpha.
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  nessus-libraries-2.0.10a.ebuild, nessus-libraries-2.0.7.ebuild,
+  nessus-libraries-2.0.8a.ebuild, nessus-libraries-2.0.9.ebuild:
+  Add die following econf for bug 48950
+
+*nessus-libraries-2.0.10a (09 Feb 2004)
+
+  09 Feb 2004; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-libraries-2.0.10a.ebuild:
+  Version bump
+
+*nessus-libraries-2.0.9 (19 Nov 2003)
+
+  19 Nov 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-libraries-1.2.4.ebuild, nessus-libraries-1.2.7.ebuild,
+  nessus-libraries-2.0.6a.ebuild, nessus-libraries-2.0.9.ebuild:
+  Version bump + cleanup
+
+*nessus-libraries-2.0.8a (13 Oct 2003)
+
+  13 Oct 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-libraries-2.0.8a.ebuild:
+  Version bump.
+
+  15 Sep 2003; Jason Wever <weeve@gentoo.org> nessus-libraries-2.0.7.ebuild:
+  Added ~sparc keyword.
+
+*nessus-libraries-2.0.7 (10 Jul 2003)
+
+  10 Jul 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-libraries-2.0.7.ebuild:
+  Version bump.
+
+*nessus-libraries-2.0.6a (23 May 2003)
+
+  23 May 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-libraries-2.0.6a.ebuild:
+  Version bump, should fix bug 21529
+
+*nessus-libraries-2.0.5 (13 May 2003)
+
+  13 May 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-libraries-2.0.5.ebuild:
+  Version bump, bug #20901.
+
+*nessus-libraries-2.0.4 (23 Apr 2003)
+
+  23 Apr 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Found in #18978.
+
+*nessus-libraries-2.0.0 (25 Feb 2003)
+
+  25 Feb 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Ebuild submitted by Blu3 <david+gentoo.org@blue-labs.org> in #16310.
+
+*nessus-libraries-1.2.7 (04 Jan 2003)
+
+  16 Jan 2003; Nick Hadaway <raker@gentoo.org> nessus-libraries-1.2.7.ebuild :
+  Marked stable for x86
+
+  04 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Found by Raskasi <raskasi@gmx.net>.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*nessus-libraries-1.2.6 (05 Nov 2002)
+
+  15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> nessus-libraries-1.2.6.ebuild :
+  Add ~alpha to KEYWORDS
+
+  05 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
+
+*nessus-libraries-1.2.4 (22 Aug 2002)
+
+  15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> nessus-libraries-1.2.4.ebuild :
+  Add alpha to KEYWORDS
+
+  22 Aug 2002; Nick Hadaway <raker@gentoo.org>
+  nessus-libraries-1.2.4.ebuild, files/digest-nessus-libraries-1.2.4 :
+  Version bump.
+
+*nessus-libraries-1.2.3 (26 Jul 2002)
+
+  26 Jul 2002; Nick Hadaway <raker@gentoo.org>
+  nessus-libraries-1.2.3.ebuild, files/digest-nessus-libraries-1.2.3 :
+
+  Split out the "nessus" ebuild to the individual nessues componets
+  to allow pieces to build and install properly.  "nessus" is still
+  an installable ebuild, it just pulls in the individual components.
+  nessus-libraries is the first of those components.
diff --git a/net-analyzer/nessus-libraries/Manifest b/net-analyzer/nessus-libraries/Manifest
new file mode 100644
index 0000000..1311a89
--- /dev/null
+++ b/net-analyzer/nessus-libraries/Manifest
@@ -0,0 +1,5 @@
+AUX nessus-libraries-2.3.1-ldflags.patch 1010 RMD160 382f930f6eec35405264f9cf0baffa29cd55a15b SHA1 a78554996cb28929aeed729b9ee088482cf99b59 SHA256 8c5cdd22850134641eee93045391f4c4566d44287cec7a7c81c6d219de3e24af
+DIST nessus-libraries-2.2.11.tar.gz 428265 RMD160 9c7a2da70ba7d64cdd2fd54e26b280d77da72661 SHA1 0e4794df390607f224057c1ca9d9ad1bcd8c0b86 SHA256 2eece04c3660005142d1740855876118addad3296b5db1073f89ff04b52e739a
+EBUILD nessus-libraries-2.2.11.ebuild 1008 RMD160 c95a7587fbe5bf1eff957b98ac53fd6d6e74697f SHA1 d343a85cca210c31fa874889860f419d13a635f5 SHA256 f125d5a889e47175ee6233a014f90aa6ee48078eb8372d31422649b7e9b552b6
+MISC ChangeLog 12392 RMD160 8c213d597435a842ed5844e0e52e91a9ff2f44f7 SHA1 a34a8dc9e627565d437b681648ab531f21a4477e SHA256 9310cb97b9af67a7dc32638838ddd87232015700021783c708b6b41905c2d9a4
+MISC metadata.xml 249 RMD160 733e7145e60c54eb0c583195b4c0c6ebb91756c0 SHA1 0a5d282d1381312bc9eaee4f4cc282811ba33a64 SHA256 14643d9de5c8caeb0c6ab8044426e00b98dab06667ef8d75472a365ef8011754
diff --git a/net-analyzer/nessus-libraries/files/digest-nessus-libraries-2.2.10 b/net-analyzer/nessus-libraries/files/digest-nessus-libraries-2.2.10
new file mode 100644
index 0000000..ea7d3de
--- /dev/null
+++ b/net-analyzer/nessus-libraries/files/digest-nessus-libraries-2.2.10
@@ -0,0 +1,3 @@
+MD5 79654be23fc17ed5ec484caa98e87e85 nessus-libraries-2.2.10.tar.gz 429040
+RMD160 e57a177a51c353fc5df7b28fa151a885d5ab1c99 nessus-libraries-2.2.10.tar.gz 429040
+SHA256 497ad1946435846647aeca0b687a9766799eda7877ea3d3fa0df4ee8cbe93f1e nessus-libraries-2.2.10.tar.gz 429040
diff --git a/net-analyzer/nessus-libraries/files/nessus-libraries-2.3.1-ldflags.patch b/net-analyzer/nessus-libraries/files/nessus-libraries-2.3.1-ldflags.patch
new file mode 100644
index 0000000..9aca9ab
--- /dev/null
+++ b/net-analyzer/nessus-libraries/files/nessus-libraries-2.3.1-ldflags.patch
@@ -0,0 +1,25 @@
+diff -ru nessus-libraries~/libnessus/Makefile nessus-libraries/libnessus/Makefile
+--- nessus-libraries~/libnessus/Makefile	2007-01-21 19:49:30.000000000 +0100
++++ nessus-libraries/libnessus/Makefile	2007-01-21 20:17:59.000000000 +0100
+@@ -101,7 +101,7 @@
+ 	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c snprintf.c	
+ libnessus.la: $(OBJS)
+ 	$(LIBTOOL) $(CC) -o libnessus.la $(LO_OBJS) -rpath ${libdir} \
+-	-version-info ${PACKAGE_VERSION}
++	-version-info ${PACKAGE_VERSION} ${PCAP_FLAG} ${SSL_FLAG}
+ 
+ install : libnessus.la
+ 	test -d $(DESTDIR)${libdir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${libdir}
+diff -ru nessus-libraries~/nessus.tmpl.in nessus-libraries/nessus.tmpl.in
+--- nessus-libraries~/nessus.tmpl.in	2007-01-21 19:49:30.000000000 +0100
++++ nessus-libraries/nessus.tmpl.in	2007-01-21 20:17:45.000000000 +0100
+@@ -61,6 +61,9 @@
+ #
+ BUILD_PCAP=@BUILD_PCAP@
+ 
++PCAP_FLAG=@pcap_flag@
++SSL_FLAG=@ssl@
++
+ 
+ # Some defines you may want to modify
+ DEFS=@DEFS@ $(DEBUG_SSL) $(USE_CIPHER) $(DEBUG)
diff --git a/net-analyzer/nessus-libraries/metadata.xml b/net-analyzer/nessus-libraries/metadata.xml
new file mode 100644
index 0000000..6f25766
--- /dev/null
+++ b/net-analyzer/nessus-libraries/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>netmon</herd>
+<longdescription>A remote security scanner for Linux (nessus-libraries)</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/nessus-libraries/nessus-libraries-2.2.11.ebuild b/net-analyzer/nessus-libraries/nessus-libraries-2.2.11.ebuild
new file mode 100644
index 0000000..e244559
--- /dev/null
+++ b/net-analyzer/nessus-libraries/nessus-libraries-2.2.11.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-libraries/nessus-libraries-2.2.9.ebuild,v 1.2 2007/04/11 13:41:07 welp Exp $
+
+inherit toolchain-funcs
+
+DESCRIPTION="A remote security scanner for Linux (nessus-libraries)"
+HOMEPAGE="http://www.nessus.org/"
+SRC_URI="${P}.tar.gz"
+RESTRICT="mirror fetch strip"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+# Hard dep on SSL since libnasl won't compile when this package is emerged -ssl.
+DEPEND=">=dev-libs/openssl-0.9.6d"
+S="${WORKDIR}/${PN}"
+
+pkg_nofetch() {
+    einfo "Please download ${P}.tar.gz from ${HOMEPAGE}/download"
+	einfo "The archive should then be placed into ${DISTDIR}."
+}
+
+
+src_compile() {
+	export CC="$(tc-getCC)"
+	econf --with-ssl=/usr/lib || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "failed to install"
+	dodoc README*
+}
diff --git a/net-analyzer/nessus-plugins/ChangeLog b/net-analyzer/nessus-plugins/ChangeLog
new file mode 100644
index 0000000..ab304ef
--- /dev/null
+++ b/net-analyzer/nessus-plugins/ChangeLog
@@ -0,0 +1,340 @@
+# ChangeLog for net-analyzer/nessus-plugins
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-plugins/ChangeLog,v 1.77 2007/04/11 13:45:06 welp Exp $
+
+  11 Apr 2007; Peter Weller <welp@gentoo.org> nessus-plugins-2.2.9.ebuild:
+  Keyworded ~x86-fbsd wrt bug 172890
+
+*nessus-plugins-2.2.9 (03 Apr 2007)
+
+  03 Apr 2007; Marcelo Goes <vanquirius@gentoo.org>
+  +nessus-plugins-2.2.9.ebuild:
+  2.2.9 version bump for bug 169466. Thanks to Jared Breland <nitro322 at
+  gmail dot com>.
+
+  26 Mar 2007; Fabian Groffen <grobian@gentoo.org>
+  nessus-plugins-2.3.1.ebuild:
+  Dropped ppc-macos keyword
+
+  01 Feb 2007; Markus Ullmann <jokey@gentoo.org>
+  -nessus-plugins-2.2.7.ebuild, -nessus-plugins-2.2.8.ebuild:
+  cleanup
+
+*nessus-plugins-2.2.8 (01 Jun 2006)
+
+  01 Jun 2006; Markus Ullmann <jokey@gentoo.org>
+  +nessus-plugins-2.2.8.ebuild:
+  Version bump wrt bug #134036
+
+*nessus-plugins-2.2.7 (09 Mar 2006)
+
+  09 Mar 2006; Marcelo Goes <vanquirius@gentoo.org>
+  +nessus-plugins-2.2.7.ebuild:
+  2.2.7 version bump for bug 125519. Thanks to ChazeFroy <chazefroy at gmail
+  dot com>.
+
+  18 Feb 2006; Fabian Groffen <grobian@gentoo.org>
+  nessus-plugins-2.3.1.ebuild:
+  Marked ~ppc-macos (bug #123308)
+
+  12 Feb 2006; Marcelo Goes <vanquirius@gentoo.org>
+  -nessus-plugins-2.2.4.ebuild, -nessus-plugins-2.2.5.ebuild:
+  Remove old ebuilds.
+
+  07 Feb 2006; Simon Stelling <blubb@gentoo.org>
+  nessus-plugins-2.2.6.ebuild:
+  stable on amd64
+
+  24 Dec 2005; Michael Hanselmann <hansmi@gentoo.org>
+  nessus-plugins-2.2.6.ebuild:
+  Stable on ppc.
+
+  20 Dec 2005; Bryan Østergaard <kloeri@gentoo.org
+  nessus-plugins-2.2.6.ebuild:
+  Stable on alpha.
+
+  18 Dec 2005; Markus Rothe <corsair@gentoo.org>
+  nessus-plugins-2.2.6.ebuild:
+  Stable on ppc64
+
+  16 Dec 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  nessus-plugins-2.2.6.ebuild:
+  Stable on sparc
+
+  15 Dec 2005; Marcelo Goes <vanquirius@gentoo.org>
+  nessus-plugins-2.2.6.ebuild:
+  Marking nessus suite 2.2.6 x86 stable.
+
+  04 Dec 2005; Tom Gall <tgall@gentoo.org> 
+  nessus-plugins-2.2.5.ebuild:
+  stable on ppc64
+
+*nessus-plugins-2.2.6 (09 Nov 2005)
+
+  09 Nov 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +nessus-plugins-2.2.6.ebuild:
+  2.2.6 version bump. Fixes bug 111973. Thanks to ChazeFroy <chazefroy at
+  gmail dot com>.
+
+  05 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  nessus-plugins-2.2.5.ebuild:
+  Stable on sparc
+
+  02 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  nessus-plugins-2.2.5.ebuild:
+  Stable on ppc.
+
+  01 Oct 2005; Luis Medinas <metalgod@gentoo.org>
+  nessus-plugins-2.2.5.ebuild:
+  Marked Stable on amd64.
+
+  26 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  nessus-plugins-2.2.5.ebuild:
+  nessus 2.2.5 series x86 stable.
+
+*nessus-plugins-2.2.5 (24 Jul 2005)
+
+  24 Jul 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +nessus-plugins-2.2.5.ebuild:
+  Version bump for bug 100024. Thanks to ChazeFroy <chazefroy@gmail.com>.
+
+  19 Jun 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -nessus-plugins-2.0.12.ebuild, -nessus-plugins-2.2.0.ebuild,
+  -nessus-plugins-2.3.0.ebuild:
+  Remove old ebuilds.
+
+  09 Jun 2005; Olivier Crête <tester@gentoo.org>
+  nessus-plugins-2.2.4.ebuild:
+  Marking stable on amd64
+
+  02 Jun 2005; Joseph Jezak <josejx@gentoo.org> nessus-plugins-2.2.4.ebuild:
+  Marked ppc stable.
+
+  22 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  nessus-plugins-2.2.4.ebuild:
+  Stable on alpha.
+
+*nessus-plugins-2.3.1 (15 May 2005)
+
+  15 May 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +nessus-plugins-2.3.1.ebuild:
+  Version bump.
+
+  02 May 2005; Jason Wever <weeve@gentoo.org> nessus-plugins-2.2.4.ebuild:
+  Stable on SPARC.
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  nessus-plugins-2.2.4.ebuild:
+  Stable on ppc64
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  nessus-plugins-2.2.0.ebuild:
+  Stable on ppc.
+
+  24 Apr 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -nessus-plugins-2.2.2a.ebuild, -nessus-plugins-2.2.3.ebuild,
+  nessus-plugins-2.2.4.ebuild:
+  Removing ebuild clutter, marking 2.2.4 x86 stable.
+
+  31 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
+  nessus-plugins-2.2.0.ebuild:
+  Stable on alpha.
+
+  27 Mar 2005; Jason Wever <weeve@gentoo.org> nessus-plugins-2.2.0.ebuild:
+  Stable on SPARC.
+
+  24 Mar 2005; Marcelo Goes <vanquirius@gentoo.org>
+  nessus-plugins-2.0.12.ebuild, nessus-plugins-2.2.0.ebuild:
+  Marking 2.2.0 x86 stable, cleaning up unnecessary src_compile.
+
+*nessus-plugins-2.2.4 (23 Mar 2005)
+
+  23 Mar 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +nessus-plugins-2.2.4.ebuild:
+  Version bump, bug 86392. Thanks to Omkhar Arasaratnam <omkhar@rogers.com> for
+  reporting.
+
+*nessus-plugins-2.2.3 (26 Feb 2005)
+
+  26 Feb 2005; Daniel Black <dragonheart@gentoo.org>
+  +nessus-plugins-2.2.3.ebuild:
+  Version bump as per bug #81580. Thanks to ChazeFroy <chazefroy@gmail.com> and
+  Omkhar Arasaratnam <omkhar@rogers.com>.
+
+*nessus-plugins-2.2.2a (28 Jan 2005)
+
+  28 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  nessus-plugins-2.2.0.ebuild, +nessus-plugins-2.2.2a.ebuild,
+  nessus-plugins-2.3.0.ebuild:
+  Add latest stable version. 2.3.0 uses correct CC now. Added missing ppc64
+  keywords
+
+*nessus-plugins-2.3.0 (12 Jan 2005)
+
+  12 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  +nessus-plugins-2.3.0.ebuild:
+  Version bump as per bug #73780. Thanks to Holger Hoffstätte <holger@wizards.de>
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*nessus-plugins-2.2.0 (28 Oct 2004)
+
+  28 Oct 2004; Eldad Zack <eldad@gentoo.org> -nessus-plugins-2.1.1.ebuild,
+  +nessus-plugins-2.2.0.ebuild:
+  Version bump: new stable series. Removed 2.1.x development series.
+
+  25 Sep 2004; Tom Gall <tgall@gentoo.org> nessus-plugins-2.0.12.ebuild:
+  stable on ppc64, bug #58014
+
+  28 Aug 2004; Eldad Zack <eldad@gentoo.org> nessus-plugins-2.1.1.ebuild:
+  x86 stable
+
+  13 Aug 2004; Bryan Østergaard <kloeri@gentoo.org>
+  nessus-plugins-2.0.12.ebuild:
+  Stable on alpha, bug 58014.
+
+  12 Aug 2004; Eldad Zack <eldad@gentoo.org> nessus-plugins-2.0.10a.ebuild:
+  GLSA 200408-11: masking 2.0.10a for all archs besides alpha until 2.0.12 will
+  be stable on alpha
+
+  12 Aug 2004; Eldad Zack <eldad@gentoo.org> -nessus-plugins-2.0.11.ebuild,
+  nessus-plugins-2.0.12.ebuild, -nessus-plugins-2.0.7.ebuild,
+  -nessus-plugins-2.0.8a.ebuild, -nessus-plugins-2.0.9.ebuild,
+  -nessus-plugins-2.1.0.ebuild:
+  GLSA 200408-11 (Bug #58014) ebuild purging. ppc64 -> ~ppc64, and moved to
+  2.0.12. wrt bug #57456.
+
+  12 Aug 2004; <SeJo@gentoo.org> nessus-plugins-2.0.12.ebuild:
+  stable masking ppc for bug 58014
+
+  01 Aug 2004; Tom Gall <tgall@gentoo.org> nessus-plugins-2.0.11.ebuild:
+  stable on ppc64,bug #57456
+
+*nessus-plugins-2.1.1 (24 Jul 2004)
+
+  24 Jul 2004; Eldad Zack <eldad@gentoo.org> +nessus-plugins-2.1.1.ebuild:
+  Version bump
+
+  23 Jul 2004; Jason Wever <weeve@gentoo.org> nessus-plugins-2.0.12.ebuild:
+  Stable on sparc wrt security bug #58014.
+
+*nessus-plugins-2.0.12 (23 Jul 2004)
+
+  23 Jul 2004; Eldad Zack <eldad@gentoo.org> +nessus-plugins-2.0.12.ebuild:
+  Version bump - Security update (x86 stable). Bug 58014.
+
+*nessus-plugins-2.0.11 (21 Jul 2004)
+
+  21 Jul 2004; Eldad Zack <eldad@gentoo.org> +nessus-plugins-2.0.11.ebuild:
+  Version bump
+
+  19 Jul 2004; Jason Wever <weeve@gentoo.org> nessus-plugins-2.0.10a.ebuild:
+  Stable on sparc.
+
+*nessus-plugins-2.1.0 (16 Jul 2004)
+
+  16 Jul 2004; Eldad Zack <eldad@gentoo.org> +nessus-plugins-2.1.0.ebuild:
+  Added development series 2.1.0 (hard-masked). Closes #56436
+
+  13 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  nessus-plugins-2.0.10a.ebuild:
+  marked x86 stable
+
+  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org>
+  nessus-plugins-2.0.10a.ebuild:
+  Stable on alpha.
+
+*nessus-plugins-2.0.10a (09 Feb 2004)
+
+  09 Feb 2004; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-plugins-2.0.10a.ebuild:
+  Version bump
+
+*nessus-plugins-2.0.9 (19 Nov 2003)
+
+  19 Nov 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-plugins-2.0.6a.ebuild, nessus-plugins-2.0.9.ebuild:
+  Version bump
+
+*nessus-plugins-2.0.8a (13 Oct 2003)
+
+  13 Oct 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-plugins-2.0.8a.ebuild:
+  Version bump
+
+  15 Sep 2003; Jason Wever <weeve@gentoo.org> nessus-plugins-2.0.7.ebuild:
+  Added ~sparc keyword.
+
+  02 Sep 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-plugins-2.0.7.ebuild:
+  Changing DEPEND from = to >= because of bug 27544
+
+  05 Aug 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-plugins-2.0.6a.ebuild:
+  Corrected dependency (bug 25874)
+
+*nessus-plugins-2.0.7 (10 Jul 2003)
+
+  10 Jul 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-plugins-2.0.7.ebuild:
+  Version bump
+
+*nessus-plugins-2.0.6a (23 May 2003)
+
+  23 May 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-plugins-2.0.6a.ebuild:
+  Version bump, should fix bug 21529
+
+*nessus-plugins-2.0.5 (13 May 2003)
+
+  13 May 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-plugins-2.0.5.ebuild:
+  Version bump, bug #20901.
+
+*nessus-plugins-2.0.4 (23 Apr 2003)
+
+  23 Apr 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Found in #18978.
+
+*nessus-plugins-2.0.0 (25 Feb 2003)
+
+  25 Feb 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Ebuild submitted by Blu3 <david+gentoo.org@blue-labs.org> in #16310.
+
+*nessus-plugins-1.2.7 (04 Jan 2003)
+
+  12 Jan 2003; Nick Hadaway <raker@gentoo.org> nessus-plugins-1.2.7.ebuild :
+  doc install fix.  Marked stable for x86.
+
+  04 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Found by Raskasi <raskasi@gmx.net>.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*nessus-plugins-1.2.6 (05 Nov 2002)
+
+  15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> nessus-plugins-1.2.6.ebuild :
+  Add ~alpha to KEYWORDS
+
+  05 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
+
+*nessus-plugins-1.2.4 (22 Aug 2002)
+
+  15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> nessus-plugins-1.2.4.ebuild :
+  Add alpha to KEYWORDS
+
+  22 Aug 2002; Nick Hadaway <raker@gentoo.org>
+  nessus-plugins-1.2.4.ebuild, files/digest-nessus-plugins-1.2.4 :
+  Version bump.
+
+*nessus-plugins-1.2.3 (26 Jul 2002)
+
+  26 Jul 2002; Nick Hadaway <raker@gentoo.org>
+  nessus-plugins-1.2.3.ebuild, files/digest-nessus-plugins-1.2.3 :
+
+  Split out the "nessus" ebuild to the individual nessues components
+  to allow pieces to build and install properly.  "nessus" is still
+  an installable ebuild, it just pulls in the individual components.
+  nessus-plugins is the third of those components.
diff --git a/net-analyzer/nessus-plugins/Manifest b/net-analyzer/nessus-plugins/Manifest
new file mode 100644
index 0000000..94890dc
--- /dev/null
+++ b/net-analyzer/nessus-plugins/Manifest
@@ -0,0 +1,4 @@
+DIST nessus-plugins-2.2.11.tar.gz 7647308 RMD160 480aa0b57412de681fd6bc7b1b3b5fdec78626db SHA1 5037f7b6551c1cb303e5f5b853b7493e56aa02d9 SHA256 de6d4484a540dc82e24fa05a1dc074fcc1b56f2e499b3a3631b976f529ce9be5
+EBUILD nessus-plugins-2.2.11.ebuild 1114 RMD160 12378c68565995ea450926407ef442ff6bd1306b SHA1 5f077a687416f949ce792171f316803376bc26c4 SHA256 ebb19a69954350956011c3fdd479874780f71cd9af860e5cd2a4f0dabae4cf2b
+MISC ChangeLog 10559 RMD160 d672f18cefd5f8f3d9b3f16a2f05cc47e9062922 SHA1 562924158132b643adfa1c6e182b543b84f14d7f SHA256 334a7c0865c09c0eb3cb95927d678084b669ea1bb341861812ab8f4bcae2fe1f
+MISC metadata.xml 247 RMD160 4ee594f802a5efde22684ba19f1b0cb4cfb52399 SHA1 2d76dbd3df76c22407c44eda059770e705b83b0f SHA256 c66aabcec0558bf93d1f1ee660ca7b72237fe51ecb21baa48f8a45b162824877
diff --git a/net-analyzer/nessus-plugins/files/digest-nessus-plugins-2.2.10 b/net-analyzer/nessus-plugins/files/digest-nessus-plugins-2.2.10
new file mode 100644
index 0000000..a7c5b22
--- /dev/null
+++ b/net-analyzer/nessus-plugins/files/digest-nessus-plugins-2.2.10
@@ -0,0 +1,3 @@
+MD5 4ba3bbb84272a449e09bce2448861fbb nessus-plugins-GPL-2.2.10.tar.gz 1097233
+RMD160 4a2f60164eff803b29a81a5f8a7cf479209b0411 nessus-plugins-GPL-2.2.10.tar.gz 1097233
+SHA256 affbfd5f2a01b43a618944227ab08f25ed40eea51c2512dac4dbc9ed9688b946 nessus-plugins-GPL-2.2.10.tar.gz 1097233
diff --git a/net-analyzer/nessus-plugins/metadata.xml b/net-analyzer/nessus-plugins/metadata.xml
new file mode 100644
index 0000000..59050fc
--- /dev/null
+++ b/net-analyzer/nessus-plugins/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>netmon</herd>
+<longdescription>A remote security scanner for Linux (nessus-plugins)</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/nessus-plugins/nessus-plugins-2.2.11.ebuild b/net-analyzer/nessus-plugins/nessus-plugins-2.2.11.ebuild
new file mode 100644
index 0000000..599c8e4
--- /dev/null
+++ b/net-analyzer/nessus-plugins/nessus-plugins-2.2.11.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-plugins/nessus-plugins-2.2.9.ebuild,v 1.3 2007/07/11 23:49:24 mr_bones_ Exp $
+
+inherit toolchain-funcs
+
+S="${WORKDIR}/${PN}"
+DESCRIPTION="A remote security scanner for Linux (nessus-plugins)"
+HOMEPAGE="http://www.nessus.org/"
+#SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/nessus-plugins-${PV}.tar.gz"
+SRC_URI="${PN}-${PV}.tar.gz"
+RESTRICT="mirror fetch strip"
+
+DEPEND=">=net-analyzer/nessus-core-${PV}"
+SLOT="0"
+IUSE=""
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+pkg_nofetch() {
+    einfo "Please download ${PN}-${PV}.tar.gz from ${HOMEPAGE}/download"
+	einfo "The archive should then be placed into ${DISTDIR}."
+}
+
+src_compile() {
+	export CC="$(tc-getCC)"
+	econf || die
+	emake || die
+}
+
+src_install() {
+	touch scripts/dummy.nbin	# needed a dummy nbin or installer would not
+								# work
+	emake \
+		DESTDIR="${D}" \
+		install || die "make install failed"
+	dodoc docs/*.txt plugins/accounts/accounts.txt
+}
diff --git a/net-analyzer/nessus/ChangeLog b/net-analyzer/nessus/ChangeLog
new file mode 100644
index 0000000..663f930
--- /dev/null
+++ b/net-analyzer/nessus/ChangeLog
@@ -0,0 +1,360 @@
+# ChangeLog for net-analyzer/nessus
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus/ChangeLog,v 1.87 2007/05/01 18:05:06 genone Exp $
+
+  01 May 2007; Marius Mauch <genone@gentoo.org> nessus-2.2.6.ebuild,
+  nessus-2.2.9.ebuild, nessus-2.3.1.ebuild:
+  Replacing einfo with elog
+
+  11 Apr 2007; Peter Weller <welp@gentoo.org> nessus-2.2.9.ebuild:
+  Keyworded ~x86-fbsd wrt bug 172890
+
+*nessus-2.2.9 (03 Apr 2007)
+
+  03 Apr 2007; Marcelo Goes <vanquirius@gentoo.org> +nessus-2.2.9.ebuild:
+  2.2.9 version bump for bug 169466. Thanks to Jared Breland <nitro322 at
+  gmail dot com>.
+
+  26 Mar 2007; Fabian Groffen <grobian@gentoo.org> nessus-2.3.1.ebuild:
+  Dropped ppc-macos keyword
+
+  01 Feb 2007; Markus Ullmann <jokey@gentoo.org> -nessus-2.2.7.ebuild,
+  -nessus-2.2.8.ebuild:
+  cleanup
+
+*nessus-2.2.8 (01 Jun 2006)
+
+  01 Jun 2006; Markus Ullmann <jokey@gentoo.org> +nessus-2.2.8.ebuild:
+  Version bump wrt bug #134036
+
+*nessus-2.2.7 (09 Mar 2006)
+
+  09 Mar 2006; Marcelo Goes <vanquirius@gentoo.org> +nessus-2.2.7.ebuild:
+  2.2.7 version bump for bug 125519. Thanks to ChazeFroy <chazefroy at gmail
+  dot com>.
+
+  19 Feb 2006; Marcelo Goes <vanquirius@gentoo.org> nessus-2.3.1.ebuild:
+  Update description. Now that it runs on ppc-macos, it is no longer a scanner
+  for Linux :-).
+
+  18 Feb 2006; Fabian Groffen <grobian@gentoo.org> nessus-2.3.1.ebuild:
+  Marked ~ppc-macos (bug #123308)
+
+  12 Feb 2006; Marcelo Goes <vanquirius@gentoo.org> -nessus-2.2.4.ebuild,
+  -nessus-2.2.5.ebuild:
+  Remove old ebuilds.
+
+  07 Feb 2006; Simon Stelling <blubb@gentoo.org> nessus-2.2.6.ebuild:
+  stable on amd64
+
+  24 Dec 2005; Michael Hanselmann <hansmi@gentoo.org> nessus-2.2.6.ebuild:
+  Stable on ppc.
+
+  20 Dec 2005; Bryan Østergaard <kloeri@gentoo.org nessus-2.2.6.ebuild:
+  Stable on alpha.
+
+  18 Dec 2005; Markus Rothe <corsair@gentoo.org> nessus-2.2.6.ebuild:
+  Stable on ppc64
+
+  16 Dec 2005; Gustavo Zacarias <gustavoz@gentoo.org> nessus-2.2.6.ebuild:
+  Stable on sparc
+
+  15 Dec 2005; Marcelo Goes <vanquirius@gentoo.org> nessus-2.2.6.ebuild:
+  Marking nessus suite 2.2.6 x86 stable.
+
+  04 Dec 2005; Tom Gall <tgall@gentoo.org> nessus-2.2.5.ebuild:
+  stable on ppc64
+
+*nessus-2.2.6 (09 Nov 2005)
+
+  09 Nov 2005; Marcelo Goes <vanquirius@gentoo.org> +nessus-2.2.6.ebuild:
+  2.2.6 version bump. Fixes bug 111973. Thanks to ChazeFroy <chazefroy at
+  gmail dot com>.
+
+  05 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> nessus-2.2.5.ebuild:
+  Stable on sparc
+
+  02 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> nessus-2.2.5.ebuild:
+  Stable on ppc.
+
+  01 Oct 2005; Luis Medinas <metalgod@gentoo.org> nessus-2.2.5.ebuild:
+  Marked Stable on amd64.
+
+  26 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> nessus-2.2.5.ebuild,
+  nessus-2.3.1.ebuild:
+  nessus 2.2.5 series x86 stable.
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+*nessus-2.2.5 (24 Jul 2005)
+
+  24 Jul 2005; Marcelo Goes <vanquirius@gentoo.org> +nessus-2.2.5.ebuild:
+  Version bump for bug 100024. Thanks to ChazeFroy <chazefroy@gmail.com>.
+
+  19 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> -nessus-2.0.12.ebuild,
+  -nessus-2.2.0.ebuild, -nessus-2.3.0.ebuild:
+  Remove old ebuilds.
+
+  09 Jun 2005; Olivier Crête <tester@gentoo.org> ChangeLog:
+  Marking stable on amd64
+
+  02 Jun 2005; Joseph Jezak <josejx@gentoo.org> nessus-2.2.4.ebuild:
+  Marked ppc stable.
+
+  22 May 2005; Bryan Østergaard <kloeri@gentoo.org> nessus-2.2.4.ebuild:
+  Stable on alpha.
+
+*nessus-2.3.1 (18 May 2005)
+
+  18 May 2005; Aaron Walker <ka0ttic@gentoo.org> +nessus-2.3.1.ebuild:
+  Version bump.
+
+  02 May 2005; Jason Wever <weeve@gentoo.org> nessus-2.2.4.ebuild:
+  Stable on SPARC.
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> nessus-2.2.4.ebuild:
+  Stable on ppc64
+
+  24 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> -nessus-2.2.2a.ebuild,
+  -nessus-2.2.3.ebuild, nessus-2.2.4.ebuild:
+  Removing ebuild clutter, marking 2.2.4 x86 stable.
+
+  31 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> nessus-2.2.0.ebuild:
+  Stable on alpha.
+
+  27 Mar 2005; Jason Wever <weeve@gentoo.org> nessus-2.2.0.ebuild:
+  Stable on SPARC.
+
+  24 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> nessus-2.2.0.ebuild:
+  Marking 2.2.0 x86 stable
+
+*nessus-2.2.4 (23 Mar 2005)
+
+  23 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> +nessus-2.2.4.ebuild:
+  Version bump, bug 86392. Thanks to Omkhar Arasaratnam <omkhar@rogers.com> for
+  reporting.
+
+  28 Feb 2005; Daniel Black <dragonheart@gentoo.org> nessus-2.0.12.ebuild,
+  nessus-2.2.0.ebuild, nessus-2.2.2a.ebuild, nessus-2.2.3.ebuild,
+  nessus-2.3.0.ebuild:
+  Added remove message as this is a META ebuild. Dependancies should of been ~
+  instead of >=. Thanks to bug #83513 by Darren Spruell <lists@sancho2k.net>
+
+*nessus-2.2.3 (26 Feb 2005)
+
+  26 Feb 2005; Daniel Black <dragonheart@gentoo.org> +nessus-2.2.3.ebuild:
+  Version bump as per bug #81580. Thanks to ChazeFroy <chazefroy@gmail.com>.
+
+*nessus-2.2.2a (28 Jan 2005)
+
+  28 Jan 2005; Daniel Black <dragonheart@gentoo.org> nessus-2.2.0.ebuild,
+  +nessus-2.2.2a.ebuild, nessus-2.3.0.ebuild:
+  Add latest stable version (bug #78789). Added dropped ~ppc64 keywords. Thanks
+  to Alexey Portnov <mail@trado.nnov.ru>
+
+*nessus-2.3.0 (12 Jan 2005)
+
+  12 Jan 2005; Daniel Black <dragonheart@gentoo.org> +nessus-2.3.0.ebuild:
+  Version bump as per bug #73780. Thanks to Holger Hoffstätte <holger@wizards.de>
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*nessus-2.2.0 (28 Oct 2004)
+
+  28 Oct 2004; Eldad Zack <eldad@gentoo.org> -nessus-2.1.1.ebuild,
+  +nessus-2.2.0.ebuild:
+  Version bump: new stable series. Removed 2.1.x development series.
+
+  25 Sep 2004; Tom Gall <tgall@gentoo.org> nessus-2.0.12.ebuild:
+  stable on ppc64, bug #58014
+
+  28 Aug 2004; Eldad Zack <eldad@gentoo.org> nessus-2.1.1.ebuild:
+  x86 stable
+
+  13 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> nessus-2.0.12.ebuild:
+  Stable on alpha, bug 58014.
+
+  12 Aug 2004; Eldad Zack <eldad@gentoo.org> -nessus-2.0.11.ebuild,
+  nessus-2.0.12.ebuild, -nessus-2.1.0.ebuild:
+  ppc64 -> ~ppc64, and moved to 2.0.12. wrt bug #57456.
+
+  12 Aug 2004; Eldad Zack <eldad@gentoo.org> nessus-2.0.10a.ebuild,
+  nessus-2.0.11.ebuild, -nessus-2.0.7-r1.ebuild, -nessus-2.0.7.ebuild,
+  -nessus-2.0.8a.ebuild, -nessus-2.0.9.ebuild:
+  GLSA 200408-11 (Bug #58014) ebuild purging.
+
+  12 Aug 2004; <SeJo@gentoo.org> nessus-2.0.12.ebuild:
+  stable masking ppc for bug 58014
+
+  01 Aug 2004; Tom Gall <tgall@gentoo.org> nessus-2.0.11.ebuild:
+  stable on ppc64, bug #57456
+
+*nessus-2.1.1 (24 Jul 2004)
+
+  24 Jul 2004; Eldad Zack <eldad@gentoo.org> +nessus-2.1.1.ebuild:
+  Version bump
+
+  24 Jul 2004; Eldad Zack <eldad@gentoo.org> nessus-2.0.12.ebuild,
+  nessus-2.1.0.ebuild:
+  Fixed RDEPEND. Closes #58113
+
+  23 Jul 2004; Jason Wever <weeve@gentoo.org> nessus-2.0.12.ebuild:
+  Stable on sparc wrt security bug #58014.
+
+*nessus-2.0.12 (23 Jul 2004)
+
+  23 Jul 2004; Eldad Zack <eldad@gentoo.org> +nessus-2.0.12.ebuild:
+  Version bump - Security update (x86 stable). Bug 58014.
+
+*nessus-2.0.11 (21 Jul 2004)
+
+  21 Jul 2004; Eldad Zack <eldad@gentoo.org> +nessus-2.0.11.ebuild:
+  Version bump
+
+  19 Jul 2004; Jason Wever <weeve@gentoo.org> nessus-2.0.10a.ebuild:
+  Stable on sparc.
+
+*nessus-2.1.0 (16 Jul 2004)
+
+  16 Jul 2004; Eldad Zack <eldad@gentoo.org> +nessus-2.1.0.ebuild:
+  Added development series 2.1.0 (hard-masked). Closes #56436
+
+  13 Jul 2004; Eldad Zack <eldad@gentoo.org> nessus-2.0.10a.ebuild:
+  marked x86 stable
+
+  11 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  nessus-2.0.10a.ebuild, nessus-2.0.7-r1.ebuild, nessus-2.0.7.ebuild,
+  nessus-2.0.8a.ebuild, nessus-2.0.9.ebuild:
+  Added metadata, added missing IUSE
+
+  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> nessus-2.0.10a.ebuild:
+  Stable on alpha.
+
+*nessus-2.0.10a (09 Feb 2004)
+
+  09 Feb 2004; Patrick Kursawe <phosphan@gentoo.org> nessus-2.0.10a.ebuild:
+  Version bump
+
+*nessus-2.0.9 (19 Nov 2003)
+
+  19 Nov 2003; Patrick Kursawe <phosphan@gentoo.org> nessus-2.0.6a-r1.ebuild,
+  nessus-2.0.9.ebuild, files/nessusd, files/nessusd-r6:
+  Version bump.
+
+*nessus-2.0.8a (13 Oct 2003)
+
+  13 Oct 2003; Patrick Kursawe <phosphan@gentoo.org> nessus-2.0.8a.ebuild:
+  Version bump.
+
+  15 Sep 2003; Jason Wever <weeve@gentoo.org> nessus-2.0.7-r1.ebuild:
+  Added ~sparc keyword.
+
+*nessus-2.0.7-r1 (01 Sep 2003)
+
+  01 Sep 2003; Patrick Kursawe <phosphan@gentoo.org> nessus-2.0.7-r1.ebuild:
+  nessus-core 2.0.7-r1 includes patches for prelude.
+
+*nessus-2.0.6a-r1 (17 Jul 2003)
+
+  17 Jul 2003; Patrick Kursawe <phosphan@gentoo.org> nessus-2.0.6a-r1.ebuild:
+  Fixing bug 23106
+
+*nessus-2.0.7 (10 Jul 2003)
+
+  10 Jul 2003; Patrick Kursawe <phosphan@gentoo.org> nessus-2.0.7.ebuild:
+  Version bump
+
+*nessus-2.0.6a (23 May 2003)
+
+  23 May 2003; Patrick Kursawe <phosphan@gentoo.org> nessus-2.0.6a.ebuild:
+  Version bump, should fix bug 21529
+
+*nessus-2.0.5 (13 May 2003)
+
+  13 May 2003; Patrick Kursawe <phosphan@gentoo.org> nessus-2.0.5.ebuild:
+  Version bump, bug #20901.
+
+*nessus-2.0.4 (23 Apr 2003)
+
+  23 Apr 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Found in #18978.
+
+*nessus-2.0.0 (25 Feb 2003)
+
+  25 Feb 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Ebuild submitted by Blu3 <david+gentoo.org@blue-labs.org> in #16310.
+
+*nessus-1.2.7 (04 Jan 2003)
+
+  16 Jan 2003; Nick Hadaway <raker@gentoo.org> nessus-1.2.7.ebuild :
+  Marked stable for x86
+
+  04 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Found by Raskasi <raskasi@gmx.net>.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*nessus-1.2.6 (05 Nov 2002)
+
+  05 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
+
+*nessus-1.2.4 (22 Aug 2002)
+
+  22 Aug 2002; Nick Hadaway <raker@gentoo.org> nessus-1.2.3.ebuild, nessus-1.2.4.ebuild :
+  Version bump.
+  (important notes from upstream ChangeLog)
+  Reverted back to autoconf 2.13. 
+  Bug fix in nessus-core/nessusd/pluginlaunch.c
+   - under some circumstances, data might be lost in the reports 
+  Fixed a bug in several plugins for web checks 
+   -under some circumstances, a plugin would do N x N checks against 
+   the remote web servers (where N equals to the number of web servers 
+   running on the remote host) 
+
+*nessus-1.2.3 (26 Jul 2002)
+
+  26 Jul 2002; Nick Hadaway <raker@gentoo.org>
+  nessus-1.2.3.ebuild, files/digest-nessus-1.2.3.ebuild :
+
+  Split out the package to allow a clean installation of all components.
+  Kept the "nessus" package for easy install of all components.
+
+*nessus-1.2.2-r1 (17 Jul 2002)
+
+  17 Jul 2002; Nicholas Jones <carpaski@gentoo.org> nessus-1.2.2-r1.ebuild:
+
+  SLOT and KEYWORDS additions.
+	Removed duplicated 'make install' calls.
+	Added die comments. (Added notice about possible breaking with nessus-1.0.*)
+
+*nessus-1.2.2 (02 Jul 2002)
+
+  02 Jul 2002; Bruce A. Locke <blocke@shivan.org> nessus-1.2.2.ebuild:
+
+  Version bump.
+
+*nessus-1.2.0 (25 Apr 2002)
+
+  25 Apr 2002; Grant Goodyear <g2boojum@gentoo.org> nessus-1.2.0.ebuild
+
+  New version.
+
+*nessus-1.0.10 (5 Apr 2002)
+
+  5 Apr 2002; Seemant Kulleen <seemant@gentoo.org> nessus-1.0.10.ebuild
+  files/digest-nessus-1.0.10
+
+  Version bump submitted by lotia@umich.edu (ali asad lotia)
+
+*nessus-1.0.9 (1 Feb 2002)
+
+  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  
+  Added initial ChangeLog which should be updated whenever the package is
+  updated in any way. This changelog is targetted to users. This means that the
+  comments should well explained and written in clean English. The details about
+  writing correct changelogs are explained in the skel.ChangeLog file which you
+  can find in the root directory of the portage repository.
diff --git a/net-analyzer/nessus/Manifest b/net-analyzer/nessus/Manifest
new file mode 100644
index 0000000..baf252f
--- /dev/null
+++ b/net-analyzer/nessus/Manifest
@@ -0,0 +1,3 @@
+EBUILD nessus-2.2.11.ebuild 926 RMD160 77a7e7907dfc8504f58995580561e90968fba254 SHA1 dbe6c9b5d8c842fe68038ae8393f3ffa5e66e02a SHA256 8a850f974af16af708035c73ce896d4def189ee1bcac9c9e1c5cf39fd7f93011
+MISC ChangeLog 11762 RMD160 99b77f17c32996e7875dfe60a732c2ee73b6f2bb SHA1 3ca419bf0219cb8bc8fb2b17b38ca63916736204 SHA256 8a07cfbd90664677ab34f0dd126324eeadbfa3b1fb0956f0d96e29e876a127ae
+MISC metadata.xml 230 RMD160 d2b42cc4a1f23bdc47b0d7fbd00f6b5da0887726 SHA1 912ac3ed9c9389f18e0d154a358c3a3cfc33a742 SHA256 ca6db48cc0b51c9d0cde223b5da8fe2678478a7a706381908a32880ac6b85a1e
diff --git a/net-analyzer/nessus/files/digest-nessus-2.2.10 b/net-analyzer/nessus/files/digest-nessus-2.2.10
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/net-analyzer/nessus/files/digest-nessus-2.2.10
diff --git a/net-analyzer/nessus/metadata.xml b/net-analyzer/nessus/metadata.xml
new file mode 100644
index 0000000..5ee01a3
--- /dev/null
+++ b/net-analyzer/nessus/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>netmon</herd>
+<longdescription>A remote security scanner for Linux</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/nessus/nessus-2.2.11.ebuild b/net-analyzer/nessus/nessus-2.2.11.ebuild
new file mode 100644
index 0000000..7bc0cb9
--- /dev/null
+++ b/net-analyzer/nessus/nessus-2.2.11.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus/nessus-2.2.9.ebuild,v 1.4 2007/07/11 23:49:24 mr_bones_ Exp $
+
+DESCRIPTION="A remote security scanner for Linux"
+HOMEPAGE="http://www.nessus.org/"
+DEPEND="~net-analyzer/nessus-libraries-${PV}
+	~net-analyzer/libnasl-${PV}
+	~net-analyzer/nessus-core-${PV}
+	~net-analyzer/nessus-plugins-${PV}"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+pkg_postinst() {
+	elog "The following article may be useful to get started:"
+	elog "http://www.securityfocus.com/infocus/1741"
+}
+
+pkg_postrm() {
+	elog "Note: this is a META ebuild for ${P}."
+	elog "to remove it completely or before re-emerging"
+	elog "either use 'depclean', or remove/re-emerge these packages:"
+	elog
+	for dep in ${RDEPEND}; do
+		elog "     ${dep}"
+	done
+	echo
+}
diff --git a/net-analyzer/netxms/files/netxmsd b/net-analyzer/netxms/files/netxmsd
new file mode 100644
index 0000000..b4e8657
--- /dev/null
+++ b/net-analyzer/netxms/files/netxmsd
@@ -0,0 +1,15 @@
+#!/sbin/runscript
+
+depend() {
+	need net mysql
+}
+start() {
+	ebegin "Starting NetXMS Server"
+	start-stop-daemon --start --quiet --exec /usr/bin/netxmsd -- -d -c /etc/netxms/netxmsd.conf
+		eend
+	}
+	stop() {
+	ebegin "Stopping NetXMS Server"
+	start-stop-daemon --stop --quiet --exec /usr/bin/netxmsd
+	eend
+        }
diff --git a/net-analyzer/netxms/files/netxmsd.conf b/net-analyzer/netxms/files/netxmsd.conf
new file mode 100644
index 0000000..f293fe9
--- /dev/null
+++ b/net-analyzer/netxms/files/netxmsd.conf
@@ -0,0 +1,7 @@
+DBDriver = libnxddr_mysql.so
+DBServer = 
+DBName = 
+DBLogin = 
+DBPassword = 
+LogFailedSQLQueries = yes
+LogFile = {syslog}
diff --git a/net-analyzer/netxms/files/nxagentd b/net-analyzer/netxms/files/nxagentd
new file mode 100644
index 0000000..60c8a6a
--- /dev/null
+++ b/net-analyzer/netxms/files/nxagentd
@@ -0,0 +1,15 @@
+#!/sbin/runscript
+
+depend() {
+	need net
+}
+start() {
+	ebegin "Starting NetXMS Agent"
+	start-stop-daemon --start --quiet --exec /usr/bin/nxagentd -- -d -c /etc/netxms/nxagentd.conf
+		eend
+	}
+	stop() {
+	ebegin "Stopping NetXMS Agent"
+	start-stop-daemon --stop --quiet --exec /usr/bin/nxagentd
+	eend
+        }
diff --git a/net-analyzer/netxms/files/nxagentd.conf b/net-analyzer/netxms/files/nxagentd.conf
new file mode 100644
index 0000000..6b20a6c
--- /dev/null
+++ b/net-analyzer/netxms/files/nxagentd.conf
@@ -0,0 +1,2 @@
+MasterServers = 
+Servers = 
diff --git a/net-analyzer/netxms/netxms-0.2.22.ebuild b/net-analyzer/netxms/netxms-0.2.22.ebuild
new file mode 100644
index 0000000..0d4f9a3
--- /dev/null
+++ b/net-analyzer/netxms/netxms-0.2.22.ebuild
@@ -0,0 +1,93 @@
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="1"
+
+inherit eutils autotools
+
+DESCRIPTION="NetXMS is new and rapidly developing monitoring system"
+HOMEPAGE="http://netxms.org/"
+SRC_URI="http://www.netxms.org/download/${P/_/}.tar.gz"
+RESTRICT="mirror"
+
+IUSE="server client console agent static-agent ipso-agent nxhttpd mdebug sqlite odbc oracle mysql pgsql openssl gd unstable debug"
+SLOT=""
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64"
+
+
+RDEPEND="${DEPEND}
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/autoconf:2.5
+	sys-devel/automake:1.10
+	mysql? ( virtual/mysql )
+	openssl? ( dev-libs/openssl )
+	postgres? ( virtual/postgresql-base )
+	console? ( x11-libs/wxGTK )
+	gd? ( media-libs/gd )
+	sqlite? ( >=dev-db/sqlite-3.4.1 )
+"
+
+S="${WORKDIR}/${P/_/}"
+
+src_unpack(){
+	unpack ${A}
+	cd "${S}"
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+	$(useq server && echo --with-server ) \
+	$(useq client && echo --with-client ) \
+	$(useq agent && echo --with-agent ) \
+	$(useq console && echo --with-console ) \
+	$(useq static-agent && echo --with-static-agent ) \
+	$(useq ipso-agent && echo --with-ipso-agent ) \
+	$(useq nxhttpd && echo --with-nxhttpd ) \
+	$(useq mdebug && echo --with-mdebug ) \
+	$(useq sqlite && echo --with-sqlite ) \
+	$(useq odbc && echo --with-odbc ) \
+	$(useq oracle && echo --with-oracle ) \
+	$(useq mysql && echo --with-mysql ) \
+	$(useq pgsql && echo --with-pgsql ) \
+	$(use_enable openssl encryption) \
+	$(useq gd && echo --with-gd ) \
+	$(useq unstable && echo --enable-unstable ) \
+	$(useq debug && echo --enable-debug ) || die "econf failed"
+	emake CONFDIR="/etc/netxms" || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" CONFDIR="${D}/etc/netxms" install || die "install failed"
+}
+pkg_postinst() {
+	dodir /etc/netxms
+	keepdir /etc/netxms
+	if ( use server )
+	then
+		if ( test -e /etc/netxms/netxmsd.conf )
+		then
+		elog "Keeping your existing config /etc/netxms/netxmsd.conf"
+		else
+		elog "Installing initial server config file to /etc/netxms/netxmsd.conf"
+		cp ${FILESDIR}/netxmsd.conf /etc/netxms/netxmsd.conf
+		fi
+	fi
+	if ( use agent )
+	then
+		if ( test -e /etc/netxms/nxagentd.conf )
+		then
+		elog "Keeping your existing config /etc/netxms/nxagentd.conf"
+		else
+		elog "Installing initial server config file to /etc/netxms/nxagentd.conf"
+		cp ${FILESDIR}/nxagentd.conf /etc/netxms/nxagentd.conf
+		fi
+	fi
+	$(useq server && cp ${FILESDIR}/netxmsd /etc/init.d/netxmsd )
+	$(useq agent && cp ${FILESDIR}/nxagentd /etc/init.d/nxagentd )
+	elog
+	elog "Startup scripts installed to /etc/init.d"
+	elog
+}
+
diff --git a/net-analyzer/netxms/netxms-9999.ebuild b/net-analyzer/netxms/netxms-9999.ebuild
new file mode 100644
index 0000000..86f9a22
--- /dev/null
+++ b/net-analyzer/netxms/netxms-9999.ebuild
@@ -0,0 +1,97 @@
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="1"
+
+inherit eutils autotools subversion
+
+DESCRIPTION="NetXMS is new and rapidly developing monitoring system"
+HOMEPAGE="http://netxms.org/"
+SRC_URI=""
+RESTRICT="mirror"
+
+IUSE="server client console agent static-agent ipso-agent nxhttpd mdebug sqlite odbc oracle mysql pgsql openssl gd unstable debug"
+SLOT=""
+LICENSE="GPL-2"
+KEYWORDS=""
+
+ESVN_REPO_URI="https://svn.netxms.org/public/netxms/trunk"
+ESVN_STORE_DIR="${DISTDIR}/svn-src"
+ESVN_PROJECT="${PN/-svn}"
+ESVN_BOOTSTRAP="./reconf"
+
+RDEPEND="${DEPEND}
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/autoconf:2.5
+	sys-devel/automake:1.10
+	mysql? ( virtual/mysql )
+	openssl? ( dev-libs/openssl )
+	postgres? ( virtual/postgresql-base )
+	console? ( x11-libs/wxGTK )
+	gd? ( media-libs/gd )
+	sqlite? ( >=dev-db/sqlite-3.4.1 )
+"
+
+S="${WORKDIR}/${P/_/}"
+
+src_unpack(){
+	subversion_src_unpack
+	cd "${S}"
+#	eautoreconf
+}
+
+src_compile() {
+	econf \
+	$(useq server && echo --with-server ) \
+	$(useq client && echo --with-client ) \
+	$(useq agent && echo --with-agent ) \
+	$(useq console && echo --with-console ) \
+	$(useq static-agent && echo --with-static-agent ) \
+	$(useq ipso-agent && echo --with-ipso-agent ) \
+	$(useq nxhttpd && echo --with-nxhttpd ) \
+	$(useq mdebug && echo --with-mdebug ) \
+	$(useq sqlite && echo --with-sqlite ) \
+	$(useq odbc && echo --with-odbc ) \
+	$(useq oracle && echo --with-oracle ) \
+	$(useq mysql && echo --with-mysql ) \
+	$(useq pgsql && echo --with-pgsql ) \
+	$(use_enable openssl encryption) \
+	$(useq gd && echo --with-gd ) \
+	$(useq unstable && echo --enable-unstable ) \
+	$(useq debug && echo --enable-debug ) || die "econf failed"
+	emake CONFDIR="/etc/netxms" || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" CONFDIR="${D}/etc/netxms" install || die "install failed"
+}
+pkg_postinst() {
+	dodir /etc/netxms
+	keepdir /etc/netxms
+	if ( use server )
+	then
+		if ( test -e /etc/netxms/netxmsd.conf )
+		then
+		elog "Keeping your existing config /etc/netxms/netxmsd.conf"
+		else
+		elog "Installing initial server config file to /etc/netxms/netxmsd.conf"
+		cp ${FILESDIR}/netxmsd.conf /etc/netxms/netxmsd.conf
+		fi
+	fi
+	if ( use agent )
+	then
+		if ( test -e /etc/netxms/nxagentd.conf )
+		then
+		elog "Keeping your existing config /etc/netxms/nxagentd.conf"
+		else
+		elog "Installing initial server config file to /etc/netxms/nxagentd.conf"
+		cp ${FILESDIR}/nxagentd.conf /etc/netxms/nxagentd.conf
+		fi
+	fi
+	$(useq server && cp ${FILESDIR}/netxmsd /etc/init.d/netxmsd )
+	$(useq agent && cp ${FILESDIR}/nxagentd /etc/init.d/nxagentd )
+	elog
+	elog "Startup scripts installed to /etc/init.d"
+	elog
+}
+
diff --git a/net-analyzer/snort/files b/net-analyzer/snort/files
new file mode 120000
index 0000000..09dbbef
--- /dev/null
+++ b/net-analyzer/snort/files
@@ -0,0 +1 @@
+/var/paludis/repositories/gentoo/net-analyzer/snort/files
\ No newline at end of file
diff --git a/net-analyzer/snort/snort-2.8.3.1.ebuild b/net-analyzer/snort/snort-2.8.3.1.ebuild
new file mode 100644
index 0000000..f95c047
--- /dev/null
+++ b/net-analyzer/snort/snort-2.8.3.1.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+AT_M4DIR=m4
+
+inherit eutils autotools
+
+DESCRIPTION="Libpcap-based packet sniffer/logger/lightweight IDS"
+HOMEPAGE="http://www.snort.org/"
+SRC_URI="http://www.snort.org/dl/snort-2.8.3.1.tar.gz
+	http://www.snort.org/pub-bin/downloads.cgi/Download/comm_rules/Community-Rules-2.4.tar.gz
+	http://www.snort.org/pub-bin/downloads.cgi/Download/vrt_pr/snortrules-pr-2.4.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 -sparc ~x86"
+IUSE="postgres mysql selinux odbc prelude inline dynamicplugin timestats perfprofiling linux-smp-stats flexresp2 sguil gre"
+
+DEPEND="virtual/libc
+	>=dev-libs/libpcre-4.2-r1
+	virtual/libpcap
+	flexresp2? ( dev-libs/libdnet )
+	react? ( ~net-libs/libnet-1.0.2a )
+	postgres? ( || ( dev-db/postgresql dev-db/libpq ) )
+	mysql? ( virtual/mysql )
+	prelude? ( >=dev-libs/libprelude-0.9.0 )
+	odbc? ( dev-db/unixODBC )
+	>=sys-devel/libtool-1.4
+	inline? (
+		~net-libs/libnet-1.0.2a
+		net-firewall/iptables
+		)"
+
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	selinux? ( sec-policy/selinux-snort )"
+
+pkg_setup() {
+	enewgroup snort
+	enewuser snort -1 -1 /dev/null snort
+
+	if use flexresp && use flexresp2 ; then
+		ewarn
+		ewarn "You have both the 'flexresp' and 'flexresp2' USE"
+		ewarn "flags set. You can use 'flexresp' or 'flexresp2'"
+		ewarn "but not both."
+		ewarn
+		ewarn "Defaulting to flexresp2..."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-2.6.1.2-libdir.patch"
+	epatch "${FILESDIR}/${PN}-2.8.2-libnet.patch"
+	sed -i "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort/rules:" \
+		etc/snort.conf
+
+	if use prelude ; then
+		sed -i -e "s:AC_PROG_RANLIB:AC_PROG_LIBTOOL:" configure.in
+	fi
+
+	einfo "Regenerating autoconf/automake files"
+	eautoreconf
+}
+
+src_compile() {
+	local myconf
+
+	if use flexresp2; then
+		myconf="${myconf} --enable-flexresp2"
+	elif use flexresp; then
+		myconf="${myconf} --enable-flexresp"
+	fi
+
+	if use react && ! use flexresp; then
+		myconf="${myconf} --enable-react"
+	fi
+
+	use gre && myconf="${myconf} --enable-gre"
+
+	myconf="${myconf} --with-libipq-includes=/usr/include/libipq"
+
+	econf \
+		--without-oracle \
+		$(use_with postgres postgresql) \
+		$(use_with mysql) \
+		$(use_with odbc) \
+		$(use_enable prelude) \
+		$(use_enable inline) \
+		$(use_enable dynamicplugin) \
+		$(use_enable timestats) \
+		$(use_enable perfprofiling) \
+		$(use_enable linux-smp-stats) \
+		${myconf} || die "econf failed"
+
+	# limit to single as reported by jforman on irc
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	keepdir /var/log/snort/
+
+	dodoc doc/*
+	dodoc ./RELEASE.NOTES
+	docinto schemas ; dodoc schemas/*
+
+	insinto /etc/snort
+	doins etc/reference.config etc/classification.config \
+		etc/*.map etc/threshold.conf
+	use dynamicplugin || sed -i -e 's:^dynamic:# dynamic:g' etc/snort.conf
+	sed -e "s:/usr/local/lib:/usr/$(get_libdir):g" -e 's:/usr/local/:/usr/:g' \
+		etc/snort.conf > "${D}"/etc/snort/snort.conf.distrib
+
+	newinitd "${FILESDIR}/snort.rc8" snort
+	newconfd "${FILESDIR}/snort.confd" snort
+
+	fowners snort:snort /var/log/snort
+	fperms 0770 /var/log/snort
+
+	# install rules
+	insinto /etc/snort/rules
+	doins -r "${WORKDIR}"/rules/*
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "If you find that snort is using too much memory, your system"
+	ewarn "freezes, or snort crashes after a few minutes try adding the"
+	ewarn "following to your snort.conf..."
+	ewarn
+	ewarn "'config detection: search-method ac-sparsebands'"
+	ewarn
+	ewarn "This will provide high pattern matching performance at a much"
+	ewarn "lower cost to memory. For more information on the new features"
+	ewarn "in snort 2.7, please take a look at the release notes located in..."
+	ewarn
+	ewarn "  /usr/share/doc/${PF}/RELEASE.NOTES.bz2"
+	ewarn
+	elog  "To use a database as a backend for snort you will have to"
+	elog  "import the correct tables to the database."
+	elog  "You will have to setup a database called snort before doing the"
+	elog  "following..."
+	elog
+	elog  "  MySQL: bzcat /usr/share/doc/${PF}/schemas/create_mysql.bz2 | mysql -p snort"
+	elog
+	elog  "  PostgreSQL: import /usr/share/doc/${PF}/schemas/create_postgresql.bz2"
+	elog
+	elog  "  ODBC: look at /usr/share/doc/${PF}/schemas/"
+	elog
+	elog  "Users using the unified output plugin and barnyard do not need to"
+	elog  "compile database support into snort, but still need to set up their"
+	elog  "database as shown above."
+	elog
+	ewarn "Only a basic set of rules was installed."
+	ewarn "Please add your other sets of rules to /etc/snort/rules."
+	ewarn "For more information on rules, visit ${HOMEPAGE}."
+	if use sguil ; then
+		elog "SGUIL needs to catch up with recent snort. If you plan on using SGUIL"
+		elog "you should unmerge ${P} and emerge snort-2.4.x"
+	fi
+}
+
diff --git a/net-analyzer/wireshark/files b/net-analyzer/wireshark/files
new file mode 120000
index 0000000..e2f17e4
--- /dev/null
+++ b/net-analyzer/wireshark/files
@@ -0,0 +1 @@
+/var/paludis/repositories/gentoo/net-analyzer/wireshark/files
\ No newline at end of file
diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild
new file mode 100644
index 0000000..bd1cfdb
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-9999.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.1.1.ebuild,v 1.3 2008/10/21 05:51:38 pva Exp $
+
+EAPI=1
+inherit autotools libtool flag-o-matic eutils toolchain-funcs subversion
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="http://www.wireshark.org/"
+
+SRC_URI=""
+
+ESVN_REPO_URI="http://anonsvn.wireshark.org/wireshark/trunk/"
+ESVN_STORE_DIR="${DISTDIR}/svn-src"
+ESVN_PROJECT="${PN/-svn}"
+ESVN_BOOTSTRAP="./autogen.sh"
+
+S="${WORKDIR}/${P/_/}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="adns +gtk ipv6 lua portaudio gnutls ares gcrypt zlib kerberos threads profile smi +pcap pcre +caps selinux"
+
+RDEPEND=">=dev-libs/glib-2.4.0:2
+	zlib? ( sys-libs/zlib )
+	smi? ( net-libs/libsmi )
+	gtk? ( >=x11-libs/gtk+-2.4.0:2
+		x11-libs/pango
+		dev-libs/atk )
+	gnutls? ( net-libs/gnutls )
+	gcrypt? ( dev-libs/libgcrypt )
+	pcap? ( net-libs/libpcap )
+	pcre? ( dev-libs/libpcre )
+	caps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	portaudio? ( media-libs/portaudio )
+	ares? ( >=net-dns/c-ares-1.5 )
+	!ares? ( adns? ( net-libs/adns ) )
+	lua? ( >=dev-lang/lua-5.1 )
+	selinux? ( sec-policy/selinux-wireshark )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.15.0
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex"
+
+pkg_setup() {
+	if ! use gtk; then
+		ewarn "USE=-gtk will means no gui called wireshark will be created and"
+		ewarn "only command line utils are available"
+	fi
+
+	if use ares && use adns; then
+		einfo "You asked for both, ares and adns, but we can use only one of them."
+		einfo "c-ares supersedes adns resolver thus using c-ares (ares USE flag)."
+		myconf="$(use_with ares c-ares) --without-adns"
+	else
+		myconf="$(use_with adns) $(use_with ares c-ares)"
+	fi
+
+	# Add group for users allowed to sniff.
+	enewgroup wireshark
+}
+
+src_unpack() {
+	subversion_src_unpack
+
+	# our hardened toolchain bug...
+	cd "${S}"/epan
+	epatch "${FILESDIR}/wireshark-except-double-free.diff"
+
+	cd "${S}"
+#	epatch "${FILESDIR}/wireshark-1.1.1-misc-warnings.patch"
+	# made dependent on lua as generally dissectors shouldn't depend on wiretap
+	use lua && epatch "${FILESDIR}/wireshark-1.1.1--as-needed.patch"
+#	eautoreconf
+}
+
+src_compile() {
+	# optimization bug, see bug #165340, bug #40660
+	if [[ $(gcc-version) == 3.4 ]] ; then
+		elog "Found gcc 3.4, forcing -O3 into CFLAGS"
+		replace-flags -O? -O3
+	elif [[ $(gcc-version) == 3.3 || $(gcc-version) == 3.2 ]] ; then
+		elog "Found <=gcc-3.3, forcing -O into CFLAGS"
+		replace-flags -O? -O
+	fi
+
+	# see bug #133092; bugs.wireshark.org/bugzilla/show_bug.cgi?id=1001
+	# our hardened toolchain bug
+	filter-flags -fstack-protector
+
+	# profile and -fomit-frame-pointer are incompatible, bug #215806
+	use profile && filter-flags -fomit-frame-pointer
+
+	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
+	if use kerberos; then
+		case `krb5-config --libs` in
+			*-lcrypto*) myconf="${myconf} --with-ssl" ;;
+		esac
+	fi
+
+	# dumpcap requires libcap, setuid-install requires dumpcap
+	econf $(use_enable gtk wireshark) \
+		$(use_enable profile profile-build) \
+		$(use_with gnutls) \
+		$(use_with gcrypt) \
+		$(use_enable ipv6) \
+		$(use_enable threads) \
+		$(use_with lua) \
+		$(use_with kerberos krb5) \
+		$(use_with smi libsmi) \
+		$(use_with pcap) \
+		$(use_with zlib) \
+		$(use_with pcre) \
+		$(use_with portaudio) \
+		$(use_with caps libcap) \
+		$(use_enable pcap setuid-install) \
+		--sysconfdir=/etc/wireshark \
+		${myconf}
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	fowners 0:wireshark /usr/bin/tshark
+	fperms 6550 /usr/bin/tshark
+	use pcap && fowners 0:wireshark /usr/bin/dumpcap
+	use pcap && fperms 6550 /usr/bin/dumpcap
+
+	insinto /usr/include/wiretap
+	doins wiretap/wtap.h
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} doc/randpkt.txt
+
+	if use gtk; then
+		for c in hi lo; do
+			for d in 16 32 48; do
+				insinto /usr/share/icons/${c}color/${d}x${d}/apps
+				newins image/${c}${d}-app-wireshark.png wireshark.png
+			done
+		done
+		insinto /usr/share/applications
+		doins wireshark.desktop
+	fi
+}
+
+pkg_postinst() {
+	echo
+	ewarn "With version 0.99.7, all function calls that require elevated privileges"
+	ewarn "have been moved out of the GUI to dumpcap. WIRESHARK CONTAINS OVER ONE"
+	ewarn "POINT FIVE MILLION LINES OF SOURCE CODE. DO NOT RUN THEM AS ROOT."
+	ewarn
+	ewarn "NOTE: To run wireshark as normal user you have to add yourself into"
+	ewarn "wireshark group. This security measure ensures that only trusted"
+	ewarn "users allowed to sniff your traffic."
+	echo
+}
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
new file mode 100644
index 0000000..a7cf0b5
--- /dev/null
+++ b/net-ftp/proftpd/Manifest
@@ -0,0 +1,9 @@
+DIST mod_clamav-0.7.tar.gz 3676 RMD160 779203276643343bb54dc5e8225cf16392959533 SHA1 2e9376865eb03d482e2aac89a0ce611a5587e084 SHA256 61aa9d6af9432d1409170305526d87f63742aca198dd299d21ce37a60a8f41e7
+DIST proftpd-1.3.1.tar.bz2 2243888 RMD160 ed47f7a7c446b01c3d00d2d25d89573c787da905 SHA1 0b54286492967172c5355e2f489f9665b46591e5 SHA256 03bc023e5b7b1c04d8eb2d5dca53b931b3e02cc7aba7dd8f629b0878535dc91b
+DIST proftpd-1.3.2rc1.tar.bz2 2331814 RMD160 ced3098f3b59e0da09e7f0200fe3a960092120cb SHA1 3270067cf85cb343367cbb3e623114f5ccbe9e10 SHA256 d3ac73d7f575ae797cd57e1879b654071fe58e43c3ff8d5ef2a80d6d21475ecc
+DIST proftpd-mod-case-0.3.tar.gz 4781 RMD160 99f46a2cfb88ec2f3070d632dbc17d89d12ec30b SHA1 c8ea2c4604ab2ffa5853284d0696b1dfe518ae84 SHA256 a9affd47558020b2b3f369c9a945ac91d22b45368734d839404b76e0fbdaaf7c
+DIST proftpd-mod-deflate-0.3.tar.gz 7704 RMD160 dd51a966942642b2a5ae1cd1c3b3b6f47721637c SHA1 9d08a32da1c1e7e8b126e1fdbc172aa6889bccbc SHA256 dd6650e1cb69ee118319c19bbaa9dbe277b92675ab26e9c70a93e1e93f724adb
+DIST proftpd-mod-shaper-0.6.3.tar.gz 19040 RMD160 9978fda37d0099c48d755e53132482506c948c05 SHA1 a5c9a1889c441b9290f2c571ad7fc06bebaf9326 SHA256 a6947836461872adca53dab2708b1e140fa6ce7a8b93ccbe2dafbc3ca63fde67
+DIST proftpd-mod-vroot-0.7.2.tar.gz 6071 RMD160 b152162b3714910d5b9378611313041c3e7e17d4 SHA1 3fc4c5874deba4bbe989b0bd54a7478a47f3d876 SHA256 cab5a42390eac4e0b8bdcbe1e6d15804c8029d51da9ad3bd428b46a80cd69d5a
+EBUILD proftpd-1.3.1.ebuild 7112 RMD160 3ad6e31a850b60779096bbd22f8556a80a2f115a SHA1 eee22424cc8c8fd1697ae79567749d7f634b8d53 SHA256 6b0a2e848425f7d4c0f83004892ac780041bcf6eb3ccaf0e00ead5ab72d4f5c3
+EBUILD proftpd-1.3.2_rc1.ebuild 7147 RMD160 5b12d53b8eb060a9c6a549eb380aa7c0b51d19e6 SHA1 2c9edd9d2264443bef5eb591013b6afb793a4e81 SHA256 9549d4906b6d118d7345c8dffa3e45225177e7e577d6004582f97bf48c61e4e4
diff --git a/net-ftp/proftpd/files/proftpd-1.3.2_rc1-bug218850.patch b/net-ftp/proftpd/files/proftpd-1.3.2_rc1-bug218850.patch
new file mode 100644
index 0000000..e6b39ca
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.2_rc1-bug218850.patch
@@ -0,0 +1,12 @@
+--- lib/libcap/libcap.h~	2008-04-23 10:45:33.000000000 +0400
++++ lib/libcap/libcap.h	2008-04-23 10:45:41.000000000 +0400
+@@ -52,7 +52,7 @@
+  */
+   
+    #if !defined(_LINUX_CAPABILITY_VERSION) || \
+    -            (_LINUX_CAPABILITY_VERSION != 0x19980330)
+    +            (_LINUX_CAPABILITY_VERSION <= 0x19980330)
+     
+      # error "Kernel <linux/capability.h> does not match library"
+       # error "file "libcap.h" --> fix and recompile libcap"
+       
\ No newline at end of file
diff --git a/net-ftp/proftpd/proftpd-1.3.1.ebuild b/net-ftp/proftpd/proftpd-1.3.1.ebuild
new file mode 100644
index 0000000..984270b
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.1.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils flag-o-matic toolchain-funcs autotools
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="acl authfile ban case clamav deflate hardened ifsession ipv6 ldap mysql ncurses nls noauthunix opensslcrypt pam postgres radius rewrite selinux shaper sitemisc softquota ssl tcpd vroot xinetd"
+
+CASE_VER="0.3"
+CLAMAV_VER="0.7"
+DEFLATE_VER="0.3"
+SHAPER_VER="0.6.3"
+VROOT_VER="0.7.2"
+
+DESCRIPTION="An advanced and very configurable FTP server."
+
+SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.bz2
+		case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${CASE_VER}.tar.gz )
+		clamav? ( http://www.thrallingpenguin.com/resources/mod_clamav-${CLAMAV_VER}.tar.gz )
+		deflate? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-deflate-${DEFLATE_VER}.tar.gz )
+		shaper? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-${SHAPER_VER}.tar.gz )
+		vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${VROOT_VER}.tar.gz )"
+
+HOMEPAGE="http://www.proftpd.org/
+		http://www.castaglia.org/proftpd/
+		http://www.thrallingpenguin.com/resources/mod_clamav.htm"
+
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="acl? ( sys-apps/acl sys-apps/attr )
+		clamav? ( app-antivirus/clamav )
+		ldap? ( >=net-nds/openldap-1.2.11 )
+		mysql? ( virtual/mysql )
+		ncurses? ( sys-libs/ncurses )
+		opensslcrypt? ( >=dev-libs/openssl-0.9.6f )
+		pam? ( virtual/pam )
+		postgres? ( virtual/postgresql-base )
+		ssl? ( >=dev-libs/openssl-0.9.6f )
+		tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 )
+		xinetd? ( virtual/inetd )"
+
+RDEPEND="${DEPEND}
+		net-ftp/ftpbase
+		selinux? ( sec-policy/selinux-ftpd )"
+
+S="${WORKDIR}/${P/_/}"
+
+pkg_setup() {
+	# Add the proftpd user to make the default config
+	# work out-of-the-box
+	enewgroup proftpd
+	enewuser proftpd -1 -1 -1 proftpd
+}
+
+src_unpack() {
+	unpack ${P/_/}.tar.bz2
+
+	cd "${S}"
+
+	# Fix stripping of files
+	sed -e "s| @INSTALL_STRIP@||g" -i Make*
+
+	if use case ; then
+		unpack ${PN}-mod-case-${CASE_VER}.tar.gz
+		cp -f mod_case/mod_case.c contrib/
+		cp -f mod_case/mod_case.html doc/
+	fi
+
+	if use clamav ; then
+		unpack mod_clamav-${CLAMAV_VER}.tar.gz
+		cp -f mod_clamav-${CLAMAV_VER}/mod_clamav.* contrib/
+		epatch mod_clamav-${CLAMAV_VER}/${PN}.patch
+	fi
+
+	if use deflate ; then
+		unpack ${PN}-mod-deflate-${DEFLATE_VER}.tar.gz
+		cp -f mod_deflate/mod_deflate.c contrib/
+		cp -f mod_deflate/mod_deflate.html doc/
+	fi
+
+	if use shaper ; then
+		unpack ${PN}-mod-shaper-${SHAPER_VER}.tar.gz
+		cp -f mod_shaper/mod_shaper.c contrib/
+		cp -f mod_shaper/mod_shaper.html doc/
+	fi
+
+	if use vroot ; then
+		unpack ${PN}-mod-vroot-${VROOT_VER}.tar.gz
+		cp -f mod_vroot/mod_vroot.c contrib/
+		cp -f mod_vroot/mod_vroot.html doc/
+	fi
+
+	# Fix bug #218850
+	epatch "${FILESDIR}/${P}-bug218850.patch"
+
+	# Fix bug #208840
+	epatch "${FILESDIR}/${P}-bug208840.patch"
+
+	# Fix bug #221275
+	# extract custom PR_ macros from aclocal.m4 to acinclude.m4
+	# and delete the provided aclocal.m4 before running autoreconf
+	elog "Extract custom m4 macros from aclocal.m4..."
+	cat aclocal.m4 | head -n188 > acinclude.m4
+	rm -f aclocal.m4
+
+	eautoreconf
+}
+
+src_compile() {
+	addpredict /etc/krb5.conf
+	local modules myconf
+
+	modules="mod_ratio:mod_readme"
+	use acl && modules="${modules}:mod_facl"
+	use ban && modules="${modules}:mod_ban"
+	use case && modules="${modules}:mod_case"
+	use clamav && modules="${modules}:mod_clamav"
+	use deflate && modules="${modules}:mod_deflate"
+	use pam && modules="${modules}:mod_auth_pam"
+	use radius && modules="${modules}:mod_radius"
+	use rewrite && modules="${modules}:mod_rewrite"
+	use shaper && modules="${modules}:mod_shaper"
+	use sitemisc && modules="${modules}:mod_site_misc"
+	use ssl && modules="${modules}:mod_tls"
+	use tcpd && modules="${modules}:mod_wrap"
+	use vroot && modules="${modules}:mod_vroot"
+
+	# pam needs to be explicitely disabled
+	use pam || myconf="${myconf} --enable-auth-pam=no"
+
+	if use ldap ; then
+		modules="${modules}:mod_ldap"
+		append-ldflags "-lresolv"
+		if use ssl ; then
+			CFLAGS="${CFLAGS} -DUSE_LDAP_TLS"
+		fi
+	fi
+
+	if use opensslcrypt ; then
+		myconf="${myconf} --enable-openssl --with-includes=/usr/include/openssl"
+		append-ldflags "-lcrypto"
+		CFLAGS="${CFLAGS} -DHAVE_OPENSSL"
+	fi
+
+	if use nls ; then
+		myconf="${myconf} --enable-nls"
+	fi
+
+	if use mysql && use postgres ; then
+		ewarn "ProFTPD only supports either the MySQL or PostgreSQL modules."
+		ewarn "Presently this ebuild defaults to mysql. If you would like to"
+		ewarn "change the default behaviour, merge ProFTPD with:"
+		ewarn "USE='-mysql postgres' emerge proftpd"
+		epause 5
+	fi
+
+	if use mysql ; then
+		modules="${modules}:mod_sql:mod_sql_mysql"
+		myconf="${myconf} --with-includes=/usr/include/mysql"
+	elif use postgres ; then
+		modules="${modules}:mod_sql:mod_sql_postgres"
+		myconf="${myconf} --with-includes=/usr/include/postgresql"
+	fi
+
+	if use softquota ; then
+		modules="${modules}:mod_quotatab"
+		if use mysql || use postgres ; then
+			modules="${modules}:mod_quotatab_sql"
+		fi
+		if use radius ; then
+			modules="${modules}:mod_quotatab_radius"
+		fi
+		if use ldap ; then
+			modules="${modules}:mod_quotatab_file:mod_quotatab_ldap"
+		else
+			modules="${modules}:mod_quotatab_file"
+		fi
+	fi
+
+	# mod_ifsession should be the last module in the --with-modules list
+	# see http://www.castaglia.org/proftpd/modules/mod_ifsession.html#Installation
+	use ifsession && modules="${modules}:mod_ifsession"
+
+	# bug #30359
+	use hardened && echo > lib/libcap/cap_sys.c
+	gcc-specs-pie && echo > lib/libcap/cap_sys.c
+
+	if use noauthunix ; then
+		myconf="${myconf} --disable-auth-unix"
+	else
+		myconf="${myconf} --enable-auth-unix"
+	fi
+
+	econf \
+		--sbindir=/usr/sbin \
+		--localstatedir=/var/run \
+		--sysconfdir=/etc/proftpd \
+		--enable-shadow \
+		--enable-autoshadow \
+		--enable-ctrls \
+		--with-modules=${modules} \
+		$(use_enable acl facl) \
+		$(use_enable authfile auth-file) \
+		$(use_enable ipv6) \
+		$(use_enable ncurses) \
+		${myconf} || die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	keepdir /var/run/proftpd
+
+	dodoc "${FILESDIR}/proftpd.conf" \
+		COPYING CREDITS ChangeLog NEWS README* \
+		doc/license.txt
+	dohtml doc/*.html
+	dohtml doc/howto/*.html
+
+	docinto rfc
+	dodoc doc/rfc/*.txt
+
+	mv -f "${D}/etc/proftpd/proftpd.conf" "${D}/etc/proftpd/proftpd.conf.distrib"
+
+	insinto /etc/proftpd
+	newins "${FILESDIR}/proftpd.conf" proftpd.conf.sample
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/proftpd.xinetd" proftpd
+	fi
+
+	newinitd "${FILESDIR}/proftpd.rc6" proftpd
+}
+
+pkg_postinst() {
+	elog
+	elog "You can find the config files in /etc/proftpd"
+	elog
+	ewarn "With the introduction of net-ftp/ftpbase the ftp user is now ftp."
+	ewarn "Remember to change that in the configuration file."
+	ewarn
+	if use clamav ; then
+		ewarn "mod_clamav was updated to a new version, which uses Clamd"
+		ewarn "only for virus scanning, so you'll have to set Clamd up"
+		ewarn "and start it, also re-check the mod_clamav docs."
+		ewarn
+	fi
+}
diff --git a/net-ftp/proftpd/proftpd-1.3.2_rc1.ebuild b/net-ftp/proftpd/proftpd-1.3.2_rc1.ebuild
new file mode 100644
index 0000000..fae756a
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.2_rc1.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.1.ebuild,v 1.3 2008/04/24 18:04:56 chtekk Exp $
+
+inherit eutils flag-o-matic toolchain-funcs autotools
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="acl authfile ban case clamav deflate hardened ifsession ipv6 ldap mysql ncurses nls noauthunix opensslcrypt pam postgres radius rewrite selinux shaper sitemisc softquota ssl tcpd vroot xinetd"
+
+CASE_VER="0.3"
+CLAMAV_VER="0.7"
+DEFLATE_VER="0.3"
+SHAPER_VER="0.6.3"
+VROOT_VER="0.7.2"
+
+DESCRIPTION="An advanced and very configurable FTP server."
+
+SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.bz2
+case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${CASE_VER}.tar.gz )
+clamav? ( http://www.thrallingpenguin.com/resources/mod_clamav-${CLAMAV_VER}.tar.gz )
+deflate? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-deflate-${DEFLATE_VER}.tar.gz )
+shaper? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-${SHAPER_VER}.tar.gz )
+vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${VROOT_VER}.tar.gz )"
+
+HOMEPAGE="http://www.proftpd.org/
+http://www.castaglia.org/proftpd/
+http://www.thrallingpenguin.com/resources/mod_clamav.htm"
+
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="acl? ( sys-apps/acl sys-apps/attr )
+clamav? ( app-antivirus/clamav )
+ldap? ( >=net-nds/openldap-1.2.11 )
+mysql? ( virtual/mysql )
+ncurses? ( sys-libs/ncurses )
+opensslcrypt? ( >=dev-libs/openssl-0.9.6f )
+pam? ( virtual/pam )
+postgres? ( virtual/postgresql-base )
+ssl? ( >=dev-libs/openssl-0.9.6f )
+tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 )
+xinetd? ( virtual/inetd )"
+
+RDEPEND="${DEPEND}
+net-ftp/ftpbase
+selinux? ( sec-policy/selinux-ftpd )"
+
+S="${WORKDIR}/${P/_/}"
+
+pkg_setup() {
+# Add the proftpd user to make the default config
+# work out-of-the-box
+enewgroup proftpd
+enewuser proftpd -1 -1 -1 proftpd
+}
+
+src_unpack() {
+unpack ${P/_/}.tar.bz2
+
+cd "${S}"
+
+# Fix stripping of files
+sed -e "s| @INSTALL_STRIP@||g" -i Make*
+
+if use case ; then
+unpack ${PN}-mod-case-${CASE_VER}.tar.gz
+cp -f mod_case/mod_case.c contrib/
+cp -f mod_case/mod_case.html doc/
+fi
+
+if use clamav ; then
+unpack mod_clamav-${CLAMAV_VER}.tar.gz
+cp -f mod_clamav-${CLAMAV_VER}/mod_clamav.* contrib/
+epatch mod_clamav-${CLAMAV_VER}/${PN}.patch
+fi
+
+if use deflate ; then
+unpack ${PN}-mod-deflate-${DEFLATE_VER}.tar.gz
+cp -f mod_deflate/mod_deflate.c contrib/
+cp -f mod_deflate/mod_deflate.html doc/
+fi
+
+if use shaper ; then
+unpack ${PN}-mod-shaper-${SHAPER_VER}.tar.gz
+cp -f mod_shaper/mod_shaper.c contrib/
+cp -f mod_shaper/mod_shaper.html doc/
+fi
+
+if use vroot ; then
+unpack ${PN}-mod-vroot-${VROOT_VER}.tar.gz
+cp -f mod_vroot/mod_vroot.c contrib/
+cp -f mod_vroot/mod_vroot.html doc/
+fi
+
+# Fix bug #218850
+#epatch "${FILESDIR}/${P}-bug218850.patch"
+
+# Fix bug #221275
+# extract custom PR_ macros from aclocal.m4 to acinclude.m4
+# and delete the provided aclocal.m4 before running autoreconf
+elog "Extract custom m4 macros from aclocal.m4..."
+cat aclocal.m4 | head -n188 > acinclude.m4
+rm -f aclocal.m4
+
+eautoreconf
+}
+
+src_compile() {
+addpredict /etc/krb5.conf
+local modules myconf
+
+modules="mod_ratio:mod_readme"
+use acl && modules="${modules}:mod_facl"
+use ban && modules="${modules}:mod_ban"
+use case && modules="${modules}:mod_case"
+use clamav && modules="${modules}:mod_clamav"
+use deflate && modules="${modules}:mod_deflate"
+use pam && modules="${modules}:mod_auth_pam"
+use radius && modules="${modules}:mod_radius"
+use rewrite && modules="${modules}:mod_rewrite"
+use shaper && modules="${modules}:mod_shaper"
+use sitemisc && modules="${modules}:mod_site_misc"
+use ssl && modules="${modules}:mod_tls"
+use tcpd && modules="${modules}:mod_wrap"
+use vroot && modules="${modules}:mod_vroot"
+
+# pam needs to be explicitely disabled
+use pam || myconf="${myconf} --enable-auth-pam=no"
+
+if use ldap ; then
+modules="${modules}:mod_ldap"
+append-ldflags "-lresolv"
+if use ssl ; then
+CFLAGS="${CFLAGS} -DUSE_LDAP_TLS"
+fi
+fi
+
+if use opensslcrypt ; then
+myconf="${myconf} --enable-openssl --with-includes=/usr/include/openssl"
+append-ldflags "-lcrypto"
+CFLAGS="${CFLAGS} -DHAVE_OPENSSL"
+fi
+
+if use nls ; then
+myconf="${myconf} --enable-nls"
+fi
+
+if use mysql && use postgres ; then
+ewarn "ProFTPD only supports either the MySQL or PostgreSQL modules."
+ewarn "Presently this ebuild defaults to mysql. If you would like to"
+ewarn "change the default behaviour, merge ProFTPD with:"
+ewarn "USE='-mysql postgres' emerge proftpd"
+epause 5
+fi
+
+if use mysql ; then
+modules="${modules}:mod_sql:mod_sql_mysql"
+myconf="${myconf} --with-includes=/usr/include/mysql"
+elif use postgres ; then
+modules="${modules}:mod_sql:mod_sql_postgres"
+myconf="${myconf} --with-includes=/usr/include/postgresql"
+fi
+
+if use softquota ; then
+modules="${modules}:mod_quotatab"
+if use mysql || use postgres ; then
+modules="${modules}:mod_quotatab_sql"
+fi
+if use radius ; then
+modules="${modules}:mod_quotatab_radius"
+fi
+if use ldap ; then
+modules="${modules}:mod_quotatab_file:mod_quotatab_ldap"
+else
+modules="${modules}:mod_quotatab_file"
+fi
+fi
+
+# mod_ifsession should be the last module in the --with-modules list
+# see http://www.castaglia.org/proftpd/modules/mod_ifsession.html#Installation
+use ifsession && modules="${modules}:mod_ifsession"
+
+# bug #30359
+use hardened && echo > lib/libcap/cap_sys.c
+gcc-specs-pie && echo > lib/libcap/cap_sys.c
+
+if use noauthunix ; then
+myconf="${myconf} --disable-auth-unix"
+else
+myconf="${myconf} --enable-auth-unix"
+fi
+
+econf \
+--sbindir=/usr/sbin \
+--localstatedir=/var/run \
+--sysconfdir=/etc/proftpd \
+--enable-shadow \
+--enable-autoshadow \
+--enable-ctrls \
+--with-modules=${modules} \
+$(use_enable acl facl) \
+$(use_enable authfile auth-file) \
+$(use_enable ipv6) \
+$(use_enable ncurses) \
+${myconf} || die "econf failed"
+
+emake || die "emake failed"
+}
+
+src_install() {
+emake DESTDIR="${D}" install || die "emake install failed"
+
+keepdir /var/run/proftpd
+
+dodoc "${FILESDIR}/proftpd.conf" \
+COPYING CREDITS ChangeLog NEWS README* \
+doc/license.txt
+dohtml doc/*.html
+dohtml doc/howto/*.html
+
+docinto rfc
+dodoc doc/rfc/*.txt
+
+mv -f "${D}/etc/proftpd/proftpd.conf" "${D}/etc/proftpd/proftpd.conf.distrib"
+
+insinto /etc/proftpd
+newins "${FILESDIR}/proftpd.conf" proftpd.conf.sample
+
+if use xinetd ; then
+insinto /etc/xinetd.d
+newins "${FILESDIR}/proftpd.xinetd" proftpd
+fi
+
+newinitd "${FILESDIR}/proftpd.rc6" proftpd
+}
+
+pkg_postinst() {
+elog
+elog "You can find the config files in /etc/proftpd"
+elog
+ewarn "With the introduction of net-ftp/ftpbase the ftp user is now ftp."
+ewarn "Remember to change that in the configuration file."
+ewarn
+if use clamav ; then
+ewarn "mod_clamav was updated to a new version, which uses Clamd"
+ewarn "only for virus scanning, so you'll have to set Clamd up"
+ewarn "and start it, also re-check the mod_clamav docs."
+ewarn
+fi
+}
diff --git a/net-im/centerim/centerim-9999.ebuild b/net-im/centerim/centerim-9999.ebuild
new file mode 100644
index 0000000..3633acd
--- /dev/null
+++ b/net-im/centerim/centerim-9999.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.6.ebuild,v 1.1 2008/11/07 23:20:28 swegener Exp $
+
+inherit eutils git
+
+PROTOCOL_IUSE="aim gadu icq irc jabber lj msn rss yahoo"
+IUSE="${PROTOCOL_IUSE} bidi nls ssl crypt jpeg otr"
+
+DESCRIPTION="CenterIM is a fork of CenterICQ - a ncurses ICQ/Yahoo!/AIM/IRC/MSN/Jabber/GaduGadu/RSS/LiveJournal Client"
+SRC_URI=""
+HOMEPAGE="http://www.centerim.org/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+
+EGIT_REPO_URI="git://repo.or.cz/centerim.git"
+EGIT_BOOTSTRAP="./autogen.sh"
+
+DEPEND=">=sys-libs/ncurses-5.2
+	bidi? ( dev-libs/fribidi )
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	jpeg? ( media-libs/jpeg )
+	jabber? (
+		otr? ( net-libs/libotr )
+		crypt? ( >=app-crypt/gpgme-1.0.2 )
+	)
+	msn? (
+		net-misc/curl
+		dev-libs/openssl
+	)"
+
+RDEPEND="${DEPEND}
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}"/${P/_p*}
+
+check_protocol_iuse() {
+	local flag
+
+	for flag in ${PROTOCOL_IUSE}
+	do
+		use ${flag} && return 0
+	done
+
+	return 1
+}
+
+pkg_setup() {
+	if ! check_protocol_iuse
+	then
+		eerror
+		eerror "Please activate at least one of the following protocol USE flags:"
+		eerror "${PROTOCOL_IUSE}"
+		eerror
+		die "Please activate at least one protocol USE flag!"
+	fi
+
+	if use msn && ! built_with_use net-misc/curl ssl
+	then
+		eerror
+		eerror "As of right now, the msn use flags requires curl to be built"
+		eerror "with SSL support. Make sure ssl is in your USE flags and"
+		eerror "re-emerge net-misc/curl."
+		eerror
+		die "net-misc/curl dependencie issue"
+	fi
+
+	if use otr && ! use jabber
+	then
+		eerror
+		eerror "Support for OTR is only supported with Jabber!"
+		eerror
+		die "Support for OTR is only supported with Jabber!"
+	fi
+
+	if use gadu && ! use jpeg
+	then
+		ewarn
+		ewarn "You need jpeg support to be able to register Gadu-Gadu accounts!"
+		ewarn
+	fi
+}
+
+src_unpack() {
+	git_src_unpack
+	cd "${S}"
+
+	# Don't execute git commands, bug #228151
+#	cat >"${S}"/misc/git-version-gen <<-EOF
+		#!/bin/sh
+#		echo -n "${PVR}"
+#	EOF
+}
+
+src_compile() {
+	econf \
+		$(use_with ssl) \
+		$(use_enable aim) \
+		$(use_with bidi fribidi) \
+		$(use_with jpeg libjpeg) \
+		$(use_with otr libotr) \
+		$(use_enable gadu gg) \
+		$(use_enable icq) \
+		$(use_enable irc) \
+		$(use_enable jabber) \
+		$(use_enable lj) \
+		$(use_enable msn) \
+		$(use_enable nls locales-fix) \
+		$(use_enable nls) \
+		$(use_enable rss) \
+		$(use_enable yahoo) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS ChangeLog FAQ README THANKS TODO
+}
diff --git a/net-im/centerim/files b/net-im/centerim/files
new file mode 120000
index 0000000..57fd4f6
--- /dev/null
+++ b/net-im/centerim/files
@@ -0,0 +1 @@
+/var/paludis/repositories/gentoo/net-im/centerim/files
\ No newline at end of file
diff --git a/net-im/ekiga/ekiga-3.0.1.ebuild b/net-im/ekiga/ekiga-3.0.1.ebuild
new file mode 100644
index 0000000..2f062bf
--- /dev/null
+++ b/net-im/ekiga/ekiga-3.0.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="1"
+
+inherit eutils gnome2
+
+DESCRIPTION="H.323 and SIP VoIP softphone"
+HOMEPAGE="http://www.ekiga.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="avahi dbus debug doc eds gconf gnome ldap libnotify xv"
+
+RDEPEND=">=dev-libs/ptlib-2.4.2
+	>=net-libs/opal-3.4.2
+	>=x11-libs/gtk+-2.12.0:2
+	>=dev-libs/glib-2.8.0:2
+	dev-libs/libsigc++:2
+	dev-libs/libxml2:2
+	avahi? ( >=net-dns/avahi-0.6.0 )
+	dbus? ( >=dev-libs/dbus-glib-0.36 )
+	eds? ( >=gnome-extra/evolution-data-server-1.2 )
+	gconf? ( >=gnome-base/gconf-2.6.0:2 )
+	gnome? ( >=gnome-base/libgnome-2.14.0
+		>=gnome-base/libgnomeui-2.14.0 )
+	ldap? ( net-nds/openldap )
+	libnotify? ( x11-libs/libnotify )
+	xv? ( x11-libs/libXv )"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	>=dev-util/pkgconfig-0.12.0
+	>=dev-util/intltool-0.35
+	doc? ( app-text/scrollkeeper
+		app-text/gnome-doc-utils )"
+
+DOCS="AUTHORS ChangeLog FAQ NEWS README"
+
+pkg_setup() {
+	# ekiga has to be built like opal and ptlib but as opal has to be built
+	# like ptlib, it should be possible to check only opal but as ekiga is
+	# linking to both, we are cheking both
+	if use debug && (! built_with_use dev-libs/ptlib debug ||
+		! built_with_use net-libs/opal debug); then
+		eerror "You need to build dev-libs/ptlib and net-libs/opal with\
+ USE=debug enabled."
+		die "dev-libs/ptlib and net-libs/opal have to be built with USE=debug"
+	fi
+
+	if ! use debug && (built_with_use dev-libs/ptlib debug ||
+		built_with_use net-libs/opal debug); then
+		eerror "You need to build dev-libs/ptlib and net-libs/opal without\
+ USE=debug."
+		die "dev-libs/ptlib and net-libs/opal has not to be built with USE=debug"
+	fi
+
+	# dbus-service is always enable if dbus is enable, no reason to disable it
+	G2CONF="${G2CONF}
+		$(use_enable avahi)
+		$(use_enable dbus)
+		$(use_enable dbus dbus_service)
+		$(use_enable debug)
+		$(use_enable doc gdu)
+		$(use_enable eds)
+		$(use_enable gconf)
+		$(use_enable gnome)
+		$(use_enable ldap)
+		$(use_enable libnotify notify)
+		$(use_enable xv)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# remove call to gconftool-2 --shutdown
+	sed -i -e '/gconftool-2 --shutdown/d' Makefile.in \
+		|| die "Patching Makefile.in failed"
+
+	# fix ekiga-helper dbus service .in file
+	sed -i -e 's/@PACKAGE_NAME@/ekiga/'\
+		src/components/org.ekiga.Helper.service.in \
+		|| die "Patching src/components/org.ekiga.Helper.service.in failed"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! use gnome; then
+		ewarn "USE=-gnome is experimental, some weirdness with the UI and"
+		ewarn "config keys should appear."
+	fi
+}
diff --git a/net-im/ekiga/ekiga-9999.ebuild b/net-im/ekiga/ekiga-9999.ebuild
new file mode 100644
index 0000000..42c5d33
--- /dev/null
+++ b/net-im/ekiga/ekiga-9999.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="1"
+
+inherit eutils subversion autotools gnome2
+
+DESCRIPTION="H.323 and SIP VoIP softphone"
+HOMEPAGE="http://www.ekiga.org/"
+SRC_URI=""
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS=""
+IUSE="avahi dbus debug doc eds gconf gnome ldap libnotify xv"
+
+ESVN_REPO_URI="http://svn.gnome.org/svn/ekiga/trunk/"
+ESVN_STORE_DIR="${DISTDIR}/svn-src"
+ESVN_PROJECT="${PN/-svn}"
+ESVN_BOOTSTRAP="./autogen.sh $(use_enable avahi) $(use_enable dbus) $(use_enable dbus dbus_service) $(use_enable debug) $(use_enable doc gdu) $(use_enable eds) $(use_enable gconf) $(use_enable gnome) $(use_enable ldap) $(use_enable libnotify notify) $(use_enable xv)"
+
+
+S="${WORKDIR}/${P/_/}"
+
+RDEPEND=">=dev-libs/ptlib-2.4.2
+	>=net-libs/opal-3.4.2
+	>=x11-libs/gtk+-2.12.0:2
+	>=dev-libs/glib-2.8.0:2
+	dev-libs/libsigc++:2
+	dev-libs/libxml2:2
+	gnome-base/gconf
+	gnome-base/gnome-common
+	app-text/gnome-doc-utils
+	avahi? ( >=net-dns/avahi-0.6.0 )
+	dbus? ( >=dev-libs/dbus-glib-0.36 )
+	eds? ( >=gnome-extra/evolution-data-server-1.2 )
+	gconf? ( >=gnome-base/gconf-2.6.0:2 )
+	gnome? ( >=gnome-base/libgnome-2.14.0
+		>=gnome-base/libgnomeui-2.14.0 )
+	ldap? ( net-nds/openldap )
+	libnotify? ( x11-libs/libnotify )
+	xv? ( x11-libs/libXv )"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	>=dev-util/pkgconfig-0.12.0
+	>=dev-util/intltool-0.35
+	doc? ( app-text/scrollkeeper
+		app-text/gnome-doc-utils )"
+
+DOCS="AUTHORS ChangeLog FAQ NEWS README"
+
+pkg_setup() {
+	# ekiga has to be built like opal and ptlib but as opal has to be built
+	# like ptlib, it should be possible to check only opal but as ekiga is
+	# linking to both, we are cheking both
+	if use debug && (! built_with_use dev-libs/ptlib debug ||
+		! built_with_use net-libs/opal debug); then
+		eerror "You need to build dev-libs/ptlib and net-libs/opal with\
+ USE=debug enabled."
+		die "dev-libs/ptlib and net-libs/opal have to be built with USE=debug"
+	fi
+
+	if ! use debug && (built_with_use dev-libs/ptlib debug ||
+		built_with_use net-libs/opal debug); then
+		eerror "You need to build dev-libs/ptlib and net-libs/opal without\
+ USE=debug."
+		die "dev-libs/ptlib and net-libs/opal has not to be built with USE=debug"
+	fi
+
+	# dbus-service is always enable if dbus is enable, no reason to disable it
+	G2CONF="${G2CONF}
+		$(use_enable avahi)
+		$(use_enable dbus)
+		$(use_enable dbus dbus_service)
+		$(use_enable debug)
+		$(use_enable doc gdu)
+		$(use_enable eds)
+		$(use_enable gconf)
+		$(use_enable gnome)
+		$(use_enable ldap)
+		$(use_enable libnotify notify)
+		$(use_enable xv)
+		"
+}
+
+src_unpack() {
+
+	subversion_src_unpack
+	cd "${S}"
+#	eautoreconf
+
+	# remove call to gconftool-2 --shutdown
+#	sed -i -e '/gconftool-2 --shutdown/d' Makefile.in \
+#		|| die "Patching Makefile.in failed"
+
+	# fix ekiga-helper dbus service .in file
+#	sed -i -e 's/@PACKAGE_NAME@/ekiga/'\
+#		src/components/org.ekiga.Helper.service.in \
+#		|| die "Patching src/components/org.ekiga.Helper.service.in failed"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! use gnome; then
+		ewarn "USE=-gnome is experimental, some weirdness with the UI and"
+		ewarn "config keys should appear."
+	fi
+}
diff --git a/net-im/gajim/gajim-9999.ebuild b/net-im/gajim/gajim-9999.ebuild
new file mode 100644
index 0000000..a350984
--- /dev/null
+++ b/net-im/gajim/gajim-9999.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.11.4.ebuild,v 1.6 2008/01/24 20:23:28 angelos Exp $
+
+inherit multilib python eutils subversion autotools
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="http://www.gajim.org/"
+SRC_URI=""
+
+ESVN_REPO_URI="svn://svn.gajim.org/gajim/trunk"
+ESVN_STORE_DIR="${DISTDIR}/svn-src"
+ESVN_PROJECT="${PN/-svn}"
+ESVN_BOOTSTRAP="./autogen.sh"
+
+S="${WORKDIR}/${P/_/}"
+
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="avahi dbus gnome idle libnotify nls spell srv trayicon X xhtml"
+
+DEPEND="|| (
+		( <dev-lang/python-2.5 dev-python/pysqlite )
+		>=dev-lang/python-2.5
+	)
+	dev-python/pygtk
+	sys-devel/gettext
+	dev-util/intltool
+	dev-util/pkgconfig"
+
+RDEPEND="gnome? ( dev-python/gnome-python-extras
+		dev-python/gnome-python-desktop
+	)
+	dbus? ( dev-python/dbus-python dev-libs/dbus-glib )
+	libnotify? ( x11-libs/libnotify )
+	xhtml? ( dev-python/docutils )
+	srv? ( net-dns/bind-tools )
+	idle? ( x11-libs/libXScrnSaver )
+	spell? ( app-text/gtkspell )
+	avahi? ( net-dns/avahi )
+	dev-python/pyopenssl"
+
+pkg_setup() {
+	if ! use dbus; then
+		if use libnotify; then
+			eerror "The dbus USE flag is required for libnotify support"
+			die "USE=\"dbus\" needed for libnotify support"
+		fi
+		if use avahi; then
+			eerror "The dbus USE flag is required for avahi support"
+			die "USE=\"dbus\" needed for avahi support"
+		fi
+	else
+		if has_version "<sys-apps/dbus-0.90" && ! built_with_use sys-apps/dbus python; then
+				eerror "Please rebuild dbus with USE=\"python\""
+				die "USE=\"python\" needed for dbus"
+		fi
+	fi
+
+	if use avahi; then
+		if ! built_with_use net-dns/avahi dbus gtk python; then
+			eerror "The following USE flags are required for correct avahi"
+			eerror "support: dbus gtk python"
+			die "Please rebuild avahi with these use flags enabled."
+		fi
+	fi
+
+	if has_version ">=dev-lang/python-2.5" && ! built_with_use dev-lang/python sqlite; then
+		eerror "Please rebuild python with USE=\"sqlite\""
+		die "USE=\"sqlite\" needed for python"
+	fi
+}
+
+src_unpack() {
+	subversion_src_unpack
+	#eautoreconf
+	cd "${S}"
+	#epatch "${FILESDIR}/${P}-test_fix.patch"
+}
+
+src_compile() {
+	local myconf
+
+	if ! use gnome; then
+		myconf="${myconf} $(use_enable trayicon)"
+		myconf="${myconf} $(use_enable idle)"
+	fi
+
+	econf $(use_enable nls) \
+		$(use_enable spell gtkspell) \
+		$(use_enable dbus remote) \
+		$(use_with X x) \
+		--docdir="/usr/share/doc/${PF}" \
+		--prefix="/usr" \
+		--libdir="/usr/$(get_libdir)" \
+		${myconf} || die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	rm "${D}/usr/share/doc/${PF}/README.html"
+	dohtml README.html
+}
+
+pkg_postinst() {
+	python_mod_optimize /usr/share/gajim/
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/share/gajim/
+}
diff --git a/net-libs/opal/files/opal-3.4.1-eapi2.patch b/net-libs/opal/files/opal-3.4.1-eapi2.patch
new file mode 100644
index 0000000..a9c0346
--- /dev/null
+++ b/net-libs/opal/files/opal-3.4.1-eapi2.patch
@@ -0,0 +1,59 @@
+--- opal-3.4.1.ebuild	2008-10-09 19:47:27.000000000 -0400
++++ opal-3.4.1-eapi2.ebuild	2008-10-09 20:06:51.000000000 -0400
+@@ -4,6 +4,8 @@
+ 
+ inherit eutils
+ 
++EAPI="2"
++
+ DESCRIPTION="C++ class library normalising numerous telephony protocols"
+ HOMEPAGE="http://www.ekiga.org"
+ SRC_URI="http://www.ekiga.org/admin/downloads/latest/sources/sources/${P}.tar.gz"
+@@ -13,33 +15,16 @@
+ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+ IUSE="debug doc java"
+ 
+-RDEPEND="~dev-libs/ptlib-2.4.1
++RDEPEND="~dev-libs/ptlib-2.4.1[debug=]
+ 	>=media-video/ffmpeg-0.4.7
+ 	media-libs/speex
+ 	java? ( virtual/jdk )"
+ 
+-pkg_setup() {
+-	if use debug && ! built_with_use dev-libs/ptlib debug; then
+-		eerror "You need to build dev-libs/ptlib with USE=debug enabled."
+-		die "dev-libs/ptlib has to be built with USE=debug"
+-	fi
+-
+-	if ! use debug && built_with_use dev-libs/ptlib debug; then
+-		eerror "You need to build dev-libs/ptlib without USE=debug."
+-		die "dev-libs/ptlib has not to be built with USE=debug"
+-	fi
+-}
+-
+-src_unpack() {
+-	unpack ${A}
+-	cd "${S}"
+-
++src_prepare() {
+ 	epatch "${FILESDIR}"/${P}-lpcini.patch
+ }
+ 
+-src_compile() {
+-	local makeopts
+-
++src_configure() {
+ 	# zrtp doesn't depend on net-libs/libzrtpcpp but on libzrtp from
+ 	# http://zfoneproject.com/ that is not in portage
+ 	econf \
+@@ -49,6 +34,10 @@
+ 		--disable-localspeex \
+ 		--disable-zrtp \
+ 		|| die "econf failed"
++}
++
++src_compile() {
++	local makeopts
+ 
+ 	if use debug; then
+ 		makeopts="debug"
diff --git a/net-libs/opal/files/opal-lpcini.patch b/net-libs/opal/files/opal-lpcini.patch
new file mode 100644
index 0000000..a59ef79
--- /dev/null
+++ b/net-libs/opal/files/opal-lpcini.patch
@@ -0,0 +1,11 @@
+--- plugins/audio/LPC_10/src/lpcini.c.orig	2008-09-24 23:01:05.000000000 -0400
++++ plugins/audio/LPC_10/src/lpcini.c	2008-09-25 00:39:34.000000000 -0400
+@@ -50,6 +50,8 @@
+   #ifdef _MSC_VER
+     #include <malloc.h>
+   #endif
++#else
++	extern void * malloc();
+ #endif
+ 
+ /* Common Block Declarations */
diff --git a/net-libs/opal/opal-3.4.1.ebuild b/net-libs/opal/opal-3.4.1.ebuild
new file mode 100644
index 0000000..64a3a70
--- /dev/null
+++ b/net-libs/opal/opal-3.4.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+
+DESCRIPTION="C++ class library normalising numerous telephony protocols"
+HOMEPAGE="http://www.ekiga.org"
+SRC_URI="http://www.ekiga.org/admin/downloads/latest/sources/sources/${P}.tar.gz"
+
+LICENSE="MPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug doc java"
+
+RDEPEND="~dev-libs/ptlib-2.4.1
+	>=media-video/ffmpeg-0.4.7
+	media-libs/speex
+	java? ( virtual/jdk )"
+
+pkg_setup() {
+	if use debug && ! built_with_use dev-libs/ptlib debug; then
+		eerror "You need to build dev-libs/ptlib with USE=debug enabled."
+		die "dev-libs/ptlib has to be built with USE=debug"
+	fi
+
+	if ! use debug && built_with_use dev-libs/ptlib debug; then
+		eerror "You need to build dev-libs/ptlib without USE=debug."
+		die "dev-libs/ptlib has not to be built with USE=debug"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-lpcini.patch
+}
+
+src_compile() {
+	local makeopts
+
+	# zrtp doesn't depend on net-libs/libzrtpcpp but on libzrtp from
+	# http://zfoneproject.com/ that is not in portage
+	econf \
+		$(use_enable debug) \
+		$(use_enable java) \
+		--enable-plugins \
+		--disable-localspeex \
+		--disable-zrtp \
+		|| die "econf failed"
+
+	if use debug; then
+		makeopts="debug"
+	else
+		makeopts="opt"
+	fi
+
+	emake ${makeopts} || die "emake failed"
+}
+
+src_install() {
+	emake PREFIX=/usr DESTDIR="${D}" install || die "emake install failed"
+
+	if use doc; then
+		dohtml -r html/* docs/* || die "documentation installation failed"
+	fi
+}
diff --git a/net-libs/opal/opal-3.4.2.ebuild b/net-libs/opal/opal-3.4.2.ebuild
new file mode 100644
index 0000000..7231f62
--- /dev/null
+++ b/net-libs/opal/opal-3.4.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="C++ class library normalising numerous telephony protocols"
+HOMEPAGE="http://www.opalvoip.org/"
+SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2"
+
+LICENSE="MPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug doc java"
+
+RDEPEND=">=dev-libs/ptlib-2.0.0
+	>=media-video/ffmpeg-0.4.7
+	media-libs/speex
+	java? ( virtual/jdk )"
+
+pkg_setup() {
+	if use debug && ! built_with_use dev-libs/ptlib debug; then
+		eerror "You need to build dev-libs/ptlib with USE=debug enabled."
+		die "dev-libs/ptlib has to be built with USE=debug"
+	fi
+
+	if ! use debug && built_with_use dev-libs/ptlib debug; then
+		eerror "You need to build dev-libs/ptlib without USE=debug."
+		die "dev-libs/ptlib has not to be built with USE=debug"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-lpcini.patch
+}
+
+src_compile() {
+	local makeopts
+
+	filter-ldflags -Wl,--as-needed --as-needed
+
+	# zrtp doesn't depend on net-libs/libzrtpcpp but on libzrtp from
+	# http://zfoneproject.com/ that is not in portage
+	econf \
+		$(use_enable debug) \
+		$(use_enable java) \
+		--enable-plugins \
+		--disable-localspeex \
+		--disable-zrtp \
+		|| die "econf failed"
+
+	if use debug; then
+		makeopts="debug"
+	else
+		makeopts="opt"
+	fi
+
+	emake ${makeopts} || die "emake failed"
+}
+
+src_install() {
+	emake PREFIX=/usr DESTDIR="${D}" install || die "emake install failed"
+
+	if use doc; then
+		dohtml -r html/* docs/* || die "documentation installation failed"
+	fi
+}
diff --git a/net-libs/opal/opal-3.6.0.ebuild b/net-libs/opal/opal-3.6.0.ebuild
new file mode 100644
index 0000000..c11179e
--- /dev/null
+++ b/net-libs/opal/opal-3.6.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="C++ class library normalising numerous telephony protocols"
+HOMEPAGE="http://www.opalvoip.org/"
+SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2"
+
+LICENSE="MPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug doc java"
+
+RDEPEND=">=dev-libs/ptlib-2.0.0
+	>=media-video/ffmpeg-0.4.7
+	media-libs/speex
+	java? ( virtual/jdk )"
+
+pkg_setup() {
+	if use debug && ! built_with_use dev-libs/ptlib debug; then
+		eerror "You need to build dev-libs/ptlib with USE=debug enabled."
+		die "dev-libs/ptlib has to be built with USE=debug"
+	fi
+
+	if ! use debug && built_with_use dev-libs/ptlib debug; then
+		eerror "You need to build dev-libs/ptlib without USE=debug."
+		die "dev-libs/ptlib has not to be built with USE=debug"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+#	epatch "${FILESDIR}"/${PN}-lpcini.patch
+}
+
+src_compile() {
+	local makeopts
+
+	filter-ldflags -Wl,--as-needed --as-needed
+
+	# zrtp doesn't depend on net-libs/libzrtpcpp but on libzrtp from
+	# http://zfoneproject.com/ that is not in portage
+	econf \
+		$(use_enable debug) \
+		$(use_enable java) \
+		--enable-plugins \
+		--disable-localspeex \
+		--disable-zrtp \
+		|| die "econf failed"
+
+	if use debug; then
+		makeopts="debug"
+	else
+		makeopts="opt"
+	fi
+
+	emake ${makeopts} || die "emake failed"
+}
+
+src_install() {
+	emake PREFIX=/usr DESTDIR="${D}" install || die "emake install failed"
+
+	if use doc; then
+		dohtml -r html/* docs/* || die "documentation installation failed"
+	fi
+}
diff --git a/net-libs/opal/opal-9999.ebuild b/net-libs/opal/opal-9999.ebuild
new file mode 100644
index 0000000..fa26350
--- /dev/null
+++ b/net-libs/opal/opal-9999.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils flag-o-matic subversion autotools
+
+DESCRIPTION="C++ class library normalising numerous telephony protocols"
+HOMEPAGE="http://www.opalvoip.org/"
+SRC_URI=""
+
+ESVN_REPO_URI="https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/opal/trunk/"
+ESVN_STORE_DIR="${DISTDIR}/svn-src"
+ESVN_PROJECT="${PN/-svn}"
+
+S="${WORKDIR}/${P/_/}"
+
+
+LICENSE="MPL-1.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug doc java versioncheck +plugins h323 h224 +h281 +g711plc"
+
+RDEPEND=">=dev-libs/ptlib-2.0.0
+	>=media-video/ffmpeg-0.4.7
+	media-libs/speex
+	java? ( virtual/jdk )"
+
+pkg_setup() {
+	if use debug && ! built_with_use dev-libs/ptlib debug; then
+		eerror "You need to build dev-libs/ptlib with USE=debug enabled."
+		die "dev-libs/ptlib has to be built with USE=debug"
+	fi
+
+	if ! use debug && built_with_use dev-libs/ptlib debug; then
+		eerror "You need to build dev-libs/ptlib without USE=debug."
+		die "dev-libs/ptlib has not to be built with USE=debug"
+	fi
+}
+
+src_unpack() {
+	subversion_src_unpack
+	cd "${S}"
+#	eautoreconf
+}
+
+src_compile() {
+	local makeopts
+
+#	filter-ldflags -Wl,--as-needed --as-needed
+
+	# zrtp doesn't depend on net-libs/libzrtpcpp but on libzrtp from
+	# http://zfoneproject.com/ that is not in portage
+	econf \
+		$(use_enable debug) \
+		$(use_enable java) \
+		$(use_enable h323) \
+		$(use_enable h224) \
+		$(use_enable h281) \
+		$(use_enable g711plc) \
+		$(use_enable plugins) \
+		$(use_enable versioncheck) \
+		|| die "econf failed"
+
+	if use debug; then
+		makeopts="debug"
+	else
+		makeopts="opt"
+	fi
+
+	emake ${makeopts} || die "emake failed"
+}
+
+src_install() {
+	emake PREFIX=/usr DESTDIR="${D}" install || die "emake install failed"
+
+#	if use doc; then
+#		dohtml -r html/* docs/* || die "documentation installation failed"
+#	fi
+}
diff --git a/net-misc/dhcdbd/dhcdbd-3.0.ebuild b/net-misc/dhcdbd/dhcdbd-3.0.ebuild
new file mode 100644
index 0000000..1f54eef
--- /dev/null
+++ b/net-misc/dhcdbd/dhcdbd-3.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcdbd/dhcdbd-3.0.ebuild,v 1.5 2008/02/29 03:12:57 ranger Exp $
+
+inherit eutils
+
+DESCRIPTION="DHCP D-BUS daemon (dhcdbd) controls dhclient sessions with D-BUS, stores and presents DHCP options."
+HOMEPAGE="http://people.redhat.com/dcantrel/dhcdbd"
+HOMEPAGE="http://dcantrel.fedorapeople.org/dhcdbd"
+SRC_URI="http://dcantrel.fedorapeople.org/dhcdbd/${P}.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 x86"
+IUSE="debug"
+
+DEPEND="sys-apps/dbus
+	>=net-misc/dhcp-3.0.3-r7"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-2.5-fixes.patch
+	# Create a pidfile immediately after daemonizing so we're more robust
+	# with baselayout-2.
+	epatch ${FILESDIR}/${PN}-3.0-daemon.patch
+	# We don't and won't have dbus snapshots in the tree
+	epatch ${FILESDIR}/${PN}-3.0-dbus.patch
+	
+	epatch ${FILESDIR}/${PN}-3.0-fix_open_missing_mode.diff
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc README include/dhcp_options.h
+	newinitd ${FILESDIR}/dhcdbd.init dhcdbd
+	newconfd ${FILESDIR}/dhcdbd.confd dhcdbd
+}
+
+pkg_postinst() {
+	einfo "dhcdbd is used by NetworkManager in order to use it"
+	einfo "you can add it to runlevels by writing on your terminal"
+	einfo "rc-update add dhcdbd default"
+}
diff --git a/net-misc/dhcdbd/files/dhcdbd-2.5-fixes.patch b/net-misc/dhcdbd/files/dhcdbd-2.5-fixes.patch
new file mode 100644
index 0000000..aa0e56c
--- /dev/null
+++ b/net-misc/dhcdbd/files/dhcdbd-2.5-fixes.patch
@@ -0,0 +1,56 @@
+diff -ruN dhcdbd-2.5.orig/include/dhcdbd.h dhcdbd-2.5/include/dhcdbd.h
+--- dhcdbd-2.5.orig/include/dhcdbd.h	2007-02-15 12:39:30.000000000 -0600
++++ dhcdbd-2.5/include/dhcdbd.h	2007-02-15 15:07:23.000000000 -0600
+@@ -64,12 +64,12 @@
+ #endif
+ 
+ #ifndef DHCDBD_DHCLIENT_CONF_PFX
+-#define DHCDBD_DHCLIENT_CONF_PFX "/etc/dhclient"
++#define DHCDBD_DHCLIENT_CONF_PFX "/etc/dhcp/dhclient"
+ #endif
+ 
+-#ifndef DHCDBD_DHCLIENT_CONF_SEP
++/*#ifndef DHCDBD_DHCLIENT_CONF_SEP*/
+ #define DHCDBD_DHCLIENT_CONF_SEP "-"
+-#endif
++/*#endif*/
+ 
+ #ifndef DHCDBD_DHCLIENT_CONF_SFX
+ #define DHCDBD_DHCLIENT_CONF_SFX ".conf"
+diff -ruN dhcdbd-2.5.orig/src/dbus_service.c dhcdbd-2.5/src/dbus_service.c
+--- dhcdbd-2.5.orig/src/dbus_service.c	2007-02-15 12:39:30.000000000 -0600
++++ dhcdbd-2.5/src/dbus_service.c	2007-02-15 12:44:43.000000000 -0600
+@@ -1216,7 +1216,7 @@
+     return (cs);
+ 
+ give_up:
+-    dbus_connection_close(connection);
++    dbus_connection_unref(connection);
+     dbus_shutdown();
+ 
+     return (0L);
+@@ -1250,7 +1250,7 @@
+     tdestroy(cs->roots, free_root);
+     cs->roots = 0L;
+ 
+-    dbus_connection_close(cs->connection);
++    dbus_connection_unref(cs->connection);
+     dbus_shutdown();
+     free(cs);
+ }
+diff -ruN dhcdbd-2.5.orig/src/dhcdbd.c dhcdbd-2.5/src/dhcdbd.c
+--- dhcdbd-2.5.orig/src/dhcdbd.c	2007-02-15 12:39:30.000000000 -0600
++++ dhcdbd-2.5/src/dhcdbd.c	2007-02-15 15:06:11.000000000 -0600
+@@ -833,9 +833,8 @@
+                 ) {
+                 dhcdbd_debug ("Running dhclient for IF_UP %s", d_if->name);
+ 
+-                snprintf (dhc_if_conf_file, 1024, "%s%s%s%s",
+-                                  DHCDBD_DHCLIENT_CONF_PFX, DHCDBD_DHCLIENT_CONF_SEP,
+-                                  d_if->name, DHCDBD_DHCLIENT_CONF_SFX);
++                snprintf (dhc_if_conf_file, 1024, "%s%s",
++                                  DHCDBD_DHCLIENT_CONF_PFX, DHCDBD_DHCLIENT_CONF_SFX);
+ 
+                 if (access (dhc_if_conf_file, R_OK) == 0)
+                         n_args += 2;
+Files dhcdbd-2.5.orig/src/.dhcdbd.c.swp and dhcdbd-2.5/src/.dhcdbd.c.swp differ
diff --git a/net-misc/dhcdbd/files/dhcdbd-2.8-daemon.patch b/net-misc/dhcdbd/files/dhcdbd-2.8-daemon.patch
new file mode 100644
index 0000000..342ce0d
--- /dev/null
+++ b/net-misc/dhcdbd/files/dhcdbd-2.8-daemon.patch
@@ -0,0 +1,46 @@
+diff -ur a b
+--- a/src/dhcdbd.c	2007-07-08 17:31:50.000000000 +0100
++++ b/src/dhcdbd.c	2007-07-08 17:38:39.000000000 +0100
+@@ -2778,9 +2778,6 @@
+         char path[1024];
+         int fd, l;
+ 
+-        if (dhcdbd_daemonize && (daemon (0, 0) == -1))
+-                return errno;
+-
+         openlog ("dhcdbd", LOG_NDELAY | LOG_CONS, LOG_USER);
+ 
+         dbus = dbus_svc_init (bus, dhcdbd_destination, dhcdbd_log, 0L);
+@@ -2821,6 +2818,17 @@
+                 (dbus, dhcdbd_object_path, path, dhcdbd_if_subscribe, dhco))
+                 return (1);
+ 
++        /* Daemonize and write the pidfile write away, to avoid races */
++        if (dhcdbd_daemonize && (daemon (0, 0) == -1))
++                return errno;
++		unlink (DHCDBD_PID_FILE);
++        if ((fd = open (DHCDBD_PID_FILE, O_WRONLY | O_CREAT)) == -1)
++                exit (errno);
++        l = sprintf (path, "%u", getpid ());
++        l = write (fd, path, l);
++        fsync (fd);
++        close (fd);
++
+         memset (&sa, '\0', sizeof (struct sigaction));
+         sa.sa_sigaction = dhc_reaper;
+         sa.sa_flags = SA_SIGINFO;       /* NO RESTART, NO DEFER, CLDSTOP */
+@@ -2828,13 +2836,7 @@
+                 dhcdbd_log ("sigaction failed: %s\n", strerror (errno));
+                 return (1);
+         }
+-        unlink (DHCDBD_PID_FILE);
+-        if ((fd = open (DHCDBD_PID_FILE, O_WRONLY | O_CREAT)) == -1)
+-                exit (errno);
+-        l = sprintf (path, "%u", getpid ());
+-        l = write (fd, path, l);
+-        fsync (fd);
+-        close (fd);
++
+         dhcdbd_log ("Started up.");
+         dbus_svc_main_loop (dbus, dhcdbd_work);
+         dhcdbd_debug ("Main Loop Exited.");
diff --git a/net-misc/dhcdbd/files/dhcdbd-3.0-daemon.patch b/net-misc/dhcdbd/files/dhcdbd-3.0-daemon.patch
new file mode 100644
index 0000000..23534d3
--- /dev/null
+++ b/net-misc/dhcdbd/files/dhcdbd-3.0-daemon.patch
@@ -0,0 +1,46 @@
+diff -ruN dhcdbd-3.0.orig/src/dhcdbd.c dhcdbd-3.0/src/dhcdbd.c
+--- dhcdbd-3.0.orig/src/dhcdbd.c	2007-09-04 10:31:45.000000000 -0500
++++ dhcdbd-3.0/src/dhcdbd.c	2007-09-04 10:35:52.000000000 -0500
+@@ -2769,9 +2769,6 @@
+         char path[1024];
+         int fd, l;
+ 
+-        if (dhcdbd_daemonize && (daemon (0, 0) == -1))
+-                return errno;
+-
+         openlog ("dhcdbd", LOG_NDELAY | LOG_CONS, LOG_USER);
+ 
+         dbus = dbus_svc_init (bus, dhcdbd_destination, dhcdbd_log, 0L);
+@@ -2812,6 +2809,17 @@
+                 (dbus, dhcdbd_object_path, path, dhcdbd_if_subscribe, dhco))
+                 return (1);
+ 
++        /* Daemonize and write the pidfile write away, to avoid races */
++        if (dhcdbd_daemonize && (daemon (0, 0) == -1))
++                return errno;
++               unlink (DHCDBD_PID_FILE);
++        if ((fd = open (DHCDBD_PID_FILE, O_WRONLY | O_CREAT)) == -1)
++                exit (errno);
++        l = sprintf (path, "%u", getpid ());
++        l = write (fd, path, l);
++        fsync (fd);
++        close (fd);
++
+         memset (&sa, '\0', sizeof (struct sigaction));
+         sa.sa_sigaction = dhc_reaper;
+         sa.sa_flags = SA_SIGINFO;       /* NO RESTART, NO DEFER, CLDSTOP */
+@@ -2819,13 +2827,7 @@
+                 dhcdbd_log ("sigaction failed: %s\n", strerror (errno));
+                 return (1);
+         }
+-        unlink (DHCDBD_PID_FILE);
+-        if ((fd = open (DHCDBD_PID_FILE, O_WRONLY | O_CREAT, 0644)) == -1)
+-                exit (errno);
+-        l = sprintf (path, "%u", getpid ());
+-        l = write (fd, path, l);
+-        fsync (fd);
+-        close (fd);
++
+         dhcdbd_log ("Started up.");
+         dbus_svc_main_loop (dbus, dhcdbd_work);
+         dhcdbd_debug ("Main Loop Exited.");
diff --git a/net-misc/dhcdbd/files/dhcdbd-3.0-dbus.patch b/net-misc/dhcdbd/files/dhcdbd-3.0-dbus.patch
new file mode 100644
index 0000000..3c96d45
--- /dev/null
+++ b/net-misc/dhcdbd/files/dhcdbd-3.0-dbus.patch
@@ -0,0 +1,82 @@
+diff -ruN dhcdbd-3.0.orig/src/dbus_service.c dhcdbd-3.0/src/dbus_service.c
+--- dhcdbd-3.0.orig/src/dbus_service.c	2007-09-04 11:08:45.000000000 -0500
++++ dhcdbd-3.0/src/dbus_service.c	2007-09-04 12:00:38.000000000 -0500
+@@ -1024,7 +1024,11 @@
+ 
+ static void set_watch_fds(DBusWatch * watch, DBusConnectionState * cs) {
+     uint8_t flags = dbus_watch_get_flags(watch);
++#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 && DBUS_VERSION_MICRO >= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR > 1) || (DBUS_VERSION_MAJOR > 1)
+     int fd = dbus_watch_get_unix_fd(watch);
++#else
++    int fd = dbus_watch_get_fd(watch);
++#endif
+ 
+     if (cs->n <= fd)
+         cs->n = fd + 1;
+@@ -1057,7 +1061,11 @@
+     dbus_watch_set_data(watch, cs, no_free);
+ 
+     if (cs->dh != 0L)
++#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 && DBUS_VERSION_MICRO >= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR > 1) || (DBUS_VERSION_MAJOR > 1)
+         (*(cs->dh)) ("add_watch: %d", dbus_watch_get_unix_fd (watch));
++#else
++        (*(cs->dh)) ("add_watch: %d", dbus_watch_get_fd(watch));
++#endif
+ 
+     if (tsearch((const void *) watch, &(cs->watches), ptr_key_comparator) == 0L) {
+         if (cs->eh != 0L)
+@@ -1074,14 +1082,22 @@
+ static void remove_watch(DBusWatch * watch, void *csp)
+ {
+     DBusConnectionState *cs = csp;
++#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 && DBUS_VERSION_MICRO >= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR > 1) || (DBUS_VERSION_MAJOR > 1)
+     int fd = dbus_watch_get_unix_fd(watch);
++#else
++    int fd = dbus_watch_get_fd(watch);
++#endif
+ 
+     if (tdelete((const void *) watch, &(cs->watches), ptr_key_comparator) == 0L)
+         if (cs->eh != 0L)
+             (*(cs->eh)) ("remove_watch: can't happen?!?: watch not found");
+ 
+     if (cs->dh != 0L)
++#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 && DBUS_VERSION_MICRO >= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR > 1) || (DBUS_VERSION_MAJOR > 1)
+         (*(cs->dh)) ("remove_watch: %d", dbus_watch_get_unix_fd(watch));
++#else
++        (*(cs->dh)) ("remove_watch: %d", dbus_watch_get_fd(watch));
++#endif
+ 
+     FD_CLR(fd, &(cs->r_fds));
+     FD_CLR(fd, &(cs->w_fds));
+@@ -1092,7 +1108,11 @@
+     DBusConnectionState *cs = csp;
+ 
+     if (cs->dh != 0L)
++#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 && DBUS_VERSION_MICRO >= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR > 1) || (DBUS_VERSION_MAJOR > 1)
+         (*(cs->dh)) ("toggle_watch: %d", dbus_watch_get_unix_fd(watch));
++#else
++        (*(cs->dh)) ("toggle_watch: %d", dbus_watch_get_fd(watch));
++#endif
+ 
+     set_watch_fds(watch, cs);
+ }
+@@ -1114,11 +1134,19 @@
+         if (!dbus_watch_get_enabled(w))
+             return;
+ 
++#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 && DBUS_VERSION_MICRO >= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR > 1) || (DBUS_VERSION_MAJOR > 1)
+         fd = dbus_watch_get_unix_fd(w);
++#else
++        fd = dbus_watch_get_fd(w);
++#endif
+         flags = dbus_watch_get_flags(w);
+ 
+         if (cs->dh != 0L)
++#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 && DBUS_VERSION_MICRO >= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR > 1) || (DBUS_VERSION_MAJOR > 1)
+             (*(cs->dh)) ("handle_watch: %d", dbus_watch_get_unix_fd(w));
++#else
++            (*(cs->dh)) ("handle_watch: %d", dbus_watch_get_fd(w));
++#endif
+ 
+         if ((flags & DBUS_WATCH_READABLE) && (FD_ISSET(fd, &(cs->s_r_fds))))
+             dbus_watch_handle(w, DBUS_WATCH_READABLE);
diff --git a/net-misc/dhcdbd/files/dhcdbd-3.0-fix_open_missing_mode.diff b/net-misc/dhcdbd/files/dhcdbd-3.0-fix_open_missing_mode.diff
new file mode 100644
index 0000000..9a4abf2
--- /dev/null
+++ b/net-misc/dhcdbd/files/dhcdbd-3.0-fix_open_missing_mode.diff
@@ -0,0 +1,12 @@
+diff -urN dhcdbd-3.0.orig/temp/environment dhcdbd-3.0/temp/environment
+--- dhcdbd-3.0.orig/work/dhcdbd-3.0/src/dhcdbd.c	2009-02-09 13:54:24.533255364 +0000
++++ dhcdbd-3.0/work/dhcdbd-3.0/src/dhcdbd.c	2009-02-09 14:01:02.868255071 +0000
+@@ -2813,7 +2813,7 @@
+         if (dhcdbd_daemonize && (daemon (0, 0) == -1))
+                 return errno;
+                unlink (DHCDBD_PID_FILE);
+-        if ((fd = open (DHCDBD_PID_FILE, O_WRONLY | O_CREAT)) == -1)
++        if ((fd = open (DHCDBD_PID_FILE, O_WRONLY || O_CREAT)) == -1)
+                 exit (errno);
+         l = sprintf (path, "%u", getpid ());
+         l = write (fd, path, l);
diff --git a/net-misc/dhcdbd/files/dhcdbd.confd b/net-misc/dhcdbd/files/dhcdbd.confd
new file mode 100644
index 0000000..ae833ec
--- /dev/null
+++ b/net-misc/dhcdbd/files/dhcdbd.confd
@@ -0,0 +1,4 @@
+# Configuration file for dhcdbd
+#
+# Arguments to pass to the dhcdbd daemon.
+DHCDBD_ARGS="--system"
diff --git a/net-misc/dhcdbd/files/dhcdbd.init b/net-misc/dhcdbd/files/dhcdbd.init
new file mode 100644
index 0000000..9bf0cfe
--- /dev/null
+++ b/net-misc/dhcdbd/files/dhcdbd.init
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+   need net dbus
+}
+
+start() {
+   ebegin "Starting ${SVCNAME}"
+   start-stop-daemon --start --exec /sbin/dhcdbd \
+   	--pidfile /var/run/dhcdbd.pid \
+      	-- ${DHCDBD_ARGS}
+   eend $?
+}
+
+stop() {
+   ebegin "Stopping ${SVCNAME}"
+   start-stop-daemon --stop --exec /sbin/dhcdbd \
+   	--pidfile /var/run/dhcdbd.pid
+   eend $?
+}
diff --git a/net-misc/tor/files b/net-misc/tor/files
new file mode 120000
index 0000000..455484a
--- /dev/null
+++ b/net-misc/tor/files
@@ -0,0 +1 @@
+/var/paludis/repositories/gentoo/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
new file mode 100644
index 0000000..7d7f55c
--- /dev/null
+++ b/net-misc/tor/tor-9999.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.0.31.ebuild,v 1.6 2008/11/14 12:43:56 fmccor Exp $
+
+inherit eutils subversion
+
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://tor.eff.org"
+MY_PV=${PV/_/-}
+SRC_URI=""
+S="${WORKDIR}/${P/_/}"
+
+ESVN_REPO_URI="https://svn.torproject.org/svn/tor/trunk/"
+ESVN_STORE_DIR="${DISTDIR}/svn-src"
+ESVN_PROJECT="${PN/-svn}"
+ESVN_BOOTSTRAP="./autogen.sh"
+
+
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ppc ppc64 ~sparc x86 ~x86-fbsd"
+IUSE="debug logrotate"
+
+DEPEND="dev-libs/openssl
+	>=dev-libs/libevent-1.2"
+RDEPEND="${DEPEND}
+	net-proxy/tsocks"
+
+pkg_setup() {
+	enewgroup tor
+	enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_unpack() {
+#	unpack ${A}
+	subversion_src_unpack
+	cd "${S}"
+	epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch
+	epatch "${FILESDIR}"/${PN}-0.2.0.30-logrotate.patch
+}
+
+src_compile() {
+	econf $(use_enable debug)
+	emake || die
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/tor.initd-r4 tor
+	emake DESTDIR="${D}" install || die
+	keepdir /var/{lib,log,run}/tor
+
+	dodoc README ChangeLog AUTHORS ReleaseNotes \
+		doc/{HACKING,TODO} \
+		doc/spec/*.txt
+
+	fperms 750 /var/lib/tor /var/log/tor
+	fperms 755 /var/run/tor
+	fowners tor:tor /var/lib/tor /var/log/tor /var/run/tor
+
+	if use logrotate; then
+		sed -e "s:/lib::" \
+			-e "s:/rc.d::" \
+			-e "s:\\*:\\*.:" \
+			-e "s:sharedscripts:create 0640 tor tor\n\tsharedscripts:" -i contrib/tor.logrotate || die
+		insinto /etc/logrotate.d
+		newins contrib/tor.logrotate tor
+	fi
+}
+
+pkg_postinst() {
+	elog "You must create /etc/tor/torrc, you can use the sample that is in that directory"
+	elog "To have privoxy and tor working together you must add:"
+	elog "forward-socks4a / localhost:9050 ."
+	elog "(notice the . at the end of the line)"
+	elog "to /etc/privoxy/config"
+}
diff --git a/net-misc/vidalia/vidalia-0.9999.ebuild b/net-misc/vidalia/vidalia-0.9999.ebuild
new file mode 100644
index 0000000..34dd3bf
--- /dev/null
+++ b/net-misc/vidalia/vidalia-0.9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vidalia/vidalia-0.1.7.ebuild,v 1.1 2008/08/11 23:11:29 yngwin Exp $
+
+EAPI="1"
+inherit eutils qt4 cmake-utils subversion
+# cmake-utils needs to be last, so we get its src_compile()
+
+DESCRIPTION="Qt 4 front-end for Tor"
+HOMEPAGE="http://www.vidalia-project.net/"
+SRC_URI=""
+
+ESVN_REPO_URI="https://svn.vidalia-project.net/svn/vidalia/trunk/"
+ESVN_STORE_DIR="${DISTDIR}/svn-src"
+ESVN_PROJECT="${PN/-svn}"
+
+
+LICENSE="|| ( GPL-3 GPL-2 ) openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="debug"
+
+DEPEND="|| ( x11-libs/qt-gui:4 =x11-libs/qt-4* )
+	dev-util/cmake"
+RDEPEND="|| ( x11-libs/qt-gui:4 =x11-libs/qt-4* )
+	net-misc/tor"
+	
+src_unpack(){
+	subversion_src_unpack
+}
+
+use debug && QT4_BUILT_WITH_USE_CHECK="debug"
+
+DOCS="CHANGELOG CREDITS README"
+
+pkg_postinst() {
+	echo
+	ewarn "To have vidalia starting tor, you probably have to copy"
+	ewarn "/etc/tor/torrc.sample to the users ~/.tor/torrc and comment"
+	ewarn "the settings there and change the socks. Also, in vidalia"
+	ewarn "change the default user under which tor will run."
+	echo
+}
diff --git a/net-p2p/dclib/dclib-9999.ebuild b/net-p2p/dclib/dclib-9999.ebuild
new file mode 100644
index 0000000..3c8cfac
--- /dev/null
+++ b/net-p2p/dclib/dclib-9999.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/dclib/dclib-0.3.21.ebuild,v 1.1 2008/09/24 19:59:13 armin76 Exp $
+
+inherit subversion autotools
+
+DESCRIPTION="DirectConnect client library"
+HOMEPAGE="http://sourceforge.net/projects/wxdcgui"
+SRC_URI=""
+
+ESVN_REPO_URI="https://wxdcgui.svn.sourceforge.net/svnroot/wxdcgui/trunk/dclib"
+ESVN_STORE_DIR="${DISTDIR}/svn-src"
+ESVN_PROJECT="${PN/-svn}"
+
+S="${WORKDIR}/${P/_/}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=">=app-arch/bzip2-1.0.2
+	>=dev-libs/libxml2-2.4.22"
+
+src_unpack(){
+        subversion_src_unpack
+        cd "${S}"
+        eautoreconf
+}
+
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/net-p2p/kmldonkey/kmldonkey-2.9999.ebuild b/net-p2p/kmldonkey/kmldonkey-2.9999.ebuild
new file mode 100644
index 0000000..fd50bfb
--- /dev/null
+++ b/net-p2p/kmldonkey/kmldonkey-2.9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/kmldonkey/kmldonkey-2.0.2-r1.ebuild,v 1.2 2009/03/02 14:38:40 scarabeus Exp $
+
+EAPI="2"
+
+
+
+KMNAME="extragear/network"
+KMMODULE="kmldonkey"
+
+inherit kde4-base
+
+DESCRIPTION="Provides integration for the MLDonkey P2P software and KDE 4."
+HOMEPAGE="http://extragear.kde.org/apps/kmldonkey/"
+LICENSE="GPL-2 LGPL-2"
+
+SLOT="live"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="debug plasma"
+
+RDEPEND="plasma? ( >=kde-base/plasma-workspace-${KDE_MINIMAL} )"
+DEPEND="${RDEPEND}
+		!net-p2p/kmldonkey:4.1
+		sys-devel/gettext"
+
+
diff --git a/net-p2p/mldonkey/mldonkey-9999.ebuild b/net-p2p/mldonkey/mldonkey-9999.ebuild
new file mode 100644
index 0000000..9b32ef8
--- /dev/null
+++ b/net-p2p/mldonkey/mldonkey-9999.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.9.6.ebuild,v 1.1 2008/08/05 18:09:54 armin76 Exp $
+
+WANT_AUTOCONF=2.5
+
+inherit flag-o-matic eutils autotools toolchain-funcs cvs
+
+EAPI="1"
+
+IUSE="doc fasttrack gd gnutella gtk guionly magic +ocamlopt"
+
+DESCRIPTION="MLDonkey is a multi-network P2P application written in Ocaml, coming with its own Gtk GUI, web and telnet interface."
+HOMEPAGE="http://mldonkey.sourceforge.net/"
+SRC_URI=""
+
+ECVS_SERVER="cvs.sv.gnu.org:/sources/mldonkey"
+ECVS_MODULE="mldonkey"
+ECVS_AUTH="pserver"
+ECVS_USER="anonymous"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+
+RDEPEND="dev-lang/perl
+	guionly? ( >=gnome-base/librsvg-2.4.0
+			>=dev-ml/lablgtk-2.6 )
+	gtk? ( >=gnome-base/librsvg-2.4.0
+			>=dev-ml/lablgtk-2.6 )
+	gd? ( >=media-libs/gd-2.0.28 )
+	magic? ( sys-apps/file )"
+
+DEPEND="${RDEPEND}
+	>=dev-lang/ocaml-3.08.3
+	sys-apps/sed"
+
+MLUSER="p2p"
+
+pkg_setup() {
+	if use gtk; then
+		echo ""
+		einfo "If the compile with gui fails, and you have updated Ocaml"
+		einfo "recently, you may have forgotten that you need to run"
+		einfo "/usr/portage/dev-lang/ocaml/files/ocaml-rebuild.sh"
+		einfo "to learn which ebuilds you need to recompile"
+		einfo "each time you update Ocaml to a different version"
+		einfo "see the Ocaml ebuild for details"
+		echo ""
+	fi
+
+	if use gtk && ! built_with_use dev-ml/lablgtk svg; then
+		eerror "dev-ml/lablgtk must be built with the 'svg' USE flag to use the gtk gui"
+		die "Recompile dev-ml/lablgtk with enabled svg USE flag"
+	fi
+
+	if use gd && ! built_with_use media-libs/gd truetype; then
+		eerror "media-libs/gd must be built with 'truetype' to compile"
+		eerror "MLDonkey with gd support"
+		die "Recompile media-libs/gd with enabled truetype USE flag"
+	fi
+	if use ocamlopt && ! built_with_use --missing true dev-lang/ocaml ocamlopt; then
+		eerror "In order to build ${PN} with native code support from ocaml"
+		eerror "You first need to have a native code ocaml compiler."
+		eerror "You need to install dev-lang/ocaml with ocamlopt useflag on."
+		die "Please install ocaml with ocamlopt useflag"
+	fi
+	# dev-lang/ocaml creates its own objects but calls gcc for linking, which will
+	# results in relocations if gcc wants to create a PIE executable
+	if gcc-specs-pie ; then
+		append-ldflags -nopie
+		ewarn "Ocaml generates its own native asm, you're using a PIE compiler"
+		ewarn "We have appended -nopie to ocaml build options"
+		ewarn "because linking an executable with pie while the objects are not pic will not work"
+	fi
+}
+
+src_unpack() {
+#	unpack ${A} && cd "${S}"
+	cvs_src_unpack
+	cd "${S}"/config
+	eautoconf
+	cd "${S}"
+	use ocamlopt || sed -i -e "s/ocamlopt/idontwantocamlopt/g" "${S}/config/configure" || die "failed to disable ocamlopt"
+}
+
+src_compile() {
+	# the dirs are not (yet) used, but it doesn't hurt to specify them anyway
+
+	# onlygui	Disable all nets support, build only chosen GUI
+
+	if use gtk || use guionly; then
+		myconf="--enable-gui=newgui2"
+	else
+		myconf="--disable-gui"
+	fi
+
+	if use guionly; then
+		myconf="${myconf} --disable-multinet --disable-donkey"
+	fi
+
+	cd "${S}"
+	econf \
+		--sysconfdir=/etc/mldonkey \
+		--sharedstatedir=/var/mldonkey \
+		--localstatedir=/var/mldonkey \
+		--enable-checks \
+		--disable-batch \
+		$(use_enable fasttrack) \
+		$(use_enable gnutella) \
+		$(use_enable gnutella gnutella2) \
+		$(use_enable gd) \
+		$(use_enable magic) \
+		--enable-ocamlver=3.10 \
+		${myconf} || die "econf failed"
+
+	export OCAMLRUNPARAM="l=256M"
+	emake || die "emake failed"
+
+	if ! use guionly; then
+		emake utils || die "emake utils failed"
+	fi;
+}
+
+src_install() {
+	local myext=""
+	use ocamlopt || myext=".byte"
+	use ocamlopt || export STRIP_MASK="*/bin/*"
+	if ! use guionly; then
+		for i in mlnet mld_hash get_range copysources make_torrent subconv; do
+			newbin $i$myext $i || die "failed to install $i"
+		done
+
+		newconfd "${FILESDIR}/mldonkey.confd-2.8" mldonkey
+		fperms 600 /etc/conf.d/mldonkey
+		newinitd "${FILESDIR}/mldonkey.initd" mldonkey
+	fi
+
+	if use gtk; then
+		for i in mlgui mlguistarter; do
+			newbin $i$myext $i || die "failed to install $i"
+		done
+		make_desktop_entry mlgui "MLDonkey GUI" mldonkey "Network;P2P"
+		newicon "${S}"/packages/rpm/mldonkey-icon-48.png ${PN}.png
+	fi
+
+	if use doc ; then
+		cd "${S}"/distrib
+		dodoc ChangeLog *.txt
+		dohtml *.html
+
+		insinto /usr/share/doc/${PF}/scripts
+		doins kill_mldonkey mldonkey_command mldonkey_previewer make_buginfo
+
+		cd "${S}"/docs
+		dodoc *.txt *.tex *.pdf
+		dohtml *.html
+
+		cd "${S}"/docs/developers
+		dodoc *.txt *.tex
+
+		cd "${S}"/docs/images
+		insinto /usr/share/doc/${PF}/html/images
+		doins *
+	fi
+}
+
+pkg_preinst() {
+	if ! use guionly; then
+		enewuser ${MLUSER} -1 -1 /home/p2p users
+	fi
+}
+
+pkg_postinst() {
+	if ! use guionly; then
+		echo
+		einfo "If you want to start MLDonkey as a system service, use"
+		einfo "the /etc/init.d/mldonkey script. To control bandwidth, use"
+		einfo "the 'slow' and 'fast' arguments. Be sure to have a look at"
+		einfo "/etc/conf.d/mldonkey also."
+		echo
+		einfo "Attention: 2.6 has changed the inifiles structure, so downgrading"
+		einfo "will be problematic."
+		einfo "User settings (admin) are transferred to users.ini from "
+		einfo "downloads.ini"
+		einfo "Old ini files are automatically converted to the new format"
+		echo
+	else
+		echo
+		einfo "Simply run mlgui to start the chosen MLDonkey gui."
+		einfo "It puts its config files into ~/.mldonkey"
+	fi
+}
diff --git a/net-p2p/sancho-bin/sancho-bin-0.9.4.59.ebuild b/net-p2p/sancho-bin/sancho-bin-0.9.4.59.ebuild
new file mode 100644
index 0000000..28b53e2
--- /dev/null
+++ b/net-p2p/sancho-bin/sancho-bin-0.9.4.59.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/sancho-bin/sancho-bin-0.9.4.58-r1.ebuild,v 1.5 2008/01/29 16:26:44 rich0 Exp $
+
+inherit eutils
+
+MY_P=${P/-bin/}
+MY_P=${MY_P%.*}-${MY_P##*.}
+SRC_URI="mirror://gentoo/${MY_P}-linux-gtk-x86_64-java.sh"
+
+DESCRIPTION="a powerful frontend for mldonkey"
+HOMEPAGE="http://sancho-gui.sourceforge.net/"
+
+RESTRICT="strip"
+
+# In order to keyword ~ppc, 'java' should be package.use.force'd
+KEYWORDS="~amd64"
+SLOT="0"
+LICENSE="CPL-1.0 LGPL-2.1"
+IUSE="java"
+
+DEPEND="x11-libs/libXxf86vm
+	x11-libs/libXext
+	x11-libs/libX11
+	>=x11-libs/gtk+-2
+	java? ( >=virtual/jre-1.5 )"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack_makeself
+}
+
+src_install() {
+	dodir /opt/sancho
+	dodir /opt/bin
+
+	cd "${S}"
+	cp -dpR sancho distrib lib ${D}/opt/sancho
+
+	exeinto /opt/sancho
+	newexe sancho sancho-bin
+
+	exeinto /opt/bin
+	newexe ${FILESDIR}/sancho.sh sancho
+
+	insinto /etc/revdep-rebuild
+	doins ${FILESDIR}/50-${PN}
+
+	make_desktop_entry sancho sancho /opt/sancho/distrib/sancho-32.xpm
+}
+
+pkg_postinst() {
+	elog
+	elog "Sancho requires the presence of a p2p core, like"
+	elog "net-p2p/mldonkey, in order to operate. This core"
+	elog "may be in other machine of your network."
+	elog
+}
diff --git a/net-p2p/valknut/valknut-9999.ebuild b/net-p2p/valknut/valknut-9999.ebuild
new file mode 100644
index 0000000..c9bb660
--- /dev/null
+++ b/net-p2p/valknut/valknut-9999.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/valknut/valknut-0.3.21a.ebuild,v 1.1 2008/09/24 20:01:25 armin76 Exp $
+
+EAPI=1
+
+inherit autotools subversion
+
+ESVN_REPO_URI="https://wxdcgui.svn.sourceforge.net/svnroot/wxdcgui/branches/valknut-qt4"
+ESVN_STORE_DIR="${DISTDIR}/svn-src"
+ESVN_PROJECT="${PN/-svn}"
+
+S="${WORKDIR}/${P/_/}"
+
+DESCRIPTION="Qt based client for DirectConnect"
+HOMEPAGE="http://sourceforge.net/projects/wxdcgui/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="ssl"
+
+RDEPEND="x11-libs/qt:3
+	>=dev-libs/libxml2-2.4.22
+	net-p2p/dclib
+	ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack(){
+        subversion_src_unpack
+        cd "${S}"
+        eautoreconf
+}
+
+
+src_compile() {
+	econf \
+		$(use_with ssl) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/net-p2p/verlihub/Manifest b/net-p2p/verlihub/Manifest
new file mode 100644
index 0000000..245932f
--- /dev/null
+++ b/net-p2p/verlihub/Manifest
@@ -0,0 +1,2 @@
+DIST verlihub-0.9.8d-RC2.tar.gz 1087314 RMD160 723ad7e1c84425635098e745156042f19895bffa SHA1 82750e82ee83e697e1cfa79bb58b2c087b3f4e04 SHA256 295424abc986d256e998d565fa28729083cf762460317def43de59e58ba297df
+EBUILD verlihub-0.9.8d_rc2.ebuild 2778 RMD160 4920f6fb3bf4c6bfdcc507f9afe0bb5d39bd7e5c SHA1 87d555523aaa84ca34b3dcd13e0181ca2b4842c0 SHA256 e10fc08073b37770ec123468c861d1734ecb634fa01728f07e7d3e1b4a42e215
diff --git a/net-p2p/verlihub/verlihub-0.9.8d_rc2.ebuild b/net-p2p/verlihub/verlihub-0.9.8d_rc2.ebuild
new file mode 100644
index 0000000..013c533
--- /dev/null
+++ b/net-p2p/verlihub/verlihub-0.9.8d_rc2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+DESCRIPTION="Verlihub, a linux hub for the p2p program 'direct connect'"
+HOMEPAGE="http://www.verlihub-project.org"
+SRC_URI="http://umn.dl.sourceforge.net/sourceforge/verlihub/${PN}-0.9.8d-RC2.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86-fbsd x86"
+DEPEND="dev-libs/libpcre
+        dev-libs/geoip
+        >=dev-db/mysql-4.0.20
+	sys-libs/zlib"
+IUSE="lua50 lua51 floodprot iplog forbid funny messanger chatroom isp replacer stats p_perl hublink"
+PDEPEND=" lua50? ( net-libs/lua50 )
+	  lua51? ( net-libs/lua51 )
+	  floodport? ( net-libs/floodprot )
+  	  iplog? ( net-libs/iplog )
+	  forbid? ( net-libs/forbid )
+	  funny? ( net-libs/funny )
+	  messanger? ( net-libs/messanger )
+	  chatroom? ( net-libs/chatroom )
+	  isp? ( net-libs/isp ) 
+	  replacer? ( net-libs/replacer ) 
+	  stats? ( net-libs/stats ) 
+	  p_perl? ( net-libs/perl ) 
+	  hublink? ( net-libs/hublink )"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack "${PN}-0.9.8d-RC2.tar.gz"
+	cd "${S}"
+}
+src_compile() {
+        econf || die
+        emake || die "Make failed for problems or bugs please visit http://forums.verlihub-project.org/"
+}
+
+src_install() {
+        make DESTDIR=${D} install || die
+
+        dohtml docs/*.html
+
+        docinto "scripts"
+
+        dodoc \
+                scripts/ccgraph \
+                scripts/import_reglist_0.9.x_to_0.9.8b.sql  \
+                scripts/install \
+                scripts/regnick \
+                scripts/runhub  \
+                scripts/setenv  \
+                scripts/trigger \
+                scripts/vh_runhub.in
+
+        docinto ""
+        dodoc \
+                AUTHORS \
+                COPYING \
+                ChangeLog \
+                INSTALL \
+                NEWS \
+                README \
+                TODO \
+                docs/configuring.txt \
+                docs/help \
+                docs/help.sql \
+                docs/ascii \
+                docs/params.php \
+                docs/using.txt
+}
+
+pkg_postinst() {
+    echo
+    ewarn "Do NOT report bugs to Gentoo's bugzilla"
+    einfo "Please report all bugs to http://forums.verlihubproject.org"
+    einfo "Verlihub-project team"
+
+    if [[ -f "/etc/verlihub/dbconfig" ]]
+    then
+	einfo "Verlihub is already configured in /etc/verlihub"
+    else
+	ewarn "You MUST configure verlihub before starting it:"
+	ewarn "emerge --config =${CATEGORY}/${PF}"
+	ewarn "That way you can [re]configure your verlihub setup"
+    fi
+}
+
+pkg_config() {
+    ewarn "Configuring verlihub"
+    /usr/bin/vh_install
+    if [[ -f "/etc/verlihub/dbconfig" ]]
+    then
+	ewarn "Configuration completed"
+    else
+	ewarn "You haven't configured verlihub succesfully. Please try again"
+    fi
+}
diff --git a/net-voip/sflphone/sflphone-9999.ebuild b/net-voip/sflphone/sflphone-9999.ebuild
new file mode 100644
index 0000000..74e54f1
--- /dev/null
+++ b/net-voip/sflphone/sflphone-9999.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=1
+inherit qt3 git autotools
+
+DESCRIPTION="SFLphone aims to become your desktop's VoIP companion."
+HOMEPAGE="http://www.sflphone.org/"
+SRC_URI=""
+LICENSE="GPL-2"
+SLOT="0"
+
+EGIT_REPO_URI="http://sflphone.org/git/sflphone.git"
+
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="qt3 speex zeroconf"
+
+DEPEND=">=net-libs/libosip-2.2.2
+	>=net-libs/libeXosip-1.9.0
+	>=dev-cpp/commoncpp2-1.3.21
+	>=net-libs/ccrtp-1.3.5
+	>=media-libs/portaudio-19_pre
+	>=media-libs/libsamplerate-0.1.1
+	net-libs/pjsip
+	media-sound/pulseaudio
+	qt3? ( >=x11-libs/qt-3.3:3 )
+	speex? ( media-libs/speex )
+	zeroconf? ( net-misc/mDNSResponder )"
+
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+#	unpack ${A}
+	git_src_unpack
+	cd "${S}"
+	eautoreconf
+	# fix compile error on genstef's box..doesn't seem to break anything
+#	sed -i -e "s/Qt::Key_Mode_switch/0x0100117e/" src/gui/qt/SFLPhoneWindow.cpp
+}
+src_compile () {
+	econf \
+		$(use_enable qt3 sflphoneqt) \
+		$(use_enable speex) \
+		$(use_enable zeroconf) \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc README
+}
diff --git a/sys-apps/hal/files b/sys-apps/hal/files
new file mode 120000
index 0000000..e8fea5c
--- /dev/null
+++ b/sys-apps/hal/files
@@ -0,0 +1 @@
+/var/paludis/repositories/gentoo/sys-apps/hal/files
\ No newline at end of file
diff --git a/sys-apps/hal/hal-9999.ebuild b/sys-apps/hal/hal-9999.ebuild
new file mode 100644
index 0000000..8e31d2c
--- /dev/null
+++ b/sys-apps/hal/hal-9999.ebuild
@@ -0,0 +1,317 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r6.ebuild,v 1.4 2009/01/21 22:18:36 aballier Exp $
+
+inherit eutils linux-info autotools flag-o-matic git
+
+PATCH_VERSION="3"
+
+DESCRIPTION="Hardware Abstraction Layer"
+HOMEPAGE="http://www.freedesktop.org/Software/hal"
+SRC_URI=""
+
+EGIT_REPO_URI="git://git.freedesktop.org/git/hal"
+#EGIT_BOOTSTRAP="./autogen.sh"
+
+
+LICENSE="|| ( GPL-2 AFL-2.0 )"
+SLOT="0"
+KEYWORDS=""
+
+KERNEL_IUSE="kernel_linux kernel_FreeBSD"
+IUSE="X acpi apm crypt debug dell disk-partition doc laptop selinux ${KERNEL_IUSE}"
+
+RDEPEND=">=dev-libs/dbus-glib-0.61
+		 >=dev-libs/glib-2.14
+		 >=dev-libs/expat-1.95.8
+		 >=dev-libs/libusb-0.1.10a
+		 >=sys-apps/pciutils-2.2.7-r1
+		 >=dev-util/gperf-3.0.3
+		   sys-apps/usbutils
+		   virtual/eject
+		 amd64? ( >=sys-apps/dmidecode-2.7 )
+		 dell? ( >=sys-libs/libsmbios-0.13.4 )
+		 disk-partition? ( >=sys-apps/parted-1.8.0 )
+		 ia64? ( >=sys-apps/dmidecode-2.7 )
+		 kernel_linux?	(
+							>=sys-fs/udev-117
+							>=sys-apps/util-linux-2.13
+							>=sys-kernel/linux-headers-2.6.19
+							crypt?	( >=sys-fs/cryptsetup-1.0.5 )
+						)
+		 kernel_FreeBSD? ( >=dev-libs/libvolume_id-0.77 )
+		 x86? ( >=sys-apps/dmidecode-2.7 )
+		 selinux? ( sys-libs/libselinux sec-policy/selinux-hal )"
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig
+		>=dev-util/intltool-0.35
+		doc?	(
+					app-text/xmlto
+					dev-libs/libxml2
+					dev-util/gtk-doc
+					app-text/docbook-sgml-utils
+				)"
+PDEPEND="|| (
+	app-misc/hal-info
+	)
+	!gnome-extra/hal-device-manager
+	laptop? ( >=sys-power/pm-utils-0.99.3 )"
+
+## HAL Daemon drops privledges so we need group access to read disks
+HALDAEMON_GROUPS_LINUX="haldaemon,plugdev,disk,cdrom,cdrw,floppy,usb"
+HALDAEMON_GROUPS_FREEBSD="haldaemon,plugdev,operator"
+
+function check_hotplug_net() {
+	local CONFIG_CHECK="~HOTPLUG ~NET"
+	local WARNING_HOTPLUG="CONFIG_HOTPLUG:\tis not set (required for HAL)\n"
+	local WARNING_NET="CONFIG_NET:\tis not set (required for HAL)\n"
+	check_extra_config
+}
+
+function check_inotify() {
+	local CONFIG_CHECK="~INOTIFY_USER"
+	local WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER:\tis not set (required for HAL)\n"
+	check_extra_config
+}
+
+function check_acpi_proc() {
+	local CONFIG_CHECK="~ACPI_PROCFS ~ACPI_PROC_EVENT"
+	local WARNING_ACPI_PROCFS="CONFIG_ACPI_PROCFS:\tis not set (required for HAL)\n"
+	local WARNING_ACPI_PROC_EVENT="CONFIG_ACPI_PROC_EVENT:\tis not set (required for HAL)\n"
+	check_extra_config
+}
+
+pkg_setup() {
+	if use kernel_linux ; then
+		if [[ -e "${ROOT}/usr/src/linux/.config" ]] ; then
+			kernel_is ge 2 6 19 || ewarn "HAL requires a kernel version 2.6.19 or newer"
+
+			if kernel_is lt 2 6 23 && use acpi ; then
+				check_acpi_proc
+			fi
+		fi
+
+		check_hotplug_net
+		check_inotify
+	fi
+
+	# http://devmanual.gentoo.org/ebuild-writing/functions/
+	# http://bugs.gentoo.org/show_bug.cgi?id=191605
+
+	# Create groups for hotplugging and HAL
+	enewgroup haldaemon
+	enewgroup plugdev
+
+	# HAL drops priviledges by default now ...
+	# ... so we must make sure it can read disk/cdrom info (ie. be in ${HALDAEMON_GROUPS} groups)
+	if use kernel_linux; then
+		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_LINUX}
+	elif use kernel_FreeBSD; then
+		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD}
+	fi
+
+	# Make sure that the haldaemon user is in the ${HALDAEMON_GROUPS}
+	# If users have a problem with this, let them file a bug
+	if [[ ${ROOT} == / ]] ; then
+		if use kernel_linux; then
+			usermod -G ${HALDAEMON_GROUPS_LINUX} haldaemon
+		elif use kernel_FreeBSD; then
+			pw usermod haldaemon -G ${HALDAEMON_GROUPS_FREEBSD}
+		fi
+	fi
+}
+
+S="${WORKDIR}/${PF/-r*/}"
+
+src_unpack() {
+	git_src_unpack
+	cd "${S}"
+
+#	EPATCH_MULTI_MSG="Applying Gentoo Patchset ..." \
+#	EPATCH_SUFFIX="patch" \
+#	EPATCH_SOURCE="${WORKDIR}/hal-0.5.11-patches/" \
+#	EPATCH_FORCE="yes" \
+#	epatch
+
+#	epatch "${FILESDIR}"/hal-0.5.11-ppc64.patch
+
+#	eautoreconf
+}
+
+src_compile() {
+	local acpi="$(use_enable acpi)"
+	local backend=
+	local hardware=
+
+	append-flags -rdynamic
+
+	if use kernel_linux ; then
+		backend="linux"
+	elif use kernel_FreeBSD ; then
+		backend="freebsd"
+	else
+		eerror "Invalid backend"
+	fi
+
+	if use kernel_linux ; then
+		if use acpi ; then
+			# Using IBM ACPI and Toshiba ACPI results in double notification as this
+			# was merged into the Linux Kernel 2.6.22
+			if kernel_is lt 2 6 22 ; then
+				acpi="$acpi --enable-acpi-ibm --enable-acpi-toshiba"
+			else
+				acpi="$acpi --disable-acpi-ibm --disable-acpi-toshiba"
+			fi
+
+			acpi="$acpi --enable-acpi-proc --enable-acpi-acpid"
+		else
+			acpi="$acpi --disable-acpi-ibm --disable-acpi-toshiba"
+			acpi="$acpi --disable-acpi-proc --disable-acpi-acpid"
+		fi
+
+		hardware="--with-cpufreq --with-usb-csr --with-keymaps"
+		use arm && hardware="$hardware --with-omap --enable-pmu"
+		use ppc && hardware="$hardware --enable-pmu"
+
+		if use dell ; then
+			hardware="$hardware --with-dell-backlight"
+		else
+			hardware="$hardware --without-dell-backlight"
+		fi
+
+		hardware="$hardware --enable-sonypic"
+	else
+		hardware="--without-cpufreq --without-usb-csr --without-keymaps"
+		hardware="$hardware --without-omap"
+		hardware="$hardware --without-dell-backlight"
+		hardware="$hardware --enable-acpi-ibm --enable-acpi-toshiba"
+		hardware="$hardware --disable-sonypic"
+	fi
+
+	./autogen.sh --with-backend=${backend} \
+		  --with-os-type=gentoo \
+		  --with-pid-file=/var/run/hald.pid \
+		  --with-hwdata=/usr/share/misc \
+		  --with-socket-dir=/var/run/hald \
+		  --enable-umount-helper \
+		  $(use_enable apm) \
+		  $(use_enable debug verbose-mode) \
+		  $(use_enable disk-partition parted) \
+		  $(use_enable doc docbook-docs) \
+		  $(use_enable doc gtk-doc) \
+		  --docdir=/usr/share/doc/${PF} \
+		  --localstatedir=/var \
+		  ${acpi} ${hardware} \
+	|| die "configure failed"
+	econf --with-os-type=gentoo \
+		  --with-pid-file=/var/run/hald.pid \
+		  --with-socket-dir=/var/run/hald \
+		  $(use_enable apm) \
+		  $(use_enable debug verbose-mode) \
+		  $(use_enable disk-partition parted) \
+		  $(use_enable doc docbook-docs) \
+		  $(use_enable doc gtk-doc) \
+		  --docdir=/usr/share/doc/${PF} \
+		  --localstatedir=/var \
+		  ${acpi} ${hardware} \
+	|| die "configure failed"
+	
+	
+
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+#	dodoc AUTHORS ChangeLog NEWS README || die "docs failed"
+
+	# hal umount for unclean unmounts
+	exeinto /lib/udev/
+	newexe "${FILESDIR}/hal-unmount.dev" hal_unmount || die "udev helper failed"
+
+	# initscript
+	newinitd "${FILESDIR}/0.5.10-hald.rc" hald || die "init script failed"
+
+	# configuration
+	cp "${FILESDIR}/0.5.10-hald.conf" "${WORKDIR}/" || \
+		die "failed to copy hald.conf"
+
+	if use debug; then
+		sed -e 's:HALD_VERBOSE="no":HALD_VERBOSE="yes":' \
+			-i "${WORKDIR}/0.5.10-hald.conf" || die "failed to change verbose"
+	fi
+	newconfd "${WORKDIR}/0.5.10-hald.conf" hald || \
+		die "failed to install hald.conf"
+
+	if use X ; then
+		# New Configuration Snippets
+		dodoc "${WORKDIR}/${PN}-config-examples/"*.fdi || \
+			die "dodoc X examples failed"
+		dobin "${WORKDIR}/${PN}-config-examples/migrate-xorg-to-fdi.py" || \
+			die "dodoc X migration script failed"
+
+		# Automagic conversion!
+		elog "Migrating xorg.conf Core Keyboard configuration to HAL FDI file"
+		"${WORKDIR}/${PN}-config-examples/migrate-xorg-to-fdi.py" 2> /dev/null \
+			> "${D}/etc/hal/fdi/policy/10-x11-input.fdi" || \
+			ewarn "Failed to migrate your keyboard configuration."
+	fi
+
+	# We now create and keep /media here as both gnome-mount and pmount
+	# use these directories, to avoid collision.
+	keepdir /media
+
+	# We also need to create and keep /etc/fdi/{information,policy,preprobe}
+	# or else hal bombs.
+	keepdir /etc/hal/fdi/{information,policy,preprobe}
+
+	# HAL stores it's fdi cache in /var/lib/cache/hald
+	keepdir /var/lib/cache/hald
+
+	# HAL keeps its unix socket here
+	keepdir /var/run/hald
+	keepdir /var/lib/hal
+}
+
+pkg_postinst() {
+	# Despite what people keep changing this location. Either one works.. it doesn't matter
+	# http://dev.gentoo.org/~plasmaroo/devmanual/ebuild-writing/functions/
+
+	elog "The HAL daemon needs to be running for certain applications to"
+	elog "work. Suggested is to add the init script to your start-up"
+	elog "scripts, this should be done like this :"
+	elog "\`rc-update add hald default\`"
+	echo
+	elog "Looking for automounting support? Add yourself to the plugdev group"
+	echo
+	elog "IF you have additional applications which consume ACPI events, you"
+	elog "should consider installing acpid to allow applications to share ACPI"
+	elog "events."
+	if use X ; then
+		echo
+		elog "If you wish to use a non US layout, you may do so by executing:"
+		elog "setxkbmap <layout> or by utilizing your Desktop Environment's"
+		elog "Keyboard Layout Settings mechanism."
+		elog "Under GNOME, this is gnome-keyboard-properties, and under KDE"
+		elog "it is kxkb."
+	fi
+	echo
+	elog "In order have suspend/hibernate function with HAL or apps that use HAL"
+	elog "(such as gnome-power-manager), you should build HAL with the laptop"
+	elog "useflag which will install pm-utils."
+	if use X ; then
+		echo
+		elog "X Input Hotplugging (if you build xorg-server with the HAL useflag)"
+		elog "reads user specific configuration from /etc/hal/fdi/policy/."
+		if [[ $(cat "${ROOT}etc/hal/fdi/policy/10-x11-input.fdi" | wc -c) -gt 0 ]]
+		then
+			elog "We have converted your existing xorg.conf rules and the FDI is stored"
+			elog "at /etc/hal/fdi/policy/10-x11-input.fdi"
+		fi
+		elog "You should remove the Input sections from your xorg.conf once you have"
+		elog "migrated the rules to a HAL fdi file."
+	fi
+
+	ebeep 5
+	epause 5
+}
diff --git a/sys-power/cpufrequtils/cpufrequtils-005.ebuild b/sys-power/cpufrequtils/cpufrequtils-005.ebuild
new file mode 100644
index 0000000..1f938fc
--- /dev/null
+++ b/sys-power/cpufrequtils/cpufrequtils-005.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/cpufrequtils-002-r4.ebuild,v 1.1 2008/08/11 17:46:53 armin76 Exp $
+
+inherit eutils toolchain-funcs multilib
+
+DESCRIPTION="Userspace utilities for the Linux kernel cpufreq subsystem"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html"
+SRC_URI="mirror://kernel/linux/utils/kernel/cpufreq/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc x86"
+IUSE="debug nls"
+
+DEPEND="sys-fs/sysfsutils"
+
+src_compile() {
+	local debug=false nls=false
+
+	use debug && debug=true
+	use nls && nls=true
+
+	emake V=true DEBUG=${debug} NLS=${nls} \
+		CC=$(tc-getCC) LD=$(tc-getCC) AR=$(tc-getAR) STRIP=echo RANLIB=$(tc-getRANLIB) \
+		|| die "emake failed"
+}
+
+src_install() {
+	local nls=false
+
+	use nls && nls=true
+
+	make DESTDIR="${D}" NLS=${nls} mandir=/usr/share/man libdir=/usr/$(get_libdir) \
+		install || die "make install failed"
+
+	newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
+	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
+
+	dodoc AUTHORS README
+}
diff --git a/sys-power/hibernate-script/hibernate-script-1.99.ebuild b/sys-power/hibernate-script/hibernate-script-1.99.ebuild
new file mode 100644
index 0000000..a1cc9b6
--- /dev/null
+++ b/sys-power/hibernate-script/hibernate-script-1.99.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+
+PATCH_VERSION="1"
+
+DESCRIPTION="Hibernate script supporting multiple suspend methods"
+HOMEPAGE="http://www.tuxonice.net/"
+SRC_URI="http://www.tuxonice.net/downloads/all/${P}.tar.gz
+	mirror://gentoo/${PN}-1.98.1-patches-${PATCH_VERSION}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="vim-syntax"
+
+DEPEND=""
+RDEPEND="!<media-gfx/splashutils-1.5.2"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Our patches
+	epatch "${WORKDIR}"/patches/*.patch
+}
+
+src_install() {
+	BASE_DIR="${D}" \
+		DISTRIBUTION="gentoo" \
+		PREFIX="/usr" \
+		MAN_DIR="${D}/usr/share/man" \
+		"${S}/install.sh" || die "Install failed"
+
+	# hibernate-ram will default to using ram.conf
+	dosym /usr/sbin/hibernate /usr/sbin/hibernate-ram
+
+	newinitd "${S}"/init.d/hibernate-cleanup.sh hibernate-cleanup
+
+	# other ebuilds can install scriplets to this dir
+	keepdir /etc/hibernate/scriptlets.d/
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins hibernate.vim
+	fi
+
+	dodoc CHANGELOG README SCRIPTLET-API hibernate.vim
+
+	insinto /etc/logrotate.d
+	newins "${S}"/logrotate.d-hibernate-script hibernate-script
+}
+
+pkg_postinst() {
+	elog
+	elog "You should run the following command to invalidate suspend"
+	elog "images on a clean boot."
+	elog
+	elog "  # rc-update add hibernate-cleanup boot"
+	elog
+	elog "See /usr/share/doc/${PF}/README.* for further details."
+	elog
+	elog "Please note that you will need to manually emerge any utilities"
+	elog "(radeontool, vbetool, ...) enabled in the configuration files,"
+	elog "should you wish to use them."
+}
diff --git a/www-apps/trac/files b/www-apps/trac/files
new file mode 120000
index 0000000..63d9929
--- /dev/null
+++ b/www-apps/trac/files
@@ -0,0 +1 @@
+/var/paludis/repositories/gentoo/www-apps/trac/files
\ No newline at end of file
diff --git a/www-apps/trac/trac-9999.ebuild b/www-apps/trac/trac-9999.ebuild
new file mode 100644
index 0000000..b6badfa
--- /dev/null
+++ b/www-apps/trac/trac-9999.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.11.2.ebuild,v 1.3 2008/11/16 17:47:23 maekke Exp $
+
+inherit distutils webapp subversion
+
+MY_PV=${PV/_beta/b}
+MY_P=Trac-${MY_PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Trac is a minimalistic web-based project management, wiki and bug/issue tracking system."
+HOMEPAGE="http://trac.edgewall.com/"
+LICENSE="trac"
+SRC_URI=""
+
+ESVN_REPO_URI="http://svn.edgewall.org/repos/trac/trunk"
+ESVN_STORE_DIR="${DISTDIR}/svn-src"
+ESVN_PROJECT="${PN/-svn}"
+#ESVN_BOOTSTRAP="./reconf"
+
+S="${WORKDIR}/${P/_/}"
+
+
+IUSE="cgi fastcgi mysql postgres sqlite subversion"
+
+KEYWORDS=""
+
+# doing so because tools, python packages... overlap
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+
+DEPEND="
+	${DEPEND}
+	dev-python/setuptools
+	"
+
+RDEPEND="
+	${RDEPEND}
+	>=dev-python/genshi-0.5
+	dev-python/pygments
+	>=dev-python/docutils-0.3.9
+	dev-python/pytz
+	cgi? (
+		virtual/httpd-cgi
+	)
+	fastcgi? (
+		virtual/httpd-fastcgi
+	)
+	mysql? (
+		>=dev-python/mysql-python-1.2.1
+		>=virtual/mysql-4.1
+	)
+	postgres? (
+		>=dev-python/psycopg-2
+	)
+	sqlite? (
+		>=dev-db/sqlite-3.3.4
+		|| (
+			>=dev-lang/python-2.5
+			>=dev-python/pysqlite-2.3.2
+		)
+	)
+	subversion? (
+		>=dev-util/subversion-1.4.2
+	)
+	!www-apps/trac-webadmin
+	"
+
+# The following function should be added to eutils.eclass (see bug #143572):
+
+# Generate an standard error message for missing USE flags
+# in existing packages, and die.
+#
+# Usage: built_with_use_die <category/package> <functionality> [<USE flag>]
+#    ex: built_with_use_die dev-util/subversion python
+#    or: built_with_use_die www-servers/apache LDAP ldap
+#
+# Typical usage:
+#	if ! built_with_use dev-util/subversion python ; then
+#        built_with_use_die dev-util/subversion python
+#   fi
+#
+# Note: when <USE flag> is not specified, <functionality> is used for the USE flag name.
+built_with_use_die() {
+	local package=$1
+	local func=$2
+	local use_flag=$3
+
+	[[ -z ${use_flag} ]] && use_flag=${func}
+
+	eerror "Your ${package} package has been built without"
+	eerror "${func} support, please enable the '${use_flag}' USE flag and"
+	eerror "re-emerge ${package}."
+	elog "You can enable this USE flag either globally in /etc/make.conf,"
+	elog "or just for specific packages in /etc/portage/package.use."
+	die "${package} missing ${func} support"
+}
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	if ! use mysql && ! use postgres && ! use sqlite ; then
+		eerror "You must select at least one database backend, by enabling"
+		eerror "at least one of the 'mysql', 'postgres' or 'sqlite' USE flags."
+		die "no database backend selected"
+	fi
+
+	# python has built-in sqlite support starting from 2.5
+	if use sqlite && \
+		has_version ">=dev-lang/python-2.5" && \
+		! has_version ">=dev-python/pysqlite-2.3" && \
+		! built_with_use dev-lang/python sqlite ; then
+		eerror "To use the sqlite database backend, you must either:"
+		eerror "- build dev-lang/python with sqlite support, using the 'sqlite'"
+		eerror "  USE flag, or"
+		eerror "- emerge dev-python/pysqlite"
+		die "missing python sqlite support"
+	fi
+
+	if use subversion && \
+		! built_with_use dev-util/subversion python ; then
+		built_with_use_die dev-util/subversion python
+	fi
+
+	enewgroup tracd
+	enewuser tracd -1 -1 -1 tracd
+}
+
+src_upack(){
+	subversion_src_unpack
+	cd ${S}
+}
+
+src_install() {
+	webapp_src_preinst
+	distutils_src_install
+
+	# project environments might go in here
+	keepdir /var/lib/trac
+
+	# Use this as the egg-cache for tracd
+	dodir /var/lib/trac/egg-cache
+	keepdir /var/lib/trac/egg-cache
+	fowners tracd:tracd /var/lib/trac/egg-cache
+
+	# documentation
+	cp -r contrib "${D}"/usr/share/doc/${P}/
+
+	# tracd init script
+	newconfd "${FILESDIR}"/tracd.confd tracd
+	newinitd "${FILESDIR}"/tracd.initd.2 tracd
+
+	if use cgi ; then
+		cp cgi-bin/trac.cgi "${D}"/${MY_CGIBINDIR} || die
+	fi
+	if use fastcgi ; then
+		cp cgi-bin/trac.fcgi "${D}"/${MY_CGIBINDIR} || die
+	fi
+
+	for lang in en; do
+		webapp_postinst_txt ${lang} "${FILESDIR}"/postinst-${lang}.txt
+		webapp_postupgrade_txt ${lang} "${FILESDIR}"/postupgrade-${lang}.txt
+	done
+
+	webapp_src_install
+}
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
new file mode 100644
index 0000000..62cb262
--- /dev/null
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.8.2.ebuild,v 1.1 2008/10/31 20:45:54 cardoe Exp $
+
+inherit eutils flag-o-matic libtool git
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="http://cairographics.org/"
+SRC_URI=""
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo"
+EGIT_BOOTSTRAP="./autogen.sh"
+
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug directfb doc glitz opengl svg X xcb"
+
+# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
+RESTRICT="test"
+
+RDEPEND="media-libs/fontconfig
+	>=media-libs/freetype-2.1.9
+	sys-libs/zlib
+	media-libs/libpng
+	>=x11-libs/pixman-0.12.0
+	directfb? ( >=dev-libs/DirectFB-0.9.24 )
+	glitz? ( >=media-libs/glitz-0.5.1 )
+	svg? ( dev-libs/libxml2 )
+	X? ( 	>=x11-libs/libXrender-0.6
+		x11-libs/libXext
+		x11-libs/libX11
+		virtual/xft )
+	xcb? (	>=x11-libs/libxcb-0.92
+		x11-libs/xcb-util )"
+#	test? (
+#	pdf test
+#	x11-libs/pango
+#	>=x11-libs/gtk+-2.0
+#	>=app-text/poppler-bindings-0.9.2
+#	ps test
+#	virtual/ghostscript
+#	svg test
+#	>=x11-libs/gtk+-2.0
+#	>=gnome-base/librsvg-2.15.0
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.19
+	doc? (	>=dev-util/gtk-doc-1.6
+		~app-text/docbook-xml-dtd-4.2 )
+	X? ( x11-proto/renderproto )
+	xcb? ( x11-proto/xcb-proto )"
+
+#pkg_setup() {
+#	if ! built_with_use app-text/poppler-bindings gtk ; then
+#		eerror 'poppler-bindings with gtk is required for the pdf backend'
+#		die 'poppler-bindings built without gtk support'
+#	fi
+#}
+
+src_unpack() {
+	git_src_unpack
+	cd "${S}"
+
+}
+
+src_compile() {
+	#gets rid of fbmmx.c inlining warnings
+	append-flags -finline-limit=1200
+
+	if use glitz && use opengl; then
+		export glitz_LIBS=-lglitz-glx
+	fi
+
+	econf $(use_enable X xlib) $(use_enable doc gtk-doc) \
+		$(use_enable directfb) $(use_enable xcb) \
+		$(use_enable svg) $(use_enable glitz) $(use_enable X xlib-xrender) \
+		$(use_enable debug test-surfaces) --enable-pdf  --enable-png \
+		--enable-freetype --enable-ps \
+		|| die "configure failed"
+
+	emake || die "compile failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Installation failed"
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/x11-libs/cairo/files b/x11-libs/cairo/files
new file mode 120000
index 0000000..68d5a11
--- /dev/null
+++ b/x11-libs/cairo/files
@@ -0,0 +1 @@
+/var/paludis/repositories/gentoo/x11-libs/cairo/files
\ No newline at end of file
diff --git a/x11-libs/compizconfig-backend-kconfig/compizconfig-backend-kconfig-0.8.2.ebuild b/x11-libs/compizconfig-backend-kconfig/compizconfig-backend-kconfig-0.8.2.ebuild
new file mode 100644
index 0000000..b21b5cd
--- /dev/null
+++ b/x11-libs/compizconfig-backend-kconfig/compizconfig-backend-kconfig-0.8.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+ARTS_REQUIRED="never"
+NEED_KDE="3.5"
+
+inherit kde
+
+PREFIX=`kde-config --prefix`
+#QTDIR='/usr'
+
+DESCRIPTION="Compizconfig Kconfig Backend"
+HOMEPAGE="http://www.compiz.org/"
+SRC_URI="http://releases.compiz.org/components/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="~x11-libs/libcompizconfig-${PV}
+	~x11-wm/compiz-${PV}"
+RDEPEND="${DEPEND}"
diff --git a/x11-libs/gtk+/files b/x11-libs/gtk+/files
new file mode 120000
index 0000000..145e7da
--- /dev/null
+++ b/x11-libs/gtk+/files
@@ -0,0 +1 @@
+/var/paludis/repositories/gentoo/x11-libs/gtk+/files
\ No newline at end of file
diff --git a/x11-libs/gtk+/gtk+-2.9999.ebuild b/x11-libs/gtk+/gtk+-2.9999.ebuild
new file mode 100644
index 0000000..4d01043
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.9999.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.14.4.ebuild,v 1.1 2008/10/19 03:27:31 leio Exp $
+
+WANT_AUTOMAKE="1.7"
+
+inherit flag-o-matic eutils libtool virtualx subversion
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+
+ESVN_REPO_URI="http://svn.gnome.org/svn/gtk+/trunk"
+ESVN_STORE_DIR="${DISTDIR}/svn-src"
+ESVN_PROJECT="${PN/-svn}"
+ESVN_BOOTSTRAP="./autogen.sh"
+
+S="${WORKDIR}/${P/_/}"
+
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS=""
+IUSE="cups debug doc jpeg jpeg2k tiff vim-syntax xinerama"
+
+RDEPEND="x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXt
+	x11-libs/libXext
+	>=x11-libs/libXrandr-1.2
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	xinerama? ( x11-libs/libXinerama )
+	>=dev-libs/glib-2.17.6
+	>=x11-libs/pango-1.20
+	>=dev-libs/atk-1.13
+	>=x11-libs/cairo-1.6
+	media-libs/fontconfig
+	x11-misc/shared-mime-info
+	>=media-libs/libpng-1.2.1
+	cups? ( net-print/cups )
+	jpeg? ( >=media-libs/jpeg-6b-r2 )
+	jpeg2k? ( media-libs/jasper )
+	tiff? ( >=media-libs/tiff-3.5.7 )
+	!<gnome-base/gail-1000"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-proto/inputproto
+	x11-proto/damageproto
+	xinerama? ( x11-proto/xineramaproto )
+	>=dev-util/gtk-doc-am-1.8
+	doc? (
+			>=dev-util/gtk-doc-1.8
+			~app-text/docbook-xml-dtd-4.1.2
+		 )"
+PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
+
+pkg_setup() {
+	if ! built_with_use x11-libs/cairo X; then
+		eerror "Please re-emerge x11-libs/cairo with the X USE flag set"
+		die "cairo needs the X flag set"
+	fi
+}
+
+set_gtk2_confdir() {
+	# An arch specific config directory is used on multilib systems
+	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
+}
+
+src_unpack() {
+	subversion_src_unpack
+	cd "${S}"
+
+	# use an arch-specific config directory so that 32bit and 64bit versions
+	# dont clash on multilib systems
+	has_multilib_profile && epatch "${FILESDIR}/${PN}-2.8.0-multilib.patch"
+
+	# Workaround adobe flash infinite loop. Patch from http://bugzilla.gnome.org/show_bug.cgi?id=463773#c11
+	epatch "${FILESDIR}/${PN}-2.12.0-flash-workaround.patch"
+
+	# Don't break inclusion of gtkclist.h, upstream bug 536767
+	epatch "${FILESDIR}/${PN}-2.14.3-limit-gtksignal-includes.patch"
+
+	# -O3 and company cause random crashes in applications. Bug #133469
+	replace-flags -O3 -O2
+	strip-flags
+
+	use ppc64 && append-flags -mminimal-toc
+
+	elibtoolize
+}
+
+src_compile() {
+	# png always on to display icons (foser)
+	local myconf="$(use_enable doc gtk-doc) \
+		$(use_with jpeg libjpeg) \
+		$(use_with jpeg2k libjasper) \
+		$(use_with tiff libtiff) \
+		$(use_enable xinerama) \
+		$(use_enable cups cups auto) \
+		--with-libpng \
+		--with-gdktarget=x11 \
+		--with-xinput"
+
+	# Passing --disable-debug is not recommended for production use
+	use debug && myconf="${myconf} --enable-debug=yes"
+
+	econf ${myconf} || die "configure failed"
+	emake || die "compile failed"
+}
+
+src_test() {
+	Xemake check || die "tests failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Installation failed"
+
+	set_gtk2_confdir
+	dodir ${GTK2_CONFDIR}
+	keepdir ${GTK2_CONFDIR}
+
+	# see bug #133241
+	echo 'gtk-fallback-icon-theme = "gnome"' > "${D}/${GTK2_CONFDIR}/gtkrc"
+
+	# Enable xft in environment as suggested by <utx@gentoo.org>
+	dodir /etc/env.d
+	echo "GDK_USE_XFT=1" > "${D}/etc/env.d/50gtk2"
+
+	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+
+	# This has to be removed, because it's multilib specific; generated in
+	# postinst
+	rm "${D}/etc/gtk-2.0/gtk.immodules"
+}
+
+pkg_postinst() {
+	set_gtk2_confdir
+
+	if [ -d "${ROOT}${GTK2_CONFDIR}" ]; then
+		gtk-query-immodules-2.0  > "${ROOT}${GTK2_CONFDIR}/gtk.immodules"
+		gdk-pixbuf-query-loaders > "${ROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders"
+	else
+		ewarn "The destination path ${ROOT}${GTK2_CONFDIR} doesn't exist;"
+		ewarn "to complete the installation of GTK+, please create the"
+		ewarn "directory and then manually run:"
+		ewarn "  cd ${ROOT}${GTK2_CONFDIR}"
+		ewarn "  gtk-query-immodules-2.0  > gtk.immodules"
+		ewarn "  gdk-pixbuf-query-loaders > gdk-pixbuf.loaders"
+	fi
+
+	if [ -e /usr/lib/gtk-2.0/2.[^1]* ]; then
+		elog "You need to rebuild ebuilds that installed into" /usr/lib/gtk-2.0/2.[^1]*
+		elog "to do that you can use qfile from portage-utils:"
+		elog "emerge -va1 \$(qfile -qC /usr/lib/gtk-2.0/2.[^1]*)"
+	fi
+
+	elog "Please install app-text/evince for print preview functionality"
+}
diff --git a/x11-libs/pango/files b/x11-libs/pango/files
new file mode 120000
index 0000000..78f78af
--- /dev/null
+++ b/x11-libs/pango/files
@@ -0,0 +1 @@
+/var/paludis/repositories/gentoo/x11-libs/pango/files
\ No newline at end of file
diff --git a/x11-libs/pango/pango-9999.ebuild b/x11-libs/pango/pango-9999.ebuild
new file mode 100644
index 0000000..33ee025
--- /dev/null
+++ b/x11-libs/pango/pango-9999.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.22.2.ebuild,v 1.1 2008/10/31 00:10:31 leio Exp $
+
+inherit eutils multilib subversion
+
+DESCRIPTION="Text rendering and layout library"
+HOMEPAGE="http://www.pango.org/"
+
+LICENSE="LGPL-2 FTL"
+SLOT="0"
+KEYWORDS=""
+IUSE="X debug doc"
+
+ESVN_REPO_URI="http://svn.gnome.org/svn/pango/trunk"
+ESVN_STORE_DIR="${DISTDIR}/svn-src"
+ESVN_PROJECT="${PN/-svn}"
+ESVN_BOOTSTRAP="./autogen.sh"
+
+S="${WORKDIR}/${P/_/}"
+
+RDEPEND=">=dev-libs/glib-2.17.3
+		 >=media-libs/fontconfig-1.0.1
+		 >=media-libs/freetype-2
+		 >=x11-libs/cairo-1.7.6
+		 X? (
+				x11-libs/libXrender
+				x11-libs/libX11
+				x11-libs/libXft
+			)"
+DEPEND="${RDEPEND}
+		>=dev-util/pkgconfig-0.9
+		doc? (
+				>=dev-util/gtk-doc-1
+				~app-text/docbook-xml-dtd-4.1.2
+			 )
+		X? ( x11-proto/xproto )"
+
+DOCS="AUTHORS ChangeLog* NEWS README TODO*"
+
+function multilib_enabled() {
+	has_multilib_profile || ( use x86 && [ "$(get_libdir)" == "lib32" ] )
+}
+
+pkg_setup() {
+	# Do NOT build with --disable-debug/--enable-debug=no
+	if use debug ; then
+		G2CONF="${G2CONF} --enable-debug=yes"
+	fi
+
+	G2CONF="${G2CONF} $(use_with X x)"
+}
+
+src_unpack() {
+	subversion_src_unpack
+
+	# make config file location host specific so that a 32bit and 64bit pango
+	# wont fight with each other on a multilib system.  Fix building for
+	# emul-linux-x86-gtklibs
+	if multilib_enabled ; then
+		epatch "${FILESDIR}/${PN}-1.2.5-lib64.patch"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm "${D}/etc/pango/pango.modules"
+}
+
+pkg_postinst() {
+	if [[ "${ROOT}" == "/" ]] ; then
+		einfo "Generating modules listing..."
+
+		local PANGO_CONFDIR=
+
+		if multilib_enabled ; then
+			PANGO_CONFDIR="/etc/pango/${CHOST}"
+		else
+			PANGO_CONFDIR="/etc/pango"
+		fi
+
+		mkdir -p ${PANGO_CONFDIR}
+
+		pango-querymodules > ${PANGO_CONFDIR}/pango.modules
+	fi
+}
+
+src_compile(){
+	econf\
+	$(use_enable doc gtk-doc) \
+	$(use_enable doc man) \
+	$(useq debug && echo --enable-debug=yes )
+	emake
+}
diff --git a/x11-libs/pixman/files/pixman-0.12.0-sse.patch b/x11-libs/pixman/files/pixman-0.12.0-sse.patch
new file mode 100644
index 0000000..1f6ee92
--- /dev/null
+++ b/x11-libs/pixman/files/pixman-0.12.0-sse.patch
@@ -0,0 +1,14 @@
+--- configure.ac.orig	2008-09-25 20:34:22.000000000 -0700
++++ configure.ac	2008-09-25 20:43:57.000000000 -0700
+@@ -191,10 +191,8 @@
+ CFLAGS="$CFLAGS -msse2 $SSE2_CFLAGS"
+ 
+ AC_COMPILE_IFELSE([
+-#if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2))
+-#   if !defined(__amd64__) && !defined(__x86_64__)
++#if !defined(__GNUC__) && !(__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2))
+ #      error "Need GCC >= 4.2 for SSE2 intrinsics on x86"
+-#   endif
+ #endif
+ #include <mmintrin.h>
+ #include <xmmintrin.h>
diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild
new file mode 100644
index 0000000..144a467
--- /dev/null
+++ b/x11-libs/pixman/pixman-9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.9.5.ebuild,v 1.1 2007/09/08 08:47:24 dberkholz Exp $
+
+# Must be before x-modular eclass is inherited
+SNAPSHOT="yes"
+
+inherit git x-modular
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/pixman"
+EGIT_BOOTSTRAP="./autogen.sh"
+
+
+DESCRIPTION="Low-level pixel manipulation routines"
+SRC_URI=""
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+
+src_config(){
+		econf || die
+}
+
+src_unpack() {
+	git_src_unpack
+	x-modular_patch_source
+	x-modular_reconf_source
+}
diff --git a/x11-wm/compiz/compiz-0.8.2.ebuild b/x11-wm/compiz/compiz-0.8.2.ebuild
new file mode 100644
index 0000000..0044441
--- /dev/null
+++ b/x11-wm/compiz/compiz-0.8.2.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit autotools eutils gnome2-utils multilib
+
+DESCRIPTION="3D composite and windowmanager"
+HOMEPAGE="http://www.compiz.org/"
+SRC_URI="http://releases.compiz.org/core/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cairo dbus fuse gnome gtk kde kde4 +svg"
+
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=media-libs/glitz-0.5.6
+	media-libs/libpng
+	>=media-libs/mesa-6.5.1-r1
+	>=x11-base/xorg-server-1.1.1-r1
+	x11-libs/libX11[xcb]
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libICE
+	x11-libs/libSM
+	>=x11-libs/libXrender-0.8.4
+	>=x11-libs/startup-notification-0.7
+	cairo? (
+			x11-libs/cairo[X]
+	)
+	dbus? ( >=sys-apps/dbus-1.0 )
+	fuse? ( sys-fs/fuse )
+	gnome? (
+		>=gnome-base/gnome-control-center-2.16.1:2
+		gnome-base/gnome-desktop
+		gnome-base/gconf:2
+	)
+	gtk? (
+		>=x11-libs/gtk+-2.8.0:2
+		>=x11-libs/libwnck-2.18.3
+		x11-libs/pango
+	)
+	kde? (
+		|| ( kde-base/kwin:3.5
+			kde-base/kdebase:3.5
+		)
+		dev-libs/dbus-qt3-old
+	)
+	kde4? (
+		|| (
+			kde-base/kwin:live
+		)
+	)
+	svg? (
+		>=gnome-base/librsvg-2.14.0:2
+		>=x11-libs/cairo-1.0
+	)
+"
+
+RDEPEND="${DEPEND}
+	x11-apps/mesa-progs
+	x11-apps/xvinfo"
+
+DEPEND="${DEPEND}
+	dev-util/pkgconfig
+	x11-proto/damageproto
+	x11-proto/xineramaproto"
+
+src_prepare() {
+
+	use gnome || {
+		epatch "${FILESDIR}"/${PN}-no-gconf.patch
+		ln -s /usr/share/aclocal/gconf-2.m4 acinclude.m4
+
+		# required to apply the above patch
+		intltoolize --copy --force || die "intltoolize failed"
+		eautoreconf || die "eautoreconf failed"
+	}
+}
+
+src_configure() {
+	econf \
+		--disable-gnome-keybindings \
+		--enable-librsvg \
+		--with-default-plugins \
+		$(use_enable cairo annotate) \
+		$(use_enable dbus) \
+		$(use_enable dbus dbus-glib) \
+		$(use_enable fuse) \
+		$(use_enable gnome) \
+		$(use_enable gnome gconf) \
+		$(use_enable gnome metacity) \
+		$(use_enable gtk) \
+		$(use_enable kde) \
+		$(use_enable kde4) \
+		|| die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# Install compiz-manager
+	dobin "${FILESDIR}/compiz-manager" || die "dobin failed"
+
+	# Add the full-path to lspci
+	sed -i "s#lspci#/usr/sbin/lspci#" "${D}/usr/bin/compiz-manager"
+
+	# Fix the hardcoded lib paths
+	sed -i "s#/lib/#/$(get_libdir)/#g" "${D}/usr/bin/compiz-manager"
+
+	# Create gentoo's config file
+	dodir /etc/xdg/compiz
+
+	cat <<- EOF > "${D}/etc/xdg/compiz/compiz-manager"
+	COMPIZ_BIN_PATH="/usr/bin/"
+	PLUGIN_PATH="/usr/$(get_libdir)/compiz/"
+	LIBGL_NVIDIA="/usr/$(get_libdir)/opengl/xorg-x11/libGL.so.1.2"
+	LIBGL_FGLRX="/usr/$(get_libdir)/opengl/xorg-x11/libGL.so.1.2"
+	KWIN="$(type -p kwin)"
+	METACITY="$(type -p metacity)"
+	SKIP_CHECKS="yes"
+	EOF
+
+	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
+}
+
+pkg_postinst() {
+	use gnome && gnome2_gconf_install
+
+	ewarn "If you update to x11-wm/metacity-2.24 after you install ${P},"
+	ewarn "gtk-window-decorator will crash until you reinstall ${PN} again."
+}
+
+pkg_prerm() {
+	use gnome && gnome2_gconf_uninstall
+}
diff --git a/x11-wm/compiz/compiz-9999.ebuild b/x11-wm/compiz/compiz-9999.ebuild
new file mode 100644
index 0000000..e68402d
--- /dev/null
+++ b/x11-wm/compiz/compiz-9999.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit autotools eutils gnome2-utils git multilib
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/app/compiz"
+
+DESCRIPTION="3D composite- and windowmanager"
+HOMEPAGE="http://www.compiz.org/"
+SRC_URI=""
+
+LICENSE="GPL-2 LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="+cairo dbus fuse gnome gtk kde kde4 +svg"
+
+COMMONDEPEND="
+	dev-libs/glib:2
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=media-libs/glitz-0.5.6
+	media-libs/libpng
+	>=media-libs/mesa-6.5.1-r1
+	>=x11-base/xorg-server-1.1.1-r1
+	x11-libs/libX11[xcb]
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libICE
+	x11-libs/libSM
+	>=x11-libs/libXrender-0.8.4
+	>=x11-libs/startup-notification-0.7
+	cairo? (
+		x11-libs/cairo[X]
+	)
+	dbus? ( >=sys-apps/dbus-1.0 )
+	fuse? ( sys-fs/fuse )
+	gnome? (
+		>=gnome-base/gnome-control-center-2.16.1:2
+		gnome-base/gnome-desktop
+		gnome-base/gconf:2
+	)
+	gtk? (
+		>=x11-libs/gtk+-2.8.0:2
+		>=x11-libs/libwnck-2.18.3
+		x11-libs/pango
+	)
+	kde? (
+		|| ( kde-base/kwin:3.5
+			kde-base/kdebase:3.5
+		)
+		dev-libs/dbus-qt3-old
+	)
+	kde4? (
+		|| (
+			kde-base/kwin:4.2
+			kde-base/kwin:live
+		)
+	)
+	svg? (
+		>=gnome-base/librsvg-2.14.0:2
+		>=x11-libs/cairo-1.0
+	)
+"
+
+DEPEND="${COMMONDEPEND}
+	dev-util/pkgconfig
+	x11-proto/damageproto
+	x11-proto/xineramaproto
+"
+
+RDEPEND="${COMMONDEPEND}
+	x11-apps/mesa-progs
+	x11-apps/xvinfo
+"
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	git_src_unpack
+}
+
+src_prepare() {
+	use gnome || {
+
+		epatch "${FILESDIR}"/${PN}-no-gconf.patch
+		ln -s "${ROOT}"/usr/share/aclocal/gconf-2.m4 acinclude.m4
+	}
+
+	# required to apply the above patch
+	intltoolize --copy --force || die "intltoolize failed"
+	eautoreconf || die "eautoreconf failed"
+}
+
+src_configure() {
+	econf \
+		--disable-gnome-keybindings \
+		--enable-librsvg \
+		--with-default-plugins \
+		$(use_enable cairo annotate) \
+		$(use_enable dbus) \
+		$(use_enable dbus dbus-glib) \
+		$(use_enable fuse) \
+		$(use_enable gnome) \
+		$(use_enable gnome gconf) \
+		$(use_enable gnome metacity) \
+		$(use_enable gtk) \
+		$(use_enable kde) \
+		$(use_enable kde4) \
+		|| die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# Install compiz-manager
+	dobin "${FILESDIR}/compiz-manager" || die "dobin failed"
+
+	# Add the full-path to lspci
+	sed -i "s#lspci#/usr/sbin/lspci#" "${D}/usr/bin/compiz-manager"
+
+	# Create gentoo's config file
+	dodir /etc/xdg/compiz
+
+	cat <<- EOF > "${D}/etc/xdg/compiz/compiz-manager"
+	COMPIZ_BIN_PATH="/usr/bin/"
+	PLUGIN_PATH="/usr/$(get_libdir)/compiz/"
+	LIBGL_NVIDIA="/usr/$(get_libdir)/opengl/xorg-x11/libGL.so.1.2"
+	LIBGL_FGLRX="/usr/$(get_libdir)/opengl/xorg-x11/libGL.so.1.2"
+	KWIN="$(type -p kwin)"
+	METACITY="$(type -p metacity)"
+	SKIP_CHECKS="yes"
+	EOF
+
+	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
+}
+
+pkg_preinst() {
+	use gnome && gnome2_gconf_savelist
+}
+
+pkg_postinst() {
+	use gnome && gnome2_gconf_install
+}
diff --git a/x11-wm/compiz/files/compiz-0.7.8-framesvg.patch b/x11-wm/compiz/files/compiz-0.7.8-framesvg.patch
new file mode 100644
index 0000000..a3eb303
--- /dev/null
+++ b/x11-wm/compiz/files/compiz-0.7.8-framesvg.patch
@@ -0,0 +1,77 @@
+diff -p -up compiz-0.7.8/configure.ac.framesvg compiz-0.7.8/configure.ac
+--- compiz-0.7.8/configure.ac.framesvg	2008-11-20 15:58:43.000000000 +0100
++++ compiz-0.7.8/configure.ac	2008-11-20 16:34:25.000000000 +0100
+@@ -487,7 +487,7 @@ if test "x$use_kde4" = "xyes"; then
+   kde4libs=`kde4-config --install lib --expandvars 2>/dev/null`
+   kde4incs=`kde4-config --install include --expandvars 2>/dev/null`
+ 
+-  kde4_test_includes="kdecoration.h kcommondecoration.h kdecorationbridge.h plasma/panelsvg.h"
++  kde4_test_includes="kdecoration.h kcommondecoration.h kdecorationbridge.h plasma/framesvg.h"
+ 
+   dnl Check for KWin headers
+   AC_MSG_CHECKING([for KWin headers])
+diff -p -up compiz-0.7.8/kde/window-decorator-kde4/switcher.cpp.framesvg compiz-0.7.8/kde/window-decorator-kde4/switcher.cpp
+--- compiz-0.7.8/kde/window-decorator-kde4/switcher.cpp.framesvg	2008-08-08 13:20:31.000000000 +0200
++++ compiz-0.7.8/kde/window-decorator-kde4/switcher.cpp	2008-11-20 16:38:10.000000000 +0100
+@@ -30,7 +30,7 @@
+ 
+ #include <fixx11h.h>
+ 
+-#include <KDE/Plasma/PanelSvg>
++#include <KDE/Plasma/FrameSvg>
+ #include <KDE/Plasma/Theme>
+ 
+ #include <kwindowsystem.h>
+@@ -46,9 +46,9 @@ mId (id)
+     QColor   color;
+     color = Plasma::Theme::defaultTheme ()->color (Plasma::Theme::TextColor);
+ 
+-    mBackground = new Plasma::PanelSvg();
++    mBackground = new Plasma::FrameSvg();
+     mBackground->setImagePath ("dialogs/background");
+-    mBackground->setEnabledBorders(Plasma::PanelSvg::AllBorders);
++    mBackground->setEnabledBorders(Plasma::FrameSvg::AllBorders);
+ 
+     mBorder.left   = mBackground->marginSize(Plasma::LeftMargin);
+     mBorder.right  = mBackground->marginSize(Plasma::RightMargin);
+@@ -131,8 +131,8 @@ KWD::Switcher::redrawPixmap ()
+     p.setCompositionMode (QPainter::CompositionMode_Source);
+     p.setRenderHint (QPainter::SmoothPixmapTransform);
+ 
+-    mBackground->resizePanel (QSizeF (contentWidth, contentHeight));
+-    mBackground->paintPanel (&p, QRect (0, 0, contentWidth,
++    mBackground->resizeFrame (QSizeF (contentWidth, contentHeight));
++    mBackground->paintFrame (&p, QRect (0, 0, contentWidth,
+ 			contentHeight));
+ 
+     mBackgroundPixmap = mPixmap.copy (mBorder.left, mBorder.top,
+@@ -168,7 +168,7 @@ KWD::Switcher::update ()
+     p.setCompositionMode (QPainter::CompositionMode_Source);
+ 
+ 
+-    mBackground->paintPanel (&p, QRect (mBorder.left, mBorder.top +
++    mBackground->paintFrame (&p, QRect (mBorder.left, mBorder.top +
+ 			mGeometry.height () + 5, mGeometry.width (),
+ 			fm.height ()));
+ 
+diff -p -up compiz-0.7.8/kde/window-decorator-kde4/switcher.h.framesvg compiz-0.7.8/kde/window-decorator-kde4/switcher.h
+--- compiz-0.7.8/kde/window-decorator-kde4/switcher.h.framesvg	2008-08-08 13:20:31.000000000 +0200
++++ compiz-0.7.8/kde/window-decorator-kde4/switcher.h	2008-11-20 16:36:22.000000000 +0100
+@@ -30,7 +30,7 @@
+ 
+ namespace Plasma
+ {
+-class PanelSvg;
++class FrameSvg;
+ }
+ 
+ class QSpacerItem;
+@@ -70,7 +70,7 @@ class Switcher
+ 
+ 	QRect mGeometry;
+ 
+-	Plasma::PanelSvg *mBackground;
++	Plasma::FrameSvg *mBackground;
+ 	QPixmap mPixmap;
+ 	QPixmap mBackgroundPixmap;
+ 
diff --git a/x11-wm/compiz/files/compiz-0.7.8-metacity-2.25.patch b/x11-wm/compiz/files/compiz-0.7.8-metacity-2.25.patch
new file mode 100644
index 0000000..676181f
--- /dev/null
+++ b/x11-wm/compiz/files/compiz-0.7.8-metacity-2.25.patch
@@ -0,0 +1,46 @@
+From: Christopher Williams <crdlb@compiz-fusion.org>
+Date: Wed, 11 Feb 2009 08:23:11 +0000 (+0100)
+Subject: Fix compatibility with newer libmetacity-private versions. GtkStyle is colormap speci... 
+X-Git-Url: http://gitweb.compiz-fusion.org/?p=compiz%2Fcore;a=commitdiff_plain;h=27cc9c5178921ce6d6266f4b00303913163be7ee
+
+Fix compatibility with newer libmetacity-private versions. GtkStyle is colormap specific, so we can't use a new colormap each time we create a pixmap.
+---
+
+diff --git a/gtk/window-decorator/gtk-window-decorator.c b/gtk/window-decorator/gtk-window-decorator.c
+index dd7ee68..91f676c 100644
+--- a/gtk/window-decorator/gtk-window-decorator.c
++++ b/gtk/window-decorator/gtk-window-decorator.c
+@@ -673,32 +673,10 @@ static GdkPixmap *
+ create_pixmap (int w,
+ 	       int h)
+ {
+-    GdkPixmap	*pixmap;
+-    GdkVisual	*visual;
+-    GdkColormap *colormap;
+-
+-    visual = gdk_visual_get_best_with_depth (32);
+-    if (!visual)
+-	return NULL;
+-
+     if (w == 0 || h ==0)
+ 	abort ();
+ 
+-    pixmap = gdk_pixmap_new (NULL, w, h, 32);
+-    if (!pixmap)
+-	return NULL;
+-
+-    colormap = gdk_colormap_new (visual, FALSE);
+-    if (!colormap)
+-    {
+-	g_object_unref (G_OBJECT (pixmap));
+-	return NULL;
+-    }
+-
+-    gdk_drawable_set_colormap (GDK_DRAWABLE (pixmap), colormap);
+-    g_object_unref (G_OBJECT (colormap));
+-
+-    return pixmap;
++    return gdk_pixmap_new (GDK_DRAWABLE (style_window->window), w, h, 32);
+ }
+ 
+ #define CORNER_TOPLEFT     (1 << 0)
diff --git a/x11-wm/compiz/files/compiz-drop-xcb.patch b/x11-wm/compiz/files/compiz-drop-xcb.patch
new file mode 100644
index 0000000..244948c
--- /dev/null
+++ b/x11-wm/compiz/files/compiz-drop-xcb.patch
@@ -0,0 +1,50 @@
+diff --git a/configure.ac b/configure.ac
+index 8a45698..d82e5f7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -118,8 +118,7 @@ AC_SUBST(imagedir)
+ metadatadir=$datadir/compiz
+ AC_SUBST(metadatadir)
+ 
+-COMPIZ_REQUIRES="x11-xcb    \
+-		 xcomposite \
++COMPIZ_REQUIRES="xcomposite \
+ 		 xfixes	    \
+ 		 xdamage    \
+ 		 xrandr	    \
+diff --git a/include/compiz-core.h b/include/compiz-core.h
+index ade40c5..47cac9c 100644
+--- a/include/compiz-core.h
++++ b/include/compiz-core.h
+@@ -33,7 +33,7 @@
+ #include <stdio.h>
+ #include <sys/time.h>
+ 
+-#include <X11/Xlib-xcb.h>
++#include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ #include <X11/extensions/Xdamage.h>
+ #include <X11/extensions/Xcomposite.h>
+@@ -716,8 +716,6 @@ typedef void (*FiniPluginForDisplayProc) (CompPlugin  *plugin,
+ struct _CompDisplay {
+     CompObject object;
+ 
+-    xcb_connection_t *connection;
+-
+     Display    *display;
+     CompScreen *screens;
+ 
+diff --git a/include/compiz.h b/include/compiz.h
+diff --git a/src/display.c b/src/display.c
+index 57cd520..9d9a3e1 100644
+--- a/src/display.c
++++ b/src/display.c
+@@ -2064,8 +2064,6 @@ addDisplay (const char *name)
+ 	return FALSE;
+     }
+ 
+-    d->connection = XGetXCBConnection (dpy);
+-
+     if (!compInitDisplayOptionsFromMetadata (d,
+ 					     &coreMetadata,
+ 					     coreDisplayOptionInfo,
diff --git a/x11-wm/compiz/files/compiz-manager b/x11-wm/compiz/files/compiz-manager
new file mode 100644
index 0000000..3fbae21
--- /dev/null
+++ b/x11-wm/compiz/files/compiz-manager
@@ -0,0 +1,384 @@
+#!/bin/sh
+# Compiz Manager wrapper script
+# 
+# Copyright (c) 2007 Kristian Lyngstøl <kristian@bohemians.org>
+#
+# 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.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+#
+# Contributions by: Treviño (3v1n0) <trevi55@gmail.com>, Ubuntu Packages
+#
+# Much of this code is based on Beryl code, also licensed under the GPL.
+# This script will detect what options we need to pass to compiz to get it
+# started, and start a default plugin and possibly window decorator.
+# 
+
+
+COMPIZ_BIN_PATH="/usr/bin/" # For window decorators and compiz
+PLUGIN_PATH="/usr/lib/compiz/" 
+GLXINFO="/usr/bin/glxinfo"
+KWIN="/usr/bin/kwin"
+METACITY="/usr/bin/metacity"
+COMPIZ_NAME="compiz" # Final name for compiz (compiz.real) 
+
+# For Xgl LD_PRELOAD
+LIBGL_NVIDIA="/usr/lib/nvidia/libGL.so.1.2.xlibmesa"
+LIBGL_FGLRX="/usr/lib/fglrx/libGL.so.1.2.xlibmesa"
+
+# Minimum amount of memory (in kilo bytes) that nVidia cards need
+# to be allowed to start
+# Set to 262144 to require 256MB
+NVIDIA_MEMORY="65536" # 64MB
+NVIDIA_SETTINGS="nvidia-settings" # Assume it's in the path by default
+
+# For detecting what driver is in use, the + is for one or more /'s
+XORG_DRIVER_PATH="/usr/lib/xorg/modules/drivers/+"
+
+FALLBACKWM="${METACITY}"
+FALLBACKWM_OPTIONS="--replace $@"
+
+# Driver whitelist
+WHITELIST="nvidia intel ati radeon i810"
+
+# blacklist based on the pci ids 
+# See http://wiki.compiz-fusion.org/Hardware/Blacklist for details
+T="   1002:5954 1002:5854 1002:5955" # ati rs480
+T="$T 1002:4153" # ATI Rv350
+T="$T 8086:2982 8086:2992 8086:29a2 8086:2a02 8086:2a12"  # intel 965
+BLACKLIST_PCIIDS="$T"
+unset T
+
+COMPIZ_OPTIONS="--ignore-desktop-hints --replace"
+COMPIZ_PLUGINS=""
+ENV=""
+
+# Use emerald by default if it exist
+USE_EMERALD="yes"
+
+# No indirect by default
+INDIRECT="no"
+
+# Default X.org log if xset q doesn't reveal it
+XORG_DEFAULT_LOG="/var/log/Xorg.0.log"
+
+# Set to yes to enable verbose
+VERBOSE="yes"
+
+# Echos the arguments if verbose
+verbose()
+{
+	if [ "x$VERBOSE" = "xyes" ]; then
+		printf "$*"
+	fi
+}
+
+# abort script and run fallback windowmanager
+abort_with_fallback_wm()
+{
+	if [ "x$SKIP_CHECKS" = "xyes" ]; then
+		verbose "SKIP_CHECKS is yes, so continuing despite problems.\n"
+		return 0;
+	fi
+
+	verbose "aborting and using fallback: $FALLBACKWM \n"
+
+	if [ -x $FALLBACKWM ]; then
+		exec $FALLBACKWM $FALLBACKWM_OPTIONS
+	else
+		printf "no $FALLBACKWM found, exiting\n"
+		exit 1
+	fi
+}
+
+# Check for non power of two texture support
+check_npot_texture()
+{
+	verbose "Checking for non power of two support: "
+	if glxinfo 2> /dev/null | egrep -q '(GL_ARB_texture_non_power_of_two|GL_NV_texture_rectangle|GL_EXT_texture_rectangle|GL_ARB_texture_rectangle)' ; then
+		verbose "present. \n";
+		return 0;
+	else
+		verbose "Not present. \n"
+		return 1;
+	fi
+
+}
+
+# Check for presence of FBConfig
+check_fbconfig()
+{
+	verbose "Checking for FBConfig: "
+	if [ "$INDIRECT" = "yes" ]; then
+		$GLXINFO -i | grep -q GLX.*fbconfig 
+		FB=$?
+	else
+		$GLXINFO | grep -q GLX.*fbconfig 
+		FB=$?
+	fi
+
+	if [ $FB = "0" ]; then
+		unset FB
+		verbose "present. \n"
+		return 0;
+	else
+		unset FB
+		verbose "not present. \n"
+		return 1;
+	fi
+}
+
+
+# Check for TFP
+check_tfp()
+{
+	verbose "Checking for texture_from_pixmap: "
+	if [ $($GLXINFO 2>/dev/null | grep GLX_EXT_texture_from_pixmap -c) -gt 2 ] ; then
+		verbose "present. \n"
+		return 0;
+	else
+		verbose "not present. \n"
+		if [ "$INDIRECT" = "yes" ]; then
+			unset LIBGL_ALWAYS_INDIRECT
+			INDIRECT="no"
+			return 1;
+		else
+			verbose "Trying again with indirect rendering:\n";
+			INDIRECT="yes"
+			export LIBGL_ALWAYS_INDIRECT=1
+			check_tfp;
+			return $?
+		fi
+	fi
+}
+
+# Check wether the composite extension is present
+check_composite()
+{
+	verbose "Checking for Composite extension: "
+	if xdpyinfo -queryExtensions | grep -q Composite ; then
+		verbose "present. \n";
+		return 0;
+	else
+		verbose "not present. \n";
+		return 1;
+	fi
+}
+
+# Detects if Xgl is running
+check_xgl()
+{
+	verbose "Checking for Xgl: "
+	if xvinfo | grep -q Xgl ; then
+		verbose "present. \n"
+		return 0;
+	else
+		verbose "not present. \n"
+		return 1;
+	fi
+}
+
+# Check if the nVidia card has enough video ram to make sense
+check_nvidia_memory()
+{
+	MEM=$(${NVIDIA_SETTINGS} -q VideoRam | egrep Attribute\ \'VideoRam\'\ .*: | cut -d: -f3 | sed 's/[^0-9]//g')
+	if [ $MEM -lt $NVIDIA_MEMORY ]; then
+		verbose "Less than ${NVIDIA_MEMORY}kb of memory and nVidia";
+		return 1;
+	fi
+	return 0;
+}
+
+# Check for existence if NV-GLX
+check_nvidia()
+{
+	if [ ! -z $NVIDIA_INTERNAL_TEST ]; then
+		return $NVIDIA_INTERNAL_TEST;
+	fi
+	verbose "Checking for nVidia: "
+	if xdpyinfo | grep -q NV-GLX ; then
+		verbose "present. \n"
+		NVIDIA_INTERNAL_TEST=0
+		return 0;
+	else
+		verbose "not present. \n"
+		NVIDIA_INTERNAL_TEST=1
+		return 1;
+	fi
+}
+
+# Check if the max texture size is large enough compared to the resolution
+check_texture_size()
+{
+	TEXTURE_LIMIT=$(glxinfo -l | grep GL_MAX_TEXTURE_SIZE | sed 's/.*=[^0-9]//g')
+	RESOLUTION=$(xdpyinfo  | grep -i dimensions: | sed 's/[^0-9]*pixels.*(.*).*//' | sed 's/[^0-9x]*//')
+	VRES=$(echo $RESOLUTION | sed 's/.*x//')
+	HRES=$(echo $RESOLUTION | sed 's/x.*//')
+	verbose "Comparing resolution ($RESOLUTION) to maximum 3D texture size ($TEXTURE_LIMIT): ";
+	if [ $VRES -gt $TEXTURE_LIMIT ] || [ $HRES -gt $TEXTURE_LIMIT ]; then
+		verbose "Failed.\n"
+		return 1;
+	fi
+	verbose "Passed.\n"
+	return 0
+}
+
+# check driver whitelist
+running_under_whitelisted_driver()
+{
+	LOG=$(xset q|grep "Log file"|awk '{print $3}')
+	if [ "$LOG" = "" ]; then
+	    verbose "xset q doesn't reveal the location of the log file. Using fallback $XORG_DEFAULT_LOG \n"
+	    LOG=$XORG_DEFAULT_LOG;
+	fi
+	if [ -z "$LOG" ];then
+		verbose "AIEEEEH, no Log file found \n"
+		verbose "$(xset q) \n"
+	return 0
+	fi
+	for DRV in ${WHITELIST}; do
+		if egrep -q "Loading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG &&
+		   ! egrep -q "Unloading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG; 
+		then
+			return 0
+		fi
+	done
+	verbose "No whitelisted driver found\n"
+	return 1
+}
+
+# check pciid blacklist
+have_blacklisted_pciid()
+{
+	OUTPUT=$(lspci -n)
+	for ID in ${BLACKLIST_PCIIDS}; do
+		if echo "$OUTPUT" | egrep -q "$ID"; then
+			verbose "Blacklisted PCIID '$ID' found \n"
+			return 0
+		fi
+	done
+	OUTPUT=$(lspci -vn | grep -i VGA)
+	verbose "Detected PCI ID for VGA: $OUTPUT\n"
+	return 1
+}
+
+build_env()
+{
+	if check_nvidia; then
+		ENV="__GL_YIELD=NOTHING "
+	fi
+	if [ "$INDIRECT" = "yes" ]; then
+		ENV="$ENV LIBGL_ALWAYS_INDIRECT=1 "
+	fi
+	if check_xgl; then
+		if [ -f ${LIBGL_NVIDIA} ]; then
+			ENV="$ENV LD_PRELOAD=${LIBGL_NVIDIA}"
+			verbose "Enabling Xgl with nVidia drivers...\n"
+		fi
+		if [ -f ${LIBGL_FGLRX} ]; then
+			ENV="$ENV LD_PRELOAD=${LIBGL_FGLRX}"
+			verbose "Enabling Xgl with fglrx ATi drivers...\n"
+		fi
+	fi
+
+	ENV="$ENV FROM_WRAPPER=yes"
+
+	if [ -n "$ENV" ]; then
+		export $ENV
+	fi
+}
+
+build_args()
+{
+	if [ $INDIRECT = "yes" ]; then
+		COMPIZ_OPTIONS="$COMPIZ_OPTIONS --indirect-rendering "
+	fi
+	if check_nvidia; then
+		COMPIZ_OPTIONS="$COMPIZ_OPTIONS --loose-binding"
+	fi
+}
+
+####################
+# Execution begins here.
+
+# Read configuration from XDG paths
+if [ -z "$XDG_CONFIG_DIRS" ]; then
+	test -f /etc/xdg/compiz/compiz-manager && . /etc/xdg/compiz/compiz-manager
+else
+	test -f $XDG_CONFIG_DIRS/compiz/compiz-manager && . $XDG_CONFIG_DIRS/compiz/compiz-manager
+fi
+
+if [ -z "$XDG_CONFIG_HOME" ]; then
+	test -f $HOME/.config/compiz/compiz-manager && . $HOME/.config/compiz/compiz-manager
+else
+	test -f $XDG_CONFIG_HOME/compiz/compiz-manager && .  $XDG_CONFIG_HOME/compiz/compiz-manager
+fi
+
+# Don't use compiz when running the failsafe session
+if [ "x$GNOME_DESKTOP_SESSION_ID" = "xFailsafe" ]; then
+	abort_with_fallback_wm
+fi
+
+if [ "x$LIBGL_ALWAYS_INDIRECT" = "x1" ]; then
+	INDIRECT="yes";
+fi
+
+# if we run under Xgl, we can skip some tests here
+if ! check_xgl; then
+	# if vesa or vga are in use, do not even try glxinfo (LP#119341)
+	if ! running_under_whitelisted_driver || have_blacklisted_pciid; then
+		abort_with_fallback_wm
+	fi
+	# check if we have the required bits to run compiz and if not, 
+	# fallback
+	if ! check_tfp || ! check_npot_texture || ! check_composite || ! check_texture_size; then
+		abort_with_fallback_wm
+	fi
+
+	if check_nvidia && ! check_nvidia_memory; then
+		abort_with_fallback_wm
+	fi
+
+	if ! check_fbconfig; then
+		abort_with_fallback_wm
+	fi
+fi
+
+# load the ccp plugin if present and fallback to plain gconf if not
+if [ -f ${PLUGIN_PATH}libccp.so ]; then
+	COMPIZ_PLUGINS="$COMPIZ_PLUGINS ccp"
+elif [ -f ${PLUGIN_PATH}libgconf.so ]; then
+	COMPIZ_PLUGINS="$COMPIZ_PLUGINS glib gconf"
+fi
+
+# get environment
+build_env
+build_args
+
+# start the gtk-window-decorator if present
+if [ -x ${COMPIZ_BIN_PATH}emerald ] && [ "$USE_EMERALD" = "yes" ]; then
+	verbose "Starting emerald\n"
+	${COMPIZ_BIN_PATH}emerald --replace &
+elif [ -x ${COMPIZ_BIN_PATH}gtk-window-decorator ] && [ -n "$GNOME_DESKTOP_SESSION_ID" ]; then
+	verbose "Starting gtk-window-decorator\n"
+	${COMPIZ_BIN_PATH}gtk-window-decorator --replace &
+elif [ -x ${COMPIZ_BIN_PATH}kde-window-decorator ] && [ -n "$KDE_FULL_SESSION" ]; then
+	verbose "Starting kde-window-decorator\n"
+	${COMPIZ_BIN_PATH}kde-window-decorator --replace &
+	FALLBACKWM="${KWIN}"
+fi
+
+${COMPIZ_BIN_PATH}${COMPIZ_NAME} $COMPIZ_OPTIONS "$@" $COMPIZ_PLUGINS || exec $FALLBACKWM $FALLBACKWM_OPTIONS
+
diff --git a/x11-wm/compiz/files/compiz-no-gconf.patch b/x11-wm/compiz/files/compiz-no-gconf.patch
new file mode 100644
index 0000000..d43e84d
--- /dev/null
+++ b/x11-wm/compiz/files/compiz-no-gconf.patch
@@ -0,0 +1,20 @@
+ configure.ac |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7b09153..9c22ea0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -192,10 +192,10 @@ if test "x$use_gconf" = "xyes"; then
+   if test x"$GCONFTOOL" = xno; then
+     AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
+   fi
++else
++  AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, test "x$use_gconf" = "xyes")
+ fi
+ 
+-AM_GCONF_SOURCE_2
+-
+ AM_CONDITIONAL(USE_GCONF, test "x$use_gconf" = "xyes")
+ if test "$use_gconf" = yes; then
+   AC_DEFINE(USE_GCONF, 1, [Build gconf plugin])
diff --git a/x11-wm/compiz/files/compiz-start b/x11-wm/compiz/files/compiz-start
new file mode 100644
index 0000000..161068b
--- /dev/null
+++ b/x11-wm/compiz/files/compiz-start
@@ -0,0 +1,41 @@
+# compiz-start script
+#
+# hacky autodetection of neccessary options for XGL/AIGLX/NVIDIA
+#
+# Hanno Boeck, http://www.hboeck.de/
+#
+# Licensed under the same conditions as compiz itself (MIT or GPL)
+
+if [ ! -x /usr/bin/glxinfo ]; then
+	echo "glxinfo not found, please install mesa-progs."
+	exit -1
+fi
+
+GLX_WITH_DIRECT=`glxinfo|grep -c GLX_EXT_texture_from_pixmap`
+GLX_WITH_INDIRECT=`LIBGL_ALWAYS_INDIRECT=1 glxinfo|grep -c GLX_EXT_texture_from_pixmap`
+GLX_RENDER=`glxinfo|grep -c "OpenGL renderer string: Mesa GLX Indirect"`
+
+
+COMPIZ_OPTIONS="--replace"
+
+if [ $GLX_WITH_DIRECT -eq 3 ]; then
+	if [ $GLX_RENDER -eq 0 ]; then
+		echo NVIDA detected
+		export __GL_YIELD="NOTHING" 
+	else
+		echo XGL detected
+	fi
+elif [ $GLX_WITH_INDIRECT -eq 3 ]; then
+	echo AIGLX detected
+	export LIBGL_ALWAYS_INDIRECT=1
+fi
+
+if [ ! -z $KDE_FULL_SESSION ] && [ -x /usr/bin/kde-window-decorator ]; then
+	echo Using KDE decorator
+	kde-window-decorator --replace &
+else
+	echo Using GTK decorator
+	gtk-window-decorator --replace &
+fi
+
+compiz $COMPIZ_OPTIONS gconf move resize minimize place decoration wobbly fade cube rotate scale switcher zoom dbus