From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 69747158091 for ; Fri, 3 Jun 2022 08:35:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 99B57E0875; Fri, 3 Jun 2022 08:35:26 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 74CDEE0875 for ; Fri, 3 Jun 2022 08:35:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4105834186D for ; Fri, 3 Jun 2022 08:35:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CC6804E7 for ; Fri, 3 Jun 2022 08:35:23 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1654245304.5777e5659dffc667a1b200323d842a4d00002c07.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/hpx/, sys-cluster/hpx/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/hpx/Manifest sys-cluster/hpx/files/hpx-1.7.1-python.patch sys-cluster/hpx/hpx-1.7.1-r1.ebuild X-VCS-Directories: sys-cluster/hpx/files/ sys-cluster/hpx/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 5777e5659dffc667a1b200323d842a4d00002c07 X-VCS-Branch: master Date: Fri, 3 Jun 2022 08:35:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6e3fc4b7-f58d-4f80-aced-07d005a5a076 X-Archives-Hash: fd2564bce6763f2c34dfffc12601d269 commit: 5777e5659dffc667a1b200323d842a4d00002c07 Author: Kurt Kanzenbach kmk-computers de> AuthorDate: Mon May 30 18:56:48 2022 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Fri Jun 3 08:35:04 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5777e565 sys-cluster/hpx: drop 1.7.1-r1 Signed-off-by: Kurt Kanzenbach kmk-computers.de> Closes: https://github.com/gentoo/gentoo/pull/25706 Signed-off-by: Florian Schmaus gentoo.org> sys-cluster/hpx/Manifest | 1 - sys-cluster/hpx/files/hpx-1.7.1-python.patch | 30 -------- sys-cluster/hpx/hpx-1.7.1-r1.ebuild | 104 --------------------------- 3 files changed, 135 deletions(-) diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest index 0e04f6bf71bc..4783253e8786 100644 --- a/sys-cluster/hpx/Manifest +++ b/sys-cluster/hpx/Manifest @@ -1,2 +1 @@ -DIST hpx-1.7.1.tar.gz 4751163 BLAKE2B 21e417dab5c118b16ab8d2955b0d65a95ca7d0e2f777496306855e4098cfb400962dd9e0cf03ebbab5e3348f2f985d1053d0a70124c0925c77859e8ada209cec SHA512 6bdb294da393a198abf81d5f63799a066334755eed0fda40bbfc4e9a774b6e19a3e5ad7ab45c989d31f3797e7b547bb552c29f51b552d9a79d166f86aee375a3 DIST hpx-1.8.0.tar.gz 5209106 BLAKE2B aab9d3743cc2d73c2d3a6a2f2323e35dbe38cf506618475ea627d9c0d92855632f646404f5b257e2260eabe6bb22e8090bc3db2aafd9f4f71a0eeb62d7286247 SHA512 80afc93d517144d5c11164f82d7f0dd6fd71c079fb65930532c4fd96b6a5497cdf972bee8a6251035548a3662579a3bee5c04802569f47bc3c042ca868716cb7 diff --git a/sys-cluster/hpx/files/hpx-1.7.1-python.patch b/sys-cluster/hpx/files/hpx-1.7.1-python.patch deleted file mode 100644 index 21b7ce3ceeff..000000000000 --- a/sys-cluster/hpx/files/hpx-1.7.1-python.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 3d8d3acf0daad9cec8b092d67f7187265f7704e3 Mon Sep 17 00:00:00 2001 -From: Kurt Kanzenbach -Date: Tue, 17 Mar 2020 16:20:35 +0100 -Subject: [PATCH 1/4] cmake: python: Use standard python interpreter - -These scripts are needed during build and run time. So, use a python interpreter -which works for both cases. - -Signed-off-by: Kurt Kanzenbach ---- - cmake/templates/hpxcxx.in | 2 +- - cmake/templates/hpxrun.py.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - ---- a/cmake/templates/hpxcxx.in -+++ b/cmake/templates/hpxcxx.in -@@ -1,4 +1,4 @@ --#! @PYTHON_EXECUTABLE@ -+#! /usr/bin/env python - # - # Copyright (c) 2014 Steven R. Brandt - # ---- a/cmake/templates/hpxrun.py.in -+++ b/cmake/templates/hpxrun.py.in -@@ -1,4 +1,4 @@ --#! @PYTHON_EXECUTABLE@ -+#! /usr/bin/env python - # - # Copyright (c) 2014 Thomas Heller - # diff --git a/sys-cluster/hpx/hpx-1.7.1-r1.ebuild b/sys-cluster/hpx/hpx-1.7.1-r1.ebuild deleted file mode 100644 index c1be762e1c26..000000000000 --- a/sys-cluster/hpx/hpx-1.7.1-r1.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) - -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/STEllAR-GROUP/hpx.git" -else - SRC_URI="https://github.com/STEllAR-GROUP/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -fi -inherit check-reqs cmake multiprocessing python-single-r1 - -DESCRIPTION="C++ runtime system for parallel and distributed applications" -HOMEPAGE="https://stellar.cct.lsu.edu/tag/hpx/" - -SLOT="0" -LICENSE="Boost-1.0" -IUSE="examples jemalloc mpi papi +perftools tbb" -# tests fail to compile -RESTRICT="test" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - ?? ( jemalloc perftools tbb ) -" - -BDEPEND=" - virtual/pkgconfig -" -RDEPEND=" - ${PYTHON_DEPS} - >=dev-cpp/asio-1.12.0 - dev-libs/boost:= - sys-apps/hwloc:= - sys-libs/zlib - jemalloc? ( dev-libs/jemalloc:= ) - mpi? ( virtual/mpi ) - papi? ( dev-libs/papi ) - perftools? ( dev-util/google-perftools:= ) - tbb? ( dev-cpp/tbb:= ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-python.patch" -) - -hpx_memory_requirement() { - # HPX needs enough main memory for compiling - # rule of thumb: 1G per job - if [[ -z ${MAKEOPTS} ]] ; then - echo "2G" - else - local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") - echo "${jobs}G" - fi -} - -pkg_pretend() { - local CHECKREQS_MEMORY=$(hpx_memory_requirement) - check-reqs_pkg_setup -} - -pkg_setup() { - local CHECKREQS_MEMORY=$(hpx_memory_requirement) - check-reqs_pkg_setup - python-single-r1_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DHPX_WITH_EXAMPLES=OFF - -DHPX_WITH_DOCUMENTATION=OFF - -DHPX_WITH_PARCELPORT_MPI=$(usex mpi) - -DHPX_WITH_PAPI=$(usex papi) - -DHPX_WITH_GOOGLE_PERFTOOLS=$(usex perftools) - -DBUILD_TESTING=OFF - ) - if use jemalloc; then - mycmakeargs+=( -DHPX_WITH_MALLOC=jemalloc ) - elif use perftools; then - mycmakeargs+=( -DHPX_WITH_MALLOC=tcmalloc ) - elif use tbb; then - mycmakeargs+=( -DHPX_WITH_MALLOC=tbbmalloc ) - else - mycmakeargs+=( -DHPX_WITH_MALLOC=system ) - fi - - cmake_src_configure -} - -src_compile() { - cmake_src_compile -} - -src_install() { - cmake_src_install - use examples && dodoc -r examples/ - python_fix_shebang "${ED}" -}