gentoo resync : 06.08.2019

3 files changed, 3 insertions, 23 deletions

diff --git a/app-emacs/apache-mode/Manifest b/app-emacs/apache-mode/Manifest
index 86d8be815802..686b2840f77d 100644
--- a/app-emacs/apache-mode/Manifest
+++ b/app-emacs/apache-mode/Manifest
@@ -1,6 +1,4 @@
 AUX 50apache-mode-gentoo.el 499 BLAKE2B a49be09cf0a7ef07263899bcd1ba7485228cec4932bb7e756d2f31fecc63299389b68e9c3d6e08b2664b0e4d187f92550fe785bcd3d8b241b7a8a1bb3b707128 SHA512 4193ed796f1bd433ad33f61e2d23eafb6cde2114304f51c20464827d25185408749eccadb006663be25bb3a62b206deedf654bf0398b3e5ef94773a53ba28caf
-DIST apache-mode-1.1.el.gz 3468 BLAKE2B aa89b18877049fa8399ef75dd048e40eb84c20dec4365b08bcb1d1df2a14e4a2d63a2baff3bfeed1bb01fdd0489a757b3377ad21d311c03e958650e68a0f927b SHA512 4eb42a0b4db847026832f14473dfc6cfea6c436eaed5a52c2ca3ba27cc89b0b36b0e7be1472048e1c559f3b5d5a5e7e85b9e2cb9c5563bf781f241b540e141f1
 DIST apache-mode-2.2.0.tar.gz 16077 BLAKE2B 25b153dde0488febd361463b0f43207bd10680f7db2f28f32aa1955f9edc5a07c501646580afd124c7787da3283aa2ee4a2209bfd57f68bf73d5ad07fac41ca7 SHA512 3b309291813b309215250fc1ae1ff206df6474981302a145c305adebb6ffe6a20338b9d8fd5fef1ba491a6bd2427d372178f02d90af214dd24d389c574789aa5
-EBUILD apache-mode-1.1.ebuild 377 BLAKE2B 8818e51c9504cb143b83046ec9c33b085dfcb24e714e63138127c54f83de31b73c4161144a1b2304508832857fc97b038ed6226f0e23e1c9cde55c8c0e576501 SHA512 ae7e50866fff671b94acd287b8671ec77e5ffecc093c6f685afdb3be1e48f3178f2f4ac5d832e37897add19a2fa14e062a2899f01ec11e34f78fcbd3c7eed894
-EBUILD apache-mode-2.2.0.ebuild 441 BLAKE2B 111fb27fadd500d98507c881a7cc95168bbc98d202651c86365593571810f261efe6118e5bb2ef480e8d032d123f90de0e2c6685e20c9b71df7efbcf5992b182 SHA512 4c5f8a3cdd3015337c0886dd6be0256047a6942de455f4c12faddf23286fc647eb887523f01d509dee1f8ed1fad5301a9189a8b54ee7dec27e0b74d24b3ad66a
+EBUILD apache-mode-2.2.0.ebuild 432 BLAKE2B 8203d0d9d402f4d6f586432f12ca42d5f5b8bea3e87dc080f8b666b54e1902d4e2e2292f3b718695701a192e2f77ee5ad4588fe0919352d35faba0a56566ea71 SHA512 ebeae3f1222bd62dbff9849d70ba304b691980d35a067037aaa62ffbdf19845d692652ee962fe43e03ce07ef1ff179c00e74829d2e9550b8354120536b1f7e72
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/apache-mode/apache-mode-1.1.ebuild b/app-emacs/apache-mode/apache-mode-1.1.ebuild
deleted file mode 100644
index 7fc337a8f516..000000000000
--- a/app-emacs/apache-mode/apache-mode-1.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp
-
-DESCRIPTION="Major mode for editing Apache configuration files"
-HOMEPAGE="http://www.keelhaul.me.uk/linux/#apachemode"
-SRC_URI="mirror://gentoo/${P}.el.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/apache-mode/apache-mode-2.2.0.ebuild b/app-emacs/apache-mode/apache-mode-2.2.0.ebuild
index a3c41f739d3a..fc4c04af2ca7 100644
--- a/app-emacs/apache-mode/apache-mode-2.2.0.ebuild
+++ b/app-emacs/apache-mode/apache-mode-2.2.0.ebuild
@@ -9,10 +9,9 @@ DESCRIPTION="Major mode for editing Apache configuration files"
 HOMEPAGE="https://github.com/emacs-php/apache-mode"
 SRC_URI="https://github.com/emacs-php/apache-mode/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
+KEYWORDS="amd64 ~ppc x86"
 
 SITEFILE="50${PN}-gentoo.el"
 DOCS="README.org"