Version bump. Specify LICENSE more precisely. Remove old.

Package-Manager: portage-2.1.11.58/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

4 files changed, 39 insertions, 34 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/Manifest b/app-emacs/emacs-daemon/Manifest
index 1168b3609d49..0f41b0c85afa 100644
--- a/app-emacs/emacs-daemon/Manifest
+++ b/app-emacs/emacs-daemon/Manifest
@@ -1,26 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST emacs-daemon-0.18.tar.bz2 5074 SHA256 6c5f32e71e220fe0bac089af1fda75b1412ff4902e08740d093bc79b7a75450c SHA512 d34b5c276760128f877ee8d50b45f4a37077a19d80611512e47911ba37c4f62d81042fc26f8e824a2ca2b42a0b171d03bcfdc35550f07298a64aaadd0569086a WHIRLPOOL f04836958a044f2af35d926d4c628120b0b674bfe87e47d171eb310fcdf500313ac1e86a41ebcd33c33ea911a0883a55258731972c78ab575ba6736780bbae8e
 DIST emacs-daemon-0.19.tar.bz2 4988 SHA256 63231c4c0d04310eeeb432d33d195b620b5b8308aecfdb93825df0c4acc4a341 SHA512 f1684387f3018f1dcb2d9d600a4155ce7980264e817aff762a49b04ac0b01fe6ab68bb702694a9eba28770c4eaadbc1a02ef570270eb5b8369c789c7fc60370a WHIRLPOOL ec18ebae334e1da36aa79a0542cb3563962e5542fdaba72f667adc9831406ad8ac99dddf5ec649127eaff8d67890d3c8f6acdd32a79f33c27e8554157674ef59
-EBUILD emacs-daemon-0.18.ebuild 1718 SHA256 eaa1fe3e6d89f857815148a6b7abf59b07801b9cb78b1fc149a40a57ac6d66dd SHA512 f7fff430b28d5690c16e25c43b10e0bb098fac3775025cc1c666c666897b2efe54e9b442d01275060653a9b2f85b7748e0de995c5c9053739443628b71b84071 WHIRLPOOL 48e9cf9c05916a3c9a1aaf339c922250725009c405ab51d4f1bd3dd73258614501d7f53352f45a45a8d5b4750b7e0f6f60b88a657bd3fa6a13a6f690693d8db0
-EBUILD emacs-daemon-0.19.ebuild 1738 SHA256 12286a433588223b71c017b7bd0adc8c82d2eb14bb497e5e9e20dce845dfcf60 SHA512 828b0561a14003e9b31fe10aee7899aa99dcafe00210cf3258f8ec3ee7daaf384738947fc2de4d224c9950f64a1999ab415623e66859e1d369f9f2d79738dd9f WHIRLPOOL 32173a08c7b70a29480add6c5caaf005cbeef920dbcd126e7466c54e0e21eab39dd618b0affbdca4b838518ceb22f1eaa1c5834c5df265667c532e36cfb3f1ea
-MISC ChangeLog 7125 SHA256 0663730d8e28b064ff3759a787e0a4aed731829cb4bc845f6e7d0db08fd7c336 SHA512 2881a7376192aea49edf8eb0892fbf0b2cfaf2e1e43e3467a4412ae3d2a36b01853c99f28683fe9e3176872e9eeaea22afa61fc71cab38396a4ee072cb527851 WHIRLPOOL 9768c74a17133a76a3668b31126f3bfea451f0cb8c7ab1fd0ca9bcb2f1c0f1230c424912a5d7d22775e6699ef871b41f3ec51d64260b3bb42c877373ba51cb47
+DIST emacs-daemon-0.20.tar.xz 5120 SHA256 5c0f0bc9a1fab391657737fc3b6af4088eff1ead2e05987fe50e02f5b6e50eb3 SHA512 ac1bfc543f38dd86aeef544a8d03aa2f2a6cb02ee2042ecb3f339baed98294deac1fc6d3d002e654f3d9f32f00379c4de40efa226ddd07715aee7fe0fcb41e43 WHIRLPOOL 5941c1ea18d238275aab312123eb598f3d3265f279674191a75bec6bfd6efeebadb20dc7e6db6454a9da10ed8e98b2916fad195741b4d5fddbb270528e040d63
+EBUILD emacs-daemon-0.19.ebuild 1736 SHA256 b81cb8c3bba074283cb019c33f3c1f3c16d6033670b371225efe6a479c476629 SHA512 968f226e3bcbcfc5a86760d4b87e5dd6113f9d882b1e4d5d0e062984be61a1bef3c409107084f8e94e0ece857af20ae27ee93a4df736e0c1e027665f1f431d3e WHIRLPOOL 033f24ffbfd313ff2f138f6f6e696bdb4137e30f65a6b971e13200696caa6346ea1d4b3fdf7b23c8eb15bedea421e3b3cb13ae4fe24b9ef5faacc5aa447c066d
+EBUILD emacs-daemon-0.20.ebuild 1769 SHA256 14c994bb7e5b2e902073a6ea00102243e3d80e21eb30c9c750940dcea1bea47c SHA512 176ba62a8be6b7ea385ec18e4d6cbfb2317022cdfda9a2f285cc2e0d6e4be9d9c78deb67f99972d55bf714b0d2cb1a224c84e07e9650838c6b6b74b9a884c69d WHIRLPOOL 2540b5105fd882c2fc43e7fb9b540ffdaffac856636d0255ec1e4af8a44222626241ed4328349727f5ff1a94454351c1a4de409b577417c75779b2982dea515a
+MISC ChangeLog 7347 SHA256 cf46bb7c9bb4f186e318b5ed9f1dd63576b2cfce688b100e5c19e7c8aff2f396 SHA512 83f68bf9b1f414f3d4dfefa49e925562dd0493f48a7c61ad41a99bb86051871804f1d540764842c7b874c0a98082d9762e2bb9c0d59e29b207b8188ea6316c17 WHIRLPOOL 27efe5b474b123272f781bd13029e8a9bba64c60d5afd76b461dfed9473968705456c2ba42c4fc92b584678d01663ef6254697478f5aa7033963bee77aa9811c
 MISC metadata.xml 158 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab SHA512 e55d75feae933ba948ae987305ea58e36f5880f18687e8acaf91237e33e251be3ecfd5be27048f4907ea6799e0bcf784b602096dd7e2bc9c450eb5e2bb6a73d2 WHIRLPOOL 1d1676172186235a3e99ca1d148298fb24f6a089f9b7908b3c28c246c8854969835fd3742b8b81e0a30b63d76ee0be0c42bfede2416a30dfc3c8b915a147340c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQbUBjAAoJEDYO1FT4VRUUAH0QAKMzEUMke/ws5+KeJfMcVqeX
-ISGkl6i5AFPbI6ULa8pZTT5EgJSUVI8N0rV13zBivxayTq5zhIkliLAi+z7woP1X
-6vuymfaW8hWf5HjGVfoVkbRGk9IQiNhHaN3wSoCvaboEBI8q+nYyYPWe0yyH0kMx
-eSmLy0QHieyd51SuJJR17ehVNrkSshlXCcaboi/7XOtPaGF7j/UmFNWd6p5IDJjW
-yJf3j5oxT/HcWUhRVPbYTI54+iwyba9yjFr8gPyGQLrBEBQrjriFzTrmGleroMkx
-CMUbw9D0RJ4ofxC7aeU0NcF9c7WTb+31eekWGR955/VtSYKB5EUEwwKXcKnfCxNN
-61SElHeSy6zBUucwm4CBqbABCeFmB7ovx37JYy5YJQ+Hby9UoMt9kTdaKAbuKHUH
-1w6q3y+ZS/DPVoZcpvH51fxL+bo3LdlJ/QLmDrNQu3+bXNbkfTvnH/yesadrWz9c
-8L+/sZmTFyU2g917ovsabOy4VAvRC/r1QCsWCEYAWVxqpzJn2X7RkPmUYcqaarY8
-HwIx9pm2FVt4ABjsiJBl9Y0AAjzl/zM59njU6BALfq3jXv0BwkU8JSrUMx+Qzopx
-fL6LV+eRNwQqWasGq6tDpikX/lysBtZMwjO/EgaiegUyBMU1dcdYYyrS09NOZm4S
-KRCUpIpf8IJOH07tsuzw
-=MBhi
+iQGcBAEBCAAGBQJRTif1AAoJEJQzkH1pP7W4vAcL/jmtDWtkjKrtb00NJUjYnbw7
+sL5BGHr3LLdMQZBkkbjIINnYh0bYh3mvuHJ9gn15d/kSSJ7KZvbJ4aGgRVuKDZ8U
+PhF1DG7n49qqm4cr+eOYJea9hIO5xXZgQsb96+8nzMwDgaghb9kmdINvkBEuaySt
+J6rfUzCk+ya6pYdt0P92Ez0R7njkchCi8QCOfF3FTpRUe5+hzrVAD564LR/IqBDW
+hP8HJLZx/rNJNlTO6X3dONULdFn/cxKWGM0IRZsk3fRqdhDzd2xyVfIrBCqDvNDA
+l6YI7wUYDz/jZtB1Wq/mIFGnQIwGsCh/bk/CuKIGfhZ1WPRQu+9PNmxN4aOWM36z
+0oMjkD5B+tY1qcmZKSvod2ef85lU2kke4sDpf9lMwIzsAx9WaabogRWSTouO0YPL
+y+EOYSKvpiUd8L5xw6nAgeyrSbltUYDtAPmWuHRiPdIaNY1SU6JUV2nh8Cf0CnW3
+NmcVXu8TgIxB/GFr8r07LEB+QHz7vYgiM5MUqh+ZgA==
+=pS/q
 -----END PGP SIGNATURE-----
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
 }