[gentoo-commits] repo/gentoo:master commit in: dev-libs/libgrapheme/files/, dev-libs/libgrapheme/

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libgrapheme/files/, dev-libs/libgrapheme/

[Ionen Wolkens]

commit:     ae345b9e4f35a36acde5c2e4c65f852b899c0dc3
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 20 11:29:14 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Oct 20 13:31:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae345b9e

dev-libs/libgrapheme: drop 1, 2.0.0

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-libs/libgrapheme/Manifest                      |  2 --
 .../libgrapheme/files/libgrapheme-1-make.patch     | 32 ------------------
 dev-libs/libgrapheme/libgrapheme-1.ebuild          | 37 ---------------------
 dev-libs/libgrapheme/libgrapheme-2.0.0.ebuild      | 38 ----------------------
 4 files changed, 109 deletions(-)

diff --git a/dev-libs/libgrapheme/Manifest b/dev-libs/libgrapheme/Manifest
index 7c9b2bf7c698..b2ebc2371f4d 100644
--- a/dev-libs/libgrapheme/Manifest
+++ b/dev-libs/libgrapheme/Manifest
@@ -1,3 +1 @@
-DIST libgrapheme-1.tar.gz 67912 BLAKE2B 62e82018b2a45f7259811fbfbae45741252ffedafa095d8e373d62220fc50141afe359d171b723e007120ac307db540c03cfe6e60ecedf1eea0be5518caa9bcb SHA512 c0f3300d30707266e44ee01f359204720ae1770788cec509b03be914f8581caae144fb72952d111f108ebef21fd96b5ca2cf69463ee569bce4bba8645942ee05
-DIST libgrapheme-2.0.0.tar.gz 844784 BLAKE2B 02e52bbbf69276bf2ed43b7acb0b95d59ba5e435514d62827d2e41f1605ba207ab808864df149527798f51e8ae8025fe7880aac738c66dd35bec0ad042f34d85 SHA512 c5b55a4201958f10cabd2ad228cda8ea35b6fc3260d6018f2c01a82ce265369c2f4ebd36e7e66aabf7458f86791e97754b544acac136c8acd874ea708efe961a
 DIST libgrapheme-2.0.1.tar.gz 845666 BLAKE2B 872617d492e64ac0af2562e2842c0011e47f103551b72f0ed4979c1c486401fac0881614d7205da4db4b375c8cd89c00a02e1063428caea0110d5cd3a92602aa SHA512 bc52d4384332a2e2cb01a2697b21e8a3a9742e8ae95dd6e815b69de0a82fdaa2286c44038688a94812dde09d5479a625b0b5c9f839a69789e40d4b76a2def808

diff --git a/dev-libs/libgrapheme/files/libgrapheme-1-make.patch b/dev-libs/libgrapheme/files/libgrapheme-1-make.patch
deleted file mode 100644
index 363df6cfb51e..000000000000
--- a/dev-libs/libgrapheme/files/libgrapheme-1-make.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Adjust config.mk variables, fix cross-compilation, and don't run ldconfig.
---- a/Makefile
-+++ b/Makefile
-@@ -68,3 +68,6 @@
- $(GEN):
--	$(CC) -o $@ $(LDFLAGS) $@.o gen/util.o
-+	$(BUILD_CC) -o $@ $(BUILD_LDFLAGS) $@.o gen/util.o
-+
-+gen/%.o:
-+	$(BUILD_CC) -c -o $@ $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $<
- 
-@@ -84,3 +87,3 @@
- libgrapheme.so: $(SRC:=.o)
--	$(CC) -o $@ -shared $?
-+	$(CC) -o $@ -shared $(LDFLAGS) $?
- 
-@@ -99,3 +102,2 @@
- 	cp -f grapheme.h "$(DESTDIR)$(INCPREFIX)"
--	ldconfig || true
- 
---- a/config.mk
-+++ b/config.mk
-@@ -13,8 +13,4 @@
- CPPFLAGS = -D_DEFAULT_SOURCE
--CFLAGS   = -std=c99 -Os -fPIC -Wall -Wextra -Wpedantic
--LDFLAGS  = -s
-+CFLAGS  := -std=c99 -fPIC -Wall -Wextra -Wpedantic $(CFLAGS)
- 
- # tools
--CC = cc
--AR = ar
--RANLIB = ranlib

diff --git a/dev-libs/libgrapheme/libgrapheme-1.ebuild b/dev-libs/libgrapheme/libgrapheme-1.ebuild
deleted file mode 100644
index 3217f024438d..000000000000
--- a/dev-libs/libgrapheme/libgrapheme-1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Unicode string library"
-HOMEPAGE="https://libs.suckless.org/libgrapheme/"
-SRC_URI="https://dl.suckless.org/libgrapheme/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-make.patch
-)
-
-src_configure() {
-	tc-export CC AR RANLIB
-	tc-export_build_env BUILD_CC # see make.patch
-
-	append-ldflags -Wl,--soname=${PN}.so
-}
-
-src_install() {
-	local emakeargs=(
-		DESTDIR="${D}"
-		PREFIX="${EPREFIX}"/usr
-		LIBPREFIX="${EPREFIX}"/usr/$(get_libdir)
-	)
-	emake "${emakeargs[@]}" install
-	einstalldocs
-
-	rm "${ED}"/usr/$(get_libdir)/${PN}.a || die
-}

diff --git a/dev-libs/libgrapheme/libgrapheme-2.0.0.ebuild b/dev-libs/libgrapheme/libgrapheme-2.0.0.ebuild
deleted file mode 100644
index 9cd9b0bf37de..000000000000
--- a/dev-libs/libgrapheme/libgrapheme-2.0.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Unicode string library"
-HOMEPAGE="https://libs.suckless.org/libgrapheme/"
-SRC_URI="https://dl.suckless.org/libgrapheme/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
-# upstream suggests keeping the static option, others have requested it too
-IUSE="static-libs"
-
-src_prepare() {
-	default
-
-	append-cflags ${CPPFLAGS}
-	tc-export CC AR RANLIB
-	tc-export_build_env BUILD_CC
-	sed -Ei '/^(BUILD_|)(CC|AR|RANLIB|CFLAGS|LDFLAGS|LDCONFIG).*=/d' config.mk || die
-}
-
-src_install() {
-	local emakeargs=(
-		DESTDIR="${D}"
-		PREFIX="${EPREFIX}"/usr
-		LIBPREFIX="${EPREFIX}"/usr/$(get_libdir)
-	)
-
-	emake "${emakeargs[@]}" install
-	einstalldocs
-
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/${PN}.a || die
-}