commit: 680fa5348a355e83a94bda07f59caaa3acd0d01d
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 25 12:01:36 2023 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 25 12:02:38 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=680fa534
app-editors/emacs: Minor reformatting of ebuild
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
app-editors/emacs/emacs-29.1-r5.ebuild | 9 +++++++--
app-editors/emacs/emacs-29.1-r6.ebuild | 9 +++++++--
app-editors/emacs/emacs-29.1.90.ebuild | 9 +++++++--
app-editors/emacs/emacs-29.1.9999.ebuild | 9 +++++++--
app-editors/emacs/emacs-30.0.9999.ebuild | 9 +++++++--
5 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/app-editors/emacs/emacs-29.1-r5.ebuild
b/app-editors/emacs/emacs-29.1-r5.ebuild
index 4b7c9693bece..03e386212118 100644
--- a/app-editors/emacs/emacs-29.1-r5.ebuild
+++ b/app-editors/emacs/emacs-29.1-r5.ebuild
@@ -393,7 +393,7 @@ src_compile() {
EMACS_EMAKE_ARGS=( EMACS="${S}-build/src/emacs" )
emake "${EMACS_EMAKE_ARGS[@]}" actual-all
else
- unset EMACS_EMAKE_ARGS
+ EMACS_EMAKE_ARGS=()
emake
fi
}
@@ -443,7 +443,12 @@ src_test() {
}
src_install() {
- emake "${EMACS_EMAKE_ARGS[@]}" DESTDIR="${D}" NO_BIN_LINK=t
BLESSMAIL_TARGET= install
+ emake \
+ "${EMACS_EMAKE_ARGS[@]}" \
+ DESTDIR="${D}" \
+ NO_BIN_LINK=t \
+ BLESSMAIL_TARGET="" \
+ install
mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
diff --git a/app-editors/emacs/emacs-29.1-r6.ebuild
b/app-editors/emacs/emacs-29.1-r6.ebuild
index 80e573a98f93..530bf23e5be8 100644
--- a/app-editors/emacs/emacs-29.1-r6.ebuild
+++ b/app-editors/emacs/emacs-29.1-r6.ebuild
@@ -393,7 +393,7 @@ src_compile() {
EMACS_EMAKE_ARGS=( EMACS="${S}-build/src/emacs" )
emake "${EMACS_EMAKE_ARGS[@]}" actual-all
else
- unset EMACS_EMAKE_ARGS
+ EMACS_EMAKE_ARGS=()
emake
fi
}
@@ -443,7 +443,12 @@ src_test() {
}
src_install() {
- emake "${EMACS_EMAKE_ARGS[@]}" DESTDIR="${D}" NO_BIN_LINK=t
BLESSMAIL_TARGET= install
+ emake \
+ "${EMACS_EMAKE_ARGS[@]}" \
+ DESTDIR="${D}" \
+ NO_BIN_LINK=t \
+ BLESSMAIL_TARGET="" \
+ install
mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
diff --git a/app-editors/emacs/emacs-29.1.90.ebuild
b/app-editors/emacs/emacs-29.1.90.ebuild
index 14dd93aefa00..350b224b93a8 100644
--- a/app-editors/emacs/emacs-29.1.90.ebuild
+++ b/app-editors/emacs/emacs-29.1.90.ebuild
@@ -390,7 +390,7 @@ src_compile() {
EMACS_EMAKE_ARGS=( EMACS="${S}-build/src/emacs" )
emake "${EMACS_EMAKE_ARGS[@]}" actual-all
else
- unset EMACS_EMAKE_ARGS
+ EMACS_EMAKE_ARGS=()
emake
fi
}
@@ -440,7 +440,12 @@ src_test() {
}
src_install() {
- emake "${EMACS_EMAKE_ARGS[@]}" DESTDIR="${D}" NO_BIN_LINK=t
BLESSMAIL_TARGET= install
+ emake \
+ "${EMACS_EMAKE_ARGS[@]}" \
+ DESTDIR="${D}" \
+ NO_BIN_LINK=t \
+ BLESSMAIL_TARGET="" \
+ install
mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
diff --git a/app-editors/emacs/emacs-29.1.9999.ebuild
b/app-editors/emacs/emacs-29.1.9999.ebuild
index 14dd93aefa00..350b224b93a8 100644
--- a/app-editors/emacs/emacs-29.1.9999.ebuild
+++ b/app-editors/emacs/emacs-29.1.9999.ebuild
@@ -390,7 +390,7 @@ src_compile() {
EMACS_EMAKE_ARGS=( EMACS="${S}-build/src/emacs" )
emake "${EMACS_EMAKE_ARGS[@]}" actual-all
else
- unset EMACS_EMAKE_ARGS
+ EMACS_EMAKE_ARGS=()
emake
fi
}
@@ -440,7 +440,12 @@ src_test() {
}
src_install() {
- emake "${EMACS_EMAKE_ARGS[@]}" DESTDIR="${D}" NO_BIN_LINK=t
BLESSMAIL_TARGET= install
+ emake \
+ "${EMACS_EMAKE_ARGS[@]}" \
+ DESTDIR="${D}" \
+ NO_BIN_LINK=t \
+ BLESSMAIL_TARGET="" \
+ install
mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
diff --git a/app-editors/emacs/emacs-30.0.9999.ebuild
b/app-editors/emacs/emacs-30.0.9999.ebuild
index ab14d02c094b..a157e4eceac9 100644
--- a/app-editors/emacs/emacs-30.0.9999.ebuild
+++ b/app-editors/emacs/emacs-30.0.9999.ebuild
@@ -392,7 +392,7 @@ src_compile() {
EMACS_EMAKE_ARGS=( EMACS="${S}-build/src/emacs" )
emake "${EMACS_EMAKE_ARGS[@]}" actual-all
else
- unset EMACS_EMAKE_ARGS
+ EMACS_EMAKE_ARGS=()
emake
fi
}
@@ -442,7 +442,12 @@ src_test() {
}
src_install() {
- emake "${EMACS_EMAKE_ARGS[@]}" DESTDIR="${D}" NO_BIN_LINK=t
BLESSMAIL_TARGET= install
+ emake \
+ "${EMACS_EMAKE_ARGS[@]}" \
+ DESTDIR="${D}" \
+ NO_BIN_LINK=t \
+ BLESSMAIL_TARGET="" \
+ install
mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
