summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2012-03-25 11:21:25 +0000
committerUlrich Müller <ulm@gentoo.org>2012-03-25 11:21:25 +0000
commit946d91333d8d21b578dd73125915b15d4f4a31c3 (patch)
tree74cae7de04ab31558e8e7bde982b7a7ede049167 /app-emacs
parentBump to 1.16.12, thanks to slepnoga (diff)
downloadgentoo-2-946d91333d8d21b578dd73125915b15d4f4a31c3.tar.gz
gentoo-2-946d91333d8d21b578dd73125915b15d4f4a31c3.tar.bz2
gentoo-2-946d91333d8d21b578dd73125915b15d4f4a31c3.zip
Drop emacs22icons flag; always install all icons. Remove old cleanup code.
(Portage version: 2.1.10.51/cvs/Linux x86_64)
Diffstat (limited to 'app-emacs')
-rw-r--r--app-emacs/emacs-common-gentoo/ChangeLog8
-rw-r--r--app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r2.ebuild109
2 files changed, 116 insertions, 1 deletions
diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog
index 7e711e75adb6..6883bec92050 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.61 2012/03/15 22:19:29 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.62 2012/03/25 11:21:25 ulm Exp $
+
+*emacs-common-gentoo-1.3-r2 (25 Mar 2012)
+
+ 25 Mar 2012; Ulrich Müller <ulm@gentoo.org>
+ +emacs-common-gentoo-1.3-r2.ebuild:
+ Drop emacs22icons flag; always install all icons. Remove old cleanup code.
15 Mar 2012; Markus Meier <maekke@gentoo.org>
emacs-common-gentoo-1.3-r1.ebuild:
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r2.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r2.ebuild
new file mode 100644
index 000000000000..b8dfd267757b
--- /dev/null
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2012 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-r2.ebuild,v 1.1 2012/03/25 11:21:25 ulm Exp $
+
+EAPI=4
+
+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-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="X"
+
+PDEPEND="virtual/emacs"
+
+src_install() {
+ insinto "${SITELISP}"
+ doins subdirs.el
+
+ keepdir /etc/emacs
+ insinto /etc/emacs
+ doins site-start.el
+
+ if use X; then
+ local i
+ domenu emacs.desktop emacsclient.desktop || die
+
+ pushd icons
+ newicon sink.png emacs-sink.png || die
+ newicon emacs_48.png emacs.png || die
+ newicon emacs22_48.png emacs22.png || die
+ for i in 16 24 32 48 128; do
+ insinto /usr/share/icons/hicolor/${i}x${i}/apps
+ newins emacs_${i}.png emacs.png
+ [[ ${i} -ne 128 ]] && newins emacs22_${i}.png emacs22.png
+ done
+ insinto /usr/share/icons/hicolor/scalable/apps
+ doins emacs.svg
+ popd
+
+ gnome2_icon_savelist
+ fi
+}
+
+site-start-modified-p() {
+ case $(cksum <"${EROOT}${SITELISP}/site-start.el") in
+ # checksums of auto-generated site-start.el files
+ "2098727038 349") return 1 ;; # elisp-common.eclass
+ "3626264063 355") return 1 ;; # emacs-common-gentoo-1.0 (cvs rev 1.1)
+ "3738455534 394") return 1 ;; # emacs-common-gentoo-1.0 (cvs rev 1.6)
+ "4199862847 394") return 1 ;; # emacs-common-gentoo-1.1
+ "2547348044 394") return 1 ;; # emacs-common-gentoo-1.2
+ "2214952934 397") return 1 ;; # emacs-common-gentoo-1.2-r1
+ "3917799317 397") return 1 ;; # emacs-common-gentoo-1.2-r2
+ *) return 0 ;;
+ esac
+}
+
+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
+
+ local line
+ while read line; do elog "${line:- }"; done <<-EOF
+ All site initialisation for Gentoo-installed packages is added to
+ ${SITELISP}/site-gentoo.el. In order for this site
+ initialisation to be loaded for all users automatically, a default
+ site startup file /etc/emacs/site-start.el is installed. You are
+ responsible for 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
+ ${SITELISP}/site-gentoo.d/.
+ EOF
+
+ if [[ -e ${EROOT}${SITELISP}/site-start.el ]]; then
+ elog
+ ewarn "The location of the site startup file for Emacs has changed to"
+ ewarn "/etc/emacs/site-start.el."
+ if site-start-modified-p; then
+ ewarn "If your site-start.el file contains your own customisation,"
+ ewarn "you should move it to the new file. In any case, you should"
+ ewarn "remove the old ${SITELISP}/site-start.el file."
+ else
+ ewarn "Removing the old ${SITELISP}/site-start.el file."
+ rm -f "${EROOT}${SITELISP}/site-start.el"
+ fi
+ fi
+}
+
+pkg_postrm() {
+ if use X; then
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+ fi
+}