gentoo resync : 18.05.2019

3 files changed, 13 insertions, 11 deletions

diff --git a/app-emacs/ess/Manifest b/app-emacs/ess/Manifest
index 15065e858875..f9d04750320a 100644
--- a/app-emacs/ess/Manifest
+++ b/app-emacs/ess/Manifest
@@ -1,8 +1,8 @@
 AUX 50ess-gentoo.el 58 BLAKE2B a643ea2780e8bb7c211ad438b41d709d39e3484a99ab1d603c86843aad92a66b8bbfc1bbe9a81c25fcc19cb68fa9de7d657bb99889704cc9593e61bff43e227c SHA512 e9023d176d39d3d3c35e004747007892e6f2e2b101b3c8e64fadc37d1fac8d264a786b7bad26c744730fec03580d7fb1170c8d2789e76e12b4eb47481b7f2808
 DIST ess-15.09-2.tgz 3248241 BLAKE2B 63e83436e60d6f9398dabaaed2aa795dee8888f3a992749bdf6ab9541464c65297c29e1d2936d3e6b1da6284c0c3508556b30a6b5a68e4e090e8e1ce3d925894 SHA512 9ba2f8800ece437e18749e29b6ecec3cf52297fa1c5a149dbf8eeb991df4f5dc99a76925458bd03203b7e8418347c4bcb5226e08dc64bd95d16e9a5b32f8634b
-DIST ess-16.04.tgz 3265496 BLAKE2B 2b7b9c972afb0fdea1b8c386d91ab0f2797c8ab1bf0e6a9ca17915670d7e4d61afbec108beb5e61fe7e0491f851aac21d5c2145c6c61d77b3be4046448479580 SHA512 5070197c8c622c83db98100272aa3bc947a0687fa357db1d63dab81b30175d7044f1eb5dc7274039f85636c613d23ad7b84eaae5ccef0cca7061d6d5af7b97d6
 DIST ess-17.11.tgz 3275703 BLAKE2B 50ec08040135fb05be35494829b347f1ce1c8fdb8bbc5c11f9327800cbfafbb4e7dd5dc46c2b6ce8d506e4e9ade90e369d14c0498e06f990eccbbacbb7d16cec SHA512 b2bb09d079922ed8bded04387e6aecd38d760d7a3b9a521044fb7e2537fdc0cbb59c707e5aa550fc76aa92a6c47eab0fa40f554060707cfc7656b19adbdea222
+DIST ess-18.10.2.tgz 2939425 BLAKE2B f9a6181dfaffc820a55214418d14aef1443945d6b15cb156ecfb70a8f5878df545662f37114a44ea8aa20338a5eaea6a6ce0884b02f108bd3372653db13e1eff SHA512 9bc04c5ec87ed639e56de9fd7817c3adb1a823f091254a91b906e22e8537fb097b21b80020bf245acbd61420d09949d66fc079f3c552d79bf32b95dc7fa1dca9
 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 1114 BLAKE2B 09fc93db9bdc861c44b1778705d06ce2993b05408dc558407390eb5cc7aff64be4c6e80749386604e1e61d5e03935e25bc95f9c15f124b3ea61f04e444b2c3ea SHA512 6e56b5d0b043c260cddd30907f2d9347c9622d4fc23ac365c4e84255fa1a75523eab6fb9df7a4c8ae231ba4a250cf5a4794e97f31cacd3f5c5e00c08d2f825c1
+EBUILD ess-17.11.ebuild 1127 BLAKE2B b7641b9626adb58c9a2cbc419d9ebfcf9cc495fcbf5609be60137a21c818980d39794ff032623040bf70aab3016960ed89d7fe069050058d0b4e6dfab8bb151a SHA512 e9da4050ed56caf3f05e853679b745ed8d0e5fcaa271bba770eed872cdcd1d7abdd38f3c4ad7b09e7ceaab283ae6373ec96edaf3761518e608e510d8fc877a30
+EBUILD ess-18.10.2-r1.ebuild 1151 BLAKE2B 6829c65356024a1e6a93372e245ca85a192c56ec50c3cbfb8097f1b9aa046226b62b8841d1cb12b9156b2fbed0e242a0d74747d6747f5d9368b232cba3eaad60 SHA512 49a8f781838fa66690e121e11e08ecb5ef91fd0338ef8aa3d51e3262b5319821567f1bf2a46f6e0a9d06130efd7ae063153f6346305689d0c9f40bbac2397d39
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/ess/ess-17.11.ebuild b/app-emacs/ess/ess-17.11.ebuild
index 6cda31d72ab8..8b9c7b08b5a7 100644
--- a/app-emacs/ess/ess-17.11.ebuild
+++ b/app-emacs/ess/ess-17.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,7 @@ SRC_URI="http://ess.r-project.org/downloads/ess/${P}.tgz"
 LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+RESTRICT="test"
 
 DEPEND="app-text/texi2html
 	virtual/latex-base"
diff --git a/app-emacs/ess/ess-16.04.ebuild b/app-emacs/ess/ess-18.10.2-r1.ebuild
index b3242a8d0323..9152a7ea4f81 100644
--- a/app-emacs/ess/ess-16.04.ebuild
+++ b/app-emacs/ess/ess-18.10.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit elisp readme.gentoo-r1
 
@@ -12,8 +12,9 @@ SRC_URI="http://ess.r-project.org/downloads/ess/${P}.tgz"
 LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+RESTRICT="test"
 
-DEPEND="app-text/texi2html
+BDEPEND="app-text/texi2html
 	virtual/latex-base"
 
 SITEFILE="50${PN}-gentoo.el"
@@ -24,18 +25,18 @@ src_compile() {
 
 src_install() {
 	emake PREFIX="${ED}/usr" \
-		INFODIR="${ED}/usr/share/info" \
 		LISPDIR="${ED}${SITELISP}/ess" \
+		ETCDIR="${ED}${SITEETC}/ess" \
 		DOCDIR="${ED}/usr/share/doc/${PF}" \
 		install
 
+	# Version 18* doesn't install *.el files any more #685978
+	elisp-install ${PN} lisp/*.{el,elc} lisp/obsolete/*.{el,elc}
 	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}
+	dodoc ChangeLog *NEWS doc/TODO
 	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 ."