Version bump. Remove math support since it was moved into an external extension.

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

3 files changed, 109 insertions, 10 deletions

diff --git a/www-apps/mediawiki/ChangeLog b/www-apps/mediawiki/ChangeLog
index 5246f2b07434..fa40b65389c8 100644
--- a/www-apps/mediawiki/ChangeLog
+++ b/www-apps/mediawiki/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/mediawiki
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.170 2011/12/09 22:09:03 radhermit Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.171 2012/01/15 03:44:02 radhermit Exp $
+
+*mediawiki-1.18.1 (15 Jan 2012)
+
+  15 Jan 2012; Tim Harder <radhermit@gentoo.org> +mediawiki-1.18.1.ebuild:
+  Version bump. Remove math support since it was moved into an external
+  extension.
 
   09 Dec 2011; Tim Harder <radhermit@gentoo.org> mediawiki-1.18.0.ebuild:
   Update to EAPI 4 and other minor fixes.
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index 4792bf572e41..9c9043c33d23 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -5,18 +5,20 @@ AUX postinstall-1.13-en.txt 2751 RMD160 4f6c918bc1b897ed017ab8129a6d5387e982e07a
 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.0.tar.gz 17018978 RMD160 9e83e7f07ee11da4348afb01a7aad63501176aef SHA1 4f41ebcf986873625ae22641da8dca76542914a7 SHA256 da522adc659280c5a95813c571d76f7bc555942e0ae3a5f6d92e9a852e252077
+DIST mediawiki-1.18.1.tar.gz 17271798 RMD160 066871f63d38120ba0985f5168351a6a66a45758 SHA1 1c433523a5ae2835e97462053e08ad7c01e178d2 SHA256 d9db16b4f18bc43984f323ad90f724ee5ffa52e1f21e6c453bc8d4b1210e1a34
 EBUILD mediawiki-1.16.5.ebuild 3786 RMD160 0ff8b4d5b4091b32e04cc25e52acf32059b3fb2b SHA1 a354d0652ec80de0bfa73d0d9e749a597856c7fa SHA256 6b59a5221b34f7cc6e1cc500157c739179b3f2214e21d7d994edb36ffa75fe36
 EBUILD mediawiki-1.18.0.ebuild 3736 RMD160 4e205ed9d3d09c54af89f3defaf699c336b5fe8f SHA1 1ac14683ba5eb887e805e3d8d1751fc109c62440 SHA256 9d1dab7ae0d15cde367044f1c614d1adaa1edc81f5d1a337d8a900b693d4edb7
-MISC ChangeLog 28866 RMD160 d5d5b7438d3e776fe675ea9b9f653397f442d12d SHA1 7fe1261798d8b3d58d08069370616a6ec8be9b94 SHA256 6b077937eba0e8496bf5d800ac291a2d731273eaff226d7fa2c722e03ca18dfe
+EBUILD mediawiki-1.18.1.ebuild 2879 RMD160 45784755dfcb212e1617b284da1a498e450b66f8 SHA1 d7bf9f910cd1b6760aa22dd2851a72262e9e32f3 SHA256 014f0a23cd2bfbab22884aa828aa633db2228d22dc8a97c111dd48b5bd16b171
+MISC ChangeLog 29060 RMD160 e2ea63644528c2e2bb6bdb6e0cb8fdb484b6443e SHA1 285933582d55a4f7ab60e512038a739079f19365 SHA256 54e50f34af690b8666c601caf5eb826214507e8a0eddf61938d41686368220b7
 MISC metadata.xml 295 RMD160 0e99ed39b17f196d96fa661725f18447202c793a SHA1 3d63cc41895a26fde229f1394541cf6792fbc016 SHA256 ac52057208794d9f818ca0f56f292885eac738678c8fcdf56e099e98ce953593
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO4ocMAAoJEEqz6FtPBkyj2UEIALb4SOrKvr67mJRG4i8fDaAM
-+wIPFv4N/Atn+QU5N6KOu+YGGhEMzLx7kKRttFuENy9wClnQJviPsMX2vuq+MNnU
-t/KI4CwUfA6XB8nZF2KVg/jNvZd440SU5hG6GAzUatK77OmJqqMX67ou9RrXq0D7
-VRemHU8XZ92VY3E0zm2bjyddypj/nfYJgkbXE8wqK3fzhdxRAjw7aCIGKO+CbAR9
-gEOmXs9Qlzl3fRi+5pQnOheB/Hhe4HDLJvs+iuCUkcCrFsTwkb7YllbODuZRs/tc
-sPuzI6rJS1tB+zNV0edOVmfltAIiib0NVsDOHkRPNDPh89CQNZsm63YjGAkh7ZU=
-=79W5
+iQEcBAEBCgAGBQJPEkuIAAoJEEqz6FtPBkyjpSAH/jgHcCxLwfsoxayyhWbkcu9o
+M62fiOjSNYhsQJNVeX9a7NcXQfClLJsTMmubgaJipDf0+Xbsbdsbyr3DYx1kcWfy
+xlfNBL1h4CAGTON5KbAMDWctpersJIe+Zx8QvdHx6hto4EhBCB+s8vuA6q+RlGea
+wl+aIUbL3WIuKnXHDTKo2+uLNoWgPFU4uB+BuLEynOwdf2YmS0lCr3XOOf+KMUU7
+KGdDCuW2KEW0L3agp70MDQUvPjXCAOPWvuO7XlXoazLRCSYAtrD8LSQrpaKwKIaT
+3m/rGRrlkWudpiNr0VNFb5yYRk5AZv9HWQRRe83cQNMFFOuEwHlzTUEcuim6Mn8=
+=Xgjj
 -----END PGP SIGNATURE-----
diff --git a/www-apps/mediawiki/mediawiki-1.18.1.ebuild b/www-apps/mediawiki/mediawiki-1.18.1.ebuild
new file mode 100644
index 000000000000..dc4d4449ec39
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.18.1.ebuild
@@ -0,0 +1,91 @@
+# 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.1 2012/01/15 03:44:02 radhermit Exp $
+
+EAPI="4"
+inherit webapp depend.php versionator eutils
+
+MY_BRANCH=$(get_version_component_range 1-2)
+
+DESCRIPTION="The MediaWiki wiki web application (as used on wikipedia.org)"
+HOMEPAGE="http://www.mediawiki.org"
+SRC_URI="http://download.wikimedia.org/mediawiki/${MY_BRANCH}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="imagemagick mysql postgres sqlite"
+
+RDEPEND="${DEPEND}
+	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] ) )"
+
+need_httpd_cgi
+need_php_httpd
+
+RESTRICT="test"
+
+src_install() {
+	webapp_src_preinst
+
+	# First we install docs and then copy everything left into htdocs dir
+	# to avoid bugs like #236411.
+
+	# We ensure the directories are prepared for writing.  The post-
+	# install instructions guide the user to enable the feature.
+	local DOCS="FAQ HISTORY INSTALL README RELEASE-NOTES-1.18 UPGRADE"
+	dodoc ${DOCS} docs/*.txt
+	docinto php-memcached
+	dodoc docs/php-memcached/*
+
+	# Clean everything not used at the site...
+	rm -rf ${DOCS} COPYING tests docs
+	find . -name Makefile -delete
+	# and install
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	# If imagemagick is enabled then setup for image upload.
+	# We ensure the directory is prepared for writing.
+	if use imagemagick ; then
+		webapp_serverowned "${MY_HTDOCSDIR}"/images
+	fi
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-1.13-en.txt"
+	webapp_postupgrade_txt en "${FILESDIR}/postupgrade-1.16-en.txt"
+	webapp_src_install
+}
+
+pkg_preinst() {
+	prev_install="false"
+	if has_version ${CATEGORY}/${PN} ; then
+		prev_install="true"
+	fi
+}
+
+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 ==="
+		elog "Before doing anything, stop and consult the release notes"
+		elog "/usr/share/doc/${PF}/RELEASE-NOTES.bz2"
+		elog
+		elog "These detail bug fixes, new features and functionality, and any"
+		elog "particular points that may need to be noted during the upgrade procedure."
+		einfo
+		ewarn "Back up existing files and the database before upgrade."
+		ewarn "http://www.mediawiki.org/wiki/Manual:Backing_up_a_wiki"
+		ewarn "provides an overview of the backup process."
+		einfo
+	fi
+}