www-apps/phabricator: Remove unnecessary patch

4 files changed, 3 insertions, 48 deletions

diff --git a/www-apps/phabricator/Manifest b/www-apps/phabricator/Manifest
index 90cdfd91..becbcdfb 100644
--- a/www-apps/phabricator/Manifest
+++ b/www-apps/phabricator/Manifest
@@ -1,11 +1,10 @@
-AUX 0001-Changed-add_user.php-to-create-users-with-unverified.patch 1246 SHA256 fe0a9bbdbecf40754e06569e0766781f2a8370c6ac2dd077f013bca98981deed WHIRLPOOL 25b50454516d1bc368c81efaeb3603052cb2524eced0330c7ad81e12588a79f8894edd6ba211508e94c206842e527ae4e86ad2760eb844175980462c479a4f09
-AUX 0002-Make-wiki-visible-to-all.patch 907 SHA256 8f145e199490c559b11865b90b694146bf2d6fa07dcdf50f34f91f44216f24c9 WHIRLPOOL b868cfd98f85eda609ec2c700b42ae1c1ec2724dba8b3bed1cc53dbbda862b294dbad9864cf95f6aab5668b15a17b6f39a25778250c38d602c28a540a7d70ad7
+AUX 0001-Make-wiki-visible-to-all.patch 907 SHA256 8f145e199490c559b11865b90b694146bf2d6fa07dcdf50f34f91f44216f24c9 WHIRLPOOL b868cfd98f85eda609ec2c700b42ae1c1ec2724dba8b3bed1cc53dbbda862b294dbad9864cf95f6aab5668b15a17b6f39a25778250c38d602c28a540a7d70ad7
 AUX aphlictd.confd 163 SHA256 553f18f54bcf75eada649e564fea7c4c610fd01ec93708bd246263405e7d5246 WHIRLPOOL 027e41cff147fbf7544ba72575fa21e12a66da7b5cd1bdf53a98b929b7c6127c25a997118e9cfea0e00379a7937eb52b051deb4256abb5bb5d6796a9d16138ad
 AUX aphlictd.initd 1049 SHA256 6f45d4e4d2d55b50b35b84c11c73628c067f5b7e4d6d88e148ebd00a1a1208cd WHIRLPOOL 2dcf7c230891e660f6dd3655ef0f04be74798f7fc98cc6191088d90ceeb7b6fe51d36ea016d625c18325f4b724a89f07b8e6c2bfd0aa6779946fe72b1702f95d
 AUX htaccess 475 SHA256 90b7245b7518f5b3e56bae9d574a530e3cd47808ef937bdc78ea4288eaff0c6a WHIRLPOOL fc9123f3d40affe53314a25c2649a5b2f47640131c9bc5a6dd0c55ac36e0a205f392b403fcbce93daffceaf427c7146b7a091115a8260c7551a3bfe8069ad88e
 AUX phd.confd 215 SHA256 80ddbf586f38cc600d06e524f7e85c3258bd563696fa2e41e1ea19268da8079b WHIRLPOOL 0f1a587c755994c410b62da6b897ca8684d584b9f01956359e078429fc7ec7642561dc3e3c306bbb24753e3a68ef5f088a5709706143b6154aa085ac2dfa52ad
 AUX phd.initd 2108 SHA256 8475c308320ce4d51d35cbea46df61628c9c1d64eb724955a38ed49e51690cda WHIRLPOOL 4c91fcce779d423fa0fa24e744675a7dfaa57d0fe2dd86792a2c27215fc014ca85b38695909f8f6c063308a10d53c499620d909ee29382aec8097c437857988e
 AUX webapp-hook 3866 SHA256 429b0dd02a50b61c71b340037687fbacd41fabaf399e6b078cdc80b7b035357e WHIRLPOOL 38395b7ba5d6ee06ccb724b12f0c2dd1192e3cc517e30eed1efbb9b4d4dcb06ab411aad0a004aa833e05f2552525f48e98e58d6915be2be4e633b7900705d831
-EBUILD phabricator-9999.ebuild 4447 SHA256 bdf13289c45393bb662a68a5b245709301c75827f6b862d8e25874b02834e3d6 WHIRLPOOL 71ffd697eabfacb9af315d37f7eabe3cbed0b58b45d839defc9828f4100794df0b77afa8d3e16ee68ecff4d772b1be86d0ea351db974bcea8d7085534c9b0784
+EBUILD phabricator-9999.ebuild 4361 SHA256 fb56697cc061aed300573a5ac58cb7c6778dcc8a1cc535afcdca30d1137e8cff WHIRLPOOL 0a084454f8aa19516cd5953d1a2e11f04c3766b4f5d182bf48a3cbe013b8c03fd5ce697004a0a5fae23b293b581f7ead3a33ff0a0e31ca7c59e285d3792994c2
 MISC ChangeLog 5510 SHA256 42a23aea75ba359a20d9e04761940e64d10528583f3e4a7547940be9d1957d8a WHIRLPOOL df70bb81aec9581805b3b0e61c041a1644d8ac3f6c2c35419b904ea419bee9e4532c08f6b2c3cc66cbd1f03049ff7ff01810535053be71bfa51d7fe8f2369d41
 MISC metadata.xml 653 SHA256 744c67bfd3b874f305b08a5b68c5e2213c3cdc1c47b381fe130ebfc2005a964b WHIRLPOOL 5efd225c032e0704862510f166c94327460caf27527b473fe8f35ea6117b2b16862e362aff0b7bdb47b38349dbcf8710fff4040f11d50e07865f983dacc93d99
diff --git a/www-apps/phabricator/files/0001-Changed-add_user.php-to-create-users-with-unverified.patch b/www-apps/phabricator/files/0001-Changed-add_user.php-to-create-users-with-unverified.patch
deleted file mode 100644
index 73c7553d..00000000
--- a/www-apps/phabricator/files/0001-Changed-add_user.php-to-create-users-with-unverified.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From fc9e297d124790a337dd6c69b50bd72cbdc0067c Mon Sep 17 00:00:00 2001
-From: Enlightenment <no-reply@enlightenment.org>
-Date: Fri, 25 Jan 2013 06:00:11 -0800
-Subject: [PATCH] Changed add_user.php to create users with unverified
- emails.
-
-Different error codes for different errors.
----
- scripts/user/add_user.php | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/scripts/user/add_user.php b/scripts/user/add_user.php
-index edb6a1a..fb3555a 100755
---- a/scripts/user/add_user.php
-+++ b/scripts/user/add_user.php
-@@ -27,6 +27,7 @@ $existing_user = id(new PhabricatorUser())->loadOneWhere(
-   'username = %s',
-   $username);
- if ($existing_user) {
-+  exit(2);
-   throw new Exception(
-     "There is already a user with the username '{$username}'!");
- }
-@@ -35,6 +36,7 @@ $existing_email = id(new PhabricatorUserEmail())->loadOneWhere(
-   'address = %s',
-   $email);
- if ($existing_email) {
-+  exit(3);
-   throw new Exception(
-     "There is already a user with the email '{$email}'!");
- }
-@@ -45,7 +47,7 @@ $user->setRealname($realname);
- 
- $email_object = id(new PhabricatorUserEmail())
-   ->setAddress($email)
--  ->setIsVerified(1);
-+  ->setIsVerified(0);
- 
- id(new PhabricatorUserEditor())
-   ->setActor($admin)
--- 
-1.8.1.5
-
diff --git a/www-apps/phabricator/files/0002-Make-wiki-visible-to-all.patch b/www-apps/phabricator/files/0001-Make-wiki-visible-to-all.patch
index 2a3ecc3c..2a3ecc3c 100644
--- a/www-apps/phabricator/files/0002-Make-wiki-visible-to-all.patch
+++ b/www-apps/phabricator/files/0001-Make-wiki-visible-to-all.patch
diff --git a/www-apps/phabricator/phabricator-9999.ebuild b/www-apps/phabricator/phabricator-9999.ebuild
index 644b58dc..a1fd2c80 100644
--- a/www-apps/phabricator/phabricator-9999.ebuild
+++ b/www-apps/phabricator/phabricator-9999.ebuild
@@ -52,8 +52,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/0001-Changed-add_user.php-to-create-users-with-unverified.patch"
-	epatch "${FILESDIR}/0002-Make-wiki-visible-to-all.patch"
+	epatch "${FILESDIR}/0001-Make-wiki-visible-to-all.patch"
 
 	find -type f -name .gitignore -print0 \
 		| xargs -0 --no-run-if-empty -- \