Updated i18n-misc patch. Fixed meta-refresh bug.

5 files changed, 31 insertions, 33 deletions

diff --git a/net-www/dillo/ChangeLog b/net-www/dillo/ChangeLog
index c22462ebc15e..fbf60c73faad 100644
--- a/net-www/dillo/ChangeLog
+++ b/net-www/dillo/ChangeLog
@@ -1,6 +1,11 @@
 # 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.33 2004/03/29 14:47:04 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/dillo/ChangeLog,v 1.34 2004/03/31 20:37:06 usata Exp $
+
+*dillo-0.8.0-r1 (01 Apr 2004)
+
+  01 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> dillo-0.8.0-r1.ebuild:
+  Updated i18n-misc patch. Fixed meta-refresh bug.
 
   29 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org> dillo-0.7.3-r5.ebuild:
   stable on sparc
diff --git a/net-www/dillo/Manifest b/net-www/dillo/Manifest
index d5bb4db5f02a..4ee85c226aef 100644
--- a/net-www/dillo/Manifest
+++ b/net-www/dillo/Manifest
@@ -1,12 +1,14 @@
-MD5 269908d12bff0a5ab60c11ca05655ddd ChangeLog 5359
-MD5 238ab30c5039932b4b6c93a019a79fa8 dillo-0.7.3-r1.ebuild 2593
 MD5 2c1ebd12393e735f832ba1c378bbfa2a dillo-0.7.3-r3.ebuild 3245
-MD5 171e30e0769dfcb01021ce7b3e9b103d dillo-0.7.3-r4.ebuild 3244
 MD5 a5f8d110008d339db65553f214084327 dillo-0.7.3-r5.ebuild 3108
+MD5 171e30e0769dfcb01021ce7b3e9b103d dillo-0.7.3-r4.ebuild 3244
+MD5 269908d12bff0a5ab60c11ca05655ddd ChangeLog 5359
+MD5 238ab30c5039932b4b6c93a019a79fa8 dillo-0.7.3-r1.ebuild 2593
 MD5 de6d2821e42f377cd356dc123e2530c3 dillo-0.8.0.ebuild 3109
+MD5 036f688f211e53f46f33555ef130abe8 dillo-0.8.0-r1.ebuild 3058
 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 4a9abe992ee64111264ab8eee9c24724 files/digest-dillo-0.7.3-r4 226
-MD5 67d7bc742594fdc4a7c68caf1e160992 files/digest-dillo-0.7.3-r5 226
 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
diff --git a/net-www/dillo/dillo-0.7.3-r4.ebuild b/net-www/dillo/dillo-0.8.0-r1.ebuild
index cc66cefd4161..cd73230542ff 100644
--- a/net-www/dillo/dillo-0.7.3-r4.ebuild
+++ b/net-www/dillo/dillo-0.8.0-r1.ebuild
@@ -1,24 +1,22 @@
 # 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-r4.ebuild,v 1.4 2004/02/23 09:46:34 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/dillo/dillo-0.8.0-r1.ebuild,v 1.1 2004/03/31 20:37:06 usata Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic eutils
 
 S2=${WORKDIR}/dillo-gentoo-extras-patch3
-I18N_P=${P}-i18n-misc-20031208
+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
-	cjk? ( http://teki.jpn.ph/pc/software/${I18N_P}.diff.bz2 )"
+	http://teki.jpn.ph/pc/software/${DILLO_I18N_P}.diff.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc sparc alpha ~hppa ~amd64"
-# Note that truetype, ssl and nls IUSE flags will take effect
-# only if you enable cjk IUSE flag.
-IUSE="ipv6 kde gnome mozilla truetype ssl cjk nls"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+IUSE="ipv6 kde gnome mozilla nls ssl truetype"
 
 DEPEND="=x11-libs/gtk+-1.2*
 	>=media-libs/jpeg-6b
@@ -29,7 +27,7 @@ DEPEND="=x11-libs/gtk+-1.2*
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	use cjk && epatch ../${I18N_P}.diff
+	epatch ../${DILLO_I18N_P}.diff
 
 	if [ "${DILLO_ICONSET}" = "kde" ]
 	then
@@ -59,23 +57,14 @@ src_unpack() {
 src_compile() {
 	replace-flags "-O2 -mcpu=k6" "-O2 -mcpu=pentium"
 
-	local myconf
-
-	if [ -n "`use cjk`" ] ; then
-		if [ -n "`use truetype`" ] ; then
-			CPPFLAGS="${CPPFLAGS} -I/usr/include/freetype2"
-			LDFLAGS="${LDFLAGS} -L/usr/X11R6/lib -lXft"
-			export CPPFLAGS LDFLAGS
-		fi
-		myconf="`use_enable nls`
-			`use_enable ssl`
-			`use_enable truetype anti-alias`
-			--enable-meta-refresh
-			--enable-web-search"
-	fi
-
 	econf `use_enable ipv6` \
-		${myconf} || die
+		`use_enable nls` \
+		`use_enable ssl` \
+		`use_enable truetype anti-alias` \
+		--enable-tabs \
+		--enable-meta-refresh \
+		--enable-user-agent \
+		|| die
 	emake || make || die
 }
 
@@ -83,6 +72,8 @@ 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
diff --git a/net-www/dillo/files/digest-dillo-0.7.3-r4 b/net-www/dillo/files/digest-dillo-0.7.3-r4
deleted file mode 100644
index 2709e37648be..000000000000
--- a/net-www/dillo/files/digest-dillo-0.7.3-r4
+++ /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 0d3bdf88a3e61a4659e708ac4a971c1f dillo-0.7.3-i18n-misc-20031208.diff.bz2 249474
diff --git a/net-www/dillo/files/digest-dillo-0.8.0-r1 b/net-www/dillo/files/digest-dillo-0.8.0-r1
new file mode 100644
index 000000000000..7f2ad91d9f07
--- /dev/null
+++ b/net-www/dillo/files/digest-dillo-0.8.0-r1
@@ -0,0 +1,3 @@
+MD5 fa4bdedcd7e76135257d70104efb13db dillo-0.8.0.tar.bz2 396058
+MD5 3bc2370883e41905791f94f0b8e2f79b dillo-gentoo-extras-patch3.tar.bz2 86929
+MD5 c46b9eefc65cb984a568a7ecc3963c19 dillo-0.8.0-i18n-misc-20040329.diff.bz2 265238