[gentoo-commits] proj/sci:master commit in: sci-physics/herwig++/

[Jauhien Piatlicki]

commit:     137e3bf282b79e4d4122a71c13b4fc0d53293a80
Author:     Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 18:07:08 2015 +0000
Commit:     Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 18:09:28 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=137e3bf2

sci-physics/herwig++: remove version imported to the tree

Also rename c++0x USE to c++11 for consistency

Package-Manager: portage-2.2.20.1

 sci-physics/herwig++/ChangeLog                     |  7 ++-
 ...++-2.7.0-r1.ebuild => herwig++-2.7.0-r2.ebuild} |  6 +--
 sci-physics/herwig++/herwig++-2.7.1.ebuild         | 57 ----------------------
 sci-physics/herwig++/metadata.xml                  |  2 +-
 4 files changed, 10 insertions(+), 62 deletions(-)

diff --git a/sci-physics/herwig++/ChangeLog b/sci-physics/herwig++/ChangeLog
index 4cce494..f3c6759 100644
--- a/sci-physics/herwig++/ChangeLog
+++ b/sci-physics/herwig++/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for sci-physics/herwig++
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  30 Aug 2015; Jauhien Piatlicki <jauhien@g.o> herwig++-2.7.0-r1.ebuild,
+  -herwig++-2.7.1.ebuild, metadata.xml:
+  remove version imported to the tree, rename c++0x USE to c++11 for
+  consistency
+
 *herwig++-2.7.1 (31 Aug 2014)
 
   31 Aug 2014; Jauhien Piatlicki <jauhien@g.o> +herwig++-2.7.1.ebuild:

diff --git a/sci-physics/herwig++/herwig++-2.7.0-r1.ebuild b/sci-physics/herwig++/herwig++-2.7.0-r2.ebuild
similarity index 92%
rename from sci-physics/herwig++/herwig++-2.7.0-r1.ebuild
rename to sci-physics/herwig++/herwig++-2.7.0-r2.ebuild
index f60e257..05ab0f2 100644
--- a/sci-physics/herwig++/herwig++-2.7.0-r1.ebuild
+++ b/sci-physics/herwig++/herwig++-2.7.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,7 +19,7 @@ LICENSE="GPL-2"
 
 SLOT="0/14"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="c++0x fastjet static-libs"
+IUSE="c++11 fastjet static-libs"
 
 RDEPEND="
 	dev-libs/boost:0=
@@ -45,7 +45,7 @@ src_configure() {
 	local myeconfargs=(
 		--with-boost="${EPREFIX}"/usr
 		--with-thepeg="${EPREFIX}"/usr
-		$(use_enable c++0x stdcxx11)
+		$(use_enable c++11 stdcxx11)
 		$(use_with fastjet fastjet "${EPREFIX}"/usr)
 	)
 	autotools-utils_src_configure

diff --git a/sci-physics/herwig++/herwig++-2.7.1.ebuild b/sci-physics/herwig++/herwig++-2.7.1.ebuild
deleted file mode 100644
index 67e358e..0000000
--- a/sci-physics/herwig++/herwig++-2.7.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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/15"
-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-2.8:0=
-	>=sci-physics/thepeg-1.9.2: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++/metadata.xml b/sci-physics/herwig++/metadata.xml
index ce1ef84..73787df 100644
--- a/sci-physics/herwig++/metadata.xml
+++ b/sci-physics/herwig++/metadata.xml
@@ -13,7 +13,7 @@
   ordered parton evolution and the cluster hadronization model).
 </longdescription>
 <use>
-  <flag name='c++0x'>Build Herwig++ using the C++11 standard.
+  <flag name='c++11'>Build Herwig++ using the C++11 standard.
   Experimental feature, not for production use.</flag>
   <flag name='fastjet'>Adds support for <pkg>sci-physics/fastjet</pkg></flag>
 </use>