summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2011-12-15 07:22:59 +0000
committerUlrich Müller <ulm@gentoo.org>2011-12-15 07:22:59 +0000
commit45a0018071a7ab4080acd237b584f7f87c2e3e1b (patch)
treead19b397177e755e1c62b1066a39a41a872f5f2e /app-emacs/emacs-common-gentoo
parentDrop ruby19 to create a stable candidate. (diff)
downloadhistorical-45a0018071a7ab4080acd237b584f7f87c2e3e1b.tar.gz
historical-45a0018071a7ab4080acd237b584f7f87c2e3e1b.tar.bz2
historical-45a0018071a7ab4080acd237b584f7f87c2e3e1b.zip
Don't (ab)use elisp-install for installing subdirs.el in the parent dir.
Package-Manager: portage-2.1.10.40/cvs/Linux x86_64
Diffstat (limited to 'app-emacs/emacs-common-gentoo')
-rw-r--r--app-emacs/emacs-common-gentoo/ChangeLog5
-rw-r--r--app-emacs/emacs-common-gentoo/Manifest10
-rw-r--r--app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3.ebuild8
3 files changed, 13 insertions, 10 deletions
diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog
index 40e1f0569e03..9033a2880d52 100644
--- a/app-emacs/emacs-common-gentoo/ChangeLog
+++ b/app-emacs/emacs-common-gentoo/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-emacs/emacs-common-gentoo
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.46 2011/12/13 22:20:27 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.47 2011/12/15 07:22:59 ulm Exp $
+
+ 15 Dec 2011; Ulrich Mueller <ulm@gentoo.org> emacs-common-gentoo-1.3.ebuild:
+ Don't (ab)use elisp-install for installing subdirs.el in the parent dir.
*emacs-common-gentoo-1.3 (13 Dec 2011)
diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
index 9f51509e4b44..7fadec4dd071 100644
--- a/app-emacs/emacs-common-gentoo/Manifest
+++ b/app-emacs/emacs-common-gentoo/Manifest
@@ -4,13 +4,13 @@ Hash: SHA1
DIST emacs-common-gentoo-1.2.tar.gz 46622 RMD160 88c923d05286b53687e1099294fb579a2f4f5d39 SHA1 4712b6186d4620aaa5258236367d3228f515f341 SHA256 d15f9654214b10e9efc9e38fe45b4e08c3f0cc1c975de34058e4d360d3053108
DIST emacs-common-gentoo-1.3.tar.gz 46819 RMD160 40c12dd355c3fd80ad65d45190c4f3c7f2134ad6 SHA1 ff743a4646d493dd14ed1e812d3adfd6323498e9 SHA256 c874088b1d9833432e1da9c3e3f79e7891cb3af41bcdecb02aa299d207c0218d
EBUILD emacs-common-gentoo-1.2-r2.ebuild 4044 RMD160 ac44d82f984f1617085324553b37aa666ad76417 SHA1 497a66e8596d4c0af2a25bd468be40238f808325 SHA256 ba89c891ad62b3940b25251f90ea2a943a41dbd71e1f81a9fe07204bd8284f37
-EBUILD emacs-common-gentoo-1.3.ebuild 3054 RMD160 4b2f34113a663dae73429a1edd330e83132bab1e SHA1 0814447402dce6523973fe1d9b6ddf8b9bae2667 SHA256 b5535d1c9848f9fa9c0d3925a0bb265c16b3a649f7a05a0a4c3dca58fd0a4948
-MISC ChangeLog 9496 RMD160 b2481792cc1b0dba5ae60d0e69d9b062a5ba2438 SHA1 b8f26319ca55ceccc545bbc4f2204bf7b382d2e7 SHA256 eb683650de530c39cd343fe853f8de0a318ff0aaa6c710d71568a22dbea83933
+EBUILD emacs-common-gentoo-1.3.ebuild 3037 RMD160 6cb2dc4a8a3dc142822a97336c78f814bc2b548f SHA1 0aeaac945139d9c59af4ddede5847d63902cf171 SHA256 a62ca45237b500c448161f3c7c7609eb3f05f9c941c61a81171b66944e8d1d97
+MISC ChangeLog 9651 RMD160 0486cc1f06eb1721242772288af8eaa7ba99d7ba SHA1 a4a47917006ea91ac119ec9d5500f5c406508800 SHA256 ad4698df1bbb6da4e2c3560de9ef4c816601d208bb09d4c986da4e29ca81189a
MISC metadata.xml 235 RMD160 94ec7acf062c24ce7a5c9b98fff11c2a68baf269 SHA1 c948e0bb625876a97f14834fe5848367dda93628 SHA256 81f928a2ff996d91f098bc1d718adec61bbb6afa1f8e5f1b29f0931a73902ec1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iEYEARECAAYFAk7n0gQACgkQOeoy/oIi7uwmEACeIADCn9YCWgLDJSdEYt5vLIFf
-Ou8An14vZuSQ8uN+iSA+X1kDkEuK96tK
-=X08f
+iEYEARECAAYFAk7poq8ACgkQOeoy/oIi7uwQzwCgwpPysYsZSq7R9CTLllENUDP/
+N0MAoMdP+KNAbxQbd2FBY9PVA6WfPXAz
+=R5Tt
-----END PGP SIGNATURE-----
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3.ebuild
index 1134d4a171f3..ace5e57e9862 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3.ebuild,v 1.1 2011/12/13 22:20:27 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3.ebuild,v 1.2 2011/12/15 07:22:59 ulm Exp $
EAPI=4
@@ -18,7 +18,7 @@ IUSE="X emacs22icons"
PDEPEND="virtual/emacs"
pkg_setup() {
- if [ -e "${EROOT}${SITELISP}/subdirs.el" ] \
+ if [[ -e ${EROOT}${SITELISP}/subdirs.el ]] \
&& ! has_version ">=${CATEGORY}/${PN}-1"
then
ewarn "Removing orphan subdirs.el (installed by old Emacs ebuilds)"
@@ -27,8 +27,8 @@ pkg_setup() {
}
src_install() {
- keepdir "${SITELISP}"
- elisp-install . subdirs.el || die
+ insinto "${SITELISP}"
+ doins subdirs.el
keepdir /etc/emacs
insinto /etc/emacs