7 files changed, 39 insertions, 208 deletions
diff --git a/app-emacs/bbdb/Manifest b/app-emacs/bbdb/Manifest
index f7ae4130f084..75ee88692255 100644
--- a/app-emacs/bbdb/Manifest
+++ b/app-emacs/bbdb/Manifest
@@ -1,3 +1,2 @@
-DIST bbdb-3.1.2.tar.gz 378935 BLAKE2B 3fc862d2d68632c997e3f250aa82cced743c3cc3861c74789bb12015ab99745270c79722dc0342334b90f4dd9071ef809ab670a342ac227c24a927870907c25c SHA512 8b32baadc4eb06b0abf533ccb1f540f4f407f27b8d2e847ae25e62d1405e1de5cfc6af16368eecd4086f281ee7a4016cf25568847b3cb798156c7e18e1912576
-DIST bbdb-3.2.2a.tar.gz 198749 BLAKE2B 9f9bf9eb1414f66e19ab4e0771275cb15716257019063874000adfd3de56d047f531c440f585def481c79bf69b06b2fa1edb5b6f42ad0619bfb44318fdde9a3c SHA512 767aa7a046a9456dbf0b622a6efabe5c1d87c0022507b3bb6bec07be54e57a7285a9fe39f870599a248d5e78883300de870c168dc9918c2d1a139ef31fd53ac8
 DIST bbdb-3.2.2b.tar.gz 199518 BLAKE2B d6eef625636689d204ed9c6c7f299380924da5b021118e70930ab3b928d547b9cbb5a1cec8d111ce52678fc44b30ee34d164f46a9c6afa98c829ba871382acef SHA512 f730b911d16484c3723f6983b94784a828173797f4732c8d8eb47d50186415e0fdfde62f4f5f5b5b6ac66b78580fcfb2a398840935400fddd5f8143831e35fe2
+DIST bbdb-3.2.2d_p20231122.tar.gz 201355 BLAKE2B 6f1abd80d580fa2bc9f5ce2a26179d54358ab156991e138e8028bec4c7e891e884f3aa938e895b3e7a5cdb7dae1548e5161c212e5b6073d8bf2c38ba76bc8029 SHA512 3d5d6a8411c14e8c8f8b60872e954c0d26e25bebb9c9148c354ea078e12a30b500ee1de026414359efca3b9fd502a0bad00c9df0549cb7c83c726d878187373d
diff --git a/app-emacs/bbdb/bbdb-3.1.2-r2.ebuild b/app-emacs/bbdb/bbdb-3.1.2-r2.ebuild
deleted file mode 100644
index f324f803d0c1..000000000000
--- a/app-emacs/bbdb/bbdb-3.1.2-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp autotools
-
-DESCRIPTION="The Insidious Big Brother Database"
-HOMEPAGE="https://savannah.nongnu.org/projects/bbdb/"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ GPL-1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="tex vm"
-RESTRICT="test" #631700
-
-BDEPEND="vm? ( app-emacs/vm )"
-RDEPEND="${BDEPEND}
-	tex? ( virtual/tex-base )"
-
-SITEFILE="50${PN}-gentoo-${PV}.el"
-TEXMF="/usr/share/texmf-site"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-no-init.patch
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
-		"$(use_with vm vm-dir "${EPREFIX}${SITELISP}/vm")"
-}
-
-src_compile() {
-	emake -C lisp
-}
-
-src_install() {
-	emake -C lisp DESTDIR="${D}" install
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	if use tex; then
-		insinto "${TEXMF}"/tex/plain/${PN}
-		doins tex/*.tex
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	use tex && texconfig rehash
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	use tex && texconfig rehash
-}
diff --git a/app-emacs/bbdb/bbdb-3.2.2b.ebuild b/app-emacs/bbdb/bbdb-3.2.2b.ebuild
index f166a51d8054..d3c0f19d3571 100644
--- a/app-emacs/bbdb/bbdb-3.2.2b.ebuild
+++ b/app-emacs/bbdb/bbdb-3.2.2b.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://git.savannah.nongnu.org/cgit/bbdb.git/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-3+ FDL-1.3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc tex vm wanderlust"
 RESTRICT="test" #631700
 
diff --git a/app-emacs/bbdb/bbdb-3.2.2a-r1.ebuild b/app-emacs/bbdb/bbdb-3.2.2d_p20231122.ebuild
index 492f9d913f89..efccb1113027 100644
--- a/app-emacs/bbdb/bbdb-3.2.2a-r1.ebuild
+++ b/app-emacs/bbdb/bbdb-3.2.2d_p20231122.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,21 +7,37 @@ inherit elisp autotools
 
 DESCRIPTION="The Insidious Big Brother Database"
 HOMEPAGE="https://savannah.nongnu.org/projects/bbdb/"
-#SRC_URI="https://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
-SRC_URI="https://git.savannah.nongnu.org/cgit/bbdb.git/snapshot/${P}.tar.gz"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://git.savannah.nongnu.org/cgit/${PN}.git"
+else
+	COMMIT="53e8ba04c47b3542db75b68f9663941daf2e6ca4"
+	SRC_URI="https://git.savannah.nongnu.org/cgit/bbdb.git/snapshot/${PN}-${COMMIT}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+
+	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
 
 LICENSE="GPL-3+ FDL-1.3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="doc tex vm wanderlust"
-RESTRICT="test" #631700
+RESTRICT="test"                                                    # bug 631700
 
-RDEPEND="vm? ( app-emacs/vm )
-	wanderlust? ( app-emacs/wanderlust )"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-apps/texinfo
-	doc? ( virtual/texi2dvi )"
-IDEPEND="tex? ( virtual/latex-base )"
+RDEPEND="
+	vm? ( app-emacs/vm )
+	wanderlust? ( app-emacs/wanderlust )
+"
+BDEPEND="
+	${RDEPEND}
+	sys-apps/texinfo
+	doc? ( virtual/texi2dvi )
+"
+IDEPEND="
+	tex? ( virtual/latex-base )
+"
 
 SITEFILE="50${PN}-gentoo-3.2.el"
 TEXMF="/usr/share/texmf-site"
@@ -32,10 +48,12 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
-		"$(use_with vm vm-dir "${EPREFIX}${SITELISP}/vm")" \
+	local -a -r econfargs=(
+		--with-lispdir="${EPREFIX}${SITELISP}/${PN}"
+		"$(use_with vm vm-dir "${EPREFIX}${SITELISP}/vm")"
 		"$(use_with wanderlust wl-dir "${EPREFIX}${SITELISP}/wl")"
+	)
+	econf "${econfargs[@]}"
 }
 
 src_compile() {
@@ -47,12 +65,13 @@ src_install() {
 	emake -C lisp DESTDIR="${D}" install
 	emake -C doc DESTDIR="${D}" install-info $(usev doc install-pdf)
 	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	dodoc AUTHORS ChangeLog NEWS README TODO
 
 	if use tex; then
-		insinto "${TEXMF}"/tex/latex/${PN}
+		insinto "${TEXMF}/tex/latex/${PN}"
 		doins tex/bbdb.sty
 	fi
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }
 
 pkg_postinst() {
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 "" >> $@;
- #	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 "" >> $@;
- #	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)/"
diff --git a/app-emacs/bbdb/metadata.xml b/app-emacs/bbdb/metadata.xml
index aaffcca93625..66ad8f6e5c9c 100644
--- a/app-emacs/bbdb/metadata.xml
+++ b/app-emacs/bbdb/metadata.xml
@@ -18,5 +18,6 @@
 </use>
 <upstream>
   <remote-id type="sourceforge">bbdb</remote-id>
+  <remote-id type="savannah-nongnu">bbdb</remote-id>
 </upstream>
 </pkgmetadata>