Version bump (bug #519456). Added rewritten init script

Package-Manager: portage-2.2.11-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

5 files changed, 123 insertions, 20 deletions

diff --git a/sys-apps/smartmontools/ChangeLog b/sys-apps/smartmontools/ChangeLog
index 632400c9aa45..097b470d9c3d 100644
--- a/sys-apps/smartmontools/ChangeLog
+++ b/sys-apps/smartmontools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/smartmontools
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/ChangeLog,v 1.135 2014/01/07 09:15:04 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/ChangeLog,v 1.136 2014/08/09 09:36:30 polynomial-c Exp $
+
+*smartmontools-6.3 (09 Aug 2014)
+
+  09 Aug 2014; Lars Wendler <polynomial-c@gentoo.org>
+  +smartmontools-6.3.ebuild, smartmontools-9999.ebuild, +files/smartd-r1.rc:
+  Version bump (bug #519456). Added rewritten init script.
 
   07 Jan 2014; Lars Wendler <polynomial-c@gentoo.org>
   -smartmontools-5.38.ebuild, -smartmontools-5.39.1.ebuild,
diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index fa9dd4264f2e..2f69c9c6bd05 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -1,29 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX smartd-r1.rc 735 SHA256 691e41511a27c13eeccb5a2e448daf3acba984fe833804c8b36d9ffd6b4427ff SHA512 199970c8da29c884e1e72b55b04edc1ea26b1b73655b7734fba81b80258e2f1a18bbbc0e28c3811988c806fc5a61f5feac20a6ae5c784573b4b150b48b38ec3a WHIRLPOOL 41ae383d703ef51533a8ef4606e81c5c58d25d80e27b91bc4a1def552da0772e2028314e31b7a080b6bee12deebb21411ecca99f4697bb6b63c3d878a36e19e9
 AUX smartd.confd 107 SHA256 714cc1b253e1f59b884be89693757fec91ca878c62f37451a49ef6bb72263e85 SHA512 ff45462944f01c0e7cac99443078b253dcbaed4f99ffab85052b12361d9eec4beec81cab334fbede9148b3dd503d5205add32ef4327a788f02a8b1e37f460437 WHIRLPOOL 773405a2cc669f6eaae835bc3a6415151891b91ccf4111147f8b12d9763be26cbf65815879a70cd64ae12a36f59840ffcb15ff7e527479f88d9816130e704e76
 AUX smartd.rc 1007 SHA256 bdd4ce0d6f061342b5e55b0093c53c910cc2cca30d7d43e2d52b248dfa6368c0 SHA512 8fbe3777859f5bdf3e2e26995fee14c4e8c83fa9ecba5353ac3c97f20b7ca92caf024cf4d26e26820ad6b83148aa6a3893b6b378b06807546e0290b2b3061982 WHIRLPOOL 2dc5af0bde0dbd52c59d8755087a11a66b865c58bd73f593ee0448308faf28b1b64391226f2a11ae589e2335d32e76a9ef2ff56ee0e7a889d3e71e5db7a39c1e
 DIST smartmontools-6.1.tar.gz 787091 SHA256 a9003b8bccc82682f658ce76d70edb1842411e51dc56d4cd6b56618da1d9ce07 SHA512 38aca4b02c0acb4c1c641737a6b651c2110238e9696bef89adada650ab1314e3ab2f4a8bde538b959b341e3ec84348eecc075f1d709363b83b1fdb894a893295 WHIRLPOOL e94e3569c68ba57a012415f5aa9969a06d711f742e56fced0e32bb5d30f3d132f323e89e68a5d6aa7ea41ccc620eb23ea51cda4146e9d348cc444dd147d0e5dd
 DIST smartmontools-6.2.tar.gz 791427 SHA256 486f660579bb0fb4f6b927ded7531cb1f99685c666397377761c5b04dd96065b SHA512 b7f335faf1b1cdbb56c0ad637ca39ea8af399df2dabef08bcac5756d1daad12cc2ed26cbbf5ace0f646ce1fa863cfee17c9559eadf143fcb1b729c3f815e6bf3 WHIRLPOOL 437fcec6c33a248ef9e008060c41d2b90182d2367211a3ffee86964223ff391d5fc9b96a91765796226bc22ce157fe986585023237262b2bd6cdd0fd3f0b3212
+DIST smartmontools-6.3.tar.gz 809790 SHA256 a777065d1a5965d71b3672e054b09b7696200ec73aaf45ab636f34016538fe19 SHA512 59f13ca510618a65d4d227978fbcf9d0f67efbf75c425357ff79b283db650e1fc2ffb27cd37c32dc963c43130a2b982ef7b50e11673c92ae5a4369965fabe524 WHIRLPOOL 4574df8f2e01b1ef7b7874f0376021c6cce2ddd152de5d3db4c055d2e134d77d9a1cbbb372f43525f3ee2fcde2857c27f5feca96c7056dce4b5f86d7324a2087
 EBUILD smartmontools-6.1.ebuild 1745 SHA256 d9269ec44ebcdfb41a38fc51c2286256daaaa13731ac2a1c063aefd246c125a8 SHA512 28125ac987222e49b4b10c6346b606d014a2405c8611f186a258ac7500cbd6021fed843c12dfd59eaf84c1329cc3ed1846074f6c1015c4c1bed75e22b540795e WHIRLPOOL 83ab197e5befcd08078f0902e8ae402d8a5ae4624195d98d4f42b7f70e1ccedb17deca9dd922a1867dcaf1937635872ad314dd857a58dd2fc1bf195f13446c96
 EBUILD smartmontools-6.2.ebuild 1820 SHA256 d8a3e44d4e865bbfbc6e43b376fde81b097e98e5b3d048d3af48ac14a290af8f SHA512 2046d936012130d9b78648b433f443e116bc570c24d11175c242679412e074603626ba8e51783390f963e9997a36a75bece653a1c059754503508427fc7b5cc4 WHIRLPOOL 900acce0c3d2bd3863ef5566b9df27d385b52175bda559d2146426397a96fd291ad3ca42324aef2d937300be476f6d91d18716dd3fec3a2c726b9d8b6f5518d9
-EBUILD smartmontools-9999.ebuild 1755 SHA256 0a11979165f2e946c38b93fe410ca1c8ee0e123dd379cc228ab1f9c0fcfa04e0 SHA512 b11199bcab0211d965e1881904624d965ed9417ce667507bb752639204d0cc565bb9a9d80ed5d1c3692f79e5eb5241a819155d11699574180756f1b0e92b262e WHIRLPOOL 3ce21ea90d2801719026ccbacc44c6a8a2aa8b4d9a70dc114fe957d7a18cce8d053056c4762ae023353be414f54741d9c611a7bec94d3ce512f47d1c06d35c35
-MISC ChangeLog 18169 SHA256 4a52d765bfb2e641a7d79204d0c869bc6647a902cc96fa422817f17fb5611482 SHA512 951b6589843faa62739c8415d8a27dae72ce6934af050944bfe3748cf88e632b80b094d32775870a8390655123d214a874c39651bb5bf772d47e757af4838aac WHIRLPOOL 4382df3d38f9a4080895bab369c9798f0265e8dcb39cdb91faad4ebc1d06e973386485e116a220f52b340227cf88c24a7bebacfb18ec52b7c9933380eaeafed0
+EBUILD smartmontools-6.3.ebuild 1827 SHA256 27f0467989c3904bd826ca8cf35a5ccaf9b5407cb28fcea538367541788b38aa SHA512 ebd38f33e74ea3ec2d975e6b8adfbdb86cf4410cb1d3059b3f4ec0c23ad5550f6a1546ee25b7931d6384878b5d43f1748dae5239d9fc6e54a027d0e3a2ad080a WHIRLPOOL 1b53c802964c5b5b6ae1b8f0a20c7e9a0ad67ca06ff5d47c29729e946d673a28c11321c922e5830c64362aadc6f47cd6882caef57f833b18fdd51967c0bce53f
+EBUILD smartmontools-9999.ebuild 1765 SHA256 2410778f8e747974aef8c06b849de981e8dc9303d47b9e29954a27a9f0c6d7d1 SHA512 152dc7bdd8601c927932f7317a1cc2d90c7651059360024c72efefacf07523a47f70806ec8a70c42f0b8e02ee71fdba6ca69078b5bb6a364e57d0357b9768a36 WHIRLPOOL 3568be2cbd1c91eb645c653150ee0a14faaa2fe45ffc5d12d7cbe9a3ec6a7d946816de7b2a63803c92ae5ca40e2a9487a9dca2c33fe52227c79beafc0dd66b32
+MISC ChangeLog 18394 SHA256 222aff72327704022af8c77e1f2e0e6fa4f92f768b6c6d533352942b48f26710 SHA512 e18428e0fa19d46dae8e8d9a39bea8ab1a4186c4de089ee30d26779260cc03673dcd9305d378a1b1f6461815869b7b8b1368cf2373f2bdb0393e3799c9511954 WHIRLPOOL 390d14de2f73efa344f9f0f948eac4a63d1f95a59b556995ed66074bb60261ef9826e17f6afab8cda13ee173e9788aecf403e2ed971b6fe96c1f0d22aca07489
 MISC metadata.xml 266 SHA256 bdf7da32dcd39df0f58aa02c64dfd1c5dda0ca1080c9b1001d8e110881a364eb SHA512 d2809f0df32816d12eb21b020e5edd68c28bf3ad42ca6c6ae24acb2a08afdf2ca85398b830de01a7377c10e929a8b0a3e74c4daa3c43710ad8b93a198ef2d049 WHIRLPOOL 3df4d283499b426832cc7964e0bb277614ec8fbe4ca5729dfc8dec28a85bdadba94076c845d898ab73e13ece50e7e595322fdfc095a6e4c8fa0b1706b1119e88
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJSy8WZAAoJEPiazRVxLXTF2VkQAIqg6LK8eQsTyv7Yj+mJrpc2
-LaTCMLfpS3yYcfiE3gTV62a1okM7QwiUYqR5FrHL9dYeCMjTVo8+YdZkqPJVVj7j
-hqrmqcpWWW0KuAvO/foPdCZfqj1J/DyvaW6Es0M3HOhV8qdwLwkrixEHRn+cXE76
-z2hhunePO0gNPSmlt6AwCADhklzcLbdyKBcLlZKVXto5r/paMezRYwq2koruNoOh
-/KlTihXDERT7+evgviGaf24d5Zwl8CU+x/GGp442CK0o7h9DHdEHywzUTVpRUqk9
-xdAZLwoLVeQNcgMv0XglmxkGd2+rRce0VRtplVBSTf1i2cGsvtjR7VCKxLW7tXUA
-Rv+OEVVa2AXSzxvfMBknv7eoVDVPO77gVJ6/y12zcfUz+K87uFm1WXg83S2PVPaT
-lF2hTxpFrKFYvZQ6Y2e7wwMc3n/UyMxnRxW384KyALhBHWYGOev7Qy1KZY1riiV3
-Rf1VTtCdIQBIgGmgM5Zi/wORzCJOD0+RCoFXL4H1qrBnnZ5t8X3TrM6+kLJXoVYD
-8e3YQVn4+t6RurjIbq4nutz/1k4F6RzYWLF+dhve6H0uwIYKBP9pJSLWy1T3/2GH
-S9u0ioy5TnvplcNB21p/BeaX4H5bJphlZL7fM8eQcKGB1pVyPCGF1TKSaGTebRRz
-o8s2YuEfPHA0t8tB9tiE
-=o2Qn
+iQIcBAEBCAAGBQJT5eufAAoJEPiazRVxLXTFtkEQALcaL3u44EhgDymjfOsvlwzO
+NJIkXf84Fupos6w7Oj+ZqDMdpbE7WkfflYz7B9fWGZy3DNjuaiFBVYnTqX3Tt2Qr
+ac9eyXQB6MEwORyw0biOKJoQJslxwJGzQbY4tS95spWRjzTrcBLwUtTRDX+9+LSj
+miLkpc1i5jHj9zWvaASvvESkZXFDtJNX5H6p/ucvd8s4i+ak+M2WybDyInC1OU5F
+zXNNOHTC4s+93o73pgR20lK5l1a6QKn/N6dqGhIIsBJ1a8bD1VAHU5ealGWzAove
+WKeikzjLErpaAPWwBZO4iCW6xG09MnITfxlHjUSCnORWU1YChvjcHxLhv3Os7tIW
+1sRcQhkRcCxmdfvutimu9SHCs5FX2TKdyAeLSEUqq8KNPezTNs7D/E5MzdKekqMV
+8XkboEBOnq+qT/WkdvtUJktY4M6eCDvAqSPp82hqc+VzlQRasZLpVZCYgIWt5KGN
+01lkOCkRsTBn0A/JyPuzVJahfx2ZQxHeg5XEgeLmXhg5fcWmj6umSrl+ljALI7J1
+5txAvx9BVbS10hLgt9VDPJ2kjE7pf33TA9/wHDYVpm/DRgbVa8ANY7FgSYzL8q4m
+vOsWpu4kZ4pGVVhx7GZxMamIRDZ1iOAS4HI5+/9wQ8VK+SftFrk9ZTcBDuoeeHYe
+dG1D8wV9ZLAerMKxgXKh
+=3rhU
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/smartmontools/files/smartd-r1.rc b/sys-apps/smartmontools/files/smartd-r1.rc
new file mode 100644
index 000000000000..d6273e6bffdc
--- /dev/null
+++ b/sys-apps/smartmontools/files/smartd-r1.rc
@@ -0,0 +1,29 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/files/smartd-r1.rc,v 1.1 2014/08/09 09:36:30 polynomial-c Exp $
+
+pidfile="/run/smartd.pid"
+command="/usr/sbin/smartd"
+command_args="-p ${pidfile} ${SMARTD_OPTS}"
+extra_started_commands="reload"
+
+depend() {
+    need localmount
+    after bootmisc
+}
+
+start_pre() {
+	if [ ! -f "/etc/smartd.conf" ] ; then
+		eerror "You should setup your /etc/smartd.conf file!"
+		eerror "See the smartd.conf(5) manpage."
+		return 1
+	fi
+	return 0
+}
+
+reload() {
+	ebegin "Reloading configuration"
+	start-stop-daemon --signal HUP --pidfile ${pidfile} ${command##*/}
+	eend $?
+}
diff --git a/sys-apps/smartmontools/smartmontools-6.3.ebuild b/sys-apps/smartmontools/smartmontools-6.3.ebuild
new file mode 100644
index 000000000000..c0eddc6b0216
--- /dev/null
+++ b/sys-apps/smartmontools/smartmontools-6.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/smartmontools-6.3.ebuild,v 1.1 2014/08/09 09:36:30 polynomial-c Exp $
+
+EAPI="4"
+
+inherit flag-o-matic systemd
+if [[ ${PV} == "9999" ]] ; then
+	ESVN_REPO_URI="https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk/smartmontools"
+	ESVN_PROJECT="smartmontools"
+	inherit subversion autotools
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~x64-macos"
+fi
+
+DESCRIPTION="Self-Monitoring, Analysis and Reporting Technology System (S.M.A.R.T.) monitoring tools"
+HOMEPAGE="http://smartmontools.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps minimal selinux static"
+
+DEPEND="
+	caps? (
+		static? ( sys-libs/libcap-ng[static-libs] )
+		!static? ( sys-libs/libcap-ng )
+	)
+	selinux? (
+		sys-libs/libselinux
+		sec-policy/selinux-smartmon
+	)"
+RDEPEND="${DEPEND}
+	!minimal? ( virtual/mailx )"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		#./autogen.sh
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	use minimal && einfo "Skipping the monitoring daemon for minimal build."
+	use static && append-ldflags -static
+	# The build installs /etc/init.d/smartd, but we clobber it
+	# in our src_install, so no need to manually delete it.
+	econf \
+		--with-docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--with-initscriptdir="${EPREFIX}/etc/init.d" \
+		$(use_with caps libcap-ng) \
+		$(use_with selinux) \
+		$(systemd_with_unitdir)
+}
+
+src_install() {
+	if use minimal ; then
+		dosbin smartctl
+		doman smartctl.8
+	else
+		default
+		newinitd "${FILESDIR}"/smartd-r1.rc smartd
+		newconfd "${FILESDIR}"/smartd.confd smartd
+	fi
+}
diff --git a/sys-apps/smartmontools/smartmontools-9999.ebuild b/sys-apps/smartmontools/smartmontools-9999.ebuild
index 2391ef4a8e8f..2e4ea97bcff1 100644
--- a/sys-apps/smartmontools/smartmontools-9999.ebuild
+++ b/sys-apps/smartmontools/smartmontools-9999.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/sys-apps/smartmontools/smartmontools-9999.ebuild,v 1.15 2013/08/11 16:37:40 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/smartmontools-9999.ebuild,v 1.16 2014/08/09 09:36:30 polynomial-c Exp $
 
 EAPI="4"
 
@@ -55,7 +55,7 @@ src_install() {
 		doman smartctl.8
 	else
 		default
-		newinitd "${FILESDIR}"/smartd.rc smartd
+		newinitd "${FILESDIR}"/smartd-r1.rc smartd
 		newconfd "${FILESDIR}"/smartd.confd smartd
 	fi
 }