Fix license for stable too. Use portage KEYWORDS instead of x11 overlay KEYWORDS for new.

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

3 files changed, 10 insertions, 8 deletions

diff --git a/x11-libs/startup-notification/Manifest b/x11-libs/startup-notification/Manifest
index 7489e6c5d2e1..ede7617d5427 100644
--- a/x11-libs/startup-notification/Manifest
+++ b/x11-libs/startup-notification/Manifest
@@ -4,14 +4,14 @@ Hash: SHA256
 AUX startup-notification-0.10-tests.patch 408 RMD160 6a2d9310b3dabd4264a65ca22be718dc7688678f SHA1 07478c3408779e115df5aea3229259cc6985725e SHA256 379caf2a12757163179d5a490c6d1fe346f70a8db4f9b9af609aba28db1b8452
 DIST startup-notification-0.10.tar.gz 328787 RMD160 de905634db3263d24b69ae42887111b7ff95b3ba SHA1 670c5e44f59e3844e2ca0c67730ba9ca5f5228fc SHA256 64bbeb5c28619721fc19d6920ad2b8bf6c0dc3a0e96a1b0bc26f480fbc525459
 DIST startup-notification-0.10_p20110426.tar.xz 38192 RMD160 9bc696dcbc4d4bf02c014eceebc3a47dbba79650 SHA1 4ed0264c58770b665bcb20c2a335dbad19056e0c SHA256 6423719efaf076e0d1d30178ca47827b973d20d1828187f2fe505446f98c7f01
-EBUILD startup-notification-0.10.ebuild 1197 RMD160 7d5e37504b03c16527b75ee8d291e6f1ff721aa3 SHA1 d6d854e58be6e63a8bc061df149231d02c3b7d96 SHA256 670634be480824c6a94b315852349137e2d61753eb58a18c0475e1c5ba826fae
-EBUILD startup-notification-0.10_p20110426.ebuild 912 RMD160 27b3cf96a03779f0b0284de39ca2ca0d572223a6 SHA1 f214268d67009f8dfa1091b785dfb38846dc5da2 SHA256 2cf758c27e2931bde5e48e4f81a55de13be89067edab6abae36c90627ea3f59c
+EBUILD startup-notification-0.10.ebuild 1223 RMD160 cae34ecddc56633e0abd4de697caa3fcf8d84110 SHA1 ec937d29c9db88fca94d95637025e68013a81ca5 SHA256 b6d07f71d3fec538169d3579a834753cd79a1d8e6b80b5569bb6019d76fc8975
+EBUILD startup-notification-0.10_p20110426.ebuild 1115 RMD160 3cd2b3c3c7cece89f9528f758132430e4478048f SHA1 5f0750606d65ed502924fc6fe40d8ed02d86dbff SHA256 1e54056c69f10d74d9db5c175820637d474de24cf6f3209fcf21ec95b45f2805
 MISC ChangeLog 8392 RMD160 d143b0317ac2f858fc9b566c4c10024e89d73517 SHA1 66d92dbb5af2198fded22f983478f4e1084fede1 SHA256 224aeda1ea00f952710cb62a23c2c57b378cc1d0425a2b2efa4712da2d7bf474
 MISC metadata.xml 234 RMD160 bd496dac30573bf707591b2b2ad497860e5aa029 SHA1 4641c1e70e35e944e7019aeae967deb1d2c28186 SHA256 3018e3b31ed690a57bfc14e35699dd20ea3b352fc28b918f699e6955b57a2d97
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk22384ACgkQXkR9YqOcLPESqQD/VAlM6QBbBtPv6KxAKfNzkPM5
-//iD+rar66a4WwEyBM4BAIIbRy83sDRNSJ/kfKctmwzS0qWrVkxklWuUstHqmEfx
-=I/Wm
+iF4EAREIAAYFAk224D4ACgkQXkR9YqOcLPHP3gD8C5e/r7VimQbsECQ5XaHGCaYA
+YoJ1ASDWZ3mBal7CI48A/1dZDexiYc6JEATNghiB07pgY2avmxpOZRWhoENZjeKE
+=NvTH
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/startup-notification/startup-notification-0.10.ebuild b/x11-libs/startup-notification/startup-notification-0.10.ebuild
index ffc230cafe52..aa967b315045 100644
--- a/x11-libs/startup-notification/startup-notification-0.10.ebuild
+++ b/x11-libs/startup-notification/startup-notification-0.10.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/x11-libs/startup-notification/startup-notification-0.10.ebuild,v 1.12 2011/04/15 18:09:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/startup-notification/startup-notification-0.10.ebuild,v 1.13 2011/04/26 15:08:20 ssuominen Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -9,7 +9,7 @@ DESCRIPTION="Application startup notification and feedback library"
 HOMEPAGE="http://www.freedesktop.org/software/startup-notification"
 SRC_URI="http://freedesktop.org/software/${PN}/releases/${P}.tar.gz"
 
-LICENSE="LGPL-2 BSD"
+LICENSE="LGPL-2 MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
@@ -18,6 +18,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libSM
 	x11-libs/libICE
 	x11-libs/libxcb
+	<x11-libs/xcb-util-0.3.8
 	>=x11-libs/xcb-util-0.3"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
diff --git a/x11-libs/startup-notification/startup-notification-0.10_p20110426.ebuild b/x11-libs/startup-notification/startup-notification-0.10_p20110426.ebuild
index 48038d0f823e..17de44756cad 100644
--- a/x11-libs/startup-notification/startup-notification-0.10_p20110426.ebuild
+++ b/x11-libs/startup-notification/startup-notification-0.10_p20110426.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/x11-libs/startup-notification/startup-notification-0.10_p20110426.ebuild,v 1.1 2011/04/26 15:06:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/startup-notification/startup-notification-0.10_p20110426.ebuild,v 1.2 2011/04/26 15:08:20 ssuominen Exp $
 
 EAPI=4
 XORG_EAUTORECONF=yes
@@ -12,6 +12,7 @@ SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.xz"
 
 LICENSE="LGPL-2 MIT"
 SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""