diff options
author | Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in> | 2022-05-30 22:28:10 +0500 |
---|---|---|
committer | Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in> | 2022-05-30 22:46:59 +0500 |
commit | 6805b9c4ce3b0097ff9747c3421930fbae048c4c (patch) | |
tree | 3ed881736fdab3f970cb29fdd4cb7b1f0193b4ca /sci-misc | |
parent | dev-libs/boinc-zip: drop 7.18 (diff) | |
download | guru-6805b9c4ce3b0097ff9747c3421930fbae048c4c.tar.gz guru-6805b9c4ce3b0097ff9747c3421930fbae048c4c.tar.bz2 guru-6805b9c4ce3b0097ff9747c3421930fbae048c4c.zip |
sci-misc/boinc-wrapper: version bump to 7.18.1
Closes: https://bugs.gentoo.org/842204
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>
Diffstat (limited to 'sci-misc')
-rw-r--r-- | sci-misc/boinc-wrapper/Manifest | 2 | ||||
-rw-r--r-- | sci-misc/boinc-wrapper/boinc-wrapper-7.16.17.ebuild | 55 | ||||
-rw-r--r-- | sci-misc/boinc-wrapper/boinc-wrapper-7.18.1.ebuild (renamed from sci-misc/boinc-wrapper/boinc-wrapper-7.16.17-r1.ebuild) | 2 | ||||
-rw-r--r-- | sci-misc/boinc-wrapper/files/boinc-wrapper-7.16-makefile.patch | 25 | ||||
-rw-r--r-- | sci-misc/boinc-wrapper/files/boinc-wrapper-7.18-makefile.patch | 20 |
5 files changed, 22 insertions, 82 deletions
diff --git a/sci-misc/boinc-wrapper/Manifest b/sci-misc/boinc-wrapper/Manifest index a8d70e790..b9de5fbda 100644 --- a/sci-misc/boinc-wrapper/Manifest +++ b/sci-misc/boinc-wrapper/Manifest @@ -1 +1 @@ -DIST boinc-7.16.17.tar.gz 49628624 BLAKE2B 87e266a29506ecaa41fd18a2521b08c291548a4e31f7748001e5214e6f1fada1ded8bb8b559635d4f9c7c256cd7829dcf9132c02448c559d5ceb13524ca42e0f SHA512 e9882f37ad5c83ed020155c8192228322932f83b88ed00d025dcda63bff2dca109ecdcbaf98b48c4522b841f545f32352e5c158ae0a41de0a1f2941ac8135221 +DIST boinc-7.18.1.tar.gz 50851883 BLAKE2B 64d321c8c56d7c34a08646dc16de5ddbb9b8e4be57b673fa77515845d967e28b5cf1fda677293e2fc8cf36a18ac0b7e7feebfbd8e434ebed41b8280c7395950d SHA512 200587a0896aec6a7e7247132811141909aa333cb2bb9350c5ba016ffdf056413b1c5346361b311c087634b2d29cdbb204486385d8561a299b68739244c5a532 diff --git a/sci-misc/boinc-wrapper/boinc-wrapper-7.16.17.ebuild b/sci-misc/boinc-wrapper/boinc-wrapper-7.16.17.ebuild deleted file mode 100644 index e282280fd..000000000 --- a/sci-misc/boinc-wrapper/boinc-wrapper-7.16.17.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -MY_PN=${PN%%-*} -MY_PV=$(ver_cut 1-2) -DESCRIPTION="Wrapper to use non-BOINC apps with BOINC" -HOMEPAGE="https://boinc.berkeley.edu/trac/wiki/WrapperApp" - -SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/client_release/${MY_PV}/${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz" -KEYWORDS="~amd64 ~arm64 ~x86" -S="${WORKDIR}/${MY_PN}-client_release-${MY_PV}-${PV}/samples/${PN#*-}" - -LICENSE="LGPL-3+ regexp-UofT" -SLOT="0" - -# sci-misc/boinc doesn't have all necessary headers, so -# we have to include from build root. All that said, -# versions must not mismatch. -RDEPEND=" - ~sci-misc/boinc-${PV} - >=dev-libs/boinc-zip-${PV} -" -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}"/${PN}-$(ver_cut 1-2)-makefile.patch ) -DOCS=( job.xml ) - -src_configure() { - cd ../.. || die - - bash ./generate_svn_version.sh || die - - # autotools would take an eternity to configure - cat <<-EOF > "config.h" - #ifndef BOINC_CONFIG_H - #define BOINC_CONFIG_H - - #define HAVE_SYS_RESOURCE_H 1 - #define HAVE_SYS_TIME_H 1 - #define HAVE_SYS_WAIT_H 1 - - #endif - EOF - - tc-export CC CXX -} - -src_install() { - einstalldocs - newbin wrapper boinc-wrapper -} diff --git a/sci-misc/boinc-wrapper/boinc-wrapper-7.16.17-r1.ebuild b/sci-misc/boinc-wrapper/boinc-wrapper-7.18.1.ebuild index 91ccc4e18..470bb372d 100644 --- a/sci-misc/boinc-wrapper/boinc-wrapper-7.16.17-r1.ebuild +++ b/sci-misc/boinc-wrapper/boinc-wrapper-7.18.1.ebuild @@ -18,7 +18,7 @@ SLOT="0" # versions must not mismatch. RDEPEND=" ~sci-misc/boinc-${PV} - >=dev-libs/boinc-zip-${PV} + dev-libs/boinc-zip " DEPEND="${RDEPEND}" diff --git a/sci-misc/boinc-wrapper/files/boinc-wrapper-7.16-makefile.patch b/sci-misc/boinc-wrapper/files/boinc-wrapper-7.16-makefile.patch deleted file mode 100644 index f503ba847..000000000 --- a/sci-misc/boinc-wrapper/files/boinc-wrapper-7.16-makefile.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/samples/wrapper/Makefile b/samples/wrapper/Makefile -index c20af9446d..5ecd76c45d 100644 ---- a/Makefile -+++ b/Makefile -@@ -7,8 +7,7 @@ BOINC_LIB_DIR = $(BOINC_DIR)/lib - BOINC_ZIP_DIR = $(BOINC_DIR)/zip - PTHREAD = -pthread - --CXXFLAGS += -g -O0 \ -- -Wall -W -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -fno-common \ -+CXXFLAGS += \ - -I$(BOINC_DIR) \ - -I$(BOINC_LIB_DIR) \ - -I$(BOINC_API_DIR) \ -@@ -41,5 +40,5 @@ REGEXP_OBJS = \ - regexp_memory.o \ - regexp_report.o - --wrapper: wrapper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a $(REGEXP_OBJS) -- $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o wrapper wrapper.o $(REGEXP_OBJS) libstdc++.a $(PTHREAD) -lboinc_api -lboinc -lboinc_zip -+wrapper: wrapper.o $(REGEXP_OBJS) -+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o wrapper wrapper.o $(REGEXP_OBJS) $(PTHREAD) -lboinc_api -lboinc -lboinc_zip $(LDFLAGS) --- -2.31.1 - diff --git a/sci-misc/boinc-wrapper/files/boinc-wrapper-7.18-makefile.patch b/sci-misc/boinc-wrapper/files/boinc-wrapper-7.18-makefile.patch new file mode 100644 index 000000000..58a9e766e --- /dev/null +++ b/sci-misc/boinc-wrapper/files/boinc-wrapper-7.18-makefile.patch @@ -0,0 +1,20 @@ +--- a/Makefile ++++ b/Makefile +@@ -22,8 +22,7 @@ + MAKEFILE_STDLIB = libstdc++.a + endif + +-CXXFLAGS += -g -O0 \ +- -Wall -W -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -fno-common \ ++CXXFLAGS += -Wall -W -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings \ + -I$(BOINC_DIR) \ + -I$(BOINC_LIB_DIR) \ + -I$(BOINC_API_DIR) \ +@@ -56,5 +55,5 @@ + regexp_memory.o \ + regexp_report.o + +-wrapper: wrapper.o $(MAKEFILE_STDLIB) $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a $(REGEXP_OBJS) +- $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o wrapper wrapper.o $(REGEXP_OBJS) $(MAKEFILE_LDFLAGS) -lboinc_api -lboinc -lboinc_zip $(STDCPPTC) ++wrapper: wrapper.o $(REGEXP_OBJS) ++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o wrapper wrapper.o $(REGEXP_OBJS) -lboinc_api -lboinc -lboinc_zip $(STDCPPTC) |