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

5 files changed, 10 insertions, 63 deletions

diff --git a/sci-physics/herwig++/ChangeLog b/sci-physics/herwig++/ChangeLog
index 4cce4943f..f3c675911 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@gentoo.org> 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@gentoo.org> +herwig++-2.7.1.ebuild:
diff --git a/sci-physics/herwig++/Manifest b/sci-physics/herwig++/Manifest
index ff9387e38..39d301768 100644
--- a/sci-physics/herwig++/Manifest
+++ b/sci-physics/herwig++/Manifest
@@ -1,2 +1 @@
 DIST Herwig++-2.7.0.tar.bz2 3365868 SHA256 17403748e7e3d76b0b91633ed5d23957f8eb086f7b833128b1294911dbceca33 SHA512 c59ba24893bd6c5bd02ef86c5e1d1a38b6bd4c59e06d48e54c32748951f752c988717dc88f340a2013db6c359d59a0f19bee42461015f294b9cd67ce5a58d479 WHIRLPOOL 573d8f5abb594e9a2e93152e00921ce19e57279a087f7b5583f61f4383a4bdcbf493bc618c299ccd1cdc319ce1939afab507219304e35d3b959de8a4c58f502c
-DIST Herwig++-2.7.1.tar.bz2 3388956 SHA256 80a189376bb65f5ec4e64f42e76c00ea9102d8224010563a424fc11e619a6ad6 SHA512 643f389f13f22b30d0adb4ca601a11c2686f6db4746af51136601954af2ec20eb0af7b45981e764d8b71cb7206bfe310beea1fee069972868955b1f024b8d5e3 WHIRLPOOL 5336136e90c4f90e4e08a24a4d753ab61d1c4b033a23228ebb5bc039175987f4d70d7162a2319b635644a3fbaf24c9bbc1b901e92abb4bcaad27884e429d472a
diff --git a/sci-physics/herwig++/herwig++-2.7.0-r1.ebuild b/sci-physics/herwig++/herwig++-2.7.0-r2.ebuild
index f60e257c8..05ab0f2ef 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 67e358e4e..000000000
--- 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 ce1ef8434..73787df5d 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>