summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarald van Dijk <truedfx@gentoo.org>2008-05-19 23:41:14 +0000
committerHarald van Dijk <truedfx@gentoo.org>2008-05-19 23:41:14 +0000
commit80ac4b5541ede60c570adcc4c7dc680a9ae104ec (patch)
treee1864c013a4f1ae34dc351e0c536393446cc7229 /www-client/dillo
parent Stable on amd64 and x86. (diff)
downloadgentoo-2-80ac4b5541ede60c570adcc4c7dc680a9ae104ec.tar.gz
gentoo-2-80ac4b5541ede60c570adcc4c7dc680a9ae104ec.tar.bz2
gentoo-2-80ac4b5541ede60c570adcc4c7dc680a9ae104ec.zip
Fix error reported by aclocal (#220511)
(Portage version: 2.1.5)
Diffstat (limited to 'www-client/dillo')
-rw-r--r--www-client/dillo/ChangeLog6
-rw-r--r--www-client/dillo/dillo-0.8.6.ebuild3
-rw-r--r--www-client/dillo/files/dillo-ac_subst.patch17
3 files changed, 24 insertions, 2 deletions
diff --git a/www-client/dillo/ChangeLog b/www-client/dillo/ChangeLog
index b8f2aec272eb..c2bc2bc3ace2 100644
--- a/www-client/dillo/ChangeLog
+++ b/www-client/dillo/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-client/dillo
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.58 2008/01/17 12:39:58 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.59 2008/05/19 23:41:14 truedfx Exp $
+
+ 19 May 2008; Harald van Dijk <truedfx@gentoo.org>
+ +files/dillo-ac_subst.patch, dillo-0.8.6.ebuild:
+ Fix error reported by aclocal (#220511)
17 Jan 2008; Raúl Porcel <armin76@gentoo.org> -dillo-0.8.5-r1.ebuild,
-dillo-0.8.5-r2.ebuild, -dillo-0.8.5-r3.ebuild:
diff --git a/www-client/dillo/dillo-0.8.6.ebuild b/www-client/dillo/dillo-0.8.6.ebuild
index 09f187492806..b4f364a01d70 100644
--- a/www-client/dillo/dillo-0.8.6.ebuild
+++ b/www-client/dillo/dillo-0.8.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-0.8.6.ebuild,v 1.12 2008/01/10 09:02:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-0.8.6.ebuild,v 1.13 2008/05/19 23:41:14 truedfx Exp $
inherit flag-o-matic eutils autotools
@@ -31,6 +31,7 @@ src_unpack() {
epatch ../${DILLO_I18N_P}.diff
epatch "${FILESDIR}"/${PN}-build-fix.patch
epatch "${FILESDIR}"/${PN}-asneeded.patch
+ epatch "${FILESDIR}"/${PN}-ac_subst.patch
AT_M4DIR="${S}/m4" eautoreconf
if [ "${DILLO_ICONSET}" = "kde" ]
diff --git a/www-client/dillo/files/dillo-ac_subst.patch b/www-client/dillo/files/dillo-ac_subst.patch
new file mode 100644
index 000000000000..0c5e39dc89ad
--- /dev/null
+++ b/www-client/dillo/files/dillo-ac_subst.patch
@@ -0,0 +1,17 @@
+
+ AC_SUBST only takes a single variable name, so the below line is
+ broken. It is also unnecessary and has already been removed upstream
+ in the dillo2 branch.
+
+ http://bugs.gentoo.org/220511, reported by Christian Lerrahn
+
+--- dillo-0.8.6/configure.in
++++ dillo-0.8.6/configure.in
+@@ -427,7 +427,6 @@
+ AC_SUBST(LIBFLTK_CXXFLAGS)
+ AC_SUBST(LIBFLTK_LIBS)
+ AC_SUBST(datadir)
+-AC_SUBST(src doc bin util lib)
+
+ AC_OUTPUT(Makefile dpip/Makefile dpid/Makefile dpi/Makefile doc/Makefile src/Makefile src/IO/Makefile)
+