root
4 years ago
parent
96762df714
commit
277ca29042
@ -1,23 +1,23 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA512
|
||||
|
||||
MANIFEST Manifest.files.gz 29471 BLAKE2B 97b417b5fc32b94fac9244b3dc1a2b0db9d6cec28c907a13b8c5560e894ddb1e49964286a974c4172eb534485f7c4542cc1e76448aa03a0ec95c82d235bc9ada SHA512 2b0485bcce0a6cc8c26dfcc601032aeb35966779042694e57c2c7a9ba6cf685e19a0a3424306340d4475a617db5288b280997df836fb49ff3391d85cd8a748f4
|
||||
TIMESTAMP 2020-04-04T09:38:51Z
|
||||
MANIFEST Manifest.files.gz 29486 BLAKE2B cfb21f9867b2b4cecec408fe460406848f9d2c9069f2690d883e356f15abc8f79e06814a819fa5e24ce18a9c5333d3fb6e8f271f20ebdd89231fbc01170c0a99 SHA512 1463ecc22a04a4e24c6eb899d3392fe569cb3afd58f23d8ec4841ca0d5f1dfda1e15841f4d24c04cb12cb3ba656f32adb15fc018e49c54da33faaf83e69fc74e
|
||||
TIMESTAMP 2020-04-05T19:08:54Z
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl6IVatfFIAAAAAALgAo
|
||||
iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl6KLMZfFIAAAAAALgAo
|
||||
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
|
||||
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
|
||||
klDFFA/+NxoWltaXWX/3qS8R8qROQkahT+fXNXoAZktstjzQlnOMWMcPiHsCL6Hx
|
||||
MwlTV1gbygCMUcv2N1MeQRsbntQCUma6ciFD+InyGfvIwdR9kQUJTWcZDqQKb73j
|
||||
ppcPGGzczsFOG+nHmtylTsT0i51Xu9oaoTXKRUH12OtbZy1VkmsttEmtnKET8tW0
|
||||
O7xGAiH4DRBstb1RjhmGp6bVkqb6pTTwlBfpRIL74iG+KSuSSiVFG+pzVXzL8/M/
|
||||
jvagEiaQjbzYqN30rIw9OvFbsApg5l83TSUpuVjRve0hwk4lDxwwtsCRTA6oz2GZ
|
||||
rkzfdahMeYv06AKABLU8GXYYAUwx2DXCZKpZFL0G6iYH+895XUVu+aWedQN6Y9Y5
|
||||
E3ftBK4jA9ZJc3tt/zi8PoU6GfD0jsUByKw3HhahU5oklTXHdMMRwx64xgFU8Y5E
|
||||
VYFaSjHJtY/5I0eMixQ0jWRS76QlfDJSShaopwPa6SGmQGsYigvGGZbgeWaeii/X
|
||||
Uqpj0wptFzXP7wMxYUhASk+ltAzYlzY3f2RtBc5E3Ge01shJYORv6CckZIDz0hHo
|
||||
EbFT8w/Jtk6at9DQUri0vY8BbrviMgDFM6mk/4MI4YsDdPDhJguYmg5qBtwbzOWd
|
||||
KQzRw9Z1vl3+nsZYkifkGuAL9+1MGVHKvE7XksBD2poRGK+jvjs=
|
||||
=2boA
|
||||
klDH5g/+IMjYIJ89Aee4akuO3h1TGi8BvMSPxdMJJG4itaZEqmSI/ILJ52dqqNFx
|
||||
wj2v/FgkdNhy/biokNsgkI8PlCNOCGsv89wPgiaoZtJmM1dQ7l8PI0DCTNnLG6Lp
|
||||
bBVwLJo/R+DRSe79yFrdLkBfN26o3oLpkZXsL760DIt18mDSom86/5VZvu77dyAZ
|
||||
tw1MzcESJ8hX35lTeMqk98wFmw+7hLxOP91AkJxckV2roeBYFvV2ScPb0ms95PPX
|
||||
WriqgLa/xsThY+6k8rz0Dr65jtWIfj25fuv5aozhHAMKVj6dbBRSo6e9OWS50oFh
|
||||
iWpRxtCR/35K6+hKUxgP259EcOtBZBojrUYPMHxOC7VeLNC6qwPjY6bCnI3hVX/6
|
||||
nnSWd2ikozS07uOPZ7uPguULsAMLP5nZeb7neLhb68vnxZ87Qbfdg/0+3IfRHnKo
|
||||
uZ/r7r9nNCLTK2J7L4La8v+xi1IIrjsZu9hDWUujNLJ8DSkbfxlwXTGMHlYb5n0D
|
||||
FO2L4RysJdhfiqUX9+kh64LBQQdAX7lXv76FeQ/tngXk3SlXERMVmMRiNk/VU9s1
|
||||
2SKZQmNHq0WxHpZ1K8xVa6WSqlOyeDfjghn8E7lKcyhlIsoWUPWcgAg3OW640hP3
|
||||
KwDA+389TH2SnQ/2vnZgbvK8E2DJNAAB/GArAlEyrly50FAWbFs=
|
||||
=wiQ0
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -1,3 +1,3 @@
|
||||
DIST emacs-updater-1.16.tar.xz 7112 BLAKE2B 82160ef71b4c22a385a45765c1f60b7d428297cfb3b51f84bd44b176d1bd302165f9ccdde803aae628a2dab9e0520098082232c513b2006ae5facfa283f287ab SHA512 3de3126debc49ea47bd57802c1a3aa82a0769ab392741fb891c93ffb66141f05f58025fa0de746ec78795fc34c135536740e447e1f6a4ae59aa847d21bd6215b
|
||||
EBUILD emacs-updater-1.16.ebuild 951 BLAKE2B b9612348a4b0c1a6c75274add3410babe30aa1671fd1879c05c79945ace1b159921910aebd0d4aba1ac38ab36086b42e837305f00ec623c1869d157bf281d323 SHA512 aed1c807642438a5d3f1244588502624379fa6dca7533c094562de2221813801ecf88f64158db8e0f0d90a4124ea17949f85beea6a1434ab217c2478ef752fb2
|
||||
EBUILD emacs-updater-1.16.ebuild 952 BLAKE2B dda69320623c22c46cd1d746a9513280a35798b16793e6e274e60c41ed6ae68d2e80972109568440a5369deb50da2d7715a30a34a5bc697a7bfb5299a4c721f7 SHA512 16cf55dc73c5b8eea8d3a6cae3e5f918304387c85e29a3269a40ae56cb52faf13bdc89c16f2bfbfe26b08bf0ab34f9e3719187adb34d355e5064a29ed1bc4431
|
||||
MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
AUX glance.initd 375 BLAKE2B 3d061f0357b8782e6abb0e2f6c779d8901fc7211238b877f3078cea66bc6086e80a530729b6484f110c02e23375fddde7f0ddfd22a6451ef84d9ec3caaa9d6cc SHA512 c6c433334bb337c708e31fac7869bf29e89516b857800d7cb77d264766483f54976dda6d83460078eed0dee14f0770a31adce344ec7fca04c2040b21dcf239b5
|
||||
DIST glance-19.0.1.tar.gz 1943385 BLAKE2B 5e2530a05a171f640499a3e595ad15be29e95a10e6f22a186514cc73c4fc77d0ae5bf00a3d43616e8cb53ccde748a6560dd448db631c86343b2667c0dc6719a1 SHA512 b672d84d709149191103ed54cca91d604b43460b1bd6ab56263c1b8c382d1c4261ebfd58ca9e233ee50b248327bcbfd7bfd47fee57c8c08a9635b2ca0c0cffe4
|
||||
DIST glance-19.0.2.tar.gz 1943984 BLAKE2B 2fc0d30a11a056b02471e1d038f85b327632b02b7ee177fc4b44e571be9713905cd5bfc6c3d8103edb7a04bf5c51dcc1edc31ce81f25951df84236ad5a6898c6 SHA512 cd0e88f8bba81536eb95f49d1e3f029d8951b2c81208fcd6c32dc877ce51df6026521a6829705e97c8aacd2bc6e4f5eddeae98dfea0c41e00c7f6757dbcfbfa2
|
||||
EBUILD glance-19.0.1.ebuild 5124 BLAKE2B b7da40b1feaf8d6f81ab1a605953b2b96554f37fc7caa45c3570d7670c4011fdc7f6c8508ee49029c587760c23318e2442d4e09d04253081e3e0d033f7a38577 SHA512 0d7e92e19eeb2bd079e7c9542e3c4d1e8ae4dfd3a552e03795bdd4bdf9d1e50ab44920bbff8f1396272d0eafc03d556cfd6c580539a92b94de8e2ae4047081d8
|
||||
EBUILD glance-19.0.2.ebuild 5126 BLAKE2B 458afeb68f845e09b6f5760f61cab9f183b3884bec4cbdcefd929d4e531a40de77a99c60ba647843597af6e3ba2639eb576ae1991a57275b6d78f19619855cd0 SHA512 54b5b077ceaf19c81c3fef14bef15f24cc97d93e3a176febd81879ad5e1fa279ac3f8b1f2a286b2cfd70c1926c17e5ef0845a8fe05933c3df3acb4bf435589c8
|
||||
EBUILD glance-19.0.2.ebuild 5124 BLAKE2B b7da40b1feaf8d6f81ab1a605953b2b96554f37fc7caa45c3570d7670c4011fdc7f6c8508ee49029c587760c23318e2442d4e09d04253081e3e0d033f7a38577 SHA512 0d7e92e19eeb2bd079e7c9542e3c4d1e8ae4dfd3a552e03795bdd4bdf9d1e50ab44920bbff8f1396272d0eafc03d556cfd6c580539a92b94de8e2ae4047081d8
|
||||
EBUILD glance-2019.2.9999.ebuild 5126 BLAKE2B 458afeb68f845e09b6f5760f61cab9f183b3884bec4cbdcefd929d4e531a40de77a99c60ba647843597af6e3ba2639eb576ae1991a57275b6d78f19619855cd0 SHA512 54b5b077ceaf19c81c3fef14bef15f24cc97d93e3a176febd81879ad5e1fa279ac3f8b1f2a286b2cfd70c1926c17e5ef0845a8fe05933c3df3acb4bf435589c8
|
||||
MISC metadata.xml 786 BLAKE2B 2d0d8d4d270200eafcb2570528bfc0fb0f3932295550186f9cf930c05d7ade06faf004d159047fe347716249166cf9f595c2512cea86aa86fc2c604582380106 SHA512 eed1ca2a7e15b1844de0a3a35453ab5890622cf161407df5ccb9d21ab2634691c94237496ddc8ab02881a687e16f8378f37817b20705112e11ee55d2a813f99a
|
||||
|
||||
@ -1,144 +0,0 @@
|
||||
# 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
|
||||
|
||||
DESCRIPTION="Services for discovering, registering, and retrieving VM images"
|
||||
HOMEPAGE="https://launchpad.net/glance"
|
||||
|
||||
if [[ ${PV} == *9999 ]];then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/openstack/glance.git"
|
||||
EGIT_BRANCH="stable/train"
|
||||
else
|
||||
SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
|
||||
KEYWORDS="amd64 ~arm64 x86"
|
||||
fi
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE="doc mysql postgres +sqlite +swift"
|
||||
REQUIRED_USE="|| ( mysql postgres sqlite )"
|
||||
|
||||
CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
|
||||
!~dev-python/pbr-2.1.0"
|
||||
DEPEND="
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
${CDEPEND}"
|
||||
|
||||
#note to self, wsgiref is a python builtin, no need to package it
|
||||
#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
|
||||
|
||||
RDEPEND="
|
||||
${CDEPEND}
|
||||
>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
|
||||
sqlite? (
|
||||
>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
|
||||
!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
|
||||
!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
|
||||
!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
|
||||
!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
|
||||
)
|
||||
mysql? (
|
||||
>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
|
||||
!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
|
||||
>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
|
||||
!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
|
||||
!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
|
||||
!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
|
||||
!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
|
||||
)
|
||||
postgres? (
|
||||
>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
|
||||
!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
|
||||
!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
|
||||
!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
|
||||
!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
|
||||
)
|
||||
>=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}]
|
||||
!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
|
||||
!~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/webob-1.8.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]
|
||||
>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
|
||||
>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
|
||||
>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
|
||||
<dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
|
||||
>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
|
||||
>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
|
||||
!~dev-python/oslo-messaging-9.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
|
||||
!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/glance_store-1.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
|
||||
>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/castellan-0.17.0[${PYTHON_USEDEP}]
|
||||
acct-user/glance
|
||||
acct-group/glance
|
||||
"
|
||||
|
||||
python_prepare_all() {
|
||||
sed -i '/xattr/d' test-requirements.txt || die
|
||||
sed -i '/pysendfile/d' test-requirements.txt || die
|
||||
sed -i '/^hacking/d' test-requirements.txt || die
|
||||
distutils-r1_python_prepare_all
|
||||
}
|
||||
|
||||
python_compile_all() {
|
||||
if [ ! -z ${EGIT_BRANCH+x} ]; then
|
||||
use doc && "${PYTHON}" setup.py build_sphinx
|
||||
fi
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
distutils-r1_python_install_all
|
||||
|
||||
newinitd "${FILESDIR}/glance.initd" glance-api
|
||||
|
||||
diropts -m 0750 -o glance -g glance
|
||||
dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
|
||||
keepdir /etc/glance
|
||||
keepdir /var/log/glance
|
||||
keepdir /var/lib/glance/images
|
||||
keepdir /var/lib/glance/scrubber
|
||||
|
||||
insinto /etc/glance
|
||||
insopts -m 0640 -o glance -g glance
|
||||
doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
|
||||
|
||||
use doc && local HTML_DOCS=( doc/build/html/. )
|
||||
distutils-r1_python_install_all
|
||||
rm -r "${ED}"/usr/etc
|
||||
}
|
||||
@ -0,0 +1,273 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
EAPI=7
|
||||
|
||||
inherit go-module
|
||||
EGIT_COMMIT=a33283598c4b7a70fc2f113680318f29d5826cca
|
||||
|
||||
DESCRIPTION="A tool for extracting metrics from application logs"
|
||||
HOMEPAGE="https://github.com/google/mtail"
|
||||
|
||||
EGO_SUM=(
|
||||
"cloud.google.com/go v0.26.0/go.mod"
|
||||
"cloud.google.com/go v0.34.0/go.mod"
|
||||
"cloud.google.com/go v0.38.0/go.mod"
|
||||
"contrib.go.opencensus.io/exporter/jaeger v0.2.0"
|
||||
"contrib.go.opencensus.io/exporter/jaeger v0.2.0/go.mod"
|
||||
"github.com/BurntSushi/toml v0.3.1/go.mod"
|
||||
"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
|
||||
"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
|
||||
"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
|
||||
"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
|
||||
"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
|
||||
"github.com/beorn7/perks v1.0.0"
|
||||
"github.com/beorn7/perks v1.0.0/go.mod"
|
||||
"github.com/beorn7/perks v1.0.1"
|
||||
"github.com/beorn7/perks v1.0.1/go.mod"
|
||||
"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
|
||||
"github.com/cespare/xxhash/v2 v2.1.1"
|
||||
"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
|
||||
"github.com/client9/misspell v0.3.4/go.mod"
|
||||
"github.com/davecgh/go-spew v1.1.0/go.mod"
|
||||
"github.com/davecgh/go-spew v1.1.1/go.mod"
|
||||
"github.com/dvyukov/go-fuzz v0.0.0-20191206100749-a378175e205c"
|
||||
"github.com/dvyukov/go-fuzz v0.0.0-20191206100749-a378175e205c/go.mod"
|
||||
"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
|
||||
"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
|
||||
"github.com/flazz/togo v0.0.0-20170320145504-babdbf21cff0"
|
||||
"github.com/flazz/togo v0.0.0-20170320145504-babdbf21cff0/go.mod"
|
||||
"github.com/fsnotify/fsnotify v1.4.7"
|
||||
"github.com/fsnotify/fsnotify v1.4.7/go.mod"
|
||||
"github.com/go-kit/kit v0.8.0/go.mod"
|
||||
"github.com/go-kit/kit v0.9.0/go.mod"
|
||||
"github.com/go-logfmt/logfmt v0.3.0/go.mod"
|
||||
"github.com/go-logfmt/logfmt v0.4.0/go.mod"
|
||||
"github.com/go-stack/stack v1.8.0/go.mod"
|
||||
"github.com/gogo/protobuf v1.1.1/go.mod"
|
||||
"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
|
||||
"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
|
||||
"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6"
|
||||
"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
|
||||
"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7"
|
||||
"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
|
||||
"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e"
|
||||
"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
|
||||
"github.com/golang/mock v1.1.1/go.mod"
|
||||
"github.com/golang/mock v1.2.0/go.mod"
|
||||
"github.com/golang/protobuf v1.2.0/go.mod"
|
||||
"github.com/golang/protobuf v1.3.1"
|
||||
"github.com/golang/protobuf v1.3.1/go.mod"
|
||||
"github.com/golang/protobuf v1.3.2"
|
||||
"github.com/golang/protobuf v1.3.2/go.mod"
|
||||
"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
|
||||
"github.com/google/go-cmp v0.2.0/go.mod"
|
||||
"github.com/google/go-cmp v0.3.0"
|
||||
"github.com/google/go-cmp v0.3.0/go.mod"
|
||||
"github.com/google/go-cmp v0.3.1"
|
||||
"github.com/google/go-cmp v0.3.1/go.mod"
|
||||
"github.com/google/go-cmp v0.4.0"
|
||||
"github.com/google/go-cmp v0.4.0/go.mod"
|
||||
"github.com/google/gofuzz v1.0.0/go.mod"
|
||||
"github.com/google/martian v2.1.0+incompatible/go.mod"
|
||||
"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
|
||||
"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
|
||||
"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
|
||||
"github.com/hashicorp/golang-lru v0.5.0/go.mod"
|
||||
"github.com/hashicorp/golang-lru v0.5.1"
|
||||
"github.com/hashicorp/golang-lru v0.5.1/go.mod"
|
||||
"github.com/json-iterator/go v1.1.6/go.mod"
|
||||
"github.com/json-iterator/go v1.1.8/go.mod"
|
||||
"github.com/json-iterator/go v1.1.9/go.mod"
|
||||
"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
|
||||
"github.com/julienschmidt/httprouter v1.2.0/go.mod"
|
||||
"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
|
||||
"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
|
||||
"github.com/kr/pretty v0.1.0/go.mod"
|
||||
"github.com/kr/pty v1.1.1/go.mod"
|
||||
"github.com/kr/text v0.1.0/go.mod"
|
||||
"github.com/matttproud/golang_protobuf_extensions v1.0.1"
|
||||
"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
|
||||
"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
|
||||
"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
|
||||
"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
|
||||
"github.com/modern-go/reflect2 v1.0.1/go.mod"
|
||||
"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
|
||||
"github.com/pkg/errors v0.8.0/go.mod"
|
||||
"github.com/pkg/errors v0.8.1"
|
||||
"github.com/pkg/errors v0.8.1/go.mod"
|
||||
"github.com/pkg/errors v0.9.1"
|
||||
"github.com/pkg/errors v0.9.1/go.mod"
|
||||
"github.com/pmezard/go-difflib v1.0.0/go.mod"
|
||||
"github.com/prometheus/client_golang v0.9.1/go.mod"
|
||||
"github.com/prometheus/client_golang v1.0.0"
|
||||
"github.com/prometheus/client_golang v1.0.0/go.mod"
|
||||
"github.com/prometheus/client_golang v1.3.0"
|
||||
"github.com/prometheus/client_golang v1.3.0/go.mod"
|
||||
"github.com/prometheus/client_golang v1.4.0"
|
||||
"github.com/prometheus/client_golang v1.4.0/go.mod"
|
||||
"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
|
||||
"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90"
|
||||
"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
|
||||
"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
|
||||
"github.com/prometheus/client_model v0.1.0/go.mod"
|
||||
"github.com/prometheus/client_model v0.2.0"
|
||||
"github.com/prometheus/client_model v0.2.0/go.mod"
|
||||
"github.com/prometheus/common v0.4.1"
|
||||
"github.com/prometheus/common v0.4.1/go.mod"
|
||||
"github.com/prometheus/common v0.7.0"
|
||||
"github.com/prometheus/common v0.7.0/go.mod"
|
||||
"github.com/prometheus/common v0.9.0"
|
||||
"github.com/prometheus/common v0.9.0/go.mod"
|
||||
"github.com/prometheus/common v0.9.1"
|
||||
"github.com/prometheus/common v0.9.1/go.mod"
|
||||
"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
|
||||
"github.com/prometheus/procfs v0.0.2"
|
||||
"github.com/prometheus/procfs v0.0.2/go.mod"
|
||||
"github.com/prometheus/procfs v0.0.8"
|
||||
"github.com/prometheus/procfs v0.0.8/go.mod"
|
||||
"github.com/sirupsen/logrus v1.2.0/go.mod"
|
||||
"github.com/sirupsen/logrus v1.4.2/go.mod"
|
||||
"github.com/stretchr/objx v0.1.0/go.mod"
|
||||
"github.com/stretchr/objx v0.1.1/go.mod"
|
||||
"github.com/stretchr/testify v1.2.2/go.mod"
|
||||
"github.com/stretchr/testify v1.3.0/go.mod"
|
||||
"github.com/stretchr/testify v1.4.0/go.mod"
|
||||
"github.com/uber/jaeger-client-go v2.15.0+incompatible/go.mod"
|
||||
"github.com/uber/jaeger-client-go v2.22.1+incompatible"
|
||||
"github.com/uber/jaeger-client-go v2.22.1+incompatible/go.mod"
|
||||
"go.opencensus.io v0.21.0/go.mod"
|
||||
"go.opencensus.io v0.22.2"
|
||||
"go.opencensus.io v0.22.2/go.mod"
|
||||
"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
|
||||
"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
|
||||
"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
|
||||
"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
|
||||
"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
|
||||
"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
|
||||
"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
|
||||
"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
|
||||
"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
|
||||
"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
|
||||
"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
|
||||
"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
|
||||
"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
|
||||
"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
|
||||
"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
|
||||
"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
|
||||
"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
|
||||
"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
|
||||
"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
|
||||
"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
|
||||
"golang.org/x/net v0.0.0-20191204025024-5ee1b9f4859a"
|
||||
"golang.org/x/net v0.0.0-20191204025024-5ee1b9f4859a/go.mod"
|
||||
"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
|
||||
"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
|
||||
"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
|
||||
"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
|
||||
"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
|
||||
"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
|
||||
"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
|
||||
"golang.org/x/sync v0.0.0-20190423024810-112230192c58"
|
||||
"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
|
||||
"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
|
||||
"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
|
||||
"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
|
||||
"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
|
||||
"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
|
||||
"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
|
||||
"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
|
||||
"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
|
||||
"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd"
|
||||
"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
|
||||
"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
|
||||
"golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod"
|
||||
"golang.org/x/sys v0.0.0-20200117145432-59e60aa80a0c"
|
||||
"golang.org/x/sys v0.0.0-20200117145432-59e60aa80a0c/go.mod"
|
||||
"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82"
|
||||
"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
|
||||
"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9"
|
||||
"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
|
||||
"golang.org/x/text v0.3.0/go.mod"
|
||||
"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
|
||||
"golang.org/x/text v0.3.2"
|
||||
"golang.org/x/text v0.3.2/go.mod"
|
||||
"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
|
||||
"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
|
||||
"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
|
||||
"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
|
||||
"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
|
||||
"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
|
||||
"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
|
||||
"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135"
|
||||
"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
|
||||
"golang.org/x/tools v0.0.0-20200129045341-207d3de1faaf"
|
||||
"golang.org/x/tools v0.0.0-20200129045341-207d3de1faaf/go.mod"
|
||||
"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
|
||||
"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
|
||||
"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
|
||||
"google.golang.org/api v0.4.0/go.mod"
|
||||
"google.golang.org/api v0.15.0"
|
||||
"google.golang.org/api v0.15.0/go.mod"
|
||||
"google.golang.org/appengine v1.1.0/go.mod"
|
||||
"google.golang.org/appengine v1.4.0/go.mod"
|
||||
"google.golang.org/appengine v1.5.0/go.mod"
|
||||
"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
|
||||
"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
|
||||
"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
|
||||
"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb"
|
||||
"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
|
||||
"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
|
||||
"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
|
||||
"google.golang.org/genproto v0.0.0-20200117163144-32f20d992d24"
|
||||
"google.golang.org/genproto v0.0.0-20200117163144-32f20d992d24/go.mod"
|
||||
"google.golang.org/grpc v1.19.0/go.mod"
|
||||
"google.golang.org/grpc v1.20.1"
|
||||
"google.golang.org/grpc v1.20.1/go.mod"
|
||||
"google.golang.org/grpc v1.23.0/go.mod"
|
||||
"google.golang.org/grpc v1.26.0"
|
||||
"google.golang.org/grpc v1.26.0/go.mod"
|
||||
"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
|
||||
"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
|
||||
"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
|
||||
"gopkg.in/yaml.v2 v2.2.1/go.mod"
|
||||
"gopkg.in/yaml.v2 v2.2.2/go.mod"
|
||||
"gopkg.in/yaml.v2 v2.2.4/go.mod"
|
||||
"gopkg.in/yaml.v2 v2.2.5/go.mod"
|
||||
"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
|
||||
"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
|
||||
"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
|
||||
"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
|
||||
)
|
||||
go-module_set_globals
|
||||
SRC_URI="https://github.com/google/mtail/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz
|
||||
${EGO_SUM_SRC_URI}"
|
||||
|
||||
LICENSE="Apache-2.0 MPL-2.0 BSD BSD-2 MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
RDEPEND="!app-misc/mtail"
|
||||
|
||||
S="${WORKDIR}/${PN}-${PV/_/-}"
|
||||
|
||||
RESTRICT+=" test"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
sed \
|
||||
-e '/go get/d' \
|
||||
-e 's|^branch :=.*|branch := master|' \
|
||||
-e "s|^version :=.*|version := v${PV/_/-}|" \
|
||||
-e "s|^revision :=.*|revision := ${EGIT_COMMIT}|" \
|
||||
-e "s|^release :=.*|release := v${PV/_/-}|" \
|
||||
-i Makefile || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin mtail
|
||||
dodoc CONTRIBUTING.md README.md TODO
|
||||
}
|
||||
Binary file not shown.
@ -1,5 +1,5 @@
|
||||
AUX alien-8.95-tar-extensions.patch 733 BLAKE2B 75aa07b9c3b4b3e48d381309caeef41ad312c7d71c81958eb74193752276240dcf6ca91fbf5a4dc6279a35cf6a6c90e77a11ee8ec7f5b087a50bfd6ba089710f SHA512 6bcaea2b8a0dd5bd5a493aaf6f0b19edb691e49fc7684486da2331621619745baeaa30d88889d8aa345f989016a096745b875aca2c01c5b8127e93903f4e8b10
|
||||
DIST alien-8.95.tar.xz 56940 BLAKE2B c2f6b71d39800a7bc4ab00bcd50d165855bad4eb1a17fe217aeb302c6b7af701bcd9445276d7e522db7e6c81f1e8d7e9e2ada99f9d7505e6ec958ae87df7c9f7 SHA512 c46d3c82542dc3d96eeabea0f0c7ab5b572acaf67d15e2064ea01df32d69a2cf6e083754be49269df6cd7431ec5b3e09ddcb83fbe2ee17843b22e9cd3e73073c
|
||||
EBUILD alien-8.95-r1.ebuild 757 BLAKE2B 4405c7b813c6dc61473768888c500c7d6044fd119e4703e2d333f399e8fe404d171365e9020095879365ba26e597379ab8fa0ec579417961d0aa11c4d31f2fd5 SHA512 f6fc5b2d718907090c14de20501414f3e3125b9f62779f29190526222be223deed56443bd0c74c1b12cfff058efa22facf45833fff20c85913ec4c5f29d46c56
|
||||
EBUILD alien-8.95.ebuild 695 BLAKE2B 31ad497d230ccf8dcd4091afa22bd2c92937885a43e03a4566f2e26406bd0a74c7b53e8822e55e123294537b48e95c7128b8b363d8276cc004937bd7b68077a0 SHA512 0495cbf77e0a3cfeb370efe62549552c6d6f8795bb938e52e0b6dda75e1560ce84264d6c04c18c0b61db5741abc5ce0504817c93e26279882ffd4f786561694f
|
||||
EBUILD alien-8.95.ebuild 696 BLAKE2B 1785203f35b867eded394f0d69ca38f2dbb7c567ffed5926b7955346effa7ae98b83104ed22eed28584dbb021a458f88ca0a149aa42c8576dc387f9c4e1743a2 SHA512 12fb32985c5b140412c5d3fedb6ead77df3b56bd53810add90b4dfefefc9c77744335ccd390f7f7e9178ad5cd7e587bf1a38c03e71e4d734dc882aea837ee7b2
|
||||
MISC metadata.xml 299 BLAKE2B f0c85fbabcb5ea8dd194f3560a66469354932c2df8a09aacfa26eb980bf1b301ff1d59e5c5196e4014fc637b7f78361ab031930409509c4529a08e78c8d540b6 SHA512 bdfc3c82d7f1c34ba9ee5c104ce164a73e4dea8d9cbbed424f2f9e6a16da20ccd081d02a39a45000a49d265bbcbd362b34ed91c4688396cf73e423591de2b46b
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
DIST engrampa-1.22.1.tar.xz 1363488 BLAKE2B 0f71e94af50443f9f562b0eed461ca1160fab0a5a3cd02c845fac09ee2466cb8634a458a6a4488ff5ac6674b0f525eccf754b8b1cc7e3f1729d4eb6ac224e025 SHA512 111eeb470555ae8edb7754159bb2e70b03cbbc7b1c9d61c253d9d67e50d84ff0e0654e16547883c39aeeb223e8ba58201d45b50819784fc6cf7a21f0cf176c70
|
||||
DIST engrampa-1.22.2.tar.xz 1379564 BLAKE2B 4193fe3cc06f48e333a37af02ecef9c8e501dabe9a0a43ed07ead543279cc9edb77ea31c4b35490edb8ecaf12fea7f14059ba4ccfc591c1a3727076d9bd5c8bc SHA512 7d57d863a7e6236fdff8c9925647438056474cc7fed32a4ba6a2ba6121a856aa070b47292edb0db447369082cddff9b40978c7c92aecc3d8c2ebc17a4cf3ea99
|
||||
EBUILD engrampa-1.22.1-r1.ebuild 1680 BLAKE2B c4c11eb9ed21b405777c6957200bcf5cd9d1f6bf34f10a9c8133a4c89a7975674bd614f7d2829e180178542ed76cb0428b52907f65265919642ee3de3aa26936 SHA512 16356039e8f8b466896b418b9f804a0984d661bedc4643ab5d021c93783f4b4dca22d9571749165bece0e1a6392e763bca02f3d8d3862f7b16c60bd54cd3ff89
|
||||
EBUILD engrampa-1.22.2.ebuild 1583 BLAKE2B 80be8f6ebd0aa71abbc95bc5dd5238a607f339bb692c8f7a95e3bef49bd05e371388ac58e382e6c33c6211bb05e6463507fd4fb1b8f50e23f7f269db9e91b5c2 SHA512 3d66c296f8db56a9458365a8adec848320e7b62969f38abbd4c734bda473215a2e621549a90a4cfe60328f748fa1ea67c91ef824b4406efd30c353e640279c84
|
||||
MISC metadata.xml 611 BLAKE2B a8d57ae0c1657b6f17d961b3059746d47249007387dbf3d5dc555279e054e91fbff524e8abf17ffa64d788a3bc8b80f0a7e77977e3544bea849b5843e3ec860f SHA512 304268690ba4159d1bd296c24551b527b2ae9bfa9b99531f686e983d4954b9f00f540792d020d1a2fd46ec9c8a330c87e1bf7bf0073ba379ccdf8f36d49b434e
|
||||
|
||||
@ -0,0 +1,64 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
MATE_LA_PUNT="yes"
|
||||
|
||||
inherit eutils mate
|
||||
|
||||
if [[ ${PV} != 9999 ]]; then
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Engrampa archive manager for MATE"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
|
||||
IUSE="caja magic packagekit"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-libs/glib-2.50:2
|
||||
>=dev-libs/json-glib-0.14
|
||||
virtual/libintl
|
||||
x11-libs/gdk-pixbuf:2
|
||||
>=x11-libs/gtk+-3.22:3[X]
|
||||
x11-libs/pango
|
||||
caja? ( >=mate-base/caja-1.17.1 )
|
||||
magic? ( sys-apps/file )
|
||||
packagekit? ( app-admin/packagekit-base )"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
app-text/yelp-tools
|
||||
dev-util/glib-utils
|
||||
>=dev-util/intltool-0.50.1
|
||||
sys-devel/gettext
|
||||
virtual/pkgconfig"
|
||||
|
||||
DISABLE_AUTOFORMATTING="yes"
|
||||
|
||||
src_configure() {
|
||||
mate_src_configure \
|
||||
--disable-run-in-place \
|
||||
$(use_enable caja caja-actions) \
|
||||
$(use_enable magic) \
|
||||
$(use_enable packagekit)
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
mate_pkg_postinst
|
||||
optfeature "Support for 7-zip" app-arch/p7zip
|
||||
optfeature "Support for ace" app-arch/unace
|
||||
optfeature "Support for arj" app-arch/arj
|
||||
optfeature "Support for cpio" app-arch/cpio
|
||||
optfeature "Support for deb" app-arch/dpkg
|
||||
optfeature "Support for iso" app-cdr/cdrtools
|
||||
optfeature "Support for jar,zip" app-arch/zip app-arch/unzip
|
||||
optfeature "Support for lha" app-arch/lha
|
||||
optfeature "Support for lzma" app-arch/xz-utils
|
||||
optfeature "Support for lzop" app-arch/lzop
|
||||
optfeature "Support for rar" app-arch/unrar
|
||||
optfeature "Support for rpm" app-arch/rpm
|
||||
optfeature "Support for unstuff" app-arch/stuffit
|
||||
optfeature "Support for zoo" app-arch/zoo
|
||||
}
|
||||
Binary file not shown.
@ -1,6 +1,4 @@
|
||||
DIST certbot-1.2.0.tar.gz 1354262 BLAKE2B 1abdf4cb99ecdac6b9b8d2ebdd6897a3182a147f0175e2db4c6b0feaa3f6c615ee3146dd63627a83266c223456c5aba44b018be4059574d0209aec89065d9925 SHA512 ed52a31a71b3762b8cd217ea2784d9cb01f7c1a50cef3b7e0d99483ca3ab623b90ab7d4896674e0d1c06e2e8370c02162418d934de7d3048b0471416616146fe
|
||||
DIST certbot-1.3.0.tar.gz 1362945 BLAKE2B bb36a7737275332f018d7f2283286e07e041892cc366f79e68df9eee7e57ca2186d36895d1923b032068a365878d09e49e17c1399a7418dbd8607c9a7efc1c26 SHA512 4205cdd1f3ddf500b9b952744db234636c086a856df80acd2d776305f4501eed07995e453e5c9b2c711fb0d1f1987d2bb8baaa13fccce8e000a38f486cfdc5d3
|
||||
EBUILD acme-1.2.0.ebuild 1744 BLAKE2B 4dc4d69eee70fead7baf6cdc811510fe7b6e5f49deb84b765223555b8a9ac29fdc299c35ab260cd05ce5447b3b6cfe152ef110e2a0c18ebd9c34dd78ad5fce4d SHA512 b69c7b8a952c95415894c299e49c26cbf1a6bb5929f52f10d23f4e297b6cf6a6c7f1427a94834536416518245899d498395574f46b6dd0a015c626d01c75994c
|
||||
EBUILD acme-1.3.0.ebuild 1746 BLAKE2B eb09320774e53a3f6b2b0c9cf229ca86b40f98c1cac803a359d5ba4310556afcc223d54818fac64bb34bddb9033676a5fb6321376874da73e8cf01024a14019f SHA512 c87f8c6be501bde475a17525f6cb5b1f26e627590fc393b06f62ec0d211952f4ab146a66718cb37e4e275d7bbd2fd861eadfae814035b5a2b81b59d8574d1670
|
||||
EBUILD acme-1.3.0.ebuild 1744 BLAKE2B 4dc4d69eee70fead7baf6cdc811510fe7b6e5f49deb84b765223555b8a9ac29fdc299c35ab260cd05ce5447b3b6cfe152ef110e2a0c18ebd9c34dd78ad5fce4d SHA512 b69c7b8a952c95415894c299e49c26cbf1a6bb5929f52f10d23f4e297b6cf6a6c7f1427a94834536416518245899d498395574f46b6dd0a015c626d01c75994c
|
||||
EBUILD acme-9999.ebuild 1746 BLAKE2B eb09320774e53a3f6b2b0c9cf229ca86b40f98c1cac803a359d5ba4310556afcc223d54818fac64bb34bddb9033676a5fb6321376874da73e8cf01024a14019f SHA512 c87f8c6be501bde475a17525f6cb5b1f26e627590fc393b06f62ec0d211952f4ab146a66718cb37e4e275d7bbd2fd861eadfae814035b5a2b81b59d8574d1670
|
||||
MISC metadata.xml 384 BLAKE2B 55780995cb61c11ca859c9f1de17b1c22c9c92902f551ccd1ee6f030df9d513bb5519a2c62bf33bc6a5872790d033ba966e5ed137d84a4f66ab4ba7636a88887 SHA512 cf8393b25aa363bc1db4ebd23274affd1eaf999a4c2ab8d359730f421961dafd5c96fcf14c247f3f5419616116e2351d72fbf0e29301ea44ac522e865c7b0fa1
|
||||
|
||||
@ -1,69 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=(python{3_6,3_7,3_8})
|
||||
|
||||
if [[ ${PV} == 9999* ]]; then
|
||||
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
|
||||
inherit git-r3
|
||||
S=${WORKDIR}/${P}/${PN}
|
||||
else
|
||||
SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
|
||||
KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
|
||||
S=${WORKDIR}/certbot-${PV}/acme
|
||||
fi
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="An implementation of the ACME protocol"
|
||||
HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE="doc test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
|
||||
>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
|
||||
dev-python/mock[${PYTHON_USEDEP}]
|
||||
>=dev-python/pyopenssl-0.13.1[${PYTHON_USEDEP}]
|
||||
dev-python/pyrfc3339[${PYTHON_USEDEP}]
|
||||
dev-python/pytz[${PYTHON_USEDEP}]
|
||||
>=dev-python/requests-2.10[${PYTHON_USEDEP}]
|
||||
>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
|
||||
"
|
||||
DEPEND="
|
||||
doc? (
|
||||
dev-python/sphinx[${PYTHON_USEDEP}]
|
||||
dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
|
||||
)
|
||||
test? (
|
||||
${RDEPEND}
|
||||
dev-python/nose[${PYTHON_USEDEP}]
|
||||
dev-python/pytest[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-xdist[${PYTHON_USEDEP}]
|
||||
)
|
||||
>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
|
||||
"
|
||||
|
||||
src_compile() {
|
||||
python_foreach_impl run_in_build_dir default
|
||||
if use doc ; then
|
||||
cd docs || die
|
||||
sphinx-build -b html -d _build/doctrees . _build/html
|
||||
fi
|
||||
}
|
||||
|
||||
python_test() {
|
||||
nosetests -w ${PN} || die
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
use doc && local HTML_DOCS=( docs/_build/html/. )
|
||||
|
||||
distutils-r1_python_install_all
|
||||
}
|
||||
@ -1,6 +1,4 @@
|
||||
DIST certbot-1.2.0.tar.gz 1354262 BLAKE2B 1abdf4cb99ecdac6b9b8d2ebdd6897a3182a147f0175e2db4c6b0feaa3f6c615ee3146dd63627a83266c223456c5aba44b018be4059574d0209aec89065d9925 SHA512 ed52a31a71b3762b8cd217ea2784d9cb01f7c1a50cef3b7e0d99483ca3ab623b90ab7d4896674e0d1c06e2e8370c02162418d934de7d3048b0471416616146fe
|
||||
DIST certbot-1.3.0.tar.gz 1362945 BLAKE2B bb36a7737275332f018d7f2283286e07e041892cc366f79e68df9eee7e57ca2186d36895d1923b032068a365878d09e49e17c1399a7418dbd8607c9a7efc1c26 SHA512 4205cdd1f3ddf500b9b952744db234636c086a856df80acd2d776305f4501eed07995e453e5c9b2c711fb0d1f1987d2bb8baaa13fccce8e000a38f486cfdc5d3
|
||||
EBUILD certbot-apache-1.2.0.ebuild 1096 BLAKE2B f211cb5ca409a472f7ef37a52ec3691632680140832ebff70265b213888c45c4ba07e8c6e81a4a5ecc8791d185e6ae22c652ee6a8815f62997f11677269b085f SHA512 c9d67683aa5be99edf4e657f75a8de3fe598f11416991cf1006475b9a45033e02f85433c429c5047568d9789c3f6a870ece93ff02a571b2da1d56551d354c076
|
||||
EBUILD certbot-apache-1.3.0.ebuild 1098 BLAKE2B 48134461ad6db972453423f9d57c4d3bbb0c4823015f2ae8f36c2059a75124d105e7fa6594eb7a313e3220f07d0fed8f56cfe99d0a37df64b66e8e14dd3c67ad SHA512 0f276ad597397a20050801349dfd03782ad40a414f13a28070594468484e9761a629a3c8e4889d36a8cf8c58f3b0b2ca61b98761ecf8d2a7b66a80584eb65a73
|
||||
EBUILD certbot-apache-1.3.0.ebuild 1096 BLAKE2B f211cb5ca409a472f7ef37a52ec3691632680140832ebff70265b213888c45c4ba07e8c6e81a4a5ecc8791d185e6ae22c652ee6a8815f62997f11677269b085f SHA512 c9d67683aa5be99edf4e657f75a8de3fe598f11416991cf1006475b9a45033e02f85433c429c5047568d9789c3f6a870ece93ff02a571b2da1d56551d354c076
|
||||
EBUILD certbot-apache-9999.ebuild 1098 BLAKE2B 48134461ad6db972453423f9d57c4d3bbb0c4823015f2ae8f36c2059a75124d105e7fa6594eb7a313e3220f07d0fed8f56cfe99d0a37df64b66e8e14dd3c67ad SHA512 0f276ad597397a20050801349dfd03782ad40a414f13a28070594468484e9761a629a3c8e4889d36a8cf8c58f3b0b2ca61b98761ecf8d2a7b66a80584eb65a73
|
||||
MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=(python{3_6,3_7})
|
||||
|
||||
if [[ ${PV} == 9999* ]]; then
|
||||
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
|
||||
inherit git-r3
|
||||
S=${WORKDIR}/${P}/${PN}
|
||||
else
|
||||
SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
|
||||
KEYWORDS="amd64 ~arm64 x86"
|
||||
S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
|
||||
fi
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
|
||||
HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
|
||||
>=app-crypt/certbot-1.1.0[${PYTHON_USEDEP}]
|
||||
dev-python/mock[${PYTHON_USEDEP}]
|
||||
dev-python/python-augeas[${PYTHON_USEDEP}]
|
||||
dev-python/zope-component[${PYTHON_USEDEP}]
|
||||
dev-python/zope-interface[${PYTHON_USEDEP}]"
|
||||
DEPEND="test? ( ${RDEPEND}
|
||||
dev-python/nose[${PYTHON_USEDEP}] )
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]"
|
||||
|
||||
python_test() {
|
||||
nosetests || die
|
||||
}
|
||||
@ -1,6 +1,4 @@
|
||||
DIST certbot-1.2.0.tar.gz 1354262 BLAKE2B 1abdf4cb99ecdac6b9b8d2ebdd6897a3182a147f0175e2db4c6b0feaa3f6c615ee3146dd63627a83266c223456c5aba44b018be4059574d0209aec89065d9925 SHA512 ed52a31a71b3762b8cd217ea2784d9cb01f7c1a50cef3b7e0d99483ca3ab623b90ab7d4896674e0d1c06e2e8370c02162418d934de7d3048b0471416616146fe
|
||||
DIST certbot-1.3.0.tar.gz 1362945 BLAKE2B bb36a7737275332f018d7f2283286e07e041892cc366f79e68df9eee7e57ca2186d36895d1923b032068a365878d09e49e17c1399a7418dbd8607c9a7efc1c26 SHA512 4205cdd1f3ddf500b9b952744db234636c086a856df80acd2d776305f4501eed07995e453e5c9b2c711fb0d1f1987d2bb8baaa13fccce8e000a38f486cfdc5d3
|
||||
EBUILD certbot-nginx-1.2.0.ebuild 1002 BLAKE2B ce0f437e0c35c4384932b65f1f9bc68a7bb1f10b601941dddd87350d9c8745014cd1cfeb8253c8262fa07fede07a10cb42bb6584363c6a510e023b5cf40253ec SHA512 84cf0ce1e323a9f20a70f147d67465662fdc799df553dd9e74ddb35b8da4d8bf3b3d6179f23964d3145fc8d44804321352b779424b5f15c6e19626129f6a2f97
|
||||
EBUILD certbot-nginx-1.3.0.ebuild 1004 BLAKE2B d9c6cdfb14346b94daab36f639191aeb826d1e550ac22c972d6f7203690a565274992111172c5672f2d695030920e762bca222f7fea1ccfc415a3b8e5c7951a2 SHA512 b728d99c7675bb42c1af6dcd3c88cbca72f7e3a3e4651e916437ec7aaac5fa43b675b47560a04b879c2f454c1e8f11bd2dd436eba1fe6761399c44c9068a0116
|
||||
EBUILD certbot-nginx-1.3.0.ebuild 1002 BLAKE2B ce0f437e0c35c4384932b65f1f9bc68a7bb1f10b601941dddd87350d9c8745014cd1cfeb8253c8262fa07fede07a10cb42bb6584363c6a510e023b5cf40253ec SHA512 84cf0ce1e323a9f20a70f147d67465662fdc799df553dd9e74ddb35b8da4d8bf3b3d6179f23964d3145fc8d44804321352b779424b5f15c6e19626129f6a2f97
|
||||
EBUILD certbot-nginx-9999.ebuild 1004 BLAKE2B d9c6cdfb14346b94daab36f639191aeb826d1e550ac22c972d6f7203690a565274992111172c5672f2d695030920e762bca222f7fea1ccfc415a3b8e5c7951a2 SHA512 b728d99c7675bb42c1af6dcd3c88cbca72f7e3a3e4651e916437ec7aaac5fa43b675b47560a04b879c2f454c1e8f11bd2dd436eba1fe6761399c44c9068a0116
|
||||
MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=(python{3_6,3_7})
|
||||
|
||||
if [[ ${PV} == 9999* ]]; then
|
||||
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
|
||||
inherit git-r3
|
||||
S=${WORKDIR}/${P}/${PN}
|
||||
else
|
||||
SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
|
||||
KEYWORDS="amd64 ~arm ~arm64 x86"
|
||||
S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
|
||||
fi
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
|
||||
HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
|
||||
RDEPEND="${CDEPEND}
|
||||
>=app-crypt/acme-1.0.0[${PYTHON_USEDEP}]
|
||||
>=app-crypt/certbot-1.1.0[${PYTHON_USEDEP}]
|
||||
dev-python/mock[${PYTHON_USEDEP}]
|
||||
dev-python/pyopenssl[${PYTHON_USEDEP}]
|
||||
>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
|
||||
dev-python/zope-interface[${PYTHON_USEDEP}]"
|
||||
DEPEND="${CDEPEND}"
|
||||
@ -1,6 +1,4 @@
|
||||
DIST certbot-1.2.0.tar.gz 1354262 BLAKE2B 1abdf4cb99ecdac6b9b8d2ebdd6897a3182a147f0175e2db4c6b0feaa3f6c615ee3146dd63627a83266c223456c5aba44b018be4059574d0209aec89065d9925 SHA512 ed52a31a71b3762b8cd217ea2784d9cb01f7c1a50cef3b7e0d99483ca3ab623b90ab7d4896674e0d1c06e2e8370c02162418d934de7d3048b0471416616146fe
|
||||
DIST certbot-1.3.0.tar.gz 1362945 BLAKE2B bb36a7737275332f018d7f2283286e07e041892cc366f79e68df9eee7e57ca2186d36895d1923b032068a365878d09e49e17c1399a7418dbd8607c9a7efc1c26 SHA512 4205cdd1f3ddf500b9b952744db234636c086a856df80acd2d776305f4501eed07995e453e5c9b2c711fb0d1f1987d2bb8baaa13fccce8e000a38f486cfdc5d3
|
||||
EBUILD certbot-1.2.0-r1.ebuild 1478 BLAKE2B 88cb65acdf7e41bb4d415a6831a055f61aea97854f34f065b24f417b4fdabb15fa0293aeacf50434d3c56e37391dbe0bca1aaf3e1b68927ba63204508e168bd7 SHA512 2069c1f49f2122736d4c2351f598c5f0682de87430c664fb046292d14fa38be1938abdd47fcdb77c26cf25dab6e91c8f1a7aaacd90547535a7b6044b14752e2d
|
||||
EBUILD certbot-1.3.0.ebuild 1480 BLAKE2B ba986a8752ea1a113425338c76a6c2c2928af3f7b33cbc49cca872bb61b269e541dc01709c0f29b6994760a15eaadff2da97a5d5d128f086af105e1b6c44e93a SHA512 a8039218848544651e80e11215e6f5cfa75ed2f244a9db61108b573a082e499f70cd4f358573f7a4aa423635755338b627ea212d8ef0e9f16338bce5ddf43412
|
||||
EBUILD certbot-1.3.0.ebuild 1478 BLAKE2B 88cb65acdf7e41bb4d415a6831a055f61aea97854f34f065b24f417b4fdabb15fa0293aeacf50434d3c56e37391dbe0bca1aaf3e1b68927ba63204508e168bd7 SHA512 2069c1f49f2122736d4c2351f598c5f0682de87430c664fb046292d14fa38be1938abdd47fcdb77c26cf25dab6e91c8f1a7aaacd90547535a7b6044b14752e2d
|
||||
EBUILD certbot-9999.ebuild 1480 BLAKE2B ba986a8752ea1a113425338c76a6c2c2928af3f7b33cbc49cca872bb61b269e541dc01709c0f29b6994760a15eaadff2da97a5d5d128f086af105e1b6c44e93a SHA512 a8039218848544651e80e11215e6f5cfa75ed2f244a9db61108b573a082e499f70cd4f358573f7a4aa423635755338b627ea212d8ef0e9f16338bce5ddf43412
|
||||
MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
|
||||
|
||||
@ -1,49 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=(python{3_6,3_7})
|
||||
|
||||
if [[ ${PV} == 9999* ]]; then
|
||||
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
|
||||
fi
|
||||
S=${WORKDIR}/${P}/${PN}
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
|
||||
HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
|
||||
RDEPEND="
|
||||
${CDEPEND}
|
||||
>=app-crypt/acme-0.40.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
|
||||
dev-python/configobj[${PYTHON_USEDEP}]
|
||||
>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
|
||||
>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
|
||||
dev-python/mock[${PYTHON_USEDEP}]
|
||||
>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
|
||||
dev-python/pyrfc3339[${PYTHON_USEDEP}]
|
||||
dev-python/pytz[${PYTHON_USEDEP}]
|
||||
dev-python/zope-component[${PYTHON_USEDEP}]
|
||||
dev-python/zope-interface[${PYTHON_USEDEP}]"
|
||||
DEPEND="${CDEPEND}"
|
||||
|
||||
distutils_enable_tests pytest
|
||||
|
||||
python_prepare_all() {
|
||||
# required as deps of deps can trigger this too...
|
||||
echo ' ignore:.*collections\.abc:DeprecationWarning' >> ../pytest.ini
|
||||
distutils-r1_python_prepare_all
|
||||
}
|
||||
@ -0,0 +1,27 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
DESCRIPTION="Small RSA key management package, based on OpenSSL"
|
||||
HOMEPAGE="https://openvpn.net/"
|
||||
SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
|
||||
IUSE="libressl"
|
||||
|
||||
DEPEND="!libressl? ( >=dev-libs/openssl-0.9.6:0= )
|
||||
libressl? ( dev-libs/libressl:0= )"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_install() {
|
||||
exeinto /usr/share/easy-rsa
|
||||
doexe easyrsa3/easyrsa
|
||||
insinto /usr/share/easy-rsa
|
||||
doins -r easyrsa3/{vars.example,openssl-easyrsa.cnf,x509-types}
|
||||
dodoc README.quickstart.md ChangeLog
|
||||
dodoc -r doc
|
||||
doenvd "${FILESDIR}/65easy-rsa" # config-protect easy-rsa
|
||||
}
|
||||
Binary file not shown.
@ -1,3 +1,5 @@
|
||||
DIST cppman-0.4.8.tar.gz 3185978 BLAKE2B 9f662874eb6b6540e02a2b371fa47e53e0893239fbfcc65421fa5c7c4bc5f88c4cfd2facf08deb13606f5cf7c895a1a07e119e1c15bbc98b95af5f8056c6a5e8 SHA512 f5b93774988dad592b31670d6c21718bd034e4e94858982e1756e8db89779d12001fd786ba629211b038b173b7b507382277a3db7fb35363dba28cd029e69a7d
|
||||
EBUILD cppman-0.4.8-r1.ebuild 716 BLAKE2B 75e8f02f0e7588859660263f5964db0631640381452afca349a597413fcd5fa7f9ac48540c56aec9325932b45bb20f782d8739d8a1d3e24caded76af511b2313 SHA512 2e5ff03f14a255ed0a77bb34fade6916e05add25fe494be9854b57e8c938d18dc5be4cab06b5250a5aafad1aa7d754532da35df3f960f326c1635e0a2704c519
|
||||
DIST cppman-0.4.9.tar.gz 3237707 BLAKE2B 23068f8896dd4f9fa3ab86e8e3ddb7de5190af4f59f3cf283537c6ce8c3df60c5deab4972be750464121eeb1ebbde93e30c313869d5fb92e1d784d1294b1d842 SHA512 49957e9c9dcf82a85558d47325912e689ed7786f745015215b32e6f86b97878af6edcb265655674191992ba16171fdbf2220ee43d8c90a0d5eb37f1fb584c3ce
|
||||
EBUILD cppman-0.4.8-r2.ebuild 848 BLAKE2B 0dfc4d1b167e6e1ec3ed91302da8a679949bb2e95559d4e06b0d77c6493b55d2da8c43efbc107f3e0fd13f60bac55babcee8404a25f10cadb48afb2d516ca2ee SHA512 779a152208eecf5d1b372966e1180103d2a292852402be373863715cdf94f73a88521cd9a4ebb2fba3614ac0b7b2eb0412e7202118b5feed07c3e6bf670cef91
|
||||
EBUILD cppman-0.4.9.ebuild 848 BLAKE2B 0dfc4d1b167e6e1ec3ed91302da8a679949bb2e95559d4e06b0d77c6493b55d2da8c43efbc107f3e0fd13f60bac55babcee8404a25f10cadb48afb2d516ca2ee SHA512 779a152208eecf5d1b372966e1180103d2a292852402be373863715cdf94f73a88521cd9a4ebb2fba3614ac0b7b2eb0412e7202118b5feed07c3e6bf670cef91
|
||||
MISC metadata.xml 247 BLAKE2B 8da6363de18a0eb4c29efee8c35de35970668cf0107b011b7e885c8d151b7cbd90709f000548025593f2ed5b4bc2d512de53c0285805fec978b363536ccf1ec4 SHA512 a788f5e022a740fafc174856c3fcda9b4c43908303427ecb48deb2198b5c01f1103bcf4965d950e3f981be4036173f9e968e431c49d3df96061f24cdc202edbc
|
||||
|
||||
@ -0,0 +1,35 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{6,7,8} )
|
||||
PYTHON_REQ_USE="sqlite,threads(+)"
|
||||
|
||||
DISTUTILS_SINGLE_IMPL=true
|
||||
DISTUTILS_USE_SETUPTOOLS=no
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="C++ man pages for Linux, with source from cplusplus.com and cppreference.com"
|
||||
HOMEPAGE="https://github.com/aitjcize/cppman"
|
||||
SRC_URI="https://github.com/aitjcize/cppman/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
|
||||
|
||||
RDEPEND="
|
||||
sys-apps/groff
|
||||
$(python_gen_cond_dep '
|
||||
dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
|
||||
dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
|
||||
')
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# Don't allow setup.py to install documentation directly
|
||||
sed -i '\:share/doc/cppman:d' setup.py || die "sed failed"
|
||||
}
|
||||
Binary file not shown.
@ -1,7 +1,10 @@
|
||||
AUX gvim-completion 1219 BLAKE2B 8a8d8ac5b42be0103da00ecda3445f24993df0b2762310dcc1a9e1cf892048b57c02b7da2ea19d900c40b782cabeda4c6f7b79b9b7b44b6fb7ad7ae723b46f88 SHA512 08bb32a3c9fcbdd00977b7343dda9cda44b389a13b1717ebddb462e22b6cf9d4db37d5b49ff752b931e305bf57e8f9f4a7d6e32ea25f8acd1b00e5f8320ac132
|
||||
AUX gvimrc-r1 990 BLAKE2B 5fc0b805458aff22485e3e180ca8c32a62f2cfe49572edffa5725d2cfc4ed9a7bded20c1a5cd1f19f41e0849e3ca08be4798ff23edd66a92bcbb31aee16c433a SHA512 f6538550f1ecadcccf74a6bbd5a6a0b71d18a234a854d1a0179144125555c42280000df9523e7c3d5a8b449f421af7bafcca1034951f085279cee0dd1160808a
|
||||
DIST vim-8.2.0210-gentoo-patches.tar.bz2 2755 BLAKE2B 21f1fb97c95d4f2eb45968783add80e11011be12fd2d701c267644a44da9782214828e022667c1a0a2ed08aedb7c12b6756a8b8adea4db5c7a3cb7dc94b75fd8 SHA512 c942c33dc033d63569e07523fa7652d1c53685aa64f9e7a4bf4e6126012790ec0ec820a7a9209cfe64096679ba8a9f9394ed92696a933e3c8be10658d16b8a7b
|
||||
DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7bc254f11038bde275ae4e6f56513a14e0268fdc1032ae847d1d7f8539f8a657217011770ccb4685998f34722383ec7bfb1a15 SHA512 00bc8eb8b20a4a6f3bbd179bb90d42fa6727c8eaae5b625e95e52c33638d456ef36d06b51c542ecaffb237c0b4f7aa72dc3bae7fe00144d55ab0d2fa51950f3b
|
||||
DIST vim-8.2.0360.tar.gz 14842830 BLAKE2B fe3a13cb4bef4ada1bd13cdc80aa9a4ab275d1ff16a7f5308109adc7c5a3459393e1c8153fa32a972141b27cce3aaff50c59416d1ba32e4dca03074be49705a9 SHA512 183bcb5cc73290193de99beb69b56b64efa37db9d905c6e76a51ac727f4447f76346dde632e2dfae9d289abb4b9ca11a14f7e350eaa699fc2c3c7c2e35fc20b2
|
||||
DIST vim-8.2.0508.tar.gz 14885937 BLAKE2B 70d9cbaa69fac168e6719ef6ee0fadef21bc0b4c17e3c01d983cfe7d75ec831089845aae2f4ca2b5eba02ea24664dc968b0d472254db45e13a5a1f9cdc62253a SHA512 0cbe7cb8d16ac9ed2e6b2f7031bf3b962bcfa199ef7421dfa549fd53f42eb00fc20a14d0df13fcdb4b5f06c88e659086f8d277797824e628133ebd66c72232b6
|
||||
EBUILD gvim-8.2.0360.ebuild 10326 BLAKE2B 4fd00bb56f9cac3143d22d7d080046a4ac76a8d64b13ede6614527aa5c69603b792f5b0ec5efb9284978a1c782454211bf23ed25fb96e6994352602bc97b350e SHA512 37b60dcc8805c6aef6e1b1a3bb93fa96ad6b12a66614f30858018f369843d77ab57040656b710fd818bc2c823a43202ce52dff5a6aff1e1912298a72e51ea2cd
|
||||
EBUILD gvim-9999.ebuild 10333 BLAKE2B 4c47354ccea9b318efa4db9ffe79a716c62b8e6fe37ede8965a7b7a1584aa47bb8e8a43574e4ddf250699eb9370f6d51dbab484e0cc62621c5848ebc3c305ff6 SHA512 fa569a6907927acc18545d9e0b9450b6f0da4f404a8c45554dae392052f0aece504cf64bb30d7cd084b83aea214c63b3cadaa57e7a6f4b07c558139105319e2e
|
||||
EBUILD gvim-8.2.0508.ebuild 10352 BLAKE2B 6254ebd3e71252a483b4e17edca824d44191e3a60a60a1578484f590ead141fd145c203639ea4abf4aa9f62e8d0a5239b32662d780e3915b0034c849b826e7f1 SHA512 636f140d411d0a1c1bb36e0d6bea7256d6f9ac7db0745ed99d7e347536bedc2af0175b94be1738afb7626bb7790b979192d9bf5d528f43b6c86b09b8d1a7832f
|
||||
EBUILD gvim-9999.ebuild 10352 BLAKE2B 6254ebd3e71252a483b4e17edca824d44191e3a60a60a1578484f590ead141fd145c203639ea4abf4aa9f62e8d0a5239b32662d780e3915b0034c849b826e7f1 SHA512 636f140d411d0a1c1bb36e0d6bea7256d6f9ac7db0745ed99d7e347536bedc2af0175b94be1738afb7626bb7790b979192d9bf5d528f43b6c86b09b8d1a7832f
|
||||
MISC metadata.xml 633 BLAKE2B 5ecbefdb3a4a116a9e56113621970dd581f27dd42f8b6ed4fd445cb675bec4729bbce076a0d20de3dd329e00723f51d64df9a7b62658fa8f1348982aa8b8628d SHA512 bca6784d9746a7d98aaec2e3469b8bb3057802b869181c79622d16cfd31b06ca8c9dd89cb147f11c1f709fda2312973e7e115efea257a781905fb3a789b0cfce
|
||||
|
||||
@ -0,0 +1,367 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
VIM_VERSION="8.2"
|
||||
PYTHON_COMPAT=( python3_{6,7,8} )
|
||||
PYTHON_REQ_USE="threads(+)"
|
||||
USE_RUBY="ruby24 ruby25 ruby26 ruby27"
|
||||
|
||||
inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix python-single-r1 ruby-single
|
||||
|
||||
if [[ ${PV} == 9999* ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/vim/vim.git"
|
||||
EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
|
||||
else
|
||||
SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
|
||||
https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
|
||||
fi
|
||||
|
||||
DESCRIPTION="GUI version of the Vim text editor"
|
||||
HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
|
||||
|
||||
SLOT="0"
|
||||
LICENSE="vim"
|
||||
IUSE="acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
|
||||
REQUIRED_USE="
|
||||
python? ( ${PYTHON_REQUIRED_USE} )
|
||||
"
|
||||
|
||||
RDEPEND="
|
||||
~app-editors/vim-core-${PV}
|
||||
>=app-eselect/eselect-vi-1.1
|
||||
>=sys-libs/ncurses-5.2-r2:0=
|
||||
x11-libs/libICE
|
||||
x11-libs/libSM
|
||||
x11-libs/libXext
|
||||
x11-libs/libXt
|
||||
acl? ( kernel_linux? ( sys-apps/acl ) )
|
||||
!aqua? (
|
||||
gtk? (
|
||||
x11-libs/gtk+:3
|
||||
x11-libs/libXft
|
||||
)
|
||||
!gtk? (
|
||||
gtk2? (
|
||||
>=x11-libs/gtk+-2.6:2
|
||||
x11-libs/libXft
|
||||
)
|
||||
!gtk2? (
|
||||
motif? ( >=x11-libs/motif-2.3:0 )
|
||||
!motif? (
|
||||
neXt? ( x11-libs/neXtaw )
|
||||
!neXt? ( x11-libs/libXaw )
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
cscope? ( dev-util/cscope )
|
||||
lua? (
|
||||
luajit? ( dev-lang/luajit:2= )
|
||||
!luajit? ( dev-lang/lua:0[deprecated] )
|
||||
)
|
||||
nls? ( virtual/libintl )
|
||||
perl? ( dev-lang/perl:= )
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
racket? ( dev-scheme/racket )
|
||||
ruby? ( ${RUBY_DEPS} )
|
||||
selinux? ( sys-libs/libselinux )
|
||||
session? ( x11-libs/libSM )
|
||||
sound? ( media-libs/libcanberra )
|
||||
tcl? ( dev-lang/tcl:0= )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
sys-devel/autoconf
|
||||
virtual/pkgconfig
|
||||
nls? ( sys-devel/gettext )
|
||||
"
|
||||
|
||||
# various failures (bugs #630042 and #682320)
|
||||
RESTRICT="test"
|
||||
|
||||
S=${WORKDIR}/vim-${PV}
|
||||
|
||||
pkg_setup() {
|
||||
# people with broken alphabets run into trouble. bug 82186.
|
||||
unset LANG LC_ALL
|
||||
export LC_COLLATE="C"
|
||||
|
||||
# Gnome sandbox silliness. bug #114475.
|
||||
mkdir -p "${T}"/home || die
|
||||
export HOME="${T}"/home
|
||||
|
||||
use python && python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if [[ ${PV} != 9999* ]]; then
|
||||
# Gentoo patches to fix runtime issues, cross-compile errors, etc
|
||||
eapply "${WORKDIR}"/patches/
|
||||
fi
|
||||
|
||||
# Fixup a script to use awk instead of nawk
|
||||
sed -i -e \
|
||||
'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
|
||||
"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
|
||||
|
||||
# Read vimrc and gvimrc from /etc/vim
|
||||
echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
|
||||
>> "${S}"/src/feature.h || die "echo failed"
|
||||
echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
|
||||
>> "${S}"/src/feature.h || die "echo failed"
|
||||
|
||||
# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
|
||||
# Hopefully this pattern won't break for a while at least.
|
||||
# This fixes bug 29398 (27 Sep 2003 agriffis)
|
||||
sed -i -e \
|
||||
's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
|
||||
"${S}"/runtime/doc/syntax.txt \
|
||||
"${S}"/runtime/doc/tagsrch.txt \
|
||||
"${S}"/runtime/doc/usr_29.txt \
|
||||
"${S}"/runtime/menu.vim \
|
||||
"${S}"/src/configure.ac || die 'sed failed'
|
||||
|
||||
# Don't be fooled by /usr/include/libc.h. When found, vim thinks
|
||||
# this is NeXT, but it's actually just a file in dev-libs/9libs
|
||||
# This fixes bug 43885 (20 Mar 2004 agriffis)
|
||||
sed -i -e \
|
||||
's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
|
||||
|
||||
# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
|
||||
# correctly. To avoid some really entertaining error messages about stuff
|
||||
# which isn't even in the source file being invalid, we'll do some trickery
|
||||
# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
|
||||
find "${S}" -name '*.c' | while read c; do
|
||||
echo >> "$c" || die "echo failed"
|
||||
done
|
||||
|
||||
# Try to avoid sandbox problems. Bug #114475.
|
||||
if [[ -d "${S}"/src/po ]]; then
|
||||
sed -i -e \
|
||||
'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
|
||||
"${S}"/src/po/Makefile || die
|
||||
fi
|
||||
|
||||
cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
|
||||
|
||||
# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
|
||||
sed -i -e \
|
||||
"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
|
||||
"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
|
||||
|
||||
eapply_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=()
|
||||
|
||||
# Fix bug 37354: Disallow -funroll-all-loops on amd64
|
||||
# Bug 57859 suggests that we want to do this for all archs
|
||||
filter-flags -funroll-all-loops
|
||||
|
||||
# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
|
||||
# everyone since previous flag filtering bugs have turned out to affect
|
||||
# multiple archs...
|
||||
replace-flags -O3 -O2
|
||||
|
||||
# Fix bug 18245: Prevent "make" from the following chain:
|
||||
# (1) Notice configure.ac is newer than auto/configure
|
||||
# (2) Rebuild auto/configure
|
||||
# (3) Notice auto/configure is newer than auto/config.mk
|
||||
# (4) Run ./configure (with wrong args) to remake auto/config.mk
|
||||
sed -i -e \
|
||||
's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
|
||||
rm -v src/auto/configure || die "rm failed"
|
||||
emake -j1 -C src autoconf
|
||||
|
||||
# This should fix a sandbox violation (see bug 24447). The hvc
|
||||
# things are for ppc64, see bug 86433.
|
||||
local file
|
||||
for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
|
||||
if [[ -e ${file} ]]; then
|
||||
addwrite $file
|
||||
fi
|
||||
done
|
||||
|
||||
use debug && append-flags "-DDEBUG"
|
||||
|
||||
myconf=(
|
||||
--with-features=huge
|
||||
--disable-gpm
|
||||
--with-gnome=no
|
||||
$(use_enable sound canberra)
|
||||
$(use_enable acl)
|
||||
$(use_enable cscope)
|
||||
$(use_enable lua luainterp)
|
||||
$(use_with luajit)
|
||||
$(use_enable netbeans)
|
||||
$(use_enable nls)
|
||||
$(use_enable perl perlinterp)
|
||||
$(use_enable python python3interp)
|
||||
$(use_with python python3-command $(type -P $(eselect python show --python3)))
|
||||
$(use_enable racket mzschemeinterp)
|
||||
$(use_enable ruby rubyinterp)
|
||||
$(use_enable selinux)
|
||||
$(use_enable session xsmp)
|
||||
$(use_enable tcl tclinterp)
|
||||
)
|
||||
|
||||
# --with-features=huge forces on cscope even if we --disable it. We need
|
||||
# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
|
||||
if ! use cscope; then
|
||||
sed -i -e \
|
||||
'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
|
||||
fi
|
||||
|
||||
# gvim's GUI preference order is as follows:
|
||||
# aqua CARBON (not tested)
|
||||
# -aqua gtk GTK3
|
||||
# -aqua -gtk gtk2 GTK2
|
||||
# -aqua -gtk -gtk motif MOTIF
|
||||
# -aqua -gtk -gtk -motif neXt NEXTAW
|
||||
# -aqua -gtk -gtk -motif -neXt ATHENA
|
||||
echo ; echo
|
||||
if use aqua; then
|
||||
einfo "Building gvim with the Carbon GUI"
|
||||
myconf+=(
|
||||
--enable-darwin
|
||||
--enable-gui=carbon
|
||||
)
|
||||
elif use gtk; then
|
||||
myconf+=( --enable-gtk3-check )
|
||||
einfo "Building gvim with the gtk+-3 GUI"
|
||||
myconf+=( --enable-gui=gtk3 )
|
||||
elif use gtk2; then
|
||||
myconf+=( --enable-gtk2-check )
|
||||
einfo "Building gvim with the gtk+-2 GUI"
|
||||
myconf+=( --enable-gui=gtk2 )
|
||||
elif use motif; then
|
||||
einfo "Building gvim with the MOTIF GUI"
|
||||
myconf+=( --enable-gui=motif )
|
||||
elif use neXt; then
|
||||
einfo "Building gvim with the neXtaw GUI"
|
||||
myconf+=( --enable-gui=nextaw )
|
||||
else
|
||||
einfo "Building gvim with the Athena GUI"
|
||||
myconf+=( --enable-gui=athena )
|
||||
fi
|
||||
echo ; echo
|
||||
|
||||
# let package manager strip binaries
|
||||
export ac_cv_prog_STRIP="$(type -P true ) faking strip"
|
||||
|
||||
# keep prefix env contained within the EPREFIX
|
||||
use prefix && myconf+=( --without-local-dir )
|
||||
|
||||
if [[ ${CHOST} == *-interix* ]]; then
|
||||
# avoid finding of this function, to avoid having to patch either
|
||||
# configure or the source, which would be much more hackish.
|
||||
# after all vim does it right, only interix is badly broken (again)
|
||||
export ac_cv_func_sigaction=no
|
||||
fi
|
||||
|
||||
econf \
|
||||
--with-modified-by=Gentoo-${PVR} \
|
||||
--with-vim-name=gvim \
|
||||
--with-x \
|
||||
"${myconf[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# The following allows emake to be used
|
||||
emake -j1 -C src auto/osdef.h objects
|
||||
|
||||
emake
|
||||
}
|
||||
|
||||
src_test() {
|
||||
einfo
|
||||
einfo "Starting vim tests. Several error messages will be shown"
|
||||
einfo "while the tests run. This is normal behaviour and does not"
|
||||
einfo "indicate a fault."
|
||||
einfo
|
||||
ewarn "If the tests fail, your terminal may be left in a strange"
|
||||
ewarn "state. Usually, running 'reset' will fix this."
|
||||
einfo
|
||||
|
||||
# Don't let vim talk to X
|
||||
unset DISPLAY
|
||||
|
||||
# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
|
||||
# this evil trickery works.
|
||||
ln -s "${S}"/src/gvim "${S}"/src/testvim || die
|
||||
|
||||
# Make sure our VIMPROG is used.
|
||||
sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
|
||||
|
||||
# Don't do additional GUI tests.
|
||||
emake -j1 VIMPROG=../testvim -C src/testdir nongui
|
||||
}
|
||||
|
||||
# Call eselect vi update with --if-unset
|
||||
# to respect user's choice (bug 187449)
|
||||
eselect_vi_update() {
|
||||
einfo "Calling eselect vi update..."
|
||||
eselect vi update --if-unset
|
||||
eend $?
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
|
||||
|
||||
dobin src/gvim
|
||||
dosym gvim /usr/bin/gvimdiff
|
||||
dosym gvim /usr/bin/evim
|
||||
dosym gvim /usr/bin/eview
|
||||
dosym gvim /usr/bin/gview
|
||||
dosym gvim /usr/bin/rgvim
|
||||
dosym gvim /usr/bin/rgview
|
||||
|
||||
emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
|
||||
|
||||
dodir /usr/share/man/man1
|
||||
echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
|
||||
echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
|
||||
echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
|
||||
die "echo failed"
|
||||
|
||||
insinto /etc/vim
|
||||
newins "${FILESDIR}"/gvimrc-r1 gvimrc
|
||||
eprefixify "${ED}"/etc/vim/gvimrc
|
||||
|
||||
# bash completion script, bug #79018.
|
||||
newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
|
||||
|
||||
# don't install vim desktop file
|
||||
rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# update documentation tags (from vim-doc.eclass)
|
||||
update_vim_helptags
|
||||
|
||||
# update fdo mime stuff, bug #78394
|
||||
xdg_desktop_database_update
|
||||
|
||||
# update icon cache
|
||||
xdg_icon_cache_update
|
||||
|
||||
# call eselect vi update
|
||||
eselect_vi_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
# update documentation tags (from vim-doc.eclass)
|
||||
update_vim_helptags
|
||||
|
||||
# update fdo mime stuff, bug #78394
|
||||
xdg_desktop_database_update
|
||||
|
||||
# update icon cache
|
||||
xdg_icon_cache_update
|
||||
|
||||
# call eselect vi update
|
||||
eselect_vi_update
|
||||
}
|
||||
@ -0,0 +1,225 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
VIM_VERSION="8.2"
|
||||
inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
|
||||
|
||||
if [[ ${PV} == 9999* ]] ; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/vim/vim.git"
|
||||
EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
|
||||
else
|
||||
SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
|
||||
https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
fi
|
||||
|
||||
DESCRIPTION="vim and gvim shared files"
|
||||
HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
|
||||
|
||||
SLOT="0"
|
||||
LICENSE="vim"
|
||||
IUSE="nls acl minimal"
|
||||
|
||||
DEPEND="sys-devel/autoconf"
|
||||
# avoid icon file collision bug #673880
|
||||
RDEPEND="!!<app-editors/gvim-8.1.0648"
|
||||
PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
|
||||
|
||||
S=${WORKDIR}/vim-${PV}
|
||||
|
||||
pkg_setup() {
|
||||
# people with broken alphabets run into trouble. bug 82186.
|
||||
unset LANG LC_ALL
|
||||
export LC_COLLATE="C"
|
||||
|
||||
# Gnome sandbox silliness. bug #114475.
|
||||
mkdir -p "${T}"/home || die "mkdir -p failed"
|
||||
export HOME="${T}"/home
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if [[ ${PV} != 9999* ]] ; then
|
||||
# Gentoo patches to fix runtime issues, cross-compile errors, etc
|
||||
eapply "${WORKDIR}"/patches
|
||||
fi
|
||||
|
||||
# Fixup a script to use awk instead of nawk
|
||||
sed -i \
|
||||
-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
|
||||
"${S}"/runtime/tools/mve.awk || die "sed failed"
|
||||
|
||||
# See #77841. We remove this file after the tarball extraction.
|
||||
rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
|
||||
|
||||
# Read vimrc and gvimrc from /etc/vim
|
||||
echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
|
||||
echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
|
||||
|
||||
# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
|
||||
# Hopefully this pattern won't break for a while at least.
|
||||
# This fixes bug 29398 (27 Sep 2003 agriffis)
|
||||
sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
|
||||
"${S}"/runtime/doc/syntax.txt \
|
||||
"${S}"/runtime/doc/tagsrch.txt \
|
||||
"${S}"/runtime/doc/usr_29.txt \
|
||||
"${S}"/runtime/menu.vim \
|
||||
"${S}"/src/configure.ac || die 'sed failed'
|
||||
|
||||
# Don't be fooled by /usr/include/libc.h. When found, vim thinks
|
||||
# this is NeXT, but it's actually just a file in dev-libs/9libs
|
||||
# This fixes bug 43885 (20 Mar 2004 agriffis)
|
||||
sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
|
||||
|
||||
# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
|
||||
# correctly. To avoid some really entertaining error messages about stuff
|
||||
# which isn't even in the source file being invalid, we'll do some trickery
|
||||
# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
|
||||
find "${S}" -name '*.c' | while read c; do
|
||||
echo >> "$c" || die "echo failed"
|
||||
done
|
||||
|
||||
# Try to avoid sandbox problems. Bug #114475.
|
||||
if [[ -d "${S}"/src/po ]]; then
|
||||
sed -i -e \
|
||||
'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
|
||||
"${S}"/src/po/Makefile || die "sed failed"
|
||||
fi
|
||||
|
||||
cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
|
||||
|
||||
# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
|
||||
sed -i -e \
|
||||
"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
|
||||
"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
|
||||
|
||||
eapply_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
|
||||
# Fix bug 37354: Disallow -funroll-all-loops on amd64
|
||||
# Bug 57859 suggests that we want to do this for all archs
|
||||
filter-flags -funroll-all-loops
|
||||
|
||||
# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
|
||||
# everyone since previous flag filtering bugs have turned out to affect
|
||||
# multiple archs...
|
||||
replace-flags -O3 -O2
|
||||
|
||||
# Fix bug 18245: Prevent "make" from the following chain:
|
||||
# (1) Notice configure.ac is newer than auto/configure
|
||||
# (2) Rebuild auto/configure
|
||||
# (3) Notice auto/configure is newer than auto/config.mk
|
||||
# (4) Run ./configure (with wrong args) to remake auto/config.mk
|
||||
sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
|
||||
|
||||
# Remove src/auto/configure file.
|
||||
rm -v src/auto/configure || die "rm configure failed"
|
||||
|
||||
emake -j1 -C src autoconf
|
||||
|
||||
# This should fix a sandbox violation (see bug 24447). The hvc
|
||||
# things are for ppc64, see bug 86433.
|
||||
for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
|
||||
if [[ -e "${file}" ]]; then
|
||||
addwrite $file
|
||||
fi
|
||||
done
|
||||
|
||||
# Let Portage do the stripping. Some people like that.
|
||||
export ac_cv_prog_STRIP="$(type -P true ) faking strip"
|
||||
|
||||
# Keep Gentoo Prefix env contained within the EPREFIX
|
||||
use prefix && myconf+=" --without-local-dir"
|
||||
|
||||
econf \
|
||||
--with-modified-by=Gentoo-${PVR} \
|
||||
--enable-gui=no \
|
||||
--without-x \
|
||||
--disable-darwin \
|
||||
--disable-perlinterp \
|
||||
--disable-pythoninterp \
|
||||
--disable-rubyinterp \
|
||||
--disable-gpm \
|
||||
--disable-selinux \
|
||||
$(use_enable nls) \
|
||||
$(use_enable acl) \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake -j1 -C src auto/osdef.h objects
|
||||
emake tools
|
||||
}
|
||||
|
||||
src_test() { :; }
|
||||
|
||||
src_install() {
|
||||
local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
|
||||
|
||||
dodir /usr/{bin,share/{man/man1,vim}}
|
||||
emake -C src \
|
||||
installruntime \
|
||||
installmanlinks \
|
||||
installmacros \
|
||||
installtutor \
|
||||
installtutorbin \
|
||||
installtools \
|
||||
install-languages \
|
||||
DESTDIR="${D}" \
|
||||
BINDIR="${EPREFIX}"/usr/bin \
|
||||
MANDIR="${EPREFIX}"/usr/share/man \
|
||||
DATADIR="${EPREFIX}"/usr/share
|
||||
|
||||
keepdir ${vimfiles}/keymap
|
||||
|
||||
# default vimrc is installed by vim-core since it applies to
|
||||
# both vim and gvim
|
||||
insinto /etc/vim/
|
||||
newins "${FILESDIR}"/vimrc-r5 vimrc
|
||||
eprefixify "${ED}"/etc/vim/vimrc
|
||||
|
||||
if use minimal; then
|
||||
# To save space, install only a subset of the files.
|
||||
# Helps minimalize the livecd, bug 65144.
|
||||
eshopts_push -s extglob
|
||||
|
||||
rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
|
||||
rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
|
||||
rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
|
||||
|
||||
local keep_colors="default"
|
||||
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
|
||||
|
||||
local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
|
||||
# tinkering with the next line might make bad things happen ...
|
||||
keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
|
||||
ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
|
||||
|
||||
eshopts_pop
|
||||
fi
|
||||
|
||||
newbashcomp "${FILESDIR}"/xxd-completion xxd
|
||||
|
||||
# install gvim icon since both vim/gvim desktop files reference it
|
||||
doicon -s scalable "${FILESDIR}"/gvim.svg
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# update documentation tags (from vim-doc.eclass)
|
||||
update_vim_helptags
|
||||
|
||||
# update icon cache
|
||||
xdg_icon_cache_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
# Update documentation tags (from vim-doc.eclass)
|
||||
update_vim_helptags
|
||||
|
||||
# update icon cache
|
||||
xdg_icon_cache_update
|
||||
}
|
||||
@ -1,6 +1,9 @@
|
||||
AUX vim-completion 1004 BLAKE2B dea4230a8d2a57fd1af18df4037504a44382a97ff672410e987cb287d802c964baa502da4d08f09cb8684307481fec503c1d8cae7f4f6e61500f1cb06033a2c4 SHA512 dccf663a93efdf2ec3be69f49e418a0ef66277e2fae6c12287adde772592e19f5130388a04242121846f1dae39f78b30780c99dc6fe1b847f4f08354bda3cc41
|
||||
DIST vim-8.2.0210-gentoo-patches.tar.bz2 2755 BLAKE2B 21f1fb97c95d4f2eb45968783add80e11011be12fd2d701c267644a44da9782214828e022667c1a0a2ed08aedb7c12b6756a8b8adea4db5c7a3cb7dc94b75fd8 SHA512 c942c33dc033d63569e07523fa7652d1c53685aa64f9e7a4bf4e6126012790ec0ec820a7a9209cfe64096679ba8a9f9394ed92696a933e3c8be10658d16b8a7b
|
||||
DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7bc254f11038bde275ae4e6f56513a14e0268fdc1032ae847d1d7f8539f8a657217011770ccb4685998f34722383ec7bfb1a15 SHA512 00bc8eb8b20a4a6f3bbd179bb90d42fa6727c8eaae5b625e95e52c33638d456ef36d06b51c542ecaffb237c0b4f7aa72dc3bae7fe00144d55ab0d2fa51950f3b
|
||||
DIST vim-8.2.0360.tar.gz 14842830 BLAKE2B fe3a13cb4bef4ada1bd13cdc80aa9a4ab275d1ff16a7f5308109adc7c5a3459393e1c8153fa32a972141b27cce3aaff50c59416d1ba32e4dca03074be49705a9 SHA512 183bcb5cc73290193de99beb69b56b64efa37db9d905c6e76a51ac727f4447f76346dde632e2dfae9d289abb4b9ca11a14f7e350eaa699fc2c3c7c2e35fc20b2
|
||||
DIST vim-8.2.0508.tar.gz 14885937 BLAKE2B 70d9cbaa69fac168e6719ef6ee0fadef21bc0b4c17e3c01d983cfe7d75ec831089845aae2f4ca2b5eba02ea24664dc968b0d472254db45e13a5a1f9cdc62253a SHA512 0cbe7cb8d16ac9ed2e6b2f7031bf3b962bcfa199ef7421dfa549fd53f42eb00fc20a14d0df13fcdb4b5f06c88e659086f8d277797824e628133ebd66c72232b6
|
||||
EBUILD vim-8.2.0360.ebuild 9047 BLAKE2B 61761262f606478b9bf0d3ed8a1e33d88675409b559b821285ac819222f8fb20cf4d1a473310b22a0f066e34d2794fb747f9abd66b83457e0ebe050e9ca0bfd4 SHA512 4de6099691f5bb9cb991b794bcfb257b835cf20d3dcb79e3715b9ffc92696a74094cddbd143734854420218e96bf9c482625c4c8d1cf0a55aafc07e128ce6fd0
|
||||
EBUILD vim-9999.ebuild 9054 BLAKE2B fac48de47789660d6697bf1945b804fc7d931ff958461c2a29cde3e1866d5af01b0ee56b95ad3a642d28eb4c02f9265d1e82e801f5599c778bd7303ce6bb5840 SHA512 19b17d15f62f91fb161974bebb89bfe5a61337297b9a612c0ebc5066f640092651a5be6cfbbf23e4b883249f386a153ea6983451eb735c8d65566eaa86570e12
|
||||
EBUILD vim-8.2.0508.ebuild 9073 BLAKE2B 8fa50fa02b0023cb62ab874d05448783f67dae78b4acc3cdea06fe74cd676e8c73818f5c89a4c5f9d551af9d544ca7c99d5737f5031e0567c7b2ea05cbe68e5b SHA512 1c7f28b4c3c3fa0cdaf05e7613e5a41793f257dc1af5e0cfe489b721fbeb68816e3dd42dfc432a806de509ff1b869a187165ae415e144719e5dc62928468febe
|
||||
EBUILD vim-9999.ebuild 9073 BLAKE2B 8fa50fa02b0023cb62ab874d05448783f67dae78b4acc3cdea06fe74cd676e8c73818f5c89a4c5f9d551af9d544ca7c99d5737f5031e0567c7b2ea05cbe68e5b SHA512 1c7f28b4c3c3fa0cdaf05e7613e5a41793f257dc1af5e0cfe489b721fbeb68816e3dd42dfc432a806de509ff1b869a187165ae415e144719e5dc62928468febe
|
||||
MISC metadata.xml 807 BLAKE2B e876f33c06a0bb165a43a7c50ff9bbfa0513e43287f54dbcee396af736034e4cefba8831226b47cc8a334599632a94344623ae2343f0162dbbcd511f749d524a SHA512 a7801a4483b08944c01848593354322c406a929296075617736755c0b62852b76c30467cee2c360ea211521274f2019b495309bffb5a3285d73940aac45e4a53
|
||||
|
||||
@ -0,0 +1,318 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
VIM_VERSION="8.2"
|
||||
PYTHON_COMPAT=( python3_{6,7,8} )
|
||||
PYTHON_REQ_USE="threads(+)"
|
||||
USE_RUBY="ruby24 ruby25 ruby26 ruby27"
|
||||
|
||||
inherit vim-doc flag-o-matic bash-completion-r1 python-single-r1 ruby-single desktop xdg-utils
|
||||
|
||||
if [[ ${PV} == 9999* ]] ; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/vim/vim.git"
|
||||
else
|
||||
SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
|
||||
https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Vim, an improved vi-style text editor"
|
||||
HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
|
||||
|
||||
SLOT="0"
|
||||
LICENSE="vim"
|
||||
IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux sound tcl terminal vim-pager"
|
||||
REQUIRED_USE="
|
||||
python? ( ${PYTHON_REQUIRED_USE} )
|
||||
vim-pager? ( !minimal )
|
||||
"
|
||||
|
||||
RDEPEND="
|
||||
>=app-eselect/eselect-vi-1.1
|
||||
>=sys-libs/ncurses-5.2-r2:0=
|
||||
nls? ( virtual/libintl )
|
||||
acl? ( kernel_linux? ( sys-apps/acl ) )
|
||||
cscope? ( dev-util/cscope )
|
||||
gpm? ( >=sys-libs/gpm-1.19.3 )
|
||||
lua? (
|
||||
luajit? ( dev-lang/luajit:2= )
|
||||
!luajit? ( dev-lang/lua:0[deprecated] )
|
||||
)
|
||||
!minimal? ( ~app-editors/vim-core-${PV} )
|
||||
vim-pager? ( app-editors/vim-core[-minimal] )
|
||||
perl? ( dev-lang/perl:= )
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
racket? ( dev-scheme/racket )
|
||||
ruby? ( ${RUBY_DEPS} )
|
||||
selinux? ( sys-libs/libselinux )
|
||||
sound? ( media-libs/libcanberra )
|
||||
tcl? ( dev-lang/tcl:0= )
|
||||
X? ( x11-libs/libXt )
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
sys-devel/autoconf
|
||||
nls? ( sys-devel/gettext )
|
||||
"
|
||||
|
||||
pkg_setup() {
|
||||
# people with broken alphabets run into trouble. bug 82186.
|
||||
unset LANG LC_ALL
|
||||
export LC_COLLATE="C"
|
||||
|
||||
# Gnome sandbox silliness. bug #114475.
|
||||
mkdir -p "${T}"/home || die "mkdir failed"
|
||||
export HOME="${T}"/home
|
||||
|
||||
use python && python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if [[ ${PV} != 9999* ]] ; then
|
||||
# Gentoo patches to fix runtime issues, cross-compile errors, etc
|
||||
eapply "${WORKDIR}"/patches/
|
||||
fi
|
||||
|
||||
# Fixup a script to use awk instead of nawk
|
||||
sed -i -e \
|
||||
'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
|
||||
"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
|
||||
|
||||
# Read vimrc and gvimrc from /etc/vim
|
||||
echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
|
||||
>> "${S}"/src/feature.h || die "echo failed"
|
||||
echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
|
||||
>> "${S}"/src/feature.h || die "echo failed"
|
||||
|
||||
# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
|
||||
# Hopefully this pattern won't break for a while at least.
|
||||
# This fixes bug 29398 (27 Sep 2003 agriffis)
|
||||
sed -i -e \
|
||||
's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
|
||||
"${S}"/runtime/doc/syntax.txt \
|
||||
"${S}"/runtime/doc/tagsrch.txt \
|
||||
"${S}"/runtime/doc/usr_29.txt \
|
||||
"${S}"/runtime/menu.vim \
|
||||
"${S}"/src/configure.ac || die 'sed failed'
|
||||
|
||||
# Don't be fooled by /usr/include/libc.h. When found, vim thinks
|
||||
# this is NeXT, but it's actually just a file in dev-libs/9libs
|
||||
# This fixes bug 43885 (20 Mar 2004 agriffis)
|
||||
sed -i -e \
|
||||
's/ libc\.h / /' \
|
||||
"${S}"/src/configure.ac || die 'sed failed'
|
||||
|
||||
# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
|
||||
# correctly. To avoid some really entertaining error messages about stuff
|
||||
# which isn't even in the source file being invalid, we'll do some trickery
|
||||
# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
|
||||
find "${S}" -name '*.c' | while read c; do
|
||||
echo >> "$c" || die "echo failed"
|
||||
done
|
||||
|
||||
# conditionally make the manpager.sh script
|
||||
if use vim-pager; then
|
||||
cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
|
||||
#!/bin/sh
|
||||
sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
|
||||
vim \\
|
||||
-c 'let no_plugin_maps = 1' \\
|
||||
-c 'set nolist nomod ft=man ts=8' \\
|
||||
-c 'let g:showmarks_enable=0' \\
|
||||
-c 'runtime! macros/less.vim' -
|
||||
_EOF_
|
||||
fi
|
||||
|
||||
# Try to avoid sandbox problems. Bug #114475.
|
||||
if [[ -d "${S}"/src/po ]]; then
|
||||
sed -i -e \
|
||||
'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
|
||||
"${S}"/src/po/Makefile || die "sed failed"
|
||||
fi
|
||||
|
||||
cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
|
||||
|
||||
sed -i -e \
|
||||
"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
|
||||
"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
|
||||
|
||||
eapply_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=()
|
||||
|
||||
# Fix bug 37354: Disallow -funroll-all-loops on amd64
|
||||
# Bug 57859 suggests that we want to do this for all archs
|
||||
filter-flags -funroll-all-loops
|
||||
|
||||
# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
|
||||
# everyone since previous flag filtering bugs have turned out to affect
|
||||
# multiple archs...
|
||||
replace-flags -O3 -O2
|
||||
|
||||
# Fix bug 18245: Prevent "make" from the following chain:
|
||||
# (1) Notice configure.ac is newer than auto/configure
|
||||
# (2) Rebuild auto/configure
|
||||
# (3) Notice auto/configure is newer than auto/config.mk
|
||||
# (4) Run ./configure (with wrong args) to remake auto/config.mk
|
||||
sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
|
||||
rm src/auto/configure || die "rm failed"
|
||||
emake -j1 -C src autoconf
|
||||
|
||||
# This should fix a sandbox violation (see bug 24447). The hvc
|
||||
# things are for ppc64, see bug 86433.
|
||||
for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
|
||||
if [[ -e "${file}" ]]; then
|
||||
addwrite $file
|
||||
fi
|
||||
done
|
||||
|
||||
if use minimal; then
|
||||
myconf=(
|
||||
--with-features=tiny
|
||||
--disable-nls
|
||||
--disable-canberra
|
||||
--disable-acl
|
||||
--enable-gui=no
|
||||
--without-x
|
||||
--disable-darwin
|
||||
--disable-luainterp
|
||||
--disable-perlinterp
|
||||
--disable-pythoninterp
|
||||
--disable-mzschemeinterp
|
||||
--disable-rubyinterp
|
||||
--disable-selinux
|
||||
--disable-tclinterp
|
||||
--disable-gpm
|
||||
)
|
||||
else
|
||||
use debug && append-flags "-DDEBUG"
|
||||
|
||||
myconf=(
|
||||
--with-features=huge
|
||||
$(use_enable sound canberra)
|
||||
$(use_enable acl)
|
||||
$(use_enable cscope)
|
||||
$(use_enable gpm)
|
||||
$(use_enable lua luainterp)
|
||||
$(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
|
||||
$(use_with luajit)
|
||||
$(use_enable nls)
|
||||
$(use_enable perl perlinterp)
|
||||
$(use_enable python python3interp)
|
||||
$(use_with python python3-command $(type -P $(eselect python show --python3)))
|
||||
$(use_enable racket mzschemeinterp)
|
||||
$(use_enable ruby rubyinterp)
|
||||
$(use_enable selinux)
|
||||
$(use_enable tcl tclinterp)
|
||||
$(use_enable terminal)
|
||||
)
|
||||
|
||||
# --with-features=huge forces on cscope even if we --disable it. We need
|
||||
# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
|
||||
if ! use cscope; then
|
||||
sed -i -e \
|
||||
'/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
|
||||
fi
|
||||
|
||||
# don't test USE=X here ... see bug #19115
|
||||
# but need to provide a way to link against X ... see bug #20093
|
||||
myconf+=(
|
||||
--enable-gui=no
|
||||
--disable-darwin
|
||||
$(use_with X x)
|
||||
)
|
||||
fi
|
||||
|
||||
# let package manager strip binaries
|
||||
export ac_cv_prog_STRIP="$(type -P true ) faking strip"
|
||||
|
||||
# keep prefix env contained within the EPREFIX
|
||||
use prefix && myconf+=( --without-local-dir )
|
||||
|
||||
econf \
|
||||
--with-modified-by=Gentoo-${PVR} \
|
||||
"${myconf[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# The following allows emake to be used
|
||||
emake -j1 -C src auto/osdef.h objects
|
||||
|
||||
emake
|
||||
}
|
||||
|
||||
src_test() {
|
||||
einfo
|
||||
einfo "Starting vim tests. Several error messages will be shown"
|
||||
einfo "while the tests run. This is normal behaviour and does not"
|
||||
einfo "indicate a fault."
|
||||
einfo
|
||||
ewarn "If the tests fail, your terminal may be left in a strange"
|
||||
ewarn "state. Usually, running 'reset' will fix this."
|
||||
einfo
|
||||
|
||||
# Don't let vim talk to X
|
||||
unset DISPLAY
|
||||
|
||||
emake -j1 -C src/testdir nongui
|
||||
}
|
||||
|
||||
# Call eselect vi update with --if-unset
|
||||
# to respect user's choice (bug 187449)
|
||||
eselect_vi_update() {
|
||||
einfo "Calling eselect vi update..."
|
||||
eselect vi update --if-unset
|
||||
eend $?
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
|
||||
|
||||
# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
|
||||
# managed by eselect-vi
|
||||
dobin src/vim
|
||||
dosym vim /usr/bin/vimdiff
|
||||
dosym vim /usr/bin/rvim
|
||||
dosym vim /usr/bin/rview
|
||||
if use vim-pager ; then
|
||||
dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
|
||||
dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
|
||||
insinto ${vimfiles}/macros
|
||||
doins runtime/macros/manpager.sh
|
||||
fperms a+x ${vimfiles}/macros/manpager.sh
|
||||
fi
|
||||
|
||||
domenu runtime/vim.desktop
|
||||
|
||||
newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
|
||||
|
||||
# keep in sync with 'complete ... -F' list
|
||||
bashcomp_alias vim ex vi view rvim rview vimdiff
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# Update documentation tags (from vim-doc.eclass)
|
||||
update_vim_helptags
|
||||
|
||||
# Call eselect vi update
|
||||
eselect_vi_update
|
||||
|
||||
# update desktop file mime cache
|
||||
xdg_desktop_database_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
# Update documentation tags (from vim-doc.eclass)
|
||||
update_vim_helptags
|
||||
|
||||
# Call eselect vi update
|
||||
eselect_vi_update
|
||||
|
||||
# update desktop file mime cache
|
||||
xdg_desktop_database_update
|
||||
}
|
||||
Binary file not shown.
@ -1,4 +1,4 @@
|
||||
AUX 50autoconf-mode-gentoo.el 366 BLAKE2B 9394476da3892a5b857fe35ff9a6ecbacec761adec91465201259b03080a7303a1c5e6fe2767ffabfad1b156f4d362e1f025fef9ab131d89799912e0328090a9 SHA512 e917a5c7e7216da4624ac9463aa575569402383fd77d11b510c4752d1dfb54aa93c3cd29f3e3b198693c4f9ee9452611f5f342ecf57bf2c5f72b5e10ffab2d9f
|
||||
DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b
|
||||
EBUILD autoconf-mode-2.69-r1.ebuild 525 BLAKE2B 89e132ac24c849eb811d9a622c65126d8a448d9f24ed489842fdc79fe2759bdfc235354b1fb32d71214dff646aef1e2ba4546d3c5560ff7eca3c035e2ac3da98 SHA512 4c1b174cf684bfcd8278637b0c60e831083a5955a3d179ab0c590cbadc4451fdb1cd7752dd21ebe394fa75a95207fb77edfd911f6735f57351b90c7b2531c022
|
||||
EBUILD autoconf-mode-2.69-r1.ebuild 526 BLAKE2B 34faae12867b898615d70c9bcc474e9e5db1ddb2fc74f6541e7ec3f19845355c71b226a3244be2537dc4fbc5926b03c93f308a0d8ce8752070169dd37a0114b2 SHA512 fafe1045b68f465201a1136a90e2cab8fb42c9bd3cf8c8cb78890372e296380ee9b97163cf88005356d736427eecb602b730d8ebcaf4fe02def5f0baaf49f7c2
|
||||
MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
AUX 60doctest-mode-gentoo.el 191 BLAKE2B 92514ec6c9b9c193f9693d3a2bebb2574a58ca723679688542726d2d8d502c3a7bffbb7b89b7b5e2538c9a3f57ea7dd138586895d6e0b9d8ea7c73d4c32338ec SHA512 b8cd1cc6a2f8fed8b7c979736422050182a008d78665d4dd0897bcd34dde7a214b9e62533a1df6a1021f7028a22e78cd8f31a2515835c60ab492cff6e294a8fe
|
||||
DIST doctest-mode.el 75232 BLAKE2B aefe0953e66ebf5a3dd8a650a013af66d9eda41a496411012caf49098daa67d5576b5e1fb149cdfe4d088bc3342b83943676b58d088e685ee724875ab9aa0c15 SHA512 e32326644cb66bf5cfa9a597364a46b2279636368c751940eb418c670219cd907ecb60f6d2b6a8a4ec8970df4f17500be053b9fc6b75fece908dc37329d9aa9c
|
||||
EBUILD doctest-mode-0.4.ebuild 558 BLAKE2B 0658cf5ac3d5d80266e5cf334f12aadfc677e3f7944a6ca1248df6d1a7150e01ee142dbfc10d5e5637dd58a3994daeae67ba7fe49e7487809d8fb886846bad5b SHA512 1eb4e7b689b68f171c866b806ca6a9d3f0f6e85058f20702eefa53faf843412b7c34e9f2b5f36c4166f77bf13ffa2f3fd244c97acefa64def28429b2face65c4
|
||||
EBUILD doctest-mode-0.4.ebuild 559 BLAKE2B 0ff7595a157c5634c0f8816604d307c999fe0d7a0b64cdb9e8980372231d2420e345464c716fe2932f1f439380bf36fdba146ccfeb72ed99e44819d2781f1ec5 SHA512 e3ec9ceae6a0ac1bc4e427c784dddb635b934b649e3283ea879cc976b51a41a6241d7c5c5fe6277de2b49b273bdb7d5d0042176da4a46addf839c74a851a08ff
|
||||
MISC metadata.xml 365 BLAKE2B 0022a468707eac2f753ef622f03d99d41455cddb87c78bd0a33c33f9ad7f9b69900e7b5684859ee8630fd4f973f5dae806aee1fd6837102a826196c5c0e38fa2 SHA512 2965f445a0f0def6b42819c9f9cdbf1e739e20b4998d954e1065c09826e7eef2383735764fe50c99b811aad0736cf4a185095926e24712a94c272c278c3be4d7
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
AUX 50ebuild-mode-gentoo-1.39.el 805 BLAKE2B 3cdb41677c5ef11ef6fb44001cc36b58f923c2be4090fe8635fa85d338af3d170b1ad3d6b2f31704cf24e1528d3ce9b6fd3d305c2e3c1b1923e345e011642307 SHA512 8038b7bac0f3322b1149467152790dac7cd133234afe7c362c0e14686e378bc27eaf432a7194e1748dda80b41483943facb44e1a66466ebdcb4e7a0768e8f629
|
||||
DIST ebuild-mode-1.49.tar.xz 34632 BLAKE2B 3e7814363aedbb5a05193faccc0815a7f4b0f56eacb03fb720fa270ac69faa163bd8164639390b1703bb0a82341975e9bfea143c651b5b0ba2825b2bbb3b3329 SHA512 440e23aa6f63307955a9c970f5cbcc175eb14cca4ff4035da4f10fa22d9c6766b29ca7842b800a43c46063f3045c2ff3b2d6b8e27026f47bd0ed0959a8f2d0e9
|
||||
DIST ebuild-mode-1.50.tar.xz 35440 BLAKE2B 281719a0a686ef1c80c8391cc118d14085ac6407dee5ee7ee44229bb529de041d31fcec7c08bb1e4b8b5057823c5d99a49a9786daa0b7b17a766155b7daaaecc SHA512 a7c232103848c7782a4ebad89e064f3bc37a78427228be799d8e1bd3670524b32050229ba7cd48d9e4c2b0bb32828ce95eb2e47038411591d03fa8f998614c1e
|
||||
EBUILD ebuild-mode-1.49.ebuild 728 BLAKE2B f9a6bc31ab5c7795a91bfb440c1dc7608f6e098bcbe66078a6ec9193f66af58d6ed89d992457529acb25f74646e23c3f29bd837707dfd38d5e2db7c5c9414fa8 SHA512 0c88848bcc82a7b593c86a7220f2a23bfee006c6d24ac5679692aa1765087dc9db97b24e31011204f6e7639270b92e9b111f3238b27fc0f9c37c432783bcbf9b
|
||||
EBUILD ebuild-mode-1.49.ebuild 729 BLAKE2B b9ef061e9ec7c6c86f6e273a8e14418c97d7b6f15e69c4d86d508a8d481181db11c8f1e803e6431d1c4d07d11cace5f2ff99d02781946f11be65a76196afedca SHA512 421366a5d630f2427c7e6ea0aac34bcae9aaf5f1761a06ed53dac7d27361b1494da86bccee90e57b0d52a21ad8302bdf28f8b13a161babc3212cbd184cf53ab2
|
||||
EBUILD ebuild-mode-1.50.ebuild 736 BLAKE2B b1354b8019cf64e7c06413dce30b50bbc56efd895acd85bfae1d1e20015ea0be6292bb0a782a637b71b460c7ca70b01babf525838412374dc2c2cc1fc21b0d8d SHA512 e661830c77df5a7e65924d598f02d67e17c71290038fdc352a5740e0f370cb70b98795a1a59670e7374ee4b3b7e232f51c30b340f4a733b2fddef2aaec2fd1bc
|
||||
MISC metadata.xml 426 BLAKE2B d0b4dc2bd01fc6fb2f0c58b01676b80d09a4677876adc9681c3c436ebc437b6b034187b19fea30cf980927fec1f6a9feee9a0b7d1a4dd15818d02e4c8ec77af6 SHA512 058df2768030185953c7ac3622819c430681eae3ca60b0d02ad48ed22ab6a0ac7c169d93f8f54a3dddcade3f84c9bf58f662a58bfd78217ea8fc27a580ab9077
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
AUX 50elscreen-gentoo-20180321.el 82 BLAKE2B 6f7d7f574bc931161a8baac7c4bd43165703c1b4102755950aaffabb2c09d42be3ce546c0c546ffc43a04f5c946f69e43f92d4d3137befb5a299c2542a331029 SHA512 cd303735ee0a8f293e0d0d5e3e7dafd01d398d6eb6cd8871d99e6727f4d3c06711572ef9a199055f639c2a44c1f8833fafde37f2c71ca92bffc4f7e2454ab2fd
|
||||
DIST elscreen-20180321.tar.gz 36840 BLAKE2B 7157a2040cb3d1bb60eb5c4f672dde35b5f1437a83a0af32138d252cfe44bf8a23013f5672182ece7f2dda5bfbe266247188d59408005d8963837d0958c100d3 SHA512 777835daf328aeddfd8999c37553bf5f57683292cea4f2fdca774e16d7a137ad26e791515000e8092c2ba5e4c2d0aeb03b260e4a2069c4f8a091b014d69ff201
|
||||
EBUILD elscreen-20180321.ebuild 767 BLAKE2B b9d41678b1b376c0998c336f2896083c91fc49a42f09fa571108fb84ef5c574101c6d80094e8adb42223ee4801d938992f3a3a57ec5846df519038e688031da7 SHA512 a570847879a85e6eb8e3dc1d21505aa777e10aa46d00b01e5232c57d658680a12c799ebf64139f56066f401657e00f8e8eb0b618ac46d6c15a4775a87769ad8e
|
||||
EBUILD elscreen-20180321.ebuild 768 BLAKE2B 160be74da6f71659452f964332ca1f9df5ff821322a634460dc8a2209d3d59cd7b8e9372145c35c08713a5c3f13dad4758b2c36f7e84e2c627c141dddbbd3fc9 SHA512 902dd122c3177ee1ef8b260c11a924a8979bc34dd84935b937fec8048de642ec35613b8b41b2c0d887c2ccf5478348f5ea90c2f10f5b19fa74306f67682c543c
|
||||
MISC metadata.xml 1188 BLAKE2B bbd91c8e116ead86174542013b33e6e83d1a464d96191e76619ec31e6c325390bb8516e70c4f81d4e73a98149be619b466ec62aa61178692c1de57b110699017 SHA512 736c8159defd57e17f46623187edb72f03fad76723062a4de6714d45fb1568838109754e735fd691ee9cfcfcb70c1223d641e112f6fcda74e5b84133cb4bdc08
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
DIST emacs-common-gentoo-1.6.tar.xz 61224 BLAKE2B 70e4f30c26c9098fdb02a53cab5d60cb611143d8bac6947707f3c7596b5a81ceb513b5a0809ee90f351472824f1d4216720c02cadb51d25b3dfce5e436e02bdf SHA512 a7daed2241d778ab283482ecc016801e25084eed10fcbbc50e187d5f842df5a0d278a77f94ae950b086c8651e8ca1a18f89c11dffdde9cf9168755288aae926a
|
||||
EBUILD emacs-common-gentoo-1.6-r3.ebuild 2827 BLAKE2B 1b73c4b5eb31b4679f6db579a967a1a7080fe726e08b5a96323aeb8a908144622d362056b645906accec9d337dadd384174a4b444075c234bb1af4cdefd31cc3 SHA512 9acd0ef35238c91b1aab6e62081e782dc22d90930ccf30ab7e017d853c63ac3143a2f272e64ad67181661b1ed4a77d3488931ee2fa6eff85c3b0ecdd3fd9986b
|
||||
EBUILD emacs-common-gentoo-1.6-r3.ebuild 2828 BLAKE2B dbc4d8ec3187bc14e261b5cf5a522a9464da7c06e0efc9541711cd4e4dfdedf2e884ea572729f7418b8abf7f0501d92c029e884aead02cb27a31c37ddf5a4b71 SHA512 aeff68e4854b72c2028335708533f56b50e5f3a23e40150b97d003741caf9b1fa6e9e03ad7079e76ca1e57629ce3088a79f412d2c3a9397464644937e097de99
|
||||
MISC metadata.xml 360 BLAKE2B e7e420afb7a8377bffcf2a23f3954bbf4cc80fcd19a8514733e2e0164f4235271e21dc860bf77cb9cfcd1a4026ef3dafe97a10dc397e2d8e6f001f02bf6e9bc7 SHA512 d57f8f097617229f774b06437aaa83595aab2a6d9321d51b97dac8bd56fa94db396c7bdca538570f0912390e25ae8643c5adc374908757f67f1422fa1f872605
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
DIST emacs-daemon-0.22.tar.xz 5276 BLAKE2B a866b14951df94e1d382253dcb7045beb800c9dd754f7eed40eadecde43fd583bb2bc20ad9ccc9f87174b06aadbb26f7875deaf36d9bb5325f98ffa58fded8c7 SHA512 f013cd00d3a24ca348bf718dd20dec7bea89107c0a27c921d6b58595b611991830604fc658d57681708218fbee1dae6dd0b277a2a9da67639e3553e0fd133094
|
||||
EBUILD emacs-daemon-0.22.ebuild 1610 BLAKE2B ba4a8a2d4acc270150390deea8cffd0bde72f890823cf984b343dfdde477cee8542d9ffe1acf3b0c77bb81d12458069b128293302fa0fdc06baf9d02ce3c6bc6 SHA512 c13a2c9a20c0267d0cdc76f9ff459dd1cc7956cb68852d49ddcd5d94cec6c1ddc3f414f7f91af64c902c9ba9d6edf7d825f11fe3392cdd58a4708a78a32d62d2
|
||||
EBUILD emacs-daemon-0.22.ebuild 1611 BLAKE2B 658d3d3e0b2d2e66f7dfc6f0d1d97dbda36c58354a78a7ba0faf9ae5ef04bb7f74ae19e61c1122978ad2f848c47147042d491aa4197554e65648d012b410c549 SHA512 dc2a84098fb0eee23005e9490f29ee8f72d96725fe6442d298580db91acf8ea8f8480b53290d1ac95a15b60ebec411b3f26fcd8632929cd26472e67fba08e561
|
||||
MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
AUX 50eselect-mode-gentoo.el 178 BLAKE2B 50fea27e7add6d31f37801593430154636bb58ac6e3f7cc44c68a16d49c9156cf37285778a38bf97a1f4805a22d6d5cf9d597acdcdedfd77c62a5825a0d1d88f SHA512 200da398adf72241112bcda74b432a8a313cf29018c9f6fbdf6021674b23a201ada6ba884d4c9c3a4ee4c042d6c8fc7c3ba59702c8ddb6ea20b652f9ded9d32f
|
||||
DIST eselect-1.4.15.tar.xz 178996 BLAKE2B 4354d975c8af2e1de0f0c6efe2badc92584e947f9b73c05aac144caf8f9d74c850d366c7c225112322a504262b5f285f6e2e8d32223f1b2d4bac87db740a148c SHA512 ceb55fecc2bf70e816679af9b20653b29aa9ce24ca2d4cd0c6e02ab214689459bc2ccd5b3968ac49249b8fb6613c6055e7e76598b86c6a114a9abf847c4a2b58
|
||||
DIST eselect-1.4.16.tar.xz 178660 BLAKE2B dae97ee324cb67983c5395b5dc54c4b84d2da43f6a0c5c8ab81ff402ab211e9d1f1d3fe5c174b130ac1e11d3dd19e3812056274145415ee029e649cda880cd95 SHA512 264fb6122f5f7c9e73bb2250a94c3c0377e5263e2e5ae653ed58e08ebf6ed1b4aa165ae5c1d70b0156081c4db5672d1ec9d379782919d5b40a2f3e862378ce62
|
||||
EBUILD eselect-mode-1.4.15.ebuild 548 BLAKE2B 3d945eb94ea01ef1221593bd1e47b14ebd5f55a82df1e38384c0e026330f0138c4e47a85f82c6f2ef053d3b22baccd4a58611254553c895b2cdbf750d70fa17d SHA512 678b55a49001ce09d9fcdf943562ec8c4abfd02ea1d9ed0fbe1f40e48fdae0886ed97ed3fe039dd974b3238879c1b1c9905c5e56a51da2fc36d21eabd006e1a2
|
||||
EBUILD eselect-mode-1.4.16.ebuild 548 BLAKE2B 3d945eb94ea01ef1221593bd1e47b14ebd5f55a82df1e38384c0e026330f0138c4e47a85f82c6f2ef053d3b22baccd4a58611254553c895b2cdbf750d70fa17d SHA512 678b55a49001ce09d9fcdf943562ec8c4abfd02ea1d9ed0fbe1f40e48fdae0886ed97ed3fe039dd974b3238879c1b1c9905c5e56a51da2fc36d21eabd006e1a2
|
||||
EBUILD eselect-mode-1.4.15.ebuild 549 BLAKE2B 7697ff1501986aba8748b59b9dcca6cd3265c5478eebad7ddc033c3ebf3ddb56780d44939f18ee62ad8b8c43b00321291dd4ce770e274dcb1d208c9bf869c9ab SHA512 72559257846151ff2f9e14ed953ec3d1e0effa8d9111e6558ccd64c5dd412fd8d7c1813a24c2009cb129f5113842f6867497ec9682e4f25f100b6d61f06e3918
|
||||
EBUILD eselect-mode-1.4.16.ebuild 549 BLAKE2B 7697ff1501986aba8748b59b9dcca6cd3265c5478eebad7ddc033c3ebf3ddb56780d44939f18ee62ad8b8c43b00321291dd4ce770e274dcb1d208c9bf869c9ab SHA512 72559257846151ff2f9e14ed953ec3d1e0effa8d9111e6558ccd64c5dd412fd8d7c1813a24c2009cb129f5113842f6867497ec9682e4f25f100b6d61f06e3918
|
||||
EBUILD eselect-mode-9999.ebuild 458 BLAKE2B 0a5b748fc09dbfe532ec9b40adbbb939bd5150ecac9ee610ad0dc5b37e7b6ccdcb8c183337d6f0ce04ee5bfad4f1ede0c13cc4dc55c828474b07265fd91ffba3 SHA512 5d11532145273d6956274ce05d732352593a20daa1d86f900b1fa9927aa536131e5ec922996f4e3939803253e5649f6c2a3ec9a81dabd6dac0475422cf0a4ceb
|
||||
MISC metadata.xml 449 BLAKE2B 711e97a9feb5a464b81a738024f1f8b1ea4dcf2dab78f1e814fcb30569df5a3192cc6e72308687bffd9f7c806f3ce37ef62856f86737d3e8aa4334f721a2fd7b SHA512 38b645859453423cb80be836dc712364d5650f07f071c44d07ad7f5f629b8efd0d26535ebf61e8c38281e8426109ef5828015e01b3377486ab28f942163d155b
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
AUX 50lua-mode-gentoo.el 206 BLAKE2B 07efd36ded1a442c754102c22bea97ee4bffc2c89e40fbef2d8e644051766da13da6b0d2034f3a4e27fa1522949ff351a1105651d79d9005bf38dddd4bea6577 SHA512 b062343ab77dcaa50355498a63681c8e5bc6f209b1aa5ef82d65be8c19aa52d58c2efcd481f091804726b095a02b97de5b6cbce232ee5d9f328c5e3d888b496b
|
||||
DIST lua-mode-20151025.tar.gz 35319 BLAKE2B d84c79622793c51caf7262749d4648baa106f7a2d639706b495097d89fbe8f3ce09482ca12a0473e4a4eaf04cab83ee8b65d62e505b32b12302571efdd1881d4 SHA512 1b2877ba9ba24694b2a820a4e1408d0f475f04bdee424d346fc2248980863aaaf230f757365095304cda763addb32de7e6a2585218770f66d519455d1a32762d
|
||||
EBUILD lua-mode-20151025.ebuild 644 BLAKE2B a45768690a4e5c2fe99c4d42fdd6e91c5fdcec94b4a81d40caef21e9bcc7747b5bd01963a8fbe4332c769bddb2b52e64822d97cd3da6ebf41a7d84a755aad940 SHA512 5380ca3353830f6deaa0b97b0d5cc87292b0b790005f53fb351412333518c6f06067075d3fcf2eba38e6061447da95040691fd6e52cb5477e5079e1e2bbc94f2
|
||||
EBUILD lua-mode-20151025.ebuild 645 BLAKE2B 8d28cea4ab2c1b25b701e5199b1d6ed0afd956e6a1ff4b98857e2a3a52cb5b91142ef414d849de45aef81679ef786087286c452d01e5cb85568a1b8635df5163 SHA512 87453327fbcf94ab575d8069ed39dfbf6a68da8f1e44ade717ee8760d524b847bae4c8b5e016855d855cb647f1b76c6f7c1778b3fef2c0d9272bf3a6e3d4e04f
|
||||
MISC metadata.xml 361 BLAKE2B 4953692a3d3c19f162a539ae4167f16289c569f8c379e09f46423556bb8bf5335e95c5a125a29fcabdbf762405920a4d97c4920c304560688d617be0badcb69a SHA512 e7d96df1fb7a061ecba903b1e2ee997a93801e8d367f7b7b6c1394a8366f05e4fe001d96a08496559f16187ad93d21055b93a52ab4afce9631a179635e4e78d1
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
AUX 50ocaml-mode-gentoo-3.12.1.el 499 BLAKE2B 30d49a4e43fbf4fac02f4a2dd8a9fe7c3aeea623836330e3ed0f8921cc96a02d087f35a32a93f6e404392a1f915539799d1a5c8168b06cb1d8ab76ea0ac6b8fa SHA512 0be69a30c07caeff818e4d6fb0147e18855e88a3bb6a6e876b170edddb32382c0bd19ca960836d8442eecd00e78be09cba7de08030420645c2ef1ba5d9198524
|
||||
DIST ocaml-4.05.0.tar.gz 4431750 BLAKE2B c2ab003a13e0a581ebd0e1c96eeb8a9baea9bfe6bee08823b0e4541819201ec109f1846e13fc1aefa51a001eefbb8f73320ba854d41975fc68cef41bc75b1ecc SHA512 9a060ae4b741e1687277403e5bdb8f6eda2e2ebf6c45f7c0149b66ea1213cb26d13febfbb3f11c12543e244cfdd053b786b09c4145e2348e5d89a7206f7de225
|
||||
EBUILD ocaml-mode-4.05.0.ebuild 503 BLAKE2B 61ea6a0fed03457504f20fd78dfe58537ce19047fe92968049ce96209db18a0898c76833046c1d1dda7117ab87c0fae4e792e7d832b92ecae9f731741a5ff940 SHA512 10475a57d53e07ceed15ec0acd7b958dc3555b6bdca63af6efe0b9f67142091c62a23a5de00f392c0160e225fa2aece5eb74456e19d080261d7f0705133fdac2
|
||||
EBUILD ocaml-mode-4.05.0.ebuild 504 BLAKE2B f67f65b745ce2fdc5392a19201a66a65a7ac8186f9f5b5f284fd79c510ad13ac16817b795c8c7116c992d1632ee0a35946fbf141df0178c9dcf273edeb478d96 SHA512 db3855fb0938cdedb4c13dc40b909cfe683b602a2b574ce7d82c09fe3d6c5b7e74cacf28cce796fb55c520b04940ce7a3b2987fd56f9c0e3148a33123eb6737b
|
||||
MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
AUX 50po-mode-gentoo.el 373 BLAKE2B dedf37969c42ac3dbeb4b4cb01af0f9ee79e40aad8586831503bebc1192a110fbecdc0bba339ebe6d7f89a8509e4f6df52f98f7563a90f31d73af279aad81e66 SHA512 48c371afe3f1a1f033ea20cb0a60bc700414108f7dc1f235e62423bda9b94373e49da9bdd3ab76e119b7b6c1b5f0a7601d36ce2710dd23b3de46557cf7d9cd8d
|
||||
DIST gettext-0.20.1.tar.gz 23267473 BLAKE2B 34e776b985c7db105f8029e0f3400aa645ff6843cd35f778d48450368a31218ddcf590fbc7fd2d10f716b63094d6a15bf40b358e8a6f498d450d2420e7e7a5f2 SHA512 af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06
|
||||
EBUILD po-mode-0.20.1.ebuild 523 BLAKE2B ad770e5cf577fe08502fb5cfed3365cbf87cd8516dde9d8dd88589d445af391c7c7742c1ded1d441b17f20bc82e283c5532b5f7bd879804fcb061297f728c24a SHA512 a7190350516bf100c233096e6b468856dd70f127e8b2b6ef20044409d8708f4c00eb8e5f1e4369d8572991e078768db17bf4c11fc6cfa6f8e9acab5044a81f1a
|
||||
EBUILD po-mode-0.20.1.ebuild 524 BLAKE2B b025efda971f4604a048d3122d519a2d60af5f1e933d1193d91da3b385d08ad097a0bd4e8d40ea81ce9433d46307b95154ad92a36c851f1768955e9be4492530 SHA512 546f3a6601898f9da201b82de4fcffc904042ff36873d34aed988e484e973ca16b3b663579b6b3528d1b95214df4dedff284c27237deb5b98649d6bc910db9bc
|
||||
MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
AUX 50python-mode-gentoo.el 541 BLAKE2B a1657fc49011246ba1cfed1cd8993a222c4932516c6a8e3be4fcc53200510ad8e9a3e1072c2bce641cded4be1581a9c950991d6864c2136668ddba4de8f2429d SHA512 8e1c2c68409c48f3e7c2ae36128380fd5358a12470db571ffa22b1c9cb11730a2f2a84ec66f23c064e32b504c8ae002033e77640d85e11577c50e31462cd5274
|
||||
DIST python-mode.el-6.2.3.tar.gz 314461 BLAKE2B 3bd71b47de1284d59db61f829e3419f2fb10e226900392d903256f31ad90f47317b7bde4cde1cf7d86518f9c706d9c844b208a9e2469a41037252a63f7bc1ba6 SHA512 4aeb33d4054d582cd2a3f4834472c7d0cb3fe5e12e10f5117dcbcd90ec2ca490964c774918c83697f283c68e57766c3c67d3853ddbaa3408777fdafc7f2674f2
|
||||
EBUILD python-mode-6.2.3.ebuild 696 BLAKE2B ba4639e277f68ba68f31da08f5285dbaca08d59aba7def16df0f6ba0f035c619fc95d05e9eb40edcb22beb06b2a49b29d2f38f5b53f73b3928b570cb6be91a04 SHA512 333da1e3669d15be86bd30052d0426d24383353f208660f7b670a28b806cf137ba70551d048c193b588bb4220ceee89d7517475eaaa17de5f5e1ed6c4d4243c9
|
||||
EBUILD python-mode-6.2.3.ebuild 697 BLAKE2B e9a5f4e2a1c80d04370b3cec41f9b9bb9a448244d50db75331ee145f77ff20e6b1fd158dca64d2eac1ee5de881198f82f04f4e065bdcf125d0fc3c292ab053e3 SHA512 b3b62186cfe5d2baf09cd5f6358fb694a3466d73f326c956b87419585038a1d7d13d77700c5d21300f56072bf999d07fab9254dcc38b43ea1700743fa3414e42
|
||||
MISC metadata.xml 359 BLAKE2B 6f98624b4484b28ec87e9d4de4ae43b729db5c5c76bf9e480f86eca25423e8cc8a201762b8f938b5b012765e9258d1752fe01a847e3cd69539aa25ba0cdf9394 SHA512 a61b3fe8afa6c99edce3978dac6b52f37be06c7fbd57166697d14e9d4d0b5e7212c3bb1988c47aeeff4356cd841ca20a4605da0b5bed487acca4e2375994b0bb
|
||||
|
||||
Binary file not shown.
@ -1,170 +0,0 @@
|
||||
From 525d89d39f78a4099508f47a58c4ab65d1e59c0a Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <525d89d39f78a4099508f47a58c4ab65d1e59c0a.1552736006.git.mprivozn@redhat.com>
|
||||
From: Michal Privoznik <mprivozn@redhat.com>
|
||||
Date: Sat, 16 Mar 2019 12:33:00 +0100
|
||||
Subject: [PATCH] gentoo: do not use sysconf
|
||||
|
||||
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
||||
---
|
||||
src/Makefile.am | 21 ++-------------------
|
||||
src/locking/virtlockd.service.in | 3 +--
|
||||
src/logging/virtlogd.service.in | 3 +--
|
||||
src/remote/libvirtd.service.in | 3 +--
|
||||
tools/Makefile.am | 13 ++-----------
|
||||
tools/libvirt-guests.service.in | 2 +-
|
||||
tools/libvirt-guests.sysconf | 7 +++++++
|
||||
7 files changed, 15 insertions(+), 37 deletions(-)
|
||||
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index a73f43c483..47dd55c112 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -747,23 +747,6 @@ endif WITH_SETUID_RPC_CLIENT
|
||||
|
||||
EXTRA_DIST += $(SYSCONF_FILES)
|
||||
|
||||
-install-sysconfig:
|
||||
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
|
||||
- for f in $(SYSCONF_FILES:%.sysconf=%) ; \
|
||||
- do \
|
||||
- tgt=`basename $$f`; \
|
||||
- $(INSTALL_DATA) $(srcdir)/$$f.sysconf \
|
||||
- $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
|
||||
- done
|
||||
-
|
||||
-uninstall-sysconfig:
|
||||
- for f in $(SYSCONF_FILES:%.sysconf=%) ; \
|
||||
- do \
|
||||
- tgt=`basename $$f`; \
|
||||
- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
|
||||
- done
|
||||
- rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
|
||||
-
|
||||
LOGROTATE_FILES := $(LOGROTATE_FILES_IN:remote/%.in=%)
|
||||
|
||||
EXTRA_DIST += $(LOGROTATE_FILES_IN)
|
||||
@@ -822,14 +805,14 @@ SYSTEMD_UNIT_FILES = $(notdir $(SYSTEMD_UNIT_FILES_IN:%.in=%))
|
||||
BUILT_SOURCES += $(SYSTEMD_UNIT_FILES)
|
||||
DISTCLEANFILES += $(SYSTEMD_UNIT_FILES)
|
||||
|
||||
-install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig
|
||||
+install-systemd: $(SYSTEMD_UNIT_FILES)
|
||||
$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
|
||||
for f in $(SYSTEMD_UNIT_FILES); \
|
||||
do \
|
||||
$(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \
|
||||
done
|
||||
|
||||
-uninstall-systemd: uninstall-sysconfig
|
||||
+uninstall-systemd:
|
||||
rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%)
|
||||
rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :
|
||||
|
||||
diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
|
||||
index 3c9d587032..2449b201d9 100644
|
||||
--- a/src/locking/virtlockd.service.in
|
||||
+++ b/src/locking/virtlockd.service.in
|
||||
@@ -7,8 +7,7 @@ Documentation=man:virtlockd(8)
|
||||
Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
-EnvironmentFile=-/etc/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
|
||||
diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in
|
||||
index 3d9ae36150..43736191d5 100644
|
||||
--- a/src/logging/virtlogd.service.in
|
||||
+++ b/src/logging/virtlogd.service.in
|
||||
@@ -7,8 +7,7 @@ Documentation=man:virtlogd(8)
|
||||
Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
-EnvironmentFile=-/etc/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
|
||||
diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
|
||||
index 7f689e08a8..239beeced9 100644
|
||||
--- a/src/remote/libvirtd.service.in
|
||||
+++ b/src/remote/libvirtd.service.in
|
||||
@@ -22,8 +22,7 @@ Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
-EnvironmentFile=-/etc/sysconfig/libvirtd
|
||||
-ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
|
||||
+ExecStart=@sbindir@/libvirtd
|
||||
ExecReload=/bin/kill -HUP $MAINPID
|
||||
KillMode=process
|
||||
Restart=on-failure
|
||||
diff --git a/tools/Makefile.am b/tools/Makefile.am
|
||||
index c6064dee08..40f41ddb38 100644
|
||||
--- a/tools/Makefile.am
|
||||
+++ b/tools/Makefile.am
|
||||
@@ -333,15 +333,6 @@ install-data-local: install-systemd install-nss \
|
||||
uninstall-local: uninstall-systemd uninstall-nss \
|
||||
uninstall-bash-completion
|
||||
|
||||
-install-sysconfig:
|
||||
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
|
||||
- $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \
|
||||
- $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
|
||||
-
|
||||
-uninstall-sysconfig:
|
||||
- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
|
||||
- rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||:
|
||||
-
|
||||
EXTRA_DIST += libvirt-guests.sh.in
|
||||
|
||||
libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir)/config.status
|
||||
@@ -361,12 +352,12 @@ EXTRA_DIST += libvirt-guests.service.in
|
||||
SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
|
||||
|
||||
if LIBVIRT_INIT_SCRIPT_SYSTEMD
|
||||
-install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh
|
||||
+install-systemd: libvirt-guests.service libvirt-guests.sh
|
||||
$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
|
||||
$(INSTALL_DATA) libvirt-guests.service \
|
||||
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
|
||||
|
||||
-uninstall-systemd: uninstall-sysconfig
|
||||
+uninstall-systemd:
|
||||
rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
|
||||
rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||:
|
||||
|
||||
diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
|
||||
index 491ca62138..f0f417bffb 100644
|
||||
--- a/tools/libvirt-guests.service.in
|
||||
+++ b/tools/libvirt-guests.service.in
|
||||
@@ -10,7 +10,7 @@ Documentation=man:libvirtd(8)
|
||||
Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
-EnvironmentFile=-/etc/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
|
||||
diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf
|
||||
index 669b046507..45b0b9ea46 100644
|
||||
--- a/tools/libvirt-guests.sysconf
|
||||
+++ b/tools/libvirt-guests.sysconf
|
||||
@@ -1,3 +1,10 @@
|
||||
+#
|
||||
+# 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
|
||||
+#
|
||||
+
|
||||
+
|
||||
# URIs to check for running guests
|
||||
# example: URIS='default xen:///system vbox+tcp://host/system lxc:///system'
|
||||
#URIS=default
|
||||
--
|
||||
2.19.2
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
From 538d873571d7a682852dc1d70e5f4478f4d64e85 Mon Sep 17 00:00:00 2001
|
||||
From: Jiri Denemark <jdenemar@redhat.com>
|
||||
Date: Fri, 5 Apr 2019 15:11:20 +0200
|
||||
Subject: [PATCH] cpu_map: Define md-clear CPUID bit
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
CVE-2018-12126, CVE-2018-12127, CVE-2018-12130, CVE-2019-11091
|
||||
|
||||
The bit is set when microcode provides the mechanism to invoke a flush
|
||||
of various exploitable CPU buffers by invoking the VERW instruction.
|
||||
|
||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
||||
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
||||
---
|
||||
src/cpu_map/x86_features.xml | 3 +++
|
||||
|
||||
diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
|
||||
index efcc10b1ae..370807f88e 100644
|
||||
--- a/src/cpu_map/x86_features.xml
|
||||
+++ b/src/cpu_map/x86_features.xml
|
||||
@@ -320,6 +320,9 @@
|
||||
<feature name='avx512-4fmaps'>
|
||||
<cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000008'/>
|
||||
</feature>
|
||||
+ <feature name='md-clear'> <!-- md_clear -->
|
||||
+ <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000400'/>
|
||||
+ </feature>
|
||||
<feature name='pconfig'>
|
||||
<cpuid eax_in='0x07' ecx_in='0x00' edx='0x00040000'/>
|
||||
</feature>
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@ -1,174 +0,0 @@
|
||||
From 8b27863cd4bd4eebefe6f39b42c181d073b457ff Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <8b27863cd4bd4eebefe6f39b42c181d073b457ff.1564650738.git.mprivozn@redhat.com>
|
||||
From: Michal Privoznik <mprivozn@redhat.com>
|
||||
Date: Sat, 16 Mar 2019 12:33:00 +0100
|
||||
Subject: [PATCH] gentoo: do not use sysconf
|
||||
|
||||
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
||||
---
|
||||
src/Makefile.am | 21 ++-------------------
|
||||
src/locking/virtlockd.service.in | 3 +--
|
||||
src/logging/virtlogd.service.in | 3 +--
|
||||
src/remote/libvirtd.service.in | 3 +--
|
||||
tools/Makefile.am | 13 ++-----------
|
||||
tools/libvirt-guests.service.in | 2 +-
|
||||
tools/libvirt-guests.sysconf | 7 +++++++
|
||||
7 files changed, 15 insertions(+), 37 deletions(-)
|
||||
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index 4a8cae11dc..6c93435066 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -750,23 +750,6 @@ endif WITH_SETUID_RPC_CLIENT
|
||||
|
||||
EXTRA_DIST += $(SYSCONF_FILES)
|
||||
|
||||
-install-sysconfig:
|
||||
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
|
||||
- for f in $(SYSCONF_FILES:%.sysconf=%) ; \
|
||||
- do \
|
||||
- tgt=`basename $$f`; \
|
||||
- $(INSTALL_DATA) $(srcdir)/$$f.sysconf \
|
||||
- $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
|
||||
- done
|
||||
-
|
||||
-uninstall-sysconfig:
|
||||
- for f in $(SYSCONF_FILES:%.sysconf=%) ; \
|
||||
- do \
|
||||
- tgt=`basename $$f`; \
|
||||
- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
|
||||
- done
|
||||
- rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
|
||||
-
|
||||
LOGROTATE_FILES := $(LOGROTATE_FILES_IN:remote/%.in=%)
|
||||
|
||||
EXTRA_DIST += $(LOGROTATE_FILES_IN)
|
||||
@@ -825,14 +808,14 @@ SYSTEMD_UNIT_FILES = $(notdir $(SYSTEMD_UNIT_FILES_IN:%.in=%))
|
||||
BUILT_SOURCES += $(SYSTEMD_UNIT_FILES)
|
||||
DISTCLEANFILES += $(SYSTEMD_UNIT_FILES)
|
||||
|
||||
-install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig
|
||||
+install-systemd: $(SYSTEMD_UNIT_FILES)
|
||||
$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
|
||||
for f in $(SYSTEMD_UNIT_FILES); \
|
||||
do \
|
||||
$(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \
|
||||
done
|
||||
|
||||
-uninstall-systemd: uninstall-sysconfig
|
||||
+uninstall-systemd:
|
||||
rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%)
|
||||
rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :
|
||||
|
||||
diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
|
||||
index 3c9d587032..2449b201d9 100644
|
||||
--- a/src/locking/virtlockd.service.in
|
||||
+++ b/src/locking/virtlockd.service.in
|
||||
@@ -7,8 +7,7 @@ Documentation=man:virtlockd(8)
|
||||
Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
-EnvironmentFile=-/etc/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
|
||||
diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in
|
||||
index 3d9ae36150..43736191d5 100644
|
||||
--- a/src/logging/virtlogd.service.in
|
||||
+++ b/src/logging/virtlogd.service.in
|
||||
@@ -7,8 +7,7 @@ Documentation=man:virtlogd(8)
|
||||
Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
-EnvironmentFile=-/etc/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
|
||||
diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
|
||||
index 3ddf0e229b..a38f2b08fa 100644
|
||||
--- a/src/remote/libvirtd.service.in
|
||||
+++ b/src/remote/libvirtd.service.in
|
||||
@@ -20,12 +20,11 @@ Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
-EnvironmentFile=-/etc/sysconfig/libvirtd
|
||||
# libvirtd.service is set to run on boot so that autostart of
|
||||
# VMs can be performed. We don't want it to stick around if
|
||||
# unused though, so we set a timeout. The socket activation
|
||||
# then ensures it gets started again if anything needs it
|
||||
-ExecStart=@sbindir@/libvirtd --timeout 120 $LIBVIRTD_ARGS
|
||||
+ExecStart=@sbindir@/libvirtd --timeout 120
|
||||
ExecReload=/bin/kill -HUP $MAINPID
|
||||
KillMode=process
|
||||
Restart=on-failure
|
||||
diff --git a/tools/Makefile.am b/tools/Makefile.am
|
||||
index 2807b9f6fd..cde5dba193 100644
|
||||
--- a/tools/Makefile.am
|
||||
+++ b/tools/Makefile.am
|
||||
@@ -334,15 +334,6 @@ install-data-local: install-systemd install-nss \
|
||||
uninstall-local: uninstall-systemd uninstall-nss \
|
||||
uninstall-bash-completion
|
||||
|
||||
-install-sysconfig:
|
||||
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
|
||||
- $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \
|
||||
- $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
|
||||
-
|
||||
-uninstall-sysconfig:
|
||||
- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
|
||||
- rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||:
|
||||
-
|
||||
EXTRA_DIST += libvirt-guests.sh.in
|
||||
|
||||
libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir)/config.status
|
||||
@@ -362,12 +353,12 @@ EXTRA_DIST += libvirt-guests.service.in
|
||||
SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
|
||||
|
||||
if LIBVIRT_INIT_SCRIPT_SYSTEMD
|
||||
-install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh
|
||||
+install-systemd: libvirt-guests.service libvirt-guests.sh
|
||||
$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
|
||||
$(INSTALL_DATA) libvirt-guests.service \
|
||||
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
|
||||
|
||||
-uninstall-systemd: uninstall-sysconfig
|
||||
+uninstall-systemd:
|
||||
rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
|
||||
rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||:
|
||||
|
||||
diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
|
||||
index 491ca62138..f0f417bffb 100644
|
||||
--- a/tools/libvirt-guests.service.in
|
||||
+++ b/tools/libvirt-guests.service.in
|
||||
@@ -10,7 +10,7 @@ Documentation=man:libvirtd(8)
|
||||
Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
-EnvironmentFile=-/etc/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
|
||||
diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf
|
||||
index 669b046507..45b0b9ea46 100644
|
||||
--- a/tools/libvirt-guests.sysconf
|
||||
+++ b/tools/libvirt-guests.sysconf
|
||||
@@ -1,3 +1,10 @@
|
||||
+#
|
||||
+# 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
|
||||
+#
|
||||
+
|
||||
+
|
||||
# URIs to check for running guests
|
||||
# example: URIS='default xen:///system vbox+tcp://host/system lxc:///system'
|
||||
#URIS=default
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@ -1,170 +0,0 @@
|
||||
From e387be8671d0de88632d063e2ecd2c12eb1b2fdf Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <e387be8671d0de88632d063e2ecd2c12eb1b2fdf.1567522968.git.mprivozn@redhat.com>
|
||||
From: Michal Privoznik <mprivozn@redhat.com>
|
||||
Date: Sat, 16 Mar 2019 12:33:00 +0100
|
||||
Subject: [PATCH] gentoo: do not use sysconf
|
||||
|
||||
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
||||
---
|
||||
src/Makefile.am | 21 ++-------------------
|
||||
src/locking/virtlockd.service.in | 3 +--
|
||||
src/logging/virtlogd.service.in | 3 +--
|
||||
src/remote/libvirtd.service.in | 3 +--
|
||||
tools/Makefile.am | 13 ++-----------
|
||||
tools/libvirt-guests.service.in | 2 +-
|
||||
tools/libvirt-guests.sysconf | 7 +++++++
|
||||
7 files changed, 15 insertions(+), 37 deletions(-)
|
||||
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index f5093b9c90..e2ebc51c87 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -672,23 +672,6 @@ libvirt_lxc_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD)
|
||||
|
||||
EXTRA_DIST += $(SYSCONF_FILES)
|
||||
|
||||
-install-sysconfig:
|
||||
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
|
||||
- for f in $(SYSCONF_FILES:%.sysconf=%) ; \
|
||||
- do \
|
||||
- tgt=`basename $$f`; \
|
||||
- $(INSTALL_DATA) $(srcdir)/$$f.sysconf \
|
||||
- $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
|
||||
- done
|
||||
-
|
||||
-uninstall-sysconfig:
|
||||
- for f in $(SYSCONF_FILES:%.sysconf=%) ; \
|
||||
- do \
|
||||
- tgt=`basename $$f`; \
|
||||
- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
|
||||
- done
|
||||
- rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
|
||||
-
|
||||
LOGROTATE_FILES := $(LOGROTATE_FILES_IN:remote/%.in=%)
|
||||
|
||||
EXTRA_DIST += $(LOGROTATE_FILES_IN)
|
||||
@@ -746,14 +729,14 @@ SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
|
||||
BUILT_SOURCES += $(SYSTEMD_UNIT_FILES)
|
||||
DISTCLEANFILES += $(SYSTEMD_UNIT_FILES)
|
||||
|
||||
-install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig
|
||||
+install-systemd: $(SYSTEMD_UNIT_FILES)
|
||||
$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
|
||||
for f in $(SYSTEMD_UNIT_FILES); \
|
||||
do \
|
||||
$(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \
|
||||
done
|
||||
|
||||
-uninstall-systemd: uninstall-sysconfig
|
||||
+uninstall-systemd:
|
||||
rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%)
|
||||
rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :
|
||||
|
||||
diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
|
||||
index e7f8057c06..2449b201d9 100644
|
||||
--- a/src/locking/virtlockd.service.in
|
||||
+++ b/src/locking/virtlockd.service.in
|
||||
@@ -7,8 +7,7 @@ Documentation=man:virtlockd(8)
|
||||
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
|
||||
diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in
|
||||
index daff48e67d..43736191d5 100644
|
||||
--- a/src/logging/virtlogd.service.in
|
||||
+++ b/src/logging/virtlogd.service.in
|
||||
@@ -7,8 +7,7 @@ Documentation=man:virtlogd(8)
|
||||
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
|
||||
diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
|
||||
index 9c8c54a2ef..a042280cef 100644
|
||||
--- a/src/remote/libvirtd.service.in
|
||||
+++ b/src/remote/libvirtd.service.in
|
||||
@@ -25,8 +25,7 @@ Documentation=https://libvirt.org
|
||||
|
||||
[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
|
||||
diff --git a/tools/Makefile.am b/tools/Makefile.am
|
||||
index 29fdbfe846..04b21eb54a 100644
|
||||
--- a/tools/Makefile.am
|
||||
+++ b/tools/Makefile.am
|
||||
@@ -360,15 +360,6 @@ install-data-local: install-systemd install-nss \
|
||||
uninstall-local: uninstall-systemd uninstall-nss \
|
||||
uninstall-bash-completion
|
||||
|
||||
-install-sysconfig:
|
||||
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
|
||||
- $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \
|
||||
- $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
|
||||
-
|
||||
-uninstall-sysconfig:
|
||||
- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
|
||||
- rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||:
|
||||
-
|
||||
EXTRA_DIST += libvirt-guests.sh.in
|
||||
|
||||
libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir)/config.status
|
||||
@@ -388,12 +379,12 @@ EXTRA_DIST += libvirt-guests.service.in
|
||||
SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
|
||||
|
||||
if LIBVIRT_INIT_SCRIPT_SYSTEMD
|
||||
-install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh
|
||||
+install-systemd: libvirt-guests.service libvirt-guests.sh
|
||||
$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
|
||||
$(INSTALL_DATA) libvirt-guests.service \
|
||||
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
|
||||
|
||||
-uninstall-systemd: uninstall-sysconfig
|
||||
+uninstall-systemd:
|
||||
rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
|
||||
rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||:
|
||||
|
||||
diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
|
||||
index 10c664016a..f0f417bffb 100644
|
||||
--- a/tools/libvirt-guests.service.in
|
||||
+++ b/tools/libvirt-guests.service.in
|
||||
@@ -10,7 +10,7 @@ Documentation=man:libvirtd(8)
|
||||
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
|
||||
diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf
|
||||
index 669b046507..45b0b9ea46 100644
|
||||
--- a/tools/libvirt-guests.sysconf
|
||||
+++ b/tools/libvirt-guests.sysconf
|
||||
@@ -1,3 +1,10 @@
|
||||
+#
|
||||
+# 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
|
||||
+#
|
||||
+
|
||||
+
|
||||
# URIs to check for running guests
|
||||
# example: URIS='default xen:///system vbox+tcp://host/system lxc:///system'
|
||||
#URIS=default
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@ -0,0 +1,39 @@
|
||||
From ba756e8d0928ac4ddb7decd1033de2121201d941 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <ba756e8d0928ac4ddb7decd1033de2121201d941.1585986243.git.mprivozn@redhat.com>
|
||||
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
|
||||
Date: Mon, 20 Jan 2020 07:55:48 +0100
|
||||
Subject: [PATCH] qemu: end the agent job in qemuDomainSetTimeAgent
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This function grabs an agent job but ends a monitor job.
|
||||
End the agent job instead.
|
||||
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1792723
|
||||
|
||||
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
||||
Reported-by: Dan Zheng <dzheng@redhat.com>
|
||||
Fixes: e005c95f56fee9ed780be7f8db103d690bd34cbd
|
||||
(cherry picked from commit d61f95cf6a6fbd564e104c168d325581acd9cd8d)
|
||||
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
||||
---
|
||||
src/qemu/qemu_driver.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
||||
index d6b1e9f00c..48cd5b95d9 100644
|
||||
--- a/src/qemu/qemu_driver.c
|
||||
+++ b/src/qemu/qemu_driver.c
|
||||
@@ -20376,7 +20376,7 @@ qemuDomainSetTimeAgent(virQEMUDriverPtr driver,
|
||||
qemuDomainObjExitAgent(vm, agent);
|
||||
|
||||
endjob:
|
||||
- qemuDomainObjEndJob(driver, vm);
|
||||
+ qemuDomainObjEndAgentJob(vm);
|
||||
return ret;
|
||||
}
|
||||
|
||||
--
|
||||
2.24.1
|
||||
|
||||
@ -0,0 +1,325 @@
|
||||
From c378ab3e7fe84ac69ad787c099f24fd32dbbf6e4 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <c378ab3e7fe84ac69ad787c099f24fd32dbbf6e4.1586091631.git.mprivozn@redhat.com>
|
||||
From: Michal Privoznik <mprivozn@redhat.com>
|
||||
Date: Sun, 5 Apr 2020 14:41:45 +0200
|
||||
Subject: [PATCH] Do not use sysconfig
|
||||
|
||||
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
||||
---
|
||||
src/Makefile.am | 21 ++-------------------
|
||||
src/interface/virtinterfaced.service.in | 1 -
|
||||
src/libxl/virtxend.service.in | 1 -
|
||||
src/locking/virtlockd.service.in | 3 +--
|
||||
src/logging/virtlogd.service.in | 3 +--
|
||||
src/lxc/virtlxcd.service.in | 1 -
|
||||
src/network/virtnetworkd.service.in | 1 -
|
||||
src/node_device/virtnodedevd.service.in | 1 -
|
||||
src/nwfilter/virtnwfilterd.service.in | 1 -
|
||||
src/qemu/virtqemud.service.in | 1 -
|
||||
src/remote/libvirtd.service.in | 3 +--
|
||||
src/remote/virtproxyd.service.in | 1 -
|
||||
src/secret/virtsecretd.service.in | 1 -
|
||||
src/storage/virtstoraged.service.in | 1 -
|
||||
src/vbox/virtvboxd.service.in | 1 -
|
||||
src/vz/virtvzd.service.in | 1 -
|
||||
tools/Makefile.am | 13 ++-----------
|
||||
tools/libvirt-guests.service.in | 2 +-
|
||||
tools/libvirt-guests.sysconf | 6 ++++++
|
||||
19 files changed, 14 insertions(+), 49 deletions(-)
|
||||
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index 12dd6b80e1..10f1bb769d 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -522,23 +522,6 @@ EXTRA_DIST += \
|
||||
$(SYSCONF_FILES) \
|
||||
$(OPENRC_CONF_FILES)
|
||||
|
||||
-install-sysconfig:
|
||||
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
|
||||
- for f in $(SYSCONF_FILES:%.sysconf=%) ; \
|
||||
- do \
|
||||
- tgt=`basename $$f`; \
|
||||
- $(INSTALL_DATA) $(srcdir)/$$f.sysconf \
|
||||
- $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
|
||||
- done
|
||||
-
|
||||
-uninstall-sysconfig:
|
||||
- for f in $(SYSCONF_FILES:%.sysconf=%) ; \
|
||||
- do \
|
||||
- tgt=`basename $$f`; \
|
||||
- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
|
||||
- done
|
||||
- rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
|
||||
-
|
||||
OPENRC_CONF_DIR = $(sysconfdir)/conf.d
|
||||
|
||||
install-openrc-conf:
|
||||
@@ -604,14 +587,14 @@ SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
|
||||
BUILT_SOURCES += $(SYSTEMD_UNIT_FILES)
|
||||
DISTCLEANFILES += $(SYSTEMD_UNIT_FILES)
|
||||
|
||||
-install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig
|
||||
+install-systemd: $(SYSTEMD_UNIT_FILES)
|
||||
$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
|
||||
for f in $(SYSTEMD_UNIT_FILES); \
|
||||
do \
|
||||
$(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \
|
||||
done
|
||||
|
||||
-uninstall-systemd: uninstall-sysconfig
|
||||
+uninstall-systemd:
|
||||
rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%)
|
||||
rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :
|
||||
|
||||
diff --git a/src/interface/virtinterfaced.service.in b/src/interface/virtinterfaced.service.in
|
||||
index 73d409b81b..2d2c0138f5 100644
|
||||
--- a/src/interface/virtinterfaced.service.in
|
||||
+++ b/src/interface/virtinterfaced.service.in
|
||||
@@ -13,7 +13,6 @@ Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
-EnvironmentFile=-@sysconfdir@/sysconfig/virtinterfaced
|
||||
ExecStart=@sbindir@/virtinterfaced $VIRTINTERFACED_ARGS
|
||||
ExecReload=/bin/kill -HUP $MAINPID
|
||||
Restart=on-failure
|
||||
diff --git a/src/libxl/virtxend.service.in b/src/libxl/virtxend.service.in
|
||||
index a863917467..5b2d16f627 100644
|
||||
--- a/src/libxl/virtxend.service.in
|
||||
+++ b/src/libxl/virtxend.service.in
|
||||
@@ -17,7 +17,6 @@ ConditionPathExists=/proc/xen/capabilities
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
-EnvironmentFile=-@sysconfdir@/sysconfig/virtxend
|
||||
ExecStart=@sbindir@/virtxend $VIRTXEND_ARGS
|
||||
ExecReload=/bin/kill -HUP $MAINPID
|
||||
Restart=on-failure
|
||||
diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
|
||||
index e7f8057c06..2449b201d9 100644
|
||||
--- a/src/locking/virtlockd.service.in
|
||||
+++ b/src/locking/virtlockd.service.in
|
||||
@@ -7,8 +7,7 @@ Documentation=man:virtlockd(8)
|
||||
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
|
||||
diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in
|
||||
index daff48e67d..43736191d5 100644
|
||||
--- a/src/logging/virtlogd.service.in
|
||||
+++ b/src/logging/virtlogd.service.in
|
||||
@@ -7,8 +7,7 @@ Documentation=man:virtlogd(8)
|
||||
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
|
||||
diff --git a/src/lxc/virtlxcd.service.in b/src/lxc/virtlxcd.service.in
|
||||
index 3af7c1a52d..cff421d988 100644
|
||||
--- a/src/lxc/virtlxcd.service.in
|
||||
+++ b/src/lxc/virtlxcd.service.in
|
||||
@@ -18,7 +18,6 @@ Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
-EnvironmentFile=-@sysconfdir@/sysconfig/virtlxcd
|
||||
ExecStart=@sbindir@/virtlxcd $VIRTLXCD_ARGS
|
||||
ExecReload=/bin/kill -HUP $MAINPID
|
||||
KillMode=process
|
||||
diff --git a/src/network/virtnetworkd.service.in b/src/network/virtnetworkd.service.in
|
||||
index e7f1326945..49fb7b99ff 100644
|
||||
--- a/src/network/virtnetworkd.service.in
|
||||
+++ b/src/network/virtnetworkd.service.in
|
||||
@@ -13,7 +13,6 @@ Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
-EnvironmentFile=-@sysconfdir@/sysconfig/virtnetworkd
|
||||
ExecStart=@sbindir@/virtnetworkd $VIRTNETWORKD_ARGS
|
||||
ExecReload=/bin/kill -HUP $MAINPID
|
||||
Restart=on-failure
|
||||
diff --git a/src/node_device/virtnodedevd.service.in b/src/node_device/virtnodedevd.service.in
|
||||
index d2453dd620..847263e8b9 100644
|
||||
--- a/src/node_device/virtnodedevd.service.in
|
||||
+++ b/src/node_device/virtnodedevd.service.in
|
||||
@@ -13,7 +13,6 @@ Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
-EnvironmentFile=-@sysconfdir@/sysconfig/virtnodedevd
|
||||
ExecStart=@sbindir@/virtnodedevd $VIRTNODEDEVD_ARGS
|
||||
ExecReload=/bin/kill -HUP $MAINPID
|
||||
Restart=on-failure
|
||||
diff --git a/src/nwfilter/virtnwfilterd.service.in b/src/nwfilter/virtnwfilterd.service.in
|
||||
index dda7c01a3d..bb0bf0afa4 100644
|
||||
--- a/src/nwfilter/virtnwfilterd.service.in
|
||||
+++ b/src/nwfilter/virtnwfilterd.service.in
|
||||
@@ -13,7 +13,6 @@ Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
-EnvironmentFile=-@sysconfdir@/sysconfig/virtnwfilterd
|
||||
ExecStart=@sbindir@/virtnwfilterd $VIRTNWFILTERD_ARGS
|
||||
ExecReload=/bin/kill -HUP $MAINPID
|
||||
Restart=on-failure
|
||||
diff --git a/src/qemu/virtqemud.service.in b/src/qemu/virtqemud.service.in
|
||||
index 8abc9d3a7f..3539be3c0b 100644
|
||||
--- a/src/qemu/virtqemud.service.in
|
||||
+++ b/src/qemu/virtqemud.service.in
|
||||
@@ -18,7 +18,6 @@ Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
-EnvironmentFile=-@sysconfdir@/sysconfig/virtqemud
|
||||
ExecStart=@sbindir@/virtqemud $VIRTQEMUD_ARGS
|
||||
ExecReload=/bin/kill -HUP $MAINPID
|
||||
KillMode=process
|
||||
diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
|
||||
index 90b2cad5b0..d16b11ec8d 100644
|
||||
--- a/src/remote/libvirtd.service.in
|
||||
+++ b/src/remote/libvirtd.service.in
|
||||
@@ -25,8 +25,7 @@ Documentation=https://libvirt.org
|
||||
|
||||
[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
|
||||
diff --git a/src/remote/virtproxyd.service.in b/src/remote/virtproxyd.service.in
|
||||
index f43ce9ee6e..9076e638a7 100644
|
||||
--- a/src/remote/virtproxyd.service.in
|
||||
+++ b/src/remote/virtproxyd.service.in
|
||||
@@ -13,7 +13,6 @@ Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
-EnvironmentFile=-@sysconfdir@/sysconfig/virtproxyd
|
||||
ExecStart=@sbindir@/virtproxyd $VIRTPROXYD_ARGS
|
||||
ExecReload=/bin/kill -HUP $MAINPID
|
||||
Restart=on-failure
|
||||
diff --git a/src/secret/virtsecretd.service.in b/src/secret/virtsecretd.service.in
|
||||
index 8444142a3a..57e74c2d38 100644
|
||||
--- a/src/secret/virtsecretd.service.in
|
||||
+++ b/src/secret/virtsecretd.service.in
|
||||
@@ -13,7 +13,6 @@ Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
-EnvironmentFile=-@sysconfdir@/sysconfig/virtsecretd
|
||||
ExecStart=@sbindir@/virtsecretd $VIRTSECRETD_ARGS
|
||||
ExecReload=/bin/kill -HUP $MAINPID
|
||||
Restart=on-failure
|
||||
diff --git a/src/storage/virtstoraged.service.in b/src/storage/virtstoraged.service.in
|
||||
index fc3e9a1b69..a82319b214 100644
|
||||
--- a/src/storage/virtstoraged.service.in
|
||||
+++ b/src/storage/virtstoraged.service.in
|
||||
@@ -15,7 +15,6 @@ Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
-EnvironmentFile=-@sysconfdir@/sysconfig/virtstoraged
|
||||
ExecStart=@sbindir@/virtstoraged $VIRTSTORAGED_ARGS
|
||||
ExecReload=/bin/kill -HUP $MAINPID
|
||||
Restart=on-failure
|
||||
diff --git a/src/vbox/virtvboxd.service.in b/src/vbox/virtvboxd.service.in
|
||||
index ebb31dde07..21eec57bab 100644
|
||||
--- a/src/vbox/virtvboxd.service.in
|
||||
+++ b/src/vbox/virtvboxd.service.in
|
||||
@@ -14,7 +14,6 @@ Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
-EnvironmentFile=-@sysconfdir@/sysconfig/virtvboxd
|
||||
ExecStart=@sbindir@/virtvboxd $VIRTVBOXD_ARGS
|
||||
ExecReload=/bin/kill -HUP $MAINPID
|
||||
Restart=on-failure
|
||||
diff --git a/src/vz/virtvzd.service.in b/src/vz/virtvzd.service.in
|
||||
index f551cb8fbf..99b9b4f1bf 100644
|
||||
--- a/src/vz/virtvzd.service.in
|
||||
+++ b/src/vz/virtvzd.service.in
|
||||
@@ -14,7 +14,6 @@ Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
-EnvironmentFile=-@sysconfdir@/sysconfig/virtvzd
|
||||
ExecStart=@sbindir@/virtvzd $VIRTVZD_ARGS
|
||||
ExecReload=/bin/kill -HUP $MAINPID
|
||||
Restart=on-failure
|
||||
diff --git a/tools/Makefile.am b/tools/Makefile.am
|
||||
index 53df930e0a..598a62ddef 100644
|
||||
--- a/tools/Makefile.am
|
||||
+++ b/tools/Makefile.am
|
||||
@@ -294,15 +294,6 @@ install-data-local: install-systemd install-nss \
|
||||
uninstall-local: uninstall-systemd uninstall-nss \
|
||||
uninstall-bash-completion
|
||||
|
||||
-install-sysconfig:
|
||||
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
|
||||
- $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \
|
||||
- $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
|
||||
-
|
||||
-uninstall-sysconfig:
|
||||
- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
|
||||
- rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||:
|
||||
-
|
||||
EXTRA_DIST += libvirt-guests.sh.in
|
||||
|
||||
libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir)/config.status
|
||||
@@ -322,12 +313,12 @@ EXTRA_DIST += libvirt-guests.service.in
|
||||
SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
|
||||
|
||||
if LIBVIRT_INIT_SCRIPT_SYSTEMD
|
||||
-install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh
|
||||
+install-systemd: libvirt-guests.service libvirt-guests.sh
|
||||
$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
|
||||
$(INSTALL_DATA) libvirt-guests.service \
|
||||
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
|
||||
|
||||
-uninstall-systemd: uninstall-sysconfig
|
||||
+uninstall-systemd:
|
||||
rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
|
||||
rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||:
|
||||
|
||||
diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
|
||||
index 10c664016a..f0f417bffb 100644
|
||||
--- a/tools/libvirt-guests.service.in
|
||||
+++ b/tools/libvirt-guests.service.in
|
||||
@@ -10,7 +10,7 @@ Documentation=man:libvirtd(8)
|
||||
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
|
||||
diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf
|
||||
index 0765efec21..a1a53d8a8d 100644
|
||||
--- 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
|
||||
--
|
||||
2.24.1
|
||||
|
||||
@ -1,236 +0,0 @@
|
||||
#!/sbin/openrc-run
|
||||
|
||||
description="Virtual Machine Management (libvirt) Guests"
|
||||
|
||||
depend() {
|
||||
use libvirtd
|
||||
}
|
||||
|
||||
# set the default to QEMU
|
||||
[ -z "${LIBVIRT_URIS}" ] && LIBVIRT_URIS="qemu:///system"
|
||||
|
||||
# default to suspending the VM via managedsave
|
||||
case "${LIBVIRT_SHUTDOWN}" in
|
||||
managedsave|shutdown|destroy) ;;
|
||||
*) LIBVIRT_SHUTDOWN="managedsave" ;;
|
||||
esac
|
||||
|
||||
# default to 500 seconds
|
||||
[ -z ${LIBVIRT_MAXWAIT} ] && LIBVIRT_MAXWAIT=500
|
||||
|
||||
gueststatefile="/var/lib/libvirt/libvirt-guests.state"
|
||||
netstatefile="/var/lib/libvirt/libvirt-net.state"
|
||||
|
||||
do_virsh() {
|
||||
local hvuri=$1
|
||||
shift
|
||||
|
||||
# if unset, default to qemu
|
||||
[ -z ${hvuri} ] && hvuri="qemu:///system"
|
||||
# if only qemu was supplied then correct the value
|
||||
[ "xqemu" = x${hvuri} ] && hvuri="qemu:///system"
|
||||
|
||||
# Silence errors because virsh always throws an error about
|
||||
# not finding the hypervisor version when connecting to libvirtd
|
||||
# lastly strip the blank line at the end
|
||||
LC_ALL=C virsh -c ${hvuri} "$@" 2>/dev/null | head -n -1
|
||||
}
|
||||
|
||||
libvirtd_dom_list() {
|
||||
# Only work with domains by their UUIDs
|
||||
local hvuri=$1
|
||||
shift
|
||||
|
||||
# The grep is to remove dom0 for xen domains. Otherwise we never hit 0
|
||||
do_virsh "${hvuri}" list --uuid $@ | grep -v 00000000-0000-0000-0000-000000000000
|
||||
}
|
||||
|
||||
libvirtd_dom_count() {
|
||||
local hvuri=$1
|
||||
shift
|
||||
|
||||
libvirtd_dom_list "${hvuri}" $@ | wc -l
|
||||
}
|
||||
|
||||
libvirtd_net_list() {
|
||||
# Only work with networks by their UUIDs
|
||||
local hvuri=$1
|
||||
shift
|
||||
|
||||
do_virsh "${hvuri}" net-list --uuid $@
|
||||
}
|
||||
|
||||
libvirtd_net_count() {
|
||||
local hvuri=$1
|
||||
shift
|
||||
|
||||
libvirtd_net_list "${hvuri}" $@ | wc -l
|
||||
}
|
||||
|
||||
libvirtd_dom_stop() {
|
||||
# stops all persistent or transient domains for a given URI
|
||||
# $1 - uri
|
||||
# $2 - persisent/transient
|
||||
|
||||
local uri=$1
|
||||
local persist=$2
|
||||
local shutdown_type=${LIBVIRT_SHUTDOWN}
|
||||
local counter=${LIBVIRT_MAXWAIT}
|
||||
local dom_name=
|
||||
local dom_as=
|
||||
local dom_ids=
|
||||
local uuid=
|
||||
local dom_count=
|
||||
|
||||
[ "${persist}" = "--transient" ] && shutdown_type="shutdown"
|
||||
[ -n "${counter}" ] || counter=500
|
||||
|
||||
einfo " Shutting down domain(s) ..."
|
||||
|
||||
# grab all persistent or transient domains running
|
||||
dom_ids=$(libvirtd_dom_list ${uri} ${persist})
|
||||
|
||||
for uuid in ${dom_ids}; do
|
||||
# Get the name
|
||||
dom_name=$(do_virsh ${uri} domname ${uuid})
|
||||
einfo " ${dom_name}"
|
||||
# Get autostart state
|
||||
dom_as=$(do_virsh ${uri} dominfo ${uuid} | \
|
||||
awk '$1 == "Autostart:" { print $2 }')
|
||||
|
||||
if [ "${persist}" = "--persistent" ]; then
|
||||
# Save our running state only if LIBVIRT_IGNORE_AUTOSTART != yes
|
||||
if [ "x${LIBVIRT_IGNORE_AUTOSTART}" = "xyes" ] && \
|
||||
[ ${dom_as} = "enabled" ]; then
|
||||
:
|
||||
else
|
||||
echo "${uri} ${uuid}" >> ${gueststatefile}
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
# Now let's stop it
|
||||
do_virsh "${uri}" ${shutdown_type} ${uuid} > /dev/null
|
||||
|
||||
done
|
||||
|
||||
dom_count="$(libvirtd_dom_count ${uri} ${persist})"
|
||||
while [ ${dom_count} -gt 0 ] && [ ${counter} -gt 0 ] ; do
|
||||
dom_count="$(libvirtd_dom_count ${uri} ${persist})"
|
||||
sleep 1
|
||||
if [ "${shutdown_type}" = "shutdown" ]; then
|
||||
counter=$((${counter} - 1))
|
||||
fi
|
||||
printf "."
|
||||
done
|
||||
|
||||
if [ "${shutdown_type}" = "shutdown" ]; then
|
||||
# grab all domains still running
|
||||
dom_ids=$(libvirtd_dom_list ${uri} ${persist})
|
||||
for uuid in ${dom_ids}; do
|
||||
dom_name=$(do_virsh ${uri} domname ${uuid})
|
||||
eerror " ${dom_name} forcibly stopped"
|
||||
do_virsh "${uri}" destroy ${uuid} > /dev/null
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
libvirtd_net_stop() {
|
||||
# stops all persistent or transient domains for a given URI
|
||||
# $1 - uri
|
||||
# $2 - persisent/transient
|
||||
|
||||
local uri=$1
|
||||
local persist=$2
|
||||
local uuid=
|
||||
local net_name=
|
||||
|
||||
if [ "${LIBVIRT_NET_SHUTDOWN}" != "no" ]; then
|
||||
|
||||
einfo " Shutting down network(s):"
|
||||
for uuid in $(libvirtd_net_list ${uri} ${persist}); do
|
||||
net_name=$(do_virsh ${uri} net-name ${uuid})
|
||||
einfo " ${net_name}"
|
||||
|
||||
if [ "${persist}" = "--persistent" ]; then
|
||||
# Save our running state
|
||||
echo "${uri} ${uuid}" >> ${netstatefile}
|
||||
|
||||
fi
|
||||
|
||||
# Actually stop the network
|
||||
do_virsh qemu net-destroy ${uuid} > /dev/null
|
||||
done
|
||||
|
||||
fi
|
||||
}
|
||||
|
||||
start() {
|
||||
local uri=
|
||||
local uuid=
|
||||
local name=
|
||||
|
||||
for uri in ${LIBVIRT_URIS}; do
|
||||
do_virsh "${uri}" connect
|
||||
if [ $? -ne 0 ]; then
|
||||
eerror "Failed to connect to '${uri}'. Domains may not start."
|
||||
fi
|
||||
done
|
||||
|
||||
[ ! -e "${netstatefile}" ] && touch "${netstatefile}"
|
||||
[ ! -e "${gueststatefile}" ] && touch "${gueststatefile}"
|
||||
|
||||
# if the user didn't want to start any guests up then respect their wish
|
||||
[ "x${LIBVIRT_START}" = "xno" ] && return 0
|
||||
|
||||
# start networks
|
||||
ebegin "Starting libvirt networks"
|
||||
while read -r uri uuid
|
||||
do
|
||||
# ignore trash
|
||||
[ -z "${uri}" ] || [ -z "${uuid}" ] && continue
|
||||
|
||||
name=$(do_virsh "${uri}" net-name ${uuid})
|
||||
einfo " ${name}"
|
||||
do_virsh "${uri}" net-start ${uuid} > /dev/null
|
||||
done <"${netstatefile}"
|
||||
eend 0
|
||||
|
||||
# start domains
|
||||
ebegin "Starting libvirt domains"
|
||||
while read -r uri uuid
|
||||
do
|
||||
# ignore trash
|
||||
[ -z "${uri}" ] || [ -z "${uuid}" ] && continue
|
||||
|
||||
name=$(do_virsh "${uri}" domname ${uuid})
|
||||
einfo " ${name}"
|
||||
do_virsh "${uri}" start ${uuid} > /dev/null
|
||||
done <"${gueststatefile}"
|
||||
eend 0
|
||||
}
|
||||
|
||||
stop() {
|
||||
local counter=
|
||||
local dom_name=
|
||||
local net_name=
|
||||
local dom_ids=
|
||||
local uuid=
|
||||
local dom_count=
|
||||
|
||||
rm -f "${gueststatefile}"
|
||||
[ $? -ne 0 ] && eerror "Unable to save domain state"
|
||||
rm -f "${netstatefile}"
|
||||
[ $? -ne 0 ] && eerror "Unable to save net state"
|
||||
|
||||
for uri in ${LIBVIRT_URIS}; do
|
||||
einfo "Stopping libvirt domains and networks for ${uri}"
|
||||
|
||||
libvirtd_dom_stop "${uri}" "--persistent"
|
||||
libvirtd_dom_stop "${uri}" "--transient"
|
||||
libvirtd_net_stop "${uri}" "--persistent"
|
||||
libvirtd_net_stop "${uri}" "--transient"
|
||||
|
||||
einfo "Done stopping domains and networks for ${uri}"
|
||||
done
|
||||
}
|
||||
@ -1,36 +0,0 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
description="Virtual Machine Management daemon (libvirt)"
|
||||
|
||||
LIBVIRTD_OPTS=${LIBVIRTD_OPTS:-"${LIBVIRTD_OPTS}"}
|
||||
LIBVIRTD_TIMEOUT=${LIBVIRTD_TERMTIMEOUT:-"TERM/25/KILL/5"}
|
||||
|
||||
command="/usr/sbin/libvirtd"
|
||||
command_args="-d ${LIBVIRTD_OPTS}"
|
||||
start_stop_daemon_args="--env KRB5_KTNAME=/etc/libvirt/krb5.tab"
|
||||
pidfile="/run/libvirtd.pid"
|
||||
retry="${LIBVIRTD_TERMTIMEOUT}"
|
||||
|
||||
depend() {
|
||||
need virtlogd
|
||||
use dbus virtlockd
|
||||
after ntp-client ntpd nfs nfsmount portmap rpc.statd iptables ip6tables ebtables corosync sanlock cgconfig xenconsoled
|
||||
USE_FLAG_FIREWALLD
|
||||
USE_FLAG_AVAHI
|
||||
USE_FLAG_ISCSI
|
||||
USE_FLAG_RBD
|
||||
}
|
||||
|
||||
start_pre() {
|
||||
# Test configuration directories in /etc/libvirt/ to be either not
|
||||
# present or a directory, i.e. not a regular file, bug #532892
|
||||
|
||||
checkpath --directory /etc/libvirt/lxc || return 1
|
||||
checkpath --directory /etc/libvirt/nwfilter || return 1
|
||||
[ -L /etc/libvirt/qemu ] ||
|
||||
checkpath --directory /etc/libvirt/qemu || return 1
|
||||
[ -L /etc/libvirt/storage ] ||
|
||||
checkpath --directory /etc/libvirt/storage || return 1
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue