[gentoo-commits] repo/proj/guru:master commit in: dev-libs/boinc-zip/

[Andrew Ammerlaan]

commit:     1c202c07d59b9d1f219599d6ccf20ab4f6560226
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Mon Jul 19 07:58:39 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Jul 19 08:10:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1c202c07

dev-libs/boinc-zip: add 7.18, remove other

Notable changes:
* use make targets instead of sed voodoo
* do not use patch version as the library is rarely updated

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 dev-libs/boinc-zip/Manifest                 |  3 +--
 dev-libs/boinc-zip/boinc-zip-7.16.16.ebuild | 36 -----------------------------
 dev-libs/boinc-zip/boinc-zip-7.16.17.ebuild | 36 -----------------------------
 dev-libs/boinc-zip/boinc-zip-7.18.ebuild    | 36 +++++++++++++++++++++++++++++
 4 files changed, 37 insertions(+), 74 deletions(-)

diff --git a/dev-libs/boinc-zip/Manifest b/dev-libs/boinc-zip/Manifest
index 909891f1b..0e53bce6e 100644
--- a/dev-libs/boinc-zip/Manifest
+++ b/dev-libs/boinc-zip/Manifest
@@ -1,2 +1 @@
-DIST boinc-7.16.16.tar.gz 49599131 BLAKE2B 819ab85c19a684144711f77e669b892aa73c006b81c1d7ef7adbd9d580e1e8473ae27b52dc17953ee677c70fc78ed15df936afd740e629715f30f2b81d84ea6f SHA512 dd7042e176d6506c70de7866556ae73b2f45734df92038086d5b0414751f3da08dc571c49f0c26d747d3fb2577674d3ff8cdec7d3563861eaaaa5af9c1db0a0e
-DIST boinc-7.16.17.tar.gz 49628624 BLAKE2B 87e266a29506ecaa41fd18a2521b08c291548a4e31f7748001e5214e6f1fada1ded8bb8b559635d4f9c7c256cd7829dcf9132c02448c559d5ceb13524ca42e0f SHA512 e9882f37ad5c83ed020155c8192228322932f83b88ed00d025dcda63bff2dca109ecdcbaf98b48c4522b841f545f32352e5c158ae0a41de0a1f2941ac8135221
+DIST boinc-7.18.0.tar.gz 50848912 BLAKE2B 1088b734a5111dac1b42110cc5059e7114ef2bb2a7e786d20e681ac96543869fbf170c566c6c7ea93ac97f54f347e388d33d7d39c19d59cbe7bf3066d8c69fde SHA512 4bccd576bc786cf5d7b01a1ff379545b4d9ddb818c8561d3dccb836b6490668c73a0c10884609980dfc6e8250173ead71a5f6044cabe69a0c93316e03515a0d9

diff --git a/dev-libs/boinc-zip/boinc-zip-7.16.16.ebuild b/dev-libs/boinc-zip/boinc-zip-7.16.16.ebuild
deleted file mode 100644
index 31e7072d1..000000000
--- a/dev-libs/boinc-zip/boinc-zip-7.16.16.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_PV=$(ver_cut 1-2)
-
-DESCRIPTION="Wrapper for the zip/unzip functions to expose to BOINC clients"
-HOMEPAGE="https://boinc.berkeley.edu/trac/wiki/FileCompression"
-
-SRC_URI="https://github.com/BOINC/boinc/archive/client_release/${MY_PV}/${PV}.tar.gz -> boinc-${PV}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-S="${WORKDIR}/boinc-client_release-${MY_PV}-${PV}/zip"
-
-LICENSE="Info-ZIP LGPL-3+"
-SLOT="0"
-
-src_prepare() {
-	default
-	sed '/$(LN) .libs\/$(LIBBOINC_ZIP_STATIC)/d' -i Makefile.am || die
-
-	cd .. || die
-	eautoreconf
-}
-
-src_configure() {
-	cd .. || die
-	econf --enable-pkg-devel --disable-static
-}
-
-src_install() {
-	default
-	rm "${ED}"/usr/*/libboinc_zip.la || die
-}

diff --git a/dev-libs/boinc-zip/boinc-zip-7.16.17.ebuild b/dev-libs/boinc-zip/boinc-zip-7.16.17.ebuild
deleted file mode 100644
index 0d89894c2..000000000
--- a/dev-libs/boinc-zip/boinc-zip-7.16.17.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MY_PV=$(ver_cut 1-2)
-
-DESCRIPTION="Wrapper for the zip/unzip functions to expose to BOINC clients"
-HOMEPAGE="https://boinc.berkeley.edu/trac/wiki/FileCompression"
-
-SRC_URI="https://github.com/BOINC/boinc/archive/client_release/${MY_PV}/${PV}.tar.gz -> boinc-${PV}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-S="${WORKDIR}/boinc-client_release-${MY_PV}-${PV}/zip"
-
-LICENSE="Info-ZIP LGPL-3+"
-SLOT="0"
-
-src_prepare() {
-	default
-	sed '/$(LN) .libs\/$(LIBBOINC_ZIP_STATIC)/d' -i Makefile.am || die
-
-	cd .. || die
-	eautoreconf
-}
-
-src_configure() {
-	cd .. || die
-	econf --enable-pkg-devel --disable-static
-}
-
-src_install() {
-	default
-	rm "${ED}"/usr/*/libboinc_zip.la || die
-}

diff --git a/dev-libs/boinc-zip/boinc-zip-7.18.ebuild b/dev-libs/boinc-zip/boinc-zip-7.18.ebuild
new file mode 100644
index 000000000..e800b45e2
--- /dev/null
+++ b/dev-libs/boinc-zip/boinc-zip-7.18.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_PN=${PN%%-*}
+MY_PV="${PV}.0"
+DESCRIPTION="Wrapper for the zip/unzip functions to expose to BOINC clients"
+HOMEPAGE="https://boinc.berkeley.edu/trac/wiki/FileCompression"
+
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/client_release/${PV}/${MY_PV}.tar.gz -> ${MY_PN}-${MY_PV}.tar.gz"
+KEYWORDS="~amd64 ~arm64 ~x86"
+S="${WORKDIR}/${MY_PN}-client_release-${PV}-${MY_PV}"
+
+LICENSE="Info-ZIP LGPL-3+"
+SLOT="0"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-pkg-devel
+}
+
+src_compile() {
+	emake -C zip lib${PN//-/_}.la
+}
+
+src_install() {
+	emake -C zip install-{libLTLIBRARIES,pkgincludeHEADERS} DESTDIR="${D}"
+	find "${ED}" -name '*.la' -delete || die
+}