Update post install instructions (fixes bugs #405573 and #405575), update php dependencies (fixes bug #401335), and remove depend.php eclass usage.

(Portage version: 2.2.0_alpha87/cvs/Linux x86_64)

3 files changed, 101 insertions, 16 deletions

diff --git a/www-apps/mediawiki/ChangeLog b/www-apps/mediawiki/ChangeLog
index 477fa949bc92..c42509693292 100644
--- a/www-apps/mediawiki/ChangeLog
+++ b/www-apps/mediawiki/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/mediawiki
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.176 2012/02/01 17:19:09 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.177 2012/02/26 04:10:34 radhermit Exp $
+
+  26 Feb 2012; Tim Harder <radhermit@gentoo.org> mediawiki-1.18.1.ebuild,
+  +files/postinstall-1.18-en.txt:
+  Update post install instructions (fixes bugs #405573 and #405575), update php
+  dependencies (fixes bug #401335), and remove depend.php eclass usage.
 
   01 Feb 2012; Brent Baude <ranger@gentoo.org> mediawiki-1.18.1.ebuild:
   Marking mediawiki-1.18.1 ppc for bug 398687
diff --git a/www-apps/mediawiki/files/postinstall-1.18-en.txt b/www-apps/mediawiki/files/postinstall-1.18-en.txt
new file mode 100644
index 000000000000..bfed0d9215cd
--- /dev/null
+++ b/www-apps/mediawiki/files/postinstall-1.18-en.txt
@@ -0,0 +1,85 @@
+To complete installation you need to proceed the following steps:
+=================================================================
+
+1. Temporarily make the "mw-config" directory writable to the user the web
+server is running as. The quickest way is to make the directory world
+writable. For example:
+
+$ cd ${MY_INSTALLDIR}
+$ chmod a+w mw-config
+
+
+2. Configure database.
+a.) If you know the root password on your database, the MediaWiki installation
+script can create a new database for you.
+
+b.) If you don't know the root password, MediaWiki still needs database to
+work with. So, please, read the following link and find solution which suits
+your needs best:
+
+http://www.mediawiki.org/wiki/Manual:Installing_MediaWiki#Create_a_database
+
+
+3. Now continue the installation through web browser by accessing the
+following page:
+
+http://${VHOST_HOSTNAME}${VHOST_APPDIR}/mw-config/
+ 
+
+4. After the setup script has finished running successfully, a file called
+LocalSettings.php is created in the "mw-config" directory. Move this file to the
+root wiki directory (${MY_INSTALLDIR}):
+
+$ mv mw-config/LocalSettings.php .
+
+Set stringent permissions on the LocalSettings.php file:
+
+$ chown <webserver-user>:root LocalSettings.php
+$ chmod 600 LocalSettings.php
+
+And delete the "mw-config" directory:
+
+$ rm -rf mw-config
+
+
+5. Once you have done the above, your wiki should be ready to use!
+
+http://${VHOST_HOSTNAME}${VHOST_APPDIR}/
+ 
+
+Enabling Optional Features and other configuration
+==================================================
+
+Allow images and other files to be uploaded through the wiki
+------------------------------------------------------------
+
+If you wish to enable images and other files to be uploaded through wiki then
+edit the LocalSettings.php file and set \$wgEnableUploads to 'true':
+
+\$wgEnableUploads       = true;
+
+Now if MediaWiki was built with the imagemagick USE-flag the directory
+permissions are correct, otherwise install ImageMagick and adjust permissions
+on the images directory to allow the web server to write. For example:
+ 
+$ chown <webserver-user>:<webserver-group> ${MY_INSTALLDIR}/images
+
+IMPORTANT: Uploads need to be set up properly in order to be secure! For more
+details take a look at the following page:
+
+http://www.mediawiki.org/wiki/Manual:$wgEnableUploads
+
+
+Math Support
+------------
+
+Math support has been removed from the core mediawiki package from 1.18.0
+onwards. See http://www.mediawiki.org/wiki/Extension:Math to enable math
+support.
+
+
+Other
+-----
+
+For other tweaks, continue with the following:
+http://www.mediawiki.org/wiki/Manual:Installing_MediaWiki#See_also
diff --git a/www-apps/mediawiki/mediawiki-1.18.1.ebuild b/www-apps/mediawiki/mediawiki-1.18.1.ebuild
index dfa2282b1d2b..a420837669e3 100644
--- a/www-apps/mediawiki/mediawiki-1.18.1.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.18.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.18.1.ebuild,v 1.5 2012/02/01 17:19:09 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.18.1.ebuild,v 1.6 2012/02/26 04:10:34 radhermit Exp $
 
 EAPI="4"
-inherit webapp depend.php versionator eutils
+inherit webapp versionator eutils
 
 MY_BRANCH=$(get_version_component_range 1-2)
 
@@ -15,16 +15,16 @@ LICENSE="GPL-2"
 KEYWORDS="~alpha amd64 ppc x86"
 IUSE="imagemagick mysql postgres sqlite"
 
-RDEPEND="${DEPEND}
+RDEPEND=">=dev-lang/php-5.3[mysql?,postgres?,session,xml,xmlreader]
 	imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )
-	!imagemagick? ( || ( dev-lang/php[gd] dev-lang/php[gd-external] ) )
-	|| (  >=dev-lang/php-5.3[mysql?,postgres?,session,xml]
-		<dev-lang/php-5.3[mysql?,pcre,postgres?,session,spl,xml] )
-	sqlite? ( dev-db/sqlite:3[fts3]
-		|| ( >=dev-lang/php-5.3[sqlite3,pdo] <dev-lang/php-5.3[sqlite,pdo] ) )"
+	!imagemagick? ( dev-lang/php[gd] )
+	sqlite? (
+		dev-db/sqlite:3[fts3]
+		>=dev-lang/php-5.3[sqlite3,pdo]
+	)
+	virtual/httpd-php"
 
 need_httpd_cgi
-need_php_httpd
 
 RESTRICT="test"
 
@@ -54,7 +54,7 @@ src_install() {
 		webapp_serverowned "${MY_HTDOCSDIR}"/images
 	fi
 
-	webapp_postinst_txt en "${FILESDIR}/postinstall-1.13-en.txt"
+	webapp_postinst_txt en "${FILESDIR}/postinstall-1.18-en.txt"
 	webapp_postupgrade_txt en "${FILESDIR}/postupgrade-1.16-en.txt"
 	webapp_src_install
 }
@@ -69,11 +69,6 @@ pkg_preinst() {
 pkg_postinst() {
 	webapp_pkg_postinst
 
-	einfo
-	einfo "Math support has been removed from the core mediawiki package from 1.18.0 onwards."
-	einfo "See http://www.mediawiki.org/wiki/Extension:Math to enable math support."
-	einfo
-
 	if ${prev_install} ; then
 		einfo
 		elog "=== Consult the release notes ==="