summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2013-01-28 08:02:55 +0000
committerJustin Lecher <jlec@gentoo.org>2013-01-28 08:02:55 +0000
commitf49fe38277f5690bb0aabe52477b32f56e4ae0b4 (patch)
treee99f39e78587d7b107694228a09823572a6110fe /dev-libs
parentInitial commit, ebuild by me (diff)
downloadgentoo-2-f49fe38277f5690bb0aabe52477b32f56e4ae0b4.tar.gz
gentoo-2-f49fe38277f5690bb0aabe52477b32f56e4ae0b4.tar.bz2
gentoo-2-f49fe38277f5690bb0aabe52477b32f56e4ae0b4.zip
dev-libs/jsoncpp: Block colliding version, #452234
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/jsoncpp/ChangeLog6
-rw-r--r--dev-libs/jsoncpp/jsoncpp-0.5.0.ebuild4
-rw-r--r--dev-libs/jsoncpp/metadata.xml8
3 files changed, 11 insertions, 7 deletions
diff --git a/dev-libs/jsoncpp/ChangeLog b/dev-libs/jsoncpp/ChangeLog
index b8b08f51bf18..7fd895fbd282 100644
--- a/dev-libs/jsoncpp/ChangeLog
+++ b/dev-libs/jsoncpp/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/jsoncpp
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/jsoncpp/ChangeLog,v 1.2 2013/01/08 04:15:11 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/jsoncpp/ChangeLog,v 1.3 2013/01/28 08:02:55 jlec Exp $
+
+ 28 Jan 2013; Justin Lecher <jlec@gentoo.org> jsoncpp-0.5.0.ebuild,
+ metadata.xml:
+ Block colliding version, #452234
08 Jan 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org> jsoncpp-0.5.0.ebuild:
Keyword ~amd64
diff --git a/dev-libs/jsoncpp/jsoncpp-0.5.0.ebuild b/dev-libs/jsoncpp/jsoncpp-0.5.0.ebuild
index 226cfe7f32af..9435925db5ea 100644
--- a/dev-libs/jsoncpp/jsoncpp-0.5.0.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-0.5.0.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/dev-libs/jsoncpp/jsoncpp-0.5.0.ebuild,v 1.2 2013/01/08 04:15:11 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/jsoncpp/jsoncpp-0.5.0.ebuild,v 1.3 2013/01/28 08:02:55 jlec Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
@@ -23,7 +23,7 @@ DEPEND="
app-doc/doxygen
${PYTHON_DEPS}
)"
-RDEPEND=""
+RDEPEND="!<dev-libs/json-c-0.10"
S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/jsoncpp/metadata.xml b/dev-libs/jsoncpp/metadata.xml
index d047926ffe02..ca7415b87d35 100644
--- a/dev-libs/jsoncpp/metadata.xml
+++ b/dev-libs/jsoncpp/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>phajdan.jr@gentoo.org</email>
- <name>Pawel Hajdan jr</name>
- </maintainer>
+ <maintainer>
+ <email>phajdan.jr@gentoo.org</email>
+ <name>Pawel Hajdan jr</name>
+ </maintainer>
</pkgmetadata>