Fix Emacs compilation issues, bug #165441.

Package-Manager: portage-2.1.3.11

10 files changed, 128 insertions, 81 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/Manifest b/app-misc/gtypist/Manifest
index 37d808496702..d0cb9439ad04 100644
--- a/app-misc/gtypist/Manifest
+++ b/app-misc/gtypist/Manifest
@@ -1,32 +1,41 @@
-DIST gtypist-2.5.tar.gz 612794 RMD160 b081a35909edad576d5bb836e4db76aa82e8a632 SHA1 5169da539e145db8e508652dd909302e2411bd8e SHA256 6175c19c981bc1dbca478e96109d3b91ef5c9ed82745cb38790b0edc9721ad7f
-DIST gtypist-2.6.2.tar.gz 723524 RMD160 30f3b111dae15f1b25c4b719b87e34a65613b35d SHA1 6fed439f3cdf43b870ba7ed3bf003adac6d3c735 SHA256 cfba1d286ff58ea7fe5224baf7bf5b3219a5a05126cf86470f5c2f71cb4957dd
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 50gtypist-gentoo.el 182 RMD160 bb3f58bfc2b10a4054842028712a9ba68f051758 SHA1 4acf0819faeb45b17fe8048ea75962ede9f6f388 SHA256 3274e8829cc488918e9f2676ad00e4aa12f06ca6147f128c54c105245b971b11
+MD5 e94e7cd868fa3c03f4136f77e03fa227 files/50gtypist-gentoo.el 182
+RMD160 bb3f58bfc2b10a4054842028712a9ba68f051758 files/50gtypist-gentoo.el 182
+SHA256 3274e8829cc488918e9f2676ad00e4aa12f06ca6147f128c54c105245b971b11 files/50gtypist-gentoo.el 182
+AUX gtypist-2.7-xemacs-compat.patch 588 RMD160 ed40210c2ab26af552101a435e78538b7cb38455 SHA1 54b9d1cc1b34ced86fbe0ea96f64cd3fe51c7df8 SHA256 4434ca2d42f25ee4b6d5553bb75dce2de243769a4a2f05336959b0fd032a772b
+MD5 ce603ce7b3ed1a4e2c1a3a404ce25fe7 files/gtypist-2.7-xemacs-compat.patch 588
+RMD160 ed40210c2ab26af552101a435e78538b7cb38455 files/gtypist-2.7-xemacs-compat.patch 588
+SHA256 4434ca2d42f25ee4b6d5553bb75dce2de243769a4a2f05336959b0fd032a772b files/gtypist-2.7-xemacs-compat.patch 588
 DIST gtypist-2.7.tar.gz 1019990 RMD160 3bd7f01c6cd4f9f453744c76296701967786fe19 SHA1 b44292ea6f5b7f97138777b8090c402084a839e0 SHA256 d73da348bfe32f54bfcc20afdff64168faf38b19172992bebdf693876d102a33
-EBUILD gtypist-2.5.ebuild 807 RMD160 d8f81de08bbca531f6dc4af7a9ff58ce3e3d9321 SHA1 cef9f205bbf6a5f9dbe6c00fea5dfc8af6f1a90b SHA256 3d988cb48c433c9ecd7eb78d88abe97e1e6df9a6a9ebe8efc3f7b1e1ed28bb63
-MD5 ce66e4e8798f2d45c88789df56b471ff gtypist-2.5.ebuild 807
-RMD160 d8f81de08bbca531f6dc4af7a9ff58ce3e3d9321 gtypist-2.5.ebuild 807
-SHA256 3d988cb48c433c9ecd7eb78d88abe97e1e6df9a6a9ebe8efc3f7b1e1ed28bb63 gtypist-2.5.ebuild 807
-EBUILD gtypist-2.6.2.ebuild 799 RMD160 b1fd3ae7dbb9c0b1e48a74b7508a1ccf775e8706 SHA1 3514304a58517e291000bcb10142e02edbffe8b1 SHA256 0934e7c45623086551a8e76cbc487e0ef225e6bd0d95a06687c040ab61604449
-MD5 1ee42800e14eed2a8366583893f9ae21 gtypist-2.6.2.ebuild 799
-RMD160 b1fd3ae7dbb9c0b1e48a74b7508a1ccf775e8706 gtypist-2.6.2.ebuild 799
-SHA256 0934e7c45623086551a8e76cbc487e0ef225e6bd0d95a06687c040ab61604449 gtypist-2.6.2.ebuild 799
+EBUILD gtypist-2.7-r1.ebuild 1486 RMD160 0e0e4ca31dff9635b5affad5df25c2297d3ebf6d SHA1 9ab1f0b2643c73a33cfd5cfc357cd709db6d1aa5 SHA256 ea8fa05f343958b51c9d01ad5c283e46db91d4c0828b15478d1efe62bb368a65
+MD5 f401e7fcc8ffa001069fa84f4ec6d2f7 gtypist-2.7-r1.ebuild 1486
+RMD160 0e0e4ca31dff9635b5affad5df25c2297d3ebf6d gtypist-2.7-r1.ebuild 1486
+SHA256 ea8fa05f343958b51c9d01ad5c283e46db91d4c0828b15478d1efe62bb368a65 gtypist-2.7-r1.ebuild 1486
 EBUILD gtypist-2.7.ebuild 804 RMD160 9440b010b27780a4583819f3bbf19120d1462a28 SHA1 959fa221c0fc2049c9ecd8303bd275bc2992dc50 SHA256 5ece962c9038b4997d5d1dc2b1717c47bac00ff4ac1666cad732489423f47752
 MD5 0a12d3ddefa970b232c896e88b0ba970 gtypist-2.7.ebuild 804
 RMD160 9440b010b27780a4583819f3bbf19120d1462a28 gtypist-2.7.ebuild 804
 SHA256 5ece962c9038b4997d5d1dc2b1717c47bac00ff4ac1666cad732489423f47752 gtypist-2.7.ebuild 804
-MISC ChangeLog 1358 RMD160 27618b85fb9f1a4a3d3345d9a0ae8229563487c3 SHA1 c49ae2315b52bf89b3b2bab44a7135a1be45c497 SHA256 4d8b8cc6e6f248f4d144522b58657a752c7991f55c22f34e1d0f61493efa9124
-MD5 97a0760ee2a8c3a52b6c462d7b5769f2 ChangeLog 1358
-RMD160 27618b85fb9f1a4a3d3345d9a0ae8229563487c3 ChangeLog 1358
-SHA256 4d8b8cc6e6f248f4d144522b58657a752c7991f55c22f34e1d0f61493efa9124 ChangeLog 1358
+MISC ChangeLog 1771 RMD160 a8dcd3f3b55ca7463bdeabba7c28575c392ff5fc SHA1 b0bc1194129627602a0787b1cf9c92fe1f49d926 SHA256 5faa2bcc97aabbd180ef2ebc3bff5ad13ea9409af84f44ffb8a7b12bc85c5fa6
+MD5 9d46048460e44a1717831ccc9ac84674 ChangeLog 1771
+RMD160 a8dcd3f3b55ca7463bdeabba7c28575c392ff5fc ChangeLog 1771
+SHA256 5faa2bcc97aabbd180ef2ebc3bff5ad13ea9409af84f44ffb8a7b12bc85c5fa6 ChangeLog 1771
 MISC metadata.xml 314 RMD160 25181cde297628576a9545bea3a76601485bfaf3 SHA1 ac16b621acf5a22b64859e3323d466fb556fc4c8 SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7
 MD5 38cacf4270b8a100918bf328ed9154d3 metadata.xml 314
 RMD160 25181cde297628576a9545bea3a76601485bfaf3 metadata.xml 314
 SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7 metadata.xml 314
-MD5 820ef89adca69baee6dcf166f66c73b0 files/digest-gtypist-2.5 235
-RMD160 8c5bbbb2d267af7552f1e8a1b979c5952344f288 files/digest-gtypist-2.5 235
-SHA256 3f7d5fcfcaa5d758b19022722c288ee188e85a099cca38dc03ae190034bb7539 files/digest-gtypist-2.5 235
-MD5 de66f92b394067374b7d9c43957c1061 files/digest-gtypist-2.6.2 241
-RMD160 3022f73e83caf4d9762707b7fa7148ef833b9d65 files/digest-gtypist-2.6.2 241
-SHA256 65c55f10d05e502825736408f1309e4b39e97101259b954d074475f0207eb34e files/digest-gtypist-2.6.2 241
 MD5 4a8ee4e25d445c5e5bb263b992b8e501 files/digest-gtypist-2.7 238
 RMD160 e49bd00ee08739d32413098e1dd634653191a327 files/digest-gtypist-2.7 238
 SHA256 c531d69e2f7f4f747c80594c79c2357019e02ce70844a058a7e948fc569ae1a4 files/digest-gtypist-2.7 238
+MD5 4a8ee4e25d445c5e5bb263b992b8e501 files/digest-gtypist-2.7-r1 238
+RMD160 e49bd00ee08739d32413098e1dd634653191a327 files/digest-gtypist-2.7-r1 238
+SHA256 c531d69e2f7f4f747c80594c79c2357019e02ce70844a058a7e948fc569ae1a4 files/digest-gtypist-2.7-r1 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHBp+JOeoy/oIi7uwRAo3bAKCxWyxrFz4OrbViEi0gqLOn8AtaYgCgrJM6
+k4x7HDZ4t4CYoJmojY7AEZU=
+=ND9t
+-----END PGP SIGNATURE-----
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
+}