From: "Stephan Hartmann" <sultan@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/lde/, sys-fs/lde/files/
Date: Fri, 1 Jan 2021 18:12:29 +0000 (UTC) [thread overview]
Message-ID: <1609524735.95708ebf53cd9d24a8ad11f6ccea6fca8818fafc.sultan@gentoo> (raw)
commit: 95708ebf53cd9d24a8ad11f6ccea6fca8818fafc
Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 1 18:12:04 2021 +0000
Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Fri Jan 1 18:12:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95708ebf
sys-fs/lde: fix ncurses[tinfo], fix -fno-common, EAPI 7
Closes: https://bugs.gentoo.org/692966
Closes: https://bugs.gentoo.org/692966
Closes: https://bugs.gentoo.org/690512
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>
sys-fs/lde/files/lde-2.6.1-fno-common.patch | 32 +++++++++++++++++++++++++++++
sys-fs/lde/files/lde-2.6.1-respect-ar.patch | 11 ++++++++++
sys-fs/lde/files/lde-2.6.1-tinfo.patch | 22 ++++++++++++++++++++
sys-fs/lde/lde-2.6.1-r1.ebuild | 25 +++++++++++++++++-----
4 files changed, 85 insertions(+), 5 deletions(-)
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 00000000000..8e246aea95a
--- /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 00000000000..104aaf45b77
--- /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 00000000000..bb4c6c2386c
--- /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 30c88f3438e..ed69cd92632 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"
reply other threads:[~2021-01-01 18:12 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1609524735.95708ebf53cd9d24a8ad11f6ccea6fca8818fafc.sultan@gentoo \
--to=sultan@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox