Merge updates from master

app-misc/pfetch/Manifest

@@ -0,0 +1 @@
+DIST pfetch-0.6.0.tar.gz 17431 BLAKE2B 300f6f44f9306df4f438227a6f35bd54f50e477b950a45d63656f7c460cfc30a8b44ebdb3d5fdcf1e808e3b8e8e69e14088ff73a5da4485abf694893f2cc53f3 SHA512 868901bec6ae8999ad40fcb94bdf804969a3dfd724dc554d62f59982daf48d359094764b2e45d4816983d4f46e38de30f0bcb646ecd95bf3263ba128b87a1ddf

app-misc/pfetch/metadata.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+        <maintainer type="person">
+                <email>mathieu.tortuyaux@gmail.com</email>
+                <name>Mathieu Tortuyaux</name>
+        </maintainer>
+        <longdescription lang="en">
+The goal of this project is to implement a simple system information tool in POSIX sh using features built into the language itself (where possible).
+The source code is highly documented and I hope it will act as a learning resource for POSIX sh and simple information detection across various different operating systems.
+        </longdescription>
+        <upstream>
+                <bugs-to>https://github.com/dylanaraps/pfetch/issues</bugs-to>
+        </upstream>
+</pkgmetadata>
+

app-misc/pfetch/pfetch-0.6.0.ebuild

@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A pretty system information tool written in POSIX sh"
+HOMEPAGE="https://github.com/dylanaraps/pfetch"
+
+KEYWORDS="~amd64 ~x86"
+SRC_URI="https://github.com/dylanaraps/pfetch/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+
+src_install() {
+	dobin "${PN}"
+}

dev-libs/StringiFor/metadata.xml

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer needed -->
+<maintainer type="person">
+	<email>torokhov-s-a@yandex.ru</email>
+	<name>Sergey Torokhov</name>
+</maintainer>
 <longdescription>
 	A KISS pure Fortran library providing astrings (class) manipulator for modern (2003+) Fortran projects
 </longdescription>

dev-python/spotipy/Manifest

@@ -1 +1 @@
-DIST spotipy-2.11.1.tar.gz 85670 BLAKE2B 821650ed83968ad76c1cf1fd6463d1441acf0e05b48721b82200d4be642056b3525f5d61de61856a342ffd67623b09a6d466df0e4b4c036e2a33c66872fd6702 SHA512 596ba9ce5e36f8885d6cf04112e16e97e40e39a1da0879e0c2e254118454766220a16b3dd8008364085aa238f27e40899c57e442574dfebf1e393fad74b852a9
+DIST spotipy-2.11.2.tar.gz 86231 BLAKE2B dc98ffd505ef60c13129b3ad0540302a2b4e063e12a270e352fe719efe44ca6b83cfd9557af8e5f604260c9b523e617d066575bb1c83ce905f8797a7aa36a010 SHA512 74ad7813619a49766ddb8b6fded48ed510448993a0aad043c365b04f55477a075aa59bd43d660b7f7b54c3b76f0d9c151960dc56bbaeee86ad76252834edf2a0

games-action/ATLauncher/Manifest

@@ -1,2 +1,2 @@
-DIST ATLauncher-3.3.4.3.jar 10460517 BLAKE2B d5298bb3f5fe12b2b8981c2e738594eb7685b6bde85b290681578f5b4388d9747091c6acff1e768f9e11203d590e1f6debdd9063c316bbfff7326a77cff1b511 SHA512 a285e8085f3a00758e053b8eda9d906b1e3fbba1c85e4ecfa5edcb710d8bda51a555db94a803c5c7b43bb51b487c4754bbb6e32694e18904f04370f0b8597922
+DIST ATLauncher-3.3.4.4.jar 10460514 BLAKE2B 13355b55fd83387f076fa25a3ada68fa0bdbe39a499c2291202e4e88be487372ef11dbc0e757faccadbdea2e7ea74b4e871ef4159e4970831593890870438b06 SHA512 b372c9ae1eabb4a15caa44f84fa1fbbd1ef6cae5c711cd7c951dc06fcf926920568dc141309e9ba89615a09b7879f3fc3633400d79228d572cb707fe50c94e2d
 DIST ATLauncher.ico 370070 BLAKE2B 992e5df968054884c21f136b8f16f2b14e8d321b2196ebc07f7a59621223ca79b896f63b21dba864f61f238ca1864039a410d8089127714163092f65d0ca7f27 SHA512 353f6dd68475778cc8e97a773e800fe532df2f6d28d5babc751cfb5ed7ef24ef6246f76d26e3e25706e458741d604bb8fa8e79cb8904900284f0f7b0f9488bfb

media-video/kikoplay/Manifest

@@ -1 +1 @@
-DIST kikoplay-0.6.0.tar.gz 7497254 BLAKE2B a23106151782477194d15712e9458171a0bc1dd53f8b6c8dbed12663be1c2c76204674c23eba61f2b8828be7acbd10449f51c766ab57be86cf21844591430b18 SHA512 9d8801f7c9b091f097d1edf9496a389718e81399a8d380d7763c1d12eafd1d4ce444e4df22a0e4a6c8eebbc7f1176e58a3cbac6bea60e87ccd44a5890927bf21
+DIST kikoplay-0.6.1.tar.gz 7528741 BLAKE2B 92ec99bc64661688509fe1ec951e90a28cbdd9c06999ba8574d23ffec4628e7ad4e2ac60c955009beb2ea9023e9d18faa35ae9f0b9f63d5a098aa4ad15315bd5 SHA512 4e304c5f1b0592ce5eb4b22745e73f4a9446843002cb8f050433be33137c660ef41b71c7a80055bff86f21381bad5b1be2088b621feb6e86e6575ecf6acc16ed

media-video/kikoplay/files/kikoplay-0.6.0-desktop.patch

@@ -1,16 +0,0 @@
-diff --git a/kikoplay.desktop b/kikoplay.desktop
-new file mode 100644
-index 0000000..6171559
---- /dev/null
-+++ b/kikoplay.desktop
-@@ -0,0 +1,10 @@
-+[Desktop Entry]
-+Type=Application
-+Name=KikoPlay
-+Comment=KikoPlay is a full-featured danmu player!
-+TryExec=KikoPlay
-+Exec=KikoPlay
-+Icon=/usr/share/pixmaps/kikoplay.png
-+Terminal=false
-+StartupNotify=true
-+Categories=Qt;AudioVideo;Video;

media-video/kikoplay/files/kikoplay-0.6.0-home.patch

@@ -1,97 +0,0 @@
-diff --git a/Download/Script/scriptmanager.cpp b/Download/Script/scriptmanager.cpp
-index f99c261..8ede8e3 100644
---- a/Download/Script/scriptmanager.cpp
-+++ b/Download/Script/scriptmanager.cpp
-@@ -163,7 +163,11 @@ QString ScriptManager::search(QString sid, const QString &keyword, int page, int
-     {
-         if(s.id==sid)
-         {
-+#ifndef CONFIG_HOME_DATA
-             scriptPath=QCoreApplication::applicationDirPath()+"/script/"+s.fileName;
-+#else
-+            scriptPath=QDir::homePath()+"/.config/kikoplay/script/"+s.fileName;
-+#endif
-             break;
-         }
-     }
-@@ -270,7 +274,11 @@ void ScriptManager::removeScript(const QModelIndex &index)
-         else
-             normalScriptId="";
-     }
-+#ifndef CONFIG_HOME_DATA
-     QFileInfo fi(QCoreApplication::applicationDirPath()+"/script/"+script.fileName);
-+#else
-+    QFileInfo fi(QDir::homePath()+"/.config/kikoplay/script/"+script.fileName);
-+#endif
-     if(fi.exists()) fi.dir().remove(fi.fileName());
-     beginRemoveRows(QModelIndex(),index.row(),index.row());
-     scriptList.removeAt(index.row());
-@@ -319,7 +327,11 @@ QVariant ScriptManager::headerData(int section, Qt::Orientation orientation, int
- 
- void ScriptWorker::refreshScriptList()
- {
-+#ifndef CONFIG_HOME_DATA
-     QString scriptPath(QCoreApplication::applicationDirPath()+"/script/");
-+#else
-+    QString scriptPath(QDir::homePath()+"/.config/kikoplay/script/");
-+#endif
-     QDir folder(scriptPath);
-     QList<ScriptInfo> sList;
-     for (QFileInfo fileInfo : folder.entryInfoList())
-diff --git a/Download/aria2jsonrpc.cpp b/Download/aria2jsonrpc.cpp
-index 7999128..43bc63d 100644
---- a/Download/aria2jsonrpc.cpp
-+++ b/Download/aria2jsonrpc.cpp
-@@ -1,4 +1,5 @@
- #include "aria2jsonrpc.h"
-+#include <QFileInfo>
- #include <QNetworkAccessManager>
- #include <QNetworkRequest>
- #include <QNetworkReply>
-@@ -19,7 +20,13 @@ Aria2JsonRPC::Aria2JsonRPC(QObject *parent) : QObject(parent)
- #ifdef Q_OS_WIN
-     process->start(QCoreApplication::applicationDirPath()+"\\aria2c.exe", args);
- #else
--    process->start(QCoreApplication::applicationDirPath()+"/aria2c", args);
-+    QFileInfo check_file(QCoreApplication::applicationDirPath()+"/aria2c");
-+    /* check if file exists and if yes: Is it really a file and no directory? */
-+    if (check_file.exists() && check_file.isFile()) {
-+        process->start(QCoreApplication::applicationDirPath()+"/aria2c", args);
-+    } else {
-+        process->start("aria2c", args);
-+    }
- 
- #endif
-     process->waitForStarted(-1);
-diff --git a/LANServer/httpserver.cpp b/LANServer/httpserver.cpp
-index 5b3fa08..d66a6ee 100644
---- a/LANServer/httpserver.cpp
-+++ b/LANServer/httpserver.cpp
-@@ -127,7 +127,11 @@ namespace
- HttpServer::HttpServer(QObject *parent) : QObject(parent)
- {
-     MediaFileHandler *handler=new MediaFileHandler(&mediaHash,this);
-+#ifndef CONFIG_HOME_DATA
-     handler->setDocumentRoot(QCoreApplication::applicationDirPath()+"/web");
-+#else
-+    handler->setDocumentRoot(QDir::homePath()+"/.config/kikoplay/web");
-+#endif
-     handler->addRedirect(QRegExp("^$"), "/index.html");
- 
-     QHttpEngine::QObjectHandler *apiHandler=new QHttpEngine::QObjectHandler(this);
-diff --git a/globalobjects.cpp b/globalobjects.cpp
-index 07bf674..32b82a2 100644
---- a/globalobjects.cpp
-+++ b/globalobjects.cpp
-@@ -42,7 +42,11 @@ namespace  {
- }
- void GlobalObjects::init()
- {
-+#ifndef CONFIG_HOME_DATA
-     dataPath=QCoreApplication::applicationDirPath()+"/data/";
-+#else
-+    dataPath=QDir::homePath()+"/.config/kikoplay/data/";
-+#endif
-     QDir dir;
-     if(!dir.exists(dataPath))
-     {

media-video/kikoplay/kikoplay-0.6.0.ebuild

@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GIT_PN="KikoPlay"
-
-inherit qmake-utils xdg
-
-DESCRIPTION="KikoPlay is a full-featured danmu player"
-HOMEPAGE="
-	https://kikoplay.fun
-	https://github.com/Protostars/KikoPlay
-"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Protostars/${GIT_PN}.git"
-else
-	SRC_URI="https://github.com/Protostars/${GIT_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-	S="${WORKDIR}/${GIT_PN}-${PV}"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-RDEPEND="
-	dev-lang/lua:5.3
-	dev-libs/qhttpengine:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	media-video/mpv[libmpv,-luajit]
-	net-misc/aria2
-"
-
-DEPEND="
-	${RDEPEND}
-"
-
-BDEPEND="
-	media-gfx/imagemagick
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.0-install.patch # Fix install problem
-	"${FILESDIR}"/${PN}-0.6.0-desktop.patch # Add a desktop file
-	"${FILESDIR}"/${PN}-0.6.0-home.patch # Fix config file path
-)
-
-src_prepare() {
-	default
-	# Fix lua link problem, link to lua5.3 to fix bug
-	sed -i "s/-llua/-llua5.3/" KikoPlay.pro || die "Could not fix lua link"
-	echo "target.path += /usr/bin" >> KikoPlay.pro || die "Could not fix install path"
-	echo "INSTALLS += target icons desktop" >> KikoPlay.pro || die "Could not fix install target"
-	echo "unix:icons.path = /usr/share/pixmaps" >> KikoPlay.pro || die "Could not fix install icon PATH"
-	echo "unix:desktop.path = /usr/share/applications" >> KikoPlay.pro || die "Could not fix install desktop PATH"
-	echo "unix:icons.files = kikoplay.png kikoplay.xpm" >> KikoPlay.pro || die "Could not fix install desktop PATH"
-	echo "unix:desktop.files = kikoplay.desktop" >> KikoPlay.pro || die "Could not fix install desktop PATH"
-	echo "DEFINES += CONFIG_HOME_DATA" >> KikoPlay.pro || die "Could not set defines"
-	convert kikoplay.ico kikoplay.png || die "Could not create PNG icon"
-	convert kikoplay.ico kikoplay.xpm || die "Could not create XPM icon"
-}
-
-src_configure() {
-	eqmake5 PREFIX="${D}"/usr
-}
-
-src_install() {
-	# Can't use default, set INSTALL_ROOT
-	emake INSTALL_ROOT="${D}" install
-}

media-video/kikoplay/kikoplay-0.6.1.ebuild

@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GIT_PN="KikoPlay"
+
+inherit qmake-utils xdg
+
+DESCRIPTION="KikoPlay is a full-featured danmu player"
+HOMEPAGE="
+	https://kikoplay.fun
+	https://github.com/Protostars/KikoPlay
+"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Protostars/${GIT_PN}.git"
+else
+	SRC_URI="https://github.com/Protostars/${GIT_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	S="${WORKDIR}/${GIT_PN}-${PV}"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND="
+	dev-lang/lua:5.3
+	dev-libs/qhttpengine:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	media-video/mpv[libmpv,-luajit]
+	net-misc/aria2
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	eqmake5 PREFIX="${D}"/usr
+}
+
+src_install() {
+	# Can't use default, set INSTALL_ROOT
+	emake INSTALL_ROOT="${D}" install
+}

media-video/kikoplay/kikoplay-9999.ebuild

@@ -43,30 +43,9 @@ DEPEND="
 "
 
 BDEPEND="
-	media-gfx/imagemagick
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.0-desktop.patch # Add a desktop file
-	"${FILESDIR}"/${PN}-0.6.0-home.patch # Fix config file path
-)
-
-src_prepare() {
-	default
-	# Fix lua link problem, link to lua5.3 to fix bug
-	sed -i "s/-llua/-llua5.3/" KikoPlay.pro || die "Could not fix lua link"
-	echo "target.path += /usr/bin" >> KikoPlay.pro || die "Could not fix install path"
-	echo "INSTALLS += target icons desktop" >> KikoPlay.pro || die "Could not fix install target"
-	echo "unix:icons.path = /usr/share/pixmaps" >> KikoPlay.pro || die "Could not fix install icon PATH"
-	echo "unix:desktop.path = /usr/share/applications" >> KikoPlay.pro || die "Could not fix install desktop PATH"
-	echo "unix:icons.files = kikoplay.png kikoplay.xpm" >> KikoPlay.pro || die "Could not fix install desktop PATH"
-	echo "unix:desktop.files = kikoplay.desktop" >> KikoPlay.pro || die "Could not fix install desktop PATH"
-	echo "DEFINES += CONFIG_HOME_DATA" >> KikoPlay.pro || die "Could not set defines"
-	convert kikoplay.ico kikoplay.png || die "Could not create PNG icon"
-	convert kikoplay.ico kikoplay.xpm || die "Could not create XPM icon"
-}
-
 src_configure() {
 	eqmake5 PREFIX="${D}"/usr
 }