gentoo resync : 12.11.2017

3 files changed, 18 insertions, 5 deletions

diff --git a/media-libs/musicbrainz/Manifest b/media-libs/musicbrainz/Manifest
index 078c70e14b43..834aa15829f1 100644
--- a/media-libs/musicbrainz/Manifest
+++ b/media-libs/musicbrainz/Manifest
@@ -1,8 +1,8 @@
 AUX musicbrainz-3.0.2-gcc44.patch 270 SHA256 8641ae2665640453b2f7f66a393246d7fed6833a1360e770020ced79eb84a369 SHA512 3837a5c0940a730107ae56a9c388994dad060353e0fa02f8be6ac54928c82d34b6c8143e790e87f2066073874adcb7efb3a391a1868e3bb16da26436ef5bb00d WHIRLPOOL a015e45959f65e982aec6a45878660a5a7291b14997599b5e14711769ad45ee2f0a3d16d34a7e26ce681f9b8c4c8b9775fe5cd8b0b05048c808da0d22f165a62
 DIST libmusicbrainz-3.0.3.tar.gz 105837 SHA256 7fd459a9fd05be9faec60a9a21caa9a1e9fda03147d58d8c7c95f33582a738c5 SHA512 b4c76a0c056480c74eec36c4419f7f696f945b5a4b29dd0a5c61ab3a8b076f48b803ca7af60fb9cfa5eb5344f9ae5d566aaafea6e8eae498ed6aed2169f70480 WHIRLPOOL 775071c15ef4989738d76ca3bd115d1de884556c2fe526b87e111603b024b46883a19d7272e58eec6d6e9211cbd7f1b76a9f7a782a54f030de303d887d898a21
 DIST libmusicbrainz-5.1.0.tar.gz 77220 SHA256 6749259e89bbb273f3f5ad7acdffb7c47a2cf8fcaeab4c4695484cef5f4c6b46 SHA512 daa7ccb94e517e90f7d88a0659c84b00f04c6a73ef7771b7e3bd9101fa6569b1935a68a3689502ed0cc8c0d71ba9d2d0ebd9c074dd5eed9f75a3db390b222e03 WHIRLPOOL 4c747ce333b0a52fff24f1aadc98dd422d11dbdb1a93f45be91b59f7baeeb714bea88d2551309a3327dccb450d34ec4553f694793a5115c481fee758ee9a3e45
-EBUILD musicbrainz-3.0.3.ebuild 679 SHA256 23d2b351ace9865abda388961a8e9f5f0b7b5c96c8d73e9f99fd47445a319a7e SHA512 78cb54caea76e3285f35489b7339365515a971084f182c9496b8c89bc864bf337f3e3c224c1f81bfa0aa55254f512aa74fb9ac299ff4b217a5e349eb17bb4d1c WHIRLPOOL b3bcd17acc5b65804f91dce576710a750b748e4cad99f3891059b353d0aa8cfc1c4128fad10f73e8f6d86cc7ab55f4d5726fd91ddaa8b5f428e32cd91f98a700
-EBUILD musicbrainz-5.1.0.ebuild 842 SHA256 7ffd38bb97f598e8324a20b3916b19eee9f9ded5606b7473332814ed88e9e6c8 SHA512 619965db03a0e242623c7ab7c8227fd2c82aed188150d04f48a60dce7672e558eddbe6777353db4dcb48c864f3a2d8e42f02f9ebc90aafa0c03566e31243bd33 WHIRLPOOL c976ea1d1b5c65a573c86bc59292e49d1622a1dc81cca2d91fe124599bca54c5917c2e2c2700127d0e76b70c76fc7b8dbb8e239cc567764040badf1529ca6e87
+EBUILD musicbrainz-3.0.3.ebuild 800 SHA256 4956e10949e4b06ceca00471d2e404e3c773c01dbd08544ff463f44e0f2da084 SHA512 c285d507c89c40e881a42bb1baf7e1910600e55573847109e04b302e44abdd317a57dbec2d45aa25db35c40b7ec6e3989677edb66ec0a4325ee23290c4b30fdf WHIRLPOOL 086fe36a0c6eb120b02dd44036e89c242afa83bc17f2f5203aba9879a0bfa4eb54fdf596c3f1492969ef7c75a4dc5de6c0f5048b97d8db2fb9d7b005679817b1
+EBUILD musicbrainz-5.1.0.ebuild 937 SHA256 98d197f1cc52e20590b62c93bdcf9dbec48abeffba601329920b601f73457392 SHA512 8ff2e396ecdedebcbadaf59db901981788f74f25bbdb1325abd79d9198f44d7278f0ca7fcdf6b427852ad80db612289f23fb03851c26ccf446b357dd93ff5688 WHIRLPOOL f6d2bbe7210cfbfc3efba25116812408cfe56ac65a19551681ece5485e34b9de7cfc3356500d21e8bd487713fa5980ca3b5a55285888fa93fa8129aff423eacb
 MISC ChangeLog 3032 SHA256 ea7eb4247e7fdf7c5abeb5812838a9e80fb57b7d0ea4c16e7e35ceb836bd8442 SHA512 a4dca398490fac8804530bd6e9241df18b60ef2c9fe77a31b8f37ee7a6f4abfceedcb9046a4f75a043cd41188b79f07eb67c42ff15a6cc1b5523d4a78d6c8357 WHIRLPOOL 85a9bec24ba8b73a166bf8a7c3e89a05039b74c6d84ecf165a50fa16eaa7efb5f38dda718b7745a6458bf57719855e4ec39680059fb775d20ebf159915b19a1b
 MISC ChangeLog-2015 15592 SHA256 cf6a52a3dcd7dde45186be2f981e51988593297775b36e451e7c098dfc2dc614 SHA512 95d4c0edc5702294ca64d7919e4fd2f14f165448ff269f1d8eab169b79f46db8bdca4ea0134f43d7eaccad72a3ea81f122768d3858245b0744c7ef76e9a24198 WHIRLPOOL 0713623dc9ce75510e9107c5a1414bcd8edf0befea4786ce586f801202dc42007368113db827041b6171501c9ca5b99be32b55f388dda712774156e680eb4973
 MISC metadata.xml 416 SHA256 a0db21d7309d1b6ee7b5a9b9455641714f6591a83531a664c20c8bd9691aee98 SHA512 c2517eaf706a3672812c02189fc33a866b4a27950010c5d1d3e957cab1097d2bb011a6958342f5a840af7b787089bfccde5e7c044873c0dd2d4247ff9b294a6b WHIRLPOOL eb36a862d479468efafffb58a48089e4a49e4e34c43075d196c845f242b826e062fa888ce83dcaf66878897ddd97481cdbec777cda22cdea92f92ab9681f92fc
diff --git a/media-libs/musicbrainz/musicbrainz-3.0.3.ebuild b/media-libs/musicbrainz/musicbrainz-3.0.3.ebuild
index f30c547810f8..5f40ac9a32c4 100644
--- a/media-libs/musicbrainz/musicbrainz-3.0.3.ebuild
+++ b/media-libs/musicbrainz/musicbrainz-3.0.3.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI=5
 
 inherit cmake-utils
 
 DESCRIPTION="Client library to access metadata of mp3/vorbis/CD media"
-HOMEPAGE="http://musicbrainz.org/"
+HOMEPAGE="https://musicbrainz.org/"
 SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/lib${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
@@ -26,3 +27,10 @@ CMAKE_IN_SOURCE_BUILD=true
 DOCS="README.txt NEWS.txt AUTHORS.txt"
 
 PATCHES=( "${FILESDIR}/${PN}-3.0.2-gcc44.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package test CppUnit)
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild b/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild
index f8f09eb468ed..2a0a69f4568b 100644
--- a/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild
+++ b/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils
 
 DESCRIPTION="Client Library for accessing the latest XML based MusicBrainz web service"
-HOMEPAGE="http://musicbrainz.org/doc/libmusicbrainz"
+HOMEPAGE="https://musicbrainz.org/doc/libmusicbrainz"
 SRC_URI="https://github.com/metabrainz/lib${PN}/releases/download/release-${PV}/lib${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
@@ -24,6 +24,11 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/lib${P}"
 
+src_prepare() {
+	use test || cmake_comment_add_subdirectory tests
+	cmake-utils_src_prepare
+}
+
 src_install() {
 	cmake-utils_src_install