diff --git a/dev-java/xdoclet/Manifest b/dev-java/xdoclet/Manifest
new file mode 100644
index 0000000..b1ce1b0
--- /dev/null
+++ b/dev-java/xdoclet/Manifest
@@ -0,0 +1,6 @@
+MD5 6193d7eb9cd7025b74389318a443e4aa files/digest-xdoclet-1.2.3 247
+RMD160 093af07ba0c12bb1e63fc36579d6254c78e5aaab files/digest-xdoclet-1.2.3 247
+SHA256 f9aa8bf27ce3635becdd9ac1c245239b27b4277014f90ba8f1ba87963a57622b files/digest-xdoclet-1.2.3 247
+MD5 9f19245098137ba73c57672c156fb23e xdoclet-1.2.3.ebuild 1709
+RMD160 70ca44aa07b58fd1b30239bc6eac1dc14ccee6ad xdoclet-1.2.3.ebuild 1709
+SHA256 be924d4558ac0c29e7ff76908fee7b7d4d809b456986f0eb51e1053833090a59 xdoclet-1.2.3.ebuild 1709
diff --git a/dev-java/xdoclet/files/digest-xdoclet-1.2.3 b/dev-java/xdoclet/files/digest-xdoclet-1.2.3
new file mode 100644
index 0000000..391b674
--- /dev/null
+++ b/dev-java/xdoclet/files/digest-xdoclet-1.2.3
@@ -0,0 +1,3 @@
+MD5 9e1a2856e03b338b505a086b962a77ab xdoclet-src-1.2.3.tgz 5880180
+RMD160 cbeed94bf97f6a422a41f373a02b9533fa27a5b7 xdoclet-src-1.2.3.tgz 5880180
+SHA256 b7b8e00954497928626db15e9759280a0dc18397dc54b02924a162e819eff4ef xdoclet-src-1.2.3.tgz 5880180
diff --git a/dev-java/xdoclet/xdoclet-1.2.3.ebuild b/dev-java/xdoclet/xdoclet-1.2.3.ebuild
new file mode 100644
index 0000000..ae800ba
--- /dev/null
+++ b/dev-java/xdoclet/xdoclet-1.2.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xdoclet/xdoclet-1.2.2.ebuild,v 1.8 2006/03/22 06:58:58 wormo Exp $
+
+inherit java-pkg eutils
+
+DESCRIPTION="XDoclet is an extended Javadoc Doclet engine."
+HOMEPAGE="http://xdoclet.sf.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tgz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="jikes source"
+
+RDEPEND=">=virtual/jre-1.3
+	=dev-java/bsf-2.3*
+	dev-java/commons-collections
+	dev-java/commons-logging
+	dev-java/log4j
+	dev-java/mockobjects
+	dev-java/velocity
+	dev-java/xjavadoc"
+DEPEND=">=virtual/jdk-1.3
+	${RDEPEND}
+	>=dev-java/ant-core-1.6
+	>=dev-java/ant-tasks-1.6
+	jikes? ( dev-java/jikes )
+	source? ( app-arch/zip )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-interface.patch
+	epatch ${FILESDIR}/${P}-buildfile.patch
+	# Fixes problems experienced when behind a proxy.
+	# Contributed by Gergan Penkov <gpp666_999@yahoo.de> bug #99642
+	epatch ${FILESDIR}/${PN}-modules_common_ent.patch
+
+	cd ${S}/lib && rm -f *.jar
+	java-pkg_jar-from xjavadoc
+	java-pkg_jar-from bsf-2.3
+	java-pkg_jar-from velocity
+	java-pkg_jar-from log4j
+	java-pkg_jar-from mockobjects
+	java-pkg_jar-from commons-logging
+	java-pkg_jar-from commons-collections
+	java-pkg_jar-from velocity
+}
+
+src_compile() {
+	local antflags="core modules maven"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	ant ${antflags} || die "Failed to compile XDoclet core."
+}
+
+src_install() {
+	for jar in target/lib/*.jar; do
+		java-pkg_newjar ${jar} $(basename ${jar/-${PV}/})
+	done
+
+	dodoc README.txt
+	use source && java-pkg_dosrc core/src/xdoclet modules/*
+}
+
diff --git a/dev-util/eclipse-sdk/Manifest b/dev-util/eclipse-sdk/Manifest
new file mode 100644
index 0000000..554299f
--- /dev/null
+++ b/dev-util/eclipse-sdk/Manifest
@@ -0,0 +1,6 @@
+MD5 a381d0a0951fe8ec2d4e0b94331a4933 eclipse-sdk-3.1.2.ebuild 10371
+RMD160 76f4c392304365bfd2e138fbd3a7b0d300bd9efc eclipse-sdk-3.1.2.ebuild 10371
+SHA256 ddb5302f60e4b659fe6061924e0e6ca08b00cd0a14b505e875cea7b01d56ca6e eclipse-sdk-3.1.2.ebuild 10371
+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
new file mode 100644
index 0000000..61314b3
--- /dev/null
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.1.2.ebuild
@@ -0,0 +1,369 @@
+# 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-${PV}.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-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/digest-eclipse-sdk-3.1.2 b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.1.2
new file mode 100644
index 0000000..f22ddff
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.1.2
@@ -0,0 +1,3 @@
+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