gentoo auto-resync : 19:02:2023 - 20:16:03

9 files changed, 107 insertions, 18 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index f678a9df896f..45571bdf5d06 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 2fa5b89406f7..7674a47058d0 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -4,9 +4,9 @@ AUX gdb-12.1-readline-8.2-build.patch 926 BLAKE2B f483dd1054b019d44dd4731ba22113
 AUX gdb-8.3.1-verbose-build.patch 395 BLAKE2B e2e82307ceae64d16aa9b57a5e639eb5d217c4d977aed0847fdf125bb13ebc004906d9afb8e3f629c41efccca88df0040015e7799c1fd24de5fb50f62f5bbd90 SHA512 c2bb013e4fcabefddcd8042bd3cbb53471f83182cc8769fe0d19eed80ccc4a83bd84d120006fa25b3b7d0310dc2f2ec6b44a6ff74909cd312b7e491f371777a3
 DIST gdb-12.1-patches-1.tar.xz 12340 BLAKE2B 071ff492f6cf7b0969d76db6f7414eeec564daf773c3334fb0d3f669e328bb4ae403ba8c709f3e33a56caa92273f762a5597a34dd7e7a1056f473b7ede2d8e59 SHA512 dc4a1a8d501dd1adfdcd6dcbd2559f1e2cc6aadeb18eacb2e9152f6858510e7392253db9568fe782da6d160221412e3e13dfd42a47a2a4a1addba2c1804a45b5
 DIST gdb-12.1.tar.xz 22470332 BLAKE2B 7f6f853d1640908cf2c79932cdc1ba02549a07721c005d9c7ce2946a715761719cc164a4e68235a18664ec8a029afe3a2a0cfb57e1635f280076d6bed91317fd SHA512 425568d2e84672177d0fb87b1ad7daafdde097648d605e30cf0656970f66adc6a82ca2d83375ea4be583e9683a340e5bfdf5819668ddf66728200141ae50ff2d
-DIST gdb-13.0.91.tar.xz 23647304 BLAKE2B a9d03ae7e22711d39e05c2125615f923a317c3df657a781e9194072e6a179e1d9140a42708ccd68e9e37e4ed4d341eda598878de2e3058a7be1c393ef8f622bd SHA512 34453510b3e6c2a01f54a5d7bb4eae0e37a9959014b507bc055f4bddb66a0107c4034918cb6fd79226a08ac4fef5440b050d9d7a384e5b723ebb393ad4748551
+DIST gdb-13.1.tar.xz 23665472 BLAKE2B ab3a77ef35d21597dd1299787eebc422c3ca9764d0866223752c3036c0f9e198bf25ab4730bf6e7025bc2db148c66e98b191e15abc2d69c3088aed146728beef SHA512 e65054ffbc0357eeed4b17e1edc5ef45aa73c9ddf3b1210651e3d859576e27c1d27b266800fe26328eda58857455ccd8632f4000cfc5f63f90854096290187ca
 EBUILD gdb-12.1-r3.ebuild 8100 BLAKE2B 48a993f5a5319bb9326a1f045b4b4ca2706011f77a4c1ef96c135bff3aacf3a7b2e20862645f443f7558c405ea1864e2d8251407a5e208fce6817e0079c6cc50 SHA512 9519decae94744ffa27371879b222f21be38036b8b5642be4a37fc5d2930e2f92ede7373b0e56f66208d57a6d36b94762e9395cd42e89c55bfedc90f05bf0e98
 EBUILD gdb-12.1-r4.ebuild 8352 BLAKE2B b70813155233f843c45cc853b4b1d5d14d9abc861fd9d244c67b14fe6e708cbc452fdc0064f8e0183c247c0c62ffb9e1390f843ad0b7344c75a177570a8fb4b5 SHA512 1d407f528c52b3b7930df48658d9c956fd7ff1416cb9e8ca01325febf689b69fbcffaa60fb55245a3e98de46c55a5390a5d63d3748be8da0b39a83a5519a42f6
-EBUILD gdb-13.0.91.ebuild 8678 BLAKE2B 1dfc0997bf77f4de49ac4e471021b1e06794e1ca7561f415ded8d8a056b1cb8793127d1220f6c361c05ec4c4dc4b6c654cdf62461e029798544ce93a70df0218 SHA512 f7a76ca053aa0bc16a1f78ddd89c2102ad636be661f1ca96c00dd5b01b89200252cb1564cf32a1705446fba5f2af475a6d659c7bcaf486bd370eb5af2b2e7148
-EBUILD gdb-9999.ebuild 8678 BLAKE2B 1dfc0997bf77f4de49ac4e471021b1e06794e1ca7561f415ded8d8a056b1cb8793127d1220f6c361c05ec4c4dc4b6c654cdf62461e029798544ce93a70df0218 SHA512 f7a76ca053aa0bc16a1f78ddd89c2102ad636be661f1ca96c00dd5b01b89200252cb1564cf32a1705446fba5f2af475a6d659c7bcaf486bd370eb5af2b2e7148
+EBUILD gdb-13.1.ebuild 8570 BLAKE2B 32c61c49575772fec207a02628a01465eff60b655a7e6dc57cd1f69d7c9db143bb65b90650f17c09908ac997475b428d5acdd3b5d932f51b24c87ed11e8cbc43 SHA512 650ee621962310fef101c486047a293b05835c8becfdf94a2929020cb50500a393becf5e434914700a3cf50ed80b650f57bc84a8c3302ac2e0bc396ea5aa9b2f
+EBUILD gdb-9999.ebuild 8570 BLAKE2B 32c61c49575772fec207a02628a01465eff60b655a7e6dc57cd1f69d7c9db143bb65b90650f17c09908ac997475b428d5acdd3b5d932f51b24c87ed11e8cbc43 SHA512 650ee621962310fef101c486047a293b05835c8becfdf94a2929020cb50500a393becf5e434914700a3cf50ed80b650f57bc84a8c3302ac2e0bc396ea5aa9b2f
 MISC metadata.xml 1242 BLAKE2B 368d8798d7d3b610653f635eb36ee5517912e8a2cb392622b32ac0aa90f336e3b391ba25811dee110644e50fabec0d64f6bcf3b219cdd240ec806e709a198eed SHA512 192fa340899680413c3d6c886ecd7d2262475a33aecc452192e5fe1d8e3eb5cf17546e57181e720128cf9b39cd8e4b1b1a73cb1f0c9887866c0ce88b288636e2
diff --git a/sys-devel/gdb/gdb-13.0.91.ebuild b/sys-devel/gdb/gdb-13.1.ebuild
index 9e1fdd605935..4a30a9445468 100644
--- a/sys-devel/gdb/gdb-13.0.91.ebuild
+++ b/sys-devel/gdb/gdb-13.1.ebuild
@@ -50,7 +50,7 @@ case ${PV} in
 			https://sourceware.org/pub/gdb/releases/${P}.tar.xz
 		"
 
-		#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 		;;
 esac
 
@@ -67,11 +67,6 @@ SRC_URI="
 LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
 IUSE="cet guile lzma multitarget nls +python +server sim source-highlight test vanilla xml xxhash zstd"
-# TODO: Drop once 13 is released
-if [[ ${PV} != 9999 ]] ; then
-	# for testing on loong only
-	KEYWORDS="~loong"
-fi
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index 9e1fdd605935..4a30a9445468 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.ebuild
@@ -50,7 +50,7 @@ case ${PV} in
 			https://sourceware.org/pub/gdb/releases/${P}.tar.xz
 		"
 
-		#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 		;;
 esac
 
@@ -67,11 +67,6 @@ SRC_URI="
 LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
 IUSE="cet guile lzma multitarget nls +python +server sim source-highlight test vanilla xml xxhash zstd"
-# TODO: Drop once 13 is released
-if [[ ${PV} != 9999 ]] ; then
-	# for testing on loong only
-	KEYWORDS="~loong"
-fi
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index 1cae565accae..5c54ff3b076e 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -6,5 +6,5 @@ AUX gettext-0.21.1-java-autoconf.patch 2280 BLAKE2B 79605c0ea6c5a56be1a6d586210e
 AUX gettext-0.21_rc1-avoid_eautomake.patch 1362 BLAKE2B eed15ecde829aa63859dc196052f97abc0386e6c496b7d7e073769e0ad6208623cc1fb6322ff422647f3a55aac6453bd6390432d707d179da7cfc820d487c23a SHA512 5089af3dabb2459345aec6196de70591dafabfc292495f052dd67ce3d2566c4b62a8554eb11db7499378e16a8d11953f044fcfd23c77a71ad01feec4c0c41956
 DIST gettext-0.21.1.tar.xz 10054564 BLAKE2B e994924284b3fd5b3e3bf59d4bf43eb30c9b21cc213dc3b98616b4a9fc321c90911d94d314f323cfffd0d2c3e9371b5b8f7985b9a785adc61617dd042b6f4df5 SHA512 61e93bc9876effd3ca1c4e64ff6ba5bd84b24951ec2cc6f40a0e3248410e60f887552f29ca1f70541fb5524f6a4e8191fed288713c3e280e18922dd5bff1a2c9
 DIST gettext-0.21.1.tar.xz.sig 833 BLAKE2B f673436d315e972f9e110a1b5c8d1b2f20a32fc1b7ce027fcd3bc2fe7a81af183fb8db744cbed1a8c3a6ce1a13d55e19a8e8829fc944960fbfc7efcd9aaed91c SHA512 fba912830c57d0616fb66cf81da0cb7a3ab1e27497c45daa63249d3c9f85182a4f42dfeb1591d8f31c2a340ba0c519f04fd2f05429d1cf26a3ea316d047993d0
-EBUILD gettext-0.21.1.ebuild 5155 BLAKE2B e8543612fecd1ad5bc765547df163c7ef572149a00c8b8f9e35a042669844dbb8b831f9769b5bc04b16e35f429ebf35a33ee6f9246d5895692360f9c95dfe772 SHA512 3f7fc243ccb88a7a3694fe64f5a4e6179af3ced1540cf49806483b0aef32e75187168b1653a6e14b2dabff9b19dabfc749e63a22a6017b3379dbe62a75087022
+EBUILD gettext-0.21.1.ebuild 5318 BLAKE2B afe61292abc7c97de7c408f3be855020d9229d36d715f4b4441a4ff48a2c4617cce4cf3c3452214c8abb86937777830ceca37acdb484868ad2c53c6b8ad01ddd SHA512 eef70c6b966654a83b2155310c53bc08e2f7b354b7bf9cd5a5cf11f808e19a201df82bdf1010ef52be993ab86fcffaee81062f6f4a249b5bef55cbd7fae35535
 MISC metadata.xml 708 BLAKE2B 851174e455d052a1c3a4e0a5dbfeac2feb10781a54fa0bfb52b3934ed88a3f8a2437a922f3ce5b56e21aa6aaec3488539e151362e3441344f97c246b79e2c2e2 SHA512 9dbd43e82384160c392bcfa94a271951a754c2cbf116cf61659642660e93b4a82a7636d600cc8a83b68fcd2d92669e4b5b009334039ff66c58b92baa24961aac
diff --git a/sys-devel/gettext/gettext-0.21.1.ebuild b/sys-devel/gettext/gettext-0.21.1.ebuild
index 654d28fe3fbd..df051017c102 100644
--- a/sys-devel/gettext/gettext-0.21.1.ebuild
+++ b/sys-devel/gettext/gettext-0.21.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: Keep version bumps in sync with dev-libs/libintl.
@@ -6,7 +6,7 @@
 EAPI=8
 
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gettext.asc
-inherit java-pkg-opt-2 libtool multilib-minimal verify-sig
+inherit java-pkg-opt-2 libtool multilib-minimal verify-sig toolchain-funcs
 
 DESCRIPTION="GNU locale utilities"
 HOMEPAGE="https://www.gnu.org/software/gettext/"
@@ -70,7 +70,12 @@ PATCHES=(
 
 QA_SONAME_NO_SYMLINK=".*/preloadable_libintl.so"
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 	java-pkg-opt-2_pkg_setup
 }
 
diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest
index b6e21bdd42d2..3858f9b66ef4 100644
--- a/sys-devel/make/Manifest
+++ b/sys-devel/make/Manifest
@@ -1,13 +1,17 @@
 AUX make-3.82-darwin-library_search-dylib.patch 394 BLAKE2B abd83733bc3036e412a57e0ced927511f45b9308f77d759ab299a5fc7fd76e81346cb4b908513ab20bc4aa931d436dbd4b3cd8cd0f5b05f94816569830589ce8 SHA512 32728cda66093f813e2731e120d71befa71e97e57a908503f60f79fd400e9fe0766f72d0c2ed065def1ea3a36a03b67d189dbff474728f41622489f1c3a515cb
 AUX make-4.2-default-cxx.patch 212 BLAKE2B 16ab647e54b27b2be8fe3b8abc37940690e828a1f68a21856377dec4b282ef489246f5de7c2b364654327166fb9b3f2a0dae755dc15db786c607c6d7f1fd76d1 SHA512 9b9be230f8c74ee438851d1c10409ebd188f818d04e99b799a353fc26c2da78d2e298b907287ceece7b6e64f9ac0908ae65e33c35634b9338b246225b63cb409
+AUX make-4.4-default-cxx.patch 278 BLAKE2B 9b5a0428e37f3abcaa01567302b12e48031b755cd988054464275c5ae255a9c77a507d9772f2124614569a858c820c533a46d859e11813591a6cdea636d74f2a SHA512 f569ebd924d64c95e0d3d7c61daaedb7780cccded83bd73036d56f1ef658497056f95a65c463fe347b14b1d12205507173eaab8cb74205cbcf32bf1a25531f9d
 DIST make-4.3.tar.gz 2317073 BLAKE2B 5a82ce1f30eb034366ac3b87d2ec6698aae17d7b1a611941cf42136b2453b34236ab55382eab0a593c43cee8b036ba4a054f966c41ba766fdbd2862942be5dff SHA512 9a1185cc468368f4ec06478b1cfa343bf90b5cd7c92c0536567db0315b0ee909af53ecce3d44cfd93dd137dbca1ed13af5713e8663590c4fdd21ea635d78496b
 DIST make-4.3.tar.gz.sig 566 BLAKE2B 75bf71602e60f97ec8efa81676329047746d960257ef310b89a059144c00628b6a1ddf7a16a2ac2c3e935b8591475f5043a7c7546668ab39abbc4717c75a6528 SHA512 bf13e2943593b153457c8111179e8ae11cef2d9185a986106a1e70946a260bd930505a5e10002c5a60888e11affc07713c367b8680fd511ad87b2e124d303a99
 DIST make-4.4.0.90.tar.gz 2328399 BLAKE2B fc260a3c942b00d57bc64fc037e4e4a510000ec281194122e3315f0ca7c6fe3507877c84bff62e197f5df45e1d5d95aae347085e225377788ebd466a1327cb25 SHA512 e693e6146871dcaf5b65b6c05b620047b6c2a3474b02ecc58cf4698f88107cc7a7b0d35551eb209c772b09ea7db2ffde13fe984d6227339974ca54a68b99839b
 DIST make-4.4.0.90.tar.gz.sig 833 BLAKE2B b0a2d98f5a99ee29523c6b25be4b29bfb193773ab5b70ce26adf75a066e30ca95d79b111eedc656e817246cfaf7f9345014626b12de5a381e44e4b6f8ddd5be1 SHA512 7a20c6058221b1003a26806f65d7b568575f88187562b89b7593c67dfc2b15569cd92c75c23056b2a3ff7577f96794835f1b6d5d9f5f5b92c59acb3af8efc944
+DIST make-4.4.0.91.tar.gz 2345140 BLAKE2B 3e28fa6e74684329f41aab69aa3558e45381b64964cacd4c83611df86d7ade69cec9561248c817b2e3f52db60c2821e34603d68e1957377c05c48e6b09a93295 SHA512 7798340062edf15c0ad459c3f9741125337c5bf59e002cc109b4e5d59e7cf9c510f4fcf33aba0bf61a0e91d6259f84d6cffabfe7a3eb45a07e70a5ba54e91d37
+DIST make-4.4.0.91.tar.gz.sig 833 BLAKE2B 7d86e8cfb5018ab32701379b7b04777c032d40d0fe02469ddb2113f3878079ee3e99a69636c5a2a42d0a20e43f833f88709d456255418ae4007fb18ebda4ab0d SHA512 950e11c5c27d198846d0c871f5e3d9b4bd3afa43aa9819cd293c3c97083b7df4c5b7cc5959b17c488433bba3e64a53ab51805bad5788b106d462fb97f7ea2fb2
 DIST make-4.4.tar.gz 2307891 BLAKE2B 5b8a2fcd7610c33347c2e552fdc4f2698c9a4c468de588c9687cd11d15f120a37768bcd521231adf32359e3b48b27ab7b142746fd18b1a8d15578d34344f487e SHA512 4be73f494295dcfa10034531b0d920cfdb5438bc20625f863f5c878549c140e1e67195162580c53060c3c11c67a2c739c09051f02cdd283e5aa9ebcd68975a1f
 DIST make-4.4.tar.gz.sig 566 BLAKE2B 879e85eccd748a9e6687e8beaaf1321ad84986990290c34d34285eab96fe9d493db1e6f20178aa5374796da9c8fb58f87065ea2de44a6daa55dd23dcc8b09c8f SHA512 76b7ecb3aa38b0a6867fd0379e42d2cae6632f102d902ac604e7ea3265ac1c1090da8e5676bd56b9946dc291e57c06bb05c953f76714fe8bd27b924bb39301e6
 EBUILD make-4.3.ebuild 1931 BLAKE2B 84d538027ac0a84300ccce7f1b446407796a10a9314e016850b092f7e2d5d62dfcf96cc68d013f6b12d682cc3bf94ba4a97a7b0a6247314fee10d864e8ebf6b6 SHA512 2f764ad5b425038139fec36c56a194284ed34c0f2991d0d4c94cc81ea111ef6662646c3ba96968c2d13debbcdede5a0000abe091ff970b67c13cc49958d113e8
 EBUILD make-4.4.0.90.ebuild 1960 BLAKE2B dfa4f6945510882c3db0fe4a860ea4820fae1a24592c81518578f7af9067ff9080b4ab624eda00da0b9242463a75178a1893b104277df82dd27469a4d9f87081 SHA512 124335d012cc9a316c1d9fbd8d7dea64baef0407b11ccd1ce2ac4b5b00d84cbb3d0b84173f6aa57af815c43273a06189a6e6ee2cb5fade960fe2a3aab3f4ba8b
+EBUILD make-4.4.0.91.ebuild 1906 BLAKE2B a09f61448b1298c4edf202cff26876957aebd0b35ece91c150ecaf8c05cc78fb14c27b0ba6083ec5fa28650255c85e48210dca53f1dbf27b76dfb610b5983570 SHA512 cf6888ee91fbcc20604b2572e479cd50157fe4bddfc3da1cd6386f9f2bde4125e1e1909181a09ff572da6504a0be91aa837ccba425087d3368487b23f6cf793f
 EBUILD make-4.4.ebuild 1937 BLAKE2B e63f3a30b3032769736d408691c594cc08b40c0cd06fc0f548ebf62dcca4e67f793a6fa42c89ec40f329af2551fbb2928eb6c21ca1e704c802f4b0ff86318173 SHA512 158e77869d70fc1e0c00d4f1df036bf66a85273900c19c67626701986e9eb36e0a8c1899cd22c7af091eaccfe6a334f20f03e47ec6fafb3225f5740999f1d790
 EBUILD make-9999.ebuild 1960 BLAKE2B dfa4f6945510882c3db0fe4a860ea4820fae1a24592c81518578f7af9067ff9080b4ab624eda00da0b9242463a75178a1893b104277df82dd27469a4d9f87081 SHA512 124335d012cc9a316c1d9fbd8d7dea64baef0407b11ccd1ce2ac4b5b00d84cbb3d0b84173f6aa57af815c43273a06189a6e6ee2cb5fade960fe2a3aab3f4ba8b
 MISC metadata.xml 335 BLAKE2B 5b17214450a474af84b5015059fed4edc919e53bfd407cedf0816746d95a3258aa90fb851a7d013f1ef10b61d689ead735f8ed35b109e12b45e7a4efab22abe3 SHA512 72ff31b31e5d9bf55124d570d8ff4911eecd2272492988919fc073e5864d4282e4acc3101c367076c1009e3af086792993fa96562c25699f1b537b88fed40a1f
diff --git a/sys-devel/make/files/make-4.4-default-cxx.patch b/sys-devel/make/files/make-4.4-default-cxx.patch
new file mode 100644
index 000000000000..4a56df5da2c8
--- /dev/null
+++ b/sys-devel/make/files/make-4.4-default-cxx.patch
@@ -0,0 +1,11 @@
+--- a/src/default.c
++++ b/src/default.c
+@@ -542,7 +542,7 @@ static const char *default_variables[] =
+     "CXX", "gcc",
+ #  endif /* __MSDOS__ */
+ # else
+-    "CXX", "g++",
++    "CXX", "c++",
+ # endif
+ #endif
+     /* This expands to $(CO) $(COFLAGS) $< $@ if $@ does not exist,
diff --git a/sys-devel/make/make-4.4.0.91.ebuild b/sys-devel/make/make-4.4.0.91.ebuild
new file mode 100644
index 000000000000..27cc510be3c6
--- /dev/null
+++ b/sys-devel/make/make-4.4.0.91.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/make.asc
+inherit flag-o-matic verify-sig
+
+DESCRIPTION="Standard tool to compile source trees"
+HOMEPAGE="https://www.gnu.org/software/make/make.html"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/make.git"
+	inherit autotools git-r3
+elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then
+	SRC_URI="https://alpha.gnu.org/gnu/make/${P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/make/${P}.tar.gz.sig )"
+else
+	SRC_URI="mirror://gnu/make/${P}.tar.gz"
+	SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.gz.sig )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="guile nls static"
+
+DEPEND="guile? ( >=dev-scheme/guile-1.8:= )"
+RDEPEND="
+	${DEPEND}
+	nls? ( virtual/libintl )
+"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-make )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.4-default-cxx.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+
+		cd "${S}" || die
+		./bootstrap || die
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	local myeconfargs=(
+		--program-prefix=g
+		$(use_with guile)
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS NEWS README*
+	if [[ ${USERLAND} == "GNU" ]] ; then
+		# we install everywhere as 'gmake' but on GNU systems,
+		# symlink 'make' to 'gmake'
+		dosym gmake /usr/bin/make
+		dosym gmake.1 /usr/share/man/man1/make.1
+	fi
+}