gentoo auto-resync : 09:12:2022 - 09:17:42

7 files changed, 68 insertions, 50 deletions

diff --git a/app-arch/qpress/Manifest b/app-arch/qpress/Manifest
index 08098ac117ca..683829a59a79 100644
--- a/app-arch/qpress/Manifest
+++ b/app-arch/qpress/Manifest
@@ -1,5 +1,4 @@
-AUX qpress-1.1-fix-build-system.patch 231 BLAKE2B e8fa8dad2a660d37e927f254804ad9a5e556d7f6058c0ed28a46c08070d8f790765eefe41506216cc6f7e11d1813d55ef39fdd6a65470ccc85ac63e052196da4 SHA512 9e6123baed7917d484aba0dfadd9f0382f6739bf7ee4600cd5248034276bd6cd7e71a5ebe1314734182caaa2448a1fe33639c57d611d08459f3d8fef718ba618
-AUX qpress-1.1-fix-includes.patch 158 BLAKE2B fa446d129cfc56fc7d53c342df334810311de9c5e903ee8402e78b196583d5caefee29bdc2381e4f5c9193f57a328f196e68e0c79031ca37fbe40ce7d7aedeed SHA512 321cdafc7ca71597c4ccf94a8493ff5156cb7103266d5c71ad4e650efded68e91dc655ae567562f5bc28913b137d9d3f142fbe295703864277e4e53729bf4658
-DIST qpress-11-source.zip 26998 BLAKE2B 08dd943f248f7211e8588fbaf7a2c2eee988d33b17aebfb5f1178647d80314fde576caec9b4aab67d69689f5931d086f88fd51204c1df6d3abc2cca583830380 SHA512 986754cca8bb2cdcfc7e197f7e123c6b2da90db840642a6385f14613f49f7ec6b2c18944838405fe35d5382d71fcd5d69050a036dda4c5de2e588d144e16ea6b
-EBUILD qpress-1.1-r1.ebuild 601 BLAKE2B 9be02cacbfb26adea05db4a2eef5a4ae549aa7599501571b607528320c67bef9ffa9addfa2c3d3e486085aca15524229bfe51758e00b37c6a4e4d836c2e35443 SHA512 ee3ed62855bbebaac2036ab511abd526b6384a181fe332ed94faae8ea31c81d9405bddd947debb6e4c70e796a99d3fbb025cee7776b7654707086cc70b409693
-MISC metadata.xml 407 BLAKE2B ab107cbc4c6048f4c83a38eb81c55d47a3038ca92aa431afc54d2ae77c936ef6e40eb91436f8e9bb763180635fa41ff6de80de45688c5ef64a9e4973ecd2ac81 SHA512 1c353d7c2ee066109e5adac1fb327715dacfb830d066032971d7beac80add3749ac0f49ed5125fdbc63910c5cb371a533a4023fdb8081351ad665bb32b6d8cfa
+AUX qpress-20220819-fix-build-system.patch 1079 BLAKE2B 1d8817e15d37697a47de6f9b9eddcce93d97052d69e5fbd4e4b16338c658accfc96cc3fe13e869dc70462b8554324cb84ad22fda13b7d3fd9189e9d6568e76ad SHA512 4a1c6134d58130dc75dc387ef138845bc18818a0cea096409ce72952a052b45e00a0cc6e2afd2039b71154d30f05d7aa9b9fa9c1765dda3473821a0a0ff24100
+DIST qpress-20220819.tar.gz 25150 BLAKE2B e19a2bca747ec48507288b1b1ad8e053cfb35558f5936dff4ff83c548a3ab613a640813fc3b793e7acb1b65f371af414635d7e469e92c014b580efce4f84ee90 SHA512 f9cf4f87c25fdaa9b8ed12bbfb8d95c3036a7c5c1a0548042ba460b79787a83d5cd2ad93f2da84e5b6715ade5e137024541a3f29e076d4236d0507e2c604113c
+EBUILD qpress-20220819.ebuild 482 BLAKE2B a72d325bc86f99870232f7450a09d7f6a0469ca276930167ef84469371eca1d3dd782da51f8ff49d4d43de4993d16850b07fa89281a3a67e027504534ea57a36 SHA512 a34bfa6aa59d9b04c964b820214d84afe7df02b38db2aedda8c513136f6008135c8f4b984584b7eb14b474f4f23a402e0e8ee111cdcb28cfc9635fbd73cdcc38
+MISC metadata.xml 488 BLAKE2B 931482680609670cbb65cc79943cca69d01067e8ae15545dfb469d6a1f18619237964fdf42ce1453b3535fc8a68355a35a3ebcd4d45b761d49a254f86ea17250 SHA512 ea1f899fde5b7a54a82e8c77d996fd87efed3784f68cb8f6b1857cb7b5b7ea8d5573e572f3a9578c9956a65ef751124a526ac8af7a53bc77b3fd3f041118304e
diff --git a/app-arch/qpress/files/qpress-1.1-fix-build-system.patch b/app-arch/qpress/files/qpress-1.1-fix-build-system.patch
deleted file mode 100644
index b6f7c0f2841b..000000000000
--- a/app-arch/qpress/files/qpress-1.1-fix-build-system.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/makefile
-+++ b/makefile
-@@ -1,2 +1 @@
--g++:	qpress.cpp aio.cpp quicklz.c utilities.cpp
--	g++ -O3 -o qpress qpress.cpp aio.cpp quicklz.c utilities.cpp -lpthread
-\ No newline at end of file
-+qpress: aio.o quicklz.o utilities.o
diff --git a/app-arch/qpress/files/qpress-1.1-fix-includes.patch b/app-arch/qpress/files/qpress-1.1-fix-includes.patch
deleted file mode 100644
index 51bfee465aa9..000000000000
--- a/app-arch/qpress/files/qpress-1.1-fix-includes.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/qpress.cpp
-+++ b/qpress.cpp
-@@ -1,3 +1,4 @@
-+#include <unistd.h>
- /*

- qpress - portable high-speed file archiver

- Copyright Lasse Reinhold 2006-2010

diff --git a/app-arch/qpress/files/qpress-20220819-fix-build-system.patch b/app-arch/qpress/files/qpress-20220819-fix-build-system.patch
new file mode 100644
index 000000000000..79676f57664d
--- /dev/null
+++ b/app-arch/qpress/files/qpress-20220819-fix-build-system.patch
@@ -0,0 +1,40 @@
+From 1627b18fdf76e978bdd05b985eb6efb1286fa1da Mon Sep 17 00:00:00 2001
+From: Davide Cavalca <dcavalca@fedoraproject.org>
+Date: Thu, 24 Nov 2022 16:13:30 -0800
+Subject: [PATCH] Rework makefile to ease packaging
+
+---
+ makefile | 22 +++++++++++++++++-----
+ 1 file changed, 17 insertions(+), 5 deletions(-)
+
+diff --git a/makefile b/makefile
+index 4890f9d..349fbb2 100755
+--- a/makefile
++++ b/makefile
+@@ -1,9 +1,21 @@
+-PREFIX = /usr/local
++DESTDIR ?=
++PREFIX ?= /usr/local
++CXX ?= g++
++CXXFLAGS ?= -O3
++CXXFLAGS += -Wall -Wextra -Werror
++LDFLAGS ?=
+ 
+-g++:	qpress.cpp aio.cpp quicklz.c utilities.cpp
+-	g++ -O3 -o qpress -x c quicklz.c -x c++ qpress.cpp aio.cpp utilities.cpp -lpthread -Wall -Wextra -Werror
++qpress:	qpress.cpp aio.cpp quicklz.c utilities.cpp
++	$(CXX) $(CXXFLAGS) -o qpress -x c quicklz.c -x c++ qpress.cpp aio.cpp utilities.cpp -lpthread $(LDFLAGS)
+ 
+ install: qpress
+-	install -m 0755 qpress $(PREFIX)/bin
++	install -D -p -m 0755 -t $(DESTDIR)$(PREFIX)/bin qpress
+ 
+-.PHONY: install g++
++clean:
++	rm -f qpress
++
++all: qpress
++
++g++: qpress
++
++.PHONY: clean install
diff --git a/app-arch/qpress/metadata.xml b/app-arch/qpress/metadata.xml
index c10db277fd54..ff29f9711f94 100644
--- a/app-arch/qpress/metadata.xml
+++ b/app-arch/qpress/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">PierreLvx/qpress</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-arch/qpress/qpress-1.1-r1.ebuild b/app-arch/qpress/qpress-1.1-r1.ebuild
deleted file mode 100644
index ba05bad121ce..000000000000
--- a/app-arch/qpress/qpress-1.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="A portable file archiver using QuickLZ algorithm"
-HOMEPAGE="http://www.quicklz.com/"
-SRC_URI="http://www.quicklz.com/${PN}-${PV/./}-source.zip"
-S="${WORKDIR}"
-
-LICENSE="GPL-1 GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="app-arch/unzip"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1-fix-includes.patch"
-	"${FILESDIR}/${PN}-1.1-fix-build-system.patch"
-)
-
-src_configure() {
-	tc-export CC CXX
-	export LDLIBS="-lpthread"
-}
-
-src_install() {
-	dobin qpress
-}
diff --git a/app-arch/qpress/qpress-20220819.ebuild b/app-arch/qpress/qpress-20220819.ebuild
new file mode 100644
index 000000000000..c7327d69a530
--- /dev/null
+++ b/app-arch/qpress/qpress-20220819.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A portable file archiver using QuickLZ algorithm"
+HOMEPAGE="https://github.com/PierreLvx/qpress"
+SRC_URI="https://github.com/PierreLvx/qpress/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-1 GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-build-system.patch"
+)
+
+src_install() {
+	dobin qpress
+	dodoc readme.md
+}