gentoo resync : 06.08.2019

4 files changed, 9 insertions, 84 deletions

diff --git a/app-emacs/bbdb/Manifest b/app-emacs/bbdb/Manifest
index 60e2311ce82e..5d002257aa61 100644
--- a/app-emacs/bbdb/Manifest
+++ b/app-emacs/bbdb/Manifest
@@ -1,10 +1,5 @@
 AUX 50bbdb-gentoo-3.1.2.el 63 BLAKE2B 4e066577f6bbc4ddcc7a5b102c1bc650fd957d82468ed9782a97520db6acb2fb600372c4fcff7c21dd020080a3d4a5f41aaea15e5751ed5f22e17b9d2e04996d SHA512 3cb67cba1e12630c40b7c78572e7af0418c56d821c327c7b963cb00401a13f47da622b3a8e7a67795158b1394e860bcdf5ac3e478f8df9c5e3a97963bbd65a2e
-AUX 50bbdb-gentoo.el 115 BLAKE2B 69ff091d2da0819ec7bbc163c453a2621c12e6e1b685b577e9c2c16bce5a9c57c7afdf7ae35d113edc0b5e6e6e433f88155123646dd01f9cdb012824b81172b4 SHA512 c04101cfe2b1a13f9f25c6a8d5a9055cc4cda6e5b9208a563e6f1ed979e2585cffca97303f192f3a2b9f755d65ec3f86e68509293b874bf8020243eedbf99c50
 AUX bbdb-3.1.2-no-init.patch 4709 BLAKE2B 3e38c67d8347a8c6202ecddfa68847f0c9feab1593d84e5564607b3d9da104af93b5bb0862e899386555dd1abe5f8b7894c71575fc6a750db2e4332c5ad9c204 SHA512 3f262323cb35636d0249aafa54ff2a2e462df803d19c356bf2b7ed6a68410fa6e6bc41298a1e7fbeef224c84cf4bf9f80ff1ae068c5226ac6bea3ec62d593355
-DIST bbdb-2.35.tar.gz 393097 BLAKE2B 194924e828cb02022e90b49bc1c1cf8cfa23146e3118dbf6be7310930463c743f1648d54daf5f605f8d7a83ea307974084cbc07d630ae2273e8147a05dced799 SHA512 ee815f62796bcda63d37ae5a3805d065f6cc79648ca86852b97d4c1b849a1eb6c8f46dab2f257b9a8f9efc44d38469739f98137037c10f79f37a1ff235f6a413
 DIST bbdb-3.1.2.tar.gz 378935 BLAKE2B 3fc862d2d68632c997e3f250aa82cced743c3cc3861c74789bb12015ab99745270c79722dc0342334b90f4dd9071ef809ab670a342ac227c24a927870907c25c SHA512 8b32baadc4eb06b0abf533ccb1f540f4f407f27b8d2e847ae25e62d1405e1de5cfc6af16368eecd4086f281ee7a4016cf25568847b3cb798156c7e18e1912576
-DIST dates.el 7048 BLAKE2B 866a9a7a5524290a7762d0ad3c7b91766ca61fa025c2f634ce11909fdbd2a6d8bd7316ec66649590148a92660ef6122c93bac8085f333f1e319cc740349a8e90 SHA512 51b0dca58a1b54e913a0dbd97df12230ec49f05b368404fa3d49cddf4ca8e14dbff47a28087c4ba41b189a38a3608c77454e102ae5bb124d07d1ad3ec9c39e71
-DIST point-at.el 440 BLAKE2B fba28258d84c378985d2f17e28f0258e1e671f831f726e1d1289e84e246d9965300aa303c7f7dd383c9d33ec84e1e8bb014bba1e4f737661a5522a37ce6541ad SHA512 e38cbf39cb3f29f51f6759a7ba548f065c4763668d38c746eb69d9ab2384357f6b1c7f032a6afe739bc64658f5863730b7a4b3023cc9df1cc5e088e591c02760
-EBUILD bbdb-2.35-r1.ebuild 1831 BLAKE2B 27d7dc2da5c45c33d827030d6381b5cd329205c1ea7e51a65b2bd9c1805c0feb9b3fbe065de88f661715468f9a1873f1f26f8d0b4736ee84c158d14dfdb31310 SHA512 7b6a393f6c22933f748de30ce1be9a1b58d0f2d5ed90b403bb232cfb7eace715f14feb962c2543f15d458c11bd6131c2cdcc72cff3830008d8091d8f0726f311
-EBUILD bbdb-3.1.2.ebuild 1236 BLAKE2B b8d33d9d94984aad113fba3fa3ab2e6fdd75b1df4dab9803efe213dc84267fe1ec84625ff9d66bb90e45943c9cb0f3ded556ba7085f2a1201ba353c4b0904762 SHA512 b0a57c163c29f7eb3682ffc4ea6f1da679d9f238194d68d86785994009c96f34f41e97ec77a09f89d804767cb2f49a31cf5326256c8efffc8d4d54d3a3495695
+EBUILD bbdb-3.1.2-r1.ebuild 1252 BLAKE2B aa0e52adf4f144345ce9ab63158c28e0700992fa6166ad0dbaa2c0c774abb0d3096b75a754fd19bb796ddda5f6de3a4c5bbd67f80c0284f293e2e747271d2eb1 SHA512 b1af482f2570358068a5f2548b405cae3860b5493af9d7e212b2fd4091a2a7a8e55a552eb618996ee8b351b9d971726ef481726ab264c2f23a76d54e12a08595
 MISC metadata.xml 753 BLAKE2B 34f54aee0c3090fa9d9ee231f1f3ada71e889a4c4d7db76be9f0e351a4ae2333230c3338b014c2b267fd24610d788ede12749fe135f14d9760e76bd4e47d2827 SHA512 76dad950ad39c0f3442e2339dbf560154cc1b0685137c81e64224686ee31ff856dbd147aa04202250fa9595510c991d15609aec986dab26ad60bda3744902dda
diff --git a/app-emacs/bbdb/bbdb-2.35-r1.ebuild b/app-emacs/bbdb/bbdb-2.35-r1.ebuild
deleted file mode 100644
index f603c567dd93..000000000000
--- a/app-emacs/bbdb/bbdb-2.35-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp
-
-DESCRIPTION="The Insidious Big Brother Database"
-HOMEPAGE="http://bbdb.sourceforge.net/"
-SRC_URI="http://bbdb.sourceforge.net/${P}.tar.gz
-	http://www.mit.edu/afs/athena/contrib/emacs-contrib/Fin/point-at.el
-	http://www.mit.edu/afs/athena/contrib/emacs-contrib/Fin/dates.el"
-
-LICENSE="GPL-2+ Texinfo-manual"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="tex"
-
-RDEPEND="tex? ( virtual/tex-base )"
-
-SITEFILE="50${PN}-gentoo.el"
-TEXMF="/usr/share/texmf-site"
-
-src_prepare() {
-	sed -i -e '0,/^--- bbdb-mail-folders.el ---$/d;/^--- end ---$/,$d' \
-		bits/bbdb-mail-folders.el || die "sed failed"
-	sed -i -e '/^;/,$!d' bits/bbdb-sort-mailrc.el || die "sed failed"
-	cp "${DISTDIR}"/{dates,point-at}.el bits || die "cp failed"
-}
-
-src_configure() {
-	default
-}
-
-src_compile() {
-	emake -j1
-	BYTECOMPFLAGS="-L bits -L lisp"	elisp-compile bits/*.el || die
-}
-
-src_install() {
-	elisp-install ${PN} lisp/*.el{,c} || die
-	elisp-install ${PN}/bits bits/*.el{,c} || die
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	doinfo texinfo/*.info*
-	dodoc ChangeLog INSTALL README bits/*.txt
-	newdoc bits/README README.bits
-	if use tex; then
-		insinto "${TEXMF}"/tex/plain/bbdb
-		doins tex/*.tex
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	use tex && texconfig rehash
-
-	elog "If you use encryption or signing, you may specify the encryption"
-	elog "method by customising variable \"bbdb/pgp-method\". For details,"
-	elog "see the documentation of this variable. Depending on the Emacs"
-	elog "version, installation of additional packages like app-emacs/gnus"
-	elog "or app-emacs/mailcrypt may be required."
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	use tex && texconfig rehash
-}
diff --git a/app-emacs/bbdb/bbdb-3.1.2.ebuild b/app-emacs/bbdb/bbdb-3.1.2-r1.ebuild
index 58c9da5277c0..f4d2705ce4e8 100644
--- a/app-emacs/bbdb/bbdb-3.1.2.ebuild
+++ b/app-emacs/bbdb/bbdb-3.1.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit elisp autotools
 
@@ -11,19 +11,20 @@ SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+ GPL-1+ FDL-1.3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="tex vm"
 RESTRICT="test" #631700
 
-DEPEND="tex? ( virtual/tex-base )
-	vm? ( app-emacs/vm )"
-RDEPEND="${DEPEND}"
+BDEPEND="vm? ( app-emacs/vm )"
+RDEPEND="${BDEPEND}
+	tex? ( virtual/tex-base )"
 
 SITEFILE="50${PN}-gentoo-${PV}.el"
 TEXMF="/usr/share/texmf-site"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-init.patch
+	eapply "${FILESDIR}"/${P}-no-init.patch
+	eapply_user
 	eautoreconf
 }
 
diff --git a/app-emacs/bbdb/files/50bbdb-gentoo.el b/app-emacs/bbdb/files/50bbdb-gentoo.el
deleted file mode 100644
index 7953b3c852a4..000000000000
--- a/app-emacs/bbdb/files/50bbdb-gentoo.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(add-to-list 'load-path "@SITELISP@/bits")
-(require 'bbdb)
-(bbdb-initialize)