gentoo resync : 26.12.2017

4 files changed, 13 insertions, 17 deletions

diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 9edbe1d9bfb0..8f05d9946512 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/exheres-syntax/Manifest b/app-vim/exheres-syntax/Manifest
index 45a3d4b496c1..ee5a918b07cc 100644
--- a/app-vim/exheres-syntax/Manifest
+++ b/app-vim/exheres-syntax/Manifest
@@ -1,4 +1,4 @@
 DIST exheres-syntax-20090310.tar.bz2 3670 BLAKE2B 27a6f075f80b7fc2e172b9586211a248f8075affd6a20ea52cafe06cda4f6d489a56a539e6a7619b3f7ce7fd29084ea990e66efbbdef7198a6857912eb9288c8 SHA512 616ef17367c68157d715321e457aaf0c65c97329f0848cb964d8974b6a85b4147f2e192b2ea3fcbfa3970e095bd9874203ce9723c73d1ef8350200732198c79f
-EBUILD exheres-syntax-20090310.ebuild 421 BLAKE2B 6467e18ce54b86b24e15d8020abef8ad6080263547264ba8d0ccd2900634e6e36dc4b004a8e88743b8704bfdbb2aaf2e3d474daf2ddd89358d76962e187ce0ae SHA512 f0db326fb3f884bbeca9d47e592712304caf6e5ebfa73b7d68a7155d7b93a7248fa984d5d89c966dff5288174b47dc1d3572ac77c9c4797aec0731bf5e19301c
-EBUILD exheres-syntax-99999999.ebuild 534 BLAKE2B 504f487aacc696304c75055e16d15325eedee12e86b845ac37c1f4fd03bf7ab65b9c1aa6a0e950002c0462833adbfb8ce083fb6b8503ad959854e88d4507c0e5 SHA512 c10c375fb2743cebd415753cfad22070eae9f265b8474406e05008eb1a2c965f711d4e7e6a5bc0f869da55f2fe711545e5c5598e30f4fc2408010107cf5641b3
+EBUILD exheres-syntax-20090310.ebuild 429 BLAKE2B ac967a7af33014986c90134098220abd47f0af841b35643a04b4205eead5f728bdd07fc578b9ab42075227e2f91966717119cc4921938c861b07e9eaa8e4bb3b SHA512 9da67961cc12debd0077fa9e280617ea01f6087c28ab0fae488dcc168f63efbcd76f5a323c64b50d982a356044a57b7950bf03a4ac9f1ed68b3cd8f16bf8dfa9
+EBUILD exheres-syntax-99999999.ebuild 456 BLAKE2B 1b3e21ae23744ad4695c2733ff4193899fe12cb2a59d051600082efd0458cc8930480d6edd18ce4c89aeb77989b651f3dd5b8f05853264f363437ac48006cdef SHA512 672617538cde07bafa27bad4feeea22448f579ae9069faab5687fd08579bf7d51366e9ecca63163c7bdda030fe2ccbd721b8a4580d160544774c91474271e91a
 MISC metadata.xml 251 BLAKE2B 4951201e33801e19bf0cf7b2bb87164107d87f074a28da579e90da44077e2833c36b51b63f92780ec4aa611d482a80a03723b56175bc041adcbe5573b537072d SHA512 5c10f22ced866afcb94b97662e270d3d4164ca9f988621c13d6a7c4508da8d9e9bbb804798cd468a2cc84ae9fd61aff32c782a372b0b8de145c1ea71751bab34
diff --git a/app-vim/exheres-syntax/exheres-syntax-20090310.ebuild b/app-vim/exheres-syntax/exheres-syntax-20090310.ebuild
index d7afc8d55ad1..98ebebae3200 100644
--- a/app-vim/exheres-syntax/exheres-syntax-20090310.ebuild
+++ b/app-vim/exheres-syntax/exheres-syntax-20090310.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: exheres format highlighting"
diff --git a/app-vim/exheres-syntax/exheres-syntax-99999999.ebuild b/app-vim/exheres-syntax/exheres-syntax-99999999.ebuild
index dd2c8f010758..21106c1f23b8 100644
--- a/app-vim/exheres-syntax/exheres-syntax-99999999.ebuild
+++ b/app-vim/exheres-syntax/exheres-syntax-99999999.ebuild
@@ -1,28 +1,22 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit vim-plugin git-2
+EAPI=6
+
+inherit vim-plugin git-r3
 
 DESCRIPTION="vim plugin: exheres format highlighting"
 HOMEPAGE="http://www.exherbo.org/"
-EGIT_REPO_URI="git://git.exherbo.org/${PN}.git
-	http://git.exherbo.org/pub/scm/${PN}.git"
-unset SRC_URI
+EGIT_REPO_URI="https://git.exherbo.org/git/exheres-syntax.git"
 
 LICENSE="vim"
 SLOT="0"
 IUSE=""
-KEYWORDS=""
 
 VIM_PLUGIN_HELPFILES="exheres-syntax"
 VIM_PLUGIN_MESSAGES="filetype"
 
-src_unpack() {
-	git-2_src_unpack
-	cd "${S}"
-	rm .gitignore Makefile
-}
-
-src_compile() {
-	:
+src_prepare() {
+	default
+	rm .gitignore Makefile || die
 }