Marking 2.2.8-r1 stable (x86)

Package-Manager: portage-2.0.51.22-r2

6 files changed, 13 insertions, 151 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index bc0ca37a9884..75b8a2ff9112 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.122 2005/08/04 11:50:44 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.123 2005/08/29 04:29:46 leonardop Exp $
+
+  29 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  gimp-2.2.8-r1.ebuild:
+  Stable on x86.
 
   04 Aug 2005; John N. Laliberte <allanonjl@gentoo.org>
   gimp-2.2.6-r1.ebuild:
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index db89487e6ce2..d648ce053ebc 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,15 +1,12 @@
-MD5 359821884fafa1b60877a1bc8f2e8939 gimp-2.2.8-r1.ebuild 4663
+MD5 47c1fd995029966c1a4cafe29c0b99da ChangeLog 18340
 MD5 2649b2a2f35aa2549ab4d81e750ea2d2 gimp-1.2.5.ebuild 3279
-MD5 6a127b6934fb17cf0346b81b42916591 gimp-2.0.4.ebuild 3280
-MD5 39d4983eff8a926fd6bc0b8bc122ee3f gimp-2.2.6-r1.ebuild 4307
-MD5 bf2eaad44bf5830a9662549b2534866d ChangeLog 18243
+MD5 e15a647fd9896f04c70cf29262b20ffb gimp-2.2.8-r1.ebuild 4662
 MD5 f4713bbf77ae895c7ff6c022a7a2f542 metadata.xml 222
+MD5 39d4983eff8a926fd6bc0b8bc122ee3f gimp-2.2.6-r1.ebuild 4307
+MD5 662e7b51f4c882429b73dea3263b39de files/digest-gimp-1.2.5 65
+MD5 aebd823dc72aefe0a0e4596da64c7277 files/digest-gimp-2.2.8-r1 134
 MD5 9d903731e90f07c2492aab4bd55f0e62 files/gimp-2.2.8-restart-marker.patch 611
-MD5 12ff6c7c980ee34dc7d4d94aa40059b0 files/ltmain_sh-1.5.0-fix-relink.patch 1718
 MD5 9696bde4a1b70dd2816d46bed477ebc0 files/gimp.desktop 2404
-MD5 8bf83fb83ce1c66006a27a7d9ec29dd7 files/pygimp-logo.png 19823
+MD5 12ff6c7c980ee34dc7d4d94aa40059b0 files/ltmain_sh-1.5.0-fix-relink.patch 1718
 MD5 5bd6fc067eba3828be1e3a49b4aa1c44 files/digest-gimp-2.2.6-r1 134
-MD5 aebd823dc72aefe0a0e4596da64c7277 files/digest-gimp-2.2.8-r1 134
 MD5 ff17b80bceb6bd818e20556c23647b0f files/gimp-2.2.8-configure-fix.patch 2423
-MD5 662e7b51f4c882429b73dea3263b39de files/digest-gimp-1.2.5 65
-MD5 0d3108f9120d6976ce4ccb29a131aea7 files/digest-gimp-2.0.4 133
diff --git a/media-gfx/gimp/files/digest-gimp-2.0.4 b/media-gfx/gimp/files/digest-gimp-2.0.4
deleted file mode 100644
index 8989ad8b82e4..000000000000
--- a/media-gfx/gimp/files/digest-gimp-2.0.4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 731198e0f46cca833243c43197681c66 gimp-2.0.4.tar.bz2 13845175
-MD5 41adc4749ba78171135063436325ff23 gimp-help-2-0.4.tar.gz 9399232
diff --git a/media-gfx/gimp/files/pygimp-logo.png b/media-gfx/gimp/files/pygimp-logo.png
deleted file mode 100644
index 6f7ef4d56918..000000000000
--- a/media-gfx/gimp/files/pygimp-logo.png
+++ /dev/null
diff --git a/media-gfx/gimp/gimp-2.0.4.ebuild b/media-gfx/gimp/gimp-2.0.4.ebuild
deleted file mode 100644
index 0a11945aeaad..000000000000
--- a/media-gfx/gimp/gimp-2.0.4.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.0.4.ebuild,v 1.11 2005/07/16 02:18:13 allanonjl Exp $
-
-inherit flag-o-matic libtool eutils
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="http://www.gimp.org/"
-LICENSE="GPL-2"
-
-P_HELP="gimp-help-${PV/\./-}"
-S_HELP="$WORKDIR/${P_HELP}"
-SRC_URI="mirror://gimp/v2.0/${P}.tar.bz2
-	doc? ( mirror://gimp/help/testing/${P_HELP}.tar.gz )"
-
-SLOT="2"
-KEYWORDS="x86 ppc hppa sparc amd64 mips ppc64"
-#IUSE="X aalib altivec debug doc gimpprint jpeg mmx mng png python sse svg tiff wmf"
-IUSE="aalib altivec debug doc gimpprint jpeg mmx mng png python sse svg tiff wmf"
-
-# FIXME : some more things can be (local) USE flagged
-# a few options are detection only, fix them to switch
-
-#	X? ( virtual/x11 )"
-RDEPEND="virtual/x11
-	>=dev-libs/glib-2.2
-	>=x11-libs/gtk+-2.2.2
-	>=x11-libs/pango-1.2.2
-	>=media-libs/fontconfig-2.2
-	>=media-libs/libart_lgpl-2.3.8-r1
-	sys-libs/zlib
-
-	gimpprint? ( =media-gfx/gimp-print-4.2* )
-	doc? ( =gnome-extra/libgtkhtml-2* )
-
-	png? ( >=media-libs/libpng-1.2.1 )
-	jpeg? ( >=media-libs/jpeg-6b-r2
-		media-libs/libexif )
-	tiff? ( >=media-libs/tiff-3.5.7 )
-	mng? ( media-libs/libmng )
-
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	svg? ( >=gnome-base/librsvg-2.2 )
-
-	aalib?	( media-libs/aalib )
-	python?	( >=dev-lang/python-2.2
-		>=dev-python/pygtk-2 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	dev-util/intltool
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-	# Fix linking to older version of gimp if installed - this should
-	# void liquidx's hack, so it is removed.
-	epatch ${FILESDIR}/ltmain_sh-1.5.0-fix-relink.patch
-
-}
-
-src_compile() {
-
-	# Since 1.3.16, fixes linker problems when upgrading
-	elibtoolize
-
-	# Workaround portage variable leakage
-	local AA=
-
-	# only use mmx if hardened is not set
-	local USE_MMX=
-
-	replace-flags "-march=k6*" "-march=i586"
-
-	# gimp uses inline functions (plug-ins/common/grid.c) (#23078)
-	# gimp uses floating point math, needs accuracy (#98685)
-	filter-flags "-fno-inline" "-ffast-math"
-
-	if use hardened; then
-		ewarn "hardened use flag suppressing mmx use flag"
-		HARDENED_SUPPRESS_MMX="--disable-mmx"
-	else
-		HARDENED_SUPPRESS_MMX="`use_enable mmx`"
-	fi
-
-	econf \
-		--disable-default-binary \
-		--with-x \
-		"${HARDENED_SUPPRESS_MMX}" \
-		`use_enable sse` \
-		`use_enable altivec` \
-		`use_enable doc gtk-doc` \
-		`use_enable python` \
-		`use_enable gimpprint print` \
-		`use_with png libpng` \
-		`use_with jpeg libjpeg` \
-		`use_with jpeg libexif` \
-		`use_with tiff libtiff` \
-		`use_with mng libmng` \
-		`use_with aalib aa` \
-		`use_enable debug` || die
-
-	# X isn't optional (#58003) atm
-	#	`use_with X x` \
-
-	emake || die
-
-	if use doc; then
-		cd ${S_HELP}
-		econf --without-gimp || die
-		emake || die
-	fi
-
-}
-
-src_install() {
-
-	# Workaround portage variable leakage
-	local AA=
-
-	# create these dirs to make the makefile installs these items correctly
-	dodir /usr/share/{applications,application-registry,mime-info}
-
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeL* HACKING INSTALL \
-		MAINTAINERS NEWS PLUGIN_MAINTAINERS README* TODO*
-
-	if use doc; then
-		cd ${S_HELP}
-		make DESTDIR=${D} install || die
-	fi
-
-}
diff --git a/media-gfx/gimp/gimp-2.2.8-r1.ebuild b/media-gfx/gimp/gimp-2.2.8-r1.ebuild
index a68840c78519..8a5a8c598d95 100644
--- a/media-gfx/gimp/gimp-2.2.8-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.2.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.8-r1.ebuild,v 1.2 2005/07/16 02:18:13 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.8-r1.ebuild,v 1.3 2005/08/29 04:29:46 leonardop Exp $
 
 inherit flag-o-matic libtool eutils fdo-mime alternatives
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://gimp/v2.2/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="aalib altivec debug doc gtkhtml gimpprint hardened jpeg lcms mmx mng png
 python scanner smp sse svg tiff wmf"