From f92577385c6924fc4296bc32916b67d18414d368 Mon Sep 17 00:00:00 2001
From: Joshua Baergen <joshuabaergen@gentoo.org>
Date: Wed, 22 Feb 2006 04:27:54 +0000
Subject: Fix shadow manpages for bug #123328 (reported by Philip Kovacs).
 (Portage version: 2.1_pre4-r1)

---
 x11-libs/libX11/ChangeLog                    |  8 +++++-
 x11-libs/libX11/Manifest                     | 14 +++++++---
 x11-libs/libX11/files/digest-libX11-1.0.0-r1 |  1 -
 x11-libs/libX11/files/digest-libX11-1.0.0-r2 |  6 +++++
 x11-libs/libX11/libX11-1.0.0-r1.ebuild       | 35 -------------------------
 x11-libs/libX11/libX11-1.0.0-r2.ebuild       | 39 ++++++++++++++++++++++++++++
 6 files changed, 63 insertions(+), 40 deletions(-)
 delete mode 100644 x11-libs/libX11/files/digest-libX11-1.0.0-r1
 create mode 100644 x11-libs/libX11/files/digest-libX11-1.0.0-r2
 delete mode 100644 x11-libs/libX11/libX11-1.0.0-r1.ebuild
 create mode 100644 x11-libs/libX11/libX11-1.0.0-r2.ebuild

diff --git a/x11-libs/libX11/ChangeLog b/x11-libs/libX11/ChangeLog
index 8e6e25d287ca..0867cc9dacec 100644
--- a/x11-libs/libX11/ChangeLog
+++ b/x11-libs/libX11/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libX11
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v 1.26 2006/02/14 22:19:39 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v 1.27 2006/02/22 04:27:54 joshuabaergen Exp $
+
+*libX11-1.0.0-r2 (22 Feb 2006)
+
+  22 Feb 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  -libX11-1.0.0-r1.ebuild, +libX11-1.0.0-r2.ebuild:
+  Fix shadow manpages for bug #123328 (reported by Philip Kovacs).
 
   14 Feb 2006; Markus Rothe <corsair@gentoo.org> libX11-1.0.0-r1.ebuild:
   Added ~ppc64
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index cf0d785392e5..d513be5a93dc 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,4 +1,12 @@
-MD5 ff725da731ccfc43365521ef48a19bd7 ChangeLog 3748
-MD5 567312f8f1878280a4bc5d747bcba2c8 files/digest-libX11-1.0.0-r1 66
-MD5 526e36141eb10909ef79ca196aab8707 libX11-1.0.0-r1.ebuild 945
+MD5 80ddae9b513494041c2845db5f66201b ChangeLog 3957
+RMD160 9461c16bbf1a867e591d0de8a0fb28e8ca414eba ChangeLog 3957
+SHA256 e1ed7c8c2801313489c451384e9bda8fdf2032efe53ef5420e30c4df66b3ed3a ChangeLog 3957
+MD5 900360a974724c93601e364b8f63b67a files/digest-libX11-1.0.0-r2 539
+RMD160 3cab8957251f32985c10762f8dec822f2e2170e2 files/digest-libX11-1.0.0-r2 539
+SHA256 e92b5a4af3081e21a10b13dba5741d7801023fa0b512762613957a17f5d12661 files/digest-libX11-1.0.0-r2 539
+MD5 960aa813c9bfb5af05ca13f1e472aad3 libX11-1.0.0-r2.ebuild 1117
+RMD160 a50462f132e32e310c6b97918e36faeade71ab6a libX11-1.0.0-r2.ebuild 1117
+SHA256 5583a029d2cf7b46a281e60a698baa4c709aaea066d14cd2d8b75a461c2d02ba libX11-1.0.0-r2.ebuild 1117
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
+SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
diff --git a/x11-libs/libX11/files/digest-libX11-1.0.0-r1 b/x11-libs/libX11/files/digest-libX11-1.0.0-r1
deleted file mode 100644
index ae18b7b40a32..000000000000
--- a/x11-libs/libX11/files/digest-libX11-1.0.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b5014273518e724e7c64bf17ff8fe555 libX11-1.0.0.tar.bz2 1398660
diff --git a/x11-libs/libX11/files/digest-libX11-1.0.0-r2 b/x11-libs/libX11/files/digest-libX11-1.0.0-r2
new file mode 100644
index 000000000000..ff46aedb3e39
--- /dev/null
+++ b/x11-libs/libX11/files/digest-libX11-1.0.0-r2
@@ -0,0 +1,6 @@
+MD5 4be5beedf881ddfa809fa91b15d89b9f libX11-1.0.0-fix_shadow_manpages.tar.bz2 2411
+RMD160 244ab93edda8321d8e22a734bb5dd25232a62a0d libX11-1.0.0-fix_shadow_manpages.tar.bz2 2411
+SHA256 4340ca66373422bdbd9554851b09728c53a6530e7a5b0b8984a232d52b1f953d libX11-1.0.0-fix_shadow_manpages.tar.bz2 2411
+MD5 b5014273518e724e7c64bf17ff8fe555 libX11-1.0.0.tar.bz2 1398660
+RMD160 78cd3a6a3bc8b4532f98ddd2dac545e9009bf3e3 libX11-1.0.0.tar.bz2 1398660
+SHA256 30aec9d56a248375c80975b41fbbff5b9398d9df6cd6437ec0303cd1b0f95995 libX11-1.0.0.tar.bz2 1398660
diff --git a/x11-libs/libX11/libX11-1.0.0-r1.ebuild b/x11-libs/libX11/libX11-1.0.0-r1.ebuild
deleted file mode 100644
index 7d656f656a6e..000000000000
--- a/x11-libs/libX11/libX11-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.0.0-r1.ebuild,v 1.2 2006/02/14 22:19:40 corsair Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-inherit x-modular
-
-DESCRIPTION="X.Org X11 library"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ipv6"
-RDEPEND="x11-libs/xtrans
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-proto/kbproto
-	x11-proto/inputproto
-	x11-proto/xproto"
-DEPEND="${RDEPEND}
-	x11-proto/xf86bigfontproto
-	x11-proto/bigreqsproto
-	x11-proto/xextproto
-	x11-proto/xcmiscproto
-	>=x11-misc/util-macros-0.99.0_p20051007"
-
-CONFIGURE_OPTIONS="$(use_enable ipv6)"
-# xorg really doesn't like xlocale disabled.
-# $(use_enable nls xlocale)
-
-src_install() {
-	x-modular_src_install
-
-	local ENVD="10libx11"
-	echo "LDPATH=\"/usr/lib\"" > ${T}/${ENVD}
-	doenvd ${T}/${ENVD}
-}
diff --git a/x11-libs/libX11/libX11-1.0.0-r2.ebuild b/x11-libs/libX11/libX11-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..c6d5cdeb589b
--- /dev/null
+++ b/x11-libs/libX11/libX11-1.0.0-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.0.0-r2.ebuild,v 1.1 2006/02/22 04:27:54 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+SNAPSHOT="yes"
+inherit x-modular
+
+DESCRIPTION="X.Org X11 library"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ipv6"
+RDEPEND="x11-libs/xtrans
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-proto/kbproto
+	x11-proto/inputproto
+	x11-proto/xproto"
+DEPEND="${RDEPEND}
+	x11-proto/xf86bigfontproto
+	x11-proto/bigreqsproto
+	x11-proto/xextproto
+	x11-proto/xcmiscproto
+	>=x11-misc/util-macros-0.99.0_p20051007"
+
+CONFIGURE_OPTIONS="$(use_enable ipv6)"
+# xorg really doesn't like xlocale disabled.
+# $(use_enable nls xlocale)
+
+SRC_URI="${SRC_URI}
+	http://dev.gentoo.org/~joshuabaergen/distfiles/libX11-1.0.0-fix_shadow_manpages.tar.bz2"
+PATCHES="${DISTDIR}/libX11-1.0.0-fix_shadow_manpages.tar.bz2"
+
+src_install() {
+	x-modular_src_install
+
+	local ENVD="10libx11"
+	echo "LDPATH=\"/usr/lib\"" > ${T}/${ENVD}
+	doenvd ${T}/${ENVD}
+}
-- 
cgit v1.2.3-65-gdbad