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

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EE88A22

diff --git a/net-misc/gns3-gui/ChangeLog b/net-misc/gns3-gui/ChangeLog
index b370f2886c075fd2e8f8674ed902acdecd533632..d8028378e9da80cb89f7840ce0a7f3f2393e0f39 100644 (file)
--- 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/Manifest b/net-misc/gns3-gui/Manifest
index b8fa033567c11ba03daf34d4a4bc2a8e23ac1f2d..cac18a51dee07b6e1f10b1f7ba906aea2e37337e 100644 (file)
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -1,26 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST gns3-gui-1.2.3.tar.gz 6554089 SHA256 5d84ec343380abd9da1ef1bfa168be56ff75fb32b5a2e4119ad919ce774fe8d0 SHA512 e7ded40da1d9964b004819038082cbf7f27c6a5878963831c53b85e66b3cdc5b77c7931fd6046866a4b0d4a94f50b754f0536422fba05ee3ea607a17911c1b46 WHIRLPOOL 30bf33b17a2ba437c15467a9cc5392c270d02270f260ad9362a8fcb211cf98c150fbe8e7bff452422c57ee7d6c710f54a5fb9e56b1c4746ec433d93c009101a4
-DIST gns3-gui-1.3.0.tar.gz 6558377 SHA256 12c8d6d535a902eba83a60a46646f89c9c6e4dbb14d4953f1867392d64a766b6 SHA512 9302df1e0913fb885f36d03e436f4bb222f86656b92b67d82692e1179b901a1a139259c063fdb44297ea96218c9f350c947b75b992ded6e959bc58cfa66a3229 WHIRLPOOL 1739fd2fbf71dd2cbb8e45ce1632eae4148d2999d73114c2607b90ad321126c223097eb7727fa3a038e48527d9c290942aace4ec60eadc91c57812095c4185e7
-EBUILD gns3-gui-1.2.3.ebuild 1469 SHA256 7285e02e18940a5907033a6e4d43741ba36ad53eedb62247351fbcc6f75d4e36 SHA512 84599245178945a34fc701697aff3bf73300dbd7def845fb1ac1c64c273852cc86a0df25b38da1dbb660d22a1fd3ff33571733f38a3195e10b52873a932c93db WHIRLPOOL 555712bbbf163912abd477818a21f4c89508dc2c3beb77b0c04600beb0d14060bd1e1dfaafd62228422faa9115e8e1326ae7ddcece9f39b8fa96813f064226ef
-EBUILD gns3-gui-1.3.0.ebuild 1466 SHA256 6e033312837b389a9b2c92fbfbe22da6f7b60f62528d4776d9b8e53de2653cf2 SHA512 afb527425f4ff0bd62c9097ff04c5aa4b47ffa43e00faa50a2b5c91cf3b6aceb84b025b263ebc0a96136bc08587d217258f4dacd450e63e2fb16a9d61bbfc741 WHIRLPOOL 1da27cd398ff19266dcc689262f735df031f50d33adfaed5e498133a1b28a8fffc3db75cc21e8998f9e7686d21a7c05dcd041d6e1249bcff180a9da3587e47a1
-MISC ChangeLog 994 SHA256 33f691732ca9b041123e7a68595e20a965acb7f898b9966edafcfe22e95e5254 SHA512 0e8784435a88c02a20f3712e4259f3e149e044a56124563c9739d3d8c74b8300b4c0525e580b26f38f75d6acf9aa0d16f0cab984c60628c83eb88a919fbd348e WHIRLPOOL 32400d58a6f34968a80d51639c8b6ba938e93b0c46ca69b3248d7c082cc19b6e08d5b131c5431fefff52baf9d31a54e5f3480d381224c7918b0fecd640a98d4a
+DIST gns3-gui-1.3.1.tar.gz 6557896 SHA256 e699eacfccb29eda52a77e5240faf5528d510a1a753c719fb678bf6fbd342dfc SHA512 40b5ce6c08144f2dbf76fa52daba9a629cabb125194544731be8894c72b00dc88561305b95339684d8adb796a4a3e9f2f58c04f2dda57d9117d2df2405961f65 WHIRLPOOL a7e4537ba3635deaef4fdac32927fccfc1f3445d494c5905adf0bc990fda9a729bdc97fa72fe2eb4d56a4979b38645ca886e0df2362ea84ebece7604ae4c3089
+EBUILD gns3-gui-1.3.1.ebuild 1417 SHA256 c365cd26b564ee2435ca77d0a3340a49c6aafd02002e63a641712b3176883460 SHA512 13f9761813855ee8d5792e77f80d9b2f7497f97404b342bfb8e05446be348d873dae89a39a44ffa2fa622114a92f6fc5acc2853b86b4693adeeca130d143aa40 WHIRLPOOL 0ea30d357ffe74eae488a9b1e627f518a47fa1b2e2bc9bd19025f2479e56843288a324d283979e87f81731650e694629c05676382e5bf0621af6c85a04a02ab8
+MISC ChangeLog 1234 SHA256 068bce028df2de88bf01f0ce84a8b956c90b0ed25fcebab35c8e8a33e29b2526 SHA512 3e6905f7562ea35cc50d442bbef8179de0ece64586957489d81ed91b09b2e937140a7ffc821f26d7029c605901c6bd423192fb7f2ed1d0bf1666f4b9a618da70 WHIRLPOOL bfd659cc8caee62b89e65ef725ad8ff0ea010c3b256df517a7fb2c643c8779b37035f34409943ee00ff38d91d8f2679606fe1ef904a00465c85bb83b3bc3ab33
 MISC metadata.xml 229 SHA256 0e32bd4374eb7ddef5d9d3feb500bfd626eae6f88edfe43ac3847e65dde78281 SHA512 8a66f8c117584e3d9b891c2813466691397dbd50388956981eabf86c7720a15b57bc4584f704211faef0044500106802d3ef1bed1592145cf3f8b5259279a43f WHIRLPOOL dfa20fb61d9b2ebb6e4e35f24bfb2e584706440d30fef2e82c463f5ef75df66d5ba809f0126f95c908a59627c59ec1971f015e5d281efe121061b7b09137c883
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVIleKAAoJENXWzZRV2HNsTZcP/Az0wQPCIP3EpE+DlRtcF4ZU
-5/6Gvek7gedAi2t+DxTEOnN/rxYqG3nPWAJHDOzqF/u0mPO9GSwqz0apeqsgcxP6
-TqM172VzWmNPNbrKdSFkg+fb7E/if+Ut87bdm/WSZBVg0RViZbyU0WNWY1Q4zFAW
-ABcj495Dg+rz7UaARYoIHl6JXc2ULqGAVyuTt2pzT25cEzitmMeDrCRqJhvgRsjS
-ynpv3TH/4ViiCX8+HruHxXZAZihYDN6mmL3JNJaALqX7z+C41orwIabdF8b9DLLb
-bXodl8WYWqX5wNWt/iVqvw1zjVQmflMb1HdiyQdTRhgjYfuo64Yj8t8K2n8ymESI
-DdPT6foSHTdZEFStnBPhPqdrZr5m4EfTijq9BHQnXwbe7l9j75DcdDzl/KxIPBSD
-tae2NaY+ptsteo9Zt4HsQpy2AeMMzwqxjAVrYJkDuhYoQuemxGdtcFXMnHsbcSli
-/9LUddlyKWsPY84B5+Dr+0nE9ZmfsaHfFaP+ZitsxodBWnhW3jRUJBV5LrtfHhrm
-LzoVU7FM6yjjD82Ai3ZxDV88ggusEl1QjKQRsgcpiTRoJkBbS6w7pVM3AwMF6mx7
-lBykhhdrWQqlROqK+VJtb8DF26aZ+VrK0xnIf/iaVvBJwymp8ACVZ8CXQ//Sk/9L
-FPdPGuUMhwX7658kIepL
-=Swj7
+iQIcBAEBCAAGBQJVMfujAAoJENXWzZRV2HNse5MP/1uewheeL2TNfvB4rxL5vpvZ
+7cJ0bKsR5rJvG7iDOUVbQCuN2lzhmYsO4XD+dm2D/q7p53MsAWQAGh9xwmjPmh9B
+Qj8MqvIhSNacjFt7ESTjIJEQk00QM3Mw0PYCpE5IqfI3ktQfH6NWzHukORjTptqn
+QUuHkpI3CY3T6MaC3EKmqgTkRT5HWe7vUVkyGcCHpS+IypcmUvmQ+PJw3fAFNSfp
+3eYJeoUI9YxZ9ms1FHo1afDpWzohKa5+EHEVekz0vZhQvZhJCKb1/gdepJui4Wgl
+s0m96WChcBtERDYvf+6Vv1Cd/UnC+yeUyVm1/80cLpRemCE4n+lytTVsazfQJ9+K
+hZqT9lhhaFUC7+0ZwhZNjLjLG+anmEFbBhKBhE/16bWBTwGW3yZIgXjiWff+C/rV
+AL34Rq4M2d4rxBfxiPf9n16aEIJR0Y8sMx3rat/8UpPui1ZNSSCHe9V+UGCTkY/L
+S1QTdWQ8NmxmxUtzxSJM7vZC6jwG0adXQe5HS+P7kbDpdhxVTX0at9E4i2iYNFCU
+QBvTk3pzDBoicmdI114npXsZ+X0akSG/qC4HSh1UjuIDfHAtf1lSfDAtcVW9X2ZF
+c1u6TCOgkQJFKzJx9qDO6vKHbAWVXJeCZw8c0dHWCmm8j5zckC4EoqtsVMat4ZtP
+JQoiSupwD74yHsxcGzyA
+=M3Cp
 -----END PGP SIGNATURE-----

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 (file)
index a4e925c..0000000
--- 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
similarity index 89%
rename from net-misc/gns3-gui/gns3-gui-1.3.0.ebuild
rename to net-misc/gns3-gui/gns3-gui-1.3.1.ebuild
index 5e31828d024f630639e92829dd79d1d967700b0c..172e1116ebf6ab87de11322f11cdb3db473ffd88 100644 (file)
--- 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}]"