From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 83EFF138334 for ; Fri, 22 Nov 2019 11:10:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BFA63E085A; Fri, 22 Nov 2019 11:10:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 742C8E085A for ; Fri, 22 Nov 2019 11:10:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D6C4934D1F7 for ; Fri, 22 Nov 2019 11:10:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 21EFF889 for ; Fri, 22 Nov 2019 11:10:33 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1574421022.beca2c5704531d3afee51b148e0e6d01927d5153.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/emacs/emacs-23.4-r18.ebuild app-editors/emacs/emacs-24.5-r7.ebuild app-editors/emacs/emacs-25.3-r6.ebuild app-editors/emacs/emacs-26.2.ebuild app-editors/emacs/emacs-26.3-r1.ebuild X-VCS-Directories: app-editors/emacs/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: beca2c5704531d3afee51b148e0e6d01927d5153 X-VCS-Branch: master Date: Fri, 22 Nov 2019 11:10:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 13224ea2-6caf-406d-b5a0-66c2ce578b24 X-Archives-Hash: d82c9db582500e6278a2b99c5c9dc769 commit: beca2c5704531d3afee51b148e0e6d01927d5153 Author: Ulrich Müller gentoo org> AuthorDate: Fri Nov 22 11:09:41 2019 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Fri Nov 22 11:10:22 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beca2c57 app-editors/emacs: Remove compatibility code in pkg_preinst. Needed only for Portage versions from before 2011. Since all ebuilds are EAPI 7 (approved in 2018), it should be safe to drop this. Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Ulrich Müller gentoo.org> app-editors/emacs/emacs-23.4-r18.ebuild | 15 ++------------- app-editors/emacs/emacs-24.5-r7.ebuild | 15 ++------------- app-editors/emacs/emacs-25.3-r6.ebuild | 15 ++------------- app-editors/emacs/emacs-26.2.ebuild | 14 ++------------ app-editors/emacs/emacs-26.3-r1.ebuild | 14 ++------------ 5 files changed, 10 insertions(+), 63 deletions(-) diff --git a/app-editors/emacs/emacs-23.4-r18.ebuild b/app-editors/emacs/emacs-23.4-r18.ebuild index a5179566d3f..7fa200d71b1 100644 --- a/app-editors/emacs/emacs-23.4-r18.ebuild +++ b/app-editors/emacs/emacs-23.4-r18.ebuild @@ -328,19 +328,8 @@ src_install () { pkg_preinst() { # move Info dir file to correct name - local infodir=/usr/share/info/${EMACS_SUFFIX} f - if [[ -f ${ED}${infodir}/dir.orig ]]; then - mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed" - elif [[ -d "${ED}"${infodir} ]]; then - # this should not happen in EAPI 4 - ewarn "Regenerating Info directory index in ${infodir} ..." - rm -f "${ED}"${infodir}/dir{,.*} - for f in "${ED}"${infodir}/*; do - if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then - install-info --info-dir="${ED}"${infodir} "${f}" \ - || die "install-info failed" - fi - done + if [[ -d ${ED}/usr/share/info ]]; then + mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die fi } diff --git a/app-editors/emacs/emacs-24.5-r7.ebuild b/app-editors/emacs/emacs-24.5-r7.ebuild index 80d215cacae..7a8a310132f 100644 --- a/app-editors/emacs/emacs-24.5-r7.ebuild +++ b/app-editors/emacs/emacs-24.5-r7.ebuild @@ -322,19 +322,8 @@ src_install () { pkg_preinst() { # move Info dir file to correct name - local infodir=/usr/share/info/${EMACS_SUFFIX} f - if [[ -f ${ED}${infodir}/dir.orig ]]; then - mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed" - elif [[ -d "${ED}"${infodir} ]]; then - # this should not happen in EAPI 4 - ewarn "Regenerating Info directory index in ${infodir} ..." - rm -f "${ED}"${infodir}/dir{,.*} - for f in "${ED}"${infodir}/*; do - if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then - install-info --info-dir="${ED}"${infodir} "${f}" \ - || die "install-info failed" - fi - done + if [[ -d ${ED}/usr/share/info ]]; then + mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die fi } diff --git a/app-editors/emacs/emacs-25.3-r6.ebuild b/app-editors/emacs/emacs-25.3-r6.ebuild index 757eadddc09..8825e18aa7e 100644 --- a/app-editors/emacs/emacs-25.3-r6.ebuild +++ b/app-editors/emacs/emacs-25.3-r6.ebuild @@ -330,19 +330,8 @@ src_install () { pkg_preinst() { # move Info dir file to correct name - local infodir=/usr/share/info/${EMACS_SUFFIX} f - if [[ -f ${ED}${infodir}/dir.orig ]]; then - mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed" - elif [[ -d "${ED}"${infodir} ]]; then - # this should not happen in EAPI 4 - ewarn "Regenerating Info directory index in ${infodir} ..." - rm -f "${ED}"${infodir}/dir{,.*} - for f in "${ED}"${infodir}/*; do - if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then - install-info --info-dir="${ED}"${infodir} "${f}" \ - || die "install-info failed" - fi - done + if [[ -d ${ED}/usr/share/info ]]; then + mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die fi } diff --git a/app-editors/emacs/emacs-26.2.ebuild b/app-editors/emacs/emacs-26.2.ebuild index 3ac8b0f94da..457aade942a 100644 --- a/app-editors/emacs/emacs-26.2.ebuild +++ b/app-editors/emacs/emacs-26.2.ebuild @@ -347,18 +347,8 @@ src_install () { pkg_preinst() { # move Info dir file to correct name - local infodir=/usr/share/info/${EMACS_SUFFIX} f - if [[ -f ${ED}${infodir}/dir.orig ]]; then - mv "${ED}"${infodir}/dir{.orig,} || die - elif [[ -d "${ED}"${infodir} ]]; then - # this should not happen in EAPI 4 - ewarn "Regenerating Info directory index in ${infodir} ..." - rm -f "${ED}"${infodir}/dir{,.*} - for f in "${ED}"${infodir}/*; do - if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then - install-info --info-dir="${ED}"${infodir} "${f}" || die - fi - done + if [[ -d ${ED}/usr/share/info ]]; then + mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die fi } diff --git a/app-editors/emacs/emacs-26.3-r1.ebuild b/app-editors/emacs/emacs-26.3-r1.ebuild index eeb8091162b..ba274338365 100644 --- a/app-editors/emacs/emacs-26.3-r1.ebuild +++ b/app-editors/emacs/emacs-26.3-r1.ebuild @@ -356,18 +356,8 @@ src_install () { pkg_preinst() { # move Info dir file to correct name - local infodir=/usr/share/info/${EMACS_SUFFIX} f - if [[ -f ${ED}${infodir}/dir.orig ]]; then - mv "${ED}"${infodir}/dir{.orig,} || die - elif [[ -d "${ED}"${infodir} ]]; then - # this should not happen in EAPI 4 - ewarn "Regenerating Info directory index in ${infodir} ..." - rm -f "${ED}"${infodir}/dir{,.*} - for f in "${ED}"${infodir}/*; do - if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then - install-info --info-dir="${ED}"${infodir} "${f}" || die - fi - done + if [[ -d ${ED}/usr/share/info ]]; then + mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die fi }