Thanks to Vikraman Choudhury <vikraman@gentoo.org> for this fix: dev-haskell/lhs2tex: Fix man page install location

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

4 files changed, 38 insertions, 15 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/Manifest b/dev-haskell/lhs2tex/Manifest
index cb31ef9e8afc..742964b06b96 100644
--- a/dev-haskell/lhs2tex/Manifest
+++ b/dev-haskell/lhs2tex/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST lhs2tex-1.17.tar.gz 662684 SHA256 2cf7495b951f44454a73d1be32617ffeba9b938af3e0c2a171a4f6524d1889f4 SHA512 cc73dfde7c0192d0d2e085d645584958728afdd71ba657466761accaf09e856aad615c3211ea02235f871266c6091d119494f62a447a54aa0ed34713b84935c9 WHIRLPOOL 711a76e17c9fe498f8bb7709ba8d62c8861fe44f457c050a8b83a960914b0709c7b330973b0d9025707a8abf0becb2d2f74fca3e7415d28c0d0dfd98c18ebddf
+AUX lhs2tex-1.18.1-mandir.patch 790 SHA256 f49376446c97cb4b2be72f099a974514eea53d3a3906ad8984a6c7a0870cc031 SHA512 2d97ce0015e9844f1b8954ae658807116293ebea07e12d3a8553c48c515e02625b6390c6640ae17e68394a00d908a821783fa5a063a7e6ad10a80f436f73c4ae WHIRLPOOL c06b1e73b6fbc713f29e1a1e81a91e03242bb23c835f52c356962ea01ba799486c050899c28668d602d1d25f24a5fc5592eb4cb5eccd1fd408477bff29d433ae
 DIST lhs2tex-1.18.1.tar.gz 661053 SHA256 dccae22231a1db64cddc38b6f7ac98ac4d5677f03df2f548b2efe9a5e63e9648 SHA512 c44b4c5972b833ae41921d86e13c71ea60ac876a9996fb9a4e8d69ba25d000bbddb85f82d223b8a73381e3a4453c2757154a866fbbb48473f121dd88efb917d7 WHIRLPOOL 4d4473dc74f3951baf53fe35053cd3a1f922d2f25f700e43aab4957b01a5516208ed03ce1a13a1204d7a875293f586757b33dac852629b0854a1318c944905a9
-EBUILD lhs2tex-1.17.ebuild 826 SHA256 43c14f572c902f39541762bfd82d103d7390089bed372c10130c33135143b954 SHA512 1fc6f95ce2e452b9b364e671b5aa6758c81366886335f5c5eea3886e0afa1987c530a72c883c3d07419c744785b67779ba0e88b27a29d5f840ec624bc450d7f9 WHIRLPOOL f97885fea5fda14e2f7bd7d947577dcbb2e8809b0617d21e2eb3376c82d00645e5cd19fb28138c7408d3ecb76ba99240f8934bc050355016d619215e87883413
+EBUILD lhs2tex-1.18.1-r1.ebuild 1036 SHA256 f8324bee96a0b3e9f89c90da35dcf52a4332dab4737cf6cd661f4ffe9af5270d SHA512 ecb57054b5efb3b2d1914ad7c248ed7148bf64127719aa84beb8d26f81ef2b06ed6e1457126f509fa1af5e27d471670f93230ab1bf14b3fcbe05f812dbb81f83 WHIRLPOOL 829f2a1372f5c567ceff54ce4611f2a91da85a4dcb197b9b0fc80ddd12a3efe162e9cca2bee780df0b3b41dca954a243c81b151b9c6f7425f778c5d1aa427ea0
 EBUILD lhs2tex-1.18.1.ebuild 787 SHA256 77456329090b46e73e3b45b3d3a729888a36edbe647d36a274a07589d7bb480e SHA512 be5c19b7f9e2fe24b4342b777c990fdcc28a6a2ea44d7565050f17e546bd0f569bbf0b37e34c92e0147fc8630308df7318838d3bc2ad07bbfb59f546af4cb6e9 WHIRLPOOL 72c5196edf4663d67f9c7470552a1609289fd27cfad326051676ae1d2541154c2b7ce180195a6daab600e25b941ee2cfc52ed123a18600be6665d8ffd8a7d48a
-MISC ChangeLog 3885 SHA256 eae456844bd708db9b01e8bb821a22404bcd5b6f6d8a832baf29f1d330ed03e7 SHA512 1c7d5e9bdf73a9bdd6d00226dfabd3bcdf14b5d1e1db687776739852e110730924abe64014e6a6bdb319ed0338d247655a0078400225e6ae5fcb218cdd2999ff WHIRLPOOL 1e76333a41fbf50f2ea95f7aa2270bf290139716dd07a16f595e9eb90ff960761bc95bba66b14fb0f545653b7582704b6835fb77f2c8405befce56814856c46f
+MISC ChangeLog 4177 SHA256 0fec43c0b43066de1c53df9c39b0dc273157332615627f6539969a2f85117fbe SHA512 d42cf9900c09fb88019c6f40cabad68136bb1271995594f808af63d39ad84cceac40ae029a392695f8f151a472862fb2c5826d8da502ab93ba9435f5329ffd7c WHIRLPOOL 679778d1d94769227aef6c96784a7b0d1a8b7e455dcddb781deb3b13e753272a81a9496b363ae7f70f01c45737867153720d6ec0916a1669d7ce9efcfc4ca443
 MISC metadata.xml 179 SHA256 ff47897192778a875cf6d382656e58ca0530fd4d0bbf3a9e14f1ab6dfb48dd96 SHA512 a0791991dd4e866c67c8eaa3728a45f3fc2f813db0b4649b738464af107c9f6b3e4e0f72444eda4f1bc1b8778dd2020efc49a02e0240ba2d1b8b100327b823d2 WHIRLPOOL 0462f2d73392da87d794365b5d9981536d1465bd0805570678ead426bf7ad06fc49db1b455b08e2c53edcfe5d58ab998268804a0d042bae4b440267491a6c155
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iF4EAREIAAYFAlCxtWAACgkQoBEVQmGOlx/jZwEAq1Ap4bu6c9DngRo94GRWS0bD
-8SXHhBq9Wj9msBQzEx4A/2EycNvorcynOfQOCmZltMnY6orTKd8ln5N0nI+4N9Xs
-=dddx
+iF4EAREIAAYFAlSNWXwACgkQoBEVQmGOlx+IFwD/b/KiU/nMGhJdiOy7HOkxXSAL
+3/ZLpJ6QgaF5PYR6NHEA/3FWinuRrQrzv5Jc/Q5iry80i+JGa+9dCftzV4LlT/ne
+=lSfr
 -----END PGP SIGNATURE-----
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")