commit: a7af25e0ef157fc58c8d99541013f8bae68adddd Author: Jack Todaro <solpeth <AT> posteo <DOT> org> AuthorDate: Mon Aug 3 20:28:49 2020 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Mon Aug 3 22:58:17 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7af25e0
dev-vcs/git-annex: remove old Bug: https://bugs.gentoo.org/659288 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Jack Todaro <solpeth <AT> posteo.org> Closes: https://github.com/gentoo/gentoo/pull/16987 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> dev-vcs/git-annex/Manifest | 1 - .../files/git-annex-6.20160114-QC-2.8.2.patch | 16 -- .../files/git-annex-6.20161210-directory-1.3.patch | 9 -- .../files/git-annex-6.20170101-crypto-api.patch | 8 - dev-vcs/git-annex/git-annex-6.20170818-r1.ebuild | 161 --------------------- dev-vcs/git-annex/metadata.xml | 2 - 6 files changed, 197 deletions(-) diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest index 8f97fa423e2..9e78d63c3c1 100644 --- a/dev-vcs/git-annex/Manifest +++ b/dev-vcs/git-annex/Manifest @@ -1,2 +1 @@ -DIST git-annex-6.20170818.tar.gz 1111837 BLAKE2B ff18ffd101b3f9dc2b74caaed57c8f8f568fc51beeedddccf7f76ef5a27a99801cb994a52f09e5467be2f030842f4fa3b38bfd0a19a207057ffe269dfc8f240c SHA512 06587bf0d3056e4b94d4c40aaae820efda133dcbc876a2ac3db3183fb511ec20aae4c495323b4886868a3e66b5b1f53a04c5f3abb0362c718bbadc8e2f6e15d0 DIST git-annex-8.20200617.tar.gz 1296190 BLAKE2B 3731641ff6623d7f0b2ac5402fe6acb41e4c8210e958c5c4383f401486d4307a921cc9072023ec62fdf2da78ec432cf0707a06265345681d7646af2974917cbf SHA512 736d10c1442bb6d8eaf67337da6b606e8b79970f1bbd10cfc15caaaa0376780c14dee9ece066dbc6b378f0a750d11d5b7b87687252899e473748828939dc03ae diff --git a/dev-vcs/git-annex/files/git-annex-6.20160114-QC-2.8.2.patch b/dev-vcs/git-annex/files/git-annex-6.20160114-QC-2.8.2.patch deleted file mode 100644 index 2f232782de0..00000000000 --- a/dev-vcs/git-annex/files/git-annex-6.20160114-QC-2.8.2.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/Utility/QuickCheck.hs b/Utility/QuickCheck.hs -index cd408dd..9f60f23 100644 ---- a/Utility/QuickCheck.hs -+++ b/Utility/QuickCheck.hs -@@ -9,2 +9,3 @@ - {-# LANGUAGE TypeSynonymInstances #-} -+{-# LANGUAGE CPP #-} - -@@ -23,2 +24,3 @@ import Prelude - -+#if ! MIN_VERSION_QuickCheck(2,8,2) - instance (Arbitrary k, Arbitrary v, Eq k, Ord k) => Arbitrary (M.Map k v) where -@@ -28,2 +30,3 @@ instance (Arbitrary v, Eq v, Ord v) => Arbitrary (S.Set v) where - arbitrary = S.fromList <$> arbitrary -+#endif - 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 deleted file mode 100644 index 1e9bb57f9ee..00000000000 --- a/dev-vcs/git-annex/files/git-annex-6.20161210-directory-1.3.patch +++ /dev/null @@ -1,9 +0,0 @@ -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 deleted file mode 100644 index c517c651ce4..00000000000 --- a/dev-vcs/git-annex/files/git-annex-6.20170101-crypto-api.patch +++ /dev/null @@ -1,8 +0,0 @@ -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, diff --git a/dev-vcs/git-annex/git-annex-6.20170818-r1.ebuild b/dev-vcs/git-annex/git-annex-6.20170818-r1.ebuild deleted file mode 100644 index 91abe516311..00000000000 --- a/dev-vcs/git-annex/git-annex-6.20170818-r1.ebuild +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# ebuild generated by hackport 0.5.3.9999 -#hackport: flags: -production,-android,-androidsplice,-testsuite - -CABAL_FEATURES="" -inherit haskell-cabal bash-completion-r1 - -DESCRIPTION="manage files with git, without checking their contents into git" -HOMEPAGE="http://git-annex.branchable.com/"; -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"; -RESTRICT="test" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux" -IUSE="+assistant benchmark +concurrentoutput +dbus doc +magic +network-uri +pairing s3 +torrentparser +webapp +webdav" - -RDEPEND="dev-haskell/aeson:= - dev-haskell/async:= - dev-haskell/bloomfilter:= - dev-haskell/byteable:= - dev-haskell/case-insensitive:= - dev-haskell/crypto-api:= - dev-haskell/cryptonite:= - dev-haskell/data-default:= - dev-haskell/disk-free-space:= - dev-haskell/dlist:= - dev-haskell/edit-distance:= - dev-haskell/esqueleto:= - >=dev-haskell/exceptions-0.6:= - >=dev-haskell/feed-0.3.9:= - dev-haskell/free:= - dev-haskell/hslogger:= - dev-haskell/http-client:= - >=dev-haskell/http-conduit-2.0:= - >=dev-haskell/http-types-0.7:= - dev-haskell/ifelse:= - dev-haskell/memory:= - dev-haskell/monad-control:= - dev-haskell/monad-logger:= - >=dev-haskell/mtl-2:= - dev-haskell/old-locale:= - >=dev-haskell/optparse-applicative-0.11.0:= - dev-haskell/persistent:= - dev-haskell/persistent-sqlite:= - dev-haskell/persistent-template:= - >=dev-haskell/quickcheck-2.1:2= - dev-haskell/random:= - dev-haskell/regex-tdfa:= - dev-haskell/resourcet:= - dev-haskell/safesemaphore:= - dev-haskell/sandi:= - dev-haskell/securemem:= - dev-haskell/socks:= - dev-haskell/split:= - >=dev-haskell/stm-2.3:= - dev-haskell/stm-chans:= - dev-haskell/text:= - dev-haskell/unix-compat:= - dev-haskell/unordered-containers:= - dev-haskell/utf8-string:= - >=dev-haskell/uuid-1.2.6:= - >=dev-lang/ghc-7.8.2:= - assistant? ( >=dev-haskell/dns-1.0.0:= - dev-haskell/hinotify:= - dev-haskell/mountpoints:= - sys-process/lsof ) - benchmark? ( dev-haskell/criterion:= ) - concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= ) - dbus? ( >=dev-haskell/dbus-0.10.7:= - >=dev-haskell/fdo-notify-0.3:= ) - magic? ( dev-haskell/magic:= ) - network-uri? ( >=dev-haskell/network-2.6:= - >=dev-haskell/network-uri-2.6:= ) - !network-uri? ( >=dev-haskell/network-2.4:= <dev-haskell/network-2.6:= ) - pairing? ( dev-haskell/network-info:= - dev-haskell/network-multicast:= ) - s3? ( >=dev-haskell/aws-0.9.2:= - dev-haskell/conduit:= - dev-haskell/conduit-extra:= ) - torrentparser? ( >=dev-haskell/torrent-10000.0.0:= ) - webapp? ( dev-haskell/blaze-builder:= - dev-haskell/clientsession:= - >=dev-haskell/path-pieces-0.1.4:= - >=dev-haskell/shakespeare-2.0.0:= - dev-haskell/wai:= - dev-haskell/wai-extra:= - >=dev-haskell/warp-3.0.0.5:= - >=dev-haskell/warp-tls-1.4:= - >=dev-haskell/yesod-1.2.6:= - >=dev-haskell/yesod-core-1.2.19:= - >=dev-haskell/yesod-default-1.2.0:= - >=dev-haskell/yesod-form-1.3.15:= - >=dev-haskell/yesod-static-1.2.4:= ) - webdav? ( >=dev-haskell/dav-1.0:= ) -" -# not generated by hackport: -RDEPEND="${RDEPEND} - dev-vcs/git -" - -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.18.1.3 -" - -# not generated by hackport: -DEPEND="${DEPEND} - dev-lang/perl - doc? ( www-apps/ikiwiki net-misc/rsync ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-6.20160114-QC-2.8.2.patch - "${FILESDIR}"/${PN}-6.20161210-directory-1.3.patch - "${FILESDIR}"/${PN}-6.20170101-crypto-api.patch -) - -src_configure() { - haskell-cabal_src_configure \ - --flag=-android \ - --flag=-androidsplice \ - $(cabal_flag assistant assistant) \ - $(cabal_flag benchmark benchmark) \ - $(cabal_flag concurrentoutput concurrentoutput) \ - $(cabal_flag dbus dbus) \ - $(cabal_flag magic magicmime) \ - $(cabal_flag network-uri network-uri) \ - $(cabal_flag pairing pairing) \ - --flag=-production \ - $(cabal_flag s3 s3) \ - --flag=-testsuite \ - $(cabal_flag torrentparser torrentparser) \ - $(cabal_flag webapp webapp) \ - $(cabal_flag webdav webdav) -} - -src_test() { - if use webapp; then - export GIT_CONFIG=${T}/temp-git-config - git config user.email "git@src_test" - git config user.name "Mr. ${P} The Test" - - emake test - fi -} - -src_install() { - haskell-cabal_src_install - - newbashcomp "${FILESDIR}"/${PN}.bash ${PN} - - dodoc CHANGELOG README - if use webapp ; then - doicon "${FILESDIR}"/${PN}.xpm - make_desktop_entry "${PN} webapp" "git-annex" ${PN}.xpm "Office" - fi -} diff --git a/dev-vcs/git-annex/metadata.xml b/dev-vcs/git-annex/metadata.xml index d3a3483550e..8d49ace368c 100644 --- a/dev-vcs/git-annex/metadata.xml +++ b/dev-vcs/git-annex/metadata.xml @@ -22,11 +22,9 @@ <use> <flag name="assistant">Enable git-annex assistant and watch command</flag> <flag name="benchmark">Enable benchmarking</flag> - <flag name="concurrentoutput">Use concurrent-output library (experimental)</flag> <flag name="debuglocks">Debug location of MVar/STM deadlocks</flag> <flag name="magicmime">Use libmagic to determine file MIME types</flag> <flag name="network-3">Use network-3</flag> - <flag name="network-uri">Get Network.URI from the network-uri package.</flag> <flag name="pairing">Enable pairing of git annex repositories</flag> <flag name="s3">Enable Amazon S3 remote</flag> <flag name="torrentparser">Use haskell torrent library to parse torrent files</flag>
