add fix for k6 compile problems 'n cleanup

8 files changed, 19 insertions, 187 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 7d338c76466c..8ad802f548af 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.33 2003/05/27 14:48:21 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.34 2003/06/07 17:20:51 foser Exp $
 
 *gimp-1.2.4 (26 May 2003)
 
+  07 Jun 2003; foser <foser@gentoo.org> gimp-1.2.4.ebuild :
+  Add fix for possible k6 compile problem (#22115)
+ 
   26 May 2003; Alastair Tse <liquidx@gentoo.org> gimp-1.2.4.ebuild,
   files/gimp-1.2.4-gentoo.diff:
   bumping stable series to 1.2.4. removing custom psd_save and various
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 2c511eacaa66..067995c85e28 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,21 +1,17 @@
-MD5 855d7d70f5b845d808e46258219e5d9f ChangeLog 5295
-MD5 0baa40e08fefbcca963d21359b210477 gimp-1.2.3-r2.ebuild 4202
+MD5 333c7a300975f264fb660cc0b65025fe gimp-1.3.14.ebuild 2492
 MD5 3ffcb6910a8be02857177f4179725ca8 gimp-1.2.3-r3.ebuild 4717
-MD5 9abd23b9bf6152be1f7ce3dc0fe322c5 gimp-1.2.4.ebuild 2983
-MD5 f965b674f1ab5e80d1c83313aee3900b gimp-1.3.11.ebuild 2151
 MD5 04eb1d0c00755166e94520f1373b452a gimp-1.3.13.ebuild 2355
-MD5 33b3899f6b5b6a4a8e7e43be18ffed46 gimp-1.3.12.ebuild 2280
-MD5 333c7a300975f264fb660cc0b65025fe gimp-1.3.14.ebuild 2492
+MD5 58d7b7167b6d8d6e9e476fbf6a7ed542 gimp-1.2.4.ebuild 2978
+MD5 72a957b3b1c6c79464fd043b8493f021 ChangeLog 5406
+MD5 6606255b200760d9524e19a95740a492 gimp-1.2.3-r2.ebuild 4080
+MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.3-r3-gentoo.diff 427
 MD5 86617fa03849f2ba22c845a31ddf8958 files/digest-gimp-1.2.3-r2 65
 MD5 86617fa03849f2ba22c845a31ddf8958 files/digest-gimp-1.2.3-r3 65
-MD5 3653d9f21a8d987555662106456ffa5d files/digest-gimp-1.3.12 66
-MD5 e0e988ca6036cf071d0336b57f284b07 files/digest-gimp-1.3.11 65
-MD5 13e882e38fccf991bbea8677bedca67e files/digest-gimp-1.3.13 66
-MD5 cdda0b1cc179cf75eabb63945efdae0e files/gimp-1.2.3-libgimpi-libtool.diff 1365
-MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.3-r2-gentoo.diff 427
-MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.3-r3-gentoo.diff 427
-MD5 9696bde4a1b70dd2816d46bed477ebc0 files/gimp.desktop 2404
 MD5 f2b58299eceabecfe5df955198c267d6 files/psd_save.c 49151
+MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.4-gentoo.diff 427
+MD5 9696bde4a1b70dd2816d46bed477ebc0 files/gimp.desktop 2404
+MD5 cdda0b1cc179cf75eabb63945efdae0e files/gimp-1.2.3-libgimpi-libtool.diff 1365
+MD5 13e882e38fccf991bbea8677bedca67e files/digest-gimp-1.3.13 66
 MD5 89fee7931deb88ed771f5ec2ec28aea4 files/digest-gimp-1.3.14 66
+MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.3-r2-gentoo.diff 427
 MD5 86551dc2402aaed28ccf3612e8fe7b7a files/digest-gimp-1.2.4 65
-MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.4-gentoo.diff 427
diff --git a/media-gfx/gimp/files/digest-gimp-1.3.11 b/media-gfx/gimp/files/digest-gimp-1.3.11
deleted file mode 100644
index 48b0db9db9e5..000000000000
--- a/media-gfx/gimp/files/digest-gimp-1.3.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 df2e753e1ad951b52f790b8392091a46 gimp-1.3.11.tar.bz2 9736877
diff --git a/media-gfx/gimp/files/digest-gimp-1.3.12 b/media-gfx/gimp/files/digest-gimp-1.3.12
deleted file mode 100644
index 1d254f3b1045..000000000000
--- a/media-gfx/gimp/files/digest-gimp-1.3.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1f3eda10fc8e6379e5578f21a925e2be gimp-1.3.12.tar.bz2 10226396
diff --git a/media-gfx/gimp/gimp-1.2.3-r2.ebuild b/media-gfx/gimp/gimp-1.2.3-r2.ebuild
index 4cbd09149717..7fe1198c0af9 100644
--- a/media-gfx/gimp/gimp-1.2.3-r2.ebuild
+++ b/media-gfx/gimp/gimp-1.2.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.3-r2.ebuild,v 1.14 2003/03/10 12:01:38 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.3-r2.ebuild,v 1.15 2003/06/07 17:20:51 foser Exp $
 
 inherit eutils flag-o-matic
 
@@ -70,9 +70,7 @@ src_unpack() {
 src_compile() {
 
 	# Strip out -fomit-frame-pointer for k6's
-	is-flag "-march=k6-3" && strip-flags "-fomit-frame-pointer"
-	is-flag "-march=k6-2" && strip-flags "-fomit-frame-pointer"
-	is-flag "-march=k6" && strip-flags "-fomit-frame-pointer"
+	is-flag "-march=k6*" && filter-flags "-fomit-frame-pointer"
 
 
 	local myconf=""
diff --git a/media-gfx/gimp/gimp-1.2.4.ebuild b/media-gfx/gimp/gimp-1.2.4.ebuild
index a3d0bf3fe551..305651ee8618 100644
--- a/media-gfx/gimp/gimp-1.2.4.ebuild
+++ b/media-gfx/gimp/gimp-1.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.4.ebuild,v 1.2 2003/05/27 17:54:31 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.4.ebuild,v 1.3 2003/06/07 17:20:51 foser Exp $
 
 inherit eutils flag-o-matic
 
@@ -39,8 +39,8 @@ src_unpack() {
 
 src_compile() {
 
-	# Strip out -fomit-frame-pointer for k6's
-	is-flag "-march=k6*" && strip-flags "-fomit-frame-pointer"
+	# fix problem with k6's (#22115)
+	is-flag "-march=k6*" && replace-flags "-march=k6*" "-march=i586"
 
 	local mymake=""
 
diff --git a/media-gfx/gimp/gimp-1.3.11.ebuild b/media-gfx/gimp/gimp-1.3.11.ebuild
deleted file mode 100644
index a848db3530e4..000000000000
--- a/media-gfx/gimp/gimp-1.3.11.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.3.11.ebuild,v 1.6 2003/03/10 12:01:38 seemant Exp $
-
-IUSE="doc python"
-
-inherit debug flag-o-matic
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Development series of Gimp"
-SRC_URI="ftp://ftp.gimp.org/pub/gimp/v1.3/v${PV}/${P}.tar.bz2"
-HOMEPAGE="http://www.gimp.org/"
-SLOT="1.4"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
-
-replace-flags -Os -O2
-
-#libglade
-RDEPEND=">=x11-libs/gtk+-2.0.0
-	>=x11-libs/pango-1.0.0
-	>=dev-libs/glib-2.0.0
-	>=media-libs/libpng-1.2.1
-	>=media-libs/jpeg-6b-r2
-	>=media-libs/tiff-3.5.7
-	>=media-libs/libart_lgpl-2.3.8-r1
-	sys-devel/gettext
-	python? ( >=dev-lang/python-2.2 
-	>=dev-python/pygtk-1.99.13 ) "
-
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-0.9 )"
-
-src_compile() {
-
-	# Strip out -fomit-frame-pointer for k6's
-	is-flag "-march=k6-3" && strip-flags "-fomit-frame-pointer"
-	is-flag "-march=k6-2" && strip-flags "-fomit-frame-pointer"
-	is-flag "-march=k6" && strip-flags "-fomit-frame-pointer"
-
-	local myconf
-	use doc \
-		&& myconf="${myconf} --enable-gtk-doc" \
-		|| myconf="${myconf} --disable-gtk-doc"
-
-	use python \
-		&& myconf="${myconf} --enable-python" \
-		|| myconf="${myconf} --disable-python"
-
-	myconf="${myconf} --disable-print"
-
-	econf --disable-perl ${myconf} --without-gnome-desktop || die
-	# disable gnome-desktop since it breaks sandboxing
-
-	# hack for odd make break
-	touch plug-ins/common/${P}.tar.bz2
-
-	emake || die
-}
-
-src_install() {
-        make DESTDIR=${D} prefix=/usr \
-                sysconfdir=/etc \
-                infodir=/usr/share/info \
-                mandir=/usr/share/man \
-                localstatedir=/var/lib \
-                install || die
-    
-	dodoc AUTHORS COPYING ChangeL* HACKING INSTALL MAINTAINERS NEWS PLUGIN_MAINTAINERS README* TODO* 
-}
-
-
-pkg_postinst() {
-	ewarn "There have been changes to the gtkrc file."
-	ewarn "You are strongly advised to remove the ~/.gimp-1.3 directory and perform a fresh"
-	ewarn "user installation if you have been running a gimp-1.3 below minor version 11"
-}
diff --git a/media-gfx/gimp/gimp-1.3.12.ebuild b/media-gfx/gimp/gimp-1.3.12.ebuild
deleted file mode 100644
index 0edb5ceda57c..000000000000
--- a/media-gfx/gimp/gimp-1.3.12.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.3.12.ebuild,v 1.5 2003/04/01 23:10:52 spider Exp $
-
-IUSE="doc python aalib"
-
-inherit debug flag-o-matic
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Development series of Gimp"
-SRC_URI="ftp://ftp.gimp.org/pub/gimp/v1.3/v${PV}/${P}.tar.bz2"
-HOMEPAGE="http://www.gimp.org/"
-SLOT="1.4"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-
-replace-flags -Os -O2
-
-#libglade
-RDEPEND=">=x11-libs/gtk+-2
-	>=x11-libs/pango-1
-	>=dev-libs/glib-2
-	>=gnome-extra/libgtkhtml-2
-
-	>=media-libs/libpng-1.2.1
-	>=media-libs/jpeg-6b-r2
-	>=media-libs/tiff-3.5.7
-	>=media-libs/libart_lgpl-2.3.8-r1
-
-	aalib? ( media-libs/aalib )
-	python? ( >=dev-lang/python-2.2 
-		>=dev-python/pygtk-1.99.13 ) "
-
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	sys-devel/gettext
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-src_compile() {
-
-	# Strip out -fomit-frame-pointer for k6's
-	is-flag "-march=k6-3" && strip-flags "-fomit-frame-pointer"
-	is-flag "-march=k6-2" && strip-flags "-fomit-frame-pointer"
-	is-flag "-march=k6" && strip-flags "-fomit-frame-pointer"
-
-
-	local myconf
-
-	use doc \
-		&& myconf="${myconf} --enable-gtk-doc" \
-		|| myconf="${myconf} --disable-gtk-doc"
-	use python \
-		&& myconf="${myconf} --enable-python" \
-		|| myconf="${myconf} --disable-python"
-
-	myconf="${myconf} --disable-print"
-
-	#econf --disable-perl --with-gnome-datadir=${D}/usr/share ${myconf} || die
-	econf --disable-perl ${myconf} --without-gnome-desktop || die
-	# disable gnome-desktop since it breaks sandboxing
-
-	# hack for odd make break
-	touch plug-ins/common/${P}.tar.bz2
-
-	emake || die
-}
-
-src_install() {
-        make DESTDIR=${D} prefix=/usr \
-                sysconfdir=/etc \
-                infodir=/usr/share/info \
-                mandir=/usr/share/man \
-                localstatedir=/var/lib \
-                install || die
-    
-	dodoc AUTHORS COPYING ChangeL* HACKING INSTALL MAINTAINERS NEWS PLUGIN_MAINTAINERS README* TODO* 
-}
-
-pkg_postinst() {
-	ewarn "There have been changes to the gtkrc file."
-	ewarn "You are strongly advised to remove the ~/.gimp-1.3 directory and perform a fresh"
-	ewarn "user installation if you have been running a gimp-1.3 below minor version 11"
-}