diff options
| author |   Mark Wright <gienah@gentoo.org> | 2014-12-14 09:33:43 +0000 |
|---|---|---|
| committer | Mark Wright <gienah@gentoo.org> | 2014-12-14 09:33:43 +0000 |
| commit | 8790ace15d1e32b32691c0f074390a8be8b88a88 (patch) | |
| tree | 38001e209114c5b112c9e1d391cd498e9c012911 /dev-haskell/lhs2tex | |
| parent | Bump darcs to 2.8.5-r3 (diff) | |
| download | gentoo-2-8790ace15d1e32b32691c0f074390a8be8b88a88.tar.gz gentoo-2-8790ace15d1e32b32691c0f074390a8be8b88a88.tar.bz2 gentoo-2-8790ace15d1e32b32691c0f074390a8be8b88a88.zip | |
Thanks to Vikraman Choudhury <vikraman@gentoo.org> for this fix: dev-haskell/lhs2tex: Fix man page install location
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
Diffstat (limited to 'dev-haskell/lhs2tex')
| -rw-r--r-- | dev-haskell/lhs2tex/ChangeLog | 12 | ||||
| -rw-r--r-- | dev-haskell/lhs2tex/files/lhs2tex-1.18.1-mandir.patch | 11 | ||||
| -rw-r--r-- | dev-haskell/lhs2tex/lhs2tex-1.18.1-r1.ebuild (renamed from dev-haskell/lhs2tex/lhs2tex-1.17.ebuild) | 16 |
3 files changed, 31 insertions, 8 deletions
diff --git a/dev-haskell/lhs2tex/ChangeLog b/dev-haskell/lhs2tex/ChangeLog index 7c136b1d8e87..1c7339a9d9d9 100644 --- a/dev-haskell/lhs2tex/ChangeLog +++ b/dev-haskell/lhs2tex/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-haskell/lhs2tex -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/lhs2tex/ChangeLog,v 1.31 2012/11/25 06:06:18 gienah Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/lhs2tex/ChangeLog,v 1.32 2014/12/14 09:33:43 gienah Exp $ + +*lhs2tex-1.18.1-r1 (14 Dec 2014) + + 14 Dec 2014; Mark Wright <gienah@gentoo.org> + +files/lhs2tex-1.18.1-mandir.patch, +lhs2tex-1.18.1-r1.ebuild, + -lhs2tex-1.17.ebuild: + Thanks to Vikraman Choudhury <vikraman@gentoo.org> for this fix: dev- + haskell/lhs2tex: Fix man page install location *lhs2tex-1.18.1 (25 Nov 2012) diff --git a/dev-haskell/lhs2tex/files/lhs2tex-1.18.1-mandir.patch b/dev-haskell/lhs2tex/files/lhs2tex-1.18.1-mandir.patch new file mode 100644 index 000000000000..1a3c922723e1 --- /dev/null +++ b/dev-haskell/lhs2tex/files/lhs2tex-1.18.1-mandir.patch @@ -0,0 +1,11 @@ +--- Setup.hs.orig 2014-11-03 00:57:44.033467328 +0530 ++++ Setup.hs 2014-11-03 00:58:05.775218672 +0530 +@@ -205,7 +205,7 @@ + else docdir (absoluteInstallDirs pd lbi cd) `joinFileName` "doc" + let manDir = if isWindows + then dataPref `joinFileName` "Documentation" +- else datadir (absoluteInstallDirs pd lbi cd) `joinFileName` ".." `joinFileName` "man" `joinFileName` "man1" ++ else datadir (absoluteInstallDirs pd lbi cd) `joinFileName` ".." `joinFileName` ".." `joinFileName` "man" `joinFileName` "man1" + createDirectoryIfMissing True docDir + installOrdinaryFile v (lhs2texDocDir `joinFileName` "Guide2.pdf") (docDir `joinFileName` "Guide2.pdf") + when (not isWindows) $ diff --git a/dev-haskell/lhs2tex/lhs2tex-1.17.ebuild b/dev-haskell/lhs2tex/lhs2tex-1.18.1-r1.ebuild index 3c765f0c79c7..335e19ed3a89 100644 --- a/dev-haskell/lhs2tex/lhs2tex-1.17.ebuild +++ b/dev-haskell/lhs2tex/lhs2tex-1.18.1-r1.ebuild @@ -1,13 +1,11 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/lhs2tex/lhs2tex-1.17.ebuild,v 1.2 2012/09/12 15:31:45 qnikst Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/lhs2tex/lhs2tex-1.18.1-r1.ebuild,v 1.1 2014/12/14 09:33:43 gienah Exp $ -# ebuild generated by hackport 0.2.13 - -EAPI="3" +EAPI=5 CABAL_FEATURES="bin" -inherit haskell-cabal +inherit base haskell-cabal DESCRIPTION="Preprocessor for typesetting Haskell sources with LaTeX" HOMEPAGE="http://www.andres-loeh.de/lhs2tex/" @@ -28,3 +26,9 @@ DEPEND="${RDEPEND} dev-haskell/mtl dev-haskell/regex-compat >=dev-lang/ghc-6.12.1" + +# Setup.hs uses 'Text.Regex' available in both 'r-c' and 'r-c-tdfa' +HCFLAGS+=" -ignore-package=regex-compat-tdfa" + +# datadir is /usr/share/${PN}/${GHC_VER} so mandir is ${DATADIR}/../../man +PATCHES=("${FILESDIR}/${PN}-1.18.1-mandir.patch") |