Added CVS snapshot and decode-header fix patch. Thanks to Markus Knitting <makmaster@arcor.de> for submitting the ebuild. Closing bug #48345

8 files changed, 105 insertions, 56 deletions

diff --git a/app-emacs/bbdb/ChangeLog b/app-emacs/bbdb/ChangeLog
index 6f40801b902c..4a691322681b 100644
--- a/app-emacs/bbdb/ChangeLog
+++ b/app-emacs/bbdb/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emacs/bbdb
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/bbdb/ChangeLog,v 1.4 2003/12/04 23:58:34 jbms Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/bbdb/ChangeLog,v 1.5 2004/04/25 16:56:26 usata Exp $
+
+*bbdb-2.35_pre20040323 (26 Apr 2004)
+
+  26 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> bbdb-2.34-r1.ebuild,
+  bbdb-2.34.ebuild, bbdb-2.35_pre20040323.ebuild,
+  files/bbdb-decode-header.diff:
+  Added CVS snapshot and decode-header fix patch. Thanks to Markus Knitting
+  <makmaster@arcor.de> for submitting the ebuild. Closing bug #48345
 
   04 Dec 2003; Jeremy Maitin-Shepard <jbms@gentoo.org> bbdb-2.34-r1.ebuild:
   bits/bbdb-pgp.el is excluded if crypt USE flag is not specified.
diff --git a/app-emacs/bbdb/Manifest b/app-emacs/bbdb/Manifest
index 43efa1f47ea3..fed2c07d3e25 100644
--- a/app-emacs/bbdb/Manifest
+++ b/app-emacs/bbdb/Manifest
@@ -1,7 +1,10 @@
-MD5 b835b538e928166a1269fcd07f482916 ChangeLog 767
 MD5 174bc7fca2f283965385b74319fc002c bbdb-2.34-r1.ebuild 1699
-MD5 59b02cf9b889543dab7e4a1d494338d0 bbdb-2.34.ebuild 897
+MD5 b835b538e928166a1269fcd07f482916 ChangeLog 767
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
-MD5 936a1cf6e98d4e93b6d061f3f6a61557 files/50bbdb-gentoo.el 169
+MD5 59b02cf9b889543dab7e4a1d494338d0 bbdb-2.34.ebuild 897
+MD5 b79f9ff058c71bbab38915bf7b0b04cc bbdb-2.35_pre20040323.ebuild 1832
 MD5 46ff21db541c51bca257a3f9c7f39242 files/digest-bbdb-2.34 61
 MD5 08789689a2022d2d3030c3859797f296 files/digest-bbdb-2.34-r1 165
+MD5 936a1cf6e98d4e93b6d061f3f6a61557 files/50bbdb-gentoo.el 169
+MD5 b15409170b7c83e2dae04fa1b6d9b7e6 files/digest-bbdb-2.35_pre20040323 177
+MD5 33d69d4900a55ee2d7f3c8f68c8ebc9e files/bbdb-decode-header.diff 367
diff --git a/app-emacs/bbdb/bbdb-2.34-r1.ebuild b/app-emacs/bbdb/bbdb-2.34-r1.ebuild
index 425847500ddd..c785650ab6f5 100644
--- a/app-emacs/bbdb/bbdb-2.34-r1.ebuild
+++ b/app-emacs/bbdb/bbdb-2.34-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/bbdb/bbdb-2.34-r1.ebuild,v 1.3 2004/03/04 04:59:39 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/bbdb/bbdb-2.34-r1.ebuild,v 1.4 2004/04/25 16:56:26 usata Exp $
 
 inherit elisp
 
@@ -13,12 +13,11 @@ SRC_URI="http://bbdb.sourceforge.net/${P}.tar.gz
 	http://www.mit.edu/afs/athena/contrib/emacs-contrib/Fin/dates.el"
 LICENSE="GPL-2 as-is"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64"
 
-DEPEND="virtual/emacs
-crypt? app-emacs/mailcrypt"
-
-S="${WORKDIR}/${P}"
+DEPEND="virtual/emacs"
+RDEPEND="${DEPEND}
+	crypt? ( app-emacs/mailcrypt )"
 
 src_unpack() {
 
diff --git a/app-emacs/bbdb/bbdb-2.34.ebuild b/app-emacs/bbdb/bbdb-2.34.ebuild
deleted file mode 100644
index 2c2e122b25c8..000000000000
--- a/app-emacs/bbdb/bbdb-2.34.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/bbdb/bbdb-2.34.ebuild,v 1.3 2003/09/06 22:01:25 msterret Exp $
-
-inherit elisp
-
-IUSE=""
-
-DESCRIPTION="The Big Brother Database"
-HOMEPAGE="http://bbdb.sourceforge.net/"
-SRC_URI="http://bbdb.sourceforge.net/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND="virtual/emacs"
-
-S="${WORKDIR}/${P}"
-
-src_compile() {
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--with-emacs=emacs || die "./configure failed"
-	make || die
-}
-
-src_install() {
-	elisp-install ${PN} lisp/*.el lisp/*.elc
-	elisp-site-file-install ${FILESDIR}/50bbdb-gentoo.el
-
-	doinfo texinfo/*.info*
-	dodoc ChangeLog INSTALL README
-}
-
-pkg_postinst() {
-	elisp-site-regen
-}
-
-pkg_postrm() {
-	elisp-site-regen
-}
diff --git a/app-emacs/bbdb/bbdb-2.35_pre20040323.ebuild b/app-emacs/bbdb/bbdb-2.35_pre20040323.ebuild
new file mode 100644
index 000000000000..34a0c18d814c
--- /dev/null
+++ b/app-emacs/bbdb/bbdb-2.35_pre20040323.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/bbdb/bbdb-2.35_pre20040323.ebuild,v 1.1 2004/04/25 16:56:26 usata Exp $
+
+inherit elisp
+
+IUSE="crypt"
+
+DESCRIPTION="The Big Brother Database"
+HOMEPAGE="http://bbdb.sourceforge.net/"
+# taken from http://bbdb.sourceforge.net/${P}.tar.gz
+SRC_URI="mirror://gentoo/${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 as-is"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+DEPEND="virtual/emacs"
+RDEPEND="${DEPEND}
+	crypt? ( app-emacs/mailcrypt )"
+
+S="${WORKDIR}/${P/_pre*/}"
+
+src_unpack() {
+
+	unpack ${P}.tar.gz
+	cd ${S}
+	epatch ${FILESDIR}/bbdb-decode-header.diff
+	cd ${S}/bits
+	mv bbdb-mail-folders.el bbdb-mail-folders.txt
+	sed -e "0,/^--- bbdb-mail-folders.el ---$/d" \
+		-e "/^--- end ---$/,+4d" \
+		bbdb-mail-folders.txt > bbdb-mail-folders.el
+	mv bbdb-sort-mailrc.el bbdb-sort-mailrc.txt
+	sed -e "0,/^Bng$/d" \
+		bbdb-sort-mailrc.txt > bbdb-sort-mailrc.el
+	cp ${DISTDIR}/{dates,point-at}.el .
+
+	if [ -z "`use crypt`" ] ; then
+		rm ${S}/bits/bbdb-pgp.el
+		einfo "Excluding bits/bbdb-pgp.el because the \`crypt' USE flag was not"
+		einfo "specified."
+	fi
+
+}
+
+src_compile() {
+
+	econf --with-emacs=emacs || die "econf failed"
+	emake -j1 || die "emake failed"
+	cat >${T}/lp.el<<-EOF
+		(add-to-list 'load-path "${S}/bits")
+		(add-to-list 'load-path "${S}/lisp")
+	EOF
+	emacs -batch -q --no-site-file --no-init-file \
+		-l ${T}/lp.el -f batch-byte-compile bits/*.el \
+		|| die "make bits failed"
+}
+
+src_install() {
+	elisp-install ${PN} lisp/*.el lisp/*.elc || die
+	elisp-install ${PN}/bits bits/*.el bits/*.elc || die
+	elisp-site-file-install ${FILESDIR}/50bbdb-gentoo.el || die
+
+	doinfo texinfo/*.info*
+	dodoc ChangeLog INSTALL README bits/*.txt
+	newdoc bits/README README.bits
+}
diff --git a/app-emacs/bbdb/files/bbdb-decode-header.diff b/app-emacs/bbdb/files/bbdb-decode-header.diff
new file mode 100644
index 000000000000..8a6d9b30e38b
--- /dev/null
+++ b/app-emacs/bbdb/files/bbdb-decode-header.diff
@@ -0,0 +1,11 @@
+--- lisp/bbdb-hooks.el~	Fri Mar 14 10:00:30 2003
++++ lisp/bbdb-hooks.el	Fri May 16 20:01:39 2003
+@@ -141,7 +141,8 @@
+                (buffer-substring (match-end 0)
+                  (progn (end-of-line 2) (point))))))))
+       (forward-line 1))
+-    done))
++    (and done
++	 (mail-decode-encoded-word-string done))))
+
+ (defcustom bbdb-ignore-most-messages-alist '()
diff --git a/app-emacs/bbdb/files/digest-bbdb-2.34 b/app-emacs/bbdb/files/digest-bbdb-2.34
deleted file mode 100644
index f31b3a511086..000000000000
--- a/app-emacs/bbdb/files/digest-bbdb-2.34
+++ /dev/null
@@ -1 +0,0 @@
-MD5 552c6056a5db5ec0935473a9a2760068 bbdb-2.34.tar.gz 363841
diff --git a/app-emacs/bbdb/files/digest-bbdb-2.35_pre20040323 b/app-emacs/bbdb/files/digest-bbdb-2.35_pre20040323
new file mode 100644
index 000000000000..ef67a17d011d
--- /dev/null
+++ b/app-emacs/bbdb/files/digest-bbdb-2.35_pre20040323
@@ -0,0 +1,3 @@
+MD5 30e08e6ad1024043411272d90107250e bbdb-2.35_pre20040323.tar.gz 382768
+MD5 fc14cd7ca30c3abc4acc1c3ab95c1644 point-at.el 440
+MD5 1979e29c242f16c6a96f091a04a6a74a dates.el 7048