public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-annex/
@ 2016-01-22 20:23 Sergei Trofimovich
  0 siblings, 0 replies; 18+ messages in thread
From: Sergei Trofimovich @ 2016-01-22 20:23 UTC (permalink / raw
  To: gentoo-commits

commit:     d22fc278d5994d554e99365e980d64237f2a9350
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 20:21:23 2016 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 20:22:34 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d22fc278

dev-vcs/git-annex: bump up to 5.20151218

Package-Manager: portage-2.2.27

 dev-vcs/git-annex/Manifest                    |   1 +
 dev-vcs/git-annex/git-annex-5.20151218.ebuild | 168 ++++++++++++++++++++++++++
 dev-vcs/git-annex/metadata.xml                |   2 +
 3 files changed, 171 insertions(+)

diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index 94a45b1..89e19fc 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -7,3 +7,4 @@ DIST git-annex-5.20150327.tar.gz 4764485 SHA256 1e309466627eb634816805004391c540
 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
+DIST git-annex-5.20151218.tar.gz 5233343 SHA256 d8aed73cbc1d1eefcbe6de7790c83f1d6458b4ac1e910d9a34b22782d16142ca SHA512 6c572b40f53dc4e8b72a14daf16a94bdf8c53618bbe85d797f2f440ceab42066376e681b228699a76da3a93965cd166aa68c020a48e2fdb1de964ca27aed55a0 WHIRLPOOL 62e24e29e5e2dfc8b6b9c7815fea57d720bd7183ec513b23dd0d8ac9f8182eaa1178b4017ea9e4d221baac3684c67ede1d3809956aabe5ce77ed3600b175bbbf

diff --git a/dev-vcs/git-annex/git-annex-5.20151218.ebuild b/dev-vcs/git-annex/git-annex-5.20151218.ebuild
new file mode 100644
index 0000000..8e5b052
--- /dev/null
+++ b/dev-vcs/git-annex/git-annex-5.20151218.ebuild
@@ -0,0 +1,168 @@
+# 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="+assistant concurrentoutput cryptonite +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/data-default:=
+	dev-haskell/dlist:=
+	dev-haskell/edit-distance:=
+	>=dev-haskell/exceptions-0.6:=
+	dev-haskell/hslogger:=
+	dev-haskell/http-client:=
+	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.11:=
+	>=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:=
+	assistant? ( inotify? ( dev-haskell/hinotify:= ) )
+	concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= )
+	cryptonite? ( dev-haskell/cryptonite:= )
+	!cryptonite? ( >=dev-haskell/cryptohash-0.11.0:= )
+	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:= )
+	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:= )
+	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}"/${PN}-5.20150731-no-strange-installs.patch
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-android \
+		--flag=-androidsplice \
+		$(cabal_flag assistant assistant) \
+		$(cabal_flag database database) \
+		$(cabal_flag cryptonite Cryptonite) \
+		$(cabal_flag concurrentoutput ConcurrentOutput) \
+		$(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 351a729..e7807d6 100644
--- a/dev-vcs/git-annex/metadata.xml
+++ b/dev-vcs/git-annex/metadata.xml
@@ -22,6 +22,8 @@
 		<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="concurrentoutput">Use concurrent-output library (experimental)</flag>
+		<flag name="cryptonite">Use the cryptonite library, instead of the older cryptohash</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>


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-annex/
@ 2016-02-06 16:52 Sergei Trofimovich
  0 siblings, 0 replies; 18+ messages in thread
From: Sergei Trofimovich @ 2016-02-06 16:52 UTC (permalink / raw
  To: gentoo-commits

commit:     16923880692f85bdf0267429cc7ef4df7eebcd9f
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  6 16:49:15 2016 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Feb  6 16:51:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16923880

dev-vcs/git-annex: bump up to 6.20160126, bug #572996

While at it restored dependencies on non-haskell packages:
    git, ikiwiki, perl, rsync

Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/572996

Package-Manager: portage-2.2.27

 dev-vcs/git-annex/Manifest                    |   1 +
 dev-vcs/git-annex/git-annex-6.20160126.ebuild | 168 ++++++++++++++++++++++++++
 dev-vcs/git-annex/metadata.xml                |   7 +-
 3 files changed, 170 insertions(+), 6 deletions(-)

diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index 89e19fc..14b9723 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -8,3 +8,4 @@ DIST git-annex-5.20150617.tar.gz 5047577 SHA256 2d37c49866880803886fe77be17ac154
 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
 DIST git-annex-5.20151218.tar.gz 5233343 SHA256 d8aed73cbc1d1eefcbe6de7790c83f1d6458b4ac1e910d9a34b22782d16142ca SHA512 6c572b40f53dc4e8b72a14daf16a94bdf8c53618bbe85d797f2f440ceab42066376e681b228699a76da3a93965cd166aa68c020a48e2fdb1de964ca27aed55a0 WHIRLPOOL 62e24e29e5e2dfc8b6b9c7815fea57d720bd7183ec513b23dd0d8ac9f8182eaa1178b4017ea9e4d221baac3684c67ede1d3809956aabe5ce77ed3600b175bbbf
+DIST git-annex-6.20160126.tar.gz 5146331 SHA256 dc59f670a3d0bdb90db8fc6cadba8003708219bb0dc3d56867a9246d825c0d11 SHA512 45828b5e9968ce037e48366deb537353368dbac9145fc93d56921444210c9f0d4af1460c047bcae3e85244ecdf7e272fb65860656a19c449add09bf697c0a37d WHIRLPOOL f9b350968e8e82f7e4523648d5aefd03689123165424e15fee71eaa67345d38a0efe71ea4fc1388b5b683925bc8f638dba130371c4f324ac5910d7a051ae5548

diff --git a/dev-vcs/git-annex/git-annex-6.20160126.ebuild b/dev-vcs/git-annex/git-annex-6.20160126.ebuild
new file mode 100644
index 0000000..cabccbd
--- /dev/null
+++ b/dev-vcs/git-annex/git-annex-6.20160126.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+#hackport: flags: -production,-android,-androidsplice,-testsuite
+
+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="+assistant benchmark +concurrentoutput +cryptonite doc ekg +network-uri +pairing +s3 +torrentparser +webapp +webdav"
+
+RDEPEND="dev-haskell/aeson:=
+	dev-haskell/async:=
+	dev-haskell/bloomfilter:=
+	dev-haskell/case-insensitive:=
+	dev-haskell/data-default:=
+	>=dev-haskell/dbus-0.10.7:=
+	dev-haskell/dlist:=
+	dev-haskell/edit-distance:=
+	dev-haskell/esqueleto:=
+	>=dev-haskell/exceptions-0.6:=
+	>=dev-haskell/fdo-notify-0.3:=
+	dev-haskell/feed:=
+	>=dev-haskell/gnutls-0.1.4:=
+	dev-haskell/hslogger:=
+	dev-haskell/http-client:=
+	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/network-protocol-xmpp:=
+	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/stm-2.3:=
+	dev-haskell/text:=
+	dev-haskell/transformers:=
+	dev-haskell/unix-compat:=
+	dev-haskell/utf8-string:=
+	dev-haskell/uuid:=
+	dev-haskell/xml-types:=
+	>=dev-lang/ghc-7.6.1:=
+	assistant? ( dev-haskell/dns:=
+			dev-haskell/hinotify:= )
+	benchmark? ( dev-haskell/criterion:= )
+	concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= )
+	cryptonite? ( dev-haskell/cryptonite:= )
+	!cryptonite? ( >=dev-haskell/cryptohash-0.11.0:= )
+	ekg? ( dev-haskell/ekg:= )
+	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:= )
+	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/byteable:=
+			dev-haskell/clientsession:=
+			dev-haskell/crypto-api:=
+			>=dev-haskell/path-pieces-0.1.4:=
+			dev-haskell/securemem:=
+			>=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.16.0
+"
+
+# not generated by hackport:
+DEPEND="${DEPEND}
+	dev-lang/perl
+	doc? ( www-apps/ikiwiki net-misc/rsync )
+"
+
+src_prepare() {
+	# does not respect staging dir
+	epatch "${FILESDIR}"/${PN}-5.20150731-no-strange-installs.patch
+	epatch "${FILESDIR}"/${PN}-6.20160114-QC-2.8.2.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 cryptonite cryptonite) \
+		$(cabal_flag ekg ekg) \
+		$(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_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 cd2b660..d98d30d 100644
--- a/dev-vcs/git-annex/metadata.xml
+++ b/dev-vcs/git-annex/metadata.xml
@@ -21,26 +21,21 @@
 	</longdescription>
 	<use>
 		<flag name="assistant">Enable git-annex assistant and watch command</flag>
-		<flag name="android">Building for Android</flag>
-		<flag name="androidsplice">Get TH splices for Android.</flag>
+		<flag name="benchmark">Enable benchmarking</flag>
 		<flag name="asciiprogress">Use ascii-progress library (experimental)</flag>
-		<flag name="cryptohash">Enable use of cryptohash for checksumming</flag>
 		<flag name="concurrentoutput">Use concurrent-output library (experimental)</flag>
 		<flag name="cryptonite">Use the cryptonite library, instead of the older cryptohash</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>
 		<flag name="s3">Enable Amazon S3 remote</flag>
 		<flag name="tahoe">Enable the tahoe special remote</flag>
 		<flag name="tdfa">Use regex-tdfa for wildcards</flag>
-		<flag name="testsuite">Embed the test suite into git-annex</flag>
 		<flag name="torrentparser">Use haskell torrent library to parse torrent files</flag>
 		<flag name="webapp">Enable git-annex webapp</flag>
 		<flag name="webapp-secure">Secure webapp</flag>


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-annex/
@ 2016-02-06 16:52 Sergei Trofimovich
  0 siblings, 0 replies; 18+ messages in thread
From: Sergei Trofimovich @ 2016-02-06 16:52 UTC (permalink / raw
  To: gentoo-commits

commit:     ec6018fa7403251a97322f2ce32996b336598231
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  6 16:50:04 2016 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Feb  6 16:51:54 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec6018fa

dev-vcs/git-annex: drop old

Package-Manager: portage-2.2.27

 dev-vcs/git-annex/Manifest                    |   8 --
 dev-vcs/git-annex/git-annex-5.20140927.ebuild | 162 -----------------------
 dev-vcs/git-annex/git-annex-5.20141125.ebuild | 162 -----------------------
 dev-vcs/git-annex/git-annex-5.20141203.ebuild | 165 ------------------------
 dev-vcs/git-annex/git-annex-5.20141231.ebuild | 173 -------------------------
 dev-vcs/git-annex/git-annex-5.20150219.ebuild | 172 -------------------------
 dev-vcs/git-annex/git-annex-5.20150327.ebuild | 172 -------------------------
 dev-vcs/git-annex/git-annex-5.20150617.ebuild | 178 --------------------------
 dev-vcs/git-annex/git-annex-5.20150710.ebuild | 178 --------------------------
 9 files changed, 1370 deletions(-)

diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index 14b9723..e13637c 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -1,11 +1,3 @@
-DIST git-annex-5.20140927.tar.gz 4547006 SHA256 532b36a4a33909b9835a19888b1678251a0b99b1a1f82e94755bb5cc2e7af50b SHA512 7851b773a296efc3c4d3ae36ce240ca466b42d87d32f8635ae1dc8457064c20b2521c0fe3c123554e0d2e2e35346f03a3c25ae94f47f2a2d902a73629f0c6535 WHIRLPOOL bc30b2b7833f46a5633012f072a901142c2a6bc5fbca198c3d391fe336c2c88d3ae2491a439692fe32eb1b217d8a9c6b8baad931f462660b0c4a3cccb1ba44b0
-DIST git-annex-5.20141125.tar.gz 4580886 SHA256 ba26d0459d74d818b7ecc8153856ffccfcd7068dbea344334438a698dd689a66 SHA512 44feb1ecfe6c0f08c8c69b11efa9b81b5e420019321f27b825ae831c04e0e8ad307cea73e6c52ab1f73f2bebdd6476012e5eab1e823a9ded7d6c865e7fd24350 WHIRLPOOL 57ed46a1a8bd43fd12c05c2eee9da2bad529cde7ba424e7607858637e9394b280789edba5ae5c9e0547ad6d6a4ee48fd920c29cab87aacfebf4cf3b527aa58ce
-DIST git-annex-5.20141203.tar.gz 4611768 SHA256 d36d07fe592b27e7e4e363de3ddccb5cc4a8f189c30c58cfdb4524837473f105 SHA512 a16cc0d000cde3cc7ebad1a8eac17ba2d3efed2ac11090c1d8247a30c341fcb38bc32dccf6a8f6fe05c31fd22dc50ea2a292711a2edb43ab96275fd157030481 WHIRLPOOL a4c393e29d441b36ca56c88f1690235fc1939af0ad1834239d2a80896ae8e8cb0dc1586d87b4493803d0984dc5666550a69f1d03f44488cadcb1430f7e003225
-DIST git-annex-5.20141231.tar.gz 4635173 SHA256 ce7f8e1a6f9049e9864a125a10672d577605ecbb45bb83401af6d6c128533c67 SHA512 d9b0db8084f08a8a2408ea1af1bc95c20591e573cddef866a9eed84319a7fff774d482d464a390c10468436dabb69fdd2cf177afb4600ef2300ae0f08b284e6e WHIRLPOOL 053b76ee765cc5b01900a7c3c115a736dff67e50b4847e552e6e1adae10344219698f59969509f2248e589ea7a6eb32991d2e4646c02b2b1a703c8269fdc1352
-DIST git-annex-5.20150219.tar.gz 4688334 SHA256 46c1d2a338a4f54774060b39fe5e864551d047b0d04eee158b3c2cb947085d5f SHA512 006ef74ba687bd97f93fb91f3ee675551abecfe019e45696bdc783523e8559ffeb9a8e521b488b695518b2fb001b2db2826ad53c5af2199d487cd664f2a9ee13 WHIRLPOOL 1e2f16af86915ec433c38eedad994538b13f56d7f0e3b35d648bc2872abef78acdac4b19b4983101f697dd138a3deaa60451196ad13a8b083dd0c6dc1c712de1
-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
 DIST git-annex-5.20151218.tar.gz 5233343 SHA256 d8aed73cbc1d1eefcbe6de7790c83f1d6458b4ac1e910d9a34b22782d16142ca SHA512 6c572b40f53dc4e8b72a14daf16a94bdf8c53618bbe85d797f2f440ceab42066376e681b228699a76da3a93965cd166aa68c020a48e2fdb1de964ca27aed55a0 WHIRLPOOL 62e24e29e5e2dfc8b6b9c7815fea57d720bd7183ec513b23dd0d8ac9f8182eaa1178b4017ea9e4d221baac3684c67ede1d3809956aabe5ce77ed3600b175bbbf
 DIST git-annex-6.20160126.tar.gz 5146331 SHA256 dc59f670a3d0bdb90db8fc6cadba8003708219bb0dc3d56867a9246d825c0d11 SHA512 45828b5e9968ce037e48366deb537353368dbac9145fc93d56921444210c9f0d4af1460c047bcae3e85244ecdf7e272fb65860656a19c449add09bf697c0a37d WHIRLPOOL f9b350968e8e82f7e4523648d5aefd03689123165424e15fee71eaa67345d38a0efe71ea4fc1388b5b683925bc8f638dba130371c4f324ac5910d7a051ae5548

diff --git a/dev-vcs/git-annex/git-annex-5.20140927.ebuild b/dev-vcs/git-annex/git-annex-5.20140927.ebuild
deleted file mode 100644
index b5e0a87..0000000
--- a/dev-vcs/git-annex/git-annex-5.20140927.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5
-
-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="android androidsplice +assistant +cryptohash +dbus +dns doc +desktop-notify ekg +feed +inotify +pairing +production +quvi +s3 +tahoe +tdfa +testsuite +webapp +webapp-secure +webdav +xmpp"
-
-RDEPEND="dev-vcs/git
-"
-DEPEND="${RDEPEND}
-	dev-haskell/async
-	dev-haskell/bloomfilter
-	>=dev-haskell/cabal-1.8
-	dev-haskell/case-insensitive
-	dev-haskell/dataenc
-	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[generic]
-	dev-haskell/missingh
-	dev-haskell/monad-control
-	>=dev-haskell/mtl-2
-	>=dev-haskell/network-2.0
-	>=dev-haskell/quickcheck-2.1:2
-	dev-haskell/random
-	dev-haskell/safesemaphore
-	dev-haskell/sha
-	>=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.4.1
-	android? ( dev-haskell/data-endian )
-	assistant? ( >=dev-haskell/stm-2.3
-			inotify? ( dev-haskell/hinotify ) )
-	cryptohash? ( >=dev-haskell/cryptohash-0.10.0 )
-	dbus? ( >=dev-haskell/dbus-0.10.3 )
-	dns? ( dev-haskell/dns )
-	ekg? ( dev-haskell/aeson
-		dev-haskell/ekg
-		dev-haskell/http-types )
-	feed? ( dev-haskell/feed )
-	pairing? ( dev-haskell/network-info
-			dev-haskell/network-multicast )
-	quvi? ( dev-haskell/aeson )
-	s3? ( dev-haskell/hs3 )
-	tdfa? ( dev-haskell/regex-tdfa )
-	tahoe? ( dev-haskell/aeson )
-	testsuite? (
-			dev-haskell/crypto-api
-			>=dev-haskell/tasty-0.7
-			dev-haskell/tasty-hunit
-			dev-haskell/tasty-quickcheck
-			dev-haskell/tasty-rerun
-			>=dev-haskell/optparse-applicative-0.9.1
-			)
-	webapp? ( dev-haskell/blaze-builder
-			dev-haskell/aeson
-			dev-haskell/clientsession
-			dev-haskell/crypto-api
-			dev-haskell/hamlet
-			dev-haskell/http-types
-			dev-haskell/path-pieces
-			dev-haskell/transformers
-			dev-haskell/shakespeare
-			dev-haskell/wai
-			dev-haskell/wai-extra
-			dev-haskell/warp
-			dev-haskell/warp-tls
-			dev-haskell/yesod
-			dev-haskell/yesod-core
-			dev-haskell/yesod-default
-			dev-haskell/yesod-form
-			dev-haskell/yesod-static
-			webapp-secure? ( dev-haskell/warp-tls
-					dev-haskell/securemem
-					dev-haskell/byteable ) )
-	webdav? ( >=dev-haskell/dav-1.0
-			dev-haskell/http-client
-			dev-haskell/xml-conduit )
-	xmpp? ( >=dev-haskell/gnutls-0.1.4
-		dev-haskell/network-protocol-xmpp
-		dev-haskell/xml-types )
-		dev-lang/perl
-	doc? ( www-apps/ikiwiki net-misc/rsync )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag android android) \
-		$(cabal_flag androidsplice androidsplice) \
-		$(cabal_flag assistant assistant) \
-		$(cabal_flag cryptohash cryptohash) \
-		$(cabal_flag dbus dbus) \
-		$(cabal_flag desktop-notify desktop-notify) \
-		$(cabal_flag dns dns) \
-		$(cabal_flag ekg ekg) \
-		$(cabal_flag feed feed) \
-		$(cabal_flag inotify inotify) \
-		$(cabal_flag pairing pairing) \
-		$(cabal_flag production production) \
-		$(cabal_flag quvi quvi) \
-		$(cabal_flag s3 s3) \
-		$(cabal_flag tahoe tahoe) \
-		$(cabal_flag tdfa tdfa) \
-		$(cabal_flag testsuite testsuite) \
-		$(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/git-annex-5.20141125.ebuild b/dev-vcs/git-annex/git-annex-5.20141125.ebuild
deleted file mode 100644
index b5e0a87..0000000
--- a/dev-vcs/git-annex/git-annex-5.20141125.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5
-
-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="android androidsplice +assistant +cryptohash +dbus +dns doc +desktop-notify ekg +feed +inotify +pairing +production +quvi +s3 +tahoe +tdfa +testsuite +webapp +webapp-secure +webdav +xmpp"
-
-RDEPEND="dev-vcs/git
-"
-DEPEND="${RDEPEND}
-	dev-haskell/async
-	dev-haskell/bloomfilter
-	>=dev-haskell/cabal-1.8
-	dev-haskell/case-insensitive
-	dev-haskell/dataenc
-	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[generic]
-	dev-haskell/missingh
-	dev-haskell/monad-control
-	>=dev-haskell/mtl-2
-	>=dev-haskell/network-2.0
-	>=dev-haskell/quickcheck-2.1:2
-	dev-haskell/random
-	dev-haskell/safesemaphore
-	dev-haskell/sha
-	>=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.4.1
-	android? ( dev-haskell/data-endian )
-	assistant? ( >=dev-haskell/stm-2.3
-			inotify? ( dev-haskell/hinotify ) )
-	cryptohash? ( >=dev-haskell/cryptohash-0.10.0 )
-	dbus? ( >=dev-haskell/dbus-0.10.3 )
-	dns? ( dev-haskell/dns )
-	ekg? ( dev-haskell/aeson
-		dev-haskell/ekg
-		dev-haskell/http-types )
-	feed? ( dev-haskell/feed )
-	pairing? ( dev-haskell/network-info
-			dev-haskell/network-multicast )
-	quvi? ( dev-haskell/aeson )
-	s3? ( dev-haskell/hs3 )
-	tdfa? ( dev-haskell/regex-tdfa )
-	tahoe? ( dev-haskell/aeson )
-	testsuite? (
-			dev-haskell/crypto-api
-			>=dev-haskell/tasty-0.7
-			dev-haskell/tasty-hunit
-			dev-haskell/tasty-quickcheck
-			dev-haskell/tasty-rerun
-			>=dev-haskell/optparse-applicative-0.9.1
-			)
-	webapp? ( dev-haskell/blaze-builder
-			dev-haskell/aeson
-			dev-haskell/clientsession
-			dev-haskell/crypto-api
-			dev-haskell/hamlet
-			dev-haskell/http-types
-			dev-haskell/path-pieces
-			dev-haskell/transformers
-			dev-haskell/shakespeare
-			dev-haskell/wai
-			dev-haskell/wai-extra
-			dev-haskell/warp
-			dev-haskell/warp-tls
-			dev-haskell/yesod
-			dev-haskell/yesod-core
-			dev-haskell/yesod-default
-			dev-haskell/yesod-form
-			dev-haskell/yesod-static
-			webapp-secure? ( dev-haskell/warp-tls
-					dev-haskell/securemem
-					dev-haskell/byteable ) )
-	webdav? ( >=dev-haskell/dav-1.0
-			dev-haskell/http-client
-			dev-haskell/xml-conduit )
-	xmpp? ( >=dev-haskell/gnutls-0.1.4
-		dev-haskell/network-protocol-xmpp
-		dev-haskell/xml-types )
-		dev-lang/perl
-	doc? ( www-apps/ikiwiki net-misc/rsync )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag android android) \
-		$(cabal_flag androidsplice androidsplice) \
-		$(cabal_flag assistant assistant) \
-		$(cabal_flag cryptohash cryptohash) \
-		$(cabal_flag dbus dbus) \
-		$(cabal_flag desktop-notify desktop-notify) \
-		$(cabal_flag dns dns) \
-		$(cabal_flag ekg ekg) \
-		$(cabal_flag feed feed) \
-		$(cabal_flag inotify inotify) \
-		$(cabal_flag pairing pairing) \
-		$(cabal_flag production production) \
-		$(cabal_flag quvi quvi) \
-		$(cabal_flag s3 s3) \
-		$(cabal_flag tahoe tahoe) \
-		$(cabal_flag tdfa tdfa) \
-		$(cabal_flag testsuite testsuite) \
-		$(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/git-annex-5.20141203.ebuild b/dev-vcs/git-annex/git-annex-5.20141203.ebuild
deleted file mode 100644
index 8fc0419..0000000
--- a/dev-vcs/git-annex/git-annex-5.20141203.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5
-
-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="android androidsplice +assistant +cryptohash +dbus +dns doc +desktop-notify ekg +feed +inotify +pairing +production +quvi +s3 +tahoe +tdfa +testsuite +webapp +webapp-secure +webdav +xmpp"
-
-RDEPEND="dev-vcs/git
-"
-DEPEND="${RDEPEND}
-	dev-haskell/async
-	dev-haskell/bloomfilter
-	>=dev-haskell/cabal-1.8
-	dev-haskell/case-insensitive
-	dev-haskell/dataenc
-	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[generic]
-	dev-haskell/missingh
-	dev-haskell/monad-control
-	>=dev-haskell/mtl-2
-	>=dev-haskell/network-2.0
-	>=dev-haskell/quickcheck-2.1:2
-	dev-haskell/random
-	dev-haskell/safesemaphore
-	dev-haskell/sha
-	>=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.4.1
-	android? ( dev-haskell/data-endian )
-	assistant? ( >=dev-haskell/stm-2.3
-			inotify? ( dev-haskell/hinotify ) )
-	cryptohash? ( >=dev-haskell/cryptohash-0.10.0 )
-	dbus? ( >=dev-haskell/dbus-0.10.3 )
-	dns? ( dev-haskell/dns )
-	ekg? ( dev-haskell/aeson
-		dev-haskell/ekg
-		dev-haskell/http-types )
-	feed? ( dev-haskell/feed )
-	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/resourcet )
-	tdfa? ( dev-haskell/regex-tdfa )
-	tahoe? ( dev-haskell/aeson )
-	testsuite? (
-			dev-haskell/crypto-api
-			>=dev-haskell/tasty-0.7
-			dev-haskell/tasty-hunit
-			dev-haskell/tasty-quickcheck
-			dev-haskell/tasty-rerun
-			>=dev-haskell/optparse-applicative-0.9.1
-			)
-	webapp? ( dev-haskell/blaze-builder
-			dev-haskell/aeson
-			dev-haskell/clientsession
-			dev-haskell/crypto-api
-			dev-haskell/hamlet
-			dev-haskell/http-types
-			dev-haskell/path-pieces
-			dev-haskell/transformers
-			dev-haskell/shakespeare
-			dev-haskell/wai
-			dev-haskell/wai-extra
-			dev-haskell/warp
-			dev-haskell/warp-tls
-			dev-haskell/yesod
-			dev-haskell/yesod-core
-			dev-haskell/yesod-default
-			dev-haskell/yesod-form
-			dev-haskell/yesod-static
-			webapp-secure? ( dev-haskell/warp-tls
-					dev-haskell/securemem
-					dev-haskell/byteable ) )
-	webdav? ( >=dev-haskell/dav-1.0
-			dev-haskell/http-client
-			dev-haskell/xml-conduit )
-	xmpp? ( >=dev-haskell/gnutls-0.1.4
-		dev-haskell/network-protocol-xmpp
-		dev-haskell/xml-types )
-		dev-lang/perl
-	doc? ( www-apps/ikiwiki net-misc/rsync )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag android android) \
-		$(cabal_flag androidsplice androidsplice) \
-		$(cabal_flag assistant assistant) \
-		$(cabal_flag cryptohash cryptohash) \
-		$(cabal_flag dbus dbus) \
-		$(cabal_flag desktop-notify desktop-notify) \
-		$(cabal_flag dns dns) \
-		$(cabal_flag ekg ekg) \
-		$(cabal_flag feed feed) \
-		$(cabal_flag inotify inotify) \
-		$(cabal_flag pairing pairing) \
-		$(cabal_flag production production) \
-		$(cabal_flag quvi quvi) \
-		$(cabal_flag s3 s3) \
-		$(cabal_flag tahoe tahoe) \
-		$(cabal_flag tdfa tdfa) \
-		$(cabal_flag testsuite testsuite) \
-		$(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/git-annex-5.20141231.ebuild b/dev-vcs/git-annex/git-annex-5.20141231.ebuild
deleted file mode 100644
index 914cf06..0000000
--- a/dev-vcs/git-annex/git-annex-5.20141231.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5
-
-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="android androidsplice +assistant +cryptohash +dbus +dns doc +desktop-notify ekg +feed +inotify +pairing +production +quvi +s3 +tahoe +tdfa +testsuite torrentparser +webapp +webapp-secure +webdav +xmpp"
-
-RDEPEND="dev-vcs/git
-"
-DEPEND="${RDEPEND}
-	dev-haskell/async
-	dev-haskell/bloomfilter
-	>=dev-haskell/cabal-1.8
-	dev-haskell/case-insensitive
-	dev-haskell/dataenc
-	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[generic]
-	dev-haskell/missingh
-	dev-haskell/monad-control
-	>=dev-haskell/mtl-2
-	>=dev-haskell/network-2.0
-	dev-haskell/network-uri
-	>=dev-haskell/quickcheck-2.1:2
-	dev-haskell/random
-	dev-haskell/safesemaphore
-	dev-haskell/sha
-	>=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.4.1
-	android? ( dev-haskell/data-endian )
-	assistant? ( >=dev-haskell/stm-2.3
-			inotify? ( dev-haskell/hinotify ) )
-	cryptohash? ( >=dev-haskell/cryptohash-0.10.0 )
-	dbus? ( >=dev-haskell/dbus-0.10.3 )
-	dns? ( dev-haskell/dns )
-	ekg? ( dev-haskell/aeson
-		dev-haskell/ekg
-		dev-haskell/http-types )
-	feed? ( dev-haskell/feed )
-	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
-		dev-haskell/resourcet )
-	tdfa? ( dev-haskell/regex-tdfa )
-	tahoe? ( dev-haskell/aeson )
-	testsuite? (
-			dev-haskell/crypto-api
-			>=dev-haskell/tasty-0.7
-			dev-haskell/tasty-hunit
-			dev-haskell/tasty-quickcheck
-			dev-haskell/tasty-rerun
-			>=dev-haskell/optparse-applicative-0.9.1
-			)
-	torrentparser? ( >=dev-haskell/torrent-10000.0.0 )
-	webapp? ( dev-haskell/blaze-builder
-			dev-haskell/aeson
-			dev-haskell/clientsession
-			dev-haskell/crypto-api
-			dev-haskell/hamlet
-			dev-haskell/http-types
-			dev-haskell/path-pieces
-			dev-haskell/transformers
-			dev-haskell/shakespeare
-			dev-haskell/wai
-			dev-haskell/wai-extra
-			dev-haskell/warp
-			dev-haskell/warp-tls
-			dev-haskell/yesod
-			dev-haskell/yesod-core
-			dev-haskell/yesod-default
-			dev-haskell/yesod-form
-			dev-haskell/yesod-static
-			webapp-secure? ( dev-haskell/warp-tls
-					dev-haskell/securemem
-					dev-haskell/byteable ) )
-	webdav? ( >=dev-haskell/dav-1.0
-			dev-haskell/http-client
-			dev-haskell/xml-conduit )
-	xmpp? ( >=dev-haskell/gnutls-0.1.4
-		dev-haskell/network-protocol-xmpp
-		dev-haskell/xml-types )
-		dev-lang/perl
-	doc? ( www-apps/ikiwiki net-misc/rsync )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag android android) \
-		$(cabal_flag androidsplice androidsplice) \
-		$(cabal_flag assistant assistant) \
-		$(cabal_flag cryptohash cryptohash) \
-		$(cabal_flag dbus dbus) \
-		$(cabal_flag desktop-notify desktop-notify) \
-		$(cabal_flag dns dns) \
-		$(cabal_flag ekg ekg) \
-		$(cabal_flag feed feed) \
-		$(cabal_flag inotify inotify) \
-		$(cabal_flag pairing pairing) \
-		$(cabal_flag production production) \
-		$(cabal_flag quvi quvi) \
-		$(cabal_flag s3 s3) \
-		$(cabal_flag tahoe tahoe) \
-		$(cabal_flag tdfa tdfa) \
-		$(cabal_flag testsuite testsuite) \
-		$(cabal_flag webapp webapp) \
-		$(cabal_flag webapp-secure webapp-secure) \
-		$(cabal_flag webdav webdav) \
-		$(cabal_flag xmpp xmpp)
-}
-
-src_prepare() {
-	cabal_chdeps \
-		', aws (>= 0.9.2)' ', aws (>= 0.9.2), http-client'
-}
-
-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/git-annex-5.20150219.ebuild b/dev-vcs/git-annex/git-annex-5.20150219.ebuild
deleted file mode 100644
index 54c050f..0000000
--- a/dev-vcs/git-annex/git-annex-5.20150219.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5
-
-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="android androidsplice +assistant +dbus +dns doc +desktop-notify ekg +feed +inotify +pairing +production +quvi +s3 +tahoe +tdfa +testsuite torrentparser +webapp +webapp-secure +webdav +xmpp"
-
-RDEPEND="dev-vcs/git
-"
-DEPEND="${RDEPEND}
-	dev-haskell/async
-	dev-haskell/bloomfilter
-	>=dev-haskell/cabal-1.8
-	dev-haskell/case-insensitive
-	>=dev-haskell/cryptohash-0.10.0
-	dev-haskell/dataenc
-	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[generic]
-	dev-haskell/missingh
-	dev-haskell/monad-control
-	>=dev-haskell/mtl-2
-	>=dev-haskell/network-2.0
-	dev-haskell/network-uri
-	>=dev-haskell/quickcheck-2.1:2
-	dev-haskell/random
-	dev-haskell/safesemaphore
-	dev-haskell/sha
-	>=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.4.1
-	android? ( dev-haskell/data-endian )
-	assistant? ( >=dev-haskell/stm-2.3
-			inotify? ( dev-haskell/hinotify ) )
-	dbus? ( >=dev-haskell/dbus-0.10.3 )
-	dns? ( dev-haskell/dns )
-	ekg? ( dev-haskell/aeson
-		dev-haskell/ekg
-		dev-haskell/http-types )
-	feed? ( dev-haskell/feed )
-	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
-		dev-haskell/resourcet )
-	tdfa? ( dev-haskell/regex-tdfa )
-	tahoe? ( dev-haskell/aeson )
-	testsuite? (
-			dev-haskell/crypto-api
-			>=dev-haskell/tasty-0.7
-			dev-haskell/tasty-hunit
-			dev-haskell/tasty-quickcheck
-			dev-haskell/tasty-rerun
-			>=dev-haskell/optparse-applicative-0.9.1
-			)
-	torrentparser? ( >=dev-haskell/torrent-10000.0.0 )
-	webapp? ( dev-haskell/blaze-builder
-			dev-haskell/aeson
-			dev-haskell/clientsession
-			dev-haskell/crypto-api
-			dev-haskell/hamlet
-			dev-haskell/http-types
-			dev-haskell/path-pieces
-			dev-haskell/transformers
-			dev-haskell/shakespeare
-			dev-haskell/wai
-			dev-haskell/wai-extra
-			dev-haskell/warp
-			dev-haskell/warp-tls
-			dev-haskell/yesod
-			dev-haskell/yesod-core
-			dev-haskell/yesod-default
-			dev-haskell/yesod-form
-			dev-haskell/yesod-static
-			webapp-secure? ( dev-haskell/warp-tls
-					dev-haskell/securemem
-					dev-haskell/byteable ) )
-	webdav? ( >=dev-haskell/dav-1.0
-			dev-haskell/http-client
-			dev-haskell/xml-conduit )
-	xmpp? ( >=dev-haskell/gnutls-0.1.4
-		dev-haskell/network-protocol-xmpp
-		dev-haskell/xml-types )
-		dev-lang/perl
-	doc? ( www-apps/ikiwiki net-misc/rsync )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag android android) \
-		$(cabal_flag androidsplice androidsplice) \
-		$(cabal_flag assistant assistant) \
-		$(cabal_flag dbus dbus) \
-		$(cabal_flag desktop-notify desktop-notify) \
-		$(cabal_flag dns dns) \
-		$(cabal_flag ekg ekg) \
-		$(cabal_flag feed feed) \
-		$(cabal_flag inotify inotify) \
-		$(cabal_flag pairing pairing) \
-		$(cabal_flag production production) \
-		$(cabal_flag quvi quvi) \
-		$(cabal_flag s3 s3) \
-		$(cabal_flag tahoe tahoe) \
-		$(cabal_flag tdfa tdfa) \
-		$(cabal_flag testsuite testsuite) \
-		$(cabal_flag webapp webapp) \
-		$(cabal_flag webapp-secure webapp-secure) \
-		$(cabal_flag webdav webdav) \
-		$(cabal_flag xmpp xmpp)
-}
-
-src_prepare() {
-	cabal_chdeps \
-		', aws (>= 0.9.2)' ', aws (>= 0.9.2), http-client'
-}
-
-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/git-annex-5.20150327.ebuild b/dev-vcs/git-annex/git-annex-5.20150327.ebuild
deleted file mode 100644
index 8a8fe43..0000000
--- a/dev-vcs/git-annex/git-annex-5.20150327.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5
-
-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="android androidsplice +assistant +dbus +dns doc +desktop-notify ekg +feed +inotify +pairing +production +quvi +s3 +tahoe +tdfa +testsuite torrentparser +webapp +webapp-secure +webdav +xmpp"
-
-RDEPEND="dev-vcs/git
-"
-DEPEND="${RDEPEND}
-	dev-haskell/async
-	dev-haskell/bloomfilter
-	>=dev-haskell/cabal-1.8
-	dev-haskell/case-insensitive
-	>=dev-haskell/cryptohash-0.10.0
-	dev-haskell/dataenc
-	dev-haskell/data-default
-	dev-haskell/dlist
-	dev-haskell/edit-distance
-	dev-haskell/esqueleto
-	>=dev-haskell/exceptions-0.6
-	dev-haskell/hslogger
-	dev-haskell/http-conduit
-	dev-haskell/http-types
-	dev-haskell/ifelse
-	dev-haskell/json[generic]
-	dev-haskell/missingh
-	dev-haskell/monad-control
-	dev-haskell/monad-logger
-	>=dev-haskell/mtl-2
-	>=dev-haskell/network-2.0
-	dev-haskell/network-uri
-	dev-haskell/persistent
-	dev-haskell/persistent-sqlite
-	dev-haskell/persistent-template
-	>=dev-haskell/quickcheck-2.1:2
-	dev-haskell/random
-	dev-haskell/resourcet
-	dev-haskell/safesemaphore
-	dev-haskell/sha
-	>=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.4.1
-	android? ( dev-haskell/data-endian )
-	assistant? ( >=dev-haskell/stm-2.3
-			inotify? ( dev-haskell/hinotify ) )
-	dbus? ( >=dev-haskell/dbus-0.10.3 )
-	dns? ( dev-haskell/dns )
-	ekg? ( dev-haskell/aeson
-		dev-haskell/ekg
-		dev-haskell/http-types )
-	feed? ( >=dev-haskell/feed-0.3.4 )
-	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 )
-	tdfa? ( dev-haskell/regex-tdfa )
-	tahoe? ( dev-haskell/aeson )
-	testsuite? (
-			dev-haskell/crypto-api
-			>=dev-haskell/tasty-0.7
-			dev-haskell/tasty-hunit
-			dev-haskell/tasty-quickcheck
-			dev-haskell/tasty-rerun
-			>=dev-haskell/optparse-applicative-0.9.1
-			)
-	torrentparser? ( >=dev-haskell/torrent-10000.0.0 )
-	webapp? ( dev-haskell/blaze-builder
-			dev-haskell/aeson
-			dev-haskell/clientsession
-			dev-haskell/crypto-api
-			dev-haskell/hamlet
-			dev-haskell/http-types
-			dev-haskell/path-pieces
-			dev-haskell/transformers
-			dev-haskell/shakespeare
-			dev-haskell/wai
-			dev-haskell/wai-extra
-			dev-haskell/warp
-			dev-haskell/warp-tls
-			dev-haskell/yesod
-			dev-haskell/yesod-core
-			dev-haskell/yesod-default
-			dev-haskell/yesod-form
-			dev-haskell/yesod-static
-			webapp-secure? ( dev-haskell/warp-tls
-					dev-haskell/securemem
-					dev-haskell/byteable ) )
-	webdav? ( >=dev-haskell/dav-1.0
-			dev-haskell/http-client
-			dev-haskell/xml-conduit )
-	xmpp? ( >=dev-haskell/gnutls-0.1.4
-		dev-haskell/network-protocol-xmpp
-		dev-haskell/xml-types )
-		dev-lang/perl
-	doc? ( www-apps/ikiwiki net-misc/rsync )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag android android) \
-		$(cabal_flag androidsplice androidsplice) \
-		$(cabal_flag assistant assistant) \
-		$(cabal_flag dbus dbus) \
-		$(cabal_flag desktop-notify desktop-notify) \
-		$(cabal_flag dns dns) \
-		$(cabal_flag ekg ekg) \
-		$(cabal_flag feed feed) \
-		$(cabal_flag inotify inotify) \
-		$(cabal_flag pairing pairing) \
-		$(cabal_flag production production) \
-		$(cabal_flag quvi quvi) \
-		$(cabal_flag s3 s3) \
-		$(cabal_flag tahoe tahoe) \
-		$(cabal_flag tdfa tdfa) \
-		$(cabal_flag testsuite testsuite) \
-		$(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/git-annex-5.20150617.ebuild b/dev-vcs/git-annex/git-annex-5.20150617.ebuild
deleted file mode 100644
index f98fc6e..0000000
--- a/dev-vcs/git-annex/git-annex-5.20150617.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5
-
-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="android androidsplice asciiprogress +assistant +dbus +dns doc +desktop-notify ekg +feed +inotify +pairing +production +quvi +s3 +tahoe +tdfa +testsuite torrentparser +webapp +webapp-secure +webdav +xmpp"
-
-RDEPEND="dev-vcs/git
-"
-DEPEND="${RDEPEND}
-	dev-haskell/async
-	dev-haskell/bloomfilter
-	>=dev-haskell/cabal-1.8
-	dev-haskell/case-insensitive
-	>=dev-haskell/cryptohash-0.11.0
-	dev-haskell/data-default
-	dev-haskell/dlist
-	dev-haskell/edit-distance
-	dev-haskell/esqueleto
-	>=dev-haskell/exceptions-0.6
-	dev-haskell/hslogger
-	dev-haskell/http-conduit
-	dev-haskell/http-types
-	dev-haskell/ifelse
-	dev-haskell/json[generic]
-	dev-haskell/missingh
-	dev-haskell/monad-control
-	dev-haskell/monad-logger
-	>=dev-haskell/mtl-2
-	>=dev-haskell/network-2.0
-	dev-haskell/network-uri
-	dev-haskell/persistent
-	dev-haskell/persistent-sqlite
-	dev-haskell/persistent-template
-	>=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.4.1
-	android? ( dev-haskell/data-endian )
-	asciiprogress? ( dev-haskell/ascii-progress
-		dev-haskell/terminal-size )
-	assistant? ( >=dev-haskell/stm-2.3
-			inotify? ( dev-haskell/hinotify ) )
-	dbus? ( >=dev-haskell/dbus-0.10.3 )
-	dns? ( dev-haskell/dns )
-	ekg? ( dev-haskell/aeson
-		dev-haskell/ekg
-		dev-haskell/http-types )
-	feed? ( >=dev-haskell/feed-0.3.4 )
-	dev-haskell/old-locale
-	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 )
-	tdfa? ( dev-haskell/regex-tdfa )
-	tahoe? ( dev-haskell/aeson )
-	testsuite? (
-			dev-haskell/crypto-api
-			>=dev-haskell/tasty-0.7
-			dev-haskell/tasty-hunit
-			dev-haskell/tasty-quickcheck
-			dev-haskell/tasty-rerun
-			>=dev-haskell/optparse-applicative-0.9.1
-			)
-	torrentparser? ( >=dev-haskell/torrent-10000.0.0 )
-	webapp? ( dev-haskell/blaze-builder
-			dev-haskell/aeson
-			dev-haskell/clientsession
-			dev-haskell/crypto-api
-			dev-haskell/http-types
-			>=dev-haskell/path-pieces-0.1.4
-			dev-haskell/transformers
-			>=dev-haskell/shakespeare-2
-			dev-haskell/wai
-			dev-haskell/wai-extra
-			>=dev-haskell/warp-3.0.0.5
-			dev-haskell/warp-tls
-			>=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/warp-tls
-					dev-haskell/securemem
-					dev-haskell/byteable ) )
-	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 )
-		dev-lang/perl
-	doc? ( www-apps/ikiwiki net-misc/rsync )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'ascii-progress (<= 0.2.1.2)' 'ascii-progress'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag android android) \
-		$(cabal_flag androidsplice androidsplice) \
-		$(cabal_flag asciiprogress asciiprogress) \
-		$(cabal_flag assistant assistant) \
-		$(cabal_flag dbus dbus) \
-		$(cabal_flag desktop-notify desktop-notify) \
-		$(cabal_flag dns dns) \
-		$(cabal_flag ekg ekg) \
-		$(cabal_flag feed feed) \
-		$(cabal_flag inotify inotify) \
-		$(cabal_flag pairing pairing) \
-		$(cabal_flag production production) \
-		$(cabal_flag quvi quvi) \
-		$(cabal_flag s3 s3) \
-		$(cabal_flag tahoe tahoe) \
-		$(cabal_flag tdfa tdfa) \
-		$(cabal_flag testsuite testsuite) \
-		$(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/git-annex-5.20150710.ebuild b/dev-vcs/git-annex/git-annex-5.20150710.ebuild
deleted file mode 100644
index 3f9f33f..0000000
--- a/dev-vcs/git-annex/git-annex-5.20150710.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5
-
-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="android androidsplice asciiprogress +assistant +dbus +dns doc +desktop-notify ekg +feed +inotify +pairing +production +quvi +s3 +tahoe +tdfa +testsuite torrentparser +webapp +webapp-secure +webdav +xmpp"
-
-RDEPEND="dev-vcs/git
-"
-DEPEND="${RDEPEND}
-	dev-haskell/async
-	dev-haskell/bloomfilter
-	>=dev-haskell/cabal-1.8
-	dev-haskell/case-insensitive
-	>=dev-haskell/cryptohash-0.11.0
-	dev-haskell/data-default
-	dev-haskell/dlist
-	dev-haskell/edit-distance
-	dev-haskell/esqueleto
-	>=dev-haskell/exceptions-0.6
-	dev-haskell/hslogger
-	dev-haskell/http-conduit
-	dev-haskell/http-types
-	dev-haskell/ifelse
-	dev-haskell/json[generic]
-	dev-haskell/missingh
-	dev-haskell/monad-control
-	dev-haskell/monad-logger
-	>=dev-haskell/mtl-2
-	>=dev-haskell/network-2.0
-	dev-haskell/network-uri
-	dev-haskell/persistent
-	dev-haskell/persistent-sqlite
-	dev-haskell/persistent-template
-	>=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.4.1
-	android? ( dev-haskell/data-endian )
-	asciiprogress? ( dev-haskell/ascii-progress
-		dev-haskell/terminal-size )
-	assistant? ( >=dev-haskell/stm-2.3
-			inotify? ( dev-haskell/hinotify ) )
-	dbus? ( >=dev-haskell/dbus-0.10.3 )
-	dns? ( dev-haskell/dns )
-	ekg? ( dev-haskell/aeson
-		dev-haskell/ekg
-		dev-haskell/http-types )
-	feed? ( >=dev-haskell/feed-0.3.4 )
-	dev-haskell/old-locale
-	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 )
-	tdfa? ( dev-haskell/regex-tdfa )
-	tahoe? ( dev-haskell/aeson )
-	testsuite? (
-			dev-haskell/crypto-api
-			>=dev-haskell/tasty-0.7
-			dev-haskell/tasty-hunit
-			dev-haskell/tasty-quickcheck
-			dev-haskell/tasty-rerun
-			>=dev-haskell/optparse-applicative-0.10
-			)
-	torrentparser? ( >=dev-haskell/torrent-10000.0.0 )
-	webapp? ( dev-haskell/blaze-builder
-			dev-haskell/aeson
-			dev-haskell/clientsession
-			dev-haskell/crypto-api
-			dev-haskell/http-types
-			>=dev-haskell/path-pieces-0.1.4
-			dev-haskell/transformers
-			>=dev-haskell/shakespeare-2
-			dev-haskell/wai
-			dev-haskell/wai-extra
-			>=dev-haskell/warp-3.0.0.5
-			dev-haskell/warp-tls
-			>=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/warp-tls
-					dev-haskell/securemem
-					dev-haskell/byteable ) )
-	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 )
-		dev-lang/perl
-	doc? ( www-apps/ikiwiki net-misc/rsync )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'ascii-progress (<= 0.2.1.2)' 'ascii-progress'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag android android) \
-		$(cabal_flag androidsplice androidsplice) \
-		$(cabal_flag asciiprogress asciiprogress) \
-		$(cabal_flag assistant assistant) \
-		$(cabal_flag dbus dbus) \
-		$(cabal_flag desktop-notify desktop-notify) \
-		$(cabal_flag dns dns) \
-		$(cabal_flag ekg ekg) \
-		$(cabal_flag feed feed) \
-		$(cabal_flag inotify inotify) \
-		$(cabal_flag pairing pairing) \
-		$(cabal_flag production production) \
-		$(cabal_flag quvi quvi) \
-		$(cabal_flag s3 s3) \
-		$(cabal_flag tahoe tahoe) \
-		$(cabal_flag tdfa tdfa) \
-		$(cabal_flag testsuite testsuite) \
-		$(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
-}


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-annex/
@ 2016-04-03 13:39 Sergei Trofimovich
  0 siblings, 0 replies; 18+ messages in thread
From: Sergei Trofimovich @ 2016-04-03 13:39 UTC (permalink / raw
  To: gentoo-commits

commit:     788b585227639893bd575aa6786620d07f65b267
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  3 13:33:15 2016 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Apr  3 13:36:34 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=788b5852

dev-vcs/git-annex: drop old

Package-Manager: portage-2.2.28

 dev-vcs/git-annex/Manifest                    |   2 -
 dev-vcs/git-annex/git-annex-5.20150731.ebuild | 171 --------------------------
 dev-vcs/git-annex/git-annex-5.20151218.ebuild | 169 -------------------------
 3 files changed, 342 deletions(-)

diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index e13637c..e96e42d 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -1,3 +1 @@
-DIST git-annex-5.20150731.tar.gz 5096183 SHA256 a2eefd4c273f5510e8ee384cc4fb512bf10c76cc4b84f6fff5c255223bd853a1 SHA512 edad8fb6aa98ad08cfe8406e2c7b794b0cc3a437f28ed43b5863bbba59a1633e2d6b3a94b6f942494ef7bd912650f7c89ad2a3d54920ff405f4d8d173e1027e9 WHIRLPOOL 945600b49b9f240da37d4642849395fc9ef9a615701a8088b6fb573e098e9b4de5a4bde8714974105a36a963e19a78137abdc513f9a0335ff5fe36981d12be25
-DIST git-annex-5.20151218.tar.gz 5233343 SHA256 d8aed73cbc1d1eefcbe6de7790c83f1d6458b4ac1e910d9a34b22782d16142ca SHA512 6c572b40f53dc4e8b72a14daf16a94bdf8c53618bbe85d797f2f440ceab42066376e681b228699a76da3a93965cd166aa68c020a48e2fdb1de964ca27aed55a0 WHIRLPOOL 62e24e29e5e2dfc8b6b9c7815fea57d720bd7183ec513b23dd0d8ac9f8182eaa1178b4017ea9e4d221baac3684c67ede1d3809956aabe5ce77ed3600b175bbbf
 DIST git-annex-6.20160126.tar.gz 5146331 SHA256 dc59f670a3d0bdb90db8fc6cadba8003708219bb0dc3d56867a9246d825c0d11 SHA512 45828b5e9968ce037e48366deb537353368dbac9145fc93d56921444210c9f0d4af1460c047bcae3e85244ecdf7e272fb65860656a19c449add09bf697c0a37d WHIRLPOOL f9b350968e8e82f7e4523648d5aefd03689123165424e15fee71eaa67345d38a0efe71ea4fc1388b5b683925bc8f638dba130371c4f324ac5910d7a051ae5548

diff --git a/dev-vcs/git-annex/git-annex-5.20150731.ebuild b/dev-vcs/git-annex/git-annex-5.20150731.ebuild
deleted file mode 100644
index 3f4f031..0000000
--- a/dev-vcs/git-annex/git-annex-5.20150731.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# 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/git-annex-5.20151218.ebuild b/dev-vcs/git-annex/git-annex-5.20151218.ebuild
deleted file mode 100644
index 7afd432..0000000
--- a/dev-vcs/git-annex/git-annex-5.20151218.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# 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="+assistant concurrentoutput cryptonite +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/data-default:=
-	dev-haskell/dlist:=
-	dev-haskell/edit-distance:=
-	>=dev-haskell/exceptions-0.6:=
-	dev-haskell/hslogger:=
-	dev-haskell/http-client:=
-	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.11:=
-	>=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:=
-	assistant? ( inotify? ( dev-haskell/hinotify:= ) )
-	concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= )
-	cryptonite? ( dev-haskell/cryptonite:= )
-	!cryptonite? ( >=dev-haskell/cryptohash-0.11.0:= )
-	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:= )
-	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:= )
-	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}"/${PN}-5.20150731-no-strange-installs.patch
-	epatch "${FILESDIR}"/${PN}-6.20160114-QC-2.8.2.patch
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-android \
-		--flag=-androidsplice \
-		$(cabal_flag assistant assistant) \
-		$(cabal_flag database database) \
-		$(cabal_flag cryptonite Cryptonite) \
-		$(cabal_flag concurrentoutput ConcurrentOutput) \
-		$(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
-}


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-annex/
@ 2016-04-03 13:39 Sergei Trofimovich
  0 siblings, 0 replies; 18+ messages in thread
From: Sergei Trofimovich @ 2016-04-03 13:39 UTC (permalink / raw
  To: gentoo-commits

commit:     f31000f5ed040fea316a62a3dfac7b24c3c1d5f0
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  3 13:34:27 2016 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Apr  3 13:36:34 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f31000f5

dev-vcs/git-annex: drop unused local USE-descriptions

Package-Manager: portage-2.2.28

 dev-vcs/git-annex/metadata.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/dev-vcs/git-annex/metadata.xml b/dev-vcs/git-annex/metadata.xml
index d98d30d..a241541 100644
--- a/dev-vcs/git-annex/metadata.xml
+++ b/dev-vcs/git-annex/metadata.xml
@@ -22,23 +22,14 @@
 	<use>
 		<flag name="assistant">Enable git-annex assistant and watch command</flag>
 		<flag name="benchmark">Enable benchmarking</flag>
-		<flag name="asciiprogress">Use ascii-progress library (experimental)</flag>
 		<flag name="concurrentoutput">Use concurrent-output library (experimental)</flag>
 		<flag name="cryptonite">Use the cryptonite library, instead of the older cryptohash</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="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="pairing">Enable pairing of git annex repositories</flag>
-		<flag name="quvi">Enable use of quvi to download videos</flag>
 		<flag name="s3">Enable Amazon S3 remote</flag>
-		<flag name="tahoe">Enable the tahoe special remote</flag>
-		<flag name="tdfa">Use regex-tdfa for wildcards</flag>
 		<flag name="torrentparser">Use haskell torrent library to parse torrent files</flag>
 		<flag name="webapp">Enable git-annex webapp</flag>
-		<flag name="webapp-secure">Secure webapp</flag>
 		<flag name="webdav">Enable webdav remote</flag>
 	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-annex/
@ 2016-04-03 21:24 Sergei Trofimovich
  0 siblings, 0 replies; 18+ messages in thread
From: Sergei Trofimovich @ 2016-04-03 21:24 UTC (permalink / raw
  To: gentoo-commits

commit:     16e89a8a81376ffb0be81c58e73f7cccd0ddf9c4
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  3 21:18:47 2016 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Apr  3 21:24:36 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16e89a8a

dev-vcs/git-annex: bump up to 6.20160318

Package-Manager: portage-2.2.28

 dev-vcs/git-annex/Manifest                    |   1 +
 dev-vcs/git-annex/git-annex-6.20160318.ebuild | 174 ++++++++++++++++++++++++++
 dev-vcs/git-annex/metadata.xml                |   1 +
 3 files changed, 176 insertions(+)

diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index e96e42d..acfd511 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -1 +1,2 @@
 DIST git-annex-6.20160126.tar.gz 5146331 SHA256 dc59f670a3d0bdb90db8fc6cadba8003708219bb0dc3d56867a9246d825c0d11 SHA512 45828b5e9968ce037e48366deb537353368dbac9145fc93d56921444210c9f0d4af1460c047bcae3e85244ecdf7e272fb65860656a19c449add09bf697c0a37d WHIRLPOOL f9b350968e8e82f7e4523648d5aefd03689123165424e15fee71eaa67345d38a0efe71ea4fc1388b5b683925bc8f638dba130371c4f324ac5910d7a051ae5548
+DIST git-annex-6.20160318.tar.gz 5399078 SHA256 5c0067d161a3cd6b93822f85eb82e5cb4895d913b2593bc4fe3b74d3ed426e0b SHA512 62d0caef2f09a1d690229b720e81bf477715fd765a98c037b8e22e7e04ad72d91c81fdbe8bb61bdf4e0bf40cd5b81ea349e60a8e61690767db4a4b92541a063f WHIRLPOOL 96c0232790b0b2cf0d97df2984383a0616a56c695daac233da625fd08ccd8044ef26aed613341f47aa8b0ef70e806b5d0569ff733d3e0dee0e92ed7220b503bc

diff --git a/dev-vcs/git-annex/git-annex-6.20160318.ebuild b/dev-vcs/git-annex/git-annex-6.20160318.ebuild
new file mode 100644
index 0000000..31ef5e6
--- /dev/null
+++ b/dev-vcs/git-annex/git-annex-6.20160318.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.7.9999
+#hackport: flags: -production,-android,-androidsplice,-testsuite
+
+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="+assistant benchmark +concurrentoutput +cryptonite doc +dbus ekg +magicmime +network-uri +pairing +s3 +torrentparser +webapp +webdav +xmpp"
+
+RDEPEND="dev-haskell/aeson:=
+	dev-haskell/async:=
+	dev-haskell/bloomfilter:=
+	dev-haskell/case-insensitive:=
+	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:=
+	dev-haskell/hslogger:=
+	dev-haskell/http-client:=
+	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.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/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:=
+	assistant? ( dev-haskell/dns:=
+			dev-haskell/hinotify:=
+			dev-haskell/mountpoints:= )
+	benchmark? ( dev-haskell/criterion:= )
+	concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= )
+	cryptonite? ( dev-haskell/cryptonite:= )
+	!cryptonite? ( >=dev-haskell/cryptohash-0.11.0:= )
+	dbus? ( >=dev-haskell/dbus-0.10.7:=
+		>=dev-haskell/fdo-notify-0.3:= )
+	ekg? ( dev-haskell/ekg:= )
+	magicmime? ( 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/byteable:=
+			dev-haskell/clientsession:=
+			dev-haskell/crypto-api:=
+			>=dev-haskell/path-pieces-0.1.4:=
+			dev-haskell/securemem:=
+			>=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:= )
+	xmpp? ( >=dev-haskell/gnutls-0.1.4:=
+		dev-haskell/network-protocol-xmpp:=
+		dev-haskell/xml-types:= )
+"
+# not generated by hackport:
+RDEPEND="${RDEPEND}
+	dev-vcs/git
+"
+
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+"
+
+# not generated by hackport:
+DEPEND="${DEPEND}
+	dev-lang/perl
+	doc? ( www-apps/ikiwiki net-misc/rsync )
+"
+
+src_prepare() {
+	# does not respect staging dir
+	epatch "${FILESDIR}"/${PN}-5.20150731-no-strange-installs.patch
+	epatch "${FILESDIR}"/${PN}-6.20160114-QC-2.8.2.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 cryptonite cryptonite) \
+		$(cabal_flag dbus dbus) \
+		$(cabal_flag ekg ekg) \
+		$(cabal_flag magicmime 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) \
+		$(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 a241541..c880c40 100644
--- a/dev-vcs/git-annex/metadata.xml
+++ b/dev-vcs/git-annex/metadata.xml
@@ -25,6 +25,7 @@
 		<flag name="concurrentoutput">Use concurrent-output library (experimental)</flag>
 		<flag name="cryptonite">Use the cryptonite library, instead of the older cryptohash</flag>
 		<flag name="ekg">Enable use of EKG to monitor git-annex as it runs.</flag>
+		<flag name="magicmime">Use libmagic to determine file MIME types</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>


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-annex/
@ 2016-08-16 21:40 Sergei Trofimovich
  0 siblings, 0 replies; 18+ messages in thread
From: Sergei Trofimovich @ 2016-08-16 21:40 UTC (permalink / raw
  To: gentoo-commits

commit:     e1259af6a27a3de4460ca6068a0dc802c4d5ed8d
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 16 21:38:30 2016 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Aug 16 21:38:46 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1259af6

dev-vcs/git-annex: restore lsof dependency, bug #591252

Reporter-by: Devrin Talen
Bug: https://bugs.gentoo.org/591252

Package-Manager: portage-2.2.27_p10

 dev-vcs/git-annex/git-annex-6.20160126.ebuild | 3 ++-
 dev-vcs/git-annex/git-annex-6.20160318.ebuild | 3 ++-
 dev-vcs/git-annex/git-annex-6.20160419.ebuild | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dev-vcs/git-annex/git-annex-6.20160126.ebuild b/dev-vcs/git-annex/git-annex-6.20160126.ebuild
index cabccbd..caa0433 100644
--- a/dev-vcs/git-annex/git-annex-6.20160126.ebuild
+++ b/dev-vcs/git-annex/git-annex-6.20160126.ebuild
@@ -64,7 +64,8 @@ RDEPEND="dev-haskell/aeson:=
 	dev-haskell/xml-types:=
 	>=dev-lang/ghc-7.6.1:=
 	assistant? ( dev-haskell/dns:=
-			dev-haskell/hinotify:= )
+			dev-haskell/hinotify:=
+			sys-process/lsof )
 	benchmark? ( dev-haskell/criterion:= )
 	concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= )
 	cryptonite? ( dev-haskell/cryptonite:= )

diff --git a/dev-vcs/git-annex/git-annex-6.20160318.ebuild b/dev-vcs/git-annex/git-annex-6.20160318.ebuild
index 31ef5e6..7d1070e 100644
--- a/dev-vcs/git-annex/git-annex-6.20160318.ebuild
+++ b/dev-vcs/git-annex/git-annex-6.20160318.ebuild
@@ -61,7 +61,8 @@ RDEPEND="dev-haskell/aeson:=
 	>=dev-lang/ghc-7.6.1:=
 	assistant? ( dev-haskell/dns:=
 			dev-haskell/hinotify:=
-			dev-haskell/mountpoints:= )
+			dev-haskell/mountpoints:=
+			sys-process/lsof )
 	benchmark? ( dev-haskell/criterion:= )
 	concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= )
 	cryptonite? ( dev-haskell/cryptonite:= )

diff --git a/dev-vcs/git-annex/git-annex-6.20160419.ebuild b/dev-vcs/git-annex/git-annex-6.20160419.ebuild
index 31ef5e6..7d1070e 100644
--- a/dev-vcs/git-annex/git-annex-6.20160419.ebuild
+++ b/dev-vcs/git-annex/git-annex-6.20160419.ebuild
@@ -61,7 +61,8 @@ RDEPEND="dev-haskell/aeson:=
 	>=dev-lang/ghc-7.6.1:=
 	assistant? ( dev-haskell/dns:=
 			dev-haskell/hinotify:=
-			dev-haskell/mountpoints:= )
+			dev-haskell/mountpoints:=
+			sys-process/lsof )
 	benchmark? ( dev-haskell/criterion:= )
 	concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= )
 	cryptonite? ( dev-haskell/cryptonite:= )


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-annex/
@ 2016-09-24 10:08 Sergei Trofimovich
  0 siblings, 0 replies; 18+ messages in thread
From: Sergei Trofimovich @ 2016-09-24 10:08 UTC (permalink / raw
  To: gentoo-commits

commit:     725eadedbeb20ce266bfb381735bf61303ed0437
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 24 10:08:45 2016 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Sep 24 10:08:45 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=725eaded

dev-vcs/git-annex: restore manpage installation

Drop git-annex-5.20150731-no-strange-installs.patch
as git-annex is now respecting $(DISTDIR). Woohoo!

Reported-by: Jan Kundrát
Bug: https://github.com/gentoo-haskell/gentoo-haskell/issues/506

Package-Manager: portage-2.3.1

 dev-vcs/git-annex/git-annex-6.20160923-r1.ebuild | 171 +++++++++++++++++++++++
 1 file changed, 171 insertions(+)

diff --git a/dev-vcs/git-annex/git-annex-6.20160923-r1.ebuild b/dev-vcs/git-annex/git-annex-6.20160923-r1.ebuild
new file mode 100644
index 00000000..281e2ea
--- /dev/null
+++ b/dev-vcs/git-annex/git-annex-6.20160923-r1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.4.7.9999
+#hackport: flags: -production,-android,-androidsplice,-testsuite
+
+CABAL_FEATURES="bin"
+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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+RESTRICT="test"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="+assistant benchmark +concurrentoutput +cryptonite doc +dbus +magicmime +network-uri +pairing +s3 +torrentparser +webapp +webdav +xmpp"
+
+RDEPEND="dev-haskell/aeson:=
+	dev-haskell/async:=
+	dev-haskell/bloomfilter:=
+	dev-haskell/case-insensitive:=
+	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:=
+	dev-haskell/hslogger:=
+	dev-haskell/http-client:=
+	dev-haskell/http-conduit:=
+	dev-haskell/http-types:=
+	dev-haskell/ifelse:=
+	dev-haskell/missingh:=
+	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/stm-2.3:=
+	dev-haskell/text:=
+	dev-haskell/transformers:=
+	dev-haskell/unix-compat:=
+	dev-haskell/unordered-containers:=
+	dev-haskell/utf8-string:=
+	>=dev-haskell/uuid-1.2.6:=
+	>=dev-lang/ghc-7.6.1:=
+	assistant? ( dev-haskell/dns:=
+			dev-haskell/hinotify:=
+			dev-haskell/mountpoints:=
+			sys-process/lsof )
+	benchmark? ( dev-haskell/criterion:= )
+	concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= )
+	cryptonite? ( dev-haskell/cryptonite:= )
+	!cryptonite? ( >=dev-haskell/cryptohash-0.11.0:= )
+	dbus? ( >=dev-haskell/dbus-0.10.7:=
+		>=dev-haskell/fdo-notify-0.3:= )
+	magicmime? ( 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/byteable:=
+			dev-haskell/clientsession:=
+			dev-haskell/crypto-api:=
+			>=dev-haskell/path-pieces-0.1.4:=
+			dev-haskell/securemem:=
+			>=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:= )
+	xmpp? ( >=dev-haskell/gnutls-0.1.4:=
+		dev-haskell/network-protocol-xmpp:=
+		dev-haskell/xml-types:= )
+"
+# not generated by hackport:
+RDEPEND="${RDEPEND}
+	dev-vcs/git
+"
+
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+"
+
+# 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
+)
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'http-conduit (<2.2.0)' 'http-conduit' \
+		'persistent (< 2.5)' 'persistent'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-android \
+		--flag=-androidsplice \
+		$(cabal_flag assistant assistant) \
+		$(cabal_flag benchmark benchmark) \
+		$(cabal_flag concurrentoutput concurrentoutput) \
+		$(cabal_flag cryptonite cryptonite) \
+		$(cabal_flag dbus dbus) \
+		$(cabal_flag magicmime 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) \
+		$(cabal_flag xmpp xmpp)
+}
+
+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
+}


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-annex/
@ 2017-02-16 21:57 Sergei Trofimovich
  0 siblings, 0 replies; 18+ messages in thread
From: Sergei Trofimovich @ 2017-02-16 21:57 UTC (permalink / raw
  To: gentoo-commits

commit:     e9e15341fdb93f58beef2f4f5b3f950a93943177
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 16 21:51:02 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=e9e15341

dev-vcs/git-annex: bump up to 6.20170101

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-vcs/git-annex/Manifest                    |   1 +
 dev-vcs/git-annex/git-annex-6.20170101.ebuild | 169 ++++++++++++++++++++++++++
 2 files changed, 170 insertions(+)

diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index 9a7cc9d163..f1912bd38b 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -3,3 +3,4 @@ DIST git-annex-6.20160318.tar.gz 5399078 SHA256 5c0067d161a3cd6b93822f85eb82e5cb
 DIST git-annex-6.20160419.tar.gz 5086638 SHA256 1452a55809ba7367847fc4a77f2d8a5365af92e130d5ca460bf0880a26a6fb8e SHA512 b8b250b700aaaa336ee85af3d053d893b422e2bf427dc0f1f38689b49a2a74fa240a725da09d98f5bdf86d35d68612765c0de878de52ae4ddbb8908fb32ad118 WHIRLPOOL 1a68daef4b271ec8945c0ab22439eba83400d7babac368ae65167bd8dfec29430913c8165046421d4b0a072d7beaaedf832464a04ac625250b401303afff16aa
 DIST git-annex-6.20160923.tar.gz 1084326 SHA256 964235a358814e081cf4a5d8dab798faacb1dabe5fc714ac6687b135e30fd93d SHA512 2204b5a3b76b22718e4cf5329e78035c4ff45a133e738a8ab627067551fd40a778d4be124862f6a08b583c49400844e3b0c61a682909f911e5ac51fdb6319295 WHIRLPOOL ed5f6c732210b0a720de095ce71c8907b5ddc636e28835f85697f81a01824be7b9f154335af1c4c4e1a304f967b6233487699a49da447f8f883519063be35a55
 DIST git-annex-6.20161031.tar.gz 1087730 SHA256 6de3751f361d730e4a69106443b747a45e27aaeabf51ea999c41bd92fd2c71ce SHA512 4a67154b4bbb12f4573bca71617d4c898c8915b242b30b484bc45e661c09893c5ebf2c906e87269307666dcde603d8dbb34f616d46c7a88bffb4baff0bbec81c WHIRLPOOL 0251d406889b9f171dd207a3956ee6adae4b9415fd993f692e8e76240e1f15194b7c125d5118935db1dbc0676513bf213c91df285d9a3311285ed69c24080c4c
+DIST git-annex-6.20170101.tar.gz 1095866 SHA256 5fbf88652a84278275d9d4bec083189f590b045e23a73bfe8d395c3e356e3f53 SHA512 faf97a4619d1fa94efebd6fc592c58822e853505649c230afa8711165a22c1d84e8c24c850fc61d47ce1390868a934400db28f7b370a7aa26b128c0dcdc11475 WHIRLPOOL 95dbe81bf51b654d6d3deb97c180a346701d35ae07ef0774eafc2d5877ba07ed5f9b9f85beee2b3eacd6749b3f505f6d888b3747da0802fab36496ade6ab12c9

diff --git a/dev-vcs/git-annex/git-annex-6.20170101.ebuild b/dev-vcs/git-annex/git-annex-6.20170101.ebuild
new file mode 100644
index 0000000000..18cc12b927
--- /dev/null
+++ b/dev-vcs/git-annex/git-annex-6.20170101.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+RESTRICT="test"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="+assistant benchmark +concurrentoutput +cryptonite doc +dbus +magicmime +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/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:=
+	dev-haskell/free:=
+	dev-haskell/hslogger:=
+	dev-haskell/http-client:=
+	dev-haskell/http-conduit:=
+	dev-haskell/http-types:=
+	dev-haskell/ifelse:=
+	dev-haskell/missingh:=
+	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/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:=
+			dev-haskell/hinotify:=
+			dev-haskell/mountpoints:=
+			sys-process/lsof )
+	benchmark? ( dev-haskell/criterion:= )
+	concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= )
+	cryptonite? ( dev-haskell/cryptonite:= )
+	!cryptonite? ( >=dev-haskell/cryptohash-0.11.0:= )
+	dbus? ( >=dev-haskell/dbus-0.10.7:=
+		>=dev-haskell/fdo-notify-0.3:= )
+	magicmime? ( 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
+	dev-haskell/data-default
+	dev-haskell/exceptions
+	dev-haskell/hslogger
+	dev-haskell/ifelse
+	dev-haskell/missingh
+	dev-haskell/unix-compat
+"
+
+# 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 cryptonite cryptonite) \
+		$(cabal_flag dbus dbus) \
+		$(cabal_flag magicmime 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
+}


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-annex/
@ 2017-08-21 21:32 Sergei Trofimovich
  0 siblings, 0 replies; 18+ messages in thread
From: Sergei Trofimovich @ 2017-08-21 21:32 UTC (permalink / raw
  To: gentoo-commits

commit:     81d17e4af35cbecc7b28a96de8a62d80cf4d9e18
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 21 21:31:46 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Aug 21 21:32:29 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81d17e4a

dev-vcs/git-annex: bump up to 6.20170818, bug #628488

"""
git-annex before 6.20170818 allows remote attackers to execute
arbitrary commands via an ssh URL with an initial dash character
in the hostname, as demonstrated by an ssh://-eProxyCommand= URL,
a related issue to CVE-2017-9800, CVE-2017-12836, CVE-2017-1000116,
and CVE-2017-1000117.
"""

Reported-by: mbailey_j
Bug: https://bugs.gentoo.org/628488
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-vcs/git-annex/Manifest                    |   1 +
 dev-vcs/git-annex/git-annex-6.20170818.ebuild | 161 ++++++++++++++++++++++++++
 2 files changed, 162 insertions(+)

diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index f1912bd38b6..7f7eda5b868 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -4,3 +4,4 @@ DIST git-annex-6.20160419.tar.gz 5086638 SHA256 1452a55809ba7367847fc4a77f2d8a53
 DIST git-annex-6.20160923.tar.gz 1084326 SHA256 964235a358814e081cf4a5d8dab798faacb1dabe5fc714ac6687b135e30fd93d SHA512 2204b5a3b76b22718e4cf5329e78035c4ff45a133e738a8ab627067551fd40a778d4be124862f6a08b583c49400844e3b0c61a682909f911e5ac51fdb6319295 WHIRLPOOL ed5f6c732210b0a720de095ce71c8907b5ddc636e28835f85697f81a01824be7b9f154335af1c4c4e1a304f967b6233487699a49da447f8f883519063be35a55
 DIST git-annex-6.20161031.tar.gz 1087730 SHA256 6de3751f361d730e4a69106443b747a45e27aaeabf51ea999c41bd92fd2c71ce SHA512 4a67154b4bbb12f4573bca71617d4c898c8915b242b30b484bc45e661c09893c5ebf2c906e87269307666dcde603d8dbb34f616d46c7a88bffb4baff0bbec81c WHIRLPOOL 0251d406889b9f171dd207a3956ee6adae4b9415fd993f692e8e76240e1f15194b7c125d5118935db1dbc0676513bf213c91df285d9a3311285ed69c24080c4c
 DIST git-annex-6.20170101.tar.gz 1095866 SHA256 5fbf88652a84278275d9d4bec083189f590b045e23a73bfe8d395c3e356e3f53 SHA512 faf97a4619d1fa94efebd6fc592c58822e853505649c230afa8711165a22c1d84e8c24c850fc61d47ce1390868a934400db28f7b370a7aa26b128c0dcdc11475 WHIRLPOOL 95dbe81bf51b654d6d3deb97c180a346701d35ae07ef0774eafc2d5877ba07ed5f9b9f85beee2b3eacd6749b3f505f6d888b3747da0802fab36496ade6ab12c9
+DIST git-annex-6.20170818.tar.gz 1111837 SHA256 7ddf3f8be218d8e8955be49fb0200179e54406cc02e884abe999f88d578f7d79 SHA512 06587bf0d3056e4b94d4c40aaae820efda133dcbc876a2ac3db3183fb511ec20aae4c495323b4886868a3e66b5b1f53a04c5f3abb0362c718bbadc8e2f6e15d0 WHIRLPOOL b4034833a96ab11c8972c1b679c10948455459ef0a82fe98c9912db932ab384e00ad1a13d08030f658cc1f0525888e5e9e34e48f7e09704f642ac57e908d8a35

diff --git a/dev-vcs/git-annex/git-annex-6.20170818.ebuild b/dev-vcs/git-annex/git-annex-6.20170818.ebuild
new file mode 100644
index 00000000000..29375595e8d
--- /dev/null
+++ b/dev-vcs/git-annex/git-annex-6.20170818.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+RESTRICT="test"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="+assistant benchmark +concurrentoutput +dbus doc +magicmime +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:= )
+	magicmime? ( 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 magicmime 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
+}


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-annex/
@ 2017-08-21 21:32 Sergei Trofimovich
  0 siblings, 0 replies; 18+ messages in thread
From: Sergei Trofimovich @ 2017-08-21 21:32 UTC (permalink / raw
  To: gentoo-commits

commit:     92983108b65f645af5ab815add715492d9929c04
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 21 21:32:14 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Aug 21 21:32:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92983108

dev-vcs/git-annex: drop old

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-vcs/git-annex/Manifest                       |   6 -
 dev-vcs/git-annex/git-annex-6.20160126.ebuild    | 168 ----------------------
 dev-vcs/git-annex/git-annex-6.20160318.ebuild    | 174 -----------------------
 dev-vcs/git-annex/git-annex-6.20160419.ebuild    | 174 -----------------------
 dev-vcs/git-annex/git-annex-6.20160923-r1.ebuild | 170 ----------------------
 dev-vcs/git-annex/git-annex-6.20160923.ebuild    | 173 ----------------------
 dev-vcs/git-annex/git-annex-6.20161031.ebuild    | 170 ----------------------
 dev-vcs/git-annex/git-annex-6.20170101.ebuild    | 168 ----------------------
 dev-vcs/git-annex/metadata.xml                   |   2 -
 9 files changed, 1205 deletions(-)

diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index 7f7eda5b868..ebbd26c904d 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -1,7 +1 @@
-DIST git-annex-6.20160126.tar.gz 5146331 SHA256 dc59f670a3d0bdb90db8fc6cadba8003708219bb0dc3d56867a9246d825c0d11 SHA512 45828b5e9968ce037e48366deb537353368dbac9145fc93d56921444210c9f0d4af1460c047bcae3e85244ecdf7e272fb65860656a19c449add09bf697c0a37d WHIRLPOOL f9b350968e8e82f7e4523648d5aefd03689123165424e15fee71eaa67345d38a0efe71ea4fc1388b5b683925bc8f638dba130371c4f324ac5910d7a051ae5548
-DIST git-annex-6.20160318.tar.gz 5399078 SHA256 5c0067d161a3cd6b93822f85eb82e5cb4895d913b2593bc4fe3b74d3ed426e0b SHA512 62d0caef2f09a1d690229b720e81bf477715fd765a98c037b8e22e7e04ad72d91c81fdbe8bb61bdf4e0bf40cd5b81ea349e60a8e61690767db4a4b92541a063f WHIRLPOOL 96c0232790b0b2cf0d97df2984383a0616a56c695daac233da625fd08ccd8044ef26aed613341f47aa8b0ef70e806b5d0569ff733d3e0dee0e92ed7220b503bc
-DIST git-annex-6.20160419.tar.gz 5086638 SHA256 1452a55809ba7367847fc4a77f2d8a5365af92e130d5ca460bf0880a26a6fb8e SHA512 b8b250b700aaaa336ee85af3d053d893b422e2bf427dc0f1f38689b49a2a74fa240a725da09d98f5bdf86d35d68612765c0de878de52ae4ddbb8908fb32ad118 WHIRLPOOL 1a68daef4b271ec8945c0ab22439eba83400d7babac368ae65167bd8dfec29430913c8165046421d4b0a072d7beaaedf832464a04ac625250b401303afff16aa
-DIST git-annex-6.20160923.tar.gz 1084326 SHA256 964235a358814e081cf4a5d8dab798faacb1dabe5fc714ac6687b135e30fd93d SHA512 2204b5a3b76b22718e4cf5329e78035c4ff45a133e738a8ab627067551fd40a778d4be124862f6a08b583c49400844e3b0c61a682909f911e5ac51fdb6319295 WHIRLPOOL ed5f6c732210b0a720de095ce71c8907b5ddc636e28835f85697f81a01824be7b9f154335af1c4c4e1a304f967b6233487699a49da447f8f883519063be35a55
-DIST git-annex-6.20161031.tar.gz 1087730 SHA256 6de3751f361d730e4a69106443b747a45e27aaeabf51ea999c41bd92fd2c71ce SHA512 4a67154b4bbb12f4573bca71617d4c898c8915b242b30b484bc45e661c09893c5ebf2c906e87269307666dcde603d8dbb34f616d46c7a88bffb4baff0bbec81c WHIRLPOOL 0251d406889b9f171dd207a3956ee6adae4b9415fd993f692e8e76240e1f15194b7c125d5118935db1dbc0676513bf213c91df285d9a3311285ed69c24080c4c
-DIST git-annex-6.20170101.tar.gz 1095866 SHA256 5fbf88652a84278275d9d4bec083189f590b045e23a73bfe8d395c3e356e3f53 SHA512 faf97a4619d1fa94efebd6fc592c58822e853505649c230afa8711165a22c1d84e8c24c850fc61d47ce1390868a934400db28f7b370a7aa26b128c0dcdc11475 WHIRLPOOL 95dbe81bf51b654d6d3deb97c180a346701d35ae07ef0774eafc2d5877ba07ed5f9b9f85beee2b3eacd6749b3f505f6d888b3747da0802fab36496ade6ab12c9
 DIST git-annex-6.20170818.tar.gz 1111837 SHA256 7ddf3f8be218d8e8955be49fb0200179e54406cc02e884abe999f88d578f7d79 SHA512 06587bf0d3056e4b94d4c40aaae820efda133dcbc876a2ac3db3183fb511ec20aae4c495323b4886868a3e66b5b1f53a04c5f3abb0362c718bbadc8e2f6e15d0 WHIRLPOOL b4034833a96ab11c8972c1b679c10948455459ef0a82fe98c9912db932ab384e00ad1a13d08030f658cc1f0525888e5e9e34e48f7e09704f642ac57e908d8a35

diff --git a/dev-vcs/git-annex/git-annex-6.20160126.ebuild b/dev-vcs/git-annex/git-annex-6.20160126.ebuild
deleted file mode 100644
index 81a2b85e20b..00000000000
--- a/dev-vcs/git-annex/git-annex-6.20160126.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: -production,-android,-androidsplice,-testsuite
-
-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="+assistant benchmark +concurrentoutput +cryptonite doc ekg +network-uri +pairing +s3 +torrentparser +webapp +webdav"
-
-RDEPEND="dev-haskell/aeson:=
-	dev-haskell/async:=
-	dev-haskell/bloomfilter:=
-	dev-haskell/case-insensitive:=
-	dev-haskell/data-default:=
-	>=dev-haskell/dbus-0.10.7:=
-	dev-haskell/dlist:=
-	dev-haskell/edit-distance:=
-	dev-haskell/esqueleto:=
-	>=dev-haskell/exceptions-0.6:=
-	>=dev-haskell/fdo-notify-0.3:=
-	dev-haskell/feed:=
-	>=dev-haskell/gnutls-0.1.4:=
-	dev-haskell/hslogger:=
-	dev-haskell/http-client:=
-	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/network-protocol-xmpp:=
-	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/stm-2.3:=
-	dev-haskell/text:=
-	dev-haskell/transformers:=
-	dev-haskell/unix-compat:=
-	dev-haskell/utf8-string:=
-	dev-haskell/uuid:=
-	dev-haskell/xml-types:=
-	>=dev-lang/ghc-7.6.1:=
-	assistant? ( dev-haskell/dns:=
-			dev-haskell/hinotify:=
-			sys-process/lsof )
-	benchmark? ( dev-haskell/criterion:= )
-	concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= )
-	cryptonite? ( dev-haskell/cryptonite:= )
-	!cryptonite? ( >=dev-haskell/cryptohash-0.11.0:= )
-	ekg? ( dev-haskell/ekg:= )
-	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:= )
-	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/byteable:=
-			dev-haskell/clientsession:=
-			dev-haskell/crypto-api:=
-			>=dev-haskell/path-pieces-0.1.4:=
-			dev-haskell/securemem:=
-			>=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.16.0
-"
-
-# not generated by hackport:
-DEPEND="${DEPEND}
-	dev-lang/perl
-	doc? ( www-apps/ikiwiki net-misc/rsync )
-"
-
-src_prepare() {
-	# does not respect staging dir
-	epatch "${FILESDIR}"/${PN}-5.20150731-no-strange-installs.patch
-	epatch "${FILESDIR}"/${PN}-6.20160114-QC-2.8.2.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 cryptonite cryptonite) \
-		$(cabal_flag ekg ekg) \
-		$(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_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/git-annex-6.20160318.ebuild b/dev-vcs/git-annex/git-annex-6.20160318.ebuild
deleted file mode 100644
index b45da300f07..00000000000
--- a/dev-vcs/git-annex/git-annex-6.20160318.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: -production,-android,-androidsplice,-testsuite
-
-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="+assistant benchmark +concurrentoutput +cryptonite doc +dbus ekg +magicmime +network-uri +pairing +s3 +torrentparser +webapp +webdav +xmpp"
-
-RDEPEND="dev-haskell/aeson:=
-	dev-haskell/async:=
-	dev-haskell/bloomfilter:=
-	dev-haskell/case-insensitive:=
-	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:=
-	dev-haskell/hslogger:=
-	dev-haskell/http-client:=
-	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.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/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:=
-	assistant? ( dev-haskell/dns:=
-			dev-haskell/hinotify:=
-			dev-haskell/mountpoints:=
-			sys-process/lsof )
-	benchmark? ( dev-haskell/criterion:= )
-	concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= )
-	cryptonite? ( dev-haskell/cryptonite:= )
-	!cryptonite? ( >=dev-haskell/cryptohash-0.11.0:= )
-	dbus? ( >=dev-haskell/dbus-0.10.7:=
-		>=dev-haskell/fdo-notify-0.3:= )
-	ekg? ( dev-haskell/ekg:= )
-	magicmime? ( 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/byteable:=
-			dev-haskell/clientsession:=
-			dev-haskell/crypto-api:=
-			>=dev-haskell/path-pieces-0.1.4:=
-			dev-haskell/securemem:=
-			>=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:= )
-	xmpp? ( >=dev-haskell/gnutls-0.1.4:=
-		dev-haskell/network-protocol-xmpp:=
-		dev-haskell/xml-types:= )
-"
-# not generated by hackport:
-RDEPEND="${RDEPEND}
-	dev-vcs/git
-"
-
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
-
-# not generated by hackport:
-DEPEND="${DEPEND}
-	dev-lang/perl
-	doc? ( www-apps/ikiwiki net-misc/rsync )
-"
-
-src_prepare() {
-	# does not respect staging dir
-	epatch "${FILESDIR}"/${PN}-5.20150731-no-strange-installs.patch
-	epatch "${FILESDIR}"/${PN}-6.20160114-QC-2.8.2.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 cryptonite cryptonite) \
-		$(cabal_flag dbus dbus) \
-		$(cabal_flag ekg ekg) \
-		$(cabal_flag magicmime 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) \
-		$(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/git-annex-6.20160419.ebuild b/dev-vcs/git-annex/git-annex-6.20160419.ebuild
deleted file mode 100644
index b45da300f07..00000000000
--- a/dev-vcs/git-annex/git-annex-6.20160419.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: -production,-android,-androidsplice,-testsuite
-
-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="+assistant benchmark +concurrentoutput +cryptonite doc +dbus ekg +magicmime +network-uri +pairing +s3 +torrentparser +webapp +webdav +xmpp"
-
-RDEPEND="dev-haskell/aeson:=
-	dev-haskell/async:=
-	dev-haskell/bloomfilter:=
-	dev-haskell/case-insensitive:=
-	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:=
-	dev-haskell/hslogger:=
-	dev-haskell/http-client:=
-	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.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/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:=
-	assistant? ( dev-haskell/dns:=
-			dev-haskell/hinotify:=
-			dev-haskell/mountpoints:=
-			sys-process/lsof )
-	benchmark? ( dev-haskell/criterion:= )
-	concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= )
-	cryptonite? ( dev-haskell/cryptonite:= )
-	!cryptonite? ( >=dev-haskell/cryptohash-0.11.0:= )
-	dbus? ( >=dev-haskell/dbus-0.10.7:=
-		>=dev-haskell/fdo-notify-0.3:= )
-	ekg? ( dev-haskell/ekg:= )
-	magicmime? ( 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/byteable:=
-			dev-haskell/clientsession:=
-			dev-haskell/crypto-api:=
-			>=dev-haskell/path-pieces-0.1.4:=
-			dev-haskell/securemem:=
-			>=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:= )
-	xmpp? ( >=dev-haskell/gnutls-0.1.4:=
-		dev-haskell/network-protocol-xmpp:=
-		dev-haskell/xml-types:= )
-"
-# not generated by hackport:
-RDEPEND="${RDEPEND}
-	dev-vcs/git
-"
-
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
-
-# not generated by hackport:
-DEPEND="${DEPEND}
-	dev-lang/perl
-	doc? ( www-apps/ikiwiki net-misc/rsync )
-"
-
-src_prepare() {
-	# does not respect staging dir
-	epatch "${FILESDIR}"/${PN}-5.20150731-no-strange-installs.patch
-	epatch "${FILESDIR}"/${PN}-6.20160114-QC-2.8.2.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 cryptonite cryptonite) \
-		$(cabal_flag dbus dbus) \
-		$(cabal_flag ekg ekg) \
-		$(cabal_flag magicmime 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) \
-		$(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/git-annex-6.20160923-r1.ebuild b/dev-vcs/git-annex/git-annex-6.20160923-r1.ebuild
deleted file mode 100644
index 7c8a48a51c8..00000000000
--- a/dev-vcs/git-annex/git-annex-6.20160923-r1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: -production,-android,-androidsplice,-testsuite
-
-CABAL_FEATURES="bin"
-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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-RESTRICT="test"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+assistant benchmark +concurrentoutput +cryptonite doc +dbus +magicmime +network-uri +pairing +s3 +torrentparser +webapp +webdav +xmpp"
-
-RDEPEND="dev-haskell/aeson:=
-	dev-haskell/async:=
-	dev-haskell/bloomfilter:=
-	dev-haskell/case-insensitive:=
-	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:=
-	dev-haskell/hslogger:=
-	dev-haskell/http-client:=
-	dev-haskell/http-conduit:=
-	dev-haskell/http-types:=
-	dev-haskell/ifelse:=
-	dev-haskell/missingh:=
-	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/stm-2.3:=
-	dev-haskell/text:=
-	dev-haskell/transformers:=
-	dev-haskell/unix-compat:=
-	dev-haskell/unordered-containers:=
-	dev-haskell/utf8-string:=
-	>=dev-haskell/uuid-1.2.6:=
-	>=dev-lang/ghc-7.6.1:=
-	assistant? ( dev-haskell/dns:=
-			dev-haskell/hinotify:=
-			dev-haskell/mountpoints:=
-			sys-process/lsof )
-	benchmark? ( dev-haskell/criterion:= )
-	concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= )
-	cryptonite? ( dev-haskell/cryptonite:= )
-	!cryptonite? ( >=dev-haskell/cryptohash-0.11.0:= )
-	dbus? ( >=dev-haskell/dbus-0.10.7:=
-		>=dev-haskell/fdo-notify-0.3:= )
-	magicmime? ( 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/byteable:=
-			dev-haskell/clientsession:=
-			dev-haskell/crypto-api:=
-			>=dev-haskell/path-pieces-0.1.4:=
-			dev-haskell/securemem:=
-			>=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:= )
-	xmpp? ( >=dev-haskell/gnutls-0.1.4:=
-		dev-haskell/network-protocol-xmpp:=
-		dev-haskell/xml-types:= )
-"
-# not generated by hackport:
-RDEPEND="${RDEPEND}
-	dev-vcs/git
-"
-
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
-
-# 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
-)
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'http-conduit (<2.2.0)' 'http-conduit' \
-		'persistent (< 2.5)' 'persistent'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-android \
-		--flag=-androidsplice \
-		$(cabal_flag assistant assistant) \
-		$(cabal_flag benchmark benchmark) \
-		$(cabal_flag concurrentoutput concurrentoutput) \
-		$(cabal_flag cryptonite cryptonite) \
-		$(cabal_flag dbus dbus) \
-		$(cabal_flag magicmime 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) \
-		$(cabal_flag xmpp xmpp)
-}
-
-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/git-annex-6.20160923.ebuild b/dev-vcs/git-annex/git-annex-6.20160923.ebuild
deleted file mode 100644
index d3a791110b6..00000000000
--- a/dev-vcs/git-annex/git-annex-6.20160923.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: -production,-android,-androidsplice,-testsuite
-
-CABAL_FEATURES="bin"
-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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-RESTRICT="test"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+assistant benchmark +concurrentoutput +cryptonite doc +dbus +magicmime +network-uri +pairing +s3 +torrentparser +webapp +webdav +xmpp"
-
-RDEPEND="dev-haskell/aeson:=
-	dev-haskell/async:=
-	dev-haskell/bloomfilter:=
-	dev-haskell/case-insensitive:=
-	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:=
-	dev-haskell/hslogger:=
-	dev-haskell/http-client:=
-	dev-haskell/http-conduit:=
-	dev-haskell/http-types:=
-	dev-haskell/ifelse:=
-	dev-haskell/missingh:=
-	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/stm-2.3:=
-	dev-haskell/text:=
-	dev-haskell/transformers:=
-	dev-haskell/unix-compat:=
-	dev-haskell/unordered-containers:=
-	dev-haskell/utf8-string:=
-	>=dev-haskell/uuid-1.2.6:=
-	>=dev-lang/ghc-7.6.1:=
-	assistant? ( dev-haskell/dns:=
-			dev-haskell/hinotify:=
-			dev-haskell/mountpoints:=
-			sys-process/lsof )
-	benchmark? ( dev-haskell/criterion:= )
-	concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= )
-	cryptonite? ( dev-haskell/cryptonite:= )
-	!cryptonite? ( >=dev-haskell/cryptohash-0.11.0:= )
-	dbus? ( >=dev-haskell/dbus-0.10.7:=
-		>=dev-haskell/fdo-notify-0.3:= )
-	magicmime? ( 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/byteable:=
-			dev-haskell/clientsession:=
-			dev-haskell/crypto-api:=
-			>=dev-haskell/path-pieces-0.1.4:=
-			dev-haskell/securemem:=
-			>=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:= )
-	xmpp? ( >=dev-haskell/gnutls-0.1.4:=
-		dev-haskell/network-protocol-xmpp:=
-		dev-haskell/xml-types:= )
-"
-# not generated by hackport:
-RDEPEND="${RDEPEND}
-	dev-vcs/git
-"
-
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
-
-# not generated by hackport:
-DEPEND="${DEPEND}
-	dev-lang/perl
-	doc? ( www-apps/ikiwiki net-misc/rsync )
-"
-
-PATCHES=(
-	# does not respect staging dir
-	"${FILESDIR}"/${PN}-5.20150731-no-strange-installs.patch
-	"${FILESDIR}"/${PN}-6.20160114-QC-2.8.2.patch
-)
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'http-conduit (<2.2.0)' 'http-conduit' \
-		'persistent (< 2.5)' 'persistent'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-android \
-		--flag=-androidsplice \
-		$(cabal_flag assistant assistant) \
-		$(cabal_flag benchmark benchmark) \
-		$(cabal_flag concurrentoutput concurrentoutput) \
-		$(cabal_flag cryptonite cryptonite) \
-		$(cabal_flag dbus dbus) \
-		$(cabal_flag magicmime 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) \
-		$(cabal_flag xmpp xmpp)
-}
-
-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
-
-	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/git-annex-6.20161031.ebuild b/dev-vcs/git-annex/git-annex-6.20161031.ebuild
deleted file mode 100644
index d320fec3e53..00000000000
--- a/dev-vcs/git-annex/git-annex-6.20161031.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: -production,-android,-androidsplice,-testsuite
-
-CABAL_FEATURES="bin"
-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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-RESTRICT="test"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+assistant benchmark +concurrentoutput +cryptonite doc +dbus +magicmime +network-uri +pairing s3 +torrentparser +webapp +webdav +xmpp"
-
-RDEPEND="dev-haskell/aeson:=
-	dev-haskell/async:=
-	dev-haskell/bloomfilter:=
-	dev-haskell/case-insensitive:=
-	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:=
-	dev-haskell/hslogger:=
-	dev-haskell/http-client:=
-	dev-haskell/http-conduit:=
-	dev-haskell/http-types:=
-	dev-haskell/ifelse:=
-	dev-haskell/missingh:=
-	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/stm-2.3:=
-	dev-haskell/text:=
-	dev-haskell/transformers:=
-	dev-haskell/unix-compat:=
-	dev-haskell/unordered-containers:=
-	dev-haskell/utf8-string:=
-	>=dev-haskell/uuid-1.2.6:=
-	>=dev-lang/ghc-7.6.1:=
-	assistant? ( dev-haskell/dns:=
-			dev-haskell/hinotify:=
-			dev-haskell/mountpoints:=
-			sys-process/lsof )
-	benchmark? ( dev-haskell/criterion:= )
-	concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= )
-	cryptonite? ( dev-haskell/cryptonite:= )
-	!cryptonite? ( >=dev-haskell/cryptohash-0.11.0:= )
-	dbus? ( >=dev-haskell/dbus-0.10.7:=
-		>=dev-haskell/fdo-notify-0.3:= )
-	magicmime? ( 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/byteable:=
-			dev-haskell/clientsession:=
-			dev-haskell/crypto-api:=
-			>=dev-haskell/path-pieces-0.1.4:=
-			dev-haskell/securemem:=
-			>=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:= )
-	xmpp? ( >=dev-haskell/gnutls-0.1.4:=
-		dev-haskell/network-protocol-xmpp:=
-		dev-haskell/xml-types:= )
-"
-# not generated by hackport:
-RDEPEND="${RDEPEND}
-	dev-vcs/git
-"
-
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
-
-# 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
-)
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'http-conduit (<2.2.0)' 'http-conduit' \
-		'persistent (< 2.5)' 'persistent'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-android \
-		--flag=-androidsplice \
-		$(cabal_flag assistant assistant) \
-		$(cabal_flag benchmark benchmark) \
-		$(cabal_flag concurrentoutput concurrentoutput) \
-		$(cabal_flag cryptonite cryptonite) \
-		$(cabal_flag dbus dbus) \
-		$(cabal_flag magicmime 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) \
-		$(cabal_flag xmpp xmpp)
-}
-
-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/git-annex-6.20170101.ebuild b/dev-vcs/git-annex/git-annex-6.20170101.ebuild
deleted file mode 100644
index 0127fbd7e6c..00000000000
--- a/dev-vcs/git-annex/git-annex-6.20170101.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-RESTRICT="test"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+assistant benchmark +concurrentoutput +cryptonite doc +dbus +magicmime +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/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:=
-	dev-haskell/free:=
-	dev-haskell/hslogger:=
-	dev-haskell/http-client:=
-	dev-haskell/http-conduit:=
-	dev-haskell/http-types:=
-	dev-haskell/ifelse:=
-	dev-haskell/missingh:=
-	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/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:=
-			dev-haskell/hinotify:=
-			dev-haskell/mountpoints:=
-			sys-process/lsof )
-	benchmark? ( dev-haskell/criterion:= )
-	concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= )
-	cryptonite? ( dev-haskell/cryptonite:= )
-	!cryptonite? ( >=dev-haskell/cryptohash-0.11.0:= )
-	dbus? ( >=dev-haskell/dbus-0.10.7:=
-		>=dev-haskell/fdo-notify-0.3:= )
-	magicmime? ( 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
-	dev-haskell/data-default
-	dev-haskell/exceptions
-	dev-haskell/hslogger
-	dev-haskell/ifelse
-	dev-haskell/missingh
-	dev-haskell/unix-compat
-"
-
-# 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 cryptonite cryptonite) \
-		$(cabal_flag dbus dbus) \
-		$(cabal_flag magicmime 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 c880c40bd84..e35251395d3 100644
--- a/dev-vcs/git-annex/metadata.xml
+++ b/dev-vcs/git-annex/metadata.xml
@@ -23,8 +23,6 @@
 		<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="cryptonite">Use the cryptonite library, instead of the older cryptohash</flag>
-		<flag name="ekg">Enable use of EKG to monitor git-annex as it runs.</flag>
 		<flag name="magicmime">Use libmagic to determine file MIME types</flag>
 		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
 		<flag name="pairing">Enable pairing of git annex repositories</flag>


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-annex/
@ 2019-09-25 17:34 Michał Górny
  0 siblings, 0 replies; 18+ messages in thread
From: Michał Górny @ 2019-09-25 17:34 UTC (permalink / raw
  To: gentoo-commits

commit:     809222eb24fd2ac39fbae67c81f6dbc7e13aacc6
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 19 20:06:03 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Sep 25 17:33:02 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=809222eb

dev-vcs/git-annex: USE=magicmime → USE=magic, to match global

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-vcs/git-annex/git-annex-6.20170818-r1.ebuild | 161 +++++++++++++++++++++++
 1 file changed, 161 insertions(+)

diff --git a/dev-vcs/git-annex/git-annex-6.20170818-r1.ebuild b/dev-vcs/git-annex/git-annex-6.20170818-r1.ebuild
new file mode 100644
index 00000000000..2086bf8824d
--- /dev/null
+++ b/dev-vcs/git-annex/git-annex-6.20170818-r1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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="mirror://hackage/packages/archive/${PN}/${PV}/${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
+}


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-annex/
@ 2020-06-28 22:43 Sergei Trofimovich
  0 siblings, 0 replies; 18+ messages in thread
From: Sergei Trofimovich @ 2020-06-28 22:43 UTC (permalink / raw
  To: gentoo-commits

commit:     3b7a6e29cda9bd3c78570243780f24d47d4ad67c
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 28 22:34:34 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jun 28 22:43:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b7a6e29

dev-vcs/git-annex: drop old

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-vcs/git-annex/git-annex-6.20170818.ebuild | 161 --------------------------
 dev-vcs/git-annex/metadata.xml                |   1 -
 2 files changed, 162 deletions(-)

diff --git a/dev-vcs/git-annex/git-annex-6.20170818.ebuild b/dev-vcs/git-annex/git-annex-6.20170818.ebuild
deleted file mode 100644
index ac78674adb6..00000000000
--- a/dev-vcs/git-annex/git-annex-6.20170818.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 +magicmime +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:= )
-	magicmime? ( 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 magicmime 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 e35251395d3..556f1c584b7 100644
--- a/dev-vcs/git-annex/metadata.xml
+++ b/dev-vcs/git-annex/metadata.xml
@@ -23,7 +23,6 @@
 		<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="magicmime">Use libmagic to determine file MIME types</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>


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-annex/
@ 2020-08-12  9:21 Sergei Trofimovich
  0 siblings, 0 replies; 18+ messages in thread
From: Sergei Trofimovich @ 2020-08-12  9:21 UTC (permalink / raw
  To: gentoo-commits

commit:     014f21e754e689a408f5181a9034e6c1c6b34314
Author:     Jack Todaro <solpeth <AT> posteo <DOT> org>
AuthorDate: Tue Aug 11 21:12:26 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Aug 12 09:21:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=014f21e7

dev-vcs/git-annex: remove old

Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Jack Todaro <solpeth <AT> posteo.org>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-vcs/git-annex/Manifest                    |   1 -
 dev-vcs/git-annex/git-annex-8.20200617.ebuild | 160 --------------------------
 dev-vcs/git-annex/metadata.xml                |   1 -
 3 files changed, 162 deletions(-)

diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index cac3abdca23..7306f3571bc 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -1,2 +1 @@
-DIST git-annex-8.20200617.tar.gz 1296190 BLAKE2B 3731641ff6623d7f0b2ac5402fe6acb41e4c8210e958c5c4383f401486d4307a921cc9072023ec62fdf2da78ec432cf0707a06265345681d7646af2974917cbf SHA512 736d10c1442bb6d8eaf67337da6b606e8b79970f1bbd10cfc15caaaa0376780c14dee9ece066dbc6b378f0a750d11d5b7b87687252899e473748828939dc03ae
 DIST git-annex-8.20200810.tar.gz 1312890 BLAKE2B 63226ee6b2150dd48dae3e52e70502e64e89d73185500c1cea201f2be98760ed9b3cd173b75b5603b49ca63f316163273a7c6d7eaddd68e548d903c845925713 SHA512 e6a4ad3169582f65284218c75f2679105a52d2f22310b10436796c439e031c5ad6f4d2dff1772f4cfc670d8956ae4a68d4d98e1dabd48bf06bcafda97676321f

diff --git a/dev-vcs/git-annex/git-annex-8.20200617.ebuild b/dev-vcs/git-annex/git-annex-8.20200617.ebuild
deleted file mode 100644
index 033a5d6cb5a..00000000000
--- a/dev-vcs/git-annex/git-annex-8.20200617.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-#hackport: flags: -production,-android,-androidsplice,-testsuite,networkbsd:network-3
-
-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"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+assistant benchmark +dbus debuglocks doc +magicmime +network-3 +pairing +s3 +torrentparser +webapp +webdav" # NOTE: add local USE flag 'doc' when bumping
-
-RESTRICT=test
-
-RDEPEND="dev-haskell/aeson:=
-	dev-haskell/async:=
-	dev-haskell/attoparsec:=
-	>=dev-haskell/bloomfilter-2.0.0:=
-	dev-haskell/byteable:=
-	dev-haskell/case-insensitive:=
-	>=dev-haskell/concurrent-output-1.10:=
-	dev-haskell/conduit:=
-	>=dev-haskell/connection-0.2.6:=
-	dev-haskell/crypto-api:=
-	>=dev-haskell/cryptonite-0.23:=
-	dev-haskell/data-default:=
-	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.0:=
-	dev-haskell/http-client-tls:=
-	>=dev-haskell/http-conduit-2.3.0:=
-	>=dev-haskell/http-types-0.7:=
-	dev-haskell/ifelse:=
-	dev-haskell/memory:=
-	dev-haskell/microlens:=
-	dev-haskell/monad-control:=
-	dev-haskell/monad-logger:=
-	>=dev-haskell/mtl-2:=
-	>=dev-haskell/network-uri-2.6:=
-	dev-haskell/old-locale:=
-	>=dev-haskell/optparse-applicative-0.14.1:=
-	>=dev-haskell/persistent-2.8.1:=
-	>=dev-haskell/persistent-sqlite-2.8.1:=
-	dev-haskell/persistent-template:=
-	>=dev-haskell/quickcheck-2.10.0: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/tagsoup:=
-	>=dev-haskell/tasty-0.7:=
-	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:=
-	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:= )
-	magicmime? ( dev-haskell/magic:= )
-	network-3? ( >=dev-haskell/network-3.0.0.0:=
-			dev-haskell/network-bsd:= )
-	!network-3? ( >=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:=
-			>=dev-haskell/path-pieces-0.2.1:=
-			>=dev-haskell/shakespeare-2.0.11:=
-			dev-haskell/wai:=
-			dev-haskell/wai-extra:=
-			>=dev-haskell/warp-3.2.8:=
-			>=dev-haskell/warp-tls-3.2.2:=
-			>=dev-haskell/yesod-1.4.3:=
-			>=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
-"
-# not generated by hackport:
-DEPEND+=" dev-lang/perl
-	doc? ( www-apps/ikiwiki net-misc/rsync )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-android \
-		--flag=-androidsplice \
-		$(cabal_flag assistant assistant) \
-		$(cabal_flag benchmark benchmark) \
-		$(cabal_flag dbus dbus) \
-		$(cabal_flag debuglocks debuglocks) \
-		$(cabal_flag magicmime magicmime) \
-		$(cabal_flag network-3 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
-}
-
-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 acfc1100620..58517e95d4a 100644
--- a/dev-vcs/git-annex/metadata.xml
+++ b/dev-vcs/git-annex/metadata.xml
@@ -14,7 +14,6 @@
 		<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="network-3">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>


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-annex/
@ 2020-08-12  9:21 Sergei Trofimovich
  0 siblings, 0 replies; 18+ messages in thread
From: Sergei Trofimovich @ 2020-08-12  9:21 UTC (permalink / raw
  To: gentoo-commits

commit:     d8b33e00fde8371b4f235c814fd748f9559d8cd9
Author:     Jack Todaro <solpeth <AT> posteo <DOT> org>
AuthorDate: Tue Aug 11 21:08:34 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Aug 12 09:21:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8b33e00

dev-vcs/git-annex: bump up to 8.20200810

Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Jack Todaro <solpeth <AT> posteo.org>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-vcs/git-annex/Manifest                    |   1 +
 dev-vcs/git-annex/git-annex-8.20200810.ebuild | 164 ++++++++++++++++++++++++++
 dev-vcs/git-annex/metadata.xml                |  45 ++++---
 3 files changed, 192 insertions(+), 18 deletions(-)

diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index 9e78d63c3c1..cac3abdca23 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -1 +1,2 @@
 DIST git-annex-8.20200617.tar.gz 1296190 BLAKE2B 3731641ff6623d7f0b2ac5402fe6acb41e4c8210e958c5c4383f401486d4307a921cc9072023ec62fdf2da78ec432cf0707a06265345681d7646af2974917cbf SHA512 736d10c1442bb6d8eaf67337da6b606e8b79970f1bbd10cfc15caaaa0376780c14dee9ece066dbc6b378f0a750d11d5b7b87687252899e473748828939dc03ae
+DIST git-annex-8.20200810.tar.gz 1312890 BLAKE2B 63226ee6b2150dd48dae3e52e70502e64e89d73185500c1cea201f2be98760ed9b3cd173b75b5603b49ca63f316163273a7c6d7eaddd68e548d903c845925713 SHA512 e6a4ad3169582f65284218c75f2679105a52d2f22310b10436796c439e031c5ad6f4d2dff1772f4cfc670d8956ae4a68d4d98e1dabd48bf06bcafda97676321f

diff --git a/dev-vcs/git-annex/git-annex-8.20200810.ebuild b/dev-vcs/git-annex/git-annex-8.20200810.ebuild
new file mode 100644
index 00000000000..c80e75b5184
--- /dev/null
+++ b/dev-vcs/git-annex/git-annex-8.20200810.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.6.9999
+#hackport: flags: -production,-android,-androidsplice,-testsuite
+
+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"
+
+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
+
+RDEPEND="dev-haskell/aeson:=
+	dev-haskell/async:=
+	dev-haskell/attoparsec:=
+	>=dev-haskell/bloomfilter-2.0.0:=
+	dev-haskell/byteable:=
+	dev-haskell/case-insensitive:=
+	>=dev-haskell/concurrent-output-1.10:=
+	dev-haskell/conduit:=
+	>=dev-haskell/connection-0.2.6:=
+	dev-haskell/crypto-api:=
+	>=dev-haskell/cryptonite-0.23:=
+	dev-haskell/data-default:=
+	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-tls:=
+	>=dev-haskell/http-conduit-2.3.0:=
+	>=dev-haskell/http-types-0.7:=
+	dev-haskell/ifelse:=
+	dev-haskell/memory:=
+	dev-haskell/microlens:=
+	dev-haskell/monad-control:=
+	dev-haskell/monad-logger:=
+	>=dev-haskell/mtl-2:=
+	>=dev-haskell/network-uri-2.6:=
+	dev-haskell/old-locale:=
+	>=dev-haskell/optparse-applicative-0.14.1:=
+	>=dev-haskell/persistent-2.8.1:=
+	>=dev-haskell/persistent-sqlite-2.8.1:=
+	dev-haskell/persistent-template:=
+	>=dev-haskell/quickcheck-2.10.0: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/tagsoup:=
+	>=dev-haskell/tasty-0.7:=
+	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:=
+	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:= )
+	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:=
+			>=dev-haskell/path-pieces-0.2.1:=
+			>=dev-haskell/shakespeare-2.0.11:=
+			dev-haskell/wai:=
+			dev-haskell/wai-extra:=
+			>=dev-haskell/warp-3.2.8:=
+			>=dev-haskell/warp-tls-3.2.2:=
+			>=dev-haskell/yesod-1.4.3:=
+			>=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
+"
+# not generated by hackport:
+DEPEND+=" dev-lang/perl
+	doc? ( www-apps/ikiwiki net-misc/rsync )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-android \
+		--flag=-androidsplice \
+		$(cabal_flag assistant assistant) \
+		$(cabal_flag benchmark benchmark) \
+		$(cabal_flag dbus dbus) \
+		$(cabal_flag debuglocks debuglocks) \
+		$(cabal_flag gitlfs gitlfs) \
+		$(cabal_flag httpclientrestricted httpclientrestricted) \
+		$(cabal_flag magicmime magicmime) \
+		$(cabal_flag networkbsd 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
+}
+
+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 8d49ace368c..acfc1100620 100644
--- a/dev-vcs/git-annex/metadata.xml
+++ b/dev-vcs/git-annex/metadata.xml
@@ -5,30 +5,39 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<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, checksumming time, or disk space.
-		
-		Even without file content tracking, being able to manage files with git,
-		move files around and delete files with versioned directory trees, and use
-		branches and distributed clones, are all very handy reasons to use git. And
-		annexed files can co-exist in the same git repository with regularly
-		versioned files, which is convenient for maintaining documents, Makefiles,
-		etc that are associated with annexed files but that benefit from full
-		revision control.
-	</longdescription>
 	<use>
 		<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="network-3">Use network-3</flag>
-		<flag name="pairing">Enable pairing of git annex repositories</flag>
-		<flag name="s3">Enable Amazon S3 remote</flag>
+		<flag name="networkbsd">Build with network-3.0 which split out network-bsd</flag>
+		<flag name="network-3">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 remote</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] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-annex/
@ 2022-07-30  5:59 Sam James
  0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2022-07-30  5:59 UTC (permalink / raw
  To: gentoo-commits

commit:     dcafe5130522eb69e56c84afe19cdd1f82700706
Author:     matoro <matoro <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Sat Jul 30 02:51:40 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=dcafe513

dev-vcs/git-annex: keyword 10.20220624 for ~ppc64

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-vcs/git-annex/git-annex-10.20220624.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-vcs/git-annex/git-annex-10.20220624.ebuild b/dev-vcs/git-annex/git-annex-10.20220624.ebuild
index 23fbd1f88474..3104cec95ee0 100644
--- a/dev-vcs/git-annex/git-annex-10.20220624.ebuild
+++ b/dev-vcs/git-annex/git-annex-10.20220624.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://git-annex.branchable.com/"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux"
 IUSE="+assistant +benchmark +dbus debug doc +gitlfs +magicmime +pairing +torrentparser +webapp"
 
 RDEPEND="dev-haskell/aeson:=


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-annex/
@ 2023-03-17 18:23 Sam James
  0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2023-03-17 18:23 UTC (permalink / raw
  To: gentoo-commits

commit:     90c6f0f6cc3a9a8b701af8507cd2438fbb3e7704
Author:     hololeap <hololeap <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Wed Mar 15 23:45:29 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 17 18:22:32 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90c6f0f6

dev-vcs/git-annex: Stabilize for amd64

Signed-off-by: hololeap <hololeap <AT> users.noreply.github.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-vcs/git-annex/git-annex-10.20220624.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-vcs/git-annex/git-annex-10.20220624.ebuild b/dev-vcs/git-annex/git-annex-10.20220624.ebuild
index 168e00c73277..533212eb0b99 100644
--- a/dev-vcs/git-annex/git-annex-10.20220624.ebuild
+++ b/dev-vcs/git-annex/git-annex-10.20220624.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ HOMEPAGE="https://git-annex.branchable.com/"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
 IUSE="+assistant +benchmark +dbus debug doc +gitlfs +magicmime +pairing +torrentparser +webapp"
 
 REQUIRED_USE="webapp? ( assistant )"


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-annex/
@ 2023-03-19  1:49 Sam James
  0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2023-03-19  1:49 UTC (permalink / raw
  To: gentoo-commits

commit:     1175b08ed2dab21c201ee42d87ea7fe17dee23fa
Author:     hololeap <hololeap <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Sun Mar 19 01:05:10 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 19 01:42:05 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1175b08e

dev-vcs/git-annex: Add GHC_BOOTSTRAP_PACKAGES

Bug: https://github.com/gentoo-haskell/gentoo-haskell/issues/1327
Signed-off-by: hololeap <hololeap <AT> users.noreply.github.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-vcs/git-annex/git-annex-10.20220624.ebuild | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dev-vcs/git-annex/git-annex-10.20220624.ebuild b/dev-vcs/git-annex/git-annex-10.20220624.ebuild
index 533212eb0b99..0b65231e2a48 100644
--- a/dev-vcs/git-annex/git-annex-10.20220624.ebuild
+++ b/dev-vcs/git-annex/git-annex-10.20220624.ebuild
@@ -19,6 +19,13 @@ IUSE="+assistant +benchmark +dbus debug doc +gitlfs +magicmime +pairing +torrent
 
 REQUIRED_USE="webapp? ( assistant )"
 
+GHC_BOOTSTRAP_PACKAGES=(
+	async
+	filepath-bytestring
+	split
+	unix-compat
+)
+
 RDEPEND="dev-haskell/aeson:=
 	>=dev-haskell/ansi-terminal-0.9:=
 	dev-haskell/async:=


^ permalink raw reply related	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2023-03-19  1:49 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-06 16:52 [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-annex/ Sergei Trofimovich
  -- strict thread matches above, loose matches on Subject: below --
2023-03-19  1:49 Sam James
2023-03-17 18:23 Sam James
2022-07-30  5:59 Sam James
2020-08-12  9:21 Sergei Trofimovich
2020-08-12  9:21 Sergei Trofimovich
2020-06-28 22:43 Sergei Trofimovich
2019-09-25 17:34 Michał Górny
2017-08-21 21:32 Sergei Trofimovich
2017-08-21 21:32 Sergei Trofimovich
2017-02-16 21:57 Sergei Trofimovich
2016-09-24 10:08 Sergei Trofimovich
2016-08-16 21:40 Sergei Trofimovich
2016-04-03 21:24 Sergei Trofimovich
2016-04-03 13:39 Sergei Trofimovich
2016-04-03 13:39 Sergei Trofimovich
2016-02-06 16:52 Sergei Trofimovich
2016-01-22 20:23 Sergei Trofimovich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox