From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/prefix:master commit in: dev-util/dialog/, dev-util/dialog/files/
Date: Mon, 21 Jun 2021 05:59:35 +0000 (UTC) [thread overview]
Message-ID: <1624255103.dff5464262d280b98a1d903e5cbeb2611c6eb232.sam@gentoo> (raw)
commit: dff5464262d280b98a1d903e5cbeb2611c6eb232
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 21 05:58:23 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 21 05:58:23 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=dff54642
dev-util/dialog: drop broken EAPI 4 version
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/dialog/Manifest | 1 -
dev-util/dialog/dialog-1.1.20120706.ebuild | 77 -------------
.../dialog/files/dialog-1.1-no-usr-local.patch | 103 ------------------
.../dialog-1.1.20100428-no-path-invention.patch | 121 ---------------------
.../dialog/files/dialog-1.1.20100428-shared.patch | 80 --------------
dev-util/dialog/files/dialog-mkdirs.patch | 16 ---
dev-util/dialog/files/dialog-shared.patch | 80 --------------
7 files changed, 478 deletions(-)
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index 0d0aed2ec5..1eb24922f7 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,2 +1 @@
-DIST dialog-1.1-20120706.tgz 444554 BLAKE2B d1863ce51fee8e2ab36664b322386a1368b5c30cf11bddd49a7aec5c1760d14cfef2b515c27231b4353e60dfa758d5ab9890ae0114c0c2308e330b58de04af0e SHA512 90000dbdd33226767a45a66a60af25c0e743e78d938b329c980c929c18bcdc5e88031ef7f19ca8ab0471060ff2011aa7d52366cb094537d08ea64f5ef2e0b97d
DIST dialog-1.3-20181022.tgz 531815 BLAKE2B c6a34010eb991683356338009998964fde60bcae4181d8b07e6d5b9f0d0e9a61d3f0b112fad02c151b1774380e18b87f93f43fdfe35e0fba86914c029eaa274c SHA512 5d7891086ab6d2f4a815538513b09754a56368bbb0ec3bd107346fd2ed6ae10fa858173447fa609cce28a91e234ed8067d9439efeb973593fff2df1e811a8925
diff --git a/dev-util/dialog/dialog-1.1.20120706.ebuild b/dev-util/dialog/dialog-1.1.20120706.ebuild
deleted file mode 100644
index 6606d3fb53..0000000000
--- a/dev-util/dialog/dialog-1.1.20120706.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/dialog-1.1.20120706.ebuild,v 1.1 2012/07/18 17:25:40 jer Exp $
-
-EAPI="4"
-
-inherit multilib
-
-MY_PV="${PV/1.1./1.1-}"
-S=${WORKDIR}/${PN}-${MY_PV}
-DESCRIPTION="tool to display dialog boxes from a shell"
-HOMEPAGE="http://invisible-island.net/dialog/dialog.html"
-SRC_URI="ftp://invisible-island.net/${PN}/${PN}-${MY_PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples minimal nls static-libs unicode"
-
-RDEPEND="
- >=app-shells/bash-2.04-r3
- !unicode? ( >=sys-libs/ncurses-5.2-r5 )
- unicode? ( >=sys-libs/ncurses-5.2-r5[unicode] )
-"
-DEPEND="
- ${RDEPEND}
- nls? ( sys-devel/gettext )
- !minimal? ( sys-devel/libtool )
- !<=sys-freebsd/freebsd-contrib-8.9999
-"
-
-src_prepare() {
- sed -i configure -e '/LIB_CREATE=/s:${CC}:& ${LDFLAGS}:g' || die
- # configure searches all over the world for some things...
- sed -i configure \
- -e 's:^test -d "\(/usr\|$prefix\|/usr/local\|/opt\|$HOME\):test -d "XnoX:' || die
-}
-
-src_configure() {
- local ncursesw
- use unicode && ncursesw="w"
- # doing this libtool stuff through configure
- # (--with-libtool=/path/to/libtool) strangely breaks the build
- local glibtool="libtool"
- [[ ${CHOST} == *-darwin* ]] && glibtool="glibtool"
- export ac_cv_path_LIBTOOL="$(type -P ${glibtool})"
- econf \
- --disable-rpath-hack \
- $(use_enable nls) \
- $(use_with !minimal libtool) \
- --with-ncurses${ncursesw}
-}
-
-src_install() {
- if use minimal; then
- emake DESTDIR="${D}" install
- else
- emake DESTDIR="${D}" install-full
- fi
-
- dodoc CHANGES README
-
- if use examples; then
- docinto samples
- dodoc $( find samples -maxdepth 1 -type f )
- docinto samples/copifuncs
- dodoc $( find samples/copifuncs -maxdepth 1 -type f )
- docinto samples/install
- dodoc $( find samples/install -type f )
- fi
-
- if ! use static-libs; then
- rm -f \
- "${ED}"usr/$(get_libdir)/libdialog.a \
- "${ED}"usr/$(get_libdir)/libdialog.la
- fi
-}
diff --git a/dev-util/dialog/files/dialog-1.1-no-usr-local.patch b/dev-util/dialog/files/dialog-1.1-no-usr-local.patch
deleted file mode 100644
index e3d64a9f31..0000000000
--- a/dev-util/dialog/files/dialog-1.1-no-usr-local.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-diff -ru dialog-1.1-20080316.orig/configure dialog-1.1-20080316/configure
---- dialog-1.1-20080316.orig/configure 2008-03-25 13:54:12 +0100
-+++ dialog-1.1-20080316/configure 2008-03-25 14:18:09 +0100
-@@ -5447,15 +5449,15 @@
- test -d "$HOME/gettext/include/gettext" && cf_search="$cf_search $HOME/gettext/include/gettext"
- }
-
--test "$prefix" != /usr/local && \
--test -d /usr/local && {
-- test -n "$verbose" && echo " ... testing include-directories under /usr/local"
-- test -d /usr/local/include && cf_search="$cf_search /usr/local/include"
-- test -d /usr/local/include/gettext && cf_search="$cf_search /usr/local/include/gettext"
-- test -d /usr/local/include/gettext/include && cf_search="$cf_search /usr/local/include/gettext/include"
-- test -d /usr/local/gettext/include && cf_search="$cf_search /usr/local/gettext/include"
-- test -d /usr/local/gettext/include/gettext && cf_search="$cf_search /usr/local/gettext/include/gettext"
--}
-+#test "$prefix" != /usr/local && \
-+#test -d /usr/local && {
-+# test -n "$verbose" && echo " ... testing include-directories under /usr/local"
-+# test -d /usr/local/include && cf_search="$cf_search /usr/local/include"
-+# test -d /usr/local/include/gettext && cf_search="$cf_search /usr/local/include/gettext"
-+# test -d /usr/local/include/gettext/include && cf_search="$cf_search /usr/local/include/gettext/include"
-+# test -d /usr/local/gettext/include && cf_search="$cf_search /usr/local/gettext/include"
-+# test -d /usr/local/gettext/include/gettext && cf_search="$cf_search /usr/local/gettext/include/gettext"
-+#}
-
- test "$prefix" != NONE && \
- test -d $prefix && {
-@@ -5681,15 +5683,15 @@
- test -d "$HOME/intl/lib/intl" && cf_search="$cf_search $HOME/intl/lib/intl"
- }
-
--test "$prefix" != /usr/local && \
--test -d /usr/local && {
-- test -n "$verbose" && echo " ... testing lib-directories under /usr/local"
-- test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib"
-- test -d /usr/local/lib/intl && cf_search="$cf_search /usr/local/lib/intl"
-- test -d /usr/local/lib/intl/lib && cf_search="$cf_search /usr/local/lib/intl/lib"
-- test -d /usr/local/intl/lib && cf_search="$cf_search /usr/local/intl/lib"
-- test -d /usr/local/intl/lib/intl && cf_search="$cf_search /usr/local/intl/lib/intl"
--}
-+#test "$prefix" != /usr/local && \
-+#test -d /usr/local && {
-+# test -n "$verbose" && echo " ... testing lib-directories under /usr/local"
-+# test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib"
-+# test -d /usr/local/lib/intl && cf_search="$cf_search /usr/local/lib/intl"
-+# test -d /usr/local/lib/intl/lib && cf_search="$cf_search /usr/local/lib/intl/lib"
-+# test -d /usr/local/intl/lib && cf_search="$cf_search /usr/local/intl/lib"
-+# test -d /usr/local/intl/lib/intl && cf_search="$cf_search /usr/local/intl/lib/intl"
-+#}
-
- test "$prefix" != NONE && \
- test -d $prefix && {
-@@ -7596,15 +7598,15 @@
- test -d "$HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root" && cf_search="$cf_search $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
- }
-
--test "$prefix" != /usr/local && \
--test -d /usr/local && {
-- test -n "$verbose" && echo " ... testing include-directories under /usr/local"
-- test -d /usr/local/include && cf_search="$cf_search /usr/local/include"
-- test -d /usr/local/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root"
-- test -d /usr/local/include/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root/include"
-- test -d /usr/local/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include"
-- test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
--}
-+#test "$prefix" != /usr/local && \
-+#test -d /usr/local && {
-+ #test -n "$verbose" && echo " ... testing include-directories under /usr/local"
-+ #test -d /usr/local/include && cf_search="$cf_search /usr/local/include"
-+ #test -d /usr/local/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root"
-+ #test -d /usr/local/include/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root/include"
-+ #test -d /usr/local/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include"
-+ #test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
-+#}
-
- test "$prefix" != NONE && \
- test -d $prefix && {
-@@ -8350,15 +8352,15 @@
- test -d "$HOME/$cf_nculib_root/lib/$cf_nculib_root" && cf_search="$cf_search $HOME/$cf_nculib_root/lib/$cf_nculib_root"
- }
-
--test "$prefix" != /usr/local && \
--test -d /usr/local && {
-- test -n "$verbose" && echo " ... testing lib-directories under /usr/local"
-- test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib"
-- test -d /usr/local/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/lib/$cf_nculib_root"
-- test -d /usr/local/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/lib/$cf_nculib_root/lib"
-- test -d /usr/local/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/$cf_nculib_root/lib"
-- test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root"
--}
-+#test "$prefix" != /usr/local && \
-+#test -d /usr/local && {
-+# test -n "$verbose" && echo " ... testing lib-directories under /usr/local"
-+# test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib"
-+# test -d /usr/local/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/lib/$cf_nculib_root"
-+# test -d /usr/local/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/lib/$cf_nculib_root/lib"
-+# test -d /usr/local/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/$cf_nculib_root/lib"
-+# test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root"
-+#}
-
- test "$prefix" != NONE && \
- test -d $prefix && {
diff --git a/dev-util/dialog/files/dialog-1.1.20100428-no-path-invention.patch b/dev-util/dialog/files/dialog-1.1.20100428-no-path-invention.patch
deleted file mode 100644
index 8ac93fc710..0000000000
--- a/dev-util/dialog/files/dialog-1.1.20100428-no-path-invention.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-Don't go looking on your own for headers and libs in /opt, /usr/local,
-$HOME ...
-
---- configure
-+++ configure
-@@ -5760,17 +5760,6 @@
-
- cf_search=
-
--test "/usr" != "$prefix" && \
--test -d "/usr" && \
--(test $prefix = NONE || test -d $prefix) && {
-- test -n "$verbose" && echo " ... testing for include-directories under /usr"
-- test -d /usr/include && cf_search="$cf_search /usr/include"
-- test -d /usr/include/iconv && cf_search="$cf_search /usr/include/iconv"
-- test -d /usr/include/iconv/include && cf_search="$cf_search /usr/include/iconv/include"
-- test -d /usr/iconv/include && cf_search="$cf_search /usr/iconv/include"
-- test -d /usr/iconv/include/iconv && cf_search="$cf_search /usr/iconv/include/iconv"
--}
--
- test "$prefix" != "NONE" && \
- test -d "$prefix" && \
- {
-@@ -5782,39 +5771,6 @@
- test -d $prefix/iconv/include/iconv && cf_search="$cf_search $prefix/iconv/include/iconv"
- }
-
--test "/usr/local" != "$prefix" && \
--test -d "/usr/local" && \
--(test $prefix = NONE || test -d $prefix) && {
-- test -n "$verbose" && echo " ... testing for include-directories under /usr/local"
-- test -d /usr/local/include && cf_search="$cf_search /usr/local/include"
-- test -d /usr/local/include/iconv && cf_search="$cf_search /usr/local/include/iconv"
-- test -d /usr/local/include/iconv/include && cf_search="$cf_search /usr/local/include/iconv/include"
-- test -d /usr/local/iconv/include && cf_search="$cf_search /usr/local/iconv/include"
-- test -d /usr/local/iconv/include/iconv && cf_search="$cf_search /usr/local/iconv/include/iconv"
--}
--
--test "/opt" != "$prefix" && \
--test -d "/opt" && \
--(test $prefix = NONE || test -d $prefix) && {
-- test -n "$verbose" && echo " ... testing for include-directories under /opt"
-- test -d /opt/include && cf_search="$cf_search /opt/include"
-- test -d /opt/include/iconv && cf_search="$cf_search /opt/include/iconv"
-- test -d /opt/include/iconv/include && cf_search="$cf_search /opt/include/iconv/include"
-- test -d /opt/iconv/include && cf_search="$cf_search /opt/iconv/include"
-- test -d /opt/iconv/include/iconv && cf_search="$cf_search /opt/iconv/include/iconv"
--}
--
--test "$HOME" != "$prefix" && \
--test -d "$HOME" && \
--(test $prefix = NONE || test -d $prefix) && {
-- test -n "$verbose" && echo " ... testing for include-directories under $HOME"
-- test -d $HOME/include && cf_search="$cf_search $HOME/include"
-- test -d $HOME/include/iconv && cf_search="$cf_search $HOME/include/iconv"
-- test -d $HOME/include/iconv/include && cf_search="$cf_search $HOME/include/iconv/include"
-- test -d $HOME/iconv/include && cf_search="$cf_search $HOME/iconv/include"
-- test -d $HOME/iconv/include/iconv && cf_search="$cf_search $HOME/iconv/include/iconv"
--}
--
- test "$includedir" != NONE && \
- test "$includedir" != "/usr/include" && \
- test -d "$includedir" && {
-@@ -10312,17 +10268,6 @@
-
- cf_search=
-
--test "/usr" != "$prefix" && \
--test -d "/usr" && \
--(test $prefix = NONE || test -d $prefix) && {
-- test -n "$verbose" && echo " ... testing for lib-directories under /usr"
-- test -d /usr/lib && cf_search="$cf_search /usr/lib"
-- test -d /usr/lib/$cf_nculib_root && cf_search="$cf_search /usr/lib/$cf_nculib_root"
-- test -d /usr/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/lib/$cf_nculib_root/lib"
-- test -d /usr/$cf_nculib_root/lib && cf_search="$cf_search /usr/$cf_nculib_root/lib"
-- test -d /usr/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /usr/$cf_nculib_root/lib/$cf_nculib_root"
--}
--
- test "$prefix" != "NONE" && \
- test -d "$prefix" && \
- {
-@@ -10334,39 +10279,6 @@
- test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root"
- }
-
--test "/usr/local" != "$prefix" && \
--test -d "/usr/local" && \
--(test $prefix = NONE || test -d $prefix) && {
-- test -n "$verbose" && echo " ... testing for lib-directories under /usr/local"
-- test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib"
-- test -d /usr/local/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/lib/$cf_nculib_root"
-- test -d /usr/local/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/lib/$cf_nculib_root/lib"
-- test -d /usr/local/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/$cf_nculib_root/lib"
-- test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root"
--}
--
--test "/opt" != "$prefix" && \
--test -d "/opt" && \
--(test $prefix = NONE || test -d $prefix) && {
-- test -n "$verbose" && echo " ... testing for lib-directories under /opt"
-- test -d /opt/lib && cf_search="$cf_search /opt/lib"
-- test -d /opt/lib/$cf_nculib_root && cf_search="$cf_search /opt/lib/$cf_nculib_root"
-- test -d /opt/lib/$cf_nculib_root/lib && cf_search="$cf_search /opt/lib/$cf_nculib_root/lib"
-- test -d /opt/$cf_nculib_root/lib && cf_search="$cf_search /opt/$cf_nculib_root/lib"
-- test -d /opt/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /opt/$cf_nculib_root/lib/$cf_nculib_root"
--}
--
--test "$HOME" != "$prefix" && \
--test -d "$HOME" && \
--(test $prefix = NONE || test -d $prefix) && {
-- test -n "$verbose" && echo " ... testing for lib-directories under $HOME"
-- test -d $HOME/lib && cf_search="$cf_search $HOME/lib"
-- test -d $HOME/lib/$cf_nculib_root && cf_search="$cf_search $HOME/lib/$cf_nculib_root"
-- test -d $HOME/lib/$cf_nculib_root/lib && cf_search="$cf_search $HOME/lib/$cf_nculib_root/lib"
-- test -d $HOME/$cf_nculib_root/lib && cf_search="$cf_search $HOME/$cf_nculib_root/lib"
-- test -d $HOME/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $HOME/$cf_nculib_root/lib/$cf_nculib_root"
--}
--
- cf_search="$cf_library_path_list $cf_search"
-
- for cf_libdir in $cf_search
diff --git a/dev-util/dialog/files/dialog-1.1.20100428-shared.patch b/dev-util/dialog/files/dialog-1.1.20100428-shared.patch
deleted file mode 100644
index adcd803e44..0000000000
--- a/dev-util/dialog/files/dialog-1.1.20100428-shared.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- dialog-1.1-20100428/aclocal.m4
-+++ dialog-1.1-20100428/aclocal.m4
-@@ -3460,6 +3460,7 @@
- ])
- # common library maintenance symbols that are convenient for libtool scripts:
- LIB_CREATE='${AR} -cr'
-+LIB_LIBS=''
- LIB_OBJECT='${OBJECTS}'
- LIB_SUFFIX=.a
- LIB_PREP="$RANLIB"
-@@ -3494,7 +3495,8 @@
- AC_MSG_ERROR(Cannot find libtool)
- fi
- ])dnl
-- LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} -o'
-+ LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} ${LDFLAGS} -o'
-+ LIB_LIBS='$(LIBS)'
- LIB_OBJECT='${OBJECTS:.o=.lo}'
- LIB_SUFFIX=.la
- LIB_CLEAN='${LIBTOOL} --mode=clean'
-@@ -3547,6 +3549,7 @@
- AC_SUBST(LIBTOOL_OPTS)
-
- AC_SUBST(LIB_CREATE)
-+AC_SUBST(LIB_LIBS)
- AC_SUBST(LIB_OBJECT)
- AC_SUBST(LIB_SUFFIX)
- AC_SUBST(LIB_PREP)
---- dialog-1.1-20100428/configure
-+++ dialog-1.1-20100428/configure
-@@ -8305,6 +8305,7 @@
-
- # common library maintenance symbols that are convenient for libtool scripts:
- LIB_CREATE='${AR} -cr'
-+LIB_LIBS=''
- LIB_OBJECT='${OBJECTS}'
- LIB_SUFFIX=.a
- LIB_PREP="$RANLIB"
-@@ -8409,7 +8410,8 @@
- echo "$as_me: error: Cannot find libtool" >&2;}
- { (exit 1); exit 1; }; }
- fi
-- LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} -o'
-+ LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} ${LDFLAGS} -o'
-+ LIB_LIBS='$(LIBS)'
- LIB_OBJECT='${OBJECTS:.o=.lo}'
- LIB_SUFFIX=.la
- LIB_CLEAN='${LIBTOOL} --mode=clean'
-@@ -13848,6 +13850,7 @@
- s,@LIBTOOL_CXX@,$LIBTOOL_CXX,;t t
- s,@LIBTOOL_OPTS@,$LIBTOOL_OPTS,;t t
- s,@LIB_CREATE@,$LIB_CREATE,;t t
-+s,@LIB_LIBS@,$LIB_LIBS,;t t
- s,@LIB_OBJECT@,$LIB_OBJECT,;t t
- s,@LIB_SUFFIX@,$LIB_SUFFIX,;t t
- s,@LIB_PREP@,$LIB_PREP,;t t
---- dialog-1.1-20100428/makefile.in
-+++ dialog-1.1-20100428/makefile.in
-@@ -54,6 +54,7 @@
- LIBTOOL_CLEAN = @LIB_CLEAN@
- LIBTOOL_COMPILE = @LIB_COMPILE@
- LIBTOOL_CREATE = @LIB_CREATE@
-+LIBTOOL_LIBS = @LIB_LIBS@
- LIBTOOL_LINK = @LIB_LINK@
- LIBTOOL_INSTALL = @LIB_INSTALL@
- LIBTOOL_UNINSTALL = @LIB_UNINSTALL@
-@@ -140,11 +141,11 @@
- $(OBJECTS) : $(srcdir)/dialog.h $(srcdir)/dlg_keys.h dlg_config.h VERSION
-
- $(LIB) : $(LIB_OBJECT)
-- $(LIBTOOL_CREATE) $(LIB) $(LIB_OBJECT)
-+ $(LIBTOOL_CREATE) $(LIB) $(LIB_OBJECT) $(LIBTOOL_LIBS)
- $(RANLIB) $@
-
- dialog$x : $(LIB) dialog$o @INTLDIR_MAKE@ @INTLLIBS@
-- $(LINK) -o $@ dialog$o -L. -ldialog $(LDFLAGS) $(LIBS)
-+ $(LINK) $(LDFLAGS) -o $@ dialog$o -L. -ldialog $(LIBS)
-
- clean \
- distclean \
diff --git a/dev-util/dialog/files/dialog-mkdirs.patch b/dev-util/dialog/files/dialog-mkdirs.patch
deleted file mode 100644
index 70bdcef40c..0000000000
--- a/dev-util/dialog/files/dialog-mkdirs.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- mkdirs.sh.orig 2007-03-19 16:28:39.000000000 +0100
-+++ mkdirs.sh 2007-03-19 16:28:56.000000000 +0100
-@@ -21,11 +21,11 @@
- esac
-
- if test ! -d "$pathcomp"; then
-- echo "mkdir $pathcomp" 1>&2
-+ echo "mkdir -p $pathcomp" 1>&2
- case "$pathcomp" in
- [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]: )
- ;; # DOSISH systems
-- * ) mkdir "$pathcomp" || errstatus=$? ;;
-+ * ) mkdir -p "$pathcomp" || errstatus=$? ;;
- esac
- fi
-
diff --git a/dev-util/dialog/files/dialog-shared.patch b/dev-util/dialog/files/dialog-shared.patch
deleted file mode 100644
index 9e58ba48a4..0000000000
--- a/dev-util/dialog/files/dialog-shared.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- dialog-1.1-20080819/aclocal.m4
-+++ dialog-1.1-20080819/aclocal.m4
-@@ -3037,6 +3037,7 @@
- ])
- # common library maintenance symbols that are convenient for libtool scripts:
- LIB_CREATE='${AR} -cr'
-+LIB_LIBS=''
- LIB_OBJECT='${OBJECTS}'
- LIB_SUFFIX=.a
- LIB_PREP="$RANLIB"
-@@ -3071,7 +3072,8 @@
- AC_MSG_ERROR(Cannot find libtool)
- fi
- ])dnl
-- LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o'
-+ LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LDFLAGS} -o'
-+ LIB_LIBS='$(LIBS)'
- LIB_OBJECT='${OBJECTS:.o=.lo}'
- LIB_SUFFIX=.la
- LIB_CLEAN='${LIBTOOL} --mode=clean'
-@@ -3114,6 +3116,7 @@
- AC_SUBST(LIBTOOL_OPTS)
-
- AC_SUBST(LIB_CREATE)
-+AC_SUBST(LIB_LIBS)
- AC_SUBST(LIB_OBJECT)
- AC_SUBST(LIB_SUFFIX)
- AC_SUBST(LIB_PREP)
---- dialog-1.1-20080819/configure
-+++ dialog-1.1-20080819/configure
-@@ -7113,6 +7113,7 @@
-
- # common library maintenance symbols that are convenient for libtool scripts:
- LIB_CREATE='${AR} -cr'
-+LIB_LIBS=''
- LIB_OBJECT='${OBJECTS}'
- LIB_SUFFIX=.a
- LIB_PREP="$RANLIB"
-@@ -7217,7 +7218,8 @@
- echo "$as_me: error: Cannot find libtool" >&2;}
- { (exit 1); exit 1; }; }
- fi
-- LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o'
-+ LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LDFLAGS} -o'
-+ LIB_LIBS='$(LIBS)'
- LIB_OBJECT='${OBJECTS:.o=.lo}'
- LIB_SUFFIX=.la
- LIB_CLEAN='${LIBTOOL} --mode=clean'
-@@ -11460,6 +11462,7 @@
- s,@LIBTOOL_CXX@,$LIBTOOL_CXX,;t t
- s,@LIBTOOL_OPTS@,$LIBTOOL_OPTS,;t t
- s,@LIB_CREATE@,$LIB_CREATE,;t t
-+s,@LIB_LIBS@,$LIB_LIBS,;t t
- s,@LIB_OBJECT@,$LIB_OBJECT,;t t
- s,@LIB_SUFFIX@,$LIB_SUFFIX,;t t
- s,@LIB_PREP@,$LIB_PREP,;t t
---- dialog-1.1-20080819/makefile.in
-+++ dialog-1.1-20080819/makefile.in
-@@ -51,6 +51,7 @@
- LIBTOOL_CLEAN = @LIB_CLEAN@
- LIBTOOL_COMPILE = @LIB_COMPILE@
- LIBTOOL_CREATE = @LIB_CREATE@
-+LIBTOOL_LIBS = @LIB_LIBS@
- LIBTOOL_LINK = @LIB_LINK@
- LIBTOOL_INSTALL = @LIB_INSTALL@
- LIBTOOL_UNINSTALL = @LIB_UNINSTALL@
-@@ -125,11 +126,11 @@
- $(OBJECTS) : $(srcdir)/dialog.h $(srcdir)/dlg_keys.h dlg_config.h VERSION
-
- $(LIB) : $(LIB_OBJECT)
-- $(LIBTOOL_CREATE) $(LIB) $(LIB_OBJECT)
-+ $(LIBTOOL_CREATE) $(LIB) $(LIB_OBJECT) $(LIBTOOL_LIBS)
- $(RANLIB) $@
-
- dialog$x : $(LIB) dialog$o @INTLDIR_MAKE@ @INTLLIBS@
-- $(LINK) -o $@ dialog$o -L. -ldialog $(LDFLAGS) $(LIBS)
-+ $(LINK) $(LDFLAGS) -o $@ dialog$o -L. -ldialog $(LIBS)
-
- clean \
- distclean \
reply other threads:[~2021-06-21 5:59 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=1624255103.dff5464262d280b98a1d903e5cbeb2611c6eb232.sam@gentoo \
--to=sam@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