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

(Portage version: 2.1.10.20/cvs/Linux x86_64)

3 files changed, 9 insertions, 64 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/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
-}