summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2010-09-28 17:37:58 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2010-09-28 17:37:58 +0000
commitbc68105e11ef996397800e7bc126d78d5dbb24d0 (patch)
tree07f98766f42b1e59952ab5c60b8eda381ca55411 /www-plugins/gnash
parentRespect LDFLAGS (bug #337105), CC, CFLAGS. (diff)
downloadgentoo-2-bc68105e11ef996397800e7bc126d78d5dbb24d0.tar.gz
gentoo-2-bc68105e11ef996397800e7bc126d78d5dbb24d0.tar.bz2
gentoo-2-bc68105e11ef996397800e7bc126d78d5dbb24d0.zip
Install documentation in the proper directory, bug #296110
(Portage version: 2.2_rc85/cvs/Linux x86_64)
Diffstat (limited to 'www-plugins/gnash')
-rw-r--r--www-plugins/gnash/ChangeLog6
-rw-r--r--www-plugins/gnash/files/gnash-0.8.8-documentation-paths.patch20
-rw-r--r--www-plugins/gnash/gnash-0.8.8.ebuild5
3 files changed, 29 insertions, 2 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/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() {