gienah      15/01/03 01:58:42

  Modified:             metadata.xml ChangeLog
  Added:                git-annex-5.20141231.ebuild
  Log:
  Bump git-annex to 5.20141231. Which contains the fix upstreamed by ?ukasz 
Stelmach, thanks for fixing and reporting, for Bug 533342 - 
dev-vcs/git-annex-5.20141203 - Remote/Helper/AWS.hs:16:18: Could not find 
module Aws.S3
  
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 
618E971F)

Revision  Changes    Path
1.10                 dev-vcs/git-annex/metadata.xml

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git-annex/metadata.xml?rev=1.10&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git-annex/metadata.xml?rev=1.10&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git-annex/metadata.xml?r1=1.9&r2=1.10

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/metadata.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- metadata.xml        6 Sep 2014 18:57:38 -0000       1.9
+++ metadata.xml        3 Jan 2015 01:58:42 -0000       1.10
@@ -32,6 +32,7 @@
                <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>
                <flag name="webdav">Enable webdav remote</flag>



1.34                 dev-vcs/git-annex/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git-annex/ChangeLog?rev=1.34&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git-annex/ChangeLog?rev=1.34&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git-annex/ChangeLog?r1=1.33&r2=1.34

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/ChangeLog,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ChangeLog   16 Dec 2014 23:08:28 -0000      1.33
+++ ChangeLog   3 Jan 2015 01:58:42 -0000       1.34
@@ -1,6 +1,14 @@
 # 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.33 
2014/12/16 23:08:28 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/ChangeLog,v 1.34 
2015/01/03 01:58:42 gienah Exp $
+
+*git-annex-5.20141231 (03 Jan 2015)
+
+  03 Jan 2015; Mark Wright <[email protected]> +git-annex-5.20141231.ebuild,
+  metadata.xml:
+  Bump git-annex to 5.20141231. Which contains the fix upstreamed by ?ukasz
+  Stelmach, thanks for fixing and reporting, for Bug 533342 - dev-vcs/git-
+  annex-5.20141203 - Remote/Helper/AWS.hs:16:18: Could not find module Aws.S3
 
 *git-annex-5.20141203 (16 Dec 2014)
 



1.1                  dev-vcs/git-annex/git-annex-5.20141231.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git-annex/git-annex-5.20141231.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git-annex/git-annex-5.20141231.ebuild?rev=1.1&content-type=text/plain

Index: git-annex-5.20141231.ebuild
===================================================================
# Copyright 1999-2015 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.20141231.ebuild,v 1.1 
2015/01/03 01:58:42 gienah 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 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
}




Reply via email to