From 288701ce317e0530f533163121dd67fcd8396635 Mon Sep 17 00:00:00 2001 From: Aisha Tammy Date: Fri, 26 Jun 2020 06:19:48 -0400 Subject: [PATCH 01/11] net-libs/usockets: removed unneeded BDEPEND Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Aisha Tammy --- .../usockets/files/usockets-Makefile.patch | 17 +++++----------- net-libs/usockets/metadata.xml | 18 ++++++++++------- ...-0.4.1.ebuild => usockets-0.4.1-r1.ebuild} | 20 +++++++++---------- net-libs/usockets/usockets-9999.ebuild | 20 +++++++++---------- 4 files changed, 34 insertions(+), 41 deletions(-) rename net-libs/usockets/{usockets-0.4.1.ebuild => usockets-0.4.1-r1.ebuild} (78%) diff --git a/net-libs/usockets/files/usockets-Makefile.patch b/net-libs/usockets/files/usockets-Makefile.patch index a51f8b16bd..5be09eeee2 100644 --- a/net-libs/usockets/files/usockets-Makefile.patch +++ b/net-libs/usockets/files/usockets-Makefile.patch @@ -1,5 +1,5 @@ diff --git a/Makefile b/Makefile -index fa6e2ff..529ed74 100644 +index fa6e2ff..ca2603f 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,14 @@ @@ -17,28 +17,21 @@ index fa6e2ff..529ed74 100644 # WITH_OPENSSL=1 enables OpenSSL 1.1+ support ifeq ($(WITH_OPENSSL),1) override CFLAGS += -DLIBUS_USE_OPENSSL -@@ -33,13 +44,33 @@ ifeq ($(WITH_ASAN),1) +@@ -33,13 +44,27 @@ ifeq ($(WITH_ASAN),1) endif override CFLAGS += -std=c11 -Isrc -override LDFLAGS += uSockets.a -# By default we build the uSockets.a static library --default: -+static: + default: rm -f *.o - $(CC) $(CFLAGS) -flto -O3 -c src/*.c src/eventing/*.c src/crypto/*.c - $(AR) rvs uSockets.a *.o -+ $(CC) $(CFLAGS) -c src/*.c src/eventing/*.c src/crypto/*.c -+ $(AR) rvs libusockets.a *.o -+ -+dynamic: -+ rm -f *.o + $(CC) -fPIC -c src/*.c src/eventing/*.c src/crypto/*.c $(CFLAGS) ++ $(AR) rvs libusockets.a *.o + $(CC) -shared -fPIC -Wl,-soname,$(LIBTARGET) $(CFLAGS) -o $(LIBTARGET) *.o $(LDFLAGS) + -+default: static dynamic -+ +install: + # install the folders needed (making sure that the exist) + install -d "$(DESTDIR)$(libdir)" \ @@ -56,7 +49,7 @@ index fa6e2ff..529ed74 100644 # Builds all examples .PHONY: examples -@@ -52,4 +83,5 @@ swift_examples: +@@ -52,4 +77,5 @@ swift_examples: clean: rm -f *.o rm -f *.a diff --git a/net-libs/usockets/metadata.xml b/net-libs/usockets/metadata.xml index 73dd5769c2..a24f33aee9 100644 --- a/net-libs/usockets/metadata.xml +++ b/net-libs/usockets/metadata.xml @@ -1,11 +1,15 @@ - - gentoo@aisha.cc - Aisha Tammy - - - Enable bindings to use the libuv dispatcher - + + gentoo@aisha.cc + Aisha Tammy + + + proxy-maint@gentoo.org + Proxy Maintainers + + + Enable bindings to use the libuv dispatcher + diff --git a/net-libs/usockets/usockets-0.4.1.ebuild b/net-libs/usockets/usockets-0.4.1-r1.ebuild similarity index 78% rename from net-libs/usockets/usockets-0.4.1.ebuild rename to net-libs/usockets/usockets-0.4.1-r1.ebuild index 0b4a1f0a53..07f682856f 100644 --- a/net-libs/usockets/usockets-0.4.1.ebuild +++ b/net-libs/usockets/usockets-0.4.1-r1.ebuild @@ -27,7 +27,6 @@ DEPEND="ssl? ( ) libuv? ( dev-libs/libuv[static-libs?] ) " -BDEPEND="${DEPEND}" RDEPEND="${DEPEND}" PATCHES=( @@ -36,19 +35,18 @@ PATCHES=( src_compile() { # the Makefile uses environment variables - emake -j1 \ - LIBusockets_VERSION=${PV} \ - WITH_OPENSSL=$(usex ssl 1 0) \ - WITH_LIBUV=$(usex libuv 1 0) \ - default + emake LIBusockets_VERSION=${PV} \ + WITH_OPENSSL=$(usex ssl 1 0) \ + WITH_LIBUV=$(usex libuv 1 0) \ + default } src_install() { - emake -j1 \ - libdir="/usr/$(get_libdir)" \ - prefix="/usr" DESTDIR="${D}" \ - LIBusockets_VERSION=${PV} \ - install + emake libdir="/usr/$(get_libdir)" \ + prefix="/usr" \ + DESTDIR="${D}" \ + LIBusockets_VERSION=${PV} \ + install einstalldocs if ! use static-libs; then rm "${D}/usr/$(get_libdir)/libusockets.a" || die diff --git a/net-libs/usockets/usockets-9999.ebuild b/net-libs/usockets/usockets-9999.ebuild index 0b4a1f0a53..07f682856f 100644 --- a/net-libs/usockets/usockets-9999.ebuild +++ b/net-libs/usockets/usockets-9999.ebuild @@ -27,7 +27,6 @@ DEPEND="ssl? ( ) libuv? ( dev-libs/libuv[static-libs?] ) " -BDEPEND="${DEPEND}" RDEPEND="${DEPEND}" PATCHES=( @@ -36,19 +35,18 @@ PATCHES=( src_compile() { # the Makefile uses environment variables - emake -j1 \ - LIBusockets_VERSION=${PV} \ - WITH_OPENSSL=$(usex ssl 1 0) \ - WITH_LIBUV=$(usex libuv 1 0) \ - default + emake LIBusockets_VERSION=${PV} \ + WITH_OPENSSL=$(usex ssl 1 0) \ + WITH_LIBUV=$(usex libuv 1 0) \ + default } src_install() { - emake -j1 \ - libdir="/usr/$(get_libdir)" \ - prefix="/usr" DESTDIR="${D}" \ - LIBusockets_VERSION=${PV} \ - install + emake libdir="/usr/$(get_libdir)" \ + prefix="/usr" \ + DESTDIR="${D}" \ + LIBusockets_VERSION=${PV} \ + install einstalldocs if ! use static-libs; then rm "${D}/usr/$(get_libdir)/libusockets.a" || die From bcd7f0ebe4bfa0aa53595c39352c194f8bb78e6d Mon Sep 17 00:00:00 2001 From: Aisha Tammy Date: Fri, 26 Jun 2020 06:23:35 -0400 Subject: [PATCH 02/11] www-apps/uwebsockets: remove unneeded patch Signed-off-by: Aisha Tammy --- .../files/uwebsockets-Makefile.patch | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100644 www-apps/uwebsockets/files/uwebsockets-Makefile.patch diff --git a/www-apps/uwebsockets/files/uwebsockets-Makefile.patch b/www-apps/uwebsockets/files/uwebsockets-Makefile.patch deleted file mode 100644 index bc6ba5cc03..0000000000 --- a/www-apps/uwebsockets/files/uwebsockets-Makefile.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/Makefile b/Makefile -index ae71753..d057e96 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,3 +1,9 @@ -+DESTDIR ?= -+ -+prefix ?= "/usr/local" -+exec_prefix ?= "$(prefix)" -+includedir?= "$(exec_prefix)/include/uWebSockets" -+ - EXAMPLE_FILES := HelloWorld EchoServer BroadcastingEchoServer - THREADED_EXAMPLE_FILES := HelloWorldThreaded EchoServerThreaded - override CXXFLAGS += -lpthread -Wconversion -std=c++17 -Isrc -IuSockets/src -@@ -38,3 +44,9 @@ all: - clean: - rm -rf $(EXAMPLE_FILES) $(THREADED_EXAMPLE_FILES) - rm -rf fuzzing/*.o benchmarks/*.o -+install: -+ # create the folder for the header files -+ install -d "$(DESTDIR)$(includedir)/f2" -+ # now install the header files -+ install -m 644 src/*.h "$(DESTDIR)$(includedir)/" -+ install -m 644 src/f2/function2.hpp "$(DESTDIR)$(includedir)/f2/" From 7aa554ddccec5098f0c3de4d91a5cda9d3cefc90 Mon Sep 17 00:00:00 2001 From: Aisha Tammy Date: Fri, 26 Jun 2020 06:27:30 -0400 Subject: [PATCH 03/11] www-apps/uwebsockets: version bump to 18.7.0 Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Aisha Tammy --- www-apps/uwebsockets/Manifest | 1 + .../uwebsockets/uwebsockets-18.7.0.ebuild | 37 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 www-apps/uwebsockets/uwebsockets-18.7.0.ebuild diff --git a/www-apps/uwebsockets/Manifest b/www-apps/uwebsockets/Manifest index 6f60638b3e..4f5a0f8190 100644 --- a/www-apps/uwebsockets/Manifest +++ b/www-apps/uwebsockets/Manifest @@ -1 +1,2 @@ DIST uwebsockets-18.6.0.tar.gz 264309 BLAKE2B c1cea128b6b0d5b7df30bb2aba97b0ac7207392755090e6950c61ab1847dd146b4a6c95dcd18065f3e969cfeaf3c5ffc09b17a5a34b6c5531b767a23df322386 SHA512 f748c90cb5cc83f119a27bd10d3043643cdc1bd617ccbd5460086e96114af8cbd9583c590bb9506b77f447c4e91b1f0be0493e3504af3d4f52d543a4f02826ba +DIST uwebsockets-18.7.0.tar.gz 264566 BLAKE2B 83e5cbf08c9f46f377128f1c2447eb148fb36a4a5acd9658e64c81d820be3a639fd081639859356c2131b4487b60e09ebe21824378282ad8d7347bcdc64e8aee SHA512 6dafd3eb9a86ebcc873ea5fe35bce46e40f415945197171d2dbfa71a28d57a3338bf61c594b00f5f5009f61dc3d0811f3d444b341270bf57613bfd1aa2c0e090 diff --git a/www-apps/uwebsockets/uwebsockets-18.7.0.ebuild b/www-apps/uwebsockets/uwebsockets-18.7.0.ebuild new file mode 100644 index 0000000000..2738b66dd6 --- /dev/null +++ b/www-apps/uwebsockets/uwebsockets-18.7.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 2019-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="ultra fast, simple, secure & standards compliant web I/O" +HOMEPAGE="https://github.com/uNetworking/uWebSockets" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/uNetworking/uWebSockets.git" +else + SRC_URI="https://github.com/uNetworking/uWebSockets/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~x86" + S="${WORKDIR}/uWebSockets-${PV}" +fi + +LICENSE="Apache-2.0" +SLOT="0" +RDEPEND=">=net-libs/usockets-0.4.1" + +PATCHES=( + "${FILESDIR}/${PN}-src_Loop.h.patch" +) + +src_prepare() { + default + mv src uWebSockets +} + +src_compile() { + return 0 +} + +src_install() { + doheader -r uWebSockets +} From 51c7a770035114fdb29da960590c9ae56e4df526 Mon Sep 17 00:00:00 2001 From: Aisha Tammy Date: Fri, 26 Jun 2020 06:28:01 -0400 Subject: [PATCH 04/11] www-apps/uwebsockets: drop old version Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Aisha Tammy --- www-apps/uwebsockets/Manifest | 1 - .../uwebsockets/uwebsockets-18.6.0.ebuild | 37 ------------------- 2 files changed, 38 deletions(-) delete mode 100644 www-apps/uwebsockets/uwebsockets-18.6.0.ebuild diff --git a/www-apps/uwebsockets/Manifest b/www-apps/uwebsockets/Manifest index 4f5a0f8190..511540c254 100644 --- a/www-apps/uwebsockets/Manifest +++ b/www-apps/uwebsockets/Manifest @@ -1,2 +1 @@ -DIST uwebsockets-18.6.0.tar.gz 264309 BLAKE2B c1cea128b6b0d5b7df30bb2aba97b0ac7207392755090e6950c61ab1847dd146b4a6c95dcd18065f3e969cfeaf3c5ffc09b17a5a34b6c5531b767a23df322386 SHA512 f748c90cb5cc83f119a27bd10d3043643cdc1bd617ccbd5460086e96114af8cbd9583c590bb9506b77f447c4e91b1f0be0493e3504af3d4f52d543a4f02826ba DIST uwebsockets-18.7.0.tar.gz 264566 BLAKE2B 83e5cbf08c9f46f377128f1c2447eb148fb36a4a5acd9658e64c81d820be3a639fd081639859356c2131b4487b60e09ebe21824378282ad8d7347bcdc64e8aee SHA512 6dafd3eb9a86ebcc873ea5fe35bce46e40f415945197171d2dbfa71a28d57a3338bf61c594b00f5f5009f61dc3d0811f3d444b341270bf57613bfd1aa2c0e090 diff --git a/www-apps/uwebsockets/uwebsockets-18.6.0.ebuild b/www-apps/uwebsockets/uwebsockets-18.6.0.ebuild deleted file mode 100644 index 2738b66dd6..0000000000 --- a/www-apps/uwebsockets/uwebsockets-18.6.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 2019-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="ultra fast, simple, secure & standards compliant web I/O" -HOMEPAGE="https://github.com/uNetworking/uWebSockets" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/uNetworking/uWebSockets.git" -else - SRC_URI="https://github.com/uNetworking/uWebSockets/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" - S="${WORKDIR}/uWebSockets-${PV}" -fi - -LICENSE="Apache-2.0" -SLOT="0" -RDEPEND=">=net-libs/usockets-0.4.1" - -PATCHES=( - "${FILESDIR}/${PN}-src_Loop.h.patch" -) - -src_prepare() { - default - mv src uWebSockets -} - -src_compile() { - return 0 -} - -src_install() { - doheader -r uWebSockets -} From ddacbdedfb09efa14c5099c3f1c70bae1419e10b Mon Sep 17 00:00:00 2001 From: Aisha Tammy Date: Fri, 26 Jun 2020 06:30:56 -0400 Subject: [PATCH 05/11] net-misc/purritobin: version bump to 0.2.2 Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Aisha Tammy --- net-misc/purritobin/Manifest | 1 + net-misc/purritobin/purritobin-0.2.2.ebuild | 50 +++++++++++++++++++++ net-misc/purritobin/purritobin-9999.ebuild | 4 +- 3 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 net-misc/purritobin/purritobin-0.2.2.ebuild diff --git a/net-misc/purritobin/Manifest b/net-misc/purritobin/Manifest index a2c4a31095..73d4ad912c 100644 --- a/net-misc/purritobin/Manifest +++ b/net-misc/purritobin/Manifest @@ -1 +1,2 @@ DIST purritobin-0.2.1.tar.gz 9487 BLAKE2B 1aa4e44b5d79d4da6c05195ed5aa187e8c4c2864905b0f225d4e6a0c65b469c046b2172d8b2108588955930dbfc2ab01f6d01b191fd988ebdb7b5714cda2bbd9 SHA512 4dbcc473b2f4df399a572a9ae588c32564eb0d807411448a4da701d2982bc72d45dd2fb5256b9cf1b6d6b3c06b588a18ac7a2f980758763f699fe54d11207ddb +DIST purritobin-0.2.2.tar.gz 11223 BLAKE2B da28aab88578a076f3fb795264d8dc35fb279c9ce6ed170187b9269cd80c135e9f03b06bf5668f55272b6bc479aefedfe389a0b58eb52eac7d6a9c9129f42de4 SHA512 5bf64e62333f72a98c5e00b45885012212df6d88a609c7b71aecccb89b87ea6370567efa7a5b6c9ed0f09fb6b5ba15cb2769f67509fa6ee49a00ce19e5968f18 diff --git a/net-misc/purritobin/purritobin-0.2.2.ebuild b/net-misc/purritobin/purritobin-0.2.2.ebuild new file mode 100644 index 0000000000..301a1af7fd --- /dev/null +++ b/net-misc/purritobin/purritobin-0.2.2.ebuild @@ -0,0 +1,50 @@ +# Copyright 2019-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="minimalistic commandline pastebin" +HOMEPAGE="https://bsd.ac" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/PurritoBin/PurritoBin.git" + KEYWORDS="" +else + SRC_URI="https://github.com/PurritoBin/PurritoBin/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~x86" + S="${WORKDIR}/PurritoBin-${PV}" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="libuv static-libs" + +RDEPEND="net-libs/usockets[libuv=,static-libs?] + libuv? ( >=dev-libs/libuv-1.35.0[static-libs?] ) +" +DEPEND="${RDEPEND} + www-apps/uwebsockets +" + +src_prepare() { + sed -i -e "s:.ifdef:ifdef:g" \ + -e "s:.else:else:g" \ + -e "s:.endif:endif:g" \ + Makefile + default +} + +src_compile() { + env LDFLAGS="-L/usr/$(get_libdir)" \ + emake $(usex libuv USE_DLIBUV=1 '') \ + $(usex static-libs USE_STATIC=1 '') \ + all +} + +src_install() { + emake prefix="/usr" \ + DESTDIR="${D}" \ + install + einstalldocs +} diff --git a/net-misc/purritobin/purritobin-9999.ebuild b/net-misc/purritobin/purritobin-9999.ebuild index 92b81b9f6f..301a1af7fd 100644 --- a/net-misc/purritobin/purritobin-9999.ebuild +++ b/net-misc/purritobin/purritobin-9999.ebuild @@ -20,10 +20,10 @@ LICENSE="GPL-2" SLOT="0" IUSE="libuv static-libs" -DEPEND="net-libs/usockets[libuv=,static-libs?] +RDEPEND="net-libs/usockets[libuv=,static-libs?] libuv? ( >=dev-libs/libuv-1.35.0[static-libs?] ) " -BDEPEND=" +DEPEND="${RDEPEND} www-apps/uwebsockets " From cead9a95ece3cdbe0af30ff832f5afdb680f2270 Mon Sep 17 00:00:00 2001 From: Aisha Tammy Date: Fri, 26 Jun 2020 06:31:22 -0400 Subject: [PATCH 06/11] net-misc/purritobin: drop old version Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Aisha Tammy --- net-misc/purritobin/Manifest | 1 - net-misc/purritobin/purritobin-0.2.1.ebuild | 50 --------------------- 2 files changed, 51 deletions(-) delete mode 100644 net-misc/purritobin/purritobin-0.2.1.ebuild diff --git a/net-misc/purritobin/Manifest b/net-misc/purritobin/Manifest index 73d4ad912c..bc91a79da3 100644 --- a/net-misc/purritobin/Manifest +++ b/net-misc/purritobin/Manifest @@ -1,2 +1 @@ -DIST purritobin-0.2.1.tar.gz 9487 BLAKE2B 1aa4e44b5d79d4da6c05195ed5aa187e8c4c2864905b0f225d4e6a0c65b469c046b2172d8b2108588955930dbfc2ab01f6d01b191fd988ebdb7b5714cda2bbd9 SHA512 4dbcc473b2f4df399a572a9ae588c32564eb0d807411448a4da701d2982bc72d45dd2fb5256b9cf1b6d6b3c06b588a18ac7a2f980758763f699fe54d11207ddb DIST purritobin-0.2.2.tar.gz 11223 BLAKE2B da28aab88578a076f3fb795264d8dc35fb279c9ce6ed170187b9269cd80c135e9f03b06bf5668f55272b6bc479aefedfe389a0b58eb52eac7d6a9c9129f42de4 SHA512 5bf64e62333f72a98c5e00b45885012212df6d88a609c7b71aecccb89b87ea6370567efa7a5b6c9ed0f09fb6b5ba15cb2769f67509fa6ee49a00ce19e5968f18 diff --git a/net-misc/purritobin/purritobin-0.2.1.ebuild b/net-misc/purritobin/purritobin-0.2.1.ebuild deleted file mode 100644 index 92b81b9f6f..0000000000 --- a/net-misc/purritobin/purritobin-0.2.1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 2019-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="minimalistic commandline pastebin" -HOMEPAGE="https://bsd.ac" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/PurritoBin/PurritoBin.git" - KEYWORDS="" -else - SRC_URI="https://github.com/PurritoBin/PurritoBin/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" - S="${WORKDIR}/PurritoBin-${PV}" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="libuv static-libs" - -DEPEND="net-libs/usockets[libuv=,static-libs?] - libuv? ( >=dev-libs/libuv-1.35.0[static-libs?] ) -" -BDEPEND=" - www-apps/uwebsockets -" - -src_prepare() { - sed -i -e "s:.ifdef:ifdef:g" \ - -e "s:.else:else:g" \ - -e "s:.endif:endif:g" \ - Makefile - default -} - -src_compile() { - env LDFLAGS="-L/usr/$(get_libdir)" \ - emake $(usex libuv USE_DLIBUV=1 '') \ - $(usex static-libs USE_STATIC=1 '') \ - all -} - -src_install() { - emake prefix="/usr" \ - DESTDIR="${D}" \ - install - einstalldocs -} From 05670022596dc81d67e4ad26e3604d2e201eb6e4 Mon Sep 17 00:00:00 2001 From: Aisha Tammy Date: Fri, 26 Jun 2020 06:32:32 -0400 Subject: [PATCH 07/11] net-libs/usockets: remove proxy-maint from metadata Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Aisha Tammy --- net-libs/usockets/metadata.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/net-libs/usockets/metadata.xml b/net-libs/usockets/metadata.xml index a24f33aee9..4e34222762 100644 --- a/net-libs/usockets/metadata.xml +++ b/net-libs/usockets/metadata.xml @@ -5,10 +5,6 @@ gentoo@aisha.cc Aisha Tammy - - proxy-maint@gentoo.org - Proxy Maintainers - Enable bindings to use the libuv dispatcher From d61ca2d372d03f68a56e2c28d8ba3f9dbc61bab8 Mon Sep 17 00:00:00 2001 From: David Flogeras Date: Fri, 26 Jun 2020 10:55:44 -0300 Subject: [PATCH 08/11] x11-libs/kimageannotator: Bump to 0.3.1 and remove 0.3.0. Signed-off-by: David Flogeras --- x11-libs/kimageannotator/Manifest | 1 + ...mmand-delete-items-that-are-required.patch | 10 ------ .../include-gnuinstalldirs-before-use.patch | 36 ------------------- ....0.ebuild => kimageannotator-0.3.1.ebuild} | 7 ---- 4 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 x11-libs/kimageannotator/files/fix-undo-command-delete-items-that-are-required.patch delete mode 100644 x11-libs/kimageannotator/files/include-gnuinstalldirs-before-use.patch rename x11-libs/kimageannotator/{kimageannotator-0.3.0.ebuild => kimageannotator-0.3.1.ebuild} (73%) diff --git a/x11-libs/kimageannotator/Manifest b/x11-libs/kimageannotator/Manifest index 539d692fd5..c15f6e6c1b 100644 --- a/x11-libs/kimageannotator/Manifest +++ b/x11-libs/kimageannotator/Manifest @@ -1,2 +1,3 @@ DIST kImageAnnotator-0.2.1.tar.gz 107027 BLAKE2B 247ea31f3dfd90fd175b879c3fe06a50ee2ce8f3f2ce395efa1882fe8abc4be4e5a739782054682336cf327fe288d24b17971c89dfaf7f5202ba3f607165b0f2 SHA512 6f9d03b6d0d020c90fa050ac6be30b680db8dd3a2035db80856bb69c9e6ef0228b2d152c5f234caf6d3fe2d8433b17fbdfee728246f2a8c339936b6ba051a52b DIST kImageAnnotator-0.3.0.tar.gz 128019 BLAKE2B 412748b432e41e6bdc01aa7270cbb32342016423beeca537c92096641e06f9a82a0ce7d1779fb25aec51e6e4c9451778fc339bb3c82edcdc56657ac810859447 SHA512 0d9e4ab5bdef1554e3b476e0d0e8f2ad08387abd94d9167c2b4987b0857294618b7a6626640381dade10c7eedaa5dec9e449715b46437c1d9a044142c15b7617 +DIST kImageAnnotator-0.3.1.tar.gz 130708 BLAKE2B 5491ca5b3d11bfeeb92366d737251bfeb5a19631e37269d8edc4b9799d86f93ac276aa1edd34ed0aa27fff2b2fbfe07044150ef90b3dfe59d40f7669c547cce8 SHA512 5953b4083328a632c889b8a7bef0e61ef7dd9c6dfdeb9cf99fa248409116f2757ca63ff98e1695b46dfb24d818bf296c89abb7609af1b06034f814557e1c5af0 diff --git a/x11-libs/kimageannotator/files/fix-undo-command-delete-items-that-are-required.patch b/x11-libs/kimageannotator/files/fix-undo-command-delete-items-that-are-required.patch deleted file mode 100644 index 39aa7590c5..0000000000 --- a/x11-libs/kimageannotator/files/fix-undo-command-delete-items-that-are-required.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/annotations/undo/AddCommand.cpp -+++ b/src/annotations/undo/AddCommand.cpp -@@ -29,7 +29,6 @@ AddCommand::AddCommand(AbstractAnnotationItem *item, AnnotationArea *annotationA - - AddCommand::~AddCommand() - { -- delete mItem; - } - - void AddCommand::undo() diff --git a/x11-libs/kimageannotator/files/include-gnuinstalldirs-before-use.patch b/x11-libs/kimageannotator/files/include-gnuinstalldirs-before-use.patch deleted file mode 100644 index c5c7677d88..0000000000 --- a/x11-libs/kimageannotator/files/include-gnuinstalldirs-before-use.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 94b08e1a3cef1d826ccae09a1287c2d5e327a293 Mon Sep 17 00:00:00 2001 -From: Dave Flogeras -Date: Fri, 19 Jun 2020 09:23:29 -0300 -Subject: [PATCH] Include GNUInstallDirs before using variables that rely on - it. - -This was subtle because when building by hand, and running cmake -multiple times, it seems to cache the variable. However when building -for Gentoo in an ebuild, cmake makes one pass, and the -CMAKE_INSTALL_DATAROOTDIR variable is empty. This results in the -translation files going in the wrong place. ---- - CMakeLists.txt | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 12ad227..5c14937 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -11,6 +11,8 @@ set(CMAKE_AUTORCC ON) - option(BUILD_TESTS "Build Unit Tests" OFF) - option(BUILD_EXAMPLE "Build Example Application" ON) - -+include(GNUInstallDirs) -+ - if (WIN32) - set(KIMAGEANNOTATOR_LANG_INSTAL_DIR "translations") - elseif (APPLE) -@@ -27,7 +29,6 @@ if (UNIX) - find_package(X11 REQUIRED) - endif () - --include(GNUInstallDirs) - include(FeatureSummary) - - set(KCOLORPICKER_MIN_VERSION "0.1.4") diff --git a/x11-libs/kimageannotator/kimageannotator-0.3.0.ebuild b/x11-libs/kimageannotator/kimageannotator-0.3.1.ebuild similarity index 73% rename from x11-libs/kimageannotator/kimageannotator-0.3.0.ebuild rename to x11-libs/kimageannotator/kimageannotator-0.3.1.ebuild index d1dd0cb220..9139507326 100644 --- a/x11-libs/kimageannotator/kimageannotator-0.3.0.ebuild +++ b/x11-libs/kimageannotator/kimageannotator-0.3.1.ebuild @@ -22,10 +22,3 @@ RDEPEND="${DEPEND}" BDEPEND="" S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - eapply "${FILESDIR}"/fix-undo-command-delete-items-that-are-required.patch - eapply "${FILESDIR}"/include-gnuinstalldirs-before-use.patch - cmake_src_prepare -} From d40a68ecf56d4358a69faa6ca07b006342441716 Mon Sep 17 00:00:00 2001 From: David Flogeras Date: Fri, 26 Jun 2020 10:57:22 -0300 Subject: [PATCH 09/11] x11-misc/ksnip: Bump to 1.7.1 and remove 1.7.0 Signed-off-by: David Flogeras --- x11-misc/ksnip/Manifest | 1 + x11-misc/ksnip/{ksnip-1.7.0.ebuild => ksnip-1.7.1.ebuild} | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) rename x11-misc/ksnip/{ksnip-1.7.0.ebuild => ksnip-1.7.1.ebuild} (95%) diff --git a/x11-misc/ksnip/Manifest b/x11-misc/ksnip/Manifest index e48a0e6708..9cdab225a5 100644 --- a/x11-misc/ksnip/Manifest +++ b/x11-misc/ksnip/Manifest @@ -1,2 +1,3 @@ DIST ksnip-1.6.2.tar.gz 221518 BLAKE2B a2e08b3dcfa448790a165a15e4e0c76771168d03756778b53ea79d7ebc3aad5efa50a18a6d4755a5c85ba3867e5d8e0c534af2cd0e7886db70ba407fb36185ff SHA512 2e40d12524a6a0d5bf321f7e5554a0a423e3fe7861118b6d6fc95e01e9558e63ce1519ed234ac514f3ade88d1d3261fb8f693e89d097059e1607f9bfd5227573 DIST ksnip-1.7.0.tar.gz 335727 BLAKE2B 2b7aab75917dfe5a5a2cf77ea96c78d35c6483705999e1a0be6de0ae00aa3c4a1ea5b6ea3923fc5624fe13cba4133e180367db224b094f4b2625d8b53951c2ec SHA512 833a8c07cdb71dd3437686b1eb350f45caa70614114145901dd05b3db9b62bc83702b258e5f414306d779e0febeba8605b586fc57f55907dc9bbb50da5a08703 +DIST ksnip-1.7.1.tar.gz 340654 BLAKE2B 76f14b3a1b664e4877e19fb9b0e4620b20bb01f5c0d1e14671250a058f9e39170f385dd3aca53e9325de091c29c8bd17ae85127ec622cf751a387f6b09a5bbda SHA512 8d978fd4d5844427b041091e79f01e308ed9defbe393fc1ac72b4f5607c114f1c30ccb963c79ebe32559e58cb2c60aeaba7a288aee9d16f6ed6a637466396cd3 diff --git a/x11-misc/ksnip/ksnip-1.7.0.ebuild b/x11-misc/ksnip/ksnip-1.7.1.ebuild similarity index 95% rename from x11-misc/ksnip/ksnip-1.7.0.ebuild rename to x11-misc/ksnip/ksnip-1.7.1.ebuild index ea5c53bc18..91216b6872 100644 --- a/x11-misc/ksnip/ksnip-1.7.0.ebuild +++ b/x11-misc/ksnip/ksnip-1.7.1.ebuild @@ -21,7 +21,7 @@ RDEPEND=" dev-qt/qtprintsupport:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 - >=x11-libs/kimageannotator-0.3.0 + >=x11-libs/kimageannotator-0.3.1 x11-libs/libxcb" BDEPEND="" From ac1f278c10974e3dc142769bdc74b893265c8b4a Mon Sep 17 00:00:00 2001 From: David Flogeras Date: Fri, 26 Jun 2020 11:02:30 -0300 Subject: [PATCH 10/11] x11-libs/kimageannotator: Remove old from manifest Signed-off-by: David Flogeras --- x11-libs/kimageannotator/Manifest | 1 - 1 file changed, 1 deletion(-) diff --git a/x11-libs/kimageannotator/Manifest b/x11-libs/kimageannotator/Manifest index c15f6e6c1b..0139500c73 100644 --- a/x11-libs/kimageannotator/Manifest +++ b/x11-libs/kimageannotator/Manifest @@ -1,3 +1,2 @@ DIST kImageAnnotator-0.2.1.tar.gz 107027 BLAKE2B 247ea31f3dfd90fd175b879c3fe06a50ee2ce8f3f2ce395efa1882fe8abc4be4e5a739782054682336cf327fe288d24b17971c89dfaf7f5202ba3f607165b0f2 SHA512 6f9d03b6d0d020c90fa050ac6be30b680db8dd3a2035db80856bb69c9e6ef0228b2d152c5f234caf6d3fe2d8433b17fbdfee728246f2a8c339936b6ba051a52b -DIST kImageAnnotator-0.3.0.tar.gz 128019 BLAKE2B 412748b432e41e6bdc01aa7270cbb32342016423beeca537c92096641e06f9a82a0ce7d1779fb25aec51e6e4c9451778fc339bb3c82edcdc56657ac810859447 SHA512 0d9e4ab5bdef1554e3b476e0d0e8f2ad08387abd94d9167c2b4987b0857294618b7a6626640381dade10c7eedaa5dec9e449715b46437c1d9a044142c15b7617 DIST kImageAnnotator-0.3.1.tar.gz 130708 BLAKE2B 5491ca5b3d11bfeeb92366d737251bfeb5a19631e37269d8edc4b9799d86f93ac276aa1edd34ed0aa27fff2b2fbfe07044150ef90b3dfe59d40f7669c547cce8 SHA512 5953b4083328a632c889b8a7bef0e61ef7dd9c6dfdeb9cf99fa248409116f2757ca63ff98e1695b46dfb24d818bf296c89abb7609af1b06034f814557e1c5af0 From ea54c3e7e153b4118f0422a2dcdc077a31e68b3d Mon Sep 17 00:00:00 2001 From: David Flogeras Date: Fri, 26 Jun 2020 11:02:55 -0300 Subject: [PATCH 11/11] x11-misc/ksnip: remove old from manifest Signed-off-by: David Flogeras --- x11-misc/ksnip/Manifest | 1 - 1 file changed, 1 deletion(-) diff --git a/x11-misc/ksnip/Manifest b/x11-misc/ksnip/Manifest index 9cdab225a5..aeb7372eb1 100644 --- a/x11-misc/ksnip/Manifest +++ b/x11-misc/ksnip/Manifest @@ -1,3 +1,2 @@ DIST ksnip-1.6.2.tar.gz 221518 BLAKE2B a2e08b3dcfa448790a165a15e4e0c76771168d03756778b53ea79d7ebc3aad5efa50a18a6d4755a5c85ba3867e5d8e0c534af2cd0e7886db70ba407fb36185ff SHA512 2e40d12524a6a0d5bf321f7e5554a0a423e3fe7861118b6d6fc95e01e9558e63ce1519ed234ac514f3ade88d1d3261fb8f693e89d097059e1607f9bfd5227573 -DIST ksnip-1.7.0.tar.gz 335727 BLAKE2B 2b7aab75917dfe5a5a2cf77ea96c78d35c6483705999e1a0be6de0ae00aa3c4a1ea5b6ea3923fc5624fe13cba4133e180367db224b094f4b2625d8b53951c2ec SHA512 833a8c07cdb71dd3437686b1eb350f45caa70614114145901dd05b3db9b62bc83702b258e5f414306d779e0febeba8605b586fc57f55907dc9bbb50da5a08703 DIST ksnip-1.7.1.tar.gz 340654 BLAKE2B 76f14b3a1b664e4877e19fb9b0e4620b20bb01f5c0d1e14671250a058f9e39170f385dd3aca53e9325de091c29c8bd17ae85127ec622cf751a387f6b09a5bbda SHA512 8d978fd4d5844427b041091e79f01e308ed9defbe393fc1ac72b4f5607c114f1c30ccb963c79ebe32559e58cb2c60aeaba7a288aee9d16f6ed6a637466396cd3