commit: b12b22dc56d9ab43a067e5cf8c51f7027ed1cde9 Author: Alexander Puck Neuwirth <apn-pucky <AT> gentoo <DOT> org> AuthorDate: Wed Aug 20 12:00:08 2025 +0000 Commit: Alexander Puck Neuwirth <apn-pucky <AT> gentoo <DOT> org> CommitDate: Mon Aug 25 10:35:35 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b12b22dc
sci-physics/fastjet-contrib: delete static-libs sci-physics/fastjet itself also does not have static-libs. Closes: https://bugs.gentoo.org/961506 Closes: https://bugs.gentoo.org/961717 Part-of: https://github.com/gentoo/gentoo/pull/43507 Closes: https://github.com/gentoo/gentoo/pull/43507 Signed-off-by: Alexander Puck Neuwirth <apn-pucky <AT> gentoo.org> ...9999.ebuild => fastjet-contrib-1.101-r2.ebuild} | 22 ++++++++-------------- .../fastjet-contrib/fastjet-contrib-9999.ebuild | 6 ++++-- .../files/fastjet-contrib-1.055-ar-part2.patch | 1 + 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/sci-physics/fastjet-contrib/fastjet-contrib-9999.ebuild b/sci-physics/fastjet-contrib/fastjet-contrib-1.101-r2.ebuild similarity index 64% copy from sci-physics/fastjet-contrib/fastjet-contrib-9999.ebuild copy to sci-physics/fastjet-contrib/fastjet-contrib-1.101-r2.ebuild index c2670065ef41..846421402fa0 100644 --- a/sci-physics/fastjet-contrib/fastjet-contrib-9999.ebuild +++ b/sci-physics/fastjet-contrib/fastjet-contrib-1.101-r2.ebuild @@ -1,39 +1,31 @@ -# 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[plugins]" 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.055-ar-part2.patch "${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 \ @@ -59,4 +51,6 @@ src_install() { # 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 + # purge static libs, which are includedin fragile lib above + find "${ED}" -type f -name '*.a' -delete || die } diff --git a/sci-physics/fastjet-contrib/fastjet-contrib-9999.ebuild b/sci-physics/fastjet-contrib/fastjet-contrib-9999.ebuild index c2670065ef41..de9b4538c6e2 100644 --- a/sci-physics/fastjet-contrib/fastjet-contrib-9999.ebuild +++ b/sci-physics/fastjet-contrib/fastjet-contrib-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2024 Gentoo Authors +# Copyright 2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -21,7 +21,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.055-ar-part2.patch "${FILESDIR}"/${PN}-1.101-ldflags.patch ) @@ -59,4 +59,6 @@ src_install() { # 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 + # purge static libs, which are includedin fragile lib above + find "${ED}" -type f -name '*.a' -delete || die } 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 index 2bfb63960c6b..e6fe2f9c87cb 100644 --- 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 @@ -1,3 +1,4 @@ +https://github.com/fjcontrib/fjcontrib/issues/3 --- a/SignalFreeBackgroundEstimator/Makefile +++ b/SignalFreeBackgroundEstimator/Makefile @@ -39,8 +39,8 @@
