Reeanble gaim cvs

to sed instead of patch
add some java packages to make eclipse compile

44 files changed, 1429 insertions, 5 deletions

diff --git a/dev-java/antlr/ChangeLog b/dev-java/antlr/ChangeLog
new file mode 100644
index 00000000..f31671a5
--- /dev/null
+++ b/dev-java/antlr/ChangeLog
@@ -0,0 +1,142 @@
+# ChangeLog for dev-java/antlr
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.33 2005/12/29 23:44:38 compnerd Exp $
+
+  29 Dec 2005; Saleem Abdulrasool <compnerd@gentoo.org>
+  antlr-2.7.5-r2.ebuild:
+  Fixing java screwup, thanks to axxo for noticing it.
+
+*antlr-2.7.5-r2 (29 Dec 2005)
+
+  29 Dec 2005; Saleem Abdulrasool <compnerd@gentoo.org>
+  +antlr-2.7.5-r2.ebuild:
+  Adding nojava useflag as per axxo's request.  Fixing script issue (bug #80862)
+  with script useflag.
+
+  13 Dec 2005; Saleem Abdulrasool <compnerd@gentoo.org>
+  antlr-2.7.5-r1.ebuild:
+  Fixing the jar install.
+
+  10 Dec 2005; Saleem Abdulrasool <compnerd@gentoo.org> -antlr-2.7.5.ebuild:
+  Pruning old 2.7.5 ebuild
+
+*antlr-2.7.5-r1 (10 Dec 2005)
+
+  10 Dec 2005; Saleem Abdulrasool <compnerd@gentoo.org> +files/antlr.pc.in,
+  +antlr-2.7.5-r1.ebuild:
+  Adding new revision of ANTLR 2.7.5 which resolves bug #80862.  Adds a block on
+  pccts.
+
+  09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> antlr-2.7.3.ebuild,
+  antlr-2.7.4.ebuild, antlr-2.7.5.ebuild:
+  add source use flag
+
+*antlr-2.7.5 (03 Apr 2005)
+
+  03 Apr 2005; Thomas Matthijs <axxo@gentoo.org> +antlr-2.7.5.ebuild:
+  version bump
+
+  05 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> antlr-2.7.4.ebuild:
+  added support for the doc and the examples useflag. fixes #80862
+
+  26 Jan 2005; Markus Rothe <corsair@gentoo.org> antlr-2.7.4.ebuild:
+  Stable on ppc64
+
+  18 Dec 2004; Markus Rothe <corsair@gentoo.org> antlr-2.7.4.ebuild:
+  added ~ppc64 to KEYWORDS and gnuconfig_update
+
+  22 Oct 2004; Dylan Carlson <absinthe@gentoo.org> antlr-2.7.4.ebuild:
+  Keywords ~amd64.
+
+*antlr-2.7.4 (16 Oct 2004)
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> antlr-2.7.3.ebuild,
+  antlr-2.7.4.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
+
+  04 Sep 2004; Thomas Matthijs <axxo@gentoo.org> antlr-2.7.3.ebuild:
+  stable on sparc
+
+  15 Jul 2004; Thomas Matthijs <axxo@gentoo.org> :
+  version bump
+
+*antlr-2.7.3 (31 Mar 2004)
+
+  31 Mar 2004; Chris Aniszczyk <zx@gentoo.org> antlr-2.7.3.ebuild:
+  Marking stable on x86.
+
+  22 Mar 2004; Chris Aniszczyk <zx@gentoo.org> antlr-2.7.2.ebuild:
+  Clean up + Version bump. Fixes #45281
+
+  20 Jan 2004; Adrian Almenar <strider@gentoo.org> antlr-2.7.2.ebuild:
+  Stable on sparc.
+
+  19 Jan 2004; Adrian Almenar <strider@gentoo.org> antlr-2.7.2.ebuild:
+  Added ~ppc keyword.
+
+  18 Jan 2004; Adrian Almenar <strider@gentoo.org> antlr-2.7.1-r3.ebuild,
+  antlr-2.7.2.ebuild:
+  Added amd64 keyword. Removed old version.
+
+  16 Dec 2003; Jason Wever <weeve@gentoo.org> antlr-2.7.2.ebuild:
+  Added ~sparc keyword to fix broken dependencies in dev-java/makeme.
+
+  15 Aug 2003; Adrian Almenar <strider@gentoo.org> antlr-2.7.1-r3.ebuild,
+  antlr-2.7.2.ebuild, antlr-2.7.2_alpha2-r1.ebuild, antlr-2.7.2_alpha2.ebuild:
+  Fixes bug 21887, That makes the ebuild to build with jikes java compiler,
+  Thanks to Jonas Berlin <jberlin@cc.hut.fi> for the patch
+
+*antlr-2.7.2 (05 Apr 2003)
+  02 Apr 2003; Robin Johnson <robbat2@gentoo.org> antlr-2.7.2.ebuild,
+  files/digest-antlr-2.7.2:
+  Updated to new version, slight change in ebuild script for cleanliness
+  changed description to reflect removal of Sather support
+  Fixes to make it compile now included
+
+*antlr-2.7.2_alpha2-r1 (Jan 2003)
+
+  10 Jan 2003; Matthew Kennedy <mkennedy@gentoo.org>
+  antlr-2.7.2_alpha2-r1.ebuild, files/digest-antlr-2.7.2_alpha2-r1,
+  files/antrl-2.7.2_alpha2-r1-gcc3-gentoo.patch, ChangeLog :
+
+  Code fix for GCC 3.2.1. No oustanding bug out on this.
+	
+*antlr-2.7.2_alpha2 (25 Jun 2002)
+
+  01 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> antlr-2.7.2_alpha2.ebuild files/digest-antlr-2.7.2_alpha2 :
+
+  Added KEYWORDS. 
+
+  25 Jun 2002; Karl Trygve Kalleberg <karltk@gentoo.org> antlr-2.7.2_alpha2.ebuild files/digest-antlr-2.7.2_alpha2 :
+
+  New upstream version.
+
+*antlr-2.7.1-r3 (10 May 2002)
+
+  01 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> antlr-2.7.2_alpha2.ebuild files/digest-antlr-2.7.2_alpha2 :
+
+  Added SLOT, KEYWORDS and LICENSE.
+
+  10 May 2002; Karl Trygve Kalleberg <karltk@gentoo.org> antlr-2.7.1-r3.ebuild files/digest-antlr-2.7.1-r3:
+
+  Now the installed jarballs are properly registered so that they are noticed 
+  by java-config.
+
+  Removed antlr-2.7.1-r2.ebuild files/digest-antlr-2.7.1-r2
+
+*antlr-2.7.1-r2 (15 Mar 2002)
+
+  1 Feb 2002; G.Bevin <gbevin@gentoo.org> antlr-2.7.1-r2.ebuild digest/digest-antlr-2.7.1-r2 :
+
+  Added support for c++ library and includes
+
+*antlr-2.7.1-r1 (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/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
new file mode 100644
index 00000000..f0f051ff
--- /dev/null
+++ b/dev-java/antlr/Manifest
@@ -0,0 +1,5 @@
+MD5 513efdc1226f16eea9ab8401d83c2d6f ChangeLog 5018
+MD5 194d49e26253a33f9e0e41182f1b1d5f antlr-2.7.5-r3.ebuild 2803
+MD5 f48a40b0b28f1cb3e973c726c883f501 files/antlr.pc.in 155
+MD5 f40028cdafa23c0b364b0ef1287460ce files/digest-antlr-2.7.5-r3 64
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
diff --git a/dev-java/antlr/antlr-2.7.5-r3.ebuild b/dev-java/antlr/antlr-2.7.5-r3.ebuild
new file mode 100644
index 00000000..42429544
--- /dev/null
+++ b/dev-java/antlr/antlr-2.7.5-r3.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.5-r2.ebuild,v 1.2 2005/12/29 23:44:38 compnerd Exp $
+
+inherit gnuconfig java-pkg mono distutils multilib
+
+DESCRIPTION="A parser generator for C++, C#, Java, and Python"
+HOMEPAGE="http://www.antlr.org/"
+SRC_URI="http://www.antlr.org/download/${P}.tar.gz"
+
+LICENSE="ANTLR"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="doc debug examples mono nocxx nojava python script source"
+
+RDEPEND=">=virtual/jdk-1.2
+		 dev-java/java-config
+		 mono? ( dev-lang/mono dev-util/pkgconfig )
+		 python? ( dev-lang/python )"
+DEPEND="${RDEPEND}
+		script? ( !dev-util/pccts )
+		>=sys-apps/sed-4
+		  sys-apps/findutils
+		 source? ( app-arch/zip )"
+
+src_compile() {
+	gnuconfig_update
+
+	source /etc/profile
+	PATH=${PATH}:/usr/lib/portage/bin/
+
+	local myconf=
+
+	if use nocxx ; then
+		myconf="--disable-cxx"
+	else
+		myconf="--enable-cxx"
+	fi
+
+	if use nojava ; then
+		myconf="${myconf} --disable-java"
+	else
+		myconf="${myconf} --enable-java"
+	fi
+
+	econf $(use_enable python) \
+		  $(use_enable mono csharp) \
+		  $(use_enable debug) \
+		  $(use_enable examples) \
+		  ${myconf} \
+		  --enable-verbose || die "configure failed"
+
+	emake || die "compile failed"
+
+	sed -e "s|@prefix@|/usr/|" \
+		-e 's|@exec_prefix@|${prefix}|' \
+		-e "s|@libdir@|\$\{exec_prefix\}/$(get_libdir)/antlr|" \
+		-e 's|@libs@|-r:\$\{libdir\}/antlr.astframe.dll -r:\$\{libdir\}/antlr.runtime.dll|' \
+		-e "s|@VERSION@|${PV}|" \
+		${FILESDIR}/antlr.pc.in > ${S}/antlr.pc
+
+	if ! use nojava && use script ; then
+		cat > antlr.sh <<-EOF
+		#!/bin/sh
+		ANTLR_JAR=\$(java-config -p antlr)
+		\$(java-config -J) -cp \$ANTLR_JAR antlr.Tool \$*
+		EOF
+	fi
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe ${S}/scripts/antlr-config
+
+	if ! use nocxx ; then
+		cd ${S}/lib/cpp
+		einstall || die "failed to install C++ files"
+	fi
+
+	if ! use nojava ; then
+		exeinto /usr/bin
+		use script && newexe ${S}/antlr.sh antlr
+
+		java-pkg_dojar ${S}/antlr/antlr.jar
+
+		use source && java-pkg_dosrc ${S}/antlr
+		use doc && java-pkg_dohtml -r doc/*
+	fi
+
+	if use mono ; then
+		cd ${S}/lib
+
+		dodir /usr/$(get_libdir)/antlr/
+		insinto /usr/$(get_libdir)/antlr/
+
+		doins antlr.astframe.dll
+		doins antlr.runtime.dll
+
+		insinto /usr/$(get_libdir)/pkgconfig
+		doins ${S}/antlr.pc
+	fi
+
+	if use python ; then
+		cd ${S}/lib/python
+		distutils_src_install
+	fi
+
+	if use examples ; then
+		find ${S}/examples -iname Makefile\* -exec rm \{\} \;
+
+		dodir /usr/share/doc/${PF}/examples
+		insinto /usr/share/doc/${PF}/examples
+
+		! use cxx && doins -r ${S}/examples/cpp
+		use java && doins -r ${S}/examples/java
+		use mono && doins -r ${S}/examples/csharp
+		use python && doins -r ${S}/examples/python
+	fi
+
+	newdoc ${S}/README.txt README
+}
diff --git a/dev-java/antlr/files/antlr.pc.in b/dev-java/antlr/files/antlr.pc.in
new file mode 100644
index 00000000..fb548063
--- /dev/null
+++ b/dev-java/antlr/files/antlr.pc.in
@@ -0,0 +1,9 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+
+
+Name: antlr
+Description: ANother Tool for Language Recognition
+Version: @VERSION@
+Libs: @libs@
diff --git a/dev-java/antlr/files/digest-antlr-2.7.5-r3 b/dev-java/antlr/files/digest-antlr-2.7.5-r3
new file mode 100644
index 00000000..933fddaf
--- /dev/null
+++ b/dev-java/antlr/files/digest-antlr-2.7.5-r3
@@ -0,0 +1 @@
+MD5 1ef201f29283179c8e5ab618529cac78 antlr-2.7.5.tar.gz 1636304
diff --git a/dev-java/antlr/metadata.xml b/dev-java/antlr/metadata.xml
new file mode 100644
index 00000000..838c00a4
--- /dev/null
+++ b/dev-java/antlr/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>java</herd>
+</pkgmetadata>
diff --git a/dev-java/bsh/ChangeLog b/dev-java/bsh/ChangeLog
new file mode 100644
index 00000000..1fdfa177
--- /dev/null
+++ b/dev-java/bsh/ChangeLog
@@ -0,0 +1,108 @@
+# ChangeLog for dev-java/bsh
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/ChangeLog,v 1.28 2005/09/11 11:45:27 axxo Exp $
+
+  11 Sep 2005; Thomas Matthijs <axxo@gentoo.org> bsh-2.0_beta4.ebuild:
+  fix icon
+
+  09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> -bsh-2.0_beta2.ebuild,
+  bsh-2.0_beta4.ebuild:
+  fix deps, some cleanups
+
+  23 Jun 2005; Thomas Matthijs <axxo@gentoo.org>
+  +files/bsh2.0b4-build.patch, bsh-2.0_beta4.ebuild:
+  fix 96799, sorry commited wrong ebuild
+
+*bsh-2.0_beta4 (22 Jun 2005)
+
+  22 Jun 2005; Thomas Matthijs <axxo@gentoo.org> +bsh-2.0_beta4.ebuild:
+  version bump
+
+  08 Apr 2005; Markus Rothe <corsair@gentoo.org> bsh-2.0_beta1-r1.ebuild:
+  Stable on ppc64
+
+  11 Mar 2005; Sven Wegener <swegener@gentoo.org> bsh-2.0_beta2.ebuild:
+  Fixed invalid atoms in *DEPEND.
+
+*bsh-2.0_beta2 (10 Mar 2005)
+
+  10 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> files/bsh.Console,
+  files/bsh.Interpreter, +files/bsh2-build.patch, +files/bsh2-readline.patch,
+  +bsh-2.0_beta2.ebuild:
+  new version, improvements, build from source, generall cleanup and much more.
+  fixes #62664 and #81879. Ebuild based on the contribution by Saleem A.
+  <compnerd@gentoo.org>, thanks to Diego Pettenò <dgp85@users.sourceforge.net>
+  for the patch.
+
+  26 Jan 2005; Markus Rothe <corsair@gentoo.org> bsh-1.3.0.ebuild:
+  Stable on ppc64
+
+  18 Dec 2004; Markus Rothe <corsair@gentoo.org> bsh-1.3.0.ebuild:
+  added ~ppc64 to KEYWORDS
+
+  16 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> bsh-2.0_beta1-r1.ebuild:
+  Stable on sparc
+
+  01 Nov 2004; Lars Weiler <pylon@gentoo.org> bsh-2.0_beta1-r1.ebuild:
+  Stable on ppc for PHP5, Bug #60442.
+
+  28 Oct 2004; Jason Wever <weeve@gentoo.org> bsh-2.0_beta1-r1.ebuild:
+  Added ~sparc keyword.
+
+*bsh-2.0_beta1-r1 (17 Sep 2004)
+
+  17 Sep 2004; Thomas Matthijs <axxo@gentoo.org> +bsh-2.0_beta1-r1.ebuild,
+  -bsh-2.0_beta1.ebuild:
+  named the jar ${PN}.jar to its usable with java-pkg_jar-from
+
+  17 Sep 2004; Thomas Matthijs <axxo@gentoo.org> -files/beanshell-icon.png,
+  bsh-2.0_beta1.ebuild:
+  moved beanshell-icon.png to mirrors, so repoman is nice to me
+
+  27 Jun 2004; Chris Aniszczyk <zx@gentoo.org> bsh-1.3.0.ebuild,
+  bsh-2.0_beta1.ebuild:
+  Stability bumps
+
+  02 Jun 2004; Aron Griffis <agriffis@gentoo.org> bsh-2.0_beta1.ebuild:
+  Fix use invocation
+
+  09 May 2004; Jason Wever <weeve@gentoo.org> bsh-1.3.0.ebuild:
+  Added ~sparc keyword to resolve bug #50405.
+
+  06 May 2004; Chris Aniszczyk <zx@gentoo.org> bsh-2.0_beta1.ebuild:
+  Marking stable on x86
+
+  06 May 2004; Chris Aniszczyk <zx@gentoo.org> +files/beanshell-icon.png,
+  +files/beanshell.desktop, bsh-2.0_beta1.ebuild:
+  Closes #49418.
+  Thanks to Keith Lea <keith@cs.oswego.edu> for the pretty icon and desktop file.
+
+  18 Mar 2004; Chris Aniszczyk <zx@gentoo.org> bsh-1.3.0.ebuild:
+  Marking stable on x86
+
+*bsh-2.0_beta1 (18 Feb 2004)
+
+  18 Feb 2004; Chris Aniszczyk <zx@gentoo.org> bsh-2.0_beta1.ebuild:
+  Bug fix #37506
+
+  15 Feb 2004; David Holm <dholm@gentoo.org> bsh-1.3.0.ebuild:
+  Added to ~ppc.
+
+  10 Feb 2004; Adrian Almenar <strider@gentoo.org> bsh-1.2-r7.ebuild:
+  Removed alpha keyword.
+
+  19 Jan 2004; Adrian Almenar <strider@gentoo.org> bsh-1.3.0.ebuild:
+  Added amd64 keyword.
+
+*bsh-1.3.0 (10 Jan 2004)
+
+  10 Jan 2004; Adrian Almenar <strider@gentoo.org> bsh-1.3.0.ebuild,bsh-1.2-r7.ebuild:
+  Version Bump.
+  Removed keywords for arm,hppa,mips, since there's no JVM on those ARCH's.
+
+*bsh-1.2-r7 (14 May 2003)
+
+  14 May 2003; Dylan Carlson <absinthe@gentoo.org> bsh-1.2-r7.ebuild,
+  files/bsh.Console, files/bsh.Interpreter:
+  Initial import.
+
diff --git a/dev-java/bsh/Manifest b/dev-java/bsh/Manifest
new file mode 100644
index 00000000..d0acaa81
--- /dev/null
+++ b/dev-java/bsh/Manifest
@@ -0,0 +1,10 @@
+MD5 c15514e967930e06bdde72bed3c9918a ChangeLog 3640
+MD5 745200282d6e70a9f0914ad2fcd012ec bsh-2.0_beta4-r1.ebuild 2065
+MD5 32448cba89ef5394ffab7a7cdb399ded files/beanshell.desktop 266
+MD5 e98c8ab811f673d6089a092d3b8a3d97 files/bsh.Console 856
+MD5 c0ad0331cfc0855056051a83d34fc35f files/bsh.Interpreter 871
+MD5 af516cc82d6597c5f6f49ad83916647e files/bsh2-build.patch 1704
+MD5 356a59a8ed4e03783dc4ec5a143ef75f files/bsh2-readline.patch 5428
+MD5 b2c7f4d348c2075960cec1811975f5c9 files/bsh2.0b4-build.patch 1697
+MD5 e3573013987b1143543da192ca717039 files/digest-bsh-2.0_beta4-r1 125
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
diff --git a/dev-java/bsh/bsh-2.0_beta4-r1.ebuild b/dev-java/bsh/bsh-2.0_beta4-r1.ebuild
new file mode 100644
index 00000000..0d09dd72
--- /dev/null
+++ b/dev-java/bsh/bsh-2.0_beta4-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/bsh-2.0_beta4.ebuild,v 1.5 2005/09/11 11:45:27 axxo Exp $
+
+inherit java-pkg eutils
+
+MY_PV=${PV/_beta/b}
+MY_DIST=${PN}-${MY_PV}-src.jar
+
+DESCRIPTION="BeanShell: A small embeddable Java source interpreter"
+HOMEPAGE="http://www.beanshell.org"
+SRC_URI="http://www.beanshell.org/${MY_DIST} mirror://gentoo/beanshell-icon.png"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE="doc jikes readline source"
+
+RDEPEND=">=virtual/jdk-1.4
+	=dev-java/bsf-2.3*
+	=dev-java/servletapi-2.4*
+	readline? ( dev-java/libreadline-java )"
+DEPEND="${RDEPEND}
+	source? ( app-arch/zip )
+	>=dev-java/ant-core-1.6"
+
+S=${WORKDIR}/BeanShell-${MY_PV}
+
+src_unpack() {
+	# Extract the sources
+	cd ${WORKDIR}
+	source /etc/profile
+	jar xf ${DISTDIR}/${MY_DIST} || die "failed to unpack"
+
+	# Apply the build patch
+	cd ${S}
+	epatch ${FILESDIR}/bsh${MY_PV}-build.patch
+
+	# Copy the needed files
+	cp ${FILESDIR}/bsh.Console ${FILESDIR}/bsh.Interpreter ${S}
+
+	# Patch with readline if required
+	if use readline ; then
+		# Apply the patch
+		epatch ${FILESDIR}/bsh2-readline.patch
+	fi
+	local classpath="bsf-2.3,servletapi-2.4"
+	use readline && classpath="${classpath},libreadline-java"
+	classpath="$(java-pkg_getjars ${classpath})"
+}
+
+src_compile() {
+	local classpath="bsf-2.3,servletapi-2.4"
+	use readline && classpath="${classpath},libreadline-java"
+	classpath="$(java-pkg_getjars ${classpath})"
+
+	local antflags="jarall"
+	use doc && antflags="${antflags} javadoc"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	ant -lib ${classpath} ${antflags} || die "Compile Failed!"
+}
+
+src_install() {
+	mv ${S}/dist/${P/_beta/b}.jar ${S}/dist/${PN}.jar
+	java-pkg_dojar ${S}/dist/${PN}.jar
+
+	newbin ${S}/bsh.Console bsh-console
+	newbin ${S}/bsh.Interpreter bsh-interpreter
+
+	use doc && java-pkg_dohtml -r ${S}/javadoc/*
+
+	newicon ${DISTDIR}/beanshell-icon.png beanshell.png
+
+	make_desktop_entry bsh-console "BeanShell Prompt" beanshell
+}
diff --git a/dev-java/bsh/files/beanshell.desktop b/dev-java/bsh/files/beanshell.desktop
new file mode 100644
index 00000000..b6e96af7
--- /dev/null
+++ b/dev-java/bsh/files/beanshell.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Exec=bsh.Console
+Terminal=false
+Name=BeanShell Prompt
+GenericName=Java Command Prompt
+Comment=An interactive Java command prompt
+Categories=Application;Development
+Icon=/usr/share/pixmaps/beanshell-icon.png
\ No newline at end of file
diff --git a/dev-java/bsh/files/bsh.Console b/dev-java/bsh/files/bsh.Console
new file mode 100644
index 00000000..fe7f938e
--- /dev/null
+++ b/dev-java/bsh/files/bsh.Console
@@ -0,0 +1,31 @@
+#!/bin/sh
+# bsh.Console Launch Script
+# Author: Dylan Carlson
+# May 2003
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/files/bsh.Console,v 1.3 2005/03/10 17:45:40 luckyduck Exp $
+
+JAVA_HOME=`/usr/bin/java-config --jdk-home`
+if [ -z "${JAVA_HOME}" ] ; then
+	JAVA_HOME=`/usr/bin/java-config --jre-home`
+fi
+CLASSPATH="${CLASSPATH}:`/usr/bin/java-config --classpath=bsh,bsf-2.3,servletapi-2.4,libreadline-java`"
+
+if [ ! -f ${JAVA_HOME}/bin/java ] ; then
+	echo " "
+	echo "I tried using the following Java Runtime:"
+	echo "${JAVA_HOME}/bin/java" 
+	echo " "
+	echo "Java Runtime missing.  Please run java-config(1) and ensure"
+	echo "your environment is configured properly."
+	exit 1
+else
+	echo " "
+	echo "Using Java Runtime:"
+	echo "${JAVA_HOME}/bin/java" 
+	echo " "
+	echo "Using CLASSPATH:"
+	echo "${CLASSPATH}"
+	echo " "
+fi
+
+${JAVA_HOME}/bin/java bsh.Console
diff --git a/dev-java/bsh/files/bsh.Interpreter b/dev-java/bsh/files/bsh.Interpreter
new file mode 100644
index 00000000..ae80eeb5
--- /dev/null
+++ b/dev-java/bsh/files/bsh.Interpreter
@@ -0,0 +1,31 @@
+#!/bin/sh
+# bsh.Interpreter Launch Script
+# Author: Dylan Carlson
+# May 2003
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/files/bsh.Interpreter,v 1.3 2005/03/10 17:45:40 luckyduck Exp $
+
+JAVA_HOME=`/usr/bin/java-config --jdk-home`
+if [ -z "${JAVA_HOME}" ] ; then
+	JAVA_HOME=`/usr/bin/java-config --jre-home`
+fi
+CLASSPATH="${CLASSPATH}:`/usr/bin/java-config --classpath=bsh,bsf-2.3,servletapi-2.4,libreadline-java`"
+
+if [ ! -f ${JAVA_HOME}/bin/java ] ; then
+	echo " "
+	echo "I tried using the following Java Runtime:"
+	echo "${JAVA_HOME}/bin/java" 
+	echo " "
+	echo "Java Runtime missing.  Please run java-config(1) and ensure"
+	echo "your environment is configured properly."
+	exit 1
+else
+	echo " "
+	echo "Using Java Runtime:"
+	echo "${JAVA_HOME}/bin/java" 
+	echo " "
+	echo "Using CLASSPATH:"
+	echo "${CLASSPATH}"
+	echo " "
+fi
+
+${JAVA_HOME}/bin/java bsh.Interpreter $*
diff --git a/dev-java/bsh/files/bsh2-build.patch b/dev-java/bsh/files/bsh2-build.patch
new file mode 100644
index 00000000..4ab3112c
--- /dev/null
+++ b/dev-java/bsh/files/bsh2-build.patch
@@ -0,0 +1,54 @@
+--- BeanShell/build.xml~	2004-01-20 19:12:20.888557245 -0500
++++ BeanShell/build.xml	2004-01-20 19:13:36.150184282 -0500
+@@ -103,50 +103,7 @@
+ 		value="docs/manual/bshcommands-bshdoc.xml"/>
+ 
+ <!-- Begin Targets -->
+-
+-	<!-- The javacc targets could be smarter... -->
+-	<target name="checkjjt">
+-		<uptodate property="jjtree.notRequired" 
+-				targetfile="${src-dir}/bsh/bsh.jj"
+-		>
+-			<srcfiles dir="${src-dir}/bsh" includes="bsh.jjt"/>
+-		</uptodate>
+-	</target>
+-	<target name="checkjj">
+-		<uptodate property="javacc.notRequired" 
+-				targetfile="${src-dir}/bsh/Parser.java"
+-		>
+-			<srcfiles dir="${src-dir}/bsh" includes="bsh.jj"/>
+-		</uptodate>
+-	</target>
+-
+-	<!-- Create bsh.jj when bsh.jjt changes. -->
+-	<target name="jjtree" unless="jjtree.notRequired" depends="checkjjt">
+-		<java classname="jjtree"
+-			fork="yes"
+-			failonerror="yes" >
+-			<arg 
+-				line="-OUTPUT_DIRECTORY=${src-dir}/bsh ${src-dir}/bsh/bsh.jjt"/>
+-			<classpath>
+-				<fileset refid="lib-fileset"/>
+-			</classpath>
+-		</java>
+-	</target>
+-
+-	<!-- Create Parser.java when bsh.jj changes. -->
+-	<target name="javacc" unless="javacc.notRequired" depends="checkjj">
+-		<java classname="javacc"
+-			fork="yes"
+-			failonerror="yes" >
+-			<!-- classpath="${javacc-lib}" -->
+-			<arg line="-OUTPUT_DIRECTORY=${src-dir}/bsh ${src-dir}/bsh/bsh.jj"/>
+-			<classpath>
+-				<fileset refid="lib-fileset"/>
+-			</classpath>
+-		</java>
+-	</target>
+-
+-	<target name="compile" depends="jjtree,javacc,builddir">
++	<target name="compile" depends="builddir">
+ 		<!-- exclude the ${excludes} as well as anything under a "bak" dir -->
+ 		<!--compiler="${build-compiler}"-->
+ 		<javac srcdir="${src-dir}:${test-src-dir}:${bsf-src-dir}"
diff --git a/dev-java/bsh/files/bsh2-readline.patch b/dev-java/bsh/files/bsh2-readline.patch
new file mode 100644
index 00000000..f6aa7d4a
--- /dev/null
+++ b/dev-java/bsh/files/bsh2-readline.patch
@@ -0,0 +1,151 @@
+--- BeanShell/src/bsh/Interpreter.java~	2003-09-03 19:56:58.000000000 -0400
++++ BeanShell/src/bsh/Interpreter.java	2004-01-25 09:59:41.730059108 -0500
+@@ -38,6 +38,13 @@
+ import java.lang.reflect.Method;
+ import java.lang.reflect.InvocationTargetException;
+ 
++import bsh.util.BshCompleter;
++import bsh.util.NameCompletionTable;
++import bsh.classpath.ClassManagerImpl;
++import org.gnu.readline.Readline;
++import org.gnu.readline.ReadlineLibrary;
++import org.gnu.readline.ReadlineReader;
++
+ /**
+ 	The BeanShell script interpreter.
+ 
+@@ -394,10 +401,59 @@
+ 			else
+ 				src = System.in;
+ 
+-            Reader in = new CommandLineReader( new InputStreamReader(src));
+-            Interpreter interpreter = 
+-				new Interpreter( in, System.out, System.err, true );
+-        	interpreter.run();
++            Reader in = null;
++            boolean usingReadline = false;
++            String backingLib = System.getProperty("bsh.console.readlinelib"); System.out.println("backingLib is " + backingLib);
++            if (backingLib != null && backingLib.length() > 0) {
++                try {
++                    File history = new File(System.getProperty("user.home") +
++                                            File.separator + ".bsh_history");
++                    if (!history.exists()) {
++                        try {
++                            history.createNewFile();
++                        } catch(IOException ioe) {
++                            debug("Unable to create history  " + history.getAbsolutePath());
++                        }
++                    }
++                    ReadlineLibrary lib = ReadlineLibrary.byName(backingLib);
++                    // should I wrap CommandLineReader around it?
++                    if (history.canWrite() && history.canRead()) {
++                        in = new ReadlineReader("bsh % ", history,lib);
++                    } else {
++                        in = new ReadlineReader("bsh % ",lib);
++                        debug("Unable to read/write history  " + history.getAbsolutePath());
++                    }
++                } catch (IOException ioe) {
++                    System.err.println("Unable to invoke ReadlineReader " +
++                                       "due to: " + ioe);
++                }
++            }
++            if (in == null)
++                in = new CommandLineReader( new InputStreamReader(src));
++            else
++                usingReadline = true;
++            Interpreter interpreter =
++                new Interpreter( in, System.out, System.err, true );
++            if (usingReadline) {
++                NameCompletionTable nct = new NameCompletionTable();
++                nct.add(interpreter.getNameSpace());
++
++                /** ClassManager does a lot of chatting to the stdout,
++                 *  so this has been commented out for the time being
++                 **/
++
++//              try {
++//                  BshClassManager bcm = BshClassManager.getClassManager();
++//                      if (bcm != null) {
++//                          nct.add(((ClassManagerImpl)bcm).getClassPath());
++//                      }
++//                  } catch(ClassPathException cpe) {
++//                      debug("classpath exception in name compl:" + cpe);
++//                  }
++
++                Readline.setCompleter(new BshCompleter(nct));
++            }
++            interpreter.run();
+         }
+     }
+ 
+@@ -445,7 +501,7 @@
+                 System.err.flush();
+                 Thread.yield();  // this helps a little
+ 
+-                if ( interactive )
++                if ( interactive && !(in instanceof ReadlineReader))
+                     print( getBshPrompt() );
+ 
+                 eof = Line();
+@@ -548,10 +604,17 @@
+             }
+         }
+ 
+-		if ( interactive && exitOnEOF )
+-			System.exit(0);
++        if ( interactive && exitOnEOF ) {
++            /* should be done for all streams in general, but this
++             * ensures that the history for readline is flushed */
++            try {
++                in.close();
++            } catch (IOException ioe) {
++            }
++	
++            System.exit(0);
+     }
+-
++   }
+ 	// begin source and eval
+ 
+ 	/**
+--- /dev/null	2003-10-19 02:52:03.000000000 -0400
++++ BeanShell/src/bsh/util/BshCompleter.java	2004-01-25 10:14:10.184458217 -0500
+@@ -0,0 +1,38 @@
++package bsh.util;
++
++import org.gnu.readline.ReadlineCompleter;
++
++/**
++ * An adapter for org.gnu.readline's ReadlineCompleter interface to map to
++ * BeanShell's NameCompleter interface.
++ *
++ * @see org.gnu.readline.ReadlineReader
++ * @version $Revision: 1.1 $
++ * @author Shane Celis <shane@terraspring.com>
++ **/
++public class BshCompleter implements ReadlineCompleter {
++
++    private NameCompletion completer;
++
++    /**
++     * Constructs a <code>ReadlineCompleter</code> out of a
++     * <code>NameCompleter</code> object.
++     **/
++    public BshCompleter(NameCompletion completer) {
++        this.completer = completer;
++    }
++
++    /**
++     * Returns String of completion if unambiguous, otherwise null
++     **/
++    public String completer(String text, int state) {
++        // Not sure what state is used for in ReadlineCompleter
++        String[] completions = completer.completeName(text);
++        if (completions.length == 1 && state == 0) {
++            return completions[0];
++        } else {
++            return null;        // ambiguous result
++        }
++    }
++
++}
diff --git a/dev-java/bsh/files/bsh2.0b4-build.patch b/dev-java/bsh/files/bsh2.0b4-build.patch
new file mode 100644
index 00000000..7492e72b
--- /dev/null
+++ b/dev-java/bsh/files/bsh2.0b4-build.patch
@@ -0,0 +1,53 @@
+--- build.xml	2005-06-22 18:01:39.000000000 +0200
++++ /var/tmp/portage/bsh-2.0_beta4/work/BeanShell-2.0b4/build.xml	2005-06-22 18:02:48.000000000 +0200
+@@ -108,49 +108,7 @@
+ 
+ <!-- Begin Targets -->
+ 
+-	<!-- The javacc targets could be smarter... -->
+-	<target name="checkjjt">
+-		<uptodate property="jjtree.notRequired" 
+-				targetfile="${src-dir}/bsh/bsh.jj"
+-		>
+-			<srcfiles dir="${src-dir}/bsh" includes="bsh.jjt"/>
+-		</uptodate>
+-	</target>
+-	<target name="checkjj">
+-		<uptodate property="javacc.notRequired" 
+-				targetfile="${src-dir}/bsh/Parser.java"
+-		>
+-			<srcfiles dir="${src-dir}/bsh" includes="bsh.jj"/>
+-		</uptodate>
+-	</target>
+-
+-	<!-- Create bsh.jj when bsh.jjt changes. -->
+-	<target name="jjtree" unless="jjtree.notRequired" depends="checkjjt">
+-		<java classname="jjtree"
+-			fork="yes"
+-			failonerror="yes" >
+-			<arg 
+-				line="-OUTPUT_DIRECTORY=${src-dir}/bsh ${src-dir}/bsh/bsh.jjt"/>
+-			<classpath>
+-				<fileset refid="lib-fileset"/>
+-			</classpath>
+-		</java>
+-	</target>
+-
+-	<!-- Create Parser.java when bsh.jj changes. -->
+-	<target name="javacc" unless="javacc.notRequired" depends="checkjj">
+-		<java classname="javacc"
+-			fork="yes"
+-			failonerror="yes"
+-			classpath="${javacc-lib}">
+-			<arg line="-OUTPUT_DIRECTORY=${src-dir}/bsh ${src-dir}/bsh/bsh.jj"/>
+-			<classpath>
+-				<fileset refid="lib-fileset"/>
+-			</classpath>
+-		</java>
+-	</target>
+-
+-	<target name="compile" depends="jjtree,javacc,builddir">
++	<target name="compile" depends="builddir">
+ 		<!-- exclude the ${excludes} as well as anything under a "bak" dir -->
+ 		<!--compiler="${build-compiler}"-->
+ 		<javac srcdir="${src-dir}:${test-src-dir}:${bsf-src-dir}:${classgen-src-dir}"
diff --git a/dev-java/bsh/files/digest-bsh-2.0_beta4-r1 b/dev-java/bsh/files/digest-bsh-2.0_beta4-r1
new file mode 100644
index 00000000..6e1dbf39
--- /dev/null
+++ b/dev-java/bsh/files/digest-bsh-2.0_beta4-r1
@@ -0,0 +1,2 @@
+MD5 ebba3ce4fcf75c2835a3691cd588a446 beanshell-icon.png 29784
+MD5 49c9cc9872f26d562bffb1e5ec8aa377 bsh-2.0b4-src.jar 1636723
diff --git a/dev-java/bsh/metadata.xml b/dev-java/bsh/metadata.xml
new file mode 100644
index 00000000..838c00a4
--- /dev/null
+++ b/dev-java/bsh/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>java</herd>
+</pkgmetadata>
diff --git a/dev-java/gnu-crypto/ChangeLog b/dev-java/gnu-crypto/ChangeLog
new file mode 100644
index 00000000..fb2f1614
--- /dev/null
+++ b/dev-java/gnu-crypto/ChangeLog
@@ -0,0 +1,50 @@
+# ChangeLog for dev-java/gnu-crypto
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-crypto/ChangeLog,v 1.16 2005/07/25 11:16:21 dholm Exp $
+
+  25 Jul 2005; David Holm <dholm@gentoo.org> gnu-crypto-2.0.1-r1.ebuild:
+  Stable on ppc.
+
+  09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> gnu-crypto-2.0.1.ebuild,
+  gnu-crypto-2.0.1-r1.ebuild:
+  force -j1 and some cleanups
+
+*gnu-crypto-2.0.1-r1 (28 May 2005)
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/gnu-crypto-2.0.1-jdk15.patch, +gnu-crypto-2.0.1-r1.ebuild:
+  Added patch to enable compilation with a 1.5 jdk, fixes #94065. Thanks to
+  Mikael Cluseau <nwrk-public@altern.org>.
+
+  27 May 2005; Jan Brinkmann <luckyduck@gentoo.org> gnu-crypto-2.0.1.ebuild:
+  stable on ppc
+
+  29 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> gnu-crypto-2.0.1.ebuild:
+  stable on amd64
+
+  29 Mar 2005; Markus Rothe <corsair@gentoo.org> gnu-crypto-2.0.1.ebuild:
+  Stable on ppc64; bug #86799
+
+  26 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> gnu-crypto-2.0.1.ebuild:
+  jikes support disabled, doesnt work: #86655
+
+  09 Jan 2005; Sven Wegener <swegener@gentoo.org> gnu-crypto-2.0.1.ebuild:
+  Added missing parentheses in SRC_URI/*DEPEND/LICENSE.
+
+  20 Oct 2004; Dylan Carlson <absinthe@gentoo.org> gnu-crypto-2.0.1.ebuild:
+  Keywords ~amd64.
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> gnu-crypto-2.0.1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
+
+  24 Aug 2004; Chris Aniszczyk <zx@gentoo.org> gnu-crypto-2.0.1.ebuild:
+  Marking x86
+
+  03 Jun 2004; David Holm <dholm@gentoo.org> gnu-crypto-2.0.1.ebuild:
+  Added to ~ppc.
+
+*gnu-crypto-2.0.1 (01 Apr 2004)
+
+  01 Apr 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
+  gnu-crypto-2.0.1.ebuild: Initial import. Ebuild submitted by myself.
diff --git a/dev-java/gnu-crypto/Manifest b/dev-java/gnu-crypto/Manifest
new file mode 100644
index 00000000..ce040af7
--- /dev/null
+++ b/dev-java/gnu-crypto/Manifest
@@ -0,0 +1,5 @@
+MD5 b218bc1afdd252b7e74d3e2cb2533c77 ChangeLog 1874
+MD5 a30727b2c8c5fc36a69558733c20d877 files/digest-gnu-crypto-2.0.1-r2 70
+MD5 8450af49bee9ffde3a26100560db5842 files/gnu-crypto-2.0.1-jdk15.patch 1551
+MD5 fdcd10c737413f578e2ba4c070a3371f gnu-crypto-2.0.1-r2.ebuild 1169
+MD5 f68ccff3a15a74a08ec0f41232d8a6e0 metadata.xml 461
diff --git a/dev-java/gnu-crypto/files/digest-gnu-crypto-2.0.1-r2 b/dev-java/gnu-crypto/files/digest-gnu-crypto-2.0.1-r2
new file mode 100644
index 00000000..27fdc694
--- /dev/null
+++ b/dev-java/gnu-crypto/files/digest-gnu-crypto-2.0.1-r2
@@ -0,0 +1 @@
+MD5 39ac686b8f7ecfb95de7d58c85b8935b gnu-crypto-2.0.1.tar.bz2 3895714
diff --git a/dev-java/gnu-crypto/files/gnu-crypto-2.0.1-jdk15.patch b/dev-java/gnu-crypto/files/gnu-crypto-2.0.1-jdk15.patch
new file mode 100644
index 00000000..47957cc5
--- /dev/null
+++ b/dev-java/gnu-crypto/files/gnu-crypto-2.0.1-jdk15.patch
@@ -0,0 +1,30 @@
+diff -Nur gnu-crypto-2.0.1/source/gnu/crypto/sasl/ClientMechanism.java gnu-crypto-2.0.1-new/source/gnu/crypto/sasl/ClientMechanism.java
+--- gnu-crypto-2.0.1/source/gnu/crypto/sasl/ClientMechanism.java	2003-11-21 10:22:10.000000000 +0100
++++ gnu-crypto-2.0.1-new/source/gnu/crypto/sasl/ClientMechanism.java	2005-05-24 16:16:37.493727834 +0200
+@@ -140,9 +140,9 @@
+       return mechanism;

+    }

+ 

+-   public Object getNegotiatedProperty(final String propName) throws SaslException {

++   public Object getNegotiatedProperty(final String propName) {

+       if (!isComplete()) {

+-         throw new IllegalMechanismStateException();

++         throw new IllegalStateException();

+       }

+       if (Sasl.QOP.equals(propName)) {

+          return getNegotiatedQOP();

+diff -Nur gnu-crypto-2.0.1/source/gnu/crypto/sasl/ServerMechanism.java gnu-crypto-2.0.1-new/source/gnu/crypto/sasl/ServerMechanism.java
+--- gnu-crypto-2.0.1/source/gnu/crypto/sasl/ServerMechanism.java	2003-11-21 10:26:14.000000000 +0100
++++ gnu-crypto-2.0.1-new/source/gnu/crypto/sasl/ServerMechanism.java	2005-05-24 16:16:55.503085024 +0200
+@@ -147,9 +147,9 @@
+       return this.authorizationID;

+    }

+ 

+-   public Object getNegotiatedProperty(final String propName) throws SaslException {

++   public Object getNegotiatedProperty(final String propName) {

+       if (!isComplete()) {

+-         throw new IllegalMechanismStateException();

++         throw new IllegalStateException();

+       }

+       if (Sasl.QOP.equals(propName)) {

+          return getNegotiatedQOP();

diff --git a/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild b/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild
new file mode 100644
index 00000000..c68493a0
--- /dev/null
+++ b/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-crypto/gnu-crypto-2.0.1-r1.ebuild,v 1.4 2005/10/30 19:36:30 axxo Exp $
+
+inherit java-pkg eutils
+
+DESCRIPTION="GNU Crypto cryptographic primitives for Java"
+HOMEPAGE="http://www.gnu.org/software/gnu-crypto/"
+SRC_URI="ftp://ftp.gnupg.org/GnuPG/gnu-crypto/gnu-crypto-2.0.1.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc ~ppc64 ~x86"
+IUSE="doc"
+
+DEPEND=">=virtual/jdk-1.3"
+RDEPEND=">=virtual/jre-1.3"
+
+RESTRICT="test"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-jdk15.patch
+}
+
+src_compile() {
+	source /etc/profile
+	PATH=${PATH}:/usr/lib/portage/bin/
+
+	# jikes support disabled, doesnt work: #86655
+	econf \
+		--with-jce=yes \
+		--with-sasl=yes \
+		|| die
+	emake -j1 || die
+	if use doc ; then
+		emake -j1 javadoc || die
+	fi
+}
+
+src_install() {
+	einstall || die
+	rm ${D}/usr/share/*.jar
+
+	java-pkg_dojar source/gnu-crypto.jar
+	java-pkg_dojar jce/javax-crypto.jar
+	java-pkg_dojar security/javax-security.jar
+
+	use doc && java-pkg_dohtml -r api/*
+
+	dodoc AUTHORS ChangeLog NEWS README THANKS
+}
diff --git a/dev-java/gnu-crypto/metadata.xml b/dev-java/gnu-crypto/metadata.xml
new file mode 100644
index 00000000..3a7ea50b
--- /dev/null
+++ b/dev-java/gnu-crypto/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+<herd>java</herd>
+
+<longdescription>
+GNU Crypto, part of the GNU project, released under the aegis of GNU,
+aims at providing free, versatile, high-quality, and provably correct
+implementations of cryptographic primitives and tools in the Java
+programming language for use by programmers and end-users.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/javacup/ChangeLog b/dev-java/javacup/ChangeLog
new file mode 100644
index 00000000..4e4b4975
--- /dev/null
+++ b/dev-java/javacup/ChangeLog
@@ -0,0 +1,40 @@
+# ChangeLog for dev-java/javacup
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacup/ChangeLog,v 1.11 2005/12/09 12:13:56 betelgeuse Exp $
+
+  09 Dec 2005; Petteri Räty <betelgeuse@gentoo.org> javacup-0.10k.ebuild:
+  Removed the installation of the LICENSE file.
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> javacup-0.10k.ebuild:
+  Stable on ppc.
+
+  09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> javacup-0.10k.ebuild:
+  fix deps, and source useflag support
+
+  26 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> javacup-0.10k.ebuild:
+  Stable on sparc
+
+  13 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> javacup-0.10k.ebuild:
+  stable on amd64 and x86.
+
+  26 Jan 2005; Markus Rothe <corsair@gentoo.org> javacup-0.10k.ebuild:
+  Stable on ppc64
+
+  18 Dec 2004; Markus Rothe <corsair@gentoo.org> javacup-0.10k.ebuild:
+  added ~ppc64 to KEYWORDS
+
+  28 Oct 2004; Jason Wever <weeve@gentoo.org> javacup-0.10k.ebuild:
+  Added ~sparc keyword.
+
+  20 Oct 2004; Dylan Carlson <absinthe@gentoo.org> javacup-0.10k.ebuild:
+  Keywords ~amd64.
+
+  17 Oct 2004; David Holm <dholm@gentoo.org> javacup-0.10k.ebuild:
+  Added to ~ppc.
+
+*javacup-0.10k (19 Sep 2004)
+
+  19 Sep 2004; Thomas Matthijs <axxo@gentoo.org> +metadata.xml,
+  +javacup-0.10k.ebuild:
+  initial import, ebuild created me, as a dep
+
diff --git a/dev-java/javacup/Manifest b/dev-java/javacup/Manifest
new file mode 100644
index 00000000..734e4f47
--- /dev/null
+++ b/dev-java/javacup/Manifest
@@ -0,0 +1,4 @@
+MD5 221daabda36b7177badf2ef51aa8a004 ChangeLog 1362
+MD5 908c09cfed6120fc09504305319af259 files/digest-javacup-0.10k-r1 65
+MD5 50ce87e882b51ff1173414bec1c81478 javacup-0.10k-r1.ebuild 986
+MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
diff --git a/dev-java/javacup/files/digest-javacup-0.10k-r1 b/dev-java/javacup/files/digest-javacup-0.10k-r1
new file mode 100644
index 00000000..a0b8b39c
--- /dev/null
+++ b/dev-java/javacup/files/digest-javacup-0.10k-r1
@@ -0,0 +1 @@
+MD5 8b11edfec13c590ea443d0f0ae0da479 java_cup_v10k.tar.gz 190843
diff --git a/dev-java/javacup/javacup-0.10k-r1.ebuild b/dev-java/javacup/javacup-0.10k-r1.ebuild
new file mode 100644
index 00000000..7cf37ab0
--- /dev/null
+++ b/dev-java/javacup/javacup-0.10k-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacup/javacup-0.10k.ebuild,v 1.11 2005/12/09 12:13:56 betelgeuse Exp $
+
+inherit java-pkg
+
+DESCRIPTION="CUP Parser Generator for Java"
+
+HOMEPAGE="http://www.cs.princeton.edu/~appel/modern/java/CUP/"
+SRC_URI="http://www.cs.princeton.edu/~appel/modern/java/CUP/java_cup_v10k.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE="source"
+DEPEND=">=virtual/jdk-1.3
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jre-1.3"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	find . -name "*.class" -exec rm -f {} \;
+}
+
+src_compile() {
+	source /etc/profile
+	javac java_cup/*.java java_cup/runtime/*.java || die "failed to compile"
+	find java_cup -name "*.class" | xargs jar -cvf ${PN}.jar
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	dodoc CHANGELOG README
+	dohtml manual.html
+	use source && java-pkg_dosrc java_cup
+}
diff --git a/dev-java/javacup/metadata.xml b/dev-java/javacup/metadata.xml
new file mode 100644
index 00000000..7303cef9
--- /dev/null
+++ b/dev-java/javacup/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>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jython/ChangeLog b/dev-java/jython/ChangeLog
new file mode 100644
index 00000000..a0590792
--- /dev/null
+++ b/dev-java/jython/ChangeLog
@@ -0,0 +1,100 @@
+# ChangeLog for dev-java/jython
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.28 2005/12/05 03:59:24 nichoj Exp $
+
+  05 Dec 2005; Joshua Nichols <nichoj@gentoo.org> files/jython:
+  Fix for jython script (bug #73655).
+
+  09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> jython-2.1-r6.ebuild:
+  fix deps, and source useflag support
+
+  01 Jul 2005; Thomas Matthijs <axxo@gentoo.org> jython-2.1-r6.ebuild:
+  fix 94099: unpackable class. 97665: use doc useflag for javadocs
+
+*jython-2.1-r6 (29 Jun 2005)
+
+  29 Jun 2005; Thomas Matthijs <axxo@gentoo.org> -jython-2.1-r5.ebuild,
+  +jython-2.1-r6.ebuild:
+  dont install versioned jar
+
+  26 Jan 2005; Markus Rothe <corsair@gentoo.org> jython-2.1-r5.ebuild:
+  Stable on ppc64
+
+  18 Dec 2004; Markus Rothe <corsair@gentoo.org> jython-2.1-r5.ebuild:
+  added ~ppc64 to KEYWORDS
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jython-2.1-r5.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
+
+  16 Oct 2004; Dylan Carlson <absinthe@gentoo.org> jython-2.1-r5.ebuild:
+  Stable on amd64.
+
+  02 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jython-2.1-r5.ebuild:
+  compile with -source 1.3
+
+  17 Sep 2004; <SeJo@gentoo.org> jython-2.1-r5.ebuild:
+  removed addwrite .hotspot, thx Mr_Bones
+
+  16 Sep 2004; <SeJo@gentoo.org> jython-2.1-r5.ebuild:
+  bugfixing with axxo works great
+
+  10 Sep 2004; Thomas Matthijs <axxo@gentoo.org> jython-2.1-r5.ebuild:
+  removed -source 1.3 bug 63480
+
+  10 Sep 2004; Thomas Matthijs <axxo@gentoo.org> files/jython,
+  jython-2.1-r5.ebuild:
+  install the registry file, add the library path to the wrapper, added a
+  comment in postinst on how to enable readline. closes bug 63496
+
+  04 Sep 2004; Thomas Matthijs <axxo@gentoo.org> jython-2.1-r5.ebuild:
+  move jython-bin -> jython, stable on sparc
+
+*jython-2.1-r5 (03 Sep 2004)
+
+  03 Sep 2004; Thomas Matthijs <axxo@gentoo.org> jython-2.1-r5.ebuild,
+  files/jython, files/jythonc:
+  fix paths in wrapper script. fix installion path(depends on being in Lib).
+  changed the way everything gets compiled so we don't have to export the
+  classpath and made it compile everythong
+
+  27 Aug 2004; <SeJo@gentoo.org> jython-2.1-r4.ebuild:
+  stable on ppc
+
+  23 Aug 2004; Chris Aniszczyk <zx@gentoo.org> jython-2.1-r4.ebuild:
+  Marking x86
+
+  31 Jul 2004; Karl Trygve Kalleberg <karltk@gentoo.org>:
+  jython-2.1-r4.ebuild: Rewrote almost totally to compile from source. Ugly hack
+  that needs more attention.
+
+  16 Jul 2004; Thomas Matthijs <axxo@gentoo.org> :
+  fix python.home path in files/jython closes 49841
+  fix path in jythonc (although it still doesn't work, looks like it never did
+  if you know how to fix it, please let me know or file a bug on bugzilla)
+
+  19 Jun 2004; Jason Wever <weeve@gentoo.org> jython-2.1-r2.ebuild:
+  Stable on sparc.
+
+  19 Jan 2004; Adrian Almenar <strider@gentoo.org> jython-2.1-r2.ebuild:
+  Added amd64 keyword.
+
+*jython-2.1-r2 (17 Jan 2004)
+
+  17 Jan 2004; Adrian Almenar <strider@gentoo.org> jython-2.1-r1.ebuild,
+  jython-2.1-r2.ebuild, jython-2.1.ebuild:
+  Fixes #25533. Ebuild submitted by Chris Aniszczyk <zx@mea-culpa.net>. Moved
+  2.1-r1 to stable, Removed 2.1.
+
+*jython-2.1-r1 (13 May 2003)
+
+  13 May 2003; Todd Berman <tberman@gentoo.org> jython-2.1-r1.ebuild,
+  files/jython, files/jythonc:
+  Fixed up ebuild, closing bug #20562, bumped revision # for people with it
+  already installed.
+
+*jython-2.1 (29 Apr 2003)
+
+  29 Apr 2003; Todd Berman <tberman@gentoo.org> jython-2.1.ebuild:
+  Initial import.
+
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
new file mode 100644
index 00000000..886801b3
--- /dev/null
+++ b/dev-java/jython/Manifest
@@ -0,0 +1,6 @@
+MD5 6ee4aeb6f271b4b16b58773920d5a48c ChangeLog 3602
+MD5 d38ea464f1cad146456318d7ee87319a files/digest-jython-2.1-r7 64
+MD5 47a98e90e6282fae67a841a3fae52a90 files/jython 394
+MD5 17272ca5f12bd9bb307210c12606d526 files/jythonc 67
+MD5 069a26551445605521425236d905961f jython-2.1-r7.ebuild 2222
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
diff --git a/dev-java/jython/files/digest-jython-2.1-r7 b/dev-java/jython/files/digest-jython-2.1-r7
new file mode 100644
index 00000000..7f3b7891
--- /dev/null
+++ b/dev-java/jython/files/digest-jython-2.1-r7
@@ -0,0 +1 @@
+MD5 74f21a0185135396c71453bc279c179f jython-2.1.tar.bz2 1301528
diff --git a/dev-java/jython/files/jython b/dev-java/jython/files/jython
new file mode 100644
index 00000000..9667d387
--- /dev/null
+++ b/dev-java/jython/files/jython
@@ -0,0 +1,7 @@
+#!/bin/sh
+###############################################################################
+#
+# This file generated by Jython installer
+# Created on XXX by root
+
+exec $(java-config --java) -Djava.library.path="$(java-config -i libreadline-java)" -Dpython.home="/usr/share/jython" -classpath "$(java-config --classpath=jython,libreadline-java 2>/dev/null):CLASSPATH" "org.python.util.jython" "$@"
diff --git a/dev-java/jython/files/jythonc b/dev-java/jython/files/jythonc
new file mode 100644
index 00000000..39efd061
--- /dev/null
+++ b/dev-java/jython/files/jythonc
@@ -0,0 +1,2 @@
+#!/bin/sh
+jython "/usr/share/jython/tools/jythonc/jythonc.py" "$@"
diff --git a/dev-java/jython/jython-2.1-r7.ebuild b/dev-java/jython/jython-2.1-r7.ebuild
new file mode 100644
index 00000000..fa7cc0a4
--- /dev/null
+++ b/dev-java/jython/jython-2.1-r7.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.1-r6.ebuild,v 1.3 2005/07/09 16:06:00 axxo Exp $
+
+inherit java-pkg
+
+DESCRIPTION="An implementation of Python written in Java"
+HOMEPAGE="http://www.jython.org"
+MY_PV="21"
+#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.class"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+LICENSE="JPython"
+SLOT="0"
+KEYWORDS="x86 ppc sparc amd64 ppc64"
+IUSE="readline jikes source doc"
+# servlet
+
+RDEPEND=">=virtual/jre-1.2
+	readline? ( >=dev-java/libreadline-java-0.8.0 )
+	jikes? ( >=dev-java/jikes-1.18 )"
+#	servlet? ( >=net-www/tomcat-5.0 )
+DEPEND=">=virtual/jdk-1.2
+	source? ( app-arch/zip )
+	${RDEPEND}"
+
+src_compile() {
+	javac=$(java-config -c)
+	if use jikes ; then
+		java=$(which jikes)
+	fi
+
+	local cp="."
+	local exclude=""
+
+	if use readline ; then
+		cp=${cp}:$(java-pkg_getjars libreadline-java)
+	else
+		exclude="${exclude} ! -name ReadlineConsole.java"
+	fi
+
+	#if use servlet; then
+	#	cp=${cp}:$(java-pkg_getjars servlet)
+	#else
+		exclude="${exclude} ! -name PyServlet.java"
+	#fi
+
+	find org -name "*.java" ${exclude} | xargs ${javac} -source 1.3 -classpath ${cp} -nowarn || die "Failed to compile"
+
+	source /etc/profile
+	find org -name "*.class" | xargs jar cf ${PN}.jar
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+
+	dodoc README.txt NEWS ACKNOWLEDGMENTS
+	use doc && java-pkg_dohtml -A .css .jpg .gif -r Doc/*
+	newbin ${FILESDIR}/jython jython
+	newbin ${FILESDIR}/jythonc jythonc
+
+	dodir /usr/share/jython/cachedir
+	chmod a+rw ${D}/usr/share/jython/cachedir
+
+	rm Demo/jreload/example.jar
+	insinto /usr/share/${PN}
+	doins -r Lib Demo registry
+
+	insinto /usr/share/${PN}/tools
+	doins -r Tools/*
+
+	use source && java-pkg_dosrc com org
+}
+
+pkg_postinst() {
+	if use readline; then
+		einfo "To use readline you need to add the following to your registery"
+		einfo
+		einfo "python.console=org.python.util.ReadlineConsole"
+		einfo "python.console.readlinelib=GnuReadline"
+		einfo
+		einfo "The global registry can be found in /usr/share/${PN}/registry"
+		einfo "User registry in \$HOME/.jython"
+		einfo "See http://www.jython.org/docs/registry.html for more information"
+	fi
+}
diff --git a/dev-java/jython/metadata.xml b/dev-java/jython/metadata.xml
new file mode 100644
index 00000000..838c00a4
--- /dev/null
+++ b/dev-java/jython/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>java</herd>
+</pkgmetadata>
diff --git a/dev-java/libreadline-java/ChangeLog b/dev-java/libreadline-java/ChangeLog
new file mode 100644
index 00000000..e9391d3e
--- /dev/null
+++ b/dev-java/libreadline-java/ChangeLog
@@ -0,0 +1,78 @@
+# ChangeLog for dev-java/libreadline-java
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libreadline-java/ChangeLog,v 1.19 2005/07/09 16:06:44 axxo Exp $
+
+  09 Jul 2005; Thomas Matthijs <axxo@gentoo.org>
+  libreadline-java-0.8.0-r1.ebuild:
+  fix deps, and source useflag support, small cleanup
+
+  26 Jan 2005; Markus Rothe <corsair@gentoo.org>
+  libreadline-java-0.8.0-r1.ebuild:
+  Stable on ppc64
+
+  18 Dec 2004; Markus Rothe <corsair@gentoo.org>
+  libreadline-java-0.8.0-r1.ebuild:
+  added ~ppc64 to KEYWORDS
+
+  17 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  libreadline-java-0.8.0-r1.ebuild:
+  dojar --> java-pkg_dojar
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  libreadline-java-0.8.0-r1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
+
+  16 Oct 2004; Dylan Carlson <absinthe@gentoo.org>
+  libreadline-java-0.8.0-r1.ebuild:
+  Stable on amd64.
+
+  23 Sep 2004; Thomas Matthijs <axxo@gentoo.org>
+  -libreadline-java-0.8.0.ebuild:
+  removing
+
+  23 Sep 2004; <SeJo@gentoo.org> libreadline-java-0.8.0-r1.ebuild:
+  stable lovin :-)
+
+  23 Sep 2004; Thomas Matthijs <axxo@gentoo.org>
+  libreadline-java-0.8.0-r1.ebuild:
+  x86,sparc
+
+*libreadline-java-0.8.0-r1 (11 Sep 2004)
+
+  11 Sep 2004; Thomas Matthijs <axxo@gentoo.org>
+  +files/termcap-to-ncurses.patch, +libreadline-java-0.8.0-r1.ebuild:
+  link against ncurses, gets rid of libtermcap-compat dependency, patch
+  submitted by Sven <skoehler@upb.de>, bug 63129
+
+  07 Sep 2004; Thomas Matthijs <axxo@gentoo.org>
+  libreadline-java-0.8.0.ebuild:
+  disable maketest, bug 63102
+
+  04 Sep 2004; Thomas Matthijs <axxo@gentoo.org>
+  libreadline-java-0.8.0.ebuild:
+  stable on sparc
+
+  23 Aug 2004; Chris Aniszczyk <zx@gentoo.org> libreadline-java-0.8.0.ebuild:
+  Marking stable on x86
+
+  27 Aug 2004; <SeJo@gentoo.org> libreadline-java-0.8.0.ebuild:
+  stable on ppc
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> libreadline-java-0.8.0.ebuild:
+  Added to ~ppc.
+
+  20 Apr 2004; Martin Holzer <mholzer@gentoo.org>
+  libreadline-java-0.8.0.ebuild:
+  src_uri now uses mirror://sf
+
+  14 Apr 2004; Chris Aniszczyk <zx@gentoo.org> libreadline-java-0.8.0.ebuild:
+  Added lib-compat as a depend, closes #47767.
+  Thanks to <quannump@netscape.net> for the fix.
+
+*libreadline-java-0.8.0 (16 Feb 2004)
+
+  16 Feb 2004; Chris Aniszczyk <zx@gentoo.org libreadline-java-0.8.0.ebuild:
+  Initial Import. Thanks to Matteo Coloberti <xteo78@libero.it> for the initial
+  ebuild. Bug #34107
+
diff --git a/dev-java/libreadline-java/Manifest b/dev-java/libreadline-java/Manifest
new file mode 100644
index 00000000..c037e9a0
--- /dev/null
+++ b/dev-java/libreadline-java/Manifest
@@ -0,0 +1,6 @@
+MD5 2afcb59fafd97db77c8fd32b17962d66 ChangeLog 2551
+MD5 9e6c8c38a34f297ef3ff5d65648dc214 files/digest-libreadline-java-0.8.0-r2 77
+MD5 6cc4fe1ccc527446ade56f52f83fca2a files/env.patch 207
+MD5 dcfb40cea2d4ce6b93a3a05548f702a0 files/termcap-to-ncurses.patch 498
+MD5 49dffdd589039aee9847ac4fa4ed748e libreadline-java-0.8.0-r2.ebuild 1069
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
diff --git a/dev-java/libreadline-java/files/digest-libreadline-java-0.8.0-r2 b/dev-java/libreadline-java/files/digest-libreadline-java-0.8.0-r2
new file mode 100644
index 00000000..362f20cd
--- /dev/null
+++ b/dev-java/libreadline-java/files/digest-libreadline-java-0.8.0-r2
@@ -0,0 +1 @@
+MD5 501720ddded45eaedf429b7cc356107c libreadline-java-0.8.0-src.tar.gz 77122
diff --git a/dev-java/libreadline-java/files/env.patch b/dev-java/libreadline-java/files/env.patch
new file mode 100644
index 00000000..6582009d
--- /dev/null
+++ b/dev-java/libreadline-java/files/env.patch
@@ -0,0 +1,11 @@
+--- Makefile.old	2006-01-10 00:28:23.000000000 +0100
++++ Makefile	2006-01-10 00:28:31.000000000 +0100
+@@ -69,7 +69,7 @@
+ endif
+ 
+ ## normal javac
+-JAVAC = javac
++#JAVAC = javac
+ JC_FLAGS = 
+ 
+ ## with jikes
diff --git a/dev-java/libreadline-java/files/termcap-to-ncurses.patch b/dev-java/libreadline-java/files/termcap-to-ncurses.patch
new file mode 100644
index 00000000..22921c80
--- /dev/null
+++ b/dev-java/libreadline-java/files/termcap-to-ncurses.patch
@@ -0,0 +1,13 @@
+--- src/native/Makefile.org	2004-09-07 16:43:16.703100016 +0200
++++ src/native/Makefile	2004-09-07 16:43:28.804919625 +0200
+@@ -45,8 +45,8 @@
+ CFLAGS=-DWIN32=$(WIN32) -D__IBMC__
+ else
+ INCLUDES          = -I $(JAVAINCLUDE) -I $(JAVANATINC)
+-LIBPATH           = -L/usr/lib/termcap 
+-JavaReadline_LIBS = -lreadline -ltermcap -lhistory
++LIBPATH           = 
++JavaReadline_LIBS = -lreadline -lncurses -lhistory
+ JavaEditline_LIBS = -ledit -ltermcap
+ ifeq (cygwin,$(WIN32))
+ JavaGetline_LIBS = -lcygwin
diff --git a/dev-java/libreadline-java/libreadline-java-0.8.0-r2.ebuild b/dev-java/libreadline-java/libreadline-java-0.8.0-r2.ebuild
new file mode 100644
index 00000000..60900568
--- /dev/null
+++ b/dev-java/libreadline-java/libreadline-java-0.8.0-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libreadline-java/libreadline-java-0.8.0-r1.ebuild,v 1.10 2005/07/09 16:06:44 axxo Exp $
+
+inherit java-pkg eutils
+
+DESCRIPTION="A JNI-wrapper to GNU Readline."
+HOMEPAGE="http://java-readline.sourceforge.net/"
+SRC_URI="mirror://sourceforge/java-readline/${P}-src.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="x86 sparc ppc amd64 ppc64"
+IUSE="doc source"
+
+RDEPEND=">=virtual/jre-1.4
+	sys-libs/ncurses"
+DEPEND=">=virtual/jdk-1.4
+	source? ( app-arch/zip )
+	${RDEPEND}"
+RESTRICT="test"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/termcap-to-ncurses.patch
+	epatch ${FILESDIR}/env.patch
+}
+
+src_compile() {
+	source /etc/profile
+	make || die "failed to compile"
+	if use doc; then
+		make apidoc || die "failed to generate docs"
+	fi
+}
+
+src_install() {
+	java-pkg_doso *.so
+	java-pkg_dojar *.jar
+	use source && java-pkg_dosrc src/*
+	use doc && java-pkg_dohtml -r api/*
+	dodoc  ChangeLog NEWS README README.1st TODO
+}
diff --git a/dev-java/libreadline-java/metadata.xml b/dev-java/libreadline-java/metadata.xml
new file mode 100644
index 00000000..838c00a4
--- /dev/null
+++ b/dev-java/libreadline-java/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>java</herd>
+</pkgmetadata>
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index 4db0cae1..9bb73654 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -2,4 +2,4 @@ MD5 2c4a27af96f02fda96088c16ba7391e2 files/digest-gaim-2.0.0_beta1-r4 69
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gaim-9999 0
 MD5 26f66f1d23f9e7e776b157dd02dc2e7f files/gaim-to-gaim2.patch 5425350
 MD5 4f26dc11ef16b93a191eaff015d4444b gaim-2.0.0_beta1-r4.ebuild 5442
-MD5 324567dfb8246f41f8db0f37f0a17e58 gaim-9999.ebuild 5573
+MD5 eb6168c51b85a572be9563e992d3c72d gaim-9999.ebuild 5786
diff --git a/net-im/gaim/gaim-9999.ebuild b/net-im/gaim/gaim-9999.ebuild
index 64617b04..acccf0fc 100644
--- a/net-im/gaim/gaim-9999.ebuild
+++ b/net-im/gaim/gaim-9999.ebuild
@@ -16,6 +16,7 @@ HOMEPAGE="http://gaim.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="2"
+KEYWORDS="~x86"
 IUSE="bonjour dbus nls perl spell nas cjk gnutls silc eds krb4 tcltk debug mono xscreensaver truespeech ao startup-notification audiofile vv"
 
 RDEPEND="media-libs/libao
@@ -94,8 +95,8 @@ print_gaim_warning() {
 	einfo
 	einfo "Note that we are now filtering all unstable flags in C[XX]FLAGS."
 	einfo
-	ebeep 5
-	epause 3
+	#ebeep 5
+	#epause 3
 }
 
 pkg_setup() {
@@ -116,7 +117,11 @@ src_unpack() {
 }
 
 src_compile() {
-	epatch ${FILESDIR}/gaim-to-gaim2.patch
+	ewarn "Convert Gaim to Gaim"
+	#epatch ${FILESDIR}/gaim-to-gaim2.patch
+	find . -type f -exec sed -i -e 's/gaim/gaim2/g' {} \;
+	find . -type f -exec sed -i -e 's/Gaim/Gaim2/g' {} \;
+	find . -type f -exec sed -i -e 's/GAIM/GAIM2/g' {} \;
 
 	# Stabilize things, for your own good
 	strip-flags
@@ -158,7 +163,7 @@ src_compile() {
 	fi
 
 	./autogen.sh
-	mv pixmaps/gaim{,2}.png
+	v pixmaps/gaim{,2}.png
 	econf ${myconf} || die "Configuration failed"
 
 	emake -j1 || die "Make failed"