[gentoo-commits] repo/gentoo:master commit in: net-misc/x2goclient/

["Bernard Cafarelli" <voyageur@gentoo.org>]

commit:     b1b30bab30e8906e070704c73bc2fe734720ea55
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 22 10:03:44 2018 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 10:03:44 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1b30bab

net-misc/x2goclient: drop versions with qt4 support, #631892

Keeping 4.1.0.1-r1 for now for Polynomial-C (it is qt5-only)

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-misc/x2goclient/Manifest                     |   1 -
 net-misc/x2goclient/x2goclient-4.1.0.0-r1.ebuild | 104 -----------------------
 net-misc/x2goclient/x2goclient-4.1.0.1.ebuild    | 104 -----------------------
 3 files changed, 209 deletions(-)

diff --git a/net-misc/x2goclient/Manifest b/net-misc/x2goclient/Manifest
index 2968925e7dc..8cc4d6e2098 100644
--- a/net-misc/x2goclient/Manifest
+++ b/net-misc/x2goclient/Manifest
@@ -1,3 +1,2 @@
-DIST x2goclient-4.1.0.0.tar.gz 1889861 BLAKE2B 1b5c452168e65540827ad4503ffecfd5a825cc74a1443f3c3f5f362d93c37b00c35fca6c60847d8c3f72793d7fc70d75114becadfe5f26f12cfd754b1fe9b1e6 SHA512 cb7023b0b9de6d83ee8206bc0a36be0306cea19a3a8fc081ffe704691ae8744848bc3c329b3bf475e838b93c2ee4b9c96af20fae34e6d4822fcf7feb9c3cf6d0
 DIST x2goclient-4.1.0.1.tar.gz 1891484 BLAKE2B af9ccff0ae313c42a13089e0e1b154d8204cc626b2cb5dfbd1f0016bd7099592d2f29ff8d540a2e1d64552359e90ed024c9790bce551e38e5826bfff5b2ee408 SHA512 6cbfb70fb7f522f0a5557ab36b6e15b6cae9ad184bd1d51b6c2f2acfa7b22d8fd9344bbfee141f2d5bd71f5adf9d3bd6d2c7db7b774cd8f8af5bcd25144de98d
 DIST x2goclient-4.1.1.0.tar.gz 2745227 BLAKE2B 3cd33a828a890189fa92790388abf34c95eeb33d0c5019a014b1ba893a739011886462f62b2ce74cf57c8229acf573db778defec7e0097f5c0d6ea1e35361699 SHA512 c9763ab4b1ce4065ee1512dae2fcaf5b23dd515dc64fd8bb11d033aca1a026a4bf0d06a0fab38576e98627490dc459973716689e8c9aa7c47fb6c68124405e30

diff --git a/net-misc/x2goclient/x2goclient-4.1.0.0-r1.ebuild b/net-misc/x2goclient/x2goclient-4.1.0.0-r1.ebuild
deleted file mode 100644
index b206b35fed5..00000000000
--- a/net-misc/x2goclient/x2goclient-4.1.0.0-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit nsplugins 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 nsplugin qt5"
-
-REQUIRED_USE="nsplugin? ( !qt5 )"
-
-DEPEND=">=net-libs/libssh-0.6.0_rc1
-	net-print/cups
-	x11-libs/libXpm
-	ldap? ( net-nds/openldap )
-	!qt5? (
-		dev-qt/qtcore:4[ssl]
-		dev-qt/qtgui:4
-		dev-qt/qtsvg:4
-	)
-	qt5? (
-		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
-	)
-"
-RDEPEND="${DEPEND}
-	net-misc/nx"
-
-CLIENT_BUILD="${WORKDIR}"/${P}.client_build
-PLUGIN_BUILD="${WORKDIR}"/${P}.plugin_build
-
-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
-
-	mkdir -p "${CLIENT_BUILD}" || die
-	if use nsplugin; then
-		mkdir -p "${PLUGIN_BUILD}" || die
-	fi
-}
-
-src_configure() {
-	cd "${CLIENT_BUILD}" || die
-
-	if use qt5; then
-		eqmake5 "${S}"/x2goclient.pro
-	else
-		eqmake4 "${S}"/x2goclient.pro
-	fi
-
-	if use nsplugin; then
-		cd "${PLUGIN_BUILD}" || die
-		X2GO_CLIENT_TARGET=plugin eqmake4 "${S}"/x2goclient.pro
-	fi
-}
-
-src_compile() {
-	cd "${CLIENT_BUILD}" || die
-	emake
-
-	if use nsplugin; then
-		cd "${PLUGIN_BUILD}" || die
-		emake
-	fi
-}
-
-src_install() {
-	dobin "${CLIENT_BUILD}"/${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?/*
-
-	if use nsplugin; then
-		# PLUGINS_DIR comes from nsplugins.eclass
-		exeinto /usr/$(get_libdir)/${PLUGINS_DIR}
-		doexe "${PLUGIN_BUILD}"/libx2goplugin.so
-	fi
-
-	emake DESTDIR="${D}" PREFIX=/usr install_pluginprovider
-}

diff --git a/net-misc/x2goclient/x2goclient-4.1.0.1.ebuild b/net-misc/x2goclient/x2goclient-4.1.0.1.ebuild
deleted file mode 100644
index 4774046e76f..00000000000
--- a/net-misc/x2goclient/x2goclient-4.1.0.1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit nsplugins 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 nsplugin qt5"
-
-REQUIRED_USE="nsplugin? ( !qt5 )"
-
-DEPEND=">=net-libs/libssh-0.6.0_rc1
-	net-print/cups
-	x11-libs/libXpm
-	ldap? ( net-nds/openldap )
-	!qt5? (
-		dev-qt/qtcore:4[ssl]
-		dev-qt/qtgui:4
-		dev-qt/qtsvg:4
-	)
-	qt5? (
-		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
-	)
-"
-RDEPEND="${DEPEND}
-	net-misc/nx"
-
-CLIENT_BUILD="${WORKDIR}"/${P}.client_build
-PLUGIN_BUILD="${WORKDIR}"/${P}.plugin_build
-
-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
-
-	mkdir -p "${CLIENT_BUILD}" || die
-	if use nsplugin; then
-		mkdir -p "${PLUGIN_BUILD}" || die
-	fi
-}
-
-src_configure() {
-	cd "${CLIENT_BUILD}" || die
-
-	if use qt5; then
-		eqmake5 "${S}"/x2goclient.pro
-	else
-		eqmake4 "${S}"/x2goclient.pro
-	fi
-
-	if use nsplugin; then
-		cd "${PLUGIN_BUILD}" || die
-		X2GO_CLIENT_TARGET=plugin eqmake4 "${S}"/x2goclient.pro
-	fi
-}
-
-src_compile() {
-	cd "${CLIENT_BUILD}" || die
-	emake
-
-	if use nsplugin; then
-		cd "${PLUGIN_BUILD}" || die
-		emake
-	fi
-}
-
-src_install() {
-	dobin "${CLIENT_BUILD}"/${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?/*
-
-	if use nsplugin; then
-		# PLUGINS_DIR comes from nsplugins.eclass
-		exeinto /usr/$(get_libdir)/${PLUGINS_DIR}
-		doexe "${PLUGIN_BUILD}"/libx2goplugin.so
-	fi
-
-	emake DESTDIR="${D}" PREFIX=/usr install_pluginprovider
-}