Adding the patch for mapserver-4.10.3 version to support compilation for both php4 and 5, resolving #191165. Use the same detection of dependencies in the 4.10.0 and 4.10.3 resolving #170556

Package-Manager: portage-2.1.2.12

5 files changed, 323 insertions, 17 deletions

diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 5120d140169f..88aaf7bc5cf5 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,7 +1,14 @@
+-----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
 SHA256 53d1018cee68c5c2f9fc1b66995d9f465c3035d9650b7045149f835f6f74b522 files/mapserver-4.10.0_php.patch 11446
+AUX mapserver-4.10.3_php.patch 8862 RMD160 f44a8a004e85d8466b633556a97f8224e6dbe456 SHA1 bc4ce1314070505db6389030769a75d435ee6ae9 SHA256 96531b38af4f4885022b5b98e0620798d4ef63243f20cc493122691969a0cb0f
+MD5 0176a13daa80a42dad656738057fd85f files/mapserver-4.10.3_php.patch 8862
+RMD160 f44a8a004e85d8466b633556a97f8224e6dbe456 files/mapserver-4.10.3_php.patch 8862
+SHA256 96531b38af4f4885022b5b98e0620798d4ef63243f20cc493122691969a0cb0f files/mapserver-4.10.3_php.patch 8862
 AUX mapserver_php4.patch 344 RMD160 c39884c956cff7286e1dbe5d5f1929441583250d SHA1 2bc2ce88cefee9738aba890e4f98c38c7689bd2f SHA256 02da3ebfd7bd1f93eb183093c00fc0b1e974c4485d427ecb8b03d6d93cc77304
 MD5 f1a0a07ee3dfa721dfbcc09f377f3f3b files/mapserver_php4.patch 344
 RMD160 c39884c956cff7286e1dbe5d5f1929441583250d files/mapserver_php4.patch 344
@@ -12,18 +19,18 @@ 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
 DIST mapserver-4.10.3.tar.gz 1777575 RMD160 98c27f42abc69a709e1f08d11110654fe7a6ac84 SHA1 d0ecba0878769e52c87341480f6d04aa6c0d6ec6 SHA256 f7acfec5cd73c9c8e4070f4732d2c52159fcdec1dad888ab73b45069490f085a
-EBUILD mapserver-4.10.0-r1.ebuild 7358 RMD160 e575b12c5b63fb5cf46debb5bed4c8ad45bae06a SHA1 71c4120cc8a4d1804a7abba15acdcba990c51eb4 SHA256 5c69959229054498212f37072406d71633a55a136901aad59cec13e285cb387e
-MD5 d4984e89348b1d0b981268fcb369b166 mapserver-4.10.0-r1.ebuild 7358
-RMD160 e575b12c5b63fb5cf46debb5bed4c8ad45bae06a mapserver-4.10.0-r1.ebuild 7358
-SHA256 5c69959229054498212f37072406d71633a55a136901aad59cec13e285cb387e mapserver-4.10.0-r1.ebuild 7358
-EBUILD mapserver-4.10.0.ebuild 7280 RMD160 15afc679398726fff8fce315fce7cabb602956b4 SHA1 7f32e20a3a0e633ae7419d5f92463962a7d903ba SHA256 6c7e65143531548b8ef5474ec58e8964b303de8af3b982a0bebdc4ee5cdb0990
-MD5 a048c330e7af0d787a79bb8331450be1 mapserver-4.10.0.ebuild 7280
-RMD160 15afc679398726fff8fce315fce7cabb602956b4 mapserver-4.10.0.ebuild 7280
-SHA256 6c7e65143531548b8ef5474ec58e8964b303de8af3b982a0bebdc4ee5cdb0990 mapserver-4.10.0.ebuild 7280
-EBUILD mapserver-4.10.3.ebuild 8227 RMD160 3e9a4dec1c635bfc76b9b204b2f71ddb34e77f90 SHA1 6b6d78960f7186746ac884fe20dd47ba619d0b69 SHA256 d02965efed056007a74a6ce2426d02a23f0213be13a39304b908c1921f5a2a4c
-MD5 4217cbfc52917cc2d573d24f9581c4e1 mapserver-4.10.3.ebuild 8227
-RMD160 3e9a4dec1c635bfc76b9b204b2f71ddb34e77f90 mapserver-4.10.3.ebuild 8227
-SHA256 d02965efed056007a74a6ce2426d02a23f0213be13a39304b908c1921f5a2a4c mapserver-4.10.3.ebuild 8227
+EBUILD mapserver-4.10.0-r1.ebuild 8185 RMD160 996be0e9782a0a356b91d07a90350846b69242cc SHA1 416967a637f672b5846f0585c0fca4bdc6fbe5da SHA256 6ef0a7fcad8d214055384b49454842ba6f96889829e3cc9a6bca090a7f893471
+MD5 d5a28732e54a7aad940a2eeb3068e85d mapserver-4.10.0-r1.ebuild 8185
+RMD160 996be0e9782a0a356b91d07a90350846b69242cc mapserver-4.10.0-r1.ebuild 8185
+SHA256 6ef0a7fcad8d214055384b49454842ba6f96889829e3cc9a6bca090a7f893471 mapserver-4.10.0-r1.ebuild 8185
+EBUILD mapserver-4.10.0.ebuild 8102 RMD160 85c89e9896f40580eb9cf60391962831e861b4c7 SHA1 693fa0366aa2b85537474c30559f08b11c81ed2b SHA256 0a0b1ff673c167b61b3fc49bdaefd91da28fc64ffedb2b6ecb8f3660647ac2f5
+MD5 078ed6d6f9187e27b6dea598a09fa2b8 mapserver-4.10.0.ebuild 8102
+RMD160 85c89e9896f40580eb9cf60391962831e861b4c7 mapserver-4.10.0.ebuild 8102
+SHA256 0a0b1ff673c167b61b3fc49bdaefd91da28fc64ffedb2b6ecb8f3660647ac2f5 mapserver-4.10.0.ebuild 8102
+EBUILD mapserver-4.10.3.ebuild 8244 RMD160 dce6a67a8e6fdd03892f9e4f2d45a37a0fd9d404 SHA1 875f12ac6af909cc83d0933e87de0ddffbdd46f9 SHA256 394f11b77b5c8999a4c451b8f2df2e37b664f7177c3568a3042b90fe754d5676
+MD5 3a01c50b42f7490441468478164abd0d mapserver-4.10.3.ebuild 8244
+RMD160 dce6a67a8e6fdd03892f9e4f2d45a37a0fd9d404 mapserver-4.10.3.ebuild 8244
+SHA256 394f11b77b5c8999a4c451b8f2df2e37b664f7177c3568a3042b90fe754d5676 mapserver-4.10.3.ebuild 8244
 MISC ChangeLog 1863 RMD160 410d7f868559caf7dc609ecb0f10ad59fbd74300 SHA1 17bac150070a8224fdc63d58e06abe7632520aaa SHA256 39fa4815ac30f4fb3bfa8b88e9f58ae1b4a8aead5b33406a9f7eac15bdb42a68
 MD5 b736265ad66f5524c0cd17780b74f51a ChangeLog 1863
 RMD160 410d7f868559caf7dc609ecb0f10ad59fbd74300 ChangeLog 1863
@@ -41,3 +48,10 @@ SHA256 f7bd7ededad852faae52263743152717150cd449d90f27878469ae7a52b5fc1f files/di
 MD5 b5571edf57cfa1df2e6e2c740ae2a31d files/digest-mapserver-4.10.3 253
 RMD160 c4a24eec23dd36f5b91753fe556c4d4fa7549070 files/digest-mapserver-4.10.3 253
 SHA256 4ec71c1617caf9086a5ff36e0521ad0c00f8bd4f99a4f1552a553c3053066bcd files/digest-mapserver-4.10.3 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFHK9pkDL3RqOXecAkRAmg5AJ9M54ljDvAyYx3rWpUj5L6HUenufwCfbvAy
+4DIEuZ2uevNyXw38UBDKwJA=
+=IJSU
+-----END PGP SIGNATURE-----
diff --git a/sci-geosciences/mapserver/files/mapserver-4.10.3_php.patch b/sci-geosciences/mapserver/files/mapserver-4.10.3_php.patch
new file mode 100644
index 000000000000..352ca5a02376
--- /dev/null
+++ b/sci-geosciences/mapserver/files/mapserver-4.10.3_php.patch
@@ -0,0 +1,242 @@
+--- ./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
index fb130bbb972f..391121848291 100644
--- a/sci-geosciences/mapserver/mapserver-4.10.0-r1.ebuild
+++ b/sci-geosciences/mapserver/mapserver-4.10.0-r1.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-4.10.0-r1.ebuild,v 1.5 2007/07/29 17:09:16 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-4.10.0-r1.ebuild,v 1.6 2007/09/06 01:17:33 djay Exp $
 
 PHP_EXT_NAME="php_mapscript php_proj"
 RUBY_OPTIONAL="yes"
@@ -43,7 +43,7 @@ DEPEND="media-libs/libpng
 	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
@@ -85,12 +85,36 @@ src_unpack() {
 			mkdir ./mapscript/php4
 			cp -r ./mapscript/php3 ./mapscript/php5 ||\
 				die "Unable to copy php mapscript directory"
-			epatch "${FILESDIR}"/${PF}_php.patch
+			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() {
diff --git a/sci-geosciences/mapserver/mapserver-4.10.0.ebuild b/sci-geosciences/mapserver/mapserver-4.10.0.ebuild
index 9813d63a704c..44cc7737dd59 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-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.7 2007/07/29 17:09:16 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-4.10.0.ebuild,v 1.8 2007/09/06 01:17:33 djay Exp $
 
 PHP_EXT_NAME="php_mapscript php_proj"
 RUBY_OPTIONAL="yes"
@@ -42,6 +42,7 @@ DEPEND="media-libs/libpng
 	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
 
@@ -68,6 +69,30 @@ pkg_setup(){
 		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() {
diff --git a/sci-geosciences/mapserver/mapserver-4.10.3.ebuild b/sci-geosciences/mapserver/mapserver-4.10.3.ebuild
index c55b328dc64f..9c16c68eaeef 100644
--- a/sci-geosciences/mapserver/mapserver-4.10.3.ebuild
+++ b/sci-geosciences/mapserver/mapserver-4.10.3.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-4.10.3.ebuild,v 1.1 2007/09/01 16:58:36 nerdboy Exp $
+# $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"
@@ -40,6 +40,7 @@ DEPEND="media-libs/libpng
 	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