Updated i18n-misc patch to 20051010. Removed old ebuilds.

(Portage version: 2.0.52-r1)

8 files changed, 23 insertions, 294 deletions

diff --git a/www-client/dillo/ChangeLog b/www-client/dillo/ChangeLog
index 289e4b678677..97700cdfbe5a 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.43 2005/09/17 11:10:22 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.44 2005/10/30 04:39:36 usata Exp $
+
+*dillo-0.8.5-r2 (30 Oct 2005)
+
+  30 Oct 2005; Mamoru KOMACHI <usata@gentoo.org> -dillo-0.8.4-r1.ebuild,
+  -dillo-0.8.4-r2.ebuild, -dillo-0.8.5.ebuild, +dillo-0.8.5-r2.ebuild:
+  Updated i18n-misc patch to 20051010. Removed old ebuilds.
 
   13 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> dillo-0.8.5-r1.ebuild:
   Stable on ppc.
diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest
index 20e9d7de4dc0..c22360909793 100644
--- a/www-client/dillo/Manifest
+++ b/www-client/dillo/Manifest
@@ -1,23 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e23614bce2d1d77e7df6952b8f3244ca dillo-0.7.3-r7.ebuild 3061
-MD5 30eeb7fe4579a8864d7a1591810820ff dillo-0.8.4-r1.ebuild 3594
-MD5 efac901b41f4e799579c065e66d5d7ed dillo-0.8.4-r2.ebuild 3594
+MD5 99323cd2b770d46b4524f22884ba14ae ChangeLog 13072
 MD5 d59c047c502094e1882c0c09422b385a dillo-0.8.5-r1.ebuild 3606
+MD5 f40d3614ff0a6397bf879ba3a8d22ed4 dillo-0.8.5-r2.ebuild 3606
+MD5 e23614bce2d1d77e7df6952b8f3244ca dillo-0.7.3-r7.ebuild 3061
 MD5 37762f6bddfcecc84da47bef66268d43 dillo-0.8.5.ebuild 3622
 MD5 3ff31b5479b2a0244f5711fff3155aed metadata.xml 221
-MD5 99323cd2b770d46b4524f22884ba14ae ChangeLog 13072
+MD5 30eeb7fe4579a8864d7a1591810820ff dillo-0.8.4-r1.ebuild 3594
+MD5 efac901b41f4e799579c065e66d5d7ed dillo-0.8.4-r2.ebuild 3594
+MD5 8114dfcae2f9f3437c043ed6953f219d files/digest-dillo-0.8.5-r1 226
+MD5 b2d1d2280e92c7e86dcfb11fe73eb777 files/digest-dillo-0.8.5-r2 226
 MD5 e257387d2c71e79a44b93b59e5240db3 files/digest-dillo-0.7.3-r7 226
-MD5 b86fffd43a8ba3b6791d459ad012a2e3 files/digest-dillo-0.8.4-r1 226
-MD5 cec29ab3305c35980bc16ecc1eac7b8d files/digest-dillo-0.8.4-r2 226
 MD5 deb91ab61005bccf824ad864ea0ea66a files/digest-dillo-0.8.5 142
-MD5 8114dfcae2f9f3437c043ed6953f219d files/digest-dillo-0.8.5-r1 226
+MD5 b86fffd43a8ba3b6791d459ad012a2e3 files/digest-dillo-0.8.4-r1 226
 MD5 7750091e1346c986eeb58aef81297fd0 files/dillo-format-string-vulnerability.diff 787
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDK/mzKf2g/qXtneoRApDLAKCumyF3maVHxfl+LjiearvPL65t4QCfZdwV
-ZOfDx/HJ/aP0sDNGv2nke80=
-=Hbao
------END PGP SIGNATURE-----
+MD5 cec29ab3305c35980bc16ecc1eac7b8d files/digest-dillo-0.8.4-r2 226
diff --git a/www-client/dillo/dillo-0.8.4-r2.ebuild b/www-client/dillo/dillo-0.8.4-r2.ebuild
deleted file mode 100644
index 2c58771db113..000000000000
--- a/www-client/dillo/dillo-0.8.4-r2.ebuild
+++ /dev/null
@@ -1,132 +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-r2.ebuild,v 1.9 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-20050402"
-
-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="alpha ~amd64 arm hppa ~mips ppc ppc64 sparc x86"
-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"
-	append-flags "-O"
-
-	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.4-r1.ebuild b/www-client/dillo/dillo-0.8.5-r2.ebuild
index c4c3899c53b6..f711d636ff31 100644
--- a/www-client/dillo/dillo-0.8.4-r1.ebuild
+++ b/www-client/dillo/dillo-0.8.5-r2.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.4-r1.ebuild,v 1.8 2005/07/10 20:50:24 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-0.8.5-r2.ebuild,v 1.1 2005/10/30 04:39:36 usata Exp $
 
 inherit flag-o-matic eutils
 
 S2=${WORKDIR}/dillo-gentoo-extras-patch4
-DILLO_I18N_P="${P}-i18n-misc-20050219"
+DILLO_I18N_P="${P}-i18n-misc-20051010"
 
 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="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 MISC_IUSE="nls truetype"
 IUSE="${MISC_IUSE} ipv6 ssl"
 
@@ -31,7 +31,8 @@ DEPEND="sys-devel/autoconf
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ../${DILLO_I18N_P}.diff
+	epatch ../${DILLO_I18N_P}.diff || die
+	sh autogen.sh || die
 
 	if [ "${DILLO_ICONSET}" = "kde" ]
 	then
@@ -64,8 +65,6 @@ src_unpack() {
 	else
 		einfo "Using default Dillo icon set"
 	fi
-
-	cd ${S}; sh autogen.sh || die
 }
 
 src_compile() {
@@ -74,6 +73,7 @@ src_compile() {
 
 	local myconf
 
+	# misc features
 	myconf="$(use_enable nls)
 		$(use_enable truetype anti-alias)
 		--enable-tabs
diff --git a/www-client/dillo/dillo-0.8.5.ebuild b/www-client/dillo/dillo-0.8.5.ebuild
deleted file mode 100644
index 9ee10ed61265..000000000000
--- a/www-client/dillo/dillo-0.8.5.ebuild
+++ /dev/null
@@ -1,132 +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.5.ebuild,v 1.3 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-20050414"
-
-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="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-#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 || die
-	#sh autogen.sh || die
-
-	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"
-	append-flags "-O"
-
-	local myconf
-
-	# misc features
-	#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/files/digest-dillo-0.8.4-r1 b/www-client/dillo/files/digest-dillo-0.8.4-r1
deleted file mode 100644
index b536d54b8799..000000000000
--- a/www-client/dillo/files/digest-dillo-0.8.4-r1
+++ /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 5fd62c111a3b2046bcc0c1f776f83703 dillo-0.8.4-i18n-misc-20050219.diff.bz2 229315
diff --git a/www-client/dillo/files/digest-dillo-0.8.4-r2 b/www-client/dillo/files/digest-dillo-0.8.4-r2
deleted file mode 100644
index 7e445c6f8e3f..000000000000
--- a/www-client/dillo/files/digest-dillo-0.8.4-r2
+++ /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 619a96918345c8b1170ab1f3ed26b3f9 dillo-0.8.4-i18n-misc-20050402.diff.bz2 232098
diff --git a/www-client/dillo/files/digest-dillo-0.8.5 b/www-client/dillo/files/digest-dillo-0.8.5-r2
index 217a4687d611..73bbdd1a1a25 100644
--- a/www-client/dillo/files/digest-dillo-0.8.5
+++ b/www-client/dillo/files/digest-dillo-0.8.5-r2
@@ -1,2 +1,3 @@
 MD5 d0ab7fa1d40b310deb891388604188f8 dillo-0.8.5.tar.bz2 424795
 MD5 0d0bc7cdd39dc66b80280f73d74bfeaf dillo-gentoo-extras-patch4.tar.bz2 98800
+MD5 b4191226e7e3e5f1a6bf7e43004e26da dillo-0.8.5-i18n-misc-20051010.diff.bz2 247058