gentoo resync : 23.09.2020

3 files changed, 20 insertions, 26 deletions

diff --git a/app-misc/todo/Manifest b/app-misc/todo/Manifest
index 057b1dcbe798..833014ab1c8c 100644
--- a/app-misc/todo/Manifest
+++ b/app-misc/todo/Manifest
@@ -1,7 +1,6 @@
-AUX todo-2.10-fix-bash-completion.patch 344 BLAKE2B 8e19719ce96559e49715bec34e6e4b90ea2c3dae9d4a4ecd1a05be51919f5ae8d7a1a29fa55ae3d70d0c42e8e55b6bab596b598116a5f8399a9a4e95df3415e9 SHA512 eb7bf79eabc912f3a5ca211ff1c4d5ac09cb42b2a8719a8c60a1f0880d89703afbe7073a640ac1b8ef8bf0d8c5ec8e2891faf924123d3bbe04f37479eadac95d
 AUX todo-2.11.0-fix-bash-completion.patch 385 BLAKE2B cfb5b88e8113d45790d9dcc7a005a09816aa6658ec781b1a3a76721ff8f4d573a2ae1208fe27ae136c48747dde70d9ce2c375357c4117e0a2303dab1c648d565 SHA512 804ba00f3c3bf494c853778ad388583adc40b613c35dbe63ffc63a75660df5a12e0806ac2f3d352cb4818c2cb53ff4d49d519924d231f98ebce4af1dbb5085e5
-DIST todo-2.10.tar.gz 56509 BLAKE2B ec89d12506b5025bab8d05bab1122d48ef2e9edb811c4091c1ff96b4b18c2ced54026d3d908a565278804c15c6fbde8aef3ae5a0cb23d4b12bb36133fce5bb2c SHA512 b14d9d13948836d971f72b941770e8e2c59d171d35f074205900619c5c3efd7ca0a482887046c1865890afb6595fe27c69677c54ea5824163d291e16fa5329d3
 DIST todo-2.11.0.tar.gz 712455 BLAKE2B f9d0fa53712a49c2f6ee94c02a62c16b8184734f7bb0c9354db9d640e2f619c75e3b3468065cb51204c7872f1f155bda51b9e3387f62f0f478f80f6a99f199b4 SHA512 5500ed1aa10eceaaa3e5116605eed4f4228337fdc0f2ceaa5b889753a60576918c0953adbfbf80c40008d6dfdf854e8a538103bfed4d1015aa1c5a9876c2e47c
-EBUILD todo-2.10-r2.ebuild 1406 BLAKE2B a1bdc12885d8b93370373adae8be4d86bb12db6b2d845147d7a15c75267e570fbd0a7b386306a712ebed2c3d052ad6065a822c578148f9241c8e7104847960b2 SHA512 8b8abbfb387d5a07f8929560e4338fd64db09a57e36cfefd60e1d1dcfdd6742c09a8f0ab3576da4ac3c040336b5e2f35c43c2ca9516cb54a58728373799fec74
+DIST todo-2.12.0.tar.gz 716524 BLAKE2B 168951c50670228ba2e1438ec04f5907181073668f1e260874e48959f2e37d11ee7ba4f2b0e5e5c55c9375a31921eca258f720afe98d2a4841529ef6acbb1510 SHA512 3b30d5e395f878811831f57e8e1a040c990e1f042f57050b6381d83ffc8b92b1ce20bfd3c5aa8b5e028b4810a5b289599603b2e16efff8badac559d200ed79f5
 EBUILD todo-2.11.0.ebuild 1739 BLAKE2B d4470876d6533fe1fff3ed60fed423730b4c894262e15b78d4192d34cca6babfd506ae125c32b7b28a1608568b91144e8ba42083dd95b80c2f83a1136153df03 SHA512 7244f131a1dbff7d77dc873647cc7cca1fe22873a10af853a6c4169e8757b68ebcf602430ee411bdc0f20bba19f7fbb342bfb9e60108bafe46838704e529da62
+EBUILD todo-2.12.0.ebuild 1665 BLAKE2B 4a1100a2be6fb645c213dd2d5883a32797fbc235588f77dec8b491f12e4ba5de615599fedcde92c75ff22840a4cd13b99f3f363af78e43a9dfdf166f131c915a SHA512 84c4459b7628ccddf0c087d8fc8a7d482fda5a4afd1aaf79c50da386ae80b06fa3b2814a7681dcfc55b92f9253dc1f44353e179082f8b2e282e8ae9e392790e7
 MISC metadata.xml 565 BLAKE2B 854d88ec5a9d76fba34d2feb01a36d5a9513433f1dd3301883e3213eeb1e24e1e4db0876c0b26d4e0ba68acee07177eed06912c3ce285e163f8d287510338825 SHA512 052553ce06e888905ddd230bb40e59039a42bf9e9f6684812231cc9f21d478d0e7e44d7e4ee44896258852a6778bbb507b4824a6b70150c7314b507a652e9dc7
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/todo-2.10-r2.ebuild b/app-misc/todo/todo-2.12.0.ebuild
index 90a86a6929da..d1dcad07e588 100644
--- a/app-misc/todo/todo-2.10-r2.ebuild
+++ b/app-misc/todo/todo-2.12.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 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"
+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"
@@ -17,15 +17,16 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="app-shells/bash"
 
-PATCHES=( "${FILESDIR}/${P}-fix-bash-completion.patch" )
-
-DOCS=( README.textile CONTRIBUTING.md LICENSE todo.cfg )
+DOCS=( README.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
@@ -36,10 +37,11 @@ src_test() {
 }
 
 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"
+	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
 }
 
@@ -53,6 +55,11 @@ pkg_postinst() {
 	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