From ffb8c80b491c1f026e210631612a821b91b76f06 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Tue, 16 Apr 2013 09:02:31 +0200 Subject: [PATCH] Update to latest verison with restriction patch Package-Manager: portage-2.2.0_alpha166 RepoMan-Options: --force --- www-apps/mediawiki/ChangeLog | 3 + www-apps/mediawiki/Manifest | 5 +- www-apps/mediawiki/mediawiki-1.18.6-r1.ebuild | 94 ++++++------------- 3 files changed, 33 insertions(+), 69 deletions(-) diff --git a/www-apps/mediawiki/ChangeLog b/www-apps/mediawiki/ChangeLog index da4c2bfa..662a1fca 100644 --- a/www-apps/mediawiki/ChangeLog +++ b/www-apps/mediawiki/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.136 2010/04/15 20:25:15 maekke Exp $ + 16 Apr 2013; Mario Fetka mediawiki-1.18.6-r1.ebuild: + Update to latest verison with restriction patch + *mediawiki-1.18.6-r1 (16 Apr 2013) 16 Apr 2013; Mario Fetka diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest index c5e9b438..51e86cc4 100644 --- a/www-apps/mediawiki/Manifest +++ b/www-apps/mediawiki/Manifest @@ -1,6 +1,7 @@ AUX postinstall-1.18-en.txt 2611 SHA256 8388d74e84d63c40cbc697e25639be5f07108ecc13497346fccf9d89ab0484eb SHA512 2b6a0e00160c15466bf70189499816d18a5ea06f040ed79f2361842be93a584ea19033170dc59c1d78c590da85223a61b8d04730084e60bc7906648f2532578b WHIRLPOOL 254b014ac9a7cf431958ade7827afadbf7e48ec255e1ea39e7ac3fa091f7d321376b760dad39d0be3af3a6cb342aaeac9d4e2329816bf3c6b3e4e55e1ac05d4b AUX postupgrade-1.16-en.txt 1512 SHA256 d45dd49ecfd27f3dee9296925befbf334437035e311c985db78ac6132b990877 SHA512 4fe42348722d850dfea7dbb3cd11a06dc8d5f5e2f0afbfd077dc39117b3fd7316dc0ea94423e4b08d0e1de50d0e8046f3f90912bbe03a3558e958746d78547c6 WHIRLPOOL e8d57644ddfcad706196c02c5b885ca0f24ec464670e1acc3c2089f8c8fd5dc5210d75c659455b39311db5b149b013562d38e68fb0a6787454935183a7c75efe +DIST mediawiki-1.18.1-restrict-0.8.5.patch 86875 SHA256 00e037db2278c67d2e1811627281d9fdbfe268dba7d52e190b7769c369b0a079 SHA512 727ae57013f4211b4e7b5dfd2092da532031bbf2c11eed0f60cb295b9c76d115ad4ed7cfde974a16f57e7a1293618a67b7ce3599406f7ba876714aa26fc38890 WHIRLPOOL f0ea2c216696219b0ba40fa6706d2cd435eb67084a4151f009acf36ee1deb02352071b62816728da29a5a4a6029c7c1d0eadbf9d7599be2f3bb520fa680601a2 DIST mediawiki-1.18.6.tar.gz 17683490 SHA256 6af73915093b791fbb53cece3ebc89530a11f02eeba9762d630805fbb2624e20 SHA512 0effb0f24198090fecc0ed99ea449fa4c9b53599d9804dd7424f5bc010c4e79fbe0aa38ad0382894b35911d00d4bfdd39158d736cc31b0cf5a158bb12f2d53c0 WHIRLPOOL 3d399ef9a9f3697988680a558303a406cdce07b56a79ccb1bf86f2861bf44c8527b00913fdb55714f4467aa91945d89ce9405658a49aa833ef663b199739d98b -EBUILD mediawiki-1.18.6-r1.ebuild 3850 SHA256 b5de08cabbfbe2a78103f90dd325189606d91c4ffb7dcc1d2da721dbd3262c31 SHA512 2f9ed87e8d8f76c72b3aec4a37c2ffd50b04c603e3c1d906071b2e847eebbc55803b8a4bf2f7155fbfaf6fb3314ace34857538faf0e225965c2296438adad12d WHIRLPOOL ec2d1ba4ab69edebf8a4f71bb112e2c5e189860b365ea913048256bacbab48ebed7352ddd3336e07cd51454ac0d28c2351bdf761fc81b15322c72051539eb300 -MISC ChangeLog 25410 SHA256 f91ff39a452fe2e4f878825fe74617d43cc758959ea999a74e6dfebe6bd61f4a SHA512 d5f44d0a1d3336457a22c4d1cbe0c9e2622cdfba6c2016f2360b4abe704353a96fffc1cbf88b21d06bf6c1d08a8ea7bb43be036cfa8da808643010235c6b0452 WHIRLPOOL d0db036fcfde7486c49abfc81a42f6c9ced63dc7c925497890de085013c004abcfca66faafffc614aba618fb859c205c6343b6a305da0bba97bc7b13122e742d +EBUILD mediawiki-1.18.6-r1.ebuild 2782 SHA256 a69e5d24d2c6fd38beb802f1f86b602acca16ad283d14d9c23a892c0c6b0306a SHA512 4796357946e7c1bf4b12f5d7fd34ffcd25c1e4f4c6e54fafa5355d23451b5a33e36e839789c52251ba696fe201a4b823a8f6bb8a940faf369d5996f2217368cb WHIRLPOOL 23ab96e45c64c286c298ec2331efb90918aec0d65b1dd4aaa12aa524e118d9e96842a714f5ed0af57bc4cb57397396ab5434699264335f38b5b590ca2530d1d4 +MISC ChangeLog 25540 SHA256 b6c39e8c05f997711967302ae28596a9192d5d5365c84acfd61cb4b9eff1fa04 SHA512 c3726dfb9b7b3da74043e7215c1a8f14a869ec4c15ed415c8db392c5c34f424c362197a3c8e55af9e68ff9a0a71b854f3075cc2cd91990f3620b0d3ce6feda44 WHIRLPOOL 31b13dd7eebaad30780ae72600e5ad3f45bbfa7c1737bcb52cc272517a7b436e2625ebc9f8a005fe1c3571a5990830bdd03264543eb4983a7093467bca798f28 MISC metadata.xml 418 SHA256 68dd9b135528db0c39e306e60b4e910b402ee121fa1b0dc17107d1ba7c66d0eb SHA512 53c3a79d3ba11b01ad03f35b0986ea08a7f764d07e53d974003d9f2a4eea4a9a4e662307e47b84439a6d5f3c662efcb433a4bf3a3b9ba4030eeb4fa4b2c1e689 WHIRLPOOL 88043c5cca28f64cad6838dea617a40ebafca4b67a212465ebf0354308ee648965c1599b4d0f2b47fda7b5cd5f36b20b001b22e059293551cd714d920d8cffd9 diff --git a/www-apps/mediawiki/mediawiki-1.18.6-r1.ebuild b/www-apps/mediawiki/mediawiki-1.18.6-r1.ebuild index c1cf1380..9453b3b2 100644 --- a/www-apps/mediawiki/mediawiki-1.18.6-r1.ebuild +++ b/www-apps/mediawiki/mediawiki-1.18.6-r1.ebuild @@ -1,96 +1,55 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.18.0.ebuild,v 1.2 2011/12/09 22:09:03 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/Attic/mediawiki-1.18.6.ebuild,v 1.3 2013/03/20 03:48:04 radhermit dead $ -EAPI="4" -inherit webapp depend.php versionator eutils +EAPI="5" +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" +SRC_URI="http://download.wikimedia.org/mediawiki/${MY_BRANCH}/${P}.tar.gz + http://mikedld.com/f/mediawiki/mediawiki-1.18.1-restrict-0.8.5.patch" LICENSE="GPL-2" -#KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" -KEYWORDS="" -IUSE="imagemagick math mysql postgres +ocamlopt sqlite" +KEYWORDS="~alpha ~amd64 ~ppc ~x86" +IUSE="imagemagick mysql postgres sqlite" -DEPEND="math? ( >=dev-lang/ocaml-3.0.6[ocamlopt?] )" -RDEPEND="${DEPEND} - math? ( - app-text/dvipng - virtual/tex-base - app-text/ghostscript-gpl - || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) - ) +RDEPEND=">=dev-lang/php-5.3[mysql?,postgres?,session,xml,xmlreader] 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[sqlite3,pdo] =dev-lang/php-5.3[pdo] + || ( dev-lang/php[sqlite] dev-lang/php[sqlite3] ) + ) + virtual/httpd-php" need_httpd_cgi -need_php_httpd RESTRICT="test" src_prepare() { - epatch "${FILESDIR}"/mediawiki-1.16.0-restrict-0.8.4-1.patch - webapp_src_prepare -} - -src_compile() { - if use math; then - einfo "Compiling math support" - cd math || die - if ! use ocamlopt; then - sed -e "s/ocamlopt/ocamlc/" \ - -e "s/cmxa/cma/" \ - -e "s/cmx/cmo/g" -i Makefile || die - fi - emake - else - einfo "Math support not enabled. Skipping." - fi - - # TODO: 1. think about includes/zhtable/ support - # 2. generate docs (?): echo '0' | php mwdocgen.php + epatch "${DISTDIR}"/mediawiki-1.18.1-restrict-0.8.5.patch + webapp_src_prepare } src_install() { webapp_src_preinst - # First we install math, docs and then copy everything left into htdocs dir + # First we install docs and then copy everything left into htdocs dir # to avoid bugs like #236411. - # If we've enabled math USE-flag, install math support. # We ensure the directories are prepared for writing. The post- # install instructions guide the user to enable the feature. - if use math; then - einfo "Installing math support" - exeinto "${MY_HTDOCSDIR}"/math - doexe math/texvc - - docinto math - dodoc math/{README,TODO} - docinto "" - - # Working directories. Server writeable. - dodir "${MY_HTDOCSDIR}"/images/math - webapp_serverowned "${MY_HTDOCSDIR}"/images/math - dodir "${MY_HTDOCSDIR}"/images/tmp - webapp_serverowned "${MY_HTDOCSDIR}"/images/tmp - fi - - local DOCS="FAQ HISTORY INSTALL README RELEASE-NOTES-1.18 UPGRADE" + 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 math t docs + rm -rf ${DOCS} COPYING tests docs find . -name Makefile -delete # and install insinto "${MY_HTDOCSDIR}" @@ -98,7 +57,7 @@ src_install() { # If imagemagick is enabled then setup for image upload. # We ensure the directory is prepared for writing. - if use imagemagick; then + if use imagemagick ; then webapp_serverowned "${MY_HTDOCSDIR}"/images fi @@ -108,19 +67,20 @@ src_install() { } pkg_preinst() { - prev_instal="false" - if has_version ${CATEGORY}/${PN}; then - prev_instal="true" + prev_install="false" + if has_version ${CATEGORY}/${PN} ; then + prev_install="true" fi } pkg_postinst() { webapp_pkg_postinst - if ${prev_instal}; then + + 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.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."