diff --git a/app-arch/kio_rar/Manifest b/app-arch/kio_rar/Manifest
new file mode 100644
index 0000000..d7d91ec
--- /dev/null
+++ b/app-arch/kio_rar/Manifest
@@ -0,0 +1,6 @@
+MD5 f0b16a60647231c55ba0735f60a055d7 files/digest-kio_rar-0.6 256
+RMD160 cb40be2434be0b4fbe142ce5ad837d44fdf2b67b files/digest-kio_rar-0.6 256
+SHA256 a3becd9e2e80645d5e4dbc921b33aed4a28b70a5652c1c41fefe61c6c0182629 files/digest-kio_rar-0.6 256
+MD5 3a2282d3075c408f7a579e59b937c6b2 kio_rar-0.6.ebuild 347
+RMD160 db0fff0ba52189ba454fe93eb95e03f6ff02b4ad kio_rar-0.6.ebuild 347
+SHA256 af34a8c76fd5d2f96d2499229eff14b0f9cfe99b3b026446a9f52323b20b2481 kio_rar-0.6.ebuild 347
diff --git a/app-arch/kio_rar/files/digest-kio_rar-0.6 b/app-arch/kio_rar/files/digest-kio_rar-0.6
new file mode 100644
index 0000000..c78e54f
--- /dev/null
+++ b/app-arch/kio_rar/files/digest-kio_rar-0.6
@@ -0,0 +1,3 @@
+MD5 670c4a3cce504be4224e35de3d996148 17527-kio_rar-0.6.tar.bz2 460187
+RMD160 013b1099be7f3dd61027d80ad60f232b473d2f57 17527-kio_rar-0.6.tar.bz2 460187
+SHA256 ee1e3a342a88735e95668e17abaa12556c75ed4c2729001c6ccecbcfad076e3b 17527-kio_rar-0.6.tar.bz2 460187
diff --git a/app-arch/kio_rar/kio_rar-0.6.ebuild b/app-arch/kio_rar/kio_rar-0.6.ebuild
new file mode 100644
index 0000000..31d8ab4
--- /dev/null
+++ b/app-arch/kio_rar/kio_rar-0.6.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+
+inherit kde
+
+DESCRIPTION="A kioslave for RAR archives"
+HOMEPAGE="http://www.kde-apps.org/content/show.php?content=17527"
+SRC_URI="http://www.kde-apps.org/content/files/17527-${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="x86 amd64"
+
+need-kde 3
diff --git a/app-laptop/khdapsmon/khdapsmon-0.1.2.ebuild b/app-laptop/khdapsmon/khdapsmon-0.1.2.ebuild
new file mode 100644
index 0000000..fc5f3a1
--- /dev/null
+++ b/app-laptop/khdapsmon/khdapsmon-0.1.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+#
+# Thank you to Tobias Roeser <le.petit.fou at web.de> for working on
+# this ebuild.
+
+inherit kde
+
+MY_P=${P/-/_}
+RELNR=2
+
+DESCRIPTION="KDE-based monitor for the IBM HDAPS system."
+HOMEPAGE="http://www.oakcourt.dyndns.org/projects/khdapsmon/"
+SRC_URI="http://www.oakcourt.dyndns.org/projects/khdapsmon/${MY_P}-${RELNR}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+need-kde 3.3
+
+pkg_postinst() {
+        einfo
+        einfo "To autoload the required kernel module at system startup type"
+        einfo
+        einfo "  # echo \"hdaps\" >> /etc/modules.autoload.d/kernel-2.6"
+        einfo
+}
diff --git a/dev-java/gnu-classpath/Manifest b/dev-java/gnu-classpath/Manifest
new file mode 100644
index 0000000..018acb0
--- /dev/null
+++ b/dev-java/gnu-classpath/Manifest
@@ -0,0 +1,6 @@
+MD5 9116576687153c82996c52974a42055f files/digest-gnu-classpath-0.90 247
+RMD160 e73cf0c9a30616c77a889131831c75f438847d32 files/digest-gnu-classpath-0.90 247
+SHA256 3d292ab35abca43e6a7259848428839997f9a5c7c41398d762edaefe9712ec73 files/digest-gnu-classpath-0.90 247
+MD5 61dc80cb60759589f761b2e52b51112b gnu-classpath-0.90.ebuild 2335
+RMD160 e0fb390858a48882417cf08c150e2d9c88135aa7 gnu-classpath-0.90.ebuild 2335
+SHA256 4a69c0c4550bb95f63dd8ee6f4b17f9925783751c3c3b41fab99534c78729f62 gnu-classpath-0.90.ebuild 2335
diff --git a/dev-java/gnu-classpath/files/digest-gnu-classpath-0.90 b/dev-java/gnu-classpath/files/digest-gnu-classpath-0.90
new file mode 100644
index 0000000..5c4652d
--- /dev/null
+++ b/dev-java/gnu-classpath/files/digest-gnu-classpath-0.90
@@ -0,0 +1,3 @@
+MD5 cf5aaaf07fe43567fa605b33165355d7 classpath-0.90.tar.gz 7930836
+RMD160 e108fb537610ae993d1968d606aa43e6f804a402 classpath-0.90.tar.gz 7930836
+SHA256 4f2824c42062dea269e489c1acb2769c015bf78cdaa929ee75441d412f10a03b classpath-0.90.tar.gz 7930836
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.90.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.90.ebuild
new file mode 100644
index 0000000..8e2657d
--- /dev/null
+++ b/dev-java/gnu-classpath/gnu-classpath-0.90.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.20.ebuild,v 1.3 2006/02/05 14:25:43 betelgeuse Exp $
+
+inherit eutils
+
+MY_P=${P/gnu-/}
+DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the Java programming language"
+SRC_URI="ftp://ftp.gnu.org/gnu/classpath/${MY_P}.tar.gz"
+HOMEPAGE="http://www.gnu.org/software/classpath"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+
+# Add the doc use flag after the upstream build system is improved
+# See their bug 24025
+
+IUSE="alsa cairo debug dssi examples gtk xml2"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+		dssi? ( >=media-libs/dssi-0.9 )
+		gtk? ( >=x11-libs/gtk+-2.4
+				>=dev-libs/glib-2.0
+				|| ( (
+					   x11-libs/libICE
+					   x11-libs/libSM
+					   x11-libs/libX11
+					   x11-libs/libXtst
+					 )
+				     virtual/x11
+				   )
+				cairo? ( >=x11-libs/cairo-0.5.0 )
+		     )
+		xml2? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )"
+
+DEPEND="app-arch/zip
+		dev-java/jikes
+		gtk? ( || ( (
+					  x11-libs/libXrender
+					  x11-proto/xextproto
+					  x11-proto/xproto
+					)
+					virtual/x11
+				  )
+			 )
+		${REPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+	# Note: This is written in a way to easily support GCJ and other compilers
+	# at a later point. Currently Gentoo uses mainly GCJ 3.3 (from the
+	# corresponding GCC) which cannot compile GNU Classpath correctly.
+	# Another possibility would be ECJ (from Eclipse).
+	local compiler="--with-gcj"
+
+	econf ${compiler} \
+		$(use_enable alsa) \
+		$(use_enable cairo gtk-cairo) \
+		$(use_enable debug ) \
+		$(use_enable examples) \
+		$(use_enable gtk gtk-peer) \
+		$(use_enable xml2 xmlj) \
+		$(use_enable dssi ) \
+		|| die "configure failed"
+# disabled for now... see above.
+#		$(use_with   doc   gjdoc) \
+
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO
+}
+
+pkg_postinst() {
+	if use gtk && use cairo; then
+		einfo "GNU Classpath was compiled with preliminary cairo support."
+		einfo "To use that functionality set the system property"
+		einfo "gnu.java.awt.peer.gtk.Graphics to Graphics2D at runtime."
+	fi
+}
diff --git a/dev-util/eclipse-sdk/Manifest b/dev-util/eclipse-sdk/Manifest
deleted file mode 100644
index 910e66b..0000000
--- a/dev-util/eclipse-sdk/Manifest
+++ /dev/null
@@ -1,27 +0,0 @@
-MD5 d315274aee3541c9394e25754c6cc170 eclipse-sdk-3.1.2.ebuild 10393
-RMD160 7e585ddfd4f61bc7703eb57c6287199853c432d3 eclipse-sdk-3.1.2.ebuild 10393
-SHA256 9fd84473fb6871825bb14bd4e777580ffad40e6d1adb8e871216ea0d909d8a68 eclipse-sdk-3.1.2.ebuild 10393
-MD5 ab0f6620b4767e065bd533b06245b0fc files/01-distribute_ant_target-2.1.patch 1103
-RMD160 b1e41e2a202fcd91135b9df0573b3611c27bc046 files/01-distribute_ant_target-2.1.patch 1103
-SHA256 98b71329db9aae0bbeef88613939c68a9220764e8c207f4301f38a9087e72cd3 files/01-distribute_ant_target-2.1.patch 1103
-MD5 ed33fd609db26b85ef9b0c2a82a06b22 files/01-distribute_ant_target-3.0.patch 726
-RMD160 3e95ebeb60bd16a584945aca923a5edc7cd82156 files/01-distribute_ant_target-3.0.patch 726
-SHA256 11248e25b16ac86634c6da2fd0d33dbff10c31d663aa92ec6db8e29bb111d300 files/01-distribute_ant_target-3.0.patch 726
-MD5 59c18169fdf20b43544bb4891592dce4 files/02-konqueror_help_browser-2.1.patch 1013
-RMD160 4785681bd4c970b344fb163d42d19dd8682ebef7 files/02-konqueror_help_browser-2.1.patch 1013
-SHA256 56212dbd6e8e2ba9ced67e70b04e4b0111acfd7198021ae939286198db7dd244 files/02-konqueror_help_browser-2.1.patch 1013
-MD5 8f66a016be8f50dc8f57353c8207c669 files/03-motif-java1.5-build.patch 1848
-RMD160 274af67bdbfccb89ae4cf6b2ff431f8821c1aeac files/03-motif-java1.5-build.patch 1848
-SHA256 3bd0d4812b95070a807c51c36c4bfd3cf9d1b509484b43b25ea9080e33269707 files/03-motif-java1.5-build.patch 1848
-MD5 79d8cfcfc342234eac01538827998fa2 files/04-amd64-gtk.patch 388
-RMD160 ce337c9a8cd13dd104bdb7f01d1a46aeb966e090 files/04-amd64-gtk.patch 388
-SHA256 f2a492ccc0a24fec3af54e64594ea06814267e6849b0d7d9a31ee80cbdcea67b files/04-amd64-gtk.patch 388
-MD5 3110e7ec528bc98ef251172c2d7e2956 files/05-mozilla-xpcom.patch 862
-RMD160 307f83c9751c7f58a805026a3dff53ff98d26788 files/05-mozilla-xpcom.patch 862
-SHA256 aa188e120d350c55b333cbdcde7fed0a79015d4608a424d48ffcf1735c494648 files/05-mozilla-xpcom.patch 862
-MD5 a9f983102fa1b491ad4c4f154123d509 files/06-path-fixups.patch 4707
-RMD160 9870d6a1c6278d37f1dbbfaf966aef3604fae4e4 files/06-path-fixups.patch 4707
-SHA256 f031191538783d91e8370832ac7b712e47d2d32515d3979bdc409ac46567a4ca files/06-path-fixups.patch 4707
-MD5 0dd05cebf3928888ff566c433da96335 files/digest-eclipse-sdk-3.1.2 310
-RMD160 dea902b88d52673c42f034ab9451e145bc52b30c files/digest-eclipse-sdk-3.1.2 310
-SHA256 01187ce1cad8c9037d48c130cd9d98167d7c934e075d42c7c55f3adae8105749 files/digest-eclipse-sdk-3.1.2 310
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.1.2.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.1.2.ebuild
deleted file mode 100644
index 8c9ed2f..0000000
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.1.2.ebuild
+++ /dev/null
@@ -1,370 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.1.1.ebuild,v 1.1 2005/11/09 19:00:28 axxo Exp $
-
-inherit eutils java-utils
-
-MY_A="eclipse-sourceBuild-srcIncluded-3.1.2.zip"
-DESCRIPTION="Eclipse Tools Platform"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/R-3.1.2-200601181600/${MY_A}"
-IUSE="gnome mozilla firefox jikes nosrc nodoc atk"
-SLOT="3.1"
-LICENSE="CPL-1.0"
-KEYWORDS="~x86 ~ppc ~amd64"
-
-RDEPEND=">=virtual/jre-1.4.2
-	>=x11-libs/gtk+-2.2.4
-	mozilla? ( >=www-client/mozilla-1.7 )
-	atk? ( >=dev-libs/atk-1.6 )
-	firefox? ( >=www-client/mozilla-firefox-1.0.2 )
-	gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* )"
-
-DEPEND="${RDEPEND}
-	>=virtual/jdk-1.4.2
-	jikes? ( >=dev-java/jikes-1.21 )
-	>=dev-java/ant-1.6.2
-	>=dev-java/ant-core-1.6.2-r4
-	>=sys-apps/findutils-4.1.7
-	app-arch/unzip
-	app-arch/zip"
-
-# TODO:
-# - use CFLAGS from make.conf when building native libraries
-#   - must patch eclipse build files
-#   - also submit patch to bugs.eclipse
-# - intergration to eclipse plugin ebuilds most likely broken
-# - ppc support not tested, but not explicitly broken either
-
-pkg_setup() {
-
-	einfo "Checking for sufficient physical RAM"
-	check-ram
-	check-cflags
-
-	java-utils_setup-vm
-
-	java-utils_ensure-vm-version-ge 1 4 2
-
-	# all other gentoo archs match in eclipse build system except amd64
-	if [ ${ARCH} == 'amd64' ] ; then
-		eclipsearch=x86_64
-	else
-		eclipsearch=${ARCH}
-	fi
-
-	# all other gentoo archs match in sun jdk library patch except x86
-	if [ ${ARCH} == 'x86' ] ; then
-		jvmarch=i386
-	else
-		jvmarch=${ARCH}
-	fi
-}
-
-src_unpack() {
-
-	mkdir ${S}
-	cd ${S}
-	unpack ${MY_A} || die "Could not unpack ${MY_A}"
-
-	epatch ${FILESDIR}/06-path-fixups.patch
-
-	einfo "Setting up virtual machine"
-	java-utils_setup-vm
-
-	einfo "Cleaning out prebuilt code"
-	clean-prebuilt-code
-
-	einfo "Patching makefiles"
-	process-makefiles
-
-	patch_amd64_ibm_jvm
-
-}
-
-src_compile() {
-
-	# karltk: this should be handled by the java-pkg eclass in setup-vm 
-	addwrite "/proc/self/maps"
-	addwrite "/proc/cpuinfo"
-	addwrite "/dev/random"
-
-	# Figure out VM, set up ant classpath and native library paths
-	setup-jvm-opts
-
-	${use_gtk} && use mozilla && setup-mozilla-opts
-
-	use jikes && bootstrap_ant_opts="-Dbuild.compiler=jikes"
-
-	einfo "Bootstrapping bootstrap ecj"
-	ant ${bootstrap_ant_opts} -q -f jdtcoresrc/compilejdtcorewithjavac.xml || die "Failed to bootstrap ecj"
-
-	einfo "Bootstrapping ecj"
-	ant -lib jdtcoresrc/ecj.jar -q -f jdtcoresrc/compilejdtcore.xml || die "Failed to bootstrap ecj"
-
-	einfo "Compiling Eclipse -- see ${S}/compilelog.txt for details"
-	ANT_OPTS="-Xmx1024M" \
-		ant -lib jdtcoresrc/ecj.jar -q -f build.xml \
-		-DinstallOs=linux \
-		-DinstallWs=gtk \
-		-DinstallArch=${eclipsearch} \
-		-Dbootclasspath=${bootclasspath} \
-		-Dlibsconfig=true \
-		-DjavacTarget=1.4 \
-		-DjavacSource=1.4 \
-		-DjavacVerbose=false \
-		-DjavacFailOnError=true \
-		-DjavacDebugInfo=true \
-		-DbuildId="Gentoo Linux ${PF}" \
-		|| die "Failed to compile Eclipse"
-
-	cp launchertmp/eclipse eclipse-gtk || die "Cannot find eclipse binary"
-
-	einfo "Creating .desktop entry"
-	create-desktop-entry
-}
-
-src_install() {
-
-	eclipse_dir="/usr/lib/eclipse-${SLOT}"
-
-	dodir /usr/lib
-
-	einfo "Installing features and plugins"
-
-	[ -f result/linux-gtk-${eclipsearch}-sdk.tar.gz ] || die "tar.gz bundle was not built properly!"
-	tar zxf result/linux-gtk-${eclipsearch}-sdk.tar.gz -C ${D}/usr/lib || die "Failed to extract the built package"
-
-
-	mv ${D}/usr/lib/eclipse ${D}/${eclipse_dir}
-
-	insinto ${eclipse_dir}
-
-	# Install launchers and native code
-	exeinto ${eclipse_dir}
-
-	einfo "Installing eclipse-gtk binary"
-	doexe eclipse-gtk || die "Failed to install eclipse binary"
-
-	if use nosrc ; then
-		einfo "Stripping away source code"
-		strip-src
-	fi
-
-	if use nodoc ; then
-		einfo "Stripping away documentation"
-		strip-docs
-	fi
-
-	# Install startup script
-	exeinto /usr/bin
-	doexe ${FILESDIR}/eclipse-${SLOT}
-
-	install-desktop-entry
-
-	doman ${FILESDIR}/eclipse.1
-
-	install-link-files
-}
-
-# -----------------------------------------------------------------------------
-#  Helper functions
-# -----------------------------------------------------------------------------
-
-function setup-mozilla-opts()
-{
-	mozilla_dir="--mozdir-unset---"
-
-	if [ -f ${ROOT}/usr/lib/MozillaFirefox/libgtkembedmoz.so ] ; then
-		einfo "Compiling against www-client/mozilla-firefox"
-		mozilla_dir=/usr/lib/MozillaFirefox
-	elif [ -f ${ROOT}/usr/lib/mozilla/libgtkembedmoz.so ] ; then
-		einfo "Compiling against www-client/mozilla"
-		mozilla_dir=/usr/lib/mozilla
-	else
-		eerror "You have enabled the embedded mozilla component, but no suitable"
-		eerror "provider was found. You need Mozilla or Firefox compiled against"
-		eerror "gtk+ v2.0 or newer."
-		eerror "To merge it, execute 'USE=\"gtk2\" emerge mozilla' as root."
-		eerror "To disable embedded mozilla, remove \"mozilla\" from your USE flags."
-		die "Need Mozilla compiled with gtk+-2.x support"
-	fi
-
-	export GECKO_SDK="${mozilla_dir}"
-	export GECKO_INCLUDES="-include ${GECKO_SDK}/include/mozilla-config.h \
-		-I${GECKO_SDK}/include/nspr \
-		-I${GECKO_SDK}/include/nspr \
-		-I${GECKO_SDK}/include/xpcom \
-		-I${GECKO_SDK}/include/string \
-		-I${GECKO_SDK}/include/embed_base \
-		-I${JAVA_HOME}/include/linux"
-	export GECKO_LIBS="-L${GECKO_SDK} -lgtkembedmoz"
-}
-
-function build-native() {
-	sh features/org.eclipse.platform.launchers/library/gtk/build.sh \
-		-os linux -ws gtk \
-		-arch ${eclipsearch} || die "Failed to build launcher"
-}
-
-function process-makefiles() {
-
-	# Comment out hard-coded JAVA_HOME
-	sed -i 's/^JAVA_HOME/#JAVA_HOME/' plugins/org.eclipse.core.resources.linux/src/Makefile || die "Failed to patch Makefile"
-
-	# Select the set of native libraries to compile
-	local libs="make_swt make_awt make_atk"
-
-	if use gnome ; then
-		einfo "Building GNOME VFS support"
-		libs="${libs} make_gnome"
-	fi
-
-	if use mozilla ; then
-		einfo "Building Mozilla embed support"
-		libs="${libs} make_mozilla"
-	fi
-
-	if use atk ; then
-		einfo "Building ATK support"
-		libs="${libs} make_atk"
-	fi
-
-	sed -i "s/^all:.*/all: ${libs}/" "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak" || die "Failed to patch make_linux.mak"
-}
-
-function create-desktop-entry() {
-
-	cat ${FILESDIR}/eclipse-${SLOT}.desktop | \
-		sed -e "s/@PV@/${PV}/" \
-		> eclipse-${SLOT}.desktop || die "Failed to create desktop entry"
-}
-
-function install-desktop-entry() {
-
-	dodir /usr/share/applications
-	insinto /usr/share/applications
-	doins eclipse-${SLOT}.desktop
-}
-
-function clean-prebuilt-code() {
-
-	find ${S} -type f \( -name '*.class' -o -name '*.so' -o -name '*.so.*' -o -name 'eclipse' \) | xargs rm -f
-}
-
-function get-memory-total() {
-	cat /proc/meminfo | grep MemTotal | sed -r "s/[^0-9]*([0-9]+).*/\1/"
-}
-
-function check-ram() {
-
-	local mem=$(get-memory-total)
-	[ $(get-memory-total) -lt 775000 ] &&
-		(
-		echo
-		ewarn "To build Eclipse, at least 768MB of RAM is recommended."
-		ewarn "Your machine has less RAM. Continuing anyway. If the build"
-		ewarn "stops with an error about invalid memory, increase your swap."
-		echo
-		)
-}
-
-function install-link-files() {
-
-	einfo "Installing link files"
-
-	dodir /usr/lib/eclipse-${SLOT}/links
-
-	echo "path=/opt/eclipse-extensions-3" > ${D}/${eclipse_dir}/links/eclipse-binary-extensions-3.link
-	echo "path=/opt/eclipse-extensions-3.1" > ${D}/${eclipse_dir}/links/eclipse-binary-extensions-3.1.link
-
-	echo "path=/usr/lib/eclipse-extensions-3" > ${D}/${eclipse_dir}/links/eclipse-extensions-3.link
-	echo "path=/usr/lib/eclipse-extensions-3.1" > ${D}/${eclipse_dir}/links/eclipse-extensions-3.1.link
-}
-
-function patch_amd64_ibm_jvm() {
-	# the ibm jdk ebuild should have fixed headers, but until then
-	# we just fix the compiling here (see bug #97421)
-	if [ ${ARCH} == 'amd64' ]; then
-	    if [ ! -z "`java-config --java-version | grep IBM`" ] ; then
-		einfo "Fixing IBM jdk header problem"
-		find plugins -name "make_linux.mak" -print0 | xargs -0 sed -i -e 's/^CFLAGS =/CFLAGS = -D_JNI_IMPORT_OR_EXPORT_= /'
-	    fi
-	fi
-}
-
-function setup-jvm-opts() {
-
-	# Figure out correct boot classpath
-	# karltk: this should be handled by the java-pkg eclass in setup-vm
-	if [ ! -z "`java-config --java-version | grep IBM`" ] ; then
-		# IBM JRE
-		local bp="$(java-config --jdk-home)/jre/lib"
-		bootclasspath="${bp}/core.jar:${bp}/xml.jar:${bp}/graphics.jar:${bp}/security.jar:${bp}/server.jar"
-	        JAVA_LIB_DIR="$(java-config --jdk-home)/jre/bin"
-	else
-		# Sun derived JREs (Blackdown, Sun)
-		local bp="$(java-config --jdk-home)/jre/lib"
-		bootclasspath="${bp}/rt.jar:${bp}/jsse.jar"
-	        JAVA_LIB_DIR="$(java-config --jdk-home)/jre/lib/${jvmarch}"
-	fi
-	einfo "Using bootclasspath ${bootclasspath}"
-	einfo "Using JVM library path ${JAVA_LIB_DIR}"
-
-	if [ ! -f ${JAVA_LIB_DIR}/libawt.so ] ; then
-	    die "Could not find libawt.so native library"
-	fi
-
-	export AWT_LIB_PATH=${JAVA_LIB_DIR}
-}
-
-function strip-src() {
-
-	local bp=${D}/${eclipse_dir}
-
-	rm -rf ${bp}/plugins/org.eclipse.pde.source_3*
-	rm -rf ${bp}/plugins/org.eclipse.jdt.source_3*
-	rm -rf ${bp}/plugins/org.eclipse.platform.source.linux.*
-	rm -rf ${bp}/plugins/org.eclipse.platform.source_3*
-
-	rm -rf ${bp}/features/org.eclipse.jdt.source_3*/
-	rm -rf ${bp}/features/org.eclipse.pde.source_3*/
-	rm -rf ${bp}/features/org.eclipse.platform.source_3*/
-}
-
-function strip-docs() {
-	local bp=${D}/${eclipse_dir}
-
-	rm -rf ${bp}/plugins/org.eclipse.platform.doc.*
-	rm -rf ${bp}/plugins/org.eclipse.jdt.doc.*
-	rm -rf ${bp}/plugins/org.eclipse.pde.doc.*
-}
-
-function check-cflags() {
-
-	einfo "Checking for bad CFLAGS"
-
-	local badflags="-fomit-frame-pointer -msse2"
-	local error=false
-
-	for x in ${badflags} ; do
-		if [ ! -z "$(echo ${CFLAGS} | grep -- $x)" ] ; then
-			ewarn "Found offending option $x in your CFLAGS"
-			error=true
-		fi
-	done
-	if [ ${error} == "true" ]; then
-		echo
-		ewarn "One or more potentially gruesome CFLAGS detected. When you run into trouble,"
-		ewarn "please edit /etc/make.conf and remove all offending flags, then recompile"
-		ewarn "Eclipse and all its dependencies before submitting a bug report."
-		echo
-		ewarn "In particular, gtk+ is extremely sensitive to which which flags it was"
-		ewarn "compiled with."
-		echo
-		einfo "Tip: use equery depgraph \"=${PF}\" to list all dependencies."
-		echo
-		ebeep
-	fi
-}
-
diff --git a/dev-util/eclipse-sdk/files/01-distribute_ant_target-2.1.patch b/dev-util/eclipse-sdk/files/01-distribute_ant_target-2.1.patch
deleted file mode 100644
index 7becab0..0000000
--- a/dev-util/eclipse-sdk/files/01-distribute_ant_target-2.1.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -urN eclipse.orig/build.xml eclipse/build.xml
---- eclipse.orig/build.xml	2003-11-03 14:29:23.000000000 +0100
-+++ eclipse/build.xml	2004-01-14 20:27:03.777314290 +0100
-@@ -8,6 +8,13 @@
- 	
- 	<!--  sourcepath setting for rt.jar in javadoc scripts in org.eclipse.platform.doc.isv and org.eclipse.jdt.doc.isv  -->
- 	<property name="rt" value="${bootclasspath}" />
-+
-+	<!--  target for making a set of distribution zipfiles -->
-+        <target name="distribute" depends="init">
-+                <antcall target="allElements">
-+                        <param name="target" value="zip.distribution"/>
-+                </antcall>
-+        </target>
- 	
- 	<!--  default target that runs complete build  -->
- 	<target name="run" depends="compile,buildDoc,install" />
-@@ -28,7 +35,7 @@
- 		  Compiles jars for all sdk plugins, and generates javadoc.
- 		  Deletes previously compiled jars first.
- 	-->
--	<target name="compile" depends="init,clean">
-+	<target name="compile" depends="init">
- 		<record name="compilelog.txt" action="start" />
- 		<antcall target="compileSwt" />
-   		<antcall target="allElements">
diff --git a/dev-util/eclipse-sdk/files/01-distribute_ant_target-3.0.patch b/dev-util/eclipse-sdk/files/01-distribute_ant_target-3.0.patch
deleted file mode 100644
index eaeaa8f..0000000
--- a/dev-util/eclipse-sdk/files/01-distribute_ant_target-3.0.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- eclipse-sdk-3.0.0_pre8.orig/build.xml	2004-05-17 20:10:10.021687520 +0200
-+++ eclipse-sdk-3.0.0_pre8/build.xml	2004-05-17 20:11:25.842161056 +0200
-@@ -24,7 +24,15 @@
- 		  Compiles jars for all sdk plugins, and generates javadoc.
- 		  Deletes previously compiled jars first.
- 	-->
--	<target name="compile" depends="init,clean">
-+	
-+	<!--  target for making a set of distribution zipfiles -->
-+	<target name="distribute" depends="init">
-+		<antcall target="allElements">
-+			<param name="target" value="zip.distribution"/>
-+		</antcall>
-+	</target>
-+
-+	<target name="compile" depends="init">
- 		<record name="compilelog.txt" action="start" />
- 		<antcall target="allElements">
- 			<param name="target" value="build.jars" />
diff --git a/dev-util/eclipse-sdk/files/02-konqueror_help_browser-2.1.patch b/dev-util/eclipse-sdk/files/02-konqueror_help_browser-2.1.patch
deleted file mode 100644
index f6d6ccb..0000000
--- a/dev-util/eclipse-sdk/files/02-konqueror_help_browser-2.1.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- eclipse-sdk-2.1.3.orig/plugins/org.eclipse.help/plugin.xml	2004-05-16 20:57:36.098652288 +0200
-+++ eclipse-sdk-2.1.3/plugins/org.eclipse.help/plugin.xml	2004-05-16 20:58:17.043427736 +0200
-@@ -94,6 +94,25 @@
-    <extension
-          point="org.eclipse.help.browser">
-       <browser
-+            name="%konqueror_adapter"
-+            id="org.eclipse.help.konquerorLinux">
-+         <factoryclass
-+               class="org.eclipse.help.internal.browser.MozillaFactory">
-+            <parameter
-+                  name="executable"
-+                  value="konqueror">
-+            </parameter>
-+            <parameter
-+                  name="executableName"
-+                  value="%konqueror">
-+            </parameter>
-+            <parameter
-+                  name="os"
-+                  value="Linux">
-+            </parameter>
-+         </factoryclass>
-+      </browser>
-+      <browser
-             name="%mozilla_adapter"
-             id="org.eclipse.help.mozillaLinux">
-          <factoryclass
diff --git a/dev-util/eclipse-sdk/files/03-motif-java1.5-build.patch b/dev-util/eclipse-sdk/files/03-motif-java1.5-build.patch
deleted file mode 100644
index 3d63921..0000000
--- a/dev-util/eclipse-sdk/files/03-motif-java1.5-build.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urN eclipse-sdk-3.0.0.orig/plugins/org.eclipse.swt.motif/build.xml eclipse-sdk-3.0.0/plugins/org.eclipse.swt.motif/build.xml
---- eclipse-sdk-3.0.0.orig/plugins/org.eclipse.swt.motif/build.xml	2004-06-25 18:26:03.000000000 +0200
-+++ eclipse-sdk-3.0.0/plugins/org.eclipse.swt.motif/build.xml	2004-07-07 00:53:06.000000000 +0200
-@@ -105,7 +105,7 @@
- 		<property name="destdir" value="${temp.folder}/ws/motif/swt-gtk.jar.bin"/>
- 		<delete dir="${temp.folder}/ws/motif/swt-gtk.jar.bin"/>
- 		<mkdir dir="${temp.folder}/ws/motif/swt-gtk.jar.bin"/>
--		<javac destdir="${temp.folder}/ws/motif/swt-gtk.jar.bin" verbose="true" debug="on" failonerror="no" bootclasspath="${bootclasspath}">
-+		<javac destdir="${temp.folder}/ws/motif/swt-gtk.jar.bin" source="1.3" target="1.2" verbose="true" debug="on" failonerror="no" bootclasspath="${bootclasspath}">
- 			<src path="${plugindir}/Eclipse SWT PI/motif_gtk/"/>
- 		</javac>
-         <property name="includes" value=""/>
-@@ -125,7 +125,7 @@
- 	<property name="destdir" value="${temp.folder}/ws/motif/swt-mozilla.jar.bin"/>
- 	<delete dir="${temp.folder}/ws/motif/swt-mozilla.jar.bin"/>
- 	<mkdir dir="${temp.folder}/ws/motif/swt-mozilla.jar.bin"/>
--	<javac destdir="${temp.folder}/ws/motif/swt-mozilla.jar.bin" verbose="true" debug="on" failonerror="no" bootclasspath="${bootclasspath}" classpath="${build.result.folder}/ws/motif/swt-gtk.jar">
-+	<javac destdir="${temp.folder}/ws/motif/swt-mozilla.jar.bin" source="1.3" target="1.2" verbose="true" debug="on" failonerror="no" bootclasspath="${bootclasspath}" classpath="${build.result.folder}/ws/motif/swt-gtk.jar">
- 		<src path="${plugindir}/Eclipse SWT Mozilla/gtk/"/>
- 		<src path="${plugindir}/Eclipse SWT Mozilla/common/"/>
- 	</javac>
-@@ -315,4 +315,4 @@
- 		<delete dir="${temp.folder}"/>
- 	</target>
- 
--</project>
-\ No newline at end of file
-+</project>
diff --git a/dev-util/eclipse-sdk/files/04-amd64-gtk.patch b/dev-util/eclipse-sdk/files/04-amd64-gtk.patch
deleted file mode 100644
index bcd186a..0000000
--- a/dev-util/eclipse-sdk/files/04-amd64-gtk.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-*** eclipse-3.0.1.orig/plugins/platform-launcher/library/gtk/eclipseGtk.c  Thu Sep 16 17:46:23 2004
---- eclipse-3.0.1/plugins/platform-launcher/library/gtk/eclipseGtk.c Sun Oct 17 21:06:47 2004
-***************
-*** 23,28 ****
---- 23,29 ----
-  #include <stdio.h>
-  #include <string.h>
-  #include <locale.h>
-+ #include <stdlib.h>
-
-  #include <gtk/gtk.h>
-  #include <gdk-pixbuf/gdk-pixbuf.h>
diff --git a/dev-util/eclipse-sdk/files/05-mozilla-xpcom.patch b/dev-util/eclipse-sdk/files/05-mozilla-xpcom.patch
deleted file mode 100644
index 87767ca..0000000
--- a/dev-util/eclipse-sdk/files/05-mozilla-xpcom.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ur eclipse.orig/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp
---- eclipse.orig/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp	2005-03-11 15:59:28.000000000 +0200
-+++ eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp	2005-03-30 08:03:03.983042167 +0300
-@@ -234,16 +234,6 @@
- 	return rc;
- }
- 
--JNIEXPORT jboolean JNICALL XPCOM_NATIVE(nsString_1Equals)
--	(JNIEnv *env, jclass, jint arg0, jint arg1)
--{
--	nsEmbedString *lparg0 = NULL;
--	nsEmbedString *lparg1 = NULL;
--	if (arg0 != 0) lparg0 = (nsEmbedString*)arg0;
--	if (arg1 != 0) lparg1 = (nsEmbedString*)arg1;
--	return lparg0->Equals(*lparg1);
--}
--
- JNIEXPORT jstring JNICALL XPCOM_NATIVE(PR_1GetEnv)
- 	(JNIEnv *env, jclass, jstring arg0)
- {
diff --git a/dev-util/eclipse-sdk/files/06-path-fixups.patch b/dev-util/eclipse-sdk/files/06-path-fixups.patch
deleted file mode 100644
index ed07886..0000000
--- a/dev-util/eclipse-sdk/files/06-path-fixups.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff -ur eclipse.orig/plugins/org.eclipse.core.resources.linux/build.xml eclipse.fix/plugins/org.eclipse.core.resources.linux/build.xml
---- eclipse.orig/plugins/org.eclipse.core.resources.linux/build.xml	2005-05-13 21:34:52.000000000 +0300
-+++ eclipse.fix/plugins/org.eclipse.core.resources.linux/build.xml	2005-05-23 21:43:30.000000000 +0300
-@@ -57,10 +57,15 @@
- 
- 	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
- 		<mkdir dir="${destination.temp.folder}/org.eclipse.core.resources.linux_3.1.0"/>
-+          <exec dir="./src" executable="make">
-+          </exec>
-+	  <copy todir="os/linux/${basearch}" failonerror="true" overwrite="false">
-+        	<fileset dir="src" includes="*.so"/>
-+          </copy>
- 		<copy todir="${destination.temp.folder}/org.eclipse.core.resources.linux_3.1.0" failonerror="true" overwrite="false">
- 			<fileset dir="${basedir}" includes="os/,META-INF/,about.html"			/>
- 		</copy>
--		<chmod perm="755" dir="${destination.temp.folder}/org.eclipse.core.resources.linux_3.1.0" includes="os/linux/x86/*.so" /> 
-+		<chmod perm="755" dir="${destination.temp.folder}/org.eclipse.core.resources.linux_3.1.0" includes="os/linux/${basearch}/*.so" /> 
- 	</target>
- 
- 	<target name="build.zips" depends="init">
-diff -ur eclipse.orig/plugins/org.eclipse.update.core.linux/src/build.xml eclipse.fix/plugins/org.eclipse.update.core.linux/src/build.xml
---- eclipse.orig/plugins/org.eclipse.update.core.linux/src/build.xml	2005-05-13 21:37:28.000000000 +0300
-+++ eclipse.fix/plugins/org.eclipse.update.core.linux/src/build.xml	2005-05-23 21:43:30.000000000 +0300
-@@ -5,7 +5,7 @@
-   <!-- Set a meaningful default value for when it is not. -->
-   <property name="eclipse-home" value="${basedir}/../.."/>
-   <property name="jdk-path" value="${java.home}"/>  
--  <property name="destination" value="${eclipse-home}/org.eclipse.update.core.linux/os/linux/x86/"/>
-+  <property name="destination" value="${eclipse-home}/org.eclipse.update.core.linux/os/linux/${arch}/"/>
-   <property name="obj-path" value="${eclipse-home}/org.eclipse.update.core.linux/src/"/>
-   <property name="src-path" value="${eclipse-home}/org.eclipse.update.core.linux/src/"/>  
-   
-@@ -47,17 +47,17 @@
-     <property name="header-path" value="${jdk-path}/../include"/>
-     <property name="header-linux-path" value="${header-path}/linux" />
- 
--	<echo message="gcc -o  ${library-file} -shared -I${src-path} -I${header-linux-path} ${library-file} -static -lc"/>
-+	<echo message="gcc -o  ${library-file} -shared -fPIC -I${src-path} -I${header-linux-path} ${library-file} -lc"/>
- 
-     <apply executable="gcc" dest="${eclipse-home}/" parallel="false">
-       <arg value="-o"/>
-       <arg value="${library-file}"/>
-       <arg value="-shared"/>
-+      <arg value="-fPIC"/>
-       <arg value="-I${src-path}"/>
-       <arg value="-I${header-path}"/>      
-       <arg value="-I${header-linux-path}"/>  
- 	  <srcfile/>
--	  <arg value="-static"/>           
-       <arg value="-lc"/>	  
-       <fileset dir="${src-path}" includes="*.c"/>
-       <mapper type="glob" from="*.c" to="*.o"/>
-diff -ur eclipse.orig/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh eclipse.fix/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
---- eclipse.orig/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	2005-06-27 23:46:32.000000000 +0300
-+++ eclipse.fix./plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	2005-06-27 23:51:09.000000000 +0300
-@@ -30,7 +30,9 @@
- 				if [ "${JAVA_HOME}" = "" ]; then
- 					JAVA_HOME=/bluebird/teamswt/swt-builddir/jdk1.5.0
- 				fi
--				AWT_LIB_PATH=$JAVA_HOME/jre/lib/amd64
-+				if [ "${AWT_LIB_PATH}" = "" ]; then
-+				    AWT_LIB_PATH=$JAVA_HOME/jre/lib/amd64
-+				fi
- 				XTEST_LIB_PATH=/usr/X11R6/lib64
- 				if [ "${GECKO_SDK}" = "" ]; then
- 					GECKO_SDK=/mozilla/mozilla/1.7/amd64/gtk2/mozilla/dist/sdk
-@@ -48,7 +50,9 @@
- 				if [ "${JAVA_HOME}" = "" ]; then
- 					JAVA_HOME=/bluebird/teamswt/swt-builddir/IBMJava2-141
- 				fi
--				AWT_LIB_PATH=$JAVA_HOME/jre/bin
-+				if [ "${AWT_LIB_PATH}" = "" ]; then
-+				    AWT_LIB_PATH=$JAVA_HOME/jre/bin
-+				fi
- 				XTEST_LIB_PATH=/usr/X11R6/lib
- 				if [ "${GECKO_SDK}" = "" ]; then
- 					GECKO_SDK=/mozilla/mozilla/1.4/linux_gtk2/mozilla/dist/sdk
---- eclipse-sdk-3.1/plugins/org.eclipse.help.webapp/build.xml.orig	2005-07-02 23:53:29.888012464 +0000
-+++ eclipse-sdk-3.1/plugins/org.eclipse.help.webapp/build.xml	2005-07-02 23:53:42.596080544 +0000
-@@ -165,7 +165,7 @@
- 		<java
- 			classname="org.apache.jasper.JspC"
- 			fork="true"
--			failonerror="false"
-+			failonerror="true"
- 			classpathref="jasper.classpath"
- 			output="${temp.folder}/WEB-INF/lib/jsp.jar.bin.log">
- 			<arg value="-v3" />
diff --git a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.1.2 b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.1.2
deleted file mode 100644
index f22ddff..0000000
--- a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.1.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f2c8066151de14c5ccdf420266ce9f39 eclipse-sourceBuild-srcIncluded-3.1.2.zip 66630673
-RMD160 ffe59352fe02b4a47be3e9a6daad3a5501f196b0 eclipse-sourceBuild-srcIncluded-3.1.2.zip 66630673
-SHA256 31233332f205a197a42aafdc4f15a4f38eb5e4be19ac8a7192492ab8a21324a4 eclipse-sourceBuild-srcIncluded-3.1.2.zip 66630673
diff --git a/media-sound/kwave/Manifest b/media-sound/kwave/Manifest
new file mode 100644
index 0000000..e7dda3a
--- /dev/null
+++ b/media-sound/kwave/Manifest
@@ -0,0 +1,12 @@
+MD5 8c6849d2dca4f93ef06da7a5aff5e030 files/digest-kwave-0.7.4 238
+RMD160 4ee8805e2bb97292f79a7196e760dab604151069 files/digest-kwave-0.7.4 238
+SHA256 46cf0a83666222079534102d8f7f7813cdd2155d4256f75cec7029246682afad files/digest-kwave-0.7.4 238
+MD5 be13e37aad3d122e740cda3ce0cff31e files/digest-kwave-0.7.5 238
+RMD160 75a4d773997932f35a21955f66234b74297022f4 files/digest-kwave-0.7.5 238
+SHA256 98b06d38ab9acdf790f93afd54b1df537cd8cd6f1d9ab92cc14db742144c3fe5 files/digest-kwave-0.7.5 238
+MD5 5c10ef2f7f9797fd0f20442080c0b7af kwave-0.7.4.ebuild 1108
+RMD160 a933f581cf43531bd37642a82569d93a163b0f56 kwave-0.7.4.ebuild 1108
+SHA256 d931171a702be4104024d2b4e95dc24b02333c77f118058bdff3343b96d42a46 kwave-0.7.4.ebuild 1108
+MD5 5c10ef2f7f9797fd0f20442080c0b7af kwave-0.7.5.ebuild 1108
+RMD160 a933f581cf43531bd37642a82569d93a163b0f56 kwave-0.7.5.ebuild 1108
+SHA256 d931171a702be4104024d2b4e95dc24b02333c77f118058bdff3343b96d42a46 kwave-0.7.5.ebuild 1108
diff --git a/media-sound/kwave/files/digest-kwave-0.7.4 b/media-sound/kwave/files/digest-kwave-0.7.4
new file mode 100644
index 0000000..76ece7e
--- /dev/null
+++ b/media-sound/kwave/files/digest-kwave-0.7.4
@@ -0,0 +1,3 @@
+MD5 80c02b67a622439d5de0c207f38b017c kwave-0.7.4.tar.gz 3104490
+RMD160 337a3e5fef191e2d0b79acf5d025703e98c0fe87 kwave-0.7.4.tar.gz 3104490
+SHA256 3878573a618154b7dd85b88c4749b3e4f55a76a444e497e24d8ad8173b715666 kwave-0.7.4.tar.gz 3104490
diff --git a/media-sound/kwave/files/digest-kwave-0.7.5 b/media-sound/kwave/files/digest-kwave-0.7.5
new file mode 100644
index 0000000..d99aecb
--- /dev/null
+++ b/media-sound/kwave/files/digest-kwave-0.7.5
@@ -0,0 +1,3 @@
+MD5 0c6951360b4ce10f537efdd2c6b1712c kwave-0.7.5.tar.gz 3082906
+RMD160 4f2888953ec2a801cfce3d42c2e1e6a501788669 kwave-0.7.5.tar.gz 3082906
+SHA256 3bf06792bc2f6663ed3b813ad5f83506b6a28f3e2fbaeb81a575ec15df064696 kwave-0.7.5.tar.gz 3082906
diff --git a/media-sound/kwave/kwave-0.7.4.ebuild b/media-sound/kwave/kwave-0.7.4.ebuild
new file mode 100644
index 0000000..d2b5271
--- /dev/null
+++ b/media-sound/kwave/kwave-0.7.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /cvsroot/kwave/kwave/kwave.ebuild,v 1.7 2005/12/24 10:43:19 the Exp $
+
+inherit kde flag-o-matic eutils
+
+DESCRIPTION="Kwave is a sound editor for KDE."
+HOMEPAGE="http://kwave.sourceforge.net/"
+SRC_URI="mirror://sourceforge/kwave/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+IUSE="mmx"
+
+RDEPEND="kde-base/arts
+	media-libs/alsa-lib
+	media-libs/audiofile
+	media-libs/id3lib
+	media-libs/libmad
+	media-libs/libogg
+	media-libs/libvorbis
+	media-libs/flac
+	sci-libs/gsl"
+DEPEND="${RDEPEND}
+	|| ( kde-base/kdesdk-misc kde-base/kdesdk )
+	app-text/recode
+	media-gfx/imagemagick"
+need-kde 3.4
+
+pkg_setup() {
+	if ! built_with_use kdelibs arts ; then
+		eerror "KWave needs aRts, please rebuild kdelibs with arts use flag enabled."
+		die
+	fi
+}
+
+src_compile() {
+	libtoolize --copy --force
+	aclocal-1.9 -I ./admin
+	autoheader
+	automake-1.9 --foreign --add-missing --copy --include-deps
+	autoconf
+
+	local myconf="--without-builtin-libaudiofile"
+
+	use mmx && append-flags "-mmmx"
+
+	kde_src_compile
+}
diff --git a/media-sound/kwave/kwave-0.7.5.ebuild b/media-sound/kwave/kwave-0.7.5.ebuild
new file mode 100644
index 0000000..d2b5271
--- /dev/null
+++ b/media-sound/kwave/kwave-0.7.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /cvsroot/kwave/kwave/kwave.ebuild,v 1.7 2005/12/24 10:43:19 the Exp $
+
+inherit kde flag-o-matic eutils
+
+DESCRIPTION="Kwave is a sound editor for KDE."
+HOMEPAGE="http://kwave.sourceforge.net/"
+SRC_URI="mirror://sourceforge/kwave/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+IUSE="mmx"
+
+RDEPEND="kde-base/arts
+	media-libs/alsa-lib
+	media-libs/audiofile
+	media-libs/id3lib
+	media-libs/libmad
+	media-libs/libogg
+	media-libs/libvorbis
+	media-libs/flac
+	sci-libs/gsl"
+DEPEND="${RDEPEND}
+	|| ( kde-base/kdesdk-misc kde-base/kdesdk )
+	app-text/recode
+	media-gfx/imagemagick"
+need-kde 3.4
+
+pkg_setup() {
+	if ! built_with_use kdelibs arts ; then
+		eerror "KWave needs aRts, please rebuild kdelibs with arts use flag enabled."
+		die
+	fi
+}
+
+src_compile() {
+	libtoolize --copy --force
+	aclocal-1.9 -I ./admin
+	autoheader
+	automake-1.9 --foreign --add-missing --copy --include-deps
+	autoconf
+
+	local myconf="--without-builtin-libaudiofile"
+
+	use mmx && append-flags "-mmmx"
+
+	kde_src_compile
+}
diff --git a/virtual/kernel/kernel-0.1.ebuild b/virtual/kernel/kernel-0.1.ebuild
new file mode 100644
index 0000000..804ba35
--- /dev/null
+++ b/virtual/kernel/kernel-0.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/x11/x11-6.8.ebuild,v 1.3 2005/12/31 09:54:55 vapier Exp $
+
+DESCRIPTION="Virtual for rebuilding all necessary kernel modules"
+HOMEPAGE="http://gentoo.migmedia.net"
+SRC_URI=""
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86"
+IUSE=""
+DEPEND=""
+RDEPEND=">=app-laptop/ibm-acpi"
diff --git a/virtual/x11/Manifest b/virtual/x11/Manifest
new file mode 100644
index 0000000..2aa7d29
--- /dev/null
+++ b/virtual/x11/Manifest
@@ -0,0 +1,6 @@
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-x11-7.0 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-x11-7.0 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-x11-7.0 0
+MD5 1a3265109f8364e7a6f46066b394808f x11-7.0.ebuild 470
+RMD160 ddbf3bca2f5c8d7627ce10f053956ab05f9161e9 x11-7.0.ebuild 470
+SHA256 4117477b89b0547c0d22aa574236cd008e7c6707ae3bb7fffe6b84253ecadb56 x11-7.0.ebuild 470
diff --git a/virtual/x11/files/digest-x11-7.0 b/virtual/x11/files/digest-x11-7.0
new file mode 100644
index 0000000..e69de29
diff --git a/virtual/x11/x11-7.0.ebuild b/virtual/x11/x11-7.0.ebuild
new file mode 100644
index 0000000..abb7ac8
--- /dev/null
+++ b/virtual/x11/x11-7.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/x11/x11-6.8.ebuild,v 1.3 2005/12/31 09:54:55 vapier Exp $
+
+DESCRIPTION="Virtual for the core X11 implementation"
+HOMEPAGE="http://www.gentoo.org/proj/en/desktop/x/x11/"
+SRC_URI=""
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86"
+IUSE=""
+DEPEND=""
+RDEPEND=">=x11-base/xorg-x11-7"