Fix compile failure, bug 395897 comment #1. Remove old.

Package-Manager: portage-2.1.12.11/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

4 files changed, 34 insertions, 26 deletions

diff --git a/app-xemacs/gentoo-syntax/ChangeLog b/app-xemacs/gentoo-syntax/ChangeLog
index fdd90f2ae578..9d99b855bd15 100644
--- a/app-xemacs/gentoo-syntax/ChangeLog
+++ b/app-xemacs/gentoo-syntax/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-xemacs/gentoo-syntax
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/gentoo-syntax/ChangeLog,v 1.29 2012/06/08 12:02:12 phajdan.jr Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/gentoo-syntax/ChangeLog,v 1.30 2013/07/06 20:52:28 ulm Exp $
+
+  06 Jul 2013; Ulrich Müller <ulm@gentoo.org> -gentoo-syntax-1.18.ebuild,
+  gentoo-syntax-1.19.ebuild:
+  Fix compile failure, bug 395897 comment #1. Remove old.
 
   08 Jun 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   gentoo-syntax-1.19.ebuild:
diff --git a/app-xemacs/gentoo-syntax/Manifest b/app-xemacs/gentoo-syntax/Manifest
index 4dafac280633..8efb001c5d9e 100644
--- a/app-xemacs/gentoo-syntax/Manifest
+++ b/app-xemacs/gentoo-syntax/Manifest
@@ -1,6 +1,21 @@
-DIST gentoo-syntax-1.18.tar.bz2 20819 SHA256 c05a935ce7803595a888c77c37c2f16dd9fe5da31418bc8f9b5940be9c08fb14 SHA512 c7786f2abb9765fdc7b3d59e7cf46e01fa1d8e7bc7a21af17a61b4fd3968f9471a023c75d09330c4bab33c0e8cdaa4e58f1c80a05e118fece89ddddb98a8aa13 WHIRLPOOL ea5d726b65f581ac6018c08fa7180c91c805ce0b20245e8b829fa4b406b993477617325c00886482d098ba6cfc54799e4f955e0a1042d4bea235ad3c8e1bd778
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST gentoo-syntax-1.19.tar.bz2 21385 SHA256 d20b5f13118d7823f5fed194c43decf322fb4ff3a05a7b63c46a9f001307b058 SHA512 ae745375cd4737fe4fa51be2d26c06b0579018b16963cad173af0721cd8a278f7c294fac4eeea9cdd57a41ca20892cdcf988da54049005a2e9aab13c58fdb9fd WHIRLPOOL 1d3883761bb1255021ba7fb2871b7d8edb75785e1a01ab0c5f1165827665dc58e41da6bd89a174c3c38adecd67d1ee6ffaee6648aab3f9c60e52a82b85b5d858
-EBUILD gentoo-syntax-1.18.ebuild 587 SHA256 2de31400b0c3d1684b73104adff45aacb6aae5f2599cd6f88290bc2772ddb863 SHA512 aa7e9604343cc5b04098c2b2fa5e512a69f65e52e60d2538d3c68d67ccec291a368b54015a7458a846d6b97d43021a2bd84c57e194314bd391aae1b2fca5ab4d WHIRLPOOL b72d613477cbda588628383ba683fa541f488386cbcb8389331cf22ba363845d759c9d15ff8f199d754c2b6bb81f27326ca6e82ea119a6dafc3dd1f8b2c19f21
-EBUILD gentoo-syntax-1.19.ebuild 587 SHA256 84fff2134fcfb642872aa9e49f6a7f4bdc42ec841d1ddb281b34a2e43c8156ce SHA512 eec8043db76b903a6d49e866d2dda52e3abc8dc479ceb1d0e607357be49d69d2d800fe54d169bfb258526978d4f61c480ccb3f65fdb9b71dae2aab2c3b0478aa WHIRLPOOL 47a93c767773b0b3946e6199186e8367920054607f7dcd41da1836af6c091f8edb9db46367d5a19eed95f0d042cecf70b3ec4f17a4bcbbd6335acb731e831dd5
-MISC ChangeLog 3856 SHA256 268b4a862c844b31d687a0826c1bcf9ec7df40144940da52178db57c1df18b5d SHA512 baa659d38e5c6f80d4b5d16ae02e1ae3d7262ed065706ebb921b2bb067a6b31723bf9d00e02099fc8abd9d3b04bc84cefc63e2eb38228afc6065110aa70252a2 WHIRLPOOL 00d75052dc13b1ebb25c431574b8fb3aaa6a039b7ff7504e6e1916ad0b6a2cab97ae9b7e9b26dcaba256416831b27a7fe26b71511135f6bd9c336febed4f5c7b
+EBUILD gentoo-syntax-1.19.ebuild 757 SHA256 6cddffd2558ecffc71dfdc39f8a17fd5f8f9e968d2c3138fea81b56a5ed6d9bb SHA512 d973767b3b2f98ac8e2ae40255a8ac055f1bd844755f163ff5f9883d520ca15ec86d1b7c66131583524d9f6f7748d662769d34eddfeb4c427ff7c019be5b9a89 WHIRLPOOL 2ee2ca4c4f680bd6a74b7952a08dad7eab832a1b1ccccb253b216d22236f87476a6174763b4d109963b5ed885cd4b88bd5e3390f457e3e53310fec45bfd1b6db
+MISC ChangeLog 4012 SHA256 7e211f56226a9909c032248ca7ff06b030e6211ae4417839d333499d61c9b270 SHA512 54b5c783eecc5ccb63f918a7b2841b4766f58505bb023bdd0ee050ec38247c81a6234c429aa20e0d4c3c74a196103ac1b9f4dfcd7788d3504d0a6a5863bef40b WHIRLPOOL 0504c49deff973170986cc003020d10be6924e1f86caabb2584cfe5d779abc583bcd782d28cce4310976ce14b956ca6e206a1a33b8bbaff67ec98345b9ef7eb7
 MISC metadata.xml 161 SHA256 d896eb54e7e82141c9d5a2e82955cbfa75c030dc5747822a6a2263f6a76a4512 SHA512 a6207bc08d0c9660dd50ac762de8b51a724824f949c70573d01f37681ab86a36baaa5f05d33ec0be868a35df458678717752a895bc5c902c3c06fac7df8fcd9e WHIRLPOOL 240885d2e40114abb0ddd2b435fbbcfed4c869954a26fd9116cfd43bb54b0d603a3023c67eda16014c1f8fc073dc8a8848fa4beea9f2dc5a6860e2ab3fc60cf4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQGcBAEBCAAGBQJR2IPAAAoJEJQzkH1pP7W45qwL/A0SynBw+e2oJLHjbLxY8c/6
+tkQxAjqLiSxO/+FLsgI5dHBur4k8Xce8Cvy+ZJ/8ZyrKbgSngMqx+1l7ij7zzOJk
+WuaXY7O2VrDDsfi4bXtNUknkN/7HVNVWa3Ox4iwsA6He5S/rVqaoGfqe8kjzAG8s
+dj7NvzJSDVSCFWq0QryIsRy7vj11f8F0nOv2o66e+jNbU7z2bdGajRpkju/SoSII
+KSiXS/4QBho5jYtTw0gDJxxlWUDlaioXXlOWDSc8f5zM0mBZXsY+khvA905ZdYh2
+BXMgIVCT+M0vjvEvdE3HScSYQCKS5BwvAFov09V4iSXT/PWYKE0f2DgT2WSrMrkk
+sDlLQ1ndK2UjgQA3/00ouUxex62WIYYrJb/SLMDFV6DfscQmSL9ROHa0HwnIFTUY
+90w0A4T51joHTYcrfR1Vz/ZQEMtHFnoylUakeEpasVJAEbyK5Sr8H9VJLXGfQSmZ
+Ym1CJ/BNgCYIMc5DKXwVqqdkcI+CsnSj91mfnLqncg==
+=V7bI
+-----END PGP SIGNATURE-----
diff --git a/app-xemacs/gentoo-syntax/gentoo-syntax-1.18.ebuild b/app-xemacs/gentoo-syntax/gentoo-syntax-1.18.ebuild
deleted file mode 100644
index dd202e97ae80..000000000000
--- a/app-xemacs/gentoo-syntax/gentoo-syntax-1.18.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/gentoo-syntax/gentoo-syntax-1.18.ebuild,v 1.3 2012/01/04 18:20:54 phajdan.jr Exp $
-
-inherit xemacs-elisp eutils
-
-DESCRIPTION="An Emacs mode for editing ebuilds and other Gentoo specific files."
-HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/index.xml"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=app-editors/xemacs-21.4.20-r5
-	app-xemacs/sh-script"
-DEPEND="${RDEPEND}"
diff --git a/app-xemacs/gentoo-syntax/gentoo-syntax-1.19.ebuild b/app-xemacs/gentoo-syntax/gentoo-syntax-1.19.ebuild
index ffc2f67c64eb..4c60a100bbf8 100644
--- a/app-xemacs/gentoo-syntax/gentoo-syntax-1.19.ebuild
+++ b/app-xemacs/gentoo-syntax/gentoo-syntax-1.19.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/gentoo-syntax/gentoo-syntax-1.19.ebuild,v 1.3 2012/06/08 12:02:12 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/gentoo-syntax/gentoo-syntax-1.19.ebuild,v 1.4 2013/07/06 20:52:28 ulm Exp $
 
 inherit xemacs-elisp eutils
 
 DESCRIPTION="An Emacs mode for editing ebuilds and other Gentoo specific files."
 HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/index.xml"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
@@ -15,3 +15,9 @@ IUSE=""
 RDEPEND=">=app-editors/xemacs-21.4.20-r5
 	app-xemacs/sh-script"
 DEPEND="${RDEPEND}"
+
+src_compile() {
+	${XEMACS_BATCH_CLEAN} -eval "(add-to-list 'load-path \".\")" \
+		-f batch-byte-compile gentoo-syntax.el || die
+	xemacs-elisp-make-autoload-file *.el || die
+}