gentoo auto-resync : 01:10:2022 - 07:10:12

4 files changed, 8 insertions, 167 deletions

diff --git a/dev-libs/libvterm/Manifest b/dev-libs/libvterm/Manifest
index c9ebf1cb0dae..7253bb361653 100644
--- a/dev-libs/libvterm/Manifest
+++ b/dev-libs/libvterm/Manifest
@@ -1,9 +1,7 @@
 AUX libvterm-0.1.4-slibtool.patch 2251 BLAKE2B d8484447c8a7e352514b298634d3e39bf606a5669cda67ef906f29b4a411737d81277e060fdd01cb14d1d04d329af1207dbeee475baff5cabc7afe9b5573ac78 SHA512 dd8d3b8c192bd6f6b357f7c5849a0b2a94661410e7f3cf5f6301a3cd34884362a54dc3ac593895f186ce3ce3628c2a8804f555107fb57d9a82a91ddd8cdca39e
-AUX libvterm-0.2-slibtool.patch 2328 BLAKE2B 9a03c8fae1228e07eb7245c06f46fe489760a6c2e4b183fa27444169254369f8ce71e27b011b9b6370eed6422d04993f0bdf3662266ac5f88e16d567aec55230 SHA512 fc714e88f3dcbaf48667e49377639ed2d58bdc9000b1f909108ee6d98dbdadd390f6b66f311524a57ce2ca83488d3d745e431816b572cdd73f9d63714eb85d16
 DIST libvterm-0.1.4.tar.gz 69122 BLAKE2B 4f0acc9ec6755c4a840e5df6c32c44e12c5316b5c5918d0e8eada19d819736c3e5b9090b468e32b3141a7fbb5ba226e365be27d6d1d9ca22f9f5e365fc3971c2 SHA512 90b5d47417e3f469df5c6574a27d12bd6bd1571d17cab7c4ac0ee61b1dbcb6361987f6fdfd11e314ea32f8958ec165c319a34d0f77288947c7cbc11de697d524
-DIST libvterm-0.2.tar.gz 79712 BLAKE2B db17d15550a595652368edd7ee0ccab2a69effa79677a23d6ee94731fc05d685df0de843d2e953cd59d2077922e72834d7ab09eaf5260aed869d9511cfd224a7 SHA512 bc99ae4fbdc165ced92c10fb0168ae6da2ed702208064616fefcd42aba71c57b7d42a08bc5b0e7e1ebda8cc4b5682d16059bdd2edfb12fbd8ac97527e854b14c
+DIST libvterm-0.3.tar.gz 83861 BLAKE2B a2e8e9d80698880d87f9d26977a4e3dec7b520c3096d0ca6f7823254eeebe51666380ed2a5c05c923dd8b138f15c87e671fdfb03e5511c01711e112cdda9867a SHA512 2a7b6831476465d6a9f7c792406f4e3c4eca0c3dbce4b7031f2646c87e33692128a3d3ce27e1541403772cc0b5eface7bd41325e1e5300c3915bfc0bac97a896
 EBUILD libvterm-0.1.4-r1.ebuild 728 BLAKE2B 463cd2bf20ef1c8eba98789969bb2dab24599a2923c13e204d73ddbe407cd957ed37938f388603b4a542b71b369eed2aab249f3061c0c7b417f1e365b4fd5085 SHA512 45bdbde642172c252b94375f44207a1a011cdc5fd36a2330ced3434c9059dcb27277f076ba5d82542b7851f4699f3f673da3c85295c0e4c2ef1cfd77050f3f05
 EBUILD libvterm-0.1.4.ebuild 882 BLAKE2B e4f2e22e191ce35883e9fa2700222e55b8c5d482251aa5dd9f35d982fa18d20371ff3781a5962a07aeade487ee0c0e4df474023894c035154aa79425e477dc81 SHA512 70201223cdcad83064d87b949525040294d925002e4b12faf318353a211171a596d3992413731c8d71b377bc866095d9811a4bb110d03b414022b1bcf64b33e3
-EBUILD libvterm-0.2-r1.ebuild 941 BLAKE2B af9950eb2c5ecad18c968814394ffac2cebb41199df8b06f208ca58594a884f6b95f3f62c9ca2d42313998b4181aa2852cfd0aee43da9eedfed4d18e62d4a19b SHA512 d9d6fd02caf0e0541ccd74f2690237216664c5d6a6eea928b2c6b4c4a88ab89ae80f7ca7737cb82295213f1dfcbb9d8b743cb96b6afb9d24e4137806166073e5
-EBUILD libvterm-0.2.ebuild 1098 BLAKE2B afaf31a7a3da3eb8817b796f70d8388a26f8006bbbed97d4906ff365e5f81864be7009e91c94aebfa0c76b56f396e7f3d58920733ad0108578b4acf9834be6c0 SHA512 ad3e3b00c078bf7d59682e8072058223cae92251e7fdbf9095efd37c4b4555a0c1da2f21f8712a4f712c17e8f3a0ba47001d9e5e9f8220e930f6496e1e455613
+EBUILD libvterm-0.3.ebuild 777 BLAKE2B a25765bcd54f73ac1f6bc552e253675bc69edd372b2851f130d51705e8c8679d4e080a2051b608a41d97dc327a76a3132b08657cebac2ce973974a6976fabe95 SHA512 f125bf30f72d4ea72cccdbaf7ce2bc077f533dd0bc0cb6ad1f451c1d9c86d3685d5b54d56b3da9cf121889a4b46db96e685ab6ae9eb26abf364d64799f617b1a
 MISC metadata.xml 326 BLAKE2B 1ede96c6ed5288e9f8603f2c1fd2daad8bf48384c09b01de355628fd970e3f252b6d064cff58d70fb5838cdf0edaa71c6d83e65f240e0ce48559ef74cbff43b3 SHA512 951e8795d8482cd230a256c4084f5d0e28d9cfb7fdae75f239f72b7d67d900c9545b47bdafc8260eec393c302eed4fdd70912e965521312705fcb4ddb281d814
diff --git a/dev-libs/libvterm/files/libvterm-0.2-slibtool.patch b/dev-libs/libvterm/files/libvterm-0.2-slibtool.patch
deleted file mode 100644
index 5f6356da2761..000000000000
--- a/dev-libs/libvterm/files/libvterm-0.2-slibtool.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From: orbea <orbea@riseup.net>
-Date: Thu, 14 Jul 2022 13:18:26 -0700
-Subject: [PATCH] build: Add a minimal configures script
-
-When building libvterm with slibtool using the rlibtool symlink the
-build will fail when the generated libtool is not found. This file is
-required with rlibtool so that the build can determine if the build
-should be shared, static or both.
-
-This can be solved by adding a minimal configure script.
-
-The build steps are now:
-
-autoreconf -fi
-./configure
-make
-make install
-
-diff --git a/Makefile b/Makefile.in
-similarity index 90%
-rename from Makefile
-rename to Makefile.in
-index e3c1c39..70e7ca2 100644
---- a/Makefile
-+++ b/Makefile.in
-@@ -1,13 +1,13 @@
--ifeq ($(shell uname),Darwin)
--  LIBTOOL ?= glibtool
--else
--  LIBTOOL ?= libtool
--endif
-+top_builddir = @top_builddir@
-+
-+LIBTOOL = @LIBTOOL@
- 
- ifneq ($(VERBOSE),1)
-   LIBTOOL +=--quiet
- endif
- 
-+CC = @CC@
-+
- override CFLAGS +=-Wall -Iinclude -std=c99 -Wpedantic
- 
- ifeq ($(shell uname),SunOS)
-@@ -36,20 +36,21 @@ INCFILES=$(TBLFILES:.tbl=.inc)
- 
- HFILES_INT=$(sort $(wildcard src/*.h)) $(HFILES)
- 
--VERSION_MAJOR=0
--VERSION_MINOR=2
-+VERSION_MAJOR=@VERSION_MAJOR@
-+VERSION_MINOR=@VERSION_MINOR@
- 
- VERSION_CURRENT=0
- VERSION_REVISION=0
- VERSION_AGE=0
- 
--VERSION=$(VERSION_MAJOR).$(VERSION_MINOR)
-+VERSION=@PACKAGE_VERSION@
- 
--PREFIX=/usr/local
--BINDIR=$(PREFIX)/bin
--LIBDIR=$(PREFIX)/lib
--INCDIR=$(PREFIX)/include
--MANDIR=$(PREFIX)/share/man
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+BINDIR=@bindir@
-+LIBDIR=@libdir@
-+INCDIR=@includedir@
-+MANDIR=@mandir@
- MAN3DIR=$(MANDIR)/man3
- 
- all: $(LIBRARY) $(BINFILES)
-@@ -73,7 +74,7 @@ src/encoding.lo: $(INCFILES)
- 
- bin/%: bin/%.c $(LIBRARY)
- 	@echo CC $<
--	@$(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) -o $@ $< -lvterm $(LDFLAGS)
-+	@$(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
- 
- t/harness.lo: t/harness.c $(HFILES)
- 	@echo CC $<
-diff --git a/configure.ac b/configure.ac
-new file mode 100644
-index 0000000..39f7767
---- /dev/null
-+++ b/configure.ac
-@@ -0,0 +1,14 @@
-+m4_define([version_major], [0])
-+m4_define([version_minor], [2])
-+
-+AC_INIT([libvterm], [version_major.version_minor])
-+AC_CONFIG_FILES([Makefile])
-+
-+LT_INIT
-+
-+AC_SUBST([top_builddir], [$abs_builddir])
-+
-+AC_SUBST([VERSION_MAJOR], [version_major])
-+AC_SUBST([VERSION_MINOR], [version_minor])
-+
-+AC_OUTPUT
diff --git a/dev-libs/libvterm/libvterm-0.2.ebuild b/dev-libs/libvterm/libvterm-0.2.ebuild
deleted file mode 100644
index 84e1e689e51e..000000000000
--- a/dev-libs/libvterm/libvterm-0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
-HOMEPAGE="https://www.leonerd.org.uk/code/libvterm/"
-SRC_URI="https://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-# Fedora have a revert patch for now:
-# https://src.fedoraproject.org/rpms/libvterm/blob/rawhide/f/libvterm-0.2-fix-resize-buffer.patch
-# so let's see if 0.2.1 is any better or if this is actually needed for us?
-#KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
-
-BDEPEND="
-	dev-lang/perl
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-RDEPEND="!dev-libs/libvterm-neovim"
-
-src_compile() {
-	tc-export CC
-
-	append-cflags -fPIC
-	emake VERBOSE=1 PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-}
-
-src_install() {
-	emake \
-		VERBOSE=1 \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" install
-
-	find "${ED}" -name '*.la' -delete || die "Failed to prune libtool files"
-}
diff --git a/dev-libs/libvterm/libvterm-0.2-r1.ebuild b/dev-libs/libvterm/libvterm-0.3.ebuild
index 3e8037c9ec7b..5011f386127d 100644
--- a/dev-libs/libvterm/libvterm-0.2-r1.ebuild
+++ b/dev-libs/libvterm/libvterm-0.3.ebuild
@@ -3,38 +3,26 @@
 
 EAPI=8
 
-inherit autotools
-
 DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
 HOMEPAGE="https://www.leonerd.org.uk/code/libvterm/"
 SRC_URI="https://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-# Fedora have a revert patch for now:
-# https://src.fedoraproject.org/rpms/libvterm/blob/rawhide/f/libvterm-0.2-fix-resize-buffer.patch
-# so let's see if 0.2.1 is any better or if this is actually needed for us?
-#KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
 
 BDEPEND="
 	dev-lang/perl
-	virtual/pkgconfig
+	sys-devel/libtool
 "
 
-PATCHES=(
-	"${FILESDIR}"/${P}-slibtool.patch # 779034
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
 src_compile() {
-	emake VERBOSE=1
+	emake VERBOSE=1 PREFIX="${EPREFIX}"/usr LIBDIR="${EPREFIX}/usr/$(get_libdir)"
 }
 
 src_install() {
-	emake VERBOSE=1 DESTDIR="${D}" install
+	emake VERBOSE=1 DESTDIR="${D}" PREFIX="${EPREFIX}"/usr LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+
 	find "${ED}" -name '*.la' -delete || die "Failed to prune libtool files"
+	find "${ED}" -name '*.a' -delete || die
 }