From e16599dfede74cc8372c935d81279a6035b2e5cd Mon Sep 17 00:00:00 2001 From: Albert Diserholt Date: Wed, 18 Oct 2017 21:54:53 +0200 Subject: Updated haxe and fixed neko. Thanks to Alexander Konotop for the patches. --- dev-lang/haxe/Manifest | 2 +- dev-lang/haxe/haxe-3.4.2.ebuild | 36 ----------------------------- dev-lang/haxe/haxe-3.4.4.ebuild | 36 +++++++++++++++++++++++++++++ dev-lang/neko/Manifest | 3 ++- dev-lang/neko/files/2.0.0-soname.patch | 40 +++++++++++++++++++++++++++++++++ dev-lang/neko/neko-2.0.0-r1.ebuild | 41 ++++++++++++++++++++++++++++++++++ dev-lang/neko/neko-2.0.0.ebuild | 31 ------------------------- 7 files changed, 120 insertions(+), 69 deletions(-) delete mode 100644 dev-lang/haxe/haxe-3.4.2.ebuild create mode 100644 dev-lang/haxe/haxe-3.4.4.ebuild create mode 100644 dev-lang/neko/files/2.0.0-soname.patch create mode 100644 dev-lang/neko/neko-2.0.0-r1.ebuild delete mode 100644 dev-lang/neko/neko-2.0.0.ebuild diff --git a/dev-lang/haxe/Manifest b/dev-lang/haxe/Manifest index 6483521..ab96382 100644 --- a/dev-lang/haxe/Manifest +++ b/dev-lang/haxe/Manifest @@ -1,2 +1,2 @@ EBUILD haxe-3.2.0.ebuild 710 SHA256 3caa872083803bed4b1c22cd0843c0a5031876a2728b59526a5155ba416a9491 SHA512 07a64770a5f7181d31bb44ab6f88afe52e1cdbb12fa0fa3d223c8b26b2b0e0f843fb9cacfb022bd53ee720a4576b162466fe5d4397c44d861f2327a09b7a4ad4 WHIRLPOOL 9f083c898500c2c76bebd2bbc458d87e3642c5e63cac641882b76e488b8428444fd39770d8921a70a14f4703e14a74b1db244d86f156f31eca0677c83a0d5288 -EBUILD haxe-3.4.2.ebuild 710 SHA256 3caa872083803bed4b1c22cd0843c0a5031876a2728b59526a5155ba416a9491 SHA512 07a64770a5f7181d31bb44ab6f88afe52e1cdbb12fa0fa3d223c8b26b2b0e0f843fb9cacfb022bd53ee720a4576b162466fe5d4397c44d861f2327a09b7a4ad4 WHIRLPOOL 9f083c898500c2c76bebd2bbc458d87e3642c5e63cac641882b76e488b8428444fd39770d8921a70a14f4703e14a74b1db244d86f156f31eca0677c83a0d5288 +EBUILD haxe-3.4.4.ebuild 710 SHA256 3caa872083803bed4b1c22cd0843c0a5031876a2728b59526a5155ba416a9491 SHA512 07a64770a5f7181d31bb44ab6f88afe52e1cdbb12fa0fa3d223c8b26b2b0e0f843fb9cacfb022bd53ee720a4576b162466fe5d4397c44d861f2327a09b7a4ad4 WHIRLPOOL 9f083c898500c2c76bebd2bbc458d87e3642c5e63cac641882b76e488b8428444fd39770d8921a70a14f4703e14a74b1db244d86f156f31eca0677c83a0d5288 diff --git a/dev-lang/haxe/haxe-3.4.2.ebuild b/dev-lang/haxe/haxe-3.4.2.ebuild deleted file mode 100644 index 3995786..0000000 --- a/dev-lang/haxe/haxe-3.4.2.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit git-r3 - -EGIT_REPO_URI="https://github.com/HaxeFoundation/${PN}" -EGIT_COMMIT=${PV} -SRC_URI="" -KEYWORDS="~amd64 ~x86" - -DESCRIPTION="Haxe cross-platform toolkit" -HOMEPAGE="http://haxe.org/" - -LICENSE="GPL-2 LGPL-2.1 BSD" -SLOT="0" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-lang/neko - >=dev-lang/ocaml-4.02[ocamlopt] - dev-libs/libpcre - dev-ml/camlp4[ocamlopt] - sys-libs/zlib" - -MAKEOPTS+=" -j1" - -src_install() { - mkdir -p "${D}/usr/bin" # Missing from install target - emake INSTALL_DIR="${D}/usr" install - # Strip destination from haxelib. - sed -i "s|${D}||" "${D}/usr/bin/haxelib" -} diff --git a/dev-lang/haxe/haxe-3.4.4.ebuild b/dev-lang/haxe/haxe-3.4.4.ebuild new file mode 100644 index 0000000..3995786 --- /dev/null +++ b/dev-lang/haxe/haxe-3.4.4.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit git-r3 + +EGIT_REPO_URI="https://github.com/HaxeFoundation/${PN}" +EGIT_COMMIT=${PV} +SRC_URI="" +KEYWORDS="~amd64 ~x86" + +DESCRIPTION="Haxe cross-platform toolkit" +HOMEPAGE="http://haxe.org/" + +LICENSE="GPL-2 LGPL-2.1 BSD" +SLOT="0" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND} + dev-lang/neko + >=dev-lang/ocaml-4.02[ocamlopt] + dev-libs/libpcre + dev-ml/camlp4[ocamlopt] + sys-libs/zlib" + +MAKEOPTS+=" -j1" + +src_install() { + mkdir -p "${D}/usr/bin" # Missing from install target + emake INSTALL_DIR="${D}/usr" install + # Strip destination from haxelib. + sed -i "s|${D}||" "${D}/usr/bin/haxelib" +} diff --git a/dev-lang/neko/Manifest b/dev-lang/neko/Manifest index 7e4c302..1cee76a 100644 --- a/dev-lang/neko/Manifest +++ b/dev-lang/neko/Manifest @@ -1,2 +1,3 @@ +AUX 2.0.0-soname.patch 1329 SHA256 7709391a0549211f58d59298dedd7fcab57a42eb6b5ca246f68a675521bcb1a9 SHA512 d96f70f6e8b44ac634dadce7b9a7dd86efd431261ce16b8aaa01a14e749bef436ce5225ea314d871fabc44505b91ce0a2be3cc8fc1e3866c9d033f65c4dec5dd WHIRLPOOL f029a2cd107d19180db6e50090e69b590973e9212443798612841039501db4defe5f73d75a71d9c52a4f17d087e17424e3a5ae6c0f8342bf500d42215202e791 DIST neko-2.0.0.tar.gz 425539 SHA256 47a4714df7a603fc64995fc353f09205e52da4df954b6c6969d7d1b9a00a95d1 SHA512 08db3993fadd68228e04ade4b6410ae6f6f7c89ac9b462d4e956f15a2636dca3510d452079404aa492c739a8934409578ea268faee7bee9516c618990a4ee234 WHIRLPOOL d4b3bf381df8d065ff7eb62f99a908f7d9bdcab923862fe1fbe0640c07a52059118c252a65e84e0724a4706d2b92352a9423f065c868cf3f23a2bb8fc5e14c01 -EBUILD neko-2.0.0.ebuild 739 SHA256 899dc3b3d011a417145559adbcba1e57c9c0bd65b05ea78ac10298d4b710184b SHA512 818f4dfe25cff8a2009c5ede995e324f1e79d11f56ba957eece018701d81afa5d952637ca437088d58299e0d762095210407e0ccd04a75753fb31046b6946a74 WHIRLPOOL 59d6e77cc1371f747386e0c3d86e2e220fa1a29d9c5a469ec3297846f8fa8caa964a976b3cc77177754fe08b2b09e60eb0be33e9ff988c30c22ffcaf720e88f5 +EBUILD neko-2.0.0-r1.ebuild 1041 SHA256 fdcc3e078b4a9dea60c573a503fcc4cc37c5734897e955abb2ad968f902cdd76 SHA512 26ed1ddb1071b89be245baf9f96e0c5db02466eb8afa97cffc6e3b4cb0fadc3aeb1a6ab07073c6a1885d1faff964feec9cf020dabdb4caff00deba9957919c2d WHIRLPOOL 61314edb9c3d3705b05128890b2abc5a92d1e2fc82f8e254639b3cdaf4988af50118c86741444fff4bee793f30b1536e4c67457b8ed361027088c3f42d301543 diff --git a/dev-lang/neko/files/2.0.0-soname.patch b/dev-lang/neko/files/2.0.0-soname.patch new file mode 100644 index 0000000..608303c --- /dev/null +++ b/dev-lang/neko/files/2.0.0-soname.patch @@ -0,0 +1,40 @@ +--- Makefile.orig 2013-02-23 17:24:43.000000000 +0200 ++++ Makefile 2017-10-16 01:50:02.531404913 +0300 +@@ -14,8 +14,10 @@ + + CFLAGS = -Wall -O3 -fPIC -fomit-frame-pointer -I vm -D_GNU_SOURCE -I libs/common + EXTFLAGS = -pthread +-MAKESO = $(CC) -shared -Wl,-Bsymbolic +-LIBNEKO_NAME = libneko.so ++MAJOR = libneko.so ++MINOR = 2.0.0 ++MAKESO = $(CC) -shared -Wl,-soname,${MAJOR} ++LIBNEKO_NAME = ${MAJOR}.${MINOR} + LIBNEKO_LIBS = -ldl -lgc -lm + NEKOVM_FLAGS = -Lbin -lneko + STD_NDLL_FLAGS = ${NEKOVM_FLAGS} -lrt +@@ -70,6 +72,7 @@ + -mkdir bin 2>/dev/null + + libneko: bin/${LIBNEKO_NAME} ++ ln -s ${LIBNEKO_NAME} bin/${MAJOR} + + libs: + (cd src; ${NEKO_EXEC} nekoc tools/install.neko) +@@ -108,6 +111,7 @@ + + clean: + rm -rf bin/${LIBNEKO_NAME} ${LIBNEKO_OBJECTS} ${VM_OBJECTS} ++ rm -rf bin/libneko.so* + rm -rf bin/neko bin/nekoc bin/nekoml bin/nekotools + rm -rf bin/std bin/*.ndll bin/*.n libs/*/*.o + rm -rf src/*.n src/neko/*.n src/nekoml/*.n src/tools/*.n +@@ -115,6 +119,8 @@ + + install: + cp bin/${LIBNEKO_NAME} ${INSTALL_PREFIX}/lib ++# ln -s ${INSTALL_PREFIX}/lib/${LIBNEKO_NAME} ${INSTALL_PREFIX}/lib/${MAJOR} ++ ln -s ${LIBNEKO_NAME} ${INSTALL_PREFIX}/lib/${MAJOR} + cp bin/neko bin/nekoc bin/nekotools bin/nekoml bin/nekoml.std ${INSTALL_PREFIX}/bin + -mkdir ${INSTALL_PREFIX}/lib/neko + cp bin/*.ndll ${INSTALL_PREFIX}/lib/neko diff --git a/dev-lang/neko/neko-2.0.0-r1.ebuild b/dev-lang/neko/neko-2.0.0-r1.ebuild new file mode 100644 index 0000000..1efd7f5 --- /dev/null +++ b/dev-lang/neko/neko-2.0.0-r1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit base + +DESCRIPTION="Neko is a high-level dynamically typed programming language." +HOMEPAGE="http://nekovm.org/" +SRC_URI="http://nekovm.org/media/${P}.tar.gz" + +LICENSE="" +SLOT="0" +KEYWORDS="amd64 ~arm ~ppc x86" +IUSE="" + +DEPEND="dev-libs/boehm-gc[threads]" +RDEPEND="${DEPEND}" + +MAKEOPTS+=" -j1" + +src_configure() { + # Reading things from stdin doesn't work, so just replace with "s" (i.e. skip). + sed -i 's/readline();/"s";/' src/tools/install.neko || die "Unable to modify install.neko." +} + +src_prepare() { + epatch "${FILESDIR}/${PV}-soname.patch" + + # fix path to use lib64 for appropriate architectures + sed -i -e "s:\/lib\/:\/$(get_libdir)\/:g" Makefile \ + || die "patching Makefile failed" + sed -i -e "s:\/lib$:\/$(get_libdir):" Makefile \ + || die "patching Makefile failed" +} + +src_install() { + mkdir -p "${D}/usr/"{$(get_libdir),bin} # Missing from install target + emake INSTALL_PREFIX="${D}/usr" install +} diff --git a/dev-lang/neko/neko-2.0.0.ebuild b/dev-lang/neko/neko-2.0.0.ebuild deleted file mode 100644 index 823e1c5..0000000 --- a/dev-lang/neko/neko-2.0.0.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit base - -DESCRIPTION="Neko is a high-level dynamically typed programming language." -HOMEPAGE="http://nekovm.org/" -SRC_URI="http://nekovm.org/media/${P}.tar.gz" - -LICENSE="" -SLOT="0" -KEYWORDS="amd64 ~arm ~ppc x86" -IUSE="" - -DEPEND="dev-libs/boehm-gc[threads]" -RDEPEND="${DEPEND}" - -MAKEOPTS+=" -j1" - -src_configure() { - # Reading things from stdin doesn't work, so just replace with "s" (i.e. skip). - sed -i 's/readline();/"s";/' src/tools/install.neko || die "Unable to modify install.neko." -} - -src_install() { - mkdir -p "${D}/usr/"{lib,bin} # Missing from install target - emake INSTALL_PREFIX="${D}/usr" install -} -- cgit v1.2.3-65-gdbad