diff options
| -rw-r--r-- | dev-java/libgconf-java/Manifest | 15 | ||||
| -rw-r--r-- | dev-java/libglade-java/ChangeLog | 13 | ||||
| -rw-r--r-- | dev-java/libglade-java/Manifest | 19 | ||||
| -rw-r--r-- | dev-java/libglade-java/files/digest-libglade-java-2.8.3.1 | 1 | ||||
| -rw-r--r-- | dev-java/libglade-java/files/libglade-java-2.8.3.1_gentoo-PN-SLOT.patch | 12 | ||||
| -rw-r--r-- | dev-java/libglade-java/libglade-java-2.8.2-r1.ebuild | 4 | ||||
| -rw-r--r-- | dev-java/libglade-java/libglade-java-2.8.2.2.ebuild | 4 | ||||
| -rw-r--r-- | dev-java/libglade-java/libglade-java-2.8.2.ebuild | 4 | ||||
| -rw-r--r-- | dev-java/libglade-java/libglade-java-2.8.3.1.ebuild | 101 |
9 files changed, 151 insertions, 22 deletions
diff --git a/dev-java/libgconf-java/Manifest b/dev-java/libgconf-java/Manifest index ceccf85ffbd1..45e5305c59b6 100644 --- a/dev-java/libgconf-java/Manifest +++ b/dev-java/libgconf-java/Manifest @@ -1,15 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 0d0d2bae27f2305e11a75db15cac921d ChangeLog 760 -MD5 39b0d1bcd2ea46c03b2cb7b59f66443c libgconf-java-2.8.2.ebuild 3383 +MD5 e08166d8e0d4adaa46010abe8ff3423f ChangeLog 1103 +MD5 f39b14065c28ae93e38cd4be361f9e7d libgconf-java-2.8.2.ebuild 3388 MD5 2e1952c33e5bcce8813dec9d43203e29 metadata.xml 1042 +MD5 6300793f4ab3efea205c00394b97dc4f libgconf-java-2.8.3.1.ebuild 2855 MD5 f68363dbf78345af0bea956d309d2f66 files/digest-libgconf-java-2.8.2 71 +MD5 073d974cdf39c3e94b0da21e0b2e9231 files/libgconf-java-2.8.3.1_gentoo-PN-SLOT.patch 508 MD5 03c4b5ccb943b51e5259e5046ff30719 files/libgconf-java-2.8.2_gentoo-PN-SLOT.patch 994 +MD5 fa4698389381ae96bb70cc672750fe57 files/digest-libgconf-java-2.8.3.1 74 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) +Version: GnuPG v1.4.0 (GNU/Linux) -iD8DBQFB0VfL/rLF9B432nYRAly9AJ0VKM8IgUUIsp8qsYt/iIDxyUeIdgCfR9s2 -FokM9L0edCBsJxH4onxXagQ= -=Kb88 +iD8DBQFCM0I206ebR+OMO78RArHeAJ98vYcSmwPdHtPaYMOSqfOtZdPxwgCgg0ix +NFUUw3e/O6sCGw2tNyWMCdc= +=B+oE -----END PGP SIGNATURE----- diff --git a/dev-java/libglade-java/ChangeLog b/dev-java/libglade-java/ChangeLog index 16dc1ffb0b21..c3250ba2968f 100644 --- a/dev-java/libglade-java/ChangeLog +++ b/dev-java/libglade-java/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for dev-java/libglade-java -# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/libglade-java/ChangeLog,v 1.4 2004/12/28 12:56:02 axxo Exp $ +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/libglade-java/ChangeLog,v 1.5 2005/03/12 19:21:25 luckyduck Exp $ + +*libglade-java-2.8.3.1 (12 Mar 2005) + + 12 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> + +files/libglade-java-2.8.3.1_gentoo-PN-SLOT.patch, + +libglade-java-2.8.3.1.ebuild: + new upstream version, partially closes #83366. added ~amd64 to KEYWORDS. + ebuilds and patched contributed by Andrew Cowie + <andrew@operationaldynamics.com>. * libglade-java-2.8.2.2 (27 Dec 2004) diff --git a/dev-java/libglade-java/Manifest b/dev-java/libglade-java/Manifest index 5723d6d68535..d997c7dc7b65 100644 --- a/dev-java/libglade-java/Manifest +++ b/dev-java/libglade-java/Manifest @@ -1,20 +1,23 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 13b08bbeefee0e8a27e9e164716e8440 libglade-java-2.8.2-r1.ebuild 3293 -MD5 6de331aa2801fe61fdc64be5dacc31ae libglade-java-2.8.2.2.ebuild 3531 -MD5 d197affdf56f939b2b8c7290022edee9 libglade-java-2.8.2.ebuild 3289 -MD5 4b99c567407ba2a72bd50c747827abe2 ChangeLog 1744 +MD5 3ded0ce79fea023e616fbf5ce992272b libglade-java-2.8.2-r1.ebuild 3298 +MD5 82520f56771b441b3e590f2bd7c94087 libglade-java-2.8.2.2.ebuild 3536 +MD5 c1c9e5992b374f3123f2213961ee6f8a libglade-java-2.8.2.ebuild 3294 +MD5 1d3a4a180747d4687c39126c2943a238 ChangeLog 2087 +MD5 b3642b8d11c73f681ccf6e163e1fa3cf libglade-java-2.8.3.1.ebuild 3170 MD5 d50086d74d4377e4f0a73922c949eac1 metadata.xml 1305 MD5 eda99aeb347c072151e20c330b8cc3c4 files/digest-libglade-java-2.8.2-r1 71 MD5 7ac5fbc0483956edf0634e70b501ce1a files/libglade-java-2.8.2_signal-connection-fix.patch 630 MD5 c22ae14a58aed3c45a686a82e04094bb files/digest-libglade-java-2.8.2.2 73 +MD5 76a4839bd8baf7f40b90050f11d17277 files/digest-libglade-java-2.8.3.1 74 +MD5 7ca0226e8641ea6429ce47f0d1cc1bde files/libglade-java-2.8.3.1_gentoo-PN-SLOT.patch 508 MD5 eda99aeb347c072151e20c330b8cc3c4 files/digest-libglade-java-2.8.2 71 MD5 c068d53842b2d7d7efdca61acf5d72ca files/libglade-java-2.8.2_gentoo-PN-SLOT.patch 1190 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) +Version: GnuPG v1.4.0 (GNU/Linux) -iD8DBQFB0Vfw/rLF9B432nYRAhYUAKDDCDXxZfl7ZNRBeJLz5QmaTtSzHwCgu+6A -P0l25hwDc2ru2zbjRcK5uUA= -=tdzz +iD8DBQFCM0E706ebR+OMO78RAvE3AKCWRElUsSUkk/qHJgEVAbwPzVOA9QCdEns0 +v22IV3JMxu2L7InQ830SEmo= +=8nYf -----END PGP SIGNATURE----- diff --git a/dev-java/libglade-java/files/digest-libglade-java-2.8.3.1 b/dev-java/libglade-java/files/digest-libglade-java-2.8.3.1 new file mode 100644 index 000000000000..479ebf8ee71a --- /dev/null +++ b/dev-java/libglade-java/files/digest-libglade-java-2.8.3.1 @@ -0,0 +1 @@ +MD5 21dea47798d29201d82247b8784ca7e5 libglade-java-2.8.3.1.tar.bz2 249745 diff --git a/dev-java/libglade-java/files/libglade-java-2.8.3.1_gentoo-PN-SLOT.patch b/dev-java/libglade-java/files/libglade-java-2.8.3.1_gentoo-PN-SLOT.patch new file mode 100644 index 000000000000..a70eea21a83d --- /dev/null +++ b/dev-java/libglade-java/files/libglade-java-2.8.3.1_gentoo-PN-SLOT.patch @@ -0,0 +1,12 @@ +diff -Nuar libglade-java-2.8.3.1-ORIG/configure libglade-java-2.8.3.1-WORK/configure +--- libglade-java-2.8.3.1-ORIG/configure 2005-02-12 12:51:01.000000000 +1100 ++++ libglade-java-2.8.3.1-WORK/configure 2005-02-24 17:24:00.000000000 +1100 +@@ -19564,7 +19564,7 @@ + apiversion="2.8" + VERSION="2.8.3.1" + +-INSTALLED_CLASSPATH=\${prefix}/share/java/glade${apiversion}-${VERSION}.jar ++INSTALLED_CLASSPATH=\${prefix}/share/${PN}-${SLOT}/lib/glade${apiversion}-${VERSION}.jar + INSTALLED_JNI_DIR=\${prefix}/lib/ + + 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 index c2d91dea81cf..1175aa571dfe 100644 --- a/dev-java/libglade-java/libglade-java-2.8.2-r1.ebuild +++ b/dev-java/libglade-java/libglade-java-2.8.2-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# 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.1 2004/12/28 12:56:02 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/libglade-java/libglade-java-2.8.2-r1.ebuild,v 1.2 2005/03/12 19:21:25 luckyduck Exp $ # # WARNING: Because java-gnome is a set of bindings to native GNOME libraries, 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 index eb6e777679a9..03224e7d382f 100644 --- a/dev-java/libglade-java/libglade-java-2.8.2.2.ebuild +++ b/dev-java/libglade-java/libglade-java-2.8.2.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# 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.1 2004/12/28 12:56:02 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/libglade-java/libglade-java-2.8.2.2.ebuild,v 1.2 2005/03/12 19:21:25 luckyduck Exp $ # # WARNING: Because java-gnome is a set of bindings to native GNOME libraries, diff --git a/dev-java/libglade-java/libglade-java-2.8.2.ebuild b/dev-java/libglade-java/libglade-java-2.8.2.ebuild index e31bf4b51f8f..435cb85fe20e 100644 --- a/dev-java/libglade-java/libglade-java-2.8.2.ebuild +++ b/dev-java/libglade-java/libglade-java-2.8.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# 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.2 2004/12/28 12:56:02 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/libglade-java/libglade-java-2.8.2.ebuild,v 1.3 2005/03/12 19:21:25 luckyduck Exp $ # # WARNING: Because java-gnome is a set of bindings to native GNOME libraries, 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 new file mode 100644 index 000000000000..9fe8fe446d8b --- /dev/null +++ b/dev-java/libglade-java/libglade-java-2.8.3.1.ebuild @@ -0,0 +1,101 @@ +# 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.1 2005/03/12 19:21:25 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.8.1 + >=dev-java/libgnome-java-2.8.3.1 + >=virtual/jre-1.2" + + +DEPEND="${RDEPEND} + >=virtual/jdk-1.2 + app-arch/zip" + +# +# Critical that this match glade's apiversion +# +SLOT="2.8" +LICENSE="LGPL-2.1" +KEYWORDS="~x86 ~ppc ~amd64" +IUSE="gcj gnome" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/libglade-java-2.8.3.1_gentoo-PN-SLOT.patch +# epatch ${FILESDIR}/libglade-java-2.8.3.1_gtk-dependency.patch + + 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 \ + ${conf} || die "./configure failed" + make || die +} + +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 +} |