Add initial emacs support.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A5DE03AE)

4 files changed, 46 insertions, 7 deletions

diff --git a/app-admin/pass/ChangeLog b/app-admin/pass/ChangeLog
index 60a1da7b3bd6..1b67a7bb6ed7 100644
--- a/app-admin/pass/ChangeLog
+++ b/app-admin/pass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/pass
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/pass/ChangeLog,v 1.20 2014/05/08 03:03:15 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/pass/ChangeLog,v 1.21 2014/05/09 11:48:09 zx2c4 Exp $
+
+  09 May 2014; Jason A. Donenfeld <zx2c4@gentoo.org> +files/50pass-gentoo.el,
+  pass-1.6.1-r1.ebuild, pass-9999.ebuild:
+  Add initial emacs support.
 
   08 May 2014; Jason A. Donenfeld <zx2c4@gentoo.org> pass-1.6.1-r1.ebuild,
   pass-9999.ebuild:
diff --git a/app-admin/pass/files/50pass-gentoo.el b/app-admin/pass/files/50pass-gentoo.el
new file mode 100644
index 000000000000..122d813af1e7
--- /dev/null
+++ b/app-admin/pass/files/50pass-gentoo.el
@@ -0,0 +1,9 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'password-store-edit "password-store" nil t)
+(autoload 'password-store-copy "password-store" nil t)
+(autoload 'password-store-init "password-store" nil t)
+(autoload 'password-store-insert "password-store" nil t)
+(autoload 'password-store-generate "password-store" nil t)
+(autoload 'password-store-remove "password-store" nil t)
+(autoload 'password-store-rename "password-store" nil t)
+(autoload 'password-store-version "password-store" nil t)
diff --git a/app-admin/pass/pass-1.6.1-r1.ebuild b/app-admin/pass/pass-1.6.1-r1.ebuild
index 2361dfcc1cb2..6379978055a2 100644
--- a/app-admin/pass/pass-1.6.1-r1.ebuild
+++ b/app-admin/pass/pass-1.6.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/pass/pass-1.6.1-r1.ebuild,v 1.2 2014/05/08 03:03:15 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/pass/pass-1.6.1-r1.ebuild,v 1.3 2014/05/09 11:48:09 zx2c4 Exp $
 
 EAPI=4
 
-inherit bash-completion-r1
+inherit bash-completion-r1 elisp-common
 
 DESCRIPTION="Stores, retrieves, generates, and synchronizes passwords securely using gpg, pwgen, and git"
 HOMEPAGE="http://zx2c4.com/projects/password-store/"
@@ -13,7 +13,7 @@ SRC_URI="http://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.x
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86 ~x86-macos"
-IUSE="+git X zsh-completion fish-completion dmenu elibc_Darwin"
+IUSE="+git X zsh-completion fish-completion emacs dmenu elibc_Darwin"
 
 RDEPEND="
 	app-crypt/gnupg
@@ -25,6 +25,7 @@ RDEPEND="
 	zsh-completion? ( app-shells/zsh-completion )
 	fish-completion? ( app-shells/fish )
 	dmenu? ( x11-misc/dmenu )
+	emacs? ( virtual/emacs )
 "
 
 S="${WORKDIR}/password-store-${PV}"
@@ -49,4 +50,16 @@ src_install() {
 	default
 	use dmenu && dobin contrib/dmenu/passmenu
 	newbashcomp src/completion/pass.bash-completion pass
+	if use emacs; then
+		elisp-install ${PN} contrib/emacs/*.el || die
+		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" || die
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
 }
diff --git a/app-admin/pass/pass-9999.ebuild b/app-admin/pass/pass-9999.ebuild
index 81e572d329c6..286579c996ee 100644
--- a/app-admin/pass/pass-9999.ebuild
+++ b/app-admin/pass/pass-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/pass/pass-9999.ebuild,v 1.13 2014/05/08 03:03:15 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/pass/pass-9999.ebuild,v 1.14 2014/05/09 11:48:09 zx2c4 Exp $
 
 EAPI=4
 
-inherit bash-completion-r1 git-2
+inherit bash-completion-r1 git-2 elisp-common
 
 DESCRIPTION="Stores, retrieves, generates, and synchronizes passwords securely using gpg, pwgen, and git"
 HOMEPAGE="http://zx2c4.com/projects/password-store/"
@@ -13,7 +13,7 @@ EGIT_REPO_URI="http://git.zx2c4.com/password-store"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS=""
-IUSE="+git X zsh-completion fish-completion dmenu elibc_Darwin"
+IUSE="+git X zsh-completion fish-completion emacs dmenu elibc_Darwin"
 
 RDEPEND="
 	app-crypt/gnupg
@@ -25,6 +25,7 @@ RDEPEND="
 	zsh-completion? ( app-shells/zsh-completion )
 	fish-completion? ( app-shells/fish )
 	dmenu? ( x11-misc/dmenu )
+	emacs? ( virtual/emacs )
 "
 
 S="${WORKDIR}/password-store-${PV}"
@@ -49,4 +50,16 @@ src_install() {
 	default
 	use dmenu && dobin contrib/dmenu/passmenu
 	newbashcomp src/completion/pass.bash-completion pass
+	if use emacs; then
+		elisp-install ${PN} contrib/emacs/*.el || die
+		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" || die
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
 }