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

(Portage version: 2.2.01.21938-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

3 files changed, 14 insertions, 104 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/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 \