[gentoo-commits] repo/gentoo:master commit in: sys-fs/f2fs-tools/files/, sys-fs/f2fs-tools/

[Mikle Kolyada]

commit:     797bebf829f4b87db1828195e71c788f904f3488
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  8 15:16:05 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Wed Jan  8 15:16:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=797bebf8

sys-fs/f2fs-tools: Drop old

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 sys-fs/f2fs-tools/Manifest                         |  3 --
 sys-fs/f2fs-tools/f2fs-tools-1.10.0.ebuild         | 34 -------------
 sys-fs/f2fs-tools/f2fs-tools-1.11.0-r1.ebuild      | 38 ---------------
 sys-fs/f2fs-tools/f2fs-tools-1.12.0-r1.ebuild      | 39 ---------------
 ...f2fs-tools-1.10.0-fibmap-include-config_h.patch | 15 ------
 .../f2fs-tools/files/f2fs-tools-1.12.0-fsck.patch  | 56 ----------------------
 6 files changed, 185 deletions(-)

diff --git a/sys-fs/f2fs-tools/Manifest b/sys-fs/f2fs-tools/Manifest
index e9ad8cb6c54..484858925d4 100644
--- a/sys-fs/f2fs-tools/Manifest
+++ b/sys-fs/f2fs-tools/Manifest
@@ -1,4 +1 @@
-DIST f2fs-tools-1.10.0.tar.xz 342904 BLAKE2B ba4dec55e11959b2dd9461b1b02d173c7766908bfdbca9f6da7aa134b4a3b5cf2bda3c2e380b3fab46afdda0be9181ae5fe85ed9d085f816a1ff96e847e2a836 SHA512 e6e9fc10bd8051db86880c415ceb50900bf0cc919f1d9fe39026b5320de7c93cbcc1d817fab73130817042ed551fc5fd55ef9b589caeca9fca63fd3098f7a853
-DIST f2fs-tools-1.11.0.tar.gz 278795 BLAKE2B 8faefb1554283291ad2dc2b66800b88bbdcf07dcb1896a206fd56d52eaa19761c6b008a4961bcec12843a96d2df1744bb5394b4f7bf3830315f4bd3180850e8d SHA512 a69fbd01826909576634f40343293addae3a9c3be09bf8210e2abc1ae12f385fe24dd71c623d14a0a15a81d12f404f193981caaadacbd663bc1502de9a8f7fb7
-DIST f2fs-tools-1.12.0.tar.gz 286528 BLAKE2B ca2e17fa6c48905fc1905fdec865143a003260bd60f659cd9f6c427b371c39f4c869f7265dc198888adf7ef7d4d8ba7ed2a3733c52aab18277f5371cb2cb3be3 SHA512 3f1a914540f57f94bbdc33ad66ee0b02b26fe380b05f9209f226cb3df8e84e29aa4e8e91d77f52bf737915b2785d4b9723becf5a95d75e8821b2e107e991cbad
 DIST f2fs-tools-1.13.0.tar.gz 356028 BLAKE2B 170ddd5825b4f0f6a42a623f01d332092172a385e07dffccca46eb2545c12db23799fdeca7458c0cef17c95989e35db5e617a1458f0c7b41eeccd93eae807167 SHA512 fd920a19e8705a65395809aeef55791c5678ed31c026cdf41fc173e0dbcacdef1db7e0e184ec1aae8637b1784e2ad6e0207583e918255483fe43c73f89bd7f7f

diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.10.0.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.10.0.ebuild
deleted file mode 100644
index ce7d7f0fa63..00000000000
--- a/sys-fs/f2fs-tools/f2fs-tools-1.10.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Tools for Flash-Friendly File System (F2FS)"
-HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/about/"
-SRC_URI="https://dev.gentoo.org/~blueness/f2fs-tools/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/4"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86"
-IUSE="selinux"
-
-RDEPEND="
-	sys-apps/util-linux
-	selinux? ( sys-libs/libselinux )
-	elibc_musl? ( sys-libs/queue-standalone )"
-DEPEND="$RDEPEND"
-
-PATCHES=( "${FILESDIR}"/${P}-fibmap-include-config_h.patch )
-
-src_configure() {
-	#This is required to install to /sbin, bug #481110
-	econf \
-		--bindir="${EPREFIX}"/sbin \
-		--disable-static \
-		$(use_with selinux)
-}
-
-src_install() {
-	default
-	find "${D}" -name "*.la" -delete || die
-}

diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.11.0-r1.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.11.0-r1.ebuild
deleted file mode 100644
index 8bbde577cad..00000000000
--- a/sys-fs/f2fs-tools/f2fs-tools-1.11.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Tools for Flash-Friendly File System (F2FS)"
-HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/about/"
-SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/5"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86"
-IUSE="selinux"
-
-RDEPEND="
-	selinux? ( sys-libs/libselinux )
-	elibc_musl? ( sys-libs/queue-standalone )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	#This is required to install to /sbin, bug #481110
-	econf \
-		--bindir="${EPREFIX}"/sbin \
-		--disable-static \
-		$(use_with selinux)
-}
-
-src_install() {
-	default
-	find "${D}" -name "*.la" -delete || die
-}

diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.12.0-r1.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.12.0-r1.ebuild
deleted file mode 100644
index 3717d20a363..00000000000
--- a/sys-fs/f2fs-tools/f2fs-tools-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Tools for Flash-Friendly File System (F2FS)"
-HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/about/"
-SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/6"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86"
-IUSE="selinux"
-
-RDEPEND="
-	selinux? ( sys-libs/libselinux )
-	elibc_musl? ( sys-libs/queue-standalone )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-fsck.patch
-	default
-	eautoreconf
-}
-
-src_configure() {
-	#This is required to install to /sbin, bug #481110
-	econf \
-		--bindir="${EPREFIX}"/sbin \
-		--disable-static \
-		$(use_with selinux)
-}
-
-src_install() {
-	default
-	find "${D}" -name "*.la" -delete || die
-}

diff --git a/sys-fs/f2fs-tools/files/f2fs-tools-1.10.0-fibmap-include-config_h.patch b/sys-fs/f2fs-tools/files/f2fs-tools-1.10.0-fibmap-include-config_h.patch
deleted file mode 100644
index df57412b74c..00000000000
--- a/sys-fs/f2fs-tools/files/f2fs-tools-1.10.0-fibmap-include-config_h.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-See https://bugs.gentoo.org/649168
-
-Patch by: Matt Whitlock <gentoo@××××××××××××.name>
-
-diff -Naur a/tools/fibmap.c b/tools/fibmap.c
---- a/tools/fibmap.c	2018-03-01 00:09:24.861919778 +0000
-+++ b/tools/fibmap.c	2018-03-01 17:31:48.854604556 +0000
-@@ -15,6 +15,7 @@
- #ifndef O_LARGEFILE
- #define O_LARGEFILE 0
- #endif
-+#include "config.h"
- #include <unistd.h>
- #include <string.h>
- #include <stdlib.h>

diff --git a/sys-fs/f2fs-tools/files/f2fs-tools-1.12.0-fsck.patch b/sys-fs/f2fs-tools/files/f2fs-tools-1.12.0-fsck.patch
deleted file mode 100644
index 72d86fec465..00000000000
--- a/sys-fs/f2fs-tools/files/f2fs-tools-1.12.0-fsck.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From a6160c3e21f43b89b49802cc4a956d1c4b65ae44 Mon Sep 17 00:00:00 2001
-From: Chao Yu <yuchao0@××××××.com>
-Date: Mon, 26 Nov 2018 18:53:37 +0800
-Subject: fsck.f2fs: allow to fsck readonly image w/ -f option
-
-To keep line with e2fsprogs, let's allow to fsck mounted image as
-readonly w/ -f option.
-
-Reported-by: Perfect Gentleman <perfect007gentleman@×××××.com>
-Signed-off-by: Chao Yu <yuchao0@××××××.com>
----
- fsck/main.c       | 1 +
- include/f2fs_fs.h | 1 +
- lib/libf2fs.c     | 2 +-
- 3 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/fsck/main.c b/fsck/main.c
-index 675c603..bb79f6e 100644
---- a/fsck/main.c
-+++ b/fsck/main.c
-@@ -249,6 +249,7 @@ void f2fs_parse_options(int argc, char *argv[])
- 			case 'f':
- 			case 'y':
- 				c.fix_on = 1;
-+				c.force = 1;
- 				MSG(0, "Info: Force to fix corruption\n");
- 				break;
- 			case 'q':
-diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h
-index 65cc8fd..6eebb3a 100644
---- a/include/f2fs_fs.h
-+++ b/include/f2fs_fs.h
-@@ -369,6 +369,7 @@ struct f2fs_configuration {
- 	void *private;
- 	int dry_run;
- 	int fix_on;
-+	int force;
- 	int defset;
- 	int bug_on;
- 	int alloc_failed;
-diff --git a/lib/libf2fs.c b/lib/libf2fs.c
-index cc335db..498f6c0 100644
---- a/lib/libf2fs.c
-+++ b/lib/libf2fs.c
-@@ -821,7 +821,7 @@ int get_device_info(int i)
- 			return -1;
- 		}
- 
--		if (S_ISBLK(stat_buf->st_mode))
-+		if (S_ISBLK(stat_buf->st_mode) && !c.force)
- 			fd = open(dev->path, O_RDWR | O_EXCL);
- 		else
- 			fd = open(dev->path, O_RDWR);
--- 
-cgit 1.2-0.3.lf.el7
-