summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Vershilov <qnikst@gentoo.org>2014-03-15 20:59:48 +0000
committerAlexander Vershilov <qnikst@gentoo.org>2014-03-15 20:59:48 +0000
commit0d01576ffec502b818dcc71eb23c088c0fe6a877 (patch)
tree1b0499f8ca1eb93ca5d7d8ff56045c080c8ca7dd /dev-vcs/git-annex
parentBackport upstream fixes for bug 503180. (diff)
downloadhistorical-0d01576ffec502b818dcc71eb23c088c0fe6a877.tar.gz
historical-0d01576ffec502b818dcc71eb23c088c0fe6a877.tar.bz2
historical-0d01576ffec502b818dcc71eb23c088c0fe6a877.zip
fix assistant dependency, #504610
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64 Manifest-Sign-Key: 0xEAD50D64D8D3571A!
Diffstat (limited to 'dev-vcs/git-annex')
-rw-r--r--dev-vcs/git-annex/ChangeLog8
-rw-r--r--dev-vcs/git-annex/Manifest20
-rw-r--r--dev-vcs/git-annex/git-annex-5.20140306-r1.ebuild (renamed from dev-vcs/git-annex/git-annex-5.20140306.ebuild)3
3 files changed, 19 insertions, 12 deletions
diff --git a/dev-vcs/git-annex/ChangeLog b/dev-vcs/git-annex/ChangeLog
index 05265a2505c8..7023a4b792d5 100644
--- 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.21 2014/03/12 21:33:28 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/ChangeLog,v 1.22 2014/03/15 20:59:23 qnikst Exp $
+
+*git-annex-5.20140306-r1 (15 Mar 2014)
+
+ 15 Mar 2014; Alexander Vershilov <qnikst@gentoo.org>
+ +git-annex-5.20140306-r1.ebuild, -git-annex-5.20140306.ebuild:
+ fix assistant dependency, #504610
*git-annex-5.20140306 (12 Mar 2014)
diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index 682554b63293..c1700c07bd53 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -7,19 +7,19 @@ DIST git-annex-4.20130815.tar.gz 6408230 SHA256 e144cf60ccdfc588e71798141f38ce9e
DIST git-annex-5.20140306.tar.gz 4340927 SHA256 89cacd6b17a0db65c09c5bc0e21298629fd7ac0f92c7b632f58c590e7ec64fce SHA512 8f2980604f8172537a6e67241b7ddedfc7dbafc5dca64398f5ded381a6326b6cb7b5324b515e324f53ea6e2a7ff12b8a30c56a894ec0b18d9ca5c4b3bd31385a WHIRLPOOL 414591c91f17a6ee1afbe59d8f5115a85cc2932803aa7618d4f0a7b25574d87ea538ce7cce0f1def97b60c4c243e041019e09324e2a1ee475cfacfad78f313ca
EBUILD git-annex-3.20121211-r2.ebuild 2796 SHA256 ec1ee68bf3ea711322acf89194f4eb2ad0f2702ab38fb696e7061745baa2481d SHA512 1a09fb926a8ac966e6b0d9010a5bb6db9c5d0197dd04fbce0e83f74d2fbbfa35737f438c1e3b956c6905b44cc50f302b7688d0d062078c42e097491c6c53ef94 WHIRLPOOL 14624b94558bffa5a1ed27ffa3b859b1254a20bd07e99b02cbc65a9b6c29948b5a57b147971cae50c0cd1ad6da39569b57dce4d0461db7028d4f4255e537bca0
EBUILD git-annex-4.20130815-r1.ebuild 3475 SHA256 13a5211cc722e89f6c65e215d249f4637c7fca1e683ac033593743024a1d44fd SHA512 63a3460cb789b81c81252e9a3a5e7d04ac839fd178c6d39d49cfc3ea5ed68cf729fe8cdd6b36e5c5fd73fa1c7f33fa0de377d72a81695e402a328a35aad6cbba WHIRLPOOL 3c056a9399bee0f19b8cef2db8cac74803d540d05c6cdef06e7d19a3307cc9bcb7cc5c71a2378ab7749734957944dab6637d47588e41dd4fd1b153c1a2d9c172
-EBUILD git-annex-5.20140306.ebuild 4531 SHA256 86b86f7fef5075ac0e5ed7dc5b7ee426d44adbb5fd547a1552d213a9cb499829 SHA512 3838a5b902c7552a3f4669f048d30494e80e88aa52d2ad6b1c80cb5ce8f028adafb5333870d23ea05ed431428e098587de135a20a73bfff0f4fc3d16699de8a3 WHIRLPOOL 8a544d59a438ea33426772f145f106ee105a13c0c8b970ebd3323b1333e1a6f9d02687b082ecf1e11c682efcf4d3bdfe4622c3b456a1a884dd7f7fdd4471c639
-MISC ChangeLog 4284 SHA256 1773fcdaaa76915f0c9844ccca9e358b57785a18fb16ca796989d09515f9bc2f SHA512 09774bb5cd340f1ae53c7b5956c24ac49b4abd0a977edd90dec7b42e8d0e573be72733e407de844f3b3b9f7fe9d165ae446ab627341cb3e49dc3b4ca1c77dfdc WHIRLPOOL 25be015382a4a607c8bd8d58be3f68749f1e5d683b9b1e49c61636cafdd16f5fc92696856d9174582c7e26ebfb588ec675f5073ff9e6e80415840b635220bd50
+EBUILD git-annex-5.20140306-r1.ebuild 4567 SHA256 981854e05e7c41cfa8d5fb1e6bdbb876e54cd6c79e15ffbebd0bcf71efd719ef SHA512 30c214c586953f33f643c8906fa02d882445cda9f1fb7d0c436cceeb14d58c411da4ab01de73ded84c9b5ea6a6fe1fa35a89387a06b791e1af5e5fe1d42df346 WHIRLPOOL dbff39cb94cb39c081523d2373341c0783caf14dfa3e829e3c91b9e61986a41f252d17e8e30d10cbd0f9220554849f2de245466d894c4cbdb2ccdab1fada6607
+MISC ChangeLog 4481 SHA256 8d93fa07858d8623e23a86a1138dce8534396a1b5e32d1a3c788f02e2e629415 SHA512 48e2eed5710347af848febd0b11ade0bb465c603c089dc554cc59857d6373965bc2521faac778a7821d516693cb6d73038ef98d1a8f13e3738c2b05525867476 WHIRLPOOL e4d9a7c59ed58402b6e309f0b90687b46e0be46b0eacdd6a21a43393d96f9cdc3bb5e2aed54e6f6d81f3be66ca77f95a3930b0f8ba9d6fdbc01b49c762671ccd
MISC metadata.xml 2065 SHA256 e4e5ef593e5b7c3b2fdb9078186481782b387a9616528b4e762f56619bd2ef93 SHA512 eacaf2913548b16f69cafe7ea0f54945d5ff7713ccf412aa99a12863a719225ab420bcfd50c237d19e1694f246364ed43c3a5c69d7ae1ea899d1d5f48e725b7b WHIRLPOOL c1963e71659026fb6a43dabc34a5366b31e03416d10c0e0583f1a1e60bfafc87c5878100cf1e7f4c5eb6037ea6e42759c2d793ccd64182aebda7541a615b6569
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQF8BAEBCABmBQJTINKpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQF8BAEBCABmBQJTJL89XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwMTlGQTEwRTVCMUJCNjdFRDM5Qzg3RjdF
-QUQ1MEQ2NEQ4RDM1NzFBAAoJEOrVDWTY01caPgAH/0lyOXr3VHWIKtOWFacjfzVo
-T6u2GTahcNGtNPlrzeMnRSXFy96YcM9P4wSmtqIgUQbMCSWZFYckHMh5pecOV0PX
-wtesds/KqzqZLK52+WPhpHD8+a6A30uB7gw8qJRwpqbpXEy9n7RaVwNnRaZ/7AEs
-U4mGfgNVASY+QafEWEIWixT5CHRsR3k2H+iO65Qtt3ohrHdhFC/JxF3E4eFDKt4n
-woynaX+X3GPw66w5rBopUwNKr09fVdnBf8UI+7Dp2gRnaFGJQRyfdAbO1QUTasFj
-SP1wOxR8xhFNffBpIJwMmXObr054zDYuo7UmIlaQMlUwF3D3uBLaA3W3Yg7qhVI=
-=01r9
+QUQ1MEQ2NEQ4RDM1NzFBAAoJEOrVDWTY01cauwUIAKCYwE6G13N2mU7xkoIHCjEZ
++dta5j8kuH2FaARy9+S6rzXe+xtYR8ZULMOHp6FRFudhzLZPDzeNIfSLK2zTIyy4
+09jP0HJn4oYXSxS58SZRICnzIsTu9X/psYjPMg0UJ+MiAY2ePF6uMdjrGyWM0zMN
+0SI6Eg07vVp3B715/aDj5BnZ1hZUxQMfAV6JhA4DnO9te8PsngJy7A0uCWHPucbS
+g4LEh9uNRq0MaK/gIqOzfi08t+QDNHYsDrlOD3+Y9GSYBqIwty+VCjv0jvXT31i7
+14jzDdWJBlYGfCx6AEKF5RE5WDartiUHOLDA6ezpH9Dq1Yj3VrjLx2eZsxd2MYo=
+=L+zp
-----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-annex/git-annex-5.20140306.ebuild b/dev-vcs/git-annex/git-annex-5.20140306-r1.ebuild
index dbf5778d8aa7..8a7eed2ca1dd 100644
--- a/dev-vcs/git-annex/git-annex-5.20140306.ebuild
+++ b/dev-vcs/git-annex/git-annex-5.20140306-r1.ebuild
@@ -1,6 +1,6 @@
# 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.20140306.ebuild,v 1.1 2014/03/12 21:33:28 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/git-annex-5.20140306-r1.ebuild,v 1.1 2014/03/15 20:59:23 qnikst Exp $
EAPI=5
@@ -20,6 +20,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE="android androidsplice +assistant +cryptohash +dbus +dns doc ekg +feed +inotify +pairing tahoe +production +quvi +s3 +tdfa +testsuite +webapp +webdav +xmpp"
RDEPEND="dev-vcs/git
+ assistant? ( sys-process/lsof )
"
DEPEND="${RDEPEND}
dev-haskell/async