Attachment #675208 for bug #718760

Lines 3-9 Link Here

(-)a/app-editors/emacs/emacs-27.1-r2.ebuild (-5 / +29 lines)
3		3
4	EAPI=7	4	EAPI=7
5		5
6	inherit autotools elisp-common flag-o-matic readme.gentoo-r1	6	inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
7		7
8	if [[ ${PV##*.} = 9999 ]]; then	8	if [[ ${PV##*.} = 9999 ]]; then
9	inherit git-r3	9	inherit git-r3
Lines 262-267 src_configure() { Link Here
262	fi	262	fi
263	fi	263	fi
264		264
		265	# Configure a CBUILD directory when cross-compiling to make tools.
		266	# Also don't try to execute the binary for dumping during the build.
		267	if tc-is-cross-compiler; then
		268	mkdir "${S}-build" && pushd "${S}-build" >/dev/null \|\| die
		269	ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
		270	popd >/dev/null \|\| die
		271	myconf+=" --with-dumping=none"
		272	fi
		273
265	econf \	274	econf \
266	--program-suffix="-${EMACS_SUFFIX}" \	275	--program-suffix="-${EMACS_SUFFIX}" \
267	--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \	276	--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
Lines 273-278 src_configure() { Link Here
273	--without-pop \	282	--without-pop \
274	--with-dumping=pdumper \	283	--with-dumping=pdumper \
275	--with-file-notification=$(usev inotify \|\| usev gfile \|\| echo no) \	284	--with-file-notification=$(usev inotify \|\| usev gfile \|\| echo no) \
		285	--with-pdumper \
276	$(use_enable acl) \	286	$(use_enable acl) \
277	$(use_with dbus) \	287	$(use_with dbus) \
278	$(use_with dynamic-loading modules) \	288	$(use_with dynamic-loading modules) \
Lines 293-302 src_configure() { Link Here
293	${myconf}	303	${myconf}
294	}	304	}
295		305
296	#src_compile() {	306	src_compile() {
297	# # Disable sandbox when dumping. For the unbelievers, see bug #131505	307	if tc-is-cross-compiler; then
298	# emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"	308	# Build native tools for compiling lisp etc.
299	#}	309	emake -C "${S}-build" src
		310	# Save native build tools in the cross-directory.
		311	emake lib # Cross-compile dependencies first for timestamps.
		312	cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src \|\| die
		313	# Specify the native Emacs to compile lisp.
		314	emake -C lisp all EMACS="${S}-build/src/emacs"
		315	fi
		316
		317	emake
		318	}
300		319
301	src_install() {	320	src_install() {
302	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install	321	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
Lines 400-405 src_install() { Link Here
400	use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in	419	use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
401	\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink	420	\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
402	it into /Applications by yourself."	421	it into /Applications by yourself."
		422	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write a portable
		423	dump file due to being cross-compiled. To create this file at run
		424	time, execute the following command:\\nemacs
		425	--batch --eval='(dump-emacs-portable
		426	\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
403	readme.gentoo_create_doc	427	readme.gentoo_create_doc
404	}	428	}
405		429

Lines 3-9 Link Here

(-)a/app-editors/emacs/emacs-27.1.9999-r1.ebuild (-5 / +29 lines)
3		3
4	EAPI=7	4	EAPI=7
5		5
6	inherit autotools elisp-common flag-o-matic readme.gentoo-r1	6	inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
7		7
8	if [[ ${PV##*.} = 9999 ]]; then	8	if [[ ${PV##*.} = 9999 ]]; then
9	inherit git-r3	9	inherit git-r3
Lines 261-266 src_configure() { Link Here
261	fi	261	fi
262	fi	262	fi
263		263
		264	# Configure a CBUILD directory when cross-compiling to make tools.
		265	# Also don't try to execute the binary for dumping during the build.
		266	if tc-is-cross-compiler; then
		267	mkdir "${S}-build" && pushd "${S}-build" >/dev/null \|\| die
		268	ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
		269	popd >/dev/null \|\| die
		270	myconf+=" --with-dumping=none"
		271	fi
		272
264	econf \	273	econf \
265	--program-suffix="-${EMACS_SUFFIX}" \	274	--program-suffix="-${EMACS_SUFFIX}" \
266	--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \	275	--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
Lines 272-277 src_configure() { Link Here
272	--without-pop \	281	--without-pop \
273	--with-dumping=pdumper \	282	--with-dumping=pdumper \
274	--with-file-notification=$(usev inotify \|\| usev gfile \|\| echo no) \	283	--with-file-notification=$(usev inotify \|\| usev gfile \|\| echo no) \
		284	--with-pdumper \
275	$(use_enable acl) \	285	$(use_enable acl) \
276	$(use_with dbus) \	286	$(use_with dbus) \
277	$(use_with dynamic-loading modules) \	287	$(use_with dynamic-loading modules) \
Lines 292-301 src_configure() { Link Here
292	${myconf}	302	${myconf}
293	}	303	}
294		304
295	#src_compile() {	305	src_compile() {
296	# # Disable sandbox when dumping. For the unbelievers, see bug #131505	306	if tc-is-cross-compiler; then
297	# emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"	307	# Build native tools for compiling lisp etc.
298	#}	308	emake -C "${S}-build" src
		309	# Save native build tools in the cross-directory.
		310	emake lib # Cross-compile dependencies first for timestamps.
		311	cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src \|\| die
		312	# Specify the native Emacs to compile lisp.
		313	emake -C lisp all EMACS="${S}-build/src/emacs"
		314	fi
		315
		316	emake
		317	}
299		318
300	src_install() {	319	src_install() {
301	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install	320	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
Lines 399-404 src_install() { Link Here
399	use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in	418	use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
400	\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink	419	\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
401	it into /Applications by yourself."	420	it into /Applications by yourself."
		421	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write a portable
		422	dump file due to being cross-compiled. To create this file at run
		423	time, execute the following command:\\nemacs
		424	--batch --eval='(dump-emacs-portable
		425	\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
402	readme.gentoo_create_doc	426	readme.gentoo_create_doc
403	}	427	}
404		428

Lines 3-9 Link Here

(-)a/app-editors/emacs/emacs-28.0.9999.ebuild (-6 / +29 lines)
3		3
4	EAPI=7	4	EAPI=7
5		5
6	inherit autotools elisp-common flag-o-matic readme.gentoo-r1	6	inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
7		7
8	if [[ ${PV##*.} = 9999 ]]; then	8	if [[ ${PV##*.} = 9999 ]]; then
9	inherit git-r3	9	inherit git-r3
Lines 260-265 src_configure() { Link Here
260	fi	260	fi
261	fi	261	fi
262		262
		263	# Configure a CBUILD directory when cross-compiling to make tools.
		264	# Also don't try to execute the binary for dumping during the build.
		265	if tc-is-cross-compiler; then
		266	mkdir "${S}-build" && pushd "${S}-build" >/dev/null \|\| die
		267	ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
		268	popd >/dev/null \|\| die
		269	myconf+=" --with-dumping=none"
		270	fi
		271
263	econf \	272	econf \
264	--program-suffix="-${EMACS_SUFFIX}" \	273	--program-suffix="-${EMACS_SUFFIX}" \
265	--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \	274	--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
Lines 271-276 src_configure() { Link Here
271	--without-pop \	280	--without-pop \
272	--with-dumping=pdumper \	281	--with-dumping=pdumper \
273	--with-file-notification=$(usev inotify \|\| usev gfile \|\| echo no) \	282	--with-file-notification=$(usev inotify \|\| usev gfile \|\| echo no) \
		283	--with-pdumper \
274	$(use_enable acl) \	284	$(use_enable acl) \
275	$(use_with dbus) \	285	$(use_with dbus) \
276	$(use_with dynamic-loading modules) \	286	$(use_with dynamic-loading modules) \
Lines 291-300 src_configure() { Link Here
291	${myconf}	301	${myconf}
292	}	302	}
293		303
294	#src_compile() {	304	src_compile() {
295	# # Disable sandbox when dumping. For the unbelievers, see bug #131505	305	if tc-is-cross-compiler; then
296	# emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"	306	# Build native tools for compiling lisp etc.
297	#}	307	emake -C "${S}-build" src
		308	# Save native build tools in the cross-directory.
		309	emake lib # Cross-compile dependencies first for timestamps.
		310	cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src \|\| die
		311	# Specify the native Emacs to compile lisp.
		312	emake -C lisp all EMACS="${S}-build/src/emacs"
		313	fi
		314
		315	emake
		316	}
298		317
299	src_install() {	318	src_install() {
300	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install	319	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
Lines 398-403 src_install() { Link Here
398	use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in	417	use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
399	\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink	418	\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
400	it into /Applications by yourself."	419	it into /Applications by yourself."
		420	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write a portable
		421	dump file due to being cross-compiled. To create this file at run
		422	time, execute the following command:\\nemacs
		423	--batch --eval='(dump-emacs-portable
		424	\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
401	readme.gentoo_create_doc	425	readme.gentoo_create_doc
402	}	426	}
403		427
404	-

Return to bug 718760