commit: 7f79601a3867491168d944ccfb6de3a18b0c0be3 Author: Florian Schmaus <flow <AT> gentoo <DOT> org> AuthorDate: Fri Nov 8 21:53:33 2024 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Fri Nov 8 21:53:33 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f79601a
x11-plugins/lurch net-libs/libomemo net-libs/libaxc: treeclean Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> Closes: https://bugs.gentoo.org/940725 (pkgremoved) Closes: https://bugs.gentoo.org/881373 (pkgremoved) Closes: https://bugs.gentoo.org/930527 (pkgremoved) Closes: https://bugs.gentoo.org/930528 (pkgremoved) Closes: https://bugs.gentoo.org/939759 (pkgremoved) net-libs/libaxc/Manifest | 4 - .../libaxc/files/libaxc-0.3.4-so-symlinks.patch | 25 ------ net-libs/libaxc/libaxc-0.3.4-r2.ebuild | 66 ---------------- net-libs/libaxc/libaxc-0.3.5.ebuild | 62 --------------- net-libs/libaxc/libaxc-0.3.6.ebuild | 73 ----------------- net-libs/libaxc/libaxc-0.3.7-r1.ebuild | 75 ------------------ net-libs/libaxc/libaxc-0.3.7.ebuild | 73 ----------------- net-libs/libaxc/metadata.xml | 8 -- net-libs/libomemo/Manifest | 1 - net-libs/libomemo/libomemo-0.8.1-r1.ebuild | 38 --------- net-libs/libomemo/metadata.xml | 8 -- profiles/package.mask | 9 --- x11-plugins/lurch/Manifest | 4 - ...urch-0.6.8-axc-0.3.3-libsignal-protocol-c.patch | 91 --------------------- .../files/lurch-0.6.8-libsignal-protocol-c.patch | 92 ---------------------- x11-plugins/lurch/lurch-0.6.8-r3.ebuild | 75 ------------------ x11-plugins/lurch/lurch-0.7.0-r1.ebuild | 52 ------------ x11-plugins/lurch/metadata.xml | 8 -- 18 files changed, 764 deletions(-) diff --git a/net-libs/libaxc/Manifest b/net-libs/libaxc/Manifest deleted file mode 100644 index 4ecd71f036be..000000000000 --- a/net-libs/libaxc/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST libaxc-0.3.4.tar.gz 40198 BLAKE2B 78fc122eefbc5c6173bdad5cf31734cf95b750c09bddede5b2656a88bede3d6c25fb22af5447681c58eb1f296ee326480e22aacb843d951f1bd7a6933155432a SHA512 7b6b5466ee89d78d3c3a2e7cf961dfb3310bff01947e69e906c83ff97e89d1bdc0e2e92f7bd0d4b48a97af91409f435a4fd869229af5b67b2f66ba464bbfd7b8 -DIST libaxc-0.3.5.tar.gz 40418 BLAKE2B bcafe30c295fb6c5bd075cc7ecb9b81dcb094301a65d51ec7bcff82159c4fecdc6a4a64530e81c429803c8e267c3d6f6ccede8b5fda7d920af1c10c3806d66f0 SHA512 7708c136dfd57cc799ac467bea010ddbdcfe78a4cdae3c5882f97de7674e38e5f183f94fd42dd2df74dfec451f1822ef43122321aca46c042d5355b74e128694 -DIST libaxc-0.3.6.tar.gz 40488 BLAKE2B e59d73e0011b11c0e594297d15353f0e7c378c5ce29c2f747f0a10f7ac302abbe8a0e6f3cad37a652a5a4763d15f393e2cbd7272c4249883c0c99640d18ab518 SHA512 0e02282e42597eaf641fcd620c103c4892b26120f9aec442ce61b99e2a5042d62213bed7786aede296e1024fea26ef9a21950d96a9a520ca6a5d5c524620f42d -DIST libaxc-0.3.7.tar.gz 41742 BLAKE2B e43220745cbf1e3f375c69218cc0c5bc944e2fbfd1ca2a79be38d8cac9206609f757b8afbf5d5a1411ad29cddbb8edf9cf67b570fe152d91e77e070ddbf4666f SHA512 e9982a54307ebc4fbecdd6482e0ccc9b1d5539047f455f66a4f25c067e2da8eba782163ccf0ad8aac8b11867da5d7efb309c403cdfed464e6865d3e03e09ea11 diff --git a/net-libs/libaxc/files/libaxc-0.3.4-so-symlinks.patch b/net-libs/libaxc/files/libaxc-0.3.4-so-symlinks.patch deleted file mode 100644 index 94850adb9a0a..000000000000 --- a/net-libs/libaxc/files/libaxc-0.3.4-so-symlinks.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b9a79499a8638fb58394088af1b3e419c52f0562 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <[email protected]> -Date: Sun, 21 Feb 2021 20:16:34 +0100 -Subject: [PATCH] Add missing symlinks libaxc.so.$(VER_MAJ) and libaxc.so - ---- - Makefile | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Makefile b/Makefile -index b79a3f8..b882cbb 100644 ---- a/Makefile -+++ b/Makefile -@@ -125,6 +125,8 @@ install: $(BDIR) - install -d $(DESTDIR)/$(PREFIX)/lib/$(ARCH)/pkgconfig/ - install -m 644 $(BDIR)/libaxc.a $(DESTDIR)/$(PREFIX)/lib/$(ARCH)/libaxc.a - install -m 644 $(BDIR)/libaxc.so $(DESTDIR)/$(PREFIX)/lib/$(ARCH)/libaxc.so.$(VERSION) -+ ln -s libaxc.so.$(VERSION) $(DESTDIR)/$(PREFIX)/lib/$(ARCH)/libaxc.so.$(VER_MAJ) -+ ln -s libaxc.so.$(VERSION) $(DESTDIR)/$(PREFIX)/lib/$(ARCH)/libaxc.so - install -m 644 $(BDIR)/libaxc.pc $(DESTDIR)/$(PREFIX)/lib/$(ARCH)/pkgconfig/ - install -d $(DESTDIR)/$(PREFIX)/include/axc/ - install -m 644 $(SDIR)/axc.h $(DESTDIR)/$(PREFIX)/include/axc/ --- -2.30.1 - diff --git a/net-libs/libaxc/libaxc-0.3.4-r2.ebuild b/net-libs/libaxc/libaxc-0.3.4-r2.ebuild deleted file mode 100644 index 13ba915719fb..000000000000 --- a/net-libs/libaxc/libaxc-0.3.4-r2.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_P="axc-${PV}" -DESCRIPTION="Client library for libsignal-protocol-c" -HOMEPAGE="https://github.com/gkdr/axc"; -SRC_URI="https://github.com/gkdr/axc/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" # not GPL-3+ -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="static-libs test" - -RDEPEND=" - dev-db/sqlite - dev-libs/glib - dev-libs/libgcrypt - net-libs/libsignal-protocol-c - " -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - test? ( dev-util/cmocka ) - " - -S="${WORKDIR}"/${MY_P} -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${P}-so-symlinks.patch -) - -DOCS=( CHANGELOG.md README.md ) - -src_prepare() { - rm -R lib || die # unbundle libsignal-protocol-c - default -} - -src_compile() { - emake PREFIX=/usr -} - -src_install() { - emake DESTDIR="${D}" PREFIX=/usr install - - # Respect libdir other than /usr/lib, e.g. /usr/lib64 - local libdir="$(get_libdir)" - if [[ ${libdir} != lib ]]; then - mv "${D}"/usr/{lib,${libdir}} || die - sed "s|^libdir=.*|libdir=\${prefix}/${libdir}|" \ - -i "${D}/usr/${libdir}/pkgconfig/libaxc.pc" || die - fi - - einstalldocs - - if ! use static-libs ; then - rm "${D}/usr/${libdir}/libaxc.a" || die - fi -} - -src_test() { - emake -j1 test -} diff --git a/net-libs/libaxc/libaxc-0.3.5.ebuild b/net-libs/libaxc/libaxc-0.3.5.ebuild deleted file mode 100644 index fe624430b582..000000000000 --- a/net-libs/libaxc/libaxc-0.3.5.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_P="axc-${PV}" -DESCRIPTION="Client library for libsignal-protocol-c" -HOMEPAGE="https://github.com/gkdr/axc"; -SRC_URI="https://github.com/gkdr/axc/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" # not GPL-3+ -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="static-libs test" - -RDEPEND=" - dev-db/sqlite - dev-libs/glib - dev-libs/libgcrypt - net-libs/libsignal-protocol-c - " -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - test? ( dev-util/cmocka ) - " - -S="${WORKDIR}"/${MY_P} -RESTRICT="!test? ( test )" - -DOCS=( CHANGELOG.md README.md ) - -src_prepare() { - rm -R lib || die # unbundle libsignal-protocol-c - default -} - -src_compile() { - emake PREFIX=/usr -} - -src_install() { - emake DESTDIR="${D}" PREFIX=/usr install - - # Respect libdir other than /usr/lib, e.g. /usr/lib64 - local libdir="$(get_libdir)" - if [[ ${libdir} != lib ]]; then - mv "${D}"/usr/{lib,${libdir}} || die - sed "s|^libdir=.*|libdir=\${prefix}/${libdir}|" \ - -i "${D}/usr/${libdir}/pkgconfig/libaxc.pc" || die - fi - - einstalldocs - - if ! use static-libs ; then - rm "${D}/usr/${libdir}/libaxc.a" || die - fi -} - -src_test() { - emake -j1 test -} diff --git a/net-libs/libaxc/libaxc-0.3.6.ebuild b/net-libs/libaxc/libaxc-0.3.6.ebuild deleted file mode 100644 index 013ce8f510cb..000000000000 --- a/net-libs/libaxc/libaxc-0.3.6.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -MY_P="axc-${PV}" -DESCRIPTION="Client library for libsignal-protocol-c" -HOMEPAGE="https://github.com/gkdr/axc"; -SRC_URI="https://github.com/gkdr/axc/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" # not GPL-3+ -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="static-libs test" - -RDEPEND=" - dev-db/sqlite - dev-libs/glib - dev-libs/libgcrypt - net-libs/libsignal-protocol-c - " -DEPEND=" - ${RDEPEND} - test? ( dev-util/cmocka ) - " -BDEPEND="virtual/pkgconfig" - -S="${WORKDIR}"/${MY_P} -RESTRICT="!test? ( test )" - -DOCS=( CHANGELOG.md README.md ) - -src_prepare() { - rm -R lib || die # unbundle libsignal-protocol-c - default -} - -src_compile() { - local make_args=( - PREFIX=/usr - - AR="$(tc-getAR)" - CC="$(tc-getCC)" - PKG_CONFIG="$(tc-getPKG_CONFIG)" - ) - emake "${make_args[@]}" -} - -src_test() { - # TODO: Test failures seem to be ignored in the upstream Makefile? - # e.g. https://github.com/gkdr/axc/blob/master/Makefile#L154 - emake CC="$(tc-getCC)" test -} - -src_install() { - emake DESTDIR="${D}" PREFIX=/usr install - - # Respect libdir other than /usr/lib, e.g. /usr/lib64 - local libdir="$(get_libdir)" - if [[ ${libdir} != lib ]]; then - mv "${ED}"/usr/{lib,${libdir}} || die - sed "s|^libdir=.*|libdir=\${prefix}/${libdir}|" \ - -i "${ED}/usr/${libdir}/pkgconfig/libaxc.pc" || die - fi - - einstalldocs - - if ! use static-libs ; then - rm "${ED}/usr/${libdir}/libaxc.a" || die - fi -} diff --git a/net-libs/libaxc/libaxc-0.3.7-r1.ebuild b/net-libs/libaxc/libaxc-0.3.7-r1.ebuild deleted file mode 100644 index e217a88d83cf..000000000000 --- a/net-libs/libaxc/libaxc-0.3.7-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -MY_P="axc-${PV}" -DESCRIPTION="Client library for libsignal-protocol-c" -HOMEPAGE="https://github.com/gkdr/axc"; -SRC_URI="https://github.com/gkdr/axc/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" # not GPL-3+ -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="static-libs test" - -RDEPEND=" - dev-db/sqlite - dev-libs/glib - dev-libs/libgcrypt - net-libs/libsignal-protocol-c - " -DEPEND=" - ${RDEPEND} - test? ( dev-util/cmocka ) - " -BDEPEND="virtual/pkgconfig" - -S="${WORKDIR}"/${MY_P} -RESTRICT="!test? ( test )" - -DOCS=( CHANGELOG.md README.md ) - -src_prepare() { - rm -R lib || die # unbundle libsignal-protocol-c - default -} - -src_compile() { - local make_args=( - PREFIX=/usr - - AR="$(tc-getAR)" - CC="$(tc-getCC)" - PKG_CONFIG="$(tc-getPKG_CONFIG)" - - ARCH= - ) - emake "${make_args[@]}" -} - -src_test() { - # TODO: Test failures seem to be ignored in the upstream Makefile? - # e.g. https://github.com/gkdr/axc/blob/master/Makefile#L153 - emake CC="$(tc-getCC)" test -} - -src_install() { - emake DESTDIR="${D}" PREFIX=/usr ARCH= install - - # Respect libdir other than /usr/lib, e.g. /usr/lib64 - local libdir="$(get_libdir)" - if [[ ${libdir} != lib ]]; then - mv "${ED}"/usr/{lib,${libdir}} || die - sed "s|^libdir=.*|libdir=\${prefix}/${libdir}|" \ - -i "${ED}/usr/${libdir}/pkgconfig/libaxc.pc" || die - fi - - einstalldocs - - if ! use static-libs ; then - rm "${ED}/usr/${libdir}/libaxc.a" || die - fi -} diff --git a/net-libs/libaxc/libaxc-0.3.7.ebuild b/net-libs/libaxc/libaxc-0.3.7.ebuild deleted file mode 100644 index 564171853f90..000000000000 --- a/net-libs/libaxc/libaxc-0.3.7.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -MY_P="axc-${PV}" -DESCRIPTION="Client library for libsignal-protocol-c" -HOMEPAGE="https://github.com/gkdr/axc"; -SRC_URI="https://github.com/gkdr/axc/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" # not GPL-3+ -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="static-libs test" - -RDEPEND=" - dev-db/sqlite - dev-libs/glib - dev-libs/libgcrypt - net-libs/libsignal-protocol-c - " -DEPEND=" - ${RDEPEND} - test? ( dev-util/cmocka ) - " -BDEPEND="virtual/pkgconfig" - -S="${WORKDIR}"/${MY_P} -RESTRICT="!test? ( test )" - -DOCS=( CHANGELOG.md README.md ) - -src_prepare() { - rm -R lib || die # unbundle libsignal-protocol-c - default -} - -src_compile() { - local make_args=( - PREFIX=/usr - - AR="$(tc-getAR)" - CC="$(tc-getCC)" - PKG_CONFIG="$(tc-getPKG_CONFIG)" - ) - emake "${make_args[@]}" -} - -src_test() { - # TODO: Test failures seem to be ignored in the upstream Makefile? - # e.g. https://github.com/gkdr/axc/blob/master/Makefile#L153 - emake CC="$(tc-getCC)" test -} - -src_install() { - emake DESTDIR="${D}" PREFIX=/usr install - - # Respect libdir other than /usr/lib, e.g. /usr/lib64 - local libdir="$(get_libdir)" - if [[ ${libdir} != lib ]]; then - mv "${ED}"/usr/{lib,${libdir}} || die - sed "s|^libdir=.*|libdir=\${prefix}/${libdir}|" \ - -i "${ED}/usr/${libdir}/pkgconfig/libaxc.pc" || die - fi - - einstalldocs - - if ! use static-libs ; then - rm "${ED}/usr/${libdir}/libaxc.a" || die - fi -} diff --git a/net-libs/libaxc/metadata.xml b/net-libs/libaxc/metadata.xml deleted file mode 100644 index 37bfda4938f0..000000000000 --- a/net-libs/libaxc/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">gkdr/axc</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-libs/libomemo/Manifest b/net-libs/libomemo/Manifest deleted file mode 100644 index b39ff0896a86..000000000000 --- a/net-libs/libomemo/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libomemo-0.8.1.tar.gz 28648 BLAKE2B b75ad298946dff680705ba0927293ea30cb8bf616a417c6584cef9f84e0894c5581462782a4b1003bf9e530695eea10bba9f37ae94e957a0008a35c862f17f62 SHA512 452c7ff9eb809de37df24bd0857c30c1e1ed1d4638c8338bb101f6d5a31be700f174f4fe65fb8ccd5358a674f8397a0eb54d8e03abfdce57cea60bcd4959f40a diff --git a/net-libs/libomemo/libomemo-0.8.1-r1.ebuild b/net-libs/libomemo/libomemo-0.8.1-r1.ebuild deleted file mode 100644 index e53dabe9e607..000000000000 --- a/net-libs/libomemo/libomemo-0.8.1-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Implementation of OMEMO (XEP-0384) in C" -HOMEPAGE="https://github.com/gkdr/libomemo"; -SRC_URI="https://github.com/gkdr/libomemo/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="test" - -RDEPEND=" - dev-db/sqlite - dev-libs/glib - dev-libs/libgcrypt - dev-libs/mxml:0 - " -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - test? ( dev-util/cmocka ) - " - -RESTRICT="!test? ( test )" - -DOCS=( CHANGELOG.md README.md ) - -src_configure() { - local mycmakeargs=( - -DOMEMO_WITH_TESTS=$(usex test) - ) - cmake_src_configure -} diff --git a/net-libs/libomemo/metadata.xml b/net-libs/libomemo/metadata.xml deleted file mode 100644 index 333eb47aba2b..000000000000 --- a/net-libs/libomemo/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">gkdr/libomemo</remote-id> - </upstream> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index d839b33794f0..ab65ec71e1ac 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -288,15 +288,6 @@ app-i18n/kcm-fcitx # See also: https://github.com/gentoo/gentoo/pull/36091 ~sys-boot/plymouth-24.004.60 -# Sebastian Pipping <[email protected]> (2024-10-03) -# Masked for removal in 30 days. Last release in 2021, -# last commit two years ago, has open bugs, .. (bug #940725). -# Also removing its two dependencies that have no other -# reverse dependencies in Gentoo or known use outside of Lurch. -net-libs/libaxc -net-libs/libomemo -x11-plugins/lurch - # Sam James <[email protected]> (2024-09-30) # GCC 10 and older no longer receive upstream support or fixes for # bugs. Please switch to a newer GCC version using gcc-config. diff --git a/x11-plugins/lurch/Manifest b/x11-plugins/lurch/Manifest deleted file mode 100644 index ffee016b68cd..000000000000 --- a/x11-plugins/lurch/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST axc-0.3.3.tar.gz 39497 BLAKE2B 7f13f2ee6bb98fecc3ff5ddb726e19d412d588613be50e6666e8bfdcf248e842b97c00cccbc19fef55c0df50053e0b80539f0573dfa7a54a8c88725735382bc6 SHA512 9fe494eb4a264a31c137a4f21e4a53358d55f6f6b3bd2fab0fbe43c0e85f2372127a2a85d00d2e308f3785b30cf8161de3f696aaf71c232f594ef3c54b8f6771 -DIST libomemo-0.7.0.tar.gz 23678 BLAKE2B 91b57f6c93d5f777996687ea0648d996950bc893314e4e3ee02973c70165a9e533ab6980a420bd270d7a4acaa45da7cf83b401b69e2b305b017a3fbb42d5b4d2 SHA512 f9843a35958e4a7930ed9e9f4bef1e765bd51721d6e79d2c092bad86d26f092d22d1cdd4df1c4017b9434bb84c33e226985136d35dfcbcf9b915eb3cae862fa5 -DIST lurch-0.6.8.tar.gz 398267 BLAKE2B 23211e82b80e26105f0d62510dc321abdd818eae21dd9f3e24f6ab01458748df64283acb99371a8ece34248f06e9e04edd35da30c771f45779474b3b43c3a53d SHA512 8b93523049d05a00f1d7286ec9d0d8d03c7ae46793ac72ea08c0d12cb5193324be4805fb6278d6c0f906d9c63db9d7ce6ca2a21442236df51e0ee0b48de6ef1d -DIST lurch-0.7.0.tar.gz 66885 BLAKE2B 1a3cc1dbfd8f999b677b23d02952a3c28c922d438cfe81a3bfd3a03cc49723fcc4d52a549bfc7ecb45616a0c939b0f78a39f73a4439bc5337d4da656e9d42b11 SHA512 082f85d25fbcb184b7b6d827e1e6bac073ad46064a144ca24245164558ca9e0cdfcdc4187ac3da5f8738e0476e759e67801d0fd24598b31e2d86053f8af576b6 diff --git a/x11-plugins/lurch/files/lurch-0.6.8-axc-0.3.3-libsignal-protocol-c.patch b/x11-plugins/lurch/files/lurch-0.6.8-axc-0.3.3-libsignal-protocol-c.patch deleted file mode 100644 index 261c3ac57c5b..000000000000 --- a/x11-plugins/lurch/files/lurch-0.6.8-axc-0.3.3-libsignal-protocol-c.patch +++ /dev/null @@ -1,91 +0,0 @@ -From d5c2d8902ec268a1e6f8a9f5bd6fabde1e8ddf6a Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <[email protected]> -Date: Thu, 3 Dec 2020 23:59:00 +0100 -Subject: [PATCH] axc: Use system's libsignal-protocol-c shared library - ---- - Makefile | 26 ++++++++++---------------- - 1 file changed, 10 insertions(+), 16 deletions(-) - -diff --git a/lib/axc/Makefile b/lib/axc/Makefile -index 601e4fb..d08dd85 100644 ---- a/lib/axc/Makefile -+++ b/lib/axc/Makefile -@@ -14,6 +14,9 @@ GLIB_LDFLAGS ?= $(shell $(PKG_CONFIG) --libs glib-2.0) - SQLITE3_CFLAGS ?= $(shell $(PKG_CONFIG) --cflags sqlite3) - SQLITE3_LDFLAGS ?= $(shell $(PKG_CONFIG) --libs sqlite3) - -+LIBSIGNAL_PROTOCOL_C_CFLAGS ?= $(shell $(PKG_CONFIG) --cflags libsignal-protocol-c) -+LIBSIGNAL_PROTOCOL_C_LDFLAGS ?= $(shell $(PKG_CONFIG) --libs libsignal-protocol-c) -+ - LIBGCRYPT_CONFIG ?= libgcrypt-config - LIBGCRYPT_LDFLAGS ?= $(shell $(LIBGCRYPT_CONFIG) --libs) - -@@ -24,26 +27,24 @@ TDIR = test - TFN = test_all - CDIR = coverage - --AX_DIR=./lib/libsignal-protocol-c --AX_BDIR=$(AX_DIR)/build/src --AX_PATH=$(AX_BDIR)/libsignal-protocol-c.a -- - PKGCFG_C=$(GLIB_CFLAGS) \ - $(SQLITE3_CFLAGS) \ -+ $(LIBSIGNAL_PROTOCOL_C_CFLAGS) \ - $(LIBGCRYPT_CFLAGS) - - PKGCFG_L=$(GLIB_LDFLAGS) \ - $(SQLITE3_LDFLAGS) \ -+ $(LIBSIGNAL_PROTOCOL_C_LDFLAGS) \ - $(LIBGCRYPT_LDFLAGS) - --HEADERS=-I$(AX_DIR)/src -+HEADERS= - CFLAGS += $(HEADERS) $(PKGCFG_C) -std=c11 -g -Wall -Wextra -Wpedantic \ - -Wstrict-overflow -fno-strict-aliasing -funsigned-char \ - -fno-builtin-memset - CPPFLAGS += -D_XOPEN_SOURCE=700 -D_BSD_SOURCE -D_POSIX_SOURCE -D_GNU_SOURCE -D_DEFAULT_SOURCE - TESTFLAGS=$(HEADERS) $(PKGCFG_C) -g -O0 --coverage - PICFLAGS=-fPIC $(CFLAGS) --LDFLAGS += -pthread -ldl $(PKGCFG_L) $(AX_PATH) -lm -+LDFLAGS += -pthread -ldl $(PKGCFG_L) -lm - LDFLAGS_T= -lcmocka $(LDFLAGS) - - all: $(BDIR)/libaxc.a -@@ -51,7 +52,7 @@ all: $(BDIR)/libaxc.a - $(BDIR): - $(MKDIR_P) $@ - --client: $(SDIR)/message_client.c $(BDIR)/axc_store.o $(BDIR)/axc_crypto.o $(BDIR)/axc.o $(AX_PATH) -+client: $(SDIR)/message_client.c $(BDIR)/axc_store.o $(BDIR)/axc_crypto.o $(BDIR)/axc.o - $(MKDIR_P) $@ - $(CC) $(CPPFLAGS) $(CFLAGS) $^ -o $@/[email protected] $(LDFLAGS) - -@@ -73,15 +74,8 @@ $(BDIR)/libaxc.a: $(BDIR)/axc.o $(BDIR)/axc_crypto.o $(BDIR)/axc_store.o - $(BDIR)/libaxc-nt.a: $(BDIR)/axc-nt.o $(BDIR)/axc_crypto.o $(BDIR)/axc_store.o - $(AR) rcs $@ $^ - --$(AX_PATH): -- cd $(AX_DIR) && \ -- $(MKDIR_P) build && \ -- cd build && \ -- $(CMAKE) $(CMAKE_FLAGS) .. && \ -- $(MAKE) -- - .PHONY: test --test: $(AX_PATH) test_store test_client -+test: test_store test_client - - .PHONY: test_store - test_store: $(SDIR)/axc_store.c $(SDIR)/axc_crypto.c $(TDIR)/test_store.c -@@ -109,6 +103,6 @@ clean: - - .PHONY: clean-all - clean-all: clean -- rm -rf client $(BDIR) $(CDIR) $(AX_DIR)/build -+ rm -rf client $(BDIR) $(CDIR) - - --- -2.27.0 - diff --git a/x11-plugins/lurch/files/lurch-0.6.8-libsignal-protocol-c.patch b/x11-plugins/lurch/files/lurch-0.6.8-libsignal-protocol-c.patch deleted file mode 100644 index 4b3de986154d..000000000000 --- a/x11-plugins/lurch/files/lurch-0.6.8-libsignal-protocol-c.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 72f286f389236fe99cb10fdeda3ee9b474de645d Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <[email protected]> -Date: Fri, 4 Dec 2020 00:10:17 +0100 -Subject: [PATCH] lurch: Use system's libsignal-protocol-c shared library - ---- - Makefile | 37 ++++++++++++++++++++++++------------- - 1 file changed, 24 insertions(+), 13 deletions(-) - -diff --git a/Makefile b/Makefile -index 32bc9c9..937401d 100644 ---- a/Makefile -+++ b/Makefile -@@ -28,16 +28,21 @@ LIBPURPLE_LDFLAGS=$(shell $(PKG_CONFIG) --cflags purple) \ - XML2_CFLAGS ?= $(shell $(XML2_CONFIG) --cflags) - XML2_LDFLAGS ?= $(shell $(XML2_CONFIG) --libs) - -+LIBSIGNAL_PROTOCOL_C_CFLAGS ?= $(shell $(PKG_CONFIG) --cflags libsignal-protocol-c) -+LIBSIGNAL_PROTOCOL_C_LDFLAGS ?= $(shell $(PKG_CONFIG) --libs libsignal-protocol-c) -+ - LIBGCRYPT_LDFLAGS ?= $(shell $(LIBGCRYPT_CONFIG) --libs) - - PKGCFG_C=$(GLIB_CFLAGS) \ - $(LIBPURPLE_CFLAGS) \ -+ $(LIBSIGNAL_PROTOCOL_C_CFLAGS) \ - $(XML2_CFLAGS) - - - PKGCFG_L=$(shell $(PKG_CONFIG) --libs sqlite3 mxml) \ - $(GLIB_LDFLAGS) \ - $(LIBPURPLE_LDFLAGS) \ -+ $(LIBSIGNAL_PROTOCOL_C_LDFLAGS) \ - $(XML2_LDFLAGS) \ - $(LIBGCRYPT_LDFLAGS) - -@@ -51,7 +56,7 @@ else - endif - endif - --HEADERS=-I$(HDIR)/jabber -I$(LOMEMO_SRC) -I$(AXC_SRC) -I$(AX_DIR)/src -+HEADERS=-I$(HDIR)/jabber -I$(LOMEMO_SRC) -I$(AXC_SRC) - CFLAGS += -std=c11 -Wall -g -Wstrict-overflow $(PKGCFG_C) $(HEADERS) - PLUGIN_CPPFLAGS=-DPURPLE_PLUGINS - # -D_BSD_SOURCE can be removed once nobody uses glibc <= 2.18 any more -@@ -79,26 +84,32 @@ AXC_SRC=$(AXC_DIR)/src - AXC_BUILD=$(AXC_DIR)/build - AXC_PATH=$(AXC_BUILD)/libaxc-nt.a - --AX_DIR=$(AXC_DIR)/lib/libsignal-protocol-c --AX_PATH=$(AX_DIR)/build/src/libsignal-protocol-c.a -- --VENDOR_LIBS=$(LOMEMO_PATH) $(AXC_PATH) $(AX_PATH) -+VENDOR_LIBS=$(LOMEMO_PATH) $(AXC_PATH) - - - ### make rules - # --all: $(BDIR)/lurch.so -+all: $(BDIR)/lurch.so $(BDIR)/linkdummy -+ -+ -+$(BDIR)/linkdummy.c: -+ echo 'int main() { return 0; }' > $@ -+ -+$(BDIR)/liblinklurch.so: $(BDIR)/lurch.so | $(BDIR) -+ ln -f $^ $@ -+ -+$(BDIR)/linkdummy: $(BDIR)/linkdummy.o $(BDIR)/liblinklurch.so -+ $(CC) \ -+ $(shell $(PKG_CONFIG) --libs purple) \ -+ -L$(BDIR) -llinklurch \ -+ $^ \ -+ -o $@ \ -+ $(LDFLAGS) -+ - - $(BDIR): - $(MKDIR_P) build - --$(AX_PATH): -- cd $(AX_DIR)/ && \ -- $(MKDIR_P) build && \ -- cd build && \ -- $(CMAKE) $(CMAKE_FLAGS) .. \ -- && $(MAKE) -- - $(AXC_PATH): - $(MAKE) -C "$(AXC_DIR)" build/libaxc-nt.a - --- -2.27.0 - diff --git a/x11-plugins/lurch/lurch-0.6.8-r3.ebuild b/x11-plugins/lurch/lurch-0.6.8-r3.ebuild deleted file mode 100644 index 584d96b3834b..000000000000 --- a/x11-plugins/lurch/lurch-0.6.8-r3.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -AXC_PV=0.3.3 -LIBOMEMO_PV=0.7.0 - -DESCRIPTION="OMEMO encryption for libpurple (XEP-0384)" -HOMEPAGE="https://github.com/gkdr/lurch"; -SRC_URI="https://github.com/gkdr/lurch/releases/download/v${PV}/lurch-${PV}-src.tar.gz -> ${P}.tar.gz - https://github.com/gkdr/axc/archive/v${AXC_PV}.tar.gz -> axc-${AXC_PV}.tar.gz - https://github.com/gkdr/libomemo/archive/v${LIBOMEMO_PV}.tar.gz -> libomemo-${LIBOMEMO_PV}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 x86" - -# NOTE -# The build systems of axc (ex-libaxolotl) -# at https://github.com/gkdr/axc and of libomemo -# at https://github.com/gkdr/libomemo build static -# libraries (*.a files) only, so it is not clear when or -# how to best unbundle them into standalone packages. -# Related yet-to-be-merged pull requests to build shared libraries -# exist upstream: -# - https://github.com/gkdr/axc/pull/17 -# - https://github.com/gkdr/lurch/pull/151 -# - https://github.com/gkdr/libomemo/pull/30 -RDEPEND=" - dev-db/sqlite - dev-libs/glib - dev-libs/libgcrypt:= - dev-libs/libxml2 - dev-libs/mxml:0 - net-im/pidgin:= - >=net-libs/libsignal-protocol-c-2.3.2 - " -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - " - -PATCHES=( - # Unbundle net-libs/libsignal-protocol-c - "${FILESDIR}"/${P}-libsignal-protocol-c.patch - "${FILESDIR}"/${P}-axc-${AXC_PV}-libsignal-protocol-c.patch -) - -src_prepare() { - # Upgrade outdated bundle of axc - rm -R lib/axc || die - mv "${WORKDIR}"/axc-${AXC_PV} lib/axc || die - - # Upgrade outdated bundle of libomemo - rm -R lib/libomemo || die - mv "${WORKDIR}"/libomemo-${LIBOMEMO_PV} lib/libomemo || die - - # Unbundle axc's bundled net-libs/libsignal-protocol-c - rm -R lib/axc/lib/libsignal-protocol-c || die - - default -} - -src_compile() { - local makeargs=( - CC="$(tc-getCC)" - LIBGCRYPT_CONFIG="$(tc-getPROG LIBGCRYPT_CONFIG libgcrypt-config)" - PKG_CONFIG="$(tc-getPKG_CONFIG)" - XML2_CONFIG="$(tc-getPROG XML2_CONFIG xml2-config)" - ) - emake "${makeargs[@]}" -} diff --git a/x11-plugins/lurch/lurch-0.7.0-r1.ebuild b/x11-plugins/lurch/lurch-0.7.0-r1.ebuild deleted file mode 100644 index f2f240c868f0..000000000000 --- a/x11-plugins/lurch/lurch-0.7.0-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="OMEMO encryption for libpurple (XEP-0384)" -HOMEPAGE="https://github.com/gkdr/lurch"; -SRC_URI="https://github.com/gkdr/lurch/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" # likely not GPL-3+, https://github.com/gkdr/lurch/issues/165 -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="test" - -# NOTE: Some of these dependencies seem like leftovers in the build system -# and can probably be dropped with lurch >=0.7.1 -# (https://github.com/gkdr/lurch/issues/164) -RDEPEND=" - dev-db/sqlite - dev-libs/glib - dev-libs/libgcrypt:= - dev-libs/libxml2 - dev-libs/mxml:0 - net-im/pidgin:= - net-libs/libaxc - net-libs/libomemo - >=net-libs/libsignal-protocol-c-2.3.2 - " -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - test? ( dev-util/cmocka ) - " - -RESTRICT="!test? ( test )" - -src_prepare() { - rm -Rv lib/{axc,libomemo} || die # unbundle - default -} - -src_compile() { - local makeargs=( - CC="$(tc-getCC)" - LIBGCRYPT_CONFIG="$(tc-getPROG LIBGCRYPT_CONFIG libgcrypt-config)" - PKG_CONFIG="$(tc-getPKG_CONFIG)" - XML2_CONFIG="$(tc-getPROG XML2_CONFIG xml2-config)" - ) - emake "${makeargs[@]}" -} diff --git a/x11-plugins/lurch/metadata.xml b/x11-plugins/lurch/metadata.xml deleted file mode 100644 index 4c63e7ad2e37..000000000000 --- a/x11-plugins/lurch/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">gkdr/lurch</remote-id> - </upstream> -</pkgmetadata>
