gentoo resync : 17.02.2021

3 files changed, 82 insertions, 3 deletions

diff --git a/games-emulation/dosbox/Manifest b/games-emulation/dosbox/Manifest
index 3876459a01b7..e44af432763c 100644
--- a/games-emulation/dosbox/Manifest
+++ b/games-emulation/dosbox/Manifest
@@ -1,9 +1,10 @@
 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-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-841e1071597b64ead14dd08c25a03206b2d1d1b6.diff 96801 BLAKE2B d24d1f4262129899d807c275b1ae2d6c09056a126441665f37359302428f30576f399c4778b55f4eaec674e714d85243f576bfa3064887c5801daddc9e507aad SHA512 4cbe0ede9c4242aa346ca6c609b7a4d8e4e1d204d79d93ff741d58d3ca14e43a2e49cd696bd4bd54c13e62d1080320ee233963bac26f25bb0b4fada86e813ca2
 EBUILD dosbox-0.74.3.ebuild 1522 BLAKE2B bc38f48859f1d96aa2244924dbcf62f16ee45cd078f99161e381be6f0edb2760295e20f700d296f9408c5af109d5df86a1fda9a8458f4b6f799eb14f3db6edfd SHA512 e8123c54e12c80a67ad742c2e0c78ba4db54f992ae6e6922e265642de19e4b5ceedefc83c689e4ea7f96ca63ccd30d700b70e3eded8a575d755381d52066d318
 EBUILD dosbox-0.75_pre4302.ebuild 2275 BLAKE2B a2c75aa6878402f3fb8b554c8009ca1b9d194e160870eebf0736fba8ae8fb1995d65d9f490b1c2a132f8476bff4dc664b0a2626894bd7627adf12b183698184b SHA512 e0b3233630ebcfe2cc4f72607eb45d5f164ee09db41a5a44ceee701d5fb764cf1b5b154315f51c12abf7409e41df8ecc102707ef1b2642d072840a5b13ed71d3
-EBUILD dosbox-9999.ebuild 2205 BLAKE2B 93e0fcacb561aa8370473c2c3b9386623d773b5aaaf5ae8465d46a773c7d654d696c7b7df5f494fb001bf184d7c0c29e0409f78ca549e5fd42b2be8ccc668cb1 SHA512 a70753a9b49b7d46afd28a9c2d4826777b8730108bbdfa374c15bd2275e890cbbba4ea209de1c5ec5cd6dda450ebda7097310515a2b588096dc014302b10efcd
+EBUILD dosbox-9999.ebuild 2205 BLAKE2B c35041fbc0200ce7ed3654deed3188906adff96fce1471b956b650e313cd2e807e2e0e20da82c0357eb8dabe7d3b99b9948b6093bda815a48c240eb3bbde2fc4 SHA512 6c475c2c4ffba0fcbdc7be17528ce7a3b24a7bf1bb0102088bdc6d24b15745e83e36c6a8f116c3c9a13d528131cd039ac427e2d830fae196dd89dd39d68e8c7a
 MISC metadata.xml 742 BLAKE2B 1b36ebc57b143b7fb214632f79c3f51f812ac96de39e6f8886efd5c13cf1ee86d905c2cef3d46e58171ee00cc8515852bfb177726aaab196415e47b876d28a12 SHA512 0c9ad19d1512236023a349545c8bb8790388ac49ef62b30d03a81f84407aae2b9b199f7041a513af5b34a61bc5a439d663be2cdb3cd59a7e23830f78633285b5
diff --git a/games-emulation/dosbox/dosbox-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild
index 3292eebd77d5..e9aadb1e2ef7 100644
--- a/games-emulation/dosbox/dosbox-9999.ebuild
+++ b/games-emulation/dosbox/dosbox-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -50,7 +50,7 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.74-ncurses.patch
+	"${FILESDIR}"/${PN}-0.75-ncurses.patch
 )
 
 src_prepare() {
diff --git a/games-emulation/dosbox/files/dosbox-0.75-ncurses.patch b/games-emulation/dosbox/files/dosbox-0.75-ncurses.patch
new file mode 100644
index 000000000000..67c23c70532a
--- /dev/null
+++ b/games-emulation/dosbox/files/dosbox-0.75-ncurses.patch
@@ -0,0 +1,78 @@
+https://sourceforge.net/p/dosbox/patches/286/
+
+--- a/configure.ac	2019-11-12 17:55:51.000000000 +0000
++++ b/configure.ac	2020-01-02 21:26:27.551856431 +0000
+@@ -235,39 +235,41 @@
+ #Features to enable/disable
+ AH_TEMPLATE(C_DEBUG,[Define to 1 to enable internal debugger, requires libcurses])
+ AH_TEMPLATE(C_HEAVY_DEBUG,[Define to 1 to enable heavy debugging, also have to enable C_DEBUG])
+-AC_ARG_ENABLE(debug,AC_HELP_STRING([--enable-debug],[Enable debug mode]),[
+-   AC_CHECK_HEADER(curses.h,have_curses_h=yes,)
+-   AC_CHECK_LIB(curses, initscr, have_curses_lib=yes, , )
+-   AC_CHECK_LIB(ncurses, initscr, have_ncurses_lib=yes, , )
+-   AC_CHECK_LIB(pdcurses, initscr, have_pdcurses_lib=yes, , )
++AC_ARG_ENABLE(debug,AC_HELP_STRING([--enable-debug],[Enable debug mode]),,enable_debug=no)
++AC_MSG_CHECKING(whether debug will be enabled)
++  
++if test x$enable_debug = xno; then
++  AC_MSG_RESULT(no)
++else
++  AC_MSG_RESULT(yes)
+ 
+-   if test x$enable_debug = xno; then
+-     AC_MSG_RESULT([Debugger not enabled])
+-   elif test x$have_ncurses_lib = xyes -a x$have_curses_h = xyes ; then
+-     LIBS="$LIBS -lncurses"
+-     if test x$host = xi386-pc-os2-emx ; then
+-     	LIBS="$LIBS -ltinfo"
+-     fi
+-     AC_DEFINE(C_DEBUG,1)
+-     if test x$enable_debug = xheavy ; then 
+-       AC_DEFINE(C_HEAVY_DEBUG,1)
+-     fi
+-   elif test x$have_curses_lib = xyes -a x$have_curses_h = xyes ; then
+-     LIBS="$LIBS -lcurses"
+-     AC_DEFINE(C_DEBUG,1)
+-     if test x$enable_debug = xheavy ; then 
+-       AC_DEFINE(C_HEAVY_DEBUG,1)
+-     fi
+-   elif test x$have_pdcurses_lib = xyes -a x$have_curses_h = xyes ; then
+-     LIBS="$LIBS -lpdcurses"
+-     AC_DEFINE(C_DEBUG,1)
+-     if test x$enable_debug = xheavy ; then 
+-       AC_DEFINE(C_HEAVY_DEBUG,1)
+-     fi
+-   else 
+-     AC_MSG_ERROR([Can't find curses, which is required for debug mode])
+-   fi
+-],)
++  PKG_CHECK_MODULES(NCURSES, ncurses, [
++    LIBS="$LIBS $NCURSES_LIBS"; CFLAGS="$CFLAGS $NCURSES_CFLAGS"
++  ], [
++    AC_CHECK_HEADER(curses.h,have_curses_h=yes,)
++    AC_CHECK_LIB(curses, initscr, have_curses_lib=yes, , )
++    AC_CHECK_LIB(ncurses, initscr, have_ncurses_lib=yes, , )
++    AC_CHECK_LIB(pdcurses, initscr, have_pdcurses_lib=yes, , )
++
++    if test x$have_ncurses_lib = xyes -a x$have_curses_h = xyes ; then
++      LIBS="$LIBS -lncurses"
++      if test x$host = xi386-pc-os2-emx ; then
++        LIBS="$LIBS -ltinfo"
++      fi
++    elif test x$have_curses_lib = xyes -a x$have_curses_h = xyes ; then
++      LIBS="$LIBS -lcurses"
++    elif test x$have_pdcurses_lib = xyes -a x$have_curses_h = xyes ; then
++      LIBS="$LIBS -lpdcurses"
++    else 
++      AC_MSG_ERROR([Can't find curses, which is required for debug mode])
++    fi
++  ])
++
++  AC_DEFINE(C_DEBUG,1)
++  if test x$enable_debug = xheavy; then 
++    AC_DEFINE(C_HEAVY_DEBUG,1)
++  fi
++fi
+ 
+ AH_TEMPLATE(C_CORE_INLINE,[Define to 1 to use inlined memory functions in cpu core])
+ AC_ARG_ENABLE(core-inline,AC_HELP_STRING([--disable-core-inline],[Disable inlined memory handling in CPU Core]),,enable_core_inline=yes)