Updated iconset patch. Closing bug #41596 and #48806. Removed 0.8.0

6 files changed, 30 insertions, 25 deletions

diff --git a/net-www/dillo/ChangeLog b/net-www/dillo/ChangeLog
index fbf60c73faad..49f0d65565a5 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.34 2004/03/31 20:37:06 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/dillo/ChangeLog,v 1.35 2004/04/25 12:53:27 usata Exp $
+
+*dillo-0.8.0-r2 (25 Apr 2004)
+
+  25 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> dillo-0.8.0-r2.ebuild,
+  dillo-0.8.0.ebuild, files/dillo-0.8.0-i18n-misc-gentoo.diff:
+  Updated iconset patch. Closing bug #41596 and #48806. Removed 0.8.0
 
 *dillo-0.8.0-r1 (01 Apr 2004)
 
diff --git a/net-www/dillo/Manifest b/net-www/dillo/Manifest
index 7830d1750b8c..ab6311f31638 100644
--- a/net-www/dillo/Manifest
+++ b/net-www/dillo/Manifest
@@ -4,9 +4,11 @@ MD5 ffe0d3dcad094e14c6b5eb45cc5039a2 ChangeLog 5511
 MD5 238ab30c5039932b4b6c93a019a79fa8 dillo-0.7.3-r1.ebuild 2593
 MD5 de6d2821e42f377cd356dc123e2530c3 dillo-0.8.0.ebuild 3109
 MD5 4b3547baa36bf58b6b355906466e82e1 dillo-0.8.0-r1.ebuild 2957
+MD5 133e58ffe52831dd7f3ca8e62d8fad4b dillo-0.8.0-r2.ebuild 3431
 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 457776a031aa84e244a73ff4b428d470 files/digest-dillo-0.8.0 226
 MD5 2597b5f8f650ced3b13f3cec33e32cb2 files/digest-dillo-0.8.0-r1 226
 MD5 a3c954376eb9ac6e766d76e78340da0e files/dillo-0.8.0-i18n-misc-gentoo.diff 690
+MD5 daf7c85d61b4c5268d693b0456e13fc9 files/digest-dillo-0.8.0-r2 226
diff --git a/net-www/dillo/dillo-0.8.0.ebuild b/net-www/dillo/dillo-0.8.0-r2.ebuild
index d2b951c67bd3..0458c780267c 100644
--- a/net-www/dillo/dillo-0.8.0.ebuild
+++ b/net-www/dillo/dillo-0.8.0-r2.ebuild
@@ -1,20 +1,16 @@
 # 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
+# $Header: /var/cvsroot/gentoo-x86/net-www/dillo/dillo-0.8.0-r2.ebuild,v 1.1 2004/04/25 12:53:27 usata Exp $
 
 inherit flag-o-matic eutils
 
-S2=${WORKDIR}/dillo-gentoo-extras-patch3
-DILLO_I18N_P="${P}-i18n-misc-20040313"
+S2=${WORKDIR}/dillo-gentoo-extras-patch4
+DILLO_I18N_P="${P}-i18n-misc-20040329"
 
 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
+	mirror://gentoo/dillo-gentoo-extras-patch4.tar.bz2
 	http://teki.jpn.ph/pc/software/${DILLO_I18N_P}.diff.bz2"
 
 LICENSE="GPL-2"
@@ -32,7 +28,6 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ../${DILLO_I18N_P}.diff
-	epatch ${FILESDIR}/${DILLO_I18N_P%-*}-gentoo.diff
 
 	if [ "${DILLO_ICONSET}" = "kde" ]
 	then
@@ -46,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"
@@ -54,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
@@ -97,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/files/digest-dillo-0.8.0 b/net-www/dillo/files/digest-dillo-0.8.0
deleted file mode 100644
index d07c755c2821..000000000000
--- a/net-www/dillo/files/digest-dillo-0.8.0
+++ /dev/null
@@ -1,3 +0,0 @@
-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/digest-dillo-0.8.0-r2 b/net-www/dillo/files/digest-dillo-0.8.0-r2
new file mode 100644
index 000000000000..22c236da0fe8
--- /dev/null
+++ b/net-www/dillo/files/digest-dillo-0.8.0-r2
@@ -0,0 +1,3 @@
+MD5 fa4bdedcd7e76135257d70104efb13db dillo-0.8.0.tar.bz2 396058
+MD5 0d0bc7cdd39dc66b80280f73d74bfeaf dillo-gentoo-extras-patch4.tar.bz2 98800
+MD5 c46b9eefc65cb984a568a7ecc3963c19 dillo-0.8.0-i18n-misc-20040329.diff.bz2 265238
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
deleted file mode 100644
index cc1f5ad1d124..000000000000
--- a/net-www/dillo/files/dillo-0.8.0-i18n-misc-gentoo.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-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... */