From 1dabd41f73fd13b33e116722c6ba3415bbb2a662 Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Thu, 1 Feb 2007 00:45:15 +0000 Subject: [PATCH] Migrated to generation-2 java eclasses, bug #114327. This should also fix bugs #138924 and #155341. Package-Manager: portage-2.1.2-r5 --- kde-base/kdejava/ChangeLog | 12 +++- .../kdejava/files/digest-kdejava-3.5.2-r1 | 3 + .../kdejava/files/digest-kdejava-3.5.5-r1 | 3 + .../kdejava/files/digest-kdejava-3.5.6-r1 | 3 + .../files/kdejava-3.5-javacflags.patch | 10 ++++ kde-base/kdejava/kdejava-3.5.2-r1.ebuild | 58 +++++++++++++++++++ kde-base/kdejava/kdejava-3.5.5-r1.ebuild | 58 +++++++++++++++++++ kde-base/kdejava/kdejava-3.5.6-r1.ebuild | 58 +++++++++++++++++++ 8 files changed, 204 insertions(+), 1 deletion(-) create mode 100644 kde-base/kdejava/files/digest-kdejava-3.5.2-r1 create mode 100644 kde-base/kdejava/files/digest-kdejava-3.5.5-r1 create mode 100644 kde-base/kdejava/files/digest-kdejava-3.5.6-r1 create mode 100644 kde-base/kdejava/files/kdejava-3.5-javacflags.patch create mode 100644 kde-base/kdejava/kdejava-3.5.2-r1.ebuild create mode 100644 kde-base/kdejava/kdejava-3.5.5-r1.ebuild create mode 100644 kde-base/kdejava/kdejava-3.5.6-r1.ebuild diff --git a/kde-base/kdejava/ChangeLog b/kde-base/kdejava/ChangeLog index 75e9224fd169..2600d0d94a4a 100644 --- a/kde-base/kdejava/ChangeLog +++ b/kde-base/kdejava/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for kde-base/kdejava # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/ChangeLog,v 1.48 2007/01/18 00:06:24 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/ChangeLog,v 1.49 2007/02/01 00:45:15 caster Exp $ + +*kdejava-3.5.6-r1 (31 Jan 2007) +*kdejava-3.5.5-r1 (31 Jan 2007) +*kdejava-3.5.2-r1 (31 Jan 2007) + + 31 Jan 2007; Vlastimil Babka + +files/kdejava-3.5-javacflags.patch, +kdejava-3.5.2-r1.ebuild, + +kdejava-3.5.5-r1.ebuild, +kdejava-3.5.6-r1.ebuild: + Migrated to generation-2 java eclasses, bug #114327. This should also fix + bugs #138924 and #155341. 18 Jan 2007; Carsten Lohrke kdejava-3.5.6.ebuild: Update minimal needed versions. diff --git a/kde-base/kdejava/files/digest-kdejava-3.5.2-r1 b/kde-base/kdejava/files/digest-kdejava-3.5.2-r1 new file mode 100644 index 000000000000..87cc72c5a065 --- /dev/null +++ b/kde-base/kdejava/files/digest-kdejava-3.5.2-r1 @@ -0,0 +1,3 @@ +MD5 cb26ce2e4efc35ca2c9c7a47807d679a kdebindings-3.5.2.tar.bz2 5416964 +RMD160 670891a4848bd18d9ce629f675d1d2550b45307c kdebindings-3.5.2.tar.bz2 5416964 +SHA256 71ca8bf60cc9eb232ddfe5d6522e0051931b2f498ee0066edcb6c4900784f1c9 kdebindings-3.5.2.tar.bz2 5416964 diff --git a/kde-base/kdejava/files/digest-kdejava-3.5.5-r1 b/kde-base/kdejava/files/digest-kdejava-3.5.5-r1 new file mode 100644 index 000000000000..d6542e599565 --- /dev/null +++ b/kde-base/kdejava/files/digest-kdejava-3.5.5-r1 @@ -0,0 +1,3 @@ +MD5 e0da219943407a786c2ceea1605fadd1 kdebindings-3.5.5.tar.bz2 5419613 +RMD160 8515555111e2745f63b403d3255ff5521bf77875 kdebindings-3.5.5.tar.bz2 5419613 +SHA256 54751d3fe6635abf7bb8ef08ff240354e56dfaaa02cd16b1dd2a837706c4b274 kdebindings-3.5.5.tar.bz2 5419613 diff --git a/kde-base/kdejava/files/digest-kdejava-3.5.6-r1 b/kde-base/kdejava/files/digest-kdejava-3.5.6-r1 new file mode 100644 index 000000000000..68a27e497ff5 --- /dev/null +++ b/kde-base/kdejava/files/digest-kdejava-3.5.6-r1 @@ -0,0 +1,3 @@ +MD5 d26b5f54f062b765a949d66657c2ab3c kdebindings-3.5.6.tar.bz2 5421905 +RMD160 3c6547c5eb4baa9efe0e94473d4daf4e14514f80 kdebindings-3.5.6.tar.bz2 5421905 +SHA256 9fad26d5827d996cbd88d9267883b5bc444f228d9fc8e0312db56e5f6d7363d8 kdebindings-3.5.6.tar.bz2 5421905 diff --git a/kde-base/kdejava/files/kdejava-3.5-javacflags.patch b/kde-base/kdejava/files/kdejava-3.5-javacflags.patch new file mode 100644 index 000000000000..6d3bc97802e6 --- /dev/null +++ b/kde-base/kdejava/files/kdejava-3.5-javacflags.patch @@ -0,0 +1,10 @@ +--- kdejava/koala/org/kde/koala/Makefile.am.orig 2004-10-29 23:36:58.640919896 +0200 ++++ kdejava/koala/org/kde/koala/Makefile.am 2004-10-29 23:36:46.479768672 +0200 +@@ -12,6 +12,6 @@ + + JAVAROOT = ../../.. + CLASSPATH = $(srcdir)/../../..:$(srcdir)/../../../../../qtjava/javalib/qtjava.jar:$(srcdir) +-JAVACFLAGS = -classpath $(CLASSPATH) ++JAVACFLAGS = -classpath _CLASSPATH_:$(CLASSPATH) _JAVACFLAGS_ + # Prevent stupid automake from putting JAVAC=javac in Makefile.in + JAVAC = @JAVAC@ diff --git a/kde-base/kdejava/kdejava-3.5.2-r1.ebuild b/kde-base/kdejava/kdejava-3.5.2-r1.ebuild new file mode 100644 index 000000000000..6ffdc5bfd8df --- /dev/null +++ b/kde-base/kdejava/kdejava-3.5.2-r1.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/kdejava-3.5.2-r1.ebuild,v 1.1 2007/02/01 00:45:15 caster Exp $ + +KMNAME=kdebindings +KMEXTRACTONLY=qtjava +KMCOPYLIB="libqtjavasupport qtjava/javalib/qtjava" +KM_MAKEFILESREV=1 +MAXKDEVER=3.5.4 +KM_DEPRANGE="$PV $MAXKDEVER" +inherit java-pkg-2 kde-meta + +DESCRIPTION="KDE java bindings" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="" +COMMONDEPEND="$(deprange-dual $PV 3.5.4 kde-base/kwin) + $(deprange-dual $PV 3.5.4 kde-base/kcontrol) + $(deprange $PV 3.5.4 kde-base/qtjava)" +DEPEND=">=virtual/jdk-1.4 $COMMONDEPEND" +RDEPEND=">=virtual/jre-1.4 $COMMONDEPEND" +OLDDEPEND="~kde-base/kwin-$PV ~kde-base/kcontrol-$PV ~kde-base/qtjava-$PV virtual/jdk" + +PATCHES="${FILESDIR}/no-gtk-glib-check.diff + ${FILESDIR}/${PN}-${SLOT}-javacflags.patch" + +# Probably missing other kdebase, kdepim etc deps +# Needs to be compiled with just kdelibs installed to make sure + +# both eclasses define pkg_setup +pkg_setup() { + kde_pkg_setup + java-pkg-2_pkg_setup +} + +src_unpack() { + kde-meta_src_unpack + + local cp="$(java-pkg_getjars qtjava-${SLOT})" + local mf="${S}/kdejava/koala/org/kde/koala/Makefile.am" + sed -i -e "s#_CLASSPATH_#${cp}#" "${mf}" \ + || die "sed CLASSPATH failed" + sed -i -e "s#_JAVACFLAGS_#${JAVACFLAGS}#" "${mf}" \ + || die "sed JAVACFLAGS failed" +} + +src_compile() { + myconf="${myconf} --with-java=${JDK_HOME}" + kde-meta_src_compile +} + +src_install() { + kde-meta_src_install + + rm -rf ${D}/usr/kde/${SLOT}/lib/java + + java-pkg_dojar ${S}/${PN}/koala/koala.jar + java-pkg_regso "${D}/usr/kde/${SLOT}"/lib/*.so +} diff --git a/kde-base/kdejava/kdejava-3.5.5-r1.ebuild b/kde-base/kdejava/kdejava-3.5.5-r1.ebuild new file mode 100644 index 000000000000..264acf00e43b --- /dev/null +++ b/kde-base/kdejava/kdejava-3.5.5-r1.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/kdejava-3.5.5-r1.ebuild,v 1.1 2007/02/01 00:45:15 caster Exp $ + +KMNAME=kdebindings +KMEXTRACTONLY=qtjava +KMCOPYLIB="libqtjavasupport qtjava/javalib/qtjava" +KM_MAKEFILESREV=1 +MAXKDEVER=$PV +KM_DEPRANGE="$PV $MAXKDEVER" +inherit java-pkg-2 kde-meta + +DESCRIPTION="KDE java bindings" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="" +COMMONDEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/kwin) + $(deprange-dual $PV $MAXKDEVER kde-base/kcontrol) + $(deprange 3.5.2 $MAXKDEVER kde-base/qtjava)" +DEPEND=">=virtual/jdk-1.4 $COMMONDEPEND" +RDEPEND=">=virtual/jre-1.4 $COMMONDEPEND" +OLDDEPEND="~kde-base/kwin-$PV ~kde-base/kcontrol-$PV ~kde-base/qtjava-$PV virtual/jdk" + +PATCHES="${FILESDIR}/no-gtk-glib-check.diff + ${FILESDIR}/${PN}-${SLOT}-javacflags.patch" + +# Probably missing other kdebase, kdepim etc deps +# Needs to be compiled with just kdelibs installed to make sure + +# both eclasses define pkg_setup +pkg_setup() { + kde_pkg_setup + java-pkg-2_pkg_setup +} + +src_unpack() { + kde-meta_src_unpack + + local cp="$(java-pkg_getjars qtjava-${SLOT})" + local mf="${S}/kdejava/koala/org/kde/koala/Makefile.am" + sed -i -e "s#_CLASSPATH_#${cp}#" "${mf}" \ + || die "sed CLASSPATH failed" + sed -i -e "s#_JAVACFLAGS_#${JAVACFLAGS}#" "${mf}" \ + || die "sed JAVACFLAGS failed" +} + +src_compile() { + myconf="${myconf} --with-java=${JDK_HOME}" + kde-meta_src_compile +} + +src_install() { + kde-meta_src_install + + rm -rf ${D}/usr/kde/${SLOT}/lib/java + + java-pkg_dojar ${S}/${PN}/koala/koala.jar + java-pkg_regso "${D}/usr/kde/${SLOT}"/lib/*.so +} diff --git a/kde-base/kdejava/kdejava-3.5.6-r1.ebuild b/kde-base/kdejava/kdejava-3.5.6-r1.ebuild new file mode 100644 index 000000000000..8c3425dc220d --- /dev/null +++ b/kde-base/kdejava/kdejava-3.5.6-r1.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/kdejava-3.5.6-r1.ebuild,v 1.1 2007/02/01 00:45:15 caster Exp $ + +KMNAME=kdebindings +KMEXTRACTONLY=qtjava +KMCOPYLIB="libqtjavasupport qtjava/javalib/qtjava" +KM_MAKEFILESREV=1 +MAXKDEVER=$PV +KM_DEPRANGE="$PV $MAXKDEVER" +inherit java-pkg-2 kde-meta + +DESCRIPTION="KDE java bindings" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="" +COMMONDEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/kwin) + $(deprange-dual $PV $MAXKDEVER kde-base/kcontrol) + $(deprange $PV $MAXKDEVER kde-base/qtjava)" +DEPEND=">=virtual/jdk-1.4 $COMMONDEPEND" +RDEPEND=">=virtual/jre-1.4 $COMMONDEPEND" +OLDDEPEND="~kde-base/kwin-$PV ~kde-base/kcontrol-$PV ~kde-base/qtjava-$PV virtual/jdk" + +PATCHES="${FILESDIR}/no-gtk-glib-check.diff + ${FILESDIR}/${PN}-${SLOT}-javacflags.patch" + +# Probably missing other kdebase, kdepim etc deps +# Needs to be compiled with just kdelibs installed to make sure + +# both eclasses define pkg_setup +pkg_setup() { + kde_pkg_setup + java-pkg-2_pkg_setup +} + +src_unpack() { + kde-meta_src_unpack + + local cp="$(java-pkg_getjars qtjava-${SLOT})" + local mf="${S}/kdejava/koala/org/kde/koala/Makefile.am" + sed -i -e "s#_CLASSPATH_#${cp}#" "${mf}" \ + || die "sed CLASSPATH failed" + sed -i -e "s#_JAVACFLAGS_#${JAVACFLAGS}#" "${mf}" \ + || die "sed JAVACFLAGS failed" +} + +src_compile() { + myconf="${myconf} --with-java=${JDK_HOME}" + kde-meta_src_compile +} + +src_install() { + kde-meta_src_install + + rm -rf ${D}/usr/kde/${SLOT}/lib/java + + java-pkg_dojar ${S}/${PN}/koala/koala.jar + java-pkg_regso "${D}/usr/kde/${SLOT}"/lib/*.so +} -- 2.26.2