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>

6 files changed, 22 insertions, 88 deletions

diff --git a/profiles/package.mask b/profiles/package.mask
index de7eb00e29..7a7af08429 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -9,12 +9,6 @@
 # TODO: Either fix per profile masking in overlays, or move
 # relevant entries to the relevant package.mask files in ::gentoo
 
-# Arthur Zamarin <arthurzam@gentoo.org> (2022-05-02)
-# Depends on removed ~sci-misc/boinc-7.16.17
-# Bug #842204
-sci-misc/boinc-wrapper
-sci-biology/cmdock
-
 # Sergey Torokhov <torokhov-s-a@yandex.ru> (2022-04-29)
 # The upstream didn't update the md-environ since 2016.
 # The only rev. dependency is =app-doc/ford-1.6.8
diff --git a/sci-misc/boinc-wrapper/Manifest b/sci-misc/boinc-wrapper/Manifest
index a8d70e790e..b9de5fbda7 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 e282280fdf..0000000000
--- 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 91ccc4e187..470bb372d2 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 f503ba847a..0000000000
--- 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 0000000000..58a9e766e9
--- /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)