gentoo resync : 15.09.2018

3 files changed, 2 insertions, 75 deletions

diff --git a/sys-power/nvram-wakeup/Manifest b/sys-power/nvram-wakeup/Manifest
index 30186f21b30e..66db6acd3380 100644
--- a/sys-power/nvram-wakeup/Manifest
+++ b/sys-power/nvram-wakeup/Manifest
@@ -1,6 +1,4 @@
 AUX nvram-wakeup-0.97-nonls.patch 450 BLAKE2B cd67fd5ba3fd5bb56d10040ae8e0e5e5ade7f787d201be879bc859e069c26fc560d66840b24e1ceeb00c6464f8c036620774c13c0af27d76c59352adefc567c8 SHA512 014c0d04d0b6a765a9ea1a42bdd11d5bc8f2d6c580f1a7d08c90b4622b6958a129add4c3be7c79e05e529e1dc38fffffe4c14d90a266fee252df71ac508121f1
-DIST nvram-wakup-1.0.tar.gz 1068875 BLAKE2B 85b68033b1c021f0dd17f929f9e759b5a628d6b998fda4ab5b7bbaf2f55acdf5c4b7cbaa2a8be13a52954f1a2d883aff57756ec15c52e2edc6ceb81d6fb08882 SHA512 f9f350323cfb65a33903edc5938c3503c60f4259acbc347d76aece65307d97e971e3350724e6d4a4870175db1baf1d3f1803b6536f0529371aae1f9fc6ee56c0
 DIST nvram-wakup-1.1.tar.gz 1070097 BLAKE2B 9e9aad545d7a7d0882cf07522c60a68ab678ad2dec8ba51828862afe077fa5a11929aaf5a21bae69977338fdf1de5cb394a874475dcc8b4018c4358e780fe786 SHA512 a47c6831e004e25f43adbc25aa46aca457602c681693621e3acda12f1f775aa1c5fa30ec9a09d71945ef2de8a2dbe97f9c1c7e09b1ae3464c368c9b8fc0f11e0
-EBUILD nvram-wakeup-1.0.ebuild 2053 BLAKE2B 2f1200b20de08267c1104cb4524b2c8eb86c4597de7b6605fc9d6051196796c229253211a219f9ce6416c0164bbaff108825180c5173dfdfa38bc43a65b26efb SHA512 90d8a806aaecea39e6a95c9bd1a155bd8fead151129f73e22143c30a7ac79886bd429d2187f02b59a5a15a10b9c6e01f9b8fc82a1121980adfdee74db42b9a9b
-EBUILD nvram-wakeup-1.1.ebuild 2084 BLAKE2B 6e8701e78bbcae6a0211078bf472cdb7ab77ae6266fba5ce9c3b0874651efa18cc0c89fd7ab70b84c9832062bba67addea6d8fb0c2d7181cbfdea6ad72aa080b SHA512 0605cbc1336fcbb0d9c5943ba914620ad932fd44a64c7400175df6be6583b7d8f8c7ec9e6e5d1c36e7f80bb682b6a8eebb65f61fe60fd54d38c49e0386e929dd
+EBUILD nvram-wakeup-1.1.ebuild 2082 BLAKE2B e2097441340b17b06e0b7eb6abe303d575af8b1bafc921e49891f8784798630c70371bb68630697c6c4f6360646cba14ac18d90730147cc1b0b9c98dabf05897 SHA512 8ad07b94c71b73a658d0cb9eee229caaaee5c9b038b0d60229283045fe3335ad31bbaf3ae70672f4043b69e0daf54b92d1ca6238454ad5c9bd1d4200df5619ee
 MISC metadata.xml 332 BLAKE2B da79324331fe0e03012a29f4a25a7df5ee5e9e3673c280f322f55ed62b969e72b85ff31411bd443b4234e60df86e1efa96a9de45a864d5871075d3934cd8ff08 SHA512 948648cf4b193094ffe04b679d159ea2acf4a42d5005792889b782d56fc96cccdd87ba2b92ed5eade664a379107a1ee3a2a197c6dd69b531c395ebdf38229ebb
diff --git a/sys-power/nvram-wakeup/nvram-wakeup-1.0.ebuild b/sys-power/nvram-wakeup/nvram-wakeup-1.0.ebuild
deleted file mode 100644
index e9ad08cbf064..000000000000
--- a/sys-power/nvram-wakeup/nvram-wakeup-1.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit flag-o-matic eutils
-
-MY_P=${P%_p*}
-[[ ${PV} == *_p* ]] && REV=${P#*_p} || unset REV
-MY_P=${MY_P/e}
-DESCRIPTION="read and write the WakeUp time in the BIOS"
-HOMEPAGE="https://sourceforge.net/projects/nvram-wakeup"
-SRC_URI="mirror://sourceforge/nvram-wakeup/${MY_P}.tar.gz
-	${REV+http://nvram-wakeup.svn.sourceforge.net/viewvc/*checkout*/nvram-wakeup/trunk/nvram-wakeup/nvram-wakeup-mb.c?revision=${REV}}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-[[ -n ${REV} ]] && RESTRICT="mirror" #168114
-
-DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	if [[ -n ${REV} ]] ; then
-		cp "${DISTDIR}"/nvram-wakeup-mb.c?revision=${REV} "${S}"/nvram-wakeup-mb.c || die
-	fi
-	cd "${S}"
-	use nls || epatch "${FILESDIR}"/${PN}-0.97-nonls.patch
-	# Need to be careful with CFLAGS since this could eat your bios
-	strip-flags
-	sed -i \
-		-e '/^CFLAGS/s:= -O2 :+= $(CPPFLAGS) :' \
-		Makefile || die "setting CFLAGS"
-}
-
-src_install() {
-	emake \
-		prefix="${D}"/usr \
-		MANDIR="${D}"/usr/share/man \
-		DOCDIR="${D}"/usr/share/doc/${PF} \
-		install || die
-
-	dodoc "${D}"/usr/bin/vdrshutdown
-	rm -f "${D}"/usr/bin/vdrshutdown
-	dodoc set_timer
-
-	rm -f "${D}"/usr/sbin/time
-	rm -f "${D}"/usr/share/man/man*/time.8*
-
-	prepalldocs
-}
-
-pkg_postinst() {
-	echo
-	ewarn "WARNING:"
-	ewarn "This program  writes into the  NVRAM  (used by  BIOS to store the CMOS"
-	ewarn "settings).  This is  DANGEROUS.  Do it at  your own  risk.  Neither the"
-	ewarn "author  of  this program  (nvram-wakeup)  nor anyone else  can be made"
-	ewarn "responsible to any damage made by this program in any way."
-	ewarn "(The worst case  happened to me is that on reboot the BIOS noticed the"
-	ewarn "illegal  contents of  the nvram and  set everything to default values."
-	ewarn "But this doesn't mean that you can't destroy even your whole computer.)"
-	echo
-	ewarn "		YOU HAVE BEEN WARNED, HAVE A NICE DAY"
-	echo
-}
diff --git a/sys-power/nvram-wakeup/nvram-wakeup-1.1.ebuild b/sys-power/nvram-wakeup/nvram-wakeup-1.1.ebuild
index 80a7ddac4035..48e4da2acae3 100644
--- a/sys-power/nvram-wakeup/nvram-wakeup-1.1.ebuild
+++ b/sys-power/nvram-wakeup/nvram-wakeup-1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/nvram-wakeup/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 [[ -n ${REV} ]] && RESTRICT="mirror" #168114