clean up and version bump

Package-Manager: portage-2.1.2.12

5 files changed, 46 insertions, 33 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/Manifest b/app-emacs/easypg/Manifest
index dcb101d602c2..7a242c9160ed 100644
--- a/app-emacs/easypg/Manifest
+++ b/app-emacs/easypg/Manifest
@@ -5,35 +5,35 @@ AUX 50easypg-gentoo.el 116 RMD160 e657a48ca12914a6bbc21103b2cfc0e821bcc2af SHA1
 MD5 6202359254959c820d3b653fb1e80cc1 files/50easypg-gentoo.el 116
 RMD160 e657a48ca12914a6bbc21103b2cfc0e821bcc2af files/50easypg-gentoo.el 116
 SHA256 40ef439574b986f5776210379c54e43d19f7b6d9f91e4146c03df39713f0d19f files/50easypg-gentoo.el 116
-DIST epg-0.0.11.tar.gz 180541 RMD160 031f3a41af619b814b393bf4dadb13c3611a44e1 SHA1 6b48fd0cf781dd80574d93a418743f8329e34416 SHA256 97276f18b7d5448001b5963fb3285d360762a20b409bd15f8b35e3e5ba3ce7fc
 DIST epg-0.0.13.tar.gz 181735 RMD160 aa8ff97f20915a36340afbe50114de002f884b23 SHA1 7114025883d3ed8e3c5b029cc5ad77275af6067b SHA256 82f13d1c6fad9ed3c0d47399c70c861438f0db1aef092bf970e492922b1feb02
+DIST epg-0.0.15.tar.gz 182396 RMD160 fa3294ad73d76ffa3c4879e7081f347de4fb0e22 SHA1 11f89b61128b807d23ff73ae61fe5caf8c2684c5 SHA256 f7c7615c5514451084f45afcc414d12eaf63c276488cf3ec1cc86c6b9babd9ed
 DIST pgg-epg.el 10023 RMD160 6236ab5253d96d973c136e9ed02de1b1183b79db SHA1 42c507fc9d7659a33c57d55a04fd6f7503e9c614 SHA256 468a8bc533b7052604e6ef07a7d09f79c2e1bb1390bdeef06d9364fd5908835b
-EBUILD easypg-0.0.11-r2.ebuild 1310 RMD160 ce82498cea9c14214acae70fafa54a1376e206f5 SHA1 648ba5e21c5c4d497f48182df62940d115dbd292 SHA256 f4d2487b3533061c16abe3e4b2c2cf7cdbdda8f121d0508b7201920a12e2b98f
-MD5 388f364457a44eb09eb63be00839677c easypg-0.0.11-r2.ebuild 1310
-RMD160 ce82498cea9c14214acae70fafa54a1376e206f5 easypg-0.0.11-r2.ebuild 1310
-SHA256 f4d2487b3533061c16abe3e4b2c2cf7cdbdda8f121d0508b7201920a12e2b98f easypg-0.0.11-r2.ebuild 1310
 EBUILD easypg-0.0.13.ebuild 1570 RMD160 95ba935137ec128fa9e7fc8e4c25bd44ee876672 SHA1 39632e417243c508901457222b30beba5e3cfacb SHA256 7d0ffca75b895ddc05432f4bf210bc3971a7c0f84e1b03c7a1a76c1659bbae11
 MD5 c8097aa33bf346677579647fe3a5fddb easypg-0.0.13.ebuild 1570
 RMD160 95ba935137ec128fa9e7fc8e4c25bd44ee876672 easypg-0.0.13.ebuild 1570
 SHA256 7d0ffca75b895ddc05432f4bf210bc3971a7c0f84e1b03c7a1a76c1659bbae11 easypg-0.0.13.ebuild 1570
-MISC ChangeLog 647 RMD160 0a910dda04602c2d480d027728b00e8ae50d9cc1 SHA1 db6a5d666a4eb9e2feb11d0b2cd2e553f59a39fc SHA256 4eb437db174bf6d26b5a2c421c2875529d51f72cb312661a759baea38f9d9157
-MD5 b303b4cc42246e04731a12f07dbdf217 ChangeLog 647
-RMD160 0a910dda04602c2d480d027728b00e8ae50d9cc1 ChangeLog 647
-SHA256 4eb437db174bf6d26b5a2c421c2875529d51f72cb312661a759baea38f9d9157 ChangeLog 647
+EBUILD easypg-0.0.15.ebuild 1572 RMD160 8f186004d0a3622ae937e772b67300b37d988800 SHA1 6944a58237bc6eac941bd29d7b14952dd8a48ade SHA256 b7bc601a7c11f2f40ad2233655e681498662fad3c4e1df71b7b1d0839ee25101
+MD5 e4c09dcb68217c2481904a71282a230b easypg-0.0.15.ebuild 1572
+RMD160 8f186004d0a3622ae937e772b67300b37d988800 easypg-0.0.15.ebuild 1572
+SHA256 b7bc601a7c11f2f40ad2233655e681498662fad3c4e1df71b7b1d0839ee25101 easypg-0.0.15.ebuild 1572
+MISC ChangeLog 814 RMD160 fa54045a9bfff806a002fe43b3328ad2ec353596 SHA1 6b50fe072dc46166b8fdbc0d84d1c928c5c5d90f SHA256 1f6180e0e7a08d38117e940b95d3c373bb09bb82b4d6c9124ceb0b05e53252ee
+MD5 fe94f702942a39ca50a45e8305ad7d43 ChangeLog 814
+RMD160 fa54045a9bfff806a002fe43b3328ad2ec353596 ChangeLog 814
+SHA256 1f6180e0e7a08d38117e940b95d3c373bb09bb82b4d6c9124ceb0b05e53252ee ChangeLog 814
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata.xml 158
-MD5 accc32f9e37c95b8bbd4710c5bbeb8d1 files/digest-easypg-0.0.11-r2 440
-RMD160 37e7ba207bdce8fceb4a9105732f67c813ea7ed2 files/digest-easypg-0.0.11-r2 440
-SHA256 0714b631a99a1879605c4d26841880d8a0a5293fc2628c2596afd7953dee2a6a files/digest-easypg-0.0.11-r2 440
 MD5 3303879f4ff953a7ebb9a7d6db991571 files/digest-easypg-0.0.13 440
 RMD160 d0f8fc0a9e360e9ca0bbbc5cdee665099ce19f66 files/digest-easypg-0.0.13 440
 SHA256 d671b12b5a9f58b4a7987f93c88fafff2bbb48cb5920237faf244d67a3c45ba2 files/digest-easypg-0.0.13 440
+MD5 b2e45f8a87c57321fc55720052239773 files/digest-easypg-0.0.15 440
+RMD160 f8d089ee41579dc200f8156ee823727b29da6c1d files/digest-easypg-0.0.15 440
+SHA256 efbfa694bb2d4ca2668cf12bf4473aeb610a022e6ea3b3d8db34ad116bca6a6c files/digest-easypg-0.0.15 440
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGmfOqOeoy/oIi7uwRArqkAJ9qKhh8QLm+SPCMjlpJ3MA9f2ltewCfQP1f
-Dej9KlpW2uZ++x+B2ktKsBs=
-=L5c+
+iD8DBQFG5jbaNQqtfCuFneMRAoKeAKCOzVjA+3dON9scOpT/TOd+lLLghgCeNkuM
+eF3w4PNcb5LTKf3gj9AWGDs=
+=uzDR
 -----END PGP SIGNATURE-----
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