gentoo resync : 29.05.2018

3 files changed, 2 insertions, 127 deletions

diff --git a/dev-libs/libdbusmenu-qt/Manifest b/dev-libs/libdbusmenu-qt/Manifest
index 410479754901..004ff7d1aba2 100644
--- a/dev-libs/libdbusmenu-qt/Manifest
+++ b/dev-libs/libdbusmenu-qt/Manifest
@@ -1,4 +1,3 @@
 DIST libdbusmenu-qt_0.9.3+16.04.20160218.orig.tar.gz 46438 BLAKE2B 66b1fa44f28b5f4d5fa09afa988ca793ae892a7aeab6290b1650876a992e27a15af5a6a999080aa4c499295e2fa3de768fe5f185b5df2af36b957766508c1804 SHA512 dfaba59cedd320e6a3b5a9c0a5e13fb9e0952224e39cdd6ee3b32b03d95ac850a533e2a73835a7c0ead93b2283b9c235472bacb84e3d761ebe9e9398345314a9
-EBUILD libdbusmenu-qt-0.9.3_pre20160218-r1.ebuild 2634 BLAKE2B ca1776d57037a4345e8dd970bd45104dfe99169620d54c377d3e231a987fc0b9272eba32ec25528950c9fc062ce0352f371bfa26677a2292d50bee7a8d56517d SHA512 1b9704567cb14c5390c690ae3519731df2298b33097a6eefd11825cd72faff814bc95a9df322254199b3b896b81b57d2bc03b6713ec2fe4b44d3f38ba168aecb
-EBUILD libdbusmenu-qt-0.9.3_pre20160218-r2.ebuild 1258 BLAKE2B c4b450140e72880b26a76688f84a804b4d81bdb2af809ef680a95d0dc0f460e43293425206141d8e8d3604371e43400a2f39f113d93dcc54ba875abe9e808e05 SHA512 1e186dc4a65b26335af0bbbdce214719c47f118661182bf2c5800ddcc5909d10b92bec77bc2b8dc06ff8070175b3ebefa3d6ca57bb8136d35b6b6866e3791231
+EBUILD libdbusmenu-qt-0.9.3_pre20160218-r2.ebuild 1256 BLAKE2B dc7097ea4dbbb176a5b23aa4785f4b2c6a9afa759ab05fd751d2c37f170a54e772ea1ab61f429f1495a2ab0e39f04ade2375d45670f6a98029f3070dcdaf1e80 SHA512 f3e6d70dfe14ffd3f5188c60bd224a1b3614353181b878e034374a55c38adbf294b60ad8b0376ed12784628c978b395255925157967be7bd7779a68b1a45ec3e
 MISC metadata.xml 323 BLAKE2B 02dce303163a2303c73bb15ae09358e93077a751333d7204c2372ed7cf7667137ea4d633250b39ee5ee032316433cddedca5b80ec01ff8300d8ac221793bddbe SHA512 290f7befe52993609acc464791369b56b20c1584e4266166073d504dd0ea66a2e2f6f786fcc56e1928125b37dd3f7461ab29b00e17e012ef2ea6c34321f643ba
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r1.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r1.ebuild
deleted file mode 100644
index c3d493104e5a..000000000000
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EBZR_REPO_URI="lp:libdbusmenu-qt"
-
-[[ ${PV} == 9999* ]] && inherit bzr
-inherit cmake-multilib multibuild virtualx
-
-DESCRIPTION="Library providing Qt implementation of DBusMenu specification"
-HOMEPAGE="https://launchpad.net/libdbusmenu-qt/"
-if [[ ${PV} != 9999* ]] ; then
-	MY_PV=${PV/_pre/+16.04.}
-	SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${MY_PV}.orig.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug qt4"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	qt4? (
-		>=dev-qt/qtcore-4.8.6:4[${MULTILIB_USEDEP}]
-		>=dev-qt/qtdbus-4.8.6:4[${MULTILIB_USEDEP}]
-		>=dev-qt/qtgui-4.8.6:4[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-qt/qttest:5
-		qt4? ( >=dev-qt/qttest-4.8.6:4[${MULTILIB_USEDEP}] )
-	)
-"
-
-[[ ${PV} == 9999* ]] || S=${WORKDIR}/${PN}-${MY_PV}
-
-DOCS=( NEWS README )
-
-# tests fail due to missing connection to dbus
-RESTRICT="test"
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usex qt4 4) 5 )
-}
-
-src_prepare() {
-	[[ ${PV} == 9999* ]] && bzr_src_prepare
-	cmake-utils_src_prepare
-
-	cmake_comment_add_subdirectory tools
-	use test || cmake_comment_add_subdirectory tests
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DWITH_DOC=OFF
-		-DUSE_QT${QT_MULTIBUILD_VARIANT}=ON
-		-DQT_QMAKE_EXECUTABLE="/usr/$(get_libdir)/qt${QT_MULTIBUILD_VARIANT}/bin/qmake"
-	)
-	cmake-utils_src_configure
-}
-
-src_configure() {
-	myconfigure() {
-		local QT_MULTIBUILD_VARIANT=${MULTIBUILD_VARIANT}
-		if [[ ${MULTIBUILD_VARIANT} = 4 ]] ; then
-			cmake-multilib_src_configure
-		elif [[ ${MULTIBUILD_VARIANT} = 5 ]] ; then
-			multilib_src_configure
-		fi
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	mycompile() {
-		if [[ ${MULTIBUILD_VARIANT} = 4 ]] ; then
-			cmake-multilib_src_compile
-		elif [[ ${MULTIBUILD_VARIANT} = 5 ]] ; then
-			cmake-utils_src_compile
-		fi
-	}
-
-	multibuild_foreach_variant mycompile
-}
-
-src_install() {
-	myinstall() {
-		if [[ ${MULTIBUILD_VARIANT} = 4 ]] ; then
-			cmake-multilib_src_install
-		elif [[ ${MULTIBUILD_VARIANT} = 5 ]] ; then
-			cmake-utils_src_install
-		fi
-	}
-
-	multibuild_foreach_variant myinstall
-}
-
-src_test() {
-	mytest() {
-		if [[ ${MULTIBUILD_VARIANT} = 4 ]] ; then
-			cmake-multilib_src_test
-		elif [[ ${MULTIBUILD_VARIANT} = 5 ]] ; then
-			multilib_src_test
-		fi
-	}
-
-	multibuild_foreach_variant mytest
-}
-
-multilib_src_test() {
-	local builddir=${BUILD_DIR}
-
-	BUILD_DIR=${BUILD_DIR}/tests virtx cmake-utils_src_test
-
-	BUILD_DIR=${builddir}
-}
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r2.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r2.ebuild
index 96ef62ac05b9..32db4c0a9192 100644
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r2.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://launchpad.net/libdbusmenu-qt/"
 if [[ ${PV} != 9999* ]] ; then
 	MY_PV=${PV/_pre/+16.04.}
 	SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${MY_PV}.orig.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2"