summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/java-gnome/ChangeLog7
-rw-r--r--dev-java/java-gnome/files/digest-java-gnome-2.6.0.11
-rw-r--r--dev-java/java-gnome/files/digest-java-gnome-2.6.0.1-r11
-rw-r--r--dev-java/java-gnome/files/digest-java-gnome-2.8.2-r20
-rw-r--r--dev-java/java-gnome/files/digest-java-gnome-2.8.2-r30
-rw-r--r--dev-java/java-gnome/java-gnome-0.8.3.ebuild4
-rw-r--r--dev-java/java-gnome/java-gnome-2.10.1.ebuild4
-rw-r--r--dev-java/java-gnome/java-gnome-2.6.0.1-r1.ebuild84
-rw-r--r--dev-java/java-gnome/java-gnome-2.6.0.1.ebuild82
-rw-r--r--dev-java/java-gnome/java-gnome-2.8.2-r2.ebuild114
-rw-r--r--dev-java/java-gnome/java-gnome-2.8.2-r3.ebuild115
-rw-r--r--dev-java/java-gnome/java-gnome-2.8.3.ebuild4
-rw-r--r--dev-java/libgconf-java/ChangeLog6
-rw-r--r--dev-java/libgconf-java/files/digest-libgconf-java-2.8.21
-rw-r--r--dev-java/libgconf-java/libgconf-java-2.10.1.ebuild4
-rw-r--r--dev-java/libgconf-java/libgconf-java-2.8.2.ebuild105
-rw-r--r--dev-java/libgconf-java/libgconf-java-2.8.3.1.ebuild4
-rw-r--r--dev-java/libglade-java/ChangeLog7
-rw-r--r--dev-java/libglade-java/files/digest-libglade-java-2.8.21
-rw-r--r--dev-java/libglade-java/files/digest-libglade-java-2.8.2-r11
-rw-r--r--dev-java/libglade-java/files/digest-libglade-java-2.8.2.21
-rw-r--r--dev-java/libglade-java/libglade-java-2.10.1.ebuild4
-rw-r--r--dev-java/libglade-java/libglade-java-2.8.2-r1.ebuild104
-rw-r--r--dev-java/libglade-java/libglade-java-2.8.2.2.ebuild110
-rw-r--r--dev-java/libglade-java/libglade-java-2.8.2.ebuild105
-rw-r--r--dev-java/libglade-java/libglade-java-2.8.3.1.ebuild4
-rw-r--r--dev-java/libgnome-java/ChangeLog7
-rw-r--r--dev-java/libgnome-java/Manifest8
-rw-r--r--dev-java/libgnome-java/files/digest-libgnome-java-2.8.21
-rw-r--r--dev-java/libgnome-java/files/digest-libgnome-java-2.8.2-r11
-rw-r--r--dev-java/libgnome-java/libgnome-java-2.10.1.ebuild4
-rw-r--r--dev-java/libgnome-java/libgnome-java-2.8.2-r1.ebuild106
-rw-r--r--dev-java/libgnome-java/libgnome-java-2.8.2.ebuild105
-rw-r--r--dev-java/libgnome-java/libgnome-java-2.8.3.1.ebuild4
-rw-r--r--dev-java/libgtk-java/ChangeLog7
-rw-r--r--dev-java/libgtk-java/Manifest11
-rw-r--r--dev-java/libgtk-java/files/digest-libgtk-java-2.4.6-r11
-rw-r--r--dev-java/libgtk-java/files/digest-libgtk-java-2.4.6-r21
-rw-r--r--dev-java/libgtk-java/files/digest-libgtk-java-2.4.7.21
-rw-r--r--dev-java/libgtk-java/libgtk-java-2.4.6-r1.ebuild97
-rw-r--r--dev-java/libgtk-java/libgtk-java-2.4.6-r2.ebuild99
-rw-r--r--dev-java/libgtk-java/libgtk-java-2.4.7.2.ebuild109
-rw-r--r--dev-java/libgtk-java/libgtk-java-2.4.8.1.ebuild4
-rw-r--r--dev-java/libgtk-java/libgtk-java-2.4.9.ebuild4
-rw-r--r--dev-java/libgtk-java/libgtk-java-2.6.2-r1.ebuild4
45 files changed, 57 insertions, 1390 deletions
diff --git a/dev-java/java-gnome/ChangeLog b/dev-java/java-gnome/ChangeLog
index b219a547ef1f..5e27c075ccfe 100644
--- a/dev-java/java-gnome/ChangeLog
+++ b/dev-java/java-gnome/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/java-gnome
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/ChangeLog,v 1.25 2005/05/01 16:46:31 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/ChangeLog,v 1.26 2005/06/29 15:11:51 axxo Exp $
+
+ 29 Jun 2005; Thomas Matthijs <axxo@gentoo.org> -java-gnome-2.6.0.1.ebuild,
+ -java-gnome-2.6.0.1-r1.ebuild, -java-gnome-2.8.2-r2.ebuild,
+ -java-gnome-2.8.2-r3.ebuild, java-gnome-2.8.3.ebuild:
+ remove older ebuilds + keyword x86
*java-gnome-2.10.1 (01 May 2005)
diff --git a/dev-java/java-gnome/files/digest-java-gnome-2.6.0.1 b/dev-java/java-gnome/files/digest-java-gnome-2.6.0.1
deleted file mode 100644
index c0406e9a30c3..000000000000
--- a/dev-java/java-gnome/files/digest-java-gnome-2.6.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c6d5cd8fcca6da42ea0895383a3b2cc2 java-gnome-2.6.0.1.tar.bz2 1459788
diff --git a/dev-java/java-gnome/files/digest-java-gnome-2.6.0.1-r1 b/dev-java/java-gnome/files/digest-java-gnome-2.6.0.1-r1
deleted file mode 100644
index c0406e9a30c3..000000000000
--- a/dev-java/java-gnome/files/digest-java-gnome-2.6.0.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c6d5cd8fcca6da42ea0895383a3b2cc2 java-gnome-2.6.0.1.tar.bz2 1459788
diff --git a/dev-java/java-gnome/files/digest-java-gnome-2.8.2-r2 b/dev-java/java-gnome/files/digest-java-gnome-2.8.2-r2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-java/java-gnome/files/digest-java-gnome-2.8.2-r2
+++ /dev/null
diff --git a/dev-java/java-gnome/files/digest-java-gnome-2.8.2-r3 b/dev-java/java-gnome/files/digest-java-gnome-2.8.2-r3
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-java/java-gnome/files/digest-java-gnome-2.8.2-r3
+++ /dev/null
diff --git a/dev-java/java-gnome/java-gnome-0.8.3.ebuild b/dev-java/java-gnome/java-gnome-0.8.3.ebuild
index c232bad4cded..b549b9e93940 100644
--- a/dev-java/java-gnome/java-gnome-0.8.3.ebuild
+++ b/dev-java/java-gnome/java-gnome-0.8.3.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/java-gnome/java-gnome-0.8.3.ebuild,v 1.9 2005/03/31 19:12:54 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-0.8.3.ebuild,v 1.10 2005/06/29 15:11:51 axxo Exp $
inherit eutils
@@ -19,7 +19,7 @@ DEPEND="virtual/libc
SLOT="0.8"
LICENSE="LGPL-2.1"
-KEYWORDS="x86 ~sparc"
+KEYWORDS="~sparc x86"
IUSE=""
src_compile() {
diff --git a/dev-java/java-gnome/java-gnome-2.10.1.ebuild b/dev-java/java-gnome/java-gnome-2.10.1.ebuild
index d41452fbec97..4e51efed9be7 100644
--- a/dev-java/java-gnome/java-gnome-2.10.1.ebuild
+++ b/dev-java/java-gnome/java-gnome-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/java-gnome/java-gnome-2.10.1.ebuild,v 1.1 2005/05/01 16:46:31 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-2.10.1.ebuild,v 1.2 2005/06/29 15:11:51 axxo Exp $
inherit eutils
@@ -15,7 +15,7 @@ DEPEND="!<dev-java/java-gnome-2.8
SLOT="2.10"
LICENSE="as-is"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~ppc ~x86"
IUSE=""
pkg_setup() {
diff --git a/dev-java/java-gnome/java-gnome-2.6.0.1-r1.ebuild b/dev-java/java-gnome/java-gnome-2.6.0.1-r1.ebuild
deleted file mode 100644
index 40e2057c47ea..000000000000
--- a/dev-java/java-gnome/java-gnome-2.6.0.1-r1.ebuild
+++ /dev/null
@@ -1,84 +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/java-gnome/java-gnome-2.6.0.1-r1.ebuild,v 1.5 2005/02/17 17:33:53 luckyduck Exp $
-
-inherit eutils
-
-DESCRIPTION="Java bindings for GNOME and GTK libraries that allow GNOME and GTK applications to be written in Java"
-SRC_URI="mirror://sourceforge/java-gnome/${P}.tar.bz2"
-HOMEPAGE="http://java-gnome.sourceforge.net/"
-DEPEND="virtual/libc
- >=gnome-base/libgnome-2.6.0
- >=gnome-base/libgnomeui-2.6.0
- >=gnome-base/libgnomecanvas-2.6.0
- =gnome-extra/libgtkhtml-2.6*
- >=gnome-base/libglade-2.3.6
- >=gnome-base/gconf-2.6.0
- virtual/jdk
- app-text/docbook-sgml
- >=app-text/docbook-sgml-utils-0.6.12
- x11-libs/vte
- app-arch/zip"
-SLOT="2.6"
-LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
-
-src_unpack() {
- unpack ${A}
- cd ${S} && epatch ${FILESDIR}/gentoo-java-gnome-2.6.0.1.patch || die "epatch failed"
-}
-
-src_compile() {
- ./configure \
- --host=${CHOST} \
- --prefix=/usr \
- --infodir=/usr/share/info \
- --mandir=/usr/share/man \
- --without-gcj-compile \
- --with-java-prefix=${JAVA_HOME} || die "./configure failed"
- make || die
-}
-
-src_install() {
- make prefix=${D}/usr install || die
-
- dodir /usr/share/java-gnome/lib
- mv ${D}/usr/share/java-gnome/*.jar ${D}/usr/share/java-gnome/lib/
-
- cd ${S}/atk/src/java
- zip -r ${D}/usr/share/java-gnome/lib/gtk-${PV}.src.zip *
- cd ${S}/gdk/src/java
- zip -r ${D}/usr/share/java-gnome/lib/gtk-${PV}.src.zip *
- cd ${S}/gtk/src/java
- zip -r ${D}/usr/share/java-gnome/lib/gtk-${PV}.src.zip *
- cd ${S}/glib/src/java
- zip -r ${D}/usr/share/java-gnome/lib/gtk-${PV}.src.zip *
- cd ${S}/pango/src/java
- zip -r ${D}/usr/share/java-gnome/lib/gtk-${PV}.src.zip *
-
- cd ${S}/gnome/src/java
- zip -r ${D}/usr/share/java-gnome/lib/gnome-${PV}.src.zip *
-
- cd ${S}/gtkhtml/src/java
- zip -r ${D}/usr/share/java-gnome/lib/gtkhtml-${PV}.src.zip *
-
- cd ${S}/glade/src/java
- zip -r ${D}/usr/share/java-gnome/lib/glade-${PV}.src.zip *
-
- cd ${S}/gconf/src/java
- zip -r ${D}/usr/share/java-gnome/lib/gconf-${PV}.src.zip *
-
- cd ${S}/vte/src/java
- zip -r ${D}/usr/share/java-gnome/lib/gnomevte-${PV}.src.zip *
-
- dosym /usr/share/java-gnome/lib/gnome${SLOT}-${PV%.*}.jar /usr/share/java-gnome/lib/gnome${SLOT}.jar
-
- dosym /usr/lib/libgnomejava${SLOT}.so.${PV%.*} /usr/lib/libgnomejava${SLOT}.so
-
- echo "DESCRIPTION=${DESCRIPTION}" \
- > ${D}/usr/share/java-gnome/package.env
-
- echo "CLASSPATH=/usr/share/java-gnome/lib/gtk${SLOT}.jar:/usr/share/java-gnome/lib/gnome${SLOT}.jar:/usr/share/java-gnome/lib/glade${SLOT}.jar:/usr/share/java-gnome/lib/gconf${SLOT}.jar:/usr/share/java-gnome/lib/gnomevte${SLOT}.jar:/usr/share/java-gnome/lib/gtkhtml${SLOT}.jar" \
- >> ${D}/usr/share/java-gnome/package.env
-}
diff --git a/dev-java/java-gnome/java-gnome-2.6.0.1.ebuild b/dev-java/java-gnome/java-gnome-2.6.0.1.ebuild
deleted file mode 100644
index e8c58bab1998..000000000000
--- a/dev-java/java-gnome/java-gnome-2.6.0.1.ebuild
+++ /dev/null
@@ -1,82 +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/java-gnome/java-gnome-2.6.0.1.ebuild,v 1.7 2005/02/17 17:33:53 luckyduck Exp $
-
-inherit eutils
-
-DESCRIPTION="Java bindings for GNOME and GTK libraries that allow GNOME and GTK applications to be written in Java"
-SRC_URI="mirror://sourceforge/java-gnome/${P}.tar.bz2"
-HOMEPAGE="http://java-gnome.sourceforge.net/"
-DEPEND="virtual/libc
- >=gnome-base/libgnome-2.6.0
- >=gnome-base/libgnomeui-2.6.0
- >=gnome-base/libgnomecanvas-2.6.0
- =gnome-extra/libgtkhtml-2.6*
- >=gnome-base/libglade-2.0
- virtual/jdk
- >=app-text/docbook-sgml-utils-0.6.12
- x11-libs/vte
- app-arch/zip"
-SLOT="2.6"
-LICENSE="LGPL-2.1"
-KEYWORDS="~x86"
-IUSE=""
-
-src_unpack() {
- unpack ${A}
- cd ${S} && epatch ${FILESDIR}/gentoo-java-gnome-2.6.0.1.patch || die "epatch failed"
-}
-
-src_compile() {
- ./configure \
- --host=${CHOST} \
- --prefix=/usr \
- --infodir=/usr/share/info \
- --mandir=/usr/share/man \
- --without-gcj-compile \
- --with-java-prefix=${JAVA_HOME} || die "./configure failed"
- make || die
-}
-
-src_install() {
- make prefix=${D}/usr install || die
-
- dodir /usr/share/java-gnome/lib
- mv ${D}/usr/share/java-gnome/*.jar ${D}/usr/share/java-gnome/lib/
-
- cd ${S}/atk/src/java
- zip -r ${D}/usr/share/java-gnome/lib/gtk-${PV}.src.zip *
- cd ${S}/gdk/src/java
- zip -r ${D}/usr/share/java-gnome/lib/gtk-${PV}.src.zip *
- cd ${S}/gtk/src/java
- zip -r ${D}/usr/share/java-gnome/lib/gtk-${PV}.src.zip *
- cd ${S}/glib/src/java
- zip -r ${D}/usr/share/java-gnome/lib/gtk-${PV}.src.zip *
- cd ${S}/pango/src/java
- zip -r ${D}/usr/share/java-gnome/lib/gtk-${PV}.src.zip *
-
- cd ${S}/gnome/src/java
- zip -r ${D}/usr/share/java-gnome/lib/gnome-${PV}.src.zip *
-
- cd ${S}/gtkhtml/src/java
- zip -r ${D}/usr/share/java-gnome/lib/gtkhtml-${PV}.src.zip *
-
- cd ${S}/glade/src/java
- zip -r ${D}/usr/share/java-gnome/lib/glade-${PV}.src.zip *
-
- cd ${S}/gconf/src/java
- zip -r ${D}/usr/share/java-gnome/lib/gconf-${PV}.src.zip *
-
- cd ${S}/vte/src/java
- zip -r ${D}/usr/share/java-gnome/lib/gnomevte-${PV}.src.zip *
-
- dosym /usr/share/java-gnome/lib/gnome${SLOT}-${PV}.jar /usr/share/java-gnome/lib/gnome${SLOT}.jar
-
- dosym /usr/lib/libgnomejava${SLOT}.so.${PV} /usr/lib/libgnomejava${SLOT}.so
-
- echo "DESCRIPTION=${DESCRIPTION}" \
- > ${D}/usr/share/java-gnome/package.env
-
- echo "CLASSPATH=/usr/share/java-gnome/lib/gtk${SLOT}.jar:/usr/share/java-gnome/lib/gnome${SLOT}.jar:/usr/share/java-gnome/lib/glade${SLOT}.jar:/usr/share/java-gnome/lib/gconf${SLOT}.jar:/usr/share/java-gnome/lib/gnomevte${SLOT}.jar:/usr/share/java-gnome/lib/gtkhtml${SLOT}.jar" \
- >> ${D}/usr/share/java-gnome/package.env
-}
diff --git a/dev-java/java-gnome/java-gnome-2.8.2-r2.ebuild b/dev-java/java-gnome/java-gnome-2.8.2-r2.ebuild
deleted file mode 100644
index e29132829cd7..000000000000
--- a/dev-java/java-gnome/java-gnome-2.8.2-r2.ebuild
+++ /dev/null
@@ -1,114 +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/java-gnome/java-gnome-2.8.2-r2.ebuild,v 1.2 2005/02/17 17:33:53 luckyduck Exp $
-
-inherit eutils
-
-DESCRIPTION="A meta package for all the bindings libraries necessary to write GNOME/GTK applicatons in Java"
-HOMEPAGE="http://java-gnome.sourceforge.net/"
-DEPEND="!<dev-java/java-gnome-2.8
- >=dev-java/libgtk-java-2.4.6-r2
- >=dev-java/libgnome-java-2.8.2-r1
- >=dev-java/libgconf-java-2.8.2
- >=dev-java/libglade-java-2.8.2-r1
- doc? ( >=virtual/jdk-1.2 )
- app-arch/unzip"
-
-SLOT="2.8"
-LICENSE="as-is"
-KEYWORDS="~x86 ~ppc"
-IUSE="doc"
-
-pkg_setup() {
-
- einfo ""
- einfo "The java-gnome project has made considerably changes to its internal"
- einfo "structure. Instead of one monolithic java-gnome package, there are"
- einfo "now indiviudal builds for libgtk-java, libgnome-java, libglade-java, etc"
- einfo ""
- einfo "This java-gnome ebuild is now a meta package which simply depends on"
- einfo "the various new ebuilds"
- einfo ""
- ewarn "While this ebuild is slotted 2.8, it is marked as being blocked by"
- ewarn "the presence of older versions of java-gnome if they exist on your"
- ewarn "system. Not only were the 2.6 bindings really buggy, but with the"
- ewarn "major re-organization of this package into modular pieces, the"
- ewarn "risk of library and/or jar naming collisions is too high."
- einfo ""
- einfo "By the time you see this message, the above issues have been"
- einfo "resolved (ie the new lib*-java packages will all be merged,"
- einfo "and any old java-gnome packages are now removed)."
- einfo ""
-}
-
-src_compile() {
- use doc || return
-
- #
- # Upstream's reorg led to a total mess with the generated Javadoc.
- # This attempts to replace it for the time being, creating Javadoc
- # for all the java-gnome libraries at one go (which makes way more sense
- # than one per library scattered all over)
- #
-
- cd ${WORKDIR}
-
- # Yes, this is terrible hard coding. I'd welcome someone telling me
- # how to do this better.
-
- unzip -o -q /usr/share/libgtk-java-2.4/src/libgtk-java-2.4.6.src.zip -d java
- unzip -o -q /usr/share/libgnome-java-2.8/src/libgnome-java-2.8.2.src.zip -d java
- unzip -o -q /usr/share/libgconf-java-2.8/src/libgconf-java-2.8.2.src.zip -d java
- unzip -o -q /usr/share/libglade-java-2.8/src/libglade-java-2.8.2.src.zip -d java
-
- javadoc \
- -public -use -version -author \
- -windowtitle "java-gnome ${PV} API Reference" \
- -doctitle "API reference for <B><TT>java-gnome</TT></B>, version ${PV}" \
- -d api \
- -sourcepath java \
- org.gnu.glib \
- org.gnu.pango \
- org.gnu.atk \
- org.gnu.gdk \
- org.gnu.gtk \
- org.gnu.gtk.event \
- org.gnu.gnome \
- org.gnu.gnome.event \
- org.gnu.glade \
- org.gnu.gconf
-}
-
-src_install() {
- einfo "creating symlinks for convenience and backwards compatability"
-
- #
- # This is just here for convenience and for legacy compatability.
- #
- # This isn't meant to be Java policy compliant. There is no
- # package.env file for this ebuild because the individual libraries
- # it depends on all have proper package.env (which this uses, in fact).
- #
-
- mkdir -p ${D}/usr/share/java-gnome/lib
- cd ${D}/usr/share/java-gnome/lib
-
- gtk_jar=`java-config -p libgtk-java-2.4`
- ln -s $gtk_jar `basename $gtk_jar`
-
- gnome_jar=`java-config -p libgnome-java-2.8`
- ln -s $gnome_jar `basename $gnome_jar`
-
- glade_jar=`java-config -p libglade-java-2.8`
- ln -s $glade_jar `basename $glade_jar`
-
- gconf_jar=`java-config -p libgconf-java-2.8`
- ln -s $gconf_jar `basename $gconf_jar`
-
-
- use doc || return
-
- mkdir -p ${D}/usr/share/doc/${PF}
- mv ${WORKDIR}/api ${D}/usr/share/doc/${PF}
-}
-
diff --git a/dev-java/java-gnome/java-gnome-2.8.2-r3.ebuild b/dev-java/java-gnome/java-gnome-2.8.2-r3.ebuild
deleted file mode 100644
index a8354ad746c1..000000000000
--- a/dev-java/java-gnome/java-gnome-2.8.2-r3.ebuild
+++ /dev/null
@@ -1,115 +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/java-gnome/java-gnome-2.8.2-r3.ebuild,v 1.3 2005/02/17 17:33:53 luckyduck Exp $
-
-inherit eutils java-pkg
-
-DESCRIPTION="A meta package for all the bindings libraries necessary to write GNOME/GTK applicatons in Java"
-HOMEPAGE="http://java-gnome.sourceforge.net/"
-DEPEND="!<dev-java/java-gnome-2.8
- >=dev-java/libgtk-java-2.4.7.2
- >=dev-java/libgnome-java-2.8.2-r1
- >=dev-java/libgconf-java-2.8.2
- >=dev-java/libglade-java-2.8.2.2
- doc? ( >=virtual/jdk-1.2 )
- app-arch/unzip"
-
-SLOT="2.8"
-LICENSE="as-is"
-KEYWORDS="~x86 ~ppc"
-IUSE="doc"
-
-pkg_setup() {
-
- einfo ""
- einfo "The java-gnome project has made considerably changes to its internal"
- einfo "structure. Instead of one monolithic java-gnome package, there are"
- einfo "now indiviudal builds for libgtk-java, libgnome-java, libglade-java, etc"
- einfo ""
- einfo "This java-gnome ebuild is now a meta package which simply depends on"
- einfo "the various new ebuilds"
- einfo ""
- ewarn "While this ebuild is slotted 2.8, it is marked as being blocked by"
- ewarn "the presence of older versions of java-gnome if they exist on your"
- ewarn "system. Not only were the 2.6 bindings really buggy, but with the"
- ewarn "major re-organization of this package into modular pieces, the"
- ewarn "risk of library and/or jar naming collisions is too high."
- einfo ""
- einfo "By the time you see this message, the above issues have been"
- einfo "resolved (ie the new lib*-java packages will all be merged,"
- einfo "and any old java-gnome packages are now removed)."
- einfo ""
-}
-
-src_compile() {
- use doc || return
-
- #
- # Upstream's reorg led to a total mess with the generated Javadoc.
- # This attempts to replace it for the time being, creating Javadoc
- # for all the java-gnome libraries at one go (which makes way more sense
- # than one per library scattered all over)
- #
-
- cd ${WORKDIR}
-
- # Yes, this is terrible hard coding. I'd welcome someone telling me
- # how to do this better.
-
- unzip -o -q /usr/share/libgtk-java-2.4/src/libgtk-java-2.4.7.2.src.zip -d java
- unzip -o -q /usr/share/libgnome-java-2.8/src/libgnome-java-2.8.2.src.zip -d java
- unzip -o -q /usr/share/libgconf-java-2.8/src/libgconf-java-2.8.2.src.zip -d java
- unzip -o -q /usr/share/libglade-java-2.8/src/libglade-java-2.8.2.2.src.zip -d java
-
- mkdir api
- javadoc \
- -public -use -version -author \
- -windowtitle "java-gnome ${PV} API Reference" \
- -doctitle "API reference for <B><TT>java-gnome</TT></B>, version ${PV}" \
- -d api \
- -sourcepath java \
- org.gnu.glib \
- org.gnu.pango \
- org.gnu.atk \
- org.gnu.gdk \
- org.gnu.gtk \
- org.gnu.gtk.event \
- org.gnu.gnome \
- org.gnu.gnome.event \
- org.gnu.glade \
- org.gnu.gconf
-}
-
-src_install() {
- einfo "creating symlinks for convenience and backwards compatability"
-
- #
- # This is just here for convenience and for legacy compatability.
- #
- # This isn't meant to be Java policy compliant. There is no
- # package.env file for this ebuild because the individual libraries
- # it depends on all have proper package.env (which this uses, in fact).
- #
-
- dodir /usr/share/java-gnome/lib
- cd ${D}/usr/share/java-gnome/lib
-
- gtk_jar=`java-config -p libgtk-java-2.4`
- ln -s $gtk_jar `basename $gtk_jar`
-
- gnome_jar=`java-config -p libgnome-java-2.8`
- ln -s $gnome_jar `basename $gnome_jar`
-
- glade_jar=`java-config -p libglade-java-2.8`
- ln -s $glade_jar `basename $glade_jar`
-
- gconf_jar=`java-config -p libgconf-java-2.8`
- ln -s $gconf_jar `basename $gconf_jar`
-
-
- if use doc; then
- dodir ${D}/usr/share/doc/${PF}
- java-pkg_dohtml -r ${WORKDIR}/api
- fi
-}
-
diff --git a/dev-java/java-gnome/java-gnome-2.8.3.ebuild b/dev-java/java-gnome/java-gnome-2.8.3.ebuild
index 77655b4f3ba4..09764a3fa3ae 100644
--- a/dev-java/java-gnome/java-gnome-2.8.3.ebuild
+++ b/dev-java/java-gnome/java-gnome-2.8.3.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/java-gnome/java-gnome-2.8.3.ebuild,v 1.1 2005/03/12 19:29:33 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-2.8.3.ebuild,v 1.2 2005/06/29 15:11:51 axxo Exp $
inherit eutils
@@ -15,7 +15,7 @@ DEPEND="!<dev-java/java-gnome-2.8
SLOT="2.8"
LICENSE="as-is"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc x86"
IUSE="doc"
pkg_setup() {
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() {
diff --git a/dev-java/libglade-java/ChangeLog b/dev-java/libglade-java/ChangeLog
index 5da528976560..87857b4a0dc1 100644
--- a/dev-java/libglade-java/ChangeLog
+++ b/dev-java/libglade-java/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/libglade-java
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libglade-java/ChangeLog,v 1.8 2005/05/01 16:39:10 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libglade-java/ChangeLog,v 1.9 2005/06/29 15:11:18 axxo Exp $
+
+ 29 Jun 2005; Thomas Matthijs <axxo@gentoo.org>
+ -libglade-java-2.8.2.ebuild, -libglade-java-2.8.2-r1.ebuild,
+ -libglade-java-2.8.2.2.ebuild, libglade-java-2.8.3.1.ebuild:
+ remove older ebuilds + keyword x86
*libglade-java-2.10.1 (01 May 2005)
diff --git a/dev-java/libglade-java/files/digest-libglade-java-2.8.2 b/dev-java/libglade-java/files/digest-libglade-java-2.8.2
deleted file mode 100644
index 6998c06972dd..000000000000
--- a/dev-java/libglade-java/files/digest-libglade-java-2.8.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 428aad7b148cb2e4d695a04593b52435 libglade-java-2.8.2.tar.bz2 31557
diff --git a/dev-java/libglade-java/files/digest-libglade-java-2.8.2-r1 b/dev-java/libglade-java/files/digest-libglade-java-2.8.2-r1
deleted file mode 100644
index 6998c06972dd..000000000000
--- a/dev-java/libglade-java/files/digest-libglade-java-2.8.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 428aad7b148cb2e4d695a04593b52435 libglade-java-2.8.2.tar.bz2 31557
diff --git a/dev-java/libglade-java/files/digest-libglade-java-2.8.2.2 b/dev-java/libglade-java/files/digest-libglade-java-2.8.2.2
deleted file mode 100644
index 4fd1fa4341de..000000000000
--- a/dev-java/libglade-java/files/digest-libglade-java-2.8.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ff3d2120538c1e0d1ef3f7f813dddbd7 libglade-java-2.8.2.2.tar.bz2 81449
diff --git a/dev-java/libglade-java/libglade-java-2.10.1.ebuild b/dev-java/libglade-java/libglade-java-2.10.1.ebuild
index ebb02c699b2c..5755bfc2f635 100644
--- a/dev-java/libglade-java/libglade-java-2.10.1.ebuild
+++ b/dev-java/libglade-java/libglade-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/libglade-java/libglade-java-2.10.1.ebuild,v 1.1 2005/05/01 16:39:10 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libglade-java/libglade-java-2.10.1.ebuild,v 1.2 2005/06/29 15:11:18 axxo Exp $
#
# WARNING: Because java-gnome is a set of bindings to native GNOME libraries,
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
#
SLOT="2.10"
LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~ppc ~x86"
IUSE="gcj gnome"
src_unpack() {
diff --git a/dev-java/libglade-java/libglade-java-2.8.2-r1.ebuild b/dev-java/libglade-java/libglade-java-2.8.2-r1.ebuild
deleted file mode 100644
index 7e46b41537ba..000000000000
--- a/dev-java/libglade-java/libglade-java-2.8.2-r1.ebuild
+++ /dev/null
@@ -1,104 +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/libglade-java/libglade-java-2.8.2-r1.ebuild,v 1.3 2005/03/31 18:59: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 DOES NOT WORK.
-#
-
-inherit eutils gnome.org
-
-DESCRIPTION="Java bindings for [Lib]Glade (allows GNOME/GTK applications writen in Java to be generate their user interface based on Glade description files)"
-HOMEPAGE="http://java-gnome.sourceforge.net/"
-RDEPEND=">=gnome-base/libglade-2.3.6
- >=dev-java/libgtk-java-2.4.6-r2
- >=dev-java/libgnome-java-2.8.2-r1
- >=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"
-
-#
-# 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}/libglade-java-2.8.2_gentoo-PN-SLOT.patch
- epatch ${FILESDIR}/libglade-java-2.8.2_signal-connection-fix.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/libglade${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/libglade${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/libglade-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/glade${SLOT}.jar" \
- >> ${D}/usr/share/${PN}-${SLOT}/package.env
-}
diff --git a/dev-java/libglade-java/libglade-java-2.8.2.2.ebuild b/dev-java/libglade-java/libglade-java-2.8.2.2.ebuild
deleted file mode 100644
index 03e0abbf0aca..000000000000
--- a/dev-java/libglade-java/libglade-java-2.8.2.2.ebuild
+++ /dev/null
@@ -1,110 +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/libglade-java/libglade-java-2.8.2.2.ebuild,v 1.3 2005/03/31 18:59: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 DOES NOT WORK.
-#
-
-inherit eutils gnome.org
-
-DESCRIPTION="Java bindings for [Lib]Glade (allows GNOME/GTK applications writen in Java to be generate their user interface based on Glade description files)"
-HOMEPAGE="http://java-gnome.sourceforge.net/"
-RDEPEND=">=gnome-base/libglade-2.3.6
- >=dev-java/libgtk-java-2.4.7.1
- >=dev-java/libgnome-java-2.8.2-r1
- >=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}/libglade-java-2.8.2_gentoo-PN-SLOT.patch
-# fixed upstream, will remove next release.
-# epatch ${FILESDIR}/libglade-java-2.8.2_signal-connection-fix.patch
- sed -i "s|^\(JAVA_INCLUDES = \)|\1 -I\${JDK_HOME}/include -I\${JDK_HOME}/include/linux/|" src/Makefile.in || die "sed failed"
-
- 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.
- #
-
- ./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/libglade${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/libglade${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/libglade-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/glade${SLOT}.jar" \
- >> ${D}/usr/share/${PN}-${SLOT}/package.env
-}
diff --git a/dev-java/libglade-java/libglade-java-2.8.2.ebuild b/dev-java/libglade-java/libglade-java-2.8.2.ebuild
deleted file mode 100644
index a08a6077ae72..000000000000
--- a/dev-java/libglade-java/libglade-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/libglade-java/libglade-java-2.8.2.ebuild,v 1.4 2005/03/31 18:59: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 [Lib]Glade (allows GNOME/GTK applications writen in Java to be generate their user interface based on Glade description files)"
-HOMEPAGE="http://java-gnome.sourceforge.net/"
-RDEPEND=">=gnome-base/libglade-2.3.6
- >=dev-java/libgnome-java-2.8.2
- >=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}/libglade-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/libglade${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/libglade${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/libglade-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/glade${SLOT}.jar" \
- >> ${D}/usr/share/${PN}-${SLOT}/package.env
-}
diff --git a/dev-java/libglade-java/libglade-java-2.8.3.1.ebuild b/dev-java/libglade-java/libglade-java-2.8.3.1.ebuild
index 28aea32b4b5e..ea0554d4dfa3 100644
--- a/dev-java/libglade-java/libglade-java-2.8.3.1.ebuild
+++ b/dev-java/libglade-java/libglade-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/libglade-java/libglade-java-2.8.3.1.ebuild,v 1.3 2005/03/31 18:59:34 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libglade-java/libglade-java-2.8.3.1.ebuild,v 1.4 2005/06/29 15:11:18 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 gnome"
src_unpack() {
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() {
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() {