# HG changeset patch # User root@gentoo.local # Date 1234233418 -3600 # Node ID 19c1c51024372188490f956f2ae0fc9876df89da # Parent cce6d76ec6f163be49d337d4fa45d19905050ce2# Parent e262ea872d5468aed192e6a0e078690d9bb09979 merge from central diff -r cce6d76ec6f1 -r 19c1c5102437 www-apps/serendipity/serendipity-1.4.1.ebuild --- a/www-apps/serendipity/serendipity-1.4.1.ebuild Mon Feb 09 16:06:28 2009 +0100 +++ b/www-apps/serendipity/serendipity-1.4.1.ebuild Tue Feb 10 03:36:58 2009 +0100 @@ -14,51 +14,51 @@ DEPEND="" RDEPEND="virtual/httpd-cgi - imagemagick? ( media-gfx/imagemagick )" + imagemagick? ( media-gfx/imagemagick )" need_php_httpd S="${WORKDIR}/${PN}" pkg_setup() { - webapp_pkg_setup + webapp_pkg_setup - if ! PHPCHECKNODIE="yes" require_php_with_any_use mysql mysqli postgres sqlite \ - || ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external \ - || ! PHPCHECKNODIE="yes" require_php_with_use iconv pcre unicode xml zlib ; then - eerror - eerror "${PHP_PKG} needs to be reinstalled at least one of mysql, mysqli," - eerror "postgres or sqlite USE flags enabled for a database backend." - eerror "It must also have either gd or gd-external USE flag enabled." - eerror "It must also have all of iconv pcre unicode zlib USE flags enabled." - die "Reinstall ${PHP_PKG} with the above-stated USE flags." - fi + if ! PHPCHECKNODIE="yes" require_php_with_any_use mysql mysqli postgres sqlite \ + || ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external \ + || ! PHPCHECKNODIE="yes" require_php_with_use iconv pcre unicode xml zlib ; then + eerror + eerror "${PHP_PKG} needs to be reinstalled at least one of mysql, mysqli," + eerror "postgres or sqlite USE flags enabled for a database backend." + eerror "It must also have either gd or gd-external USE flag enabled." + eerror "It must also have all of iconv pcre unicode xml zlib USE flags enabled." + die "Reinstall ${PHP_PKG} with the above-stated USE flags." + fi } src_install() { - webapp_src_preinst + webapp_src_preinst - rm docs/INSTALL* - local docs="docs/*" - dodoc ${docs} - rm -rf docs/ + rm docs/INSTALL* + local docs="docs/*" + dodoc ${docs} + rm -rf docs/ - einfo "Installing application files." - cp -r . "${D}"${MY_HTDOCSDIR} - touch "${D}"${MY_HTDOCSDIR}/.htaccess - touch "${D}"${MY_HTDOCSDIR}/serendipity_config_local.inc.php + einfo "Installing application files." + cp -r . "${D}"${MY_HTDOCSDIR} + touch "${D}"${MY_HTDOCSDIR}/.htaccess + touch "${D}"${MY_HTDOCSDIR}/serendipity_config_local.inc.php - keepdir ${MY_HTDOCSDIR}/archives/ - webapp_configfile ${MY_HTDOCSDIR}/serendipity_config_local.inc.php - #webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt + keepdir ${MY_HTDOCSDIR}/archives/ + webapp_configfile ${MY_HTDOCSDIR}/serendipity_config_local.inc.php + #webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt - # archives, templates_c and uploads need to be writable to PHP - # .htaccess amd serendipity_config_local.inc.php need to be too - # plugins and templates need to be writable for spartacus support. - local SERVEROWNED="serendipity_config_local.inc.php .htaccess archives plugins templates templates_c uploads" - for SFILES in ${SERVEROWNED}; do - webapp_serverowned ${MY_HTDOCSDIR}/${SFILES} - done + # archives, templates_c and uploads need to be writable to PHP + # .htaccess amd serendipity_config_local.inc.php need to be too + # plugins and templates need to be writable for spartacus support. + local SERVEROWNED="serendipity_config_local.inc.php .htaccess archives plugins templates templates_c uploads" + for SFILES in ${SERVEROWNED}; do + webapp_serverowned ${MY_HTDOCSDIR}/${SFILES} + done - webapp_src_install + webapp_src_install }