Stable on x86.

(Portage version: 2.0.51.22-r2)

4 files changed, 7 insertions, 137 deletions

diff --git a/www-client/dillo/ChangeLog b/www-client/dillo/ChangeLog
index dbf79ea18767..48291de84aea 100644
--- a/www-client/dillo/ChangeLog
+++ b/www-client/dillo/ChangeLog
@@ -1,6 +1,10 @@
 # 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.35 2005/07/10 20:50:24 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.36 2005/08/02 09:14:30 usata Exp $
+
+  02 Aug 2005; Mamoru KOMACHI <usata@gentoo.org> -dillo-0.8.4.ebuild,
+  dillo-0.8.5-r1.ebuild:
+  Stable on x86.
 
   10 Jul 2005; Sven Wegener <swegener@gentoo.org> dillo-0.7.3-r7.ebuild,
   dillo-0.8.4.ebuild, dillo-0.8.4-r1.ebuild, dillo-0.8.4-r2.ebuild,
diff --git a/www-client/dillo/dillo-0.8.4.ebuild b/www-client/dillo/dillo-0.8.4.ebuild
deleted file mode 100644
index a885cec1f570..000000000000
--- a/www-client/dillo/dillo-0.8.4.ebuild
+++ /dev/null
@@ -1,131 +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.4.ebuild,v 1.7 2005/07/10 20:50:24 swegener Exp $
-
-inherit flag-o-matic eutils
-
-S2=${WORKDIR}/dillo-gentoo-extras-patch4
-DILLO_I18N_P="${P}-i18n-misc-20050116"
-
-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
-
-	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
-
-	cd ${S}; sh autogen.sh || die
-}
-
-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"
-
-	myconf="${myconf}
-		$(use_enable ipv6)
-		$(use_enable ssl)"
-
-	econf ${myconf} || die
-	emake -j1 || 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/dillo-0.8.5-r1.ebuild b/www-client/dillo/dillo-0.8.5-r1.ebuild
index a688405c601a..db0b6a353ecf 100644
--- a/www-client/dillo/dillo-0.8.5-r1.ebuild
+++ b/www-client/dillo/dillo-0.8.5-r1.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.5-r1.ebuild,v 1.3 2005/07/10 20:50:24 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-0.8.5-r1.ebuild,v 1.4 2005/08/02 09:14:31 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="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
 MISC_IUSE="nls truetype"
 IUSE="${MISC_IUSE} ipv6 ssl"
 
diff --git a/www-client/dillo/files/digest-dillo-0.8.4 b/www-client/dillo/files/digest-dillo-0.8.4
deleted file mode 100644
index 151f3d33e465..000000000000
--- a/www-client/dillo/files/digest-dillo-0.8.4
+++ /dev/null
@@ -1,3 +0,0 @@
-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