remove older + keyword x86

Package-Manager: portage-2.0.51.22-r1

8 files changed, 12 insertions, 224 deletions

diff --git a/dev-java/libgnome-java/ChangeLog b/dev-java/libgnome-java/ChangeLog
index 36f3a82dcbd7..619a765545ea 100644
--- a/dev-java/libgnome-java/ChangeLog
+++ b/dev-java/libgnome-java/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/libgnome-java
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libgnome-java/ChangeLog,v 1.9 2005/05/01 16:42:39 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgnome-java/ChangeLog,v 1.10 2005/06/29 15:10:50 axxo Exp $
+
+  29 Jun 2005; Thomas Matthijs <axxo@gentoo.org>
+  -libgnome-java-2.8.2.ebuild, -libgnome-java-2.8.2-r1.ebuild,
+  libgnome-java-2.8.3.1.ebuild:
+  remove older ebuilds + keyword x86
 
 *libgnome-java-2.10.1 (01 May 2005)
 
diff --git a/dev-java/libgnome-java/Manifest b/dev-java/libgnome-java/Manifest
index 8542fbdff5e8..b966fd48c2f7 100644
--- a/dev-java/libgnome-java/Manifest
+++ b/dev-java/libgnome-java/Manifest
@@ -1,13 +1,9 @@
-MD5 e0a52a0a3bf1d1594c1f340066fa79e6 libgnome-java-2.8.2-r1.ebuild 3381
 MD5 91ec0d782c0ffc1e4f05ff394adc6328 libgnome-java-2.10.1.ebuild 2727
-MD5 13c2706dfd5b5682fdbf335aee169d88 libgnome-java-2.8.3.1.ebuild 3072
-MD5 a454b05c06a8cf2ee43479a468497453 libgnome-java-2.8.2.ebuild 3249
-MD5 0fbba5115dffcc9d8ca8d6fd970a2522 ChangeLog 2348
+MD5 8d11c311178262c0cc94be186de8c88c libgnome-java-2.8.3.1.ebuild 3071
+MD5 acc7de41032291f36e4d66887193f93c ChangeLog 2530
 MD5 de0a216d1797f18db9dc83e5aedee360 metadata.xml 1002
-MD5 a8a8cdd7ec44ae7402032003fe1bb7ab files/digest-libgnome-java-2.8.2-r1 72
 MD5 6ab1ec4f4e7665d6f1e73d04e5ffea0d files/libgnome-java-2.10.0_fix-install-dir.patch 409
 MD5 efea40cf1a5eb3c48001cde4ead5c123 files/digest-libgnome-java-2.8.3.1 74
 MD5 b5f8aad83ed35026438574e04a3122ac files/libgnome-java-2.8.2_gentoo-PN-SLOT.patch 1310
-MD5 a8a8cdd7ec44ae7402032003fe1bb7ab files/digest-libgnome-java-2.8.2 72
 MD5 d8bbcf350e68bf0a42c37ecbef32c8dd files/libgnome-java-2.8.3.1_gentoo-PN-SLOT.patch 508
 MD5 55fb422ad6119794ac0805432ebdc410 files/digest-libgnome-java-2.10.1 73
diff --git a/dev-java/libgnome-java/files/digest-libgnome-java-2.8.2 b/dev-java/libgnome-java/files/digest-libgnome-java-2.8.2
deleted file mode 100644
index 1f873169f1b0..000000000000
--- a/dev-java/libgnome-java/files/digest-libgnome-java-2.8.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3fa03e9809f032540388b43dbf0cf582 libgnome-java-2.8.2.tar.bz2 126393
diff --git a/dev-java/libgnome-java/files/digest-libgnome-java-2.8.2-r1 b/dev-java/libgnome-java/files/digest-libgnome-java-2.8.2-r1
deleted file mode 100644
index 1f873169f1b0..000000000000
--- a/dev-java/libgnome-java/files/digest-libgnome-java-2.8.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3fa03e9809f032540388b43dbf0cf582 libgnome-java-2.8.2.tar.bz2 126393
diff --git a/dev-java/libgnome-java/libgnome-java-2.10.1.ebuild b/dev-java/libgnome-java/libgnome-java-2.10.1.ebuild
index 3e56bdc75b5f..108175fc6557 100644
--- a/dev-java/libgnome-java/libgnome-java-2.10.1.ebuild
+++ b/dev-java/libgnome-java/libgnome-java-2.10.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/libgnome-java/libgnome-java-2.10.1.ebuild,v 1.1 2005/05/01 16:42:39 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgnome-java/libgnome-java-2.10.1.ebuild,v 1.2 2005/06/29 15:10:50 axxo Exp $
 
 #
 # WARNING: Because java-gnome is a set of bindings to native GNOME libraries, 
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}
 #
 SLOT="2.10"
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~ppc ~x86"
 IUSE="gcj"
 
 src_unpack() {
diff --git a/dev-java/libgnome-java/libgnome-java-2.8.2-r1.ebuild b/dev-java/libgnome-java/libgnome-java-2.8.2-r1.ebuild
deleted file mode 100644
index 7507af9f05b2..000000000000
--- a/dev-java/libgnome-java/libgnome-java-2.8.2-r1.ebuild
+++ /dev/null
@@ -1,106 +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/libgnome-java/libgnome-java-2.8.2-r1.ebuild,v 1.4 2005/03/31 18:56:11 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 the core GNOME libraries (allow GNOME/GTK applications to be written in Java)"
-HOMEPAGE="http://java-gnome.sourceforge.net/"
-RDEPEND=">=gnome-base/libgnome-2.8.0
-	>=gnome-base/libgnomeui-2.8.0
-	=dev-java/libgtk-java-2.4.6*
-	>=gnome-base/libgnomecanvas-2.8.0
-	>=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
-	sys-devel/autoconf
-	sys-devel/automake"
-
-#
-# Critical that this match gtkapiversion
-#
-SLOT="2.8"
-LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="gcj"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/libgnome-java-2.8.2_gentoo-PN-SLOT.patch
-	sed -i "s|^\(JAVA_INCLUDES = \)|\1 -I\${JDK_HOME}/include -I\${JDK_HOME}/include/linux/|" src/Makefile.in || die "sed failed"
-}
-
-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.
-	#
-
-	./autogen.sh \
-		--host=${CHOST} \
-		--prefix=/usr \
-			${conf} || die "./configure failed"
-	make || die "compile failed"
-}
-
-src_install() {
-	# workaround Makefile bug not creating necessary parent directories
-	mkdir -p ${D}/usr/lib
-	mkdir -p ${D}/usr/share/java
-	mkdir -p ${D}/usr/lib/pkgconfig
-	mkdir -p ${D}/usr/share/doc/libgnome${SLOT}-java
-
-	make prefix=${D}/usr install || die
-
-	# actually, at time of writing, there were no DOCUMENTS, but leave it here...
-	mv ${D}/usr/share/doc/libgnome${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/libgnome-java-${PV}.src.zip *
-
-	# again, with dojar misbehaving, better do to this manually for the
-	# time being. Yes, this is bad hard coding, but what in this ebuild isn't?
-
-	echo "DESCRIPTION=${DESCRIPTION}" \
-		>  ${D}/usr/share/${PN}-${SLOT}/package.env
-
-	echo "CLASSPATH=/usr/share/${PN}-${SLOT}/lib/gnome${SLOT}.jar" \
-		>> ${D}/usr/share/${PN}-${SLOT}/package.env
-}
diff --git a/dev-java/libgnome-java/libgnome-java-2.8.2.ebuild b/dev-java/libgnome-java/libgnome-java-2.8.2.ebuild
deleted file mode 100644
index 983775f68d6c..000000000000
--- a/dev-java/libgnome-java/libgnome-java-2.8.2.ebuild
+++ /dev/null
@@ -1,105 +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/libgnome-java/libgnome-java-2.8.2.ebuild,v 1.4 2005/03/31 18:56:11 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 the core GNOME libraries (allow GNOME/GTK applications to be written in Java)"
-HOMEPAGE="http://java-gnome.sourceforge.net/"
-RDEPEND=">=gnome-base/libgnome-2.8.0
-	>=gnome-base/libgnomeui-2.8.0
-	>=dev-java/libgtk-java-2.4.6
-	>=gnome-base/libgnomecanvas-2.8.0
-	>=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
-		sys-devel/autoconf
-		sys-devel/automake"
-
-#
-# Critical that this match gtkapiversion
-#
-SLOT="2.8"
-LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~ppc"
-IUSE="gcj"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/libgnome-java-2.8.2_gentoo-PN-SLOT.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.
-	#
-
-	./autogen.sh \
-		--host=${CHOST} \
-		--prefix=/usr \
-			${conf} || die "./configure failed"
-	make || die "compile failed"
-}
-
-src_install() {
-	# workaround Makefile bug not creating necessary parent directories
-	mkdir -p ${D}/usr/lib
-	mkdir -p ${D}/usr/share/java
-	mkdir -p ${D}/usr/lib/pkgconfig
-	mkdir -p ${D}/usr/share/doc/libgnome${SLOT}-java
-
-	make prefix=${D}/usr install || die
-
-	# actually, at time of writing, there were no DOCUMENTS, but leave it here...
-	mv ${D}/usr/share/doc/libgnome${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/libgnome-java-${PV}.src.zip *
-
-	# again, with dojar misbehaving, better do to this manually for the
-	# time being. Yes, this is bad hard coding, but what in this ebuild isn't?
-
-	echo "DESCRIPTION=${DESCRIPTION}" \
-		>  ${D}/usr/share/${PN}-${SLOT}/package.env
-
-	echo "CLASSPATH=/usr/share/${PN}-${SLOT}/lib/gnome${SLOT}.jar" \
-		>> ${D}/usr/share/${PN}-${SLOT}/package.env
-}
diff --git a/dev-java/libgnome-java/libgnome-java-2.8.3.1.ebuild b/dev-java/libgnome-java/libgnome-java-2.8.3.1.ebuild
index c6461cf7acdc..a55f4cc3893b 100644
--- a/dev-java/libgnome-java/libgnome-java-2.8.3.1.ebuild
+++ b/dev-java/libgnome-java/libgnome-java-2.8.3.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/libgnome-java/libgnome-java-2.8.3.1.ebuild,v 1.3 2005/03/31 18:56:11 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgnome-java/libgnome-java-2.8.3.1.ebuild,v 1.4 2005/06/29 15:10:50 axxo Exp $
 
 #
 # WARNING: Because java-gnome is a set of bindings to native GNOME libraries, 
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}
 #
 SLOT="2.8"
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="gcj"
 
 src_unpack() {