From 4f29f3952502932b27b4a5c3a74b188a71889ade Mon Sep 17 00:00:00 2001 From: Tim Harder Date: Sun, 28 Nov 2010 09:35:08 +0000 Subject: Add sqlite USE flag to mediawiki-1.15.5, change sqlite3 USE flag to sqlite for mediawiki-1.16.0, and fix php dependencies with sqlite (bug #343275 by UnclePain@gmx.de). Add graphicsmagick alternative to imagemagick (bug #314389 by Wojciech Porczyk) and depend on GD support via php if the imagemagick USE flag is not enabled. Package-Manager: portage-2.2.0_alpha5/cvs/Linux x86_64 --- www-apps/mediawiki/ChangeLog | 10 +++++++++- www-apps/mediawiki/Manifest | 20 ++++++++++---------- www-apps/mediawiki/mediawiki-1.15.5.ebuild | 13 ++++++++----- www-apps/mediawiki/mediawiki-1.16.0.ebuild | 13 +++++++------ 4 files changed, 34 insertions(+), 22 deletions(-) diff --git a/www-apps/mediawiki/ChangeLog b/www-apps/mediawiki/ChangeLog index 0a3454714222..5de220ae3d45 100644 --- a/www-apps/mediawiki/ChangeLog +++ b/www-apps/mediawiki/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for www-apps/mediawiki # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.144 2010/10/24 19:27:20 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.145 2010/11/28 09:35:08 radhermit Exp $ + + 28 Nov 2010; Tim Harder mediawiki-1.15.5.ebuild, + mediawiki-1.16.0.ebuild: + Add sqlite USE flag to mediawiki-1.15.5, change sqlite3 USE flag to sqlite + for mediawiki-1.16.0, and fix php dependencies with sqlite (bug #343275 by + UnclePain@gmx.de). Add graphicsmagick alternative to imagemagick (bug #314389 + by Wojciech Porczyk) and depend on GD support via php if the imagemagick USE + flag is not enabled. 24 Oct 2010; Tim Harder -files/postinstall-1.11-en.txt, -mediawiki-1.14.1.ebuild, diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest index efc3eec88218..7e7327b9f6a6 100644 --- a/www-apps/mediawiki/Manifest +++ b/www-apps/mediawiki/Manifest @@ -6,18 +6,18 @@ AUX postupgrade-1.13-en.txt 1651 RMD160 aaae13a05a0984dfb327b9b5e2c6faa0d3c0c037 AUX postupgrade-1.16-en.txt 1512 RMD160 362daf6f25f8a1497209426751aedd4cf78796c7 SHA1 d86a1f9097b4809f3f295e3784d4c4baf79936b6 SHA256 d45dd49ecfd27f3dee9296925befbf334437035e311c985db78ac6132b990877 DIST mediawiki-1.15.5.tar.gz 11595008 RMD160 5113beb1df46c56275a90d5a1cb85c2b01ca541f SHA1 b157fe37bb89c78e5ffa0f27b14beb886db3a5f4 SHA256 f838c94af81e018dcf11f77674d2a363e97b8832d0d66416294fd301db720ab5 DIST mediawiki-1.16.0.tar.gz 12647934 RMD160 dc65164fd92bdfbc22992652cd31789d08527936 SHA1 41d6dc0530eb00fd96f48690b8d7041d2b7fd7f3 SHA256 81abaf3393cfbffb464f9c2da8c091983b49bbbb09d156669b443042cd48ac92 -EBUILD mediawiki-1.15.5.ebuild 3694 RMD160 bcd09ac38442e6f0b15820f91d682e4b98724467 SHA1 73a88391ec68259bdb4d72551c675e22285bfe44 SHA256 ae4c71114568f053f7d45bdaf342c32e01d6417e119fcf1427e9508983eaf06d -EBUILD mediawiki-1.16.0.ebuild 3615 RMD160 8629b5e8234f7c806b611aa7a6f41067cd1024af SHA1 c67a6c4c004e8a138fc4c8a785387ddfe6862cf3 SHA256 fc9d23adc94715a2122c7c4e17e2bd6230b33bc969453c37650865c8f9a88f05 -MISC ChangeLog 25120 RMD160 3b885b82717f61877e4e9a759ae57c7675b472fd SHA1 c62dead4b2f8cb93fd748a958faaca73294b6291 SHA256 b3af6ce0e9bee7c69bebfc7ba9f86532feb088425bade1af8c8817c65310b03a +EBUILD mediawiki-1.15.5.ebuild 3918 RMD160 a38eaf35d6610935041b9cfe927f696b97e46998 SHA1 c545ae0a1593555cc93884ea42c42cd28676b0d1 SHA256 af766da3d9002d426fe9fd025f5c511b91f42be36c2444ffcecd159c0dda0696 +EBUILD mediawiki-1.16.0.ebuild 3744 RMD160 2438f45c90f1c680659988027e69c73d19c55b00 SHA1 50f259f182d322eb4be7f973d43ad7be1a5c122c SHA256 333d321041905da835eae1eea494b2d7cbb0384db8ea4d80fd154082f98f2dfb +MISC ChangeLog 25558 RMD160 f0fba00a19132a4a38af960978c6a8ae91fbf5af SHA1 cdd77f1e5fa987081ff014414be245adae1b0966 SHA256 38b8ff73f8a21708d8b1d1539a3dec7a18cf8b0958bf4fef3ba2cf123d3c4897 MISC metadata.xml 295 RMD160 0e99ed39b17f196d96fa661725f18447202c793a SHA1 3d63cc41895a26fde229f1394541cf6792fbc016 SHA256 ac52057208794d9f818ca0f56f292885eac738678c8fcdf56e099e98ce953593 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iQEcBAEBAgAGBQJMxIihAAoJEEqz6FtPBkyjZoAH/2FcspJRhH2UFvfH0inWpz8A -MYHilC2n21IkLDj+A61hnTuTFgJnzn00X8F5V8/6KUGDnYmo3rkV7wu5lNhmWTsV -e4pM5FqDK94gbblu3F3ApVtcQg+Bu5zWRd7efVQH60oPt1lePtGgmnerkppwEQ1+ -7M4IwNkt9h3Kq93kljhkE1Nya7c/EaW1gDcIyYOHKwZ28/jekTukDXaTzWJC6dZ3 -xsXkuFxHJfEtxbm4QRwTSb/N3lCAqB/4ZuOntYleMTB0yfUkgI6Bjm+P+geBDppw -dpwioNKREBut6Nw6y+EGM5+fzSI3WBWJM0urMWAVrMrH5ZS7Yw2w/2rCa/35C6Q= -=NNN+ +iQEcBAEBAgAGBQJM8iJVAAoJEEqz6FtPBkyj0+4H/R1ySaO4R6le/YDdK/Wj2hyP +UxxfgKGeaUHtUu8YUI8ENTxBdi5Kub+XZZ3Rd+WvgZOabb8hADFyoQsixdkyBT71 +kj0AABG1V9qBpPpHNZl+5ou4ehwNo0/mr+q0k956hv8ETFOmXMunTqLHLrMRm6AB +sJ0k5jfcdhyExJ+S4JH54N2bexa1rGHpIH1LWIiKJtzDistWlEav2F+4PH3HDeMR +OmnbuQ951x/LbzrLPskiB5M8zSmypU8XcLpum1QX/165y/ZYoIvdzlqRso8WUUKJ +F+DU2D5HXPvqIsvrs8Od0mbYqIFlLbEzX/SdMTnqshQ1mayJ15dNVcJhC+t56Cc= +=Yody -----END PGP SIGNATURE----- diff --git a/www-apps/mediawiki/mediawiki-1.15.5.ebuild b/www-apps/mediawiki/mediawiki-1.15.5.ebuild index 735a7f09bfe6..efd5140dbbb8 100644 --- a/www-apps/mediawiki/mediawiki-1.15.5.ebuild +++ b/www-apps/mediawiki/mediawiki-1.15.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.15.5.ebuild,v 1.5 2010/10/24 17:53:25 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.15.5.ebuild,v 1.6 2010/11/28 09:35:08 radhermit Exp $ EAPI="3" inherit webapp depend.php versionator eutils @@ -13,7 +13,7 @@ SRC_URI="http://download.wikimedia.org/mediawiki/${MY_BRANCH}/${P}.tar.gz" LICENSE="GPL-2" KEYWORDS="~alpha amd64 ppc sparc x86" -IUSE="imagemagick math mysql postgres +ocamlopt" +IUSE="imagemagick math mysql postgres +ocamlopt sqlite" DEPEND="math? ( >=dev-lang/ocaml-3.0.6[ocamlopt?] )" RDEPEND="${DEPEND} @@ -21,11 +21,14 @@ RDEPEND="${DEPEND} app-text/dvipng virtual/tex-base app-text/ghostscript-gpl - media-gfx/imagemagick + || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) - imagemagick? ( media-gfx/imagemagick ) + 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?,postgres?,session,xml] ) + sqlite? ( dev-db/sqlite:3 + dev-lang/php[sqlite,pdo] )" RESTRICT="test" diff --git a/www-apps/mediawiki/mediawiki-1.16.0.ebuild b/www-apps/mediawiki/mediawiki-1.16.0.ebuild index 84aa7f7181c9..eb85b0402831 100644 --- a/www-apps/mediawiki/mediawiki-1.16.0.ebuild +++ b/www-apps/mediawiki/mediawiki-1.16.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.16.0.ebuild,v 1.1 2010/10/09 21:30:45 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.16.0.ebuild,v 1.2 2010/11/28 09:35:08 radhermit Exp $ EAPI="3" inherit webapp depend.php versionator eutils @@ -13,7 +13,7 @@ SRC_URI="http://download.wikimedia.org/mediawiki/${MY_BRANCH}/${P}.tar.gz" LICENSE="GPL-2" KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" -IUSE="imagemagick math mysql postgres +ocamlopt sqlite3" +IUSE="imagemagick math mysql postgres +ocamlopt sqlite" DEPEND="math? ( >=dev-lang/ocaml-3.0.6[ocamlopt?] )" RDEPEND="${DEPEND} @@ -21,13 +21,14 @@ RDEPEND="${DEPEND} app-text/dvipng virtual/tex-base app-text/ghostscript-gpl - media-gfx/imagemagick + || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) - imagemagick? ( media-gfx/imagemagick ) + 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[gd] dev-lang/php[gd-external] ) - sqlite3? ( >=dev-db/sqlite-3.6[fts3] )" + sqlite? ( dev-db/sqlite:3[fts3] + dev-lang/php[sqlite,pdo] )" RESTRICT="test" -- cgit v1.2.3-65-gdbad