Update patchset from Debian version

Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
Package-Manager: portage-2.2.20/cvs/Linux i686
Manifest-Sign-Key: 0x565953B95372756C

3 files changed, 111 insertions, 15 deletions

diff --git a/sci-physics/cernlib-montecarlo/ChangeLog b/sci-physics/cernlib-montecarlo/ChangeLog
index 701116123257..f96112a942ff 100644
--- a/sci-physics/cernlib-montecarlo/ChangeLog
+++ b/sci-physics/cernlib-montecarlo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-physics/cernlib-montecarlo
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/ChangeLog,v 1.25 2015/06/09 09:04:16 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/ChangeLog,v 1.26 2015/08/01 13:22:31 bircoph Exp $
+
+*cernlib-montecarlo-2006-r4 (01 Aug 2015)
+
+  01 Aug 2015; Andrew Savchenko <bircoph@gentoo.org>
+  +cernlib-montecarlo-2006-r4.ebuild:
+  Update Debian patchset.
 
   09 Jun 2015; Andrew Savchenko <bircoph@gentoo.org>
   -cernlib-montecarlo-2006-r2.ebuild:
diff --git a/sci-physics/cernlib-montecarlo/Manifest b/sci-physics/cernlib-montecarlo/Manifest
index 563a61cca823..64754cd21472 100644
--- a/sci-physics/cernlib-montecarlo/Manifest
+++ b/sci-physics/cernlib-montecarlo/Manifest
@@ -3,24 +3,26 @@ Hash: SHA256
 
 AUX cernlib-montecarlo-2006-noherwig.patch 1993 SHA256 bb85c46eb9d2acaf95dad615aac3b3c08b2607aea3368f7bbadd2532d58e177d SHA512 e53794aeefdda4667bc71826b9514f44dd23fb0076cb55284ff4af0277facf5d3e1664f76dff80f975157350a02b871437230c66b49816c75730b4afed9d5ec9 WHIRLPOOL 088f7786549f24b1fcb47bdd1fd4ee98a973d7ef0a5add7f327ad84def85ddd0be38467e478aa5028e324fff26d3a50e0f7f6bb63074192a28b26d55440bd715
 DIST mclibs_20061220+dfsg3-1.debian.tar.gz 46362 SHA256 17a9f61860237b963bc4b6240296add2bbe45cf16ce994061c3f20c33994cf73 SHA512 ddb31fd218f0f051155548011415d9526e7866ec7caf7041a5f572d8064cb4f19c188724e839f445a47f490dacf0d67ef9ba871725756892e0ba1d569d575fe3 WHIRLPOOL c8db51ed7e1e78ffcdca96af3aeb388391473acc796b35af838fa60cb3129816e787dce325c8ac8be411d98ec2d1392959df97dd560ccae172c230ce2c342676
+DIST mclibs_20061220+dfsg3-3.debian.tar.gz 44763 SHA256 9796094d6b27a07a342c8f7572cae40b8717e13d04c8b1acb4b337901cb0c5af SHA512 2ef3c54026e86182200d4d7fce1889a2dd8c252743d0819e74679e2a5067794bea574530b59a7f08c394f8b75f7d31cac31f638fb72045700b379bd686a8f92f WHIRLPOOL 515ba362e11897c02cbbcecd25340ca7aba87c608b537103b38afe2fb65f0d1f7fcdd025d2fe4d835f488580608f53c1c606751996fe0e7fb55fb828c2d35997
 DIST mclibs_20061220+dfsg3.orig.tar.gz 7642494 SHA256 cb5ea19bc54a06c031c90192685748ce0f7df016bfae6b9d7d672d77a3444ce5 SHA512 add98b585648994ab616d040e9a3410b0eba13ab54a812674d3940bae0effed4446b02ce6a34887841c114bc444b1b83598e2c89c22b4df8dcd3fd4c1d8aaba3 WHIRLPOOL cee4c265ae610bbc1b2a48fdc6d769848bf936c78862a298725e5ac11fc2620a18b748dcd41e8b7622cf369c2a43f9641cc67e5f902a88e2f083f7b7587a1771
 EBUILD cernlib-montecarlo-2006-r3.ebuild 2398 SHA256 64741c4f04d380eae2ffa14854beb144006620af985ec3903f5a51676d6a235d SHA512 769a9bbdee931c9bac63846807391e6a610b0b082b73a528cf1a72327faa3b71fd2752209ba40c36ee8b0bee34fa9097141419cd6a0f41b0cccceff11c67a207 WHIRLPOOL edd5b731d83b12354c7a982cff825d34804afdf51c33478e57c5f62adc04dd6035a2ee963eee5e912c652aaf950a9f49f3b6a305e829b838007ae44d88f1163c
-MISC ChangeLog 4190 SHA256 6ddbfdd287d860217f1e21256af57c0ded42fe6705e54614b18461784c3bac86 SHA512 f64fb481970a7864c2f2f1fc8ab652aad361b7de522bffd6fccb30715f8f91a284026fbec31bb915d16a6a22384557cae91063020e555e905193280d14a8c75b WHIRLPOOL 406bf24a546a69132ba31ac48c1d22f66345042013a6d1212d53389860bf3a2ee4cd8b3583a94172fb8d7afe44c18ea962ef5677c33e6082615e8a4c2cdb53c3
+EBUILD cernlib-montecarlo-2006-r4.ebuild 2404 SHA256 706084f887388828283a24c76cc5607bc7ed7ea639d7fc5b7e8b761ef913b227 SHA512 acffec474b6d5935c24f8625287659613e2cd252a6180412660910ba2e5c5029483c203df4034072963984280d4f69e6374c0bb44b148b135b820af401cd9c96 WHIRLPOOL bec05faa8367f961625aefe4117859db6ce6bf01f30a3d6346f8e87379c80f39220b06d439a2fa20e67c36436f18248caa40816fef667d7883f525ad3df8b14c
+MISC ChangeLog 4351 SHA256 3a11fecbfdf72e2227c7463ada61bd8af52c3dccbb24461514f0c71bba9d9ae3 SHA512 cd3119af3276e3b8c3fe01b85642ec25c7400f52081581935f24ea70297c05b65f06761570a8b53bc9381d492f81162a813df3f5eb1f912fe6e07892a524a274 WHIRLPOOL 7affc2ab909eb38bf40f6c16135606ce6fe6b3ecc16c18580c3b6b194226918dea1da2a9bcee15657bc8d872970dfe3bee4ceb025b4e5fcb182091164fc6f488
 MISC metadata.xml 671 SHA256 4cb8611f8eb7861f6b33d5cd35e03458f30949cbb3e727f2dc3514faa7c8864b SHA512 f585405fd828fad2d9aa9da29083894dca020208a6e71582d02bc92175416d13011b55bdaeaf3486c9f7a0f6a7e2f4ddf1ed819f77c18cc34e53a56ca8195471 WHIRLPOOL 7b6d814523e7f34200e16d809b9298560e4d089d63580d644d9fdfceafcbb1ab3a5a2d8f517bd4c278e04a2d44e093b9af2d4e1b4b95ef93f1af404a03581c31
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVdqwRAAoJEPZTWjO6HuSN0uYP/j5bSoV3enzlPtK6pP8Sumlo
-sxmDfgPxD9bA96tJRjyHo2E2AyQk89NXRBH8b6/IN8dAmKhny43h89v/TitkV7oO
-tmYLDulHOZ/3EoEVZAd5paEHincbsHKItM39hOaFB/wCTtzNMrwqh+aU7nxbphCQ
-SXZtDT5FTe52x7oH5Zg1c6S/QZXG1Jf6cGvonKJz3q48dn8NARVrapZ/zsMDL1FT
-xF8gG8bCsjtywzcoX0CexyOmrDy2tNg2cT6XQP7KVI25Dx0Jvjq7d2vHVmy3BBps
-lwju3bgpjYNHPFl2iThaxNAkD8yzwE6tgkT0oI4iYyEgc7lzGpMhIymGb96tmIHk
-VjtQvDqPMF6QlDgOeONW67gl6rhJuYG4B65ad2tLOFijO7L2Q3w2d8ptWpUwGjDN
-lflwkTIsS8W/+cMwATOgTnvNxIEK+l8DKKz9J/YKrZ063csRn2hBO5yRQX9TJ0h2
-rLBr7rr4f9cjXzvaHfy7YfAKEZVJjN+GDloVJ3SEr6sB9M+dDxwMbG/cWwSXYNSq
-gOT44HCXHl5I6NZvA7a9UbXEViqRwz4Pdj/UhdOSdm0UeHSMZ5BxrzcO9UEM2hcE
-ZYDTvMT55Ix1aatjbGWnN8I6OWAC/zo23GxnQ3iZz4NwF2ZdvCvaFdivYRGdSIhL
-Pmg0Rfeu0MuVjn28RwOH
-=Esgj
+iQIcBAEBCAAGBQJVvMgYAAoJEPZTWjO6HuSN8hsQAJdluhPREq6PNy0iiIhQzjrA
+fy9JaYoL1DjqqMqvOxhQXtUVXSeh4sHy2T66SeYw4lx1CPl9xc3iWzH1jFNfsUoV
+fW0IrAUyLPnKNk0+ejtlMuC9i/haPlvAu3eVQoUZDxIpc3D3xu32uQTgIbvAK7it
+FiJanuwDmn4tAYBBfolUvHmDcEgW7rwPVjthDq4bLzw7Tsd3VlTHQWzxLsIXgbsy
+HM3ZmObCfNDxKiiRyFqxcjysmd1UJcdf+WhedRHMQSJTn6J/uWSyiWSh1nwBjHcE
+nnwOe2zg+eMjExzUuw5ieqfVNUAH+wq8EjYSZ1mNZ9wtJntDX8kdPp6azEc1AqiZ
+XjAW3NWwFOjo4Rv1VoP9oygRkQHwgsfEExs1dbyVKDEMWnA5bB5I+6itqTgMacFY
+QcjtADW8h8FgVA/1NewvlSdary9y7B8/nu5EiJlfL4QiPgksI93blC1xI9SrJcvj
+DhzCOHWZysNhHU4NNcGzkRHAzSe6uYxLAtpR3ETJ4R8XAf2SEIvR26XQQRNXKRNR
+S12EUiSWfSs7h3INE61iRQXCNw7g39gLF29tcO1haV1nh3WsTRoLl0ZRKWxZg1xe
+BzPKrL5q4mCv9UHygm5d2OLDJfkXlAKHVFGl3WJXRZBNv/lLnCmZ9nkb39sZHLha
+y7TkRIEiTWCPAGHUGkaO
+=GGMx
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r4.ebuild b/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r4.ebuild
new file mode 100644
index 000000000000..fdb9f7b922fe
--- /dev/null
+++ b/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r4.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r4.ebuild,v 1.1 2015/08/01 13:22:31 bircoph Exp $
+
+EAPI=5
+
+inherit eutils fortran-2 toolchain-funcs
+
+DEB_PN=mclibs
+DEB_PV=20061220+dfsg3
+DEB_PR=3
+DEB_P=${DEB_PN}_${DEB_PV}
+
+DESCRIPTION="Monte-carlo library and tools for the cernlib"
+HOMEPAGE="https://cernlib.web.cern.ch/cernlib/"
+SRC_URI="
+	mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}.orig.tar.gz
+	mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}-${DEB_PR}.debian.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2 LGPL-2 BSD"
+IUSE="+herwig"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	x11-libs/motif:0
+	dev-lang/cfortran
+	sci-physics/cernlib
+	herwig? ( !sci-physics/herwig )"
+
+DEPEND="${RDEPEND}
+	virtual/latex-base
+	x11-misc/imake
+	x11-misc/makedepend"
+
+S="${WORKDIR}/${DEB_PN}-${DEB_PV}.orig"
+
+src_prepare() {
+	mv ../debian . || die
+	cp debian/add-ons/Makefile . || die
+	export DEB_BUILD_OPTIONS="$(tc-getFC) nostrip nocheck"
+	sed -i \
+		-e "s:/usr/local:${EROOT}/usr:g" \
+		Makefile || die
+
+	einfo "Applying Debian patches"
+	emake -j1 patch
+	use herwig || epatch "${FILESDIR}"/${P}-noherwig.patch
+	# since we depend on cfortran, do not use the one from cernlib
+	rm src/include/cfortran/cfortran.h || die
+	# respect users flags
+	sed -i \
+		-e 's/-O3/-O2/g' \
+		-e "s/-O2/${CFLAGS}/g" \
+		-e "s|\(CcCmd[[:space:]]*\)gcc|\1$(tc-getCC)|g" \
+		-e "s|\(CplusplusCmd[[:space:]]*\)g++|\1$(tc-getCXX)|g" \
+		-e "s|\(FortranCmd[[:space:]]*\)gfortran|\1$(tc-getFC)|g" \
+		src/config/linux.cf	\
+		|| die "sed linux.cf failed"
+	sed -i \
+		-e "s|\(ArCmdBase[[:space:]]*\)ar|\1$(tc-getAR)|g" \
+		-e "s|\(RanlibCmd[[:space:]]*\)ranlib|\1$(tc-getRANLIB)|g" \
+		src/config/Imake.tmpl	\
+		|| die "sed Imake.tmpl failed"
+
+	sed -i \
+		-e 's/\$(FCLINK)/\$(FCLINK) $(LDFLAGS)/' \
+		-e 's/\$(CCLINK)/\$(CCLINK) $(LDFLAGS)/' \
+		src/config/{biglib,fortran,Imake}.rules \
+		|| die "sed for ldflags propagation failed"
+}
+
+src_compile() {
+	VARTEXFONTS="${T}"/fonts
+	emake -j1 cernlib-indep cernlib-arch
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}"/shlib \
+		emake -j1 cernlib-test
+}
+
+src_install() {
+	emake DESTDIR="${D}" MCDOC="${ED}usr/share/doc/${PF}" install
+	cd debian
+	dodoc changelog README.* deadpool.txt copyright
+	newdoc add-ons/README README.add-ons
+}