From 711c6d8e242041de9090f022176ebce28e3ebd50 Mon Sep 17 00:00:00 2001 From: Sam James Date: Mon, 19 Apr 2021 04:14:59 +0000 Subject: app-misc/cdargs: port to EAPI 7, remove HTML from patch(!) Signed-off-by: Sam James --- app-misc/cdargs/cdargs-1.35-r2.ebuild | 17 +++-- .../cdargs/files/cdargs-1.35-format_security.patch | 89 ---------------------- app-misc/cdargs/files/cdargs-1.35-tinfo.patch | 5 -- 3 files changed, 10 insertions(+), 101 deletions(-) (limited to 'app-misc') diff --git a/app-misc/cdargs/cdargs-1.35-r2.ebuild b/app-misc/cdargs/cdargs-1.35-r2.ebuild index db643cd46934..49a232fae2de 100644 --- a/app-misc/cdargs/cdargs-1.35-r2.ebuild +++ b/app-misc/cdargs/cdargs-1.35-r2.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit autotools elisp-common epatch +inherit autotools elisp-common DESCRIPTION="Bookmarks and browser for the shell builtin cd command" HOMEPAGE="http://www.skamphausen.de/cgi-bin/ska/CDargs" @@ -16,7 +16,8 @@ IUSE="emacs" DEPEND=" sys-libs/ncurses:0= - emacs? ( >=app-editors/emacs-23.1:* )" + emacs? ( >=app-editors/emacs-23.1:* ) +" RDEPEND="${DEPEND}" SITEFILE=50${PN}-gentoo.el @@ -24,10 +25,11 @@ SITEFILE=50${PN}-gentoo.el PATCHES=( "${FILESDIR}"/${P}-format_security.patch "${FILESDIR}"/${P}-tinfo.patch - ) +) src_prepare() { - epatch "${PATCHES[@]}" + default + mv configure.{in,ac} || die eautoreconf } @@ -41,12 +43,13 @@ src_compile() { src_install() { default - cd "${S}/contrib" || die + cd "${S}"/contrib || die insinto /usr/share/cdargs doins cdargs-bash.sh cdargs-tcsh.csh + if use emacs ; then elisp-install ${PN} cdargs.{el,elc} - elisp-site-file-install "${FILESDIR}/${SITEFILE}" + elisp-site-file-install "${FILESDIR}"/${SITEFILE} fi } diff --git a/app-misc/cdargs/files/cdargs-1.35-format_security.patch b/app-misc/cdargs/files/cdargs-1.35-format_security.patch index 978a8e92c088..525ad2434651 100644 --- a/app-misc/cdargs/files/cdargs-1.35-format_security.patch +++ b/app-misc/cdargs/files/cdargs-1.35-format_security.patch @@ -1,86 +1,3 @@ - - - -cdargs.git - cdargs - - - - - - - - - - - -
- - - - -
-summaryrefslogtreecommitdiffstats
- - - -
-
-
path: root/cdargs-1.35_format_security.patch
blob: 3ddc550e607e9f908b891c7e3626ee256484607e (plain) - - -
1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-
diff --git a/src/cdargs.cc b/src/cdargs.cc
-index e505e4e..1fdfeb8 100644
 --- a/src/cdargs.cc
 +++ b/src/cdargs.cc
 @@ -1301,7 +1301,7 @@ void helpscreen(void) {
@@ -92,9 +9,3 @@ index e505e4e..1fdfeb8 100644
      exit(1);
  }
  
-
-
-
generated by cgit v0.10.2 at 2015-06-21 13:46:50 (GMT)
-
- - diff --git a/app-misc/cdargs/files/cdargs-1.35-tinfo.patch b/app-misc/cdargs/files/cdargs-1.35-tinfo.patch index d85a3b9b685c..a4ca4e28b10b 100644 --- a/app-misc/cdargs/files/cdargs-1.35-tinfo.patch +++ b/app-misc/cdargs/files/cdargs-1.35-tinfo.patch @@ -1,8 +1,3 @@ - configure.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index a21d664..263929e 100644 --- a/configure.in +++ b/configure.in @@ -8,10 +8,11 @@ dnl if test "$has_curses" = "false" ; then -- cgit v1.2.3-65-gdbad