Add USE=keymap to match udev ebuild.

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x9627F456F9DA7643!

5 files changed, 34 insertions, 29 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 8657f6ea46ba..d8a076b859ff 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/systemd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.120 2013/04/16 18:47:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.121 2013/04/17 11:01:30 mgorny Exp $
+
+  17 Apr 2013; Michał Górny <mgorny@gentoo.org> metadata.xml,
+  systemd-201.ebuild, systemd-9999.ebuild:
+  Add USE=keymap to match udev ebuild.
 
   16 Apr 2013; Michał Górny <mgorny@gentoo.org> systemd-201.ebuild,
   systemd-9999.ebuild:
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 5b89744b2009..4744dce85051 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -19,26 +19,26 @@ DIST systemd-201.tar.xz 2128876 SHA256 d6299f1a0bc2122002d731808d3825c6b566d1ffe
 EBUILD systemd-197-r1.ebuild 6496 SHA256 0069c8127574ee382c55b790a3ef807c1db064057dc7ab9a24aec195e8907aa5 SHA512 ce8fdb78c5cce5e34474b12e29bed83814746949b676025e8780206ac716c1dab863be31f3d83db02de09be00a5ac26ebe70ca2474ea2e244f4903bbd5e6871a WHIRLPOOL 2f316c077c6fa23d02e12985131a915947aac265009094ff851d65cc403ca10aefbc8c3f3b6ced4ce6f9c551f52223ca01ec46545bc4b3cccd78633c04534dc1
 EBUILD systemd-198-r1.ebuild 6869 SHA256 bd68d6866eed550d86f04c1f365caf2256fb9f552711073864833599a55eb632 SHA512 76394453ded9cdbf364f79c0e1426ee575b3ad88e38dc53661db0ae87b03fafaaae6720c3f231340995af4db73172515e5a0fd6c997ec42d70a4edb70041eb51 WHIRLPOOL a82174d69c02fcbb6ed5c262c6a58706181f047bb306a053500f5833d3819e272282a0bf5d88ca4116e719b8cb50fefaefe105570bd4f35e26ece1caf741fa72
 EBUILD systemd-200-r1.ebuild 7304 SHA256 321931cf7a04ba7a681b6457d136e016a04ed6c40fe9fb1aadfddc359ec9eae8 SHA512 ed6a3ff8c3b37b3e50dce30e19d78f3c6cfa0fc8a730ddbe0665806c389460de30e60c5abfdc33cf50c61922d240cbc08f2ee7d06ca5e919ecf272ca3da484a4 WHIRLPOOL e497c7f8447475ee6f915779bfaac196470398e4292326c560f393f53600054bbe283ba96a2f2fbcf959358d405acec7de61aa5e248857b723f7280de34e45a4
-EBUILD systemd-201.ebuild 7465 SHA256 2b66451c81c16e060b5b8c3ba8b2d5fdb0871ee56bd584728f5bade51061e03d SHA512 1a58a2aafc1e1622e127e6fda6c6cfdd03d5d3e48fd7abd2ad745a8cd6112c57e091879e26afa2696ddc9b7ade25d2e165b4fbdb0ce8d3d68dccc27f3f11fae0 WHIRLPOOL 4a375ca26ac0ed0d557f60e55d1a29d43e40da987d7abd15e1bdc944aa59b8fc56338f7983c2c20da6d4613a910d440c9357fa28b7bb20dbf86e0ca9a725e7c9
-EBUILD systemd-9999.ebuild 7847 SHA256 b4a71bd4ed08a5aa307baf639e09069287941192bddce86aeb3e4c9ef1dd6ce8 SHA512 f5b7ce7f207f750c5ec8c9b4ab467086116bc192877483a28ebc1c33171b2042e4e9c20231f5531b79adf152e8c337bd286048ea1e63e4bf6242ff15281079e4 WHIRLPOOL 023be75d3c4c4ea29207ce56382c48f88e5c93e44e68e7500abea2f5ec71938000d69f0155ae816160fa3e90e0cda7f0c49462ca4f8dc262444c31cc30db2b64
-MISC ChangeLog 23094 SHA256 e3c83bb259cbbed8fffc911e5b17bd387cc53b185ef20331e168ab31eba59365 SHA512 66874a52fcb9b85b6906e62515edf6eabe4064b327e6aa0ec0eb7794212fcbfcff739d7b92ce4a9ad9acbc8033ebad5d3f8bf6c1419b8885549345026f431e63 WHIRLPOOL 91ce4faeaf2b57ce686a9cddcb597917e0e15df2803bf609f1d3b675f7e20771bed355df732e22d094bc984dcca6c26d5ca9a5de1128a3b23d0feaf7570eb402
-MISC metadata.xml 1006 SHA256 d84e6f4b410953584e039109fb733281441733c3670a1e60bdf9458bbb013a2f SHA512 04efd3c8aa7850e58a734d7288ee207975b38da1bf82a2736f14312e420d42da91fb237d3710876c9f76867486daf151bae9ecf952df06618849de039e64b51d WHIRLPOOL 35953aac5c1683bf4cd6aeb875e1d27949293eb1827d4693be60e490585853ef46ed1e5e5009ce0cf7687f233f2dbfe8e0840f2898505da1a0ed8d72f0cbd134
+EBUILD systemd-201.ebuild 7477 SHA256 b5b6bb430858677ebf6a89022a8eab4afd6fd5953ed5969d26020679335e9053 SHA512 bcb4f27aec26ea578c18ac8642f405aa0cf17539e5725256000f69f573a7420b90f4d245d55c7228c6f67bc01f91ee63966f1c1835d6f9dd5cd6a901a588c522 WHIRLPOOL faed72d64e0b988f0967bde102f1dc4036abba0bbc1df72aac7e9215056ba9e84a9e3d674478cc24d4853d117f845f75737d7b83e3f1cb5975dbe6202131eaae
+EBUILD systemd-9999.ebuild 7859 SHA256 98376f17c44572f0da1f7b412e32c3e9fc08053b759215e356bd8f1d9cb05f11 SHA512 a211adbd24310933a0cfcd187b789b38e76911fd0e253016726ca54204cc711ed51b643ceb131f732aed0103fc673fea3ba49ce8f76a90333a8174f58cf71896 WHIRLPOOL 4f20f12036f8f2b59cafc61dc85d1e2b2a1820d9acf1b0f06b891e125d72e54c929ea7eefa0dd8a0229659c47c21250a3f7f9222b64a1eb25c55a5a78a158122
+MISC ChangeLog 23241 SHA256 b4904e5a993c48931657a8617201d4c5d73e3746f3c2611ad4b5ae21610b0a8b SHA512 7fab51fc7fa376361919dc12aadb3891ca8761e760d6c8a97441d00c6b86efc02c107dcd0e6112f94598d74f79a797aeeff02c8da9d52ebe523c32efc7416154 WHIRLPOOL c9adc82ecfc61cca2540da831fc7929a6afa4f67b3d212e77e8eb9ccda7df79aae40c8ce301892249d8b33d260555beac46c51405222bb689c1d5156731dfcdc
+MISC metadata.xml 1073 SHA256 71ae99fb50973ac5dfa88e7769819f33e0cb94008c291c2f619f5edec2bb6112 SHA512 3ab385e8bce57fa894a5752c8bb5a7ccbf93ffa04792192759ff09788fbc1c47bd85aee14bf5179ca03bae8f125e32aeda0bffb0c1561e06bc57e16ae197f053 WHIRLPOOL 189d679ddb184ec1a9dd853ba227c87bea14a92b99529ff972e6d62ba5c11cf7c1e85040d8b8160eade9c126b25edc5d25fec41201768bf05d12a9400c6d7997
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRbZ0WXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJRboFbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDItUQAIoO3rEYHL+mSSq6Ltof/Gnx
-Nyzr5n6RrIRkawb16lBP2KMblQCvtcUNdJhNrnFj/7h8Vw2csan1wMLda4N3Jh1N
-JVQwXsI73M1etZlBFcKhpUB0GPfPgjIYdS1wHA5AH/p6MlbdAKVXzjBz//SOk8Ml
-MtqcAMubXDPcSaqIHeD78whHKc/PJo4LQCsLCPiJaMY1bWLy25UYWau3CSE3TKOP
-utSUESCheP6hJZuMiw1PM6fB5kqTRzaQME/KlY6JZBGp53Yl1oM8WhcoEablNz/o
-3t1pQI45Q+KEXrXJDyWIysgRf61b8/NouRGgwNE/MlPNvygVUMTA3YewQOPU3t3a
-rTQ/7+nmjRxkM6Tmm0i/uROC9Njud9UP5pvD9ucERCisE4eQVB5aPW2q//8uAR8C
-WnZN9a8/mSeCMkGzdXX+IYj77RmgKNmxNl91/FouN+x5cwuhqHmJn0d8a1+gc17Y
-sqTAAFVs8AGChZuVQYZD7Ml8r4ZkJUvf0GGOsiE6noua1WgDBeB4fpe91h2qDd7/
-R4R/qCgybxZdpBI8AboqWWNHdEmRLmFV8wfjQpPCF7mC+Tv6qO7khGGs23/MLeVY
-2Kq+2KXxlNhr+bh75AICvVvvgkFTbfHa/tDyWWq4sGypnhA18zOfkLQ21pscnrih
-bxRMrpNfAZfIKeLeeDjl
-=Vvjj
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDTcoP/27JkE12Uk+CqtoSoF3FcXrI
+7L8fHd7CYEyRkaRyQnrvQg32zeA9tzSry3FcUGOOey8Sh4rDZDC3L3AqotcJyInw
+4BVk9QEgu2nmC8G00YOL5cv0jK9wZ+a7S5usZTe/N+ZYgHyOq+DkTmFq2qMAB1Ov
+8swdv5S7hCl/F+yOrYO9fyLvogAZarQOESBNTRi/HAQup6gpPKYWVeYr0a0Xiwaa
+HKW/mdlorZI3ryl+3FJfPkdbb1HX1pWdLDun/IcI1gVpdxwXz1Rx0Rb/KUGPuCiN
+wfK/X3Jj0hRCE7jHgfKzLAqPMd8JClFcd1n06wtyqSUrl0h5n5W3jlZ5Pp9XW3wA
+doN9ysB45tGyBXT9NXyI3Vm77jhNPUHLSdVPGLmt7idCX31Imzai/DaEgANejpgn
+PyjwXC32e3mWHiSiZMhXyooV9RDtrY7uR2hYbQD2WW7J866UuXccMnXeYzPdvpaY
+JSkgrQCMtS8h0OxxvF7p5go0VJVyjrDkMwKL6Nb4tyXzYI17LziR27KFFE0i2iqb
+VlES4UN2vfIrUJbFb3gspriPwqyAWCB4DhZodUlsQAl8GPzMi/mQc21q8q1rnFS8
+6VtCsd4RCwdy75M5OF2nZ7devdYD1NLRgkYfgagdScKoZ3S6aZlWcCG3nobB2RON
+Q7XLPNFELOXgN3XtRDLB
+=uixQ
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index 5e0d9d6bee4e..d9a66eac4dca 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -13,6 +13,7 @@
 		<flag name='gcrypt'>Enable sealing of journal files using gcrypt</flag>
 		<flag name="gudev">enable libudev gobject interface</flag>
 		<flag name='http'>Enable embedded HTTP server in journald</flag>
+		<flag name="keymap">Map custom hardware's multimedia keys</flag>
 		<flag name='kmod'>Enable kernel module loading via <pkg>sys-apps/kmod</pkg></flag>
 		<flag name='openrc'>Depend on <pkg>sys-fs/udev-init-scripts</pkg></flag>
 		<flag name='qrcode'>Enable qrcode output support in journal</flag>
diff --git a/sys-apps/systemd/systemd-201.ebuild b/sys-apps/systemd/systemd-201.ebuild
index 0f0d6d4ac264..7c0188246bb7 100644
--- a/sys-apps/systemd/systemd-201.ebuild
+++ b/sys-apps/systemd/systemd-201.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-201.ebuild,v 1.5 2013/04/16 18:47:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-201.ebuild,v 1.6 2013/04/17 11:01:30 mgorny Exp $
 
 EAPI=5
 
@@ -14,9 +14,9 @@ SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
 LICENSE="GPL-2 LGPL-2.1 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE="acl audit cryptsetup doc gcrypt gudev http introspection +kmod
-	lzma openrc pam policykit python qrcode selinux static-libs tcpd
-	vanilla xattr"
+IUSE="acl audit cryptsetup doc gcrypt gudev http introspection keymap
+	+kmod lzma openrc pam policykit python qrcode selinux static-libs
+	tcpd vanilla xattr"
 
 MINKV="2.6.39"
 
@@ -91,7 +91,6 @@ src_configure() {
 		# just text files
 		--enable-polkit
 		# no deps
-		--enable-keymap
 		--enable-efi
 		--enable-ima
 		# optional components/dependencies
@@ -103,6 +102,7 @@ src_configure() {
 		$(use_enable gudev)
 		$(use_enable http microhttpd)
 		$(use_enable introspection)
+		$(use_enable keymap)
 		$(use_enable kmod)
 		$(use_enable lzma xz)
 		$(use_enable pam)
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index ab945d15971f..e4b98a320e27 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.46 2013/04/16 18:47:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.47 2013/04/17 11:01:30 mgorny Exp $
 
 EAPI=5
 
@@ -22,9 +22,9 @@ SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
 LICENSE="GPL-2 LGPL-2.1 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE="acl audit cryptsetup doc gcrypt gudev http introspection +kmod
-	lzma openrc pam policykit python qrcode selinux static-libs tcpd
-	vanilla xattr"
+IUSE="acl audit cryptsetup doc gcrypt gudev http introspection keymap
+	+kmod lzma openrc pam policykit python qrcode selinux static-libs
+	tcpd vanilla xattr"
 
 MINKV="2.6.39"
 
@@ -115,7 +115,6 @@ src_configure() {
 		# just text files
 		--enable-polkit
 		# no deps
-		--enable-keymap
 		--enable-efi
 		--enable-ima
 		# optional components/dependencies
@@ -127,6 +126,7 @@ src_configure() {
 		$(use_enable gudev)
 		$(use_enable http microhttpd)
 		$(use_enable introspection)
+		$(use_enable keymap)
 		$(use_enable kmod)
 		$(use_enable lzma xz)
 		$(use_enable pam)