commit: e469dc10b9d9159bebb0edc995711981a7054938
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 19 08:46:50 2017 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Tue Sep 19 10:08:22 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e469dc10
net-misc/x2goclient: drop old
Package-Manager: Portage-2.3.8, Repoman-2.3.3
net-misc/x2goclient/Manifest | 4 -
.../files/x2goclient-4.0.5.2-r1-rcc_to_qrc.patch | 23 -----
net-misc/x2goclient/x2goclient-4.0.4.0.ebuild | 78 ---------------
net-misc/x2goclient/x2goclient-4.0.5.0.ebuild | 78 ---------------
net-misc/x2goclient/x2goclient-4.0.5.1.ebuild | 80 ----------------
net-misc/x2goclient/x2goclient-4.0.5.2-r1.ebuild | 105 ---------------------
net-misc/x2goclient/x2goclient-4.1.0.0.ebuild | 98 -------------------
7 files changed, 466 deletions(-)
diff --git a/net-misc/x2goclient/Manifest b/net-misc/x2goclient/Manifest
index 8653f94ef92..dcc27172d22 100644
--- a/net-misc/x2goclient/Manifest
+++ b/net-misc/x2goclient/Manifest
@@ -1,6 +1,2 @@
DIST x2goclient-4.0.3.2.tar.gz 1560536 SHA256
f65a70463eae3d6d9fe6e4379f4ffacda50080a11f196d2792742f5b67fa0c6f SHA512
e390948360cb93db553b157b8146c0222f10a070a7b3f699a0e3be94bba0498b6fc6c0e064b6ecf753afc25a7447e5162f44305688fc2e68423a5530d73f0431
WHIRLPOOL
3d0b6aec77a8096541e810bf0a70d73caf63f34121d6931f5d3c2a721c4cd8b70e0eef1c902decc6733feb9a1cb09d3146baf4429532a60a013d0c36727059f7
-DIST x2goclient-4.0.4.0.tar.gz 1571218 SHA256
86d05ce10039fe0a965cdc55086e00f4f3abc573a96f128b92f87081b7251657 SHA512
53c12e31e9cddc732f1d85f963103c99d3e051946f56b6eef861cb450a5ac69b7d09aceb2a1cb4ff8af949d56abe0c00dff649a1980e21ffbc6980a1a1f87e14
WHIRLPOOL
69bc539e2dd8b4953d3e15417f583d47a4aa6419e207fc6fda666de6b8cf695b85871c3e9995bcfd8cc930bc4b2334d08b1a905a77d5cc97377abde01cbed8bb
-DIST x2goclient-4.0.5.0.tar.gz 1577271 SHA256
242e91720c1e5830f64a632c111ac3c4b6f6690d5005454c8e025b00bfbe42a1 SHA512
4fd3ca6061a4a86d04a699e41b17a546b0ed31e784ff357749d56a8015b60e86d1205580e6e57347a64c6ce47eaa47f054a783c6c90fd6716912333c7858309a
WHIRLPOOL
72125958ade3baebdc272621834980ca07290adb16ab3a2129325d7d7ad7692061d5a24c1d48bbcda1c6b925a84bcf97dc30386910d533c0c4ac2db11d0f239f
-DIST x2goclient-4.0.5.1.tar.gz 1657361 SHA256
844e983fbbddfe8a626506e4140b1ad65591e14f794c735412402bee3163ed11 SHA512
29bfd3a1c678b4b36536bfe90ee66007d38fb69d9ef2e4421bc72dd697832e879af5765297a56e18ed05c6fcc1b960115865adb51d838c4e5b083cd9355563b8
WHIRLPOOL
f1b1e5e560a7b5684f373180d243e1cc54ca94ce927b987fb5653049fb610e34d4285efeafa57186decc8216058213eff3110ba1e9de96e42d36bb0764ae4e61
-DIST x2goclient-4.0.5.2.tar.gz 1666082 SHA256
0d0adfd5c03cef42367a5894948ee804ae13ffb7ed30a608e7c54351addd1530 SHA512
d1d9eecc17bfeb5067bca32f3fbbe14bcfde8d10f44a3d91cd32edc797371547b9b22adfbcff1f5b33c4869b6d1427424c052cb18e4c91e7905ba22ed2c69c29
WHIRLPOOL
d56c9ad8a4e0375f76f4c20f90803c6369f18ada3003fe9d9acde95d7076274fc0e092f88de03a9af95a72039f4951d5f2d36e04b679f432e16bf48f83225319
DIST x2goclient-4.1.0.0.tar.gz 1889861 SHA256
4b5915bc3666228910342810a34f7a03fb6967c6b9c796633d9cdf8b89cc2b6a SHA512
cb7023b0b9de6d83ee8206bc0a36be0306cea19a3a8fc081ffe704691ae8744848bc3c329b3bf475e838b93c2ee4b9c96af20fae34e6d4822fcf7feb9c3cf6d0
WHIRLPOOL
c2f3de5f164ae6794f439c8b59e72782f54ca802ee7ce5f3f52e0cd79625b372d61e8f5d8a6b2127fa3520545922150fc761a1874640ad1e3fbf7b5066ce3ade
diff --git a/net-misc/x2goclient/files/x2goclient-4.0.5.2-r1-rcc_to_qrc.patch
b/net-misc/x2goclient/files/x2goclient-4.0.5.2-r1-rcc_to_qrc.patch
deleted file mode 100644
index 724c176eebb..00000000000
--- a/net-misc/x2goclient/files/x2goclient-4.0.5.2-r1-rcc_to_qrc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur x2goclient-4.0.5.2.orig/x2goclient.pro
x2goclient-4.0.5.2/x2goclient.pro
---- x2goclient-4.0.5.2.orig/x2goclient.pro 2016-09-19 06:17:44.000000000
+0200
-+++ x2goclient-4.0.5.2/x2goclient.pro 2016-09-28 22:03:41.830790244 +0200
-@@ -167,16 +167,16 @@
- TEMPLATE = app
- DEPENDPATH += .
- INCLUDEPATH += src
--RESOURCES += res/resources.rcc
-+RESOURCES += res/resources.qrc
-
- exists(res/txt/git-info) {
- message("Configuring with --git-info")
-- RESOURCES += res/git.rcc
-+ RESOURCES += res/git.qrc
- }
-
- exists(res/txt/changelog) {
- message("Configuring with --changelog")
-- RESOURCES += res/changelog.rcc
-+ RESOURCES += res/changelog.qrc
- }
-
- linux-g++ {
diff --git a/net-misc/x2goclient/x2goclient-4.0.4.0.ebuild
b/net-misc/x2goclient/x2goclient-4.0.4.0.ebuild
deleted file mode 100644
index 04f8d852f08..00000000000
--- a/net-misc/x2goclient/x2goclient-4.0.4.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils nsplugins qt4-r2
-
-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"
-
-DEPEND=">=net-libs/libssh-0.6.0_rc1
- net-print/cups
- dev-qt/qtcore:4[ssl]
- dev-qt/qtgui:4
- dev-qt/qtsvg:4
- x11-libs/libXpm
- ldap? ( net-nds/openldap )"
-RDEPEND="${DEPEND}
- net-misc/nx"
-
-CLIENT_BUILD=${WORKDIR}/${P}.client_build
-PLUGIN_BUILD=${WORKDIR}/${P}.plugin_build
-
-src_prepare() {
- 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}"
- use nsplugin && mkdir -p "${PLUGIN_BUILD}"
-}
-
-src_configure() {
- cd "${CLIENT_BUILD}"
- eqmake4 "${S}"/x2goclient.pro
-
- if use nsplugin;
- then
- cd "${PLUGIN_BUILD}"
- X2GO_CLIENT_TARGET=plugin eqmake4 "${S}"/x2goclient.pro
- fi
-}
-
-src_compile() {
- cd "${CLIENT_BUILD}"
- qt4-r2_src_compile
-
- if use nsplugin;
- then
- cd "${PLUGIN_BUILD}"
- qt4-r2_src_compile
- fi
-}
-
-src_install() {
- dobin "${CLIENT_BUILD}"/${PN}
-
- insinto /usr/share/pixmaps/x2goclient
- 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.0.5.0.ebuild
b/net-misc/x2goclient/x2goclient-4.0.5.0.ebuild
deleted file mode 100644
index 04f8d852f08..00000000000
--- a/net-misc/x2goclient/x2goclient-4.0.5.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils nsplugins qt4-r2
-
-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"
-
-DEPEND=">=net-libs/libssh-0.6.0_rc1
- net-print/cups
- dev-qt/qtcore:4[ssl]
- dev-qt/qtgui:4
- dev-qt/qtsvg:4
- x11-libs/libXpm
- ldap? ( net-nds/openldap )"
-RDEPEND="${DEPEND}
- net-misc/nx"
-
-CLIENT_BUILD=${WORKDIR}/${P}.client_build
-PLUGIN_BUILD=${WORKDIR}/${P}.plugin_build
-
-src_prepare() {
- 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}"
- use nsplugin && mkdir -p "${PLUGIN_BUILD}"
-}
-
-src_configure() {
- cd "${CLIENT_BUILD}"
- eqmake4 "${S}"/x2goclient.pro
-
- if use nsplugin;
- then
- cd "${PLUGIN_BUILD}"
- X2GO_CLIENT_TARGET=plugin eqmake4 "${S}"/x2goclient.pro
- fi
-}
-
-src_compile() {
- cd "${CLIENT_BUILD}"
- qt4-r2_src_compile
-
- if use nsplugin;
- then
- cd "${PLUGIN_BUILD}"
- qt4-r2_src_compile
- fi
-}
-
-src_install() {
- dobin "${CLIENT_BUILD}"/${PN}
-
- insinto /usr/share/pixmaps/x2goclient
- 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.0.5.1.ebuild
b/net-misc/x2goclient/x2goclient-4.0.5.1.ebuild
deleted file mode 100644
index 59d34c73922..00000000000
--- a/net-misc/x2goclient/x2goclient-4.0.5.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils 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"
-
-DEPEND=">=net-libs/libssh-0.6.0_rc1
- net-print/cups
- dev-qt/qtcore:4[ssl]
- dev-qt/qtgui:4
- dev-qt/qtsvg:4
- x11-libs/libXpm
- ldap? ( net-nds/openldap )"
-RDEPEND="${DEPEND}
- net-misc/nx"
-
-CLIENT_BUILD=${WORKDIR}/${P}.client_build
-PLUGIN_BUILD=${WORKDIR}/${P}.plugin_build
-
-src_prepare() {
- 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}"
- use nsplugin && mkdir -p "${PLUGIN_BUILD}"
-
- default
-}
-
-src_configure() {
- cd "${CLIENT_BUILD}"
- eqmake4 "${S}"/x2goclient.pro
-
- if use nsplugin;
- then
- cd "${PLUGIN_BUILD}"
- X2GO_CLIENT_TARGET=plugin eqmake4 "${S}"/x2goclient.pro
- fi
-}
-
-src_compile() {
- cd "${CLIENT_BUILD}"
- emake
-
- if use nsplugin;
- then
- cd "${PLUGIN_BUILD}"
- emake
- fi
-}
-
-src_install() {
- dobin "${CLIENT_BUILD}"/${PN}
-
- insinto /usr/share/pixmaps/x2goclient
- 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.0.5.2-r1.ebuild
b/net-misc/x2goclient/x2goclient-4.0.5.2-r1.ebuild
deleted file mode 100644
index b21559cb22e..00000000000
--- a/net-misc/x2goclient/x2goclient-4.0.5.2-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2016 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
-
-PATCHES=( "${FILESDIR}"/${P}-r1-rcc_to_qrc.patch )
-
-src_prepare() {
- default
-
- local f
- for f in res/*rcc; do
- mv ${f} ${f/rcc/qrc} || die
- done
-
- 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}
-
- insinto /usr/share/pixmaps/x2goclient
- 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.0.ebuild
b/net-misc/x2goclient/x2goclient-4.1.0.0.ebuild
deleted file mode 100644
index d0e4817fc3a..00000000000
--- a/net-misc/x2goclient/x2goclient-4.1.0.0.ebuild
+++ /dev/null
@@ -1,98 +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}
-
- insinto /usr/share/pixmaps/x2goclient
- 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
-}
