6 files changed, 14 insertions, 109 deletions
diff --git a/app-misc/todo/Manifest b/app-misc/todo/Manifest
index 4be1e46c2670..d4cfd196b9ca 100644
--- a/app-misc/todo/Manifest
+++ b/app-misc/todo/Manifest
@@ -1,2 +1 @@
-DIST todo-2.10.tar.gz 56509 BLAKE2B ec89d12506b5025bab8d05bab1122d48ef2e9edb811c4091c1ff96b4b18c2ced54026d3d908a565278804c15c6fbde8aef3ae5a0cb23d4b12bb36133fce5bb2c SHA512 b14d9d13948836d971f72b941770e8e2c59d171d35f074205900619c5c3efd7ca0a482887046c1865890afb6595fe27c69677c54ea5824163d291e16fa5329d3
-DIST todo-2.11.0.tar.gz 712455 BLAKE2B f9d0fa53712a49c2f6ee94c02a62c16b8184734f7bb0c9354db9d640e2f619c75e3b3468065cb51204c7872f1f155bda51b9e3387f62f0f478f80f6a99f199b4 SHA512 5500ed1aa10eceaaa3e5116605eed4f4228337fdc0f2ceaa5b889753a60576918c0953adbfbf80c40008d6dfdf854e8a538103bfed4d1015aa1c5a9876c2e47c
+DIST todo-2.12.0.tar.gz 716524 BLAKE2B 168951c50670228ba2e1438ec04f5907181073668f1e260874e48959f2e37d11ee7ba4f2b0e5e5c55c9375a31921eca258f720afe98d2a4841529ef6acbb1510 SHA512 3b30d5e395f878811831f57e8e1a040c990e1f042f57050b6381d83ffc8b92b1ce20bfd3c5aa8b5e028b4810a5b289599603b2e16efff8badac559d200ed79f5
diff --git a/app-misc/todo/files/todo-2.10-fix-bash-completion.patch b/app-misc/todo/files/todo-2.10-fix-bash-completion.patch
deleted file mode 100644
index 7e6de2f10568..000000000000
--- a/app-misc/todo/files/todo-2.10-fix-bash-completion.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./todo_completion	2017-04-08 15:18:23.102736966 +0200
-+++ ./todo_completion	2017-04-08 15:18:56.839725605 +0200
-@@ -85,6 +85,9 @@
- }
- complete -F _todo todo.sh
- 
-+# Gentoo bug 614400
-+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/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/metadata.xml b/app-misc/todo/metadata.xml
index 7c2302dd216d..f068300ba6b9 100644
--- a/app-misc/todo/metadata.xml
+++ b/app-misc/todo/metadata.xml
@@ -1,19 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>monsieurp@gentoo.org</email>
-		<name>Patrice Clement</name>
-	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>erkiferenc@gmail.com</email>
 		<name>Ferenc Erki</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">ginatrapani/todo.txt-cli</remote-id>
+		<remote-id type="github">todotxt/todo.txt-cli</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-misc/todo/todo-2.10-r2.ebuild b/app-misc/todo/todo-2.10-r2.ebuild
deleted file mode 100644
index 90a86a6929da..000000000000
--- a/app-misc/todo/todo-2.10-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-DESCRIPTION="A CLI-based TODO list manager"
-HOMEPAGE="http://todotxt.com"
-SRC_URI="https://github.com/ginatrapani/${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.textile CONTRIBUTING.md LICENSE todo.cfg )
-
-S="${WORKDIR}/${PN}.txt-cli-${PV}"
-
-src_prepare() {
-	default
-
-	# 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_test() {
-	make test || die "tests failed"
-}
-
-src_install() {
-	newbin "${PN}.sh" "${PN}cli"
-	dosym "${PN}cli" "/usr/bin/${PN}txt"
-	newbashcomp "${PN}_completion" "${PN}cli.sh"
-	bashcomp_alias "${PN}cli.sh" "${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 'You can then edit this file as you see fit.'
-	einfo 'Enjoy!'
-	einfo
-}
diff --git a/app-misc/todo/todo-2.11.0.ebuild b/app-misc/todo/todo-2.12.0-r2.ebuild
index 4db4b749f060..0f9cee042d49 100644
--- a/app-misc/todo/todo-2.11.0.ebuild
+++ b/app-misc/todo/todo-2.12.0-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 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
 
@@ -17,9 +17,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="app-shells/bash"
 
-PATCHES=( "${FILESDIR}/${P}-fix-bash-completion.patch" )
-
-DOCS=( README.md CONTRIBUTING.md LICENSE todo.cfg )
+DOCS=( README.md LICENSE todo.cfg )
 
 S="${WORKDIR}/${PN}.txt-cli-${PV}"
 
@@ -34,16 +32,9 @@ src_prepare() {
 	sed -i -e '4i export TODO_DIR="$HOME/.todo"' todo.cfg || die
 }
 
-src_test() {
-	make test || die "tests failed"
-}
-
 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
 }
 
@@ -65,4 +56,9 @@ pkg_postinst() {
 	einfo 'You can then edit this file as you see fit.'
 	einfo 'Enjoy!'
 	einfo
+	ewarn 'The Gentoo-specific todocli and todotxt aliases have been removed.'
+	ewarn 'If you still need them, add the following lines to your ~/.bashrc:'
+	ewarn
+	ewarn 'alias todocli=todo.sh'
+	ewarn 'complete -F _todo todocli'
 }