Fix shadow manpages.

(Portage version: 2.1_pre4-r1)

6 files changed, 50 insertions, 7 deletions

diff --git a/x11-libs/libXScrnSaver/ChangeLog b/x11-libs/libXScrnSaver/ChangeLog
index 4d9cc0521a22..2bd6930c5412 100644
--- a/x11-libs/libXScrnSaver/ChangeLog
+++ b/x11-libs/libXScrnSaver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/libXScrnSaver
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXScrnSaver/ChangeLog,v 1.20 2006/02/14 22:41:39 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXScrnSaver/ChangeLog,v 1.21 2006/02/22 04:29:24 joshuabaergen Exp $
+
+*libXScrnSaver-1.0.1-r1 (22 Feb 2006)
+
+  22 Feb 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/fix_shadow_manpages.patch, -libXScrnSaver-1.0.1.ebuild,
+  +libXScrnSaver-1.0.1-r1.ebuild:
+  Fix shadow manpages.
 
   14 Feb 2006; Markus Rothe <corsair@gentoo.org> libXScrnSaver-1.0.1.ebuild:
   Added ~ppc64
diff --git a/x11-libs/libXScrnSaver/Manifest b/x11-libs/libXScrnSaver/Manifest
index b0fd3cbd2068..09253b584d62 100644
--- a/x11-libs/libXScrnSaver/Manifest
+++ b/x11-libs/libXScrnSaver/Manifest
@@ -1,4 +1,15 @@
-MD5 3e4045a4735bfd49bc0c4095604cbee7 ChangeLog 3047
-MD5 9b229450100fc2772e8646afcdd8c20f files/digest-libXScrnSaver-1.0.1 72
-MD5 101a00e123a0b5d9c331ce7a366fe32f libXScrnSaver-1.0.1.ebuild 535
+MD5 b57977f37f96334c23ec524b6d6860e5 ChangeLog 3266
+RMD160 05e22aed3930b332cf9dd7607428963537a30182 ChangeLog 3266
+SHA256 b26cbd89cbc0eddcf73d0ed011dcbc16fcf32ebb933d11bc4fdb7151a2104005 ChangeLog 3266
+MD5 53ad41e70ea52287aa5a885245857972 files/digest-libXScrnSaver-1.0.1-r1 262
+RMD160 f7233970f1553179b8a0158dc9669e395cc9c57d files/digest-libXScrnSaver-1.0.1-r1 262
+SHA256 f8fd3d2bfae1ea73cc758f49c2fa4f279a4c96fa9a83d6c987379d58daa8d53a files/digest-libXScrnSaver-1.0.1-r1 262
+MD5 654768f60116da50c3825fc104b72f31 files/fix_shadow_manpages.patch 539
+RMD160 07f6835d4d8c78026a891bbcd7d95e6d07f71a39 files/fix_shadow_manpages.patch 539
+SHA256 e31439f7c0c7d92f3e23c5fae0beab5534332d0e95da63eb1e2cd9d1599bf892 files/fix_shadow_manpages.patch 539
+MD5 74ddd8164b3f069e85bdccd62606c6f4 libXScrnSaver-1.0.1-r1.ebuild 583
+RMD160 115ef02213cdaecd5cadeab47560e618823bebd3 libXScrnSaver-1.0.1-r1.ebuild 583
+SHA256 0d767cdd81442dc4008d1160b19b2f053e48bbde251aae767b2be124c28e286e libXScrnSaver-1.0.1-r1.ebuild 583
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
+SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
diff --git a/x11-libs/libXScrnSaver/files/digest-libXScrnSaver-1.0.1 b/x11-libs/libXScrnSaver/files/digest-libXScrnSaver-1.0.1
deleted file mode 100644
index 9168b9bc4d1a..000000000000
--- a/x11-libs/libXScrnSaver/files/digest-libXScrnSaver-1.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 67f442dba87060b45dd794b492842794 libXScrnSaver-1.0.1.tar.bz2 213993
diff --git a/x11-libs/libXScrnSaver/files/digest-libXScrnSaver-1.0.1-r1 b/x11-libs/libXScrnSaver/files/digest-libXScrnSaver-1.0.1-r1
new file mode 100644
index 000000000000..c93e48d390da
--- /dev/null
+++ b/x11-libs/libXScrnSaver/files/digest-libXScrnSaver-1.0.1-r1
@@ -0,0 +1,3 @@
+MD5 67f442dba87060b45dd794b492842794 libXScrnSaver-1.0.1.tar.bz2 213993
+RMD160 d39c1dc090f627045a9c1157255c75a55404fa68 libXScrnSaver-1.0.1.tar.bz2 213993
+SHA256 7573732f9730a98e64fa51ab2972452e8e353e3446c78629191f35bc35a409a6 libXScrnSaver-1.0.1.tar.bz2 213993
diff --git a/x11-libs/libXScrnSaver/files/fix_shadow_manpages.patch b/x11-libs/libXScrnSaver/files/fix_shadow_manpages.patch
new file mode 100644
index 000000000000..a74e5ad468f0
--- /dev/null
+++ b/x11-libs/libXScrnSaver/files/fix_shadow_manpages.patch
@@ -0,0 +1,21 @@
+diff -u -r1.7 -r1.8
+--- man/Makefile.am	2005/12/06 22:48:42	1.7
++++ man/Makefile.am	2006/02/12 18:19:21	1.8
+@@ -27,6 +27,8 @@
+ 
+ libmandir = $(LIB_MAN_DIR)
+ 
++LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
++
+ libman_PRE = Xss.man
+ 
+ BUILT_SOURCES = shadows.DONE
+@@ -71,5 +73,5 @@
+ shadows.DONE:
+ 	-rm -f $(Xss_shadows:=.@LIB_MAN_SUFFIX@)
+ 	(for i in $(Xss_shadows:=.@LIB_MAN_SUFFIX@) ; do \
+-	 echo .so man$(LIB_MAN_SUFFIX)/Xss.$(LIB_MAN_SUFFIX) > $$i; \
++	 echo .so man$(LIB_MAN_DIR_SUFFIX)/Xss.$(LIB_MAN_SUFFIX) > $$i; \
+ 	 done)
+
+
diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.0.1.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.0.1-r1.ebuild
index 22c39b2bec66..9edd623c7f8b 100644
--- a/x11-libs/libXScrnSaver/libXScrnSaver-1.0.1.ebuild
+++ b/x11-libs/libXScrnSaver/libXScrnSaver-1.0.1-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/libXScrnSaver/libXScrnSaver-1.0.1.ebuild,v 1.4 2006/02/14 22:41:39 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXScrnSaver/libXScrnSaver-1.0.1-r1.ebuild,v 1.1 2006/02/22 04:29:24 joshuabaergen Exp $
 
 # Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
+SNAPSHOT="yes"
 
 inherit x-modular
 
@@ -14,3 +14,5 @@ RDEPEND="x11-libs/libX11
 DEPEND="${RDEPEND}
 	x11-proto/xextproto
 	x11-proto/scrnsaverproto"
+
+PATCHES="${FILESDIR}/fix_shadow_manpages.patch"