* [gentoo-commits] repo/gentoo:master commit in: profiles/base/, sys-devel/binutils/
@ 2022-09-06 3:41 Sam James
0 siblings, 0 replies; only message in thread
From: Sam James @ 2022-09-06 3:41 UTC (permalink / raw
To: gentoo-commits
commit: 54fd4eb35a3655b08fac7d75a91ccf2697ffe252
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 6 03:40:51 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 6 03:40:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54fd4eb3
sys-devel/binutils: drop USE=emacs (moved to app-emacs/dwarf-mode)
Signed-off-by: Sam James <sam <AT> gentoo.org>
profiles/base/package.use.mask | 4 ----
sys-devel/binutils/binutils-2.38-r2.ebuild | 14 +-------------
sys-devel/binutils/binutils-2.39-r1.ebuild | 14 +-------------
sys-devel/binutils/binutils-9999.ebuild | 14 +-------------
4 files changed, 3 insertions(+), 43 deletions(-)
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index e1aee943aef6..e6ad4c800221 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -16,10 +16,6 @@
app-arch/lbzip2 symlink
app-arch/pigz symlink
-# Sam James <sam@gentoo.org> (2022-09-05)
-# Needs to be split into a separate package to avoid collisions
-sys-devel/binutils emacs
-
# Sam James <sam@gentoo.org> (2022-08-26)
# Broken at runtime for now (bug #865113).
sys-devel/binutils gprofng
diff --git a/sys-devel/binutils/binutils-2.38-r2.ebuild b/sys-devel/binutils/binutils-2.38-r2.ebuild
index 7f49d0e9d113..557b4622882d 100644
--- a/sys-devel/binutils/binutils-2.38-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.38-r2.ebuild
@@ -8,7 +8,7 @@ inherit elisp-common libtool flag-o-matic gnuconfig strip-linguas toolchain-func
DESCRIPTION="Tools necessary to build programs"
HOMEPAGE="https://sourceware.org/binutils/"
LICENSE="GPL-3+"
-IUSE="cet default-gold doc emacs +gold multitarget +nls pgo +plugins static-libs test vanilla"
+IUSE="cet default-gold doc +gold multitarget +nls pgo +plugins static-libs test vanilla"
REQUIRED_USE="default-gold? ( gold )"
# Variables that can be set here (ignored for live ebuilds)
@@ -52,7 +52,6 @@ is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
RDEPEND="
>=sys-devel/binutils-config-3
sys-libs/zlib
- emacs? ( >=app-editors/emacs-23.1:* )
"
DEPEND="${RDEPEND}"
BDEPEND="
@@ -312,8 +311,6 @@ src_compile() {
emake V=1 info
fi
- ! is_cross && use emacs && elisp-compile "${S}"/binutils/dwarf-mode.el
-
# we nuke the manpages when we're left with junk
# (like when we bootstrap, no perl -> no manpages)
find . -name '*.1' -a -size 0 -delete
@@ -406,11 +403,6 @@ src_install() {
dodoc opcodes/ChangeLog*
fi
- if ! is_cross && use emacs ; then
- elisp-install ${PN} "${S}"/binutils/dwarf-mode.el{,c}
- elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
- fi
-
# Remove shared info pages
rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
@@ -422,8 +414,6 @@ pkg_postinst() {
# Make sure this ${CTARGET} has a binutils version selected
[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
binutils-config ${CTARGET}-${PV}
-
- ! is_cross && use emacs && elisp-site-regen
}
pkg_postrm() {
@@ -447,8 +437,6 @@ pkg_postrm() {
elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
binutils-config ${CTARGET}-${PV}
fi
-
- ! is_cross && use emacs && elisp-site-regen
}
# Note [slotting support]
diff --git a/sys-devel/binutils/binutils-2.39-r1.ebuild b/sys-devel/binutils/binutils-2.39-r1.ebuild
index ed23cdc5a829..816ef121f08a 100644
--- a/sys-devel/binutils/binutils-2.39-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.39-r1.ebuild
@@ -8,7 +8,7 @@ inherit elisp-common libtool flag-o-matic gnuconfig strip-linguas toolchain-func
DESCRIPTION="Tools necessary to build programs"
HOMEPAGE="https://sourceware.org/binutils/"
LICENSE="GPL-3+"
-IUSE="cet default-gold doc emacs gold gprofng multitarget +nls pgo +plugins static-libs test vanilla"
+IUSE="cet default-gold doc gold gprofng multitarget +nls pgo +plugins static-libs test vanilla"
REQUIRED_USE="default-gold? ( gold )"
# Variables that can be set here (ignored for live ebuilds)
@@ -52,7 +52,6 @@ is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
RDEPEND="
>=sys-devel/binutils-config-3
sys-libs/zlib
- emacs? ( >=app-editors/emacs-23.1:* )
"
DEPEND="${RDEPEND}"
BDEPEND="
@@ -323,8 +322,6 @@ src_compile() {
emake V=1 info
fi
- ! is_cross && use emacs && elisp-compile "${S}"/binutils/dwarf-mode.el
-
# we nuke the manpages when we're left with junk
# (like when we bootstrap, no perl -> no manpages)
find . -name '*.1' -a -size 0 -delete
@@ -426,11 +423,6 @@ src_install() {
dodoc opcodes/ChangeLog*
fi
- if ! is_cross && use emacs ; then
- elisp-install ${PN} "${S}"/binutils/dwarf-mode.el{,c}
- elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
- fi
-
# Remove shared info pages
rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
@@ -442,8 +434,6 @@ pkg_postinst() {
# Make sure this ${CTARGET} has a binutils version selected
[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
binutils-config ${CTARGET}-${PV}
-
- ! is_cross && use emacs && elisp-site-regen
}
pkg_postrm() {
@@ -467,8 +457,6 @@ pkg_postrm() {
elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
binutils-config ${CTARGET}-${PV}
fi
-
- ! is_cross && use emacs && elisp-site-regen
}
# Note [slotting support]
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild
index 98858772e782..033e36f10292 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -8,7 +8,7 @@ inherit elisp-common libtool flag-o-matic gnuconfig strip-linguas toolchain-func
DESCRIPTION="Tools necessary to build programs"
HOMEPAGE="https://sourceware.org/binutils/"
LICENSE="GPL-3+"
-IUSE="cet default-gold doc emacs gold gprofng multitarget +nls pgo +plugins static-libs test vanilla"
+IUSE="cet default-gold doc gold gprofng multitarget +nls pgo +plugins static-libs test vanilla"
REQUIRED_USE="default-gold? ( gold )"
# Variables that can be set here (ignored for live ebuilds)
@@ -53,7 +53,6 @@ is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
RDEPEND="
>=sys-devel/binutils-config-3
sys-libs/zlib
- emacs? ( >=app-editors/emacs-23.1:* )
"
DEPEND="${RDEPEND}"
BDEPEND="
@@ -324,8 +323,6 @@ src_compile() {
emake V=1 info
fi
- ! is_cross && use emacs && elisp-compile "${S}"/binutils/dwarf-mode.el
-
# we nuke the manpages when we're left with junk
# (like when we bootstrap, no perl -> no manpages)
find . -name '*.1' -a -size 0 -delete
@@ -427,11 +424,6 @@ src_install() {
dodoc opcodes/ChangeLog*
fi
- if ! is_cross && use emacs ; then
- elisp-install ${PN} "${S}"/binutils/dwarf-mode.el{,c}
- elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
- fi
-
# Remove shared info pages
rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
@@ -443,8 +435,6 @@ pkg_postinst() {
# Make sure this ${CTARGET} has a binutils version selected
[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
binutils-config ${CTARGET}-${PV}
-
- ! is_cross && use emacs && elisp-site-regen
}
pkg_postrm() {
@@ -468,8 +458,6 @@ pkg_postrm() {
elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
binutils-config ${CTARGET}-${PV}
fi
-
- ! is_cross && use emacs && elisp-site-regen
}
# Note [slotting support]
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2022-09-06 3:41 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-06 3:41 [gentoo-commits] repo/gentoo:master commit in: profiles/base/, sys-devel/binutils/ Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox