gentoo resync : 18.11.2018

4 files changed, 2 insertions, 67 deletions

diff --git a/dev-lang/mujs/Manifest b/dev-lang/mujs/Manifest
index 0a03353baeb1..9f2f826b4d05 100644
--- a/dev-lang/mujs/Manifest
+++ b/dev-lang/mujs/Manifest
@@ -1,10 +1,7 @@
-AUX mujs-0_p20150202-Makefile.patch 593 BLAKE2B f2e12bc18ae155a4cc5c69a9b1c5ad749e206a567fc7c58ae453f85f2dbda6cb5f0c462e853ad6c52e422a0dcab9834312d1c2cdbd419759ceedaa4b5513314d SHA512 2c6c0b0ba8dc757a1ae57fbfe5ea56970e07177b45e7d7aa7ed41896ead5b0d4200003897f9c837fc97e96bdc2fd51229fd2629e8780194ad12f86940591878e
 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-0_p20161202.tar.gz 105413 BLAKE2B a65a343d6f60975c88001cdd8eae881559eaf8ba94cf26c8aa9a9a3837cd47ee798c784ed9e90380a76ef328e56d63d1dccd8a85a4a7496d31046d221cf8d7b9 SHA512 90dd1bce44740715a6f642bdb376be230c4a03c7970c2026479cf014a080b98b56a2131ca7ef8bf9c05b91285fe7dcc21dd4ca83879750351d57088408a62cbc
 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-0_p20161202.ebuild 726 BLAKE2B 40c7124aa39cf487050429c915f23d6fab6b82297d998a5a5b43a0ad64a3ec8c39184fa5e6d8c1a321912e2b3061255a67e045f4f90b951352a66e1f27c6b7a2 SHA512 b59f25ec9818dc536d7601dcf5849e2383642a457743536c612614f5493690c12c6aed6e33a2b9cb0ff21d3866a4838b9cbbfbe3e4d84266b2acc4f35022e381
-EBUILD mujs-1.0.4.ebuild 1017 BLAKE2B c32db32a06cbc6b6b1b958fcbc08710e61b191cd5d2aca291771c9c57f17d3962a2e0019b957a1226656003502fcb8b9d8550bdf2da6409513333a9200645e49 SHA512 f10cf32b59d1a1d081fb74f602980d62c61feb17fd375e8a8b8c71081d32bc7aeff7dbc6bed7c4370ff32e2e276e2c12c967a88e24750fe1b13cf3220517616d
+EBUILD mujs-1.0.4.ebuild 1016 BLAKE2B 981407517b165d3c1ffaa8fcd0d425363371de19331542c836fea7b09c641e1716402429dc5963ac7ca2cd6c65fbd900fc1ee3323e6cc2168143f79a5729ba3e SHA512 18487401cfadae4794d86ee26ab40bbf748c7b0ee5f62b699e87c26c72401791f10c1729b5d6a4b7916d38e0568623ad90a37b96ff937bfa43cd0a041fa2defd
 EBUILD mujs-1.0.5.ebuild 1120 BLAKE2B 902cc90db33b4e002b62548f45aae172074f14b10d381d3aea7bdb3d851e931d58a2ef7220e5dafc18def85a86ed59a97973165920b1ece3e47b99feebf55008 SHA512 6ad59ba623213920c573e44bb25ac2cdb4667cbe93d8bb6542a8ec1498e5dce8ddbd569ab4da96a58106bcffbe1ceb628ac3eb47ae80369554414e9aaf7fed8e
 MISC metadata.xml 555 BLAKE2B ea6b447ad19ed256c8a8f4b81b51ad3b336824ea357e746bd9194d7a30dadceae89ec00630e7dc5fe15435fb6f85da65e4d3a22363f5ab40365afd157b2e9302 SHA512 cb5e725aad6542f1d1c569fb82a79973d1e528f3c43251e3f60a8cb2af229747cc6c7ead5fa8b39e46a50498251a704453c90b9863641008b01317b1d8b89bc7
diff --git a/dev-lang/mujs/files/mujs-0_p20150202-Makefile.patch b/dev-lang/mujs/files/mujs-0_p20150202-Makefile.patch
deleted file mode 100644
index 4dca385e3792..000000000000
--- a/dev-lang/mujs/files/mujs-0_p20150202-Makefile.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- mujs-0_p20150202/Makefile
-+++ mujs-0_p20150202/Makefile
-@@ -2,23 +2,17 @@
- HDRS := $(wildcard js*.h mujs.h utf.h regex.h)
- OBJS := $(SRCS:%.c=build/%.o)
- 
--prefix ?= /usr/local
-+prefix ?= /usr
- bindir ?= $(prefix)/bin
- incdir ?= $(prefix)/include
- libdir ?= $(prefix)/lib
- 
--CFLAGS := -std=c99 -pedantic -Wall -Wextra -Wno-unused-parameter
-+CFLAGS += -std=c99 -pedantic -Wall -Wextra -Wno-unused-parameter
- 
- ifeq "$(CC)" "clang"
- CFLAGS += -Wunreachable-code
- endif
- 
--ifeq "$(build)" "debug"
--CFLAGS += -g
--else
--CFLAGS += -O2
--endif
--
- default: build build/mujs build/mujsone
- 
- debug:
diff --git a/dev-lang/mujs/mujs-0_p20161202.ebuild b/dev-lang/mujs/mujs-0_p20161202.ebuild
deleted file mode 100644
index 629e6c0a7763..000000000000
--- a/dev-lang/mujs/mujs-0_p20161202.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs vcs-snapshot
-
-DESCRIPTION="lightweight Javascript interpreter"
-HOMEPAGE="http://mujs.com/"
-SRC_URI="http://git.ghostscript.com/?p=mujs.git;a=snapshot;h=fd003eceda531e13fbdd1aeb6e9c73156496e569;sf=tgz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="arm"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0_p20150202-Makefile.patch"
-	# workaround for linkage of app-text/mupdf-1.7a
-	# TODO: generate a shared library and IUSE=static-libs
-)
-
-src_prepare() {
-	default
-	append-cflags -fPIC
-	tc-export CC
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-}
diff --git a/dev-lang/mujs/mujs-1.0.4.ebuild b/dev-lang/mujs/mujs-1.0.4.ebuild
index bf36fc690d91..2946c902c8ba 100644
--- a/dev-lang/mujs/mujs-1.0.4.ebuild
+++ b/dev-lang/mujs/mujs-1.0.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://mujs.com/downloads/${P}.tar.xz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 
 PATCHES=(