# HG changeset patch
# User Da Risk <da_risk@geekorum.com>
# Date 1439806539 -7200
# Node ID afa33bdd3028d2525780a8f8a295c2ab1381eef4
# Parent  df5c00aba7c285ab8e132be0697d43c93fca1924# Parent  b44d25193c0372312e842e1603cba973b156ad20
merge with revbump pep257

diff -r b44d25193c03 -r afa33bdd3028 dev-python/caldav/Manifest
--- a/dev-python/caldav/Manifest	Thu Jul 30 09:57:37 2015 +0200
+++ b/dev-python/caldav/Manifest	Mon Aug 17 12:15:39 2015 +0200
@@ -1,1 +1,1 @@
-DIST caldav-0.2.2.tar.gz 36846 SHA256 845ed1c76c6755e0d036ddf7bf4f77d159edaaafa62561b9125b09712d944ef9 SHA512 f0a965ee4035aa8317c013e4819b3b1e0b87dc643435e95c58ab99476610a904cd2bc601f1b08186c5cb114bbe0ab278ee582fc77912b728a204c414fc71800c WHIRLPOOL fc681841a2944e5134045d5aedee28e04fdf2471e17aee4969c0ebc5acbec2be2c2ffbf9664fe5724e33536f2a82b70b46b16fe996fd98edd7a8118b0c1ddfb1
+DIST caldav-0.4.0.tar.gz 41755 SHA256 1e512f2989901d853ba43a3e98b1daff77569663ac3a7e29492fcecf4e86f858 SHA512 92a545901e1134a0ef94fdda2521b286cae212c442a43294da0019f1d34ed19dd0c967a9f81b2409b663f852bd80b47fd1ae39a8215c9429b2e9e22da99bd903 WHIRLPOOL 30df6c872b932a5b96cf1baf7dec405fd235c56be01b576d5aa06902669ecf09e422256cae5ec1bdc864b178db6696cc5067f8584615ec3eb610091121a8c474
diff -r b44d25193c03 -r afa33bdd3028 dev-python/caldav/caldav-0.2.2.ebuild
--- a/dev-python/caldav/caldav-0.2.2.ebuild	Thu Jul 30 09:57:37 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python implementation of JSON Web Token"
-HOMEPAGE="http://pypi.python.org/pypi/PyJWT"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( GPL-3 Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-COMMON_DEPS="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]"
-
-DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )
-		${COMMON_DEPS}"
-RDEPEND="${COMMON_DEPS}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-fix-setup.patch"
-}
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
diff -r b44d25193c03 -r afa33bdd3028 dev-python/caldav/caldav-0.4.0.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-python/caldav/caldav-0.4.0.ebuild	Mon Aug 17 12:15:39 2015 +0200
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="CalDAV (RFC4791) client library for python"
+HOMEPAGE="http://pypi.python.org/pypi/caldab"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-3 Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+COMMON_DEPS="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/vobject[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	"
+
+DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}]
+				dev-python/coverage[${PYTHON_USEDEP}]
+			  )
+		${COMMON_DEPS}"
+RDEPEND="${COMMON_DEPS}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-${PV}-fix-setup.patch"
+}
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
diff -r b44d25193c03 -r afa33bdd3028 dev-python/caldav/files/caldav-0.4.0-fix-setup.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-python/caldav/files/caldav-0.4.0-fix-setup.patch	Mon Aug 17 12:15:39 2015 +0200
@@ -0,0 +1,11 @@
+--- setup.py.orig	2015-07-27 15:24:00.832885472 +0200
++++ setup.py	2015-07-27 15:24:52.079709139 +0200
+@@ -23,7 +23,7 @@
+         author_email='cyril@hippie.io',
+         url='http://bitbucket.org/cyrilrbt/caldav',
+         license='GPL',
+-        packages=find_packages(exclude="tests"),
++        packages=find_packages(exclude=("tests", "test.*")),
+         include_package_data=True,
+         zip_safe=False,
+         install_requires=['vobject', 'lxml', 'nose', 'coverage', 'requests', 'six'],
diff -r b44d25193c03 -r afa33bdd3028 dev-python/caldav/files/caldav-fix-setup.patch
--- a/dev-python/caldav/files/caldav-fix-setup.patch	Thu Jul 30 09:57:37 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- setup.py.orig	2015-02-03 14:48:32.760080838 +0100
-+++ setup.py	2015-02-03 14:49:26.469081674 +0100
-@@ -23,7 +23,7 @@
-         author_email='cyril@hippie.io',
-         url='http://bitbucket.org/cyrilrbt/caldav',
-         license='GPL',
--        packages=find_packages(),
-+        packages=find_packages(exclude=("tests", "tests.*")),
-         include_package_data=True,
-         zip_safe=False,
-         install_requires=['nose', 'coverage', 'sphinx'],
diff -r b44d25193c03 -r afa33bdd3028 media-video/lm/lm-9999.ebuild
--- a/media-video/lm/lm-9999.ebuild	Thu Jul 30 09:57:37 2015 +0200
+++ b/media-video/lm/lm-9999.ebuild	Mon Aug 17 12:15:39 2015 +0200
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -6,7 +6,7 @@
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit git-2 python-r1 versionator
+inherit git-r3 python-single-r1 versionator
 
 EGIT_REPO_URI="https://github.com/RedRise/lm.git"
 
@@ -21,11 +21,14 @@
 KEYWORDS="~amd64"
 IUSE=""
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND=""
 RDEPEND="${PYTHON_DEPS}
 		dev-python/imdbpy[${PYTHON_USEDEP}]"
 
-S="${WORKDIR}/RedRise-lm-41c4004"
+src_prepare() {
+	python_fix_shebang lm.py
+}
 
 src_install() {
 	newbin lm.py lm
diff -r b44d25193c03 -r afa33bdd3028 media-video/subdl/metadata.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/media-video/subdl/metadata.xml	Mon Aug 17 12:15:39 2015 +0200
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>video</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">subdl</remote-id>
+	</upstream>
+</pkgmetadata>
diff -r b44d25193c03 -r afa33bdd3028 media-video/subdl/subdl-9999.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/media-video/subdl/subdl-9999.ebuild	Mon Aug 17 12:15:39 2015 +0200
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_3 python3_4 )
+inherit python-single-r1 git-r3
+
+DESCRIPTION="A command-line tool for downloading subs from opensubtitles.org"
+HOMEPAGE="http://code.google.com/p/subdl/"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/fbarthelery/subdl.git"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+src_prepare() {
+	python_fix_shebang ${PN}
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc README.txt
+}