sci-physics/herwig++: Switch to autotools-utils, a few more link fixes, prefix love

Package-Manager: portage-2.2.8-prefix

5 files changed, 65 insertions, 104 deletions

diff --git a/sci-physics/herwig++/ChangeLog b/sci-physics/herwig++/ChangeLog
index 83bafb096..c38c9841d 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 <bicatali@gentoo.org> +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 <piatlicki@gmail.com> +herwig++-2.7.0.ebuild,
@@ -34,4 +41,3 @@
   08 Sep 2012; Jauhien Piatlicki (jauhien) <piatlicki@gmail.com>
   +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++/Manifest b/sci-physics/herwig++/Manifest
index a5527bbfb..39d301768 100644
--- a/sci-physics/herwig++/Manifest
+++ b/sci-physics/herwig++/Manifest
@@ -1,2 +1 @@
-DIST Herwig++-2.6.3.tar.bz2 3163127 SHA256 fb61f11cd43cb0d587d02572cbb19882e94f1132eca19c35c0e36816c051ffc4 SHA512 3a37dc5769ecdbb6ce86cc04df9245dcc986bf10fbf1d917742c3c421fe3c4949f40effcfc4fbdb80b8e60fdf15630020e849849e936776702693d7459090ee2 WHIRLPOOL 5682ecb8a944c287ec733b4a5c31a0b7b82a66728dd1f9d6a5b1026fe8b59d07ea52db3b9d92cb1d1eff6a3b3449ce546ce09cf647d57d8ec63a6bd0da1bc03a
 DIST Herwig++-2.7.0.tar.bz2 3365868 SHA256 17403748e7e3d76b0b91633ed5d23957f8eb086f7b833128b1294911dbceca33 SHA512 c59ba24893bd6c5bd02ef86c5e1d1a38b6bd4c59e06d48e54c32748951f752c988717dc88f340a2013db6c359d59a0f19bee42461015f294b9cd67ce5a58d479 WHIRLPOOL 573d8f5abb594e9a2e93152e00921ce19e57279a087f7b5583f61f4383a4bdcbf493bc618c299ccd1cdc319ce1939afab507219304e35d3b959de8a4c58f502c
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 ff9d609b0..000000000
--- 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 000000000..330652eeb
--- /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 d24dc4047..000000000
--- 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
-}