| 1 |
jlec 13/01/28 08:02:55 |
| 2 |
|
| 3 |
Modified: metadata.xml ChangeLog jsoncpp-0.5.0.ebuild |
| 4 |
Log: |
| 5 |
dev-libs/jsoncpp: Block colliding version, #452234 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 70EB7916) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 dev-libs/jsoncpp/metadata.xml |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/jsoncpp/metadata.xml?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/jsoncpp/metadata.xml?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/jsoncpp/metadata.xml?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: metadata.xml |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/jsoncpp/metadata.xml,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- metadata.xml 29 Dec 2012 20:08:06 -0000 1.1 |
| 23 |
+++ metadata.xml 28 Jan 2013 08:02:55 -0000 1.2 |
| 24 |
@@ -1,8 +1,8 @@ |
| 25 |
<?xml version="1.0" encoding="UTF-8"?> |
| 26 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 27 |
<pkgmetadata> |
| 28 |
- <maintainer> |
| 29 |
- <email>phajdan.jr@g.o</email> |
| 30 |
- <name>Pawel Hajdan jr</name> |
| 31 |
- </maintainer> |
| 32 |
+ <maintainer> |
| 33 |
+ <email>phajdan.jr@g.o</email> |
| 34 |
+ <name>Pawel Hajdan jr</name> |
| 35 |
+ </maintainer> |
| 36 |
</pkgmetadata> |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.3 dev-libs/jsoncpp/ChangeLog |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/jsoncpp/ChangeLog?rev=1.3&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/jsoncpp/ChangeLog?rev=1.3&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/jsoncpp/ChangeLog?r1=1.2&r2=1.3 |
| 45 |
|
| 46 |
Index: ChangeLog |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/jsoncpp/ChangeLog,v |
| 49 |
retrieving revision 1.2 |
| 50 |
retrieving revision 1.3 |
| 51 |
diff -u -r1.2 -r1.3 |
| 52 |
--- ChangeLog 8 Jan 2013 04:15:11 -0000 1.2 |
| 53 |
+++ ChangeLog 28 Jan 2013 08:02:55 -0000 1.3 |
| 54 |
@@ -1,6 +1,10 @@ |
| 55 |
# ChangeLog for dev-libs/jsoncpp |
| 56 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/jsoncpp/ChangeLog,v 1.2 2013/01/08 04:15:11 phajdan.jr Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/jsoncpp/ChangeLog,v 1.3 2013/01/28 08:02:55 jlec Exp $ |
| 59 |
+ |
| 60 |
+ 28 Jan 2013; Justin Lecher <jlec@g.o> jsoncpp-0.5.0.ebuild, |
| 61 |
+ metadata.xml: |
| 62 |
+ Block colliding version, #452234 |
| 63 |
|
| 64 |
08 Jan 2013; Pawel Hajdan jr <phajdan.jr@g.o> jsoncpp-0.5.0.ebuild: |
| 65 |
Keyword ~amd64 |
| 66 |
|
| 67 |
|
| 68 |
|
| 69 |
1.3 dev-libs/jsoncpp/jsoncpp-0.5.0.ebuild |
| 70 |
|
| 71 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/jsoncpp/jsoncpp-0.5.0.ebuild?rev=1.3&view=markup |
| 72 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/jsoncpp/jsoncpp-0.5.0.ebuild?rev=1.3&content-type=text/plain |
| 73 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/jsoncpp/jsoncpp-0.5.0.ebuild?r1=1.2&r2=1.3 |
| 74 |
|
| 75 |
Index: jsoncpp-0.5.0.ebuild |
| 76 |
=================================================================== |
| 77 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/jsoncpp/jsoncpp-0.5.0.ebuild,v |
| 78 |
retrieving revision 1.2 |
| 79 |
retrieving revision 1.3 |
| 80 |
diff -u -r1.2 -r1.3 |
| 81 |
--- jsoncpp-0.5.0.ebuild 8 Jan 2013 04:15:11 -0000 1.2 |
| 82 |
+++ jsoncpp-0.5.0.ebuild 28 Jan 2013 08:02:55 -0000 1.3 |
| 83 |
@@ -1,6 +1,6 @@ |
| 84 |
# Copyright 1999-2013 Gentoo Foundation |
| 85 |
# Distributed under the terms of the GNU General Public License v2 |
| 86 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/jsoncpp/jsoncpp-0.5.0.ebuild,v 1.2 2013/01/08 04:15:11 phajdan.jr Exp $ |
| 87 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/jsoncpp/jsoncpp-0.5.0.ebuild,v 1.3 2013/01/28 08:02:55 jlec Exp $ |
| 88 |
|
| 89 |
EAPI=5 |
| 90 |
PYTHON_COMPAT=( python2_7 ) |
| 91 |
@@ -23,7 +23,7 @@ |
| 92 |
app-doc/doxygen |
| 93 |
${PYTHON_DEPS} |
| 94 |
)" |
| 95 |
-RDEPEND="" |
| 96 |
+RDEPEND="!<dev-libs/json-c-0.10" |
| 97 |
|
| 98 |
S="${WORKDIR}/${MY_P}" |
Archives