Version bump by Nikoli.

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

4 files changed, 63 insertions, 29 deletions

diff --git a/dev-python/pysrt/ChangeLog b/dev-python/pysrt/ChangeLog
index 4cdc3e1be519..166ce07d6710 100644
--- a/dev-python/pysrt/ChangeLog
+++ b/dev-python/pysrt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pysrt
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pysrt/ChangeLog,v 1.1 2013/12/07 17:31:25 tomwij Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pysrt/ChangeLog,v 1.2 2014/01/16 12:00:38 xmw Exp $
+
+*pysrt-1.0.0 (16 Jan 2014)
+
+  16 Jan 2014; Michael Weber <xmw@gentoo.org> +pysrt-1.0.0.ebuild,
+  pysrt-9999.ebuild:
+  Version bump by Nikoli.
 
 *pysrt-0.5.1 (07 Dec 2013)
 *pysrt-9999 (07 Dec 2013)
diff --git a/dev-python/pysrt/Manifest b/dev-python/pysrt/Manifest
index 01ae83520096..182a4192850e 100644
--- a/dev-python/pysrt/Manifest
+++ b/dev-python/pysrt/Manifest
@@ -2,18 +2,16 @@
 Hash: SHA256
 
 DIST pysrt-0.5.1.tar.gz 95486 SHA256 6de1d10c37f40272657eeb59b0911e27111a98957807ce7becef0e82cb738d53 SHA512 87544a1802c86543bad946d298e32b9e1474a0c6330686c3cea1b7c1b5dc948c4a0c15cd96fd65b8bf8a5d53993f5c416c4bb96a0c7c218b80abb47872e85486 WHIRLPOOL 166161d449729a351354a3ac80758bc0c0eea4d91431d95534dd7a41e36b3c2287555cee7b4e1c435122258da15588ee93ba920f4f9b8cc518e36d8f205009ff
+DIST pysrt-1.0.0.tar.gz 11966 SHA256 88b4f93223c84aa86741387dcf5bcec86acf961eb66383c4ba86b1ffbb826a64 SHA512 92aff2d30c0ff900f7fd4599bdcb666cf212d54a61ebf0b6d4c95699c15d0259cadf216a851ec9daad102bd70b097c878b05a259dcf89cb81d8f1f79631363ad WHIRLPOOL 1c4bd8df2b7f53289aa0b1684b7abc8a440ed3a2ada9e1473064ad288f3eb9b9b7b0cd359574cb2371299c964351c2c0696d2a4666c0522c799926d509cfb812
 EBUILD pysrt-0.5.1.ebuild 1136 SHA256 479b17e809f738279e116c40f7f652ec3ccf91a14e2e3cb93b5746a857367ee5 SHA512 41fdd495ff6be50325b9b800ceeb80d2d64fa7e511056d083ab48b18f9c28192cc34cfc00cb9d0bfc22f567f7de5431ccc6560669fcd2fe5b2c366642a29a111 WHIRLPOOL 4823acf15643e54e18909fb548cf0bb0b53a060731c3e8301c862e0eb3bcc494bcfa1c87bec18ef02ff80ca0142837fd07f0365c6753c651211210122dec9d69
-EBUILD pysrt-9999.ebuild 1019 SHA256 528158fd4f32fdcc921c807d0283cea229efe2487dacf629ddcacca99fe0dbad SHA512 8dc24f6c9f645c6b1f9ba9f8d2a170cdb350209fda4f193a5b5c11627f07c8f57d9e6a4f96594d917bc918405f812e82436d373354d2c90108ca373db1266146 WHIRLPOOL fb7f99e2309b2b60b6dd77ab7598466069ffedc738ad7d8dd8471f55c001a0f3c29c241983364bdd38118b5c1bf90d3a4cae187798361ff5351d74fbf9124f10
-MISC ChangeLog 553 SHA256 ef446dc2669d3ba9daf6732a16c46df476a18e674ab12ad47328dc84d9ea232c SHA512 3da54a13eaf6d002aafe0fc1d82620a22d8df70910088da8293e01ea0ef0ade02e43dc8c44b5d51ac34175acb6b938f4df4f1bedcbf6f3cf40e549c7c6b1a2f5 WHIRLPOOL a07248885f520e6404fa2f3bd6bc291f52aaba51ef8c1dd22099e3ac9b5b6ead04aa248fcfb8af1d97b85c02f8ba14bdd62062a4a9bd35687ac2a6d3438d21cc
+EBUILD pysrt-1.0.0.ebuild 999 SHA256 215fc74e4fbf177a328c6de603e1d5ac7f30990f8d887a0f9445f4912beaf1bb SHA512 f348594a4770f0387bbc1ce373a04c890ea99013529d0a3b8cb8d611c559cc72d2838031941eb51104cb8f6439a00ee06d4868414eae233f7b47a9f63c9b0303 WHIRLPOOL e95de5925affb3b3828898dfa64cd2275be19538332683fb357d6c35a4cfca40fc6f67e20509cc3ba495c918dd45f018dcbf23d29035c61dfd99808cc67707a3
+EBUILD pysrt-9999.ebuild 933 SHA256 275540df569f1dba668171062a64bf2c7e3c9969cb66ee0df48f7895e5df7877 SHA512 caa6ed31de467b9887c610a802685e978c96dc9b1873b8f8ce9a554a96b70d12c351dd8802ba836f33b98bcd441d13a4aaaec52248006e01b6a20d58b42b0e8f WHIRLPOOL 2c1c130f34dd7c8a5adcf779da5ee6b3c714f36e6518771e9c7f068030435ce504f8d336260546b0ad124ebea0eb468195dbf1b89f4426476c01ff0acbb6fd71
+MISC ChangeLog 693 SHA256 f691cf3bb7b7e222d8ae95817322a43461985f126184be5de7251aa8c1ce1258 SHA512 48dcf6fbdecba663098485aed43522c27c120a04b408faa600b654eb761ce55a33b1773c2400ba8d3fb007b831ca767c7f340f5f82f7b1a917d06629f0d3551c WHIRLPOOL 18c7be959e66e15fd70b5b9bca36e033e7167761a1e58409a3ff41e3bda2538139f4d78bd09e4756968abd1d82547e853ac1715029c36765ee78c45dcffde53d
 MISC metadata.xml 227 SHA256 7ff268c3b48d6310e34944871d18622b9d075f2831dc5954ebbf48f618f1c944 SHA512 edeaaa76df4173b44e386329ac738b2b234f51ca55a5eb29775828ad7ebe737f797bcded80f3353bf5a57d1cb626a82752657abc1dffdcf8f8989ea5420f85e7 WHIRLPOOL e69d29399029be93641496ec2233801972d25963cc85a94647d04ab0852465178c83a0e8bf9e8489ebedaada9c57ad3ee229935be20e8bb8c7c6d533e6bee760
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSo1t0AAoJEJWyH81tNOV9QcYH/RbDIfdRmfFyJAPffc8JHdpv
-JZp/fPQtF3FOkGCvbyZcDZw3M6ekt9sU5FBGFU76VsMUs+bvHyY+Ec7q5f3uj88X
-cEl12uQoNeEHqku4rUcKgb4YMoGWMNOEUP3+FMyHnjWWsow3ilaxzpoohjMBMwvK
-0/JOYY7GKKDAiFkvqctpRX+4RzZ5ekWQUUpcfnGReRwkSr6gemifoq08pQIXvtru
-pcwTCNM29M0NwfL+ZC0E6pZcX0nL0KAm1JHlrw89rRd72KOnU6jfOE4aJrDq3HSl
-VYOFp4atFaxfl70wzdO1n8mLEMMJNY/1/iTQrkkQsmhsFwcX6Q5e8CHg02e5rlY=
-=gyQW
+iF4EAREIAAYFAlLXye0ACgkQknrdDGLu8JCnWgEAh6LwvSfIYs6snG+oY5gLR3H3
+BDnrEyKgHIl8h+ZTGH4A/1Fr9EuWE1NNs9LTpWvqMmcoF3w2gv6EkWYaiRZbctvm
+=H0Dh
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pysrt/pysrt-1.0.0.ebuild b/dev-python/pysrt/pysrt-1.0.0.ebuild
new file mode 100644
index 000000000000..35a762ff0d04
--- /dev/null
+++ b/dev-python/pysrt/pysrt-1.0.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pysrt/pysrt-1.0.0.ebuild,v 1.1 2014/01/16 12:00:37 xmw Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library used to edit or create SubRip files"
+HOMEPAGE="https://github.com/byroot/pysrt https://pypi.python.org/pypi/pysrt"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/charade[${PYTHON_USEDEP}]
+	virtual/python-argparse[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[coverage(+),${PYTHON_USEDEP}] )
+"
+
+# https://github.com/byroot/pysrt/issues/42
+RESTRICT="test"
+
+src_test() {
+	DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
+}
+
+python_test() {
+	nosetests --with-coverage --cover-package=pysrt \
+		|| die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pysrt/pysrt-9999.ebuild b/dev-python/pysrt/pysrt-9999.ebuild
index e83829ae23d9..d5098e7b97e3 100644
--- a/dev-python/pysrt/pysrt-9999.ebuild
+++ b/dev-python/pysrt/pysrt-9999.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pysrt/pysrt-9999.ebuild,v 1.1 2013/12/07 17:31:25 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pysrt/pysrt-9999.ebuild,v 1.2 2014/01/16 12:00:38 xmw Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7} )
-EGIT_REPO_URI="https://github.com/byroot/pysrt.git"
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
-inherit distutils-r1 git-2
+inherit distutils-r1 git-r3
 
-DESCRIPTION="A library used to edit or create SubRip files"
+DESCRIPTION="Python library used to edit or create SubRip files"
 HOMEPAGE="https://github.com/byroot/pysrt https://pypi.python.org/pypi/pysrt"
+EGIT_REPO_URI="https://github.com/byroot/pysrt.git"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -25,19 +25,11 @@ DEPEND="${RDEPEND}
 	test? ( dev-python/nose[coverage(+),${PYTHON_USEDEP}] )
 "
 
+src_test() {
+	DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
+}
+
 python_test() {
 	nosetests --with-coverage --cover-package=pysrt \
 		|| die "Tests failed under ${EPYTHON}"
 }
-
-src_install() {
-	rm -rf "${S}/tests" || die
-
-	distutils-r1_src_install
-}
-
-python_install() {
-	rm -rf "${BUILD_DIR}/lib/tests" || die
-
-	distutils-r1_python_install
-}