gentoo resync : 16.02.1018

4 files changed, 2 insertions, 70 deletions

diff --git a/dev-lang/mujs/Manifest b/dev-lang/mujs/Manifest
index fbb6ccf081a0..eddae221b354 100644
--- a/dev-lang/mujs/Manifest
+++ b/dev-lang/mujs/Manifest
@@ -1,7 +1,4 @@
-AUX mujs-1.0.4-gentoo.patch 638 BLAKE2B 4f4f5a3d21f49380ab9b2c87d3e367e1a83490794ed1e7653be2079d1fd71b2359d728f3831dec3199f9a1cf7331627a657019df332dea175f1c08e95638c3a1 SHA512 4e50aa9143d461935f6475ee409a8392ddd93b51a1817a1b21d3152064c2c1b0bb1b8bdc97558b0b2b04094431085c22e80da43b099dd5a87e4d593033563f51
 AUX mujs-1.0.5-flags.patch 839 BLAKE2B 843d1bf60167dfb91a5736ee936098c8f6b716f7a70118512d102adb3dc00223d5a3f1fb8da3a57b89797d5b26ebf8120cc1ef2013162aeff288be07cb99d99f SHA512 35681b868e129edffe27e41b793ef073b9ebeb5842212116f9740257515a3fb0d2f00d828a72d96b630c7632184ff9340325a5d79503e5a4c5a52892bd26f4bd
-DIST mujs-1.0.4.tar.xz 91520 BLAKE2B 6ffe62b19b140e2ae63ebe59a3b3bd352936ccba53dda3b0fcf575440dc790a0767c7de8c0a1441d26c11c65074520a80050cc0efa1113be0df51a802e719574 SHA512 a32498fee20ab6ddc8bbf79b4fdd82f3560d4e4b28bbe57c4e8f1df4a8a5367a689b6c9a391761abe47a8f15d2832fede4a508330eb181744b9563ae9954c102
 DIST mujs-1.0.5.tar.gz 119353 BLAKE2B 48f1b598e50d5804b0d64230cdd6b4d3f719187ea0906f45c9f45baee2c8df59c6fd09dc25afc9e1ce4e20a9866d158d16a4632bec552fddd8fac70b20e2363f SHA512 c1c59b5e80e0e5f580f30dfc0b4707b6a1e44a73c746b9783bb24d91429ddf8ed670a7663478300cc568cfc15a511720b6d18be2ade40a3a66fc7ab8f3933c2d
-EBUILD mujs-1.0.4.ebuild 1021 BLAKE2B f037a744c255dd71fbb9ce3312d45a42c6648e88324a8fa16e6f1b27672607f9c0e0b22974afdd4ecdb3ddb7d692b9ccbd7ba781ba2a4074dcb1b2188e362a41 SHA512 1e5fbe3b2c145623ab863eec5d4570597334b43c7c9dc95ab87a530ce28d33be365ea0a6fa15433cb34c2c45085720864d40fb9a73e60217bc20cd58c8b26bbb
-EBUILD mujs-1.0.5.ebuild 1171 BLAKE2B 4f27a1ba78439a92196efab75969c9fb3ee77a8b08843df42cf62b2cc979222916a95d99bdf3f3a7c58e16d23f3e85276824ef99d4b0c2b126e318c8b42d66c9 SHA512 e5527b94206066d9df36d87090e7cd9efd86db9984a84e61d731bec6b57f7c5a34a9a478e0fafb5dfc45536c40bb1fa6cc0828ee95f6bbc95afc6dee1f08b862
+EBUILD mujs-1.0.5.ebuild 1169 BLAKE2B e361dd250701172d3ef1ab6d3884cc2f9892016e7c7a968562be7e9eed9667ee7285c9a13d26203684764926451eb3d0f01e32d02bc1254b2182ca0f0bba9061 SHA512 8f1cc0036d59e0982cb7ec1cb0f13ba2b9a699865c16390d634a752268bdf67a3c6b363095ca088e317dd1cfdf2533bc23d84f715a4cd9a5e6de21a335a0a066
 MISC metadata.xml 555 BLAKE2B ea6b447ad19ed256c8a8f4b81b51ad3b336824ea357e746bd9194d7a30dadceae89ec00630e7dc5fe15435fb6f85da65e4d3a22363f5ab40365afd157b2e9302 SHA512 cb5e725aad6542f1d1c569fb82a79973d1e528f3c43251e3f60a8cb2af229747cc6c7ead5fa8b39e46a50498251a704453c90b9863641008b01317b1d8b89bc7
diff --git a/dev-lang/mujs/files/mujs-1.0.4-gentoo.patch b/dev-lang/mujs/files/mujs-1.0.4-gentoo.patch
deleted file mode 100644
index c05b8787466c..000000000000
--- a/dev-lang/mujs/files/mujs-1.0.4-gentoo.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-1. Add to user-defined CFLAGS instead of being overwritten by them
-2. Don't strip binaries: it leads to QA warnings
-diff --git a/Makefile b/Makefile
-index 7284f51..7615158 100644
---- a/Makefile
-+++ b/Makefile
-@@ -15,7 +15,7 @@ endif
- 
- # Compiler flags for various configurations:
- 
--CFLAGS := -std=c99 -pedantic -Wall -Wextra -Wno-unused-parameter
-+CFLAGS += -std=c99 -pedantic -Wall -Wextra -Wno-unused-parameter
- 
- ifeq "$(CC)" "clang"
-   CFLAGS += -Wunreachable-code
-@@ -32,7 +32,6 @@ else ifeq "$(build)" "sanitize"
-   LDFLAGS += -fsanitize=address
- else
-   CFLAGS += -Os
--  LDFLAGS += -Wl,-s
- endif
- 
- ifeq "$(HAVE_READLINE)" "yes"
diff --git a/dev-lang/mujs/mujs-1.0.4.ebuild b/dev-lang/mujs/mujs-1.0.4.ebuild
deleted file mode 100644
index cb17cf6855f7..000000000000
--- a/dev-lang/mujs/mujs-1.0.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="lightweight Javascript interpreter"
-HOMEPAGE="http://mujs.com/"
-SRC_URI="https://mujs.com/downloads/${P}.tar.xz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="static-libs"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.4-gentoo.patch
-)
-
-src_prepare() {
-	default
-	append-cflags -fPIC -Wl,-soname=lib${PN}.so.${PV}
-	tc-export CC
-}
-
-src_compile() {
-	emake VERSION=${PV} prefix=/usr shared
-}
-
-src_install() {
-	emake \
-		DESTDIR="${ED}" \
-		VERSION=${PV} \
-		prefix=/usr \
-		libdir="/usr/$(get_libdir)" \
-		install-shared \
-		$(usex static-libs install-static '')
-
-	mv -v "${D}"/usr/$(get_libdir)/lib${PN}.so{,.${PV}} || die
-	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so || die
-	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV:0:1} || die
-}
diff --git a/dev-lang/mujs/mujs-1.0.5.ebuild b/dev-lang/mujs/mujs-1.0.5.ebuild
index 8a76c3275ffd..f2f016629348 100644
--- a/dev-lang/mujs/mujs-1.0.5.ebuild
+++ b/dev-lang/mujs/mujs-1.0.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ccxvii/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 
 RDEPEND="sys-libs/readline:0="