commit: de3621dc313da3ff551ae2d40720d4e462713ada
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 20 07:43:16 2024 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Feb 20 07:43:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de3621dc
www-apps/webmcp: drop 1.2.6-r1, 2.1.0-r1
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
www-apps/webmcp/Manifest | 2 -
www-apps/webmcp/files/webmcp-1.2.6-gentoo.patch | 143 ------------------------
www-apps/webmcp/files/webmcp-2.1.0-c99.patch | 20 ----
www-apps/webmcp/files/webmcp-2.1.0-gentoo.patch | 73 ------------
www-apps/webmcp/webmcp-1.2.6-r1.ebuild | 78 -------------
www-apps/webmcp/webmcp-2.1.0-r1.ebuild | 47 --------
6 files changed, 363 deletions(-)
diff --git a/www-apps/webmcp/Manifest b/www-apps/webmcp/Manifest
index 296175a21f4d..1774f5d7810a 100644
--- a/www-apps/webmcp/Manifest
+++ b/www-apps/webmcp/Manifest
@@ -1,3 +1 @@
-DIST webmcp-v1.2.6.tar.gz 132283 BLAKE2B
ed5539b91eeb809a1e19b98f2dc8888c055ec547c95c53c0ea9232531bf9b8432ba6a0ad566a1d2fecbdcc056a52e42e99b973741fc44f923ea88369393c5ade
SHA512
a233c312f85851c690f9b020e5df1fffb548c708199279021f384a36cf6e2b73a9b7bc2343c886ccc0e18aecf6d205e2a699fa2398b9bf0da587bc4f8a8f8556
-DIST webmcp-v2.1.0.tar.gz 145388 BLAKE2B
233b21ccc2c6ebcd32b847ee49ddf9ced5c15b79a860b484c9e3ad088f9996e9bcc56b43c34a558d134157800f19a9b586c9dbcee3ba61a2252178d0cf6b7cd7
SHA512
6698fab9c23d2fb4122bd79659babbcfed8a98515764deb7fa1519abb3c3d783ccec6fd2f23fc947e5e95cafdd066dde4518eff885cc98f36008785fcc45677f
DIST webmcp-v2.2.1.tar.gz 158068 BLAKE2B
a1e1ef07aadbb5dc3ab93d993f2f9cff005c404f489ac0eae736f149a20d1376f9b1013ddbcdc831089fdd0d684693a9dbc01b5bdd52e65e814bb0fb9cd254cf
SHA512
98b4eb41e312af5733ebb7cd20af7a721dc6392e5345b650706e9747c228ee0dccafbf0ed95c8ece400a80009d94f8e3c33537bbcdb393add915610570d170b8
diff --git a/www-apps/webmcp/files/webmcp-1.2.6-gentoo.patch
b/www-apps/webmcp/files/webmcp-1.2.6-gentoo.patch
deleted file mode 100644
index 3b399fe96ad9..000000000000
--- a/www-apps/webmcp/files/webmcp-1.2.6-gentoo.patch
+++ /dev/null
@@ -1,143 +0,0 @@
---- a/Makefile 2013-03-12 21:49:03.976676966 +0100
-+++ b/Makefile 2013-03-12 21:50:02.888103540 +0100
-@@ -1,11 +1,11 @@
- include Makefile.options
-
- all::
-- make documentation
-- make accelerator
-- make libraries
-- make symlinks
-- make precompile
-+ $(MAKE) documentation
-+ $(MAKE) accelerator
-+ $(MAKE) libraries
-+ $(MAKE) symlinks
-+ $(MAKE) precompile
-
- documentation::
- rm -f doc/autodoc.tmp
-@@ -14,12 +14,12 @@
- rm -f doc/autodoc.tmp
-
- accelerator::
-- cd framework/accelerator; make
-+ $(MAKE) -C framework/accelerator
-
- libraries::
-- cd libraries/extos; make
-- cd libraries/mondelefant; make
-- cd libraries/multirand; make
-+ $(MAKE) -C libraries/extos
-+ $(MAKE) -C libraries/mondelefant
-+ $(MAKE) -C libraries/multirand
-
- symlinks::
- ln -s -f ../../libraries/atom/atom.lua framework/lib/
---- a/Makefile.options 2015-05-26 21:43:41.354197822 +0200
-+++ b/Makefile.options 2015-05-26 22:01:34.594735786 +0200
-@@ -14,13 +14,13 @@
- # C compiler flags
- # TODO: check alternatives to -D_GNU_SOURCE -fPIC
- # using libtool?
--CFLAGS = -O2 -D_GNU_SOURCE -fPIC -Wall -I /usr/include -I /usr/local/include
-I /usr/local/include/lua52
-+CPPFLAGS = -D_GNU_SOURCE
-
- # additional C compiler flags for parts which depend on PostgreSQL
--CFLAGS_PGSQL = -I /usr/local/include/postgresql -I
/usr/local/include/postgresql/server
-+CFLAGS_PGSQL = -I /usr/include/postgresql -I /usr/include/postgresql/server
-
- # linker flags
--LDFLAGS = -shared -L /usr/lib -L /usr/local/lib
-+LDFLAGS = -shared $(MYLDFLAGS)
-
- # additional linker flags for parts which depend on PostgreSQL
--LDFLAGS_PGSQL = -L /usr/local/lib/postgresql -rpath /usr/local/lib/postgresql
-+LDFLAGS_PGSQL =
---- a/libraries/extos/Makefile 2013-03-13 21:49:19.710360750 +0100
-+++ b/libraries/extos/Makefile 2013-03-13 21:49:47.778096460 +0100
-@@ -1,7 +1,7 @@
- include ../../Makefile.options
-
- extos.so: extos.o
-- $(LD) $(LDFLAGS) -lrt -lcrypt -o extos.$(SLIB_EXT) extos.o
-+ $(LD) $(LDFLAGS) -o extos.$(SLIB_EXT) extos.o -lrt -lcrypt -llua
-
- extos.o: extos.c
- $(CC) -c $(CFLAGS) -o extos.o extos.c
---- a/libraries/mondelefant/Makefile 2013-03-13 21:52:54.884250479 +0100
-+++ b/libraries/mondelefant/Makefile 2013-03-13 21:53:27.511932686 +0100
-@@ -1,7 +1,7 @@
- include ../../Makefile.options
-
- mondelefant_native.so: mondelefant_native.o
-- $(LD) $(LDFLAGS) $(LDFLAGS_PGSQL) -o mondelefant_native.$(SLIB_EXT)
mondelefant_native.o -lpq
-+ $(LD) $(LDFLAGS) $(LDFLAGS_PGSQL) -o mondelefant_native.$(SLIB_EXT)
mondelefant_native.o -lpq -llua
-
- mondelefant_native.o: mondelefant_native.c
- $(CC) -c $(CFLAGS) $(CFLAGS_PGSQL) -o mondelefant_native.o
mondelefant_native.c
---- a/libraries/multirand/Makefile 2013-03-13 21:54:29.399328173 +0100
-+++ b/libraries/multirand/Makefile 2013-03-13 21:54:58.019048434 +0100
-@@ -1,7 +1,7 @@
- include ../../Makefile.options
-
- multirand.so: multirand.o
-- $(LD) $(LDFLAGS) -o multirand.$(SLIB_EXT) multirand.o
-+ $(LD) $(LDFLAGS) -o multirand.$(SLIB_EXT) multirand.o -llua
-
- multirand.o: multirand.c
- $(CC) -c $(CFLAGS) -o multirand.o multirand.c
---- a/libraries/extos/extos.c 2013-04-05 23:19:52.028115226 +0200
-+++ b/libraries/extos/extos.c 2013-04-05 23:20:14.819896253 +0200
-@@ -12,6 +12,7 @@
- #include <fcntl.h>
- #include <poll.h>
- #include <stdlib.h>
-+#include <crypt.h>
-
- #define EXTOS_MAX_ERRLEN 80
- #define EXTOS_EXEC_MAX_ARGS 64
---- a/framework/accelerator/Makefile 2014-06-21 20:15:21.019918183 +0200
-+++ b/framework/accelerator/Makefile 2014-06-21 20:15:44.700471794 +0200
-@@ -4,7 +4,7 @@
- $(LD) $(LDFLAGS) -o webmcp_accelerator.$(SLIB_EXT) webmcp_accelerator.o
-
- webmcp_accelerator.o: webmcp_accelerator.c
-- $(CC) -c $(CFLAGS) -o webmcp_accelerator.o webmcp_accelerator.c
-+ $(CC) -c $(CFLAGS) $(CPPFLAGS) -fPIC -o webmcp_accelerator.o
webmcp_accelerator.c
-
- clean::
- rm -f webmcp_accelerator.so webmcp_accelerator.o
---- a/libraries/extos/Makefile 2014-06-21 20:18:25.594611956 +0200
-+++ b/libraries/extos/Makefile 2014-06-21 20:18:50.457183029 +0200
-@@ -4,7 +4,7 @@
- $(LD) $(LDFLAGS) -o extos.$(SLIB_EXT) extos.o -lrt -lcrypt -llua
-
- extos.o: extos.c
-- $(CC) -c $(CFLAGS) -o extos.o extos.c
-+ $(CC) -c $(CFLAGS) $(CPPFLAGS) -fPIC -o extos.o extos.c
-
- clean::
- rm -f extos.so extos.o
---- a/libraries/mondelefant/Makefile 2014-06-21 20:19:58.218962359 +0200
-+++ b/libraries/mondelefant/Makefile 2014-06-21 20:20:24.527476578 +0200
-@@ -4,7 +4,7 @@
- $(LD) $(LDFLAGS) $(LDFLAGS_PGSQL) -o mondelefant_native.$(SLIB_EXT)
mondelefant_native.o -lpq -llua
-
- mondelefant_native.o: mondelefant_native.c
-- $(CC) -c $(CFLAGS) $(CFLAGS_PGSQL) -o mondelefant_native.o
mondelefant_native.c
-+ $(CC) -c $(CFLAGS) $(CPPFLAGS) -fPIC $(CFLAGS_PGSQL) -o
mondelefant_native.o mondelefant_native.c
-
- test:: mondelefant_native.so mondelefant.lua
- lua -l mondelefant
---- a/libraries/multirand/Makefile 2014-06-21 20:21:36.950197127 +0200
-+++ b/libraries/multirand/Makefile 2014-06-21 20:22:04.967703944 +0200
-@@ -4,7 +4,7 @@
- $(LD) $(LDFLAGS) -o multirand.$(SLIB_EXT) multirand.o -llua
-
- multirand.o: multirand.c
-- $(CC) -c $(CFLAGS) -o multirand.o multirand.c
-+ $(CC) -c $(CFLAGS) $(CPPFLAGS) -fPIC -o multirand.o multirand.c
-
- clean::
- rm -f multirand.so multirand.o
diff --git a/www-apps/webmcp/files/webmcp-2.1.0-c99.patch
b/www-apps/webmcp/files/webmcp-2.1.0-c99.patch
deleted file mode 100644
index ac27ebb43295..000000000000
--- a/www-apps/webmcp/files/webmcp-2.1.0-c99.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/libraries/extos/extos.c 2023-12-15 10:12:53.396506457 +0100
-+++ b/libraries/extos/extos.c 2023-12-15 14:32:20.464092779 +0100
-@@ -262,7 +262,7 @@
- if (result != 1) goto extos_pfilter_error_fd_remapping;
- do result = dup(pipe_err[1]); while (result < 0 && errno == EINTR);
- if (result != 2) goto extos_pfilter_error_fd_remapping;
-- execvp(filename, args);
-+ execvp(filename, (char * const*)args);
- status_buf[0] = errno;
- do result = write(pipe_status[1], status_buf, 1); while (result < 0 &&
errno == EINTR);
- _exit(0);
-@@ -287,7 +287,7 @@
- lua_settop(L, 0);
- lua_newtable(L); // 1
- while (1) {
-- readdir_r(dir, &entry_buffer, &entry);
-+ entry = readdir(dir);
- if (!entry) break;
- // Linux doesn't have d_namlen
- //lua_pushlstring(L, entry->d_name, entry->d_namlen);
diff --git a/www-apps/webmcp/files/webmcp-2.1.0-gentoo.patch
b/www-apps/webmcp/files/webmcp-2.1.0-gentoo.patch
deleted file mode 100644
index 90bf0992a608..000000000000
--- a/www-apps/webmcp/files/webmcp-2.1.0-gentoo.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- a/Makefile 2021-04-17 13:46:36.321270501 +0200
-+++ b/Makefile 2021-04-17 13:47:26.019424556 +0200
-@@ -2,10 +2,10 @@
-
- all::
-- make documentation
-- make accelerator
-- make libraries
-- make symlinks
-- make precompile
-+ $(MAKE) documentation
-+ $(MAKE) accelerator
-+ $(MAKE) libraries
-+ $(MAKE) symlinks
-+ $(MAKE) precompile
-
- documentation::
- rm -f doc/autodoc.tmp
---- a/libraries/extos/Makefile 2013-03-13 21:49:19.710360750 +0100
-+++ b/libraries/extos/Makefile 2013-03-13 21:49:47.778096460 +0100
-@@ -1,7 +1,7 @@
- include ../../Makefile.options
-
- extos.so: extos.o
-- $(LD) $(LDFLAGS) -lrt -lcrypt -o extos.$(SLIB_EXT) extos.o
-+ $(LD) $(LDFLAGS) -o extos.$(SLIB_EXT) extos.o -lrt -lcrypt $(LUALIBS)
-
- extos.o: extos.c
- $(CC) -c $(CFLAGS) -o extos.o extos.c
---- a/libraries/json/Makefile 2021-04-17 16:57:48.351876836 +0200
-+++ b/libraries/json/Makefile 2021-04-17 16:58:27.806190853 +0200
-@@ -1,7 +1,7 @@
- include ../../Makefile.options
-
- json.so: json.o
-- $(LD) $(LDFLAGS) -o json.$(SLIB_EXT) json.o
-+ $(LD) $(LDFLAGS) -o json.$(SLIB_EXT) json.o $(LUALIBS)
-
- json.o: json.c
- $(CC) -c $(CFLAGS) -o json.o json.c
---- a/libraries/mondelefant/Makefile 2013-03-13 21:52:54.884250479 +0100
-+++ b/libraries/mondelefant/Makefile 2013-03-13 21:53:27.511932686 +0100
-@@ -1,7 +1,7 @@
- include ../../Makefile.options
-
- mondelefant_native.so: mondelefant_native.o
-- $(LD) $(LDFLAGS) $(LDFLAGS_PGSQL) -o mondelefant_native.$(SLIB_EXT)
mondelefant_native.o -lpq
-+ $(LD) $(LDFLAGS) $(LDFLAGS_PGSQL) -o mondelefant_native.$(SLIB_EXT)
mondelefant_native.o -lpq $(LUALIBS)
-
- mondelefant_native.o: mondelefant_native.c
- $(CC) -c $(CFLAGS) $(CFLAGS_PGSQL) -o mondelefant_native.o
mondelefant_native.c
---- a/libraries/multirand/Makefile 2013-03-13 21:54:29.399328173 +0100
-+++ b/libraries/multirand/Makefile 2013-03-13 21:54:58.019048434 +0100
-@@ -1,7 +1,7 @@
- include ../../Makefile.options
-
- multirand.so: multirand.o
-- $(LD) $(LDFLAGS) -o multirand.$(SLIB_EXT) multirand.o
-+ $(LD) $(LDFLAGS) -o multirand.$(SLIB_EXT) multirand.o $(LUALIBS)
-
- multirand.o: multirand.c
- $(CC) -c $(CFLAGS) -o multirand.o multirand.c
---- a/framework/accelerator/Makefile 2021-04-17 18:36:56.402722612 +0200
-+++ b/framework/accelerator/Makefile 2021-04-17 18:37:08.605513867 +0200
-@@ -1,7 +1,7 @@
- include ../../Makefile.options
-
- webmcp_accelerator.so: webmcp_accelerator.o
-- $(LD) $(LDFLAGS) -o webmcp_accelerator.$(SLIB_EXT) webmcp_accelerator.o
-+ $(LD) $(LDFLAGS) -o webmcp_accelerator.$(SLIB_EXT) webmcp_accelerator.o
$(LUALIBS)
-
- webmcp_accelerator.o: webmcp_accelerator.c
- $(CC) -c $(CFLAGS) -o webmcp_accelerator.o webmcp_accelerator.c
diff --git a/www-apps/webmcp/webmcp-1.2.6-r1.ebuild
b/www-apps/webmcp/webmcp-1.2.6-r1.ebuild
deleted file mode 100644
index 5e614d549307..000000000000
--- a/www-apps/webmcp/webmcp-1.2.6-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 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 -i \
- -e "s/-llua/$(lua_get_LIBS)/g" \
- libraries/multirand/Makefile \
- libraries/mondelefant/Makefile \
- 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-2.1.0-r1.ebuild
b/www-apps/webmcp/webmcp-2.1.0-r1.ebuild
deleted file mode 100644
index a44301ee98d0..000000000000
--- a/www-apps/webmcp/webmcp-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{2,3} )
-
-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}"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=(
- "${FILESDIR}"/${P}-gentoo.patch
- "${FILESDIR}"/${P}-c99.patch
-)
-
-src_compile() {
- emake CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS} \
- $(lua_get_CFLAGS) -fPIC" \
- LD="$(tc-getCC)" \
- LDFLAGS="${LDFLAGS} -shared" \
- LDFLAGS_PGSQL="-L `pg_config --libdir`" \
- LUALIBS="$(lua_get_LIBS)"
-}
-
-src_install() {
- insinto /usr/lib/${PN}
- doins -r framework.precompiled/*
-}
