diff options
Diffstat (limited to 'sci-physics')
| -rw-r--r-- | sci-physics/Manifest.gz | bin | 4205 -> 4209 bytes | |||
| -rw-r--r-- | sci-physics/rivet/Manifest | 3 | ||||
| -rw-r--r-- | sci-physics/rivet/files/rivet-3.1.10-versions.patch | 65 | ||||
| -rw-r--r-- | sci-physics/rivet/rivet-3.1.10-r1.ebuild (renamed from sci-physics/rivet/rivet-3.1.10.ebuild) | 3 |
4 files changed, 69 insertions, 2 deletions
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz Binary files differindex 3cb02f7342e8..cf373d27ded8 100644 --- a/sci-physics/Manifest.gz +++ b/sci-physics/Manifest.gz diff --git a/sci-physics/rivet/Manifest b/sci-physics/rivet/Manifest index a4e9641aec4b..07af521309fc 100644 --- a/sci-physics/rivet/Manifest +++ b/sci-physics/rivet/Manifest @@ -1,10 +1,11 @@ AUX rivet-3.1.10-ref_cin.patch 1050 BLAKE2B 81c4d7628977d5a9ea22b4ce65bc5dc26db389b092f784a006ed79a3533325f28ce219de83b571ea106c7e582034415f7f969852893ce4375955b9980991422a SHA512 37f7fedc855c625af70384d599ed54b58e69be118aae5d0f9c76999bcf7ff19a9283aa30d6667c4366c5a93a8e9d6ba36f5f177161fb45cc5b4ae88a121398f4 +AUX rivet-3.1.10-versions.patch 3868 BLAKE2B 673d94a64e20104c9605a127a7c53483f43479960783b784eaccedd9a297006f9bcbd6ff2fbec6f8cd963648e06a77409722b9d54b769231398191cbcf27b0c9 SHA512 afb45897acc503ecc410616c5237f1b9b171863a34d57c854f43176bbd14c5a0c03be55eea75730fa76a7b27ece5818be6743e0679ee1e9e5c97a77d6d65cdeb AUX rivet-3.1.6-binreloc.patch 626 BLAKE2B 2d3d14b334e3dd826534401ef2613643da0302f2e29148173aba08f46454169956c4f5d53ad6fff9e29f35bed97ba9a697ddc8fd34a22677cab3c30632e48175 SHA512 699bc0209e01120266436421d5f4f5dd97c81da7f107394654a4a42dd141545de63e9143de96da2d4d668e1ae1d3165d290eec48d567a872553d494694aa0229 AUX rivet-3.1.9-pythontests.patch 508 BLAKE2B 76f758a47643efbe2b997b184c8af7d86055456d84e8bcbdcd67f0836d631f3e38d9b7c53c69133c17ff0f15ae212710e253fa68f794583a321b541baa58a331 SHA512 98fb734113b4639ead244ae044df2ddd85d62247a669f1e3e23ec35b63eb7db56e7999fb4d5144ac313eb6f5bd71e25ca31338f51c0256a4290af8e74cff9a78 DIST rivet-3.1.10.tar.gz 36327949 BLAKE2B 76d8ed8b3ee0eda2f7f03b4e423c46f49d39006a4ab0b66622ab2b2a7817f91f1f7bc648ecfb2e9d2d73da1619069c25fe9078c9b04a54cce8e1a71c33dc6b1a SHA512 9a0a3516686b82c7cf667bab230229553e9e49e5656d763046a86baa1f2d3fdb3167e53540533ebe5da532e71f15140ab8dd16de4075fd76e634e0c6919155e4 DIST rivet-3.1.9.tar.gz 37599489 BLAKE2B a470254b8d4303f5738ca9c4ff0061a000d06e37ee805d909dfc709f14e5ebc8958739912f9b9bbf80bb38e79f4b8df057d7ac59c6924fddd56918102243aeed SHA512 21c1ca6eda7ac7d0394875cd8b972d3e65df1bf0e773d2094bab1997c6fab67381d6202aef8024eaa363c03b2345bae95d54dca1ce38c2499ddc24a7e7f93bdc DIST rivet-4.0.2.tar.gz 39847467 BLAKE2B b7c1c03ea9503a6da536ca15a0ff961768e3d7d4140bb1ba19c20ba75b55592609bf2c99aece37436c1f4bdf443bd69ab5b59f86fec972ae5b8275359747b9e4 SHA512 0e383e015c425a9e8d734a9ef624222b8c025cd48cb174075b60f7f5a818213ea9f4352445c36bdc574f80722cf4ae3dbe083af89a1f9083fa3632bdf94b860a -EBUILD rivet-3.1.10.ebuild 2812 BLAKE2B 52ce856a54f65a804e08314cf951f89c7a4bc1e25114ab9cca55c31725c0805473ecf1c94c9eea8d6cf22dcf59e5578cef03da9ba84982191f2cd9bc955f829b SHA512 21ad5dc23d0d150f0e2fa33602b9ae703eeb08930687e1f233624a1cdefafcb0680462c431890c7c1ec888d3c18f5866a84817cb09cf81dda0b84a60cd89c78c +EBUILD rivet-3.1.10-r1.ebuild 2919 BLAKE2B 8f8f261ac09fb6fd6bb843abbbfc4bb01a270b75e837784eb15b24fc4dd18dcae91f8be93ba7ff4ba8f68fac92ccda32decb2f3447981b987b5dc9f67432c5d1 SHA512 e70fd47eb53180aed25d8dc7dfc2698630e1bbf6177d7ca91d19052ad0607ecee7a2b6ceb29b271ae8b49f9e179e76c22629f65aaf02e5045a6d01887eb5bbe7 EBUILD rivet-3.1.9.ebuild 2900 BLAKE2B a47c46505beff3595c236976923b74ce795dbb7ac7ff140d74f1c8f5d20978b5406be8ddea8b44983ee0ab9a2cfebb600b35632644b7cdc3dd82d3692631c5fd SHA512 3039bcaced8628e69d396d6bd9b59fd8fe345ce0abe12f173959f081d92aa9a400ff93b608a8b3ed5c65817fd7a797e28cb2c3bad0a4ee2f29a79838ec2fe7ad EBUILD rivet-4.0.2.ebuild 2625 BLAKE2B bd63bc5e3849d77bd64268813eaa6f4cfeb1f9a644261561010deef5db5771f496a84347cf1355eeff34a75c86e4d9709e09fc2d45e10a0487773b873bed3272 SHA512 6251c58000fdcae35c86eab401bbe9bfb2cb66ce9d2b7bac43850f2925ffa64ad476d9715caf6ca38b55bff8b7e7dc4688c0a586b082985920bafd61d6297ca6 EBUILD rivet-9999.ebuild 2603 BLAKE2B 15fbf948fc75eb5fb3fe727b001b6f6daba19fc906136920f527498aa32e782e9da3fe3c46bc951dd4ef481d647d6976643090b11de441bd2efbf8a51f447743 SHA512 78f9fa5dfe764863f4bf3633081fe5d0db7564665753a4fe2a2fcdac158153c5ce38dfebe41ae5096ee4099ec42982a4925cb670d3a309172603e62a64fdfa58 diff --git a/sci-physics/rivet/files/rivet-3.1.10-versions.patch b/sci-physics/rivet/files/rivet-3.1.10-versions.patch new file mode 100644 index 000000000000..394a7dde9885 --- /dev/null +++ b/sci-physics/rivet/files/rivet-3.1.10-versions.patch @@ -0,0 +1,65 @@ +--- a/configure.ac 2024-11-28 14:14:00.608290493 +0100 ++++ b/configure.ac 2024-11-28 14:19:41.434877928 +0100 +@@ -21,9 +21,9 @@ + AC_SUBST(LT_OBJDIR) + + ## Compute version code +-let rivet_major=[`echo "$PACKAGE_VERSION" | cut -d. -f1 | sed -e 's/^0*//'`] +-let rivet_minor=[`echo "$PACKAGE_VERSION" | cut -d. -f2 | sed -e 's/^0*//'`] +-let rivet_micro=[`echo "$PACKAGE_VERSION" | cut -d. -f3 | sed -e 's/^0*//' | sed -e 's/[^0-9].*//g'`] ++let rivet_major=[`echo "$PACKAGE_VERSION" | cut -d. -f1 | sed -e 's/^0*//;s/\([0-9]*\).*/\1/g;s/^$/0/'`] ++let rivet_minor=[`echo "$PACKAGE_VERSION" | cut -d. -f2 | sed -e 's/^0*//;s/\([0-9]*\).*/\1/g;s/^$/0/'`] ++let rivet_micro=[`echo "$PACKAGE_VERSION" | cut -d. -f3 | sed -e 's/^0*//;s/\([0-9]*\).*/\1/g;s/^$/0/'`] + let PACKAGE_VERSION_CODE=10000*$rivet_major+100*$rivet_minor+$rivet_micro + + ## Package-specific #defines +@@ -79,9 +79,9 @@ + AC_MSG_CHECKING([YODA version using yoda-config]) + YODA_VERSION=`$YODACONFIG --version` + AC_MSG_RESULT([$YODA_VERSION]) +- YODA_VERSION1=[`echo $YODA_VERSION | cut -d. -f1 | sed -e 's/^0*//' | sed -e 's/\([0-9]*\).*/\1/g'`] +- YODA_VERSION2=[`echo $YODA_VERSION | cut -d. -f2 | sed -e 's/^0*//' | sed -e 's/\([0-9]*\).*/\1/g'`] +- YODA_VERSION3=[`echo $YODA_VERSION | cut -d. -f3 | sed -e 's/^0*//' | sed -e 's/\([0-9]*\).*/\1/g'`] ++ YODA_VERSION1=[`echo $YODA_VERSION | cut -d. -f1 | sed -e 's/^0*//;s/\([0-9]*\).*/\1/g;s/^$/0/'`] ++ YODA_VERSION2=[`echo $YODA_VERSION | cut -d. -f2 | sed -e 's/^0*//;s/\([0-9]*\).*/\1/g;s/^$/0/'`] ++ YODA_VERSION3=[`echo $YODA_VERSION | cut -d. -f3 | sed -e 's/^0*//;s/\([0-9]*\).*/\1/g;s/^$/0/'`] + let YODA_VERSION_INT=YODA_VERSION1*10000+YODA_VERSION2*100+YODA_VERSION3 + if test $YODA_VERSION_INT -lt 10800; then + AC_MSG_ERROR([YODA version isn't sufficient: at least version 1.8.0 required]) +@@ -154,8 +154,8 @@ + fi + hepmc_version=`./conftest` + if test x$hepmc_version != x; then +- let hepmc_major=[`echo "$hepmc_version" | cut -d. -f1 | sed -e 's/^0*//'`] +- let hepmc_minor=[`echo "$hepmc_version" | cut -d. -f2 | sed -e 's/^0*//'`] ++ let hepmc_major=[`echo "$hepmc_version" | cut -d. -f1 | sed -e 's/^0*//;s/\([0-9]*\).*/\1/g;s/^$/0/'`] ++ let hepmc_minor=[`echo "$hepmc_version" | cut -d. -f2 | sed -e 's/^0*//;s/\([0-9]*\).*/\1/g;s/^$/0/'`] + fi + rm -f conftest conftest.cpp conftest.cc conftest.C + HEPMC_VERSION=$hepmc_major$hepmc_minor +@@ -184,9 +184,9 @@ + fi + hepmc_version=`./conftest` + if test x$hepmc_version != x; then +- let hepmc_major=[`echo "$hepmc_version" | cut -d. -f1 | sed -e 's/^0*//'`] +- let hepmc_minor=[`echo "$hepmc_version" | cut -d. -f2 | sed -e 's/^0*//'`] +- let hepmc_third=[`echo "$hepmc_version" | cut -d. -f3 | sed -e 's/^0*//'`] ++ let hepmc_major=[`echo "$hepmc_version" | cut -d. -f1 | sed -e 's/^0*//;s/\([0-9]*\).*/\1/g;s/^$/0/'`] ++ let hepmc_minor=[`echo "$hepmc_version" | cut -d. -f2 | sed -e 's/^0*//;s/\([0-9]*\).*/\1/g;s/^$/0/'`] ++ let hepmc_third=[`echo "$hepmc_version" | cut -d. -f3 | sed -e 's/^0*//;s/\([0-9]*\).*/\1/g;s/^$/0/'`] + fi + rm -f conftest conftest.cpp conftest.cc conftest.C + HEPMC_VERSION=$hepmc_major$hepmc_minor$hepmc_third +@@ -219,9 +219,9 @@ + AC_MSG_CHECKING([FastJet version using fastjet-config]) + fjversion=`$FJCONFIG --version` + AC_MSG_RESULT([$fjversion]) +- fjmajor=$(echo $fjversion | cut -f1 -d.) +- fjminor=$(echo $fjversion | cut -f2 -d.) +- fjmicro=$(echo $fjversion | cut -f3 -d.) ++ fjmajor=$(echo $fjversion | cut -f1 -d. | sed -e 's/^0*//;s/\([0-9]*\).*/\1/g;s/^$/0/') ++ fjminor=$(echo $fjversion | cut -f2 -d. | sed -e 's/^0*//;s/\([0-9]*\).*/\1/g;s/^$/0/') ++ fjmicro=$(echo $fjversion | cut -f3 -d. | sed -e 's/^0*//;s/\([0-9]*\).*/\1/g;s/^$/0/') + if test "$fjmajor" -lt 3 -o "$fjminor" -lt 2 ; then #< only works for v3.x + AC_MSG_ERROR([FastJet version 3.2.0 or later is required]) + fi diff --git a/sci-physics/rivet/rivet-3.1.10.ebuild b/sci-physics/rivet/rivet-3.1.10-r1.ebuild index 085d80fb47d5..b3594c3ce620 100644 --- a/sci-physics/rivet/rivet-3.1.10.ebuild +++ b/sci-physics/rivet/rivet-3.1.10-r1.ebuild @@ -36,7 +36,7 @@ RDEPEND=" >=sci-physics/fastjet-3.4.0[plugins] >=sci-physics/fastjet-contrib-1.048 hepmc2? ( sci-physics/hepmc:2=[-cm(-),gev(+)] ) - hepmc3? ( sci-physics/hepmc:3=[-cm(-),gev(+)] ) + hepmc3? ( <sci-physics/hepmc-3.3.0:3=[-cm(-),gev(+)] ) sci-libs/gsl zlib? ( sys-libs/zlib ) @@ -67,6 +67,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.1.6-binreloc.patch "${FILESDIR}"/${PN}-3.1.9-pythontests.patch "${FILESDIR}"/${PN}-3.1.10-ref_cin.patch # https://gitlab.com/hepcedar/rivet/-/merge_requests/844 + "${FILESDIR}"/${PN}-3.1.10-versions.patch # https://gitlab.com/hepcedar/rivet/-/merge_requests/979 ) pkg_setup() { |