Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-block/nbd/
Date: Wed, 01 Jun 2022 01:25:33
Message-Id: 1654046709.c8a350785778feb0ced49ff5077174e0ea10c195.sam@gentoo
1 commit: c8a350785778feb0ced49ff5077174e0ea10c195
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 1 00:39:08 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 1 01:25:09 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8a35078
7
8 sys-block/nbd: add 3.24
9
10 Bug: https://bugs.gentoo.org/834678
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 sys-block/nbd/Manifest | 1 +
14 sys-block/nbd/{nbd-9999.ebuild => nbd-3.24.ebuild} | 22 +++++++++++++++-------
15 sys-block/nbd/nbd-9999.ebuild | 22 +++++++++++++++-------
16 3 files changed, 31 insertions(+), 14 deletions(-)
17
18 diff --git a/sys-block/nbd/Manifest b/sys-block/nbd/Manifest
19 index deee3965f712..acfc433a02e0 100644
20 --- a/sys-block/nbd/Manifest
21 +++ b/sys-block/nbd/Manifest
22 @@ -1 +1,2 @@
23 DIST nbd-3.21.tar.xz 523472 BLAKE2B 8601306966b75e5000e34d784175f287553d478e8367d488b9a3c1c11bcb7345a4ba898f02a94b8e927fbded1d3a563a4f0369ad7b49b14dcb6f5ea8d91812f3 SHA512 5dc238e6f45eb230a6f92493a8c3b4891dee98fc47e120e59c3ca31c0a698537ca03f78e43c5e7089d93d548a22b5e3853ba228536d2fc688c3edf4a590fdb3f
24 +DIST nbd-3.24.tar.xz 556928 BLAKE2B a07b0d8ce18cdea2e0778afbf9adfbc49f4fdc5746ec6f304f46d390adfc0a9ffb199e7c5cb6a72b3073a12a37f598e3780f0a1374b25c0e0a546653f7657d28 SHA512 b542733ca8bdfb6883591acd5cc82fd8fa64fed7ca85b01a961e0ad69b9655750e5317df9ec510b4147cc8b0b5cdfa0b43da53dd06c42863553555d710a3c85d
25
26 diff --git a/sys-block/nbd/nbd-9999.ebuild b/sys-block/nbd/nbd-3.24.ebuild
27 similarity index 76%
28 copy from sys-block/nbd/nbd-9999.ebuild
29 copy to sys-block/nbd/nbd-3.24.ebuild
30 index 732367ad8970..04319fda899d 100644
31 --- a/sys-block/nbd/nbd-9999.ebuild
32 +++ b/sys-block/nbd/nbd-3.24.ebuild
33 @@ -1,4 +1,4 @@
34 -# Copyright 1999-2021 Gentoo Authors
35 +# Copyright 1999-2022 Gentoo Authors
36 # Distributed under the terms of the GNU General Public License v2
37
38 EAPI=7
39 @@ -6,14 +6,16 @@ EAPI=7
40 inherit systemd
41
42 DESCRIPTION="Userland client/server for kernel network block device"
43 -HOMEPAGE="http://nbd.sourceforge.net/"
44 -if [[ "${PV}" = 9999 ]] ; then
45 +HOMEPAGE="https://nbd.sourceforge.net/"
46 +if [[ ${PV} = 9999 ]] ; then
47 inherit autotools git-r3
48 EGIT_REPO_URI="https://github.com/NetworkBlockDevice/nbd.git"
49 else
50 - SRC_URI="mirror://sourceforge/nbd/${P}.tar.xz"
51 + SRC_URI="https://github.com/NetworkBlockDevice/nbd/releases/download/${P}/${P}.tar.xz
52 + mirror://sourceforge/nbd/${P}.tar.xz"
53 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
54 fi
55 +
56 LICENSE="GPL-2"
57 SLOT="0"
58 IUSE="debug gnutls netlink zlib"
59 @@ -27,24 +29,29 @@ RDEPEND="
60 zlib? ( sys-libs/zlib )
61 "
62 DEPEND="${RDEPEND}"
63 +BDEPEND="sys-devel/bison"
64
65 -if [[ "${PV}" = 9999 ]] ; then
66 - DEPEND+="
67 +if [[ ${PV} = 9999 ]] ; then
68 + BDEPEND+="
69 app-text/docbook-sgml-dtd:4.5
70 app-text/docbook-sgml-utils
71 + sys-devel/autoconf-archive
72 "
73 fi
74
75 src_prepare() {
76 default
77 - if [[ "${PV}" = 9999 ]] ; then
78 +
79 + if [[ ${PV} = 9999 ]] ; then
80 emake -C man -f Makefile.am \
81 nbd-server.1.sh.in \
82 nbd-server.5.sh.in \
83 nbd-client.8.sh.in \
84 nbd-trdump.1.sh.in \
85 nbdtab.5.sh.in
86 +
87 emake -C systemd -f Makefile.am nbd@×××××××××××.in
88 +
89 eautoreconf
90 fi
91 }
92 @@ -58,6 +65,7 @@ src_configure() {
93 $(use_with gnutls)
94 $(use_with netlink libnl)
95 )
96 +
97 econf "${myeconfargs[@]}"
98 }
99
100
101 diff --git a/sys-block/nbd/nbd-9999.ebuild b/sys-block/nbd/nbd-9999.ebuild
102 index 732367ad8970..04319fda899d 100644
103 --- a/sys-block/nbd/nbd-9999.ebuild
104 +++ b/sys-block/nbd/nbd-9999.ebuild
105 @@ -1,4 +1,4 @@
106 -# Copyright 1999-2021 Gentoo Authors
107 +# Copyright 1999-2022 Gentoo Authors
108 # Distributed under the terms of the GNU General Public License v2
109
110 EAPI=7
111 @@ -6,14 +6,16 @@ EAPI=7
112 inherit systemd
113
114 DESCRIPTION="Userland client/server for kernel network block device"
115 -HOMEPAGE="http://nbd.sourceforge.net/"
116 -if [[ "${PV}" = 9999 ]] ; then
117 +HOMEPAGE="https://nbd.sourceforge.net/"
118 +if [[ ${PV} = 9999 ]] ; then
119 inherit autotools git-r3
120 EGIT_REPO_URI="https://github.com/NetworkBlockDevice/nbd.git"
121 else
122 - SRC_URI="mirror://sourceforge/nbd/${P}.tar.xz"
123 + SRC_URI="https://github.com/NetworkBlockDevice/nbd/releases/download/${P}/${P}.tar.xz
124 + mirror://sourceforge/nbd/${P}.tar.xz"
125 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
126 fi
127 +
128 LICENSE="GPL-2"
129 SLOT="0"
130 IUSE="debug gnutls netlink zlib"
131 @@ -27,24 +29,29 @@ RDEPEND="
132 zlib? ( sys-libs/zlib )
133 "
134 DEPEND="${RDEPEND}"
135 +BDEPEND="sys-devel/bison"
136
137 -if [[ "${PV}" = 9999 ]] ; then
138 - DEPEND+="
139 +if [[ ${PV} = 9999 ]] ; then
140 + BDEPEND+="
141 app-text/docbook-sgml-dtd:4.5
142 app-text/docbook-sgml-utils
143 + sys-devel/autoconf-archive
144 "
145 fi
146
147 src_prepare() {
148 default
149 - if [[ "${PV}" = 9999 ]] ; then
150 +
151 + if [[ ${PV} = 9999 ]] ; then
152 emake -C man -f Makefile.am \
153 nbd-server.1.sh.in \
154 nbd-server.5.sh.in \
155 nbd-client.8.sh.in \
156 nbd-trdump.1.sh.in \
157 nbdtab.5.sh.in
158 +
159 emake -C systemd -f Makefile.am nbd@×××××××××××.in
160 +
161 eautoreconf
162 fi
163 }
164 @@ -58,6 +65,7 @@ src_configure() {
165 $(use_with gnutls)
166 $(use_with netlink libnl)
167 )
168 +
169 econf "${myeconfargs[@]}"
170 }