From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QTxJj-0007ap-IV for garchives@archives.gentoo.org; Tue, 07 Jun 2011 14:31:39 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6F6911C109; Tue, 7 Jun 2011 14:31:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 290C71C109 for ; Tue, 7 Jun 2011 14:31:32 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A5D561B401C for ; Tue, 7 Jun 2011 14:31:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id DE8A18003C for ; Tue, 7 Jun 2011 14:31:30 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <992cf2800205d9af6d7d24ce50a204b07ffa950a.mgorny@gentoo> Subject: [gentoo-commits] dev/mgorny:master commit in: sys-apps/systemd/ X-VCS-Repository: dev/mgorny X-VCS-Files: sys-apps/systemd/Manifest sys-apps/systemd/metadata.xml sys-apps/systemd/systemd-9999.ebuild X-VCS-Directories: sys-apps/systemd/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 992cf2800205d9af6d7d24ce50a204b07ffa950a Date: Tue, 7 Jun 2011 14:31:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 3631649a8ed5f706044af4e1dc60a682 commit: 992cf2800205d9af6d7d24ce50a204b07ffa950a Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Tue Jun 7 14:31:47 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Tue Jun 7 14:31:47 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/mgorny.git;a=3D= commit;h=3D992cf280 sys-apps/systemd: Sync from gx86. (Portage version: 2.2.0_alpha37_p23/git/Linux x86_64, signed Manifest com= mit with key 42B9401D) --- sys-apps/systemd/Manifest | 14 +++++++------- sys-apps/systemd/metadata.xml | 6 ++++++ sys-apps/systemd/systemd-9999.ebuild | 16 ++++++++-------- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index b526fe6..ca05be4 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -1,14 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 =20 -EBUILD systemd-9999.ebuild 3817 RMD160 df4083196c9576f568ec4a242774f5278= 94ac1ef SHA1 ed9e397b10d981f05a42af4625f926e450ad1fae SHA256 b32246c0514d= 3a149c1dc4d4cf06c9b72f70163ec2fc1a2617f34b491bdd82ad -MISC metadata.xml 346 RMD160 0a87c8fe5dab7495fbe54aac0bbefa83a05ac451 SH= A1 b3a588f46564c9dc4dc186c7e6d8a31c37d2bbfd SHA256 1ea5b2ad74881e6dec7d2f= f29067cd6fced2dd838cc3bdec3638971e80c5870d +EBUILD systemd-9999.ebuild 3905 RMD160 1034d0467132db85b986c5883247e8651= 9171705 SHA1 185f287b3dede21e09f988505ef1d741918e10fb SHA256 2f1ad3fc325e= 559c74571239c570f230ba970ffce1cb6fefdcd01cc48c87433b +MISC metadata.xml 532 RMD160 9f5a8f7563e27323c5827c45c929cde322283b45 SH= A1 862697f70e43ce66b0cace76e791bb73d9389c00 SHA256 1e18687866714408f81dbd= f4849ae598a4a6914fae2de83e1d2220af197a39cd -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) =20 -iJwEAQEIAAYFAk3skBwACgkQfXuS5UK5QB0VDgP9HaLLe7l1Fmz5YMw6SavjgH+S -GMKTfJXmZ3uM09d8Rxh7pXw9U2HicO8GxazyaEyeGCiHhlqYxvHLUiFVlOtdh3fK -cqS5c3lCwJ8yFnTqfr/Tpl8MK1qqpLLfZ8p5W5GLp0bqZXCxEk9ufg7vCAhUPMH/ -nrunlIyvaf1PvuBrJdY=3D -=3DSwhX +iJwEAQEIAAYFAk3uNlMACgkQfXuS5UK5QB3ECgP/RzlsiXy85ZJ/Kw7m3LdA9MyV +s4eaAZMtzSzmbv8imSFhPzRtkQ+GlPWURLSA/Lnu5l0ApSO3IxUV5Z/q/SDbnAfp +bMsrAwIL3xWFIiJKehp4nPa1QCbVzOvLjt6btu+981cIpRGu7bv23drTdGRzYu8i +NyTg0IAXRSVQR36gDuo=3D +=3D7i3B -----END PGP SIGNATURE----- diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xm= l index e44b596..773834e 100644 --- a/sys-apps/systemd/metadata.xml +++ b/sys-apps/systemd/metadata.xml @@ -6,7 +6,13 @@ mgorny@gentoo.org Micha=C5=82 G=C3=B3rny + + dagger@gentoo.org + Robert Piasek + + Enable support for sys-process/audit + Use libcryptsetup diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/syst= emd-9999.ebuild index 34632d1..1404c0b 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -15,15 +15,14 @@ SRC_URI=3D"" LICENSE=3D"GPL-2" SLOT=3D"0" KEYWORDS=3D"" -IUSE=3D"audit gtk pam selinux tcpd" - -# XXX: libcryptsetup +IUSE=3D"audit gtk cryptsetup pam selinux tcpd" =20 COMMON_DEPEND=3D">=3Dsys-apps/dbus-1.4.8-r1 >=3Dsys-apps/util-linux-2.19 >=3Dsys-fs/udev-171 sys-libs/libcap audit? ( >=3Dsys-process/audit-2 ) + cryptsetup? ( sys-fs/cryptsetup ) gtk? ( dev-libs/dbus-glib >=3Ddev-libs/glib-2.26 @@ -66,7 +65,7 @@ pkg_setup() { =20 src_prepare() { # Force the rebuild of .vala sources - touch src/*.vala + touch src/*.vala || die autotools-utils_src_prepare eautoreconf } @@ -77,6 +76,7 @@ src_configure() { --with-rootdir=3D --localstatedir=3D/var $(use_enable audit) + $(use_enable cryptsetup libcryptsetup) $(use_enable gtk) $(use_enable pam) $(use_enable selinux) @@ -94,7 +94,7 @@ src_install() { autotools-utils_src_install =20 dodoc "${D}"/usr/share/doc/systemd/* - rm -rf "${D}"/usr/share/doc/systemd + rm -rf "${D}"/usr/share/doc/systemd || die =20 cd "${D}"/usr/share/man/man8/ for i in halt poweroff reboot runlevel shutdown telinit; do @@ -103,13 +103,13 @@ src_install() { =20 # Drop the .pc file to avoid automagic depends. # This a temporary workaround for gx86 packages. - rm -f "${D}"/usr/share/pkgconfig/systemd.pc + rm -f "${D}"/usr/share/pkgconfig/systemd.pc || die =20 keepdir /run } =20 check_mtab_is_symlink() { - if test ! -L "${ROOT}"etc/mtab; then + if [[ ! -L "${ROOT}"etc/mtab ]]; then ewarn "${ROOT}etc/mtab must be a symlink to ${ROOT}proc/self/mounts!" ewarn "To correct that, execute" ewarn " $ ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'" @@ -121,7 +121,7 @@ systemd_machine_id_setup() { if ! "${ROOT}"bin/systemd-machine-id-setup; then ewarn "Setting up /etc/machine-id failed, to fix it please see" ewarn " http://lists.freedesktop.org/archives/dbus/2011-March/014187.= html" - elif test ! -L "${ROOT}"var/lib/dbus/machine-id; then + elif [[ ! -L "${ROOT}"var/lib/dbus/machine-id ]]; then # This should be fixed in the dbus ebuild, but we warn about it here. ewarn "${ROOT}var/lib/dbus/machine-id ideally should be a symlink to" ewarn "${ROOT}etc/machine-id to make it clear that they have the same"