summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-java/java-gnome/ChangeLog9
-rw-r--r--dev-java/java-gnome/files/digest-java-gnome-2.10.10
-rw-r--r--dev-java/java-gnome/java-gnome-2.10.1.ebuild82
-rw-r--r--dev-java/libglade-java/ChangeLog10
-rw-r--r--dev-java/libglade-java/files/digest-libglade-java-2.10.11
-rw-r--r--dev-java/libglade-java/files/libglade-java-2.10.0_fix-install-dir.patch11
-rw-r--r--dev-java/libglade-java/libglade-java-2.10.1.ebuild94
-rw-r--r--dev-java/libgnome-java/ChangeLog10
-rw-r--r--dev-java/libgnome-java/files/digest-libgnome-java-2.10.11
-rw-r--r--dev-java/libgnome-java/files/libgnome-java-2.10.0_fix-install-dir.patch11
-rw-r--r--dev-java/libgnome-java/libgnome-java-2.10.1.ebuild90
11 files changed, 316 insertions, 3 deletions
diff --git a/dev-java/java-gnome/ChangeLog b/dev-java/java-gnome/ChangeLog
index 5e56565ebe60..b219a547ef1f 100644
--- a/dev-java/java-gnome/ChangeLog
+++ b/dev-java/java-gnome/ChangeLog
@@ -1,6 +1,13 @@
# 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.24 2005/03/31 19:12:54 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/ChangeLog,v 1.25 2005/05/01 16:46:31 karltk Exp $
+
+*java-gnome-2.10.1 (01 May 2005)
+
+ 01 May 2005; Karl Trygve Kalleberg <karltk@gentoo.org>
+ +java-gnome-2.10.1.ebuild:
+ Updates from Andrew Cowie <andrew@operationaldynamics.com>, partial fix for
+ #87978.
31 Mar 2005; Thomas Matthijs <axxo@gentoo.org> java-gnome-0.8.3.ebuild:
add gnomeui & libgtkhtml to depend
diff --git a/dev-java/java-gnome/files/digest-java-gnome-2.10.1 b/dev-java/java-gnome/files/digest-java-gnome-2.10.1
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/dev-java/java-gnome/files/digest-java-gnome-2.10.1
diff --git a/dev-java/java-gnome/java-gnome-2.10.1.ebuild b/dev-java/java-gnome/java-gnome-2.10.1.ebuild
new file mode 100644
index 000000000000..d41452fbec97
--- /dev/null
+++ b/dev-java/java-gnome/java-gnome-2.10.1.ebuild
@@ -0,0 +1,82 @@
+# 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 $
+
+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.6.2
+ >=dev-java/libgnome-java-2.10.1
+ >=dev-java/libgconf-java-2.10.1
+ >=dev-java/libglade-java-2.10.1
+ doc? ( >=virtual/jdk-1.2 )"
+
+SLOT="2.10"
+LICENSE="as-is"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+
+pkg_setup() {
+
+ einfo ""
+ einfo "At the 2.8 release, the java-gnome project made considerably changes to"
+ einfo "its structure. Instead of one monolithic java-gnome package, there are"
+ einfo "now indiviudal builds for libgtk-java, libgnome-java, libglade-java, etc"
+ einfo ""
+ einfo "The java-gnome ebuild is now a meta package which simply depends on"
+ einfo "the various new ebuilds, to make it easy to pull them all in."
+ einfo ""
+ ewarn "While this ebuild is slotted 2.10, 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 was deemed too high."
+ einfo ""
+ einfo "java-gnome 2.8 and 2.10 can co-exist on your system, but you really"
+ einfo "only need the older gtk 2.4 / gnome 2.8 series (instead of the"
+ einfo "current gtk 2.6 / gnome 2.10 series) if you don't have GNOME 2.10 yet."
+ einfo ""
+}
+
+src_compile() {
+
+ #
+ # Upstream's reorg led to a total mess with the generated Javadoc.
+ # We need to address it, but now the automake is building all the
+ # javadoc more or less like-it-or-not, so we'll need to act there.
+ #
+ return
+}
+
+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.6`
+ ln -s $gtk_jar `basename $gtk_jar`
+
+ gnome_jar=`java-config -p libgnome-java-2.10`
+ ln -s $gnome_jar `basename $gnome_jar`
+
+ glade_jar=`java-config -p libglade-java-2.10`
+ ln -s $glade_jar `basename $glade_jar`
+
+ gconf_jar=`java-config -p libgconf-java-2.10`
+ ln -s $gconf_jar `basename $gconf_jar`
+
+
+ use doc || return
+}
+
diff --git a/dev-java/libglade-java/ChangeLog b/dev-java/libglade-java/ChangeLog
index 65b1ba509f3b..5da528976560 100644
--- a/dev-java/libglade-java/ChangeLog
+++ b/dev-java/libglade-java/ChangeLog
@@ -1,6 +1,14 @@
# 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.7 2005/03/31 18:59:34 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libglade-java/ChangeLog,v 1.8 2005/05/01 16:39:10 karltk Exp $
+
+*libglade-java-2.10.1 (01 May 2005)
+
+ 01 May 2005; Karl Trygve Kalleberg <karltk@gentoo.org>
+ +files/libglade-java-2.10.0_fix-install-dir.patch,
+ +libglade-java-2.10.1.ebuild:
+ Updates from Andrew Cowie <andrew@operationaldynamics.com>, partial fix for
+ #87978.
31 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
libglade-java-2.8.2-r1.ebuild, libglade-java-2.8.2.2.ebuild,
diff --git a/dev-java/libglade-java/files/digest-libglade-java-2.10.1 b/dev-java/libglade-java/files/digest-libglade-java-2.10.1
new file mode 100644
index 000000000000..b37605f75898
--- /dev/null
+++ b/dev-java/libglade-java/files/digest-libglade-java-2.10.1
@@ -0,0 +1 @@
+MD5 edf7e9e113afa9f002f048d62c87920b libglade-java-2.10.1.tar.bz2 251071
diff --git a/dev-java/libglade-java/files/libglade-java-2.10.0_fix-install-dir.patch b/dev-java/libglade-java/files/libglade-java-2.10.0_fix-install-dir.patch
new file mode 100644
index 000000000000..fc36bb8d452c
--- /dev/null
+++ b/dev-java/libglade-java/files/libglade-java-2.10.0_fix-install-dir.patch
@@ -0,0 +1,11 @@
+--- libglade-java-2.10.0/Makefile.in 2005-03-06 16:57:51.000000000 -0500
++++ fixed/Makefile.in 2005-04-04 00:37:47.000000000 -0400
+@@ -1688,7 +1688,7 @@
+ @BUILD_JAVADOC_TRUE@ touch doc-stamp
+
+ install-data-hook:
+- cd $(DESTDIR)$(datadir)/java && \
++ cd $(DESTDIR)$(jardir) && \
+ mv -f glade$(apiversion).jar glade$(apiversion)-$(VERSION).jar && \
+ $(LN_S) glade$(apiversion)-$(VERSION).jar glade$(apiversion).jar
+
diff --git a/dev-java/libglade-java/libglade-java-2.10.1.ebuild b/dev-java/libglade-java/libglade-java-2.10.1.ebuild
new file mode 100644
index 000000000000..ebb02c699b2c
--- /dev/null
+++ b/dev-java/libglade-java/libglade-java-2.10.1.ebuild
@@ -0,0 +1,94 @@
+# 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 $
+
+#
+# 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.5.1
+ gnome? ( >=gnome-base/libgnomeui-2.10.0 )
+ gnome? ( >=gnome-base/libgnomecanvas-2.10.0 )
+ >=dev-java/libgtk-java-2.6.2
+ gnome? ( >=dev-java/libgnome-java-2.10.1 )
+ >=virtual/jre-1.2"
+
+
+DEPEND="${RDEPEND}
+ >=virtual/jdk-1.2
+ app-arch/zip"
+
+#
+# Critical that this match glade's apiversion
+#
+SLOT="2.10"
+LICENSE="LGPL-2.1"
+KEYWORDS="~x86 ~ppc"
+IUSE="gcj gnome"
+
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+
+ epatch ${FILESDIR}/libglade-java-2.10.0_fix-install-dir.patch
+
+ sed -i \
+ -e "s:/share/${PN}/:/share/${PN}-${SLOT}/:" \
+ -e "s:/share/java/:/share/${PN}-${SLOT}/lib/:" \
+ configure || die "sed configure error"
+
+ rm -f ${S}/config.cache
+}
+
+src_compile() {
+ local conf
+
+ use gcj || conf="${conf} --without-gcj-compile"
+ use gnome || conf="${conf} --without-gnome"
+
+ 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.
+ #
+
+ ./configure \
+ --host=${CHOST} \
+ --prefix=/usr \
+ --with-jardir=/usr/share/${PN}-${SLOT}/lib \
+ ${conf} || die "./configure failed"
+ make || die
+}
+
+src_install() {
+
+ make DESTDIR=${D} install || die "install failed"
+
+ # the upstream install scatters things around a bit. The following cleans
+ # that up to make it policy compliant.
+
+ mkdir ${D}/usr/share/${PN}-${SLOT}/src
+ cd ${S}/src/java
+ find . -name '*.java' | xargs zip ${D}/usr/share/${PN}-${SLOT}/src/libglade-java-${PV}.src.zip
+
+ # 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/libgnome-java/ChangeLog b/dev-java/libgnome-java/ChangeLog
index e0ed9586fb5a..36f3a82dcbd7 100644
--- a/dev-java/libgnome-java/ChangeLog
+++ b/dev-java/libgnome-java/ChangeLog
@@ -1,6 +1,14 @@
# 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.8 2005/03/31 18:56:11 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgnome-java/ChangeLog,v 1.9 2005/05/01 16:42:39 karltk Exp $
+
+*libgnome-java-2.10.1 (01 May 2005)
+
+ 01 May 2005; Karl Trygve Kalleberg <karltk@gentoo.org>
+ +files/libgnome-java-2.10.0_fix-install-dir.patch,
+ +libgnome-java-2.10.1.ebuild:
+ Updates from Andrew Cowie <andrew@operationaldynamics.com>, partial fix for
+ #87978.
31 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
libgnome-java-2.8.2-r1.ebuild, libgnome-java-2.8.2.ebuild,
diff --git a/dev-java/libgnome-java/files/digest-libgnome-java-2.10.1 b/dev-java/libgnome-java/files/digest-libgnome-java-2.10.1
new file mode 100644
index 000000000000..36dc2aabb461
--- /dev/null
+++ b/dev-java/libgnome-java/files/digest-libgnome-java-2.10.1
@@ -0,0 +1 @@
+MD5 c1b47338bafe4c7f89d1cb505c26a8ce libgnome-java-2.10.1.tar.bz2 349490
diff --git a/dev-java/libgnome-java/files/libgnome-java-2.10.0_fix-install-dir.patch b/dev-java/libgnome-java/files/libgnome-java-2.10.0_fix-install-dir.patch
new file mode 100644
index 000000000000..fa21ad94115c
--- /dev/null
+++ b/dev-java/libgnome-java/files/libgnome-java-2.10.0_fix-install-dir.patch
@@ -0,0 +1,11 @@
+--- libgnome-java-2.10.0/Makefile.in 2005-03-06 18:14:01.000000000 -0500
++++ fixed/Makefile.in 2005-04-04 00:39:40.000000000 -0400
+@@ -3072,7 +3072,7 @@
+ $(DOCBOOK) -o doc/doc $<
+
+ install-data-hook:
+- cd $(DESTDIR)$(datadir)/java && \
++ cd $(DESTDIR)$(jardir) && \
+ mv -f gnome$(apiversion).jar gnome$(apiversion)-$(VERSION).jar && \
+ $(LN_S) gnome$(apiversion)-$(VERSION).jar gnome$(apiversion).jar
+
diff --git a/dev-java/libgnome-java/libgnome-java-2.10.1.ebuild b/dev-java/libgnome-java/libgnome-java-2.10.1.ebuild
new file mode 100644
index 000000000000..3e56bdc75b5f
--- /dev/null
+++ b/dev-java/libgnome-java/libgnome-java-2.10.1.ebuild
@@ -0,0 +1,90 @@
+# 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 $
+
+#
+# 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.10.0
+ >=gnome-base/libgnomeui-2.10.0
+ >=gnome-base/libgnomecanvas-2.10.0
+ >=dev-java/libgtk-java-2.6.2
+ >=virtual/jre-1.2"
+
+DEPEND="${RDEPEND}
+ >=virtual/jdk-1.2
+ app-arch/zip"
+
+#
+# Critical that this match the gnome apiversion
+#
+SLOT="2.10"
+LICENSE="LGPL-2.1"
+KEYWORDS="~x86 ~ppc"
+IUSE="gcj"
+
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+
+ epatch ${FILESDIR}/libgnome-java-2.10.0_fix-install-dir.patch
+
+ sed -i \
+ -e "s:/share/${PN}/:/share/${PN}-${SLOT}/:" \
+ -e "s:/share/java/:/share/${PN}-${SLOT}/lib/:" \
+ configure || die "sed configure error"
+}
+
+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.
+ #
+
+ ./configure \
+ --host=${CHOST} \
+ --prefix=/usr \
+ --with-jardir=/usr/share/${PN}-${SLOT}/lib \
+ ${conf} || die "./configure failed"
+ make || die
+}
+
+src_install() {
+ # workaround Makefile bug not creating necessary parent directories
+
+ make DESTDIR=${D} install || die "install step failed"
+
+ # 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}
+
+ dodir /usr/share/${PN}-${SLOT}/src
+ cd ${S}/src/java
+ find . -name '*.java' | xargs zip ${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
+}