gentoo resync : 19.07.2019

3 files changed, 55 insertions, 7 deletions

diff --git a/games-board/natch/Manifest b/games-board/natch/Manifest
index 1310511c105e..92718fb3700d 100644
--- a/games-board/natch/Manifest
+++ b/games-board/natch/Manifest
@@ -1,4 +1,5 @@
 AUX natch-2.4-format.patch 754 BLAKE2B 55c042df161710b3eb5bbaa7ea97a1be54468ec9243dcde6ab323301cb3cb6ef8e74bc4fe9c8d7bf0ea8382685e25274fba2ed7a885d9c5902d9e3ae9a6bc3de SHA512 9e80e047a458e4339c3a5b4e3023f96a853e8b1ae3ab847fa1de68adb0319961f996a10de9478b98acd0718433f034e42f98b84d145e9b5879fcf777a83bfc9d
+AUX natch-2.4-tinfo.patch 1464 BLAKE2B a4db238aa39e4bf069c0dedda561fb6ec9299306e432f29f0c233043f9b70bc13895a326f4cc3829ce49bf462d86f2b8f506beb7d56fd5d54e405175e4776696 SHA512 531c04cb28d16a8592a4a423a1c73ef9f129ad8e899bf05c2982cf979cd7fe04d063d2ff33bdd4d45a37d46e81c113fd9bc85d48fb2a12259c972ea69f4e5de7
 DIST Natch-2.4.tar.gz 196621 BLAKE2B 9d778ace5783f04638101265923053565cfb8930ac6657f10ac3370987bc4acd0f08af958d601ddeeded59253d619f83593b9283e34f905f30d03d65e110bc32 SHA512 390b1cb295f6d8f4d5ec27abad9aae0c06ea1b4bb9c29dcf5bf74f515ac4a90926a657fe3dd3cc91233cf772d2f072cdc34a043e5e294dc668ca619b21535d81
-EBUILD natch-2.4-r1.ebuild 567 BLAKE2B 36cd8b8301fdb15537267931270c0f34672a0f05b895a5e0dae4272366ef724bac0d04ac4625dc0ed8c16d406c18c75ff390875387870a4aa608bec674b8d9e5 SHA512 8973fa2aefa7d454c87fe77e0874c5f215e7bcedc03250bf3630ddbca542f2188b7c9ea5625455fb017ce98ed7e298d4b105f032b81fae4e1d4d5aadb73ed62b
+EBUILD natch-2.4-r1.ebuild 674 BLAKE2B 5ed1a83334e34ffc338cf136859d193ae79249deadbd501ce0fa7e38be61b5dcea9e62cb008b7bb27d8e5b990a495bbe9980eb5a4bec2ce2920b79caf74466a5 SHA512 9849cb0307574780e18ca14a056519aea4e7d0140f7dbbf66045c07b5a3515504762f6e78c0596a2f3e8f735896d4380e6fcecd5b7004d787804b467bf087485
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/natch/files/natch-2.4-tinfo.patch b/games-board/natch/files/natch-2.4-tinfo.patch
new file mode 100644
index 000000000000..92646aa54bba
--- /dev/null
+++ b/games-board/natch/files/natch-2.4-tinfo.patch
@@ -0,0 +1,39 @@
+https://bugs.gentoo.org/690078
+
+--- Natch-2.4/configure.in
++++ Natch-2.4/configure.in
+@@ -25,17 +25,19 @@
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PATH_PROGS(GENGETOPT, gengetopt)
++PKG_PROG_PKG_CONFIG
+ 
+ dnl for txtc (Text-to-C compiler)
+ AC_PROG_AWK
+ LF_PROG_TXTC
+ 
+ dnl Checks for libraries.
+-AC_SEARCH_LIBS(
+-	initscr,
+-	ncurses curses,
++PKG_CHECK_MODULES(NCURSES, ncurses,[
+ 	AC_DEFINE(HAVE_LIBNCURSES,,
+-		  Define if you have curses library for visual mode. ), )
++		  Define if you have curses library for visual mode. )
++	],[
++	AC_MSG_ERROR([Cannot find ncurses lib])
++])
+ 
+ dnl Replace `main' with a function in -lpc:
+ dnl AC_CHECK_LIB(pc, main)
+--- Natch-2.4/src/Makefile.am
++++ Natch-2.4/src/Makefile.am
+@@ -29,7 +29,7 @@
+ 
+ Natch_SOURCES = main.c main.h types.h cmdline.c cmdline.h distance.c distance.h dis_type.h pcpj.c pcpj.h distimmo.c distimmo.h pcpj_deb.c pcpj_deb.h pcpjcapt.c pcpjcapt.h trajet.c trajet.h explorat.c explorat.h expltype.h pcpjcoup.c pcpjcoup.h hash.c hash.h pcpjtool.c pcpjtool.h myHashTable.c myHashTable.h langues.c langues.h screen.c screen.h common.h moves_order.c moves_order.h test_moves_order.c test_moves_order.h twin_squares.c twin_squares.h precise_trajectories.c precise_trajectories.h captInitSquare.c captInitSquare.h piece.c piece.h reportbugs.text copyright.text
+ 
+-Natch_LDADD = @LIBOBJS@
++Natch_LDADD = @LIBOBJS@ $(NCURSES_LIBS)
+ 
+ AM_CFLAGS = -Wall -fshort-enums -DNDEBUG -O3
+ #AM_CFLAGS = -Wall -fshort-enums
diff --git a/games-board/natch/natch-2.4-r1.ebuild b/games-board/natch/natch-2.4-r1.ebuild
index 8b263b424b33..0e81bbc485f3 100644
--- a/games-board/natch/natch-2.4-r1.ebuild
+++ b/games-board/natch/natch-2.4-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=7
+
+inherit autotools
 
 MY_P="Natch-${PV}"
 DESCRIPTION="A program to solve chess proof games"
@@ -14,15 +15,22 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="sys-libs/ncurses:0"
-RDEPEND=${DEPEND}
+DEPEND="sys-libs/ncurses:0="
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-format.patch
+	"${FILESDIR}"/${P}-tinfo.patch
 )
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_install() {
 	newbin src/Natch natch
 	dodoc AUTHORS ChangeLog NEWS README THANKS example.txt