# HG changeset patch
# User Dirk Olmes <dirk@xanthippe.ping.de>
# Date 1333422391 -7200
# Node ID 88703931ca437123cf67dcc1773d45977f25033c
# Parent  cee7e5f9f250cd24610568373e5dfff53d88deb5# Parent  331efd5e02ce9dce53753780fa10bc0980741e11
Automated merge with https://xanthippe.dyndns.org/hg/portage

diff -r cee7e5f9f250 -r 88703931ca43 www-apps/serendipity/Manifest
--- a/www-apps/serendipity/Manifest	Mon Apr 02 15:39:05 2012 +0200
+++ b/www-apps/serendipity/Manifest	Tue Apr 03 05:06:31 2012 +0200
@@ -4,9 +4,11 @@
 DIST serendipity-1.5.1.tar.gz 5337760 RMD160 5a14551f727230e0c134a0aff555c40a0856ece6 SHA1 4f7712835480b24b05de68fc6af2f7c7fb700377 SHA256 5e6dc05208e115c3068f91a91687aa91078f19a36e630104146e2fc8a0ffcbe9
 DIST serendipity-1.5.2.tar.gz 5337799 RMD160 9210d2982b28459929488a46b8cba70efd220cd1 SHA1 58ba1d14d0beb07d538968ddfa7f95419002251b SHA256 75544fd4104a2b1afbac6a80aa8ff0bb5bfc008dcdaa1e4531740d96e00465e5
 DIST serendipity-1.5.5.tar.gz 5338491 RMD160 883c746ef50267b96d5ba9669491d81d6107cb1a SHA1 70c0287630e213e9067be384917233498fe8b745 SHA256 b61bb613eba147a30b3be479a2cf8b218b2475d1f045127964e56fa285bdb657
+DIST serendipity-1.6.tar.gz 5357394 RMD160 486bee0ab9bfc7b215a0cbfa5d9298316c75994e SHA1 7d7fba385d379559bae724907fdb20d6d0426b9e SHA256 c2fb8ba8ccb0a509004151eeb57dcdef78c6e137dfe839fe635042cf36a49365
 EBUILD serendipity-1.3.1.ebuild 1976 RMD160 44845a102490482da1fe3ff4ee2950069b411d47 SHA1 be7d9821dac7feac30927f077dc4765dfd04a5fd SHA256 5a06f6ae838bacdcaa4cfe0ca4f90ff6a10081b6eb20df457cc47e9b0db06f38
 EBUILD serendipity-1.4.1.ebuild 2128 RMD160 fb4e4c13ce065160984fe8a0298448d5f55841da SHA1 5e7cc2e38a87fba7a40801f1ac7fb952ea1b9033 SHA256 227ab84ff8eef17579fe4352610f258ffede0ae18c362b42658c1638e6b64465
 EBUILD serendipity-1.4.ebuild 1976 RMD160 44845a102490482da1fe3ff4ee2950069b411d47 SHA1 be7d9821dac7feac30927f077dc4765dfd04a5fd SHA256 5a06f6ae838bacdcaa4cfe0ca4f90ff6a10081b6eb20df457cc47e9b0db06f38
 EBUILD serendipity-1.5.1.ebuild 2128 RMD160 fb4e4c13ce065160984fe8a0298448d5f55841da SHA1 5e7cc2e38a87fba7a40801f1ac7fb952ea1b9033 SHA256 227ab84ff8eef17579fe4352610f258ffede0ae18c362b42658c1638e6b64465
 EBUILD serendipity-1.5.2.ebuild 2128 RMD160 fb4e4c13ce065160984fe8a0298448d5f55841da SHA1 5e7cc2e38a87fba7a40801f1ac7fb952ea1b9033 SHA256 227ab84ff8eef17579fe4352610f258ffede0ae18c362b42658c1638e6b64465
 EBUILD serendipity-1.5.5.ebuild 2123 RMD160 c88742b8a8429794801e14b7f7ac5577c7711276 SHA1 a0e2a70e846a67344f7d0c5790b105bc7f50646f SHA256 8514b35a5e8e5c321f5e15306e1d12e4d2a7dd492dbfb8e11e86681017ffc998
+EBUILD serendipity-1.6.0.ebuild 2186 RMD160 82580b832ebaa5042f3305c8e2133611f99ad9bb SHA1 63ae04291638adfd508bce9fe6feceb692429b22 SHA256 5bbfdec818f7ebbd2f72444215a571b7663ad94ea3f60854f7a766e6ba3fc177
diff -r cee7e5f9f250 -r 88703931ca43 www-apps/serendipity/serendipity-1.6.0.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/www-apps/serendipity/serendipity-1.6.0.ebuild	Tue Apr 03 05:06:31 2012 +0200
@@ -0,0 +1,65 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit webapp depend.php versionator
+
+DESCRIPTION="PHP-powered, flexible blogging/CMS application."
+HOMEPAGE="http://www.s9y.org/"
+MY_P="${PN}-$(get_version_component_range 1-2)"
+SRC_URI="mirror://sourceforge/php-blog/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+IUSE="imagemagick"
+
+DEPEND=""
+RDEPEND="virtual/httpd-cgi
+    imagemagick? ( media-gfx/imagemagick )"
+
+need_php_httpd
+
+S="${WORKDIR}/${PN}"
+
+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 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
+
+    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
+
+    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
+
+    webapp_src_install
+}