gentoo resync : 16.04.2022

4 files changed, 17 insertions, 50 deletions

diff --git a/app-emacs/ess/Manifest b/app-emacs/ess/Manifest
index 4712d28f1400..1ef0f53d45f5 100644
--- a/app-emacs/ess/Manifest
+++ b/app-emacs/ess/Manifest
@@ -1,6 +1,5 @@
 AUX 50ess-gentoo.el 58 BLAKE2B a643ea2780e8bb7c211ad438b41d709d39e3484a99ab1d603c86843aad92a66b8bbfc1bbe9a81c25fcc19cb68fa9de7d657bb99889704cc9593e61bff43e227c SHA512 e9023d176d39d3d3c35e004747007892e6f2e2b101b3c8e64fadc37d1fac8d264a786b7bad26c744730fec03580d7fb1170c8d2789e76e12b4eb47481b7f2808
-DIST ess-17.11.tgz 3275703 BLAKE2B 50ec08040135fb05be35494829b347f1ce1c8fdb8bbc5c11f9327800cbfafbb4e7dd5dc46c2b6ce8d506e4e9ade90e369d14c0498e06f990eccbbacbb7d16cec SHA512 b2bb09d079922ed8bded04387e6aecd38d760d7a3b9a521044fb7e2537fdc0cbb59c707e5aa550fc76aa92a6c47eab0fa40f554060707cfc7656b19adbdea222
+AUX ess-18.10.2-emacs-28.patch 702 BLAKE2B e7122c2ffcbce5606432e86109317fa846e9ede24ba67641ec222adef56ad3c6afb0a412c5425bbe49ff22c736c7fac41205401c9588a7ec33b0e420b2389976 SHA512 62a2211e4b1dd0a36bc651f240738b6327f1c5e682d7af7250099b29c848704e125484390eb6a83f8098eccf3e71fa38c1f89c3786268fb98fa615dbf83d4b1d
 DIST ess-18.10.2.tgz 2939425 BLAKE2B f9a6181dfaffc820a55214418d14aef1443945d6b15cb156ecfb70a8f5878df545662f37114a44ea8aa20338a5eaea6a6ce0884b02f108bd3372653db13e1eff SHA512 9bc04c5ec87ed639e56de9fd7817c3adb1a823f091254a91b906e22e8537fb097b21b80020bf245acbd61420d09949d66fc079f3c552d79bf32b95dc7fa1dca9
-EBUILD ess-17.11.ebuild 1114 BLAKE2B 123e1c165ad4663887260bf2dfd04dcd9c69d2092c6d0d15ee4c353c72a8639b46e2421971569074959506f2d5d1ac4b5da5c00104ff3db020aed7356a51f8e7 SHA512 78583fdd03cfb1c514050c56ff78eb8ead6575618eac76389d81051d0e41de08d2dd4828dca383adf53300644baf587513fd3706c90ed82167f4fdccfdfe7681
-EBUILD ess-18.10.2-r1.ebuild 1137 BLAKE2B caff2f46c3154a7ead6fa8826226126bd26fd4daf62a8f0d6f8a0ef91ca47ff3a835fb7b731821cef69698c75603d72a4c0e147d88f8f85a68094ea9142ef2b9 SHA512 d1f3e95fbd29f8691b45d35219626db1f14a17fec7fb92845ff8836ea64713baf238dfdfbdcf5167a4c846b045644115076b7cbc151988be1ec3cbd520662f99
+EBUILD ess-18.10.2-r1.ebuild 1185 BLAKE2B 7d952863b6f7a951aa360114ad05d95a2b7a4c48a24fd7fa253d7e86fb9eb50cbaebd026b341ceb14241148bc21b0beb2335214baccd01d2d1064c7e3c973459 SHA512 59ad7abea15b7c326e5c8f79844d3210fe1ce0913f2345042e9dfd554c7001b9e70f3d6522ad74604012d659e6fbf1315d951c6a3664bd902082d94175cec8b5
 MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
diff --git a/app-emacs/ess/ess-17.11.ebuild b/app-emacs/ess/ess-17.11.ebuild
deleted file mode 100644
index 668acfe92701..000000000000
--- a/app-emacs/ess/ess-17.11.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
-RESTRICT="test"
-
-BDEPEND="app-text/texi2html
-	virtual/latex-base"
-
-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-18.10.2-r1.ebuild b/app-emacs/ess/ess-18.10.2-r1.ebuild
index 893fb96a64ef..9b0ee42f87c9 100644
--- a/app-emacs/ess/ess-18.10.2-r1.ebuild
+++ b/app-emacs/ess/ess-18.10.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 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"
+HOMEPAGE="https://ess.r-project.org/"
+SRC_URI="https://ess.r-project.org/downloads/ess/${P}.tgz"
 
 LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
 SLOT="0"
@@ -17,6 +17,7 @@ RESTRICT="test"
 BDEPEND="app-text/texi2html
 	virtual/latex-base"
 
+PATCHES=( "${FILESDIR}"/${P}-emacs-28.patch )
 SITEFILE="50${PN}-gentoo.el"
 
 src_compile() {
diff --git a/app-emacs/ess/files/ess-18.10.2-emacs-28.patch b/app-emacs/ess/files/ess-18.10.2-emacs-28.patch
new file mode 100644
index 000000000000..c8f9b922eddc
--- /dev/null
+++ b/app-emacs/ess/files/ess-18.10.2-emacs-28.patch
@@ -0,0 +1,11 @@
+--- ess-18.10.2/lisp/ess-r-package.el
++++ ess-18.10.2/lisp/ess-r-package.el
+@@ -557,7 +557,7 @@
+   (error "As of ESS 16.04, `ess-developer' is deprecated. Use `ess-r-set-evaluation-env' instead"))
+ 
+ (defalias 'ess-toggle-developer 'ess-developer)
+-(define-obsolete-function-alias 'ess-r-devtools-check-package-buildwin 'ess-r-devtools-check-with-winbuilder)
++(define-obsolete-function-alias 'ess-r-devtools-check-package-buildwin 'ess-r-devtools-check-with-winbuilder "")
+ (define-obsolete-function-alias 'ess-r-devtools-ask 'ess-r-devtools-execute-command "18.04")
+ 
+ (make-obsolete-variable 'ess-developer "Please use `ess-developer-select-package' and `ess-r-set-evaluation-env' instead." "16.04")