gentoo resync : 03.11.2018

7 files changed, 73 insertions, 66 deletions

diff --git a/dev-lang/mujs/Manifest b/dev-lang/mujs/Manifest
index 197ec453fdf6..0a03353baeb1 100644
--- a/dev-lang/mujs/Manifest
+++ b/dev-lang/mujs/Manifest
@@ -1,10 +1,10 @@
 AUX mujs-0_p20150202-Makefile.patch 593 BLAKE2B f2e12bc18ae155a4cc5c69a9b1c5ad749e206a567fc7c58ae453f85f2dbda6cb5f0c462e853ad6c52e422a0dcab9834312d1c2cdbd419759ceedaa4b5513314d SHA512 2c6c0b0ba8dc757a1ae57fbfe5ea56970e07177b45e7d7aa7ed41896ead5b0d4200003897f9c837fc97e96bdc2fd51229fd2629e8780194ad12f86940591878e
-AUX mujs-1.0.1-gentoo.patch 788 BLAKE2B b3a62c59226c79a81c748b1c7d6cfa80e89d909f47946133e22fc07f57f99bead5a61be8b9b76902ca04f86d2a7494940145118cf464ef2a39a651797ce5921b SHA512 b7409ff5aa9e5e38d3d9b7a3805699847a043ee83d46520d2b2ac011ac0a66588126a5c6761e919f9f9c7c510ff5d62d7c22c97739b52e611f5b89a911f52169
 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.1.tar.gz 116948 BLAKE2B 54d898eff95e65688a51d9df9175964609a55ad3243ffaa4da10f27a6262a207777dd500cb76aefc22aa52799fed577864d15dfec9ed4aea24f0a4f1ff8dfa0a SHA512 46cbc45735dbf173d7fa5839e3b511730e4d42933c2286d170767659649ea88c2a3dcc74fb986d1eedb1d4fec8fcaaba146805cc9d0ef7da98bb5a9ce0c80a96
 DIST mujs-1.0.4.tar.xz 91520 BLAKE2B 6ffe62b19b140e2ae63ebe59a3b3bd352936ccba53dda3b0fcf575440dc790a0767c7de8c0a1441d26c11c65074520a80050cc0efa1113be0df51a802e719574 SHA512 a32498fee20ab6ddc8bbf79b4fdd82f3560d4e4b28bbe57c4e8f1df4a8a5367a689b6c9a391761abe47a8f15d2832fede4a508330eb181744b9563ae9954c102
-EBUILD mujs-0_p20161202.ebuild 824 BLAKE2B ef5920796454ab2cb26c54149228da8a4903f708fef17972a8bad581778e598b5e682d46f34327873d6fea3925b8310668c57a8ae9339a18624ce418676d8797 SHA512 15f9ad4f8bfa67ba51cf2429a8d985974fd39af83ddc53c238acfa5293b055a116c7de6c91271a975d7b044b6c5cd6c1bb645db5d3400b4399f9f96f7b4cd401
-EBUILD mujs-1.0.1-r1.ebuild 1103 BLAKE2B ca260b9e9864f98c2dc94d3297f4ebf98e7e6ccab60803c0abf90981e5b91e6505e9643e1e6d36e6da803a19d3fb935bcdc4dd7cabdfff9abcc5450a5dce9306 SHA512 98525a0a8fea64b8a223b88f082cdf8634e5eca55e51c5c792c6ff3407408e83c69d9d1b9f6bc6e36002bf33b7ce21fe927938c93fac1a925902e643336841e5
-EBUILD mujs-1.0.4.ebuild 1018 BLAKE2B 23dc3714367525cb661ce959eda325a039a6cc31b4403717bb3a92e72237d411d7550d967affeb25960218e1a7863db3b9057b05be99a4cef00fc78b09ad979e SHA512 964401b2d68911961c0089efce3afdea3405eb91812061462a4a9ce604217af969ba10c6167904200d1b88ca73efc1e9b5dbf32f99a6e4a98e8e12f5390506bd
-MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
+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.5.ebuild 1120 BLAKE2B 902cc90db33b4e002b62548f45aae172074f14b10d381d3aea7bdb3d851e931d58a2ef7220e5dafc18def85a86ed59a97973165920b1ece3e47b99feebf55008 SHA512 6ad59ba623213920c573e44bb25ac2cdb4667cbe93d8bb6542a8ec1498e5dce8ddbd569ab4da96a58106bcffbe1ceb628ac3eb47ae80369554414e9aaf7fed8e
+MISC metadata.xml 555 BLAKE2B ea6b447ad19ed256c8a8f4b81b51ad3b336824ea357e746bd9194d7a30dadceae89ec00630e7dc5fe15435fb6f85da65e4d3a22363f5ab40365afd157b2e9302 SHA512 cb5e725aad6542f1d1c569fb82a79973d1e528f3c43251e3f60a8cb2af229747cc6c7ead5fa8b39e46a50498251a704453c90b9863641008b01317b1d8b89bc7
diff --git a/dev-lang/mujs/files/mujs-1.0.1-gentoo.patch b/dev-lang/mujs/files/mujs-1.0.1-gentoo.patch
deleted file mode 100644
index c6c7977ac75d..000000000000
--- a/dev-lang/mujs/files/mujs-1.0.1-gentoo.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -2,7 +2,7 @@
- 
- build ?= release
- 
--prefix ?= /usr/local
-+prefix ?= /usr
- bindir ?= $(prefix)/bin
- incdir ?= $(prefix)/include
- libdir ?= $(prefix)/lib
-@@ -11,7 +11,7 @@
- 
- # 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
-@@ -22,16 +22,6 @@
- LDFLAGS += -Wl,--gc-sections
- endif
- 
--ifeq "$(build)" "debug"
--CFLAGS += -g
--else ifeq "$(build)" "sanitize"
--CFLAGS += -pipe -g -fsanitize=address -fno-omit-frame-pointer
--LDFLAGS += -fsanitize=address
--else
--CFLAGS += -Os
--LDFLAGS += -Wl,-s
--endif
--
- # You shouldn't need to edit anything below here.
- 
- OUT := build/$(build)
diff --git a/dev-lang/mujs/files/mujs-1.0.5-flags.patch b/dev-lang/mujs/files/mujs-1.0.5-flags.patch
new file mode 100644
index 000000000000..50de4fcff21e
--- /dev/null
+++ b/dev-lang/mujs/files/mujs-1.0.5-flags.patch
@@ -0,0 +1,30 @@
+--- a/Makefile	2018-09-11 12:47:31.000000000 +0200
++++ b/Makefile	2018-10-28 20:09:17.000000000 +0100
+@@ -15,7 +15,7 @@
+ 
+ # 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
+@@ -30,9 +30,6 @@
+ else ifeq "$(build)" "sanitize"
+   CFLAGS += -pipe -g -fsanitize=address -fno-omit-frame-pointer
+   LDFLAGS += -fsanitize=address
+-else
+-  CFLAGS += -Os
+-  LDFLAGS += -Wl,-s
+ endif
+ 
+ ifeq "$(HAVE_READLINE)" "yes"
+@@ -78,7 +75,7 @@
+ 
+ $(OUT)/libmujs.so: one.c $(HDRS)
+ 	@ mkdir -p $(dir $@)
+-	$(CC) $(CFLAGS) -fPIC -shared -o $@ $< -lm
++	$(CC) $(CFLAGS) $(LDFLAGS) -fPIC -shared -o $@ $< -lm
+ 
+ $(OUT)/mujs: $(OUT)/libmujs.o $(OUT)/main.o
+ 	@ mkdir -p $(dir $@)
diff --git a/dev-lang/mujs/metadata.xml b/dev-lang/mujs/metadata.xml
index 68674fe1b802..9019cb3c42cd 100644
--- a/dev-lang/mujs/metadata.xml
+++ b/dev-lang/mujs/metadata.xml
@@ -2,11 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>vdupras@gentoo.org</email>
 		<name>Virgil Dupras</name>
 	</maintainer>
+	<longdescription>
+		MuJS is a lightweight Javascript interpreter designed for embedding in
+		other software to extend them with scripting capabilities.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/ccxvii/mujs/issues</bugs-to>
+		<remote-id type="github">ccxvii/mujs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-lang/mujs/mujs-0_p20161202.ebuild b/dev-lang/mujs/mujs-0_p20161202.ebuild
index 711c77f09503..629e6c0a7763 100644
--- a/dev-lang/mujs/mujs-0_p20161202.ebuild
+++ b/dev-lang/mujs/mujs-0_p20161202.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://git.ghostscript.com/?p=mujs.git;a=snapshot;h=fd003eceda531e13fbd
 
 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="arm"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-lang/mujs/mujs-1.0.4.ebuild b/dev-lang/mujs/mujs-1.0.4.ebuild
index f835e190f0c0..bf36fc690d91 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=(
diff --git a/dev-lang/mujs/mujs-1.0.1-r1.ebuild b/dev-lang/mujs/mujs-1.0.5.ebuild
index d0a2333dcf41..11960e25273a 100644
--- a/dev-lang/mujs/mujs-1.0.1-r1.ebuild
+++ b/dev-lang/mujs/mujs-1.0.5.ebuild
@@ -1,12 +1,16 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit flag-o-matic multilib toolchain-funcs
 
-DESCRIPTION="lightweight Javascript interpreter"
-HOMEPAGE="http://mujs.com/"
-SRC_URI="http://git.ghostscript.com/?p=mujs.git;a=snapshot;h=4792d16f17b15a1eca3c2a9c856dc13fda1d23c5;sf=tgz -> ${P}.tar.gz"
+DESCRIPTION="An embeddable Javascript interpreter in C."
+HOMEPAGE="
+	http://mujs.com/
+	https://github.com/ccxvii/mujs/
+"
+SRC_URI="https://github.com/ccxvii/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
@@ -14,29 +18,35 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-l
 IUSE="static-libs"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.1-gentoo.patch
+	"${FILESDIR}/${P}-flags.patch"
 )
-S=${WORKDIR}/${PN}-4792d16
 
 src_prepare() {
 	default
+
+	tc-export AR CC
+
 	append-cflags -fPIC -Wl,-soname=lib${PN}.so.${PV}
-	tc-export CC
 }
 
 src_compile() {
-	emake VERSION=${PV} shared
+	emake VERSION=${PV} prefix=/usr shared
 }
 
 src_install() {
-	emake \
-		DESTDIR="${ED}" \
-		VERSION=${PV} \
-		libdir="/usr/$(get_libdir)" \
-		install-shared \
+	local myeconfargs=(
+		DESTDIR="${ED}"
+		install-shared
+		libdir="/usr/$(get_libdir)"
+		prefix="/usr"
+		VERSION="${PV}"
 		$(usex static-libs install-static '')
+	)
+
+	emake "${myeconfargs[@]}"
 
 	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
+
+	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so
+	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV:0:1}
 }