Version bumped; bug #96502. Dropped misc patch until its ready.

Package-Manager: portage-2.0.51.22-r1

5 files changed, 154 insertions, 11 deletions

diff --git a/www-client/dillo/ChangeLog b/www-client/dillo/ChangeLog
index 20a4a79dc0c5..8efe03f21976 100644
--- a/www-client/dillo/ChangeLog
+++ b/www-client/dillo/ChangeLog
@@ -1,11 +1,17 @@
 # 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.27 2005/05/14 11:35:19 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.28 2005/06/19 09:41:50 usata Exp $
+
+*dillo-0.8.5 (19 Jun 2005)
+
+  19 Jun 2005; Mamoru KOMACHI <usata@gentoo.org> dillo-0.8.4-r2.ebuild,
+  +dillo-0.8.5.ebuild:
+  Version bumped; bug #96502. Dropped misc patch until its ready.
 
   14 May 2005; Guy Martin <gmsoft@gentoo.org> dillo-0.8.4-r1.ebuild:
   Stable on hppa.
 
-  26 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> dillo-0.8.4-r1.ebuild:
+  26 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> dillo-0.8.4-r1.ebuild:
   Stable on alpha.
 
   09 Apr 2005; Markus Rothe <corsair@gentoo.org> dillo-0.8.4-r1.ebuild:
@@ -27,7 +33,7 @@
   Updated i18n-misc patch, and appended -O to CFLAGS (bug #86442).
   Marked 0.8.4-r1 stable on x86 and ppc.
 
-  19 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> dillo-0.8.4.ebuild:
+  19 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> dillo-0.8.4.ebuild:
   Stable on alpha.
 
   24 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> dillo-0.8.4.ebuild:
@@ -51,7 +57,7 @@
   08 Jan 2005; Jason Wever <weeve@gentoo.org> dillo-0.8.3-r4.ebuild:
   Stable on sparc wrt bug #76665.
 
-  08 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> dillo-0.8.3-r4.ebuild:
+  08 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> dillo-0.8.3-r4.ebuild:
   Stable on alpha, bug 76665.
 
   08 Jan 2005; Lars Weiler <pylon@gentoo.org> dillo-0.8.3-r4.ebuild:
diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest
index 7e79d1e0be8d..19a9ee0261dd 100644
--- a/www-client/dillo/Manifest
+++ b/www-client/dillo/Manifest
@@ -1,13 +1,15 @@
-MD5 1ee5ab72d2e96480c3882b9060d9f521 ChangeLog 11224
+MD5 480bb19449953ccd4056a9d54243e526 ChangeLog 11419
 MD5 2e853f9207a33d2fd352132561c48e6a dillo-0.7.3-r7.ebuild 3072
+MD5 23b84e3e37d9480bbf9e9e35f5c99c70 dillo-0.8.4-r2.ebuild 3601
+MD5 3ff31b5479b2a0244f5711fff3155aed metadata.xml 221
 MD5 3b8ac4260193f9a184cec89f3a85a2d3 dillo-0.8.3-r4.ebuild 3638
-MD5 4a1d96c3478e17c65d06e09388d89993 dillo-0.8.4-r1.ebuild 3596
 MD5 2193d4a3532b99be305ba4d59f6ae074 dillo-0.8.4.ebuild 3573
-MD5 3ff31b5479b2a0244f5711fff3155aed metadata.xml 221
-MD5 66add3b934bd35ffd5f97632ffb4d199 dillo-0.8.4-r2.ebuild 3602
+MD5 4a1d96c3478e17c65d06e09388d89993 dillo-0.8.4-r1.ebuild 3596
+MD5 b1e9b59819ae9e74d5ebf4dbc31efd23 dillo-0.8.5.ebuild 3623
 MD5 e257387d2c71e79a44b93b59e5240db3 files/digest-dillo-0.7.3-r7 226
 MD5 cec29ab3305c35980bc16ecc1eac7b8d files/digest-dillo-0.8.4-r2 226
 MD5 e5d887ebabc4b20dc1ba0d268bb90291 files/digest-dillo-0.8.3-r4 226
 MD5 47c572d76913ed4ec3608d3f840f9c67 files/digest-dillo-0.8.4 226
-MD5 b86fffd43a8ba3b6791d459ad012a2e3 files/digest-dillo-0.8.4-r1 226
 MD5 7750091e1346c986eeb58aef81297fd0 files/dillo-format-string-vulnerability.diff 787
+MD5 b86fffd43a8ba3b6791d459ad012a2e3 files/digest-dillo-0.8.4-r1 226
+MD5 3a9f6bd0cc3175459cad353402fd7f14 files/digest-dillo-0.8.5 226
diff --git a/www-client/dillo/dillo-0.8.4-r2.ebuild b/www-client/dillo/dillo-0.8.4-r2.ebuild
index 5e9c2f923c06..874c58952fc5 100644
--- a/www-client/dillo/dillo-0.8.4-r2.ebuild
+++ b/www-client/dillo/dillo-0.8.4-r2.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-r2.ebuild,v 1.1 2005/04/06 04:32:22 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-0.8.4-r2.ebuild,v 1.2 2005/06/19 09:41:50 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/dillo-0.8.5.ebuild b/www-client/dillo/dillo-0.8.5.ebuild
new file mode 100644
index 000000000000..d72ef485c19f
--- /dev/null
+++ b/www-client/dillo/dillo-0.8.5.ebuild
@@ -0,0 +1,132 @@
+# 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.5.ebuild,v 1.1 2005/06/19 09:41:50 usata Exp $
+
+inherit flag-o-matic eutils
+
+S2=${WORKDIR}/dillo-gentoo-extras-patch4
+DILLO_I18N_P="${P}-i18n-misc-20050414"
+
+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 || die
+	#sh autogen.sh || die
+
+	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"
+	append-flags "-O"
+
+	local myconf
+
+	# misc features
+	#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.5 b/www-client/dillo/files/digest-dillo-0.8.5
new file mode 100644
index 000000000000..52145b50dfc0
--- /dev/null
+++ b/www-client/dillo/files/digest-dillo-0.8.5
@@ -0,0 +1,3 @@
+MD5 d0ab7fa1d40b310deb891388604188f8 dillo-0.8.5.tar.bz2 424795
+MD5 0d0bc7cdd39dc66b80280f73d74bfeaf dillo-gentoo-extras-patch4.tar.bz2 98800
+MD5 236248f27bd12ac927b0126c0dd5eed9 dillo-0.8.4-i18n-misc-20050414.diff.bz2 232104