remove older + keyword x86

(Portage version: 2.0.51.22-r1)

11 files changed, 14 insertions, 324 deletions

diff --git a/dev-java/libgtk-java/ChangeLog b/dev-java/libgtk-java/ChangeLog
index 5c1b41d21e92..8d69c80a0938 100644
--- a/dev-java/libgtk-java/ChangeLog
+++ b/dev-java/libgtk-java/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/libgtk-java
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/ChangeLog,v 1.9 2005/05/01 16:20:48 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/ChangeLog,v 1.10 2005/06/29 15:10:08 axxo Exp $
+
+  29 Jun 2005; Thomas Matthijs <axxo@gentoo.org>
+  -libgtk-java-2.4.6-r1.ebuild, -libgtk-java-2.4.6-r2.ebuild,
+  -libgtk-java-2.4.7.2.ebuild, libgtk-java-2.6.2-r1.ebuild:
+  remove older ebuilds + keyword x86
 
 *libgtk-java-2.6.2-r1 (01 May 2005)
 *libgtk-java-2.4.9 (01 May 2005)
diff --git a/dev-java/libgtk-java/Manifest b/dev-java/libgtk-java/Manifest
index 0630087ad40f..5c1d3b215849 100644
--- a/dev-java/libgtk-java/Manifest
+++ b/dev-java/libgtk-java/Manifest
@@ -1,21 +1,14 @@
 MD5 46ca4320033ac90148c3894e3495babe libgtk-java-2.4.9.ebuild 2894
 MD5 2b05aa2234bb74151d373089c076bab2 libgtk-java-2.4.8.1.ebuild 3356
-MD5 8d87c3352d9d71dfa985bcb99a8328bf libgtk-java-2.6.2-r1.ebuild 2823
-MD5 00688add12aaa3eafc2de930a0a6b45b libgtk-java-2.4.6-r2.ebuild 3055
-MD5 5ebc048801e09a96cbc1e0387edf5496 libgtk-java-2.4.7.2.ebuild 3348
-MD5 0521ec467b18c6d5d3ced317cf813912 libgtk-java-2.4.6-r1.ebuild 3012
-MD5 42593ec8869b6abd4c2478601079f14c ChangeLog 3822
+MD5 d5bf440245da92b3882aa6f1d7d5d549 libgtk-java-2.6.2-r1.ebuild 2822
+MD5 00c0d9093769f10605c924c20a406556 ChangeLog 4031
 MD5 23e70539fce4ef96d51e3043420acb8c metadata.xml 975
-MD5 d5868ac77f6fa3fcf16ec100095cb0af files/digest-libgtk-java-2.4.6-r1 70
-MD5 d5868ac77f6fa3fcf16ec100095cb0af files/digest-libgtk-java-2.4.6-r2 70
 MD5 5447d20adb67dacfc4ecd80c88386343 files/digest-libgtk-java-2.6.2-r1 70
 MD5 1defc6f20e4684f13955e28a28e47e1f files/libgtk-java-2.4.6_install-doc.patch 740
 MD5 fc26b5e15e1e19216390e328d36237f2 files/libgtk-java-2.4.8.1_find-jni.patch 662
 MD5 f4c28fbb216236ce592ffe72a3d4e9ed files/digest-libgtk-java-2.4.9 70
 MD5 1f2599c8fd250432f6e6b43d598e75db files/libgtk-java-2.4.6_gentoo-PN-SLOT.patch 2013
 MD5 4130379b76854eac4060c133f20a765d files/libgtk-java-2.4.8.1_gentoo-PN-SLOT.patch 527
-MD5 44a67ac512c028ffef92f3a0ed1bc196 files/digest-libgtk-java-2.4.7.2 72
-MD5 c9b06cd33dfa81082635f38a375da14d files/digest-libgtk-java-2.4.8.1 72
 MD5 40c9acf29309ee98632a536eba5ef6a9 files/libgtk-java-2.4.8.1_fix-TextBuffer.patch 802
 MD5 21907163f2b6597c520b7c1a4da20784 files/libgtk-java-2.4.6_find_jni.patch 369
 MD5 40956547f4eb0b797359f67f6c6910bb files/libgtk-java-2.4.6_gcj-autoconf-macro-fix.patch 689
diff --git a/dev-java/libgtk-java/files/digest-libgtk-java-2.4.6-r1 b/dev-java/libgtk-java/files/digest-libgtk-java-2.4.6-r1
deleted file mode 100644
index 1f417fd76435..000000000000
--- a/dev-java/libgtk-java/files/digest-libgtk-java-2.4.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3f4533073d2c51cb444d16ecf91e9d08 libgtk-java-2.4.6.tar.bz2 438133
diff --git a/dev-java/libgtk-java/files/digest-libgtk-java-2.4.6-r2 b/dev-java/libgtk-java/files/digest-libgtk-java-2.4.6-r2
deleted file mode 100644
index 1f417fd76435..000000000000
--- a/dev-java/libgtk-java/files/digest-libgtk-java-2.4.6-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3f4533073d2c51cb444d16ecf91e9d08 libgtk-java-2.4.6.tar.bz2 438133
diff --git a/dev-java/libgtk-java/files/digest-libgtk-java-2.4.7.2 b/dev-java/libgtk-java/files/digest-libgtk-java-2.4.7.2
deleted file mode 100644
index 5312c4ea6cb3..000000000000
--- a/dev-java/libgtk-java/files/digest-libgtk-java-2.4.7.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a91852eb5a0ff7b5487f55a17f2eb13b libgtk-java-2.4.7.2.tar.bz2 458397
diff --git a/dev-java/libgtk-java/libgtk-java-2.4.6-r1.ebuild b/dev-java/libgtk-java/libgtk-java-2.4.6-r1.ebuild
deleted file mode 100644
index fdab6a9afdb4..000000000000
--- a/dev-java/libgtk-java/libgtk-java-2.4.6-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/libgtk-java-2.4.6-r1.ebuild,v 1.4 2005/03/12 19:08:29 luckyduck Exp $
-
-#
-# WARNING: Because java-gnome is a set of bindings to native GNOME libraries,
-# it has, like any GNOME project, a massive autoconf setup, and unlike many
-# other java libraries, it has its own [necessary] `make install` step.
-# As a result, this ebuild is VERY sensitive to the internal layout of the
-# upstream project. Because these issues are currently evolving upstream,
-# simply version bumping this ebuild is not likely to work but FAILURES WILL
-# BE VERY SUBTLE IF IT DOESN NOT WORK.
-#
-
-inherit eutils gnome.org
-
-DESCRIPTION="Java bindings for GTK libraries (allow GTK applications to be written in Java)"
-HOMEPAGE="http://java-gnome.sourceforge.net/"
-RDEPEND=">=x11-libs/gtk+-2.4
-		>=virtual/jre-1.2"
-
-#
-# Unfortunately we need to run autogen to do the variable substitutions, so
-# regardless of whether or not there is an upstream ./configure [at time of
-# writing there isn't] we need to recreate it
-#
-
-DEPEND="${RDEPEND}
-		>=virtual/jdk-1.2
-		app-arch/zip"
-
-#
-# Critical that this match gtkapiversion
-#
-SLOT="2.4"
-LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~ppc"
-IUSE="gcj"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}_gcj-autoconf-macro-fix.patch
-	epatch ${FILESDIR}/${P}_gentoo-PN-SLOT.patch
-	epatch ${FILESDIR}/${P}_install-doc.patch
-	epatch ${FILESDIR}/${P}_no-docbook-autoconf-macro.patch
-	use gcj || epatch ${FILESDIR}/${P}_find_jni.patch
-}
-
-src_compile() {
-	local conf
-
-	use gcj	|| conf="${conf} --without-gcj-compile"
-
-	#
-	# Ordinarily, moving things around post `make install` would do
-	# the trick, but there are paths hard coded in .pc files and in the
-	# `make install` step itself that need to be influenced.
-	#
-	# NOTE: THIS RELIES ON PORTAGE PASSING $PN AND $SLOT IN THE ENVIRONMENT
-	#
-
-	./autogen.sh \
-		--host=${CHOST} \
-		--prefix=/usr \
-			${conf} || die "./configure failed"
-	make || die "compile failed"
-}
-
-src_install() {
-	make prefix=${D}/usr install || die "make install failed"
-
-	mv ${D}/usr/share/doc/libgtk${SLOT}-java ${D}/usr/share/doc/${PF}
-
-	# the upstream install scatters things around a bit. The following cleans
-	# that up to make it policy compliant.
-
-	# I originally tried java-pkg_dojar here, but it has a few glitches
-	# like not copying symlinks as symlinks which makes a mess.
-
-	dodir /usr/share/${PN}-${SLOT}/lib
-	mv ${D}/usr/share/java/*.jar ${D}/usr/share/${PN}-${SLOT}/lib
-	rm -rf ${D}/usr/share/java
-
-	mkdir ${D}/usr/share/${PN}-${SLOT}/src
-	cd ${S}/src/java
-	zip -r ${D}/usr/share/${PN}-${SLOT}/src/libgtk-java-${PV}.src.zip *
-
-	# again, with dojar misbehaving, better do to this manually for the
-	# time being.
-
-	echo "DESCRIPTION=${DESCRIPTION}" \
-		>  ${D}/usr/share/${PN}-${SLOT}/package.env
-
-	echo "CLASSPATH=/usr/share/${PN}-${SLOT}/lib/gtk${SLOT}.jar" \
-		>> ${D}/usr/share/${PN}-${SLOT}/package.env
-}
diff --git a/dev-java/libgtk-java/libgtk-java-2.4.6-r2.ebuild b/dev-java/libgtk-java/libgtk-java-2.4.6-r2.ebuild
deleted file mode 100644
index f10ce1542f8f..000000000000
--- a/dev-java/libgtk-java/libgtk-java-2.4.6-r2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/libgtk-java-2.4.6-r2.ebuild,v 1.3 2005/03/12 20:58:16 luckyduck Exp $
-
-#
-# WARNING: Because java-gnome is a set of bindings to native GNOME libraries,
-# it has, like any GNOME project, a massive autoconf setup, and unlike many
-# other java libraries, it has its own [necessary] `make install` step.
-# As a result, this ebuild is VERY sensitive to the internal layout of the
-# upstream project. Because these issues are currently evolving upstream,
-# simply version bumping this ebuild is not likely to work but FAILURES WILL
-# BE VERY SUBTLE IF IT DOES NOT WORK.
-#
-
-inherit eutils gnome.org
-
-DESCRIPTION="Java bindings for GTK libraries (allow GTK applications to be written in Java)"
-HOMEPAGE="http://java-gnome.sourceforge.net/"
-RDEPEND=">=x11-libs/gtk+-2.4
-	>=virtual/jre-1.2"
-
-#
-# Unfortunately we need to run autogen to do the variable substitutions, so
-# regardless of whether or not there is an upstream ./configure [at time of
-# writing there isn't] we need to recreate it
-#
-
-DEPEND="${RDEPEND}
-	>=virtual/jdk-1.2
-	app-arch/zip"
-
-#
-# Critical that this match gtkapiversion
-#
-SLOT="2.4"
-LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="gcj"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/libgtk-java-2.4.6_gcj-autoconf-macro-fix.patch
-	epatch ${FILESDIR}/libgtk-java-2.4.6_gentoo-PN-SLOT.patch
-	epatch ${FILESDIR}/libgtk-java-2.4.6_install-doc.patch
-	epatch ${FILESDIR}/libgtk-java-2.4.6_no-docbook-autoconf-macro.patch
-	use gcj || epatch ${FILESDIR}/${P}_find_jni.patch
-}
-
-src_compile() {
-	local conf
-
-	use gcj	|| conf="${conf} --without-gcj-compile"
-
-	cd ${S}
-
-	#
-	# Ordinarily, moving things around post `make install` would do
-	# the trick, but there are paths hard coded in .pc files and in the
-	# `make install` step itself that need to be influenced.
-	#
-	# NOTE: THIS RELIES ON PORTAGE PASSING $PN AND $SLOT IN THE ENVIRONMENT
-	#
-
-	./autogen.sh \
-		--host=${CHOST} \
-		--prefix=/usr \
-			${conf} || die "./configure failed"
-	make || die "compile failed"
-}
-
-src_install() {
-	make prefix=${D}/usr install || die
-
-	mv ${D}/usr/share/doc/libgtk${SLOT}-java ${D}/usr/share/doc/${PF}
-
-	# the upstream install scatters things around a bit. The following cleans
-	# that up to make it policy compliant.
-
-	# I originally tried java-pkg_dojar here, but it has a few glitches
-	# like not copying symlinks as symlinks which makes a mess.
-
-	dodir /usr/share/${PN}-${SLOT}/lib
-	mv ${D}/usr/share/java/*.jar ${D}/usr/share/${PN}-${SLOT}/lib
-	rm -rf ${D}/usr/share/java
-
-	mkdir ${D}/usr/share/${PN}-${SLOT}/src
-	cd ${S}/src/java
-	zip -r ${D}/usr/share/${PN}-${SLOT}/src/libgtk-java-${PV}.src.zip *
-
-	# again, with dojar misbehaving, better do to this manually for the
-	# time being.
-
-	echo "DESCRIPTION=${DESCRIPTION}" \
-		>  ${D}/usr/share/${PN}-${SLOT}/package.env
-
-	echo "CLASSPATH=/usr/share/${PN}-${SLOT}/lib/gtk${SLOT}.jar" \
-		>> ${D}/usr/share/${PN}-${SLOT}/package.env
-}
diff --git a/dev-java/libgtk-java/libgtk-java-2.4.7.2.ebuild b/dev-java/libgtk-java/libgtk-java-2.4.7.2.ebuild
deleted file mode 100644
index 7a268d287012..000000000000
--- a/dev-java/libgtk-java/libgtk-java-2.4.7.2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/libgtk-java-2.4.7.2.ebuild,v 1.2 2005/03/12 19:08:29 luckyduck Exp $
-
-#
-# WARNING: Because java-gnome is a set of bindings to native GNOME libraries,
-# it has, like any GNOME project, a massive autoconf setup, and unlike many
-# other java libraries, it has its own [necessary] `make install` step.
-# As a result, this ebuild is VERY sensitive to the internal layout of the
-# upstream project. Because these issues are currently evolving upstream,
-# simply version bumping this ebuild is not likely to work but FAILURES WILL
-# BE VERY SUBTLE IF IT DOES NOT WORK.
-#
-
-inherit eutils gnome.org
-
-DESCRIPTION="Java bindings for GTK libraries (allow GTK applications to be written in Java)"
-HOMEPAGE="http://java-gnome.sourceforge.net/"
-RDEPEND=">=x11-libs/gtk+-2.4
-	>=virtual/jre-1.2"
-
-#
-# Unfortunately we need to run autogen to do the variable substitutions, so
-# regardless of whether or not there is an upstream ./configure [at time of
-# writing there isn't] we need to recreate it
-#
-
-DEPEND="${RDEPEND}
-	>=virtual/jdk-1.2
-	app-arch/zip"
-
-#
-# Critical that this match gtkapiversion
-#
-SLOT="2.4"
-LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~ppc"
-IUSE="gcj"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# I know it's better to use ${P}, but I don't feel like duplicating
-	# the patch files for every bloody point release. I'll copy them at
-	# major version releases.
-
-#	Fixed upstream, will remove next release
-#	epatch ${FILESDIR}/libgtk-java-2.4.6_gcj-autoconf-macro-fix.patch
-
-	epatch ${FILESDIR}/libgtk-java-2.4.6_gentoo-PN-SLOT.patch
-	epatch ${FILESDIR}/libgtk-java-2.4.6_install-doc.patch
-	epatch ${FILESDIR}/libgtk-java-2.4.6_no-docbook-autoconf-macro.patch
-	use gcj || epatch ${FILESDIR}/libgtk-java-2.4.6_find_jni.patch
-
-	# Rediculous glitch from upstream's packaging.
-	rm -f ${S}/config.cache
-}
-
-src_compile() {
-	local conf
-
-	use gcj	|| conf="${conf} --without-gcj-compile"
-
-	cd ${S}
-
-	#
-	# Ordinarily, moving things around post `make install` would do
-	# the trick, but there are paths hard coded in .pc files and in the
-	# `make install` step itself that need to be influenced.
-	#
-	# NOTE: THIS RELIES ON PORTAGE PASSING $PN AND $SLOT IN THE ENVIRONMENT
-	#
-
-	./autogen.sh \
-		--host=${CHOST} \
-		--prefix=/usr \
-			${conf} || die "./configure failed"
-			make || die "compile failed"
-}
-
-src_install() {
-	make prefix=${D}/usr install || die
-
-	mv ${D}/usr/share/doc/libgtk${SLOT}-java ${D}/usr/share/doc/${PF}
-
-	# the upstream install scatters things around a bit. The following cleans
-	# that up to make it policy compliant.
-
-	# I originally tried java-pkg_dojar here, but it has a few glitches
-	# like not copying symlinks as symlinks which makes a mess.
-
-	dodir /usr/share/${PN}-${SLOT}/lib
-	mv ${D}/usr/share/java/*.jar ${D}/usr/share/${PN}-${SLOT}/lib
-	rm -rf ${D}/usr/share/java
-
-	mkdir ${D}/usr/share/${PN}-${SLOT}/src
-	cd ${S}/src/java
-	zip -r ${D}/usr/share/${PN}-${SLOT}/src/libgtk-java-${PV}.src.zip *
-
-	# again, with dojar misbehaving, better do to this manually for the
-	# time being.
-
-	echo "DESCRIPTION=${DESCRIPTION}" \
-		>  ${D}/usr/share/${PN}-${SLOT}/package.env
-
-	echo "CLASSPATH=/usr/share/${PN}-${SLOT}/lib/gtk${SLOT}.jar" \
-		>> ${D}/usr/share/${PN}-${SLOT}/package.env
-}
diff --git a/dev-java/libgtk-java/libgtk-java-2.4.8.1.ebuild b/dev-java/libgtk-java/libgtk-java-2.4.8.1.ebuild
index 39faa4faf591..e7485cbc3026 100644
--- a/dev-java/libgtk-java/libgtk-java-2.4.8.1.ebuild
+++ b/dev-java/libgtk-java/libgtk-java-2.4.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/libgtk-java-2.4.8.1.ebuild,v 1.2 2005/03/12 19:08:29 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/libgtk-java-2.4.8.1.ebuild,v 1.3 2005/06/29 15:10:08 axxo Exp $
 
 #
 # WARNING: Because java-gnome is a set of bindings to native GNOME libraries, 
@@ -28,7 +28,7 @@ DEPEND="${RDEPEND}
 #
 SLOT="2.4"
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="gcj"
 
 src_unpack() {
diff --git a/dev-java/libgtk-java/libgtk-java-2.4.9.ebuild b/dev-java/libgtk-java/libgtk-java-2.4.9.ebuild
index 2c1a26a6dd07..282af0c10d78 100644
--- a/dev-java/libgtk-java/libgtk-java-2.4.9.ebuild
+++ b/dev-java/libgtk-java/libgtk-java-2.4.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/libgtk-java-2.4.9.ebuild,v 1.1 2005/05/01 16:20:48 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/libgtk-java-2.4.9.ebuild,v 1.2 2005/06/29 15:10:08 axxo Exp $
 
 #
 # WARNING: Because java-gnome is a set of bindings to native GNOME libraries, 
@@ -28,7 +28,7 @@ DEPEND="${RDEPEND}
 #
 SLOT="2.4"
 LICENSE="LGPL-2.1"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="~ppc x86"
 IUSE="gcj"
 
 src_unpack() {
diff --git a/dev-java/libgtk-java/libgtk-java-2.6.2-r1.ebuild b/dev-java/libgtk-java/libgtk-java-2.6.2-r1.ebuild
index 5f277d1216bc..1fe275dfd00a 100644
--- a/dev-java/libgtk-java/libgtk-java-2.6.2-r1.ebuild
+++ b/dev-java/libgtk-java/libgtk-java-2.6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/libgtk-java-2.6.2-r1.ebuild,v 1.1 2005/05/01 16:20:48 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/libgtk-java-2.6.2-r1.ebuild,v 1.2 2005/06/29 15:10:08 axxo Exp $
 
 #
 # WARNING: Because java-gnome is a set of bindings to native GNOME libraries, 
@@ -28,7 +28,7 @@ DEPEND="${RDEPEND}
 #
 SLOT="2.6"
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~ppc x86"
 IUSE="gcj"
 
 src_unpack() {