Commit 5ee1c106 authored by Liguros - Gitlab CI/CD [develop]'s avatar Liguros - Gitlab CI/CD [develop]
Browse files

updates

merged:

  xor: 2c7769476eaa2d37bfa8957658663779d57d4645
  mate-desktop: 46b50ccbaeb9394a51927c8aa3e41719351c8101
  ejabberd: 8963c21e0fbc0f9537ef548487bcaf91bda9ebd1
  fusion809: b907b13da38d5e6e7c9940ded5f3e8d496a09cc9
  steam: c63523eabba3d5f70a495e63d366111089ea27cc
  chaoslab: be11df7e103adf1b05f63bc7ed4eb04462729789
  go-overlay: 0f5d2ecabb604fdae9cec12be7c7d231e4201ce7
  stefantalpalaru: 1e48198b00f1203016a6c8ed471ccc68f44f0541
  gentoo-libressl: ad08d4df67f1e2235ae1847448ed4e2c35d87ab5
  gentoo-staging: b4eb5d8e3ca87f50278b7deefb2f692421f8ccd7
  bradlyatc: 369209f17c82c889ff7fa9e04d4e6c785a57a5da
  calculatelinux: f39d42bbf252511432e813580199963a3f33fe9a
  kit-fixups: ff37e85f5332a48c3f766b216bcc3e98acc21745
parent f95b702d
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>nerve@ipwar.ch</email>
<name>Daniel Heule</name>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
<!-- maintainer-needed -->
<upstream>
<remote-id type="pypi">cdist</remote-id>
</upstream>
......
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>hendrik@consetetur.de</email>
<name>Hendrik v. Raven (lorem_ipsum)</name>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
<!-- maintainer-needed -->
<use>
<flag name="minimal">Avoid collision with <pkg>app-misc/pwsafe</pkg></flag>
<flag name="qr">Enable QR code password display</flag>
......
......@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
LICENSE="Apache-2.0 GPL-2"
SLOT="0"
KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
RESTRICT="test"
......
......@@ -5,14 +5,6 @@
<email>zlogene@gentoo.org</email>
<name>Mikle Kolyada</name>
</maintainer>
<maintainer type="person">
<email>dan@danmolik.com</email>
<name>Dan Molik</name>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
<longdescription lang="en">
Terraform is a tool for building, changing, and versioning infrastructure
safely and efficiently. Terraform can manage existing and popular service
......
......@@ -14,7 +14,7 @@ SLOT="0"
IUSE="gtk +introspection vala"
REQUIRED_USE="vala? ( introspection )"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
RDEPEND="
>=app-arch/libarchive-3.2.0
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gentoo@pennewiss.de</email>
<name>Marcel Pennewiß</name>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
<!-- maintainer-needed -->
<upstream>
<remote-id type="sourceforge">ftplicity</remote-id>
</upstream>
......
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
......@@ -49,9 +49,9 @@ RDEPEND="${DEPEND}
S="${WORKDIR}/${PN^}-${P}"
src_configure() {
local mycmakeargs=(
-DUSE_SYSTEM_LIBGIT2=ON
)
ecm_src_configure
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"
}
......@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rdiff-backup/${PN}/releases/download/v${PV}/${P}.tar
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="examples"
DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>morlix@morlix.de</email>
<name>Timo Eissler</name>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
<!-- maintainer-needed -->
<longdescription lang="en">
Relax and Recover (Rear) is the leading Open Source disaster recovery solution, and successor to mkcdrec. It comprises of a modular framework and ready-to-go workflows for many common situations to produce a bootable image and restore from backup using this image. As a benefit, it allows to restore to different hardware and can therefore be used as a migration tool as well.
</longdescription>
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>her@sorah.jp</email>
<name>Sorah Fukumori</name>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
<!-- maintainer-needed -->
<longdescription lang="en">
Set environment variables with OS X keychain or D-Bus secret service.
Envchain allows you to save credentials in a secure vault to use as
......
......@@ -18,7 +18,7 @@ IUSE="debug gtk +introspection +vala"
RESTRICT="!test? ( test )"
REQUIRED_USE="vala? ( introspection )"
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
COMMON_DEPEND="
>=app-crypt/p11-kit-0.19
......
......@@ -5,7 +5,7 @@ EAPI=5
inherit eutils flag-o-matic
DESCRIPTION="Rotix allows you to generate rotational obfuscations"
HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
HOMEPAGE="https://github.com/shemminga/rotix"
SRC_URI="http://elektron.its.tudelft.nl/~hemmin98/rotix_releases/${P}/${P}.tar.bz2"
LICENSE="GPL-2"
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>bernardo@standard.ai</email>
<name>Bernardo Meurer</name>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Gentoo Proxy Maintainers Project</name>
</maintainer>
<maintainer type="project">
<email>vim@gentoo.org</email>
<name>Gentoo Vim Project</name>
......
......@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
BDEPEND="sys-apps/texinfo"
......
......@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
LICENSE="HPND"
SLOT="0"
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86"
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
SITEFILE="60${PN}-gentoo.el"
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>dan@danmolik.com</email>
<name>Dan Molik</name>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
<!-- maintainer-needed -->
<longdescription lang="en">
While most of the tools used in the Linux containers ecosystem are written in
Go, crun authors believe C is a better fit for a lower level tool like a
......
......@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
KEYWORDS="amd64"
IUSE="+gui"
BDEPEND="${PYTHON_DEPS}
......
DIST vice-3.1.tar.gz 30714226 BLAKE2B 75c2cce5294dad5b954cd23b623b6b4610c8142a09aef05dbefed6b3e6b268077d375e644dde6a057682d41ab9cf15e93a9f4a9359bfa0d1567d6d1862053a0e SHA512 bc02a3597a17dadb37c487e6942192c0e9dc1a7d4e440fbf0dc8a165dbb2dee60ddf157697a020d2780ddef56a0a67802768d5c6d117b9cf5cdc124de45bc579
DIST vice-emu-code-r37498-trunk-vice.zip 26810776 BLAKE2B 05baa0d123e9a0f1141ef68940455b5abfccde0204d0ffeb0a806212977be6f1f2c777267cad077272f4e09fa3c6adb9e95436adaaee5482b2ce918a3485caeb SHA512 5b4c31e51efc67ac08f6fe9361c42b80115b315fc24c128861341f2eea7567bdbb1761e52bc914df442ed5cc7f2ca7c6b0a2694441d63e63f9f693bcf72c70c0
DIST vice-emu-code-r37605-trunk-vice.zip 26854864 BLAKE2B 771728b69cb38492d086d199fcb56d19f14738bc6b5c3f0b1c9c6ffb07db0d2c2a3d631ed9f32a2abf0159d4e3e0d144c04e6ba13c22ce619ea1090f89b7b5cc SHA512 975c342d5ee7f72cc775bee711fed77fb6ce00bc15eef13403b9f3a457ac589d0089bcdf452507605bbf11d8806fceec94729becf1ef3fe66f6074854684d998
--- vice-2.4.7.orig/configure.ac
+++ vice-2.4.7/configure.ac
@@ -124,7 +118,7 @@
AC_SUBST(VICE_VERSION)
AM_INIT_AUTOMAKE(vice, $VICE_VERSION)
-AM_CONFIG_HEADER(src/config.h)
+AC_CONFIG_HEADERS(src/config.h)
if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then
VERSION_RC=$VICE_VERSION_MAJOR","$VICE_VERSION_MINOR",0,0"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment