From 8d5dbd847cbc704a6a06405856e94b461011afe3 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 27 Mar 2021 06:06:27 +0000
Subject: gentoo resync : 27.03.2021

---
 www-apps/webmcp/Manifest               |  2 +-
 www-apps/webmcp/webmcp-1.2.6-r1.ebuild | 74 ++++++++++++++++++++++++++++++++++
 www-apps/webmcp/webmcp-1.2.6.ebuild    | 64 -----------------------------
 3 files changed, 75 insertions(+), 65 deletions(-)
 create mode 100644 www-apps/webmcp/webmcp-1.2.6-r1.ebuild
 delete mode 100644 www-apps/webmcp/webmcp-1.2.6.ebuild

(limited to 'www-apps/webmcp')

diff --git a/www-apps/webmcp/Manifest b/www-apps/webmcp/Manifest
index 95c3ccdc6667..dc4f69e4f547 100644
--- a/www-apps/webmcp/Manifest
+++ b/www-apps/webmcp/Manifest
@@ -1,4 +1,4 @@
 AUX webmcp-1.2.6-gentoo.patch 5156 BLAKE2B 4d0680753a83422483c33909b692bc6a0fdd146216889aa83e6a9b99a15bf92920913330de12f2e2125b976214753ec4853b7dd48dabf8c2a0c88fb9b7d1ada5 SHA512 7e57b4f5f32f280198e8c6e01c21ed1414af3bf87a77022af37e3d144576a7d23c9f912e7f41282ef6d984f4323af1dbdda472cfe076fc62a6ee1a47d0529a7c
 DIST webmcp-v1.2.6.tar.gz 132283 BLAKE2B ed5539b91eeb809a1e19b98f2dc8888c055ec547c95c53c0ea9232531bf9b8432ba6a0ad566a1d2fecbdcc056a52e42e99b973741fc44f923ea88369393c5ade SHA512 a233c312f85851c690f9b020e5df1fffb548c708199279021f384a36cf6e2b73a9b7bc2343c886ccc0e18aecf6d205e2a699fa2398b9bf0da587bc4f8a8f8556
-EBUILD webmcp-1.2.6.ebuild 1433 BLAKE2B 2992e27650896416405f9315e295d030062f271c9392973a09d935f0dbed619cc80912535b33baba8b320eb7bb9927053e38b0077b9390e0eac66baf9d6f7f61 SHA512 96ecc61450f7de7fb280fb6ea1ffb1f906e7c27245dacc1bc5e31d8c864639af4b8d572416eaa1fb46160371dd268a6065a1c11377433a793c8f293670c1a847
+EBUILD webmcp-1.2.6-r1.ebuild 1685 BLAKE2B f19c420e563f36047cd653ef74f442986112dd361d2e9f836747857c01484e801a9c42433862cdb32b82bddd6b1d3c3ecf8d3c33e83eeec81cb53e6cf6d5e1ec SHA512 0f62e6c94ad104e0b57925cb0f471f70af7e42a860a9a384c0ece2a21f7b3c0aa05423655f1562bce21eb0e0402c31d370d68283260dd19c15b652dd235cf720
 MISC metadata.xml 821 BLAKE2B a116a4db4b1be4a6a860805b866e735633b1ee8031cc0750e9843c201fe5b1d36657f845d0e9fc1e3871ab091601b85996b4ebd5b224ea1fa6139ffc0e6fd8a2 SHA512 68b0741c84f5a93b26b89e56093b9554727ef375ed77e189cdeb62e12dc0a1b8506b56885be46c637e03b388830467eeac3f11511f49668d74dd36ff15f380e8
diff --git a/www-apps/webmcp/webmcp-1.2.6-r1.ebuild b/www-apps/webmcp/webmcp-1.2.6-r1.ebuild
new file mode 100644
index 000000000000..135b1a65ad3f
--- /dev/null
+++ b/www-apps/webmcp/webmcp-1.2.6-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit lua-single toolchain-funcs
+
+MY_P=${PN}-v${PV}
+DESCRIPTION="Web application framework written in Lua and C"
+HOMEPAGE="https://www.public-software-group.org/webmcp"
+SRC_URI="https://www.public-software-group.org/pub/projects/${PN}/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="HPND"
+KEYWORDS="~amd64"
+SLOT=0
+
+RDEPEND="
+	${LUA_DEPS}
+	dev-db/postgresql:=
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+	default
+
+	# Use correct LUA version
+	sed -e "s/-llua/$(lua_get_LIBS)/g" -i libraries/multirand/Makefile -i libraries/mondelefant/Makefile -i libraries/extos/Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC) $(lua_get_CFLAGS)" LD="$(tc-getCC)" MYLDFLAGS="${LDFLAGS}"
+	# Dereference symlinks
+	cd framework
+	mkdir lib.link
+	mv lib/* lib.link
+	cp lib.link/* lib
+}
+
+src_install() {
+	into /usr/lib/${PN}
+	dolib.so framework/lib/*.so
+	for subdir in "" ".precompiled"; do
+		MY_DEST=/usr/lib/${PN}/framework${subdir}
+
+		cd framework${subdir}
+		exeinto ${MY_DEST}/accelerator
+		doexe accelerator/webmcp_accelerator.so
+		insinto ${MY_DEST}
+		doins -r env js
+		exeinto ${MY_DEST}/cgi-bin
+		doexe cgi-bin/webmcp*.lua
+		into ${MY_DEST}
+		dobin bin/*
+		insinto ${MY_DEST}/lib
+		doins lib/*.lua
+		cd ..
+
+		for file in extos.so mondelefant_native.so multirand.so; do
+			dosym ../../$(get_libdir)/$file ${MY_DEST}/lib/$file
+		done
+
+		insinto /usr/share/${PN}
+		doins -r demo-app${subdir}
+	done
+	dodoc doc/*sample.conf libraries/mondelefant/example.lua
+	docinto html
+	dodoc doc/autodoc.html
+}
diff --git a/www-apps/webmcp/webmcp-1.2.6.ebuild b/www-apps/webmcp/webmcp-1.2.6.ebuild
deleted file mode 100644
index 70f63e2a0bd3..000000000000
--- a/www-apps/webmcp/webmcp-1.2.6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_P=${PN}-v${PV}
-DESCRIPTION="Web application framework written in Lua and C"
-HOMEPAGE="https://www.public-software-group.org/webmcp"
-SRC_URI="https://www.public-software-group.org/pub/projects/${PN}/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="HPND"
-KEYWORDS="~amd64"
-SLOT=0
-IUSE=""
-
-RDEPEND="dev-lang/lua:0=
-	dev-db/postgresql:="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_compile() {
-	emake CC=$(tc-getCC) LD=$(tc-getCC) MYLDFLAGS="${LDFLAGS}"
-	# Dereference symlinks
-	cd framework
-	mkdir lib.link
-	mv lib/* lib.link
-	cp lib.link/* lib
-}
-
-src_install() {
-	into /usr/lib/${PN}
-	dolib.so framework/lib/*.so
-	for subdir in "" ".precompiled"; do
-		MY_DEST=/usr/lib/${PN}/framework${subdir}
-
-		cd framework${subdir}
-		exeinto ${MY_DEST}/accelerator
-		doexe accelerator/webmcp_accelerator.so
-		insinto ${MY_DEST}
-		doins -r env js
-		exeinto ${MY_DEST}/cgi-bin
-		doexe cgi-bin/webmcp*.lua
-		into ${MY_DEST}
-		dobin bin/*
-		insinto ${MY_DEST}/lib
-		doins lib/*.lua
-		cd ..
-
-		for file in extos.so mondelefant_native.so multirand.so; do
-			dosym ../../$(get_libdir)/$file ${MY_DEST}/lib/$file
-		done
-
-		insinto /usr/share/${PN}
-		doins -r demo-app${subdir}
-	done
-	dodoc doc/*sample.conf libraries/mondelefant/example.lua
-	docinto html
-	dodoc doc/autodoc.html
-}
-- 
cgit v1.2.3