diff --git a/dev-java/lwjgl/ChangeLog b/dev-java/lwjgl/ChangeLog
new file mode 100644
index 000000000..f4afe1a0b
--- /dev/null
+++ b/dev-java/lwjgl/ChangeLog
@@ -0,0 +1,25 @@
+# ChangeLog for dev-java/lwjgl
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  5 Feb 2011; James Le Cuirot <chewi@aura-online.co.uk>
+  -lwjgl-2.4.2-r1.ebuild, lwjgl-2.6-r1.ebuild:
+  Remove 2.4 now that 2.6 has been confirmed to work better with Minecraft. I
+  attempted to cross-compile the native library but it didn't work due to a
+  call to "uname" so now we just build it manually instead, avoiding that and
+  all the other issues.
+
+  30 Dec 2010; James Le Cuirot <chewi@aura-online.co.uk>
+  -lwjgl-2.4.2.ebuild, -lwjgl-2.6.ebuild, +lwjgl-2.4.2-r1.ebuild,
+  +lwjgl-2.6-r1.ebuild:
+  The xrandr application is required at run-time, as well as libXrandr.
+
+  19 Dec 2010; James Le Cuirot <chewi@aura-online.co.uk>
+  +lwjgl-2.4.2.ebuild, +lwjgl-2.6.ebuild:
+  Version bump and major cleanup. 2.4.2 is provided for Minecraft. Not sure
+  why it takes so long to build the native part. Seems to just sit there for
+  most of it. Did look at tests but they all require X or certain hardware.
+
+  22 Jan 2009; Alistair Bush <ali_bush@gentoo.org> metadata.xml,
+  lwjgl-1.0.ebuild:
+  QA Fixes.
diff --git a/dev-java/lwjgl/Manifest b/dev-java/lwjgl/Manifest
new file mode 100644
index 000000000..63d57874f
--- /dev/null
+++ b/dev-java/lwjgl/Manifest
@@ -0,0 +1,9 @@
+AUX fix-linux-build.patch 6387 RMD160 417740fb3835cc2d13728477bdf1adb434a3b2fe SHA1 5b412840d5df22bbb2a64ac233b71814c23fc244 SHA256 dcf2a1dc77c3c9cbd10e577c1570c8b5966dab7e979eb0d4e401c26af256790e
+DIST lwjgl-1.0_beta3.tar.gz 3946636 RMD160 b263c193e9ffdf922d1bbe96a9314a10c802a0e9 SHA1 12dc0cde941678bf486a85bda163e2c8a75d445a SHA256 f5234954bb9756a1f9acf8a4e1236455592265203ee57f76014e74eb1dc2b025
+DIST lwjgl-source-1.0.zip 1469824 RMD160 5a99d6f341b7fc134b210f7b04bf788a46ea7fe6 SHA1 a0d99002fca6e5fd84e623018a7cc62f5f0bc335 SHA256 5eb0e4b5baf7c6c56690a99cd892cf49144f957fec187716d385299f88fe07a0
+DIST lwjgl-source-2.6.zip 2164141 RMD160 34c8399ea0a665b23206d202fd7d1eae3664ca8e SHA1 b371d91db0f5e17f3250f9c59acc75b646b00e5b SHA256 3046798e2bb81b35d9b7ff49905d60bbfe6117abf35277a0adda4a0807358125
+EBUILD lwjgl-1.0.ebuild 1586 RMD160 cd432aa4c95ca640c2aac6339e97e2b61ee77e9b SHA1 988d4b0e44e651165b05704e486e2de0588a5424 SHA256 81df20ab60f398b35fec84db633ef3fef07db1abe1ee57bc95b630466a254f82
+EBUILD lwjgl-1.0_beta3.ebuild 1642 RMD160 8debda9c2eb216017d3a1003024369b37375226d SHA1 e720960d8c31377cb68ac26a379bb04d4fc270c8 SHA256 13544bb4c94c02fce23a9960c95e8cfd96de6878df573e6a83c0f5991f94699e
+EBUILD lwjgl-2.6-r1.ebuild 1689 RMD160 66c162e0033877ecdb3a8eac8abaa5c243e0dba7 SHA1 a4f352a854e6e32de531d941eb46001aa304a5e9 SHA256 0b919deb88191a048181e44ca0e0a4b820bb1c181b51ce5aa22582059d8aa74d
+MISC ChangeLog 1121 RMD160 7230ab672b290cc7ecc6b0651b6aadea20451cb1 SHA1 91ad2b9c4cbc573cb74272aa286d6af6cac100ac SHA256 7ab6adcf5589c23dc0ff9bce05b05b2c0961595d624767a25cad506377b17308
+MISC metadata.xml 746 RMD160 7c3ae7c84f6aff1b2b12a91cc9869f947eb27b93 SHA1 22b8e6e755de8a878dd583ce6f5995f8c007fd27 SHA256 51369cca4ec436ad6d688944444db7d7ad7417e6bdd8f1f7e6c5bcd2ea8d7886
diff --git a/dev-java/lwjgl/files/fix-linux-build.patch b/dev-java/lwjgl/files/fix-linux-build.patch
new file mode 100644
index 000000000..933d84adf
--- /dev/null
+++ b/dev-java/lwjgl/files/fix-linux-build.patch
@@ -0,0 +1,109 @@
+diff -Nur lwjgl/build.xml lwjgl-new/build.xml
+--- lwjgl/build.xml	2006-08-10 08:45:10.000000000 +0000
++++ lwjgl-new/build.xml	2006-09-10 23:39:36.000000000 +0000
+@@ -359,7 +359,7 @@
+ 		<condition property="native_path" value="libs/macosx">
+ 			<os name="Mac OS X" />
+ 		</condition>
+-		<java classname="${test.mainclass}" classpath="${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:${lwjgl.lib}/jinput.jar" fork="true">
++		<java classname="${test.mainclass}" classpath="${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:${lwjgl.lib}/jinput.jar:${lwjgl.lib}/jutils.jar" fork="true">
+ 			<jvmarg value="-Dorg.lwjgl.util.Debug=true"/>
+ 			<jvmarg value="-Djava.library.path=${native_path}"/>
+ 		</java>
+@@ -417,11 +417,13 @@
+ 		<copy file="${lwjgl.lib}/lwjgl_fmod3.jar" todir="applet"/>
+ 		<copy file="${lwjgl.lib}/lwjgl_devil.jar" todir="applet"/>
+ 		<copy file="${lwjgl.lib}/jinput.jar" todir="applet"/>
++		<copy file="${lwjgl.lib}/jutils.jar" todir="applet"/>
+ 		<zip destfile="applet/res.jar">
+ 		  <zipfileset dir="${lwjgl.res}" includes="Footsteps.wav, ILtest.tga, Missing_you.mod"/>
+ 		</zip>
+ 		<signjar jar="applet/lwjgl.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
+ 		<signjar jar="applet/jinput.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
++		<signjar jar="applet/jutils.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
+ 		<signjar jar="applet/lwjgl_util_applet.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
+ 		<signjar jar="applet/lwjgl_fmod3.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
+ 		<signjar jar="applet/lwjgl_devil.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>		
+@@ -433,6 +435,7 @@
+ 			<fileset dir="${lwjgl.temp}/native/" includes="**/*"/>
+ 		</delete>	
+     <copy file="${lwjgl.lib}/jinput.jar" todir="${lwjgl.temp}/jar"/>
++    <copy file="${lwjgl.lib}/jutils.jar" todir="lwjgl.temp/jar"/>
+ 		<copy todir="${lwjgl.temp}/native/win32">
+ 			<fileset dir="${lwjgl.lib}/win32">
+ 				<patternset refid="lwjgl-win32.fileset" />
+@@ -474,7 +477,7 @@
+ 
+ 	<!-- Compiles the Java source code -->
+ 	<target name="compile" description="Compiles the java source code" depends="-initialize">
+-		<javac debug="yes" destdir="${lwjgl.bin}" includes="org/lwjgl/opengl/**" source="1.4" target="1.4" classpath="${lwjgl.lib}/jinput.jar" taskname="core">
++		<javac debug="yes" destdir="${lwjgl.bin}" includes="org/lwjgl/opengl/**" source="1.4" target="1.4" classpath="${lwjgl.lib}/jinput.jar:${lwjgl.lib}/jutils.jar" taskname="core">
+ 			<src path="${lwjgl.src}/java/"/>
+ 			<src path="${lwjgl.src}/generated/"/>
+ 			<include name="org/lwjgl/*.java"/>
+@@ -573,7 +576,7 @@
+ 		</javac>
+ 	</target>
+ 
+-	<target name="generate-all" depends="generate-openal, generate-opengl, generate-opengl-capabilities, generate-opengl-references" description="Generates java and native source"/>
++	<target name="generate-all" depends="-initialize, generate-openal, generate-opengl, generate-opengl-capabilities, generate-opengl-references" description="Generates java and native source"/>
+ 
+ 	<target name="generate-openal" depends="generators" description="Generates java and native source for AL">
+ 		<!-- Generate OpenAL -->
+@@ -777,6 +780,7 @@
+ 		<signjar jar="${lwjgl.temp}/jnlp/native_macosx.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
+ 		<signjar jar="${lwjgl.temp}/jnlp/native_win32.jar" 	alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
+ 		<signjar jar="${lwjgl.temp}/jnlp/jinput.jar" 		alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
++		<signjar jar="${lwjgl.temp}/jnlp/jutils.jar}"		alisa="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
+ 	</target>
+ 	
+ 	<!-- -->
+diff -Nur lwjgl/platform_build/linux_ant/build.xml lwjgl-new/platform_build/linux_ant/build.xml
+--- lwjgl/platform_build/linux_ant/build.xml	2006-07-11 21:46:44.000000000 +0000
++++ lwjgl-new/platform_build/linux_ant/build.xml	2006-09-11 00:57:27.000000000 +0000
+@@ -4,8 +4,8 @@
+ 	<property name="native" location="../../src/native"/>
+ 	<property name="libname32" value="liblwjgl.so"/>
+ 	<property name="libname64" value="liblwjgl64.so"/>
+-	<property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lpthread -L${java.home}/lib/i386 -ljawt -Wl,-static,-lXxf86vm,-lXcursor,-lXrender,-lXrandr,-lXfixes,-call_shared"/>
+-	<property name="libs64" value="-L/usr/X11R6/lib64 -L/usr/X11/lib64 -lm -lX11 -lXext -lpthread -L${java.home}/lib/amd64 -ljawt -lXxf86vm -lXcursor -lXrender -lXrandr -lXfixes"/>
++	<property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lpthread -L${java.home}/jre/lib/i386 -ljawt -Wl,-static,-lXxf86vm,-lXcursor,-lXrender,-lXrandr,-lXfixes,-call_shared"/>
++	<property name="libs64" value="-L/usr/X11R6/lib64 -L/usr/X11/lib64 -lm -lX11 -lXext -lpthread -L${java.home}/jre/lib/amd64 -ljawt -lXxf86vm -lXcursor -lXrender -lXrandr -lXfixes"/>
+ 	<property name="cflags" value="-O2 -Wall -c -fPIC -std=c99 -pthread"/>
+ 	
+ 	<target name="clean">
+@@ -17,7 +17,7 @@
+ 	
+     <target name="compile">
+ 		<exec executable="uname" outputproperty="hwplatform">
+-			<arg value="-i"/>
++			<arg value="-m"/>
+ 		</exec>
+ 		<condition property="libs" value="${libs64}" else="${libs32}">
+ 			<equals arg1="${hwplatform}" arg2="x86_64"/>
+@@ -26,6 +26,9 @@
+ 			<equals arg1="${hwplatform}" arg2="x86_64"/>
+ 		</condition>
+ 		<property name="linker_flags" value="-Wl,--version-script=${native}/linux/lwjgl.map -shared -O2 -Wall -o ${libname} ${libs}"/>
++		<echo message="${java.home}"/>
++		<echo message="${native}"/>
++		<echo message="${cflags}"/>
+ 		<apply dir="." executable="cc" dest="." skipemptyfilesets="true" failonerror="true">
+ 			<arg line="${cflags}"/>
+ 			<arg value="-I${java.home}/include"/>
+@@ -37,14 +40,12 @@
+ 			<fileset dir="${native}/generated" includes="*.c"/>
+ 			<fileset dir="${native}/common" includes="*.c"/>
+ 		</apply>
++		<echo message="${linker_flags}"/>
+ 		<apply dir="." parallel="true" executable="cc" failonerror="true">
+ 			<srcfile/>
+ 			<arg line="${linker_flags}"/>
+ 			<fileset dir="." includes="*.o"/>
+ 		</apply>
+-		<apply dir="." parallel="true" executable="strip" failonerror="true">
+-			<fileset file="${libname}"/>
+-		</apply>
+     </target>
+ </project>
+ 
diff --git a/dev-java/lwjgl/lwjgl-1.0.ebuild b/dev-java/lwjgl/lwjgl-1.0.ebuild
new file mode 100644
index 000000000..4248c864a
--- /dev/null
+++ b/dev-java/lwjgl/lwjgl-1.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# uses the javah task
+WANT_ANT_TASKS="ant-nodeps"
+JAVA_PKG_IUSE="devil doc source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+# See for dev info
+# http://overlays.gentoo.org/proj/java/wiki/
+#	Java_Games_ProjectLightWeightJavaGameLibraryLWJGL
+MY_PV="$(delete_version_separator 2)"
+DESCRIPTION="The Lightweigth Java Game Library (LWJGL)"
+HOMEPAGE="http://www.lwjgl.org"
+SRC_URI="mirror://sourceforge/java-game-lib/${PN}-source-${PV}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+CDEPEND="virtual/opengl
+		media-libs/openal
+		dev-java/jinput
+		dev-java/jutils"
+
+DEPEND=">=virtual/jdk-1.5
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXrandr
+		x11-proto/xf86vidmodeproto
+		x11-proto/xproto
+		${CDEPEND}"
+
+#TODO: the library for devil seems to be only needed at runtime
+# check how it behaves with code that is using it when the library is not there
+RDEPEND=">=virtual/jre-1.5
+		devil? ( media-libs/devil )
+		x11-libs/libX11
+		x11-libs/libXext
+		${CDEPEND}"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	#eant clean clean-generated
+	mkdir bin
+	java-ant_rewrite-classpath build.xml
+}
+
+#EANT_BUILD_TARGET="generate-all all"
+EANT_BUILD_TARGET="all"
+EANT_GENTOO_CLASSPATH="jinput,jutils"
+# needs com.sun.* from tools.jar for code generation
+# EANT_EXTRA_ARGS="-Dbuild.sysclasspath=first"
+
+src_install() {
+	java-pkg_dojar libs/lwjgl*jar
+	java-pkg_doso libs/linux/*.so
+	use doc && java-pkg_dojavadoc doc/javadoc
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/lwjgl/lwjgl-1.0_beta3.ebuild b/dev-java/lwjgl/lwjgl-1.0_beta3.ebuild
new file mode 100644
index 000000000..2eaa25ab6
--- /dev/null
+++ b/dev-java/lwjgl/lwjgl-1.0_beta3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+WANT_ANT_TASKS="ant-nodeps"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+# See for dev info
+# http://overlays.gentoo.org/proj/java/wiki/
+#	Java_Games_ProjectLightWeightJavaGameLibraryLWJGL
+MY_PV="$(delete_version_separator 2)"
+DESCRIPTION="The Lightweigth Java Game Library (LWJGL)"
+HOMEPAGE="http://www.lwjgl.org"
+SRC_URI="http://www.counties.co.nz/alistair/distfiles/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc devil"
+
+CDEPEND="virtual/opengl
+		media-libs/openal
+		dev-java/jinput
+		dev-java/jutils
+		x11-libs/libXrandr
+		x11-libs/libXxf86vm
+		x11-libs/libXcursor
+		devil? ( media-libs/devil )"
+
+DEPEND=">=virtual/jdk-1.5
+		>=dev-java/ant-core-1.5
+		${CDEPEND}"
+RDEPEND=">=virtual/jre-1.5
+		${CDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/fix-linux-build.patch"
+	eant clean clean-generated
+
+	# libs is the final install path for jars and so's
+	rm -vr libs/*
+	mkdir libs/linux
+	cd libs
+	java-pkg_jarfrom jinput
+	java-pkg_jarfrom jutils
+	cd linux
+
+}
+
+src_compile() {
+	# Using com.sun.mirror.declaration from tools.jar
+	eant -Djava.home=${JAVA_HOME} generate-all all $(use_doc javadoc) \
+		-Dbuild.sysclasspath=first
+}
+
+src_install() {
+	cd libs
+	java-pkg_dojar lwjgl.jar lwjgl_util.jar
+	use devil && java-pkg_dojar lwjgl_devil.jar
+	if use amd64; then
+		cp linux/liblwjgl64.so linux/liblwjgl.so || die
+	fi
+	java-pkg_doso linux/liblwjgl.so
+	#if use_doc; then
+	#	cd ${S}/doc
+	#	mv javadoc api
+	#	java-pkg_dohtml -r api
+	#fi
+	cd "${S}"
+	use_doc && java-pkg_dojavadoc doc/javadoc
+}
diff --git a/dev-java/lwjgl/lwjgl-2.6-r1.ebuild b/dev-java/lwjgl/lwjgl-2.6-r1.ebuild
new file mode 100644
index 000000000..778bb3c23
--- /dev/null
+++ b/dev-java/lwjgl/lwjgl-2.6-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+# Uses the javah task.
+WANT_ANT_TASKS="ant-nodeps"
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="The Lightweight Java Game Library (LWJGL)"
+HOMEPAGE="http://www.lwjgl.org"
+SRC_URI="mirror://sourceforge/java-game-lib/${PN}-source-${PV}.zip"
+LICENSE="BSD"
+SLOT="2.6"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/apple-java-extensions-bin
+	dev-java/apt-mirror
+	dev-java/jinput
+	dev-java/jutils
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXrandr
+	x11-libs/libXxf86vm"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.5
+	x11-proto/xproto"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5
+	media-libs/openal
+	virtual/opengl
+	x11-apps/xrandr"
+
+S="${WORKDIR}"
+
+JAVA_PKG_BSFIX_NAME="build.xml build-generator.xml"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_GENTOO_CLASSPATH="apple-java-extensions-bin apt-mirror jinput jutils"
+EANT_BUILD_TARGET="jars headers"
+
+src_compile() {
+	# Build the JARs and headers.
+	java-pkg-2_src_compile
+
+	# Add "64" for amd64.
+	local BITS=
+	use amd64 && BITS=64
+
+	# Their native build script sucks.
+	cd "${S}/src/native" || die
+	LIBRARY_PATH="$(java-config -g LDPATH)" gcc -shared -fPIC -std=c99 -pthread -Wall -Wl,--version-script=linux/${PN}.map -Wl,-z -Wl,defs ${CFLAGS} ${LDFLAGS} $(java-pkg_get-jni-cflags) -I{common,linux} {linux,generated,common}/*.c -lm -lX11 -lXcursor -lXrandr -lXxf86vm -ljawt -ldl -o lib${PN}${BITS}.so || die
+}
+
+src_install() {
+	java-pkg_dojar libs/${PN}*.jar
+	java-pkg_doso src/native/lib${PN}*.so
+
+	use doc && java-pkg_dojavadoc doc/javadoc
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/lwjgl/metadata.xml b/dev-java/lwjgl/metadata.xml
new file mode 100644
index 000000000..ad5c63619
--- /dev/null
+++ b/dev-java/lwjgl/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<maintainer>
+<email>alistair.bush at gmail.com</email>
+<name>Alistair Bush</name>
+</maintainer>
+<longdescription lang="en">
+The Lightweight Java Game Library (LWJGL) is a solution aimed directly at
+professional and amateur Java programmers alike to enable commercial quality
+games to be written in Java. LWJGL provides developers access to high
+performance crossplatform libraries such as OpenGL (Open Graphics Library) and
+OpenAL (Open Audio Library) allowing for state of the art 3D games and 3D sound
+</longdescription>
+<use><flag name="devil">TODO describe this use flag</flag></use>
+</pkgmetadata>
+