[gentoo-commits] repo/gentoo:master commit in: dev-lang/mujs/, dev-lang/mujs/files/

2024-01-20 Thread Sam James 
commit: 53be3ccfe0863754fb581293b43d74b29e358166
Author: Philipp Rösner  protonmail  com>
AuthorDate: Thu Dec 21 16:11:56 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 20 12:03:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53be3ccf

dev-lang/mujs: drop 1.3.2

Signed-off-by: Philipp Rösner  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34397
Signed-off-by: Sam James  gentoo.org>

 dev-lang/mujs/Manifest |  1 -
 dev-lang/mujs/files/mujs-1.1.1-flags.patch | 12 --
 dev-lang/mujs/mujs-1.3.2.ebuild| 61 --
 3 files changed, 74 deletions(-)

diff --git a/dev-lang/mujs/Manifest b/dev-lang/mujs/Manifest
index 2b2bf90c64a1..86b6a2c9dd1a 100644
--- a/dev-lang/mujs/Manifest
+++ b/dev-lang/mujs/Manifest
@@ -1,3 +1,2 @@
-DIST mujs-1.3.2.tar.gz 127899 BLAKE2B 
4de5e1e60c5d6af9a20d8bb1fe2612d6c90a6b5557a66524bf81747e893a89a88b4da7e5393325923c6eb0788679da4013f25032cad23e547f15a1d49cf0a738
 SHA512 
ccffb04171f7ecec2cfa6f0e59859acc911836370a648e4c6703db174631ce316413a64ebf4b32eea3d3b09221ff01861cda91f4b1b9bebf495168f26f90daf5
 DIST mujs-1.3.3.tar.gz 128097 BLAKE2B 
9b880dc462af8945e647994f9a42cf121461c6b295538db6cef818919a7c2418ebe1df7d36f69214279ad2414d0ce7149a541a3533e766274624b9c44b733db9
 SHA512 
74288484185473a813c55e08dcc2fefba46f87651d3a1fcea6ac843bb09a4150e13e0d46b348a34380a0defdeaa388cc93b6f7f569a7886091a34b4951b9461b
 DIST mujs-1.3.4.tar.gz 128202 BLAKE2B 
d07942cce02dc71937ad0207887bcefce67916e19d01f134d68d3673bcc0649eb616a1fadc5a21ddbf372629f12e7c04be4652a31ba604359607e9e7233a8923
 SHA512 
0806684be5e6dc3cb7305355ab7c7babbfd3fd5bbd22515659a88a82c25f3f4b6af14f7ca07bacd154823b19110b749bba68311c9f317dd684e0fd5628ece573

diff --git a/dev-lang/mujs/files/mujs-1.1.1-flags.patch 
b/dev-lang/mujs/files/mujs-1.1.1-flags.patch
deleted file mode 100644
index f3dbdfd44cd1..
--- a/dev-lang/mujs/files/mujs-1.1.1-flags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
 a/Makefile
-+++ b/Makefile
-@@ -32,9 +32,6 @@ ifeq "$(build)" "debug"
- else ifeq "$(build)" "sanitize"
-   CFLAGS += -pipe -g -fsanitize=address -fno-omit-frame-pointer
-   LDFLAGS += -fsanitize=address
--else ifeq "$(build)" "release"
--  CFLAGS += -O2
--  LDFLAGS += -Wl,-s
- endif
- 
- ifeq "$(HAVE_READLINE)" "yes"

diff --git a/dev-lang/mujs/mujs-1.3.2.ebuild b/dev-lang/mujs/mujs-1.3.2.ebuild
deleted file mode 100644
index 959d5d70c1f4..
--- a/dev-lang/mujs/mujs-1.3.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="An embeddable JavaScript interpreter written in C"
-HOMEPAGE="https://mujs.com/ https://github.com/ccxvii/mujs;
-SRC_URI="https://mujs.com/downloads/${P}.tar.gz;
-
-LICENSE="ISC"
-# The subslot matches the SONAME
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
-
-RDEPEND="sys-libs/readline:="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.1.1-flags.patch
-)
-
-src_prepare() {
-   default
-
-   tc-export AR CC
-
-   append-cflags -fPIC
-
-   # The library's ABI (and API) might change in new releases
-   # Diff 'usr/include/mujs.h' across releases to validate
-   if [[ ${CHOST} == *-darwin* ]] ; then
-   append-cflags 
-Wl,-install_name,"${EPREFIX}"/usr/$(get_libdir)/lib${PN}.${PV}.dylib
-   else
-   append-cflags -Wl,-soname=lib${PN}.so.${PV}
-   fi
-}
-
-src_compile() {
-   # We need to use ${PV} for the pkgconfig file, see: #784461
-   emake \
-   VERSION=${PV} \
-   XCFLAGS="${CFLAGS}" \
-   XCPPFLAGS="${CPPFLAGS}" \
-   prefix=/usr \
-   shell shared
-}
-
-src_install() {
-   emake \
-   DESTDIR="${ED}" \
-   VERSION=${PV} \
-   libdir="/usr/$(get_libdir)" \
-   prefix=/usr \
-   install-shared
-
-   mv -v "${ED}"/usr/$(get_libdir)/lib${PN}$(get_libname) 
"${ED}"/usr/$(get_libdir)/lib${PN}$(get_libname ${PV}) || die "Failed adding 
version suffix to mujs shared library"
-   dosym lib${PN}$(get_libname ${PV}) 
/usr/$(get_libdir)/lib${PN}$(get_libname)
-   dosym lib${PN}$(get_libname ${PV}) 
/usr/$(get_libdir)/lib${PN}$(get_libname ${PV:0:1})
-}

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mujs/, dev-lang/mujs/files/

2023-04-13 Thread Joonas Niilola 
commit: 0e28ca50b4cc77ef97f975befb918a59c44d1396
Author: Philipp Rösner  protonmail  com>
AuthorDate: Wed Mar 29 19:47:43 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Apr 13 06:01:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e28ca50

dev-lang/mujs: add 1.3.3

Upstream changes to Makefile at f190f88 and
57e3f01.
XCPPFLAGS aren't used in the Makefile anymore.
No API changes in /usr/include/mujs.h.

Signed-off-by: Philipp Rösner  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/30402
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-lang/mujs/Manifest |  1 +
 dev-lang/mujs/files/mujs-1.3.3-flags.patch | 12 ++
 dev-lang/mujs/mujs-1.3.3.ebuild| 61 ++
 3 files changed, 74 insertions(+)

diff --git a/dev-lang/mujs/Manifest b/dev-lang/mujs/Manifest
index 84a86105d508..6120ebca2ad6 100644
--- a/dev-lang/mujs/Manifest
+++ b/dev-lang/mujs/Manifest
@@ -1 +1,2 @@
 DIST mujs-1.3.2.tar.gz 127899 BLAKE2B 
4de5e1e60c5d6af9a20d8bb1fe2612d6c90a6b5557a66524bf81747e893a89a88b4da7e5393325923c6eb0788679da4013f25032cad23e547f15a1d49cf0a738
 SHA512 
ccffb04171f7ecec2cfa6f0e59859acc911836370a648e4c6703db174631ce316413a64ebf4b32eea3d3b09221ff01861cda91f4b1b9bebf495168f26f90daf5
+DIST mujs-1.3.3.tar.gz 128097 BLAKE2B 
9b880dc462af8945e647994f9a42cf121461c6b295538db6cef818919a7c2418ebe1df7d36f69214279ad2414d0ce7149a541a3533e766274624b9c44b733db9
 SHA512 
74288484185473a813c55e08dcc2fefba46f87651d3a1fcea6ac843bb09a4150e13e0d46b348a34380a0defdeaa388cc93b6f7f569a7886091a34b4951b9461b

diff --git a/dev-lang/mujs/files/mujs-1.3.3-flags.patch 
b/dev-lang/mujs/files/mujs-1.3.3-flags.patch
new file mode 100644
index ..90709863015f
--- /dev/null
+++ b/dev-lang/mujs/files/mujs-1.3.3-flags.patch
@@ -0,0 +1,12 @@
+diff --git a/Makefile.oirg b/Makefile
+index 24049d3..5d5d58d 100644
+--- a/Makefile.oirg
 b/Makefile
+@@ -5,6 +5,7 @@
+ default: build/debug/mujs build/debug/mujs-pp
+ 
+ CFLAGS = -std=c99 -pedantic -Wall -Wextra -Wno-unused-parameter
++CFLAGS += $(XCFLAGS) $(XLDFLAGS)
+ 
+ OPTIM = -O3
+ 

diff --git a/dev-lang/mujs/mujs-1.3.3.ebuild b/dev-lang/mujs/mujs-1.3.3.ebuild
new file mode 100644
index ..6c8aa130e526
--- /dev/null
+++ b/dev-lang/mujs/mujs-1.3.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="An embeddable JavaScript interpreter written in C"
+HOMEPAGE="https://mujs.com/ https://github.com/ccxvii/mujs;
+SRC_URI="https://mujs.com/downloads/${P}.tar.gz;
+
+LICENSE="ISC"
+# The subslot matches the SONAME
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+
+RDEPEND="sys-libs/readline:="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-flags.patch
+)
+
+src_prepare() {
+   default
+
+   tc-export AR CC
+
+   append-cflags -fPIC
+
+   # The library's ABI (and API) might change in new releases
+   # Diff 'usr/include/mujs.h' across releases to validate
+   if [[ ${CHOST} == *-darwin* ]] ; then
+   append-cflags 
-Wl,-install_name,"${EPREFIX}"/usr/$(get_libdir)/lib${PN}.${PV}.dylib
+   else
+   append-cflags -Wl,-soname=lib${PN}.so.${PV}
+   fi
+}
+
+src_compile() {
+   # We need to use ${PV} for the pkgconfig file, see: #784461
+   emake \
+   VERSION=${PV} \
+   XCFLAGS="${CFLAGS}" \
+   XLDFLAGS="${LDFLAGS}" \
+   prefix=/usr \
+   release
+}
+
+src_install() {
+   emake \
+   DESTDIR="${ED}" \
+   VERSION=${PV} \
+   libdir="/usr/$(get_libdir)" \
+   prefix=/usr \
+   install-shared
+
+   mv -v "${ED}"/usr/$(get_libdir)/lib${PN}$(get_libname) 
"${ED}"/usr/$(get_libdir)/lib${PN}$(get_libname ${PV}) || die "Failed adding 
version suffix to mujs shared library"
+   dosym lib${PN}$(get_libname ${PV}) 
/usr/$(get_libdir)/lib${PN}$(get_libname)
+   dosym lib${PN}$(get_libname ${PV}) 
/usr/$(get_libdir)/lib${PN}$(get_libname ${PV:0:1})
+}

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mujs/, dev-lang/mujs/files/

2021-04-13 Thread Sam James 
commit: 9cdb3a1bee2b1281ca93812d24f612be3ed4d1bb
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 13 22:47:36 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 13 22:52:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cdb3a1b

dev-lang/mujs: add 1.1.1

Signed-off-by: Sam James  gentoo.org>

 dev-lang/mujs/Manifest |  1 +
 dev-lang/mujs/files/mujs-1.1.1-flags.patch | 12 +++
 dev-lang/mujs/mujs-1.1.1.ebuild| 58 ++
 3 files changed, 71 insertions(+)

diff --git a/dev-lang/mujs/Manifest b/dev-lang/mujs/Manifest
index fbc2c2369cf..0cf67cd7fb7 100644
--- a/dev-lang/mujs/Manifest
+++ b/dev-lang/mujs/Manifest
@@ -1,2 +1,3 @@
 DIST mujs-1.0.9.tar.gz 123113 BLAKE2B 
c55deaf14508c412394bf5fe3a53ef581d4e4726024d65f2ba5155eb2400a6e2f043c9f6721b170d19297e2cd38c62c462f3b4e102eb4bfe6e7857b40156c18b
 SHA512 
a3dbc8dbf5c16b7de9803954fe38ea9f77c0e5b7de3895966ec0877e063d463c9950499791ea0d102e464bd0426413689f3edb15e38db3f13915d72f27556725
 DIST mujs-1.1.0.tar.gz 123450 BLAKE2B 
e7bc05d35566ff26346e713645e0f417a9acd1a73b5fb5c7f0c35bf940765fba1ab04199f4ed1dd6ce0e3bb2bf1547703335a1c125353da24de72f2b1adfb243
 SHA512 
10b61453f8483e3e67c95a742aa7868e255816b2ce25c84d8e24c5c737bad1f23ade67531c5c5bb914804be446da33c0cbe8e95a6d5889250dd8520ce56f23a0
+DIST mujs-1.1.1.tar.xz 95448 BLAKE2B 
df19d045a16603b94fae6e8f996af32ab5986983a191041bf82cde67c876b34e9574b2c5ea75be8dba36da6692761608ce56117c7cf98833795eadec37ee546e
 SHA512 
8978cb120458b982cd8fa2242ca648c1bb19a837f3b41a88226f95c6d48796b92f221d95b4c2cb73c4a4257ee33045640aee8c3c849cf0725a686fa452f2cc84

diff --git a/dev-lang/mujs/files/mujs-1.1.1-flags.patch 
b/dev-lang/mujs/files/mujs-1.1.1-flags.patch
new file mode 100644
index 000..f3dbdfd44cd
--- /dev/null
+++ b/dev-lang/mujs/files/mujs-1.1.1-flags.patch
@@ -0,0 +1,12 @@
+--- a/Makefile
 b/Makefile
+@@ -32,9 +32,6 @@ ifeq "$(build)" "debug"
+ else ifeq "$(build)" "sanitize"
+   CFLAGS += -pipe -g -fsanitize=address -fno-omit-frame-pointer
+   LDFLAGS += -fsanitize=address
+-else ifeq "$(build)" "release"
+-  CFLAGS += -O2
+-  LDFLAGS += -Wl,-s
+ endif
+ 
+ ifeq "$(HAVE_READLINE)" "yes"

diff --git a/dev-lang/mujs/mujs-1.1.1.ebuild b/dev-lang/mujs/mujs-1.1.1.ebuild
new file mode 100644
index 000..f4a97b55578
--- /dev/null
+++ b/dev-lang/mujs/mujs-1.1.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="An embeddable JavaScript interpreter in C"
+HOMEPAGE="https://mujs.com/ https://github.com/ccxvii/mujs;
+SRC_URI="https://mujs.com/downloads/${P}.tar.xz;
+#SRC_URI=" https://github.com/ccxvii/mujs/archive/${PV}.tar.xz -> ${P}.tar.xz"
+
+LICENSE="ISC"
+# subslot matches SONAME
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 
~amd64-linux ~ppc-macos ~x64-macos"
+
+RDEPEND="sys-libs/readline:0="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.1.1-flags.patch
+)
+
+src_prepare() {
+   default
+
+   tc-export AR CC
+
+   # library's ABI (and API) changes in ~each release:
+   # diff 'usr/includemujs.h' across releases to validate
+   append-cflags -fPIC -Wl,-soname=lib${PN}.so.${PV}
+}
+
+src_compile() {
+   emake \
+   VERSION=${PF} \
+   XCFLAGS="${CFLAGS}" \
+   XCPPFLAGS="${CPPFLAGS}" \
+   prefix=/usr \
+   shell shared
+}
+
+src_install() {
+   local myemakeargs=(
+   DESTDIR="${ED}"
+   libdir="/usr/$(get_libdir)"
+   prefix="/usr"
+   VERSION="${PV}"
+   )
+
+   emake "${myemakeargs[@]}" install-shared
+
+   mv -v "${ED}"/usr/$(get_libdir)/lib${PN}.so{,.${PV}} || 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}
+}

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mujs/, dev-lang/mujs/files/

2019-02-12 Thread Virgil Dupras 
commit: 3c9028d92d1b67154d4de03665d77577e72b0871
Author: Virgil Dupras  gentoo  org>
AuthorDate: Tue Feb 12 13:24:41 2019 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Tue Feb 12 13:28:39 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c9028d9

dev-lang/mujs: remove old

Signed-off-by: Virgil Dupras  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-lang/mujs/Manifest  |  1 -
 dev-lang/mujs/files/mujs-1.0.4-gentoo.patch | 23 
 dev-lang/mujs/mujs-1.0.4.ebuild | 42 -
 3 files changed, 66 deletions(-)

diff --git a/dev-lang/mujs/Manifest b/dev-lang/mujs/Manifest
index 5f729fce1ca..0200ee406a7 100644
--- a/dev-lang/mujs/Manifest
+++ b/dev-lang/mujs/Manifest
@@ -1,2 +1 @@
-DIST mujs-1.0.4.tar.xz 91520 BLAKE2B 
6ffe62b19b140e2ae63ebe59a3b3bd352936ccba53dda3b0fcf575440dc790a0767c7de8c0a1441d26c11c65074520a80050cc0efa1113be0df51a802e719574
 SHA512 
a32498fee20ab6ddc8bbf79b4fdd82f3560d4e4b28bbe57c4e8f1df4a8a5367a689b6c9a391761abe47a8f15d2832fede4a508330eb181744b9563ae9954c102
 DIST mujs-1.0.5.tar.gz 119353 BLAKE2B 
48f1b598e50d5804b0d64230cdd6b4d3f719187ea0906f45c9f45baee2c8df59c6fd09dc25afc9e1ce4e20a9866d158d16a4632bec552fddd8fac70b20e2363f
 SHA512 
c1c59b5e80e0e5f580f30dfc0b4707b6a1e44a73c746b9783bb24d91429ddf8ed670a7663478300cc568cfc15a511720b6d18be2ade40a3a66fc7ab8f3933c2d

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 c05b8787466..000
--- 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 cb17cf6855f..000
--- 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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mujs/, dev-lang/mujs/files/

2018-10-29 Thread Virgil Dupras 
commit: e9aabe50eeb1ae673c9ad99ad03b83284350cdfb
Author: Virgil Dupras  gentoo  org>
AuthorDate: Tue Oct 30 00:49:00 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Tue Oct 30 00:50:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9aabe50

dev-lang/mujs: remove old and vulnerable

Bug: https://bugs.gentoo.org/646784
Signed-off-by: Virgil Dupras  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-lang/mujs/Manifest  |  1 -
 dev-lang/mujs/files/mujs-1.0.1-gentoo.patch | 37 -
 dev-lang/mujs/mujs-0_p20161202.ebuild   |  4 +--
 dev-lang/mujs/mujs-1.0.1-r1.ebuild  | 42 -
 4 files changed, 2 insertions(+), 82 deletions(-)

diff --git a/dev-lang/mujs/Manifest b/dev-lang/mujs/Manifest
index 026fba50ce5..f05faac21e9 100644
--- a/dev-lang/mujs/Manifest
+++ b/dev-lang/mujs/Manifest
@@ -1,4 +1,3 @@
 DIST mujs-0_p20161202.tar.gz 105413 BLAKE2B 
a65a343d6f60975c88001cdd8eae881559eaf8ba94cf26c8aa9a9a3837cd47ee798c784ed9e90380a76ef328e56d63d1dccd8a85a4a7496d31046d221cf8d7b9
 SHA512 
90dd1bce44740715a6f642bdb376be230c4a03c7970c2026479cf014a080b98b56a2131ca7ef8bf9c05b91285fe7dcc21dd4ca83879750351d57088408a62cbc
-DIST mujs-1.0.1.tar.gz 116948 BLAKE2B 
54d898eff95e65688a51d9df9175964609a55ad3243ffaa4da10f27a6262a20dd500cb76aefc22aa52799fed577864d15dfec9ed4aea24f0a4f1ff8dfa0a
 SHA512 
46cbc45735dbf173d7fa5839e3b511730e4d42933c2286d170767659649ea88c2a3dcc74fb986d1eedb1d4fec8fcaaba146805cc9d0ef7da98bb5a9ce0c80a96
 DIST mujs-1.0.4.tar.xz 91520 BLAKE2B 
6ffe62b19b140e2ae63ebe59a3b3bd352936ccba53dda3b0fcf575440dc790a0767c7de8c0a1441d26c11c65074520a80050cc0efa1113be0df51a802e719574
 SHA512 
a32498fee20ab6ddc8bbf79b4fdd82f3560d4e4b28bbe57c4e8f1df4a8a5367a689b6c9a391761abe47a8f15d2832fede4a508330eb181744b9563ae9954c102
 DIST mujs-1.0.5.tar.gz 119353 BLAKE2B 
48f1b598e50d5804b0d64230cdd6b4d3f719187ea0906f45c9f45baee2c8df59c6fd09dc25afc9e1ce4e20a9866d158d16a4632bec552fddd8fac70b20e2363f
 SHA512 
c1c59b5e80e0e5f580f30dfc0b4707b6a1e44a73c746b9783bb24d91429ddf8ed670a7663478300cc568cfc15a511720b6d18be2ade40a3a66fc7ab8f3933c2d

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 c6c7977ac75..000
--- 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/mujs-0_p20161202.ebuild 
b/dev-lang/mujs/mujs-0_p20161202.ebuild
index 711c77f0950..629e6c0a776 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.1-r1.ebuild 
b/dev-lang/mujs/mujs-1.0.1-r1.ebuild
deleted file mode 100644
index d0a2333dcf4..000
--- a/dev-lang/mujs/mujs-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="static-libs"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.0.1-gentoo.patch
-)
-S=${WORKDIR}/${PN}-4792d16
-
-src_prepare() {
-   default
-   append-cflags -fPIC -Wl,-soname=lib${PN}.so.${PV}
-   tc-export CC
-}
-
-src_compile() {
-   emake VERSION=${PV} shared
-}
-
-src_install() {
-   emake \
-

[gentoo-commits] repo/gentoo:master commit in: dev-lang/mujs/, dev-lang/mujs/files/

2018-10-06 Thread Virgil Dupras 
commit: 63926daea9a8a9b4e5e6f49b5159b5cdd6dd39b7
Author: Virgil Dupras  gentoo  org>
AuthorDate: Sun Oct  7 02:13:03 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Sun Oct  7 02:13:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63926dae

dev-lang/mujs: bump to 1.0.4

Bug: https://bugs.gentoo.org/605554
Bug: https://bugs.gentoo.org/646784
Signed-off-by: Virgil Dupras  gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11

 dev-lang/mujs/Manifest  |  1 +
 dev-lang/mujs/files/mujs-1.0.4-gentoo.patch | 23 
 dev-lang/mujs/mujs-1.0.4.ebuild | 42 +
 3 files changed, 66 insertions(+)

diff --git a/dev-lang/mujs/Manifest b/dev-lang/mujs/Manifest
index 33f28245f89..55458109be0 100644
--- a/dev-lang/mujs/Manifest
+++ b/dev-lang/mujs/Manifest
@@ -1,2 +1,3 @@
 DIST mujs-0_p20161202.tar.gz 105413 BLAKE2B 
a65a343d6f60975c88001cdd8eae881559eaf8ba94cf26c8aa9a9a3837cd47ee798c784ed9e90380a76ef328e56d63d1dccd8a85a4a7496d31046d221cf8d7b9
 SHA512 
90dd1bce44740715a6f642bdb376be230c4a03c7970c2026479cf014a080b98b56a2131ca7ef8bf9c05b91285fe7dcc21dd4ca83879750351d57088408a62cbc
 DIST mujs-1.0.1.tar.gz 116948 BLAKE2B 
54d898eff95e65688a51d9df9175964609a55ad3243ffaa4da10f27a6262a20dd500cb76aefc22aa52799fed577864d15dfec9ed4aea24f0a4f1ff8dfa0a
 SHA512 
46cbc45735dbf173d7fa5839e3b511730e4d42933c2286d170767659649ea88c2a3dcc74fb986d1eedb1d4fec8fcaaba146805cc9d0ef7da98bb5a9ce0c80a96
+DIST mujs-1.0.4.tar.xz 91520 BLAKE2B 
6ffe62b19b140e2ae63ebe59a3b3bd352936ccba53dda3b0fcf575440dc790a0767c7de8c0a1441d26c11c65074520a80050cc0efa1113be0df51a802e719574
 SHA512 
a32498fee20ab6ddc8bbf79b4fdd82f3560d4e4b28bbe57c4e8f1df4a8a5367a689b6c9a391761abe47a8f15d2832fede4a508330eb181744b9563ae9954c102

diff --git a/dev-lang/mujs/files/mujs-1.0.4-gentoo.patch 
b/dev-lang/mujs/files/mujs-1.0.4-gentoo.patch
new file mode 100644
index 000..c05b8787466
--- /dev/null
+++ b/dev-lang/mujs/files/mujs-1.0.4-gentoo.patch
@@ -0,0 +1,23 @@
+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
new file mode 100644
index 000..91ee7c0085a
--- /dev/null
+++ b/dev-lang/mujs/mujs-1.0.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 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 ~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
+}