Assign PORTDIR in site-init file.

Package-Manager: portage-2.2_rc40/cvs/Linux i686

6 files changed, 35 insertions, 17 deletions

diff --git a/app-emacs/gentoo-syntax/ChangeLog b/app-emacs/gentoo-syntax/ChangeLog
index 465e0684f879..80b9fcd076d7 100644
--- a/app-emacs/gentoo-syntax/ChangeLog
+++ b/app-emacs/gentoo-syntax/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emacs/gentoo-syntax
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/gentoo-syntax/ChangeLog,v 1.44 2009/08/25 13:39:55 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/gentoo-syntax/ChangeLog,v 1.45 2009/08/25 17:02:55 ulm Exp $
+
+  25 Aug 2009; Ulrich Mueller <ulm@gentoo.org> gentoo-syntax-1.12.ebuild,
+  +files/50gentoo-syntax-gentoo-1.12.el, files/50gentoo-syntax-gentoo.el,
+  gentoo-syntax-9999.ebuild:
+  Assign PORTDIR in site-init file.
 
   25 Aug 2009; Christian Faulhammer <fauli@gentoo.org>
   gentoo-syntax-9999.ebuild:
diff --git a/app-emacs/gentoo-syntax/Manifest b/app-emacs/gentoo-syntax/Manifest
index e8d02b4e0789..493a7e48f130 100644
--- a/app-emacs/gentoo-syntax/Manifest
+++ b/app-emacs/gentoo-syntax/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 50gentoo-syntax-gentoo.el 533 RMD160 8684215fadb0c812e9f19034db26e38e5439a8aa SHA1 7d4e9b354810cf97004e397b0837b9cc4f62e63f SHA256 0fbad4e841e4eae0eca11804b2bc9b5cc44d42b406e01f612f99ef0cec91d8b2
+AUX 50gentoo-syntax-gentoo-1.12.el 489 RMD160 1388dbe82a7b7ed716f7ed53f88c8f681bd3503a SHA1 b5b47ebec900d2805ae0bdbdfd1e8c923d295996 SHA256 2fd5c4f798deeb4268c73926e9265d66788d5bbca56bf9334db2979fdcf0a10d
+AUX 50gentoo-syntax-gentoo.el 529 RMD160 14951e4be8175bafc7d826b8ce5fe2cbdfb6c757 SHA1 046cb7e3a518159a57b0fb0f2ee036a531ed38e3 SHA256 28e95e0def4ebec23067a471573300bc0449c9787895089b30d919295547d338
 AUX 51gentoo-syntax-gentoo.el 510 RMD160 85cb392d4ff4330b8502c99d6411406f17e882df SHA1 bd960089aace9bf5ca6bebba198a265986034fa9 SHA256 fc184b54749bbbf3ea888cd245d0d899ee2a8c97d9b4e803a0ecc1f6b18ea902
 DIST gentoo-syntax-1.11.tar.bz2 13227 RMD160 f2c281c70516279db58b58d2e794bbd1bbd2262f SHA1 b65e21e91b1ffd2483a3f7061f8b85fabd1a0494 SHA256 5fa79d5769631cc89518c0c74eac111579b1606909d13ce17bf787972d6ac54d
 DIST gentoo-syntax-1.12.tar.bz2 13764 RMD160 d16fec796dcc15082e7d5232c1e862e9c751648f SHA1 cef3ac7345b2e4106cae172e84f34b423aee7723 SHA256 d9cf9fe7ff3dfa36ba667faf2069fbfb275429c50c4e9b7e0bf523f81a060cea
 EBUILD gentoo-syntax-1.11.ebuild 748 RMD160 a6f4eaf744c169de21bad0ecd21ca07d9f545037 SHA1 8566a8520aa738b1c02c9ae7fb32688290e62e48 SHA256 fc4999199c3f1b8398f241457d39c12d16fc4020e08a4ff5113e23575dff727c
-EBUILD gentoo-syntax-1.12.ebuild 749 RMD160 674a2fe2b54bc1874e755175e6b049a551ffe066 SHA1 7e1761b13e081743a2146c3d85dd930c80b8b782 SHA256 02d7546d2aa93ed2f062ae1c98b0cac61235cb2f189f83c25c72c480239d28e0
-EBUILD gentoo-syntax-9999.ebuild 955 RMD160 ec6d151247406cbe87793dd12d3965937e52142c SHA1 bf20bc0afc53eee98ad7d68e348b909cd3d5eee7 SHA256 88f06287ea44cedabad27035dfdb6e0a947f8977cb3aacfcab3a9a494ebd4a84
-MISC ChangeLog 9102 RMD160 ed6b7f955b0e55386c1d2250708739e0350b72f5 SHA1 5fba163fce7f9c2d3cf90a90e37e8454cf648a5b SHA256 033c3166421fa011d001949ce1018d5a4545859823df16387f932502bdb897fa
+EBUILD gentoo-syntax-1.12.ebuild 752 RMD160 d2e16765769a41bb7563318a6ec0fd49b9d468d2 SHA1 0ced2f69b3e8ad21da81086a8bec2b8625e7035d SHA256 61f0a97dd03a100217680ff7c4914fa50e1ecce8935a77ed9597f5c648188d37
+EBUILD gentoo-syntax-9999.ebuild 1144 RMD160 a8cb09a5e009ef797c1b3f8343ed6f0ba9191c75 SHA1 1b425fe0daca242ee2f9570db3cb313022637694 SHA256 79b80245f086006250fee6f1b4bac5b4a518d81f1336bf90125707cb29cd5316
+MISC ChangeLog 9314 RMD160 c16bfdb748a187a50f0bf524ff8788abf84538f9 SHA1 a4d3bb2e61a0acd5184dfafb77871075408c21ca SHA256 5c6a60416697c2dd68cb51850915bb51d3b964f63e5a5784bf9aac7c2b0ea3a8
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkqT6bEACgkQNQqtfCuFnePEcgCfUnIXEZx3SgsRQSUX6EB+Z+Qz
-IQkAnRTDyEalZN/LQFp3hs8WDhpW4uIK
-=LcJl
+iEYEARECAAYFAkqUGb4ACgkQOeoy/oIi7uyF4wCfTKNhj55AwKF34whyNCih+OAL
+70cAn0NYBpdIFTD2iyGSVjoplgeftG/Q
+=5M/W
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/gentoo-syntax/files/50gentoo-syntax-gentoo-1.12.el b/app-emacs/gentoo-syntax/files/50gentoo-syntax-gentoo-1.12.el
new file mode 100644
index 000000000000..4c4f2739c91d
--- /dev/null
+++ b/app-emacs/gentoo-syntax/files/50gentoo-syntax-gentoo-1.12.el
@@ -0,0 +1,9 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'ebuild-mode "gentoo-syntax"
+  "Major mode for Portage .ebuild and .eclass files." t)
+(autoload 'eselect-mode "gentoo-syntax" "Major mode for .eselect files." t)
+
+(add-to-list 'auto-mode-alist '("\\.\\(ebuild\\|eclass\\)\\'" . ebuild-mode))
+(add-to-list 'auto-mode-alist '("\\.eselect\\'" . eselect-mode))
+(add-to-list 'interpreter-mode-alist '("runscript" . sh-mode))
+(modify-coding-system-alist 'file "\\.\\(ebuild\\|eclass\\)\\'" 'utf-8)
diff --git a/app-emacs/gentoo-syntax/files/50gentoo-syntax-gentoo.el b/app-emacs/gentoo-syntax/files/50gentoo-syntax-gentoo.el
index 6c5f0d536d79..80ce285a9bde 100644
--- a/app-emacs/gentoo-syntax/files/50gentoo-syntax-gentoo.el
+++ b/app-emacs/gentoo-syntax/files/50gentoo-syntax-gentoo.el
@@ -1,6 +1,3 @@
-
-;;; gentoo-syntax site-lisp configuration
-
 (add-to-list 'load-path "@SITELISP@")
 (autoload 'ebuild-mode "gentoo-syntax"
   "Major mode for Portage .ebuild and .eclass files." t)
@@ -10,3 +7,5 @@
 (add-to-list 'auto-mode-alist '("\\.eselect\\'" . eselect-mode))
 (add-to-list 'interpreter-mode-alist '("runscript" . sh-mode))
 (modify-coding-system-alist 'file "\\.\\(ebuild\\|eclass\\)\\'" 'utf-8)
+
+(setq ebuild-mode-portdir "@PORTDIR@")
diff --git a/app-emacs/gentoo-syntax/gentoo-syntax-1.12.ebuild b/app-emacs/gentoo-syntax/gentoo-syntax-1.12.ebuild
index 88d64c1c825f..99d19f825d0a 100644
--- a/app-emacs/gentoo-syntax/gentoo-syntax-1.12.ebuild
+++ b/app-emacs/gentoo-syntax/gentoo-syntax-1.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/gentoo-syntax/gentoo-syntax-1.12.ebuild,v 1.6 2009/07/16 17:42:15 tcunha Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/gentoo-syntax/gentoo-syntax-1.12.ebuild,v 1.7 2009/08/25 17:02:55 ulm Exp $
 
 inherit elisp
 
@@ -14,7 +14,7 @@ KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE=""
 
 DOCS="ChangeLog"
-SITEFILE="50${PN}-gentoo.el"
+SITEFILE="50${PN}-gentoo-${PV}.el"
 
 pkg_postinst() {
 	elisp-site-regen
diff --git a/app-emacs/gentoo-syntax/gentoo-syntax-9999.ebuild b/app-emacs/gentoo-syntax/gentoo-syntax-9999.ebuild
index c9b6db3cfad6..abfdd9986833 100644
--- a/app-emacs/gentoo-syntax/gentoo-syntax-9999.ebuild
+++ b/app-emacs/gentoo-syntax/gentoo-syntax-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/gentoo-syntax/gentoo-syntax-9999.ebuild,v 1.7 2009/08/25 13:39:55 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/gentoo-syntax/gentoo-syntax-9999.ebuild,v 1.8 2009/08/25 17:02:55 ulm Exp $
 
 inherit elisp subversion
 
@@ -23,8 +23,12 @@ src_compile() {
 }
 
 src_install() {
-	elisp_src_install
-	doinfo gentoo-syntax.info
+	elisp-install ${PN} *.el *.elc || die
+	sed -e "s:@PORTDIR@:${PORTDIR}:" \
+		"${FILESDIR}/${SITEFILE}" >"${T}/${SITEFILE}" || die
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+	doinfo gentoo-syntax.info || die
+	dodoc ${DOCS} || die
 }
 
 pkg_postinst() {