Add systemd support #371367 by Opportunist. Also add USE=selinux support.

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

4 files changed, 37 insertions, 47 deletions

diff --git a/sys-apps/smartmontools/ChangeLog b/sys-apps/smartmontools/ChangeLog
index c8984c5d8651..968b33954f9c 100644
--- a/sys-apps/smartmontools/ChangeLog
+++ b/sys-apps/smartmontools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/smartmontools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/ChangeLog,v 1.114 2012/08/18 04:44:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/ChangeLog,v 1.115 2012/08/18 04:53:03 vapier Exp $
+
+  18 Aug 2012; Mike Frysinger <vapier@gentoo.org> smartmontools-5.43.ebuild,
+  smartmontools-9999.ebuild:
+  Add systemd support #371367 by Opportunist.  Also add USE=selinux support.
 
   18 Aug 2012; Mike Frysinger <vapier@gentoo.org> smartmontools-5.43.ebuild,
   smartmontools-9999.ebuild:
diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index 47b3f34d011d..8904a19ad21d 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -14,24 +14,24 @@ EBUILD smartmontools-5.39.1.ebuild 1510 SHA256 c142d94b4cd3336e6e3a21c7c1e4d6559
 EBUILD smartmontools-5.40.ebuild 1743 SHA256 1afd5d438263f3bc23198c5e1f99d8ffbcbbe04b3d4d58f8968f806cccfb2418 SHA512 d782a031365bf4972dd1631e7a5e0c68ac8505fa892821e43fe5a8775fa819469e6aaf528f1c2dc81c67e20b0623b4ec11552f267e136f18b8e5f4ffc94a8345 WHIRLPOOL 2c2850418e73403a21451f6d0f04db4ebc13c91a57b7bc24f3bb2a0c15148773b1ba925b732c7c3bf94f8b68fed9a590dcc60f1e26a5ed012d9132df15c29ce7
 EBUILD smartmontools-5.41-r1.ebuild 1697 SHA256 989605309d4ff98d4b54a216771fff3c19b65175020c7d15976d4c2d178e40e4 SHA512 3bfaf7d2846d56a30551f8f461fa21541d012f610cf012469e9cbeed593e56bc7d9c5e4070e62ad979f435c1205da9bc9ad2c40c509a01a7210db78588476911 WHIRLPOOL a7fdfc9d3ca179fe3bf576e1e8e9cc8886ec96a42e4bb4f62762c8af7a23def162b6843e7955a39ea9688f1127acaedf96bd5e24b2265914b1d1a69040c9c90c
 EBUILD smartmontools-5.42.ebuild 1705 SHA256 249715c5038d5dc3a533dae5b6fbf9b1343ccb01ad4d52d1156453dd8340b683 SHA512 380c3a51112f65280da268b339b8f230da7b4145430039c5dc8073dc456763069bf6794a1bd1fdceffda55ec2f08c767cbf494f6b4f3649a7a24a918d7cc45f2 WHIRLPOOL bdb160c54d4852fd6cf80dc520e82e031068fa5f56f84a7acaf5fa05e6d303a5f064b2bf4f84ea5b5e4a70327d104aca8a964d0084c7405730feb33ab18eba04
-EBUILD smartmontools-5.43.ebuild 1718 SHA256 1009e187e43e6061fee7402ae2e6d4da469502caf78ee4f2954c0b23258eb70a SHA512 8da06a9a02cda65e5ac34440206f96ab01951572e1d84ccc825cf043f34b69a81c5562e9f245f1742a5e102869f88e62701536f8c749e87e9c5ba15704476f1a WHIRLPOOL b0757cf32b5432a1a35025283235fbf130baae29b49df1bab7fe71179bba79bfdaf8459d45a1040e907886dde169007f246948481ff20ee748955a8ece26a68f
-EBUILD smartmontools-9999.ebuild 1718 SHA256 20d8d4549961aed74f744510b398e817e3a7f4c74642deac3f365993eda7c59e SHA512 fb697b3b685f129562bd2ce075f362e957223f22e41a55834f32a690cc6c19694b1ba551946a7e84e2f0e6c4e1ea99fe090b0bfc4fdebc406d7866669fa168d4 WHIRLPOOL 87d3b04fcf3f30a23b262d0acf103cdcef073adfe929601750c627671684c785edf04bae55eba57446623acbfac3a72ec5e905e6d7414411d6bf7953fec88b59
-MISC ChangeLog 15220 SHA256 067bcba8556df60dab387c937e0b518bdb36d731467169385722cc5e4ed0dd0b SHA512 92be1a79faa89cf03e8fd076b8f4fb3391f8fbcb3d123ebac6e43a83feca1cfb2c0099f9c555ea194d2d27abc9519fde3214073bed3b876fd9061115d77a6cab WHIRLPOOL ce09a4f2ebc6d5f7e7754b2ae5deb8cd10a035fcfc34a41a929628b006b8d34378c194b77dbf004887359ace6e07b95ca39dabbd0b4f498591c59ef3e7b3eea8
+EBUILD smartmontools-5.43.ebuild 1637 SHA256 2f182b5304ad67795083539cf96b878bfe88de1be6ffc62ac863626d774d3cc4 SHA512 6f015ef8c8998271debd7bec915173073a5e2447c563d0758ee8ea7751b4cbaeadd9bf37c11db16b27f7750987a474e8d0119aae8c5e799d46ffc7033d8578a0 WHIRLPOOL 329bf90b8e825dfc2b25d79c29a4d6ee9bb7e9d046ab53532f5c5ed17246968b8d93c22fbed0fb82fbb93b92b9edf414f28ae49620ed94900752f1c4323badb2
+EBUILD smartmontools-9999.ebuild 1638 SHA256 7f75a5574d66f8a97fb1dbf097790d8e10f2c3aa721c9cce9c9f4052fb587ef6 SHA512 961bdb51736d7762cb94c50c45a2642dec6d24a064b8fec439b91287685d1ea7e2d3ca126891dc2ad5aaa502cc02c29fc8db45dfac2c90b0671c15c9dd144b30 WHIRLPOOL bd961caeb0163ad7379a929b950efd76fa08dbbf15d8843394f6ed499faefb75b5f3935b36362e4557efc9230059e9ec04266b75a861773341b5e04f34869ef5
+MISC ChangeLog 15404 SHA256 d51cba963f2a19eec6284e50596d18b595a8f286c555389af7cc9db46e53afc9 SHA512 d8dbcc059cbfe66201418c65afa8b5e806ce9043acdf6443aa84b3ed2da8be095f1e95538fb129473685a0fdf9ca0509e1cc26ff6b03bf3347779cc8935656e2 WHIRLPOOL b7bf196f1b597ff6ce415bb371b52c95a3afdbf37be43d522b80131a160f22a0f4cf170bb00cb37fb4dd987573842e437107c280d595364db4f20b47f07777a3
 MISC metadata.xml 266 SHA256 bdf7da32dcd39df0f58aa02c64dfd1c5dda0ca1080c9b1001d8e110881a364eb SHA512 d2809f0df32816d12eb21b020e5edd68c28bf3ad42ca6c6ae24acb2a08afdf2ca85398b830de01a7377c10e929a8b0a3e74c4daa3c43710ad8b93a198ef2d049 WHIRLPOOL 3df4d283499b426832cc7964e0bb277614ec8fbe4ca5729dfc8dec28a85bdadba94076c845d898ab73e13ece50e7e595322fdfc095a6e4c8fa0b1706b1119e88
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQLx3BAAoJELEHsLL7fEFWciwQALqD4q84n9ZEbrywF1ceE7ig
-ES2MSIT21DYQKjSPGr3nWda4vFb4hhHmHz6ulVTIST4tAch7IaoXv64Mf8mhlK1s
-89PhGprMKkq9Iox5KQU/ZtsjKdgQSepB4fCtnFtW0KagbTDcIoQCccI4xiRXki/g
-d9Oijo/JXaBOV8n6+DaNNuGBJ3z+DgKP0eqAMmZaFiQAtTEb5OaHI9CLuRFJxrpv
-Nd3DCu5QmbADjrfiAELdr014ebbee3RwEe1PYsaFoYg8I4j/tBZhRtIMplC0yrF7
-qpcs0mLNWy9a4enxFPnRj0jYNi54AMQZfUUyeRXZFdPGoCReGZ1tYJ+rxnILfR3q
-SRvDskPft0MybBpoxgLYg9o2wwqxeJS4z6SoEHbDOBi8doyJncw5GPhUAssalcqE
-kC2qoamo122iHPzh+vUencrKNemCMfCeTtJVle9x+/dvNkTBT9RS1XWOZj2j24A6
-anrxnvqgik+mN6r43FmKRz6vWroUAXeFS0AC2HeQis1kBp/tqDzqLaTjZojU5MIt
-qA59X4CniaCJMwX4TeJGrkGO6X6+xO7bCvXifU4wNXeVHXzzEk/8DqyxYRboLRbT
-CJ0BSomuCY685SSQ7dYHPlSjIyoiNE/v4BFhXLw/4EYUbzYMs9BaWRClsqjaTSpK
-QhJDX40wrVcjkoZHU3ll
-=0f8d
+iQIcBAEBCAAGBQJQLx+6AAoJELEHsLL7fEFWF4gQAJe9YWQQtnGaQcIcl+eEkaLM
+OeaWX4rVqzpajxYFHlngRHvTZCVuyhjguiMY2V33Mnk9rPIjUfXXWwlpNRS4TQRX
+e+1FtU5VM6c+bfp5Cp5oROc/jtbybxf5Dlcll8s/RvRf9y5s8hbCtqYeUmIUEVFf
+NhFJdDOAPWVFd3BFh1+QgfOW4/w+ksdid7CfTCH0okNd4RL5MXRoEsig+QbQTXE1
+MsAR7zpfYHHKZKVcVJdJoq8lw73AxaiZmnia0TpvJ4NsxbqQ7M0luCaboV6a5/n0
+WqsL05fJlGod1kZpc4OT8Sxw7s6/20UpDy4qS3lqnBWoDlvKPgFqFCqOgVGJRo0Y
+iWdctVqBml5Dj+EItwVjYg/gRJc63m2P0tziKerL3IJmRS994fSjicOils8NtGOJ
+1pUU/wsDWA7SFLdgGff7s420ckyco2QANkvffW9jPrYPbdv2F1hUEgoKND75DZP6
+fTk1vj54Ev9Yka1GVAr4JyjfNR8J3PjlsHHiXVBHd/gozwdottk/kZiws8RxQLPr
+BhpsefWA8eGvbW/+G2lMGvjcvHPtFT5oSBnbG/CnU72e0h1Ou/ntoSArDgg4K8/I
+DuY6U0vFf/tqK1Q2mp5/gL5nIVk68QzbyhT65fZdA4B8RRxNWwlK6nVjUvQWYLjU
+ixSt9CRtD1oJLoDwsg1V
+=AB3V
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/smartmontools/smartmontools-5.43.ebuild b/sys-apps/smartmontools/smartmontools-5.43.ebuild
index 98d0f244405c..c86a8e32e5f0 100644
--- a/sys-apps/smartmontools/smartmontools-5.43.ebuild
+++ b/sys-apps/smartmontools/smartmontools-5.43.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/smartmontools-5.43.ebuild,v 1.2 2012/08/18 04:44:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/smartmontools-5.43.ebuild,v 1.3 2012/08/18 04:53:03 vapier Exp $
 
 EAPI="3"
 
-inherit flag-o-matic
+inherit flag-o-matic systemd
 if [[ ${PV} == "9999" ]] ; then
 	ESVN_REPO_URI="https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk/smartmontools"
 	ESVN_PROJECT="smartmontools"
@@ -20,9 +20,10 @@ HOMEPAGE="http://smartmontools.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="static minimal caps"
+IUSE="caps minimal selinux static"
 
-DEPEND="!minimal? ( caps? ( sys-libs/libcap-ng ) )"
+DEPEND="caps? ( sys-libs/libcap-ng )
+	selinux? ( sys-libs/libselinux )"
 RDEPEND="${DEPEND}
 	!minimal? ( virtual/mailx )"
 
@@ -34,22 +35,14 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf
 	use minimal && einfo "Skipping the monitoring daemon for minimal build."
 	use static && append-ldflags -static
-
-	if ! use minimal; then
-		myconf="${myconf} $(use_with caps libcap-ng)"
-	else
-		# disable it so that we stay safe
-		myconf="${myconf} --without-libcap-ng"
-	fi
-
 	econf \
 		--with-docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--with-initscriptdir="/toss-it-away" \
-		${myconf} \
-		|| die
+		$(use_with caps libcap-ng) \
+		$(use_with selinux) \
+		$(systemd_with_unitdir)
 }
 
 src_install() {
diff --git a/sys-apps/smartmontools/smartmontools-9999.ebuild b/sys-apps/smartmontools/smartmontools-9999.ebuild
index 8e4678c922fc..6cff77b8f3aa 100644
--- a/sys-apps/smartmontools/smartmontools-9999.ebuild
+++ b/sys-apps/smartmontools/smartmontools-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/smartmontools-9999.ebuild,v 1.9 2012/08/18 04:44:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/smartmontools-9999.ebuild,v 1.10 2012/08/18 04:53:03 vapier Exp $
 
 EAPI="3"
 
-inherit flag-o-matic
+inherit flag-o-matic systemd
 if [[ ${PV} == "9999" ]] ; then
 	ESVN_REPO_URI="https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk/smartmontools"
 	ESVN_PROJECT="smartmontools"
@@ -20,9 +20,10 @@ HOMEPAGE="http://smartmontools.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="static minimal caps"
+IUSE="caps minimal selinux static"
 
-DEPEND="!minimal? ( caps? ( sys-libs/libcap-ng ) )"
+DEPEND="caps? ( sys-libs/libcap-ng )
+	selinux? ( sys-libs/libselinux )"
 RDEPEND="${DEPEND}
 	!minimal? ( virtual/mailx )"
 
@@ -34,22 +35,14 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf
 	use minimal && einfo "Skipping the monitoring daemon for minimal build."
 	use static && append-ldflags -static
-
-	if ! use minimal; then
-		myconf="${myconf} $(use_with caps libcap-ng)"
-	else
-		# disable it so that we stay safe
-		myconf="${myconf} --without-libcap-ng"
-	fi
-
 	econf \
 		--with-docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--with-initscriptdir="/toss-it-away" \
-		${myconf} \
-		|| die
+		$(use_with caps libcap-ng) \
+		$(use_with selinux) \
+		$(systemd_with_unitdir)
 }
 
 src_install() {