diff options
author | Petr Kocmid <raxas@pavouk-v-rohu.net> | 2009-08-25 04:07:09 +0200 |
---|---|---|
committer | Petr Kocmid <raxas@pavouk-v-rohu.net> | 2009-08-25 04:07:09 +0200 |
commit | 0b1aa1a28f125087d361a99cfff45d5082ded7fe (patch) | |
tree | 3c1e69feaa15fdd6798af346cfc3475a87030bbb /kde-base/kdejava | |
download | kde-sunset-0b1aa1a28f125087d361a99cfff45d5082ded7fe.tar.gz kde-sunset-0b1aa1a28f125087d361a99cfff45d5082ded7fe.tar.bz2 kde-sunset-0b1aa1a28f125087d361a99cfff45d5082ded7fe.zip |
kde 3.5.10 rescue mission: initial commit
Diffstat (limited to 'kde-base/kdejava')
-rw-r--r-- | kde-base/kdejava/Manifest | 6 | ||||
-rw-r--r-- | kde-base/kdejava/files/kdejava-3.5-javacflags.patch | 10 | ||||
-rw-r--r-- | kde-base/kdejava/files/no-gtk-glib-check.diff | 37 | ||||
-rw-r--r-- | kde-base/kdejava/files/no-libhpi.so-check.patch | 25 | ||||
-rw-r--r-- | kde-base/kdejava/kdejava-3.5.10.ebuild | 59 | ||||
-rw-r--r-- | kde-base/kdejava/metadata.xml | 6 |
6 files changed, 143 insertions, 0 deletions
diff --git a/kde-base/kdejava/Manifest b/kde-base/kdejava/Manifest new file mode 100644 index 00000000..cae3b94b --- /dev/null +++ b/kde-base/kdejava/Manifest @@ -0,0 +1,6 @@ +AUX kdejava-3.5-javacflags.patch 484 RMD160 d859c947892def01ce3d0981848988022c15cf95 SHA1 2e61da24cacc6d88cc3d8bd31bf864d9d4c145ff SHA256 d237e52cac8fa4c730066bbe442faed972d496466ef5af0ef44ac1bffc4cff2d +AUX no-gtk-glib-check.diff 949 RMD160 6df47b78e158fb7e38a49c30627421186d83e3da SHA1 234a650d3b629e41b2249ae99e6f7b0ee44fcf63 SHA256 f2721c8a1567ab9e259e216372a6552f8910fd33bc82390d8556aff00b0ba8df +AUX no-libhpi.so-check.patch 1094 RMD160 e68eb3bcc1626056f2b1ae1edc87cbef2fa61f14 SHA1 77b567790c3a601412ec289332ff3421cbb33f40 SHA256 1111790213a8cf3c888d3444984cee824bcbe55b3b80043d2c01231b00b00b62 +DIST kdebindings-3.5.10.tar.bz2 5735439 RMD160 0c6b4690455a131c90a1e27a3345aa2a2e9d6b99 SHA1 42946974889ec44a1eb9c54c8b0832d6f1af6719 SHA256 438fb601ec109f542aa721abad0d21b424e6225e3fd3081919981a69ad59b6ad +EBUILD kdejava-3.5.10.ebuild 1737 RMD160 d9380d315469e2da50600920833b1211b9d894b4 SHA1 3656884b43bdb2b5ab4c4141b19421e89fc80b0f SHA256 793d1214cec1d0155330eba07a2bbc4f9a47e2523ca9ecb0a37e17ca361422fd +MISC metadata.xml 174 RMD160 c2e418dc10e1431eec90cebd2bcd049ea84c164e SHA1 b29657b99bedc684ac7e40dfa561ef7da5fc4ad7 SHA256 9b93e47904abc783e4ed3714c950f453b6769b553b06fb1a0964b50beabf36e8 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 00000000..6d3bc978 --- /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/files/no-gtk-glib-check.diff b/kde-base/kdejava/files/no-gtk-glib-check.diff new file mode 100644 index 00000000..ad9a6fb8 --- /dev/null +++ b/kde-base/kdejava/files/no-gtk-glib-check.diff @@ -0,0 +1,37 @@ +diff -urN Makefile.am Makefile.am +--- Makefile.am 2004-11-29 17:08:25.000000000 +0200 ++++ Makefile.am 2004-12-10 20:56:30.534024600 +0200 +@@ -14,8 +14,6 @@ + + AUTOMAKE_OPTIONS = foreign 1.5 + +-$(top_srcdir)/acinclude.m4: $(top_srcdir)/dcopc/glib.m4 $(top_srcdir)/dcopc/gtk.m4 +- + EXTRA_DIST = admin + + include admin/deps.am +diff -urN Makefile.am.in Makefile.am.in +--- Makefile.am.in 2004-08-05 21:57:23.000000000 +0300 ++++ Makefile.am.in 2004-12-10 20:56:30.534024600 +0200 +@@ -14,8 +14,6 @@ + + AUTOMAKE_OPTIONS = foreign 1.5 + +-$(top_srcdir)/acinclude.m4: $(top_srcdir)/dcopc/glib.m4 $(top_srcdir)/dcopc/gtk.m4 +- + EXTRA_DIST = admin + + include admin/deps.am +diff -urN configure.in.in configure.in.in +--- configure.in.in 2004-10-03 09:11:28.000000000 +0200 ++++ configure.in.in 2004-12-10 20:56:37.916902232 +0200 +@@ -104,9 +104,6 @@ + + ]) + +-AM_PATH_GLIB([1.2.6]) +-AM_PATH_GTK([1.2.6]) +- + # check for CSANT compiler + + AC_DEFUN([KDE_CHECK_CSANT],[ diff --git a/kde-base/kdejava/files/no-libhpi.so-check.patch b/kde-base/kdejava/files/no-libhpi.so-check.patch new file mode 100644 index 00000000..797815ce --- /dev/null +++ b/kde-base/kdejava/files/no-libhpi.so-check.patch @@ -0,0 +1,25 @@ +diff -ur ./admin/acinclude.m4.in ../kdebindings-3.5.8/admin/acinclude.m4.in +--- ./admin/acinclude.m4.in 2008-02-12 01:42:21.000000000 +0200 ++++ ../kdebindings-3.5.8/admin/acinclude.m4.in 2008-02-17 21:01:17.000000000 +0200 +@@ -5263,8 +5263,6 @@ + kde_java_libjvmdir=`find $kde_java_bindir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1` + dnl Look for libgcj.so + kde_java_libgcjdir=`find $kde_java_bindir/.. -name libgcj.so | sed 's,libgcj.so,,'|head -n 1` +- dnl Look for libhpi.so and avoid green threads +- kde_java_libhpidir=`find $kde_java_bindir/.. -name libhpi.so | grep -v green | sed 's,libhpi.so,,' | head -n 1` + + dnl Now check everything's fine under there + dnl the include dir is our flag for having the JDK +@@ -5315,12 +5313,6 @@ + + dnl not needed for gcj compile + +- if test "x$kde_java_libgcjdir" = "x"; then +- if test ! -r "$kde_java_libhpidir/libhpi.so"; then +- AC_MSG_ERROR([libhpi.so not found under $kde_java_libhpidir. Use --without-java.]) +- fi +- fi +- + if test -n "$jni_includes"; then + dnl Check for JNI version + AC_LANG_SAVE diff --git a/kde-base/kdejava/kdejava-3.5.10.ebuild b/kde-base/kdejava/kdejava-3.5.10.ebuild new file mode 100644 index 00000000..5fc077c7 --- /dev/null +++ b/kde-base/kdejava/kdejava-3.5.10.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/kdejava-3.5.10.ebuild,v 1.4 2009/06/06 13:10:23 maekke Exp $ + +KMNAME=kdebindings +KMEXTRACTONLY=qtjava +KMCOPYLIB="libqtjavasupport qtjava/javalib/qtjava" +KM_MAKEFILESREV=1 +EAPI="1" +inherit java-pkg-2 kde-meta + +DESCRIPTION="KDE java bindings" +KEYWORDS="amd64 ppc ppc64 x86" +IUSE="" +COMMONDEPEND="|| ( ( >=kde-base/kwin-${PV}:${SLOT} >=kde-base/kcontrol-${PV}:${SLOT} ) >=kde-base/kdebase-${PV}:${SLOT} ) + >=kde-base/qtjava-${PV}:${SLOT}" +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" + +# libhpi for bug #209631 +PATCHES=( "${FILESDIR}/no-gtk-glib-check.diff" + "${FILESDIR}/${PN}-${SLOT}-javacflags.patch" + "${FILESDIR}/no-libhpi.so-check.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 + + local libdir="${D}/usr/kde/${SLOT}/$(get_libdir)" + rm -rf "${libdir}/java" || die "rm failed" + + java-pkg_dojar "${S}/${PN}/koala/koala.jar" + java-pkg_regso "${libdir}"/*.so +} diff --git a/kde-base/kdejava/metadata.xml b/kde-base/kdejava/metadata.xml new file mode 100644 index 00000000..37e870b6 --- /dev/null +++ b/kde-base/kdejava/metadata.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>kde</herd> +<herd>java</herd> +</pkgmetadata> |