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
commit4d7a6d14cc3595200b02f3d553066a76ff1394c6 (patch)
treec806ab16a4c2cd2fcd1a14304e9b6585ae77b34b /www-client
parentStable on amd64 and x86. (diff)
downloadhistorical-4d7a6d14cc3595200b02f3d553066a76ff1394c6.tar.gz
historical-4d7a6d14cc3595200b02f3d553066a76ff1394c6.tar.bz2
historical-4d7a6d14cc3595200b02f3d553066a76ff1394c6.zip
Fix error reported by aclocal (#220511)
Package-Manager: portage-2.1.5
Diffstat (limited to 'www-client')
-rw-r--r--www-client/dillo/ChangeLog6
-rw-r--r--www-client/dillo/Manifest15
-rw-r--r--www-client/dillo/dillo-0.8.6.ebuild3
-rw-r--r--www-client/dillo/files/dillo-ac_subst.patch17
4 files changed, 37 insertions, 4 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/Manifest b/www-client/dillo/Manifest
index 3f655e709623..0bc325261528 100644
--- a/www-client/dillo/Manifest
+++ b/www-client/dillo/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX dillo-ac_subst.patch 517 RMD160 277b3d55d7f99ba612eb2263002e4888d62f5d9d SHA1 60ef12ca8217d0370614967d2e74afec1c9d2131 SHA256 753fc722a2947c46ffc2bda6ef84f90c0cd2f880381c874636ea201cb8f4a49a
AUX dillo-asneeded.patch 1894 RMD160 892d979625bb338802d038c370422c33d9501edb SHA1 c6ac90247a6f344cee5dde70dbc55ad6e449b458 SHA256 36069751fe0fd5ecc9e60b387217a7c30da5000ecadc0379f6b39255d7c5f633
AUX dillo-build-fix.patch 631 RMD160 06930ca452554bd4dcc140eb85a9cc9016c4107b SHA1 2eb478e3b05de223c574de925be9d9f1de71f6df SHA256 a6ae597926744dcb48e670da5ee24daade11631ddbca728bc8b2775af9277571
DIST dillo-0.8.6-i18n-misc-20060625.diff.bz2 258290 RMD160 b158236c62f80d7df1273863ef958704fdd7e340 SHA1 c9aabf6b5c0e4f3d3d963b0471b66724f8e00c20 SHA256 872accdc2828eb564f4e30d9471e0c52ce48d957a196d1671cd3067b7a454de3
DIST dillo-0.8.6.tar.bz2 441739 RMD160 062cff85b330a5b443ddc81a356e81f930677cbb SHA1 ee03b11ba6b75d3180ca906d8275bd35e8765995 SHA256 47e695a5d370eb656f5e41eeb917ad6281b1559bf60172c9eca89b5518a9f9b9
DIST dillo-gentoo-extras-patch4.tar.bz2 98800 RMD160 2c04bf1b7f2763e748e2fc4d6848e0d82f680525 SHA1 7011f67113b1f811d94aa88e5185cbd1daf8bd8d SHA256 25871b318ffc046eebe9be100f5d1027e649b94dd4d3e0bfb36ec6d139cded05
-EBUILD dillo-0.8.6.ebuild 3679 RMD160 f8c72b693bac54643b85bdac20d207eb37a8bfb9 SHA1 574797f69368d2885a700975977e9e283fd32f23 SHA256 1ca0cb4ed581e37a7cb0ddd9f36a4390057301711205bc711936bfcf59381144
-MISC ChangeLog 15293 RMD160 bde0775beef201b408f3513149a7375950c05807 SHA1 9e3c81f14558bfdbb8c59815956d049fef7290a5 SHA256 1a86c4caf6b511b29a4355a8f684c8537d4c88df353ae05f3df2ef10139c3c27
+EBUILD dillo-0.8.6.ebuild 3723 RMD160 b198f29d565878152bfef0a63a7efaeb73a0d7a0 SHA1 7ef789985f47b02905fac69d734baa78dde1afda SHA256 6fec12fedb84793d38050aca7d6a7e83be0dc378f8b027c5862b145e1409c81f
+MISC ChangeLog 15439 RMD160 e8d690727873a3c69f794479ff35557807305602 SHA1 81ffd5454b842dfabc33dfe36d7a107c793f9dad SHA256 d08165f0defcc416e9489ff763bfd286b5779306c3a0e65b8463b761e987836a
MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgyEE0ACgkQwnQyISwouHwLQgCdHfkd0dxcn551be/VoOfwKAJp
+vkYAniyxlftRrxnUeci1DUyH/M1SbvHG
+=U0QK
+-----END PGP SIGNATURE-----
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)
+