Fixed problems with PEAR/Date for dotproject.

Package-Manager: portage-2.1.11.31/cvs/Linux i686

5 files changed, 59 insertions, 56 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/Manifest b/www-apps/dotproject/Manifest
index 7e4fcfab20a8..ab30b3b07ea6 100644
--- a/www-apps/dotproject/Manifest
+++ b/www-apps/dotproject/Manifest
@@ -1,8 +1,6 @@
+AUX dotproject-2.1.7-pear-date.patch 1755 SHA256 3880c324cc829c5f47bcd04c2a8e6d86ddde3c6ecbd4eb162a5aa4af50d9e7b3 SHA512 fca1ffba1bd9df2b49b1e8fd129c807bfaca1f5c847b862fe5b8b159f243e116d7e21f5445c6383d0ac0bfd6e5ed480da10c5c78c5b10f62862f759c8078446b WHIRLPOOL d20b216fb610914c0a5292a68be108234070ffcbc2b6a564d83afd78cd1ca926feeafaecc834a75e62dca6c8c44e9c82b6f358dbbe574448016aae1bfa5c1609
 AUX install-en.txt 609 SHA256 d549f68d108393e1f21f463dabbc82d28844243bf16800bbd8b73fb5d3a2ab41 SHA512 ad00eb64e70702f032f2f0c8f17daf8263659982d24b554e18c70a59e2dbbcdb14f36f3f245faf36e1ec36e3676954975d00c4f9256ddc2b7bf1899e77c961dc WHIRLPOOL fb0bb637205adce6ec47c0fed24e1ebc900dc3cccb0390d5bdb3131886ac4b91fab4da7ac894ac11d248d9c9ca80690ba7f09aab0b85edfef6b47705cf32f95a
-DIST dotproject-2.1.2-r5791_5840.patch.bz2 65904 SHA256 75188142873a1298f6fdf3257a02a05106d289497ba43518e221a5b07d2388e3
-DIST dotproject-2.1.2.tar.gz 3592472 SHA256 e8c0f6707397aaa7a8d8030da7d0784a8430797a9d833be3f533ae1340422bb6
 DIST dotproject-2.1.7.tar.gz 4528969 SHA256 1c55e2bfa50f543c4f6fb877870fa99ffe2abb3971aa8ab53c03b25a578a9a74 SHA512 887637d8b66096ca0313dd257de44f2afef587c795cb8009861698f799db4e09677f6cd7e5ee57d3655e81219e25257c379deafac77003bf7e6f82e70eef8f58 WHIRLPOOL ee158b755338e44148913765c58becca1394f1e0bd6218be7636949c64db26f9dfa0ae219d1aee77158e31d72290c68681146b44538bed79ae538bf48076a59e
-EBUILD dotproject-2.1.2-r1.ebuild 1114 SHA256 16da1144e007acaa10ddf62a6b376293d285c387692f4f5f333d18d33e54c82c SHA512 b53867d0379d5add19ab8f53a4df82af5146fcba7f2e39c92ac671d276eeabf49a71e59677d1d2dce0fc57ec85880621dd48ce5bd6e7332b628278a05def0c5a WHIRLPOOL b8853b88cd99021caab510f4e11d4772c2930d4ee21b9f4df6780dc86743ee8c56dbcc5a60e8b05db7e7d927e0454cd0601d5317c5f0a043f4b42158ee6425ad
-EBUILD dotproject-2.1.7.ebuild 980 SHA256 0c13454991f1321b55a5a8d1aaf3c5461aeed926d6b81f7c49719acc95264719 SHA512 85392b0ad5e828d82e637fcdda405cef642d8101745ac33f3ef19dd1949f25d62c91f6001e7e5d9b8990742852c41c248f0c4d1797317fd2910120f4cc5de822 WHIRLPOOL e4d3bfb38f32e8ada47c0c0afe160fd31f13dda9ed1283c9bfda16be3267a29ca1fcd45e0230004ce7ff46531d509c2782e451f522d9677de37fbe88e272c42c
-MISC ChangeLog 3736 SHA256 335dc2eaa74874bf3be849b582cb3dadd4f98829020c62bd49d1a9568075c0ed SHA512 09e16de9751275abb15c6afc82a2a9543fde0905f380a678dd8d7e5f7364af648c512e18bd64293adfd423415600dfc29dd7eae81259f80d5e0f5994c5634b3f WHIRLPOOL 042a2cc3b6cd2f903f6412c5163a99b83714f57cb4fb8644376037248fa8f2db1c3e448bbdbcd2408579a857d470c885fef455022b09cd6aa9af0814bcc46435
+EBUILD dotproject-2.1.7-r1.ebuild 1099 SHA256 9c02f19096e0fe49f8d41962d5aaaaaebc9f2fcb00004eeb7d342badfcf9f83b SHA512 a28af2460023f4487350d395d5a8d59f27eda4864013a309a36f1d77bf3f1569ee19e4ee643111063f3f9ed256be73c85dafd59302110463f0cc4fa34a8eae30 WHIRLPOOL 5848f52f492e0e081abd797b08a96dc1b61cd9298e2b8b43e2f35fde7388f047294401fde11be35cc889635a91192e33648f15166696831456877ae1920941a4
+MISC ChangeLog 4016 SHA256 e85264adb1bbe808b1d570c46193da556407bdbfbb1a3a045b283f0f0b6abfaf SHA512 aaa5f1f471e62f53cad3a5ab9e7aaa04b1a096f6fb1e413fb8b53368dcb162e9da615ca24c84d3316679f3b1e395f790135f7812444c3df6fcf606fed47fb88a WHIRLPOOL dfbd4e9931915fd3f9e68ff4518dfd543041e465837a2e26b4f63a1a5539dcdbf17b4ce8a6ac4134123288283349ba8eae1eb08335123ed9e231b71f5176a9e1
 MISC metadata.xml 162 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0 SHA512 550d0f517601255e5c9b120a03f1dad37a1a75bdaadad486ddbd2380a7f0dd884970400574455d34d3ba6e800d9fd21467dfb7f89ba27a0aa8a65e7a265534e3 WHIRLPOOL d50adcb067d0290aa7dfe5aebd0e8abf4939ece7afbf284920d08f2bf04f9306f0062a78cacb7572a12735ac41545440fcf138beda81cc53774950bdde495dcb
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'));