gentoo resync : 27.10.2021

4 files changed, 21 insertions, 2 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 20186b5e2734..45678bde8fce 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/dosbox/Manifest b/games-emulation/dosbox/Manifest
index 7efb5199f0d5..a4bb326cf1b9 100644
--- a/games-emulation/dosbox/Manifest
+++ b/games-emulation/dosbox/Manifest
@@ -1,11 +1,12 @@
 AUX dosbox-0.74-ncurses.patch 2863 BLAKE2B 5fbd9c3ec77384406f2c79d3f57ab5529829e2438fba54aee70bcdcea87e1a7b8f6dd8e6b64d7ab54292995e3cce13b4ddf26b23a1245ed8e7895395f4dbdc15 SHA512 934a0ef73f700caf7e3714f8f6fa2d60a7c6e443aeb38b8d34f9c78b31fd066f6b2de6cda5f6684579174c92fe5ad7307be6c389dd3650f4d2c44bf3c13495ae
 AUX dosbox-0.75-detect-AR.patch 274 BLAKE2B 6034a903657693f5d7725b2371e0e7bca535424bbd705df3c79969d400e693c04ad32174c5f755d0d8e8f07f774212aa5777ff1bfda7acb1805ad70678a8a5c2 SHA512 aca956f61c536264228648edff3f9c5963458075bae244ee37e84e1886df44a3bdb2f37fcf3c427ac524c857ce4ae1246788ee610bdcf4094c7f62a01da8cf28
+AUX dosbox-0.75-glide-libdl.patch 634 BLAKE2B 7e0971601204033e9f453395ee1312f1003630675d1db74079eb9cbd9aacb1cb76464fd325eb4d41eaca53107df776e3743ac839b01e49cd42ae9f98ddfa900b SHA512 eb7dccc44dace3f4384da055eb1af3c22d83c84662d49a92ebf4608b7c9369d5927e7552d9ccdbcbf131e11d342290d36833bbd24bb3e919ad3a57d5df052565
 AUX dosbox-0.75-ncurses.patch 3035 BLAKE2B 65c09f5c6dc241edbc64d4383fccd04258683c8ed7290957a839384569df83ddfc60025893894a97c73ef1061a7aee4400978a7f53407bb6325e39e836578394 SHA512 a06ffb518cd05972aabed29b1704281e126d82c1f218bd100f02cf939b20718107dbd5637439ff24aa80d58c1c9e4838bd6170089ec0959ef135a1367d23503d
 DIST dosbox-0.74-3.tar.gz 1326339 BLAKE2B bc25e6aba29747d4060269809d729904d8d187527c59953125c8591c0a91cf4583223c1bcf1224a041d44bfe5efcfe9034d6572954cf26870a290ff1b27e7d9d SHA512 3770f1578e71730168fba01809585f2a05cf8c4d420524687ba28791d242faad294401bb9cd268bba725798e1db853551f274dc00a4024331f5dcef9f87f8f5f
 DIST dosbox-code-0-r4302-dosbox-trunk.zip 1443140 BLAKE2B 91e7c5ceb90baa09fd30cf0d8799d900d6bcd94f2b1eead8493ee276b1ee038e093fde56874c58d379218b60e1b510f1d493d72fc275f206912304312ce58d0b SHA512 57758950fd3f0440f4e4d59191a059387a0c7c4559376a2ba826537423ac63d266defe2da37be81450bfece3e0d1caa79b7097ea7fcd3cf96cd04d8899123c69
 DIST dosbox_glide-6a01f554fad979cf34d3ff07c9579192c88086c3.diff 97353 BLAKE2B bb95f9916d4dc8813d1fb4b61c63e50aba5d1862e5554c4af0fc2e75c105b477a6e6ef8b8941e9570860a2fe41570eca94ef36e1d594a2fb9a922b132b210e76 SHA512 b4cf2e5a335b948de94567806950c9512d81adc7687a184b6da5aae082c437af51c61950b1abd0d0c00d83ce37b5ee365ee6bb9e981854fce8bfbb0b1e93be68
 DIST dosbox_glide-841e1071597b64ead14dd08c25a03206b2d1d1b6.diff 96801 BLAKE2B d24d1f4262129899d807c275b1ae2d6c09056a126441665f37359302428f30576f399c4778b55f4eaec674e714d85243f576bfa3064887c5801daddc9e507aad SHA512 4cbe0ede9c4242aa346ca6c609b7a4d8e4e1d204d79d93ff741d58d3ca14e43a2e49cd696bd4bd54c13e62d1080320ee233963bac26f25bb0b4fada86e813ca2
 EBUILD dosbox-0.74.3.ebuild 1522 BLAKE2B 05abcda688e1a6bd53c1494e7a9496a40f2d73acbac29e8e5c92c91d245f22f3926a7be774c053851372e3f4b5c7bbeac1ebed17dbfa0524889c77c19f25da81 SHA512 c9fcbf5fb32bfeaf7d72611b2e0764f6995049afb0e79e3d4db1a8f28d36ceb34e9918618219115a960e96b6c76bcc3276a99951d2d6b29804dec05fd9fdd25f
-EBUILD dosbox-0.75_pre4302.ebuild 2288 BLAKE2B c8308ab88550535af2055ee448f08140707cd78af02fd644d7b2b31a6061fd04ab220bca579fdc645da6e9960149022501e87733c3469ed57bf00dfb1ed664d4 SHA512 bc41da3fbbd55b4784f248fb3a7f6ec4802cd41f66d448bd0cc59d3944648383026b8e272966b5fc2f02f54c0801f33d59ab6c9ca301a982c040a9a50e0d96ad
+EBUILD dosbox-0.75_pre4302.ebuild 2331 BLAKE2B b29922409d919f3d16050604573abc01bfc792cf84e6cbfa0da8f32c36e728c0d85f9406ba26bd66686509a90b37ad65ecb7926330fa6acbd6e6fe88c76b8afa SHA512 8ac6834748093fc7b2a540a4778eaacb323b2478eb6df6c3adb3adbc93a9fb0fd01e724ee8c898426382182f50082ddd23962c7b163b5d51c3c2ebf1c23aa653
 EBUILD dosbox-9999.ebuild 2206 BLAKE2B 066c39c10f7526ab0b54e858fbc5e82a5148a902a4a8e5a7b39289efa370bf55af91ec132a8da7a580d2834e9f9d0f7b64e416703c52d3f3a0c28dca7a6e6616 SHA512 fa2833a8de8d791b27bcecfd99b06ede3caef2caa86bb97aed541b43624c85693709a6656826022e40a5a3923c2b7d3364ef3e86de44b0a59d593f1351a67b7b
 MISC metadata.xml 743 BLAKE2B 2191b3e347144776ede26b44fe48b2caab5c6d584df62ecfa3597baeefd8facf2b72f0d04cee213a7255ffbaf0f8559cd2eecda1d070981ac3560ed9a3a44d33 SHA512 4ada56bdf777120b751a6f5afb20ea9d5a4c18c624323c00b1baf3706d6f6cfe3717233364085afcc16456e46df6b1488c7d9924ddc7d95dcf273ea4cbea901f
diff --git a/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild b/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
index 8ae6d980d50b..4cf2a4a4d981 100644
--- a/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
+++ b/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
@@ -54,7 +54,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	use glide && eapply "${DISTDIR}"/dosbox_glide-${GLIDE_PATCH}.diff
+	use glide && eapply "${DISTDIR}"/dosbox_glide-${GLIDE_PATCH}.diff "${FILESDIR}"/${PN}-0.75-glide-libdl.patch
 	default
 	eautoreconf
 }
diff --git a/games-emulation/dosbox/files/dosbox-0.75-glide-libdl.patch b/games-emulation/dosbox/files/dosbox-0.75-glide-libdl.patch
new file mode 100644
index 000000000000..524c5839672e
--- /dev/null
+++ b/games-emulation/dosbox/files/dosbox-0.75-glide-libdl.patch
@@ -0,0 +1,18 @@
+https://github.com/voyageur/openglide/pull/25
+
+diff -Naur dosbox.orig/configure.ac dosbox/configure.ac
+--- dosbox.orig/configure.ac	2021-10-26 13:06:35.585761330 +0100
++++ dosbox/configure.ac	2021-10-26 13:07:31.641323631 +0100
+@@ -20,6 +20,12 @@
+ AC_PROG_RANLIB
+ AM_PROG_AR
+
++dnl The dlopen() function is in the C library for *BSD and in
++dnl libdl on GLIBC-based systems
++AC_SEARCH_LIBS([dlopen], [dl dld], [], [
++  AC_MSG_ERROR([unable to find the dlopen() function])
++])
++
+ dnl Some needed libaries for OS2
+ dnl perharps join this with the other target depended checks. move them upwards
+ if test x$host = xi386-pc-os2-emx ; then