Version bumped.

8 files changed, 178 insertions, 30 deletions

diff --git a/net-www/dillo/ChangeLog b/net-www/dillo/ChangeLog
index a97047b2d148..f52c03486931 100644
--- a/net-www/dillo/ChangeLog
+++ b/net-www/dillo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/dillo
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/dillo/ChangeLog,v 1.44 2004/06/25 00:51:44 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/dillo/ChangeLog,v 1.45 2004/07/08 16:31:46 usata Exp $
+
+*dillo-0.8.0-r5 (09 Jul 2004)
+
+  09 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> -dillo-0.7.3-r6.ebuild,
+  +dillo-0.8.0-r5.ebuild, +dillo-0.8.2.ebuild:
+  Version bumped.
 
   17 Jun 2004; Jason Wever <weeve@gentoo.org> dillo-0.7.3-r7.ebuild:
   Stable on sparc.
diff --git a/net-www/dillo/Manifest b/net-www/dillo/Manifest
index ffa5877e350d..6f9f19a82af9 100644
--- a/net-www/dillo/Manifest
+++ b/net-www/dillo/Manifest
@@ -1,10 +1,12 @@
-MD5 f09c6b3f172553b8d8e957840c7e1324 dillo-0.8.1.ebuild 3545
-MD5 77d404ee293812433652719dd67eff04 dillo-0.7.3-r7.ebuild 3089
-MD5 90f000d462f9925d24e7cbeba6e34579 dillo-0.8.0-r4.ebuild 3425
 MD5 26d1b18f460d6b9d633932f62564df47 ChangeLog 7143
+MD5 90f000d462f9925d24e7cbeba6e34579 dillo-0.8.0-r4.ebuild 3425
+MD5 66bc975cf394f060b1ba755c0ecd8e7b dillo-0.8.2.ebuild 3545
+MD5 77d404ee293812433652719dd67eff04 dillo-0.7.3-r7.ebuild 3089
+MD5 fc73ec647383cfb15c2fb0aef861a77e dillo-0.8.0-r5.ebuild 3425
 MD5 3ff31b5479b2a0244f5711fff3155aed metadata.xml 221
-MD5 710c4bb98f1345a544588817c79a42dd dillo-0.7.3-r6.ebuild 3089
+MD5 f09c6b3f172553b8d8e957840c7e1324 dillo-0.8.1.ebuild 3545
+MD5 ebe1975525013c493f067b3ebbc8aecb files/digest-dillo-0.8.0-r4 226
 MD5 22aadb5a0dea9b874a84ed79c5187f4c files/digest-dillo-0.8.1 220
-MD5 82620923b2ae1db72422bf38bc27646d files/digest-dillo-0.7.3-r6 226
 MD5 e257387d2c71e79a44b93b59e5240db3 files/digest-dillo-0.7.3-r7 226
-MD5 ebe1975525013c493f067b3ebbc8aecb files/digest-dillo-0.8.0-r4 226
+MD5 95d879f408936b0b61006a6a55a3f68d files/digest-dillo-0.8.0-r5 226
+MD5 999857d7ee9a88dd460d44fa95e5b9d5 files/digest-dillo-0.8.2 220
diff --git a/net-www/dillo/dillo-0.8.0-r4.ebuild b/net-www/dillo/dillo-0.8.0-r4.ebuild
index 8258589c4731..2917e3abb765 100644
--- a/net-www/dillo/dillo-0.8.0-r4.ebuild
+++ b/net-www/dillo/dillo-0.8.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/dillo/dillo-0.8.0-r4.ebuild,v 1.2 2004/06/25 00:51:44 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/dillo/dillo-0.8.0-r4.ebuild,v 1.3 2004/07/08 16:31:46 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"
+KEYWORDS="x86 ~ppc ~sparc alpha ~hppa ~amd64"
 IUSE="ipv6 kde gnome mozilla nls ssl truetype"
 
 DEPEND="=x11-libs/gtk+-1.2*
diff --git a/net-www/dillo/dillo-0.7.3-r6.ebuild b/net-www/dillo/dillo-0.8.0-r5.ebuild
index 3484e6c5146e..a5a6b75664e4 100644
--- a/net-www/dillo/dillo-0.7.3-r6.ebuild
+++ b/net-www/dillo/dillo-0.8.0-r5.ebuild
@@ -1,34 +1,33 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/dillo/dillo-0.7.3-r6.ebuild,v 1.4 2004/06/25 00:51:44 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/dillo/dillo-0.8.0-r5.ebuild,v 1.1 2004/07/08 16:31:46 usata Exp $
 
 inherit flag-o-matic eutils
 
-S2=${WORKDIR}/dillo-gentoo-extras-patch3
-DILLO_I18N_MISC=${P}-i18n-misc-20040507
+S2=${WORKDIR}/dillo-gentoo-extras-patch4
+DILLO_I18N_P="${P}-i18n-misc-20040627"
 
 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-patch3.tar.bz2
-	http://teki.jpn.ph/pc/software/${DILLO_I18N_MISC}.diff.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"
-IUSE="ipv6 kde gnome mozilla truetype ssl nls"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+IUSE="ipv6 kde gnome mozilla nls ssl truetype"
 
 DEPEND="=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 )
-	truetype? ( virtual/xft )"
+	ssl? ( dev-libs/openssl )"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ../${DILLO_I18N_MISC}.diff
+	epatch ../${DILLO_I18N_P}.diff
 
 	if [ "${DILLO_ICONSET}" = "kde" ]
 	then
@@ -42,6 +41,10 @@ src_unpack() {
 	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"
@@ -50,6 +53,10 @@ src_unpack() {
 	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
@@ -58,26 +65,23 @@ src_unpack() {
 src_compile() {
 	replace-flags "-O2 -mcpu=k6" "-O2 -mcpu=pentium"
 
-	if use truetype ; then
-		CPPFLAGS="${CPPFLAGS} -I/usr/include/freetype2"
-		append-ldflags -L/usr/X11R6/lib -lXft
-		export CPPFLAGS
-	fi
-
 	econf `use_enable ipv6` \
 		`use_enable nls` \
 		`use_enable ssl` \
 		`use_enable truetype anti-alias` \
+		--enable-tabs \
 		--enable-meta-refresh \
-		--enable-web-search \
+		--enable-user-agent \
 		|| die
-	emake -j1 || emake -j1 || die
+	emake || make || die
 }
 
 src_install() {
 	dodir /etc  /usr/share/icons/${PN}
 	einstall || die
 
+	dosed /etc/dpidrc
+
 	dodoc AUTHORS COPYING ChangeLog* INSTALL README NEWS
 	docinto doc
 	dodoc doc/*.txt doc/README
@@ -96,12 +100,18 @@ pkg_postinst() {
 	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
diff --git a/net-www/dillo/dillo-0.8.2.ebuild b/net-www/dillo/dillo-0.8.2.ebuild
new file mode 100644
index 000000000000..0c674356f1f4
--- /dev/null
+++ b/net-www/dillo/dillo-0.8.2.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/dillo/dillo-0.8.2.ebuild,v 1.1 2004/07/08 16:31:46 usata Exp $
+
+inherit flag-o-matic eutils
+
+S2=${WORKDIR}/dillo-gentoo-extras-patch4
+DILLO_I18N_P="${P}-i18n-20040708"
+
+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"
+MISC_IUSE="nls ssl truetype ssl"
+#IUSE="${MISC_IUSE} ipv6 kde gnome mozilla"
+IUSE="ipv6 kde gnome mozilla"
+
+DEPEND="=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 )
+
+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
+}
+
+src_compile() {
+	replace-flags "-O2 -mcpu=k6" "-O2 -mcpu=pentium"
+
+	local myconf
+	myconf="`use_enable nls`
+		`use_enable ssl`
+		`use_enable truetype anti-alias`
+		--enable-tabs
+		--enable-meta-refresh
+		--enable-user-agent"
+
+	#myconf="${myconf} `use_enable ipv6`"
+	myconf="`use_enable ipv6`"
+
+	econf ${myconf} || die
+	emake || make || die
+}
+
+src_install() {
+	dodir /etc  /usr/share/icons/${PN}
+	einstall || 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/net-www/dillo/files/digest-dillo-0.7.3-r6 b/net-www/dillo/files/digest-dillo-0.7.3-r6
deleted file mode 100644
index c471fc5e5245..000000000000
--- a/net-www/dillo/files/digest-dillo-0.7.3-r6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 896f4d8c752b86376bfb445740f01470 dillo-0.7.3.tar.bz2 345295
-MD5 3bc2370883e41905791f94f0b8e2f79b dillo-gentoo-extras-patch3.tar.bz2 86929
-MD5 da009bf1ebf3c65c3aefdba5444a6d42 dillo-0.7.3-i18n-misc-20040507.diff.bz2 249690
diff --git a/net-www/dillo/files/digest-dillo-0.8.0-r5 b/net-www/dillo/files/digest-dillo-0.8.0-r5
new file mode 100644
index 000000000000..9e39dcc28256
--- /dev/null
+++ b/net-www/dillo/files/digest-dillo-0.8.0-r5
@@ -0,0 +1,3 @@
+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/net-www/dillo/files/digest-dillo-0.8.2 b/net-www/dillo/files/digest-dillo-0.8.2
new file mode 100644
index 000000000000..d863df9c0ac5
--- /dev/null
+++ b/net-www/dillo/files/digest-dillo-0.8.2
@@ -0,0 +1,3 @@
+MD5 4322f339aa4a4a2a4ba9a11444df9c67 dillo-0.8.2.tar.bz2 409961
+MD5 0d0bc7cdd39dc66b80280f73d74bfeaf dillo-gentoo-extras-patch4.tar.bz2 98800
+MD5 25ffc552635910513d64e7529dddf9db dillo-0.8.2-i18n-20040708.diff.bz2 78058