gentoo resync : 04.05.2019

7 files changed, 2 insertions, 583 deletions

diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index c4788c10754a..fb27a1716097 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -1,14 +1,8 @@
 AUX smartd-r1.rc 614 BLAKE2B ec80520e3c8762e39d89eadc63e16bb9d9d4f7dec84507faeba692cfcf106557047ce4ecb2756addff2800f75ae2d550e209a83d1399484f7c1bf1c7f7f859b9 SHA512 7a46212d2d76b335ac7470b51b44e40b1cdd4814e5db4a8a2f013803bb40ea5072fde64590ffd51754b03a6f80a43e835605a5bb3ac2c23e456633995191ec31
 AUX smartd.confd 107 BLAKE2B fe687733a13f7a9c32aee16a759feef798fe7db158783497c6cc0ccba2baaff7cf48acffea0a4becb47d470c691855a046617d3f8e934eeebd54df7030ef4877 SHA512 ff45462944f01c0e7cac99443078b253dcbaed4f99ffab85052b12361d9eec4beec81cab334fbede9148b3dd503d5205add32ef4327a788f02a8b1e37f460437
 AUX smartd.systemd 258 BLAKE2B 9aadec117adeacff070f127ff34df520d5deebe152d0a72e34f36a34b267f854c52640644b285c57de460c7b91f5fb54a5e1c704706540fd5813ed1954f74e7d SHA512 73c49bca755adf0ff1c6ccd221de0fd2bb7804250968fbcb3799e19c66dacc85a6c7a3e0d1eecea683f57d6a3ff01fbd4b4fc47b0eab5747006f0edc21876a7c
-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.6.tar.gz 903847 BLAKE2B 6c18884cf763c146abceed47587de0e77cd434673df6a17e4527d160f06a5a8762e6ae490fc5ed13a33f819ba23c1924b49dd13620f4a51e6a40dac20a217523 SHA512 64bb533dac29f62ddd662a16a12c97df1af9cbac9ac526ce7af0b3bff9da49cf265a2030d91a7160452b56a67e80d7f34c9b4e45bbb320114f55695e2cb5cfaf
 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-7.0-r1.ebuild 4113 BLAKE2B d8986e08cfe70546e49f3cfa9fc2b5731b10c99295cd81a5700940bd853b8ab4ec6457f21484673a0306b2052dff7ca39cc473bb681172b9a815da36af8c9d70 SHA512 0964280ef10d6606e6f97b67b7ab5cda85db5fe9e97ac78ac7e6fd466268e9b26e980e67c7d4ab499feb8028481031d8db9c19a0b796be76888aa9fe93f14686
-EBUILD smartmontools-7.0.ebuild 4183 BLAKE2B 46f268cc66b3222225b78760a6f55e2412ac846e8cfe8c943caad77b89ece5fa9338c458ec00bc7aba4cbebcd42cbb97bb38da283dd8574fdbdea4cc778e4668 SHA512 f8168c32b934e9905290da8ba6f20584a58b8fd3360c81307883ab02c8700b5f3e018337a46cd753dff385cc8461a647e8fa94eea7d58c2b32f627a84a617353
+EBUILD smartmontools-7.0-r1.ebuild 4112 BLAKE2B 43cb568b5a8405d70293ac7c594a5aadf1169a7b05675e82aa1e475e24ec11a4456d2c7a197536b81771973950fd0be6826f144b628aaff16f1fedff3734fda0 SHA512 108d1695cc17fac873c88ccce79b026920eea83f625e6b785af5258a9f3ea980d3a62525778bf803cc1828837b315766a8ff81e70d357543bf019c5f81852a21
 EBUILD smartmontools-9999.ebuild 4121 BLAKE2B ae44fb2240efd744cd44f6037b7d2476d3610145b2b5555a99d785904b811cee212d0b44f6450398536a2767933ab8a2c80fcd3eb7da8a4ba14dacfa95bc6e9f SHA512 0dc795252612d83de6e83d57c3ffc7a5341e360ec54ec3744974461cedd88fe09d4b04b3cc4c7d508c635050a38d6673522860851c5e92a6bf6cd9c14c4f8c9d
 MISC metadata.xml 628 BLAKE2B 1998d18fb38795b682ec935d8e994a93176e6bff49db77adcfc6a168e297515b7ac6a121b1acbb0743182d7dd4696b898cf6a8eeda0a290e0c75598036ef4951 SHA512 86ac56fbb2b15c7c4fa4e80607b5a3ceefd7300ade482d6d6adaf8e22c7a95797e10b1a03aacb34cf07c02e7d0fbd8437954d1c94c395afedc1c61c24202e3d6
diff --git a/sys-apps/smartmontools/files/smartmontools-6.6-fix-build-on-musl.patch b/sys-apps/smartmontools/files/smartmontools-6.6-fix-build-on-musl.patch
deleted file mode 100644
index 2cd36e0dce5e..000000000000
--- a/sys-apps/smartmontools/files/smartmontools-6.6-fix-build-on-musl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Bug: https://bugs.gentoo.org/644586
-
-Upstream fix: https://www.smartmontools.org/changeset/4603
-
---- smartmontools-6.6/os_linux.cpp
-+++ smartmontools-6.6/os_linux.cpp
-@@ -3177,5 +3177,5 @@
-   char path[128];
-   snprintf(path, sizeof(path), "/sys/block/%s/device", name);
--  char * syshostpath = canonicalize_file_name(path);
-+  char * syshostpath = realpath(name, (char *)0);
-   if (!syshostpath)
-     return false;
diff --git a/sys-apps/smartmontools/files/smartmontools-6.6-set-broadcast-nsid.patch b/sys-apps/smartmontools/files/smartmontools-6.6-set-broadcast-nsid.patch
deleted file mode 100644
index e65504d43c65..000000000000
--- a/sys-apps/smartmontools/files/smartmontools-6.6-set-broadcast-nsid.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-fix from upstream
-
-https://www.smartmontools.org/changeset?new=4671@/&old=4670@/
-
-Index: trunk/smartmontools-6.6/ChangeLog
-===================================================================
- 2017-12-27  Douglas Gilbert  <dgilbert@interlog.com>
- 
-+	nvmecmds.cpp: according to NVMe 1.3a spec, the SMART/
-+	health information log page is global and should take
-+	the global nsid (all ff_s). It also says the Error
-+	info lpage is "global. Broke WD Black PCIe (NVMe)
-+	SSD but worked on Intel SSDs. Fix; could break others.
-+
-+2017-12-27  Douglas Gilbert  <dgilbert@interlog.com>
-+
- 	os_freebsd.cpp: on error was setting set_nvme_err() to 1,
- 	not the actual NVMe status value; fix.
- 
-Index: trunk/smartmontools-6.6/nvmecmds.cpp
-===================================================================
-diff --git smartmontools-6.6/nvmecmds.cpp smartmontools-6.6/nvmecmds.cpp
---- smartmontools-6.6/nvmecmds.cpp	(revision 4670)
-+++ smartmontools-6.6/nvmecmds.cpp	(revision 4671)
-@@ -196,7 +196,8 @@
- }
- 
- // Read NVMe log page with identifier LID.
--bool nvme_read_log_page(nvme_device * device, unsigned char lid, void * data, unsigned size)
-+bool nvme_read_log_page(nvme_device * device, unsigned char lid, void * data,
-+	       		unsigned size, bool broadcast_nsid)
- {
-   if (!(4 <= size && size <= 0x4000 && (size % 4) == 0))
-     throw std::logic_error("nvme_read_log_page(): invalid size");
-@@ -204,7 +205,7 @@
-   memset(data, 0, size);
-   nvme_cmd_in in;
-   in.set_data_in(nvme_admin_get_log_page, data, size);
--  in.nsid = device->get_nsid();
-+  in.nsid = broadcast_nsid ? 0xffffffff : device->get_nsid();
-   in.cdw10 = lid | (((size / 4) - 1) << 16);
- 
-   return nvme_pass_through(device, in);
-@@ -213,7 +214,7 @@
- // Read NVMe Error Information Log.
- bool nvme_read_error_log(nvme_device * device, nvme_error_log_page * error_log, unsigned num_entries)
- {
--  if (!nvme_read_log_page(device, 0x01, error_log, num_entries * sizeof(*error_log)))
-+  if (!nvme_read_log_page(device, 0x01, error_log, num_entries * sizeof(*error_log), true))
-     return false;
- 
-   if (isbigendian()) {
-@@ -234,7 +235,7 @@
- // Read NVMe SMART/Health Information log.
- bool nvme_read_smart_log(nvme_device * device, nvme_smart_log & smart_log)
- {
--  if (!nvme_read_log_page(device, 0x02, &smart_log, sizeof(smart_log)))
-+  if (!nvme_read_log_page(device, 0x02, &smart_log, sizeof(smart_log), true))
-     return false;
- 
-   if (isbigendian()) {
-Index: trunk/smartmontools-6.6/nvmecmds.h
-===================================================================
-diff --git smartmontools-6.6/nvmecmds.h smartmontools-6.6/nvmecmds.h
---- smartmontools-6.6/nvmecmds.h	(revision 4670)
-+++ smartmontools-6.6/nvmecmds.h	(revision 4671)
-@@ -248,7 +248,8 @@
- bool nvme_read_id_ns(nvme_device * device, unsigned nsid, smartmontools::nvme_id_ns & id_ns);
- 
- // Read NVMe log page with identifier LID.
--bool nvme_read_log_page(nvme_device * device, unsigned char lid, void * data, unsigned size);
-+bool nvme_read_log_page(nvme_device * device, unsigned char lid, void * data,
-+	       		unsigned size, bool broadcast_nsid);
- 
- // Read NVMe Error Information Log.
- bool nvme_read_error_log(nvme_device * device, smartmontools::nvme_error_log_page * error_log,
-Index: trunk/smartmontools-6.6/nvmeprint.cpp
-===================================================================
-diff --git smartmontools-6.6/nvmeprint.cpp smartmontools-6.6/nvmeprint.cpp
---- smartmontools-6.6/nvmeprint.cpp	(revision 4670)
-+++ smartmontools-6.6/nvmeprint.cpp	(revision 4671)
-@@ -473,9 +473,21 @@
-   if (options.log_page_size) {
-     // Align size to dword boundary
-     unsigned size = ((options.log_page_size + 4-1) / 4) * 4;
-+    bool broadcast_nsid;
-     raw_buffer log_buf(size);
- 
--    if (!nvme_read_log_page(device, options.log_page, log_buf.data(), size)) {
-+    switch (options.log_page) {
-+    case 1:
-+    case 2:
-+    case 3:
-+      broadcast_nsid = true;
-+      break;
-+    default:
-+      broadcast_nsid = false;
-+      break;
-+    }
-+    if (!nvme_read_log_page(device, options.log_page, log_buf.data(),
-+			    size, broadcast_nsid)) {
-       pout("Read NVMe Log 0x%02x failed: %s\n\n", options.log_page, device->get_errmsg());
-       return retval | FAILSMART;
-     }
diff --git a/sys-apps/smartmontools/smartmontools-6.6-r1.ebuild b/sys-apps/smartmontools/smartmontools-6.6-r1.ebuild
deleted file mode 100644
index f0c381ba6cb7..000000000000
--- a/sys-apps/smartmontools/smartmontools-6.6-r1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools 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
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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 +daemon selinux static update_drivedb"
-
-DEPEND="
-	caps? (
-		static? ( sys-libs/libcap-ng[static-libs] )
-		!static? ( sys-libs/libcap-ng )
-	)
-	kernel_FreeBSD? (
-		sys-freebsd/freebsd-lib[usb]
-	)
-	selinux? (
-		sys-libs/libselinux
-	)"
-RDEPEND="${DEPEND}
-	daemon? ( virtual/mailx )
-	selinux? ( sec-policy/selinux-smartmon )
-	update_drivedb? (
-		app-crypt/gnupg
-		|| (
-			net-misc/curl
-			net-misc/wget
-			www-client/lynx
-			dev-vcs/subversion
-		)
-	)
-"
-
-REQUIRED_USE="( caps? ( daemon ) )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-build-on-musl.patch
-	"${FILESDIR}"/${P}-set-broadcast-nsid.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	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="${EPREFIX}/var/db/${PN}" #575292
-		--with-initscriptdir="${EPREFIX}/etc/init.d"
-		$(use_with caps libcap-ng)
-		$(use_with selinux)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		$(use_with update_drivedb gnupg)
-		$(use_with update_drivedb update-smart-drivedb)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	local db_path="/var/db/${PN}"
-
-	if use daemon; then
-		default
-
-		newinitd "${FILESDIR}"/smartd-r1.rc smartd
-		newconfd "${FILESDIR}"/smartd.confd smartd
-		systemd_newunit "${FILESDIR}"/smartd.systemd smartd.service
-	else
-		dosbin smartctl
-		doman smartctl.8
-
-		local DOCS=( AUTHORS ChangeL* COPYING INSTALL NEWS README TODO )
-		einstalldocs
-	fi
-
-	if use update_drivedb ; then
-		if ! use daemon; then
-			dosbin "${S}"/update-smart-drivedb
-		fi
-
-		exeinto /etc/cron.monthly
-		doexe "${FILESDIR}/${PN}-update-drivedb"
-	fi
-
-	if use daemon || use update_drivedb; then
-		keepdir "${db_path}"
-
-		# Install a copy of the initial drivedb.h to /usr/share/${PN}
-		# so that we can access that file later in pkg_postinst
-		# even when dealing with binary packages (bug #575292)
-		insinto /usr/share/${PN}
-		doins "${S}"/drivedb.h
-	fi
-
-	# Make sure we never install drivedb.h into the db location
-	# of the acutal image so we don't record hashes because user
-	# can modify that file
-	rm -f "${ED%/}${db_path}/drivedb.h" || die
-
-	# Bug #622072
-	find "${ED%/}"/usr/share/doc -type f -exec chmod a-x '{}' \; || die
-}
-
-pkg_postinst() {
-	if use daemon || use update_drivedb; then
-		local initial_db_file="${EPREFIX%/}/usr/share/${PN}/drivedb.h"
-		local db_path="${EPREFIX%/}/var/db/${PN}"
-
-		if [[ ! -f "${db_path}/drivedb.h" ]] ; then
-			# No initial database found
-			cp "${initial_db_file}" "${db_path}" || die
-			einfo "Default drive database which was shipped with this release of ${PN}"
-			einfo "has been installed to '${db_path}'."
-		else
-			ewarn "WARNING: There's already a drive database in '${db_path}'!"
-			ewarn "Because we cannot determine if this database is untouched"
-			ewarn "or was modified by the user you have to manually update the"
-			ewarn "drive database:"
-			ewarn ""
-			ewarn "a) Replace '${db_path}/drivedb.h' by the database shipped with this"
-			ewarn "   release which can be found in '${initial_db_file}', i.e."
-			ewarn ""
-			ewarn "     cp \"${initial_db_file}\" \"${db_path}\""
-			ewarn ""
-			ewarn "b) Run the following command as root:"
-			ewarn ""
-			ewarn "     /usr/sbin/update-smart-drivedb"
-
-			if ! use update_drivedb ; then
-				ewarn ""
-				ewarn "However, 'update-smart-drivedb' requires that you re-emerge ${PN}"
-				ewarn "with USE='update_drivedb'."
-			fi
-		fi
-	fi
-}
diff --git a/sys-apps/smartmontools/smartmontools-6.6.ebuild b/sys-apps/smartmontools/smartmontools-6.6.ebuild
deleted file mode 100644
index 1661efefba14..000000000000
--- a/sys-apps/smartmontools/smartmontools-6.6.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools 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
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 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 +daemon selinux static update_drivedb"
-
-DEPEND="
-	caps? (
-		static? ( sys-libs/libcap-ng[static-libs] )
-		!static? ( sys-libs/libcap-ng )
-	)
-	kernel_FreeBSD? (
-		sys-freebsd/freebsd-lib[usb]
-	)
-	selinux? (
-		sys-libs/libselinux
-	)"
-RDEPEND="${DEPEND}
-	daemon? ( virtual/mailx )
-	selinux? ( sec-policy/selinux-smartmon )
-	update_drivedb? (
-		app-crypt/gnupg
-		|| (
-			net-misc/curl
-			net-misc/wget
-			www-client/lynx
-			dev-vcs/subversion
-		)
-	)
-"
-
-REQUIRED_USE="( caps? ( daemon ) )"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-build-on-musl.patch )
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	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="${EPREFIX}/var/db/${PN}" #575292
-		--with-initscriptdir="${EPREFIX}/etc/init.d"
-		$(use_with caps libcap-ng)
-		$(use_with selinux)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		$(use_with update_drivedb gnupg)
-		$(use_with update_drivedb update-smart-drivedb)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	local db_path="/var/db/${PN}"
-
-	if use daemon; then
-		default
-
-		newinitd "${FILESDIR}"/smartd-r1.rc smartd
-		newconfd "${FILESDIR}"/smartd.confd smartd
-		systemd_newunit "${FILESDIR}"/smartd.systemd smartd.service
-	else
-		dosbin smartctl
-		doman smartctl.8
-
-		local DOCS=( AUTHORS ChangeL* COPYING INSTALL NEWS README TODO )
-		einstalldocs
-	fi
-
-	if use update_drivedb ; then
-		if ! use daemon; then
-			dosbin "${S}"/update-smart-drivedb
-		fi
-
-		exeinto /etc/cron.monthly
-		doexe "${FILESDIR}/${PN}-update-drivedb"
-	fi
-
-	if use daemon || use update_drivedb; then
-		keepdir "${db_path}"
-
-		# Install a copy of the initial drivedb.h to /usr/share/${PN}
-		# so that we can access that file later in pkg_postinst
-		# even when dealing with binary packages (bug #575292)
-		insinto /usr/share/${PN}
-		doins "${S}"/drivedb.h
-	fi
-
-	# Make sure we never install drivedb.h into the db location
-	# of the acutal image so we don't record hashes because user
-	# can modify that file
-	rm -f "${ED%/}${db_path}/drivedb.h" || die
-
-	# Bug #622072
-	find "${ED%/}"/usr/share/doc -type f -exec chmod a-x '{}' \; || die
-}
-
-pkg_postinst() {
-	if use daemon || use update_drivedb; then
-		local initial_db_file="${EPREFIX%/}/usr/share/${PN}/drivedb.h"
-		local db_path="${EPREFIX%/}/var/db/${PN}"
-
-		if [[ ! -f "${db_path}/drivedb.h" ]] ; then
-			# No initial database found
-			cp "${initial_db_file}" "${db_path}" || die
-			einfo "Default drive database which was shipped with this release of ${PN}"
-			einfo "has been installed to '${db_path}'."
-		else
-			ewarn "WARNING: There's already a drive database in '${db_path}'!"
-			ewarn "Because we cannot determine if this database is untouched"
-			ewarn "or was modified by the user you have to manually update the"
-			ewarn "drive database:"
-			ewarn ""
-			ewarn "a) Replace '${db_path}/drivedb.h' by the database shipped with this"
-			ewarn "   release which can be found in '${initial_db_file}', i.e."
-			ewarn ""
-			ewarn "     cp \"${initial_db_file}\" \"${db_path}\""
-			ewarn ""
-			ewarn "b) Run the following command as root:"
-			ewarn ""
-			ewarn "     /usr/sbin/update-smart-drivedb"
-
-			if ! use update_drivedb ; then
-				ewarn ""
-				ewarn "However, 'update-smart-drivedb' requires that you re-emerge ${PN}"
-				ewarn "with USE='update_drivedb'."
-			fi
-		fi
-	fi
-}
diff --git a/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild b/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild
index 3dd3f74e6c5d..73438dd4dad8 100644
--- a/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild
+++ b/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit subversion
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="alpha amd64 arm ~arm64 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"
diff --git a/sys-apps/smartmontools/smartmontools-7.0.ebuild b/sys-apps/smartmontools/smartmontools-7.0.ebuild
deleted file mode 100644
index 46b1cf2cff3f..000000000000
--- a/sys-apps/smartmontools/smartmontools-7.0.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools 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
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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 +daemon selinux static systemd update_drivedb"
-
-DEPEND="
-	caps? (
-		static? ( sys-libs/libcap-ng[static-libs] )
-		!static? ( sys-libs/libcap-ng )
-	)
-	kernel_FreeBSD? (
-		sys-freebsd/freebsd-lib[usb]
-	)
-	selinux? (
-		sys-libs/libselinux
-	)"
-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
-			www-client/lynx
-			dev-vcs/subversion
-		)
-	)
-"
-
-REQUIRED_USE="( caps? ( daemon ) )"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	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=(
-		--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)
-		$(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[@]}"
-}
-
-src_install() {
-	local db_path="/var/db/${PN}"
-
-	if use daemon; then
-		default
-
-		newinitd "${FILESDIR}"/smartd-r1.rc smartd
-		newconfd "${FILESDIR}"/smartd.confd smartd
-		systemd_newunit "${FILESDIR}"/smartd.systemd smartd.service
-	else
-		dosbin smartctl
-		doman smartctl.8
-
-		local DOCS=( AUTHORS ChangeL* COPYING INSTALL NEWS README TODO )
-		einstalldocs
-	fi
-
-	if use update_drivedb ; then
-		if ! use daemon; then
-			dosbin "${S}"/update-smart-drivedb
-		fi
-
-		exeinto /etc/cron.monthly
-		doexe "${FILESDIR}/${PN}-update-drivedb"
-	fi
-
-	if use daemon || use update_drivedb; then
-		keepdir "${db_path}"
-
-		# Install a copy of the initial drivedb.h to /usr/share/${PN}
-		# so that we can access that file later in pkg_postinst
-		# even when dealing with binary packages (bug #575292)
-		insinto /usr/share/${PN}
-		doins "${S}"/drivedb.h
-	fi
-
-	# Make sure we never install drivedb.h into the db location
-	# of the acutal image so we don't record hashes because user
-	# can modify that file
-	rm -f "${ED%/}${db_path}/drivedb.h" || die
-
-	# Bug #622072
-	find "${ED%/}"/usr/share/doc -type f -exec chmod a-x '{}' \; || die
-}
-
-pkg_postinst() {
-	if use daemon || use update_drivedb; then
-		local initial_db_file="${EPREFIX%/}/usr/share/${PN}/drivedb.h"
-		local db_path="${EPREFIX%/}/var/db/${PN}"
-
-		if [[ ! -f "${db_path}/drivedb.h" ]] ; then
-			# No initial database found
-			cp "${initial_db_file}" "${db_path}" || die
-			einfo "Default drive database which was shipped with this release of ${PN}"
-			einfo "has been installed to '${db_path}'."
-		else
-			ewarn "WARNING: There's already a drive database in '${db_path}'!"
-			ewarn "Because we cannot determine if this database is untouched"
-			ewarn "or was modified by the user you have to manually update the"
-			ewarn "drive database:"
-			ewarn ""
-			ewarn "a) Replace '${db_path}/drivedb.h' by the database shipped with this"
-			ewarn "   release which can be found in '${initial_db_file}', i.e."
-			ewarn ""
-			ewarn "     cp \"${initial_db_file}\" \"${db_path}\""
-			ewarn ""
-			ewarn "b) Run the following command as root:"
-			ewarn ""
-			ewarn "     /usr/sbin/update-smart-drivedb"
-
-			if ! use update_drivedb ; then
-				ewarn ""
-				ewarn "However, 'update-smart-drivedb' requires that you re-emerge ${PN}"
-				ewarn "with USE='update_drivedb'."
-			fi
-		fi
-	fi
-}