* [gentoo-commits] gentoo-x86 commit in app-text/pandoc: pandoc-1.13.2-r1.ebuild ChangeLog
@ 2015-01-05 5:04 Mark Wright (gienah)
0 siblings, 0 replies; 2+ messages in thread
From: Mark Wright (gienah) @ 2015-01-05 5:04 UTC (permalink / raw
To: gentoo-commits
gienah 15/01/05 05:04:03
Modified: ChangeLog
Added: pandoc-1.13.2-r1.ebuild
Log:
Patch pandoc 1.13.2 for ghc 7.10.1 RC1 and haddock-libary 1.2 https://github.com/jgm/pandoc/pull/1856
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
Revision Changes Path
1.35 app-text/pandoc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/pandoc/ChangeLog?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/pandoc/ChangeLog?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/pandoc/ChangeLog?r1=1.34&r2=1.35
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/pandoc/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ChangeLog 20 Dec 2014 09:52:26 -0000 1.34
+++ ChangeLog 5 Jan 2015 05:04:03 -0000 1.35
@@ -1,6 +1,13 @@
# ChangeLog for app-text/pandoc
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/ChangeLog,v 1.34 2014/12/20 09:52:26 gienah Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/ChangeLog,v 1.35 2015/01/05 05:04:03 gienah Exp $
+
+*pandoc-1.13.2-r1 (05 Jan 2015)
+
+ 05 Jan 2015; Mark Wright <gienah@gentoo.org>
+ +files/pandoc-1.13.2-ghc-7.10.patch, +pandoc-1.13.2-r1.ebuild:
+ Patch pandoc 1.13.2 for ghc 7.10.1 RC1 and haddock-libary 1.2
+ https://github.com/jgm/pandoc/pull/1856
*pandoc-1.13.2 (20 Dec 2014)
1.1 app-text/pandoc/pandoc-1.13.2-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/pandoc/pandoc-1.13.2-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/pandoc/pandoc-1.13.2-r1.ebuild?rev=1.1&content-type=text/plain
Index: pandoc-1.13.2-r1.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.13.2-r1.ebuild,v 1.1 2015/01/05 05:04:03 gienah Exp $
EAPI=5
# ebuild generated by hackport 0.4.4.9999
CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
inherit base haskell-cabal
DESCRIPTION="Conversion between markup formats"
HOMEPAGE="http://johnmacfarlane.net/pandoc"
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
IUSE="embed_data_files +https make-pandoc-man-pages +network-uri trypandoc"
RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-0.9:=[profile?]
>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
>=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?]
>=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?]
>=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?]
>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?]
>=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?]
>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
>=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?]
>=dev-haskell/highlighting-kate-0.5.11.1:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?]
>=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?]
>=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?]
>=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?]
>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
>=dev-haskell/pandoc-types-1.12.4:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?]
>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?]
>=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
>=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?]
>=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?]
>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
>=dev-haskell/texmath-0.8.0.1:=[profile?] <dev-haskell/texmath-0.9:=[profile?]
>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?]
>=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
>=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
>=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?]
>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?]
>=dev-lang/ghc-7.4.1:=
https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?]
>=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?]
>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
network-uri? ( >=dev-haskell/network-2.6:=[profile?]
>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
dev-haskell/wai-extra:=[profile?]
!https? ( dev-haskell/http-types:=[profile?] ) )
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.10
test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7
>=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
>=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
>=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.8
>=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
>=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
"
PATCHES=("${FILESDIR}/${PN}-1.13.2-ghc-7.10.patch")
src_configure() {
haskell-cabal_src_configure \
$(cabal_flag embed_data_files embed_data_files) \
$(cabal_flag https https) \
$(cabal_flag make-pandoc-man-pages make-pandoc-man-pages) \
$(cabal_flag network-uri network-uri) \
$(cabal_flag trypandoc trypandoc)
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-text/pandoc: pandoc-1.13.2-r1.ebuild ChangeLog
@ 2015-04-03 9:46 Mark Wright (gienah)
0 siblings, 0 replies; 2+ messages in thread
From: Mark Wright (gienah) @ 2015-04-03 9:46 UTC (permalink / raw
To: gentoo-commits
gienah 15/04/03 09:46:57
Modified: pandoc-1.13.2-r1.ebuild ChangeLog
Log:
Loosen filepath and QuickCheck dependencies in pandoc-1.13.2-r1
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
Revision Changes Path
1.3 app-text/pandoc/pandoc-1.13.2-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/pandoc/pandoc-1.13.2-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/pandoc/pandoc-1.13.2-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/pandoc/pandoc-1.13.2-r1.ebuild?r1=1.2&r2=1.3
Index: pandoc-1.13.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.13.2-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pandoc-1.13.2-r1.ebuild 18 Feb 2015 21:20:05 -0000 1.2
+++ pandoc-1.13.2-r1.ebuild 3 Apr 2015 09:46:57 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.13.2-r1.ebuild,v 1.2 2015/02/18 21:20:05 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.13.2-r1.ebuild,v 1.3 2015/04/03 09:46:57 gienah Exp $
EAPI=5
@@ -66,7 +66,7 @@
>=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
>=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
>=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
- >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.8
+ >=dev-haskell/quickcheck-2.4:2
>=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
>=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
@@ -74,6 +74,13 @@
PATCHES=("${FILESDIR}/${PN}-1.13.2-ghc-7.10.patch")
+src_prepare() {
+ base_src_prepare
+ cabal_chdeps \
+ 'filepath >= 1.1 && < 1.4' 'filepath >= 1.1' \
+ 'QuickCheck >= 2.4 && < 2.8' 'QuickCheck >= 2.4'
+}
+
src_configure() {
haskell-cabal_src_configure \
$(cabal_flag embed_data_files embed_data_files) \
1.38 app-text/pandoc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/pandoc/ChangeLog?rev=1.38&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/pandoc/ChangeLog?rev=1.38&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/pandoc/ChangeLog?r1=1.37&r2=1.38
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/pandoc/ChangeLog,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ChangeLog 18 Feb 2015 21:20:05 -0000 1.37
+++ ChangeLog 3 Apr 2015 09:46:57 -0000 1.38
@@ -1,6 +1,9 @@
# ChangeLog for app-text/pandoc
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/ChangeLog,v 1.37 2015/02/18 21:20:05 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/ChangeLog,v 1.38 2015/04/03 09:46:57 gienah Exp $
+
+ 03 Apr 2015; Mark Wright <gienah@gentoo.org> pandoc-1.13.2-r1.ebuild:
+ Loosen filepath and QuickCheck dependencies in pandoc-1.13.2-r1
18 Feb 2015; Sergei Trofimovich <slyfox@gentoo.org> pandoc-1.12.1.ebuild,
pandoc-1.12.2.1.ebuild, pandoc-1.12.3.1.ebuild, pandoc-1.12.3.3.ebuild,
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-04-03 9:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-05 5:04 [gentoo-commits] gentoo-x86 commit in app-text/pandoc: pandoc-1.13.2-r1.ebuild ChangeLog Mark Wright (gienah)
-- strict thread matches above, loose matches on Subject: below --
2015-04-03 9:46 Mark Wright (gienah)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox