app-admin/rsyslog: Correct buildsystem so that json-c will be detected correctly by pkg-config, #454944

Package-Manager: portage-2.2.0_alpha162/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

5 files changed, 187 insertions, 22 deletions

diff --git a/app-admin/rsyslog/ChangeLog b/app-admin/rsyslog/ChangeLog
index dde35b703133..e5712b7b3ca7 100644
--- a/app-admin/rsyslog/ChangeLog
+++ b/app-admin/rsyslog/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/rsyslog
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.88 2013/01/21 13:13:22 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.89 2013/02/12 12:06:16 jlec Exp $
+
+  12 Feb 2013; Justin Lecher <jlec@gentoo.org> rsyslog-7.2.5.ebuild,
+  +files/rsyslog-7.2.5-json-c-pkgconfig.patch, metadata.xml:
+  Correct buildsystem so that json-c will be detected correctly by pkg-config,
+  #454944
 
 *rsyslog-7.2.5 (21 Jan 2013)
 
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 3ad7ab35ba82..1d7f0bc245b1 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 5-stable/rsyslog-gentoo.conf 3998 SHA256 d31ba477fb94c82cd2362694b680d43bfc5eb83c6e930202feb7531c4396982b SHA512 a27dc6255dceecc41b6fd231604bd0b4baa91ff03faa08e11cebaf2c3c791a9130ff7f5d51150cae8d06d5b270a2f23ce3f50c55f596841bbbd4b2c7cf49051a WHIRLPOOL 5ff9b2495853fb5616a6709296efd906a58f930e55639a384792219120a62fc2c517c417dddca800a13a2532f096a09924d8b486bf16235b5144edb793632df6
 AUX 5-stable/rsyslog.confd 654 SHA256 c476c2180fcceaf581d26d2da6201fbe7a2b9fc89c58456fdb3bdaf18a4cbb56 SHA512 c216674e6867d655c2c09b6205071591ae2b1611ad5dd0346e682733abafa8a1be261fdd9bb985bb5d05d5bfa708a68262b1a94e654a2c18d352fd02d6f950a3 WHIRLPOOL f4069536f61ff7190a357cc7d9bb90af7839e48a34bd4c12a622b295b963aac2f3dda7d9e637ab492ed00e2079541df4ab65516f43d7eb3673a66d579d96f966
@@ -15,6 +15,7 @@ AUX 7-stable/rsyslog-gentoo.conf 2630 SHA256 9b390cfffef39d3b5c6f845c6285e23fddc
 AUX 7-stable/rsyslog.confd 583 SHA256 ff2634927d3208ac2c82d352f0a7dc9fef1d0ee098d18f818d4417ac04516e9c SHA512 d7cdfd5eab63877ca2a4776c24b2810aee600c2590f10b598d9feee08a5fcedd9c33cdd2a8e1f89b869474b66ab22e7f96126a5b52e6e66760f742407ae81301 WHIRLPOOL f53744ca0177d2f52e1f070eed6927afddbd38c9b6f3fe889b4652cd8b3f0dd625abfe434253e73fbdbf7a14169c7ace5038dc8322ca4b3f97abf893125cedec
 AUX 7-stable/rsyslog.initd 985 SHA256 7b3b32e89c051566b68c5e5a077cd5960da183e071e411b1248d4e4702a24279 SHA512 982f2f11370a87fc5d3dd6d1961d35b4e2c1d0d91b4806f9d2ce422e08c08f8d62c7c0f0fdfa6950c0114da099f61bb3142af431a13ea62d7c6ea1720a6d6682 WHIRLPOOL 4b906fbed7d8a9acb2c0989d94d4611f63f8598d77c124506426ddb9d9d24ff9b92b7c91d5405158e18542fb8a383e0abdfecace03959507c1180244d1b93973
 AUX 7-stable/rsyslog.logrotate 530 SHA256 4d84da5fdcd1b36e017bc6dfac09c5d0cf277b461667ba7d15b23463b572bc08 SHA512 ccb0a72efa10f4455de7404fd112be3787b22e755b857f8fe9895886a20acceda8cf02cdbd764ce1dfd313bb6c030d47288aa5a945ecd0100d02a324052afae0 WHIRLPOOL 734f9d80d1da3ee834939db65cdf56b7dc788140612c6d38d217f8f86b57bf6ea98a3d13558cc0cc9723160c0b4b6b027d86893d5cd5df83a38a6bf38b4f379b
+AUX rsyslog-7.2.5-json-c-pkgconfig.patch 4459 SHA256 55ba883c9d2b69cd8a08cf1417b838fadba4fe8d23107729e5358c81b877bff7 SHA512 06e5e07e97cc803476149d3f37151d612a24afa6862b1f36e35c9c80abcd0176f9b6d9d496c3633db4e1dd3d4257c3fb97e744afbcc377b2ec20a44f862bb8ea WHIRLPOOL 4086b1fb077554b0115cf7fdf83f28a1e92a510d09809fb89891b70a25b40b0fd2ba2c04ad0e2ef53b40ec3ef8b0e4bb5c2d7185310f87fe8f6d0f9479d8157b
 DIST rsyslog-5.10.1.tar.gz 2390048 SHA256 2f643a2c613d5b09f242affd32a90cf4fb7a9ac4557dc80f218e6f3e5affb4c8 SHA512 5f70e97c60103c1f3198cd04cb1fb402d67c2e0232ff09c0aa0cd578667924e0a77a34529bcf4f530c0ef5b8da4f42b98bd5be029d1c2669dd04003e59c1b092 WHIRLPOOL 3f14b25dfca61bdcbdc954f0cd54f5e71481a8ebcbfbd45abceafac9185a51dfd67990e936dd3368c9944aabc9653435fbefc270aabcf925e1a2afda9d09e7ea
 DIST rsyslog-5.8.11.tar.gz 2393222 SHA256 f75b39cf22506f7a28d986d0a446a09a0806f253dba661f125a241a1b47d6285 SHA512 545db333efd136c2ae26131ad400e69f41aaa4fa458a5d586c73e9063f0acb044dbcfe3a13e48b3db77a72f471e87b3b8f9ab2bff008b1166b836dbdddb7974a WHIRLPOOL 2ab8ae35179dcade3953c612cb8bdbd48e7bce6c0cca54278d2949ff3c7c29311341855778511acc38328db4ebeca5599e632c94def038f7134cdd2df78e53e8
 DIST rsyslog-5.8.12.tar.gz 2393679 SHA256 18a408c92fa299773d26a8d6f324eec66282a148b0989c66d94b94318dd0a514 SHA512 18080b09a5e80d3a2dc4b04976c3470eb096560ebc038815dfaec73ef3e53ffbad74b2586d0247aeb318a6e2463e072fe84dad5a2040a9320f37b55511d890ae WHIRLPOOL 80b429beb88014c862fc74f0b9ff0b78bd54764b3c01a4b3f7595d4863eb2f8996d29e9db70b472c30c7cac02793a5290319f51b6eaab4b28dea4ca16246c030
@@ -31,13 +32,13 @@ EBUILD rsyslog-5.8.5.ebuild 7346 SHA256 2b630d5e51c4225ad3d07195002e82ac00162a43
 EBUILD rsyslog-6.2.2.ebuild 7450 SHA256 f2b435b4fdd7a4e1bed90da721404fcbb42c1751c1c32bceb522a8378d5ae4f0 SHA512 c0c4cc937eb00861004a71071a3b45596847e43fe8e34e82541176143c5fd4e005635f52b06f517cbf5418d189a85a465feb45e5eb06a4707ead8a104e62b8ff WHIRLPOOL e4f8dd62cd408a7bf7ebc5dab9e124076359b89066f71aaa25a364ad044cb62d450769022c0dc6ab5c1c75f5e9a89a4c3e8884e77b561bd8fec23d3cc390762d
 EBUILD rsyslog-6.6.0.ebuild 7056 SHA256 431f39720521bb4181c8bbadf9a6f86663572eddb4eaad7d16e6f01e64726d0e SHA512 5a3521dc8c8b778e4271f337eaec357e051af8cddef06618c64b0666df8e62e58969d11ca56f1fd8c39153084754927ecc21eb5c678d02b2ea59428a5a58559c WHIRLPOOL 3dab207f37ddd9f22b0c553bc98dcf8d8ef31dbc385d40fa0b626d6c0392bfb3d3f04da5a6a5d722270943b2672af041695a8c20ecf8c38ba4349e2939e5507b
 EBUILD rsyslog-7.2.2-r1.ebuild 7137 SHA256 2814946a6ad96181c33fd7a5b6f874d99035a5b2f9e156a8bf1d99ddab76a39c SHA512 3ab258ddc9f8c1747c772ef9f9e7f209aa5285a5098eebf0bd445a65c152c8499b73944c0da64e1f584f568b776c338bc8b903977b35e144b6555abe6913fedd WHIRLPOOL 3b00dfe36d159dc57429cd05595f1d71bf6fcf0511657e96a07d327ca0e2d3ccfde25206ff8b3231a6fda80776d42965a31f321369b527d20b7951a28d535d31
-EBUILD rsyslog-7.2.5.ebuild 7093 SHA256 295b920ae52c12abf497ad79f93a7b62f472e2e4415296dec0378a51933fab80 SHA512 70a79bac3c4dfce7d37fa165f5931e4f215d1933e45eefff6af28f9e024529079dcb28bdfb09f54e72067b99456d5f765100b11258b83df499ddd585d88f9a25 WHIRLPOOL b409b9d06198131ae3344eae8df4a027cc653603b696ac05ad9aa288dd5abb6a314d19d19bd532903b198414622f6d16f3b41b75fbeada9633356369f0ab915e
-MISC ChangeLog 16313 SHA256 a1993c7137d8a98d72be706e83b9f129ba050315844358fcca7f621f23616608 SHA512 d9a832fd3cfceba8d0f85673ca985f6da39cb9ae4fccb65690e77b891f4b76a266bddd8aeb9508651ea94d4b8d1db93ed4d7ebf4f597a34db503d0909a48ad0f WHIRLPOOL 5bdd09a300208cf7eee802ae4fa99048b28cab817a734a013f052542875333c5537dff7b7d7745bbc1661806440ed447a4a1c440ec558df3af3fa3f3022e0e5a
-MISC metadata.xml 631 SHA256 7ebd03f706c1f5e6b35ff9d211a59c7647d5f341d65120bd235063797fc1e1a1 SHA512 a5976799cc4461fd6fef37c21aace7d495686bbce37b444e3ba8ac7b3b4fc94df0ce80ad58df529de733ffd9df2e2e1681eb23fabd135e486b19c959f3045d78 WHIRLPOOL 721f60f354f0182de51b88e2fb3d3b9b54f32aa612916b9ee0ef0fbce22d7992dd348515efd95209057ed4ce850d6f002a597e5e1975e5131c5271b36176771f
+EBUILD rsyslog-7.2.5.ebuild 7138 SHA256 ad05447d4f322c4f901c43ac192accc3a9d30c20a261bbb7b925a84e10c667a2 SHA512 e8ed53579c636b6f2f863c02ab92d8cfbbdbc915a8a3f1ebe511c1c20225c980f574d6b708cd057b43d0f175798ae60c66dc50bcdcb939b78f0a48f819adee62 WHIRLPOOL 7e37583e9990e0e5952a0eb89beff092ba803d236dfb08dc49efd4af7b135117a3d8fd9168d5f4149cbe6e151c16984185a6506279c645f766a7f785e3a1e443
+MISC ChangeLog 16529 SHA256 d9ad97c033130ae559d8bb3471a62842d2b4e9a90ef6510c13bbb793f0267ceb SHA512 d98b8878f93478bb70762c6979005c4aa0b5774b07d06fe8e715e3069dc43cd1337c0a60b99056c920163317896ca6abcd64f2c4972adc6710b501053062a0c0 WHIRLPOOL 852d400b684200d45ef49de066d24f8d30a77dd50785eb6a6e07c17e3a6abdee94758fd1c721255f6aa7f71289a9c7107ba0a6c37df03218c19f0fb37ef3265c
+MISC metadata.xml 654 SHA256 64c2e80b469c21ebea4933e47f601d390cc442d6c0ad83478888b7a2d39c3782 SHA512 f2d7bf3151036af2a023c959e75391b796066b6fc62c95b8493409a20a092d39ed2d9ac9f3ca466d5dcaeb4cc9eb82d899da381a21b1df6d9ee11b1537a54907 WHIRLPOOL c3529400558796c324cb007acb9d600e1b02f4227c5587600072e8addc207ae53c531d2929901f3d41912708d2be1ec943fab4b513f199e2822ba1ba44f6617e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlD9PvgACgkQKiQSS7ZY+hO/QQD+KPraKERO85iGGBDgx3AaE2m3
-WCZxyFw6UpmUyiC5XmYA+wci4H5WWJ68LJUrQjGLTycho27+kdQLpzcA7GwxECv2
-=F+Gg
+iEYEAREKAAYFAlEaMFcACgkQgAnW8HDreRbT/gCfRC1wTeyNnPgnLHB49WvqOacI
+FDsAnRXjob1InJhdc6eAHzocttxGjywi
+=S1el
 -----END PGP SIGNATURE-----
diff --git a/app-admin/rsyslog/files/rsyslog-7.2.5-json-c-pkgconfig.patch b/app-admin/rsyslog/files/rsyslog-7.2.5-json-c-pkgconfig.patch
new file mode 100644
index 000000000000..61cc38c5a3dc
--- /dev/null
+++ b/app-admin/rsyslog/files/rsyslog-7.2.5-json-c-pkgconfig.patch
@@ -0,0 +1,156 @@
+From edf9b718d3007bdb519b3d64cb1f8145bba8e15e Mon Sep 17 00:00:00 2001
+From: Justin Lecher <jlec@gentoo.org>
+Date: Tue, 12 Feb 2013 11:55:17 +0100
+Subject: [PATCH] Use pkg-config to detect json-c
+
+There was a typo in the configure.ac which prevented correct usage of pkg-config
+to detect json-c.
+This patch corrects this typo and removes all paths from json.h in source files.
+
+Signed-off-by: Justin Lecher <jlec@gentoo.org>
+---
+ action.c                          | 2 +-
+ configure.ac                      | 2 +-
+ plugins/imkmsg/kmsg.c             | 2 +-
+ plugins/mmjsonparse/mmjsonparse.c | 2 +-
+ plugins/mmnormalize/mmnormalize.c | 2 +-
+ plugins/ommongodb/ommongodb.c     | 2 +-
+ runtime/msg.c                     | 2 +-
+ runtime/msg.h                     | 2 +-
+ template.c                        | 2 +-
+ template.h                        | 2 +-
+ 10 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/action.c b/action.c
+index 07f3a6f..d5cf983 100644
+--- a/action.c
++++ b/action.c
+@@ -98,7 +98,7 @@
+ #include <strings.h>
+ #include <time.h>
+ #include <errno.h>
+-#include <json/json.h>
++#include <json.h>
+ 
+ #include "dirty.h"
+ #include "template.h"
+diff --git a/configure.ac b/configure.ac
+index e9fce3f..cad0d57 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -758,7 +758,7 @@ if test "x$enable_rsyslogrt" = "xyes"; then
+   RSRT_LIBS1="\$(top_builddir)/runtime/librsyslog.la"
+ fi
+ AM_CONDITIONAL(ENABLE_RSYSLOGRT, test x$enable_rsyslogrt = xyes)
+-RSRT_CFLAGS="\$(RSRT_CFLAGS1) \$(LIBESTR_CFLAGS) \$(JSON_C_FLAGS)"
++RSRT_CFLAGS="\$(RSRT_CFLAGS1) \$(LIBESTR_CFLAGS) \$(JSON_C_CFLAGS)"
+ RSRT_LIBS="\$(RSRT_LIBS1) \$(LIBESTR_LIBS) \$(JSON_C_LIBS)"
+ AC_SUBST(RSRT_CFLAGS1)
+ AC_SUBST(RSRT_LIBS1)
+diff --git a/plugins/imkmsg/kmsg.c b/plugins/imkmsg/kmsg.c
+index b771d68..1c3ae4d 100644
+--- a/plugins/imkmsg/kmsg.c
++++ b/plugins/imkmsg/kmsg.c
+@@ -35,7 +35,7 @@
+ #ifdef  OS_LINUX
+ #include <sys/klog.h>
+ #endif
+-#include <json/json.h>
++#include <json.h>
+ 
+ #include "rsyslog.h"
+ #include "srUtils.h"
+diff --git a/plugins/mmjsonparse/mmjsonparse.c b/plugins/mmjsonparse/mmjsonparse.c
+index c47aceb..56db557 100644
+--- a/plugins/mmjsonparse/mmjsonparse.c
++++ b/plugins/mmjsonparse/mmjsonparse.c
+@@ -36,7 +36,7 @@
+ #include <unistd.h>
+ #include <ctype.h>
+ #include <libestr.h>
+-#include <json/json.h>
++#include <json.h>
+ #include "conf.h"
+ #include "syslogd-types.h"
+ #include "template.h"
+diff --git a/plugins/mmnormalize/mmnormalize.c b/plugins/mmnormalize/mmnormalize.c
+index fd2004a..45dde98 100644
+--- a/plugins/mmnormalize/mmnormalize.c
++++ b/plugins/mmnormalize/mmnormalize.c
+@@ -40,7 +40,7 @@
+ #include <unistd.h>
+ #include <libestr.h>
+ #include <libee/libee.h>
+-#include <json/json.h>
++#include <json.h>
+ #include <liblognorm.h>
+ #include "conf.h"
+ #include "syslogd-types.h"
+diff --git a/plugins/ommongodb/ommongodb.c b/plugins/ommongodb/ommongodb.c
+index dd99741..64d501d 100644
+--- a/plugins/ommongodb/ommongodb.c
++++ b/plugins/ommongodb/ommongodb.c
+@@ -33,7 +33,7 @@
+ #include <stdint.h>
+ #include <time.h>
+ #include <mongo.h>
+-#include <json/json.h>
++#include <json.h>
+ /* For struct json_object_iter, should not be necessary in future versions */
+ #include <json/json_object_private.h>
+ 
+diff --git a/runtime/msg.c b/runtime/msg.c
+index 68577ad..664abb9 100644
+--- a/runtime/msg.c
++++ b/runtime/msg.c
+@@ -41,7 +41,7 @@
+ #endif
+ #include <netdb.h>
+ #include <libestr.h>
+-#include <json/json.h>
++#include <json.h>
+ /* For struct json_object_iter, should not be necessary in future versions */
+ #include <json/json_object_private.h>
+ #if HAVE_MALLOC_H
+diff --git a/runtime/msg.h b/runtime/msg.h
+index 564441b..caa825f 100644
+--- a/runtime/msg.h
++++ b/runtime/msg.h
+@@ -30,7 +30,7 @@
+ 
+ #include <pthread.h>
+ #include <libestr.h>
+-#include <json/json.h>
++#include <json.h>
+ #include "obj.h"
+ #include "syslogd-types.h"
+ #include "template.h"
+diff --git a/template.c b/template.c
+index 1ccb375..974aba3 100644
+--- a/template.c
++++ b/template.c
+@@ -34,7 +34,7 @@
+ #include <string.h>
+ #include <ctype.h>
+ #include <assert.h>
+-#include <json/json.h>
++#include <json.h>
+ #include "stringbuf.h"
+ #include "syslogd-types.h"
+ #include "template.h"
+diff --git a/template.h b/template.h
+index 018e2f5..c87e7a8 100644
+--- a/template.h
++++ b/template.h
+@@ -30,7 +30,7 @@
+ #ifndef	TEMPLATE_H_INCLUDED
+ #define	TEMPLATE_H_INCLUDED 1
+ 
+-#include <json/json.h>
++#include <json.h>
+ #include <libestr.h>
+ #include "regexp.h"
+ #include "stringbuf.h"
+-- 
+1.8.1.2
+
diff --git a/app-admin/rsyslog/metadata.xml b/app-admin/rsyslog/metadata.xml
index b0e4733bf73e..828e59ef5e5e 100644
--- a/app-admin/rsyslog/metadata.xml
+++ b/app-admin/rsyslog/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>ultrabug@gentoo.org</email>
-  <name>Alexys Jacob</name>
-  <description>Primary Maintainer</description>
-</maintainer>
-<use>
-	<flag name='extras'>Add support for the UDP spoofing module (omudpspoof) using <pkg>net-libs/libnet</pkg></flag>
-	<flag name='relp'>Add support for the Reliable Event Logging Protocol using <pkg>dev-libs/librelp</pkg></flag>
-	<flag name='zeromq'>Add support for the ZeroMQ input and output plugins using <pkg>net-libs/zeromq</pkg></flag>
-</use>
+  <maintainer>
+    <email>ultrabug@gentoo.org</email>
+    <name>Alexys Jacob</name>
+    <description>Primary Maintainer</description>
+  </maintainer>
+  <use>
+    <flag name="extras">Add support for the UDP spoofing module (omudpspoof) using <pkg>net-libs/libnet</pkg></flag>
+    <flag name="relp">Add support for the Reliable Event Logging Protocol using <pkg>dev-libs/librelp</pkg></flag>
+    <flag name="zeromq">Add support for the ZeroMQ input and output plugins using <pkg>net-libs/zeromq</pkg></flag>
+  </use>
 </pkgmetadata>
diff --git a/app-admin/rsyslog/rsyslog-7.2.5.ebuild b/app-admin/rsyslog/rsyslog-7.2.5.ebuild
index ff6165b73850..dc76bd567fba 100644
--- a/app-admin/rsyslog/rsyslog-7.2.5.ebuild
+++ b/app-admin/rsyslog/rsyslog-7.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.2.5.ebuild,v 1.1 2013/01/21 13:13:22 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.2.5.ebuild,v 1.2 2013/02/12 12:06:16 jlec Exp $
 
 EAPI=4
 AUTOTOOLS_AUTORECONF=yes
@@ -47,13 +47,16 @@ AUTOTOOLS_IN_SOURCE_BUILD=1
 
 DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)
 
+PATCHES=(
+	"${FILESDIR}"/${P}-json-c-pkgconfig.patch
+
+	# Fix runtime UUID/JSON libs linking
+	"${FILESDIR}"/6-stable/${PN}-6.6.0-fix-runtime.patch	)
+
 src_prepare() {
 	# Don't force '-g' CFLAG
 	sed -e 's/CFLAGS="\(.*\) -g"/CFLAGS="\1"/g' -i configure.ac || die
 
-	# Fix runtime UUID/JSON libs linking
-	epatch "${FILESDIR}/6-stable/${PN}-6.6.0-fix-runtime.patch"
-
 	autotools-utils_src_prepare
 }