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 4A8D1138334 for ; Sat, 23 Feb 2019 20:58:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0F7E7E094B; Sat, 23 Feb 2019 20:58:07 +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 C3F81E094B for ; Sat, 23 Feb 2019 20:58:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 2A29333BEB8 for ; Sat, 23 Feb 2019 20:58:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9AC3A503 for ; Sat, 23 Feb 2019 20:58:03 +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: <1550955456.02cc97bbd9d8ea383fd9f362cae6cd60c5a18be3.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/emacs-vcs/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild X-VCS-Directories: app-editors/emacs-vcs/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 02cc97bbd9d8ea383fd9f362cae6cd60c5a18be3 X-VCS-Branch: master Date: Sat, 23 Feb 2019 20:58:03 +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: e784c95b-8a2f-499b-866a-bba5505b6e9f X-Archives-Hash: 4da3f58cbf3f8bfeac5deaaa545f0703 commit: 02cc97bbd9d8ea383fd9f362cae6cd60c5a18be3 Author: Ulrich Müller gentoo org> AuthorDate: Sat Feb 23 20:49:59 2019 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sat Feb 23 20:57:36 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02cc97bb app-editors/emacs-vcs: Move metainfo file to correct name. Drop test restriction in slot 26. Package-Manager: Portage-2.3.61, Repoman-2.3.12 Signed-off-by: Ulrich Müller gentoo.org> app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild | 21 ++++++++------------- app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild | 20 ++++++++------------ 2 files changed, 16 insertions(+), 25 deletions(-) diff --git a/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild index 8c8c1e0e0c8..4ae3b77727a 100644 --- a/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -30,7 +30,6 @@ LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="26" IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib" REQUIRED_USE="?? ( aqua X )" -RESTRICT="test" RDEPEND="sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 @@ -142,8 +141,7 @@ src_prepare() { eapply_user # Fix filename reference in redirected man page - sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \ - || die "unable to sed ctags.1" + sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die AT_M4DIR=m4 eautoreconf } @@ -285,14 +283,12 @@ src_compile() { src_install () { emake DESTDIR="${D}" NO_BIN_LINK=t install - mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \ - || die "moving emacs executable failed" - mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \ - || die "moving emacs man page failed" + mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die + mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die + mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die # move info dir to avoid collisions with the dir file generated by portage - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \ - || die "moving info dir failed" + mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig @@ -377,15 +373,14 @@ 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" + 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 "install-info failed" + install-info --info-dir="${ED}"${infodir} "${f}" || die fi done fi diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild index 5450edeeb08..735fbb98de7 100644 --- a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -143,8 +143,7 @@ src_prepare() { eapply_user # Fix filename reference in redirected man page - sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \ - || die "unable to sed ctags.1" + sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die AT_M4DIR=m4 eautoreconf } @@ -288,14 +287,12 @@ src_compile() { src_install () { emake DESTDIR="${D}" NO_BIN_LINK=t install - mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \ - || die "moving emacs executable failed" - mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \ - || die "moving emacs man page failed" + mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die + mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die + mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die # move info dir to avoid collisions with the dir file generated by portage - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \ - || die "moving info dir failed" + mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig @@ -380,15 +377,14 @@ 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" + 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 "install-info failed" + install-info --info-dir="${ED}"${infodir} "${f}" || die fi done fi