Browse Source

Sync with portage [Sat Oct 3 08:33:38 MSK 2020].

master 1777
Calculate Linux 1 year ago
parent
commit
7322132ac4
  1. BIN
      Manifest.files.gz
  2. BIN
      app-admin/Manifest.gz
  3. 1
      app-admin/ansible/Manifest
  4. 70
      app-admin/ansible/ansible-2.10.0.ebuild
  5. 1
      app-admin/op-cli-bin/Manifest
  6. 6
      app-admin/op-cli-bin/metadata.xml
  7. 23
      app-admin/op-cli-bin/op-cli-bin-1.7.0.ebuild
  8. 1
      app-admin/xkcdpass/xkcdpass-1.17.3-r1.ebuild
  9. BIN
      app-arch/Manifest.gz
  10. 1
      app-arch/rpm/Manifest
  11. 13
      app-arch/rpm/files/rpm-4.16.0-autotools.patch
  12. 34
      app-arch/rpm/files/rpm-4.16.0-libdir.patch
  13. 139
      app-arch/rpm/rpm-4.16.0.ebuild
  14. BIN
      app-backup/Manifest.gz
  15. 2
      app-backup/duplicity/duplicity-0.8.15.ebuild
  16. BIN
      app-cdr/Manifest.gz
  17. 3
      app-cdr/dumpet/dumpet-2.1_p20140601-r3.ebuild
  18. BIN
      app-crypt/Manifest.gz
  19. 2
      app-crypt/acme/acme-1.7.0.ebuild
  20. 2
      app-crypt/acme/acme-1.8.0.ebuild
  21. 2
      app-crypt/acme/acme-9999.ebuild
  22. 4
      app-crypt/certbot-apache/certbot-apache-1.7.0.ebuild
  23. 4
      app-crypt/certbot-apache/certbot-apache-1.8.0.ebuild
  24. 4
      app-crypt/certbot-apache/certbot-apache-9999.ebuild
  25. 5
      app-crypt/certbot-nginx/certbot-nginx-1.7.0.ebuild
  26. 5
      app-crypt/certbot-nginx/certbot-nginx-1.8.0.ebuild
  27. 5
      app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
  28. 4
      app-crypt/certbot/certbot-1.7.0.ebuild
  29. 4
      app-crypt/certbot/certbot-1.8.0.ebuild
  30. 4
      app-crypt/certbot/certbot-9999.ebuild
  31. 2
      app-crypt/tpm2-totp/Manifest
  32. 3
      app-crypt/tpm2-totp/metadata.xml
  33. 24
      app-crypt/tpm2-totp/tpm2-totp-0.3.0.ebuild
  34. BIN
      app-emulation/Manifest.gz
  35. 2
      app-emulation/cloud-init/cloud-init-19.4.ebuild
  36. 2
      app-emulation/cloud-init/cloud-init-20.1.ebuild
  37. 2
      app-emulation/cloud-init/cloud-init-9999.ebuild
  38. 4
      app-emulation/diskimage-builder/diskimage-builder-3.2.1.ebuild
  39. 4
      app-emulation/diskimage-builder/diskimage-builder-3.3.1.ebuild
  40. 4
      app-emulation/diskimage-builder/diskimage-builder-9999.ebuild
  41. 2
      app-emulation/libvirt/Manifest
  42. 169
      app-emulation/libvirt/files/libvirt-6.7.0-do-not-use-sysconfig.patch
  43. 9
      app-emulation/libvirt/files/libvirt-6.7.0-doc-path.patch
  44. 26
      app-emulation/libvirt/files/libvirt-6.7.0-fix-paths-for-apparmor.patch
  45. 344
      app-emulation/libvirt/libvirt-6.7.0.ebuild
  46. 344
      app-emulation/libvirt/libvirt-6.8.0.ebuild
  47. 41
      app-emulation/libvirt/libvirt-9999.ebuild
  48. 2
      app-emulation/qemu/qemu-5.1.0-r1.ebuild
  49. BIN
      app-eselect/Manifest.gz
  50. 1
      app-eselect/eselect-awk/Manifest
  51. 18
      app-eselect/eselect-awk/eselect-awk-0.2.ebuild
  52. BIN
      app-i18n/Manifest.gz
  53. 20
      app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild
  54. 20
      app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild
  55. 11
      app-i18n/fcitx-m17n/fcitx-m17n-0.2.4.ebuild
  56. 11
      app-i18n/fcitx-m17n/fcitx-m17n-4.9999.ebuild
  57. 15
      app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild
  58. 20
      app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild
  59. 2
      app-i18n/fcitx-sayura/fcitx-sayura-0.1.2.ebuild
  60. 2
      app-i18n/fcitx-sayura/fcitx-sayura-4.9999.ebuild
  61. 19
      app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild
  62. 19
      app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild
  63. 1
      app-i18n/scim-wijesekera/Manifest
  64. 22
      app-i18n/scim-wijesekera/files/scim-wijesekera-0.3.3-gcc43.patch
  65. 37
      app-i18n/scim-wijesekera/scim-wijesekera-0.3.3-r1.ebuild
  66. 4
      app-i18n/tagainijisho/Manifest
  67. 0
      app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20201001_p20201001.ebuild
  68. 11
      app-i18n/tomoe/files/tomoe-glibc-2.32.patch
  69. 3
      app-i18n/tomoe/tomoe-0.6.0-r6.ebuild
  70. 1
      app-i18n/transifex-client/Manifest
  71. 34
      app-i18n/transifex-client/transifex-client-0.13.12.ebuild
  72. BIN
      app-portage/Manifest.gz
  73. 1
      app-portage/gemato/Manifest
  74. 43
      app-portage/gemato/gemato-16.2.ebuild
  75. BIN
      app-text/Manifest.gz
  76. 2
      app-text/discount/discount-2.2.7.ebuild
  77. 1
      app-text/fbless/Manifest
  78. 16
      app-text/fbless/fbless-0.2.3.ebuild
  79. 11
      app-text/fbless/metadata.xml
  80. 1
      app-text/ghostscript-gpl/Manifest
  81. 189
      app-text/ghostscript-gpl/ghostscript-gpl-9.53.3.ebuild
  82. 1
      app-text/master-pdf-editor/Manifest
  83. 50
      app-text/master-pdf-editor/master-pdf-editor-5.6.42.ebuild
  84. 1
      app-text/poppler/Manifest
  85. 124
      app-text/poppler/poppler-20.10.0.ebuild
  86. 2
      app-text/poppler/poppler-9999.ebuild
  87. BIN
      dev-cpp/Manifest.gz
  88. 1
      dev-cpp/icnc/Manifest
  89. 77
      dev-cpp/icnc/icnc-1.0.100.ebuild
  90. 11
      dev-cpp/icnc/metadata.xml
  91. BIN
      dev-db/Manifest.gz
  92. 4
      dev-db/opendbx/opendbx-1.4.6-r3.ebuild
  93. 4
      dev-db/oracle-instantclient-basic/Manifest
  94. 57
      dev-db/oracle-instantclient-basic/files/11.2.0.3-makefile.patch
  95. 199
      dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.4.ebuild
  96. 4
      dev-db/oracle-instantclient-basic/oracle-instantclient-basic-12.ebuild
  97. 2
      dev-db/oracle-instantclient-jdbc/Manifest
  98. 92
      dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.4.ebuild
  99. 4
      dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-12.ebuild
  100. 2
      dev-db/oracle-instantclient-odbc/Manifest

BIN
Manifest.files.gz

BIN
app-admin/Manifest.gz

1
app-admin/ansible/Manifest

@ -1,2 +1,3 @@
DIST ansible-2.10.0.tar.gz 25454980 BLAKE2B 91f930518b90b36aa2c21f553092233059fada86fd1674c9c6e881484b1bd4e68a3eaa05d82e15115906e55da99c43394c3de36a898e26bb222f780b82f8a5bd SHA512 878036f06e1705e4392223bda210b2acae0232069d0cec02a47f13f6b3bc6c9538fb515a2d2dc6003695bcf0915fdd3dfc5b8dc59355e37e2ca8fa48bbd79657
DIST ansible-2.9.12.tar.gz 14260349 BLAKE2B 6d7fdc82489df755196b890b39c166e9639c94e4238b4bf33686a3ab17fcc92c6b3a05f80e1276795b966aaa318ec7d9003099950102c014adb1a5d730928633 SHA512 6c05c49e363d4d68516dfea448cead3e2c281d1288c9467a0b6dd083504f303df694ed1c5957ae6582b28acc937d12d13333254328e13bac430b9b7fa4354f23
DIST ansible-2.9.13.tar.gz 14261322 BLAKE2B 5de939a99cd703eaf240f536a9a4b707e3931364647782dde2bbebd5b755253594cbb1cf8c4e9f22a14fca85c9f018ee6ea26bce1cbe2145ba72e5f5ec313670 SHA512 cb08adf62df0f3650425a5d960baadd7439c7c1e95b8f9df3d08e7504f9622b9e5f7104b8700b0f1e9fe318d349a6a5728e9178f0193fb4a190456e30a2f1eb2

70
app-admin/ansible/ansible-2.10.0.ebuild

@ -0,0 +1,70 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{6,7} )
inherit distutils-r1 eutils
DESCRIPTION="Model-driven deployment, config management, and command execution framework"
HOMEPAGE="https://ansible.com/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
IUSE="doc test"
RESTRICT="test"
RDEPEND="
dev-python/paramiko[${PYTHON_USEDEP}]
dev-python/jinja[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/cryptography[${PYTHON_USEDEP}]
dev-python/httplib2[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
dev-python/netaddr[${PYTHON_USEDEP}]
dev-python/pexpect[${PYTHON_USEDEP}]
net-misc/sshpass
virtual/ssh
!app-admin/ansible-base
"
DEPEND="
!app-admin/ansible-base
dev-python/setuptools[${PYTHON_USEDEP}]
>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
doc? (
dev-python/sphinx[${PYTHON_USEDEP}]
dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
)
test? (
${RDEPEND}
dev-python/nose[${PYTHON_USEDEP}]
>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
dev-python/passlib[${PYTHON_USEDEP}]
dev-python/coverage[${PYTHON_USEDEP}]
dev-python/unittest2[${PYTHON_USEDEP}]
dev-vcs/git
)"
ANSIBLE_SKIP_CONFLICT_CHECK=1
python_compile_all() {
if use doc; then
cd docs/docsite || die
export CPUS=4
emake -f Makefile.sphinx html
fi
}
python_test() {
nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
}
python_install_all() {
use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
distutils-r1_python_install_all
}

1
app-admin/op-cli-bin/Manifest

@ -0,0 +1 @@
DIST op_linux_amd64_v1.7.0.zip 3989846 BLAKE2B 074bcc248438c1cfa0436726fb3b101e5d60c477c406434d00bb7689d6004796373d8562e22fa870239c9d2234cfae21d7a8aa2b90e7807cb15df8870b2afd64 SHA512 7ab0792ba737a8f95ec874dc111fdb6cd45d552c5b5cfb9d35423a76f444c15718269e77faae978d773bfcaa7e7607f4b8b7e93616c8f7fc91caafb35c856a5e

6
sys-cluster/pbs-python/metadata.xml → app-admin/op-cli-bin/metadata.xml

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cluster@gentoo.org</email>
<name>Gentoo Cluster Project</name>
<maintainer type="person">
<email>williamh@gentoo.org</email>
<name>William Hubbs</name>
</maintainer>
</pkgmetadata>

23
app-admin/op-cli-bin/op-cli-bin-1.7.0.ebuild

@ -0,0 +1,23 @@
# Copyright 2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DESCRIPTION="command line interface for the 1password password manager"
HOMEPAGE="https://1password.com/downloads/command-line"
SITE="https://cache.agilebits.com/dist/1P/op/pkg/v${PV}/"
SRC_URI="${SITE}/op_linux_amd64_v${PV}.zip"
LICENSE="all-rights-reserved"
SLOT="0"
KEYWORDS="~amd64"
BDEPEND="app-arch/unzip"
QA_PREBUILT="usr/bin/op"
RESTRICT="bindist mirror"
S="${WORKDIR}"
src_install() {
dobin op
}

1
app-admin/xkcdpass/xkcdpass-1.17.3.ebuild → app-admin/xkcdpass/xkcdpass-1.17.3-r1.ebuild

@ -4,6 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{7,8,9} )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
DESCRIPTION="Password generator inspired by XKCD 936"

BIN
app-arch/Manifest.gz

1
app-arch/rpm/Manifest

@ -1 +1,2 @@
DIST rpm-4.14.2.1.tar.bz2 4156574 BLAKE2B 2eb0cf621eecef7d8977d28d52be922156ceb64b14d2aefda0f5a927b90cf3d3e9c055d773e05ed52422254397153b79557dc94bdb43ca28a2ea126153a43c1f SHA512 0aad457f91918904c15649a1764ce7cbfaf38e083678031286e866f7997be0435a6b7b73596706d97e9263cff7b4df4a3150b142d81e6e3fddbfcf67bd83f990
DIST rpm-4.16.0.tar.bz2 4341683 BLAKE2B 5161e5dcc6d9a1f1d4b8e44740fb368050b808fd9e8b8276fb17b530a4642e1b9ad104b5a30c0071215aef7f823eeab10988dd41f73af1c52d575529c374b5eb SHA512 177119c3ac3d48980db55bb4ba0fdbb2a911968e5efc690bfa8cc343f850fc90531cc0dee6dd8e45d2b14f0d951ced35bd8893d24011b7f270745d281ddf4e3d

13
app-arch/rpm/files/rpm-4.16.0-autotools.patch

@ -0,0 +1,13 @@
diff -uNr rpm-4.16.0.ORIG/configure.ac rpm-4.16.0/configure.ac
--- rpm-4.16.0.ORIG/configure.ac 2020-10-01 11:02:21.605485875 +0100
+++ rpm-4.16.0/configure.ac 2020-10-01 11:05:34.077157904 +0100
@@ -552,9 +552,6 @@
AM_CONDITIONAL([BDB], [test "x$have_bdb" != "xno"])
AM_CONDITIONAL([WITH_INTERNAL_DB],[test "x$have_bdb" = "xinternal"])
-if test "x$have_bdb" = "xinternal"; then
- AC_CONFIG_SUBDIRS(db3)
-fi
#=================

34
app-arch/rpm/files/rpm-4.16.0-libdir.patch

@ -0,0 +1,34 @@
diff -uNr rpm-4.16.0.ORIG/configure.ac rpm-4.16.0/configure.ac
--- rpm-4.16.0.ORIG/configure.ac 2020-10-01 11:08:43.780842602 +0100
+++ rpm-4.16.0/configure.ac 2020-10-01 11:09:03.533705353 +0100
@@ -935,13 +935,7 @@
AC_DEFINE_UNQUOTED([RUNDIR],["${RUNDIR}"],[run-time variable directory])
AC_SUBST(RUNDIR)
-if test X"$prefix" = XNONE ; then
- usrprefix="$ac_default_prefix"
-else
- usrprefix=$prefix
-fi
-
-RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
+RPMCONFIGDIR="`echo ${libexecdir}/rpm/`"
AC_SUBST(RPMCONFIGDIR)
AC_SUBST(OBJDUMP)
diff -uNr rpm-4.16.0.ORIG/rpm.am rpm-4.16.0/rpm.am
--- rpm-4.16.0.ORIG/rpm.am 2020-10-01 11:08:43.743842859 +0100
+++ rpm-4.16.0/rpm.am 2020-10-01 11:09:03.533705353 +0100
@@ -1,10 +1,8 @@
# Internal binaries
-## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm
-rpmlibexecdir = $(prefix)/lib/rpm
+rpmlibexecdir = $(pkglibexecdir)
# Host independent config files
-## HACK: it probably should be $(datadir)/rpm
-rpmconfigdir = $(prefix)/lib/rpm
+rpmconfigdir = $(pkglibexecdir)
# Libtool version (current-revision-age) for all our libraries
rpm_version_info = 10:0:1

139
app-arch/rpm/rpm-4.16.0.ebuild

@ -0,0 +1,139 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{6,7,8,9} )
inherit autotools flag-o-matic perl-module python-single-r1
DESCRIPTION="Red Hat Package Management Utils"
HOMEPAGE="https://rpm.org
https://github.com/rpm-software-management/rpm"
SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
# Tests are broken. See bug 657500
RESTRICT="test"
IUSE="acl caps doc dbus lua nls python selinux test +zstd"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
CDEPEND="!app-arch/rpm5
app-arch/libarchive
>=sys-libs/db-4.5:*
>=sys-libs/zlib-1.2.3-r1
>=app-arch/bzip2-1.0.1
>=dev-libs/popt-1.7
>=app-crypt/gnupg-1.2
dbus? ( sys-apps/dbus )
dev-libs/elfutils
virtual/libintl
>=dev-lang/perl-5.8.8
dev-libs/nss
python? ( ${PYTHON_DEPS} )
nls? ( virtual/libintl )
lua? ( dev-lang/lua:5.2 )
acl? ( virtual/acl )
caps? ( >=sys-libs/libcap-2.0 )
zstd? ( app-arch/zstd )
"
DEPEND="${CDEPEND}
nls? ( sys-devel/gettext )
doc? ( app-doc/doxygen )
virtual/pkgconfig
test? ( sys-apps/fakechroot )
"
RDEPEND="${CDEPEND}
selinux? ( sec-policy/selinux-rpm )
"
pkg_setup() {
use python && python-single-r1_pkg_setup
}
src_prepare() {
eapply "${FILESDIR}"/${P}-autotools.patch
eapply "${FILESDIR}"/${PN}-4.8.1-db-path.patch
eapply "${FILESDIR}"/${P}-libdir.patch
# fix #356769
sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
# fix #492642
sed -i "s:@__PYTHON@:${PYTHON}:" macros.in || die "Fixing %__python failed"
eapply_user
eautoreconf
# Prevent automake maintainer mode from kicking in (#450448).
touch -r Makefile.am preinstall.am
}
src_configure() {
append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
econf \
--without-selinux \
--with-crypto=nss \
$(use_enable python) \
$(use_enable nls) \
$(use_enable dbus inhibit-plugin) \
$(use_with lua) \
$(use_with caps cap) \
$(use_with acl) \
$(use_enable zstd zstd $(usex zstd yes no))
}
src_install() {
default
# remove la files
find "${ED}" -name '*.la' -delete || die
# fix symlinks to /bin/rpm (#349840)
for binary in rpmquery rpmverify;do
ln -sf rpm "${ED}"/usr/bin/${binary} || die
done
if ! use nls; then
rm -rf "${ED}"/usr/share/man/?? || die
fi
keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
dodoc CREDITS README*
if use doc; then
for docname in librpm; do
docinto "html/${docname}"
dodoc -r "doc/${docname}/html/."
done
fi
# Fix perllocal.pod file collision
perl_delete_localpod
use python && python_optimize
}
src_test() {
# Known to fail with FEATURES=usersandbox (bug #657500):
if has usersandbox $FEATURES ; then
ewarn "You are emerging ${P} with 'usersandbox' enabled." \
"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
fi
emake check
}
pkg_postinst() {
if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
einfo "RPM database found... Rebuilding database (may take a while)..."
"${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}/" || die
else
einfo "No RPM database found... Creating database..."
"${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}/" || die
fi
}

BIN
app-backup/Manifest.gz

2
app-backup/duplicity/duplicity-0.8.15.ebuild

@ -12,7 +12,7 @@ SRC_URI="https://code.launchpad.net/${PN}/$(ver_cut 1-2)-series/$(ver_cut 1-3)/+
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="s3 test"
CDEPEND="

BIN
app-cdr/Manifest.gz

3
app-cdr/dumpet/dumpet-2.1_p20140601-r2.ebuild → app-cdr/dumpet/dumpet-2.1_p20140601-r3.ebuild

@ -13,7 +13,7 @@ SRC_URI="https://github.com/rhboot/dumpet/archive/${COMMIT}.tar.gz -> ${P}.tar.g
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 x86"
IUSE="test"
#Restrict tests since required test file is unavailable
RESTRICT="test"
@ -31,6 +31,7 @@ src_prepare() {
-e "s/^install : all$/install :/" \
-e "s/^CFLAGS:=/CFLAGS?=/" \
-e "s/^CC:=/CC?=/" \
-e '/^LFLAGS/ s/$/$(LDFLAGS)/' \
|| die
default
}

BIN
app-crypt/Manifest.gz

2
app-crypt/acme/acme-1.7.0.ebuild

@ -3,6 +3,7 @@
EAPI=7
PYTHON_COMPAT=(python{3_6,3_7,3_8})
DISTUTILS_USE_SETUPTOOLS=rdepend
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@ -46,7 +47,6 @@ DEPEND="
dev-python/pytest[${PYTHON_USEDEP}]
dev-python/pytest-xdist[${PYTHON_USEDEP}]
)
>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
"
src_compile() {

2
app-crypt/acme/acme-1.8.0.ebuild

@ -3,6 +3,7 @@
EAPI=7
PYTHON_COMPAT=(python{3_6,3_7,3_8})
DISTUTILS_USE_SETUPTOOLS=rdepend
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@ -46,7 +47,6 @@ DEPEND="
dev-python/pytest[${PYTHON_USEDEP}]
dev-python/pytest-xdist[${PYTHON_USEDEP}]
)
>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
"
src_compile() {

2
app-crypt/acme/acme-9999.ebuild

@ -3,6 +3,7 @@
EAPI=7
PYTHON_COMPAT=(python{3_6,3_7,3_8})
DISTUTILS_USE_SETUPTOOLS=rdepend
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@ -46,7 +47,6 @@ DEPEND="
dev-python/pytest[${PYTHON_USEDEP}]
dev-python/pytest-xdist[${PYTHON_USEDEP}]
)
>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
"
src_compile() {

4
app-crypt/certbot-apache/certbot-apache-1.7.0.ebuild

@ -3,6 +3,7 @@
EAPI=7
PYTHON_COMPAT=(python{3_6,3_7,3_8})
DISTUTILS_USE_SETUPTOOLS=rdepend
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@ -30,8 +31,7 @@ RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
dev-python/zope-component[${PYTHON_USEDEP}]
dev-python/zope-interface[${PYTHON_USEDEP}]"
DEPEND="test? ( ${RDEPEND}
dev-python/pytest[${PYTHON_USEDEP}] )
dev-python/setuptools[${PYTHON_USEDEP}]"
dev-python/pytest[${PYTHON_USEDEP}] )"
python_test() {
esetup.py test || die

4
app-crypt/certbot-apache/certbot-apache-1.8.0.ebuild

@ -3,6 +3,7 @@
EAPI=7
PYTHON_COMPAT=(python{3_6,3_7,3_8})
DISTUTILS_USE_SETUPTOOLS=rdepend
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@ -30,8 +31,7 @@ RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
dev-python/zope-component[${PYTHON_USEDEP}]
dev-python/zope-interface[${PYTHON_USEDEP}]"
DEPEND="test? ( ${RDEPEND}
dev-python/pytest[${PYTHON_USEDEP}] )
dev-python/setuptools[${PYTHON_USEDEP}]"
dev-python/pytest[${PYTHON_USEDEP}] )"
python_test() {
esetup.py test || die

4
app-crypt/certbot-apache/certbot-apache-9999.ebuild

@ -3,6 +3,7 @@
EAPI=7
PYTHON_COMPAT=(python{3_6,3_7,3_8})
DISTUTILS_USE_SETUPTOOLS=rdepend
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@ -30,8 +31,7 @@ RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
dev-python/zope-component[${PYTHON_USEDEP}]
dev-python/zope-interface[${PYTHON_USEDEP}]"
DEPEND="test? ( ${RDEPEND}
dev-python/pytest[${PYTHON_USEDEP}] )
dev-python/setuptools[${PYTHON_USEDEP}]"
dev-python/pytest[${PYTHON_USEDEP}] )"
python_test() {
esetup.py test || die

5
app-crypt/certbot-nginx/certbot-nginx-1.7.0.ebuild

@ -3,6 +3,7 @@
EAPI=7
PYTHON_COMPAT=(python{3_6,3_7,3_8})
DISTUTILS_USE_SETUPTOOLS=rdepend
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@ -23,11 +24,9 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="${CDEPEND}
RDEPEND="
>=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
dev-python/pyopenssl[${PYTHON_USEDEP}]
>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
dev-python/zope-interface[${PYTHON_USEDEP}]"
DEPEND="${CDEPEND}"

5
app-crypt/certbot-nginx/certbot-nginx-1.8.0.ebuild

@ -3,6 +3,7 @@
EAPI=7
PYTHON_COMPAT=(python{3_6,3_7,3_8})
DISTUTILS_USE_SETUPTOOLS=rdepend
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@ -23,11 +24,9 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="${CDEPEND}
RDEPEND="
>=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
dev-python/pyopenssl[${PYTHON_USEDEP}]
>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
dev-python/zope-interface[${PYTHON_USEDEP}]"
DEPEND="${CDEPEND}"

5
app-crypt/certbot-nginx/certbot-nginx-9999.ebuild

@ -3,6 +3,7 @@
EAPI=7
PYTHON_COMPAT=(python{3_6,3_7,3_8})
DISTUTILS_USE_SETUPTOOLS=rdepend
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@ -23,11 +24,9 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="${CDEPEND}
RDEPEND="
>=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
dev-python/pyopenssl[${PYTHON_USEDEP}]
>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
dev-python/zope-interface[${PYTHON_USEDEP}]"
DEPEND="${CDEPEND}"

4
app-crypt/certbot/certbot-1.7.0.ebuild

@ -3,6 +3,7 @@
EAPI=7
PYTHON_COMPAT=(python{3_6,3_7,3_8})
DISTUTILS_USE_SETUPTOOLS=rdepend
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@ -23,9 +24,7 @@ SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="
${CDEPEND}
>=app-crypt/acme-1.6.0[${PYTHON_USEDEP}]
>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
dev-python/configobj[${PYTHON_USEDEP}]
@ -37,7 +36,6 @@ RDEPEND="
dev-python/pytz[${PYTHON_USEDEP}]
dev-python/zope-component[${PYTHON_USEDEP}]
dev-python/zope-interface[${PYTHON_USEDEP}]"
DEPEND="${CDEPEND}"
distutils_enable_tests pytest

4
app-crypt/certbot/certbot-1.8.0.ebuild

@ -3,6 +3,7 @@
EAPI=7
PYTHON_COMPAT=(python{3_6,3_7,3_8})
DISTUTILS_USE_SETUPTOOLS=rdepend
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@ -23,9 +24,7 @@ SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="
${CDEPEND}
>=app-crypt/acme-1.6.0[${PYTHON_USEDEP}]
>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
dev-python/configobj[${PYTHON_USEDEP}]
@ -37,7 +36,6 @@ RDEPEND="
dev-python/pytz[${PYTHON_USEDEP}]
dev-python/zope-component[${PYTHON_USEDEP}]
dev-python/zope-interface[${PYTHON_USEDEP}]"
DEPEND="${CDEPEND}"
distutils_enable_tests pytest

4
app-crypt/certbot/certbot-9999.ebuild

@ -3,6 +3,7 @@
EAPI=7
PYTHON_COMPAT=(python{3_6,3_7,3_8})
DISTUTILS_USE_SETUPTOOLS=rdepend
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@ -23,9 +24,7 @@ SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="
${CDEPEND}
>=app-crypt/acme-1.6.0[${PYTHON_USEDEP}]
>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
dev-python/configobj[${PYTHON_USEDEP}]
@ -37,7 +36,6 @@ RDEPEND="
dev-python/pytz[${PYTHON_USEDEP}]
dev-python/zope-component[${PYTHON_USEDEP}]
dev-python/zope-interface[${PYTHON_USEDEP}]"
DEPEND="${CDEPEND}"
distutils_enable_tests pytest

2
app-crypt/tpm2-totp/Manifest

@ -1 +1 @@
DIST tpm2-totp-0.2.1.tar.gz 427226 BLAKE2B e6a9dbcdac4d7fc31048aff968e3eea097752c79a3c1b8551d22558a6b143a758e7bb507722185c648000f4b1edd2f0bbdd443890b5763b297f3d42cfbd84d9d SHA512 2bda34e89b76319a40206e08c0208b0f139309c0b0e40e7168b5e7562096750df504dfcae3a39e6f82fdccbf7a79ed0802d115fbd7560dc3f5b52d81fe8fb59c
DIST tpm2-totp-0.3.0.tar.gz 428874 BLAKE2B 413f4418cd1ce9a996f36c83e27c3fe256b2d3f5ff36e7df1dc1b651e38afa222be9742d5cfa76287263a4e1402dabea3400b41a1e1bde9f31fe03f82894f4f1 SHA512 d47cc8155a60a464afe602c3114ff8e6b2ff825457e6069693947421716b97c34b00f70adbcb4cda1b5b9639b8a3dfc7800295bbff99822da7a8077ebf78d6b2

3
app-crypt/tpm2-totp/metadata.xml

@ -12,4 +12,7 @@
<upstream>
<remote-id type="github">tpm2-software/tpm2-totp</remote-id>
</upstream>
<use>
<flag name="plymouth">Add <pkg>sys-boot/plymouth</pkg> support</flag>
</use>
</pkgmetadata>

24
app-crypt/tpm2-totp/tpm2-totp-0.2.1-r1.ebuild → app-crypt/tpm2-totp/tpm2-totp-0.3.0.ebuild

@ -12,12 +12,26 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/v${PV}/${P}.ta
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
IUSE="plymouth test"
REQUIRED_USE="test? ( plymouth )"
RDEPEND="app-crypt/tpm2-tss
media-gfx/qrencode
plymouth? ( sys-boot/plymouth )"
DEPEND="${RDEPEND}
test? (
app-crypt/swtpm
app-crypt/tpm2-tools
>=app-crypt/tpm2-tss-3.0.0
sys-apps/fakeroot
sys-auth/oath-toolkit
)"
RDEPEND=">=app-crypt/tpm2-tss-2.0
media-gfx/qrencode:="
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
RESTRICT="!test? ( test )"
src_prepare() {
default
eautoreconf
@ -26,7 +40,9 @@ src_prepare() {
src_configure() {
econf \
--disable-static \
--disable-defaultflags
--disable-defaultflags \
$(use_enable plymouth) \
$(use_enable test integration)
}
src_install() {

BIN
app-emulation/Manifest.gz

2
app-emulation/cloud-init/cloud-init-19.4.ebuild

@ -3,6 +3,7 @@
EAPI=7
PYTHON_COMPAT=( python3_6 python3_7 )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
@ -28,7 +29,6 @@ CDEPEND="
dev-python/six[${PYTHON_USEDEP}]
"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
test? (
${CDEPEND}
>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]

2
app-emulation/cloud-init/cloud-init-20.1.ebuild

@ -3,6 +3,7 @@
EAPI=7
PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
@ -34,7 +35,6 @@ CDEPEND="
dev-python/six[${PYTHON_USEDEP}]
"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
test? (
${CDEPEND}
>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]

2
app-emulation/cloud-init/cloud-init-9999.ebuild

@ -3,6 +3,7 @@
EAPI=7
PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
@ -34,7 +35,6 @@ CDEPEND="
dev-python/six[${PYTHON_USEDEP}]
"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
test? (
${CDEPEND}
>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]

4
app-emulation/diskimage-builder/diskimage-builder-3.2.1.ebuild

@ -4,6 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
DESCRIPTION="Golden Disk Image builder."
@ -22,8 +23,7 @@ IUSE=""
CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
DEPEND="${CDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]"
DEPEND="${CDEPEND}"
RDEPEND="${CDEPEND}
>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]

4
app-emulation/diskimage-builder/diskimage-builder-3.3.1.ebuild

@ -4,6 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
DESCRIPTION="Golden Disk Image builder."
@ -22,8 +23,7 @@ IUSE=""
CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
DEPEND="${CDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]"
DEPEND="${CDEPEND}"
RDEPEND="${CDEPEND}
>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]

4
app-emulation/diskimage-builder/diskimage-builder-9999.ebuild

@ -4,6 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
DESCRIPTION="Golden Disk Image builder."
@ -22,8 +23,7 @@ IUSE=""
CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
DEPEND="${CDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]"
DEPEND="${CDEPEND}"
RDEPEND="${CDEPEND}
>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]

2
app-emulation/libvirt/Manifest

@ -1,2 +1,4 @@
DIST libvirt-6.2.0.tar.xz 8307248 BLAKE2B 9d449e041fc548a688f974d0801e625cf023ef0df49c40028e486e88fcf14181869e0dfd87f0eabcdd184df67dda5b5fbdc0c2375832f1534faff531779255dd SHA512 96bef701fd73aef93d1490f0bc331901a0ff6250a4f36a3e4844f76cc262dc0ae4cce8686a603c2a9c575ce489d8d5ed1521ebd22b92aff8301efdb74dee91e4
DIST libvirt-6.5.0.tar.xz 9407160 BLAKE2B 592aace555a3b72311cb430784587180fa7dbf74f75509cd8373a046339b9c4c0707bf530dd2d06146d78a85f8af3dba5d0b146ecec180d3cc4d3bf78c19da61 SHA512 30a032270304b97945ff2c5087c72c2f5510634186f2eaf7c3d834a72cddcaec97bbe5ccc86802728a59f4c80b5bb54757400683df5f20175757cfe07ce67453
DIST libvirt-6.7.0.tar.xz 8362140 BLAKE2B d0afe33fcdaab3cc0f2ea8c552e7550bcece018b049a3b58e5c05ee85b39e2b3ebf42fa1b70ddb1d2a541d1114b6b49734f23a889b3589397a30a672f27a3a56 SHA512 cabfb6aa65a3a1412b0111654ad3a7d0a6dfc63399a892c540ca39ab4e56f87626a067037e4480bb55418a371d2b5e9ac74862c92a3cdea69822ec3d158d769f
DIST libvirt-6.8.0.tar.xz 8412092 BLAKE2B c118ca6b263054bb6941c62f3d1415f7ed1a3f29a35294272d04bc726643247ee5691e0310a1bf013faeba856d7aadd00a90fe8dbdca6ff4c7eb480e94d92fa2 SHA512 9b69f3dcceb5e40470a78908654faf51b643f6793e556f3115daa4bfe08743af290882dd51f15eb27c38d589eb210d495de7c44a40b363420ab4f4d3a6393cc9

169
app-emulation/libvirt/files/libvirt-6.7.0-do-not-use-sysconfig.patch

@ -0,0 +1,169 @@
--- a/src/interface/virtinterfaced.service.in
+++ b/src/interface/virtinterfaced.service.in
@@ -13,7 +13,6 @@
[Service]
Type=notify
-EnvironmentFile=-@sysconfdir@/sysconfig/virtinterfaced
ExecStart=@sbindir@/virtinterfaced $VIRTINTERFACED_ARGS
ExecReload=/bin/kill -HUP $MAINPID
Restart=on-failure
--- a/src/libxl/virtxend.service.in
+++ b/src/libxl/virtxend.service.in
@@ -17,7 +17,6 @@
[Service]
Type=notify
-EnvironmentFile=-@sysconfdir@/sysconfig/virtxend
ExecStart=@sbindir@/virtxend $VIRTXEND_ARGS
ExecReload=/bin/kill -HUP $MAINPID
Restart=on-failure
--- a/src/locking/virtlockd.service.in
+++ b/src/locking/virtlockd.service.in
@@ -7,8 +7,7 @@
Documentation=https://libvirt.org
[Service]
-EnvironmentFile=-@sysconfdir@/sysconfig/virtlockd
-ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS
+ExecStart=@sbindir@/virtlockd
ExecReload=/bin/kill -USR1 $MAINPID
# Loosing the locks is a really bad thing that will
# cause the machine to be fenced (rebooted), so make
--- a/src/logging/virtlogd.service.in
+++ b/src/logging/virtlogd.service.in
@@ -7,8 +7,7 @@
Documentation=https://libvirt.org
[Service]
-EnvironmentFile=-@sysconfdir@/sysconfig/virtlogd
-ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS
+ExecStart=@sbindir@/virtlogd
ExecReload=/bin/kill -USR1 $MAINPID
# Loosing the logs is a really bad thing that will
# cause the machine to be fenced (rebooted), so make
--- a/src/lxc/virtlxcd.service.in
+++ b/src/lxc/virtlxcd.service.in
@@ -18,7 +18,6 @@
[Service]
Type=notify
-EnvironmentFile=-@sysconfdir@/sysconfig/virtlxcd
ExecStart=@sbindir@/virtlxcd $VIRTLXCD_ARGS
ExecReload=/bin/kill -HUP $MAINPID
KillMode=process
--- a/src/network/virtnetworkd.service.in
+++ b/src/network/virtnetworkd.service.in
@@ -16,7 +16,6 @@
[Service]
Type=notify
-EnvironmentFile=-@sysconfdir@/sysconfig/virtnetworkd
ExecStart=@sbindir@/virtnetworkd $VIRTNETWORKD_ARGS
ExecReload=/bin/kill -HUP $MAINPID
Restart=on-failure
--- a/src/node_device/virtnodedevd.service.in
+++ b/src/node_device/virtnodedevd.service.in
@@ -13,7 +13,6 @@
[Service]
Type=notify
-EnvironmentFile=-@sysconfdir@/sysconfig/virtnodedevd
ExecStart=@sbindir@/virtnodedevd $VIRTNODEDEVD_ARGS
ExecReload=/bin/kill -HUP $MAINPID
Restart=on-failure
--- a/src/nwfilter/virtnwfilterd.service.in
+++ b/src/nwfilter/virtnwfilterd.service.in
@@ -13,7 +13,6 @@
[Service]
Type=notify
-EnvironmentFile=-@sysconfdir@/sysconfig/virtnwfilterd
ExecStart=@sbindir@/virtnwfilterd $VIRTNWFILTERD_ARGS
ExecReload=/bin/kill -HUP $MAINPID
Restart=on-failure
--- a/src/qemu/virtqemud.service.in
+++ b/src/qemu/virtqemud.service.in
@@ -18,7 +18,6 @@
[Service]
Type=notify
-EnvironmentFile=-@sysconfdir@/sysconfig/virtqemud
ExecStart=@sbindir@/virtqemud $VIRTQEMUD_ARGS
ExecReload=/bin/kill -HUP $MAINPID
KillMode=process
--- a/src/remote/libvirtd.service.in
+++ b/src/remote/libvirtd.service.in
@@ -28,8 +28,7 @@
[Service]
Type=notify
-EnvironmentFile=-@sysconfdir@/sysconfig/libvirtd
-ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
+ExecStart=@sbindir@/libvirtd
ExecReload=/bin/kill -HUP $MAINPID
KillMode=process
Restart=on-failure
--- a/src/remote/virtproxyd.service.in
+++ b/src/remote/virtproxyd.service.in
@@ -13,7 +13,6 @@
[Service]
Type=notify
-EnvironmentFile=-@sysconfdir@/sysconfig/virtproxyd
ExecStart=@sbindir@/virtproxyd $VIRTPROXYD_ARGS
ExecReload=/bin/kill -HUP $MAINPID
Restart=on-failure
--- a/src/secret/virtsecretd.service.in
+++ b/src/secret/virtsecretd.service.in
@@ -13,7 +13,6 @@
[Service]
Type=notify
-EnvironmentFile=-@sysconfdir@/sysconfig/virtsecretd
ExecStart=@sbindir@/virtsecretd $VIRTSECRETD_ARGS
ExecReload=/bin/kill -HUP $MAINPID
Restart=on-failure
--- a/src/storage/virtstoraged.service.in
+++ b/src/storage/virtstoraged.service.in
@@ -15,7 +15,6 @@
[Service]
Type=notify
-EnvironmentFile=-@sysconfdir@/sysconfig/virtstoraged
ExecStart=@sbindir@/virtstoraged $VIRTSTORAGED_ARGS
ExecReload=/bin/kill -HUP $MAINPID
Restart=on-failure
--- a/src/vbox/virtvboxd.service.in
+++ b/src/vbox/virtvboxd.service.in
@@ -14,7 +14,6 @@
[Service]
Type=notify
-EnvironmentFile=-@sysconfdir@/sysconfig/virtvboxd
ExecStart=@sbindir@/virtvboxd $VIRTVBOXD_ARGS
ExecReload=/bin/kill -HUP $MAINPID
Restart=on-failure
--- a/tools/libvirt-guests.service.in
+++ b/tools/libvirt-guests.service.in
@@ -10,7 +10,7 @@
Documentation=https://libvirt.org
[Service]
-EnvironmentFile=-@sysconfdir@/sysconfig/libvirt-guests
+EnvironmentFile=-/etc/libvirt/libvirt-guests.conf
# Hack just call traditional service until we factor
# out the code
ExecStart=@libexecdir@/libvirt-guests.sh start
--- a/tools/libvirt-guests.sysconf
+++ b/tools/libvirt-guests.sysconf
@@ -1,3 +1,9 @@
+#
+# Warning: This configuration file is only sourced by the systemd
+# libvirt-guests.service unit. The coresponding openrc facility is in
+# /etc/init.d/libvirtd and /etc/conf.d/libvirtd
+#
+
# Customizations for the libvirt-guests.service systemd unit
# URIs to check for running guests

9
app-emulation/libvirt/files/libvirt-6.7.0-doc-path.patch

@ -0,0 +1,9 @@
--- a/meson.build 2020-09-26 21:25:08.557345415 +0000
+++ b/meson.build 2020-09-26 21:25:59.507348156 +0000
@@ -84,7 +84,7 @@ sbindir = prefix / get_option('sbindir')
sharedstatedir = prefix / get_option('sharedstatedir')
confdir = sysconfdir / meson.project_name()
-docdir = datadir / 'doc' / meson.project_name()
+docdir = datadir / 'doc' / '@0@-@1@'.format(meson.project_name(), meson.project_version())
pkgdatadir = datadir / meson.project_name()

26
app-emulation/libvirt/files/libvirt-6.7.0-fix-paths-for-apparmor.patch

@ -0,0 +1,26 @@
diff --git a/src/security/apparmor/libvirt-qemu b/src/security/apparmor/libvirt-qemu
index 80986ae..d550d8c 100644
--- a/src/security/apparmor/libvirt-qemu
+++ b/src/security/apparmor/libvirt-qemu
@@ -88,6 +88,7 @@
/usr/share/sgabios/** r,
/usr/share/slof/** r,
/usr/share/vgabios/** r,
+ /usr/share/seavgabios/** r,
# pki for libvirt-vnc and libvirt-spice (LP: #901272, #1690140)
/etc/pki/CA/ r,
diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in b/src/security/apparmor/usr.libexec.virt-aa-helper.in
similarity index 97%
rename from src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
rename to src/security/apparmor/usr.libexec.virt-aa-helper.in
index dd18c8a..d06f9cb 100644
--- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
+++ b/src/security/apparmor/usr.libexec.virt-aa-helper.in
@@ -69,5 +69,5 @@ profile virt-aa-helper @libexecdir@/virt-aa-helper {
/**.[iI][sS][oO] r,
/**/disk{,.*} r,
- #include <local/usr.lib.libvirt.virt-aa-helper>
+ #include <local/usr.libexec.virt-aa-helper>
}

344
app-emulation/libvirt/libvirt-6.7.0.ebuild

@ -0,0 +1,344 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{7,8,9} )
inherit meson bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
if [[ ${PV} = *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
SRC_URI=""
SLOT="0"
else
SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
SLOT="0/${PV}"
fi
DESCRIPTION="C toolkit to manipulate virtual machines"
HOMEPAGE="https://www.libvirt.org/"
LICENSE="LGPL-2.1"
IUSE="
apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi
iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz
parted pcap policykit +qemu rbd sasl selinux +udev +vepa
virtualbox virt-network wireshark-plugins xen zfs
"
REQUIRED_USE="
firewalld? ( virt-network )
libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
lxc? ( caps libvirtd )
openvz? ( libvirtd )
policykit? ( dbus )
qemu? ( libvirtd )
vepa? ( macvtap )
virt-network? ( libvirtd )
virtualbox? ( libvirtd )
xen? ( libvirtd )"
BDEPEND="
acct-user/qemu
policykit? ( acct-group/libvirt )
app-text/xhtml1
dev-lang/perl
dev-libs/libxslt
dev-perl/XML-XPath
dev-python/docutils
virtual/pkgconfig"
# gettext.sh command is used by the libvirt command wrappers, and it's
# non-optional, so put it into RDEPEND.
# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
# package will use 3 by default. Since we don't have slot pinning in an API,
# we must go with the most recent
RDEPEND="
app-misc/scrub
>=dev-libs/glib-2.48.0
dev-libs/libgcrypt:0
dev-libs/libnl:3
>=dev-libs/libxml2-2.7.6
>=net-analyzer/openbsd-netcat-1.105-r1
>=net-libs/gnutls-1.0.25:0=
net-libs/libssh2
net-libs/libtirpc
net-libs/rpcsvc-proto
>=net-misc/curl-7.18.0
sys-apps/dmidecode
sys-devel/gettext
sys-libs/ncurses:0=
sys-libs/readline:=
apparmor? ( sys-libs/libapparmor )
audit? ( sys-process/audit )
caps? ( sys-libs/libcap-ng )
dbus? ( sys-apps/dbus )
dtrace? ( dev-util/systemtap )
firewalld? ( >=net-firewall/firewalld-0.6.3 )
fuse? ( sys-fs/fuse:0= )
glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
iscsi? ( sys-block/open-iscsi )
iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
libssh? ( net-libs/libssh )
lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
nfs? ( net-fs/nfs-utils )
numa? (
>sys-process/numactl-2.0.2
sys-process/numad
)
parted? (
>=sys-block/parted-1.8[device-mapper]
sys-fs/lvm2[-device-mapper-only(-)]
)
pcap? ( >=net-libs/libpcap-1.0.0 )
policykit? ( >=sys-auth/polkit-0.9 )
qemu? (
>=app-emulation/qemu-1.5.0
dev-libs/yajl
)
rbd? ( sys-cluster/ceph )
sasl? ( dev-libs/cyrus-sasl )
selinux? ( >=sys-libs/libselinux-2.0.85 )
virt-network? (
net-dns/dnsmasq[script]
net-firewall/ebtables
>=net-firewall/iptables-1.4.10[ipv6]
net-misc/radvd
sys-apps/iproute2[-minimal]
)
wireshark-plugins? ( net-analyzer/wireshark:= )
xen? (
>=app-emulation/xen-4.6.0
app-emulation/xen-tools:=
)
udev? (
virtual/libudev
>=x11-libs/libpciaccess-0.10.9
)
zfs? ( sys-fs/zfs )"
DEPEND="${BDEPEND}
${RDEPEND}
${PYTHON_DEPS}"
PATCHES=(
"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
"${FILESDIR}"/${PN}-6.7.0-do-not-use-sysconfig.patch
"${FILESDIR}"/${PN}-6.7.0-doc-path.patch
"${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch
)
pkg_setup() {
# Check kernel configuration:
CONFIG_CHECK=""
use fuse && CONFIG_CHECK+="
~FUSE_FS"
use lvm && CONFIG_CHECK+="
~BLK_DEV_DM
~DM_MULTIPATH
~DM_SNAPSHOT"
use lxc && CONFIG_CHECK+="
~BLK_CGROUP
~CGROUP_CPUACCT
~CGROUP_DEVICE
~CGROUP_FREEZER
~CGROUP_NET_PRIO
~CGROUP_PERF
~CGROUPS
~CGROUP_SCHED
~CPUSETS
~IPC_NS
~MACVLAN
~NAMESPACES
~NET_CLS_CGROUP
~NET_NS
~PID_NS
~POSIX_MQUEUE
~SECURITYFS
~USER_NS
~UTS_NS
~VETH
~!GRKERNSEC_CHROOT_MOUNT
~!GRKERNSEC_CHROOT_DOUBLE
~!GRKERNSEC_CHROOT_PIVOT
~!GRKERNSEC_CHROOT_CHMOD
~!GRKERNSEC_CHROOT_CAPS"
kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
~DEVPTS_MULTIPLE_INSTANCES"
use macvtap && CONFIG_CHECK+="
~MACVTAP"
use virt-network && CONFIG_CHECK+="
~BRIDGE_EBT_MARK_T
~BRIDGE_NF_EBTABLES
~NETFILTER_ADVANCED
~NETFILTER_XT_CONNMARK
~NETFILTER_XT_MARK
~NETFILTER_XT_TARGET_CHECKSUM
~IP_NF_FILTER
~IP_NF_MANGLE
~IP_NF_NAT
~IP_NF_TARGET_MASQUERADE
~IP6_NF_FILTER
~IP6_NF_MANGLE
~IP6_NF_NAT"
# Bandwidth Limiting Support
use virt-network && CONFIG_CHECK+="
~BRIDGE_EBT_T_NAT
~IP_NF_TARGET_REJECT
~NET_ACT_POLICE
~NET_CLS_FW
~NET_CLS_U32
~NET_SCH_HTB
~NET_SCH_INGRESS
~NET_SCH_SFQ"
# Handle specific kernel versions for different features
kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
if kernel_is ge 3 6; then
CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
fi
ERROR_USER_NS="Optional depending on LXC configuration."
if [[ -n ${CONFIG_CHECK} ]]; then
linux-info_pkg_setup
fi
}
src_prepare() {
touch "${S}/.mailmap" || die
default
# Tweak the init script:
cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-i "${S}/libvirtd.init" || die "sed failed"
}
src_configure() {
local emesonargs=(
$(meson_feature apparmor)
$(meson_use apparmor apparmor_profiles)
$(meson_feature audit)
$(meson_feature caps capng)
$(meson_feature dbus)
$(meson_feature dtrace)
$(meson_feature firewalld)
$(meson_feature fuse)
$(meson_feature glusterfs)
$(meson_feature glusterfs storage_gluster)
$(meson_feature iscsi storage_iscsi)
$(meson_feature iscsi-direct storage_iscsi_direct)
$(meson_feature libvirtd driver_libvirtd)
$(meson_feature libssh)
$(meson_feature lvm storage_lvm)
$(meson_feature lvm storage_mpath)
$(meson_feature lxc driver_lxc)
$(meson_feature macvtap)
$(meson_feature nls)
$(meson_feature numa numactl)
$(meson_feature numa numad)
$(meson_feature openvz driver_openvz)
$(meson_feature parted storage_disk)
$(meson_feature pcap libpcap)
$(meson_feature policykit polkit)
$(meson_feature qemu driver_qemu)
$(meson_feature qemu yajl)
$(meson_feature rbd storage_rbd)
$(meson_feature sasl)
$(meson_feature selinux)
$(meson_feature udev)
$(meson_feature vepa virtualport)
$(meson_feature virt-network driver_network)
$(meson_feature virtualbox driver_vbox)
$(meson_feature wireshark-plugins wireshark_dissector)
$(meson_feature xen driver_libxl)
$(meson_feature zfs storage_zfs)
-Dhal=disabled
-Dnetcf=disabled
-Dsanlock=disabled
-Ddriver_esx=enabled
-Dinit_script=systemd
-Dqemu_user=$(usex caps qemu root)
-Dqemu_group=$(usex caps qemu root)
-Ddriver_remote=enabled
-Dstorage_fs=enabled
-Ddriver_vmware=enabled
--localstatedir="${EPREFIX}/var"
-Drunstatedir="${EPREFIX}/run"
)
meson_src_configure
}
src_test() {
# remove problematic tests, bug #591416, bug #591418
sed -i -e 's#commandtest$(EXEEXT) # #' \
-e 's#virfirewalltest$(EXEEXT) # #' \
-e 's#nwfilterebiptablestest$(EXEEXT) # #' \
-e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
tests/Makefile
export VIR_TEST_DEBUG=1
meson_src_test
}
src_install() {
meson_src_install
# Remove bogus, empty directories. They are either not used, or
# libvirtd is able to create them on demand
rm -rf "${D}"/etc/sysconfig || die
rm -rf "${D}"/var || die
rm -rf "${D}"/run || die
newbashcomp "${S}/tools/bash-completion/vsh" virsh
bashcomp_alias virsh virt-admin
use libvirtd || return 0
# From here, only libvirtd-related instructions, be warned!
systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
newinitd "${S}/libvirtd.init" libvirtd
newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
DISABLE_AUTOFORMATTING=true
readme.gentoo_create_doc
}
pkg_preinst() {
# we only ever want to generate this once
if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml || die
fi
}
pkg_postinst() {
if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
fi
use libvirtd || return 0
# From here, only libvirtd-related instructions, be warned!
readme.gentoo_print_elog
}

344
app-emulation/libvirt/libvirt-6.8.0.ebuild

@ -0,0 +1,344 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{7,8,9} )
inherit meson bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
if [[ ${PV} = *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
SRC_URI=""
SLOT="0"
else
SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
SLOT="0/${PV}"
fi
DESCRIPTION="C toolkit to manipulate virtual machines"
HOMEPAGE="https://www.libvirt.org/"
LICENSE="LGPL-2.1"
IUSE="
apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi
iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz
parted pcap policykit +qemu rbd sasl selinux +udev +vepa
virtualbox virt-network wireshark-plugins xen zfs
"
REQUIRED_USE="
firewalld? ( virt-network )
libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
lxc? ( caps libvirtd )
openvz? ( libvirtd )
policykit? ( dbus )
qemu? ( libvirtd )
vepa? ( macvtap )
virt-network? ( libvirtd )
virtualbox? ( libvirtd )
xen? ( libvirtd )"
BDEPEND="
acct-user/qemu
policykit? ( acct-group/libvirt )
app-text/xhtml1
dev-lang/perl
dev-libs/libxslt
dev-perl/XML-XPath
dev-python/docutils
virtual/pkgconfig"
# gettext.sh command is used by the libvirt command wrappers, and it's
# non-optional, so put it into RDEPEND.
# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
# package will use 3 by default. Since we don't have slot pinning in an API,
# we must go with the most recent
RDEPEND="
app-misc/scrub
>=dev-libs/glib-2.48.0
dev-libs/libgcrypt:0
dev-libs/libnl:3
>=dev-libs/libxml2-2.7.6
>=net-analyzer/openbsd-netcat-1.105-r1
>=net-libs/gnutls-1.0.25:0=
net-libs/libssh2
net-libs/libtirpc
net-libs/rpcsvc-proto
>=net-misc/curl-7.18.0
sys-apps/dmidecode
sys-devel/gettext
sys-libs/ncurses:0=
sys-libs/readline:=
apparmor? ( sys-libs/libapparmor )
audit? ( sys-process/audit )
caps? ( sys-libs/libcap-ng )
dbus? ( sys-apps/dbus )
dtrace? ( dev-util/systemtap )
firewalld? ( >=net-firewall/firewalld-0.6.3 )
fuse? ( sys-fs/fuse:0= )
glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
iscsi? ( sys-block/open-iscsi )
iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
libssh? ( net-libs/libssh )
lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
nfs? ( net-fs/nfs-utils )
numa? (
>sys-process/numactl-2.0.2
sys-process/numad
)
parted? (
>=sys-block/parted-1.8[device-mapper]
sys-fs/lvm2[-device-mapper-only(-)]
)
pcap? ( >=net-libs/libpcap-1.0.0 )
policykit? ( >=sys-auth/polkit-0.9 )
qemu? (
>=app-emulation/qemu-1.5.0
dev-libs/yajl
)
rbd? ( sys-cluster/ceph )
sasl? ( dev-libs/cyrus-sasl )
selinux? ( >=sys-libs/libselinux-2.0.85 )
virt-network? (
net-dns/dnsmasq[script]
net-firewall/ebtables
>=net-firewall/iptables-1.4.10[ipv6]
net-misc/radvd
sys-apps/iproute2[-minimal]
)
wireshark-plugins? ( net-analyzer/wireshark:= )
xen? (
>=app-emulation/xen-4.6.0
app-emulation/xen-tools:=
)
udev? (
virtual/libudev
>=x11-libs/libpciaccess-0.10.9
)
zfs? ( sys-fs/zfs )"
DEPEND="${BDEPEND}
${RDEPEND}
${PYTHON_DEPS}"
PATCHES=(
"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
"${FILESDIR}"/${PN}-6.7.0-do-not-use-sysconfig.patch
"${FILESDIR}"/${PN}-6.7.0-doc-path.patch
"${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch
)
pkg_setup() {
# Check kernel configuration:
CONFIG_CHECK=""
use fuse && CONFIG_CHECK+="
~FUSE_FS"
use lvm && CONFIG_CHECK+="
~BLK_DEV_DM
~DM_MULTIPATH
~DM_SNAPSHOT"
use lxc && CONFIG_CHECK+="
~BLK_CGROUP
~CGROUP_CPUACCT
~CGROUP_DEVICE
~CGROUP_FREEZER
~CGROUP_NET_PRIO
~CGROUP_PERF
~CGROUPS
~CGROUP_SCHED
~CPUSETS
~IPC_NS
~MACVLAN
~NAMESPACES
~NET_CLS_CGROUP
~NET_NS
~PID_NS
~POSIX_MQUEUE
~SECURITYFS
~USER_NS
~UTS_NS
~VETH
~!GRKERNSEC_CHROOT_MOUNT
~!GRKERNSEC_CHROOT_DOUBLE
~!GRKERNSEC_CHROOT_PIVOT
~!GRKERNSEC_CHROOT_CHMOD
~!GRKERNSEC_CHROOT_CAPS"
kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
~DEVPTS_MULTIPLE_INSTANCES"
use macvtap && CONFIG_CHECK+="
~MACVTAP"
use virt-network && CONFIG_CHECK+="
~BRIDGE_EBT_MARK_T
~BRIDGE_NF_EBTABLES
~NETFILTER_ADVANCED
~NETFILTER_XT_CONNMARK
~NETFILTER_XT_MARK
~NETFILTER_XT_TARGET_CHECKSUM
~IP_NF_FILTER
~IP_NF_MANGLE
~IP_NF_NAT
~IP_NF_TARGET_MASQUERADE
~IP6_NF_FILTER
~IP6_NF_MANGLE
~IP6_NF_NAT"
# Bandwidth Limiting Support
use virt-network && CONFIG_CHECK+="
~BRIDGE_EBT_T_NAT
~IP_NF_TARGET_REJECT