commit: d75c56f7c128b1aeb9870584c940a9aec33d2c19
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Thu Apr 4 01:53:57 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 5 01:20:49 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d75c56f7
media-gfx/sane-backends: remove outdated seds
Fixes:
* SED: the following did not cause any changes
* sed -e "s/m4_esyscmd_s(\[git describe --dirty\])/${PV}/" -e
'/^AM_MAINTAINER_MODE/d' -i configure.ac || die;
* no-op: -e s/m4_esyscmd_s(\[git describe --dirty\])/1.2.1/
* no-op: -e /^AM_MAINTAINER_MODE/d
Maintainer mode was removed upstream:
https://gitlab.com/sane-project/backends/-/commit/262e32ce591feb79ba5be9b21396b9dd71f1f067
git describe was dropped in favor of tools/git-version-gen:
https://gitlab.com/sane-project/backends/-/commit/c28c9843ed12f0fe2697d66c3dad724f68d0e576
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild | 5 -----
media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild | 5 -----
media-gfx/sane-backends/sane-backends-1.2.1.ebuild | 5 -----
3 files changed, 15 deletions(-)
diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild
b/media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild
index 044b4fd553fc..bed67f34eff9 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r11.ebuild
@@ -190,11 +190,6 @@ MULTILIB_CHOST_TOOLS=(
src_prepare() {
default
- # Patch out the git reference so we can run eautoreconf
- sed \
- -e "s/m4_esyscmd_s(\[git describe --dirty\])/${PV}/" \
- -e '/^AM_MAINTAINER_MODE/d' \
- -i configure.ac || die
eautoreconf
# Fix for "make check". Upstream sometimes forgets to update this.
diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
b/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
index 99b7d0e574d9..639413ca7003 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
@@ -195,11 +195,6 @@ MULTILIB_CHOST_TOOLS=(
src_prepare() {
default
- # Patch out the git reference so we can run eautoreconf
- sed \
- -e "s/m4_esyscmd_s(\[git describe --dirty\])/${PV}/" \
- -e '/^AM_MAINTAINER_MODE/d' \
- -i configure.ac || die
eautoreconf
# Fix for "make check". Upstream sometimes forgets to update this.
diff --git a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
index 0654e5f25260..79cd8cec7b15 100644
--- a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
@@ -190,11 +190,6 @@ MULTILIB_CHOST_TOOLS=(
src_prepare() {
default
- # Patch out the git reference so we can run eautoreconf
- sed \
- -e "s/m4_esyscmd_s(\[git describe --dirty\])/${PV}/" \
- -e '/^AM_MAINTAINER_MODE/d' \
- -i configure.ac || die
eautoreconf
# Fix for "make check". Upstream sometimes forgets to update this.