Psi plugins update

Documentation/generate-psi-plugins-ebuilds.sh

@@ -67,11 +67,11 @@ METACONTENT
   [ "$arch" != "generic" ] && dirvar="PLUGIN_DIR=\"${arch}\"
 "
   echo "$(cat <<EBUILDCONTENT
-# Copyright 1999-$(date +%Y) Gentoo Foundation
+# Copyright 1999-$(date +%Y) Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 # \$Header: \$
 
-EAPI=6
+EAPI=7
 
 ${dirvar}inherit psi-plugin
 
@@ -82,13 +82,6 @@ IUSE=""
 EBUILDCONTENT
 )" >> "net-im/psi-${pn}/psi-${pn}-9999.ebuild"
 
-  echo "# ChangeLog for net-im/psi-${pn}
-# Copyright 1999-$(date +%Y) Gentoo Foundation; Distributed under the GPL v2
-# \$Header: \$
-
-  `LANG=C date "+%d %b %Y"`; $USER <$USER@bots.ru> ChangeLog:
-  generate ChangeLog" > "net-im/psi-${pn}/ChangeLog"
-
   ebuild "net-im/psi-${pn}/psi-${pn}-9999.ebuild" digest
   git add "net-im/psi-${pn}"
 
@@ -101,10 +94,10 @@ ALL_PLUGINS="$(grep psi-plugin -lr net-im/ --include '*ebuild' | cut -d '/' -f -
   echo "net-im/psimedia::rion **"
   echo "net-im/qconf::rion **"
   echo "$ALL_PLUGINS" | awk '{print $1."::rion **"}'
-) > Documentation/package.keywords/psi/psi.keywords
+) > Documentation/package.keywords/psi/psi.accept_keywords
 (
-  echo "net-im/psi[plugins]"
-  echo "net-im/psimedia[extras]"
+  echo "net-im/psi"
+  echo "net-im/psimedia"
   echo "$ALL_PLUGINS"
 ) > sets/psiplus
 ##########################################################
@@ -121,11 +114,11 @@ for atom in $ALL_PLUGINS; do
 done
 
   echo "$(cat <<EBUILDCONTENT
-# Copyright 1999-$(date +%Y) Gentoo Foundation
+# Copyright 1999-$(date +%Y) Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 # \$Header: \$
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Meta package for net-im/psi plugins"
 HOMEPAGE="https://github.com/psi-im"

Documentation/package.keywords/psi/psi.keywords → Documentation/package.keywords/psi/psi.accept_keywords

@@ -1,37 +1,35 @@
 net-im/psi::rion **
 net-im/psimedia::rion **
 net-im/qconf::rion **
-net-im/psi-pepchangenotify::rion **
-net-im/psi-screenshot::rion **
-net-im/psi-clientswitcher::rion **
+net-im/psi-attention::rion **
 net-im/psi-autoreply::rion **
+net-im/psi-birthdayreminder::rion **
+net-im/psi-chess::rion **
 net-im/psi-cleaner::rion **
-net-im/psi-enummessages::rion **
-net-im/psi-imagepreview::rion **
+net-im/psi-clientswitcher::rion **
 net-im/psi-conferencelogger::rion **
-net-im/psi-birthdayreminder::rion **
-net-im/psi-gomokugame::rion **
-net-im/psi-attention::rion **
+net-im/psi-contentdownloader::rion **
+net-im/psi-enummessages::rion **
+net-im/psi-extendedmenu::rion **
 net-im/psi-extendedoptions::rion **
-net-im/psi-translate::rion **
-net-im/psi-videostatus::rion **
-net-im/psi-jabberdisk::rion **
-net-im/psi-chess::rion **
 net-im/psi-gnupg::rion **
-net-im/psi-messagefilter::rion **
+net-im/psi-gomokugame::rion **
+net-im/psi-historykeeper::rion **
+net-im/psi-icqdie::rion **
 net-im/psi-image::rion **
+net-im/psi-imagepreview::rion **
+net-im/psi-jabberdisk::rion **
 net-im/psi-juick::rion **
+net-im/psi-messagefilter::rion **
+net-im/psi-omemo::rion **
+net-im/psi-openpgp::rion **
+net-im/psi-otr::rion **
+net-im/psi-pepchangenotify::rion **
+net-im/psi-qipxstatuses::rion **
+net-im/psi-screenshot::rion **
 net-im/psi-skins::rion **
+net-im/psi-stopspam::rion **
 net-im/psi-storagenotes::rion **
-net-im/psi-historykeeper::rion **
-net-im/psi-psto::rion **
-net-im/psi-icqdie::rion **
-net-im/psi-extendedmenu::rion **
+net-im/psi-translate::rion **
+net-im/psi-videostatus::rion **
 net-im/psi-watcher::rion **
-net-im/psi-stopspam::rion **
-net-im/psi-contentdownloader::rion **
-net-im/psi-httpupload::rion **
-net-im/psi-otr::rion **
-net-im/psi-otr::rion **
-net-im/psi-qipxstatuses::rion **
-net-im/psi-omemo::rion **

net-im/psi-openpgp/metadata.xml

@@ -0,0 +1,11 @@
+<?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>
+  </maintainer>
+  <longdescription lang="en">
+    
+  </longdescription>
+</pkgmetadata>

net-im/psi-openpgp/psi-openpgp-9999.ebuild

@@ -0,0 +1,12 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=7
+
+inherit psi-plugin
+
+DESCRIPTION="Psi plugin to manager OpenPGP keys and settings"
+
+KEYWORDS=""
+IUSE=""

net-im/psi-plugins-meta/metadata.xml

@@ -24,16 +24,16 @@
     <flag name="gnupg">Enable Psi plugin for GnuPG message encryption</flag>
     <flag name="gomokugame">Enable Psi plugin for Gomoku game</flag>
     <flag name="historykeeper">Enable Psi plugin to keep certain contacts history clean</flag>
-    <flag name="httpupload">Enable Psi plugin to suppor http uploade feature as per XEP-0363</flag>
     <flag name="icqdie">Enable Psi plugin generating weird replies to icq transport contacts.</flag>
     <flag name="image">Enable Psi plugin for sending in-band images</flag>
     <flag name="imagepreview">Enable Psi plugin to preview images in chat log</flag>
     <flag name="jabberdisk">Enable Psi plugin for file sharing via jabber disk</flag>
     <flag name="juick">Enable Psi plugin for juick.com service</flag>
     <flag name="messagefilter">Enable Psi plugin to filter out messages by various conditions</flag>
+    <flag name="omemo">Enable Psi plugin for OMEMO</flag>
+    <flag name="openpgp">Enable Psi plugin to manager OpenPGP keys and settings</flag>
     <flag name="otr">Enable Psi plugin for OTR message ecnryption</flag>
     <flag name="pepchangenotify">Enable Psi plugin to show PEP change notifications</flag>
-    <flag name="psto">Enable Psi plugin for psto.net service</flag>
     <flag name="qipxstatuses">Enable Psi plugin for QIP xStatus to xmpp user moods translation</flag>
     <flag name="screenshot">Enable Psi plugin to quickly make screenshots</flag>
     <flag name="skins">Enable Psi plugin for skins support.</flag>

net-im/psi-plugins-meta/psi-plugins-meta-9999.ebuild

@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+# $Header: $
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Meta package for net-im/psi plugins"
 HOMEPAGE="https://github.com/psi-im"
@@ -10,10 +11,10 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 
-IUSE="attention autoreply birthdayreminder chess cleaner clientswitcher conferencelogger contentdownloader enummessages extendedmenu extendedoptions gnupg gomokugame historykeeper icqdie image imagepreview jabberdisk juick messagefilter omemo otr pepchangenotify qipxstatuses screenshot skins stopspam storagenotes translate videostatus watcher"
+IUSE="attention autoreply birthdayreminder chess cleaner clientswitcher conferencelogger contentdownloader enummessages extendedmenu extendedoptions gnupg gomokugame historykeeper icqdie image imagepreview jabberdisk juick messagefilter omemo openpgp otr pepchangenotify qipxstatuses screenshot skins stopspam storagenotes translate videostatus watcher"
 
 RDEPEND=""
 
 for plugin in ${IUSE}; do
-	RDEPEND+=" ${plugin}? ( >=net-im/psi-${plugin}-${PV} )"
+ RDEPEND+=" ${plugin}? ( >=net-im/psi-${plugin}-${PV} )"
 done

sets/psiplus

@@ -1,35 +1,34 @@
-net-im/psi[plugins]
-net-im/psimedia[extras]
-net-im/psi-pepchangenotify
-net-im/psi-screenshot
-net-im/psi-clientswitcher
+net-im/psi
+net-im/psimedia
+net-im/psi-attention
 net-im/psi-autoreply
+net-im/psi-birthdayreminder
+net-im/psi-chess
 net-im/psi-cleaner
-net-im/psi-enummessages
-net-im/psi-imagepreview
+net-im/psi-clientswitcher
 net-im/psi-conferencelogger
-net-im/psi-birthdayreminder
-net-im/psi-gomokugame
-net-im/psi-attention
+net-im/psi-contentdownloader
+net-im/psi-enummessages
+net-im/psi-extendedmenu
 net-im/psi-extendedoptions
-net-im/psi-translate
-net-im/psi-videostatus
-net-im/psi-jabberdisk
-net-im/psi-chess
 net-im/psi-gnupg
-net-im/psi-messagefilter
+net-im/psi-gomokugame
+net-im/psi-historykeeper
+net-im/psi-icqdie
 net-im/psi-image
+net-im/psi-imagepreview
+net-im/psi-jabberdisk
 net-im/psi-juick
+net-im/psi-messagefilter
+net-im/psi-omemo
+net-im/psi-openpgp
+net-im/psi-otr
+net-im/psi-pepchangenotify
+net-im/psi-qipxstatuses
+net-im/psi-screenshot
 net-im/psi-skins
+net-im/psi-stopspam
 net-im/psi-storagenotes
-net-im/psi-historykeeper
-net-im/psi-psto
-net-im/psi-icqdie
-net-im/psi-extendedmenu
+net-im/psi-translate
+net-im/psi-videostatus
 net-im/psi-watcher
-net-im/psi-stopspam
-net-im/psi-contentdownloader
-net-im/psi-httpupload
-net-im/psi-otr
-net-im/psi-otr
-net-im/psi-qipxstatuses