gentoo new year resync : 01.01.2021

5 files changed, 89 insertions, 6 deletions

diff --git a/sys-fs/lde/Manifest b/sys-fs/lde/Manifest
index 749e02d49fe3..f5b05fe70fbc 100644
--- a/sys-fs/lde/Manifest
+++ b/sys-fs/lde/Manifest
@@ -1,4 +1,7 @@
+AUX lde-2.6.1-fno-common.patch 890 BLAKE2B 993008642739d4048d345d0f82f3c7b71c265b40805d375d1bbcb9e070328796b863fe6fef3f6de6d06eb6cd2f935767a2563b8f6c932b46b1803f1ef1737a38 SHA512 194c7cfb1d7a5491ced955732f7c277aa0de73d595774fe0362b0975151b3c78b391d78983ade9d4c05dfccb576a13cde1cb75a874aab64bdda5b97267fcc7a9
 AUX lde-2.6.1-no-shadowing.patch 1296 BLAKE2B 22d2f0efc08196c050498796b5dc28688e6b6a0afb1d57d71d77ee0d7509d4df1e5c9fa2abf3f2cc21c4a9e2b3c87f0064b426b9dd96f19b32b929ba82f82460 SHA512 71545fc978fc5ef792fe61d5495e5690d50f6a9e44b1a48b835738cb0b05737db311fe10851b90655373e2d5cb5f7e47a4befcc40db5170092e28243fa99b32b
+AUX lde-2.6.1-respect-ar.patch 229 BLAKE2B 62b6e599b7d8cde2338816dc4d92ac57190cad1509c5b01e7c8dbcfcc96acd63f2d1b271c46c28c0de74029f73c1b02ea7028d1f06473eb0d53c632c789ff504 SHA512 49f76e035e7046bdf1ba815a05a32d56ba439f8752bf95b8e63701c0ed6389d31870317ff2a1f067462555f5411789dcb7af800c893994ff78b4fda34cbc1a43
+AUX lde-2.6.1-tinfo.patch 773 BLAKE2B 6ec56d92ed75f91e6b3bf6000f094a004483b24450c5fb6c9d0801c30e1c46971e2a5fb3bd10dfe4605d6b0332ba6def2fa154a2eba31f0d9d41304304ff2bf7 SHA512 2df8b0fc7feba65a7a0a456bcb8504f67645fb0adce8373a7449cad74f2827521f36a11145e8d1ce1270884a6ecf34f28d0086b426cb6bb03d87369637a1293b
 DIST lde-2.6.1.tar.gz 598050 BLAKE2B 5ce0dd9c06de599016fa408e8e67ed71923acc556c0f0fce54bbdc091bde99a2ab1b0783ba2928b9a1c7d3521c82fe62e359750d0ef26ba64a3e022d5471b0c5 SHA512 b77baa9998a3d45493b6949a81df81dc5c0ee27060108bbae29548af09595aa260fdfcd12e958ea8ecf12805d97c157f5aad147137d6b42d806529ac6a3ab015
-EBUILD lde-2.6.1-r1.ebuild 584 BLAKE2B 7def205da62dedebf58f2b908e070933fe850a695f7ad650ab9f3cd5593b5157fce2bf0f7ec00608d97d851d8ea6c12efa649e8ca0de29bef27d0ed83286674f SHA512 42cd34a8b8b77c9ac457390ab349e0ed07b7f34620d2bd13dcce52f93639b2aa30a5aad1c9e9674854d8fd10b3dfff3bd3f1b589708661751fdc1aaf7eb6ccc4
+EBUILD lde-2.6.1-r1.ebuild 823 BLAKE2B 366aa1f0935f812f41282e1dca0d2dcd9285a81a7999335684429d026d94d3ab5a3c0f403a87c8c839e5ffa98d7f662dbf03d49e543983606c0673e520ed3aa9 SHA512 e161df936f5ebce50e379516dc15cd906288eb95d5516b4bbcb1d2696e998f92d81a242d458b22ff232b81abe57ec252e409aadd5afbe933236f1e67b17ffd23
 MISC metadata.xml 323 BLAKE2B a2df9affe6f199ea2e9741d775185681bd5d2776d9e8b4d63a4e374f507edc6c53df67d4d9d4078c2c32499d2aeb85b31bce3150ded4146148665d9705e3504e SHA512 7da6b75e5be951e2227e74cd49fb6a6f4c2be3770021989d9fcc43a816138ddbaa2841f1a28316e8312fc624b5ee2124320a212379eda33ecace5f0a83293d4f
diff --git a/sys-fs/lde/files/lde-2.6.1-fno-common.patch b/sys-fs/lde/files/lde-2.6.1-fno-common.patch
new file mode 100644
index 000000000000..8e246aea95ac
--- /dev/null
+++ b/sys-fs/lde/files/lde-2.6.1-fno-common.patch
@@ -0,0 +1,32 @@
+--- a/src/lde.h
++++ b/src/lde.h
+@@ -211,7 +211,7 @@ struct fs_constants {
+ };
+ 
+ /* File system specific commands */
+-struct {
++struct _FS_cmd {
+   /* Check if inode is marked in use */
+   int (*inode_in_use)(unsigned long n);
+   /* Check if data zone/block is marked in use */
+@@ -231,7 +231,9 @@ struct {
+   unsigned long (*map_inode)(unsigned long n);
+   /* Map block number in file chain to physical block on disk */
+   int (*map_block)(unsigned long zone_index[], unsigned long blknr, unsigned long *mapped_block);
+-} FS_cmd;
++};
++
++extern struct _FS_cmd FS_cmd;
+ 
+ /* Flags */
+ struct _lde_flags {
+--- a/src/main_lde.c
++++ b/src/main_lde.c
+@@ -90,6 +90,7 @@ int  (*mgetch)(void) = tty_mgetch;
+ 
+ struct _lde_typedata lde_typedata[] = LDE_ALLTYPES;
+ 
++struct _FS_cmd FS_cmd;
+ 
+ /* Check if device is mounted, return 1 if is mounted else 0 */
+ static int check_mount(char *device_name)
diff --git a/sys-fs/lde/files/lde-2.6.1-respect-ar.patch b/sys-fs/lde/files/lde-2.6.1-respect-ar.patch
new file mode 100644
index 000000000000..104aaf45b774
--- /dev/null
+++ b/sys-fs/lde/files/lde-2.6.1-respect-ar.patch
@@ -0,0 +1,11 @@
+--- a/macros/configure.in
++++ b/macros/configure.in
+@@ -30,7 +30,7 @@ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+ AC_PATH_PROG(RM, rm, rm)
+-AC_PATH_PROG(AR, ar, ar)
++AM_PROG_AR
+ 
+ AC_CHECK_PROG(system,uname,`uname`,unknown)
+ 
diff --git a/sys-fs/lde/files/lde-2.6.1-tinfo.patch b/sys-fs/lde/files/lde-2.6.1-tinfo.patch
new file mode 100644
index 000000000000..bb4c6c2386c4
--- /dev/null
+++ b/sys-fs/lde/files/lde-2.6.1-tinfo.patch
@@ -0,0 +1,22 @@
+--- a/macros/configure.in
++++ b/macros/configure.in
+@@ -14,7 +14,6 @@ AC_SUBST(STATIC_LDFLAGS)
+ AC_DEFINE(_GNU_SOURCE)
+ 
+ dnl Must use builtin() as it is overridden by some AC_ macros
+-builtin(include,./curses.m4)
+ builtin(include,./misctests.m4)
+ 
+ dnl Search for ncurses by default
+@@ -187,7 +186,10 @@ AC_ARG_WITH(gpm,
+ dnl ------------------------------------------------------------------
+ dnl  Search for some version of curses
+ dnl ------------------------------------------------------------------
+-AC_CHECK_CURSES
++has_curses=false
++AC_SUBST(CURSES_INCLUDEDIR)
++AC_SUBST(CURSES_LIBS)
++PKG_CHECK_MODULES(ncurses, ncurses, [CURSES_LIBS="$ncurses_LIBS" CURSES_INCLUDEDIR="$ncurses_CFLAGS" has_curses=true])
+ if test "$has_curses" = true
+ then
+ 	AC_DEFINE(LDE_CURSES)
diff --git a/sys-fs/lde/lde-2.6.1-r1.ebuild b/sys-fs/lde/lde-2.6.1-r1.ebuild
index 30c88f3438ed..ed69cd926321 100644
--- a/sys-fs/lde/lde-2.6.1-r1.ebuild
+++ b/sys-fs/lde/lde-2.6.1-r1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="ext2fs and minix disk editor for linux"
 HOMEPAGE="http://lde.sourceforge.net/"
@@ -12,20 +14,33 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="sys-libs/ncurses:0="
-DEPEND="
-	${RDEPEND}
-	dev-util/yacc"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	virtual/yacc
+"
 
 S="${WORKDIR}/${PN}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-no-shadowing.patch"
+	"${FILESDIR}/${P}-fno-common.patch"
+	"${FILESDIR}/${P}-tinfo.patch"
+	"${FILESDIR}/${P}-respect-ar.patch"
 )
 
 DOCS=( WARNING README TODO COPYING )
 
 RESTRICT="test"
 
+src_prepare() {
+	default
+
+	cd macros || die
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
 src_install() {
 	dosbin "${PN}"
 	newman "doc/${PN}.man" "${PN}.8"