public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: sci-physics/herwig++/
@ 2012-10-15  4:35 Guillaume Horel
  0 siblings, 0 replies; 7+ messages in thread
From: Guillaume Horel @ 2012-10-15  4:35 UTC (permalink / raw
  To: gentoo-commits

commit:     d3615f6ea43382192c23bc91c76a736283111aef
Author:     Jauhien Piatlicki (jauhien) <piatlicki <AT> gmail <DOT> com>
AuthorDate: Fri Sep 14 17:34:04 2012 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Fri Sep 14 17:34:04 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d3615f6e

sci-physics/herwig++: move sed stuff to pkg_preinst and change $D to $ED

---
 sci-physics/herwig++/herwig++-2.6.0.ebuild |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/sci-physics/herwig++/herwig++-2.6.0.ebuild b/sci-physics/herwig++/herwig++-2.6.0.ebuild
index 3cea34d..a2dfd21 100644
--- a/sci-physics/herwig++/herwig++-2.6.0.ebuild
+++ b/sci-physics/herwig++/herwig++-2.6.0.ebuild
@@ -44,8 +44,7 @@ src_configure() {
 		$(use_with fastjet fastjet "${EPREFIX}"/usr)
 }
 
-src_install () {
-	emake DESTDIR="${D}" install
-	sed -i "s%${D}%%g" "${D}"/usr/share/herwig++/defaults/PDF.in || die
-	sed -i "s%${D}%%g" "${D}"/usr/share/herwig++/HerwigDefaults.rpo || die
+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
 }


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/herwig++/
@ 2013-11-07 20:05 Alexey Shvetsov
  0 siblings, 0 replies; 7+ messages in thread
From: Alexey Shvetsov @ 2013-11-07 20:05 UTC (permalink / raw
  To: gentoo-commits

commit:     9274678a22179e800439adf2252f35f3c523225b
Author:     Jauhien Piatlicki <piatlicki <AT> gmail <DOT> com>
AuthorDate: Mon Nov  4 13:51:56 2013 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Mon Nov  4 13:51:56 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9274678a

sci-physics/herwig++: version bump (2.7.0), c++0x USE added

---
 sci-physics/herwig++/ChangeLog             |  6 ++++
 sci-physics/herwig++/herwig++-2.7.0.ebuild | 51 ++++++++++++++++++++++++++++++
 sci-physics/herwig++/metadata.xml          |  2 ++
 3 files changed, 59 insertions(+)

diff --git a/sci-physics/herwig++/ChangeLog b/sci-physics/herwig++/ChangeLog
index d539d32..83bafb0 100644
--- a/sci-physics/herwig++/ChangeLog
+++ b/sci-physics/herwig++/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*herwig++-2.7.0 (04 Nov 2013)
+
+  04 Nov 2013; Jauhien Piatlicki <piatlicki@gmail.com> +herwig++-2.7.0.ebuild,
+  metadata.xml:
+  Version bump, c++0x USE added
+
 *herwig++-2.6.3 (11 Mar 2013)
 
   11 Mar 2013; Jauhien Piatlicki (jauhien) <piatlicki@gmail.com>

diff --git a/sci-physics/herwig++/herwig++-2.7.0.ebuild b/sci-physics/herwig++/herwig++-2.7.0.ebuild
new file mode 100644
index 0000000..3e9054b
--- /dev/null
+++ b/sci-physics/herwig++/herwig++-2.7.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2013 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
+}

diff --git a/sci-physics/herwig++/metadata.xml b/sci-physics/herwig++/metadata.xml
index c41e386..e8ade11 100644
--- a/sci-physics/herwig++/metadata.xml
+++ b/sci-physics/herwig++/metadata.xml
@@ -13,6 +13,8 @@
   ordered parton evolution and the cluster hadronization model).
 </longdescription>
 <use>
+  <flag name='c++0x'>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>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/herwig++/
@ 2013-11-10 12:39 Justin Lecher
  0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher @ 2013-11-10 12:39 UTC (permalink / raw
  To: gentoo-commits

commit:     0743100c5cda739e7d4121ce1892c4a22801364e
Author:     Jauhien Piatlicki (jauhien) <piatlicki <AT> gmail <DOT> com>
AuthorDate: Sat Nov  9 12:58:46 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 12:58:46 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0743100c

sci-physics/herwig++: fix dependency on sci-physics/thepeg

---
 sci-physics/herwig++/herwig++-2.7.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-physics/herwig++/herwig++-2.7.0.ebuild b/sci-physics/herwig++/herwig++-2.7.0.ebuild
index 3e9054b..eb9de50 100644
--- a/sci-physics/herwig++/herwig++-2.7.0.ebuild
+++ b/sci-physics/herwig++/herwig++-2.7.0.ebuild
@@ -23,7 +23,7 @@ DEPEND="dev-libs/boost
 	sci-libs/gsl
 	sci-physics/LoopTools
 	dev-lang/perl
-	=sci-physics/thepeg-1.9.0
+	=sci-physics/thepeg-1.9.0*
 	fastjet? ( sci-physics/fastjet )"
 RDEPEND="${DEPEND}"
 


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/herwig++/
@ 2014-05-07 23:19 Sebastien Fabbro
  0 siblings, 0 replies; 7+ messages in thread
From: Sebastien Fabbro @ 2014-05-07 23:19 UTC (permalink / raw
  To: gentoo-commits

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 <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++/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
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/herwig++/
@ 2014-08-31 10:54 Jauhien Piatlicki
  0 siblings, 0 replies; 7+ messages in thread
From: Jauhien Piatlicki @ 2014-08-31 10:54 UTC (permalink / raw
  To: gentoo-commits

commit:     3b1cd4fa57847b1ee1e14f0124ec9d6fd1f2df53
Author:     Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 31 10:51:34 2014 +0000
Commit:     Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
CommitDate: Sun Aug 31 10:51:34 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3b1cd4fa

sci-physics/herwig++: fix dependency on sci-physics/looptools

---
 sci-physics/herwig++/ChangeLog                | 3 +++
 sci-physics/herwig++/herwig++-2.7.0-r1.ebuild | 2 +-
 sci-physics/herwig++/metadata.xml             | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sci-physics/herwig++/ChangeLog b/sci-physics/herwig++/ChangeLog
index c38c984..3173f38 100644
--- a/sci-physics/herwig++/ChangeLog
+++ b/sci-physics/herwig++/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  31 Aug 2014; Jauhien Piatlicki <jauhien@gentoo.org> herwig++-2.7.0-r1.ebuild:
+  fix dependency on sci-physics/looptools
+
 *herwig++-2.7.0-r1 (07 May 2014)
 
   07 May 2014; Sébastien Fabbro <bicatali@gentoo.org> +herwig++-2.7.0-r1.ebuild,

diff --git a/sci-physics/herwig++/herwig++-2.7.0-r1.ebuild b/sci-physics/herwig++/herwig++-2.7.0-r1.ebuild
index 330652e..39408ed 100644
--- a/sci-physics/herwig++/herwig++-2.7.0-r1.ebuild
+++ b/sci-physics/herwig++/herwig++-2.7.0-r1.ebuild
@@ -24,7 +24,7 @@ IUSE="c++0x fastjet static-libs"
 RDEPEND="
 	dev-libs/boost:0=
 	sci-libs/gsl:0=
-	sci-physics/looptools:0=
+	<=sci-physics/looptools-2.8:0=
 	>=sci-physics/thepeg-1.9.1:0=
 	fastjet? ( sci-physics/fastjet:0= )"
 DEPEND="${RDEPEND}

diff --git a/sci-physics/herwig++/metadata.xml b/sci-physics/herwig++/metadata.xml
index e8ade11..ce1ef84 100644
--- a/sci-physics/herwig++/metadata.xml
+++ b/sci-physics/herwig++/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>sci-physics</herd>
 <maintainer>
-  <email>piatlicki@gmail.com</email>
+  <email>jauhien@gentoo.org</email>
 </maintainer>
 <longdescription>
   Herwig++ is a completely new event generator, written in C++.


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/herwig++/
@ 2014-08-31 17:11 Jauhien Piatlicki
  0 siblings, 0 replies; 7+ messages in thread
From: Jauhien Piatlicki @ 2014-08-31 17:11 UTC (permalink / raw
  To: gentoo-commits

commit:     8ec4a589ed1eab521b3b6a5f77d638e707db38d4
Author:     Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 31 17:09:47 2014 +0000
Commit:     Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
CommitDate: Sun Aug 31 17:09:47 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8ec4a589

sci-physics/herwig++: version bump

---
 sci-physics/herwig++/ChangeLog             |  5 +++
 sci-physics/herwig++/herwig++-2.7.1.ebuild | 57 ++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)

diff --git a/sci-physics/herwig++/ChangeLog b/sci-physics/herwig++/ChangeLog
index 3173f38..52bed34 100644
--- a/sci-physics/herwig++/ChangeLog
+++ b/sci-physics/herwig++/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*herwig++-2.7.1 (31 Aug 2014)
+
+  31 Aug 2014; Jauhien Piatlicki <jauhien@gentoo.org> +herwig++-2.7.1.ebuild:
+  version bump
+
   31 Aug 2014; Jauhien Piatlicki <jauhien@gentoo.org> herwig++-2.7.0-r1.ebuild:
   fix dependency on sci-physics/looptools
 

diff --git a/sci-physics/herwig++/herwig++-2.7.1.ebuild b/sci-physics/herwig++/herwig++-2.7.1.ebuild
new file mode 100644
index 0000000..1a48d65
--- /dev/null
+++ b/sci-physics/herwig++/herwig++-2.7.1.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/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
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-physics/herwig++/
@ 2015-08-30 18:11 Jauhien Piatlicki
  0 siblings, 0 replies; 7+ messages in thread
From: Jauhien Piatlicki @ 2015-08-30 18:11 UTC (permalink / raw
  To: gentoo-commits

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@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++/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>


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2015-08-30 18:11 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-31 17:11 [gentoo-commits] proj/sci:master commit in: sci-physics/herwig++/ Jauhien Piatlicki
  -- strict thread matches above, loose matches on Subject: below --
2015-08-30 18:11 Jauhien Piatlicki
2014-08-31 10:54 Jauhien Piatlicki
2014-05-07 23:19 Sebastien Fabbro
2013-11-10 12:39 Justin Lecher
2013-11-07 20:05 Alexey Shvetsov
2012-10-15  4:35 Guillaume Horel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox