gentoo resync : 06.12.2017

3 files changed, 10 insertions, 55 deletions

diff --git a/app-emacs/ess/Manifest b/app-emacs/ess/Manifest
index 030d6603eac5..643a1085d4a5 100644
--- a/app-emacs/ess/Manifest
+++ b/app-emacs/ess/Manifest
@@ -1,10 +1,8 @@
 AUX 50ess-gentoo.el 58 BLAKE2B a643ea2780e8bb7c211ad438b41d709d39e3484a99ab1d603c86843aad92a66b8bbfc1bbe9a81c25fcc19cb68fa9de7d657bb99889704cc9593e61bff43e227c SHA512 e9023d176d39d3d3c35e004747007892e6f2e2b101b3c8e64fadc37d1fac8d264a786b7bad26c744730fec03580d7fb1170c8d2789e76e12b4eb47481b7f2808
-DIST ess-14.09.tgz 3350987 BLAKE2B 38b6f5e341d6822fe7e94b6555b0cf5d6fc6a1e63799c1bdc60906aeedf3c28bff4fe6ff197c52e82293eb3863edd094322c0761b301c9e028cbd7a2faae119c SHA512 91e275810f7a8c856f3392194ad3fb3d5f5b966e887568b22c133a362164e71ff5306d1d1a70e97f9d10261fe82eecb5f14e99a0dad4a4e239f5b810d7bba8ac
-DIST ess-15.03-1.tgz 3177102 BLAKE2B 83aa1a8a2e43d1bc144246593552b62ada9ac938d7e340c3e034e60adc609342fa688b21d69967b395a1c371defe6004cea4242f17ed1c11a30fad998df49e74 SHA512 5260d8afa10e1382cac3c70a4b6f753dd77e9f24bb2f68247732605b0f5fbb1b06e090dbcb45d747a484333f0779959c9213a4792103839b11c9e239bf35534d
 DIST ess-15.09-2.tgz 3248241 BLAKE2B 63e83436e60d6f9398dabaaed2aa795dee8888f3a992749bdf6ab9541464c65297c29e1d2936d3e6b1da6284c0c3508556b30a6b5a68e4e090e8e1ce3d925894 SHA512 9ba2f8800ece437e18749e29b6ecec3cf52297fa1c5a149dbf8eeb991df4f5dc99a76925458bd03203b7e8418347c4bcb5226e08dc64bd95d16e9a5b32f8634b
 DIST ess-16.04.tgz 3265496 BLAKE2B 2b7b9c972afb0fdea1b8c386d91ab0f2797c8ab1bf0e6a9ca17915670d7e4d61afbec108beb5e61fe7e0491f851aac21d5c2145c6c61d77b3be4046448479580 SHA512 5070197c8c622c83db98100272aa3bc947a0687fa357db1d63dab81b30175d7044f1eb5dc7274039f85636c613d23ad7b84eaae5ccef0cca7061d6d5af7b97d6
-EBUILD ess-14.09.ebuild 1103 BLAKE2B 371e1ae10fd90600e2987530ea6562f7514aa825186a3355335a5ec8743a237f3c457da483b8ec473ab972bc35b62cfe54e44bc96e8149b1bd1f1d26b468ae1b SHA512 116ed0dbc0a96881dae5fc21b9f81e9a7932e07603c16dee58ef29bbabf6668f989e2a6dc2a0f615ea57cb9594486cb27362b1acf28ed407b42e01efce17bf93
-EBUILD ess-15.03.1.ebuild 1161 BLAKE2B d30afdcbb8d06a00161c77149ad856d704771a881932b389c3ba230a4dbeb3c44db10d99da04d57b8a0f10d50e20fac4c5ad7f1bfac9e580bb907bc878f749a0 SHA512 68cc9ad8795c96f11f6cc880015134dc1037150ac731a46ed66e20bb4daf8dd6298195e38e239abb6b64a29285ad197c7ed191feffd25e4e0a92e760cc42cf15
+DIST ess-17.11.zip 3388618 BLAKE2B a935f11f71455791efe01a3d0fa5461cf2bf99c48807ef596f0c5b04e1c3a6d4b8710746c9dc5849c37261c9f8d528a64a48557a2350d5cae7109c0142bcb24c SHA512 0265ff2d284a1ce11b0ae125b4e77d7c4c10c2b491ceccb1efa6e59400f8377d2ac8951953fcbd38408d92d697c4cdd60dfb8385f19956414b88ac8f100c8551
 EBUILD ess-15.09.2.ebuild 1164 BLAKE2B 8a3105ca2a7ff0acdf27c3b9a061a395a8eb005511c3515d286eb99b4aa1ba3b43ecc21c82bb01f82438934f47b4ca1f9a8723a82ba001b37d5e1d899815f52b SHA512 ae190fba951333cad7300484d6988ca1d6e2954697a36c719a0616b99b10911d00846f63f5a5c5ba2662ec90eaf9f9d991ef0be55a01c89c71263a28011c1067
 EBUILD ess-16.04.ebuild 1114 BLAKE2B fa5a7812a40748d429fa77e151e8ef1cb987bf6e59a1853d2ba804d87ac28323f8fa5b4b1013578cb90886e25038b44e687209167953f17ce1d6665d261d4c77 SHA512 10a7ba2643a5e04e8b9fb3d80bf27f5e1ff02de0443f0cf7791e99defabf6e08959625c60938458c3d9ba612e7df8b96b46ff845af48220959ab0c5d9669fa16
+EBUILD ess-17.11.ebuild 1198 BLAKE2B 04422878bbff1ffb81ede5827d780910b029e5a9fc73254caff9ff8db9061f78f9643105e2360a5ffb1c517e10908af8e8f356c14659ac29f5aa0c4a817c628c SHA512 837bd8e8ce0c2df4ba63d5876220f9d0895c5317293ce16e0cfe6efa75a3a0014546214dc0bb37b5778dda21ecd29e01148da2e198bee52a7c1b948d2219341a
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/ess/ess-15.03.1.ebuild b/app-emacs/ess/ess-15.03.1.ebuild
deleted file mode 100644
index 5834ae91a7f0..000000000000
--- a/app-emacs/ess/ess-15.03.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit readme.gentoo elisp
-
-MY_P="${PN}-${PV%.*}-${PV##*.}"
-DESCRIPTION="Emacs Speaks Statistics"
-HOMEPAGE="http://ess.r-project.org/"
-SRC_URI="http://ess.r-project.org/downloads/ess/${MY_P}.tgz"
-
-LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
-
-DEPEND="app-text/texi2html
-	virtual/latex-base"
-
-S="${WORKDIR}/${MY_P}"
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	default
-}
-
-src_install() {
-	emake PREFIX="${ED}/usr" \
-		INFODIR="${ED}/usr/share/info" \
-		LISPDIR="${ED}${SITELISP}/ess" \
-		DOCDIR="${ED}/usr/share/doc/${PF}" \
-		install
-
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-
-	# Most documentation is installed by the package's build system.
-	rm -f "${ED}${SITELISP}/${PN}/ChangeLog"
-	dodoc ChangeLog *NEWS doc/{TODO,ess-intro.pdf}
-	newdoc doc/ChangeLog ChangeLog-doc
-	newdoc lisp/ChangeLog ChangeLog-lisp
-
-	DOC_CONTENTS="Please see /usr/share/doc/${PF} for the complete
-		documentation. Usage hints are in ${SITELISP}/${PN}/ess-site.el ."
-	readme.gentoo_create_doc
-}
diff --git a/app-emacs/ess/ess-14.09.ebuild b/app-emacs/ess/ess-17.11.ebuild
index 0b62f45729b3..30a7a1782eb8 100644
--- a/app-emacs/ess/ess-14.09.ebuild
+++ b/app-emacs/ess/ess-17.11.ebuild
@@ -1,20 +1,22 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit readme.gentoo elisp
+inherit elisp readme.gentoo-r1
 
 DESCRIPTION="Emacs Speaks Statistics"
 HOMEPAGE="http://ess.r-project.org/"
-SRC_URI="http://ess.r-project.org/downloads/ess/${P}.tgz"
+# ${P}.tgz is plain (uncompresses) tar, so use zip for this version
+SRC_URI="http://ess.r-project.org/downloads/ess/${P}.zip"
 
 LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 DEPEND="app-text/texi2html
-	virtual/latex-base"
+	virtual/latex-base
+	app-arch/unzip"
 
 SITEFILE="50${PN}-gentoo.el"