Version bump to 1.2.6

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x0145142D

4 files changed, 224 insertions, 6 deletions

diff --git a/www-apps/webmcp/ChangeLog b/www-apps/webmcp/ChangeLog
index ffd18ff593a4..af8cfa127cdc 100644
--- a/www-apps/webmcp/ChangeLog
+++ b/www-apps/webmcp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/webmcp
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/webmcp/ChangeLog,v 1.4 2014/12/28 17:00:50 titanofold Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/webmcp/ChangeLog,v 1.5 2015/05/27 19:15:27 tupone Exp $
+
+*webmcp-1.2.6 (27 May 2015)
+
+  27 May 2015; Alfredo Tupone <tupone@gentoo.org> +webmcp-1.2.6.ebuild,
+  +files/webmcp-1.2.6-gentoo.patch:
+  Version bump to 1.2.6
 
   28 Dec 2014; Aaron W. Swenson <titanofold@gentoo.org> webmcp-1.2.5.ebuild:
   Rename virtual/postgresql to dev-db/postgresql
diff --git a/www-apps/webmcp/Manifest b/www-apps/webmcp/Manifest
index dcf7d8eaf313..068c3b46e65a 100644
--- a/www-apps/webmcp/Manifest
+++ b/www-apps/webmcp/Manifest
@@ -2,14 +2,17 @@
 Hash: SHA256
 
 AUX webmcp-1.2.5-gentoo.patch 5020 SHA256 fe1e964220dba4eb0e7b3fea5b4bd92b016d5d28306a1ffc48968fad9d955f2e SHA512 91b3b2679b2254b78120d3ec360d2770aaff82a21c8aa0fa00190d4dd215d4c9d837682c3562332e24ef079fd147618c7727ba721dc4e1302c6c71c875307a60 WHIRLPOOL 87845c81963514d9d3ee892f584a3bfb7a0ce4f0555b83a3c1e45282ad8ff0be1d741f81c1c0ea889f4ea68f8f7c31c009c1d625f8e5e8581c58ee017099708e
+AUX webmcp-1.2.6-gentoo.patch 5143 SHA256 1793be45bd855fe60120e240f6da058d8d1bb3714ca2deebb2fb51a956143f5a SHA512 da2b68d8a7adf787dfb42f2b3f9a73dcbdf256ba1eb665bdf41e19a1e4bfadeb138067abea53d07fa851ec4daa70ab198c9c3ca829ed406ce0dda2796518ae10 WHIRLPOOL fce519a2bec46feefc59bd4c0771bae9e028d19defd6af89289a1c9d4b7691d8ce4adca56b96e4ef34c14c68a210f4fc61796dbb556e2c22dd8d9f670e4a93ee
 DIST webmcp-v1.2.5.tar.gz 131003 SHA256 16bf5096f4754d56a6f7e059963cd8bc759c406ab50812e49252d97007666da3 SHA512 40ce2f48c0e7362b7cb7a20a44c19d597fd919d98dbd2865aa6c1b5f9c41f593aee408309cf530a7cd0f94e2976ddda93816e723228a7285e689f13e31135589 WHIRLPOOL 51ae7aa7964da773e912ec58ac9113e51a573e6fbde4d01fac63acaaecfcf15f126164321390bf240c23baa99fe7e7e0b1f0ba2c25d70d465395c7c90c9e7432
+DIST webmcp-v1.2.6.tar.gz 132283 SHA256 a8fb516b638fab8cd50e3f9c325c7d166da2f03f3772f9678a47f68ada9f80fe SHA512 a233c312f85851c690f9b020e5df1fffb548c708199279021f384a36cf6e2b73a9b7bc2343c886ccc0e18aecf6d205e2a699fa2398b9bf0da587bc4f8a8f8556 WHIRLPOOL db147e55d7ff327269a112e6df28cbef8ea4398246e790619c577c2df3535bff7f8dfe27587a999c1fef53da7f6438ac2a90881960575b70fdc56b541c716339
 EBUILD webmcp-1.2.5.ebuild 1528 SHA256 ff7bfbbd73de34014846bd546be04afc683b5f133af265ec0de0ac4cde7b27cb SHA512 fea387e61dd82cdd846b13f1e6a2e973e5e151cde4b3b94ec4490022b763e416114a719e79bf9a9a8375c0bf457a44a409456fda263fa19c8010a1ff9316d83c WHIRLPOOL d1cbfe6d6d485006f9f90c0fac973e8e44ebdf87f7e46dcb2ccd066eb2fab25813c1952e5114aab506b8fcd885ddcea249ecf4142a4f15b34b8894196253f45f
-MISC ChangeLog 777 SHA256 3dfc41f16f39e14bc815a0453668b2b95794f8f8588488c1f3abfb4b7c123376 SHA512 ea8bf7ab0f8a9ef4fef7d4a68ee99e0aac13870692a802147e77ba475fa5456e8315c90350adb3fb9565c449297352c6051d577e635bb57818412e75cde638eb WHIRLPOOL 5a46838517c3b56c4d11e381534db6030aab82d3495c23703d2816dd3e0a395739cb07ae233fe445ef8bca8fcce55ef9a0338f4962b53f45c2019f748fa181bb
+EBUILD webmcp-1.2.6.ebuild 1524 SHA256 acc454935fee467ca4acf2049d39263249004b75bab62dc609dac0887c6243b0 SHA512 b9d731665cb492de65bdef778d110b826a4b880f71afd30360f3144947b76cccf41f54445c21b7b8786a91d445b8594ec30c5320d344f56d09cb099259d245aa WHIRLPOOL 749a61c56e353bc9ae79fad87414bcda1d8f233e66daf5c33378aea82fa9301523defc4e9aa70dc017cc6e1c86900d983a40e6bd17b0d5320171dfa547084f12
+MISC ChangeLog 935 SHA256 9c8e30ad5646616f3b114ab6e35548a0ce8e66410a54383533c5ddfb12375612 SHA512 04cc507c6ee10769372c523996b5e181f552676c98b76f7d5e41c64d06e47ac436bd994515120df7d97dadcf6cccbc6250d74238a418529ffb602931ce958a1b WHIRLPOOL 5c528c043531e687104d37e596f5ec5f1b2e4963fd40104d235538b3681c25de73eebcb96fa3dcf79e84a75b75aedcab04cfe7f527c2a71f95abfd718f34e48a
 MISC metadata.xml 807 SHA256 85f0dde5218d4d95b770666a56f4fbf9054a28184b39c55902fbf63b837dbd22 SHA512 013a1c78c2b2df60e7091996571c81383f8d365d6e7f737a20aad619e6d27ac332f4864e9b50e103ac224d98ec1598f2a21827a4bd7338071354414d19096782 WHIRLPOOL 5210de7920fdbf4727670fc81636b4ae68101f083da02f29aa0c2b6e07168741100f9deed0e7b0ba70306515a29d4cec27bc9962261d306648cab3303d0a7f1f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlSgN0MACgkQVxOqA9G7/aA51gD9HxoXwi1XU4+5kpCl01koRs5E
-jJvcnEPDGLYdNNBJrXcA/iAI5Vxf4ClSeCs7Sd3Xq14bHiXxYS1A1+ftI+ivDRzJ
-=EcVi
+iEYEAREIAAYFAlVmF9UACgkQIY77eQFFFC1TLgCguxp2uUHpHJTq+4pZu/96ekix
+qi8AoMDFV+57KW1rCIEH//j7K1UlrFVI
+=G4Uj
 -----END PGP SIGNATURE-----
diff --git a/www-apps/webmcp/files/webmcp-1.2.6-gentoo.patch b/www-apps/webmcp/files/webmcp-1.2.6-gentoo.patch
new file mode 100644
index 000000000000..2fa1eb4aff53
--- /dev/null
+++ b/www-apps/webmcp/files/webmcp-1.2.6-gentoo.patch
@@ -0,0 +1,143 @@
+--- Makefile.old	2013-03-12 21:49:03.976676966 +0100
++++ 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/
+--- Makefile.options.old	2015-05-26 21:43:41.354197822 +0200
++++ 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
+ 
+ # additional linker flags for parts which depend on PostgreSQL
+-LDFLAGS_PGSQL = -L /usr/local/lib/postgresql -rpath /usr/local/lib/postgresql
++LDFLAGS_PGSQL =
+--- libraries/extos/Makefile.old	2013-03-13 21:49:19.710360750 +0100
++++ 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
+--- libraries/mondelefant/Makefile.old	2013-03-13 21:52:54.884250479 +0100
++++ 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
+--- libraries/multirand/Makefile.old	2013-03-13 21:54:29.399328173 +0100
++++ 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
+--- libraries/extos/extos.c.old	2013-04-05 23:19:52.028115226 +0200
++++ 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
+--- framework/accelerator/Makefile.old	2014-06-21 20:15:21.019918183 +0200
++++ 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
+--- libraries/extos/Makefile.old	2014-06-21 20:18:25.594611956 +0200
++++ 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
+--- libraries/mondelefant/Makefile.old	2014-06-21 20:19:58.218962359 +0200
++++ 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
+--- libraries/multirand/Makefile.old	2014-06-21 20:21:36.950197127 +0200
++++ 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/webmcp-1.2.6.ebuild b/www-apps/webmcp/webmcp-1.2.6.ebuild
new file mode 100644
index 000000000000..912c86b1fd8d
--- /dev/null
+++ b/www-apps/webmcp/webmcp-1.2.6.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/webmcp/webmcp-1.2.6.ebuild,v 1.1 2015/05/27 19:15:27 tupone Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+MY_P=${PN}-v${PV}
+DESCRIPTION="Web application framework written in Lua and C"
+HOMEPAGE="http://www.public-software-group.org/webmcp"
+SRC_URI="http://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
+	dev-db/postgresql"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) LD=$(tc-getCC)
+	# 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
+	dohtml doc/autodoc.html
+}