Version bump. Remove old.

Package-Manager: portage-2.2.18/cvs/Linux x86_64

4 files changed, 14 insertions, 46 deletions

diff --git a/net-libs/stem/ChangeLog b/net-libs/stem/ChangeLog
index c722f1aa5772..3028e4d27e49 100644
--- a/net-libs/stem/ChangeLog
+++ b/net-libs/stem/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/stem
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/stem/ChangeLog,v 1.10 2015/04/16 22:28:42 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/stem/ChangeLog,v 1.11 2015/05/16 15:54:30 mrueg Exp $
+
+*stem-1.4.0 (16 May 2015)
+
+  16 May 2015; Manuel Rüger <mrueg@gentoo.org> +stem-1.4.0.ebuild,
+  -stem-1.2.2_p20140718.ebuild, -stem-1.3.0_p20150414.ebuild:
+  Version bump. Remove old.
 
 *stem-1.3.0_p20150414 (16 Apr 2015)
 
diff --git a/net-libs/stem/Manifest b/net-libs/stem/Manifest
index ae8d2774550f..0366c79c5062 100644
--- a/net-libs/stem/Manifest
+++ b/net-libs/stem/Manifest
@@ -1,8 +1,6 @@
-DIST stem-1.2.2_p20140718.tar.gz 1534015 SHA256 61c0aabd7d18cfd3ca89b05c8c8c066447d2b570ee4802956a4fba05ef5f9b85 SHA512 219d8293542cb61ce38d9a9269208847d81b9b94c0aeff8f1b3a3b71a550c2829414230709d4d5610d9ecf39af8ae1b5537a4398c6dd4930cc36777346412758 WHIRLPOOL 86c9335daf9331c355acfc545dcad2b0ae078b67b124f22c59532fde9dfa216a7578d9dff025cdd66f1b09935fae3ebd3bc4edccda3a307a39366134f2ba1b04
 DIST stem-1.3.0.tar.bz2 1481513 SHA256 770e370156e0e92a9862e4670ee3f4ac385742006e578608528ee16cbab9d416 SHA512 dea65d026a27985432b291614dc3c8da7a628fad945a755abb706177864edd387c8ea96cd8358af60825b342896d57ea1daa96365efd5156bf8885e7a7aa9714 WHIRLPOOL 1e3d9f800ed9670a347d41c565250a42e1a166e24c55dc3a0128cd3b2c5d9a8f0e926e73338a4cdd846997911c11db5e2fa98f2b7dd5a259da523951d8bf1626
-DIST stem-1.3.0_p20150414.tar.gz 1677096 SHA256 4bde897f7286fa0afab5d7bfc54136d1d088d1139e8a5bced6becdd6952d6469 SHA512 ba4b15dfe5e506d466469fee4c6a0ef4322b8de3ec9751550bd6b7394b606221f894c1dd826810a82ebc42af0d5cc0f6ea66a936f063e916cc54f49c22fb9d6c WHIRLPOOL da1723a496a2e02433117365dcd39eabf0ce388ac9c751745070a0565402a410b33626af5b8497009080fda9a7dbf6951b3f40988bc95fd15a9d599b51a87ade
-EBUILD stem-1.2.2_p20140718.ebuild 1077 SHA256 3b3b40a3b45471febd4c7ce371253b9d9213d4c620ebcf4336224e77d8f2e276 SHA512 cbae672abd3849a09126a63409e20c26e69b7561fe944485f7adb3351e9bbd257a6e976968dabed1bbbedd0191fdb9d77569305f62ce301abea55d49e09b75b5 WHIRLPOOL e50e3e0472640d4a80c511dfb302e774bc0973d3b8278a8fb732be6479288534b466a9f85f25353c0bc390063b05250ecfd3ae0b27082a708d0503d0ba2ebdb6
+DIST stem-1.4.0.tar.bz2 1569644 SHA256 6c8af06a6fa9553ad4da3e397cffa42d7ddd9396a1425b2757f125e7699ef83c SHA512 0d93355659ff04d8846133845636c0596e06331b6646a62c597c2d6156be39705ed182d480dde3e49653c4b5341f663e4da83610110383d9d8c395ac1e473191 WHIRLPOOL 3eb30be403980a6a446fa0fe666fe628ef1f732e5a7da6ae3db323e4053c7df866142faad979a69cfeecb031077896e4883c58fdb6b3db84f7c5502141b4df7c
 EBUILD stem-1.3.0.ebuild 1132 SHA256 2b4d1dd108638da3c6d4786e77dd643f13fd068e7e1ff55c6d345c986a4662f7 SHA512 7508f3304c16887ba85ac965254fbe6b6013460aae5002e715ff278cbce7b98af3ccd4cad5611438724508cccb36a449ada5613ef6e9b8349e3c9ec06e14cfd4 WHIRLPOOL af1fa05a6c44ae250bb732530453028f8cbc4e37dfa81ebdef806140c649fb34109bb58a996da042d3a69f78380cd8ffa0b7abdc6fc6a0fbc3a25d815ebabc46
-EBUILD stem-1.3.0_p20150414.ebuild 1422 SHA256 8136e8046a2d557c594328c575d870077ed733674ef1e51ab6bd8f3c4aa2cdc2 SHA512 8832da5e1a61c33f4f95d2ddfb44018bf26ce04da410e95bc2c5fb1d7652389cd2bc13f3df212b74e8d5ad2f3e3a60551b3fb9ee33db1ab07491229c874dc975 WHIRLPOOL bded167393cd59b777df4863f51d3ef68be242ec6f84393d4d5e5bdd71cca0d96277f5d7e89d5fa091e59e523c4df61e1d3beab6eb09cf604abfb2e31e969160
-MISC ChangeLog 1635 SHA256 47695405e180e760cf0f9177c7a1a0510e050b4c1fb86b6840501f8cd7dddd9d SHA512 a5ea774336036e17db8d7e2b854b544848bb21a150814bd62feb16677b98853be69d00d94c6f8e31a394c128dc76e85d7a3a94ea3695f923818e7f1b6bf135d8 WHIRLPOOL 9e5d240e2710939f5230bf07a7b40d6eb66736e05d2ef0047adbbee6f4cbb67ea8e71977dcf617d0259b308fe384b267c34199b18bf0e5cbfc24ce6fac4a092d
+EBUILD stem-1.4.0.ebuild 1098 SHA256 fd14a15d03eacefa91182c628bc892ad057a047092ccf2c95a0cb7fb08ae3583 SHA512 dd909e348f95ae324278871bfc62ee3ada1ad01b4eaa7040410e2ce08d0923ec3a7b49ba9bae36869c3f0df37d5e43c34a55889048537b0bb47b3f6277ad2668 WHIRLPOOL 05f7e7ee218adb5d1eac5310752a67de4a95754dd6e2e445c3c2c0819b51932966a08d8df4231a6907500d6a278c2173c50ea8bed7a0ed7ce202d7fb9d8feab0
+MISC ChangeLog 1821 SHA256 e6bc8d1fa2dafb0dccaca347c8b21d4eb4210663ae9d1915f6c8971243c21d24 SHA512 ce496549f0d4c0e79bcca08ef2b0cecbeb89b939d8ab4bcf0cdcfeea420dff81605c795c5e5eecbced2ad4a599c20cb38631ee696b94a34d73aa88930332d62b WHIRLPOOL 2d28bb5b3e27cb2b10185950cd6e2ead37596d0dfb4ea7b54306ee4b8e40af87239235d0606ac5281992030e67048a57173c0efcfe2b29fe004a64e07d979a91
 MISC metadata.xml 330 SHA256 087ea49bd54a0ea3232bdb174caf9f6f3c47c02eff4e251ae44b8a77c19afc70 SHA512 66aaa25b72464537676f71f86963d764b03c1bf41067009b10fe9180419570442515dfef808b241eb2f64c10fbfaa42ed0bde587ba1921bb994f5ac25116ce27 WHIRLPOOL df36f1b32cb272e7de01491f24ed19e5840fe443dd19317122f22e7d5062e7a3ae831b079f7087666fc1befe8b71b61759737e0f9821dd9648feb67fb6255d6f
diff --git a/net-libs/stem/stem-1.2.2_p20140718.ebuild b/net-libs/stem/stem-1.2.2_p20140718.ebuild
deleted file mode 100644
index 78d9c00237e6..000000000000
--- a/net-libs/stem/stem-1.2.2_p20140718.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/stem/stem-1.2.2_p20140718.ebuild,v 1.6 2014/12/07 01:51:14 blueness Exp $
-
-EAPI=5
-PYTHON_COMPAT=(python2_7)
-
-inherit vcs-snapshot distutils-r1
-
-DESCRIPTION="Stem is a Python controller library for Tor"
-HOMEPAGE="https://stem.torproject.org"
-COMMIT_ID="14861679a24e0cfb5949da8fd90f3a3c45016dfb"
-SRC_URI="https://gitweb.torproject.org/stem.git/snapshot/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="test"
-
-DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="net-misc/tor"
-
-DOCS=( docs/{_static,_templates,api,tutorials,{change_log,api,contents,download,faq,index,tutorials}.rst} )
-
-python_prepare_all() {
-	sed -i -e "/test_expand_path/a \
-	\ \ \ \ return" test/integ/util/system.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	${PYTHON} run_tests.py --all --target RUN_ALL || die
-}
diff --git a/net-libs/stem/stem-1.3.0_p20150414.ebuild b/net-libs/stem/stem-1.4.0.ebuild
index d96cf66d5d00..0d3ffc01469f 100644
--- a/net-libs/stem/stem-1.3.0_p20150414.ebuild
+++ b/net-libs/stem/stem-1.4.0.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/stem/stem-1.3.0_p20150414.ebuild,v 1.1 2015/04/16 22:28:42 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/stem/stem-1.4.0.ebuild,v 1.1 2015/05/16 15:54:30 mrueg Exp $
 
 EAPI=5
-PYTHON_COMPAT=(python{2_7,3_3})
+PYTHON_COMPAT=(python{2_7,3_3,3_4})
 
 inherit vcs-snapshot distutils-r1
 
 DESCRIPTION="Stem is a Python controller library for Tor"
 HOMEPAGE="https://stem.torproject.org"
-COMMIT_ID="f2eca8fe828d965a86b8789e9d6049c424452ac7"
-SRC_URI="https://gitweb.torproject.org/stem.git/snapshot/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://pypi/s/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-3"
 SLOT="0"
@@ -26,7 +25,7 @@ RDEPEND="net-misc/tor"
 DOCS=( docs/{_static,_templates,api,tutorials,{change_log,api,contents,download,faq,index,tutorials}.rst} )
 
 python_prepare_all() {
-	# Disable failing test                                                                                                                                                                                                                         
+	# Disable failing test
 	sed -i -e "/test_expand_path/a \
 		\ \ \ \ return" test/integ/util/system.py || die
 	sed -i -e "/test_get_connections_by_ss/,+1d"\