gentoo resync : 25.12.2017

12 files changed, 48 insertions, 34 deletions

diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 4f39fb838619..f5d7f7bc4111 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index 9a65790b2d4b..6fe4b2a75863 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -1,9 +1,9 @@
 AUX 50ebuild-mode-gentoo-1.31.el 649 BLAKE2B 47fbea3bd7d02a90b66c21577eb4e4c1b7a6083abab29ad57b3bd92c347fb11d3aa509c1d8dc43e37b8e8ac9a7414e1325951e5a72e998d5b7937bb07334fffa SHA512 59c1ca3ce148d037d16b06cfb5de56cefb608c514f942f9dbbdd8655ae65b438cc04d395647def321d85d7685a5f8ec5e5cf487edf9a5074d7972f489e8eafc2
 AUX 50ebuild-mode-gentoo-1.39.el 805 BLAKE2B 3cdb41677c5ef11ef6fb44001cc36b58f923c2be4090fe8635fa85d338af3d170b1ad3d6b2f31704cf24e1528d3ce9b6fd3d305c2e3c1b1923e345e011642307 SHA512 8038b7bac0f3322b1149467152790dac7cd133234afe7c362c0e14686e378bc27eaf432a7194e1748dda80b41483943facb44e1a66466ebdcb4e7a0768e8f629
-DIST ebuild-mode-1.37.tar.xz 30816 BLAKE2B f93d1513ec3f2eab4fc4dda4d46aeedaba7f2ffecf20e6f90426c84e979fe72120719b13182ca407576effcf62f839ebc9c2f94d5f9e9d8230b449dd74a58dcb SHA512 1d570b213ad0c6eef8817f69c99c0862703b9bddc24477234dde542b697ba372a06bbe8e4a91179a7d528b720a7dbfc13bb92c8ea0a4d3b3b8684fa4ee0065c0
 DIST ebuild-mode-1.38.tar.xz 30744 BLAKE2B a147fbb462f0e1a2ba3272c74b12c9357200b0ca6671d75263547d7b777489772504c9fda634a797fecff8dce35e40b7bb579cdbd9a7da99f68f74b08a48a4da SHA512 bfcc4fb100f7d9299e9b466c7661e865f9b93ee352780da1647f1a98159fe3e9eeb8cd4b7d1d9906d532316d1256ec7b6f821cac3d064cda15f2fd62ca7cb349
 DIST ebuild-mode-1.40.tar.xz 34676 BLAKE2B bf34c773966540f67c74fe72a8c47073f9385ba210ceecaf8fa8977a67f5945314090c0555b2b12dcee8486ed495dda062d6d36bcaff3a291f3d4ba5ca6886fa SHA512 50caa3255ff874e779f8dcb34b84845fd3b03edee35fc20df8aa3606dc2a00a4a0e88fab79f7872cfe3e92f04263ce74e60f3aeb1d97a2706116414ac9b352d5
-EBUILD ebuild-mode-1.37.ebuild 740 BLAKE2B b2f5c87bdbdef963801b1567c60c36fa206a990735de667dfc902a8d07847782be554b88450036b24508a1440e115c54000a87406cecb795ba4b1134581e5ad8 SHA512 63813337bf774b92901a4b2443cb70587c9e548cdbb2e0e1e210bac256dfac49ee69e2edc34e8f0529b8e251991e0398472ac7d393f3884b95973c15dc1790cb
+DIST ebuild-mode-1.41.tar.xz 34728 BLAKE2B c3863a249536c7df1ee4463879fb29a3b7243eee7192319ffeff527f40527891e02e9dec69601a1783a7ed28fa098b102b224eb5cdd5e9c95dcca37d48acc4a2 SHA512 8c85b8c5197162c936cbb4d8d204eb10e4f20d413b021c4b4d7b18793cef192063ea74441efa6ac69ec91e2297344027a0ea714537898cfa41ad8fd5a1262bce
 EBUILD ebuild-mode-1.38.ebuild 740 BLAKE2B b2f5c87bdbdef963801b1567c60c36fa206a990735de667dfc902a8d07847782be554b88450036b24508a1440e115c54000a87406cecb795ba4b1134581e5ad8 SHA512 63813337bf774b92901a4b2443cb70587c9e548cdbb2e0e1e210bac256dfac49ee69e2edc34e8f0529b8e251991e0398472ac7d393f3884b95973c15dc1790cb
 EBUILD ebuild-mode-1.40.ebuild 749 BLAKE2B cb65341d5b80c711532c5bf2d9da243be31e096adc73774cc5200de2649592adda41b2cec5864f8054d8b8de26507291af6fd25e8d5420e85df68b2ad83a2cf1 SHA512 37a077ec8dc58e8177f4969005d5f710632d36b4dd9cb93355a75c0806ff0b57face77c90d10624cbada6d7569d7073ebcf4958a3f9a6ba8e52a0edf79b43485
+EBUILD ebuild-mode-1.41.ebuild 749 BLAKE2B cb65341d5b80c711532c5bf2d9da243be31e096adc73774cc5200de2649592adda41b2cec5864f8054d8b8de26507291af6fd25e8d5420e85df68b2ad83a2cf1 SHA512 37a077ec8dc58e8177f4969005d5f710632d36b4dd9cb93355a75c0806ff0b57face77c90d10624cbada6d7569d7073ebcf4958a3f9a6ba8e52a0edf79b43485
 MISC metadata.xml 403 BLAKE2B b3996463afa7f1471fafe74467cc3b2bfac32c9ed6f8cbab1390ac1b974be057982f8f3ec7d796f7eb45b023d702b668f979e962d6c33c525f1e644de2703007 SHA512 b6c2ed67a0eac9b03f15bc00374f925eb8ba28000f8d1ebbe03f75e26c953ef799fe73c0bc1658089e5ab687cb07e97ff8d74123b6a67cd5dd8246e81051c239
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.37.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.41.ebuild
index 1b7fc32843be..4d22f1bea1c6 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.37.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.41.ebuild
@@ -11,12 +11,12 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 DEPEND="sys-apps/texinfo"
 
 DOCS="ChangeLog keyword-generation.sh"
 ELISP_TEXINFO="${PN}.texi"
-SITEFILE="50${PN}-gentoo-1.31.el"
+SITEFILE="50${PN}-gentoo-1.39.el"
 DOC_CONTENTS="Some optional features may require installation of additional
 	packages, like app-portage/gentoolkit-dev for echangelog."
diff --git a/app-emacs/eselect-mode/Manifest b/app-emacs/eselect-mode/Manifest
index a54509a50f11..28026abb4b8e 100644
--- a/app-emacs/eselect-mode/Manifest
+++ b/app-emacs/eselect-mode/Manifest
@@ -1,5 +1,7 @@
 AUX 50eselect-mode-gentoo.el 178 BLAKE2B 50fea27e7add6d31f37801593430154636bb58ac6e3f7cc44c68a16d49c9156cf37285778a38bf97a1f4805a22d6d5cf9d597acdcdedfd77c62a5825a0d1d88f SHA512 200da398adf72241112bcda74b432a8a313cf29018c9f6fbdf6021674b23a201ada6ba884d4c9c3a4ee4c042d6c8fc7c3ba59702c8ddb6ea20b652f9ded9d32f
+DIST eselect-1.4.10.tar.xz 177212 BLAKE2B 25f548d56ecfdc5ccf18167ebdeb50cccc77fbdc65ab8683e293242de0083e6036714ae9d173f507da0404dbad0e48f2ac09d542dbdf92d8a5d7e9868b31fa07 SHA512 09e4196959cfb42e0fe4536939ad8e0d1a49d500e3d42634cd959c544f2ed5beaa006100fffaf10eaba121901d36a42721da42504d496de8d157690b7ab7f9fb
 DIST eselect-1.4.4.tar.xz 177536 BLAKE2B 9991d69a0589be0a7df881fe5d6c0021c99fd7fd5b561ad7a9423edc46b25528b499a3e839dfe974d5d53e8e8a5b3a798cd7f5f1eeb78e531fff16680babce96 SHA512 1ed01cf00e3f13aad3e5f844c7086c3dd48398efd76e68cd91cf13b9939f4b48eef8915c5f3926954d158023115ad66ee67c0bc8fc4c9570900a37207674fc8f
+EBUILD eselect-mode-1.4.10.ebuild 579 BLAKE2B e54fd92d5edfd9fc5879f2299cc8693ea77b901208b669c879da57fa3c4607ba852e5d40187c268a821f2443f40aa233317435cc25051e84b68a490aff2af0b0 SHA512 39c1a786812771cecc76c137dbaaa1f87e1f342e8951e94e1739eceab326d794efc82b5fb7c9f25992c2a23fa08fba7b8e2c1bd40e6cf25b55d497204509a2c3
 EBUILD eselect-mode-1.4.4.ebuild 570 BLAKE2B fb18e59ec9ba157d1a8f6b55e9e416b4332c9cc7cf561b782361ff4c840881696cf0e91b2f63f9da223fb2a3d06dae3fe3f6d46678b7139ddca745d676e718f0 SHA512 14ab8292c91ab1da794cfd4b33b09dec3f382c1e7fbf3ed3f9fc0f26438ae255b314f993963cc867e37f6cfcba37d8da0f64e6094cb42fb13ca8f11b9ed1675e
-EBUILD eselect-mode-9999.ebuild 452 BLAKE2B 9d4361fb9f5563ad906e8c9676b3dc15a5baf8687892dfda04558ef385db9466ad22383d2d21332240d4356b5a64c9f9fb9b0f6c92d8e367cc93c49f37135aaa SHA512 0598d25157ccc71091e91f3bced3063021af2db1b02f16d53a1c5df3d2ac5f4eb8c0c238d811038a91d776843e87e47a43ce0a428e576d46f12f69905fd9f81e
+EBUILD eselect-mode-9999.ebuild 458 BLAKE2B 0a5b748fc09dbfe532ec9b40adbbb939bd5150ecac9ee610ad0dc5b37e7b6ccdcb8c183337d6f0ce04ee5bfad4f1ede0c13cc4dc55c828474b07265fd91ffba3 SHA512 5d11532145273d6956274ce05d732352593a20daa1d86f900b1fa9927aa536131e5ec922996f4e3939803253e5649f6c2a3ec9a81dabd6dac0475422cf0a4ceb
 MISC metadata.xml 426 BLAKE2B 85331f7b7beb7a72e8151728884637e255f783856cabaf1a6bf58938b4a3f565eaa047dad4032089c416381c52d66f4341805cb43f152f99c83d0c27900f8963 SHA512 18468ec99892972ddfd973e3efc4869abc9848906773556b6ae5bf9bc48780c790beb77da548c98f9fc07771068dc219d1af2f3dc29f1bb36f12dddd2432a675
diff --git a/app-emacs/eselect-mode/eselect-mode-1.4.10.ebuild b/app-emacs/eselect-mode/eselect-mode-1.4.10.ebuild
new file mode 100644
index 000000000000..2b1cd5c3cb47
--- /dev/null
+++ b/app-emacs/eselect-mode/eselect-mode-1.4.10.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+MY_P="eselect-${PV}"
+DESCRIPTION="Emacs major mode for editing eselect files"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
+SRC_URI="https://dev.gentoo.org/~ulm/eselect/${MY_P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+S="${WORKDIR}/${MY_P}/misc"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/eselect-mode/eselect-mode-9999.ebuild b/app-emacs/eselect-mode/eselect-mode-9999.ebuild
index 0b4441d0b597..92002f841bae 100644
--- a/app-emacs/eselect-mode/eselect-mode-9999.ebuild
+++ b/app-emacs/eselect-mode/eselect-mode-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 MY_PN="eselect"
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/eselect.git"
+EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/eselect.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${MY_PN}"
 
 inherit elisp git-r3
diff --git a/app-emacs/puppet-mode/Manifest b/app-emacs/puppet-mode/Manifest
index 8bef030c9409..cc8de322fe41 100644
--- a/app-emacs/puppet-mode/Manifest
+++ b/app-emacs/puppet-mode/Manifest
@@ -1,5 +1,5 @@
 AUX 50puppet-mode-1-gentoo.el 217 BLAKE2B 632d02667437b04642b7d3510d5010a3a7952ccd6aaa301a463c629c5dd6320c847e9f05425bd5882681a471761d0fe501ccf6860faa33b9e5458a761dad40a1 SHA512 3fbe7045df9ac9d30520020d4df454a03f02989bbcaa4bae0c632f86f6e6d3fd2eeb3bed84d864077c2b85b65586406525fa621a262ec363f53d714a093f6d1a
 AUX puppet-mode-0.3-version.patch 547 BLAKE2B a3731babc0e9d207c5dde31f28f0a3e2481679bc2d95f9fdadc77e153689bf6e7c1498acb93e1783863bc66de1e65ecb332a4a605fb6c3856dc8964a42e4dd5e SHA512 623496493b6f920700e042c69099060b9e89cec3a04281af0d8fb7b32c57cfa9b70833935f1ec723c4e877545ac0962b9c70054891084b50c6eb2ad8bb1eb9f2
 DIST puppet-mode-0.3.tar.gz 25617 BLAKE2B a9afb8e2f6c0a2b40cef6bb39d0fa2effe2ddffaa3b646562f0fc5b84d1613e556df88206835d6aad5862d526161d69c49ecd188e299e4f4175b479fe1957eee SHA512 16ba5f71a1ec6c40b1eddf2acf5c1aa1968526b959279e1cac0cfac947f82f404fc35978ce12f5851309f293e2c92f054a718ade97d156528d505dcda58434e8
-EBUILD puppet-mode-0.3-r1.ebuild 614 BLAKE2B 0722d9eb941a11109be1daa01d7f771237beb047d2b00156b97bcf48e0d7d2ab60f2f5e27af570d60dc2572b08a3aecae8e38e462f1e7b2abddee53c58dec98f SHA512 eb0a512dd2a34a27d51c6df677de05d478bfc9da00dedc35babe994a0fa9b0fc161b3fa682812e31feee20bab1717648c9236ce563a1858f1dac8cb0de6bb0d6
+EBUILD puppet-mode-0.3-r1.ebuild 613 BLAKE2B f98dab8fc53fcd00f2b3156ee8572d4c11181ff5d6660dda7b172e99f6ad7abf7f826c423e9500aacaa6d273c51b6acf3725deb76ab155ba5a5f4c34348382ca SHA512 12a42f2ecce4bce4b2963e22dd7c4b9f9545f1ccbb8713c0cf4344ee00da59b42e3eb5922b3b20e161d946aa7314a5c95df1a61797842e0ffcad4ae43e4f92e3
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/puppet-mode/puppet-mode-0.3-r1.ebuild b/app-emacs/puppet-mode/puppet-mode-0.3-r1.ebuild
index c3499c592dab..71d3827097d7 100644
--- a/app-emacs/puppet-mode/puppet-mode-0.3-r1.ebuild
+++ b/app-emacs/puppet-mode/puppet-mode-0.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/voxpupuli/puppet-mode/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 
 DOCS="CHANGES.rst README.rst"
 SITEFILE="50${PN}-1-gentoo.el"
diff --git a/app-emacs/twittering-mode/Manifest b/app-emacs/twittering-mode/Manifest
index d0cb2bd8081c..8b0557801fc2 100644
--- a/app-emacs/twittering-mode/Manifest
+++ b/app-emacs/twittering-mode/Manifest
@@ -1,6 +1,6 @@
 DIST twittering-mode-2.0.0.tar.gz 615223 BLAKE2B 1fc5ceb440ac9a00dde4d49cd48580d3e8f78ed2e9bccb8b2dcf41c6be1c7e0394c8db958e6ab4ac632b91bbdfc9a0930ad3867584d642b3f90b15a7bc0132d5 SHA512 318768c54c99c03c7641bfeb8396fdcaf65752121da6a64e6af9c071b6c429f73e44d1698df600915c4c7042233ef96cf86c037eece21b00d8e52a01ae569601
 DIST twittering-mode-3.0.0.tar.gz 1363235 BLAKE2B 31801fcb339cab42c7b9a9bfb186ef6a21570be16dd90d36baaabe97ec9fc93bdc35ead707e366e7262347158da145c04a6f51340abd3386b8c2a9fd8b5d417b SHA512 c696a8f31abcf6944c127575719d3e9b24a2bfb6271e0193e2a6faa8137c6468c7686b88d1e4ec0c3cc3b833e26853b435726d1acb422e9f37d3c0334e278494
-EBUILD twittering-mode-2.0.0.ebuild 844 BLAKE2B f15b0b79cfdc3a280bb5f9603f02d93878090d4957f9adc7f9a4e3fa83ee26a954766cb0e3b67358d710f9c3cf24c1bdb60a00a27e5fbf00a06e3fa938ddf0d8 SHA512 03636162edd76ef4d80ce83a02e0065e4ad5138d7aa9a7f089a3d1551644463406c0191ac72e2fbfd440ac2d049863fdbf5568a7adeb7728f2b1dce8af821ebe
-EBUILD twittering-mode-3.0.0.ebuild 844 BLAKE2B f15b0b79cfdc3a280bb5f9603f02d93878090d4957f9adc7f9a4e3fa83ee26a954766cb0e3b67358d710f9c3cf24c1bdb60a00a27e5fbf00a06e3fa938ddf0d8 SHA512 03636162edd76ef4d80ce83a02e0065e4ad5138d7aa9a7f089a3d1551644463406c0191ac72e2fbfd440ac2d049863fdbf5568a7adeb7728f2b1dce8af821ebe
-EBUILD twittering-mode-9999.ebuild 844 BLAKE2B f15b0b79cfdc3a280bb5f9603f02d93878090d4957f9adc7f9a4e3fa83ee26a954766cb0e3b67358d710f9c3cf24c1bdb60a00a27e5fbf00a06e3fa938ddf0d8 SHA512 03636162edd76ef4d80ce83a02e0065e4ad5138d7aa9a7f089a3d1551644463406c0191ac72e2fbfd440ac2d049863fdbf5568a7adeb7728f2b1dce8af821ebe
+EBUILD twittering-mode-2.0.0.ebuild 820 BLAKE2B e6ce259b52aed7bcc00f550cf4f92d9bf0a5fb826e4fc785f62f1fab62a93e3cbc8228fcc5e5a001bbece49907e65981a9d531192185399720269fd05f2ee64e SHA512 71dacc1eb3d71a1245b68499ebd092befb8c9b6dda1472b6cbef068860840b9b66b4aec03abe5d5bf778089555ceba14c690301041c98df885c294752a03a464
+EBUILD twittering-mode-3.0.0.ebuild 820 BLAKE2B e6ce259b52aed7bcc00f550cf4f92d9bf0a5fb826e4fc785f62f1fab62a93e3cbc8228fcc5e5a001bbece49907e65981a9d531192185399720269fd05f2ee64e SHA512 71dacc1eb3d71a1245b68499ebd092befb8c9b6dda1472b6cbef068860840b9b66b4aec03abe5d5bf778089555ceba14c690301041c98df885c294752a03a464
+EBUILD twittering-mode-9999.ebuild 820 BLAKE2B e6ce259b52aed7bcc00f550cf4f92d9bf0a5fb826e4fc785f62f1fab62a93e3cbc8228fcc5e5a001bbece49907e65981a9d531192185399720269fd05f2ee64e SHA512 71dacc1eb3d71a1245b68499ebd092befb8c9b6dda1472b6cbef068860840b9b66b4aec03abe5d5bf778089555ceba14c690301041c98df885c294752a03a464
 MISC metadata.xml 408 BLAKE2B 02b407a162e301d78caf8be7820f1b3974a848d704046b0d17f9b2f8d5e99a727e13ababca80a51164f9ac7936372becef48599c5aa6696720dbefe957a14858 SHA512 5d6fad266eb35c92343368d836144f4cb0c2c86e36dcc6153f15e71cf92f1f0a91a2a92f4755554332adfa42cb6ba4935b308cdf5aa37367648abe0a4d037730
diff --git a/app-emacs/twittering-mode/twittering-mode-2.0.0.ebuild b/app-emacs/twittering-mode/twittering-mode-2.0.0.ebuild
index b858dc10fc4e..1e802fc217fc 100644
--- a/app-emacs/twittering-mode/twittering-mode-2.0.0.ebuild
+++ b/app-emacs/twittering-mode/twittering-mode-2.0.0.ebuild
@@ -1,15 +1,13 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
 inherit elisp elisp-common eutils
 
-if [ "${PV}" = "9999" ]; then
+if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/hayamiz/twittering-mode.git"
-	inherit git-2
-	SRC_URI=""
-	KEYWORDS=""
+	inherit git-r3
 	IUSE="doc"
 else
 	SRC_URI="mirror://sourceforge/twmode/${P}.tar.gz"
@@ -29,7 +27,7 @@ RDEPEND="app-crypt/gnupg"
 
 src_compile() {
 	elisp-compile twittering-mode.el || die
-	[ "${PV}" = "9999" ] && use doc && emake -C doc/manual
+	[[ ${PV} == *9999 ]] && use doc && emake -C doc/manual
 }
 
 src_test() {
@@ -37,6 +35,6 @@ src_test() {
 }
 
 src_install() {
-	[ "${PV}" = "9999" ] && use doc && dodoc doc/manual/twmode/twmode.html
+	[[ ${PV} == *9999 ]] && use doc && dodoc doc/manual/twmode/twmode.html
 	elisp-install ${PN} twittering-mode.el *.elc || die
 }
diff --git a/app-emacs/twittering-mode/twittering-mode-3.0.0.ebuild b/app-emacs/twittering-mode/twittering-mode-3.0.0.ebuild
index b858dc10fc4e..1e802fc217fc 100644
--- a/app-emacs/twittering-mode/twittering-mode-3.0.0.ebuild
+++ b/app-emacs/twittering-mode/twittering-mode-3.0.0.ebuild
@@ -1,15 +1,13 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
 inherit elisp elisp-common eutils
 
-if [ "${PV}" = "9999" ]; then
+if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/hayamiz/twittering-mode.git"
-	inherit git-2
-	SRC_URI=""
-	KEYWORDS=""
+	inherit git-r3
 	IUSE="doc"
 else
 	SRC_URI="mirror://sourceforge/twmode/${P}.tar.gz"
@@ -29,7 +27,7 @@ RDEPEND="app-crypt/gnupg"
 
 src_compile() {
 	elisp-compile twittering-mode.el || die
-	[ "${PV}" = "9999" ] && use doc && emake -C doc/manual
+	[[ ${PV} == *9999 ]] && use doc && emake -C doc/manual
 }
 
 src_test() {
@@ -37,6 +35,6 @@ src_test() {
 }
 
 src_install() {
-	[ "${PV}" = "9999" ] && use doc && dodoc doc/manual/twmode/twmode.html
+	[[ ${PV} == *9999 ]] && use doc && dodoc doc/manual/twmode/twmode.html
 	elisp-install ${PN} twittering-mode.el *.elc || die
 }
diff --git a/app-emacs/twittering-mode/twittering-mode-9999.ebuild b/app-emacs/twittering-mode/twittering-mode-9999.ebuild
index b858dc10fc4e..1e802fc217fc 100644
--- a/app-emacs/twittering-mode/twittering-mode-9999.ebuild
+++ b/app-emacs/twittering-mode/twittering-mode-9999.ebuild
@@ -1,15 +1,13 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
 inherit elisp elisp-common eutils
 
-if [ "${PV}" = "9999" ]; then
+if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/hayamiz/twittering-mode.git"
-	inherit git-2
-	SRC_URI=""
-	KEYWORDS=""
+	inherit git-r3
 	IUSE="doc"
 else
 	SRC_URI="mirror://sourceforge/twmode/${P}.tar.gz"
@@ -29,7 +27,7 @@ RDEPEND="app-crypt/gnupg"
 
 src_compile() {
 	elisp-compile twittering-mode.el || die
-	[ "${PV}" = "9999" ] && use doc && emake -C doc/manual
+	[[ ${PV} == *9999 ]] && use doc && emake -C doc/manual
 }
 
 src_test() {
@@ -37,6 +35,6 @@ src_test() {
 }
 
 src_install() {
-	[ "${PV}" = "9999" ] && use doc && dodoc doc/manual/twmode/twmode.html
+	[[ ${PV} == *9999 ]] && use doc && dodoc doc/manual/twmode/twmode.html
 	elisp-install ${PN} twittering-mode.el *.elc || die
 }