gentoo resync : 22.10.2018

3 files changed, 121 insertions, 3 deletions

diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest
index 9f8f65838521..12d85a86a6e3 100644
--- a/app-admin/hddtemp/Manifest
+++ b/app-admin/hddtemp/Manifest
@@ -1,4 +1,4 @@
-AUX hddgentoo.db 19464 BLAKE2B 82577371ce2f8702a400bf10eb0a9300506a10c5cb780b72503b908c8129c14f78f0ef339b97d86e2bef96f889a6f43e82739d810add817cf94a731b73a7b591 SHA512 03aa8c528988a1d602cd17f2d3a02e00142634dd87f92af7cb2ceab30f1d525a5954300c74e61e6614043a0636f63151e641e57aa860ed878eb339a51db8b72b
+AUX hddgentoo.db 19595 BLAKE2B c02a706c8afc92f17854ae6b0b8d7071e95a5d53b8e4962e53d8209c0c70bcaed4392b2a3233717854838200cfd7d75b4a19444dec03719fb9f5a0bac8a61152 SHA512 097acfa6127ff3628e71edf72fec67731b6d9d2f105f62ce757fb67caa19afa16c7f2e21361fdd647209c33ecd5f97a44be209773c5b1fe3d175eeb441933593
 AUX hddtemp-0.3_beta15-byteswap.patch 1037 BLAKE2B 5e0df7da8f67facd8f5d466c502b44aa1e58822ec6b91992b973aea0d3e70fdba0812746fd697341419b670a984e14c1c44a1b952d27ffc82df56b06bf6a27a3 SHA512 4d37b31129be7f767a416d4b15e3eaf94af297a7d2f4ed57f900fc48775bbb389ca1259c13dd048d670f32fe53f8d0e06c6f1c02485cb95a08d2a80aac4f76a8
 AUX hddtemp-0.3_beta15-dontwake.patch 515 BLAKE2B 56061289e8d247a11a3172eebf3ed7f04f6b55b6021c9d79dbc41553828d4b265dc049ac139473dfd48c8e904d3cd4023405f9c787a21537872c6e2185395ee4 SHA512 ff5cfeb9fcd6a17ab3937212a85076fafa9abfde72a1b602ada09b5fb71f89a200e91398e9682a17034f630b90e57559e550c0f1565d12ca642af0c2e10a99e1
 AUX hddtemp-0.3_beta15-execinfo.patch 751 BLAKE2B 955e4d3501f7a8669036168740d67574f912197110cb2a156b3aef884596346bd1cbc32279248bc91f8e94993139092b80db02fe4cc42124ada99915fcb0b899 SHA512 cd320985142df5f07cb8c56613aa4110a63fed34e2e08f95272f3d43b75289d298e9dc61e86a42e0be5f15f9a76007d894d515d4d09c8a9deb41b16aa4ea3bc6
@@ -13,5 +13,7 @@ AUX hddtemp.service.conf 88 BLAKE2B 310463288da0fdee89d914c70aed0175b62d53a38285
 AUX update-hddtemp.db 819 BLAKE2B 2322abe8bc4c4f49a4c16267783d9d7ee46666e1e11b70438914d3c770b75f5b4912ddb17dff0555d9847b43d1e43b19a5a54598778b97bfb4c6829f7424f09f SHA512 7d923d582da2e8012de4ebb4243a4fccd6135cfca7d06f02f50b290c5984af288942f7588da7c8c57b91e362a8febc76f14b489798af14f66e3ec7bec9518ba4
 DIST hddtemp-0.3-beta15.tar.bz2 256372 BLAKE2B 1c928234c36172c387a002190045cd05007f4b4b8d74eb378ba810ea9aad96951b7a9b3b0f872130677fca1f294d86f855327dcfa5a263c9f3c7d58fbbba502e SHA512 7db5a3dff60c59ce147b996ea4f8b6de1abcd34301bb863507b4d4b44e72fdc031078867a7f37161e67e74f6b426a1d856d3081179c678d2a442815bb0faa94d
 DIST hddtemp-20080531.db.bz2 5627 BLAKE2B b973a981ee55033c8ba190efd9dc8586589292ef1f2b00542be7db2be64df812847665abefc7517f7c71dc70df153766570f62b69fc4891e758e82200ff8d589 SHA512 cd03cc300aece4f7427fde1b58840643c8e41e6c0ce30b418a62bf44b268f249ef3dc4f5f4bcbc9cc0cfe0346c18d4f1da22451c87efc3d46faebcb81a1fe059
+DIST hddtemp_0.3-beta15-53.diff.gz 52845 BLAKE2B ae4ef1f98ff39a39bdb49b2752f6f442c6ebe8ea6b0e8e743cc3ab9ef39d07abe8970648b841b3974cd814fdef72bc59cfe93c4b4d1cf2a85de1a0d94c4409b9 SHA512 1006ffa92f9973eb1da6444f8e8eed681e641efd17a52954b0e6c5041ecae13108af4ed89534ec4f2799685f96191769d3b168dbbb96085dc801150c7c547511
 EBUILD hddtemp-0.3_beta15-r26.ebuild 2972 BLAKE2B f273cee116ed77f85fdedaab31f82c6a7bd109b306a9d56745767050cc65ed79c2b28875f934b02fbdde87db6e8e1185605525f1562d930d3b5eadf8bc4edd0c SHA512 64c30191b0103c410b9d8461c283738a56ccdc09b7fd2f9d8ee3f4e05f1a16768d2e94fe74f7638e1ed8c3852976a19fe9f3766581c49ed884f686495eca1bf5
+EBUILD hddtemp-0.3_beta15-r27.ebuild 2997 BLAKE2B 3eaa5dd05ed2075d71fb3b52d18a1641fd5de5bbd740f37f1d41ef78af7f44ba6065682bc97f162d26d28e3fa553760e41e113f713d879480574bd1d95374f42 SHA512 455cf277c4faa3c281585a6fa63f030ea2078635b237cbd27a3e39aa5defc56c52e525a3b3f3b16676cb9d358c5c2d58c624d5bd340e8e2aca0bb5c3636c81d6
 MISC metadata.xml 260 BLAKE2B 41040f0f9342dec7a3993d99bd9fb49f624c8fc8a0be036b3c2e3f2f20d4182d23c5b98a5451f5d2d6906d749b7756b7ec10b1e135bfa7b1633234ebdae1370a SHA512 480d8cf7f249c083d64b11e13bd93b42856531860afa935a9265bfcf9491fbd3997a9b9d8e90630daba103402fc9aa08c63ef18091cd6ee68310c0a8f3c38af3
diff --git a/app-admin/hddtemp/files/hddgentoo.db b/app-admin/hddtemp/files/hddgentoo.db
index 539a88a4917d..c4f679052577 100644
--- a/app-admin/hddtemp/files/hddgentoo.db
+++ b/app-admin/hddtemp/files/hddgentoo.db
@@ -215,6 +215,7 @@
 "Hitachi HDS721680PLA380"					194 C "Hitachi Deskstar 7K160 80GB SATA2 7200RPM 8MB"
 "Hitachi HDS721010CLA332"					194 C "Hitachi Deskstar 7K1000.C 1TB SATA2 7200RPM"
 "HGST HDS724040ALE640"						194 C "HGST Deskstar 7K4000 4TB SATA3 7200RPM"
+"HGST HUS726060ALE610"						194 C "HGST Ultrastar 7K6000 model HUS726060ALE610"
 "ST9120822AS"							194 C "Seagate Momentus 5400.3 120GB SATA 5400RPM 8MB"
 "ST32000542AS"							194 C "Seagate Barracuda LP 2000GB SATA2 5900RPM 32MB"
 "ST2000DL003-9VT166"						194 C "Seagate Barracuda LP 2000GB SATA3 5900RPM 64MB"
@@ -227,12 +228,13 @@
 "TOSHIBA HDWD130"						194 C "Toshiba P300 3TB SATA3 7200RPM 64MB"
 "Samsung SSD 850 EVO"						190 C "Samsung SSD 850 EVO Series"
 "Samsung SSD 840 Series"					190 C "Samsung SSD 840 Series"
-"Samsung SSD 840 PRO Serise"					190 C "Samsung SSD 840 Pro Series"
+"Samsung SSD 840 PRO Series"					190 C "Samsung SSD 840 Pro Series"
 "Samsung SSD 840 EVO"						190 C "Samsung SSD 840 EVO Series"
 "SAMSUNG HD203WI"						194 C "Samsung SpinPoint F3 EcoGreen 2TB SATA2 5400RPM 32MB"
 "SAMSUNG SSD 830 Series"					190 C "Samsung SSD 830 Series"
 "SanDisk SDSSDH2128G"						194 C "Sandisk SSD Ultra Plus 128GB"
 "SanDisk SDSSDH2256G"						194 C "Sandisk SSD Ultra Plus 256GB"
+"SuperMicro SSD"						194 C "SuperMicro SSD"
 "OCZ-VERTEX3"							194 C "OCZ Vertex 3 120GB SATA3"
 "Crucial_CT240M500SSD3"						194 C "Crucial M500 240GB SATA3 256MB"
 "WDC WD5003ABYX-01WERA2"					194 C "Western Digital RE4 500GB"
@@ -258,6 +260,6 @@
 "ST2000DM006-2DM164"						194 C "Seagate Barracuda 2TB SATA3 7200RPM 64MB"
 "Samsung SSD 850 PRO 128G"					190 C "Samsung SSD 850 PRO 128G"
 "WDC WD1600BEVS-08RST2"						194 C "Western Digital Scorpio Blue SATA 160GB 5400RPM 8MB"
-"WDC WD30EZRZ-00Z5HB0"						194 C "Western Digital Blue 3TB SATA3 5400RPM 64MB"
+"WDC WD(1|2|3|4|5|6)0EZRZ-00Z5HB0"				194 C "Western Digital Blue SATA3 5400RPM 64MB"
 "ST31000528AS"							194 C "Seagate Barracuda 7200.12 1TB SATA2 7200RPM 32MB"
 "HITACHI HTS727550A9E364"                                       194 C "Hitachi Travelstar 7K500 500GB SATA2 7200RPM 16MB"
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r27.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r27.ebuild
new file mode 100644
index 000000000000..53a9a779e93a
--- /dev/null
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r27.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools readme.gentoo-r1 systemd
+
+MY_P=${P/_beta/-beta}
+DBV="20080531"
+DEB_PATCH="53"
+
+DESCRIPTION="A simple utility to read the temperature of SMART capable hard drives"
+HOMEPAGE="https://savannah.nongnu.org/projects/hddtemp/"
+SRC_URI="
+	http://download.savannah.gnu.org/releases/hddtemp/${MY_P}.tar.bz2
+	mirror://gentoo/hddtemp-${DBV}.db.bz2
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_/-}-${DEB_PATCH}.diff.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="network-cron nls selinux"
+
+DEPEND=""
+RDEPEND="selinux? ( sec-policy/selinux-hddtemp )"
+
+S="${WORKDIR}/${MY_P}"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="In order to update your hddtemp database, run:
+emerge --config =${CATEGORY}/${PF} or update-hddtemp.db (if USE
+network-cron is enabled)
+
+If your hard drive is not recognized by hddtemp, please consider
+submitting your HDD info for inclusion into the Gentoo hddtemp
+database by filing a bug at https://bugs.gentoo.org/
+
+If hddtemp complains but finds your HDD temperature sensor, use the
+--quiet option to suppress the warning.
+"
+
+PATCHES=(
+	"${WORKDIR}"/${PN}_${PV/_/-}-${DEB_PATCH}.diff
+	"${FILESDIR}"/${P}-nls.patch
+	"${FILESDIR}"/${P}-iconv.patch
+	"${FILESDIR}"/${P}-dontwake.patch
+)
+
+src_prepare() {
+	default
+	mv "${S}"/configure.{in,ac} || die
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	myconf="--with-db-path=/usr/share/hddtemp/hddtemp.db"
+	# disabling nls breaks compiling
+	use nls || myconf="--disable-nls ${myconf}"
+	econf ${myconf}
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/hddtemp
+	newins "${WORKDIR}/hddtemp-${DBV}.db" hddtemp.db
+	doins "${FILESDIR}"/hddgentoo.db
+
+	update_db "${ED}/usr/share/hddtemp/hddgentoo.db" "${ED}/usr/share/hddtemp/hddtemp.db"
+	newconfd "${FILESDIR}"/hddtemp-conf.d hddtemp
+	newinitd "${FILESDIR}"/hddtemp-init hddtemp
+	systemd_newunit "${FILESDIR}"/hddtemp.service-r1 "${PN}.service"
+	systemd_install_serviced "${FILESDIR}"/hddtemp.service.conf
+
+	readme.gentoo_create_doc
+
+	if use network-cron; then
+		dosbin "${FILESDIR}"/update-hddtemp.db
+		exeinto /etc/cron.monthly
+		echo -e "#!/bin/sh\n/usr/sbin/update-hddtemp.db" > "${T}"/hddtemp.cron
+		newexe "${T}"/hddtemp.cron update-hddtemp.db
+	fi
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
+
+update_db() {
+	local src=$1
+	local dst=$2
+
+	while read line ; do
+		if [[ -z $(echo "${line}" | sed -re 's/(^#.*|^\w*$)//') ]]; then
+			echo "${line}" >> "${dst}"
+		fi
+
+		id=$(echo "${line}" | grep -o '"[^"]*"')
+
+		grep "${id}" "${dst}" 2>&1 >/dev/null || echo "${line}" >> "${dst}"
+	done < "${src}"
+}
+
+pkg_config() {
+	cd "${ROOT}"/usr/share/hddtemp || die
+
+	einfo "Trying to download the latest hddtemp.db file"
+	wget http://download.savannah.nongnu.org/releases/hddtemp/hddtemp.db -O hddtemp.db \
+		|| die "failed to download hddtemp.db"
+
+	update_db "hddgentoo.db" "hddtemp.db"
+}