gentoo auto-resync : 07:02:2023 - 03:23:23

6 files changed, 65 insertions, 10 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index c86119fd188c..d8eea9a32114 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/autorun/Manifest b/sys-fs/autorun/Manifest
index 98ed66ec15f1..c8398c8fb951 100644
--- a/sys-fs/autorun/Manifest
+++ b/sys-fs/autorun/Manifest
@@ -1,4 +1,4 @@
-AUX autorun-3.17-headers.patch 229 BLAKE2B 5253f4c30e74baf5ca73235b69e31e5e78db1ed2a5ea829622e880337ae37351397d320577c1d19d6deb8bb4d169e1d36667a9204d3bd22c1708552e3bc242c6 SHA512 6e76e2d2e53bf9af7028bb873957789da1b906290189e82849a47a459449fe7455c19f007491ed5e3b35b97891973c8891d3250f7b559813a5f25ae3ada43225
+AUX autorun-3.17-headers.patch 1087 BLAKE2B fe60a569433249709bc54559df0f82823786b7192c63dc9b7bdfa71da723fe1fae653f7b242160fda0d52d7c1bdf0aafeb1f53f40f207ce0d32ae4c6b4f9c451 SHA512 6a104a93f54c8759a835f460e5228b6551463a007fcd51409a6235f1f99363e33e0c5a4a510a8de8e8fae3a49388e71d45369a4eb595933065aec86a7c246712
 DIST autorun-3.17.tar.gz 481168 BLAKE2B 4c217c050c72cfebd04743a5fc99d409c21bfc0f239446a1c0a9901c0a5c7c1523c649f28ae62d00491d34e3b9c5e44cff6b984a97927ec83e5e373d21b8360b SHA512 cb3885fa578616013ec66658c31caa49240b77c10f18c1597d7583d0efa5318c716d8ed468f3387702e94353c0db8c74f202a736278cde563c99d2337cdac11e
 EBUILD autorun-3.17.ebuild 490 BLAKE2B b1ae40cadf0ef1b854c78786fc260e63241066ce87e9748ecd32d7356c3116a86c8cd32596714b93a32139b5d8e6cc601e9a3339362426ee17e6d54987ee33bd SHA512 fd37b94f0a121b3a2a9f0c9b3131f166969fbc68c623413ac64eeaec4692fa62d5b876fc9f5bff51869e28e67d100bb6cccce21317a4d5deb063cf21c372ad25
 MISC metadata.xml 328 BLAKE2B 9f6629b1e36b400c19333ba991661a8496c645e1bc88bb43a71449791ad8f25235297d93cc6853e2ce132f940ceb5b98d171b88c325d669715e5a1110d94eef0 SHA512 c180a6e200555e2d02ee9dcee44ccd12e9289bfac58e9c2d541c069d535c96f89f7bc97d4d29f9aee22042b24a8c86e78476c029c18a2a5977f39f0fe8d07898
diff --git a/sys-fs/autorun/files/autorun-3.17-headers.patch b/sys-fs/autorun/files/autorun-3.17-headers.patch
index 4fc487d656b3..113367305af0 100644
--- a/sys-fs/autorun/files/autorun-3.17-headers.patch
+++ b/sys-fs/autorun/files/autorun-3.17-headers.patch
@@ -1,5 +1,6 @@
 https://bugs.gentoo.org/251684
-
+https://bugs.gentoo.org/875851
+https://bugs.gentoo.org/877125
 --- a/autorun.cc
 +++ b/autorun.cc
 @@ -90,6 +90,8 @@ char *strchr (), *strrchr ();
@@ -11,3 +12,44 @@ https://bugs.gentoo.org/251684
  #ifndef MNTTYPE_ISO9660
  #define MNTTYPE_ISO9660 "iso9660"
  #endif
+--- a/autorun.cc
++++ b/autorun.cc
+@@ -26,20 +26,6 @@
+ #define HAVE_ARGP
+ #endif
+ 
+-#if STDC_HEADERS
+-# include <string.h>
+-#else
+-# if !HAVE_STRCHR
+-#  define strchr index
+-#  define strrchr rindex
+-# endif
+-char *strchr (), *strrchr ();
+-# if !HAVE_MEMCPY
+-#  define memcpy(d, s, n) bcopy ((s), (d), (n))
+-#  define memmove(d, s, n) bcopy ((s), (d), (n))
+-# endif
+-#endif
+-
+ #include <sys/types.h>
+ #if HAVE_SYS_WAIT_H
+ # include <sys/wait.h>
+@@ -78,6 +64,8 @@ char *strchr (), *strrchr ();
+ #include <stdarg.h>
+ #include <mntent.h>
+ #include "cdrom.h"
++#include <cstring>
++#include <climits>
+ #include <list>
+ #include <iostream>
+ #include <libintl.h>
+@@ -88,7 +76,7 @@ char *strchr (), *strrchr ();
+ #include <getopt.h>
+ #endif
+ 
+-#include <errno.h>
++#include <cerrno>
+ 
+ #include <stdlib.h>
+ 
diff --git a/sys-fs/ext3grep/Manifest b/sys-fs/ext3grep/Manifest
index b370838ec4ab..830f1d7359f2 100644
--- a/sys-fs/ext3grep/Manifest
+++ b/sys-fs/ext3grep/Manifest
@@ -1,7 +1,8 @@
 AUX ext3grep-0.10.1-gcc44.patch 7824 BLAKE2B b0c7bb82f81f088388836d3d8c92496d164043592c97a5a97570f4db38128fb24fc8ba761e9f59f900e161214285f261bc978f3fe1341d7ec45e2cc76bb2d591 SHA512 11404bb9f606a223f328068d7b42911a49df05a0bee68e88e15b58c66964357bab1888af4a3284f3ea7ed559753ac7c80d4db59c63b53ee52117b8c92aae5607
 AUX ext3grep-0.10.2-include-unistd_h-for-sysconf.patch 271 BLAKE2B b06c18ab18b5b1278883155dfefc3e0b4aff93e1fcfd2a500c92ada7ad10df56823564deb0acf1bfcb0c4453c2280cb27232bbf01be6567692ba2e4b0f2e395a SHA512 ea47220fc10d18bcaa6dbd9e89c94a9248f5af11d8f314a148edb1e99c9d655f753a9d8b3a33f0f3f20bc82eaa80cfd509b6d4255ff32b4977269a05af6f8e1e
+AUX ext3grep-0.10.2-missing-cassert-include.patch 227 BLAKE2B 9bd2d32865d3e16ee9ee0190299e334df27a15da2dab175618104bd421866a4b513e5dc672be5dc5221b7e3b4bffe9d99218a5db0d0aad085f36c598d20f9fd1 SHA512 3c638bed6d954c99063b7a510e4476a992b2ce245594b5783becf152b18cb567358b1e4e15083d712669866dcb71bb2869574d73f84ead0ea67d41247bb23c90
 AUX ext3grep-0.10.2-new-e2fsprogs.patch 1478 BLAKE2B aa7daaae9984f524b59a7391268f301d8570bf8e48ffea686cd65e98db950351ba9fe43b9da93925c636aef78749b00acf0aa72d57b08bb2817b229497019875 SHA512 f16b5ed428c7bd1bf453d331eb1c114a13a2ec7fdc19d61b9788c5f4f3e5d4d85c013c738e04dbea12967a678d81bddedb60e573ac97c801efffa3ef27774e19
 AUX ext3grep-0.10.2-newer-e2fsprogs.patch 1111 BLAKE2B c4343f4d8ad9d6e4c1b52f1dc41ab42d4de97e2185279cdc018ac3de7824ed2ca09eea8a9bd79d22628ccd2fb37b0e94bfaf27bfdc1e78da11a0ed0411ad432f SHA512 321d303e8f8e12270ee40f64418888e5a23347d33b978aec4979c87ceb21f70c970736087175ce141024997332f0772444cee9baab3758d2aab08d7d84b05faa
 DIST ext3grep-0.10.2.tar.gz 236364 BLAKE2B 0352e00a20c6a1486e4ddc0b80c9dcc9afa383775bb4ca6bcc83d2761b2901a9344ccd66f96e4a3e4b02177730f4e27b444695ba0644a5c42c4f3105618288ff SHA512 301a65c91d2342753a4588c40d496114067a18ceceb999f10fe3fc49c7d3a20c7836dba915575db352c89de7ff0ed3553cd8fbd2d1540109cb0ff7fa8f530b6f
-EBUILD ext3grep-0.10.2.ebuild 733 BLAKE2B 9f93845eaee2b993c8fc47c389bf63c8d0d4cc100a8ae749a6877f79461476c4d3c3dad2520f7cc2943eb17a382ce1aad17d77a580e77618f7425410a98d8292 SHA512 462bec287c7ab79daa485b4649abca01e2cf3046a05cacd304e8db691262bf37e20a322da4d4e4c212562b1706906260ff45645c5a29b972e1375edcd7823232
+EBUILD ext3grep-0.10.2-r1.ebuild 778 BLAKE2B b4f3267a0e56dcc77be3393d518919d51d0fedb59724ba1953d3cb8b8fd7a1da954d3b764236f239d5b44ec1e0524df011d12d64eaf6e0ff99c9334636eecd8a SHA512 68e4f652b7d27a6794383c3a594bbde7e8db77f298dc73c1f4d1847226e9785058f474b9d1287fabf6d9a66eaa6f132916a340bcd38d7dab963448b714fc2d8b
 MISC metadata.xml 295 BLAKE2B 78fd1bd49fbcee6b961da117736ab0801ea68eb1f7a63f8844bfbce88a051e4f3b0734e75c4d9b1bdc3ab31f7fd694314a8bd8cee653f82cd08950700e65f850 SHA512 674a418d6ddb0df5b9260b4f3160c409afbb030d19c20e3777344d218039cad2b41244767b3f9bb300a29dc186bded3d167f175f8842b4bfa137ab7880b36176
diff --git a/sys-fs/ext3grep/ext3grep-0.10.2.ebuild b/sys-fs/ext3grep/ext3grep-0.10.2-r1.ebuild
index 1c8c5533ad98..6be20c71aa3f 100644
--- a/sys-fs/ext3grep/ext3grep-0.10.2.ebuild
+++ b/sys-fs/ext3grep/ext3grep-0.10.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Recover deleted files on an ext3 file system"
 HOMEPAGE="https://code.google.com/p/ext3grep/"
@@ -12,21 +12,22 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug pch"
 
-DEPEND="sys-fs/e2fsprogs
+DEPEND="
+	sys-fs/e2fsprogs
 	virtual/os-headers
-	virtual/pkgconfig"
-
-DOCS="NEWS README"
+"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.10.1-gcc44.patch"
 	"${FILESDIR}/${P}-include-unistd_h-for-sysconf.patch"
 	"${FILESDIR}/${P}-new-e2fsprogs.patch"
 	"${FILESDIR}/${P}-newer-e2fsprogs.patch"
+	"${FILESDIR}/${P}-missing-cassert-include.patch"
 )
 
 src_configure() {
-	myeconfargs=(
+	local myeconfargs=(
 		$(use_enable debug)
 		$(use_enable pch)
 	)
diff --git a/sys-fs/ext3grep/files/ext3grep-0.10.2-missing-cassert-include.patch b/sys-fs/ext3grep/files/ext3grep-0.10.2-missing-cassert-include.patch
new file mode 100644
index 000000000000..34e60b00a659
--- /dev/null
+++ b/sys-fs/ext3grep/files/ext3grep-0.10.2-missing-cassert-include.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/890987
+--- a/src/custom.cc
++++ b/src/custom.cc
+@@ -44,6 +44,7 @@
+ #include "init_consts.h"
+ #include "print_inode_to.h"
+ #include <sys/time.h>
++#include <cassert>
+ #include <cstring>
+ #include <ctime>
+