Remove old. Remove unused USE flag description for emacs22icons in metadata.

Package-Manager: portage-2.1.11.12-r1/cvs/Linux x86_64

4 files changed, 20 insertions, 128 deletions

diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog
index 2509dd78829f..2211bbb169f4 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.80 2012/09/02 17:55:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.81 2012/09/02 18:27:16 ulm Exp $
+
+  02 Sep 2012; Ulrich Müller <ulm@gentoo.org>
+  -emacs-common-gentoo-1.3-r1.ebuild, metadata.xml:
+  Remove old. Remove unused USE flag description for emacs22icons in metadata.
 
   02 Sep 2012; Raúl Porcel <armin76@gentoo.org>
   emacs-common-gentoo-1.3-r3.ebuild:
diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
index 6bee3c5f9bf3..4cce6f1788fd 100644
--- a/app-emacs/emacs-common-gentoo/Manifest
+++ b/app-emacs/emacs-common-gentoo/Manifest
@@ -2,14 +2,23 @@
 Hash: SHA256
 
 DIST emacs-common-gentoo-1.3.tar.gz 46819 SHA256 c874088b1d9833432e1da9c3e3f79e7891cb3af41bcdecb02aa299d207c0218d SHA512 32682ac7e78d42026bd3a7f3e7b7d9be382f1394b8a422f0a4a36c75eb40167432a83e6fef8283d158055c1843f8bf0cbf14a82f1bbb54e2a93cbbc7394d2d8f WHIRLPOOL 3c8b592d486e5950b2ec2bbabcf63e11510c11fa9918992e96efe1b5f5569a0ee8a255fd1af39e42996e3c08fe22f76632451206c2dec363cce049af22578c63
-EBUILD emacs-common-gentoo-1.3-r1.ebuild 3729 SHA256 7429d7d9af1f2dff7dae46b7eaeab53c8428e3c7c349da50c61124d0065bbcac SHA512 7d8256cb7c13912a9caa69d65bf65f7827856e0a32c9797c99bbf58f4e18c25224140046cb5ed92f7e6615f0e68efa23f9f4dda81964f97b97282118b47036b8 WHIRLPOOL 8baddeddd878bcd569c3f5c85f3d14c5a349d28910e3c0bfe11f038c2b3c4b945bafa136cbcbcef032955158a1ac327cdca61ce046a2fe895abab3a88882a499
 EBUILD emacs-common-gentoo-1.3-r3.ebuild 4034 SHA256 a144f60b6fb24f599946190cc388a367605232d167ce376061c512bcc3c392a1 SHA512 01447fc97ae0382131aa56829a084d2222afe03c7df47c964bd3f1ea6727a8b39198bfa64e218e514da144b48edb7132d1863ae7f4601f581b34e91176d2525a WHIRLPOOL a7f000ed42e987c3bc8b8788273126f5d8826bc6e9fc00523cbb7ce6f8db2b99c28906d4152df4b0d05e531234db7c16505f7a9ce9b1fbe3b7778a634228dc24
-MISC ChangeLog 14034 SHA256 d6d9bc9fbfc9a1416f9fda52771223c5f768b5d5266b5d90af42d4331d717235 SHA512 b3954065a6a194811370a92e5d4b9253e19c68cd6d029a7cf8aa48d7fe0e583245cbec85352a0740173808ad3a58c74fa34befd26aed9571816b47ebc2e9ac78 WHIRLPOOL 265e5e0eb3349c5acb372e43ddb3d1c9313ba91f77131a4b6e702273735005bc8f0a1684dedcbe2674baa30dadd1a603186ccdec2a8c970400f12af668633510
-MISC metadata.xml 300 SHA256 3db1ca77aa19677da4be7526f7667fa5d2fbd9aba96b6a0d590f9c3084bda3a8 SHA512 4cb43994b0e53ba29a128af254d72833de244747de122dbdde6b176e2d0b427528e7510c6dc5516220440096240bc3e5740b67d244b7d5d6d1371ffc788fd3d0 WHIRLPOOL 13d6d605cf2ebcc96c1ab66186a046e9a2f0049bbb93bcd581fce0657ec084eaac14575b0c899dea3d1f61e14d2224be86102a00f57430b3b5b1f089c918c15e
+MISC ChangeLog 14209 SHA256 74f515bf904e48bce5a78b89dc5f0371dfdf959d3ba5c0402aa278b959eef411 SHA512 67529924e141ae65d08a57852e4dd44f28525a0b47e2fa0b8519d0f326768279d8f3816634537f4729197adbb3e2e5bb3994567870c57e228d9b98a92d13c1c2 WHIRLPOOL c7122ba6dff56f4993044c07af00ef758f4b374f7dc34018111169ca3b9442619ea3cc14aafc0f15b8fe58fe0996b6983a684d8f17fc722f24bd93bb54a7fe4b
+MISC metadata.xml 236 SHA256 f0b6df93ac83810a22d1519f0b37ee94996d1512c4fe4407df6fbb27f4da6608 SHA512 beb19666e6ea1a04718133d41e61ee7e7604ae0e614f979c66835f10fcd8b8e908a136a67397b212bcbb3e67d9bda458d561da228998cd9b616cd4a8bff6a989 WHIRLPOOL 099d599d015c0835bf2ed4780df6609ed0bf407c8cef5278f35fab89ccc6b9b2d98d48833aac8ef3243633dc33206eb155851cf570c980e96dc259d1e0416759
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBDnZMACgkQuQc30/atMkAUFQCgvjMY+jsehqKSUrOuUQLST8bl
-KL8An1B1RF+H8DlTX2xegrGtzqlxS4WO
-=oPad
+iQIcBAEBCAAGBQJQQ6bhAAoJEDxpGckxwJCB7bUP/0Wp1g9M8dKxqD2go6xfyknJ
+jM0CVIzRhsFh62LdEmOkuU1Od+evt4rstZyLxGPeteXz41yLknnDFX9yJwsSDGcR
+UamLDbf64p6DaFHhTTfW8tkkzDjknqcmO3LRwyvwF9o/EkYQF0MdaWMglpBLCpoz
+VFcb3PJWAquIJAQGSqSaWpigVJlEx+a/1sM7/817B/V0kVHXRwhZhC1iNMHc8KZk
+6+wbpc7O3wdvuyLoVPttMxXWz54YCqQthPelW84rVBeLME4uTA4tlTaxyIlfiUpn
+Y59eP4cl37mTfCZYoRp8uQ8ZBDVuGdpswzc4VERXDbcRpFU8p/EJ/745W/66bofs
+YhEwveisxCPzlfjR38BpHypte4uYdZOmorBOlr800aqfqIdezhzZ6xPD5xjAaeF8
+cJTwmrW/KjagySIC8KzMM8vWZL1sr/MZ85fPSO5PT8wL+xN5ZBdC8/Rt036et/dl
+NvsrbUhGylXf2lMUbWXiylK/Ulorf3yuruBe3H0i2GKdIoELO+2z/MherUkHvQRu
+iAChm1Ck4ua3YsrWan88e98oEIzltRrU7Mh11YeBVNnIjaA3K6gBXPNalr/FPgfu
++SxrczvwIw6tAVRK0DIUi1XaTcnnC4YFNvVFgVbq1KOKg0/4V/DYUTFfhbhSJ7dl
+gD8BCJDPXuwCAu5mPN+Y
+=3a3z
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r1.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r1.ebuild
deleted file mode 100644
index 45e46240310b..000000000000
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# 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-r1.ebuild,v 1.10 2012/06/01 17:29:50 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 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="X emacs22icons"
-
-PDEPEND="virtual/emacs"
-
-pkg_setup() {
-	if [[ -e ${EROOT}${SITELISP}/subdirs.el ]] \
-		&& ! has_version ">=${CATEGORY}/${PN}-1"
-	then
-		ewarn "Removing orphan subdirs.el (installed by old Emacs ebuilds)"
-		rm -f "${EROOT}${SITELISP}/subdirs.el"
-	fi
-}
-
-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
-		newicon icons/sink.png emacs-sink.png || die
-		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/emacs22_${i}.png emacs.png
-			done
-		else
-			newicon icons/emacs_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/emacs_${i}.png emacs.png
-			done
-			insinto /usr/share/icons/hicolor/scalable/apps
-			doins icons/emacs.svg
-		fi
-		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
-}
diff --git a/app-emacs/emacs-common-gentoo/metadata.xml b/app-emacs/emacs-common-gentoo/metadata.xml
index 6a6e04f295d0..dce592051146 100644
--- a/app-emacs/emacs-common-gentoo/metadata.xml
+++ b/app-emacs/emacs-common-gentoo/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 <herd>emacs</herd>
 <use>
-  <flag name='emacs22icons'>Install Emacs 22 style icons</flag>
   <flag name='games'>Support shared score files for games</flag>
 </use>
 </pkgmetadata>