commit: 51709fafa48b6467d845f5cad2dfee3aa442d204 Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> AuthorDate: Sun Aug 25 12:16:52 2024 +0000 Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> CommitDate: Sun Aug 25 12:16:52 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=51709faf
dev-libs/qrcodegen: treeclean duplicate Packaged in gentoo as dev-libs/qr-code-generator Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in> dev-libs/qrcodegen/Manifest | 1 - .../files/c_makefile_generate_libraries.patch | 73 ---------------------- .../files/cpp_makefile_generate_libraries.patch | 70 --------------------- dev-libs/qrcodegen/metadata.xml | 8 --- dev-libs/qrcodegen/qrcodegen-1.8.0-r1.ebuild | 42 ------------- net-im/abaddon/abaddon-0.1.12-r1.ebuild | 2 +- net-im/abaddon/abaddon-0.1.13.ebuild | 2 +- net-im/abaddon/abaddon-0.2.1.ebuild | 2 +- net-im/abaddon/abaddon-9999.ebuild | 2 +- net-im/abaddon/metadata.xml | 2 +- profiles/updates/3Q-2024 | 1 + 11 files changed, 6 insertions(+), 199 deletions(-) diff --git a/dev-libs/qrcodegen/Manifest b/dev-libs/qrcodegen/Manifest deleted file mode 100644 index 203ac5155..000000000 --- a/dev-libs/qrcodegen/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qrcodegen-1.8.0.tar.gz 193288 BLAKE2B 2e511baf35fbfdb71ad5e2dc91c1400a113eb9bce51afa022c34b7ad7d3c9be4a862e2caaef89f517fbbf29879223fb078c88fdec27d6a876126c798ac6772c6 SHA512 0cdf0873e71aed124fc7357da86fb26f23fd26432f94c9752fa5a044085b26e5aece2115134d0e50213ff24be7c55818e7dec31205a68751065bc82ab0c2c6ac diff --git a/dev-libs/qrcodegen/files/c_makefile_generate_libraries.patch b/dev-libs/qrcodegen/files/c_makefile_generate_libraries.patch deleted file mode 100644 index b21b820f8..000000000 --- a/dev-libs/qrcodegen/files/c_makefile_generate_libraries.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff --git a/c/Makefile b/c/Makefile -index 661b1f7..7a507b2 100644 ---- a/c/Makefile -+++ b/c/Makefile -@@ -51,18 +51,47 @@ CFLAGS += -std=c99 -O - # ---- Targets to build ---- - - LIB = qrcodegen --LIBFILE = lib$(LIB).a -+LIBFILE = lib$(LIB).so -+LIBFILE = lib$(LIB).so -+ARFILE = lib$(LIB).a -+SO_NAME = $(LIBFILE).1 -+REAL_NAME = $(LIBFILE).$(VERSION) -+HEADERS = qrcodegen.h - LIBOBJ = qrcodegen.o - MAINS = qrcodegen-demo qrcodegen-test - -+MULTIARCH ?= $(shell $(CC) --print-multiarch) -+ -+INCLUDEDIR ?= $(DESTDIR)/usr/include/qrcodegen -+LIBDIR ?= $(DESTDIR)/usr/lib/$(MULTIARCH) -+ - # Build all binaries --all: $(LIBFILE) $(MAINS) -+all: $(LIBFILE) $(ARFILE) $(MAINS) - - # Delete build output - clean: -- rm -f -- $(LIBOBJ) $(LIBFILE) $(MAINS:=.o) $(MAINS) -+ rm -f -- $(LIBOBJ) $(LIBFILE) $(ARFILE) $(MAINS:=.o) $(MAINS) - rm -rf .deps - -+# Install procedure -+install-shared: $(LIBFILE) -+ install -d $(LIBDIR) || true -+ install -m 0644 $(LIBFILE) $(LIBDIR)/$(REAL_NAME) -+ rm -f $(LIBDIR)/$(SO_NAME) -+ ln -s $(REAL_NAME) $(LIBDIR)/$(SO_NAME) -+ rm -f $(LIBDIR)/$(LIBFILE) -+ ln -s $(SO_NAME) $(LIBDIR)/$(LIBFILE) -+ -+install-static: $(ARFILE) -+ install -d $(LIBDIR) || true -+ install -m 0644 $(ARFILE) $(LIBDIR)/$(ARFILE) -+ -+install-header: $(HEADERS) -+ install -d $(INCLUDEDIR) || true -+ install -m 0644 $(HEADERS) $(INCLUDEDIR)/ -+ -+install: install-shared install-static install-header -+ - # Executable files - %: %.o $(LIBFILE) - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L . -l $(LIB) -@@ -72,12 +101,15 @@ qrcodegen-test: qrcodegen-test.c $(LIBOBJ:%.o=%.c) - $(CC) $(CFLAGS) $(LDFLAGS) -DQRCODEGEN_TEST -o $@ $^ - - # The library --$(LIBFILE): $(LIBOBJ) -+$(ARFILE): $(LIBOBJ) - $(AR) -crs $@ -- $^ - -+$(LIBFILE): $(LIBOBJ) -+ $(CC) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $@ $^ -+ - # Object files - %.o: %.c .deps/timestamp -- $(CC) $(CFLAGS) -c -o $@ -MMD -MF .deps/$*.d $< -+ $(CC) $(CFLAGS) -fPIC -c -o $@ -MMD -MF .deps/$*.d $< - - # Have a place to store header dependencies automatically generated by compiler - .deps/timestamp: diff --git a/dev-libs/qrcodegen/files/cpp_makefile_generate_libraries.patch b/dev-libs/qrcodegen/files/cpp_makefile_generate_libraries.patch deleted file mode 100644 index 56cb4b23c..000000000 --- a/dev-libs/qrcodegen/files/cpp_makefile_generate_libraries.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff --git a/cpp/Makefile b/cpp/Makefile -index 57dc0bf..219f0b8 100644 ---- a/cpp/Makefile -+++ b/cpp/Makefile -@@ -51,29 +51,60 @@ CXXFLAGS += -std=c++11 -O - # ---- Targets to build ---- - - LIB = qrcodegencpp --LIBFILE = lib$(LIB).a -+LIBFILE = lib$(LIB).so -+ARFILE = lib$(LIB).a -+SO_NAME = $(LIBFILE).1 -+REAL_NAME = $(LIBFILE).$(VERSION) -+HEADERS = qrcodegen.hpp - LIBOBJ = qrcodegen.o - MAINS = QrCodeGeneratorDemo - -+MULTIARCH ?= $(shell $(CC) --print-multiarch) -+ -+INCLUDEDIR ?= $(DESTDIR)/usr/include/qrcodegen -+LIBDIR ?= $(DESTDIR)/usr/lib/$(MULTIARCH) -+ - # Build all binaries --all: $(LIBFILE) $(MAINS) -+all: $(LIBFILE) $(ARFILE) $(MAINS) - - # Delete build output - clean: -- rm -f -- $(LIBOBJ) $(LIBFILE) $(MAINS:=.o) $(MAINS) -+ rm -f -- $(LIBOBJ) $(LIBFILE) $(ARFILE) $(MAINS:=.o) $(MAINS) - rm -rf .deps - -+# Install procedure -+install-shared: $(LIBFILE) -+ install -d $(LIBDIR) || true -+ install -m 0644 $(LIBFILE) $(LIBDIR)/$(REAL_NAME) -+ rm -f $(LIBDIR)/$(SO_NAME) -+ ln -s $(REAL_NAME) $(LIBDIR)/$(SO_NAME) -+ rm -f $(LIBDIR)/$(LIBFILE) -+ ln -s $(SO_NAME) $(LIBDIR)/$(LIBFILE) -+ -+install-static: $(ARFILE) -+ install -d $(LIBDIR) || true -+ install -m 0644 $(ARFILE) $(LIBDIR)/$(ARFILE) -+ -+install-header: $(HEADERS) -+ install -d $(INCLUDEDIR) || true -+ install -m 0644 $(HEADERS) $(INCLUDEDIR)/ -+ -+install: install-shared install-static install-header -+ - # Executable files - %: %.o $(LIBFILE) - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $< -L . -l $(LIB) - - # The library --$(LIBFILE): $(LIBOBJ) -+$(ARFILE): $(LIBOBJ) - $(AR) -crs $@ -- $^ - -+$(LIBFILE): $(LIBOBJ) -+ $(CXX) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $@ $^ -+ - # Object files - %.o: %.cpp .deps/timestamp -- $(CXX) $(CXXFLAGS) -c -o $@ -MMD -MF .deps/$*.d $< -+ $(CXX) $(CXXFLAGS) -fPIC -c -o $@ -MMD -MF .deps/$*.d $< - - # Have a place to store header dependencies automatically generated by compiler - .deps/timestamp: diff --git a/dev-libs/qrcodegen/metadata.xml b/dev-libs/qrcodegen/metadata.xml deleted file mode 100644 index a11f800c0..000000000 --- a/dev-libs/qrcodegen/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="github">nayuki/QR-Code-generator</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-libs/qrcodegen/qrcodegen-1.8.0-r1.ebuild b/dev-libs/qrcodegen/qrcodegen-1.8.0-r1.ebuild deleted file mode 100644 index 59a43cdb7..000000000 --- a/dev-libs/qrcodegen/qrcodegen-1.8.0-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Forked from : https://github.com/gentoo-mirror/pg_overlay/blob/master/dev-libs/qrcodegen - -EAPI=8 - -DESCRIPTION="High-quality QR Code generator library" -HOMEPAGE="https://www.nayuki.io/page/qr-code-generator-library"; -SRC_URI="https://github.com/nayuki/QR-Code-generator/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -S="${WORKDIR}/QR-Code-generator-${PV}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -PATCHES=( - "${FILESDIR}/c_makefile_generate_libraries.patch" - "${FILESDIR}/cpp_makefile_generate_libraries.patch" -) - -src_prepare() { - default - sed '/^C\(XX\)\?FLAGS/s/-O//' -i {c,cpp}/Makefile || die -} - -src_compile() { - for dir in c cpp - do - emake -C ${dir} - done -} - -src_install() { - local -x DESTDIR="${ED}" - for dir in c cpp - do - emake -C ${dir} install-header - emake -C ${dir} LIBDIR="${ED}"/usr/$(get_libdir) VERSION=${PV} install-shared - done -} diff --git a/net-im/abaddon/abaddon-0.1.12-r1.ebuild b/net-im/abaddon/abaddon-0.1.12-r1.ebuild index f3cda4227..267155430 100644 --- a/net-im/abaddon/abaddon-0.1.12-r1.ebuild +++ b/net-im/abaddon/abaddon-0.1.12-r1.ebuild @@ -33,7 +33,7 @@ RDEPEND=" net-misc/curl sys-libs/zlib:= libhandy? ( gui-libs/libhandy:= ) - qrcodegen? ( dev-libs/qrcodegen ) + qrcodegen? ( dev-libs/qr-code-generator ) rnnoise? ( media-libs/rnnoise ) " DEPEND=" diff --git a/net-im/abaddon/abaddon-0.1.13.ebuild b/net-im/abaddon/abaddon-0.1.13.ebuild index f3cda4227..267155430 100644 --- a/net-im/abaddon/abaddon-0.1.13.ebuild +++ b/net-im/abaddon/abaddon-0.1.13.ebuild @@ -33,7 +33,7 @@ RDEPEND=" net-misc/curl sys-libs/zlib:= libhandy? ( gui-libs/libhandy:= ) - qrcodegen? ( dev-libs/qrcodegen ) + qrcodegen? ( dev-libs/qr-code-generator ) rnnoise? ( media-libs/rnnoise ) " DEPEND=" diff --git a/net-im/abaddon/abaddon-0.2.1.ebuild b/net-im/abaddon/abaddon-0.2.1.ebuild index a51c94aa9..9c2123625 100644 --- a/net-im/abaddon/abaddon-0.2.1.ebuild +++ b/net-im/abaddon/abaddon-0.2.1.ebuild @@ -33,7 +33,7 @@ RDEPEND=" net-misc/curl sys-libs/zlib:= libhandy? ( gui-libs/libhandy:= ) - qrcodegen? ( dev-libs/qrcodegen ) + qrcodegen? ( dev-libs/qr-code-generator ) rnnoise? ( media-libs/rnnoise ) " DEPEND=" diff --git a/net-im/abaddon/abaddon-9999.ebuild b/net-im/abaddon/abaddon-9999.ebuild index f3cda4227..267155430 100644 --- a/net-im/abaddon/abaddon-9999.ebuild +++ b/net-im/abaddon/abaddon-9999.ebuild @@ -33,7 +33,7 @@ RDEPEND=" net-misc/curl sys-libs/zlib:= libhandy? ( gui-libs/libhandy:= ) - qrcodegen? ( dev-libs/qrcodegen ) + qrcodegen? ( dev-libs/qr-code-generator ) rnnoise? ( media-libs/rnnoise ) " DEPEND=" diff --git a/net-im/abaddon/metadata.xml b/net-im/abaddon/metadata.xml index a058234b9..20634e33a 100644 --- a/net-im/abaddon/metadata.xml +++ b/net-im/abaddon/metadata.xml @@ -3,7 +3,7 @@ <pkgmetadata> <!-- maintainer-needed --> <use> - <flag name="qrcodegen">Support for login through QR Code feature using dev-libs/qrcodegen</flag> + <flag name="qrcodegen">Support for login through QR Code feature using dev-libs/qr-code-generator</flag> <flag name="libhandy">Support for features using gui-libs/libhandy</flag> <flag name="rnnoise">Support for noise reduction using media-libs/rnnoise</flag> </use> diff --git a/profiles/updates/3Q-2024 b/profiles/updates/3Q-2024 index c8ac2fc0b..826f879c9 100644 --- a/profiles/updates/3Q-2024 +++ b/profiles/updates/3Q-2024 @@ -1,2 +1,3 @@ move dev-ml/ollama app-misc/ollama move app-misc/ledger-live app-misc/ledger-live-bin +move dev-libs/qrcodegen dev-libs/qr-code-generator
