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

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

4 files changed, 118 insertions, 18 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/Manifest b/www-apps/mediawiki/Manifest
index a3cd76b36a23..9d86f6bc3544 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1,8 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX postinstall-1.13-en.txt 2751 RMD160 4f6c918bc1b897ed017ab8129a6d5387e982e07a SHA1 a4afb248ab7cb7abe25aa9d69533a7fd52401d73 SHA256 cebfe53c219cd6acacffcf0ed24493c0aa3180c89fa954e4a7e458dd0feb62c9
+AUX postinstall-1.18-en.txt 2611 RMD160 4cb0e176f3ef6ccb4943ddb1cb5e1b60b4c6a04c SHA1 4145463e1826c814e289f8449117e573fe455f96 SHA256 8388d74e84d63c40cbc697e25639be5f07108ecc13497346fccf9d89ab0484eb
 AUX postupgrade-1.16-en.txt 1512 RMD160 362daf6f25f8a1497209426751aedd4cf78796c7 SHA1 d86a1f9097b4809f3f295e3784d4c4baf79936b6 SHA256 d45dd49ecfd27f3dee9296925befbf334437035e311c985db78ac6132b990877
 DIST mediawiki-1.16.5.tar.gz 13235937 RMD160 0a8298051baaf02f400bc6f317508f7b7544ec57 SHA1 2526a5aebeafe49dcbfb1584823e467445daf1ae SHA256 5b451f578d9876f02a1a4363851d1558385290638676680ab33dc26116db20cb
 DIST mediawiki-1.18.1.tar.gz 17271798 RMD160 066871f63d38120ba0985f5168351a6a66a45758 SHA1 1c433523a5ae2835e97462053e08ad7c01e178d2 SHA256 d9db16b4f18bc43984f323ad90f724ee5ffa52e1f21e6c453bc8d4b1210e1a34
 EBUILD mediawiki-1.16.5.ebuild 3777 RMD160 9a998f9a961064488e296a454183a4c25e23704f SHA1 e4a93613d2a74210f76e31bf5458eb2f72418ee8 SHA256 b15d2a7290cbf42a5f49d5db7c6590c8fd7a856b0643b417a852d455c659bcad
-EBUILD mediawiki-1.18.1.ebuild 2866 RMD160 0afb87e4619a44ef659c3d5237f6373523988fc7 SHA1 19039d9d7babc82b517756724c414503957d4b9b SHA256 0a62960fb3f42872949a5e984cce9a28f094e83cd4d36e21e81f3e7eaddd2ac0
-MISC ChangeLog 29624 RMD160 434a85e17938e99c268744552270c7f55cab72af SHA1 bc9435eb1bd2ad097b788830daadf84f162dd9f8 SHA256 924d477250e045cfc423f3e2fec449097da56a98807ae45939c480c7b5fcfba9
+EBUILD mediawiki-1.18.1.ebuild 2538 RMD160 31e451701e2dd70f8cc7d99ba2ac88e69642ba0a SHA1 15083e35527b4dc5db60fbc89dd985a5dddeecd6 SHA256 f91ecb3f4ba5ec78fb3f961719d2b32a99b15915c7cb4f748543766a362863d2
+MISC ChangeLog 29888 RMD160 d87d5d9142696ebd9f45d43e953b67792b13e3c6 SHA1 b56a566b4d8e1250759f278a01ff4df8372491b1 SHA256 e9d16be650d2f0bc3043e5fa7a5b8a0b660ef3c1d891fdfe53e1d44e241fa424
 MISC metadata.xml 295 RMD160 0e99ed39b17f196d96fa661725f18447202c793a SHA1 3d63cc41895a26fde229f1394541cf6792fbc016 SHA256 ac52057208794d9f818ca0f56f292885eac738678c8fcdf56e099e98ce953593
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBCgAGBQJPSbDAAAoJEEqz6FtPBkyjDjAH+gO7RVHa5aMl4P5oJcL4HCkW
+qJZc3p3vLO/20Ggw3GU4uln5x9Dj7jU2XwaK5LGOt0MCAtCfu/cPqu1Yv+tCBIUq
+72168NV8FymGuvuwu+9gfKk5Oj+b4IIH3SXnvR1FjpN0kSGgN0RwUTbQCeUecX27
+QzyQobsldjRJ3slsoRkBt1sEQen9V7Uu6LMxOQp2UmslT2BZrj1q+ZVz5Pp9ABmj
+tnEsnmxJ9pbk0WvEl4xXec+XS2EERJb31BxKjjfqxEjVY3Jh+j1Eq0GZsAtEhayT
+aVBaIQTpQyLUMr8DEfV2tyaXAfUnJwMuObRnWy7FuEX05DhI3DEOLG12+pLsFkw=
+=EAcZ
+-----END PGP SIGNATURE-----
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 ==="