Version bumped. Closing bug #43634

5 files changed, 141 insertions, 5 deletions

diff --git a/net-www/dillo/ChangeLog b/net-www/dillo/ChangeLog
index 36e86ac0f7d6..91fd0bd5ffa3 100644
--- a/net-www/dillo/ChangeLog
+++ b/net-www/dillo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/dillo
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/dillo/ChangeLog,v 1.30 2004/01/23 14:14:22 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/dillo/ChangeLog,v 1.31 2004/03/26 19:39:13 usata Exp $
+
+*dillo-0.8.0 (27 Mar 2004)
+
+  27 Mar 2004; Mamoru KOMACHI <usata@gentoo.org> dillo-0.8.0.ebuild,
+  files/dillo-0.8.0-i18n-misc-gentoo.diff:
+  Version bumped. Closing bug #43634
 
   23 Jan 2004; <gustavoz@gentoo.org> dillo-0.7.3-r4.ebuild:
   stable on sparc
diff --git a/net-www/dillo/Manifest b/net-www/dillo/Manifest
index d0830e6d6e57..f0b67b93b136 100644
--- a/net-www/dillo/Manifest
+++ b/net-www/dillo/Manifest
@@ -1,9 +1,12 @@
-MD5 f807048c55528272281d7fb83b90581b ChangeLog 4907
 MD5 2c1ebd12393e735f832ba1c378bbfa2a dillo-0.7.3-r3.ebuild 3245
-MD5 171e30e0769dfcb01021ce7b3e9b103d dillo-0.7.3-r4.ebuild 3244
 MD5 de878312c25a321cd4a35a7a8b0546f1 dillo-0.7.3-r5.ebuild 3247
+MD5 171e30e0769dfcb01021ce7b3e9b103d dillo-0.7.3-r4.ebuild 3244
+MD5 f807048c55528272281d7fb83b90581b ChangeLog 4907
 MD5 238ab30c5039932b4b6c93a019a79fa8 dillo-0.7.3-r1.ebuild 2593
+MD5 4399b22b63137fbd631f44413b9f6090 dillo-0.8.0.ebuild 2909
+MD5 228c86b4db650b4d95d9ccbe853cecce files/digest-dillo-0.7.3-r1 142
+MD5 67d7bc742594fdc4a7c68caf1e160992 files/digest-dillo-0.7.3-r5 226
 MD5 5a68f4d28dc193393eee32ad8e9e70ea files/digest-dillo-0.7.3-r3 228
 MD5 4a9abe992ee64111264ab8eee9c24724 files/digest-dillo-0.7.3-r4 226
-MD5 67d7bc742594fdc4a7c68caf1e160992 files/digest-dillo-0.7.3-r5 226
-MD5 228c86b4db650b4d95d9ccbe853cecce files/digest-dillo-0.7.3-r1 142
+MD5 457776a031aa84e244a73ff4b428d470 files/digest-dillo-0.8.0 226
+MD5 435ba2a251bccbda6ab83c6e3193b1af files/digest-dillo-0.8.0.bak 211
diff --git a/net-www/dillo/dillo-0.8.0.ebuild b/net-www/dillo/dillo-0.8.0.ebuild
new file mode 100644
index 000000000000..d2b951c67bd3
--- /dev/null
+++ b/net-www/dillo/dillo-0.8.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/dillo/dillo-0.8.0.ebuild,v 1.1 2004/03/26 19:39:13 usata Exp $
+
+# TODO:	add GTK+ 2 patch
+#	stop 'main.c:333: main: get_command failed' warning when
+#	loading bookmark
+
+inherit flag-o-matic eutils
+
+S2=${WORKDIR}/dillo-gentoo-extras-patch3
+DILLO_I18N_P="${P}-i18n-misc-20040313"
+
+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_P}.diff.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+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 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ../${DILLO_I18N_P}.diff
+	epatch ${FILESDIR}/${DILLO_I18N_P%-*}-gentoo.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}" = "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
+	else
+		einfo "Using default Dillo icon set"
+	fi
+}
+
+src_compile() {
+	replace-flags "-O2 -mcpu=k6" "-O2 -mcpu=pentium"
+
+	econf `use_enable ipv6` \
+		`use_enable nls` \
+		`use_enable ssl` \
+		`use_enable truetype anti-alias` \
+		--enable-tabs \
+		--enable-meta-refresh \
+		--enable-user-agent \
+		|| 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 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 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.8.0 b/net-www/dillo/files/digest-dillo-0.8.0
new file mode 100644
index 000000000000..d07c755c2821
--- /dev/null
+++ b/net-www/dillo/files/digest-dillo-0.8.0
@@ -0,0 +1,3 @@
+MD5 fa4bdedcd7e76135257d70104efb13db dillo-0.8.0.tar.bz2 396058
+MD5 3bc2370883e41905791f94f0b8e2f79b dillo-gentoo-extras-patch3.tar.bz2 86929
+MD5 fe6929c0b88b1182651c6e42bd058bdd dillo-0.8.0-i18n-misc-20040313.diff.bz2 264836
diff --git a/net-www/dillo/files/dillo-0.8.0-i18n-misc-gentoo.diff b/net-www/dillo/files/dillo-0.8.0-i18n-misc-gentoo.diff
new file mode 100644
index 000000000000..cc1f5ad1d124
--- /dev/null
+++ b/net-www/dillo/files/dillo-0.8.0-i18n-misc-gentoo.diff
@@ -0,0 +1,12 @@
+diff -urN dillo-0.8.0-i18n-misc/src/html.c dillo-0.8.0/src/html.c
+--- dillo-0.8.0-i18n-misc/src/html.c	2004-03-26 13:19:52.535130864 +0900
++++ dillo-0.8.0/src/html.c	2004-03-26 13:20:30.798313976 +0900
+@@ -3461,7 +3461,7 @@
+       data->lb->meta_refresh = &data->html_dead;
+       data->url = a_Url_new(*content ? content :
+                             URL_STR(a_History_get_url(NAV_TOP(data->lb->dd))),
+-                            URL_STR_(data->lb->base_url), 0, 0);
++                            URL_STR_(data->lb->base_url), 0, 0, 0);
+       //a_Url_set_flags(data->url, URL_FLAGS(data->url) | URL_E2EReload);
+ 
+       if (!*content && delay < 7) /* don't refresh itself to often... */