Version bump. Specify LICENSE more precisely. Remove old.

(Portage version: 2.1.11.58/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

3 files changed, 25 insertions, 17 deletions

diff --git a/app-emacs/emacs-daemon/ChangeLog b/app-emacs/emacs-daemon/ChangeLog
index b889fb71035e..38eb3f43f5e6 100644
--- a/app-emacs/emacs-daemon/ChangeLog
+++ b/app-emacs/emacs-daemon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/emacs-daemon
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-daemon/ChangeLog,v 1.58 2012/10/04 07:53:06 naota Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-daemon/ChangeLog,v 1.59 2013/03/23 22:08:32 ulm Exp $
+
+*emacs-daemon-0.20 (23 Mar 2013)
+
+  23 Mar 2013; Ulrich Müller <ulm@gentoo.org> -emacs-daemon-0.18.ebuild,
+  emacs-daemon-0.19.ebuild, +emacs-daemon-0.20.ebuild:
+  Version bump. Specify LICENSE more precisely. Remove old.
 
   04 Oct 2012;  <naota@gentoo.org> emacs-daemon-0.19.ebuild:
   Add ~x86-fbsd wrt bug #263222
diff --git a/app-emacs/emacs-daemon/emacs-daemon-0.19.ebuild b/app-emacs/emacs-daemon/emacs-daemon-0.19.ebuild
index b1a6164e39a9..a5af93bad1f9 100644
--- a/app-emacs/emacs-daemon/emacs-daemon-0.19.ebuild
+++ b/app-emacs/emacs-daemon/emacs-daemon-0.19.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-daemon/emacs-daemon-0.19.ebuild,v 1.9 2012/09/30 17:08:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-daemon/emacs-daemon-0.19.ebuild,v 1.10 2013/03/23 22:08:32 ulm Exp $
 
 inherit elisp
 
@@ -8,7 +8,7 @@ DESCRIPTION="Gentoo support for Emacs running as a server in the background"
 HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
diff --git a/app-emacs/emacs-daemon/emacs-daemon-0.18.ebuild b/app-emacs/emacs-daemon/emacs-daemon-0.20.ebuild
index 5983cdc0f6c2..76dfeaaf501d 100644
--- a/app-emacs/emacs-daemon/emacs-daemon-0.18.ebuild
+++ b/app-emacs/emacs-daemon/emacs-daemon-0.20.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-daemon/emacs-daemon-0.18.ebuild,v 1.9 2011/12/26 00:49:55 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-daemon/emacs-daemon-0.20.ebuild,v 1.1 2013/03/23 22:08:32 ulm Exp $
+
+EAPI=5
 
 inherit elisp
 
 DESCRIPTION="Gentoo support for Emacs running as a server in the background"
 HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 
 DEPEND=">=virtual/emacs-23"
 RDEPEND="${DEPEND}"
@@ -35,7 +36,8 @@ pkg_setup() {
 		bug in GTK+ that prevents Emacs from recovering from X disconnects:
 		<http://bugzilla.gnome.org/show_bug.cgi?id=85715>
 		If you run Emacs as a daemon, then it is strongly recommended that
-		you compile it with the Lucid toolkit, i.e. with USE="Xaw3d -gtk".
+		you compile it with the Motif or the Lucid toolkit instead, i.e.
+		with USE="motif -athena -gtk" or USE="athena -gtk -motif".
 		EOF
 	fi
 }
@@ -43,10 +45,10 @@ pkg_setup() {
 src_compile() { :; }
 
 src_install() {
-	newinitd emacs.rc emacs || die
-	newconfd emacs.conf emacs || die
+	newinitd emacs.rc emacs
+	newconfd emacs.conf emacs
 	exeinto /usr/libexec/emacs
-	doexe emacs-wrapper.sh emacs-stop.sh || die
-	elisp-site-file-install "${SITEFILE}" || die
-	dodoc README ChangeLog || die
+	doexe emacs-wrapper.sh emacs-stop.sh
+	elisp-site-file-install "${SITEFILE}"
+	dodoc README ChangeLog
 }