Version bump, bug #311391, thank David Hicks and useful comments on the mailing list.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 29 insertions, 61 deletions

diff --git a/www-apps/mantisbt/ChangeLog b/www-apps/mantisbt/ChangeLog
index 1e80ad7637ca..c4dec8bfb39e 100644
--- a/www-apps/mantisbt/ChangeLog
+++ b/www-apps/mantisbt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/mantisbt
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mantisbt/ChangeLog,v 1.84 2009/08/09 13:26:11 nixnut Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mantisbt/ChangeLog,v 1.85 2010/05/11 10:07:44 pva Exp $
+
+*mantisbt-1.2.1 (11 May 2010)
+
+  11 May 2010; Peter Volkov <pva@gentoo.org> -mantisbt-1.1.6.ebuild,
+  -mantisbt-1.1.7.ebuild, +mantisbt-1.2.1.ebuild:
+  Version bump, bug #311391, thank David Hicks and useful comments on the
+  mailing list.
 
   09 Aug 2009; nixnut <nixnut@gentoo.org> mantisbt-1.1.8.ebuild:
   ppc stable #278435
diff --git a/www-apps/mantisbt/mantisbt-1.1.7.ebuild b/www-apps/mantisbt/mantisbt-1.1.7.ebuild
deleted file mode 100644
index a86bf025905d..000000000000
--- a/www-apps/mantisbt/mantisbt-1.1.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mantisbt/mantisbt-1.1.7.ebuild,v 1.1 2009/04/22 17:02:21 pva Exp $
-
-inherit eutils webapp depend.php
-
-DESCRIPTION="PHP/MySQL/Web based bugtracking system"
-HOMEPAGE="http://www.mantisbt.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	virtual/httpd-php
-	virtual/httpd-cgi
-	dev-php/adodb"
-
-pkg_setup() {
-	webapp_pkg_setup
-	has_php
-	require_php_with_use pcre
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	rm -r "${S}/core/adodb/" # We use external adodb
-}
-
-src_install() {
-	webapp_src_preinst
-	rm doc/{LICENSE,INSTALL}
-	dodoc doc/*
-
-	rm -rf doc packages
-	mv config_inc.php.sample config_inc.php
-	cp -R . "${D}/${MY_HTDOCSDIR}"
-
-	webapp_configfile "${MY_HTDOCSDIR}/config_inc.php"
-	webapp_postinst_txt en "${FILESDIR}/postinstall-en-1.0.0.txt"
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-	elog "Note, that this branch of mantisbt does not work with PostgreSQL."
-	elog "If really need mantisbt to work with PostgreSQL you'll have to"
-	elog "install it manually from upstream svn repository:"
-	elog "https://sourceforge.net/svn/?group_id=14963"
-}
diff --git a/www-apps/mantisbt/mantisbt-1.1.6.ebuild b/www-apps/mantisbt/mantisbt-1.2.1.ebuild
index 879a76dad5db..fd8b862cf2c3 100644
--- a/www-apps/mantisbt/mantisbt-1.1.6.ebuild
+++ b/www-apps/mantisbt/mantisbt-1.2.1.ebuild
@@ -1,21 +1,24 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mantisbt/mantisbt-1.1.6.ebuild,v 1.3 2009/01/04 17:31:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mantisbt/mantisbt-1.2.1.ebuild,v 1.1 2010/05/11 10:07:44 pva Exp $
 
 inherit eutils webapp depend.php
 
 DESCRIPTION="PHP/MySQL/Web based bugtracking system"
 HOMEPAGE="http://www.mantisbt.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+mirror://gentoo/${P}-git20100511.patch.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
 	virtual/httpd-php
 	virtual/httpd-cgi
-	dev-php/adodb"
+	dev-php5/ezc-Base
+	dev-php5/ezc-Graph
+	>=dev-php/adodb-5.10"
 
 pkg_setup() {
 	webapp_pkg_setup
@@ -26,13 +29,23 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	rm -r "${S}/core/adodb/" # We use external adodb
+
+	epatch "${WORKDIR}/${P}-git20100511.patch"
+	# Drop external libraries
+	rm -r "${S}/library/adodb/"
+	rm -r "${S}/library/ezc/"{Base,Graph}
+	sed -e 's:ezc/Base/src/base.php:ezc/Base/base.php:' \
+		-i "${S}"/plugins/MantisGraph/{core/graph_api.php,pages/summary_graph_cumulative_bydate2.php} \
+			|| die
+	# Fix incorrect filename
+	sed -e 's:config_default_inc.php:config_defaults_inc.php:' \
+		-i "${S}/lang/strings_russian.txt" || die
 }
 
 src_install() {
 	webapp_src_preinst
 	rm doc/{LICENSE,INSTALL}
-	dodoc doc/*
+	dodoc doc/{CREDITS,CUSTOMIZATION,RELEASE} doc/en/*
 
 	rm -rf doc packages
 	mv config_inc.php.sample config_inc.php