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 31ED913835A for ; Mon, 19 Apr 2021 22:42:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1E4BEE0855; Mon, 19 Apr 2021 22:42:01 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 EA6DEE0855 for ; Mon, 19 Apr 2021 22:42:00 +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 51173340E43 for ; Mon, 19 Apr 2021 22:41:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 796566BD for ; Mon, 19 Apr 2021 22:41:57 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1618872076.7b1c43db1f9a77334f4e87b96d8346da905a6380.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/elvis/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/elvis/elvis-2.2.0-r6.ebuild app-editors/elvis/elvis-2.2.0-r7.ebuild X-VCS-Directories: app-editors/elvis/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7b1c43db1f9a77334f4e87b96d8346da905a6380 X-VCS-Branch: master Date: Mon, 19 Apr 2021 22:41:57 +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: 0b0e1c13-13da-49ed-a4a7-68d4bf5b36e6 X-Archives-Hash: f3db30498cfd6ea0118c35b2bc32bf6d commit: 7b1c43db1f9a77334f4e87b96d8346da905a6380 Author: Sam James gentoo org> AuthorDate: Mon Apr 19 21:56:06 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon Apr 19 22:41:16 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b1c43db app-editors/elvis: drop 2.2.0-r6, 2.2.0-r7 Signed-off-by: Sam James gentoo.org> app-editors/elvis/elvis-2.2.0-r6.ebuild | 96 ------------------------------ app-editors/elvis/elvis-2.2.0-r7.ebuild | 101 -------------------------------- 2 files changed, 197 deletions(-) diff --git a/app-editors/elvis/elvis-2.2.0-r6.ebuild b/app-editors/elvis/elvis-2.2.0-r6.ebuild deleted file mode 100644 index 9fc2dbe91d1..00000000000 --- a/app-editors/elvis/elvis-2.2.0-r6.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit epatch versionator toolchain-funcs - -MY_PV=$(replace_version_separator 2 '_') - -DESCRIPTION="A vi/ex clone" -HOMEPAGE="ftp://ftp.cs.pdx.edu/pub/elvis/" -SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${PN}-${MY_PV}.tar.gz" - -LICENSE="Artistic" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86 ~ppc-macos ~sparc-solaris" -IUSE="X" - -RDEPEND=">=sys-libs/ncurses-5.7-r7:0= - X? ( - >=x11-libs/libX11-1.0.0 - >=x11-libs/libXt-1.0.0 - >=x11-libs/libXpm-3.5.4.2 - >=x11-libs/libXft-2.1.8.2 ) - app-eselect/eselect-vi" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto ) - virtual/pkgconfig" - -S=${WORKDIR}/${PN}-${MY_PV} - -src_prepare() { - epatch \ - "${FILESDIR}"/ft2.3-symbol-collision-fix.patch \ - "${FILESDIR}"/${P}-glibc-2.10.patch \ - "${FILESDIR}"/${P}-interix.patch -} - -src_configure() { - ./configure \ - --libs="$($(tc-getPKG_CONFIG) --libs ncurses)" \ - --prefix="${EPREFIX}"/usr \ - --bindir="${EPREFIX}"/usr/bin \ - --datadir="${EPREFIX}"/usr/share/elvis \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} \ - $(use_with X x) \ - || die - - # Some Makefile fixups (must happen after configure) - # Use our CFLAGS - sed -i -e "s:gcc -O2:$(tc-getCC) ${CFLAGS}:" Makefile || die "sed 1 failed" - - # We'll install the man-pages ourselves - sed -i -e '/^ sh instman.sh/d' Makefile || die "sed 2 failed" - - # Don't try to write to /etc - sed -i -e 's,/etc/elvis,${ED}/etc/elvis,g' Makefile || die "sed 3 failed" - - # Use LDFLAGS - sed -i -e "s#\$(CC) \$(CFLAGS)#\$(CC) \$(CFLAGS) ${LDFLAGS}#" Makefile || \ - die "sed 4 failed" -} - -src_install() { - dodir /usr/bin - dodir /usr/share/man/man1 - dodir /usr/share/elvis - dodir /usr/share/doc/${PF} - dodir /etc - emake install \ - PREFIX="${ED}"/usr \ - BINDIR="${ED}"/usr/bin \ - DATADIR="${ED}"/usr/share/elvis \ - DOCDIR="${ED}"/usr/share/doc/${PF} - - # Install the man-pages - mv doc/elvis.man doc/elvis.1 - mv doc/elvtags.man doc/elvtags.1 - mv doc/ref.man doc/ref.1 - doman doc/*.1 - - # Fixup some READMEs - sed -i -e "s,${ED},,g" "${ED}"/etc/elvis/README \ - || die 'sed /etc/elvis/README failed' - sed -i -e "s,${ED},,g" "${ED}"/usr/share/elvis/README \ - || die 'sed /usr/share/elvis/README failed' -} - -pkg_postinst() { - einfo "Setting /usr/bin/vi symlink" - eselect vi set "${PN}" -} - -pkg_postrm() { - einfo "Updating /usr/bin/vi symlink" - eselect vi update -} diff --git a/app-editors/elvis/elvis-2.2.0-r7.ebuild b/app-editors/elvis/elvis-2.2.0-r7.ebuild deleted file mode 100644 index 5df218c1ee9..00000000000 --- a/app-editors/elvis/elvis-2.2.0-r7.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit versionator toolchain-funcs - -MY_PV=$(replace_version_separator 2 '_') - -DESCRIPTION="A vi/ex clone" -HOMEPAGE="http://elvis.the-little-red-haired-girl.org" -SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${PN}-${MY_PV}.tar.gz" - -LICENSE="Artistic" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~sparc-solaris" -IUSE="X" - -RDEPEND=" - sys-libs/ncurses:0= - app-eselect/eselect-vi - X? ( - >=x11-libs/libX11-1.0.0 - >=x11-libs/libXt-1.0.0 - >=x11-libs/libXpm-3.5.4.2 - >=x11-libs/libXft-2.1.8.2 - )" - -DEPEND=" - ${RDEPEND} - X? ( x11-base/xorg-proto ) - virtual/pkgconfig" - -S="${WORKDIR}/${PN}-${MY_PV}" - -PATCHES=( - "${FILESDIR}"/ft2.3-symbol-collision-fix.patch - "${FILESDIR}"/${P}-glibc-2.10.patch - "${FILESDIR}"/${P}-interix.patch -) - -src_configure() { - ./configure \ - --libs="$($(tc-getPKG_CONFIG) --libs ncurses)" \ - --prefix="${EPREFIX}"/usr \ - --bindir="${EPREFIX}"/usr/bin \ - --datadir="${EPREFIX}"/usr/share/elvis \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} \ - $(use_with X x) \ - || die - - # Some Makefile fixups (must happen after configure) - # Use our CFLAGS - sed -i -e "s:gcc -O2:$(tc-getCC) ${CFLAGS}:" Makefile || die "sed 1 failed" - - # We'll install the man-pages ourselves - sed -i -e '/^ sh instman.sh/d' Makefile || die "sed 2 failed" - - # Don't try to write to /etc - sed -i -e 's,/etc/elvis,${ED}/etc/elvis,g' Makefile || die "sed 3 failed" - - # Use LDFLAGS - sed -i -e "s#\$(CC) \$(CFLAGS)#\$(CC) \$(CFLAGS) ${LDFLAGS}#" Makefile || \ - die "sed 4 failed" -} - -src_install() { - dodir /usr/bin - dodir /usr/share/man/man1 - dodir /usr/share/elvis - dodir /usr/share/doc/${PF} - dodir /etc - - emake install \ - PREFIX="${ED}"/usr \ - BINDIR="${ED}"/usr/bin \ - DATADIR="${ED}"/usr/share/elvis \ - DOCDIR="${ED}"/usr/share/doc/${PF} - - # Install the man-pages - mv doc/elvis.man doc/elvis.1 || die - mv doc/elvtags.man doc/elvtags.1 || die - mv doc/ref.man doc/ref.1 || die - doman doc/*.1 - - # Fixup some READMEs - sed -i -e "s,${ED},,g" "${ED}"/etc/elvis/README \ - || die 'sed /etc/elvis/README failed' - sed -i -e "s,${ED},,g" "${ED}"/usr/share/elvis/README \ - || die 'sed /usr/share/elvis/README failed' -} - -pkg_postinst() { - einfo "Setting /usr/bin/vi symlink" - eselect vi set "${PN}" -} - -pkg_postrm() { - einfo "Updating /usr/bin/vi symlink" - eselect vi update -}