Respect AR (bug #468170) and RANLIB (bug #468190), switch to EAPI5, removed old

Package-Manager: portage-2.2.01.21938-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

4 files changed, 20 insertions, 112 deletions

diff --git a/sci-physics/cernlib/ChangeLog b/sci-physics/cernlib/ChangeLog
index a1806114209d..8bd7ad1a5de2 100644
--- a/sci-physics/cernlib/ChangeLog
+++ b/sci-physics/cernlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-physics/cernlib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/ChangeLog,v 1.33 2013/02/20 16:48:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/ChangeLog,v 1.34 2013/05/23 20:09:32 bicatali Exp $
+
+  23 May 2013; Sébastien Fabbro <bicatali@gentoo.org> -cernlib-2006-r4.ebuild,
+  cernlib-2006-r5.ebuild:
+  Respect AR (bug #468170) and RANLIB (bug #468190), switch to EAPI5, removed
+  old
 
   20 Feb 2013; Justin Lecher <jlec@gentoo.org> cernlib-2006-r3.ebuild,
   cernlib-2006-r4.ebuild, metadata.xml:
diff --git a/sci-physics/cernlib/Manifest b/sci-physics/cernlib/Manifest
index 78d4cd43f7dd..180092cd0fdd 100644
--- a/sci-physics/cernlib/Manifest
+++ b/sci-physics/cernlib/Manifest
@@ -6,18 +6,16 @@ AUX cernlib-2006-nogfortran.patch 1994 SHA256 f9839ef5dc005715387bd997f69565aa1e
 AUX cernlib-2006-ypatchy-short-name.patch 331 SHA256 c71212efa6e33ec4dd55d4080bd22db86438fbda1091186d146699496f1cd101 SHA512 dd97e328706c243b84c6464ee1db3c546280dba838766e6aefd8a5349e57a3b430c38d81909f5ad445af7c3a602e0a6e64110b7f8eb6e44a907a7311828142e9 WHIRLPOOL bd2b7c886ecf3937e0c189b04b3f13c4b9fe131b2cac8e150b4bfda0218eebd984ba9978ca3b704d59b5098718f9ff5424b1163ad7ade078164224a7642d2548
 DIST cernlib_2006.dfsg.2-14.diff.gz 191345 SHA256 e58c84825ea6fc775acdbccbaaa7ac8c3b70120da8f99e704270ea0aa437e665
 DIST cernlib_2006.dfsg.2.orig.tar.gz 6152834 SHA256 f8ef612cdef0e02b69ccabbe0061eed5f952522565affc25e8ad6e0b73b73f26
-DIST cernlib_20061220+dfsg3-1.debian.tar.gz 263187 SHA256 5613c101b0089d572a52e0a36e0a11caa04f3c2aa2d19ebff36b40e40e930eaa SHA512 dbefafa8067ba995f270d02c96d4fab21f9883ab908d7198e62941e22bf815bc546c61bf72d73db9ebfd4aa4b2c059ecff0cad18125c56b74ad700e72db767ff WHIRLPOOL 4f710523a8505b6edd18b9420753fbab0e700d5e880bede752fdb63ddbab0501b4144cbcdc7e5c0471b61b7a68b908eac835c18d921cfd5ed5e386406e5d98b4
 DIST cernlib_20061220+dfsg3-2.debian.tar.gz 257093 SHA256 54d01b7c16015586b09d54940f8e4389eb9f9a85e93be8058a2f1349a009029a SHA512 43a2ca55d42b92bfb551b029c75728e80b4c83473397b52f746d9481c7503762bc5a281732908bfeb29a64f728fed4c127ed1cb9101c16e4fb2dd28c452730ea WHIRLPOOL e11e127c2ef22c96a8f309a1828b076064b87419d7b2fa2f0e93f254582ded6ce41ca678c757921e9a732f75a4bd0392cd4edb7c0752ce04986fe8c1ee210c46
 DIST cernlib_20061220+dfsg3.orig.tar.gz 6434476 SHA256 767ecf344cb00a7b2ec232a61c67645ce0fe1a6af861e60a9aa2f96544470f1b SHA512 11fade45c5ae69c858f37a82e74ab1a69416314a23c12ec5205ee6b918590d66f26d3ae68afa466ae3109d736212968ece956a444270ddd189a27a24c0ccece8 WHIRLPOOL fce13048cff43b6abc7e52e9729f5e484ebf85b53f09e6bfbf8acd970ea13b160de6d6d9593779b6b485dfb9843dec4d2d58bac0df20dfce9809a3560eec079c
 EBUILD cernlib-2006-r3.ebuild 3334 SHA256 17981aab97718b7d96b5ae2c48e7eeda26f3eb2a99fae0fd4f7ab091ee83eb2d SHA512 43dc65835fc95b707ed946845a15ea1b9d03ed397c88e1be01c45d81bbee791afbb9061d230aa983aa787823465f45ccb04f0898645c486c35c9e430d6370712 WHIRLPOOL 562619c47177bf9ef057129d55309a4897a0163cbc44540b3bb1b8cf80fd8682935f4277ce51ef799e9ddaf91658c798d58be6205a2c8241d0c5e7a81af93e3a
-EBUILD cernlib-2006-r4.ebuild 2814 SHA256 8e53e647f8664236162c5126095e0876f4d4099e55d566e448c66b837c27109d SHA512 24347e35f0c19a1ff8cf04727ca1d4b247145c62cfc8ff35c602505732b5aff2e01745278d71364dd692ff643c7883eb709ef09c0837f86c43697c7a264e6353 WHIRLPOOL 30db42b006f224da8b3f48f82484e54cb8f032312e47b71662c4b4c241e1469a669567ebf927e7a8e37caa9aaf4ebb7d401141ac8a70d4be7bcfc124b3b07b26
-EBUILD cernlib-2006-r5.ebuild 2880 SHA256 ce1c87a08c11d822eb9ac788d17f39f01c0e40aeb33d6484b2b8997c9f81bf2f SHA512 802b99e3c5bc26f4e88ca061a9b808df16376e2ec39fcfefe877793283e84a1f48c861edd7d5dbd9df57f94d139ee3a139ef80ffca2232101c5b34aba4f205b7 WHIRLPOOL 3b52756a262ac82573372db4c9a74e2c4407b1e53b8fe2241f4624a3117b0b43b06f264a2cde226efb2503e516365c0b60525d439eba1ad513b97f3a1c74cd1e
-MISC ChangeLog 5482 SHA256 e9fb6c6c4abc3abb586a7ddf2cf45a9ac0f2eb3421703e74edc8037990d1cae4 SHA512 e2dc321909d772b7265266bbf231e1c859f9d460e3c968e570ebad4f3965d30f28157e6cdc206a69101d9c99fc268e5514c19f9211396c8893e5b5f5770d560e WHIRLPOOL ddfbb9b703ca44e20d0df45b44ad34cf591d7c6274b025f40047886b054f30fd3d6c127b8f98545c0d643350953fedecb81302bfbd989e9a04c1eb353de4d040
+EBUILD cernlib-2006-r5.ebuild 3068 SHA256 5aa0be1f6efc1fefea3705c24fd94026d2b9da90fd3e06bb5406e51fd27cd384 SHA512 32db533150f15533a428516e1b8ff648133baf96581b76c0814583d43f44ee3b240dcfaefdc0d961a562024f8c2999d613b4f55f905bc175ba84eb2a2ecd94fb WHIRLPOOL 5e3246ed456ea155eaafb971bc0ef629302d0b565451603903b9b90248b604a0cc6c340cfa75da117c387937da99ef4ea3183ef89dea56a4b2f9afb41dd68670
+MISC ChangeLog 5677 SHA256 e04ef19df46c60596c68ad2e5b22302e32a4ab462651019351415707f0206d09 SHA512 6fd453dae35c2a9ddcefaaa1d526531a9bb7136128f98c8ab6c842ae493cdef236b50af5502dc73a0562e5ee9c94d652f7e64929ed9fd93a25924306c5d78af2 WHIRLPOOL 8aff673e92c07d2908303a65743db70da79389256e9a60d182be89421769f50cfd1656d0cc5e27ec5d124afe2be52ee86788368bdc880561891575a6bea44f0e
 MISC metadata.xml 658 SHA256 e9ebc62fd54aea3e6d7d677b225878650650ff4bca547f98b732f5a5adf8acb1 SHA512 3c45590b5caf423473f9bd20963be4c3a7c131ce81111164c002b00b0ae99125becffbd9805709584aa66c3ba8023e77108fcb3479cb4920ca4d3cb7e2440e5f WHIRLPOOL 8fe1ee941329f72717db167525a3b0c43540e690aafd39c4a74338bdf6a7799b4f836409fc675c9c30f8fda4c01e4ed508bfc05456b5697e7dc3e7fb7ea7f1a8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlEk/mgACgkQgAnW8HDreRZr5gCdGoOH6+ElztjM5wDLZbYscGAc
-mzMAn2XzIzpIcmYP9gZpJLNWxyFOnbaR
-=GPdW
+iEYEAREIAAYFAlGed4AACgkQ1ycZbhPLE2D/xQCfaWMf/xJfdzCq7wvGmG7oeIWP
+7z0An3BbSm6vIrT5xX59GaDDygupAoOG
+=oznJ
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/cernlib/cernlib-2006-r4.ebuild b/sci-physics/cernlib/cernlib-2006-r4.ebuild
deleted file mode 100644
index 2f4d0f4ad29d..000000000000
--- a/sci-physics/cernlib/cernlib-2006-r4.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/cernlib-2006-r4.ebuild,v 1.6 2013/02/20 16:48:39 jlec Exp $
-
-EAPI=4
-
-inherit eutils fortran-2 multilib toolchain-funcs
-
-DEB_PN=cernlib
-DEB_PV=20061220+dfsg3
-DEB_PR=1
-DEB_P=${DEB_PN}_${DEB_PV}
-
-DESCRIPTION="CERN program library for High Energy Physics"
-HOMEPAGE="http://wwwasd.web.cern.ch/wwwasd/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"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
-IUSE=""
-
-RDEPEND="
-	x11-libs/motif:0
-	virtual/lapack
-	dev-lang/cfortran"
-DEPEND="${RDEPEND}
-	x11-misc/imake
-	x11-misc/makedepend
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${DEB_PN}-${DEB_PV}"
-
-src_prepare() {
-	mv ../debian .
-	epatch "${FILESDIR}"/${P}-nogfortran.patch
-	# set some default paths
-	sed -i \
-		-e "s:/usr/local:${EPREFIX}/usr:g" \
-		-e "s:prefix)/lib:prefix)/$(get_libdir):" \
-		-e "s:\$(prefix)/etc:${EPREFIX}/etc:" \
-		-e 's:$(prefix)/man:$(prefix)/share/man:' \
-		debian/add-ons/cernlib.mk || die "sed failed"
-
-	# use system blas and lapack set by gentoo framework
-	sed -i \
-		-e "s:\$DEPS -lm:$($(tc-getPKG_CONFIG) --libs blas):" \
-		-e "s:\$DEPS -llapack -lm:$($(tc-getPKG_CONFIG) --libs lapack):" \
-		-e 's:`depend $d $a blas`::' \
-		-e 's:X11R6:X11:g' \
-		debian/add-ons/bin/cernlib.in || die "sed failed"
-
-	cp debian/add-ons/Makefile .
-	export DEB_BUILD_OPTIONS="$(tc-getFC) nostrip nocheck"
-
-	einfo "Applying Debian patches"
-	emake -j1 patch
-
-	epatch "${FILESDIR}"/${P}-fgets.patch
-	# since we depend on cfortran, do not use the one from cernlib
-	rm -f src/include/cfortran/cfortran.h
-
-	# 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/\$(FCLINK)/\$(FCLINK) $(LDFLAGS)/' \
-		-e 's/\$(CCLINK)/\$(CCLINK) $(LDFLAGS)/' \
-		src/config/{biglib,fortran,Imake}.rules \
-		src/patchy/Imakefile \
-		|| die "sed for ldflags propagation failed"
-
-	# add missing headers for implicit
-	sed -i \
-		-e '0,/^#include/i#include <stdlib.h>' \
-		src/kernlib/kerngen/ccgen*/*.c || die
-}
-
-src_compile() {
-	# parallel make breaks and complex patched imake system, hard to debug
-	emake -j1 cernlib-indep cernlib-arch
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}"/shlib emake -j1 cernlib-test
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	cd debian
-	dodoc changelog README.* deadpool.txt NEWS copyright
-	newdoc add-ons/README README.add-ons
-}
diff --git a/sci-physics/cernlib/cernlib-2006-r5.ebuild b/sci-physics/cernlib/cernlib-2006-r5.ebuild
index 3e0dd1e9b804..c599992a86f8 100644
--- a/sci-physics/cernlib/cernlib-2006-r5.ebuild
+++ b/sci-physics/cernlib/cernlib-2006-r5.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/cernlib-2006-r5.ebuild,v 1.1 2013/01/16 22:04:04 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/cernlib-2006-r5.ebuild,v 1.2 2013/05/23 20:09:32 bicatali Exp $
 
-EAPI=4
+EAPI=5
 
 inherit eutils fortran-2 multilib toolchain-funcs
 
@@ -73,6 +73,12 @@ src_prepare() {
 		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 \