Version bump. Emacs 23 style icons are default now.

(Portage version: 2.2_rc36/cvs/Linux i686)

3 files changed, 19 insertions, 12 deletions

diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog
index 05e1897fb8c5..4267996ed4db 100644
--- a/app-emacs/emacs-common-gentoo/ChangeLog
+++ b/app-emacs/emacs-common-gentoo/ChangeLog
@@ -1,6 +1,13 @@
 # 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.15 2009/04/22 23:14:03 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.16 2009/08/09 07:27:13 ulm Exp $
+
+*emacs-common-gentoo-1.2 (08 Aug 2009)
+
+  08 Aug 2009; Ulrich Mueller <ulm@gentoo.org>
+  -emacs-common-gentoo-1.1.ebuild, +emacs-common-gentoo-1.2.ebuild,
+  metadata.xml:
+  Version bump. Emacs 23 style icons are default now.
 
 *emacs-common-gentoo-1.1 (23 Apr 2009)
 
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.1.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.2.ebuild
index f46446f2b4ec..65d69fe67dd4 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.1.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.2.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.2.ebuild,v 1.1 2009/08/09 07:27:13 ulm Exp $
 
 inherit elisp-common eutils fdo-mime gnome2-utils
 
@@ -8,10 +8,10 @@ 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 ) )"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="X emacs23icons"
+IUSE="X emacs22icons"
 
 PDEPEND="virtual/emacs"
 
@@ -34,20 +34,20 @@ src_install() {
 		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
+		if use emacs22icons; then
+			newicon icons/emacs22_48.png emacs.png || die
+			for i in 16 24 32 48; do
 				insinto /usr/share/icons/hicolor/${i}x${i}/apps
-				newins icons/emacs23_${i}.png emacs.png || die
+				newins icons/emacs22_${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
+			for i in 16 24 32 48 128; do
 				insinto /usr/share/icons/hicolor/${i}x${i}/apps
 				newins icons/emacs_${i}.png emacs.png || die
 			done
+			insinto /usr/share/icons/hicolor/scalable/apps
+			doins icons/emacs.svg || die
 		fi
 		gnome2_icon_savelist
 	fi
diff --git a/app-emacs/emacs-common-gentoo/metadata.xml b/app-emacs/emacs-common-gentoo/metadata.xml
index e798a7238eee..ed0de1c76357 100644
--- a/app-emacs/emacs-common-gentoo/metadata.xml
+++ b/app-emacs/emacs-common-gentoo/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>emacs</herd>
 <use>
-  <flag name='emacs23icons'>Install Emacs 23 style icons</flag>
+  <flag name='emacs22icons'>Install Emacs 22 style icons</flag>
 </use>
 </pkgmetadata>