From a978c074e4272bb901fbe4a10de0a7b2af574f17 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 4 May 2021 22:28:33 +0100 Subject: gentoo resync : 04.05.2021 --- app-emacs/Manifest.gz | Bin 34139 -> 34138 bytes app-emacs/emacs-w3m/Manifest | 2 - .../emacs-w3m/emacs-w3m-1.4.625_pre20180518.ebuild | 51 --- app-emacs/rudel/Manifest | 3 - .../files/rudel-0.3_pre20110721-emacs25.patch | 341 --------------------- app-emacs/rudel/rudel-0.3_pre20110721-r1.ebuild | 49 --- 6 files changed, 446 deletions(-) delete mode 100644 app-emacs/emacs-w3m/emacs-w3m-1.4.625_pre20180518.ebuild delete mode 100644 app-emacs/rudel/files/rudel-0.3_pre20110721-emacs25.patch delete mode 100644 app-emacs/rudel/rudel-0.3_pre20110721-r1.ebuild (limited to 'app-emacs') diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz index 85760c36c27a..a35e5a2497a2 100644 Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ diff --git a/app-emacs/emacs-w3m/Manifest b/app-emacs/emacs-w3m/Manifest index d7589fe7d046..2a4cf1617a92 100644 --- a/app-emacs/emacs-w3m/Manifest +++ b/app-emacs/emacs-w3m/Manifest @@ -1,6 +1,4 @@ AUX 70emacs-w3m-gentoo.el 96 BLAKE2B 90d452df120d37b1d19be08ed6e7b56edb588c95de6d124bdb8d25daa5c65fd8a19500e29e94a0936aa8efa2b51bae258e1431c6d1459d0d700e8d1dae0cbaca SHA512 7fd090a575e5b8f2df50bd751f301f5f4409dfd78eb45bb911c54a3cbfe76941a146630ea0e4089138c400caf45bb040f72e3ac335457061776e01e0aa3f5577 -DIST emacs-w3m-1.4.625_pre20180518.tar.xz 788404 BLAKE2B f621071c8657cab848789d359d492e5bee0fe401af48871fa54298571d87192de7186b1ea92fd3d64e6f1713fd12e5750b49b7e54c94e8d3b455d614ef0d0683 SHA512 f60317024f6dca23699510c21f185c162a5b3f0be551c681ce69b3b46e6fc7860e875fa6fc46a0bfafd8e5e6aaa9f1b29af0e0731685fbca2ce2b636eca7ad93 DIST emacs-w3m-1.4.632_pre20181112.tar.xz 792664 BLAKE2B f60249a064cf9b63a46e0d9ae0d845d3877dd9ddfc1f7770609c68c9d9b60c67b9e461c399b83c5b01fbe94609914937fbf8177475274faa262d8fab0b4e6a19 SHA512 01ecb8a282484d164f5d630adac39784aec9f2e37975865f132be4b8b82d4be1e5667d903775c4adf0470109053b1b229f09472410a0ac7d1588e64c86c7b8f9 -EBUILD emacs-w3m-1.4.625_pre20180518.ebuild 1205 BLAKE2B 595cfb5798ce80846faf0a5031e23ec5a1b9a81f8fd140118cf7da624a86138e0e9a0962fadb837746eede075831da0d6f61c8c5afbcf522e613ddaa1bd494cb SHA512 d1aaacb3f5274249774407adc1718c4dae43c074d11dd8ac2c608c9d64d7773c370afdee253985885c16e822ce02bfb80b1389f0b33aee93379b1a6f91ca74ac EBUILD emacs-w3m-1.4.632_pre20181112.ebuild 1307 BLAKE2B 1f3fd16f58e2621e39dec449b35e7587730a3f23cdc7e59d676c4a94b961d07f7c064946098dc85dd7bf5451a7721e8ee70fac93452f8d08490f521be5afb4f6 SHA512 a18bee4ffe4dc6bb7afa26f27cb146aa484f32cc47ab473d0ca6469dedef3d5a3d7b191a4e847b924eeb33ab2c95a68b423a20e0ebbb209fe52249a0416e965f MISC metadata.xml 360 BLAKE2B 35118ae1bf39fcfa2171f3637f0bac4b96f9727800a5ecd6057fc94185bfde69b496f2eed3ecbfb177b2a797ca23868f455889bfe86e978775ee09ce89534dcd SHA512 bce2ca2010fac3a4afadee07e58978abeba393e2e21642059c2d9baabd51ae9301915f41a9cc028a43d47f0dca878fdfd365585662b1dd1db0278e8473e9cd5c diff --git a/app-emacs/emacs-w3m/emacs-w3m-1.4.625_pre20180518.ebuild b/app-emacs/emacs-w3m/emacs-w3m-1.4.625_pre20180518.ebuild deleted file mode 100644 index 5541f1eb3266..000000000000 --- a/app-emacs/emacs-w3m/emacs-w3m-1.4.625_pre20180518.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit elisp autotools readme.gentoo-r1 - -DESCRIPTION="emacs-w3m is an interface program of w3m on Emacs" -HOMEPAGE="http://emacs-w3m.namazu.org/" -SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="l10n_ja" - -DEPEND="virtual/w3m" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${PN}" -SITEFILE="70${PN}-gentoo.el" - -src_prepare() { - mv configure.{in,ac} || die - sed -i -e '/^configure:/,+2d' Makefile.in || die - eapply_user - eautoreconf -} - -src_configure() { - default -} - -src_compile() { - emake all-en $(use l10n_ja && echo all-ja) -} - -src_install() { - emake lispdir="${ED}${SITELISP}/${PN}" \ - infodir="${ED}/usr/share/info" \ - ICONDIR="${ED}${SITEETC}/${PN}" \ - install-en $(use l10n_ja && echo install-ja) install-icons - - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - dodoc ChangeLog* NEWS README - use l10n_ja && dodoc BUGS.ja NEWS.ja README.ja - - DOC_CONTENTS="If you want to use the shimbun library, please emerge - app-emacs/apel and app-emacs/flim." - readme.gentoo_create_doc -} diff --git a/app-emacs/rudel/Manifest b/app-emacs/rudel/Manifest index 0bb95d70e59f..8937a9d67dd8 100644 --- a/app-emacs/rudel/Manifest +++ b/app-emacs/rudel/Manifest @@ -1,8 +1,5 @@ AUX 60rudel-gentoo-0.3.1.el 543 BLAKE2B 48539a1df3982a24a3dc289535ba8769ef368713c04833a7d4d16049118b0f43479642bf08e44358198bdfd58470778a8717440c832eec02ce27d9b25b81fc5d SHA512 5901c0b4c902f6d9b5c27e6b6bb8ef1a9605ea5594d58830aad500ba49b128e8fb9b12f61bc05e7af57a18448376c96d71088b73207012a79ab06d9f6dfab9cc AUX 60rudel-gentoo.el 542 BLAKE2B 2b1e1df77779d5de74db60b434e9a66b9a85a9fddbf2139b7b4f56bb04d1837b77d0b64d126b932a4d3441bbc9dec4039f729c3452ed79e77a98853fb8a2d29b SHA512 8b553141f8ade7c93e5d30298fe921b420a84d005450092473589a91e7e8ce5a0ad76ce7beaf8be1cb8233bb3f1693a4a6d055d034b903d46e5883f1d35386d0 -AUX rudel-0.3_pre20110721-emacs25.patch 9309 BLAKE2B 4cb32e198519de82bee48bc0b3b6ffa32f5efc25afa34a201c43ea0ce23c22be38cb455afe17ad94ebd8b8121396908f3aef0a26b4ba1800a8d04c1f2c1dc8c8 SHA512 6f5d8b6cadf527ea7c8410519d07b2f831e13da10812a5180142ca381d47ee14072ed59251a048d250c5a582998e9fb8205f050f034d7aa21a336b98255b9bc0 DIST rudel-0.3.1.tar.xz 418076 BLAKE2B e4a85abba24c3241cf5f8b468c6953662584256998c28cea6b1df59bcc943b364b9b1564787758c2d2c55ce61cbddf1e10c22714dc99c4b705831000eb5835f8 SHA512 b006745af5d5f607da78e910d226abfdd51343e806a14f1fbe340fc7b92503dba6b5d43668967da346bdf534b983d0de4b83d9039f5c5940b6b0d1c0fad3ad6b -DIST rudel-0.3_pre20110721.tar.xz 416060 BLAKE2B 813ec0dc034a0893c0cc540118d9471fcb353c232ce37b70816183ebc99ff82c16e80eddf015f5d5663c7380a93c29b153871bb1ca58f37f06d4e09bddd87912 SHA512 abf6c8eb4fcaf4acafb9bed7cafff5d3c8e19e3fecd2aa779065bfb11ce5cb198ef14cc9deed360ac895166ea159a821e24dc92dbeda4f5481d1bb3bc2f8c023 EBUILD rudel-0.3.1.ebuild 924 BLAKE2B a248195c97ade921686281aeaf2a9ea9259e7e666509808dd56a863315218595c6723dec340f98a8716d0f4e19acfab341332657d6f220efdc4fbf46b2d13ee6 SHA512 0390d8282832f1368d78d3acb86e4fad1ad714da62cb365e3d6893dea0f3c1e892bff88a17d9577ed1b811cb5700a300b3439bb0088d9ca2979e6db8361f1f3f -EBUILD rudel-0.3_pre20110721-r1.ebuild 1199 BLAKE2B 420d1983b029be02199dfe4bd3f1d3d090aa33b28917e2d31abd222b23b84ba6b371eb41910666df00443d0b93fc8f288ca4e6b3fdf2913a82424ab877cb25ff SHA512 6f7ebe1ed408b7c2524085fd4af4ecc274f7da04ce03a0127ce8f8015ddd6b3670f41a1eff8bd0d73176de38a3ef69075c3843d5c3ff6f61b04302cde2a1c961 MISC metadata.xml 781 BLAKE2B 66f1f7794721148546035e40a21b27075a828174825fd0a09a8dd7bfdc863ad585dd3aa093745c6494e488d2cce85494b346d45c5ffaa7ae905927be4c8e8123 SHA512 2df67c7b3175b5f6d0109a2627abb9f12b5ab7f88bb8fe386e786ce4014d8c1c7886cdab181a928d9ba8ab1d932823fe90ef782341d0cbbf6c07f84952bb9326 diff --git a/app-emacs/rudel/files/rudel-0.3_pre20110721-emacs25.patch b/app-emacs/rudel/files/rudel-0.3_pre20110721-emacs25.patch deleted file mode 100644 index 98aa38f370d7..000000000000 --- a/app-emacs/rudel/files/rudel-0.3_pre20110721-emacs25.patch +++ /dev/null @@ -1,341 +0,0 @@ -Fix byte-compilation with Emacs 25. -https://bugs.gentoo.org/590340 - -This comprises parts of the following commits from ELPA: - -commit 9ec4b84e27f3faae8ad3eb5d3e96c523ce1fece2 -Author: Stefan Monnier -Date: Sun Jul 10 18:16:39 2016 -0400 - - * rudel-backend.el: Try and fix compilation problem - -commit 5e4f147f6b23c392505cb0cbb5f13384d6d96304 -Author: Stefan Monnier -Date: Mon May 12 02:23:00 2014 -0400 - - Fix up headers and compilation - ---- rudel-orig/rudel-backend.el -+++ rudel/rudel-backend.el -@@ -46,8 +46,7 @@ - ;;; Code: - ;; - --(eval-when-compile -- (require 'cl)) -+(require 'cl) - - (require 'warnings) - -@@ -97,24 +96,34 @@ - "Factory class that holds an object for each known backend - category. Objects manage backend implementation for one backend - category each.") --(oset-default rudel-backend-factory factories -+(oset-default 'rudel-backend-factory factories - (make-hash-table :test #'eq)) - --(defmethod initialize-instance ((this rudel-backend-factory) &rest slots) -+(defmethod initialize-instance ((this rudel-backend-factory) &rest _slots) - "Initialize slots of THIS with SLOTS." - (when (next-method-p) - (call-next-method)) -- (oset this :backends (make-hash-table :test #'eq))) -+ (oset this backends (make-hash-table :test #'eq))) -+ -+;;;###autoload -+(progn -+(defmacro rudel--with-memoization (place &rest code) -+ (declare (indent 1) (debug t)) -+ (gv-letplace (getter setter) place -+ `(or ,getter -+ ,(macroexp-let2 nil val (macroexp-progn code) -+ `(progn -+ ,(funcall setter val) -+ ,val)))))) - - ;;;###autoload - (defmethod rudel-get-factory :static ((this rudel-backend-factory) - category) - "Return the factory responsible for CATEGORY. - If there is no responsible factory, create one and return it." -- (with-slots (factories) this -- (or (gethash category factories) -- (puthash category (rudel-backend-factory category) factories))) -- ) -+ (rudel--with-memoization -+ (gethash category (eieio-oref-default this 'factories)) -+ (make-instance 'rudel-backend-factory))) ;; category - - ;;;###autoload - (defmethod rudel-add-backend ((this rudel-backend-factory) -@@ -188,7 +197,8 @@ - (unless (object-p class) - (condition-case error - (puthash name (make-instance -- class (symbol-name name)) backends) -+ class (symbol-name name)) -+ backends) - (error - ;; Store this error on the name symbol of the backend for - ;; later display. -@@ -224,7 +234,7 @@ - ;;;###autoload - (defun rudel-backend-get-factory (category) - "A shortcut for getting the factory object for CATEGORY." -- (rudel-get-factory rudel-backend-factory category)) -+ (rudel-get-factory 'rudel-backend-factory category)) - - (defun rudel-backend-suitable-backends (category predicate) - "Return backends from category CATEGORY that satisfy PREDICATE. -@@ -290,15 +300,15 @@ - - ;; Insert all backends provided by this factory. - (dolist (backend (rudel-all-backends factory)) -- (if (or (object-p (cdr backend)) -- (null (get (car backend) -- 'rudel-backend-last-load-error))) -- (insert (rudel-backend--format-backend-normal backend)) -- (insert (rudel-backend--format-backend-error backend)))) -+ (insert (if (or (object-p (cdr backend)) -+ (null (get (car backend) -+ 'rudel-backend-last-load-error))) -+ (rudel-backend--format-backend-normal backend) -+ (rudel-backend--format-backend-error backend)))) - - ;; One empty line between backend categories. - (insert "\n")) -- (oref rudel-backend-factory factories)) -+ (oref-default 'rudel-backend-factory factories)) - (current-buffer)) - - (defun rudel-backend--format-backend-normal (backend) -@@ -316,7 +326,7 @@ - (propertize - (if (object-p (cdr backend)) - (mapconcat #'prin1-to-string -- (oref (cdr backend) :version) -+ (oref (cdr backend) version) - ".") - "?") - 'face 'font-lock-constant-face) -@@ -324,7 +334,7 @@ - (propertize - (if (object-p (cdr backend)) - (mapconcat #'prin1-to-string -- (oref (cdr backend) :capabilities) -+ (oref (cdr backend) capabilities) - " ") - "?") - 'face 'font-lock-constant-face)) ---- rudel-orig/rudel-color.el -+++ rudel/rudel-color.el -@@ -46,6 +46,7 @@ - ;;; Code: - ;; - -+(eval-when-compile (require 'cl)) - - ;;; RGV <-> HSV conversion - ;; ---- rudel-orig/rudel.el -+++ rudel/rudel.el -@@ -41,8 +41,7 @@ - ;;; Code: - ;; - --(eval-when-compile -- (require 'cl)) -+(require 'cl) - - (require 'eieio) - (require 'eieio-base) ---- rudel-orig/rudel-icons.el -+++ rudel/rudel-icons.el -@@ -41,8 +41,9 @@ - ;;; Image constants - ;; - -+(eval-and-compile - (defconst rudel-icons-image-formats '(svg png) -- "Image formats to try (in that order) when loading Rudel icons.") -+ "Image formats to try (in that order) when loading Rudel icons.")) - - (defvar rudel-icons-directory - (file-name-as-directory ---- rudel-orig/rudel-interactive.el -+++ rudel/rudel-interactive.el -@@ -38,6 +38,7 @@ - - ;;; Code: - ;; -+(require 'cl) - - (require 'rudel-compat) ;; for `read-color' replacement - (require 'rudel-backend) ;; for `rudel-backend-cons-p' -@@ -80,25 +81,29 @@ - (setq prompt "Session: ")) - ;; For presentation and identification of sessions, use the :name - ;; property. -- (flet ((to-string (session) -- (if (rudel-backend-cons-p session) -- (symbol-name (car session)) -- (plist-get session :name)))) -+ (let ((to-string -+ (lambda (session) -+ (if (rudel-backend-cons-p session) -+ (symbol-name (car session)) -+ (plist-get session :name))))) - ;; Read a session by name, then return that name or the - ;; corresponding session info. - (let ((session-name (completing-read prompt -- (mapcar #'to-string sessions) -+ (mapcar to-string sessions) - nil t))) - (cond - ((eq return 'object) - (find session-name sessions -- :key #'to-string :test #'string=)) -+ :key to-string :test #'string=)) - (t session-name)))) - ) - - (defvar rudel-read-user-name-history nil - "History of inputs read by `rudel-read-user-name'.") - -+(defvar rudel-default-username) -+(defvar rudel-current-session) -+ - (defun rudel-read-user-name () - "Read a username. - The default is taken from `rudel-default-username'." ---- rudel-orig/rudel-mode.el -+++ rudel/rudel-mode.el -@@ -48,6 +48,7 @@ - ;;; Code: - ;; - -+(require 'cl) - (require 'easy-mmode) - (require 'easymenu) - -@@ -132,6 +133,8 @@ - (rudel-buffer-document)))) - (force-mode-line-update)) - -+(defvar rudel-header-subscriptions-minor-mode) -+ - (defun rudel-header-subscriptions--options-changed () - "Update headers in buffers that have header subscriptions mode enabled." - (dolist (buffer (buffer-list)) -@@ -228,8 +231,7 @@ - #'rudel-header-subscriptions--remove-user)) - - ;; Reset header line to default format. -- (setq header-line-format default-header-line-format) -- (force-mode-line-update)) ;; TODO remove all handlers -+ (kill-local-variable 'header-line-format)) ;; TODO remove all handlers - - ;; No buffer document - (t -@@ -237,8 +239,7 @@ - (setq rudel-header-subscriptions-minor-mode nil) - - ;; Reset header line to default format. -- (setq header-line-format default-header-line-format) -- (force-mode-line-update))) -+ (kill-local-variable 'header-line-format))) - ) - - -@@ -411,6 +412,8 @@ - (force-mode-line-update) - ) - -+(defvar rudel-mode-line-publish-state-minor-mode) -+ - (defun rudel-mode-line-publish-state--document-attach (document buffer) - "Handle attaching of DOCUMENT to BUFFER. - When `rudel-mode-line-publish-state-minor-mode' is enabled in ---- rudel-orig/rudel-overlay.el -+++ rudel/rudel-overlay.el -@@ -36,8 +36,7 @@ - - (require 'custom) - --(eval-when-compile -- (require 'cl)) -+(require 'cl) - - (require 'eieio) - ---- rudel-orig/rudel-session-initiation.el -+++ rudel/rudel-session-initiation.el -@@ -54,8 +54,7 @@ - ;;; Code: - ;; - --(eval-when-compile -- (require 'cl)) -+(require 'cl) - - (require 'eieio) - ---- rudel-orig/rudel-speedbar.el -+++ rudel/rudel-speedbar.el -@@ -77,6 +77,8 @@ - '([ "Subscribe" #'ignore t]) - "Menu part in easymenu format used in speedbar while browsing objects.") - -+(defvar rudel-current-session) -+ - (defun rudel-speedbar-toplevel-buttons (dir) - "Return a list of objects to display in speedbar. - Argument DIR is the directory from which to derive the list of objects." ---- rudel-orig/rudel-state-machine.el -+++ rudel/rudel-state-machine.el -@@ -41,8 +41,7 @@ - ;;; Code: - ;; - --(eval-when-compile -- (require 'cl)) -+(require 'cl) - - (require 'eieio) - ---- rudel-orig/rudel-transport-util.el -+++ rudel/rudel-transport-util.el -@@ -48,7 +48,10 @@ - - ;;; Code: - ;; - -+(eval-when-compile (require 'cl)) -+(require 'eieio) -+(eval-when-compile (require 'rudel-util)) - (require 'rudel-errors) ;; for `rudel-error' - (require 'rudel-transport) - ---- rudel-orig/rudel-util.el -+++ rudel/rudel-util.el -@@ -43,8 +43,7 @@ - ;;; Code: - ;; - --(eval-when-compile -- (require 'cl)) -+(require 'cl) - - (require 'eieio) - ---- rudel-orig/rudel-xml.el -+++ rudel/rudel-xml.el -@@ -45,6 +45,7 @@ - ;;; Code: - ;; - -+(eval-when-compile (require 'cl)) - (require 'xml) - - diff --git a/app-emacs/rudel/rudel-0.3_pre20110721-r1.ebuild b/app-emacs/rudel/rudel-0.3_pre20110721-r1.ebuild deleted file mode 100644 index a1d42fd45fb9..000000000000 --- a/app-emacs/rudel/rudel-0.3_pre20110721-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -NEED_EMACS=24 - -inherit readme.gentoo-r1 elisp - -DESCRIPTION="Collaborative editing environment for GNU Emacs" -HOMEPAGE="http://rudel.sourceforge.net/ - https://www.emacswiki.org/emacs/Rudel" -# snapshot of bzr://rudel.bzr.sourceforge.net/bzrroot/rudel/trunk -SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -S="${WORKDIR}/${PN}" -ELISP_PATCHES="${P}-emacs25.patch" -SITEFILE="60${PN}-gentoo.el" - -src_compile() { - ${EMACS} ${EMACSFLAGS} -l rudel-compile.el || die -} - -src_install() { - local dir - - for dir in . adopted infinote jupiter obby socket telepathy tls \ - xmpp zeroconf - do - insinto "${SITELISP}/${PN}/${dir}" - doins ${dir}/*.{el,elc} - done - - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - - insinto "${SITEETC}/${PN}" - doins -r icons - - dodoc README INSTALL ChangeLog TODO doc/card.pdf - - DOC_CONTENTS="Connections to Gobby servers require the gnutls-cli program - (net-libs/gnutls). - \\n\\nThe Avahi daemon (net-dns/avahi) is required for automatic - session discovery and advertising." - readme.gentoo_create_doc -} -- cgit v1.2.3