Updated i18n-misc patch. Marked 0.8.4 stable on x86 and ppc.

(Portage version: 2.0.51-r15)

5 files changed, 147 insertions, 5 deletions

diff --git a/www-client/dillo/ChangeLog b/www-client/dillo/ChangeLog
index 3bd2d349f72a..5af28e3d9533 100644
--- a/www-client/dillo/ChangeLog
+++ b/www-client/dillo/ChangeLog
@@ -1,6 +1,12 @@
 # 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.16 2005/02/06 17:34:27 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.17 2005/02/22 16:21:34 usata Exp $
+
+*dillo-0.8.4-r1 (23 Feb 2005)
+
+  23 Feb 2005; Mamoru KOMACHI <usata@gentoo.org> +dillo-0.8.4-r1.ebuild,
+  dillo-0.8.4.ebuild:
+  Updated i18n-misc patch. Marked 0.8.4 stable on x86 and ppc.
 
   06 Feb 2005; Markus Rothe <corsair@gentoo.org> dillo-0.8.3-r4.ebuild:
   Stable on ppc64
diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest
index a38e7799a16f..86323ffcdbd4 100644
--- a/www-client/dillo/Manifest
+++ b/www-client/dillo/Manifest
@@ -1,11 +1,13 @@
 MD5 d70026b3ce357095f9943c70614cdcf0 ChangeLog 10026
 MD5 2e853f9207a33d2fd352132561c48e6a dillo-0.7.3-r7.ebuild 3072
 MD5 f21b4ddabc98e88e9a1417336531a37e dillo-0.8.0-r5.ebuild 3407
-MD5 77ea87efe5a8f279d242f461f4db8207 dillo-0.8.4.ebuild 3580
 MD5 3ff31b5479b2a0244f5711fff3155aed metadata.xml 221
 MD5 3b8ac4260193f9a184cec89f3a85a2d3 dillo-0.8.3-r4.ebuild 3638
+MD5 77ea87efe5a8f279d242f461f4db8207 dillo-0.8.4.ebuild 3580
+MD5 aff82f1cdae28decc3003ce2bedf7436 dillo-0.8.4-r1.ebuild 3580
 MD5 e257387d2c71e79a44b93b59e5240db3 files/digest-dillo-0.7.3-r7 226
 MD5 95d879f408936b0b61006a6a55a3f68d files/digest-dillo-0.8.0-r5 226
-MD5 47c572d76913ed4ec3608d3f840f9c67 files/digest-dillo-0.8.4 226
 MD5 e5d887ebabc4b20dc1ba0d268bb90291 files/digest-dillo-0.8.3-r4 226
+MD5 47c572d76913ed4ec3608d3f840f9c67 files/digest-dillo-0.8.4 226
 MD5 7750091e1346c986eeb58aef81297fd0 files/dillo-format-string-vulnerability.diff 787
+MD5 b86fffd43a8ba3b6791d459ad012a2e3 files/digest-dillo-0.8.4-r1 226
diff --git a/www-client/dillo/dillo-0.8.4-r1.ebuild b/www-client/dillo/dillo-0.8.4-r1.ebuild
new file mode 100644
index 000000000000..d453017e2066
--- /dev/null
+++ b/www-client/dillo/dillo-0.8.4-r1.ebuild
@@ -0,0 +1,131 @@
+# 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 $
+
+inherit flag-o-matic eutils
+
+S2=${WORKDIR}/dillo-gentoo-extras-patch4
+DILLO_I18N_P="${P}-i18n-misc-20050219"
+
+DESCRIPTION="Lean GTK+-based web browser"
+HOMEPAGE="http://www.dillo.org/"
+SRC_URI="http://www.dillo.org/download/${P}.tar.bz2
+	mirror://gentoo/dillo-gentoo-extras-patch4.tar.bz2
+	http://teki.jpn.ph/pc/software/${DILLO_I18N_P}.diff.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~mips ~arm ~ppc64"
+MISC_IUSE="nls truetype"
+IUSE="${MISC_IUSE} ipv6 ssl"
+
+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}
+	cd ${S}
+	epatch ../${DILLO_I18N_P}.diff
+
+	if [ "${DILLO_ICONSET}" = "kde" ]
+	then
+		einfo "Using Konqueror style icon set"
+		cp ${S2}/pixmaps.konq.h ${S}/src/pixmaps.h
+	elif [ "${DILLO_ICONSET}" = "gnome" ]
+	then
+		einfo "Using Ximian style icon set"
+		cp ${S2}/pixmaps.ximian.h ${S}/src/pixmaps.h
+	elif [ "${DILLO_ICONSET}" = "mozilla" ]
+	then
+		einfo "Using Netscape style icon set"
+		cp ${S2}/pixmaps.netscape.h ${S}/src/pixmaps.h
+	elif [ "${DILLO_ICONSET}" = "cobalt" ]
+	then
+		einfo "Using Cobalt style icon set"
+		cp ${S2}/pixmaps.cobalt.h ${S}/src/pixmaps.h
+	elif [ "${DILLO_ICONSET}" = "bold" ]
+	then
+		einfo "Using bold style icon set"
+		cp ${S2}/pixmaps.bold.h ${S}/src/pixmaps.h
+	elif [ "${DILLO_ICONSET}" = "trans" ]
+	then
+		einfo "Using transparent style icon set"
+		cp ${S2}/pixmaps.trans.h ${S}/src/pixmaps.h
+	elif [ "${DILLO_ICONSET}" = "trad" ]
+	then
+		einfo "Using the traditional icon set"
+		cp ${S2}/pixmaps.trad.h ${S}/src/pixmaps.h
+	else
+		einfo "Using default Dillo icon set"
+	fi
+
+	cd ${S}; sh autogen.sh || die
+}
+
+src_compile() {
+	replace-flags "-O2 -mcpu=k6" "-O2 -mcpu=pentium"
+
+	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 ${myconf} || die
+	emake || make || die
+}
+
+src_install() {
+	dodir /etc  /usr/share/icons/${PN}
+	make DESTDIR=${D} install || die
+
+	dosed /etc/dpidrc
+
+	dodoc AUTHORS COPYING ChangeLog* INSTALL README NEWS
+	docinto doc
+	dodoc doc/*.txt doc/README
+
+	cp ${S2}/icons/*.png ${D}/usr/share/icons/${PN}
+}
+
+pkg_postinst() {
+	einfo "This ebuild for dillo comes with different toolbar icons"
+	einfo "If you want mozilla style icons then try"
+	einfo "	DILLO_ICONSET=\"mozilla\" emerge dillo"
+	einfo
+	einfo "If you prefer konqueror style icons then try"
+	einfo "	DILLO_ICONSET=\"kde\" emerge dillo"
+	einfo
+	einfo "If you prefer ximian gnome style icons then try"
+	einfo "	DILLO_ICONSET=\"gnome\" emerge dillo"
+	einfo
+	einfo "If you prefer cobalt style icons then try"
+	einfo "	DILLO_ICONSET=\"cobalt\" emerge dillo"
+	einfo
+	einfo "If you prefer bold style icons then try"
+	einfo "	DILLO_ICONSET=\"bold\" emerge dillo"
+	einfo
+	einfo "If you prefer transparent style icons then try"
+	einfo "	DILLO_ICONSET=\"trans\" emerge dillo"
+	einfo
+	einfo "If you prefer the traditional icons then try"
+	einfo "	DILLO_ICONSET=\"trad\" emerge dillo"
+	einfo
+	einfo "If the DILLO_ICONSET variable is not set, you will get the"
+	einfo "default iconset"
+	einfo
+	einfo "To see what the icons look like, please point your browser to:"
+	einfo "http://dillo.auriga.wearlab.de/Icons/"
+	einfo
+}
diff --git a/www-client/dillo/dillo-0.8.4.ebuild b/www-client/dillo/dillo-0.8.4.ebuild
index 57c6a0506720..4e7244afbd76 100644
--- a/www-client/dillo/dillo-0.8.4.ebuild
+++ b/www-client/dillo/dillo-0.8.4.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.ebuild,v 1.1 2005/01/18 12:53:35 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-0.8.4.ebuild,v 1.2 2005/02/22 16:21:34 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"
 
diff --git a/www-client/dillo/files/digest-dillo-0.8.4-r1 b/www-client/dillo/files/digest-dillo-0.8.4-r1
new file mode 100644
index 000000000000..b536d54b8799
--- /dev/null
+++ b/www-client/dillo/files/digest-dillo-0.8.4-r1
@@ -0,0 +1,3 @@
+MD5 ebf17d6cca1fccc8bc80acdf05e736a3 dillo-0.8.4.tar.bz2 423106
+MD5 0d0bc7cdd39dc66b80280f73d74bfeaf dillo-gentoo-extras-patch4.tar.bz2 98800
+MD5 5fd62c111a3b2046bcc0c1f776f83703 dillo-0.8.4-i18n-misc-20050219.diff.bz2 229315