From 084f5a3b0336767dd71e40105cc78652b4cb892a Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Sun, 12 Jan 2020 12:13:33 +0100
Subject: dev-python/ntlm-auth: Remove mistaken dep on ordereddict
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This package needs ordereddict for Python < 2.7, not 2.7 itself.

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 dev-python/ntlm-auth/ntlm-auth-1.1.0.ebuild    |  3 +--
 dev-python/ntlm-auth/ntlm-auth-1.2.0.ebuild    |  3 +--
 dev-python/ntlm-auth/ntlm-auth-1.3.0.ebuild    |  3 +--
 dev-python/ntlm-auth/ntlm-auth-1.4.0-r1.ebuild | 21 +++++++++++++++++++++
 dev-python/ntlm-auth/ntlm-auth-1.4.0.ebuild    | 22 ----------------------
 5 files changed, 24 insertions(+), 28 deletions(-)
 create mode 100644 dev-python/ntlm-auth/ntlm-auth-1.4.0-r1.ebuild
 delete mode 100644 dev-python/ntlm-auth/ntlm-auth-1.4.0.ebuild

(limited to 'dev-python')

diff --git a/dev-python/ntlm-auth/ntlm-auth-1.1.0.ebuild b/dev-python/ntlm-auth/ntlm-auth-1.1.0.ebuild
index 1b47c71d4346..4b2433e20090 100644
--- a/dev-python/ntlm-auth/ntlm-auth-1.1.0.ebuild
+++ b/dev-python/ntlm-auth/ntlm-auth-1.1.0.ebuild
@@ -16,6 +16,5 @@ LICENSE="MIT"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/ordereddict[${PYTHON_USEDEP}]' python2_7)"
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/ntlm-auth/ntlm-auth-1.2.0.ebuild b/dev-python/ntlm-auth/ntlm-auth-1.2.0.ebuild
index 1b47c71d4346..4b2433e20090 100644
--- a/dev-python/ntlm-auth/ntlm-auth-1.2.0.ebuild
+++ b/dev-python/ntlm-auth/ntlm-auth-1.2.0.ebuild
@@ -16,6 +16,5 @@ LICENSE="MIT"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/ordereddict[${PYTHON_USEDEP}]' python2_7)"
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/ntlm-auth/ntlm-auth-1.3.0.ebuild b/dev-python/ntlm-auth/ntlm-auth-1.3.0.ebuild
index 5569f7c7e2dd..f34de2bf8fea 100644
--- a/dev-python/ntlm-auth/ntlm-auth-1.3.0.ebuild
+++ b/dev-python/ntlm-auth/ntlm-auth-1.3.0.ebuild
@@ -17,6 +17,5 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/ordereddict[${PYTHON_USEDEP}]' python2_7)"
+	dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/ntlm-auth/ntlm-auth-1.4.0-r1.ebuild b/dev-python/ntlm-auth/ntlm-auth-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..f34de2bf8fea
--- /dev/null
+++ b/dev-python/ntlm-auth/ntlm-auth-1.4.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Calculates NTLM Authentication codes"
+HOMEPAGE="https://github.com/jborean93/ntlm-auth"
+SRC_URI="https://github.com/jborean93/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/ntlm-auth/ntlm-auth-1.4.0.ebuild b/dev-python/ntlm-auth/ntlm-auth-1.4.0.ebuild
deleted file mode 100644
index 5569f7c7e2dd..000000000000
--- a/dev-python/ntlm-auth/ntlm-auth-1.4.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Calculates NTLM Authentication codes"
-HOMEPAGE="https://github.com/jborean93/ntlm-auth"
-SRC_URI="https://github.com/jborean93/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/ordereddict[${PYTHON_USEDEP}]' python2_7)"
-DEPEND="${RDEPEND}"
-- 
cgit v1.2.3-65-gdbad