summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2012-01-31 01:53:59 +0000
committerUlrich Müller <ulm@gentoo.org>2012-01-31 01:53:59 +0000
commit5f798ed05f0159da7d31f9b2c50c27906883312c (patch)
tree7f6891be931d02e77d0ad7a748c89849ba303702 /app-editors/emacs
parentVersion bump for beta channel release. (diff)
downloadgentoo-2-5f798ed05f0159da7d31f9b2c50c27906883312c.tar.gz
gentoo-2-5f798ed05f0159da7d31f9b2c50c27906883312c.tar.bz2
gentoo-2-5f798ed05f0159da7d31f9b2c50c27906883312c.zip
Fix infinite loop in xg_select() with glib >= 2.31, bug 401199; thanks to
Maciej Piechotka <uzytkownik2@gmail.com>. Remove release candidate. (Portage version: 2.1.10.44/cvs/Linux x86_64)
Diffstat (limited to 'app-editors/emacs')
-rw-r--r--app-editors/emacs/ChangeLog9
-rw-r--r--app-editors/emacs/emacs-23.4-r1.ebuild (renamed from app-editors/emacs/emacs-23.4_rc1.ebuild)6
2 files changed, 11 insertions, 4 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 576b9c5f75d0..6d2d3c68a8d9 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-editors/emacs
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.472 2012/01/28 12:00:53 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.473 2012/01/31 01:53:59 ulm Exp $
+
+*emacs-23.4-r1 (30 Jan 2012)
+
+ 30 Jan 2012; Ulrich Müller <ulm@gentoo.org> -emacs-23.4_rc1.ebuild,
+ +emacs-23.4-r1.ebuild:
+ Fix infinite loop in xg_select() with glib >= 2.31, bug 401199; thanks to
+ Maciej Piechotka <uzytkownik2@gmail.com>. Remove release candidate.
*emacs-23.4 (28 Jan 2012)
diff --git a/app-editors/emacs/emacs-23.4_rc1.ebuild b/app-editors/emacs/emacs-23.4-r1.ebuild
index 5526781f8cdf..ba01216537d5 100644
--- a/app-editors/emacs/emacs-23.4_rc1.ebuild
+++ b/app-editors/emacs/emacs-23.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4_rc1.ebuild,v 1.2 2012/01/28 10:54:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r1.ebuild,v 1.1 2012/01/31 01:53:59 ulm Exp $
EAPI=4
WANT_AUTOMAKE="none"
@@ -9,8 +9,8 @@ inherit autotools elisp-common eutils flag-o-matic multilib
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
HOMEPAGE="http://www.gnu.org/software/emacs/"
-SRC_URI="ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${PV/_/}.tar.gz
- mirror://gentoo/${PN}-${PV%%_*}-patches-1.tar.bz2"
+SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
+ mirror://gentoo/${P}-patches-2.tar.bz2"
LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
SLOT="23"