| 1 |
commit: 2595d123cd46e36b9235f521979534c766bcc9e9 |
| 2 |
Author: Tiziano Müller <tm <AT> dev-zero <DOT> ch> |
| 3 |
AuthorDate: Thu Jan 31 09:19:10 2013 +0000 |
| 4 |
Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 31 09:19:10 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=2595d123 |
| 7 |
|
| 8 |
Revert my header move and import block for json-c 0.9 from gentoo-x86 ebuild. |
| 9 |
|
| 10 |
--- |
| 11 |
dev-libs/jsoncpp/Manifest | 2 +- |
| 12 |
dev-libs/jsoncpp/jsoncpp-0.6.0_rc2.ebuild | 8 ++++---- |
| 13 |
2 files changed, 5 insertions(+), 5 deletions(-) |
| 14 |
|
| 15 |
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest |
| 16 |
index 8807f28..e877e8e 100644 |
| 17 |
--- a/dev-libs/jsoncpp/Manifest |
| 18 |
+++ b/dev-libs/jsoncpp/Manifest |
| 19 |
@@ -1,2 +1,2 @@ |
| 20 |
DIST jsoncpp-src-0.6.0-rc2.tar.gz 117661 SHA256 d4d193d163f520b08b9155cba978615892ca1359d77e3fb261fce2f86d09b283 SHA512 5d44e766aa2d7657bc68cf16173130febaa6744d5fca0c6df5465617a3f306023a17cbeb07a62ad1a34c2d183d916401b4be48f37c2416c895db4ad5d9481b3d WHIRLPOOL bfa7e70e14f3ed0911c5127da0d2099ca8b9159a900a5bc5147d1e50b5a9f9d5be69a8d46a761d277ca1edabaab8d0d3b9f81417572e4664ed8239fd83c953e6 |
| 21 |
-EBUILD jsoncpp-0.6.0_rc2.ebuild 1115 SHA256 e49ff61403fb71435737d0aed29b3d0a1ca18a79a07020266d8afddae364b4ea SHA512 d5e8bc9d8b1803ff746903985f670ce236533e3fec6965bf267e0cce331129fe78cccdde2890cb0ca3d8f0823bdad7e96a94fe7ce063d01777d168b33f7bba3c WHIRLPOOL cb089d7e9d2586496567f03b4ce3efbc384f7c107a3532d74a0d40c68cdd61f4f4f2b43e6cd124c757a58bc0813ef3f01faaec7e584105978873a36ea0021d8e |
| 22 |
+EBUILD jsoncpp-0.6.0_rc2.ebuild 1123 SHA256 78bf43af2928be0d78cde5c05cf0f0a2bb28e9e3e67284fef099d767b4ab1a3e SHA512 3b7362968422f4ebaabcbc2e6108e1d8124c9c0fc4411b5f7cb4298b9d26b66439c00428a3018abb3997ffc8e267cdfd1d113c31cd700f6fc2c6a18112eda47e WHIRLPOOL 242aed3b3cc1b7f2feaa2cee32c45fc1961e4dc72827cea6bb356de8f41bb62965c6c3d9c06e717a815ff3c60acf948a2703c1c908ae84805f53c20dc12c8ce7 |
| 23 |
|
| 24 |
diff --git a/dev-libs/jsoncpp/jsoncpp-0.6.0_rc2.ebuild b/dev-libs/jsoncpp/jsoncpp-0.6.0_rc2.ebuild |
| 25 |
index 32154fc..a8c680c 100644 |
| 26 |
--- a/dev-libs/jsoncpp/jsoncpp-0.6.0_rc2.ebuild |
| 27 |
+++ b/dev-libs/jsoncpp/jsoncpp-0.6.0_rc2.ebuild |
| 28 |
@@ -5,7 +5,7 @@ |
| 29 |
EAPI=5 |
| 30 |
PYTHON_COMPAT=( python2_7 ) |
| 31 |
|
| 32 |
-inherit toolchain-funcs python-any-r1 |
| 33 |
+inherit multilib toolchain-funcs python-any-r1 |
| 34 |
|
| 35 |
MY_P="${PN}-src-${PV/_/-}" |
| 36 |
|
| 37 |
@@ -23,7 +23,7 @@ DEPEND=" |
| 38 |
app-doc/doxygen |
| 39 |
${PYTHON_DEPS} |
| 40 |
)" |
| 41 |
-RDEPEND="" |
| 42 |
+RDEPEND="!<dev-libs/json-c-0.10" |
| 43 |
|
| 44 |
S="${WORKDIR}/${MY_P}" |
| 45 |
|
| 46 |
@@ -40,8 +40,8 @@ src_compile() { |
| 47 |
} |
| 48 |
|
| 49 |
src_install() { |
| 50 |
- insinto /usr/include/jsoncpp |
| 51 |
- doins -r include/json/* |
| 52 |
+ insinto /usr |
| 53 |
+ doins -r include |
| 54 |
|
| 55 |
dolib ${soname} |
| 56 |
dosym ${soname} /usr/$(get_libdir)/libjsoncpp.so |
Archives