From ad6182343997a405079870a2fe91c4e0c6b94595 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Sep 2019 19:33:39 +0100 Subject: gentoo resync : 25.09.2019 --- sys-block/Manifest.gz | Bin 11390 -> 11382 bytes sys-block/eject-bsd/Manifest | 2 +- sys-block/eject-bsd/eject-bsd-1.5.ebuild | 5 ++- sys-block/nbd/Manifest | 6 ++-- sys-block/nbd/nbd-3.15.3.ebuild | 30 ---------------- sys-block/nbd/nbd-3.20.ebuild | 60 +++++++++++++++++++++++++++++++ sys-block/nbd/nbd-9999.ebuild | 10 +++--- 7 files changed, 71 insertions(+), 42 deletions(-) delete mode 100644 sys-block/nbd/nbd-3.15.3.ebuild create mode 100644 sys-block/nbd/nbd-3.20.ebuild (limited to 'sys-block') diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz index a213078ae50c..9a34d055f5e1 100644 Binary files a/sys-block/Manifest.gz and b/sys-block/Manifest.gz differ diff --git a/sys-block/eject-bsd/Manifest b/sys-block/eject-bsd/Manifest index 5b07e60b4ed2..810df7dedb0c 100644 --- a/sys-block/eject-bsd/Manifest +++ b/sys-block/eject-bsd/Manifest @@ -1,5 +1,5 @@ AUX eject-bsd-1.5-devname.patch 330 BLAKE2B 9dd4e72b9c4b40c9af386d2d87643c34ef4b89265d026ee3d6f1268b953059bf507e18755f230b5af40a86bfaf7a9598d9acf149e8a114c961e8c3f2629405bd SHA512 0397fbeaed4b62ef1d76cabf768aa9f38d91abedcb4a26b34b98dae58a3c34172cfe742841e7de5aa236ffbbec455e7b5b9cf349441b2087e81ee8d0ef70dbf0 AUX eject-bsd-1.5-manpage.patch 292 BLAKE2B 526e185b5eb24565d7d1885fa0f54202c6a0ab08b759c64c76298af0fd4d19e9256fb7356b7376acef78315d321c389865e670dee04217e5fd2da304447d5bdd SHA512 46de6a9ccb16da90e4a9879468cf1162854c68918567f62ff233e2d1766ea730e3b871b523c4aef1e90e0373e4f8b8cf9e2bd95c91d84c5acd453f8e6d3699f0 DIST eject-1.5.tar.gz 4928 BLAKE2B 9b10622d758f31670d360f7ffbcdca3bacb3f24e9adc602ab60a25a3bac843fef702c7d66d587e4b820ee6b7c65c0735925cdfafa9846704e0484b4fb2b5063c SHA512 d116aa1119cddb82b3b2ef3202ebdf6f02d1184746e1fe5f00fa9819bab4b90386bf9cbcb3b3796b03299c13c1730a020cf917f2c071982d10124d82cdda5ac3 -EBUILD eject-bsd-1.5.ebuild 907 BLAKE2B 65a24ab63ee445e153fddba0d7b0a156d6094ec5eab07914487bed0d30e312ae865481a5a29910c242a50f7e0203fcb9ee29e94101562574e3fa1d94c38f3108 SHA512 34a872caa1995f317eac44b20f59c2a181569a5a282f7c87badfe68073a7843545fa7a11dec972569398258cd79882f13172484907894609808c795ef94a490c +EBUILD eject-bsd-1.5.ebuild 855 BLAKE2B e81df58f8a818f75cec1fbfc33c7bda28c2794d469c5f4dcaa19e5282ea3d11be8ccb4ca910746fd633bb1bcf3565df78b200f3f64f1ddc6428c65b01dc21f94 SHA512 beebb7c528681978d3eec6e44932d012b5e782440093e2939d97fbebf6e66e39aeb22a636e64104b1d33c4c70c67815eafff8b3c09a27439193d87d25a84fb36 MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d diff --git a/sys-block/eject-bsd/eject-bsd-1.5.ebuild b/sys-block/eject-bsd/eject-bsd-1.5.ebuild index 5e864c9ddf8a..f64583860f86 100644 --- a/sys-block/eject-bsd/eject-bsd-1.5.ebuild +++ b/sys-block/eject-bsd/eject-bsd-1.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=0 @@ -11,8 +11,7 @@ DESCRIPTION="eject command for FreeBSD systems" HOMEPAGE="http://www.freshports.org/sysutils/eject/" SRC_URI="ftp://ports.jp.FreeBSD.org/pub/FreeBSD-jp/OD/${MY_P}.tar.gz ftp://ftp4.jp.FreeBSD.org/pub/FreeBSD-jp/OD/${MY_P}.tar.gz - ftp://ftp.ics.es.osaka-u.ac.jp/pub/mirrors/FreeBSD-jp/OD/${MY_P}.tar.gz - mirror://freebsd/ports/distfiles/${MY_P}.tar.gz" + ftp://ftp.ics.es.osaka-u.ac.jp/pub/mirrors/FreeBSD-jp/OD/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0" diff --git a/sys-block/nbd/Manifest b/sys-block/nbd/Manifest index 9fe8cf73fd70..4ee58bd36250 100644 --- a/sys-block/nbd/Manifest +++ b/sys-block/nbd/Manifest @@ -1,8 +1,8 @@ -DIST nbd-3.15.3.tar.xz 505856 BLAKE2B 8536b01908eb84733448382dcafe011e2786fe5e1363d6d957f1f8895ff257a35c56cecba3b177a1eb2270cec2a7c00082db7408cb8023aa3f20a22eb28bc295 SHA512 c4cd580272faa6a0564469d188decd2db99a5b9d691dca511eea16154ce6185c38e6f695a05bd18941d42cb9e4bb92e30e9eca70d38dce8054a0785ab16b711a DIST nbd-3.18.tar.xz 527436 BLAKE2B 6f87f013ff00b3cb478a038f07a83fba44b41c257a689be498959d90bb44dd39681fdcd005fe8e48f9a79fbe29bfd67d98fc0eb6440e51b1ac3a5de4d002060d SHA512 f9fe221b585c126efa3fb65e2344477a38f2ce42164b04d0dc4681c5a3bfd34d5d3e227454fff24eee9039853eb38a8707ea0aab0337f44906cccf379c185ce8 DIST nbd-3.19.tar.xz 524412 BLAKE2B 21669bfe3d34789725895511b1b65be83f85c315992d973db6737cb151ffa48c69ca8bef7dbce513d6f12551b22d063a951644fcaadbec5c115672040b2af8e7 SHA512 0916b411857045af6e01032b3093e295e7f3cfb1ae92f25adb03d97d3196741f8805104c627b17ad4f7f4305db3a4bcd5516bfd2c60fbea02b497dc296f97a16 -EBUILD nbd-3.15.3.ebuild 692 BLAKE2B 7726d0000f9ebaa2c6490dda7f9483ffe546bdfb77ed2f30524666b01505d4b5678bd0b98f17dfc53e57eafb3445625fcc97a20cc32125dd727d9b2094eae317 SHA512 d0bf5937ebe43552c3415f8957b87efd7a651d7a7ecec9243e81b3b6666352255b781b4cf1a09e111ed5c1ff17c76b8865ee66733d623ffdbb2927b64be0fc1a +DIST nbd-3.20.tar.xz 535136 BLAKE2B e707ab5565ca2281052d04e0b8854222a14b3dd365a2bb71b6544a9253204aad49df652bb888a035fbcc3b352530ccf59ab5374280ae78feea012f91fd4fa24c SHA512 d115939d8f086a1d99637d71453cbcc000a9145a85912a7edf701fad1b90d79e7bba1bc065fc54baa20c8a7665f47ad886cf8493bbabb15854eeede45cf176bc EBUILD nbd-3.18.ebuild 1294 BLAKE2B 2d403e7c993df9acb2d90678fffd852154ee5d4eefcef4dd3e8c462b9f2bbb0d2d3adc76e3b9dc5de5cadc0883150a8b44a62cfaf5c8a13f38e5e274c29ff990 SHA512 c6cbfb3748c4380133060501ef1f4453f50f33d5a44008bdab9f4e0a1bdc748a5ef5b83accec9cd425689988b9d18f0cd359f1b641e6a9b8e4f30e91b3ede73e EBUILD nbd-3.19.ebuild 1300 BLAKE2B 5b577d3a883821588764d6cfe3bc7e990e7493c7690a6664ecf54753c9b67d16caa2499b719a9323ff1a03b61b48b164462fe4eed88e77a3df393f7427e48386 SHA512 b6d18e6d129d0645c199344d0ce4ec6fa9f168783a126795b9d704de0c724c800f1c46888ddd9d115a5f429401bdfffab804349c80c863e802a7b39a83e005e8 -EBUILD nbd-9999.ebuild 1303 BLAKE2B cc38bdafe7c889d2c8960b9e1fe7e7f3dd347a35adbcb1a82ab7681f83dfa5e44b4c186bc84de2b66ce16027a6b5ca2b90b27905ce3174ca8c13dffc7629d796 SHA512 cc8cacad9661ba30fae805e82df0916256b5d50ade3f36225c507be9933d7d32bfd73a6914bf886c9877e4c4f2f7a789fb0388d1c2554ad11d3c411959bbd3a9 +EBUILD nbd-3.20.ebuild 1309 BLAKE2B 26288bdfdb8cda4425f74618119f089bd073ff4cd51b0a2fcdbf7636f4e399cb43117bf30dd9b2fe11f79dd33be5487a061f7804d1b6009c17c3bfd8c50c58bb SHA512 14ecb279342da915ebaedfd8a4ffaa4051f0c528f3852e9c3b9f47421995f81de8d7053b569728f7b0fe9aa2c76c4ccf8797a189b1156166253bb053bf7b33bc +EBUILD nbd-9999.ebuild 1309 BLAKE2B 26288bdfdb8cda4425f74618119f089bd073ff4cd51b0a2fcdbf7636f4e399cb43117bf30dd9b2fe11f79dd33be5487a061f7804d1b6009c17c3bfd8c50c58bb SHA512 14ecb279342da915ebaedfd8a4ffaa4051f0c528f3852e9c3b9f47421995f81de8d7053b569728f7b0fe9aa2c76c4ccf8797a189b1156166253bb053bf7b33bc MISC metadata.xml 428 BLAKE2B 517a7a18e27635aee079f823c121ad151ffad3c815c63853bef3ac17fd05f6f3a5e8028a0189fdde60cd339774a8ee34334ee724044368ecc92de07c1b995cb8 SHA512 6cf2e9181f243ca20efac7684b470f288f5f75de387e3e2389dc21f41e4e037d6962a98c4eb249f009f1e02038ba53858d2feb41218e0422d05d11d1ab067cc0 diff --git a/sys-block/nbd/nbd-3.15.3.ebuild b/sys-block/nbd/nbd-3.15.3.ebuild deleted file mode 100644 index c5273c225709..000000000000 --- a/sys-block/nbd/nbd-3.15.3.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="Userland client/server for kernel network block device" -HOMEPAGE="http://nbd.sourceforge.net/" -SRC_URI="mirror://sourceforge/nbd/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86" -IUSE="debug zlib" - -# gnutls is an automagic dep. -RDEPEND=">=dev-libs/glib-2.0 - >=net-libs/gnutls-2.12.0 - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_configure() { - local myeconfargs=( - --enable-lfs - $(use_enable !debug syslog) - $(use_enable debug) - $(use_enable zlib gznbd) - ) - econf "${myeconfargs[@]}" -} diff --git a/sys-block/nbd/nbd-3.20.ebuild b/sys-block/nbd/nbd-3.20.ebuild new file mode 100644 index 000000000000..fad2a1deedee --- /dev/null +++ b/sys-block/nbd/nbd-3.20.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Userland client/server for kernel network block device" +HOMEPAGE="http://nbd.sourceforge.net/" +if [[ "${PV}" = 9999 ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://github.com/NetworkBlockDevice/nbd.git" +else + SRC_URI="mirror://sourceforge/nbd/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~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 + gnutls? ( >=net-libs/gnutls-2.12.0 ) + netlink? ( >=dev-libs/libnl-3.1 ) + zlib? ( sys-libs/zlib ) +" +DEPEND="${RDEPEND}" + +if [[ "${PV}" = 9999 ]] ; then + DEPEND+=" + app-text/docbook-sgml-dtd:4.5 + app-text/docbook-sgml-utils + " +fi + +src_prepare() { + default + if [[ "${PV}" = 9999 ]] ; then + emake -C man -f Makefile.am \ + nbd-server.1.sh.in \ + nbd-server.5.sh.in \ + nbd-client.8.sh.in \ + nbd-trdump.1.sh.in \ + nbdtab.5.sh.in + emake -C systemd -f Makefile.am nbd@.service.sh.in + eautoreconf + fi +} + +src_configure() { + local myeconfargs=( + --enable-lfs + $(use_enable !debug syslog) + $(use_enable debug) + $(use_enable zlib gznbd) + $(use_with gnutls) + $(use_with netlink libnl) + ) + econf "${myeconfargs[@]}" +} diff --git a/sys-block/nbd/nbd-9999.ebuild b/sys-block/nbd/nbd-9999.ebuild index c02131c2e628..fad2a1deedee 100644 --- a/sys-block/nbd/nbd-9999.ebuild +++ b/sys-block/nbd/nbd-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="Userland client/server for kernel network block device" HOMEPAGE="http://nbd.sourceforge.net/" @@ -16,15 +16,15 @@ LICENSE="GPL-2" SLOT="0" IUSE="debug gnutls netlink zlib" +BDEPEND="virtual/pkgconfig" + RDEPEND=" >=dev-libs/glib-2.26.0 gnutls? ( >=net-libs/gnutls-2.12.0 ) netlink? ( >=dev-libs/libnl-3.1 ) zlib? ( sys-libs/zlib ) " -DEPEND="${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" if [[ "${PV}" = 9999 ]] ; then DEPEND+=" -- cgit v1.2.3