new dev release

5 files changed, 40 insertions, 24 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index fc8d486156b1..d59356f0783b 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,11 @@
 # 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.61 2003/11/26 22:39:10 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.62 2004/01/09 00:27:25 foser Exp $
+
+*gimp-2.0_pre1 (09 Jan 2003)
+
+  09 Jan 2003; foser <foser@gentoo.org> gimp-2.0_pre1.ebuild :
+  New release, add fix for intltool 0.28 problems
 
 *gimp-1.3.23 (26 Nov 2003)
 
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 4284368669e4..fa40a9ed7846 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,10 +1,9 @@
 MD5 98e58808202ec45561b20ba1adddbf5c gimp-1.3.23.ebuild 3080
 MD5 77133bcfa2ac629b90795a80eff64be4 gimp-1.2.5.ebuild 3213
-MD5 4797ef6f7df649933538bed938813ec1 gimp-2.0_pre1.ebuild 3224
+MD5 21b25086803e02509273264b435c72d9 gimp-2.0_pre1.ebuild 3390
 MD5 736c753854776cb1c93f7e89ba807787 gimp-1.2.3-r3.ebuild 4685
-MD5 5cf0c416eac875db363e76f0c2325338 gimp-1.3.22.ebuild 3035
 MD5 94d6af458cd63b08afdecab7cce057ee gimp-1.2.4.ebuild 3079
-MD5 20d827a33f687df2317dfdcd0aa82863 ChangeLog 9685
+MD5 1a1055e7409a1c660906200dfcf39b31 ChangeLog 9829
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.3-r3-gentoo.diff 427
 MD5 86617fa03849f2ba22c845a31ddf8958 files/digest-gimp-1.2.3-r3 65
@@ -13,7 +12,6 @@ MD5 12ff6c7c980ee34dc7d4d94aa40059b0 files/ltmain_sh-1.5.0-fix-relink.patch 1718
 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 0804b683ba605f1ecbfd645741d45270 files/digest-gimp-1.3.22 66
 MD5 7cb224c3321fc461565ba31831ed87a8 files/digest-gimp-1.3.23 66
 MD5 306a002fbdf9b01208b181663474dbe4 files/digest-gimp-2.0_pre1 67
 MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.3-r2-gentoo.diff 427
diff --git a/media-gfx/gimp/files/digest-gimp-1.3.22 b/media-gfx/gimp/files/digest-gimp-1.3.22
deleted file mode 100644
index f4f72c9b0031..000000000000
--- a/media-gfx/gimp/files/digest-gimp-1.3.22
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bcc923683df204c8a82354a4dab7f3de gimp-1.3.22.tar.bz2 11844039
diff --git a/media-gfx/gimp/files/digest-gimp-2.0_pre1 b/media-gfx/gimp/files/digest-gimp-2.0_pre1
new file mode 100644
index 000000000000..8179f744ba6e
--- /dev/null
+++ b/media-gfx/gimp/files/digest-gimp-2.0_pre1
@@ -0,0 +1 @@
+MD5 7862920def4ee411f6417c9372753a6d gimp-2.0pre1.tar.bz2 12065700
diff --git a/media-gfx/gimp/gimp-1.3.22.ebuild b/media-gfx/gimp/gimp-2.0_pre1.ebuild
index 95249b3bf5e7..e76b8473c12f 100644
--- a/media-gfx/gimp/gimp-1.3.22.ebuild
+++ b/media-gfx/gimp/gimp-2.0_pre1.ebuild
@@ -1,29 +1,35 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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.22.ebuild,v 1.2 2003/11/11 16:15:14 foser Exp $
-
-IUSE="doc python aalib png jpeg tiff gtkhtml mmx sse X altivec"
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.0_pre1.ebuild,v 1.1 2004/01/09 00:27:26 foser Exp $
 
 inherit debug flag-o-matic libtool
 
-SV="`echo ${PV} | cut -d'.' -f1,2`"
-DESCRIPTION="Development series of Gimp"
-SRC_URI="mirror://gimp/v${SV}/v${PV}/${P}.tar.bz2"
+MY_PV=${PV/_/}
+MY_P=${PN}-${MY_PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="GNU Image Manipulation Program - Development series"
+SRC_URI="mirror://gimp/v${MY_PV}/testing/${MY_P}.tar.bz2"
 HOMEPAGE="http://www.gimp.org/"
+
 SLOT="2"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~hppa ~sparc"
+IUSE="doc python aalib png jpeg tiff gtkhtml mmx sse X altivec"
 
 # protect against over optimisation (related to #21787)
-replace-flags -Os -O2
-MAKEOPTS="${MAKEOPTS} -j1"
+#replace-flags -Os -O2
+#MAKEOPTS="${MAKEOPTS} -j1"
 
 # FIXME : some more things can be (local) USE flagged
+# FIXME : printing needs to be re-enabled
+
 RDEPEND=">=dev-libs/glib-2.2
 	>=x11-libs/gtk+-2.2.2
-	>=x11-libs/pango-1.2
+	>=x11-libs/pango-1.2.2
 	>=media-libs/fontconfig-2.2
 	>=media-libs/libart_lgpl-2.3.8-r1
+	sys-libs/zlib
 
 	gtkhtml? ( =gnome-extra/libgtkhtml-2* )
 
@@ -42,22 +48,30 @@ RDEPEND=">=dev-libs/glib-2.2
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0
 	dev-util/intltool
-	sys-devel/gettext
 	doc? ( >=dev-util/gtk-doc-1 )"
+#	sys-devel/gettext
 
+# Attention : libtool hack not needed anymore it seems (testing)
 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
-
+#	epatch ${FILESDIR}/ltmain_sh-1.5.0-fix-relink.patch
 	# note: this make elibtoolize do some weird things, so disabling - liquidx
 	# replace ltmain.sh from libtool 1.5a with libtool 1.4.x
 	#cd ${S}; aclocal; automake; libtoolize --force; autoconf
 
+	# fix problems with libtool-0.28 generated stuff
+	intltoolize --force
+
+	export WANT_AUTOMAKE=1.7
+	export WANT_AUTOCONF=2.5
+	aclocal || die
+	autoconf || die
+	automake -a || die
+
 }
 
 src_compile() {
@@ -101,7 +115,7 @@ src_install() {
 
 	# Install desktop file in the right place
 	insinto /usr/share/applications
-	newins ${S}/data/misc/gimp.desktop gimp-${SV}.desktop
+	newins ${S}/data/misc/gimp.desktop gimp-${PV}.desktop
 
 	dodoc AUTHORS COPYING ChangeL* HACKING INSTALL \
 		MAINTAINERS NEWS PLUGIN_MAINTAINERS README* TODO*
@@ -110,12 +124,11 @@ src_install() {
 
 pkg_postinst() {
 
-	ewarn "The ${SV} Gimp series have been reslotted to SLOT 2."
-	ewarn "To clean up old ${SV} version remove all ${SV} series and recompile."
+	ewarn "The development Gimp series have been reslotted to SLOT 2"
+	ewarn "To clean up old 1.3 versions use 'emerge -C =gimp-1.3* -vp'"
 	echo ""
 	ewarn "If you are upgrading from an earlier 1.3 release, please note that"
 	ewarn "the gimprc and sessionrc file formats changed. We suggest you remove"
 	ewarn "your personal ~/.gimp-1.3 directory and do a fresh user installation."
 
 }
-