revbump; conversion -> distutils-r1 wrt bug #544750

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 237 insertions, 18 deletions

diff --git a/sci-geosciences/mapserver/ChangeLog b/sci-geosciences/mapserver/ChangeLog
index 1fbf0f931f43..d619807a8149 100644
--- a/sci-geosciences/mapserver/ChangeLog
+++ b/sci-geosciences/mapserver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-geosciences/mapserver
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.54 2015/02/04 19:58:49 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.55 2015/05/05 08:52:36 idella4 Exp $
+
+*mapserver-6.0.1-r3 (05 May 2015)
+
+  05 May 2015; Ian Delaney <idella4@gentoo.org> +mapserver-6.0.1-r3.ebuild,
+  metadata.xml:
+  revbump; conversion -> distutils-r1 wrt bug #544750
 
 *mapserver-6.0.1-r2 (04 Feb 2015)
 
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index e4c0034cb06e..afb6f972535d 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -9,22 +9,15 @@ AUX 6.1.0-php-5.4.patch 3074 SHA256 829a504a956fe79436ed3c1c36eebc47f0c6b58c4563
 AUX mapserver_tcl.patch-r1 1985 SHA256 725c7e5dd9dc6ae6372d9c4a334ce13fc8ea2ab6afbf569a6db786f2caa7a31f SHA512 d98a9885f934974412a10e2cb1aeb59f5c1b2dab1740d0cec408ecd67d47bb8ed44893c0aec4c7bd788683dc8a64ab8335f9565ea8e6e530e5d8db4acf7ad877 WHIRLPOOL a82fb5b5acd0f2f0e747c4cc3bd5dbbdb0013636e75b410c3a48be035b9e756392351b67b2f83e78d4440edcabb5c6646ea72321a88d17c5bff641674d3b3e7a
 DIST mapserver-6.0.1.tar.gz 2430064 SHA256 dd6821917aa7030381442f5e092e4f46f44b9deb9425ec92729e5819e9b61d65 SHA512 0fd9da9d6452fbfbaf0c815e6d15309e185119a4ab33cab2f1c6839bfb8c3a75ce6e7e7779b0eb2aa6e80d1a623ca6e0e58a02049b0db0bfa3f7b0f29117d5dc WHIRLPOOL e4846d40b93c22f7b5dcce1c242b4d88db253be9185194b45c4acddf9066d10c2ec2fbe667941dfe15702838690517a0e57719b1937169e55517e43ed1c225b8
 EBUILD mapserver-6.0.1-r2.ebuild 6037 SHA256 673d67effb68182ae58923a253fe9e17cfd06fe27e71ca7a1ff981af6a880057 SHA512 20c51f041ade35ab5e2d960d265c704bca6175e54326178b8ec03b7a866d7f09789d2d50b8fff892c93a202edbaaf13dd43013c286ebabec6a0610e5367d13eb WHIRLPOOL 062145d3a50c89aa5dfd67b447399cea204d40b08f7a8b19abea48a08b328a33b91668bb865515f9fe2afea4d83467dca8096bf9a0c55c13b67cdedfeb0cf497
-MISC ChangeLog 10015 SHA256 54c4cf7fcd1b9aa4e46527771def512c1e8d59b699cefa3726fa9326e6d9b760 SHA512 ab4af14821dc107deb02e5332c0c3ba614db74f24f7981b7ccd40162f97cd7bd5caecaad8bc977c6d6ac73668b511aeddc2f12f0fd4e5210575dda4aa0ea316f WHIRLPOOL f4e49e1eb25ec142d547409989d522b6feb8c7db1901ea370169fbcc8101e26520e2b6a54e109f4e49ee863d11adc8a3309352fbae3012c0f7fbfe392ae9917e
-MISC metadata.xml 582 SHA256 14f7d9d6360046985e8dcb1e486faaa0d7616ba3e3f7daea8b291219b53305b0 SHA512 84a7e0adb9f9118377184c1f018645c9c4902e7c8e85c62f55c12f6c54a018a828c4024386e1379eea943a7f228fde3427aa1e679c8c85e4cea717806087e86f WHIRLPOOL e0fe6f9f515efb3c4f64929e5740b8a377bc1278e3c4402d100f9bf107cef35b5d2b0b64055c043d9981b79ab6e30f671e8dbf4846ab51cd11d74f16fcbf1579
+EBUILD mapserver-6.0.1-r3.ebuild 5796 SHA256 436920eaff65b818f68a84e1036129f58dc9c8452d9557b757c3ef7ab05f2536 SHA512 8d59de3947f864cadfdc401d17c813f5e9f0c5ce1d9ed274f0b9ba9c80530d44e118b23e882c7021e7bb192cd6b960f5fd9727ee4fb31f22ce076d56c5cedff3 WHIRLPOOL 382ba0e65bc8c693371d0cbfc64165a16c3897c2a1a207f03b43964fc45fb7be2b183482ffae4137d405e1f3ecec70ead3d8bad39e2508cfa2add71362ccd745
+MISC ChangeLog 10196 SHA256 1be39f8f58da2d276e47e1e5f83f2d7c72a77256ff7416ae5d295bae08468a5e SHA512 852f3397d325410bc7cf714a7052ef84375f200b67579b96ca95f45745ea716282b26247345599f148900fdcbd5a7009c53055c97268e44d470be91748e26e30 WHIRLPOOL dee8f2dda356cf14157f6f9bd712a58eae742de5f5a7f80b31832caccdada450dc6eeeb51b1b537fa8b4813c7fee14c8346bb06e0d67a7e1a88a6072f8580872
+MISC metadata.xml 582 SHA256 803c008b7eb92135b17ea6ca938356e1f1f22a361f4746c03374a9dba5361d2e SHA512 4f199260bab5fe4883d63b667e6e32c795bce2d7606d6f45eb0e9589e9278da2719ed04d78e8791f9be98c0473603ff40fec335874c4792ab06c5f5f5cebe3e7 WHIRLPOOL 6a331bdc8249a3008ae70777e59d7a39e8218d56159b0c2cad02e0489c291e243b936ad76a03e2b19981aa4a56454c5ffeed9ce1c261f2a06f338586d19fba6e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJU0noEAAoJENH3ge/59KO2xp8QAKJX8E+CUpyPTP80FEFUGRsA
-52TzihN/T/s6mYwZLxmqjElcbwL6QWzuATOYEMGrumCZF4aOkcNm8mzdskQzOLi+
-grb5stPLNWh1EYQ9Rz2HvqVuCmDlLJz5C09PwZ/aewW06KgODXz+wCbmxCeD+/kN
-zml2SaVhV+O8nfp/y9ButU5KTJnGMtXIPYlNUs8Ccuse7alL/VbKIjS+6W/zm2u/
-VEiKnKuFF14z+dknxrlV0tjCeqncZfJ5p7UZOA3WAdWjcqJt2z0qvYMnGYKXBJKJ
-uQpYU7bTwqGjqHdRzc8GCVTGBZtQwkGJ4m+ngvFM4rkM9Wg1hG9Yc4V8FlKEpkHX
-TeS231ef9mj06bEor13T/Lm/WviH4Zq7YEUfq+SVR6i4pyNGRTE4JFNMO4u3ItTx
-vEPIFCV18fD0aLAIGw1zCNBhon0llw+bd8ORvm3Bq8ZZnOazwljTeNYWEsNbJ0lu
-ANXuckHA1mUwi0LWAXCdaX+aG7dAJUWTo6c09u2zDjfLsaK9UQqfsxaV23xbs9SA
-w0ujuBE23iFvSV60lK7zaJq2yv9LIt5fzyM3dhlbTZfd5dAv6Vl89cl19A4Dt8fF
-Q4Wm6Hqivlt0M2bufpXPkmhs5Ut44IvtLLyblyRmsJ+vRNIMyixz3oFHcKcOitPh
-BpzyJkzKb6/t26K7OiDt
-=/D5q
+iKYEAREIAGYFAlVIhONfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldDdDQUM1OUY0ODkzMERBREU1NUQ1RjJBRkIy
+OEVDMjEzQjgwNzJCMEQACgkQso7CE7gHKw2UnACgxyRXHnnIiOwbpubzLOqQ0oz+
+P4kAniEw9LY5Vt9hc5mjoFeg/EG8E/7R
+=KH0g
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/mapserver/mapserver-6.0.1-r3.ebuild b/sci-geosciences/mapserver/mapserver-6.0.1-r3.ebuild
new file mode 100644
index 000000000000..4eb02b006675
--- /dev/null
+++ b/sci-geosciences/mapserver/mapserver-6.0.1-r3.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.1-r3.ebuild,v 1.1 2015/05/05 08:52:36 idella4 Exp $
+
+EAPI=5
+
+MY_P="${PN}-${PV/_/-}"
+
+PHP_EXT_OPTIONAL_USE="php"
+PHP_EXT_NAME="php_mapscript"
+PHP_EXT_S="${WORKDIR}/${MY_P}/mapscript/php/"
+PHP_EXT_SKIP_PHPIZE="no"
+USE_PHP="php5-4 php5-5"
+
+PYTHON_COMPAT=( python2_7 )
+
+#USE_RUBY="ruby18 ruby19"
+#RUBY_OPTIONAL="yes"
+
+WEBAPP_MANUAL_SLOT=yes
+
+inherit eutils autotools depend.apache webapp distutils-r1 perl-module php-ext-source-r2 multilib # ruby-ng
+
+DESCRIPTION="OpenSource development environment for constructing spatially enabled Internet-web applications"
+HOMEPAGE="http://mapserver.org/"
+SRC_URI="http://download.osgeo.org/mapserver/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="bidi cairo gdal geos mysql opengl perl php postgis proj python threads tiff xml xslt" # ruby php tcl
+
+REQUIRED_USE="php? ( ^^ ( php_targets_php5-4 php_targets_php5-5 ) )"
+
+RDEPEND="
+	!${CATEGORY}/${PN}:${PV}
+	dev-libs/expat
+	dev-libs/fcgi
+	>=media-libs/gd-2.0.12[truetype,jpeg,png,zlib]
+	media-libs/giflib
+	net-misc/curl
+	virtual/jpeg:=
+	virtual/libiconv
+	x11-libs/agg
+	bidi? ( dev-libs/fribidi )
+	cairo? ( x11-libs/cairo )
+	gdal? ( >=sci-libs/gdal-1.8.0 )
+	geos? ( sci-libs/geos )
+	mysql? ( virtual/mysql )
+	opengl? (
+		media-libs/ftgl
+		media-libs/mesa
+	)
+	perl? ( dev-lang/perl:= )
+	postgis? ( dev-db/postgis )
+	proj? ( sci-libs/proj net-misc/curl )
+	tiff? (
+		media-libs/tiff:=
+		sci-libs/libgeotiff
+	)
+	xml? ( dev-libs/libxml2:2 )
+	xslt? ( dev-libs/libxslt[crypt] )
+"
+for i in perl python; do
+	SWIG_DEPEND+=" ${i}? ( >=dev-lang/swig-2.0 )"
+done
+DEPEND="${RDEPEND} ${SWIG_DEPEND}"
+unset SWIG_DEPEND
+unset i
+
+need_apache2
+
+S=${WORKDIR}/${MY_P}
+
+_enter_build_dir() {
+	[[ -z ${1} ]] && die "Missing path argument"
+	local workdir=${1}
+	shift
+	[[ -z ${1} ]] && die "missing command argument"
+
+	echo ">>> Running \"${@}\" in work directory \"${workdir}\""
+	pushd "${workdir}" > /dev/null || die "Failed to enter directory"
+	${@} || die
+	popd > /dev/null
+}
+
+each_ruby_configure() { ${RUBY} extconf.rb || die ; }
+
+ext-source-r2_src_install() {
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env ${slot}
+		insinto "${EXT_DIR}"
+		newins "${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so" || die "Unable to install extension"
+	done
+	php-ext-source-r2_createinifiles
+}
+
+pkg_setup() {
+	webapp_pkg_setup
+	use perl && perl_set_version
+	#use ruby && ruby-ng_pkg_setup
+}
+
+src_unpack() {
+	# unpack A and then copy the php thingies into workdir/php-slot
+	php-ext-source-r2_src_unpack
+	# HACK: and then remove it and replace by symlink
+	for slot in $(php_get_slots); do
+		rm -rf "${WORKDIR}/${slot}" || die
+		ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die
+	done
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/6.0.0_rc1-ldflags.patch" \
+		"${FILESDIR}/6.0.0_rc1-bool.patch" \
+		"${FILESDIR}/6.0.0_rc1-php_ldflags.patch" \
+		"${FILESDIR}/6.1.0-php-5.4.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	local myopts
+
+	if use gdal && use proj ; then
+		myopts+="
+			--with-wfs
+			--with-wcs
+			--with-wfsclient
+			--with-wmsclient
+		"
+		use xml && myopts+=" --with-sos"
+	fi
+
+	# some scripts require configure time options so place it here
+	if use php ; then
+		use php_targets_php5-4 && myopts+=" --with-php=${EPREFIX}/usr/$(get_libdir)/php5.4/include/php/"
+		use php_targets_php5-5 && myopts+=" --with-php=${EPREFIX}/usr/$(get_libdir)/php5.5/include/php/"
+	fi
+
+	# sde is ESRI package that you have to buy first
+	# oraclespatial needs oracle server for testing/usage
+	# note that some options accept just path, they are not on/off switches!
+	econf \
+		--without-oraclespatial \
+		--without-sde \
+		--with-libiconv \
+		--with-jpeg \
+		--with-gd \
+		--with-gif="${EPREFIX}/usr/" \
+		--with-wms \
+		--with-kml \
+		--with-curl-config \
+		--with-agg-svg-symbols \
+		--with-httpd="${APACHE_BIN}" \
+		--with-fastcgi \
+		$(use_with opengl ogl) \
+		$(use_with opengl ftgl) \
+		$(use_with proj) \
+		$(use_with threads) \
+		$(use_with geos) \
+		$(use_with gdal) \
+		$(use_with gdal ogr) \
+		$(use_with postgis) \
+		$(use_with mysql) \
+		$(use_with xml xml2-config) \
+		$(use_with xslt) \
+		$(use_with xslt xml-mapfile) \
+		$(use_with bidi fribidi-config) \
+		$(use_with cairo) \
+		${myopts}
+
+	#use ruby && _enter_build_dir "${S}/mapscript/ruby" "ln -s ../mapscript.i ./"
+	#use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_configure"
+}
+
+src_compile() {
+	default
+	use python && _enter_build_dir "${S}/mapscript/python" "distutils-r1_src_compile"
+	use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_prep"
+	use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_compile"
+	#use php && php-ext-source-r2_src_compile # already compiled by the emake all
+	#use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_compile"
+}
+
+src_install() {
+	local step="Installing"
+	local extra_dir="fonts tests tests/vera symbols"
+	local i
+
+	dobin shp2img legend shptree shptreevis shp2img legend shptreetst scalebar \
+		sortshp tile4ms msencrypt mapserver-config
+
+	dodoc INSTALL README HISTORY.TXT
+
+	for i in ${extra_dir}; do
+		docinto /usr/share/doc/${PF}/${i}
+		dodoc -r ${i}/* || die
+	done
+
+	use python && _enter_build_dir "${S}/mapscript/python" "distutils-r1_src_install"
+	use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_install"
+	use perl && _enter_build_dir "${S}/mapscript/perl" "perl_delete_localpod"
+	use php && ext-source-r2_src_install
+	#use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_install"
+
+	webapp_src_preinst
+	exeinto "${MY_CGIBINDIR}"
+	doexe "${S}/mapserv"
+	webapp_src_install
+}
+
+pkg_preinst() {
+	use perl && perl_set_version
+}
+
+pkg_prerm() {
+	webapp_pkg_prerm
+}
diff --git a/sci-geosciences/mapserver/metadata.xml b/sci-geosciences/mapserver/metadata.xml
index 5ec7d05f679b..a4103a88dd1e 100644
--- a/sci-geosciences/mapserver/metadata.xml
+++ b/sci-geosciences/mapserver/metadata.xml
@@ -6,8 +6,7 @@
 		<flag name="gdal">Enable <pkg>sci-libs/gdal</pkg> library support</flag>
 		<flag name="geos">Enable <pkg>sci-libs/geos</pkg> library support</flag>
 		<flag name="postgis">Enable <pkg>dev-db/postgis</pkg> support</flag>
-		<flag name="proj">Enable <pkg>sci-libs/proj</pkg> library support
-(geographic projections)</flag>
+		<flag name="proj">Enable <pkg>sci-libs/proj</pkg> library support (geographic projections)</flag>
 		<flag name="xslt">Enable xslt and exslt support xml-mapfile support</flag>
 	</use>
 </pkgmetadata>