[gentoo-commits] repo/gentoo:master commit in: sci-physics/fastjet-contrib/

2025-02-28 Thread Nowa Ammerlaan 
commit: 11ec8143883eb541a04da7c65a3b1d6e777e87ba
Author: Alexander Puck Neuwirth  neuwirth-informatik  
de>
AuthorDate: Thu Feb 27 10:48:41 2025 +
Commit: Nowa Ammerlaan  gentoo  org>
CommitDate: Fri Feb 28 18:04:57 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11ec8143

sci-physics/fastjet-contrib: fix dependency on plugins

Closes: https://bugs.gentoo.org/950330
Signed-off-by: Alexander Puck Neuwirth  neuwirth-informatik.de>
Closes: https://github.com/gentoo/gentoo/pull/40790
Signed-off-by: Nowa Ammerlaan  gentoo.org>

 .../{fastjet-contrib-1.100.ebuild => fastjet-contrib-1.100-r1.ebuild}   | 2 +-
 .../{fastjet-contrib-1.101.ebuild => fastjet-contrib-1.101-r1.ebuild}   | 2 +-
 sci-physics/fastjet-contrib/fastjet-contrib-.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-physics/fastjet-contrib/fastjet-contrib-1.100.ebuild 
b/sci-physics/fastjet-contrib/fastjet-contrib-1.100-r1.ebuild
similarity index 96%
rename from sci-physics/fastjet-contrib/fastjet-contrib-1.100.ebuild
rename to sci-physics/fastjet-contrib/fastjet-contrib-1.100-r1.ebuild
index 516a6334c1bd..fcea92ce60c5 100644
--- a/sci-physics/fastjet-contrib/fastjet-contrib-1.100.ebuild
+++ b/sci-physics/fastjet-contrib/fastjet-contrib-1.100-r1.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
 
-DEPEND=">=sci-physics/fastjet-3.4.1"
+DEPEND=">=sci-physics/fastjet-3.4.1[plugins]"
 RDEPEND="${DEPEND}"
 
 PATCHES=(

diff --git a/sci-physics/fastjet-contrib/fastjet-contrib-1.101.ebuild 
b/sci-physics/fastjet-contrib/fastjet-contrib-1.101-r1.ebuild
similarity index 96%
rename from sci-physics/fastjet-contrib/fastjet-contrib-1.101.ebuild
rename to sci-physics/fastjet-contrib/fastjet-contrib-1.101-r1.ebuild
index 3d8439f18a9d..abb20e65df84 100644
--- a/sci-physics/fastjet-contrib/fastjet-contrib-1.101.ebuild
+++ b/sci-physics/fastjet-contrib/fastjet-contrib-1.101-r1.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
 
-DEPEND=">=sci-physics/fastjet-3.4.1"
+DEPEND=">=sci-physics/fastjet-3.4.1[plugins]"
 RDEPEND="${DEPEND}"
 
 PATCHES=(

diff --git a/sci-physics/fastjet-contrib/fastjet-contrib-.ebuild 
b/sci-physics/fastjet-contrib/fastjet-contrib-.ebuild
index 2d3ba90325ed..c2670065ef41 100644
--- a/sci-physics/fastjet-contrib/fastjet-contrib-.ebuild
+++ b/sci-physics/fastjet-contrib/fastjet-contrib-.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 
-DEPEND=">=sci-physics/fastjet-3.4.1"
+DEPEND=">=sci-physics/fastjet-3.4.1[plugins]"
 RDEPEND="${DEPEND}"
 
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: sci-physics/fastjet-contrib/, sci-physics/fastjet-contrib/files/

2025-02-26 Thread Nowa Ammerlaan 
commit: e2dc7fd1247f2d3dcef0fe03ce7bab11a7bf4657
Author: Alexander Puck Neuwirth  neuwirth-informatik  
de>
AuthorDate: Wed Feb 26 10:46:48 2025 +
Commit: Nowa Ammerlaan  gentoo  org>
CommitDate: Wed Feb 26 13:46:50 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2dc7fd1

sci-physics/fastjet-contrib: add 1.101

Signed-off-by: Alexander Puck Neuwirth  neuwirth-informatik.de>
Closes: https://github.com/gentoo/gentoo/pull/40768
Signed-off-by: Nowa Ammerlaan  gentoo.org>

 sci-physics/fastjet-contrib/Manifest  |  1 +
 ...ntrib-.ebuild => fastjet-contrib-1.101.ebuild} | 19 ++-
 .../fastjet-contrib/fastjet-contrib-.ebuild   |  1 +
 .../files/fastjet-contrib-1.101-ldflags.patch | 11 +++
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/sci-physics/fastjet-contrib/Manifest 
b/sci-physics/fastjet-contrib/Manifest
index 9e51883dec5f..ea35b4a8df6f 100644
--- a/sci-physics/fastjet-contrib/Manifest
+++ b/sci-physics/fastjet-contrib/Manifest
@@ -1,3 +1,4 @@
 DIST fastjet-contrib-1.053.tar.gz 912109 BLAKE2B 
b195c415163d9ebf8e48d2516ea44014f0f4b112307a86d536e82d62121b0e22d8c862468fddcc8570eea6137c1d757586941af80112459a528e261764a0fb96
 SHA512 
bd30abaead7ec084d551d05dbd53f5a03e226fd58ec1e4c236cb022868c5134a4199dde262f18334628f4b58d532bd0e7955e81d8d964a985646d376878b
 DIST fastjet-contrib-1.055.tar.gz 945588 BLAKE2B 
5dc40313fa3b1decb1bd6e2ac8ce486b1905e7be3d575e54e43b82982f50202c5eea060390851b92c3f4b08472b8c3f0e304e5bd345e07f4742749ed892d3960
 SHA512 
2140c4198b704336449bbaed5625428d5e97ae1b744ff83837932189a72f20ba0226843517130cfb0d74fb395abd19c3377f232a86e0e734aded27d52c4ac71d
 DIST fastjet-contrib-1.100.tar.gz 1049197 BLAKE2B 
3a68754de57f99f23099501fd02c81fbc44fc14f8d114a99c3e3af9653794f5e08e8ca0de4fac22dd95a33355dcede102d59a80088c67c3794fc23f0b186b8ce
 SHA512 
b2903d31f1070ae73dec5f2d2c23f5d60ec2aeda9073978601ad3fbf85adb227ce9e4fb8b6b7e0065e1ea611f002aaf165960733acd2f49c031088912f0a8c95
+DIST fastjet-contrib-1.101.tar.gz 1096239 BLAKE2B 
69790facda1e623d1f1ad0f1701f0c0e1aba462c34e83d1164f541c0f5cdbc2577f8d962345ec30f730315f332cc5ab7206f968088153973d2ab05498926b8f6
 SHA512 
68d2d438a4b4aefd9ea040412bc40b117feac40ed43c3d35f86047bf85f23847a5153da46c6fc3631d46f0c90f5f14a965963f64dd5299e8e0e3a080e714a316

diff --git a/sci-physics/fastjet-contrib/fastjet-contrib-.ebuild 
b/sci-physics/fastjet-contrib/fastjet-contrib-1.101.ebuild
similarity index 69%
copy from sci-physics/fastjet-contrib/fastjet-contrib-.ebuild
copy to sci-physics/fastjet-contrib/fastjet-contrib-1.101.ebuild
index d97361a5c0bc..3d8439f18a9d 100644
--- a/sci-physics/fastjet-contrib/fastjet-contrib-.ebuild
+++ b/sci-physics/fastjet-contrib/fastjet-contrib-1.101.ebuild
@@ -1,20 +1,21 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit subversion toolchain-funcs
+inherit toolchain-funcs
 
 MY_PN=fjcontrib
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="3rd party extensions of FastJet."
 HOMEPAGE="https://fastjet.hepforge.org/contrib/";
-ESVN_REPO_URI="https://svn.hepforge.org/fastjetsvn/contrib/trunk";
+SRC_URI="https://fastjet.hepforge.org/contrib/downloads/${MY_P}.tar.gz -> 
${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64"
 
 DEPEND=">=sci-physics/fastjet-3.4.1"
 RDEPEND="${DEPEND}"
@@ -22,17 +23,9 @@ RDEPEND="${DEPEND}"
 PATCHES=(
"${FILESDIR}"/${PN}-1.049-ar.patch
"${FILESDIR}"/${PN}-1.055-ar-part2.patch # 
https://github.com/fjcontrib/fjcontrib/issues/3
+   "${FILESDIR}"/${PN}-1.101-ldflags.patch
 )
 
-src_unpack() {
-   subversion_src_unpack
-   subversion_wc_info || die "subversion_wc_info fails."
-   # We need the .svn folder for fetching contributions => copy it
-   rsync -rlpgo "${ESVN_WC_PATH}/.svn" "${S}" || die "can't copy .svn."
-   cd "${S}" || die "svn should have created ${S}."
-   ./scripts/update-contribs.sh || die "can't fetch contributions"
-}
-
 src_configure() {
tc-export CXX AR RANLIB
./configure \

diff --git a/sci-physics/fastjet-contrib/fastjet-contrib-.ebuild 
b/sci-physics/fastjet-contrib/fastjet-contrib-.ebuild
index d97361a5c0bc..2d3ba90325ed 100644
--- a/sci-physics/fastjet-contrib/fastjet-contrib-.ebuild
+++ b/sci-physics/fastjet-contrib/fastjet-contrib-.ebuild
@@ -22,6 +22,7 @@ RDEPEND="${DEPEND}"
 PATCHES=(
"${FILESDIR}"/${PN}-1.049-ar.patch
"${FILESDIR}"/${PN}-1.055-ar-part2.patch # 
https://github.com/fjcontrib/fjcontrib/issues/3
+   "${FILESDIR}"/${PN}-1.101-ldflags.patch
 )
 
 src_unpack() {

diff --git 
a/sci-physics/fastjet-contrib/files/fastjet-contrib-1.101-ldflags.patch 
b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.101-ldflags.patch
new file mode 100644
index ..7f8d572ce4ed
--- /dev/null
+++ b/sci-physics/fastjet-contrib/files/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/fastjet-contrib/

2025-02-06 Thread Nowa Ammerlaan 
commit: b340b37802b27ee79d674eae5d469ccda5706493
Author: Alexander Puck Neuwirth  neuwirth-informatik  
de>
AuthorDate: Wed Feb  5 19:02:37 2025 +
Commit: Nowa Ammerlaan  gentoo  org>
CommitDate: Thu Feb  6 14:34:37 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b340b378

sci-physics/fastjet-contrib: add 

Signed-off-by: Alexander Puck Neuwirth  neuwirth-informatik.de>
Closes: https://github.com/gentoo/gentoo/pull/40398
Signed-off-by: Nowa Ammerlaan  gentoo.org>

 .../fastjet-contrib/fastjet-contrib-.ebuild| 61 ++
 1 file changed, 61 insertions(+)

diff --git a/sci-physics/fastjet-contrib/fastjet-contrib-.ebuild 
b/sci-physics/fastjet-contrib/fastjet-contrib-.ebuild
new file mode 100644
index ..d97361a5c0bc
--- /dev/null
+++ b/sci-physics/fastjet-contrib/fastjet-contrib-.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit subversion toolchain-funcs
+
+MY_PN=fjcontrib
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="3rd party extensions of FastJet."
+HOMEPAGE="https://fastjet.hepforge.org/contrib/";
+ESVN_REPO_URI="https://svn.hepforge.org/fastjetsvn/contrib/trunk";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+
+DEPEND=">=sci-physics/fastjet-3.4.1"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.049-ar.patch
+   "${FILESDIR}"/${PN}-1.055-ar-part2.patch # 
https://github.com/fjcontrib/fjcontrib/issues/3
+)
+
+src_unpack() {
+   subversion_src_unpack
+   subversion_wc_info || die "subversion_wc_info fails."
+   # We need the .svn folder for fetching contributions => copy it
+   rsync -rlpgo "${ESVN_WC_PATH}/.svn" "${S}" || die "can't copy .svn."
+   cd "${S}" || die "svn should have created ${S}."
+   ./scripts/update-contribs.sh || die "can't fetch contributions"
+}
+
+src_configure() {
+   tc-export CXX AR RANLIB
+   ./configure \
+   --prefix="${ESYSROOT}/usr" \
+   --fastjet-config="${ESYSROOT}/usr/bin/fastjet-config" \
+   RANLIB="${RANLIB}" \
+   AR="${AR}" \
+   CXX="${CXX}" \
+   CFLAGS="${CFLAGS}" \
+   CXXFLAGS="${CXXFLAGS}" \
+   FFLAGS="${FFLAGS}" \
+   LDFLAGS="${LDFLAGS}" || die
+}
+
+src_compile() {
+   emake
+   emake fragile-shared
+}
+
+src_install() {
+   emake install PREFIX="${ED}/usr"
+   dolib.so libfastjetcontribfragile.so
+   # The name used for requesting this library varies
+   dosym libfastjetcontribfragile.so 
/usr/$(get_libdir)/libfastjetcontribfragile.so.0
+   dosym libfastjetcontribfragile.so 
/usr/$(get_libdir)/fastjetcontribfragile.so.0
+}

[gentoo-commits] repo/gentoo:master commit in: sci-physics/fastjet-contrib/

2025-02-06 Thread Nowa Ammerlaan 
commit: 22612a2978699ab94adb0ab7bf51464356083fa4
Author: Alexander Puck Neuwirth  neuwirth-informatik  
de>
AuthorDate: Mon Feb  3 13:30:35 2025 +
Commit: Nowa Ammerlaan  gentoo  org>
CommitDate: Thu Feb  6 14:34:36 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22612a29

sci-physics/fastjet-contrib: add 1.100

Signed-off-by: Alexander Puck Neuwirth  neuwirth-informatik.de>
Signed-off-by: Nowa Ammerlaan  gentoo.org>

 sci-physics/fastjet-contrib/Manifest   |  1 +
 .../fastjet-contrib/fastjet-contrib-1.100.ebuild   | 53 ++
 2 files changed, 54 insertions(+)

diff --git a/sci-physics/fastjet-contrib/Manifest 
b/sci-physics/fastjet-contrib/Manifest
index 7a13a24c975d..361db7eb54e6 100644
--- a/sci-physics/fastjet-contrib/Manifest
+++ b/sci-physics/fastjet-contrib/Manifest
@@ -1,3 +1,4 @@
 DIST fastjet-contrib-1.053.tar.gz 912109 BLAKE2B 
b195c415163d9ebf8e48d2516ea44014f0f4b112307a86d536e82d62121b0e22d8c862468fddcc8570eea6137c1d757586941af80112459a528e261764a0fb96
 SHA512 
bd30abaead7ec084d551d05dbd53f5a03e226fd58ec1e4c236cb022868c5134a4199dde262f18334628f4b58d532bd0e7955e81d8d964a985646d376878b
 DIST fastjet-contrib-1.055.tar.gz 945588 BLAKE2B 
5dc40313fa3b1decb1bd6e2ac8ce486b1905e7be3d575e54e43b82982f50202c5eea060390851b92c3f4b08472b8c3f0e304e5bd345e07f4742749ed892d3960
 SHA512 
2140c4198b704336449bbaed5625428d5e97ae1b744ff83837932189a72f20ba0226843517130cfb0d74fb395abd19c3377f232a86e0e734aded27d52c4ac71d
+DIST fastjet-contrib-1.100.tar.gz 1049197 BLAKE2B 
3a68754de57f99f23099501fd02c81fbc44fc14f8d114a99c3e3af9653794f5e08e8ca0de4fac22dd95a33355dcede102d59a80088c67c3794fc23f0b186b8ce
 SHA512 
b2903d31f1070ae73dec5f2d2c23f5d60ec2aeda9073978601ad3fbf85adb227ce9e4fb8b6b7e0065e1ea611f002aaf165960733acd2f49c031088912f0a8c95
 DIST fjcontrib-1.049.tar.gz 850931 BLAKE2B 
ed80c231220794cda36fb0cbbad225eb8d741f2de5558878f17d1774e16e3046d2af4b0cb895d5fc897f382c36f50def0b3ecb0fba06010347752e0a59ee402f
 SHA512 
21dc066cc8f2667f41377924bad6c3df625fa73d16b6bc3dd49ff76e6e15abbfeac0317850699e7047a7c2445c4a94a67d0f37119922163eae8bf77a56edd9e6

diff --git a/sci-physics/fastjet-contrib/fastjet-contrib-1.100.ebuild 
b/sci-physics/fastjet-contrib/fastjet-contrib-1.100.ebuild
new file mode 100644
index ..516a6334c1bd
--- /dev/null
+++ b/sci-physics/fastjet-contrib/fastjet-contrib-1.100.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_PN=fjcontrib
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="3rd party extensions of FastJet."
+HOMEPAGE="https://fastjet.hepforge.org/contrib/";
+SRC_URI="https://fastjet.hepforge.org/contrib/downloads/${MY_P}.tar.gz -> 
${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=sci-physics/fastjet-3.4.1"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.049-ar.patch
+   "${FILESDIR}"/${PN}-1.055-ar-part2.patch # 
https://github.com/fjcontrib/fjcontrib/issues/3
+)
+
+src_configure() {
+   tc-export CXX AR RANLIB
+   ./configure \
+   --prefix="${ESYSROOT}/usr" \
+   --fastjet-config="${ESYSROOT}/usr/bin/fastjet-config" \
+   RANLIB="${RANLIB}" \
+   AR="${AR}" \
+   CXX="${CXX}" \
+   CFLAGS="${CFLAGS}" \
+   CXXFLAGS="${CXXFLAGS}" \
+   FFLAGS="${FFLAGS}" \
+   LDFLAGS="${LDFLAGS}" || die
+}
+
+src_compile() {
+   emake
+   emake fragile-shared
+}
+
+src_install() {
+   emake install PREFIX="${ED}/usr"
+   dolib.so libfastjetcontribfragile.so
+   # The name used for requesting this library varies
+   dosym libfastjetcontribfragile.so 
/usr/$(get_libdir)/libfastjetcontribfragile.so.0
+   dosym libfastjetcontribfragile.so 
/usr/$(get_libdir)/fastjetcontribfragile.so.0
+}

[gentoo-commits] repo/gentoo:master commit in: sci-physics/fastjet-contrib/

2025-02-06 Thread Nowa Ammerlaan 
commit: 2a234f0c2b1d86b03f3bad338de4a560df96b136
Author: Alexander Puck Neuwirth  neuwirth-informatik  
de>
AuthorDate: Mon Feb  3 13:31:33 2025 +
Commit: Nowa Ammerlaan  gentoo  org>
CommitDate: Thu Feb  6 14:34:37 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a234f0c

sci-physics/fastjet-contrib: drop 1.049-r2

Signed-off-by: Alexander Puck Neuwirth  neuwirth-informatik.de>
Signed-off-by: Nowa Ammerlaan  gentoo.org>

 sci-physics/fastjet-contrib/Manifest   |  1 -
 .../fastjet-contrib-1.049-r2.ebuild| 45 --
 2 files changed, 46 deletions(-)

diff --git a/sci-physics/fastjet-contrib/Manifest 
b/sci-physics/fastjet-contrib/Manifest
index 361db7eb54e6..9e51883dec5f 100644
--- a/sci-physics/fastjet-contrib/Manifest
+++ b/sci-physics/fastjet-contrib/Manifest
@@ -1,4 +1,3 @@
 DIST fastjet-contrib-1.053.tar.gz 912109 BLAKE2B 
b195c415163d9ebf8e48d2516ea44014f0f4b112307a86d536e82d62121b0e22d8c862468fddcc8570eea6137c1d757586941af80112459a528e261764a0fb96
 SHA512 
bd30abaead7ec084d551d05dbd53f5a03e226fd58ec1e4c236cb022868c5134a4199dde262f18334628f4b58d532bd0e7955e81d8d964a985646d376878b
 DIST fastjet-contrib-1.055.tar.gz 945588 BLAKE2B 
5dc40313fa3b1decb1bd6e2ac8ce486b1905e7be3d575e54e43b82982f50202c5eea060390851b92c3f4b08472b8c3f0e304e5bd345e07f4742749ed892d3960
 SHA512 
2140c4198b704336449bbaed5625428d5e97ae1b744ff83837932189a72f20ba0226843517130cfb0d74fb395abd19c3377f232a86e0e734aded27d52c4ac71d
 DIST fastjet-contrib-1.100.tar.gz 1049197 BLAKE2B 
3a68754de57f99f23099501fd02c81fbc44fc14f8d114a99c3e3af9653794f5e08e8ca0de4fac22dd95a33355dcede102d59a80088c67c3794fc23f0b186b8ce
 SHA512 
b2903d31f1070ae73dec5f2d2c23f5d60ec2aeda9073978601ad3fbf85adb227ce9e4fb8b6b7e0065e1ea611f002aaf165960733acd2f49c031088912f0a8c95
-DIST fjcontrib-1.049.tar.gz 850931 BLAKE2B 
ed80c231220794cda36fb0cbbad225eb8d741f2de5558878f17d1774e16e3046d2af4b0cb895d5fc897f382c36f50def0b3ecb0fba06010347752e0a59ee402f
 SHA512 
21dc066cc8f2667f41377924bad6c3df625fa73d16b6bc3dd49ff76e6e15abbfeac0317850699e7047a7c2445c4a94a67d0f37119922163eae8bf77a56edd9e6

diff --git a/sci-physics/fastjet-contrib/fastjet-contrib-1.049-r2.ebuild 
b/sci-physics/fastjet-contrib/fastjet-contrib-1.049-r2.ebuild
deleted file mode 100644
index e21a08bc6b6b..
--- a/sci-physics/fastjet-contrib/fastjet-contrib-1.049-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-MY_PN=fjcontrib
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="3rd party extensions of FastJet."
-HOMEPAGE="https://fastjet.hepforge.org/contrib/";
-SRC_URI="https://fastjet.hepforge.org/contrib/downloads/${MY_P}.tar.gz";
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=">=sci-physics/fastjet-3.4.0"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-soname.patch
-   "${FILESDIR}"/${P}-ar.patch
-   "${FILESDIR}"/${P}-musl.patch
-)
-
-src_configure() {
-   tc-export CXX AR RANLIB
-   ./configure --prefix=/usr --fastjet-config=/usr/bin/fastjet-config 
RANLIB="${RANLIB}" AR="${AR}" CXX="${CXX}" CFLAGS="${CFLAGS}" 
CXXFLAGS="${CXXFLAGS}" FFLAGS="${FFLAGS}" LDFLAGS="${LDFLAGS}" || die
-}
-
-src_compile() {
-   emake
-   emake fragile-shared
-}
-
-src_install() {
-   emake install PREFIX="${ED}/usr"
-   dolib.so libfastjetcontribfragile.so
-   # The name used for requesting this library varies
-   dosym libfastjetcontribfragile.so 
/usr/$(get_libdir)/libfastjetcontribfragile.so.0
-   dosym libfastjetcontribfragile.so 
/usr/$(get_libdir)/fastjetcontribfragile.so.0
-}

[gentoo-commits] repo/gentoo:master commit in: sci-physics/fastjet-contrib/

2024-10-21 Thread Andrew Ammerlaan 
commit: 6cf75bdbb74a3610f61da076d3c8bb4d92b1
Author: Alexander Puck Neuwirth  neuwirth-informatik  
de>
AuthorDate: Sun Oct 20 16:40:47 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Mon Oct 21 12:16:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cf75bdb

sci-physics/fastjet-contrib: add github upstream metadata

Signed-off-by: Alexander Puck Neuwirth  neuwirth-informatik.de>
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/fastjet-contrib/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sci-physics/fastjet-contrib/metadata.xml 
b/sci-physics/fastjet-contrib/metadata.xml
index ae55524d0200..dba86d876d40 100644
--- a/sci-physics/fastjet-contrib/metadata.xml
+++ b/sci-physics/fastjet-contrib/metadata.xml
@@ -16,4 +16,7 @@

The fastjet-contrib space is intended to provide a common location for 
access to 3rd party extensions of FastJet.

+   
+   fjcontrib/fjcontrib
+

[gentoo-commits] repo/gentoo:master commit in: sci-physics/fastjet-contrib/files/, sci-physics/fastjet-contrib/

2024-10-21 Thread Andrew Ammerlaan 
commit: 57ac98d528da9242378901de422704e96cfa483b
Author: Alexander Puck Neuwirth  neuwirth-informatik  
de>
AuthorDate: Sun Oct 20 16:40:22 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Mon Oct 21 12:16:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57ac98d5

sci-physics/fastjet-contrib: Update ar patch

Closes: https://bugs.gentoo.org/940452
Signed-off-by: Alexander Puck Neuwirth  neuwirth-informatik.de>
Closes: https://github.com/gentoo/gentoo/pull/39057
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/fastjet-contrib/fastjet-contrib-1.055.ebuild|  1 +
 .../files/fastjet-contrib-1.055-ar-part2.patch  | 13 +
 2 files changed, 14 insertions(+)

diff --git a/sci-physics/fastjet-contrib/fastjet-contrib-1.055.ebuild 
b/sci-physics/fastjet-contrib/fastjet-contrib-1.055.ebuild
index f48a5b1a4594..c337473684b1 100644
--- a/sci-physics/fastjet-contrib/fastjet-contrib-1.055.ebuild
+++ b/sci-physics/fastjet-contrib/fastjet-contrib-1.055.ebuild
@@ -23,6 +23,7 @@ RDEPEND="${DEPEND}"
 PATCHES=(
"${FILESDIR}"/${PN}-1.049-soname.patch
"${FILESDIR}"/${PN}-1.049-ar.patch
+   "${FILESDIR}"/${PN}-1.055-ar-part2.patch # 
https://github.com/fjcontrib/fjcontrib/issues/3
 )
 
 src_configure() {

diff --git 
a/sci-physics/fastjet-contrib/files/fastjet-contrib-1.055-ar-part2.patch 
b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.055-ar-part2.patch
new file mode 100644
index ..2bfb63960c6b
--- /dev/null
+++ b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.055-ar-part2.patch
@@ -0,0 +1,13 @@
+--- a/SignalFreeBackgroundEstimator/Makefile
 b/SignalFreeBackgroundEstimator/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+ 
+ lib$(NAME).a: $(OBJS) 
+-  ar cru lib$(NAME).a $(OBJS)
+-  ranlib lib$(NAME).a
++  $(AR) cru lib$(NAME).a $(OBJS)
++  $(RANLIB) lib$(NAME).a
+ 
+ # building the examples
+ examples: $(EXAMPLES)

[gentoo-commits] repo/gentoo:master commit in: sci-physics/fastjet-contrib/files/

2024-10-21 Thread Andrew Ammerlaan 
commit: 31b93b384933f10d537c86db531dbb058885bab5
Author: Alexander Puck Neuwirth  neuwirth-informatik  
de>
AuthorDate: Sun Oct 20 16:35:43 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Mon Oct 21 12:16:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31b93b38

sci-physics/fastjet-contrib: remove typo in patch

Signed-off-by: Alexander Puck Neuwirth  neuwirth-informatik.de>
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-soname.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-soname.patch 
b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-soname.patch
index fe3794d5e0f5..df8fd8d51bc9 100644
--- a/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-soname.patch
+++ b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-soname.patch
@@ -5,7 +5,7 @@
  fragile_SHARED_SRC_LIST=@FRAGILE_SHARED_SRC_LIST@
  libfastjetcontribfragile.@DYNLIBEXT@: $(fragile_SHARED_SRC_LIST)
 -  $(CXX) @DYNLIBOPT@ -fPIC -DPIC $(CXXFLAGS) `$(FASTJETCONFIG) --cxxflags 
--libs` $(fragile_SHARED_SRC_LIST) -o libfastjetcontribfragile.@DYNLIBEXT@
-+  $(CXX) @DYNLIBOPT@ -fPIC -DPIC -Wl,-Ol -Wl,--as-needed 
-Wl,-soname,fastjetcontribfragile.so.0 $(LDFLAGS) $(CXXFLAGS) `$(FASTJETCONFIG) 
--cxxflags --libs` $(fragile_SHARED_SRC_LIST) -o 
libfastjetcontribfragile.@DYNLIBEXT@
++  $(CXX) @DYNLIBOPT@ -fPIC -DPIC -Wl,--as-needed 
-Wl,-soname,fastjetcontribfragile.so.0 $(LDFLAGS) $(CXXFLAGS) `$(FASTJETCONFIG) 
--cxxflags --libs` $(fragile_SHARED_SRC_LIST) -o 
libfastjetcontribfragile.@DYNLIBEXT@
  
  fragile-shared-install: fragile-shared
utils/install-sh -c -m 755 libfastjetcontribfragile.@DYNLIBEXT@ 
$(PREFIX)/lib

[gentoo-commits] repo/gentoo:master commit in: sci-physics/fastjet-contrib/

2024-09-27 Thread Andrew Ammerlaan 
commit: 34a688291a38261c6ab650f937c575c3d98330b3
Author: Alexander Puck Neuwirth  neuwirth-informatik  
de>
AuthorDate: Wed Sep 25 15:47:29 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Sep 27 09:08:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34a68829

sci-physics/fastjet-contrib: add 1.055

Signed-off-by: Alexander Puck Neuwirth  neuwirth-informatik.de>
Closes: https://github.com/gentoo/gentoo/pull/38771
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/fastjet-contrib/Manifest   |  1 +
 .../fastjet-contrib/fastjet-contrib-1.055.ebuild   | 53 ++
 2 files changed, 54 insertions(+)

diff --git a/sci-physics/fastjet-contrib/Manifest 
b/sci-physics/fastjet-contrib/Manifest
index c107593243e9..7a13a24c975d 100644
--- a/sci-physics/fastjet-contrib/Manifest
+++ b/sci-physics/fastjet-contrib/Manifest
@@ -1,2 +1,3 @@
 DIST fastjet-contrib-1.053.tar.gz 912109 BLAKE2B 
b195c415163d9ebf8e48d2516ea44014f0f4b112307a86d536e82d62121b0e22d8c862468fddcc8570eea6137c1d757586941af80112459a528e261764a0fb96
 SHA512 
bd30abaead7ec084d551d05dbd53f5a03e226fd58ec1e4c236cb022868c5134a4199dde262f18334628f4b58d532bd0e7955e81d8d964a985646d376878b
+DIST fastjet-contrib-1.055.tar.gz 945588 BLAKE2B 
5dc40313fa3b1decb1bd6e2ac8ce486b1905e7be3d575e54e43b82982f50202c5eea060390851b92c3f4b08472b8c3f0e304e5bd345e07f4742749ed892d3960
 SHA512 
2140c4198b704336449bbaed5625428d5e97ae1b744ff83837932189a72f20ba0226843517130cfb0d74fb395abd19c3377f232a86e0e734aded27d52c4ac71d
 DIST fjcontrib-1.049.tar.gz 850931 BLAKE2B 
ed80c231220794cda36fb0cbbad225eb8d741f2de5558878f17d1774e16e3046d2af4b0cb895d5fc897f382c36f50def0b3ecb0fba06010347752e0a59ee402f
 SHA512 
21dc066cc8f2667f41377924bad6c3df625fa73d16b6bc3dd49ff76e6e15abbfeac0317850699e7047a7c2445c4a94a67d0f37119922163eae8bf77a56edd9e6

diff --git a/sci-physics/fastjet-contrib/fastjet-contrib-1.055.ebuild 
b/sci-physics/fastjet-contrib/fastjet-contrib-1.055.ebuild
new file mode 100644
index ..f48a5b1a4594
--- /dev/null
+++ b/sci-physics/fastjet-contrib/fastjet-contrib-1.055.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_PN=fjcontrib
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="3rd party extensions of FastJet."
+HOMEPAGE="https://fastjet.hepforge.org/contrib/";
+SRC_URI="https://fastjet.hepforge.org/contrib/downloads/${MY_P}.tar.gz -> 
${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=sci-physics/fastjet-3.4.0"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.049-soname.patch
+   "${FILESDIR}"/${PN}-1.049-ar.patch
+)
+
+src_configure() {
+   tc-export CXX AR RANLIB
+   ./configure \
+   --prefix="${ESYSROOT}/usr" \
+   --fastjet-config="${ESYSROOT}/usr/bin/fastjet-config" \
+   RANLIB="${RANLIB}" \
+   AR="${AR}" \
+   CXX="${CXX}" \
+   CFLAGS="${CFLAGS}" \
+   CXXFLAGS="${CXXFLAGS}" \
+   FFLAGS="${FFLAGS}" \
+   LDFLAGS="${LDFLAGS}" || die
+}
+
+src_compile() {
+   emake
+   emake fragile-shared
+}
+
+src_install() {
+   emake install PREFIX="${ED}/usr"
+   dolib.so libfastjetcontribfragile.so
+   # The name used for requesting this library varies
+   dosym libfastjetcontribfragile.so 
/usr/$(get_libdir)/libfastjetcontribfragile.so.0
+   dosym libfastjetcontribfragile.so 
/usr/$(get_libdir)/fastjetcontribfragile.so.0
+}

[gentoo-commits] repo/gentoo:master commit in: sci-physics/fastjet-contrib/

2024-03-26 Thread Andrew Ammerlaan 
commit: 4b09eb80c56dc123d456a4bcfe679e3e72a16714
Author: Alexander Puck Neuwirth  neuwirth-informatik  
de>
AuthorDate: Tue Mar 26 10:00:25 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Mar 26 19:09:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b09eb80

sci-physics/fastjet-contrib: drop 1.049-r1

Closes: https://bugs.gentoo.org/871420
Signed-off-by: Alexander Puck Neuwirth  neuwirth-informatik.de>
Closes: https://github.com/gentoo/gentoo/pull/35924
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 .../fastjet-contrib-1.049-r1.ebuild| 44 --
 1 file changed, 44 deletions(-)

diff --git a/sci-physics/fastjet-contrib/fastjet-contrib-1.049-r1.ebuild 
b/sci-physics/fastjet-contrib/fastjet-contrib-1.049-r1.ebuild
deleted file mode 100644
index 5327d49c484d..
--- a/sci-physics/fastjet-contrib/fastjet-contrib-1.049-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-MY_PN=fjcontrib
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="3rd party extensions of FastJet."
-HOMEPAGE="https://fastjet.hepforge.org/contrib/";
-SRC_URI="https://fastjet.hepforge.org/contrib/downloads/${MY_P}.tar.gz";
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=">=sci-physics/fastjet-3.4.0"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-soname.patch
-   "${FILESDIR}"/${P}-ar.patch
-)
-
-src_configure() {
-   tc-export CXX AR RANLIB
-   ./configure --prefix=/usr --fastjet-config=/usr/bin/fastjet-config 
RANLIB="${RANLIB}" AR="${AR}" CXX="${CXX}" CFLAGS="${CFLAGS}" 
CXXFLAGS="${CXXFLAGS}" FFLAGS="${FFLAGS}" LDFLAGS="${LDFLAGS}" || die
-}
-
-src_compile() {
-   emake
-   emake fragile-shared
-}
-
-src_install() {
-   emake install PREFIX="${ED}/usr"
-   dolib.so libfastjetcontribfragile.so
-   # The name used for requesting this library varies
-   dosym libfastjetcontribfragile.so 
/usr/$(get_libdir)/libfastjetcontribfragile.so.0
-   dosym libfastjetcontribfragile.so 
/usr/$(get_libdir)/fastjetcontribfragile.so.0
-}

[gentoo-commits] repo/gentoo:master commit in: sci-physics/fastjet-contrib/

2024-03-18 Thread Andrew Ammerlaan 
commit: d9bb768e10e2b3f8b4754b7cb00a66b894aad278
Author: Alexander Puck Neuwirth  neuwirth-informatik  
de>
AuthorDate: Sun Mar 17 21:06:26 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Mon Mar 18 10:58:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9bb768e

sci-physics/fastjet-contrib: add 1.053

Signed-off-by: Alexander Puck Neuwirth  neuwirth-informatik.de>
Closes: https://github.com/gentoo/gentoo/pull/35810
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/fastjet-contrib/Manifest   |  1 +
 .../fastjet-contrib/fastjet-contrib-1.053.ebuild   | 54 ++
 2 files changed, 55 insertions(+)

diff --git a/sci-physics/fastjet-contrib/Manifest 
b/sci-physics/fastjet-contrib/Manifest
index 286bd2321c57..c107593243e9 100644
--- a/sci-physics/fastjet-contrib/Manifest
+++ b/sci-physics/fastjet-contrib/Manifest
@@ -1 +1,2 @@
+DIST fastjet-contrib-1.053.tar.gz 912109 BLAKE2B 
b195c415163d9ebf8e48d2516ea44014f0f4b112307a86d536e82d62121b0e22d8c862468fddcc8570eea6137c1d757586941af80112459a528e261764a0fb96
 SHA512 
bd30abaead7ec084d551d05dbd53f5a03e226fd58ec1e4c236cb022868c5134a4199dde262f18334628f4b58d532bd0e7955e81d8d964a985646d376878b
 DIST fjcontrib-1.049.tar.gz 850931 BLAKE2B 
ed80c231220794cda36fb0cbbad225eb8d741f2de5558878f17d1774e16e3046d2af4b0cb895d5fc897f382c36f50def0b3ecb0fba06010347752e0a59ee402f
 SHA512 
21dc066cc8f2667f41377924bad6c3df625fa73d16b6bc3dd49ff76e6e15abbfeac0317850699e7047a7c2445c4a94a67d0f37119922163eae8bf77a56edd9e6

diff --git a/sci-physics/fastjet-contrib/fastjet-contrib-1.053.ebuild 
b/sci-physics/fastjet-contrib/fastjet-contrib-1.053.ebuild
new file mode 100644
index ..f4141ddfd6d1
--- /dev/null
+++ b/sci-physics/fastjet-contrib/fastjet-contrib-1.053.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_PN=fjcontrib
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="3rd party extensions of FastJet."
+HOMEPAGE="https://fastjet.hepforge.org/contrib/";
+SRC_URI="https://fastjet.hepforge.org/contrib/downloads/${MY_P}.tar.gz -> 
${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=sci-physics/fastjet-3.4.0"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.049-soname.patch
+   "${FILESDIR}"/${PN}-1.049-ar.patch
+   "${FILESDIR}"/${PN}-1.049-musl.patch
+)
+
+src_configure() {
+   tc-export CXX AR RANLIB
+   ./configure \
+   --prefix="${ESYSROOT}/usr" \
+   --fastjet-config="${ESYSROOT}/usr/bin/fastjet-config" \
+   RANLIB="${RANLIB}" \
+   AR="${AR}" \
+   CXX="${CXX}" \
+   CFLAGS="${CFLAGS}" \
+   CXXFLAGS="${CXXFLAGS}" \
+   FFLAGS="${FFLAGS}" \
+   LDFLAGS="${LDFLAGS}" || die
+}
+
+src_compile() {
+   emake
+   emake fragile-shared
+}
+
+src_install() {
+   emake install PREFIX="${ED}/usr"
+   dolib.so libfastjetcontribfragile.so
+   # The name used for requesting this library varies
+   dosym libfastjetcontribfragile.so 
/usr/$(get_libdir)/libfastjetcontribfragile.so.0
+   dosym libfastjetcontribfragile.so 
/usr/$(get_libdir)/fastjetcontribfragile.so.0
+}

[gentoo-commits] repo/gentoo:master commit in: sci-physics/fastjet-contrib/files/, sci-physics/fastjet-contrib/

2023-02-19 Thread Sam James 
commit: 34c58f997155323ca47d73f6d58213fa09a08b88
Author: Alexander Puck Neuwirth  neuwirth-informatik  
de>
AuthorDate: Fri Feb 17 13:38:35 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 19 19:55:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34c58f99

sci-physics/fastjet-contrib: uint -> unsigned int

Closes: https://bugs.gentoo.org/873646
Signed-off-by: Alexander Puck Neuwirth  neuwirth-informatik.de>
Closes: https://github.com/gentoo/gentoo/pull/29633
Signed-off-by: Sam James  gentoo.org>

 .../fastjet-contrib-1.049-r2.ebuild| 45 ++
 .../files/fastjet-contrib-1.049-musl.patch | 11 ++
 2 files changed, 56 insertions(+)

diff --git a/sci-physics/fastjet-contrib/fastjet-contrib-1.049-r2.ebuild 
b/sci-physics/fastjet-contrib/fastjet-contrib-1.049-r2.ebuild
new file mode 100644
index ..e21a08bc6b6b
--- /dev/null
+++ b/sci-physics/fastjet-contrib/fastjet-contrib-1.049-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_PN=fjcontrib
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="3rd party extensions of FastJet."
+HOMEPAGE="https://fastjet.hepforge.org/contrib/";
+SRC_URI="https://fastjet.hepforge.org/contrib/downloads/${MY_P}.tar.gz";
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=sci-physics/fastjet-3.4.0"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-soname.patch
+   "${FILESDIR}"/${P}-ar.patch
+   "${FILESDIR}"/${P}-musl.patch
+)
+
+src_configure() {
+   tc-export CXX AR RANLIB
+   ./configure --prefix=/usr --fastjet-config=/usr/bin/fastjet-config 
RANLIB="${RANLIB}" AR="${AR}" CXX="${CXX}" CFLAGS="${CFLAGS}" 
CXXFLAGS="${CXXFLAGS}" FFLAGS="${FFLAGS}" LDFLAGS="${LDFLAGS}" || die
+}
+
+src_compile() {
+   emake
+   emake fragile-shared
+}
+
+src_install() {
+   emake install PREFIX="${ED}/usr"
+   dolib.so libfastjetcontribfragile.so
+   # The name used for requesting this library varies
+   dosym libfastjetcontribfragile.so 
/usr/$(get_libdir)/libfastjetcontribfragile.so.0
+   dosym libfastjetcontribfragile.so 
/usr/$(get_libdir)/fastjetcontribfragile.so.0
+}

diff --git a/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-musl.patch 
b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-musl.patch
new file mode 100644
index ..880e145ba060
--- /dev/null
+++ b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-musl.patch
@@ -0,0 +1,11 @@
+--- a/LundPlane/example_dpsi_slice.cc
 b/LundPlane/example_dpsi_slice.cc
+@@ -124,7 +124,7 @@
+ 
+   int index_of_max_kt_secondary = -1;
+   double dpsi;
+-  for (uint i_secondary=0; i_secondaryz() > z2_cut) {
+ 
+   index_of_max_kt_secondary = i_secondary;

[gentoo-commits] repo/gentoo:master commit in: sci-physics/fastjet-contrib/

2022-08-26 Thread Andrew Ammerlaan 
commit: 0071393fb5af5e4616e24f354047072ae25c3ccf
Author: Alexander Puck Neuwirth  neuwirth-informatik  
de>
AuthorDate: Mon Aug  1 23:08:04 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Aug 26 09:50:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0071393f

sci-physics/fastjet-contrib: add myself as a maintainer

Signed-off-by: Alexander Puck Neuwirth  neuwirth-informatik.de>
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/fastjet-contrib/metadata.xml | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/sci-physics/fastjet-contrib/metadata.xml 
b/sci-physics/fastjet-contrib/metadata.xml
index 1a470bb15f7b..ae55524d0200 100644
--- a/sci-physics/fastjet-contrib/metadata.xml
+++ b/sci-physics/fastjet-contrib/metadata.xml
@@ -1,14 +1,18 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
-   
-   s...@gentoo.org
-   Gentoo Science Project
+   
+   alexan...@neuwirth-informatik.de
+   Alexander Puck Neuwirth

-   
+   
sci-phys...@gentoo.org
Gentoo Physics Project

+   
+   s...@gentoo.org
+   Gentoo Science Project
+   

The fastjet-contrib space is intended to provide a common location for 
access to 3rd party extensions of FastJet.

[gentoo-commits] repo/gentoo:master commit in: sci-physics/fastjet-contrib/, sci-physics/fastjet-contrib/files/

2022-08-26 Thread Andrew Ammerlaan 
commit: cb0a7488023274b9a567fbddd5d0198d7b9ec5fe
Author: Alexander Puck Neuwirth  neuwirth-informatik  
de>
AuthorDate: Mon Aug  1 23:06:58 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Aug 26 09:50:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb0a7488

sci-physics/fastjet-contrib: Fix tc ar and ranlib

Closes: https://github.com/gentoo/gentoo/pull/26621
Closes: https://bugs.gentoo.org/860222
Signed-off-by: Alexander Puck Neuwirth  neuwirth-informatik.de>
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 049.ebuild => fastjet-contrib-1.049-r1.ebuild} |   6 +-
 .../files/fastjet-contrib-1.049-ar.patch   | 247 +
 .../files/fastjet-contrib-1.049-soname.patch   |   4 +-
 3 files changed, 253 insertions(+), 4 deletions(-)

diff --git a/sci-physics/fastjet-contrib/fastjet-contrib-1.049.ebuild 
b/sci-physics/fastjet-contrib/fastjet-contrib-1.049-r1.ebuild
similarity index 83%
rename from sci-physics/fastjet-contrib/fastjet-contrib-1.049.ebuild
rename to sci-physics/fastjet-contrib/fastjet-contrib-1.049-r1.ebuild
index cf942ac11e58..5327d49c484d 100644
--- a/sci-physics/fastjet-contrib/fastjet-contrib-1.049.ebuild
+++ b/sci-physics/fastjet-contrib/fastjet-contrib-1.049-r1.ebuild
@@ -22,12 +22,14 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
"${FILESDIR}"/${P}-soname.patch
+   "${FILESDIR}"/${P}-ar.patch
 )
 
 src_configure() {
-   CXX=`tc-getCXX`
-   ./configure --prefix=/usr --fastjet-config=/usr/bin/fastjet-config 
CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" FFLAGS="${FFLAGS}" 
LDFLAGS="${LDFLAGS}" || die
+   tc-export CXX AR RANLIB
+   ./configure --prefix=/usr --fastjet-config=/usr/bin/fastjet-config 
RANLIB="${RANLIB}" AR="${AR}" CXX="${CXX}" CFLAGS="${CFLAGS}" 
CXXFLAGS="${CXXFLAGS}" FFLAGS="${FFLAGS}" LDFLAGS="${LDFLAGS}" || die
 }
+
 src_compile() {
emake
emake fragile-shared

diff --git a/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-ar.patch 
b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-ar.patch
new file mode 100644
index ..b7578bd76738
--- /dev/null
+++ b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-ar.patch
@@ -0,0 +1,247 @@
+--- a/Centauro/Makefile
 b/Centauro/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+ 
+ lib$(NAME).a: $(OBJS) 
+-  ar cru lib$(NAME).a $(OBJS)
+-  ranlib lib$(NAME).a
++  $(AR) cru lib$(NAME).a $(OBJS)
++  $(RANLIB) lib$(NAME).a
+ 
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/ClusteringVetoPlugin/Makefile
 b/ClusteringVetoPlugin/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+ 
+ lib$(NAME).a: $(OBJS) 
+-  ar cru lib$(NAME).a $(OBJS)
+-  ranlib lib$(NAME).a
++  $(AR) cru lib$(NAME).a $(OBJS)
++  $(RANLIB) lib$(NAME).a
+ 
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/ConstituentSubtractor/Makefile
 b/ConstituentSubtractor/Makefile
+@@ -41,8 +41,8 @@
+ all: lib$(NAME).a
+ 
+ lib$(NAME).a: $(OBJS) 
+-  ar cru lib$(NAME).a $(OBJS)
+-  ranlib lib$(NAME).a
++  $(AR) cru lib$(NAME).a $(OBJS)
++  $(RANLIB) lib$(NAME).a
+ 
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/EnergyCorrelator/Makefile
 b/EnergyCorrelator/Makefile
+@@ -40,8 +40,8 @@
+ all: lib$(NAME).a
+ 
+ lib$(NAME).a: $(OBJS)
+-  ar cru lib$(NAME).a $(OBJS)
+-  ranlib lib$(NAME).a
++  $(AR) cru lib$(NAME).a $(OBJS)
++  $(RANLIB) lib$(NAME).a
+ 
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/FlavorCone/Makefile  
 b/FlavorCone/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+ 
+ lib$(NAME).a: $(OBJS) 
+-  ar cru lib$(NAME).a $(OBJS)
+-  ranlib lib$(NAME).a
++  $(AR) cru lib$(NAME).a $(OBJS)
++  $(RANLIB) lib$(NAME).a
+ 
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/GenericSubtractor/Makefile
 b/GenericSubtractor/Makefile
+@@ -38,8 +38,8 @@
+ all: lib$(NAME).a
+ 
+ lib$(NAME).a: $(OBJS) 
+-  ar cru lib$(NAME).a $(OBJS)
+-  ranlib lib$(NAME).a
++  $(AR) cru lib$(NAME).a $(OBJS)
++  $(RANLIB) lib$(NAME).a
+ 
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/JetCleanser/Makefile
 b/JetCleanser/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+ 
+ lib$(NAME).a: $(OBJS) 
+-  ar cru lib$(NAME).a $(OBJS)
+-  ranlib lib$(NAME).a
++  $(AR) cru lib$(NAME).a $(OBJS)
++  $(RANLIB) lib$(NAME).a
+ 
+ # building the examples
+ examples: $(EXAMPLES)
+--- a/JetFFMoments/Makefile
 b/JetFFMoments/Makefile
+@@ -34,8 +34,8 @@
+ all: lib$(NAME).a
+ 
+ lib$(NAME).a: $(OBJS) 
+-  ar cru lib$(NAME).a $(OBJS)
+-  ranlib lib$(NAME).a
++  $(AR) cru lib$(NAME).a $(OBJS)
++  $(RANLIB) lib$(NAME).a
+ 
+ examples: example
+ 
+--- a/JetsWithoutJets/Makefile
 b/JetsWithoutJets/Makefile
+@@ -39,8 +39,8 @@
+ all: lib$(NAME).a
+ 
+ lib$(NAME).a: $(OBJS) 
+-  ar cru lib$(NAME).a $(OBJS)
+-  ranlib lib$(NAME).a
++  $(AR) cru lib$(NAME).a $(OBJS

[gentoo-commits] repo/gentoo:master commit in: sci-physics/fastjet-contrib/

2022-07-22 Thread Sam James 
commit: f681fde16701cf9d389234836d72b2aab746b8dc
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 23 04:12:03 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 23 04:12:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f681fde1

sci-physics/fastjet-contrib: [QA] fix dtd URL (HTTP->HTTPS)

Signed-off-by: Sam James  gentoo.org>

 sci-physics/fastjet-contrib/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-physics/fastjet-contrib/metadata.xml 
b/sci-physics/fastjet-contrib/metadata.xml
index 2ba65cdb8045..1a470bb15f7b 100644
--- a/sci-physics/fastjet-contrib/metadata.xml
+++ b/sci-physics/fastjet-contrib/metadata.xml
@@ -1,5 +1,5 @@
 
-http://www.gentoo.org/dtd/metadata.dtd";>
+https://www.gentoo.org/dtd/metadata.dtd";>
 

s...@gentoo.org

[gentoo-commits] repo/gentoo:master commit in: sci-physics/fastjet-contrib/

2022-07-22 Thread Andrew Ammerlaan 
commit: 6556322145f33a4b3d9c682abe555a7bf4e29e6e
Author: Alexander Puck Neuwirth  neuwirth-informatik  
de>
AuthorDate: Fri Jul 22 16:14:40 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Jul 22 20:49:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65563221

sci-physics/fastjet-contrib: needs CXX from tc

Closes: https://bugs.gentoo.org/860039
Signed-off-by: Alexander Puck Neuwirth  neuwirth-informatik.de>
Closes: https://github.com/gentoo/gentoo/pull/26521
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/fastjet-contrib/fastjet-contrib-1.049.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-physics/fastjet-contrib/fastjet-contrib-1.049.ebuild 
b/sci-physics/fastjet-contrib/fastjet-contrib-1.049.ebuild
index c5de8596605c..cf942ac11e58 100644
--- a/sci-physics/fastjet-contrib/fastjet-contrib-1.049.ebuild
+++ b/sci-physics/fastjet-contrib/fastjet-contrib-1.049.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit toolchain-funcs
+
 MY_PN=fjcontrib
 MY_P=${MY_PN}-${PV}
 
@@ -23,7 +25,8 @@ PATCHES=(
 )
 
 src_configure() {
-   ./configure --prefix=/usr --fastjet-config=/usr/bin/fastjet-config 
CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" FFLAGS="${FFLAGS}" 
LDFLAGS="${LDFLAGS}" || die
+   CXX=`tc-getCXX`
+   ./configure --prefix=/usr --fastjet-config=/usr/bin/fastjet-config 
CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" FFLAGS="${FFLAGS}" 
LDFLAGS="${LDFLAGS}" || die
 }
 src_compile() {
emake

[gentoo-commits] repo/gentoo:master commit in: sci-physics/fastjet-contrib/files/, sci-physics/fastjet-contrib/

2022-07-22 Thread Andrew Ammerlaan 
commit: 806ecc0d4efdc7a87df9798508ad27eb49dcc6d6
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Jul 22 09:39:50 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Jul 22 09:42:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=806ecc0d

sci-physics/fastjet-contrib: new package, add 1.049

Closes: https://github.com/gentoo/sci/pull/1158
Co-authored-by: Alexander Puck Neuwirth  neuwirth-informatik.de>
Signed-off-by: Alexander Puck Neuwirth  neuwirth-informatik.de>
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-physics/fastjet-contrib/Manifest   |  1 +
 .../fastjet-contrib/fastjet-contrib-1.049.ebuild   | 39 ++
 .../files/fastjet-contrib-1.049-soname.patch   | 11 ++
 sci-physics/fastjet-contrib/metadata.xml   | 15 +
 4 files changed, 66 insertions(+)

diff --git a/sci-physics/fastjet-contrib/Manifest 
b/sci-physics/fastjet-contrib/Manifest
new file mode 100644
index ..286bd2321c57
--- /dev/null
+++ b/sci-physics/fastjet-contrib/Manifest
@@ -0,0 +1 @@
+DIST fjcontrib-1.049.tar.gz 850931 BLAKE2B 
ed80c231220794cda36fb0cbbad225eb8d741f2de5558878f17d1774e16e3046d2af4b0cb895d5fc897f382c36f50def0b3ecb0fba06010347752e0a59ee402f
 SHA512 
21dc066cc8f2667f41377924bad6c3df625fa73d16b6bc3dd49ff76e6e15abbfeac0317850699e7047a7c2445c4a94a67d0f37119922163eae8bf77a56edd9e6

diff --git a/sci-physics/fastjet-contrib/fastjet-contrib-1.049.ebuild 
b/sci-physics/fastjet-contrib/fastjet-contrib-1.049.ebuild
new file mode 100644
index ..c5de8596605c
--- /dev/null
+++ b/sci-physics/fastjet-contrib/fastjet-contrib-1.049.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=fjcontrib
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="3rd party extensions of FastJet."
+HOMEPAGE="https://fastjet.hepforge.org/contrib/";
+SRC_URI="https://fastjet.hepforge.org/contrib/downloads/${MY_P}.tar.gz";
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=sci-physics/fastjet-3.4.0"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-soname.patch
+)
+
+src_configure() {
+   ./configure --prefix=/usr --fastjet-config=/usr/bin/fastjet-config 
CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" FFLAGS="${FFLAGS}" 
LDFLAGS="${LDFLAGS}" || die
+}
+src_compile() {
+   emake
+   emake fragile-shared
+}
+
+src_install() {
+   emake install PREFIX="${ED}/usr"
+   dolib.so libfastjetcontribfragile.so
+   # The name used for requesting this library varies
+   dosym libfastjetcontribfragile.so 
/usr/$(get_libdir)/libfastjetcontribfragile.so.0
+   dosym libfastjetcontribfragile.so 
/usr/$(get_libdir)/fastjetcontribfragile.so.0
+}

diff --git 
a/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-soname.patch 
b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-soname.patch
new file mode 100644
index ..5f69900cdc30
--- /dev/null
+++ b/sci-physics/fastjet-contrib/files/fastjet-contrib-1.049-soname.patch
@@ -0,0 +1,11 @@
+--- fjcontrib-1.046.orig/Makefile.in   2022-03-10 13:44:33.963887464 +0100
 fjcontrib-1.046/Makefile.in2022-03-10 13:45:02.573890763 +0100
+@@ -54,7 +54,7 @@
+ 
+ fragile_SHARED_SRC_LIST=@FRAGILE_SHARED_SRC_LIST@
+ libfastjetcontribfragile.@DYNLIBEXT@: $(fragile_SHARED_SRC_LIST)
+-  $(CXX) @DYNLIBOPT@ -fPIC -DPIC $(CXXFLAGS) `$(FASTJETCONFIG) --cxxflags 
--libs` $(fragile_SHARED_SRC_LIST) -o libfastjetcontribfragile.@DYNLIBEXT@
++  $(CXX) @DYNLIBOPT@ -fPIC -DPIC -Wl,-Ol -Wl,--as-needed 
-Wl,-soname,fastjetcontribfragile.so.0 $(LDFLAGS) $(CXXFLAGS) `$(FASTJETCONFIG) 
--cxxflags --libs` $(fragile_SHARED_SRC_LIST) -o 
libfastjetcontribfragile.@DYNLIBEXT@
+ 
+ fragile-shared-install: fragile-shared
+   utils/install-sh -c -m 755 libfastjetcontribfragile.@DYNLIBEXT@ 
$(PREFIX)/lib

diff --git a/sci-physics/fastjet-contrib/metadata.xml 
b/sci-physics/fastjet-contrib/metadata.xml
new file mode 100644
index ..2ba65cdb8045
--- /dev/null
+++ b/sci-physics/fastjet-contrib/metadata.xml
@@ -0,0 +1,15 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+   
+   s...@gentoo.org
+   Gentoo Science Project
+   
+   
+   sci-phys...@gentoo.org
+   Gentoo Physics Project
+   
+   
+   The fastjet-contrib space is intended to provide a common location for 
access to 3rd party extensions of FastJet.
+   
+