Updated dependencies and a few other fixes.

5 files changed, 33 insertions, 25 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 5940a5d7c032..3939da09982c 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.100 2004/12/21 22:44:45 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.101 2004/12/22 15:25:36 obz Exp $
+
+  22 Dec 2004; Mike Gardiner <obz@gentoo.org> +files/pygimp-logo.png,
+  -files/pygimp-logo.png.bz2, gimp-2.2.0.ebuild:
+  Updated dependencies and a few other fixes.
 
 *gimp-2.2.0 (21 Dec 2004)
 
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 614cc99e5d71..607b453246be 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,21 +1,22 @@
-MD5 df316b1d4bd1c70f25f7ef811a14e5bc gimp-2.0.5.ebuild 3219
-MD5 1bd4ec41b9b8a1bb0089cf20aa37587a ChangeLog 14722
+MD5 2951e3093e294629908f060f0d55a381 gimp-2.0.0.ebuild 2655
 MD5 d7a9ef0b998d360ae6254fc0508e2f7d gimp-2.0.2.ebuild 2570
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 e7cbfba89facb9cca1a3117df924f41b gimp-1.2.5.ebuild 3206
 MD5 1fbffd70f406bee33a8827ebf6f43c48 gimp-2.0.4.ebuild 3205
-MD5 2951e3093e294629908f060f0d55a381 gimp-2.0.0.ebuild 2655
+MD5 7fa15ea9fbc0e37b3b4e3b0c7a3abc67 gimp-2.2.0.ebuild 3306
 MD5 284476bb4ded32c690a4aa10be6cf03a gimp-2.0.6.ebuild 3238
-MD5 e7cbfba89facb9cca1a3117df924f41b gimp-1.2.5.ebuild 3206
-MD5 5b894c0a0da567bab494684d8511d484 gimp-2.2.0.ebuild 3360
-MD5 12ff6c7c980ee34dc7d4d94aa40059b0 files/ltmain_sh-1.5.0-fix-relink.patch 1718
+MD5 1bd4ec41b9b8a1bb0089cf20aa37587a ChangeLog 14722
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 df316b1d4bd1c70f25f7ef811a14e5bc gimp-2.0.5.ebuild 3219
+MD5 be326cb198ec1f1f6c21a5a5a1460415 files/gimp-2.0.0-gcc34.patch 1148
 MD5 f2b58299eceabecfe5df955198c267d6 files/psd_save.c 49151
-MD5 204a8065e28141810fbda423e4118b9e files/digest-gimp-2.2.0 134
-MD5 0d3108f9120d6976ce4ccb29a131aea7 files/digest-gimp-2.0.4 133
-MD5 662e7b51f4c882429b73dea3263b39de files/digest-gimp-1.2.5 65
+MD5 12ff6c7c980ee34dc7d4d94aa40059b0 files/ltmain_sh-1.5.0-fix-relink.patch 1718
 MD5 2673113735e707942c89d4b3658b49fc files/pygimp-logo.png.bz2 20207
-MD5 397055832117d5c76e873af50a2e6f30 files/digest-gimp-2.0.5 134
+MD5 9696bde4a1b70dd2816d46bed477ebc0 files/gimp.desktop 2404
+MD5 8bf83fb83ce1c66006a27a7d9ec29dd7 files/pygimp-logo.png 19823
+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
+MD5 0d3108f9120d6976ce4ccb29a131aea7 files/digest-gimp-2.0.4 133
+MD5 397055832117d5c76e873af50a2e6f30 files/digest-gimp-2.0.5 134
 MD5 bbe7cd6ece5455900adcaeed9b467679 files/digest-gimp-2.0.6 134
-MD5 568ba885fc51613466e3b0039e21946c files/digest-gimp-2.0.0 65
-MD5 9696bde4a1b70dd2816d46bed477ebc0 files/gimp.desktop 2404
-MD5 be326cb198ec1f1f6c21a5a5a1460415 files/gimp-2.0.0-gcc34.patch 1148
+MD5 204a8065e28141810fbda423e4118b9e files/digest-gimp-2.2.0 134
diff --git a/media-gfx/gimp/files/pygimp-logo.png b/media-gfx/gimp/files/pygimp-logo.png
new file mode 100644
index 000000000000..6f7ef4d56918
--- /dev/null
+++ b/media-gfx/gimp/files/pygimp-logo.png
diff --git a/media-gfx/gimp/files/pygimp-logo.png.bz2 b/media-gfx/gimp/files/pygimp-logo.png.bz2
deleted file mode 100644
index 6ffc270af0aa..000000000000
--- a/media-gfx/gimp/files/pygimp-logo.png.bz2
+++ /dev/null
diff --git a/media-gfx/gimp/gimp-2.2.0.ebuild b/media-gfx/gimp/gimp-2.2.0.ebuild
index 636f8ce3d5ce..a7676236e790 100644
--- a/media-gfx/gimp/gimp-2.2.0.ebuild
+++ b/media-gfx/gimp/gimp-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.0.ebuild,v 1.1 2004/12/21 22:44:45 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.0.ebuild,v 1.2 2004/12/22 15:25:36 obz Exp $
 
 inherit flag-o-matic libtool eutils
 
@@ -8,7 +8,7 @@ DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="http://www.gimp.org/"
 LICENSE="GPL-2"
 
-P_HELP="gimp-help-2-0.6" #"gimp-help-${PV/\./-}"
+P_HELP="gimp-help-2-0.6" #gimp-help-2-{version}
 S_HELP="$WORKDIR/${P_HELP}"
 SRC_URI="mirror://gimp/v2.2/${P}.tar.bz2
 	doc? ( mirror://gimp/help/testing/${P_HELP}.tar.gz )"
@@ -23,12 +23,14 @@ IUSE="aalib altivec debug doc gimpprint jpeg mmx mng png python sse svg tiff wmf
 
 #	X? ( virtual/x11 )"
 RDEPEND="virtual/x11
-	>=dev-libs/glib-2.2
-	>=x11-libs/gtk+-2.2.2
-	>=x11-libs/pango-1.2.2
+	>=dev-libs/glib-2.4.5
+	>=x11-libs/gtk+-2.4.4
+	>=x11-libs/pango-1.4
 	>=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* )
 	doc? ( =gnome-extra/libgtkhtml-2* )
@@ -59,9 +61,8 @@ src_unpack() {
 	# 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
-	# Fix missing logo for python support
-	bzcat ${FILESDIR}/pygimp-logo.png.bz2 > \
-	${S}/plug-ins/pygimp/pygimp-logo.png
+	# Install the missing pygimp logo
+	cp ${FILESDIR}/pygimp-logo.png ${S}/plug-ins/pygimp/
 
 }
 
@@ -128,12 +129,14 @@ src_install() {
 
 	make DESTDIR=${D} install || die
 
-	dodoc AUTHORS COPYING ChangeL* HACKING INSTALL \
-		MAINTAINERS NEWS PLUGIN_MAINTAINERS README* TODO*
+	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
+
 }