Added a patch for proper nypatchy generation, updated Debian patch, use generic pkg-config and ebuild cleaning. Keyworded amd64-linux and x86-linux

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

3 files changed, 122 insertions, 3 deletions

diff --git a/sci-physics/cernlib/ChangeLog b/sci-physics/cernlib/ChangeLog
index 3d805223e987..247c4b95bc20 100644
--- a/sci-physics/cernlib/ChangeLog
+++ b/sci-physics/cernlib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-physics/cernlib
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/ChangeLog,v 1.31 2012/10/24 19:42:22 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/ChangeLog,v 1.32 2013/01/16 22:04:04 bicatali Exp $
+
+*cernlib-2006-r5 (16 Jan 2013)
+
+  16 Jan 2013; Sébastien Fabbro <bicatali@gentoo.org> +cernlib-2006-r5.ebuild,
+  +files/cernlib-2006-ypatchy-short-name.patch:
+  Added a patch for proper nypatchy generation, updated Debian patch, use
+  generic pkg-config and ebuild cleaning. Keyworded amd64-linux and x86-linux
 
   24 Oct 2012; Ulrich Müller <ulm@gentoo.org> cernlib-2006-r3.ebuild,
   cernlib-2006-r4.ebuild:
@@ -127,4 +134,3 @@
   24 Aug 2007; Sébastien Fabbro <bicatali@gentoo.org> +metadata.xml,
   +cernlib-2006.ebuild:
   Initial import. Closes bug #65708
-
diff --git a/sci-physics/cernlib/cernlib-2006-r5.ebuild b/sci-physics/cernlib/cernlib-2006-r5.ebuild
new file mode 100644
index 000000000000..3e0dd1e9b804
--- /dev/null
+++ b/sci-physics/cernlib/cernlib-2006-r5.ebuild
@@ -0,0 +1,102 @@
+# 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 $
+
+EAPI=4
+
+inherit eutils fortran-2 multilib toolchain-funcs
+
+DEB_PN=cernlib
+DEB_PV=20061220+dfsg3
+DEB_PR=2
+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 ~amd64-linux ~x86-linux"
+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 . || die
+	epatch "${FILESDIR}"/${P}-nogfortran.patch
+	# set some default paths
+	sed -i \
+		-e "s:/usr/local:${EROOT}/usr:g" \
+		-e "s:prefix)/lib:prefix)/$(get_libdir):" \
+		-e "s:\$(prefix)/etc:${EROOT}/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
+	epatch "${FILESDIR}"/${P}-ypatchy-short-name.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/\$(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() {
+	default
+	cd debian
+	dodoc changelog README.* deadpool.txt NEWS copyright
+	newdoc add-ons/README README.add-ons
+}
diff --git a/sci-physics/cernlib/files/cernlib-2006-ypatchy-short-name.patch b/sci-physics/cernlib/files/cernlib-2006-ypatchy-short-name.patch
new file mode 100644
index 000000000000..706ab3671672
--- /dev/null
+++ b/sci-physics/cernlib/files/cernlib-2006-ypatchy-short-name.patch
@@ -0,0 +1,11 @@
+--- src/patchy/Imakefile.orig	2013-01-16 13:45:07.161828513 -0800
++++ src/patchy/Imakefile	2013-01-16 13:45:34.768966597 -0800
+@@ -77,7 +77,7 @@
+ 	@ ln -s $< $@
+ 
+ %.f:  $(LDIR)%.cra $(LDIR)patchy.car
+-	ypatchy - :$@ :$< TTY .go
++	ypatchy - :$@ :$(shell basename $<) TTY .go
+ 
+ .f.o:
+ 	$(FC) -c $(FORTRANOPTIONS) $(FDEBUGFLAGS) $<