public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: sci-physics/thepeg/
@ 2012-09-10  8:16 Kacper Kowalik
  0 siblings, 0 replies; 9+ messages in thread
From: Kacper Kowalik @ 2012-09-10  8:16 UTC (permalink / raw
  To: gentoo-commits

commit:     8d66d3e662bb8253af2fbe73570fc96f8395c15a
Author:     Jauhien Piatlicki (jauhien) <piatlicki <AT> gmail <DOT> com>
AuthorDate: Sat Sep  8 13:14:07 2012 +0000
Commit:     Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
CommitDate: Sat Sep  8 13:14:07 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8d66d3e6

sci-physics/thepeg: DEPEND fixed

---
 sci-physics/thepeg/thepeg-1.8.0.ebuild |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/sci-physics/thepeg/thepeg-1.8.0.ebuild b/sci-physics/thepeg/thepeg-1.8.0.ebuild
index 1698260..abddbcd 100644
--- a/sci-physics/thepeg/thepeg-1.8.0.ebuild
+++ b/sci-physics/thepeg/thepeg-1.8.0.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE="emacs hepmc java lhapdf test zlib"
 
-DEPEND="sci-libs/gsl
+RDEPEND="sci-libs/gsl
 	dev-lang/perl
 	emacs? ( virtual/emacs )
 	hepmc? ( sci-physics/hepmc )
@@ -30,8 +30,7 @@ DEPEND="sci-libs/gsl
 	lhapdf? ( sci-physics/lhapdf )
 	zlib? ( sys-libs/zlib )
 "
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	test? ( sys-process/time )"
 
 S="${WORKDIR}/${MYP}"


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

* [gentoo-commits] proj/sci:master commit in: sci-physics/thepeg/
@ 2012-09-10  8:16 Kacper Kowalik
  0 siblings, 0 replies; 9+ messages in thread
From: Kacper Kowalik @ 2012-09-10  8:16 UTC (permalink / raw
  To: gentoo-commits

commit:     9d59043a20daf97de12cbcb7d83a349fbb3b602f
Author:     Jauhien Piatlicki (jauhien) <piatlicki <AT> gmail <DOT> com>
AuthorDate: Sat Sep  8 13:25:46 2012 +0000
Commit:     Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
CommitDate: Sat Sep  8 13:25:46 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9d59043a

sci-physics/thepeg: maintainer email fixed

---
 sci-physics/thepeg/metadata.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sci-physics/thepeg/metadata.xml b/sci-physics/thepeg/metadata.xml
index ca863dd..1bffb2a 100644
--- a/sci-physics/thepeg/metadata.xml
+++ b/sci-physics/thepeg/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>sci</herd>
 <maintainer>
-  <email>maintainer-wanted@gentoo.org</email>
+  <email>piatlicki@gmail.com</email>
 </maintainer>
 <longdescription>
   Toolkit for High Energy Physics Event Generation.


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

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

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

sci-physics/thepeg: version bump (1.9.0)

---
 sci-physics/thepeg/ChangeLog           |  5 ++
 sci-physics/thepeg/thepeg-1.9.0.ebuild | 92 ++++++++++++++++++++++++++++++++++
 2 files changed, 97 insertions(+)

diff --git a/sci-physics/thepeg/ChangeLog b/sci-physics/thepeg/ChangeLog
index 5eae5bc..723b533 100644
--- a/sci-physics/thepeg/ChangeLog
+++ b/sci-physics/thepeg/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*thepeg-1.9.0 (04 Nov 2013)
+
+  04 Nov 2013; Jauhien Piatlicki <piatlicki@gmail.com> +thepeg-1.9.0.ebuild:
+  Version bump
+
 *thepeg-1.8.3 (11 Mar 2013)
 
   11 Mar 2013; Jauhien Piatlicki (jauhien) <piatlicki@gmail.com>

diff --git a/sci-physics/thepeg/thepeg-1.9.0.ebuild b/sci-physics/thepeg/thepeg-1.9.0.ebuild
new file mode 100644
index 0000000..a9d8b3c
--- /dev/null
+++ b/sci-physics/thepeg/thepeg-1.9.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit autotools elisp-common eutils java-pkg-opt-2
+
+MYP=ThePEG-${PV}
+
+DESCRIPTION="Toolkit for High Energy Physics Event Generation"
+HOMEPAGE="http://home.thep.lu.se/ThePEG/"
+SRC_URI="http://www.hepforge.org/archive/thepeg/${MYP}.tar.bz2
+	test? ( hepmc? (
+	http://www.hepforge.org/archive/lhapdf/pdfsets/current/cteq6ll.LHpdf
+	http://www.hepforge.org/archive/lhapdf/pdfsets/current/cteq5l.LHgrid
+	http://www.hepforge.org/archive/lhapdf/pdfsets/current/GRV98nlo.LHgrid
+	http://www.hepforge.org/archive/lhapdf/pdfsets/current/MRST2001nlo.LHgrid ) )"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs hepmc java lhapdf test zlib"
+
+RDEPEND="sci-libs/gsl
+	dev-lang/perl
+	emacs? ( virtual/emacs )
+	hepmc? ( sci-physics/hepmc )
+	java? ( >=virtual/jre-1.5 )
+	lhapdf? ( sci-physics/lhapdf )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+	test? ( sys-process/time )"
+
+S="${WORKDIR}/${MYP}"
+
+pkg_setup() {
+	elog "There is an extra option on package Rivet not yet in Gentoo:"
+	elog "You can use the env variable EXTRA_ECONF variable for this:"
+	elog "EXTRA_ECONF=\"--with-rivet=DIR\""
+	elog "where DIR - location of Rivet installation"
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	find -name 'Makefile.am' -exec sed -i '1ipkgdatadir=$(datadir)/thepeg' {} \; \
+		|| die "changing pkgdatadir name failed"
+	sed -i '/dist_pkgdata_DATA = ThePEG.el/d' lib/Makefile.am \
+		|| die "preventing install ThePEG.el in pkgdatadir failed"
+	epatch "${FILESDIR}"/${PN}-1.8.3-java.patch
+	eautoreconf
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	econf \
+		--disable-silent-rules \
+		$(use_with hepmc hepmc "${EPREFIX}"/usr) \
+		$(use_with java javagui) \
+		$(use_with lhapdf LHAPDF "${EPREFIX}"/usr) \
+		$(use_with zlib zlib "${EPREFIX}"/usr)
+}
+
+src_compile() {
+	emake
+	if use emacs; then
+		elisp-compile lib/ThePEG.el || die
+	fi
+}
+
+src_test() {
+	emake LHAPATH="${DISTDIR}" check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	if use emacs; then
+		elisp-install ${PN} lib/ThePEG.el lib/ThePEG.elc || die
+	fi
+	use java && java-pkg_newjar java/ThePEG.jar
+}
+
+pkg_postinst() {
+	if use emacs; then
+		elog "To use installed elisp file you should add"
+		elog "(add-to-list 'load-path \"${SITELISP}/${PN}\")"
+		elog "(load \"ThePEG\")"
+		elog "to your .emacs file"
+	fi
+}


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

* [gentoo-commits] proj/sci:master commit in: sci-physics/thepeg/
@ 2013-11-09  8:55 Justin Lecher
  0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2013-11-09  8:55 UTC (permalink / raw
  To: gentoo-commits

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

sci-physics/thepeg: USE flags fixed for ver. 1.9.0

---
 sci-physics/thepeg/ChangeLog                                       | 6 ++++++
 sci-physics/thepeg/metadata.xml                                    | 1 +
 sci-physics/thepeg/{thepeg-1.9.0.ebuild => thepeg-1.9.0-r1.ebuild} | 6 ++++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/sci-physics/thepeg/ChangeLog b/sci-physics/thepeg/ChangeLog
index 723b533..5914b9e 100644
--- a/sci-physics/thepeg/ChangeLog
+++ b/sci-physics/thepeg/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*thepeg-1.9.0-r1 (09 Nov 2013)
+
+  09 Nov 2013; Jauhien Piatlicki (jauhien) <piatlicki@gmail.com>
+  -thepeg-1.9.0.ebuild, +thepeg-1.9.0-r1.ebuild, metadata.xml:
+  USEs fixed: fastjet USE added, lhapdf USE fixed
+
 *thepeg-1.9.0 (04 Nov 2013)
 
   04 Nov 2013; Jauhien Piatlicki <piatlicki@gmail.com> +thepeg-1.9.0.ebuild:

diff --git a/sci-physics/thepeg/metadata.xml b/sci-physics/thepeg/metadata.xml
index e41238c..8fe6a10 100644
--- a/sci-physics/thepeg/metadata.xml
+++ b/sci-physics/thepeg/metadata.xml
@@ -13,6 +13,7 @@
   of the toolkit and which can be used by any event generator model.
 </longdescription>
 <use>
+  <flag name='fastjet'>Adds support for <pkg>sci-physics/fastjet</pkg></flag>
   <flag name='hepmc'>Adds support for High Energy Physics Monte Carlo
 	  Generators <pkg>sci-physics/hepmc</pkg></flag>
   <flag name='lhapdf'>Adds support for <pkg>sci-physics/lhapdf</pkg></flag>

diff --git a/sci-physics/thepeg/thepeg-1.9.0.ebuild b/sci-physics/thepeg/thepeg-1.9.0-r1.ebuild
similarity index 92%
rename from sci-physics/thepeg/thepeg-1.9.0.ebuild
rename to sci-physics/thepeg/thepeg-1.9.0-r1.ebuild
index a9d8b3c..d65e8df 100644
--- a/sci-physics/thepeg/thepeg-1.9.0.ebuild
+++ b/sci-physics/thepeg/thepeg-1.9.0-r1.ebuild
@@ -20,11 +20,12 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="emacs hepmc java lhapdf test zlib"
+IUSE="emacs fastjet hepmc java lhapdf test zlib"
 
 RDEPEND="sci-libs/gsl
 	dev-lang/perl
 	emacs? ( virtual/emacs )
+	fastjet? ( sci-physics/fastjet )
 	hepmc? ( sci-physics/hepmc )
 	java? ( >=virtual/jre-1.5 )
 	lhapdf? ( sci-physics/lhapdf )
@@ -57,9 +58,10 @@ src_prepare() {
 src_configure() {
 	econf \
 		--disable-silent-rules \
+		$(use_with fastjet fastjet "${EPREFIX}"/usr) \
 		$(use_with hepmc hepmc "${EPREFIX}"/usr) \
 		$(use_with java javagui) \
-		$(use_with lhapdf LHAPDF "${EPREFIX}"/usr) \
+		$(use_with lhapdf lhapdf "${EPREFIX}"/usr) \
 		$(use_with zlib zlib "${EPREFIX}"/usr)
 }
 


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

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

commit:     466d3cb19a801a16712329aaeaaddf0a80c35f7b
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Tue May  6 21:57:06 2014 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue May  6 21:57:06 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=466d3cb1

sci-physics/thepeg: Version bump

Package-Manager: portage-2.2.8-prefix

---
 sci-physics/thepeg/ChangeLog           |  8 +++-
 sci-physics/thepeg/thepeg-1.9.1.ebuild | 87 ++++++++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+), 2 deletions(-)

diff --git a/sci-physics/thepeg/ChangeLog b/sci-physics/thepeg/ChangeLog
index 5914b9e..57d3fad 100644
--- a/sci-physics/thepeg/ChangeLog
+++ b/sci-physics/thepeg/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for sci-physics/thepeg
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*thepeg-1.9.1 (06 May 2014)
+
+  06 May 2014; Sébastien Fabbro <bicatali@gentoo.org> +thepeg-1.9.1.ebuild:
+  sci-physics/thepeg: Version bump
+
 *thepeg-1.9.0-r1 (09 Nov 2013)
 
   09 Nov 2013; Jauhien Piatlicki (jauhien) <piatlicki@gmail.com>
@@ -39,4 +44,3 @@
   07 Sep 2012; Jauhien Piatlicki (jauhien) <piatlicki@gmail.com>
   +thepeg-1.8.0.ebuild, +files/thepeg-1.8.0-java.patch, +metadata.xml:
   New Ebuild for bug #424003 thanks to hasufell, mgorny and xarthisius.
-

diff --git a/sci-physics/thepeg/thepeg-1.9.1.ebuild b/sci-physics/thepeg/thepeg-1.9.1.ebuild
new file mode 100644
index 0000000..e70b39f
--- /dev/null
+++ b/sci-physics/thepeg/thepeg-1.9.1.ebuild
@@ -0,0 +1,87 @@
+# 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 elisp-common eutils java-pkg-opt-2
+
+MYP=ThePEG-${PV}
+
+DESCRIPTION="Toolkit for High Energy Physics Event Generation"
+HOMEPAGE="http://home.thep.lu.se/ThePEG/"
+
+TEST_URI="http://www.hepforge.org/archive/lhapdf/pdfsets/current"
+SRC_URI="http://www.hepforge.org/archive/thepeg/${MYP}.tar.bz2
+	test? ( hepmc? (
+	   ${TEST_URI}/cteq6ll.LHpdf
+	   ${TEST_URI}/cteq5l.LHgrid
+	   ${TEST_URI}/GRV98nlo.LHgrid
+	   ${TEST_URI}/MRST2001nlo.LHgrid ) )"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="emacs fastjet hepmc java lhapdf rivet static-libs test zlib"
+
+RDEPEND="
+	sci-libs/gsl:0=
+	emacs? ( virtual/emacs )
+	fastjet? ( sci-physics/fastjet:0= )
+	hepmc? ( sci-physics/hepmc:0= )
+	java? ( >=virtual/jre-1.5 )
+	lhapdf? ( sci-physics/lhapdf:0= )
+	rivet? ( sci-physics/rivet:0= )
+	zlib? ( sys-libs/zlib:0= )"
+DEPEND="${RDEPEND}
+	test? ( sys-process/time )"
+
+S="${WORKDIR}/${MYP}"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.8.3-java.patch )
+
+src_prepare() {
+	find -name 'Makefile.am' -exec \
+		sed -i -e '1ipkgdatadir=$(datadir)/thepeg' {} \; || die
+	sed -i -e '/dist_pkgdata_DATA = ThePEG.el/d' lib/Makefile.am || die
+	autotools-utils_src_prepare
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with fastjet fastjet "${EPREFIX}"/usr)
+		$(use_with hepmc hepmc "${EPREFIX}"/usr)
+		$(use_with java javagui)
+		$(use_with lhapdf lhapdf "${EPREFIX}"/usr)
+		$(use_with rivet rivet "${EPREFIX}"/usr)
+		$(use_with zlib zlib "${EPREFIX}"/usr)
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+	use emacs && elisp-compile lib/ThePEG.el
+}
+
+src_test() {
+	emake LHAPATH="${DISTDIR}" -C "${BUILD_DIR}" check
+}
+
+src_install() {
+	autotools-utils_src_install
+	use emacs && elisp-install ${PN} lib/ThePEG.el{,c}
+	use java && java-pkg_newjar java/ThePEG.jar
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}


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

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

commit:     f73ae7dd317ffab84687e59e4458d8e42c4d9b66
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Tue May  6 23:11:14 2014 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue May  6 23:11:14 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f73ae7dd

sci-physics/thepeg: Properly link with c++

Package-Manager: portage-2.2.8-prefix

---
 sci-physics/thepeg/ChangeLog           | 3 +++
 sci-physics/thepeg/thepeg-1.9.1.ebuild | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/sci-physics/thepeg/ChangeLog b/sci-physics/thepeg/ChangeLog
index 57d3fad..bca9a07 100644
--- a/sci-physics/thepeg/ChangeLog
+++ b/sci-physics/thepeg/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 May 2014; Sébastien Fabbro <bicatali@gentoo.org> thepeg-1.9.1.ebuild:
+  sci-physics/thepeg: Properly link with c++
+
 *thepeg-1.9.1 (06 May 2014)
 
   06 May 2014; Sébastien Fabbro <bicatali@gentoo.org> +thepeg-1.9.1.ebuild:

diff --git a/sci-physics/thepeg/thepeg-1.9.1.ebuild b/sci-physics/thepeg/thepeg-1.9.1.ebuild
index e70b39f..6ecdb8a 100644
--- a/sci-physics/thepeg/thepeg-1.9.1.ebuild
+++ b/sci-physics/thepeg/thepeg-1.9.1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="http://www.hepforge.org/archive/thepeg/${MYP}.tar.bz2
 	   ${TEST_URI}/MRST2001nlo.LHgrid ) )"
 LICENSE="GPL-2"
 
-SLOT="0"
+SLOT="0/18"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="emacs fastjet hepmc java lhapdf rivet static-libs test zlib"
 
@@ -46,7 +46,11 @@ PATCHES=( "${FILESDIR}"/${PN}-1.8.3-java.patch )
 src_prepare() {
 	find -name 'Makefile.am' -exec \
 		sed -i -e '1ipkgdatadir=$(datadir)/thepeg' {} \; || die
-	sed -i -e '/dist_pkgdata_DATA = ThePEG.el/d' lib/Makefile.am || die
+	# trick to force c++ linking
+	sed -i \
+		-e '1inodist_EXTRA_libThePEG_la_SOURCES = dummy.cxx' \
+		-e '/dist_pkgdata_DATA = ThePEG.el/d' \
+		lib/Makefile.am || die
 	autotools-utils_src_prepare
 	java-pkg-opt-2_src_prepare
 }


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

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

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

sci-physics/thepeg: add libraries to LD_LIBRARY_PATH, add rivet USE description

---
 sci-physics/thepeg/ChangeLog                                     | 9 +++++++++
 sci-physics/thepeg/metadata.xml                                  | 3 ++-
 .../thepeg/{thepeg-1.8.3.ebuild => thepeg-1.8.3-r1.ebuild}       | 5 +++++
 .../thepeg/{thepeg-1.9.0-r1.ebuild => thepeg-1.9.0-r2.ebuild}    | 5 +++++
 .../thepeg/{thepeg-1.9.1.ebuild => thepeg-1.9.1-r1.ebuild}       | 5 +++++
 5 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/sci-physics/thepeg/ChangeLog b/sci-physics/thepeg/ChangeLog
index bca9a07..e530492 100644
--- a/sci-physics/thepeg/ChangeLog
+++ b/sci-physics/thepeg/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*thepeg-1.9.1-r1 (31 Aug 2014)
+*thepeg-1.9.0-r2 (31 Aug 2014)
+*thepeg-1.8.3-r1 (31 Aug 2014)
+
+  31 Aug 2014; Jauhien Piatlicki <jauhien@gentoo.org> -thepeg-1.8.3.ebuild,
+  +thepeg-1.8.3-r1.ebuild, -thepeg-1.9.0-r1.ebuild, +thepeg-1.9.0-r2.ebuild,
+  -thepeg-1.9.1.ebuild, +thepeg-1.9.1-r1.ebuild, metadata.xml:
+  Add libraries to LD_LIBRARY_PATH, add rivet USE description
+
   06 May 2014; Sébastien Fabbro <bicatali@gentoo.org> thepeg-1.9.1.ebuild:
   sci-physics/thepeg: Properly link with c++
 

diff --git a/sci-physics/thepeg/metadata.xml b/sci-physics/thepeg/metadata.xml
index 8fe6a10..12f7bfb 100644
--- a/sci-physics/thepeg/metadata.xml
+++ b/sci-physics/thepeg/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>sci-physics</herd>
 <maintainer>
-  <email>piatlicki@gmail.com</email>
+  <email>jauhien@gentoo.org</email>
 </maintainer>
 <longdescription>
   Toolkit for High Energy Physics Event Generation.
@@ -17,5 +17,6 @@
   <flag name='hepmc'>Adds support for High Energy Physics Monte Carlo
 	  Generators <pkg>sci-physics/hepmc</pkg></flag>
   <flag name='lhapdf'>Adds support for <pkg>sci-physics/lhapdf</pkg></flag>
+  <flag name='rivet'>Adds support for <pkg>sci-physics/rivet</pkg></flag>
 </use>
 </pkgmetadata>

diff --git a/sci-physics/thepeg/thepeg-1.8.3.ebuild b/sci-physics/thepeg/thepeg-1.8.3-r1.ebuild
similarity index 95%
rename from sci-physics/thepeg/thepeg-1.8.3.ebuild
rename to sci-physics/thepeg/thepeg-1.8.3-r1.ebuild
index 495506e..4f0ccd8 100644
--- a/sci-physics/thepeg/thepeg-1.8.3.ebuild
+++ b/sci-physics/thepeg/thepeg-1.8.3-r1.ebuild
@@ -80,6 +80,11 @@ src_install() {
 		elisp-install ${PN} lib/ThePEG.el lib/ThePEG.elc || die
 	fi
 	use java && java-pkg_newjar java/ThePEG.jar
+
+	cat <<-EOF > "${T}"/50${PN}
+	LDPATH="${EPREFIX}/usr/$(get_libdir)/ThePEG"
+	EOF
+	doenvd "${T}"/50${PN}
 }
 
 pkg_postinst() {

diff --git a/sci-physics/thepeg/thepeg-1.9.0-r1.ebuild b/sci-physics/thepeg/thepeg-1.9.0-r2.ebuild
similarity index 95%
rename from sci-physics/thepeg/thepeg-1.9.0-r1.ebuild
rename to sci-physics/thepeg/thepeg-1.9.0-r2.ebuild
index 9657686..e0c37fd 100644
--- a/sci-physics/thepeg/thepeg-1.9.0-r1.ebuild
+++ b/sci-physics/thepeg/thepeg-1.9.0-r2.ebuild
@@ -82,6 +82,11 @@ src_install() {
 		elisp-install ${PN} lib/ThePEG.el lib/ThePEG.elc || die
 	fi
 	use java && java-pkg_newjar java/ThePEG.jar
+
+	cat <<-EOF > "${T}"/50${PN}
+	LDPATH="${EPREFIX}/usr/$(get_libdir)/ThePEG"
+	EOF
+	doenvd "${T}"/50${PN}
 }
 
 pkg_postinst() {

diff --git a/sci-physics/thepeg/thepeg-1.9.1.ebuild b/sci-physics/thepeg/thepeg-1.9.1-r1.ebuild
similarity index 95%
rename from sci-physics/thepeg/thepeg-1.9.1.ebuild
rename to sci-physics/thepeg/thepeg-1.9.1-r1.ebuild
index 6ecdb8a..d59bd2f 100644
--- a/sci-physics/thepeg/thepeg-1.9.1.ebuild
+++ b/sci-physics/thepeg/thepeg-1.9.1-r1.ebuild
@@ -80,6 +80,11 @@ src_install() {
 	autotools-utils_src_install
 	use emacs && elisp-install ${PN} lib/ThePEG.el{,c}
 	use java && java-pkg_newjar java/ThePEG.jar
+
+	cat <<-EOF > "${T}"/50${PN}
+	LDPATH="${EPREFIX}/usr/$(get_libdir)/ThePEG"
+	EOF
+	doenvd "${T}"/50${PN}
 }
 
 pkg_postinst() {


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

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

commit:     7a5190f2fa5e7708690504904117de0f82fdb7a1
Author:     Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 31 15:59:09 2014 +0000
Commit:     Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
CommitDate: Sun Aug 31 15:59:09 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7a5190f2

sci-physics/thepeg: version bump

---
 sci-physics/thepeg/ChangeLog           |  6 +++
 sci-physics/thepeg/metadata.xml        |  2 +
 sci-physics/thepeg/thepeg-1.9.2.ebuild | 97 ++++++++++++++++++++++++++++++++++
 3 files changed, 105 insertions(+)

diff --git a/sci-physics/thepeg/ChangeLog b/sci-physics/thepeg/ChangeLog
index e530492..212a043 100644
--- a/sci-physics/thepeg/ChangeLog
+++ b/sci-physics/thepeg/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*thepeg-1.9.2 (31 Aug 2014)
+
+  31 Aug 2014; Jauhien Piatlicki <jauhien@gentoo.org> +thepeg-1.9.2.ebuild,
+  metadata.xml:
+  version bump
+
 *thepeg-1.9.1-r1 (31 Aug 2014)
 *thepeg-1.9.0-r2 (31 Aug 2014)
 *thepeg-1.8.3-r1 (31 Aug 2014)

diff --git a/sci-physics/thepeg/metadata.xml b/sci-physics/thepeg/metadata.xml
index 12f7bfb..c1dafb3 100644
--- a/sci-physics/thepeg/metadata.xml
+++ b/sci-physics/thepeg/metadata.xml
@@ -13,6 +13,8 @@
   of the toolkit and which can be used by any event generator model.
 </longdescription>
 <use>
+  <flag name='c++0x'>Build ThePEG using the C++11 standard.
+  Experimental feature, not for production use.</flag>
   <flag name='fastjet'>Adds support for <pkg>sci-physics/fastjet</pkg></flag>
   <flag name='hepmc'>Adds support for High Energy Physics Monte Carlo
 	  Generators <pkg>sci-physics/hepmc</pkg></flag>

diff --git a/sci-physics/thepeg/thepeg-1.9.2.ebuild b/sci-physics/thepeg/thepeg-1.9.2.ebuild
new file mode 100644
index 0000000..3807b4d
--- /dev/null
+++ b/sci-physics/thepeg/thepeg-1.9.2.ebuild
@@ -0,0 +1,97 @@
+# 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 elisp-common eutils java-pkg-opt-2
+
+MYP=ThePEG-${PV}
+
+DESCRIPTION="Toolkit for High Energy Physics Event Generation"
+HOMEPAGE="http://home.thep.lu.se/ThePEG/"
+
+TEST_URI="http://www.hepforge.org/archive/lhapdf/pdfsets/current"
+SRC_URI="http://www.hepforge.org/archive/thepeg/${MYP}.tar.bz2
+	test? ( hepmc? (
+	   ${TEST_URI}/cteq6ll.LHpdf
+	   ${TEST_URI}/cteq5l.LHgrid
+	   ${TEST_URI}/GRV98nlo.LHgrid
+	   ${TEST_URI}/MRST2001nlo.LHgrid ) )"
+LICENSE="GPL-2"
+
+SLOT="0/18"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="c++0x emacs fastjet hepmc java lhapdf rivet static-libs test zlib"
+
+RDEPEND="
+	sci-libs/gsl:0=
+	emacs? ( virtual/emacs )
+	fastjet? ( sci-physics/fastjet:0= )
+	hepmc? ( sci-physics/hepmc:0= )
+	java? ( >=virtual/jre-1.5 )
+	lhapdf? ( sci-physics/lhapdf:0= )
+	rivet? ( sci-physics/rivet:0= )
+	zlib? ( sys-libs/zlib:0= )"
+DEPEND="${RDEPEND}
+	test? ( sys-process/time )"
+
+S="${WORKDIR}/${MYP}"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.8.3-java.patch )
+
+src_prepare() {
+	find -name 'Makefile.am' -exec \
+		sed -i -e '1ipkgdatadir=$(datadir)/thepeg' {} \; || die
+	# trick to force c++ linking
+	sed -i \
+		-e '1inodist_EXTRA_libThePEG_la_SOURCES = dummy.cxx' \
+		-e '/dist_pkgdata_DATA = ThePEG.el/d' \
+		lib/Makefile.am || die
+	autotools-utils_src_prepare
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable c++0x stdcxx11)
+		$(use_with fastjet fastjet "${EPREFIX}"/usr)
+		$(use_with hepmc hepmc "${EPREFIX}"/usr)
+		$(use_with java javagui)
+		$(use_with lhapdf lhapdf "${EPREFIX}"/usr)
+		$(use_with rivet rivet "${EPREFIX}"/usr)
+		$(use_with zlib zlib "${EPREFIX}"/usr)
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+	use emacs && elisp-compile lib/ThePEG.el
+}
+
+src_test() {
+	emake LHAPATH="${DISTDIR}" -C "${BUILD_DIR}" check
+}
+
+src_install() {
+	autotools-utils_src_install
+	use emacs && elisp-install ${PN} lib/ThePEG.el{,c}
+	use java && java-pkg_newjar java/ThePEG.jar
+
+	cat <<-EOF > "${T}"/50${PN}
+	LDPATH="${EPREFIX}/usr/$(get_libdir)/ThePEG"
+	EOF
+	doenvd "${T}"/50${PN}
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}


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

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

commit:     c25ca61f656cb6ad6b5a795a67f7324b22604ebd
Author:     Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 17:51:10 2015 +0000
Commit:     Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 17:51:10 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=c25ca61f

sci-physics/thepeg: remove version imported to the tree

Package-Manager: portage-2.2.20.1

 sci-physics/thepeg/ChangeLog           |  6 ++-
 sci-physics/thepeg/metadata.xml        |  2 -
 sci-physics/thepeg/thepeg-1.9.2.ebuild | 97 ----------------------------------
 3 files changed, 5 insertions(+), 100 deletions(-)

diff --git a/sci-physics/thepeg/ChangeLog b/sci-physics/thepeg/ChangeLog
index a187d89..70568d7 100644
--- a/sci-physics/thepeg/ChangeLog
+++ b/sci-physics/thepeg/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-physics/thepeg
-# 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> -thepeg-1.9.2.ebuild,
+  metadata.xml:
+  remove version imported to the tree
+
 *thepeg-1.9.2 (31 Aug 2014)
 
   31 Aug 2014; Jauhien Piatlicki <jauhien@gentoo.org> +thepeg-1.9.2.ebuild,

diff --git a/sci-physics/thepeg/metadata.xml b/sci-physics/thepeg/metadata.xml
index c1dafb3..12f7bfb 100644
--- a/sci-physics/thepeg/metadata.xml
+++ b/sci-physics/thepeg/metadata.xml
@@ -13,8 +13,6 @@
   of the toolkit and which can be used by any event generator model.
 </longdescription>
 <use>
-  <flag name='c++0x'>Build ThePEG using the C++11 standard.
-  Experimental feature, not for production use.</flag>
   <flag name='fastjet'>Adds support for <pkg>sci-physics/fastjet</pkg></flag>
   <flag name='hepmc'>Adds support for High Energy Physics Monte Carlo
 	  Generators <pkg>sci-physics/hepmc</pkg></flag>

diff --git a/sci-physics/thepeg/thepeg-1.9.2.ebuild b/sci-physics/thepeg/thepeg-1.9.2.ebuild
deleted file mode 100644
index 149f15f..0000000
--- a/sci-physics/thepeg/thepeg-1.9.2.ebuild
+++ /dev/null
@@ -1,97 +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 elisp-common eutils java-pkg-opt-2
-
-MYP=ThePEG-${PV}
-
-DESCRIPTION="Toolkit for High Energy Physics Event Generation"
-HOMEPAGE="http://home.thep.lu.se/ThePEG/"
-
-TEST_URI="http://www.hepforge.org/archive/lhapdf/pdfsets/current"
-SRC_URI="http://www.hepforge.org/archive/thepeg/${MYP}.tar.bz2
-	test? ( hepmc? (
-	   ${TEST_URI}/cteq6ll.LHpdf
-	   ${TEST_URI}/cteq5l.LHgrid
-	   ${TEST_URI}/GRV98nlo.LHgrid
-	   ${TEST_URI}/MRST2001nlo.LHgrid ) )"
-LICENSE="GPL-2"
-
-SLOT="0/18"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="c++0x emacs fastjet hepmc java lhapdf rivet static-libs test zlib"
-
-RDEPEND="
-	sci-libs/gsl:0=
-	emacs? ( virtual/emacs )
-	fastjet? ( sci-physics/fastjet:0= )
-	hepmc? ( sci-physics/hepmc:0= )
-	java? ( >=virtual/jre-1.5 )
-	lhapdf? ( sci-physics/lhapdf:0= )
-	rivet? ( sci-physics/rivet:0= )
-	zlib? ( sys-libs/zlib:0= )"
-DEPEND="${RDEPEND}
-	test? ( sys-process/time )"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.8.3-java.patch )
-
-src_prepare() {
-	find -name 'Makefile.am' -exec \
-		sed -i -e '1ipkgdatadir=$(datadir)/thepeg' {} \; || die
-	# trick to force c++ linking
-	sed -i \
-		-e '1inodist_EXTRA_libThePEG_la_SOURCES = dummy.cxx' \
-		-e '/dist_pkgdata_DATA = ThePEG.el/d' \
-		lib/Makefile.am || die
-	autotools-utils_src_prepare
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable c++0x stdcxx11)
-		$(use_with fastjet fastjet "${EPREFIX}"/usr)
-		$(use_with hepmc hepmc "${EPREFIX}"/usr)
-		$(use_with java javagui)
-		$(use_with lhapdf lhapdf "${EPREFIX}"/usr)
-		$(use_with rivet rivet "${EPREFIX}"/usr)
-		$(use_with zlib zlib "${EPREFIX}"/usr)
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	use emacs && elisp-compile lib/ThePEG.el
-}
-
-src_test() {
-	emake LHAPATH="${DISTDIR}" -C "${BUILD_DIR}" check
-}
-
-src_install() {
-	autotools-utils_src_install
-	use emacs && elisp-install ${PN} lib/ThePEG.el{,c}
-	use java && java-pkg_newjar java/ThePEG.jar
-
-	cat <<-EOF > "${T}"/50${PN}
-	LDPATH="${EPREFIX}/usr/$(get_libdir)/ThePEG"
-	EOF
-	doenvd "${T}"/50${PN}
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}


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

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

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-10  8:16 [gentoo-commits] proj/sci:master commit in: sci-physics/thepeg/ Kacper Kowalik
  -- strict thread matches above, loose matches on Subject: below --
2015-08-30 18:11 Jauhien Piatlicki
2014-08-31 17:11 Jauhien Piatlicki
2014-08-31 10:54 Jauhien Piatlicki
2014-05-07 23:19 Sebastien Fabbro
2014-05-07 23:19 Sebastien Fabbro
2013-11-09  8:55 Justin Lecher
2013-11-07 20:05 Alexey Shvetsov
2012-09-10  8:16 Kacper Kowalik

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