From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- app-misc/cdargs/Manifest | 6 +- app-misc/cdargs/cdargs-1.35-r2.ebuild | 19 +++-- .../cdargs/files/cdargs-1.35-format_security.patch | 89 ---------------------- app-misc/cdargs/files/cdargs-1.35-tinfo.patch | 5 -- 4 files changed, 14 insertions(+), 105 deletions(-) (limited to 'app-misc/cdargs') diff --git a/app-misc/cdargs/Manifest b/app-misc/cdargs/Manifest index aa17b1c9a552..6f5e200a2da7 100644 --- a/app-misc/cdargs/Manifest +++ b/app-misc/cdargs/Manifest @@ -1,6 +1,6 @@ AUX 50cdargs-gentoo.el 270 BLAKE2B d39eb5ffd0e910aae99706b6e802621180a090d6ee221b5fad300b37c3a337bfa6f7aa0e0673e6776b8090bad9e8ded919d242e2d47c293dd102a64b01238ba7 SHA512 ee6765ea4222102678d482a3728e2ba3aac0b0709b6148b7d7755421e00125be0b15a41bce2d8fce4340865a10863f519d5c87729aa66ec9216e9618cf059f75 -AUX cdargs-1.35-format_security.patch 4482 BLAKE2B bf7eb8cde3061bee105ca5f16fafa65fa43a0f600f80998e4d0e4244e277f4a0c557fade1a3a384642a75494a5cf1f94d4b678bb2d3322c128cf995eda495213 SHA512 379d220d9d257af5e260a4234653520d08078c2a89d30216f9d6c1b77e6aa18ff82d1c609203ceebd78ba238077acf0eda34d2a1e00fb059db6ba7a9fedfe3ff -AUX cdargs-1.35-tinfo.patch 624 BLAKE2B 82a3210fbed0fd4f5903ef621a330e8eb01a9169e29cb2c09784c135581c5d08969c26b14e48797a27a3d73390371c8931ca00e1418de8bf01ccf5215435f50f SHA512 3f332d2f76c71affa92ab30b527621dafae09655b71839598784498fb7b07e5967907d6977bb2321ea7043a9c82d6dc2273c3bb5bf0fa7a8d4b11635442640b6 +AUX cdargs-1.35-format_security.patch 212 BLAKE2B 0abb8f8e238f25425dac6fed3b43846370634e4129186b39b72772f6d6d761a67aff678a2388df576da4c230364e103a1609e3ddf57fb8550685ba642cafbe9c SHA512 33e96c48ccc4fb09359eb1720488f5ed231e3c5b40fbd7ce71ca0903e4c17095d60f9d3b2bc506402839ef6c6b8e88bba2548120a1c59464d83070e3d782d750 +AUX cdargs-1.35-tinfo.patch 482 BLAKE2B dd9d06363022048293034643d495fc16fd0d1fdfef8190034fbdfb1e6e1c4654a34da6454e1c0bf553880eb512202c208c9d4d9aead7ad4a8f4d7993ec0943fe SHA512 54bf6faa9dfafa7b6749cbd94518e8735e5cdc9a2dcd477e7d3a98a96d64a90277871761058c11a54722331edccb850fa20b4a1f857ef9e1520f9875951c6873 DIST cdargs-1.35.tar.gz 74103 BLAKE2B 06fa5b4ed7c00dbcceeda28c2b02dd46431748434a692f3690885dc1141764e8aacef2e09cab57cf1baab32cb66c5c39a846a09fd6381723f47cd8dc98c8584f SHA512 13df5d18de6f62309a0ecccc0dd95508d81d1955f87cfd2962360d3b7d74c5cdc2b0d2e00f7a4f1e7556bfbcbd3e2ecf4847a1a48ab47442e6d2d5a36db0cf0c -EBUILD cdargs-1.35-r2.ebuild 1529 BLAKE2B 4d593f0c0bc9de436d93fd37e2a39eefe9c93ce849b496b599d4fa14b92397bb89576610066e1a5266e4d718b5a8f0ad7dd10528d9c120058a8754ed8e3f77cd SHA512 6456d40c8b2a5a85785a0f7dca210879d4c964e873bfe2ab91ba3a0da94ac96d241b0a87859405abdeca7a3432ad9f63c3569937315a23676065f9fb25745579 +EBUILD cdargs-1.35-r2.ebuild 1509 BLAKE2B 763746b9efc5f2dc87eae6d45b493aebf68a721df30e65cd7ad9c19c67e4ed62a69b42432603bc563ef5cf9d1fe8102d15687a982fc6d2c3db9342066010eda9 SHA512 8eee6d3ab9152b6d1167b0b01877f3ef508b9dd945e2261f1b094d4f429c83fca80bec9409e28010a907edf3d84d314056257500f833ed199e81d0d1969abfb1 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25 diff --git a/app-misc/cdargs/cdargs-1.35-r2.ebuild b/app-misc/cdargs/cdargs-1.35-r2.ebuild index c1a76560ba1f..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-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit autotools elisp-common eutils +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
- - - -
-
-
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);
  }
  
-
-
- -
- - 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