Merge branch 'purple-discord'

x11-plugins/purple-discord/Manifest

@@ -0,0 +1 @@
+DIST purple-discord-0.9_p20230215.tar.gz 132051 BLAKE2B 9b93c0349ac7c4448c2fe82412cc0dbd4746abe2ed8961299e2defa9c816140410ca9ff2fa9078ff987e19fe1b4b64d1220b7afea52969c060a20eafcaa315b1 SHA512 f290ef0ebce89414142a858266b84294fbfe8493fd005531f57aa04971381b03532fe6736d697849e31366a4723f4aa039603ccca2f2d04dec9bc1fac067ce5e

x11-plugins/purple-discord/metadata.xml

@@ -5,4 +5,10 @@
     <email>y0rune@aol.com</email>
     <name>Marcin Woźniak</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">EionRobb/purple-discord</remote-id>
+  </upstream>
+  <use>
+    <flag name="qrcode">Add support for qrcodes using media-gfx/qrencode</flag>
+  </use>
 </pkgmetadata>

x11-plugins/purple-discord/purple-discord-0.9_p20230215.ebuild

@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Pidgin/Purple PRotocol PLugin for Discord"
+HOMEPAGE="https://github.com/EionRobb/purple-discord"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/EionRobb/${PN}.git"
+else
+	COMMIT="4a091883e646f2c103ae68c41d04b1b880e8d0bf"
+	SRC_URI="https://github.com/EionRobb/purple-discord/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+IUSE="+qrcode"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/nss
+	net-im/pidgin:=
+	sys-libs/zlib
+	virtual/libintl
+	qrcode? ( media-gfx/qrencode:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	media-gfx/imagemagick[png]
+	sys-devel/gettext
+"
+
+src_compile() {
+	emake USE_QRCODE_AUTH=$(usex qrcode 1 0)
+}

x11-plugins/purple-discord/purple-discord-9999.ebuild

@@ -1,23 +1,42 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
-
-inherit git-r3
 
 DESCRIPTION="Pidgin/Purple PRotocol PLugin for Discord"
 HOMEPAGE="https://github.com/EionRobb/purple-discord"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/EionRobb/${PN}.git"
+else
+	COMMIT="4a091883e646f2c103ae68c41d04b1b880e8d0bf"
+	SRC_URI="https://github.com/EionRobb/purple-discord/archive/${COMMIT}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+
+	KEYWORDS="~amd64"
+fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+
+IUSE="+qrcode"
 
 RDEPEND="
-	media-gfx/imagemagick[jpeg,png,svg,xml]
+	dev-libs/glib:2
-	net-im/pidgin
-	dev-vcs/git
 	dev-libs/json-glib
+	dev-libs/nss
+	net-im/pidgin:=
+	sys-libs/zlib
+	virtual/libintl
+	qrcode? ( media-gfx/qrencode:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	media-gfx/imagemagick[png]
+	sys-devel/gettext
 "
 
-DEPEND="${RDEPEND}"
+src_compile() {
+	emake USE_QRCODE_AUTH=$(usex qrcode 1 0)
+}