gentoo auto-resync : 15:12:2024 - 02:02:03

3 files changed, 3 insertions, 116 deletions

diff --git a/app-emacs/emacs-common/Manifest b/app-emacs/emacs-common/Manifest
index 5d3a999f9ced..92bc037fe3fd 100644
--- a/app-emacs/emacs-common/Manifest
+++ b/app-emacs/emacs-common/Manifest
@@ -1,5 +1,3 @@
 DIST emacs-common-1.10.tar.xz 61800 BLAKE2B 9dd25f45bf0db308417a6c35d87e3b8c6a7dd2f11de57ab2e6fcf81646aa5d5b54b76a78142de0e175df3ba4dce4f404f4774cb0a0d64c41e484de4ea4da6e6a SHA512 a9a9142394261b34ba625e48eaac489f713cef52df3ca801c2445759bf27d6335b4e7162305f314203d3efcd89f6e65a635595ffc0ad6e6082b735c5f8283b82
-DIST emacs-common-1.9.tar.xz 61812 BLAKE2B 6a87dae71120c2b41a4918dc788f7baa161eb0cc2b895a39e721330a6151a888cd9d930f93ac840557d3766847a7eb5ff8907d2fdde2c897a296887c0a5cf8c2 SHA512 b2e2df57a83548aeb7f7271a7d0b9ca27086d0c0ec80b6aa354016938ece70e8d9058214e7a813ec491bd67a61df8afbe4b55081b68a109ce527ba6cdba7e891
-EBUILD emacs-common-1.10.ebuild 3109 BLAKE2B 8fa574406c9dc39e744d2c3813fae7190ea53ac669c4a5b3f105e11735d7bf6071355491bd8ccbebc10f15e7e5084c6ff39c497e2704887099e35729fec526e6 SHA512 d362fd81cc15b1f6676330fc2afac1778c97d54466b5b0c05fee9ccaff2c01f7fbd7616cf35df439c748a17cd4dd924ac12bd827fb1170c8cb5d7d42cb14ca5f
-EBUILD emacs-common-1.9.ebuild 3119 BLAKE2B 6fd9c2fc70a5053949bcc38d0e967ff9cb1ce6d36ea832aeb1bb9b9b52860f9f6102d35500c0968f695449849e450f4a60b86c25ed4bc9fbbfc8b093d41bb1e2 SHA512 3430700cd49a4d2fc3b85c947a4ecac50760ec1b3130a9164e7456d4fea41cfdc65a6b950941478a890037f59050f9e7436ddc6c3f8f04a6a2024909fcc4b042
+EBUILD emacs-common-1.10.ebuild 3137 BLAKE2B 46550cda452355037e3748287a8f2f1aa7b427eb5351a575cb911f09424d715131fc28537bcfdb84ba91a4b4d31832171ca40838c9d0dfa86d3b2163cb3f474e SHA512 563d7b41951f3daa8ab5ea674453d45f955b0881d334b6b09bd21c5dd6fa0e337964f521171378fb3a11a951794eee411921437370f06ff14adbbdffe4822595
 MISC metadata.xml 535 BLAKE2B 6c6c5bb8ce0585a2bcd37f80f6426f1e4304715f142a36d186643f9f69054fc49f889847d1d76d34537152dc9d8310a066bce1ea40b2ff7c30ee4c2dcf3b185b SHA512 0a200530dc27ea2a6ca1860d70964027d9bc748b19459639f3a946ffc4f83c965d339683a1ceb1f9cb03212a1877dc1ca51a2a1dfd1c8c9fc814aff67ad177c1
diff --git a/app-emacs/emacs-common/emacs-common-1.10.ebuild b/app-emacs/emacs-common/emacs-common-1.10.ebuild
index d1a861b5f2ca..2966e899528c 100644
--- a/app-emacs/emacs-common/emacs-common-1.10.ebuild
+++ b/app-emacs/emacs-common/emacs-common-1.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit elisp-common desktop gnome2-utils readme.gentoo-r1
+inherit elisp-common desktop eapi9-pipestatus gnome2-utils readme.gentoo-r1
 
 DESCRIPTION="Common files needed by all GNU Emacs versions"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
@@ -22,7 +22,7 @@ IDEPEND="gui? ( gsettings? ( dev-libs/glib ) )"
 src_install() {
 	insinto "${SITELISP}"
 	sed -e "s:@libdir@:$(get_libdir):g" subdirs.el.in | newins - subdirs.el
-	assert
+	pipestatus || die
 	newins site-gentoo.el{,.orig}
 
 	keepdir /etc/emacs
diff --git a/app-emacs/emacs-common/emacs-common-1.9.ebuild b/app-emacs/emacs-common/emacs-common-1.9.ebuild
deleted file mode 100644
index c1925843f94d..000000000000
--- a/app-emacs/emacs-common/emacs-common-1.9.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common desktop gnome2-utils xdg-utils readme.gentoo-r1
-
-DESCRIPTION="Common files needed by all GNU Emacs versions"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="games gsettings gui"
-
-DEPEND="games? ( acct-group/gamestat )"
-RDEPEND="${DEPEND}"
-PDEPEND=">=app-editors/emacs-23.1:*"
-IDEPEND="gui? ( gsettings? ( dev-libs/glib ) )"
-
-src_install() {
-	insinto "${SITELISP}"
-	sed -e "s:@libdir@:$(get_libdir):g" subdirs.el.in | newins - subdirs.el
-	assert
-	newins site-gentoo.el{,.orig}
-
-	keepdir /etc/emacs
-	insinto /etc/emacs
-	doins site-start.el
-
-	if use games; then
-		keepdir /var/games/emacs
-		fowners 0:gamestat /var/games/emacs
-		fperms g+w /var/games/emacs
-	fi
-
-	if use gui; then
-		local i
-		domenu emacs.desktop emacsclient.desktop
-
-		pushd icons || die
-		newicon sink.png emacs-sink.png
-		newicon emacs25_48.png emacs.png
-		for i in 16 24 32 48 128; do
-			[[ ${i} -le 48 ]] && newicon -s ${i} emacs22_${i}.png emacs22.png
-			newicon -s ${i} emacs23_${i}.png emacs23.png
-			newicon -s ${i} emacs25_${i}.png emacs.png
-		done
-		doicon -s scalable emacs23.svg
-		newicon -s scalable emacs25.svg emacs.svg
-		popd
-
-		if use gsettings; then
-			insinto /usr/share/glib-2.0/schemas
-			doins org.gnu.emacs.defaults.gschema.xml
-		fi
-	fi
-
-	DOC_CONTENTS="All site initialisation for Gentoo-installed packages is
-		added to ${SITELISP}/site-gentoo.el. In order for this site
-		initialisation to be loaded for all users automatically, a default
-		site startup file /etc/emacs/site-start.el is installed. You are
-		responsible for maintenance of this file.
-		\n\nAlternatively, individual users can add the following command:
-		\n\n(require 'site-gentoo)
-		\n\nto their ~/.emacs initialisation files, or, for greater
-		flexibility, users may load single package-specific initialisation
-		files from the ${SITELISP}/site-gentoo.d/ directory."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# make sure that site-gentoo.el exists since site-start.el requires it
-	if [[ ! -f ${ED}${SITELISP}/site-gentoo.el ]]; then		#554518
-		mv "${ED}${SITELISP}"/site-gentoo.el{.orig,} || die
-	fi
-	if [[ -d ${EROOT}${SITELISP} ]]; then
-		elisp-site-regen
-		cp "${EROOT}${SITELISP}/site-gentoo.el" "${ED}${SITELISP}/" || die
-	fi
-
-	if use games; then
-		local f
-		for f in /var/games/emacs/{snake,tetris}-scores; do
-			if [[ -e ${EROOT}${f} ]]; then
-				cp "${EROOT}${f}" "${ED}${f}" || die
-			fi
-			touch "${ED}${f}" || die
-			chgrp gamestat "${ED}${f}" || die
-			chmod g+w "${ED}${f}" || die
-		done
-	fi
-}
-
-pkg_postinst() {
-	if use gui; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-		use gsettings && gnome2_schemas_update
-	fi
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	if use gui; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-		use gsettings && gnome2_schemas_update
-	fi
-}