[gentoo-commits] repo/gentoo:master commit in: app-emacs/bbdb/files/

[gentoo-commits] repo/gentoo:master commit in: app-emacs/bbdb/files/

[Maciej Barć]

commit:     9d9ae29bfe6939b7325441b0c51ff8f35c2645c8
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Aug 13 13:30:35 2023 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sun Aug 13 19:26:08 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d9ae29b

app-emacs/bbdb: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 app-emacs/bbdb/files/50bbdb-gentoo-3.1.2.el   |   2 -
 app-emacs/bbdb/files/bbdb-3.1.2-no-init.patch | 126 --------------------------
 2 files changed, 128 deletions(-)

diff --git a/app-emacs/bbdb/files/50bbdb-gentoo-3.1.2.el b/app-emacs/bbdb/files/50bbdb-gentoo-3.1.2.el
deleted file mode 100644
index 45a7cc208e0d..000000000000
--- a/app-emacs/bbdb/files/50bbdb-gentoo-3.1.2.el
+++ /dev/null
@@ -1,2 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(require 'bbdb-loaddefs)

diff --git a/app-emacs/bbdb/files/bbdb-3.1.2-no-init.patch b/app-emacs/bbdb/files/bbdb-3.1.2-no-init.patch
deleted file mode 100644
index 85dbc0374e32..000000000000
--- a/app-emacs/bbdb/files/bbdb-3.1.2-no-init.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-Patch from upstream, backported to bbdb-3.1.2.
-
-From e028f4d8f04c3db663db023cf5a630461cfda2bd Mon Sep 17 00:00:00 2001
-From: Roland Winkler <winkler@gnu.org>
-Date: Wed, 23 Jul 2014 03:27:09 +0000
-Subject: Do not load init file or site file for byte compilation
-
---- bbdb-3.1.2-orig/lisp/Makefile.am
-+++ bbdb-3.1.2/lisp/Makefile.am
-@@ -20,6 +20,9 @@
- # You should have received a copy of the GNU General Public License
- # along with BBDB.  If not, see <http://www.gnu.org/licenses/>.
- 
-+# --batch implies --no-init-file, yet let's be explicit about what we want
-+AM_ELCFLAGS += --no-init-file --no-site-file
-+
- dist_lisp_LISP = 				\
- 	bbdb.el					\
- 	bbdb-anniv.el				\
-@@ -70,10 +73,11 @@
- 	@echo "\f" >> $@;
- #	Generated autoload-file must have an absolute path,
- #	$srcdir can be relative.
--	$(EMACS) -batch -l autoload \
-+	$(EMACS) --batch $(AM_ELCFLAGS) $(ELCFLAGS) \
-+		--load autoload \
- 		--eval '(setq generated-autoload-file "'$(abs_builddir)/$@'")' \
- 		--eval '(setq make-backup-files nil)' \
--		-f batch-update-autoloads $(srcdir)
-+		--funcall batch-update-autoloads $(srcdir)
- 
- # Generate bbdb-site.el here as pkgdatadir is only known at "make" time.
- # We protect the autoconf variables in the sed regular expressions
---- bbdb-3.1.2-orig/lisp/makefile-temp
-+++ bbdb-3.1.2/lisp/makefile-temp
-@@ -43,13 +43,16 @@
- EMACSOPT =
- 
- # The actual Emacs command run in the targets below.
--emacs = LC_ALL=C $(EMACS) --batch --directory=./ $(EMACSOPT)
-+# --batch implies --no-init-file, yet let's be explicit about what we want
-+emacs = LC_ALL=C $(EMACS) --batch --no-init-file --no-site-file \
-+		--directory=./ $(EMACSOPT)
-+emacs_compile = $(emacs) --funcall batch-byte-compile
- 
--# If you want to use BBDB with VM this should point to your vm/lisp directory.
--# See also the target all below.
-+# VM is not part of GNU Emacs.  If you want to use BBDB with VM
-+# then the variable VMDIR should point to your vm/lisp directory.
- VMDIR =
- 
--VM = -eval '(unless (string-match "$(VMDIR)" "") (push "$(VMDIR)" load-path))'
-+VM = -eval '(unless (string= "$(VMDIR)" "") (push "$(VMDIR)" load-path))'
- 
- .SUFFIXES: .elc .el .tar .Z .gz .uu
- 
-@@ -89,51 +92,50 @@
- 	@echo "\f" >> $@;
- #	Generated autoload-file must have an absolute path,
- #	$(srcdir) can be relative.
--	$(emacs) -l autoload \
-+	$(emacs) --load autoload \
- 		--eval '(setq generated-autoload-file "'`pwd`/$@'")' \
- 		--eval '(setq make-backup-files nil)' \
--		-f batch-update-autoloads `pwd`
-+		--funcall batch-update-autoloads `pwd`
- 
- .el.elc:
--	$(emacs) -f batch-byte-compile $<
-+	$(emacs_compile) $<
- 
- # Not perfect, but better than nothing:  If we do not have / do not use
- # autotools, we simply copy bbdb-site.el.in to bbdb-site.el.
- bbdb-site.el: bbdb-site.el.in
- 	$(CP) $< $@
- bbdb-site.elc: bbdb-site.el
--	$(emacs) -f batch-byte-compile $(@:.elc=.el)
-+	$(emacs_compile) $(@:.elc=.el)
- 
- bbdb.elc: bbdb.el bbdb-site.elc
--	$(emacs) -f batch-byte-compile $(@:.elc=.el)
-+	$(emacs_compile) $(@:.elc=.el)
- 
- bbdb-com.elc: bbdb-com.el bbdb.elc
--	$(emacs) -f batch-byte-compile $(@:.elc=.el)
-+	$(emacs_compile) $(@:.elc=.el)
- bbdb-mua.elc: bbdb-mua.el bbdb-com.elc
--	$(emacs) -eval '(unless (string= "$(VMDIR)" "") (push "$(VMDIR)" load-path) (load "vm" t t))' \
--	-f batch-byte-compile $(@:.elc=.el)
-+	$(emacs_compile) -eval '(unless (string= "$(VMDIR)" "") (push "$(VMDIR)" load-path) (load "vm" t t))' \
-+	$(@:.elc=.el)
- bbdb-rmail.elc: bbdb-rmail.el bbdb-mua.elc
--	$(emacs) -f batch-byte-compile $(@:.elc=.el)
-+	$(emacs_compile) $(@:.elc=.el)
- bbdb-gnus.elc: bbdb-gnus.el bbdb-mua.elc
--	$(emacs) -f batch-byte-compile $(@:.elc=.el)
-+	$(emacs_compile) $(@:.elc=.el)
- bbdb-mhe.elc: bbdb-mhe.el bbdb-mua.elc
--	$(emacs) -f batch-byte-compile $(@:.elc=.el)
--# VM is not part of GNU Emacs
-+	$(emacs_compile) $(@:.elc=.el)
- bbdb-vm.elc: bbdb-vm.el bbdb-mua.elc
--	$(emacs) $(VM) -f batch-byte-compile $(@:.elc=.el)
-+	$(emacs_compile) $(VM) $(@:.elc=.el)
- bbdb-sc.elc: bbdb-sc.el bbdb-mua.elc
--	$(emacs) -f batch-byte-compile $(@:.elc=.el)
-+	$(emacs_compile) $(@:.elc=.el)
- 
- bbdb-print.elc: bbdb-print.el bbdb-com.elc
--	$(emacs) -f batch-byte-compile $(@:.elc=.el)
-+	$(emacs_compile) $(@:.elc=.el)
- bbdb-migrate.elc: bbdb-migrate.el bbdb.elc
--	$(emacs) -f batch-byte-compile $(@:.elc=.el)
-+	$(emacs_compile) $(@:.elc=.el)
- bbdb-anniv.elc: bbdb-anniv.el bbdb-com.elc
--	$(emacs) -f batch-byte-compile $(@:.elc=.el)
-+	$(emacs_compile) $(@:.elc=.el)
- bbdb-ispell.elc: bbdb-ispell.el bbdb.elc
--	$(emacs) -f batch-byte-compile $(@:.elc=.el)
-+	$(emacs_compile) $(@:.elc=.el)
- bbdb-snarf.elc: bbdb-snarf.el bbdb-com.elc
--	$(emacs) -f batch-byte-compile $(@:.elc=.el)
-+	$(emacs_compile) $(@:.elc=.el)
- 
- install-el: all
- 	$(INSTALL) -d -m 0755 "$(lispdir)/"