Version bump, remove old.

(Portage version: 2.1.11.3/cvs/Linux x86_64)

4 files changed, 19 insertions, 138 deletions

diff --git a/app-accessibility/java-access-bridge/ChangeLog b/app-accessibility/java-access-bridge/ChangeLog
index b86fd87c349c..7f78d9ddc10a 100644
--- a/app-accessibility/java-access-bridge/ChangeLog
+++ b/app-accessibility/java-access-bridge/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-accessibility/java-access-bridge
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/java-access-bridge/ChangeLog,v 1.52 2012/05/21 23:17:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/java-access-bridge/ChangeLog,v 1.53 2012/06/30 18:05:43 pacho Exp $
+
+*java-access-bridge-1.26.2 (30 Jun 2012)
+
+  30 Jun 2012; Pacho Ramos <pacho@gentoo.org> +java-access-bridge-1.26.2.ebuild,
+  -java-access-bridge-1.24.2.ebuild, -java-access-bridge-1.6.0-r2.ebuild,
+  -java-access-bridge-1.6.0.ebuild:
+  Version bump, remove old.
 
   21 May 2012; Mike Frysinger <vapier@gentoo.org>
   java-access-bridge-1.24.2.ebuild, java-access-bridge-1.26.0.ebuild,
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.26.2.ebuild
index 7edf015b25db..1481460ef268 100644
--- a/app-accessibility/java-access-bridge/java-access-bridge-1.24.2.ebuild
+++ b/app-accessibility/java-access-bridge/java-access-bridge-1.26.2.ebuild
@@ -1,12 +1,15 @@
 # Copyright 1999-2012 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.4 2012/05/21 23:17:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/java-access-bridge/java-access-bridge-1.26.2.ebuild,v 1.1 2012/06/30 18:05:43 pacho Exp $
+
+EAPI=4
+GNOME_TARBALL_SUFFIX="bz2"
+GNOME2_LA_PUNT="yes"
 
-EAPI="2"
 inherit java-pkg-2 gnome2 eutils autotools
 
 DESCRIPTION="Gnome Java Accessibility Bridge"
-HOMEPAGE="http://developer.gnome.org/projects/gap/"
+HOMEPAGE="https://live.gnome.org/Java%20Access%20Bridge/"
 
 LICENSE="LGPL-2"
 SLOT="0"
@@ -14,7 +17,8 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 COMMON_DEPEND=">=gnome-base/libbonobo-2
-	>=gnome-extra/at-spi-1.7.10:1"
+	>=gnome-extra/at-spi-1.7.10:1
+	x11-apps/xprop"
 
 RDEPEND="$COMMON_DEPEND
 	>=virtual/jre-1.4"
@@ -33,7 +37,8 @@ src_prepare() {
 
 pkg_setup() {
 	java-pkg-2_pkg_setup
-	G2CONF="--with-java-home=${JDK_HOME}"
+	G2CONF+="--disable-static
+		--with-java-home=${JDK_HOME}"
 }
 
 src_configure() {
@@ -41,7 +46,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake JAVAC="${JAVAC} ${JAVACFLAGS}" || die "compile failure"
+	emake JAVAC="${JAVAC} ${JAVACFLAGS}"
 }
 
 src_install() {
@@ -62,8 +67,6 @@ 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:"
diff --git a/app-accessibility/java-access-bridge/java-access-bridge-1.6.0-r2.ebuild b/app-accessibility/java-access-bridge/java-access-bridge-1.6.0-r2.ebuild
deleted file mode 100644
index 280fcfde2642..000000000000
--- a/app-accessibility/java-access-bridge/java-access-bridge-1.6.0-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2012 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-r2.ebuild,v 1.4 2012/05/21 23:17:23 vapier Exp $
-
-EAPI="2"
-inherit java-pkg-2 gnome2 eutils 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:1"
-
-RDEPEND="$COMMON_DEPEND
-	>=virtual/jre-1.4"
-
-DEPEND="$COMMON_DEPEND
-	>=virtual/jdk-1.4
-	virtual/pkgconfig"
-
-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_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.ebuild b/app-accessibility/java-access-bridge/java-access-bridge-1.6.0.ebuild
deleted file mode 100644
index 525f51c614fd..000000000000
--- a/app-accessibility/java-access-bridge/java-access-bridge-1.6.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 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.12 2012/05/03 01:48:59 jdhore Exp $
-
-EAPI="2"
-
-inherit java-pkg-2 gnome2
-
-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:1"
-
-RDEPEND="$COMMON_DEPEND
-	>=virtual/jre-1.4"
-
-DEPEND="$COMMON_DEPEND
-	>=virtual/jdk-1.4
-	virtual/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	G2CONF="--with-java-home=${JDK_HOME}"
-}
-
-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_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
-}