diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2013-06-04 19:10:36 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2013-06-04 19:10:36 +0000 |
| commit | 7b66c0b375bdefefd77ea79176261e9d14c925c9 (patch) | |
| tree | 4c952df107781c651c3b28e02533866f64c23be0 /sci-physics/cernlib-montecarlo | |
| parent | Version bump (bug #464610 by Manuel Rüger), convert to python-single-r1, add... (diff) | |
| download | historical-7b66c0b375bdefefd77ea79176261e9d14c925c9.tar.gz historical-7b66c0b375bdefefd77ea79176261e9d14c925c9.tar.bz2 historical-7b66c0b375bdefefd77ea79176261e9d14c925c9.zip | |
Respect user toolchain (bug #468192)
Package-Manager: portage-2.2.01.21938-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360
Diffstat (limited to 'sci-physics/cernlib-montecarlo')
| -rw-r--r-- | sci-physics/cernlib-montecarlo/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-physics/cernlib-montecarlo/Manifest | 12 | ||||
| -rw-r--r-- | sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild | 24 |
3 files changed, 33 insertions, 9 deletions
diff --git a/sci-physics/cernlib-montecarlo/ChangeLog b/sci-physics/cernlib-montecarlo/ChangeLog index e278025102fa..f75a394e7211 100644 --- a/sci-physics/cernlib-montecarlo/ChangeLog +++ b/sci-physics/cernlib-montecarlo/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-physics/cernlib-montecarlo # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/ChangeLog,v 1.19 2013/01/17 18:53:15 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/ChangeLog,v 1.20 2013/06/04 19:10:24 bicatali Exp $ + + 04 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org> + cernlib-montecarlo-2006-r3.ebuild: + Respect user toolchain (bug #468192) 17 Jan 2013; Sébastien Fabbro <bicatali@gentoo.org> cernlib-montecarlo-2006-r3.ebuild, metadata.xml: diff --git a/sci-physics/cernlib-montecarlo/Manifest b/sci-physics/cernlib-montecarlo/Manifest index a00ff2722359..773d4b097a52 100644 --- a/sci-physics/cernlib-montecarlo/Manifest +++ b/sci-physics/cernlib-montecarlo/Manifest @@ -7,13 +7,13 @@ DIST mclibs_2006.dfsg.2.orig.tar.gz 7406559 SHA256 8e73ccb987cb8f930ed44eac807d4 DIST mclibs_20061220+dfsg3-1.debian.tar.gz 46362 SHA256 17a9f61860237b963bc4b6240296add2bbe45cf16ce994061c3f20c33994cf73 SHA512 ddb31fd218f0f051155548011415d9526e7866ec7caf7041a5f572d8064cb4f19c188724e839f445a47f490dacf0d67ef9ba871725756892e0ba1d569d575fe3 WHIRLPOOL c8db51ed7e1e78ffcdca96af3aeb388391473acc796b35af838fa60cb3129816e787dce325c8ac8be411d98ec2d1392959df97dd560ccae172c230ce2c342676 DIST mclibs_20061220+dfsg3.orig.tar.gz 7642494 SHA256 cb5ea19bc54a06c031c90192685748ce0f7df016bfae6b9d7d672d77a3444ce5 SHA512 add98b585648994ab616d040e9a3410b0eba13ab54a812674d3940bae0effed4446b02ce6a34887841c114bc444b1b83598e2c89c22b4df8dcd3fd4c1d8aaba3 WHIRLPOOL cee4c265ae610bbc1b2a48fdc6d769848bf936c78862a298725e5ac11fc2620a18b748dcd41e8b7622cf369c2a43f9641cc67e5f902a88e2f083f7b7587a1771 EBUILD cernlib-montecarlo-2006-r2.ebuild 1967 SHA256 19bc95ca8c11e99e8d2c37d0d1b8b6310fc1bc3443b820ac0973a9feba16b43a SHA512 dcaf92410960b83e244a853a78c92b3c8d35bba99e98a231d5ed52e96cf5f17eef76d6381a879216fdf50f7dabf006b09d78cd5b6abff2ae565c57e21f414ae8 WHIRLPOOL fcde76ab68ff823cc22fc6bf4e0949ca047532f3d9c5be77456d1bb2c02bcad8087d635cc23ef387a4c403cacbaf0eb2eb983bdd87beea4afbcda3356d7a9ca7 -EBUILD cernlib-montecarlo-2006-r3.ebuild 1711 SHA256 629ff845f40edb32f3b06a1494c22788a19ba0b33549d862bc7d393d0ba63be1 SHA512 49e452f8353269be2683e59e28d4d44983f6bb79eabeebd5130e74882e5be9d65edfabeaadd9218c4dfafc65c313cbf0db8821329d1fb58abc0270d5a8f7bc43 WHIRLPOOL 1441be1e2d9dd4586bfc72c7899b4bb977dae3a24a618f9a1ca3172e36f4562189818cb70f3bfe160dcb0127dc4ff1244246d445f4b1c1bff443a9711e784cf9 -MISC ChangeLog 3409 SHA256 566016167d3f32347d556371581188c6bdca47b8f9331398e975ed383bb2d299 SHA512 dc8d8aaf7cb1d4ab435ebcff1d6f234501053d053d6043440dd87fad6b4453ee71f60d9a51e6bc5dc32880157e4926b9c49a65981ef78bbded99fad6cba23a8c WHIRLPOOL 442fe6ad77b12c239300e23b470568822f7945229bd0c2c7eaa7b573d5602f5230958f7d666b661a16367273cd2870784c249c13517773a98b1f55ee9c4cd8cb +EBUILD cernlib-montecarlo-2006-r3.ebuild 2399 SHA256 456fcad470cdb36e0a059260a8d78768f52678e58de4aa6cd18b10a7d8942e81 SHA512 1f90e952f30f4d3e277115dc6a05e2bde46f9809420a84784cc24d1b16b2e7ba9bda839c44ebc02b977c81e77d27bbc680c8fe736751cbff26df319f94628b45 WHIRLPOOL 20a35e2cc7705aaf54055bd0ef87102ba8ccf8a883096474fe2050335376b978b63a39abd1d51725463043f1ea5351d0858b5bdd2d0d6819e978dd63814e4be3 +MISC ChangeLog 3541 SHA256 07230f133b6c913f770148e70adb6ade678bf5ae622c70016714425399bd14cb SHA512 e715685b759306979a1617959f02524f18880768acfab428a25f28468a5ec0d957cbeb7c727c99b5d764127cc199bfc3d8934b7cff8944919c5a50b87e184980 WHIRLPOOL 50afb753f6832a60c57e4d3a3de146c722206a0aba5e018e4b425f6fb6032c7db64f21bb0b89f21b8e07e68905eac9438b1b338099b11ed43abd63e98e3812f7 MISC metadata.xml 661 SHA256 3705472cb9b8a9e777de950a83d2c367576a0d56781410489e7efb93716efd1c SHA512 ed40b1b975163c79830f24d7e1c79207bca629a3f80ac0199c073c8b2a671255bde4e6e4a793cd09f6cb0bf091fc347db2539e97b6992fb34214c30c2d2a7de7 WHIRLPOOL eeeea417bdc1594dba150243729d82d94cb5c8991ba2c4ccaca6a962cf8171372fe2b2347361b8eeff6b22df8468bd33b890df3633bdd0d4f7711214ea8ff7f4 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.20 (GNU/Linux) -iEYEAREIAAYFAlD4SKAACgkQ1ycZbhPLE2ARbQCfZB5D1NCSPPIMGay5y/ghL2br -kzkAoI1DdP5Bq4L1/j3Oz2KUPuxHFmau -=hhlJ +iEYEAREIAAYFAlGuO6EACgkQ1ycZbhPLE2BFugCgkWz4p00qWSsPk+lrtPIj5jYU +KYkAn19wbg0eXWpqNBcmNPxUs8Z4JGpu +=dAK8 -----END PGP SIGNATURE----- diff --git a/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild b/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild index f6beb7a72957..8ffbb94f2053 100644 --- a/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild +++ b/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2013 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-r3.ebuild,v 1.4 2013/01/17 18:53:15 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild,v 1.5 2013/06/04 19:10:24 bicatali Exp $ -EAPI=4 +EAPI=5 inherit eutils toolchain-funcs @@ -48,6 +48,26 @@ src_prepare() { 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() { |