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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 33 insertions, 66 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/Manifest b/www-apps/mantisbt/Manifest
index 2b7f6fd10b65..33ac181eac5d 100644
--- a/www-apps/mantisbt/Manifest
+++ b/www-apps/mantisbt/Manifest
@@ -1,9 +1,8 @@
 AUX postinstall-en-1.0.0.txt 640 RMD160 1e0a077db936ab8c2a6bf06c9091d4b5194b0b9c SHA1 1fb4a3c4e32b7ddca4b37017e8c8101d8d0c83c7 SHA256 af60f6f6be915164f420f5e9ae04fa18d8bf85e73a9a59668ba4a6b7ba41900d
-DIST mantisbt-1.1.6.tar.gz 2475290 RMD160 027f64080d1a9892511683a2f40e466f168cfb57 SHA1 38e457c7ea90fa049f9fb4b544baaff23325b8c9 SHA256 1ba69b2390df2e42f7ac7e92af8367ac9c09de2f0e76f2702f2e87933fbecae1
-DIST mantisbt-1.1.7.tar.gz 2417784 RMD160 6d13570e7e99195aa869419149b513be696b1d3a SHA1 f22948ddeb76b85a3fb30072b937b1836ca16441 SHA256 4a1a20941109c3aaca1ae3e3e1ab4931d789e362448de6a00feb29d184839291
 DIST mantisbt-1.1.8.tar.gz 2428447 RMD160 a455bafa1cdba82e6e848840ef654441a38ecf1a SHA1 98f8c6169d994f413a58cdc711792bd0c806f078 SHA256 fbbf3f8a2b7452e84d8e4eea5ea39f1cb34e7d162cd572d9aa6b82562c64f3ed
-EBUILD mantisbt-1.1.6.ebuild 1277 RMD160 03ddd9091d973a30691b7b459ccabc67c9f1d28f SHA1 b3986cfd8ae33f776b137f0cc9503aaa8f8c5d53 SHA256 cf0c16f95d1c52c1d0876b367d2375a5729a9eaf7219924b453af43a9511c447
-EBUILD mantisbt-1.1.7.ebuild 1277 RMD160 c78a5bcc2c7668cec1256531678e2890a8eb0487 SHA1 d2f071364f478093230bdb9c2def19c4930cdba9 SHA256 1ca20a739d80f7a74e2851ecf11a293c9eb3a9560d40975736db77a58e96f0df
+DIST mantisbt-1.2.1-git20100511.patch.bz2 53215 RMD160 ce9a0cc73592d049e292bb9f71e831ec7afa0d80 SHA1 e742ade3267f9621e8b7d640a944aae8025b5b84 SHA256 1d8afb5b3019a0fa689ae924ab3fc815e409f48f2c2f9990d6e7f00f8b506525
+DIST mantisbt-1.2.1.tar.gz 3193962 RMD160 a76fec872297382cf841838169f3b42e3019cb30 SHA1 abf97cb1237d79c49256de801491355d6edbf2fe SHA256 6f690d4945e6a891bde6f14070bbdd6975590f1bc651c76e9c4742f248d70424
 EBUILD mantisbt-1.1.8.ebuild 1277 RMD160 6cc6ae6a3cf5062c17353eba42cd76551c03f997 SHA1 65efa47b98393cfa8bd20c04049116b6607aa9c7 SHA256 e12f8365ea1d25646c79e6779bacda2775fba3e26753f04147334dac1e31b181
-MISC ChangeLog 12933 RMD160 b88ae266fde3e7786307b7d812e7bee42c0a1e30 SHA1 cc98e24c9088fdcafb19bb4cdd5949337f52d6d8 SHA256 a157b615fff502bc399aa3ea2f935f97474dd721c4704ed5744622ae092919de
+EBUILD mantisbt-1.2.1.ebuild 1785 RMD160 a226aa2d53551d59ad11a0814f17c29325cd7e96 SHA1 c2edbbeeb817b531158ee97a751a6875d8435fed SHA256 99bd295dd258ae98a99ce29a623e52217394b29feb6f0537eeeb1a8b0fe560a2
+MISC ChangeLog 13171 RMD160 b7199426b7013dbf2106026483024f2b9d24217e SHA1 a38f0a328efb44a81ee4bf29ace4d80b01b31c82 SHA256 f9176b6d681ad04c4145bb44a140b113680a2c75f92e2a750883cab2d41be1ef
 MISC metadata.xml 246 RMD160 7bde3c3aeda481e076adaab65b51a338aee24fb2 SHA1 9d36ce4b3731cd84f9451c529c737544dc63e66d SHA256 675aa3e54d27d05c15ac139906703b5f0886742fd1ce1468c964ad57ab51085b
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