From: Ulrich Müller <ulm@gentoo.org>
Date: Thu, 13 May 2010 20:06:43 +0000 (+0000)
Subject: Version bump. Remove beta versions.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=33d55f08638ad57d3b9a7ccdf302d6858e675583;p=gentoo.git

Version bump. Remove beta versions.
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
---

diff --git a/app-emacs/vm/ChangeLog b/app-emacs/vm/ChangeLog
index 281d3db187b4..58f43e6ccca3 100644
--- a/app-emacs/vm/ChangeLog
+++ b/app-emacs/vm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emacs/vm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/ChangeLog,v 1.90 2010/03/16 11:59:52 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/ChangeLog,v 1.91 2010/05/13 20:06:43 ulm Exp $
+
+*vm-8.1.1 (13 May 2010)
+
+  13 May 2010; Ulrich Mueller <ulm@gentoo.org> -vm-8.1.0_beta.ebuild,
+  -vm-8.1.0_beta2.ebuild, -files/vm-8.1.0_beta-submake-errors.patch,
+  +vm-8.1.1.ebuild:
+  Version bump. Remove beta versions.
 
 *vm-8.1.0 (16 Mar 2010)
 
diff --git a/app-emacs/vm/Manifest b/app-emacs/vm/Manifest
index e48fe9f194b4..09d06f9aed62 100644
--- a/app-emacs/vm/Manifest
+++ b/app-emacs/vm/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 50vm-gentoo-7.19.el 584 RMD160 761dc3dc41c81ba23cd3bae2a6c874bbcd639593 SHA1 93a0ac84dd4d184bf46c7cc1fc55bd4665631630 SHA256 dc11350f3d9d3e432b906eab4a87234537cbebfdfecbbb295509726047589703
 AUX 50vm-gentoo.el 147 RMD160 6c4de171b7cdd46641ad73e89b4b55acce913024 SHA1 edcad107507f8db94c3e4b5169a3ca01ccdaeb9e SHA256 b79981760d6c58e03cd1b57d8e413f2c1b2ebc2d083da03cbe6eac287e89bcad
 AUX vm-7.19-burst-digest.patch 632 RMD160 c255a41e56921d1c9e7e7448be0b566ba9dccc18 SHA1 776b5f39833fdcc6c316960399f0d0305490e0d9 SHA256 c7105eaf435c09bff03136e29e8636a7c828ceaf2cd75dacbce5b88a70c25cd1
@@ -9,17 +12,21 @@ AUX vm-8.0.12-charset-displayable.patch 921 RMD160 784c0beee5917952e9ed542426027
 AUX vm-8.0.12-emacs-23.patch 3704 RMD160 ad0a36c08968566d7abac86801c7ea072e8e122f SHA1 b1037b2364517cde8e10fd8edc10581329da766f SHA256 7ef9861270b019303968f5db993cbfef1ab13c69ec094d117da1ce91d9c93f45
 AUX vm-8.0.12-folder-corruption.patch 635 RMD160 1dc3454b6df2bfd9944c63e0e90b23ea18f45b03 SHA1 b11b9fb8de22f879313c5cd203cbf2cf76bd8f64 SHA256 f78007ef176ea9e8dd98ed01e2edec4055b9ef9356b0d85f8e3ca6341198febc
 AUX vm-8.0.12-supercite-yank-1.patch 733 RMD160 0cb7bae7019165d75b0c691aab37745f956053c0 SHA1 cde1312c400a6013739bd52400debcc0b8cfb8cc SHA256 49b3006d7dacbf17e334f4fae97cb35170e1a0c52ad11888d2dd40e7dfff0ac6
-AUX vm-8.1.0_beta-submake-errors.patch 911 RMD160 dac05bebc1ff0c732b6df8704c0ba9880fb5ccac SHA1 52213731de991c62cdcd7da37af8a5993c81f980 SHA256 fd138e9e29ffe87c3f864a59b212b9890a88a121b8ae0ca82b0b3aa5d28da286
 AUX vm-info-dir-fix-gentoo.patch 325 RMD160 51f59c36d9c0ae13eca4db61dc76ef1dabdd6d31 SHA1 3a1bce1bd3e91ef3b2403bab54bb47569933e88d SHA256 8320c7ae7c51a5985bb344ec04a153e263af87de3ff2d95a0a55814e2377d276
 DIST vm-7.19.tar.gz 381658 RMD160 7a28c0a096f1f8093cffb9fc621cd270dd67b432 SHA1 0fe9012b8988ebdec7641f48aca0ef365549c590 SHA256 54bdd076bb98cad57a71fb986d131963e97a13cc71f15819d32691e3c0c5bdb0
 DIST vm-8.0.12.tgz 547048 RMD160 b2e0976d349a182111dc928073dbbb9327087f6e SHA1 f7016a33c9ef8b8c291aa0c16ccc73adeb8e7c43 SHA256 1e7b6e3c7401a825d288420c5a7820a004eff4b0f8838018a5598c95a0d5de57
-DIST vm-8.1.0-beta.tgz 682201 RMD160 8d4325ddd667f5671938df41e1e58e6c1cb7c927 SHA1 31d2e72cd73a6b0d43a3baa517e2455f607a4896 SHA256 4f04c6a71ec0a089d770e06f49c704b701776ddb6448a18ac9e85db1d9ccd44b
-DIST vm-8.1.0-beta2.tgz 691686 RMD160 336e1d7658994f91955232ed5c910b9881e196f3 SHA1 7c0a52583aa70fddbd2a85048dc339edbb31b265 SHA256 c8291f84823637940a90e7c08c61a5b3b5792a61d52f95eea35da1534b7b9791
 DIST vm-8.1.0.tgz 689653 RMD160 da17398849b4d6ac10614d504415dad85fdb6f54 SHA1 8c0367c73f14b2fb85a8ea964d8c78db2d927886 SHA256 c9065188c476367f67a76d4441ea69372ab6e321c4fa673156838eebcbf68664
+DIST vm-8.1.1.tgz 701429 RMD160 a13383dabe0536e0e19de1abd9acc2e702402a8f SHA1 0d551c47a67f4e1e347896ce3bbde19342669dd2 SHA256 1a40c48027e3ca164415b7054d83f9d00a0236d41d82af0c1816e4a911e869f1
 EBUILD vm-7.19-r4.ebuild 1249 RMD160 cce2daf9056af80464421a39333a165dc5960c91 SHA1 bfcd041bedbf950d2c60d4bd5c0fb97d2852bd33 SHA256 5f95b9365e5081d690ea8f6d9ccd7343405673c0504af55dc856c89339761873
 EBUILD vm-8.0.12-r6.ebuild 1426 RMD160 348ee892d21d7d046feccabea9a27df34bf421f2 SHA1 9dfed43128cd4eb3af18e28a2af573e1124cf453 SHA256 6c9e5d3880cb5aa033c0c9408b26a333687c9a82c53e3c5e3cdeed737176b35b
 EBUILD vm-8.1.0.ebuild 1249 RMD160 75f5488b87fb5c2eedbd6b4c5feba53b9dd362a5 SHA1 7d0a346ad138e4bb331b68e108bb2d5b70dc3751 SHA256 9e31599928c3cd3e70bbdfcbd1936ef3de153b34257b22c7cc41adc1110adad0
-EBUILD vm-8.1.0_beta.ebuild 1298 RMD160 446e27dc06d39f613b419dc783489934660fb8db SHA1 948cbf63cd510693d76c3db4c83ff29a943757c2 SHA256 46ce49c28ad36124d4ef088918627193082d76a7504b2c783f73d6b1893da083
-EBUILD vm-8.1.0_beta2.ebuild 1255 RMD160 9cfd1aec4d725130695f8778fc40cc3a6e5c8b82 SHA1 48e7f47854c09e112f57698700c2459b37968c60 SHA256 3a3ab5bcc333ecb5fbacdaac0aaaba15b13df3a9f41b5fe50a9c669053bd4c34
-MISC ChangeLog 12436 RMD160 6fcba7cc7efbffb054684932b131bd6baaab1712 SHA1 9846d976d0fa640a8ea97fd019a4aa543a8e3542 SHA256 ff0e5b7b0fce164e695eb47984694282eb657cb4c44359295b6f71ccc1378b5d
+EBUILD vm-8.1.1.ebuild 1249 RMD160 2b6467f9abd3d569b1ecfb933e33fc6071cb52c4 SHA1 454c67cfa6c708f842b6b8d7edf1ba5e77902dfe SHA256 a99601c7a4e9b4f0a87869af200f97d0581a3f1abb32ae11babca621579f111a
+MISC ChangeLog 12659 RMD160 f62bbb65a35b31977d55badc8aec3001e5f4c5ef SHA1 82bf3605e9fb4a22cb70f73192ceedd89e5b4cc1 SHA256 2813ae7c55f7ce9387fb29957f75ee8577d71d1b50446789347a9765b32e3213
 MISC metadata.xml 616 RMD160 0671bc015f427662d3614403112ee15d0c457125 SHA1 27754651e0a70d9c85c159cb1e6175bc44c85de6 SHA256 9f491a8f5a4adb6bebc5ce9d5177a87d3daff04c7fa9cb3aad9a6a8e4909dec7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkvsW+gACgkQOeoy/oIi7uwTewCdFmMYExjcmRM+WRaGJRmHbLyB
+CzQAn137ZqardZyCiDmm8OkMDj6TMRi+
+=aoIU
+-----END PGP SIGNATURE-----
diff --git a/app-emacs/vm/files/vm-8.1.0_beta-submake-errors.patch b/app-emacs/vm/files/vm-8.1.0_beta-submake-errors.patch
deleted file mode 100644
index 00136538e33d..000000000000
--- a/app-emacs/vm/files/vm-8.1.0_beta-submake-errors.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-http://bugs.gentoo.org/299108
-
---- Makefile.in	2009-12-04 17:39:55 +0000
-+++ Makefile.in	2009-12-31 15:32:51 +0000
-@@ -12,7 +12,7 @@
- 
- ##############################################################################
- all: vm-load.el
--	@for i in $(SUBDIRS) ; do ($(MAKE) -C $$i); done
-+	@for i in $(SUBDIRS) ; do ($(MAKE) -C $$i) || exit 1; done
- 
- Makefile vm-load.el: %: config.status @srcdir@/%.in
- 	./config.status $@
-@@ -25,13 +25,13 @@
- 	./config.status --recheck
- 
- install:
--	@for i in $(SUBDIRS) ; do ($(MAKE) -C $$i install); done
-+	@for i in $(SUBDIRS) ; do ($(MAKE) -C $$i install) || exit 1; done
- 
- clean:
--	@for i in $(SUBDIRS) ; do ($(MAKE) -C $$i clean); done
-+	@for i in $(SUBDIRS) ; do ($(MAKE) -C $$i clean) || exit 1; done
- 
- distclean:
--	@for i in $(SUBDIRS) ; do ($(MAKE) -C $$i distclean); done
-+	@for i in $(SUBDIRS) ; do ($(MAKE) -C $$i distclean) || exit 1; done
- 
- push:
- 	$(BZR) push
diff --git a/app-emacs/vm/vm-8.1.0_beta.ebuild b/app-emacs/vm/vm-8.1.0_beta.ebuild
deleted file mode 100644
index 080ceb533081..000000000000
--- a/app-emacs/vm/vm-8.1.0_beta.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.1.0_beta.ebuild,v 1.3 2010/01/04 22:45:42 ulm Exp $
-
-inherit elisp eutils
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="The VM mail reader for Emacs"
-HOMEPAGE="http://www.nongnu.org/viewmail/"
-SRC_URI="http://launchpad.net/vm/trunk/${MY_PV}/+download/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="bbdb ssl"
-
-DEPEND="bbdb? ( app-emacs/bbdb )"
-RDEPEND="!app-emacs/u-vm-color
-	${DEPEND}
-	ssl? ( net-misc/stunnel )"
-
-S="${WORKDIR}/${MY_P}"
-SITEFILE="50${PN}-gentoo.el"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-submake-errors.patch"
-
-	if ! use bbdb; then
-		elog "Excluding vm-pcrisis.el since the \"bbdb\" USE flag is not set."
-		epatch "${FILESDIR}/vm-8.0-no-pcrisis.patch"
-	fi
-}
-
-src_compile() {
-	econf \
-		--with-emacs="emacs" \
-		--with-pixmapdir="${SITEETC}/${PN}" \
-		$(use bbdb && echo "--with-other-dirs=${SITELISP}/bbdb")
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	dodoc CHANGES NEWS README TODO example.vm || die "dodoc failed"
-}
diff --git a/app-emacs/vm/vm-8.1.0_beta2.ebuild b/app-emacs/vm/vm-8.1.1.ebuild
similarity index 91%
rename from app-emacs/vm/vm-8.1.0_beta2.ebuild
rename to app-emacs/vm/vm-8.1.1.ebuild
index 2deb247bec59..46d1c3e151e3 100644
--- a/app-emacs/vm/vm-8.1.0_beta2.ebuild
+++ b/app-emacs/vm/vm-8.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.1.0_beta2.ebuild,v 1.1 2010/02/02 09:09:38 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.1.1.ebuild,v 1.1 2010/05/13 20:06:43 ulm Exp $
 
 inherit elisp eutils