gentoo resync : 20.03.2022

4 files changed, 3 insertions, 85 deletions

diff --git a/app-misc/todo/Manifest b/app-misc/todo/Manifest
index d707180fb73a..570100944968 100644
--- a/app-misc/todo/Manifest
+++ b/app-misc/todo/Manifest
@@ -1,6 +1,3 @@
-AUX todo-2.11.0-fix-bash-completion.patch 385 BLAKE2B cfb5b88e8113d45790d9dcc7a005a09816aa6658ec781b1a3a76721ff8f4d573a2ae1208fe27ae136c48747dde70d9ce2c375357c4117e0a2303dab1c648d565 SHA512 804ba00f3c3bf494c853778ad388583adc40b613c35dbe63ffc63a75660df5a12e0806ac2f3d352cb4818c2cb53ff4d49d519924d231f98ebce4af1dbb5085e5
-DIST todo-2.11.0.tar.gz 712455 BLAKE2B f9d0fa53712a49c2f6ee94c02a62c16b8184734f7bb0c9354db9d640e2f619c75e3b3468065cb51204c7872f1f155bda51b9e3387f62f0f478f80f6a99f199b4 SHA512 5500ed1aa10eceaaa3e5116605eed4f4228337fdc0f2ceaa5b889753a60576918c0953adbfbf80c40008d6dfdf854e8a538103bfed4d1015aa1c5a9876c2e47c
 DIST todo-2.12.0.tar.gz 716524 BLAKE2B 168951c50670228ba2e1438ec04f5907181073668f1e260874e48959f2e37d11ee7ba4f2b0e5e5c55c9375a31921eca258f720afe98d2a4841529ef6acbb1510 SHA512 3b30d5e395f878811831f57e8e1a040c990e1f042f57050b6381d83ffc8b92b1ce20bfd3c5aa8b5e028b4810a5b289599603b2e16efff8badac559d200ed79f5
-EBUILD todo-2.11.0.ebuild 1690 BLAKE2B 81fe3d4086516b4b9a4373013914b4b0d2656a88730c1a663619403cf2043e4d08c45408b41abbbb94cc221703479d503d9485a18f799f006f54a54228499da7 SHA512 b6878c6b764ddb214d980568555f4c4c3a6826e850a20de0f89461df152c6550a982ad41f06054bd3984626693d745692847b8af4dc9cb3d09557950af90616d
-EBUILD todo-2.12.0-r1.ebuild 1716 BLAKE2B 8bb57dddab81f57029334254ade40506d706a56fa8c6de7e9b916ae4f5dff66c9bf05d90ed40a2d394bcc86145fe0fc1a574d7abe422c446155da8abb3598f56 SHA512 19315a38d2f614b93b15ee79a1b5754e6c6368ce90bb27610b496a98e40d30593a6731ad1d8dfbb7e691d14fb572f030fde3a291d307ad34dfd22f3db81b3ba4
+EBUILD todo-2.12.0-r2.ebuild 1716 BLAKE2B 468eb8db176e0bd111f2b1a78ecc898eeb0b30a2f3004d7ce2509179870bff2b8586fa5ba29f11c2bfda6939abdd8df34cce09b2d365e5cc83207ffd88a912d6 SHA512 a22a1f579226837d0bc48c0690f974cbc33d34db9923faadbb2b8008ee73efa867f6b5bd3443546a2dfec717849545c16e0a46ae09d03fe62406531b80565cd8
 MISC metadata.xml 592 BLAKE2B a3bf583ae49dc8771c4b2d159b3ff8bc8a3b92031d8e1365151450820cb7413cbbe4cc87211055e17d04329d2260e845ad1cdaaf4a00fe7cabd5bff3963d3edd SHA512 7ac74597a84c8b269cf341c624ca4b818d87889d4c761d400ec8775d48e2765a866abfb3c06d7bfa969087c5eeaf0b2c0cbda4a93ffdd7553d142ec94b3f9187
diff --git a/app-misc/todo/files/todo-2.11.0-fix-bash-completion.patch b/app-misc/todo/files/todo-2.11.0-fix-bash-completion.patch
deleted file mode 100644
index 254c454ab8ac..000000000000
--- a/app-misc/todo/files/todo-2.11.0-fix-bash-completion.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/todo_completion b/todo_completion
-index 644be6e..964383e 100755
---- a/todo_completion
-+++ b/todo_completion
-@@ -85,6 +85,10 @@ _todo()
- }
- complete -F _todo todo.sh
- 
-+# Gentoo bug 614400
-+complete -F _todo todocli
-+complete -F _todo todotxt
-+
- # If you define an alias (e.g. "t") to todo.sh, you need to explicitly enable
- # completion for it, too:
- #complete -F _todo t
diff --git a/app-misc/todo/todo-2.11.0.ebuild b/app-misc/todo/todo-2.11.0.ebuild
deleted file mode 100644
index c3a527e1a45c..000000000000
--- a/app-misc/todo/todo-2.11.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1
-
-DESCRIPTION="A CLI-based TODO list manager"
-HOMEPAGE="http://todotxt.org"
-SRC_URI="https://github.com/todotxt/${PN}.txt-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-shells/bash"
-
-PATCHES=( "${FILESDIR}/${P}-fix-bash-completion.patch" )
-
-DOCS=( README.md CONTRIBUTING.md LICENSE todo.cfg )
-
-S="${WORKDIR}/${PN}.txt-cli-${PV}"
-
-src_prepare() {
-	default
-
-	# fix version string
-	sed -i -e "s/@DEV_VERSION@/${PV}/" todo.sh || die
-
-	# TODO_DIR variable is bogus
-	sed -i -e '/export TODO_DIR/d' todo.cfg || die
-	sed -i -e '4i export TODO_DIR="$HOME/.todo"' todo.cfg || die
-}
-
-src_install() {
-	dobin "${PN}.sh"
-	dosym "${PN}.sh" "/usr/bin/${PN}cli"
-	dosym "${PN}.sh" "/usr/bin/${PN}txt"
-	newbashcomp "${PN}_completion" "${PN}.sh"
-	bashcomp_alias "${PN}.sh" "${PN}cli" "${PN}txt"
-	einstalldocs
-}
-
-pkg_postinst() {
-	einfo
-	einfo 'Before starting todo, make sure to create'
-	einfo 'a .todo directory in your home directory:'
-	einfo '  $ mkdir -p $HOME/.todo'
-	einfo
-	einfo 'and make sure to copy the default todo'
-	einfo 'configuration file in the same location:'
-	einfo "  $ bzcat /usr/share/doc/${PF}/todo.cfg.bz2 > \$HOME/.todo/config"
-	einfo
-	einfo 'Alternatively, you can use XDG directories instead:'
-	einfo '  $ mkdir -p $HOME/.local/share/todo'
-	einfo '  $ mkdir -p $HOME/.config/todo'
-	einfo "  $ bzcat /usr/share/doc/${PF}/todo.cfg.bz2 > \$HOME/.config/todo/config"
-	einfo
-	einfo 'You can then edit this file as you see fit.'
-	einfo 'Enjoy!'
-	einfo
-}
diff --git a/app-misc/todo/todo-2.12.0-r1.ebuild b/app-misc/todo/todo-2.12.0-r2.ebuild
index 547d0e721b41..0f9cee042d49 100644
--- a/app-misc/todo/todo-2.12.0-r1.ebuild
+++ b/app-misc/todo/todo-2.12.0-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit bash-completion-r1