From 2a05df4946ab347496bdcdf984590c9194e3c558 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=A9rald=20Fenoy?= Date: Sat, 25 Nov 2006 04:28:19 +0000 Subject: [PATCH] Ebuild contain mistake. Package-Manager: portage-2.1.1-r2 --- sci-geosciences/mapserver/Manifest | 14 +++---- .../mapserver/mapserver-4.10.0.ebuild | 37 ++++++++++--------- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest index 45e19eb51343..dd43e8e7b661 100644 --- a/sci-geosciences/mapserver/Manifest +++ b/sci-geosciences/mapserver/Manifest @@ -10,10 +10,10 @@ MD5 be6f6a45732fdf0aa265de8a42e496ff files/mapserver_tcl.patch 802 RMD160 8c4870e30b7ed3c40dce58f0fd1123bbb119ff57 files/mapserver_tcl.patch 802 SHA256 75a07f28f0f69445f6cf7227af98ae584a4d80cc22fa002c9c4ff25c9ae232a3 files/mapserver_tcl.patch 802 DIST mapserver-4.10.0.tar.gz 1782838 RMD160 425b1e856e98165cb7d4facf6a1ef393bf9c7f36 SHA1 ee2b7befc738ec79fab83bafe27b4e4efe11b1cb SHA256 c59b0b6b75443fbbced153c4b01f752e748cf73ce7c29125cfe8e223893b9d99 -EBUILD mapserver-4.10.0.ebuild 7244 RMD160 d1d900ef7232d209776bd11b39b48e481ea72dc3 SHA1 2f67f39fb0221d0b58d2da010ef5589942669484 SHA256 b76fba6d98884fb4d3cada16d1f4751fe5143f7a57c6338b79bcd8c85d9032ae -MD5 3ead41b87558d91f0e8fddae5cba334d mapserver-4.10.0.ebuild 7244 -RMD160 d1d900ef7232d209776bd11b39b48e481ea72dc3 mapserver-4.10.0.ebuild 7244 -SHA256 b76fba6d98884fb4d3cada16d1f4751fe5143f7a57c6338b79bcd8c85d9032ae mapserver-4.10.0.ebuild 7244 +EBUILD mapserver-4.10.0.ebuild 7244 RMD160 c6c943708617223151d600c984a78ee46c08d1f4 SHA1 075394d01c1bf82d2acefad354ce3b5bde502969 SHA256 b8efacf7fb8e52388e83aac3485e853047068bd48e484c09e9ec36254d5c8512 +MD5 a432828b5bdd7fdf08f6ab349217a3ef mapserver-4.10.0.ebuild 7244 +RMD160 c6c943708617223151d600c984a78ee46c08d1f4 mapserver-4.10.0.ebuild 7244 +SHA256 b8efacf7fb8e52388e83aac3485e853047068bd48e484c09e9ec36254d5c8512 mapserver-4.10.0.ebuild 7244 MISC ChangeLog 887 RMD160 719a521454092f26dcef1bbc9fc8b2c470a9d41c SHA1 ffd2132a66254c97fa5ebccc68b73d06ca9d7e1a SHA256 510493e55ee7957657df49968aa215b548b603e3781cb548e6f4d3109086a478 MD5 25f73d700417086d0454e9d3766cf078 ChangeLog 887 RMD160 719a521454092f26dcef1bbc9fc8b2c470a9d41c ChangeLog 887 @@ -28,7 +28,7 @@ SHA256 f7bd7ededad852faae52263743152717150cd449d90f27878469ae7a52b5fc1f files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.4 (GNU/Linux) -iD8DBQFFZ7szGG5LT2KRH24RAugdAKCeeXMOYMwRqu/EY6jaY7fQ2GjTZACgmT+k -NzaZVXhRcBfCcmv2coOvACs= -=3oZ9 +iD8DBQFFZ8aZGG5LT2KRH24RAtKFAJ9w6Q6M/nw6h7C60aav+FoxyRIgygCgh9tS +UxzjWctrRt3I3YXeLBvmj2w= +=K4K6 -----END PGP SIGNATURE----- diff --git a/sci-geosciences/mapserver/mapserver-4.10.0.ebuild b/sci-geosciences/mapserver/mapserver-4.10.0.ebuild index ea6764c13d3c..d4147d87313c 100644 --- a/sci-geosciences/mapserver/mapserver-4.10.0.ebuild +++ b/sci-geosciences/mapserver/mapserver-4.10.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-4.10.0.ebuild,v 1.1 2006/11/25 03:39:43 djay Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-4.10.0.ebuild,v 1.2 2006/11/25 04:28:19 djay Exp $ PHP_EXT_NAME="php_mapscript php_proj" RUBY_OPTIONAL="yes" @@ -19,7 +19,7 @@ KEYWORDS="~x86" #I must check for mygis use flag availability #"mono" -IUSE="xml pdf proj geos tiff gdal xpm threads postgis ming php python perl ruby tcl java" +IUSE="xml pdf proj geos tiff gdal xpm postgis ming php python perl ruby tcl java" DEPEND="media-libs/libpng @@ -74,10 +74,6 @@ src_unpack() { unpack "${A}" cd "${S}" - local MY_PUSE,MY_GPUSE - MY_PUSE="wmsserver wmsclient" - MY_GPUSE="wfs wcs wmsclient wfsclient" - if (use tcl); then epatch "${FILESDIR}"/${PN}_tcl.patch fi @@ -99,25 +95,29 @@ src_compile() { AT_GNUCONF_UPDATE="no" eautoreconf - my_conf="--with-httpd=${APACHECTL/'ctl'/} --with-freetype" + local myconf + myconf="--with-httpd=${APACHECTL/'ctl'/} --with-freetype" if use geos; then - my_conf="${my_conf} --with-geos=$(which geos-config)" + myconf="${myconf} --with-geos=$(which geos-config)" fi + local MYPUSE="wmsserver wmsclient" + local MYGPUSE="wfs wcs wmsclient wfsclient" + if (use gdal && use proj); then - my_conf="--with-ogr ${my_conf}"; - for i in ${MY_GPUSE}; do - my_conf="${my_conf} --with-${i}" + myconf="--with-ogr ${myconf}"; + for i in ${MYGPUSE}; do + myconf="${myconf} --with-${i}" done fi if (use proj); then - for i in ${MY_ProjUSE}; do - my_conf="${my_conf} --with-${i}" + for i in ${MYPUSE}; do + myconf="${myconf} --with-${i}" done if (use xml); then - my_conf="${my_conf} --with-sos" + myconf="${myconf} --with-sos" fi fi @@ -126,15 +126,15 @@ src_compile() { if [ ${np} -eq 2 ] ; then for i in 4 5; do uses_php${i} - my_conf="${my_conf} --with-php${i}=${PHPPREFIX}" + myconf="${myconf} --with-php${i}=${PHPPREFIX}" done else - my_conf="${my_conf} --with-php=${PHPPREFIX}/include/php" + myconf="${myconf} --with-php=${PHPPREFIX}/include/php" fi fi if (use perl || use python || use ruby || use tcl || use php) ; then - my_conf="${my_conf} --with-mapscript"; + myconf="${myconf} --with-mapscript"; fi cd "${S}" @@ -149,12 +149,13 @@ src_compile() { $(use_with pdf)\ $(use_with ming)\ $(use_with java)\ - ${my_conf}\ + ${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 -- 2.26.2