Version bump. Emacs 23 style icons are default now.

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

4 files changed, 26 insertions, 19 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/Manifest b/app-emacs/emacs-common-gentoo/Manifest
index e5fdbcf7738c..b2e9398b7d4c 100644
--- a/app-emacs/emacs-common-gentoo/Manifest
+++ b/app-emacs/emacs-common-gentoo/Manifest
@@ -2,15 +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
+DIST emacs-common-gentoo-1.2.tar.gz 46622 RMD160 88c923d05286b53687e1099294fb579a2f4f5d39 SHA1 4712b6186d4620aaa5258236367d3228f515f341 SHA256 d15f9654214b10e9efc9e38fe45b4e08c3f0cc1c975de34058e4d360d3053108
 EBUILD emacs-common-gentoo-1.0.ebuild 3509 RMD160 c7354f24d8be75d5fbfe8430935ab25416bb659c SHA1 ea088c168918168c2094b86a965fe2a7d1d46054 SHA256 034f89121bf6fd9c296704fb59815ab1d1a2f95440d89eb0813ad70808ef58e6
-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
+EBUILD emacs-common-gentoo-1.2.ebuild 3910 RMD160 0995e898e50193e381227f4a40b19a7de64e804d SHA1 86e6506dfdd3a15fcc15b53b4a483edc73c1e1c4 SHA256 9284289d25254b3d436e4b61cf360f95665a89f0c5c5d5a8e7f68701e74bfe5f
+MISC ChangeLog 5763 RMD160 eaef8044ac629a0f206066889e2515668a5f2829 SHA1 23764772ccd2d133fd49ca0867bd44516cfc1729 SHA256 9cd7f6c334a440a6ddcf3638c40c9b76fa47b3c5071b388f6f560280473cfc2a
+MISC metadata.xml 235 RMD160 94ec7acf062c24ce7a5c9b98fff11c2a68baf269 SHA1 c948e0bb625876a97f14834fe5848367dda93628 SHA256 81f928a2ff996d91f098bc1d718adec61bbb6afa1f8e5f1b29f0931a73902ec1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAknvpRgACgkQOeoy/oIi7uxVdgCgkdeXz5kndlR07gZMPrsFDJNz
-nkEAnRZC71CVl2rUYmfb63VO1zMKKFUq
-=NwW7
+iEYEARECAAYFAkp+etQACgkQOeoy/oIi7uxIhQCfT1UDGzRPCWoLJW7yovMFnl0o
+UegAn09gUyNL4F+9vlwpqoQac9MaBJWR
+=xdGq
 -----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.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>