gentoo (valentine's day) resync : 14.02.2021

5 files changed, 32 insertions, 35 deletions

diff --git a/app-misc/devtodo/Manifest b/app-misc/devtodo/Manifest
index e2b369235c9b..c0bd069e5022 100644
--- a/app-misc/devtodo/Manifest
+++ b/app-misc/devtodo/Manifest
@@ -1,7 +1,7 @@
-AUX devtodo-0.1.20-bashcom_spaces.patch 1077 BLAKE2B f4c2a9fbcda727ceee4f28376331744856845dbc4eda1fdfd9cfaad254ad0119b7b687053eafdb6791f046f65b8d3dcc839a9c95207991eca2731550eb0de326 SHA512 8e2934b40fba0397fc21ca9084ddb0c6f65fd9715656dd520fd90ece7c04be2d5733e52a568d1786e9a7fea3dc58f4eb4ce988ace6dc8fa23a8b9a192b6fa54b
-AUX devtodo-0.1.20-gcc43.patch 217 BLAKE2B 9d8af6ddf3036120498fda96bc493b3ce5e480e678e2ca4eb07917857383728390e45f1947c765003bad76f77e951a595edfa5b500137f6189489cc678c994a3 SHA512 2a34a52467f61704031dc1ab568c5909fa165d6f4fcf007726611e80437b805fe70a16d3ed6080d5ad83dd934a05fdf3de46a0a84e5679efbdd0ca2e41b8a99c
-AUX devtodo-0.1.20-gentoo.diff 3744 BLAKE2B f80130ba310593442d92013a51186af2ec082c0c4cde25981432ccab76a77dad38197e8d84b9939d3ad78e6442196315b446d431daa675bb082e488723b86a48 SHA512 f2a6de30807c2ec718725491d92f4906c50b944eff389e15d17cb2982127112d443e08096b6923ca76ca720832afc1fd561bd55a327ffa435e1e21abda07abbb
+AUX devtodo-0.1.20-bashcom_spaces.patch 872 BLAKE2B 2ee88feb37d7d693439f7479a3b715287b1c75c7f75b8d477e3fef4f21c9056ab066cff34eea04fa6e9e56e9de1bcdd13885abe0d503379fb118fd25d27fbd76 SHA512 98951ab084217194c2c89dd72eb3518d8010727185641faf0dde3e86e5aa6348bd305777d501debb9b6210382fd94a3d5b9ca5deb00a2a8357d525faf6036afe
+AUX devtodo-0.1.20-gcc43.patch 186 BLAKE2B 6207710d08010b608542810aeaa116cdc6268e4d7c20665af37602cfe3afb71f6749b47a3ed35e081da296ebb90decca0727bf3a41b03ff45345e6a0c6fe328a SHA512 f178f7db3fe8e60f5225de926c00ada3bf02a9ea3c173fd6884d338d6be4cc314e146d8e5291180cb8942f53c051f07e1877fd4980da92406f1ec27a68a48255
+AUX devtodo-0.1.20-gentoo.patch 3167 BLAKE2B 505d6b85188f2bedc08d2192455a64f49a7e8e4b7aec1f59b77fdb70f485e62fd4e4643185fb0d504b6981b6073514048cf051bfc21848435150ed1ef70008a8 SHA512 ae1832330b8368ce39e02afb26bc177ba48b9f877761f01293c0fbe2ce18c88403bc0622610ce18c0a10ee5192d0edab95181e9f9c6fac85843cf2ff0db7fdf2
 AUX devtodo.bash-completion 1424 BLAKE2B 10166a35074d1f501d76a0f60e383c6f6198242b4c22ae2b17468f887e2d6caa2466bbfae290d76cf8199156703591633aaa755298c7ebcd1274faa09656a369 SHA512 6139218a2bc4d06f2af23fc04247e8fa3d70eaf3affe326dbb8b1bbbb880f2534f1c1bf4c54079231bed7c1c64465705deb5a5cb1a0f4ca5415ccddae726b20b
 DIST devtodo-0.1.20.tar.gz 390935 BLAKE2B 1605fb6ae6f416ea9b7c072463aacedf7fe997a362b3188addce9c6fbdd9bf99f2f7d4524870fb09f0a0c29e9886011a8fae737388a3151ecc489f3fe4fec980 SHA512 58cff0455c735af4530fc9321d1eade8272dd5759eeb8a688a641c9be11830b87be116801e3cd1d90a27e070775fa00d7b4d6b3399eba7aad5c752bfda9c28fb
-EBUILD devtodo-0.1.20-r3.ebuild 1674 BLAKE2B 365cf485650832eff62764df6c2123fd05a8ce5e6258aec725997eb62d6ea60d02a9ffafe28e056d5820996c522066f308cb104755a5b9b4528ce5f40d21da45 SHA512 39136e17534b8d3b7fd1313bbc6b57f60326867aab74a6f661c6ca39f9ae6c0f0a3300d694544b17c2772592f00d0cba5b793b72e92a190eb7b8eb44e2854312
+EBUILD devtodo-0.1.20-r3.ebuild 1615 BLAKE2B 60113996d1122b3b06c44b77241102bb02d4a8255471668020e8e55846a7f67ee5a1677808177c1830ad157e02ba5972cd513027d0055b30359c07a2ab2bb7c7 SHA512 121f66070020969d83d6e33df389257e868dd02743183f92f73461ba06c9a15763b78c535995c5d9934fd7b5b1b388774c0fd13640054d1f6a8a7df6d08b1df3
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/devtodo/devtodo-0.1.20-r3.ebuild b/app-misc/devtodo/devtodo-0.1.20-r3.ebuild
index 8e8653c62509..7be802db3607 100644
--- a/app-misc/devtodo/devtodo-0.1.20-r3.ebuild
+++ b/app-misc/devtodo/devtodo-0.1.20-r3.ebuild
@@ -1,12 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils bash-completion-r1 eutils flag-o-matic toolchain-funcs
+inherit autotools bash-completion-r1 flag-o-matic
 
 DESCRIPTION="A nice command line todo list for developers"
 HOMEPAGE="http://swapoff.org/DevTodo"
@@ -15,8 +12,8 @@ SRC_URI="http://swapoff.org/files/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	>=sys-libs/ncurses-5.2:0=
 	>=sys-libs/readline-4.1:0="
@@ -25,12 +22,16 @@ DEPEND="${RDEPEND}"
 DOCS=( AUTHORS ChangeLog QuickStart README doc/scripts.sh doc/scripts.tcsh doc/todorc.example )
 
 PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.diff
+	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-gcc43.patch
 	"${FILESDIR}"/${P}-bashcom_spaces.patch
 )
 
 src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+
 	# fix regex.h issue on case-insensitive file-systems #332235
 	sed \
 		-e 's/Regex.h/DTRegex.h/' \
@@ -41,7 +42,7 @@ src_prepare() {
 		-e "/^LIBS/s:$: $($(tc-getPKG_CONFIG) --libs ncursesw):g" \
 		-i src/Makefile.am  || die
 
-	autotools-utils_src_prepare
+	eautoreconf
 }
 
 src_configure() {
@@ -50,11 +51,12 @@ src_configure() {
 	local myeconfargs=(
 		--sysconfdir="${EPREFIX}/etc/devtodo"
 	)
-	autotools-utils_src_configure
+
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
-	autotools-utils_src_install
+	default
 
 	newbashcomp contrib/${PN}.bash-completion ${PN}
 	rm contrib/${PN}.bash-completion || die 'rm failed'
diff --git a/app-misc/devtodo/files/devtodo-0.1.20-bashcom_spaces.patch b/app-misc/devtodo/files/devtodo-0.1.20-bashcom_spaces.patch
index 8567ab4b0562..6fd38a077212 100644
--- a/app-misc/devtodo/files/devtodo-0.1.20-bashcom_spaces.patch
+++ b/app-misc/devtodo/files/devtodo-0.1.20-bashcom_spaces.patch
@@ -1,8 +1,3 @@
- contrib/devtodo.bash-completion | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/contrib/devtodo.bash-completion b/contrib/devtodo.bash-completion
-index 07139b0..c058dad 100644
 --- a/contrib/devtodo.bash-completion
 +++ b/contrib/devtodo.bash-completion
 @@ -15,20 +15,20 @@ _devtodo() {
diff --git a/app-misc/devtodo/files/devtodo-0.1.20-gcc43.patch b/app-misc/devtodo/files/devtodo-0.1.20-gcc43.patch
index f9f920545805..cc388953fbb7 100644
--- a/app-misc/devtodo/files/devtodo-0.1.20-gcc43.patch
+++ b/app-misc/devtodo/files/devtodo-0.1.20-gcc43.patch
@@ -1,5 +1,5 @@
---- devtodo-0.1.20.orig/src/todoterm.cc
-+++ devtodo-0.1.20/src/todoterm.cc
+--- a/src/todoterm.cc
++++ b/src/todoterm.cc
 @@ -2,6 +2,7 @@
  #include "todoterm.h"
  
diff --git a/app-misc/devtodo/files/devtodo-0.1.20-gentoo.diff b/app-misc/devtodo/files/devtodo-0.1.20-gentoo.patch
index 05c36a31880c..5be7bdca9c81 100644
--- a/app-misc/devtodo/files/devtodo-0.1.20-gentoo.diff
+++ b/app-misc/devtodo/files/devtodo-0.1.20-gentoo.patch
@@ -1,5 +1,5 @@
---- devtodo-0.1.20.orig/doc/devtodo.1.in	2004-12-17 10:21:09.135350872 -0500
-+++ devtodo-0.1.20/doc/devtodo.1.in	2004-12-17 10:21:34.050210242 -0500
+--- a/doc/devtodo.1.in
++++ b/doc/devtodo.1.in
 @@ -20,9 +20,6 @@
  .TP 
  \fBtdd \fI<indices>\fP\fP
@@ -16,13 +16,13 @@
  User-specific options are specified in this file. Please refer to the section \fBTODORC\fR for more information.
 +.SH "BUGS"
 +.LP
-+Because of a conflict with app-misc/tdl, the tdl symbolic link and the tdl manual page have been removed.  
++Because of a conflict with app-misc/tdl, the tdl symbolic link and the tdl manual page have been removed.
 +See \fIhttp://bugs.gentoo.org/show_bug.cgi?id=55371\fR for more information.
  .SH "AUTHORS"
  .LP 
  Alec Thomas \fI<alec@swapoff.org>\fR
---- devtodo-0.1.20.orig/doc/Makefile.am	2004-12-17 10:21:09.135350872 -0500
-+++ devtodo-0.1.20/doc/Makefile.am	2004-12-17 10:21:34.050210242 -0500
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
 @@ -1,5 +1,5 @@
  man_MANS=devtodo.1
 -manlinks=tda tdr tdd tde tdl todo
@@ -30,8 +30,8 @@
  
  install-data-local:
  	mkdir -p $(DESTDIR)$(mandir)/man1
---- devtodo-0.1.20.orig/src/TodoDB.cc	2004-12-17 10:21:09.136350706 -0500
-+++ devtodo-0.1.20/src/TodoDB.cc	2004-12-17 10:21:34.054209577 -0500
+--- a/src/TodoDB.cc
++++ b/src/TodoDB.cc
 @@ -949,7 +948,11 @@
  	if (out.bad()) 
  		throw exception("couldn't open TODO for generation");
@@ -45,8 +45,8 @@
  	if (options.verbose > 1)
  		cout << "todo: generating using format '" << options.format["verbose-generated"] << "'" << endl;
  	filterView();
---- devtodo-0.1.20/contrib/devtodo.bash-completion	{cset 9b4d9f02-fdb7-4641-b07f-7359b794d6b0}
-+++ devtodo-0.1.20/contrib/devtodo.bash-completion	{local clone}
+--- a/contrib/devtodo.bash-completion
++++ b/contrib/devtodo.bash-completion
 @@ -35,6 +35,6 @@ _devtodo() {
              ;;
      esac
@@ -55,8 +55,8 @@
 +complete -o filenames -F _devtodo devtodo todo tda tde tdr tdd
  
  # vim: set ft=sh tw=80 sw=4 et :
---- devtodo-0.1.20/src/support.cc	{cset 5f5bd9cb-18fb-4046-bff5-4f3dbd781e47}
-+++ devtodo-0.1.20/src/support.cc	{local clone}
+--- a/src/support.cc
++++ b/src/support.cc
 @@ -289,11 +289,10 @@ enum { Help = -100, Remove, Version, Tit
  					<< "Where <arguments> can be any of the following:" << endl;
  				args.displayHelp(cout, options.columns);
@@ -72,8 +72,8 @@
  					<< "eg. tde 1" << endl;
  				exit(0);
  			break;
---- devtodo-0.1.20/src/Makefile.am	2007-09-17 12:12:55.000000000 +0200
-+++ devtodo-0.1.20/src/Makefile.am	2007-09-17 12:13:43.000000000 +0200
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -1,7 +1,7 @@
  bin_PROGRAMS=devtodo
  devtodo_SOURCES=Todo.cc Todo.h TodoDB.cc TodoDB.h support.cc support.h \