gentoo resync : 22.10.2018

3 files changed, 3 insertions, 48 deletions

diff --git a/lxqt-base/liblxqt/Manifest b/lxqt-base/liblxqt/Manifest
index 31f73ecf8e5c..ad1cc1b18bc9 100644
--- a/lxqt-base/liblxqt/Manifest
+++ b/lxqt-base/liblxqt/Manifest
@@ -1,5 +1,3 @@
-DIST liblxqt-0.11.0.tar.xz 58912 BLAKE2B 1ee7064f3fe9de78890761744655c8d11834439535d64b07fec9709db955d9e70b574dbe437d1f1afa65bf7b008cb1473b99c1eda19840efa4bfae3d43fb13ab SHA512 df2aaba0c0b723975c65a063ef3c6564a60d1ac8662da443e1ff9030b1dd61bc264916e5efac272895048f7219a5cb5413e98aa12c5340b547413ad686f2c9ed
 DIST liblxqt-0.13.0.tar.xz 56896 BLAKE2B aa642fc87991c1768e391908e6444af456cca073223e4f05a2ff95eb7a04a4ab5d4c7d217424ab8d096531095d2dc767be7341b8336410ab46ce6d2e8676c686 SHA512 17d6ab8aa7475e1d2ca90b9c3d8b0a438003f740fa878b09937e0214f0139b6f69eb833e7179e981260ae67079fd70c19423d1a4948a2a18061539fb2191e9ad
-EBUILD liblxqt-0.11.0-r1.ebuild 997 BLAKE2B f0e1ba8faa0354dbffd1c8577e80d1902a260b714095066ae53e2087355747ffcaf08f2e5bd230a2dc296c6db584a1475e7287a75fbf0ee28ca2fc98c2fabd8d SHA512 331143949494e13b548ffcf1b128f719625666811fca9da25e300be8af87775f8d7b692eb08cf2c210c617dffe1eb193aa94d4b922f17e8180ac9f56d7ba9f2a
-EBUILD liblxqt-0.13.0.ebuild 930 BLAKE2B e100262408987d2498883841590f41bd11a319cb7e3e8708d074dd52368eabc71ebae6d526ff286dbade711646e3f62c44f905f9d5d64b04c16dbc2c0ef4cdfe SHA512 8c260a3fcf34efb711d7cc96e5daadf120e635c497a1fb9a29b246c9d74e08b14ee87f67f410928521b5e8b602cd9e6e62c08237ae85cf65417341c8925684ea
+EBUILD liblxqt-0.13.0.ebuild 925 BLAKE2B ce9867b032d01218b81c8e9286abffccc44e53806afe300faf52ebc68878bb05aa9c3ca25889793890381f15f5f0a53119e8b30c24b5f609e3073719583998d8 SHA512 42ecef791fc97efcb6a849f9f775deb4422e1f82cab9120105c7f1cfe3cc2e2b03c8e6b8dfd12a24921f6160efc063e41ac5e14b09fc1514d40e3b2621e00fa4
 MISC metadata.xml 313 BLAKE2B 6eee2dbe392f7cd8b5f033d718e5ef3c4d07b788a09d99d97f06ff7571153366bf9367bec44b18d8c096c9afbd8be76776623b0fcc78bc2507422e78ab197405 SHA512 e3a460c17c69d21bb39bc75a79f36154afdd3b38abe18bac568afb28b5739ffc2ffe5d33607037ae32b7d6925512eebf560562b3e157dcf1e882d3bd9deaff54
diff --git a/lxqt-base/liblxqt/liblxqt-0.11.0-r1.ebuild b/lxqt-base/liblxqt/liblxqt-0.11.0-r1.ebuild
deleted file mode 100644
index 1f4a33b9f2e7..000000000000
--- a/lxqt-base/liblxqt/liblxqt-0.11.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-DESCRIPTION="Common base library for the LXQt desktop environment"
-HOMEPAGE="https://lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="GPL-2 LGPL-2.1+"
-SLOT="0"
-
-RDEPEND=">=dev-libs/libqtxdg-1.3.0
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	kde-frameworks/kwindowsystem:5[X]
-	x11-libs/libXScrnSaver"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		tc-is-gcc && [[ $(gcc-version) < 4.8 ]] && \
-		die 'The active compiler needs to be gcc 4.8 (or newer)'
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=( -DPULL_TRANSLATIONS=OFF )
-	cmake-utils_src_configure
-}
diff --git a/lxqt-base/liblxqt/liblxqt-0.13.0.ebuild b/lxqt-base/liblxqt/liblxqt-0.13.0.ebuild
index b1974c20be93..bddb1fc02b98 100644
--- a/lxqt-base/liblxqt/liblxqt-0.13.0.ebuild
+++ b/lxqt-base/liblxqt/liblxqt-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+ BSD"