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 1QTUEB-0007Ip-4P for garchives@archives.gentoo.org; Mon, 06 Jun 2011 07:28:01 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 623581C025; Mon, 6 Jun 2011 07:27:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1FE0D1C025 for ; Mon, 6 Jun 2011 07:27:49 +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 8E3111B402A for ; Mon, 6 Jun 2011 07:27:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A62188003C for ; Mon, 6 Jun 2011 07:27:47 +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: <16a3fccdbd45c81eb4b609ea0cc3d10bf1eba5bb.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/systemd-28-r1.ebuild sys-apps/systemd/systemd-28.ebuild 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: 16a3fccdbd45c81eb4b609ea0cc3d10bf1eba5bb Date: Mon, 6 Jun 2011 07:27:47 +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: 75e557cdbb6da6d119ad84a45eeae04a commit: 16a3fccdbd45c81eb4b609ea0cc3d10bf1eba5bb Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Mon Jun 6 06:44:08 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Mon Jun 6 06:44:08 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/mgorny.git;a=3D= commit;h=3D16a3fccd sys-apps/systemd: Update the deps for in-tree inclusion. (Portage version: 2.2.0_alpha37_p23/git/Linux x86_64, signed Manifest com= mit with key 42B9401D) --- sys-apps/systemd/Manifest | 14 +++++++------- .../{systemd-28.ebuild =3D> systemd-28-r1.ebuild} | 17 ++++++++++++= ----- sys-apps/systemd/systemd-9999.ebuild | 17 ++++++++++++--= --- 3 files changed, 31 insertions(+), 17 deletions(-) diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index 36febf3..8fcdb71 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -2,15 +2,15 @@ Hash: SHA256 =20 DIST systemd-28.tar.bz2 810357 RMD160 0d91101b158af98cbd7d9be35f5a9dae51= d565fc SHA1 8c8e04f4577afcc7fa5f28205d581594fe69367b SHA256 dd11cc85b2f2a= fc8094cefb47af519d5a03a9ec1abce0fb82bc19d48fa471b33 -EBUILD systemd-28.ebuild 3386 RMD160 dcb4593cd1337dea0e587851d346a137d61= 1668e SHA1 b9cb0bf74246ddfb0bcd224a48b5684ff87ab453 SHA256 5b81c828d02f29= ffcdf6cf2568628e12f3edc464f0371427b1919233b009940a -EBUILD systemd-9999.ebuild 3495 RMD160 b0d15d4f8baa1263f6d7ef3526d0d0a63= 147768e SHA1 84cbe9deac0ab79c3890ed62da1d58c01c8eb977 SHA256 5896e0b4dfde= fcbe6ed2a16a3c8a66d5e3ef3abd0a680dfaf71bea982977fc4c +EBUILD systemd-28-r1.ebuild 3704 RMD160 34a3cf887e73fc580c64cfac82c5d71f= ddde7132 SHA1 77f3e905d85428130f76c6c39b724b10423f7365 SHA256 ebff12228ad= 1aeacc25432f5706b31cad420111ef048ff3568bf79fa928d11bf +EBUILD systemd-9999.ebuild 3813 RMD160 850f2d314cf55839da56f12dfa59faeff= dd99d4f SHA1 253ebd40cc43f8b42313af4c2bb7312a798ce790 SHA256 cc024c0cf9f1= b60f96b8123a42855f353ed9e5fb303bfd832d4777be5e9c3511 MISC metadata.xml 346 RMD160 0a87c8fe5dab7495fbe54aac0bbefa83a05ac451 SH= A1 b3a588f46564c9dc4dc186c7e6d8a31c37d2bbfd SHA256 1ea5b2ad74881e6dec7d2f= f29067cd6fced2dd838cc3bdec3638971e80c5870d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) =20 -iJwEAQEIAAYFAk3falEACgkQfXuS5UK5QB04OwP/aAFtPxOdZE3AnDmiCyTiGuKC -K3cAsn9MmSSXIX6J4u4XGLCQqW8F+yaMgn07Oe2Ae4TnLsy8H2qa5oQKngbbRc/G -hndZPmieCDjV9TNd59XJg7sULe5Vg7MuM9/hpBhOAjJvA/N5mFuzXUr5M6wLCUZD -aE+pdxn65Myc+jM3Vto=3D -=3DRqH1 +iJwEAQEIAAYFAk3sdzgACgkQfXuS5UK5QB0svQP/bOjqs6ZCuYT1nsObOf07J5mg +zGPecK+PNmFSLIdVZDMtvPhUygYEB3iZAgHl6mENeD0KTLzKcN4rHe2H1YzbE5Ww +SZDvjzXAQC6arvtT8fE4Vjx3ByTmerweU7slx/n1ZUV25NA4RGtEK1AXa5+EtfwC +56zv+ZvHaRIq/o9PCyU=3D +=3DPnuj -----END PGP SIGNATURE----- diff --git a/sys-apps/systemd/systemd-28.ebuild b/sys-apps/systemd/system= d-28-r1.ebuild similarity index 87% rename from sys-apps/systemd/systemd-28.ebuild rename to sys-apps/systemd/systemd-28-r1.ebuild index 0397644..2da53e9 100644 --- a/sys-apps/systemd/systemd-28.ebuild +++ b/sys-apps/systemd/systemd-28-r1.ebuild @@ -17,9 +17,10 @@ IUSE=3D"audit gtk pam selinux tcpd" =20 # XXX: libcryptsetup =20 -COMMON_DEPEND=3D"sys-apps/dbus +COMMON_DEPEND=3D">=3Dsys-apps/dbus-1.4.8-r1 + >=3Dsys-fs/udev-171 + >=3Dsys-apps/util-linux-2.19 sys-libs/libcap - >=3Dsys-fs/udev-160 audit? ( sys-process/audit ) gtk? ( dev-libs/dbus-glib @@ -28,15 +29,21 @@ COMMON_DEPEND=3D"sys-apps/dbus >=3Dx11-libs/libnotify-0.7 ) pam? ( virtual/pam ) selinux? ( sys-libs/libselinux ) - tcpd? ( sys-apps/tcp-wrappers ) - >=3Dsys-apps/util-linux-2.19" + tcpd? ( sys-apps/tcp-wrappers )" =20 # Vala-0.10 doesn't work with libnotify 0.7.1 VALASLOT=3D"0.12" +# A little higher than upstream requires +# but I had real trouble with 2.6.37 and systemd. MINKV=3D"2.6.38" =20 +# dbus, udev versions because of systemd units +# blocker on old packages to avoid collisions with above +# openrc blocker to avoid udev rules starting openrc scripts RDEPEND=3D"${COMMON_DEPEND} - sys-apps/systemd-units" + !!sys-apps/systemd-dbus + !!sys-apps/systemd-udev + !=3Dsys-kernel/linux-headers-${MINKV}" diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/syst= emd-9999.ebuild index 9d3974f..5b738f3 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -19,9 +19,10 @@ IUSE=3D"audit gtk pam selinux tcpd" =20 # XXX: libcryptsetup =20 -COMMON_DEPEND=3D"sys-apps/dbus +COMMON_DEPEND=3D">=3Dsys-apps/dbus-1.4.8-r1 + >=3Dsys-apps/util-linux-2.19 + >=3Dsys-fs/udev-171 sys-libs/libcap - >=3Dsys-fs/udev-160 audit? ( sys-process/audit ) gtk? ( dev-libs/dbus-glib @@ -30,15 +31,21 @@ COMMON_DEPEND=3D"sys-apps/dbus >=3Dx11-libs/libnotify-0.7 ) pam? ( virtual/pam ) selinux? ( sys-libs/libselinux ) - tcpd? ( sys-apps/tcp-wrappers ) - >=3Dsys-apps/util-linux-2.19" + tcpd? ( sys-apps/tcp-wrappers )" =20 # Vala-0.10 doesn't work with libnotify 0.7.1 VALASLOT=3D"0.12" +# A little higher than upstream requires +# but I had real trouble with 2.6.37 and systemd. MINKV=3D"2.6.38" =20 +# dbus, udev versions because of systemd units +# blocker on old packages to avoid collisions with above +# openrc blocker to avoid udev rules starting openrc scripts RDEPEND=3D"${COMMON_DEPEND} - sys-apps/systemd-units" + !!sys-apps/systemd-dbus + !!sys-apps/systemd-udev + !