Fix regexp in site-init file, bug 389193. Change EAPI to 4.

Package-Manager: portage-2.1.10.32/cvs/Linux x86_64

4 files changed, 27 insertions, 18 deletions

diff --git a/app-emacs/xslide/ChangeLog b/app-emacs/xslide/ChangeLog
index 93c08f7fceef..fcfeaeeaebac 100644
--- a/app-emacs/xslide/ChangeLog
+++ b/app-emacs/xslide/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emacs/xslide
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/xslide/ChangeLog,v 1.16 2007/12/18 08:20:42 opfer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/xslide/ChangeLog,v 1.17 2011/11/01 19:48:51 ulm Exp $
+
+  01 Nov 2011; Ulrich Mueller <ulm@gentoo.org> files/50xslide-gentoo.el,
+  xslide-0.2.2.ebuild:
+  Fix regexp in site-init file, bug 389193. Change EAPI to 4.
 
   18 Dec 2007; Christian Faulhammer <opfer@gentoo.org> xslide-0.2.2.ebuild:
   stable amd64
diff --git a/app-emacs/xslide/Manifest b/app-emacs/xslide/Manifest
index 34ca2e6d668f..6039b46b9745 100644
--- a/app-emacs/xslide/Manifest
+++ b/app-emacs/xslide/Manifest
@@ -1,5 +1,15 @@
-AUX 50xslide-gentoo.el 350 RMD160 0fc984b8e9919fbabf1931f89063e7c58b6397fe SHA1 8b214f2a42b42e3dd6acfeff743c5a2da9bc838a SHA256 c96f9c042ef90dd464bbd750dea247665eaa6c989d8c37c7bb512025178bd1d2
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 50xslide-gentoo.el 264 RMD160 b628265afe70efb0e33e1cb4258f03afc941389e SHA1 c0f5ea4b9d1a0610a6f93ff43ba553686d32627d SHA256 35440d5728dda67a9b7a7bbb3aa1eb6c46f2c7913ef5e96ef85dfcad1af8f247
 DIST xslide-0.2.2.zip 29051 RMD160 3726bcb2c9340ef8f51c1c99e1675101bb75816b SHA1 0a47087b7509b60627834c6e3fb822487e6578bd SHA256 dde9884f1584bcb63a8e218542c1a2d619327f4e94847974b6ece31b36c63c42
-EBUILD xslide-0.2.2.ebuild 643 RMD160 4d71bd9b66a6230fc701e2e29287bf00d29f226e SHA1 e0e391b448a8c38704c53e3475a23af531d7d09b SHA256 b24798100a8e36ba0621c8c232a36b83e52448be945d9c8060e408ba873125de
-MISC ChangeLog 2046 RMD160 e97cba66f7029faa9ad4e94bbff04e5e89262fa8 SHA1 f14b533a041441e3669769af1f5a302916ac17e5 SHA256 8d781f8c679ae587028fb6992b1ee311f56b3bbaeb90fa8240cb64f96a868b93
+EBUILD xslide-0.2.2.ebuild 629 RMD160 789fb3521d7965992fd013995b21fb0a2593bf1e SHA1 8761210486cd366de3ae182287f9060302f4b410 SHA256 ffecffe97f0a081407882cfc140a6d044c64eba28e058d157eb43f265f9c1cb1
+MISC ChangeLog 2203 RMD160 c4c2d01e18b442e9d06e92c9a1ac322a37787d04 SHA1 bf8090693773c2179188519061fa654ae5287773 SHA256 2974191c9163dc97246fa10576159afba82f1b4b2f5d2c327c1d6c615d0b9bb5
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk6wTx8ACgkQOeoy/oIi7uzurwCghXdHqZXRMTsdsk3NUUHDA0H+
+Nl4AoM+e5cBk/mQc2388c7OaxnI4jLnK
+=COe5
+-----END PGP SIGNATURE-----
diff --git a/app-emacs/xslide/files/50xslide-gentoo.el b/app-emacs/xslide/files/50xslide-gentoo.el
index faed732fb6f3..3ae228472f1b 100644
--- a/app-emacs/xslide/files/50xslide-gentoo.el
+++ b/app-emacs/xslide/files/50xslide-gentoo.el
@@ -1,14 +1,7 @@
-
-;;; xslide site-lisp configuration
-
 (add-to-list 'load-path "@SITELISP@")
 (autoload 'xsl-mode "xslide" "Major mode for XSL stylesheets." t)
 ;; Turn on font lock when in XSL mode
 (add-hook 'xsl-mode-hook
 	  'turn-on-font-lock)
-(setq auto-mode-alist
-      (append
-       (list
-	'("\\.fo$" . xsl-mode)
-	'("\\.xsl" . xsl-mode))
-       auto-mode-alist))
+(add-to-list 'auto-mode-alist
+	     '("\\.fo\\'\\|\\.xsl\\'" . xsl-mode))
diff --git a/app-emacs/xslide/xslide-0.2.2.ebuild b/app-emacs/xslide/xslide-0.2.2.ebuild
index d30c09233bbe..936e51146821 100644
--- a/app-emacs/xslide/xslide-0.2.2.ebuild
+++ b/app-emacs/xslide/xslide-0.2.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/xslide/xslide-0.2.2.ebuild,v 1.10 2007/12/18 08:20:42 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/xslide/xslide-0.2.2.ebuild,v 1.11 2011/11/01 19:48:51 ulm Exp $
+
+EAPI=4
 
 inherit elisp
 
@@ -16,9 +18,9 @@ IUSE=""
 DEPEND="app-arch/unzip"
 RDEPEND=""
 
-SITEFILE=50${PN}-gentoo.el
+SITEFILE="50${PN}-gentoo.el"
 DOCS="ChangeLog NEWS README.TXT TODO"
 
 src_compile() {
-	emake EMACS=emacs || die "emake failed"
+	emake EMACS=emacs
 }