Fixed problems with PEAR/Date for dotproject.

(Portage version: 2.1.11.31/cvs/Linux i686, unsigned Manifest commit)

4 files changed, 56 insertions, 51 deletions

diff --git a/www-apps/dotproject/ChangeLog b/www-apps/dotproject/ChangeLog
index 68173271af04..d596c3052eac 100644
--- a/www-apps/dotproject/ChangeLog
+++ b/www-apps/dotproject/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/dotproject
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dotproject/ChangeLog,v 1.11 2013/01/02 22:00:52 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dotproject/ChangeLog,v 1.12 2013/01/03 12:41:25 elvanor Exp $
+
+*dotproject-2.1.7-r1 (03 Jan 2013)
+
+  03 Jan 2013; <elvanor@gentoo.org> -dotproject-2.1.2-r1.ebuild,
+  +dotproject-2.1.7-r1.ebuild, +files/dotproject-2.1.7-pear-date.patch:
+  Added a patch to work with system PEAR/Date. Removed old ebuild no longer
+  compatible with stable PHP.
 
 *dotproject-2.1.7 (02 Jan 2013)
 
diff --git a/www-apps/dotproject/dotproject-2.1.2-r1.ebuild b/www-apps/dotproject/dotproject-2.1.2-r1.ebuild
deleted file mode 100644
index f8bc0819d2c4..000000000000
--- a/www-apps/dotproject/dotproject-2.1.2-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dotproject/dotproject-2.1.2-r1.ebuild,v 1.3 2010/02/10 22:35:23 ssuominen Exp $
-
-EAPI=2
-inherit eutils webapp depend.php
-
-DESCRIPTION="dotProject is a PHP web-based project management framework"
-HOMEPAGE="http://www.dotproject.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://gentoo/dotproject-2.1.2-r5791_5840.patch.bz2"
-
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=app-text/poppler-0.12.3-r3[utils]"
-
-need_httpd_cgi
-need_php_httpd
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${WORKDIR}/${P}-r5791_5840.patch"
-}
-
-src_install () {
-	webapp_src_preinst
-
-	dodoc ChangeLog README
-	rm -f ChangeLog README
-
-	mv includes/config{-dist,}.php
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/includes/config.php
-	webapp_serverowned "${MY_HTDOCSDIR}"/files{,/temp}
-	webapp_serverowned "${MY_HTDOCSDIR}"/locales/en
-
-	webapp_postinst_txt en "${FILESDIR}"/install-en.txt
-	webapp_src_install
-}
diff --git a/www-apps/dotproject/dotproject-2.1.7.ebuild b/www-apps/dotproject/dotproject-2.1.7-r1.ebuild
index e10abe154ef1..67ee4b48e581 100644
--- a/www-apps/dotproject/dotproject-2.1.7.ebuild
+++ b/www-apps/dotproject/dotproject-2.1.7-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dotproject/dotproject-2.1.7.ebuild,v 1.1 2013/01/02 22:00:52 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dotproject/dotproject-2.1.7-r1.ebuild,v 1.1 2013/01/03 12:41:25 elvanor Exp $
 
-EAPI=2
+EAPI="5"
 inherit eutils webapp depend.php
 
 DESCRIPTION="dotProject is a PHP web-based project management framework"
@@ -14,18 +14,23 @@ LICENSE="GPL-2"
 IUSE=""
 
 DEPEND=""
-RDEPEND="app-text/poppler[utils]"
+RDEPEND="app-text/poppler[utils]
+	dev-php/PEAR-Date"
 
 need_httpd_cgi
 need_php_httpd
 
 S=${WORKDIR}/${PN}
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-pear-date.patch"
+}
+
 src_install () {
 	webapp_src_preinst
 
 	dodoc ChangeLog README
-	rm -f ChangeLog README
+	rm -rf ChangeLog README lib/PEAR/Date.php lib/PEAR/Date
 
 	mv includes/config{-dist,}.php
 
diff --git a/www-apps/dotproject/files/dotproject-2.1.7-pear-date.patch b/www-apps/dotproject/files/dotproject-2.1.7-pear-date.patch
new file mode 100644
index 000000000000..a907589f00e2
--- /dev/null
+++ b/www-apps/dotproject/files/dotproject-2.1.7-pear-date.patch
@@ -0,0 +1,39 @@
+diff -u -r dotproject/classes/date.class.php dotproject-patched/classes/date.class.php
+--- dotproject/classes/date.class.php	2011-03-10 06:11:25.000000000 +0100
++++ dotproject-patched/classes/date.class.php	2013-01-03 12:35:36.598020904 +0100
+@@ -8,7 +8,8 @@
+ }
+ 
+ 
+-require_once $AppUI->getLibraryClass('PEAR/Date');
++#require_once $AppUI->getLibraryClass('PEAR/Date');
++require_once 'Date.php';
+ 
+ define('FMT_DATEISO', '%Y%m%dT%H%M%S');
+ define('FMT_DATELDAP', '%Y%m%d%H%M%SZ');
+diff -u -r dotproject/modules/calendar/calendar.class.php dotproject-patched/modules/calendar/calendar.class.php
+--- dotproject/modules/calendar/calendar.class.php	2012-06-19 11:05:19.000000000 +0200
++++ dotproject-patched/modules/calendar/calendar.class.php	2013-01-03 12:36:10.898019883 +0100
+@@ -7,7 +7,8 @@
+ ## Calendar classes
+ ##
+ 
+-require_once ($AppUI->getLibraryClass('PEAR/Date'));
++#require_once ($AppUI->getLibraryClass('PEAR/Date'));
++require_once 'Date.php';
+ require_once ($AppUI->getSystemClass ('dp'));
+ require_once $AppUI->getSystemClass('libmail');
+ require_once $AppUI->getSystemClass('date');
+diff -u -r dotproject/modules/projects/projects.class.php dotproject-patched/modules/projects/projects.class.php
+--- dotproject/modules/projects/projects.class.php	2011-06-20 13:07:49.000000000 +0200
++++ dotproject-patched/modules/projects/projects.class.php	2013-01-03 12:36:12.709019829 +0100
+@@ -10,7 +10,8 @@
+ */
+ 
+ require_once ($AppUI->getSystemClass ('dp'));
+-require_once ($AppUI->getLibraryClass('PEAR/Date'));
++#require_once ($AppUI->getLibraryClass('PEAR/Date'));
++require_once 'Date.php';
+ require_once ($AppUI->getModuleClass('tasks'));
+ require_once ($AppUI->getModuleClass('companies'));
+ require_once ($AppUI->getModuleClass('departments'));