Fixed bug #73312 and updated i18n-misc patch.

4 files changed, 146 insertions, 5 deletions

diff --git a/www-client/dillo/ChangeLog b/www-client/dillo/ChangeLog
index 663845af80a1..c36f0e16a3c4 100644
--- a/www-client/dillo/ChangeLog
+++ b/www-client/dillo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/dillo
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.5 2004/12/04 05:09:34 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.6 2004/12/07 12:09:42 usata Exp $
+
+*dillo-0.8.3-r3 (07 Dec 2004)
+
+  07 Dec 2004; Mamoru KOMACHI <usata@gentoo.org> +dillo-0.8.3-r3.ebuild:
+  Fixed bug #73312 and updated i18n-misc patch.
 
 *dillo-0.8.3-r2 (04 Dec 2004)
 
diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest
index 8d619f99ad51..48472bea14d9 100644
--- a/www-client/dillo/Manifest
+++ b/www-client/dillo/Manifest
@@ -1,22 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 4a972bfa856c9779ffcd90db73867b42 ChangeLog 8613
+MD5 e6bf9a32fd3b7290cb58e2e2c252f220 ChangeLog 8766
 MD5 619fe4d656815f4dfd82e327b3185135 dillo-0.8.0-r5.ebuild 3407
 MD5 def12c88d88c0d0a3c71b14ce95b9ae5 dillo-0.8.3-r1.ebuild 3483
 MD5 7f2bb92ac717537bf6e4bf64e0d14243 dillo-0.7.3-r7.ebuild 3071
 MD5 558d10e8224da11b0cc6faf9b08ff1f2 dillo-0.8.3.ebuild 3475
 MD5 3ff31b5479b2a0244f5711fff3155aed metadata.xml 221
 MD5 e7869030dca341f4e829868f982bdf45 dillo-0.8.3-r2.ebuild 3483
+MD5 f54e79945e25aafb737b065d6fc28485 dillo-0.8.3-r3.ebuild 3576
 MD5 95d879f408936b0b61006a6a55a3f68d files/digest-dillo-0.8.0-r5 226
 MD5 a8401f3ca5314e42d67967160f4c8e3f files/digest-dillo-0.8.3-r1 226
 MD5 e257387d2c71e79a44b93b59e5240db3 files/digest-dillo-0.7.3-r7 226
 MD5 ba28c8a3ac90eda9150e386ab318bbcd files/digest-dillo-0.8.3 220
 MD5 70b691dea1f087e974f897af445d63ee files/digest-dillo-0.8.3-r2 226
+MD5 e5d887ebabc4b20dc1ba0d268bb90291 files/digest-dillo-0.8.3-r3 226
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBsUaSVWNWqTUmv+0RAuuoAJ0UzUuvAWFrsQ4r3T9R/TEbXDwqNACcDcqF
-rwvFponOvfx+5iX1hzutMEY=
-=GJwd
+iD8DBQFBtZvbVWNWqTUmv+0RAvvrAKCbMFzhzf9PEH71YQJpkmjsKOIpKQCeJBlL
+937eYXUw3orGKWEtXQFkcyQ=
+=BLMn
 -----END PGP SIGNATURE-----
diff --git a/www-client/dillo/dillo-0.8.3-r3.ebuild b/www-client/dillo/dillo-0.8.3-r3.ebuild
new file mode 100644
index 000000000000..b6511ccea3ea
--- /dev/null
+++ b/www-client/dillo/dillo-0.8.3-r3.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-0.8.3-r3.ebuild,v 1.1 2004/12/07 12:09:42 usata Exp $
+
+inherit flag-o-matic eutils
+
+S2=${WORKDIR}/dillo-gentoo-extras-patch4
+DILLO_I18N_P="${P}-i18n-misc-20041206"
+
+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"
+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/files/digest-dillo-0.8.3-r3 b/www-client/dillo/files/digest-dillo-0.8.3-r3
new file mode 100644
index 000000000000..ec9bf532eb21
--- /dev/null
+++ b/www-client/dillo/files/digest-dillo-0.8.3-r3
@@ -0,0 +1,3 @@
+MD5 be772ec9361bcc01515ae0da61de9bda dillo-0.8.3.tar.bz2 418714
+MD5 0d0bc7cdd39dc66b80280f73d74bfeaf dillo-gentoo-extras-patch4.tar.bz2 98800
+MD5 0eca06ae9a11b6ffa3c506591c1f4497 dillo-0.8.3-i18n-misc-20041206.diff.bz2 216604