diff options
| author |   Horea Christian <chr@chymera.eu> | 2022-04-03 04:13:53 -0400 |
|---|---|---|
| committer | Horea Christian <chr@chymera.eu> | 2022-04-03 04:13:53 -0400 |
| commit | 48589a716ae0690d1f7968fa42eb3c8686cef7a8 (patch) | |
| tree | d990d9c62c9f3a500118963116f632f72ddefe56 /sci-biology | |
| parent | sci-biology/afni: corrected patch application (diff) | |
| download | sci-48589a716ae0690d1f7968fa42eb3c8686cef7a8.tar.gz sci-48589a716ae0690d1f7968fa42eb3c8686cef7a8.tar.bz2 sci-48589a716ae0690d1f7968fa42eb3c8686cef7a8.zip | |
sci-biology/afni: version patches are identical
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Horea Christian <chr@chymera.eu>
Diffstat (limited to 'sci-biology')
| -rw-r--r-- | sci-biology/afni/afni-20.3.03.ebuild | 2 | ||||
| -rw-r--r-- | sci-biology/afni/afni-22.0.21.ebuild | 2 | ||||
| -rw-r--r-- | sci-biology/afni/files/afni-20.3.03-python.patch | 11 | ||||
| -rw-r--r-- | sci-biology/afni/files/afni-22.0.21-python.patch | 13 |
4 files changed, 2 insertions, 26 deletions
diff --git a/sci-biology/afni/afni-20.3.03.ebuild b/sci-biology/afni/afni-20.3.03.ebuild index a95a34cfb..1cc1a3246 100644 --- a/sci-biology/afni/afni-20.3.03.ebuild +++ b/sci-biology/afni/afni-20.3.03.ebuild @@ -40,7 +40,7 @@ BUILD="linux_fedora_19_64" BIN_CONFLICTS=(qdelaunay whirlgif djpeg cjpeg qhull rbox count mpeg_encode) src_prepare() { - eapply "${FILESDIR}/${P}-python.patch" || die + eapply "${FILESDIR}/${PN}-20.1.16-python.patch" || die find -type f -exec sed -i -e "s/-lXp //g" {} + cp other_builds/Makefile.${BUILD} Makefile || die "Could not copy Makefile" # Unbundle imcat diff --git a/sci-biology/afni/afni-22.0.21.ebuild b/sci-biology/afni/afni-22.0.21.ebuild index 6694c9525..6d791e6e1 100644 --- a/sci-biology/afni/afni-22.0.21.ebuild +++ b/sci-biology/afni/afni-22.0.21.ebuild @@ -42,7 +42,7 @@ BIN_CONFLICTS=(qdelaunay whirlgif djpeg cjpeg qhull rbox count) src_prepare() { # more easily applied here than via PATCHES at phase end. - eapply "${FILESDIR}/${P}-python.patch" || die + eapply "${FILESDIR}/${PN}-20.1.16-python.patch" || die find -type f -exec sed -i -e "s/-lXp //g" {} + || die cp other_builds/Makefile.${BUILD} Makefile || die "Could not copy Makefile" # Unbundle imcat diff --git a/sci-biology/afni/files/afni-20.3.03-python.patch b/sci-biology/afni/files/afni-20.3.03-python.patch deleted file mode 100644 index 8c3e859f5..000000000 --- a/sci-biology/afni/files/afni-20.3.03-python.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/other_builds/Makefile.linux_fedora_19_64 2020-10-09 07:07:58.348874414 -0400 -+++ b/other_builds/Makefile.linux_fedora_19_64 2020-10-10 01:15:22.337755934 -0400 -@@ -11,8 +11,6 @@ - - # ------------------------------ - # python from C --IPYTHON = -DSELENIUM_READY -I/usr/include/python2.7 --LDPYTHON = -lpython2.7 - - # ---------------------------------------------------------------------- - # X configuration diff --git a/sci-biology/afni/files/afni-22.0.21-python.patch b/sci-biology/afni/files/afni-22.0.21-python.patch deleted file mode 100644 index f31cc051b..000000000 --- a/sci-biology/afni/files/afni-22.0.21-python.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/other_builds/Makefile.linux_fedora_19_64 b/other_builds/Makefile.linux_fedora_19_64 -index ebaa9d5..1471081 100644 ---- a/other_builds/Makefile.linux_fedora_19_64 -+++ b/other_builds/Makefile.linux_fedora_19_64 -@@ -11,8 +11,6 @@ LGIFTI = -lexpat - - # ------------------------------ - # python from C --IPYTHON = -DSELENIUM_READY -I/usr/include/python2.7 --LDPYTHON = -lpython2.7 - - # ---------------------------------------------------------------------- - # X configuration |