gentoo auto-resync : 09:01:2023 - 12:18:20

6 files changed, 94 insertions, 49 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 484d160ca2db..d7a9228dabda 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/libeatmydata/Manifest b/sys-fs/libeatmydata/Manifest
index 46e539b3dc23..a465ee96c6a5 100644
--- a/sys-fs/libeatmydata/Manifest
+++ b/sys-fs/libeatmydata/Manifest
@@ -1,4 +1,7 @@
 AUX libeatmydata-130-implicit-function-decl-test.patch 611 BLAKE2B cd8fa997d0dd36d0414cd8b1bec9fc82616444a2db0e61ff5fd1e773c1800bb1294b0ae8134d67061b0baded60a1ec890f31ecc6791ea87c811a14338be9d64c SHA512 a4e5e13b8a66723ef813328ef67b62ee33bcb84173eed76ada886c2a5c1d316552ed089a404d19effa765f159bae03772738eeaa5a4bddbe000c740d83382ba2
+AUX libeatmydata-131-gnu_source.patch 1941 BLAKE2B abf46ff6eb4dc0547e1dc758384df86794564fd2fb337404374788690e850013be71d79c8054d320788fe98cb980986cb47998d20ad545506a8d630d1ac238de SHA512 c5ddcca4fd02c1245d494a5945df0e392b4f10f4320a3c625caf53281d89eeee225035ff502916124b25bbdc908fd7b48506da23e60f7179190e65036e359c20
 DIST libeatmydata-130.tar.gz 375627 BLAKE2B a1f65050572e8a7fc8345082a12e2831a8fb1e68e1d198ae507752375b2081a79fa6e5e589028104cd9d767d86b4d453c0eac0ad7f366c90d6734f5868f8e0cd SHA512 80edeee1b39e14d10e7d04d7fff63a233119c6e13216e92ec786cc41ecd79eb58937da0e621aaef697490e9fb285f3e1109b786ee6967fa1736bb4879e100f18
+DIST libeatmydata-131.tar.gz 368469 BLAKE2B 1b59f80ba72caeafa40272c5996e0fb03774c69c35d7a2194d312e53c48212caca84abed56ec63a9fba2b4142efbee4aa371c3869a76f8c5674936ffe0daea5d SHA512 064417dc085cb82e4baf1d160fcde2c6e0d9fed60e5c595799630b030053c373d888853055894c127c5b384be9204e8bbb251877651811b5fc5cdca8ffd9cf42
 EBUILD libeatmydata-130.ebuild 943 BLAKE2B ad8fe9386fe35838aba815f8b24d22e631612750d0f9b14ec0bfbabe9dce4a027b28ae38a817f33810687f731f4bb12e3128a85efbdeced97e2156e4e0634386 SHA512 46f166d40c734e48c09f87f2126ad9d9d4afa74b999785b4e3f6512f2bb494fbff6a8ecbea01db8d29067b88e1546e0505c359e90b9b08300281d2c7b96093a2
+EBUILD libeatmydata-131.ebuild 929 BLAKE2B 6f90fbd8bc8e702202b348bfe8bbd69c4036eafded49954a955cb3468ba2e1c83de0d62bd6807903e5743dee3cc736ddc73fe106d91c71ac8a360e78786ef574 SHA512 bb7b2cc163b5fbb301d1e1573558fbe0b3fba5f055164f6ece5ab597fd099707f14d85bd0f65d6ef05a8a14eff456c195beddce6434425c14d86583b690fe1ce
 MISC metadata.xml 511 BLAKE2B 34fcc6f9c449e64c078f8e77d41afed2d5acc2ef4f7eb298f1dd35241520c28452d610b216a5811de0dc6bdc79efef7d8ee31d680547674b5e8fd9f2eb47bb17 SHA512 c58ddfef161abdf2775d9e2f8f7eb4850088bd1a8ddbc2cc6a43c26154b48bb571695f6c439275e66b84af8bff7922aecfeabd8a55839260633de530c4a9205c
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 000000000000..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 <sam@gentoo.org>
+Date: Mon, 9 Jan 2023 05:50:13 +0000
+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 <errno.h>
+ #include <fcntl.h>
+ #include <limits.h>
+--- a/libeatmydata/test/tst-invalidfd.c
++++ b/libeatmydata/test/tst-invalidfd.c
+@@ -13,6 +13,7 @@
+  * with this program.  If not, see <http://www.gnu.org/licenses/>.
+  * END LICENSE */
+ 
++#include "config.h"
+ #include "libeatmydata/portability.h"
+ 
+ #include <stdio.h>
+@@ -21,7 +22,6 @@
+ #include <assert.h>
+ 
+ #ifdef HAVE_SYNC_FILE_RANGE
+-#define _GNU_SOURCE
+ #include <fcntl.h>
+ #endif
+ 
diff --git a/sys-fs/libeatmydata/libeatmydata-131.ebuild b/sys-fs/libeatmydata/libeatmydata-131.ebuild
new file mode 100644
index 000000000000..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
+}
diff --git a/sys-fs/mtd-utils/Manifest b/sys-fs/mtd-utils/Manifest
index 9b7e5b4c2a5e..c387ec81e753 100644
--- a/sys-fs/mtd-utils/Manifest
+++ b/sys-fs/mtd-utils/Manifest
@@ -1,6 +1,4 @@
 AUX mtd-utils-2.1.4-glibc-2.36.patch 537 BLAKE2B 14788f3b435c2e4bbb01afed7ce412277a1f72f627fe90b6859e6ed859bb18860312393804e0da868072898684571dc4a6b5398193346025fe0a3878eb4a4c53 SHA512 ce1d72b7edd21d21e3a6a3add78cf146efa39adc34621facb000022bdc2bfbad40e36824d5eeecfca1347f59fa01706f3c4e73ab7ed00f6834235ebe167fa6c8
-DIST mtd-utils-2.1.4.tar.bz2 630365 BLAKE2B 0538ecb90cd1215662cc8493d07e743e067218c1ae1ce09f40343a1ab13f5318d5e198d622a0d69acb2d677cdd3415880689c42afa41877730ff6a546c2b318f SHA512 4010a7b25cf32df2de02b8efbbe91c49789e3963618df7461e4bf64a8c588440c55f17c750a7d2df34367a732b0fefc487ee052129a5aa6a44a0023b714dface
 DIST mtd-utils-2.1.5.tar.bz2 640309 BLAKE2B 94dfd37c10d2759c2fe0b2a7565e2a2aeafdfcaaba2ab9eddc5de2d77658f2702f25004609698585c170839f4e4b685e99004918f1e20cf1ced6925680215427 SHA512 625ee12baf38401c60f6c22d53ed649710417f8d03c6c2217cee890478954e22261428fbf11c713493fb6b7d452ed5af44b0dc9c58133f7b4f52e369353a62c3
-EBUILD mtd-utils-2.1.4-r1.ebuild 952 BLAKE2B 1e7b02e02626649558ef5ce65aab0453cf0c62676b4968b0393a25ffeda3fac89567d0349683304970ffaf747bad7ae00258da449f4ba91f214b857acaf08533 SHA512 7d907aba023347f6eb80b47185cbcf588fee44829b3f0a8b1adc387a624616a3a723a0e6abfcad1abae57802db3358be8a67408c976279c109f8c71f1a40d671
 EBUILD mtd-utils-2.1.5.ebuild 953 BLAKE2B db78555cd51ba15ecb12d5800ef2e0be12f251f3db5ae765069bb7effabde1b8961bbbd5ee0387bee8b678132b9c7a8d24f8f2930ccb816f65b15188b84e413a SHA512 99d985403883d53d85f4f65fb755235427b048334e04028a256f916432ddcc6b7a2ad060b64fea02d3c68937182a51f0ae25285c4882af320e031afa17ea3335
 MISC metadata.xml 589 BLAKE2B 4991d24ee29697e60dd1672008647d8b7ef2f6cf60a64ccf3b1174eecdaf842b81783ecd9995a7b050f98b744546550074b6c2ea509e45f3f42106badbc3deeb SHA512 a3a46acfa94eb80e4220d2e143a929f4a02e1d6708378a4e429b7de4e82bfe1d04aee5868c889c98354b566b58f0512d50f36357f16fa6997afffd0c2177b696
diff --git a/sys-fs/mtd-utils/mtd-utils-2.1.4-r1.ebuild b/sys-fs/mtd-utils/mtd-utils-2.1.4-r1.ebuild
deleted file mode 100644
index 3043d82ddf48..000000000000
--- a/sys-fs/mtd-utils/mtd-utils-2.1.4-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-DESCRIPTION="MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)"
-HOMEPAGE="https://git.infradead.org/?p=mtd-utils.git;a=summary"
-SRC_URI="https://infraroot.at/pub/mtd/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="+lzo xattr +zstd"
-
-DEPEND="
-	sys-apps/util-linux:=
-	sys-libs/zlib:=
-	lzo? ( dev-libs/lzo:= )
-	xattr? ( sys-apps/acl )
-	zstd? ( app-arch/zstd:= )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( jffsX-utils/device_table.txt ubifs-utils/mkfs.ubifs/README )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-glibc-2.36.patch
-)
-
-src_prepare() {
-	default
-	sed -i '/if test.*then/s: == : = :' configure || die
-}
-
-src_configure() {
-	econf \
-		$(use_with lzo) \
-		$(use_with xattr) \
-		$(use_with zstd)
-}
-
-src_install() {
-	default
-	doman \
-		jffsX-utils/mkfs.jffs2.1 \
-		ubi-utils/ubinize.8
-}