net-wireless/qflipper: adds 1.2.0, updates 9999

Signed-off-by: Thibaud CANALE <thican@thican.net>

net-wireless/qflipper/Manifest

@@ -1,2 +1,3 @@
 DIST qflipper-1.1.2.tar.gz 1048924 BLAKE2B 7d336f20936bce9e0d1a79604cb0b66eb40c634d367d7c51facabb4780ddce859e324920ae8504d251468890b2876fef0b399f0ac08f1ca6691ddf76e4d18bae SHA512 d75bc51e570f1a9d39c16186c7969547bb980c7f91c796dd79489e12fbcf7a8a9fa231d00d16936e4cef69530e31982dfcca735616e18961c4706750a15d4dbe
 DIST qflipper-1.1.3.tar.gz 1053448 BLAKE2B 129839b7fddb9ebd7c6e2cae4834a04186f391ec9208224dbeb53f777421580e29c9c1c1f5cd32fd14df9168956be5ab18629c1f162a3b683fbf39d068645bf6 SHA512 7d30a4d64bdfb06e1cc3790d9e375613621109bcc8316825fc34ce1fe4f8b133eabdd3b6ca3b29ac7ccb90adb056b7a4e4fbe3dd4be40342d2931f9f614cb146
+DIST qflipper-1.2.0.tar.gz 1285194 BLAKE2B f651bf6c90da1d5bf7b1b2ba4e725472ab0094b11537cb4b1f75aa4721fb219749d6dee4c9d637fafe3d7c0cb53e6a2878f2da57db0150952e47d094acdb2a5c SHA512 23bc1bbde9e151066f64e781bcf1d385c69b321dbfd112088499e381e219a478d994661e82c7e3236985b998988e2cb39ec797ffafad34c8f875011ba6989859

net-wireless/qflipper/files/qflipper-1.2.0_display_version.patch

@@ -0,0 +1,28 @@
+diff --git a/qflipper_common.pri b/qflipper_common.pri
+index 6266badf..766a44f9 100644
+--- a/qflipper_common.pri
++++ b/qflipper_common.pri
+@@ -27,20 +27,11 @@ unix:!macx {
+     error("Unsupported OS or compiler")
+ }
+ 
+-GIT_VERSION = $$system("git describe --tags --abbrev=0","lines", HAS_VERSION)
+-!equals(HAS_VERSION, 0) {
+-    GIT_VERSION = unknown
+-}
++GIT_VERSION = 1.2.0
+ 
+-GIT_COMMIT = $$system("git rev-parse --short=8 HEAD","lines", HAS_COMMIT)
+-!equals(HAS_COMMIT, 0) {
+-    GIT_COMMIT = unknown
+-}
++GIT_COMMIT = 49a2c9b4
+ 
+-GIT_TIMESTAMP = $$system("git log -1 --pretty=format:%ct","lines", HAS_TIMESTAMP)
+-!equals(HAS_TIMESTAMP, 0) {
+-    GIT_TIMESTAMP = 0
+-}
++GIT_TIMESTAMP = 1663592547
+ 
+ DEFINES += APP_NAME=\\\"$$NAME\\\" \
+            APP_VERSION=\\\"$$GIT_VERSION\\\" \

net-wireless/qflipper/files/qflipper-1.2.0_unbundle.patch

@@ -0,0 +1,60 @@
+diff --git a/cli/cli.pro b/cli/cli.pro
+index 6b5c27ac..4949fe70 100644
+--- a/cli/cli.pro
++++ b/cli/cli.pro
+@@ -11,13 +11,13 @@ CONFIG -= app_bundle
+
+ unix|win32 {
+     LIBS += \
+-        -L$$OUT_PWD/../3rdparty/ -l3rdparty \
++        -lprotobuf-nanopb \
+         -L$$OUT_PWD/../plugins/ -lflipperproto0 \
+         -L$$OUT_PWD/../backend/ -lbackend \
+         -L$$OUT_PWD/../dfu/ -ldfu
+
+     contains(CONFIG, static): LIBS += \
+-        -L$$OUT_PWD/../3rdparty/ -l3rdparty \
++        -lprotobuf-nanopb \
+         -L$$OUT_PWD/../plugins/ -lflipperproto0
+ }
+
+diff --git a/plugins/flipperproto0/flipperproto0.pro b/plugins/flipperproto0/flipperproto0.pro
+index 1de45121..d8eab59b 100644
+--- a/plugins/flipperproto0/flipperproto0.pro
++++ b/plugins/flipperproto0/flipperproto0.pro
+@@ -12,8 +12,7 @@ CONFIG += plugin c++11
+
+ VERSION = 0.0.0
+
+-INCLUDEPATH += $$PWD/../protobufinterface \
+-    $$PWD/../../3rdparty/nanopb
++INCLUDEPATH += $$PWD/../protobufinterface
+
+ HEADERS += \
+     guirequest.h \
+@@ -59,7 +58,7 @@ SOURCES += \
+     systemresponse.cpp
+
+ unix|win32 {
+-    LIBS += -L$$OUT_PWD/../../3rdparty/ -l3rdparty
++    LIBS += -lprotobuf-nanopb
+ }
+
+ DEFINES += PB_ENABLE_MALLOC
+diff --git a/qFlipper.pro b/qFlipper.pro
+index 1bb97627..8b2a6c44 100644
+--- a/qFlipper.pro
++++ b/qFlipper.pro
+@@ -1,7 +1,6 @@
+ TEMPLATE = subdirs
+
+ SUBDIRS += \
+-    3rdparty \
+     application \
+     backend \
+     dfu \
+@@ -11,4 +10,3 @@ SUBDIRS += \
+ backend.depends = dfu plugins
+ application.depends = backend
+ cli.depends = backend
+-plugins.depends = 3rdparty

net-wireless/qflipper/metadata.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>thican@thican.net</email>
+		<name>Thibaud CANALE</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">flipperdevices/qFlipper</remote-id>
+	</upstream>
+</pkgmetadata>

net-wireless/qflipper/qflipper-1.2.0.ebuild

@@ -0,0 +1,63 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils
+
+DESCRIPTION="Desktop application for updating Flipper Zero firmware via PC"
+HOMEPAGE="
+	https://update.flipperzero.one/
+"
+
+MY_PV="${PV//_/-}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/flipperdevices/qFlipper.git"
+else
+	KEYWORDS="amd64 ~arm64 x86"
+	SRC_URI="https://github.com/flipperdevices/qFlipper/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/qFlipper-${MY_PV}"
+fi
+IUSE="+qt5"
+REQUIRED_USE="^^ ( qt5 )"
+
+RDEPEND="
+	>=dev-libs/nanopb-0.4.5[pb-malloc]
+	qt5? (
+		dev-qt/qtconcurrent:5=
+		dev-qt/qtcore:5=
+		dev-qt/qtdeclarative:5=
+		dev-qt/qtgui:5=
+		dev-qt/qtnetwork:5=
+		dev-qt/qtquickcontrols:5=
+		dev-qt/qtquickcontrols2:5=
+		dev-qt/qtserialport:5=
+		dev-qt/qtwidgets:5=
+	)
+	sys-libs/zlib:=
+	virtual/libusb:1
+"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}/${P}_unbundle.patch"
+	"${FILESDIR}/${P}_display_version.patch"
+)
+
+src_configure() {
+	eqmake5 qFlipper.pro PREFIX="${EPREFIX}/usr" -spec linux-g++ CONFIG+=qtquickcompiler DEFINES+=DISABLE_APPLICATION_UPDATES
+}
+
+src_compile() {
+	emake qmake_all # rebuild Makefiles in subdirs
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install
+}

net-wireless/qflipper/qflipper-9999.ebuild

@@ -6,11 +6,13 @@ EAPI=8
 inherit qmake-utils
 
 DESCRIPTION="Desktop application for updating Flipper Zero firmware via PC"
-HOMEPAGE="https://update.flipperzero.one/ https://github.com/flipperdevices/qFlipper"
+HOMEPAGE="
+	https://update.flipperzero.one/
+"
 
 LICENSE="GPL-3+"
 SLOT="0"
-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/flipperdevices/qFlipper.git"
 else
@@ -18,18 +20,22 @@ else
 	SRC_URI="https://github.com/flipperdevices/qFlipper/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/qFlipper-${PV}"
 fi
+IUSE="+qt5"
+REQUIRED_USE="^^ ( qt5 )"
 
 RDEPEND="
 	>=dev-libs/nanopb-0.4.5[pb-malloc]
-	dev-qt/qtconcurrent:5=
-	dev-qt/qtcore:5=
-	dev-qt/qtdeclarative:5=
-	dev-qt/qtgui:5=
-	dev-qt/qtnetwork:5=
-	dev-qt/qtquickcontrols:5=
-	dev-qt/qtquickcontrols2:5=
-	dev-qt/qtserialport:5=
-	dev-qt/qtwidgets:5=
+	qt5? (
+		dev-qt/qtconcurrent:5=
+		dev-qt/qtcore:5=
+		dev-qt/qtdeclarative:5=
+		dev-qt/qtgui:5=
+		dev-qt/qtnetwork:5=
+		dev-qt/qtquickcontrols:5=
+		dev-qt/qtquickcontrols2:5=
+		dev-qt/qtserialport:5=
+		dev-qt/qtwidgets:5=
+	)
 	sys-libs/zlib:=
 	virtual/libusb:1
 "
@@ -37,7 +43,7 @@ DEPEND="${RDEPEND}"
 BDEPEND=""
 
 PATCHES=(
-	"${FILESDIR}/unbundle.patch"
+	"${FILESDIR}/${PN}-1.2.0_unbundle.patch"
 )
 
 src_configure() {