gentoo resync : 23.03.2018

3 files changed, 55 insertions, 56 deletions

diff --git a/media-libs/libmygpo-qt/Manifest b/media-libs/libmygpo-qt/Manifest
index 6d8177786842..b628520fca46 100644
--- a/media-libs/libmygpo-qt/Manifest
+++ b/media-libs/libmygpo-qt/Manifest
@@ -1,5 +1,7 @@
 AUX libmygpo-qt-1.0.8-fix-JsonCreatorTest-failure.patch 2832 BLAKE2B 54d040461db07b12dc5d259d5521693a4af6dc1f2b55af9418f3b45ffe89024f25f4f388406804e7c1acd9980adbce8f08372fda60b4d6099c76d44bfbb1ec2d SHA512 f51a9edfa359f7bced8c70254c7200aed7688fd356159e6dc53298dc376855c7cfe47ad4ab5e809d8e748b41dccad3175e967c173f1d2ae751c7f2c3e46fce27
 DIST libmygpo-qt-1.0.9.tar.gz 65153 BLAKE2B 67ad1530eccabb7fc76f9aaec19714716ee1e55888c02a0c8ca2efb7549929c00fbe86d066c7cd310f6203db27374b70306e737b49eb254eb53b8a1aa6364f45 SHA512 c7920841310c7b971d305e38586238e081c80a449a1b442e668d2b07ada5d6ff626e697db905a83d7b12a06127f975a9b02af13d8d3e1ebee04d407b4d4b48b6
+DIST libmygpo-qt-1.0.9_p20180307.tar.gz 65245 BLAKE2B 16fe3a9659a53c907979156b14ef55a413d1ee856ea6653bc140b39342db721f10b26c3f8ee5fe6be69793f93dbea4acf11eb2589b1c9a9e9bb4e153c0d0fbd8 SHA512 a09f4f2b9f5dda0f23b15b9670c0f1fe76c8a54677633db18b2980a89e2821b494b0ab1d7f97ab973d8ea3f2e2dea49d4010dad7184800582b0dc503dece7897
 EBUILD libmygpo-qt-1.0.9.ebuild 1670 BLAKE2B 5aaaa48f08ca84400c554b499499a817b3b7c4b11c9bc97db84b969db86193abf264239c1f33d3304033e451e7c4e1e40f025e7104a3c3bb3ca1831e36b7bfa3 SHA512 6d5c206312cd2cb1bce3e9fdc92ff85a5a7429b6e186032088fc58fde15042d8ba9d6c86e2b7a6f1feda430c95da4c656899a56ad4183acf098736e7bf48af8d
-EBUILD libmygpo-qt-9999.ebuild 1602 BLAKE2B 82d51adbd75fa38eb9509a501c5f46241e27035b029a632dc3c04873fe6b998b514f9a360dec7cfb717c85a98bb79ad48be8528f4258fac161c2a12faac8b108 SHA512 a87f9eccc71fcd275c4b3d72d588d84c7378116308c808271ac0af550dc23c4466b7efd086ec9c9aa44bf6d801543abbbd89f0ded1e21fd0f76b65d7536c2f9c
+EBUILD libmygpo-qt-1.0.9_p20180307.ebuild 828 BLAKE2B 93935fa5aa5b1d80341a5e5cc6c681ac1ee6622cdaba74d6fb4c7e28b4f0ba4ff7353fc082652ba0ea1cb849e2a2b8e050b560c790798bfa36e95271c52bf710 SHA512 9797da18e9ff508b1c01d777d572ca26494b4086cf947cf155531fdd91ed0f0ef36f1696f9807e7e5a80b333073123cf0c5cf09dfe1a13552bd18a47d6f3766d
+EBUILD libmygpo-qt-9999.ebuild 763 BLAKE2B f939dd1c0f26fb2a940b83d3a709dfac0c7e6ebf25c07c56175313015a4b109333dfbe3bea6c64184a7c3488f3d6faba8c53842a044c990c2daa2dcd75403990 SHA512 3e010b8c420eb3a605f2490cfea52d30e5147abcd5601575dff993743f3a459bdba7abcbe0e5c5371f6f4905f6d7ac5c70e34b9cfff7d71b06994c08d90c9a74
 MISC metadata.xml 587 BLAKE2B 9f2a6649f96e4dd1c463e9e4f9724b24a94c8ad5a387cf1048f4b6e958fcac7c15f645a03a0fdd1ea6dcac6d80518c95820486c35ac93d1633b2eeb51bba19c4 SHA512 083072ed5b0bc3c168a30ac3cb6870580e9a2fb01c61ae1efb6f74bba857a36f606c738236fb8a7057ee2a33c7faf2c4e4ddd9bac18adf5f4205d88057f80a7d
diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.0.9_p20180307.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.0.9_p20180307.ebuild
new file mode 100644
index 000000000000..f528099bacff
--- /dev/null
+++ b/media-libs/libmygpo-qt/libmygpo-qt-1.0.9_p20180307.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=28c492b6b789ba1c3c292995a52fe4e456268182
+inherit cmake-utils vcs-snapshot
+
+DESCRIPTION="Qt/C++ library wrapping the gpodder.net webservice"
+HOMEPAGE="http://wiki.gpodder.org/wiki/Libmygpo-qt"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/gpodder/libmygpo-qt.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/gpodder/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-qt/qttest:5 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_WITH_QT4=OFF
+		-DMYGPO_BUILD_TESTS=$(usex test)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild
index 6a6e0b5b0b20..bbdf31f17c53 100644
--- a/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild
+++ b/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit cmake-utils multibuild
+
+inherit cmake-utils
 
 DESCRIPTION="Qt/C++ library wrapping the gpodder.net webservice"
 HOMEPAGE="http://wiki.gpodder.org/wiki/Libmygpo-qt"
@@ -17,66 +18,22 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="+qt4 qt5 test"
-
-REQUIRED_USE="|| ( qt4 qt5 )"
+IUSE="test"
 
 RDEPEND="
-	qt4? (
-		>=dev-libs/qjson-0.5[qt4(+)]
-		dev-qt/qtcore:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5
-	)
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	test? (
-		qt4? ( dev-qt/qttest:4 )
-		qt5? ( dev-qt/qttest:5 )
-	)
+	test? ( dev-qt/qttest:5 )
 "
 
-DOCS=( AUTHORS README )
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
-	if use qt5; then
-		ewarn "Please note that Qt5 support is still experimental."
-		ewarn "If you find anything to not work with Qt5, please report a bug."
-	fi
-}
-
 src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			-DMYGPO_BUILD_TESTS=$(usex test)
-		)
-
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-			mycmakeargs+=(-DBUILD_WITH_QT4=ON)
-		fi
-
-		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-			mycmakeargs+=(-DBUILD_WITH_QT4=OFF)
-		fi
-
-		cmake-utils_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake-utils_src_compile
-}
-
-src_test() {
-	multibuild_foreach_variant cmake-utils_src_test
-}
+	local mycmakeargs=(
+		-DBUILD_WITH_QT4=OFF
+		-DMYGPO_BUILD_TESTS=$(usex test)
+	)
 
-src_install() {
-	multibuild_foreach_variant cmake-utils_src_install
+	cmake-utils_src_configure
 }