Cleanup. Add support for alpine (#223935)

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

4 files changed, 25 insertions, 43 deletions

diff --git a/mail-client/pinepgp/ChangeLog b/mail-client/pinepgp/ChangeLog
index 8a894bf7d2bd..2e0b59e51f0a 100644
--- a/mail-client/pinepgp/ChangeLog
+++ b/mail-client/pinepgp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/pinepgp
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pinepgp/ChangeLog,v 1.8 2007/12/31 18:31:40 armin76 Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pinepgp/ChangeLog,v 1.9 2009/04/24 08:16:26 tove Exp $
+
+  24 Apr 2009; Torsten Veller <tove@gentoo.org> -pinepgp-0.18.0.ebuild,
+  pinepgp-0.18.0-r1.ebuild:
+  Cleanup. Add support for alpine (#223935)
 
   31 Dec 2007; Raúl Porcel <armin76@gentoo.org> pinepgp-0.18.0-r1.ebuild:
   Re-add ~sparc
diff --git a/mail-client/pinepgp/Manifest b/mail-client/pinepgp/Manifest
index 43e8f2112b7a..c3259fe823d7 100644
--- a/mail-client/pinepgp/Manifest
+++ b/mail-client/pinepgp/Manifest
@@ -1,6 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pinepgp-0.18.0-makefile-sed-fix.patch 3349 RMD160 b947ab7d0d8f3f57b8e833d406ad7e2c4aebb135 SHA1 5bc46224d8eb0d0b01aa23cf6302407bfeec28e2 SHA256 22b60805085efdd6c2a327d4cf3d5deeb6ecd12eaf0c31fae9d449dc5426d42d
 DIST pinepgp-0.18.0.tar.gz 38103 RMD160 1990bdc56460cbafe8b62cffaf5520038fe910ce SHA1 d80495079f398d60a7c6262f0778fbf0db6ecaf2 SHA256 2917ed5734b2c2e70cd8d944537cb0280f7cdfa34fcd64121f41bb4c37c7d6d9
-EBUILD pinepgp-0.18.0-r1.ebuild 699 RMD160 eb5179007d88905e2785f9da58258bd2e8d8ca50 SHA1 3697c630e8258d8abc78e5c7896e1dd4b708f21a SHA256 08979daa6eb6d99ab8b4fbf049ff24953021ec7463999108671392e75810b770
-EBUILD pinepgp-0.18.0.ebuild 776 RMD160 362b4ca7ee1870d0cf93c037018b1a00d6409e48 SHA1 f12944175d6a3f4527721681a5baff3d14060c04 SHA256 d4ceb3f8360de9a2da62dbe109dde591823af6c36f91cdfbb2b9f32922747b8b
-MISC ChangeLog 1728 RMD160 de3b400834919df435683828b3467301e0950193 SHA1 6cb9de0cc9fd2fadb0599a5ec264e6ef0b4f9fdb SHA256 61e0f8dd1816b185a3b603eacd25bfac30894becbe71a5e7780c41da44bf4db5
+EBUILD pinepgp-0.18.0-r1.ebuild 730 RMD160 6a01d98ad15c2b9f0aee9225425f14d0f4405654 SHA1 130c49c848df166d3836158914277f8bbea19693 SHA256 ba36f2959dcd5d4441d0ae3c24843a05f6d647a43c7b03894667bb28d2e70c95
+MISC ChangeLog 1870 RMD160 603de92afef2d6ded7e455360f82f074b86b794f SHA1 f0334462edf79ac4082467a797486483238a8b33 SHA256 e36dc04cd5647aa241bc05ff14f19bcb9dfcbbb7cee278a712cbc7ba97b0da21
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAknxdWgACgkQV3J2n04EauzGeQCeLMMZ48p/W/5b4fuFttpqGu2J
+P9wAniQ0+D4klIymJ4YewMBtGaqM8v8j
+=OdRN
+-----END PGP SIGNATURE-----
diff --git a/mail-client/pinepgp/pinepgp-0.18.0-r1.ebuild b/mail-client/pinepgp/pinepgp-0.18.0-r1.ebuild
index 703ac9d28f4f..225aff60988c 100644
--- a/mail-client/pinepgp/pinepgp-0.18.0-r1.ebuild
+++ b/mail-client/pinepgp/pinepgp-0.18.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pinepgp/pinepgp-0.18.0-r1.ebuild,v 1.9 2007/12/31 18:31:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pinepgp/pinepgp-0.18.0-r1.ebuild,v 1.10 2009/04/24 08:16:26 tove Exp $
 
 inherit eutils
 
@@ -12,15 +12,16 @@ SLOT="0"
 KEYWORDS="~amd64 ppc ~sparc x86"
 IUSE=""
 
-DEPEND="mail-client/pine app-crypt/gnupg"
+DEPEND="|| ( mail-client/alpine mail-client/pine )
+	app-crypt/gnupg"
 
 src_unpack()	{
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-makefile-sed-fix.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-makefile-sed-fix.patch
 }
 
 src_install()	{
-	make DESTDIR=${D} install || die "install problem"
+	make DESTDIR="${D}" install || die "install problem"
 	dodoc ChangeLog README
 }
diff --git a/mail-client/pinepgp/pinepgp-0.18.0.ebuild b/mail-client/pinepgp/pinepgp-0.18.0.ebuild
deleted file mode 100644
index 85b35a81a7e0..000000000000
--- a/mail-client/pinepgp/pinepgp-0.18.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pinepgp/pinepgp-0.18.0.ebuild,v 1.5 2006/11/17 01:06:22 ticho Exp $
-
-inherit eutils
-
-DESCRIPTION="Use GPG/PGP with Pine"
-HOMEPAGE="http://www.megaloman.com/~hany/software/pinepgp/"
-SRC_URI="http://www.megaloman.com/~hany/_data/pinepgp/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~sparc"
-IUSE=""
-
-DEPEND="mail-client/pine app-crypt/gnupg"
-
-src_unpack()	{
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-makefile-sed-fix.patch
-}
-
-src_compile()	{
-	econf || die "configure problem"
-	emake || die "compile problem"
-}
-
-src_install()	{
-	exeinto /usr/bin
-	dobin pinegpg pinepgpgpg-install
-	dodoc ChangeLog COPYING README
-}