Version bump (bug #300567)

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 92 insertions, 3 deletions

diff --git a/app-misc/gtypist/ChangeLog b/app-misc/gtypist/ChangeLog
index ade85bd9cb9a..7527f76f680b 100644
--- a/app-misc/gtypist/ChangeLog
+++ b/app-misc/gtypist/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/gtypist
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gtypist/ChangeLog,v 1.15 2009/06/21 18:55:50 graaff Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gtypist/ChangeLog,v 1.16 2010/01/17 23:36:37 cla Exp $
+
+*gtypist-2.8 (17 Jan 2010)
+
+  17 Jan 2010; Dawid Węgliński <cla@gentoo.org> +gtypist-2.8.ebuild,
+  +files/gtypist-2.8-xemacs-compat.patch:
+  Version bump (bug #300567)
 
   21 Jun 2009; Hans de Graaff <graaff@gentoo.org> gtypist-2.7-r1.ebuild:
   Rename virtual/xemacs -> app-editors/xemacs since the virtual has been
diff --git a/app-misc/gtypist/Manifest b/app-misc/gtypist/Manifest
index a2434c7f568e..3e616ba12469 100644
--- a/app-misc/gtypist/Manifest
+++ b/app-misc/gtypist/Manifest
@@ -1,7 +1,10 @@
 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
 DIST gtypist-2.7.tar.gz 1019990 RMD160 3bd7f01c6cd4f9f453744c76296701967786fe19 SHA1 b44292ea6f5b7f97138777b8090c402084a839e0 SHA256 d73da348bfe32f54bfcc20afdff64168faf38b19172992bebdf693876d102a33
+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
-MISC ChangeLog 1932 RMD160 a4cdae177a91527324673dc755de984030ab3d44 SHA1 bbbfc239c30021f3552fe168f49d461949b7c25d SHA256 040c05f7566ccd483c097571359e9ab60093c75de402580d7ba87425e55c5dd7
+EBUILD gtypist-2.8.ebuild 1491 RMD160 28d55d8e380ac9f8462665cf535b1cd9f9529ac7 SHA1 810a6b5ba7e8fd79a4efa8660ad01986bc9e97e3 SHA256 d291c2c21f1eafdca8e694de5de0919bfd1dbbca7230ee61f9cde3667f16e2f2
+MISC ChangeLog 2100 RMD160 775017688b182525d2243b6ad10dc3aef4d74807 SHA1 e17d42eb9596376fb7c49bb61119a3b96b5e074c SHA256 1efad0baf9814315fea629b949a0a4d1c9af341b3cd80658d5181a30143441e5
 MISC metadata.xml 314 RMD160 25181cde297628576a9545bea3a76601485bfaf3 SHA1 ac16b621acf5a22b64859e3323d466fb556fc4c8 SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7
diff --git a/app-misc/gtypist/files/gtypist-2.8-xemacs-compat.patch b/app-misc/gtypist/files/gtypist-2.8-xemacs-compat.patch
new file mode 100644
index 000000000000..6b4af23392ea
--- /dev/null
+++ b/app-misc/gtypist/files/gtypist-2.8-xemacs-compat.patch
@@ -0,0 +1,18 @@
+--- 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.8.ebuild b/app-misc/gtypist/gtypist-2.8.ebuild
new file mode 100644
index 000000000000..c4d85b16334a
--- /dev/null
+++ b/app-misc/gtypist/gtypist-2.8.ebuild
@@ -0,0 +1,62 @@
+# 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.1 2010/01/17 23:36:37 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/8/7}-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
+}