From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- net-misc/x2goclient/Manifest | 5 -- .../files/x2goclient-4.1.2.1-gentoo-17.1.patch | 14 ---- .../files/x2goclient-4.1.2.1-qt511.patch | 20 ------ net-misc/x2goclient/x2goclient-4.1.2.1-r1.ebuild | 75 ---------------------- net-misc/x2goclient/x2goclient-4.1.2.1.ebuild | 74 --------------------- 5 files changed, 188 deletions(-) delete mode 100644 net-misc/x2goclient/files/x2goclient-4.1.2.1-gentoo-17.1.patch delete mode 100644 net-misc/x2goclient/files/x2goclient-4.1.2.1-qt511.patch delete mode 100644 net-misc/x2goclient/x2goclient-4.1.2.1-r1.ebuild delete mode 100644 net-misc/x2goclient/x2goclient-4.1.2.1.ebuild (limited to 'net-misc/x2goclient') diff --git a/net-misc/x2goclient/Manifest b/net-misc/x2goclient/Manifest index 9177aeb52bed..b600625bf020 100644 --- a/net-misc/x2goclient/Manifest +++ b/net-misc/x2goclient/Manifest @@ -1,8 +1,3 @@ -AUX x2goclient-4.1.2.1-gentoo-17.1.patch 996 BLAKE2B afc5538457142b93deb80832bbfe37352844289304ff07d2bbdb1251b082e471ddba787db5267109a594dd101e936a1552a20d75d8a7e27fc125f4c835ecc54f SHA512 a76e819aae1b8150bf219f58a29c24979bc11c6d49346c3a486d16573819d3663e93e5ef3070c9389a9d0c8c76bcdc4d904cfdf669bdd25176d0c365b2b5b502 -AUX x2goclient-4.1.2.1-qt511.patch 678 BLAKE2B d4c6de81d060d415030c7b160eaca2d72fc4c0fbcb4dc4428471069fbf6c6c1b8b918b382efd5b852cbd0accd4a2cd7c76b7b3a957a271bb46fd7b770fca74c6 SHA512 4c2571dfe286dc5e632a278c683df8ed3d5bb7107f9342ba843ac42b36d73df24a140927b0d147484c4e69668a85ccc309dd6a32627a9e0ba82493e0a9529a55 -DIST x2goclient-4.1.2.1.tar.gz 2735905 BLAKE2B 9ac70e350b0c586f76915edc187a2c6b179cb69bf28c082ef1d8122d4c32b79dd7bcb685e846a62481a4a3334eb902a3fe84aa8422099a5088559a3b548fbe20 SHA512 0dc4ef0b154c582e62d8e1c5fd0284510fd8c7ddac1d8f49638ca68244ac24f9220c9089e93a105cfa8978d1e2af9a4379deeb934d58741f51ee473ab041d369 DIST x2goclient-4.1.2.2.tar.gz 2576404 BLAKE2B 2a29f73516282af119cc4ea0a511c29156cdb71564adcdbf307f60298b87c2a7eee0ca121a3e165a63c110130c2704b49b90b3b9abc6a39b6105b1f22ac5afd0 SHA512 85e6db6a34629512be64376883c205d8bf0696c4697cf216970b57a91ffe68dcf7f38bfda0d396c104602f6991b596c5fb0934e75fa4a93f7d0e41c2b3f5ac4d -EBUILD x2goclient-4.1.2.1-r1.ebuild 1457 BLAKE2B 7d246b2e56ff6d84ddca5d1376d9c95399ebd96ac182b0f4b5969d5006a817f872d3984baf30b595bcf59a11509e330e7d4eb850ff9cc27de75352813d625ee9 SHA512 d31d2a343c5cdd006bf76102f8a9bdd9ed080f13c86ec90807024fe4216155966875d787e0df06b22b3e70db4e0c342fecebbde5c81704ae557c7dc6d0d501d0 -EBUILD x2goclient-4.1.2.1.ebuild 1419 BLAKE2B 3d5c8683105bb9f6b37e7111343891eb773b3ba1a8fd6755d0cae28ea9509852d1675be7bd67eb74cec52cca218d0cef222002763fb0ebf3486b2d919578b614 SHA512 5877bf18d4b5cb4db3c6541f754ed8a92d3f8d5b058e44eaab052b7b0ed8cf5b4ca9b9a201931a9d0cd176a40b2c37071050144d8901a090f8b397fbf1d79d94 EBUILD x2goclient-4.1.2.2.ebuild 1275 BLAKE2B 9cf9d6d7ccc697c6a52ab63ab2f519ed7ec2c2b2f3fcd8e54f9855fab786535b821dc17958a42a74a3a7d897e47e53c316336da136dc571916da64f05644b568 SHA512 1e537a1e4205b5ecf1af941758cf1b93bf45a7b9f7187e875515b7bf51d039c6b274bd4dc1b81f786aef462596dc8283d46c2350b7884b771fd529465e7fe6a1 MISC metadata.xml 307 BLAKE2B 23b74b66a93119c741def7e676af997a2442085095191b9511248b54ae1b638ab7965441881e1a45c22698068a19cebd28b898324ee5570c587428f49b964170 SHA512 c1da89b20bbe06d9193927fd9b28c1ae4b3d58fde4ef79ddc2923894b59a9ff2083b16424d6935755c734069a7f0ccd03a177884cb82c64da77aaf1835c63721 diff --git a/net-misc/x2goclient/files/x2goclient-4.1.2.1-gentoo-17.1.patch b/net-misc/x2goclient/files/x2goclient-4.1.2.1-gentoo-17.1.patch deleted file mode 100644 index b9a63264be99..000000000000 --- a/net-misc/x2goclient/files/x2goclient-4.1.2.1-gentoo-17.1.patch +++ /dev/null @@ -1,14 +0,0 @@ -X-Git-Url: https://code.x2go.org/gitweb?p=x2goclient.git;a=blobdiff_plain;f=src%2Fonmainwindow.cpp;h=cd97e6c7f28a6ab4e9495f7a9ba4b447f2b47a2f;hp=cb6bb72918cdc1d54f57cbf0b426adb03a6f4dc8;hb=567223f;hpb=fc5c93518b9023e2499a945740cd6559233ed301 - -diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp -index cb6bb72..cd97e6c 100644 ---- a/src/onmainwindow.cpp -+++ b/src/onmainwindow.cpp -@@ -10754,6 +10754,7 @@ void ONMainWindow::generateEtcFiles() - << "/usr/libexec/openssh" /* Fedora, CentOS, hopefully also RHEL */ - << "/usr/lib/ssh" /* Mageia, OpenSUSE, SLE{S,D} < 12 x86, SLE{S,D} 12, Arch */ - << "/usr/lib64/ssh" /* SLE{S,D} < 12 x86_64 */ -+ << "/usr/lib64/misc" /* Gentoo *64 with 17.1 profile - has no lib compat-symlink. */ - << "/usr/lib/misc" /* Gentoo */ - << "/run/current-system/sw/bin" /* NixOS */ - << "/usr/libexec"; /* Slackware, OS X */ diff --git a/net-misc/x2goclient/files/x2goclient-4.1.2.1-qt511.patch b/net-misc/x2goclient/files/x2goclient-4.1.2.1-qt511.patch deleted file mode 100644 index 2329813defd8..000000000000 --- a/net-misc/x2goclient/files/x2goclient-4.1.2.1-qt511.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Mihai Moldovan -Date: Thu, 5 Jul 2018 06:52:18 +0000 (+0200) -Subject: src/printwidget.cpp: add QButtonGroup include, fixes compile errors with Qt 5.11+. -X-Git-Url: https://code.x2go.org/gitweb?p=x2goclient.git;a=commitdiff_plain;h=ce14cfda34175b6456a8cc7d1e336dce2b0b0682 - -src/printwidget.cpp: add QButtonGroup include, fixes compile errors with Qt 5.11+. ---- - -diff --git a/src/printwidget.cpp b/src/printwidget.cpp -index 58a8af7..131d340 100644 ---- a/src/printwidget.cpp -+++ b/src/printwidget.cpp -@@ -23,6 +23,7 @@ - #include "x2gosettings.h" - #include "x2gologdebug.h" - #include -+#include - #ifdef Q_OS_WIN - #include "wapi.h" - #endif diff --git a/net-misc/x2goclient/x2goclient-4.1.2.1-r1.ebuild b/net-misc/x2goclient/x2goclient-4.1.2.1-r1.ebuild deleted file mode 100644 index 911efdf18aca..000000000000 --- a/net-misc/x2goclient/x2goclient-4.1.2.1-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit desktop gnome2-utils qmake-utils - -DESCRIPTION="The X2Go Qt client" -HOMEPAGE="http://www.x2go.org" -SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="ldap" - -COMMON_DEPEND="dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - >=net-libs/libssh-0.7.5-r2 - net-print/cups - x11-libs/libXpm - ldap? ( net-nds/openldap )" -DEPEND="${COMMON_DEPEND} - dev-qt/linguist-tools:5" -RDEPEND="${COMMON_DEPEND} - net-misc/nx" - -CLIENT_BUILD="${WORKDIR}"/${P}.client_build -PLUGIN_BUILD="${WORKDIR}"/${P}.plugin_build - -PATCHES=( - "${FILESDIR}/${P}-qt511.patch" - "${FILESDIR}/${P}-gentoo-17.1.patch" -) - -src_prepare() { - default - - if ! use ldap; then - sed -e "s/-lldap//" -i x2goclient.pro || die - sed -e "s/#define USELDAP//" -i src/x2goclientconfig.h || die - fi -} - -src_configure() { - eqmake5 "${S}"/x2goclient.pro -} - -src_install() { - dobin ${PN} - - local size - for size in 16 32 48 64 128 ; do - doicon -s ${size} res/img/icons/${size}x${size}/${PN}.png - done - newicon -s scalable res/img/icons/hildon/${PN}_hildon.svg ${PN}.svg - - insinto /usr/share/pixmaps - doins res/img/icons/${PN}.xpm - - domenu desktop/${PN}.desktop - doman man/man?/* -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/net-misc/x2goclient/x2goclient-4.1.2.1.ebuild b/net-misc/x2goclient/x2goclient-4.1.2.1.ebuild deleted file mode 100644 index 9912ac58712b..000000000000 --- a/net-misc/x2goclient/x2goclient-4.1.2.1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit desktop gnome2-utils qmake-utils - -DESCRIPTION="The X2Go Qt client" -HOMEPAGE="http://www.x2go.org" -SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="ldap" - -COMMON_DEPEND="dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - >=net-libs/libssh-0.7.5-r2 - net-print/cups - x11-libs/libXpm - ldap? ( net-nds/openldap )" -DEPEND="${COMMON_DEPEND} - dev-qt/linguist-tools:5" -RDEPEND="${COMMON_DEPEND} - net-misc/nx" - -CLIENT_BUILD="${WORKDIR}"/${P}.client_build -PLUGIN_BUILD="${WORKDIR}"/${P}.plugin_build - -PATCHES=( - "${FILESDIR}/${P}-qt511.patch" -) - -src_prepare() { - default - - if ! use ldap; then - sed -e "s/-lldap//" -i x2goclient.pro || die - sed -e "s/#define USELDAP//" -i src/x2goclientconfig.h || die - fi -} - -src_configure() { - eqmake5 "${S}"/x2goclient.pro -} - -src_install() { - dobin ${PN} - - local size - for size in 16 32 48 64 128 ; do - doicon -s ${size} res/img/icons/${size}x${size}/${PN}.png - done - newicon -s scalable res/img/icons/hildon/${PN}_hildon.svg ${PN}.svg - - insinto /usr/share/pixmaps - doins res/img/icons/${PN}.xpm - - domenu desktop/${PN}.desktop - doman man/man?/* -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} -- cgit v1.2.3