* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-annex/, dev-vcs/git-annex/files/
@ 2015-08-09 18:25 Sergei Trofimovich
0 siblings, 0 replies; 3+ messages in thread
From: Sergei Trofimovich @ 2015-08-09 18:25 UTC (permalink / raw
To: gentoo-commits
commit: 594a7f1af4056780eced62f3d316e8a70eac593a
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 9 18:24:29 2015 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Aug 9 18:25:18 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=594a7f1a
dev-vcs/git-annex: bump up to 5.20150731
Package-Manager: portage-2.2.20
dev-vcs/git-annex/Manifest | 1 +
.../git-annex-5.20150731-no-strange-installs.patch | 9 ++
dev-vcs/git-annex/git-annex-5.20150731.ebuild | 171 +++++++++++++++++++++
dev-vcs/git-annex/metadata.xml | 5 +-
4 files changed, 185 insertions(+), 1 deletion(-)
diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index b2a8cb7..94a45b1 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -6,3 +6,4 @@ DIST git-annex-5.20150219.tar.gz 4688334 SHA256 46c1d2a338a4f54774060b39fe5e8645
DIST git-annex-5.20150327.tar.gz 4764485 SHA256 1e309466627eb634816805004391c5407dd9eee280e2f21a48de9617a35918fa SHA512 638ed0c97d0f67cd26699826c9ff5192fd2d089932e06fe8305c536fcbad06239f8d745c350938089827ae4b7058f1e2c3156ab7f5f133e7b4a38a2e6cd69544 WHIRLPOOL a03f2d28b36eff595ba2780ed70fee8204dceb8aef087871f650dd3482865e30d2644e29b9c7d5763cc79ffe8357e81b5b1b7fb1091fa3cb1d171634af37ac77
DIST git-annex-5.20150617.tar.gz 5047577 SHA256 2d37c49866880803886fe77be17ac154c84acc0c344e4fefea577a59e55f8d54 SHA512 25f42ab403d3fd39a689af74cd8a26dc5de761d5a8a79c8d7050194c2094f65de9681b4189076c484fb5c644408918140cf1fcb0109a6a2195f1d547e307abfc WHIRLPOOL 89410f048f5773256cac6525f1a42e3845a5106a1d0b82e031d1f70136375479efc180b21907036e191243f55aee7d94b041cc1d994dea403a1640e7310f6f4d
DIST git-annex-5.20150710.tar.gz 5080419 SHA256 970f953a278401863fb1006679d216891ae556f80434b587deb08dfd6644f860 SHA512 35240f1d78561dab02ae014e4d00b8645c33c526b0d36a28253b9129198ea53b784949c7b47fd3b97f056842430a5e8b0d312b8ba6985bbb3228c73a4dfa21ea WHIRLPOOL 06b824031aeef38468e17ef239aa1501a2236a084a9c54e4c81001247c62b8621cdc6bc090f2b1a516df000823951acee784000aa6dc5b4de5dc4bcd5a2bda59
+DIST git-annex-5.20150731.tar.gz 5096183 SHA256 a2eefd4c273f5510e8ee384cc4fb512bf10c76cc4b84f6fff5c255223bd853a1 SHA512 edad8fb6aa98ad08cfe8406e2c7b794b0cc3a437f28ed43b5863bbba59a1633e2d6b3a94b6f942494ef7bd912650f7c89ad2a3d54920ff405f4d8d173e1027e9 WHIRLPOOL 945600b49b9f240da37d4642849395fc9ef9a615701a8088b6fb573e098e9b4de5a4bde8714974105a36a963e19a78137abdc513f9a0335ff5fe36981d12be25
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
new file mode 100644
index 0000000..a2ca5b8
--- /dev/null
+++ b/dev-vcs/git-annex/files/git-annex-5.20150731-no-strange-installs.patch
@@ -0,0 +1,9 @@
+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
+ }
diff --git a/dev-vcs/git-annex/git-annex-5.20150731.ebuild b/dev-vcs/git-annex/git-annex-5.20150731.ebuild
new file mode 100644
index 0000000..3f4f031
--- /dev/null
+++ b/dev-vcs/git-annex/git-annex-5.20150731.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="bin"
+inherit haskell-cabal
+
+DESCRIPTION="manage files with git, without checking their contents into git"
+HOMEPAGE="http://git-annex.branchable.com/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+RESTRICT="test"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="asciiprogress +assistant +database +dbus +desktopnotify +dns doc ekg +feed +inotify +network-uri +pairing +quvi +s3 +tahoe +tdfa +torrentparser +webapp +webapp-secure +webdav +xmpp"
+
+RDEPEND="dev-haskell/async:=
+ dev-haskell/bloomfilter:=
+ dev-haskell/case-insensitive:=
+ >=dev-haskell/cryptohash-0.11.0:=
+ dev-haskell/data-default:=
+ dev-haskell/dlist:=
+ dev-haskell/edit-distance:=
+ >=dev-haskell/exceptions-0.6:=
+ dev-haskell/hslogger:=
+ dev-haskell/http-conduit:=
+ dev-haskell/http-types:=
+ dev-haskell/ifelse:=
+ dev-haskell/json:=
+ dev-haskell/missingh:=
+ dev-haskell/monad-control:=
+ dev-haskell/monad-logger:=
+ >=dev-haskell/mtl-2:=
+ dev-haskell/old-locale:=
+ >=dev-haskell/optparse-applicative-0.10:=
+ >=dev-haskell/quickcheck-2.1:2=
+ dev-haskell/random:=
+ dev-haskell/resourcet:=
+ dev-haskell/safesemaphore:=
+ dev-haskell/sandi:=
+ >=dev-haskell/stm-2.3:=
+ dev-haskell/text:=
+ dev-haskell/transformers:=
+ dev-haskell/unix-compat:=
+ dev-haskell/utf8-string:=
+ dev-haskell/uuid:=
+ >=dev-lang/ghc-7.6.1:=
+ asciiprogress? ( dev-haskell/ascii-progress:=
+ dev-haskell/terminal-size:= )
+ assistant? ( inotify? ( dev-haskell/hinotify:= ) )
+ database? ( dev-haskell/esqueleto:=
+ dev-haskell/persistent:=
+ dev-haskell/persistent-sqlite:=
+ dev-haskell/persistent-template:= )
+ dbus? ( >=dev-haskell/dbus-0.10.7:=
+ desktopnotify? ( >=dev-haskell/fdo-notify-0.3:= ) )
+ dns? ( dev-haskell/dns:= )
+ ekg? ( dev-haskell/ekg:= )
+ feed? ( >=dev-haskell/feed-0.3.4:= )
+ network-uri? ( >=dev-haskell/network-2.6:=
+ >=dev-haskell/network-uri-2.6:= )
+ !network-uri? ( >=dev-haskell/network-2.0:= <dev-haskell/network-2.6:= )
+ pairing? ( dev-haskell/network-info:=
+ dev-haskell/network-multicast:= )
+ quvi? ( dev-haskell/aeson:= )
+ s3? ( >=dev-haskell/aws-0.9.2:=
+ dev-haskell/conduit:=
+ dev-haskell/conduit-extra:=
+ dev-haskell/http-client:= )
+ tahoe? ( dev-haskell/aeson:= )
+ tdfa? ( dev-haskell/regex-tdfa:= )
+ !tdfa? ( dev-haskell/regex-compat:= )
+ torrentparser? ( >=dev-haskell/torrent-10000.0.0:= )
+ webapp? ( dev-haskell/aeson:=
+ dev-haskell/blaze-builder:=
+ dev-haskell/clientsession:=
+ dev-haskell/crypto-api:=
+ >=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/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:=
+ webapp-secure? ( dev-haskell/byteable:=
+ dev-haskell/securemem:=
+ >=dev-haskell/warp-tls-1.4:= )
+ !webapp-secure? ( dev-haskell/warp-tls:= ) )
+ webdav? ( >=dev-haskell/dav-1.0:=
+ dev-haskell/http-client:= )
+ xmpp? ( >=dev-haskell/gnutls-0.1.4:=
+ dev-haskell/network-protocol-xmpp:=
+ dev-haskell/xml-types:= )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.16.0
+"
+
+src_prepare() {
+ # does not respect staging dir
+ epatch "${FILESDIR}"/${P}-no-strange-installs.patch
+
+ cabal_chdeps \
+ 'ascii-progress (<= 0.2.1.2)' 'ascii-progress'
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-android \
+ --flag=-androidsplice \
+ $(cabal_flag asciiprogress asciiprogress) \
+ $(cabal_flag assistant assistant) \
+ $(cabal_flag database database) \
+ $(cabal_flag dbus dbus) \
+ $(cabal_flag desktopnotify desktopnotify) \
+ $(cabal_flag dns dns) \
+ $(cabal_flag ekg ekg) \
+ $(cabal_flag feed feed) \
+ $(cabal_flag inotify inotify) \
+ $(cabal_flag network-uri network-uri) \
+ $(cabal_flag pairing pairing) \
+ --flag=-production \
+ $(cabal_flag quvi quvi) \
+ $(cabal_flag s3 s3) \
+ $(cabal_flag tahoe tahoe) \
+ $(cabal_flag tdfa tdfa) \
+ --flag=-testsuite \
+ $(cabal_flag torrentparser torrentparser) \
+ $(cabal_flag webapp webapp) \
+ $(cabal_flag webapp-secure webapp-secure) \
+ $(cabal_flag webdav webdav) \
+ $(cabal_flag xmpp xmpp)
+}
+
+src_compile() {
+ haskell-cabal_src_compile
+ use doc && emake docs
+}
+
+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
+ dosym git-annex /usr/bin/git-annex-shell # standard make install does more, than needed
+
+ # install-mans wants ikiwiki. It returns 0 and builds the man pages without ikiwiki.
+ emake install-mans DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
+ use doc && emake install-docs DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
+ mv "${ED}"/usr/share/doc/{${PN},${PF}}
+ 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 b36e0ee..351a729 100644
--- a/dev-vcs/git-annex/metadata.xml
+++ b/dev-vcs/git-annex/metadata.xml
@@ -22,10 +22,13 @@
<flag name="androidsplice">Get TH splices for Android.</flag>
<flag name="asciiprogress">Use ascii-progress library (experimental)</flag>
<flag name="cryptohash">Enable use of cryptohash for checksumming</flag>
- <flag name="dns">Enable the haskell DNS library for DNS lookup</flag>
+ <flag name="database">Enable building with <pkg>dev-haskell/persistent</pkg> for database use</flag>
+ <flag name="desktopnotify">Enable desktop environment notifications</flag>
<flag name="desktop-notify">Enable desktop environment notifications</flag>
+ <flag name="dns">Enable the haskell DNS library for DNS lookup</flag>
<flag name="ekg">Enable use of EKG to monitor git-annex as it runs.</flag>
<flag name="feed">Enable podcast feed support</flag>
+ <flag name='network-uri'>Get Network.URI from the network-uri package.</flag>
<flag name="production">Enable production build (slower build; faster binary)</flag>
<flag name="pairing">Enable pairing of git annex repositories</flag>
<flag name="quvi">Enable use of quvi to download videos</flag>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-annex/, dev-vcs/git-annex/files/
@ 2020-08-03 22:58 Sergei Trofimovich
0 siblings, 0 replies; 3+ messages in thread
From: Sergei Trofimovich @ 2020-08-03 22:58 UTC (permalink / raw
To: gentoo-commits
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>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-annex/, dev-vcs/git-annex/files/
@ 2022-07-30 5:59 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-07-30 5:59 UTC (permalink / raw
To: gentoo-commits
commit: 11b9b74c2d579cce16fdba2ced8276f4b8ebf8ae
Author: matoro <matoro <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Sat Jul 30 01:57:05 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 30 05:58:54 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11b9b74c
dev-vcs/git-annex: add 10.20220624, drop 8.20200810
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-vcs/git-annex/Manifest | 2 +-
.../git-annex-8.20210330-persistent-2.12.patch | 28 +++++++++
...0200810.ebuild => git-annex-10.20220624.ebuild} | 68 ++++++++--------------
dev-vcs/git-annex/metadata.xml | 26 +--------
4 files changed, 54 insertions(+), 70 deletions(-)
diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index 7306f3571bc6..c503006cabac 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -1 +1 @@
-DIST git-annex-8.20200810.tar.gz 1312890 BLAKE2B 63226ee6b2150dd48dae3e52e70502e64e89d73185500c1cea201f2be98760ed9b3cd173b75b5603b49ca63f316163273a7c6d7eaddd68e548d903c845925713 SHA512 e6a4ad3169582f65284218c75f2679105a52d2f22310b10436796c439e031c5ad6f4d2dff1772f4cfc670d8956ae4a68d4d98e1dabd48bf06bcafda97676321f
+DIST git-annex-10.20220624.tar.gz 1426982 BLAKE2B fa3a105f9677c51dfb1a44984ac80a377380ff5e2c69486f6f213fcb709c2280c66b8d856f004016f97751abea3faeca8756663c0af19616ed237d8e4d9d25f9 SHA512 4269c3408c9368283ab280c7231953ad95687b5ff84c1e9cb725d5ed6eb4da9384c48de33e4265d2fd8b1352eea47bffaac7d335d2c998149555b050f80a75af
diff --git a/dev-vcs/git-annex/files/git-annex-8.20210330-persistent-2.12.patch b/dev-vcs/git-annex/files/git-annex-8.20210330-persistent-2.12.patch
new file mode 100644
index 000000000000..977e5931f5f4
--- /dev/null
+++ b/dev-vcs/git-annex/files/git-annex-8.20210330-persistent-2.12.patch
@@ -0,0 +1,28 @@
+--- a/Database/Handle.hs
++++ b/Database/Handle.hs
+@@ -26,7 +26,7 @@ import qualified Database.Sqlite as Sqlite
+ import Control.Monad
+ import Control.Monad.IO.Class (liftIO)
+ import Control.Monad.IO.Unlift (MonadUnliftIO, withRunInIO)
+-import Control.Monad.Logger (MonadLogger)
++import Control.Monad.Logger (MonadLogger, askLoggerIO, MonadLoggerIO)
+ import Control.Concurrent
+ import Control.Concurrent.Async
+ import Control.Exception (throwIO, BlockedIndefinitelyOnMVar(..))
+@@ -246,6 +246,7 @@ runSqliteRobustly tablename db a = do
+ withSqlConnRobustly
+ :: (MonadUnliftIO m
+ , MonadLogger m
++ , MonadLoggerIO m
+ , IsPersistBackend backend
+ , BaseBackend backend ~ SqlBackend
+ , BackendCompatible SqlBackend backend
+@@ -254,7 +255,7 @@ withSqlConnRobustly
+ -> (backend -> m a)
+ -> m a
+ withSqlConnRobustly open f = do
+- logFunc <- askLogFunc
++ logFunc <- askLoggerIO
+ withRunInIO $ \run -> bracket
+ (open logFunc)
+ closeRobustly
diff --git a/dev-vcs/git-annex/git-annex-8.20200810.ebuild b/dev-vcs/git-annex/git-annex-10.20220624.ebuild
similarity index 70%
rename from dev-vcs/git-annex/git-annex-8.20200810.ebuild
rename to dev-vcs/git-annex/git-annex-10.20220624.ebuild
index c80e75b51846..23fbd1f88474 100644
--- a/dev-vcs/git-annex/git-annex-8.20200810.ebuild
+++ b/dev-vcs/git-annex/git-annex-10.20220624.ebuild
@@ -1,28 +1,27 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-# ebuild generated by hackport 0.6.6.9999
-#hackport: flags: -production,-android,-androidsplice,-testsuite
+# ebuild generated by hackport 0.7.1.2.9999
+#hackport: flags: -production,-android,-androidsplice,-testsuite,+networkbsd
CABAL_FEATURES=""
inherit haskell-cabal bash-completion-r1 desktop
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"
+HOMEPAGE="https://git-annex.branchable.com/"
LICENSE="AGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+assistant benchmark +dbus debuglocks doc +gitlfs +httpclientrestricted +magicmime +networkbsd +pairing +s3 +torrentparser +webapp +webdav" # NOTE: add local USE flag 'doc' when bumping
-
-RESTRICT=test
+IUSE="+assistant +benchmark +dbus debug doc +gitlfs +magicmime +pairing +torrentparser +webapp"
RDEPEND="dev-haskell/aeson:=
+ >=dev-haskell/ansi-terminal-0.9:=
dev-haskell/async:=
- dev-haskell/attoparsec:=
+ >=dev-haskell/attoparsec-0.13.2.2:=
+ >=dev-haskell/aws-0.20:=
>=dev-haskell/bloomfilter-2.0.0:=
dev-haskell/byteable:=
dev-haskell/case-insensitive:=
@@ -32,15 +31,15 @@ RDEPEND="dev-haskell/aeson:=
dev-haskell/crypto-api:=
>=dev-haskell/cryptonite-0.23:=
dev-haskell/data-default:=
+ >=dev-haskell/dav-1.0:=
dev-haskell/disk-free-space:=
dev-haskell/dlist:=
dev-haskell/edit-distance:=
- >=dev-haskell/exceptions-0.6:=
>=dev-haskell/feed-1.0.0:=
>=dev-haskell/filepath-bytestring-1.4.2.1.1:=
dev-haskell/free:=
- dev-haskell/hslogger:=
>=dev-haskell/http-client-0.5.3:=
+ >=dev-haskell/http-client-restricted-0.0.2:=
dev-haskell/http-client-tls:=
>=dev-haskell/http-conduit-2.3.0:=
>=dev-haskell/http-types-0.7:=
@@ -48,8 +47,9 @@ RDEPEND="dev-haskell/aeson:=
dev-haskell/memory:=
dev-haskell/microlens:=
dev-haskell/monad-control:=
- dev-haskell/monad-logger:=
- >=dev-haskell/mtl-2:=
+ >=dev-haskell/monad-logger-0.3.10:=
+ >=dev-haskell/network-3.0.0.0:=
+ dev-haskell/network-bsd:=
>=dev-haskell/network-uri-2.6:=
dev-haskell/old-locale:=
>=dev-haskell/optparse-applicative-0.14.1:=
@@ -68,32 +68,26 @@ RDEPEND="dev-haskell/aeson:=
>=dev-haskell/stm-2.3:=
dev-haskell/stm-chans:=
dev-haskell/tagsoup:=
- >=dev-haskell/tasty-0.7:=
+ >=dev-haskell/tasty-1.2:=
dev-haskell/tasty-hunit:=
dev-haskell/tasty-quickcheck:=
dev-haskell/tasty-rerun:=
- dev-haskell/text:=
>=dev-haskell/unix-compat-0.5:=
dev-haskell/unliftio-core:=
dev-haskell/unordered-containers:=
dev-haskell/utf8-string:=
>=dev-haskell/uuid-1.2.6:=
dev-haskell/vector:=
- >=dev-lang/ghc-8.4.3:=
+ >=dev-lang/ghc-8.10.1:=
assistant? ( >=dev-haskell/hinotify-0.3.10:=
dev-haskell/mountpoints:= )
benchmark? ( dev-haskell/criterion:= )
dbus? ( >=dev-haskell/dbus-0.10.7:=
>=dev-haskell/fdo-notify-0.3:= )
- gitlfs? ( >=dev-haskell/git-lfs-1.1.0:= )
- httpclientrestricted? ( >=dev-haskell/http-client-restricted-0.0.2:= )
+ gitlfs? ( >=dev-haskell/git-lfs-1.2.0:= )
magicmime? ( dev-haskell/magic:= )
- networkbsd? ( >=dev-haskell/network-3.0.0.0:=
- dev-haskell/network-bsd:= )
- !networkbsd? ( >=dev-haskell/network-2.6.3.0:= <dev-haskell/network-3.0.0.0:= )
pairing? ( dev-haskell/network-info:=
dev-haskell/network-multicast:= )
- s3? ( >=dev-haskell/aws-0.20:= )
torrentparser? ( >=dev-haskell/torrent-10000.0.0:= )
webapp? ( dev-haskell/blaze-builder:=
dev-haskell/clientsession:=
@@ -107,15 +101,14 @@ RDEPEND="dev-haskell/aeson:=
>=dev-haskell/yesod-core-1.6.0:=
>=dev-haskell/yesod-form-1.4.8:=
>=dev-haskell/yesod-static-1.5.1:= )
- webdav? ( >=dev-haskell/dav-1.0:= )
-"
-# not generated by hackport:
-RDEPEND+=" dev-vcs/git
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
+ >=dev-haskell/cabal-3.2.0.0
+ >=dev-haskell/filepath-bytestring-1.4.2.1.4
"
# not generated by hackport:
+RDEPEND+=" dev-vcs/git
+"
DEPEND+=" dev-lang/perl
doc? ( www-apps/ikiwiki net-misc/rsync )
"
@@ -127,28 +120,15 @@ src_configure() {
$(cabal_flag assistant assistant) \
$(cabal_flag benchmark benchmark) \
$(cabal_flag dbus dbus) \
- $(cabal_flag debuglocks debuglocks) \
+ $(cabal_flag debug debuglocks) \
$(cabal_flag gitlfs gitlfs) \
- $(cabal_flag httpclientrestricted httpclientrestricted) \
$(cabal_flag magicmime magicmime) \
- $(cabal_flag networkbsd networkbsd) \
+ --flag=networkbsd \
$(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
+ $(cabal_flag webapp webapp)
}
src_install() {
diff --git a/dev-vcs/git-annex/metadata.xml b/dev-vcs/git-annex/metadata.xml
index 0f121b9748a2..82dde5fc9a30 100644
--- a/dev-vcs/git-annex/metadata.xml
+++ b/dev-vcs/git-annex/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>haskell@gentoo.org</email>
@@ -9,34 +9,10 @@
<flag name="assistant">Enable git-annex assistant and watch command</flag>
<flag name="benchmark">Enable benchmarking</flag>
<flag name="dbus">Enable dbus support</flag>
- <flag name="debuglocks">Debug location of MVar/STM deadlocks</flag>
<flag name="gitlfs">Build with git-lfs library (rather than vendored copy)</flag>
- <flag name="httpclientrestricted">Build with http-client-restricted library (rather than vendored copy)</flag>
<flag name="magicmime">Use libmagic to determine file MIME types</flag>
- <flag name="networkbsd">Build with network-3.0 which split out network-bsd</flag>
<flag name="pairing">Enable pairing</flag>
- <flag name="s3">Enable S3 support</flag>
<flag name="torrentparser">Use haskell torrent library to parse torrent files</flag>
<flag name="webapp">Enable git-annex webapp</flag>
- <flag name="webdav">Enable WebDAV support</flag>
</use>
- <longdescription>
- git-annex allows managing files with git, without checking the file
- contents into git. While that may seem paradoxical, it is useful when
- dealing with files larger than git can currently easily handle, whether due
- to limitations in memory, time, or disk space.
-
- It can store large files in many places, from local hard drives, to a
- large number of cloud storage services, including S3, WebDAV,
- and rsync, with a dozen cloud storage providers usable via plugins.
- Files can be stored encrypted with gpg, so that the cloud storage
- provider cannot see your data. git-annex keeps track of where each file
- is stored, so it knows how many copies are available, and has many
- facilities to ensure your data is preserved.
-
- git-annex can also be used to keep a folder in sync between computers,
- noticing when files are changed, and automatically committing them
- to git and transferring them to other computers. The git-annex webapp
- makes it easy to set up and use git-annex this way.
- </longdescription>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-07-30 5:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-03 22:58 [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-annex/, dev-vcs/git-annex/files/ Sergei Trofimovich
-- strict thread matches above, loose matches on Subject: below --
2022-07-30 5:59 Sam James
2015-08-09 18:25 Sergei Trofimovich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox