floppym 14/12/14 15:58:27
Modified: systemd-9999.ebuild metadata.xml systemd-218.ebuild
ChangeLog
Log:
Optionally depend on libxkbcommon for keymap validation in logind, bug
532530. Restore systemd-consoled.service.in missing from the tarball.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
0BBEEA1FEA4843A4)
Revision Changes Path
1.149 sys-apps/systemd/systemd-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.149&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.149&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?r1=1.148&r2=1.149
Index: systemd-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- systemd-9999.ebuild 14 Dec 2014 05:27:58 -0000 1.148
+++ systemd-9999.ebuild 14 Dec 2014 15:58:27 -0000 1.149
@@ -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 @@
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 @@
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_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)
1.32 sys-apps/systemd/metadata.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/metadata.xml?rev=1.32&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/metadata.xml?rev=1.32&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/metadata.xml?r1=1.31&r2=1.32
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/metadata.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- metadata.xml 30 Oct 2014 08:47:31 -0000 1.31
+++ metadata.xml 14 Dec 2014 15:58:27 -0000 1.32
@@ -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>
1.2 sys-apps/systemd/systemd-218.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-218.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-218.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-218.ebuild?r1=1.1&r2=1.2
Index: systemd-218.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-218.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- systemd-218.ebuild 14 Dec 2014 05:27:58 -0000 1.1
+++ systemd-218.ebuild 14 Dec 2014 15:58:27 -0000 1.2
@@ -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 @@
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 @@
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 @@
# 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_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)
1.325 sys-apps/systemd/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.325&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.325&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.324&r2=1.325
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -r1.324 -r1.325
--- ChangeLog 14 Dec 2014 05:27:58 -0000 1.324
+++ ChangeLog 14 Dec 2014 15:58:27 -0000 1.325
@@ -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 <[email protected]> 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)
