Install documentation in the proper directory, bug #296110

Package-Manager: portage-2.2_rc85/cvs/Linux x86_64

4 files changed, 32 insertions, 4 deletions

diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog
index e66eaa1effef..bee2a71e2bd2 100644
--- a/www-plugins/gnash/ChangeLog
+++ b/www-plugins/gnash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-plugins/gnash
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.45 2010/09/28 14:14:24 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.46 2010/09/28 17:37:58 chithanh Exp $
+
+  28 Sep 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  gnash-0.8.8.ebuild, +files/gnash-0.8.8-documentation-paths.patch:
+  Install documentation in the proper directory, bug #296110
 
   28 Sep 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   gnash-0.8.8.ebuild:
diff --git a/www-plugins/gnash/Manifest b/www-plugins/gnash/Manifest
index 98fc33b1669f..3569512cc8b9 100644
--- a/www-plugins/gnash/Manifest
+++ b/www-plugins/gnash/Manifest
@@ -9,6 +9,7 @@ AUX gnash-0.8.7-amf-include.patch 1121 RMD160 5e17e26f5033816f011ccee9b943588fd5
 AUX gnash-0.8.7-klash.patch 4224 RMD160 9d988887af247a1810f3afd22ac56ff20b510276 SHA1 5f4991870587351282fabbe853c89fdb03853c54 SHA256 2676ae1d6d3d41937a06ca59c6252b64ece1ec8f5232cf21dbfc0126396101c0
 AUX gnash-0.8.7-moc-qt4.patch 677 RMD160 b24a4421202a75d11ec6d868e3048a78b883abf8 SHA1 7b3af0e10afc9b1600d264b2435a0324effa88f1 SHA256 b510bfb59ad1cfc54e06227f922cafb44816abe0df55765a6884323892016240
 AUX gnash-0.8.7-xpcom-idldir.patch 731 RMD160 5c79c44dd90ce3555e7a32694c2adbf01d8e5493 SHA1 a6230e75ee301831fc24311d41a4691e509f2bc3 SHA256 1b9bcd8c731e8ae49e2f22fa8e1d5da05b50822d77c3758900bb251cfbd3d32c
+AUX gnash-0.8.8-documentation-paths.patch 662 RMD160 8ebce11605d93297e8af4ca1a547fe63603ab5a3 SHA1 a3c3fac4c9c7da930e72ab27d593ee8fd2d2b093 SHA256 86542d1ea03b44f00685a81c0d2e5392056dfc980068c2ae9edda76ba9b4fd2d
 AUX gnash-0.8.8-klash.patch 1127 RMD160 f03e8de0d5bcc3eeea08ca45b96196519b01d362 SHA1 f117f36d8452ee088b80552efdc7eea969324e8f SHA256 b3015cb93b91575d214c17cfbb7f5614c3df047261e184ec9ef84e28641ddc25
 AUX gnash-0.8.x-libpng14.patch 359 RMD160 bb8cc909fc652c151da80e788d9968efeef98057 SHA1 aa66528485c4c766e223ae66f4a89aacef75f0cc SHA256 d850693fe9f411552fe6647ec4833cabfba838ce4f02e96cf75634acb46f0b58
 DIST gnash-0.8.5.tar.bz2 3335797 RMD160 8ef599237c3162f9f28459855e4729d400bd4304 SHA1 26304322728d10dda1a0da2951946d981a507ca6 SHA256 16f272214eed2ab50bcd9507d6299b82ed7d20e7e8eb253ab160e594eeb210b3
@@ -18,6 +19,6 @@ DIST gnash-0.8.8.tar.bz2 3850383 RMD160 621afbd14180ce770f60a6e158f9fda0b4d5ec02
 EBUILD gnash-0.8.5.ebuild 6847 RMD160 a5c919db8f2000ccdd69c506a3e1e4c38575d899 SHA1 cca2bff47f3e59042b7b09b0d1c6963d54964a77 SHA256 5bc8619c682951efa4b796aabf1c365b0180bfd8599c9551468dbee2dc37b5ab
 EBUILD gnash-0.8.6.ebuild 7734 RMD160 aedd6a1a87187a6136d8cf2e22ea1c43a2210880 SHA1 a2c0420b2e04ce74abfdee2d825269464d67e9a6 SHA256 bb1c4c7d2bb2d63559cdeded66d78131d0749dbb429ae0fc7abec472ea090d01
 EBUILD gnash-0.8.7.ebuild 8000 RMD160 0dc1df45702543893bd7ce339f956372c3b24027 SHA1 7dfeaceaecfd0936a9b4d4bb592d635b07330b13 SHA256 7204ce7639200d232326215f530297c341fff5d86a0c15424ae247ce84c01b66
-EBUILD gnash-0.8.8.ebuild 8085 RMD160 e9f4f1151879212f93f1a75d0228e1cd3a652893 SHA1 4f00762f949ae2f8b8b70c197b430c40badf501a SHA256 312befaa3950bdf85f3bfb3fbaecda90452ee3103a47c7e9646f22d762ee4593
-MISC ChangeLog 20574 RMD160 4a8bf6f0bfebab1467845501312d9ed71b7c36ea SHA1 f6038db5f60b64363895bf8585cf257d20fe929f SHA256 bfb60b061eeeaebb2537a7e0c2a261c5cba4cdfd654f8d3c5f5657bdbd197147
+EBUILD gnash-0.8.8.ebuild 8212 RMD160 83e75f3fa8479117dab92be04419ec00dc317c1e SHA1 4432e92ae7383a96654ee79f69a9a18cccc9c892 SHA256 6680576e7ad648d3d63ffcac3d56d1259fe757ed81f587c5397d4a1363184055
+MISC ChangeLog 20773 RMD160 6cfede02a0b72a01768a377bb654872a8bfbca99 SHA1 be42a82dacd7d2a2e725fd0a601d8b1dfa451c3f SHA256 3f54c31e5097c758b584338a89d155ca12976c2742a81e559cf5f8de855a270f
 MISC metadata.xml 863 RMD160 62955e23fbe0b0b3e9562a143bf051fca59fbaff SHA1 85247ecf93bec762839d42f49ca663aad7d8e331 SHA256 078095b61d5b5eb1fbe87b698e8ca29fe4f64ee54a1ce4d8ae575f2e90420a13
diff --git a/www-plugins/gnash/files/gnash-0.8.8-documentation-paths.patch b/www-plugins/gnash/files/gnash-0.8.8-documentation-paths.patch
new file mode 100644
index 000000000000..e57c2cecb2bc
--- /dev/null
+++ b/www-plugins/gnash/files/gnash-0.8.8-documentation-paths.patch
@@ -0,0 +1,20 @@
+diff -ur a/doc/C/Makefile.am b/doc/C/Makefile.am
+--- a/doc/C/Makefile.am	2010-08-07 17:50:00.000000000 +0200
++++ b/doc/C/Makefile.am	2010-09-28 18:33:03.000000000 +0200
+@@ -18,14 +18,12 @@
+ 
+ # Building a PDF using Apache FOP only works with fop-0.20.5 for now.
+ 
+-htmldir = ${prefix}/share/doc/gnash
+-infodir = ${prefix}/share/info
+-man1dir = ${prefix}/share/man/man1
++man1dir = ${mandir}/man1
+ docname = gnash
+ lang = C
+ omffile = gnash-C.omf
+ 
+-docdir = $(datadir)/$(PACKAGE)/doc/$(docname)/$(lang)
++# docdir = $(datadir)/$(PACKAGE)/doc/$(docname)/$(lang)
+ omf_dest_dir=$(datadir)/omf/$(PACKAGE)
+ scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
+ 
diff --git a/www-plugins/gnash/gnash-0.8.8.ebuild b/www-plugins/gnash/gnash-0.8.8.ebuild
index e69921b26bda..29104dc1b328 100644
--- a/www-plugins/gnash/gnash-0.8.8.ebuild
+++ b/www-plugins/gnash/gnash-0.8.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.8.ebuild,v 1.6 2010/09/28 14:14:24 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.8.ebuild,v 1.7 2010/09/28 17:37:58 chithanh Exp $
 
 EAPI=3
 CMAKE_REQUIRED="never"
@@ -143,6 +143,9 @@ src_prepare() {
 	# gentoo bug #283905
 	epatch "${FILESDIR}"/${PN}-0.8.7-moc-qt4.patch
 
+	# Install documentation into the proper directories, bug #321017
+	epatch "${FILESDIR}"/${PN}-0.8.8-documentation-paths.patch
+
 	eautoreconf
 }
 src_configure() {