Version bump, bug 511572.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

6 files changed, 214 insertions, 18 deletions

diff --git a/app-emacs/bbdb/ChangeLog b/app-emacs/bbdb/ChangeLog
index 582bf5a1df95..5a975566c87f 100644
--- a/app-emacs/bbdb/ChangeLog
+++ b/app-emacs/bbdb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/bbdb
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/bbdb/ChangeLog,v 1.42 2012/09/25 19:22:48 ulm Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/bbdb/ChangeLog,v 1.43 2014/07/28 16:33:40 ulm Exp $
+
+*bbdb-3.1.2 (28 Jul 2014)
+
+  28 Jul 2014; Ulrich Müller <ulm@gentoo.org> +bbdb-3.1.2.ebuild,
+  +files/bbdb-3.1.2-no-init.patch, +files/50bbdb-gentoo-3.1.2.el, metadata.xml:
+  Version bump, bug 511572.
 
   25 Sep 2012; Ulrich Müller <ulm@gentoo.org> bbdb-2.35-r1.ebuild:
   Specify LICENSE more precisely. Bump ebuild to EAPI 4.
diff --git a/app-emacs/bbdb/Manifest b/app-emacs/bbdb/Manifest
index 79e788f01e2a..8c6e36eeb9f6 100644
--- a/app-emacs/bbdb/Manifest
+++ b/app-emacs/bbdb/Manifest
@@ -1,27 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 50bbdb-gentoo-3.1.2.el 63 SHA256 818cfbe8d0c69cc75e7fcd873758ee9b4cd0ffe99695be087353a1846c11734f SHA512 3cb67cba1e12630c40b7c78572e7af0418c56d821c327c7b963cb00401a13f47da622b3a8e7a67795158b1394e860bcdf5ac3e478f8df9c5e3a97963bbd65a2e WHIRLPOOL acb376af0b3e2cc91a8315fc3c287d104439af28c6d060595eacfe1c4cf6180a9d3e6ee346dce1df2e38d60bcd6228f150dddb8a2c78f179a798f12319e93d99
 AUX 50bbdb-gentoo.el 115 SHA256 e696f6914208e4147c67903327531da164187456060b83e57ee5625aebe9a7b7 SHA512 c04101cfe2b1a13f9f25c6a8d5a9055cc4cda6e5b9208a563e6f1ed979e2585cffca97303f192f3a2b9f755d65ec3f86e68509293b874bf8020243eedbf99c50 WHIRLPOOL f8d25648201582c6ec0c23a9510ead8631234c4a17574a0e433f70acd30575daa2aff7ccad3ad34077f90afa97ac8f14524bd6ef9f39f79ba27a33eb34b7608a
+AUX bbdb-3.1.2-no-init.patch 4709 SHA256 881ea9ae7823d36e0c120d83a426b498ff337aab80ec0d1ef6ea0fa66a693cd9 SHA512 3f262323cb35636d0249aafa54ff2a2e462df803d19c356bf2b7ed6a68410fa6e6bc41298a1e7fbeef224c84cf4bf9f80ff1ae068c5226ac6bea3ec62d593355 WHIRLPOOL c639da2b4b3b6adab6b0e8b95106bd937073ac089c2886d94704c1f3513df3922e9fb018a572e3ab437ed4dbdf54d3ac7426a9951213d52e540558bf7e47f6e6
 DIST bbdb-2.35.tar.gz 393097 SHA256 3fb1316e2ed74d47ca61187fada550e58797467bd9e8ad67343ed16da769f916 SHA512 ee815f62796bcda63d37ae5a3805d065f6cc79648ca86852b97d4c1b849a1eb6c8f46dab2f257b9a8f9efc44d38469739f98137037c10f79f37a1ff235f6a413 WHIRLPOOL 8b5bfb01d03618b9b7e5715484f2594b58ca5689e0a1a6f69df6430d276f207618e2a254042c2c539ac470732f8d746d9302db8a09609ab2226f3350ff6b78ed
+DIST bbdb-3.1.2.tar.gz 378935 SHA256 05780f030584ddaa717d04700bc70e7d9e929141223c7f130fc0c778d73241bf SHA512 8b32baadc4eb06b0abf533ccb1f540f4f407f27b8d2e847ae25e62d1405e1de5cfc6af16368eecd4086f281ee7a4016cf25568847b3cb798156c7e18e1912576 WHIRLPOOL d8d50c34ba3a1ccf879a1749b37f0cdc8c5d46ff4d01940256501574e933b1e8d141d6ded8bc6a797e6377b759ba55582b5d2c3190489e9cbf96487c7124dbb5
 DIST dates.el 7048 SHA256 8de33f7b00ac1766eb104c1bf2f362aff54e3de4d67cbd0a4da1b6b137363ec4 SHA512 51b0dca58a1b54e913a0dbd97df12230ec49f05b368404fa3d49cddf4ca8e14dbff47a28087c4ba41b189a38a3608c77454e102ae5bb124d07d1ad3ec9c39e71 WHIRLPOOL eb2239adc4e2b7392e6f091ef253685f155ab9acc09432b61d67b44f572f8cd774282806d2c50e48f80be4786890d000727f1fc94966289c2f03441844b52c26
 DIST point-at.el 440 SHA256 c9695455b96f17fbebc9cf0ae21b042fb04b688016279010d87c01e9d270e0c8 SHA512 e38cbf39cb3f29f51f6759a7ba548f065c4763668d38c746eb69d9ab2384357f6b1c7f032a6afe739bc64658f5863730b7a4b3023cc9df1cc5e088e591c02760 WHIRLPOOL 9dc36a49a8d5ea6a9a5619cbccd7e2a3f668d3c6bf917e1cf315ad0eb72fd3032d1c3bb40a17995b6b5ab81760f261a128ecd3b45615fd30d87ae2430a782102
 EBUILD bbdb-2.35-r1.ebuild 1949 SHA256 ff6cba7b0185267a96cb2c59b2ebe2071caaaad9c48c18fa170f80263dafb935 SHA512 94343df75d679d7cf4317ed1a71b7da4300189d9c17f9519183d55cc894118d44ccbd4683d9269c15bb32e1c584703dfc7df4bbcaf3e7862f126abbfaf57a585 WHIRLPOOL 713a13cb1c9bf46c1aa613a9dbae17b5f0a9948fafdf2b7a2d1abce6ebf117192bd1925214f191dff77d95f88ae6ce909605fd12bc14ad2c86477fb5365ea889
-MISC ChangeLog 5493 SHA256 0d843bb680b1b6e20843bc988dec6ccdd61d5d4df741fcc2afd3e6d0a0c96093 SHA512 3577be828dcb088db9eb5ff5b7d3ffef1b6767c30f390a62d87ae07f7aac5151524f8b7115991c159922c417b12b87724bf44c27b35a492e565acd6efabd3a0d WHIRLPOOL 41a2a7fd124a92fcdd43ee0e91cdafc0a3a7b50d8096b892026f8d76ed6b7247f2fbcf497edf4195f604704d76774212a579ce6c3cf8d15e2d8ac34cf8e28dba
-MISC metadata.xml 492 SHA256 94f01d2cfdaf68ba04e329b3cf04b78b1826cdf65aeb435a4de30896607f11c3 SHA512 85249161429ec8f665ebce30b9b1afef26d9d40d9cad05c8012061413d6887059a26d00286eb0e0f540eebf4148e50e3ecced13980172a5f2a14c662c4101bef WHIRLPOOL ab1c977ac65be9c9e31c98ac3123cae6d08625e9bf55ed3740c0ddec50847fba8223595e488bcca1732b082acd8cbbfe78ecfe86bd362d873a4480945ec5055c
+EBUILD bbdb-3.1.2.ebuild 1315 SHA256 6f80aba2344d2dcfd8344e0df67e74afdd2b780ab3b90925d556a6e716e094af SHA512 958c3515267f9d1b228f61133248554e770720ce266cfdfb1a873365b6596e2b7a0d32f97f8ee2e9b0a58f275a79193dc37df043ee23edccbce2cc685942caea WHIRLPOOL 4602badf005c9ccf29ddad6511f5b8e35dd3c9dc925ee8cba6a3bedb76bbba444b30999c5a439e0f218c3a86c7cd81b2fa8682bc1c4ca31d6aaae71783e0cf7f
+MISC ChangeLog 5696 SHA256 23966de277ba88673285d0327228d4033c295d33a800a596d73512a7557cbd82 SHA512 448ee8ef62488c05b38459126002229d7155b006bcbceb14827a8052aec73e9d1f8e12148322bfa740245890e420c0fde4b52cc8416eed10be45eacc53a5d7dc WHIRLPOOL bf583c52ee4d6b961a216a453f127b51491945f7adc4b97631e918c8e4e8ca61dfc3f3a7d1101613419855968bd9b4fd2a4fcefe4c4f77b76e564cd627b4dcac
+MISC metadata.xml 557 SHA256 c130d895608c923b153e7074e76df0a03b562cd6aee4b22d6493665ab227b2ca SHA512 957ecc08eb223f0e0f76cd49550af848a7124a5c8c37d974e62e5a9e8902c264cf4869f88ac840a4589c0e94c5ff6f269d9774979ab6d0e7b0e36aecbdf3f17e WHIRLPOOL 8e1eaa3d43d031bbc4ea61fa71c969c3de5737b830964eb16d46c545d85247811203293ec84be64be8053758c0579d375d0347a01edc7efd48348d1398425de4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJQYgalAAoJEDxpGckxwJCBgr4P/RsOzFkENya4yr8fvohBsUuF
-fTNnxuyrQLnMHONIUFAOhQfdthuexqPgQRBTVaOt7WAGPiIwHTR2jrQc9bn+gZq+
-TK2x+RE/Fi4JWKCjigtErU8Whx0x9lh73q8eCSKviQMd+o4VgPsJJ1UCp7bqylVB
-W/Ui4J50lDgQtBm897tbWA9TgM/4DrgrXQDJlVrbyTrKr5p8fIBlZS0y87LnNYJ7
-TAuaXjjiDjMX4ZPCg9sDxj2Qi5hsCTlVOuwET1z6GA7pEyglKQiQ13hWFpPREW/M
-YRLrn1WWseNTeAOd2jIOQok+mGjWy1pZYeSYO9R0ic/QBYF6xy4y+BUdWCw9DAfv
-TmDuFOWvRNU1x/B6GtZJNhne0/6z1pWYLue0Cb5HGRVgrTni+32Yd3HX9hEq1v4d
-P5L4KqFHP3G+I/3pthv5YJpYKrMpKk9qCafptpo5KxsDcYDVeqSChFp1IuLV9O0R
-rKm91sKARTtCNazUHZyH47QiYtrnww3zfAkC0AfdJRcZEnbX7qPZ2c7B6ySpmyUb
-FdIimhvB7r6j9I28oUNdkxNcbtur+pjzG3rIKHjjtBU+BRsMczrlHh+v7+NuKs7a
-sYeRk9+P9n4TjvuT2OghL5LtTHgC6OIVX4yrM9Ykmq4xJjlHzVlrjn4nWWTmbhDe
-CkXMLlRzXEV2Fx5PrSIp
-=8EO9
+iQGcBAEBCAAGBQJT1nwVAAoJEJQzkH1pP7W4pnkL+wUCN5P2VnMAT05B+h9rmn+F
+Lb9yDKYv8AVetqdAxnh6ZxM0Z9POtGAYDsQcVSuP0P3BNEj2o2RGyNZ7LB+7/YSV
+s+xCfFTyU3cGquojbsVxl7wTYkEIqS/8i7E+SaaQvmerCAU4avHqTMQxA1hS4YQ/
+D/xuftYEu9EqJFyfbbZKmM/01zKR7CQfYQGuXoTlfQIMbX1P052FAlrPsIpIG2pt
+gAvLbnmnq0N3Os1njvnKO3zF/zk0l9SGm6UahomkXMxkEviKYBeppzle9+l7Qt9Y
+iGXgeBdeAPJLNapkveIbeeJr94OkKWEjkQ+N7QJ1yh1gsWAhZexSUWtTTbNt6bkb
+eojGIBXE7QR95c+6yVzWPdSuVDTr+sr1x9g7Ca5A5TJXrH24AJ4LUykxaWOKSsM9
+7ernuIgbvY3kx9DmCQnPNO2zZeCIMUWE+wyd9AeCk9BG6lPbBga/phP6iyevF1cq
+OsZCe/1Alv0ahGvzwG8A7MSFQJMw6UAytcbdi3E1fw==
+=+U2t
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/bbdb/bbdb-3.1.2.ebuild b/app-emacs/bbdb/bbdb-3.1.2.ebuild
new file mode 100644
index 000000000000..6c377ac99f17
--- /dev/null
+++ b/app-emacs/bbdb/bbdb-3.1.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/bbdb/bbdb-3.1.2.ebuild,v 1.1 2014/07/28 16:33:40 ulm Exp $
+
+EAPI=5
+
+inherit elisp autotools
+
+DESCRIPTION="The Insidious Big Brother Database"
+HOMEPAGE="http://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+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="tex vm"
+
+DEPEND="tex? ( virtual/tex-base )
+	vm? ( app-emacs/vm )"
+RDEPEND="${DEPEND}"
+
+SITEFILE="50${PN}-gentoo-${PV}.el"
+TEXMF="/usr/share/texmf-site"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-no-init.patch
+	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}"
+	doinfo doc/*.info*
+	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/files/50bbdb-gentoo-3.1.2.el b/app-emacs/bbdb/files/50bbdb-gentoo-3.1.2.el
new file mode 100644
index 000000000000..45a7cc208e0d
--- /dev/null
+++ b/app-emacs/bbdb/files/50bbdb-gentoo-3.1.2.el
@@ -0,0 +1,2 @@
+(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
new file mode 100644
index 000000000000..85dbc0374e32
--- /dev/null
+++ b/app-emacs/bbdb/files/bbdb-3.1.2-no-init.patch
@@ -0,0 +1,126 @@
+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 f677915e8de0..f7806e7da78b 100644
--- a/app-emacs/bbdb/metadata.xml
+++ b/app-emacs/bbdb/metadata.xml
@@ -9,5 +9,6 @@
 </longdescription>
 <use>
   <flag name='tex'>Install plain TeX support files</flag>
+  <flag name='vm'>Add support for <pkg>app-emacs/vm</pkg></flag>
 </use>
 </pkgmetadata>