Version bumped; bug #77679.

7 files changed, 18 insertions, 139 deletions

diff --git a/www-client/dillo/ChangeLog b/www-client/dillo/ChangeLog
index 73ca2e43209e..829da6a487d7 100644
--- a/www-client/dillo/ChangeLog
+++ b/www-client/dillo/ChangeLog
@@ -1,6 +1,12 @@
 # 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.14 2005/01/09 02:12:24 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.15 2005/01/18 12:53:35 usata Exp $
+
+*dillo-0.8.4 (18 Jan 2005)
+
+  18 Jan 2005; Mamoru KOMACHI <usata@gentoo.org> -dillo-0.8.3-r3.ebuild,
+  -dillo-0.8.3.ebuild, +dillo-0.8.4.ebuild:
+  Version bumped; bug #77679.
 
   08 Jan 2005; Jason Wever <weeve@gentoo.org> dillo-0.8.3-r4.ebuild:
   Stable on sparc wrt bug #76665.
diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest
index dfa4579d2749..f63be129f941 100644
--- a/www-client/dillo/Manifest
+++ b/www-client/dillo/Manifest
@@ -1,12 +1,14 @@
 MD5 7d444fcb7b5d273c2dbb8f783e1e9f6c ChangeLog 9757
-MD5 2e853f9207a33d2fd352132561c48e6a dillo-0.7.3-r7.ebuild 3072
 MD5 f21b4ddabc98e88e9a1417336531a37e dillo-0.8.0-r5.ebuild 3407
-MD5 3ff31b5479b2a0244f5711fff3155aed metadata.xml 221
+MD5 dcef559e4c3cf82554dc54a720234716 dillo-0.8.4.ebuild 3642
+MD5 2e853f9207a33d2fd352132561c48e6a dillo-0.7.3-r7.ebuild 3072
 MD5 18a9f26be711130a947219f4432fe069 dillo-0.8.3.ebuild 3475
+MD5 3ff31b5479b2a0244f5711fff3155aed metadata.xml 221
 MD5 3babc9c450202122269e7c926d006d9f dillo-0.8.3-r4.ebuild 3637
 MD5 8eb7501c8f2f337145845593faeba930 dillo-0.8.3-r3.ebuild 3580
-MD5 e257387d2c71e79a44b93b59e5240db3 files/digest-dillo-0.7.3-r7 226
 MD5 95d879f408936b0b61006a6a55a3f68d files/digest-dillo-0.8.0-r5 226
+MD5 47c572d76913ed4ec3608d3f840f9c67 files/digest-dillo-0.8.4 226
+MD5 e257387d2c71e79a44b93b59e5240db3 files/digest-dillo-0.7.3-r7 226
 MD5 ba28c8a3ac90eda9150e386ab318bbcd files/digest-dillo-0.8.3 220
 MD5 e5d887ebabc4b20dc1ba0d268bb90291 files/digest-dillo-0.8.3-r4 226
 MD5 e5d887ebabc4b20dc1ba0d268bb90291 files/digest-dillo-0.8.3-r3 226
diff --git a/www-client/dillo/dillo-0.8.3.ebuild b/www-client/dillo/dillo-0.8.3.ebuild
deleted file mode 100644
index f03ea81d2893..000000000000
--- a/www-client/dillo/dillo-0.8.3.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# 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.3.ebuild,v 1.3 2005/01/06 16:24:50 taviso Exp $
-
-inherit flag-o-matic eutils
-
-S2=${WORKDIR}/dillo-gentoo-extras-patch4
-DILLO_I18N_P="${P}-i18n-20041026"
-
-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"
-
-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 truetype anti-alias)
-	#	--enable-tabs
-	#	--enable-meta-refresh
-	#	--enable-user-agent"
-
-	myconf="$(use_enable ipv6)
-		$(use_enable ssl)"
-
-	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/www-client/dillo/dillo-0.8.3-r3.ebuild b/www-client/dillo/dillo-0.8.4.ebuild
index 48821b1a3ae1..57c6a0506720 100644
--- a/www-client/dillo/dillo-0.8.3-r3.ebuild
+++ b/www-client/dillo/dillo-0.8.4.ebuild
@@ -1,11 +1,11 @@
 # 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.3-r3.ebuild,v 1.5 2005/01/06 16:24:50 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-0.8.4.ebuild,v 1.1 2005/01/18 12:53:35 usata Exp $
 
 inherit flag-o-matic eutils
 
 S2=${WORKDIR}/dillo-gentoo-extras-patch4
-DILLO_I18N_P="${P}-i18n-misc-20041206"
+DILLO_I18N_P="${P}-i18n-misc-20050116"
 
 DESCRIPTION="Lean GTK+-based web browser"
 HOMEPAGE="http://www.dillo.org/"
@@ -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/files/digest-dillo-0.8.3 b/www-client/dillo/files/digest-dillo-0.8.3
deleted file mode 100644
index 264195b24182..000000000000
--- a/www-client/dillo/files/digest-dillo-0.8.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 be772ec9361bcc01515ae0da61de9bda dillo-0.8.3.tar.bz2 418714
-MD5 0d0bc7cdd39dc66b80280f73d74bfeaf dillo-gentoo-extras-patch4.tar.bz2 98800
-MD5 f7eeb66e82940694b77bab0ab5497bad dillo-0.8.3-i18n-20041026.diff.bz2 21539
diff --git a/www-client/dillo/files/digest-dillo-0.8.3-r3 b/www-client/dillo/files/digest-dillo-0.8.3-r3
deleted file mode 100644
index ec9bf532eb21..000000000000
--- a/www-client/dillo/files/digest-dillo-0.8.3-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-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
diff --git a/www-client/dillo/files/digest-dillo-0.8.4 b/www-client/dillo/files/digest-dillo-0.8.4
new file mode 100644
index 000000000000..151f3d33e465
--- /dev/null
+++ b/www-client/dillo/files/digest-dillo-0.8.4
@@ -0,0 +1,3 @@
+MD5 ebf17d6cca1fccc8bc80acdf05e736a3 dillo-0.8.4.tar.bz2 423106
+MD5 0d0bc7cdd39dc66b80280f73d74bfeaf dillo-gentoo-extras-patch4.tar.bz2 98800
+MD5 abfbefb3eafa1f624ef357175dd3e151 dillo-0.8.4-i18n-misc-20050116.diff.bz2 217402