merge from webapps overlay wrt #208584

Package-Manager: portage-2.1.4

4 files changed, 310 insertions, 7 deletions

diff --git a/sci-geosciences/mapserver/ChangeLog b/sci-geosciences/mapserver/ChangeLog
index 89d72f28a75f..bdc043bf84d6 100644
--- a/sci-geosciences/mapserver/ChangeLog
+++ b/sci-geosciences/mapserver/ChangeLog
@@ -1,6 +1,18 @@
 # 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.8 2007/10/24 06:58:02 wltjr Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.9 2008/02/05 08:29:18 hollow Exp $
+
+*mapserver-5.0.0-r1 (05 Feb 2008)
+
+  05 Feb 2008; Benedikt Böhm <hollow@gentoo.org> mapserver-5.0.0.ebuild,
+  +mapserver-5.0.0-r1.ebuild:
+  merge from webapps overlay wrt #208584
+
+  03 Feb 2008; Jakub Moc <jakub@gentoo.org>
+  -files/mapserver-5.0.0_php.patch, -files/mapserver_php4.patch,
+  mapserver-5.0.0.ebuild:
+  Fix apache handling wrt Bug 208584. Drop support for PHP4. Sanitize the
+  ebuild. Fix perl handling for Bug 205076.
 
   24 Oct 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   -files/mapserver-4.10.0_php.patch, -files/mapserver-4.10.3_php.patch,
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 1b67275650b4..5d8bd9599944 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,7 +1,18 @@
+-----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
 DIST mapserver-5.0.0.tar.gz 1803416 RMD160 82b505bf59139afc4a581543c6b4789a52ac1b2c SHA1 156987dbb5b19aaa310a391737a9e649fbc08ea1 SHA256 c754b87a62776d7cd9e781df7523a0560f0773ece5faefb8acc6c030f776b5b7
-EBUILD mapserver-5.0.0.ebuild 8748 RMD160 e6ff9640d3258c690e11ad05ec9fa6a0ac8e5445 SHA1 b901e6dd7c91589ef3008a3f4ed7b40b5ee54561 SHA256 eaffbe879bb66c1f7925cbc57ac28b540cc54137bc6582de46004ae17af69e62
-MISC ChangeLog 2344 RMD160 4ae4d81e4a321903241a5811820363c20a9ab693 SHA1 f47c8c3c6f96270edb70a29198c15ee580e3299b SHA256 e448ceb48f6bed8fae4a1f152094132720693ccddfca10979d41a42d2501b986
+EBUILD mapserver-5.0.0-r1.ebuild 7408 RMD160 a5f12ff4edc20debd9d7799df19c27c515acd6cc SHA1 31bcb7a80261adf9a8d388b7bedc7fd5de28600c SHA256 9597146820d38a681dedce74d68636ec53b109562863162cbd2abdabed305230
+EBUILD mapserver-5.0.0.ebuild 8716 RMD160 b70eac92be9534fb973a7a888c07da6b29867c8c SHA1 de68f90b1f5c63c7906eeeb9a6188ae6141e0fa5 SHA256 025b00f14aeb3241c0dceb05916f9fbd628c34f32afb22aa77ed0a74f7b0ee1a
+MISC ChangeLog 2780 RMD160 17ea2e2e4397560192c61765ce6d91213d821b22 SHA1 bea8121321f24bffcba2d6948f169def444438af SHA256 2902d0cceefaf489499888345ccf9aa541fa1865822515b7a21f6c8ead518eb6
 MISC metadata.xml 168 RMD160 156c29f9b364fbbaf0028d17736a01112e5d8cab SHA1 1221e73982792f6e23f10d95e878e86e8f62fe35 SHA256 2fc15316b226307080574c36b3761f27a23a642e89c60f02feabdc64049a188d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkeoHmkACgkQmPFBzbX68WH/gACeO99Ap42WNWaRXLxDYGsnwqt9
+WScAn0smCec8Qq0f+rd/heIw6mDRuSRY
+=A/Nu
+-----END PGP SIGNATURE-----
diff --git a/sci-geosciences/mapserver/mapserver-5.0.0-r1.ebuild b/sci-geosciences/mapserver/mapserver-5.0.0-r1.ebuild
new file mode 100644
index 000000000000..61035ada07ab
--- /dev/null
+++ b/sci-geosciences/mapserver/mapserver-5.0.0-r1.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-5.0.0-r1.ebuild,v 1.1 2008/02/05 08:29:18 hollow 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
+DEPEND="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 dev-lang/swig )
+	pdf? ( media-libs/pdflib )
+	perl? ( dev-perl/DBI dev-lang/swig )
+	php? ( dev-lang/php dev-lang/swig )
+	postgis? ( dev-db/postgis )
+	proj? ( sci-libs/proj net-misc/curl )
+	python? ( dev-lang/python dev-lang/swig )
+	ruby? ( dev-lang/ruby dev-lang/swig )
+	tcl? ( dev-lang/tcl dev-lang/swig )
+	tiff? ( media-libs/tiff sci-libs/libgeotiff )
+	unicode? ( virtual/libiconv )
+	xml? ( dev-libs/libxml2 )
+	xpm? ( x11-libs/libXpm )"
+
+RDEPEND="${DEPEND}"
+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
+}
diff --git a/sci-geosciences/mapserver/mapserver-5.0.0.ebuild b/sci-geosciences/mapserver/mapserver-5.0.0.ebuild
index 9643f3dec7a8..f99badc0e042 100644
--- a/sci-geosciences/mapserver/mapserver-5.0.0.ebuild
+++ b/sci-geosciences/mapserver/mapserver-5.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-5.0.0.ebuild,v 1.4 2007/10/24 06:58:02 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-5.0.0.ebuild,v 1.5 2008/02/05 08:29:18 hollow Exp $
 
 PHP_EXT_NAME="php_mapscript php_proj"
 RUBY_OPTIONAL="yes"
@@ -24,7 +24,6 @@ DEPEND="media-libs/libpng
 	media-libs/freetype
 	sys-libs/zlib
 	>=media-libs/gd-2.0.12
-	apache2? ( www-servers/apache )
 	unicode? ( virtual/libiconv )
 	agg? ( x11-libs/agg )
 	geos? ( sci-libs/geos )