Apply patch when building with ruby enabled. Fixes bug#402443. Patch by Dennis Schridde. Remove older stuff.

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

5 files changed, 26 insertions, 314 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index dc847d5ac8dd..612e434397fa 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/gdal
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.122 2012/05/19 19:27:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.123 2012/05/24 19:11:33 scarabeus Exp $
+
+  24 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> -files/gdal-png-1.5.patch,
+  -gdal-1.8.1.ebuild, gdal-1.8.1-r1.ebuild:
+  Apply patch when building with ruby enabled. Fixes bug#402443. Patch by Dennis
+  Schridde. Remove older stuff.
 
   19 May 2012; Samuli Suominen <ssuominen@gentoo.org> gdal-1.6.3-r1.ebuild:
   Fix building with sys-libs/zlib >= 1.2.5.1-r1 (OF) wrt #413835, Comment #1
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index e58416b0828a..806ae038df99 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -10,22 +10,26 @@ AUX gdal-1.6.0-swig-fix.patch 535 RMD160 a3946ac3897d73d09be2d03f1f8a5facef7301b
 AUX gdal-1.6.1-ruby-make.patch 1150 RMD160 8e5b8397a86506d968cbf1a5a04616303df26fc8 SHA1 80c9844bfa4374879cc01af8ac90674c251e1034 SHA256 33d213226ad831ea43df8e7d78e56cd6704dc6089320ac63a4eb3d369b920dea
 AUX gdal-1.6.3-libpng15.patch 1392 RMD160 dfa674f506ca48c8e34d5c795829a78d13f2666a SHA1 18e56da5315590a0c0d97e8a95adab653a962a8c SHA256 dd730790ccbc72131f92d78d130b160b6db30b43688bd67e404932ecd6b57ebd
 AUX gdal-1.8.1-zlib_header_fix.patch 253 RMD160 0c2f1483ea373f596a6bbf0c86ba0f11094ef232 SHA1 04df59a10d1ad719742dd40b0d0225bad053a78d SHA256 019d7a858670aa4651b5c887db4f951d906fd3395e12f3f3a570295fcc171b89
-AUX gdal-png-1.5.patch 1422 RMD160 5177f60d44189289fefc98ec8f59645b880b7362 SHA1 63c3290883f6f9f70fe6ec9cd2c3e37becaeee7b SHA256 c7a5c4584b60c653b0f2116d9898e5110fe0e29d175a2fc00d34d36487856418
 DIST gdal-1.6.3.tar.gz 7007613 RMD160 aab37ae4b7a98f9af6c10511e2ce5205505b9769 SHA1 b8fc53f562dd253c0c75e9ea4d4398f9548c1f1f SHA256 bf946aa229eef28f3d95c8bbf75913aa2d89dd93a03c5cc769cd7c8b98890c67
 DIST gdal-1.8.1.tar.gz 8852355 RMD160 4ac1cd59979464bd37b4d2aa588092ee0c34d45c SHA1 b2f8b12ebdd00c05bc7f1ab7b761d9ac335c470c SHA256 d5d76b85b4a7a0e28ead6c92be0eba9e2b2361a06db0a60ef0fb85db63e7a5df
 EBUILD gdal-1.6.3-r1.ebuild 6787 RMD160 6a587d3f3f6580f037d4e24535e4482d051e8dd5 SHA1 5eca4f493b479c02e5a9f14ec03c2cf4eacaa54b SHA256 fa637b105c2d1289bf2f671128c9b57c8038463f79f6b018ad6933a63d5b2093
-EBUILD gdal-1.8.1-r1.ebuild 6732 RMD160 881fc120f5cf3913e7d3d03aa00c176e1686f231 SHA1 36508f5157213525abe2a0948f4b8371e51dc0b7 SHA256 3bde27b3b75367d7fa5a1b807c961f295e94e8bf54c26370934b8864b8971ede
-EBUILD gdal-1.8.1.ebuild 6588 RMD160 c77a01f7b7d5ee08da021924718759af070cc6f6 SHA1 8e3da7a331b666baee30e309f85e05285949d302 SHA256 5330ef818d2781a1b83a2169df1c230617399578abccffc1bb1fc73a1addb6b8
-MISC ChangeLog 22670 RMD160 b9de9dc0f87728867cb29e0d7ac2edc41a7a0ec2 SHA1 567f0b1901db369ce342722a10600265dc2c0f4e SHA256 eab753ee5bc8613ba1bc0af723b31f0674094eaf48e534b671644000b8f3987a
+EBUILD gdal-1.8.1-r1.ebuild 6848 RMD160 18ea154a65fd9043196cb9960cf3f435ed2355db SHA1 f49bd4d83eed840ad73a8c76ddd9a26e8d40942e SHA256 b288d8c23194a1f46ac9e16a42f430a70d4dcff19a263812f8ce57fb98a81e64
+MISC ChangeLog 22910 RMD160 ef8593daee2d38117f6ca163889ea88b591574b6 SHA1 f4ebc2dd5c00ab6724fa6b07b18360210085d16b SHA256 74802251b0873faef69d58deda77a2788036cd317c099a700dc49010a62caa11
 MISC metadata.xml 1183 RMD160 a095695d479404c183e066274335dacc408bd406 SHA1 0c07b2188a4e5e2cff50ba6355a1543e7f70ed57 SHA256 789b3c4b281326a6c763ac9a62f3e1ef82ddf679e71bc7d1a1849d3772a4323e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPt/vyAAoJEEdUh39IaPFNpq4H/3roSbQL+nTdDZl58BcjSgQF
-RHublL1OahNurfUnYOPijNPVNSf9jryF+ON3ep98uw2sOzNQnDJPMpkuoR76LjzZ
-vlwzKx5q3TJ6lnOw1jk2OT+kxXZnh/qRbpvZTscbGl0VCU3b/d0eZVtY69rj5B5d
-VQ6JDd8PtNIKs+SilyuziuqSe/mm8tsdP2RbombuVhwXpw582cUPMPavWyodRY/O
-EhbeRpu3ej4pAI8RzzGyYRjjvrCZ/B/t7a8e2gYH7zkuzoNypFDjDtsmgcGc0HUE
-UFUhsS+VNbsZ4Gz7OZ35j1VZGuYpeDLZu8yRl7ae1zQyh/5vClRT557z7HXHcis=
-=+cwG
+iQIcBAEBAgAGBQJPvofrAAoJEOSiRoyO7jvolQ0P/iIu9ZnrjcQXna1IHmkJWYmx
+QKLC85jMdQQY7U76Md0Cv2sDsod5UduijKV/GFHLtn7waBHNo+qfIVJ2HVusErSx
+HG41sFDNl7Tm5E4Q3I5Xwab/RC73Kv67F7YvTqgIBo1NNXCzPFOV0C7Z172PAufO
+8QUWnwnTzVODfZRm6mtQYn5hz1ghFwBYZ6s+uiC8/YXNejJxRvUm51y+6oAqO1Ua
+2ay177f9289G4J0FemlLg850RQQ53VV8EyIVoo9TRspsskdvLtq5Xj/uyJcqoCSI
+HHMHogQ81Bb0LuzpJ+NOEn+ZhiLtNciuqH/biyum0sGwG+oBO9hy2MH6hxohAT5Z
+w9JoCcxdyg803uOM/pWU1GEU332kQiVjnJCor7tcdmi1belC8dBGGIjBzBBljkP6
+5On/jIWm7XzWphy8XdohmHfjWEpCc8Wgjyxmepzl8vb2DSOcu9QbZHqWI116OxeK
+WFl6GZAdNbXHfNGqW4Rt8ocBg49kGmIqM2Z25YYwK3tR+5f0VgiySXyLhbBJyl9N
+luQTsdJr54SwZ5zIkMJYmeF+LcWp1BojI8I1/w71rwb+76oq3xmru6QGhsJecMP+
+3J3WkOEcVO2g4F09UPD71SPJGnb0GBSRxaybK8HpXljsNS/Wl50Xc6/9sJ4MG7O5
+5Og+k6b/r5jReYXz5rzu
+=vFzm
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/gdal/files/gdal-png-1.5.patch b/sci-libs/gdal/files/gdal-png-1.5.patch
deleted file mode 100644
index f7a3f159826c..000000000000
--- a/sci-libs/gdal/files/gdal-png-1.5.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- frmts/png/pngdataset.cpp	2011-01-14 06:19:04.000000000 +0100
-+++ frmts/png/pngdataset.cpp	2011-03-01 11:41:28.762999973 +0100
-@@ -1315,7 +1315,7 @@
-     * instead of an int, which is what fread() actually returns.
-     */
-    check = (png_size_t)VSIFReadL(data, (png_size_t)1, length,
--                                 (VSILFILE*)png_ptr->io_ptr);
-+                                 (VSILFILE*)png_get_io_ptr(png_ptr));
- 
-    if (check != length)
-       png_error(png_ptr, "Read Error");
-@@ -1330,7 +1330,7 @@
- {
-    png_uint_32 check;
- 
--   check = VSIFWriteL(data, 1, length, (VSILFILE*)(png_ptr->io_ptr));
-+   check = VSIFWriteL(data, 1, length, (VSILFILE*)png_get_io_ptr(png_ptr));
- 
-    if (check != length)
-       png_error(png_ptr, "Write Error");
-@@ -1341,7 +1341,7 @@
- /************************************************************************/
- static void png_vsi_flush(png_structp png_ptr)
- {
--    VSIFFlushL( (VSILFILE*)(png_ptr->io_ptr) );
-+    VSIFFlushL( (VSILFILE*)png_get_io_ptr(png_ptr) );
- }
- 
- /************************************************************************/
-@@ -1357,7 +1357,7 @@
-     // libpng is generally not built as C++ and so won't honour unwind
-     // semantics.  Ugg. 
- 
--    jmp_buf* psSetJmpContext = (jmp_buf*) png_ptr->error_ptr;
-+    jmp_buf* psSetJmpContext = (jmp_buf*) png_get_error_ptr(png_ptr);
-     if (psSetJmpContext)
-     {
-         longjmp( *psSetJmpContext, 1 );
diff --git a/sci-libs/gdal/gdal-1.8.1-r1.ebuild b/sci-libs/gdal/gdal-1.8.1-r1.ebuild
index 736350580560..932309fdf273 100644
--- a/sci-libs/gdal/gdal-1.8.1-r1.ebuild
+++ b/sci-libs/gdal/gdal-1.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.8.1-r1.ebuild,v 1.2 2012/04/26 15:28:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.8.1-r1.ebuild,v 1.3 2012/05/24 19:11:33 scarabeus Exp $
 
 EAPI=3
 
@@ -93,6 +93,9 @@ src_prepare() {
 	# Update for zlib header changes (see bug #383569)
 	epatch "${FILESDIR}"/${P}-zlib_header_fix.patch
 
+	# Fix ldflags when building with ruby
+	sed -e '/^LDFLAGS/s/-Xcompiler//' -i swig/ruby/RubyMakefile.mk || die
+
 	# autoheader fail
 	eaclocal
 	eautoconf
diff --git a/sci-libs/gdal/gdal-1.8.1.ebuild b/sci-libs/gdal/gdal-1.8.1.ebuild
deleted file mode 100644
index dda8f68fe0cf..000000000000
--- a/sci-libs/gdal/gdal-1.8.1.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.8.1.ebuild,v 1.4 2012/04/26 15:28:13 jlec Exp $
-
-EAPI=2
-
-WANT_AUTOCONF="2.5"
-
-RUBY_OPTIONAL="yes"
-USE_RUBY="ruby18"
-
-PYTHON_DEPEND="python? 2:2.6"
-
-inherit autotools eutils libtool perl-module python ruby-ng toolchain-funcs
-
-DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="http://www.gdal.org/"
-SRC_URI="http://download.osgeo.org/gdal/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+aux_xml curl debug doc ecwj2k fits geos gif gml hdf5 jpeg jpeg2k mysql netcdf odbc ogdi pdf perl png postgres python ruby sqlite threads"
-
-RDEPEND="
-	dev-libs/expat
-	media-libs/tiff
-	sci-libs/libgeotiff
-	sys-libs/zlib
-	curl? ( net-misc/curl )
-	ecwj2k? ( sci-libs/libecwj2 )
-	fits? ( sci-libs/cfitsio )
-	geos?   ( >=sci-libs/geos-2.2.1 )
-	gif? ( media-libs/giflib )
-	gml? ( >=dev-libs/xerces-c-3 )
-	hdf5? ( >=sci-libs/hdf5-1.6.4[szip] )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/jasper )
-	mysql? ( virtual/mysql )
-	netcdf? ( sci-libs/netcdf )
-	odbc?   ( dev-db/unixODBC )
-	ogdi? ( sci-libs/ogdi )
-	pdf? ( app-text/poppler )
-	perl? ( dev-lang/perl )
-	png? ( media-libs/libpng )
-	postgres? ( >=dev-db/postgresql-base-8.4 )
-	python? ( dev-python/numpy )
-	ruby? ( $(ruby_implementation_depend ruby18) )
-	sqlite? ( >=dev-db/sqlite-3 )"
-
-SWIG_DEP=">=dev-lang/swig-2.0.2"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	perl? ( ${SWIG_DEP} )
-	python? ( ${SWIG_DEP} )
-	ruby? ( ${SWIG_DEP} )"
-
-AT_M4DIR="${S}/m4"
-MAKEOPTS+=" -j1"
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_unpack() {
-	# prevent ruby-ng.eclass from messing with the src path
-	default
-}
-
-src_prepare() {
-	# fix datadir and docdir placement
-	sed -i \
-		-e "s:@datadir@:@datadir@/gdal:" \
-		-e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
-		GDALmake.opt.in || die
-
-	# the second sed expression should fix bug 371075
-	sed -i \
-		-e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
-		-e "s:--prefix=\$(DESTDIR):--prefix=:" \
-		swig/python/GNUmakefile || die
-
-	epatch "${FILESDIR}"/1.7.2-ruby_cflags.patch
-
-	# -soname is only accepted by GNU ld/ELF
-	[[ ${CHOST} == *-darwin* ]] \
-		&& epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \
-		|| epatch "${FILESDIR}"/${PN}-1.5.0-soname.patch
-
-	# autoheader fail
-	eaclocal
-	eautoconf
-	eautomake
-	elibtoolize
-}
-
-src_configure() {
-	if use ruby; then
-		RUBY_MOD_DIR="$(ruby18 -r rbconfig -e 'print Config::CONFIG["sitearchdir"]')"
-		echo "Ruby module dir is: $RUBY_MOD_DIR"
-	fi
-
-	# pcidsk is internal, because there is no such library yet released
-	#     also that thing is developed by the gdal people
-	# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
-	# bsb - legal issues
-	# oracle - disabled, i dont have and can't test
-	# ingres - same story as oracle oci
-	# tiff is a hard dep
-	econf \
-		--enable-shared \
-		--disable-static \
-		--with-expat \
-		--without-grass \
-		--without-hdf4 \
-		--without-fme \
-		--without-pcraster \
-		--without-kakadu \
-		--without-mrsid \
-		--without-jp2mrsid \
-		--without-msg \
-		--without-bsb \
-		--without-dods-root \
-		--without-oci \
-		--without-ingres \
-		--without-spatialite \
-		--without-dwgdirect \
-		--without-epsilon \
-		--without-idb \
-		--without-sde \
-		--without-libtool \
-		--with-libz="${EPREFIX}/usr/" \
-		--with-ogr \
-		--with-grib \
-		--with-vfk \
-		--with-libtiff=external \
-		--with-geotiff=external \
-		$(use_enable debug) \
-		$(use_with postgres pg) \
-		$(use_with fits cfitsio) \
-		$(use_with netcdf) \
-		$(use_with png) \
-		$(use_with jpeg) \
-		$(use_with jpeg pcidsk) \
-		$(use_with gif) \
-		$(use_with ogdi ogdi "${EPREFIX}"/usr) \
-		$(use_with hdf5) \
-		$(use_with jpeg2k jasper) \
-		$(use_with ecwj2k ecw) \
-		$(use_with gml xerces) \
-		$(use_with odbc) \
-		$(use_with curl) \
-		$(use_with sqlite sqlite3 "${EPREFIX}"/usr) \
-		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config) \
-		$(use_with geos) \
-		$(use_with aux_xml pam) \
-		$(use_with pdf poppler) \
-		$(use_with perl) \
-		$(use_with ruby) \
-		$(use_with python) \
-		$(use_with threads) \
-		--with-pymoddir="${EPREFIX}"/$(python_get_sitedir)
-
-	# mysql-config puts this in (and boy is it a PITA to get it out)
-	if use mysql; then
-		sed -i \
-			-e "s: -rdynamic : :" \
-			GDALmake.opt || die "sed LIBS failed"
-	fi
-
-	# updated for newer swig (must specify the path to input files)
-	if use python; then
-		sed -i \
-			-e "s: gdal_array.i: ../include/gdal_array.i:" \
-			-e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
-			swig/python/GNUmakefile || die "sed python makefile failed"
-		sed -i \
-			-e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \
-			swig/python/setup.cfg || die "sed python setup.cfg failed"
-	fi
-}
-
-src_compile() {
-	local i
-	for i in perl ruby python; do
-		if use $i; then
-			rm "${S}"/swig/$i/*_wrap.cpp
-			emake -C "${S}"/swig/$i generate || \
-				die "make generate failed for swig/$i"
-		fi
-	done
-
-	emake || die "emake failed"
-
-	if use perl ; then
-		pushd "${S}"/swig/perl > /dev/null
-		perl-module_src_prep
-		perl-module_src_compile
-		popd > /dev/null
-	fi
-
-	if use doc ; then
-		emake docs || die "make docs failed"
-	fi
-}
-
-src_install() {
-	if use perl ; then
-		pushd "${S}"/swig/perl > /dev/null
-		perl-module_src_install
-		popd > /dev/null
-		sed -i \
-			-e "s:BINDINGS        =       python ruby perl:BINDINGS        =       python ruby:g" \
-			GDALmake.opt || die
-	fi
-
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	if use ruby ; then
-		# weird reinstall collision; needs manual intervention...
-		pushd "${S}"/swig/ruby > /dev/null
-		rm -rf "${D}"${RUBY_MOD_DIR}/gdal
-		exeinto ${RUBY_MOD_DIR}/gdal
-		doexe *.so || die "doins ruby modules failed"
-		popd > /dev/null
-	fi
-
-	use perl && fixlocalpod
-
-	dodoc Doxyfile HOWTO-RELEASE NEWS || die
-
-	if use doc ; then
-		dohtml html/* || die "install html failed"
-		docinto ogr
-		dohtml ogr/html/* || die "install ogr html failed"
-	fi
-
-	if use python; then
-		newdoc swig/python/README.txt README-python.txt || die
-		insinto /usr/share/${PN}/samples
-		doins swig/python/samples/* || die
-	fi
-}
-
-pkg_postinst() {
-	if use python; then
-		python_need_rebuild
-		python_mod_optimize ${PN}.py ogr.py
-	fi
-	echo
-	elog "Check available image and data formats after building with"
-	elog "gdalinfo and ogrinfo (using the --formats switch)."
-}
-
-pkg_postrm() {
-	if use python; then
-		python_mod_cleanup ${PN}.py ogr.py
-	fi
-}