gentoo auto-resync : 29:05:2023 - 21:18:33

6 files changed, 28 insertions, 144 deletions

diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index c1a11afa0b39..9e9aef5b3fe2 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1,4 +1,3 @@
-AUX apr-1.5.0-mint.patch 872 BLAKE2B dda2941cbed87117a8a6c488bd8045894686aef0ba219ff489f67dd03b58fb07a05f9e67c54cdff330c65e579c41c992446a465104661bbacbb2525a5b9518eb SHA512 ba71f17ef9f61a8379139f05ca17eb583ad34cbc3ebf5c4f59d011662db6b5c963da5c466c093c3eb98372299d8f202d927a05b52cc7515270ac52fe44ec6daf
 AUX apr-1.6.3-skip-known-failing-tests.patch 512 BLAKE2B 29607bce9a35853d824f8872557f361f3d5ffa0f2c7cd35e06cbf4d449e54f1b12978c0220b8ce4ae5d590ee9e04b5cd77af22876e3880deef115efbeb5a1dcc SHA512 ac097d28d5ae0b2437522da0578ff8bd049190d8df576e4e5298426f827b2bf69891e4f33bd1ffaf1a3c53143927e71f10d8362567121faa03cdf908d4fbc6c2
 AUX apr-1.7.2-autoconf-2.72.patch 570 BLAKE2B 6cfe6c2b00c3d0ac1f5776d546366355be3139a06c0b6229ee2830f1c8c019b16701f9404fda0071c085161461476271a7930c95ec0b6501c4a2df23a371b3fa SHA512 b44805e747c441407b01ae26e06eb1e16f4e5334f097e9eab3c41a4ed39978f483065eadc9a4514a11bf246080ea120f9b594c712d282c2be638a5eb01dc2fbb
 AUX apr-1.7.2-fix-pkgconfig-libs.patch 963 BLAKE2B fb36bb31050286064e17c2a9c9f3d48ce9c0e42f8ee6cfcfa45ec79ad57670acf953f273d83419d3b053a38d9786600a240b8b082615e0e1fe7f15dcd2793e6c SHA512 0d8bb84b71f6f9f590afc15a48010383ef6b5b84b2b64fcbb9489adefa32137a1af7c0b7b216dd18f9c04b92492772f2d9f9564b9fbfbffc019bed8e43818cfe
@@ -9,8 +8,8 @@ AUX config.layout.patch 745 BLAKE2B 9877db3d76339b70f2bd354d118eff0df4d63bc81e4a
 DIST apr-1.7.2.tar.bz2 890218 BLAKE2B a17ee4311a33acee0bdeb9e5225a198f9dec1b2e0267a742080c77d5342e5052392a5a2100a0ba85f5a192b8679838a7002d4c9a12aa5bdd7921eff025b75d15 SHA512 0a3a27ccc97bbe4865c1bc0b803012e3da6d5b1f17d4fb0da6f5f58eec01f6d2ae1f25e52896ea5f9c5ac04c5fddcfd1ac606b301c322cf40d5c4d4ce0a1b76e
 DIST apr-1.7.3.tar.bz2 901048 BLAKE2B effd809ff2d43c5340874456c6440c94c3c1dc728964d6b65050e0e11692961ccbedba63fd02009c79fa05bb8effde7cc46d2b22c560745d49d54f0a793e4b6d SHA512 d8f62868d8e3ec92cede1f0d93b5d48e49441f575c98e165ff84343746a6abd265290ab16a57f741896ae7a6b3e534a334325a99a61c96c2485e085f7761c124
 DIST apr-1.7.4.tar.bz2 894526 BLAKE2B a93b9d3f2c46fe0a34ce1d544e7a43ba40720e2fae8b8a7d0957413ac695057902378dbf96f067ced7486da86c8e513b7fbd48fa79839efeeb40a3295fe2d3df SHA512 2342c997765ea2ca96eac158e5fd260232dba68fc41b90a79a7ba9b25c539fc217981867362090e0ebebe632289257c342275e3c5baedb698c474ef8f49a9dcd
-EBUILD apr-1.7.2-r1.ebuild 4572 BLAKE2B f56d372b5d9b2fe160c14e407ad0d190cbd3a9da9de45c6a4d2868faa4452fb461b84fc0eb40a52b74139359b5d4f7b8cb86c153d6db673645d3e9c1cccb890c SHA512 618ea824f577291b6a1956cd9d830d6cd331c02a2908b4150d22a679ceab6c9f4d33271ddd3b084d1a4833c72895ad060aff41666fd64a40adc3e93a3c647aa5
-EBUILD apr-1.7.2.ebuild 4518 BLAKE2B f39d80075a71914f0a599dd91af2caa561cc8b09cb05c47098f20a4748af73f909ece3a4e771d01ee76c663fd06ed2cf3c3e1635e4e8ebfac61afa2b06d6a0f4 SHA512 2dbe0dd1773714ef76aa03b2051dae0db7d1645884a57549931d2495914be901a77e7f9632f790ebb4e7fdb7cb68bce322a8ac2b938939e6eed8611251123785
-EBUILD apr-1.7.3.ebuild 4572 BLAKE2B f56d372b5d9b2fe160c14e407ad0d190cbd3a9da9de45c6a4d2868faa4452fb461b84fc0eb40a52b74139359b5d4f7b8cb86c153d6db673645d3e9c1cccb890c SHA512 618ea824f577291b6a1956cd9d830d6cd331c02a2908b4150d22a679ceab6c9f4d33271ddd3b084d1a4833c72895ad060aff41666fd64a40adc3e93a3c647aa5
-EBUILD apr-1.7.4.ebuild 4647 BLAKE2B 137d94649aafc8572a7f03ebb9b2ec94023a5d6019c28453da3105aef5c4f61bd775c4705e981c4f1114802a5b1e1631790b27325491d4e751af3b98c4f4f31d SHA512 2e59ee8376ea27a1813a00ad0aa59d54389dfa5ab3fd4bb3232200109a2e873530e8f929b61ceeeb71ee65dfa3cac50e2d8bdbdb411ecc4402911fe20e14e98e
+EBUILD apr-1.7.2-r1.ebuild 3747 BLAKE2B 930ea9f82e48a1d53f9658f00f5a144549814d5e95febb08f232f0f12a716a305f76cdb6670017fb8973ed33e5b30ac532f97268b119a9001192cee94d18e5c1 SHA512 831a343f765fc6cdd33c5e773838a9c125c2a94b9e88923843a5fbd6e683d32aa6aedd93dedefab379c710a36bca4565eb18b15014293ae330cc50cae35d4382
+EBUILD apr-1.7.2.ebuild 3693 BLAKE2B 214f0a25eb988f0198c343ecf422fd4d6b510009049a21469ed55726c1c83271811a37e665faa35e4e6a74d352a861343e3f9f96b8961dee5ac8ed7a47a127fb SHA512 dce3f7ad05ddcbbb637254c47f776200aff8dc6cd3178dad9613c490a1cee7bfac42622f8c22fa9b9b82c901e1dd2281f0acb03649dc4357f3b7b45c3b486036
+EBUILD apr-1.7.3.ebuild 3741 BLAKE2B 88f85efbcafea7bf473daf725f61bcd259207aa9802c0d3b784583146b97e1eac1ecffadcab9a920126557c190d1342237cfe2759ace0b71d1a6225522a12db8 SHA512 45ff76a68141d32613a8927bdb10d448f443d4e2665e3ca6136498ed770d33edfcd57d59c6ead78eb62d2d954dc979838ca989ca0c42de75d3ce23e7f19c9199
+EBUILD apr-1.7.4.ebuild 3822 BLAKE2B 26a8fa98b5195b33a92d2befb5591d487f0409e35a4839ae19e3cd57f62b6684e86cd1a853caaaa7f2bae824ec14b78de26ad2f75545d7b5d9f97ac6d74b6916 SHA512 d045dca75492bc88d1764243eafd47a13fb796b0bccda494a5e619d7504e01d27a8ebae90f8c08dc9ba6f08c51230dbd8710e3f999dfa304a072291be2cfc607
 MISC metadata.xml 487 BLAKE2B 826e5b4b8b87d0077f1b2063ae1c808447987ddea524eeb4cdd17d60bea8b3919a2a714cdb0706cf758dfcf86109b702399c04dd054872d8465e1f6b3469c795 SHA512 9e8fbae61974080394151944ca7e2fec92a6c99b2c2fe75dc2486dced890933ac4694c8ac2984504bbfe42706bed6895b7d5fe9f9a9ced96c5c0ead8016f4366
diff --git a/dev-libs/apr/apr-1.7.2-r1.ebuild b/dev-libs/apr/apr-1.7.2-r1.ebuild
index 7986ed4088df..e1c446e9551f 100644
--- a/dev-libs/apr/apr-1.7.2-r1.ebuild
+++ b/dev-libs/apr/apr-1.7.2-r1.ebuild
@@ -31,7 +31,6 @@ BDEPEND="
 DOCS=( CHANGES NOTICE README )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0-mint.patch
 	"${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
 	"${FILESDIR}"/${PN}-1.7.2-libtool.patch
 	"${FILESDIR}"/${PN}-1.7.2-sysroot.patch # bug #385775
@@ -96,38 +95,16 @@ src_configure() {
 
 	if use urandom; then
 		myconf+=( --with-devrandom=/dev/urandom )
-	elif (( ${CHOST#*-hpux11.} <= 11 )); then
-		: # no /dev/*random on hpux11.11 and before, apr detects this.
 	else
 		myconf+=( --with-devrandom=/dev/random )
 	fi
 
-	# shl_load does not search runpath, but hpux11 supports dlopen
-	if [[ ${CHOST} == *-hpux11* ]]; then
-		myconf+=( --enable-dso=dlfcn )
-	elif [[ ${CHOST} == *-solaris2.10 ]]; then
-		local atomic_contents=$(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h)
-
-		case "${atomic_contents}" in
-			*atomic_cas_ptr*)
-				;;
-			*)
-				local patch_id=$([[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885)
-
-				elog "You do not have Solaris Patch ID ${patch_id} (Problem 4954703) installed on your host ($(hostname)),"
-				elog "using generic atomic operations instead."
-
-				myconf+=( --disable-nonportable-atomics )
-				;;
-		esac
-	else
-		if use ppc || use sparc || use mips; then
-			# Avoid libapr containing undefined references (underlinked)
-			# undefined reference to `__sync_val_compare_and_swap_8'
-			# (May be possible to fix via libatomic linkage in future?)
-			# bug #740464
-			myconf+=( --disable-nonportable-atomics )
-		fi
+	if use ppc || use sparc || use mips; then
+		# Avoid libapr containing undefined references (underlinked)
+		# undefined reference to `__sync_val_compare_and_swap_8'
+		# (May be possible to fix via libatomic linkage in future?)
+		# bug #740464
+		myconf+=( --disable-nonportable-atomics )
 	fi
 
 	econf "${myconf[@]}"
diff --git a/dev-libs/apr/apr-1.7.2.ebuild b/dev-libs/apr/apr-1.7.2.ebuild
index 13fff2505e42..2bac56d69761 100644
--- a/dev-libs/apr/apr-1.7.2.ebuild
+++ b/dev-libs/apr/apr-1.7.2.ebuild
@@ -31,7 +31,6 @@ BDEPEND="
 DOCS=( CHANGES NOTICE README )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0-mint.patch
 	"${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
 	"${FILESDIR}"/${PN}-1.7.2-libtool.patch
 	"${FILESDIR}"/${PN}-1.7.2-sysroot.patch # bug #385775
@@ -95,38 +94,16 @@ src_configure() {
 
 	if use urandom; then
 		myconf+=( --with-devrandom=/dev/urandom )
-	elif (( ${CHOST#*-hpux11.} <= 11 )); then
-		: # no /dev/*random on hpux11.11 and before, apr detects this.
 	else
 		myconf+=( --with-devrandom=/dev/random )
 	fi
 
-	# shl_load does not search runpath, but hpux11 supports dlopen
-	if [[ ${CHOST} == *-hpux11* ]]; then
-		myconf+=( --enable-dso=dlfcn )
-	elif [[ ${CHOST} == *-solaris2.10 ]]; then
-		local atomic_contents=$(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h)
-
-		case "${atomic_contents}" in
-			*atomic_cas_ptr*)
-				;;
-			*)
-				local patch_id=$([[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885)
-
-				elog "You do not have Solaris Patch ID ${patch_id} (Problem 4954703) installed on your host ($(hostname)),"
-				elog "using generic atomic operations instead."
-
-				myconf+=( --disable-nonportable-atomics )
-				;;
-		esac
-	else
-		if use ppc || use sparc || use mips; then
-			# Avoid libapr containing undefined references (underlinked)
-			# undefined reference to `__sync_val_compare_and_swap_8'
-			# (May be possible to fix via libatomic linkage in future?)
-			# bug #740464
-			myconf+=( --disable-nonportable-atomics )
-		fi
+	if use ppc || use sparc || use mips; then
+		# Avoid libapr containing undefined references (underlinked)
+		# undefined reference to `__sync_val_compare_and_swap_8'
+		# (May be possible to fix via libatomic linkage in future?)
+		# bug #740464
+		myconf+=( --disable-nonportable-atomics )
 	fi
 
 	econf "${myconf[@]}"
diff --git a/dev-libs/apr/apr-1.7.3.ebuild b/dev-libs/apr/apr-1.7.3.ebuild
index 7986ed4088df..3dc1fa16ac8a 100644
--- a/dev-libs/apr/apr-1.7.3.ebuild
+++ b/dev-libs/apr/apr-1.7.3.ebuild
@@ -31,7 +31,6 @@ BDEPEND="
 DOCS=( CHANGES NOTICE README )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0-mint.patch
 	"${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
 	"${FILESDIR}"/${PN}-1.7.2-libtool.patch
 	"${FILESDIR}"/${PN}-1.7.2-sysroot.patch # bug #385775
@@ -96,38 +95,15 @@ src_configure() {
 
 	if use urandom; then
 		myconf+=( --with-devrandom=/dev/urandom )
-	elif (( ${CHOST#*-hpux11.} <= 11 )); then
-		: # no /dev/*random on hpux11.11 and before, apr detects this.
-	else
 		myconf+=( --with-devrandom=/dev/random )
 	fi
 
-	# shl_load does not search runpath, but hpux11 supports dlopen
-	if [[ ${CHOST} == *-hpux11* ]]; then
-		myconf+=( --enable-dso=dlfcn )
-	elif [[ ${CHOST} == *-solaris2.10 ]]; then
-		local atomic_contents=$(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h)
-
-		case "${atomic_contents}" in
-			*atomic_cas_ptr*)
-				;;
-			*)
-				local patch_id=$([[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885)
-
-				elog "You do not have Solaris Patch ID ${patch_id} (Problem 4954703) installed on your host ($(hostname)),"
-				elog "using generic atomic operations instead."
-
-				myconf+=( --disable-nonportable-atomics )
-				;;
-		esac
-	else
-		if use ppc || use sparc || use mips; then
-			# Avoid libapr containing undefined references (underlinked)
-			# undefined reference to `__sync_val_compare_and_swap_8'
-			# (May be possible to fix via libatomic linkage in future?)
-			# bug #740464
-			myconf+=( --disable-nonportable-atomics )
-		fi
+	if use ppc || use sparc || use mips; then
+		# Avoid libapr containing undefined references (underlinked)
+		# undefined reference to `__sync_val_compare_and_swap_8'
+		# (May be possible to fix via libatomic linkage in future?)
+		# bug #740464
+		myconf+=( --disable-nonportable-atomics )
 	fi
 
 	econf "${myconf[@]}"
diff --git a/dev-libs/apr/apr-1.7.4.ebuild b/dev-libs/apr/apr-1.7.4.ebuild
index 727cb2ad663c..e2253cffa218 100644
--- a/dev-libs/apr/apr-1.7.4.ebuild
+++ b/dev-libs/apr/apr-1.7.4.ebuild
@@ -32,7 +32,6 @@ BDEPEND="
 DOCS=( CHANGES NOTICE README )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0-mint.patch
 	"${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
 	"${FILESDIR}"/${PN}-1.7.2-libtool.patch
 	"${FILESDIR}"/${PN}-1.7.2-sysroot.patch # bug #385775
@@ -98,38 +97,16 @@ src_configure() {
 
 	if use urandom; then
 		myconf+=( --with-devrandom=/dev/urandom )
-	elif (( ${CHOST#*-hpux11.} <= 11 )); then
-		: # no /dev/*random on hpux11.11 and before, apr detects this.
 	else
 		myconf+=( --with-devrandom=/dev/random )
 	fi
 
-	# shl_load does not search runpath, but hpux11 supports dlopen
-	if [[ ${CHOST} == *-hpux11* ]]; then
-		myconf+=( --enable-dso=dlfcn )
-	elif [[ ${CHOST} == *-solaris2.10 ]]; then
-		local atomic_contents=$(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h)
-
-		case "${atomic_contents}" in
-			*atomic_cas_ptr*)
-				;;
-			*)
-				local patch_id=$([[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885)
-
-				elog "You do not have Solaris Patch ID ${patch_id} (Problem 4954703) installed on your host ($(hostname)),"
-				elog "using generic atomic operations instead."
-
-				myconf+=( --disable-nonportable-atomics )
-				;;
-		esac
-	else
-		if use ppc || use sparc || use mips; then
-			# Avoid libapr containing undefined references (underlinked)
-			# undefined reference to `__sync_val_compare_and_swap_8'
-			# (May be possible to fix via libatomic linkage in future?)
-			# bug #740464
-			myconf+=( --disable-nonportable-atomics )
-		fi
+	if use ppc || use sparc || use mips; then
+		# Avoid libapr containing undefined references (underlinked)
+		# undefined reference to `__sync_val_compare_and_swap_8'
+		# (May be possible to fix via libatomic linkage in future?)
+		# bug #740464
+		myconf+=( --disable-nonportable-atomics )
 	fi
 
 	econf "${myconf[@]}"
diff --git a/dev-libs/apr/files/apr-1.5.0-mint.patch b/dev-libs/apr/files/apr-1.5.0-mint.patch
deleted file mode 100644
index cfe039e962c6..000000000000
--- a/dev-libs/apr/files/apr-1.5.0-mint.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- apr-1.5.0/build/apr_hints.m4
-+++ apr-1.5.0/build/apr_hints.m4
-@@ -45,6 +45,8 @@
-   case "$host" in
-     *mint)
- 	APR_ADDTO(CPPFLAGS, [-DMINT -D_GNU_SOURCE])
-+	apr_cv_pthreads_cflags="none"
-+	apr_cv_pthreads_lib="-lpthread"
- 	;;
-     *MPE/iX*)
- 	APR_ADDTO(CPPFLAGS, [-DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE])
---- apr-1.5.0/build/apr_threads.m4
-+++ apr-1.5.0/build/apr_threads.m4
-@@ -198,7 +198,7 @@
- AC_DEFUN([APR_CHECK_SIGWAIT_ONE_ARG], [
-   AC_CACHE_CHECK(whether sigwait takes one argument,ac_cv_sigwait_one_arg,[
-   AC_TRY_COMPILE([
--#if defined(__NETBSD__) || defined(DARWIN)
-+#if defined(__NETBSD__) || defined(DARWIN) || defined(MINT)
-     /* When using the unproven-pthreads package, we need to pull in this
-      * header to get a prototype for sigwait().  Else things will fail later
-      * on.  XXX Should probably be fixed in the unproven-pthreads package.