[gentoo-commits] gentoo-x86 commit in dev-java/java-gnome: ChangeLog java-gnome-4.0.7.ebuild java-gnome-4.0.8-r1.ebuild java-gnome-4.0.7-r1.ebuild java-gnome-4.0.8.ebuild

[Serkan Kaba (serkan)]

serkan      08/09/27 13:59:07

  Modified:             ChangeLog java-gnome-4.0.7.ebuild
  Added:                java-gnome-4.0.8-r1.ebuild
                        java-gnome-4.0.7-r1.ebuild
  Removed:              java-gnome-4.0.8.ebuild
  Log:
  Use EAPI 2 use deps for x11-libs/cairo:svg. Restrict cairo dependency. Fix indentation.
  (Portage version: 2.2_rc11/cvs/Linux 2.6.25-gentoo-r7 x86_64)

Revision  Changes    Path
1.68                 dev-java/java-gnome/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/java-gnome/ChangeLog?rev=1.68&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/java-gnome/ChangeLog?rev=1.68&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/java-gnome/ChangeLog?r1=1.67&r2=1.68

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/java-gnome/ChangeLog,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- ChangeLog	27 Sep 2008 06:23:31 -0000	1.67
+++ ChangeLog	27 Sep 2008 13:59:06 -0000	1.68
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/java-gnome
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/ChangeLog,v 1.67 2008/09/27 06:23:31 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/ChangeLog,v 1.68 2008/09/27 13:59:06 serkan Exp $
+
+*java-gnome-4.0.8-r1 (27 Sep 2008)
+*java-gnome-4.0.7-r1 (27 Sep 2008)
+
+  27 Sep 2008; Serkan Kaba <serkan@g.o> java-gnome-4.0.7.ebuild,
+  +java-gnome-4.0.7-r1.ebuild, -java-gnome-4.0.8.ebuild,
+  +java-gnome-4.0.8-r1.ebuild:
+  Use EAPI 2 use deps for x11-libs/cairo:svg. Restrict cairo dependency. Fix
+  indentation.
 
   27 Sep 2008; Kenneth Prugh <ken69267@g.o>
   +files/java-gnome-4.0.8-deprecated.patch, java-gnome-4.0.8.ebuild:



1.5                  dev-java/java-gnome/java-gnome-4.0.7.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.7.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.7.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.7.ebuild?r1=1.4&r2=1.5

Index: java-gnome-4.0.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.7.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- java-gnome-4.0.7.ebuild	26 Sep 2008 21:11:22 -0000	1.4
+++ java-gnome-4.0.7.ebuild	27 Sep 2008 13:59:06 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.7.ebuild,v 1.4 2008/09/26 21:11:22 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.7.ebuild,v 1.5 2008/09/27 13:59:06 serkan Exp $
 
 EAPI=1
 JAVA_PKG_IUSE="doc examples source"
@@ -32,13 +32,13 @@
 RESTRICT="test"
 
 pkg_setup() {
-        if ! built_with_use x11-libs/cairo svg; then
-                echo
-                eerror "x11-libs/cairo has not been built with svg support."
-                eerror "Please re-emerge cairo with the svg use-flag enabled."
-                die "missing svg flag for x11-libs/cairo"
-        fi
-        java-pkg-2_pkg_setup
+	if ! built_with_use x11-libs/cairo svg; then
+		echo
+		eerror "x11-libs/cairo has not been built with svg support."
+		eerror "Please re-emerge cairo with the svg use-flag enabled."
+		die "missing svg flag for x11-libs/cairo"
+	fi
+	java-pkg-2_pkg_setup
 }
 
 src_compile() {



1.1                  dev-java/java-gnome/java-gnome-4.0.8-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.8-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.8-r1.ebuild?rev=1.1&content-type=text/plain

Index: java-gnome-4.0.8-r1.ebuild
===================================================================
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.8-r1.ebuild,v 1.1 2008/09/27 13:59:06 serkan Exp $

EAPI=2
JAVA_PKG_IUSE="doc examples source"

inherit eutils versionator java-pkg-2

DESCRIPTION="Java bindings for GTK and GNOME"
HOMEPAGE="http://java-gnome.sourceforge.net/"
SRC_URI="mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2"

LICENSE="GPL-2-with-linking-exception"
SLOT="4.0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""

RDEPEND=">=dev-libs/glib-2.12.13
		>=x11-libs/gtk+-2.12
		>=gnome-base/libglade-2.6.1
		>=gnome-base/libgnome-2.18.0
		>=gnome-base/gnome-desktop-2.18.0
		>=virtual/jre-1.5
		>=x11-libs/cairo-1.6.4[svg]"
DEPEND="${RDEPEND}
		dev-java/junit:0
		dev-lang/python
		>=virtual/jdk-1.5
		dev-util/pkgconfig"

# Needs X11
RESTRICT="test"

src_unpack() {
	unpack ${A}
	cd "${S}"

	epatch "${FILESDIR}/${P}-disable-doc-snapshots.patch"
	epatch "${FILESDIR}/${P}-deprecated.patch"
}

src_compile() {
	# Handwritten in perl so not using econf
	./configure --prefix=/usr || die

	# Fails parallel build in case GCJ is detected
	# See https://bugs.gentoo.org/show_bug.cgi?id=200550
	emake -j1 || die "Compilation of java-gnome failed"

	if use doc; then
		emake -j1 doc || die "Making documentation failed"
	fi
}

src_install(){
	java-pkg_doso tmp/*.so
	java-pkg_dojar tmp/*.jar

	dodoc AUTHORS HACKING NEWS README || die

	use doc && java-pkg_dojavadoc doc/api
	use examples && java-pkg_doexamples doc/examples
	use source && java-pkg_dosrc src/bindings/org
}



1.1                  dev-java/java-gnome/java-gnome-4.0.7-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.7-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.7-r1.ebuild?rev=1.1&content-type=text/plain

Index: java-gnome-4.0.7-r1.ebuild
===================================================================
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.7-r1.ebuild,v 1.1 2008/09/27 13:59:06 serkan Exp $

EAPI=2
JAVA_PKG_IUSE="doc examples source"

inherit eutils versionator java-pkg-2

DESCRIPTION="Java bindings for GTK and GNOME"
HOMEPAGE="http://java-gnome.sourceforge.net/"
SRC_URI="mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2"

LICENSE="GPL-2-with-linking-exception"
SLOT="4.0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""

RDEPEND=">=dev-libs/glib-2.12.13
		>=x11-libs/gtk+-2.12
		>=gnome-base/libglade-2.6.1
		>=gnome-base/libgnome-2.18.0
		>=gnome-base/gnome-desktop-2.18.0
		>=virtual/jre-1.5
		>=x11-libs/cairo-1.6.4[svg]"
DEPEND="${RDEPEND}
		dev-java/junit:0
		dev-lang/python
		>=virtual/jdk-1.5
		dev-util/pkgconfig"

# Needs X11
RESTRICT="test"

src_compile() {
	# Handwritten in perl so not using econf
	./configure --prefix=/usr || die

	# Fails parallel build in case GCJ is detected
	# See https://bugs.gentoo.org/show_bug.cgi?id=200550
	emake -j1 || die "Compilation of java-gnome failed"

	if use doc; then
		emake -j1 doc || die "Making documentation failed"
	fi
}

src_install(){
	java-pkg_doso tmp/*.so
	java-pkg_dojar tmp/*.jar

	dodoc AUTHORS HACKING NEWS README || die

	use doc && java-pkg_dojavadoc doc/api
	use examples && java-pkg_doexamples doc/examples
	use source && java-pkg_dosrc src/bindings/org
}