Quote fixing

(Portage version: 2.1.3.19)

7 files changed, 47 insertions, 29 deletions

diff --git a/www-apps/mediawiki/ChangeLog b/www-apps/mediawiki/ChangeLog
index e6a66822d70d..63a949acd381 100644
--- a/www-apps/mediawiki/ChangeLog
+++ b/www-apps/mediawiki/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for www-apps/mediawiki
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.91 2007/09/29 14:48:14 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.92 2007/11/26 12:00:23 tchiwam Exp $
+
+  26 Nov 2007; <tchiwam@gentoo.org> files/postinstall-1.5-en.txt,
+  mediawiki-1.6.10.ebuild, mediawiki-1.8.5.ebuild, mediawiki-1.9.4.ebuild,
+  mediawiki-1.10.2.ebuild, mediawiki-1.11.0.ebuild:
+  Fixed quoting complaint from repoman
+
+  26 Nov 2007; Philippe Trottier <tchiwam@gentoo.org>
+  files/postinstall-1.5-en.txt, mediawiki-1.11.0.ebuild:
+  Bug 199361 xml support needed in php, Thanks to Jakub we also clean up the
+  dieing properly.
+
+  26 Nov 2007; Philippe Trottier <tchiwam@gentoo.org>
+  files/postinstall-1.5-en.txt:
+  Make it even more clear to users not to just expect upgrade and work. Bug
+  185731
 
   29 Sep 2007; <wrobel@gentoo.org> -mediawiki-1.8.3.ebuild,
   -mediawiki-1.8.4.ebuild, -mediawiki-1.9.0.ebuild, -mediawiki-1.9.1.ebuild,
diff --git a/www-apps/mediawiki/files/postinstall-1.5-en.txt b/www-apps/mediawiki/files/postinstall-1.5-en.txt
index 0f0d860c952f..bf75ab72a446 100644
--- a/www-apps/mediawiki/files/postinstall-1.5-en.txt
+++ b/www-apps/mediawiki/files/postinstall-1.5-en.txt
@@ -62,7 +62,11 @@ Things you need to have on the server:
 - SQL database of your choice.
 - dev-php/PEAR-Mail for external smtp server.
 
-These are not installed as dependencies as it is possible to run the database
+These are not installed as dependencies since it is possible to run the database
 and other services on other machines.
 
+It is very important that you follow all the major versions upgrade
+instructions from the mediawiki.org web page,
+http://www.mediawiki.org/wiki/Manual:Upgrading 
+Do not, I repeat, do not assume that we can upgrade from version to version just like this. Make backups before upgrading.
 
diff --git a/www-apps/mediawiki/mediawiki-1.10.2.ebuild b/www-apps/mediawiki/mediawiki-1.10.2.ebuild
index bc8e5227d66b..5f8ed0a10c84 100644
--- a/www-apps/mediawiki/mediawiki-1.10.2.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.10.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.10.2.ebuild,v 1.1 2007/09/17 14:49:24 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.10.2.ebuild,v 1.2 2007/11/26 12:00:23 tchiwam Exp $
 
 inherit webapp depend.php versionator
 
@@ -48,13 +48,13 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# XXX: besides, is/was this patch really that required? if so, why? (trapni)
 #	epatch ${FILESDIR}/jobindexlength-mysql.patch
 
 	if use restrict ; then
-		epatch ${FILESDIR}/access_restrict.patch
+		epatch "${FILESDIR}/access_restrict.patch"
 	fi
 }
 
@@ -167,6 +167,6 @@ src_install() {
 		webapp_serverowned ${MY_HTDOCSDIR}/images/tmp
 	fi
 
-	webapp_postinst_txt en ${FILESDIR}/postinstall-1.5-en.txt
+	webapp_postinst_txt en "${FILESDIR}/postinstall-1.5-en.txt"
 	webapp_src_install
 }
diff --git a/www-apps/mediawiki/mediawiki-1.11.0.ebuild b/www-apps/mediawiki/mediawiki-1.11.0.ebuild
index cbd1b63f42d7..6ba08c09168d 100644
--- a/www-apps/mediawiki/mediawiki-1.11.0.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.11.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.11.0.ebuild,v 1.2 2007/09/19 14:49:56 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.11.0.ebuild,v 1.3 2007/11/26 12:00:23 tchiwam Exp $
 
 inherit webapp depend.php versionator
 
@@ -36,25 +36,24 @@ need_php
 
 pkg_setup() {
 	webapp_pkg_setup
-	require_php_with_use pcre session
-	if use mysql ; then
-		require_php_with_use mysql
+	local flags="pcre session xml"
+	use mysql && flags="${flags} mysql"
+	use postgres && flags="${flags} postgres"
+	if ! PHPCHECKNODIE="yes" require_php_with_use ${flags} || \
+		! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external ; then
+		die "Re-install ${PHP_PKG} with ${flags} and either gd or gd-external"
 	fi
-	if use postgres ; then
-		require_php_with_use postgres
-	fi
-	require_gd
 }
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# XXX: besides, is/was this patch really that required? if so, why? (trapni)
 #	epatch ${FILESDIR}/jobindexlength-mysql.patch
 
 	if use restrict ; then
-		epatch ${FILESDIR}/access_restrict.patch
+		epatch "${FILESDIR}/access_restrict.patch"
 	fi
 }
 
@@ -168,6 +167,6 @@ src_install() {
 		webapp_serverowned ${MY_HTDOCSDIR}/images/tmp
 	fi
 
-	webapp_postinst_txt en ${FILESDIR}/postinstall-1.5-en.txt
+	webapp_postinst_txt en "${FILESDIR}/postinstall-1.5-en.txt"
 	webapp_src_install
 }
diff --git a/www-apps/mediawiki/mediawiki-1.6.10.ebuild b/www-apps/mediawiki/mediawiki-1.6.10.ebuild
index e18f6baf3607..b7c92567e163 100644
--- a/www-apps/mediawiki/mediawiki-1.6.10.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.6.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.6.10.ebuild,v 1.2 2007/07/02 14:36:56 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.6.10.ebuild,v 1.3 2007/11/26 12:00:23 tchiwam Exp $
 
 inherit webapp depend.php
 
@@ -139,6 +139,6 @@ src_install() {
 		webapp_serverowned ${MY_HTDOCSDIR}/images/tmp
 	fi
 
-	webapp_postinst_txt en ${FILESDIR}/postinstall-1.5-en.txt
+	webapp_postinst_txt en "${FILESDIR}/postinstall-1.5-en.txt"
 	webapp_src_install
 }
diff --git a/www-apps/mediawiki/mediawiki-1.8.5.ebuild b/www-apps/mediawiki/mediawiki-1.8.5.ebuild
index 03f4c6de2119..80e3958272ac 100644
--- a/www-apps/mediawiki/mediawiki-1.8.5.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.8.5.ebuild,v 1.5 2007/09/29 11:31:05 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.8.5.ebuild,v 1.6 2007/11/26 12:00:23 tchiwam Exp $
 
 inherit webapp depend.php versionator
 
@@ -46,10 +46,10 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/jobindexlength-mysql.patch
+	cd "${S}"
+	epatch "${FILESDIR}/jobindexlength-mysql.patch"
 	if use restrict ; then
-		epatch ${FILESDIR}/access_restrict.patch
+		epatch "${FILESDIR}/access_restrict.patch"
 	fi
 }
 
@@ -159,6 +159,6 @@ src_install() {
 		webapp_serverowned ${MY_HTDOCSDIR}/images/tmp
 	fi
 
-	webapp_postinst_txt en ${FILESDIR}/postinstall-1.5-en.txt
+	webapp_postinst_txt en "${FILESDIR}/postinstall-1.5-en.txt"
 	webapp_src_install
 }
diff --git a/www-apps/mediawiki/mediawiki-1.9.4.ebuild b/www-apps/mediawiki/mediawiki-1.9.4.ebuild
index 92d35f6ab22a..7e803e3c6941 100644
--- a/www-apps/mediawiki/mediawiki-1.9.4.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.9.4.ebuild,v 1.1 2007/09/17 14:49:24 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.9.4.ebuild,v 1.2 2007/11/26 12:00:23 tchiwam Exp $
 
 inherit webapp depend.php versionator
 
@@ -46,10 +46,10 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/jobindexlength-mysql.patch
+	cd "${S}"
+	epatch "${FILESDIR}/jobindexlength-mysql.patch"
 	if use restrict ; then
-		epatch ${FILESDIR}/access_restrict.patch
+		epatch "${FILESDIR}/access_restrict.patch"
 	fi
 }
 
@@ -159,6 +159,6 @@ src_install() {
 		webapp_serverowned ${MY_HTDOCSDIR}/images/tmp
 	fi
 
-	webapp_postinst_txt en ${FILESDIR}/postinstall-1.5-en.txt
+	webapp_postinst_txt en "${FILESDIR}/postinstall-1.5-en.txt"
 	webapp_src_install
 }