public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:dev commit in: dev-lang/wren/
@ 2020-12-15  9:41 Theo Anderson
  0 siblings, 0 replies; 4+ messages in thread
From: Theo Anderson @ 2020-12-15  9:41 UTC (permalink / raw
  To: gentoo-commits

commit:     499874d36c52332d1b3d79f3a3c9ce527878f05f
Author:     Theo Anderson <telans <AT> posteo <DOT> de>
AuthorDate: Tue Dec 15 09:40:27 2020 +0000
Commit:     Theo Anderson <telans <AT> posteo <DOT> de>
CommitDate: Tue Dec 15 09:40:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=499874d3

dev-lang/wren: drop 9999

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Theo Anderson <telans <AT> posteo.de>

 dev-lang/wren/wren-9999.ebuild | 79 ------------------------------------------
 1 file changed, 79 deletions(-)

diff --git a/dev-lang/wren/wren-9999.ebuild b/dev-lang/wren/wren-9999.ebuild
deleted file mode 100644
index 689c8a5d..00000000
--- a/dev-lang/wren/wren-9999.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="The Wren Programming Language"
-HOMEPAGE="https://wren.io/"
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/wren-lang/${PN}.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/wren-lang/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="static-libs tools"
-
-DEPEND=">=dev-libs/libuv-1.10.0"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-#BDEPEND="test? ( dev-lang/python )"
-#RESTRICT="!test? ( test )"
-RESTRICT="test"
-
-src_configure() {
-	return
-}
-
-src_compile() {
-	local targets=""
-
-	if use static-libs ; then
-		#do both shared and static libs
-		targets="${targets} vm"
-	else
-		targets="${targets} shared"
-	fi
-	if use tools ; then
-		targets="${targets} cli"
-	fi
-	#I don't think tests are working, I just get lots of linker errors
-	#if use test ; then
-	#	targets="${targets} api_test unit_test"
-	#fi
-
-	echo "prefix=\"${EPREFIX}/usr\"" > ${PN}.pc
-	echo "libdir=\"\${prefix}/$(get_libdir)\"" >> ${PN}.pc
-	echo "includedir=\"\${prefix}/include\"" >> ${PN}.pc
-	echo "" >> ${PN}.pc
-	echo "Name: ${PN}" >> ${PN}.pc
-	echo "Description: ${DESCRIPTION}" >> ${PN}.pc
-	echo "URL: ${HOMEPAGE}" >> ${PN}.pc
-	echo "Version: ${PV}" >> ${PN}.pc
-	echo "Libs: \"-L\${libdir}\" -l${PN}" >> ${PN}.pc
-	echo "Cflags: \"-I\${includedir}\"" >> ${PN}.pc
-
-	tc-export AR CC
-	emake -f util/wren.mk LIBUV_DIR="${EPREFIX}/usr" LIBUV="${EPREFIX}/usr/$(get_libdir)/libuv.so" VERBOSE=1 ${targets}
-}
-
-src_install() {
-	if use tools ; then
-		dobin bin/wren
-	fi
-	if use static-libs ; then
-		dolib.a lib/libwren.a
-	fi
-	dolib.so lib/libwren.so
-	doheader src/include/wren.h
-	doheader src/include/wren.hpp
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: dev-lang/wren/
@ 2020-12-15  9:41 Theo Anderson
  0 siblings, 0 replies; 4+ messages in thread
From: Theo Anderson @ 2020-12-15  9:41 UTC (permalink / raw
  To: gentoo-commits

commit:     bf7e5e416239d18bfe6c5223a82884b6c136dd1f
Author:     Theo Anderson <telans <AT> posteo <DOT> de>
AuthorDate: Tue Dec 15 09:40:10 2020 +0000
Commit:     Theo Anderson <telans <AT> posteo <DOT> de>
CommitDate: Tue Dec 15 09:40:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bf7e5e41

dev-lang/wren: bump to 0.3.0

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Theo Anderson <telans <AT> posteo.de>

 dev-lang/wren/Manifest          |  2 ++
 dev-lang/wren/wren-0.3.0.ebuild | 65 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+)

diff --git a/dev-lang/wren/Manifest b/dev-lang/wren/Manifest
index 782d2d9f..b9f78a9a 100644
--- a/dev-lang/wren/Manifest
+++ b/dev-lang/wren/Manifest
@@ -1 +1,3 @@
 DIST wren-0.2.0.tar.gz 1791488 BLAKE2B a2f48e9b115ea89cf25af1fe8cefa3c26639ce06f89796df4f5eb744b2382b44f83d6285eedfa9cb5681342cc8ebca535bae586445225622c8ebdb30c7088975 SHA512 67912df14d8afa16a4e50fa67e232870e08eb392601f7b1633bcfb242f2de7624b9a3501df9e1ae40fb62646db57ff6553733ddb3015b6b5086999dadf7d2da2
+DIST wren-0.3.0.tar.gz 1228834 BLAKE2B ff809008646970815b0f3ef3457d12ad1e6ac431b32f059035b15f1ad9f46247510a28d34d789472c6dc9fe1caeee71e09bd5484fe21dfdb356d8fcfc206a812 SHA512 8c05b69539b8a51289efecbd998bf1d054ff90944b949720b512b7a1202ace9ba56779f2e995097571459da6d8447f925f54c8170a3f6edeeaac6df265ffdc4c
+DIST wren-cli-0.3.0.tar.gz 509755 BLAKE2B 13034a6aeaa7ef2a20163714233c4750f1ab88fb232758c26bd35f8616c239936b1f80bf95c95da4d2ad2436a7813f1763002637030473a9abed8d0a4532d61d SHA512 8d4894c5e669c0c03bfb546c37cb9e917990a6cb6c59d399cbb5a03a9c9de7954bc203646ac776643c73ab9cb6e331868707d82e7c2ebd8625a9d80f4aea4f20

diff --git a/dev-lang/wren/wren-0.3.0.ebuild b/dev-lang/wren/wren-0.3.0.ebuild
new file mode 100644
index 00000000..5240bf6e
--- /dev/null
+++ b/dev-lang/wren/wren-0.3.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="The Wren Programming Language"
+HOMEPAGE="https://wren.io/"
+SRC_URI="
+	https://github.com/wren-lang/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/wren-lang/${PN}-cli/archive/${PV}.tar.gz -> ${PN}-cli-${PV}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/libuv"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# Don't pre-strip
+	sed -i 's/-s$//' projects/make/wren_shared.make || die
+	sed -i 's/-s$//' "${WORKDIR}"/wren-cli-${PV}/projects/make/wren_cli.make || die
+
+	cat <<EOF > ${PN}.pc
+prefix="${EPREFIX}/usr"
+libdir="\${prefix}/$(get_libdir)"
+includedir="\${prefix}/include"
+
+Name: ${PN}
+Description: ${DESCRIPTION}
+URL: ${HOMEPAGE}
+Version: ${PV}
+Libs: "-L\${libdir}\" -l${PN}
+Cflags: "-I\${includedir}"
+EOF
+}
+
+src_compile() {
+	cd projects/make
+	emake
+	cd "${WORKDIR}/wren-cli-${PV}/projects/make"
+	emake
+}
+
+python_test() {
+	${EPYTHON} util/test.py || die
+}
+
+src_install() {
+	newbin "${WORKDIR}"/wren-cli-${PV}/bin/wren_cli wren
+	dolib.so lib/libwren.so
+	doheader src/include/wren.h
+	doheader src/include/wren.hpp
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+	einstalldocs
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: dev-lang/wren/
@ 2020-12-21  4:25 Theo Anderson
  0 siblings, 0 replies; 4+ messages in thread
From: Theo Anderson @ 2020-12-21  4:25 UTC (permalink / raw
  To: gentoo-commits

commit:     088b9a547d71c6767a7b643d6aaea68220284945
Author:     Theo Anderson <telans <AT> posteo <DOT> de>
AuthorDate: Wed Dec 16 02:22:38 2020 +0000
Commit:     Theo Anderson <telans <AT> posteo <DOT> de>
CommitDate: Mon Dec 21 04:24:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=088b9a54

dev-lang/wren: drop old

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Theo Anderson <telans <AT> posteo.de>

 dev-lang/wren/Manifest             |  1 -
 dev-lang/wren/metadata.xml         |  3 --
 dev-lang/wren/wren-0.2.0-r1.ebuild | 79 --------------------------------------
 3 files changed, 83 deletions(-)

diff --git a/dev-lang/wren/Manifest b/dev-lang/wren/Manifest
index b9f78a9a..b19b7d38 100644
--- a/dev-lang/wren/Manifest
+++ b/dev-lang/wren/Manifest
@@ -1,3 +1,2 @@
-DIST wren-0.2.0.tar.gz 1791488 BLAKE2B a2f48e9b115ea89cf25af1fe8cefa3c26639ce06f89796df4f5eb744b2382b44f83d6285eedfa9cb5681342cc8ebca535bae586445225622c8ebdb30c7088975 SHA512 67912df14d8afa16a4e50fa67e232870e08eb392601f7b1633bcfb242f2de7624b9a3501df9e1ae40fb62646db57ff6553733ddb3015b6b5086999dadf7d2da2
 DIST wren-0.3.0.tar.gz 1228834 BLAKE2B ff809008646970815b0f3ef3457d12ad1e6ac431b32f059035b15f1ad9f46247510a28d34d789472c6dc9fe1caeee71e09bd5484fe21dfdb356d8fcfc206a812 SHA512 8c05b69539b8a51289efecbd998bf1d054ff90944b949720b512b7a1202ace9ba56779f2e995097571459da6d8447f925f54c8170a3f6edeeaac6df265ffdc4c
 DIST wren-cli-0.3.0.tar.gz 509755 BLAKE2B 13034a6aeaa7ef2a20163714233c4750f1ab88fb232758c26bd35f8616c239936b1f80bf95c95da4d2ad2436a7813f1763002637030473a9abed8d0a4532d61d SHA512 8d4894c5e669c0c03bfb546c37cb9e917990a6cb6c59d399cbb5a03a9c9de7954bc203646ac776643c73ab9cb6e331868707d82e7c2ebd8625a9d80f4aea4f20

diff --git a/dev-lang/wren/metadata.xml b/dev-lang/wren/metadata.xml
index 854f4ec8..c9845638 100644
--- a/dev-lang/wren/metadata.xml
+++ b/dev-lang/wren/metadata.xml
@@ -13,7 +13,4 @@
 		<bugs-to>https://github.com/wren-lang/wren/issues</bugs-to>
 	<remote-id type="github">wren-lang/wren</remote-id>
 	</upstream>
-	<use>
-		<flag name="tools">Install the wren command line interpreter</flag>
-	</use>
 </pkgmetadata>

diff --git a/dev-lang/wren/wren-0.2.0-r1.ebuild b/dev-lang/wren/wren-0.2.0-r1.ebuild
deleted file mode 100644
index 689c8a5d..00000000
--- a/dev-lang/wren/wren-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="The Wren Programming Language"
-HOMEPAGE="https://wren.io/"
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/wren-lang/${PN}.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/wren-lang/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="static-libs tools"
-
-DEPEND=">=dev-libs/libuv-1.10.0"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-#BDEPEND="test? ( dev-lang/python )"
-#RESTRICT="!test? ( test )"
-RESTRICT="test"
-
-src_configure() {
-	return
-}
-
-src_compile() {
-	local targets=""
-
-	if use static-libs ; then
-		#do both shared and static libs
-		targets="${targets} vm"
-	else
-		targets="${targets} shared"
-	fi
-	if use tools ; then
-		targets="${targets} cli"
-	fi
-	#I don't think tests are working, I just get lots of linker errors
-	#if use test ; then
-	#	targets="${targets} api_test unit_test"
-	#fi
-
-	echo "prefix=\"${EPREFIX}/usr\"" > ${PN}.pc
-	echo "libdir=\"\${prefix}/$(get_libdir)\"" >> ${PN}.pc
-	echo "includedir=\"\${prefix}/include\"" >> ${PN}.pc
-	echo "" >> ${PN}.pc
-	echo "Name: ${PN}" >> ${PN}.pc
-	echo "Description: ${DESCRIPTION}" >> ${PN}.pc
-	echo "URL: ${HOMEPAGE}" >> ${PN}.pc
-	echo "Version: ${PV}" >> ${PN}.pc
-	echo "Libs: \"-L\${libdir}\" -l${PN}" >> ${PN}.pc
-	echo "Cflags: \"-I\${includedir}\"" >> ${PN}.pc
-
-	tc-export AR CC
-	emake -f util/wren.mk LIBUV_DIR="${EPREFIX}/usr" LIBUV="${EPREFIX}/usr/$(get_libdir)/libuv.so" VERBOSE=1 ${targets}
-}
-
-src_install() {
-	if use tools ; then
-		dobin bin/wren
-	fi
-	if use static-libs ; then
-		dolib.a lib/libwren.a
-	fi
-	dolib.so lib/libwren.so
-	doheader src/include/wren.h
-	doheader src/include/wren.hpp
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: dev-lang/wren/
@ 2021-05-16 14:06 Anna Vyalkova
  0 siblings, 0 replies; 4+ messages in thread
From: Anna Vyalkova @ 2021-05-16 14:06 UTC (permalink / raw
  To: gentoo-commits

commit:     3a9a547f0aead57ccfda6e129c46ced1bf2c4811
Author:     Anna Vyalkova <cyber <AT> sysrq <DOT> in>
AuthorDate: Sun May 16 12:33:02 2021 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Sun May 16 14:05:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3a9a547f

dev-lang/wren: fix CC

Closes: https://bugs.gentoo.org/784932
Signed-off-by: Anna Vyalkova <cyber <AT> sysrq.in>

 dev-lang/wren/wren-0.3.0.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev-lang/wren/wren-0.3.0.ebuild b/dev-lang/wren/wren-0.3.0.ebuild
index 472f7b0c7..f3899a344 100644
--- a/dev-lang/wren/wren-0.3.0.ebuild
+++ b/dev-lang/wren/wren-0.3.0.ebuild
@@ -43,10 +43,11 @@ EOF
 }
 
 src_compile() {
+	tc-export CC
 	cd projects/make
-	emake
+	emake verbose=1
 	cd "${WORKDIR}/wren-cli-${PV}/projects/make"
-	emake
+	emake verbose=1
 }
 
 python_test() {


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-05-16 14:06 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-16 14:06 [gentoo-commits] repo/proj/guru:dev commit in: dev-lang/wren/ Anna Vyalkova
  -- strict thread matches above, loose matches on Subject: below --
2020-12-21  4:25 Theo Anderson
2020-12-15  9:41 Theo Anderson
2020-12-15  9:41 Theo Anderson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox