From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-block/nbd/
Date: Mon, 5 Jun 2023 05:24:31 +0000 (UTC) [thread overview]
Message-ID: <1685942617.6fa6af98b0362bfaba051b1dde9299f77baf2a03.sam@gentoo> (raw)
commit: 6fa6af98b0362bfaba051b1dde9299f77baf2a03
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 5 05:23:37 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 5 05:23:37 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fa6af98
sys-block/nbd: add 3.25
Drops gznbd support, at least for now, given it doesn't compile and upstream
haven't touched the dir in 9 years.
Closes: https://bugs.gentoo.org/907831
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-block/nbd/Manifest | 1 +
sys-block/nbd/{nbd-9999.ebuild => nbd-3.25.ebuild} | 34 +++++++++++++---------
sys-block/nbd/nbd-9999.ebuild | 34 +++++++++++++---------
3 files changed, 41 insertions(+), 28 deletions(-)
diff --git a/sys-block/nbd/Manifest b/sys-block/nbd/Manifest
index acfc433a02e0..163fff181c5e 100644
--- a/sys-block/nbd/Manifest
+++ b/sys-block/nbd/Manifest
@@ -1,2 +1,3 @@
DIST nbd-3.21.tar.xz 523472 BLAKE2B 8601306966b75e5000e34d784175f287553d478e8367d488b9a3c1c11bcb7345a4ba898f02a94b8e927fbded1d3a563a4f0369ad7b49b14dcb6f5ea8d91812f3 SHA512 5dc238e6f45eb230a6f92493a8c3b4891dee98fc47e120e59c3ca31c0a698537ca03f78e43c5e7089d93d548a22b5e3853ba228536d2fc688c3edf4a590fdb3f
DIST nbd-3.24.tar.xz 556928 BLAKE2B a07b0d8ce18cdea2e0778afbf9adfbc49f4fdc5746ec6f304f46d390adfc0a9ffb199e7c5cb6a72b3073a12a37f598e3780f0a1374b25c0e0a546653f7657d28 SHA512 b542733ca8bdfb6883591acd5cc82fd8fa64fed7ca85b01a961e0ad69b9655750e5317df9ec510b4147cc8b0b5cdfa0b43da53dd06c42863553555d710a3c85d
+DIST nbd-3.25.tar.xz 566360 BLAKE2B dce56fb91f6358955b0173b589df19ce2682e3cd6810b0bd74eeb973c24e52307ed55e197c13dcb9c2a62ac92e0dddb046fd1f4348862c7f7dc17bc479ba8cad SHA512 e8b83475a698b5c3718331b55a2c28fd10ca031e347aac7c439f1653d78a405fefa5cb2618e60f73b2f170a8c93d68e79a2cd5875e5c6a970cb1ef9d8e08ebda
diff --git a/sys-block/nbd/nbd-9999.ebuild b/sys-block/nbd/nbd-3.25.ebuild
similarity index 69%
copy from sys-block/nbd/nbd-9999.ebuild
copy to sys-block/nbd/nbd-3.25.ebuild
index 72e1b43ee6b1..a0554e3c6d37 100644
--- a/sys-block/nbd/nbd-9999.ebuild
+++ b/sys-block/nbd/nbd-3.25.ebuild
@@ -1,37 +1,39 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit systemd
DESCRIPTION="Userland client/server for kernel network block device"
-HOMEPAGE="https://nbd.sourceforge.net/"
-if [[ ${PV} = 9999 ]] ; then
+HOMEPAGE="https://nbd.sourceforge.io/"
+
+if [[ ${PV} == 9999 ]] ; then
inherit autotools git-r3
EGIT_REPO_URI="https://github.com/NetworkBlockDevice/nbd.git"
else
- SRC_URI="https://github.com/NetworkBlockDevice/nbd/releases/download/${P}/${P}.tar.xz
- mirror://sourceforge/nbd/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+ SRC_URI="https://github.com/NetworkBlockDevice/nbd/releases/download/${P}/${P}.tar.xz"
+ SRC_URI+=" mirror://sourceforge/nbd/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
fi
LICENSE="GPL-2"
SLOT="0"
IUSE="debug gnutls netlink zlib"
-BDEPEND="virtual/pkgconfig"
-
RDEPEND="
- >=dev-libs/glib-2.26.0
+ >=dev-libs/glib-2.32.0
gnutls? ( >=net-libs/gnutls-2.12.0 )
netlink? ( >=dev-libs/libnl-3.1 )
zlib? ( sys-libs/zlib )
"
DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/bison"
+BDEPEND="
+ sys-devel/bison
+ virtual/pkgconfig
+"
-if [[ ${PV} = 9999 ]] ; then
+if [[ ${PV} == 9999 ]] ; then
BDEPEND+="
app-text/docbook-sgml-dtd:4.5
app-text/docbook-sgml-utils
@@ -42,7 +44,7 @@ fi
src_prepare() {
default
- if [[ ${PV} = 9999 ]] ; then
+ if [[ ${PV} == 9999 ]] ; then
emake -C man -f mans.mk \
nbd-server.1.sh.in \
nbd-server.5.sh.in \
@@ -58,11 +60,15 @@ src_prepare() {
}
src_configure() {
+ # Needs Bison
+ unset YACC
+
local myeconfargs=(
--enable-lfs
+ # https://github.com/NetworkBlockDevice/nbd/issues/149
+ --disable-gznbd
$(use_enable !debug syslog)
$(use_enable debug)
- $(use_enable zlib gznbd)
$(use_with gnutls)
$(use_with netlink libnl)
)
diff --git a/sys-block/nbd/nbd-9999.ebuild b/sys-block/nbd/nbd-9999.ebuild
index 72e1b43ee6b1..a0554e3c6d37 100644
--- a/sys-block/nbd/nbd-9999.ebuild
+++ b/sys-block/nbd/nbd-9999.ebuild
@@ -1,37 +1,39 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit systemd
DESCRIPTION="Userland client/server for kernel network block device"
-HOMEPAGE="https://nbd.sourceforge.net/"
-if [[ ${PV} = 9999 ]] ; then
+HOMEPAGE="https://nbd.sourceforge.io/"
+
+if [[ ${PV} == 9999 ]] ; then
inherit autotools git-r3
EGIT_REPO_URI="https://github.com/NetworkBlockDevice/nbd.git"
else
- SRC_URI="https://github.com/NetworkBlockDevice/nbd/releases/download/${P}/${P}.tar.xz
- mirror://sourceforge/nbd/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+ SRC_URI="https://github.com/NetworkBlockDevice/nbd/releases/download/${P}/${P}.tar.xz"
+ SRC_URI+=" mirror://sourceforge/nbd/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
fi
LICENSE="GPL-2"
SLOT="0"
IUSE="debug gnutls netlink zlib"
-BDEPEND="virtual/pkgconfig"
-
RDEPEND="
- >=dev-libs/glib-2.26.0
+ >=dev-libs/glib-2.32.0
gnutls? ( >=net-libs/gnutls-2.12.0 )
netlink? ( >=dev-libs/libnl-3.1 )
zlib? ( sys-libs/zlib )
"
DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/bison"
+BDEPEND="
+ sys-devel/bison
+ virtual/pkgconfig
+"
-if [[ ${PV} = 9999 ]] ; then
+if [[ ${PV} == 9999 ]] ; then
BDEPEND+="
app-text/docbook-sgml-dtd:4.5
app-text/docbook-sgml-utils
@@ -42,7 +44,7 @@ fi
src_prepare() {
default
- if [[ ${PV} = 9999 ]] ; then
+ if [[ ${PV} == 9999 ]] ; then
emake -C man -f mans.mk \
nbd-server.1.sh.in \
nbd-server.5.sh.in \
@@ -58,11 +60,15 @@ src_prepare() {
}
src_configure() {
+ # Needs Bison
+ unset YACC
+
local myeconfargs=(
--enable-lfs
+ # https://github.com/NetworkBlockDevice/nbd/issues/149
+ --disable-gznbd
$(use_enable !debug syslog)
$(use_enable debug)
- $(use_enable zlib gznbd)
$(use_with gnutls)
$(use_with netlink libnl)
)
next reply other threads:[~2023-06-05 5:24 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-05 5:24 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-02-22 20:52 [gentoo-commits] repo/gentoo:master commit in: sys-block/nbd/ Sam James
2024-11-01 16:56 Andreas K. Hüttel
2024-10-09 0:06 Jakov Smolić
2024-10-05 14:30 Arthur Zamarin
2024-10-05 13:58 Arthur Zamarin
2024-10-05 12:02 Arthur Zamarin
2024-10-05 11:12 Sam James
2024-04-29 13:23 WANG Xuerui
2023-12-28 4:15 Sam James
2023-09-19 17:48 Arthur Zamarin
2023-06-05 8:31 Sam James
2023-06-05 8:31 Sam James
2023-06-05 8:14 Sam James
2023-06-05 8:14 Sam James
2023-06-05 8:14 Sam James
2023-01-28 15:04 Arthur Zamarin
2022-11-23 1:45 Sam James
2022-07-16 8:56 Agostino Sarubbo
2022-07-15 11:17 Arthur Zamarin
2022-07-15 11:08 Arthur Zamarin
2022-07-15 10:13 Arthur Zamarin
2022-06-01 1:25 Sam James
2021-05-15 22:15 David Seifert
2021-05-15 19:18 Sam James
2021-05-14 9:30 Agostino Sarubbo
2021-05-13 18:58 Sam James
2021-05-13 17:13 Sam James
2021-05-13 16:24 Sam James
2021-04-03 14:36 Mike Gilbert
2021-03-15 19:18 Sam James
2021-01-17 20:29 Lars Wendler
2021-01-17 20:29 Lars Wendler
2019-11-01 10:49 Mikle Kolyada
2019-09-28 21:20 Piotr Karbowski
2019-09-26 19:02 Thomas Deutschmann
2019-09-26 6:52 Sergei Trofimovich
2019-09-26 6:49 Sergei Trofimovich
2019-09-26 6:40 Sergei Trofimovich
2019-09-19 23:12 Thomas Deutschmann
2019-09-19 23:12 Thomas Deutschmann
2019-03-16 10:19 Sergei Trofimovich
2019-02-10 17:49 Mikle Kolyada
2019-02-09 18:36 Thomas Deutschmann
2019-02-07 10:51 Mikle Kolyada
2019-02-02 21:17 Sergei Trofimovich
2019-02-02 20:44 Sergei Trofimovich
2019-02-01 18:06 Lars Wendler
2019-02-01 18:06 Lars Wendler
2018-08-20 18:25 Thomas Deutschmann
2018-04-17 13:34 Lars Wendler
2018-04-17 13:29 Lars Wendler
2018-04-05 14:28 Lars Wendler
2018-04-01 21:13 Sergei Trofimovich
2018-03-19 10:19 Lars Wendler
2018-03-19 10:19 Lars Wendler
2017-09-19 23:31 Lars Wendler
2017-07-15 13:14 Markus Meier
2017-07-07 8:12 Agostino Sarubbo
2017-07-05 20:31 Agostino Sarubbo
2017-07-05 13:27 Lars Wendler
2017-07-05 13:27 Lars Wendler
2017-05-24 16:01 Lars Wendler
2017-05-24 16:01 Lars Wendler
2017-02-24 14:19 Lars Wendler
2016-12-23 13:40 Lars Wendler
2016-08-15 8:22 Lars Wendler
2016-08-15 8:22 Lars Wendler
2016-06-05 18:53 Mike Frysinger
2016-01-05 14:18 Lars Wendler
2015-11-18 13:44 Lars Wendler
2015-08-10 22:32 Chris Reffett
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1685942617.6fa6af98b0362bfaba051b1dde9299f77baf2a03.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox