Dups of PRs to Gentoo portage

net-im/psi/metadata.xml

@@ -5,20 +5,28 @@
 		<email>rion4ik@gmail.com</email>
 		<name>Sergey Ilinykh</name>
 	</maintainer>
-	<longdescription>Psi is a very good XMPP client that uses QT</longdescription>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>Psi is a very good XMPP client that uses Qt and supporting wide range of XMPP
+		extensions. It's extremely configurable and extendable with plugins. Supported on almost
+		every desktop system.
+	</longdescription>
 	<use>
-		<flag name='aspell'>Enable spellchecking using <pkg>app-text/aspell</pkg></flag>
-		<flag name='enchant'>Enable spellchecking using <pkg>app-text/enchant</pkg></flag>
-		<flag name='extras'>Enable Psi+ patcheset</flag>
-		<flag name='hunspell'>Enable spellchecking using <pkg>app-text/hunspell</pkg></flag>
-		<flag name='iconsets'>Install additional iconsets, some of them has not clear licensing</flag>
-		<flag name='keyring'>Use system keyring manager for password storage</flag>
-		<flag name='sql'>Enable psi-new-history extras patch</flag>
-		<flag name='webengine'>Use <pkg>dev-qt/qtwebengine</pkg> instead of <pkg>dev-qt/qtwebkit</pkg></flag>
-		<flag name='webkit'>Enable themed, html-based chatlogs</flag>
-		<flag name='whiteboarding'>Enable experimental interactive SVG drawing</flag>
+		<flag name="aspell">Enable spellchecking using <pkg>app-text/aspell</pkg></flag>
+		<flag name="enchant">Enable spellchecking using <pkg>app-text/enchant</pkg></flag>
+		<flag name="extras">Enable Psi+ patchset</flag>
+		<flag name="hunspell">Enable spellchecking using <pkg>app-text/hunspell</pkg></flag>
+		<flag name="iconsets">Install additional iconsets, some of them have no clear licensing</flag>
+		<flag name="keyring">Enable storing password in system keyring manager</flag>
+		<flag name="webengine">Enable themed, html-based chatlogs using <pkg>dev-qt/qtwebengine</pkg></flag>
+		<flag name="webkit">Enable themed, html-based chatlogs using <pkg>dev-qt/qtwebkit</pkg></flag>
+		<flag name="whiteboarding">Enable experimental interactive SVG drawing</flag>
+		<flag name="xscreensaver">Use X screensaver protocol extension to monitor idle/active status based on mouse/keyboard events</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">psi-im/psi</remote-id>
+		<remote-id type="sourceforge">psi</remote-id>
 	</upstream>
 </pkgmetadata>

net-im/psi/psi-9999.ebuild

@@ -3,10 +3,10 @@
 
 EAPI=7
 
-PLOCALES="be bg ca cs de en eo es et fa fi fr he hu it ja kk mk nl pl pt pt_BR ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
+PLOCALES="be bg ca cs de el en eo es et fa fi fr he hu it ja kk mk nl pl pt_BR pt ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit l10n git-r3 qmake-utils xdg
+inherit git-r3 cmake l10n qmake-utils xdg
 
 DESCRIPTION="Qt XMPP client"
 HOMEPAGE="https://psi-im.org"
@@ -20,12 +20,11 @@ EGIT_MIN_CLONE_TYPE="single"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="aspell crypt dbus debug doc enchant extras +hunspell iconsets keyring media ssl webengine webkit webp whiteboarding xscreensaver"
+IUSE="aspell crypt dbus debug doc enchant extras +hunspell iconsets keyring webengine webkit xscreensaver"
 
 REQUIRED_USE="
 	?? ( aspell enchant hunspell )
 	iconsets? ( extras )
-	webengine? ( !webkit )
 "
 
 BDEPEND="
@@ -38,10 +37,12 @@ DEPEND="
 	app-crypt/qca:2[ssl]
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	dev-qt/qtxml:5
@@ -50,24 +51,19 @@ DEPEND="
 	x11-libs/libX11
 	x11-libs/libxcb
 	aspell? ( app-text/aspell )
-	dbus? ( dev-qt/qtdbus:5 )
-	enchant? ( >=app-text/enchant-1.3.0 )
+	enchant? ( app-text/enchant:2 )
 	hunspell? ( app-text/hunspell:= )
-	keyring? ( dev-libs/qtkeychain )
+	keyring? ( dev-libs/qtkeychain:= )
 	webengine? (
 		dev-qt/qtwebchannel:5
 		dev-qt/qtwebengine:5[widgets]
 		net-libs/http-parser
 	)
 	webkit? ( dev-qt/qtwebkit:5 )
-	whiteboarding? ( dev-qt/qtsvg:5 )
-	xscreensaver? ( x11-libs/libXScrnSaver )
 "
 RDEPEND="${DEPEND}
-	media? (
-		net-im/psimedia
-	)
 	dev-qt/qtimageformats
+	crypt? ( app-crypt/qca[gpg] )
 "
 
 RESTRICT="test iconsets? ( bindist )"
@@ -86,6 +82,8 @@ pkg_setup() {
 			ewarn "and has not clear licensing."
 			ewarn "Possibly this build is not redistributable in some countries."
 		fi
+
+		EGIT_REPO_URI="${PSI_PLUS_URI}/${MY_PN}-snapshots.git"
 	fi
 }
 
@@ -98,76 +96,46 @@ src_unpack() {
 	EGIT_CHECKOUT_DIR="${WORKDIR}/psi-l10n"
 	git-r3_src_unpack
 
-	if use extras; then
+	if use iconsets; then
 		unset EGIT_BRANCH EGIT_COMMIT
-		EGIT_CHECKOUT_DIR="${WORKDIR}/psi-plus" \
-		EGIT_REPO_URI="${PSI_PLUS_URI}/main.git" \
+		EGIT_CHECKOUT_DIR="${WORKDIR}/resources" \
+		EGIT_REPO_URI="${PSI_URI}/resources.git" \
 		git-r3_src_unpack
-
-		if use iconsets; then
-			unset EGIT_BRANCH EGIT_COMMIT
-			EGIT_CHECKOUT_DIR="${WORKDIR}/resources" \
-			EGIT_REPO_URI="${PSI_PLUS_URI}/resources.git" \
-			git-r3_src_unpack
-		fi
 	fi
 }
 
 src_prepare() {
-	default
-	if use extras; then
-		if use iconsets; then
-			cp -a "${WORKDIR}/resources/iconsets" "${S}" || die "failed to copy additional iconsets"
-		fi
-
-		patches=$(find "${WORKDIR}/psi-plus/patches" -maxdepth 1 -name '*.diff')
-		[ -n "$patches" ] && eapply "${WORKDIR}/psi-plus/patches"/*.diff
-
-		vergen="${WORKDIR}/psi-plus/admin/psi-plus-nightly-version"
-		features="$(use webkit && echo '--webkit') $(use webengine && echo '--webengine')"
-		NIGHTLY_VER=$("${vergen}" ./ $features)
-		elog "Prepared version: ${NIGHTLY_VER}"
-		echo "${NIGHTLY_VER}" > version || die "Failed to write version file"
-
-		qconf || die "Failed to create ./configure."
+	cmake_src_prepare
+	if use iconsets; then
+		cp -a "${WORKDIR}/resources/iconsets" "${S}" || die "failed to copy additional iconsets"
 	fi
 }
 
 src_configure() {
-	CONF=(
-		--prefix="${EPREFIX}"/usr
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		--no-separate-debug-info
-		--qtdir="$(qt5_get_bindir)/.."
-		$(use_enable aspell)
-		$(use_enable dbus qdbus)
-		$(use_enable enchant)
-		$(use_enable hunspell)
-		$(use_enable keyring keychain)
-		$(use_enable xscreensaver xss)
-		$(use_enable whiteboarding)
+	local chattype=basic
+	use webengine && chattype=webengine
+	use webkit && chattype=webkit
+
+	local mycmakeargs=(
+		-DUSE_ASPELL=$(usex aspell)
+		-DUSE_ENCHANT=$(usex enchant)
+		-DUSE_HUNSPELL=$(usex hunspell)
+		-DINSTALL_PLUGINS_SDK=1
+		-DUSE_KEYCHAIN=$(usex keyring)
+		-DCHAT_TYPE=$chattype
+		-DUSE_XSS=$(usex xscreensaver)
+		-DPSI_PLUS=$(usex extras)
 	)
-
-	use extras && CONF+=("--psiplus")
-	use debug && CONF+=("--debug")
-	use webengine && CONF+=("--enable-webkit" "--with-webkit=qtwebengine")
-	use webkit && CONF+=("--enable-webkit" "--with-webkit=qtwebkit")
-
-	# This may generate warnings if passed option already matches with default.
-	# Just ignore them. It's how qconf-based configure works and will be fixed in
-	# future qconf versions.
-	./configure "${CONF[@]}" || die "configure failed"
-
-	eqmake5 psi.pro
+	cmake_src_configure
 }
 
 src_compile() {
-	emake
+	cmake_src_compile
 	use doc && emake -C doc api_public
 }
 
 src_install() {
-	emake INSTALL_ROOT="${D}" install
+	cmake_src_install
 
 	# this way the docs will be installed in the standard gentoo dir
 	rm "${ED}"/usr/share/${MY_PN}/{COPYING,README.html} || die "doc files set seems to have changed"

net-im/psimedia/metadata.xml

@@ -5,8 +5,14 @@
 		<email>rion4ik@gmail.com</email>
 		<name>Sergey Ilinykh</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
-		<flag name='demo'>Build simple test application for the PsiMedia system</flag>
-		<flag name='extras'>Enables extra non official patches</flag>
+		<flag name="extras">Enable Psi+ mode (required when built for Psi+)</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">psi-im/psimedia</remote-id>
+	</upstream>
 </pkgmetadata>

net-im/psimedia/psimedia-9999.ebuild

@@ -3,9 +3,9 @@
 
 EAPI=7
 
-inherit cmake-utils multilib eutils git-r3
+inherit cmake multilib eutils git-r3
 
-DESCRIPTION="Psi plugin for voice/video calls"
+DESCRIPTION="Psi/Psi+ plugin for voice/video calls"
 HOMEPAGE="https://psi-im.org/"
 
 EGIT_REPO_URI="https://github.com/psi-im/psimedia.git"
@@ -13,7 +13,7 @@ EGIT_REPO_URI="https://github.com/psi-im/psimedia.git"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug extras"
+IUSE="extras"
 
 BDEPEND="sys-devel/qconf"
 DEPEND="
@@ -29,7 +29,7 @@ RDEPEND="${DEPEND}
 	media-plugins/gst-plugins-jpeg:1.0
 	media-plugins/gst-plugins-opus:1.0
 	media-plugins/gst-plugins-v4l2:1.0
-	net-im/psi[extras?]
+	~net-im/psi-${PV}[extras?]
 "
 
 src_configure() {
@@ -37,5 +37,5 @@ src_configure() {
 		-DUSE_PSI=$(usex extras 0 1)
 		-DBUILD_DEMO=0
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }

sys-devel/qconf/Manifest

@@ -1 +1,2 @@
-DIST qconf-2.4.tar.xz 51880 SHA256 3826ac8810e3a06bf64c2504378f4405ff36224aba4f8e7d65465dac8666fe2e SHA512 982ace9e1d30f6c92078d661e103418fc7e3352a56eb78dae64a004e563f5e7bbf8f71972ca482e2f5229a6f88bb51372e543833f99c4b596d0ae4be5f443317 WHIRLPOOL a98b7723896715399ce073ee4c6a52344c3a4441d638e3c47b467e614419e1f00506260f1a9ab1989e249530d8aaf0f3471a2e8be115cbc2f85cdabc1fb1e385
+DIST qconf-2.3.tar.xz 51848 BLAKE2B 836f22e50cd4c9bb2beefd85d0e5f85f7aee40078dd4a696492c344ae9dffeae20840025a3262b5abcc2c74b22ed9e0bd4b44d077b83ab1e904c0a93bde394ff SHA512 27a532cb52067707a3e04a40260bb0f42e40adff4a643d2f048832356de58271e4051c9cb810e6fffd4b4e45dba483ed65aec062506053caa262ac03b3ec6253
+DIST qconf-2.4.tar.xz 51880 BLAKE2B c87a2a6dbca56fa52bccd0cdbbdba64013adcbf03c6cca6744d3e1c3166f74a09e945022854b1143e0c08a70a6124c0b890be8d7f9d4a91be7c6c0e2c89bf800 SHA512 982ace9e1d30f6c92078d661e103418fc7e3352a56eb78dae64a004e563f5e7bbf8f71972ca482e2f5229a6f88bb51372e543833f99c4b596d0ae4be5f443317

sys-devel/qconf/metadata.xml

@@ -1,12 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>rion4ik@gmail.com</email>
-  <name>rion</name>
- <description>Description of the maintainership</description> 
-</maintainer>
- <longdescription>Long description of the package</longdescription> 
-<use>
-</use>
+	<maintainer type="person">
+		<email>rion4ik@gmail.com</email>
+		<name>Sergey Ilinykh</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>Configuration tool for Qt-based projects</longdescription>
+	<upstream>
+		<remote-id type="github">psi-plus/qconf</remote-id>
+	</upstream>
 </pkgmetadata>

sys-devel/qconf/qconf-2.4.ebuild → sys-devel/qconf/qconf-2.5.ebuild

@@ -1,33 +1,33 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit qmake-utils
 
 DESCRIPTION="./configure like generator for qmake-based projects"
-HOMEPAGE="https://github.com/psi-plus/qconf"
+HOMEPAGE="https://github.com/psi-im/qconf"
 SRC_URI="http://psi-im.org/files/qconf/${P}.tar.xz"
+SRC_URI="https://github.com/psi-im/qconf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-# There is no one to one match to autotools-based configure
-QA_CONFIGURE_OPTIONS=".*"
-
-RDEPEND="
+DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtxml:5
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
 
 src_configure() {
-	econf \
+	# not autotools configure, so don't use econf
+	./configure \
+		--prefix="${EPREFIX}"/usr \
 		--qtdir="$(qt5_get_libdir)/qt5" \
 		--extraconf=QMAKE_STRIP= \
-		--verbose
+		--verbose || die "configure failed"
 
 	# just to set all the Gentoo toolchain flags
 	eqmake5