version bump to fix php upgrade related issue (bug #324819), also bump to EAPI4

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

3 files changed, 58 insertions, 13 deletions

diff --git a/www-apps/phpwiki/ChangeLog b/www-apps/phpwiki/ChangeLog
index cfdd610a414c..b5ddd1a17691 100644
--- a/www-apps/phpwiki/ChangeLog
+++ b/www-apps/phpwiki/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/phpwiki
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/ChangeLog,v 1.24 2008/02/04 08:30:59 hollow Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/ChangeLog,v 1.25 2011/08/22 17:45:40 mabi Exp $
+
+*phpwiki-1.4.0_rc1 (22 Aug 2011)
+
+  22 Aug 2011; Matti Bickel <mabi@gentoo.org> +phpwiki-1.4.0_rc1.ebuild:
+  version bump to fix php upgrade related issue (bug #324819), also bump to
+  EAPI4
 
   04 Feb 2008; Benedikt Böhm <hollow@gentoo.org> phpwiki-1.3.14.ebuild:
   merge from webapps overlay wrt #208584
diff --git a/www-apps/phpwiki/Manifest b/www-apps/phpwiki/Manifest
index 066b17171a67..e33a607079a8 100644
--- a/www-apps/phpwiki/Manifest
+++ b/www-apps/phpwiki/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX postinstall-1.3-en.txt 248 RMD160 5c573060068506d1ee2596b2d88434dff2e0d1c1 SHA1 d396ee7be8e19de3f76e78c93c714d8f2114dd42 SHA256 9fdf6c2c25342d247107beb7069ad7c9ab79f2cd9cea2c5993fa517135b936fd
 DIST phpwiki-1.3.14.tar.bz2 2683347 RMD160 256978866f6a35150f73a6039ed07cf45b48c3a5 SHA1 83581a6b355b7bcb3d776a791e0cd5195ae16a85 SHA256 0db44e87a5ba95907603f959a5b536714215a2219ee220e6d1b727faa7271e72
+DIST phpwiki-1.4.0rc1.tar.bz2 3969814 RMD160 eecf5340492f4b0ec5981650c911d08d76470488 SHA1 bfcae26a002903446b7f7fb0770a1fba06deeab9 SHA256 1295885b5f333def74528cc87827262ddcede1b4d6e33423175ff4ec418a7e3f
 EBUILD phpwiki-1.3.14.ebuild 1479 RMD160 b3d0e455e5432ba0a2254098c3d25c2d1e81141e SHA1 ba8d796b753f46fc1d8b3a57c566f24cfdf2b696 SHA256 3478aaa3e89ce706c13951115be3059f1542d0a40e0a2b149a72b5bfe66d2430
-MISC ChangeLog 3976 RMD160 9446a7066e82e09a2a29cda073bd68f281de3dfc SHA1 3b176696646f81226dfcb9c7cde550bd005cf3ab SHA256 04f0facbb44945d17e489610b4f7299c48056a5617ae956c28f95dd0557b7602
+EBUILD phpwiki-1.4.0_rc1.ebuild 1286 RMD160 fdd6930912ead18ce799d59f0dd4704512b99f12 SHA1 6308e417ea37fed8c48ee7515a65c3e502ed63e2 SHA256 3ec0235b772a0aeb79d5673e17945bed27858abe82bb7d0d25c7ecb325385dab
+MISC ChangeLog 4166 RMD160 89606370d12f0e40aff9e617b0c3403dd2fcfea1 SHA1 e22a1dad91316cae45ed530ddb5a45355523de25 SHA256 ad8b773692fd6e7b8653d0788816dc39a18cd325d96551705dbcf391bf9b4d65
 MISC metadata.xml 280 RMD160 c449ad35e8af3f158d8f8305f8a02ff98a420970 SHA1 9be68166586fe2133dc7cc5347b8edddd34e4926 SHA256 fd37fa0f441b1b68ef8dc4bffbb0a51f0414aa7c370b48369453af5f4bff177a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
-
-iEYEARECAAYFAkemzUgACgkQmPFBzbX68WGC8ACfWxTzeSQbua5vb5ESGnx/v/+i
-/j4An1WsDtOmOMPYJoTsOq1/jDWWHrnc
-=7nNv
------END PGP SIGNATURE-----
diff --git a/www-apps/phpwiki/phpwiki-1.4.0_rc1.ebuild b/www-apps/phpwiki/phpwiki-1.4.0_rc1.ebuild
new file mode 100644
index 000000000000..2f19f43fab0b
--- /dev/null
+++ b/www-apps/phpwiki/phpwiki-1.4.0_rc1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpwiki/phpwiki-1.4.0_rc1.ebuild,v 1.1 2011/08/22 17:45:40 mabi Exp $
+
+EAPI=4
+
+inherit webapp
+
+MY_P=${P/_/}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="PhpWiki is a WikiWikiWeb clone in PHP"
+HOMEPAGE="http://phpwiki.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="msql mysql postgres"
+
+RDEPEND="
+	virtual/httpd-cgi
+	dev-lang/php[msql?,mysql?,postgres?]
+	|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )
+	|| ( dev-lang/php[cgi] dev-lang/php[apache2] )"
+
+src_prepare() {
+	rm -f Makefile LICENSE
+}
+
+src_install() {
+	webapp_src_preinst
+
+	cp -pPR * "${D}/${MY_HTDOCSDIR}"
+	rm -rf "${D}/${MY_HTDOCSDIR}"/{doc,schemas,README,INSTALL,TODO,UPGRADING}
+
+	dodoc README INSTALL TODO UPGRADING doc/* schemas/*
+
+	# Create config file from distribution default, and fix up invalid defaults
+	sed -ie "s:;DEBUG = 1:DEBUG = 0:" "${D}/${MY_HTDOCSDIR}"/config/config-dist.ini
+	cd "${D}"/${MY_HTDOCSDIR}/config
+	cp config-dist.ini config.ini
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-1.3-en.txt
+	webapp_configfile "${MY_HTDOCSDIR}"/config/config.ini
+
+	webapp_src_install
+}