incorporate thoughts from bug #110977

Package-Manager: portage-2.0.53_rc7

diff --git a/www-apps/mediawiki/ChangeLog b/www-apps/mediawiki/ChangeLog
index a4c459fe6a718f50738d742ee93d430066dd0237..6a80d6626437cfeb5df763006531f687fc649dea 100644 (file)
--- a/www-apps/mediawiki/ChangeLog
+++ b/www-apps/mediawiki/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/mediawiki
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.39 2005/10/26 16:38:06 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.40 2005/10/31 23:21:25 trapni Exp $
+
+*mediawiki-1.5.1-r1 (31 Oct 2005)
+
+  31 Oct 2005; Christian Parpart <trapni@gentoo.org>
+  +mediawiki-1.5.1-r1.ebuild:
+  incorporate thoughts from bug #110977
 
   26 Oct 2005; Christian Parpart <trapni@gentoo.org>
   -mediawiki-1.5.0_rc2.ebuild, -mediawiki-1.5.0_rc3.ebuild,

diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index 6a512d8c12dcd407ad910cc1b60b6d81096a9a89..26779b0bb09039e3fe45f6ed3f926d1abb0fe708 100644 (file)
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1,4 +1,4 @@
-MD5 42d4b75f4c4552a95cb1e4db4a9cee9b ChangeLog 6659
+MD5 613a54aa4134fd290337957310f5c642 ChangeLog 6818
 MD5 6bbb8b1b565c4c501fa6551f85956d95 files/digest-mediawiki-1.3.13 69
 MD5 b290cd8df8d7bb2f6c601b5118ab1b3d files/digest-mediawiki-1.3.14 69
 MD5 7258757309ee4bf1c48769dcbfba8737 files/digest-mediawiki-1.3.15 69
@@ -13,6 +13,7 @@ MD5 fa7f17c613d569b12a8fc159c200119f files/digest-mediawiki-1.4.9 68
 MD5 fa7f17c613d569b12a8fc159c200119f files/digest-mediawiki-1.4.9-r1 68
 MD5 e7126e6e9d80398d7f39e6f2137b82f9 files/digest-mediawiki-1.5.0 68
 MD5 af48e06f47f3fca4b504d62041561922 files/digest-mediawiki-1.5.1 68
+MD5 af48e06f47f3fca4b504d62041561922 files/digest-mediawiki-1.5.1-r1 68
 MD5 7ec90d807694699cb90d9a56ec2ff67b files/postinstall-1.4-en.txt 1843
 MD5 85f32b5fca9afd6479cdcea022c096f2 files/postinstall-en.txt 1731
 MD5 1ecb081f1c270870be038f4bf733f298 mediawiki-1.3.13.ebuild 2899
@@ -28,5 +29,6 @@ MD5 4a5dbf7502c5e1c63b49ca91f378d5d4 mediawiki-1.4.8.ebuild 2788
 MD5 387803dfbebedc5a239cb73beb1c6901 mediawiki-1.4.9-r1.ebuild 2790
 MD5 3219b106dec605bb1d275a0dc4ec1e3c mediawiki-1.4.9.ebuild 2788
 MD5 4e7b0633ddae335dd5cf446016de24d8 mediawiki-1.5.0.ebuild 2936
+MD5 b9bccdf8f21072ba15085470c04a3b50 mediawiki-1.5.1-r1.ebuild 2933
 MD5 c4f2cd2731968301ae318465664bacc7 mediawiki-1.5.1.ebuild 2936
 MD5 4ce25f8911fa68ab85e31b0953266511 metadata.xml 226

diff --git a/www-apps/mediawiki/files/digest-mediawiki-1.5.1-r1 b/www-apps/mediawiki/files/digest-mediawiki-1.5.1-r1
new file mode 100644 (file)
index 0000000..edaa330
--- /dev/null
+++ b/www-apps/mediawiki/files/digest-mediawiki-1.5.1-r1
@@ -0,0 +1 @@
+MD5 f2030d3302a899f4e4f2e6d9f3842067 mediawiki-1.5.1.tar.gz 2292603

diff --git a/www-apps/mediawiki/mediawiki-1.5.1-r1.ebuild b/www-apps/mediawiki/mediawiki-1.5.1-r1.ebuild
new file mode 100644 (file)
index 0000000..d8f9af6
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.5.1-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.5.1-r1.ebuild,v 1.1 2005/10/31 23:21:25 trapni Exp $
+
+inherit webapp depend.php
+
+DESCRIPTION="The MediaWiki wiki web application (as used on wikipedia.org)"
+HOMEPAGE="http://www.mediawiki.org"
+SRC_URI="mirror://sourceforge/wikipedia/${P/.0_/}.tar.gz"
+RESTRICT="nomirror"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="imagemagick math"
+
+S="${WORKDIR}/${P/.0_/}"
+
+DEPEND="math? ( >=dev-lang/ocaml-3.0.6 )"
+
+RDEPEND="
+               >=dev-db/mysql-4
+               math? (
+                       virtual/tetex
+                       virtual/ghostscript
+                       media-gfx/imagemagick
+               )
+               imagemagick? (
+                       media-gfx/imagemagick
+               )
+"
+
+need_php
+
+pkg_setup() {
+       webapp_pkg_setup
+       require_php_with_use pcre
+       require_gd
+}
+
+src_compile() {
+       if use math; then
+               einfo "Compiling math support"
+               cd math || die
+               emake || die
+       else
+               einfo "No math support enabled. Skipping."
+       fi
+
+       # TODO: think about includes/zhtable/ support
+}
+
+src_install() {
+       webapp_src_preinst
+
+       # copy the app's main files excluding math support, docs, and tests
+       local DIRS="
+               config
+               extensions
+               images
+               includes
+               includes/normal
+               includes/templates
+               includes/zhtable
+               languages
+               maintenance
+               maintenance/archives
+               maintenance/postgresql
+               maintenance/storage
+               skins
+               skins/amethyst
+               skins/chick
+               skins/common
+               skins/common/images
+               skins/common/images/icons
+               skins/disabled
+               skins/monobook
+               skins/myskin
+               skins/simple
+       "
+       insinto ${MY_HTDOCSDIR}
+       doins *.php *.inc *.phtml
+       for DIR in ${DIRS}; do
+               dodir ${MY_HTDOCSDIR}/${DIR}
+               insinto ${MY_HTDOCSDIR}/${DIR}
+               doins ${DIR}/*
+               test -f ${DIR}/.htaccess && doins ${DIR}/.htaccess
+       done
+
+       # installing some docs
+       local DOCS="AdminSettings.sample COPYING FAQ HISTORY INSTALL README RELEASE-NOTES UPGRADE"
+       for DOC in ${DOCS}; do
+               dodoc "${DOC}"
+               rm -f "${DOC}"
+       done
+       dodoc docs/*.txt
+       rm -f docs/*.txt
+
+       docinto php-memcached
+       dodoc docs/php-memcached/*
+
+       # If imagemagick is enabled then setup for image upload.
+       # We ensure the directory is prepared for writing.  The post-
+       # install instructions guide the user to enable the feature.
+       if use imagemagick; then
+               webapp_serverowned ${MY_HTDOCSDIR}/images
+       fi
+
+       # 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"
+               dodir ${MY_HTDOCSDIR}/math
+               exeinto ${MY_HTDOCSDIR}/math
+               doexe math/texvc
+
+               # Docs
+               docinto math
+               dodoc math/README math/TODO
+
+               # 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
+
+       webapp_postinst_txt en ${FILESDIR}/postinstall-1.4-en.txt
+       webapp_src_install
+}