commit: ff2e634c0e5f9a944f1cd3f4460849573d2bb8d5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 4 17:17:03 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 4 18:51:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff2e634c
sys-fs/bcache-tools: Drop 1.0.8_p20140220-r1, EAPI5--
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sys-fs/bcache-tools/Manifest | 2 -
.../bcache-tools-1.0.8_p20140220-r1.ebuild | 77 ----------------------
.../1.0.8_p20140220/bcache-status-python3.patch | 8 ---
.../1.0.8_p20140220/bcache-tools-1.0.8-crc64.patch | 55 ----------------
...che-tools-1.0.8-probe-bcache-underlinking.patch | 13 ----
.../bcache-tools-20131018-fedconf.patch | 5 --
.../bcache-tools-status-20130826-man.patch | 49 --------------
7 files changed, 209 deletions(-)
diff --git a/sys-fs/bcache-tools/Manifest b/sys-fs/bcache-tools/Manifest
index 030990051d5..97abfadeebf 100644
--- a/sys-fs/bcache-tools/Manifest
+++ b/sys-fs/bcache-tools/Manifest
@@ -1,3 +1 @@
-DIST bcache-status-20140220.tar.gz 3779 BLAKE2B
a3fa5e9d87b2c51f1f5178693db6d9f8b4bde31c77783d1ebd9de6e81995d89a4b07df43178cba384757b212087c474a0508640d1d3ddcd97d3d928643971e4a
SHA512
0c8db02dc865b469f3a5964f679a3bfdf5cdbf5a2f6ccd5d81544f3bb3c06df2f5d06b9f09aaec527ec90229740dcd31fbb33e2628721b6da139cfcee6b48d7c
-DIST bcache-tools-1.0.8_p20140220.tgz 22153 BLAKE2B
d40a64b02e0d66ef8868151870715f6e6ab54633e4875c32d0e03dfe1871e5aa98d7e133b9eed583ac4898b1598f38b71e47109210009ca51c4dfe9dbd31768c
SHA512
21eaed457e5de623089c0d4e1c11394a3950f29c749c502bfd5dd94d3dcdc7379c4a910825e33bf9fc8080df656949b94a1a28d19048a8eb6422976cb391b7dc
DIST bcache-tools-1.1.tar.gz 34548 BLAKE2B
e6ebc0f609debe0cc123deba0e21076441c37cdbc6edd02bf2c16c0e36fe806f1fc160b9e9baed577f86f6358884182a4e3903f34bccee81943191c0ba6a2d11
SHA512
4ccbef47255bf3644a50242a79951b1f3720e71a55eb1e07dc6b8486df0245da99a77bba751b50197d489b4c5d738e5284aabc014c2f7f44816ddf6a1bb807ca
diff --git a/sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220-r1.ebuild
b/sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220-r1.ebuild
deleted file mode 100644
index d53d514a64e..00000000000
--- a/sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit eutils flag-o-matic python-r1 toolchain-funcs udev
-
-DESCRIPTION="Tools for bcachefs"
-HOMEPAGE="https://bcache.evilpiepirate.org/";
-SRC_URI="
- https://github.com/g2p/bcache-tools/archive/v${PV%%_p*}.tar.gz ->
${P}.tgz
- https://dev.gentoo.org/~jlec/distfiles/bcache-status-20140220.tar.gz
-"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- >=sys-apps/util-linux-2.24"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PV}/bcache-status-python3.patch
- "${FILESDIR}"/${PV}/bcache-tools-1.0.8-crc64.patch
- "${FILESDIR}"/${PV}/bcache-tools-1.0.8-noprobe.patch
- "${FILESDIR}"/${PV}/bcache-tools-20131018-fedconf.patch
- "${FILESDIR}"/${PV}/bcache-tools-status-20130826-man.patch
-)
-
-S="${WORKDIR}"/${P%%_p*}
-
-src_prepare() {
- tc-export CC
- sed \
- -e '/^CFLAGS/s:-O2::' \
- -e '/^CFLAGS/s:-g:-std=gnu99:' \
- -i Makefile || die
-
- append-lfs-flags
-
- cp ../bcache-status*/bcache-status . || die
-
- epatch "${PATCHES[@]}"
-}
-
-src_install() {
- into /
- dosbin make-bcache bcache-super-show
-
- exeinto $(get_udevdir)
- doexe bcache-register probe-bcache
-
- python_foreach_impl python_doscript bcache-status
-
- udev_dorules 69-bcache.rules
-
- insinto /etc/initramfs-tools/hooks/bcache
- doins initramfs/hook
-
- # that is what dracut does
- insinto /usr/lib/dracut/modules.d/90bcache
- doins dracut/module-setup.sh
-
- doman *.8
-
- dodoc README
-}
-
-pkg_postinst() {
- udev_reload
-}
diff --git
a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-status-python3.patch
b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-status-python3.patch
deleted file mode 100644
index 0cb08cc1a28..00000000000
--- a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-status-python3.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- bcache-tools-1.0.8/bcache-status.orig 2015-06-20 08:56:22.343589706
+0200
-+++ bcache-tools-1.0.8/bcache-status 2015-06-20 08:56:39.971692433 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # Dumb script to dump (some) of bcache status
- # Copyright 2014 Darrick J. Wong. All rights reserved.
diff --git
a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-crc64.patch
b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-crc64.patch
deleted file mode 100644
index 9b11d80c009..00000000000
--- a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-crc64.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -ruN bcache-tools-1.0.8.orig/bcache.c bcache-tools-1.0.8/bcache.c
---- bcache-tools-1.0.8.orig/bcache.c 2014-12-04 23:51:24.000000000 +0100
-+++ bcache-tools-1.0.8/bcache.c 2015-05-22 19:40:41.039355096 +0200
-@@ -26,7 +26,7 @@
- * x^7 + x^4 + x + 1
- */
-
--static const uint64_t crc_table[256] = {
-+const uint64_t crc_table[256] = {
- 0x0000000000000000ULL, 0x42F0E1EBA9EA3693ULL, 0x85E1C3D753D46D26ULL,
- 0xC711223CFA3E5BB5ULL, 0x493366450E42ECDFULL, 0x0BC387AEA7A8DA4CULL,
- 0xCCD2A5925D9681F9ULL, 0x8E224479F47CB76AULL, 0x9266CC8A1C85D9BEULL,
-@@ -114,16 +114,3 @@
- 0x5DEDC41A34BBEEB2ULL, 0x1F1D25F19D51D821ULL, 0xD80C07CD676F8394ULL,
- 0x9AFCE626CE85B507ULL
- };
--
--inline uint64_t crc64(const void *_data, size_t len)
--{
-- uint64_t crc = 0xFFFFFFFFFFFFFFFFULL;
-- const unsigned char *data = _data;
--
-- while (len--) {
-- int i = ((int) (crc >> 56) ^ *data++) & 0xFF;
-- crc = crc_table[i] ^ (crc << 8);
-- }
--
-- return crc ^ 0xFFFFFFFFFFFFFFFFULL;
--}
-diff -ruN bcache-tools-1.0.8.orig/bcache.h bcache-tools-1.0.8/bcache.h
---- bcache-tools-1.0.8.orig/bcache.h 2014-12-04 23:51:24.000000000 +0100
-+++ bcache-tools-1.0.8/bcache.h 2015-05-22 19:40:34.924320569 +0200
-@@ -115,7 +115,20 @@
- #define BDEV_STATE_DIRTY 2U
- #define BDEV_STATE_STALE 3U
-
--uint64_t crc64(const void *_data, size_t len);
-+extern const uint64_t crc_table[];
-+
-+inline uint64_t crc64(const void *_data, size_t len)
-+{
-+ uint64_t crc = 0xFFFFFFFFFFFFFFFFULL;
-+ const unsigned char *data = _data;
-+
-+ while (len--) {
-+ int i = ((int) (crc >> 56) ^ *data++) & 0xFF;
-+ crc = crc_table[i] ^ (crc << 8);
-+ }
-+
-+ return crc ^ 0xFFFFFFFFFFFFFFFFULL;
-+}
-
- #define node(i, j) ((void *) ((i)->d + (j)))
- #define end(i) node(i, (i)->keys)
-Binary files bcache-tools-1.0.8.orig/bcache-register and
bcache-tools-1.0.8/bcache-register differ
diff --git
a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-probe-bcache-underlinking.patch
b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-probe-bcache-underlinking.patch
deleted file mode 100644
index c6ca74d6888..00000000000
---
a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-probe-bcache-underlinking.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix underlinking in GCC 4.9 and below
-
---- bcache-tools-1.0.8/Makefile
-+++ bcache-tools-1.0.8/Makefile
-@@ -24,7 +24,7 @@
- make-bcache: LDLIBS += `pkg-config --libs uuid blkid`
- make-bcache: CFLAGS += `pkg-config --cflags uuid blkid`
- make-bcache: bcache.o
--probe-bcache: LDLIBS += `pkg-config --libs uuid blkid`
-+probe-bcache: LDLIBS += `pkg-config --libs uuid blkid` bcache.o
- probe-bcache: CFLAGS += `pkg-config --cflags uuid blkid`
- bcache-super-show: LDLIBS += `pkg-config --libs uuid`
- bcache-super-show: CFLAGS += -std=gnu99
diff --git
a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-20131018-fedconf.patch
b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-20131018-fedconf.patch
deleted file mode 100644
index 993ec216f88..00000000000
---
a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-20131018-fedconf.patch
+++ /dev/null
@@ -1,5 +0,0 @@
-diff -ruN bcache-tools-20130827.orig/configure bcache-tools-20130827/configure
---- bcache-tools-20130827.orig/configure 1970-01-01 01:00:00.000000000
+0100
-+++ bcache-tools-20130827/configure 2013-08-31 15:12:41.093218432 +0200
-@@ -0,0 +1 @@
-+#!/bin/sh
diff --git
a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-status-20130826-man.patch
b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-status-20130826-man.patch
deleted file mode 100644
index 3eabb3f4b83..00000000000
---
a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-status-20130826-man.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -ruN bcache-tools-20130820.orig/bcache-status.8
bcache-tools-20130820/bcache-status.8
---- bcache-tools-20130820.orig/bcache-status.8 1970-01-01 01:00:00.000000000
+0100
-+++ bcache-tools-20130820/bcache-status.8 2013-08-26 23:32:02.477274882
+0200
-@@ -0,0 +1,45 @@
-+.TH bcache-status 8
-+.SH NAME
-+bcache-status \- Display useful bcache statistics
-+.SH SYNOPSIS
-+.B bcache-status
-+[\fB \--help\fR ]
-+[\fB \-f\fR ]
-+[\fB \-h\fR ]
-+[\fB \-d\fR ]
-+[\fB \-t\fR ]
-+[\fB \-a\fR ]
-+[\fB \-r\fR ]
-+[\fB \-s\fR ]
-+[\fB \-g\fR ]
-+.SH DESCRIPTION
-+This command displays useful bcache statistics in a convenient way.
-+.SH OPTIONS
-+.TP
-+.BR \---help
-+Print help message and exit.
-+.TP
-+.BR \-f,\ --five-minute
-+Print the last five minutes of stats.
-+.TP
-+.BR \-h,\ --hour
-+Print the last hour of stats.
-+.TP
-+.BR \-d,\ --day
-+Print the last day of stats.
-+.TP
-+.BR \-t,\ --total
-+Print total stats.
-+.TP
-+.BR \-a,\ --all
-+Print all stats.
-+.TP
-+.BR \-r,\ --reset-stats
-+Reset stats after printing them.
-+.TP
-+.BR \-s,\ --sub-status
-+Print subdevice status.
-+.TP
-+.BR \-g,\ --gc
-+Print subdevice status.
-+
