gentoo resync : 25.12.2017

14 files changed, 26 insertions, 52 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index e8f6acf04cbd..f928ac9328a7 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index a5a3b850c7f5..a51087db2aa1 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -8,7 +8,7 @@ DIST nss-3.34.1.tar.gz 9562876 BLAKE2B 645fe06435dffa1a0dec688c7c10854dbd664e719
 DIST nss-3.34.tar.gz 9586315 BLAKE2B d04fcd46a7bf318b4bab14f316ae53145f415b5abb637205eeedb72f5847d43b76ea5e77485c56e4eaa3d90b850ee4bb18b6d0e42422f94ea0a9f12559263e02 SHA512 72388b596151499850546a68d9a20d82434c59f159564fb7170980f110d43d7026f174f93660d3bb6da79b618fd7d4f1f16246fc80ba568aa555df99ebbaea21
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 EBUILD ca-certificates-20161130.3.30-r1.ebuild 5957 BLAKE2B 62d319e8e5a91e087692455ea9b0ae3428fe32cf68a3194112599adb2fe1782754950708f22463caf848bde08d8d5b535ac6e7ba306b1418cc47271a514569cd SHA512 9daed98f9c1b864f6fb5aaa9172820ca660f0c794b9a68a82dd90979630c7f0d66682fd27896d679fcdfcd0048fbac77ce25b133db65f0e03c73628276649477
-EBUILD ca-certificates-20161130.3.30.2.ebuild 6252 BLAKE2B 3e5d62119ca0abbea3c0995a7a4bc1209798f45d87317481850ce69b84180d712f52e2dad29a4d1f7d8e4903ef59e61d1bb59a24fd6c4b8c4ff309049d7b535a SHA512 103c83cbd4275f17581a8d85c53c907373d737ba5c86b389ae986b3692d8559f6da1cea9c47678164a0fed7ba20970c15c91db6c2277f5903066d29ed2aa9aca
+EBUILD ca-certificates-20161130.3.30.2.ebuild 6251 BLAKE2B 903ff03839cd97cdcc39611d76e4b1ab0c26c9020aaec843f2194e9d8ac083ac52618bc90e2b38ef6b31bd111431d77be0437f0cd131d7242a85d791d48aff0d SHA512 ff5bef1d4997a0d4adfe2b94c9dce5d5f9bff23a6c339aedeeddcd24e28184300b94393637b2c692357e5408d2ffd6be71a18bc0fcc7d8055f03a12f4a0a9cd5
 EBUILD ca-certificates-20170717.3.32.1.ebuild 6278 BLAKE2B 737296804f2fcbda2a4cdd54cefd52d04021a1c01be664803e7ad8d4d2e46e6dedebcde6819dfe3215f9111062a1890c29ee9322fbc5274603b66ab11fe33c40 SHA512 394207e7ac8970d6b0724ec1bb3d7c233724d4c2f9a05a8c7a475b2d40e08483e940ad185ca6eea023c5d6bff6868b0aa10c4f642eccb6238ffa71ef9505df94
 EBUILD ca-certificates-20170717.3.34.1.ebuild 6278 BLAKE2B 737296804f2fcbda2a4cdd54cefd52d04021a1c01be664803e7ad8d4d2e46e6dedebcde6819dfe3215f9111062a1890c29ee9322fbc5274603b66ab11fe33c40 SHA512 394207e7ac8970d6b0724ec1bb3d7c233724d4c2f9a05a8c7a475b2d40e08483e940ad185ca6eea023c5d6bff6868b0aa10c4f642eccb6238ffa71ef9505df94
 EBUILD ca-certificates-20170717.3.34.ebuild 6278 BLAKE2B 737296804f2fcbda2a4cdd54cefd52d04021a1c01be664803e7ad8d4d2e46e6dedebcde6819dfe3215f9111062a1890c29ee9322fbc5274603b66ab11fe33c40 SHA512 394207e7ac8970d6b0724ec1bb3d7c233724d4c2f9a05a8c7a475b2d40e08483e940ad185ca6eea023c5d6bff6868b0aa10c4f642eccb6238ffa71ef9505df94
diff --git a/app-misc/ca-certificates/ca-certificates-20161130.3.30.2.ebuild b/app-misc/ca-certificates/ca-certificates-20161130.3.30.2.ebuild
index 2fac1bf79439..c538eb461d5e 100644
--- a/app-misc/ca-certificates/ca-certificates-20161130.3.30.2.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20161130.3.30.2.ebuild
@@ -58,7 +58,7 @@ fi
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="insecure_certs"
 ${PRECOMPILED} || IUSE+=" cacert"
 
diff --git a/app-misc/dvtm/Manifest b/app-misc/dvtm/Manifest
index 2a91312b7fd3..9ac62a9e8c82 100644
--- a/app-misc/dvtm/Manifest
+++ b/app-misc/dvtm/Manifest
@@ -1,6 +1,6 @@
 DIST dvtm-0.14.tar.gz 35893 BLAKE2B 3fc98614f4a8d3013a98a0e2766c2827a5d9f1046fb32a38b9e26de8c34d6ae03ef16294c5e80aab277e8abc529110560eb1d2b987007a9ffe990b1cbe362483 SHA512 d47f55b4ce47582f665ac5b5d86bb9137722f65b157bdd80aaaf45a2cd8d783a3b0718886c7a7ea1d900762359316c2d76816460dac03484e122d43c64f57dd6
 DIST dvtm-0.15.tar.gz 40511 BLAKE2B cc5075b5337a66b3eb5a3845f18aaadc6be36804e1a0e217e6bfe640893ec5af7553aa69578f8bda6c3b11b28c02ba5398e19f9cad9844bfcb1bd32ca4f24c12 SHA512 48a0c8fd6a50fe5d43414d0223c9f4b9920a31d42fe3bfc428ce1ae7d0e41a41ebe2597eae0824c7c76bfb0e32a13e440c8d5fcdb1886d55d6791fa3fe3fd77b
-EBUILD dvtm-0.14.ebuild 1512 BLAKE2B 6582d1d1d259543053d5425b61ff670941564775d4dfdd8b415f16c53548ceb2b5241cf3770b0033eb4d39a401316a0726d2c9259344d07c74f4ee27175b28ec SHA512 06b8a86b770fd2d3040a057a118eefccc35b1b8f533a7e2bf621c58c76eb63251132444d24687fd087d7ad31f85f2892a39c4ea437b115a1976d04279990d8af
-EBUILD dvtm-0.15.ebuild 1504 BLAKE2B 2de8d0e85cba697192e36b267ae84d8e6bc72bd371f1449797157f69f478d5aec3f29ebe2af989e244b986296a8bd1d1fc8bb8c6499313dac0a2fa541ed72c1e SHA512 03ed855a95d142ec3f60863d0c372a2ba842542210f259e1e070ae68261f5f3318ba074101cf51e5b202af1ab86d5e7e34ec2f5d34b070e5b7ea34fffc57e244
-EBUILD dvtm-9999.ebuild 1517 BLAKE2B 68cb60cefc204fdb17e991930910667d5c99deca24bb6059e9c1569e498de4368f62cfc0747334d78894baf24bf4ec0be802f873fd274637a7437421026a9d3b SHA512 090804b22e245494715fb17a5539cc4562528728a1dce94f447bb8db53f4291e5d86d99fb2fb9dfb72786fc222f2ff71d7ce554b22d2a837e4b0507fcfb6884a
+EBUILD dvtm-0.14.ebuild 1500 BLAKE2B 5380d05c9590229e2a1ce89b4c6344f20f87e036bd2a500e083ad65c879924b3cb90f278953ff11985ccceeeab0e31f64c489acd919a6d4d992383b216f05ada SHA512 fb1e68406859da697006b1fd0647557b18b9917b5cdfbd8af723e33cb3ffd9c61c04be2d520e79d216e341691911c46c5ac0cbb90840f20133f1be3ff987ac5a
+EBUILD dvtm-0.15.ebuild 1506 BLAKE2B 3a29dfc11cdb5c73feb8f599b65fe27e36e9e520e4f5064264e4b6c3eeb396fe8761a1f0880da74c46b5e4f32b7e7471e3cbcdd83a4c1ad9e1bdaa4bef50c1d7 SHA512 cb0ff91d7f7893b9f369698f70f54fc3655c378f7149e3ee64ddf2aba8f5359ddce401bc1d46819b5aed0f5deff6325f7c0b4a117e68219191baf996f4c47f79
+EBUILD dvtm-9999.ebuild 1506 BLAKE2B 3a29dfc11cdb5c73feb8f599b65fe27e36e9e520e4f5064264e4b6c3eeb396fe8761a1f0880da74c46b5e4f32b7e7471e3cbcdd83a4c1ad9e1bdaa4bef50c1d7 SHA512 cb0ff91d7f7893b9f369698f70f54fc3655c378f7149e3ee64ddf2aba8f5359ddce401bc1d46819b5aed0f5deff6325f7c0b4a117e68219191baf996f4c47f79
 MISC metadata.xml 266 BLAKE2B dcea8fa0295f75ca11474aafd9d1b56cf5c6d01fdb4444a82a0b93e818cf8e692076a1f5dc30a5098779afdff5190e2f877836b3ee87cbc1f8a529c32149ea94 SHA512 4da13e3e2134d06372d9bdc1de80cef972ac5db82e7ee8b3cfe620712610fd863c9037a6b8c84ee7a6c8eb8f0cb52568f040474eddb73a7afa07b5a53f512ac5
diff --git a/app-misc/dvtm/dvtm-0.14.ebuild b/app-misc/dvtm/dvtm-0.14.ebuild
index 23b0266b9305..3c57017af12d 100644
--- a/app-misc/dvtm/dvtm-0.14.ebuild
+++ b/app-misc/dvtm/dvtm-0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,10 +8,9 @@ inherit savedconfig toolchain-funcs
 DESCRIPTION="Dynamic virtual terminal manager"
 HOMEPAGE="http://www.brain-dump.org/projects/dvtm/"
 
-if [[ ${PV} == 9999* ]]; then
-	inherit git-2
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
 	EGIT_REPO_URI="git://repo.or.cz/dvtm.git"
-	KEYWORDS="arm"
 else
 	SRC_URI="http://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
 	KEYWORDS="amd64 arm x86"
@@ -21,7 +20,7 @@ LICENSE="MIT"
 SLOT="0"
 IUSE="unicode"
 
-DEPEND="sys-libs/ncurses[unicode?]"
+DEPEND="sys-libs/ncurses:0=[unicode?]"
 RDEPEND=${DEPEND}
 
 src_prepare() {
diff --git a/app-misc/dvtm/dvtm-0.15.ebuild b/app-misc/dvtm/dvtm-0.15.ebuild
index 06ed45d16863..a579a42918d3 100644
--- a/app-misc/dvtm/dvtm-0.15.ebuild
+++ b/app-misc/dvtm/dvtm-0.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,8 +8,8 @@ inherit savedconfig toolchain-funcs
 DESCRIPTION="Dynamic virtual terminal manager"
 HOMEPAGE="http://www.brain-dump.org/projects/dvtm/"
 
-if [[ ${PV} == 9999* ]]; then
-	inherit git-2
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
 	EGIT_REPO_URI="git://repo.or.cz/dvtm.git"
 else
 	SRC_URI="http://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
@@ -20,7 +20,7 @@ LICENSE="MIT"
 SLOT="0"
 IUSE="unicode"
 
-DEPEND="sys-libs/ncurses:0[unicode?]"
+DEPEND="sys-libs/ncurses:0=[unicode?]"
 RDEPEND=${DEPEND}
 
 src_prepare() {
diff --git a/app-misc/dvtm/dvtm-9999.ebuild b/app-misc/dvtm/dvtm-9999.ebuild
index 77565fbdbd03..a579a42918d3 100644
--- a/app-misc/dvtm/dvtm-9999.ebuild
+++ b/app-misc/dvtm/dvtm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,10 +8,9 @@ inherit savedconfig toolchain-funcs
 DESCRIPTION="Dynamic virtual terminal manager"
 HOMEPAGE="http://www.brain-dump.org/projects/dvtm/"
 
-if [[ ${PV} == 9999* ]]; then
-	inherit git-2
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
 	EGIT_REPO_URI="git://repo.or.cz/dvtm.git"
-	KEYWORDS=""
 else
 	SRC_URI="http://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
@@ -21,7 +20,7 @@ LICENSE="MIT"
 SLOT="0"
 IUSE="unicode"
 
-DEPEND="sys-libs/ncurses:0[unicode?]"
+DEPEND="sys-libs/ncurses:0=[unicode?]"
 RDEPEND=${DEPEND}
 
 src_prepare() {
diff --git a/app-misc/jail/Manifest b/app-misc/jail/Manifest
index 9cda26b67238..2531a8f84ed2 100644
--- a/app-misc/jail/Manifest
+++ b/app-misc/jail/Manifest
@@ -4,6 +4,6 @@ AUX jail-1.9-multiuser-rsa.patch 856 BLAKE2B 4974cf19df37b5a9f5c75fdb31c65e3556a
 AUX jail-1.9-wrongshell.patch 330 BLAKE2B 5d707238febc3fa77daabdd39f74644873fbd7971d8e609b2112fe5b319dbd133bd6f75e291c92cb683f6552b06605249232f675f2217b5d42564d13b78e8a8d SHA512 ee92dbfb9e147d94d2ebfaaf597ad381d93bd1e5fc65e85a20ee37c9066dbe7560a3385977cd3d30b87f5cdb2d90c19827a7adac69f667ea61a4920ec0b02cbd
 AUX jail-2.0-sysmacros.patch 418 BLAKE2B d3c5b77e8b474b9822225e913e181dc754a2b54a273fb82da6589ae54221a703f216e583207a75e3ebe5aaf0a9121d1833fd60bf1639e2d14736ad1ac40df6f0 SHA512 26da017e6c1852938799ca5a1b768dde881a29b2160a57b69a741250717c408901b95c253c0e29c8b81e94bfa303cf42cf9edb9cfd7c43166035bf846ed89f1e
 DIST jail-2.0.tar.gz 31095 BLAKE2B c86d0c677eab38c7d90317c3a19dfdadd17ea74903a886015fc1c3926fe09855be4ed9f72b18e6f144de4a7c93fb6c5be3ca77f4ccf501ebedd09533337ce578 SHA512 dfca62091b34f9adbe4e94de1dbf0ccd31bd3f8e492ea9788f712e97271b389475bc19e0390c12445353c4f73e5ba2458360bf55f5f64491705e82192db985ae
-EBUILD jail-2.0-r1.ebuild 1994 BLAKE2B 6efa14145d0d4482084f941134aa101c40a734a96bc7003acc01a5921eb7a108976e288db057778255ef9ea153f77a6fc0933ae9d37dcf1b2cd1f1b9c24716c9 SHA512 8657ab225a382eb86f6836182c6e2b4587a8d4cc4a62ebdaa172ea4eea5dae5aa94d31890c0d5ac27bc4efab4039977ff12eeec83d5d3639bcc7d91dedd26335
+EBUILD jail-2.0-r1.ebuild 1993 BLAKE2B dff0c030b4bb267f1a08517dacd4aca23b15f431dac9c4bdad5fe07ec0701375be02c1c597f013d2f24fb5bc786f87c2119f3be7bd8dba04b0e4bef06affa8e0 SHA512 a55e908408e387faf7615be5d3e38a6bf6b67509ce723dba49f87b862ef5c421b4cd7ea0b91fb3d0307b1fc71791c378bc26e6299b5dd886cae76c5f2b1e7caa
 EBUILD jail-2.0.ebuild 1940 BLAKE2B 6a8220fc07cd18556f0145bdb4af069ba4749dcb886e4b0439d9d05bba8c13a439338e6cd3b89b93ff6804300af2d59267af73c03cbf103631ecf44bfd12a42b SHA512 a8df73039d7c93d4952c9c010f465131e91f15dd4cc2a806a3d90a9a4896d744d40ce50dbd36e651646846bff3e2d93c0537748d1ac8351dd0e93f9f9e683555
 MISC metadata.xml 749 BLAKE2B 6280537aad78398b6a8eb29ca55982ca838f91ad547a71a78dbedb5e63e9e028740ef230d3fd8668079c3d2983daf55187a04fdf662cceaff1f39e468d6f6143 SHA512 a9cee89d1b10080ba67cbbce957b8118484c0224368728ba1dbb553c0c6189c73c2f9c7b257a5e4fcde39270bd4d83f8e43f25948b28c151f0d9170af121b7d9
diff --git a/app-misc/jail/jail-2.0-r1.ebuild b/app-misc/jail/jail-2.0-r1.ebuild
index 62eb691b4a39..093074a85df1 100644
--- a/app-misc/jail/jail-2.0-r1.ebuild
+++ b/app-misc/jail/jail-2.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/spiculator/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND=">=sys-apps/sed-4"
diff --git a/app-misc/supercat/Manifest b/app-misc/supercat/Manifest
index f5eb20f0d607..c1eebfcb056d 100644
--- a/app-misc/supercat/Manifest
+++ b/app-misc/supercat/Manifest
@@ -1,4 +1,3 @@
 DIST supercat-0.5.5.tar.gz 103545 BLAKE2B dfe8b823307fe39762d050e8676ff3f296b0ba206a618695fd3c699bc51d1c52cc552764ba52c45cc2eb0af2e8565a5dc4f86871489f082f15ba579aa80a51f5 SHA512 24989935ea7b863638165f7102ae511b9be00ff4399f433fc9ec2fc33543eea907b8bd46e819d815344c8c8467bc702b9a5b32aa55bd21be2670237fa1d711de
-EBUILD supercat-0.5.5-r1.ebuild 559 BLAKE2B 57c084a098cd29b363358f0a7b67df5c28dd9b18655a6125484eeff84f5b578cfbc471b95abcbffce092f0b2afcb93e6a5ad9d22129990e7ff55494bb746d800 SHA512 49e8e63eef13a42cbb81e3ae752f6b6498c26c98b9c14de3d097d969679ec8e61a562bccf8d42179bb2a69c53efead3d66cae89d2afcbc2ade3fdadd9fb91998
-EBUILD supercat-0.5.5-r2.ebuild 479 BLAKE2B 7a8c74f6370a77713935ba89e8146a891047ac7e21c25b1bb23f0e9847e71f693254736f5bc199533f2e456b590e9152b587dac7c889c883ef312d88082408de SHA512 c99d305b65374271096b7b76f688e92f1f51846dcca85b80344a86c7ad3ac8edaf410c4b14f23cad50d55c9098ae8d0d336d13dbfa0daf7e29ceffee0c1ff1dc
+EBUILD supercat-0.5.5-r2.ebuild 478 BLAKE2B 5944b293ea0da4be37e53f01cb352573a6026a03bef2558b8a14d8e3c85e59298b4b2f2c4dcf39b9d2d849d4c885b3d94a462f7fe8a293179d5bc5763dc1cbde SHA512 a5c8abbc831998d555379a71cf79d4bc1f7d799905daaacf64a6646c636ec37936a704b0875181ecf0683352585bb125f6179e70561d3327ac06cef9a0555973
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/supercat/supercat-0.5.5-r1.ebuild b/app-misc/supercat/supercat-0.5.5-r1.ebuild
deleted file mode 100644
index 7349812fd696..000000000000
--- a/app-misc/supercat/supercat-0.5.5-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-DESCRIPTION="A text file colorizer using powerful regular expressions"
-HOMEPAGE="http://supercat.nosredna.net"
-SRC_URI="http://supercat.nosredna.net/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-src_configure() {
-	econf --with-system-directory="${EPREFIX}/etc/supercat"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed!"
-
-	dodoc ChangeLog || die
-}
diff --git a/app-misc/supercat/supercat-0.5.5-r2.ebuild b/app-misc/supercat/supercat-0.5.5-r2.ebuild
index 1047bd7acd06..815957d6c770 100644
--- a/app-misc/supercat/supercat-0.5.5-r2.ebuild
+++ b/app-misc/supercat/supercat-0.5.5-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://supercat.nosredna.net/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 src_configure() {
 	econf --with-system-directory="${EPREFIX}/etc/supercat"
diff --git a/app-misc/todo/Manifest b/app-misc/todo/Manifest
index 04fec3cacd63..f18afde93eaf 100644
--- a/app-misc/todo/Manifest
+++ b/app-misc/todo/Manifest
@@ -1,4 +1,4 @@
 AUX todo-2.10-fix-bash-completion.patch 344 BLAKE2B 8e19719ce96559e49715bec34e6e4b90ea2c3dae9d4a4ecd1a05be51919f5ae8d7a1a29fa55ae3d70d0c42e8e55b6bab596b598116a5f8399a9a4e95df3415e9 SHA512 eb7bf79eabc912f3a5ca211ff1c4d5ac09cb42b2a8719a8c60a1f0880d89703afbe7073a640ac1b8ef8bf0d8c5ec8e2891faf924123d3bbe04f37479eadac95d
 DIST todo-2.10.tar.gz 56509 BLAKE2B ec89d12506b5025bab8d05bab1122d48ef2e9edb811c4091c1ff96b4b18c2ced54026d3d908a565278804c15c6fbde8aef3ae5a0cb23d4b12bb36133fce5bb2c SHA512 b14d9d13948836d971f72b941770e8e2c59d171d35f074205900619c5c3efd7ca0a482887046c1865890afb6595fe27c69677c54ea5824163d291e16fa5329d3
-EBUILD todo-2.10-r2.ebuild 1370 BLAKE2B b86e019e2f62f5d1ef4c95bc51054c80b84d7b44e9a41f4bc1d9ea427bbb54112f5359e6591bf0529c39936720234fe5bb242697d01c27cf6f210a846e36a4c5 SHA512 6815ec1140e91f8433c6d9b70c470e3b2d50935ad2837bd06d8cfff8db9518908880ec992360fa5e2e4a2b8159b885b2232540ec5693c8d3bb87728b4d5db1c9
+EBUILD todo-2.10-r2.ebuild 1382 BLAKE2B ff3db41a533a0b4ce6ab4ff531cd2fdc77efdaf791ee4dbc910ca3406dc5330d5ad457ec7ebd3546b0ac21ca4ad89b17ac3716fa3cd9940a254bf721eb5326e5 SHA512 65deff8ee79cab1ccfafeff098960bbe5c9c1585d48f55c5beb112fbf9090bb15b50e29ea6d3489ba581b80d0a413d47987edb3a6d595af96bdfbd7292bce203
 MISC metadata.xml 340 BLAKE2B 8102ae5fb34dd55116c96b815406f86d08345c3e039d5c2878b8e7f8e0e4d6a60543ae7cbf9d2ba877230b40175dcaf6e7eae6d7877ee536a6ff30786e660584 SHA512 ff000ddeb9f4b80721053c17a66f5d9792b601c4710a3577ae86fc09ddd3456b934aecad94297b5985338a87ace1b59288394fcef05bd002cd2180ccf6f59a84
diff --git a/app-misc/todo/todo-2.10-r2.ebuild b/app-misc/todo/todo-2.10-r2.ebuild
index 6ea3e65d4871..69c2994478d7 100644
--- a/app-misc/todo/todo-2.10-r2.ebuild
+++ b/app-misc/todo/todo-2.10-r2.ebuild
@@ -35,10 +35,10 @@ src_test() {
 }
 
 src_install() {
-	newbin "${PN}.sh" "${PN}"
-	dosym "${PN}" "/usr/bin/${PN}txt"
-	newbashcomp "${PN}_completion" "${PN}.sh"
-	bashcomp_alias "${PN}.sh" "${PN}txt"
+	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
 }