Removing vulnerable versions wrt bug 276432 now that 2.1.1 is stable on all arches

(Portage version: 2.2_rc33/cvs/Linux x86_64)

5 files changed, 6 insertions, 398 deletions

diff --git a/www-client/dillo/ChangeLog b/www-client/dillo/ChangeLog
index 6d8dd97c0ec6..8dd4625d4141 100644
--- a/www-client/dillo/ChangeLog
+++ b/www-client/dillo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/dillo
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.79 2009/07/15 21:45:14 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.80 2009/07/15 22:22:03 yngwin Exp $
+
+  15 Jul 2009; Ben de Groot <yngwin@gentoo.org> -dillo-0.8.6.ebuild,
+  -dillo-0.8.6-r1.ebuild, -dillo-2.0.ebuild, -dillo-2.0-r1.ebuild:
+  Removing vulnerable versions wrt bug 276432 now that 2.1.1 is stable on
+  all arches
 
   15 Jul 2009; Mounir Lamouri <volkmar@gentoo.org> dillo-2.1.1.ebuild:
   Stable on ppc. Bug 276432
diff --git a/www-client/dillo/dillo-0.8.6-r1.ebuild b/www-client/dillo/dillo-0.8.6-r1.ebuild
deleted file mode 100644
index 7dae2afc24dd..000000000000
--- a/www-client/dillo/dillo-0.8.6-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-0.8.6-r1.ebuild,v 1.1 2008/10/28 14:56:08 matsuu Exp $
-
-inherit flag-o-matic eutils autotools
-
-S2="${WORKDIR}/dillo-gentoo-extras-patch4"
-DILLO_I18N_P="${P}-i18n-misc-20070916"
-
-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} fltk ipv6 ssl"
-IUSE="${MISC_IUSE} ipv6 ssl"
-
-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 )"
-#	fltk? ( >=x11-libs/fltk-2 )
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch ../${DILLO_I18N_P}.diff
-	epatch "${FILESDIR}"/${PN}-build-fix.patch
-	epatch "${FILESDIR}"/${PN}-asneeded.patch
-	epatch "${FILESDIR}"/${PN}-ac_subst.patch
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-
-	AT_M4DIR="${S}/m4" eautoreconf
-
-	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-cpu-flags k6 pentium
-	is-flag -O? || append-flags "-O2"
-
-	local myconf
-
-	# misc features
-	myconf="$(use_enable nls)
-		$(use_enable truetype anti-alias)
-		--disable-gtktest
-		--disable-dlgui
-		--enable-tabs
-		--enable-meta-refresh"
-
-	myconf="${myconf}
-		$(use_enable ipv6)
-		$(use_enable ssl)"
-	#	$(use_enable fltk dlgui)
-
-	econf ${myconf} || die
-	emake -j1 || die "emake failed."
-}
-
-src_install() {
-	dodir /etc
-	dodir /usr/share/icons/${PN}
-	emake -j1 DESTDIR="${D}" install || die "install failed"
-
-	dodoc AUTHORS ChangeLog* README NEWS
-	docinto doc
-	dodoc doc/*.txt doc/README
-
-	insinto /usr/share/icons/${PN}
-	doins "${S2}"/icons/*.png
-}
-
-pkg_postinst() {
-	elog "This ebuild for dillo comes with different toolbar icons"
-	elog "If you want mozilla style icons then try"
-	elog "	DILLO_ICONSET=\"mozilla\" emerge dillo"
-	elog
-	elog "If you prefer konqueror style icons then try"
-	elog "	DILLO_ICONSET=\"kde\" emerge dillo"
-	elog
-	elog "If you prefer ximian gnome style icons then try"
-	elog "	DILLO_ICONSET=\"gnome\" emerge dillo"
-	elog
-	elog "If you prefer cobalt style icons then try"
-	elog "	DILLO_ICONSET=\"cobalt\" emerge dillo"
-	elog
-	elog "If you prefer bold style icons then try"
-	elog "	DILLO_ICONSET=\"bold\" emerge dillo"
-	elog
-	elog "If you prefer transparent style icons then try"
-	elog "	DILLO_ICONSET=\"trans\" emerge dillo"
-	elog
-	elog "If you prefer the traditional icons then try"
-	elog "	DILLO_ICONSET=\"trad\" emerge dillo"
-	elog
-	elog "If the DILLO_ICONSET variable is not set, you will get the"
-	elog "default iconset"
-	elog
-	elog "To see what the icons look like, please point your browser to:"
-	elog "http://dillo.auriga.wearlab.de/Icons/"
-	elog
-}
diff --git a/www-client/dillo/dillo-0.8.6.ebuild b/www-client/dillo/dillo-0.8.6.ebuild
deleted file mode 100644
index b4f364a01d70..000000000000
--- a/www-client/dillo/dillo-0.8.6.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-0.8.6.ebuild,v 1.13 2008/05/19 23:41:14 truedfx Exp $
-
-inherit flag-o-matic eutils autotools
-
-S2=${WORKDIR}/dillo-gentoo-extras-patch4
-DILLO_I18N_P="${P}-i18n-misc-20060625"
-
-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"
-
-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
-	epatch "${FILESDIR}"/${PN}-build-fix.patch
-	epatch "${FILESDIR}"/${PN}-asneeded.patch
-	epatch "${FILESDIR}"/${PN}-ac_subst.patch
-	AT_M4DIR="${S}/m4" eautoreconf
-
-	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-cpu-flags k6 pentium
-	is-flag -O? || append-flags "-O2"
-
-	local myconf
-
-	# misc features
-	myconf="$(use_enable nls)
-		$(use_enable truetype anti-alias)
-		--disable-gtktest
-		--disable-dlgui
-		--enable-tabs
-		--enable-meta-refresh"
-
-	myconf="${myconf}
-		$(use_enable ipv6)
-		$(use_enable ssl)"
-
-	econf ${myconf}
-	emake -j1 || die "emake failed."
-}
-
-src_install() {
-	dodir /etc
-	dodir /usr/share/icons/${PN}
-	emake DESTDIR="${D}" install || die "install failed"
-
-	dodoc AUTHORS ChangeLog* README NEWS
-	docinto doc
-	dodoc doc/*.txt doc/README
-
-	cp ${S2}/icons/*.png "${D}"/usr/share/icons/${PN}
-}
-
-pkg_postinst() {
-	elog "This ebuild for dillo comes with different toolbar icons"
-	elog "If you want mozilla style icons then try"
-	elog "	DILLO_ICONSET=\"mozilla\" emerge dillo"
-	elog
-	elog "If you prefer konqueror style icons then try"
-	elog "	DILLO_ICONSET=\"kde\" emerge dillo"
-	elog
-	elog "If you prefer ximian gnome style icons then try"
-	elog "	DILLO_ICONSET=\"gnome\" emerge dillo"
-	elog
-	elog "If you prefer cobalt style icons then try"
-	elog "	DILLO_ICONSET=\"cobalt\" emerge dillo"
-	elog
-	elog "If you prefer bold style icons then try"
-	elog "	DILLO_ICONSET=\"bold\" emerge dillo"
-	elog
-	elog "If you prefer transparent style icons then try"
-	elog "	DILLO_ICONSET=\"trans\" emerge dillo"
-	elog
-	elog "If you prefer the traditional icons then try"
-	elog "	DILLO_ICONSET=\"trad\" emerge dillo"
-	elog
-	elog "If the DILLO_ICONSET variable is not set, you will get the"
-	elog "default iconset"
-	elog
-	elog "To see what the icons look like, please point your browser to:"
-	elog "http://dillo.auriga.wearlab.de/Icons/"
-	elog
-}
diff --git a/www-client/dillo/dillo-2.0-r1.ebuild b/www-client/dillo/dillo-2.0-r1.ebuild
deleted file mode 100644
index 142dcb937a4a..000000000000
--- a/www-client/dillo/dillo-2.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-2.0-r1.ebuild,v 1.1 2009/04/17 15:11:02 yngwin Exp $
-
-EAPI="2"
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="Lean FLTK2-based web browser"
-HOMEPAGE="http://www.dillo.org/"
-SRC_URI="http://www.dillo.org/download/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
-IUSE="doc +gif ipv6 +jpeg +png ssl"
-
-RDEPEND="x11-libs/fltk:2[-cairo,jpeg=,png=]
-	sys-libs/zlib
-	jpeg? ( media-libs/jpeg )
-	png? ( media-libs/libpng )
-	ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/dillo2-inbuf.patch
-	use ssl && epatch "${FILESDIR}"/${P}-enable-ssl.patch
-}
-
-src_configure() {
-	append-ldflags "-L/usr/$(get_libdir)/fltk"
-	econf  \
-		$(use_enable gif) \
-		$(use_enable ipv6) \
-		$(use_enable jpeg) \
-		$(use_enable png) \
-		$(use_enable ssl)
-}
-
-src_compile() {
-	emake || die "make failed"
-	if use doc ; then
-		doxygen Doxyfile || die "doxygen failed"
-	fi
-}
-
-src_install() {
-	dodir /etc
-	emake DESTDIR="${D}" install || die "install failed"
-
-	if use doc; then
-		dohtml html/* || die "install documentation failed"
-	fi
-	dodoc AUTHORS ChangeLog README NEWS
-	docinto doc
-	dodoc doc/*.txt doc/README
-
-	doicon "${FILESDIR}"/dillo.png
-	make_desktop_entry dillo Dillo dillo
-
-	elog "Dillo has installed a default configuration into /etc/dillorc"
-	elog "You can copy this to ~/.dillo/ and customize it"
-}
diff --git a/www-client/dillo/dillo-2.0.ebuild b/www-client/dillo/dillo-2.0.ebuild
deleted file mode 100644
index 435038da2a83..000000000000
--- a/www-client/dillo/dillo-2.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-2.0.ebuild,v 1.8 2009/02/27 12:23:18 armin76 Exp $
-
-EAPI="2"
-inherit eutils multilib
-
-DESCRIPTION="Lean FLTK2-based web browser"
-HOMEPAGE="http://www.dillo.org/"
-SRC_URI="http://www.dillo.org/download/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
-IUSE="doc +gif ipv6 +jpeg +png ssl"
-
-RDEPEND="x11-libs/fltk:2[-cairo,jpeg=,png=]
-	sys-libs/zlib
-	jpeg? ( media-libs/jpeg )
-	png? ( media-libs/libpng )
-	ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/dillo2-inbuf.patch
-}
-
-src_configure() {
-	LDFLAGS="${LDFLAGS} -L/usr/$(get_libdir)/fltk" \
-	econf  \
-		$(use_enable gif) \
-		$(use_enable ipv6) \
-		$(use_enable jpeg) \
-		$(use_enable png) \
-		$(use_enable ssl)
-}
-
-src_compile() {
-	emake || die "make failed"
-	if use doc ; then
-		doxygen Doxyfile || die "doxygen failed"
-	fi
-}
-
-src_install() {
-	dodir /etc
-	emake DESTDIR="${D}" install || die "install failed"
-
-	if use doc; then
-		dohtml html/* || die "install documentation failed"
-	fi
-	dodoc AUTHORS ChangeLog README NEWS
-	docinto doc
-	dodoc doc/*.txt doc/README
-
-	doicon "${FILESDIR}"/dillo.png
-	make_desktop_entry dillo Dillo dillo
-
-	elog "Dillo has installed a default configuration into /etc/dillorc"
-	elog "You can copy this to ~/.dillo/ and customize it"
-}