www-apps/phabricator-extensions-Sprint: Version bump

Package-Manager: portage-2.2.28

6 files changed, 7 insertions, 172 deletions

diff --git a/metadata/md5-cache/www-apps/phabricator-extensions-Sprint-20160302 b/metadata/md5-cache/www-apps/phabricator-extensions-Sprint-20160709
index 117f218e..ffbb2fa1 100644
--- a/metadata/md5-cache/www-apps/phabricator-extensions-Sprint-20160302
+++ b/metadata/md5-cache/www-apps/phabricator-extensions-Sprint-20160709
@@ -9,4 +9,4 @@ LICENSE=GPL-3
 RDEPEND=dev-php/libphutil www-apps/phabricator
 SLOT=0
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	git-r3	00f60a84fc7b499c99edfe99caea9f95	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
-_md5_=2390e7f803cf48096da676506015279a
+_md5_=84d1b44718ab478b1d773a74c2869c23
diff --git a/metadata/md5-cache/www-apps/phabricator-extensions-Sprint-9999 b/metadata/md5-cache/www-apps/phabricator-extensions-Sprint-9999
index 95914cc0..c970ba4e 100644
--- a/metadata/md5-cache/www-apps/phabricator-extensions-Sprint-9999
+++ b/metadata/md5-cache/www-apps/phabricator-extensions-Sprint-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-3
 RDEPEND=dev-php/libphutil www-apps/phabricator
 SLOT=0
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	git-r3	00f60a84fc7b499c99edfe99caea9f95	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
-_md5_=986651fe0d65feaa3489aac279024466
+_md5_=8e317ba4f3959be80a2aae73dbc52531
diff --git a/www-apps/phabricator-extensions-Sprint/Manifest b/www-apps/phabricator-extensions-Sprint/Manifest
index b42ccd7e..33349cf2 100644
--- a/www-apps/phabricator-extensions-Sprint/Manifest
+++ b/www-apps/phabricator-extensions-Sprint/Manifest
@@ -1,4 +1,3 @@
-AUX 20160302-updates-to-upstream-46fb646f92b12a0031105d9fc9d67df6.patch 6522 SHA256 e6a2abdb17f27ec3accc38f799b1e87fe3b40f4c3376903c4f36aff1d824b452 WHIRLPOOL 0b9def9e7843a26b8f8ef598755cb7cb25595b0f6dd3e15d3fbe585d67bd90422cf2a99054bde6e2596ed07e8c152d2cc808d1ea597769d0239686d2349b7586
-EBUILD phabricator-extensions-Sprint-20160302.ebuild 2029 SHA256 5be2e8fd89b336dd71b2c06afa505643a4017380c404f86834ddd93c45cc3b8c WHIRLPOOL 2e4013291b829fa4f48d56d9ca188face1d28487faabb6292a49a9ed75ac937369e1f8d8983ddac1a6ea89918c22f8dbfcce9b2fde5ebf965e62790e582ea902
-EBUILD phabricator-extensions-Sprint-9999.ebuild 1662 SHA256 7a9f542d7e689ff796e2c008be22ed96d7f39deb1a4acafcda09eaee10b35fc6 WHIRLPOOL 5025382a3a49b1bf623ff9a073f351aa6e5ebe397ad7123e8eed5a283de9fab7e0849ddcd675e0b76fe9dc92e3ed84850ca5ce9a86fd2da285669e4cda68ec23
+EBUILD phabricator-extensions-Sprint-20160709.ebuild 1941 SHA256 73cea96c045b471fc1f553a3b9c2fd8d3814db31ed452effc7d421a20761597a WHIRLPOOL 95af7fb213c12119320d77c75cbd2cd1746d9b3c8f4bde5db19eaf0ef06137c0b2c96f796cd169d8f79d5c5b0f53a1932cb33aa0c8556364879b9b285f81b17f
+EBUILD phabricator-extensions-Sprint-9999.ebuild 1662 SHA256 acad9c5754bf51f6da842ec607cdf8b3a56919ea1244421325e5eb21ff3d89b3 WHIRLPOOL c82ac889878245c6987338010518c2ed1f9e760eee23be5d0ba428f18114ff9a52cbd7f1526b02441cbe675331a739ada86bc5d7707677157d9d2dfac9d0ea8c
 MISC metadata.xml 256 SHA256 6ca43960767ca28661abf97c85263db77fe7643902be2ce777c61aa688d8ea2d WHIRLPOOL cef8582829111be09e651eb819e6d1ea59c9c4386b842169ccd46a14c8e3ccb090486fecd61c5fd4aa47998cacc69cdc1fb5ca6bb6325a4da1ebfd0b6eebda7b
diff --git a/www-apps/phabricator-extensions-Sprint/files/20160302-updates-to-upstream-46fb646f92b12a0031105d9fc9d67df6.patch b/www-apps/phabricator-extensions-Sprint/files/20160302-updates-to-upstream-46fb646f92b12a0031105d9fc9d67df6.patch
deleted file mode 100644
index fd6da8fc..00000000
--- a/www-apps/phabricator-extensions-Sprint/files/20160302-updates-to-upstream-46fb646f92b12a0031105d9fc9d67df6.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From df6e9dee03e4dd0da551199df33b6d04bf096d32 Mon Sep 17 00:00:00 2001
-From: Christopher Johnson <christopher.johnson@wikimedia.de>
-Date: Mon, 11 Apr 2016 14:09:31 +0200
-Subject: [PATCH] updates to upstream 46fb646f92b12a0031105d9fc9d67df67f86dcd
- Bug:T132239
-
-Change-Id: Ie407f643af7553db4d55ce0353c7399e1ad2b7e5
----
- src/customfield/SprintBeginDateField.php |  4 +++
- src/storage/BoardDataProvider.php        |  9 ++---
- src/storage/SprintColumnTransaction.php  | 59 ++++++++++++++++++--------------
- src/view/burndown/SprintDataView.php     |  2 +-
- 4 files changed, 43 insertions(+), 31 deletions(-)
-
-diff --git a/src/customfield/SprintBeginDateField.php b/src/customfield/SprintBeginDateField.php
-index dcfe987..439d9f7 100644
---- a/src/customfield/SprintBeginDateField.php
-+++ b/src/customfield/SprintBeginDateField.php
-@@ -20,6 +20,10 @@ final class SprintBeginDateField extends SprintProjectCustomField {
-     return 'isdc:sprint:startdate';
-   }
- 
-+  public function getModernFieldKey() {
-+    return 'startdate';
-+  }
-+
-   public function getFieldName() {
-     return 'Sprint Start Date';
-   }
-diff --git a/src/storage/BoardDataProvider.php b/src/storage/BoardDataProvider.php
-index 3a3729e..5efe05e 100644
---- a/src/storage/BoardDataProvider.php
-+++ b/src/storage/BoardDataProvider.php
-@@ -168,7 +168,7 @@ final class BoardDataProvider {
-     $scope_phid = $this->project->getPHID();
-     $task_phids = mpull($this->tasks, 'getPHID');
-     $query = new ManiphestTransactionQuery();
--    $query->withTransactionTypes(array(ManiphestTransaction::TYPE_PROJECT_COLUMN));
-+    $query->withTransactionTypes(array(PhabricatorTransactions::TYPE_COLUMNS));
-     $query->withObjectPHIDs($task_phids);
-     $query->setViewer($this->viewer);
-     $col_xactions = $query->execute();
-@@ -176,9 +176,10 @@ final class BoardDataProvider {
-       $xaction_date = $xaction->getDateCreated();
-       if ($xaction_date >= $this->start && $xaction_date <= $this->end) {
-         $newval = $xaction->getNewValue();
--        if ($newval['projectPHID'] == $scope_phid) {
--            $xactions[] = $xaction;
--        }
-+          $newArr = call_user_func_array('array_merge', $newval);
-+              if ($newArr['boardPHID'] == $scope_phid) {
-+                  $xactions[] = $xaction;
-+              }
-       }
-     }
-     return $xactions;
-diff --git a/src/storage/SprintColumnTransaction.php b/src/storage/SprintColumnTransaction.php
-index cfbfa09..a5de31f 100644
---- a/src/storage/SprintColumnTransaction.php
-+++ b/src/storage/SprintColumnTransaction.php
-@@ -63,7 +63,7 @@ final class SprintColumnTransaction {
-             break;
-           case 'reopen':
-             $this->reopenedTasksToday($date, $dates);
--            $this->reopenedPointsToday($date, $points, $dates);
-+           // $this->reopenedPointsToday($date, $points, $dates);
-             break;
-         }
-       }
-@@ -91,24 +91,25 @@ final class SprintColumnTransaction {
-   }
- 
-   private function setXActionEventType($old_col_name, $new_col_name) {
--    $old_is_closed = ($old_col_name === null) ||
--        SprintConstants::TYPE_CLOSED_STATUS_COLUMN == $old_col_name;
-+    $old_is_closed = ($old_col_name = SprintConstants::TYPE_CLOSED_STATUS_COLUMN and $new_col_name != SprintConstants::TYPE_CLOSED_STATUS_COLUMN);
- 
-     if ($old_is_closed) {
-       return 'reopen';
--    } else {
-+    } else if ($new_col_name) {
-       switch ($new_col_name) {
--        case SprintConstants::TYPE_CLOSED_STATUS_COLUMN:
--          return 'close';
--        case SprintConstants::TYPE_REVIEW_STATUS_COLUMN:
--          return 'review';
--        case SprintConstants::TYPE_DOING_STATUS_COLUMN:
--          return 'doing';
--        case SprintConstants::TYPE_BACKLOG_STATUS_COLUMN:
--          return 'backlog';
--        default:
--          break;
-+          case SprintConstants::TYPE_CLOSED_STATUS_COLUMN:
-+              return 'close';
-+          case SprintConstants::TYPE_REVIEW_STATUS_COLUMN:
-+              return 'review';
-+          case SprintConstants::TYPE_DOING_STATUS_COLUMN:
-+              return 'doing';
-+          case SprintConstants::TYPE_BACKLOG_STATUS_COLUMN:
-+              return 'backlog';
-+          default:
-+              break;
-       }
-+    } else {
-+    return null;
-     }
-   }
- 
-@@ -118,22 +119,28 @@ final class SprintColumnTransaction {
-     $new_col_name = null;
-     $events = array();
-     foreach ($xactions as $xaction) {
--      $old_col_phid = idx($xaction->getOldValue(), 'columnPHIDs');
--      foreach ($old_col_phid as $phid) {
--        $old_col = $this->query->getColumnforPHID($phid);
--        foreach ($old_col as $obj) {
--          $old_col_name = $obj->getDisplayName();
-+      $oldval = $xaction->getOldValue();
-+      if (!empty($oldval)) {
-+        $newArr = call_user_func_array('array_merge', $oldval);
-+        $old_col_phid = idx($newArr, 'columnPHID');
-+        foreach ($old_col_phid as $phid) {
-+          $old_col = $this->query->getColumnforPHID($phid);
-+          foreach ($old_col as $obj) {
-+            $old_col_name = $obj->getDisplayName();
-+          }
-         }
-       }
--      $new_col_phid = idx($xaction->getNewValue(), 'columnPHIDs');
--      foreach ($new_col_phid as $phid) {
--        $new_col = $this->query->getColumnforPHID($phid);
--        foreach ($new_col as $obj) {
--          $new_col_name = $obj->getDisplayName();
--        }
-+      $newval = $xaction->getNewValue();
-+      if (!empty($newval)) {
-+        $newArr = call_user_func_array('array_merge', $newval);
-+        $new_col_phid = idx($newArr, 'columnPHID');
-+        $xaction_scope_phid = idx($newArr, 'boardPHID');
-+          $new_col = $this->query->getColumnforPHID($new_col_phid);
-+          foreach ($new_col as $obj) {
-+            $new_col_name = $obj->getDisplayName();
-+          }
-       }
-       $scope_phid = $this->project->getPHID();
--      $xaction_scope_phid = idx($xaction->getNewValue(), 'projectPHID');
-       if ($scope_phid == $xaction_scope_phid) {
-         $event_type = $this->setXActionEventType($old_col_name, $new_col_name);
-         if ($event_type !== null) {
-diff --git a/src/view/burndown/SprintDataView.php b/src/view/burndown/SprintDataView.php
-index 4b4b06d..67b1d37 100644
---- a/src/view/burndown/SprintDataView.php
-+++ b/src/view/burndown/SprintDataView.php
-@@ -19,7 +19,7 @@ final class SprintDataView extends SprintView {
-     return $this;
-   }
- 
--  public function setViewer($viewer) {
-+  public function setViewer(PhabricatorUser $viewer) {
-     $this->viewer = $viewer;
-     return $this;
-   }
diff --git a/www-apps/phabricator-extensions-Sprint/phabricator-extensions-Sprint-20160302.ebuild b/www-apps/phabricator-extensions-Sprint/phabricator-extensions-Sprint-20160709.ebuild
index 6366d32e..cffd0c53 100644
--- a/www-apps/phabricator-extensions-Sprint/phabricator-extensions-Sprint-20160302.ebuild
+++ b/www-apps/phabricator-extensions-Sprint/phabricator-extensions-Sprint-20160709.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -9,7 +9,7 @@ DESCRIPTION="Manage your tasks with Points in Phabricator"
 HOMEPAGE="https://gerrit.wikimedia.org/r/#/admin/projects/phabricator/extensions/Sprint"
 EGIT_REPO_URI="https://gerrit.wikimedia.org/r/phabricator/extensions/Sprint"
 EGIT_BRANCH="production"
-EGIT_COMMIT="release/2016-03-02/1"
+EGIT_COMMIT="release/2016-07-13/1"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -23,8 +23,6 @@ RDEPEND="dev-php/libphutil
 src_prepare() {
 	git log --format='%H %ct' -n 1 > "${S}/GIT_COMMIT_INFO"
 
-	epatch "${FILESDIR}/${PV}-updates-to-upstream-46fb646f92b12a0031105d9fc9d67df6.patch"
-
 	find -type f -name .gitignore -print0 \
 		| xargs -0 --no-run-if-empty -- \
 			rm
diff --git a/www-apps/phabricator-extensions-Sprint/phabricator-extensions-Sprint-9999.ebuild b/www-apps/phabricator-extensions-Sprint/phabricator-extensions-Sprint-9999.ebuild
index 8abee11b..f684a5b1 100644
--- a/www-apps/phabricator-extensions-Sprint/phabricator-extensions-Sprint-9999.ebuild
+++ b/www-apps/phabricator-extensions-Sprint/phabricator-extensions-Sprint-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$