Version bump. New "emacs23icons" USE flag for Emacs 23 style icons.

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

4 files changed, 151 insertions, 6 deletions

diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog
index 15e01e60da0c..05e1897fb8c5 100644
--- a/app-emacs/emacs-common-gentoo/ChangeLog
+++ b/app-emacs/emacs-common-gentoo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/emacs-common-gentoo
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.14 2009/04/14 18:02:24 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.15 2009/04/22 23:14:03 ulm Exp $
+
+*emacs-common-gentoo-1.1 (23 Apr 2009)
+
+  23 Apr 2009; Ulrich Mueller <ulm@gentoo.org> metadata.xml,
+  +emacs-common-gentoo-1.1.ebuild:
+  Version bump. New "emacs23icons" USE flag for Emacs 23 style icons.
 
   14 Apr 2009; Ulrich Mueller <ulm@gentoo.org>
   -emacs-common-gentoo-0.3.ebuild:
diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
index e3587f59bea6..e5fdbcf7738c 100644
--- a/app-emacs/emacs-common-gentoo/Manifest
+++ b/app-emacs/emacs-common-gentoo/Manifest
@@ -2,13 +2,15 @@
 Hash: SHA1
 
 DIST emacs-common-gentoo-1.0.tar.gz 14268 RMD160 3dad4c2955fc8d9be095500305d67c36e587eef0 SHA1 2d646e3761a2eb23c359e0fb45743f553ade07b6 SHA256 eafc05a71b7b77084073ab82e9bf92c4a4dec1b61feb8a7adaa0b3194f95e2cd
+DIST emacs-common-gentoo-1.1.tar.gz 46408 RMD160 3867bce376945f12da75e8051386d4b2ff91e807 SHA1 89608a53c9d18cf2b01f4c535fa630f035edfb06 SHA256 a23941f4fa1d47fdf598bd2f43308e161c66e22cc16134b85b6d4b928a218a32
 EBUILD emacs-common-gentoo-1.0.ebuild 3509 RMD160 c7354f24d8be75d5fbfe8430935ab25416bb659c SHA1 ea088c168918168c2094b86a965fe2a7d1d46054 SHA256 034f89121bf6fd9c296704fb59815ab1d1a2f95440d89eb0813ad70808ef58e6
-MISC ChangeLog 5330 RMD160 2c9d018d01b33e5b47b7ff840d0802118738aa65 SHA1 9cad4dfffa6735bf733f70edd1e32bea2928689b SHA256 9eb29b9864ad0a5879422d6a73b3491ccc6cd99a159a21b41a3bee086e1d9258
-MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
+EBUILD emacs-common-gentoo-1.1.ebuild 3954 RMD160 487384036d2e9e91a7f24685df065aad2b9ff5f3 SHA1 5e016c83f4bab3bd98c564678a7376b22e00886a SHA256 cd306f828faa03a16511de7958a823dee16e46e613f228bbdc9cb1893f5c71fd
+MISC ChangeLog 5537 RMD160 5751a0172d412b5bb065db9e6f9ce400d63de6b4 SHA1 03aac45881b9932a62c677cdf2d1d9ca59ebf018 SHA256 c24593a180741be88994f2f9c3af22928c231c5bd2c451b56c9a86c2a647cb0c
+MISC metadata.xml 235 RMD160 ce490aa2edb4e105063e20d4aeb7146a7d02f636 SHA1 e4c16f2e41d467b079a7f70ee0b3b2ac42799fc3 SHA256 7f2c9480b2a1dc4ac18ea5f96b0a003d5064168f1b5e17956b04eaaca5cc2774
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAknk0AsACgkQOeoy/oIi7uzY9ACfb/tHRj6BpzDODpA10MDSSF61
-ikMAn3kiemxbYYPw1ZB0dd+6OhnL86BX
-=mm9M
+iEYEARECAAYFAknvpRgACgkQOeoy/oIi7uxVdgCgkdeXz5kndlR07gZMPrsFDJNz
+nkEAnRZC71CVl2rUYmfb63VO1zMKKFUq
+=NwW7
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.1.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.1.ebuild
new file mode 100644
index 000000000000..f46446f2b4ec
--- /dev/null
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.1.ebuild
@@ -0,0 +1,134 @@
+# 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.1.ebuild,v 1.1 2009/04/22 23:14:03 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 X? ( emacs23icons? ( GPL-3 ) )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="X emacs23icons"
+
+PDEPEND="virtual/emacs"
+
+pkg_setup() {
+	if [ -e "${ROOT}${SITELISP}/subdirs.el" ] \
+		&& ! has_version ">=${CATEGORY}/${PN}-1"
+	then
+		ewarn "Removing orphan subdirs.el (installed by old Emacs ebuilds)"
+		rm -f "${ROOT}${SITELISP}/subdirs.el"
+	fi
+
+	NEW_INSTALL=""
+	has_version ${CATEGORY}/${PN} || NEW_INSTALL="true"
+}
+
+src_install() {
+	elisp-install . subdirs.el || die
+
+	if use X; then
+		local i
+		domenu emacs.desktop emacsclient.desktop || die
+		newicon icons/sink.png emacs-sink.png || die
+		if use emacs23icons; then
+			newicon icons/emacs23_48.png emacs.png || die
+			for i in 16 24 32 48 128; do
+				insinto /usr/share/icons/hicolor/${i}x${i}/apps
+				newins icons/emacs23_${i}.png emacs.png || die
+			done
+			insinto /usr/share/icons/hicolor/scalable/apps
+			newins icons/emacs23.svg emacs.svg || die
+		else
+			newicon icons/emacs_48.png emacs.png || die
+			for i in 16 24 32 48; do
+				insinto /usr/share/icons/hicolor/${i}x${i}/apps
+				newins icons/emacs_${i}.png emacs.png || die
+			done
+		fi
+		gnome2_icon_savelist
+	fi
+}
+
+make-site-start() {
+	ebegin "Creating default ${SITELISP}/site-start.el"
+	cat <<-EOF >"${T}/site-start.el"
+	;;; site-start.el			-*- no-byte-compile: t -*-
+
+	;;; Commentary:
+	;; This default site startup file for Emacs 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
+
+	# make sure that site-gentoo.el exists since site-start.el requires it
+	elisp-site-regen
+
+	if [ ! -e "${ROOT}${SITELISP}/site-start.el" ]; then
+		local line
+		echo
+		while read line; do elog "${line:- }"; done <<-EOF
+		All site initialisation for Gentoo-installed packages is added to
+		/usr/share/emacs/site-lisp/site-gentoo.el. In order for this site
+		initialisation to be loaded for all users automatically, a default
+		site-start.el is created in the same directory. You are responsible
+		for all further maintenance of this file.
+
+		Alternatively, individual users can add the following command:
+
+		(require 'site-gentoo)
+
+		to their ~/.emacs initialisation files, or, for greater flexibility,
+		users may load single package-specific initialisation files from
+		/usr/share/emacs/site-lisp/site-gentoo.d/.
+		EOF
+		echo
+
+		if [ "${NEW_INSTALL}" ]; then
+			# This is a new install. Create default site-start.el, so that
+			# Gentoo packages will work.
+			make-site-start
+		else
+			# This package was already installed, but site-start.el does
+			# not exist. Give a hint how to (re-)create it.
+			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
+}
diff --git a/app-emacs/emacs-common-gentoo/metadata.xml b/app-emacs/emacs-common-gentoo/metadata.xml
index bc306fe58224..e798a7238eee 100644
--- a/app-emacs/emacs-common-gentoo/metadata.xml
+++ b/app-emacs/emacs-common-gentoo/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>emacs</herd>
+<use>
+  <flag name='emacs23icons'>Install Emacs 23 style icons</flag>
+</use>
 </pkgmetadata>