sync with main portage tree

4 files changed, 36 insertions, 12 deletions

diff --git a/mail-client/alpine/ChangeLog b/mail-client/alpine/ChangeLog
index 33509c1..d62b5d4 100644
--- a/mail-client/alpine/ChangeLog
+++ b/mail-client/alpine/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for mail-client/alpine
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/alpine/ChangeLog,v 1.8 2010/03/05 12:07:14 tove Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/alpine/ChangeLog,v 1.13 2011/10/09 07:50:39 tove Exp $
+
+  09 Oct 2011; Torsten Veller <tove@gentoo.org> metadata.xml:
+  Remove tove from metadata.xml
+
+  03 Sep 2011; Raúl Porcel <armin76@gentoo.org> alpine-2.00-r4.ebuild:
+  alpha/ia64/sparc stable wrt #317971
+
+  26 Aug 2011; Markos Chandras <hwoarang@gentoo.org> alpine-2.00-r4.ebuild:
+  Stable on amd64 wrt bug #317971
+
+  20 Aug 2011; Thomas Kahle <tomka@gentoo.org> alpine-2.00-r4.ebuild:
+  x86 stable per bug 379983
+
+*alpine-2.00-r4 (09 Sep 2010)
+
+  09 Sep 2010; Torsten Veller <tove@gentoo.org> +alpine-2.00-r4.ebuild,
+  metadata.xml:
+  Bump chappa patches (73). Thanks to Sascha Lucas. Update metadata.xml
 
 *alpine-2.00-r3 (05 Mar 2010)
 
diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest
index 169ccb4..1347002 100644
--- a/mail-client/alpine/Manifest
+++ b/mail-client/alpine/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 2.00-lpam.patch 295 RMD160 f3b34a9179529f4c25086559d57dc19d828356f1 SHA1 1b39525f91ebd5a9de5a1e04f5554f6fa5f58ae3 SHA256 22c354937019693cfc03a8864a36c30579fd98475b729e089f83ec125e4225ad
 AUX CVE-2008-5514.patch 634 RMD160 ca159f967e2e973390dce3cab2768a09e1da50cf SHA1 bc61d76a237ff42b00b3f60f2e6fc5c45e261dbb SHA256 07fd3dd2ffdfe9e2c952603b9aae099d1250bc89373de3e1a5009ec5d251346b
 DIST alpine-2.00-chappa-26-all.patch.gz 179066 RMD160 c109c463da0f6736474d6c114468bb524dca35ad SHA1 5d646dc9075d0f47cfb3ae2a66dd4ad3103f66f4 SHA256 a14b3cc49a0f7eef6459488687b2a15ff5318f5db8586a47aca04c5bce08aea5
@@ -9,7 +12,14 @@ DIST alpine-2.00.tar.bz2 5222673 RMD160 9e67704b23b3973d8b878e65ad9e6f5026c10d13
 EBUILD alpine-2.00-r1.ebuild 3865 RMD160 215dac6479626df7aceab420c5b7e2630d052ccf SHA1 33a69dfe71b9d5a830352bc4da9050cac6217431 SHA256 b5778a4055e0f9370bb1334d67be426644ed7d6a9e3a4f8821389448d6c67ffa
 EBUILD alpine-2.00-r2.ebuild 3873 RMD160 1342422c79dca2db06d7bda33ba31c2e80edccef SHA1 1b88fb49a14f20bc700d76c5595e9f166deb2f20 SHA256 d7195eb6be26a40ca3e02c465ad4bfc1ae2d33fa655bdfff1e8d4ecd3f397ac8
 EBUILD alpine-2.00-r3.ebuild 3876 RMD160 16fac26fae028267f4e9f32e11845d73cf674348 SHA1 a8fc4ef42e02213c13cdc59adc643aa192f40631 SHA256 12b165d0084ef762e06ab6de1f0c9492affdf89626d211d910477c930ebb3c43
-EBUILD alpine-2.00-r4.ebuild 3876 RMD160 de281c146f03b6dc5160cd44ac52faddfcd4428f SHA1 7afbd8901412428cfd7708ee5636419fce04d1a1 SHA256 fe8707cc03765fd71f3f2166b4a23a407a0e73fa60ec2ef3f33f9b44de4b8a70
+EBUILD alpine-2.00-r4.ebuild 3874 RMD160 5dc92a1f451980eec2b0a3a124b5631cb45c3e84 SHA1 acfbd8b66d0f3e8f9cbde9fdfd1a584e6d1e0301 SHA256 3354748ccdc6fa38686099f54d1f3d79df2624816307774cae093eb2cfbfa646
 EBUILD alpine-2.00.ebuild 3865 RMD160 3aaadc2e654c3ae7eeb121430e30c6c592ec84f0 SHA1 969ab89637a7c7bae66c2e3a0f85da16cc568ae5 SHA256 a27755fc41dc3a876e9cbe4c4db3ba6abace7a3a89f042c1b77e698aa7decc82
-MISC ChangeLog 1308 RMD160 a7b4498b8b594ada99177c60b3ae4bacc6bb6731 SHA1 7505884875d1cc276a204f3d6815268521c97fcb SHA256 6fb0a86bed81cee424509b8b9e2123d32dd82ef9f4272f20c75e680247518f72
-MISC metadata.xml 844 RMD160 9eb2c872014f45593cb6600e33f8f31df908db9b SHA1 320f98eedaa623a0ff8a4af207875738eb3aae37 SHA256 e008b89b84a35953d391d4d8384563dddc2b22c0b363334deaedb69d57d57393
+MISC ChangeLog 1917 RMD160 4c1ca29cbaa08e339fc428e561d2aa1c7661c351 SHA1 4c8beb66c597796b2ff7958bd99c20f45ee83d67 SHA256 50aff32a7ef43c6f89c6eb2e7779f228e18194d62801acfb6d19ca42748a1677
+MISC metadata.xml 748 RMD160 d564dd117d392a71b5c8e6c77a09b504c7a4d75e SHA1 385a75b4fb2ce24ac0c5e819d2fe1d4bb01093f7 SHA256 217a240423045ac5706516400425fe4f903252b5eece607ba813ea6b1444067b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEAREIAAYFAk6RUlQACgkQV3J2n04EauyEbwCdE/nI32YUIoJfDFemH5kcUI5X
+ySsAnjWVIm3Xqz2W1jh0RkOe6BoTR88n
+=SNWu
+-----END PGP SIGNATURE-----
diff --git a/mail-client/alpine/alpine-2.00-r4.ebuild b/mail-client/alpine/alpine-2.00-r4.ebuild
index b872fe7..b3dcff2 100644
--- a/mail-client/alpine/alpine-2.00-r4.ebuild
+++ b/mail-client/alpine/alpine-2.00-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/alpine/alpine-2.00-r3.ebuild,v 1.1 2010/03/05 12:07:14 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/alpine/alpine-2.00-r4.ebuild,v 1.4 2011/09/03 16:44:02 armin76 Exp $
 
 EAPI="2"
 
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.cac.washington.edu/alpine/${P}.tar.bz2
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ia64 ~ppc sparc x86"
 IUSE="+chappa doc ipv6 kerberos ldap nls onlyalpine passfile smime spell ssl threads topal"
 
 DEPEND="virtual/pam
diff --git a/mail-client/alpine/metadata.xml b/mail-client/alpine/metadata.xml
index ce466ae..fd33a17 100644
--- a/mail-client/alpine/metadata.xml
+++ b/mail-client/alpine/metadata.xml
@@ -6,10 +6,6 @@
 			<email>sascha_lucas@web.de</email>
 			<name>Sascha Lucas</name>
 		</maintainer>
-		<maintainer>
-			<email>tove@gentoo.org</email>
-			<name>Torsten Veller</name>
-		</maintainer>
 	<use>
 		<flag name='chappa'>enhance alpine by applying Eduardo Chappa's
 			patches</flag>