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 1QTwzd-0005XP-RB for garchives@archives.gentoo.org; Tue, 07 Jun 2011 14:10:54 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EEE371C0FE; Tue, 7 Jun 2011 14:10:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id AD11B1C0FE for ; Tue, 7 Jun 2011 14:10:46 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F1DA61B4007 for ; Tue, 7 Jun 2011 14:10:45 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2279) id B596120036; Tue, 7 Jun 2011 14:10:44 +0000 (UTC) From: "Michal Gorny (mgorny)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, mgorny@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/systemd: metadata.xml ChangeLog systemd-28.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: metadata.xml ChangeLog systemd-28.ebuild X-VCS-Directories: sys-apps/systemd X-VCS-Committer: mgorny X-VCS-Committer-Name: Michal Gorny Content-Type: text/plain; charset=utf8 Message-Id: <20110607141044.B596120036@flycatcher.gentoo.org> Date: Tue, 7 Jun 2011 14:10:44 +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: 7fa7a3ff0e5289b33cb891979e92a6f8 mgorny 11/06/07 14:10:44 Modified: metadata.xml ChangeLog systemd-28.ebuild Log: Support libcryptsetup, misc fixes. =20 (Portage version: 2.2.0_alpha37_p23/cvs/Linux x86_64) Revision Changes Path 1.3 sys-apps/systemd/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/m= etadata.xml?rev=3D1.3&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/m= etadata.xml?rev=3D1.3&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/m= etadata.xml?r1=3D1.2&r2=3D1.3 Index: metadata.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/metadata.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- metadata.xml 6 Jun 2011 11:25:01 -0000 1.2 +++ metadata.xml 7 Jun 2011 14:10:44 -0000 1.3 @@ -11,6 +11,8 @@ Robert Piasek + Enable support for sys-process/audit + Use libcryptsetup 1.3 sys-apps/systemd/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/C= hangeLog?rev=3D1.3&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/C= hangeLog?rev=3D1.3&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/C= hangeLog?r1=3D1.2&r2=3D1.3 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ChangeLog 6 Jun 2011 11:25:01 -0000 1.2 +++ ChangeLog 7 Jun 2011 14:10:44 -0000 1.3 @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/systemd # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.2 2011= /06/06 11:25:01 dagger Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.3 2011= /06/07 14:10:44 mgorny Exp $ + + 07 Jun 2011; Micha=C5=82 G=C3=B3rny systemd-28.ebu= ild, + metadata.xml: + Support libcryptsetup, misc fixes. =20 06 Jun 2011; Robert Piasek metadata.xml: Add dagger to metadata as maintainer 1.2 sys-apps/systemd/systemd-28.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/s= ystemd-28.ebuild?rev=3D1.2&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/s= ystemd-28.ebuild?rev=3D1.2&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/s= ystemd-28.ebuild?r1=3D1.1&r2=3D1.2 Index: systemd-28.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-28.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- systemd-28.ebuild 6 Jun 2011 08:31:26 -0000 1.1 +++ systemd-28.ebuild 7 Jun 2011 14:10:44 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-28.ebuild,v = 1.1 2011/06/06 08:31:26 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-28.ebuild,v = 1.2 2011/06/07 14:10:44 mgorny Exp $ =20 EAPI=3D4 =20 @@ -13,15 +13,14 @@ LICENSE=3D"GPL-2" SLOT=3D"0" KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"audit gtk pam selinux tcpd" - -# XXX: libcryptsetup +IUSE=3D"audit cryptsetup gtk pam selinux tcpd" =20 COMMON_DEPEND=3D">=3Dsys-apps/dbus-1.4.8-r1 >=3Dsys-fs/udev-171 >=3Dsys-apps/util-linux-2.19 sys-libs/libcap audit? ( >=3Dsys-process/audit-2 ) + cryptsetup? ( sys-fs/cryptsetup ) gtk? ( dev-libs/dbus-glib >=3Ddev-libs/glib-2.26 @@ -61,7 +60,7 @@ =20 src_prepare() { # Force the rebuild of .vala sources - touch src/*.vala + touch src/*.vala || die autotools-utils_src_prepare } =20 @@ -71,6 +70,7 @@ --with-rootdir=3D --localstatedir=3D/var $(use_enable audit) + $(use_enable cryptsetup libcryptsetup) $(use_enable gtk) $(use_enable pam) $(use_enable selinux) @@ -88,7 +88,7 @@ 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 @@ -97,13 +97,13 @@ =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'" @@ -115,7 +115,7 @@ 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"