Apply patch for doc placement. Per bug #294454.

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

4 files changed, 42 insertions, 5 deletions

diff --git a/x11-libs/libXrender/ChangeLog b/x11-libs/libXrender/ChangeLog
index f2782cc2d42e..f07844fbf34a 100644
--- a/x11-libs/libXrender/ChangeLog
+++ b/x11-libs/libXrender/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/libXrender
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrender/ChangeLog,v 1.58 2009/10/03 12:04:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrender/ChangeLog,v 1.59 2009/11/29 12:33:10 scarabeus Exp $
+
+  29 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/0001-Make-libXrender-use-docdir-for-documentation-placeme.patch,
+  libXrender-0.9.5.ebuild:
+  Apply patch for doc placement. Per bug #294454.
 
 *libXrender-0.9.5 (03 Oct 2009)
 
diff --git a/x11-libs/libXrender/Manifest b/x11-libs/libXrender/Manifest
index 5ef758b55135..3d50ee39d160 100644
--- a/x11-libs/libXrender/Manifest
+++ b/x11-libs/libXrender/Manifest
@@ -1,6 +1,7 @@
+AUX 0001-Make-libXrender-use-docdir-for-documentation-placeme.patch 782 RMD160 5859d439cbd58e1dbcaf1f6f1c3ca996f6c8f484 SHA1 fdf365c7e33a1c90d031ea2f083785bf859c41d7 SHA256 dafc33666d6ed67356dd1c12b840ebde6230766bdeacc38589ce72fcb0d86336
 DIST libXrender-0.9.4.tar.bz2 226512 RMD160 0d9249ffe7f8347946f1c4d701bd06d52a4ab40b SHA1 8e0726d495db177e3089be9e1d5c41395277b0db SHA256 5682d343dd4e7ef291a6577e956c331946ce5801d8fa076284a01b41de3017ec
 DIST libXrender-0.9.5.tar.bz2 261483 RMD160 efb078aa00d8a3463a2f8267f600579372ded38d SHA1 278f762feb8e754aa5214175abf580ff486281f7 SHA256 bc0590438a4be2b674cbac6f4ad46e5a89acd02aa94817da0fa8eb3ef05ed5d5
 EBUILD libXrender-0.9.4.ebuild 535 RMD160 062a091f52f1f7278730d2ba295e967e4e04e0b1 SHA1 933cc11ccaeccb3446c422c1bdcbb644d138720d SHA256 8f463e43c9e5130ba224acf33045b26dee25d9b380bb4eec400cdbdabc541400
-EBUILD libXrender-0.9.5.ebuild 544 RMD160 cc0b772c9f139fdfda172d4a652b5bc724077912 SHA1 a705b954c1f70ba84af8c5ffa8abdaa90f824e68 SHA256 fb3542e07d4906dc28d29b6cab3a0670f7820d17cfae6a3486cc4206c6dec9b2
-MISC ChangeLog 7124 RMD160 27a484dd4fe59611313d07ff85a05c5631ddb0d4 SHA1 29ad02ed44def023551b497b0af108883544d692 SHA256 432931040f3ae905e4de0e9087f04488fc9e809409d6d5e284502e60cd288d31
+EBUILD libXrender-0.9.5.ebuild 635 RMD160 a06522a93dbbbece816d09d4b55345a1127d8ee7 SHA1 709e2c3afd5f974951c0dc1011b9ca1f8b348a03 SHA256 1abc756b2c8c80eec3d1d2a6980715984cfa3c918ba206373deadda2cd90e27c
+MISC ChangeLog 7331 RMD160 8727f74ebb957a0247029762832c6e5391f35dd1 SHA1 88a5b29f8f07a5e94aef623a92102ae4c1404c85 SHA256 80f5ee2a894957732df5d890d026387098a5c42d1e6bfd721464f861d00a101d
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-libs/libXrender/files/0001-Make-libXrender-use-docdir-for-documentation-placeme.patch b/x11-libs/libXrender/files/0001-Make-libXrender-use-docdir-for-documentation-placeme.patch
new file mode 100644
index 000000000000..9573a2c7a982
--- /dev/null
+++ b/x11-libs/libXrender/files/0001-Make-libXrender-use-docdir-for-documentation-placeme.patch
@@ -0,0 +1,27 @@
+From 260d288027d9cdcd6944a6bb16d0e1f596550552 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <scarabeus@gentoo.org>
+Date: Sun, 29 Nov 2009 13:28:41 +0100
+Subject: [PATCH] Make libXrender use docdir for documentation placement.
+
+---
+ Makefile.am |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index a15b64d..3c98504 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -24,8 +24,8 @@ SUBDIRS = src
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = xrender.pc
+ 
+-renderdocdir = $(datadir)/doc/$(PACKAGE)
+-dist_renderdoc_DATA = doc/libXrender.txt
++docdir = $(datadir)/doc/$(PACKAGE)
++dist_doc_DATA = doc/libXrender.txt
+ 
+ EXTRA_DIST = xrender.pc.in ChangeLog
+ MAINTAINERCLEANFILES = ChangeLog
+-- 
+1.6.5.3
+
diff --git a/x11-libs/libXrender/libXrender-0.9.5.ebuild b/x11-libs/libXrender/libXrender-0.9.5.ebuild
index 7ce292f47df7..c2c097b50a71 100644
--- a/x11-libs/libXrender/libXrender-0.9.5.ebuild
+++ b/x11-libs/libXrender/libXrender-0.9.5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrender/libXrender-0.9.5.ebuild,v 1.1 2009/10/03 12:04:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrender/libXrender-0.9.5.ebuild,v 1.2 2009/11/29 12:33:10 scarabeus Exp $
 
 # Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
+SNAPSHOT="yes"
 
 inherit x-modular
 
@@ -15,3 +15,7 @@ RDEPEND="x11-libs/libX11
 	>=x11-proto/renderproto-0.9.3
 	x11-proto/xproto"
 DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/0001-Make-libXrender-use-docdir-for-documentation-placeme.patch"
+)