1 |
jlec 13/01/28 07:58:55 |
2 |
|
3 |
Modified: json-c-0.9-r1.ebuild ChangeLog json-c-0.9.ebuild |
4 |
metadata.xml |
5 |
Added: json-c-0.10.ebuild |
6 |
Log: |
7 |
dev-libs/json-c: Version Bump, #454372; all patches prepared by radhermit (Tim Harder); moves header out of the way to fix collision with jsoncpp, 452234 |
8 |
|
9 |
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 70EB7916) |
10 |
|
11 |
Revision Changes Path |
12 |
1.9 dev-libs/json-c/json-c-0.9-r1.ebuild |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/json-c/json-c-0.9-r1.ebuild?rev=1.9&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/json-c/json-c-0.9-r1.ebuild?rev=1.9&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/json-c/json-c-0.9-r1.ebuild?r1=1.8&r2=1.9 |
17 |
|
18 |
Index: json-c-0.9-r1.ebuild |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/json-c/json-c-0.9-r1.ebuild,v |
21 |
retrieving revision 1.8 |
22 |
retrieving revision 1.9 |
23 |
diff -u -r1.8 -r1.9 |
24 |
--- json-c-0.9-r1.ebuild 30 Sep 2012 18:14:18 -0000 1.8 |
25 |
+++ json-c-0.9-r1.ebuild 28 Jan 2013 07:58:55 -0000 1.9 |
26 |
@@ -1,6 +1,6 @@ |
27 |
-# Copyright 1999-2012 Gentoo Foundation |
28 |
+# Copyright 1999-2013 Gentoo Foundation |
29 |
# Distributed under the terms of the GNU General Public License v2 |
30 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-c/json-c-0.9-r1.ebuild,v 1.8 2012/09/30 18:14:18 armin76 Exp $ |
31 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-c/json-c-0.9-r1.ebuild,v 1.9 2013/01/28 07:58:55 jlec Exp $ |
32 |
|
33 |
EAPI="4" |
34 |
|
35 |
@@ -13,6 +13,9 @@ |
36 |
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" |
37 |
IUSE="static-libs" |
38 |
|
39 |
+RDEPEND="!dev-libs/jsoncpp" |
40 |
+DEPEND="" |
41 |
+ |
42 |
DOCS=( README ) |
43 |
|
44 |
src_configure() { |
45 |
|
46 |
|
47 |
|
48 |
1.23 dev-libs/json-c/ChangeLog |
49 |
|
50 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/json-c/ChangeLog?rev=1.23&view=markup |
51 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/json-c/ChangeLog?rev=1.23&content-type=text/plain |
52 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/json-c/ChangeLog?r1=1.22&r2=1.23 |
53 |
|
54 |
Index: ChangeLog |
55 |
=================================================================== |
56 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/json-c/ChangeLog,v |
57 |
retrieving revision 1.22 |
58 |
retrieving revision 1.23 |
59 |
diff -u -r1.22 -r1.23 |
60 |
--- ChangeLog 30 Sep 2012 18:14:18 -0000 1.22 |
61 |
+++ ChangeLog 28 Jan 2013 07:58:55 -0000 1.23 |
62 |
@@ -1,6 +1,14 @@ |
63 |
# ChangeLog for dev-libs/json-c |
64 |
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
65 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-c/ChangeLog,v 1.22 2012/09/30 18:14:18 armin76 Exp $ |
66 |
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
67 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-c/ChangeLog,v 1.23 2013/01/28 07:58:55 jlec Exp $ |
68 |
+ |
69 |
+*json-c-0.10 (28 Jan 2013) |
70 |
+ |
71 |
+ 28 Jan 2013; Justin Lecher <jlec@g.o> json-c-0.9.ebuild, |
72 |
+ json-c-0.9-r1.ebuild, +json-c-0.10.ebuild, +files/json-c-0.10-flags.patch, |
73 |
+ +files/json-c-0.10-headers.patch, metadata.xml: |
74 |
+ Version Bump, #454372; all patches prepared by radhermit (Tim Harder); moves |
75 |
+ header out of the way to fix collision with jsoncpp, 452234 |
76 |
|
77 |
30 Sep 2012; Raúl Porcel <armin76@g.o> json-c-0.9-r1.ebuild: |
78 |
alpha/ia64/sh/sparc stable wrt #418745 |
79 |
|
80 |
|
81 |
|
82 |
1.15 dev-libs/json-c/json-c-0.9.ebuild |
83 |
|
84 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/json-c/json-c-0.9.ebuild?rev=1.15&view=markup |
85 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/json-c/json-c-0.9.ebuild?rev=1.15&content-type=text/plain |
86 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/json-c/json-c-0.9.ebuild?r1=1.14&r2=1.15 |
87 |
|
88 |
Index: json-c-0.9.ebuild |
89 |
=================================================================== |
90 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/json-c/json-c-0.9.ebuild,v |
91 |
retrieving revision 1.14 |
92 |
retrieving revision 1.15 |
93 |
diff -u -r1.14 -r1.15 |
94 |
--- json-c-0.9.ebuild 25 Mar 2012 14:45:06 -0000 1.14 |
95 |
+++ json-c-0.9.ebuild 28 Jan 2013 07:58:55 -0000 1.15 |
96 |
@@ -1,6 +1,6 @@ |
97 |
-# Copyright 1999-2012 Gentoo Foundation |
98 |
+# Copyright 1999-2013 Gentoo Foundation |
99 |
# Distributed under the terms of the GNU General Public License v2 |
100 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-c/json-c-0.9.ebuild,v 1.14 2012/03/25 14:45:06 armin76 Exp $ |
101 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-c/json-c-0.9.ebuild,v 1.15 2013/01/28 07:58:55 jlec Exp $ |
102 |
|
103 |
EAPI="2" |
104 |
|
105 |
@@ -13,6 +13,9 @@ |
106 |
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" |
107 |
IUSE="" |
108 |
|
109 |
+RDEPEND="!dev-libs/jsoncpp" |
110 |
+DEPEND="" |
111 |
+ |
112 |
src_install() { |
113 |
emake DESTDIR="${D}" install || die "Install failed" |
114 |
dodoc README || die "dodoc failed" |
115 |
|
116 |
|
117 |
|
118 |
1.3 dev-libs/json-c/metadata.xml |
119 |
|
120 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/json-c/metadata.xml?rev=1.3&view=markup |
121 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/json-c/metadata.xml?rev=1.3&content-type=text/plain |
122 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/json-c/metadata.xml?r1=1.2&r2=1.3 |
123 |
|
124 |
Index: metadata.xml |
125 |
=================================================================== |
126 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/json-c/metadata.xml,v |
127 |
retrieving revision 1.2 |
128 |
retrieving revision 1.3 |
129 |
diff -u -r1.2 -r1.3 |
130 |
--- metadata.xml 23 Sep 2011 22:41:13 -0000 1.2 |
131 |
+++ metadata.xml 28 Jan 2013 07:58:55 -0000 1.3 |
132 |
@@ -1,15 +1,15 @@ |
133 |
<?xml version="1.0" encoding="UTF-8"?> |
134 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
135 |
<pkgmetadata> |
136 |
-<maintainer> |
137 |
-<email>hwoarang@g.o</email> |
138 |
-<name>Markos Chandras</name> |
139 |
-</maintainer> |
140 |
-<longdescription lang="en"> |
141 |
+ <maintainer> |
142 |
+ <email>hwoarang@g.o</email> |
143 |
+ <name>Markos Chandras</name> |
144 |
+ </maintainer> |
145 |
+ <longdescription lang="en"> |
146 |
"A JSON implementation in C" is probably the better description, and then |
147 |
"JSON-C implements a reference counting object model that allows you to |
148 |
easily construct JSON objects in C, output them as JSON formatted |
149 |
strings and parse JSON formatted strings back into the C |
150 |
representation of JSON objects. |
151 |
-</longdescription> </pkgmetadata> |
152 |
- |
153 |
+</longdescription> |
154 |
+</pkgmetadata> |
155 |
|
156 |
|
157 |
|
158 |
1.1 dev-libs/json-c/json-c-0.10.ebuild |
159 |
|
160 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/json-c/json-c-0.10.ebuild?rev=1.1&view=markup |
161 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/json-c/json-c-0.10.ebuild?rev=1.1&content-type=text/plain |
162 |
|
163 |
Index: json-c-0.10.ebuild |
164 |
=================================================================== |
165 |
# Copyright 1999-2013 Gentoo Foundation |
166 |
# Distributed under the terms of the GNU General Public License v2 |
167 |
# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-c/json-c-0.10.ebuild,v 1.1 2013/01/28 07:58:55 jlec Exp $ |
168 |
|
169 |
EAPI=5 |
170 |
|
171 |
AUTOTOOLS_AUTORECONF=true |
172 |
|
173 |
inherit autotools-utils |
174 |
|
175 |
DESCRIPTION="A JSON implementation in C" |
176 |
HOMEPAGE="https://github.com/json-c/json-c/wiki" |
177 |
SRC_URI="mirror://github/${PN}/${PN}/${P}.tar.gz" |
178 |
|
179 |
LICENSE="MIT" |
180 |
SLOT="0/0" |
181 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" |
182 |
IUSE="doc static-libs" |
183 |
|
184 |
PATCHES=( |
185 |
"${FILESDIR}"/${P}-flags.patch |
186 |
|
187 |
# bug 452234 |
188 |
"${FILESDIR}"/${P}-headers.patch |
189 |
) |
190 |
|
191 |
# tests break otherwise |
192 |
AUTOTOOLS_IN_SOURCE_BUILD=1 |
193 |
|
194 |
src_test() { |
195 |
export USE_VALGRIND=0 VERBOSE=1 |
196 |
autotools-utils_src_test |
197 |
} |
198 |
|
199 |
src_install() { |
200 |
use doc && HTML_DOCS=( "${S}"/doc/html ) |
201 |
autotools-utils_src_install |
202 |
} |