From 25def779a863893a171fb57b1d3ae346e118823f Mon Sep 17 00:00:00 2001 From: Sebastien Fabbro Date: Fri, 17 Apr 2009 17:49:58 +0000 Subject: Revision bump to include new Debian patches and some ebuild cleanup (Portage version: 2.2_rc28/cvs/Linux x86_64) --- sci-physics/cernlib/ChangeLog | 8 ++- sci-physics/cernlib/cernlib-2006-r1.ebuild | 106 ---------------------------- sci-physics/cernlib/cernlib-2006-r3.ebuild | 107 +++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+), 107 deletions(-) delete mode 100644 sci-physics/cernlib/cernlib-2006-r1.ebuild create mode 100644 sci-physics/cernlib/cernlib-2006-r3.ebuild (limited to 'sci-physics') diff --git a/sci-physics/cernlib/ChangeLog b/sci-physics/cernlib/ChangeLog index 74a05e01ccd6..56dc356f7e33 100644 --- a/sci-physics/cernlib/ChangeLog +++ b/sci-physics/cernlib/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-physics/cernlib # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/ChangeLog,v 1.14 2009/03/22 21:51:54 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/ChangeLog,v 1.15 2009/04/17 17:49:58 bicatali Exp $ + +*cernlib-2006-r3 (17 Apr 2009) + + 17 Apr 2009; Sébastien Fabbro + -cernlib-2006-r1.ebuild, +cernlib-2006-r3.ebuild: + Revision bump to include new Debian patches and some ebuild cleanup 22 Mar 2009; Jeremy Olexa cernlib-2006-r2.ebuild: amd64 stable, bug 245875 diff --git a/sci-physics/cernlib/cernlib-2006-r1.ebuild b/sci-physics/cernlib/cernlib-2006-r1.ebuild deleted file mode 100644 index 0400d95fbdea..000000000000 --- a/sci-physics/cernlib/cernlib-2006-r1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/cernlib-2006-r1.ebuild,v 1.4 2008/06/27 10:39:23 ulm Exp $ - -inherit eutils multilib fortran - -DEB_PN=cernlib -DEB_PV=${PV}.dfsg.2 -DEB_PR=11 -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}.diff.gz" - -KEYWORDS="~amd64 ~hppa ~sparc ~x86" -LICENSE="GPL-2 LGPL-2 BSD" - -SLOT="0" - -DEPEND="x11-libs/openmotif - virtual/lapack - virtual/latex-base - dev-lang/cfortran - x11-misc/imake - x11-misc/makedepend - dev-util/pkgconfig" - -RDEPEND="x11-libs/openmotif - virtual/lapack - dev-lang/cfortran" - -IUSE="" - -S="${WORKDIR}/${DEB_PN}-${DEB_PV}.orig" - -FORTRAN="gfortran g77 ifc" - -src_unpack() { - - unpack ${A} - epatch "${DEB_P}-${DEB_PR}".diff - cd "${S}" - epatch "${FILESDIR}"/${P}-nogfortran.patch - - # set some default paths - sed -i \ - -e "s:/usr/local:/usr:g" \ - -e "s:prefix)/lib:prefix)/$(get_libdir):" \ - -e 's:$(prefix)/etc:/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:$(pkg-config --libs blas):" \ - -e "s:\$DEPS -llapack -lm:$(pkg-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="${FORTRANC} nostrip nocheck" - - einfo "Applying Debian patches" - emake -j1 patch || die "debian patch failed" - - # 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" \ - src/config/linux.cf || die "sed linux.cf failed" -} - -src_compile() { - # create local LaTeX cache dir - mkdir -p .texmf-var - emake -j1 cernlib-indep cernlib-arch || die "emake libs failed" -} - -src_test() { - LD_LIBRARY_PATH="${S}"/shlib \ - emake -j1 cernlib-test || die "emake test failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - cd "${S}"/debian - dodoc changelog README.* deadpool.txt NEWS copyright || die "dodoc failed" - newdoc add-ons/README README.add-ons || die "newdoc failed" -} - -pkg_postinst() { - elog "Gentoo ${PN} is based on Debian similar package." - elog "Serious cernlib users might want to check:" - elog "http://people.debian.org/~kmccarty/cernlib/" - elog "for the changes and licensing from the original package" - if use amd64; then - elog "Please see the possible warnings for ${PN} on 64 bits:" - elog "${ROOT}/usr/share/doc/${PF}/README.*64*" - fi -} diff --git a/sci-physics/cernlib/cernlib-2006-r3.ebuild b/sci-physics/cernlib/cernlib-2006-r3.ebuild new file mode 100644 index 000000000000..edcbd3fb4179 --- /dev/null +++ b/sci-physics/cernlib/cernlib-2006-r3.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/cernlib-2006-r3.ebuild,v 1.1 2009/04/17 17:49:58 bicatali Exp $ + +EAPI=2 +inherit eutils toolchain-funcs + +DEB_PN=cernlib +DEB_PV=${PV}.dfsg.2 +DEB_PR=14 +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}.diff.gz" + +KEYWORDS="~amd64 ~hppa ~sparc ~x86" +LICENSE="GPL-2 LGPL-2 BSD" + +SLOT="0" + +RDEPEND="x11-libs/openmotif + virtual/lapack + dev-lang/cfortran" + +DEPEND="${RDEPEND} + x11-misc/imake + x11-misc/makedepend + dev-util/pkgconfig" + +IUSE="" + +S="${WORKDIR}/${DEB_PN}-${DEB_PV}.orig" + +src_prepare() { + cd "${WORKDIR}" + epatch "${WORKDIR}/${DEB_P}-${DEB_PR}.diff" + cd "${S}" + epatch "${FILESDIR}/${P}-nogfortran.patch" + # set some default paths + sed -i \ + -e "s:/usr/local:/usr:g" \ + -e "s:prefix)/lib:prefix)/$(get_libdir):" \ + -e 's:$(prefix)/etc:/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:$(pkg-config --libs blas):" \ + -e "s:\$DEPS -llapack -lm:$(pkg-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 || die "debian patch failed" + + # 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" \ + 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 ' \ + 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 || die "emake libs failed" +} + +src_test() { + LD_LIBRARY_PATH="${S}"/shlib \ + emake -j1 cernlib-test || die "emake test failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + cd "${S}"/debian + dodoc changelog README.* deadpool.txt NEWS copyright || die "dodoc failed" + newdoc add-ons/README README.add-ons || die "newdoc failed" +} + +pkg_postinst() { + elog "Gentoo ${PN} is based on Debian similar package." + elog "Serious cernlib users might want to check:" + elog "http://people.debian.org/~kmccarty/cernlib/" + elog "for the changes and licensing from the original package" +} -- cgit v1.2.3-65-gdbad