diff options
-rw-r--r-- | app-misc/gtypist/ChangeLog | 11 | ||||
-rw-r--r-- | app-misc/gtypist/files/50gtypist-gentoo.el | 6 | ||||
-rw-r--r-- | app-misc/gtypist/files/digest-gtypist-2.5 | 3 | ||||
-rw-r--r-- | app-misc/gtypist/files/digest-gtypist-2.6.2 | 3 | ||||
-rw-r--r-- | app-misc/gtypist/files/digest-gtypist-2.7-r1 | 3 | ||||
-rw-r--r-- | app-misc/gtypist/files/gtypist-2.7-xemacs-compat.patch | 18 | ||||
-rw-r--r-- | app-misc/gtypist/gtypist-2.5.ebuild | 27 | ||||
-rw-r--r-- | app-misc/gtypist/gtypist-2.6.2.ebuild | 27 | ||||
-rw-r--r-- | app-misc/gtypist/gtypist-2.7-r1.ebuild | 62 |
9 files changed, 99 insertions, 61 deletions
diff --git a/app-misc/gtypist/ChangeLog b/app-misc/gtypist/ChangeLog index 4e7dfb0d44ff..1bfebb876b1a 100644 --- a/app-misc/gtypist/ChangeLog +++ b/app-misc/gtypist/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for app-misc/gtypist # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/gtypist/ChangeLog,v 1.13 2007/02/21 22:31:05 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/gtypist/ChangeLog,v 1.14 2007/10/05 20:32:55 ulm Exp $ + +*gtypist-2.7-r1 (05 Oct 2007) + + 05 Oct 2007; Ulrich Mueller <ulm@gentoo.org> + +files/gtypist-2.7-xemacs-compat.patch, +files/50gtypist-gentoo.el, + -gtypist-2.5.ebuild, -gtypist-2.6.2.ebuild, +gtypist-2.7-r1.ebuild: + New emacs and xemacs flags in IUSE; proper dependencies; apply patch for + XEmacs compatibility; fixes bug #165441. Add site-init file for GNU Emacs. + Don't dodoc INSTALL. Remove old versions. 21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog: Transition to Manifest2. diff --git a/app-misc/gtypist/files/50gtypist-gentoo.el b/app-misc/gtypist/files/50gtypist-gentoo.el new file mode 100644 index 000000000000..8d888d4dcd87 --- /dev/null +++ b/app-misc/gtypist/files/50gtypist-gentoo.el @@ -0,0 +1,6 @@ + +;; gtypist site-lisp configuration + +(add-to-list 'load-path "@SITELISP@") +(autoload 'gtypist-mode "gtypist-mode" nil t) +(add-to-list 'auto-mode-alist '("\\.typ\\'" . gtypist-mode)) diff --git a/app-misc/gtypist/files/digest-gtypist-2.5 b/app-misc/gtypist/files/digest-gtypist-2.5 deleted file mode 100644 index 68b40c07237a..000000000000 --- a/app-misc/gtypist/files/digest-gtypist-2.5 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 401ab1b4ea346eb2f61d490bcbc8c417 gtypist-2.5.tar.gz 612794 -RMD160 b081a35909edad576d5bb836e4db76aa82e8a632 gtypist-2.5.tar.gz 612794 -SHA256 6175c19c981bc1dbca478e96109d3b91ef5c9ed82745cb38790b0edc9721ad7f gtypist-2.5.tar.gz 612794 diff --git a/app-misc/gtypist/files/digest-gtypist-2.6.2 b/app-misc/gtypist/files/digest-gtypist-2.6.2 deleted file mode 100644 index e4a5472dd3ee..000000000000 --- a/app-misc/gtypist/files/digest-gtypist-2.6.2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 ca8cd4f23d7b1a91d2c3a36596525e81 gtypist-2.6.2.tar.gz 723524 -RMD160 30f3b111dae15f1b25c4b719b87e34a65613b35d gtypist-2.6.2.tar.gz 723524 -SHA256 cfba1d286ff58ea7fe5224baf7bf5b3219a5a05126cf86470f5c2f71cb4957dd gtypist-2.6.2.tar.gz 723524 diff --git a/app-misc/gtypist/files/digest-gtypist-2.7-r1 b/app-misc/gtypist/files/digest-gtypist-2.7-r1 new file mode 100644 index 000000000000..dc748ffc0f2e --- /dev/null +++ b/app-misc/gtypist/files/digest-gtypist-2.7-r1 @@ -0,0 +1,3 @@ +MD5 2e69a3fd10f9e7fba0dadb1189dc185a gtypist-2.7.tar.gz 1019990 +RMD160 3bd7f01c6cd4f9f453744c76296701967786fe19 gtypist-2.7.tar.gz 1019990 +SHA256 d73da348bfe32f54bfcc20afdff64168faf38b19172992bebdf693876d102a33 gtypist-2.7.tar.gz 1019990 diff --git a/app-misc/gtypist/files/gtypist-2.7-xemacs-compat.patch b/app-misc/gtypist/files/gtypist-2.7-xemacs-compat.patch new file mode 100644 index 000000000000..9d45511187b7 --- /dev/null +++ b/app-misc/gtypist/files/gtypist-2.7-xemacs-compat.patch @@ -0,0 +1,18 @@ +--- 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/gtypist-2.5.ebuild b/app-misc/gtypist/gtypist-2.5.ebuild deleted file mode 100644 index 765812bec671..000000000000 --- a/app-misc/gtypist/gtypist-2.5.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/gtypist/gtypist-2.5.ebuild,v 1.15 2005/01/01 15:06:28 eradicator Exp $ - -DESCRIPTION="universal typing tutor" -HOMEPAGE="http://www.gnu.org/software/gtypist/gtypist.html" -SRC_URI="ftp://ftp.gnu.org/gnu/gtypist/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86" -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 INSTALL NEWS README TODO THANKS -} diff --git a/app-misc/gtypist/gtypist-2.6.2.ebuild b/app-misc/gtypist/gtypist-2.6.2.ebuild deleted file mode 100644 index 9854b69625da..000000000000 --- a/app-misc/gtypist/gtypist-2.6.2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/gtypist/gtypist-2.6.2.ebuild,v 1.9 2005/01/01 15:06:28 eradicator 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" -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 INSTALL NEWS README TODO THANKS -} diff --git a/app-misc/gtypist/gtypist-2.7-r1.ebuild b/app-misc/gtypist/gtypist-2.7-r1.ebuild new file mode 100644 index 000000000000..7ab5671404da --- /dev/null +++ b/app-misc/gtypist/gtypist-2.7-r1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2007 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.1 2007/10/05 20:32:55 ulm 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? ( virtual/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 +} |