gentoo resync : 31.12.2018

6 files changed, 19 insertions, 181 deletions

diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index 559c7a81e59a..10bbd079bf4e 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -4,13 +4,10 @@ AUX smartd.systemd 258 BLAKE2B 9aadec117adeacff070f127ff34df520d5deebe152d0a72e3
 AUX smartmontools-6.6-fix-build-on-musl.patch 416 BLAKE2B 3c7eec408c3ea346ebad3df77e8b2beb89e2565c61d7b85c69404d354b662ee0679389b10cfb110728d99b8df8434a590865a4bb2b46c1ce108ca635dd2a6ebc SHA512 cf2ec3c0366c5ec79cccbe181b4dfed74f051d2236e851f81125e57f7893221a3e311c46556a8854c7c50ee6378d34c917089a90fcb6c3e07cc0c0716085540d
 AUX smartmontools-6.6-set-broadcast-nsid.patch 4217 BLAKE2B 27225c052a13c22d031450f9ed700e5f5295738644a91802c86e1d9f6938fd17b150eff028ec4aa79fdd3cf927697dbe1d0d55f57ce48df850ce335e2497c24b SHA512 8abaa33749f70049f3c28ac09f915ccd37081cc7ca8ee63325eecd78d038842c2cce300f277279614b5b1d6d336c343f7512b21c51d73953f4b3921976642a3e
 AUX smartmontools-update-drivedb 42 BLAKE2B d3a501dc6a3855bd665a16ce0f105269754a29450201f312369acdbf429c8e0c7c4162de8854ca945b2082cb734dbbbb1326df39e4fb1adf271f215329bd2105 SHA512 8ad70fc85ab67b7c32eda95dd37517382c2447862df08b810a54dcdedb1eb8148f3a0e29f402a54adff31d1e88d80d09a258ed9e1e13b597ab2a358ebeda0ce8
-DIST smartmontools-6.4.tar.gz 822539 BLAKE2B be76ec24cf24b2388a77758a1df5b5b9b19bd455dda26df6c13184051a51feeb0baf164265fcfe15b1d2ac41767d546109dea53cd7ac290d02f6e03b44da454f SHA512 366cd55ec668da1ca8a3d9ba79d5bee6e0c59032936b7f2f161f8fbb1c9f869c505d715cc10562b6241f808bb8b534feaf9d9fd752f6cb1593ee893611742adc
-DIST smartmontools-6.5.tar.gz 855642 BLAKE2B 25f78de8fd58497cf052e75aef746c15af8d56d2694007c1d6e2f8e31cae3b517babfc52ef73d3ae4bc5104a49e4bac16a48f23f3b3145228997bef0aad823dd SHA512 dca7a6363ab7280ee4197155025f624c978886dcc94fc47b524f6f849138b62c471e966c0d4bf59c7bba50519dc122264618e5ded80a406863ddd10b43d928d3
 DIST smartmontools-6.6.tar.gz 903847 BLAKE2B 6c18884cf763c146abceed47587de0e77cd434673df6a17e4527d160f06a5a8762e6ae490fc5ed13a33f819ba23c1924b49dd13620f4a51e6a40dac20a217523 SHA512 64bb533dac29f62ddd662a16a12c97df1af9cbac9ac526ce7af0b3bff9da49cf265a2030d91a7160452b56a67e80d7f34c9b4e45bbb320114f55695e2cb5cfaf
-EBUILD smartmontools-6.4-r1.ebuild 2523 BLAKE2B 2e1f313d3f74018b382a889b84dd3a22af78fc5dce90a160ce4736e76c48bbb61eeb0a150d753aa815cc2af1bb889d8296f588f49e0e8cfe3c47de8c882a2889 SHA512 192842c49cd29546c3771205a7a86f9c79eef0a68003fe058b7fd856a615f336cea6350911fc7ff5917e6a058b498822fab2d99135be5cfaadd9e2e16696f495
-EBUILD smartmontools-6.4.ebuild 1628 BLAKE2B d1ae6c4297609f2dcd23be50719e88657e6a12c1c07935a139957bd845cefaa4cfef263ecd7b8d87b4d1992a415bb1ff1cc002559fc55ab8a95b1bd4bc64bf6a SHA512 e33d70a9e228103b5afe8bdeac2b40a1d00d92d5a75e3606b7b55b031b32d8d236fce0e7f07090cd55c380f2ab44f4940af7f156c38811012e118919a46d3737
-EBUILD smartmontools-6.5-r1.ebuild 4032 BLAKE2B 789235fb45cbcef3b560fe193be739d4449d162d313301b62bfc70b3bb8bfda1a53e72396d6aa3dea20315f991fc8aa21cb7283764df5a21a324373285a7d65b SHA512 0ef036cdb5ee6c71bab7fc94ce11fe2877c86f532200026aff9b04949aab69b1633327ee1cdfbb936f97b519a21eac6c883bfb146bbea130176f2f69b92c6be8
+DIST smartmontools-7.0.tar.gz 944925 BLAKE2B 41b3894efa05471bf358fca4ba87a765e3a54df68c9a617804a9e0853752c57b68fdbaa9d55fa1462a8fa7de1d6cb5630c66929dfe521be38b180944cb80acc9 SHA512 96e18a201182579f699d541539ce393e7bc2191e027cfdf7f87455a63da3a14451574f8fe391232047ac941ace453a017193d0a4987a4edb8f7ed9d5007f0512
 EBUILD smartmontools-6.6-r1.ebuild 4187 BLAKE2B 944a9dbe7e8daf1ebb14d8674117bc421d0d87e05877e313f3d3e78178b4a56cf795e3c60d392edc1310cd87c2ae4bfe78a9ebe29928db7643b7e977e905490e SHA512 51a378f9503dafbddf8b64a24cf30abcd5aba982b20ba632967198069fae9f5c65b900e14ad942d74884739aafd5ba24a88c65703c3435522eba4f589c6323b3
 EBUILD smartmontools-6.6.ebuild 4130 BLAKE2B 8128e1ed40b33fedd93a3c0d81d8de7bdc4240753df41779bb571ecae0e68d84e0f257019dc94fa539b4c334edc04e8091f2ee1e88fca4169f4b97391df628eb SHA512 b312edb0993e3c14505be45e08398e3d598d3bbdbd098b4e4fcae866b272b35ba61d9298f652a3437908f06289c64ffcbf4a50ce70e1938c0a710647d8a4ea88
-EBUILD smartmontools-9999.ebuild 4083 BLAKE2B 7a80b258ba7ee8d0fbc4c1c3814bb9142504425fccbf5fcae9261968371697e3165aef7aed43628cd51faa8035e4cb739ad01e04a558866e73fe78b0104480f2 SHA512 eb5fc9180e4fae4048880fe6f73c09f913562de3f03cd554727514255e47a17010a9c913af332087fcebce225573eedd8cab31a1f81f3226ae190671b8effae1
-MISC metadata.xml 718 BLAKE2B 4172ef96f081f77b7f701d2f11ed1eae3cd7342815fd3643373f8bb60802a273d8308dc4ff8e8d36349f8361e04213ee2d94619045a16739aa2fa75560c7cfae SHA512 a6a07e57bd09402839295ee859481d784445afadb12ffd644c6de3af41a4a763225f63d098c328193123d72cdad3b98e278256bb3e67b104015399def014ee54
+EBUILD smartmontools-7.0.ebuild 4183 BLAKE2B 46f268cc66b3222225b78760a6f55e2412ac846e8cfe8c943caad77b89ece5fa9338c458ec00bc7aba4cbebcd42cbb97bb38da283dd8574fdbdea4cc778e4668 SHA512 f8168c32b934e9905290da8ba6f20584a58b8fd3360c81307883ab02c8700b5f3e018337a46cd753dff385cc8461a647e8fa94eea7d58c2b32f627a84a617353
+EBUILD smartmontools-9999.ebuild 4183 BLAKE2B 46f268cc66b3222225b78760a6f55e2412ac846e8cfe8c943caad77b89ece5fa9338c458ec00bc7aba4cbebcd42cbb97bb38da283dd8574fdbdea4cc778e4668 SHA512 f8168c32b934e9905290da8ba6f20584a58b8fd3360c81307883ab02c8700b5f3e018337a46cd753dff385cc8461a647e8fa94eea7d58c2b32f627a84a617353
+MISC metadata.xml 628 BLAKE2B 1998d18fb38795b682ec935d8e994a93176e6bff49db77adcfc6a168e297515b7ac6a121b1acbb0743182d7dd4696b898cf6a8eeda0a290e0c75598036ef4951 SHA512 86ac56fbb2b15c7c4fa4e80607b5a3ceefd7300ade482d6d6adaf8e22c7a95797e10b1a03aacb34cf07c02e7d0fbd8437954d1c94c395afedc1c61c24202e3d6
diff --git a/sys-apps/smartmontools/metadata.xml b/sys-apps/smartmontools/metadata.xml
index 0ae4667bf8d9..cb72f5108e40 100644
--- a/sys-apps/smartmontools/metadata.xml
+++ b/sys-apps/smartmontools/metadata.xml
@@ -8,7 +8,6 @@
 <use>
 	<flag name="caps">Build against <pkg>sys-libs/libcap-ng</pkg> to allow smartd to drop its privileges.</flag>
 	<flag name="daemon">Install the monitoring daemon (smartd) and associated scripts.</flag>
-	<flag name="minimal">Do not install the monitoring daemon and associated scripts.</flag>
 	<flag name="update_drivedb">Install a script to update the drivedb file.</flag>
 </use>
 <upstream>
diff --git a/sys-apps/smartmontools/smartmontools-6.4-r1.ebuild b/sys-apps/smartmontools/smartmontools-6.4-r1.ebuild
deleted file mode 100644
index c5512a3aad94..000000000000
--- a/sys-apps/smartmontools/smartmontools-6.4-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic systemd
-if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="https://svn.code.sf.net/p/smartmontools/code/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 ~amd64-linux ~x86-linux ~x64-macos"
-fi
-
-DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation"
-HOMEPAGE="https://www.smartmontools.org"
-
-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
-	)"
-RDEPEND="${DEPEND}
-	!minimal? ( virtual/mailx )
-	selinux? ( sec-policy/selinux-smartmon )
-"
-
-src_prepare() {
-	# 580424
-	sed '/^SRCEXPR/s@http:@https:@' \
-		-i update-smart-drivedb.in \
-		|| die
-	if [[ ${PV} == "9999" ]] ; then
-		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.
-	myeconfargs=(
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--with-drivedbdir=/var/db/${PN} #575292
-		--with-initscriptdir="${EPREFIX}/etc/init.d"
-		$(use_with caps libcap-ng)
-		$(use_with selinux)
-		$(systemd_with_unitdir)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	local db_path="/var/db/${PN}"
-
-	if use minimal ; then
-		dosbin smartctl
-		doman smartctl.8
-	else
-		default
-		newinitd "${FILESDIR}"/smartd-r1.rc smartd
-		newconfd "${FILESDIR}"/smartd.confd smartd
-
-		# Move drivedb.h file out of PM's sight (bug #575292)
-		mv "${ED}${db_path}/drivedb.h" "${T}" || die
-		keepdir "${db_path}"
-
-		exeinto /etc/cron.monthly
-		doexe "${FILESDIR}"/${PN}-update-drivedb
-	fi
-}
-
-pkg_postinst() {
-	if ! use minimal ; then
-		local db_path="/var/db/${PN}"
-
-		if [[ -f "${db_path}/drivedb.h" ]] ; then
-			ewarn "WARNING! The existing copy of the drive database has been replaced with the version that"
-			ewarn "was shipped with this release of ${PN}. You may want to update the"
-			ewarn "database by running the following command as root:"
-			ewarn ""
-			ewarn "/usr/sbin/update-smart-drivedb"
-		fi
-
-		# Move drivedb.h to /var/db/${PN} (bug #575292)
-		mv "${T}"/drivedb.h "${db_path}" || die
-	fi
-}
diff --git a/sys-apps/smartmontools/smartmontools-6.4.ebuild b/sys-apps/smartmontools/smartmontools-6.4.ebuild
deleted file mode 100644
index c3613455e263..000000000000
--- a/sys-apps/smartmontools/smartmontools-6.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit flag-o-matic systemd
-if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="https://svn.code.sf.net/p/smartmontools/code/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 ~amd64-linux ~x86-linux ~x64-macos"
-fi
-
-DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation"
-HOMEPAGE="https://www.smartmontools.org"
-
-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
-	)"
-RDEPEND="${DEPEND}
-	!minimal? ( virtual/mailx )
-	selinux? ( sec-policy/selinux-smartmon )
-"
-
-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 \
-		--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-6.5-r1.ebuild b/sys-apps/smartmontools/smartmontools-7.0.ebuild
index 499d2ebabc70..46b1cf2cff3f 100644
--- a/sys-apps/smartmontools/smartmontools-6.5-r1.ebuild
+++ b/sys-apps/smartmontools/smartmontools-7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -18,7 +18,7 @@ HOMEPAGE="https://www.smartmontools.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="caps +daemon selinux static update_drivedb"
+IUSE="caps +daemon selinux static systemd update_drivedb"
 
 DEPEND="
 	caps? (
@@ -34,7 +34,9 @@ DEPEND="
 RDEPEND="${DEPEND}
 	daemon? ( virtual/mailx )
 	selinux? ( sec-policy/selinux-smartmon )
+	systemd? ( sys-apps/systemd )
 	update_drivedb? (
+		app-crypt/gnupg
 		|| (
 			net-misc/curl
 			net-misc/wget
@@ -48,7 +50,6 @@ REQUIRED_USE="( caps? ( daemon ) )"
 
 src_prepare() {
 	default
-
 	eautoreconf
 }
 
@@ -57,13 +58,15 @@ src_configure() {
 	# The build installs /etc/init.d/smartd, but we clobber it
 	# in our src_install, so no need to manually delete it.
 	myeconfargs=(
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
 		--with-drivedbdir="${EPREFIX}/var/db/${PN}" #575292
 		--with-initscriptdir="${EPREFIX}/etc/init.d"
+		#--with-smartdscriptdir="${EPREFIX}/usr/share/${PN}"
 		$(use_with caps libcap-ng)
 		$(use_with selinux)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		$(use_with systemd libsystemd)
+		$(use_with update_drivedb gnupg)
 		$(use_with update_drivedb update-smart-drivedb)
+		$(usex systemd "--with-systemdsystemunitdir=$(systemd_get_systemunitdir)" '')
 	)
 	econf "${myeconfargs[@]}"
 }
diff --git a/sys-apps/smartmontools/smartmontools-9999.ebuild b/sys-apps/smartmontools/smartmontools-9999.ebuild
index a2e1ad35a308..46b1cf2cff3f 100644
--- a/sys-apps/smartmontools/smartmontools-9999.ebuild
+++ b/sys-apps/smartmontools/smartmontools-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="6"
 
 inherit autotools flag-o-matic systemd
 if [[ ${PV} == "9999" ]] ; then
@@ -18,7 +18,7 @@ HOMEPAGE="https://www.smartmontools.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="caps +daemon selinux static update_drivedb"
+IUSE="caps +daemon selinux static systemd update_drivedb"
 
 DEPEND="
 	caps? (
@@ -34,6 +34,7 @@ DEPEND="
 RDEPEND="${DEPEND}
 	daemon? ( virtual/mailx )
 	selinux? ( sec-policy/selinux-smartmon )
+	systemd? ( sys-apps/systemd )
 	update_drivedb? (
 		app-crypt/gnupg
 		|| (
@@ -49,7 +50,6 @@ REQUIRED_USE="( caps? ( daemon ) )"
 
 src_prepare() {
 	default
-
 	eautoreconf
 }
 
@@ -58,14 +58,15 @@ src_configure() {
 	# The build installs /etc/init.d/smartd, but we clobber it
 	# in our src_install, so no need to manually delete it.
 	myeconfargs=(
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
 		--with-drivedbdir="${EPREFIX}/var/db/${PN}" #575292
 		--with-initscriptdir="${EPREFIX}/etc/init.d"
+		#--with-smartdscriptdir="${EPREFIX}/usr/share/${PN}"
 		$(use_with caps libcap-ng)
 		$(use_with selinux)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		$(use_with systemd libsystemd)
 		$(use_with update_drivedb gnupg)
 		$(use_with update_drivedb update-smart-drivedb)
+		$(usex systemd "--with-systemdsystemunitdir=$(systemd_get_systemunitdir)" '')
 	)
 	econf "${myeconfargs[@]}"
 }