From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1173964-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 8A0B71382C5
	for <garchives@archives.gentoo.org>; Sun, 24 May 2020 20:25:18 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 455C8E0999;
	Sun, 24 May 2020 20:25:17 +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 2D689E0999
	for <gentoo-commits@lists.gentoo.org>; Sun, 24 May 2020 20:25:17 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(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 AD4C634F061
	for <gentoo-commits@lists.gentoo.org>; Sun, 24 May 2020 20:25:15 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id A7B7826D
	for <gentoo-commits@lists.gentoo.org>; Sun, 24 May 2020 20:25:11 +0000 (UTC)
From: "Thomas Deutschmann" <whissi@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, "Thomas Deutschmann" <whissi@gentoo.org>
Message-ID: <1590351833.6e149596cc76f1bbcee6720828c8c8c92420f2a3.whissi@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-libs/x265/x265-3.3.ebuild
X-VCS-Directories: media-libs/x265/
X-VCS-Committer: whissi
X-VCS-Committer-Name: Thomas Deutschmann
X-VCS-Revision: 6e149596cc76f1bbcee6720828c8c8c92420f2a3
X-VCS-Branch: master
Date: Sun, 24 May 2020 20:25:11 +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: 0f3cadd4-5139-4fa7-8c32-7cd9e1cb5aed
X-Archives-Hash: d2516b4a25b13506c1739c63b3220337

commit:     6e149596cc76f1bbcee6720828c8c8c92420f2a3
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun May 24 19:47:08 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun May 24 20:23:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e149596

media-libs/x265: drop USE=pic

Gentoo's toolchain uses PIC by default. Since USE=asm was added,
we no longer need a USE flag to control that behavior.

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 media-libs/x265/x265-3.3.ebuild | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/media-libs/x265/x265-3.3.ebuild b/media-libs/x265/x265-3.3.ebuild
index 503dca0ef3e..9428b001e84 100644
--- a/media-libs/x265/x265-3.3.ebuild
+++ b/media-libs/x265/x265-3.3.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265/wiki/Home"
 LICENSE="GPL-2"
 # subslot = libx265 soname
 SLOT="0/188"
-IUSE="+asm +10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_altivec numa pic power8 test"
+IUSE="+asm +10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_altivec numa power8 test"
 
 # Test suite requires assembly support and is known to be broken
 RESTRICT="test"
@@ -122,11 +122,9 @@ x265_variant_src_configure() {
 }
 
 multilib_src_configure() {
-	append-cflags -fPIC
-	append-cxxflags -fPIC
-
 	local myabicmakeargs=(
 		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
+		-DENABLE_PIC=ON
 		-DENABLE_LIBNUMA=$(usex numa ON OFF)
 		-DLIB_INSTALL_DIR="$(get_libdir)"
 	)
@@ -134,9 +132,9 @@ multilib_src_configure() {
 	local supports_asm=yes
 
 	if [[ ${ABI} = x86 ]] ; then
-		if use asm && use pic ; then
+		if use asm ; then
 			# Bug #528202
-			ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
+			ewarn "x86 asm is not PIC-safe, disabling it."
 			supports_asm=no
 		fi
 	elif [[ ${ABI} = x32 ]] ; then
@@ -146,12 +144,10 @@ multilib_src_configure() {
 			supports_asm=no
 		fi
 	elif [[ ${ABI} = arm ]] ; then
-		if use asm && use pic ; then
-			ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
-			supports_asm=no
-		elif use asm && use cpu_flags_arm_neon ; then
+		if use asm && use cpu_flags_arm_neon ; then
 			supports_asm=yes
 		elif use asm ; then
+			ewarn "arm asm is not PIC-safe, disabling it."
 			supports_asm=no
 		fi
 	elif [[ ${ABI} = ppc* ]] ; then