From 129160ec854dca4c3fedb5bcfbcb56930371da0f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 1 Jan 2021 21:06:00 +0000 Subject: gentoo new year resync : 01.01.2021 --- sys-block/Manifest.gz | Bin 10191 -> 10027 bytes sys-block/fio/Manifest | 10 -- sys-block/fio/files/fio-3.16-snprintf.patch | 44 ------ .../fio/files/fio-3.16-verify_only_numberio.patch | 60 --------- sys-block/fio/fio-3.16-r1.ebuild | 130 ------------------ sys-block/fio/fio-3.16.ebuild | 129 ------------------ sys-block/fio/fio-3.17-r1.ebuild | 147 --------------------- sys-block/fio/fio-3.17.ebuild | 129 ------------------ sys-block/fio/fio-3.7.ebuild | 111 ---------------- sys-block/gpart/Manifest | 2 +- sys-block/gpart/gpart-0.3.ebuild | 2 +- sys-block/mtx/Manifest | 2 +- sys-block/mtx/mtx-1.3.12.ebuild | 2 +- sys-block/nbd/Manifest | 4 +- sys-block/nbd/nbd-3.18.ebuild | 2 +- sys-block/nbd/nbd-3.19.ebuild | 2 +- sys-block/parted/Manifest | 2 +- sys-block/parted/parted-3.3-r2.ebuild | 8 +- sys-block/rts_pstor/Manifest | 6 - .../rts_pstor/files/fix-compile-kernel-5.0.0.patch | 36 ----- .../files/rts_pstor-makefile-kernel-5.1.patch | 7 - sys-block/rts_pstor/files/rts_pstor-makefile.patch | 8 -- sys-block/rts_pstor/metadata.xml | 11 -- .../rts_pstor/rts_pstor-1.10_p20160103-r1.ebuild | 42 ------ sys-block/tgt/Manifest | 5 +- sys-block/tgt/files/tgt-1.0.79-fno-common.patch | 22 +++ sys-block/tgt/tgt-1.0.78.ebuild | 62 --------- sys-block/tgt/tgt-1.0.79.ebuild | 12 +- sys-block/vblade/Manifest | 4 +- sys-block/vblade/files/vblade-24-fno-common.patch | 48 +++++++ sys-block/vblade/files/vblade-24-makefile.patch | 35 +++++ sys-block/vblade/vblade-24.ebuild | 19 ++- 32 files changed, 139 insertions(+), 964 deletions(-) delete mode 100644 sys-block/fio/files/fio-3.16-snprintf.patch delete mode 100644 sys-block/fio/files/fio-3.16-verify_only_numberio.patch delete mode 100644 sys-block/fio/fio-3.16-r1.ebuild delete mode 100644 sys-block/fio/fio-3.16.ebuild delete mode 100644 sys-block/fio/fio-3.17-r1.ebuild delete mode 100644 sys-block/fio/fio-3.17.ebuild delete mode 100644 sys-block/fio/fio-3.7.ebuild delete mode 100644 sys-block/rts_pstor/Manifest delete mode 100644 sys-block/rts_pstor/files/fix-compile-kernel-5.0.0.patch delete mode 100644 sys-block/rts_pstor/files/rts_pstor-makefile-kernel-5.1.patch delete mode 100644 sys-block/rts_pstor/files/rts_pstor-makefile.patch delete mode 100644 sys-block/rts_pstor/metadata.xml delete mode 100644 sys-block/rts_pstor/rts_pstor-1.10_p20160103-r1.ebuild create mode 100644 sys-block/tgt/files/tgt-1.0.79-fno-common.patch delete mode 100644 sys-block/tgt/tgt-1.0.78.ebuild create mode 100644 sys-block/vblade/files/vblade-24-fno-common.patch create mode 100644 sys-block/vblade/files/vblade-24-makefile.patch (limited to 'sys-block') diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz index 9d18b4a57914..c4d2c4b568fd 100644 Binary files a/sys-block/Manifest.gz and b/sys-block/Manifest.gz differ diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest index 0d563dd9ca2c..e6ff8dd9fed2 100644 --- a/sys-block/fio/Manifest +++ b/sys-block/fio/Manifest @@ -1,17 +1,7 @@ AUX fio-2.2.13-libmtd.patch 398 BLAKE2B b1519ed240879f1260e3f5859c9cada3f41161457b7e06e5e764ac3a6656c3a6439fb5f0380cf90bbd6f2133f25e80419e108d725ea4672adfdd976bee94846f SHA512 18792d4ea3dbc2664d9e24541a07d82a50cd60bb7ff2d14bcdadd2207341c003ad2d298d99d65fd72c88813073b17d03a710a50db4df52ee72d49d9e9bcfe400 -AUX fio-3.16-snprintf.patch 1723 BLAKE2B e1a8cbae3cc41163cd33118622d6d1888d47769bfa8d3fcd1df8def3b2dcfa8678d69c91cdac945a93172d21026efdb60363c0430765ef08519e6355e92b2732 SHA512 c9119a6c057367aa82ea204f29e78ce7c49c5fe2ea46dba3d6d109e9654a85feb47f7dfd04e8dbed76ddab642242f84fe7d5ff566493df018ecd496f64ac14a1 -AUX fio-3.16-verify_only_numberio.patch 1986 BLAKE2B 858cfaa1b452803451c160fffb779f83f118d06e984451725e4809bccd3f65367ba77039052ce876414a00bd32d87dee3f10817b3a2e0a09622b24b3c6612b4c SHA512 d43b2a822189483060d9b33d02c56c7676914054f79bc133eb57cd219504cfc5a9331761e193b912e287a14ac7a8d35619b2ca2061b6f71ffdc604961288e800 AUX fio-3.20-fno-common.patch 1220 BLAKE2B dcfaac74241111cae75ebf956f34258ce883b6abb360b51eaa6bf80c91770d0d4307818e7daf63dc284c3b21a0869d54523d9b4c5cb4733fac898d05c17c8933 SHA512 04e435073204d158d6e8a5de87681cd70fa76c80c82b4c86e3e12650288c3bb2c0c457d64e05812e94f9e07172b5df36542f330306bdbab8222ec2464bda12f4 -DIST fio-3.16.tar.bz2 881436 BLAKE2B fee99930d0245474eb67ceee2d1a6ec2f1a0eb4da6d52cf8616d7eda64699a8c2727715284134fd4931e91efad69b064f66a80a78f70ea03e66d4eab4e601120 SHA512 2d651b20cbc6c7babf3adc082dbe78e1f7de920764653cf5ffd99df7516cf6190ffefe2152d2739326d3102949d9bad7db978ff88866cfa54020f9ec3b0a2a23 -DIST fio-3.17.tar.bz2 888795 BLAKE2B 10277efb1234708aff336fc3c0723d0b9b5c903dce3a999ea2b8749b5034c778be4828549b9e0d9fc36a4f9429ca86ac0011f0c110e1a44ed3ad33b6e4a30a68 SHA512 27dba4c3e8f544c0fd40a5f42660f64f42e114e7b56199bc70f540b1a09b9dec9291e3fbae0fab9691189fa4a1f40edbcf4f9b53c313fd9c1a8ba0fdbb7f524e DIST fio-3.19.tar.bz2 902391 BLAKE2B 84993717248add335a77c6fc03fa730f628806e1e001078d48a91bc5ac9703e42c6cc5c720cfe76a83d1daf4af2245bfd78fd6a871611de1c19562ca70a9cc89 SHA512 0004dbaf5a8ce4f2b13114a3bfb65c388bb6d01e9a82791208ff7e7eb54cd6741e60cc8cb0a19f6319301ee2040c03862725943972ea767e6cc65fce4a2b3ecb DIST fio-3.20.tar.bz2 912040 BLAKE2B 44f8c20a390a6382aadc07881c1e7c65cca932099a1b3992e848669cf2a52b410fde67f9ae576efcd0d8e88ceec04174b6bc077d4b3f9b615b59be9f24f62bed SHA512 4e073754c95cb8d6416a80f48ca61003f34d664717f67a3f29b554e9205f8fe3553595ba6f8a8e9cb3463022d5c83be961f5b5a1ebcd2a9f4da9406a9986c1fb -DIST fio-3.7.tar.bz2 629354 BLAKE2B 99a1c88481c7a693e31b1a0bc23bc80e85df92385f9d5a7de8d6479be8bc425326a20d794eb4809f822adfcd06e07c66ebed321faa9dbae7a2c1d3c766a6467d SHA512 b1f5cb35fe1c06e030c570959ab9a96d936f9eaa2f7f30d5a34f34fd93fae057da07c4084a06143cd5188ad6b2cc06b564484f8867e050cfeddc0ee3fb0fe266 -EBUILD fio-3.16-r1.ebuild 3587 BLAKE2B 1bc4b3b50c36973a7ce0057e7901a7b810d73615338da7ffcfbabf60f2e249d06f5f400d09ef9b6b7848c7b9dee576032878d68a0e7715468e5fd23afa5ce0f6 SHA512 88a754dca79da6c8ebfa6b7a52590e8eaec0f103865eac17921da6787ef2d16b34358d1567fb641b2957addd1cf1768c55d3fea918ccdd2308c0ca8a4d3c6680 -EBUILD fio-3.16.ebuild 3536 BLAKE2B 2103340435d0bab73419f187554e6d1d466f6cd9b9cb67acb39571b626ce8bfe9cc9f3d68be8fd63036d4d45f06fae1bae34999da398c27283358ba0b34784ae SHA512 e033276c0f77a6fb04b94ed298f1a9ef371c28c861a4969fc04592fa6226bb48f0b6b5d56d0d4a293ad595755fab3dac978edfede30cf0ff770bef3b32a728dc -EBUILD fio-3.17-r1.ebuild 3944 BLAKE2B 332569e86cb7542fe3003acd4eecc2fceb34d987db50f7bb1c3343231fdd2cb8b7f5cfef993f328a8ea34d440a32b78bf38a60f2524ad761931ec511189fb67d SHA512 fec9f05a86081b670fa5f995f3fd3a4afe084ad9f09d92a6d5d4cbd3b5a168580f5208da64da6a8a186347bf64c8f4029dee7e0d9047e15454d644a5a889c317 -EBUILD fio-3.17.ebuild 3548 BLAKE2B 4a13146b9ade206190d95a4daa235e4c2c15d040335e5eee8a9fd55a50e643c27b9abc2f42095e96291b3e70b69f38a0048effc9899937926f50e52ebf77f408 SHA512 fb04e3eda7ba0f4f3f5ffc905c502ed1a0a3618d131fce539f17a6cd3d2b1f5aa2c33645504eb18c292d86d22462f84f149712baba862df4e8b5c9aafdb74fe1 EBUILD fio-3.19.ebuild 3894 BLAKE2B 558a90a4f245837ee0044529d2e09d381c5675410239abd2f21a5376299d51626a09494d50b5e09194ce2bb0759686b4ce47994ed9f394a65e8e7bfcf86f42b9 SHA512 8f2d3c714e4a53691353e51ddf0b50da0d5e614f5af0c126b724d3264e99823124b54c4602e12e499f4e8e752e0df5eade5b2fcc921680dded6e664387cc8d9e EBUILD fio-3.20-r2.ebuild 4434 BLAKE2B eb2c49c2cdce8d9613defb2ceb4bf6855bdd8ec260bb9b8ae5fed498ff1a25eee3980b198b22a032c019c72293680516959bfce0af74111eb3420ded19387628 SHA512 a491f050fc082329cb760b76f3182916e8c6fd7a33d3e6646f87abdfb072cdc41cdb5b3fb5e3db0155dfcbf019c188f69ac56df8d45906adf70235f46392d212 -EBUILD fio-3.7.ebuild 2996 BLAKE2B 66bbc26691006fe8d796009b2260ee768a251e462280d5c0fb7871a96bd67fd9955a02624ecee60ec34fec2218cb89ae5c782ee87dd237f6f9d5d77698dec482 SHA512 7cc3d4a80c9f608da5d5c8da831f1acd46e0fcb8ac90808f24cc876203e831317b19d4778d951db0e1bfacf73d96acc4c1526095967d198263bbb0f89c73bf46 MISC metadata.xml 1172 BLAKE2B e35bbaaa15c8cd095791a4a23a7344314a015ea42bb864b11bb165d340585ee667f969426282465b834a7d092ab6885736e55ec8d4fe950001fbb6336fdfdc14 SHA512 defbc7f932a5ab83b67da58a601ef62784b27f2268f8a8dd5057c02fb441b164bd0945217fa52a0e06803c74b5168dda3b4668de52f593d5cade428bd2f79e86 diff --git a/sys-block/fio/files/fio-3.16-snprintf.patch b/sys-block/fio/files/fio-3.16-snprintf.patch deleted file mode 100644 index 1470290f3cb4..000000000000 --- a/sys-block/fio/files/fio-3.16-snprintf.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 5b215853ed4b438b5b2d4ac3e56d5f0d19e145d9 Mon Sep 17 00:00:00 2001 -From: Anatol Pomozov -Date: Mon, 23 Sep 2019 14:12:12 -0700 -Subject: [PATCH] Fix compilation error with gfio -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Commit 36833fb04 replaced many usages of strncpy with snprintf. -But there is one place where new arguments were added but the function -name has not been changed. It leads to the following compilation error: - -gclient.c:333:2: error: too many arguments to function ‘strncpy’ - 333 | strncpy(message, sizeof(message), "%s", status_message); - | ^~~~~~~ -In file included from /usr/include/features.h:450, - from /usr/include/bits/libc-header-start.h:33, - from /usr/include/stdlib.h:25, - from gclient.c:1: -/usr/include/bits/string_fortified.h:103:1: note: declared here - 103 | __NTH (strncpy (char *__restrict __dest, const char *__restrict __src, - | ^~~~~ - -Signed-off-by: Anatol Pomozov ---- - gclient.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gclient.c b/gclient.c -index 64324177..d8dc62d2 100644 ---- a/gclient.c -+++ b/gclient.c -@@ -330,7 +330,7 @@ static void gfio_update_thread_status_all(struct gui *ui, char *status_message, - static char message[100]; - const char *m = message; - -- strncpy(message, sizeof(message), "%s", status_message); -+ snprintf(message, sizeof(message), "%s", status_message); - gtk_progress_bar_set_text(GTK_PROGRESS_BAR(ui->thread_status_pb), m); - gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ui->thread_status_pb), perc / 100.0); - gtk_widget_queue_draw(ui->window); --- -2.24.0 - diff --git a/sys-block/fio/files/fio-3.16-verify_only_numberio.patch b/sys-block/fio/files/fio-3.16-verify_only_numberio.patch deleted file mode 100644 index 52fb389f62b2..000000000000 --- a/sys-block/fio/files/fio-3.16-verify_only_numberio.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 8859c0675aec03467ed65dfc79ecc874d026f165 Mon Sep 17 00:00:00 2001 -From: Gwendal Grignou -Date: Mon, 13 Jan 2020 16:35:10 -0800 -Subject: [PATCH] verify: Fix test to not check for numberio when verify_only - is true - -io->numberio can not be populated when verify_only is true, because -do_dry_run() build and complete IOs immediately, so it can not replicate -the numberio that was produced when the data was layered on the media. - -Without this fix, using write_random -[write_stress] -filename=${FILENAME} -size=${FILESIZE} -verify_only=${VERIFY_ONLY} -readwrite=randwrite -bs=4k -ioengine=libaio -iodepth=32 -direct=1 -do_verify=1 -verify=crc32c - -'VERIFY_ONLY=1 FILENAME=/dev/sda1 FILESIZE=1M fio write_random' passes, -but -'VERIFY_ONLY=0 FILENAME=/dev/sda1 FILESIZE=1M fio write_random' fails: -"""verify_only option fails with verify: bad header numberio 1, wanted -0""". -The fix addresses the problem by not checking numberio. - -Fixes #732 - -Signed-off-by: Gwendal Grignou ---- - verify.c | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/verify.c b/verify.c -index a2c0d41dbb8c..cf299ebf9643 100644 ---- a/verify.c -+++ b/verify.c -@@ -845,13 +845,11 @@ static int verify_header(struct io_u *io_u, struct thread_data *td, - * For read-only workloads, the program cannot be certain of the - * last numberio written to a block. Checking of numberio will be - * done only for workloads that write data. For verify_only, -- * numberio will be checked in the last iteration when the correct -- * state of numberio, that would have been written to each block -- * in a previous run of fio, has been reached. -+ * numberio check is skipped. - */ - if (td_write(td) && (td_min_bs(td) == td_max_bs(td)) && - !td->o.time_based) -- if (!td->o.verify_only || td->o.loops == 0) -+ if (!td->o.verify_only) - if (hdr->numberio != io_u->numberio) { - log_err("verify: bad header numberio %"PRIu16 - ", wanted %"PRIu16, --- -2.23.0 - diff --git a/sys-block/fio/fio-3.16-r1.ebuild b/sys-block/fio/fio-3.16-r1.ebuild deleted file mode 100644 index f77ee340c37e..000000000000 --- a/sys-block/fio/fio-3.16-r1.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_6 ) - -inherit python-r1 toolchain-funcs - -MY_PV="${PV/_rc/-rc}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Jens Axboe's Flexible IO tester" -HOMEPAGE="https://brick.kernel.dk/snaps/" -SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" -IUSE="aio curl glusterfs gnuplot gtk libressl numa rbd rdma static tcmalloc zlib" -REQUIRED_USE="gnuplot? ( ${PYTHON_REQUIRED_USE} ) - libressl? ( curl )" - -BDEPEND="virtual/pkgconfig" - -# GTK+:2 does not offer static libaries. -LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] ) - curl? ( - net-misc/curl:=[static-libs(+)] - !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) - libressl? ( dev-libs/libressl:0=[static-libs(+)] ) - ) - glusterfs? ( sys-cluster/glusterfs[static-libs(+)] ) - gtk? ( dev-libs/glib:2[static-libs(+)] ) - numa? ( sys-process/numactl[static-libs(+)] ) - rbd? ( sys-cluster/ceph[static-libs(+)] ) - rdma? ( - sys-fabric/libibverbs[static-libs(+)] - sys-fabric/librdmacm[static-libs(+)] - ) - tcmalloc? ( dev-util/google-perftools:=[static-libs(+)] ) - zlib? ( sys-libs/zlib[static-libs(+)] )" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - gtk? ( x11-libs/gtk+:2 )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} )" -RDEPEND+=" - gnuplot? ( - sci-visualization/gnuplot - $(python_gen_any_dep 'dev-python/pandas[${PYTHON_USEDEP}]') - ${PYTHON_DEPS} - )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/fio-2.2.13-libmtd.patch - "${FILESDIR}"/fio-3.16-snprintf.patch - "${FILESDIR}"/fio-3.16-verify_only_numberio.patch -) - -python_check_deps() { - has_version "dev-python/pandas[${PYTHON_USEDEP}]" -} - -src_prepare() { - default - - sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die - - # Many checks don't have configure flags. - sed -i \ - -e "s:\:$(tc-getPKG_CONFIG):" \ - -e '/if compile_prog "" "-lz" "zlib" *; *then/ '"s::if $(usex zlib true false) ; then:" \ - -e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \ - configure || die -} - -src_configure() { - chmod g-w "${T}" - # not a real configure script - # TODO: pmem - set -- \ - ./configure \ - --disable-optimizations \ - --extra-cflags="${CFLAGS} ${CPPFLAGS}" \ - --cc="$(tc-getCC)" \ - --disable-pmem \ - $(usex curl '' '--disable-http') \ - $(usex glusterfs '' '--disable-gfapi') \ - $(usex gtk '--enable-gfio' '') \ - $(usex numa '' '--disable-numa') \ - $(usex rbd '' '--disable-rbd') \ - $(usex rdma '' '--disable-rdma') \ - $(usex static '--build-static' '') \ - $(usex tcmalloc '' '--disable-tcmalloc') - echo "$@" - "$@" || die 'configure failed' -} - -src_compile() { - emake V=1 OPTFLAGS= -} - -src_install() { - emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man" - - if use gnuplot ; then - sed -i 's:python2.7:python:g' \ - "${ED}/usr/bin/fio2gnuplot" \ - "${ED}/usr/bin/fiologparser_hist.py" \ - "${ED}/usr/bin/fiologparser.py" - python_replicate_script \ - "${ED}/usr/bin/fio2gnuplot" \ - "${ED}/usr/bin/fiologparser_hist.py" \ - "${ED}/usr/bin/fiologparser.py" - else - rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die - rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die - rm "${ED}"/usr/share/fio/*.gpm || die - rmdir "${ED}"/usr/share/fio/ 2>/dev/null - fi - - # This tool has security/parallel issues -- it hardcodes /tmp/template.fio. - rm "${ED}"/usr/bin/genfio || die - - dodoc README REPORTING-BUGS HOWTO - docinto examples - dodoc examples/* -} diff --git a/sys-block/fio/fio-3.16.ebuild b/sys-block/fio/fio-3.16.ebuild deleted file mode 100644 index fa28576751af..000000000000 --- a/sys-block/fio/fio-3.16.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_6 ) - -inherit python-r1 toolchain-funcs - -MY_PV="${PV/_rc/-rc}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Jens Axboe's Flexible IO tester" -HOMEPAGE="https://brick.kernel.dk/snaps/" -SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" -IUSE="aio curl glusterfs gnuplot gtk libressl numa rbd rdma static tcmalloc zlib" -REQUIRED_USE="gnuplot? ( ${PYTHON_REQUIRED_USE} ) - libressl? ( curl )" - -BDEPEND="virtual/pkgconfig" - -# GTK+:2 does not offer static libaries. -LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] ) - curl? ( - net-misc/curl:=[static-libs(+)] - !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) - libressl? ( dev-libs/libressl:0=[static-libs(+)] ) - ) - glusterfs? ( sys-cluster/glusterfs[static-libs(+)] ) - gtk? ( dev-libs/glib:2[static-libs(+)] ) - numa? ( sys-process/numactl[static-libs(+)] ) - rbd? ( sys-cluster/ceph[static-libs(+)] ) - rdma? ( - sys-fabric/libibverbs[static-libs(+)] - sys-fabric/librdmacm[static-libs(+)] - ) - tcmalloc? ( dev-util/google-perftools:=[static-libs(+)] ) - zlib? ( sys-libs/zlib[static-libs(+)] )" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - gtk? ( x11-libs/gtk+:2 )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} )" -RDEPEND+=" - gnuplot? ( - sci-visualization/gnuplot - $(python_gen_any_dep 'dev-python/pandas[${PYTHON_USEDEP}]') - ${PYTHON_DEPS} - )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/fio-2.2.13-libmtd.patch - "${FILESDIR}"/fio-3.16-snprintf.patch -) - -python_check_deps() { - has_version "dev-python/pandas[${PYTHON_USEDEP}]" -} - -src_prepare() { - default - - sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die - - # Many checks don't have configure flags. - sed -i \ - -e "s:\:$(tc-getPKG_CONFIG):" \ - -e '/if compile_prog "" "-lz" "zlib" *; *then/ '"s::if $(usex zlib true false) ; then:" \ - -e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \ - configure || die -} - -src_configure() { - chmod g-w "${T}" - # not a real configure script - # TODO: pmem - set -- \ - ./configure \ - --disable-optimizations \ - --extra-cflags="${CFLAGS} ${CPPFLAGS}" \ - --cc="$(tc-getCC)" \ - --disable-pmem \ - $(usex curl '' '--disable-http') \ - $(usex glusterfs '' '--disable-gfapi') \ - $(usex gtk '--enable-gfio' '') \ - $(usex numa '' '--disable-numa') \ - $(usex rbd '' '--disable-rbd') \ - $(usex rdma '' '--disable-rdma') \ - $(usex static '--build-static' '') \ - $(usex tcmalloc '' '--disable-tcmalloc') - echo "$@" - "$@" || die 'configure failed' -} - -src_compile() { - emake V=1 OPTFLAGS= -} - -src_install() { - emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man" - - if use gnuplot ; then - sed -i 's:python2.7:python:g' \ - "${ED}/usr/bin/fio2gnuplot" \ - "${ED}/usr/bin/fiologparser_hist.py" \ - "${ED}/usr/bin/fiologparser.py" - python_replicate_script \ - "${ED}/usr/bin/fio2gnuplot" \ - "${ED}/usr/bin/fiologparser_hist.py" \ - "${ED}/usr/bin/fiologparser.py" - else - rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die - rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die - rm "${ED}"/usr/share/fio/*.gpm || die - rmdir "${ED}"/usr/share/fio/ 2>/dev/null - fi - - # This tool has security/parallel issues -- it hardcodes /tmp/template.fio. - rm "${ED}"/usr/bin/genfio || die - - dodoc README REPORTING-BUGS HOWTO - docinto examples - dodoc examples/* -} diff --git a/sys-block/fio/fio-3.17-r1.ebuild b/sys-block/fio/fio-3.17-r1.ebuild deleted file mode 100644 index 213a718797a3..000000000000 --- a/sys-block/fio/fio-3.17-r1.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_6 ) - -inherit python-r1 toolchain-funcs - -MY_PV="${PV/_rc/-rc}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Jens Axboe's Flexible IO tester" -HOMEPAGE="https://brick.kernel.dk/snaps/" -SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" -IUSE="aio curl glusterfs gnuplot gtk libressl numa python rbd rdma static tcmalloc zlib" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) - libressl? ( curl ) - gnuplot? ( python )" - -BDEPEND="virtual/pkgconfig" - -# GTK+:2 does not offer static libaries. -LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] ) - curl? ( - net-misc/curl:=[static-libs(+)] - !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) - libressl? ( dev-libs/libressl:0=[static-libs(+)] ) - ) - glusterfs? ( sys-cluster/glusterfs[static-libs(+)] ) - gtk? ( dev-libs/glib:2[static-libs(+)] ) - numa? ( sys-process/numactl[static-libs(+)] ) - rbd? ( sys-cluster/ceph[static-libs(+)] ) - rdma? ( - sys-fabric/libibverbs[static-libs(+)] - sys-fabric/librdmacm[static-libs(+)] - ) - tcmalloc? ( dev-util/google-perftools:=[static-libs(+)] ) - zlib? ( sys-libs/zlib[static-libs(+)] )" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - gtk? ( x11-libs/gtk+:2 )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} )" -RDEPEND+=" - python? ( - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/pandas[${PYTHON_USEDEP}]') - ) - gnuplot? ( sci-visualization/gnuplot )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/fio-2.2.13-libmtd.patch - "${FILESDIR}"/fio-3.16-verify_only_numberio.patch -) - -python_check_deps() { - has_version "dev-python/pandas[${PYTHON_USEDEP}]" -} - -src_prepare() { - default - - sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die - - # Many checks don't have configure flags. - sed -i \ - -e "s:\:$(tc-getPKG_CONFIG):" \ - -e '/if compile_prog "" "-lz" "zlib" *; *then/ '"s::if $(usex zlib true false) ; then:" \ - -e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \ - configure || die -} - -src_configure() { - chmod g-w "${T}" - # not a real configure script - # TODO: pmem - set -- \ - ./configure \ - --disable-optimizations \ - --extra-cflags="${CFLAGS} ${CPPFLAGS}" \ - --cc="$(tc-getCC)" \ - --disable-pmem \ - $(usex curl '' '--disable-http') \ - $(usex glusterfs '' '--disable-gfapi') \ - $(usex gtk '--enable-gfio' '') \ - $(usex numa '' '--disable-numa') \ - $(usex rbd '' '--disable-rbd') \ - $(usex rdma '' '--disable-rdma') \ - $(usex static '--build-static' '') \ - $(usex tcmalloc '' '--disable-tcmalloc') - echo "$@" - "$@" || die 'configure failed' -} - -src_compile() { - emake V=1 OPTFLAGS= -} - -src_install() { - emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man" - - local python2_7_files=( - "${ED}"/usr/bin/fiologparser_hist.py - "${ED}"/usr/bin/fiologparser.py - ) - local python_files=( - "${python2_7_files[@]}" - "${ED}"/usr/bin/fio_jsonplus_clat2csv - ) - if use python ; then - sed -i 's:python2.7:python:g' "${python2_7_files[@]}" || die - python_replicate_script "${python2_7_files[@]}" - else - rm "${python_files[@]}" || die - fi - - local gnuplot_python2_7_files=( - "${ED}"/usr/bin/fio2gnuplot - ) - local gnuplot_files=( - "${gnuplot_python2_7_files[@]}" - "${ED}"/usr/bin/fio_generate_plots - "${ED}"/usr/share/man/man1/fio_generate_plots.1 - "${ED}"/usr/share/man/man1/fio2gnuplot.1 - "${ED}"/usr/share/fio/*.gpm - ) - if use gnuplot ; then - sed -i 's:python2.7:python:g' "${gnuplot_python2_7_files[@]}" || die - python_replicate_script "${gnuplot_python2_7_files[@]}" - else - rm "${gnuplot_files[@]}" || die - rmdir "${ED}"/usr/share/fio/ || die - fi - - # This tool has security/parallel issues -- it hardcodes /tmp/template.fio. - rm "${ED}"/usr/bin/genfio || die - - dodoc README REPORTING-BUGS HOWTO - docinto examples - dodoc examples/* -} diff --git a/sys-block/fio/fio-3.17.ebuild b/sys-block/fio/fio-3.17.ebuild deleted file mode 100644 index 49775e5a6365..000000000000 --- a/sys-block/fio/fio-3.17.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_6 ) - -inherit python-r1 toolchain-funcs - -MY_PV="${PV/_rc/-rc}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Jens Axboe's Flexible IO tester" -HOMEPAGE="https://brick.kernel.dk/snaps/" -SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" -IUSE="aio curl glusterfs gnuplot gtk libressl numa rbd rdma static tcmalloc zlib" -REQUIRED_USE="gnuplot? ( ${PYTHON_REQUIRED_USE} ) - libressl? ( curl )" - -BDEPEND="virtual/pkgconfig" - -# GTK+:2 does not offer static libaries. -LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] ) - curl? ( - net-misc/curl:=[static-libs(+)] - !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) - libressl? ( dev-libs/libressl:0=[static-libs(+)] ) - ) - glusterfs? ( sys-cluster/glusterfs[static-libs(+)] ) - gtk? ( dev-libs/glib:2[static-libs(+)] ) - numa? ( sys-process/numactl[static-libs(+)] ) - rbd? ( sys-cluster/ceph[static-libs(+)] ) - rdma? ( - sys-fabric/libibverbs[static-libs(+)] - sys-fabric/librdmacm[static-libs(+)] - ) - tcmalloc? ( dev-util/google-perftools:=[static-libs(+)] ) - zlib? ( sys-libs/zlib[static-libs(+)] )" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - gtk? ( x11-libs/gtk+:2 )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} )" -RDEPEND+=" - gnuplot? ( - sci-visualization/gnuplot - $(python_gen_any_dep 'dev-python/pandas[${PYTHON_USEDEP}]') - ${PYTHON_DEPS} - )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/fio-2.2.13-libmtd.patch - "${FILESDIR}"/fio-3.16-verify_only_numberio.patch -) - -python_check_deps() { - has_version "dev-python/pandas[${PYTHON_USEDEP}]" -} - -src_prepare() { - default - - sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die - - # Many checks don't have configure flags. - sed -i \ - -e "s:\:$(tc-getPKG_CONFIG):" \ - -e '/if compile_prog "" "-lz" "zlib" *; *then/ '"s::if $(usex zlib true false) ; then:" \ - -e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \ - configure || die -} - -src_configure() { - chmod g-w "${T}" - # not a real configure script - # TODO: pmem - set -- \ - ./configure \ - --disable-optimizations \ - --extra-cflags="${CFLAGS} ${CPPFLAGS}" \ - --cc="$(tc-getCC)" \ - --disable-pmem \ - $(usex curl '' '--disable-http') \ - $(usex glusterfs '' '--disable-gfapi') \ - $(usex gtk '--enable-gfio' '') \ - $(usex numa '' '--disable-numa') \ - $(usex rbd '' '--disable-rbd') \ - $(usex rdma '' '--disable-rdma') \ - $(usex static '--build-static' '') \ - $(usex tcmalloc '' '--disable-tcmalloc') - echo "$@" - "$@" || die 'configure failed' -} - -src_compile() { - emake V=1 OPTFLAGS= -} - -src_install() { - emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man" - - if use gnuplot ; then - sed -i 's:python2.7:python:g' \ - "${ED}/usr/bin/fio2gnuplot" \ - "${ED}/usr/bin/fiologparser_hist.py" \ - "${ED}/usr/bin/fiologparser.py" - python_replicate_script \ - "${ED}/usr/bin/fio2gnuplot" \ - "${ED}/usr/bin/fiologparser_hist.py" \ - "${ED}/usr/bin/fiologparser.py" - else - rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die - rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die - rm "${ED}"/usr/share/fio/*.gpm || die - rmdir "${ED}"/usr/share/fio/ 2>/dev/null - fi - - # This tool has security/parallel issues -- it hardcodes /tmp/template.fio. - rm "${ED}"/usr/bin/genfio || die - - dodoc README REPORTING-BUGS HOWTO - docinto examples - dodoc examples/* -} diff --git a/sys-block/fio/fio-3.7.ebuild b/sys-block/fio/fio-3.7.ebuild deleted file mode 100644 index d3a0e110fd2d..000000000000 --- a/sys-block/fio/fio-3.7.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) - -inherit eutils python-r1 toolchain-funcs - -MY_PV="${PV/_rc/-rc}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Jens Axboe's Flexible IO tester" -HOMEPAGE="http://brick.kernel.dk/snaps/" -SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" -IUSE="aio glusterfs gnuplot gtk numa rbd rdma static zlib" -REQUIRED_USE="gnuplot? ( ${PYTHON_REQUIRED_USE} )" - -# GTK+:2 does not offer static libaries. -LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] ) - glusterfs? ( sys-cluster/glusterfs[static-libs(+)] ) - gtk? ( dev-libs/glib:2[static-libs(+)] ) - numa? ( sys-process/numactl[static-libs(+)] ) - rbd? ( sys-cluster/ceph[static-libs(+)] ) - rdma? ( - sys-fabric/libibverbs[static-libs(+)] - sys-fabric/librdmacm[static-libs(+)] - ) - zlib? ( sys-libs/zlib[static-libs(+)] )" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - gtk? ( x11-libs/gtk+:2 )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} )" -RDEPEND+=" - gnuplot? ( - sci-visualization/gnuplot - ${PYTHON_DEPS} - )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/fio-2.2.13-libmtd.patch -) - -src_prepare() { - sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die - - # Many checks don't have configure flags. - sed -i \ - -e "s:\:$(tc-getPKG_CONFIG):" \ - -e '/if compile_prog "" "-lz" "zlib" *; *then/ '"s::if $(usex zlib true false) ; then:" \ - -e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \ - configure || die - default -} - -src_configure() { - chmod g-w "${T}" - # not a real configure script - # TODO: pmem - set -- \ - ./configure \ - --disable-optimizations \ - --extra-cflags="${CFLAGS} ${CPPFLAGS}" \ - --cc="$(tc-getCC)" \ - --disable-pmem \ - $(usex glusterfs '' '--disable-gfapi') \ - $(usex gtk '--enable-gfio' '') \ - $(usex numa '' '--disable-numa') \ - $(usex rbd '' '--disable-rbd') \ - $(usex rdma '' '--disable-rdma') \ - $(usex static '--build-static' '') - echo "$@" - "$@" || die 'configure failed' -} - -src_compile() { - emake V=1 OPTFLAGS= -} - -src_install() { - emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man" - - if use gnuplot ; then - sed -i 's:python2.7:python:g' \ - "${ED}/usr/bin/fio2gnuplot" \ - "${ED}/usr/bin/fiologparser_hist.py" \ - "${ED}/usr/bin/fiologparser.py" - python_replicate_script \ - "${ED}/usr/bin/fio2gnuplot" \ - "${ED}/usr/bin/fiologparser_hist.py" \ - "${ED}/usr/bin/fiologparser.py" - else - rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die - rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die - rm "${ED}"/usr/share/fio/*.gpm || die - rmdir "${ED}"/usr/share/fio/ 2>/dev/null - fi - - # This tool has security/parallel issues -- it hardcodes /tmp/template.fio. - rm "${ED}"/usr/bin/genfio || die - - dodoc README REPORTING-BUGS HOWTO - docinto examples - dodoc examples/* -} diff --git a/sys-block/gpart/Manifest b/sys-block/gpart/Manifest index 40771753ed2a..f86b90b31c01 100644 --- a/sys-block/gpart/Manifest +++ b/sys-block/gpart/Manifest @@ -1,5 +1,5 @@ AUX gpart-0.1h-errno.patch 384 BLAKE2B 75bf8f7698a635bd3b17eaf423cb536ac74da4027a22b391a77a1675ff72fb9b909bacf12a958bc68b4b210f4b971e90e2a42661f53d1052a6e6329e40a8e41b SHA512 0b81a8a3edecb4f44907afba9364010f2920a71d7f38626e2cf5f2bf5025b27f021ee762c039718dfb6f1119956c03219b1ffd4373f9f6b3157662dfca553618 AUX gpart-0.3-build.patch 259 BLAKE2B b0c1119b4799628104672f3ce219c560374600fe9c0a9e4163d4454546a158439bb5252205808bbb4a14f0c948115b7be3ad11a6e279021ebf6d01deee851616 SHA512 05cb685691a59bdb60af306c01c3f619e88cdbf3db0d4b48c23ac740b241b80d44a03dd90e89255180c6e0c6f4cc7bb428345734da4f4ad709659aefac66a772 DIST gpart-0.3.tar.gz 53589 BLAKE2B fd479f05219cc3b65ac91318c294728c115dfbab684269d7b5d6dbfa7575902094d3c7e611d296214170713aa23d6909814179208c2599219e94f4bae56d0ccd SHA512 5ee8bc551050d26dc71898d3232549d2b96e0806071571b120cbf819282da0ec2246147a0dfc44576e62d68092bb0183c1a9bb71db7ddca12c0922da60aeea35 -EBUILD gpart-0.3.ebuild 722 BLAKE2B 27a5846037102a6a8cb78a6e7c0a5408faf44ecd916086b9e0916bfbc3701477dee3b24a8299ff371c503593ba8cf774573caf2ed547ed6a6a4f80c5dea996d5 SHA512 08f42fe4eed2d53fae0ced2c68a95a36c878806996330b1f1fcbb23dbd4fbd7bdea4d08f1cc3c31326d038928d8fd1868c630d77ba65279be6abc6096967ee19 +EBUILD gpart-0.3.ebuild 723 BLAKE2B 0a925c2dc0864919af673bcab402444b100edc4780d02d1f154969de5c7a51ca68466a3b28435b6cf6bbe6ea411bbaadc0e2bb6c8668397df7657ac2fa915d91 SHA512 eca21cfb5adea76cb8eb699eb52d748a09ff34ec918307d792ed318132bc4e9fef0d8ad047a626285af334fd8c73123da3bf2683c71495c0af90150a494830b0 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-block/gpart/gpart-0.3.ebuild b/sys-block/gpart/gpart-0.3.ebuild index fdd4b6afe204..441fcf000345 100644 --- a/sys-block/gpart/gpart-0.3.ebuild +++ b/sys-block/gpart/gpart-0.3.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/baruch/gpart/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 hppa x86" +KEYWORDS="amd64 ~hppa x86" IUSE="" RDEPEND="" diff --git a/sys-block/mtx/Manifest b/sys-block/mtx/Manifest index 8ed3c6cb3f99..413c7be64ac6 100644 --- a/sys-block/mtx/Manifest +++ b/sys-block/mtx/Manifest @@ -1,4 +1,4 @@ AUX mtx-1.3.12-fix-buildsystem.patch 574 BLAKE2B 13a6b5005ee59b2ac0dd0e6b7f6e3fd3569e7d364ab83e0b861b41f7c68583220ea269d01667504f02cbd0cb3ebd5dc8eb6ae9296ea8e45668f8f8ca65d4a685 SHA512 61a7e259ea97fa24399db95f503dabde9cfa5ecbdc479ab681bd2c64a94a18bbed6368b536f5388c3d00d68043413962f268faa2893006f7481ee0e537a39e8b DIST mtx-1.3.12.tar.gz 235214 BLAKE2B af5d0dd35ecf4fca75af700c4eddd48775187c6015c00048204774a87d2905a016a8c36fcfce07535d093a3f16b1a31b9e455e3e3e605cc0a7db49bd76da088d SHA512 d54c360608a2c25bd4d31af3e659de0557ed355fbe45d2dbf1341cfc7e468515eb07eb89200b77ee1fe2618139295ba3c3f4340cc43a7c506ced26aab2652028 -EBUILD mtx-1.3.12.ebuild 493 BLAKE2B d7a4716682864093ce96d080f56f8cae3379dbbc8a0ec21aced8262aed0f153cbcd8a2d5a6da516ae3870ded747f1d0ef9dd5f8b9b656465863089c5cf3e8d8c SHA512 f2f47a3448b8773a3e2d8509f2536cd894d1f56656eebd7ce765cfacaa09b21b906405316d0e3f55ded775503cb75f6b637eeca39e57f450e5512124292ae24f +EBUILD mtx-1.3.12.ebuild 494 BLAKE2B 6ca04b7b68af56b4056a268ce7b43718986590df9c4d8cd544989cf31fe67b62ec70fe20a720fe684ed2e7032445ad92ffb279517ccd5416ee048c2df754051d SHA512 de809133550bad63988d4610b47c391e2747fa889bcdb6cf99ae70cc30bc9165ad2f752458f31c173223c514350d53924b6f71b62848f12062c9c5a38427d842 MISC metadata.xml 323 BLAKE2B d0c394421bd8dca2c1595f979dae3db3dfd8f08d7471cba729a9e7dc6503cc3f8053d2c6fde8293c2ab6c616285d753a772fe5fe9ecd8a2df8659f589468c25b SHA512 2988c2031af8998f902e82b0e5a703a71030d079dfa28f6f3c433e7fa6d8797b1bf31c8bdfcb7057a78f33eaaa390f0bc9b60d1c5c8d675ac3d21af8c880425f diff --git a/sys-block/mtx/mtx-1.3.12.ebuild b/sys-block/mtx/mtx-1.3.12.ebuild index cb23164a9e11..157ac69cb0e9 100644 --- a/sys-block/mtx/mtx-1.3.12.ebuild +++ b/sys-block/mtx/mtx-1.3.12.ebuild @@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mtx/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86" PATCHES=( "${FILESDIR}"/${P}-fix-buildsystem.patch ) diff --git a/sys-block/nbd/Manifest b/sys-block/nbd/Manifest index 474d21c576de..636bf57811e1 100644 --- a/sys-block/nbd/Manifest +++ b/sys-block/nbd/Manifest @@ -1,8 +1,8 @@ DIST nbd-3.18.tar.xz 527436 BLAKE2B 6f87f013ff00b3cb478a038f07a83fba44b41c257a689be498959d90bb44dd39681fdcd005fe8e48f9a79fbe29bfd67d98fc0eb6440e51b1ac3a5de4d002060d SHA512 f9fe221b585c126efa3fb65e2344477a38f2ce42164b04d0dc4681c5a3bfd34d5d3e227454fff24eee9039853eb38a8707ea0aab0337f44906cccf379c185ce8 DIST nbd-3.19.tar.xz 524412 BLAKE2B 21669bfe3d34789725895511b1b65be83f85c315992d973db6737cb151ffa48c69ca8bef7dbce513d6f12551b22d063a951644fcaadbec5c115672040b2af8e7 SHA512 0916b411857045af6e01032b3093e295e7f3cfb1ae92f25adb03d97d3196741f8805104c627b17ad4f7f4305db3a4bcd5516bfd2c60fbea02b497dc296f97a16 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 1294 BLAKE2B 2d403e7c993df9acb2d90678fffd852154ee5d4eefcef4dd3e8c462b9f2bbb0d2d3adc76e3b9dc5de5cadc0883150a8b44a62cfaf5c8a13f38e5e274c29ff990 SHA512 c6cbfb3748c4380133060501ef1f4453f50f33d5a44008bdab9f4e0a1bdc748a5ef5b83accec9cd425689988b9d18f0cd359f1b641e6a9b8e4f30e91b3ede73e +EBUILD nbd-3.18.ebuild 1295 BLAKE2B 48593bf37c7960ee2bac437e447c5000f776b31e3c5ae960b29fa126651a24b8d163397303e1d60ddf6805e8fbf1eb7da424a9f17cce965a3364efe5e392c693 SHA512 62c3e5d72ab82bac59a5bae71e05231d7cdfe2102799c5e6d345987cfe4a94fba4b69343e9615b2e2bbc168bac4e394ed190e891eebdee97e814f96c4d23d4dd +EBUILD nbd-3.19.ebuild 1295 BLAKE2B 48593bf37c7960ee2bac437e447c5000f776b31e3c5ae960b29fa126651a24b8d163397303e1d60ddf6805e8fbf1eb7da424a9f17cce965a3364efe5e392c693 SHA512 62c3e5d72ab82bac59a5bae71e05231d7cdfe2102799c5e6d345987cfe4a94fba4b69343e9615b2e2bbc168bac4e394ed190e891eebdee97e814f96c4d23d4dd 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.18.ebuild b/sys-block/nbd/nbd-3.18.ebuild index 927bb90f26d6..34c5f3a353a8 100644 --- a/sys-block/nbd/nbd-3.18.ebuild +++ b/sys-block/nbd/nbd-3.18.ebuild @@ -10,7 +10,7 @@ if [[ "${PV}" = 9999 ]] ; then 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" + KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86" fi LICENSE="GPL-2" SLOT="0" diff --git a/sys-block/nbd/nbd-3.19.ebuild b/sys-block/nbd/nbd-3.19.ebuild index 927bb90f26d6..34c5f3a353a8 100644 --- a/sys-block/nbd/nbd-3.19.ebuild +++ b/sys-block/nbd/nbd-3.19.ebuild @@ -10,7 +10,7 @@ if [[ "${PV}" = 9999 ]] ; then 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" + KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86" fi LICENSE="GPL-2" SLOT="0" diff --git a/sys-block/parted/Manifest b/sys-block/parted/Manifest index d286b65dfa4a..df79f427085c 100644 --- a/sys-block/parted/Manifest +++ b/sys-block/parted/Manifest @@ -1,5 +1,5 @@ AUX parted-3.2-po4a-mandir.patch 275 BLAKE2B 5342cc776f557c9ef95604eb2c15ad484c4dbf102d4093dcb1d4005f2f6d4f90db2ff0fc3ceae59fd22c3442604b2abbdac48594f860ba810dc4d8dce89d6fc0 SHA512 5ef686f56d8c3939da3f24fdb6196d8858c2f980805f1cb06020d6f6996158f62b8372a233ec3ec98aae30b41034046d615e415b3abf2648db7be88e3b45a872 AUX parted-3.3-atari.patch 421 BLAKE2B 9048176f882e66cf89cc2d79aa0ea7a550f9c649d8f54f4df102eb361c6e0be473a2e07e1ab8f63dc446422a92ced10cfb4858a27b7988c1b5a960e6e8e1d518 SHA512 59738de6f89dd6d407eef139ffe4d0925d418f4d33a30a1ead1e1f05ab7ad93e13294412d5061dd40302b9592a33b97f137089f477dc6a2febd3fe60eae77ca0 DIST parted-3.3.tar.xz 1757432 BLAKE2B d1e248cd8fdce22d4957055d65f9f93333505229f92174f343897422a31a43f3d35ea06f8f1bdafd254e4629c5890ec38d6b75d3b499c39a9ada4a8d5f9d9d8f SHA512 d1384694a491aa53bab6206fdeccd1d192de2ed379fe25aa865dd6aa06ed945a728e85b2ccc2fb23f5aa9dfee4a8bd8f0f2be1dd386cb8e8861b73382c6a07e4 -EBUILD parted-3.3-r2.ebuild 1327 BLAKE2B f658999b44e2756e802acd05a8db7ddc53ad34ab4543080ddc9cad31a5d66d18ee3d3fd645e97846e851067426e1f8d3dd3fbb58c2a54acde0ebbeaaa8461eff SHA512 57499a912376b92d63eb3406ac92dc9aab0c13f2d5eae24fd1ee212a4d36a33c847b5c41126eb914d6e7b14261ab2cd7b53e7ce49f7f75dc3bb7c4c6719b4a29 +EBUILD parted-3.3-r2.ebuild 1346 BLAKE2B 9596370738eaa98e7521eec60895d91c21146c4dfa456546d09c329c33c7eda8bbc646a3f406047effc05a4ddee803ef091333039655b05dc3985576311b19b4 SHA512 cbb2689566d24a717b9fa27a67e0aff6b9f7aabd218a95bb78668f10ba7981a2b4ef1a6c85486e867e93e5dc5be747ed147468a828af99571c6666a7cf8cebd9 MISC metadata.xml 886 BLAKE2B 7eab7ab0acb3ca62dbd119ebdccad3a0a5aa69754edbc7465182496bfd136cdd06a7f12c8515ff2c9420dd22b9a4c03ca7f126b357f146af3825bf8e76064149 SHA512 aad773c94d64b99d1f70f2e542e75c4795e1c58bfdc238eb50d0e0a7c10d1255af464b2c7ddea76bbee4b6af5f8d90e1c584f319cb290cbe85aa6c7c8e873e21 diff --git a/sys-block/parted/parted-3.3-r2.ebuild b/sys-block/parted/parted-3.3-r2.ebuild index 5cc32e79496f..92e75e2681b3 100644 --- a/sys-block/parted/parted-3.3-r2.ebuild +++ b/sys-block/parted/parted-3.3-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" IUSE="+debug device-mapper nls readline selinux" RDEPEND=" @@ -24,8 +24,8 @@ RDEPEND=" selinux? ( sys-libs/libselinux ) elibc_uclibc? ( dev-libs/libiconv ) " -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" nls? ( >=sys-devel/gettext-0.12.1-r2 ) virtual/pkgconfig " @@ -59,5 +59,5 @@ DOCS=( src_install() { default - find "${D}" -name '*.la' -delete || die + find "${ED}" -type f -name '*.la' -delete || die } diff --git a/sys-block/rts_pstor/Manifest b/sys-block/rts_pstor/Manifest deleted file mode 100644 index 82f8c01a0c63..000000000000 --- a/sys-block/rts_pstor/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX fix-compile-kernel-5.0.0.patch 716 BLAKE2B ecb1bbdaf80d7e801f6e316308f559f29b4f0a5a431dc74aea82fd771e4ba31945ed77b5041398c0bee144f7912e89c91b55f29158e866dbde3687c50425c1c0 SHA512 5eeb472b97ca4742358e6002afc3d7839b1d25d0e08e72badf0447b0d951b2950c195a9120288b377a45ea118af754b5418a7ff251b463df457a1c201cc5d107 -AUX rts_pstor-makefile-kernel-5.1.patch 204 BLAKE2B e5b84e6e1c08ecbb4ee88f51ab8d485b50604660bd09198a443f0e15e45e2f766a036fb7f81b3a5f8cf3e0c508070d216ac5532a646dff88ef1816a1b6b8be5b SHA512 440b431326f10f9becf7ef118e58e1b708fb109f6b58e5a06aad1581a33503e08078d186cd5298de09b27b62f885a140daa2245bf50e7b801fbb09a934fa27d8 -AUX rts_pstor-makefile.patch 319 BLAKE2B afb25a7184c13b90fd9babf975cfc7710d4e643aad97994ff5d2f4f9bf77fc9928a1a2391890723e10c51107ad0cf4a5919418a9cb0787885d57de5e9cb08b03 SHA512 ae6b3890edef023d9b965d765baf7aefa75b0b44d51296f4997b0bb20a41c6a0d6ee19381a3d9194c23198b59da2a4523a1547363e3c82ba27c3625009f8d8ca -DIST rts_pstor-1.10_p20160103.tar.gz 108102 BLAKE2B 9cbca345211f7c99c6d9cf71b0ed207a4c911569eee6c63bfbe15c094be08f64c4550f04d9df688969f43564b2ff6a91d5cc72b8ab281cfdffb6884688b354de SHA512 d802a52b1e2da447a218472e77ca6ecc56e3b3767e3eb8daf634152675171c79c86e3b5ca9654b67cf32f63740c347bf7ecee5a1d20eb1c15a3a2ad3e9774311 -EBUILD rts_pstor-1.10_p20160103-r1.ebuild 1655 BLAKE2B bf8cf45663b501a08f6a7ef6d7eb4035fb516f56ac53ca1c7b4b8b9002bcb516735f377a31e8766d08c976618ae688b201cf083b80c43b1854b74936ec239d0f SHA512 fd57a275c389f35a327ae3de379dc1d52bc65c148c88f9321226cff015321953a8e1dec53d09e7733d02a73537d8d45ea6d086fa15eb05f25714956564e32294 -MISC metadata.xml 338 BLAKE2B 518a4272f88da61f60f7ec2269dda5108abc8346f08e497d2bc8fd7d65700cb0e5e0bebbfb3503e44dc033452045c335c1d2c5e52dd8222d9467b578dfb79b09 SHA512 8de518f5f270304254bd185f4057700a117d05d151a981a887835c9f1af77fcaeb4c4cee3a9779e20ca28500779b16b3c09c4bdc619dc4d39e114d6b698e2ebe diff --git a/sys-block/rts_pstor/files/fix-compile-kernel-5.0.0.patch b/sys-block/rts_pstor/files/fix-compile-kernel-5.0.0.patch deleted file mode 100644 index 7ea6ba6fd26b..000000000000 --- a/sys-block/rts_pstor/files/fix-compile-kernel-5.0.0.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/rtsx.h -+++ b/rtsx.h -@@ -81,6 +81,17 @@ - pci_get_domain_bus_and_slot(0, (bus), (devfn)) - #endif - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0) -+static void do_gettimeofday(struct timeval *tv) -+{ -+ struct timespec64 now; -+ -+ ktime_get_real_ts64(&now); -+ tv->tv_sec = now.tv_sec; -+ tv->tv_usec = now.tv_nsec / 1000; -+} -+#endif -+ - /* - * macros for easy use - */ ---- a/rtsx.c -+++ b/rtsx.c -@@ -300,11 +300,13 @@ - - .max_sectors = 240, - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) - /* merge commands... this seems to help performance, but - * periodically someone should test to see which setting is more - * optimal. - */ - .use_clustering = 1, -+#endif - - - .emulated = 1, diff --git a/sys-block/rts_pstor/files/rts_pstor-makefile-kernel-5.1.patch b/sys-block/rts_pstor/files/rts_pstor-makefile-kernel-5.1.patch deleted file mode 100644 index ff527e8a530a..000000000000 --- a/sys-block/rts_pstor/files/rts_pstor-makefile-kernel-5.1.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -36,3 +36,3 @@ - cp -f ./define.release ./define.h -- make -C /lib/modules/$(shell uname -r)/build/ SUBDIRS=$(PWD) modules -+ +make -C $(KERNELDIR) M=$(PWD) modules - debug: diff --git a/sys-block/rts_pstor/files/rts_pstor-makefile.patch b/sys-block/rts_pstor/files/rts_pstor-makefile.patch deleted file mode 100644 index dc12cd68f52b..000000000000 --- a/sys-block/rts_pstor/files/rts_pstor-makefile.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff -N -a -u1 a/Makefile b/Makefile ---- a/Makefile 2016-01-03 14:41:40.000000000 +0100 -+++ b/Makefile 2018-12-11 23:47:44.942218496 +0100 -@@ -36,3 +36,3 @@ - cp -f ./define.release ./define.h -- make -C /lib/modules/$(shell uname -r)/build/ SUBDIRS=$(PWD) modules -+ +make -C $(KERNELDIR) SUBDIRS=$(PWD) modules - debug: diff --git a/sys-block/rts_pstor/metadata.xml b/sys-block/rts_pstor/metadata.xml deleted file mode 100644 index 429074c44a31..000000000000 --- a/sys-block/rts_pstor/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - martin.dummer@gmx.net - - - proxy-maint@gentoo.org - Proxy Maintainers - - diff --git a/sys-block/rts_pstor/rts_pstor-1.10_p20160103-r1.ebuild b/sys-block/rts_pstor/rts_pstor-1.10_p20160103-r1.ebuild deleted file mode 100644 index aebf0d373c10..000000000000 --- a/sys-block/rts_pstor/rts_pstor-1.10_p20160103-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-mod - -GIT_COMMIT="c8313abffe083ac63bf76d2cc90d3edf5b2d1188" - -DESCRIPTION="PCI-E RTS5209 card reader driver for Linux" -HOMEPAGE="https://github.com/gexplorer/RTS5209-linux-driver" -SRC_URI="https://github.com/gexplorer/RTS5209-linux-driver/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="virtual/linux-sources" -S="${WORKDIR}/RTS5209-linux-driver-${GIT_COMMIT}" - -MODULE_NAMES="rts_pstor(misc/drivers/scsi)" -MODULESD_RTS_PSTOR_ADDITIONS=( - "# when rts_pstor is installed, blacklist in-kernel driver rtsx_pci" - "blacklist rtsx_pci" -) -BUILD_TARGETS="default" -BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}" -CONFIG_CHECK="~!MISC_RTSX_PCI !FORTIFY_SOURCE" -ERROR_MISC_RTSX_PCI="CONFIG_MISC_RTSX_PCI: The in-kernel driver rtsx_pci is configured, which may have the same functionality than this driver. To make sure that your kernel loads only rts_pstor, the rtsx_pci module will be blacklisted." -ERROR_FORTIFY_SOURCE="CONFIG_FORTIFY_SOURCE: this module is known to fail compiling when the hardening option CONFIG_FORTIFY_SOURCE is set" - -src_prepare() { - default - - eapply "${FILESDIR}/fix-compile-kernel-5.0.0.patch" - kernel_is le 5 0 && eapply "${FILESDIR}/rts_pstor-makefile.patch" || eapply "${FILESDIR}/rts_pstor-makefile-kernel-5.1.patch" -} - -pkg_postinst() { - elog "This driver is based on code published by Realtek. There is a driver in the kernel named rtsx_pci which" - elog "should be preferred over this driver - but on some hardware only this driver is functional and rtsx_pci is not." -} diff --git a/sys-block/tgt/Manifest b/sys-block/tgt/Manifest index eb9ed0bb31fc..527ef5535045 100644 --- a/sys-block/tgt/Manifest +++ b/sys-block/tgt/Manifest @@ -1,7 +1,6 @@ +AUX tgt-1.0.79-fno-common.patch 605 BLAKE2B e3673ec6f1dd9021da4a0b44b099ccbfed52ba75318e7e43b20d55b2bdff5bc28686792a5be36d753a36aa149ba5f6836211cd8953194d0fe468c167a32132ae SHA512 efcf1e28c52cbfb93ed16a1326b581c8027948e160b87b7fb692c38eebf6f3aa704f854b30a7e4ac36e9d5c9571d0e4b0a6c322d6c895ac02ecd81a8cb07812d AUX tgtd.confd 108 BLAKE2B 74e5f66f6fb193541853e562cd1de5e99806f1f324db6efb5f9a5217935044dd61237171b368dc1747017fbd9094d8c3acae4dfde0d5dfff69957c3f8800d63c SHA512 2153e99e3f6a2178bbbb2bda1d6af9a67d6080b36e7c5cbb4f951b10324c80a24fa224a7003c26b3b51d40a77bba97856bc009bbb0e664e93625face723edc91 AUX tgtd.initd 3435 BLAKE2B d2441a515c7a270472efd0c4ef5e928827bde54b248d09bb47f4fcc53c46e4678acf049c16ee761f29eb8e928f0713f38a9f73bd13db1e0408da56f42f64b337 SHA512 1e6d114dbb89c7a26e65546b6c775bcabc3c9508e0757e118a4272fbf4299a185b4679bc510d9cc3da7db25b96343ddc8e45de044543ebe26d952132eba4de30 -DIST tgt-1.0.78.tar.gz 297886 BLAKE2B c9edf8e5d0fe6a9788ff6bea4097f6cc0a8a905ffdc1943dcab538843445ede9142e1684121dad7f80677207607e20695bdad04fef622364c23df7cbeab1339a SHA512 dedafd490b6a042041fb9c8ed751747ec85f3bddab849fee301e0cf43b18aa92f5609657136700b867667fbff9ace62f4733c535cd425d8c71b072a7d7029430 DIST tgt-1.0.79.tar.gz 297898 BLAKE2B d0f18dac863d6983a00eb9513bcbe17b5cbed76fad998af74b65311c1ace6f281bfb1bf639713e10124a520ad3916ef79ca0a81cef97b5ef678c25cfa9a71eaa SHA512 d71b0a08bd1cdc717e22c4dd0a229e84bd19e02e01037231ee80d9ab24848bc7274050e1ffe7d9a3d50149c892ed1e6ea382e54dacc341650f4534629116be07 -EBUILD tgt-1.0.78.ebuild 1511 BLAKE2B f8c27f0ea227cbbe2cfd26d8c38c5834a21114fba89bc0d2574629802cd93f9954022a6dbfbe3375538f5fb5f5c31612dfcf1ea2de2d1ff3b31b03c55bbbe026 SHA512 bd541ac602eee81239c350b7b34e812fac716175bb29bb5869727807dc2e3c81e9f353e7b24df7817a32fe7318ac25137ac42cc9b21a55e694d7976125815643 -EBUILD tgt-1.0.79.ebuild 1515 BLAKE2B 2e355b6de4af36ad27d9b433c428a1f5fb56305a0d3805212af7a9b34c188f0d666a6e0b8b6d76bb1d526b55ee70cda8a6ba18f25ac8ff0592bfbb67be5eacac SHA512 0137b26fae4524999ed5c08c026d3ce9fe00c2378eb6564c8bc6872f3dd2b0bb66a28c0d5b70294f3f6dbc2263cf264936ca715688b860ec2006461ef914daa4 +EBUILD tgt-1.0.79.ebuild 1528 BLAKE2B 1e5251e85ecb1e12481a6885322512a9b349022826a7863bac3bb0a51da9a0724a75c92e50a590fb3e5d65835683c36f25e96a553f0c856c9d06b43a557046f8 SHA512 dd469a9dfd831ab7c38a3b4b380cb58b512a926e2d832509f76a75ca7a8f997d84e031cd343cdfefb52fef7386b2ee308889db6af2d0ef6581d5a4e9057f8c1c MISC metadata.xml 748 BLAKE2B 8d60bc130112e0edf5f4e9b6e73a717606c19ebccc6a0e302fa30cbf3dcb0fc17b0642ae117c954ed7d3e43e520b1f250830675e1f6b780630508256eb0bc6b8 SHA512 b17ab1fe2165d7d4f03decec67cecc199804d3f5408495b469a21a2dacc228fead46e73c1a3fb7ddc2439f7af8c5ffa0969635ce1f75a77f43ec364525c0dce2 diff --git a/sys-block/tgt/files/tgt-1.0.79-fno-common.patch b/sys-block/tgt/files/tgt-1.0.79-fno-common.patch new file mode 100644 index 000000000000..08933df021d8 --- /dev/null +++ b/sys-block/tgt/files/tgt-1.0.79-fno-common.patch @@ -0,0 +1,22 @@ +--- a/usr/iscsi/iscsid.c ++++ b/usr/iscsi/iscsid.c +@@ -1074,7 +1074,7 @@ void iscsi_rsp_set_residual(struct iscsi_cmd_rsp *rsp, struct scsi_cmd *scmd) + struct iscsi_sense_data { + uint16_t length; + uint8_t data[0]; +-} __packed; ++} __attribute__((__packed__)); + + static int iscsi_cmd_rsp_build(struct iscsi_task *task) + { +--- a/usr/iscsi/iser.c ++++ b/usr/iscsi/iser.c +@@ -92,7 +92,7 @@ char *iser_portal_addr; + struct iscsi_sense_data { + uint16_t length; + uint8_t data[0]; +-} __packed; ++} __attribute__((__packed__)); + + static size_t buf_pool_sz_mb = DEFAULT_POOL_SIZE_MB; + static int cq_vector = -1; diff --git a/sys-block/tgt/tgt-1.0.78.ebuild b/sys-block/tgt/tgt-1.0.78.ebuild deleted file mode 100644 index 3c44b0ae3640..000000000000 --- a/sys-block/tgt/tgt-1.0.78.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit flag-o-matic toolchain-funcs - -MY_TREE="159138e" - -DESCRIPTION="Linux SCSI target framework (tgt)" -HOMEPAGE="http://stgt.sourceforge.net" -SRC_URI="https://github.com/fujita/tgt/tarball/v${PV} -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="fcoe fcp ibmvio infiniband rbd" - -CDEPEND="dev-perl/Config-General - dev-libs/libxslt - rbd? ( sys-cluster/ceph ) - infiniband? ( - sys-fabric/libibverbs:= - sys-fabric/librdmacm:= - )" -DEPEND="${CDEPEND} - app-text/docbook-xsl-stylesheets" -RDEPEND="${DEPEND} - dev-libs/libaio - sys-apps/sg3_utils" - -S=${WORKDIR}/fujita-tgt-${MY_TREE} - -pkg_setup() { - tc-export CC -} - -src_prepare() { - sed -i -e 's:\($(CC)\) $^:\1 $(LDFLAGS) $^:' usr/Makefile || die - # make sure xml docs are generated before trying to install them - sed -i -e "s@install: @& all @g" doc/Makefile || die - eapply_user -} - -src_compile() { - local myconf - use ibmvio && myconf="${myconf} IBMVIO=1" - use infiniband && myconf="${myconf} ISCSI_RDMA=1" - use fcp && myconf="${myconf} FCP=1" - use fcoe && myconf="${myconf} FCOE=1" - use rbd && myconf="${myconf} CEPH_RBD=1" - - emake -C usr/ KERNELSRC="${KERNEL_DIR}" ISCSI=1 ${myconf} - emake -C doc -} - -src_install() { - emake install-programs install-scripts install-doc DESTDIR="${D}" docdir=/usr/share/doc/${PF} - newinitd "${FILESDIR}"/tgtd.initd tgtd - newconfd "${FILESDIR}"/tgtd.confd tgtd - dodir /etc/tgt - keepdir /etc/tgt -} diff --git a/sys-block/tgt/tgt-1.0.79.ebuild b/sys-block/tgt/tgt-1.0.79.ebuild index d6261e6104c8..a014556fa53f 100644 --- a/sys-block/tgt/tgt-1.0.79.ebuild +++ b/sys-block/tgt/tgt-1.0.79.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit flag-o-matic toolchain-funcs +inherit toolchain-funcs MY_TREE="b43dbc6" @@ -15,30 +15,32 @@ SLOT="0" KEYWORDS="amd64 arm64 ~ppc x86" IUSE="fcoe fcp ibmvio infiniband rbd" -CDEPEND="dev-perl/Config-General +DEPEND=" + app-text/docbook-xsl-stylesheets dev-libs/libxslt + dev-perl/Config-General rbd? ( sys-cluster/ceph ) infiniband? ( sys-fabric/libibverbs:= sys-fabric/librdmacm:= )" -DEPEND="${CDEPEND} - app-text/docbook-xsl-stylesheets" RDEPEND="${DEPEND} dev-libs/libaio sys-apps/sg3_utils" S=${WORKDIR}/fujita-tgt-${MY_TREE} +PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) + pkg_setup() { tc-export CC } src_prepare() { + default sed -i -e 's:\($(CC)\) $^:\1 $(LDFLAGS) $^:' usr/Makefile || die # make sure xml docs are generated before trying to install them sed -i -e "s@install: @& all @g" doc/Makefile || die - eapply_user } src_compile() { diff --git a/sys-block/vblade/Manifest b/sys-block/vblade/Manifest index 3b0721611680..275187f7ed1a 100644 --- a/sys-block/vblade/Manifest +++ b/sys-block/vblade/Manifest @@ -1,6 +1,8 @@ AUX conf.d-vblade 817 BLAKE2B befac1b206fa3442c5e820baff8efdf4cff443b449ae23679d6bf5f491e530573acb59a1dba4d299d3f0020cdbf1b57a18bf756a38cd847ee5842549a683ce55 SHA512 b65275d01a367888d16a3d51b189f01ceb7634d7b5a1dc02860ecae9a5030d18e99fd47a842748b5ccf48204242fb6d7613698fc3e21f6a1790d91a7600c172f AUX init.d-vblade.vblade0-r2 2909 BLAKE2B cf70ce62776c6e79c75110d4622c2913090221d336cea7674a9ba87bd4fb3ea3d7bf5e374d1b9b00693bf864573fef04de11a1b13acc8eb2087811d7fafe9a39 SHA512 1250bdefad4a6abe107d9ceb296b26204c0c9731a963a5a595e799cf2ac3eb10a2d2f48335baf55fa54d220da476e0013b4cd641d35686250794b48e81912403 +AUX vblade-24-fno-common.patch 1105 BLAKE2B 1b6391626e8ca092705f3fdc35072b925d6ea0b10538fedee93e19d6f3ec6347c23b9e63a208c84fed0a09da5a3b3a36eec9ccf933772cd1fb29708c54273249 SHA512 867e31d46ce3f9633262436fca673be485045766f745ebd0607d5632213dafe17259d9f38a55a094c6dc5139d625be1855d01830c755a14c33abe34b57698db9 +AUX vblade-24-makefile.patch 885 BLAKE2B 875811dfa1a75dc1f0fd809d3fc7a72ec1908b4e4d610f1e0a7d4e5813ac4c33d44a19277867c149b3103d267391a6451be98199170cd900e7fb91036d847d66 SHA512 0e7a37fe76be875dbb28337fae91aff31e6d652b112fc255cf6f8e2c22070ad6bb5dc486719af753224ea6c6a72a647e198ab8d2a0930c38ccba46a19ffa6155 AUX vbladed 544 BLAKE2B 88badea5aad70934eb16731ea2ce93762d282193b43efd25f71b3fc2a69eb3825bcf3db9cc243fb58f38874d2c6c13ab8368817c489bd27581101ad6c1a7c908 SHA512 447dbec563f41848727fe72ff391c07136509acbb707cf427485ef9ad190ec4247d809a2d71136e8f5456cf4f1798b89c9ca4ddcc4407f71d63ad220dab37c30 DIST vblade-24.tar.gz 27638 BLAKE2B 8a99d571b3b97d47ce9c81ef8141e0d6477181e88aa56e3ea7d03c689c747a60922c21969ea009cf978a3cb15bcb969b12df50f2bd8e6bb498a8bc6d483be1d3 SHA512 d5db85581db119b83a129fc00635d37b6d8fccfaf685dc58c68773c7299f7fe4e01735ec7fea6a0494a0cf2bc1400d643a720b55e4d6de37a0b8ec15d00d1f2a -EBUILD vblade-24.ebuild 803 BLAKE2B 155f55c789f5df59ad6fe7a1edb4228ce12716f1c01ea8e76e4dc7bd5a235f80fd066c29e374b350240001a7c0cab2fbc0a49e2f4fe986dad3c6e206d0751799 SHA512 8071f8d23354e06ab5ad771d350f05c77f25f55d123efd9c9bae5b49ee091157ba0a27aa8b064ce1557062ce96336a9c87bc8fab3dfbc1987c4da306e56f321c +EBUILD vblade-24.ebuild 753 BLAKE2B c0fe8a2e3502fc9bbe6a02cca82628a9fe45f4117e0600e4c9bf32b3e1d32da5aeaeb188f8dc26976c617b11736b0be715c852898974c55c48755c82385ef789 SHA512 15723fc9dd17495dc7d1d7fc999f745d075e9aff25a15767f0a8219ca7d66b34ed574a25ac2b939e0221e1c6c5b05b17f584c5d260f0e1dc520601001957fcc2 MISC metadata.xml 328 BLAKE2B b04b8d9c3016fc84883de505bb4b5fa0dd0f97d8a07c1e84995b7b2931f6b356cfb0f59b7665f7a9c63955a3ee7bae5d37379a326eafe20d58840bd236562718 SHA512 5f04425d524c4535b0b3b42a2c310afa42f09649929f08e12bb491ae808f2fb8dbd08e3c153426bdcef328291b9b19feea2c557ef0a2c6e3a98fc69824c11ca5 diff --git a/sys-block/vblade/files/vblade-24-fno-common.patch b/sys-block/vblade/files/vblade-24-fno-common.patch new file mode 100644 index 000000000000..2a51ddea4708 --- /dev/null +++ b/sys-block/vblade/files/vblade-24-fno-common.patch @@ -0,0 +1,48 @@ +Taken from: https://github.com/OpenAoE/vblade/pull/15 +Author: Andreas Kölbl + +--- /dev/null ++++ b/dat.c +@@ -0,0 +1,12 @@ ++/* dat.c: Global memory for vblade AoE target */ ++#include "dat.h" ++ ++int shelf, slot; ++ulong aoetag; ++uchar mac[6]; ++int bfd; // block file descriptor ++int sfd; // socket file descriptor ++vlong size; // size of vblade ++vlong offset; ++char *progname; ++char serial[Nserial+1]; +--- a/dat.h ++++ b/dat.h +@@ -1,4 +1,5 @@ + /* dat.h: include file for vblade AoE target */ ++#include + + #define nil ((void *)0) + /* +@@ -163,12 +164,12 @@ enum { + Nserial= 20, + }; + +-int shelf, slot; +-ulong aoetag; +-uchar mac[6]; +-int bfd; // block file descriptor +-int sfd; // socket file descriptor +-vlong size; // size of vblade +-vlong offset; +-char *progname; +-char serial[Nserial+1]; ++extern int shelf, slot; ++extern ulong aoetag; ++extern uchar mac[6]; ++extern int bfd; // block file descriptor ++extern int sfd; // socket file descriptor ++extern vlong size; // size of vblade ++extern vlong offset; ++extern char *progname; ++extern char serial[Nserial+1]; diff --git a/sys-block/vblade/files/vblade-24-makefile.patch b/sys-block/vblade/files/vblade-24-makefile.patch new file mode 100644 index 000000000000..ed5efb2c2e23 --- /dev/null +++ b/sys-block/vblade/files/vblade-24-makefile.patch @@ -0,0 +1,35 @@ +--- a/makefile ++++ b/makefile +@@ -8,27 +8,22 @@ + sharedir = ${prefix}/share + mandir = ${sharedir}/man + +-O=aoe.o bpf.o ${PLATFORM}.o ata.o +-CFLAGS += -Wall -g -O2 +-CC = gcc ++O=aoe.o bpf.o ${PLATFORM}.o ata.o dat.o ++CFLAGS += -Wall + + vblade: $O +- ${CC} -o vblade $O ++ ${CC} ${LDFLAGS} -o vblade $O ${LIBS} + + aoe.o : aoe.c config.h dat.h fns.h makefile +- ${CC} ${CFLAGS} -c $< + + ${PLATFORM}.o : ${PLATFORM}.c config.h dat.h fns.h makefile +- ${CC} ${CFLAGS} -c $< + + ata.o : ata.c config.h dat.h fns.h makefile +- ${CC} ${CFLAGS} -c $< + +-bpf.o : bpf.c +- ${CC} ${CFLAGS} -c $< ++dat.o : dat.c + + config.h : config/config.h.in makefile +- @if ${CC} ${CFLAGS} config/u64.c > /dev/null 2>&1; then \ ++ @if ${CC} ${CFLAGS} ${CPPFLAGS} config/u64.c > /dev/null 2>&1; then \ + sh -xc "cp config/config.h.in config.h"; \ + else \ + sh -xc "sed 's!^//u64 !!' config/config.h.in > config.h"; \ diff --git a/sys-block/vblade/vblade-24.ebuild b/sys-block/vblade/vblade-24.ebuild index 418e75559d0c..e8ee9b2db33c 100644 --- a/sys-block/vblade/vblade-24.ebuild +++ b/sys-block/vblade/vblade-24.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 inherit toolchain-funcs @@ -17,23 +17,22 @@ RDEPEND="sys-apps/util-linux" S="${WORKDIR}/${PN}-${P}" -src_prepare() { - default +PATCHES=( + "${FILESDIR}"/${P}-fno-common.patch + "${FILESDIR}"/${P}-makefile.patch +) - sed -i -e 's,^CFLAGS.*,CFLAGS += -Wall,' \ - -e 's:-o vblade:${LDFLAGS} \0:' \ - makefile || die -} - -src_compile() { - emake CC="$(tc-getCC)" +src_configure() { + tc-export CC } src_install() { dosbin vblade dosbin "${FILESDIR}"/vbladed + doman vblade.8 dodoc HACKING NEWS README + newconfd "${FILESDIR}"/conf.d-vblade vblade newinitd "${FILESDIR}"/init.d-vblade.vblade0-r2 vblade.vblade0 } -- cgit v1.2.3