version bump to 2.2.8, fixes #97306

(Portage version: 2.0.51.19)

7 files changed, 15 insertions, 196 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 7455d6a7a61d..2b044fbf09d8 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,14 @@
 # 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.117 2005/06/15 01:53:23 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.118 2005/06/28 23:35:34 allanonjl Exp $
+
+*gimp-2.2.8 (28 Jun 2005)
+
+  28 Jun 2005; John N. Laliberte <allanonjl@gentoo.org>
+  -files/gimp-2.2.7-configure-fix.patch,
+  +files/gimp-2.2.8-configure-fix.patch, -gimp-2.2.7.ebuild,
+  -gimp-2.2.7-r1.ebuild, +gimp-2.2.8.ebuild:
+  version bump to 2.2.8. fixes #97306
 
 *gimp-2.2.7-r1 (15 Jun 2005)
 
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 5963cdc468fb..3dfd7fa0b053 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,25 +1,23 @@
 MD5 b3fb5e1d6f43034d0b9182f097b2df11 gimp-2.0.0.ebuild 2654
 MD5 6e30693ee2b8125d5dfadf3a72625397 gimp-2.2.6.ebuild 3660
 MD5 0c8f35412e83518ba717b652b05e4c85 gimp-2.0.2.ebuild 2569
+MD5 346846abaf52753f6a7a5c1360eb3c27 gimp-2.2.8.ebuild 4520
 MD5 405d2674bac45813485d5abed39d6eb3 gimp-2.2.3.ebuild 3740
 MD5 77ea6e18335093980ca0521510f64183 gimp-1.2.5.ebuild 3202
 MD5 f4ee70356bf8aa8f588d0d41e194c584 gimp-2.0.4.ebuild 3203
-MD5 346846abaf52753f6a7a5c1360eb3c27 gimp-2.2.7-r1.ebuild 4520
 MD5 542c10ced4b60c3b5f6d181da2c008d4 gimp-2.2.0.ebuild 3512
 MD5 23321eb2aa740463c9181ddcacb2c9bd gimp-2.0.6.ebuild 3247
-MD5 7989ef1fed772c8b156a68bd17e0aacc gimp-2.2.7.ebuild 4425
 MD5 791e42876920e6a3d55e5a4ab661190c gimp-2.2.6-r1.ebuild 4223
-MD5 f62ce643eb726b51ad8cf88a4a04add2 ChangeLog 17145
+MD5 c307585da28dcc35ac2deeb4ee6c035e ChangeLog 17414
 MD5 f4713bbf77ae895c7ff6c022a7a2f542 metadata.xml 222
 MD5 7878202fbf35cdba9a2907b735cbf90c gimp-2.0.5.ebuild 3216
 MD5 be326cb198ec1f1f6c21a5a5a1460415 files/gimp-2.0.0-gcc34.patch 1148
 MD5 f2b58299eceabecfe5df955198c267d6 files/psd_save.c 49151
 MD5 12ff6c7c980ee34dc7d4d94aa40059b0 files/ltmain_sh-1.5.0-fix-relink.patch 1718
-MD5 ff17b80bceb6bd818e20556c23647b0f files/gimp-2.2.7-configure-fix.patch 2423
 MD5 9696bde4a1b70dd2816d46bed477ebc0 files/gimp.desktop 2404
 MD5 8bf83fb83ce1c66006a27a7d9ec29dd7 files/pygimp-logo.png 19823
 MD5 5bd6fc067eba3828be1e3a49b4aa1c44 files/digest-gimp-2.2.6-r1 134
-MD5 2162d2ea38409b9e373a4086797a4c49 files/digest-gimp-2.2.7-r1 134
+MD5 ff17b80bceb6bd818e20556c23647b0f files/gimp-2.2.8-configure-fix.patch 2423
 MD5 662e7b51f4c882429b73dea3263b39de files/digest-gimp-1.2.5 65
 MD5 568ba885fc51613466e3b0039e21946c files/digest-gimp-2.0.0 65
 MD5 1f2afa6b0785b0547e956d5aff63cf4d files/digest-gimp-2.0.2 65
@@ -29,4 +27,4 @@ MD5 bbe7cd6ece5455900adcaeed9b467679 files/digest-gimp-2.0.6 134
 MD5 204a8065e28141810fbda423e4118b9e files/digest-gimp-2.2.0 134
 MD5 675541af3f64fc4acdd1bd3e759b607d files/digest-gimp-2.2.3 134
 MD5 5bd6fc067eba3828be1e3a49b4aa1c44 files/digest-gimp-2.2.6 134
-MD5 2162d2ea38409b9e373a4086797a4c49 files/digest-gimp-2.2.7 134
+MD5 aebd823dc72aefe0a0e4596da64c7277 files/digest-gimp-2.2.8 134
diff --git a/media-gfx/gimp/files/digest-gimp-2.2.7-r1 b/media-gfx/gimp/files/digest-gimp-2.2.7-r1
deleted file mode 100644
index cb5b67314b31..000000000000
--- a/media-gfx/gimp/files/digest-gimp-2.2.7-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 fb2871717998e5958a84f4c26d143d95 gimp-2.2.7.tar.bz2 13975346
-MD5 2058eb88fe7a9d230bf3284546445c65 gimp-help-2-0.8.tar.gz 19038567
diff --git a/media-gfx/gimp/files/digest-gimp-2.2.7 b/media-gfx/gimp/files/digest-gimp-2.2.8
index cb5b67314b31..18f67b9b1358 100644
--- a/media-gfx/gimp/files/digest-gimp-2.2.7
+++ b/media-gfx/gimp/files/digest-gimp-2.2.8
@@ -1,2 +1,2 @@
-MD5 fb2871717998e5958a84f4c26d143d95 gimp-2.2.7.tar.bz2 13975346
+MD5 0db3fca2f741d6dd51eb61dc85778b16 gimp-2.2.8.tar.bz2 14016570
 MD5 2058eb88fe7a9d230bf3284546445c65 gimp-help-2-0.8.tar.gz 19038567
diff --git a/media-gfx/gimp/files/gimp-2.2.7-configure-fix.patch b/media-gfx/gimp/files/gimp-2.2.8-configure-fix.patch
index f68df2bf1d1b..f68df2bf1d1b 100644
--- a/media-gfx/gimp/files/gimp-2.2.7-configure-fix.patch
+++ b/media-gfx/gimp/files/gimp-2.2.8-configure-fix.patch
diff --git a/media-gfx/gimp/gimp-2.2.7.ebuild b/media-gfx/gimp/gimp-2.2.7.ebuild
deleted file mode 100644
index 22c6633af22c..000000000000
--- a/media-gfx/gimp/gimp-2.2.7.ebuild
+++ /dev/null
@@ -1,185 +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.2.7.ebuild,v 1.5 2005/05/24 11:17:31 allanonjl Exp $
-
-inherit flag-o-matic libtool eutils fdo-mime alternatives
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="http://www.gimp.org/"
-
-P_HELP="gimp-help-2-0.8"
-S_HELP="$WORKDIR/${P_HELP}"
-SRC_URI="mirror://gimp/v2.2/${P}.tar.bz2
-	doc? ( mirror://gimp/help/testing/${P_HELP}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~mips"
-IUSE="aalib altivec debug doc gtkhtml gimpprint hardened jpeg lcms mmx mng png
-python scanner smp sse svg tiff wmf"
-
-#	X? ( virtual/x11 )"
-RDEPEND="virtual/x11
-	>=dev-libs/glib-2.4.5
-	>=x11-libs/gtk+-2.4.4
-	>=x11-libs/pango-1.4
-	>=media-libs/freetype-2.1.7
-	>=media-libs/fontconfig-2.2
-	>=media-libs/libart_lgpl-2.3.8-r1
-	sys-libs/zlib
-	dev-libs/libxml2
-	dev-libs/libxslt
-
-	gimpprint? ( =media-gfx/gimp-print-4.2* )
-	gtkhtml? ( =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.2 )
-	svg? ( >=gnome-base/librsvg-2.2 )
-
-	aalib?	( media-libs/aalib )
-	python?	( >=dev-lang/python-2.2
-		>=dev-python/pygtk-2 )
-	lcms? ( media-libs/lcms )
-
-	scanner? ( media-gfx/xsane
-		media-gfx/sane-backends
-		media-gfx/sane-frontends
-		)"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	dev-util/intltool
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-
-	# fixes bug #76050, allows for themable icons
-	sed -i -e s,@gimpdatadir@/images/@GIMP_DESKTOP_ICON@,@GIMP_DESKTOP_ICON@, ${S}/data/misc/gimp.desktop.in.in
-
-	# 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
-	epatch ${FILESDIR}/${P}-configure-fix.patch
-
-	# fix for configure patch
-	aclocal
-	libtoolize --force --copy
-	autoconf
-}
-
-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)
-	filter-flags "-fno-inline"
-
-	if use hardened; then
-		ewarn "hardened use flag suppressing mmx use flag"
-		HARDENED_SUPPRESS_MMX="--disable-mmx"
-	elif use x86; then
-		HARDENED_SUPPRESS_MMX="`use_enable mmx`"
-	elif use amd64; then
-		HARDENED_SUPPRESS_MMX="--enable-mmx"
-	fi
-
-	local myconf
-	use doc || myconf="${myconf} --disable-devel-docs"
-
-	# Hard enable SIMD assembler code for AMD64.
-	if use x86; then
-		myconf="${myconf} `use_enable sse`"
-	elif use amd64; then
-		myconf="${myconf} --enable-sse"
-	fi
-
-	econf \
-		--disable-default-binary \
-		--with-x \
-		"${HARDENED_SUPPRESS_MMX}" \
-		${myconf} \
-		`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_enable smp mp` \
-		`use_with tiff libtiff` \
-		`use_with mng libmng` \
-		`use_with aalib aa` \
-		`use_enable lcms` \
-		`use_enable gtkhtml` \
-		`use_enable svg` \
-		`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 ChangeLog* HACKING NEWS README*
-
-	if use doc; then
-		cd ${S_HELP}
-		make DESTDIR="${D}" install || die
-	fi
-
-	# Create the gimp-remote link, see bug #36648
-	dosym gimp-remote-2.2 /usr/bin/gimp-remote
-
-	# if use scanner, create the symlink see bug #93018
-	if use scanner; then
-		dosym /usr/bin/xscanimage /usr/lib/gimp/2.0/plug-ins/
-	fi
-}
-
-pkg_postinst() {
-	alternatives_auto_makesym "/usr/bin/gimp" "/usr/bin/gimp-[0-9].[0-9]"
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	einfo ""
-	einfo "If you want Postscript file support, emerge ghostscript."
-	einfo ""
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/media-gfx/gimp/gimp-2.2.7-r1.ebuild b/media-gfx/gimp/gimp-2.2.8.ebuild
index 4e4ba845bc6d..2bf47c74c920 100644
--- a/media-gfx/gimp/gimp-2.2.7-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.2.8.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.7-r1.ebuild,v 1.1 2005/06/15 01:53:23 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.8.ebuild,v 1.1 2005/06/28 23:35:34 allanonjl Exp $
 
 inherit flag-o-matic libtool eutils fdo-mime alternatives