gentoo resync : 28.04.2021

4 files changed, 2 insertions, 201 deletions

diff --git a/app-editors/elvis/Manifest b/app-editors/elvis/Manifest
index dec656982992..36ff2c3694dd 100644
--- a/app-editors/elvis/Manifest
+++ b/app-editors/elvis/Manifest
@@ -2,7 +2,5 @@ AUX elvis-2.2.0-glibc-2.10.patch 1526 BLAKE2B 4c49a42ade8a5bfb4140362d7237fa1e21
 AUX elvis-2.2.0-interix.patch 297 BLAKE2B be5b6d3ab880254f2fc271b85289ec64f3dc907936a71fc122b5ec37d7377c3d169af3c26b488c2e4bbdaf4562f3237a8850a867c3e67f568cedcc8d1cb604c6 SHA512 7215150c74b96ea441898435c02f342c0fac2e579363be5a95684a49b84e020275b6e9124b8fd449559e1e3217f96901c2887214ee61a4ca8484598a7cd42442
 AUX ft2.3-symbol-collision-fix.patch 2396 BLAKE2B a890da27b23700d2f6def41ab0a567ab3af899c291d0a06fdba4c567a5169da01ba61a3e4490faaf91a3a74b3bf91750f1426aeecc02452eb1355093e14d973f SHA512 14a2880f9984615f9876973e5eaea54846547d2871b8c2f1417c968e5e92c01612c954d39026671cb29656c4d6fd93d65f1bd6fc6325471346e1f56e3e1b97a3
 DIST elvis-2.2_0.tar.gz 1439293 BLAKE2B c061370a3a9a9d24bcdba65f1d16b5b8d7dd6a5a9e777949c80862f8e9ce879dac6685f625c0fd86cae26efbbf58277d9626be2f4e513d1b1bed131cc60eb95d SHA512 847cc9ac0af170798abd4725f7dc2ec74d4931fb761b58836d4016d36da5657176bd8cdcdae02bc08438b18e8ce2433eb3340ec2503630fd2992e83ba06adf42
-EBUILD elvis-2.2.0-r6.ebuild 2371 BLAKE2B 207ee8ce046e58ca0a7ac6e814da6327baadc122166c2f94ac1098414866cca6e578c37e1de55e683d6b8df8579adedb3bd706c670c5910c2dced12f432e0125 SHA512 9924b57b3e8af4f63ccba31944d2437bdf17682108a8dab6ac0d8c62acf6be6eef8c4e122bc15d261051300c51386d918f44d87defb775d11f85e08291b7a1fe
-EBUILD elvis-2.2.0-r7.ebuild 2379 BLAKE2B d047b05b67280a760e1f68b4038f72474d01f0766e771fb9612bea83a5b4aee47dacb1c8b0abe314e8002c2c2087fd3d8499d9a5bbd1b000a3a820467a240660 SHA512 ca56ad2a9755edd734079b82f6fdc098afd90d6d9169ec24ca76aaebbc3e26f857d2a10d408d327cded56f25ebe67e408b6f38cbf4c5051697e68ee390dc4aa2
-EBUILD elvis-2.2.0-r8.ebuild 2498 BLAKE2B d4bde6adeb77e9386b615618be3c540e7ab6f064a33f7ef27e596b0622af65bc16e51b2b59226def21a6ed8b42db5e491a71176582f04020d3d21831e413d007 SHA512 3eb10a4529919f144465dcac49c8b99c13a1479979c6892a4201aa42a1279dcf39493f42f7c73007f413da49593d8b5c73ae1af0c2cd1a36c7d4717a28df5b94
+EBUILD elvis-2.2.0-r8.ebuild 2494 BLAKE2B c0d74a06a03caecd4661e13423cd4460c986836270e3856eccb6b469be5997a51d66858dc4408683c19d3cbbb63433182af2b2539f532298e7ec0cadb38befc7 SHA512 f6e4a8e751c14c514225be2c038d6a1aea89c59b61dffbc051aadc66e5118dd2a68194bdac8420b31022f09de8b94b008ed7b03ba8c2a72d7717136cafc59a7b
 MISC metadata.xml 245 BLAKE2B d4f5ef381d0a479a17bfde792cd6828e5fa0ecdd26732c1a13c97fcae2f22396b879fb430aaea7680920d5ba897f78cfbb6e50bb2f65165613a5a0ba1f7dc609 SHA512 6d6d35ccbb839c939bc663cecb55e2178f5fd4e455ee3088b8847416d558dd3e7969f4c78bc445ff29503d6906fec12d302d7249e9adc8cb708d0790e681e5a2
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 fba833b8c828..000000000000
--- 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 eutils 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 5df218c1ee98..000000000000
--- 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
-}
diff --git a/app-editors/elvis/elvis-2.2.0-r8.ebuild b/app-editors/elvis/elvis-2.2.0-r8.ebuild
index c02af39932bb..969cfb24e3c5 100644
--- a/app-editors/elvis/elvis-2.2.0-r8.ebuild
+++ b/app-editors/elvis/elvis-2.2.0-r8.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="amd64 ppc ppc64 x86 ~ppc-macos ~sparc-solaris"
 IUSE="X doc"
 
 RDEPEND="