gentoo resync : 25.12.2017

4 files changed, 15 insertions, 17 deletions

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() {