summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2012-01-07 17:53:47 +0000
committerMichał Górny <mgorny@gentoo.org>2012-01-07 17:53:47 +0000
commitf0c45463dbdfd0680f0fea500692461c4e48bf09 (patch)
tree7ce8382bc4612d0fec0ad62cd9eaab46149d988c /eclass
parentStable for AMD64, wrt bug #397977 (diff)
downloadhistorical-f0c45463dbdfd0680f0fea500692461c4e48bf09.tar.gz
historical-f0c45463dbdfd0680f0fea500692461c4e48bf09.tar.bz2
historical-f0c45463dbdfd0680f0fea500692461c4e48bf09.zip
Install systemd units to /usr/lib.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/systemd.eclass8
2 files changed, 10 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 6174ed573722..d13df25f74e3 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.73 2012/01/06 21:32:48 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.74 2012/01/07 17:53:47 mgorny Exp $
+
+ 07 Jan 2012; Michał Górny <mgorny@gentoo.org> systemd.eclass:
+ Install systemd units to /usr/lib.
06 Jan 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
mysql.eclass, mysql-autotools.eclass, mysql-cmake.eclass, mysql-v2.eclass,
diff --git a/eclass/systemd.eclass b/eclass/systemd.eclass
index 6b94a558c2d0..1ddc9b00faa4 100644
--- a/eclass/systemd.eclass
+++ b/eclass/systemd.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.10 2012/01/05 23:20:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.11 2012/01/07 17:53:47 mgorny Exp $
# @ECLASS: systemd.eclass
# @MAINTAINER:
@@ -30,12 +30,16 @@ case ${EAPI:-0} in
*) die "${ECLASS}.eclass API in EAPI ${EAPI} not yet established."
esac
+# Block systemd version without the migration helper.
+DEPEND="!<sys-apps/systemd-29-r4
+ !=sys-apps/systemd-37-r1"
+
# @FUNCTION: _systemd_get_unitdir
# @INTERNAL
# @DESCRIPTION:
# Get unprefixed unitdir.
_systemd_get_unitdir() {
- echo -n /lib/systemd/system
+ echo -n /usr/lib/systemd/system
}
# @FUNCTION: systemd_get_unitdir