From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 542A9138359 for ; Thu, 20 Aug 2020 20:41:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6ABB1E0A49; Thu, 20 Aug 2020 20:41:40 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 50BF2E0784 for ; Thu, 20 Aug 2020 20:41:40 +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 CB94234EE5F for ; Thu, 20 Aug 2020 20:41:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8245531A for ; Thu, 20 Aug 2020 20:41:37 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1597956034.a58b0c2f479b8fc33436db2287ffb15db1cf04a7.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libjpeg-turbo/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5-r1.ebuild media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5.ebuild X-VCS-Directories: media-libs/libjpeg-turbo/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: a58b0c2f479b8fc33436db2287ffb15db1cf04a7 X-VCS-Branch: master Date: Thu, 20 Aug 2020 20:41:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a255aa24-356a-4495-a841-1c2afa01d227 X-Archives-Hash: 1704f84cd6ecb5671dc7b13b2883d564 commit: a58b0c2f479b8fc33436db2287ffb15db1cf04a7 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Aug 20 20:40:34 2020 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Aug 20 20:40:34 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a58b0c2f media-libs/libjpeg-turbo: add some EAPI=7 love Package-Manager: Portage-3.0.3, Repoman-3.0.0 Signed-off-by: Thomas Deutschmann gentoo.org> ...eg-turbo-2.0.5.ebuild => libjpeg-turbo-2.0.5-r1.ebuild} | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5-r1.ebuild similarity index 97% rename from media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5.ebuild rename to media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5-r1.ebuild index 43ac98639ee..a29f2348ca2 100644 --- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5.ebuild +++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5-r1.ebuild @@ -18,12 +18,11 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc IUSE="java static-libs" ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )" + COMMON_DEPEND="!media-libs/jpeg:0 !media-libs/jpeg:62" -RDEPEND="${COMMON_DEPEND} - java? ( >=virtual/jre-1.5 )" -DEPEND="${COMMON_DEPEND} - >=dev-util/cmake-3.16.5 + +BDEPEND=">=dev-util/cmake-3.16.5 amd64? ( ${ASM_DEPEND} ) x86? ( ${ASM_DEPEND} ) amd64-fbsd? ( ${ASM_DEPEND} ) @@ -31,9 +30,14 @@ DEPEND="${COMMON_DEPEND} amd64-linux? ( ${ASM_DEPEND} ) x86-linux? ( ${ASM_DEPEND} ) x64-macos? ( ${ASM_DEPEND} ) - x64-cygwin? ( ${ASM_DEPEND} ) + x64-cygwin? ( ${ASM_DEPEND} )" + +DEPEND="${COMMON_DEPEND} java? ( >=virtual/jdk-1.5 )" +RDEPEND="${COMMON_DEPEND} + java? ( >=virtual/jre-1.5 )" + MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h ) src_prepare() {