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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2F0A215808B for ; Fri, 1 Apr 2022 08:22:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F19E6E0802; Fri, 1 Apr 2022 08:22:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D635EE0802 for ; Fri, 1 Apr 2022 08:22:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 67B7F3414C2 for ; Fri, 1 Apr 2022 08:22:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BF699AF for ; Fri, 1 Apr 2022 08:22:38 +0000 (UTC) From: "Horea Christian" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Horea Christian" Message-ID: <1648801353.e3ed6312407f673e0d8d544fd54d625b6492a27a.chymera@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/afni/ X-VCS-Repository: proj/sci X-VCS-Files: sci-biology/afni/afni-20.1.16.ebuild sci-biology/afni/afni-20.3.03.ebuild X-VCS-Directories: sci-biology/afni/ X-VCS-Committer: chymera X-VCS-Committer-Name: Horea Christian X-VCS-Revision: e3ed6312407f673e0d8d544fd54d625b6492a27a X-VCS-Branch: master Date: Fri, 1 Apr 2022 08:22:38 +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: 248091bc-384c-44fa-9d10-9f43b9ffa88f X-Archives-Hash: e11eff3dc5b461dab7eb7a9a084a3dc4 commit: e3ed6312407f673e0d8d544fd54d625b6492a27a Author: Horea Christian chymera eu> AuthorDate: Fri Apr 1 08:22:33 2022 +0000 Commit: Horea Christian gmail com> CommitDate: Fri Apr 1 08:22:33 2022 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=e3ed6312 sci-biology/afni: cleaned up whitespace and unneeded code Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Horea Christian chymera.eu> sci-biology/afni/afni-20.1.16.ebuild | 8 ++++---- sci-biology/afni/afni-20.3.03.ebuild | 6 +----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/sci-biology/afni/afni-20.1.16.ebuild b/sci-biology/afni/afni-20.1.16.ebuild index 98fdb2397..a95a34cfb 100644 --- a/sci-biology/afni/afni-20.1.16.ebuild +++ b/sci-biology/afni/afni-20.1.16.ebuild @@ -46,17 +46,17 @@ src_prepare() { # Unbundle imcat sed -e "s/ imcat / /g" \ -i Makefile.INCLUDE || die "Could not edit includes files." - sed -e "s~CC = /usr/bin/gcc -O2 -m64~CC = $(tc-getCC) \$(CFLAGS)~" \ + sed -e "s~CC = /usr/bin/gcc -O2 -m64~CC = $(tc-getCC) \$(CFLAGS)~" \ -e "s~CCMIN = /usr/bin/gcc -m64~CCMIN = $(tc-getCC) \$(CFLAGS)~" \ - -e "s~LD = /usr/bin/gcc~LD = $(tc-getCC)~" \ - -e "s~AR = /usr/bin/ar~AR = $(tc-getAR)~" \ + -e "s~LD = /usr/bin/gcc~LD = $(tc-getCC)~" \ + -e "s~AR = /usr/bin/ar~AR = $(tc-getAR)~" \ -e "s~RANLIB = /usr/bin/ranlib~RANLIB = $(tc-getRANLIB)~" \ -i Makefile || die "Could not edit Makefile" # they provide somewhat problematic makefiles :( sed -e "s~ifeq ($(CC),gcc)~ifeq (1,1)~"\ -i SUMA/SUMA_Makefile || die "Could not edit SUMA/SUMA_Makefile" # upstream checks if $CC is EXACTLY gcc, else sets variables for Mac - find "${S}" -iname "*Makefile*" | xargs sed -e "s~/usr/~${EROOT}/usr/~g;" -i + find "${S}" -iname "*Makefile*" | xargs sed -e "s~/usr/~${EPREFIX}/usr/~g;" -i default } diff --git a/sci-biology/afni/afni-20.3.03.ebuild b/sci-biology/afni/afni-20.3.03.ebuild index fab7446bf..a95a34cfb 100644 --- a/sci-biology/afni/afni-20.3.03.ebuild +++ b/sci-biology/afni/afni-20.3.03.ebuild @@ -39,10 +39,6 @@ S="${WORKDIR}/${PN}-AFNI_${PV}/src" BUILD="linux_fedora_19_64" BIN_CONFLICTS=(qdelaunay whirlgif djpeg cjpeg qhull rbox count mpeg_encode) -#PATCHES=( -# "${FILESDIR}/${P}-python.patch" -#) - src_prepare() { eapply "${FILESDIR}/${P}-python.patch" || die find -type f -exec sed -i -e "s/-lXp //g" {} + @@ -60,7 +56,7 @@ src_prepare() { sed -e "s~ifeq ($(CC),gcc)~ifeq (1,1)~"\ -i SUMA/SUMA_Makefile || die "Could not edit SUMA/SUMA_Makefile" # upstream checks if $CC is EXACTLY gcc, else sets variables for Mac - find "${S}" -iname "*Makefile*" | xargs sed -e "s~/usr/~${EROOT}/usr/~g;" -i + find "${S}" -iname "*Makefile*" | xargs sed -e "s~/usr/~${EPREFIX}/usr/~g;" -i default }