diff options
| author |   Repository QA checks <repo-qa-checks@gentoo.org> | 2017-05-19 12:43:22 +0000 |
|---|---|---|
| committer | Repository QA checks <repo-qa-checks@gentoo.org> | 2017-05-19 12:43:22 +0000 |
| commit | 65976aad1a1e5e33ddd40391fbeba2a9b99c1fac (patch) | |
| tree | bbd9cb2ff1c842318fe3fb4a20380dbb03256415 | |
| parent | 2017-05-19 12:06:08 UTC (diff) | |
| parent | kernel-2.eclass: Fix file renaming for git-sources (diff) | |
| download | gentoo-65976aad1a1e5e33ddd40391fbeba2a9b99c1fac.tar.gz gentoo-65976aad1a1e5e33ddd40391fbeba2a9b99c1fac.tar.bz2 gentoo-65976aad1a1e5e33ddd40391fbeba2a9b99c1fac.zip | |
Merge updates from master
| -rw-r--r-- | dev-python/django-sortedm2m/django-sortedm2m-1.3.2.ebuild | 6 | ||||
| -rw-r--r-- | eclass/kernel-2.eclass | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/dev-python/django-sortedm2m/django-sortedm2m-1.3.2.ebuild b/dev-python/django-sortedm2m/django-sortedm2m-1.3.2.ebuild index 5561af820c8e..e187efd0072d 100644 --- a/dev-python/django-sortedm2m/django-sortedm2m-1.3.2.ebuild +++ b/dev-python/django-sortedm2m/django-sortedm2m-1.3.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="6" -PYTHON_COMPAT=( python{2_7,3_4} ) +PYTHON_COMPAT=( python{2_7,3_4,3_5} ) inherit distutils-r1 @@ -19,5 +19,5 @@ IUSE="" RDEPEND="" DEPEND=" ${RDEPEND} - dev-python/setuptools + dev-python/setuptools[${PYTHON_USEDEP}] " diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index c6ce28d45a57..a6c783796a15 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -512,9 +512,9 @@ detect_version() { # as of 12/5/2017, the rc patch is no longer offered as a compressed # file, and no longer is it mirrored on kernel.org if [[ ${KV_MAJOR} -ge 4 ]] && [[ ${KV_PATCH} -ge 12 ]]; then - KERNEL_URI="https://git.kernel.org/torvalds/p/v4.12-rc1/v4.11 -> patch-4.12-rc1 + KERNEL_URI="https://git.kernel.org/torvalds/p/v4.12-rc1/v4.11 -> patch-4.12-rc1.patch ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz" - UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV//_/-}" + UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV//_/-}.patch" else KERNEL_URI="${KERNEL_BASE_URI}/testing/patch-${CKV//_/-}.xz ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz" |