From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- dev-libs/unibilium/Manifest | 8 +- .../unibilium/files/unibilium-2.1.1-libtool.patch | 101 +++++++++++++++++++++ dev-libs/unibilium/unibilium-2.0.0.ebuild | 31 ------- dev-libs/unibilium/unibilium-2.1.0.ebuild | 35 ------- dev-libs/unibilium/unibilium-2.1.1-r1.ebuild | 31 +++++++ dev-libs/unibilium/unibilium-2.1.1.ebuild | 4 +- 6 files changed, 137 insertions(+), 73 deletions(-) create mode 100644 dev-libs/unibilium/files/unibilium-2.1.1-libtool.patch delete mode 100644 dev-libs/unibilium/unibilium-2.0.0.ebuild delete mode 100644 dev-libs/unibilium/unibilium-2.1.0.ebuild create mode 100644 dev-libs/unibilium/unibilium-2.1.1-r1.ebuild (limited to 'dev-libs/unibilium') diff --git a/dev-libs/unibilium/Manifest b/dev-libs/unibilium/Manifest index 64b046f78142..0ed67bebec4a 100644 --- a/dev-libs/unibilium/Manifest +++ b/dev-libs/unibilium/Manifest @@ -1,8 +1,6 @@ AUX unibilium-2.1.0-no-compress-man.patch 576 BLAKE2B a99123e8be6e229c0661b2ca9df0a56c5280e9f0a3f1e2fffae10537f5dfcd1e6ba5b35a78ceda8b52437b42442e30d1793c5a79ade78bbe2755e2d17c84d505 SHA512 501f93e537dcf8e2b5cd03e63d6c03b91c422bea52a4f615fbdd0acd64ba839d95dcf2f209ca28dcdeece902445a19d5777329a40af7b795529ea8cd9755ce53 -DIST unibilium-2.0.0.tar.gz 112570 BLAKE2B 95c24c53e11590faabf3d4b8484c344be0b2a0988f05bde785d03dac338d9f18fc65324f5ccc402723c9fabe2990083ce260d8fa57129591a1b2a1f8405eff9d SHA512 e93f319b7a85a4441c7f4e30d12d906805f066b14bff03331e48b6257da893f6447e257c8ba731077ad4b54d82d3ebf1ccf1fcf2d864273e0d4321a26ef7c172 -DIST unibilium-2.1.0.tar.gz 121971 BLAKE2B e035eab4343ee779218c302b3cae3ff5d443fc9bd723cade53a3d38dde3d66ee3d7374f7c69b85508a59d44d936601b24f33b01d923e55677d2bac71bd520fea SHA512 c0074ff8431f82c92072b8c0c9d3cf38d759b4de996b168c6ab00e475b0a6204d9c29b0a6e48e62dd4fa4898f82246150ef7cd5e246893d2c225c50ec4d4ac68 +AUX unibilium-2.1.1-libtool.patch 2273 BLAKE2B f6104f56510f2b876bf05f6985f1d8c8d0cf4282329999c3c2b911549f46bc4c4dc2a3b1e503dfa3146c8c1cb43f22f724a8dc4235a9a8d7a268c4ecbd8b18ab SHA512 8229eac14a6cf7859a08fd12eca00a2849a1872564d4313a751c4d618e1c784ff4ecb31f5a92c103c84a0ba9c96b98c7d73f30006ed51754170fdfd8cf23fa87 DIST unibilium-2.1.1.tar.gz 121998 BLAKE2B 0bd032d0cc32011fa66604b39412116824b79aeb3cebb394efcad7591d5bd18031d465f7736ff1e65914f2fcf7beca1cbee4c7ad07426cdbf45e1c82e1894d94 SHA512 ebcdcddc6c3a540d086b113bb83470c1c17cf59056b28308a484b20dc3df71de0f5d6e5bf105f9e4a8347c78500c65ae46c2b53ec87692a898c321a047664ee2 -EBUILD unibilium-2.0.0.ebuild 784 BLAKE2B f8decdab42671f3f9891ae9f019692f0c658c527c902ee2499395c1b0ec34b49f0056deec87396ed439ea1cb0a25d12b50d7727da739d4db5f4d9d11add57d43 SHA512 2c1f1edc2b1e0ace8f7dc54840636558873004f44d68ce0f434cfc403437d9fe5873ca1a66841febcaf4923bff2c82ac9d0c7937c180f11cddc721783d6eef66 -EBUILD unibilium-2.1.0.ebuild 879 BLAKE2B 03c1096e39a86fbd1a5da4f5cce318008e40fad7006de440a22a44a22412bc780253c2d4474ff5b2b2cce43d8fe2fc69bd5429e14c844a87d7c08ec673f580f4 SHA512 8a9d47758dd30e851575e487797ac435b94c57e01730710ee09d6ea10d0bfda0a613167be5554bad6dc390c36fef0cce77078dbb32d2e072b211c5c881447527 -EBUILD unibilium-2.1.1.ebuild 887 BLAKE2B a7fe78c7a903fd9c4526ddfdb7a6c64abc7c5adf75d6191e5a5104d7b37a8e0ad2716e6c3a8370b4380bda1c5e8429c1f6159bf7e6a5a07b84a776d077449ea2 SHA512 1feccff6e13f7743074228a929947ed4c804a7998e16c6f978a6b0d73fbbc164068248d4602d444c1f76d4969291d5ef0cc1e68a1138e7797e155b10c896f9be +EBUILD unibilium-2.1.1-r1.ebuild 651 BLAKE2B 5273545f3c0ed05837ebe803eecdc87f4e02a83d6df4193c9e598d81a5ddd5419877821efbd2c151a60ef357b4a10c852557222927764d57fdad994002eb7a1c SHA512 c2e62a9855b1366decd890b2975c11c2217e5612d6a31292c5c93d32549f14b02b17f0ee6e39d52c647dba874531eeb30dd9d2c27b5b518a103252b84095c535 +EBUILD unibilium-2.1.1.ebuild 884 BLAKE2B 69f4bc4fac965583f21ba8ab1930caf70dce012a2070dca7a1e6d98d1282536042318c6e36f626b1474a272a2e022f2747dbb2958f2a48d35375fff5da7ce048 SHA512 b899ae21426d72f9ca53e210e232d5d21df9dbd2b0ab42029af9a32af8254a89fa08ce12aeed98d06ed46d7411c1b2d021db0c0973f499a1a9a698436298a919 MISC metadata.xml 340 BLAKE2B fbc2fee17ce03a1aafb74a76eee00909ec9d6ab01a62bb0fc0fbf7a9e0e30fab6390ab964d908b9d3b3c22400e5720856da6aac6a3c5ac77a0f3c8e1493f7316 SHA512 bb01973af5dc1a5240f268e62428a227fc4f575bb2d359c4b1f9d129d5c5693a17054aca080a72dcb938b325c493d9690bcfc5e15feab675f02c50bc855f8dc9 diff --git a/dev-libs/unibilium/files/unibilium-2.1.1-libtool.patch b/dev-libs/unibilium/files/unibilium-2.1.1-libtool.patch new file mode 100644 index 000000000000..b9715edfb449 --- /dev/null +++ b/dev-libs/unibilium/files/unibilium-2.1.1-libtool.patch @@ -0,0 +1,101 @@ +Upstream-PR: https://github.com/neovim/unibilium/pull/21 + +From 8447cc364ac9f42745fdabba54fa8e628451f33b Mon Sep 17 00:00:00 2001 +From: orbea +Date: Mon, 20 Jun 2022 14:52:04 -0700 +Subject: [PATCH] build: Add a minimal configure.ac + +When building with slibtool using the rlibtool symlink the build will +fail when it fails to find the generated libtool. This is required so +rlibtool can determine if it should build shared or static libraries. + +This can be fixed by adding a minimal configure.ac that can generate the +required files with autoreconf. + +Gentoo Bug: https://bugs.gentoo.org/828492 +--- + Makefile => Makefile.in | 31 +++++++++++++++++-------------- + configure.ac | 16 ++++++++++++++++ + 2 files changed, 33 insertions(+), 14 deletions(-) + rename Makefile => Makefile.in (92%) + create mode 100644 configure.ac + +diff --git a/Makefile b/Makefile.in +similarity index 92% +rename from Makefile +rename to Makefile.in +index 6060ee6..d97e222 100644 +--- a/Makefile ++++ b/Makefile.in +@@ -2,21 +2,19 @@ ifneq ($(wildcard .maint),) + include maint.mk + endif + +-ifeq ($(shell uname),Darwin) +- LIBTOOL?=glibtool +-else +- LIBTOOL?=libtool +-endif ++CC=@CC@ ++LIBTOOL=@LIBTOOL@ + +-CFLAGS?=-O2 ++CFLAGS=@CFLAGS@ ++LDFLAGS=@LDFLAGS@ + + CFLAGS_DEBUG= + +-PACKAGE=unibilium ++PACKAGE=@PACKAGE_NAME@ + +-PKG_MAJOR=2 +-PKG_MINOR=1 +-PKG_REVISION=1 ++PKG_MAJOR=@MAJOR@ ++PKG_MINOR=@MINOR@ ++PKG_REVISION=@PATCH@ + + PKG_VERSION=$(PKG_MAJOR).$(PKG_MINOR).$(PKG_REVISION) + +@@ -26,10 +24,15 @@ LT_REVISION=1 + LT_CURRENT=4 + LT_AGE=0 + +-PREFIX=/usr/local +-LIBDIR=$(PREFIX)/lib +-INCDIR=$(PREFIX)/include +-MANDIR=$(PREFIX)/share/man ++top_builddir=@top_builddir@ ++ ++prefix=@prefix@ ++exec_prefix=@prefix@ ++datarootdir=@datarootdir@ ++ ++LIBDIR=@libdir@ ++INCDIR=@includedir@ ++MANDIR=@mandir@ + MAN3DIR=$(MANDIR)/man3 + + ifneq ($(OS),Windows_NT) +diff --git a/configure.ac b/configure.ac +new file mode 100644 +index 0000000..13cb888 +--- /dev/null ++++ b/configure.ac +@@ -0,0 +1,16 @@ ++m4_define([MAJOR], [2]) ++m4_define([MINOR], [1]) ++m4_define([PATCH], [1]) ++ ++AC_INIT([unibilium], [MAJOR.MINOR.PATCH]) ++AC_CONFIG_FILES([Makefile]) ++ ++LT_INIT ++ ++AC_SUBST([top_builddir], [$abs_builddir]) ++ ++AC_SUBST([MAJOR], [MAJOR]) ++AC_SUBST([MINOR], [MINOR]) ++AC_SUBST([PATCH], [PATCH]) ++ ++AC_OUTPUT diff --git a/dev-libs/unibilium/unibilium-2.0.0.ebuild b/dev-libs/unibilium/unibilium-2.0.0.ebuild deleted file mode 100644 index 22b6e120a8d1..000000000000 --- a/dev-libs/unibilium/unibilium-2.0.0.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit flag-o-matic - -DESCRIPTION="A very basic terminfo library" -HOMEPAGE="https://github.com/mauke/unibilium/" -SRC_URI="https://github.com/mauke/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-3+ MIT" -SLOT="0/4" -KEYWORDS="amd64 arm ~arm64 x86" -IUSE="static-libs" - -DEPEND=" - dev-lang/perl - sys-devel/libtool" - -RDEPEND="" - -src_compile() { - append-flags -fPIC - emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" all -} - -src_install() { - emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" DESTDIR="${D}" install - use static-libs || rm "${ED}"/usr/$(get_libdir)/lib${PN}.a || die - rm "${ED}"/usr/$(get_libdir)/lib${PN}.la || die -} diff --git a/dev-libs/unibilium/unibilium-2.1.0.ebuild b/dev-libs/unibilium/unibilium-2.1.0.ebuild deleted file mode 100644 index 38287f93cf52..000000000000 --- a/dev-libs/unibilium/unibilium-2.1.0.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="A very basic terminfo library" -HOMEPAGE="https://github.com/neovim/unibilium/" -SRC_URI="https://github.com/neovim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-3+ MIT" -SLOT="0/4" -KEYWORDS="amd64 arm ~arm64 x86 ~x64-macos" -IUSE="static-libs" - -BDEPEND=" - dev-lang/perl - sys-devel/libtool" - -PATCHES=( - "${FILESDIR}/${PN}-2.1.0-no-compress-man.patch" -) - -src_compile() { - append-flags -fPIC - tc-export CC - emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" all -} - -src_install() { - emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" DESTDIR="${D}" install - use static-libs || rm "${ED}"/usr/$(get_libdir)/lib${PN}.a || die - rm "${ED}"/usr/$(get_libdir)/lib${PN}.la || die -} diff --git a/dev-libs/unibilium/unibilium-2.1.1-r1.ebuild b/dev-libs/unibilium/unibilium-2.1.1-r1.ebuild new file mode 100644 index 000000000000..361950435198 --- /dev/null +++ b/dev-libs/unibilium/unibilium-2.1.1-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="A very basic terminfo library" +HOMEPAGE="https://github.com/neovim/unibilium/" +SRC_URI="https://github.com/neovim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-3+ MIT" +SLOT="0/4" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos" + +BDEPEND="dev-lang/perl" + +PATCHES=( + "${FILESDIR}/${PN}-2.1.0-no-compress-man.patch" + "${FILESDIR}/${P}-libtool.patch" # 828492 +) + +src_prepare() { + default + eautoreconf +} + +src_install() { + emake DESTDIR="${D}" install + find "${D}" -name '*.la' -delete || die +} diff --git a/dev-libs/unibilium/unibilium-2.1.1.ebuild b/dev-libs/unibilium/unibilium-2.1.1.ebuild index d2448195ad85..a506295cb055 100644 --- a/dev-libs/unibilium/unibilium-2.1.1.ebuild +++ b/dev-libs/unibilium/unibilium-2.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/neovim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-3+ MIT" SLOT="0/4" -KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos" +KEYWORDS="amd64 arm ~arm64 ~riscv x86 ~x64-macos" IUSE="static-libs" BDEPEND="dev-lang/perl -- cgit v1.2.3