gentoo resync : 07.01.2018

3 files changed, 3 insertions, 42 deletions

diff --git a/sys-apps/watchdog/Manifest b/sys-apps/watchdog/Manifest
index 7ca8b4101e5f..a9c5a26d61a1 100644
--- a/sys-apps/watchdog/Manifest
+++ b/sys-apps/watchdog/Manifest
@@ -4,8 +4,6 @@ AUX watchdog-conf.d 158 BLAKE2B d998b3cd1788d60d5aeec2872f39f748f75fb9bb6e3ef643
 AUX watchdog-init.d 861 BLAKE2B 5fbda896379eb22d6beb50c7839f9c10c463cea5491b74472ce30108551c7095bbac1bfde6f5089d81426809808bcecdea03fc0e0c7dab942dd4136cc1809aeb SHA512 f1a84e90dd6f169a6e28f38b9f362e43256bba0b4266fead707578705a8f404d9f256022d94d24f1555847765a27e5a7017b5e1fa20a613fdb0a41d305638231
 AUX watchdog-init.d-r1 773 BLAKE2B 7d5bdf4e349f558f12e8250de5abf39278e3d7bfa5344225ce717cd3575573853f11feef8cdc3aa526280f717f9ae43bd42191789ddf81bb4beb32afc8f38bc5 SHA512 c07f0e3f026a86ecbcaa839c5711420fe00433a9ce84c3a7e3f4de4a1d90bc5ad6646561acaa1d1df2d1adb638dd6817497c4c538574ac894deb6c7451b2964a
 AUX watchdog.service 146 BLAKE2B 9a0a28cbc4509590c98850bf31355e991fd298e52a1fce0a7b6925554f24b80c76adf76bee20790e0d100c8372e4e35a3b0826d6192267f5addf7155d414cf4c SHA512 5eb489e72351db8a881d84fc15730a91ca2a108641031196ad5374aec5e01fa5b859872fa27c3382b4637482a5c8dab7efa61057f4663ae6c49c4ed01e9d8abd
-DIST watchdog-5.14.tar.gz 216384 BLAKE2B e27f6cb3595c54a2128d828434fcbde7a42be3a31a8c837153950f360146526a809d55dbe68fa248e2efcd7063a888f563eb36075d7334e5b7307fb02da67c29 SHA512 ccfaca7a68a47cff42dbeae047dfa691e1cfc23851f9ca0634ea6315ff55a13cdbb0020bde7df38b702c82c0535ad41f520617dd639037e171701a6b0f8991aa
 DIST watchdog-5.15.tar.gz 228132 BLAKE2B 040badcf66f048e2873c335a4dd1b5dad6716c61534322c0c92dad2238049555af40e92612a260507fddd4c284d7ccb5d362dc1660084fd0a7db2c522b1ea323 SHA512 a675cfadf3296d583b9163193297038fb19459daf7c6681289392d613e775e75b7afd42a3e01b136a955f25b2f45818033b56e10de9050075d7dc015535a6e75
-EBUILD watchdog-5.14.ebuild 869 BLAKE2B 0d159a185ac60a8f911547e42d13f594d9c54e54f0bd49b375b975c9321eeb6ef13e89f748dea0947a01e7d48d4783e11838ae26c856372aed4d06b627260cd5 SHA512 7223acbd16f44a78cab8af57d283453f1e72fe49bab38100a2f3dfdfcdc9cc02caf3c07f75b77b06bdae6d14cd7c31069709d1f4374dcb852fa059cd4e57089a
-EBUILD watchdog-5.15.ebuild 977 BLAKE2B b806fb1999854c30adf4b9c13aa02a25ee0a80180850b7b4797873dae42cc3c35fc20fcfe755e9a95c1fd5e98e36502f0702cc4c7cd2ba1dfbce5faacd516904 SHA512 cc865a662a5f19d4e1c4c5ade4a47f3561ae29088a8ea33a73fa71fe7b53dd52e37bd95f0604a1455693a4c91002ac7c667bd4ba397340445944dc212f7a620e
+EBUILD watchdog-5.15.ebuild 976 BLAKE2B df9f2e8807f4bb88dc90f5e59e82960bc35714d4643a4eb1fbffe1890303bf53f760cfb52a8d058158641c6fbd991b4cec6ca80f228fe2f9d00e6f2fbfbb8b01 SHA512 235d0ee4af23297d80450c1a6c667421ea67d2676c4b95b8cbea9acd1c8520438eea1cb9ec1e4a9d2ee19def563f33f1ee512f7092ac38c9c9adabd828cd8dc4
 MISC metadata.xml 405 BLAKE2B 47880df93bf397e1a7d905a0ade7c385eb7f97ca4e99fd5687f15147adb093da1312f518b6179d7ab9095a355d73147091787a0d3dc90200cef3e8cf7320a8c8 SHA512 36da0e0199b41608190b0e39de2b82bea5516890208c57744b93e527904501de01b1bfd4e20fc74450bd7b9ac4d152e0d57e31a35deca0b1edddc9ce60846d0b
diff --git a/sys-apps/watchdog/watchdog-5.14.ebuild b/sys-apps/watchdog/watchdog-5.14.ebuild
deleted file mode 100644
index f22eacd43f2a..000000000000
--- a/sys-apps/watchdog/watchdog-5.14.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs flag-o-matic systemd
-
-DESCRIPTION="A software watchdog and /dev/watchdog daemon"
-HOMEPAGE="https://sourceforge.net/projects/watchdog/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm m68k ~mips ppc s390 sh ~sparc x86"
-IUSE="nfs"
-
-DEPEND="nfs? ( net-libs/libtirpc )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	if use nfs ; then
-		tc-export PKG_CONFIG
-		append-cppflags $(${PKG_CONFIG} libtirpc --cflags)
-		export LIBS+=" $(${PKG_CONFIG} libtirpc --libs)"
-	fi
-	econf $(use_enable nfs)
-}
-
-src_install() {
-	default
-	docinto examples
-	dodoc examples/*
-
-	newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
-	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
-	systemd_dounit "${FILESDIR}"/watchdog.service
-}
diff --git a/sys-apps/watchdog/watchdog-5.15.ebuild b/sys-apps/watchdog/watchdog-5.15.ebuild
index 3c3b6f51e119..1907cbce3c03 100644
--- a/sys-apps/watchdog/watchdog-5.15.ebuild
+++ b/sys-apps/watchdog/watchdog-5.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="nfs"
 
 RDEPEND="nfs? ( net-libs/libtirpc )"