Fix shadow manpages.

(Portage version: 2.1_pre4-r1)

6 files changed, 48 insertions, 7 deletions

diff --git a/x11-libs/libXres/ChangeLog b/x11-libs/libXres/ChangeLog
index 2c3420550a07..fffeca3881ad 100644
--- a/x11-libs/libXres/ChangeLog
+++ b/x11-libs/libXres/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/libXres
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXres/ChangeLog,v 1.16 2006/02/14 22:40:38 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXres/ChangeLog,v 1.17 2006/02/22 04:28:51 joshuabaergen Exp $
+
+*libXres-1.0.0-r1 (22 Feb 2006)
+
+  22 Feb 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/fix_shadow_manpages.patch, -libXres-1.0.0.ebuild,
+  +libXres-1.0.0-r1.ebuild:
+  Fix shadow manpages.
 
   14 Feb 2006; Markus Rothe <corsair@gentoo.org> libXres-1.0.0.ebuild:
   Added ~ppc64
diff --git a/x11-libs/libXres/Manifest b/x11-libs/libXres/Manifest
index 20522198aa5c..96fdd75ef8c0 100644
--- a/x11-libs/libXres/Manifest
+++ b/x11-libs/libXres/Manifest
@@ -1,4 +1,15 @@
-MD5 a583d652bbaf037914ef001d5645aa7e ChangeLog 2098
-MD5 3730a9f87680dd52350424e896831975 files/digest-libXres-1.0.0 66
-MD5 4a84513552b17a89f3777525ab8f98be libXres-1.0.0.ebuild 632
+MD5 c2d0f5f4d6db8a9c9f562401ee296611 ChangeLog 2299
+RMD160 00c03054efcd0d01ece1c74628def064dd618aa7 ChangeLog 2299
+SHA256 dcf0580ba5573d663f593884f1196efa0cca4bd121901874c8466b548f45a5f7 ChangeLog 2299
+MD5 7dc0e2e6fd4e345aaa3db9c7ce7a4456 files/digest-libXres-1.0.0-r1 244
+RMD160 f1fc51648a88b9a69c625a8b7adb0c44386fa719 files/digest-libXres-1.0.0-r1 244
+SHA256 b960615aaa265a2fb3b269e06dcfd3dfc63085c21ac9a736284efdd393629e8c files/digest-libXres-1.0.0-r1 244
+MD5 05783335da3a31f0ca09b69e2454ea0a files/fix_shadow_manpages.patch 542
+RMD160 779835bda2d3c71482396f8e7b00752f10d1585d files/fix_shadow_manpages.patch 542
+SHA256 28fecb16ba8e60bc8280b8769f314c2c1491db7a7b39a8b1bc398447c31997f6 files/fix_shadow_manpages.patch 542
+MD5 d4bacd6b55df44fabc943a055dfabab9 libXres-1.0.0-r1.ebuild 680
+RMD160 a3d2a4854d9d4ef7d811fb783c2b1cf3110c9510 libXres-1.0.0-r1.ebuild 680
+SHA256 fede3ca7e2384836fdd018a680f838fe8ae89b14014d7e9773b832aa906028c8 libXres-1.0.0-r1.ebuild 680
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
+SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
diff --git a/x11-libs/libXres/files/digest-libXres-1.0.0 b/x11-libs/libXres/files/digest-libXres-1.0.0
deleted file mode 100644
index eff5e89158e6..000000000000
--- a/x11-libs/libXres/files/digest-libXres-1.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1fd0c1b20c08ce9712e82a649482a2b2 libXres-1.0.0.tar.bz2 207280
diff --git a/x11-libs/libXres/files/digest-libXres-1.0.0-r1 b/x11-libs/libXres/files/digest-libXres-1.0.0-r1
new file mode 100644
index 000000000000..e8ebf702beb2
--- /dev/null
+++ b/x11-libs/libXres/files/digest-libXres-1.0.0-r1
@@ -0,0 +1,3 @@
+MD5 1fd0c1b20c08ce9712e82a649482a2b2 libXres-1.0.0.tar.bz2 207280
+RMD160 cc42924ef49734d7bf7d0d32b44df2202689cc10 libXres-1.0.0.tar.bz2 207280
+SHA256 2d78abc855d43f72c501a1e51474dd75b177b5b114dd7fa1a49bc022e0480bc4 libXres-1.0.0.tar.bz2 207280
diff --git a/x11-libs/libXres/files/fix_shadow_manpages.patch b/x11-libs/libXres/files/fix_shadow_manpages.patch
new file mode 100644
index 000000000000..5d5e78b86387
--- /dev/null
+++ b/x11-libs/libXres/files/fix_shadow_manpages.patch
@@ -0,0 +1,19 @@
+diff -u -r1.6 -r1.7
+--- man/Makefile.am	2005/12/06 22:48:42	1.6
++++ man/Makefile.am	2006/02/12 18:19:20	1.7
+@@ -27,6 +27,8 @@
+ 
+ libmandir = $(LIB_MAN_DIR)
+ 
++LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
++
+ libman_PRE = XRes.man
+ 
+ BUILT_SOURCES = shadows.DONE
+@@ -69,5 +71,5 @@
+ shadows.DONE:
+ 	-rm -f $(XRes_shadows:=.@LIB_MAN_SUFFIX@)
+ 	(for i in $(XRes_shadows:=.@LIB_MAN_SUFFIX@) ; do \
+-	 echo .so man$(LIB_MAN_SUFFIX)/XRes.$(LIB_MAN_SUFFIX) > $$i; \
++	 echo .so man$(LIB_MAN_DIR_SUFFIX)/XRes.$(LIB_MAN_SUFFIX) > $$i; \
+ 	 done)
diff --git a/x11-libs/libXres/libXres-1.0.0.ebuild b/x11-libs/libXres/libXres-1.0.0-r1.ebuild
index 9a4a365553a6..c370abc8c713 100644
--- a/x11-libs/libXres/libXres-1.0.0.ebuild
+++ b/x11-libs/libXres/libXres-1.0.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXres/libXres-1.0.0.ebuild,v 1.4 2006/02/14 22:40:38 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXres/libXres-1.0.0-r1.ebuild,v 1.1 2006/02/22 04:28:51 joshuabaergen Exp $
 
 # Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
+SNAPSHOT="yes"
 
 inherit x-modular
 
@@ -19,3 +19,5 @@ RDEPEND="x11-libs/libX11
 	x11-proto/xproto"
 DEPEND="${RDEPEND}
 	x11-proto/resourceproto"
+
+PATCHES="${FILESDIR}/fix_shadow_manpages.patch"