Fix systemd unit install location (bug #499948 by bx).

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 17 insertions, 9 deletions

diff --git a/app-admin/sysstat/ChangeLog b/app-admin/sysstat/ChangeLog
index ed123104d11b..640ef2eaa69b 100644
--- a/app-admin/sysstat/ChangeLog
+++ b/app-admin/sysstat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/sysstat
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/ChangeLog,v 1.257 2014/01/25 15:47:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/ChangeLog,v 1.258 2014/02/01 12:44:08 jer Exp $
+
+*sysstat-10.2.1-r1 (01 Feb 2014)
+
+  01 Feb 2014; Jeroen Roovers <jer@gentoo.org> -sysstat-10.2.1.ebuild,
+  +sysstat-10.2.1-r1.ebuild:
+  Fix systemd unit install location (bug #499948 by bx).
 
 *sysstat-10.2.1 (25 Jan 2014)
 
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index 8d6174353f0b..650618c8405b 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -7,13 +7,13 @@ AUX sysstat.init.d 487 SHA256 2a68f48dd3e10fa62fcebc33ce5cf020b9ccd4a6bde4a21591
 DIST sysstat-10.2.0.tar.bz2 307186 SHA256 8e494c30a2e5c4f11d6398b39df297a732fa3d4e3f5d5aa086044fccfe77f6d2 SHA512 6bc8b1217402845a4236c5ffc18f024700fa08e179b558eb65e23a7b95e1d1f1c45c2da6c323e59e74c938903fa0a6820997091d4e84a811fad7cb715dc25320 WHIRLPOOL 61097f59757032c03445410985d8fc98f5feef83d417e8bf666c56728517796c8007869b6328feabcb9fff3024b990fff7fcb4f045215f4614584f08c0db006d
 DIST sysstat-10.2.1.tar.bz2 309194 SHA256 998f6e75aeb1b64d5ce6ccd3b398318c84a816a96ca3950d29aea8b38e414ea7 SHA512 6e57e4e923285a51367fa4d2ce673cf0a6999fd78c95dfb2f895f3dc36df34bf06a01a11832b31224b4d90461f3b819451ee17866d4ecf9c3b28abd683970162 WHIRLPOOL 274e849135a7f60439c6d4f834b5b3443c577deb5cc73010d3b799e17f6458ae646fec9c1985d0544bc2938919fd1942473a54a05a75c81c3cab27c4ddd1477e
 EBUILD sysstat-10.2.0.ebuild 1787 SHA256 bc114bcbf655ed9a75cdbeffb3f77c5b009c8d98c03df5e029ed7411cea74c3f SHA512 1c880d66b507c84174c9fb4f774f9d387b340611d596abdfa04b68fd0bad1a3896f27c27ce35335e9648e8572aceaf84807e4ff34625c0801a3e402816d02505 WHIRLPOOL 165c13025f2c1dbb0b2ef68cc9ac9e2d93bddc035c6035eba02e035ad5d1c1d25c5b75248e49f9d3781bada11ec2e638142eac9318dc07a358e8139cde74938c
-EBUILD sysstat-10.2.1.ebuild 1769 SHA256 888745698fe978765da0f3e732986db64338585e6ba2706b204ceae690234009 SHA512 134f6b9d876958c55d417f1b9fdad97fcd0f6f09df47b2f55670229cde213fcfe8417dc40bd52d911c8ccc9591287a4fdabff14c61202deac9b28d8a924e1f21 WHIRLPOOL 2252608a1050fd87972ed38802097d80100c70fd4e1f52c37641fc0f976a87f1edbd8e639e0d0b94e2cd6dd9c8efce41c2d01a0c97340765e148fd33529917de
-MISC ChangeLog 32110 SHA256 886644358885cad28de243852e2beff6c4fdf1c0dd83146b92d5a2b8ebc0fd86 SHA512 2634c4951df13279c8b462dad18cc2765bb3aa538628446da5a5ce96bee19e5114f2e2f5548e6c06dac3652255fa9a2bab31bb544f9325ed22b76dc86e21d96e WHIRLPOOL bc03f9d07670d46debac159fa3016c2d42ecea0713b2d83cfcc2d673070dc48e43c61137cde24845aa566e8be3de32a3d5fc930af61952a91bf99a65161437d4
+EBUILD sysstat-10.2.1-r1.ebuild 1862 SHA256 0cbafdb3a7e0950a150faeee75f751388c8f82433be72ca4067e07abdf68dbf7 SHA512 4da73bf61dc9b03208633e06d2f2a74b43d13a4696147b60fb3c8fa7ff3eab519c7a0ec05b4501aeaf54e6abb60d2e8839e184d0cd4680b43d151ef795dd3bb9 WHIRLPOOL 54a06e5eb341829df53e733bb2dc4da8eef1147032c330f8589a69656a892d6b6b6cdaa1e0a65411f246dbfb248764b73f61771f74e7adf62b6c9892049b7103
+MISC ChangeLog 32302 SHA256 5fd82682335a104b762f91eedc2e4951b8a5263eba9c2bde1f9612fdd650b8f3 SHA512 be9a055110ec522ef06b5410800c624574f646a2ccb5eb0b343740ebfcd6108765da0eb98b025fd06878cdc6e0dd0d9d17347f524308df8995a94a7bb835f61b WHIRLPOOL fd707a1d1b3fcaac80ba7ee4587f6f1a36494837e45b2a328811f3ccd6893c4568917b707b774d1be7a50cac9fd5d4394221010a1632465c88cab14355ca87a4
 MISC metadata.xml 395 SHA256 90a23fcc0a01b4de0db48afe58aa046e2478075af5bf1b0d9b1c17f016bf945f SHA512 db36af13300611f0c11fb967217c0030f8f7c1100d16cd11566bc4b8d7e3a7bde27a3b037c8f63b60048f7310be1a41cb2deb9154a89dcfa106bda8848cfc6ab WHIRLPOOL a2df1837523416523f96cf52bbd2ef24f6756c6711c217ec6e3fca7daf7c8bca03260b5c9299d630a0cfa2d6491672c1f8e6927d903342b56d164fab0e8ad57a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLj3IgACgkQVWmRsqeSphMRZwCffu1m4n2jIJ2rKI+CYfi4Sbve
-LNIAn1yULWAMheQ6lOYgeJimRwgQjQr2
-=HxLf
+iEUEAREIAAYFAlLs7BoACgkQVWmRsqeSphOwfACeMtYknmNn9YzQZkcmKRiLRn2q
+vUQAmNgvmc7j73Ccr/eo06EG+8oMkqw=
+=9O26
 -----END PGP SIGNATURE-----
diff --git a/app-admin/sysstat/sysstat-10.2.1.ebuild b/app-admin/sysstat/sysstat-10.2.1-r1.ebuild
index 0c3290eb106f..a73c6b2d01a1 100644
--- a/app-admin/sysstat/sysstat-10.2.1.ebuild
+++ b/app-admin/sysstat/sysstat-10.2.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-10.2.1.ebuild,v 1.1 2014/01/25 15:47:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-10.2.1-r1.ebuild,v 1.1 2014/02/01 12:44:08 jer Exp $
 
 EAPI=5
-inherit eutils multilib toolchain-funcs
+inherit eutils multilib systemd toolchain-funcs
 
 DESCRIPTION="System performance tools for Linux"
 HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
@@ -51,6 +51,7 @@ src_configure() {
 		rcdir=Gentoo-does-not-use-rc.d \
 		econf \
 			--enable-copy-only \
+			--with-systemdsystemunitdir=$(systemd_get_unitdir) \
 			$(use_enable cron install-cron) \
 			$(use_enable debug debuginfo) \
 			$(use_enable doc documentation ) \
@@ -75,7 +76,8 @@ src_install() {
 
 	dodoc contrib/sargraph/sargraph
 
-	newinitd "${FILESDIR}"/sysstat.init.d sysstat
+	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+	systemd_dounit ${PN}.service
 
 	use doc && rm -f "${D}"usr/share/doc/${PF}/COPYING
 }