Build fix. Bug #514162

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

3 files changed, 57 insertions, 9 deletions

diff --git a/www-apps/webmcp/ChangeLog b/www-apps/webmcp/ChangeLog
index 96132d330ddb..7bb016d74f4d 100644
--- a/www-apps/webmcp/ChangeLog
+++ b/www-apps/webmcp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/webmcp
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/webmcp/ChangeLog,v 1.1 2013/04/24 08:15:15 tupone Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/webmcp/ChangeLog,v 1.2 2014/06/21 18:27:05 tupone Exp $
+
+  21 Jun 2014; Tupone Alfredo <tupone@gentoo.org>
+  files/webmcp-1.2.5-gentoo.patch:
+  Build fix. Bug #514162 by Patrick Lauer
 
 *webmcp-1.2.5 (24 Apr 2013)
 
diff --git a/www-apps/webmcp/Manifest b/www-apps/webmcp/Manifest
index 15eae613ceba..f9352895b6cd 100644
--- a/www-apps/webmcp/Manifest
+++ b/www-apps/webmcp/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX webmcp-1.2.5-gentoo.patch 3204 SHA256 412786485664a54e71284cfdd43b889cbce0b1f2a50bd2d28ac9d7766bc515f0 SHA512 fbb3373f9230fe9c735a4946ec2be6aef559e7afa0e3cc6c06a9145e9d667b681ae6f43f31b6aca5f0eab722b3a6636619acae20a2b80e04d6b912ff19f707ce WHIRLPOOL e863b267031392f4bd1bba0ccc5afa69297e00edd23d84e95e2a7aed683dde4085bb217068cb48a77e9c8806cd68cfad21571be2f571c23cd3b3694f16146634
+AUX webmcp-1.2.5-gentoo.patch 5020 SHA256 fe1e964220dba4eb0e7b3fea5b4bd92b016d5d28306a1ffc48968fad9d955f2e SHA512 91b3b2679b2254b78120d3ec360d2770aaff82a21c8aa0fa00190d4dd215d4c9d837682c3562332e24ef079fd147618c7727ba721dc4e1302c6c71c875307a60 WHIRLPOOL 87845c81963514d9d3ee892f584a3bfb7a0ce4f0555b83a3c1e45282ad8ff0be1d741f81c1c0ea889f4ea68f8f7c31c009c1d625f8e5e8581c58ee017099708e
 DIST webmcp-v1.2.5.tar.gz 131003 SHA256 16bf5096f4754d56a6f7e059963cd8bc759c406ab50812e49252d97007666da3 SHA512 40ce2f48c0e7362b7cb7a20a44c19d597fd919d98dbd2865aa6c1b5f9c41f593aee408309cf530a7cd0f94e2976ddda93816e723228a7285e689f13e31135589 WHIRLPOOL 51ae7aa7964da773e912ec58ac9113e51a573e6fbde4d01fac63acaaecfcf15f126164321390bf240c23baa99fe7e7e0b1f0ba2c25d70d465395c7c90c9e7432
 EBUILD webmcp-1.2.5.ebuild 1529 SHA256 893685646a6e3d4a85e1443d277522f6b45856314d0d6c6528ef7726820c7a16 SHA512 962b0d31fa71820f2cd890e7bee5bffb1c0e14f1d1a77f3f9d2111dd438a7d9d53b3bcf824eab8d114325716ce078c18d8e295da545f0dae5060114af39d4544 WHIRLPOOL 69d249327008aecfadfcf713112c74b33111be40cdac7cffa442866dba4bf3e747ac90c26e7997b7083037becea76497da189a6e7d8d0147c3f00a3ce473c5e4
-MISC ChangeLog 370 SHA256 f77b5d3294f05cba88df05686384ac2b1055526ba550b81872e8e8f8a80accf7 SHA512 32886d5a1da0670aff05169e8a2efe340c3feac320234f9cffe92f05668a17fd99874ff4946ff56067ddd7ef230a72bbb109a266ed8fef0b862453b789593fc1 WHIRLPOOL f48836ee0bddf525fac1bf18f45f72c32c9490c0245b975b30a56d1d5f29aefcf0f792e451ebd097212430f36e05383fa190ef3daa9181ca815bb832671f22db
+MISC ChangeLog 498 SHA256 244df8a2b301f978785807b88ceb6ba637c792d90ffcc5670cdcd04532bffc36 SHA512 f16cdb8b9747cd1c938009d80993160bc1248c587166144e9451665e8614665300279e5550f0bf04ef4235b8325c9b9c8c593f956fe77137737b855f167b68aa WHIRLPOOL ff116cc2eec83b6f6232ba31ad7e8960353e06aa135ad3228b9cc0a77c17a60c9c14345cfd020363ffb4a95bbb7196cad52bb11abdb3050fd0afd51137ad0cd7
 MISC metadata.xml 807 SHA256 85f0dde5218d4d95b770666a56f4fbf9054a28184b39c55902fbf63b837dbd22 SHA512 013a1c78c2b2df60e7091996571c81383f8d365d6e7f737a20aad619e6d27ac332f4864e9b50e103ac224d98ec1598f2a21827a4bd7338071354414d19096782 WHIRLPOOL 5210de7920fdbf4727670fc81636b4ae68101f083da02f29aa0c2b6e07168741100f9deed0e7b0ba70306515a29d4cec27bc9962261d306648cab3303d0a7f1f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlF3lJgACgkQIY77eQFFFC09xACgnIgPQIOjVrnC+kP3bTKvMdOs
-BfUAn1hAYS+f6CjjABQWpfRYRlojdwzZ
-=lbsd
+iEYEAREIAAYFAlOlzn4ACgkQIY77eQFFFC1jYwCfSy2loGxMlshlQjn3yFzGk+qV
+3PcAoMLI0YX8Lt3sxyTz+vj5yIOtyGDR
+=M6/6
 -----END PGP SIGNATURE-----
diff --git a/www-apps/webmcp/files/webmcp-1.2.5-gentoo.patch b/www-apps/webmcp/files/webmcp-1.2.5-gentoo.patch
index e318f0328ead..2cd506583e6b 100644
--- a/www-apps/webmcp/files/webmcp-1.2.5-gentoo.patch
+++ b/www-apps/webmcp/files/webmcp-1.2.5-gentoo.patch
@@ -41,7 +41,7 @@
  # TODO: check alternatives to -D_GNU_SOURCE -fPIC
  #       using libtool?
 -CFLAGS = -O2 -D_GNU_SOURCE -fPIC -Wall -I /usr/include -I /usr/local/include
-+CPPFLAGS = -D_GNU_SOURCE -I /usr/include
++CPPFLAGS = -D_GNU_SOURCE
  
  # additional C compiler flags for parts which depend on PostgreSQL
  CFLAGS_PGSQL = -I /usr/include/postgresql -I /usr/include/postgresql/server -I /usr/local/include/postgresql -I /usr/local/include/postgresql/server
@@ -95,3 +95,47 @@
  
  #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