Should be sun-jimi, not sun-jimi-bin, of course.

23 files changed, 218 insertions, 117 deletions

diff --git a/dev-java/ant-core/ant-core-1.6.2.ebuild b/dev-java/ant-core/ant-core-1.6.2.ebuild
index 2af21c135f14..08e7176d0c5a 100644
--- a/dev-java/ant-core/ant-core-1.6.2.ebuild
+++ b/dev-java/ant-core/ant-core-1.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.6.2.ebuild,v 1.5 2004/12/18 08:54:32 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.6.2.ebuild,v 1.6 2004/12/23 12:14:06 karltk Exp $
 
 inherit java-pkg eutils
 
@@ -16,9 +16,9 @@ KEYWORDS="x86 amd64 ppc sparc ~ppc64"
 IUSE="doc"
 
 DEPEND="virtual/libc
-	>=virtual/jdk-1.4
+	>=virtual/jdk-1.3
 	>=dev-java/java-config-1.2"
-RDEPEND=">=virtual/jdk-1.4
+RDEPEND=">=virtual/jre-1.3
 	app-shells/bash
 	>=dev-java/java-config-1.2"
 
diff --git a/dev-java/bcel/ChangeLog b/dev-java/bcel/ChangeLog
index 161efbeb318b..ac0eecf4f49b 100644
--- a/dev-java/bcel/ChangeLog
+++ b/dev-java/bcel/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/bcel
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcel/ChangeLog,v 1.20 2004/12/18 09:22:15 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcel/ChangeLog,v 1.21 2004/12/23 12:14:06 karltk Exp $
+
+  20 Dec 2004; Karl Trygve Kalleberg <karltk@gentoo.org> bcel-5.1.ebuild:
+  added ~alpha to KEYWORDS. Fixes #69366.
 
   18 Dec 2004; Markus Rothe <corsair@gentoo.org> bcel-5.1.ebuild:
   added ~ppc64 to KEYWORDS
diff --git a/dev-java/bcel/bcel-5.1.ebuild b/dev-java/bcel/bcel-5.1.ebuild
index d84664ec49d0..3a5107223b23 100644
--- a/dev-java/bcel/bcel-5.1.ebuild
+++ b/dev-java/bcel/bcel-5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcel/bcel-5.1.ebuild,v 1.25 2004/12/18 09:22:15 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcel/bcel-5.1.ebuild,v 1.26 2004/12/23 12:14:06 karltk Exp $
 
 inherit java-pkg eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://jakarta.apache.org/bcel/"
 SRC_URI="mirror://apache/jakarta/bcel/source/${P}-src.tar.gz"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="x86 ppc sparc amd64 ~ppc64"
+KEYWORDS="x86 ppc sparc amd64 ~ppc64 ~alpha"
 IUSE="doc jikes"
 DEPEND=">=virtual/jdk-1.2
 	>=dev-java/regexp-1.3-r1
diff --git a/dev-java/blackdown-jdk/ChangeLog b/dev-java/blackdown-jdk/ChangeLog
index 93f42a86d206..14fda3d973f5 100644
--- a/dev-java/blackdown-jdk/ChangeLog
+++ b/dev-java/blackdown-jdk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/blackdown-jdk
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.65 2004/11/27 12:24:05 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.66 2004/12/23 12:14:06 karltk Exp $
+
+*blackdown-jdk-1.4.2.01-r1 (23 Dec 2004)
+
+  23 Dec 2004; Karl Trygve Kalleberg <karltk@gentoo.org>  blackdown-jdk-1.4.2.01-r1.ebuild files/blackdown-jdk-1.4.2.01-r1 files/digest-blackdown-jdk-1.4.2.01-r1
+  # INSERT ENTRY HERE
 
   27 Nov 2004; Thomas Matthijs <axxo@gentoo.org>
   -files/blackdown-jdk-1.4.2_rc1, -blackdown-jdk-1.4.2_rc1.ebuild:
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r1.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r1.ebuild
new file mode 100644
index 000000000000..64a86eea3833
--- /dev/null
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r1.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r1.ebuild,v 1.1 2004/12/23 12:14:06 karltk Exp $
+
+inherit java versionator
+
+JREV="01"
+JV=${PV%_*}
+JV=$(get_version_component_range 1-3 ${JV})
+J_URI="mirror://blackdown.org/JDK-${JV}"
+
+DESCRIPTION="Blackdown Java Development Kit"
+SRC_URI="amd64? ( ${J_URI}/amd64/${JREV}/j2sdk-${JV}-${JREV}-linux-amd64.bin )
+	x86? ( ${J_URI}/i386/${JREV}/j2sdk-${JV}-${JREV}-linux-i586.bin )"
+
+HOMEPAGE="http://www.blackdown.org"
+
+SLOT="1.4.2"
+LICENSE="sun-bcla-java-vm"
+KEYWORDS="-* x86 amd64"
+IUSE="doc mozilla"
+
+DEPEND="virtual/libc
+	>=dev-java/java-config-1.2.11
+	doc? ( =dev-java/java-sdk-docs-1.4.2* )"
+
+PROVIDE="virtual/jdk-1.4.2
+	virtual/jre-1.4.2
+	virtual/java-scheme-2"
+
+S="${WORKDIR}/j2sdk${JV}"
+
+# Extract the 'skip' value (offset of tarball) we should pass to tail
+get_offset() {
+	[ ! -f "$1" ] && return
+
+	local offset=$(gawk '
+		/^[[:space:]]*skip[[:space:]]*=/ {
+			sub(/^[[:space:]]*skip[[:space:]]*=/, "")
+			SKIP = $0
+		}
+		END { print SKIP }' $1)
+
+	echo $offset
+}
+
+src_unpack() {
+	local offset=$(get_offset ${DISTDIR}/${A})
+
+	if [ -z "${offset}" ] ; then
+		die "Failed to get offset of tarball!"
+	fi
+
+	echo ">>> Unpacking ${A}..."
+	tail -n +${offset} ${DISTDIR}/${A} | tar --no-same-owner -jxpf - || die
+}
+
+unpack_jars() {
+	# New to 1.4.2
+	local PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/javaws/javaws.jar"
+	local JAVAHOME="${D}/opt/${P}"
+	local UNPACK_CMD=""
+	if [ -f "$JAVAHOME/lib/unpack" ]; then
+		UNPACK_CMD="$JAVAHOME/lib/unpack"
+		chmod +x "$UNPACK_CMD"
+		packerror=""
+		for i in $PACKED_JARS; do
+			if [ -f "$JAVAHOME/`dirname $i`/`basename $i .jar`.pack" ]; then
+				einfo "Creating ${JAVAHOME}/${i}\n"
+				"$UNPACK_CMD" "$JAVAHOME/`dirname $i`/`basename $i .jar`.pack" "$JAVAHOME/$i"
+				if [ ! -f "$JAVAHOME/$i" ]; then
+					ewarn "Failed to unpack jar files ${i}. Please refer\n"
+					ewarn "to the Troubleshooting section of the Installation\n"
+					ewarn "Instructions on the download page for more information.n"
+					packerror="1"
+				fi
+				rm -f "$JAVAHOME/`dirname $i`/`basename $i .jar`.pack"
+			fi
+		done
+	fi
+	rm -f "$UNPACK_CMD"
+}
+
+src_install() {
+	typeset platform
+
+	dodir /opt/${P}
+
+	cp -a ${S}/{bin,jre,lib,man,include} ${D}/opt/${P} || die "failed to copy"
+
+	dodir /opt/${P}/share/java
+	cp -a ${S}/{demo,src.zip} ${D}/opt/${P}/share || die "failed to copy"
+
+	dodoc COPYRIGHT LICENSE README INSTALL
+	dohtml README.html
+
+	# Install mozilla plugin if mozilla use flag is set
+	if use mozilla; then
+		case ${ARCH} in
+			amd64) platform="amd64" ;;
+			x86) platform="i386" ;;
+			ppc) platform="ppc" ;;
+			sparc*) platform="sparc" ;;
+		esac
+
+		install_mozilla_plugin /opt/${P}/jre/plugin/${platform}/mozilla/libjavaplugin_oji.so
+	fi
+
+	find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \;
+
+	sed -i "s/standard symbols l/symbol/g" ${D}/opt/${P}/jre/lib/font.properties
+
+	# install env into /etc/env.d
+	set_java_env ${FILESDIR}/${VMHANDLE} || die
+
+	# Fix for bug 26629
+	if [ "${PROFILE_ARCH}" = "sparc64" ]
+	then
+		dosym /opt/${P}/jre/lib/sparc /opt/${P}/jre/lib/sparc64
+	fi
+
+	unpack_jars
+}
+
+pkg_postinst() {
+	# Set as default system VM if none exists
+	java_pkg_postinst
+
+	# if chpax is on the target system, set the appropriate PaX flags
+	# this will not hurt the binary, it modifies only unused ELF bits
+	# but may confuse things like AV scanners and automatic tripwire
+	if has_version "sys-apps/chpax"
+	then
+		echo
+		einfo "setting up conservative PaX flags for jar and javac"
+
+		for paxkills in "jar" "javac" "java"
+		do
+			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/bin/$paxkills
+		done
+
+		# /opt/blackdown-jdk-1.4.1/jre/bin/java_vm
+		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/jre/bin/java_vm
+
+		einfo "you should have seen lots of chpax output above now"
+		ewarn "make sure the grsec ACL contains those entries also"
+		ewarn "because enabling it will override the chpax setting"
+		ewarn "on the physical files - help for PaX and grsecurity"
+		ewarn "can be given by #gentoo-hardened + pappy@gentoo.org"
+	fi
+}
diff --git a/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2.01-r1 b/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2.01-r1
new file mode 100644
index 000000000000..296efbbb6c69
--- /dev/null
+++ b/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2.01-r1
@@ -0,0 +1,12 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2.01-r1,v 1.1 2004/12/23 12:14:06 karltk Exp $
+
+VERSION="Blackdown JDK @PV@"
+JAVA_HOME=/opt/@P@
+JDK_HOME=/opt/@P@
+JAVAC=${JAVA_HOME}/bin/javac
+ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+ADDLDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/classic/"
+MANPATH=/opt/@P@/man
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC ADDPATH ADDLDPATH MANPATH"
diff --git a/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.4.2.01-r1 b/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.4.2.01-r1
new file mode 100644
index 000000000000..1e5705ea8a8d
--- /dev/null
+++ b/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.4.2.01-r1
@@ -0,0 +1,2 @@
+MD5 00cb18fe9ea91c536360c70a219b1867 j2sdk-1.4.2-01-linux-amd64.bin 37307243
+MD5 dbb87efd16b8d25cdd3fe6a8782a8e75 j2sdk-1.4.2-01-linux-i586.bin 37639008
diff --git a/dev-java/fop/fop-0.20.5-r1.ebuild b/dev-java/fop/fop-0.20.5-r1.ebuild
index 3ff41cba7f56..9a743edce61d 100644
--- a/dev-java/fop/fop-0.20.5-r1.ebuild
+++ b/dev-java/fop/fop-0.20.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-0.20.5-r1.ebuild,v 1.1 2004/12/23 12:10:13 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-0.20.5-r1.ebuild,v 1.2 2004/12/23 12:14:06 karltk Exp $
 
 inherit java-pkg
 
@@ -14,7 +14,7 @@ KEYWORDS="x86 amd64 ~ppc ~sparc"
 IUSE="doc jai jimi"
 DEPEND=">=virtual/jdk-1.4
 	jai? ( dev-java/sun-jai-bin )
-	jimi? ( dev-java/sun-jimi-bin )
+	jimi? ( dev-java/sun-jimi )
 	>=dev-java/ant-1.5.4
 	!dev-java/fop-bin"
 
@@ -24,7 +24,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}/lib
 	use jai && java-pkg_jar-from sun-jai-bin
-	use jimi && java-pkg_jar-from sun-jimi-bin
+	use jimi && java-pkg_jar-from sun-jimi
 }
 
 src_compile() {
diff --git a/dev-java/jai-bin/ChangeLog b/dev-java/jai-bin/ChangeLog
index c96122d42db6..2b79ca0649b7 100644
--- a/dev-java/jai-bin/ChangeLog
+++ b/dev-java/jai-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jai-bin
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jai-bin/ChangeLog,v 1.7 2004/10/17 18:36:21 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jai-bin/ChangeLog,v 1.8 2004/12/23 12:14:06 karltk Exp $
+
+  23 Dec 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
+  -jai-bin-1.1.2-r2.ebuild, -jai-bin-1.1.2-r3.ebuild,
+  jai-bin-1.1.2.01.ebuild:
+  Dropped old revisions. Deprecated dev-java/jai-bin; moved to
+  dev-java/sun-jai-bin.
 
   17 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jai-bin-1.1.2.01.ebuild:
   keyword ~ppc
diff --git a/dev-java/jai-bin/files/digest-jai-bin-1.1.2-r2 b/dev-java/jai-bin/files/digest-jai-bin-1.1.2-r2
deleted file mode 100644
index 36646eea3bad..000000000000
--- a/dev-java/jai-bin/files/digest-jai-bin-1.1.2-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 16f19a3853194f9422fc79819be00ed0 jai-1_1_2-lib-linux-i586-jdk.bin 2674372
diff --git a/dev-java/jai-bin/files/digest-jai-bin-1.1.2-r3 b/dev-java/jai-bin/files/digest-jai-bin-1.1.2-r3
deleted file mode 100644
index 36646eea3bad..000000000000
--- a/dev-java/jai-bin/files/digest-jai-bin-1.1.2-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 16f19a3853194f9422fc79819be00ed0 jai-1_1_2-lib-linux-i586-jdk.bin 2674372
diff --git a/dev-java/jai-bin/jai-bin-1.1.2-r2.ebuild b/dev-java/jai-bin/jai-bin-1.1.2-r2.ebuild
deleted file mode 100644
index e55bd4cfbdf7..000000000000
--- a/dev-java/jai-bin/jai-bin-1.1.2-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jai-bin/jai-bin-1.1.2-r2.ebuild,v 1.3 2004/10/17 10:15:33 kloeri Exp $
-
-DESCRIPTION="JAI is a class library for managing images."
-HOMEPAGE="http://java.sun.com/products/java-media/jai/"
-SRC_URI="jai-1_1_2-lib-linux-i586-jdk.bin"
-LICENSE="sun-bcla-jai"
-SLOT="0"
-KEYWORDS="x86 ~sparc"
-DEPEND=""
-RDEPEND=">=virtual/jdk-1.3"
-IUSE=""
-RESTRICT="fetch"
-S="${WORKDIR}"
-
-pkg_nofetch() {
-	einfo "Please download ${SRC_URI} from ${HOMEPAGE} and place it in ${DISTDIR}"
-}
-
-src_unpack() {
-	#Search for the ELF Header
-	testExp=`echo -e "\177\105\114\106\001\001\001"`
-	startAt=`grep -aonm 1 ${testExp}  ${DISTDIR}/${SRC_URI} | cut -d: -f1`
-	tail -n +${startAt} ${DISTDIR}/${SRC_URI} > install.sfx
-	chmod +x install.sfx
-	./install.sfx || die
-	rm install.sfx
-}
-
-src_install() {
-	start=${D}
-	jre=""
-	java_home="$(java-config --jdk-home)"
-	if [ ! -z "${java_home}" ]; then
-		jre="jre/"
-	else
-		java_home="$(java-config --jre-home)"
-		if [ -z ${java_home} ]; then
-			die "You must have a JVM selected in order to install JAI"
-		fi
-	fi
-	einfo "Installing JAI into current JAVA home: ${java_home}"
-	dodir ${java_home}/${jre}
-	cp -a ${S}/jre/* ${D}/${java_home}/${jre}
-	dodoc COPYRIGHT-jai.txt README-jai.txt
-}
diff --git a/dev-java/jai-bin/jai-bin-1.1.2-r3.ebuild b/dev-java/jai-bin/jai-bin-1.1.2-r3.ebuild
deleted file mode 100644
index ce33f9e08d28..000000000000
--- a/dev-java/jai-bin/jai-bin-1.1.2-r3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jai-bin/jai-bin-1.1.2-r3.ebuild,v 1.6 2004/10/17 10:42:08 axxo Exp $
-
-inherit java-pkg
-
-DESCRIPTION="JAI is a class library for managing images."
-HOMEPAGE="http://java.sun.com/products/java-media/jai/"
-SRC_URI="jai-1_1_2-lib-linux-i586-jdk.bin"
-LICENSE="sun-bcla-jai"
-SLOT="0"
-KEYWORDS="x86 ~sparc"
-DEPEND=""
-RDEPEND=">=virtual/jdk-1.3"
-IUSE=""
-RESTRICT="fetch"
-
-S="${WORKDIR}"
-pkg_nofetch() {
-	einfo "Please download ${SRC_URI} from ${HOMEPAGE} and place it in ${DISTDIR}"
-}
-
-src_unpack() {
-	unzip ${DISTDIR}/${SRC_URI}
-}
-src_compile() { :; }
-
-src_install() {
-	dodoc COPYRIGHT-jai.txt README-jai.txt
-
-	java-pkg_dojar jre/lib/ext/*.jar
-	use x86 && java-pkg_doso jre/lib/i386/*.so
-}
-
-pkg_postinst() {
-	einfo "This ebuild now installs into /opt/${PN} and /usr/share/${PN}"
-	einfo 'To use you need to pass the following to java'
-	einfo '-Djava.library.path=$(java-config -i jai-bin) -classpath $(java-config -p jai-bin)'
-}
-
diff --git a/dev-java/jai-bin/jai-bin-1.1.2.01.ebuild b/dev-java/jai-bin/jai-bin-1.1.2.01.ebuild
index 7fbbc82348ff..8a3d2ff32584 100644
--- a/dev-java/jai-bin/jai-bin-1.1.2.01.ebuild
+++ b/dev-java/jai-bin/jai-bin-1.1.2.01.ebuild
@@ -1,6 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jai-bin/jai-bin-1.1.2.01.ebuild,v 1.2 2004/10/17 18:36:21 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jai-bin/jai-bin-1.1.2.01.ebuild,v 1.3 2004/12/23 12:14:06 karltk Exp $
+
+#
+# WARNING!!
+#
+# This ebuild is deprecated. Please make updates to dev-java/sun-jai-bin from now on
+#
+# -- karltk
 
 inherit java-pkg
 
diff --git a/dev-java/libgtk-java/ChangeLog b/dev-java/libgtk-java/ChangeLog
index aeea8433e5a1..28662b4c4ee2 100644
--- a/dev-java/libgtk-java/ChangeLog
+++ b/dev-java/libgtk-java/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-java/libgtk-java
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/ChangeLog,v 1.2 2004/11/29 15:35:33 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/ChangeLog,v 1.3 2004/12/23 12:14:06 karltk Exp $
 
   29 Nov 2004; Thomas Matthijs <axxo@gentoo.org>
   +files/libgtk-java-2.4.6_find_jni.patch, libgtk-java-2.4.6-r1.ebuild:
@@ -9,7 +9,7 @@
 
 *libgtk-java-2.4.6-r1 (16 Nov 2004)
 
-  16 Nov 2004; <karltk@gentoo.org> +metadata.xml,
+  16 Nov 2004; Karl Trygve Kalleberg <karltk@gentoo.org> +metadata.xml,
   +files/libgtk-java-2.4.6_gcj-autoconf-macro-fix.patch,
   +files/libgtk-java-2.4.6_gentoo-PN-SLOT.patch,
   +files/libgtk-java-2.4.6_install-doc.patch,
diff --git a/dev-java/log4j/log4j-1.2.9.ebuild b/dev-java/log4j/log4j-1.2.9.ebuild
index 4ced986090fd..600cebc660e1 100644
--- a/dev-java/log4j/log4j-1.2.9.ebuild
+++ b/dev-java/log4j/log4j-1.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.9.ebuild,v 1.2 2004/12/18 09:04:51 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.9.ebuild,v 1.3 2004/12/23 12:14:06 karltk Exp $
 
 inherit java-pkg
 
@@ -12,11 +12,11 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc64"
 IUSE="jikes doc javamail jmx jms"
 DEPEND=">=virtual/jdk-1.4
-		dev-java/ant-core
-		javamail? ( dev-java/sun-javamail-bin dev-java/sun-jaf-bin )
-		jmx? ( dev-java/jmx )
-		jms? ( =dev-java/openjms-bin-0.7.6 )
-		jikes? ( dev-java/jikes )"
+	dev-java/ant-core
+	javamail? ( dev-java/sun-javamail-bin dev-java/sun-jaf-bin )
+	jmx? ( dev-java/jmx )
+	jms? ( =dev-java/openjms-bin-0.7.6 )
+	jikes? ( dev-java/jikes )"
 RDEPEND=">=virtual/jre-1.4"
 
 S="${WORKDIR}/logging-${P}"
diff --git a/dev-java/regexp/ChangeLog b/dev-java/regexp/ChangeLog
index c087db010d5f..3b64f63bc8c8 100644
--- a/dev-java/regexp/ChangeLog
+++ b/dev-java/regexp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/regexp
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/regexp/ChangeLog,v 1.17 2004/12/18 09:10:40 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/regexp/ChangeLog,v 1.18 2004/12/23 12:14:06 karltk Exp $
+
+  20 Dec 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
+  regexp-1.3-r1.ebuild:
+  Added ~alpha to KEYWORDS. Fixes #69367.
 
   18 Dec 2004; Markus Rothe <corsair@gentoo.org> regexp-1.3-r1.ebuild:
   added ~ppc64 to KEYWORDS
diff --git a/dev-java/regexp/regexp-1.3-r1.ebuild b/dev-java/regexp/regexp-1.3-r1.ebuild
index 7a648b1abb32..37e6e9f6a9a0 100644
--- a/dev-java/regexp/regexp-1.3-r1.ebuild
+++ b/dev-java/regexp/regexp-1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/regexp/regexp-1.3-r1.ebuild,v 1.5 2004/12/18 09:10:41 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/regexp/regexp-1.3-r1.ebuild,v 1.6 2004/12/23 12:14:06 karltk Exp $
 
 inherit java-pkg
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://jakarta.apache.org/"
 SLOT="0"
 IUSE="doc jikes"
 LICENSE="Apache-1.1"
-KEYWORDS="x86 ppc sparc amd64 ~ppc64"
+KEYWORDS="x86 ppc sparc amd64 ~ppc64 ~alpha"
 DEPEND=">=virtual/jdk-1.3
 	dev-java/ant-core"
 
diff --git a/dev-java/sun-jimi-bin/ChangeLog b/dev-java/sun-jimi/ChangeLog
index 70ee02341d58..3e8dcdfde52d 100644
--- a/dev-java/sun-jimi-bin/ChangeLog
+++ b/dev-java/sun-jimi/ChangeLog
@@ -1,11 +1,11 @@
-# ChangeLog for dev-java/sun-jimi-bin
+# ChangeLog for dev-java/sun-jimi
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jimi-bin/ChangeLog,v 1.1 2004/12/23 12:08:56 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jimi/ChangeLog,v 1.1 2004/12/23 12:14:06 karltk Exp $
 
-*sun-jimi-bin-1.0 (23 Dec 2004)
+*sun-jimi-1.0 (23 Dec 2004)
 
   23 Dec 2004; Karl Trygve Kalleberg <karltk@gentoo.org> +metadata.xml,
-  +sun-jimi-bin-1.0.ebuild:
+  +sun-jimi-1.0.ebuild:
   Moved from dev-java/jimi. Fixes #75427.
 
   17 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jimi-1.0.ebuild:
diff --git a/dev-java/sun-jimi-bin/Manifest b/dev-java/sun-jimi/Manifest
index 9f425a25dffa..9f425a25dffa 100644
--- a/dev-java/sun-jimi-bin/Manifest
+++ b/dev-java/sun-jimi/Manifest
diff --git a/dev-java/sun-jimi-bin/files/digest-sun-jimi-bin-1.0 b/dev-java/sun-jimi/files/digest-sun-jimi-1.0
index ac0616b10a80..ac0616b10a80 100644
--- a/dev-java/sun-jimi-bin/files/digest-sun-jimi-bin-1.0
+++ b/dev-java/sun-jimi/files/digest-sun-jimi-1.0
diff --git a/dev-java/sun-jimi-bin/metadata.xml b/dev-java/sun-jimi/metadata.xml
index 3ad3e7664b8f..3ad3e7664b8f 100644
--- a/dev-java/sun-jimi-bin/metadata.xml
+++ b/dev-java/sun-jimi/metadata.xml
diff --git a/dev-java/sun-jimi-bin/sun-jimi-bin-1.0.ebuild b/dev-java/sun-jimi/sun-jimi-1.0.ebuild
index 9956dc5e8cbf..a46120be6025 100644
--- a/dev-java/sun-jimi-bin/sun-jimi-bin-1.0.ebuild
+++ b/dev-java/sun-jimi/sun-jimi-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jimi-bin/sun-jimi-bin-1.0.ebuild,v 1.1 2004/12/23 12:08:56 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jimi/sun-jimi-1.0.ebuild,v 1.1 2004/12/23 12:14:06 karltk Exp $
 
 inherit java-pkg