Removed java gen 1 ebuilds, older versions, and quoted vars

(Portage version: 2.1.3.15)

10 files changed, 11 insertions, 1535 deletions

diff --git a/sci-geosciences/mapserver/ChangeLog b/sci-geosciences/mapserver/ChangeLog
index 864d58e7f553..89d72f28a75f 100644
--- 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.7 2007/09/21 08:21:49 djay Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.8 2007/10/24 06:58:02 wltjr Exp $
+
+  24 Oct 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -files/mapserver-4.10.0_php.patch, -files/mapserver-4.10.3_php.patch,
+  -mapserver-4.10.0.ebuild, -mapserver-4.10.0-r1.ebuild,
+  -mapserver-4.10.3.ebuild, mapserver-5.0.0.ebuild:
+  Removed java gen 1 ebuilds, older versions, and quoted vars
 
 *mapserver-5.0.0 (22 Nov 2007)
 
diff --git a/sci-geosciences/mapserver/files/digest-mapserver-4.10.0 b/sci-geosciences/mapserver/files/digest-mapserver-4.10.0
deleted file mode 100644
index 508bf57ddccd..000000000000
--- a/sci-geosciences/mapserver/files/digest-mapserver-4.10.0
+++ /dev/null
@@ -1,3 +0,0 @@
-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/files/digest-mapserver-4.10.0-r1 b/sci-geosciences/mapserver/files/digest-mapserver-4.10.0-r1
deleted file mode 100644
index 508bf57ddccd..000000000000
--- a/sci-geosciences/mapserver/files/digest-mapserver-4.10.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-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/files/digest-mapserver-4.10.3 b/sci-geosciences/mapserver/files/digest-mapserver-4.10.3
deleted file mode 100644
index 242f30feeca9..000000000000
--- a/sci-geosciences/mapserver/files/digest-mapserver-4.10.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b988cdfece7c2f02b0cd186b5090729b mapserver-4.10.3.tar.gz 1777575
-RMD160 98c27f42abc69a709e1f08d11110654fe7a6ac84 mapserver-4.10.3.tar.gz 1777575
-SHA256 f7acfec5cd73c9c8e4070f4732d2c52159fcdec1dad888ab73b45069490f085a mapserver-4.10.3.tar.gz 1777575
diff --git a/sci-geosciences/mapserver/files/mapserver-4.10.0_php.patch b/sci-geosciences/mapserver/files/mapserver-4.10.0_php.patch
deleted file mode 100644
index fdc851fade4d..000000000000
--- a/sci-geosciences/mapserver/files/mapserver-4.10.0_php.patch
+++ /dev/null
@@ -1,307 +0,0 @@
-diff -ru ./mapserver-4.10.0/Makefile.in ../mapserver-4.10.0/Makefile.in
---- ./mapserver-4.10.0/Makefile.in	2006-08-27 18:33:56.000000000 +0200
-+++ ../mapserver-4.10.0/Makefile.in	2006-10-07 14:29:07.000000000 +0200
-@@ -169,6 +169,8 @@
- #
- PHP_REGEX_OBJ=@PHP_REGEX_OBJ@
- PHP_REGEX_INC=@PHP_REGEX_INC@
-+PHP5_REGEX_OBJ=@PHP5_REGEX_OBJ@
-+PHP5_REGEX_INC=@PHP5_REGEX_INC@
- 
- #
- # Multithreading support.
-@@ -247,11 +249,14 @@
- .cpp.o:
- 	$(CXX) -c $(CXXFLAGS) $< -o $@
- 
--all: $(MAKE_GD) libmap.a $(EXTRA_DEFAULT) $(EXE_LIST) @MAKE_PHPMS@ 
-+all: $(MAKE_GD) libmap.a $(EXTRA_DEFAULT) $(EXE_LIST) @MAKE_PHPMS@ @MAKE_PHP5MS@
- 
- php3_mapscript:: $(LIBMAP_STATIC)
- 	cd mapscript/php3; $(MAKE); cd ../..
- 
-+php5_mapscript:: $(LIBMAP_STATIC)
-+	cd mapscript/php5; $(MAKE); cd ../..
-+
- maplexer.o: maplexer.c map.h mapfile.h
- 
- maplexer.c: maplexer.l
-@@ -334,6 +339,9 @@
- php3_mapscript_clean::
- 	cd mapscript/php3; $(MAKE) clean; cd ../..
- 
-+php5_mapscript_clean::
-+	cd mapscript/php3; $(MAKE) clean; cd ../..
-+
- install:
- 	@echo ""
- 	@echo "***** MapServer Installation *****"
-@@ -354,7 +362,7 @@
- 	(cd $(INST_BIN) && rm $(EXE_LIST) )
- 	(cd $(INST_LIB) && rm $(LIBMAP_SH_VER) $(LIBMAP_SHARED) )
- 
--clean: @MAKE_PHPMS_CLEAN@
-+clean: @MAKE_PHPMS_CLEAN@ @MAKE_PHP5MS_CLEAN@
- 	rm -f $(LIBMAP_STATIC) $(LIBMAP_SHARED) $(LIBMAP_SH_VER) *.o $(EXE_LIST)
- 
- exe-clean:
-Only in ../mapserver-4.10.0/: Makefile.in.orig
-diff -ru ./mapserver-4.10.0/configure.in ../mapserver-4.10.0/configure.in
---- ./mapserver-4.10.0/configure.in	2006-08-28 16:09:23.000000000 +0200
-+++ ../mapserver-4.10.0/configure.in	2006-10-07 14:34:44.000000000 +0200
-@@ -1866,21 +1866,10 @@
- dnl PHP/MapScript module options
- dnl ---------------------------------------------------------------------
- 
--AC_CHECKING(for PHP/MapScript module options)
--AC_ARG_WITH(php,
--[  --with-php=DIR          Specify directory where PHP4's include files are
--                          installed (or a pointer to the full source tree)
--                          Required in order to compile the PHP/MapScript 
--                          module.],,)
--
--AC_ARG_ENABLE(internal-ld-detect,
--[  --enable-perlv-ld-detect (applies to --with-php only) 
--                          Use perl -V output to figure the command to use to 
--                          link php_mapscript.so.  Try this only if the default
--                          internal macro didn't work.],,)
--
--if test -n "$with_php" -a -d "$with_php" ; then
--  AC_EXPAND_PATH($with_php, PHP_SRC_DIR)
-+dnl --------------------------------------------------------------------------
-+dnl  No php version specific
-+dnl --------------------------------------------------------------------------
-+if test -n "$with_php4" -o -n "$with_php5" ; then
-   dnl
-   dnl Checks for shared library linking.
-   dnl
-@@ -1889,7 +1878,6 @@
-   dnl (The perl-V macro was the default in 3.6 and before but this was
-   dnl  changed in 3.7 to use the internal AC_LD_SHARED macro by default)
-   dnl
--
-   if test "$enable_perlv_ld_detect" = "yes" ; then
-       AC_MSG_RESULT(Using perl -V macro to figure ld command to link php_mapscript.so)
- 
-@@ -1912,6 +1900,17 @@
-     PHP_CC="$CC $C_PIC"
-     PHP_LD="$PHP_LD_SHARED"
-   fi
-+fi
-+
-+AC_CHECKING(for PHP4/MapScript module options)
-+AC_ARG_WITH(php4,
-+[  --with-php4=DIR          Specify directory where PHP4's include files are
-+                          installed (or a pointer to the full source tree)
-+                          Required in order to compile the PHP/MapScript 
-+                          module.],,)
-+
-+if test -n "$with_php4" -a -d "$with_php4" ; then
-+  AC_EXPAND_PATH($with_php4,PHP_SRC_DIR)
- 
-   dnl
-   dnl Look for PHP3's config.h or PHP4's php_config.h.
-@@ -2001,6 +2000,109 @@
- AC_SUBST(MAKE_PHPMS, $MAKE_PHPMS)
- AC_SUBST(MAKE_PHPMS_CLEAN, $MAKE_PHPMS_CLEAN)
- 
-+AC_CHECKING(for PHP5/MapScript module options)
-+AC_ARG_WITH(php5,
-+[  --with-php5=DIR          Specify directory where PHP5's include files are
-+                          installed (or a pointer to the full source tree)
-+                          Required in order to compile the PHP/MapScript 
-+                          module.],,)
-+
-+if test -n "$with_php5" -a -d "$with_php5" ; then
-+  AC_EXPAND_PATH($with_php5, PHP5_SRC_DIR)
-+
-+  dnl
-+  dnl Look for PHP3's config.h or PHP4's php_config.h.
-+  dnl We'll need the config file to find info about the PHP configuration
-+  dnl
-+  AC_MSG_CHECKING([for location of config.h or php_config.h])
-+  dnl In PHP3, it was called config.h
-+  test -f "$PHP5_SRC_DIR/config.h" && PHP5_CONFIG_H="$PHP5_SRC_DIR/config.h"
-+
-+  dnl In PHP 4.0.1 to 4.0.3, it was php-4.0.x/php_config.h
-+  test -f "$PHP5_SRC_DIR/php_config.h" && PHP5_CONFIG_H="$PHP5_SRC_DIR/php_config.h"
-+
-+  dnl Starting with PHP 4.0.4, it's php-4.0.x/main/php_config.h
-+  test -f "$PHP5_SRC_DIR/main/php_config.h" && PHP5_CONFIG_H="$PHP5_SRC_DIR/main/php_config.h"
-+
-+  dnl If php was installed, then the headers are under $prefix/include/php/*
-+  test -f "$PHP5_SRC_DIR/include/php/main/php_config.h" && PHP5_SRC_DIR="$PHP5_SRC_DIR/include/php/" && PHP5_CONFIG_H="$PHP5_SRC_DIR/main/php_config.h"
-+
-+  if test -n "$PHP5_CONFIG_H" ; then
-+    AC_MSG_RESULT([$PHP5_CONFIG_H])
-+  else
-+    AC_MSG_ERROR([
-+!!! Could not find config.h or php_config.h in $PHP5_SRC_DIR.          !!!
-+!!! Has PHP5 been configured yet?                                      !!!])
-+  fi
-+
-+  dnl
-+  dnl Check which PHP5 version we're using.
-+  dnl
-+  AC_MSG_CHECKING([whether we have PHP5])
-+  if test -n "`grep 'ZEND_API' $PHP5_CONFIG_H`"  ; then
-+    PHP5_VERSION_FLAG="-DPHP4"
-+  else
-+    AC_MSG_ERROR([
-+!!! PHP MapScript now requires PHP 5.0.0 or more recent.              !!!
-+!!! Support for PHP3 has been dropped after MapServer version 3.5.    !!!])
-+  fi
-+  AC_MSG_RESULT([$PHP5_VERSION_FLAG])
-+
-+  dnl
-+  dnl Check if PHP was compiled with the bundled regex, and if so then
-+  dnl use the same version to compile MapServer.
-+  dnl
-+  AC_MSG_CHECKING([whether we should use PHP5's regex])
-+  if test -n "`grep 'define REGEX 1' $PHP5_CONFIG_H`"  ; then
-+    AC_MSG_RESULT(yes)
-+
-+    dnl We'll check for regex_extra.h - that might let use build
-+    dnl without the source using libphp_common.so
-+    test -f "$PHP5_SRC_DIR/regex/regex_extra.h" && PHP5_NO_SOURCE="1"
-+        if test -n "$PHP5_NO_SOURCE" ; then
-+          dnl Found regex_extra.h
-+          USE_PHP5_REGEX="-DUSE_PHP_REGEX"
-+          PHP5_REGEX_OBJ=php_regex.o
-+          AC_MSG_RESULT([        found regex_extra.h - building PHP MapScript with PHP5's bundled regex ])
-+        else
-+          AC_MSG_ERROR([
-+!!! PHP5 uses its bundled regex library but regex/regex_extra.h cannot be !!!
-+!!! found.                                                               !!!])
-+	fi
-+
-+  else
-+    AC_MSG_RESULT(no)
-+  fi
-+
-+  PHP5MS_MAKEFILE=mapscript/php5/Makefile
-+  MAKE_PHP5MS=php5_mapscript
-+  MAKE_PHP5MS_CLEAN=php_mapscript_clean
-+
-+  AC_SUBST(PHP5_VERSION_FLAG, $PHP5_VERSION_FLAG)
-+  AC_SUBST(PHP5_SRC_DIR, $PHP5_SRC_DIR)
-+  AC_SUBST(PHP5_REGEX_INC, $PHP5_REGEX_INC)
-+  AC_SUBST(PHP5_REGEX_OBJ, $PHP5_REGEX_OBJ)
-+  AC_SUBST(USE_PHP5_REGEX, $USE_PHP5_REGEX)
-+
-+  AC_MSG_RESULT([        PHP5/MapScript module configured.])
-+  AC_MSG_RESULT([        $PHP5_VERSION_FLAG, $PHP5_SRC_DIR])
-+elif test -n "$with_php5" -a "$with_php5" != "no" ; then
-+  AC_MSG_ERROR([Missing or invalid PHP5 source directory in --with-php5=DIR.])
-+else
-+  AC_MSG_RESULT([        PHP5/MapScript module not configured.])
-+fi
-+
-+AC_SUBST(MAKE_PHP5MS, $MAKE_PHP5MS)
-+AC_SUBST(MAKE_PHP5MS_CLEAN, $MAKE_PHP5MS_CLEAN)
-+AC_ARG_ENABLE(internal-ld-detect,
-+
-+[  --enable-perlv-ld-detect (applies to --with-php only) 
-+                          Use perl -V output to figure the command to use to 
-+                          link php_mapscript.so.  Try this only if the default
-+                          internal macro didn't work.],,)
-+
-+
-+
- dnl ---------------------------------------------------------------------
- dnl Shared library building.
- dnl
-@@ -2039,6 +2141,7 @@
- !!! See: http://mapserver.gis.umn.edu/cgi-bin/wiki.pl?PHPMapScriptCGI !!!])
- 
- 
-+
-   AC_MSG_CHECKING([for location of Apache headers using apxs])
-   if test -z "$MAKE_PHPMS" ; then
-     AC_MSG_ERROR([--with-apxs applies only if --with-php is used.])
-@@ -2159,5 +2262,5 @@
- AC_SUBST(ALL_STATIC_LIB, $ALL_STATIC_LIB)
- AC_SUBST(RPATHS, [$RPATHS])
- 
--AC_OUTPUT(Makefile $PHPMS_MAKEFILE mapscript/java/Makefile mapscript/csharp/Makefile)
-+AC_OUTPUT(Makefile $PHPMS_MAKEFILE $PHP5MS_MAKEFILE mapscript/java/Makefile mapscript/csharp/Makefile)
- 
-Only in ../mapserver-4.10.0/: configure.in.orig
-diff -ru ./mapserver-4.10.0/mapscript/php3/Makefile.in ../mapserver-4.10.0/mapscript/php3/Makefile.in
---- ./mapserver-4.10.0/mapscript/php3/Makefile.in	2006-08-26 18:29:54.000000000 +0200
-+++ ../mapserver-4.10.0/mapscript/php3/Makefile.in	2006-10-07 14:35:06.000000000 +0200
-@@ -77,7 +77,7 @@
- 
- CFLAGS112 = $(CFLAGS) $(MS_DEFINE) $(MS_INC) $(PHP_INC) $(PHP_REGEX_INC)
- 
--all: php_mapscript.so
-+all: php_mapscript.so php_proj.so
- 
- PHPMS_OBJS =  php_mapscript_util.o php_mapscript.o mapscript_i.o $(PHP_REGEX_OBJ)
- 
-diff -ru ./mapserver-4.10.0/mapscript/php5/Makefile.in ../mapserver-4.10.0/mapscript/php5/Makefile.in
---- ./mapserver-4.10.0/mapscript/php5/Makefile.in	2006-10-07 14:57:56.000000000 +0200
-+++ ../mapserver-4.10.0/mapscript/php5/Makefile.in	2006-10-07 14:35:20.000000000 +0200
-@@ -35,26 +35,26 @@
- 
- CC =     @PHP_CC@
- LD =     @PHP_LD@
--CFLAGS = @CFLAGS@ @USE_PHP_REGEX@ -DCOMPILE_DL=1 @PHP_VERSION_FLAG@
-+CFLAGS = @CFLAGS@ @USE_PHP5_REGEX@ -DCOMPILE_DL=1 @PHP5_VERSION_FLAG@
- RUNPATHS= @RPATHS@
- 
- #
- # Set PHP_SRC_DIR to point to the root of the PHP source tree
- #
--PHP_SRC_DIR = @PHP_SRC_DIR@
-+PHP_SRC_DIR = @PHP5_SRC_DIR@
- 
- PHP_INC = -I$(PHP_SRC_DIR) -I$(PHP_SRC_DIR)/dl -I$(PHP_SRC_DIR)/main \
- 	  -I$(PHP_SRC_DIR)/Zend -I$(PHP_SRC_DIR)/include \
- 	  -I$(PHP_SRC_DIR)/TSRM @APACHE_INC@
- 
- #
--# IMPORTANT NOTE ABOUT REGEX FOR PHP_MAPSCRIPT USERS:
-+# IMPORTANT NOTE ABOUT REGEX FOR PHP5_MAPSCRIPT USERS:
- #
--# In order to compile the PHP_MAPSCRIPT module, we have to make MapServer
--# uses the same version of the REGEX library that PHP was compiled with:
-+# In order to compile the PHP5_MAPSCRIPT module, we have to make MapServer
-+# uses the same version of the REGEX library that PHP5 was compiled with:
- #
--PHP_REGEX_OBJ=@PHP_REGEX_OBJ@
--PHP_REGEX_INC=@PHP_REGEX_INC@
-+PHP5_REGEX_OBJ=@PHP5_REGEX_OBJ@
-+PHP5_REGEX_INC=@PHP5_REGEX_INC@
- 
- 
- #
-@@ -75,20 +75,20 @@
- # The rest of the file should not have to be edited...
- #
- 
--CFLAGS112 = $(CFLAGS) $(MS_DEFINE) $(MS_INC) $(PHP_INC) $(PHP_REGEX_INC)
-+CFLAGS112 = $(CFLAGS) $(MS_DEFINE) $(MS_INC) $(PHP_INC) $(PHP5_REGEX_INC)
- 
--all: php_mapscript.so
-+all: php_mapscript.so php_proj.so
- 
--PHPMS_OBJS =  php_mapscript_util.o php_mapscript.o mapscript_i.o $(PHP_REGEX_OBJ)
-+PHP5MS_OBJS =  php_mapscript_util.o php_mapscript.o mapscript_i.o $(PHP5_REGEX_OBJ)
- 
--PHPPROJ_OBJS = php_mapscript_util.o php_proj.o $(PHP_REGEX_OBJ)
-+PHP5PROJ_OBJS = php_mapscript_util.o php_proj.o $(PHP5_REGEX_OBJ)
- 
- 
--php_mapscript.so: $(PHPMS_OBJS) ../../libmap.a
--	$(LD) -o $@ $(PHPMS_OBJS) $(MS_LIBS)
-+php_mapscript.so: $(PHP5MS_OBJS) ../../libmap.a
-+	$(LD) -o $@ $(PHP5MS_OBJS) $(MS_LIBS)
- 
--php_proj.so:  $(PHPPROJ_OBJS)
--	$(LD) -o $@ $(PHPPROJ_OBJS) $(MS_LIBS)
-+php_proj.so:  $(PHP5PROJ_OBJS)
-+	$(LD) -o $@ $(PHP5PROJ_OBJS) $(MS_LIBS)
- 
- %.o: %.c php_mapscript_util.h php_mapscript.h
- 	$(CC) $(CFLAGS112) -c -o $@ $<
diff --git a/sci-geosciences/mapserver/files/mapserver-4.10.3_php.patch b/sci-geosciences/mapserver/files/mapserver-4.10.3_php.patch
deleted file mode 100644
index 352ca5a02376..000000000000
--- a/sci-geosciences/mapserver/files/mapserver-4.10.3_php.patch
+++ /dev/null
@@ -1,242 +0,0 @@
---- ./configure.in      2007-08-21 22:24:22.000000000 +0200
-+++ ./configure.in      2007-11-02 22:04:14.000000000 +0100
-@@ -1864,14 +1864,20 @@
- [  --enable-coverage       Enable coverage testing],
- [CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"])
- 
--
- dnl ---------------------------------------------------------------------
- dnl PHP/MapScript module options
- dnl ---------------------------------------------------------------------
- 
--AC_CHECKING(for PHP/MapScript module options)
--AC_ARG_WITH(php,
--[  --with-php=DIR          Specify directory where PHP4's include files are
-+AC_CHECKING(for PHP4/MapScript module options)
-+AC_ARG_WITH(php4,
-+[  --with-php4=DIR          Specify directory where PHP4's include files are
-+                          installed (or a pointer to the full source tree)
-+                          Required in order to compile the PHP/MapScript 
-+                          module.],,)
-+
-+AC_CHECKING(for PHP5/MapScript module options)
-+AC_ARG_WITH(php5,
-+[  --with-php5=DIR          Specify directory where PHP5's include files are
-                           installed (or a pointer to the full source tree)
-                           Required in order to compile the PHP/MapScript 
-                           module.],,)
-@@ -1882,8 +1888,11 @@
-                           link php_mapscript.so.  Try this only if the default
-                           internal macro didn't work.],,)
- 
--if test -n "$with_php" -a -d "$with_php" ; then
--  AC_EXPAND_PATH($with_php, PHP_SRC_DIR)
-+dnl --------------------------------------------------------------------------
-+dnl  No php version specific
-+dnl --------------------------------------------------------------------------
-+
-+if test -n "$with_php4" -o -n "$with_php5" ; then
-   dnl
-   dnl Checks for shared library linking.
-   dnl
-@@ -1916,6 +1925,102 @@
-     PHP_LD="$PHP_LD_SHARED"
-   fi
- 
-+fi
-+
-+if test -n "$with_php5" -a -d "$with_php5" ; then
-+  AC_EXPAND_PATH($with_php5, PHP5_SRC_DIR)
-+
-+  dnl
-+  dnl Look for PHP4's config.h or PHP5's php_config.h.
-+  dnl We'll need the config file to find info about the PHP configuration
-+  dnl
-+  AC_MSG_CHECKING([for location of config.h or php_config.h])
-+  dnl In PHP3, it was called config.h
-+  test -f "$PHP5_SRC_DIR/config.h" && PHP5_CONFIG_H="$PHP5_SRC_DIR/config.h"
-+
-+  dnl In PHP 4.0.1 to 4.0.3, it was php-4.0.x/php_config.h
-+  test -f "$PHP5_SRC_DIR/php_config.h" && PHP5_CONFIG_H="$PHP5_SRC_DIR/php_config.h"
-+
-+  dnl Starting with PHP 4.0.4, it's php-4.0.x/main/php_config.h
-+  test -f "$PHP5_SRC_DIR/main/php_config.h" && PHP5_CONFIG_H="$PHP5_SRC_DIR/main/php_config.h"
-+
-+  dnl If php was installed, then the headers are under $prefix/include/php/*
-+  test -f "$PHP5_SRC_DIR/include/php/main/php_config.h" && PHP5_SRC_DIR="$PHP5_SRC_DIR/include/php/" && PHP5_CONFIG_H="$PHP5_SRC_DIR/main/php_config.h"
-+
-+  if test -n "$PHP5_CONFIG_H" ; then
-+    AC_MSG_RESULT([$PHP5_CONFIG_H])
-+  else
-+    AC_MSG_ERROR([
-+!!! Could not find config.h or php_config.h in $PHP5_SRC_DIR.          !!!
-+!!! Has PHP5 been configured yet?                                      !!!])
-+  fi
-+
-+  dnl
-+  dnl Check which PHP5 version we're using.
-+  dnl Default is PHP3, and if ZEND_API is set then we assume that we have PHP4.
-+  dnl
-+  AC_MSG_CHECKING([whether we have PHP3 or PHP4])
-+  if test -n "`grep 'ZEND_API' $PHP5_CONFIG_H`"  ; then
-+    PHP5_VERSION_FLAG="-DPHP4"
-+  else
-+    PHP5_VERSION_FLAG="-DPHP3"
-+    AC_MSG_ERROR([
-+!!! PHP MapScript now requires PHP 4.1.2 or more recent.              !!!
-+!!! Support for PHP3 has been dropped after MapServer version 3.5.    !!!])
-+  fi
-+  AC_MSG_RESULT([$PHP5_VERSION_FLAG])
-+
-+  dnl
-+  dnl Check if PHP was compiled with the bundled regex, and if so then
-+  dnl use the same version to compile MapServer.
-+  dnl
-+  AC_MSG_CHECKING([whether we should use PHP5's regex])
-+  if test -n "`grep 'define REGEX 1' $PHP5_CONFIG_H`"  ; then
-+    AC_MSG_RESULT(yes)
-+
-+    dnl We'll check for regex_extra.h - that might let use build
-+    dnl without the source using libphp_common.so
-+    test -f "$PHP5_SRC_DIR/regex/regex_extra.h" && PHP5_NO_SOURCE="1"
-+        if test -n "$PHP5_NO_SOURCE" ; then
-+          dnl Found regex_extra.h
-+          USE_PHP5_REGEX="-DUSE_PHP_REGEX"
-+          PHP5_REGEX_OBJ=php_regex.o
-+          AC_MSG_RESULT([        found regex_extra.h - building PHP5 MapScript with PHP's bundled regex ])
-+        else
-+          AC_MSG_ERROR([
-+!!! PHP uses its bundled regex library but regex/regex_extra.h cannot be !!!
-+!!! found.                                                               !!!])
-+       fi
-+
-+  else
-+    AC_MSG_RESULT(no)
-+  fi
-+
-+  PHP5MS_MAKEFILE=mapscript/php5/Makefile
-+  MAKE_PHP5MS=php5_mapscript
-+  MAKE_PHP5MS_CLEAN=php_mapscript_clean
-+
-+  AC_SUBST(PHP5_VERSION_FLAG, $PHP5_VERSION_FLAG)
-+  AC_SUBST(PHP5_SRC_DIR, $PHP5_SRC_DIR)
-+  AC_SUBST(PHP_CC, $PHP_CC)
-+  AC_SUBST(PHP_LD, $PHP_LD)
-+  AC_SUBST(PHP5_REGEX_INC, $PHP5_REGEX_INC)
-+  AC_SUBST(PHP5_REGEX_OBJ, $PHP5_REGEX_OBJ)
-+  AC_SUBST(USE_PHP5_REGEX, $USE_PHP5_REGEX)
-+
-+  AC_MSG_RESULT([        PHP5/MapScript module configured.])
-+elif test -n "$with_php5" -a "$with_php5" != "no" ; then
-+  AC_MSG_ERROR([Missing or invalid PHP5 source directory in --with-php5=DIR.])
-+else
-+  AC_MSG_RESULT([        PHP5/MapScript module not configured.])
-+fi
-+
-+AC_SUBST(MAKE_PHP5MS, $MAKE_PHP5MS)
-+AC_SUBST(MAKE_PHP5MS_CLEAN, $MAKE_PHP5MS_CLEAN)
-+
-+if test -n "$with_php4" -a -d "$with_php4" ; then
-+  AC_EXPAND_PATH($with_php4, PHP_SRC_DIR)
-+
-   dnl
-   dnl Look for PHP3's config.h or PHP4's php_config.h.
-   dnl We'll need the config file to find info about the PHP configuration
-@@ -2162,6 +2267,6 @@
- AC_SUBST(ALL_STATIC_LIB, $ALL_STATIC_LIB)
- AC_SUBST(RPATHS, [$RPATHS])
- 
--AC_OUTPUT(Makefile $PHPMS_MAKEFILE mapscript/java/Makefile mapscript/csharp/Makefile)
-+AC_OUTPUT(Makefile $PHPMS_MAKEFILE $PHP5MS_MAKEFILE mapscript/java/Makefile mapscript/csharp/Makefile)
- 
- 
---- ./mapscript/php3/Makefile.in	2007-08-21 22:24:22.000000000 +0200
-+++ ./mapscript/php3/Makefile.in	2007-11-02 21:15:36.000000000 +0100
-@@ -77,7 +77,7 @@
- 
- CFLAGS112 = $(CFLAGS) $(MS_DEFINE) $(MS_INC) $(PHP_INC) $(PHP_REGEX_INC)
- 
--all: php_mapscript.so
-+all: php_mapscript.so php_proj.so
- 
- PHPMS_OBJS =  php_mapscript_util.o php_mapscript.o mapscript_i.o $(PHP_REGEX_OBJ)
- 
---- ./mapscript/php5/Makefile.in	2007-11-02 20:34:05.000000000 +0100
-+++ ./mapscript/php5/Makefile.in	2007-11-02 21:15:38.000000000 +0100
-@@ -35,13 +35,13 @@
- 
- CC =     @PHP_CC@
- LD =     @PHP_LD@
--CFLAGS = @CFLAGS@ @USE_PHP_REGEX@ -DCOMPILE_DL=1 @PHP_VERSION_FLAG@
-+CFLAGS = @CFLAGS@ @USE_PHP5_REGEX@ -DCOMPILE_DL=1 @PHP5_VERSION_FLAG@
- RUNPATHS= @RPATHS@
- 
- #
- # Set PHP_SRC_DIR to point to the root of the PHP source tree
- #
--PHP_SRC_DIR = @PHP_SRC_DIR@
-+PHP_SRC_DIR = @PHP5_SRC_DIR@
- 
- PHP_INC = -I$(PHP_SRC_DIR) -I$(PHP_SRC_DIR)/dl -I$(PHP_SRC_DIR)/main \
- 	  -I$(PHP_SRC_DIR)/Zend -I$(PHP_SRC_DIR)/include \
-@@ -53,8 +53,8 @@
- # In order to compile the PHP_MAPSCRIPT module, we have to make MapServer
- # uses the same version of the REGEX library that PHP was compiled with:
- #
--PHP_REGEX_OBJ=@PHP_REGEX_OBJ@
--PHP_REGEX_INC=@PHP_REGEX_INC@
-+PHP_REGEX_OBJ=@PHP5_REGEX_OBJ@
-+PHP_REGEX_INC=@PHP5_REGEX_INC@
- 
- 
- #
-@@ -75,20 +75,20 @@
- # The rest of the file should not have to be edited...
- #
- 
--CFLAGS112 = $(CFLAGS) $(MS_DEFINE) $(MS_INC) $(PHP_INC) $(PHP_REGEX_INC)
-+CFLAGS112 = $(CFLAGS) $(MS_DEFINE) $(MS_INC) $(PHP_INC) $(PHP5_REGEX_INC)
- 
- all: php_mapscript.so
- 
--PHPMS_OBJS =  php_mapscript_util.o php_mapscript.o mapscript_i.o $(PHP_REGEX_OBJ)
-+PHP5MS_OBJS =  php_mapscript_util.o php_mapscript.o mapscript_i.o $(PHP5_REGEX_OBJ)
- 
--PHPPROJ_OBJS = php_mapscript_util.o php_proj.o $(PHP_REGEX_OBJ)
-+PHP5PROJ_OBJS = php_mapscript_util.o php_proj.o $(PHP5_REGEX_OBJ)
- 
- 
--php_mapscript.so: $(PHPMS_OBJS) ../../libmapserver.a
--	$(LD) -o $@ $(PHPMS_OBJS) $(MS_LIBS)
-+php_mapscript.so: $(PHP5MS_OBJS) ../../libmapserver.a
-+	$(LD) -o $@ $(PHP5MS_OBJS) $(MS_LIBS)
- 
--php_proj.so:  $(PHPPROJ_OBJS)
--	$(LD) -o $@ $(PHPPROJ_OBJS) $(MS_LIBS)
-+php_proj.so:  $(PHP5PROJ_OBJS)
-+	$(LD) -o $@ $(PHP5PROJ_OBJS) $(MS_LIBS)
- 
- %.o: %.c php_mapscript_util.h php_mapscript.h
- 	$(CC) $(CFLAGS112) -c -o $@ $<
-
---- ./Makefile.in	2007-11-02 21:58:58.000000000 +0100
-+++ ./Makefile.in	2007-11-02 22:54:14.000000000 +0100
-@@ -241,7 +241,7 @@
- #
- # --- You shouldn't have to edit anything else. ---
- #
--all: $(MAKE_GD) $(LIBMAP_STATIC) $(EXTRA_DEFAULT) $(EXE_LIST) @MAKE_PHPMS@ 
-+all: $(MAKE_GD) $(LIBMAP_STATIC) $(EXTRA_DEFAULT) $(EXE_LIST) @MAKE_PHPMS@ @MAKE_PHP5MS@
- 
- #
- # Non-gnumake's don't seem to use this pattern rule, 
-@@ -257,6 +257,9 @@
- php3_mapscript:: $(LIBMAP_STATIC)
- 	cd mapscript/php3; $(MAKE); cd ../..
- 
-+php5_mapscript:: $(LIBMAP_STATIC)
-+	cd mapscript/php5; $(MAKE); cd ../..
-+
- maplexer.o: maplexer.c map.h mapfile.h
- 
- maplexer.c: maplexer.l
diff --git a/sci-geosciences/mapserver/mapserver-4.10.0-r1.ebuild b/sci-geosciences/mapserver/mapserver-4.10.0-r1.ebuild
deleted file mode 100644
index 96e932cc95a3..000000000000
--- a/sci-geosciences/mapserver/mapserver-4.10.0-r1.ebuild
+++ /dev/null
@@ -1,324 +0,0 @@
-# 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.7 2007/09/16 10:03:27 vapier Exp $
-
-PHP_EXT_NAME="php_mapscript php_proj"
-RUBY_OPTIONAL="yes"
-
-inherit eutils autotools distutils depend.php depend.apache webapp ruby java-pkg-opt-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"
-
-# compilation fails with jdk > 1.4 on some native part probably
-DEPEND="media-libs/libpng
-	media-libs/jpeg
-	>=media-libs/gd-2.0.12
-	media-libs/freetype
-	sys-libs/zlib
-	www-servers/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-lang/swig )
-	tcl? ( dev-lang/tcl dev-lang/swig )"
-RDEPEND="${DEPEND}"
-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
-	java-pkg-opt-2_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}/${PN}"-${PV}_php.patch
-		fi
-	fi
-	if [ ! -z "${myphp4}" ]; then
-		epatch "${FILESDIR}"/${PN}_php4.patch
-	fi
-
-	elog "Checking for gd compiled with truetype support..."
-	if built_with_use media-libs/gd truetype; then
-		elog "Found truetype support; continuing..."
-	else
-		ewarn "media-libs/gd must be compiled with truetype support,"
-		ewarn "and you probably want jpeg and png support also."
-		elog "Please re-emerge gd with the truetype USE flag."
-		die "gd not merged with truetype USE flag"
-	fi
-
-	if use gdal && use tiff; then
-		ewarn "The MapServer tiff support is not compatible"
-		ewarn "with gdal tiff support."
-		elog "Please disable tiff support for mapserver."
-		die "mapserver has tiff USE flag enabled"
-	fi
-
-	if use java && ! use threads; then
-		ewarn "The MapServer Java support needs threads."
-		elog "Please enable thread support for mapserver."
-		die "mapserver has threads USE flag disabled"
-	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
-}
diff --git a/sci-geosciences/mapserver/mapserver-4.10.0.ebuild b/sci-geosciences/mapserver/mapserver-4.10.0.ebuild
deleted file mode 100644
index ea47fff642f2..000000000000
--- a/sci-geosciences/mapserver/mapserver-4.10.0.ebuild
+++ /dev/null
@@ -1,323 +0,0 @@
-# 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.ebuild,v 1.9 2007/09/16 10:03:27 vapier Exp $
-
-PHP_EXT_NAME="php_mapscript php_proj"
-RUBY_OPTIONAL="yes"
-
-inherit eutils autotools distutils depend.php depend.apache webapp ruby java-pkg
-
-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
-	www-servers/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 )"
-RDEPEND="${DEPEND}"
-
-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
-
-	elog "Checking for gd compiled with truetype support..."
-	if built_with_use media-libs/gd truetype; then
-		elog "Found truetype support; continuing..."
-	else
-		ewarn "media-libs/gd must be compiled with truetype support,"
-		ewarn "and you probably want jpeg and png support also."
-		elog "Please re-emerge gd with the truetype USE flag."
-		die "gd not merged with truetype USE flag"
-	fi
-
-	if use gdal && use tiff; then
-		ewarn "The MapServer tiff support is not compatible"
-		ewarn "with gdal tiff support."
-		elog "Please disable tiff support for mapserver."
-		die "mapserver has tiff USE flag enabled"
-	fi
-
-	if use java && ! use threads; then
-		ewarn "The MapServer Java support needs threads."
-		elog "Please enable thread support for mapserver."
-		die "mapserver has threads USE flag disabled"
-	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
-}
diff --git a/sci-geosciences/mapserver/mapserver-4.10.3.ebuild b/sci-geosciences/mapserver/mapserver-4.10.3.ebuild
deleted file mode 100644
index 9c16c68eaeef..000000000000
--- a/sci-geosciences/mapserver/mapserver-4.10.3.ebuild
+++ /dev/null
@@ -1,325 +0,0 @@
-# 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.3.ebuild,v 1.2 2007/09/06 01:17:33 djay Exp $
-
-PHP_EXT_NAME="php_mapscript php_proj"
-RUBY_OPTIONAL="yes"
-
-inherit eutils autotools distutils depend.php depend.apache webapp ruby java-pkg-opt-2
-
-DESCRIPTION="OpenSource development environment for constructing spatially enabled Internet-web applications."
-HOMEPAGE="http://mapserver.gis.umn.edu/"
-SRC_URI="http://download.osgeo.org/mapserver/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~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 threads java"
-
-# compilation fails with jdk > 1.4 on some native part probably
-DEPEND="media-libs/libpng
-	media-libs/jpeg
-	>=media-libs/gd-2.0.12
-	media-libs/freetype
-	sys-libs/zlib
-	www-servers/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-lang/swig )
-	tcl? ( dev-lang/tcl dev-lang/swig )"
-RDEPEND="${DEPEND}"
-
-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
-	java-pkg-opt-2_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
-
-	elog "Checking for gd compiled with truetype support..."
-	if built_with_use media-libs/gd truetype; then
-		elog "Found truetype support; continuing..."
-	else
-		ewarn "media-libs/gd must be compiled with truetype support,"
-		ewarn "and you probably want jpeg and png support also."
-		elog "Please re-emerge gd with the truetype USE flag."
-		die "gd not merged with truetype USE flag"
-	fi
-
-	if use gdal && use tiff; then
-		ewarn "The MapServer tiff support is not compatible"
-		ewarn "with gdal tiff support."
-		elog "Please disable tiff support for mapserver."
-		die "mapserver has tiff USE flag enabled"
-	fi
-
-	if use java && ! use threads; then
-		ewarn "The MapServer Java support needs threads."
-		elog "Please enable thread support for mapserver."
-		die "mapserver has threads USE flag disabled"
-	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)\
-		$(use_with threads)\
-		${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}
-		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
-		sed -i -e "s:lmap:lmapserver:g" ${S}/mapscript/java/Makefile \
-		     || die "sed failed"
-		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
-}
diff --git a/sci-geosciences/mapserver/mapserver-5.0.0.ebuild b/sci-geosciences/mapserver/mapserver-5.0.0.ebuild
index ec33b9c81efe..9643f3dec7a8 100644
--- a/sci-geosciences/mapserver/mapserver-5.0.0.ebuild
+++ b/sci-geosciences/mapserver/mapserver-5.0.0.ebuild
@@ -1,6 +1,6 @@
 # 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-5.0.0.ebuild,v 1.3 2007/09/28 07:35:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-5.0.0.ebuild,v 1.4 2007/10/24 06:58:02 wltjr Exp $
 
 PHP_EXT_NAME="php_mapscript php_proj"
 RUBY_OPTIONAL="yes"
@@ -240,7 +240,7 @@ src_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 \
+			"${S}"/mapscript/java/tests/threadtest/MapThread.java \
 			|| die "fixing of tests failed"
 		emake threadtests || die "Threadtests failed"
 	fi
@@ -269,14 +269,14 @@ src_install() {
 				uses_php$i
 				EXT_DIR="$(${PHPCONFIG} --extension-dir)"
 				dodir ${EXT_DIR}
-				cp *.so ${D}/${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} || \
+			cp *.so "${D}"/${EXT_DIR} || \
 				die "Unable to setup php4 mapscript support"
 		fi
 		mapscript_install_examples php