[gentoo-commits] repo/gentoo:master commit in: app-text/calibre/

[Justin Lecher]

commit:     cab2a483fce3e5e052f0378ecaf037768a295392
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 30 11:59:25 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Oct 30 12:03:49 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cab2a483

app-text/calibre: Move to virtual/dnspython

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 app-text/calibre/calibre-1.20.ebuild    | 4 ++--
 app-text/calibre/calibre-1.47.ebuild    | 4 ++--
 app-text/calibre/calibre-1.48-r1.ebuild | 2 +-
 app-text/calibre/calibre-2.27.0.ebuild  | 2 +-
 app-text/calibre/calibre-2.31.0.ebuild  | 2 +-
 app-text/calibre/calibre-2.33.0.ebuild  | 2 +-
 app-text/calibre/calibre-2.34.0.ebuild  | 2 +-
 app-text/calibre/calibre-2.35.0.ebuild  | 5 ++++-
 app-text/calibre/metadata.xml           | 2 +-
 9 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/app-text/calibre/calibre-1.20.ebuild b/app-text/calibre/calibre-1.20.ebuild
index 97e04cf..7eb5fa0 100644
--- a/app-text/calibre/calibre-1.20.ebuild
+++ b/app-text/calibre/calibre-1.20.ebuild
@@ -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
 # $Id$
 
@@ -45,7 +45,7 @@ COMMON_DEPEND="
 	dev-python/apsw
 	>=dev-python/beautifulsoup-3.0.5:python-2
 	dev-python/netifaces
-	>=dev-python/dnspython-1.6.0
+	>=dev-python/dnspython-1.6.0:0
 	>=dev-python/cssselect-0.7.1
 	>=dev-python/cssutils-0.9.9
 	>=dev-python/dbus-python-0.82.2

diff --git a/app-text/calibre/calibre-1.47.ebuild b/app-text/calibre/calibre-1.47.ebuild
index 0061c41..6126c17 100644
--- a/app-text/calibre/calibre-1.47.ebuild
+++ b/app-text/calibre/calibre-1.47.ebuild
@@ -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
 # $Id$
 
@@ -45,7 +45,7 @@ COMMON_DEPEND="
 	>=dev-python/apsw-3.7.17[python_targets_python2_7(-)]
 	>=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)]
 	dev-python/netifaces[python_targets_python2_7(-)]
-	>=dev-python/dnspython-1.6.0[python_targets_python2_7(-)]
+	>=dev-python/dnspython-1.6.0:0[python_targets_python2_7(-)]
 	>=dev-python/cssselect-0.7.1[python_targets_python2_7(-)]
 	>=dev-python/cssutils-0.9.9[python_targets_python2_7(-)]
 	>=dev-python/dbus-python-0.82.2[python_targets_python2_7(-)]

diff --git a/app-text/calibre/calibre-1.48-r1.ebuild b/app-text/calibre/calibre-1.48-r1.ebuild
index 099fe1f..c247c51 100644
--- a/app-text/calibre/calibre-1.48-r1.ebuild
+++ b/app-text/calibre/calibre-1.48-r1.ebuild
@@ -49,7 +49,7 @@ COMMON_DEPEND="
 	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
 	>=dev-python/cssutils-0.9.9[${PYTHON_USEDEP}]
 	>=dev-python/dbus-python-0.82.2[${PYTHON_USEDEP}]
-	>=dev-python/dnspython-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/dnspython-1.6.0:0[${PYTHON_USEDEP}]
 	>=dev-python/lxml-3.2.1[${PYTHON_USEDEP}]
 	>=dev-python/mechanize-0.1.11[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-1.4.1[${PYTHON_USEDEP}]

diff --git a/app-text/calibre/calibre-2.27.0.ebuild b/app-text/calibre/calibre-2.27.0.ebuild
index d17a120..d2edbbb 100644
--- a/app-text/calibre/calibre-2.27.0.ebuild
+++ b/app-text/calibre/calibre-2.27.0.ebuild
@@ -43,7 +43,7 @@ COMMON_DEPEND="
 	>=dev-libs/icu-4.4:=
 	>=dev-python/apsw-3.7.17[python_targets_python2_7(-)]
 	>=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)]
-	>=dev-python/dnspython-1.6.0[python_targets_python2_7(-)]
+	>=dev-python/dnspython-1.6.0:0[python_targets_python2_7(-)]
 	>=dev-python/cssselect-0.7.1[python_targets_python2_7(-)]
 	>=dev-python/cssutils-0.9.9[python_targets_python2_7(-)]
 	>=dev-python/dbus-python-1.2.0[python_targets_python2_7(-)]

diff --git a/app-text/calibre/calibre-2.31.0.ebuild b/app-text/calibre/calibre-2.31.0.ebuild
index d17a120..d2edbbb 100644
--- a/app-text/calibre/calibre-2.31.0.ebuild
+++ b/app-text/calibre/calibre-2.31.0.ebuild
@@ -43,7 +43,7 @@ COMMON_DEPEND="
 	>=dev-libs/icu-4.4:=
 	>=dev-python/apsw-3.7.17[python_targets_python2_7(-)]
 	>=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)]
-	>=dev-python/dnspython-1.6.0[python_targets_python2_7(-)]
+	>=dev-python/dnspython-1.6.0:0[python_targets_python2_7(-)]
 	>=dev-python/cssselect-0.7.1[python_targets_python2_7(-)]
 	>=dev-python/cssutils-0.9.9[python_targets_python2_7(-)]
 	>=dev-python/dbus-python-1.2.0[python_targets_python2_7(-)]

diff --git a/app-text/calibre/calibre-2.33.0.ebuild b/app-text/calibre/calibre-2.33.0.ebuild
index 0706d00..d2585c9 100644
--- a/app-text/calibre/calibre-2.33.0.ebuild
+++ b/app-text/calibre/calibre-2.33.0.ebuild
@@ -42,7 +42,7 @@ COMMON_DEPEND="
 	>=dev-libs/icu-4.4:=
 	>=dev-python/apsw-3.7.17[python_targets_python2_7(-)]
 	>=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)]
-	>=dev-python/dnspython-1.6.0[python_targets_python2_7(-)]
+	>=dev-python/dnspython-1.6.0:0[python_targets_python2_7(-)]
 	>=dev-python/cssselect-0.7.1[python_targets_python2_7(-)]
 	>=dev-python/cssutils-0.9.9[python_targets_python2_7(-)]
 	>=dev-python/dbus-python-1.2.0[python_targets_python2_7(-)]

diff --git a/app-text/calibre/calibre-2.34.0.ebuild b/app-text/calibre/calibre-2.34.0.ebuild
index 0706d00..d2585c9 100644
--- a/app-text/calibre/calibre-2.34.0.ebuild
+++ b/app-text/calibre/calibre-2.34.0.ebuild
@@ -42,7 +42,7 @@ COMMON_DEPEND="
 	>=dev-libs/icu-4.4:=
 	>=dev-python/apsw-3.7.17[python_targets_python2_7(-)]
 	>=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)]
-	>=dev-python/dnspython-1.6.0[python_targets_python2_7(-)]
+	>=dev-python/dnspython-1.6.0:0[python_targets_python2_7(-)]
 	>=dev-python/cssselect-0.7.1[python_targets_python2_7(-)]
 	>=dev-python/cssutils-0.9.9[python_targets_python2_7(-)]
 	>=dev-python/dbus-python-1.2.0[python_targets_python2_7(-)]

diff --git a/app-text/calibre/calibre-2.35.0.ebuild b/app-text/calibre/calibre-2.35.0.ebuild
index 0706d00..8a2a6ee 100644
--- a/app-text/calibre/calibre-2.35.0.ebuild
+++ b/app-text/calibre/calibre-2.35.0.ebuild
@@ -42,7 +42,10 @@ COMMON_DEPEND="
 	>=dev-libs/icu-4.4:=
 	>=dev-python/apsw-3.7.17[python_targets_python2_7(-)]
 	>=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)]
-	>=dev-python/dnspython-1.6.0[python_targets_python2_7(-)]
+	|| (
+		>=dev-python/dnspython-1.6.0:0[python_targets_python2_7(-)]
+		virtual/dnspython[python_targets_python2_7(-)]
+	)
 	>=dev-python/cssselect-0.7.1[python_targets_python2_7(-)]
 	>=dev-python/cssutils-0.9.9[python_targets_python2_7(-)]
 	>=dev-python/dbus-python-1.2.0[python_targets_python2_7(-)]

diff --git a/app-text/calibre/metadata.xml b/app-text/calibre/metadata.xml
index f372a0d..459ff02 100644
--- a/app-text/calibre/metadata.xml
+++ b/app-text/calibre/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>