Updated i18n-misc patches.

9 files changed, 270 insertions, 11 deletions

diff --git a/net-www/dillo/ChangeLog b/net-www/dillo/ChangeLog
index 84beb9ef1a4b..2f0c6f5ac1e6 100644
--- a/net-www/dillo/ChangeLog
+++ b/net-www/dillo/ChangeLog
@@ -1,6 +1,13 @@
 # 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.39 2004/06/01 22:02:49 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/dillo/ChangeLog,v 1.40 2004/06/02 18:06:09 usata Exp $
+
+*dillo-0.8.0-r3 (03 Jun 2004)
+*dillo-0.7.3-r7 (03 Jun 2004)
+
+  03 Jun 2004; Mamoru KOMACHI <usata@gentoo.org> dillo-0.7.3-r5.ebuild,
+  dillo-0.7.3-r6.ebuild, dillo-0.7.3-r7.ebuild, dillo-0.8.0-r3.ebuild:
+  Updated i18n-misc patches.
 
   01 Jun 2004; Travis Tilley <lv@gentoo.org> dillo-0.8.0-r2.ebuild:
   stable on amd64
diff --git a/net-www/dillo/Manifest b/net-www/dillo/Manifest
index ab08d7cf40ee..f19df3cb0dd6 100644
--- a/net-www/dillo/Manifest
+++ b/net-www/dillo/Manifest
@@ -1,8 +1,14 @@
-MD5 b199e0840a8cf828dfbe5a156a301a88 dillo-0.7.3-r5.ebuild 3111
-MD5 e41e1dbee0fc3665fb536b78a6b337b8 dillo-0.8.0-r2.ebuild 3465
+MD5 bbca7934fecfc6246fb0e58fb676cabf dillo-0.8.1.ebuild 3507
+MD5 8fa5bc6fd83850070758db59b1f1548a dillo-0.7.3-r5.ebuild 3100
 MD5 5169829af37b8cbc171e5c674750a9f0 ChangeLog 6381
-MD5 450f0329c70830cb0204211281d5243f dillo-0.7.3-r6.ebuild 3110
+MD5 904324a78164be837c082b22c51131ae dillo-0.7.3-r7.ebuild 3099
+MD5 054aff46ad64746269d62f5edde7c706 dillo-0.8.0-r3.ebuild 3432
+MD5 e41e1dbee0fc3665fb536b78a6b337b8 dillo-0.8.0-r2.ebuild 3465
+MD5 12fb8c926df2bd6aa7c635f83ab52618 dillo-0.7.3-r6.ebuild 3096
+MD5 91a4db9d9919293dba712e812b9e533d files/digest-dillo-0.8.1 226
 MD5 67d7bc742594fdc4a7c68caf1e160992 files/digest-dillo-0.7.3-r5 226
-MD5 82620923b2ae1db72422bf38bc27646d files/digest-dillo-0.7.3-r6 226
-MD5 daf7c85d61b4c5268d693b0456e13fc9 files/digest-dillo-0.8.0-r2 226
+MD5 e257387d2c71e79a44b93b59e5240db3 files/digest-dillo-0.7.3-r7 226
+MD5 eb65dc286c02420aae35ffac6b2dcad7 files/digest-dillo-0.8.0-r3 226
 MD5 49d301ccd191219619a4f4722c710bc7 files/0.8.0-gcc34.patch 177
+MD5 daf7c85d61b4c5268d693b0456e13fc9 files/digest-dillo-0.8.0-r2 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
index 466ec7d7b869..fe868e6fc3bc 100644
--- a/net-www/dillo/dillo-0.7.3-r5.ebuild
+++ b/net-www/dillo/dillo-0.7.3-r5.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-r5.ebuild,v 1.6 2004/05/08 08:52:54 usata Exp $
+# $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
 
@@ -58,7 +58,7 @@ src_unpack() {
 src_compile() {
 	replace-flags "-O2 -mcpu=k6" "-O2 -mcpu=pentium"
 
-	if [ -n "`use truetype`" ] ; then
+	if use truetype ; then
 		CPPFLAGS="${CPPFLAGS} -I/usr/include/freetype2"
 		LDFLAGS="${LDFLAGS} -L/usr/X11R6/lib -lXft"
 		export CPPFLAGS LDFLAGS
diff --git a/net-www/dillo/dillo-0.7.3-r6.ebuild b/net-www/dillo/dillo-0.7.3-r6.ebuild
index e46ff4d9a845..97da43bb63fe 100644
--- a/net-www/dillo/dillo-0.7.3-r6.ebuild
+++ b/net-www/dillo/dillo-0.7.3-r6.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-r6.ebuild,v 1.1 2004/05/08 08:52:54 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/dillo/dillo-0.7.3-r6.ebuild,v 1.2 2004/06/02 18:06:09 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*
@@ -58,7 +58,7 @@ src_unpack() {
 src_compile() {
 	replace-flags "-O2 -mcpu=k6" "-O2 -mcpu=pentium"
 
-	if [ -n "`use truetype`" ] ; then
+	if use truetype ; then
 		CPPFLAGS="${CPPFLAGS} -I/usr/include/freetype2"
 		append-ldflags -L/usr/X11R6/lib -lXft
 		export CPPFLAGS
diff --git a/net-www/dillo/dillo-0.7.3-r7.ebuild b/net-www/dillo/dillo-0.7.3-r7.ebuild
new file mode 100644
index 000000000000..67c5f40a871c
--- /dev/null
+++ b/net-www/dillo/dillo-0.7.3-r7.ebuild
@@ -0,0 +1,111 @@
+# 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 $
+
+inherit flag-o-matic eutils
+
+S2=${WORKDIR}/dillo-gentoo-extras-patch3
+DILLO_I18N_MISC=${P}-i18n-misc-20040530
+
+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"
+		append-ldflags -L/usr/X11R6/lib -lXft
+		export CPPFLAGS
+	fi
+
+	econf `use_enable ipv6` \
+		`use_enable nls` \
+		`use_enable ssl` \
+		`use_enable truetype anti-alias` \
+		--enable-meta-refresh \
+		--enable-web-search \
+		|| die
+	emake -j1 || emake -j1 || 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.8.0-r3.ebuild b/net-www/dillo/dillo-0.8.0-r3.ebuild
new file mode 100644
index 000000000000..9e913191fcfb
--- /dev/null
+++ b/net-www/dillo/dillo-0.8.0-r3.ebuild
@@ -0,0 +1,121 @@
+# 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 $
+
+inherit flag-o-matic eutils
+
+S2=${WORKDIR}/dillo-gentoo-extras-patch4
+DILLO_I18N_P="${P}-i18n-misc-20040602"
+
+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"
+IUSE="ipv6 kde gnome mozilla nls ssl truetype"
+
+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"
+
+	econf `use_enable ipv6` \
+		`use_enable nls` \
+		`use_enable ssl` \
+		`use_enable truetype anti-alias` \
+		--enable-tabs \
+		--enable-meta-refresh \
+		--enable-user-agent \
+		|| 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/net-www/dillo/files/digest-dillo-0.7.3-r7 b/net-www/dillo/files/digest-dillo-0.7.3-r7
new file mode 100644
index 000000000000..29f4279c8a4d
--- /dev/null
+++ b/net-www/dillo/files/digest-dillo-0.7.3-r7
@@ -0,0 +1,3 @@
+MD5 896f4d8c752b86376bfb445740f01470 dillo-0.7.3.tar.bz2 345295
+MD5 3bc2370883e41905791f94f0b8e2f79b dillo-gentoo-extras-patch3.tar.bz2 86929
+MD5 149189d558296e7796bf61e32e922bbb dillo-0.7.3-i18n-misc-20040530.diff.bz2 249554
diff --git a/net-www/dillo/files/digest-dillo-0.8.0-r3 b/net-www/dillo/files/digest-dillo-0.8.0-r3
new file mode 100644
index 000000000000..8d4c75ee2e19
--- /dev/null
+++ b/net-www/dillo/files/digest-dillo-0.8.0-r3
@@ -0,0 +1,3 @@
+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/metadata.xml b/net-www/dillo/metadata.xml
new file mode 100644
index 000000000000..0d93ebc2d237
--- /dev/null
+++ b/net-www/dillo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>usata@gentoo.org</email>
+</maintainer>
+</pkgmetadata>