gentoo resync : 22.01.2019

3 files changed, 3 insertions, 48 deletions

diff --git a/app-misc/bottlerocket/Manifest b/app-misc/bottlerocket/Manifest
index 8b82174c2a6e..756bb9408f67 100644
--- a/app-misc/bottlerocket/Manifest
+++ b/app-misc/bottlerocket/Manifest
@@ -1,4 +1,3 @@
 DIST bottlerocket-0.04c.tar.gz 40533 BLAKE2B d42adfc40194cde1229f6e20a3ceed3115d1e1b41789b51f508edc09d12525f6e702c470f38aa94c95d9987b986f467a7723e65f616cbfdfdfa12a05096ea932 SHA512 37673bd9a519307f0ae3003f3a458dbb99d4fd0c96ebaa664f4967fe45b20c1132828c3c7a31e769157e6034c43c9cdcd1ecac8c6791812d2a04e93d4c0c6888
-EBUILD bottlerocket-0.04c-r1.ebuild 881 BLAKE2B 3ca7e8421209e09396cce6b84197fa2bec3cd76b242176dc94c2eb3ba6f4faffdf66cdc2173f734d7139ca815920b2c4d43a10613297b5eecc2be59da96e988d SHA512 1b022113885a17a16c3ff555cdad77b4f498b8b4eced10f9636998883c0cd046f813bea88d51bf19d4a096a19c475079a3ea97d286e1419f39d7ae73966dc33f
-EBUILD bottlerocket-0.04c-r2.ebuild 850 BLAKE2B 86b862e532c99ce9328caae2a722a51dc8f3b1e1d5633895b76fb434d769080cc82bfd3041900d24f05a089a60f9b1516f056b94886c132c66f509e362f4997c SHA512 ae81eb3428fc555f7899443e9592267e07b15f99c9909e776849bc240902879ba217d96b4a09253552635da460793f541da94279c7de7dc2bdc767a9b6d63928
+EBUILD bottlerocket-0.04c-r2.ebuild 845 BLAKE2B cf81d2c8db9fa29363112602c0e314283b84935bf0ed32fa9841f26de0c3fb8ea3d6136d32a46d61750a333ad7a9d3ba34b2fc3f2237bbc6b4faa95fcf2da3e4 SHA512 fb208e7f313837176faafe00a42e853c14aac2c9d78f6573c9bd78af1ec020fe55768ddc9e0ae57d1d7f66370a1e8a47f7d2788b5617dabc899a127df7393c28
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/bottlerocket/bottlerocket-0.04c-r1.ebuild b/app-misc/bottlerocket/bottlerocket-0.04c-r1.ebuild
deleted file mode 100644
index 4bebb91dd777..000000000000
--- a/app-misc/bottlerocket/bottlerocket-0.04c-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit toolchain-funcs
-
-DESCRIPTION="CLI interface to the X-10 Firecracker Kit"
-HOMEPAGE="http://www.linuxha.com/bottlerocket/"
-SRC_URI="http://www.linuxha.com/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-src_prepare() {
-	# inset LDFLAGS
-	sed -i Makefile.in \
-		-e 's| -O2 ||g' \
-		-e '/ -o br /s|${CFLAGS}|& $(LDFLAGS)|g' \
-		|| die "sed Makefile.in"
-}
-
-src_configure() {
-	econf --with-x10port=/dev/firecracker
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	einstall || die "einstall"
-	dodoc README
-}
-
-pkg_postinst() {
-	elog
-	elog "Be sure to create a /dev/firecracker symlink to the"
-	elog "serial port that has the Firecracker serial interface"
-	elog "installed on it."
-	elog
-}
diff --git a/app-misc/bottlerocket/bottlerocket-0.04c-r2.ebuild b/app-misc/bottlerocket/bottlerocket-0.04c-r2.ebuild
index 882443c5b5f2..dbc423b04cb7 100644
--- a/app-misc/bottlerocket/bottlerocket-0.04c-r2.ebuild
+++ b/app-misc/bottlerocket/bottlerocket-0.04c-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="http://www.linuxha.com/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 
 src_prepare() {
 	default