stabilize for all since the revbump only installs a new noarch file, remove old version

Package-Manager: portage-2.1.10.20/cvs/Linux x86_64

4 files changed, 11 insertions, 67 deletions

diff --git a/app-misc/gtypist/ChangeLog b/app-misc/gtypist/ChangeLog
index c7ef34a8cc4d..5b6a7b72eee3 100644
--- a/app-misc/gtypist/ChangeLog
+++ b/app-misc/gtypist/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/gtypist
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gtypist/ChangeLog,v 1.29 2011/09/26 13:59:42 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gtypist/ChangeLog,v 1.30 2011/09/30 15:48:11 darkside Exp $
+
+  30 Sep 2011; Jeremy Olexa <darkside@gentoo.org> -gtypist-2.8.5.ebuild,
+  gtypist-2.8.5-r1.ebuild:
+  stabilize for all since the revbump only installs a new noarch file, remove
+  old version
 
   26 Sep 2011; Jeremy Olexa <darkside@gentoo.org> gtypist-2.8.5-r1.ebuild:
   style changes, add Gentoo Prefix support
diff --git a/app-misc/gtypist/Manifest b/app-misc/gtypist/Manifest
index 44d1cc52f4da..0e704fd4fc4e 100644
--- a/app-misc/gtypist/Manifest
+++ b/app-misc/gtypist/Manifest
@@ -2,7 +2,6 @@ AUX 50gtypist-gentoo.el 182 RMD160 bb3f58bfc2b10a4054842028712a9ba68f051758 SHA1
 AUX gtypist-2.8.3-xemacs-compat.patch 592 RMD160 64f9b24f4afa2bc289d6ce10e9485f8bf6e3e030 SHA1 01c3f04e8cc244c8a7588bb4ba31e38493037b4a SHA256 d84203768ba48675969286c9e448023ccd34f04bdf16a004487903b127536c82
 DIST colemak.typ 8922 RMD160 b1347d6eaff73614daff1170040ebda9a05b7748 SHA1 f36b7af0cb05ced83093c59bc750f311fc312484 SHA256 2bbe1e7b25f85f1dd7eaa469c7996b033e23537c7c475df99da19bd6429a055e
 DIST gtypist-2.8.5.tar.gz 1148279 RMD160 403e3b8fc87ba477717c7ccdbcc461289684a8ab SHA1 51c80e457a76e79fc99bbb39b5459a446cc8f109 SHA256 a58b7551a8ca0dd841d230d519c265e8e448c13f517688e029c8ded011cc9d17
-EBUILD gtypist-2.8.5-r1.ebuild 1555 RMD160 0b4cdfa2c78df3def1d1093521d4e466993bf24f SHA1 6035a3cf731ceea4fea8f200d3ac85f2ce1b50bc SHA256 940f9c25fb870b08f5e6cb3cba36bb4e518ad8281469c655f76ef192298c716c
-EBUILD gtypist-2.8.5.ebuild 1385 RMD160 4143511a05e0664907ce5aa2e016fdb19404b365 SHA1 f597456593ab0f73d25acd5272c17468babf0462 SHA256 ddf59a2d996bac90c78ad15ca834a29d6915b2743bc48d4afd7e6fefe00e0c5e
-MISC ChangeLog 3764 RMD160 a5f7b69dbfe8eeaf613bb4a2551cae5cf27a916c SHA1 137642ca4de515babf8d7080d6415cecbc5fc637 SHA256 5354a8edec342d43626881cdd7a0e17ffcd45ba0dd2d67685f4a6e916a055607
+EBUILD gtypist-2.8.5-r1.ebuild 1554 RMD160 2f8298599980d5d278759c197c183c443e810060 SHA1 706a89fd516439491ee298482598ca6b7a0549a4 SHA256 359c82083d509c2a5f2a9f381f81d0b7bbe063f6b20319a7c12bd39d85941b08
+MISC ChangeLog 3957 RMD160 1b5540edaf81ece28bc9d66c11a92d283f31ea96 SHA1 b040f6bcf8bce3d751f0112c4c95dab18736eb48 SHA256 0d825fb9ab5310ff25b8cd15f1ee972c9459df86c7073832ff1498e9a004a461
 MISC metadata.xml 205 RMD160 3835e21e020002976b3ce8ec6a575335c82b446b SHA1 c5367491e9dd124ac3c3edad51ff8bff5557b68c SHA256 7646cbdf0cae812994e33b7178f669e8ad1336b2001bc8545154700531a531d5
diff --git a/app-misc/gtypist/gtypist-2.8.5-r1.ebuild b/app-misc/gtypist/gtypist-2.8.5-r1.ebuild
index b16277ca46bc..496a22f6298e 100644
--- a/app-misc/gtypist/gtypist-2.8.5-r1.ebuild
+++ b/app-misc/gtypist/gtypist-2.8.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gtypist/gtypist-2.8.5-r1.ebuild,v 1.2 2011/09/26 13:59:42 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gtypist/gtypist-2.8.5-r1.ebuild,v 1.3 2011/09/30 15:48:11 darkside Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/gtypist/${P}.tar.gz
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux"
 IUSE="nls emacs xemacs"
 
 DEPEND=">=sys-libs/ncurses-5.2
@@ -52,7 +52,7 @@ src_install() {
 	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
 
 	insinto /usr/share/gtypist
-	doins ${DISTDIR}/colemak.typ
+	doins "${DISTDIR}"/colemak.typ
 
 	if use emacs; then
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
diff --git a/app-misc/gtypist/gtypist-2.8.5.ebuild b/app-misc/gtypist/gtypist-2.8.5.ebuild
deleted file mode 100644
index 309b5c2bffa5..000000000000
--- a/app-misc/gtypist/gtypist-2.8.5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gtypist/gtypist-2.8.5.ebuild,v 1.4 2011/06/19 15:41:38 maekke Exp $
-
-EAPI=2
-
-inherit eutils elisp-common
-
-DESCRIPTION="Universal typing tutor"
-HOMEPAGE="http://www.gnu.org/software/gtypist/"
-SRC_URI="mirror://gnu/gtypist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="nls emacs xemacs"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	emacs? ( virtual/emacs )
-	xemacs? ( !emacs? ( app-editors/xemacs app-xemacs/fsf-compat ) )"
-
-RDEPEND="${DEPEND}"
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.8.3-xemacs-compat.patch
-}
-
-src_configure() {
-	local lispdir=""
-	if use emacs; then
-		lispdir="${SITELISP}/${PN}"
-		einfo "Configuring to build with GNU Emacs support"
-	elif use xemacs; then
-		lispdir="/usr/lib/xemacs/site-packages/lisp/${PN}"
-		einfo "Configuring to build with XEmacs support"
-	fi
-
-	econf $(use_enable nls) \
-		EMACS=$(usev emacs || usev xemacs || echo no) \
-		--with-lispdir="${lispdir}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}