Version bump. This is the first release including systemd-journald for logging.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 3da0ef820cef280d76fd9b708e1eb2ffb4b025c5..7c371f16ef2440c4cc1ea8df1b528c2114efc7e9 100644 (file)
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/systemd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.18 2012/01/10 18:37:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.19 2012/01/11 07:56:35 mgorny Exp $
+
+*systemd-38 (11 Jan 2012)
+
+  11 Jan 2012; Michał Górny <mgorny@gentoo.org> +systemd-38.ebuild:
+  Version bump. This is the first release including systemd-journald for
+  logging.
 
 *systemd-37-r3 (10 Jan 2012)
 *systemd-29-r5 (10 Jan 2012)

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 68add52c1712702b8171c51c9ea720e5338f70dd..b4435258511a75a33468bf444c31bbc51893a904 100644 (file)
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -7,18 +7,20 @@ AUX update-etc-systemd-symlinks.service 165 RMD160 aab6eb2ff82ae82be72c12682fda2
 AUX update-etc-systemd-symlinks.sh 451 RMD160 94066bbc526f108e2a3a49ad3b8dc52eb1ed4ad7 SHA1 9ad3fa9e5bef1b7d10a54101ddedb299d0f875a7 SHA256 1ed27cf8c2ca5ab862b9d935eec613d1a21ceb4cc363a4bfdac6430387e350df
 DIST systemd-29.tar.bz2 810407 RMD160 49cf7906a768217190cdf61d102058b9c8762d40 SHA1 5dc36e8d900085af31a96a6bafaba228bc8225c7 SHA256 c41153c3ebab9e25b16fa1670946ce6dfdd1515608a37eedd80d2bbe46629971
 DIST systemd-37.tar.bz2 931101 RMD160 d0b15083fe938039972f38a30c757ed8b10a5998 SHA1 02665bcb8c609193170579537c3a94013519405c SHA256 b38492bde73649cc3520953354ef446c268169c1d342614183655e9ee1a1bbc5
+DIST systemd-38.tar.xz 875736 RMD160 16f427fc4d6036a36d50a22ff2cf1f78c37cbeac SHA1 868e0702279b1b1ff638475d67e103c8a979118b SHA256 cd21eddc23457323fcb8775813a985d7bc429a63ea5adc6950a8bbe421e30d13
 EBUILD systemd-29-r3.ebuild 4156 RMD160 e8e2c538b561bc98b339d4c6db34ddde6b26b67e SHA1 11a01d9ea81b142b952e3e8490a1695965c0417c SHA256 1936747e42a9af19eb62b6ca62811d9e5df337afb8499b59056183f0c77090db
 EBUILD systemd-29-r5.ebuild 5003 RMD160 dbbe8ac118c48c93a7ac27fef2883e380a26a268 SHA1 2cfdb3b8d13d3abccc688e5bcf606082e79c11aa SHA256 420a143ead5f4e2d3bec08510b2f4310f1e7cd2a65f48e360a8d57378590fd9a
 EBUILD systemd-37-r1.ebuild 4173 RMD160 9faa7b2ba5a70378b635aa76e542881ecdba9a0a SHA1 fc570db8a8a56e0c04b1a813e841711229f6f3e2 SHA256 105ad32ee8d080835d6a7648024f913b6eaee183a2daf022d56e1b367481f10e
 EBUILD systemd-37-r3.ebuild 5020 RMD160 62abeff4cd0703459e730f9195c33f6de02b729c SHA1 35e047d99474e1a17d78699941152584a530877f SHA256 673e21a3c3f81965c08ee82ccd0ac0fe72c37b3a43b98f22699a826ba440e07c
-MISC ChangeLog 3556 RMD160 ced91ee30cba8049e19893af8c75e5eaef375593 SHA1 06b49dde61835e3b594aed08323d8cf3cd0e6397 SHA256 4a4bd343a2918b8e5780e6e5a7b8b2f4ab88454b1de3e881f398f1830ce544ad
+EBUILD systemd-38.ebuild 5158 RMD160 ecae84fc629b0c7a2473ff105488b9fd359c4449 SHA1 428b943ba9575143394ae1b7de2ee35f9d982e22 SHA256 bc7f827d613d50d31d207073c428a0784d279e7e946233433d56ce55d4e103b6
+MISC ChangeLog 3738 RMD160 2d2dff23d5d5c1f37fde8fe9537142d1bf5add66 SHA1 28cb9a6eaad68d7f7f4d28d9c81f26068663af8c SHA256 fa73d8a564dfa886a887d1197d9c4ab326197096ea1db12a37988bfdb0101ce2
 MISC metadata.xml 502 RMD160 1cbf039eefa26495068305b7a3ef801b04904561 SHA1 70e619acb0be857af4f668555b5405b1c0fa8d2b SHA256 c4e473de103cd2168c5730797a9835d88c675456b2743af3dcc33c65c4d1ea7f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk8MhdkACgkQfXuS5UK5QB3wqwP/U0BdhtZ+3oK3TgjTb8zFWKkZ
-cJKUqJxlQ4Lv1VyeIUs9HlLFXJz4kWvGdAfL/Qg7pSD3Ghcv55Qjs+kbNG2AS2I5
-OuS4wjkesERs+ji+TpoLDbIAX+Yfww15r3ZQywMPIVxm4MRIT3/IgjxlGxCnS89P
-JPjdwsZ3BS18XGcn8E8=
-=dz0Z
+iJwEAQEIAAYFAk8NQREACgkQfXuS5UK5QB0E4AP9H52VmeVy9CgcKuTsJp9kf+t5
+uVwGe77YI+fFwiqaaSu9wlgl3dTlKMnHr2U5B7wv817KQQdI84U8I5fA73g7VBuz
+m/99JJjsgf3CiSLm/kk8DyTiahcDBMKZimrvQQkOOtJTtlcOUMcKeCbNeOJS2zPr
+ubMDIy/TcI5fzNwIMUo=
+=LkZo
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/systemd/systemd-38.ebuild b/sys-apps/systemd/systemd-38.ebuild
new file mode 100644 (file)
index 0000000..31001bc
--- /dev/null
+++ b/sys-apps/systemd/systemd-38.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-38.ebuild,v 1.1 2012/01/11 07:56:35 mgorny Exp $
+
+EAPI=4
+
+inherit autotools-utils bash-completion-r1 linux-info pam systemd
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
+SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="acl audit cryptsetup gtk lzma pam plymouth selinux tcpd"
+
+COMMON_DEPEND=">=sys-apps/dbus-1.4.10
+       >=sys-apps/util-linux-2.19
+       >=sys-fs/udev-172
+       sys-libs/libcap
+       acl? ( sys-apps/acl )
+       audit? ( >=sys-process/audit-2 )
+       cryptsetup? ( sys-fs/cryptsetup )
+       gtk? (
+               dev-libs/dbus-glib
+               >=dev-libs/glib-2.26
+               dev-libs/libgee:0
+               x11-libs/gtk+:2
+               >=x11-libs/libnotify-0.7 )
+       lzma? ( app-arch/xz-utils )
+       pam? ( virtual/pam )
+       plymouth? ( sys-boot/plymouth )
+       selinux? ( sys-libs/libselinux )
+       tcpd? ( sys-apps/tcp-wrappers )"
+
+# Vala-0.10 doesn't work with libnotify 0.7.1
+VALASLOT="0.12"
+# A little higher than upstream requires
+# but I had real trouble with 2.6.37 and systemd.
+MINKV="2.6.38"
+
+# 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="${COMMON_DEPEND}
+       !<sys-apps/openrc-0.8.3"
+DEPEND="${COMMON_DEPEND}
+       app-arch/xz-utils
+       dev-util/gperf
+       dev-util/intltool
+       gtk? ( dev-lang/vala:${VALASLOT} )
+       >=sys-kernel/linux-headers-${MINKV}"
+
+# Due to vala being broken.
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+pkg_setup() {
+       enewgroup lock # used by var-lock.mount
+       enewgroup tty 5 # used by mount-setup for /dev/pts
+}
+
+src_prepare() {
+       # Force the rebuild of .vala sources
+       touch src/*.vala || die
+
+       # Fix hardcoded path in .vala.
+       sed -i -e 's:/lib/systemd:/usr/lib/systemd:g' src/*.vala || die
+
+       autotools-utils_src_prepare
+}
+
+src_configure() {
+       local myeconfargs=(
+               --with-distro=gentoo
+               --with-rootprefix=/usr
+               --with-rootlibdir=/usr/$(get_libdir)
+               --localstatedir=/var
+               --docdir=/tmp/docs
+               $(use_enable acl)
+               $(use_enable audit)
+               $(use_enable cryptsetup libcryptsetup)
+               $(use_enable gtk)
+               $(use_enable lzma xz)
+               $(use_enable pam)
+               $(use_enable plymouth)
+               $(use_enable selinux)
+               $(use_enable tcpd tcpwrap)
+       )
+
+       if use gtk; then
+               export VALAC="$(type -p valac-${VALASLOT})"
+       fi
+
+       autotools-utils_src_configure
+}
+
+src_install() {
+       autotools-utils_src_install \
+               bashcompletiondir=/tmp
+
+       # compat for init= use
+       dosym ../usr/bin/systemd /bin/systemd
+       # rsyslog.service depends on it...
+       dosym ../usr/bin/systemctl /bin/systemctl
+
+       # move files as necessary
+       newbashcomp "${D}"/tmp/systemd-bash-completion.sh ${PN}
+       dodoc "${D}"/tmp/docs/*
+       rm -r "${D}"/tmp || die
+
+       # we just keep sysvinit tools, so no need for the mans
+       rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
+               || die
+       rm "${D}"/usr/share/man/man1/init.1 || die
+
+       keepdir /run
+
+       # Create /run/lock as required by new baselay/OpenRC compat.
+       insinto /usr/lib/tmpfiles.d
+       doins "${FILESDIR}"/gentoo-run.conf
+
+       # Migration helpers.
+       exeinto /usr/libexec/systemd
+       doexe "${FILESDIR}"/update-etc-systemd-symlinks.sh
+       systemd_dounit "${FILESDIR}"/update-etc-systemd-symlinks.{service,path}
+       systemd_enable_service sysinit.target update-etc-systemd-symlinks.path
+}
+
+pkg_preinst() {
+       local CONFIG_CHECK="~AUTOFS4_FS ~CGROUPS ~DEVTMPFS ~FANOTIFY ~IPV6"
+       kernel_is -ge ${MINKV//./ } || ewarn "Kernel version at least ${MINKV} required"
+       check_extra_config
+}
+
+optfeature() {
+       elog "  [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1} (${2})"
+}
+
+pkg_postinst() {
+       if [[ ! -L "${ROOT}"etc/mtab ]]; then
+               ewarn "Upstream suggests that the /etc/mtab file should be a symlink to /proc/mounts."
+               ewarn "It is known to cause users being unable to unmount user mounts. If you don't"
+               ewarn "require that specific feature, please call:"
+               ewarn " $ ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
+               ewarn
+       fi
+
+       elog "You may need to perform some additional configuration for some programs"
+       elog "to work, see the systemd manpages for loading modules and handling tmpfiles:"
+       elog "  $ man modules-load.d"
+       elog "  $ man tmpfiles.d"
+       elog
+
+       elog "To get additional features, a number of optional runtime dependencies may"
+       elog "be installed:"
+       optfeature 'dev-python/dbus-python' 'for systemd-analyze'
+       optfeature 'dev-python/pycairo[svg]' 'for systemd-analyze plotting ability'
+       elog
+
+       ewarn "Please note this is a work-in-progress and many packages in Gentoo"
+       ewarn "do not supply systemd unit files yet. You are testing it on your own"
+       ewarn "responsibility. Please remember than you can pass:"
+       ewarn " init=/sbin/init"
+       ewarn "to your kernel to boot using sysvinit / OpenRC."
+
+       # Don't run it if we're outta /
+       if [[ ! ${ROOT%/} ]]; then
+               # Update symlinks to moved units.
+               sh "${FILESDIR}"/update-etc-systemd-symlinks.sh
+
+               # Try to start migration unit.
+               ebegin "Trying to start migration helper path monitoring."
+               systemctl --system start update-etc-systemd-symlinks.path 2>/dev/null
+               eend ${?}
+       fi
+}