version bump; rm old; rm sed call as upstream fixed setup.py

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

3 files changed, 25 insertions, 27 deletions

diff --git a/net-misc/gns3-gui/ChangeLog b/net-misc/gns3-gui/ChangeLog
index 912fd3f21030..fa74f847026c 100644
--- a/net-misc/gns3-gui/ChangeLog
+++ b/net-misc/gns3-gui/ChangeLog
@@ -1,6 +1,12 @@
 # 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.9 2015/05/10 10:29:33 bman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gns3-gui/ChangeLog,v 1.10 2015/05/20 11:13:50 bman Exp $
+
+*gns3-gui-1.3.3 (20 May 2015)
+
+  20 May 2015;  <aaron@gentoo.org> +gns3-gui-1.3.3.ebuild,
+  -gns3-gui-1.3.1-r1.ebuild:
+  version bump; rm old; rm sed call as upstream fixed setup.py
 
 *gns3-gui-1.3.2 (10 May 2015)
 
diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
index e2e9b7ceb1f2..1e43ca63538f 100644
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST gns3-gui-1.3.1.tar.gz 6557896 SHA256 e699eacfccb29eda52a77e5240faf5528d510a1a753c719fb678bf6fbd342dfc SHA512 40b5ce6c08144f2dbf76fa52daba9a629cabb125194544731be8894c72b00dc88561305b95339684d8adb796a4a3e9f2f58c04f2dda57d9117d2df2405961f65 WHIRLPOOL a7e4537ba3635deaef4fdac32927fccfc1f3445d494c5905adf0bc990fda9a729bdc97fa72fe2eb4d56a4979b38645ca886e0df2362ea84ebece7604ae4c3089
 DIST gns3-gui-1.3.2.tar.gz 6556874 SHA256 5aafebe28ba57820288a24c3b62d52af2919b9d1ec8c8843cff3d4e0f672cce7 SHA512 ddb32e9cb77513cec027f1642755d31ec1d7ae99424f441dc6470120213b42c694993dac44a4580c537ad296d7d0d7f7013ea4c2a3b780c7f1a0404796eb6ce0 WHIRLPOOL e0ce6c12be54a52a7aa1dd3ea5c94ebbc7e77639c0bfc20667ded0b5f8127806bafe3836e287dbc4375c3139814c755fa92ae9d367f5fda06d744dc105094aab
-EBUILD gns3-gui-1.3.1-r1.ebuild 1465 SHA256 a05123649a292baa2fe8a69800f17649490d37bbb760af660db6c1012fc5db45 SHA512 20916856930779a4507eb647874874e131408ce20649cd17356fb279d32284defd864dd978bb0951051ea2dc330c674311a2b47ef962597ea5ee1806a2526bd4 WHIRLPOOL d955437e4b1d68e6cd42dda9b8ab884e835182373dc37bfbeafa9df30d7cfd1b3cfb2aed96948999d8dece847932b51a44089d771facf4009727ffe40e237864
+DIST gns3-gui-1.3.3.tar.gz 6559207 SHA256 58d148a7a1c01ea8b9722524d0f9c2997b3f84a0baae64074e5ab65823ad717d SHA512 421470f77271a861d665429c1ffd16a9bcea595edd2e1596b5b0f40645f96cd5213c59219fbb2c74f627ba34f16535bf37d02d23dac115b994903c92452c3e98 WHIRLPOOL ccc98ebc763934283bdee45d51758661a9fea0bed62eb33750e2303b2871715890b23379169a805a4d03d4374841ecfa5c15a57197fc4fe80140391e6da395cc
 EBUILD gns3-gui-1.3.2.ebuild 1364 SHA256 69757b41d19d582ca91ca1d1efcb19b43370bd4ce07c8b8539283f92721ff7dd SHA512 470a2aa45cdc7c725bf4fcf8e5a5a48970fe63627c57c8b673c790004d732d85bbe6d5bbd104a63b04770d7a603f9e94ddd200a84c0e3b9015e9917c98e77839 WHIRLPOOL 9e1b8f27278a9c41b72674776bb17e3e73b2af254e49812fb240a813a97e4f38c6eefa6574a8d25614fd0cdff0aad46f133612cd1b265c26a2f568bc1fcc8fb4
-MISC ChangeLog 1850 SHA256 340e6716eb2035226c1a2349b4fe3c172409ea11eb021164bf8692ac9e106143 SHA512 c79d6a8ede2b894ffb52d462382143e890f552069a8e0c15e241e063cd484bc45b4877fd98bdccc3f7192f5f917500bcda221bca8b6771fd99dbfe0b52446b0d WHIRLPOOL de1dc789960ecdd776dcf6cb42d3b0a881661d1d264cf47c710eef235d18412909b3234f07589a5ff0844e8c8fd71526763f6ea8e0e4e801262efd4f2721214e
+EBUILD gns3-gui-1.3.3.ebuild 1208 SHA256 2c9eb06146a03c2344ecd099f0da4d7d147a4c40b9f19dc7074f576d9ee40112 SHA512 feadb6c7f02a1981844b734cd8fc46fd79db2e28f46c70ecd71969a96823af7eb24999977b2ec28e9594eebb9bd4aa8f4f0027e5b939c971b42bbac87d415d41 WHIRLPOOL f09ca811522e57e1939d4f77e75c7705e9229e6be97dbf61a662c59839f332a1fed41f4181537b9a82e38429407993f304009dea56e56302134a1296a49092a1
+MISC ChangeLog 2034 SHA256 d011044acae838fa36220890e3e0c443e0c9cca46ff7276afacc458ccaf9ca5b SHA512 0940c7caac70bb815b75cdd09ad069ba31e949cc6533d652e708bce7343b970fb9d5e97c9c2338dc6d031eab2c9024257e32b0d1e8017e5e94014b9cbc188d7e WHIRLPOOL ba87271014843f996fbc5e23ec389c38c580f3af2468bcc5a970b134e5d8ce294797dbc52096ceb64c46604dbe0e4a6714e17f64cd2095dbe9324529ebe3645d
 MISC metadata.xml 229 SHA256 0e32bd4374eb7ddef5d9d3feb500bfd626eae6f88edfe43ac3847e65dde78281 SHA512 8a66f8c117584e3d9b891c2813466691397dbd50388956981eabf86c7720a15b57bc4584f704211faef0044500106802d3ef1bed1592145cf3f8b5259279a43f WHIRLPOOL dfa20fb61d9b2ebb6e4e35f24bfb2e584706440d30fef2e82c463f5ef75df66d5ba809f0126f95c908a59627c59ec1971f015e5d281efe121061b7b09137c883
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVTzMNAAoJENXWzZRV2HNsyoMP/2PutAT7wL+REnA5etbw/50C
-okbSPVkGK9KspwQIirDepFWocZEejNksdHZ9l86qu4i7WDUxH7m+QqLq1vkiDKLD
-vpJQ2SXXwTJWndxiYzlrhTaXcDdurMVFc/6rItaXEKbwhBSYoyJlnfZGbqnbC1vh
-PFjJVRemdxxeC+gKxDrhPL3arMKSSyKTRYkfuwBIunVyYJ79X93VJyznIbJsXgPo
-oB4cDtddOC0mbXhr+CtQcP1KSdcbglpCGY/TpdjkR57A/H4aoSCl3sbScNeYAe9W
-CT2Ip8/sBvHMwS89n0kMqFeCpnmUi+EFNpLKrTTaQVq/SX/A89pIma4QOU1+E7dO
-LbQzS2bOkX/wYxgPyTa39zqaoJ8XC1a4hWQnm2lx4mrg7JArue124Ers/PrrLLjr
-VLizXurI/nfjCxnxTP6Uv24k/yLHfYdE08MgpwOCpqS2k3F1Q3UB9YnjkUR16Nsq
-lA//Ez1w0L/7K3dDVrocjnnSQA+W0CoK31clfH89gn5l04wPEZMx/nWpXpXklrTy
-HHaDjh1plEWY1tSGQssYvNlrUNkuusiXQy6TW+44zxgV7HlLgY6hDsIIJozttqtN
-WonSeaP7QtlLyQJVQeTu0+nkR5pCYDesbedfxjuzigQcTnMvWsQph66ugzLzleaV
-ysRkhFbSMFqiJ/YS7f/5
-=XVEH
+iQIcBAEBCAAGBQJVXGxdAAoJENXWzZRV2HNsAEcQALxd47EV+HF+S7Q1t2+2IGP7
+Cw+8pdhfIacs83BxblByrTrBVyaFLZxCXMiezaitMidAOycVxRWh1lP+QSwwysPu
+puuxiTpnlpMA6GT35eLwsV8+9hdUPwMRqa0rmgqXRLqvwv2eTDDpLr7JDOyDceA4
+JUqIGELqSB7DBbsBAHSZUjs5wKmS2HbmWqZR5FJPsj7F7fYSlchmXEA7TRI7eFPt
+kgmL1xQFDwxgP+xN6IKaLARO5n/swhTAHv1LmByBaoE42JNBrJfCodm7KDoqtbcc
+ZqvdU4dWskdWXPVAGPdq+WmXda0VsSG6GdztE1XJWKmFWSDT4lLY6ecxBwXuzmxw
+MoXvSEpFmGVloAkayKprTn7OsUgckvSMDBmrAr8ELLZHJWS8Pk86rmcEslxiTI4B
+BJy1JnutJ62RPqWCHcCTknOSYrbKzxFj45DvBJQrDkh+oz6Ae4kZZ3CL/YqkvXVS
+eOdEXX3etS8VJvn3Ohv6n1zI9OCCUjH2tIkAqpksSfDoLk7D34cTOiNH5HZ6MgBh
+ToZm5R09hrboIDV8nkh2+47NeokfNzsZEBjgccmx+3b9DIo/0sxpR45VR6GGbE/z
+SKB62J/OD4mBQU/jtD8TyRX2/EJWe+cxWRg1QNxhC8RJKo9tWFoOWx4Tz1SrOdg2
+gSSDk9O444cy3cTna98Q
+=ceUK
 -----END PGP SIGNATURE-----
diff --git a/net-misc/gns3-gui/gns3-gui-1.3.1-r1.ebuild b/net-misc/gns3-gui/gns3-gui-1.3.3.ebuild
index 84051bb4ae78..e59c94d55416 100644
--- a/net-misc/gns3-gui/gns3-gui-1.3.1-r1.ebuild
+++ b/net-misc/gns3-gui/gns3-gui-1.3.3.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.1-r1.ebuild,v 1.2 2015/04/21 13:05:54 bman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gns3-gui/gns3-gui-1.3.3.ebuild,v 1.1 2015/05/20 11:13:50 bman Exp $
 
 EAPI=5
 
@@ -17,7 +17,6 @@ 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}]
@@ -28,16 +27,9 @@ RDEPEND=">=dev-python/libcloud-0.15.1[${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"
+	=net-misc/gns3-server-$PV[${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