Version bump, imported from Emacs overlay.

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

3 files changed, 107 insertions, 6 deletions

diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog
index 692ea10a92e1..14c5c67a217f 100644
--- a/app-emacs/emacs-common-gentoo/ChangeLog
+++ b/app-emacs/emacs-common-gentoo/ChangeLog
@@ -1,12 +1,17 @@
 # ChangeLog for x11-misc/emacs-desktop
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.1 2009/03/12 00:59:02 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.2 2009/03/12 09:44:24 ulm Exp $
 
+*emacs-common-gentoo-1.0 (12 Mar 2009)
 *emacs-common-gentoo-0.3 (12 Mar 2009)
 
   12 Mar 2009; Ulrich Mueller <ulm@gentoo.org> +metadata.xml,
-  +emacs-common-gentoo-0.3.ebuild:
+  +emacs-common-gentoo-0.3.ebuild, +emacs-common-gentoo-1.0.ebuild:
   Package moved from x11-misc/emacs-desktop to app-emacs/emacs-common-gentoo.
+  Version 1.0 imported from Emacs overlay. Install subdirs.el; install
+  desktop entry only for USE="X". Keywords ~s390 and ~sparc-fbsd carried
+  over from app-editors/emacs, which doesn't install subdirs.el anymore.
+  New pkg_config function will create a default site-start.el file.
 
   20 Sep 2008; Ulrich Mueller <ulm@gentoo.org> -emacs-desktop-0.2-r1.ebuild:
   Remove old.
diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
index abe24d31d1f5..09655218c2ef 100644
--- a/app-emacs/emacs-common-gentoo/Manifest
+++ b/app-emacs/emacs-common-gentoo/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+DIST emacs-common-gentoo-1.0.tar.gz 14268 RMD160 3dad4c2955fc8d9be095500305d67c36e587eef0 SHA1 2d646e3761a2eb23c359e0fb45743f553ade07b6 SHA256 eafc05a71b7b77084073ab82e9bf92c4a4dec1b61feb8a7adaa0b3194f95e2cd
 DIST emacs-desktop-0.3.tar.gz 14364 RMD160 bfcc3977ac602696330fde87878b2bc263267851 SHA1 9aab71bafad38be598d9f8ffcbd8c6b7b2a87854 SHA256 e4bc226140ce242679c400298a3760441dfd33e37f9e9a7f01f960b4a6eb97ae
 EBUILD emacs-common-gentoo-0.3.ebuild 1006 RMD160 946600929dc6f9339ec7920ae053a04e45083008 SHA1 936e6d8353f23e47728bf2703398cfca4ea3970c SHA256 151f5e9325afe96db2c0f156b4ca21004ac6341240fd38e8fa82b4eb0f1037c1
-MISC ChangeLog 3784 RMD160 a99cc627619da11c00d555a60f2c417abe154955 SHA1 480d6e1656d3d44138ac76d373124d86400164e1 SHA256 0eb2c8f41ba061ccd08bb3e247c9eea5f7e56b260fff41c86789f3bff86dedca
+EBUILD emacs-common-gentoo-1.0.ebuild 2559 RMD160 04f0a45294825432f1a3ef13b0a65642b8b313cc SHA1 4fe480c23be5326f4ec3ab1e9090a5af90374df5 SHA256 4aa9a1eb2f622d12c27b4ec990135e9125d33dcc72d6a22a84cde0bb7d910766
+MISC ChangeLog 4141 RMD160 c175d0929bbcd1b2dc5631c1756162da3e75f84b SHA1 3c838d4c1003f59fe71052b243c01deb66a0161c SHA256 f69cdb3ed611e2d7e0d0c90b07a3a517e80eca87cad69aee9a77480c65da9321
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkm4XqYACgkQOeoy/oIi7uyohACgnmYRNR7SbAYK863hhLzpB2un
-MiwAoIdaObiGBWvexxn8YwDxBPfeU2IH
-=78vj
+iEYEARECAAYFAkm42cgACgkQOeoy/oIi7ux03ACfXSLsYKIkocCbH4XT5viAP/H4
+4wcAoIhWZoCc8aob6SAZdboRnLao1rJI
+=nV3c
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.0.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.0.ebuild
new file mode 100644
index 000000000000..d38470d5a176
--- /dev/null
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2009 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.0.ebuild,v 1.1 2009/03/12 09:44:24 ulm Exp $
+
+inherit elisp-common eutils fdo-mime gnome2-utils
+
+DESCRIPTION="Common files needed by all GNU Emacs versions"
+HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="X"
+
+PDEPEND="virtual/emacs"
+
+pkg_setup() {
+	# clean up orphan file installed by old Emacs ebuilds
+	rm -f "${ROOT}${SITELISP}/subdirs.el"
+}
+
+src_install() {
+	elisp-install . subdirs.el || die
+
+	if use X; then
+		local i
+		domenu emacs.desktop emacsclient.desktop || die
+		newicon emacs_48.png emacs.png || die
+		for i in 16 24 32 48; do
+			insinto /usr/share/icons/hicolor/${i}x${i}/apps
+			newins emacs_${i}.png emacs.png || die
+		done
+	fi
+}
+
+make-site-start() {
+	ebegin "Creating default ${SITELISP}/site-start.el"
+	cat <<-EOF >"${T}/site-start.el"
+	;;; site-start.el
+
+	;;; Commentary:
+	;; This default site startup file was created by package
+	;; ${CATEGORY}/${PF}. You may modify this file, replace it
+	;; by your own site initialisation, or even remove it completely.
+
+	;;; Code:
+	;; Load site initialisation for Gentoo installed packages.
+	(require 'site-gentoo)
+
+	;;; site-start.el ends here
+	EOF
+	mv "${T}/site-start.el" "${ROOT}${SITELISP}/site-start.el"
+	eend $? "Installation of site-start.el failed"
+}
+
+pkg_config() {
+	if [ ! -e "${ROOT}${SITELISP}/site-start.el" ]; then
+		einfo "Press ENTER to create a default site-start.el file"
+		einfo "for GNU Emacs, or Control-C to abort now ..."
+		read
+		make-site-start
+	else
+		einfo "site-start.el for GNU Emacs already exists."
+	fi
+}
+
+pkg_postinst() {
+	if use X; then
+		fdo-mime_desktop_database_update
+		gnome2_icon_cache_update
+	fi
+
+	if [ ! -e "${ROOT}${SITELISP}/site-start.el" ]; then
+		if [ ! -e "${ROOT}${SITELISP}"/site-gentoo.el ]; then
+			# This seems to be a new install. Create site-gentoo.el and
+			# a default site-start.el, so that Gentoo packages will work.
+			elisp-site-regen
+			make-site-start
+		else
+			# site-gentoo.el already exists. Give a hint how to
+			# (re-)create the site-start.el file.
+			elog "If this is a new install, you may want to run:"
+			elog "\"emerge --config =${CATEGORY}/${PF}\""
+		fi
+	fi
+}
+
+pkg_postrm() {
+	if use X; then
+		fdo-mime_desktop_database_update
+		gnome2_icon_cache_update
+	fi
+}