Version bump, wrt bug #454710. EAPI 5, add epatch_user, do not install crap files with examples, drop unneeded nonfatal calls wrt bug #551164. Drop old version

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x60C0742D1F357D42

3 files changed, 58 insertions, 43 deletions

diff --git a/dev-libs/quantlib/ChangeLog b/dev-libs/quantlib/ChangeLog
index 3e29df19f17c..68f8b2f1aeb6 100644
--- a/dev-libs/quantlib/ChangeLog
+++ b/dev-libs/quantlib/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/quantlib
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/quantlib/ChangeLog,v 1.38 2015/06/09 14:49:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/quantlib/ChangeLog,v 1.39 2015/08/03 08:29:48 pinkbyte Exp $
+
+*quantlib-1.6 (03 Aug 2015)
+
+  03 Aug 2015; Sergey Popov <pinkbyte@gentoo.org> -quantlib-1.2.ebuild,
+  +quantlib-1.6.ebuild:
+  Version bump, wrt bug #454710. EAPI 5, add epatch_user, do not install crap
+  files with examples, drop unneeded nonfatal calls wrt bug #551164. Drop old
+  version
 
   09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Updating remote-id in metadata.xml
diff --git a/dev-libs/quantlib/Manifest b/dev-libs/quantlib/Manifest
index b3ea7b467150..aa658b3b1389 100644
--- a/dev-libs/quantlib/Manifest
+++ b/dev-libs/quantlib/Manifest
@@ -1,27 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 50quantlib-gentoo.el 163 SHA256 4be07988495fc7d2b063f097465ba7075df63ad8cdc6632bb00cd837d82ce1d9 SHA512 8c6738225465bf938900f0fadebc22a52a9a02fe28926d87b9b3d84539332f5ce51f706a8d4182b46e8a38e3c4ddd053b621c96af13a956b5233123947e3d00c WHIRLPOOL 221b1cedfa9380166260fb25549ad3d7b4a172872d18a90b19135820dc0a5eea576c73969520b5b0907ac88a9d35e175ccfc9f05d737ab75915418ddbb54495e
-DIST QuantLib-1.2.tar.gz 4045398 SHA256 0d161d43c0586f6109b9d412ff591bda438c3d265e49f3d2f2e16ca327e8e78a SHA512 387e4c9ce4980c2637020d345faf9304f02af08893c37baed371d36d7613dc8c9a14fd29849233aacf26eab50a142ea76c231508116b1215c0c55f1de7b8f23a WHIRLPOOL df523712913d46d8199192738adb8f02648a63033a0fc331c01d41293e0bd70b94cfac8264fa4cc847d093240cd0634d51c2e9ed208516f664d51dbcd647e84c
-EBUILD quantlib-1.2.ebuild 1825 SHA256 25c18fec2e1457d2483814c518d66e3a97f579ce9af99658886a33c877411638 SHA512 ae404cce9a30fd39b75e3bf12a3abb725c989d3760160e20f26b905098ba836e5dd76c6ffb3c5d2f65e8b5d0f87f6065951cc490fb08b835c38f2c4671161ad4 WHIRLPOOL d8af1ff47fa8477367f5da11559171db933a3d6e4b4a7dadb8987a95004b731c6a20e225d66ec6bda637b02923b87c705f1496e680bb1b1e8cd7cf0f2db719fb
-MISC ChangeLog 5912 SHA256 04a2f6ec414409d40c1f061c0b302e8cc7b59ce1865414da7feb67bcbe0237c9 SHA512 197c2feec12c66cfce3ab77ec446a17b9066e1183b09e56296f21ab9d5b711610d81a36d35e8c7d62dec55d54fe8aa459ee1c6c665234d93e40fd79abdf86516 WHIRLPOOL a87edcc6d5983ede922b9e923c8fb912342b832ca31a461032ced2818f0c14faa3b5262552f51b8aaef772a938ab5d8b69b96ecd01e5da662d1434d0d8583598
+DIST QuantLib-1.6.tar.gz 8714267 SHA256 a135d424a59cbb00a75d7f7ac3a181d49e804abae1776b555ec0183e309f81ce SHA512 c38cc894873a36942c022c1d70eb7b0c5f2e9208ee9e949a656aef02fb9fe95436955b560b61188ea5a374f4b7674b46629178779e066135396f291788d772c4 WHIRLPOOL 5d94afd8f608ef81c207921f5b7b8237ea2eaca71844fe27206d4b0e7ed77e99d4c9e5c2e6c74649e82a95ca5d3fb8528e6c8ee929a849a7254cbee41ab9607e
+EBUILD quantlib-1.6.ebuild 2176 SHA256 bea460005dc162d7bf938d43f9cc0303bd851c2b6884c84ca032739caa4860f2 SHA512 e7dcf9df9ec97c4935162998f5eaf5a634b7b6d4c854f6f2ad61b393472c06e1b915dc35dfd9f240676b2798001ca49c790165192aebe0d2dbca250103e9530b WHIRLPOOL 9aa060652a526e6ec265258a96f04c4cc6b468c5a61189783466666ecee35fef90e39eabef00cefaf8996b2e518f0134d69864d1bfe38025c2e996ca59644c81
+MISC ChangeLog 6208 SHA256 53d2aadeb1f126a30c9e5ea85ab7f64885fdc2e37946fa74078bfa48d4532d2f SHA512 dea78aabe0a4cd26ccec0bb351e4ffe00c67e64d145a06bf88bb97cfda092b97a4a52383667ce6b4888fc23613f410ff3da2765c668e2afa57d8aedc02a1bf1f WHIRLPOOL 0f91dad714f5bea5351fd73db3cb9306b652b662125b85b5aced4841c7000be7be642be2a3c8d5299bdfb75aedea201f654238b236c5bb3a9772376772fcf9a6
 MISC metadata.xml 374 SHA256 0443e636c214f5536d9a19f21f3ea7b4f21f0a25d7448a5068839b3e1bd6f34b SHA512 9b200a17bcee31799f37c26e550bb39f87e4b697753a22f0a48b28d02927a9484871ec3a8b60980e62f2df0273f58a2048a8a171397f7c0f3e495539a152fd6c WHIRLPOOL 727668b1a07019de0759565f75765dc65a4b106b2933e2e448198269419b5df1ccccc1657ee1ae22d44b2fc8e8ec8218b31c975af9761fa2311b2759e39fa241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVdvzvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiC0oQAJARW/6hz4lSAig8OgU789nm
-DTV3nGFD4FfKrWLZb7LVb2rb4t4xwm5qPxbOtY8zUadhK9YpmMiSotqMzICqjax9
-Ou7LitVBdXJqPdRuB8jJ42a3RybhWndfj1puJU2Q6uc+GkLkfeG8UdzLgQ/fFuRh
-u/AaHNUMJapHg+Ev/ctOCPvMy/IIJFvo0lqSyifQfiJg3EZLItbkgR3P5zaKSvTC
-4aZ1tRjYSyR7B3Sl5rpEE0JyLIdr1VbFsfW1OZmU/SCguZfQXG4h882SUvlH5ni8
-DK2Ikuai0pORTNlBVgDhsXR43iGJX1XHTVM8ns3ip0I8oPAIbwXn9WxiOigeoQzB
-Fn5SxYEP8B8kZ5JR96Oy78vF81CxdvqEay3xRuk5bVYeXxBKVvpBZlDs5oHQB5Da
-srWOvAEZ6pVWGcoA2wPhUEUq5wiCIaP19HwiF3a+WCb9y84hahOkdFvdkmBqTcBC
-6Z/XGA3Olcj5XuBOITG1ms1aNB/P/aKCPjU3C9riAUOb+scxvwVpPREKerZ+YBpl
-xJ7Fm8UyNDSG5BlOdQlBXjdLHsNM18EnBnX7Q8x6fFWxWASMgVoONFbXgC6rwDei
-TlHnmMT2R5tEXziQDsRUxoVfTrxpK6SplY2vuItIGE9wXjx+qtGqCiavAZVljsoD
-SRHssiTMT3/3QIVIRBhZ
-=3dAl
+iQEcBAEBCAAGBQJVvyZ9AAoJECo/aRed9267meoH/14h5ymcogGgg+Yaj+1E8p1e
+qm8oPL/qgyCNqKSn7mrUsIfEU3LGjhxKkgn7s5b51uoKX3/iAiZBRgjtoOXCi1Sl
+HlMoTpXRGSNS3Cg8U+yObaHd56voUNYbqIWK65zNaOX+/RhzpgNzCrTFWCxN8gnS
+NcTe+XyD8N5co0cAL+sgwVkr6Xl4FYYjt7yBJNMHBViyhF4BFBQyz0ZcUcR+WSgi
+qqYHpSELDynVIs7taq7ATMgnVryB9/71Y+7hIzZeTeN+Ch8Of56A065jGduqAx/N
+t9yqpj+hKxVW1UFME7L0wsWIDccXiYgDLc4pxSgUNOI+d45m65pFr+0YoBJTFiI=
+=EN8k
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/quantlib/quantlib-1.2.ebuild b/dev-libs/quantlib/quantlib-1.6.ebuild
index b2f902436878..9dc9f8c6dfc7 100644
--- a/dev-libs/quantlib/quantlib-1.2.ebuild
+++ b/dev-libs/quantlib/quantlib-1.6.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/quantlib/quantlib-1.2.ebuild,v 1.2 2012/03/17 08:54:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/quantlib/quantlib-1.6.ebuild,v 1.1 2015/08/03 08:29:48 pinkbyte Exp $
 
-EAPI=4
-inherit elisp-common
+EAPI=5
 
-MY_P=QuantLib-${PV}
+inherit elisp-common eutils toolchain-funcs
+
+MY_P="QuantLib-${PV}"
 
 DESCRIPTION="A comprehensive software framework for quantitative finance"
 HOMEPAGE="http://quantlib.org/"
@@ -14,18 +15,28 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc emacs examples static-libs"
+IUSE="debug doc emacs examples openmp static-libs"
 
-RDEPEND="dev-libs/boost"
+RDEPEND="dev-libs/boost:="
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
+	doc? ( app-doc/doxygen[dot] )
 	emacs? ( virtual/emacs )"
 
 DOCS="*.txt"
 
-SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+pkg_setup() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
 
-S=${WORKDIR}/${MY_P}
+src_prepare() {
+	epatch_user
+}
 
 src_configure() {
 	# NOTE: Too fragile for single .pdf or .ps document
@@ -39,39 +50,43 @@ src_configure() {
 
 	# NOTE: --enable-examples will only change noinst_PROGRAMS to bin_PROGRAMS
 	econf \
+		$(use_enable debug error-functions) \
+		$(use_enable debug error-lines) \
+		$(use_enable debug tracing) \
+		$(use_enable openmp) \
 		$(use_enable static-libs static) \
 		--enable-examples \
-		--with-lispdir="${SITELISP}"/${PN}
+		--with-lispdir="${SITELISP}/${PN}"
 }
 
 src_compile() {
-	emake
+	default
 
 	if use doc; then
 		pushd Docs >/dev/null
-		nonfatal emake docs-html
+		emake docs-html
 		popd >/dev/null
 	fi
 }
 
 src_install(){
 	default
-
-	rm -f "${ED}"/usr/lib*/*.la
+	prune_libtool_files
 
 	if use doc; then
-		find Docs \( -name '.time-stamp*' -o -name '*.doxy' -o -name 'Makefile*' \) -delete
-		insinto /usr/share/doc/${PF}
-		nonfatal doins -r Docs
+		find Docs \( -name '.time-stamp*' -o -name '*.doxy' -o -name 'Makefile*' \) -delete || die
+		insinto "/usr/share/doc/${PF}"
+		doins -r Docs
 	fi
 
 	if use examples; then
-		find Examples \( -name '*vc*proj*' -o -name '*.dev' -o -name 'Makefile*' -o -name '.libs' -o -name '*.o' \) -delete
-		insinto /usr/share/doc/${PF}
-		nonfatal doins -r Examples
+		find Examples -name '.libs' -exec rm -rf {} + || die
+		find Examples \( -name '*vc*proj*' -o -name '*.dev' -o -name 'Makefile*' -o -name '*.o' \) -delete || die
+		insinto "/usr/share/doc/${PF}"
+		doins -r Examples
 	fi
 
-	use emacs && elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	use emacs && elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 }
 
 pkg_postinst() {