Cleanup.

(Portage version: 2.1.2.2)

5 files changed, 8 insertions, 138 deletions

diff --git a/dev-java/libgtk-java/ChangeLog b/dev-java/libgtk-java/ChangeLog
index 26cadbce0b19..9b7e93aac70f 100644
--- a/dev-java/libgtk-java/ChangeLog
+++ b/dev-java/libgtk-java/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/libgtk-java
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/ChangeLog,v 1.29 2007/02/16 22:23:54 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/ChangeLog,v 1.30 2007/03/31 10:06:21 betelgeuse Exp $
+
+  31 Mar 2007; Petteri Räty <betelgeuse@gentoo.org>
+  -libgtk-java-2.8.3-r1.ebuild, -libgtk-java-2.8.7.ebuild:
+  Cleanup.
 
   16 Feb 2007; Petteri Räty <betelgeuse@gentoo.org>
   libgtk-java-2.8.7-r1.ebuild:
@@ -129,14 +133,14 @@
   New upstream release. Ebuild submitted by Andrew F. Cowie
   <andrew@operationaldynamics.com>. Partial fix for #83366.
 
-* libgtk-java-2.4.7.2 (27 Dec 2004)
+*libgtk-java-2.4.7.2 (27 Dec 2004)
 
   27 Dec 2004; Andrew Cowie <andrew@operationaldynamics.com> +libgtk-java-2.4.7.2.ebuild:
   Upstream stable maintenance release. Note that 2.4.7 had a bug which
   prevented it from building, and that 2.4.7.1 had its internal version numbers
   wrong.
 
-* libgtk-java-2.4.6-r2 (24 Dec 2004)
+*libgtk-java-2.4.6-r2 (24 Dec 2004)
 
   24 Dec 2004; Andrew Cowie <andrew@operationaldynamics.com> +libgtk-java-2.4.6-r2.ebuild, 
   -libgtk-java-2.4.6-r1.ebuild:
@@ -147,7 +151,7 @@
   added a patch to set JAVA_INCLUDES when not using gcj, so it can find jni.h
   & familiy, #72128
 
-* libgtk-java-2.4.6-r1 (15 Nov 2004)
+*libgtk-java-2.4.6-r1 (15 Nov 2004)
 
   15 Nov 2004; Andrew Cowie <andrew@operationaldynamics.com> +libgtk-java-2.4.6-r1.ebuild:
   Dependency on docbook-sgml-utils discovered by karltk; investigation showed
@@ -155,15 +159,6 @@
   in the documentation. Fixed by patching the java-gnome autoconf macros to
   remove the path check for docbook2html.
 
-* libgtk-java-2.4.6 (07 Nov 2004)
-
-  07 Nov 2004; Andrew Cowie <andrew@operationaldynamics.com>:
-  New ebuild. What used to be java-gnome is now multiplexed into various modular
-  subcomponents. Upstream CVS was all re-arranged, and now there is a release
-  tarball for each piece. This ebuild is the java binding around the core GTK
-  libraries (and is the only one of the new pieces which doesn't need the rest of
-  GNOME installed).
-
   29 Nov 2004; Thomas Matthijs <axxo@gentoo.org>
   +files/libgtk-java-2.4.6_find_jni.patch, libgtk-java-2.4.6-r1.ebuild:
   added a patch to set JAVA_INCLUDES when not using gcj, so it can find jni.h
@@ -180,8 +175,6 @@
   Initial import into Portage. Ebuild and patches by Andrew Cowie
   <andrew@operationaldynamics.com>. Fixes #70559.
 
-*libgtk-java-2.4.6 (07 Nov 2004)
-
   07 Nov 2004; Andrew Cowie <andrew@operationaldynamics.com>:
   New ebuild. What used to be java-gnome is now multiplexed into various modular
   subcomponents. Upstream CVS was all re-arranged, and now there is a release
diff --git a/dev-java/libgtk-java/files/digest-libgtk-java-2.8.3-r1 b/dev-java/libgtk-java/files/digest-libgtk-java-2.8.3-r1
deleted file mode 100644
index 1de6db19a831..000000000000
--- a/dev-java/libgtk-java/files/digest-libgtk-java-2.8.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0bcf838a3220fdfa685c55c22d664874 libgtk-java-2.8.3.tar.gz 1099065
-RMD160 f9179f032033d02a9a8a667a202111ed71f525a7 libgtk-java-2.8.3.tar.gz 1099065
-SHA256 cdc8a9c37b8b69a2e68d77b6aeaf0780ec9d277fc104c718f18a50f20982fe1c libgtk-java-2.8.3.tar.gz 1099065
diff --git a/dev-java/libgtk-java/files/digest-libgtk-java-2.8.7 b/dev-java/libgtk-java/files/digest-libgtk-java-2.8.7
deleted file mode 100644
index 581d85252467..000000000000
--- a/dev-java/libgtk-java/files/digest-libgtk-java-2.8.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 58d20b3a104d322cf5f5a356184f04a3 libgtk-java-2.8.7.tar.gz 1122001
-RMD160 eb165c0312d6a2876da446451d6ff81112b275f6 libgtk-java-2.8.7.tar.gz 1122001
-SHA256 dd7c551969136c6938c8f22322cc4407682f3609ff9d2d7738a487061fcbca90 libgtk-java-2.8.7.tar.gz 1122001
diff --git a/dev-java/libgtk-java/libgtk-java-2.8.3-r1.ebuild b/dev-java/libgtk-java/libgtk-java-2.8.3-r1.ebuild
deleted file mode 100644
index ddeb15e69083..000000000000
--- a/dev-java/libgtk-java/libgtk-java-2.8.3-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2006 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.8.3-r1.ebuild,v 1.6 2006/12/17 13:38:55 betelgeuse Exp $
-
-# Must be before the gnome.org inherit
-GNOME_TARBALL_SUFFIX="gz"
-
-inherit java-pkg eutils gnome.org
-
-DESCRIPTION="Java bindings for GTK+"
-HOMEPAGE="http://java-gnome.sourceforge.net/"
-
-# Not on gnome.org mirrors yet :-(
-SRC_URI="http://research.operationaldynamics.com/linux/java-gnome/dist/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="2.8"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc gcj source"
-
-DEPS="
-	>=x11-libs/gtk+-2.8.3
-	>=dev-java/glib-java-0.2.3
-	>=dev-java/cairo-java-1.0.2
-	>=dev-libs/glib-2.6.0
-	>=x11-libs/cairo-1.0.0-r2
-	dev-util/pkgconfig"
-
-DEPEND=">=virtual/jdk-1.4
-		>=sys-apps/sed-4
-		source? ( app-arch/zip )
-		${DEPS}"
-RDEPEND=">=virtual/jre-1.4
-		${DEPS}"
-
-JARNAME="gtk${SLOT}.jar"
-
-pkg_setup() {
-	if use gcj ; then
-		if ! built_with_use sys-devel/gcc gcj ; then
-			ewarn
-			ewarn "You must build gcc with the gcj support to build with gcj"
-			ewarn
-			ebeep 5
-			die "No GCJ support found!"
-		fi
-	fi
-	java-pkg_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/aclocal_voodoo.patch
-
-	# Oh the joys of patching the autotools stuff
-	aclocal || die "aclocal failed"
-	libtoolize --force --copy || die "libtoolize failed"
-	autoconf || die "autoconf failed"
-	automake || die "automake failed"
-}
-
-src_compile() {
-	# this gcj deal is a workaround for http://bugzilla.gnome.org/show_bug.cgi?id=336149
-	local myflags
-	use gcj || myflags="${myflags} --without-gcj-compile"
-	econf ${myflags} \
-		  $(use_with doc javadocs) \
-		  --with-jardir=/usr/share/${PN}-${SLOT}/lib \
-		  || die "configure failed"
-
-	emake || die "compile failed"
-
-	# Fix the broken pkgconfig file
-	sed -i \
-		-e "s:classpath.*$:classpath=\${prefix}/share/${PN}-${SLOT}/lib/${JARNAME}:" \
-		${S}/gtk2-java.pc
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die "install failed"
-
-	# Examples are documentation
-	use doc || rm -rf ${D}/usr/share/doc/${PF}/examples
-
-	# Use the jars installed by make
-	# and build our own package.env file.
-	# NOTE: dojar puts the jar in the wrong place! (/usr/share/${PN}/lib)
-	cat <<-END > ${D}/usr/share/${PN}-${SLOT}/package.env
-DESCRIPTION=${DESCRIPTION}
-CLASSPATH=/usr/share/${PN}-${SLOT}/lib/${JARNAME}
-END
-
-	use source && java-pkg_dosrc ${S}/src/java/org
-}
diff --git a/dev-java/libgtk-java/libgtk-java-2.8.7.ebuild b/dev-java/libgtk-java/libgtk-java-2.8.7.ebuild
deleted file mode 100644
index 440de25b3edb..000000000000
--- a/dev-java/libgtk-java/libgtk-java-2.8.7.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2006 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.8.7.ebuild,v 1.1 2006/10/08 03:54:45 nichoj Exp $
-
-inherit java-gnome
-
-DESCRIPTION="Java bindings for GTK+"
-
-SLOT="2.8"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPS=">=x11-libs/gtk+-2.8.3
-		>=dev-java/glib-java-0.2.3
-		>=dev-java/cairo-java-1.0.2
-		>=dev-libs/glib-2.6.0
-		>=x11-libs/cairo-1.0.0-r2"
-
-DEPEND="${DEPS}"
-RDEPEND="${DEPS}"
-
-JAVA_GNOME_PC="gtk2-java.pc"