media-gfx/gimp: Remove vulnerable 2.6.12-r{2,4}

(Portage version: 2.1.10.65/cvs/Linux x86_64)

3 files changed, 6 insertions, 323 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 4c9447f5bed3..3224f6482bfd 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.397 2012/09/29 20:10:26 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.398 2012/09/29 20:14:22 sping Exp $
+
+  29 Sep 2012; Sebastian Pipping <sping@gentoo.org> -gimp-2.6.12-r2.ebuild,
+  -gimp-2.6.12-r4.ebuild:
+  Remove vulnerable 2.6.12-r{2,4} ebuilds with a newer 2.6.12-r5 version stable
+  on all arches
 
   29 Sep 2012; Sebastian Pipping <sping@gentoo.org> gimp-2.6.12-r2.ebuild,
   gimp-2.6.12-r4.ebuild, gimp-2.6.12-r5.ebuild, gimp-2.8.2.ebuild:
diff --git a/media-gfx/gimp/gimp-2.6.12-r2.ebuild b/media-gfx/gimp/gimp-2.6.12-r2.ebuild
deleted file mode 100644
index 8365f8662d29..000000000000
--- a/media-gfx/gimp/gimp-2.6.12-r2.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.12-r2.ebuild,v 1.8 2012/09/29 20:10:26 sping Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="python? 2:2.5"
-
-inherit eutils gnome2 fdo-mime multilib python
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="http://www.gimp.org/"
-SRC_URI="
-	http://dev.gentoo.org/~jlec/distfiles/${PN}-2.6.11-underlinking.patch.xz
-	mirror://gimp/v2.6/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-
-LANGS="am ar ast az be bg ca ca@valencia cs da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml mr ms my nb nds ne nl nn oc or pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec curl dbus debug doc exif gnome jpeg lcms mmx mng pdf png python smp sse svg tiff webkit wmf"
-
-for lang in ${LANGS}; do
-	IUSE+=" linguas_${lang}"
-done
-
-RDEPEND="
-	>=dev-libs/glib-2.18.1:2
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=media-libs/fontconfig-2.2.0
-	>=media-libs/freetype-2.1.7
-	>=media-libs/gegl-0.0.22 <media-libs/gegl-0.2
-	>=x11-libs/gtk+-2.12.5:2
-	x11-libs/libXpm
-	>=x11-libs/pango-1.18.0
-	sys-libs/zlib
-	x11-themes/hicolor-icon-theme
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	curl? ( net-misc/curl )
-	dbus? ( dev-libs/dbus-glib )
-	exif? ( >=media-libs/libexif-0.6.15 )
-	gnome? ( gnome-base/gvfs )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( =media-libs/lcms-1* )
-	mng? ( media-libs/libmng )
-	pdf? ( >=app-text/poppler-0.12.3-r3[cairo] )
-	png? ( >=media-libs/libpng-1.2.2:0 )
-	python?	( >=dev-python/pygtk-2.10.4:2 )
-	svg? ( >=gnome-base/librsvg-2.8.0:2 )
-	tiff? ( >=media-libs/tiff-3.5.7:0 )
-	webkit? ( net-libs/webkit-gtk:2 )
-	wmf? ( >=media-libs/libwmf-0.2.8 )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-pkg_setup() {
-	G2CONF="--enable-default-binary \
-		--with-x \
-		$(use_with aalib aa) \
-		$(use_with alsa) \
-		$(use_enable altivec) \
-		$(use_with curl libcurl) \
-		$(use_with dbus) \
-		--without-hal \
-		$(use_with gnome gvfs) \
-		--without-gnomevfs \
-		$(use_with webkit) \
-		$(use_with jpeg libjpeg) \
-		$(use_with exif libexif) \
-		$(use_with lcms) \
-		$(use_enable mmx) \
-		$(use_with mng libmng) \
-		$(use_with pdf poppler) \
-		$(use_with png libpng) \
-		$(use_enable python) \
-		$(use_enable smp mp) \
-		$(use_enable sse) \
-		$(use_with svg librsvg) \
-		$(use_with tiff libtiff) \
-		$(use_with wmf)"
-
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# don't use empty, removed header
-	# https://bugs.gentoo.org/show_bug.cgi?id=377075
-	epatch "${FILESDIR}"/gimp-curl-headers.diff
-
-	# apply file-uri patch by upstream
-	# https://bugs.gentoo.org/show_bug.cgi?id=372941
-	# https://bugzilla.gnome.org/show_bug.cgi?id=653980#c6
-	epatch "${FILESDIR}"/${PN}-2.6.11-file-uri.patch
-
-	# fix test suite
-	# https://bugs.gentoo.org/show_bug.cgi?id=406625
-	epatch "${FILESDIR}"/${P}-potfiles-skip.patch
-
-	# buffer overflow patch backport
-	# https://bugs.gentoo.org/show_bug.cgi?id=418425
-	epatch "${FILESDIR}"/${P}-CVE-2012-2763.patch
-
-	echo '#!/bin/sh' > py-compile
-	gnome2_src_prepare
-}
-
-_clean_up_locales() {
-	einfo "Cleaning up locales..."
-	for lang in ${LANGS}; do
-		use "linguas_${lang}" && {
-			einfo "- keeping ${lang}"
-			continue
-		}
-		rm -Rf "${D}"/usr/share/locale/"${lang}" || die
-	done
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python; then
-		python_convert_shebangs -r $(python_get_version) "${ED}"
-		python_need_rebuild
-	fi
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${D}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	find "${D}" -name '*.la' -delete || die
-
-	_clean_up_locales
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	use python && python_mod_optimize /usr/$(get_libdir)/gimp/2.0/python \
-		/usr/$(get_libdir)/gimp/2.0/plug-ins
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	use python && python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \
-		/usr/$(get_libdir)/gimp/2.0/plug-ins
-}
diff --git a/media-gfx/gimp/gimp-2.6.12-r4.ebuild b/media-gfx/gimp/gimp-2.6.12-r4.ebuild
deleted file mode 100644
index c3056a0561c7..000000000000
--- a/media-gfx/gimp/gimp-2.6.12-r4.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.12-r4.ebuild,v 1.2 2012/09/29 20:10:26 sping Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="python? 2:2.5"
-
-inherit eutils gnome2 fdo-mime multilib python
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="http://www.gimp.org/"
-SRC_URI="
-	http://dev.gentoo.org/~jlec/distfiles/${PN}-2.6.11-underlinking.patch.xz
-	mirror://gimp/v2.6/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-LANGS="am ar ast az be bg ca ca@valencia cs da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml mr ms my nb nds ne nl nn oc or pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec curl dbus debug doc exif gnome jpeg lcms mmx mng pdf png python smp sse svg tiff webkit wmf"
-
-for lang in ${LANGS}; do
-	IUSE+=" linguas_${lang}"
-done
-
-RDEPEND="
-	>=dev-libs/glib-2.18.1:2
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=media-libs/fontconfig-2.2.0
-	>=media-libs/freetype-2.1.7
-	>=media-libs/gegl-0.0.22 <media-libs/gegl-0.2
-	>=x11-libs/gtk+-2.12.5:2
-	x11-libs/libXpm
-	>=x11-libs/pango-1.18.0
-	sys-libs/zlib
-	x11-themes/hicolor-icon-theme
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	curl? ( net-misc/curl )
-	dbus? ( dev-libs/dbus-glib )
-	exif? ( >=media-libs/libexif-0.6.15 )
-	gnome? ( gnome-base/gvfs )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( =media-libs/lcms-1* )
-	mng? ( media-libs/libmng )
-	pdf? ( >=app-text/poppler-0.12.3-r3[cairo] )
-	png? ( >=media-libs/libpng-1.2.2:0 )
-	python?	( >=dev-python/pygtk-2.10.4:2 )
-	svg? ( >=gnome-base/librsvg-2.8.0:2 )
-	tiff? ( >=media-libs/tiff-3.5.7:0 )
-	webkit? ( net-libs/webkit-gtk:2 )
-	wmf? ( >=media-libs/libwmf-0.2.8 )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-pkg_setup() {
-	G2CONF="--enable-default-binary \
-		--with-x \
-		$(use_with aalib aa) \
-		$(use_with alsa) \
-		$(use_enable altivec) \
-		$(use_with curl libcurl) \
-		$(use_with dbus) \
-		--without-hal \
-		$(use_with gnome gvfs) \
-		--without-gnomevfs \
-		$(use_with webkit) \
-		$(use_with jpeg libjpeg) \
-		$(use_with exif libexif) \
-		$(use_with lcms) \
-		$(use_enable mmx) \
-		$(use_with mng libmng) \
-		$(use_with pdf poppler) \
-		$(use_with png libpng) \
-		$(use_enable python) \
-		$(use_enable smp mp) \
-		$(use_enable sse) \
-		$(use_with svg librsvg) \
-		$(use_with tiff libtiff) \
-		$(use_with wmf)"
-
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# don't use empty, removed header
-	# https://bugs.gentoo.org/show_bug.cgi?id=377075
-	epatch "${FILESDIR}"/gimp-curl-headers.diff
-
-	# apply file-uri patch by upstream
-	# https://bugs.gentoo.org/show_bug.cgi?id=372941
-	# https://bugzilla.gnome.org/show_bug.cgi?id=653980#c6
-	epatch "${FILESDIR}"/${PN}-2.6.11-file-uri.patch
-
-	# fix test suite
-	# https://bugs.gentoo.org/show_bug.cgi?id=406625
-	epatch "${FILESDIR}"/${P}-potfiles-skip.patch
-
-	# buffer overflow patch backport
-	# https://bugs.gentoo.org/show_bug.cgi?id=418425
-	epatch "${FILESDIR}"/${P}-CVE-2012-2763.patch
-
-	# CEL and GIF plug-ins: Heap-based buffer overflows (CVE-2012-{3403,3481})
-	# https://bugs.gentoo.org/show_bug.cgi?id=434580
-	# Patches from Fedora <http://pkgs.fedoraproject.org/cgit/gimp.git/tree/?h=f16>
-	epatch "${FILESDIR}"/${P}-CVE-2012-3403.patch
-	epatch "${FILESDIR}"/${P}-CVE-2012-3481.patch
-
-	echo '#!/bin/sh' > py-compile
-	gnome2_src_prepare
-}
-
-_clean_up_locales() {
-	einfo "Cleaning up locales..."
-	for lang in ${LANGS}; do
-		use "linguas_${lang}" && {
-			einfo "- keeping ${lang}"
-			continue
-		}
-		rm -Rf "${D}"/usr/share/locale/"${lang}" || die
-	done
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python; then
-		python_convert_shebangs -r $(python_get_version) "${ED}"
-		python_need_rebuild
-	fi
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${D}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	find "${D}" -name '*.la' -delete || die
-
-	_clean_up_locales
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	use python && python_mod_optimize /usr/$(get_libdir)/gimp/2.0/python \
-		/usr/$(get_libdir)/gimp/2.0/plug-ins
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	use python && python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \
-		/usr/$(get_libdir)/gimp/2.0/plug-ins
-}