diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-05-04 11:21:05 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-05-04 11:21:05 +0000 |
| commit | 8849fd3bb7a950c5f0236cbc2483e2837ef1bf0b (patch) | |
| tree | 047c80fba8307f2fe61b243d77ccc987ecae8d73 /x11-libs | |
| parent | old (diff) | |
| download | gentoo-2-8849fd3bb7a950c5f0236cbc2483e2837ef1bf0b.tar.gz gentoo-2-8849fd3bb7a950c5f0236cbc2483e2837ef1bf0b.tar.bz2 gentoo-2-8849fd3bb7a950c5f0236cbc2483e2837ef1bf0b.zip | |
old
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/libXi/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/libXi/files/1.3.1-0001-Add-configure-switch-for-manpages-regenerating.patch | 65 |
2 files changed, 5 insertions, 66 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/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 - |