gentoo resync : 30.05.2020

11 files changed, 2 insertions, 329 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index fbc02ff6ce70..fc5233d2b592 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/bup/Manifest b/app-backup/bup/Manifest
deleted file mode 100644
index 385a9c89b23b..000000000000
--- a/app-backup/bup/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX bup-0.29.2-sitedir.patch 1186 BLAKE2B ae56baf75e32994afc6dfad386f19edfeed6d02918c572dfef2f4ecbe6c13c9e4e9a78819dbeae21c32fba1f7914b1ea43f41f52c2770c738e724ebe52031ff8 SHA512 1d1848bc24cc1216fde35ed3eabef52a0cef0a6c7c0be7d51d3829f413e0a26abd3441fc958e3461bbc5faad8b97e903e6f86f1de418b4d211996f213db5e37e
-DIST bup-0.29.2.tar.gz 389145 BLAKE2B 1a54cb68b2c68ecf4902a7f1ee940711b62e413c69d17ba1515f24e115484bac1b4919947f2214ffff784389839f633fbb13dea69c186246426e57c33a148c4c SHA512 10c433d6779b1fd7e1935c587676492d96a330dc3280556332bb55b6e5c62de8631fd755d07d2eaf80cb9fa209dc25b241d5ecf3a6fe2b8210a3d0e1ce4fa4bf
-EBUILD bup-0.29.2.ebuild 1300 BLAKE2B 06a9ea4ace51b506700235c01bffd0dd75f72dc0dc5d9ec303b3132954f1e862431096506e2ea785f038931cd023ff799fca77ddf412ccb0bc6d735322ecec69 SHA512 08ff21b76d1ccafd6c626ac1c166751c504522b355360f70e893ed5e504387e8ba5774412e476dda4c973c26a84392351129e5fe18d901c76fb43678fdb96791
-MISC metadata.xml 325 BLAKE2B 02b15157395396dd68b8020bfe90ee4c1a3f8dd6a093ee6a9873a34320bddb32a937d91bf509b363e4207fe361fee0115311656872d49523b55703d6ebf9704d SHA512 00eda495637d81b12b965a3890437a35030e3ea246d81615b6e4b598bcbe991343e5abf03cfae5072d0b0a58ec2ad9d4f1591a12907563b537c62c3f9119b177
diff --git a/app-backup/bup/bup-0.29.2.ebuild b/app-backup/bup/bup-0.29.2.ebuild
deleted file mode 100644
index e4d3a98673fa..000000000000
--- a/app-backup/bup/bup-0.29.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="A highly efficient backup system based on the git packfile format"
-HOMEPAGE="https://bup.github.io/ https://github.com/bup/bup"
-SRC_URI="https://github.com/bup/bup/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+doc test web"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-arch/par2cmdline
-	sys-libs/readline:0
-	dev-vcs/git
-	$(python_gen_cond_dep '
-		dev-python/fuse-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/pylibacl[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyxattr[${PYTHON_MULTI_USEDEP}]
-		web? ( www-servers/tornado[${PYTHON_MULTI_USEDEP}] )
-	')"
-DEPEND="${RDEPEND}
-	test? (
-		dev-lang/perl
-		net-misc/rsync
-	)
-	doc? ( app-text/pandoc )
-"
-
-# unresolved sandbox issues
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${P}-sitedir.patch )
-
-src_configure() {
-	# only build/install docs if enabled
-	export PANDOC=$(usex doc pandoc "")
-
-	./configure || die
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr DOCDIR="/usr/share/${PF}" \
-		SITEDIR="$(python_get_sitedir)" install
-	python_fix_shebang "${ED}"
-	python_optimize "${ED}"
-}
diff --git a/app-backup/bup/files/bup-0.29.2-sitedir.patch b/app-backup/bup/files/bup-0.29.2-sitedir.patch
deleted file mode 100644
index 920b3dc27921..000000000000
--- a/app-backup/bup/files/bup-0.29.2-sitedir.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- bup-0.29.2/Makefile
-+++ bup-0.29.2/Makefile
-@@ -25,7 +25,7 @@
- os := $(shell ($(pf); uname | sed 's/[-_].*//') $(isok))
- os := $(call shout,$(os),Unable to determine OS)
- 
--CFLAGS := -Wall -O2 -Werror -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS)
-+CFLAGS := -Wall -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS)
- CFLAGS := -D_FILE_OFFSET_BITS=64 $(CFLAGS)
- SOEXT:=.so
- 
-@@ -93,10 +93,11 @@
- dest_docdir := $(DESTDIR)$(DOCDIR)
- dest_bindir := $(DESTDIR)$(BINDIR)
- dest_libdir := $(DESTDIR)$(LIBDIR)
-+dest_sitedir := $(DESTDIR)$(SITEDIR)
- 
- install: all
--	$(INSTALL) -d $(dest_bindir) \
--		$(dest_libdir)/bup $(dest_libdir)/cmd \
-+	$(INSTALL) -d $(dest_bindir) $(dest_libdir) \
-+		$(dest_sitedir)/bup $(dest_libdir)/cmd \
- 		$(dest_libdir)/web $(dest_libdir)/web/static
- 	test -z "$(man_roff)" || install -d $(dest_mandir)/man1
- 	test -z "$(man_roff)" || $(INSTALL) -m 0644 $(man_roff) $(dest_mandir)/man1
-@@ -109,10 +110,10 @@
- 	done
- 	$(INSTALL) -pm 0644 \
- 		lib/bup/*.py \
--		$(dest_libdir)/bup
-+		$(dest_sitedir)/bup
- 	$(INSTALL) -pm 0755 \
- 		lib/bup/*$(SOEXT) \
--		$(dest_libdir)/bup
-+		$(dest_sitedir)/bup
- 	$(INSTALL) -pm 0644 \
- 		lib/web/static/* \
- 		$(dest_libdir)/web/static/
diff --git a/app-backup/bup/metadata.xml b/app-backup/bup/metadata.xml
deleted file mode 100644
index 1d0a6394f969..000000000000
--- a/app-backup/bup/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="web">Support browsing backups via a web interface</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">bup/bup</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-backup/kup/Manifest b/app-backup/kup/Manifest
deleted file mode 100644
index 96b0802c25ce..000000000000
--- a/app-backup/kup/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX kup-0.7.3-libgit2.patch 4160 BLAKE2B 5b71ed1308108432148ab4fd69e3228f07bb7afb78d8cffb47ff7e0045119e8ac7494d770ec7354fc7655a4eb5c021e3c396152114bb85a7d9a2169dbf54761c SHA512 39052b65077f5a30afcf6c9234920d4f9a04ce2478a0b64c54b8320212bc246bbe07401f5242b6d1bdc2bf03be1af764192a020b7fe52716d33916d28605cab4
-DIST kup-0.7.3.tar.gz 1024916 BLAKE2B aab2a1c58bc7feb6cc734a61385841b9c9b47995ba0c7e66b0596ddd7ae77b2a2b750f23f452e591c609f4a59a894815f8cfcb82c8bc266769b6e908463c009c SHA512 62609eb3c9a873045a9f02d22be5413f73f909e77d82f287ff5b2f816d2d6930a8d8ca77537a52189a98fe11441eb10f5530dfdab02ed0c09b53a2c4b5b4be80
-EBUILD kup-0.7.3.ebuild 1479 BLAKE2B 32576c5fff58c4a4b9226e91666b6c3f6f2bf47dbfa8ef2b2bd9a44334151f829c4bcd7976a1452196732bf80b6034760aa7ac194d829338119d46f016d5d289 SHA512 df770219c2c3f844df70bd1ed3d6a568d82f1c2d88eebd6320a2d9401a010c2c12692982156fb560b333f7a378fe83a8cf77b73ca8cf543bcaa06adc75a47599
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-backup/kup/files/kup-0.7.3-libgit2.patch b/app-backup/kup/files/kup-0.7.3-libgit2.patch
deleted file mode 100644
index a6b1c536afc1..000000000000
--- a/app-backup/kup/files/kup-0.7.3-libgit2.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From 2ca19e917f895e24a5379be669b9ad77ff5692f5 Mon Sep 17 00:00:00 2001
-From: Simon Persson <simon.persson@mykolab.com>
-Date: Mon, 16 Mar 2020 17:03:33 +0800
-Subject: Remove copy of libgit2
-
-API seems to have stabilized a lot, such that different distros can be
-expected to have a compatible version.
----
- CMakeLists.txt                                     |   13 +-
- filedigger/CMakeLists.txt                          |    2 +-
- filedigger/main.cpp                                |   12 -
- kioslave/CMakeLists.txt                            |    2 +-
- kioslave/bupslave.cpp                              |    8 -
-
-From ee720980113162c019eecabc01dfa5763cfb7585 Mon Sep 17 00:00:00 2001
-From: Adriaan de Groot <groot@kde.org>
-Date: Mon, 6 Apr 2020 23:06:53 +0200
-Subject: Link to libgit2 via imported target
-
----
- filedigger/CMakeLists.txt | 2 +-
- kioslave/CMakeLists.txt   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2118193..76a1367 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -6,18 +6,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
- 
- project(kup)
- 
--# Use this option if you want to use the system LibGit2 library.
--# This is not recommended unless you know what you are doing.
--option(USE_SYSTEM_LIBGIT2 "Don't set this option unless your are sure that your system version of LibGit2 library is fully compatible with Kup." OFF)
--if (USE_SYSTEM_LIBGIT2)
--  find_package(LibGit2 REQUIRED)
--  set(libgit_link_name git2)
--else (USE_SYSTEM_LIBGIT2)
--  set(BUILD_SHARED_LIBS ON)
--  add_subdirectory(libgit2-0.19.0)
--  include_directories(${CMAKE_SOURCE_DIR}/libgit2-0.19.0/include)
--  set(libgit_link_name git24kup)
--endif (USE_SYSTEM_LIBGIT2)
-+find_package(LibGit2 REQUIRED)
- 
- if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug" OR "${CMAKE_BUILD_TYPE}" STREQUAL "DebugFull")
-   message(WARNING "enabling debug output!")
-diff --git a/filedigger/CMakeLists.txt b/filedigger/CMakeLists.txt
-index 2fcdd82..fd6a3a0 100644
---- a/filedigger/CMakeLists.txt
-+++ b/filedigger/CMakeLists.txt
-@@ -37,7 +37,7 @@ KF5::I18n
- KF5::I18n
- KF5::IconThemes
- KF5::JobWidgets
--${libgit_link_name}
-+LibGit2::LibGit2
- )
- 
- ########### install files ###############
-diff --git a/filedigger/main.cpp b/filedigger/main.cpp
-index 6682985..43fe9ae 100644
---- a/filedigger/main.cpp
-+++ b/filedigger/main.cpp
-@@ -21,11 +21,7 @@
- #include "filedigger.h"
- #include "mergedvfs.h"
- 
--#if LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 24
- #include <git2/global.h>
--#else
--#include <git2/threads.h>
--#endif
- 
- #include <KAboutData>
- #include <KLocalizedString>
-@@ -66,19 +62,11 @@ int main(int pArgCount, char **pArgArray) {
- 	}
- 
- 	// This needs to be called first thing, before any other calls to libgit2.
--	#if LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 24
- 	git_libgit2_init();
--	#else
--	git_threads_init();
--	#endif
- 
- 	FileDigger *lFileDigger = new FileDigger(lRepoPath, lParser.value(QStringLiteral("branch")));
- 	lFileDigger->show();
- 	int lRetVal = lApp.exec();
--	#if LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 24
- 	git_libgit2_shutdown();
--	#else
--	git_threads_shutdown();
--	#endif
- 	return lRetVal;
- }
-diff --git a/kioslave/CMakeLists.txt b/kioslave/CMakeLists.txt
-index 7187f33..83e6122 100644
---- a/kioslave/CMakeLists.txt
-+++ b/kioslave/CMakeLists.txt
-@@ -17,7 +17,7 @@ target_link_libraries(kio_bup
- Qt5::Core
- KF5::KIOCore
- KF5::I18n
--${libgit_link_name}
-+LibGit2::LibGit2
- )
- 
- install(TARGETS kio_bup DESTINATION ${PLUGIN_INSTALL_DIR})
-diff --git a/kioslave/bupslave.cpp b/kioslave/bupslave.cpp
-index 1a7e1a3..0812658 100644
---- a/kioslave/bupslave.cpp
-+++ b/kioslave/bupslave.cpp
-@@ -64,22 +64,14 @@ BupSlave::BupSlave(const QByteArray &pPoolSocket, const QByteArray &pAppSocket)
- {
- 	mRepository = nullptr;
- 	mOpenFile = nullptr;
--	#if LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 24
- 	git_libgit2_init();
--	#else
--	git_threads_init();
--	#endif
- }
- 
- BupSlave::~BupSlave() {
- 	if(mRepository != nullptr) {
- 		delete mRepository;
- 	}
--	#if LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 24
- 	git_libgit2_shutdown();
--	#else
--	git_threads_shutdown();
--	#endif
- }
- 
- void BupSlave::close() {
--- 
-cgit v1.1
-
diff --git a/app-backup/kup/kup-0.7.3.ebuild b/app-backup/kup/kup-0.7.3.ebuild
deleted file mode 100644
index 8af41a81c73b..000000000000
--- a/app-backup/kup/kup-0.7.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Backup scheduler for KDE's Plasma desktop"
-HOMEPAGE="https://www.linux-apps.com/p/1127689"
-SRC_URI="https://github.com/spersson/${PN^}/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	dev-libs/libgit2:=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	app-backup/bup
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	net-misc/rsync
-"
-
-S="${WORKDIR}/${PN^}-${P}"
-
-PATCHES=( "${FILESDIR}/${P}-libgit2.patch" )
-
-src_prepare() {
-	ecm_src_prepare
-	rm -r libgit2-0.19.0 || die "Failed to remove bundled libgit2-0.19.0"
-}
diff --git a/app-backup/kup/metadata.xml b/app-backup/kup/metadata.xml
deleted file mode 100644
index 2fdbf33d963d..000000000000
--- a/app-backup/kup/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-backup/rsnapshot/Manifest b/app-backup/rsnapshot/Manifest
index 9626d6bf6530..c95e74112db7 100644
--- a/app-backup/rsnapshot/Manifest
+++ b/app-backup/rsnapshot/Manifest
@@ -6,4 +6,4 @@ DIST rsnapshot-1.4.2.tar.gz 487959 BLAKE2B 90a52af1b2b3de5eae7e98f87b87dae4564a7
 EBUILD rsnapshot-1.3.1-r2.ebuild 1256 BLAKE2B 64cae24e77bb53767b76c1fc6102c11a8deae431c13fa13c9af58e048f010bb4366c6dbc71964e732ce0b491a18b00063d53ef8b69b743da3091aec4b447e9ce SHA512 54d6eda226edddd7b347201429dfd5248cc4aed6ddf331aaa1d977eaf6cb668668a68ce7f3c9b6b0064955c873edaa946820d2fadcba93406e56b68869c5d8dd
 EBUILD rsnapshot-1.4.1.ebuild 1109 BLAKE2B 0f39a928a464b99d32efa552bfde1a5c6550d6ad4f397748f7611d203cbe6d3f1f6547aa5d8e91df469b9da9543e6d9f7bae30b224f8c28ddcd8aa969cec87d5 SHA512 1d0bfd24db3a4e851e1c2592784f6c4974894bc5e20e11e11bf5f4077a416203ce4c07a3563028ecc1459a48b6c6bdbe5e3dbbff9250c6213abe5a4f261923a0
 EBUILD rsnapshot-1.4.2.ebuild 1336 BLAKE2B 8ee3cbd073f40287f5b6a7c9e3e6d05a6d4003a22d5c74460f0dec473a8cbf96abf07417cee854d7a7a35b405f2e281d36c3959f26fdcfdcaa8b1737bafc1c6c SHA512 f6bbd4d2d6a89acb6a80ddd916b1b3d8c91a59e2865586dc0b9dbeb842da1f31b1819fdd2d7ec6d8103cb9d2c20f42db11d3589d61dae5652ab0b273413f3a97
-MISC metadata.xml 385 BLAKE2B 663d1a8524cad5c1ff25711d7f63808109958f264a18c40195b59d2ce03c3ac92dd4812097863fc36b95f6da92c47f7fae820446323b1c4c9973facabbfb8e34 SHA512 1dcdf81afbd2de28c4039e74e12111b7f334717c68ba161951fdea9e327a97f1cbed3e1b50e3dab5e938cd5e022d5399e0c0f1b19f3a8acefc5523eb57804d54
+MISC metadata.xml 166 BLAKE2B df899de61ee57cf9c2d5822a8ca4cb62c697c6da7142003688afbdd1261a8623d48058189ebe005c053ffddcb9f7275f19a0e48fc47ce1890341e276400f1d8f SHA512 12bfcd38af9dc9fe67b866a4ae090e26873d363409efc5949cca4b4a59ba0d770b09ebec8a108482b29b94c922bcdb8ce3f5ccbb578137b44e35bd783b4c9472
diff --git a/app-backup/rsnapshot/metadata.xml b/app-backup/rsnapshot/metadata.xml
index 41d4a20db9c6..c1744fe7fc5b 100644
--- a/app-backup/rsnapshot/metadata.xml
+++ b/app-backup/rsnapshot/metadata.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>Sergiy.Borodych@gmail.com</email>
-    <name>Sergiy Borodych</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
+  <!--maintainer-needed-->
 </pkgmetadata>