gentoo Easter resync : 12.04.2020

4 files changed, 72 insertions, 4 deletions

diff --git a/app-emacs/bbdb/Manifest b/app-emacs/bbdb/Manifest
index 323432c16c24..a8e243f9f1c9 100644
--- a/app-emacs/bbdb/Manifest
+++ b/app-emacs/bbdb/Manifest
@@ -1,5 +1,8 @@
 AUX 50bbdb-gentoo-3.1.2.el 63 BLAKE2B 4e066577f6bbc4ddcc7a5b102c1bc650fd957d82468ed9782a97520db6acb2fb600372c4fcff7c21dd020080a3d4a5f41aaea15e5751ed5f22e17b9d2e04996d SHA512 3cb67cba1e12630c40b7c78572e7af0418c56d821c327c7b963cb00401a13f47da622b3a8e7a67795158b1394e860bcdf5ac3e478f8df9c5e3a97963bbd65a2e
+AUX 50bbdb-gentoo-3.2.el 149 BLAKE2B 7db122f83411995801b658f05dcda71d8eb5382ed1d5b2216f4a74a4c45328e54f25d393cf797ca335ed4129875b1c7ddf33e95e73479528720d116ace6a6e0c SHA512 650b802917866344dc6748ec213de79d8fe31a03654f1005994020173a143a51e295407350db1ebb0ef6f240047999cd9a1630a82af13997de57ead82cdb3b08
 AUX bbdb-3.1.2-no-init.patch 4709 BLAKE2B 3e38c67d8347a8c6202ecddfa68847f0c9feab1593d84e5564607b3d9da104af93b5bb0862e899386555dd1abe5f8b7894c71575fc6a750db2e4332c5ad9c204 SHA512 3f262323cb35636d0249aafa54ff2a2e462df803d19c356bf2b7ed6a68410fa6e6bc41298a1e7fbeef224c84cf4bf9f80ff1ae068c5226ac6bea3ec62d593355
 DIST bbdb-3.1.2.tar.gz 378935 BLAKE2B 3fc862d2d68632c997e3f250aa82cced743c3cc3861c74789bb12015ab99745270c79722dc0342334b90f4dd9071ef809ab670a342ac227c24a927870907c25c SHA512 8b32baadc4eb06b0abf533ccb1f540f4f407f27b8d2e847ae25e62d1405e1de5cfc6af16368eecd4086f281ee7a4016cf25568847b3cb798156c7e18e1912576
-EBUILD bbdb-3.1.2-r1.ebuild 1265 BLAKE2B 1a40d52bfd54f724cf4811c1538c67fc6f51e34f1e2766a1f93a43941b06cfc13ef64ab62b3180160166adca4ce0785b6d182017ca27f8819a61e53e0f5d5f77 SHA512 2c1cb1cca86c94d29d4064adb8bbcd455ba58d5ed63f7c7256b1c84a7d3b50b774696dd367f81e3698c8dd77c987ed3ffbef36004f8642bdff563d9e11b8dc27
+DIST bbdb-3.2.tar.gz 189456 BLAKE2B b25efd6a3a156684e0a8f15db056683876c8dd1a44eb585db269746c7424cc18df5407e3a04defcbbd8a2c8438bbe2b16d55ab290e842951f6e475bfc34871fe SHA512 593ba5143b50f2818c19c94452efb2c5d7194ed5dc8deecf1d380da4f80e0fad2542b9a7ee68d8baca2bc2bfd84fa0459eb3cd18faaf998eb0956fcfb62dc5c8
+EBUILD bbdb-3.1.2-r2.ebuild 1236 BLAKE2B 4fe817fd96846ec01e582eb9852b5e8bfd2ff695206b67ecbb6f47cda5eff6627efaeec21d7b99e87e35c1b499f9fe42dc4e89fb11a60e3956410d96f2f5ccd5 SHA512 ce494c3108c49a36f09160e023575351daad22b0ae4f42c9cc1732019cdaaf6fbff0da245ab4ef8aa4833c0d9d6dfe5ea2b65d6e370702a9c396695a69596f96
+EBUILD bbdb-3.2_pre20180106.ebuild 1320 BLAKE2B 2436f1a584f6d6abaf66d03c6f8ce9ef5c15aea1010eca6f61661f53fa7e9c2cc39795ec2c2a5659fb5561075be00a2199be208d75032d14b9c42b4a21ac7e0e SHA512 11d3cdd4035e1b2537de3fd4855a51fc94c29477216ae700183efff69d4ac64dc1d307f4941ee71fde79d376718e3c7faf2e4458637e45173d033ec9fbaad21c
 MISC metadata.xml 753 BLAKE2B 34f54aee0c3090fa9d9ee231f1f3ada71e889a4c4d7db76be9f0e351a4ae2333230c3338b014c2b267fd24610d788ede12749fe135f14d9760e76bd4e47d2827 SHA512 76dad950ad39c0f3442e2339dbf560154cc1b0685137c81e64224686ee31ff856dbd147aa04202250fa9595510c991d15609aec986dab26ad60bda3744902dda
diff --git a/app-emacs/bbdb/bbdb-3.1.2-r1.ebuild b/app-emacs/bbdb/bbdb-3.1.2-r2.ebuild
index 14b335632f91..f324f803d0c1 100644
--- a/app-emacs/bbdb/bbdb-3.1.2-r1.ebuild
+++ b/app-emacs/bbdb/bbdb-3.1.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ 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+ FDL-1.3+"
+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"
@@ -41,7 +41,6 @@ src_compile() {
 src_install() {
 	emake -C lisp DESTDIR="${D}" install
 	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	doinfo doc/*.info*
 	dodoc AUTHORS ChangeLog NEWS README TODO
 
 	if use tex; then
diff --git a/app-emacs/bbdb/bbdb-3.2_pre20180106.ebuild b/app-emacs/bbdb/bbdb-3.2_pre20180106.ebuild
new file mode 100644
index 000000000000..8dc25fd9b6bd
--- /dev/null
+++ b/app-emacs/bbdb/bbdb-3.2_pre20180106.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp autotools
+
+MY_P="${P%_pre*}"
+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/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+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/latex-base )"
+
+SITEFILE="50${PN}-gentoo-3.2.el"
+TEXMF="/usr/share/texmf-site"
+
+src_prepare() {
+	default
+	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/latex/${PN}
+		doins tex/bbdb.sty
+	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/files/50bbdb-gentoo-3.2.el b/app-emacs/bbdb/files/50bbdb-gentoo-3.2.el
new file mode 100644
index 000000000000..4bbec687fb81
--- /dev/null
+++ b/app-emacs/bbdb/files/50bbdb-gentoo-3.2.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(require 'bbdb-loaddefs)
+;; t indicates that bbdb.sty is in the regular TeX search path
+(setq bbdb-tex-path t)