Version bumped. Cleaned up ebuilds. This closes bug #51814

11 files changed, 44 insertions, 155 deletions

diff --git a/net-www/dillo/ChangeLog b/net-www/dillo/ChangeLog
index 391b70fa80c7..c7fc36b75e87 100644
--- a/net-www/dillo/ChangeLog
+++ b/net-www/dillo/ChangeLog
@@ -1,6 +1,14 @@
 # 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.41 2004/06/11 11:57:27 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/dillo/ChangeLog,v 1.42 2004/06/16 16:24:43 usata Exp $
+
+*dillo-0.8.1 (17 Jun 2004)
+*dillo-0.8.0-r4 (17 Jun 2004)
+
+  17 Jun 2004; Mamoru KOMACHI <usata@gentoo.org> -files/0.8.0-gcc34.patch,
+  -dillo-0.7.3-r5.ebuild, dillo-0.7.3-r7.ebuild, -dillo-0.8.0-r2.ebuild,
+  -dillo-0.8.0-r3.ebuild, +dillo-0.8.0-r4.ebuild, +dillo-0.8.1.ebuild:
+  Version bumped. Cleaned up ebuilds. This closes bug #51814
 
   11 Jun 2004; Ferris McCormick <fmccor@gentoo.org> dillo-0.7.3-r6.ebuild:
   Marked stable for sparc.
diff --git a/net-www/dillo/Manifest b/net-www/dillo/Manifest
index ffea780b9402..c5b85ca7fe31 100644
--- a/net-www/dillo/Manifest
+++ b/net-www/dillo/Manifest
@@ -1,13 +1,10 @@
-MD5 7dc18984ead23df2b1d27ad00fb343c3 ChangeLog 6721
-MD5 91ae7c1c4d3a7715c206330f17c07d12 dillo-0.7.3-r5.ebuild 3099
+MD5 bd49c3167344eb44cff1dd1464882c9a ChangeLog 7059
+MD5 82c881ca9eeefdbbddc03ea640166f38 dillo-0.8.0-r4.ebuild 3430
 MD5 9a8183fbff63cab2b3a522089d004975 dillo-0.7.3-r6.ebuild 3095
-MD5 5815d607c66e6c4331b4906d3467a520 dillo-0.7.3-r7.ebuild 3098
-MD5 9575de26085980f08bea7032d6b5384b dillo-0.8.0-r2.ebuild 3464
-MD5 a438df589918424206e71c42e1f73179 dillo-0.8.0-r3.ebuild 3430
+MD5 089d870e268e3bdc5250471ff5e2743e dillo-0.7.3-r7.ebuild 3095
 MD5 3ff31b5479b2a0244f5711fff3155aed metadata.xml 221
-MD5 49d301ccd191219619a4f4722c710bc7 files/0.8.0-gcc34.patch 177
-MD5 67d7bc742594fdc4a7c68caf1e160992 files/digest-dillo-0.7.3-r5 226
-MD5 82620923b2ae1db72422bf38bc27646d files/digest-dillo-0.7.3-r6 226
+MD5 d65f522312a27d03de87d8db69481aab dillo-0.8.1.ebuild 3550
+MD5 ebe1975525013c493f067b3ebbc8aecb files/digest-dillo-0.8.0-r4 226
+MD5 22aadb5a0dea9b874a84ed79c5187f4c files/digest-dillo-0.8.1 220
 MD5 e257387d2c71e79a44b93b59e5240db3 files/digest-dillo-0.7.3-r7 226
-MD5 daf7c85d61b4c5268d693b0456e13fc9 files/digest-dillo-0.8.0-r2 226
-MD5 eb65dc286c02420aae35ffac6b2dcad7 files/digest-dillo-0.8.0-r3 226
+MD5 82620923b2ae1db72422bf38bc27646d files/digest-dillo-0.7.3-r6 226
diff --git a/net-www/dillo/dillo-0.7.3-r5.ebuild b/net-www/dillo/dillo-0.7.3-r5.ebuild
deleted file mode 100644
index fe868e6fc3bc..000000000000
--- a/net-www/dillo/dillo-0.7.3-r5.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# 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.7.3-r5.ebuild,v 1.7 2004/06/02 18:06:09 usata Exp $
-
-inherit flag-o-matic eutils
-
-S2=${WORKDIR}/dillo-gentoo-extras-patch3
-DILLO_I18N_MISC=${P}-i18n-misc-20031219
-
-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_MISC}.diff.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha ~hppa ~amd64"
-IUSE="ipv6 kde gnome mozilla truetype ssl nls"
-
-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 )
-	truetype? ( virtual/xft )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ../${DILLO_I18N_MISC}.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"
-
-	if use truetype ; then
-		CPPFLAGS="${CPPFLAGS} -I/usr/include/freetype2"
-		LDFLAGS="${LDFLAGS} -L/usr/X11R6/lib -lXft"
-		export CPPFLAGS LDFLAGS
-	fi
-
-	econf `use_enable ipv6` \
-		`use_enable nls` \
-		`use_enable ssl` \
-		`use_enable truetype anti-alias` \
-		--enable-meta-refresh \
-		--enable-web-search \
-		|| die
-	emake || make || die
-}
-
-src_install() {
-	dodir /etc  /usr/share/icons/${PN}
-	einstall || die
-
-	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/dillo-0.7.3-r7.ebuild b/net-www/dillo/dillo-0.7.3-r7.ebuild
index 67c5f40a871c..8d690c9412e0 100644
--- a/net-www/dillo/dillo-0.7.3-r7.ebuild
+++ b/net-www/dillo/dillo-0.7.3-r7.ebuild
@@ -1,6 +1,6 @@
 # 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.7.3-r7.ebuild,v 1.1 2004/06/02 18:06:09 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/dillo/dillo-0.7.3-r7.ebuild,v 1.2 2004/06/16 16:24:43 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"
+KEYWORDS="x86 ppc ~sparc alpha ~hppa ~amd64"
 IUSE="ipv6 kde gnome mozilla truetype ssl nls"
 
 DEPEND="=x11-libs/gtk+-1.2*
diff --git a/net-www/dillo/dillo-0.8.0-r3.ebuild b/net-www/dillo/dillo-0.8.0-r4.ebuild
index 9e913191fcfb..0ce2d7e035a5 100644
--- a/net-www/dillo/dillo-0.8.0-r3.ebuild
+++ b/net-www/dillo/dillo-0.8.0-r4.ebuild
@@ -1,11 +1,11 @@
 # 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-r3.ebuild,v 1.1 2004/06/02 18:06:09 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/dillo/dillo-0.8.0-r4.ebuild,v 1.1 2004/06/16 16:24:43 usata Exp $
 
 inherit flag-o-matic eutils
 
 S2=${WORKDIR}/dillo-gentoo-extras-patch4
-DILLO_I18N_P="${P}-i18n-misc-20040602"
+DILLO_I18N_P="${P}-i18n-misc-20040616"
 
 DESCRIPTION="Lean GTK+-based web browser"
 HOMEPAGE="http://www.dillo.org/"
diff --git a/net-www/dillo/dillo-0.8.0-r2.ebuild b/net-www/dillo/dillo-0.8.1.ebuild
index 9eb13b523c8d..b18c436c0ce9 100644
--- a/net-www/dillo/dillo-0.8.0-r2.ebuild
+++ b/net-www/dillo/dillo-0.8.1.ebuild
@@ -1,11 +1,11 @@
 # 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-r2.ebuild,v 1.4 2004/06/01 22:02:49 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/dillo/dillo-0.8.1.ebuild,v 1.1 2004/06/16 16:24:43 usata Exp $
 
 inherit flag-o-matic eutils
 
 S2=${WORKDIR}/dillo-gentoo-extras-patch4
-DILLO_I18N_P="${P}-i18n-misc-20040329"
+DILLO_I18N_P="${P}-i18n-20040616"
 
 DESCRIPTION="Lean GTK+-based web browser"
 HOMEPAGE="http://www.dillo.org/"
@@ -15,20 +15,21 @@ SRC_URI="http://www.dillo.org/download/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa amd64"
-IUSE="ipv6 kde gnome mozilla nls ssl truetype"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+MISC_IUSE="nls ssl truetype ssl"
+#IUSE="${MISC_IUSE} ipv6 kde gnome mozilla"
+IUSE="ipv6 kde gnome mozilla"
 
 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 )"
+	>=media-libs/libpng-1.2.1"
+#	ssl? ( dev-libs/openssl )
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ../${DILLO_I18N_P}.diff
-	epatch ${FILESDIR}/${PV}-gcc34.patch
 
 	if [ "${DILLO_ICONSET}" = "kde" ]
 	then
@@ -66,14 +67,18 @@ src_unpack() {
 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
+	local myconf
+	myconf="`use_enable nls`
+		`use_enable ssl`
+		`use_enable truetype anti-alias`
+		--enable-tabs
+		--enable-meta-refresh
+		--enable-user-agent"
+
+	#myconf="${myconf} `use_enable ipv6`"
+	myconf="`use_enable ipv6`"
+
+	econf ${myconf} || die
 	emake || make || die
 }
 
diff --git a/net-www/dillo/files/0.8.0-gcc34.patch b/net-www/dillo/files/0.8.0-gcc34.patch
deleted file mode 100644
index 7815cd177014..000000000000
--- a/net-www/dillo/files/0.8.0-gcc34.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- src/i18n.c.orig	2004-04-27 03:26:30.233762616 -0400
-+++ src/i18n.c	2004-04-27 03:25:48.546100104 -0400
-@@ -1,3 +1,4 @@
-+#define __NO_STRING_INLINES
- /*
-  * File: i18n.c
-  *
diff --git a/net-www/dillo/files/digest-dillo-0.7.3-r5 b/net-www/dillo/files/digest-dillo-0.7.3-r5
deleted file mode 100644
index 59a0e5cea921..000000000000
--- a/net-www/dillo/files/digest-dillo-0.7.3-r5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 896f4d8c752b86376bfb445740f01470 dillo-0.7.3.tar.bz2 345295
-MD5 3bc2370883e41905791f94f0b8e2f79b dillo-gentoo-extras-patch3.tar.bz2 86929
-MD5 78f3532d22c5152851accaa168bd5f13 dillo-0.7.3-i18n-misc-20031219.diff.bz2 249188
diff --git a/net-www/dillo/files/digest-dillo-0.8.0-r3 b/net-www/dillo/files/digest-dillo-0.8.0-r3
deleted file mode 100644
index 8d4c75ee2e19..000000000000
--- a/net-www/dillo/files/digest-dillo-0.8.0-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fa4bdedcd7e76135257d70104efb13db dillo-0.8.0.tar.bz2 396058
-MD5 0d0bc7cdd39dc66b80280f73d74bfeaf dillo-gentoo-extras-patch4.tar.bz2 98800
-MD5 decdb94c6205907afa1a5638b12c8497 dillo-0.8.0-i18n-misc-20040602.diff.bz2 265527
diff --git a/net-www/dillo/files/digest-dillo-0.8.0-r2 b/net-www/dillo/files/digest-dillo-0.8.0-r4
index 22c236da0fe8..56dc5467bdc6 100644
--- a/net-www/dillo/files/digest-dillo-0.8.0-r2
+++ b/net-www/dillo/files/digest-dillo-0.8.0-r4
@@ -1,3 +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
+MD5 452b7bcde1ae985ad229d34a0aa222dd dillo-0.8.0-i18n-misc-20040616.diff.bz2 265607
diff --git a/net-www/dillo/files/digest-dillo-0.8.1 b/net-www/dillo/files/digest-dillo-0.8.1
new file mode 100644
index 000000000000..3efaa4911385
--- /dev/null
+++ b/net-www/dillo/files/digest-dillo-0.8.1
@@ -0,0 +1,3 @@
+MD5 033b0875612424696d93afa2a9ba8504 dillo-0.8.1.tar.bz2 400697
+MD5 0d0bc7cdd39dc66b80280f73d74bfeaf dillo-gentoo-extras-patch4.tar.bz2 98800
+MD5 b494cd367ae317fa809299f1bae54ea2 dillo-0.8.1-i18n-20040616.diff.bz2 46998