Cleanup the build a bit. Remove the hack, and rather add a proper fix to libtool.

5 files changed, 169 insertions, 5 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 099d9abe6181..c98f1150aecd 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,13 @@
 # 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.53 2003/09/20 12:54:15 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.54 2003/09/24 22:32:04 azarah Exp $
+
+*gimp-1.3.20-r1 (25 Sep 2003)
+
+  25 Sep 2003; Martin Schlemmer <azarah@gentoo.org> gimp-1.3.20-r1.ebuild,
+  files/ltmain_sh-1.5.0-fix-relink.patch:
+  Cleanup the build a bit. Remove the hack, and rather add a proper fix to
+  libtool.
 
   20 Sep 2003; Alastair Tse <liquidx@gentoo.org> gimp-1.3.20.ebuild:
   added more intelligent symlink generation
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 80eb175e61b7..b3d12a74e004 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,11 +1,11 @@
 MD5 d410d062966d05248f9c4251bd81d3af gimp-1.2.3-r3.ebuild 4707
-MD5 bcbde86834c64358a3cb69e735dadc20 ChangeLog 8565
+MD5 8defd5fb432a55d41e952d14de05b255 ChangeLog 8799
 MD5 d235271944c1076aa7edb1726b79fecd gimp-1.2.5.ebuild 3253
 MD5 3d28dd0ccc739e10db388438d4f06dda gimp-1.2.4.ebuild 3086
+MD5 58f8987ae938a977425165ef724aca6f gimp-1.3.20.ebuild 3234
 MD5 75ad0c3088982ebf00bc3d06d2f47602 gimp-1.3.19.ebuild 2400
-MD5 586e30d716b677b1c407d2309ba340f6 gimp-1.3.20-r1.ebuild 2700
+MD5 3d23807c8ea67e81ee18cf81c3b6d634 gimp-1.3.20-r1.ebuild 2686
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 0382759fb6c9b0eed9073ac080c40aba gimp-1.3.18.ebuild 2525
 MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.3-r2-gentoo.diff 427
 MD5 cdda0b1cc179cf75eabb63945efdae0e files/gimp-1.2.3-libgimpi-libtool.diff 1365
 MD5 86617fa03849f2ba22c845a31ddf8958 files/digest-gimp-1.2.3-r3 65
@@ -18,5 +18,4 @@ MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.3-r3-gentoo.diff 427
 MD5 2170edc67e192249c4f10fadc0cded91 files/digest-gimp-1.3.20 66
 MD5 2170edc67e192249c4f10fadc0cded91 files/digest-gimp-1.3.20-r1 66
 MD5 9696bde4a1b70dd2816d46bed477ebc0 files/gimp.desktop 2404
-MD5 067de92aa202ecaed5618d0718667dcb files/digest-gimp-1.3.18 66
 MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.4-gentoo.diff 427
diff --git a/media-gfx/gimp/files/digest-gimp-1.3.20-r1 b/media-gfx/gimp/files/digest-gimp-1.3.20-r1
new file mode 100644
index 000000000000..ff8364b2ed67
--- /dev/null
+++ b/media-gfx/gimp/files/digest-gimp-1.3.20-r1
@@ -0,0 +1 @@
+MD5 e77d4b2948b57eb0739cde0f76aea57b gimp-1.3.20.tar.bz2 11380508
diff --git a/media-gfx/gimp/files/ltmain_sh-1.5.0-fix-relink.patch b/media-gfx/gimp/files/ltmain_sh-1.5.0-fix-relink.patch
new file mode 100644
index 000000000000..28631587c963
--- /dev/null
+++ b/media-gfx/gimp/files/ltmain_sh-1.5.0-fix-relink.patch
@@ -0,0 +1,51 @@
+--- ltmain.sh.norelinkfix	2003-09-24 18:18:14.961005184 +0200
++++ ltmain.sh	2003-09-24 18:20:11.204333512 +0200
+@@ -2022,6 +2022,8 @@
+ 	    convenience="$convenience $ladir/$objdir/$old_library"
+ 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
+ 	    tmp_libs=
++	    # PKGW 
++	    dependency_libs=
+ 	    for deplib in $dependency_libs; do
+ 	      deplibs="$deplib $deplibs"
+               if test "X$duplicate_deps" = "Xyes" ; then
+@@ -2143,6 +2145,8 @@
+ 	  fi
+ 
+ 	  tmp_libs=
++	  #PKGW
++	  dependency_libs=
+ 	  for deplib in $dependency_libs; do
+ 	    case $deplib in
+ 	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
+@@ -2359,7 +2363,9 @@
+ 		if test -n "$inst_prefix_dir"; then
+ 		  case "$libdir" in
+ 		    [\\/]*)
+-		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
++		      # Add the install location to the beginning, minimising possiblilty
++		      # of linking to older version of the lib already installed.
++		      add_dir="-L$inst_prefix_dir$libdir $add_dir"
+ 		      ;;
+ 		  esac
+ 		fi
+@@ -2431,7 +2437,9 @@
+ 	      if test -n "$inst_prefix_dir"; then
+ 		case "$libdir" in
+ 		  [\\/]*)
+-		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
++		    # Add the install location to the beginning, minimising possiblilty
++		    # of linking to older version of the lib already installed.
++		    add_dir="-L$inst_prefix_dir$libdir $add_dir"
+ 		    ;;
+ 		esac
+ 	      fi
+@@ -2691,7 +2699,7 @@
+ 	    -L*)
+ 	      case " $tmp_libs " in
+ 	      *" $deplib "*) ;;
+-	      *) tmp_libs="$tmp_libs $deplib" ;;
++	      *) tmp_libs="$deplib $tmp_libs" ;;
+ 	      esac
+ 	      ;;
+ 	    *) tmp_libs="$tmp_libs $deplib" ;;
diff --git a/media-gfx/gimp/gimp-1.3.20-r1.ebuild b/media-gfx/gimp/gimp-1.3.20-r1.ebuild
new file mode 100644
index 000000000000..fd4b8f141f42
--- /dev/null
+++ b/media-gfx/gimp/gimp-1.3.20-r1.ebuild
@@ -0,0 +1,106 @@
+# 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.20-r1.ebuild,v 1.1 2003/09/24 22:32:04 azarah Exp $
+
+IUSE="doc python aalib png jpeg tiff gtkhtml mmx sse X"
+
+inherit debug flag-o-matic libtool
+
+SV="`echo ${PV} | cut -d'.' -f1,2`"
+DESCRIPTION="Development series of Gimp"
+SRC_URI="ftp://ftp.gimp.org/pub/gimp/v${SV}/v${PV}/${P}.tar.bz2"
+HOMEPAGE="http://www.gimp.org/"
+SLOT="2"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~hppa ~sparc"
+
+# protect against over optimisation (related to #21787)
+replace-flags -Os -O2
+MAKEOPTS="${MAKEOPTS} -j1"
+
+RDEPEND=">=x11-libs/gtk+-2.2
+	>=x11-libs/pango-1.2
+	>=dev-libs/glib-2.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 )
+		>=media-libs/libart_lgpl-2.3.8-r1
+
+	aalib?	( media-libs/aalib )
+	python?	( >=dev-lang/python-2.2
+		>=dev-python/pygtk-1.99.13 )
+
+	X? ( virtual/x11 )"
+
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	dev-util/intltool
+	sys-devel/gettext
+	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
+
+	# 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
+}
+
+src_compile() {
+	# Since 1.3.16, fixes linker problems when upgrading
+	elibtoolize
+
+	# Workaround portage variable leakage
+	local AA=
+	local myconf=
+
+	replace-flags "-march=k6*" "-march=i586"
+	# gimp uses inline functions (plug-ins/common/grid.c) (#23078)
+	filter-flags "-fno-inline"
+
+	econf ${myconf} \
+		`use_enable mmx` \
+		`use_enable sse` \
+		`use_enable doc gtk-doc` \
+		`use_enable python` \
+		`use_with X x` \
+		`use_with png libpng` \
+		`use_with jpeg libjpeg` \
+		`use_with jpeg libexif` \
+		`use_with tiff libtiff` \
+		`use_with aalib aa` \
+		--enable-debug \
+		--disable-print || die
+
+	emake || die
+}
+
+src_install() {
+	# Workaround portage variable leakage
+	local AA=
+
+	make DESTDIR=${D} install || die
+
+	# Install desktop file in the right place
+	insinto /usr/share/applications
+	newins ${S}/data/misc/gimp.desktop gimp-${SV}.desktop
+
+	dodoc AUTHORS COPYING ChangeL* HACKING INSTALL \
+		MAINTAINERS NEWS PLUGIN_MAINTAINERS README* TODO*
+}
+
+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."
+}
+