commit: ebc5436f2fed2c5184d9242f9dae6ab64c56e689
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 29 16:23:56 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 30 21:28:30 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebc5436f
sci-physics/thepeg: drop 2.2.2-r2
It was blocking sci-physics/hepmc:2 cleanup.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-physics/thepeg/Manifest | 1 -
sci-physics/thepeg/files/thepeg-1.8.3-java.patch | 69 ---------------
sci-physics/thepeg/metadata.xml | 1 -
sci-physics/thepeg/thepeg-2.2.2-r2.ebuild | 107 -----------------------
4 files changed, 178 deletions(-)
diff --git a/sci-physics/thepeg/Manifest b/sci-physics/thepeg/Manifest
index 96864cdd051c..6861fb9f0afe 100644
--- a/sci-physics/thepeg/Manifest
+++ b/sci-physics/thepeg/Manifest
@@ -1,6 +1,5 @@
DIST GRV98nlo.LHgrid 221908 BLAKE2B
01af851928bbcfae110f3f5bc2b7599f86c25adb54e979c19625cf44ce7b633639f4ab99e068f8ae5ce3d9e72289265101ec40882e4af4b4a62abb152644890d
SHA512
fce5226a6eb56c9cc970d2d2bb23c5a0cde3afbb1f463e3e062825c2379213100a2d149ff6b25d9726e80ee817f9ae74eafcc85b2b30419aa7f095847dbcd8b6
DIST MRST2001nlo.LHgrid 719692 BLAKE2B
67a58bcf19857a5cee3eeac29bd2aa236f63c96acbf69b944ed14a94422a986e1579549172a2444b109f5bcfe6fd2fea4acc148c78e2e4f7258a836891ba0648
SHA512
126461ec2358e61221445483074a804c915b94be4a4dfd0330a9cf71feff9a9b981c5594a9d2a1efd236122f44891dd25182649803dccb3b383d03e85e96f930
-DIST ThePEG-2.2.2.tar.bz2 1930050 BLAKE2B
a10e966ed090f148b991a6434a2d527353014c25f5a91c92c2ce5302e1c51030fe56c2387f409ea3fb804a8efd7f0039424bd98471f0accb22c3092714df0c31
SHA512
70fa179dc1712b27549d1949c6f144cb899c372ec46606ab6b7dbcbf348961562a0a3ed769bdd8f8b8d62c07859a67c5e646ab357a9cbdd0644e557670fe3a3e
DIST ThePEG-2.2.3.tar.bz2 1940925 BLAKE2B
f233a637df0018e35e95f1cfaa0f354ac0df594e259bc177108723991697699d25c66721c23d82e03c3d768a108e37c2abf8c2f9817e74c78c7470b37e263cf8
SHA512
143f9a4974e5aa44c8957edd1ac8c621ce298cec8d1aaef39bb7061448e730a90cdb453c9fbf43caa2cf8e5757910584d91a908520bb540ff8e4a67a22455bb4
DIST ThePEG-2.3.0.tar.bz2 1950464 BLAKE2B
ab35bfe6b520c64ce2d65deb1cc79262090256734f42152bdc4ae3e08bb1b2ab686a310d6959a47ad9e0c48fd382d760ccc257fd7e55d99ed06208feea0c8f75
SHA512
5792ea3533ce1aaead96eb8de79827d6e3a3314e4ace7e5dc9392f98ec1160bf5bf7e69e1fbd77040887f09517afdf3e6f0ef9472cf766c70e9f135253b22cdc
DIST cteq5l.LHgrid 134797 BLAKE2B
1e222631ff00979abf64e95ffa3133d29eacd819325fcdf9d4065a1ce85db5704f0a43c646f9a9a3ee7b1905603e9060fc279405435d412bf06ee14ba9121f32
SHA512
1ba41fd773104a933af6f37745dcb6f8422e1aece74ba2b1e15a5fb69fdaf694336c0ec1dc6fbc964d2cf3fe363d17ca0c01a6c2ba6def0afa4389cb4083f34b
diff --git a/sci-physics/thepeg/files/thepeg-1.8.3-java.patch
b/sci-physics/thepeg/files/thepeg-1.8.3-java.patch
deleted file mode 100644
index 0d9eb8601842..000000000000
--- a/sci-physics/thepeg/files/thepeg-1.8.3-java.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-
-We are changing the javac -soure value from 1.4 to 1.8 which is supported by
all
-Java versions presently available in ::gentoo.
-
-TODO: configure.ac
-Replace '1.8' with a variable to be set with $(java-pkg_get-source) in the
ebuild.
-
-TODO java/Makefile.am
-Replace fixed values in
- $(JAVAC) -source 1.8 -target 1.8 `for file in $(JAVASOURCES); do echo
ThePEG/$$file; done`
-with values from java-pkg_get-source and java-pkg_get-target
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -123,7 +123,7 @@ AC_ARG_WITH(javagui,
- [ --with-javagui Compile and install the java-based
GUI.])
-
- if test "x$with_javagui" != "xno"; then
-- THEPEG_HAS_JAVA([1.4], [], [with_javagui=no; AC_MSG_NOTICE([Java GUI
disabled])])
-+ THEPEG_HAS_JAVA([1.8], [], [with_javagui=no; AC_MSG_NOTICE([Java GUI
disabled])])
- fi
-
- AM_CONDITIONAL([JAVAGUI], [test "x$with_javagui" != "xno"])
---- a/java/Makefile.am
-+++ b/java/Makefile.am
-@@ -11,8 +12,7 @@ JAVASOURCES = SetupThePEG.java ObjectFrame.java \
-
- CLEANFILES = ThePEG.jar thepeg.sh
-
--jardir = $(pkglibdir)
--nodist_jar_DATA = ThePEG.jar
-+noinst_DATA = ThePEG.jar
-
- dist_noinst_DATA = $(JAVASOURCES) jar-manifest
-
-@@ -27,14 +27,14 @@ clean-local:
- ThePEG:
- mkdir -p ThePEG
- for file in $(JAVASOURCES) jar-manifest; do \
-- cd ThePEG; $(LN_S) ../$(srcdir)/$$file $$file; cd ..; done
-+ cd ThePEG; cp ../$(srcdir)/$$file $$file; cd ..; done
-
- ThePEG.jar: ThePEG $(JAVASOURCES)
-- $(JAVAC) `for file in $(JAVASOURCES); do echo ThePEG/$$file; done`
-+ $(JAVAC) -source 1.8 -target 1.8 `for file in $(JAVASOURCES); do echo
ThePEG/$$file; done`
- $(JAR) cmf ThePEG/jar-manifest ThePEG.jar ThePEG/*.class
-
- thepeg.sh: thepeg.install Makefile
-- sed -e s:@pkglibdir[@]:$(pkglibdir):g \
-+ sed -e s:@datadir[@]:$(datadir):g \
- -e s:@bindir[@]:$(bindir):g \
- -e s:@java[@]:$(JAVA):g $(srcdir)/thepeg.install > thepeg.sh
- chmod +x thepeg.sh
---- a/java/thepeg.install
-+++ b/java/thepeg.install
-@@ -1,6 +1,6 @@
- #!/bin/sh
-
--pkglibdir=@pkglibdir@
-+source @datadir@/thepeg/package.env
- bindir=@bindir@
-
- ThePEG_CMD="${bindir}/setupThePEG"
-@@ -19,4 +19,4 @@
-
-
-
--exec @java@ ${HEADLESS} -jar ${pkglibdir}/ThePEG.jar ${ThePEG_CMD} "$@"
-+exec @java@ ${HEADLESS} -jar ${CLASSPATH} ${ThePEG_CMD} "$@"
diff --git a/sci-physics/thepeg/metadata.xml b/sci-physics/thepeg/metadata.xml
index 4a735a39f133..9173a8720a3f 100644
--- a/sci-physics/thepeg/metadata.xml
+++ b/sci-physics/thepeg/metadata.xml
@@ -18,7 +18,6 @@
</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="hepmc3">Adds support for High Energy Physics Monte
Carlo Generators 3<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>
diff --git a/sci-physics/thepeg/thepeg-2.2.2-r2.ebuild
b/sci-physics/thepeg/thepeg-2.2.2-r2.ebuild
deleted file mode 100644
index 1e9284df07a2..000000000000
--- a/sci-physics/thepeg/thepeg-2.2.2-r2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools elisp-common java-pkg-opt-2
-
-MY_P=ThePEG-${PV}
-
-DESCRIPTION="Toolkit for High Energy Physics Event Generation"
-HOMEPAGE="https://thepeg.hepforge.org/";
-
-TEST_URI="https://www.hepforge.org/downloads/lhapdf/pdfsets/current";
-SRC_URI="https://www.hepforge.org/downloads/thepeg/${MY_P}.tar.bz2
- test? ( hepmc? (
- ${TEST_URI}/cteq6ll.LHpdf
- ${TEST_URI}/cteq5l.LHgrid
- ${TEST_URI}/GRV98nlo.LHgrid
- ${TEST_URI}/MRST2001nlo.LHgrid ) )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0/20"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs fastjet hepmc lhapdf static-libs test zlib"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
- sci-libs/gsl:0=
- emacs? ( >=app-editors/emacs-23.1:* )
- fastjet? ( sci-physics/fastjet:0= )
- hepmc? ( sci-physics/hepmc:2= )
- lhapdf? ( >=sci-physics/lhapdf-6.0:0= )
- zlib? ( virtual/zlib:= )"
-DEPEND="${CDEPEND}
- java? ( >=virtual/jdk-1.8:*[-headless-awt] )
- test? ( sys-process/time )"
-RDEPEND="${CDEPEND}
- java? ( >=virtual/jre-1.8:* )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.8.3-java.patch # there are todo items in the patch
- "${FILESDIR}"/${PN}-2.0.4-gcc6.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
- default
- java-pkg-opt-2_src_prepare
- eautoreconf
-}
-
-src_configure() {
- if use java; then
- local -x JAVAC="$(java-pkg_get-javac)"
- local -x JAVA="$(java-config -J)"
- local -x JAR="$(java-config -j)"
- local -x JAVAC_SOURCE="$(java-pkg_get-source)"
- local -x JAVAC_TARGET="$(java-pkg_get-target)"
- fi
- econf \
- $(use_enable static-libs static) \
- $(use_with fastjet fastjet "${EPREFIX}"/usr) \
- $(use_with hepmc hepmc "${EPREFIX}"/usr) \
- $(use_with hepmc hepmcversion 2) \
- $(use_with java javagui) \
- $(use_with lhapdf lhapdf "${EPREFIX}"/usr) \
- --without-rivet \
- $(use_with zlib zlib "${EPREFIX}"/usr)
-}
-
-src_compile() {
- default
- use emacs && elisp-compile lib/ThePEG.el
-}
-
-src_test() {
- emake LHAPATH="${DISTDIR}" check
-}
-
-src_install() {
- default
- 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}
-
- find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
