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

2022-08-31 Thread Sam James 
commit: 7bd9cba226e32e2a53d7103a62ab58f5289b0c25
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep  1 01:58:17 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep  1 01:58:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bd9cba2

sys-fs/f2fs-tools: fix build w/ app-arch/lz4-1.9.4

Closes: https://bugs.gentoo.org/867691
Signed-off-by: Sam James  gentoo.org>

 ...ols-.ebuild => f2fs-tools-1.15.0-r1.ebuild} | 12 +++
 sys-fs/f2fs-tools/f2fs-tools-.ebuild   |  2 +-
 .../files/f2fs-tools-1.15.0-lz4-1.9.4.patch| 25 ++
 3 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/sys-fs/f2fs-tools/f2fs-tools-.ebuild 
b/sys-fs/f2fs-tools/f2fs-tools-1.15.0-r1.ebuild
similarity index 68%
copy from sys-fs/f2fs-tools/f2fs-tools-.ebuild
copy to sys-fs/f2fs-tools/f2fs-tools-1.15.0-r1.ebuild
index 106339c983bf..654499bcdb8b 100644
--- a/sys-fs/f2fs-tools/f2fs-tools-.ebuild
+++ b/sys-fs/f2fs-tools/f2fs-tools-1.15.0-r1.ebuild
@@ -3,15 +3,15 @@
 
 EAPI=8
 
-inherit git-r3 autotools
+inherit autotools
 
 DESCRIPTION="Tools for Flash-Friendly File System (F2FS)"
 
HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/about/;
-EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/${PN}.git;
-EGIT_BRANCH="dev"
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/${PN}.git/snapshot/${P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0/9"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
 IUSE="selinux"
 
 RDEPEND="
@@ -19,13 +19,17 @@ RDEPEND="
elibc_musl? ( sys-libs/queue-standalone )"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.15.0-lz4-1.9.4.patch
+)
+
 src_prepare() {
default
eautoreconf
 }
 
 src_configure() {
-   #This is required to install to /sbin, bug #481110
+   # This is required to install to /sbin, bug #481110
econf \
--bindir="${EPREFIX}"/sbin \
--disable-static \

diff --git a/sys-fs/f2fs-tools/f2fs-tools-.ebuild 
b/sys-fs/f2fs-tools/f2fs-tools-.ebuild
index 106339c983bf..45de5c193d7b 100644
--- a/sys-fs/f2fs-tools/f2fs-tools-.ebuild
+++ b/sys-fs/f2fs-tools/f2fs-tools-.ebuild
@@ -25,7 +25,7 @@ src_prepare() {
 }
 
 src_configure() {
-   #This is required to install to /sbin, bug #481110
+   # This is required to install to /sbin, bug #481110
econf \
--bindir="${EPREFIX}"/sbin \
--disable-static \

diff --git a/sys-fs/f2fs-tools/files/f2fs-tools-1.15.0-lz4-1.9.4.patch 
b/sys-fs/f2fs-tools/files/f2fs-tools-1.15.0-lz4-1.9.4.patch
new file mode 100644
index ..4194054271db
--- /dev/null
+++ b/sys-fs/f2fs-tools/files/f2fs-tools-1.15.0-lz4-1.9.4.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/867691
+https://github.com/jaegeuk/f2fs-tools/commit/b9e0985dc2e8f0a15faca21fa208afae57593486
+
+From: Jaegeuk Kim 
+Date: Mon, 29 Aug 2022 11:03:35 -0700
+Subject: [PATCH] f2fs-tools: fix build error on lz4-1.9.4
+
+LZ4_STREAMSIZE_U64 is undefined in new lz4 lib.
+
+Signed-off-by: Jaegeuk Kim 
+--- a/fsck/compress.c
 b/fsck/compress.c
+@@ -32,10 +32,7 @@
+ #ifdef HAVE_LIBLZ4
+ #define LZ4_MEMORY_USAGE  14
+ #define LZ4_MAX_INPUT_SIZE0x7E00 /* 2 113 929 216 bytes */
+-#ifndef LZ4_STREAMSIZE
+-#define LZ4_STREAMSIZE(LZ4_STREAMSIZE_U64 * 
sizeof(long long))
+-#endif
+-#define LZ4_MEM_COMPRESS  LZ4_STREAMSIZE
++#define LZ4_MEM_COMPRESS  sizeof(LZ4_stream_t)
+ #define LZ4_ACCELERATION_DEFAULT  1
+ #define LZ4_WORK_SIZE ALIGN_UP(LZ4_MEM_COMPRESS, 8)
+ #endif
+

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

2020-01-08 Thread Mikle Kolyada 
commit: 797bebf829f4b87db1828195e71c788f904f3488
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Wed Jan  8 15:16:05 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Wed Jan  8 15:16:05 2020 +
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  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 
ca2e17fa6c48905fc1905fdec865143a003260bd60f659cd9f6c427b371c39f4c869f7265dc19adf7ef7d4d8ba7ed2a3733c52aab18277f5371cb2cb3be3
 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..000
--- 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..000
--- 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..000
--- a/sys-fs/f2fs-tools/f2fs-tools-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed

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

2019-03-03 Thread Aaron Bauman 
commit: 0e75b4180974dac3cb1815b05e98ae9217479e95
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Fri Mar  1 17:33:40 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Mar  4 03:13:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e75b418

sys-fs/f2fs-tools: remove unused patch

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Aaron Bauman  gentoo.org>

 .../files/f2fs-tools-1.6.1-sysmacros.patch | 45 --
 1 file changed, 45 deletions(-)

diff --git a/sys-fs/f2fs-tools/files/f2fs-tools-1.6.1-sysmacros.patch 
b/sys-fs/f2fs-tools/files/f2fs-tools-1.6.1-sysmacros.patch
deleted file mode 100644
index f5cc4a09018..000
--- a/sys-fs/f2fs-tools/files/f2fs-tools-1.6.1-sysmacros.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://bugs.gentoo.org/580338
-
-From d6abcb38899cd03d59e0f30c49419695f86ae543 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger 
-Date: Mon, 18 Apr 2016 18:18:07 -0400
-Subject: [PATCH] fibmap: pull in sys/sysmacros.h for major/minor
-
-These funcs are provided by sys/sysmacros.h, so include the header
-directly.  Building with alternative C libraries can fail otherwise
-like so:
-
-fibmap.c: In function 'print_stat':
-fibmap.c:36:32: warning: implicit declaration of function 'major' 
[-Wimplicit-function-declaration]
-  printf("dev   [%d:%d]\n", major(st->st_dev), minor(st->st_dev));
-^
-fibmap.c:36:51: warning: implicit declaration of function 'minor' 
[-Wimplicit-function-declaration]
-  printf("dev   [%d:%d]\n", major(st->st_dev), minor(st->st_dev));
-   ^
-fibmap.o: In function 'print_stat':
-tools/fibmap.c:36: undefined reference to 'minor'
-tools/fibmap.c:36: undefined reference to 'major'
-fibmap.o: In function 'stat_bdev':
-tools/fibmap.c:59: undefined reference to 'minor'
-tools/fibmap.c:59: undefined reference to 'major'
-
-Signed-off-by: Mike Frysinger 

- tools/fibmap.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tools/fibmap.c b/tools/fibmap.c
-index 224b233..6b092f5 100644
 a/tools/fibmap.c
-+++ b/tools/fibmap.c
-@@ -8,6 +8,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #include 
--- 
-2.7.4
-

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

2018-03-22 Thread Anthony G. Basile 
commit: 6863aaf805bdfd8ef8c34f17f3371c47ae308062
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Thu Mar 22 19:49:33 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Thu Mar 22 22:49:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6863aaf8

sys-fs/f2fs-tools: remove unused patch

 sys-fs/f2fs-tools/files/f2fs-tools-1.8.0-sysmacros.patch | 10 --
 1 file changed, 10 deletions(-)

diff --git a/sys-fs/f2fs-tools/files/f2fs-tools-1.8.0-sysmacros.patch 
b/sys-fs/f2fs-tools/files/f2fs-tools-1.8.0-sysmacros.patch
deleted file mode 100644
index 7ca70222fd5..000
--- a/sys-fs/f2fs-tools/files/f2fs-tools-1.8.0-sysmacros.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 f2fs-tools-1.8.0/lib/libf2fs.c.orig2017-07-03 03:01:53.0 
+0600
-+++ f2fs-tools-1.8.0/lib/libf2fs.c 2017-08-17 00:45:01.638979885 +0600
-@@ -16,6 +16,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #include