summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2014-04-08 16:19:20 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2014-04-08 16:19:20 +0000
commit7f13f17123245c297dea061611c95170d36409cc (patch)
treeecba2dd051d7aa8933fe71bbc50e92c588c51e2a /media-libs/libechonest
parentsci-chemistry/pymol: Version Bump (diff)
downloadhistorical-7f13f17123245c297dea061611c95170d36409cc.tar.gz
historical-7f13f17123245c297dea061611c95170d36409cc.tar.bz2
historical-7f13f17123245c297dea061611c95170d36409cc.zip
Punt dev-qt/qttest dependency because tests are restricted wrt #507086 by Julian Ospald
Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0x4868F14D
Diffstat (limited to 'media-libs/libechonest')
-rw-r--r--media-libs/libechonest/ChangeLog7
-rw-r--r--media-libs/libechonest/Manifest18
-rw-r--r--media-libs/libechonest/libechonest-2.2.0-r1.ebuild10
3 files changed, 22 insertions, 13 deletions
diff --git a/media-libs/libechonest/ChangeLog b/media-libs/libechonest/ChangeLog
index 516cf23f3d88..587088867de4 100644
--- a/media-libs/libechonest/ChangeLog
+++ b/media-libs/libechonest/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-libs/libechonest
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libechonest/ChangeLog,v 1.29 2014/04/06 19:06:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libechonest/ChangeLog,v 1.30 2014/04/08 16:19:15 ssuominen Exp $
+
+ 08 Apr 2014; Samuli Suominen <ssuominen@gentoo.org>
+ libechonest-2.2.0-r1.ebuild:
+ Punt dev-qt/qttest dependency because tests are restricted wrt #507086 by
+ Julian Ospald
06 Apr 2014; Samuli Suominen <ssuominen@gentoo.org> -libechonest-2.0.3.ebuild,
-libechonest-2.1.0.ebuild, -libechonest-2.2.0.ebuild:
diff --git a/media-libs/libechonest/Manifest b/media-libs/libechonest/Manifest
index dd38e55d5f1a..ad566cf68459 100644
--- a/media-libs/libechonest/Manifest
+++ b/media-libs/libechonest/Manifest
@@ -6,17 +6,17 @@ AUX libechonest-2.2.0-always_use_QJSON_LIBRARIES.patch 901 SHA256 c7832e7e5d47a4
DIST libechonest-2.0.2.tar.bz2 82005 SHA256 e0d9b3fe7bf5fff0ce8d0f182c4cac8ea3b478c57be21549fc57da69c1a3088c SHA512 fb8baf396206cc567ae880c3f19191bd5a723820a8a8f7ea96f1065cea88c213b46ec9f7688838353331bdac105893c4e9ea118e5b17cdda313dce5ba810a1fb WHIRLPOOL d1bfd6059c5e648e190bf4ba9ddb5a3bdaeca8af346c34dc0f0177f3f05314b491f37bba2ad05944e6ff9b4ddd88e7042a089c9ecb370e75b61b6b405aa5e8d7
DIST libechonest-2.2.0.tar.bz2 84242 SHA256 f2c043a3564bc9c5a4556a80737d1440519ced583feaa62f7afa362e35e81ee0 SHA512 482df30a7a139b14da28d752cff405267bae8af448014857aa5151c08312bcb1144039dc962c85d1613d013446eede8b97efca970801262a240a5f790e95d48e WHIRLPOOL d836f14163168f455311ed30ded1cd860311913693de41f24d6416419128487f6568fd4b8f9e52cb02ffe72b2418c46d2ffb55cab7f432b6a861dc295a99347c
EBUILD libechonest-2.0.2.ebuild 762 SHA256 9c3b7ce0c7974c0ca3295b3ea585162511fa0144b37d8867087602cda1976607 SHA512 f84ce7389d827fdcd2b37ac4d3c3918643c1a2b528e35d475c47ccfaa990135cef8dcd156d30dad40b8fe0e3e577c7a44e47a2a27d12277e871babb713d20a80 WHIRLPOOL bd419878f209d5225afcba6171c9088fce905504545da84c2eb15669980c232074d7e722f39683bc8753dfe0c43119b4da503aa9a55853159d1b4616bed1c8f0
-EBUILD libechonest-2.2.0-r1.ebuild 847 SHA256 fc474498f9f0cc8225fb8f576d2ade65837f5c2d04d965889c650b7d4ad0fb12 SHA512 c46166d96523366883ab491fba27747934c85dd9fe7375c48d9aa4dc970307cc460cd56df318000af37591ab5eaff982f77957bcddf8d348bb6fec011cbd73f5 WHIRLPOOL 144ff5900212afac759c5df4299684b27fe854b54a3c07e7c15f85eaaaeb683110f5787c862563488353047043de2ab32a7474c7797edfc11b41c90130771d08
-MISC ChangeLog 4359 SHA256 33e0fef8ebc885fec0cf2a87f973ba3554c87686c376543603de5aa8935a6d02 SHA512 1a19939559b4ddfc3cc0b2ceb96ceba1be105a0de6cd991d8d0226ba5848b2a6bf41b03a95e135f52a1b1c67d19f94a5c8b51c6fdfa0bf15bbddb68d6b0a078e WHIRLPOOL 2bd48a176ae170aa0b99fab5bb4b5f6eab90c5d734c40d7f27c5d883bb66cb324a08cee7c4ea6d682bd4f8176bc54e00bc621a2299db9b4800c484d903a2eff3
+EBUILD libechonest-2.2.0-r1.ebuild 942 SHA256 4c105998d0f2e7d2641b72e3d3238009a54e4bd3139434ae6320dee56ebef8b2 SHA512 0b861517c85b44ea20c1511a7e1e9ef4b897afbe45f39c6c86c68f1122c95b0010a5773ae7c7ba05ec5dca60fa240c2c4c1963a3aaaf1b6ae0fcaf2dd242039e WHIRLPOOL f41766cfa88ba4995242433517253d3ff7dcf88cd63b9a9c7f22fa8ee28452a7af1b987fb718eb2cc9ef9d41c38a57fc9913e88c6a9f106873b98c80a780a2fa
+MISC ChangeLog 4537 SHA256 6df5ececc0df300a79d57ec467edca10375ba4dac8b101ea55d3e3dde9153470 SHA512 8b64dd08f0432c21740e2a8dbe817b53bf55fdccc41b87d0412232baefe40bc7a0353c36c7b3e04f45037034b5ffd474bb56daa9f5dd27c7b9ec7b5d5182fe26 WHIRLPOOL f7f248e003923dddee914619d2d870315548973f09a939ed95d321839222952267870cc0ff937842cd2ba3fb53313edcc1302b9f83afe98e2ef0a1a3e1e8f5c3
MISC metadata.xml 386 SHA256 300b56df88b92756eec8b55d41a1ed72634b6b0f16bcce438f050347f8d54a33 SHA512 74292a80ede9dc9642e364c88625ac3bcfbf90d17dba787b82e43546e06628cc9ffe1db4624cf7779dcde12454d62b7dd0820969a07659235be8cce2102e88f4 WHIRLPOOL 6844c22d4a67f997a4f9bbe090ad3e4ac54a9bda47f2e4f407b7d33227619ba0372dfeab5348a1d11450899a8027bd0850c9a3dcc83628ca1382fa1e62fa7eb7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQEcBAEBCAAGBQJTQaRtAAoJEEdUh39IaPFNVbwH/3VB2kSB2Pr9bv698m7LdzpW
-eUOM+Sm4jPNMzbEgOBILarkFfoQ6EsE3fujm+Ygi+pnHJChdjqQ5SHdd/WErxlOD
-kgyj7n/+jpxYwWuCdtbtfXgR1uUvZ1uINR8A1XgVRBMe1I2M2r3fmVPqpvL+ALvm
-gz1ex4lyLxf9NwdRlkc+jOh1/GVWtgWpRrYXS+fDIL3w4D4m+GA6s2z4N6mUqSzQ
-I473rCt4PhU8VcexSM9fT0kX//7yyrILNHeGCjkNdz3QpS5Km9KU8ZnVOzZQkfni
-9apQh4dKahIH1BeXt8U63vcfp00HejA3qa/8+tku00M3GUDgPsvUR92kHEYwhkE=
-=WouP
+iQEcBAEBCAAGBQJTRCAcAAoJEEdUh39IaPFNYXsIAIBy50/xZ8+OekmWkUM/h5Zw
+OPUGZwg73hxeMvme8qNJN8TsCdvdZ9a2Db9TWzVTv/XPUzN3cBNDIoxnjeycd2jU
+8sCBlJp+iusCME30gSMrhxSuOEDnVV9oQnf1PU0Dsr/uQdbVXUvXgEEYbk2BpiSO
+X4jt7e8hUJbBvgDJ8kjKmhvFLAZW524D23zk9Bi5VMA556T0AJITe+H1TflqryGU
+ONDU/fW+tZGTgtXwwYxkOV+ULCRtwUs8C7ctNC+rPsJFjR5/SvNPdscxW6U2LZgc
+QVeIFo9Q+RS/6Sm2e85BupfB1L28C11qNmuip4PdQ+g5GXu4PkP0mLiSq5wgQIU=
+=rmVM
-----END PGP SIGNATURE-----
diff --git a/media-libs/libechonest/libechonest-2.2.0-r1.ebuild b/media-libs/libechonest/libechonest-2.2.0-r1.ebuild
index 405b052c733f..0f3a9b40a3bc 100644
--- a/media-libs/libechonest/libechonest-2.2.0-r1.ebuild
+++ b/media-libs/libechonest/libechonest-2.2.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libechonest/libechonest-2.2.0-r1.ebuild,v 1.1 2014/04/06 19:05:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libechonest/libechonest-2.2.0-r1.ebuild,v 1.2 2014/04/08 16:19:15 ssuominen Exp $
EAPI=5
inherit cmake-utils
@@ -19,13 +19,17 @@ RESTRICT="test" # Networking required
RDEPEND=">=dev-libs/qjson-0.5
dev-qt/qtcore:4"
DEPEND="${RDEPEND}
- virtual/pkgconfig
- dev-qt/qttest:4"
+ virtual/pkgconfig"
DOCS=( AUTHORS README TODO )
PATCHES=( "${FILESDIR}"/${P}-always_use_QJSON_LIBRARIES.patch )
+src_prepare() {
+ cmake-utils_src_prepare
+ sed -i -e '/find_package/s/QtTest//' CMakeLists.txt || die #507086
+}
+
src_configure() {
local mycmakeargs=(
-DECHONEST_BUILD_TESTS=OFF