diff options
Diffstat (limited to 'sys-block')
65 files changed, 1659 insertions, 156 deletions
diff --git a/sys-block/btrace/btrace-1.1.0-r1.ebuild b/sys-block/btrace/btrace-1.1.0-r1.ebuild new file mode 100644 index 000000000000..0278e0ca9889 --- /dev/null +++ b/sys-block/btrace/btrace-1.1.0-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit eutils toolchain-funcs flag-o-matic linux-info + +MY_PN="blktrace" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="btrace can show detailed info about what is happening on a block device io queue" +HOMEPAGE="http://git.kernel.dk/cgit/blktrace/" +SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2" +LICENSE="GPL-2" +SLOT="0" + +KEYWORDS="~amd64 ~arm ~ppc ~x86" +IUSE="doc" + +RDEPEND="dev-libs/libaio" +# This is a Linux specific app! +DEPEND="${RDEPEND} + sys-kernel/linux-headers + doc? ( virtual/latex-base app-text/dvipdfm )" +S="${WORKDIR}/${MY_P}" + +CONFIG_CHECK="~BLK_DEV_IO_TRACE" +WARNING_BLK_DEV_IO_TRACE="you need to enable BLK_DEV_IO_TRACE kernel option if you want to gather traces from this machine" + +PATCHES=( "${FILESDIR}"/${PN}-1.1.0-ldflags-parallel-make.patch ) + +src_compile() { + append-flags -DLVM_REMAP_WORKAROUND -W -I"${S}" + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" + if use doc; then + export VARTEXFONTS="${T}/fonts" + emake docs + fi +} + +src_install() { + emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man" + einstalldocs + use doc && dodoc doc/blktrace.pdf btt/doc/btt.pdf +} diff --git a/sys-block/di/Manifest b/sys-block/di/Manifest index 8f64d7f345de..6dd6944c3451 100644 --- a/sys-block/di/Manifest +++ b/sys-block/di/Manifest @@ -1,3 +1,3 @@ DIST di-4.35.tar.gz 212325 SHA256 2cdfface7a85e3a359cb228277b090a0648cabe18520e43b09919bdaf67b71d2 SHA512 5b7e7bd347b1ea285c4410e864f29cf475015a560baf450e558d3f8e1994b10822d6c3e18c04447c6a229d6d5e991194a4a3b155f3b36a8acfee866c8d048cec WHIRLPOOL 2891f70976f5818aa73ec3a07dc4afda678ae02c63b5a018cfb538a78d25f0432d70a7104ef1fe5f6e23e8e5f301430f4cc39b1538a83ea35d1a4748d4e55929 -DIST di-4.41.tar.gz 219347 SHA256 3ae850b160b42c3b77e42b79a4374a480eca671a83a35357078308f52f431c8b SHA512 a64eb086379d2917ec898f17ea32579f071923a2e7a729934ed649f00028c8804696f3d5ad0d10a127f8d9a669a211ec9bee0d3ba585b07996a986e9a6abe3b7 WHIRLPOOL 7c97565b75cc0af9c39bf2512da0eea2e3a43a2176e9abd73edfc744da30bf9770e88140b57100403659a0f1d3627984674d405590254f28b7af10dd55afc157 DIST di-4.42.tar.gz 267259 SHA256 f61865a0f18de49caaa2bf40fe2ed1677a755173e9d3809111c8b668db4fd5c4 SHA512 87ac16f6a410ab7da4a68c28d9fddf4755c17233e35660d3a19bc6eb34e5e721365e5f7e8678103b9a12d85f13751d09b8854770eaedb740b4680de2e5500be4 WHIRLPOOL 4554726cd257a229d41c2969321ba12b7a516b12d3a33c3296bcc21d53e7c880fd46d801446ad9eee386f7d5cb6e12305abcda0f0b1e2f2b541c3e1925178fff +DIST di-4.43.tar.gz 267160 SHA256 c8374d2ab7a82274d733be01639f48440accf4c70c70b152f5fa3b1c8a9745e0 SHA512 5b84c2ebf6fa22f6c7fee5872cc81a76e897cadbdaf8ce1b1b8dac0d53d5460127c8144f94fad204bdc522117cd1fcbac2905a065057d83b8aed0d69a5b95f9a WHIRLPOOL 9e117a8dee7fd587de00c9f605ac6a034b5ba7d3e60fb199b00536dfda29fe02a560c8018cb456671fe9b3858471340dfbf9b1475537dd589f6ac89cd87e750c diff --git a/sys-block/di/di-4.41.ebuild b/sys-block/di/di-4.43.ebuild index 42ea3cc89ab1..42ea3cc89ab1 100644 --- a/sys-block/di/di-4.41.ebuild +++ b/sys-block/di/di-4.43.ebuild diff --git a/sys-block/f3/Manifest b/sys-block/f3/Manifest new file mode 100644 index 000000000000..2f440a903bbc --- /dev/null +++ b/sys-block/f3/Manifest @@ -0,0 +1 @@ +DIST f3-6.0.tar.gz 45355 SHA256 d72addb15809bc6229a08ac57e2b87b34eac80346384560ba1f16dae03fbebd5 SHA512 7960d01d7a2bd01a236006fcb4081cc7e2c0be674bc3e28137f00ea3f558a04eed47f10e7d3795c219943092ee43fb3189e19ff1925a7ed4ff5102130d65a470 WHIRLPOOL 5d96587b62528c3559061ee940342247934995cbcc919991ab53f75cc7e38d9400e3695535be1aaf80d17efc4530e89e61fead9af08c635ceba1c2937d3803d6 diff --git a/sys-block/f3/f3-6.0.ebuild b/sys-block/f3/f3-6.0.ebuild new file mode 100644 index 000000000000..f65de3592906 --- /dev/null +++ b/sys-block/f3/f3-6.0.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Utilities to detect broken or counterfeit flash storage" +HOMEPAGE="http://oss.digirati.com.br/f3/ https://github.com/AltraMayor/f3" + +PATCHES=( + "${FILESDIR}"/f3-6.0-fix-compiler-warnings_f3read.patch + "${FILESDIR}"/f3-6.0-fix-compiler-warnings_f3probe.patch + "${FILESDIR}"/f3-6.0-respect-ldflags.patch + "${FILESDIR}"/f3-6.0-use-argp_parse.patch + "${FILESDIR}"/f3-6.0-extra-target.patch + "${FILESDIR}"/f3-6.0-upstream-issue-44.patch +) + +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI=" + git://github.com/AltraMayor/${PN}.git + https://github.com/AltraMayor/${PN}.git + " + + PATCHES=() + + inherit git-r3 +else + SRC_URI="https://github.com/AltraMayor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-3+" +SLOT="0" + +IUSE="extra" + +DEPEND="extra? ( + sys-block/parted + virtual/udev + )" + +RDEPEND="" + +DOCS=( changelog README.md ) + +src_prepare() { + default + + sed -i \ + -e 's:-ggdb::' \ + -e 's:^PREFIX =:PREFIX ?=:' \ + Makefile || die + + tc-export CC + + append-cflags -fgnu89-inline # https://github.com/AltraMayor/f3/issues/34 +} + +src_compile() { + default + + if use extra; then + emake V=1 extra + fi +} + +src_install() { + emake PREFIX="${ED%/}/usr" install + + if use extra; then + emake PREFIX="${ED%/}/usr" install-extra + fi + + dodoc "${DOCS[@]}" +} diff --git a/sys-block/f3/files/f3-6.0-extra-target.patch b/sys-block/f3/files/f3-6.0-extra-target.patch new file mode 100644 index 000000000000..8523ca3f2b53 --- /dev/null +++ b/sys-block/f3/files/f3-6.0-extra-target.patch @@ -0,0 +1,108 @@ +From 64d169e2486121eaece555c56040d6aff71e0b51 Mon Sep 17 00:00:00 2001 +From: Michel Machado <michel@digirati.com.br> +Date: Tue, 29 Mar 2016 12:56:43 -0400 +Subject: [PATCH] Mark experimental applications as stable + +The code of the applications f3probe, f3brew, and f3fix is now +mature, and they have not received any significant bug report for +about six months. + +From now on, one needs to compile these applications with +```make extra``` +--- + Makefile | 10 +++++----- + README.md | 29 ++++++++++++----------------- + 2 files changed, 17 insertions(+), 22 deletions(-) + +diff --git a/Makefile b/Makefile +index 46853f5..ce54842 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,14 +2,14 @@ CC ?= gcc + CFLAGS += -std=c99 -Wall -Wextra -pedantic -MMD -ggdb + + TARGETS = f3write f3read +-EXPERIMENTAL_TARGETS = f3probe f3brew f3fix ++EXTRA_TARGETS = f3probe f3brew f3fix + + PREFIX = /usr/local + INSTALL = install + LN = ln + + all: $(TARGETS) +-experimental: $(EXPERIMENTAL_TARGETS) ++extra: $(EXTRA_TARGETS) + + install: all + $(INSTALL) -d $(PREFIX)/bin +@@ -18,9 +18,9 @@ install: all + $(INSTALL) -oroot -groot -m644 f3read.1 $(PREFIX)/share/man/man1 + $(LN) -sf f3read.1 $(PREFIX)/share/man/man1/f3write.1 + +-install-experimental: experimental ++install-extra: extra + $(INSTALL) -d $(PREFIX)/bin +- $(INSTALL) -oroot -groot -m755 $(EXPERIMENTAL_TARGETS) $(PREFIX)/bin ++ $(INSTALL) -oroot -groot -m755 $(EXTRA_TARGETS) $(PREFIX)/bin + + f3write: utils.o f3write.o + $(CC) -o $@ $^ $(LDFLAGS) -lm +@@ -45,4 +45,4 @@ cscope: + cscope -b *.c *.h + + clean: +- rm -f *.o *.d cscope.out $(TARGETS) $(EXPERIMENTAL_TARGETS) ++ rm -f *.o *.d cscope.out $(TARGETS) $(EXTRA_TARGETS) +diff --git a/README.md b/README.md +index f0399b4..e2f7f79 100644 +--- a/README.md ++++ b/README.md +@@ -5,36 +5,31 @@ make + ``` + + +-## Compile experimental applications on Linux ++## Compile the extra applications on Linux + + ### Install dependencies + +- - f3probe and f3brew require version 1 of the library libudev to compile. +- On Ubuntu, you can install this library with the following command: ++f3probe and f3brew require version 1 of the library libudev, and ++f3fix requires version 0 of the library libparted to compile. ++On Ubuntu, you can install these libraries with the following command: + ``` +-sudo apt-get install libudev1 libudev-dev +-``` +- - f3fix requires version 0 of the library libparted to compile. +- On Ubuntu, you can install this library with the following command: +-``` +-sudo apt-get install libparted0-dev ++sudo apt-get install libudev1 libudev-dev libparted0-dev + ``` + +-### Compile experimental applications ++### Compile the extra applications + + ``` +-make experimental ++make extra + ``` + + NOTES: +- - Experimental software might compile on non-Linux platforms, but +- there is no guarantee given that they are only tested on Linux. +- - Please do not e-mail me saying that you want an experimental software ++ - The extra applications are only compiled and tested on Linux platform. ++ - Please do not e-mail me saying that you want the extra applications + to run on your platform; I already know that. +- - If you want experimental software to run on your platform, ++ - If you want the extra applications to run on your platform, + help to port them, or find someone that can port them for you. +- If you do port the software, please send me a patch to help others. +- - Currently, f3probe, f3brew, and f3fix are experimental. ++ If you do port any of them, please send me a patch to help others. ++ - The extra applications are f3probe, f3brew, and f3fix. + + + ## Use example of f3write/f3read diff --git a/sys-block/f3/files/f3-6.0-fix-compiler-warnings_f3probe.patch b/sys-block/f3/files/f3-6.0-fix-compiler-warnings_f3probe.patch new file mode 100644 index 000000000000..739488b53f97 --- /dev/null +++ b/sys-block/f3/files/f3-6.0-fix-compiler-warnings_f3probe.patch @@ -0,0 +1,50 @@ +From 77d2ceb374ff70b64e95a41f0e05486575147b53 Mon Sep 17 00:00:00 2001 +From: Michel Machado <michel@digirati.com.br> +Date: Mon, 4 Jan 2016 13:49:05 -0500 +Subject: [PATCH] f3probe: avoid compiler warning +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When using -O2, GCC was issuing the following warning: + +cc -O2 -std=c99 -Wall -Wextra -pedantic -MMD -ggdb -c -o f3probe.o f3probe.c +f3probe.c: In function ‘main’: +f3probe.c:446:13: warning: ‘sdev’ may be used uninitialized in this function [-Wmaybe-uninitialized] + sdev_flush(sdev); + ^ +f3probe.c:369:30: note: ‘sdev’ was declared here + struct device *dev, *pdev, *sdev; + ^ + +NOTE: The warning was wrong. + GCC could not follow that @args->save being true implied + @sdev to not be NULL. + +This patch addresses one of the issues discussed here: +https://github.com/AltraMayor/f3/issues/34 +--- + f3probe.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/f3probe.c b/f3probe.c +index e647d7c..9f214ab 100644 +--- a/f3probe.c ++++ b/f3probe.c +@@ -393,6 +393,7 @@ static int test_device(struct args *args) + pdev = NULL; + } + ++ sdev = NULL; + if (args->save) { + sdev = create_safe_device(dev, + probe_device_max_blocks(dev), args->min_mem); +@@ -434,7 +435,7 @@ static int test_device(struct args *args) + &read_count, &read_time_us, + &write_count, &write_time_us, + &reset_count, &reset_time_us); +- if (args->save) { ++ if (sdev) { + uint64_t very_last_pos = real_size_byte >> block_order; + printf("Probe finished, recovering blocks..."); + fflush(stdout); diff --git a/sys-block/f3/files/f3-6.0-fix-compiler-warnings_f3read.patch b/sys-block/f3/files/f3-6.0-fix-compiler-warnings_f3read.patch new file mode 100644 index 000000000000..0e4f61fca816 --- /dev/null +++ b/sys-block/f3/files/f3-6.0-fix-compiler-warnings_f3read.patch @@ -0,0 +1,88 @@ +From 52e252f5d6dc6d10fd85a45b0774bb0b29d5f989 Mon Sep 17 00:00:00 2001 +From: Michel Machado <michel@digirati.com.br> +Date: Mon, 4 Jan 2016 13:22:18 -0500 +Subject: [PATCH] f3read: avoid compiler warning +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When using -O2, GCC was issuing the following warning: + +cc -O2 -std=c99 -Wall -Wextra -pedantic -MMD -ggdb -c -o f3read.o f3read.c +f3read.c: In function ‘validate_file’: +f3read.c:95:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] + offset = *((uint64_t *) sector); + ^ +--- + f3read.c | 28 ++++++++++++---------------- + 1 file changed, 12 insertions(+), 16 deletions(-) + +diff --git a/f3read.c b/f3read.c +index 1514365..2dc6942 100644 +--- a/f3read.c ++++ b/f3read.c +@@ -42,12 +42,12 @@ static void validate_file(const char *path, int number, + { + char *full_fn; + const char *filename; +- uint8_t sector[SECTOR_SIZE], *p, *ptr_end; ++ const int num_int64 = SECTOR_SIZE >> 3; ++ uint64_t sector[num_int64]; + FILE *f; + int fd; +- int offset_match, error_count; + size_t sectors_read; +- uint64_t offset, expected_offset; ++ uint64_t expected_offset; + int final_errno; + struct timeval t1, t2; + /* Progress time. */ +@@ -84,32 +84,24 @@ static void validate_file(const char *path, int number, + /* Help the kernel to help us. */ + assert(!posix_fadvise(fd, 0, 0, POSIX_FADV_SEQUENTIAL)); + +- ptr_end = sector + SECTOR_SIZE; + sectors_read = fread(sector, SECTOR_SIZE, 1, f); + final_errno = errno; + expected_offset = (uint64_t)number * GIGABYTES; + while (sectors_read > 0) { + uint64_t rn; ++ int error_count, i; + + assert(sectors_read == 1); +- offset = *((uint64_t *) sector); +- offset_match = offset == expected_offset; + +- rn = offset; +- p = sector + sizeof(offset); ++ rn = sector[0]; + error_count = 0; +- for (; error_count <= TOLERANCE && p < ptr_end; +- p += sizeof(rn)) { ++ for (i = 1; error_count <= TOLERANCE && i < num_int64; i++) { + rn = random_number(rn); +- if (rn != *((__typeof__(rn) *) p)) ++ if (rn != sector[i]) + error_count++; + } + +- sectors_read = fread(sector, SECTOR_SIZE, 1, f); +- final_errno = errno; +- expected_offset += SECTOR_SIZE; +- +- if (offset_match) { ++ if (expected_offset == sector[0]) { + if (error_count == 0) + (*ptr_ok)++; + else if (error_count <= TOLERANCE) +@@ -121,6 +113,10 @@ static void validate_file(const char *path, int number, + else + (*ptr_corrupted)++; + ++ sectors_read = fread(sector, SECTOR_SIZE, 1, f); ++ final_errno = errno; ++ expected_offset += SECTOR_SIZE; ++ + if (progress) { + struct timeval pt2; + assert(!gettimeofday(&pt2, NULL)); diff --git a/sys-block/f3/files/f3-6.0-respect-ldflags.patch b/sys-block/f3/files/f3-6.0-respect-ldflags.patch new file mode 100644 index 000000000000..4d42ea8318d4 --- /dev/null +++ b/sys-block/f3/files/f3-6.0-respect-ldflags.patch @@ -0,0 +1,40 @@ +From 70962dcfaa41ca390f6f077cc64312fb879b7eb4 Mon Sep 17 00:00:00 2001 +From: Grazvydas Ignotas <notasas@gmail.com> +Date: Sat, 12 Mar 2016 17:39:05 +0200 +Subject: [PATCH] allow users to specify linker flags + +Traditionally LDFLAGS is used for this, it's what I've tried first +but it wasn't accepted. +--- + Makefile | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Makefile b/Makefile +index 404bc17..46853f5 100644 +--- a/Makefile ++++ b/Makefile +@@ -23,19 +23,19 @@ install-experimental: experimental + $(INSTALL) -oroot -groot -m755 $(EXPERIMENTAL_TARGETS) $(PREFIX)/bin + + f3write: utils.o f3write.o +- $(CC) -o $@ $^ -lm ++ $(CC) -o $@ $^ $(LDFLAGS) -lm + + f3read: utils.o f3read.o +- $(CC) -o $@ $^ ++ $(CC) -o $@ $^ $(LDFLAGS) + + f3probe: libutils.o libdevs.o libprobe.o f3probe.o +- $(CC) -o $@ $^ -lm -ludev ++ $(CC) -o $@ $^ $(LDFLAGS) -lm -ludev + + f3brew: libutils.o libdevs.o f3brew.o +- $(CC) -o $@ $^ -lm -ludev ++ $(CC) -o $@ $^ $(LDFLAGS) -lm -ludev + + f3fix: libutils.o f3fix.o +- $(CC) -o $@ $^ -lparted ++ $(CC) -o $@ $^ $(LDFLAGS) -lparted + + -include *.d + diff --git a/sys-block/f3/files/f3-6.0-upstream-issue-44.patch b/sys-block/f3/files/f3-6.0-upstream-issue-44.patch new file mode 100644 index 000000000000..605b6b3ea663 --- /dev/null +++ b/sys-block/f3/files/f3-6.0-upstream-issue-44.patch @@ -0,0 +1,25 @@ +From a754e9cf29415d110c4fe6fb1fe0d060d765a73e Mon Sep 17 00:00:00 2001 +From: Michel Machado <michel@digirati.com.br> +Date: Thu, 19 May 2016 08:39:36 -0400 +Subject: [PATCH] f3read: add "#include <limits.h>" to f3read.c + +This addresses a compiling issue on Macs. + +@jksinton found and solved this problem: +https://github.com/AltraMayor/f3/issues/44 +--- + f3read.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/f3read.c b/f3read.c +index 0842071..c5c20d2 100644 +--- a/f3read.c ++++ b/f3read.c +@@ -5,6 +5,7 @@ + #include <stdint.h> + #include <inttypes.h> + #include <stdio.h> ++#include <limits.h> + #include <string.h> + #include <stdlib.h> + #include <errno.h> diff --git a/sys-block/f3/files/f3-6.0-use-argp_parse.patch b/sys-block/f3/files/f3-6.0-use-argp_parse.patch new file mode 100644 index 000000000000..b73fbff8c7a2 --- /dev/null +++ b/sys-block/f3/files/f3-6.0-use-argp_parse.patch @@ -0,0 +1,417 @@ +From fb187b4c710714a56d74af8a50adccd6118445e7 Mon Sep 17 00:00:00 2001 +From: zwpwjwtz <zwpwjwtz@126.com> +Date: Tue, 29 Mar 2016 15:36:04 +0800 +Subject: [PATCH] Replace parse_args() with argp_parse() from argp.h + +--- + f3read.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++----- + f3write.c | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----- + utils.c | 92 ---------------------------------------------------- + utils.h | 5 --- + 4 files changed, 200 insertions(+), 113 deletions(-) + +diff --git a/f3read.c b/f3read.c +index 2dc6942..683232d 100644 +--- a/f3read.c ++++ b/f3read.c +@@ -12,8 +12,100 @@ + #include <unistd.h> + #include <err.h> + #include <sys/time.h> ++#include <limits.h> ++#include <argp.h> + + #include "utils.h" ++#include "version.h" ++ ++/* Argp's global variables. */ ++const char *argp_program_version = "F3 Read " F3_STR_VERSION; ++ ++/* Arguments. */ ++static char adoc[] = "<PATH>"; ++ ++static char doc[] = "F3 Read -- test real flash memory capacity\n" ++ "Copyright (C) 2010 Digirati Internet LTDA.\n" ++ "This is free software; see the source for copying conditions.\n"; ++ ++static struct argp_option options[] = { ++ {"start-at", 's', "NUM", 0, ++ "Disk type of the partition table", 0}, ++ {"end-at", 'e', "NUM", 0, ++ "Type of the file system of the partition", 0}, ++ {"progress", 'p', NULL, 0, ++ "Show progress of the operation (default)", 0}, ++ { 0 } ++}; ++ ++struct args { ++ long start_at; ++ long end_at; ++ int show_progress; ++ const char *dev_path; ++}; ++ ++static error_t parse_opt(int key, char *arg, struct argp_state *state) ++{ ++ struct args *args = state->input; ++ char *endptr; ++ ++ switch (key) { ++ case 's': ++ args->start_at = strtol(arg, &endptr, 10); ++ if (*endptr != '\0') ++ argp_error(state, "Option --start-at must be a number"); ++ break; ++ ++ case 'e': ++ args->end_at = strtol(arg, &endptr, 10); ++ if (*endptr != '\0') ++ argp_error(state, "Option --end-at must be a number"); ++ break; ++ ++ case 'p': ++ args->show_progress = 1; ++ break; ++ ++ case ARGP_KEY_INIT: ++ args->dev_path = NULL; ++ args->start_at = 0; ++ args->end_at = LONG_MAX; ++ args->show_progress = 0; ++ break; ++ ++ case ARGP_KEY_ARG: ++ if (args->dev_path) ++ argp_error(state, ++ "Wrong number of arguments; only one is allowed"); ++ args->dev_path = arg; ++ break; ++ ++ case ARGP_KEY_END: ++ if (!args->dev_path) ++ argp_error(state, ++ "The disk path was not specified"); ++ ++ if (args->start_at < 0) ++ argp_error(state, ++ "Option --start-at must be greater than 0"); ++ ++ if (args->end_at < 0) ++ argp_error(state, ++ "Option --end-at must be greater than 0"); ++ ++ if (args->start_at > args->end_at) ++ argp_error(state, ++ "Option --start-at must be less or equal to option --end-at"); ++ break; ++ ++ default: ++ return ARGP_ERR_UNKNOWN; ++ } ++ return 0; ++} ++ ++static struct argp argp = {options, parse_opt, adoc, doc, NULL, NULL, NULL}; + + static inline void update_dt(struct timeval *dt, const struct timeval *t1, + const struct timeval *t2) +@@ -228,20 +320,21 @@ static void iterate_files(const char *path, const long *files, + + int main(int argc, char **argv) + { +- long start_at, end_at; +- const char *path; + const long *files; +- int progress; ++ struct args args; + int rc; +- +- rc = parse_args("read", argc, argv, &start_at, &end_at, &path); ++ rc = argp_parse(&argp, argc, argv, 0, NULL, &args); + if (rc) + return rc; + +- files = ls_my_files(path, start_at, end_at); + /* If stdout isn't a terminal, supress progress. */ +- progress = isatty(STDOUT_FILENO); +- iterate_files(path, files, start_at, end_at, progress); ++ if (!args.show_progress) ++ args.show_progress = isatty(STDOUT_FILENO); ++ ++ files = ls_my_files(args.dev_path, args.start_at, args.end_at); ++ /* If stdout isn't a terminal, supress progress. */ ++ ++ iterate_files(args.dev_path, files, args.start_at, args.end_at, args.show_progress); + free((void *)files); + return 0; + } +diff --git a/f3write.c b/f3write.c +index b964059..bfef27e 100644 +--- a/f3write.c ++++ b/f3write.c +@@ -15,8 +15,99 @@ + #include <unistd.h> + #include <err.h> + #include <math.h> ++#include <argp.h> + + #include "utils.h" ++#include "version.h" ++ ++/* Argp's global variables. */ ++const char *argp_program_version = "F3 Write " F3_STR_VERSION; ++ ++/* Arguments. */ ++static char adoc[] = "<PATH>"; ++ ++static char doc[] = "F3 Write -- test real flash memory capacity\n" ++ "Copyright (C) 2010 Digirati Internet LTDA.\n" ++ "This is free software; see the source for copying conditions.\n"; ++ ++static struct argp_option options[] = { ++ {"start-at", 's', "NUM", 0, ++ "Disk type of the partition table", 0}, ++ {"end-at", 'e', "NUM", 0, ++ "Type of the file system of the partition", 0}, ++ {"progress", 'p', NULL, 0, ++ "Show progress of the operation (default)", 0}, ++ { 0 } ++}; ++ ++struct args { ++ long start_at; ++ long end_at; ++ int show_progress; ++ const char *dev_path; ++}; ++ ++static error_t parse_opt(int key, char *arg, struct argp_state *state) ++{ ++ struct args *args = state->input; ++ char *endptr; ++ ++ switch (key) { ++ case 's': ++ args->start_at = strtol(arg, &endptr, 10); ++ if (*endptr != '\0') ++ argp_error(state, "Option --start-at must be a number"); ++ break; ++ ++ case 'e': ++ args->end_at = strtol(arg, &endptr, 10); ++ if (*endptr != '\0') ++ argp_error(state, "Option --end-at must be a number"); ++ break; ++ ++ case 'p': ++ args->show_progress = 1; ++ break; ++ ++ case ARGP_KEY_INIT: ++ args->dev_path = NULL; ++ args->start_at = 0; ++ args->end_at = LONG_MAX; ++ args->show_progress = 0; ++ break; ++ ++ case ARGP_KEY_ARG: ++ if (args->dev_path) ++ argp_error(state, ++ "Wrong number of arguments; only one is allowed"); ++ args->dev_path = arg; ++ break; ++ ++ case ARGP_KEY_END: ++ if (!args->dev_path) ++ argp_error(state, ++ "The disk path was not specified"); ++ ++ if (args->start_at < 0) ++ argp_error(state, ++ "Option --start-at must be greater than 0"); ++ ++ if (args->end_at < 0) ++ argp_error(state, ++ "Option --end-at must be greater than 0"); ++ ++ if (args->start_at > args->end_at) ++ argp_error(state, ++ "Option --start-at must be less or equal to option --end-at"); ++ break; ++ ++ default: ++ return ARGP_ERR_UNKNOWN; ++ } ++ return 0; ++} ++ ++static struct argp argp = {options, parse_opt, adoc, doc, NULL, NULL, NULL}; + + static uint64_t fill_buffer(void *buf, size_t size, uint64_t offset) + { +@@ -464,17 +555,17 @@ static void unlink_old_files(const char *path, long start_at, long end_at) + + int main(int argc, char **argv) + { +- long start_at, end_at; +- const char *path; +- int progress; ++ struct args args; + int rc; +- +- rc = parse_args("write", argc, argv, &start_at, &end_at, &path); ++ rc = argp_parse(&argp, argc, argv, 0, NULL, &args); + if (rc) + return rc; + +- unlink_old_files(path, start_at, end_at); ++ unlink_old_files(args.dev_path, args.start_at, args.end_at); ++ + /* If stdout isn't a terminal, supress progress. */ +- progress = isatty(STDOUT_FILENO); +- return fill_fs(path, start_at, end_at, progress); ++ if (!args.show_progress) ++ args.show_progress = isatty(STDOUT_FILENO); ++ ++ return fill_fs(args.dev_path, args.start_at, args.end_at, args.show_progress); + } +diff --git a/utils.c b/utils.c +index a30ea3b..6aaceff 100644 +--- a/utils.c ++++ b/utils.c +@@ -13,13 +13,11 @@ + #include <string.h> + #include <ctype.h> + #include <assert.h> +-#include <limits.h> + #include <sys/types.h> + #include <dirent.h> + #include <errno.h> + #include <err.h> + +-#include "version.h" + #include "utils.h" + + const char *adjust_unit(double *ptr_bytes) +@@ -60,87 +58,6 @@ char *full_fn_from_number(const char **filename, const char *path, long num) + return str; + } + +-/* Parse @param and return the start-at parameter. +- * The string must be of the format "--start-at=NUM"; otherwise it returns -1. +- */ +-#define START_AT_TEXT "--start-at=" +-#define END_AT_TEXT "--end-at=" +- +-static inline int is_param(const char *text, const char *param) +-{ +- return !strncmp(param, text, strlen(text)); +-} +- +-static long parse_long_param(const char *param) +-{ +- char *endptr; +- long value; +- +- /* Skip text. */ +- while (*param != '=') { +- if (*param == '\0') +- return -1; +- param++; +- } +- param++; /* Skip '='. */ +- +- value = strtol(param, &endptr, 10); +- if (*endptr != '\0') +- return -1; +- +- return (value <= 0 || value == LONG_MAX) ? -1 : value - 1; +-} +- +-static int parse_param(const char *param, long *pstart_at, long *pend_at) +-{ +- if (is_param(START_AT_TEXT, param)) +- *pstart_at = parse_long_param(param); +- else if (is_param(END_AT_TEXT, param)) +- *pend_at = parse_long_param(param); +- else +- return 1; +- return 0; +-} +- +-int parse_args(const char *name, int argc, char **argv, +- long *pstart_at, long *pend_at, const char **ppath) +-{ +- *pstart_at = 0; +- *pend_at = LONG_MAX - 1; +- +- switch (argc) { +- case 2: +- *ppath = argv[1]; +- break; +- +- case 3: +- if (parse_param(argv[1], pstart_at, pend_at)) +- goto error; +- *ppath = argv[2]; +- break; +- +- case 4: +- if (parse_param(argv[1], pstart_at, pend_at)) +- goto error; +- if (parse_param(argv[2], pstart_at, pend_at)) +- goto error; +- *ppath = argv[3]; +- break; +- +- default: +- goto error; +- } +- +- if (*pstart_at >= 0 && *pend_at >= 0 && *pstart_at <= *pend_at) +- return 0; +- +-error: +- print_header(stderr, name); +- fprintf(stderr, "Usage: f3%s [%sNUM] [%sNUM] <PATH>\n", +- name, START_AT_TEXT, END_AT_TEXT); +- return 1; +-} +- + static long number_from_filename(const char *filename) + { + const char *p; +@@ -218,15 +135,6 @@ const long *ls_my_files(const char *path, long start_at, long end_at) + return ret; + } + +-void print_header(FILE *f, const char *name) +-{ +- fprintf(f, +- "F3 %s " F3_STR_VERSION "\n" +- "Copyright (C) 2010 Digirati Internet LTDA.\n" +- "This is free software; see the source for copying conditions.\n" +- "\n", name); +-} +- + #if __APPLE__ && __MACH__ + + /* This function is a _rough_ approximation of fdatasync(2). */ +diff --git a/utils.h b/utils.h +index 6b7c92f..4fdbce2 100644 +--- a/utils.h ++++ b/utils.h +@@ -22,13 +22,8 @@ static inline long delay_ms(const struct timeval *t1, const struct timeval *t2) + (t2->tv_usec - t1->tv_usec) / 1000; + } + +-int parse_args(const char *name, int argc, char **argv, +- long *pstart_at, long *pend_at, const char **ppath); +- + const long *ls_my_files(const char *path, long start_at, long end_at); + +-void print_header(FILE *f, const char *name); +- + static inline uint64_t random_number(uint64_t prv_number) + { + return prv_number * 4294967311ULL + 17; diff --git a/sys-block/f3/metadata.xml b/sys-block/f3/metadata.xml new file mode 100644 index 000000000000..2313fa6014ca --- /dev/null +++ b/sys-block/f3/metadata.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>whissi@gentoo.org</email> + <name>Thomas Deutschmann</name> + </maintainer> + <longdescription lang="en"> + F3 - an alternative to h2testw + + The "Fight Flash Fraud" or "Fight Fake Flash" tool represents + a GPLv3 implementation of the algorithm of h2testw and further + improvements to speed up the identification of fake drives + as well as making them usable. + + You can also use these utilities if you want to test the + integrity of your USB/flash medium. + </longdescription> + <upstream> + <bugs-to>https://github.com/AltraMayor/f3/issues</bugs-to> + <remote-id type="github">AltraMayor/f3</remote-id> + </upstream> + <use> + <flag name="extra">Build the additional f3probe, f3brew and f3fix utility (requires <pkg>sys-block/parted</pkg> and <pkg>virtual/udev</pkg>)</flag> + </use> +</pkgmetadata> diff --git a/sys-block/fio/metadata.xml b/sys-block/fio/metadata.xml index d5455f87a2c7..008fec0e1b2a 100644 --- a/sys-block/fio/metadata.xml +++ b/sys-block/fio/metadata.xml @@ -13,6 +13,6 @@ <flag name="gnuplot">Install tools for generating gnuplots</flag> <flag name="numa">Enable numa support</flag> <flag name="rbd">Enable Rados block device support via <pkg>sys-cluster/ceph</pkg></flag> - <flag name="rdma">Enable infiniband support via <pkg>sys-infiniband/librdmacm</pkg></flag> + <flag name="rdma">Enable infiniband support via <pkg>sys-fabric/librdmacm</pkg></flag> </use> </pkgmetadata> diff --git a/sys-block/gparted/Manifest b/sys-block/gparted/Manifest index 914e2052ed47..17cfcd811150 100644 --- a/sys-block/gparted/Manifest +++ b/sys-block/gparted/Manifest @@ -1,2 +1,2 @@ -DIST gparted-0.25.0.tar.gz 3240180 SHA256 2d996d5f4921d49eae850a1824acb8ab1299b1ea9bbb9c607248cd6c8cdc94ae SHA512 c15b27ad85f5f4937d87e9eb3b6dadb4b0502cc076eed726d23fbd08667bdb1263539a5552e85ecc2195a4e8d4556a898130ab0aa407bbe3bcbd18148c4765c9 WHIRLPOOL 5e540e73e72042f521ad23f7145c24c6394274d0765f577153b45e34191d609baa0600be12bb46511600be60072759a7af9a37fe2684101b8d1ca7ab214585ca DIST gparted-0.26.0.tar.gz 3299035 SHA256 bcf339328c183e1d825d41267cf435b193f1312fc3b9ce207e6087e653e27fb4 SHA512 1017e1f460dd24d08959f018e51d523ae461b29350a136eb3a6cca524a966ad235edee80063fe1b6a0e1a5445e2b30086efbc98d7b948f61e9ddf758c03fc049 WHIRLPOOL 38bdf9384ee87b12dfc7b4de81fefb1ee0847430ec5ab971dfbb28f0c32f778ad6c0f4655d9e3e3d9de1d9c665a9361933ebb707f42613d17e1167dfce5de931 +DIST gparted-0.26.1.tar.gz 3311059 SHA256 2f54b642d25aef5ccdd9f06671c16350c005834df5c3eb13a9b7f33246372dc1 SHA512 cba792751f8e984cbb4e1e0baaa97d0022ba47bd400312734ed5ae4a1bea07bc46ed522ca19a84b74ad503387fc9bd9d9cd85cdd647ba2ec028b39f8da502b67 WHIRLPOOL f1b840f74d5888009e19c7c03bb5b7d4e65056e92f2e215a952a23a2446f702aa4a712ac56c22ecba772f7d39f671e55b97792b8506234974de94260b2057ad4 diff --git a/sys-block/gparted/gparted-0.26.0-r1.ebuild b/sys-block/gparted/gparted-0.26.0-r1.ebuild new file mode 100644 index 000000000000..a799c0105a7a --- /dev/null +++ b/sys-block/gparted/gparted-0.26.0-r1.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit gnome2 + +DESCRIPTION="Gnome Partition Editor" +HOMEPAGE="http://gparted.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2+ FDL-1.2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86" +IUSE="btrfs dmraid f2fs fat hfs jfs kde mdadm ntfs policykit reiserfs reiser4 xfs" + +COMMON_DEPEND=" + >=dev-cpp/glibmm-2.14:2 + >=dev-cpp/gtkmm-2.22:2.4 + >=dev-libs/glib-2:2 + >=sys-block/parted-3.2:= +" +RDEPEND="${COMMON_DEPEND} + !policykit? ( + kde? ( kde-plasma/kde-cli-tools[kdesu] ) ) + policykit? ( sys-auth/polkit ) + + >=sys-apps/util-linux-2.20 + >=sys-fs/e2fsprogs-1.41 + btrfs? ( sys-fs/btrfs-progs ) + dmraid? ( + >=sys-fs/lvm2-2.02.45 + sys-fs/dmraid + sys-fs/multipath-tools ) + f2fs? ( sys-fs/f2fs-tools ) + fat? ( + sys-fs/dosfstools + sys-fs/mtools ) + hfs? ( + sys-fs/diskdev_cmds + virtual/udev + sys-fs/hfsutils ) + jfs? ( sys-fs/jfsutils ) + mdadm? ( sys-fs/mdadm ) + ntfs? ( >=sys-fs/ntfs3g-2011.4.12[ntfsprogs] ) + reiserfs? ( sys-fs/reiserfsprogs ) + reiser4? ( sys-fs/reiser4progs ) + xfs? ( sys-fs/xfsprogs sys-fs/xfsdump ) +" +DEPEND="${COMMON_DEPEND} + app-text/docbook-xml-dtd:4.1.2 + app-text/gnome-doc-utils + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig +" + +src_prepare() { + sed -i -e 's:Exec=@gksuprog@ :Exec=:' gparted.desktop.in.in || die + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure \ + --enable-doc \ + --enable-online-resize \ + GKSUPROG=$(type -P true) +} + +src_install() { + gnome2_src_install + + local _ddir="${D}"/usr/share/applications + + if use policykit; then + sed -i -e 's:/usr/sbin/gparted %f:gparted-pkexec:' "${_ddir}"/gparted.desktop + insinto /usr/share/polkit-1/actions/ + doins "${FILESDIR}"/org.gentoo.pkexec.gparted.policy + dobin "${FILESDIR}"/gparted-pkexec + else + if use kde; then + cp "${_ddir}"/gparted{,-kde}.desktop + sed -i -e 's:Exec=:Exec=kdesu5 :' "${_ddir}"/gparted-kde.desktop + echo 'OnlyShowIn=KDE;' >> "${_ddir}"/gparted-kde.desktop + fi + fi +} diff --git a/sys-block/gparted/gparted-0.25.0.ebuild b/sys-block/gparted/gparted-0.26.1.ebuild index 1cc3abbc5a8c..cf13116917c8 100644 --- a/sys-block/gparted/gparted-0.25.0.ebuild +++ b/sys-block/gparted/gparted-0.26.1.ebuild @@ -1,10 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" -GCONF_DEBUG="no" - +EAPI=6 inherit gnome2 DESCRIPTION="Gnome Partition Editor" @@ -16,7 +14,6 @@ SLOT="0" KEYWORDS="amd64 ~arm ~ppc x86" IUSE="btrfs dmraid f2fs fat hfs jfs kde mdadm ntfs policykit reiserfs reiser4 xfs" -# FIXME: add gpart support COMMON_DEPEND=" >=dev-cpp/glibmm-2.14:2 >=dev-cpp/gtkmm-2.22:2.4 @@ -25,7 +22,7 @@ COMMON_DEPEND=" " RDEPEND="${COMMON_DEPEND} !policykit? ( - kde? ( kde-apps/kdesu ) ) + kde? ( kde-plasma/kde-cli-tools[kdesu] ) ) policykit? ( sys-auth/polkit ) >=sys-apps/util-linux-2.20 @@ -83,7 +80,7 @@ src_install() { else if use kde; then cp "${_ddir}"/gparted{,-kde}.desktop - sed -i -e 's:Exec=:Exec=kdesu :' "${_ddir}"/gparted-kde.desktop + sed -i -e 's:Exec=:Exec=kdesu5 :' "${_ddir}"/gparted-kde.desktop echo 'OnlyShowIn=KDE;' >> "${_ddir}"/gparted-kde.desktop fi fi diff --git a/sys-block/hdrecover/Manifest b/sys-block/hdrecover/Manifest index 7369431ea188..4f8e1a90fe76 100644 --- a/sys-block/hdrecover/Manifest +++ b/sys-block/hdrecover/Manifest @@ -1 +1,2 @@ DIST hdrecover-0.4.tar.gz 85409 SHA256 609a0755dbda744e3dc89bffd1c673fd5c370448aa43e426d90ff35faa74a20d SHA512 280fb7b92172b3f92d358744d093e17462e2b118d2bcd7707cb9e1ceaf89010d565f60d490d8fc247887b6189fc76adbefd8d4aedce452e402d09fdde38a130e WHIRLPOOL 842384aad30072d9ea6ff5ff3991a19664a1d2c349c04310d2083e2b0837066f7d255b475da79521b98735a9fe7c5cd6a5ff750993e2a68872ec64bd458e940e +DIST hdrecover-0.5.tar.gz 86486 SHA256 5daa11caaa8c597778a4a7a76b022372ddb315a90c527405972a2380668ad3f8 SHA512 515bc59e1e936b7c22bbd99da9e25020968e0801fe490abaa09a5e5d72cf26427e829e8412e5bf44fafb2875ac81142db15d1f55d5462708f41882633c09df5e WHIRLPOOL 466173e3affd4a0486d7ac90beebb61131f6844d4c9c70fe9acf4a70265b385211470430b0b809e379123c71128a63458d0a546c6155a5c06fcf5bdb045ab338 diff --git a/sys-block/hdrecover/hdrecover-0.5.ebuild b/sys-block/hdrecover/hdrecover-0.5.ebuild new file mode 100644 index 000000000000..36536f6999f3 --- /dev/null +++ b/sys-block/hdrecover/hdrecover-0.5.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DESCRIPTION="Attempts to recover a hard disk that has bad blocks on it" +HOMEPAGE="http://hdrecover.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="" +RDEPEND="" + +src_configure() { + # we don't want the command to be visible to non-root users. + econf --bindir=/usr/sbin +} diff --git a/sys-block/hdrecover/metadata.xml b/sys-block/hdrecover/metadata.xml index 05a0ad20251a..9d9208b2e9d0 100644 --- a/sys-block/hdrecover/metadata.xml +++ b/sys-block/hdrecover/metadata.xml @@ -1,9 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>flameeyes@gentoo.org</email> - </maintainer> <upstream> <remote-id type="sourceforge">hdrecover</remote-id> </upstream> diff --git a/sys-block/hpacucli/Manifest b/sys-block/hpacucli/Manifest index 096dd390c184..74e016142f1f 100644 --- a/sys-block/hpacucli/Manifest +++ b/sys-block/hpacucli/Manifest @@ -1,2 +1,4 @@ DIST hpacucli-9.30-15.0.i386.rpm 6405071 SHA256 f1019a4a26c7d9adef1761fafb46b3add3034e77d48efe431bd499bbe5609312 SHA512 f628e5ca1f4e598700aaf8896e310e3ee59705d2ad9eae813179c0e873878b3ab6dd317fb34f738f901eb6972e8f4e9428b57a572dd1f8de73660b1c89213ce1 WHIRLPOOL cc41b16426a4298eafbf200a9c437501c8a2eb2456ca4e9d3f278bed64e203dade4e0de7c94a56e14ef20928a9c292440193c1e98071d9aaa661616c0ad6ea64 DIST hpacucli-9.30-15.0.x86_64.rpm 6367162 SHA256 d25b4fc593e11e00f2ca2b83417b23d1b1e12e6bff3afcda5333b274dea89901 SHA512 ad53b7452feffc7457220b9f1df8fd435637e7d1d61b42bdaffe75e62c8245a127b7a80435a40ac5675f0a64e14cc9a99fa556dbecb0e37ae70dda51927afd6e WHIRLPOOL 0ba12328989bd5dce8eb5d83377768605f931ca78dd0e534bdbf65c93a17536499a7a9ea77816f4640ec86be8bdb620ae578fa14f7f7542c18ef95ac6efa3d27 +DIST hpacucli-9.40-12.0.i386.rpm 6824495 SHA256 bc0078f6e2f8e64eb5e3ce26527e08134669ca507a84c36bbe4266ac3685fa9e SHA512 93ae6c170e14e187ce33522a7f7d4e0970f8443758aa76f4eb72c6b818eeeff7720e9869473b62e4b088ced0bb9a198afecf7ff62da2fc73e67208f5cc680158 WHIRLPOOL 7c5942fb85a778c79ea78343602ccd35d2fb5a271ff17164ab157e59ad6fb8aacaa9b6d4fa122a7537bf43d54ea314491f0cc91b99681ca51581b8942a18b96c +DIST hpacucli-9.40-12.0.x86_64.rpm 6800521 SHA256 94c51105fed0a34e2a8896720ce8234af23fcffb11f0a6b7e56eb30c6e803cb8 SHA512 a7de22febc0261bdb60a5fee250d42455dc0ac152541f34eb91df81b4e57472ae96ee2972e3a4c44ff409e3d1c2b364054818c7ea610c3b2a20c913a51df2ed4 WHIRLPOOL 7d9c55d10a3953b6152e2b1937817ed8b129948229bfd4bf87f7fbd9dddece0d786fe390ca6ccc9cfd4356c91ee62484484e2dc153050365a324e3c54853c939 diff --git a/sys-block/hpacucli/files/hpacucli-wrapper-r1 b/sys-block/hpacucli/files/hpacucli-wrapper-r1 new file mode 100644 index 000000000000..fd2cec5cdf83 --- /dev/null +++ b/sys-block/hpacucli/files/hpacucli-wrapper-r1 @@ -0,0 +1,22 @@ +#!/bin/sh + +cmd="$(basename "$0")" + +HPACUCLI_BASEDIR="/opt/hp/hpacucli" +HPACUCLI_LOCKDIR="/run/lock/$cmd" +HPACUCLI_LOCK="${HPACUCLI_LOCKDIR}/CPQACU_MUTEX" +HPACUCLI_BIN="${HPACUCLI_BASEDIR}/$cmd.bin" + +if pgrep -x "$cmd.bin"; then + echo "Another instance of $cmd is running! Stop it first." + exit 1 +fi + +if ! [ -f "${HPACUCLI_LOCK}" ]; then + mkdir -p -m 700 "${HPACUCLI_LOCKDIR}" + touch "${HPACUCLI_LOCK}" +fi + +export LD_LIBRARY_PATH="${HPACUCLI_BASEDIR}" +export ACUXE_LOCK_FILES_DIR="${HPACUCLI_LOCKDIR}/" +"${HPACUCLI_BIN}" "${@}" diff --git a/sys-block/hpacucli/hpacucli-9.40.12.0.ebuild b/sys-block/hpacucli/hpacucli-9.40.12.0.ebuild new file mode 100644 index 000000000000..6e0d28ca8cda --- /dev/null +++ b/sys-block/hpacucli/hpacucli-9.40.12.0.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit rpm versionator pax-utils + +MY_PV=$(replace_version_separator 2 '-') + +SRC_URI_BASE="ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux" +AMD64_PID="1257348637" +AMD64_VID="80070" +X86_PID="414707558" +X86_VID="80071" + +DESCRIPTION="HP Array Configuration Utility Command Line Interface (HPACUCLI, formerly CPQACUXE)" +HOMEPAGE="http://h18000.www1.hp.com/products/servers/linux/documentation.html" +SRC_URI=" + amd64? ( ${SRC_URI_BASE}/p${AMD64_PID}/v${AMD64_VID}/${PN}-${MY_PV}.x86_64.rpm ) + x86? ( ${SRC_URI_BASE}/p${X86_PID}/v${X86_VID}/${PN}-${MY_PV}.i386.rpm )" + +LICENSE="hp-proliant-essentials" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="" + +DEPEND="" +RDEPEND="sys-apps/coreutils + sys-process/procps + >=sys-apps/util-linux-2.20.1" + +S="${WORKDIR}" + +HPACUCLI_BASEDIR="/opt/hp/hpacucli" +QA_PREBUILT="${HPACUCLI_BASEDIR:1}/*" +QA_EXECSTACK="${HPACUCLI_BASEDIR:1}/libcpqimgr*.so" + +src_install() { + local MY_S="${S}/opt/compaq/${PN}/bld" + + newsbin "${FILESDIR}"/"${PN}-wrapper-r1" hpacucli + dosym /usr/sbin/hpacucli /usr/sbin/hpacuscripting + + exeinto "${HPACUCLI_BASEDIR}" + for bin in "${MY_S}"/.hp*; do + local basename=$(basename "${bin}") + newexe "${bin}" ${basename#.}.bin + done + + insinto "${HPACUCLI_BASEDIR}" + doins "${MY_S}"/*.so + + dodoc "${MY_S}"/*.txt + doman "${S}"/usr/man/man*/* + + cat <<-EOF >"${T}"/45${PN} + LDPATH=${HPACUCLI_BASEDIR} + EOF + doenvd "${T}"/45${PN} + + pax-mark m "${D}opt/hp/hpacucli/"* +} diff --git a/sys-block/hpacucli/metadata.xml b/sys-block/hpacucli/metadata.xml index 64869faa0b26..a32d600f949d 100644 --- a/sys-block/hpacucli/metadata.xml +++ b/sys-block/hpacucli/metadata.xml @@ -2,6 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>flameeyes@gentoo.org</email> + <email>whissi@gentoo.org</email> + <name>Thomas Deutschmann</name> </maintainer> </pkgmetadata> diff --git a/sys-block/hpssacli/Manifest b/sys-block/hpssacli/Manifest new file mode 100644 index 000000000000..36410c00aa73 --- /dev/null +++ b/sys-block/hpssacli/Manifest @@ -0,0 +1,2 @@ +DIST hpssacli-2.40-13.0.i386.rpm 11413754 SHA256 54609da022003be25a8711230d36bbb723011857b7bb5d655f1420528cdaecd8 SHA512 f284c0979141fa2ef8728b2a6c7d7aa8b0e5e61ebb3878439321dd3742223f240f5be9782068da49a58c07ce91615072d9575f22feefb9ff6bb6fac00ae31d75 WHIRLPOOL 5a8cc350b895404c5589bcbe2952a371f4234183f14872dcbbc9989ca3711d5cf39704eedf9a00d69d8d4fcb830d00d527278b34d1d57d2bdd893a6e8bfae0df +DIST hpssacli-2.40-13.0.x86_64.rpm 11772990 SHA256 1e17602dec56f30dfe9329eb5ea060ac0dbb42ea003a27e8eecaa2148b331599 SHA512 4a650c2700f77bdc79693905e56598cbe8f198d4f54c7c97e05a7b8af830f11c5e5eea2d16538a3c6068eadb75159850b391d7f772f59447bbbd870f64eb7efa WHIRLPOOL b0821a4875724cab30c0e95fccdca71e0700e3008e48fe9efb6d0b5d1f8f3de32259b586aaa5f0bdbd51a350b8467d992ee6aefceac9ee81beb0c34f2a6b0ec7 diff --git a/sys-block/hpssacli/files/hpssacli-wrapper b/sys-block/hpssacli/files/hpssacli-wrapper new file mode 100644 index 000000000000..2e425f719e20 --- /dev/null +++ b/sys-block/hpssacli/files/hpssacli-wrapper @@ -0,0 +1,22 @@ +#!/bin/sh + +# +# Uncomment the line below to turn off discovery of Fibre +# export INFOMGR_BYPASS_FIBRE=1 +# +# Uncomment the lines below to turn off discovery of Non-Smart Array controllers +# export INFOMGR_BYPASS_NONSA=1 +# + +cmd="$(basename "$0")" + +HPSSACLI_BASEDIR="/opt/hp/hpssacli" +HPSSACLI_BIN="${HPSSACLI_BASEDIR}/${cmd}.bin" + +if pgrep --exact "${cmd}.bin" 1>/dev/null; then + echo "Another instance of ${cmd} is running! Stop it first." + exit 1 +fi + +export LD_LIBRARY_PATH="${HPSSACLI_BASEDIR}" +"${HPSSACLI_BIN}" "${@}" diff --git a/sys-block/hpssacli/hpssacli-2.40.13.0-r1.ebuild b/sys-block/hpssacli/hpssacli-2.40.13.0-r1.ebuild new file mode 100644 index 000000000000..8f0a2c6e1924 --- /dev/null +++ b/sys-block/hpssacli/hpssacli-2.40.13.0-r1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit pax-utils rpm versionator + +MY_PV=$(replace_version_separator 2 '-') + +DESCRIPTION="HPE Smart Storage Administrator (HPE SSA) CLI (HPSSACLI, formerly HPACUCLI)" +HOMEPAGE="http://h20564.www2.hpe.com/hpsc/swd/public/detail?swItemId=MTX_04bffb688a73438598fef81ddd" +SRC_URI=" + amd64? ( https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/6/x86_64/current/${PN}-${MY_PV}.x86_64.rpm ) + x86? ( https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/6/i686/current/${PN}-${MY_PV}.i386.rpm )" + +LICENSE="hpe" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="" + +DEPEND="" +RDEPEND="elibc_glibc? ( >sys-libs/glibc-2.14 ) + >=sys-libs/libunwind-0.99 + >=sys-process/procps-3.3.6" + +DOCS=( license.txt readme.txt ) + +MY_HPSSACLI_BASEDIR="/opt/hp/hpssacli" + +QA_PREBUILT="${MY_HPSSACLI_BASEDIR:1}/hpssa*.bin" +QA_EXECSTACK="${MY_HPSSACLI_BASEDIR:1}/hpssa*.bin" + +src_unpack() { + rpm_src_unpack + + mkdir "${S}" || die "Failed to create '${S}'" +} + +src_prepare() { + default + + # Create a clean $S + mv "${WORKDIR}"/opt/hp/hpssacli/bld/hpss* "${S}" || die "Failed to to copy 'hpss*' related files" + mv "${S}"/hpssacli.license "${S}"/license.txt || die "Renaming hpssacli.license failed!" + mv "${S}"/hpssacli*.txt "${S}"/readme.txt || die "Renaming hpssacli*.txt failed!" + rm -rf "${WORKDIR}"/opt || die "Failed to cleanup '${WORKDIR}/opt'" + rm -rf "${WORKDIR}"/usr || die "Failed to cleanup '${WORKDIR}/usr'" +} + +src_install() { + newsbin "${FILESDIR}"/"${PN}-wrapper" ${PN} + dosym ${PN} /usr/sbin/hpssascripting + + exeinto "${MY_HPSSACLI_BASEDIR}" + for bin in "${S}"/hpssa{cli,scripting}; do + local basename=$(basename "${bin}") + newexe "${bin}" ${basename}.bin + done + + dodoc "${DOCS[@]}" + + pax-mark m "${D%/}${HPSSACLI_BASEDIR}"/*.bin +} diff --git a/sys-block/hpssacli/metadata.xml b/sys-block/hpssacli/metadata.xml new file mode 100644 index 000000000000..a32d600f949d --- /dev/null +++ b/sys-block/hpssacli/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>whissi@gentoo.org</email> + <name>Thomas Deutschmann</name> + </maintainer> +</pkgmetadata> diff --git a/sys-block/kvpm/Manifest b/sys-block/kvpm/Manifest index e4fe039ca10f..6ff244c00767 100644 --- a/sys-block/kvpm/Manifest +++ b/sys-block/kvpm/Manifest @@ -1 +1,2 @@ +DIST kvpm-0.9.10.tar.gz 1313153 SHA256 16c44cf8f7bfbe3ba1c203b7245bc43bd66da847eb138d4c2a82a706850cc41c SHA512 825bc7f24e4b6f6aae9f218075cd7a24a8fed9ae34d0cc08ac136db501eba1abb5925aaaa937ae9d59869afb41b9f36737fd8c47bd6b560be94fbe90feba37d4 WHIRLPOOL 9d7d5f174d90c95ffeb210a1052db2400d82d64b46dd78fa6187619d24736edc59a1d72bd22dc4a9103c43a629ae849dcf6247a3ed5c46e182a82e7d13d91804 DIST kvpm-0.9.9.tar.gz 1309747 SHA256 97f4a2f0632f9df7a9e3731c93088ba0725d942838603cdb4a4cba53c1c02604 SHA512 54ba626dd93fc6908fb08abd5c6c8c0614caf67c5abf3234e4a2ad39d0d37d2f2789a7bf222b17c806920633e1f8880f775f13138c6646166755ecd109fb63ca WHIRLPOOL da932b813055278d87377f98895ce3c4eec62e78b53a59642602d8f0b53bdb4bbb681297eecea7d187b2044342ad0e18aff8d9d0113972f7f1c8d3f1ef19899a diff --git a/sys-block/kvpm/kvpm-0.9.10.ebuild b/sys-block/kvpm/kvpm-0.9.10.ebuild new file mode 100644 index 000000000000..899266a29407 --- /dev/null +++ b/sys-block/kvpm/kvpm-0.9.10.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +KDE_DOC_DIR="docbook" +KDE_HANDBOOK="forceoptional" +inherit kde5 + +DESCRIPTION="KDE frontend for Linux LVM2 and GNU parted" +HOMEPAGE="http://kvpm.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="5" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kdelibs4support) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + sys-apps/util-linux + >=sys-block/parted-2.3 + >=sys-fs/lvm2-2.02.120 + !sys-block/kvpm:4 +" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}/${PN}-0.9.9-glibc-sysmacros.patch" ) diff --git a/sys-block/megactl/megactl-0.4.1-r1.ebuild b/sys-block/megactl/megactl-0.4.1-r1.ebuild index 75feffe51724..e09e4ea9d51a 100644 --- a/sys-block/megactl/megactl-0.4.1-r1.ebuild +++ b/sys-block/megactl/megactl-0.4.1-r1.ebuild @@ -8,7 +8,7 @@ inherit eutils IUSE="" DESCRIPTION="LSI MegaRAID control utility" -HOMEPAGE="http://sourceforge.net/projects/megactl/" +HOMEPAGE="https://sourceforge.net/projects/megactl/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/sys-block/megactl/megactl-0.4.1-r2.ebuild b/sys-block/megactl/megactl-0.4.1-r2.ebuild index 6a710b1fe2d8..d5ebb0f0e24c 100644 --- a/sys-block/megactl/megactl-0.4.1-r2.ebuild +++ b/sys-block/megactl/megactl-0.4.1-r2.ebuild @@ -8,11 +8,11 @@ inherit eutils IUSE="" DESCRIPTION="LSI MegaRAID control utility" -HOMEPAGE="http://sourceforge.net/projects/megactl/" +HOMEPAGE="https://sourceforge.net/projects/megactl/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" src_prepare() { epatch "${FILESDIR}"/${P}.patch diff --git a/sys-block/ms-sys/metadata.xml b/sys-block/ms-sys/metadata.xml index 5979313f77d7..749556f5e689 100644 --- a/sys-block/ms-sys/metadata.xml +++ b/sys-block/ms-sys/metadata.xml @@ -4,6 +4,6 @@ <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">ms-sys</remote-id> - <bugs-to>http://sourceforge.net/tracker/?group_id=59200</bugs-to> + <bugs-to>https://sourceforge.net/tracker/?group_id=59200</bugs-to> </upstream> </pkgmetadata> diff --git a/sys-block/nbd/Manifest b/sys-block/nbd/Manifest index 3085534c2f6d..2c5fb6bd10b5 100644 --- a/sys-block/nbd/Manifest +++ b/sys-block/nbd/Manifest @@ -1,3 +1,3 @@ DIST nbd-3.11.tar.xz 451992 SHA256 14420f74cb16dc609a9302ed1efd653064bed7a8357e9d73daabc33608e3f2a0 SHA512 8d0abf673c7a2a7fbc5a57e0ee1093c86ca205eb664ea08143ff4ce3c8fd94b81a0e89491145159d863d181f70e9ba109487b967097c91fc2399316226bcec0a WHIRLPOOL 23f29b0e82e4672f5edfa223b7b26552ceb7505b6ff43efa151e3357811a2d4f1b599d6b9553a89e07b90b7322a3ac88f256a66d5d7e850758ea5cee4125d849 -DIST nbd-3.12.1.tar.xz 470676 SHA256 b105b9bedd82d86aee2e81e624bea33461db9918d58ddd79f5f2fd534c8b73de SHA512 8699fc62117a1321d389878dfcfb8552b960bb65aa3751feaa13d4197d9e7f717434f59d1560f1b7e23a647232500e882b31fe196392ba5f2644d23baefd0af8 WHIRLPOOL 6c9d495c77d9a2da4e3ac1a5842c8deaf9139f6ecb3eb13746051582fd6053118f561a5527227ea4a507dae4370cfba92860eaa96ab254b93f3d3d9b61aefa70 DIST nbd-3.13.tar.xz 459756 SHA256 8597cd97a41930dfcbcc6ce7cf910f6b609771718a4f1680713c2f2ba5cc200d SHA512 da1f6c1aab10baf7ef10062481f3a26dfa142f5cfc21fb7abc90f6eb9906df619331dbb36b693c52d4a7a5fe0923f6179b59eea74033cb1278dca99b192cdbff WHIRLPOOL e2d875c31215bc3e1594143b198d8a87abcfe1faf508057db9f766561edd3ca7d35f243330af71938228b61c2fe31250a59ece9f87291d967fdbd0575eec99b9 +DIST nbd-3.14.tar.xz 480260 SHA256 4d3d230ecc0a1302dc08d89f2a12d7596a8745f2b10da9bb035bbeb9ede78631 SHA512 f65c8bfb9f35931da6ec41bbcf94a34268fb7166b5df224ce525319bb053aa3ed174d242369cffc57a2e0d685c6a540cd2498f8044cd25c0c5bdeb92e9f099d0 WHIRLPOOL 7aef5b4ef84a2667ef7bdf1415f0a724acbf9aba8a67996cdb7721754b5ec0209814e46736dc362f49ffd7324163a4a979d94fd339a2055e419625100678eea7 diff --git a/sys-block/nbd/nbd-3.12.1.ebuild b/sys-block/nbd/nbd-3.14.ebuild index 0a5959c6a37f..730ec68aa1ff 100644 --- a/sys-block/nbd/nbd-3.12.1.ebuild +++ b/sys-block/nbd/nbd-3.14.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="4" +EAPI=5 -inherit eutils toolchain-funcs +inherit autotools eutils toolchain-funcs DESCRIPTION="Userland client/server for kernel network block device" HOMEPAGE="http://nbd.sourceforge.net/" @@ -21,7 +21,13 @@ DEPEND="${RDEPEND} virtual/pkgconfig" src_prepare() { - epatch "${FILESDIR}"/nbd-3.12.1-readit-and-weep.patch + # Fails to build systemd target. + # Once this is fixed we don't need autotools.eclass anymore. + sed '/^SUBDIRS/s@ systemd@@' -i Makefile.am || die + # eautoreconf fails without this + sed "s@m4_esyscmd_s(support/genver.sh)@[${PV}]@" -i configure.ac \ + || die + eautoreconf } src_configure() { diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild index 8166a2745464..3cc19c524849 100644 --- a/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild +++ b/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild @@ -17,7 +17,7 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="debug slp +tcp infiniband rdma" -DEPEND="slp? ( net-libs/openslp ) infiniband? ( sys-infiniband/ofed )" +DEPEND="slp? ( net-libs/openslp ) infiniband? ( sys-fabric/ofed )" RDEPEND="${DEPEND} sys-fs/lsscsi sys-apps/util-linux" diff --git a/sys-block/parted/files/parted-3.2-sysmacros.patch b/sys-block/parted/files/parted-3.2-sysmacros.patch new file mode 100644 index 000000000000..a29e7619b148 --- /dev/null +++ b/sys-block/parted/files/parted-3.2-sysmacros.patch @@ -0,0 +1,28 @@ +https://bugs.gentoo.org/580022 + +From dec8995fe80508374beba6356f6ecbba8ef6b18b Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Tue, 21 Jun 2016 15:01:08 -0400 +Subject: [PATCH] include sysmacros.h for major/minor/makedev + +Linux C libs are moving away from including this header implicitly via +sys/types.h, so include it explicitly. +--- + libparted/arch/linux.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c +index 326b95619d31..e5c168be3c68 100644 +--- a/libparted/arch/linux.c ++++ b/libparted/arch/linux.c +@@ -37,6 +37,7 @@ + #include <dirent.h> + #include <sys/ioctl.h> + #include <sys/stat.h> ++#include <sys/sysmacros.h> + #include <sys/types.h> + #include <sys/utsname.h> /* for uname() */ + #include <scsi/scsi.h> +-- +2.8.2 + diff --git a/sys-block/parted/parted-3.2-r1.ebuild b/sys-block/parted/parted-3.2-r1.ebuild index 7b07c237f71c..0180e45b8e55 100644 --- a/sys-block/parted/parted-3.2-r1.ebuild +++ b/sys-block/parted/parted-3.2-r1.ebuild @@ -34,7 +34,8 @@ src_prepare() { epatch \ "${FILESDIR}"/${PN}-3.2-devmapper.patch \ "${FILESDIR}"/${PN}-3.2-po4a-mandir.patch \ - "${FILESDIR}"/${PN}-3.2-fix-resizing-FAT16.patch + "${FILESDIR}"/${PN}-3.2-fix-resizing-FAT16.patch \ + "${FILESDIR}"/${PN}-3.2-sysmacros.patch eautoreconf } diff --git a/sys-block/partitionmanager/Manifest b/sys-block/partitionmanager/Manifest index 7f19e3c6b800..9360cd9251cc 100644 --- a/sys-block/partitionmanager/Manifest +++ b/sys-block/partitionmanager/Manifest @@ -1,2 +1 @@ -DIST partitionmanager-2.1.0.tar.xz 1638600 SHA256 65459a78a47b02c35f62e344e964494f7ffa84581036b193e7653e0835d3aec0 SHA512 5cbc267be8c1c2e674cc2da57c9fabb362989c0e95d138243fa477859046aa5807cee2c1c45763c713e025fcfb724f3f8a0b363bfc50d54a1899d33af38c750d WHIRLPOOL 57faf232491caf8862cebfe027d9a3ff98bea62ace6085cb0c7f8251600e374d51161b83ee6a8db48212e7c0551b653ba84c6a1cde3af39af36772d38e8fae57 -DIST partitionmanager-2.2.0.tar.xz 1651684 SHA256 0d108fafbe826997a45bfae8abdb77ad43e5db8205736d6a401a83230e080ae9 SHA512 fe8904d54d41ef205ed662060a6b17bcf821aa658a0564d1445a929a567a0ba85f94fdf9c054fcf8cbf729999e8d8f0dab1a495a1f788b45314bb6b61bb452e5 WHIRLPOOL 829a8b569de18f2d34ed181fdb7545e5c2cb261ed2ddd4a094b71ed44eb761ad2a6fbd60a1eabbee0838ea46a3cbe70c044bd127cc42e7f39af09a246942be33 +DIST partitionmanager-2.2.1.tar.xz 1497772 SHA256 bcbd531e3a3616a436595141729634aa390a9f8d56f7bd4c3ab0e74a4927ac67 SHA512 3dcc9d5f3b315f4c2377a2a9b1e56b85abe5dc534d83613a167969c4a5cde9ece646f3f2d0a522bb425505accbd944a8c8eda9c7926cea5b718c3c59f8246816 WHIRLPOOL 619930a25c67639dbd1f6dd62b412a5769ec29d30e8afbc7939853aa720ae3999e182ab5cc050c7927daa26df041a57ab0b92a822e6179dd54a3e337a4239f56 diff --git a/sys-block/partitionmanager/partitionmanager-2.1.0-r1.ebuild b/sys-block/partitionmanager/partitionmanager-2.1.0-r1.ebuild deleted file mode 100644 index 3e94bb00a9cb..000000000000 --- a/sys-block/partitionmanager/partitionmanager-2.1.0-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -inherit kde5 - -DESCRIPTION="KDE utility for management of partitions and file systems" -HOMEPAGE="https://www.kde.org/applications/system/kdepartitionmanager" -SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" - -LICENSE="GPL-3" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=" - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - sys-apps/util-linux - <sys-libs/kpmcore-2.2.0:5= -" -RDEPEND="${DEPEND} - $(add_plasma_dep kde-cli-tools kdesu 5.5.2) - !sys-block/partitionmanager:0 -" diff --git a/sys-block/partitionmanager/partitionmanager-2.1.0.ebuild b/sys-block/partitionmanager/partitionmanager-2.1.0.ebuild deleted file mode 100644 index 4f6849b63a8a..000000000000 --- a/sys-block/partitionmanager/partitionmanager-2.1.0.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -inherit kde5 - -DESCRIPTION="KDE utility for management of partitions and file systems" -HOMEPAGE="https://www.kde.org/applications/system/kdepartitionmanager" -SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" - -LICENSE="GPL-3" -KEYWORDS="amd64 ~x86" -IUSE="" - -DEPEND=" - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - sys-apps/util-linux - sys-libs/kpmcore:5 -" -RDEPEND="${DEPEND} - $(add_plasma_dep kde-cli-tools kdesu 5.5.2) - !sys-block/partitionmanager:0 -" diff --git a/sys-block/partitionmanager/partitionmanager-2.2.0.ebuild b/sys-block/partitionmanager/partitionmanager-2.2.1.ebuild index 0b71b1474245..d9242ca7402e 100644 --- a/sys-block/partitionmanager/partitionmanager-2.2.0.ebuild +++ b/sys-block/partitionmanager/partitionmanager-2.2.1.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://www.kde.org/applications/system/kdepartitionmanager" SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" LICENSE="GPL-3" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="amd64 ~arm ~x86" IUSE="" DEPEND=" diff --git a/sys-block/sedutil/sedutil-1.12.ebuild b/sys-block/sedutil/sedutil-1.12.ebuild index 7e65008ea2d0..f2aa19f911da 100644 --- a/sys-block/sedutil/sedutil-1.12.ebuild +++ b/sys-block/sedutil/sedutil-1.12.ebuild @@ -17,8 +17,10 @@ IUSE="" src_prepare() { # https://github.com/Drive-Trust-Alliance/sedutil/pull/49 find -name '*.mk' -exec sed -E -i 's: -(Werror|g|O[0-9]?) : :g' {} + || die - mkdir linux/linux || die - cp "${FILESDIR}"/nvme.h linux/linux/ || die + if has_version '>=sys-kernel/linux-headers-4.4' ; then + mkdir linux/linux || die + cp "${FILESDIR}"/nvme.h linux/linux/ || die + fi } src_configure() { diff --git a/sys-block/seekwatcher/metadata.xml b/sys-block/seekwatcher/metadata.xml index 79d462e85571..888bfebd33fc 100644 --- a/sys-block/seekwatcher/metadata.xml +++ b/sys-block/seekwatcher/metadata.xml @@ -4,4 +4,8 @@ <maintainer type="person"> <email>robbat2@gentoo.org</email> </maintainer> +<maintainer type="person"> + <email>slyfox@gentoo.org</email> + <name>Sergei Trofimovich</name> +</maintainer> </pkgmetadata> diff --git a/sys-block/seekwatcher/seekwatcher-0.12.ebuild b/sys-block/seekwatcher/seekwatcher-0.12.ebuild index 8595da7b628e..9a859c6ee1a2 100644 --- a/sys-block/seekwatcher/seekwatcher-0.12.ebuild +++ b/sys-block/seekwatcher/seekwatcher-0.12.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -DESCRIPTION="Seekwatcher generates graphs from blktrace runs to help visualize IO patterns and performance" +DESCRIPTION="generates graphs from blktrace to help visualize IO patterns and performance" HOMEPAGE="http://oss.oracle.com/~mason/seekwatcher/" SRC_URI="http://oss.oracle.com/~mason/seekwatcher/${P}.tar.bz2" diff --git a/sys-block/seekwatcher/seekwatcher-0.12_p20091015-r1.ebuild b/sys-block/seekwatcher/seekwatcher-0.12_p20091015-r1.ebuild new file mode 100644 index 000000000000..c4697dbcfc04 --- /dev/null +++ b/sys-block/seekwatcher/seekwatcher-0.12_p20091015-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) + +inherit eutils distutils-r1 + +DESCRIPTION="generates graphs from blktrace to help visualize IO patterns and performance" +HOMEPAGE="http://oss.oracle.com/~mason/seekwatcher/" +#SRC_URI="http://oss.oracle.com/~mason/seekwatcher/${P}.tar.bz2" +SRC_URI="https://dev.gentoo.org/~slyfox/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~ppc ~x86" +IUSE="" + +DEPEND="dev-python/pyrex" +RDEPEND=" + dev-python/matplotlib[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + >=sys-block/btrace-0.0.20070730162628 +" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +S=${WORKDIR}/${PN}-b392aeaf693b # hg snapshot + +PATCHES=("${FILESDIR}"/${P}-dash-fix.patch) diff --git a/sys-block/seekwatcher/seekwatcher-0.12_p20091015.ebuild b/sys-block/seekwatcher/seekwatcher-0.12_p20091015.ebuild index 9823b80da2bf..4dc1586d3ebb 100644 --- a/sys-block/seekwatcher/seekwatcher-0.12_p20091015.ebuild +++ b/sys-block/seekwatcher/seekwatcher-0.12_p20091015.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -7,7 +7,7 @@ PYTHON_DEPEND="2" inherit eutils distutils -DESCRIPTION="Seekwatcher generates graphs from blktrace runs to help visualize IO patterns and performance" +DESCRIPTION="generates graphs from blktrace to help visualize IO patterns and performance" HOMEPAGE="http://oss.oracle.com/~mason/seekwatcher/" #SRC_URI="http://oss.oracle.com/~mason/seekwatcher/${P}.tar.bz2" SRC_URI="https://dev.gentoo.org/~slyfox/${P}.tar.gz" diff --git a/sys-block/seekwatcher/seekwatcher-0.6.ebuild b/sys-block/seekwatcher/seekwatcher-0.6.ebuild index e00a2b7389ea..5f196d167c5e 100644 --- a/sys-block/seekwatcher/seekwatcher-0.6.ebuild +++ b/sys-block/seekwatcher/seekwatcher-0.6.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -DESCRIPTION="Seekwatcher generates graphs from blktrace runs to help visualize IO patterns and performance" +DESCRIPTION="generates graphs from blktrace to help visualize IO patterns and performance" HOMEPAGE="http://oss.oracle.com/~mason/seekwatcher/" SRC_URI="http://oss.oracle.com/~mason/seekwatcher/${P}.tar.bz2" diff --git a/sys-block/storcli/Manifest b/sys-block/storcli/Manifest new file mode 100644 index 000000000000..33356e5c57b9 --- /dev/null +++ b/sys-block/storcli/Manifest @@ -0,0 +1 @@ +DIST storcli-1.19.04.zip 41606377 SHA256 026456cf30e1f14f33a42eb5804dcf9fb6d3b79b9fd46828db6cdd4abe736054 SHA512 3086360a4c40755cdcaa8faa7192adccae5555cf3aaa741be583fa3559a7dedc14652489d8248a69465040871710917d09461644df3d1d2d31fe6d6e0957196b WHIRLPOOL 81fd83d9b3e938b5cf5135066db97aa4db3c1c7b62ca861a1736dd7719874a2b68d5e1c65ad79d97e29e8d4cfbfa2ee0a7fdc347fc0931009e8f7cc946739cae diff --git a/sys-block/storcli/metadata.xml b/sys-block/storcli/metadata.xml new file mode 100644 index 000000000000..a32d600f949d --- /dev/null +++ b/sys-block/storcli/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>whissi@gentoo.org</email> + <name>Thomas Deutschmann</name> + </maintainer> +</pkgmetadata> diff --git a/sys-block/storcli/storcli-1.19.04.ebuild b/sys-block/storcli/storcli-1.19.04.ebuild new file mode 100644 index 000000000000..744ee10c5f18 --- /dev/null +++ b/sys-block/storcli/storcli-1.19.04.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit pax-utils + +DESCRIPTION="MegaRAID StorCLI (successor of the MegaCLI)" +HOMEPAGE="http://www.avagotech.com/support/download-search?dnd-keyword=storcli" +# For new versions check http://www.avagotech.com/cs/Satellite?pagename=AVG2/Utilities/searchResultsJson&page=1&q=storcli&endDate=null&searchType=type-AVG_Document_C~Downloads&isEntitled=null&dynamic-search-relevance=Newest +SRC_URI="http://docs.avagotech.com/docs-and-downloads/docs-and-downloads/raid-controllers/raid-controllers-common-files/${PV}_StorCLI.zip -> ${P}.zip" + +LICENSE="Avago LSI BSD" +SLOT="0/6.11" +KEYWORDS="-* ~amd64 ~x86" +IUSE="" + +RDEPEND="" +DEPEND="" + +DOCS=( readme.txt license.txt ) + +MY_STORCLI_BASEDIR="/opt/lsi/storcli" + +QA_PRESTRIPPED="${MY_STORCLI_BASEDIR:1}/storcli" + +src_unpack() { + unpack ${A} + + mv storcli_all_os/Ubuntu/storcli_*.deb "${WORKDIR}" || die "Failed to move storclli_*.deb" + + # Unpack Ubuntu package which will be our $S content + unpack "${WORKDIR}"/storcli_*.deb + rm -f storcli_*.deb || die "Failed to cleanup storcli_*.deb package" + unpack "${WORKDIR}"/data.tar.gz + + mkdir "${S}" || die "Failed to create '${S}'" +} + +src_prepare() { + default + + # Create clean $S + mv "${WORKDIR}"/*CLI.txt "${S}"/readme.txt || die "Failed to move *CLI.txt to readme.txt" + mv "${WORKDIR}"/storcli_all_os/Linux/license.txt "${S}"/license.txt || die "Failed to move Linux/license.txt" + rm -rf "${WORKDIR}"/storcli_all* || die "Failed to cleanup storcli_all* dirs/files" + mv "${WORKDIR}"/opt/Mega*/storcli/* "${S}" || die "Failed to move storcli_.deb content to '${S}'" + rm -rf "${WORKDIR}"/{opt,control.tar.gz,data.tar.gz,debian-binary} || die "Failed to cleanup no longer needed files" +} + +src_install() { + exeinto "${MY_STORCLI_BASEDIR}" + + if use x86; then + doexe storcli + elif use amd64; then + newexe storcli64 storcli + fi + + dosym "${MY_STORCLI_BASEDIR}"/storcli /usr/sbin/storcli + + dodoc "${DOCS[@]}" + + pax-mark m "${D%/}${MY_STORCLI_BASEDIR}"/storcli +} diff --git a/sys-block/targetcli/Manifest b/sys-block/targetcli/Manifest new file mode 100644 index 000000000000..665728c8a869 --- /dev/null +++ b/sys-block/targetcli/Manifest @@ -0,0 +1 @@ +DIST targetcli-3.0_pre4.tar.gz 37299 SHA256 4f389c7de68f25034867770ecae45810340b33512dfae9827e5174db3408df88 SHA512 42e74fe8f7d26ad5693d6cd527d44d77b23f793b33071466819bf29032b71a6ad22924350fc53c78ed93c15ef30abb46b42209c5f16fbf8ade0819d6e26b70f7 WHIRLPOOL 5bb7f03a6fc0d56ab6a4197638dd7376eee1141e6e1f3f6c9e86ab307ff42ac5036a99de5fbdd42ba5708106c2098800d0d2b9af312fe08c72135e4f2a695b17 diff --git a/sys-block/targetcli/metadata.xml b/sys-block/targetcli/metadata.xml index 157114acb9c8..49da91d2bcdc 100644 --- a/sys-block/targetcli/metadata.xml +++ b/sys-block/targetcli/metadata.xml @@ -2,10 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> - <email>python@gentoo.org</email> - <name>Python</name> - </maintainer> -<maintainer type="project"> <email>cluster@gentoo.org</email> <name>Gentoo Cluster Project</name> </maintainer> diff --git a/sys-block/targetcli/targetcli-3.0_pre4.ebuild b/sys-block/targetcli/targetcli-3.0_pre4.ebuild new file mode 100644 index 000000000000..5701d51f4ee8 --- /dev/null +++ b/sys-block/targetcli/targetcli-3.0_pre4.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) + +inherit distutils-r1 linux-info + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="git://github.com/Datera/${PN}.git + https://github.com/Datera/${PN}.git" + KEYWORDS="" +else + MY_PV=${PV/_/-} + SRC_URI="https://github.com/Datera/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${MY_PV}" + KEYWORDS="~amd64" +fi + +DESCRIPTION="CLI and shell for the Linux SCSI target" +HOMEPAGE="http://linux-iscsi.org/wiki/targetcli" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="" + +DEPEND="dev-python/configshell[${PYTHON_USEDEP}] + dev-python/prettytable[${PYTHON_USEDEP}] + dev-python/rtslib[${PYTHON_USEDEP}]" +RDEPEND="${DEPEND} + dev-python/urwid[${PYTHON_USEDEP}]" + +pkg_pretend() { + if use kernel_linux; then + linux-info_get_any_version + if ! linux_config_exists; then + eerror "Unable to check your kernel for SCSI target support" + else + CONFIG_CHECK="~TARGET_CORE" + check_extra_config + fi + fi +} diff --git a/sys-block/targetcli/targetcli-9999.ebuild b/sys-block/targetcli/targetcli-9999.ebuild index e9948c906695..5701d51f4ee8 100644 --- a/sys-block/targetcli/targetcli-9999.ebuild +++ b/sys-block/targetcli/targetcli-9999.ebuild @@ -1,35 +1,46 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=4 +EAPI=6 -EGIT_REPO_URI="git://linux-iscsi.org/${PN}.git" -PYTHON_DEPEND="2" -RESTRICT_PYTHON_ABIS="3.*" -SUPPORT_PYTHON_ABIS="1" +PYTHON_COMPAT=( python2_7 ) -inherit eutils distutils git-2 python linux-info +inherit distutils-r1 linux-info -DESCRIPTION="The targetcli administration shell" -HOMEPAGE="http://linux-iscsi.org/" -SRC_URI="" +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="git://github.com/Datera/${PN}.git + https://github.com/Datera/${PN}.git" + KEYWORDS="" +else + MY_PV=${PV/_/-} + SRC_URI="https://github.com/Datera/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${MY_PV}" + KEYWORDS="~amd64" +fi -LICENSE="AGPL-3" +DESCRIPTION="CLI and shell for the Linux SCSI target" +HOMEPAGE="http://linux-iscsi.org/wiki/targetcli" + +LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="" IUSE="" -DEPEND=" - dev-python/configshell - dev-python/rtslib - sys-block/lio-utils - " -RDEPEND="${DEPEND}" - -CONFIG_CHECK="~TARGET_CORE" - -pkg_setup() { - linux-info_pkg_setup - python_pkg_setup +DEPEND="dev-python/configshell[${PYTHON_USEDEP}] + dev-python/prettytable[${PYTHON_USEDEP}] + dev-python/rtslib[${PYTHON_USEDEP}]" +RDEPEND="${DEPEND} + dev-python/urwid[${PYTHON_USEDEP}]" + +pkg_pretend() { + if use kernel_linux; then + linux-info_get_any_version + if ! linux_config_exists; then + eerror "Unable to check your kernel for SCSI target support" + else + CONFIG_CHECK="~TARGET_CORE" + check_extra_config + fi + fi } diff --git a/sys-block/tgt/Manifest b/sys-block/tgt/Manifest index 1569152f644f..e16cf8eeb19e 100644 --- a/sys-block/tgt/Manifest +++ b/sys-block/tgt/Manifest @@ -2,3 +2,5 @@ DIST tgt-1.0.60.tar.gz 295304 SHA256 619b5250e4bc63971a26c05a3eea353beb4009ed0ff DIST tgt-1.0.63.tar.gz 295305 SHA256 18aa8ad63edae7f3705577580cdbd35e312371155a2cf2059bbe96ed46efef21 SHA512 d68509c2384f969794c3d26d8cdf2994f33cf70f20e207eea25031ad310ecdeea6883d74c4589d85bd168e4abfa293bdefaa35ae603732f187e127f8d0c7b037 WHIRLPOOL 440d2f7adac630f1f1a6a7262269835d47c1f1f2346703f84a813dc03a12dc57d6458e506c513d3a8cf3594b924246868b2772b11f0ab5eb109dbd4b3f15fdee DIST tgt-1.0.64.tar.gz 295356 SHA256 2b9294a5c6a9072d3805835d35e3c3401961c3008ee2e96b46491997f199ca27 SHA512 f7c3569d8243c866d149a6722b6fafab947e25361da5ed4f97510de6549c1b7aa1ec21e3b5c6007c6654281fb4689847ca3d6206c8473b3aebfaf5ba961364ea WHIRLPOOL 80b27a3a063337edd0cd1001a76985cecf816e3c1fbadb739aa6a5bc13a7b47115c6febafff17291424d2e6cd96854449682ea9a2656b664731c29599334ad60 DIST tgt-1.0.65.tar.gz 295389 SHA256 a29e771bd847b8c6e85eef6815b06e3a232135ef8bb4d0087b319cab5003b32c SHA512 58793b7f5e596798212aef5c59d60f1a4c329084c582cce6a8050b0a83e770a5fb90d825dd1b873e03a074425654ec2e3c0065d8e2de128c3aedf89165db3d2b WHIRLPOOL 7edeeaca7bdca99ddf79400d091b28c8d08b8c1a304416c8f65b4a460c6e20ad74c8a47ca11274109aa2687f7c14cd33bb2c74f25fda4608575071f0efae4466 +DIST tgt-1.0.66.tar.gz 296024 SHA256 e6394cc54d92c0fcd50bd6850944dc7ebb1c98f31e8d2d981867e842be2bcd88 SHA512 bc467768a0f315163210dfcfdb651d8de8768b1c8c874df46afc940452ccaac17f34f87454c28e0a0dd62fb911f8c7352cda8f2246e170630d853677910039fa WHIRLPOOL 861ac71a45027a6355800b06962e5ef35c72ca52d4e3441c5ecc0239bc9ae1f92d38fba8f8cdeeafe9839ada90ec3f7fe5127fb872c06e0382b2e1e8891800b0 +DIST tgt-1.0.67.tar.gz 296092 SHA256 bf3f68d9314583459328d060942308a909b795146187ab4d4231ac03481fe6c8 SHA512 8ea1096cdf83a31d3b5c10916d8e3c1d90c23b3072a0cc9e8214bb4c230ac08b37264f1460099069d5ff6e56d31fcb2f6cf7291a2305ed685d106ed1898c50bb WHIRLPOOL d51b14dd146045f49d994f0ce8b8a88e23813c76d98f36709f4b125e8f7cc81a9204a0140c7e8fa88db694c974da56af18bdd495da66232217ca07397003d172 diff --git a/sys-block/tgt/tgt-1.0.60.ebuild b/sys-block/tgt/tgt-1.0.60.ebuild index c8a171c9dd33..7099976870bd 100644 --- a/sys-block/tgt/tgt-1.0.60.ebuild +++ b/sys-block/tgt/tgt-1.0.60.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -21,8 +21,8 @@ CDEPEND="dev-perl/Config-General dev-libs/libxslt rbd? ( sys-cluster/ceph ) infiniband? ( - sys-infiniband/libibverbs:= - sys-infiniband/librdmacm:= + sys-fabric/libibverbs:= + sys-fabric/librdmacm:= )" DEPEND="${CDEPEND} app-text/docbook-xsl-stylesheets" diff --git a/sys-block/tgt/tgt-1.0.63.ebuild b/sys-block/tgt/tgt-1.0.63.ebuild index 69a7e1e9e7bd..87cb4ef482b1 100644 --- a/sys-block/tgt/tgt-1.0.63.ebuild +++ b/sys-block/tgt/tgt-1.0.63.ebuild @@ -14,15 +14,15 @@ SRC_URI="https://github.com/fujita/tgt/tarball/v${PV} -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="fcoe fcp ibmvio infiniband rbd" CDEPEND="dev-perl/Config-General dev-libs/libxslt rbd? ( sys-cluster/ceph ) infiniband? ( - sys-infiniband/libibverbs:= - sys-infiniband/librdmacm:= + sys-fabric/libibverbs:= + sys-fabric/librdmacm:= )" DEPEND="${CDEPEND} app-text/docbook-xsl-stylesheets" diff --git a/sys-block/tgt/tgt-1.0.64.ebuild b/sys-block/tgt/tgt-1.0.64.ebuild index b866939612ba..88a35c44ab0f 100644 --- a/sys-block/tgt/tgt-1.0.64.ebuild +++ b/sys-block/tgt/tgt-1.0.64.ebuild @@ -21,8 +21,8 @@ CDEPEND="dev-perl/Config-General dev-libs/libxslt rbd? ( sys-cluster/ceph ) infiniband? ( - sys-infiniband/libibverbs:= - sys-infiniband/librdmacm:= + sys-fabric/libibverbs:= + sys-fabric/librdmacm:= )" DEPEND="${CDEPEND} app-text/docbook-xsl-stylesheets" diff --git a/sys-block/tgt/tgt-1.0.65.ebuild b/sys-block/tgt/tgt-1.0.65.ebuild index 38574ab6bd00..0f142aa4281f 100644 --- a/sys-block/tgt/tgt-1.0.65.ebuild +++ b/sys-block/tgt/tgt-1.0.65.ebuild @@ -21,8 +21,8 @@ CDEPEND="dev-perl/Config-General dev-libs/libxslt rbd? ( sys-cluster/ceph ) infiniband? ( - sys-infiniband/libibverbs:= - sys-infiniband/librdmacm:= + sys-fabric/libibverbs:= + sys-fabric/librdmacm:= )" DEPEND="${CDEPEND} app-text/docbook-xsl-stylesheets" diff --git a/sys-block/tgt/tgt-1.0.66.ebuild b/sys-block/tgt/tgt-1.0.66.ebuild new file mode 100644 index 000000000000..a995a319e1d9 --- /dev/null +++ b/sys-block/tgt/tgt-1.0.66.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit flag-o-matic toolchain-funcs + +MY_TREE="33cad04" + +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 ~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 +} + +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.67.ebuild b/sys-block/tgt/tgt-1.0.67.ebuild new file mode 100644 index 000000000000..5dd332ff2997 --- /dev/null +++ b/sys-block/tgt/tgt-1.0.67.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit flag-o-matic toolchain-funcs + +MY_TREE="cb7971c" + +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 ~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 +} + +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/tw_cli/metadata.xml b/sys-block/tw_cli/metadata.xml index 2ff437f36645..7258c2a26d03 100644 --- a/sys-block/tw_cli/metadata.xml +++ b/sys-block/tw_cli/metadata.xml @@ -6,8 +6,4 @@ <name>Robin H. Johnson</name> <description>Primary maintainer, PATA controllers</description> </maintainer> -<maintainer type="person"> - <email>neurogeek@gentoo.org</email> - <name>Jesus Rivero</name> -</maintainer> </pkgmetadata> diff --git a/sys-block/zram-init/Manifest b/sys-block/zram-init/Manifest index f3aa8ce90c13..7593acc6984f 100644 --- a/sys-block/zram-init/Manifest +++ b/sys-block/zram-init/Manifest @@ -2,3 +2,4 @@ DIST zram-init-2.7.tar.gz 4821 SHA256 205765243bd36bf62c471363c4fddf8173275d37f5 DIST zram-init-3.0.tar.gz 5578 SHA256 a1b4bf7f90497a44388f349c3c766e13e575ff7b52168f74058e9b352244b71a SHA512 f962aaa9c5d7f8f7566e9e405de4709fcfd0b659c7dcf79008ca5b7b18ab44545f363e8a695bfff07068e0889ec79ce54af578493f82be3848ca306865d6555a WHIRLPOOL 6304d5192b81490e33962e3162f18729e5a8438bb3f10b90744045014c3ef91a18c2a65538b97f02811cc793d88fb7eddc7efa3129c3b150e70cddfb3694305f DIST zram-init-3.4.tar.gz 5825 SHA256 39e121d209a03a29f98bbb0be47ce666bf6c0ef7185af30f118976fbe68a8788 SHA512 985cbe5dd63c900ce88bf8f8989bc04f982b27104dbc40e9c4cf504310aca335efafba842d801e0b9250e8b6925d063bcd2c555122fc7c7295128687ccd4080f WHIRLPOOL 086426e0f334c500f9dc65273afad1acdbd7696882cd0a9f54f7b27fac347777f8dea0899a2719626648da9dee1c837f6f3ccebd8cf1e1c9dc550624c2eb9416 DIST zram-init-3.6.tar.gz 6207 SHA256 cfd611395ffd808108921059a93db7c84c80b3ecbfcd92bbc17d450519189e1d SHA512 535104beca6de225aeb482ebb7a01a2498c841784a68d60e8e09f04ab193e6a8ae3ea55797308c89d54f3ce66bdac3f8c535059561ea6ccf848582c594b7f667 WHIRLPOOL 6cac97687f121d307992420f4fd71cefe76bae13bf9541b0ff803ad91b3ce7479229a640fb9c8eb5a37f9e9dff63e32abc0c708c586b10aa74c330b2607642d5 +DIST zram-init-3.8.tar.gz 6619 SHA256 4a43c424739dda6c4ffe62b5431b6fb1f476afd9f8b9b9149eb32314cd34a3a6 SHA512 c083f34bba6031f8e247f61a1451343e14cc4bc5c4731ad3a32a5f0eea265936a83b27ad0e3cbd2ba0e05e2bec1e6ae739b6e4149d120dafbcc057437188f07f WHIRLPOOL e4fdcdd49c8eb5eb74faa0200af7fa1db5e6e0128a531d9b4a1e02d57ced03c36bce00313e6ddc6de16c9fc6bac25b0f803f3160c20029bdaa4d3558f00124f6 diff --git a/sys-block/zram-init/metadata.xml b/sys-block/zram-init/metadata.xml index 8ba6cded818d..fdbc0f6b02d7 100644 --- a/sys-block/zram-init/metadata.xml +++ b/sys-block/zram-init/metadata.xml @@ -2,9 +2,10 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>jauhien@gentoo.org</email> - <name>Jauhien Piatlicki</name> + <email>perfinion@gentoo.org</email> + <name>Jason Zaman</name> </maintainer> + <upstream> <remote-id type="github">vaeth/zram-init</remote-id> </upstream> diff --git a/sys-block/zram-init/zram-init-3.8.ebuild b/sys-block/zram-init/zram-init-3.8.ebuild new file mode 100644 index 000000000000..665d820ce343 --- /dev/null +++ b/sys-block/zram-init/zram-init-3.8.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit readme.gentoo-r1 systemd + +DESCRIPTION="Scripts to support compressed swap devices or ramdisks with zram" +HOMEPAGE="https://github.com/vaeth/zram-init/" +SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="!<sys-apps/openrc-0.13" + +DISABLE_AUTOFORMATTING="true" +DOC_CONTENTS="To use zram, activate it in your kernel and add it to default runlevel: + rc-config add zram default +If you use systemd enable zram_swap, tmp, and/or var_tmp with systemctl. +You might need to modify /etc/modprobe.d/zram.conf" + +src_prepare() { + use prefix || sed -i \ + -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \ + -- sbin/* || die + eapply_user +} + +src_install() { + dosbin sbin/* + doinitd openrc/init.d/* + doconfd openrc/conf.d/* + systemd_dounit systemd/system/* + insinto /etc/modprobe.d + doins modprobe.d/* + insinto /usr/share/zsh/site-functions + doins zsh/* + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog +} |