* [gentoo-commits] dev/dev-zero:master commit in: dev-libs/jsoncpp/
@ 2013-01-20 13:35 Tiziano Müller
0 siblings, 0 replies; 3+ messages in thread
From: Tiziano Müller @ 2013-01-20 13:35 UTC (permalink / raw
To: gentoo-commits
commit: 1d92dd4ec899957fc6aa636beab595601d653123
Author: Tiziano Müller <tm <AT> dev-zero <DOT> ch>
AuthorDate: Sun Jan 20 13:26:03 2013 +0000
Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Sun Jan 20 13:26:03 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=1d92dd4e
Add version bump of jsoncpp based on the in-tree ebuild required by cocaine-core.
---
dev-libs/jsoncpp/Manifest | 2 +
dev-libs/jsoncpp/jsoncpp-0.6.0_rc2.ebuild | 53 +++++++++++++++++++++++++++++
2 files changed, 55 insertions(+), 0 deletions(-)
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
new file mode 100644
index 0000000..26b6098
--- /dev/null
+++ b/dev-libs/jsoncpp/Manifest
@@ -0,0 +1,2 @@
+DIST jsoncpp-src-0.6.0-rc2.tar.gz 117661 SHA256 d4d193d163f520b08b9155cba978615892ca1359d77e3fb261fce2f86d09b283 SHA512 5d44e766aa2d7657bc68cf16173130febaa6744d5fca0c6df5465617a3f306023a17cbeb07a62ad1a34c2d183d916401b4be48f37c2416c895db4ad5d9481b3d WHIRLPOOL bfa7e70e14f3ed0911c5127da0d2099ca8b9159a900a5bc5147d1e50b5a9f9d5be69a8d46a761d277ca1edabaab8d0d3b9f81417572e4664ed8239fd83c953e6
+EBUILD jsoncpp-0.6.0_rc2.ebuild 1092 SHA256 8af1e0d6cf0c98c6679b3c63faa695988dc3aaf08eb3fc03e0d07bb5fd00b31b SHA512 ecd3bd409114aee34becd0fb3e337d901b17337e5c86f8f87d22f6668b1f731ca251680ba2a53d3a834c7f58fedc10790738f234395eb9928d282d5e7e303d2b WHIRLPOOL 7f203fb631102e2638cd35d4bb2e572978bf7cecc161f6eaba042e9b84f8d5de3f837f526673e0a74f38d1d9504ecb39a4ccf70cc65d1ae9303dd1f0779f1887
diff --git a/dev-libs/jsoncpp/jsoncpp-0.6.0_rc2.ebuild b/dev-libs/jsoncpp/jsoncpp-0.6.0_rc2.ebuild
new file mode 100644
index 0000000..fc51f3e
--- /dev/null
+++ b/dev-libs/jsoncpp/jsoncpp-0.6.0_rc2.ebuild
@@ -0,0 +1,53 @@
+# 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 $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit toolchain-funcs python-any-r1
+
+MY_P="${PN}-src-${PV/_/-}"
+
+DESCRIPTION="C++ JSON reader and writer"
+HOMEPAGE="http://jsoncpp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+LICENSE="public-domain"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="
+ doc? (
+ app-doc/doxygen
+ ${PYTHON_DEPS}
+ )"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+cxx_wrapper() {
+ set -- $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "$@"
+ echo "$@"
+ "$@"
+}
+
+src_compile() {
+ soname=libjsoncpp.so.${PV}
+ cxx_wrapper src/lib_json/*.cpp -Iinclude -shared -fPIC \
+ -Wl,-soname,${soname} -o ${soname} || die
+}
+
+src_install() {
+ insinto /usr
+ doins -r include
+
+ dolib ${soname}
+ dosym ${soname} /usr/$(get_libdir)/libjsoncpp.so
+
+ if use doc; then
+ ${EPYTHON} doxybuild.py --doxygen=/usr/bin/doxygen || die
+ dohtml dist/doxygen/jsoncpp*/*
+ fi
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] dev/dev-zero:master commit in: dev-libs/jsoncpp/
@ 2013-01-31 7:37 Tiziano Müller
0 siblings, 0 replies; 3+ messages in thread
From: Tiziano Müller @ 2013-01-31 7:37 UTC (permalink / raw
To: gentoo-commits
commit: 3eea9925078da257ae00431f377f184094246138
Author: Tiziano Müller <tm <AT> dev-zero <DOT> ch>
AuthorDate: Thu Jan 31 07:36:53 2013 +0000
Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Thu Jan 31 07:36:53 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=3eea9925
Install the headers to /usr/include/jsoncpp to avoid collisiong with json-c (in /usr/include/json).
---
dev-libs/jsoncpp/Manifest | 2 +-
dev-libs/jsoncpp/jsoncpp-0.6.0_rc2.ebuild | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index 26b6098..8807f28 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,2 +1,2 @@
DIST jsoncpp-src-0.6.0-rc2.tar.gz 117661 SHA256 d4d193d163f520b08b9155cba978615892ca1359d77e3fb261fce2f86d09b283 SHA512 5d44e766aa2d7657bc68cf16173130febaa6744d5fca0c6df5465617a3f306023a17cbeb07a62ad1a34c2d183d916401b4be48f37c2416c895db4ad5d9481b3d WHIRLPOOL bfa7e70e14f3ed0911c5127da0d2099ca8b9159a900a5bc5147d1e50b5a9f9d5be69a8d46a761d277ca1edabaab8d0d3b9f81417572e4664ed8239fd83c953e6
-EBUILD jsoncpp-0.6.0_rc2.ebuild 1092 SHA256 8af1e0d6cf0c98c6679b3c63faa695988dc3aaf08eb3fc03e0d07bb5fd00b31b SHA512 ecd3bd409114aee34becd0fb3e337d901b17337e5c86f8f87d22f6668b1f731ca251680ba2a53d3a834c7f58fedc10790738f234395eb9928d282d5e7e303d2b WHIRLPOOL 7f203fb631102e2638cd35d4bb2e572978bf7cecc161f6eaba042e9b84f8d5de3f837f526673e0a74f38d1d9504ecb39a4ccf70cc65d1ae9303dd1f0779f1887
+EBUILD jsoncpp-0.6.0_rc2.ebuild 1115 SHA256 e49ff61403fb71435737d0aed29b3d0a1ca18a79a07020266d8afddae364b4ea SHA512 d5e8bc9d8b1803ff746903985f670ce236533e3fec6965bf267e0cce331129fe78cccdde2890cb0ca3d8f0823bdad7e96a94fe7ce063d01777d168b33f7bba3c WHIRLPOOL cb089d7e9d2586496567f03b4ce3efbc384f7c107a3532d74a0d40c68cdd61f4f4f2b43e6cd124c757a58bc0813ef3f01faaec7e584105978873a36ea0021d8e
diff --git a/dev-libs/jsoncpp/jsoncpp-0.6.0_rc2.ebuild b/dev-libs/jsoncpp/jsoncpp-0.6.0_rc2.ebuild
index fc51f3e..32154fc 100644
--- a/dev-libs/jsoncpp/jsoncpp-0.6.0_rc2.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-0.6.0_rc2.ebuild
@@ -40,8 +40,8 @@ src_compile() {
}
src_install() {
- insinto /usr
- doins -r include
+ insinto /usr/include/jsoncpp
+ doins -r include/json/*
dolib ${soname}
dosym ${soname} /usr/$(get_libdir)/libjsoncpp.so
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] dev/dev-zero:master commit in: dev-libs/jsoncpp/
@ 2013-01-31 9:19 Tiziano Müller
0 siblings, 0 replies; 3+ messages in thread
From: Tiziano Müller @ 2013-01-31 9:19 UTC (permalink / raw
To: gentoo-commits
commit: 2595d123cd46e36b9235f521979534c766bcc9e9
Author: Tiziano Müller <tm <AT> dev-zero <DOT> ch>
AuthorDate: Thu Jan 31 09:19:10 2013 +0000
Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Thu Jan 31 09:19:10 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=2595d123
Revert my header move and import block for json-c 0.9 from gentoo-x86 ebuild.
---
dev-libs/jsoncpp/Manifest | 2 +-
dev-libs/jsoncpp/jsoncpp-0.6.0_rc2.ebuild | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index 8807f28..e877e8e 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,2 +1,2 @@
DIST jsoncpp-src-0.6.0-rc2.tar.gz 117661 SHA256 d4d193d163f520b08b9155cba978615892ca1359d77e3fb261fce2f86d09b283 SHA512 5d44e766aa2d7657bc68cf16173130febaa6744d5fca0c6df5465617a3f306023a17cbeb07a62ad1a34c2d183d916401b4be48f37c2416c895db4ad5d9481b3d WHIRLPOOL bfa7e70e14f3ed0911c5127da0d2099ca8b9159a900a5bc5147d1e50b5a9f9d5be69a8d46a761d277ca1edabaab8d0d3b9f81417572e4664ed8239fd83c953e6
-EBUILD jsoncpp-0.6.0_rc2.ebuild 1115 SHA256 e49ff61403fb71435737d0aed29b3d0a1ca18a79a07020266d8afddae364b4ea SHA512 d5e8bc9d8b1803ff746903985f670ce236533e3fec6965bf267e0cce331129fe78cccdde2890cb0ca3d8f0823bdad7e96a94fe7ce063d01777d168b33f7bba3c WHIRLPOOL cb089d7e9d2586496567f03b4ce3efbc384f7c107a3532d74a0d40c68cdd61f4f4f2b43e6cd124c757a58bc0813ef3f01faaec7e584105978873a36ea0021d8e
+EBUILD jsoncpp-0.6.0_rc2.ebuild 1123 SHA256 78bf43af2928be0d78cde5c05cf0f0a2bb28e9e3e67284fef099d767b4ab1a3e SHA512 3b7362968422f4ebaabcbc2e6108e1d8124c9c0fc4411b5f7cb4298b9d26b66439c00428a3018abb3997ffc8e267cdfd1d113c31cd700f6fc2c6a18112eda47e WHIRLPOOL 242aed3b3cc1b7f2feaa2cee32c45fc1961e4dc72827cea6bb356de8f41bb62965c6c3d9c06e717a815ff3c60acf948a2703c1c908ae84805f53c20dc12c8ce7
diff --git a/dev-libs/jsoncpp/jsoncpp-0.6.0_rc2.ebuild b/dev-libs/jsoncpp/jsoncpp-0.6.0_rc2.ebuild
index 32154fc..a8c680c 100644
--- a/dev-libs/jsoncpp/jsoncpp-0.6.0_rc2.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-0.6.0_rc2.ebuild
@@ -5,7 +5,7 @@
EAPI=5
PYTHON_COMPAT=( python2_7 )
-inherit toolchain-funcs python-any-r1
+inherit multilib toolchain-funcs python-any-r1
MY_P="${PN}-src-${PV/_/-}"
@@ -23,7 +23,7 @@ DEPEND="
app-doc/doxygen
${PYTHON_DEPS}
)"
-RDEPEND=""
+RDEPEND="!<dev-libs/json-c-0.10"
S="${WORKDIR}/${MY_P}"
@@ -40,8 +40,8 @@ src_compile() {
}
src_install() {
- insinto /usr/include/jsoncpp
- doins -r include/json/*
+ insinto /usr
+ doins -r include
dolib ${soname}
dosym ${soname} /usr/$(get_libdir)/libjsoncpp.so
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-01-31 9:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-20 13:35 [gentoo-commits] dev/dev-zero:master commit in: dev-libs/jsoncpp/ Tiziano Müller
-- strict thread matches above, loose matches on Subject: below --
2013-01-31 7:37 Tiziano Müller
2013-01-31 9:19 Tiziano Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox