remove older + keyword x86

(Portage version: 2.0.51.22-r1)

5 files changed, 9 insertions, 111 deletions

diff --git a/dev-java/libgconf-java/ChangeLog b/dev-java/libgconf-java/ChangeLog
index f01499648923..69ff4d1d7bee 100644
--- a/dev-java/libgconf-java/ChangeLog
+++ b/dev-java/libgconf-java/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/libgconf-java
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libgconf-java/ChangeLog,v 1.7 2005/05/01 16:32:37 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgconf-java/ChangeLog,v 1.8 2005/06/29 15:11:30 axxo Exp $
+
+  29 Jun 2005; Thomas Matthijs <axxo@gentoo.org>
+  -libgconf-java-2.8.2.ebuild, libgconf-java-2.8.3.1.ebuild:
+  remove older ebuilds + keyword x86
 
 *libgconf-java-2.10.1 (01 May 2005)
 
diff --git a/dev-java/libgconf-java/files/digest-libgconf-java-2.8.2 b/dev-java/libgconf-java/files/digest-libgconf-java-2.8.2
deleted file mode 100644
index c9bc33e75bf7..000000000000
--- a/dev-java/libgconf-java/files/digest-libgconf-java-2.8.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 19078031b67dea005e41d5ccfdfcb3c9 libgconf-java-2.8.2.tar.bz2 19426
diff --git a/dev-java/libgconf-java/libgconf-java-2.10.1.ebuild b/dev-java/libgconf-java/libgconf-java-2.10.1.ebuild
index 8751ea22a6c3..e92b9b4da2b4 100644
--- a/dev-java/libgconf-java/libgconf-java-2.10.1.ebuild
+++ b/dev-java/libgconf-java/libgconf-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/libgconf-java/libgconf-java-2.10.1.ebuild,v 1.1 2005/05/01 16:32:37 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgconf-java/libgconf-java-2.10.1.ebuild,v 1.2 2005/06/29 15:11:30 axxo Exp $
 
 #
 # WARNING: Because java-gnome is a set of bindings to native GNOME libraries, 
@@ -30,7 +30,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/libgconf-java/libgconf-java-2.8.2.ebuild b/dev-java/libgconf-java/libgconf-java-2.8.2.ebuild
deleted file mode 100644
index 67f4adca65e4..000000000000
--- a/dev-java/libgconf-java/libgconf-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/libgconf-java/libgconf-java-2.8.2.ebuild,v 1.3 2005/03/12 19:25:34 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 GConf (allows GNOME/GTK applications writen in Java to store configuration information in gconf)"
-HOMEPAGE="http://java-gnome.sourceforge.net/"
-RDEPEND=">=gnome-base/gconf-2.8.0
-	>=dev-java/libgnome-java-2.8.2
-	>=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}/libgconf-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/libgconf${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/libgconf${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/libgconf-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?
-
-	# karltk: Missing generation of dependencies, should be fixed.
-	echo "DESCRIPTION=${DESCRIPTION}" \
-		>  ${D}/usr/share/${PN}-${SLOT}/package.env
-
-	echo "CLASSPATH=/usr/share/${PN}-${SLOT}/lib/gconf${SLOT}.jar" \
-		>> ${D}/usr/share/${PN}-${SLOT}/package.env
-}
diff --git a/dev-java/libgconf-java/libgconf-java-2.8.3.1.ebuild b/dev-java/libgconf-java/libgconf-java-2.8.3.1.ebuild
index 9e305c5895fd..30324f78249e 100644
--- a/dev-java/libgconf-java/libgconf-java-2.8.3.1.ebuild
+++ b/dev-java/libgconf-java/libgconf-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/libgconf-java/libgconf-java-2.8.3.1.ebuild,v 1.3 2005/05/01 16:32:37 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgconf-java/libgconf-java-2.8.3.1.ebuild,v 1.4 2005/06/29 15:11:30 axxo Exp $
 
 #
 # WARNING: Because java-gnome is a set of bindings to native GNOME libraries, 
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
 #
 SLOT="2.8"
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="gcj"
 
 src_unpack() {