Migrated to Java generation 2

Package-Manager: portage-2.1.2.5

diff --git a/sci-geosciences/mapserver/ChangeLog b/sci-geosciences/mapserver/ChangeLog
index a485d293177d13edef624137c9cbe0e600135295..0369b2ebea591c9a240ae21283210adc0a3959b8 100644 (file)
--- a/sci-geosciences/mapserver/ChangeLog
+++ b/sci-geosciences/mapserver/ChangeLog
@@ -1,6 +1,12 @@
 # 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.2 2007/03/13 00:35:42 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.3 2007/04/28 18:32:29 fordfrog Exp $
+
+*mapserver-4.10.0-r1 (28 Apr 2007)
+
+  28 Apr 2007; Miroslav Šulc <fordfrog@gentoo.org>
+  +mapserver-4.10.0-r1.ebuild:
+  Migrated to Java generation 2
 
   13 Mar 2007; Danny van Dyk <kugelfang@gentoo.org> mapserver-4.10.0.ebuild:
   QA: which -> type -P

diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index fd569a687ec1624e6f8e5f2138c0abecc87dabc8..6a500c59e7e27a9096a9181793e5f95ce75d8b68 100644 (file)
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mapserver-4.10.0_php.patch 11446 RMD160 6369ff5813e0aac9334aeff7f748e9f97e3b0ae5 SHA1 6e298508335e1159ea0396e8672d7a2dbb9f0d57 SHA256 53d1018cee68c5c2f9fc1b66995d9f465c3035d9650b7045149f835f6f74b522
 MD5 d57f707a3d53e5e35c016ece397aaf9a files/mapserver-4.10.0_php.patch 11446
 RMD160 6369ff5813e0aac9334aeff7f748e9f97e3b0ae5 files/mapserver-4.10.0_php.patch 11446
@@ -14,14 +11,18 @@ MD5 f885111c787be0e68c17073ab14ae73b files/mapserver_tcl.patch 1499
 RMD160 ad98752a52c42446fa01ad1781b5d0f4daf36379 files/mapserver_tcl.patch 1499
 SHA256 d2a692e1c34fb8a509d7fc5755bc900dc3cfc886dab35e41298c69642452ba09 files/mapserver_tcl.patch 1499
 DIST mapserver-4.10.0.tar.gz 1782838 RMD160 425b1e856e98165cb7d4facf6a1ef393bf9c7f36 SHA1 ee2b7befc738ec79fab83bafe27b4e4efe11b1cb SHA256 c59b0b6b75443fbbced153c4b01f752e748cf73ce7c29125cfe8e223893b9d99
+EBUILD mapserver-4.10.0-r1.ebuild 7286 RMD160 db4723fb62c8404075d0766d884eeb4983cf6834 SHA1 f5ccc4aa4b5d9096eb56b75e98a254797a00f53d SHA256 c2b019482a308545840bf4565c764316023ac8b0d045086f0756e845450959eb
+MD5 b49a76b90f800a765e08e2fb46b07aa5 mapserver-4.10.0-r1.ebuild 7286
+RMD160 db4723fb62c8404075d0766d884eeb4983cf6834 mapserver-4.10.0-r1.ebuild 7286
+SHA256 c2b019482a308545840bf4565c764316023ac8b0d045086f0756e845450959eb mapserver-4.10.0-r1.ebuild 7286
 EBUILD mapserver-4.10.0.ebuild 7282 RMD160 9171b0312aeee3849679091e8c8093cf6506a666 SHA1 ac85d2735602c2551c56da3ff547eebefda65be0 SHA256 b491b9baee8023e6c46ba7ad97ad20686d1f4813bbe5117182b5ee1c9cf57b1c
 MD5 ca86b06d57ab19af05d66f258d7c9364 mapserver-4.10.0.ebuild 7282
 RMD160 9171b0312aeee3849679091e8c8093cf6506a666 mapserver-4.10.0.ebuild 7282
 SHA256 b491b9baee8023e6c46ba7ad97ad20686d1f4813bbe5117182b5ee1c9cf57b1c mapserver-4.10.0.ebuild 7282
-MISC ChangeLog 993 RMD160 d413287c4a80fde3c7c26aaaafb753735f6507e1 SHA1 55320d3b4ad1292f0e26d55e6cfdf7d7c2e73f9e SHA256 feb83d3cd9aea0660c214c594c5f8eddfd8f83325d06d4d7053512cbef0d2e3b
-MD5 88399b1d2b89cf94cc73c3d3a7023d40 ChangeLog 993
-RMD160 d413287c4a80fde3c7c26aaaafb753735f6507e1 ChangeLog 993
-SHA256 feb83d3cd9aea0660c214c594c5f8eddfd8f83325d06d4d7053512cbef0d2e3b ChangeLog 993
+MISC ChangeLog 1144 RMD160 2360543dc0dea01bc0ea54043c0a8a56dba404ac SHA1 a50bc73dcf63e1db0ddf66288e3172e1d7dc51eb SHA256 1e92d7c5b7d226b19d557cb0e01a3137f33933e0e1f3a85bc616c96c26071b3b
+MD5 f4ef26f9f84221835155d44dbad54116 ChangeLog 1144
+RMD160 2360543dc0dea01bc0ea54043c0a8a56dba404ac ChangeLog 1144
+SHA256 1e92d7c5b7d226b19d557cb0e01a3137f33933e0e1f3a85bc616c96c26071b3b ChangeLog 1144
 MISC metadata.xml 168 RMD160 156c29f9b364fbbaf0028d17736a01112e5d8cab SHA1 1221e73982792f6e23f10d95e878e86e8f62fe35 SHA256 2fc15316b226307080574c36b3761f27a23a642e89c60f02feabdc64049a188d
 MD5 398851fd6e5d040b232773963c208fc6 metadata.xml 168
 RMD160 156c29f9b364fbbaf0028d17736a01112e5d8cab metadata.xml 168
@@ -29,10 +30,6 @@ SHA256 2fc15316b226307080574c36b3761f27a23a642e89c60f02feabdc64049a188d metadata
 MD5 96bab69a87064ea9ebd9741d253a6752 files/digest-mapserver-4.10.0 253
 RMD160 fb5602354575339848cf6e93093408f894b25997 files/digest-mapserver-4.10.0 253
 SHA256 f7bd7ededad852faae52263743152717150cd449d90f27878469ae7a52b5fc1f files/digest-mapserver-4.10.0 253
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFF9fH+5mJXAu5GbtIRAp/DAJ4koZkBOOjKL/ffNo14M2d1dOX1BwCfc9Ro
-y4rZ+yQ8VYLyhgosuylauVY=
-=DKmP
------END PGP SIGNATURE-----
+MD5 96bab69a87064ea9ebd9741d253a6752 files/digest-mapserver-4.10.0-r1 253
+RMD160 fb5602354575339848cf6e93093408f894b25997 files/digest-mapserver-4.10.0-r1 253
+SHA256 f7bd7ededad852faae52263743152717150cd449d90f27878469ae7a52b5fc1f files/digest-mapserver-4.10.0-r1 253

diff --git a/sci-geosciences/mapserver/files/digest-mapserver-4.10.0-r1 b/sci-geosciences/mapserver/files/digest-mapserver-4.10.0-r1
new file mode 100644 (file)
index 0000000..508bf57
--- /dev/null
+++ b/sci-geosciences/mapserver/files/digest-mapserver-4.10.0-r1
@@ -0,0 +1,3 @@
+MD5 4668bbd017c20c251e962a5cd09c8f31 mapserver-4.10.0.tar.gz 1782838
+RMD160 425b1e856e98165cb7d4facf6a1ef393bf9c7f36 mapserver-4.10.0.tar.gz 1782838
+SHA256 c59b0b6b75443fbbced153c4b01f752e748cf73ce7c29125cfe8e223893b9d99 mapserver-4.10.0.tar.gz 1782838

diff --git a/sci-geosciences/mapserver/mapserver-4.10.0-r1.ebuild b/sci-geosciences/mapserver/mapserver-4.10.0-r1.ebuild
new file mode 100644 (file)
index 0000000..00d66d3
--- /dev/null
+++ b/sci-geosciences/mapserver/mapserver-4.10.0-r1.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2007 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-r1.ebuild,v 1.1 2007/04/28 18:32:29 fordfrog Exp $
+
+PHP_EXT_NAME="php_mapscript php_proj"
+RUBY_OPTIONAL="yes"
+
+inherit eutils autotools distutils depend.php depend.apache webapp ruby java-pkg-2
+
+DESCRIPTION="OpenSource development environment for constructing spatially enabled Internet-web applications."
+
+HOMEPAGE="http://mapserver.gis.umn.edu/"
+
+SRC_URI="http://cvs.gis.umn.edu/dist/${P}.tar.gz"
+
+LICENSE="MIT"
+
+KEYWORDS="~x86"
+
+#I must check for mygis use flag availability 
+#"mono"
+IUSE="xml pdf proj geos tiff gdal xpm postgis flash php python perl ruby tcl java"
+
+
+DEPEND="media-libs/libpng
+       media-libs/jpeg
+       >=media-libs/gd-2.0.12
+       media-libs/freetype
+       sys-libs/zlib
+       net-www/apache
+       geos? ( sci-libs/geos )
+       proj? ( sci-libs/proj net-misc/curl )
+       xml? ( dev-libs/libxml2 )
+       gdal? ( >sci-libs/gdal-1.2.6 )
+       postgis? ( dev-db/postgis )
+       tiff? ( media-libs/tiff sci-libs/libgeotiff )
+       xpm? ( x11-libs/libXpm )
+       flash? ( media-libs/ming )
+       pdf? ( media-libs/pdflib )
+       php? ( dev-lang/php dev-lang/swig )
+       ruby? ( dev-lang/ruby dev-lang/swig )
+       perl? ( dev-perl/DBI dev-lang/swig )
+       python? ( dev-lang/python dev-lang/swig )
+       java? ( =virtual/jdk-1.4* dev-java/java-config dev-lang/swig )
+       tcl? ( dev-lang/tcl dev-lang/swig )"
+
+WEBAPP_MANUAL_SLOT=yes
+
+want_apache
+
+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
+       if use php; then
+               # check how many versions of php was installed
+               has_php
+               np=0
+               if has_version '=dev-lang/php-5*'; then
+                       np="$(expr ${np} + 1)"
+               fi
+               if has_version '=dev-lang/php-4*' ; then
+                       np="$(expr ${np} + 1)"
+                       myphp4=true
+               fi
+               toD="$(if [ ${np} -gt 1 ]; then echo s; fi)"
+               einfo "Using ${np} PHP version${toD}"
+       fi
+}
+
+src_unpack() {
+       unpack "${A}"
+       cd "${S}"
+
+       if (use tcl); then
+               epatch "${FILESDIR}"/${PN}_tcl.patch
+       fi
+
+       if (use php); then
+               if [ ${np} -eq 2 ]; then
+                       mkdir ./mapscript/php4
+                       cp -r ./mapscript/php3 ./mapscript/php5 ||\
+                               die "Unable to copy php mapscript directory"
+                       epatch "${FILESDIR}"/${PF}_php.patch
+               fi
+       fi
+       if [ ! -z "${myphp4}" ]; then
+               epatch "${FILESDIR}"/${PN}_php4.patch
+       fi
+}
+
+src_compile() {
+       local step
+       step="Building"
+       cd "${S}"
+
+       AT_GNUCONF_UPDATE="no" eautoreconf
+
+       local myconf
+       myconf="--with-httpd=${APACHECTL/'ctl'/} --with-freetype"
+
+       if use geos; then
+               myconf="${myconf} --with-geos=$(type -P geos-config)"
+       fi
+
+       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
+               if (use xml); then
+                       myconf="${myconf} --with-sos"
+               fi
+       fi
+
+       if (use proj); then
+               myconf="${myconf} --with-wmsclient"
+       fi
+
+       if (use php); then
+               ewarn "You use ${np} version of php"
+               if [ ${np} -eq 2 ] ; then
+                       for i in 4 5; do
+                               uses_php${i}
+                               myconf="${myconf} --with-php${i}=${PHPPREFIX}"
+                       done
+               else
+                       myconf="${myconf} --with-php=${PHPPREFIX}/include/php"
+               fi
+       fi
+
+       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 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)\
+               ${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
+       fi
+
+       if use perl; then
+               cd_script perl ${step}
+               perl Makefile.PL || die "Unable to build perl mapscript"
+               emake || die "Unable to build perl mapscript"
+       fi
+
+       if use python; then
+               cd_script python ${step}
+               cp modern/* . || die "Unable to find necessairies files for python"
+               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 || die "Unable to configure tcl mapscript"
+               touch tclmodule.i
+               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
+
+}
+
+
+mapscript_install_examples() {
+       einfo "$1-mapscript examples could be found in the following directory"
+       einfo "/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
+               if [ 2 -eq "${np}" ] ; then
+                       for i in 4 5; do
+                               cd_script php$i ${step}
+                               uses_php$i
+                               EXT_DIR="$(${PHPCONFIG} --extension-dir)"
+                               dodir ${EXT_DIR}
+                               cp *.so ${D}/${EXT_DIR} || \
+                                       die "Unable to setup php5 mapscript support"
+                       done
+               else
+                       cd_script php3 ${step}
+                       EXT_DIR="$(${PHPCONFIG} --extension-dir)"
+                       dodir ${EXT_DIR}
+                       cp *.so ${D}/${EXT_DIR} || \
+                               die "Unable to setup php4 mapscript support"
+               fi
+               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}
+                   make DESTDIR="${D}" install || \
+                               die "Unable to setup perl mapscript support"
+                       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
+               make 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 "${S}"/shp2pdf || die "Unable to setup shp2pdf"
+       fi
+
+       dobin "${S}"/sortshp "${S}"/shp2img "${S}"/shptree "${S}"/shptreevis \
+               "${S}"/shptreetst "${S}"/legend "${S}"/scalebar "${S}"/tile4ms  || \
+               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 "${S}"/$i/* || die "Unable to add extra_dir to document tree"
+       done
+
+       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
+}