Fix doc DEPEND and bashism in tests, bug #253773.

(Portage version: 2.2_rc22/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64)

4 files changed, 64 insertions, 27 deletions

diff --git a/x11-libs/libxklavier/ChangeLog b/x11-libs/libxklavier/ChangeLog
index 31b50046e4f2..299852c5e6fe 100644
--- a/x11-libs/libxklavier/ChangeLog
+++ b/x11-libs/libxklavier/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/libxklavier
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.117 2009/01/04 00:36:08 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.118 2009/01/21 23:21:34 eva Exp $
+
+  21 Jan 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/libxklavier-1.14-werror.patch, +files/libxklavier-3.8-tests.patch,
+  libxklavier-3.8.ebuild:
+  Fix doc DEPEND and bashism in tests, bug #253773.
 
 *libxklavier-3.8 (04 Jan 2009)
 
diff --git a/x11-libs/libxklavier/files/libxklavier-1.14-werror.patch b/x11-libs/libxklavier/files/libxklavier-1.14-werror.patch
deleted file mode 100644
index 0a575adf0ac2..000000000000
--- a/x11-libs/libxklavier/files/libxklavier-1.14-werror.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- libxklavier-1.14/libxklavier/Makefile.am.werror	2005-02-01 11:24:34.684925000 -0500
-+++ libxklavier-1.14/libxklavier/Makefile.am	2005-02-01 11:24:44.044556000 -0500
-@@ -14,7 +14,7 @@
-   ENABLE_XMM_SUPPORT_CFLAG = -DDISABLE_XMM_SUPPORT=1
- endif
- 
--AM_CFLAGS=-Wall -Werror -DDATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-+AM_CFLAGS=-Wall -DDATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-   -I. -I$(includedir) $(XML_CFLAGS) -I$(x_includes) -I$(top_srcdir) \
-   $(XKB_HEADERS_PRESENT_CFLAG) \
-   $(ENABLE_XKB_SUPPORT_CFLAG) \
---- libxklavier-1.14/libxklavier/Makefile.in.werror	2005-02-01 11:25:24.981578000 -0500
-+++ libxklavier-1.14/libxklavier/Makefile.in	2005-02-01 11:25:35.528023000 -0500
-@@ -205,7 +205,7 @@
- @ENABLE_XKB_SUPPORT_TRUE@ENABLE_XKB_SUPPORT_CFLAG = -DENABLE_XKB_SUPPORT=1
- @ENABLE_XMM_SUPPORT_FALSE@ENABLE_XMM_SUPPORT_CFLAG = -DDISABLE_XMM_SUPPORT=1
- @ENABLE_XMM_SUPPORT_TRUE@ENABLE_XMM_SUPPORT_CFLAG = -DENABLE_XMM_SUPPORT=1
--AM_CFLAGS = -Wall -Werror -DDATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-+AM_CFLAGS = -Wall -DDATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-   -I. -I$(includedir) $(XML_CFLAGS) -I$(x_includes) -I$(top_srcdir) \
-   $(XKB_HEADERS_PRESENT_CFLAG) \
-   $(ENABLE_XKB_SUPPORT_CFLAG) \
diff --git a/x11-libs/libxklavier/files/libxklavier-3.8-tests.patch b/x11-libs/libxklavier/files/libxklavier-3.8-tests.patch
new file mode 100644
index 000000000000..4da489911f81
--- /dev/null
+++ b/x11-libs/libxklavier/files/libxklavier-3.8-tests.patch
@@ -0,0 +1,43 @@
+# https://bugs.freedesktop.org/show_bug.cgi?id=19645
+# https://bugs.gentoo.org/show_bug.cgi?id=253773
+--- a/libxklavier-3.8/configure.in
++++ b/libxklavier-3.8/configure.in
+@@ -126,9 +126,9 @@
+ AM_CONDITIONAL(ENABLE_XMODMAP_SUPPORT, test "$enable_xmodmap_support" = "yes")
+ 
+ AC_MSG_CHECKING(whether at least one libxklavier backend is enabled)
+-if test \( "$enable_xkb_support" == "yes" -a \
+-          "$libxkbfile_present" == "yes" \) -o \
+-        "$enable_xmodmap_support" == "yes" ; then
++if test \( "$enable_xkb_support" = "yes" -a \
++          "$libxkbfile_present" = "yes" \) -o \
++        "$enable_xmodmap_support" = "yes" ; then
+   AC_MSG_RESULT(yes)
+ else
+   AC_MSG_RESULT(no)
+@@ -184,8 +184,8 @@
+ 
+ echo '**********************************************************'
+ echo '  Libxklavier is configured with the following backends:'
+-if test "$enable_xkb_support" == "yes" ; then
+-  if test "$libxkbfile_present" == "yes" ; then
++if test "$enable_xkb_support" = "yes" ; then
++  if test "$libxkbfile_present" = "yes" ; then
+     echo "    XKB, libxkbfile is present"
+     echo "         default ruleset: $xkb_default_ruleset"
+     echo "         base: $xkb_base"
+@@ -195,12 +195,12 @@
+     echo "    XKB, libxkbfile is NOT present"
+   fi
+ fi
+-if test "$enable_xmodmap_support" == "yes" ; then
++if test "$enable_xmodmap_support" = "yes" ; then
+   echo "    xmodmap, default ruleset: $xmodmap_default_ruleset"
+   echo "             base: $xmodmap_base"
+ fi
+ 
+-if test "$enable_gtk_doc" == "yes" ; then
++if test "$enable_gtk_doc" = "yes" ; then
+   echo "  gtk-doc enabled"
+ else
+   echo "  gtk-doc disabled"
diff --git a/x11-libs/libxklavier/libxklavier-3.8.ebuild b/x11-libs/libxklavier/libxklavier-3.8.ebuild
index 828a31d26cba..a4e0d9aad015 100644
--- a/x11-libs/libxklavier/libxklavier-3.8.ebuild
+++ b/x11-libs/libxklavier/libxklavier-3.8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-3.8.ebuild,v 1.1 2009/01/04 00:36:08 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-3.8.ebuild,v 1.2 2009/01/21 23:21:34 eva Exp $
 
-inherit eutils
+inherit autotools eutils
 
 DESCRIPTION="High level XKB library"
 HOMEPAGE="http://www.freedesktop.org/Software/LibXklavier"
@@ -25,7 +25,18 @@ RDEPEND="|| (
 	app-text/iso-codes"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
+	doc? ( >=dev-util/gtk-doc-1.4 )
+	dev-util/gtk-doc-am"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Fix tests in configure.in, bug #253773
+	epatch "${FILESDIR}/${P}-tests.patch"
+
+	eautoreconf
+}
 
 src_compile() {
 	local xkbbase
@@ -40,7 +51,7 @@ src_compile() {
 	econf \
 		--with-xkb-base=${xkbbase} \
 		--with-xkb-bin-base=/usr/bin \
-		$(use_enable doc doxygen)
+		$(use_enable doc gtk-doc)
 
 	emake || die "emake failed"
 }