[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-annex/files/

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-annex/files/

[Sergei Trofimovich]

commit:     596624b1f7374c059a0339f94b107f953f2c3386
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 16 21:52:37 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 21:57:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=596624b1

dev-vcs/git-annex: add missing patches

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-vcs/git-annex/files/git-annex-6.20161210-directory-1.3.patch | 9 +++++++++
 dev-vcs/git-annex/files/git-annex-6.20170101-crypto-api.patch    | 8 ++++++++
 2 files changed, 17 insertions(+)

diff --git a/dev-vcs/git-annex/files/git-annex-6.20161210-directory-1.3.patch b/dev-vcs/git-annex/files/git-annex-6.20161210-directory-1.3.patch
new file mode 100644
index 0000000000..1e9bb57f9e
--- /dev/null
+++ b/dev-vcs/git-annex/files/git-annex-6.20161210-directory-1.3.patch
@@ -0,0 +1,9 @@
+diff --git a/Common.hs b/Common.hs
+index 5213863..74b054e 100644
+--- a/Common.hs
++++ b/Common.hs
+@@ -27,3 +27,3 @@ import Utility.Process as X
+ import Utility.Path as X
+-import Utility.Directory as X
++import Utility.Directory as X hiding (getFileSize)
+ import Utility.Monad as X

diff --git a/dev-vcs/git-annex/files/git-annex-6.20170101-crypto-api.patch b/dev-vcs/git-annex/files/git-annex-6.20170101-crypto-api.patch
new file mode 100644
index 0000000000..c517c651ce
--- /dev/null
+++ b/dev-vcs/git-annex/files/git-annex-6.20170101-crypto-api.patch
@@ -0,0 +1,8 @@
+diff --git a/git-annex.cabal b/git-annex.cabal
+index 5b95a16..f03024d 100644
+--- a/git-annex.cabal
++++ b/git-annex.cabal
+@@ -326,2 +326,3 @@ Executable git-annex
+    case-insensitive,
++   crypto-api,
+    random,

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-annex/files/

[Michael Palimaka]

commit:     a55f43599de495b00e68a7e9c8f298b2b1f63d93
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Dec  1 15:57:21 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Dec  6 13:31:13 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a55f4359

dev-vcs/git-annex: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/6380

 .../files/git-annex-5.20150731-no-strange-installs.patch         | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/dev-vcs/git-annex/files/git-annex-5.20150731-no-strange-installs.patch b/dev-vcs/git-annex/files/git-annex-5.20150731-no-strange-installs.patch
deleted file mode 100644
index a2ca5b86628..00000000000
--- a/dev-vcs/git-annex/files/git-annex-5.20150731-no-strange-installs.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/Setup.hs b/Setup.hs
-index f90a9b2..97afb7f 100644
---- a/Setup.hs
-+++ b/Setup.hs
-@@ -25,3 +25,3 @@ main = defaultMainWithHooks simpleUserHooks
- 		return (Nothing, [])	
--	, postCopy = myPostCopy
-+	-- , postCopy = myPostCopy
- 	}