Deactivate package for Emacs 23; it is already included. Fixes bug 290225.

(Portage version: 2.2_rc46/cvs/Linux i686)

5 files changed, 91 insertions, 11 deletions

diff --git a/app-emacs/easypg/ChangeLog b/app-emacs/easypg/ChangeLog
index 7e44ae30757d..e05d2e7ef0f7 100644
--- a/app-emacs/easypg/ChangeLog
+++ b/app-emacs/easypg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emacs/easypg
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/easypg/ChangeLog,v 1.11 2008/12/06 17:58:25 fauli Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/easypg/ChangeLog,v 1.12 2009/10/23 14:13:02 ulm Exp $
+
+*easypg-0.0.16-r1 (23 Oct 2009)
+
+  23 Oct 2009; Ulrich Mueller <ulm@gentoo.org> easypg-0.0.16.ebuild,
+  +easypg-0.0.16-r1.ebuild, +files/50easypg-gentoo-0.0.16.el,
+  files/50easypg-gentoo.el:
+  Deactivate package for Emacs 23; it is already included. Fixes bug 290225.
 
   06 Dec 2008; Christian Faulhammer <fauli@gentoo.org>
   -easypg-0.0.15.ebuild:
diff --git a/app-emacs/easypg/easypg-0.0.16-r1.ebuild b/app-emacs/easypg/easypg-0.0.16-r1.ebuild
new file mode 100644
index 000000000000..25bed970edd7
--- /dev/null
+++ b/app-emacs/easypg/easypg-0.0.16-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/easypg/easypg-0.0.16-r1.ebuild,v 1.1 2009/10/23 14:13:02 ulm Exp $
+
+inherit elisp
+
+MY_PN=epg
+
+DESCRIPTION="GnuPG interface for Emacs"
+HOMEPAGE="http://www.easypg.org/"
+SRC_URI="mirror://sourceforge.jp/epg/29289/${MY_PN}-${PV}.tar.gz
+	gnus? ( mirror://sourceforge.jp/epg/25608/pgg-${MY_PN}.el )"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnus"
+
+DEPEND="app-crypt/gnupg"
+RDEPEND="${DEPEND}
+	gnus? ( virtual/gnus )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+
+pkg_setup() {
+	EMACS_VERSION=$(elisp-emacs-version)
+	einfo "Emacs version: ${EMACS_VERSION}"
+	if [ "${EMACS_VERSION%%.*}" -ge 23 ]; then
+		echo
+		elog "Please note that \"${PN}\" is already included with Emacs 23 or"
+		elog "later, so ${CATEGORY}/${PN} is only needed for lower versions."
+		elog "You may select the active Emacs version with \"eselect emacs\"."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	use gnus && cp "${DISTDIR}/pgg-epg.el" "${S}"
+}
+
+src_compile() {
+	econf
+	emake || die "emake failed"
+	elisp-make-autoload-file || die
+
+	if use gnus && [ "${HAVE_EMACS%%.*}" -ge 22 ]; then
+		# pgg-epg requires pgg, it will not compile with Emacs 21
+		elisp-compile pgg-epg.el || die
+	fi
+}
+
+src_install() {
+	einstall || die "einstall failed"
+
+	elisp-install ${MY_PN} ${PN}-autoloads.el || die
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${MY_PN} || die
+	if use gnus; then
+		elisp-install ${MY_PN} pgg-epg.el* || die
+	fi
+	# prevent inclusion of package dir by subdirs.el
+	touch "${D}${SITELISP}/${MY_PN}/.nosearch" || die
+
+	dodoc AUTHORS ChangeLog NEWS README || die
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	elog "See the epa info page for more information"
+	if use gnus; then
+		elog "To use, add (setq pgg-scheme 'epg) to your ~/.gnus"
+	fi
+}
diff --git a/app-emacs/easypg/easypg-0.0.16.ebuild b/app-emacs/easypg/easypg-0.0.16.ebuild
index 0bbb32ce9fe8..0f535a36c033 100644
--- a/app-emacs/easypg/easypg-0.0.16.ebuild
+++ b/app-emacs/easypg/easypg-0.0.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/easypg/easypg-0.0.16.ebuild,v 1.3 2008/08/28 06:35:40 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/easypg/easypg-0.0.16.ebuild,v 1.4 2009/10/23 14:13:02 ulm Exp $
 
 inherit elisp versionator
 
@@ -20,9 +20,8 @@ DEPEND="app-crypt/gnupg"
 RDEPEND="${DEPEND}
 	gnus? ( virtual/gnus )"
 
-SITEFILE=50${PN}-gentoo.el
-
 S="${WORKDIR}/${MY_PN}-${PV}"
+SITEFILE="50${PN}-gentoo-${PV}.el"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-emacs/easypg/files/50easypg-gentoo-0.0.16.el b/app-emacs/easypg/files/50easypg-gentoo-0.0.16.el
new file mode 100644
index 000000000000..1416594e4cb8
--- /dev/null
+++ b/app-emacs/easypg/files/50easypg-gentoo-0.0.16.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "easypg-autoloads" nil t)
diff --git a/app-emacs/easypg/files/50easypg-gentoo.el b/app-emacs/easypg/files/50easypg-gentoo.el
index 5f9d61cc8bab..b4920a664686 100644
--- a/app-emacs/easypg/files/50easypg-gentoo.el
+++ b/app-emacs/easypg/files/50easypg-gentoo.el
@@ -1,5 +1,4 @@
-
-;;; easypg site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-(load "easypg-autoloads" nil t)
+;; Emacs 23 and later include easypg
+(unless (fboundp 'epa-file-handler)
+  (add-to-list 'load-path "@SITELISP@")
+  (load "easypg-autoloads" nil t))