bump to 5.4.2, fix bug 250029

Package-Manager: portage-2.2_rc36/cvs/Linux x86_64

3 files changed, 297 insertions, 12 deletions

diff --git a/sci-geosciences/mapserver/ChangeLog b/sci-geosciences/mapserver/ChangeLog
index 32e14b88ee19..5c9821934f47 100644
--- a/sci-geosciences/mapserver/ChangeLog
+++ b/sci-geosciences/mapserver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-geosciences/mapserver
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.17 2009/07/29 20:30:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.18 2009/08/08 14:15:43 mescalinum Exp $
+
+*mapserver-5.4.2 (08 Aug 2009)
+
+  08 Aug 2009; Federico Ferri <mescalinum@gentoo.org>
+  +mapserver-5.4.2.ebuild:
+  bump to 5.4.2
 
   29 Jul 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   mapserver-5.0.0-r1.ebuild:
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index b8497bc78b5c..e55a0c448cc8 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mapserver-5.0.0_php.patch 9010 RMD160 53d60a59560b59dce7bab0aefc696f6271378c1a SHA1 7a516c46ab4526cdb981074cd79afa3181bb8fcf SHA256 b245d69e03bb2e0afd638d5a264da6cccca2e9cc2dc90b95bc407417511f39e7
 AUX mapserver_php4.patch 344 RMD160 c39884c956cff7286e1dbe5d5f1929441583250d SHA1 2bc2ce88cefee9738aba890e4f98c38c7689bd2f SHA256 02da3ebfd7bd1f93eb183093c00fc0b1e974c4485d427ecb8b03d6d93cc77304
 AUX mapserver_tcl.patch 1499 RMD160 ad98752a52c42446fa01ad1781b5d0f4daf36379 SHA1 24c8a7a306fbb7bd5bb27b33658a45156f7e6515 SHA256 d2a692e1c34fb8a509d7fc5755bc900dc3cfc886dab35e41298c69642452ba09
 AUX mapserver_tcl.patch-r1 1985 RMD160 bb4d766526f7c29535915bb87c0c5199251a2c3a SHA1 2415b6b792be100f2e5a6a936ef77260352f718b SHA256 725c7e5dd9dc6ae6372d9c4a334ce13fc8ea2ab6afbf569a6db786f2caa7a31f
 DIST mapserver-5.0.0.tar.gz 1803416 RMD160 82b505bf59139afc4a581543c6b4789a52ac1b2c SHA1 156987dbb5b19aaa310a391737a9e649fbc08ea1 SHA256 c754b87a62776d7cd9e781df7523a0560f0773ece5faefb8acc6c030f776b5b7
+DIST mapserver-5.4.2.tar.gz 1877995 RMD160 05634355e1a74b87ffa3fba0741911b34550321e SHA1 4afe4719ad37c77aeeed83f33059e4ba053dcfa1 SHA256 a7005a809c7494cf2ca1648350eab601cc1af34709b127587679bce349e5e185
 EBUILD mapserver-5.0.0-r1.ebuild 7585 RMD160 c34f4a99150a3c25135e11e194d7f4e460b98804 SHA1 1132eda483c36d796ba50617b3bb804be364bdd5 SHA256 35898f8d2bbb693f58e02afb881f28279b6db72a5325968926a428f53e19753a
 EBUILD mapserver-5.0.0.ebuild 8796 RMD160 c3fe8327dfbf076bc0eef47a28b5c7b634eebb68 SHA1 33d371d2b916889b7d32ec5c1e20891595401a4d SHA256 35ba85eee514c8ed9f6cc3640b021d0f79676e327cfc6ead09f3f6e79a4d28e0
-MISC ChangeLog 3859 RMD160 e1355fce880951ac789fdad7825b99c88e95257b SHA1 3c059b8644f8864ba887273cc246f4aaf668ab9c SHA256 285df0b3d74afcc43dd0c4c662d1195c8efb66afda088241f5280b08acb46073
+EBUILD mapserver-5.4.2.ebuild 7467 RMD160 09394dc53e3baf4c83b5a0a5ea0bd3332263412f SHA1 6b16a0789cc8247cece18e6c8954e3b69a0cf6b8 SHA256 948887dad8359adcbbe531a0c299da06e215de9d43cb56d0451fdd7f447be897
+MISC ChangeLog 3990 RMD160 289ee148541efccd17aa4d7d9410bac2ed8e36dc SHA1 890915415ba0f5567e22b92c99592812d5c9789e SHA256 8420267b6101e9c223ae761f15912666a3aeced8e2e9606b76f2c344e42ac869
 MISC metadata.xml 679 RMD160 55082f40f29cfb34e0b2ea2aea585f762dadd275 SHA1 1d9f0482ad577e1a48e738a252abfea71273899b SHA256 0e01b0d981e8a2ebcc0f10566d6f9c94d44c081b0c1bbfa4704ba2580df9f697
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpwsXsACgkQAiZjviIA2XhUhQCdG8lm2I6OOVyyvByXVkWRccLA
-CJIAn0/UVYogcdpE9iwGOqUofaQbzwt6
-=RkDX
------END PGP SIGNATURE-----
diff --git a/sci-geosciences/mapserver/mapserver-5.4.2.ebuild b/sci-geosciences/mapserver/mapserver-5.4.2.ebuild
new file mode 100644
index 000000000000..cbeb8050a3ab
--- /dev/null
+++ b/sci-geosciences/mapserver/mapserver-5.4.2.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-5.4.2.ebuild,v 1.1 2009/08/08 14:15:43 mescalinum Exp $
+
+PHP_EXT_NAME="php_mapscript php_proj"
+RUBY_OPTIONAL="yes"
+
+inherit eutils autotools confutils multilib distutils depend.php perl-module php-ext-source-r1 depend.apache webapp ruby java-pkg-opt-2
+
+WEBAPP_MANUAL_SLOT=yes
+
+DESCRIPTION="OpenSource development environment for constructing spatially enabled Internet-web applications."
+HOMEPAGE="http://mapserver.gis.umn.edu/"
+SRC_URI="http://download.osgeo.org/mapserver/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+# I must check for mygis use flag availability
+IUSE="agg doc flash gdal geos java pdf perl php postgis proj python ruby tcl threads tiff unicode xml xpm" # mono
+
+# compilation fails with jdk > 1.4 on some native part probably
+RDEPEND="media-libs/libpng
+	media-libs/jpeg
+	media-libs/freetype
+	>=media-libs/gd-2.0.12
+	sys-libs/zlib
+	agg? ( x11-libs/agg )
+	flash? ( media-libs/ming )
+	gdal? ( >sci-libs/gdal-1.2.6 )
+	geos? ( sci-libs/geos )
+	java? ( >=virtual/jdk-1.4 )
+	pdf? ( media-libs/pdflib )
+	perl? ( dev-perl/DBI )
+	php? ( dev-lang/php )
+	postgis? ( dev-db/postgis )
+	proj? ( sci-libs/proj net-misc/curl )
+	python? ( dev-lang/python )
+	ruby? ( dev-lang/ruby )
+	tcl? ( dev-lang/tcl )
+	tiff? ( media-libs/tiff sci-libs/libgeotiff )
+	unicode? ( virtual/libiconv )
+	xml? ( dev-libs/libxml2 )
+	xpm? ( x11-libs/libXpm )"
+
+DEPEND="${RDEPEND}
+	java? ( dev-lang/swig )
+	perl? ( dev-lang/swig )
+	ruby? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+	php? ( dev-lang/swig )
+	tcl? ( dev-lang/swig )"
+want_apache2
+
+cd_script() {
+	einfo "$2 the mapserver $1-mapscript"
+	cd "${S}"/mapscript/$1 || die "Unable to go into $1 mapscript dir"
+}
+
+pkg_setup() {
+	webapp_pkg_setup
+	use java && java-pkg-opt-2_pkg_setup
+	use perl && perl-module_pkg_setup
+	use php && has_php
+
+	einfo "Checking for gd compiled with truetype support..."
+	if built_with_use media-libs/gd truetype ; then
+		einfo "Found truetype support; continuing..."
+	else
+		eerror "media-libs/gd must be compiled with truetype support,"
+		eerror "and you probably want jpeg and png support also."
+		eerror "Please re-emerge gd with the truetype USE flag."
+		die "gd not merged with truetype USE flag"
+	fi
+
+	confutils_use_conflict gdal tiff
+	confutils_use_depend_all java threads
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	if use tcl ; then
+		epatch "${FILESDIR}"/${PN}_tcl.patch-r1
+		sed -i -e "s:@libdir@:$(get_libdir):g" mapscript/tcl/Makefile.in \
+			|| die "failed to fix libdir in Makefile.in"
+	fi
+	AT_GNUCONF_UPDATE="no" eautoreconf
+}
+
+src_compile() {
+	local step="Building"
+
+	local myconf="--with-png --with-jpeg --with-zlib --with-freetype"
+	use apache2 && myconf="${myconf} --with-httpd=${APACHE_BIN}"
+	use geos && myconf="${myconf} --with-geos=$(type -P geos-config)"
+
+	local MYGPUSE="wfs wcs wfsclient"
+	if use gdal && use proj ; then
+		myconf="--with-ogr ${myconf}";
+		for i in ${MYGPUSE}; do
+			myconf="${myconf} --with-${i}"
+		done
+		use xml && myconf="${myconf} --with-sos"
+	fi
+
+	use proj && myconf="${myconf} --with-wmsclient"
+	use php && myconf="${myconf} --with-php=${PHPPREFIX}/include/php"
+
+	if use perl || use python || use ruby || use tcl || use php ; then
+		myconf="${myconf} --with-mapscript"
+	fi
+
+	cd "${S}"
+	econf $(use_with gdal) \
+		$(use_with agg) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with ruby) \
+		$(use_with tcl) \
+		$(use_with proj) \
+		$(use_with postgis) \
+		$(use_with tiff) \
+		$(use_with pdf) \
+		$(use_with flash ming) \
+		$(use_with java) \
+		$(use_with unicode iconv) \
+		$(use_with threads) \
+		${myconf}
+
+	emake || die "make failed"
+
+	if use perl; then
+		cd_script perl ${step}
+		perl-module_src_compile
+	fi
+
+	if use php && use proj; then
+			cd_script php3 ${step}
+			emake php_proj.so || die "unable to built php_proj.so"
+	fi
+
+	if use python; then
+		cd_script python ${step}
+		distutils_src_compile || die "Unable to build python mapscript"
+	fi
+
+	if use ruby; then
+		cd_script ruby ${step}
+		RUBY_ECONF="-I${D}"
+		ruby_econf
+		cp ../mapscript.i . || die "Unable to find mapscript.i"
+		sed -e "s:ruby.h defines.h::g" -i ./Makefile
+		ruby_emake
+	fi
+
+	if use tcl; then
+		cd_script tcl ${step}
+		sed "s:perlvars:mapscriptvars:" -i configure
+		sed -e "s:tail -:tail -n :g" -e "s:head -:head -n :g" -i configure ||\
+			die "Unable to modify the configure file"
+		econf --with-tcl=/usr
+		touch tclmodule.i
+		# do not comment this sed out again because it will plain break build otherwise
+		# thanks in advance
+		sed -e "s:-DTCL_WIDE_INT_TYPE=long long:-DTCL_WIDE_INT_TYPE=long\\\ long:g" \
+			-i Makefile || die "Unable to modify Makefile"
+		emake || die "Unable to build tcl mapscript"
+	fi
+
+	if use java; then
+		cd_script java ${step}
+		emake interface || die "Unable to build java mapscript"
+		emake all || die "Unable to build java mapscript"
+	fi
+
+}
+
+src_test(){
+	if use java ; then
+		cd_script java test
+		emake test || die "Test failed"
+		# We need to fix the tests to make them pass
+		sed -i -e "s:setTransparency:setOpacity:g" \
+			"${S}"/mapscript/java/tests/threadtest/MapThread.java \
+			|| die "fixing of tests failed"
+		emake threadtests || die "Threadtests failed"
+	fi
+}
+
+mapscript_install_examples() {
+	elog "$1-mapscript examples could be found in the following directory"
+	elog "/usr/share/doc/${PF}/mapscript/examples/$1"
+	insinto /usr/share/doc/${PF}/mapscript/examples/$1/
+	doins examples/* || die "Unable to install specified sample data"
+}
+
+src_install() {
+	local step
+	step="Installing"
+	extra_dir="fonts tests tests/vera symbols"
+
+	dodir /usr /usr/bin
+
+	into /usr
+
+	if use php ; then
+		cd_script php3 ${step}
+		for i in *.so ; do
+			cp ${i} "${WORKDIR}"/${i/.so}-default.so || die "failed to copy php extension"
+			PHP_EXT_NAME="${i/.so}"
+			php-ext-source-r1_src_install
+		done
+
+		mapscript_install_examples php
+	fi
+
+	if use ruby ; then
+			cd_script ruby ${step}
+			ruby_einstall
+			mapscript_install_examples ruby
+	fi
+
+	if use perl ; then
+			cd_script perl ${step}
+			perl-module_src_install
+			mapscript_install_examples perl
+	fi
+
+	if use tcl ; then
+		cd_script tcl ${step}
+		sed "s:\$(TCL_EXEC_PREFIX):\$(DESTDIR)\$(TCL_EXEC_PREFIX):g" -i Makefile
+		emake -j1 DESTDIR="${D}" install || \
+			die "Unable to setup tcl mapscript support"
+		mapscript_install_examples tcl
+	fi
+
+	if use python ; then
+			cd_script python ${step}
+			distutils_src_install
+			mapscript_install_examples python
+	fi
+
+	if use java ; then
+		cd_script java ${step}
+		java-pkg_dojar mapscript.jar
+		java-pkg_doso libmapscript.so
+		mapscript_install_examples java
+	fi
+
+	cd "${S}"
+	into /usr
+
+	if use pdf ; then
+		dobin shp2pdf || die "Unable to setup shp2pdf"
+	fi
+
+	dobin shp2img legend shptree shptreevis shp2img legend shptreetst scalebar \
+			sortshp tile4ms msencrypt mapserver-config \
+			|| die "Unable to setup mapserver tools"
+
+	dodoc INSTALL README HISTORY.TXT || die "Unable to setup documentation"
+
+	for i in ${extra_dir}; do
+		insinto /usr/share/doc/${PF}/${i}
+		doins ${i}/* || die "Unable to add extra_dir to document tree"
+	done
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}/rfc
+		doins rfc/*
+	fi
+
+	webapp_src_preinst
+	chmod +x "${S}"/mapserv || die "Unable to find mapserv"
+	cp "${S}"/mapserv "${D}"/${MY_CGIBINDIR} || die "Unable to install mapserv"
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+}
+
+pkg_prerm() {
+	webapp_pkg_prerm
+}