diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2015-02-21 21:38:08 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2015-02-21 21:38:08 +0000 |
| commit | c2a5f1ec919800510aefc93f14d3c58dbda92ae6 (patch) | |
| tree | effe60a7b6f914ec71d1610a5235df6364e787bb /app-editors/emacs | |
| parent | New package, dependency of dev-perl/MongoDB (diff) | |
| download | gentoo-2-c2a5f1ec919800510aefc93f14d3c58dbda92ae6.tar.gz gentoo-2-c2a5f1ec919800510aefc93f14d3c58dbda92ae6.tar.bz2 gentoo-2-c2a5f1ec919800510aefc93f14d3c58dbda92ae6.zip | |
Partially revert previous commit and return to >= dependencies
on emacs-common-gentoo, in order to avoid blockers between slots.
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Diffstat (limited to 'app-editors/emacs')
| -rw-r--r-- | app-editors/emacs/ChangeLog | 5 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-23.4-r11.ebuild | 4 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-24.3-r6.ebuild | 4 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-24.4-r1.ebuild | 4 |
4 files changed, 8 insertions, 9 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index 6e193ce91dd5..13b6d8a3af00 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -1,12 +1,11 @@ # ChangeLog for app-editors/emacs # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.655 2015/02/21 08:47:49 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.656 2015/02/21 21:38:08 ulm Exp $ *emacs-24.4-r3 (21 Feb 2015) *emacs-23.4-r12 (21 Feb 2015) - 21 Feb 2015; Ulrich Müller <ulm@gentoo.org> emacs-23.4-r11.ebuild, - +emacs-23.4-r12.ebuild, emacs-24.3-r6.ebuild, emacs-24.4-r1.ebuild, + 21 Feb 2015; Ulrich Müller <ulm@gentoo.org> +emacs-23.4-r12.ebuild, -emacs-24.4-r2.ebuild, +emacs-24.4-r3.ebuild: Follow QA policy for game state directory, bug 537580. diff --git a/app-editors/emacs/emacs-23.4-r11.ebuild b/app-editors/emacs/emacs-23.4-r11.ebuild index f18c09d2776f..06c852ea0ffe 100644 --- a/app-editors/emacs/emacs-23.4-r11.ebuild +++ b/app-editors/emacs/emacs-23.4-r11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r11.ebuild,v 1.16 2015/02/21 08:47:49 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r11.ebuild,v 1.17 2015/02/21 21:38:08 ulm Exp $ EAPI=5 WANT_AUTOMAKE="none" @@ -20,7 +20,7 @@ REQUIRED_USE="?? ( aqua X )" RDEPEND="sys-libs/ncurses >=app-admin/eselect-emacs-1.16 - =app-emacs/emacs-common-gentoo-1.4-r1[games?,X?] + >=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?] net-libs/liblockfile hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) diff --git a/app-editors/emacs/emacs-24.3-r6.ebuild b/app-editors/emacs/emacs-24.3-r6.ebuild index b1bb56fbb92b..e121b09f5601 100644 --- a/app-editors/emacs/emacs-24.3-r6.ebuild +++ b/app-editors/emacs/emacs-24.3-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.3-r6.ebuild,v 1.14 2015/02/21 08:47:49 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.3-r6.ebuild,v 1.15 2015/02/21 21:38:08 ulm Exp $ EAPI=5 @@ -19,7 +19,7 @@ REQUIRED_USE="?? ( aqua X )" RDEPEND="sys-libs/ncurses >=app-admin/eselect-emacs-1.16 - =app-emacs/emacs-common-gentoo-1.4-r1[games?,X?] + >=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?] net-libs/liblockfile hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) diff --git a/app-editors/emacs/emacs-24.4-r1.ebuild b/app-editors/emacs/emacs-24.4-r1.ebuild index 7fc992b70381..41879abba4e6 100644 --- a/app-editors/emacs/emacs-24.4-r1.ebuild +++ b/app-editors/emacs/emacs-24.4-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.4-r1.ebuild,v 1.8 2015/02/21 08:47:49 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.4-r1.ebuild,v 1.9 2015/02/21 21:38:08 ulm Exp $ EAPI=5 @@ -19,7 +19,7 @@ REQUIRED_USE="?? ( aqua X )" RDEPEND="sys-libs/ncurses >=app-admin/eselect-emacs-1.16 - =app-emacs/emacs-common-gentoo-1.4-r1[games?,X?] + >=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) |