From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1093015-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 872D7138239 for <garchives@archives.gentoo.org>; Sun, 26 May 2019 15:00:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6F7E3E07D0; Sun, 26 May 2019 15:00:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 421B1E07D0 for <gentoo-commits@lists.gentoo.org>; Sun, 26 May 2019 15:00:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6066C345086 for <gentoo-commits@lists.gentoo.org>; Sun, 26 May 2019 15:00:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 75A084D3 for <gentoo-commits@lists.gentoo.org>; Sun, 26 May 2019 15:00:42 +0000 (UTC) From: "David Seifert" <soap@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" <soap@gentoo.org> Message-ID: <1558882822.aac155cbcde7b8fb16f5b7cbb41a6759520bea74.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pygame_sdl2/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r2.ebuild dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4.ebuild dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r1.ebuild dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r2.ebuild X-VCS-Directories: dev-python/pygame_sdl2/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: aac155cbcde7b8fb16f5b7cbb41a6759520bea74 X-VCS-Branch: master Date: Sun, 26 May 2019 15:00:42 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b80db139-2992-4e5d-a6c9-5a84a89058d0 X-Archives-Hash: 41e7336c0bbc20dd0334989cf755ac81 commit: aac155cbcde7b8fb16f5b7cbb41a6759520bea74 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sun May 26 15:00:22 2019 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun May 26 15:00:22 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aac155cb dev-python/pygame_sdl2: [QA] Fix virtual/jpeg SLOT * Don't use the binary compatibility slot for a source package. Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: David Seifert <soap <AT> gentoo.org> .../pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild | 29 +++++++++------------- ...12.4.ebuild => pygame_sdl2-6.99.12.4-r2.ebuild} | 27 +++++++++++--------- ...99.6-r1.ebuild => pygame_sdl2-6.99.6-r2.ebuild} | 16 ++++++------ 3 files changed, 35 insertions(+), 37 deletions(-) diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild index 2c7b47dbd37..dc01aea2440 100644 --- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild +++ b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=6 PYTHON_COMPAT=( python{2_7,3_5,3_6} ) inherit distutils-r1 @@ -14,31 +14,26 @@ SRC_URI="http://www.renpy.org/dl/${PV}/${PYSDL}-for-renpy-${PV}.tar.gz" LICENSE="LGPL-2.1 ZLIB" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" -BDEPEND=" - dev-python/cython[${PYTHON_USEDEP}] -" -DEPEND=" +RDEPEND=" dev-python/numpy[${PYTHON_USEDEP}] - media-libs/libpng:0 - media-libs/libsdl2[video] - media-libs/sdl2-image[png,jpeg] - >=media-libs/sdl2-mixer-2.0.2 - media-libs/sdl2-ttf - virtual/jpeg:62 -" -RDEPEND="${DEPEND}" + media-libs/libpng:0= + media-libs/libsdl2:=[video] + media-libs/sdl2-image:=[png,jpeg] + media-libs/sdl2-mixer:= + media-libs/sdl2-ttf:= + virtual/jpeg:0" +DEPEND="${RDEPEND} + dev-python/cython[${PYTHON_USEDEP}]" S=${WORKDIR}/${PYSDL}-for-renpy-${PV} -PATCHES=( "${FILESDIR}/pygame_sdl2-6.99.12.4-mixer.patch" ) - # PyGame distribution for this version has some pregenerated files; # we need to remove them python_prepare_all() { - rm -r "${S}"/gen{,3} || die + rm -r gen{,3} || die distutils-r1_python_prepare_all } diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r2.ebuild similarity index 65% rename from dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4.ebuild rename to dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r2.ebuild index 372e1a7f714..8f6ab770690 100644 --- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4.ebuild +++ b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python{2_7,3_5,3_6} ) inherit distutils-r1 @@ -14,26 +14,29 @@ SRC_URI="http://www.renpy.org/dl/${PV}/${PYSDL}-for-renpy-${PV}.tar.gz" LICENSE="LGPL-2.1 ZLIB" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~x86" IUSE="" -RDEPEND="dev-python/numpy[${PYTHON_USEDEP}] - media-libs/libpng:0 - media-libs/libsdl2[video] - media-libs/sdl2-image[png,jpeg] - media-libs/sdl2-mixer - media-libs/sdl2-ttf - virtual/jpeg:62 -" -DEPEND="${RDEPEND} +BDEPEND=" dev-python/cython[${PYTHON_USEDEP}]" +DEPEND=" + dev-python/numpy[${PYTHON_USEDEP}] + media-libs/libpng:0= + media-libs/libsdl2:=[video] + media-libs/sdl2-image:=[png,jpeg] + >=media-libs/sdl2-mixer-2.0.2:= + media-libs/sdl2-ttf:= + virtual/jpeg:0" +RDEPEND="${DEPEND}" S=${WORKDIR}/${PYSDL}-for-renpy-${PV} +PATCHES=( "${FILESDIR}/pygame_sdl2-6.99.12.4-mixer.patch" ) + # PyGame distribution for this version has some pregenerated files; # we need to remove them python_prepare_all() { - rm -r "${S}"/gen{,3} || die + rm -r gen{,3} || die distutils-r1_python_prepare_all } diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r1.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r2.ebuild similarity index 73% rename from dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r1.ebuild rename to dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r2.ebuild index fbf4027ae86..8312566925b 100644 --- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r1.ebuild +++ b/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r2.ebuild @@ -15,14 +15,14 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND="dev-python/numpy[${PYTHON_USEDEP}] - media-libs/libpng:0 - media-libs/libsdl2[video] - media-libs/sdl2-image[png,jpeg] - media-libs/sdl2-mixer - media-libs/sdl2-ttf - virtual/jpeg:62 -" +RDEPEND=" + dev-python/numpy[${PYTHON_USEDEP}] + media-libs/libpng:0= + media-libs/libsdl2:=[video] + media-libs/sdl2-image:=[png,jpeg] + media-libs/sdl2-mixer:= + media-libs/sdl2-ttf:= + virtual/jpeg:0" DEPEND="${RDEPEND} dev-python/cython[${PYTHON_USEDEP}]"