bug 152089

Package-Manager: portage-2.1.1-r2

4 files changed, 27 insertions, 12 deletions

diff --git a/www-apps/mediawiki/ChangeLog b/www-apps/mediawiki/ChangeLog
index 86aaedebb1ef..54041a71c093 100644
--- a/www-apps/mediawiki/ChangeLog
+++ b/www-apps/mediawiki/ChangeLog
@@ -1,8 +1,11 @@
 # ChangeLog for www-apps/mediawiki
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.68 2006/12/07 16:51:13 tchiwam Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.69 2006/12/11 10:51:52 tchiwam Exp $
 
 
+  11 Dec 2006; Philippe Trottier <tchiwam@gentoo.org> mediawiki-1.8.2.ebuild:
+  job key lenght bug#152089.
+
 *mediawiki-1.8.2 (05 Dec 2006)
   05 Dec 2006; Philippe Trottier <tchiwam@gentoo.org> mediawiki-1.8.2.ebuild:
   version update, support for postgres, bug#156334, bug#152089, bug#147668
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index 0869447247a8..b489642aaa0f 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1,3 +1,7 @@
+AUX jobindexlength-mysql.patch 392 RMD160 a6031a663b1a4af2d15d1cb2ba7b659fe813a175 SHA1 1442974131d16077edccc4f9539a37838b737e14 SHA256 19cf34e4864fd7352b917905480bf9ca5a984ec4d8914990902c907381b0b79b
+MD5 90e42e951dd953f36a7ddaf3f7e2a47f files/jobindexlength-mysql.patch 392
+RMD160 a6031a663b1a4af2d15d1cb2ba7b659fe813a175 files/jobindexlength-mysql.patch 392
+SHA256 19cf34e4864fd7352b917905480bf9ca5a984ec4d8914990902c907381b0b79b files/jobindexlength-mysql.patch 392
 AUX jobindexlength-mysql4.patch 697 RMD160 98fb7cd28fae9b3c9e868b9f33542e2373507b61 SHA1 6c43d2e457968d7ca03e3940822390587aa376d1 SHA256 883d077b87744c5e179164f46df364b83bf3e0c59578446835771601f024a5fc
 MD5 db9979dcfc1a0de372ce64bfb9a50683 files/jobindexlength-mysql4.patch 697
 RMD160 98fb7cd28fae9b3c9e868b9f33542e2373507b61 files/jobindexlength-mysql4.patch 697
@@ -39,14 +43,14 @@ EBUILD mediawiki-1.7.1.ebuild 3287 RMD160 dc4eefd7230173b4c090f0c776ae7cf86b8f6e
 MD5 2ebdbacaadaf1c268fcfd9f81ec5a517 mediawiki-1.7.1.ebuild 3287
 RMD160 dc4eefd7230173b4c090f0c776ae7cf86b8f6e68 mediawiki-1.7.1.ebuild 3287
 SHA256 c9509e6cf7106b980e3a42497ceecafe853d061f07d0177995fd57c36cf28f1a mediawiki-1.7.1.ebuild 3287
-EBUILD mediawiki-1.8.2.ebuild 3518 RMD160 0ee6a3aad8d0f100c3d5fee4bdfdaed3f3fe8049 SHA1 d382022e1af19eb442df45040ac10d9adf242de1 SHA256 2c3fcaca47e12fbb61932e0cb6a85f162a7ec0f61ef9078363ec19175755551d
-MD5 2aa7306559329c967f1c2492ff3f291b mediawiki-1.8.2.ebuild 3518
-RMD160 0ee6a3aad8d0f100c3d5fee4bdfdaed3f3fe8049 mediawiki-1.8.2.ebuild 3518
-SHA256 2c3fcaca47e12fbb61932e0cb6a85f162a7ec0f61ef9078363ec19175755551d mediawiki-1.8.2.ebuild 3518
-MISC ChangeLog 11650 RMD160 886f9b492c0135164ae501bccfa20563c68cf8c7 SHA1 10a6f318d0a1dc84726d09e59bad79696fdb04a2 SHA256 b64aae5b7e565088b9ae98599e3b7d761b067cd878bac2828ec319cda0ba764b
-MD5 2e71daeb2f665d79017618a79a057c91 ChangeLog 11650
-RMD160 886f9b492c0135164ae501bccfa20563c68cf8c7 ChangeLog 11650
-SHA256 b64aae5b7e565088b9ae98599e3b7d761b067cd878bac2828ec319cda0ba764b ChangeLog 11650
+EBUILD mediawiki-1.8.2.ebuild 3469 RMD160 e43324b07d57b0f50c31213befb9526247cbc53a SHA1 7d1906954aacb2a04c5e0905ee6ba6db051143bb SHA256 644d74c3d22ed4abe0b456a3bc73ed0ad7d0b93f91ec458b32dc878bf0731f46
+MD5 9acb328b0c56830e046efdc88bcde544 mediawiki-1.8.2.ebuild 3469
+RMD160 e43324b07d57b0f50c31213befb9526247cbc53a mediawiki-1.8.2.ebuild 3469
+SHA256 644d74c3d22ed4abe0b456a3bc73ed0ad7d0b93f91ec458b32dc878bf0731f46 mediawiki-1.8.2.ebuild 3469
+MISC ChangeLog 11758 RMD160 2e8464e0c96e9590eb6fa783c80c89cdeb6f6d2d SHA1 75fbff401e5df1b05f46123a3444856f87de5128 SHA256 2bb5481453471b1759cd1edf6c662889c6a34ed131d5e65310c83456edb25a9f
+MD5 fb3ac166d1e1479797740bc25a086ef1 ChangeLog 11758
+RMD160 2e8464e0c96e9590eb6fa783c80c89cdeb6f6d2d ChangeLog 11758
+SHA256 2bb5481453471b1759cd1edf6c662889c6a34ed131d5e65310c83456edb25a9f ChangeLog 11758
 MISC metadata.xml 366 RMD160 8be6da5afadbc6c6e57d589097d8f702d951bde3 SHA1 4c3b825388a712b4452ba16912b38b9aba76b78e SHA256 dddc4891c17811953d2cae412c4b1a713dc00b3629cd38a5b530c15a0acebcc2
 MD5 6e1b02a80fc901d2eaadf52a50e0b905 metadata.xml 366
 RMD160 8be6da5afadbc6c6e57d589097d8f702d951bde3 metadata.xml 366
diff --git a/www-apps/mediawiki/files/jobindexlength-mysql.patch b/www-apps/mediawiki/files/jobindexlength-mysql.patch
new file mode 100644
index 000000000000..ad61803eee0e
--- /dev/null
+++ b/www-apps/mediawiki/files/jobindexlength-mysql.patch
@@ -0,0 +1,9 @@
+--- mediawiki-1.7.1/maintenance/archives/patch-job.sql.orig	2006-12-11 12:41:04.000000000 +0200
++++ mediawiki-1.7.1/maintenance/archives/patch-job.sql		2006-12-11 12:41:17.000000000 +0200
+@@ -16,5 +16,5 @@
+   job_params blob NOT NULL default '',
+ 
+   PRIMARY KEY job_id (job_id),
+-  KEY (job_cmd, job_namespace, job_title)
++  KEY (job_cmd(128), job_namespace, job_title(128))
+ ) TYPE=InnoDB;
diff --git a/www-apps/mediawiki/mediawiki-1.8.2.ebuild b/www-apps/mediawiki/mediawiki-1.8.2.ebuild
index a7428c787906..89fa91f64f70 100644
--- a/www-apps/mediawiki/mediawiki-1.8.2.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.8.2.ebuild,v 1.3 2006/12/07 16:51:13 tchiwam Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.8.2.ebuild,v 1.4 2006/12/11 10:51:52 tchiwam Exp $
 
 inherit webapp depend.php
 
@@ -47,8 +47,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/jobindexlength-mysql4.patch
-	epatch ${FILESDIR}/jobindexlength-mysql5.patch
+	epatch ${FILESDIR}/jobindexlength-mysql.patch
 }
 
 src_compile() {