Fix shadow manpages.

(Portage version: 2.1_pre4-r1)

6 files changed, 48 insertions, 7 deletions

diff --git a/x11-libs/libXxf86misc/ChangeLog b/x11-libs/libXxf86misc/ChangeLog
index 4f6f6f9830a3..7c9969c500bf 100644
--- a/x11-libs/libXxf86misc/ChangeLog
+++ b/x11-libs/libXxf86misc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/libXxf86misc
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXxf86misc/ChangeLog,v 1.15 2006/02/14 22:47:46 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXxf86misc/ChangeLog,v 1.16 2006/02/22 04:32:22 joshuabaergen Exp $
+
+*libXxf86misc-1.0.0-r1 (22 Feb 2006)
+
+  22 Feb 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/fix_shadow_manpages.patch, -libXxf86misc-1.0.0.ebuild,
+  +libXxf86misc-1.0.0-r1.ebuild:
+  Fix shadow manpages.
 
   14 Feb 2006; Markus Rothe <corsair@gentoo.org> libXxf86misc-1.0.0.ebuild:
   Added ~ppc64
diff --git a/x11-libs/libXxf86misc/Manifest b/x11-libs/libXxf86misc/Manifest
index 2e42b063cff5..f099e47dedee 100644
--- a/x11-libs/libXxf86misc/Manifest
+++ b/x11-libs/libXxf86misc/Manifest
@@ -1,4 +1,15 @@
-MD5 e9db5796e8067a833677405b1c9815f7 ChangeLog 1913
-MD5 184796a3b5368b9c9d7729d8c5617259 files/digest-libXxf86misc-1.0.0 71
-MD5 1e2532c40b2e8313bdd970f3b9826ac3 libXxf86misc-1.0.0.ebuild 668
+MD5 aa565a8799bddb44fbe781a9eea6039a ChangeLog 2129
+RMD160 ee981144c7463dd4512849b2124e563f0bba1f47 ChangeLog 2129
+SHA256 ec056365214cca461c1f4827fd103d9840fab3e7b2c9a7dd6e550feb1ef1faa3 ChangeLog 2129
+MD5 e58ef17f393753d713eb957cd66f6db4 files/digest-libXxf86misc-1.0.0-r1 259
+RMD160 9a51979751dd7b3f7659537783d7654ab9b8cfba files/digest-libXxf86misc-1.0.0-r1 259
+SHA256 4ff6e130444cffa408d4a06ef2d0af503e2ea3d28a16efa401e1dc72bc56d15d files/digest-libXxf86misc-1.0.0-r1 259
+MD5 73736a5c92b4882f6722ff7c29ced3c4 files/fix_shadow_manpages.patch 562
+RMD160 c0b7359aa66cb149234cd79322e23b2049981e82 files/fix_shadow_manpages.patch 562
+SHA256 2b59b89b81e77aae57a836398532b394b823cf2a38884f800559f9271bf60039 files/fix_shadow_manpages.patch 562
+MD5 99b31c6a6865eec2b3f44901334c70fb libXxf86misc-1.0.0-r1.ebuild 716
+RMD160 0b436de1710bacf3bb6f243bacbf1016e14397c9 libXxf86misc-1.0.0-r1.ebuild 716
+SHA256 f89522533a1d75c0933ea7733ada20398fb6696983ddaa836a37272424ff3e1b libXxf86misc-1.0.0-r1.ebuild 716
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
+SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
diff --git a/x11-libs/libXxf86misc/files/digest-libXxf86misc-1.0.0 b/x11-libs/libXxf86misc/files/digest-libXxf86misc-1.0.0
deleted file mode 100644
index 654ffc9b55ed..000000000000
--- a/x11-libs/libXxf86misc/files/digest-libXxf86misc-1.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 593f2751ee37b4f11a9c1cb85999d60b libXxf86misc-1.0.0.tar.bz2 204879
diff --git a/x11-libs/libXxf86misc/files/digest-libXxf86misc-1.0.0-r1 b/x11-libs/libXxf86misc/files/digest-libXxf86misc-1.0.0-r1
new file mode 100644
index 000000000000..f971353762c7
--- /dev/null
+++ b/x11-libs/libXxf86misc/files/digest-libXxf86misc-1.0.0-r1
@@ -0,0 +1,3 @@
+MD5 593f2751ee37b4f11a9c1cb85999d60b libXxf86misc-1.0.0.tar.bz2 204879
+RMD160 5f8affe8dd6dd6e98c3a3c01aa295fe04285f358 libXxf86misc-1.0.0.tar.bz2 204879
+SHA256 0a24457b233644c0784f32008586f24ab97d3f2d5b69e8b3b042da9938597d38 libXxf86misc-1.0.0.tar.bz2 204879
diff --git a/x11-libs/libXxf86misc/files/fix_shadow_manpages.patch b/x11-libs/libXxf86misc/files/fix_shadow_manpages.patch
new file mode 100644
index 000000000000..2dff10cb8de5
--- /dev/null
+++ b/x11-libs/libXxf86misc/files/fix_shadow_manpages.patch
@@ -0,0 +1,19 @@
+diff -u -r1.6 -r1.7
+--- man/Makefile.am	2005/12/06 22:48:45	1.6
++++ man/Makefile.am	2006/02/12 18:19:23	1.7
+@@ -27,6 +27,8 @@
+ 
+ libmandir = $(LIB_MAN_DIR)
+ 
++LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
++
+ libman_PRE = XF86Misc.man
+ 
+ BUILT_SOURCES = shadows.DONE
+@@ -71,5 +73,5 @@
+ shadows.DONE:
+ 	-rm -f $(XF86Misc_shadows:=.@LIB_MAN_SUFFIX@)
+ 	(for i in $(XF86Misc_shadows:=.@LIB_MAN_SUFFIX@) ; do \
+-	 echo .so man$(LIB_MAN_SUFFIX)/XF86Misc.$(LIB_MAN_SUFFIX) > $$i; \
++	 echo .so man$(LIB_MAN_DIR_SUFFIX)/XF86Misc.$(LIB_MAN_SUFFIX) > $$i; \
+ 	 done)
diff --git a/x11-libs/libXxf86misc/libXxf86misc-1.0.0.ebuild b/x11-libs/libXxf86misc/libXxf86misc-1.0.0-r1.ebuild
index 8f3b0c7dcea1..54fbd209419f 100644
--- a/x11-libs/libXxf86misc/libXxf86misc-1.0.0.ebuild
+++ b/x11-libs/libXxf86misc/libXxf86misc-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/libXxf86misc/libXxf86misc-1.0.0.ebuild,v 1.4 2006/02/14 22:47:46 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXxf86misc/libXxf86misc-1.0.0-r1.ebuild,v 1.1 2006/02/22 04:32:22 joshuabaergen Exp $
 
 # Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
+SNAPSHOT="yes"
 
 inherit x-modular
 
@@ -20,3 +20,5 @@ DEPEND="${RDEPEND}
 	x11-proto/xproto
 	x11-proto/xextproto
 	x11-proto/xf86miscproto"
+
+PATCHES="${FILESDIR}/fix_shadow_manpages.patch"