From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9D24C1384AE for ; Sat, 19 Sep 2015 11:10:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DF8C621C03F; Sat, 19 Sep 2015 11:10:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 753DB21C03F for ; Sat, 19 Sep 2015 11:10:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2C3F4340DD5 for ; Sat, 19 Sep 2015 11:10:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 279F61FD for ; Sat, 19 Sep 2015 11:10:07 +0000 (UTC) From: "Aaron Bauman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Bauman" Message-ID: <1442660967.d435f2d822f07989364e2c69e820fbdd8d69a409.bman@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/gns3-gui/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/gns3-gui/Manifest net-misc/gns3-gui/gns3-gui-1.3.10.ebuild net-misc/gns3-gui/gns3-gui-1.3.2.ebuild X-VCS-Directories: net-misc/gns3-gui/ X-VCS-Committer: bman X-VCS-Committer-Name: Aaron Bauman X-VCS-Revision: d435f2d822f07989364e2c69e820fbdd8d69a409 X-VCS-Branch: master Date: Sat, 19 Sep 2015 11:10:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2818f280-7349-49d4-95be-b5f8276f890f X-Archives-Hash: fd2f81e8613db991a61c68c24ab57b8e commit: d435f2d822f07989364e2c69e820fbdd8d69a409 Author: Aaron Bauman gentoo org> AuthorDate: Sat Sep 19 11:09:27 2015 +0000 Commit: Aaron Bauman gentoo org> CommitDate: Sat Sep 19 11:09:27 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d435f2d8 rm gns3-gui-1.3.2; add gns3-gui-1.3.10 with qt4 and qt5; remove unneeded sed Package-Manager: portage-2.2.20.1 net-misc/gns3-gui/Manifest | 2 +- ...ns3-gui-1.3.2.ebuild => gns3-gui-1.3.10.ebuild} | 30 ++++++++++++++-------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest index 2a433cc..49242fa 100644 --- a/net-misc/gns3-gui/Manifest +++ b/net-misc/gns3-gui/Manifest @@ -1,2 +1,2 @@ -DIST gns3-gui-1.3.2.tar.gz 6556874 SHA256 5aafebe28ba57820288a24c3b62d52af2919b9d1ec8c8843cff3d4e0f672cce7 SHA512 ddb32e9cb77513cec027f1642755d31ec1d7ae99424f441dc6470120213b42c694993dac44a4580c537ad296d7d0d7f7013ea4c2a3b780c7f1a0404796eb6ce0 WHIRLPOOL e0ce6c12be54a52a7aa1dd3ea5c94ebbc7e77639c0bfc20667ded0b5f8127806bafe3836e287dbc4375c3139814c755fa92ae9d367f5fda06d744dc105094aab +DIST gns3-gui-1.3.10.tar.gz 6562927 SHA256 808964ae510896012e77e905cdea8824820bd59afb8a11ba9c9b1e30296811fa SHA512 aaebe3c01d2e42a11acbfabaf717148cb560523bedfb930fb4d6e8126c55e194939656a74528b135f4b79f2d936ce0331952bea02062bcdb54a8065c453c592b WHIRLPOOL de9db2478435ef573675139f60eee255199212d0b774f7be4960c66c53ef2cdf9bb132200a15ba68e4eb5b65376a3360a208e004d708933a00412f8138b6c078 DIST gns3-gui-1.3.3.tar.gz 6559207 SHA256 58d148a7a1c01ea8b9722524d0f9c2997b3f84a0baae64074e5ab65823ad717d SHA512 421470f77271a861d665429c1ffd16a9bcea595edd2e1596b5b0f40645f96cd5213c59219fbb2c74f627ba34f16535bf37d02d23dac115b994903c92452c3e98 WHIRLPOOL ccc98ebc763934283bdee45d51758661a9fea0bed62eb33750e2303b2871715890b23379169a805a4d03d4374841ecfa5c15a57197fc4fe80140391e6da395cc diff --git a/net-misc/gns3-gui/gns3-gui-1.3.2.ebuild b/net-misc/gns3-gui/gns3-gui-1.3.10.ebuild similarity index 69% rename from net-misc/gns3-gui/gns3-gui-1.3.2.ebuild rename to net-misc/gns3-gui/gns3-gui-1.3.10.ebuild index 87440e2..bc40f6f 100644 --- a/net-misc/gns3-gui/gns3-gui-1.3.2.ebuild +++ b/net-misc/gns3-gui/gns3-gui-1.3.10.ebuild @@ -15,26 +15,34 @@ SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" +IUSE="+qt4 qt5" + +REQUIRED_USE=" + ?? ( qt4 qt5 ) +" #net-misc/gns3-server version should always match gns3-gui version -RDEPEND=">=dev-python/libcloud-0.15.1[${PYTHON_USEDEP}] +RDEPEND=" + >=dev-python/libcloud-0.15.1[${PYTHON_USEDEP}] >=dev-python/ws4py-0.3.4[${PYTHON_USEDEP}] >=dev-python/requests-2.6.0[${PYTHON_USEDEP}] >=dev-python/paramiko-1.15.1[${PYTHON_USEDEP}] - >=dev-python/PyQt4-4.11.2[X,svg,${PYTHON_USEDEP}] - dev-qt/qtgui:4 - dev-qt/qtsvg:4 >=net-misc/gns3-converter-1.2.3[${PYTHON_USEDEP}] - =net-misc/gns3-server-$PV[${PYTHON_USEDEP}]" + =net-misc/gns3-server-$PV[${PYTHON_USEDEP}] + qt4? ( + dev-qt/qtgui:4[accessibility] + dev-qt/qtsvg:4 + >=dev-python/PyQt4-4.11.2[X,svg,${PYTHON_USEDEP}] + ) + qt5? ( + dev-qt/qtgui:5 + dev-qt/qtsvg:5 + dev-python/PyQt5[svg,${PYTHON_USEDEP}] + ) +" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -python_prepare_all() { - # avoid file collisions caused by required tests - sed -e "s:find_packages():find_packages(exclude=['tests','tests.*']):" -i setup.py || die - distutils-r1_python_prepare_all -} - python_install_all() { distutils-r1_python_install_all