5 files changed, 19 insertions, 115 deletions
diff --git a/sys-apps/smartmontools/ChangeLog b/sys-apps/smartmontools/ChangeLog
index ebe0478ac964..c67e36ffc42c 100644
--- a/sys-apps/smartmontools/ChangeLog
+++ b/sys-apps/smartmontools/ChangeLog
@@ -1,6 +1,13 @@
 # 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.146 2014/11/11 10:44:45 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/ChangeLog,v 1.147 2015/06/07 11:15:17 polynomial-c Exp $
+
+*smartmontools-6.4 (07 Jun 2015)
+
+  07 Jun 2015; Lars Wendler <polynomial-c@gentoo.org>
+  -smartmontools-6.1.ebuild, -smartmontools-6.2.ebuild,
+  +smartmontools-6.4.ebuild, smartmontools-9999.ebuild, -files/smartd.rc:
+  Version bump. Removed old.
 
   11 Nov 2014; Agostino Sarubbo <ago@gentoo.org> smartmontools-6.3.ebuild:
   Stable for ia64, wrt bug #526444
diff --git a/sys-apps/smartmontools/files/smartd.rc b/sys-apps/smartmontools/files/smartd.rc
deleted file mode 100644
index c3702030eeb3..000000000000
--- a/sys-apps/smartmontools/files/smartd.rc
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/files/smartd.rc,v 1.10 2013/09/14 10:32:46 hwoarang Exp $
-
-depend() {
-    need localmount
-    after bootmisc
-}
-
-extra_started_commands="reload"
-
-checkconfig() {
-	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
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting S.M.A.R.T. monitoring daemon"
-	start-stop-daemon --start --exec /usr/sbin/smartd \
-	    --pidfile /run/smartd.pid \
-	    -- -p /run/smartd.pid ${SMARTD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping S.M.A.R.T. monitoring daemon"
-	start-stop-daemon --stop --exec /usr/sbin/smartd \
-	    --pidfile /run/smartd.pid
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading configuration"
-	start-stop-daemon --signal HUP --pidfile /run/smartd.pid smartd
-	eend $?
-}
diff --git a/sys-apps/smartmontools/smartmontools-6.1.ebuild b/sys-apps/smartmontools/smartmontools-6.1.ebuild
deleted file mode 100644
index fd013768aa89..000000000000
--- a/sys-apps/smartmontools/smartmontools-6.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/smartmontools-6.1.ebuild,v 1.11 2013/08/11 16:37:40 swift 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? ( 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.rc smartd
-		newconfd "${FILESDIR}"/smartd.confd smartd
-	fi
-}
diff --git a/sys-apps/smartmontools/smartmontools-6.2.ebuild b/sys-apps/smartmontools/smartmontools-6.4.ebuild
index 32829d45ce29..a6c355564fd2 100644
--- a/sys-apps/smartmontools/smartmontools-6.2.ebuild
+++ b/sys-apps/smartmontools/smartmontools-6.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/smartmontools-6.2.ebuild,v 1.3 2013/11/30 01:15:13 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/smartmontools-6.4.ebuild,v 1.1 2015/06/07 11:15:17 polynomial-c Exp $
 
 EAPI="4"
 
@@ -28,10 +28,11 @@ DEPEND="
 	)
 	selinux? (
 		sys-libs/libselinux
-		sec-policy/selinux-smartmon
 	)"
 RDEPEND="${DEPEND}
-	!minimal? ( virtual/mailx )"
+	!minimal? ( virtual/mailx )
+	selinux? ( sec-policy/selinux-smartmon )
+"
 
 src_prepare() {
 	if [[ ${PV} == "9999" ]] ; then
@@ -46,7 +47,7 @@ src_configure() {
 	# 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}" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--with-initscriptdir="${EPREFIX}/etc/init.d" \
 		$(use_with caps libcap-ng) \
 		$(use_with selinux) \
@@ -59,7 +60,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
 }
diff --git a/sys-apps/smartmontools/smartmontools-9999.ebuild b/sys-apps/smartmontools/smartmontools-9999.ebuild
index 6d2020f2158e..dc4625753112 100644
--- a/sys-apps/smartmontools/smartmontools-9999.ebuild
+++ b/sys-apps/smartmontools/smartmontools-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.17 2014/11/02 10:00:18 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/smartmontools-9999.ebuild,v 1.18 2015/06/07 11:15:17 polynomial-c Exp $
 
 EAPI="4"
 
@@ -43,7 +43,7 @@ src_configure() {
 	# 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}" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--with-initscriptdir="${EPREFIX}/etc/init.d" \
 		$(use_with caps libcap-ng) \
 		$(use_with selinux) \