Version bump. Properly escape variable names for postupgrade output (bug #434232) and use correct release notes doc path (bug #434276).

(Portage version: 2.2.0_alpha141/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

5 files changed, 99 insertions, 6 deletions

diff --git a/www-apps/mediawiki/ChangeLog b/www-apps/mediawiki/ChangeLog
index 42d5d1cff0b2..5ddfb015bb48 100644
--- a/www-apps/mediawiki/ChangeLog
+++ b/www-apps/mediawiki/ChangeLog
@@ -1,6 +1,13 @@
 # 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.201 2012/10/06 04:18:26 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.202 2012/11/07 22:06:52 radhermit Exp $
+
+*mediawiki-1.20.0 (07 Nov 2012)
+
+  07 Nov 2012; Tim Harder <radhermit@gentoo.org> files/postupgrade-1.16-en.txt,
+  mediawiki-1.18.5.ebuild, mediawiki-1.19.2.ebuild, +mediawiki-1.20.0.ebuild:
+  Version bump. Properly escape variable names for postupgrade output (bug
+  #434232) and use correct release notes doc path (bug #434276).
 
   06 Oct 2012; Tim Harder <radhermit@gentoo.org> -mediawiki-1.19.1.ebuild:
   Remove old.
diff --git a/www-apps/mediawiki/files/postupgrade-1.16-en.txt b/www-apps/mediawiki/files/postupgrade-1.16-en.txt
index ebf6f713ea97..e26939c36e3d 100644
--- a/www-apps/mediawiki/files/postupgrade-1.16-en.txt
+++ b/www-apps/mediawiki/files/postupgrade-1.16-en.txt
@@ -8,7 +8,7 @@ http://www.mediawiki.org/wiki/Manual:Backing_up_a_wiki
 Run the update script
 =====================
 
-Note: Make sure $wgDBadminusr and $wgDBadminpassword is set in your
+Note: Make sure \$wgDBadminusr and \$wgDBadminpassword is set in your
 LocalSettings.php file in your wiki root. The user needs full permissions
 (shell access) on the database.
 
diff --git a/www-apps/mediawiki/mediawiki-1.18.5.ebuild b/www-apps/mediawiki/mediawiki-1.18.5.ebuild
index b05dd3b2e943..27ad4a5d6754 100644
--- a/www-apps/mediawiki/mediawiki-1.18.5.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.18.5.ebuild
@@ -1,6 +1,6 @@
 # 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.5.ebuild,v 1.1 2012/09/02 03:57:56 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.18.5.ebuild,v 1.2 2012/11/07 22:06:52 radhermit Exp $
 
 EAPI="4"
 inherit webapp versionator
@@ -73,7 +73,7 @@ pkg_postinst() {
 		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 "/usr/share/doc/${PF}/RELEASE-NOTES-${PV:0:4}.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."
diff --git a/www-apps/mediawiki/mediawiki-1.19.2.ebuild b/www-apps/mediawiki/mediawiki-1.19.2.ebuild
index 1e16423041fd..1de043611ee7 100644
--- a/www-apps/mediawiki/mediawiki-1.19.2.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.19.2.ebuild
@@ -1,6 +1,6 @@
 # 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.19.2.ebuild,v 1.4 2012/10/05 17:07:45 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.19.2.ebuild,v 1.5 2012/11/07 22:06:52 radhermit Exp $
 
 EAPI="4"
 inherit webapp versionator
@@ -73,7 +73,7 @@ pkg_postinst() {
 		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 "/usr/share/doc/${PF}/RELEASE-NOTES-${PV:0:4}.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."
diff --git a/www-apps/mediawiki/mediawiki-1.20.0.ebuild b/www-apps/mediawiki/mediawiki-1.20.0.ebuild
new file mode 100644
index 000000000000..edeb359e21c0
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.20.0.ebuild
@@ -0,0 +1,86 @@
+# 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.20.0.ebuild,v 1.1 2012/11/07 22:06:52 radhermit Exp $
+
+EAPI="4"
+inherit webapp versionator
+
+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 ~x86"
+IUSE="imagemagick mysql postgres sqlite"
+
+RDEPEND=">=dev-lang/php-5.3.2[mysql?,postgres?,session,xml,xmlreader]
+	imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )
+	!imagemagick? ( dev-lang/php[gd] )
+	sqlite? (
+		dev-db/sqlite:3[fts3]
+		>=dev-lang/php-5.3.2[sqlite3,pdo]
+	)
+	virtual/httpd-php"
+
+need_httpd_cgi
+
+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-${PV:0:4} 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.18-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
+
+	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-${PV:0:4}.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
+}