gentoo resync : 19.10.2017

4 files changed, 59 insertions, 70 deletions

diff --git a/app-misc/todo/Manifest b/app-misc/todo/Manifest
index 6fe779022b1a..5e627e9c1fe0 100644
--- a/app-misc/todo/Manifest
+++ b/app-misc/todo/Manifest
@@ -1,5 +1,4 @@
 AUX todo-2.10-fix-bash-completion.patch 344 SHA256 7540dfc276d33c8e355bd32729f27282111932935e94c595336a1ce67291060b SHA512 eb7bf79eabc912f3a5ca211ff1c4d5ac09cb42b2a8719a8c60a1f0880d89703afbe7073a640ac1b8ef8bf0d8c5ec8e2891faf924123d3bbe04f37479eadac95d WHIRLPOOL 5d45ec930f5ccffc1004790672cfd348857faafd6962be9ed948f73d86592534af37bf75d54ee3a4eeb8baf7ac41b3e2971546a387b67526195e8dd2617874fb
 DIST todo-2.10.tar.gz 56509 SHA256 55b6b86a970c25efcd05b24b37e8141bab623ddfa681638d49fd6fd6907eda2c SHA512 b14d9d13948836d971f72b941770e8e2c59d171d35f074205900619c5c3efd7ca0a482887046c1865890afb6595fe27c69677c54ea5824163d291e16fa5329d3 WHIRLPOOL 4282bad14c1ffac5642577ed9de4bec273eb56be28b9a019e06b11d181b56bef708167eef31fafaec607a502edd1f4edf82b1d5ba0eb4df4c27e01944f9795d6
-EBUILD todo-2.10-r1.ebuild 779 SHA256 b140e552a73ef9f257ebbfec8dc6c7cf56fe9c554bc37ed73fc06458025ede79 SHA512 a18ba66f6d17a427d9e74f7678c079398809ee631df2a83b602c2a3427c26a07ea0b97bf35f465a2c757d2779cc304dec79b04489f13ee933f8da5615a25749e WHIRLPOOL d9febef1f06035b4e855ea9299a4665c73c32a3e9475fe213083833ddb6747a81b2ff27cb3d510a1d5d9a04b49c02d68ecbd41538d0abe523e0a1dbeb306110c
-EBUILD todo-2.10.ebuild 722 SHA256 40545e4fb73b611a03ee626c2b653fd1cc5542cd5b93b5558542293976fbdc1f SHA512 3b9706aabbb89128698f0ca56c6d22a4e7e2234a2f4149971ee133120f4076f1e82df898519307792248a3c5c3b3635e3b70ee9a8047cf84635f769afa18ceee WHIRLPOOL 2a71b2547b627549827b99b2596b41329b5e38a763462c62a14d1af4a174d79ed8fcaaf1f69bef85f814e09f177a3241b4e5d0b38942fde0eb3c3ccb30c24dd1
+EBUILD todo-2.10-r2.ebuild 1370 SHA256 3e511e81a37bc317f608aa322f8b5f64fcec593466584a3d77f6ad8e5e45e604 SHA512 6815ec1140e91f8433c6d9b70c470e3b2d50935ad2837bd06d8cfff8db9518908880ec992360fa5e2e4a2b8159b885b2232540ec5693c8d3bb87728b4d5db1c9 WHIRLPOOL ad0d3b54bb0f29e90407c3283b9f582d93e0d6be40f3b8887fab462bcd14fcc2bfdf1319fca90ba1c7887db9c75060cb0fc637f3f5bf555a9c6b75c8febff9aa
 MISC metadata.xml 340 SHA256 e710cefee0af20c524b7617d64903c1e849338d8c69968d2dbdb0213eeff89be SHA512 ff000ddeb9f4b80721053c17a66f5d9792b601c4710a3577ae86fc09ddd3456b934aecad94297b5985338a87ace1b59288394fcef05bd002cd2180ccf6f59a84 WHIRLPOOL ff9c68b1dfbb148b32ebdf99277fc88950c813589b33bfbb1d160331bf66b67e47d9437c1b6baa7cdd33cf04a252574a7b044fc217de3c740da1f44741442674
diff --git a/app-misc/todo/todo-2.10-r1.ebuild b/app-misc/todo/todo-2.10-r1.ebuild
deleted file mode 100644
index 5fa2cd242a92..000000000000
--- a/app-misc/todo/todo-2.10-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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"
-
-RDEPEND="app-shells/bash"
-
-PATCHES=( "${FILESDIR}/${P}-fix-bash-completion.patch" )
-
-S="${WORKDIR}/${PN}.txt-cli-${PV}"
-
-DOCS=( README.textile CONTRIBUTING.md LICENSE todo.cfg )
-
-src_test() {
-	make test || die "tests failed"
-}
-
-src_install() {
-	dobin "${PN}.sh"
-	dosym "/usr/bin/${PN}.sh" "/usr/bin/${PN}txt"
-	newbashcomp "${PN}_completion" "${PN}.sh"
-	bashcomp_alias "${PN}.sh" "${PN}txt"
-	einstalldocs
-}
diff --git a/app-misc/todo/todo-2.10-r2.ebuild b/app-misc/todo/todo-2.10-r2.ebuild
new file mode 100644
index 000000000000..6ea3e65d4871
--- /dev/null
+++ b/app-misc/todo/todo-2.10-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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"
+
+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}"
+	dosym "${PN}" "/usr/bin/${PN}txt"
+	newbashcomp "${PN}_completion" "${PN}.sh"
+	bashcomp_alias "${PN}.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.10.ebuild b/app-misc/todo/todo-2.10.ebuild
deleted file mode 100644
index 4c640236c3e0..000000000000
--- a/app-misc/todo/todo-2.10.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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"
-
-RDEPEND="app-shells/bash"
-
-S="${WORKDIR}/${PN}.txt-cli-${PV}"
-
-DOCS=( README.textile CONTRIBUTING.md LICENSE todo.cfg )
-
-src_test() {
-	make test || die "tests failed"
-}
-
-src_install() {
-	# Renaming occur due to a clash with another package.
-	# See bug 610862.
-	newbin "${PN}.sh" "${PN}txt"
-	newbashcomp "${PN}_completion" "${PN}txt"
-	einstalldocs
-}