Fix shadow manpages.

(Portage version: 2.1_pre4-r1)

6 files changed, 100 insertions, 7 deletions

diff --git a/x11-libs/libXi/ChangeLog b/x11-libs/libXi/ChangeLog
index 8ed7ab3832f9..68bf6c0f8862 100644
--- a/x11-libs/libXi/ChangeLog
+++ b/x11-libs/libXi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/libXi
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXi/ChangeLog,v 1.15 2006/02/14 22:30:44 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXi/ChangeLog,v 1.16 2006/02/22 04:31:01 joshuabaergen Exp $
+
+*libXi-1.0.0-r1 (22 Feb 2006)
+
+  22 Feb 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/fix_shadow_manpages.patch, -libXi-1.0.0.ebuild,
+  +libXi-1.0.0-r1.ebuild:
+  Fix shadow manpages.
 
   14 Feb 2006; Markus Rothe <corsair@gentoo.org> libXi-1.0.0.ebuild:
   Added ~ppc64
diff --git a/x11-libs/libXi/Manifest b/x11-libs/libXi/Manifest
index 4a752ec2c68a..5706dcd40365 100644
--- a/x11-libs/libXi/Manifest
+++ b/x11-libs/libXi/Manifest
@@ -1,4 +1,15 @@
-MD5 cbc279f777030c2c0318f0959f2f896f ChangeLog 1760
-MD5 81f8c806b9737e9ccc6bd7251f930182 files/digest-libXi-1.0.0 64
-MD5 09cbbe8f0aa827d155b92f7357cace14 libXi-1.0.0.ebuild 644
+MD5 b6c11052d269185e05515ad08acdd88e ChangeLog 1955
+RMD160 97b8237a0f82b25dd997a43fd5f55d5520dbf835 ChangeLog 1955
+SHA256 75467ddafb98da2bcc4b3b58b86bff4abe808c3e381678e7bda094db70f43155 ChangeLog 1955
+MD5 82e497f94e8ddbdb5a61d067a9b72f54 files/digest-libXi-1.0.0-r1 238
+RMD160 e8d915fda46928f65d3b4e4f3e7f8ec4dce07689 files/digest-libXi-1.0.0-r1 238
+SHA256 737cc81605024092f117d1ad566d0b6a81877fae8365802a10ec8af3b7c5f28e files/digest-libXi-1.0.0-r1 238
+MD5 a02c539f25bad42159c70d35be2637c5 files/fix_shadow_manpages.patch 3751
+RMD160 84d36fe0d749efe56f9eaf6da7ffd054609afb29 files/fix_shadow_manpages.patch 3751
+SHA256 93d516a32e39cf19088668b610cd3346069f1b86d4ebb6950fb94d4d5eae7418 files/fix_shadow_manpages.patch 3751
+MD5 87364f565f941293d36df7ee8d8292dd libXi-1.0.0-r1.ebuild 692
+RMD160 1b6c4f69a878e8150094d782888babb766a5d14f libXi-1.0.0-r1.ebuild 692
+SHA256 12bba942b0a3741916fae4b5386014759ca1659ba0b3e1877b35c937da4dc5d0 libXi-1.0.0-r1.ebuild 692
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
+SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
diff --git a/x11-libs/libXi/files/digest-libXi-1.0.0 b/x11-libs/libXi/files/digest-libXi-1.0.0
deleted file mode 100644
index 70e3b0b8224c..000000000000
--- a/x11-libs/libXi/files/digest-libXi-1.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b202ff4cb3876949b8e1a479b7e5e8f6 libXi-1.0.0.tar.bz2 239080
diff --git a/x11-libs/libXi/files/digest-libXi-1.0.0-r1 b/x11-libs/libXi/files/digest-libXi-1.0.0-r1
new file mode 100644
index 000000000000..75786188b221
--- /dev/null
+++ b/x11-libs/libXi/files/digest-libXi-1.0.0-r1
@@ -0,0 +1,3 @@
+MD5 b202ff4cb3876949b8e1a479b7e5e8f6 libXi-1.0.0.tar.bz2 239080
+RMD160 40e5b40c251430cee23475261a01f6ce812e8194 libXi-1.0.0.tar.bz2 239080
+SHA256 e62345a670d9f17f4af95f47acb0c205eb0049f43c1011e9aef15f89fddc6722 libXi-1.0.0.tar.bz2 239080
diff --git a/x11-libs/libXi/files/fix_shadow_manpages.patch b/x11-libs/libXi/files/fix_shadow_manpages.patch
new file mode 100644
index 000000000000..14852cbc6586
--- /dev/null
+++ b/x11-libs/libXi/files/fix_shadow_manpages.patch
@@ -0,0 +1,71 @@
+diff -u -r1.6 -r1.7
+--- man/Makefile.am	2005/12/06 22:48:43	1.6
++++ man/Makefile.am	2006/02/12 18:19:22	1.7
+@@ -27,6 +27,8 @@
+ 
+ libmandir = $(LIB_MAN_DIR)
+ 
++LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
++
+ libman_PRE = \
+ 	XAllowDeviceEvents.man \
+ 	XChangeDeviceDontPropagateList.man \
+@@ -136,44 +138,44 @@
+ shadows.DONE:
+ 	-rm -f $(all_shadows:=.@LIB_MAN_SUFFIX@)
+ 	(for i in $(XGetDeviceControl_shadows:=.@LIB_MAN_SUFFIX@) ; do \
+-	 echo .so man$(LIB_MAN_SUFFIX)/XGetDeviceControl.$(LIB_MAN_SUFFIX) > $$i; \
++	 echo .so man$(LIB_MAN_DIR_SUFFIX)/XGetDeviceControl.$(LIB_MAN_SUFFIX) > $$i; \
+ 	 done)
+ 	(for i in $(XGetFeedbackControl_shadows:=.@LIB_MAN_SUFFIX@) ; do \
+-	 echo .so man$(LIB_MAN_SUFFIX)/XGetFeedbackControl.$(LIB_MAN_SUFFIX) > $$i; \
++	 echo .so man$(LIB_MAN_DIR_SUFFIX)/XGetFeedbackControl.$(LIB_MAN_SUFFIX) > $$i; \
+ 	 done)
+ 	(for i in $(XGetDeviceKeyMapping_shadows:=.@LIB_MAN_SUFFIX@) ; do \
+-	 echo .so man$(LIB_MAN_SUFFIX)/XGetDeviceKeyMapping.$(LIB_MAN_SUFFIX) > $$i; \
++	 echo .so man$(LIB_MAN_DIR_SUFFIX)/XGetDeviceKeyMapping.$(LIB_MAN_SUFFIX) > $$i; \
+ 	 done)
+ 	(for i in $(XGetDeviceModifierMapping_shadows:=.@LIB_MAN_SUFFIX@) ; do \
+-	 echo .so man$(LIB_MAN_SUFFIX)/XGetDeviceModifierMapping.$(LIB_MAN_SUFFIX) > $$i; \
++	 echo .so man$(LIB_MAN_DIR_SUFFIX)/XGetDeviceModifierMapping.$(LIB_MAN_SUFFIX) > $$i; \
+ 	 done)
+ 	(for i in $(XChangeDeviceDontPropagateList_shadows:=.@LIB_MAN_SUFFIX@) ; do \
+-	 echo .so man$(LIB_MAN_SUFFIX)/XChangeDeviceDontPropagateList.$(LIB_MAN_SUFFIX) > $$i; \
++	 echo .so man$(LIB_MAN_DIR_SUFFIX)/XChangeDeviceDontPropagateList.$(LIB_MAN_SUFFIX) > $$i; \
+ 	 done)
+ 	(for i in $(XGetDeviceMotionEvents_shadows:=.@LIB_MAN_SUFFIX@) ; do \
+-	 echo .so man$(LIB_MAN_SUFFIX)/XGetDeviceMotionEvents.$(LIB_MAN_SUFFIX) > $$i; \
++	 echo .so man$(LIB_MAN_DIR_SUFFIX)/XGetDeviceMotionEvents.$(LIB_MAN_SUFFIX) > $$i; \
+ 	 done)
+ 	(for i in $(XGrabDeviceButton_shadows:=.@LIB_MAN_SUFFIX@) ; do \
+-	 echo .so man$(LIB_MAN_SUFFIX)/XGrabDeviceButton.$(LIB_MAN_SUFFIX) > $$i; \
++	 echo .so man$(LIB_MAN_DIR_SUFFIX)/XGrabDeviceButton.$(LIB_MAN_SUFFIX) > $$i; \
+ 	 done)
+ 	(for i in $(XGrabDeviceKey_shadows:=.@LIB_MAN_SUFFIX@) ; do \
+-	 echo .so man$(LIB_MAN_SUFFIX)/XGrabDeviceKey.$(LIB_MAN_SUFFIX) > $$i; \
++	 echo .so man$(LIB_MAN_DIR_SUFFIX)/XGrabDeviceKey.$(LIB_MAN_SUFFIX) > $$i; \
+ 	 done)
+ 	(for i in $(XGrabDevice_shadows:=.@LIB_MAN_SUFFIX@) ; do \
+-	 echo .so man$(LIB_MAN_SUFFIX)/XGrabDevice.$(LIB_MAN_SUFFIX) > $$i; \
++	 echo .so man$(LIB_MAN_DIR_SUFFIX)/XGrabDevice.$(LIB_MAN_SUFFIX) > $$i; \
+ 	 done)
+ 	(for i in $(XListInputDevices_shadows:=.@LIB_MAN_SUFFIX@) ; do \
+-	 echo .so man$(LIB_MAN_SUFFIX)/XListInputDevices.$(LIB_MAN_SUFFIX) > $$i; \
++	 echo .so man$(LIB_MAN_DIR_SUFFIX)/XListInputDevices.$(LIB_MAN_SUFFIX) > $$i; \
+ 	 done)
+ 	(for i in $(XOpenDevice_shadows:=.@LIB_MAN_SUFFIX@) ; do \
+-	 echo .so man$(LIB_MAN_SUFFIX)/XOpenDevice.$(LIB_MAN_SUFFIX) > $$i; \
++	 echo .so man$(LIB_MAN_DIR_SUFFIX)/XOpenDevice.$(LIB_MAN_SUFFIX) > $$i; \
+ 	 done)
+ 	(for i in $(XSetDeviceButtonMapping_shadows:=.@LIB_MAN_SUFFIX@) ; do \
+-	 echo .so man$(LIB_MAN_SUFFIX)/XSetDeviceButtonMapping.$(LIB_MAN_SUFFIX) > $$i; \
++	 echo .so man$(LIB_MAN_DIR_SUFFIX)/XSetDeviceButtonMapping.$(LIB_MAN_SUFFIX) > $$i; \
+ 	 done)
+ 	(for i in $(XSetDeviceFocus_shadows:=.@LIB_MAN_SUFFIX@) ; do \
+-	 echo .so man$(LIB_MAN_SUFFIX)/XSetDeviceFocus.$(LIB_MAN_SUFFIX) > $$i; \
++	 echo .so man$(LIB_MAN_DIR_SUFFIX)/XSetDeviceFocus.$(LIB_MAN_SUFFIX) > $$i; \
+ 	 done)
+ 	(for i in $(XSelectExtensionEvent_shadows:=.@LIB_MAN_SUFFIX@) ; do \
+-	 echo .so man$(LIB_MAN_SUFFIX)/XSelectExtensionEvent.$(LIB_MAN_SUFFIX) > $$i; \
++	 echo .so man$(LIB_MAN_DIR_SUFFIX)/XSelectExtensionEvent.$(LIB_MAN_SUFFIX) > $$i; \
+ 	 done)
diff --git a/x11-libs/libXi/libXi-1.0.0.ebuild b/x11-libs/libXi/libXi-1.0.0-r1.ebuild
index f0e39b0691e2..64647b5c5bcd 100644
--- a/x11-libs/libXi/libXi-1.0.0.ebuild
+++ b/x11-libs/libXi/libXi-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/libXi/libXi-1.0.0.ebuild,v 1.4 2006/02/14 22:30:44 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXi/libXi-1.0.0-r1.ebuild,v 1.1 2006/02/22 04:31:01 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/inputproto"
+
+PATCHES="${FILESDIR}/fix_shadow_manpages.patch"