clean up and version bump

(Portage version: 2.1.2.12)

4 files changed, 31 insertions, 18 deletions

diff --git a/app-emacs/easypg/ChangeLog b/app-emacs/easypg/ChangeLog
index c9b67985ae85..e738eac04acd 100644
--- a/app-emacs/easypg/ChangeLog
+++ b/app-emacs/easypg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/easypg
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/easypg/ChangeLog,v 1.3 2007/07/15 10:15:07 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/easypg/ChangeLog,v 1.4 2007/09/11 06:33:49 opfer Exp $
+
+*easypg-0.0.15 (11 Sep 2007)
+
+  11 Sep 2007; Christian Faulhammer <opfer@gentoo.org>
+  -easypg-0.0.11-r2.ebuild, +easypg-0.0.15.ebuild:
+  clean up and version bump
 
 *easypg-0.0.13 (15 Jul 2007)
 
diff --git a/app-emacs/easypg/easypg-0.0.11-r2.ebuild b/app-emacs/easypg/easypg-0.0.15.ebuild
index 181bda7402b0..6cbb158f1653 100644
--- a/app-emacs/easypg/easypg-0.0.11-r2.ebuild
+++ b/app-emacs/easypg/easypg-0.0.15.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/easypg/easypg-0.0.11-r2.ebuild,v 1.1 2007/05/23 17:31:47 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/easypg/easypg-0.0.15.ebuild,v 1.1 2007/09/11 06:33:49 opfer Exp $
 
-inherit elisp
+inherit elisp versionator
 
 MY_PN=epg
 
 DESCRIPTION="GnuPG interface for Emacs"
 HOMEPAGE="http://www.easypg.org/"
-SRC_URI="mirror://sourceforge.jp/epg/24683/${MY_PN}-${PV}.tar.gz
-	gnus? ( mirror://sourceforge.jp/epg/24683/pgg-${MY_PN}.el )"
+SRC_URI="mirror://sourceforge.jp/epg/27030/${MY_PN}-${PV}.tar.gz
+	gnus? ( mirror://sourceforge.jp/epg/25608/pgg-${MY_PN}.el )"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -22,17 +22,23 @@ RDEPEND="${DEPEND}
 
 SITEFILE=50${PN}-gentoo.el
 
-S=${WORKDIR}/${MY_PN}-${PV}
+S="${WORKDIR}/${MY_PN}-${PV}"
 
-src_compile(){
-	econf
+src_unpack() {
+	unpack ${A}
+	use gnus && cp "${DISTDIR}/pgg-epg.el" "${S}"
+}
+
+src_compile() {
+	econf || die "econf failed"
 	emake || die "emake failed"
 	elisp-make-autoload-file \
 		|| die "elisp-make-autoload-file failed"
 
-	if use gnus; then
-		cp "${DISTDIR}/pgg-epg.el" "${WORKDIR}"
-		elisp-compile "${WORKDIR}/pgg-epg.el" || die "elisp-compile failed"
+	if use gnus && version_is_at_least 22 "$(elisp-emacs-version)"; then
+		# pgg-epg requires pgg, it will not compile with Emacs 21
+		# it also requires epa, so we must use elisp-comp here
+		elisp-comp pgg-epg.el || die "elisp-comp failed"
 	fi
 }
 
@@ -42,8 +48,9 @@ src_install() {
 	elisp-install ${MY_PN} ${PN}-autoloads.el
 	elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${MY_PN}
 	if use gnus; then
-		elisp-install ${MY_PN} "${WORKDIR}"/pgg-epg.el{,c}
+		elisp-install ${MY_PN} pgg-epg.el*
 	fi
+	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
 }
 
 elisp_pkg_postinst() {
diff --git a/app-emacs/easypg/files/digest-easypg-0.0.11-r2 b/app-emacs/easypg/files/digest-easypg-0.0.11-r2
deleted file mode 100644
index 97153bf9425d..000000000000
--- a/app-emacs/easypg/files/digest-easypg-0.0.11-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 49b2d9acd861c29a075431e10720e703 epg-0.0.11.tar.gz 180541
-RMD160 031f3a41af619b814b393bf4dadb13c3611a44e1 epg-0.0.11.tar.gz 180541
-SHA256 97276f18b7d5448001b5963fb3285d360762a20b409bd15f8b35e3e5ba3ce7fc epg-0.0.11.tar.gz 180541
-MD5 862b38e6482d13c8f4cbde562e231180 pgg-epg.el 10023
-RMD160 6236ab5253d96d973c136e9ed02de1b1183b79db pgg-epg.el 10023
-SHA256 468a8bc533b7052604e6ef07a7d09f79c2e1bb1390bdeef06d9364fd5908835b pgg-epg.el 10023
diff --git a/app-emacs/easypg/files/digest-easypg-0.0.15 b/app-emacs/easypg/files/digest-easypg-0.0.15
new file mode 100644
index 000000000000..7eace59c4ef9
--- /dev/null
+++ b/app-emacs/easypg/files/digest-easypg-0.0.15
@@ -0,0 +1,6 @@
+MD5 f9b789c1fae02b0dda1517eac68d270a epg-0.0.15.tar.gz 182396
+RMD160 fa3294ad73d76ffa3c4879e7081f347de4fb0e22 epg-0.0.15.tar.gz 182396
+SHA256 f7c7615c5514451084f45afcc414d12eaf63c276488cf3ec1cc86c6b9babd9ed epg-0.0.15.tar.gz 182396
+MD5 862b38e6482d13c8f4cbde562e231180 pgg-epg.el 10023
+RMD160 6236ab5253d96d973c136e9ed02de1b1183b79db pgg-epg.el 10023
+SHA256 468a8bc533b7052604e6ef07a7d09f79c2e1bb1390bdeef06d9364fd5908835b pgg-epg.el 10023