commit: 4c553666ff6789877717ac88fde42f21891ebf2f Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> AuthorDate: Wed May 7 23:11:53 2014 +0000 Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> CommitDate: Wed May 7 23:11:53 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4c553666
sci-physics/herwig++: Switch to autotools-utils, a few more link fixes, prefix love Package-Manager: portage-2.2.8-prefix --- sci-physics/herwig++/ChangeLog | 10 ++++- sci-physics/herwig++/herwig++-2.6.3.ebuild | 50 ----------------------- sci-physics/herwig++/herwig++-2.7.0-r1.ebuild | 57 +++++++++++++++++++++++++++ sci-physics/herwig++/herwig++-2.7.0.ebuild | 51 ------------------------ 4 files changed, 65 insertions(+), 103 deletions(-) diff --git a/sci-physics/herwig++/ChangeLog b/sci-physics/herwig++/ChangeLog index 83bafb0..c38c984 100644 --- a/sci-physics/herwig++/ChangeLog +++ b/sci-physics/herwig++/ChangeLog @@ -1,7 +1,14 @@ # ChangeLog for sci-physics/herwig++ -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*herwig++-2.7.0-r1 (07 May 2014) + + 07 May 2014; Sébastien Fabbro <[email protected]> +herwig++-2.7.0-r1.ebuild, + -herwig++-2.6.3.ebuild, -herwig++-2.7.0.ebuild: + sci-physics/herwig++: Switch to autotools-utils, a few more link fixes, prefix + love + *herwig++-2.7.0 (04 Nov 2013) 04 Nov 2013; Jauhien Piatlicki <[email protected]> +herwig++-2.7.0.ebuild, @@ -34,4 +41,3 @@ 08 Sep 2012; Jauhien Piatlicki (jauhien) <[email protected]> +herwig++-2.6.0.ebuild, +files/herwig++-2.6.0-looptools.patch, +metadata.xml: New Ebuild for bug #433060 - diff --git a/sci-physics/herwig++/herwig++-2.6.3.ebuild b/sci-physics/herwig++/herwig++-2.6.3.ebuild deleted file mode 100644 index ff9d609..0000000 --- a/sci-physics/herwig++/herwig++-2.6.3.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit autotools eutils - -MYP=Herwig++-${PV} - -DESCRIPTION="High-Energy Physics event generator" -HOMEPAGE="http://herwig.hepforge.org/"; -SRC_URI="http://www.hepforge.org/archive/herwig/${MYP}.tar.bz2"; - -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="fastjet" - -DEPEND="dev-libs/boost - virtual/fortran - sci-libs/gsl - sci-physics/LoopTools - dev-lang/perl - =sci-physics/thepeg-1.8.3 - fastjet? ( sci-physics/fastjet )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MYP}" - -src_prepare() { - epatch "${FILESDIR}/${P}-looptools.patch" - find -name 'Makefile.am' -exec sed -i '1ipkgdatadir=$(datadir)/herwig++' {} \; \ - || die "changing pkgdatadir name failed" - eautoreconf -} - -src_configure() { - econf \ - --disable-silent-rules \ - --with-boost="${EPREFIX}"/usr \ - --with-thepeg="${EPREFIX}"/usr \ - $(use_with fastjet fastjet "${EPREFIX}"/usr) -} - -pkg_preinst () { - sed -i "s%${ED}%%g" "${ED}"/usr/share/herwig++/defaults/PDF.in || die - sed -i "s%${ED}%%g" "${ED}"/usr/share/herwig++/HerwigDefaults.rpo || die -} diff --git a/sci-physics/herwig++/herwig++-2.7.0-r1.ebuild b/sci-physics/herwig++/herwig++-2.7.0-r1.ebuild new file mode 100644 index 0000000..330652e --- /dev/null +++ b/sci-physics/herwig++/herwig++-2.7.0-r1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=1 +AUTOTOOLS_IN_SOURCE_BUILD=1 + +inherit autotools-utils eutils flag-o-matic multilib + +MYP=Herwig++-${PV} + +DESCRIPTION="High-Energy Physics event generator" +HOMEPAGE="http://herwig.hepforge.org/"; +SRC_URI="http://www.hepforge.org/archive/herwig/${MYP}.tar.bz2"; + +LICENSE="GPL-2" + +SLOT="0/14" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="c++0x fastjet static-libs" + +RDEPEND=" + dev-libs/boost:0= + sci-libs/gsl:0= + sci-physics/looptools:0= + >=sci-physics/thepeg-1.9.1:0= + fastjet? ( sci-physics/fastjet:0= )" +DEPEND="${RDEPEND} + virtual/fortran" + +S="${WORKDIR}/${MYP}" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-2.6.3-looptools.patch + find -name 'Makefile.am' -exec \ + sed -i -e '1ipkgdatadir=$(datadir)/herwig++' {} \; || die + autotools-utils_src_prepare +} + +src_configure() { + use prefix && \ + append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/ThePEG + local myeconfargs=( + --with-boost="${EPREFIX}"/usr + --with-thepeg="${EPREFIX}"/usr + $(use_enable c++0x stdcxx11) + $(use_with fastjet fastjet "${EPREFIX}"/usr) + ) + autotools-utils_src_configure +} + +pkg_preinst () { + sed -i -e "s|${ED}||g" "${ED}"/usr/share/herwig++/defaults/PDF.in || die + sed -i -e "s|${ED}||g" "${ED}"/usr/share/herwig++/HerwigDefaults.rpo || die +} diff --git a/sci-physics/herwig++/herwig++-2.7.0.ebuild b/sci-physics/herwig++/herwig++-2.7.0.ebuild deleted file mode 100644 index d24dc40..0000000 --- a/sci-physics/herwig++/herwig++-2.7.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit autotools eutils - -MYP=Herwig++-${PV} - -DESCRIPTION="High-Energy Physics event generator" -HOMEPAGE="http://herwig.hepforge.org/"; -SRC_URI="http://www.hepforge.org/archive/herwig/${MYP}.tar.bz2"; - -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="c++0x fastjet" - -DEPEND="dev-libs/boost - virtual/fortran - sci-libs/gsl - sci-physics/LoopTools - dev-lang/perl - =sci-physics/thepeg-1.9.0* - fastjet? ( sci-physics/fastjet )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MYP}" - -src_prepare() { - epatch "${FILESDIR}/${PN}-2.6.3-looptools.patch" - find -name 'Makefile.am' -exec sed -i '1ipkgdatadir=$(datadir)/herwig++' {} \; \ - || die "changing pkgdatadir name failed" - eautoreconf -} - -src_configure() { - econf \ - --disable-silent-rules \ - --with-boost="${EPREFIX}"/usr \ - --with-thepeg="${EPREFIX}"/usr \ - $(use_enable c++0x stdcxx11) - $(use_with fastjet fastjet "${EPREFIX}"/usr) -} - -pkg_preinst () { - sed -i "s%${ED}%%g" "${ED}"/usr/share/herwig++/defaults/PDF.in || die - sed -i "s%${ED}%%g" "${ED}"/usr/share/herwig++/HerwigDefaults.rpo || die -}
