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

Package-Manager: portage-2.2_rc46/cvs/Linux i686

6 files changed, 100 insertions, 18 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/Manifest b/app-emacs/easypg/Manifest
index a5110548e67a..3996f81cddfd 100644
--- a/app-emacs/easypg/Manifest
+++ b/app-emacs/easypg/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 50easypg-gentoo.el 107 RMD160 c714b509a9f752d04aa0b152c2cdc354ce7e8e17 SHA1 ff9f7a37752880eaafd09da4359836cccbe05358 SHA256 6b28fb288758a2bc5c2577254e6ae7410677801cecbd1a78f8f32798424d0ae8
+AUX 50easypg-gentoo-0.0.16.el 70 RMD160 3bb5979a4803d4cd03abcb5200eb50b0540a2d38 SHA1 5fd2d46d7a20d7f0ea14d2b9b1390b393b434725 SHA256 5f9e6240f6f7c99d229d7158b0ede2bb289eca42f838ce245d2f44979e185cc5
+AUX 50easypg-gentoo.el 148 RMD160 0112905aecd026cd54a4b17ec48d503f3bb02925 SHA1 c513b1baf7b97e7b1342879999bf9e0ab102b985 SHA256 abe838e7af538ba3e20fb0e7d03da79d63b4d6d1a6f3f5bb2631876ea146ae8c
 DIST epg-0.0.16.tar.gz 203261 RMD160 e34eb706b7af989405fff7b314e03e1eb1e45826 SHA1 37ccd3019b98ce8cccc72d969910d112013be8b8 SHA256 ea98f9807c2dce03b33ea5ea46a687d22bd10ee9850c55dff0c05d36a6bc6be5
 DIST pgg-epg.el 10023 RMD160 6236ab5253d96d973c136e9ed02de1b1183b79db SHA1 42c507fc9d7659a33c57d55a04fd6f7503e9c614 SHA256 468a8bc533b7052604e6ef07a7d09f79c2e1bb1390bdeef06d9364fd5908835b
-EBUILD easypg-0.0.16.ebuild 1519 RMD160 964fc0d36f31faa10b179a9212692dc8af7d9468 SHA1 8bf638ad606f0ea4a26d9fe7bd1e1e7548323018 SHA256 80bf852a8be299091ba1781aedbbaed76c5846005cc6b03dece70d72369727e7
-MISC ChangeLog 1648 RMD160 76bb9b5875e1231671d97d9a72232a46f1f163fa SHA1 203944a24f5062b869c2bec1293e46397c7683be SHA256 81d7a4524788649597c0f0b6d982ba060566c8a1f7b127399e174c050748cc50
+EBUILD easypg-0.0.16-r1.ebuild 1890 RMD160 788c997a7c49a665caaa6428722477b2b7ce2714 SHA1 6ded54568257e127d7d39c294854d8a8029fe8ab SHA256 5cd1a43be0287ce63fc1c38bf005b779a223a769b544b3b18fa117ed13dfb310
+EBUILD easypg-0.0.16.ebuild 1526 RMD160 db2d9400c25e9586c881d054e5a5e76c53311ac1 SHA1 4227feca597dfb4b5e65f147f1606b7363821c28 SHA256 f09c1f464d5a8dadf6a596ad2c8145599c79eabef9141ab544797f7768ea2333
+MISC ChangeLog 1916 RMD160 e6ad0c7baad29cdec2afee1fb6c9920e135d2e8b SHA1 76e2ac312288971ff62d722c8566a020f67a333a SHA256 b2557d9f56178c0e050fb693d7d61730265760ce55d49248d2c0e706c86ebee7
 MISC metadata.xml 238 RMD160 41b523aaae1bd33d42cdf22f87b20056137045a5 SHA1 b8345f9776a57fd6cc4243928496635ae66d977a SHA256 f80f4c934debb6f2669bf84e28adc0f10c543e411e72a1f1d4cd6ee251d196b8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v1.4.10 (GNU/Linux)
 
-iEYEARECAAYFAkk6vUgACgkQNQqtfCuFneOdrQCcDtQeDe6ZTkjGP/aAA9eFbXsp
-kYQAoIJS4tYmvAkH4Jmfx+y9upDVL2kW
-=zBIx
+iEYEARECAAYFAkrhun0ACgkQOeoy/oIi7uwZhACfVtram6odB5Imb6lRnPSOaZmr
+XpwAnjH6j+LRoZNHTV0jplk/SHr8ZqNZ
+=SFqj
 -----END PGP SIGNATURE-----
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))