idella4     15/05/05 08:52:36

  Modified:             metadata.xml ChangeLog
  Added:                mapserver-6.0.1-r3.ebuild
  Log:
  revbump; conversion -> distutils-r1 wrt bug #544750
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 
0xB8072B0D)

Revision  Changes    Path
1.7                  sci-geosciences/mapserver/metadata.xml

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/metadata.xml?rev=1.7&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/metadata.xml?rev=1.7&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/metadata.xml?r1=1.6&r2=1.7

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/metadata.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- metadata.xml        17 Nov 2011 11:33:21 -0000      1.6
+++ metadata.xml        5 May 2015 08:52:36 -0000       1.7
@@ -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>



1.55                 sci-geosciences/mapserver/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/ChangeLog?rev=1.55&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/ChangeLog?rev=1.55&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/ChangeLog?r1=1.54&r2=1.55

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ChangeLog   4 Feb 2015 19:58:49 -0000       1.54
+++ ChangeLog   5 May 2015 08:52:36 -0000       1.55
@@ -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 <[email protected]> +mapserver-6.0.1-r3.ebuild,
+  metadata.xml:
+  revbump; conversion -> distutils-r1 wrt bug #544750
 
 *mapserver-6.0.1-r2 (04 Feb 2015)
 



1.1                  sci-geosciences/mapserver/mapserver-6.0.1-r3.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.1-r3.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.1-r3.ebuild?rev=1.1&content-type=text/plain

Index: mapserver-6.0.1-r3.ebuild
===================================================================
# 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
}




Reply via email to