Force an update of the emacs symlink for the livecd/dvd.

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 5fed07d9f74d4f725580d29b826e55b4c6e5c368..c955ae897b17f8501d6dd4338bf6966ace2aa62e 100644 (file)
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.427 2011/08/22 19:14:43 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.428 2011/08/29 16:28:42 ulm Exp $
+
+  29 Aug 2011; Ulrich Mueller <ulm@gentoo.org> emacs-23.3-r1.ebuild,
+  emacs-23.3-r2.ebuild:
+  Force an update of the emacs symlink for the livecd/dvd.
 
 *emacs-23.3-r2 (22 Aug 2011)
 *emacs-22.3-r8 (22 Aug 2011)

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 445bdd722af9c2a85bbb1fa03a34548907c5c01c..57f6cb664e1aed440a20d70581b84fa952b41f3f 100644 (file)
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -17,14 +17,14 @@ EBUILD emacs-18.59-r6.ebuild 2736 RMD160 23d2b7c5cbf0deb8d76035a77fe803206581a81
 EBUILD emacs-21.4-r23.ebuild 5022 RMD160 b7ece01e4d6bd874b4f719682ec89ad02e92356b SHA1 9191514319e49ab2747df372089cba4e8a8a8b90 SHA256 59d12555ab365a0dba567d33fe7b816568de6a337cd02c6a756781c161b93f40
 EBUILD emacs-22.3-r8.ebuild 7874 RMD160 213faef35dfe75d32e0c325399302af10a5d810f SHA1 2d3cd24c7e9f5ff79e27daf11c337c8fddc3b041 SHA256 e6a2d9a214be37d16e342a4d56ef473db2076940270ac879073f781e4a9372e2
 EBUILD emacs-23.2-r2.ebuild 9169 RMD160 da42435c54872e15a786f36e586b39855b33686f SHA1 b84b1d60ba0f4f3a9aa8b1952aa3cfd40c731b1c SHA256 7dd8751820b59c7b6619e05d879263fe91a56269a74240daf9d6326e44a942e1
-EBUILD emacs-23.3-r1.ebuild 10085 RMD160 ff96e56c4d3d8afb46943e12e4881286156cf871 SHA1 bfdeddbd056794503f161f89ab9b5ca95c51fcea SHA256 39aaec6a093170f6948468886e5071e93476c1568d8444d7de80de141bc48ee5
-EBUILD emacs-23.3-r2.ebuild 10185 RMD160 297dbe741666bf172c08c0ee31f4405bd13c1860 SHA1 f35c6d32f9da3c201f1355e90dd0a264f06261e1 SHA256 1200a662784df381787e1e98cbe3b35c98091ea3b27bc591f902f5effceff926
-MISC ChangeLog 61006 RMD160 48b82cb76c9025523b60761482c14375c3b2fe5b SHA1 a6451a77bac6de0c52ee1f20bead26bc913df544 SHA256 580344d5e2579c15392011e92c74428484686bfb6a2b3db6eb04b313248c0a38
+EBUILD emacs-23.3-r1.ebuild 10269 RMD160 4a384f15d098757c99f15d0592a49d2415b9d2f5 SHA1 5c1a2259f4911c8e238a4cdcfe686998ecad7039 SHA256 8b50b0f54553270a1c71a948110fe0d101a2f11ffe847913d60abb4aa716130a
+EBUILD emacs-23.3-r2.ebuild 10369 RMD160 d59c64f42a5f2685188075a33f45ef01e3fc4825 SHA1 6bee94c8c0472db886db401ceb2643086aff0de3 SHA256 833abb40dbd83382f052d7b704adff0fd1fa4c3d79bbba2e2897c590056ebc7f
+MISC ChangeLog 61159 RMD160 d260548299c7a1f8d113ec29d25c35a4c57b055e SHA1 9b58c3b8002cd441ab73c2117a131623b392f5f0 SHA256 3c5a59a2514a1cb917e25c81db12295b4d77c2b3ebcfec2aeefb9c7fa81966b4
 MISC metadata.xml 1704 RMD160 efbac0e266304bf11ffb64c3cdfecac81e7ff177 SHA1 d12430143adab307f896d1c72c02ed40a8f62822 SHA256 22b564149011a32c17256ac39c2d6d49be01b52f9ddddeb82795ff9b66a46ed1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5SrBAACgkQOeoy/oIi7uzW4QCgmWCSTTEIuNwgVnywLYACVkNV
-UnEAn01J03Nsu7b5bkMBWJ3aNUmadupi
-=Y+cU
+iEYEARECAAYFAk5bv6UACgkQOeoy/oIi7uwgUwCfVOQBZG7t91ICqJ6ddoCa1XQO
+iPsAoOOurMYERBkiSMJoedyhxUi8ITai
+=1GN8
 -----END PGP SIGNATURE-----

diff --git a/app-editors/emacs/emacs-23.3-r1.ebuild b/app-editors/emacs/emacs-23.3-r1.ebuild
index 7054816b6804eca94608d1a1be696a3d8b6135cf..4e1e7ef8ae694c46755ee64262d97fd2dff72ec0 100644 (file)
--- a/app-editors/emacs/emacs-23.3-r1.ebuild
+++ b/app-editors/emacs/emacs-23.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r1.ebuild,v 1.1 2011/08/04 17:00:32 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r1.ebuild,v 1.2 2011/08/29 16:28:42 ulm Exp $
 
 EAPI=4
 WANT_AUTOMAKE="none"
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/emacs/${P}a.tar.bz2
 LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
 SLOT="23"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="alsa aqua dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
+IUSE="alsa aqua dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
 REQUIRED_USE="aqua? ( !X )"
 RESTRICT="strip"
 
@@ -289,7 +289,14 @@ pkg_postinst() {
        chown "${GAMES_USER_DED:-games}" "${EROOT}"/var/lib/games/emacs
 
        elisp-site-regen
-       eselect emacs update ifunset
+
+       if use livecd; then
+               # force an update of the emacs symlink for the livecd/dvd,
+               # because some microemacs packages set it with USE=livecd
+               eselect emacs update
+       else
+               eselect emacs update ifunset
+       fi
 
        if use X; then
                echo

diff --git a/app-editors/emacs/emacs-23.3-r2.ebuild b/app-editors/emacs/emacs-23.3-r2.ebuild
index 2e58656fdea9e93f2268725c480e0607262d7895..7254872021e6df48b80c0c70ea264c387e47d1c6 100644 (file)
--- a/app-editors/emacs/emacs-23.3-r2.ebuild
+++ b/app-editors/emacs/emacs-23.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r2.ebuild,v 1.1 2011/08/22 19:14:43 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r2.ebuild,v 1.2 2011/08/29 16:28:42 ulm Exp $
 
 EAPI=4
 WANT_AUTOMAKE="none"
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/emacs/${P}a.tar.bz2
 LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
 SLOT="23"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="alsa aqua dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
+IUSE="alsa aqua dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
 REQUIRED_USE="aqua? ( !X )"
 
 RDEPEND="sys-libs/ncurses
@@ -290,7 +290,14 @@ pkg_postinst() {
        chown "${GAMES_USER_DED:-games}" "${EROOT}"/var/lib/games/emacs
 
        elisp-site-regen
-       eselect emacs update ifunset
+
+       if use livecd; then
+               # force an update of the emacs symlink for the livecd/dvd,
+               # because some microemacs packages set it with USE=livecd
+               eselect emacs update
+       else
+               eselect emacs update ifunset
+       fi
 
        if use X; then
                echo