Updated i18n-misc patch, and appended -O to CFLAGS (bug #86442). Marked 0.8.4-r1 stable on x86 and ppc

(Portage version: 2.0.51.19)

6 files changed, 48 insertions, 37 deletions

diff --git a/www-client/dillo/ChangeLog b/www-client/dillo/ChangeLog
index 1d17cbde0d7d..505d19a40687 100644
--- a/www-client/dillo/ChangeLog
+++ b/www-client/dillo/ChangeLog
@@ -1,8 +1,15 @@
 # ChangeLog for www-client/dillo
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.19 2005/03/19 13:16:02 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.20 2005/04/06 04:32:22 usata Exp $
 
-  19 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> dillo-0.8.4.ebuild:
+*dillo-0.8.4-r2 (06 Apr 2005)
+
+  06 Apr 2005; Mamoru KOMACHI <usata@gentoo.org> -dillo-0.8.0-r5.ebuild,
+  dillo-0.8.4-r1.ebuild, +dillo-0.8.4-r2.ebuild:
+  Updated i18n-misc patch, and appended -O to CFLAGS (bug #86442).
+  Marked 0.8.4-r1 stable on x86 and ppc.
+
+  19 Mar 2005; Bryan ?stergaard <kloeri@gentoo.org> dillo-0.8.4.ebuild:
   Stable on alpha.
 
   24 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> dillo-0.8.4.ebuild:
@@ -26,7 +33,7 @@
   08 Jan 2005; Jason Wever <weeve@gentoo.org> dillo-0.8.3-r4.ebuild:
   Stable on sparc wrt bug #76665.
 
-  08 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> dillo-0.8.3-r4.ebuild:
+  08 Jan 2005; Bryan ?stergaard <kloeri@gentoo.org> dillo-0.8.3-r4.ebuild:
   Stable on alpha, bug 76665.
 
   08 Jan 2005; Lars Weiler <pylon@gentoo.org> dillo-0.8.3-r4.ebuild:
diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest
index 074b317bd114..320cca336492 100644
--- a/www-client/dillo/Manifest
+++ b/www-client/dillo/Manifest
@@ -1,23 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 4b6317a8840a555e751a3b86b1eafa19 ChangeLog 10401
-MD5 3b8ac4260193f9a184cec89f3a85a2d3 dillo-0.8.3-r4.ebuild 3638
-MD5 3ff31b5479b2a0244f5711fff3155aed metadata.xml 221
+MD5 f21b4ddabc98e88e9a1417336531a37e dillo-0.8.0-r5.ebuild 3407
+MD5 af09cc4d7c03fb8cac68e368d2abefc4 dillo-0.8.4.ebuild 3575
 MD5 2e853f9207a33d2fd352132561c48e6a dillo-0.7.3-r7.ebuild 3072
+MD5 3ff31b5479b2a0244f5711fff3155aed metadata.xml 221
+MD5 3b8ac4260193f9a184cec89f3a85a2d3 dillo-0.8.3-r4.ebuild 3638
 MD5 6153e2433be181ed3eb6c6babc00abfd dillo-0.8.4-r1.ebuild 3583
-MD5 af09cc4d7c03fb8cac68e368d2abefc4 dillo-0.8.4.ebuild 3575
-MD5 f21b4ddabc98e88e9a1417336531a37e dillo-0.8.0-r5.ebuild 3407
-MD5 e257387d2c71e79a44b93b59e5240db3 files/digest-dillo-0.7.3-r7 226
+MD5 13aa3dfad9537dd4bb6bd14fc1b7b45c dillo-0.8.4-r2.ebuild 3583
 MD5 95d879f408936b0b61006a6a55a3f68d files/digest-dillo-0.8.0-r5 226
 MD5 47c572d76913ed4ec3608d3f840f9c67 files/digest-dillo-0.8.4 226
+MD5 e257387d2c71e79a44b93b59e5240db3 files/digest-dillo-0.7.3-r7 226
 MD5 e5d887ebabc4b20dc1ba0d268bb90291 files/digest-dillo-0.8.3-r4 226
 MD5 b86fffd43a8ba3b6791d459ad012a2e3 files/digest-dillo-0.8.4-r1 226
 MD5 7750091e1346c986eeb58aef81297fd0 files/dillo-format-string-vulnerability.diff 787
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD4DBQFCPDRGugEuf3OQ0akRAm3IAJiHvimw5JpSbrazQr5kaNdIuJotAJ4lhgUP
-Tzt76tnS3uLIcoTccXQykA==
-=7uVX
------END PGP SIGNATURE-----
+MD5 cec29ab3305c35980bc16ecc1eac7b8d files/digest-dillo-0.8.4-r2 226
diff --git a/www-client/dillo/dillo-0.8.4-r1.ebuild b/www-client/dillo/dillo-0.8.4-r1.ebuild
index d453017e2066..fe5e621bf278 100644
--- a/www-client/dillo/dillo-0.8.4-r1.ebuild
+++ b/www-client/dillo/dillo-0.8.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-0.8.4-r1.ebuild,v 1.1 2005/02/22 16:21:34 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-0.8.4-r1.ebuild,v 1.2 2005/04/06 04:32:22 usata Exp $
 
 inherit flag-o-matic eutils
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.dillo.org/download/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~mips ~arm ~ppc64"
+KEYWORDS="x86 ppc ~sparc ~alpha ~hppa ~amd64 ~mips ~arm ~ppc64"
 MISC_IUSE="nls truetype"
 IUSE="${MISC_IUSE} ipv6 ssl"
 
@@ -70,6 +70,7 @@ src_unpack() {
 
 src_compile() {
 	replace-flags "-O2 -mcpu=k6" "-O2 -mcpu=pentium"
+	append-flags "-O"
 
 	local myconf
 
diff --git a/www-client/dillo/dillo-0.8.0-r5.ebuild b/www-client/dillo/dillo-0.8.4-r2.ebuild
index 5ffc50411bd9..5e9c2f923c06 100644
--- a/www-client/dillo/dillo-0.8.0-r5.ebuild
+++ b/www-client/dillo/dillo-0.8.4-r2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-0.8.0-r5.ebuild,v 1.3 2005/01/06 16:24:50 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-0.8.4-r2.ebuild,v 1.1 2005/04/06 04:32:22 usata Exp $
 
 inherit flag-o-matic eutils
 
 S2=${WORKDIR}/dillo-gentoo-extras-patch4
-DILLO_I18N_P="${P}-i18n-misc-20040627"
+DILLO_I18N_P="${P}-i18n-misc-20050402"
 
 DESCRIPTION="Lean GTK+-based web browser"
 HOMEPAGE="http://www.dillo.org/"
@@ -15,14 +15,18 @@ SRC_URI="http://www.dillo.org/download/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha ~hppa amd64 arm"
-IUSE="ipv6 nls ssl truetype"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~mips ~arm ~ppc64"
+MISC_IUSE="nls truetype"
+IUSE="${MISC_IUSE} ipv6 ssl"
 
-DEPEND="=x11-libs/gtk+-1.2*
+RDEPEND="=x11-libs/gtk+-1.2*
 	>=media-libs/jpeg-6b
 	>=sys-libs/zlib-1.1.3
 	>=media-libs/libpng-1.2.1
 	ssl? ( dev-libs/openssl )"
+DEPEND="sys-devel/autoconf
+	sys-devel/automake
+	${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
@@ -60,25 +64,32 @@ src_unpack() {
 	else
 		einfo "Using default Dillo icon set"
 	fi
+
+	cd ${S}; sh autogen.sh || die
 }
 
 src_compile() {
 	replace-flags "-O2 -mcpu=k6" "-O2 -mcpu=pentium"
+	append-flags "-O"
+
+	local myconf
+
+	myconf="$(use_enable nls)
+		$(use_enable truetype anti-alias)
+		--enable-tabs
+		--enable-meta-refresh"
+
+	myconf="${myconf}
+		$(use_enable ipv6)
+		$(use_enable ssl)"
 
-	econf `use_enable ipv6` \
-		`use_enable nls` \
-		`use_enable ssl` \
-		`use_enable truetype anti-alias` \
-		--enable-tabs \
-		--enable-meta-refresh \
-		--enable-user-agent \
-		|| die
+	econf ${myconf} || die
 	emake || make || die
 }
 
 src_install() {
 	dodir /etc  /usr/share/icons/${PN}
-	einstall || die
+	make DESTDIR=${D} install || die
 
 	dosed /etc/dpidrc
 
diff --git a/www-client/dillo/files/digest-dillo-0.8.0-r5 b/www-client/dillo/files/digest-dillo-0.8.0-r5
deleted file mode 100644
index 9e39dcc28256..000000000000
--- a/www-client/dillo/files/digest-dillo-0.8.0-r5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fa4bdedcd7e76135257d70104efb13db dillo-0.8.0.tar.bz2 396058
-MD5 0d0bc7cdd39dc66b80280f73d74bfeaf dillo-gentoo-extras-patch4.tar.bz2 98800
-MD5 172a3cf29caac0233322d1b9565c99e6 dillo-0.8.0-i18n-misc-20040627.diff.bz2 266034
diff --git a/www-client/dillo/files/digest-dillo-0.8.4-r2 b/www-client/dillo/files/digest-dillo-0.8.4-r2
new file mode 100644
index 000000000000..7e445c6f8e3f
--- /dev/null
+++ b/www-client/dillo/files/digest-dillo-0.8.4-r2
@@ -0,0 +1,3 @@
+MD5 ebf17d6cca1fccc8bc80acdf05e736a3 dillo-0.8.4.tar.bz2 423106
+MD5 0d0bc7cdd39dc66b80280f73d74bfeaf dillo-gentoo-extras-patch4.tar.bz2 98800
+MD5 619a96918345c8b1170ab1f3ed26b3f9 dillo-0.8.4-i18n-misc-20050402.diff.bz2 232098