rm old; add gns3-gui-1.3.1; remove PyQt4 blocker; update gns3-converter requirement

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 8EE88A22)

3 files changed, 10 insertions, 50 deletions

diff --git a/net-misc/gns3-gui/ChangeLog b/net-misc/gns3-gui/ChangeLog
index b370f2886c07..d8028378e9da 100644
--- a/net-misc/gns3-gui/ChangeLog
+++ b/net-misc/gns3-gui/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/gns3-gui
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gns3-gui/ChangeLog,v 1.5 2015/04/06 09:53:13 bman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gns3-gui/ChangeLog,v 1.6 2015/04/18 06:37:22 bman Exp $
+
+*gns3-gui-1.3.1 (18 Apr 2015)
+
+  18 Apr 2015; Aaron Bauman <bman@gentoo.org> +gns3-gui-1.3.1.ebuild,
+  -gns3-gui-1.2.3.ebuild, -gns3-gui-1.3.0.ebuild:
+  rm old; add gns3-gui-1.3.1; remove PyQt4 blocker; update gns3-converter
+  requirement
 
 *gns3-gui-1.3.0 (06 Apr 2015)
 
diff --git a/net-misc/gns3-gui/gns3-gui-1.2.3.ebuild b/net-misc/gns3-gui/gns3-gui-1.2.3.ebuild
deleted file mode 100644
index a4e925ce7872..000000000000
--- a/net-misc/gns3-gui/gns3-gui-1.2.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gns3-gui/gns3-gui-1.2.3.ebuild,v 1.1 2015/02/26 06:57:43 bman Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Graphical Network Simulator"
-HOMEPAGE="http://www.gns3.net/"
-SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-#net-misc/gns3-server version should always match gns3-gui version
-#block net-misc/gns3 as it conflicts
-
-RDEPEND=">=dev-python/libcloud-0.15.1[${PYTHON_USEDEP}]
-	>=dev-python/ws4py-0.3.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
-	!=dev-python/PyQt4-4.11.3_pre20141024[${PYTHON_USEDEP}]
-	>=dev-python/PyQt4-4.11.2[X,svg,${PYTHON_USEDEP}]
-	dev-qt/qtgui:4
-	dev-qt/qtsvg:4
-	net-misc/gns3-converter[${PYTHON_USEDEP}]
-	=net-misc/gns3-server-$PV[${PYTHON_USEDEP}]
-	!!net-misc/gns3"
-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
-
-	doicon "${WORKDIR}/${P}/resources/images/gns3.ico"
-	make_desktop_entry "gns3" "GNS3" "/usr/share/pixmaps/gns3.ico" "Utility"
-}
diff --git a/net-misc/gns3-gui/gns3-gui-1.3.0.ebuild b/net-misc/gns3-gui/gns3-gui-1.3.1.ebuild
index 5e31828d024f..172e1116ebf6 100644
--- a/net-misc/gns3-gui/gns3-gui-1.3.0.ebuild
+++ b/net-misc/gns3-gui/gns3-gui-1.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gns3-gui/gns3-gui-1.3.0.ebuild,v 1.1 2015/04/06 09:53:13 bman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gns3-gui/gns3-gui-1.3.1.ebuild,v 1.1 2015/04/18 06:37:22 bman Exp $
 
 EAPI=5
 
@@ -23,11 +23,10 @@ RDEPEND=">=dev-python/libcloud-0.15.1[${PYTHON_USEDEP}]
 	>=dev-python/ws4py-0.3.4[${PYTHON_USEDEP}]
 	=dev-python/requests-2.4.3[${PYTHON_USEDEP}]
 	>=dev-python/paramiko-1.15.1[${PYTHON_USEDEP}]
-	!=dev-python/PyQt4-4.11.3_pre20141024[${PYTHON_USEDEP}]
 	>=dev-python/PyQt4-4.11.2[X,svg,${PYTHON_USEDEP}]
 	dev-qt/qtgui:4
 	dev-qt/qtsvg:4
-	net-misc/gns3-converter[${PYTHON_USEDEP}]
+	>=net-misc/gns3-converter-1.2.3[${PYTHON_USEDEP}]
 	=net-misc/gns3-server-$PV[${PYTHON_USEDEP}]
 	!!net-misc/gns3"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"