[gentoo-commits] dev/mgorny:master commit in: sys-apps/systemd/, sys-apps/systemd/files/

[Michał Górny]

commit:     bc864496715c0ba9b30691cb687f226589730f54
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 24 16:38:08 2012 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Aug 24 16:38:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=bc864496

sys-apps/systemd: Update to -189.

(Portage version: 2.2.0_alpha120_p33/git/Linux x86_64, unsigned Manifest commit)

---
 ...> 0001-Disable-udev-targets-for-udev-189.patch} |   17 +++++++++--------
 sys-apps/systemd/metadata.xml                      |    2 ++
 sys-apps/systemd/systemd-9999.ebuild               |   10 +++++++---
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-188.patch b/sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-189.patch
similarity index 95%
rename from sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-188.patch
rename to sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-189.patch
index e6819ee..05b4a9d 100644
--- a/sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-188.patch
+++ b/sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-189.patch
@@ -1,14 +1,14 @@
-From d8f51d193f93c442795b8c91d750f1e3ffdad544 Mon Sep 17 00:00:00 2001
+From 700023b0263f1f014443144a10e4544f18113458 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
 Date: Wed, 15 Aug 2012 14:02:07 +0200
-Subject: [PATCH] Disable udev targets, for udev-188.
+Subject: [PATCH] Disable udev targets, for udev-189.
 
 ---
- Makefile.am | 188 +-----------------------------------------------------------
- 1 file changed, 1 insertion(+), 187 deletions(-)
+ Makefile.am | 189 +-----------------------------------------------------------
+ 1 file changed, 1 insertion(+), 188 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 39afb62..4997902 100644
+index 8de4aa4..5fa3085 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -307,8 +307,6 @@ dist_systemunit_DATA = \
@@ -212,7 +212,7 @@ index 39afb62..4997902 100644
  # ------------------------------------------------------------------------------
  if ENABLE_GUDEV
  if ENABLE_GTK_DOC
-@@ -2111,98 +2018,11 @@ nodist_keymap_SOURCES = \
+@@ -2111,99 +2018,11 @@ nodist_keymap_SOURCES = \
  BUILT_SOURCES += \
  	$(nodist_keymap_SOURCES)
  
@@ -287,6 +287,7 @@ index 39afb62..4997902 100644
 -	keymaps/module-sony \
 -	keymaps/module-sony-old \
 -	keymaps/module-sony-vgn \
+-	keymaps/module-sony-vpc \
 -	keymaps/olpc-xo \
 -	keymaps/onkyo \
 -	keymaps/oqo-model2 \
@@ -311,7 +312,7 @@ index 39afb62..4997902 100644
  src/udev/keymap/keys.txt: Makefile
  	$(AM_V_at)$(MKDIR_P) $(dir $@)
  	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
-@@ -2230,12 +2050,6 @@ mtd_probe_SOURCES =  \
+@@ -2231,12 +2050,6 @@ mtd_probe_SOURCES =  \
  mtd_probe_CPPFLAGS = \
  	$(AM_CPPFLAGS)
  
@@ -325,5 +326,5 @@ index 39afb62..4997902 100644
  libsystemd_id128_la_SOURCES = \
  	src/libsystemd-id128/sd-id128.c
 -- 
-1.7.11.1
+1.7.12
 

diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index 2c289e2..74a2018 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -9,5 +9,7 @@
 		<!-- XXX: describe those two better -->
 		<flag name='audit'>Enable support for <pkg>sys-process/audit</pkg></flag>
 		<flag name='cryptsetup'>Use libcryptsetup</flag>
+		<flag name='gcrypt'>Enable sealing of journal files using gcrypt</flag>
+		<flag name='qrcode'>Enable qrcode output support in journal</flag>
 	</use>
 </pkgmetadata>

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 50d787a..e754b22 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -21,7 +21,7 @@ SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
 LICENSE="GPL-2 LGPL-2.1 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="acl audit cryptsetup lzma pam selinux tcpd"
+IUSE="acl audit cryptsetup gcrypt lzma pam qrcode selinux tcpd"
 
 # We need to depend on sysvinit for sulogin which is used in the rescue
 # mode. Bug #399615.
@@ -31,13 +31,15 @@ MINKV="2.6.39"
 COMMON_DEPEND=">=sys-apps/dbus-1.4.10
 	>=sys-apps/kmod-5
 	>=sys-apps/util-linux-2.20
-	~sys-fs/udev-188
+	~sys-fs/udev-189
 	sys-libs/libcap
 	acl? ( sys-apps/acl )
 	audit? ( >=sys-process/audit-2 )
 	cryptsetup? ( >=sys-fs/cryptsetup-1.4.2 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5 )
 	lzma? ( app-arch/xz-utils )
 	pam? ( virtual/pam )
+	qrcode? ( media-gfx/qrencode )
 	selinux? ( sys-libs/libselinux )
 	tcpd? ( sys-apps/tcp-wrappers )"
 
@@ -78,7 +80,7 @@ src_prepare() {
 	sed -i -e 's:libudev\.la:-ludev:' Makefile.am
 
 	local PATCHES=(
-		"${FILESDIR}"/0001-Disable-udev-targets-for-udev-188.patch
+		"${FILESDIR}"/0001-Disable-udev-targets-for-udev-189.patch
 	)
 
 #if LIVE
@@ -112,8 +114,10 @@ src_configure() {
 		$(use_enable acl)
 		$(use_enable audit)
 		$(use_enable cryptsetup libcryptsetup)
+		$(use_enable gcrypt)
 		$(use_enable lzma xz)
 		$(use_enable pam)
+		$(use_enable qrcode qrencode)
 		$(use_enable selinux)
 		$(use_enable tcpd tcpwrap)
 	)