Version bump (bug #532090 by Manuel Rüger).

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

diff --git a/dev-vcs/git-annex/ChangeLog b/dev-vcs/git-annex/ChangeLog
index 20fd97f0059bdd55a8ea38ebc459f6352efb761e..4269655e229cade46b9126432204d63c9a221122 100644 (file)
--- a/dev-vcs/git-annex/ChangeLog
+++ b/dev-vcs/git-annex/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/git-annex
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/ChangeLog,v 1.32 2014/11/10 09:57:50 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/ChangeLog,v 1.33 2014/12/16 23:08:28 slyfox Exp $
+
+*git-annex-5.20141203 (16 Dec 2014)
+
+  16 Dec 2014; Sergei Trofimovich <slyfox@gentoo.org>
+  +git-annex-5.20141203.ebuild:
+  Version bump (bug #532090 by Manuel Rüger).
 
 *git-annex-5.20141125 (10 Nov 2014)
 

diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index a818013a41ef0ddc30cad45fc9ddeed310e51b11..e0b6e745fc52518d4edf6048710e80da1c22b072 100644 (file)
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -4,14 +4,16 @@ Hash: SHA256
 AUX git-annex.xpm 1961 SHA256 e9576b4d026cb8e61ee602d52639d65a2e8f2aadaaa3cfd9d8bfd8f55cf03803 SHA512 4a22ac448852160d66838c272f41b8c7599aa1b904e35ac03ea294d9ed15b855bde24b7e5407a2578937bfd51d482837ed6680af680166d030f71666316ae4d3 WHIRLPOOL a582bb82d01de4750e3bcb2e419cf0a334e11428972f68bbb70aa06ea5a357de89d48327d4576adf0f4101cd577f13c6f50b41d85d7c2fc6a0efb87124b88b60
 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
 EBUILD git-annex-5.20140927.ebuild 4582 SHA256 c7cf1e3fca817baaf9823d431a66435fa759829dfe09957c95f66f9872581aef SHA512 81c420f4873fce061ad41a792155622d27cd076c150b26cd4b49c2a6b3d6bacca983815a2f1ea3fd85ed96d2fb5da35d1f65c426b2cd1f0bbe5ba8d04cd03dc6 WHIRLPOOL fa6257fe10038398f01ed026983d393003f26540e452e21b876ffe974a02fda5c729766abd994cbc3993bcd729eee676023f339b77b37b1b2b870e1bdbd1c903
 EBUILD git-annex-5.20141125.ebuild 4582 SHA256 a70b480a30a2c310eb8e86818be1760f1dccae4034b56a8fe83eb5bdc853e371 SHA512 f3708d11291175c5ef3dd11abd4ca45cc9e8d8f01c0cd39dee4183848b422cac607eb18efb404ad4c7c0e8ddc4642fcea7a57769252d876147e49ce3e3c0d432 WHIRLPOOL 9a782d2b35b57fb50d12d1da0638aa1e1069f9a062b31ab2edf83248001be0abee96664e2a2645718401579c0bcbf9b3e1d1e3c918869243ff573772ff47295e
-MISC ChangeLog 6522 SHA256 4e5fbf5117a813eaabdf2907b66ccb2d2edf2a9af0dff1c11896f082fc33cddf SHA512 5005c600b1ee2888bbcd0a2c04c88395b9afb78321eee907c59a6e90f5c5f89d1f5eeb4d4d9055d684f485d8592b6bbcb6c9d7d30a20c615f091be5e70c575fa WHIRLPOOL f396006afc729c561f8d66b09ec740ff27da92b96ac619c95bbff0efcd41308d180433719dea98de09abd16eb780ddf17095395171e005c134ac3b27f1d17b73
+EBUILD git-annex-5.20141203.ebuild 4664 SHA256 595f71ccdd459c57f606c2115966ad0eaf359ecb8c29e80b3ab220c8b30f12d1 SHA512 ebf0da210685736080b51eaa70230694321235f56069880bca1d52a63fd632fc550a65b68fe7541b210f00c905f1f6449a04bb94cb2f25dce8be5c37b451baa5 WHIRLPOOL 16c37434bc80305ffcf5e72db8bc540d18baa04988893cfe470d600853e751b9a21fe02559919816b1e4796a71f63b9af2b65ee1e1a70d6286db0bb107ace071
+MISC ChangeLog 6693 SHA256 14814d91f5bbad36f9db7fa8035641f67e9c040e4c762cd1c2603efc12eb6395 SHA512 8f5e3ad2e6e48b90eb52d3a0b74ebe1c95c98de893f63e45114ed2160c71388332963f5e8d25d826567e59e84da12681be52413b74c1adbd2d6713afc0087cc4 WHIRLPOOL dbaa41bd54fb5a79c2c4fe0c7eb7c46926bc53324eb1c09b51863f3a4e3de16b9b449a4acb589f099c01e552562a9f6837e1fe6df2defc830324963344e67ee7
 MISC metadata.xml 2128 SHA256 0eb7a205b68ef6665df385d7e3edbb3fc3d249f8d3e31a8755895e413346f432 SHA512 5b511ffbe6845d663c742a5a2596c83c45a8bd5919cc8e90413f11ea9aa10aab42a9293c86d7a2ce68dccfe2e23f45e56e13e7c3ebf1533315db578174fa61f4 WHIRLPOOL 7d7a9a718537ef0b5bfdc810a31d4d934f2028b48b0d0f32eb3fd7e9e21b74686b1053c70a84606b57b49d92b501a122d98418ee49a53d3cce6d1b1b81cfc190
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRgjCEACgkQcaHudmEf86pMJwCaA/7Mn3wtHJYe1O1o1yD8flGt
-4u8AnipYxkSlEpBlNdVzRPYXi8E0bpnm
-=SPeG
+iEYEAREIAAYFAlSQu20ACgkQcaHudmEf86ogbQCeOCo+gdkVmmMVro/K8qjWRZUI
+jlwAnjUoMY2ACjadmhTC1O3UbfBN+rkz
+=5NQ7
 -----END PGP SIGNATURE-----

diff --git a/dev-vcs/git-annex/git-annex-5.20141203.ebuild b/dev-vcs/git-annex/git-annex-5.20141203.ebuild
new file mode 100644 (file)
index 0000000..ac834cd
--- /dev/null
+++ b/dev-vcs/git-annex/git-annex-5.20141203.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/git-annex-5.20141203.ebuild,v 1.1 2014/12/16 23:08:28 slyfox Exp $
+
+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
+}