bump to 2.20.2 and clean up old revisions

Package-Manager: portage-2.1.4_rc14

11 files changed, 34 insertions, 171 deletions

diff --git a/x11-wm/metacity/ChangeLog b/x11-wm/metacity/ChangeLog
index 2d3c1613b094..9e924b716162 100644
--- a/x11-wm/metacity/ChangeLog
+++ b/x11-wm/metacity/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/metacity
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.204 2007/11/29 05:22:56 jer Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.205 2008/01/09 22:48:58 eva Exp $
+
+*metacity-2.20.2 (09 Jan 2008)
+
+  09 Jan 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -metacity-2.14.5.ebuild, -metacity-2.16.3.ebuild, -metacity-2.16.8.ebuild,
+  -metacity-2.20.0.ebuild, +metacity-2.20.2.ebuild:
+  bump to 2.20.2 and clean up old releases
 
   29 Nov 2007; Jeroen Roovers <jer@gentoo.org> metacity-2.20.1.ebuild:
   Stable for HPPA (bug #199740).
diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest
index 70fffda723af..4b840f8f890b 100644
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -1,66 +1,42 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST metacity-2.14.5.tar.bz2 1851552 RMD160 46fcdde1801b58f092fca64c300f195ec1852125 SHA1 e46b27c04b3cadd710384e15db8e7cca32058093 SHA256 5b0fb8c9ca34493bb7922e28d81706df8d628b3ea0f83e34c4d1f967409a0ed2
-DIST metacity-2.16.3.tar.bz2 1833738 RMD160 e85e10199739e9c39d24a3a61365093bec010757 SHA1 326f73a945b0df0dbe3a80b210c011278cc73763 SHA256 3405b2d80c43e532dc6303652e1de182ce2b65001a56c61fc837b7cd04522153
-DIST metacity-2.16.8.tar.bz2 1893552 RMD160 92dc49df53fc04c2898a488c63a36d83607d0014 SHA1 2cf8bf391333ff48ade5aaf0db271853f48b4ef7 SHA256 62e74c9da42a501c6322044945f371b3d08ec81b52b06c05da43a80175d4306e
 DIST metacity-2.18.5.tar.bz2 1949393 RMD160 fe7b06c38124ed5caf9fccb3d416145a6251787d SHA1 77ab171c6b84a4235ee6819049e2f0c26a15a19f SHA256 e611746caa24138d96c48d9bd6b71005d3c893433fcaf1890d37aa0e7d13930d
-DIST metacity-2.20.0.tar.bz2 1882886 RMD160 1723f6c575cf71a65918e8c2c223d0a31723be9d SHA1 1d515a38678f5d26568e0479d5a363c5709357e4 SHA256 e07a68c1015b8e77879c5f7ac492b3b622afeaf95eaef06180e8f7387836f08d
 DIST metacity-2.20.1.tar.bz2 1880151 RMD160 dc1ba08bbe13249073766c02746d94d26ceadfb8 SHA1 55756426a69ea35a4c6b53180ed41fd583f20341 SHA256 11ab50586b2d89d00c1da2d35d1d8cbedfa73e2e500439d6f51d058e9c483a74
-EBUILD metacity-2.14.5.ebuild 1036 RMD160 4eb4d6007a62573f7ac295e4c01e7b462ae0b2df SHA1 937344a2377e9011e555be467980fa15c2361ce4 SHA256 8603fda6195f6d99fadc5ece84eb90bf4c117d2d28d7cade451bdad63bdfa439
-MD5 6590b28fdd31b0a9b7996682f51058f6 metacity-2.14.5.ebuild 1036
-RMD160 4eb4d6007a62573f7ac295e4c01e7b462ae0b2df metacity-2.14.5.ebuild 1036
-SHA256 8603fda6195f6d99fadc5ece84eb90bf4c117d2d28d7cade451bdad63bdfa439 metacity-2.14.5.ebuild 1036
-EBUILD metacity-2.16.3.ebuild 907 RMD160 f656ccccf9a82f5a86980a9aac28b99f8e11dcca SHA1 11484e7d61ec6d501863dd423632d1d549b8d281 SHA256 bb380e1f0011a0aac70a7eda480bc2d40c497c99a2aacbeb2b412d3c3ae1119d
-MD5 25ead842684dbe7a413f0f7152e83a12 metacity-2.16.3.ebuild 907
-RMD160 f656ccccf9a82f5a86980a9aac28b99f8e11dcca metacity-2.16.3.ebuild 907
-SHA256 bb380e1f0011a0aac70a7eda480bc2d40c497c99a2aacbeb2b412d3c3ae1119d metacity-2.16.3.ebuild 907
-EBUILD metacity-2.16.8.ebuild 917 RMD160 2d3dde1f21a293919b5188e45bd37877c49b4a62 SHA1 527f79d2d2a1dc07e27a6a4dd217205bd9fa49a4 SHA256 3e0c621710e8d4af026ece7f6b5b9a70c8c9683d277949bacb7db1aef3972748
-MD5 453555bcb71e2199acfeba772995fd86 metacity-2.16.8.ebuild 917
-RMD160 2d3dde1f21a293919b5188e45bd37877c49b4a62 metacity-2.16.8.ebuild 917
-SHA256 3e0c621710e8d4af026ece7f6b5b9a70c8c9683d277949bacb7db1aef3972748 metacity-2.16.8.ebuild 917
+DIST metacity-2.20.2.tar.bz2 2035610 RMD160 7b2478c1327a6ba04665bb42997fda79217b1e00 SHA1 04779d07627326040b48138dfffa07de2b88820c SHA256 69f292f92895bb4f915a0547e44b7682577f9c168aea3638ccfc4bba8bb6aabe
 EBUILD metacity-2.18.5.ebuild 907 RMD160 538e6885b77af67f8248fbb0d6d1d586aa26cf10 SHA1 e86db8654e2e10fd71514d2dd0740e9cb8d706a8 SHA256 e873cf89ccbb8f7f7e8d41a00fc6d8dc96b56192747db024998ca7c0b33d134b
 MD5 bc976dabe19bf01281b1175f37101e44 metacity-2.18.5.ebuild 907
 RMD160 538e6885b77af67f8248fbb0d6d1d586aa26cf10 metacity-2.18.5.ebuild 907
 SHA256 e873cf89ccbb8f7f7e8d41a00fc6d8dc96b56192747db024998ca7c0b33d134b metacity-2.18.5.ebuild 907
-EBUILD metacity-2.20.0.ebuild 958 RMD160 112c9db753b966303643a45918f556597a66012b SHA1 8d5228f72e527a4437e20ad05f1c31ba823431c5 SHA256 223b6db15be6b2aaa3eccd59339205368c6461eedfd16ad7557190a6fcfa136f
-MD5 4629d689297b992ef5638a7e0aaeb39c metacity-2.20.0.ebuild 958
-RMD160 112c9db753b966303643a45918f556597a66012b metacity-2.20.0.ebuild 958
-SHA256 223b6db15be6b2aaa3eccd59339205368c6461eedfd16ad7557190a6fcfa136f metacity-2.20.0.ebuild 958
 EBUILD metacity-2.20.1.ebuild 951 RMD160 74de39251105c00a0d71d78a60738eb52f6a0790 SHA1 8164b1fba672eba08ef856ee385468eab0156b47 SHA256 03ed5c9869b46599f4fdb62d90859663864b5d91e55c5d05016257bc6c3cb918
 MD5 c943c83e0cff6ef899c61f28c0b22435 metacity-2.20.1.ebuild 951
 RMD160 74de39251105c00a0d71d78a60738eb52f6a0790 metacity-2.20.1.ebuild 951
 SHA256 03ed5c9869b46599f4fdb62d90859663864b5d91e55c5d05016257bc6c3cb918 metacity-2.20.1.ebuild 951
-MISC ChangeLog 23068 RMD160 1f579edca9126fa41c015de39fa17d5281f2aa79 SHA1 d9c1a480b507cf6bfa7bf025c4feaec28875c5fe SHA256 0f8cf25e203ecde6b175d1bb2652b84302f24c083a1c481446dcd2ec8181417f
-MD5 61bbf2c14dd6091b0d52e8c5ee3fed31 ChangeLog 23068
-RMD160 1f579edca9126fa41c015de39fa17d5281f2aa79 ChangeLog 23068
-SHA256 0f8cf25e203ecde6b175d1bb2652b84302f24c083a1c481446dcd2ec8181417f ChangeLog 23068
+EBUILD metacity-2.20.2.ebuild 961 RMD160 a8182ce72959713d8aa345375d8f389ca2b56dbb SHA1 4503c67db48e43ea0d619692c55ce552e7f0d320 SHA256 99ca545a5e422d70626a4606d8105a342861468c5eff495290e67cf514671674
+MD5 3e2947947d0d854512dafa73dc78ee35 metacity-2.20.2.ebuild 961
+RMD160 a8182ce72959713d8aa345375d8f389ca2b56dbb metacity-2.20.2.ebuild 961
+SHA256 99ca545a5e422d70626a4606d8105a342861468c5eff495290e67cf514671674 metacity-2.20.2.ebuild 961
+MISC ChangeLog 23327 RMD160 fde8b12345d469b100d138432bdc382fd5c3aabf SHA1 cdc3788fe9816af04fcd887e55bee65a795203ad SHA256 9962724c17d182035d26145571a08af3e350e254b46c90917f6cb8aa10a84333
+MD5 df266509d733cdaa45dd2089115038d4 ChangeLog 23327
+RMD160 fde8b12345d469b100d138432bdc382fd5c3aabf ChangeLog 23327
+SHA256 9962724c17d182035d26145571a08af3e350e254b46c90917f6cb8aa10a84333 ChangeLog 23327
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
-MD5 8e6f796eba3d11cead323cd9ae2bbf60 files/digest-metacity-2.14.5 253
-RMD160 5a36f6c7a75e6457193e8e9db371d744e5bd06e3 files/digest-metacity-2.14.5 253
-SHA256 8764d2eedb1b221a97475efbcd611b393a970741701af5d004d351f377240b1f files/digest-metacity-2.14.5 253
-MD5 fef99a9f02b61fb5db3b747d958994a2 files/digest-metacity-2.16.3 253
-RMD160 2223e2c346ee7367ce7a3ddfe4fe0017787ba85f files/digest-metacity-2.16.3 253
-SHA256 396b81ba5a84840c2c2d5f0734a676a4b1e04752bfe912a79601740f9106a341 files/digest-metacity-2.16.3 253
-MD5 84ca08de7105426cf757f9357cd9cd32 files/digest-metacity-2.16.8 253
-RMD160 5a9965bdf037d5174405abc9c62173f9ba7f08a7 files/digest-metacity-2.16.8 253
-SHA256 7f066c467a5a05f351f8a6c151b7aed5f6ed9f002cc44bb9efaef6256c718456 files/digest-metacity-2.16.8 253
 MD5 e97ae1ee60441b3b273f682d6651524b files/digest-metacity-2.18.5 253
 RMD160 2a139a20bcd81ec2127d432bc474bb5c0ec334d3 files/digest-metacity-2.18.5 253
 SHA256 49a62f025ba3dd8d62d4dc4a674a47164451e66e3054704355d22530c6599a86 files/digest-metacity-2.18.5 253
-MD5 76f372fa55fc180d3f07cac101628ac1 files/digest-metacity-2.20.0 253
-RMD160 0db45b7b4cdd2ab9751a1d28ecf91c18fdba90dc files/digest-metacity-2.20.0 253
-SHA256 f42693d187dbbef7619fac6257849f6887b7dec71f3a93632ff4a5fb13b232c8 files/digest-metacity-2.20.0 253
 MD5 9129b7d1afa64cb716ff0eea1d6b58d7 files/digest-metacity-2.20.1 253
 RMD160 2a64ce63a093aa8959d2f3d98df53dd0853a44a0 files/digest-metacity-2.20.1 253
 SHA256 c91c6fd3f8aa1bb9845658048c08cb5c01012e71a48b0519fed4cfa1185190c2 files/digest-metacity-2.20.1 253
+MD5 8dcdc9da5595f54544166ef7a8c0e8e0 files/digest-metacity-2.20.2 253
+RMD160 3b815a0e0dd453a613b46cb99c3c4575981a0fd2 files/digest-metacity-2.20.2 253
+SHA256 f5a8af8205791e23f9c9e8ec13654127ec0f301a0761a0888c8332137c5cdf15 files/digest-metacity-2.20.2 253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFHXm3Qp/wUKkr7RBoRAjPnAKCI6qZDnuz0zzXVYiD29RTORxwIVQCgzhPR
-FFauWzxKet1nqDlKdb8FaOQ=
-=hbgS
+iEYEARECAAYFAkeFT14ACgkQ1fmVwcYIWAY4hgCgiwkS6AEQxdbMvy2sd5cUadze
+9xoAnR6+kbvOjb/kKaB7xBTXZxvySzKf
+=U4EX
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/metacity/files/digest-metacity-2.14.5 b/x11-wm/metacity/files/digest-metacity-2.14.5
deleted file mode 100644
index 7ebdec9cfc94..000000000000
--- a/x11-wm/metacity/files/digest-metacity-2.14.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a14c4a07e456a2590452d6c9db2e5153 metacity-2.14.5.tar.bz2 1851552
-RMD160 46fcdde1801b58f092fca64c300f195ec1852125 metacity-2.14.5.tar.bz2 1851552
-SHA256 5b0fb8c9ca34493bb7922e28d81706df8d628b3ea0f83e34c4d1f967409a0ed2 metacity-2.14.5.tar.bz2 1851552
diff --git a/x11-wm/metacity/files/digest-metacity-2.16.3 b/x11-wm/metacity/files/digest-metacity-2.16.3
deleted file mode 100644
index 8d710ac95d06..000000000000
--- a/x11-wm/metacity/files/digest-metacity-2.16.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 95bdf58d175284217132a12a353fe7ec metacity-2.16.3.tar.bz2 1833738
-RMD160 e85e10199739e9c39d24a3a61365093bec010757 metacity-2.16.3.tar.bz2 1833738
-SHA256 3405b2d80c43e532dc6303652e1de182ce2b65001a56c61fc837b7cd04522153 metacity-2.16.3.tar.bz2 1833738
diff --git a/x11-wm/metacity/files/digest-metacity-2.16.8 b/x11-wm/metacity/files/digest-metacity-2.16.8
deleted file mode 100644
index b245b186e68e..000000000000
--- a/x11-wm/metacity/files/digest-metacity-2.16.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f2f7dc2bae47c370686730134020cbbb metacity-2.16.8.tar.bz2 1893552
-RMD160 92dc49df53fc04c2898a488c63a36d83607d0014 metacity-2.16.8.tar.bz2 1893552
-SHA256 62e74c9da42a501c6322044945f371b3d08ec81b52b06c05da43a80175d4306e metacity-2.16.8.tar.bz2 1893552
diff --git a/x11-wm/metacity/files/digest-metacity-2.20.0 b/x11-wm/metacity/files/digest-metacity-2.20.0
deleted file mode 100644
index ac554e1e00f3..000000000000
--- a/x11-wm/metacity/files/digest-metacity-2.20.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e9c6317c85db019ac2d832dd9f45f536 metacity-2.20.0.tar.bz2 1882886
-RMD160 1723f6c575cf71a65918e8c2c223d0a31723be9d metacity-2.20.0.tar.bz2 1882886
-SHA256 e07a68c1015b8e77879c5f7ac492b3b622afeaf95eaef06180e8f7387836f08d metacity-2.20.0.tar.bz2 1882886
diff --git a/x11-wm/metacity/files/digest-metacity-2.20.2 b/x11-wm/metacity/files/digest-metacity-2.20.2
new file mode 100644
index 000000000000..2bc15b970fa0
--- /dev/null
+++ b/x11-wm/metacity/files/digest-metacity-2.20.2
@@ -0,0 +1,3 @@
+MD5 3b986030629860674b219fc35c226b1b metacity-2.20.2.tar.bz2 2035610
+RMD160 7b2478c1327a6ba04665bb42997fda79217b1e00 metacity-2.20.2.tar.bz2 2035610
+SHA256 69f292f92895bb4f915a0547e44b7682577f9c168aea3638ccfc4bba8bb6aabe metacity-2.20.2.tar.bz2 2035610
diff --git a/x11-wm/metacity/metacity-2.14.5.ebuild b/x11-wm/metacity/metacity-2.14.5.ebuild
deleted file mode 100644
index 2c50a63af739..000000000000
--- a/x11-wm/metacity/metacity-2.14.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.14.5.ebuild,v 1.13 2007/07/12 03:41:53 mr_bones_ Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Gnome default windowmanager"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
-IUSE="xinerama"
-
-# not parallel-safe; see bug #14405
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RDEPEND=">=x11-libs/gtk+-2.6
-	>=x11-libs/pango-1.2
-	>=gnome-base/gconf-2
-	>=dev-libs/glib-2.6
-	>=x11-libs/startup-notification-0.7
-	!x11-misc/expocity"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.28"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt"
-
-pkg_setup() {
-	# Compositor is too unreliable
-	G2CONF="$(use_enable xinerama) --disable-compositor"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	einfo "Metacity & Xorg X11 with composite enabled may cause unwanted"
-	einfo "border effects"
-}
diff --git a/x11-wm/metacity/metacity-2.16.3.ebuild b/x11-wm/metacity/metacity-2.16.3.ebuild
deleted file mode 100644
index 7c47e05f4f5d..000000000000
--- a/x11-wm/metacity/metacity-2.16.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.16.3.ebuild,v 1.11 2007/01/18 23:51:54 jer Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Gnome default windowmanager"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="xinerama"
-
-# not parallel-safe; see bug #14405
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RDEPEND=">=x11-libs/gtk+-2.10
-	>=x11-libs/pango-1.2
-	>=gnome-base/gconf-2
-	>=dev-libs/glib-2.6
-	>=x11-libs/startup-notification-0.7
-	!x11-misc/expocity"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt"
-
-pkg_setup() {
-	# Compositor is not deemed stable
-	G2CONF="$(use_enable xinerama) --disable-compositor"
-}
diff --git a/x11-wm/metacity/metacity-2.16.8.ebuild b/x11-wm/metacity/metacity-2.16.8.ebuild
deleted file mode 100644
index c6c28c49b4c3..000000000000
--- a/x11-wm/metacity/metacity-2.16.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.16.8.ebuild,v 1.1 2007/05/21 04:15:21 leio Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Gnome default windowmanager"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="xinerama"
-
-# not parallel-safe; see bug #14405
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RDEPEND=">=x11-libs/gtk+-2.10
-	>=x11-libs/pango-1.2
-	>=gnome-base/gconf-2
-	>=dev-libs/glib-2.6
-	>=x11-libs/startup-notification-0.7
-	!x11-misc/expocity"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt"
-
-pkg_setup() {
-	# Compositor is not deemed stable
-	G2CONF="$(use_enable xinerama) --disable-compositor"
-}
diff --git a/x11-wm/metacity/metacity-2.20.0.ebuild b/x11-wm/metacity/metacity-2.20.2.ebuild
index f61de424e5c5..a1acbd3a9859 100644
--- a/x11-wm/metacity/metacity-2.20.0.ebuild
+++ b/x11-wm/metacity/metacity-2.20.2.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.20.0.ebuild,v 1.2 2007/11/20 14:11:56 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.20.2.ebuild,v 1.1 2008/01/09 22:48:58 eva Exp $
 
-inherit eutils gnome2
+inherit gnome2
 
 DESCRIPTION="Gnome default windowmanager"
 HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="xinerama"
 # compositor needs libcm as well, not activating it for the time being
 
@@ -31,6 +31,7 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt"
 
 pkg_setup() {
-	G2CONF="$(use_enable xinerama) \
+	G2CONF="${G2CONF}
+		$(use_enable xinerama)
 		--disable-compositor"
 }