Optionally depend on libxkbcommon for keymap validation in logind, bug 532530. Restor...

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 74798fea9cfc41cbfc7313c1566456ea0f412b2e..3238605a81f763c4630085240afd14a0c18b0990 100644 (file)
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/systemd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.324 2014/12/14 05:27:58 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.325 2014/12/14 15:58:27 floppym Exp $
+
+  14 Dec 2014; Mike Gilbert <floppym@gentoo.org> metadata.xml,
+  systemd-218.ebuild, systemd-9999.ebuild:
+  Optionally depend on libxkbcommon for keymap validation in logind, bug 532530.
+  Restore systemd-consoled.service.in missing from the tarball.
 
 *systemd-218 (14 Dec 2014)
 

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 485c14894590e7680126e00ba02e7a74ed9f1a16..bcc7190ab8eea0786144587c44784daa723342c6 100644 (file)
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -20,14 +20,14 @@ EBUILD systemd-216-r1.ebuild 15637 SHA256 8fbf530eb7d9b02701571c0a3771ff15e4ad36
 EBUILD systemd-217-r1.ebuild 15438 SHA256 bb82ff8abef1279ce432ee84e3f59aedfa9dc4031b89ef7537cf6dfcf47de73d SHA512 fded062d65154107f8cf0acafd15214b42712df4ad09fafc8a3c2247f0ec7b813e14de0d37d4c6df0c8eb074eadfea47b0915e0a7dbb6be44417ae96e6f11edd WHIRLPOOL ed6e22d3f55f2b81d2388403a211c2bab69a44e8e8e3d8565dbd015eceac6e8a963d50d7632026a142fd8fdd19b53e3812a1aaf39901f012983e84555f83e571
 EBUILD systemd-217-r2.ebuild 15568 SHA256 0565227f8b842e056cabd5c485a59c9dca39ca83519fc1e55461d3709c323c11 SHA512 2cf3b5b7d13e73e6fc9fed7d0ad4674f86aa2a18c2554461712008473477243b0a458b2b8b5cf20d12267bd6a959a1d7d11e0e7e469bf05767320c81d4a2fb75 WHIRLPOOL 7dbaff110c1075399dd8b86bf1a1710ccaf581519d5eedd05ea370d4329c856ad6153c63eeb1f966ddba86ffb51d398de9e5eaec712845288c8c0066e916a214
 EBUILD systemd-217-r3.ebuild 15572 SHA256 1e04c7dd56c989efda7546f86f3165be5a68e215ea4f8795fe2237f10b328e09 SHA512 979e61dce72446fb73b325021d662dbdc99f6c63c2d9ce4614cb8c6d3daa1d31c155d53daec2ce3b2c5d4e84916cb631beead049cf0d9c0d73106ca89b8e0ef1 WHIRLPOOL 58f17767fb81f0a459353fbb747f6dd4df2f1cc30d3510aeea8d34ec2182e94c46b6bd3ef916bccba8039471f1f243d9da1b06ae1f7c6b837d384e4665110ed4
-EBUILD systemd-218.ebuild 15327 SHA256 b9473874da691aa8edea4e8584659c64e761c075f3654c274d2e1593a00e5cf5 SHA512 8097310bcb4d8b53b889c0ce56573a341d32ade09a0fd764c5bd28bf3d691a7f829648f982252ad264f8f981784720dea72568b74a1d16ec055ddd0c0979284a WHIRLPOOL ad9343724e81ff37f646d8f840b50ed65aaeb7b12e637623e4c371fbcdc5a779ba32def8202b1e0a70442c93757282b428230a7982f60e6ce4c248ceea501789
-EBUILD systemd-9999.ebuild 15841 SHA256 b8bcfb9979e54a92b89241087c0976762971d13e3e1612e1b5f9a62bcdc931a4 SHA512 6ef98aa855e0242a8bba759a199b30e196c598383c8ce00843e8a42ad0635a23565c28f65b90ad2372ebcf225bf8e46cdf251e0b48db210ac2a3352a28977104 WHIRLPOOL e11cd67b3153d243d72eebbfcee9f38a790fa08f97c01ed44f77bdf9d05e3ad069940c59c626077a4cd44b459e7a3a611bedeff61e578c02c5f3e007c08eb102
-MISC ChangeLog 57968 SHA256 74be175cb4dcc3c2875b65150abc2c7c3d13aa95f06467487667af3af5fa620e SHA512 12b8828f324c882779fa5f9c9ee8c2810116d67528026dabd85f10f79146ad38379b6e4e86e7a2d519a93eb963dd8cb6f7c7b5769f25ce7b799dd8d6feb448ac WHIRLPOOL aa41f3f06f80f6fb1c8df0beac6b35f9010b33499133429fbac7bbc5c8ce6ad6fb3cbae46a71c0ce2512d8639ea726cd5e828c66d7cf3600e412123804ef7380
-MISC metadata.xml 1418 SHA256 e70d15f72262fbf2d21a78b533ef912f0bcb4d67ed4a3f26642a81545c8eaf53 SHA512 1109ea23a2241beffb5536ea289a5153200c2b0ff4bd9c1dd2335c3fa2d2df5bfd7f6aba575bf8225d6d8b8690505d183cd9e5664f956eeebb0f02808c2e2ce2 WHIRLPOOL 3765a3abbbf46911cac9812a6f99c3fbaf4f9e9e492cfc4647382a73740cef1a62f72c16473103749efa64ebf8d03266844d27db2c85d3e7546239cc92425f90
+EBUILD systemd-218.ebuild 15555 SHA256 a517ce8478c19b1e3e34e3462b625341f2fe78173a626e64bda8b4b49964532a SHA512 29d740558476e507eb1a0dc022025318ec313a5b8f4d274edf1bccaf9e9e6316abd2abf9a9c6452f86f222d9f190a27ab40e09705486893b97cfa17a198418be WHIRLPOOL ade3bd663c3e112587b8214fe90d7f53f0cbab71461cc464fcf1b82b1bb0538eb29eaa81e78e3952943753aae2da51eb50bd36bff4a8215fcf2cd0e56dbbb75c
+EBUILD systemd-9999.ebuild 15946 SHA256 7a7852b8a73dc9ceccb1a05675e8cd290f49fc4e7243216714a5243bed4d135d SHA512 7b558ddc6ac42d62a2e1d425ed059cf3409dd1a15ca3614cecf3e6b46d707bd436a09a430e8fa082f5170086f989a185e8cce1d5fe535495c2d2166341a2a80a WHIRLPOOL b91c006aee719c833da72780e1078efbee02158b48b0a0d82ecaf1c0457ebab84ea515154fe61c22a20f75d44c54f984b0beb6eee00f4c0cc074ab86d42f12f9
+MISC ChangeLog 58220 SHA256 7dbd5a5d05890407b4818ef0bd23559c98f7ff733843ac51463a8982a2452d3c SHA512 e26f4014a8b4b2692c2884d283c9a8aa3f94ee9d6355e6664d36c2f9f867e9f3fd12888654f95c3541608fb83d7daee555971b3d4d5497281f8f0c214066e18b WHIRLPOOL 719fe37c4726dd3f05df0e92fce66911f0bd431ddd2fbf2ff950f0ae638b7e52c9d09c25154ddfae72a2e5c8e0f6f2e0ed7e83f70a1da5d07d2566d3a56aa6a0
+MISC metadata.xml 1474 SHA256 f7ce860dd266f682528dcf29749fa5b10bcecbffdf8f1f629d41ab6d9f7e6e28 SHA512 f690ef20293d552e92c471d0da0998f5abf39979a8cda9f05cd8ef2c633406aab9fb7ef686638ab5ad59f07b303da89838febcb572de108c8bc57aa6df56f812 WHIRLPOOL 16c38645bd34353df55b723852276e05e8c3a0e0d0faa3cd68698b841ade901041bcc536e2ce9a1498529c15c3cf33ebfe6a4ad4e4daac7ac0fc390947d12325
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlSNH0AACgkQC77qH+pIQ6TgVwEAoWHkBifz8fblrCU4UYOVD+Xv
-YKoHjR8081qm1kNxWHQBAKkLnAYuLMwqXiOBHOJNkYZ6/ZEx2YC7PK/6uFCwVJfH
-=oJYc
+iF4EAREIAAYFAlSNs6QACgkQC77qH+pIQ6SgbAEAtF9rlpBPgkufZZa4Z3PTFKwl
+wff6sLc0pe8r7wNFViUA/iqzcyJmPO1kGipC9rE4o4HewgL62AqSOpO57Ycaqgrk
+=hY1W
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index 5f01a36c597ed6de5cfc1b5101672c2c849369db..3440fb6510acb438e4dafa51683d92b864e32e29 100644 (file)
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -21,5 +21,6 @@
                <flag name='seccomp'>Enable system call filtering via seccomp</flag>
                <flag name='terminal'>Enable experimental userspace virtual terminal support</flag>
                <flag name='vanilla'>Disable Gentoo-specific behavior and compatibility quirks</flag>
+               <flag name='xkb'>Validate XKB keymap in logind</flag>
        </use>
 </pkgmetadata>

diff --git a/sys-apps/systemd/systemd-218.ebuild b/sys-apps/systemd/systemd-218.ebuild
index 7a3ef19f8be6b48fc1e8451ec072098f742c4bdc..24bec8c882df4252a76a16074157a69df0db20b5 100644 (file)
--- a/sys-apps/systemd/systemd-218.ebuild
+++ b/sys-apps/systemd/systemd-218.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-218.ebuild,v 1.1 2014/12/14 05:27:58 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-218.ebuild,v 1.2 2014/12/14 15:58:27 floppym Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ SLOT="0/2"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="acl apparmor audit cryptsetup curl doc elfutils gcrypt gudev http
        idn introspection kdbus +kmod lz4 lzma pam policykit python qrcode +seccomp
-       selinux ssl terminal test vanilla"
+       selinux ssl terminal test vanilla xkb"
 
 MINKV="3.8"
 
@@ -47,9 +47,10 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.25:0=
        qrcode? ( media-gfx/qrencode:0= )
        seccomp? ( sys-libs/libseccomp:0= )
        selinux? ( sys-libs/libselinux:0= )
-       terminal? ( dev-libs/libevdev:0=
-               >=x11-libs/libxkbcommon-0.4:0=
-               x11-libs/libdrm:0= )
+       terminal? ( >=dev-libs/libevdev-1.2:0=
+               >=x11-libs/libxkbcommon-0.5:0=
+               >=x11-libs/libdrm-2.4:0= )
+       xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
        abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
                !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
 
@@ -128,6 +129,10 @@ src_prepare() {
        # Bug 463376
        sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
 
+       # missing in tarball
+       cp "${FILESDIR}"/217-systemd-consoled.service.in \
+               units/user/systemd-consoled.service.in || die
+
        autotools-utils_src_prepare
 }
 
@@ -202,6 +207,7 @@ multilib_src_configure() {
                $(multilib_native_use_enable terminal)
                $(multilib_native_use_enable test tests)
                $(multilib_native_use_enable test dbus)
+               $(multilib_native_use_enable xkb xkbcommon)
 
                # Disable optional binaries for non-native abis
                $(multilib_native_enable backlight)

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index c13360ed63efceded4a51006e79a54ae36f12d49..a22e80084785e2b05e4b2d52e51e69629df85fa4 100644 (file)
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.148 2014/12/14 05:27:58 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.149 2014/12/14 15:58:27 floppym Exp $
 
 EAPI=5
 
@@ -27,7 +27,7 @@ SLOT="0/2"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="acl apparmor audit cryptsetup curl doc elfutils gcrypt gudev http
        idn introspection kdbus +kmod lz4 lzma pam policykit python qrcode +seccomp
-       selinux ssl terminal test vanilla"
+       selinux ssl terminal test vanilla xkb"
 
 MINKV="3.8"
 
@@ -55,9 +55,10 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.25:0=
        qrcode? ( media-gfx/qrencode:0= )
        seccomp? ( sys-libs/libseccomp:0= )
        selinux? ( sys-libs/libselinux:0= )
-       terminal? ( dev-libs/libevdev:0=
-               >=x11-libs/libxkbcommon-0.4:0=
-               x11-libs/libdrm:0= )
+       terminal? ( >=dev-libs/libevdev-1.2:0=
+               >=x11-libs/libxkbcommon-0.5:0=
+               >=x11-libs/libdrm-2.4:0= )
+       xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
        abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
                !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
 
@@ -231,6 +232,7 @@ multilib_src_configure() {
                $(multilib_native_use_enable terminal)
                $(multilib_native_use_enable test tests)
                $(multilib_native_use_enable test dbus)
+               $(multilib_native_use_enable xkb xkbcommon)
 
                # Disable optional binaries for non-native abis
                $(multilib_native_enable backlight)