Index: eclass/php5_2-sapi.eclass =================================================================== --- eclass/php5_2-sapi.eclass (revision 10969) +++ eclass/php5_2-sapi.eclass (working copy) @@ -233,10 +233,10 @@ } php5_2-sapi_install_ini() { - destdir=/usr/$(get_libdir)/php5 + destdir="$EPREFIX"/usr/$(get_libdir)/php5 # get the extension dir, if not already defined - [[ -z "${PHPEXTDIR}" ]] && PHPEXTDIR="`"${ED}/${destdir}/bin/php-config" --extension-dir`" + [[ -z "${PHPEXTDIR}" ]] && PHPEXTDIR="`"${D}/${destdir}/bin/php-config" --extension-dir`" # work out where we are installing the ini file php5_2-sapi_set_php_ini_dir @@ -389,8 +389,14 @@ # Fix configure scripts to correctly support Suhosin einfo "Running aclocal" aclocal --force || die "Unable to run aclocal successfully" + # Prefixed portage seems not to find libtoolize here, since it is glibtoolize + if use x86-macos; then + LIBTOOLIZE=glibtoolize + else + LIBTOOLIZE=libtoolize + fi einfo "Running libtoolize" - libtoolize --copy --force || die "Unable to run libtoolize successfully" + $LIBTOOLIZE --copy --force || die "Unable to run libtoolize successfully" # Rebuild configure to make sure it's up to date einfo "Rebuilding configure script" @@ -408,7 +414,7 @@ # Takes care of compiling php according to USE flags set by user (and those automagically # enabled via phpconfutils eclass if unavoidable). php5_2-sapi_src_compile() { - destdir=/usr/$(get_libdir)/php5 + destdir="$EPREFIX"/usr/$(get_libdir)/php5 php5_2-sapi_set_php_ini_dir @@ -420,10 +426,10 @@ # extension USE flag shared support? phpconfutils_extension_enable "bcmath" "bcmath" 1 - phpconfutils_extension_with "bz2" "bzip2" 1 + phpconfutils_extension_with "bz2" "bzip2" 1 "$EPREFIX/usr" phpconfutils_extension_enable "calendar" "calendar" 1 phpconfutils_extension_disable "ctype" "ctype" 0 - phpconfutils_extension_with "curl" "curl" 1 + phpconfutils_extension_with "curl" "curl" 1 "$EPREFIX/usr" phpconfutils_extension_with "curlwrappers" "curlwrappers" 0 phpconfutils_extension_enable "dbase" "dbase" 1 phpconfutils_extension_disable "dom" "xml" 0 @@ -433,32 +439,32 @@ phpconfutils_extension_disable "filter" "filter" 0 phpconfutils_extension_enable "ftp" "ftp" 1 phpconfutils_extension_with "gettext" "nls" 1 - phpconfutils_extension_with "gmp" "gmp" 1 + phpconfutils_extension_with "gmp" "gmp" 1 "$EPREFIX/usr" phpconfutils_extension_disable "hash" "hash" 0 phpconfutils_extension_without "iconv" "iconv" 0 phpconfutils_extension_disable "ipv6" "ipv6" 0 phpconfutils_extension_disable "json" "json" 0 - phpconfutils_extension_with "kerberos" "kerberos" 0 "/usr" + phpconfutils_extension_with "kerberos" "kerberos" 0 "$EPREFIX/usr" phpconfutils_extension_disable "libxml" "xml" 0 phpconfutils_extension_enable "mbstring" "unicode" 1 - phpconfutils_extension_with "mcrypt" "crypt" 1 + phpconfutils_extension_with "mcrypt" "crypt" 1 "$EPREFIX/usr" phpconfutils_extension_with "mhash" "mhash" 1 phpconfutils_extension_with "msql" "msql" 1 phpconfutils_extension_with "mssql" "mssql" 1 - phpconfutils_extension_with "ncurses" "ncurses" 1 + phpconfutils_extension_with "ncurses" "ncurses" 1 "$EPREFIX/usr" phpconfutils_extension_with "openssl" "ssl" 0 - phpconfutils_extension_with "openssl-dir" "ssl" 0 "/usr" + phpconfutils_extension_with "openssl-dir" "ssl" 0 "$EPREFIX/usr" phpconfutils_extension_enable "pcntl" "pcntl" 1 phpconfutils_extension_without "pcre-regex" "pcre" 0 phpconfutils_extension_disable "pdo" "pdo" 0 - phpconfutils_extension_with "pgsql" "postgres" 1 + phpconfutils_extension_with "pgsql" "postgres" 1 "$EPREFIX/usr" phpconfutils_extension_disable "posix" "posix" 0 - phpconfutils_extension_with "pspell" "spell" 1 - phpconfutils_extension_with "recode" "recode" 1 + phpconfutils_extension_with "pspell" "spell" 1 "$EPREFIX/usr" + phpconfutils_extension_with "recode" "recode" 1 "$EPREFIX/usr" phpconfutils_extension_disable "reflection" "reflection" 0 phpconfutils_extension_disable "simplexml" "simplexml" 0 phpconfutils_extension_enable "shmop" "sharedmem" 0 - phpconfutils_extension_with "snmp" "snmp" 1 + phpconfutils_extension_with "snmp" "snmp" 1 "$EPREFIX/usr" phpconfutils_extension_enable "soap" "soap" 1 phpconfutils_extension_enable "sockets" "sockets" 1 phpconfutils_extension_disable "spl" "spl" 0 @@ -467,16 +473,16 @@ phpconfutils_extension_enable "sysvmsg" "sysvipc" 1 phpconfutils_extension_enable "sysvsem" "sysvipc" 1 phpconfutils_extension_enable "sysvshm" "sysvipc" 1 - phpconfutils_extension_with "tidy" "tidy" 1 + phpconfutils_extension_with "tidy" "tidy" 1 "$EPREFIX/usr" phpconfutils_extension_disable "tokenizer" "tokenizer" 0 phpconfutils_extension_enable "wddx" "wddx" 1 phpconfutils_extension_disable "xml" "xml" 0 phpconfutils_extension_disable "xmlreader" "xmlreader" 0 phpconfutils_extension_disable "xmlwriter" "xmlwriter" 0 phpconfutils_extension_with "xmlrpc" "xmlrpc" 1 - phpconfutils_extension_with "xsl" "xsl" 1 + phpconfutils_extension_with "xsl" "xsl" 1 "$EPREFIX/usr" phpconfutils_extension_enable "zip" "zip" 1 - phpconfutils_extension_with "zlib" "zlib" 1 + phpconfutils_extension_with "zlib" "zlib" 1 "$EPREFIX/usr" phpconfutils_extension_enable "debug" "debug" 0 # DBA support @@ -491,27 +497,27 @@ # DBA drivers support phpconfutils_extension_with "cdb" "cdb" 0 - phpconfutils_extension_with "db4" "berkdb" 0 + phpconfutils_extension_with "db4" "berkdb" 0 "$EPREFIX/usr" phpconfutils_extension_with "flatfile" "flatfile" 0 - phpconfutils_extension_with "gdbm" "gdbm" 0 + phpconfutils_extension_with "gdbm" "gdbm" 0 "$EPREFIX/usr" phpconfutils_extension_with "inifile" "inifile" 0 - phpconfutils_extension_with "qdbm" "qdbm" 0 + phpconfutils_extension_with "qdbm" "qdbm" 0 "$EPREFIX/usr" # Support for the GD graphics library if use gd-external || phpconfutils_usecheck gd-external ; then - phpconfutils_extension_with "freetype-dir" "truetype" 0 "/usr" - phpconfutils_extension_with "t1lib" "truetype" 0 "/usr" + phpconfutils_extension_with "freetype-dir" "truetype" 0 "$EPREFIX/usr" + phpconfutils_extension_with "t1lib" "truetype" 0 "$EPREFIX/usr" phpconfutils_extension_enable "gd-jis-conv" "cjk" 0 - phpconfutils_extension_with "gd" "gd-external" 1 "/usr" + phpconfutils_extension_with "gd" "gd-external" 1 "$EPREFIX/usr" else - phpconfutils_extension_with "freetype-dir" "truetype" 0 "/usr" - phpconfutils_extension_with "t1lib" "truetype" 0 "/usr" + phpconfutils_extension_with "freetype-dir" "truetype" 0 "$EPREFIX/usr" + phpconfutils_extension_with "t1lib" "truetype" 0 "$EPREFIX/usr" phpconfutils_extension_enable "gd-jis-conv" "cjk" 0 - phpconfutils_extension_with "jpeg-dir" "gd" 0 "/usr" - phpconfutils_extension_with "png-dir" "gd" 0 "/usr" - phpconfutils_extension_with "xpm-dir" "xpm" 0 "/usr" + phpconfutils_extension_with "jpeg-dir" "gd" 0 "$EPREFIX/usr" + phpconfutils_extension_with "png-dir" "gd" 0 "$EPREFIX/usr" + phpconfutils_extension_with "xpm-dir" "xpm" 0 "$EPREFIX/usr" # enable gd last, so configure can pick up the previous settings - phpconfutils_extension_with "gd" "gd" 0 + phpconfutils_extension_with "gd" "gd" 0 "$EPREFIX/usr" fi # IMAP support @@ -530,7 +536,7 @@ if has_version "