summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2015-01-28 13:06:34 +0000
committerUlrich Müller <ulm@gentoo.org>2015-01-28 13:06:34 +0000
commitdbec36aee0a077ad2b47a8452a1b6c7d17005fd0 (patch)
tree4d426409f629ad14330ea64854c92437e3570db4 /app-emacs/emacs-common-gentoo
parentbump (diff)
downloadgentoo-2-dbec36aee0a077ad2b47a8452a1b6c7d17005fd0.tar.gz
gentoo-2-dbec36aee0a077ad2b47a8452a1b6c7d17005fd0.tar.bz2
gentoo-2-dbec36aee0a077ad2b47a8452a1b6c7d17005fd0.zip
Use doicon/newicon helper functions.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Diffstat (limited to 'app-emacs/emacs-common-gentoo')
-rw-r--r--app-emacs/emacs-common-gentoo/ChangeLog8
-rw-r--r--app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.4-r1.ebuild23
2 files changed, 17 insertions, 14 deletions
diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog
index 9a74ca78b870..f5ba27eace10 100644
--- a/app-emacs/emacs-common-gentoo/ChangeLog
+++ b/app-emacs/emacs-common-gentoo/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-emacs/emacs-common-gentoo
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.109 2014/06/08 11:44:50 ulm Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.110 2015/01/28 13:06:34 ulm Exp $
+
+ 28 Jan 2015; Ulrich Müller <ulm@gentoo.org>
+ emacs-common-gentoo-1.4-r1.ebuild:
+ Use doicon/newicon helper functions.
08 Jun 2014; Ulrich Müller <ulm@gentoo.org> -emacs-common-gentoo-1.4.ebuild:
Remove old.
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.4-r1.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.4-r1.ebuild
index 6c2dc03736c6..9e2dc5af60dd 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.4-r1.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.4-r1.ebuild,v 1.10 2014/06/08 10:59:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.4-r1.ebuild,v 1.11 2015/01/28 13:06:34 ulm Exp $
EAPI=5
@@ -44,17 +44,17 @@ src_install() {
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
+ pushd icons || die
+ newicon sink.png emacs-sink.png
+ newicon emacs_48.png emacs.png
+ newicon emacs22_48.png emacs22.png
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
+ newicon -s ${i} emacs_${i}.png emacs.png
done
- insinto /usr/share/icons/hicolor/scalable/apps
- doins emacs.svg
+ for i in 16 24 32 48; do
+ newicon -s ${i} emacs22_${i}.png emacs22.png
+ done
+ doicon -s scalable emacs.svg
popd
gnome2_icon_savelist
@@ -132,7 +132,6 @@ pkg_postinst() {
fdo-mime_desktop_database_update
gnome2_icon_cache_update
fi
-
readme.gentoo_print_elog
}