Fix installing systemd unit by Xake (bug #496854).

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

4 files changed, 30 insertions, 19 deletions

diff --git a/app-admin/sysstat/ChangeLog b/app-admin/sysstat/ChangeLog
index 60a1fee6d8b0..6477acfd4dd8 100644
--- a/app-admin/sysstat/ChangeLog
+++ b/app-admin/sysstat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/sysstat
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/ChangeLog,v 1.253 2013/12/24 12:48:43 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/ChangeLog,v 1.254 2014/01/04 12:40:07 jer Exp $
+
+  04 Jan 2014; Jeroen Roovers <jer@gentoo.org> sysstat-10.2.0.ebuild,
+  +files/sysstat-10.2.0-systemd.patch:
+  Fix installing systemd unit by Xake (bug #496854).
 
   24 Dec 2013; Agostino Sarubbo <ago@gentoo.org> sysstat-10.2.0.ebuild:
   Stable for x86, wrt bug #494248
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index e2961f82fc7f..e6aa9d1d5a12 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -2,27 +2,18 @@
 Hash: SHA256
 
 AUX sysstat-10.0.4-flags.patch 887 SHA256 198660c418902107914afefbed1b07a0206ee05d673e99182f834f4ed98d1e8c SHA512 7daf43a8b09af67781ae33cbaaf7d6da9bb1f6f750428a08c3ddde8ecb94e0de27d5746a332086eb5191cccd8e6dbc37c263ab3046294b4b3df1a2666c1ab6ee WHIRLPOOL 7629adddebfb4a1704348ad17f6151359d343ef4285139681b61bba261c2a26cccc49b59c9b75bd18d29a864877845c69e7f7d66c9a8700bd16b75b6c412e17f
+AUX sysstat-10.2.0-systemd.patch 556 SHA256 f92b2ccc475e192e10cd4e0c0a9eabae73f6637392e890e046558d33f26529d8 SHA512 a9391e6f696b1e09e523d0f8b542c02566792515d215ba7b5e8c253234466238f0a5452e46dcf334926e5c341c373b3f36b8f37b2d21e792e7b32cb77705deca WHIRLPOOL d9417ccaabb63393dfb8e250d48ecc062251dd69ee54c6c552309151ae5a72d2cee820c21a9d51fb1b9617a6fa9f00f2c8b2f8a7f77b8f79e959f84edad6b9e9
 AUX sysstat.init.d 487 SHA256 2a68f48dd3e10fa62fcebc33ce5cf020b9ccd4a6bde4a21591f2d2b6739c02c2 SHA512 21ec3796055fbe306f9d7729c398e9c54b7583b8d8bfa343961b43f8d72af4c0b50f1da165d905cbf256ca1a6d2cc9d3528acec5bcb751628c9455932d0bc13d WHIRLPOOL a4f0828f3494af99ea1390b8953a9ff1f10b55079b11e20c7797892308ec76a8c507aeb6c7783a58caf333cf30c96f711409f458e03a6c297824e164ad021732
 DIST sysstat-10.0.5.tar.bz2 282403 SHA256 3e96fdc8d6710f4b642757ff88e3c4296d55838b64ff102feaaf2175f66e875b SHA512 d40cb67c61f499445dee803ac54af50704aa49a4d20b11b5aaaf8966ab6eacfbc72d30c933cf678e324d283818cb5a0beb55cddeb689b0c3a1fdeb4813b4ac63 WHIRLPOOL 868cbbcc179e5810a9b5f1af214974f949c15f0b7f8a114554f85aeb23a755be17fa76f0c24303de9b274c438097d2c2f5f48b421c275977b8bea58e49d01ac4
 DIST sysstat-10.2.0.tar.bz2 307186 SHA256 8e494c30a2e5c4f11d6398b39df297a732fa3d4e3f5d5aa086044fccfe77f6d2 SHA512 6bc8b1217402845a4236c5ffc18f024700fa08e179b558eb65e23a7b95e1d1f1c45c2da6c323e59e74c938903fa0a6820997091d4e84a811fad7cb715dc25320 WHIRLPOOL 61097f59757032c03445410985d8fc98f5feef83d417e8bf666c56728517796c8007869b6328feabcb9fff3024b990fff7fcb4f045215f4614584f08c0db006d
 EBUILD sysstat-10.0.5.ebuild 2156 SHA256 d1f8b6ef1137056afb359a72e2f93c2ccb1c53adf45c6abadf17227d348776ff SHA512 24b3456d14a6205a93d3199564b61832e387857017671b824c8d11308f7309b260464a6b9c25e41dda057e9bba7a5514b536ee6d526f94143404537af5fd7a5b WHIRLPOOL 67b1e03deb53f3e36889991f40305796fbb1b462903cffb9cac926586f487e02f6f23624c8868a79f9448e5f82d3ff31d2831dd027fc817e76225df4d087aba9
-EBUILD sysstat-10.2.0.ebuild 1739 SHA256 23cd8e2db1004e6e28e203d088bf168ad7e5d57081949e69a865efd4197a1572 SHA512 d9326358669f37b97044fa54ca4fbaf046497c5a0e508f4da4e997024c364756c594dd1b8be794d0d454f96d05ba52bd7d6708675671429dac8b5a68f5a246e6 WHIRLPOOL 88ce2f146110d45dc561773e17333f7e463db3ce7e7b85a02719dc14952b695912c769f19699845e78c13e27e3a516904b364e0ef04594ff0bf4b8fbefab7f8d
-MISC ChangeLog 31544 SHA256 984b8a5e2feb41dde680ddb6428378f7d877c88ebcb59ffcf0357428c058d4fb SHA512 0455472ab7c90bb868a9dc521f19239c502650ed72e6048a2d4621c654a5af1cac9332aa752b642f4cb2a5fe2a5b607a7c77b4dc2d2d702345fa79a4d7abde92 WHIRLPOOL 4ecb5989e7bb800712150dc34c37f517c9a271d8438f6a4e325af0793e878caca79fe7c1429537bff389d9070d2cf99cae637d7bc2812b7db2414914849cffb6
+EBUILD sysstat-10.2.0.ebuild 1788 SHA256 9c5674491b7d5c1fa3c4cf1e5e1dbadbf33894486b87a8af071e7ad8a8e962b8 SHA512 f6e00859ba79c20cbe22820a9f96007c07efb0622782f8cc6a256a050b950227a7ee390b77f7dc6c3ed415d984839157827641840417cac16ebc7e23cd8ad588 WHIRLPOOL 36e58a5847e2775e116d98e0c3af5eea70546653a0fbbd69c4feff26dfb33e041c10ac1a34a74e7bae66d27357fb80a9706fe6bfb44378b44d6cde7e3f28ee2c
+MISC ChangeLog 31707 SHA256 1fc1aa20ef8c961d544ed2b8413d0cd80231b828f1b76db4d85337c7c75770b3 SHA512 110ac22ac22b13d5bc2097408fddff5a65293a926f2eca4c9ac93d1f722633737f5507d4d6c248a4490305cb0c3e49e93623638d4d55a0ac802a628b0da301a6 WHIRLPOOL f2d2e15605fdc8dce61a336474ecc19f795d9aa387283d3dde7ce4837386e5d8c2345c6842e4a509b50d0a21e9ac9319f2518553d508ea29a0c400a70e850cb5
 MISC metadata.xml 395 SHA256 90a23fcc0a01b4de0db48afe58aa046e2478075af5bf1b0d9b1c17f016bf945f SHA512 db36af13300611f0c11fb967217c0030f8f7c1100d16cd11566bc4b8d7e3a7bde27a3b037c8f63b60048f7310be1a41cb2deb9154a89dcfa106bda8848cfc6ab WHIRLPOOL a2df1837523416523f96cf52bbd2ef24f6756c6711c217ec6e3fca7daf7c8bca03260b5c9299d630a0cfa2d6491672c1f8e6927d903342b56d164fab0e8ad57a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSuYKuAAoJELp701BxlEWfvCsP/ip9RXgJgwes4K4P4mHJeeJQ
-hjsCAcY8GRtZIpXHtC3dnE5mbbku1lwsDmxgeIksk8JADE2XJAZBv3Kop/JoVGkP
-KVy/u7QNBzeHqvxpKpBt8rfN3NFLnqjf8FOYQsXl6grcWPB8Qnk/u3v6EsHO3rVf
-inr6rBmeE/kUSxdw5dkaacMq42yPKuTC9JbHBaJKTW2Ey3W674yzQgyLS78tkhVC
-GcY0AGy3U1gb5335ZymFsVoaJfQrwofy0xkpXqhfrkle4dE5dwCHxcfGBgBmP9FF
-t0JgAK7uuQDu2VpvMCBVwI2AA1C7aXeEt0STufReJEUK6Tp+mrrAGZz7g0voxE8N
-yB7+l0NuW6ou8lf0ZN5UrIsnNvHsq9GWbwvFj5IEJz2j5QMV0vY5aDS0JMnCbjVR
-+3h9SPeMSapBSSKHXWfeWw0cF7VQK7DCvYZ1vI3brPAMP5vrnbcPKGMjW33dMkE/
-7ZrURC8tSeUt6qYg1OAhDtl+G5rdsc3HrZTWEccTMmXPw6LscHvunii484Xd4JIu
-QBgVNIzEVrRY1Om0i68qQDK3il7tvBjX/85V625ono/ZblIygHVcK5BLCJ0ipd/w
-ZtwB5XVOQAjcW3qz1W8brd9unROJRVfz93uNhMJnXuImrb9tJPHPUWuqWjLp5Hxz
-0mnrNNZYL/I1tLPkCdyY
-=aRME
+iEYEAREIAAYFAlLIASgACgkQVWmRsqeSphPGaQCeO7EABcaCTQs0900Q5jpSWFeH
+AVQAn29UB71KgWGkplIVvBUWq3/bndEv
+=Kxvj
 -----END PGP SIGNATURE-----
diff --git a/app-admin/sysstat/files/sysstat-10.2.0-systemd.patch b/app-admin/sysstat/files/sysstat-10.2.0-systemd.patch
new file mode 100644
index 000000000000..c067f21a27c2
--- /dev/null
+++ b/app-admin/sysstat/files/sysstat-10.2.0-systemd.patch
@@ -0,0 +1,15 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -376,8 +376,7 @@ install_all: install_base cron/crontab sysstat \
+ 	   su $(CRON_OWNER) -c "crontab cron/crontab"; \
+ 	fi
+ 	if [ -x $(SYSTEMCTL) -a -d "$(SYSTEMD_UNIT_DIR)" ]; then \
+-	    $(INSTALL_DATA) sysstat.service $(SYSTEMD_UNIT_DIR); \
+-	    $(SYSTEMCTL) enable sysstat.service; \
++	    $(INSTALL_DATA) -D sysstat.service $(DESTDIR)$(SYSTEMD_UNIT_DIR); \
+ 	elif [ -d $(DESTDIR)$(INIT_DIR) ]; then \
+ 	   $(INSTALL_BIN) sysstat $(DESTDIR)$(INIT_DIR)/sysstat; \
+ 	   if [ -x $(CHKCONFIG) ]; then \
+-- 
+1.8.5.2
+
diff --git a/app-admin/sysstat/sysstat-10.2.0.ebuild b/app-admin/sysstat/sysstat-10.2.0.ebuild
index 98764bb08743..8d541d7f17f4 100644
--- a/app-admin/sysstat/sysstat-10.2.0.ebuild
+++ b/app-admin/sysstat/sysstat-10.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.0.ebuild,v 1.7 2013/12/24 12:48:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-10.2.0.ebuild,v 1.8 2014/01/04 12:40:07 jer Exp $
 
 EAPI=5
 inherit eutils multilib toolchain-funcs
@@ -42,6 +42,7 @@ src_prepare() {
 		done
 	fi
 	epatch "${FILESDIR}"/${PN}-10.0.4-flags.patch
+	epatch "${FILESDIR}"/${PN}-10.2.0-systemd.patch
 }
 
 src_configure() {