adding current release to address fixes and related issues

Package-Manager: portage-2.1.3.7

4 files changed, 347 insertions, 15 deletions

diff --git a/sci-geosciences/mapserver/ChangeLog b/sci-geosciences/mapserver/ChangeLog
index 28c8b48e2d5a..cb5bad448ff4 100644
--- a/sci-geosciences/mapserver/ChangeLog
+++ b/sci-geosciences/mapserver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-geosciences/mapserver
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.5 2007/07/29 17:09:16 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.6 2007/09/01 16:58:36 nerdboy Exp $
+
+*mapserver-4.10.3 (01 Sep 2007)
+
+  01 Sep 2007; Steve Arnold <nerdboy@gentoo.org> +mapserver-4.10.3.ebuild:
+  Adding current release to fixes and related security issues.  Tested on
+  x86 (including Java 1.5 using the jBox example applet) and built on
+  amd64 (but not tested yet).  Addresses bugs 170556 and 190108.
 
   29 Jul 2007; Christian Heim <phreak@gentoo.org> mapserver-4.10.0.ebuild,
   mapserver-4.10.0-r1.ebuild:
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 9277a6bc75b5..5120d140169f 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mapserver-4.10.0_php.patch 11446 RMD160 6369ff5813e0aac9334aeff7f748e9f97e3b0ae5 SHA1 6e298508335e1159ea0396e8672d7a2dbb9f0d57 SHA256 53d1018cee68c5c2f9fc1b66995d9f465c3035d9650b7045149f835f6f74b522
 MD5 d57f707a3d53e5e35c016ece397aaf9a files/mapserver-4.10.0_php.patch 11446
 RMD160 6369ff5813e0aac9334aeff7f748e9f97e3b0ae5 files/mapserver-4.10.0_php.patch 11446
@@ -14,6 +11,7 @@ MD5 f885111c787be0e68c17073ab14ae73b files/mapserver_tcl.patch 1499
 RMD160 ad98752a52c42446fa01ad1781b5d0f4daf36379 files/mapserver_tcl.patch 1499
 SHA256 d2a692e1c34fb8a509d7fc5755bc900dc3cfc886dab35e41298c69642452ba09 files/mapserver_tcl.patch 1499
 DIST mapserver-4.10.0.tar.gz 1782838 RMD160 425b1e856e98165cb7d4facf6a1ef393bf9c7f36 SHA1 ee2b7befc738ec79fab83bafe27b4e4efe11b1cb SHA256 c59b0b6b75443fbbced153c4b01f752e748cf73ce7c29125cfe8e223893b9d99
+DIST mapserver-4.10.3.tar.gz 1777575 RMD160 98c27f42abc69a709e1f08d11110654fe7a6ac84 SHA1 d0ecba0878769e52c87341480f6d04aa6c0d6ec6 SHA256 f7acfec5cd73c9c8e4070f4732d2c52159fcdec1dad888ab73b45069490f085a
 EBUILD mapserver-4.10.0-r1.ebuild 7358 RMD160 e575b12c5b63fb5cf46debb5bed4c8ad45bae06a SHA1 71c4120cc8a4d1804a7abba15acdcba990c51eb4 SHA256 5c69959229054498212f37072406d71633a55a136901aad59cec13e285cb387e
 MD5 d4984e89348b1d0b981268fcb369b166 mapserver-4.10.0-r1.ebuild 7358
 RMD160 e575b12c5b63fb5cf46debb5bed4c8ad45bae06a mapserver-4.10.0-r1.ebuild 7358
@@ -22,10 +20,14 @@ EBUILD mapserver-4.10.0.ebuild 7280 RMD160 15afc679398726fff8fce315fce7cabb60295
 MD5 a048c330e7af0d787a79bb8331450be1 mapserver-4.10.0.ebuild 7280
 RMD160 15afc679398726fff8fce315fce7cabb602956b4 mapserver-4.10.0.ebuild 7280
 SHA256 6c7e65143531548b8ef5474ec58e8964b303de8af3b982a0bebdc4ee5cdb0990 mapserver-4.10.0.ebuild 7280
-MISC ChangeLog 1544 RMD160 9d3244f8c1a6f978c0a11aa35a3093dae3a87c65 SHA1 5b29550275147d2a779ffd7186fdc9f8f08632ff SHA256 4153b8edcdaf8647ecdc3496886a07c99f7dbfab1d68baa4aeb7f376c8544f5c
-MD5 d82e2db025a7d9d64da23c4bdedc3ce6 ChangeLog 1544
-RMD160 9d3244f8c1a6f978c0a11aa35a3093dae3a87c65 ChangeLog 1544
-SHA256 4153b8edcdaf8647ecdc3496886a07c99f7dbfab1d68baa4aeb7f376c8544f5c ChangeLog 1544
+EBUILD mapserver-4.10.3.ebuild 8227 RMD160 3e9a4dec1c635bfc76b9b204b2f71ddb34e77f90 SHA1 6b6d78960f7186746ac884fe20dd47ba619d0b69 SHA256 d02965efed056007a74a6ce2426d02a23f0213be13a39304b908c1921f5a2a4c
+MD5 4217cbfc52917cc2d573d24f9581c4e1 mapserver-4.10.3.ebuild 8227
+RMD160 3e9a4dec1c635bfc76b9b204b2f71ddb34e77f90 mapserver-4.10.3.ebuild 8227
+SHA256 d02965efed056007a74a6ce2426d02a23f0213be13a39304b908c1921f5a2a4c mapserver-4.10.3.ebuild 8227
+MISC ChangeLog 1863 RMD160 410d7f868559caf7dc609ecb0f10ad59fbd74300 SHA1 17bac150070a8224fdc63d58e06abe7632520aaa SHA256 39fa4815ac30f4fb3bfa8b88e9f58ae1b4a8aead5b33406a9f7eac15bdb42a68
+MD5 b736265ad66f5524c0cd17780b74f51a ChangeLog 1863
+RMD160 410d7f868559caf7dc609ecb0f10ad59fbd74300 ChangeLog 1863
+SHA256 39fa4815ac30f4fb3bfa8b88e9f58ae1b4a8aead5b33406a9f7eac15bdb42a68 ChangeLog 1863
 MISC metadata.xml 168 RMD160 156c29f9b364fbbaf0028d17736a01112e5d8cab SHA1 1221e73982792f6e23f10d95e878e86e8f62fe35 SHA256 2fc15316b226307080574c36b3761f27a23a642e89c60f02feabdc64049a188d
 MD5 398851fd6e5d040b232773963c208fc6 metadata.xml 168
 RMD160 156c29f9b364fbbaf0028d17736a01112e5d8cab metadata.xml 168
@@ -36,10 +38,6 @@ SHA256 f7bd7ededad852faae52263743152717150cd449d90f27878469ae7a52b5fc1f files/di
 MD5 96bab69a87064ea9ebd9741d253a6752 files/digest-mapserver-4.10.0-r1 253
 RMD160 fb5602354575339848cf6e93093408f894b25997 files/digest-mapserver-4.10.0-r1 253
 SHA256 f7bd7ededad852faae52263743152717150cd449d90f27878469ae7a52b5fc1f files/digest-mapserver-4.10.0-r1 253
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
-
-iD8DBQFGrMnKyuNVb5qfaOYRAjsTAKCzH0IouZJoNq5IxmPg+elDmOKhkwCdG01q
-JC6EcA2m5rtD4WFmASXfdNM=
-=Urso
------END PGP SIGNATURE-----
+MD5 b5571edf57cfa1df2e6e2c740ae2a31d files/digest-mapserver-4.10.3 253
+RMD160 c4a24eec23dd36f5b91753fe556c4d4fa7549070 files/digest-mapserver-4.10.3 253
+SHA256 4ec71c1617caf9086a5ff36e0521ad0c00f8bd4f99a4f1552a553c3053066bcd files/digest-mapserver-4.10.3 253
diff --git a/sci-geosciences/mapserver/files/digest-mapserver-4.10.3 b/sci-geosciences/mapserver/files/digest-mapserver-4.10.3
new file mode 100644
index 000000000000..242f30feeca9
--- /dev/null
+++ b/sci-geosciences/mapserver/files/digest-mapserver-4.10.3
@@ -0,0 +1,3 @@
+MD5 b988cdfece7c2f02b0cd186b5090729b mapserver-4.10.3.tar.gz 1777575
+RMD160 98c27f42abc69a709e1f08d11110654fe7a6ac84 mapserver-4.10.3.tar.gz 1777575
+SHA256 f7acfec5cd73c9c8e4070f4732d2c52159fcdec1dad888ab73b45069490f085a mapserver-4.10.3.tar.gz 1777575
diff --git a/sci-geosciences/mapserver/mapserver-4.10.3.ebuild b/sci-geosciences/mapserver/mapserver-4.10.3.ebuild
new file mode 100644
index 000000000000..c55b328dc64f
--- /dev/null
+++ b/sci-geosciences/mapserver/mapserver-4.10.3.ebuild
@@ -0,0 +1,324 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-4.10.3.ebuild,v 1.1 2007/09/01 16:58:36 nerdboy Exp $
+
+PHP_EXT_NAME="php_mapscript php_proj"
+RUBY_OPTIONAL="yes"
+
+inherit eutils autotools distutils depend.php depend.apache webapp ruby java-pkg-opt-2
+
+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
+#"mono"
+IUSE="xml pdf proj geos tiff gdal xpm postgis flash php python perl ruby tcl threads java"
+
+# compilation fails with jdk > 1.4 on some native part probably
+DEPEND="media-libs/libpng
+	media-libs/jpeg
+	>=media-libs/gd-2.0.12
+	media-libs/freetype
+	sys-libs/zlib
+	www-servers/apache
+	geos? ( sci-libs/geos )
+	proj? ( sci-libs/proj net-misc/curl )
+	xml? ( dev-libs/libxml2 )
+	gdal? ( >sci-libs/gdal-1.2.6 )
+	postgis? ( dev-db/postgis )
+	tiff? ( media-libs/tiff sci-libs/libgeotiff )
+	xpm? ( x11-libs/libXpm )
+	flash? ( media-libs/ming )
+	pdf? ( media-libs/pdflib )
+	php? ( dev-lang/php dev-lang/swig )
+	ruby? ( dev-lang/ruby dev-lang/swig )
+	perl? ( dev-perl/DBI dev-lang/swig )
+	python? ( dev-lang/python dev-lang/swig )
+	java? ( >=virtual/jdk-1.4 dev-lang/swig )
+	tcl? ( dev-lang/tcl dev-lang/swig )"
+
+WEBAPP_MANUAL_SLOT=yes
+
+want_apache
+
+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
+	java-pkg-opt-2_pkg_setup
+	if use php; then
+		# check how many versions of php was installed
+		has_php
+		np=0
+		if has_version '=dev-lang/php-5*'; then
+			np="$(expr ${np} + 1)"
+		fi
+		if has_version '=dev-lang/php-4*' ; then
+			np="$(expr ${np} + 1)"
+			myphp4=true
+		fi
+		toD="$(if [ ${np} -gt 1 ]; then echo s; fi)"
+		einfo "Using ${np} PHP version${toD}"
+	fi
+
+	elog "Checking for gd compiled with truetype support..."
+	if built_with_use media-libs/gd truetype; then
+		elog "Found truetype support; continuing..."
+	else
+		ewarn "media-libs/gd must be compiled with truetype support,"
+		ewarn "and you probably want jpeg and png support also."
+		elog "Please re-emerge gd with the truetype USE flag."
+		die "gd not merged with truetype USE flag"
+	fi
+
+	if use gdal && use tiff; then
+		ewarn "The MapServer tiff support is not compatible"
+		ewarn "with gdal tiff support."
+		elog "Please disable tiff support for mapserver."
+		die "mapserver has tiff USE flag enabled"
+	fi
+
+	if use java && ! use threads; then
+		ewarn "The MapServer Java support needs threads."
+		elog "Please enable thread support for mapserver."
+		die "mapserver has threads USE flag disabled"
+	fi
+
+}
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	if (use tcl); then
+		epatch "${FILESDIR}"/${PN}_tcl.patch
+	fi
+
+	if (use php); then
+		if [ ${np} -eq 2 ]; then
+			mkdir ./mapscript/php4
+			cp -r ./mapscript/php3 ./mapscript/php5 ||\
+				die "Unable to copy php mapscript directory"
+			epatch "${FILESDIR}"/${PF}_php.patch
+		fi
+	fi
+	if [ ! -z "${myphp4}" ]; then
+		epatch "${FILESDIR}"/${PN}_php4.patch
+	fi
+
+}
+
+src_compile() {
+	local step
+	step="Building"
+	cd "${S}"
+
+	AT_GNUCONF_UPDATE="no" eautoreconf
+
+	local myconf
+	myconf="--with-httpd=${APACHECTL/'ctl'/} --with-freetype"
+
+	if use geos; then
+		myconf="${myconf} --with-geos=$(type -P geos-config)"
+	fi
+
+	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
+		if (use xml); then
+			myconf="${myconf} --with-sos"
+		fi
+	fi
+
+	if (use proj); then
+		myconf="${myconf} --with-wmsclient"
+	fi
+
+	if (use php); then
+		ewarn "You use ${np} version of php"
+		if [ ${np} -eq 2 ] ; then
+			for i in 4 5; do
+				uses_php${i}
+				myconf="${myconf} --with-php${i}=${PHPPREFIX}"
+			done
+		else
+			myconf="${myconf} --with-php=${PHPPREFIX}/include/php"
+		fi
+	fi
+
+	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 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 threads)\
+		${myconf}\
+		|| die "econf failed"
+
+	make || die "make failed"
+
+	if (use php && use proj); then
+	    cd "${S}"/mapscript/php3/
+		if [ ${np} -eq 2 ]; then
+			cp *.so ../php4/ || die "Unable to copy php4 mapscript object files"
+		fi
+	fi
+
+	if use perl; then
+		cd_script perl ${step}
+		perl Makefile.PL || die "Unable to build perl mapscript"
+		emake || die "Unable to build perl mapscript"
+	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 || die "Unable to configure tcl mapscript"
+		touch tclmodule.i
+		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
+		sed -i -e "s:lmap:lmapserver:g" ${S}/mapscript/java/Makefile \
+		     || die "sed failed"
+		cd_script java ${step}
+		emake interface || die "Unable to build java mapscript"
+		emake all || die "Unable to build java mapscript"
+	fi
+
+}
+
+mapscript_install_examples() {
+	einfo "$1-mapscript examples could be found in the following directory"
+	einfo "/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
+		if [ 2 -eq "${np}" ] ; then
+			for i in 4 5; do
+				cd_script php$i ${step}
+				uses_php$i
+				EXT_DIR="$(${PHPCONFIG} --extension-dir)"
+				dodir ${EXT_DIR}
+				cp *.so ${D}/${EXT_DIR} || \
+					die "Unable to setup php5 mapscript support"
+			done
+		else
+			cd_script php3 ${step}
+			EXT_DIR="$(${PHPCONFIG} --extension-dir)"
+			dodir ${EXT_DIR}
+			cp *.so ${D}/${EXT_DIR} || \
+				die "Unable to setup php4 mapscript support"
+		fi
+		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}
+		    make DESTDIR="${D}" install || \
+				die "Unable to setup perl mapscript support"
+			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
+		make 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 "${S}"/shp2pdf || die "Unable to setup shp2pdf"
+	fi
+
+	dobin "${S}"/sortshp "${S}"/shp2img "${S}"/shptree "${S}"/shptreevis \
+		"${S}"/shptreetst "${S}"/legend "${S}"/scalebar "${S}"/tile4ms	|| \
+		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 "${S}"/$i/* || die "Unable to add extra_dir to document tree"
+	done
+
+	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
+}