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

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

7 files changed, 177 insertions, 19 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/Manifest b/app-accessibility/java-access-bridge/Manifest
index 6150ee1659a8..c8495d36c115 100644
--- a/app-accessibility/java-access-bridge/Manifest
+++ b/app-accessibility/java-access-bridge/Manifest
@@ -1,5 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX java-access-bridge-1.6.0-missingclasses.patch 2381 RMD160 c78553c8afd88ae7169bf5dfb1d996cf5d4330d8 SHA1 f66dbaea9a4b6550c71d9660703fcb950fc4eec1 SHA256 7d8b142231cb28fea0a965b93237f08218c15a6e4d0c4ba74c9b80117ae824d7
+DIST java-access-bridge-1.24.2.tar.bz2 284738 RMD160 e3c682b8ac8f36fb4dd05fc9bc88481e54905aca SHA1 bad965e3e79f2d489181b2638c825b2c4c09740d SHA256 ebe4d299657d757f0841c870d9f975975979ad5fc921171bd37de95d6c3f5960
 DIST java-access-bridge-1.6.0.tar.bz2 122911 RMD160 22112f8c3a2faa1acae054a4dce09cfe09d757f0 SHA1 947bd364214c01a6e6ba947a5b39a3e0fc9236ac SHA256 9a5ac1b59d2a0185fad08ca665a72b06b6fea69e583d5d995fc97c0e46fca520
-EBUILD java-access-bridge-1.6.0-r1.ebuild 1376 RMD160 7e7462c69a2f111ba1442f26d176a9ebd812ae0e SHA1 2f3e4c432af77b49a17fa731fde8906ba32007a7 SHA256 37f4252ba88ed3f2f38838425c36f40816983d4b237a6b01b64662bd46cff037
-EBUILD java-access-bridge-1.6.0.ebuild 1265 RMD160 3a941cc7c749745942213b39da286dcc95411177 SHA1 c6a1a350bf5614c5082dbd616c5bbb24d71d6285 SHA256 545f7122048f6796cc9fc6287bcddc3d261cac4038b870d2935183f2ed1b5706
-MISC ChangeLog 5626 RMD160 5bccdb076a38f0a086ab0aee729a504016550ace SHA1 f26078e1ff79c465754ed014cd5a02299ae90d0e SHA256 a56c72ca3ff1241feaf195edc261e19090a7e629616595c00c7e14cea0f6a026
-MISC metadata.xml 172 RMD160 6901d426a49e26089e240a7a4f990204e08c15a1 SHA1 2a33de77ba2f0f4fdedeed148abdad125b78f996 SHA256 f14db6f3dc189eb3e4a3478d7c1bead86fe077d0c756b8426b64f7fc0d42d228
+EBUILD java-access-bridge-1.24.2.ebuild 1595 RMD160 c524a27606aac959fec71c1f3e38b471f4d5d51e SHA1 6fd0213ad2308fab03af22e34d51bbe3579cc865 SHA256 4238338bc9cbf3f4a272e46e73c68fa140ad15dff7c0afe72834a53426da9070
+EBUILD java-access-bridge-1.6.0-r2.ebuild 1590 RMD160 deda626dcf0485b9354d848299a11ce8b33eecf9 SHA1 e1d2175fc266ee2046efe3200aa7de4b572b11d6 SHA256 eb8b22b99443677d24131aebb3e2ace48c0efac1559b077e3cb962ffd3af3f0a
+EBUILD java-access-bridge-1.6.0.ebuild 1274 RMD160 926828788c55c8bfca117e897bf1648c623eb5bd SHA1 e259dba7e48299bcf2c50ff5d9d59d3310723477 SHA256 9df714e8cd21da4decaf2ba377e7c0bd58eed623768990f765a9584d08ddee9c
+MISC ChangeLog 6035 RMD160 b3da0731cbc2de3b7b7e3e0d9d87696e872e2eec SHA1 49eeecb74f41dc39f18eecd6632188807615ee5c SHA256 057ce43aabfffe787cfa72f14881c1d73f8846f5b619e4c46169849dbba47f84
+MISC metadata.xml 190 RMD160 dd6af8ccc18739233933b74ee3147a16ba7bf2c6 SHA1 4dcbd204caab5a529fb3d55133c03f9e11b7fd50 SHA256 6c85a1dadf30bf298ea0378f3359778bff1bd704eca9c7577cc05080c9792bf5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmX6d0ACgkQRh6X64ivZaLcQwCcDdEH/B8ENblDH5kiRfyoisQo
+o8YAnRbMy9fzgD6Q/QXtSIpOSq42yNHx
+=Zikf
+-----END PGP SIGNATURE-----
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>