merge fix from kde cvs: correct install location for docs - buggy version installed into /javalib

Package-Manager: portage-2.0.51-r15

8 files changed, 105 insertions, 12 deletions

diff --git a/kde-base/qtjava/ChangeLog b/kde-base/qtjava/ChangeLog
index dd2378b269df..dfd6a231b99e 100644
--- a/kde-base/qtjava/ChangeLog
+++ b/kde-base/qtjava/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/qtjava
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/ChangeLog,v 1.5 2004/12/25 15:50:37 danarmak Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/ChangeLog,v 1.6 2005/02/03 14:33:54 danarmak Exp $
+
+*qtjava-3.4.0_beta1-r1 (03 Feb 2005)
+
+  03 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +qtjava-3.4.0_beta1-r1.ebuild:
+  Fix target directory for the docs; it used to install in /javalib/. This fix
+  is from the KDE CVS.
 
 *qtjava-3.3.2 (25 Dec 2004)
 
diff --git a/kde-base/qtjava/Manifest b/kde-base/qtjava/Manifest
index 0aebe445f53a..acf60fe06b52 100644
--- a/kde-base/qtjava/Manifest
+++ b/kde-base/qtjava/Manifest
@@ -1,9 +1,12 @@
-MD5 4aad518bb21c5a89be499e66642b9b18 qtjava-3.3.2.ebuild 874
-MD5 cedfdb4393a4aeb774a09b4d19b7b2d0 qtjava-3.4.0_beta1.ebuild 878
-MD5 6f75a5248e453cf40763e8898bd33f04 qtjava-3.3.1.ebuild 874
-MD5 d69a1fda007888895242a0b6e17c5d5e ChangeLog 1104
+MD5 4cea05cdcf7deb5fe05ef91d9ab816ec qtjava-3.4.0_beta1-r1.ebuild 944
+MD5 2d616246328e08899cbc077e6b07e9d0 qtjava-3.3.2.ebuild 874
+MD5 55962ad7ab77e7eacfda05999076c6d6 qtjava-3.4.0_beta1.ebuild 878
+MD5 6164c5e620823a45d9ba7e3c9ab2d130 qtjava-3.3.1.ebuild 874
+MD5 e0c2a71f6c20472ef20080b8d233ed52 ChangeLog 1325
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 ffe26fb6d5d193883dfebd69250df2e5 files/no-gtk-glib-check.diff 949
+MD5 8043c67118c30c01dfa0e0cd92c8acd7 files/docs-target-dir.diff 2614
 MD5 70e20b1b123bf8d012966ea1675c9306 files/digest-qtjava-3.3.1 222
 MD5 10ed49fd5738679f78bf8008f8975537 files/digest-qtjava-3.3.2 301
+MD5 4877266a41162d4c439090a71dcc66bc files/digest-qtjava-3.4.0_beta1-r1 225
 MD5 4877266a41162d4c439090a71dcc66bc files/digest-qtjava-3.4.0_beta1 225
diff --git a/kde-base/qtjava/files/digest-qtjava-3.4.0_beta1-r1 b/kde-base/qtjava/files/digest-qtjava-3.4.0_beta1-r1
new file mode 100644
index 000000000000..1d0086ae2535
--- /dev/null
+++ b/kde-base/qtjava/files/digest-qtjava-3.4.0_beta1-r1
@@ -0,0 +1,3 @@
+MD5 5c5d32448f4b473201d72613cc2902b5 kdebindings-3.3.90.tar.bz2 7113177
+MD5 06b5bb329c3d7271a36dddd17591c259 kdebindings-3.3.90-3.3.91.tar.xdelta 699870
+MD5 168cc78368bd9adf23a348ab24ea9dde kdebindings-3.3.91.tar.bz2 7076147
diff --git a/kde-base/qtjava/files/docs-target-dir.diff b/kde-base/qtjava/files/docs-target-dir.diff
new file mode 100644
index 000000000000..4d2550709821
--- /dev/null
+++ b/kde-base/qtjava/files/docs-target-dir.diff
@@ -0,0 +1,45 @@
+===================================================================
+RCS file: /home/kde/kdebindings/qtjava/javalib/docs/en/Makefile.am,v
+retrieving revision 1.4
+retrieving revision 1.5
+diff -u -r1.4 -r1.5
+--- qtjava/javalib/docs/en/Makefile.am	2004/08/27 17:20:17	1.4
++++ qtjava/javalib/docs/en/Makefile.am	2005/01/12 15:47:07	1.5
+@@ -4,22 +4,22 @@
+ EXTRA_DIST = index.html index-1.html index-2.html index-3.html index-4.html index-5.html index-6.html 
+ 
+ install-data-local:
+-	$(mkinstalldirs) $(DESTDIR)$(docdir)/javalib/
+-	$(INSTALL_DATA) $(srcdir)/index.html $(DESTDIR)$(docdir)/javalib/index.html
+-	$(INSTALL_DATA) $(srcdir)/index-1.html $(DESTDIR)$(docdir)/javalib/index-1.html
+-	$(INSTALL_DATA) $(srcdir)/index-2.html $(DESTDIR)$(docdir)/javalib/index-2.html
+-	$(INSTALL_DATA) $(srcdir)/index-3.html $(DESTDIR)$(docdir)/javalib/index-3.html
+-	$(INSTALL_DATA) $(srcdir)/index-4.html $(DESTDIR)$(docdir)/javalib/index-4.html
+-	$(INSTALL_DATA) $(srcdir)/index-5.html $(DESTDIR)$(docdir)/javalib/index-5.html
+-	$(INSTALL_DATA) $(srcdir)/index-6.html $(DESTDIR)$(docdir)/javalib/index-6.html
++	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/en/javalib/
++	$(INSTALL_DATA) $(srcdir)/index.html $(DESTDIR)$(kde_htmldir)/en/javalib/index.html
++	$(INSTALL_DATA) $(srcdir)/index-1.html $(DESTDIR)$(kde_htmldir)/en/javalib/index-1.html
++	$(INSTALL_DATA) $(srcdir)/index-2.html $(DESTDIR)$(kde_htmldir)/en/javalib/index-2.html
++	$(INSTALL_DATA) $(srcdir)/index-3.html $(DESTDIR)$(kde_htmldir)/en/javalib/index-3.html
++	$(INSTALL_DATA) $(srcdir)/index-4.html $(DESTDIR)$(kde_htmldir)/en/javalib/index-4.html
++	$(INSTALL_DATA) $(srcdir)/index-5.html $(DESTDIR)$(kde_htmldir)/en/javalib/index-5.html
++	$(INSTALL_DATA) $(srcdir)/index-6.html $(DESTDIR)$(kde_htmldir)/en/javalib/index-6.html
+ 
+ uninstall-local:
+-	-rm -f $(DESTDIR)$(docdir)/javalib/index.html
+-	-rm -f $(DESTDIR)$(docdir)/javalib/index-1.html
+-	-rm -f $(DESTDIR)$(docdir)/javalib/index-2.html
+-	-rm -f $(DESTDIR)$(docdir)/javalib/index-3.html
+-	-rm -f $(DESTDIR)$(docdir)/javalib/index-4.html
+-	-rm -f $(DESTDIR)$(docdir)/javalib/index-5.html
+-	-rm -f $(DESTDIR)$(docdir)/javalib/index-6.html
++	-rm -f $(DESTDIR)$(kde_htmldir)/en/javalib/index.html
++	-rm -f $(DESTDIR)$(kde_htmldir)/en/javalib/index-1.html
++	-rm -f $(DESTDIR)$(kde_htmldir)/en/javalib/index-2.html
++	-rm -f $(DESTDIR)$(kde_htmldir)/en/javalib/index-3.html
++	-rm -f $(DESTDIR)$(kde_htmldir)/en/javalib/index-4.html
++	-rm -f $(DESTDIR)$(kde_htmldir)/en/javalib/index-5.html
++	-rm -f $(DESTDIR)$(kde_htmldir)/en/javalib/index-6.html
+ 
+ ####### kdevelop will overwrite this part!!! (end)############
diff --git a/kde-base/qtjava/qtjava-3.3.1.ebuild b/kde-base/qtjava/qtjava-3.3.1.ebuild
index 6fa2e65a1ac3..643ba031f884 100644
--- a/kde-base/qtjava/qtjava-3.3.1.ebuild
+++ b/kde-base/qtjava/qtjava-3.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/qtjava-3.3.1.ebuild,v 1.6 2004/12/25 15:50:37 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/qtjava-3.3.1.ebuild,v 1.7 2005/02/03 14:33:54 danarmak Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
diff --git a/kde-base/qtjava/qtjava-3.3.2.ebuild b/kde-base/qtjava/qtjava-3.3.2.ebuild
index ac369f6a7739..09870f3b78eb 100644
--- a/kde-base/qtjava/qtjava-3.3.2.ebuild
+++ b/kde-base/qtjava/qtjava-3.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/qtjava-3.3.2.ebuild,v 1.1 2004/12/25 15:50:37 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/qtjava-3.3.2.ebuild,v 1.2 2005/02/03 14:33:54 danarmak Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
diff --git a/kde-base/qtjava/qtjava-3.4.0_beta1-r1.ebuild b/kde-base/qtjava/qtjava-3.4.0_beta1-r1.ebuild
new file mode 100644
index 000000000000..b47a7e53ea2a
--- /dev/null
+++ b/kde-base/qtjava/qtjava-3.4.0_beta1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/qtjava-3.4.0_beta1-r1.ebuild,v 1.1 2005/02/03 14:33:54 danarmak Exp $
+
+KMNAME=kdebindings
+KM_MAKEFILESREV=1
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta
+
+DESCRIPTION="Java bindings for QT"
+KEYWORDS="~x86"
+IUSE=""
+DEPEND="virtual/jdk"
+PATCHES="$FILESDIR/no-gtk-glib-check.diff
+	$FILESDIR/docs-target-dir.diff" # in cvs; remove for 3.4.0beta2
+
+src_compile() {
+	myconf="$myconf --with-java=`java-config --jdk-home`"
+	kde-meta_src_compile
+}
+
+# Doesn't really need kde, only qt? But then, it installs by default into $KDEDIR/...
+
+# Someone who's into java should look over this...
+
+src_install() {
+	kde-meta_src_install
+
+	mkdir -p $D/usr/share/qtjava
+	cat > $D/usr/share/qtjava/package.env << EOF
+DESCRIPTION=Java bindings for QT
+CLASSPATH=:$PREFIX/lib/java/qtjava.jar:
+EOF
+}
diff --git a/kde-base/qtjava/qtjava-3.4.0_beta1.ebuild b/kde-base/qtjava/qtjava-3.4.0_beta1.ebuild
index ac4b8ae7c75e..f2c7526b3d60 100644
--- a/kde-base/qtjava/qtjava-3.4.0_beta1.ebuild
+++ b/kde-base/qtjava/qtjava-3.4.0_beta1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/qtjava-3.4.0_beta1.ebuild,v 1.1 2005/01/15 02:24:42 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/qtjava-3.4.0_beta1.ebuild,v 1.2 2005/02/03 14:33:54 danarmak Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1