public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-lua/luasystem/, dev-lua/luasystem/files/
@ 2021-01-27 19:48 Conrad Kostecki
  0 siblings, 0 replies; 2+ messages in thread
From: Conrad Kostecki @ 2021-01-27 19:48 UTC (permalink / raw
  To: gentoo-commits

commit:     2a139d5c9d96f46b301b831900c455d914195912
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 24 18:14:35 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Jan 27 19:40:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a139d5c

dev-lua/luasystem: drop old version

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 dev-lua/luasystem/Manifest                         |  1 -
 .../files/luasystem-0.2.0_p0-fix-makefile.patch    | 33 -------------
 dev-lua/luasystem/luasystem-0.2.0_p0.ebuild        | 44 -----------------
 dev-lua/luasystem/luasystem-0.2.1_p0.ebuild        | 56 ----------------------
 4 files changed, 134 deletions(-)

diff --git a/dev-lua/luasystem/Manifest b/dev-lua/luasystem/Manifest
index eee4f695f36..c1feeb4a855 100644
--- a/dev-lua/luasystem/Manifest
+++ b/dev-lua/luasystem/Manifest
@@ -1,2 +1 @@
-DIST luasystem-0.2.0_p0.tar.gz 8058 BLAKE2B fd29eaec7fe2f49e933932a436be75678400fc55a275e412379e05ab5b9cfe2036dfc9e61f960caa29d3c4ab1d439f9ede7ff3cbe14a61287270cc3707660636 SHA512 b8c7ba30470cbf100cc3f14df31729778cfb0aabebe4d27ce42c19581a2585f878d86a29a2f73fd1bef4e5861e2a604d3c396a73f131fa99ae14a17cba52c336
 DIST luasystem-0.2.1_p0.tar.gz 8162 BLAKE2B ad8a6009823ad8202ff3884a3167d0779405c2a6be460b7ef2939622eb4d0fc8edbc6b04aba5dec9dd5e4e38f11ae0dcd582b9c348d5b516aa411858d55c6d71 SHA512 9dc323d4d1914cfa4f278a49ef22e58569d5cd7e369fa17fa6006cd47f9d90c6dfd4404067ea2436aa46a27cfbdf91e4aa26e20b89aeeefdf2aa7252c51fb32b

diff --git a/dev-lua/luasystem/files/luasystem-0.2.0_p0-fix-makefile.patch b/dev-lua/luasystem/files/luasystem-0.2.0_p0-fix-makefile.patch
deleted file mode 100644
index 803d2835c37..00000000000
--- a/dev-lua/luasystem/files/luasystem-0.2.0_p0-fix-makefile.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/src/Makefile b/src/Makefile
-index 10fc31a..af5e4e4 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -144,8 +144,8 @@ O_linux=o
- CC_linux=gcc
- DEF_linux=
- CFLAGS_linux= -I$(LUAINC) $(DEF) -Wall -Wshadow -Wextra \
--	-Wimplicit -O2 -ggdb3 -fpic -fvisibility=hidden
--LDFLAGS_linux=-lrt -O -shared -fpic -o
-+	-Wimplicit -fpic -fvisibility=hidden
-+LDFLAGS_linux=-lrt -shared -fpic -o
- LD_linux=gcc
- 
- #------
-@@ -208,7 +208,7 @@ SOLIB=core.$(SO)
- #
- CC=$(CC_$(PLAT))
- DEF=$(DEF_$(PLAT))
--CFLAGS=$(MYCFLAGS) $(CFLAGS_$(PLAT))
-+CFLAGS=$(CFLAGS_$(PLAT)) $(MYCFLAGS)
- LDFLAGS=$(MYLDFLAGS) $(LDFLAGS_$(PLAT))
- LD=$(LD_$(PLAT))
- LUAINC= $(LUAINC_$(PLAT))
-@@ -248,7 +248,7 @@ none:
- all: $(SOLIB)
- 
- $(SOLIB): $(OBJS)
--	$(LD) $(OBJS) $(LDFLAGS)$@
-+	$(LD) $(OBJS) $(LDFLAGS) $@
- 
- install: all
- 	$(INSTALL_DIR) $(INSTALL_TOP_LDIR)

diff --git a/dev-lua/luasystem/luasystem-0.2.0_p0.ebuild b/dev-lua/luasystem/luasystem-0.2.0_p0.ebuild
deleted file mode 100644
index 6446cfc61d6..00000000000
--- a/dev-lua/luasystem/luasystem-0.2.0_p0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-# The below is the upstream version number. The -x suffix should be kept
-# in sync with the _px suffix in the ebuild version.
-MY_PV="0.2.0-0"
-
-DESCRIPTION="platform independent system calls for lua"
-HOMEPAGE="https://github.com/LuaDist2/luasystem"
-SRC_URI="https://github.com/LuaDist2/luasystem/archive/${MY_PV}.tar.gz ->
-	${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-IUSE=""
-
-COMMON_DEPEND=">=dev-lang/lua-5.1:0="
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-makefile.patch
-)
-
-src_compile() {
-	emake CC="$(tc-getCC)" MYCFLAGS="${CFLAGS}" \
-		LD="$(tc-getCC)" MYLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
-	doins -r system
-	exeinto "$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)"/system
-	doexe src/core.so
-dodoc README.md
-}

diff --git a/dev-lua/luasystem/luasystem-0.2.1_p0.ebuild b/dev-lua/luasystem/luasystem-0.2.1_p0.ebuild
deleted file mode 100644
index 5b23c11d98c..00000000000
--- a/dev-lua/luasystem/luasystem-0.2.1_p0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-# The below is the upstream version number. The -x suffix should be kept
-# in sync with the _px suffix in the ebuild version.
-MY_PV="0.2.1-0"
-
-DESCRIPTION="platform independent system calls for lua"
-HOMEPAGE="https://github.com/LuaDist2/luasystem"
-SRC_URI="https://github.com/LuaDist2/luasystem/archive/${MY_PV}.tar.gz ->
-	${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 arm arm64 ppc ppc64 x86"
-IUSE="luajit test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		${RDEPEND}
-		dev-lua/busted
-	)"
-RDEPEND="
-	!luajit? ( >=dev-lang/lua-5.1:0= )
-	luajit? ( dev-lang/luajit:2 )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-makefile.patch
-)
-
-src_test() {
-	busted -o gtest || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" MYCFLAGS="${CFLAGS}" \
-		LD="$(tc-getCC)" MYLDFLAGS="${LDFLAGS}"
-}
-
-src_install () {
-	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
-	doins -r system
-	exeinto "$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)"/system
-	doexe src/core.so
-	einstalldocs
-}


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

* [gentoo-commits] repo/gentoo:master commit in: dev-lua/luasystem/, dev-lua/luasystem/files/
@ 2024-07-20  0:00 Conrad Kostecki
  0 siblings, 0 replies; 2+ messages in thread
From: Conrad Kostecki @ 2024-07-20  0:00 UTC (permalink / raw
  To: gentoo-commits

commit:     e0cd8e155e3bdc1b1cf15aef3e632891c9faf412
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 19 23:57:23 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Jul 20 00:00:36 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0cd8e15

dev-lua/luasystem: add missing build parts

Needed, as otherwise other dev-lua/* packages will fail tests.

Closes: https://bugs.gentoo.org/935634
Closes: https://bugs.gentoo.org/935635
Closes: https://bugs.gentoo.org/935636
Closes: https://bugs.gentoo.org/935637
Closes: https://bugs.gentoo.org/935638
Closes: https://bugs.gentoo.org/935639
Closes: https://bugs.gentoo.org/935640

Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/luasystem-0.4.2-fix-makefile.patch       | 49 ++++++++++++++++++++++
 ...stem-0.4.2.ebuild => luasystem-0.4.2-r1.ebuild} |  2 +-
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/dev-lua/luasystem/files/luasystem-0.4.2-fix-makefile.patch b/dev-lua/luasystem/files/luasystem-0.4.2-fix-makefile.patch
new file mode 100644
index 000000000000..2d930a29fe78
--- /dev/null
+++ b/dev-lua/luasystem/files/luasystem-0.4.2-fix-makefile.patch
@@ -0,0 +1,49 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -50,7 +50,7 @@
+ # /usr/local/include/lua$(LUA_VERSION)
+ # where lua headers are found for linux builds
+ LUAINC_linux_base?=/usr/include
+-LUAINC_linux?=$(LUAINC_linux_base)/lua/$(LUA_VERSION)
++LUAINC_linux?=$(LUAINC_linux_base)/lua$(LUA_VERSION)
+ LUAPREFIX_linux?=/usr/local
+ CDIR_linux?=lib/lua/$(LUA_VERSION)
+ LDIR_linux?=share/lua/$(LUA_VERSION)
+@@ -144,8 +144,8 @@
+ CC_linux=gcc
+ DEF_linux=
+ CFLAGS_linux= -I$(LUAINC) $(DEF) -Wall -Wshadow -Wextra \
+-	-Wimplicit -O2 -ggdb3 -fpic -fvisibility=hidden
+-LDFLAGS_linux=-lrt -O -shared -fpic -o
++	-Wimplicit -fpic -fvisibility=hidden
++LDFLAGS_linux=-lrt -shared -fpic -o
+ LD_linux=gcc
+ 
+ #------
+@@ -208,7 +208,7 @@
+ #
+ CC=$(CC_$(PLAT))
+ DEF=$(DEF_$(PLAT))
+-CFLAGS=$(MYCFLAGS) $(CFLAGS_$(PLAT))
++CFLAGS=$(CFLAGS_$(PLAT)) $(MYCFLAGS)
+ LDFLAGS=$(MYLDFLAGS) $(LDFLAGS_$(PLAT))
+ LD=$(LD_$(PLAT))
+ LUAINC= $(LUAINC_$(PLAT))
+@@ -217,7 +217,7 @@
+ #------
+ # Objects
+ #
+-OBJS=core.$(O) compat.$(O) time.$(O) environment.$(O) random.$(O) term.$(O)
++OBJS=core.$(O) compat.$(O) time.$(O) environment.$(O) random.$(O) term.$(O) bitflags.$(O) wcwidth.$(O)
+ 
+ #------
+ # Targets
+@@ -248,7 +248,7 @@
+ all: $(SOLIB)
+ 
+ $(SOLIB): $(OBJS)
+-	$(LD) $(OBJS) $(LDFLAGS)$@
++	$(LD) $(OBJS) $(LDFLAGS) $@
+ 
+ install: all
+ 	$(INSTALL_DIR) $(INSTALL_TOP_LDIR)

diff --git a/dev-lua/luasystem/luasystem-0.4.2.ebuild b/dev-lua/luasystem/luasystem-0.4.2-r1.ebuild
similarity index 96%
rename from dev-lua/luasystem/luasystem-0.4.2.ebuild
rename to dev-lua/luasystem/luasystem-0.4.2-r1.ebuild
index 3bfbf46ba5c8..edc7640b031c 100644
--- a/dev-lua/luasystem/luasystem-0.4.2.ebuild
+++ b/dev-lua/luasystem/luasystem-0.4.2-r1.ebuild
@@ -31,7 +31,7 @@ BDEPEND="
 	)
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-0.2.1_p0-fix-makefile.patch )
+PATCHES=( "${FILESDIR}"/${PN}-0.4.2-fix-makefile.patch )
 
 src_prepare() {
 	default


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

end of thread, other threads:[~2024-07-20  0:00 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-27 19:48 [gentoo-commits] repo/gentoo:master commit in: dev-lua/luasystem/, dev-lua/luasystem/files/ Conrad Kostecki
  -- strict thread matches above, loose matches on Subject: below --
2024-07-20  0:00 Conrad Kostecki

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