gentoo resync : 03.11.2019

4 files changed, 3 insertions, 93 deletions

diff --git a/app-emacs/haskell-mode/Manifest b/app-emacs/haskell-mode/Manifest
index 94f50c8025ba..06fc16bc3663 100644
--- a/app-emacs/haskell-mode/Manifest
+++ b/app-emacs/haskell-mode/Manifest
@@ -1,8 +1,4 @@
 AUX 50haskell-mode-gentoo.el 44 BLAKE2B 1587be01b819c8d788bc8b9c3e9481885b2be3ceda43336f8d8728f245c961cb49aa6b1245558ce4d25ed28fcfc310c4fa95f992335ca75b6cdff90e33f18af0 SHA512 3a4dc946f9f5b5e7dfed41d19b8e576f3d164d81049b7bcad08791803116104f0450634569ee60a65f78e42b2153b925062b05f31cf8b5477160a73eadbfcf2a
-DIST haskell-mode-13.07.tar.gz 131102 BLAKE2B 402a4f21eb400c0f20a17b37c556b2f3eb949ef7fe38ffc2a0f7384ef252da9f69a6ab405ab782ab9739d2b2e57bab5c471c840cc8c3e4db7b42082f8e5bb428 SHA512 e19d55a99f4d9a571c1ed0b095254e4d1b8080d9ba671461aa228cbf8aa7c7a213e19e588c0f69450a1bd4ac25793b523415a6f11bfb5dda7706dc35f7beee68
 DIST haskell-mode-16.1.tar.gz 1192866 BLAKE2B 5a53075be5ea1246f2aa61d1004fb282d6c5e182497f7660336cf89634bde3b6455997286a4e7e599bf044a9d5c47384f44addb1ab6f53a257c749a93849992e SHA512 28654499ee521032be1ae6edfd338cab6022d7fdd4ff34e720ffe249801d4b442484cce4f5fc3461aa5145918f66f4b69df774b60cceb408220fc0533386cc56
-DIST haskell-mode-2.9.1.tar.gz 123579 BLAKE2B f6aa2d989961868d2de5815ccfe79fbc75902ca33572a799e4967047685fe8d598aa3057d655ed0006c5d814e706ee94e6460c702d4bf88ba253acd0187e0970 SHA512 7c4cbdfd0f9e43ab3efd39c8ca7fcd941538865fe41522703175b7ca8a67276945ef7feef4207fa66aee156a028cb52bb96593867db0c777baba9f59415ee979
-EBUILD haskell-mode-13.07.ebuild 1163 BLAKE2B cf11607be57dc65c16bd9519ffd7f97aa359eec9d657c5325fc09c522f33f7448fffa50da56bbbc1fe17836e43e55157e4da9101062ae6f9ba714fb82f84bec9 SHA512 a3bf4975f672f62835ae80f600b1dea83e1480d05d0a56e0261ab97c9b6d0417ceef923a142fd23087038e547b4ed8f2d21cf59151a26ec74d6b94f1051fbc71
-EBUILD haskell-mode-16.1.ebuild 1050 BLAKE2B b0667cb95a16e9ee94d527002e32ad3877612d95bd3b3ac2f73f6e3693e7ec6bdd29458745d63722e6d9c529ab1ada959b9d733234fb996deae3de778d8cabb1 SHA512 08eae466b741962a41ae17d23f04dbfe1aa327659e901b757741ce721bedd486d76a33d12a45c56d95af749ca1c9d43dc11bba474be4b95ff4aba7566fce9680
-EBUILD haskell-mode-2.9.1.ebuild 1025 BLAKE2B de3b65e493a238f45a2872fa721f288d0639b67f36fa8ea85906fcdd2c787a7e4bca5d3b2fccdb36cf80dfeb8e1cb181ef8f8db378d7407a0749e78dc5aaf462 SHA512 3ba4e5d481325c864c1add293cb9a1c8d9e7e42360760f857666aae90fcc9b6aa4afc03b76ada8dcd32652b517ed0d2736e68e8b4c2f3545fa1ff556c1acae3f
+EBUILD haskell-mode-16.1.ebuild 1044 BLAKE2B 89f1495645025522b77f7122e21277d4cfa825bca386a9839179874e4c0cc50bc3f621608e6b4cf46acac0101ff19dcdb11d182e3166051eb74143f3a5f886ae SHA512 60bf9041d3df6ed44b9006283b2516dc3a023bc795c3791065699686b39d77a7f68b5937ae817cb6f6be653b088f53e362aedb60b065b07e52a391521ac2413a
 MISC metadata.xml 365 BLAKE2B 83d22f60eb396ae5edeb56a673d3eade22441caf345af215e9c288663b0c5fc9838e714924fcee0ab939e8308663bad7e1eddc3490f2dfc24b98f518ad4fd337 SHA512 60afa0ec1eeb97ab4636b806aa544a277838ad64703a213eb30a8d3981abd1a0fcdd6c6d7de94afbd1dee29c92d8c7fe4112e827ee2e8016b537307634aab025
diff --git a/app-emacs/haskell-mode/haskell-mode-13.07.ebuild b/app-emacs/haskell-mode/haskell-mode-13.07.ebuild
deleted file mode 100644
index ffc84c434453..000000000000
--- a/app-emacs/haskell-mode/haskell-mode-13.07.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="Mode for editing (and running) Haskell programs in Emacs"
-HOMEPAGE="http://projects.haskell.org/haskellmode-emacs/
-	http://www.haskell.org/haskellwiki/Emacs#Haskell-mode"
-SRC_URI="https://github.com/haskell/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+ FDL-1.2+"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-
-DEPEND="sys-apps/texinfo"
-
-SITEFILE="50${PN}-gentoo.el"
-ELISP_TEXINFO="haskell-mode.texi"
-DOCS="NEWS README.md examples/*.hs examples/init.el"
-
-src_prepare() {
-	# We install the logo in SITEETC, not in SITELISP
-	# https://github.com/haskell/haskell-mode/issues/102
-	sed -i -e "/defconst haskell-process-logo/{n;" \
-		-e "s:(.*\"\\(.*\\)\".*):\"${SITEETC}/${PN}/\\1\":}" \
-		haskell-process.el || die
-}
-
-src_compile() {
-	elisp_src_compile
-	elisp-make-autoload-file haskell-site-file.el
-}
-
-src_test() {
-	# perform tests in a separate directory #504660
-	mkdir test && cp *.el Makefile test || die
-	emake -C test check
-}
-
-src_install() {
-	elisp_src_install
-	insinto "${SITEETC}/${PN}"
-	doins logo.svg
-}
diff --git a/app-emacs/haskell-mode/haskell-mode-16.1.ebuild b/app-emacs/haskell-mode/haskell-mode-16.1.ebuild
index a8d61e5c904d..199e7d7cbc69 100644
--- a/app-emacs/haskell-mode/haskell-mode-16.1.ebuild
+++ b/app-emacs/haskell-mode/haskell-mode-16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/haskell/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+ FDL-1.2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 
 DEPEND="sys-apps/texinfo"
 
diff --git a/app-emacs/haskell-mode/haskell-mode-2.9.1.ebuild b/app-emacs/haskell-mode/haskell-mode-2.9.1.ebuild
deleted file mode 100644
index c64e1eed6fa7..000000000000
--- a/app-emacs/haskell-mode/haskell-mode-2.9.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-MY_PV=${PV//./_}
-DESCRIPTION="Mode for editing (and running) Haskell programs in Emacs"
-HOMEPAGE="http://projects.haskell.org/haskellmode-emacs/
-	http://www.haskell.org/haskellwiki/Emacs#Haskell-mode"
-SRC_URI="https://github.com/haskell/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE=""
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-DOCS="NEWS README.md *.hs examples/init.el"
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	# We install the logo in SITEETC, not in SITELISP
-	# https://github.com/haskell/haskell-mode/issues/102
-	sed -i -e "/defconst haskell-process-logo/{n;" \
-		-e "s:(.*\"\\(.*\\)\".*):\"${SITEETC}/${PN}/\\1\":}" \
-		haskell-process.el || die
-}
-
-src_compile() {
-	elisp-make-autoload-file haskell-site-file.el || die
-	elisp-compile *.el || die
-}
-
-src_install() {
-	elisp_src_install
-	insinto "${SITEETC}/${PN}"
-	doins logo.svg
-}