[gentoo-commits] gentoo-x86 commit in www-apps/mediawiki: mediawiki-1.9.4.ebuild mediawiki-1.8.5.ebuild ChangeLog mediawiki-1.10.2.ebuild mediawiki-1.11.0.ebuild mediawiki-1.6.10.ebuild

[Philippe Trottier (tchiwam)]

tchiwam     07/11/26 12:00:23

  Modified:             mediawiki-1.9.4.ebuild mediawiki-1.8.5.ebuild
                        ChangeLog mediawiki-1.10.2.ebuild
                        mediawiki-1.11.0.ebuild mediawiki-1.6.10.ebuild
  Log:
  Quote fixing
  (Portage version: 2.1.3.19)

Revision  Changes    Path
1.2                  www-apps/mediawiki/mediawiki-1.9.4.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mediawiki/mediawiki-1.9.4.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mediawiki/mediawiki-1.9.4.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mediawiki/mediawiki-1.9.4.ebuild?r1=1.1&r2=1.2

Index: mediawiki-1.9.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.9.4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mediawiki-1.9.4.ebuild	17 Sep 2007 14:49:24 -0000	1.1
+++ mediawiki-1.9.4.ebuild	26 Nov 2007 12:00:23 -0000	1.2
@@ -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 @@
 
 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 @@
 		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
 }



1.6                  www-apps/mediawiki/mediawiki-1.8.5.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mediawiki/mediawiki-1.8.5.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mediawiki/mediawiki-1.8.5.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mediawiki/mediawiki-1.8.5.ebuild?r1=1.5&r2=1.6

Index: mediawiki-1.8.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.8.5.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mediawiki-1.8.5.ebuild	29 Sep 2007 11:31:05 -0000	1.5
+++ mediawiki-1.8.5.ebuild	26 Nov 2007 12:00:23 -0000	1.6
@@ -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 @@
 
 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 @@
 		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
 }



1.92                 www-apps/mediawiki/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mediawiki/ChangeLog?rev=1.92&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mediawiki/ChangeLog?rev=1.92&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mediawiki/ChangeLog?r1=1.91&r2=1.92

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- ChangeLog	29 Sep 2007 14:48:14 -0000	1.91
+++ ChangeLog	26 Nov 2007 12:00:23 -0000	1.92
@@ -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@g.o> 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@g.o>
+  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@g.o>
+  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@g.o> -mediawiki-1.8.3.ebuild,
   -mediawiki-1.8.4.ebuild, -mediawiki-1.9.0.ebuild, -mediawiki-1.9.1.ebuild,



1.2                  www-apps/mediawiki/mediawiki-1.10.2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mediawiki/mediawiki-1.10.2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mediawiki/mediawiki-1.10.2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mediawiki/mediawiki-1.10.2.ebuild?r1=1.1&r2=1.2

Index: mediawiki-1.10.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.10.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mediawiki-1.10.2.ebuild	17 Sep 2007 14:49:24 -0000	1.1
+++ mediawiki-1.10.2.ebuild	26 Nov 2007 12:00:23 -0000	1.2
@@ -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 @@
 
 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 @@
 		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
 }



1.3                  www-apps/mediawiki/mediawiki-1.11.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mediawiki/mediawiki-1.11.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mediawiki/mediawiki-1.11.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mediawiki/mediawiki-1.11.0.ebuild?r1=1.2&r2=1.3

Index: mediawiki-1.11.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.11.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mediawiki-1.11.0.ebuild	19 Sep 2007 14:49:56 -0000	1.2
+++ mediawiki-1.11.0.ebuild	26 Nov 2007 12:00:23 -0000	1.3
@@ -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 @@
 
 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 @@
 		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
 }



1.3                  www-apps/mediawiki/mediawiki-1.6.10.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mediawiki/mediawiki-1.6.10.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mediawiki/mediawiki-1.6.10.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mediawiki/mediawiki-1.6.10.ebuild?r1=1.2&r2=1.3

Index: mediawiki-1.6.10.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.6.10.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mediawiki-1.6.10.ebuild	2 Jul 2007 14:36:56 -0000	1.2
+++ mediawiki-1.6.10.ebuild	26 Nov 2007 12:00:23 -0000	1.3
@@ -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 @@
 		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
 }



-- 
gentoo-commits@g.o mailing list