old

(Portage version: 2.2.0_alpha27/cvs/Linux x86_64)

3 files changed, 0 insertions, 157 deletions

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 094b2c57a042..5ef066efee45 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,13 +1,10 @@
-AUX gimp-2.6.8-libpng-1.4.patch 1346 RMD160 8e6272af4bb869daeb348600e296412a7a11149d SHA1 0f9271676429a6a868ca2d104328f12d3eacb863 SHA256 521bd1f7d0afb9d8e86d99cbcdbcabeb9a1ecfff6e91ab002012f01f501d2ee3
 AUX gimp-CVE-2010-4540-to-4543.diff 5678 RMD160 0947a979ae64b2520967a6e8c3493aa37e425c3d SHA1 9b9cae60c775d4312552434373618c6cb9188e3e SHA256 b1fb9d83959cfc8e7a1ebf5d8812454686d618463010bbc0e802a1476e58305f
 AUX gimp-libpng15.diff 17119 RMD160 c04595754b3b3bf2631ab834261d14d7debb08ca SHA1 a56e8dc7e7d9df47d582285effa94b25e552093f SHA256 d77b61592d4943b052200eb98305b6cd15c24259b538c9a56afa498328470086
 DIST gimp-2.6.10.tar.bz2 16445326 RMD160 b58fc4e5717508ad531827c82e48067df0d0a748 SHA1 5781fed3fbf45969eac5e6ee2c7a4bb0bb529ecc SHA256 ef7a3fe73b352d8afeda9a5358431ea64a1d4cf3ebab588167f6335cdb52e032
 DIST gimp-2.6.11.tar.bz2 16473561 RMD160 a116377499e58dc2bfe231ab3c057d0be94091ff SHA1 2f9d596e727bdbf304fa78257c1731d9faf3934c SHA256 9b6d08d0803b3912ea596d1b77b9c21ee13778c23388a225c004b8c1587cb0a1
-DIST gimp-2.6.8.tar.bz2 16342377 RMD160 da02fedcc00ebaac04bfd21c153a7130d3ff5e08 SHA1 a550943f086abc9bf6b96d576741337b7186a4f4 SHA256 d5d4218b742390157fca23a9d2cce436904546a2ea419ffeb44a5f43c99a3332
 EBUILD gimp-2.6.10.ebuild 2856 RMD160 7389386dcf8e09d07f62f5685f9d2cca2ad17bac SHA1 ff4abf3e478000a1b5cf9bf7a200c47a725b3a47 SHA256 604b0d9c35886e427f794ae7eeb7e8b0d810c4680a528bc6b5e6d46a5d445ae8
 EBUILD gimp-2.6.11-r1.ebuild 3132 RMD160 cccd0daeed98f8b99e7655da751c28e9bb0dd22b SHA1 b65c5ec6b0ee0a4c0ea810fc7f7b25e12fe6d10d SHA256 66a6cbc9139b96b39fd84744ece945b0d70a4bf50ba15332864b0331fd0df946
 EBUILD gimp-2.6.11.ebuild 2856 RMD160 c1e11c00a3b771570d6651990f10e7c54d7dad44 SHA1 c689443f69136a5ec67339066cad5c5e1b0a7c71 SHA256 1cd39cd2f37b89e139d4bec1dc36457d5e06ab45168b2356556d4dfeb4ccbffa
-EBUILD gimp-2.6.8.ebuild 2875 RMD160 496aa97a37143a90d7c63fb3844c88718fa2880a SHA1 8abeb00056103fc3076a31be80f9defbd86e58ee SHA256 eed6aa18f0c04dcc875d64d6fb4628eda9b7422184012eb04c61463f1017fa45
 EBUILD gimp-9999.ebuild 2916 RMD160 f7f6f627eacc24d5657e50a75d53cb7ce2d41700 SHA1 871e2a29dee0d55c5a870cd7bd26224235e393b6 SHA256 794160bd1396710e57170585bc480e68d2c1cb5f268850c2bcc0833d3d30c7f8
 MISC ChangeLog 44201 RMD160 08bf6c81bca15e323a13393a9181298a0745d54a SHA1 63691de5c8a49492c787378338537d7fec3a16ec SHA256 397db22b18fe5903dbe1bc94027dabf641a1a75aaf0a310cb0e561ab870b6525
 MISC metadata.xml 366 RMD160 5ae566a82314bb47784051f6ca13fc1a9ecd137e SHA1 dce399814102ba9802439497439e2e00ecc3b82e SHA256 380bccccb72b527f81e02fd37b41b584316fcd7c802b959b8eae27fcef0c0db5
diff --git a/media-gfx/gimp/files/gimp-2.6.8-libpng-1.4.patch b/media-gfx/gimp/files/gimp-2.6.8-libpng-1.4.patch
deleted file mode 100644
index 01ab5860f7a3..000000000000
--- a/media-gfx/gimp/files/gimp-2.6.8-libpng-1.4.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From b22eb0a8271a99257fe214cbf0adda29cf9a39dd Mon Sep 17 00:00:00 2001
-From: Michael Natterer <mitch@gimp.org>
-Date: Sun, 31 Jan 2010 11:28:02 +0000
-Subject: Bug 607242 - GIMP 2.7.0 fails to build against libpng 1.4.0
-
-Use png_set_expand_gray_1_2_4_to_8() instead of the deprecated
-png_set_gray_1_2_4_to_8() if libpng is at least 1.2.27 (which is in
-debian stable), so plug-ins built against old versions contine to work
-when libpng 1.4 gets installed.
----
-diff --git a/plug-ins/file-ico/ico-load.c b/plug-ins/file-ico/ico-load.c
-index 79512ae..4d894be 100644
---- a/plug-ins/file-ico/ico-load.c
-+++ b/plug-ins/file-ico/ico-load.c
-@@ -287,14 +287,22 @@ ico_read_png (FILE    *fp,
-   switch (color_type)
-     {
-     case PNG_COLOR_TYPE_GRAY:
-+#if PNG_LIBPNG_VER < 10227
-       png_set_gray_1_2_4_to_8 (png_ptr);
-+#else
-+      png_set_expand_gray_1_2_4_to_8 (png_ptr);
-+#endif
-       if ( bit_depth == 16 )
-         png_set_strip_16 (png_ptr);
-       png_set_gray_to_rgb (png_ptr);
-       png_set_add_alpha (png_ptr, 0xff, PNG_FILLER_AFTER);
-       break;
-     case PNG_COLOR_TYPE_GRAY_ALPHA:
-+#if PNG_LIBPNG_VER < 10227
-       png_set_gray_1_2_4_to_8 (png_ptr);
-+#else
-+      png_set_expand_gray_1_2_4_to_8 (png_ptr);
-+#endif
-       if ( bit_depth == 16 )
-         png_set_strip_16 (png_ptr);
-       png_set_gray_to_rgb (png_ptr);
---
-cgit v0.8.3.1
diff --git a/media-gfx/gimp/gimp-2.6.8.ebuild b/media-gfx/gimp/gimp-2.6.8.ebuild
deleted file mode 100644
index 7770529591c0..000000000000
--- a/media-gfx/gimp/gimp-2.6.8.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.8.ebuild,v 1.16 2011/01/28 18:02:17 arfrever 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="mirror://gimp/v2.6/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-
-IUSE="alsa aalib altivec curl dbus debug doc exif gnome hal jpeg lcms mmx mng pdf png python smp sse svg tiff webkit wmf"
-
-RDEPEND=">=dev-libs/glib-2.18.1
-	>=x11-libs/gtk+-2.12.5
-	>=x11-libs/pango-1.18.0
-	>=media-libs/freetype-2.1.7
-	>=media-libs/fontconfig-2.2.0
-	sys-libs/zlib
-	dev-libs/libxml2
-	dev-libs/libxslt
-	x11-misc/xdg-utils
-	x11-themes/hicolor-icon-theme
-	>=media-libs/gegl-0.0.22
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	curl? ( net-misc/curl )
-	dbus? ( dev-libs/dbus-glib )
-	hal? ( sys-apps/hal )
-	gnome? ( gnome-base/gvfs )
-	webkit? ( net-libs/webkit-gtk )
-	jpeg? ( virtual/jpeg )
-	exif? ( >=media-libs/libexif-0.6.15 )
-	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 )
-	python?	( >=dev-python/pygtk-2.10.4 )
-	tiff? ( >=media-libs/tiff-3.5.7 )
-	svg? ( >=gnome-base/librsvg-2.8.0 )
-	wmf? ( >=media-libs/libwmf-0.2.8 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.40
-	>=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) \
-		$(use_with 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() {
-	echo '#!/bin/sh' > py-compile
-	epatch "${FILESDIR}/${P}-libpng-1.4.patch"
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python; then
-		python_convert_shebangs -r $(python_get_version) "${ED}"
-		python_need_rebuild
-	fi
-}
-
-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
-}