gentoo resync : 25.08.2020

4 files changed, 11 insertions, 85 deletions

diff --git a/x11-misc/projecteur/Manifest b/x11-misc/projecteur/Manifest
index 6c033e3ef455..8036a01a6697 100644
--- a/x11-misc/projecteur/Manifest
+++ b/x11-misc/projecteur/Manifest
@@ -1,6 +1,3 @@
-AUX projecteur-0.7-fix-git-detection.patch 1740 BLAKE2B 18087fca44642910cc7b16902d10f295b55e00965d1104a5a293728d2ef5514cd2da0f0e1535662ce5385c604111d6b8ba56835b28a5e11811d59c51a76c0ff7 SHA512 f45928c0787e107c49364d2a9bf207f39f55f16278888baee5335a50ec6ec98e7c49f4734da65cf729482396b2d4297acdcef72ee101ac4113f0870bb9357918
-DIST projecteur-0.7.tar.gz 296252 BLAKE2B fb20de48ee5f89e66701fc8d6cad036aed48ed862994b82431a8a14f3ec95dccb863c4c35a5de01c932150b3b311511ef01af093ddbcd23a2413ebb882152bab SHA512 9af54e47883cd3d9368edef173b9c0eb522f947f7d72f759388e2ecdf275524bdf56d3562506a383bba32c0fd2ec5c76c232a7b523e13b79caeb4d6d76bbbac0
 DIST projecteur-0.8.tar.gz 379203 BLAKE2B b2171bd6120c9f6245c129519e33adbb4661ea4cd0df5f30c6c90fbefb8b7c5024da5c6d920d4e162b818bc0fc6417731dcf0c540103ed6f12976123c45c69eb SHA512 e892e87f442cfa7f0102efa01b43e63ed7ea9c30c875496dd3d683ee769de66f0a4ccfae149f060924e5613dfd7758a0b19d565232fb6db75b9228cee4a956de
-EBUILD projecteur-0.7-r2.ebuild 855 BLAKE2B 4cf9f3ff4809e03d5aeab30f10c96dc20c134eb1e5c81baa075583f01d0b62a669a385501f107d606825865f5cac38963b8f3033aaf77ddbd3937d3a0f08c6a1 SHA512 f5a8e094d1e181a3437f41b1f1b9a9028667c2e7d7d5dfe1fc2ebb923c810fe9a675b7b94c947cb9d477a14721994cd873d0a0828cdece8f1793bf4b86165335
-EBUILD projecteur-0.8.ebuild 805 BLAKE2B 1ba5091382d294db067f0e4eb6c8e728d29a4d885e6db4d4ccd9aab31dbec9844edded5d0a4beadcb7c219b441a27aae52fd876a79bbfc33c0cbc720d44bd82a SHA512 4cd17f53e08c7caf60ae5a82d3f669dc4c52e8d20caf69b9ab16954ad071de646dc71c5911ff5a799561d8b0f2decb2f4049a3fc5aaa2b8654e79e64188dd0e5
+EBUILD projecteur-0.8.ebuild 948 BLAKE2B e30b164914ed71a6cc887ce83281be0d6e948e2be9e95f5ca5c0862ef32ce101cc610c41ba61a55288b4264bfb380170c301b456275b84c113757ba0cf17be54 SHA512 8da018f746920cc16b9fdf2fe8c0bc4e2b4738107f4665dc109a37b09ad6037b7c1e365b343db4d1e3cf23f2f742773acf712e478c8ae5bb6e45a392ae3cf8d4
 MISC metadata.xml 612 BLAKE2B 84ebf5cc3be489a0f7483e81b43dcee7067ec325a8a6c58f2350107921d0844bc7d084d7a35cddc95296c2f1046c4e098fed2b8748f0834df90c152dcd70e91e SHA512 d51be761cc4f93a47230bb63685fb367d7b0846b048733d192c6e36e9ac87f49cfcc28631ab4980dbc50213a9bbe23d3b0db665c5257e1e0e79804d9752e822c
diff --git a/x11-misc/projecteur/files/projecteur-0.7-fix-git-detection.patch b/x11-misc/projecteur/files/projecteur-0.7-fix-git-detection.patch
deleted file mode 100644
index 841005968123..000000000000
--- a/x11-misc/projecteur/files/projecteur-0.7-fix-git-detection.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 259be1617f1b0b92e53440d95fa88aa4bf3fe25b Mon Sep 17 00:00:00 2001
-From: Jahn <jahnf@users.noreply.github.com>
-Date: Sun, 10 May 2020 19:34:19 +0200
-Subject: [PATCH] Make sure version_distance is always valid, fixes build with
- not git available. #73
-
----
- cmake/modules/GitVersion.cmake | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/modules/GitVersion.cmake b/cmake/modules/GitVersion.cmake
-index 1cbbd09..fcb77bc 100644
---- a/cmake/modules/GitVersion.cmake
-+++ b/cmake/modules/GitVersion.cmake
-@@ -282,6 +282,7 @@ function(get_version_info prefix directory)
-   set(${prefix}_VERSION_MAJOR ${${prefix}_VERSION_MAJOR} PARENT_SCOPE)
-   set(${prefix}_VERSION_MINOR ${${prefix}_VERSION_MINOR} PARENT_SCOPE)
-   set(${prefix}_VERSION_PATCH ${${prefix}_VERSION_PATCH} PARENT_SCOPE)
-+  set(${prefix}_VERSION_DISTANCE ${${prefix}_VERSION_DISTANCE} PARENT_SCOPE)
- 
-   # Build version string...
-   set(VERSION_STRING "${${prefix}_VERSION_MAJOR}.${${prefix}_VERSION_MINOR}")
-@@ -412,8 +413,8 @@ function(add_version_info_custom_prefix target prefix directory)
- 
-   get_target_property(type ${target} TYPE)
-   if(type STREQUAL "SHARED_LIBRARY")
--     set_target_properties(${target} PROPERTIES SOVERSION "${VERSION_MAJOR}.${VERSION_MINOR}")
--     set_property(TARGET ${target} PROPERTY VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
-+    set_target_properties(${target} PROPERTIES SOVERSION "${VERSION_MAJOR}.${VERSION_MINOR}")
-+    set_property(TARGET ${target} PROPERTY VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
-   endif()
-   set_property(TARGET ${target} APPEND PROPERTY SOURCES ${output_files})
-   target_include_directories(${target} PUBLIC $<BUILD_INTERFACE:${output_dir}>)
diff --git a/x11-misc/projecteur/projecteur-0.7-r2.ebuild b/x11-misc/projecteur/projecteur-0.7-r2.ebuild
deleted file mode 100644
index 26072768e67e..000000000000
--- a/x11-misc/projecteur/projecteur-0.7-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/p/P}"
-
-inherit cmake udev xdg-utils
-
-DESCRIPTION="Linux Desktop Application for the Logitech Spotlight device"
-HOMEPAGE="https://github.com/jahnf/Projecteur"
-SRC_URI="https://github.com/jahnf/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	|| (
-		dev-qt/qtgui:5[X(-)]
-		dev-qt/qtgui:5[xcb(-)]
-	)
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	virtual/udev
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES="${FILESDIR}/${P}-fix-git-detection.patch"
-
-pkg_postinst() {
-	udev_reload
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	udev_reload
-	xdg_icon_cache_update
-}
diff --git a/x11-misc/projecteur/projecteur-0.8.ebuild b/x11-misc/projecteur/projecteur-0.8.ebuild
index d727e882f0f2..d6bb721d5dbd 100644
--- a/x11-misc/projecteur/projecteur-0.8.ebuild
+++ b/x11-misc/projecteur/projecteur-0.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jahnf/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
@@ -34,6 +34,15 @@ DEPEND="${RDEPEND}"
 
 BDEPEND="virtual/pkgconfig"
 
+src_prepare() {
+	default
+
+	cmake_src_prepare
+
+	# Don't treat all warnings as errors
+	sed -e '/add_compile_options/d' -i CMakeLists.txt || die
+}
+
 pkg_postinst() {
 	udev_reload
 	xdg_icon_cache_update