Adding patch to fix installation of docs. Closes #49939 and #50307

4 files changed, 66 insertions, 6 deletions

diff --git a/dev-java/java-gnome/ChangeLog b/dev-java/java-gnome/ChangeLog
index c805acde1e80..bd3967251ff5 100644
--- a/dev-java/java-gnome/ChangeLog
+++ b/dev-java/java-gnome/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/java-gnome
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/ChangeLog,v 1.11 2004/05/14 01:31:22 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/ChangeLog,v 1.12 2004/05/16 17:23:36 zx Exp $
+
+  16 May 2004; Chris Aniszczyk <zx@gentoo.org>
+  +files/gentoo-java-gnome-2.6.0.1.patch, java-gnome-2.6.0.1.ebuild:
+  Patch to fix installation of docs. Closes #49939 and #50307
+  Thanks to Thomas Veith <xtv@gentoo.org> for the patch.
 
   13 May 2004; Chris Aniszczyk <zx@gentoo.org> java-gnome-0.8.3.ebuild:
   Fix depend on x11-libs/vte. Closes #50788
diff --git a/dev-java/java-gnome/Manifest b/dev-java/java-gnome/Manifest
index 26cff412d689..ec439bc0e10d 100644
--- a/dev-java/java-gnome/Manifest
+++ b/dev-java/java-gnome/Manifest
@@ -1,7 +1,8 @@
+MD5 7fb5417ebb3f320dfc4e65515a6f5e6c ChangeLog 2318
+MD5 e7b47b1c0940269f81c357a430533ce7 java-gnome-0.8.3.ebuild 1720
+MD5 4627f21957017eb135f1db8afd212d6d java-gnome-2.6.0.1.ebuild 2691
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 d0548db82a1916704411084a9a019f05 files/digest-java-gnome-0.8.3 70
-MD5 95eae7ebf2d8a9d2443cb7f138aab94b files/java-gnome-0.8.3-gentoo.diff 3998
 MD5 a26e989caf78aa69cbd7e1572f1f6d35 files/digest-java-gnome-2.6.0.1 72
-MD5 65cc1b6f9c2f8c280c7e53de1b1cc114 ChangeLog 2083
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 8d1a04be132e9f8f0a788b75365cd997 java-gnome-0.8.3.ebuild 1721
-MD5 d5fd8cba9ab793f98b244706668afb9e java-gnome-2.6.0.1.ebuild 2458
+MD5 95eae7ebf2d8a9d2443cb7f138aab94b files/java-gnome-0.8.3-gentoo.diff 3998
+MD5 3b0e994589f54485c4c6f43618005bc7 files/gentoo-java-gnome-2.6.0.1.patch 3574
diff --git a/dev-java/java-gnome/files/gentoo-java-gnome-2.6.0.1.patch b/dev-java/java-gnome/files/gentoo-java-gnome-2.6.0.1.patch
new file mode 100644
index 000000000000..a33f6b2372a6
--- /dev/null
+++ b/dev-java/java-gnome/files/gentoo-java-gnome-2.6.0.1.patch
@@ -0,0 +1,48 @@
+diff -U 3 -H -d -r -N -- java-gnome-2.6.0-orig/doc-core/Makefile.in java-gnome-2.6.0-neu/doc-core/Makefile.in
+--- java-gnome-2.6.0-orig/doc-core/Makefile.in	2004-04-13 14:39:17.000000000 +0200
++++ java-gnome-2.6.0-neu/doc-core/Makefile.in	2004-04-13 22:29:38.000000000 +0200
+@@ -96,7 +96,7 @@
+ # Install targets
+ install: faq api
+ 	-$(INSTALL) -d -m755 $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/doc/core/
+-	$(INSTALL) -m644 build-faq/t1.html $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/doc/core/faq.html
++	$(INSTALL) -m644 build-faq/index.html $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/doc/core/faq.html
+ 	$(INSTALL) -m644 tutorial/*.java $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/doc/core/
+ 	# TODO: create a makefile in the following place, linking to the jar files,
+ 	# setting ld-library-path, etc. as determined by the configure script.
+diff -U 3 -H -d -r -N -- java-gnome-2.6.0-orig/doc-core/Makefile.in.in java-gnome-2.6.0-neu/doc-core/Makefile.in.in
+--- java-gnome-2.6.0-orig/doc-core/Makefile.in.in	2004-04-13 14:39:17.000000000 +0200
++++ java-gnome-2.6.0-neu/doc-core/Makefile.in.in	2004-04-13 22:29:45.000000000 +0200
+@@ -43,7 +43,7 @@
+ # Install targets
+ install: faq api
+ 	-$(INSTALL) -d -m755 $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/doc/core/
+-	$(INSTALL) -m644 build-faq/t1.html $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/doc/core/faq.html
++	$(INSTALL) -m644 build-faq/index.html $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/doc/core/faq.html
+ 	$(INSTALL) -m644 tutorial/*.java $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/doc/core/
+ 	# TODO: create a makefile in the following place, linking to the jar files,
+ 	# setting ld-library-path, etc. as determined by the configure script.
+diff -U 3 -H -d -r -N -- java-gnome-2.6.0-orig/doc-gnome/Makefile.in java-gnome-2.6.0-neu/doc-gnome/Makefile.in
+--- java-gnome-2.6.0-orig/doc-gnome/Makefile.in	2004-04-13 14:39:17.000000000 +0200
++++ java-gnome-2.6.0-neu/doc-gnome/Makefile.in	2004-04-13 22:41:21.000000000 +0200
+@@ -87,7 +87,7 @@
+ # Install targets
+ install: tutorial api
+ 	-$(INSTALL) -d -m755 $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/doc/gnome/
+-	$(INSTALL) -m644 build-tutorial/book1.html $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/doc/gnome/tutorial.html
++	$(INSTALL) -m644 build-tutorial/*.html $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/doc/gnome/
+ 	# TODO: create a makefile in the following place, linking to the jar files,
+ 	# setting ld-library-path, etc. as determined by the configure script.
+ 	-$(INSTALL) -d -m755 $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/api/gnome/org/gnu/gnome/class-use/
+diff -U 3 -H -d -r -N -- java-gnome-2.6.0-orig/doc-gnome/Makefile.in.in java-gnome-2.6.0-neu/doc-gnome/Makefile.in.in
+--- java-gnome-2.6.0-orig/doc-gnome/Makefile.in.in	2004-04-13 14:39:17.000000000 +0200
++++ java-gnome-2.6.0-neu/doc-gnome/Makefile.in.in	2004-04-13 22:41:32.000000000 +0200
+@@ -34,7 +34,7 @@
+ # Install targets
+ install: tutorial api
+ 	-$(INSTALL) -d -m755 $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/doc/gnome/
+-	$(INSTALL) -m644 build-tutorial/book1.html $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/doc/gnome/tutorial.html
++	$(INSTALL) -m644 build-tutorial/*.html $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/doc/gnome/
+ 	# TODO: create a makefile in the following place, linking to the jar files,
+ 	# setting ld-library-path, etc. as determined by the configure script.
+ 	-$(INSTALL) -d -m755 $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/api/gnome/org/gnu/gnome/class-use/
diff --git a/dev-java/java-gnome/java-gnome-2.6.0.1.ebuild b/dev-java/java-gnome/java-gnome-2.6.0.1.ebuild
index 62a8149b172a..54a7edae3487 100644
--- a/dev-java/java-gnome/java-gnome-2.6.0.1.ebuild
+++ b/dev-java/java-gnome/java-gnome-2.6.0.1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-2.6.0.1.ebuild,v 1.2 2004/05/16 17:23:36 zx Exp $
 
 inherit eutils
 
@@ -20,6 +21,11 @@ LICENSE="LGPL-2.1"
 KEYWORDS="~x86"
 IUSE=""
 
+src_unpack() {
+	unpack ${A}
+	cd ${S} && epatch ${FILESDIR}/gentoo-java-gnome-2.6.0.1.patch || die "epatch failed"
+}
+
 src_compile() {
 	./configure \
 		--host=${CHOST} \