[gentoo-commits] repo/gentoo:master commit in: x11-misc/x2vnc/

[gentoo-commits] repo/gentoo:master commit in: x11-misc/x2vnc/

[Ionen Wolkens]

commit:     1177cfffdde505fe933b012b4504e1bcac5b8967
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 29 03:00:49 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Sep 29 04:17:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1177cfff

x11-misc/x2vnc: EAPI7->8, use https, add some missing deps

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 ...x2vnc-1.7.2-r1.ebuild => x2vnc-1.7.2-r2.ebuild} | 24 ++++++++++++++--------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild b/x11-misc/x2vnc/x2vnc-1.7.2-r2.ebuild
similarity index 54%
rename from x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild
rename to x11-misc/x2vnc/x2vnc-1.7.2-r2.ebuild
index b9d93cf24e77..f148da4c7b74 100644
--- a/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild
+++ b/x11-misc/x2vnc/x2vnc-1.7.2-r2.ebuild
@@ -1,27 +1,33 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Control a remote computer running VNC from X"
-HOMEPAGE="http://fredrik.hubbe.net/x2vnc.html"
-SRC_URI="http://fredrik.hubbe.net/${PN}/${P}.tar.gz"
+HOMEPAGE="https://fredrik.hubbe.net/x2vnc.html"
+SRC_URI="https://fredrik.hubbe.net/x2vnc/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ppc sparc x86"
 IUSE="tk"
 
-RDEPEND="x11-libs/libX11
+COMMON_DEPEND="
+	x11-libs/libX11
 	x11-libs/libXScrnSaver
 	x11-libs/libXext
-	x11-libs/libXinerama"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXxf86dga"
+RDEPEND="
+	${COMMON_DEPEND}
 	tk? ( dev-tcltk/expect )"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto"
 
 PATCHES=(
-	"${FILESDIR}/expectk.patch"
+	"${FILESDIR}"/expectk.patch
 )
 
 src_install() {

[gentoo-commits] repo/gentoo:master commit in: x11-misc/x2vnc/

[Ionen Wolkens]

commit:     d016d93c66f07b621c71eb32342c2042ea9bf84d
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 08:26:45 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 08:56:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d016d93c

x11-misc/x2vnc: pass -std=gnu89

Does not build with `clang -std=c2x`, early workaround for
when this will become a default.

(not actively hunting for these, merely revisiting packages
previously looked at for clang16 even if not an issue "yet").

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 x11-misc/x2vnc/x2vnc-1.7.2-r2.ebuild | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/x11-misc/x2vnc/x2vnc-1.7.2-r2.ebuild b/x11-misc/x2vnc/x2vnc-1.7.2-r2.ebuild
index 03384930c47f..610ab7161a8d 100644
--- a/x11-misc/x2vnc/x2vnc-1.7.2-r2.ebuild
+++ b/x11-misc/x2vnc/x2vnc-1.7.2-r2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit flag-o-matic
+
 DESCRIPTION="Control a remote computer running VNC from X"
 HOMEPAGE="https://fredrik.hubbe.net/x2vnc.html"
 SRC_URI="https://fredrik.hubbe.net/x2vnc/${P}.tar.gz"
@@ -31,6 +33,12 @@ PATCHES=(
 	"${FILESDIR}"/${P}-clang16.patch
 )
 
+src_configure() {
+	append-cflags -std=gnu89 # old codebase, incompatible with c2x
+
+	default
+}
+
 src_install() {
 	dodir /usr/share /usr/bin
 	emake DESTDIR="${D}" install