gentoo resync : 05.12.2021

4 files changed, 37 insertions, 16 deletions

diff --git a/x11-misc/slop/Manifest b/x11-misc/slop/Manifest
index 31191f3272d4..97e9c7a548a6 100644
--- a/x11-misc/slop/Manifest
+++ b/x11-misc/slop/Manifest
@@ -1,4 +1,6 @@
+AUX slop-7.5-missing-header.patch 498 BLAKE2B 62838afbf9c9cf35958481ed5635e0f623849669127c0851500900c7073384a909a24c75bea4ab002a8fa48357312814b2b1c1f2794a9c6c51499e1c8d417b51 SHA512 7d5068e076df464e8d3b773fd803f9d7f14b55d02ea0570fb7cc1ae6e439f3b5b46af40ada24eaf7c063f6bdeb27b5cd15e10de47c909a641506d2b46dce0a98
 DIST slop-7.5.tar.gz 51060 BLAKE2B 8d0fcf932181dfc482be7c54cf5a08605a32c85bcd8b27223a4cd8a08323382e802a7f20faa6c51fe67583b1d320cf783c7b5cc8b871e534ea11a32b827e1f45 SHA512 c02e40c5b924841996617fcc9629a6a739a04b6128c18e1eb06dc285d2f8026d847e67077fb59a111fc45c112f871a6e5faef20108c3d777271e1d4aca7f4737
-EBUILD slop-7.5.ebuild 807 BLAKE2B 18ea2e61c88e0c52794edbc33456338bf832e960535aecb2e13095655efef51bbdc11d5a75a803d79b781dc67ece636289d99ba07503c94a932086589a8bcb5e SHA512 21cd3380e7e902468d0ce67c7992064bb342c57bc0c16c9a44a53c25c7636cd7bb474512043bc12f1dae5c547da9eb669af3dfb926362aef3e38de44835424ad
-EBUILD slop-9999.ebuild 808 BLAKE2B 98fbd3f0b5395b71b11c07a235aa3358a3723a346876dbc88487335b1ed74e552e6ca15bf55d01d54f47b275ada783e3177a359d542b4c74ec03b24a4a9f4e6e SHA512 92c9f8c8920abfc9e321cbdbe4788cc35a470bac8e83fc3f278e2eb63faf05896d07fb6d1f5a323455597c0c15bad731828aa240764e9805526f05dd27dce6b2
+DIST slop-7.6.tar.gz 198605 BLAKE2B fcf8b0e1212f50044aa3e3a15d208ee3fda9e1883b9601beba6b29ad574555db83f382547bbe064570765e1ed1e7c0c92bf891edadf89f006bfdf10a5b469c66 SHA512 d1abc50cad124cfb11e9b57c38c824efb2ece3dffce8e54e451ce4adc4a7ad441c6171b7df5d1c8dfa66c875a12cf07b206ba3b87229c0e5f2ddf744d7922fc3
+EBUILD slop-7.5.ebuild 861 BLAKE2B e4b47809c04314f9c99e2636099b34874c089783120409752ce5ffe2d383c9cdaabef20d2c02cc9d87e004c1222a62064afbf0cab78ba0e83083900671d9d471 SHA512 f0fd7489c0ef69d1c9afa9111c267f92f568f86b718170b00e51a31a0d7803e7d5daa9fb05c5e698c2ba98b8a1ccdbbe1a003675f6d8265169be6df4acb38af7
+EBUILD slop-7.6.ebuild 798 BLAKE2B 5a2bc91334126000e1ddb980c2b03bef1c716597ae57dd72e134aa758aaef981239b9755901db687f397bc72b5676c93d611406f84e9cdfa7658b231439ee30d SHA512 98df1229014ac6b45e85ea7ef43053786cab2a0acd82406494f20f000a64e2242718b1dd39f70510faa9fbbe711144f2da50b885124c6943b0786f5627369e87
 MISC metadata.xml 631 BLAKE2B 7403b40eabfa7265fc4b0243e294e73c795666282db6c1d3b1b734db3faf4482a9ad1105056c06cd4d4c07ea8c1d253950d5afdc88b44b821b21267dde89490f SHA512 2367318653e7c34ab2e8943b4c548e3f7be3787c49d87b027cae51c95a29ef7c2f272ff95b9a9ba92aaf4e4e8121a6f06ef7f73b0921e2394ee6cfec6287edd4
diff --git a/x11-misc/slop/files/slop-7.5-missing-header.patch b/x11-misc/slop/files/slop-7.5-missing-header.patch
new file mode 100644
index 000000000000..f77fe8f9cf88
--- /dev/null
+++ b/x11-misc/slop/files/slop-7.5-missing-header.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/810349
+
+https://github.com/naelstrof/slop/commit/5cbcb9e
+From: Drunkard Zhang <gongfan193@gmail.com>
+Date: Tue, 28 Sep 2021 12:20:25 +0800
+Subject: [PATCH] bugfix: add missed header
+
+XDestroyImage is included in <X11/Xutil.h> which belongs to libX11.
+Build fails without include this header on Gentoo.
+--- a/src/framebuffer.cpp
++++ b/src/framebuffer.cpp
+@@ -1,3 +1,4 @@
++#include <X11/Xutil.h>
+ #include "framebuffer.hpp"
+ 
+ slop::Framebuffer::Framebuffer( int w, int h ) {
diff --git a/x11-misc/slop/slop-7.5.ebuild b/x11-misc/slop/slop-7.5.ebuild
index e3d08d39be3c..2a2d4fd07ad8 100644
--- a/x11-misc/slop/slop-7.5.ebuild
+++ b/x11-misc/slop/slop-7.5.ebuild
@@ -35,6 +35,10 @@ DEPEND="${RDEPEND}
 	media-libs/glm
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-missing-header.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DSLOP_OPENGL=$(usex opengl)
diff --git a/x11-misc/slop/slop-9999.ebuild b/x11-misc/slop/slop-7.6.ebuild
index a9c376b256ec..849d37f0f0aa 100644
--- a/x11-misc/slop/slop-9999.ebuild
+++ b/x11-misc/slop/slop-7.6.ebuild
@@ -1,20 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
 DESCRIPTION="Application that queries the user for a selection for printing"
 HOMEPAGE="https://github.com/naelstrof/slop"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/naelstrof/slop.git"
-else
-	SRC_URI="https://github.com/naelstrof/slop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
+SRC_URI="https://github.com/naelstrof/slop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
@@ -31,13 +25,18 @@ RDEPEND="
 		x11-libs/libXrender:=
 	)
 "
-DEPEND="${RDEPEND}
+BDEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+DEPEND="
+	${RDEPEND}
 	media-libs/glm
 "
 
+PATCHES=( "${FILESDIR}/${PN}"-7.5-missing-header.patch )
+
 src_configure() {
-	local mycmakeargs=(
-		-DSLOP_OPENGL=$(usex opengl)
-	)
+	local mycmakeargs=( -DSLOP_OPENGL=$(usex opengl) )
 	cmake_src_configure
 }