diff options
| -rw-r--r-- | dev-vcs/git-annex/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-vcs/git-annex/Manifest | 17 | ||||
| -rw-r--r-- | dev-vcs/git-annex/git-annex-3.20111203.ebuild | 36 | ||||
| -rw-r--r-- | dev-vcs/git-annex/git-annex-3.20120315.ebuild | 73 | ||||
| -rw-r--r-- | dev-vcs/git-annex/git-annex-3.20121211-r2.ebuild (renamed from dev-vcs/git-annex/git-annex-3.20120522.ebuild) | 55 | ||||
| -rw-r--r-- | dev-vcs/git-annex/metadata.xml | 4 |
6 files changed, 60 insertions, 134 deletions
diff --git a/dev-vcs/git-annex/ChangeLog b/dev-vcs/git-annex/ChangeLog index a03f315daa80..755fd156510a 100644 --- a/dev-vcs/git-annex/ChangeLog +++ b/dev-vcs/git-annex/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-vcs/git-annex # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/ChangeLog,v 1.11 2012/12/07 10:39:18 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/ChangeLog,v 1.12 2012/12/16 12:42:31 slyfox Exp $ + +*git-annex-3.20121211-r2 (16 Dec 2012) + + 16 Dec 2012; Sergei Trofimovich <slyfox@gentoo.org> + +git-annex-3.20121211-r2.ebuild, -git-annex-3.20111203.ebuild, + -git-annex-3.20120315.ebuild, -git-annex-3.20120522.ebuild, metadata.xml: + Version bump (bug #444010 by Ivan S. Titov and Manuel Rüger). 07 Dec 2012; Sergei Trofimovich <slyfox@gentoo.org> git-annex-3.20111203-r1.ebuild, git-annex-3.20111203.ebuild, diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest index 7e43c155e976..b6e2195177ff 100644 --- a/dev-vcs/git-annex/Manifest +++ b/dev-vcs/git-annex/Manifest @@ -2,20 +2,17 @@ Hash: SHA256 DIST git-annex-3.20111203.tar.gz 442974 SHA256 3b7361c9d27302f23136266ff1223b2a82c280988b3c706d518539eb577af244 SHA512 ec728449a76b966ce010e7a9a2892c837414504dd00db3eb77e312eed499c2c0163de12fe5278a3fd055e6fe85c89ca7c70f379f7627c29180a40d0690f840a4 WHIRLPOOL a74c3c1c07cfb61bfbbfa478bedf4e092430e52ffda5bf058a4f62e83810aad5b8c720da04147bef5d7236fc4d02f7bff790e22e34f36ab4377c5d7c9e793cd9 -DIST git-annex-3.20120315.tar.gz 622433 SHA256 742f37f04d94a97086ffdb0ad7e903b1729f7fb40bdd580fe500a859ffca1762 SHA512 ce0b3b0aed1a5f26ec6f7e78830e398efea53c68aac2e28a7e3adb72a4a7911f80814ac3885aadc796f30e2d66f7b82cfbe0c5c5207445628831d6a25d2a4880 WHIRLPOOL 88928724f72da68843016356cda61e81afe489590ff5cfcfc27e5bf3789de692379e0a02444010b1a3376759c25bb097937617edc07663d65c64b53e2da6c984 -DIST git-annex-3.20120522.tar.gz 638849 SHA256 694e59c93e8049172a54e6898c274b200c62d62b9b3064687a76c318727b5925 SHA512 383a5c44ac7bdfd6a92f75cd9eecd325565139ff918cefb08bb209f232c43be93adb90b2387d199f7028982e8afa43f79fcb5d81ed3704abaf1b61f214948b0f WHIRLPOOL 54bab14b3573fe571a67bacdf4cf0ffbb486ba2933b745f0eb42aa9a9bdca65ffc0784f99bbe3b3528e7535a009be59c54661a7e1eed9d1be2cc7f8e74f4adef DIST git-annex-3.20120605.tar.gz 654840 SHA256 1442548463bc56d702b38f1bee45be40da2aaa884127fe461f9bd12e51d5a38c SHA512 1eea2260efe558d1490ad89320ff3b3aafeaeaa8174d736b49f62814dd895250b5e01854696b87c43b7c1fb98a556118702e66dcab6bf25c40b2202b52b3f8ca WHIRLPOOL 10c4719bc9048d3d4ab074461bf32786e486ab89f07d1c94ce06e571e1a5de83bd8d9d21d306280174d9603eef7eb6af6c54973621b8e64b5bf24ae9ce1a5bea +DIST git-annex-3.20121211.tar.gz 2068316 SHA256 3b6d9d7d8d44c7939813a4798a78b76a02efef655030d742149eda3779daa13e SHA512 26095f275e9226827d36c8c9b48c71ce3c23091594b911e06cba1c4f5b65d5f60372ec300e2084fdda2f68ea8d53ba7d17f160e805d1830b1910a3d70f8bc4ba WHIRLPOOL c952877bdfac18c2216780333e930d142898e517efdd8bbaee1c42b1a95a3ddcfa4558f1b4653dac30e03a0d57dc5493d5471f70871f72ce9a432e6c7699bc94 EBUILD git-annex-3.20111203-r1.ebuild 1450 SHA256 554cea476b133269c141993da1145175539decf0b37247927e2fabb68a14e142 SHA512 aa522d55cf70982fc5693496d6b1853e6917aa089ecb2f9926a37ffb750ec89b56fa47c3d68cdadd7a5cf7807214d5b78718ce9a340dc863e3e3e402b823027e WHIRLPOOL 5213d9f259a6613f7a958df88c882daa86aaa249ceb07f370b768a1354443930cc3c27a2220d8df2d4256406e69c8a652f7a735765e16336575e1e86626fd5a0 -EBUILD git-annex-3.20111203.ebuild 957 SHA256 e074768f06f9a3c2b7686e1d1394717bf08d76ff58bb2c7f7d4c89ba14118dd9 SHA512 7dd70903f0af5d987505d377390f0aa3579baf2ca2caf77df707858496086d723b26dcd10f08c081f433b08c94047ed56d35cec839db804c981a4a781274fa14 WHIRLPOOL 2e5f32d8ab49fdc3143e0ef64b4e1053fb1badcb776f715b5a50a66c3d3269f3282443e9ecee433c82bc8a3f46931241cc43de12f43a3e887bcf5cc6b7d29986 -EBUILD git-annex-3.20120315.ebuild 1803 SHA256 4d7cc0e5a259a0554c9c56982dc940f5cdca11d25977e07392f57bbddf14af0a SHA512 a15da560486410ddea01a23b808905c43df2a2a2c0477ca5cc60602280bb0096c547f4157b3cbec6842ec4430ce823a08b4ae8a2348bfdcb523cc392bd354398 WHIRLPOOL 0429c6441b960904fa6ce8cc635601a3eae2a48ea0f9ba80ef360689c1c0a77389d851f9dfc50b34dd7f122837169c780cae2cb04a78f4dfc388501836425531 -EBUILD git-annex-3.20120522.ebuild 1933 SHA256 f2ac793cb10209fc58c2c813d55f51f779787c15b8ac0eea83d92cea0de197eb SHA512 b67257c5967e349f97d09524a3cdb9e658df8e1a37e7d25275ab6272fdbd4534fa473487c12a874ee9ed03fe833658880eca39b357d929be95559c450c8dd366 WHIRLPOOL 6179838007ee62f7b0d04780d94c4a410fe8416dc2fdec70190211c05ba40fb4d9ca4afb5a569a61636dd31e89a77a403a626ff79ae3e7547887a862a4115476 EBUILD git-annex-3.20120605.ebuild 1933 SHA256 5186162cae1ce3dfda0da0939fad64ef521e08b17dfd231b4a89f79100544650 SHA512 a9269ad72e99df9537261edacf63bdfc32664bd354bc25307ad51ab77073de34bf95fc148d3bce9a28a2b7897fee2eebc6a471d71c9e26069545691128714a31 WHIRLPOOL b90b32fd692dcb77890d20af517a115b184de367425c5de7ec43bdaa3698ad1662af5b3ba5989caf3b02943acbeae12ecc0d1b27b1352e4cfe46e3d65aae4231 -MISC ChangeLog 2420 SHA256 ea3f48a134596d240f62d306a336ab3ebc221ce800fd96a579ee6b74df4bee35 SHA512 807421d9ecd12c9cd32f30f425f114c74250212050eda24dc500035c4d5054efffaf76e2f049278a437e7fee3cbba536bf56b3df6e9f584f885a9fee39905638 WHIRLPOOL 3ca367379d40b26404d933698810a8bae2fe1212cc261a2e881b456d5a83d5ec5a72462e8c8c50758266f4b3bd49556ee117a1efd49a8f96d9b7e47c101aa475 -MISC metadata.xml 1020 SHA256 adb6331810d079ace08d3df7e88a56839b86d9656b42a6212f641a462d34b4c3 SHA512 489bc8f636dd4b33b79c123702210b049083e821ef52fc0df7d8b1a27752fd5f2f880537b7dbfce3e9371fa508e69384315fd5a315b4ee5b40969ee33b679574 WHIRLPOOL 1c604cdbe213b2cffb8f048f665cdbde65c444b5fa547b6993ca8eed1fbdfc083350bd6aad8a615e4116a8f8f213b35134f3de6b54aea3e91597aece9ac39354 +EBUILD git-annex-3.20121211-r2.ebuild 2783 SHA256 914db20db5e213ab9fca024788e3e5739774188a3975842806d9a02a4d32e02e SHA512 5499161eb02bbbda4f05651742d6c213ea5784442e3f0e64a493184ab930595b81da98bab34e86bd432728d6427cf59afa9723a42f25d5772bd6173382c85954 WHIRLPOOL 2160551bd2c7299de12ea59d6e66ec692ff9952db7149d167f93e964f7b030aeda0371d83cb47a41b67df7d136a1cd0b4ae56ccf2ba8b388c65851f3d5245ec9 +MISC ChangeLog 2721 SHA256 f936c931851a856522c4396505c7947e7ff8368151919ef86f1af062925c0d81 SHA512 65db5876e13177b5553ed86eb27d559f46359f953e54fd8d485b5a3a9ee9078b676156c792638fc0f6e72414a1d65fc8688e28048920ca7bccbb300047490dff WHIRLPOOL a44fcb6c88f325f78caa10ffc8ed481a14f81c744af448686b22febcceac649923f0fcc11e48e971b61dbfa949028f3aef14b43de64817040349b4c7691737ed +MISC metadata.xml 1194 SHA256 3ebd2f50fc735237f04fa86176523aaf3564d10e151153dd31a56d52a6f4a923 SHA512 5315bcabfefac9c8c524a6a96d21a0acefd6b6c238a2f2b00d1528f757c63bebbbccc3294f2266abc9421861a32a363a125f9b987314f88f975c979893a49105 WHIRLPOOL 0aa18e7faceb763a19e0cb3d14e6dbe5ba2a16160e9fcb1eba071ed944311a913cfc25db98e1f4bbda339faa3e00d458b0f8f542dc67c6ef43d8f9a4821721b1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlDBx1cACgkQcaHudmEf86q9nwCcDa7Bh+BZ+b/o/UUBJqFXO74n -6KkAn0CKKGz3zrvRoHVeSTvWTCOhtzPX -=xH1I +iEYEAREIAAYFAlDNwaEACgkQcaHudmEf86pf9wCdFckZSYvo/Ns0KC2jESs9t86F +3z8An21o9ulYtqZwSsHUOt1nfr3VGFT4 +=QWhs -----END PGP SIGNATURE----- diff --git a/dev-vcs/git-annex/git-annex-3.20111203.ebuild b/dev-vcs/git-annex/git-annex-3.20111203.ebuild deleted file mode 100644 index dbcfe5d60dea..000000000000 --- a/dev-vcs/git-annex/git-annex-3.20111203.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/git-annex-3.20111203.ebuild,v 1.4 2012/12/07 10:39:18 slyfox Exp $ - -# ebuild generated by hackport 0.2.13 - -EAPI="3" - -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" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-vcs/git-1.7.7" # TODO: add more deps? -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.6 - dev-haskell/dataenc - dev-haskell/hs3 - dev-haskell/hslogger - dev-haskell/http - dev-haskell/json - dev-haskell/missingh - dev-haskell/monad-control - >=dev-haskell/mtl-2 - dev-haskell/network - dev-haskell/pcre-light - dev-haskell/sha - dev-haskell/utf8-string - >=dev-lang/ghc-6.10.1" diff --git a/dev-vcs/git-annex/git-annex-3.20120315.ebuild b/dev-vcs/git-annex/git-annex-3.20120315.ebuild deleted file mode 100644 index 902a21fb11e0..000000000000 --- a/dev-vcs/git-annex/git-annex-3.20120315.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/git-annex-3.20120315.ebuild,v 1.3 2012/12/07 10:39:18 slyfox Exp $ - -# ebuild generated by hackport 0.2.17.9999 - -EAPI=4 - -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" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -RESTRICT=test # don't seem to like our git environment much - -RDEPEND=">=dev-vcs/git-1.7.7" # TODO: add more deps? -DEPEND="${RDEPEND} - dev-haskell/bloomfilter - >=dev-haskell/cabal-1.6 - dev-haskell/dataenc - dev-haskell/hs3 - dev-haskell/hslogger - dev-haskell/http - dev-haskell/ifelse - dev-haskell/json - dev-haskell/lifted-base - dev-haskell/missingh - dev-haskell/monad-control - >=dev-haskell/mtl-2 - dev-haskell/network - dev-haskell/pcre-light - >=dev-haskell/quickcheck-2.1 - dev-haskell/sha - dev-haskell/text - dev-haskell/transformers-base - dev-haskell/utf8-string - >=dev-lang/ghc-7.4 - dev-lang/perl - doc? ( www-apps/ikiwiki net-misc/rsync )" -# dev-lang/perl is to build the manpages -# www-apps/ikiwiki and net-misc/rsync used to build the rest of the docs - -src_prepare() { - echo 'mans: $(mans)' >>"${S}"/Makefile -} - -src_compile() { - haskell-cabal_src_compile - use doc && emake docs - emake mans -} - -src_test() { - export GIT_CONFIG=${T}/temp-git-config - git config user.email "git@src_test" - git config user.name "Mr. ${P} The Test" - - emake test -} - -src_install() { - #haskell-cabal_src_install - emake install DESTDIR="${D}" PREFIX="${EPREFIX}/usr" - mv "${ED}"/usr/share/doc/{${PN},${PF}} - dodoc CHANGELOG README -} diff --git a/dev-vcs/git-annex/git-annex-3.20120522.ebuild b/dev-vcs/git-annex/git-annex-3.20121211-r2.ebuild index b8fc45d8ebd6..358c28a1a264 100644 --- a/dev-vcs/git-annex/git-annex-3.20120522.ebuild +++ b/dev-vcs/git-annex/git-annex-3.20121211-r2.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/git-annex-3.20120522.ebuild,v 1.6 2012/12/07 10:39:18 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/git-annex-3.20121211-r2.ebuild,v 1.1 2012/12/16 12:42:31 slyfox Exp $ -EAPI=4 +EAPI=5 -# ebuild generated by hackport 0.2.18.9999 +# ebuild generated by hackport 0.3.1.9999 -CABAL_FEATURES="bin" +CABAL_FEATURES="bin" # test-suite" broken inherit haskell-cabal DESCRIPTION="manage files with git, without checking their contents into git" @@ -16,20 +16,19 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc test" -RESTRICT=test # don't seem to like our git environment much +IUSE="dbus doc inotify s3 test" +RESTRICT=test # don't seem to like our git environment much, does not ship all files RDEPEND=">=dev-vcs/git-1.7.7" # TODO: add more deps? DEPEND="${RDEPEND} - test? ( dev-haskell/extensible-exceptions - dev-haskell/hunit + test? ( dev-haskell/hunit dev-haskell/testpack ) dev-haskell/bloomfilter >=dev-haskell/cabal-1.8 dev-haskell/dataenc dev-haskell/edit-distance - dev-haskell/hs3 + dev-haskell/extensible-exceptions dev-haskell/hslogger dev-haskell/http dev-haskell/ifelse @@ -37,22 +36,47 @@ DEPEND="${RDEPEND} dev-haskell/lifted-base dev-haskell/missingh dev-haskell/monad-control - dev-haskell/mtl - dev-haskell/network + >=dev-haskell/mtl-2.1.1 + >=dev-haskell/network-2.0 dev-haskell/pcre-light >=dev-haskell/quickcheck-2.1 + dev-haskell/safesemaphore dev-haskell/sha dev-haskell/text dev-haskell/transformers-base dev-haskell/utf8-string - >=dev-lang/ghc-7.4 + >=dev-lang/ghc-7.4.1 + + dbus? ( >=dev-haskell/dbus-0.10.3 ) + inotify? ( dev-haskell/hinotify ) + s3? ( dev-haskell/hs3 ) + dev-lang/perl doc? ( www-apps/ikiwiki net-misc/rsync )" # dev-lang/perl is to build the manpages # www-apps/ikiwiki and net-misc/rsync used to build the rest of the docs src_prepare() { + #epatch "${FILESDIR}"/${P}-no-tf.patch echo 'mans: $(mans)' >>"${S}"/Makefile + + # there is no kqueue on linux, but should be on freebsd and solaris(?) + cabal_chdeps \ + 'testpack' 'testpack, SafeSemaphore' \ + 'if (! os(windows) && ! os(solaris))' 'if (! os(windows) && ! os(linux))' +} + +src_configure() { + haskell-cabal_src_configure \ + --flag=-Assistant \ + $(cabal_flag dbus Dbus) \ + --flag=-DNS \ + $(cabal_flag inotify Inotify) \ + --flag=-Pairing \ + $(cabal_flag s3 S3) \ + --flag=-Webapp \ + --flag=-WebDAV \ + --flag=-XMPP } src_compile() { @@ -70,8 +94,11 @@ src_test() { } src_install() { - #haskell-cabal_src_install - emake install DESTDIR="${D}" PREFIX="${EPREFIX}/usr" + haskell-cabal_src_install + dosym git-annex /usr/bin/git-annex-shell # standard make install does more, than needed + + 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 } diff --git a/dev-vcs/git-annex/metadata.xml b/dev-vcs/git-annex/metadata.xml index 19222bedf181..3c6377554ae5 100644 --- a/dev-vcs/git-annex/metadata.xml +++ b/dev-vcs/git-annex/metadata.xml @@ -19,4 +19,8 @@ etc that are associated with annexed files but that benefit from full revision control. </longdescription> + <use> + <flag name="inotify">Enable inotify support (<pkg>dev-haskell/hinotify</pkg>)</flag> + <flag name="s3">Enable S3 support (<pkg>dev-haskell/hs3</pkg>)</flag> + </use> </pkgmetadata> |