7 files changed, 22 insertions, 197 deletions
diff --git a/app-misc/gtypist/ChangeLog b/app-misc/gtypist/ChangeLog
index 0bcf0ee61398..1c76939cd4f2 100644
--- a/app-misc/gtypist/ChangeLog
+++ b/app-misc/gtypist/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/gtypist
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gtypist/ChangeLog,v 1.21 2010/10/14 19:14:27 ranger Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gtypist/ChangeLog,v 1.22 2011/04/22 23:20:45 radhermit Exp $
+
+  22 Apr 2011; Tim Harder <radhermit@gentoo.org> -gtypist-2.7.ebuild,
+  -gtypist-2.7-r1.ebuild, -files/gtypist-2.7-xemacs-compat.patch,
+  -gtypist-2.8.ebuild, -files/gtypist-2.8-xemacs-compat.patch:
+  Remove old.
 
   14 Oct 2010; Brent Baude <ranger@gentoo.org> gtypist-2.8.3.ebuild:
   stable ppc, bug 333973
diff --git a/app-misc/gtypist/Manifest b/app-misc/gtypist/Manifest
index c3346d088a00..6535dced2000 100644
--- a/app-misc/gtypist/Manifest
+++ b/app-misc/gtypist/Manifest
@@ -1,13 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 50gtypist-gentoo.el 182 RMD160 bb3f58bfc2b10a4054842028712a9ba68f051758 SHA1 4acf0819faeb45b17fe8048ea75962ede9f6f388 SHA256 3274e8829cc488918e9f2676ad00e4aa12f06ca6147f128c54c105245b971b11
-AUX gtypist-2.7-xemacs-compat.patch 588 RMD160 ed40210c2ab26af552101a435e78538b7cb38455 SHA1 54b9d1cc1b34ced86fbe0ea96f64cd3fe51c7df8 SHA256 4434ca2d42f25ee4b6d5553bb75dce2de243769a4a2f05336959b0fd032a772b
-AUX gtypist-2.8-xemacs-compat.patch 588 RMD160 b1c30b53a5157614248519320705cb512aac6823 SHA1 56da3c546dd15fac198094a255ee17359a9983e2 SHA256 9cc9b64c842f44f0ee12bf7acf41452344ac4b2f5bc23a310fd4c2b2ebbbec88
 AUX gtypist-2.8.3-xemacs-compat.patch 592 RMD160 64f9b24f4afa2bc289d6ce10e9485f8bf6e3e030 SHA1 01c3f04e8cc244c8a7588bb4ba31e38493037b4a SHA256 d84203768ba48675969286c9e448023ccd34f04bdf16a004487903b127536c82
-DIST gtypist-2.7.tar.gz 1019990 RMD160 3bd7f01c6cd4f9f453744c76296701967786fe19 SHA1 b44292ea6f5b7f97138777b8090c402084a839e0 SHA256 d73da348bfe32f54bfcc20afdff64168faf38b19172992bebdf693876d102a33
 DIST gtypist-2.8.3.tar.gz 1120289 RMD160 139a61badcc2324dc28b7313967187689a1d87ce SHA1 ac7b22c5ac4d6bb6359edb687b0810b3bb357ee7 SHA256 07cc52c36c26b1eb45ec3ec463e97ccc8b3a7ced8221dec8b43b5af28471f7e4
-DIST gtypist-2.8.tar.gz 1105434 RMD160 d8d0771b519472d69f8c45aad199ddc3c6b8778e SHA1 d390510746ef30025d11a5b19d952506b12173f5 SHA256 3fe6de44e27a8f67cf9795da2b0eaa46ea28e7b2ff545349e0ae870ccc3c3897
-EBUILD gtypist-2.7-r1.ebuild 1493 RMD160 ef88efab6a52e05db3f178178277addeeb804ae5 SHA1 c413d474c98fa268e635d39c1097de55ad21adab SHA256 90e4a8ef470a3d103b0ab14d054c130f089e0c6227a5a4ec43bc5fa978b6ded3
-EBUILD gtypist-2.7.ebuild 801 RMD160 5c523ac81f0ce180aed8cbddd53d3100caee8ef2 SHA1 2f0c8e8e530243a833235875ac73199a86975956 SHA256 827035fe363898e0213636122c938d3eed69a44d530c2d4d179c6278aaae5dbc
 EBUILD gtypist-2.8.3.ebuild 1489 RMD160 2e035ecace0fdb08ec14f47e32d640d957864906 SHA1 5e4519fdeec4936add5d19e217ad2dd8e7802010 SHA256 d5160bfa68fe6a804e85241ed6b128b77a833e0e767a93723bb362d556b646ea
-EBUILD gtypist-2.8.ebuild 1487 RMD160 ab21061e98a6aa0565d2e89f97384a689e255973 SHA1 a40dfafa980c946726c1af13f9430e91797b2916 SHA256 79cce9f2cb225273ab7ea4bc59cb96e733e4b1e816b7b520ec50445dbf55da24
-MISC ChangeLog 2683 RMD160 d3dfdf82c356785d5846f0ad1777920b1e40b365 SHA1 697206e20e8cc350ae466bf1a8338c597d78f47e SHA256 d0fb93312871964c14597ebb22b32c2e51c25930109e476b199b246fc74c2626
+MISC ChangeLog 2900 RMD160 39255a836abaa680846c00048b27e65f8bbd7cde SHA1 6eea78c0ec71c1b067787d642400d23e99563d58 SHA256 8c67b4ea60399d9779a4074ed84e2c2badf1c7bf2d3ca857a74220694dfc0123
 MISC metadata.xml 314 RMD160 25181cde297628576a9545bea3a76601485bfaf3 SHA1 ac16b621acf5a22b64859e3323d466fb556fc4c8 SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJNsg1XAAoJEEqz6FtPBkyjEGQH/ikoGy+XOXmuHONRg9PCOivV
+a66BiTq8lwaBR3uOembPp8QoeF7UZru0PmGbHqmcBc0fOIm6Ai7p8rrMC9ly8rDy
+cV6PyoEfk4N+yBD4FMBs/0PQ6aPCQVFO7l5NK+8vlUBWpVOYllljuMSNfGZor03a
+YKluwgT5NQfZEf+kSFyM0bDJ7YHMl82s50Emt3ohreHbqxM7IAES2jI5EXRgY0JY
+9VBUCjiltz3Slrx+3TVXkFSbPV7DebpYmCT0jqDvl+cRhdwPxOJQ5GO0IV8PT0h3
+HF0dJStiiTxnC0pGRD1D2jsG1RyuGBeOE1Jwztsp9ynw9EP6wDmn9vwZnVEbXwA=
+=89sg
+-----END PGP SIGNATURE-----
diff --git a/app-misc/gtypist/files/gtypist-2.7-xemacs-compat.patch b/app-misc/gtypist/files/gtypist-2.7-xemacs-compat.patch
deleted file mode 100644
index 9d45511187b7..000000000000
--- a/app-misc/gtypist/files/gtypist-2.7-xemacs-compat.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- gtypist-2.7-orig/tools/gtypist-mode.el	2003-09-28 23:35:22.000000000 +0200
-+++ gtypist-2.7/tools/gtypist-mode.el	2007-04-21 14:49:16.000000000 +0200
-@@ -95,7 +95,14 @@
- 
- (require 'font-lock)
- (require 'thingatpt)
--(require 'executable) ;; executable-find
-+
-+(eval-and-compile
-+  (cond
-+   ((fboundp 'executable-find))
-+   ((fboundp 'locate-file)
-+    (defun executable-find (command)
-+      (locate-file command exec-path nil 'executable)))
-+   (t (require 'executable))))
- 
- (defvar gtypist-mode-syntax-table nil "Syntax-table for gtypist-mode.")
- (unless gtypist-mode-syntax-table
diff --git a/app-misc/gtypist/files/gtypist-2.8-xemacs-compat.patch b/app-misc/gtypist/files/gtypist-2.8-xemacs-compat.patch
deleted file mode 100644
index 6b4af23392ea..000000000000
--- a/app-misc/gtypist/files/gtypist-2.8-xemacs-compat.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- gtypist-2.8-orig/tools/gtypist-mode.el	2003-09-28 23:35:22.000000000 +0200
-+++ gtypist-2.8/tools/gtypist-mode.el	2007-04-21 14:49:16.000000000 +0200
-@@ -95,7 +95,14 @@
- 
- (require 'font-lock)
- (require 'thingatpt)
--(require 'executable) ;; executable-find
-+
-+(eval-and-compile
-+  (cond
-+   ((fboundp 'executable-find))
-+   ((fboundp 'locate-file)
-+    (defun executable-find (command)
-+      (locate-file command exec-path nil 'executable)))
-+   (t (require 'executable))))
- 
- (defvar gtypist-mode-syntax-table nil "Syntax-table for gtypist-mode.")
- (unless gtypist-mode-syntax-table
diff --git a/app-misc/gtypist/gtypist-2.7-r1.ebuild b/app-misc/gtypist/gtypist-2.7-r1.ebuild
deleted file mode 100644
index 26dad2f19a4a..000000000000
--- a/app-misc/gtypist/gtypist-2.7-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gtypist/gtypist-2.7-r1.ebuild,v 1.2 2009/06/21 18:55:50 graaff Exp $
-
-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="~x86 ~amd64 ~ppc"
-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_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${P}-xemacs-compat.patch
-}
-
-src_compile() {
-	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}" \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "elisp-site-file-install failed"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/app-misc/gtypist/gtypist-2.7.ebuild b/app-misc/gtypist/gtypist-2.7.ebuild
deleted file mode 100644
index f66315d47e3f..000000000000
--- a/app-misc/gtypist/gtypist-2.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gtypist/gtypist-2.7.ebuild,v 1.11 2010/01/01 18:06:31 ssuominen Exp $
-
-DESCRIPTION="universal typing tutor"
-HOMEPAGE="http://www.gnu.org/software/gtypist/gtypist.html"
-SRC_URI="mirror://gnu/gtypist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 amd64 ppc"
-IUSE="nls"
-
-DEPEND=">=sys-libs/ncurses-5.2"
-
-src_compile() {
-	# gtypist also produces some Emacs/XEmacs editing modes if
-	# emacs/xemacs is present. if emacs/xemacs is not present then
-	# these emacs modes are not compiled or installed.
-	econf `use_enable nls` || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO THANKS
-}
diff --git a/app-misc/gtypist/gtypist-2.8.ebuild b/app-misc/gtypist/gtypist-2.8.ebuild
deleted file mode 100644
index 028cefc4df15..000000000000
--- a/app-misc/gtypist/gtypist-2.8.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gtypist/gtypist-2.8.ebuild,v 1.2 2010/01/17 23:45:01 cla Exp $
-
-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_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${P}-xemacs-compat.patch
-}
-
-src_compile() {
-	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}" \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "elisp-site-file-install failed"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}