| 1 |
commit: 48589a716ae0690d1f7968fa42eb3c8686cef7a8 |
| 2 |
Author: Horea Christian <chr <AT> chymera <DOT> eu> |
| 3 |
AuthorDate: Sun Apr 3 08:13:53 2022 +0000 |
| 4 |
Commit: Horea Christian <horea.christ <AT> gmail <DOT> com> |
| 5 |
CommitDate: Sun Apr 3 08:13:53 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=48589a71 |
| 7 |
|
| 8 |
sci-biology/afni: version patches are identical |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 11 |
Signed-off-by: Horea Christian <chr <AT> chymera.eu> |
| 12 |
|
| 13 |
sci-biology/afni/afni-20.3.03.ebuild | 2 +- |
| 14 |
sci-biology/afni/afni-22.0.21.ebuild | 2 +- |
| 15 |
sci-biology/afni/files/afni-20.3.03-python.patch | 11 ----------- |
| 16 |
sci-biology/afni/files/afni-22.0.21-python.patch | 13 ------------- |
| 17 |
4 files changed, 2 insertions(+), 26 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sci-biology/afni/afni-20.3.03.ebuild b/sci-biology/afni/afni-20.3.03.ebuild |
| 20 |
index a95a34cfb..1cc1a3246 100644 |
| 21 |
--- a/sci-biology/afni/afni-20.3.03.ebuild |
| 22 |
+++ b/sci-biology/afni/afni-20.3.03.ebuild |
| 23 |
@@ -40,7 +40,7 @@ BUILD="linux_fedora_19_64" |
| 24 |
BIN_CONFLICTS=(qdelaunay whirlgif djpeg cjpeg qhull rbox count mpeg_encode) |
| 25 |
|
| 26 |
src_prepare() { |
| 27 |
- eapply "${FILESDIR}/${P}-python.patch" || die |
| 28 |
+ eapply "${FILESDIR}/${PN}-20.1.16-python.patch" || die |
| 29 |
find -type f -exec sed -i -e "s/-lXp //g" {} + |
| 30 |
cp other_builds/Makefile.${BUILD} Makefile || die "Could not copy Makefile" |
| 31 |
# Unbundle imcat |
| 32 |
|
| 33 |
diff --git a/sci-biology/afni/afni-22.0.21.ebuild b/sci-biology/afni/afni-22.0.21.ebuild |
| 34 |
index 6694c9525..6d791e6e1 100644 |
| 35 |
--- a/sci-biology/afni/afni-22.0.21.ebuild |
| 36 |
+++ b/sci-biology/afni/afni-22.0.21.ebuild |
| 37 |
@@ -42,7 +42,7 @@ BIN_CONFLICTS=(qdelaunay whirlgif djpeg cjpeg qhull rbox count) |
| 38 |
|
| 39 |
src_prepare() { |
| 40 |
# more easily applied here than via PATCHES at phase end. |
| 41 |
- eapply "${FILESDIR}/${P}-python.patch" || die |
| 42 |
+ eapply "${FILESDIR}/${PN}-20.1.16-python.patch" || die |
| 43 |
find -type f -exec sed -i -e "s/-lXp //g" {} + || die |
| 44 |
cp other_builds/Makefile.${BUILD} Makefile || die "Could not copy Makefile" |
| 45 |
# Unbundle imcat |
| 46 |
|
| 47 |
diff --git a/sci-biology/afni/files/afni-20.3.03-python.patch b/sci-biology/afni/files/afni-20.3.03-python.patch |
| 48 |
deleted file mode 100644 |
| 49 |
index 8c3e859f5..000000000 |
| 50 |
--- a/sci-biology/afni/files/afni-20.3.03-python.patch |
| 51 |
+++ /dev/null |
| 52 |
@@ -1,11 +0,0 @@ |
| 53 |
---- a/other_builds/Makefile.linux_fedora_19_64 2020-10-09 07:07:58.348874414 -0400 |
| 54 |
-+++ b/other_builds/Makefile.linux_fedora_19_64 2020-10-10 01:15:22.337755934 -0400 |
| 55 |
-@@ -11,8 +11,6 @@ |
| 56 |
- |
| 57 |
- # ------------------------------ |
| 58 |
- # python from C |
| 59 |
--IPYTHON = -DSELENIUM_READY -I/usr/include/python2.7 |
| 60 |
--LDPYTHON = -lpython2.7 |
| 61 |
- |
| 62 |
- # ---------------------------------------------------------------------- |
| 63 |
- # X configuration |
| 64 |
|
| 65 |
diff --git a/sci-biology/afni/files/afni-22.0.21-python.patch b/sci-biology/afni/files/afni-22.0.21-python.patch |
| 66 |
deleted file mode 100644 |
| 67 |
index f31cc051b..000000000 |
| 68 |
--- a/sci-biology/afni/files/afni-22.0.21-python.patch |
| 69 |
+++ /dev/null |
| 70 |
@@ -1,13 +0,0 @@ |
| 71 |
-diff --git a/other_builds/Makefile.linux_fedora_19_64 b/other_builds/Makefile.linux_fedora_19_64 |
| 72 |
-index ebaa9d5..1471081 100644 |
| 73 |
---- a/other_builds/Makefile.linux_fedora_19_64 |
| 74 |
-+++ b/other_builds/Makefile.linux_fedora_19_64 |
| 75 |
-@@ -11,8 +11,6 @@ LGIFTI = -lexpat |
| 76 |
- |
| 77 |
- # ------------------------------ |
| 78 |
- # python from C |
| 79 |
--IPYTHON = -DSELENIUM_READY -I/usr/include/python2.7 |
| 80 |
--LDPYTHON = -lpython2.7 |
| 81 |
- |
| 82 |
- # ---------------------------------------------------------------------- |
| 83 |
- # X configuration |
Archives