Non-maintainer commit: Removing ebuild depending on older PHP versions. Bug 363809

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

3 files changed, 6 insertions, 314 deletions

diff --git a/sci-geosciences/mapserver/ChangeLog b/sci-geosciences/mapserver/ChangeLog
index 0a72d40ed8c1..a81f1767addb 100644
--- a/sci-geosciences/mapserver/ChangeLog
+++ b/sci-geosciences/mapserver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/mapserver
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.40 2011/06/11 15:08:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.41 2011/06/28 15:22:38 olemarkus Exp $
+
+  28 Jun 2011; Ole Markus With <olemarkus@gentoo.org> -mapserver-5.6.6.ebuild:
+  Non-maintainer commit: Removing ebuild depending on older PHP versions. Bug
+  363809
 
   11 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> mapserver-6.0.0.ebuild:
   Gif ain't exactly optional. Fixes bug #371159.
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index fc2a181f1bbb..701edefd182a 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,21 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 5.4.2-ldflags.patch 3851 RMD160 db486a2c5611b3bc9102ded21c3aa03f47f0dfe6 SHA1 7cef034f6d3a176934bbb9df957057309fe409be SHA256 518ebe8e12b590001571110d521939a44a1fc74d82cdc04d76f81943c99a5463
 AUX 6.0.0_rc1-bool.patch 862 RMD160 0678d6fa9ccf74143601122b4d2b75fbed702322 SHA1 5f06f5ce26ca4d022be7840dff82cf36a0d1be9f SHA256 59ce6a605768fd849c33fbb7093802f2906315f9abe520b78a985891d39508a6
 AUX 6.0.0_rc1-ldflags.patch 3954 RMD160 33dc08159230f49070891ad6626548746324370a SHA1 35a72f6f03e47c31971503865f05d0a6dc9beb76 SHA256 09ec9d68eccc100a315c60527bd51623ff03caa7b4721434aedb972aa96aa3b7
 AUX 6.0.0_rc1-php_ldflags.patch 551 RMD160 88de8414b4d6ea8fbeb7c11c6ad4f3c673487175 SHA1 9914dca230858fea212983521b85aa5a719fa4b7 SHA256 50023a92811b2856bdb04d8e2d241c4e424c4b00557c1d70615a3940f664fd59
 AUX mapserver_tcl.patch-r1 1985 RMD160 bb4d766526f7c29535915bb87c0c5199251a2c3a SHA1 2415b6b792be100f2e5a6a936ef77260352f718b SHA256 725c7e5dd9dc6ae6372d9c4a334ce13fc8ea2ab6afbf569a6db786f2caa7a31f
-DIST mapserver-5.6.6.tar.gz 2326652 RMD160 251d3448fbdc2f0a14351389fc85d6b014a22d99 SHA1 e0fa6455737ca2cd14357775adda92a47b4e53ff SHA256 e5d00321456791cebcbf0b0cb3fa1b69c5cd8bfa8d6003ad05480682465684f6
 DIST mapserver-6.0.0.tar.gz 2435310 RMD160 b324df0181e23cf5af46f768af59f65acc13ff9e SHA1 4bbd8ef56aa1389de4c80b4776e00db538529367 SHA256 92709333665c4784f69b18d1a8e78dd80f87a66b5d490fd0e49ef2ba616bd9af
-EBUILD mapserver-5.6.6.ebuild 7312 RMD160 c5ae1310ac90c28ea6e0910a18b8616dc1d8ab55 SHA1 d43b123ee7a61bf64e42d3bcc48397cd11947911 SHA256 bbfe04300654d2aa8531af13bebeb07ccec3f1388b26d4b4f6a55a0a181c13db
 EBUILD mapserver-6.0.0.ebuild 5876 RMD160 8051fea683fc4856854452b55bbb4a026916864c SHA1 82b8b44702d8eae19f858ac1f9d2c98630e4bee9 SHA256 b303d67d3d8573229afd9027a1a933f9ca4a9cecd6acff57f60ec7dcd8594742
-MISC ChangeLog 7590 RMD160 d194818514def359935cd3c8d2f9af0d2616e058 SHA1 ae0e7080ae33ad7d29d5e0e4683866975f818157 SHA256 9f60c75bd3bf208e00e1b65e24eebf7361dd68b9ce04d5b2e316874da7c4a572
+MISC ChangeLog 7757 RMD160 76e8eb3884cbbeb70fb8bfd1ac93a9a978a68171 SHA1 580ad37d254ce8cddd1a5121e4603918f9e0e47c SHA256 46ba31f058e1503cd6642964752cde5cd6fd4b6612e78c6aeccc49ddcda9363c
 MISC metadata.xml 752 RMD160 336d701cfcb45e8d38e7d7be62910a3b92ef4e6b SHA1 268cb1d2aad5143713b52a2be77b44fb73d29553 SHA256 0e50fb47de44ad1fe80ff9473bc5f37927cfeeaa536809782fc17d5b3a7667a1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk3zhN8ACgkQHB6c3gNBRYeC0gCgqiSUTmdP/DEqk/h7FrNeHfzF
-dVAAoLRqDg/3qMAiOtsJhmk3xdwNzcRC
-=TP3R
------END PGP SIGNATURE-----
diff --git a/sci-geosciences/mapserver/mapserver-5.6.6.ebuild b/sci-geosciences/mapserver/mapserver-5.6.6.ebuild
deleted file mode 100644
index 16b39a25f1b1..000000000000
--- a/sci-geosciences/mapserver/mapserver-5.6.6.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-5.6.6.ebuild,v 1.1 2011/05/02 10:16:17 scarabeus Exp $
-
-EAPI=3
-
-PHP_EXT_NAME="php_mapscript php_proj"
-RUBY_OPTIONAL="yes"
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-PYTHON_MODNAME="mapscript.py"
-
-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.org"
-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 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
-	virtual/jpeg
-	media-libs/freetype
-	>=media-libs/gd-2.0.12[truetype,jpeg,png]
-	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 )
-	perl? ( dev-perl/DBI )
-	php? ( dev-lang/php )
-	postgis? ( dev-db/postgis )
-	proj? ( sci-libs/proj net-misc/curl )
-	ruby? ( dev-lang/ruby )
-	tcl? ( dev-lang/tcl )
-	tiff? ( media-libs/tiff sci-libs/libgeotiff )
-	unicode? ( virtual/libiconv )
-	xml? ( dev-libs/libxml2:2 )
-	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
-	use python && python_pkg_setup
-
-	confutils_use_conflict gdal tiff
-	confutils_use_depend_all java threads
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/5.4.2-ldflags.patch
-
-	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
-	eautoreconf
-}
-
-src_configure() {
-	local step="Configuration"
-
-	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 \
-		--without-pdf \
-		$(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 flash ming) \
-		$(use_with java) \
-		$(use_with unicode iconv) \
-		$(use_with threads) \
-		${myconf}
-
-	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
-	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"
-	fi
-}
-
-src_compile() {
-	local step="Building"
-
-	# bug #279627
-	emake -j1 || 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
-	fi
-
-	if use ruby; then
-		cd_script ruby ${step}
-		ruby_emake
-	fi
-
-	if use tcl; then
-		cd_script tcl ${step}
-		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(){
-	local step="Testing"
-
-	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="Installing"
-
-	local 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
-
-	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
-	use python && distutils_pkg_postinst
-}
-
-pkg_prerm() {
-	webapp_pkg_prerm
-}
-
-pkg_postrm() {
-	use python && distutils_pkg_postrm
-}