old

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

3 files changed, 10 insertions, 82 deletions

diff --git a/x11-libs/libXi/ChangeLog b/x11-libs/libXi/ChangeLog
index ef52048d6a5b..24b999213b9e 100644
--- a/x11-libs/libXi/ChangeLog
+++ b/x11-libs/libXi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libXi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXi/ChangeLog,v 1.110 2011/04/28 18:57:46 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXi/ChangeLog,v 1.111 2011/05/04 11:21:05 scarabeus Exp $
+
+  04 May 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/1.3.1-0001-Add-configure-switch-for-manpages-regenerating.patch:
+  old
 
   28 Apr 2011; Markos Chandras <hwoarang@gentoo.org> libXi-1.4.2.ebuild:
   Stable on amd64 wrt bug #363965
diff --git a/x11-libs/libXi/Manifest b/x11-libs/libXi/Manifest
index d5a8db29ecaa..07f8d865d13c 100644
--- a/x11-libs/libXi/Manifest
+++ b/x11-libs/libXi/Manifest
@@ -1,27 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
-AUX 1.3.1-0001-Add-configure-switch-for-manpages-regenerating.patch 2370 RMD160 28723892b5d6f5b23ff2c0f418395e291338e0b5 SHA1 165fc656a87f5d9381482ad05a6addd9331e65b5 SHA256 0019af772621bb9b926317b1d24db70ebf80f3fae74674de0f3250e3e544155d
 DIST libXi-1.4.1.tar.bz2 407880 RMD160 7447cc3ef411d833bee36fca6f6ffb13108ce113 SHA1 15c9d369cc76c73b5e3833ba3b39355e6cc06636 SHA256 599f1c0930f94c2ae74711b2577a7f354c4a991cc97b5ec5bb655b855c1429a6
 DIST libXi-1.4.2.tar.bz2 398801 RMD160 2753987b72a91683321bc02172901f1d5c5b5664 SHA1 97e60a60dd789287e47df807e487f4952dd4ff95 SHA256 272b8041efc0a0203fb0ba33481ddec989539aed862181b58c8c3e410e325691
 EBUILD libXi-1.4.1.ebuild 1031 RMD160 05a4d8a281b6e5055146dc44be1f0eef617bc3c3 SHA1 6ad3702abba81fdc3bae3311bc96d1b9728ccc20 SHA256 e5c7387867325dd5eac0e78402f3ca20ec22b198144f73789438ce7601b287e1
 EBUILD libXi-1.4.2.ebuild 1000 RMD160 6dbbdf6d45222d81bbb43b5f03d5a3e1b80291c4 SHA1 6f52cd2566ad7b3bd268c4034f777074b3241dd9 SHA256 e625977ccd06f486e54763f8a747ddbbda71959e3b84d1d70d44f3f0fc0f21a4
-MISC ChangeLog 13156 RMD160 74e3bcf672da649e0be4fb073e6e0c5a9a46b7eb SHA1 0f657fbe868b104dd770b070324a435a830dfb9b SHA256 6b37ebce3558e91a06664a6ef6c2cac5bc99c6f95908d20cd950d71d1331decd
+MISC ChangeLog 13293 RMD160 737081ff09c6161f632848c66d9d6aa4ea24277a SHA1 2fbab4716ca1c5e43bac4170f172322eb9fd1168 SHA256 a9d880dc789f33fd484d724e0b737cf9bac674aca37d1c5c115fad623b8826a6
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNubitAAoJEPqDWhW0r/LCZ/kP/1KrI7iRp9FEO5lQGcSpd5Oo
-DyNpzUjNm5euuV7s2Apw1B5lLHEvd97Ai2BAz7OFnC+/WZbpSwADWYvgMJ6qcRQ3
-uvzbSBB6WfiSGI1tMXHpjtHfMv5IZvS4+IIZQ+2cXir/8Y+2Vf8BkluU26b+Ly6I
-J+Gkxf0Xe8oenxmkehpP1P52F7sOBPn6SOkzMEWHMLR2xQbkrPQTMZmJVtdpS01F
-KCsAMyyC6vISKRlD/rGaz+XSm69/p5SlNktLj0RO29UVqW82RlU+IApXzVoqUOJD
-pz908EOWe8nQFATpBPiJ3eX0jg+inQkTCeyJQ9z8+VE8f0k5o+1t1nL8x8fFNsjF
-Pf/zoryXdjbUyW191W4yJENR77VH6qTXXQqtfTWDLIv5H3jLCONsx9DbOTL2wP9f
-gwtQ4ls7izBGPlI8ps1ZSZXAwYrdwRjJQi+YBxd3/+k2CTorP10ZYqc4d2J1UV3B
-Ynj9p2w6s6g2axEZdRtWVbebP4++4CdzM4o4G9StB+RmOIeqcQIeS7NuJvMObkZq
-HaFynRZV3kjlGuWTmhjJFtCqezniYNtANYksI/P4VSp7D6zNvPsjdMsvNr7Tw1jD
-VCp27NSsokxGS6IXfG423wtwHoIZCbuLIiZ7WyQz7/kOSGfiXKsCtW/t4kAXJ4zm
-Q8ym9VUEZ023NxXflSn8
-=1UwT
+iEYEARECAAYFAk3BNowACgkQHB6c3gNBRYcLHgCcD8DiTtJ1kzb6EkOyaA/QL+sc
+xUoAoJajPc9yLL58ushBTXl/dEfWZjYi
+=3lZg
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libXi/files/1.3.1-0001-Add-configure-switch-for-manpages-regenerating.patch b/x11-libs/libXi/files/1.3.1-0001-Add-configure-switch-for-manpages-regenerating.patch
deleted file mode 100644
index a774d54d9e85..000000000000
--- a/x11-libs/libXi/files/1.3.1-0001-Add-configure-switch-for-manpages-regenerating.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From c6d02ef39180174896fca5a720d25f991802ef60 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <scarabeus@gentoo.org>
-Date: Mon, 2 Aug 2010 18:23:10 +0200
-Subject: [PATCH] Add configure switch for manpages regenerating.
-
----
- configure.ac |   35 ++++++++++++++++++++++-------------
- 1 files changed, 22 insertions(+), 13 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index baf10f8..423e65d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,26 +25,35 @@ AC_SUBST(XI_CFLAGS)
- AC_SUBST(XI_LIBS)
- 
- # Check for xmlto and asciidoc for man page conversion
--# (only needed by people building tarballs)
--AC_ARG_VAR([XMLTO], [Path to xmlto command])
--AC_PATH_PROG([XMLTO], [xmlto])
--AC_ARG_VAR([ASCIIDOC], [Path to asciidoc command])
--AC_PATH_PROG([ASCIIDOC], [asciidoc])
--if test "x$XMLTO" = "x" && test "x$ASCIIDOC" = "x"; then
--	have_doctools=yes
-+AC_ARG_WITH(manpages, AS_HELP_STRING([--with-manpages],
-+	[Enable manpages building/regenerating (default: enabled if xmlto and asciidoc found)]),
-+	[MANPAGES=$withval], [MANPAGES=auto])
-+if test "x$MANPAGES" = "xyes" -o "x$MANPAGES" = "xauto" ; then
-+		AC_ARG_VAR([XMLTO], [Path to xmlto command])
-+		AC_PATH_PROG([XMLTO], [xmlto])
-+		AC_ARG_VAR([ASCIIDOC], [Path to asciidoc command])
-+		AC_PATH_PROG([ASCIIDOC], [asciidoc])
-+		if test "x$XMLTO" != "x" && test "x$ASCIIDOC" != "x"; then
-+			regen_manpages=yes
-+		else
-+			if test "x$MANPAGES" = "xyes"; then
-+				AC_MSG_ERROR([Asciidoc or xmlto not found but manpages rebuild explicitely requested on configure line])
-+			else
-+				AC_MSG_WARN([xmlto or asciidoc not found - cannot create man pages without it])
-+			fi
-+			regen_manpages=no
-+		fi
- else
--	have_doctools=no
--fi
--AM_CONDITIONAL([HAVE_DOCTOOLS], [test $have_doctools = yes])
--if test $have_doctools = no; then
--	AC_MSG_WARN([xmlto or asciidoc not found - cannot create man pages without it])
-+	regen_manpages=no
-+	AC_MSG_WARN([Manpage generating disabled on configure line])
- fi
-+AM_CONDITIONAL([HAVE_DOCTOOLS], [test "x$regen_manpages" = "xyes"])
- 
- # Determine if the source for man pages is available
- # It may already be present (tarball) or can be generated using doctools
- AM_CONDITIONAL([INSTALL_MANPAGES],
- 	[test -f "$srcdir/man/XAllowDeviceEvents.man" || \
--	  test $have_doctools = yes])
-+	  test "x$regen_manpages" = "xyes"])
- 
- XORG_CHECK_MALLOC_ZERO
- 
--- 
-1.7.2
-