summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/systemd/ChangeLog7
-rw-r--r--sys-apps/systemd/systemd-198-r5.ebuild13
-rw-r--r--sys-apps/systemd/systemd-9999.ebuild10
3 files changed, 20 insertions, 10 deletions
diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 7179aa6a23be..a894d64bda2b 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-apps/systemd
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.95 2013/03/26 08:02:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.96 2013/03/26 16:24:26 mgorny Exp $
+
+ 26 Mar 2013; Michał Górny <mgorny@gentoo.org> systemd-198-r5.ebuild,
+ systemd-9999.ebuild:
+ Use get_udevdir rather than the deprecated one. Support installing static-libs
+ wrt bug #463250. Disable SysV compat wrt bug #463270.
26 Mar 2013; Michał Górny <mgorny@gentoo.org> systemd-198-r5.ebuild,
systemd-9999.ebuild:
diff --git a/sys-apps/systemd/systemd-198-r5.ebuild b/sys-apps/systemd/systemd-198-r5.ebuild
index 5e705ed861b0..924021fcc599 100644
--- a/sys-apps/systemd/systemd-198-r5.ebuild
+++ b/sys-apps/systemd/systemd-198-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-198-r5.ebuild,v 1.2 2013/03/26 08:02:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-198-r5.ebuild,v 1.3 2013/03/26 16:24:26 mgorny Exp $
EAPI=5
@@ -15,7 +15,8 @@ LICENSE="GPL-2 LGPL-2.1 MIT"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
IUSE="acl audit cryptsetup doc efi gcrypt gudev http
- introspection +kmod lzma pam python qrcode selinux tcpd vanilla xattr"
+ introspection +kmod lzma pam python qrcode selinux static-libs
+ tcpd vanilla xattr"
MINKV="2.6.39"
@@ -91,6 +92,9 @@ src_configure() {
--enable-split-usr
# no deps
--enable-keymap
+ # disable sysv compatibility
+ --with-sysvinit-path=
+ --with-sysvrcnd-path=
# just text files
--enable-polkit
# optional components/dependencies
@@ -115,7 +119,7 @@ src_configure() {
)
# Keep using the one where the rules were installed.
- MY_UDEVDIR=$(udev_get_udevdir)
+ MY_UDEVDIR=$(get_udevdir)
autotools-utils_src_configure
}
@@ -137,9 +141,6 @@ src_install() {
# remove pam.d plugin .la-file
prune_libtool_files --modules
- # remove useless 'README' files
- rm "${D}"/{etc/init.d,var/log}/README || die
-
# move nss_myhostname to rootfs (bug #460640)
dodir /$(get_libdir)
mv "${D}"/usr/$(get_libdir)/libnss_myhostname* "${D}"/$(get_libdir)/ \
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 4f026227b096..f06e363f8482 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.26 2013/03/26 08:02:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.27 2013/03/26 16:24:26 mgorny Exp $
EAPI=5
@@ -23,7 +23,8 @@ LICENSE="GPL-2 LGPL-2.1 MIT"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
IUSE="acl audit cryptsetup doc efi gcrypt gudev http
- introspection +kmod lzma pam python qrcode selinux tcpd vanilla xattr"
+ introspection +kmod lzma pam python qrcode selinux static-libs
+ tcpd vanilla xattr"
MINKV="2.6.39"
@@ -107,6 +108,9 @@ src_configure() {
--enable-split-usr
# no deps
--enable-keymap
+ # disable sysv compatibility
+ --with-sysvinit-path=
+ --with-sysvrcnd-path=
# just text files
--enable-polkit
# optional components/dependencies
@@ -131,7 +135,7 @@ src_configure() {
)
# Keep using the one where the rules were installed.
- MY_UDEVDIR=$(udev_get_udevdir)
+ MY_UDEVDIR=$(get_udevdir)
autotools-utils_src_configure
}