gentoo resync : 25.08.2020

2 files changed, 46 insertions, 0 deletions

diff --git a/net-misc/grdesktop/Manifest b/net-misc/grdesktop/Manifest
index 7e6356645c69..8c97667fedee 100644
--- a/net-misc/grdesktop/Manifest
+++ b/net-misc/grdesktop/Manifest
@@ -1,5 +1,7 @@
 AUX grdesktop-0.23-desktop.patch 538 BLAKE2B 70bc1fc74c7c9b298e844bd499a04a062ec8c511dca75acfc17914faaad6431573d0ae1897c72ee0e3018a174a5ecab8bed1ebef3d84c6279c7d87afdbb5280c SHA512 c228120c40f1c1afa18b120c6804e5bb824256fd5515bdcd05b7fb4a8c964cf8ef6d2a7902645640b5133b513bc9612b2484cce7413af5663d0e16c7e65122fd
 AUX grdesktop-0.23-format-security.patch 856 BLAKE2B e5f8c03ce0b7639d0662295d8260888d18af4062750aa5ce73ee13c0fb9b77ea61e3287a11f1b5d00bf1c3a654d84fa7e6bd820c81c09dc00c4fecce08d305fc SHA512 7754a958a45648cf1194e0840ab22de3025a3eaf0001670c3abe6b5ea0852caa9d27fd9f7db0b4c43a8c93a462a8f297b1c89007755486c9cef9eff26cca6590
+DIST grdesktop-0.23-patchset.tar.xz 17912 BLAKE2B 0252f3c7fa1779df05d1f7d4315e18e4cce5d4acf69e2a914805d072de25730206bf906b9fe767b777fdfde701ce033563f96087bdc2d85d11271b835947f029 SHA512 0327a17b48ff0f5eb8ab88c683f91deec612cf202cabcde3f150b4be5b19afb612a83ff9dcb965b29899a35c214a7334603263b42c0d2605b48209018845b04b
 DIST grdesktop-0.23.tar.gz 299914 BLAKE2B 0a00c721c8d962dd1ad885f4d85130486b3ad9973d21817068f4147ade03d59a2d13dd5e5b26376a0415120521e283a20d79627b62a8bcca15fb2f0213c05bc4 SHA512 a0993d7589d0b22b26535de0cf562604c89ce580fede076c15d8d7f2e7a3bd2fd5ec0a35c6a8ec07fcc8f53a0635381fefe9c2e67d9ff75cec7af47cdd25732f
 EBUILD grdesktop-0.23-r1.ebuild 950 BLAKE2B 7f142f234235a9c5063e26c882d64dac69a9914b2a0fa72f52162e7b8fc5f2ce6bf70a3bd838a395e5debc7e5be678e272f8fa4f066ebdde402d702bf939dcf9 SHA512 1377d544d03f32707e11a9c6a72cf40865151edd727b189b922770fce3ffe87b6e31fec03110c48f1f60fcc5b4292c5e2f240d910a29b11494d0e50b41c5a310
+EBUILD grdesktop-0.23-r2.ebuild 1084 BLAKE2B 0d755a7bd5fb9e44b65b6d56612eb6bd637cd96e3ab92a8419429867450ed9bfb50b461d54db9d87f00993b24954d658a98b67ee850d2cdc919cd34a81894fb1 SHA512 9a8f58b10af6b201de0bf0d7e454e9c16a806ad182694216bcaef6500a70533f261db6d20692ff9f684da3a0e47d60a9c973f167f6a2649af177f06bfa492bab
 MISC metadata.xml 429 BLAKE2B 117737367d74f70cbd717e361f2179150a8c9d3a156338464d5c6388ec226adf568fa3866e46937dc83465d0afa55caf2ac5b2c2806227892c60eb936728c284 SHA512 359d469647e065e6b771ce02442ce3789d8e67708679d07b5a3d0cb5fc76a5bd16af0483b37d3a5c593d1660d1e58d4ecc97cbe0c26659cfc6a3b6e7ce863a7d
diff --git a/net-misc/grdesktop/grdesktop-0.23-r2.ebuild b/net-misc/grdesktop/grdesktop-0.23-r2.ebuild
new file mode 100644
index 000000000000..640c10447e95
--- /dev/null
+++ b/net-misc/grdesktop/grdesktop-0.23-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_EAUTORECONF="yes"
+inherit gnome2
+
+DESCRIPTION="Gtk3 frontend for rdesktop"
+HOMEPAGE="http://www.nongnu.org/grdesktop/"
+SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=x11-libs/gtk+-3.21.4:3
+	net-misc/rdesktop
+"
+DEPEND="${RDEPEND}
+	app-text/rarian
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Patches from debian:
+	# Correct icon path. See bug #50295.
+	# Fix compilation with format-security, bug #517662
+	# gsettings, gtk3 port, gcc10 compat, etc
+	"${WORKDIR}"/grdesktop-0.23+d040330-7
+)
+
+src_prepare() {
+	gnome2_src_prepare
+	# Fix desktop file validation after debian patchset (it removes Action line, but not the action itself - remove that here)
+	sed -e '/Desktop Action Full/,+1d' -i grdesktop.desktop
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--with-keymap-path=/usr/share/rdesktop/keymaps/
+}