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

2023-11-24 Thread Sam James 
commit: b95a009f008265251004bda7fdcc737684a36763
Author: Sam James  gentoo  org>
AuthorDate: Sat Nov 25 06:33:29 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov 25 06:33:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b95a009f

sys-fs/libeatmydata: drop 130

Signed-off-by: Sam James  gentoo.org>

 sys-fs/libeatmydata/Manifest   |  1 -
 ...eatmydata-130-implicit-function-decl-test.patch | 18 --
 sys-fs/libeatmydata/libeatmydata-130.ebuild| 39 --
 3 files changed, 58 deletions(-)

diff --git a/sys-fs/libeatmydata/Manifest b/sys-fs/libeatmydata/Manifest
index 3675698a430d..a49dc78fce99 100644
--- a/sys-fs/libeatmydata/Manifest
+++ b/sys-fs/libeatmydata/Manifest
@@ -1,2 +1 @@
-DIST libeatmydata-130.tar.gz 375627 BLAKE2B 
a1f65050572e8a7fc8345082a12e2831a8fb1e68e1d198ae507752375b2081a79fa6e5e589028104cd9d767d86b4d453c0eac0ad7f366c90d6734f5868f8e0cd
 SHA512 
80edeee1b39e14d10e7d04d7fff63a233119c6e13216e92ec786cc41ecd79eb58937da0e621aaef697490e9fb285f3e1109b786ee6967fa1736bb4879e100f18
 DIST libeatmydata-131.tar.gz 368469 BLAKE2B 
1b59f80ba72caeafa40272c5996e0fb03774c69c35d7a2194d312e53c48212caca84abed56ec63a9fba2b4142efbee4aa371c3869a76f8c5674936ffe0daea5d
 SHA512 
064417dc085cb82e4baf1d160fcde2c6e0d9fed60e5c595799630b030053c373d53055894c127c5b384be9204e8bbb251877651811b5fc5cdca8ffd9cf42

diff --git 
a/sys-fs/libeatmydata/files/libeatmydata-130-implicit-function-decl-test.patch 
b/sys-fs/libeatmydata/files/libeatmydata-130-implicit-function-decl-test.patch
deleted file mode 100644
index da8403ca2c11..
--- 
a/sys-fs/libeatmydata/files/libeatmydata-130-implicit-function-decl-test.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-/var/tmp/portage/sys-fs/libeatmydata-130/work/libeatmydata-130/libeatmydata/test/tst-invalidfd.c:31:13:
 error: implicit declaration of function ‘sync_file_range’; did you mean 
‘copy_file_range’? [-Werror=implicit-function-declaration]
-   31 | r = sync_file_range(fd, 0, 0, 0);
-  | ^~~
-  | copy_file_range
 a/libeatmydata/test/tst-invalidfd.c
-+++ b/libeatmydata/test/tst-invalidfd.c
-@@ -17,6 +17,11 @@
- 
- #include 
- #include 
-+
-+#ifdef HAVE_SYNC_FILE_RANGE
-+#include 
-+#endif
-+
- #include 
- #include 
- 

diff --git a/sys-fs/libeatmydata/libeatmydata-130.ebuild 
b/sys-fs/libeatmydata/libeatmydata-130.ebuild
deleted file mode 100644
index 70deafe4c9f4..
--- a/sys-fs/libeatmydata/libeatmydata-130.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Multilib because "handy to inject into wine"
-inherit multilib-minimal
-
-DESCRIPTION="LD_PRELOAD hack to convert sync()/msync() and the like to NO-OP"
-HOMEPAGE="https://www.flamingspork.com/projects/libeatmydata/;
-SRC_URI="https://github.com/stewartsmith/${PN}/releases/download/v${PV}/${P}.tar.gz;
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-util/strace )"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-130-implicit-function-decl-test.patch
-)
-
-multilib_src_configure() {
-   ECONF_SOURCE="${S}" econf
-}
-
-multilib_src_test() {
-   # Sandbox fools LD_PRELOAD and libeatmydata does not get control
-   # feature of sandbox
-   SANDBOX_ON=0 LD_PRELOAD= emake -k check
-}
-
-multilib_src_install_all() {
-   find "${ED}" -name '*.la' -type f -delete || die
-
-   dodoc AUTHORS README.md
-}

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

2023-01-08 Thread Sam James 
commit: 5f88996c5e26575277f3167ea7bc99368d1fac35
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan  9 05:47:24 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan  9 05:52:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f88996c

sys-fs/libeatmydata: add 131

Signed-off-by: Sam James  gentoo.org>

 sys-fs/libeatmydata/Manifest   |  1 +
 .../files/libeatmydata-131-gnu_source.patch| 52 ++
 sys-fs/libeatmydata/libeatmydata-131.ebuild| 39 
 3 files changed, 92 insertions(+)

diff --git a/sys-fs/libeatmydata/Manifest b/sys-fs/libeatmydata/Manifest
index 4298bb47c862..3675698a430d 100644
--- a/sys-fs/libeatmydata/Manifest
+++ b/sys-fs/libeatmydata/Manifest
@@ -1 +1,2 @@
 DIST libeatmydata-130.tar.gz 375627 BLAKE2B 
a1f65050572e8a7fc8345082a12e2831a8fb1e68e1d198ae507752375b2081a79fa6e5e589028104cd9d767d86b4d453c0eac0ad7f366c90d6734f5868f8e0cd
 SHA512 
80edeee1b39e14d10e7d04d7fff63a233119c6e13216e92ec786cc41ecd79eb58937da0e621aaef697490e9fb285f3e1109b786ee6967fa1736bb4879e100f18
+DIST libeatmydata-131.tar.gz 368469 BLAKE2B 
1b59f80ba72caeafa40272c5996e0fb03774c69c35d7a2194d312e53c48212caca84abed56ec63a9fba2b4142efbee4aa371c3869a76f8c5674936ffe0daea5d
 SHA512 
064417dc085cb82e4baf1d160fcde2c6e0d9fed60e5c595799630b030053c373d53055894c127c5b384be9204e8bbb251877651811b5fc5cdca8ffd9cf42

diff --git a/sys-fs/libeatmydata/files/libeatmydata-131-gnu_source.patch 
b/sys-fs/libeatmydata/files/libeatmydata-131-gnu_source.patch
new file mode 100644
index ..b60cdea868c4
--- /dev/null
+++ b/sys-fs/libeatmydata/files/libeatmydata-131-gnu_source.patch
@@ -0,0 +1,52 @@
+https://github.com/stewartsmith/libeatmydata/pull/30
+
+From 9b37e3994f94687085e234d153c9ae3abdd038d3 Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Mon, 9 Jan 2023 05:50:13 +
+Subject: [PATCH] Avoid redefining _GNU_SOURCE
+
+It's harmless, but with 3dea342f64a73a271d24779474d1b304b8f5618c, we get:
+```
+x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. 
-I/var/tmp/portage/sys-fs/libeatmydata-131/work/libeatmydata-131 -O2 -pipe 
-march=native -fdiagnostics-color=always -frecord-gcc-switches -Wreturn-type
  -ggdb3 -Werror=implicit-function-declaration -Werror=implicit-int -c -o 
libeatmydata/test/tst-cancel4.o 
/var/tmp/portage/sys-fs/libeatmydata-131/work/libeatmydata-131/libeatmydata/test/tst-cancel4.c
+/var/tmp/portage/sys-fs/libeatmydata-131/work/libeatmydata-131/libeatmydata/test/tst-cancel4.c:28:
 warning: "_GNU_SOURCE" redefined
+   28 | #define _GNU_SOURCE
+  |
+In file included from 
/var/tmp/portage/sys-fs/libeatmydata-131/work/libeatmydata-131/libeatmydata/test/tst-cancel4.c:26:
+./config.h:115: note: this is the location of the previous definition
+  115 | # define _GNU_SOURCE 1
+  |
+```
+
+This is because we already have `AC_USE_SYSTEM_EXTENSIONS` in configure.ac
+which sets GNU_SOURCE in config.h for us.
+
+We also explicitly add a config.h include to tst-invalidvd.c instead
+of relying on it via portability.h.
+--- a/libeatmydata/test/tst-cancel4.c
 b/libeatmydata/test/tst-cancel4.c
+@@ -25,7 +25,6 @@
+ 
+ #include "config.h"
+ 
+-#define _GNU_SOURCE
+ #include 
+ #include 
+ #include 
+--- a/libeatmydata/test/tst-invalidfd.c
 b/libeatmydata/test/tst-invalidfd.c
+@@ -13,6 +13,7 @@
+  * with this program.  If not, see .
+  * END LICENSE */
+ 
++#include "config.h"
+ #include "libeatmydata/portability.h"
+ 
+ #include 
+@@ -21,7 +22,6 @@
+ #include 
+ 
+ #ifdef HAVE_SYNC_FILE_RANGE
+-#define _GNU_SOURCE
+ #include 
+ #endif
+ 

diff --git a/sys-fs/libeatmydata/libeatmydata-131.ebuild 
b/sys-fs/libeatmydata/libeatmydata-131.ebuild
new file mode 100644
index ..92d05a4733a5
--- /dev/null
+++ b/sys-fs/libeatmydata/libeatmydata-131.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Multilib because "handy to inject into wine"
+inherit multilib-minimal
+
+DESCRIPTION="LD_PRELOAD hack to convert sync()/msync() and the like to NO-OP"
+HOMEPAGE="https://www.flamingspork.com/projects/libeatmydata/;
+SRC_URI="https://github.com/stewartsmith/${PN}/releases/download/v${PV}/${P}.tar.gz;
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-util/strace )"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-131-gnu_source.patch
+)
+
+multilib_src_configure() {
+   ECONF_SOURCE="${S}" econf
+}
+
+multilib_src_test() {
+   # Sandbox fools LD_PRELOAD and libeatmydata does not get control
+   # feature of sandbox
+   SANDBOX_ON=0 LD_PRELOAD= emake -k check
+}
+
+multilib_src_install_all() {
+   find "${ED}" -name '*.la' -type f -delete || die
+
+   dodoc AUTHORS README.md
+}

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

2022-05-03 Thread Sam James 
commit: 12ad71010439abc71c9fef5dab5e1fcf16d23bee
Author: Sam James  gentoo  org>
AuthorDate: Wed May  4 04:51:15 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May  4 04:51:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12ad7101

sys-fs/libeatmydata: add 130

Signed-off-by: Sam James  gentoo.org>

 sys-fs/libeatmydata/Manifest   |  1 +
 ...eatmydata-130-implicit-function-decl-test.patch | 18 ++
 sys-fs/libeatmydata/libeatmydata-130.ebuild| 38 ++
 sys-fs/libeatmydata/metadata.xml   |  2 +-
 4 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/sys-fs/libeatmydata/Manifest b/sys-fs/libeatmydata/Manifest
index 877f14934b9d..620220c6f68b 100644
--- a/sys-fs/libeatmydata/Manifest
+++ b/sys-fs/libeatmydata/Manifest
@@ -1 +1,2 @@
 DIST libeatmydata-129.tar.gz 358437 BLAKE2B 
448cff19629fa1a07443a52ebe16a7bf9a8ac7d0c2688e89555ed6c9c2369695a70ae2abf1b74152b3c305e6bc019e2e9808af6642122cd10a73deb7dfb580f2
 SHA512 
dbd0ea4df77034ecbb75955394b15aec6f1331205a5c7aa4a6e0595e3e486bbcc81c28a264bf5441c660563f74bfb06630da98373d481a2ebd9e9b1538c109d1
+DIST libeatmydata-130.tar.gz 375627 BLAKE2B 
a1f65050572e8a7fc8345082a12e2831a8fb1e68e1d198ae507752375b2081a79fa6e5e589028104cd9d767d86b4d453c0eac0ad7f366c90d6734f5868f8e0cd
 SHA512 
80edeee1b39e14d10e7d04d7fff63a233119c6e13216e92ec786cc41ecd79eb58937da0e621aaef697490e9fb285f3e1109b786ee6967fa1736bb4879e100f18

diff --git 
a/sys-fs/libeatmydata/files/libeatmydata-130-implicit-function-decl-test.patch 
b/sys-fs/libeatmydata/files/libeatmydata-130-implicit-function-decl-test.patch
new file mode 100644
index ..da8403ca2c11
--- /dev/null
+++ 
b/sys-fs/libeatmydata/files/libeatmydata-130-implicit-function-decl-test.patch
@@ -0,0 +1,18 @@
+/var/tmp/portage/sys-fs/libeatmydata-130/work/libeatmydata-130/libeatmydata/test/tst-invalidfd.c:31:13:
 error: implicit declaration of function ‘sync_file_range’; did you mean 
‘copy_file_range’? [-Werror=implicit-function-declaration]
+   31 | r = sync_file_range(fd, 0, 0, 0);
+  | ^~~
+  | copy_file_range
+--- a/libeatmydata/test/tst-invalidfd.c
 b/libeatmydata/test/tst-invalidfd.c
+@@ -17,6 +17,11 @@
+ 
+ #include 
+ #include 
++
++#ifdef HAVE_SYNC_FILE_RANGE
++#include 
++#endif
++
+ #include 
+ #include 
+ 

diff --git a/sys-fs/libeatmydata/libeatmydata-130.ebuild 
b/sys-fs/libeatmydata/libeatmydata-130.ebuild
new file mode 100644
index ..92dc9a864ca8
--- /dev/null
+++ b/sys-fs/libeatmydata/libeatmydata-130.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+DESCRIPTION="LD_PRELOAD hack to convert sync()/msync() and the like to NO-OP"
+HOMEPAGE="https://www.flamingspork.com/projects/libeatmydata/;
+SRC_URI="https://github.com/stewartsmith/${PN}/releases/download/v${PV}/${P}.tar.gz;
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-util/strace )"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-130-implicit-function-decl-test.patch
+)
+
+multilib_src_configure() {
+   ECONF_SOURCE="${S}" econf
+}
+
+multilib_src_test() {
+   # Sandbox fools LD_PRELOAD and libeatmydata does not get control
+   # feature of sandbox
+   SANDBOX_ON=0 LD_PRELOAD= emake -k check
+}
+
+multilib_src_install_all() {
+   find "${ED}" -name '*.la' -type f -delete || die
+
+   dodoc AUTHORS README.md
+}

diff --git a/sys-fs/libeatmydata/metadata.xml b/sys-fs/libeatmydata/metadata.xml
index d0fa84d5992b..3516e6b66e7b 100644
--- a/sys-fs/libeatmydata/metadata.xml
+++ b/sys-fs/libeatmydata/metadata.xml
@@ -7,6 +7,6 @@
Used as LD_PRELOAD hack to hijack fsync() and open(O_SYNC) 
calls.


-   libeatmydata
+   stewartsmith/libeatmydata

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

2021-06-12 Thread Sergei Trofimovich 
commit: 8288c03b2938ee6122b368dfd3783da4b7d9bf41
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jun 12 10:01:51 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jun 12 10:07:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8288c03b

sys-fs/libeatmydata: drop old

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-fs/libeatmydata/Manifest   |  1 -
 .../files/libeatmydata-105-undpkg.patch| 12 
 sys-fs/libeatmydata/libeatmydata-105-r2.ebuild | 31 -
 sys-fs/libeatmydata/libeatmydata-129.ebuild| 32 --
 4 files changed, 76 deletions(-)

diff --git a/sys-fs/libeatmydata/Manifest b/sys-fs/libeatmydata/Manifest
index f76ee610508..877f14934b9 100644
--- a/sys-fs/libeatmydata/Manifest
+++ b/sys-fs/libeatmydata/Manifest
@@ -1,2 +1 @@
-DIST libeatmydata-105.tar.gz 419427 BLAKE2B 
251fc4226ce16abc16c8a0717cd69621e8c166cf7a7dec1c8782c2a25edcf26e34f1a09bd2b6153a46eb99a6cf4b1adc334db188201b12a27b4a1562ed03
 SHA512 
fb2ac1400d5e3c44bfc952c72f29a4c7234edf5b756a9602ad822c57fbc9813c35d2da9492e2982abf81e0826d278da2d31ee1865e806754e0b387ad699367d4
 DIST libeatmydata-129.tar.gz 358437 BLAKE2B 
448cff19629fa1a07443a52ebe16a7bf9a8ac7d0c2688e89555ed6c9c2369695a70ae2abf1b74152b3c305e6bc019e2e9808af6642122cd10a73deb7dfb580f2
 SHA512 
dbd0ea4df77034ecbb75955394b15aec6f1331205a5c7aa4a6e0595e3e486bbcc81c28a264bf5441c660563f74bfb06630da98373d481a2ebd9e9b1538c109d1

diff --git a/sys-fs/libeatmydata/files/libeatmydata-105-undpkg.patch 
b/sys-fs/libeatmydata/files/libeatmydata-105-undpkg.patch
deleted file mode 100644
index 41362d1c253..000
--- a/sys-fs/libeatmydata/files/libeatmydata-105-undpkg.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Don't rely on debian's way to multilib/multiarch.
-
-https://bugs.gentoo.org/550344
 a/eatmydata.in
-+++ b/eatmydata.in
-@@ -17,5 +17,4 @@
- 
--export `dpkg-architecture|grep DEB_BUILD_MULTIARCH`
-+shlib="@libexecdir@/eatmydata.sh"
- 
--shlib="/usr/lib/$DEB_BUILD_MULTIARCH/eatmydata.sh"
- if [ -f "$shlib" ]; then

diff --git a/sys-fs/libeatmydata/libeatmydata-105-r2.ebuild 
b/sys-fs/libeatmydata/libeatmydata-105-r2.ebuild
deleted file mode 100644
index 0d1428d550b..000
--- a/sys-fs/libeatmydata/libeatmydata-105-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="LD_PRELOAD hack to convert sync()/msync() and the like to NO-OP"
-HOMEPAGE="https://launchpad.net/libeatmydata/;
-SRC_URI="https://launchpad.net/${PN}/trunk/release-${PV}/+download/${P}.tar.gz;
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# sandbox fools LD_PRELOAD and libeatmydata does not get control
-# feature of sandbox
-#DEPEND="test? ( dev-util/strace )"
-RESTRICT=test
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-105-undpkg.patch
-)
-
-ECONF_SOURCE="${S}"
-
-multilib_src_install_all() {
-   find "${D}" -name '*.la' -type f -delete || die
-
-   dodoc AUTHORS README
-}

diff --git a/sys-fs/libeatmydata/libeatmydata-129.ebuild 
b/sys-fs/libeatmydata/libeatmydata-129.ebuild
deleted file mode 100644
index bb2148e907e..000
--- a/sys-fs/libeatmydata/libeatmydata-129.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="LD_PRELOAD hack to convert sync()/msync() and the like to NO-OP"
-HOMEPAGE="https://www.flamingspork.com/projects/libeatmydata/;
-SRC_URI="https://github.com/stewartsmith/${PN}/releases/download/v${PV}/${P}.tar.gz;
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-util/strace )"
-
-ECONF_SOURCE="${S}"
-
-multilib_src_test() {
-   # sandbox fools LD_PRELOAD and libeatmydata does not get control
-   # feature of sandbox
-   SANDBOX_ON=0 LD_PRELOAD= emake -k check
-}
-
-multilib_src_install_all() {
-   find "${D}" -name '*.la' -type f -delete || die
-
-   dodoc AUTHORS README.md
-}