Fix bug #256883. Version bump. Add to java herd. Quoting.

(Portage version: 2.2_rc23/cvs/Linux x86_64)

6 files changed, 160 insertions, 15 deletions

diff --git a/app-accessibility/java-access-bridge/ChangeLog b/app-accessibility/java-access-bridge/ChangeLog
index 78a43fe5f187..9f245110c755 100644
--- a/app-accessibility/java-access-bridge/ChangeLog
+++ b/app-accessibility/java-access-bridge/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-accessibility/java-access-bridge
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/java-access-bridge/ChangeLog,v 1.42 2007/01/23 14:52:32 genone Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/java-access-bridge/ChangeLog,v 1.43 2009/02/15 10:09:27 serkan Exp $
+
+*java-access-bridge-1.24.2 (15 Feb 2009)
+*java-access-bridge-1.6.0-r2 (15 Feb 2009)
+
+  15 Feb 2009; Serkan Kaba <serkan@gentoo.org>
+  +files/java-access-bridge-1.6.0-missingclasses.patch, metadata.xml,
+  java-access-bridge-1.6.0.ebuild, -java-access-bridge-1.6.0-r1.ebuild,
+  +java-access-bridge-1.6.0-r2.ebuild, +java-access-bridge-1.24.2.ebuild:
+  Fix bug #256883. Version bump. Add to java herd. Quoting.
 
   23 Jan 2007; Marius Mauch <genone@gentoo.org>
   java-access-bridge-1.6.0.ebuild, java-access-bridge-1.6.0-r1.ebuild:
diff --git a/app-accessibility/java-access-bridge/files/java-access-bridge-1.6.0-missingclasses.patch b/app-accessibility/java-access-bridge/files/java-access-bridge-1.6.0-missingclasses.patch
new file mode 100644
index 000000000000..286208ee6caf
--- /dev/null
+++ b/app-accessibility/java-access-bridge/files/java-access-bridge-1.6.0-missingclasses.patch
@@ -0,0 +1,48 @@
+diff -Nur java-access-bridge-1.6.0/at-client/Makefile.am java-access-bridge-1.6.0_patched/at-client/Makefile.am
+--- java-access-bridge-1.6.0/at-client/Makefile.am	2003-08-25 12:17:11.000000000 +0300
++++ java-access-bridge-1.6.0_patched/at-client/Makefile.am	2009-01-28 21:05:46.000000000 +0200
+@@ -9,7 +9,7 @@
+ 
+ ../gnome-java-bridge.jar : jar-stamp $(JAVA_FILES) $(DEP_CLASSES) 
+ 	touch ../jar-stamp
+-	$(JAR) uf ../gnome-java-bridge.jar org/GNOME/Accessibility/*.class
++	$(JAR) uf ../gnome-java-bridge.jar org/GNOME/Accessibility/
+ 
+ $(DEP_CLASSES) : 
+ 	@(cd `dirname $@`; $(MAKE) )
+diff -Nur java-access-bridge-1.6.0/bridge/Makefile.am java-access-bridge-1.6.0_patched/bridge/Makefile.am
+--- java-access-bridge-1.6.0/bridge/Makefile.am	2003-08-25 12:17:11.000000000 +0300
++++ java-access-bridge-1.6.0_patched/bridge/Makefile.am	2009-01-28 21:05:57.000000000 +0200
+@@ -15,7 +15,7 @@
+ 
+ ../gnome-java-bridge.jar : jar-stamp $(JAVA_FILES) $(DEP_CLASSES) 
+ 	touch ../jar-stamp
+-	$(JAR) uf ../gnome-java-bridge.jar org/GNOME/Accessibility/*.class
++	$(JAR) uf ../gnome-java-bridge.jar org/GNOME/Accessibility/
+ 
+ $(DEP_CLASSES) : 
+ 	@(cd `dirname $@`; $(MAKE) )
+diff -Nur java-access-bridge-1.6.0/idlgen/Makefile.am java-access-bridge-1.6.0_patched/idlgen/Makefile.am
+--- java-access-bridge-1.6.0/idlgen/Makefile.am	2003-05-06 11:51:38.000000000 +0300
++++ java-access-bridge-1.6.0_patched/idlgen/Makefile.am	2009-01-28 21:07:12.000000000 +0200
+@@ -16,7 +16,7 @@
+ 
+ ../gnome-java-bridge.jar : org/GNOME/Accessibility/Accessible.class $(CLASSES) ../jar-stamp
+ 	touch ../jar-stamp
+-	$(JAR) cf ../gnome-java-bridge.jar org/GNOME/Bonobo/*.class org/GNOME/Accessibility/*.class
++	$(JAR) cf ../gnome-java-bridge.jar org/GNOME/Bonobo/ org/GNOME/Accessibility/
+ 
+ all-local: org/GNOME/Accessibility/Accessible.class $(JARFILES)
+ 
+diff -Nur java-access-bridge-1.6.0/util/Makefile.am java-access-bridge-1.6.0_patched/util/Makefile.am
+--- java-access-bridge-1.6.0/util/Makefile.am	2003-08-25 12:17:14.000000000 +0300
++++ java-access-bridge-1.6.0_patched/util/Makefile.am	2009-01-28 21:08:22.000000000 +0200
+@@ -9,7 +9,7 @@
+ 
+ ../gnome-java-bridge.jar : jar-stamp $(JAVA_FILES) $(DEP_CLASSES) 
+ 	touch ../jar-stamp
+-	$(JAR) uf ../gnome-java-bridge.jar org/GNOME/Accessibility/*.class
++	$(JAR) uf ../gnome-java-bridge.jar org/GNOME/Accessibility/
+ 
+ $(DEP_CLASSES) : 
+ 	@(cd `dirname $@`; $(MAKE) )
diff --git a/app-accessibility/java-access-bridge/java-access-bridge-1.24.2.ebuild b/app-accessibility/java-access-bridge/java-access-bridge-1.24.2.ebuild
new file mode 100644
index 000000000000..ef0f5eac40b7
--- /dev/null
+++ b/app-accessibility/java-access-bridge/java-access-bridge-1.24.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/java-access-bridge/java-access-bridge-1.24.2.ebuild,v 1.1 2009/02/15 10:09:27 serkan Exp $
+
+EAPI="2"
+inherit java-pkg-2 gnome2 autotools
+
+DESCRIPTION="Gnome Java Accessibility Bridge"
+HOMEPAGE="http://developer.gnome.org/projects/gap/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+COMMON_DEPEND=">=gnome-base/libbonobo-2
+	>=gnome-extra/at-spi-1.7.10"
+
+RDEPEND="$COMMON_DEPEND
+	>=virtual/jre-1.4"
+
+DEPEND="$COMMON_DEPEND
+	>=virtual/jdk-1.4
+	>=dev-util/pkgconfig-0.9"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	epatch "${FILESDIR}"/${PN}-1.6.0-missingclasses.patch
+	eautoreconf
+}
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+	G2CONF="--with-java-home=${JDK_HOME}"
+}
+
+src_configure() {
+	gnome2_src_configure
+}
+
+src_compile() {
+	emake JAVAC="${JAVAC} ${JAVACFLAGS}" || die "compile failure"
+}
+
+src_install() {
+	gnome2_src_install
+
+	java-pkg_dojar "${D}"/usr/share/jar/*.jar
+
+	insinto /usr/share/${PN}
+	doins "${D}"/usr/share/jar/*.properties
+
+	rm -rf "${D}"/usr/share/jar
+}
+
+pkg_preinst() {
+	java-pkg-2_pkg_preinst
+	gnome2_pkg_preinst
+}
+
+pkg_postinst() {
+	elog
+	elog "The Java Accessibility Bridge for GNOME has been installed."
+	elog
+	elog "To enable accessibility support with your java applications, you"
+	elog "have to enable CORBA traffic over IP. To do this, you may add the"
+	elog "following line to your /etc/orbitrc or ~/.orbitrc file:"
+	elog
+	elog "  ORBIIOPIPv4=1"
+	elog
+}
diff --git a/app-accessibility/java-access-bridge/java-access-bridge-1.6.0-r1.ebuild b/app-accessibility/java-access-bridge/java-access-bridge-1.6.0-r2.ebuild
index 00bb8e74410d..6f99d0fbd0bc 100644
--- a/app-accessibility/java-access-bridge/java-access-bridge-1.6.0-r1.ebuild
+++ b/app-accessibility/java-access-bridge/java-access-bridge-1.6.0-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/java-access-bridge/java-access-bridge-1.6.0-r1.ebuild,v 1.3 2007/07/11 02:34:03 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/java-access-bridge/java-access-bridge-1.6.0-r2.ebuild,v 1.1 2009/02/15 10:09:27 serkan Exp $
 
-inherit java-pkg-2 gnome2
+EAPI="2"
+inherit java-pkg-2 gnome2 autotools
 
 DESCRIPTION="Gnome Java Accessibility Bridge"
 HOMEPAGE="http://developer.gnome.org/projects/gap/"
@@ -24,26 +25,39 @@ DEPEND="$COMMON_DEPEND
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
+src_prepare() {
+	java-pkg-2_src_prepare
+	epatch "${FILESDIR}"/${P}-missingclasses.patch
+	eautoreconf
+}
+
 pkg_setup() {
 	java-pkg-2_pkg_setup
-
 	G2CONF="--with-java-home=${JDK_HOME}"
 }
 
-src_compile() {
+src_configure() {
 	gnome2_src_configure
+}
+
+src_compile() {
 	emake JAVAC="${JAVAC} ${JAVACFLAGS}" || die "compile failure"
 }
 
 src_install() {
 	gnome2_src_install
 
-	java-pkg_dojar ${D}/usr/share/jar/*.jar
+	java-pkg_dojar "${D}"/usr/share/jar/*.jar
 
 	insinto /usr/share/${PN}
-	doins ${D}/usr/share/jar/*.properties
+	doins "${D}"/usr/share/jar/*.properties
+
+	rm -rf "${D}"/usr/share/jar
+}
 
-	rm -rf ${D}/usr/share/jar
+pkg_preinst() {
+	java-pkg-2_pkg_preinst
+	gnome2_pkg_preinst
 }
 
 pkg_postinst() {
diff --git a/app-accessibility/java-access-bridge/java-access-bridge-1.6.0.ebuild b/app-accessibility/java-access-bridge/java-access-bridge-1.6.0.ebuild
index ba4a47217971..cfbcf927eb3d 100644
--- a/app-accessibility/java-access-bridge/java-access-bridge-1.6.0.ebuild
+++ b/app-accessibility/java-access-bridge/java-access-bridge-1.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/java-access-bridge/java-access-bridge-1.6.0.ebuild,v 1.9 2007/07/11 02:34:03 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/java-access-bridge/java-access-bridge-1.6.0.ebuild,v 1.10 2009/02/15 10:09:27 serkan Exp $
 
 inherit java-pkg-2 gnome2
 
@@ -33,12 +33,12 @@ pkg_setup() {
 src_install() {
 	gnome2_src_install
 
-	java-pkg_dojar ${D}/usr/share/jar/*.jar
+	java-pkg_dojar "${D}"/usr/share/jar/*.jar
 
 	insinto /usr/share/${PN}
-	doins ${D}/usr/share/jar/*.properties
+	doins "${D}"/usr/share/jar/*.properties
 
-	rm -rf ${D}/usr/share/jar
+	rm -rf "${D}"/usr/share/jar
 }
 
 pkg_postinst() {
diff --git a/app-accessibility/java-access-bridge/metadata.xml b/app-accessibility/java-access-bridge/metadata.xml
index 6949624e59d4..ece6be261221 100644
--- a/app-accessibility/java-access-bridge/metadata.xml
+++ b/app-accessibility/java-access-bridge/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome-accessibility</herd>
+<herd>java</herd>
 </pkgmetadata>