Version bump with a mask
authorSaleem Abdulrasool <compnerd@gentoo.org>
Sat, 12 Nov 2005 23:37:58 +0000 (23:37 +0000)
committerSaleem Abdulrasool <compnerd@gentoo.org>
Sat, 12 Nov 2005 23:37:58 +0000 (23:37 +0000)
Package-Manager: portage-2.0.53_rc7

dev-java/libgnome-java/Manifest
dev-java/libgtk-java/ChangeLog
dev-java/libgtk-java/files/aclocal_voodoo.patch [new file with mode: 0644]
dev-java/libgtk-java/files/digest-libgtk-java-2.8.1 [new file with mode: 0644]
dev-java/libgtk-java/libgtk-java-2.8.1.ebuild [new file with mode: 0644]
dev-java/libgtk-java/metadata.xml

index 3c92d1143d05357976860490713f30b86c271b63..1a8350cb92c841f3087742afbee4f7b7d7c6039f 100644 (file)
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 677f2ff3ed6ec775266bf63bf1f2987d libgnome-java-2.10.1.ebuild 2725
-MD5 acbe31cfb56cfba1a61ab0197a594370 libgnome-java-2.8.3.1.ebuild 3062
-MD5 e136fd27a7c2f7ffbd5f2d0f11954c99 ChangeLog 2647
-MD5 de0a216d1797f18db9dc83e5aedee360 metadata.xml 1002
-MD5 6ab1ec4f4e7665d6f1e73d04e5ffea0d files/libgnome-java-2.10.0_fix-install-dir.patch 409
+MD5 35cc1b1c7bcd70c668c473827c3eea1a ChangeLog 2816
+MD5 55fb422ad6119794ac0805432ebdc410 files/digest-libgnome-java-2.10.1 73
+MD5 23d8bb8f12c8d969be6869734210969c files/digest-libgnome-java-2.12.1 72
 MD5 efea40cf1a5eb3c48001cde4ead5c123 files/digest-libgnome-java-2.8.3.1 74
+MD5 6ab1ec4f4e7665d6f1e73d04e5ffea0d files/libgnome-java-2.10.0_fix-install-dir.patch 409
 MD5 b5f8aad83ed35026438574e04a3122ac files/libgnome-java-2.8.2_gentoo-PN-SLOT.patch 1310
 MD5 d8bbcf350e68bf0a42c37ecbef32c8dd files/libgnome-java-2.8.3.1_gentoo-PN-SLOT.patch 508
-MD5 55fb422ad6119794ac0805432ebdc410 files/digest-libgnome-java-2.10.1 73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDJBRL/rLF9B432nYRAjJSAJ0biwzkdnrLsi4u92sTLEjR+SyJBwCePMfu
-0TTsHDPxdCbMTVSfR5vyb+U=
-=PJM6
------END PGP SIGNATURE-----
+MD5 677f2ff3ed6ec775266bf63bf1f2987d libgnome-java-2.10.1.ebuild 2725
+MD5 e89e9f1850ad15dbd4c835863e77005d libgnome-java-2.12.1.ebuild 1858
+MD5 acbe31cfb56cfba1a61ab0197a594370 libgnome-java-2.8.3.1.ebuild 3062
+MD5 fb1bed94b41f514c97fb402200db1eec metadata.xml 1102
index 8d69c80a0938ba6a901013a5474245daeb129788..faaf4a66a0e65951ca6af27f88689c3088d1550c 100644 (file)
@@ -1,6 +1,12 @@
 # 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.10 2005/06/29 15:10:08 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/ChangeLog,v 1.11 2005/11/12 23:37:57 compnerd Exp $
+
+*libgtk-java-2.8.1 (12 Nov 2005)
+
+  12 Nov 2005; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/aclocal_voodoo.patch, metadata.xml, +libgtk-java-2.8.1.ebuild:
+  Version bumping with a mask
 
   29 Jun 2005; Thomas Matthijs <axxo@gentoo.org>
   -libgtk-java-2.4.6-r1.ebuild, -libgtk-java-2.4.6-r2.ebuild,
diff --git a/dev-java/libgtk-java/files/aclocal_voodoo.patch b/dev-java/libgtk-java/files/aclocal_voodoo.patch
new file mode 100644 (file)
index 0000000..3330ad5
--- /dev/null
@@ -0,0 +1,23 @@
+--- Makefile.am.orig   2005-11-12 14:32:39.000000000 -0600
++++ Makefile.am        2005-11-12 14:33:53.000000000 -0600
+@@ -985,8 +985,8 @@
+ pkgconfig_DATA = gtk2-java.pc
+ 
+ # install the macros used by other java-gnome packages
+-jgmacrodir = $(datadir)/libgtk-java/macros
+-jgmacro_DATA = \
++m4datadir = $(datadir)/aclocal
++m4data_DATA = \
+       macros/jg_gtk_java.m4 \
+       macros/jg_gnome_java.m4
+ 
+--- gtk2-java.pc.in.orig       2005-11-12 14:34:13.000000000 -0600
++++ gtk2-java.pc.in    2005-11-12 14:34:25.000000000 -0600
+@@ -10,7 +10,6 @@
+ Version: @VERSION@\r
+ api_version=@gtkapiversion@\r
+ classpath=@INSTALLED_CLASSPATH@\r
+-macro_dir=@INSTALLED_MACRO_DIR@\r
+ jnilibs=-L@libdir@ -lgtkjni\r
+ Libs: -L@libdir@ -lgtkjava\r
+ Cflags: -I@includedir@/libgtk-java\r
diff --git a/dev-java/libgtk-java/files/digest-libgtk-java-2.8.1 b/dev-java/libgtk-java/files/digest-libgtk-java-2.8.1
new file mode 100644 (file)
index 0000000..02b282d
--- /dev/null
@@ -0,0 +1 @@
+MD5 f96f147fa2c75e810736c2a80cdcd4bd libgtk-java-2.8.1.tar.gz 1094558
diff --git a/dev-java/libgtk-java/libgtk-java-2.8.1.ebuild b/dev-java/libgtk-java/libgtk-java-2.8.1.ebuild
new file mode 100644 (file)
index 0000000..15edc38
--- /dev/null
@@ -0,0 +1,87 @@
+# 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.8.1.ebuild,v 1.1 2005/11/12 23:37:57 compnerd Exp $
+
+# Must be before the gnome.org inherit
+GNOME_TARBALL_SUFFIX="gz"
+
+inherit java-pkg eutils gnome.org
+
+DESCRIPTION="Java bindings for GTK+"
+HOMEPAGE="http://java-gnome.sourceforge.net/"
+
+# Not on gnome.org mirrors yet :-(
+SRC_URI="http://research.operationaldynamics.com/linux/java-gnome/dist/${PF}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="2.8"
+KEYWORDS="~x86"
+IUSE="doc gcj"
+
+DEPS=">=x11-libs/gtk+-2.8.3
+         >=dev-java/glib-java-0.2.1
+         >=dev-java/cairo-java-1.0.1
+         >=dev-libs/glib-2.6.0
+         >=x11-libs/cairo-1.0.0-r2
+               dev-util/pkgconfig"
+
+DEPEND=">=virtual/jdk-1.4
+               >=sys-apps/sed-4
+               ${DEPS}"
+RDEPEND=">=virtual/jre-1.4
+                ${DEPS}"
+
+pkg_setup() {
+       if use gcj -a ! built_with_use sys-devel/gcc gcc ; then
+               ewarn
+               ewarn "You must build gcc with the gcj support to build with gcj"
+               ewarn
+               ebeep 5
+               die "No GCJ support found!"
+       fi
+}
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+
+       epatch ${FILESDIR}/aclocal_voodoo.patch
+
+       # Oh the joys of patching the autotools stuff
+       aclocal || die "aclocal failed"
+       libtoolize --force --copy || die "libtoolize failed"
+       autoconf || die "autoconf failed"
+       automake || die "automake failed"
+}
+
+src_compile() {
+       # JARDIR is a hack for java-config
+       econf $(use_with gcj gcj-compile) \
+                 $(use_with doc javadocs) \
+                 --with-jardir=/usr/share/${PN}-${SLOT}/lib \
+                 || die "configure failed"
+
+       emake || die "compile failed"
+
+       # Fix the broken pkgconfig file
+       sed -i \
+               -e "s:classpath.*$:classpath=\${prefix}/share/${PN}-${SLOT}/lib/${PF}.jar:" \
+               ${S}/gtk2-java.pc
+}
+
+src_install() {
+       emake DESTDIR=${D} install || die "install failed"
+
+       # Examples are documentation
+       use doc || rm -rf ${D}/usr/share/doc/${PF}/examples
+
+       # use java-pkg_dojar to install the jar
+       rm -rf ${D}/usr/share/${PN}-${SLOT}
+
+       mv ${S}/gtk${SLOT}.jar ${S}/${PF}.jar
+       java-pkg_dojar ${S}/${PF}.jar
+
+       if use doc ; then
+               java-pkg_dohtml -r ${S}/doc
+       fi
+}
index 0ea025b89a5e0e19e27533afb67420d6cf0b5852..eda1607aceb716cf652fb8ebb37ce1d51e19cecc 100644 (file)
@@ -6,6 +6,10 @@
                <email>andrew@operationaldynamics.com</email>
                <name>Andrew Cowie</name>
        </maintainer>
+       <maintainer>
+               <email>compnerd@gentoo.org</email>
+               <name>Saleem Abdulrasool</name>
+       </maintainer>
        <longdescription>
                An elegant set of language bindings to allow you to write
                native GTK applications in Java. Works in both normal Java VMs