[gentoo-commits] gentoo-x86 commit in dev-java/java-gnome: java-gnome-4.0.15.ebuild java-gnome-4.0.16.ebuild ChangeLog java-gnome-4.0.17.ebuild java-gnome-4.0.18-r1.ebuild java-gnome-4.0.18.ebuild

[Samuli Suominen (ssuominen)]

ssuominen    11/02/05 12:36:20

  Modified:             java-gnome-4.0.15.ebuild java-gnome-4.0.16.ebuild
                        ChangeLog java-gnome-4.0.17.ebuild
                        java-gnome-4.0.18.ebuild
  Added:                java-gnome-4.0.18-r1.ebuild
  Log:
  Fix compability with x11-libs/libnotify >= 0.7.
  
  (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

Revision  Changes    Path
1.6                  dev-java/java-gnome/java-gnome-4.0.15.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.15.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.15.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.15.ebuild?r1=1.5&r2=1.6

Index: java-gnome-4.0.15.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.15.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- java-gnome-4.0.15.ebuild	24 Oct 2010 15:50:00 -0000	1.5
+++ java-gnome-4.0.15.ebuild	5 Feb 2011 12:36:20 -0000	1.6
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.15.ebuild,v 1.5 2010/10/24 15:50:00 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.15.ebuild,v 1.6 2011/02/05 12:36:20 ssuominen Exp $
 
 EAPI=2
 JAVA_PKG_IUSE="doc examples source"
@@ -28,6 +28,7 @@
 	>=x11-libs/gtksourceview-2.6.2
 	>=app-text/gtkspell-2.0.15-r1
 	>=x11-libs/libnotify-0.4.5
+	<x11-libs/libnotify-0.7
 	>=dev-libs/libunique-1.0.8
 	>=virtual/jre-1.5"
 DEPEND="${RDEPEND}



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

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

Index: java-gnome-4.0.16.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.16.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- java-gnome-4.0.16.ebuild	15 Dec 2010 16:26:50 -0000	1.4
+++ java-gnome-4.0.16.ebuild	5 Feb 2011 12:36:20 -0000	1.5
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.16.ebuild,v 1.4 2010/12/15 16:26:50 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.16.ebuild,v 1.5 2011/02/05 12:36:20 ssuominen Exp $
 
 EAPI=2
 JAVA_PKG_IUSE="doc examples source"
@@ -28,6 +28,7 @@
 	>=x11-libs/gtksourceview-2.6.2
 	>=app-text/gtkspell-2.0.15-r1
 	>=x11-libs/libnotify-0.4.5
+	<x11-libs/libnotify-0.7
 	>=dev-libs/libunique-1.0.8
 	>=virtual/jre-1.5"
 DEPEND="${RDEPEND}



1.104                dev-java/java-gnome/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/java-gnome/ChangeLog?rev=1.104&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/java-gnome/ChangeLog?rev=1.104&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/java-gnome/ChangeLog?r1=1.103&r2=1.104

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/java-gnome/ChangeLog,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- ChangeLog	29 Dec 2010 23:06:59 -0000	1.103
+++ ChangeLog	5 Feb 2011 12:36:20 -0000	1.104
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/java-gnome
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/ChangeLog,v 1.103 2010/12/29 23:06:59 ken69267 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/ChangeLog,v 1.104 2011/02/05 12:36:20 ssuominen Exp $
+
+*java-gnome-4.0.18-r1 (05 Feb 2011)
+
+  05 Feb 2011; Samuli Suominen <ssuominen@g.o>
+  +java-gnome-4.0.18-r1.ebuild, +files/java-gnome-4.0.18-libnotify-0.7.patch:
+  Fix compability with x11-libs/libnotify >= 0.7.
 
 *java-gnome-4.0.18 (29 Dec 2010)
 



1.2                  dev-java/java-gnome/java-gnome-4.0.17.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.17.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.17.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.17.ebuild?r1=1.1&r2=1.2

Index: java-gnome-4.0.17.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.17.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- java-gnome-4.0.17.ebuild	18 Nov 2010 06:42:43 -0000	1.1
+++ java-gnome-4.0.17.ebuild	5 Feb 2011 12:36:20 -0000	1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.17.ebuild,v 1.1 2010/11/18 06:42:43 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.17.ebuild,v 1.2 2011/02/05 12:36:20 ssuominen Exp $
 
 EAPI=2
 JAVA_PKG_IUSE="doc examples source"
@@ -28,6 +28,7 @@
 	>=x11-libs/gtksourceview-2.6.2
 	>=app-text/gtkspell-2.0.15-r1
 	>=x11-libs/libnotify-0.4.5
+	<x11-libs/libnotify-0.7
 	>=dev-libs/libunique-1.0.8
 	>=virtual/jre-1.5"
 DEPEND="${RDEPEND}



1.2                  dev-java/java-gnome/java-gnome-4.0.18.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.18.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.18.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.18.ebuild?r1=1.1&r2=1.2

Index: java-gnome-4.0.18.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.18.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- java-gnome-4.0.18.ebuild	29 Dec 2010 23:06:59 -0000	1.1
+++ java-gnome-4.0.18.ebuild	5 Feb 2011 12:36:20 -0000	1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.18.ebuild,v 1.1 2010/12/29 23:06:59 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.18.ebuild,v 1.2 2011/02/05 12:36:20 ssuominen Exp $
 
 EAPI=2
 JAVA_PKG_IUSE="doc examples source"
@@ -28,6 +28,7 @@
 	>=x11-libs/gtksourceview-2.6.2
 	>=app-text/gtkspell-2.0.15-r1
 	>=x11-libs/libnotify-0.4.5
+	<x11-libs/libnotify-0.7
 	>=dev-libs/libunique-1.0.8
 	>=gnome-base/librsvg-2.32.1
 	>=virtual/jre-1.5"



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

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

Index: java-gnome-4.0.18-r1.ebuild
===================================================================
# Copyright 1999-2011 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.18-r1.ebuild,v 1.1 2011/02/05 12:36:20 ssuominen Exp $

EAPI=2
JAVA_PKG_IUSE="doc examples source"

inherit eutils versionator java-pkg-2 multilib

MY_PV="${PV/_/-}"
MY_P="${PN}-${MY_PV}"

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)/${MY_P}.tar.bz2"

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

RDEPEND=">=dev-libs/glib-2.22
	>=x11-libs/gtk+-2.22.0
	>=gnome-base/libglade-2.6.4
	>=gnome-base/libgnome-2.22.0
	>=gnome-base/gnome-desktop-2.22.0:2
	>=x11-libs/cairo-1.10.0[svg]
	>=x11-libs/gtksourceview-2.6.2
	>=app-text/gtkspell-2.0.15-r1
	>=x11-libs/libnotify-0.7
	>=dev-libs/libunique-1.0.8
	>=gnome-base/librsvg-2.32.1
	>=virtual/jre-1.5"
DEPEND="${RDEPEND}
	dev-java/junit:0
	dev-lang/perl
	dev-util/pkgconfig
	>=virtual/jdk-1.5"

# Needs X11
RESTRICT="test"

S="${WORKDIR}/${MY_P}"

src_prepare() {
	#fix dependency typo in configure
	sed -i -e "s/librsvg-2.0atk/librsvg-2.0 atk/" configure || die
	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
}

src_configure() {
	# Handwritten in perl so not using econf
	./configure prefix=/usr libdir=/usr/$(get_libdir)/${PN}-${SLOT} jardir=/usr/share/${PN}-${SLOT}/lib || die
}

src_compile() {
	# 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
		DISPLAY= emake -j1 doc || die "Making documentation failed"
	fi
}

src_install(){
	emake -j1 DESTDIR="${D}" install || die
	java-pkg_regjar /usr/share/${PN}-${SLOT}/lib/gtk-${SLOT}.jar
	java-pkg_regjar /usr/share/${PN}-${SLOT}/lib/gtk.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
}