root
4 years ago
parent
91dbc1e578
commit
8789bc94bf
Binary file not shown.
Binary file not shown.
@ -1,2 +1 @@
|
|||||||
DIST glance-19.0.1.tar.gz 1943385 BLAKE2B 5e2530a05a171f640499a3e595ad15be29e95a10e6f22a186514cc73c4fc77d0ae5bf00a3d43616e8cb53ccde748a6560dd448db631c86343b2667c0dc6719a1 SHA512 b672d84d709149191103ed54cca91d604b43460b1bd6ab56263c1b8c382d1c4261ebfd58ca9e233ee50b248327bcbfd7bfd47fee57c8c08a9635b2ca0c0cffe4
|
|
||||||
DIST glance-19.0.2.tar.gz 1943984 BLAKE2B 2fc0d30a11a056b02471e1d038f85b327632b02b7ee177fc4b44e571be9713905cd5bfc6c3d8103edb7a04bf5c51dcc1edc31ce81f25951df84236ad5a6898c6 SHA512 cd0e88f8bba81536eb95f49d1e3f029d8951b2c81208fcd6c32dc877ce51df6026521a6829705e97c8aacd2bc6e4f5eddeae98dfea0c41e00c7f6757dbcfbfa2
|
DIST glance-19.0.2.tar.gz 1943984 BLAKE2B 2fc0d30a11a056b02471e1d038f85b327632b02b7ee177fc4b44e571be9713905cd5bfc6c3d8103edb7a04bf5c51dcc1edc31ce81f25951df84236ad5a6898c6 SHA512 cd0e88f8bba81536eb95f49d1e3f029d8951b2c81208fcd6c32dc877ce51df6026521a6829705e97c8aacd2bc6e4f5eddeae98dfea0c41e00c7f6757dbcfbfa2
|
||||||
|
|||||||
@ -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 +1,2 @@
|
|||||||
DIST engrampa-1.22.1.tar.xz 1363488 BLAKE2B 0f71e94af50443f9f562b0eed461ca1160fab0a5a3cd02c845fac09ee2466cb8634a458a6a4488ff5ac6674b0f525eccf754b8b1cc7e3f1729d4eb6ac224e025 SHA512 111eeb470555ae8edb7754159bb2e70b03cbbc7b1c9d61c253d9d67e50d84ff0e0654e16547883c39aeeb223e8ba58201d45b50819784fc6cf7a21f0cf176c70
|
DIST engrampa-1.22.1.tar.xz 1363488 BLAKE2B 0f71e94af50443f9f562b0eed461ca1160fab0a5a3cd02c845fac09ee2466cb8634a458a6a4488ff5ac6674b0f525eccf754b8b1cc7e3f1729d4eb6ac224e025 SHA512 111eeb470555ae8edb7754159bb2e70b03cbbc7b1c9d61c253d9d67e50d84ff0e0654e16547883c39aeeb223e8ba58201d45b50819784fc6cf7a21f0cf176c70
|
||||||
|
DIST engrampa-1.22.2.tar.xz 1379564 BLAKE2B 4193fe3cc06f48e333a37af02ecef9c8e501dabe9a0a43ed07ead543279cc9edb77ea31c4b35490edb8ecaf12fea7f14059ba4ccfc591c1a3727076d9bd5c8bc SHA512 7d57d863a7e6236fdff8c9925647438056474cc7fed32a4ba6a2ba6121a856aa070b47292edb0db447369082cddff9b40978c7c92aecc3d8c2ebc17a4cf3ea99
|
||||||
|
|||||||
@ -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,2 +1 @@
|
|||||||
DIST certbot-1.2.0.tar.gz 1354262 BLAKE2B 1abdf4cb99ecdac6b9b8d2ebdd6897a3182a147f0175e2db4c6b0feaa3f6c615ee3146dd63627a83266c223456c5aba44b018be4059574d0209aec89065d9925 SHA512 ed52a31a71b3762b8cd217ea2784d9cb01f7c1a50cef3b7e0d99483ca3ab623b90ab7d4896674e0d1c06e2e8370c02162418d934de7d3048b0471416616146fe
|
|
||||||
DIST certbot-1.3.0.tar.gz 1362945 BLAKE2B bb36a7737275332f018d7f2283286e07e041892cc366f79e68df9eee7e57ca2186d36895d1923b032068a365878d09e49e17c1399a7418dbd8607c9a7efc1c26 SHA512 4205cdd1f3ddf500b9b952744db234636c086a856df80acd2d776305f4501eed07995e453e5c9b2c711fb0d1f1987d2bb8baaa13fccce8e000a38f486cfdc5d3
|
DIST certbot-1.3.0.tar.gz 1362945 BLAKE2B bb36a7737275332f018d7f2283286e07e041892cc366f79e68df9eee7e57ca2186d36895d1923b032068a365878d09e49e17c1399a7418dbd8607c9a7efc1c26 SHA512 4205cdd1f3ddf500b9b952744db234636c086a856df80acd2d776305f4501eed07995e453e5c9b2c711fb0d1f1987d2bb8baaa13fccce8e000a38f486cfdc5d3
|
||||||
|
|||||||
@ -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,2 +1 @@
|
|||||||
DIST certbot-1.2.0.tar.gz 1354262 BLAKE2B 1abdf4cb99ecdac6b9b8d2ebdd6897a3182a147f0175e2db4c6b0feaa3f6c615ee3146dd63627a83266c223456c5aba44b018be4059574d0209aec89065d9925 SHA512 ed52a31a71b3762b8cd217ea2784d9cb01f7c1a50cef3b7e0d99483ca3ab623b90ab7d4896674e0d1c06e2e8370c02162418d934de7d3048b0471416616146fe
|
|
||||||
DIST certbot-1.3.0.tar.gz 1362945 BLAKE2B bb36a7737275332f018d7f2283286e07e041892cc366f79e68df9eee7e57ca2186d36895d1923b032068a365878d09e49e17c1399a7418dbd8607c9a7efc1c26 SHA512 4205cdd1f3ddf500b9b952744db234636c086a856df80acd2d776305f4501eed07995e453e5c9b2c711fb0d1f1987d2bb8baaa13fccce8e000a38f486cfdc5d3
|
DIST certbot-1.3.0.tar.gz 1362945 BLAKE2B bb36a7737275332f018d7f2283286e07e041892cc366f79e68df9eee7e57ca2186d36895d1923b032068a365878d09e49e17c1399a7418dbd8607c9a7efc1c26 SHA512 4205cdd1f3ddf500b9b952744db234636c086a856df80acd2d776305f4501eed07995e453e5c9b2c711fb0d1f1987d2bb8baaa13fccce8e000a38f486cfdc5d3
|
||||||
|
|||||||
@ -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,2 +1 @@
|
|||||||
DIST certbot-1.2.0.tar.gz 1354262 BLAKE2B 1abdf4cb99ecdac6b9b8d2ebdd6897a3182a147f0175e2db4c6b0feaa3f6c615ee3146dd63627a83266c223456c5aba44b018be4059574d0209aec89065d9925 SHA512 ed52a31a71b3762b8cd217ea2784d9cb01f7c1a50cef3b7e0d99483ca3ab623b90ab7d4896674e0d1c06e2e8370c02162418d934de7d3048b0471416616146fe
|
|
||||||
DIST certbot-1.3.0.tar.gz 1362945 BLAKE2B bb36a7737275332f018d7f2283286e07e041892cc366f79e68df9eee7e57ca2186d36895d1923b032068a365878d09e49e17c1399a7418dbd8607c9a7efc1c26 SHA512 4205cdd1f3ddf500b9b952744db234636c086a856df80acd2d776305f4501eed07995e453e5c9b2c711fb0d1f1987d2bb8baaa13fccce8e000a38f486cfdc5d3
|
DIST certbot-1.3.0.tar.gz 1362945 BLAKE2B bb36a7737275332f018d7f2283286e07e041892cc366f79e68df9eee7e57ca2186d36895d1923b032068a365878d09e49e17c1399a7418dbd8607c9a7efc1c26 SHA512 4205cdd1f3ddf500b9b952744db234636c086a856df80acd2d776305f4501eed07995e453e5c9b2c711fb0d1f1987d2bb8baaa13fccce8e000a38f486cfdc5d3
|
||||||
|
|||||||
@ -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,2 +1 @@
|
|||||||
DIST certbot-1.2.0.tar.gz 1354262 BLAKE2B 1abdf4cb99ecdac6b9b8d2ebdd6897a3182a147f0175e2db4c6b0feaa3f6c615ee3146dd63627a83266c223456c5aba44b018be4059574d0209aec89065d9925 SHA512 ed52a31a71b3762b8cd217ea2784d9cb01f7c1a50cef3b7e0d99483ca3ab623b90ab7d4896674e0d1c06e2e8370c02162418d934de7d3048b0471416616146fe
|
|
||||||
DIST certbot-1.3.0.tar.gz 1362945 BLAKE2B bb36a7737275332f018d7f2283286e07e041892cc366f79e68df9eee7e57ca2186d36895d1923b032068a365878d09e49e17c1399a7418dbd8607c9a7efc1c26 SHA512 4205cdd1f3ddf500b9b952744db234636c086a856df80acd2d776305f4501eed07995e453e5c9b2c711fb0d1f1987d2bb8baaa13fccce8e000a38f486cfdc5d3
|
DIST certbot-1.3.0.tar.gz 1362945 BLAKE2B bb36a7737275332f018d7f2283286e07e041892cc366f79e68df9eee7e57ca2186d36895d1923b032068a365878d09e49e17c1399a7418dbd8607c9a7efc1c26 SHA512 4205cdd1f3ddf500b9b952744db234636c086a856df80acd2d776305f4501eed07995e453e5c9b2c711fb0d1f1987d2bb8baaa13fccce8e000a38f486cfdc5d3
|
||||||
|
|||||||
@ -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
|
|
||||||
}
|
|
||||||
@ -1,3 +1,4 @@
|
|||||||
DIST EasyRSA-3.0.4.tgz 37721 BLAKE2B 84d81eb86dfee42f6de935cbd308262d36626170880a24d260dd8ae708d6340feb63866cb1704c9209675112eef4a251399e19948e88067e90b410c00707a770 SHA512 0bc145e510891af022c05427436c3ec7a29fce9d83e022954acd0cc470c88c43f5549af0b6263b46e8dc5fd167621a118cba0c01a514c51032cea8f1efbb9787
|
DIST EasyRSA-3.0.4.tgz 37721 BLAKE2B 84d81eb86dfee42f6de935cbd308262d36626170880a24d260dd8ae708d6340feb63866cb1704c9209675112eef4a251399e19948e88067e90b410c00707a770 SHA512 0bc145e510891af022c05427436c3ec7a29fce9d83e022954acd0cc470c88c43f5549af0b6263b46e8dc5fd167621a118cba0c01a514c51032cea8f1efbb9787
|
||||||
DIST easy-rsa-3.0.5.tar.gz 638366 BLAKE2B 990ef0cc7effd80d06d15dbb2dc3ef9a0a282a4adb501475fbd43c1b50bead374ba78ee9652e9c0f8d2e54354be4da6a0ae302e4ef2d576bd7fd981d59566d64 SHA512 9231ca7fda489a230d8418679d8824503ae680e2de6682d5f2d2fa716597f7df5980b7b88a3f6eb4fa0b7d9bbead59a1e2e4b8f4a5a36bda7f78ffa8f3c23d34
|
DIST easy-rsa-3.0.5.tar.gz 638366 BLAKE2B 990ef0cc7effd80d06d15dbb2dc3ef9a0a282a4adb501475fbd43c1b50bead374ba78ee9652e9c0f8d2e54354be4da6a0ae302e4ef2d576bd7fd981d59566d64 SHA512 9231ca7fda489a230d8418679d8824503ae680e2de6682d5f2d2fa716597f7df5980b7b88a3f6eb4fa0b7d9bbead59a1e2e4b8f4a5a36bda7f78ffa8f3c23d34
|
||||||
DIST easy-rsa-3.0.6.tar.gz 663190 BLAKE2B 2c7f526c3ddddf13b4c6193bcd52bc992b9e81db28dec8cd9b5f44aba231eed18b6f25c64a42072a6409a5dd23db21fa8ccefc210ce924c68ad3a79475d2eaa1 SHA512 ce553b483ed2facab71d9bc212c4a454c6ed4a6489a0b963c4fc190916c71d048955e1e24d3e58a39438a51a83a02bf696bb2b9292c6ff665113043509062eb1
|
DIST easy-rsa-3.0.6.tar.gz 663190 BLAKE2B 2c7f526c3ddddf13b4c6193bcd52bc992b9e81db28dec8cd9b5f44aba231eed18b6f25c64a42072a6409a5dd23db21fa8ccefc210ce924c68ad3a79475d2eaa1 SHA512 ce553b483ed2facab71d9bc212c4a454c6ed4a6489a0b963c4fc190916c71d048955e1e24d3e58a39438a51a83a02bf696bb2b9292c6ff665113043509062eb1
|
||||||
|
DIST easy-rsa-3.0.7.tar.gz 3863830 BLAKE2B e76db344912296d4659ae61e094595a0ebb30258e2819908f80028a771bf49b5ee02293ba4bd46c19926828724f27b149d2727a2f898fa7fbe48abdb16dbee86 SHA512 4e7dadafd9e3f8381029cf4a20f0a6fe58c6bee0571e0f8ff9711e1dae386bbfd81b5d8bbec58f415e367d613b90465a4635e8f924668ad73de555fe8bb8c82c
|
||||||
|
|||||||
@ -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 +1,2 @@
|
|||||||
DIST cppman-0.4.8.tar.gz 3185978 BLAKE2B 9f662874eb6b6540e02a2b371fa47e53e0893239fbfcc65421fa5c7c4bc5f88c4cfd2facf08deb13606f5cf7c895a1a07e119e1c15bbc98b95af5f8056c6a5e8 SHA512 f5b93774988dad592b31670d6c21718bd034e4e94858982e1756e8db89779d12001fd786ba629211b038b173b7b507382277a3db7fb35363dba28cd029e69a7d
|
DIST cppman-0.4.8.tar.gz 3185978 BLAKE2B 9f662874eb6b6540e02a2b371fa47e53e0893239fbfcc65421fa5c7c4bc5f88c4cfd2facf08deb13606f5cf7c895a1a07e119e1c15bbc98b95af5f8056c6a5e8 SHA512 f5b93774988dad592b31670d6c21718bd034e4e94858982e1756e8db89779d12001fd786ba629211b038b173b7b507382277a3db7fb35363dba28cd029e69a7d
|
||||||
|
DIST cppman-0.4.9.tar.gz 3237707 BLAKE2B 23068f8896dd4f9fa3ab86e8e3ddb7de5190af4f59f3cf283537c6ce8c3df60c5deab4972be750464121eeb1ebbde93e30c313869d5fb92e1d784d1294b1d842 SHA512 49957e9c9dcf82a85558d47325912e689ed7786f745015215b32e6f86b97878af6edcb265655674191992ba16171fdbf2220ee43d8c90a0d5eb37f1fb584c3ce
|
||||||
|
|||||||
@ -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,2 +1,4 @@
|
|||||||
DIST vim-8.2.0210-gentoo-patches.tar.bz2 2755 BLAKE2B 21f1fb97c95d4f2eb45968783add80e11011be12fd2d701c267644a44da9782214828e022667c1a0a2ed08aedb7c12b6756a8b8adea4db5c7a3cb7dc94b75fd8 SHA512 c942c33dc033d63569e07523fa7652d1c53685aa64f9e7a4bf4e6126012790ec0ec820a7a9209cfe64096679ba8a9f9394ed92696a933e3c8be10658d16b8a7b
|
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.0360.tar.gz 14842830 BLAKE2B fe3a13cb4bef4ada1bd13cdc80aa9a4ab275d1ff16a7f5308109adc7c5a3459393e1c8153fa32a972141b27cce3aaff50c59416d1ba32e4dca03074be49705a9 SHA512 183bcb5cc73290193de99beb69b56b64efa37db9d905c6e76a51ac727f4447f76346dde632e2dfae9d289abb4b9ca11a14f7e350eaa699fc2c3c7c2e35fc20b2
|
||||||
|
DIST vim-8.2.0508.tar.gz 14885937 BLAKE2B 70d9cbaa69fac168e6719ef6ee0fadef21bc0b4c17e3c01d983cfe7d75ec831089845aae2f4ca2b5eba02ea24664dc968b0d472254db45e13a5a1f9cdc62253a SHA512 0cbe7cb8d16ac9ed2e6b2f7031bf3b962bcfa199ef7421dfa549fd53f42eb00fc20a14d0df13fcdb4b5f06c88e659086f8d277797824e628133ebd66c72232b6
|
||||||
|
|||||||
@ -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
|
||||||
|
}
|
||||||
@ -1,2 +1,4 @@
|
|||||||
DIST vim-8.2.0210-gentoo-patches.tar.bz2 2755 BLAKE2B 21f1fb97c95d4f2eb45968783add80e11011be12fd2d701c267644a44da9782214828e022667c1a0a2ed08aedb7c12b6756a8b8adea4db5c7a3cb7dc94b75fd8 SHA512 c942c33dc033d63569e07523fa7652d1c53685aa64f9e7a4bf4e6126012790ec0ec820a7a9209cfe64096679ba8a9f9394ed92696a933e3c8be10658d16b8a7b
|
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.0360.tar.gz 14842830 BLAKE2B fe3a13cb4bef4ada1bd13cdc80aa9a4ab275d1ff16a7f5308109adc7c5a3459393e1c8153fa32a972141b27cce3aaff50c59416d1ba32e4dca03074be49705a9 SHA512 183bcb5cc73290193de99beb69b56b64efa37db9d905c6e76a51ac727f4447f76346dde632e2dfae9d289abb4b9ca11a14f7e350eaa699fc2c3c7c2e35fc20b2
|
||||||
|
DIST vim-8.2.0508.tar.gz 14885937 BLAKE2B 70d9cbaa69fac168e6719ef6ee0fadef21bc0b4c17e3c01d983cfe7d75ec831089845aae2f4ca2b5eba02ea24664dc968b0d472254db45e13a5a1f9cdc62253a SHA512 0cbe7cb8d16ac9ed2e6b2f7031bf3b962bcfa199ef7421dfa549fd53f42eb00fc20a14d0df13fcdb4b5f06c88e659086f8d277797824e628133ebd66c72232b6
|
||||||
|
|||||||
@ -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,2 +1,4 @@
|
|||||||
DIST vim-8.2.0210-gentoo-patches.tar.bz2 2755 BLAKE2B 21f1fb97c95d4f2eb45968783add80e11011be12fd2d701c267644a44da9782214828e022667c1a0a2ed08aedb7c12b6756a8b8adea4db5c7a3cb7dc94b75fd8 SHA512 c942c33dc033d63569e07523fa7652d1c53685aa64f9e7a4bf4e6126012790ec0ec820a7a9209cfe64096679ba8a9f9394ed92696a933e3c8be10658d16b8a7b
|
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.0360.tar.gz 14842830 BLAKE2B fe3a13cb4bef4ada1bd13cdc80aa9a4ab275d1ff16a7f5308109adc7c5a3459393e1c8153fa32a972141b27cce3aaff50c59416d1ba32e4dca03074be49705a9 SHA512 183bcb5cc73290193de99beb69b56b64efa37db9d905c6e76a51ac727f4447f76346dde632e2dfae9d289abb4b9ca11a14f7e350eaa699fc2c3c7c2e35fc20b2
|
||||||
|
DIST vim-8.2.0508.tar.gz 14885937 BLAKE2B 70d9cbaa69fac168e6719ef6ee0fadef21bc0b4c17e3c01d983cfe7d75ec831089845aae2f4ca2b5eba02ea24664dc968b0d472254db45e13a5a1f9cdc62253a SHA512 0cbe7cb8d16ac9ed2e6b2f7031bf3b962bcfa199ef7421dfa549fd53f42eb00fc20a14d0df13fcdb4b5f06c88e659086f8d277797824e628133ebd66c72232b6
|
||||||
|
|||||||
@ -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.
Binary file not shown.
@ -1,2 +1,3 @@
|
|||||||
DIST libvirt-6.0.0.tar.xz 8686092 BLAKE2B 669054aa3bb3e4f2cf0be2e9ea796b820786661f65495597322e178d7c7e42355b0e3752c8a847cb2fc4405928a30a00544829647aa84cc2e71bc0cb8ce9af5f SHA512 64259c0cffa9fc01192c5474f69d88a61ed0bae0a100379fed6112723a37eff1865ccfc85a19d6b8cd39ed504f04998bb3f6390aaafff797bb41ef65b6ec413c
|
DIST libvirt-6.0.0.tar.xz 8686092 BLAKE2B 669054aa3bb3e4f2cf0be2e9ea796b820786661f65495597322e178d7c7e42355b0e3752c8a847cb2fc4405928a30a00544829647aa84cc2e71bc0cb8ce9af5f SHA512 64259c0cffa9fc01192c5474f69d88a61ed0bae0a100379fed6112723a37eff1865ccfc85a19d6b8cd39ed504f04998bb3f6390aaafff797bb41ef65b6ec413c
|
||||||
DIST libvirt-6.1.0.tar.xz 8276964 BLAKE2B cf57e28d17e868ab4a69f03fe77b0d779362c6cb8cf1a38196ba7bad873ec4ecfa8ad1744ce97251820ab898be1ddc9bf30b788f1708172bfd23ec2c7cd3bdac SHA512 17a2641f300a4a05149261bae74ac856e9a2511a259146595d2e2412c4a0601d88369b0544ba86edc80e433a47cf828317d8de38c6ec86a1b3efaca75294a606
|
DIST libvirt-6.1.0.tar.xz 8276964 BLAKE2B cf57e28d17e868ab4a69f03fe77b0d779362c6cb8cf1a38196ba7bad873ec4ecfa8ad1744ce97251820ab898be1ddc9bf30b788f1708172bfd23ec2c7cd3bdac SHA512 17a2641f300a4a05149261bae74ac856e9a2511a259146595d2e2412c4a0601d88369b0544ba86edc80e433a47cf828317d8de38c6ec86a1b3efaca75294a606
|
||||||
|
DIST libvirt-6.2.0.tar.xz 8307248 BLAKE2B 9d449e041fc548a688f974d0801e625cf023ef0df49c40028e486e88fcf14181869e0dfd87f0eabcdd184df67dda5b5fbdc0c2375832f1534faff531779255dd SHA512 96bef701fd73aef93d1490f0bc331901a0ff6250a4f36a3e4844f76cc262dc0ae4cce8686a603c2a9c575ce489d8d5ed1521ebd22b92aff8301efdb74dee91e4
|
||||||
|
|||||||
@ -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
|
|
||||||
}
|
|
||||||
@ -0,0 +1,361 @@
|
|||||||
|
# Copyright 1999-2020 Gentoo Authors
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=7
|
||||||
|
|
||||||
|
PYTHON_COMPAT=( python3_{6,7} )
|
||||||
|
|
||||||
|
inherit autotools out-of-source bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
|
||||||
|
|
||||||
|
if [[ ${PV} = *9999* ]]; then
|
||||||
|
inherit git-r3
|
||||||
|
EGIT_REPO_URI="https://libvirt.org/git/libvirt.git"
|
||||||
|
SRC_URI=""
|
||||||
|
KEYWORDS=""
|
||||||
|
SLOT="0"
|
||||||
|
else
|
||||||
|
SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
|
||||||
|
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
|
||||||
|
SLOT="0/${PV}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
DESCRIPTION="C toolkit to manipulate virtual machines"
|
||||||
|
HOMEPAGE="http://www.libvirt.org/"
|
||||||
|
LICENSE="LGPL-2.1"
|
||||||
|
IUSE="
|
||||||
|
apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi
|
||||||
|
iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz
|
||||||
|
parted pcap policykit +qemu rbd sasl selinux +udev +vepa
|
||||||
|
virtualbox virt-network wireshark-plugins xen zfs
|
||||||
|
"
|
||||||
|
|
||||||
|
REQUIRED_USE="
|
||||||
|
firewalld? ( virt-network )
|
||||||
|
libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
|
||||||
|
lxc? ( caps libvirtd )
|
||||||
|
openvz? ( libvirtd )
|
||||||
|
policykit? ( dbus )
|
||||||
|
qemu? ( libvirtd )
|
||||||
|
vepa? ( macvtap )
|
||||||
|
virt-network? ( libvirtd )
|
||||||
|
virtualbox? ( libvirtd )
|
||||||
|
xen? ( libvirtd )"
|
||||||
|
|
||||||
|
# gettext.sh command is used by the libvirt command wrappers, and it's
|
||||||
|
# non-optional, so put it into RDEPEND.
|
||||||
|
# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
|
||||||
|
# package will use 3 by default. Since we don't have slot pinning in an API,
|
||||||
|
# we must go with the most recent
|
||||||
|
RDEPEND="
|
||||||
|
acct-user/qemu
|
||||||
|
policykit? ( acct-group/libvirt )
|
||||||
|
app-misc/scrub
|
||||||
|
>=dev-libs/glib-2.48.0
|
||||||
|
dev-libs/libgcrypt:0
|
||||||
|
dev-libs/libnl:3
|
||||||
|
>=dev-libs/libxml2-2.7.6
|
||||||
|
>=net-analyzer/openbsd-netcat-1.105-r1
|
||||||
|
>=net-libs/gnutls-1.0.25:0=
|
||||||
|
net-libs/libssh2
|
||||||
|
net-libs/libtirpc
|
||||||
|
net-libs/rpcsvc-proto
|
||||||
|
>=net-misc/curl-7.18.0
|
||||||
|
sys-apps/dmidecode
|
||||||
|
>=sys-apps/util-linux-2.17
|
||||||
|
sys-devel/gettext
|
||||||
|
sys-libs/ncurses:0=
|
||||||
|
sys-libs/readline:=
|
||||||
|
apparmor? ( sys-libs/libapparmor )
|
||||||
|
audit? ( sys-process/audit )
|
||||||
|
caps? ( sys-libs/libcap-ng )
|
||||||
|
dbus? ( sys-apps/dbus )
|
||||||
|
dtrace? ( dev-util/systemtap )
|
||||||
|
firewalld? ( >=net-firewall/firewalld-0.6.3 )
|
||||||
|
fuse? ( >=sys-fs/fuse-2.8.6:= )
|
||||||
|
glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
|
||||||
|
iscsi? ( sys-block/open-iscsi )
|
||||||
|
iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
|
||||||
|
libssh? ( net-libs/libssh )
|
||||||
|
lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
|
||||||
|
lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] )
|
||||||
|
nfs? ( net-fs/nfs-utils )
|
||||||
|
numa? (
|
||||||
|
>sys-process/numactl-2.0.2
|
||||||
|
sys-process/numad
|
||||||
|
)
|
||||||
|
parted? (
|
||||||
|
>=sys-block/parted-1.8[device-mapper]
|
||||||
|
sys-fs/lvm2[-device-mapper-only(-)]
|
||||||
|
)
|
||||||
|
pcap? ( >=net-libs/libpcap-1.0.0 )
|
||||||
|
policykit? ( >=sys-auth/polkit-0.9 )
|
||||||
|
qemu? (
|
||||||
|
>=app-emulation/qemu-1.5.0
|
||||||
|
dev-libs/yajl
|
||||||
|
)
|
||||||
|
rbd? ( sys-cluster/ceph )
|
||||||
|
sasl? ( dev-libs/cyrus-sasl )
|
||||||
|
selinux? ( >=sys-libs/libselinux-2.0.85 )
|
||||||
|
virt-network? (
|
||||||
|
net-dns/dnsmasq[script]
|
||||||
|
net-firewall/ebtables
|
||||||
|
>=net-firewall/iptables-1.4.10[ipv6]
|
||||||
|
net-misc/radvd
|
||||||
|
sys-apps/iproute2[-minimal]
|
||||||
|
)
|
||||||
|
virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
|
||||||
|
wireshark-plugins? ( net-analyzer/wireshark:= )
|
||||||
|
xen? (
|
||||||
|
>=app-emulation/xen-4.6.0
|
||||||
|
app-emulation/xen-tools:=
|
||||||
|
)
|
||||||
|
udev? (
|
||||||
|
virtual/udev
|
||||||
|
>=x11-libs/libpciaccess-0.10.9
|
||||||
|
)
|
||||||
|
zfs? ( sys-fs/zfs )"
|
||||||
|
|
||||||
|
DEPEND="${RDEPEND}
|
||||||
|
${PYTHON_DEPS}
|
||||||
|
app-text/xhtml1
|
||||||
|
dev-lang/perl
|
||||||
|
dev-libs/libxslt
|
||||||
|
dev-perl/XML-XPath
|
||||||
|
dev-python/docutils
|
||||||
|
virtual/pkgconfig"
|
||||||
|
|
||||||
|
PATCHES=(
|
||||||
|
"${FILESDIR}"/${PN}-6.0.0-do-not-use-sysconf.patch
|
||||||
|
"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
|
||||||
|
"${FILESDIR}"/${PN}-6.1.0-fix-paths-for-apparmor.patch
|
||||||
|
)
|
||||||
|
|
||||||
|
pkg_setup() {
|
||||||
|
# Check kernel configuration:
|
||||||
|
CONFIG_CHECK=""
|
||||||
|
use fuse && CONFIG_CHECK+="
|
||||||
|
~FUSE_FS"
|
||||||
|
|
||||||
|
use lvm && CONFIG_CHECK+="
|
||||||
|
~BLK_DEV_DM
|
||||||
|
~DM_MULTIPATH
|
||||||
|
~DM_SNAPSHOT"
|
||||||
|
|
||||||
|
use lxc && CONFIG_CHECK+="
|
||||||
|
~BLK_CGROUP
|
||||||
|
~CGROUP_CPUACCT
|
||||||
|
~CGROUP_DEVICE
|
||||||
|
~CGROUP_FREEZER
|
||||||
|
~CGROUP_NET_PRIO
|
||||||
|
~CGROUP_PERF
|
||||||
|
~CGROUPS
|
||||||
|
~CGROUP_SCHED
|
||||||
|
~CPUSETS
|
||||||
|
~IPC_NS
|
||||||
|
~MACVLAN
|
||||||
|
~NAMESPACES
|
||||||
|
~NET_CLS_CGROUP
|
||||||
|
~NET_NS
|
||||||
|
~PID_NS
|
||||||
|
~POSIX_MQUEUE
|
||||||
|
~SECURITYFS
|
||||||
|
~USER_NS
|
||||||
|
~UTS_NS
|
||||||
|
~VETH
|
||||||
|
~!GRKERNSEC_CHROOT_MOUNT
|
||||||
|
~!GRKERNSEC_CHROOT_DOUBLE
|
||||||
|
~!GRKERNSEC_CHROOT_PIVOT
|
||||||
|
~!GRKERNSEC_CHROOT_CHMOD
|
||||||
|
~!GRKERNSEC_CHROOT_CAPS"
|
||||||
|
|
||||||
|
kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
|
||||||
|
~DEVPTS_MULTIPLE_INSTANCES"
|
||||||
|
|
||||||
|
use macvtap && CONFIG_CHECK+="
|
||||||
|
~MACVTAP"
|
||||||
|
|
||||||
|
use virt-network && CONFIG_CHECK+="
|
||||||
|
~BRIDGE_EBT_MARK_T
|
||||||
|
~BRIDGE_NF_EBTABLES
|
||||||
|
~NETFILTER_ADVANCED
|
||||||
|
~NETFILTER_XT_CONNMARK
|
||||||
|
~NETFILTER_XT_MARK
|
||||||
|
~NETFILTER_XT_TARGET_CHECKSUM
|
||||||
|
~IP_NF_FILTER
|
||||||
|
~IP_NF_MANGLE
|
||||||
|
~IP_NF_NAT
|
||||||
|
~IP_NF_TARGET_MASQUERADE
|
||||||
|
~IP6_NF_FILTER
|
||||||
|
~IP6_NF_MANGLE
|
||||||
|
~IP6_NF_NAT"
|
||||||
|
# Bandwidth Limiting Support
|
||||||
|
use virt-network && CONFIG_CHECK+="
|
||||||
|
~BRIDGE_EBT_T_NAT
|
||||||
|
~IP_NF_TARGET_REJECT
|
||||||
|
~NET_ACT_POLICE
|
||||||
|
~NET_CLS_FW
|
||||||
|
~NET_CLS_U32
|
||||||
|
~NET_SCH_HTB
|
||||||
|
~NET_SCH_INGRESS
|
||||||
|
~NET_SCH_SFQ"
|
||||||
|
|
||||||
|
# Handle specific kernel versions for different features
|
||||||
|
kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
|
||||||
|
if kernel_is ge 3 6; then
|
||||||
|
CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
|
||||||
|
kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
|
||||||
|
fi
|
||||||
|
|
||||||
|
ERROR_USER_NS="Optional depending on LXC configuration."
|
||||||
|
|
||||||
|
if [[ -n ${CONFIG_CHECK} ]]; then
|
||||||
|
linux-info_pkg_setup
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
touch "${S}/.mailmap"
|
||||||
|
|
||||||
|
default
|
||||||
|
|
||||||
|
# Tweak the init script:
|
||||||
|
cp "${FILESDIR}/libvirtd.init-r18" "${S}/libvirtd.init" || die
|
||||||
|
sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
|
||||||
|
-i "${S}/libvirtd.init" || die "sed failed"
|
||||||
|
|
||||||
|
eautoreconf
|
||||||
|
}
|
||||||
|
|
||||||
|
my_src_configure() {
|
||||||
|
local myeconfargs=(
|
||||||
|
$(use_with apparmor)
|
||||||
|
$(use_with apparmor apparmor-profiles)
|
||||||
|
$(use_with audit)
|
||||||
|
$(use_with caps capng)
|
||||||
|
$(use_with dbus)
|
||||||
|
$(use_with dtrace)
|
||||||
|
$(use_with firewalld)
|
||||||
|
$(use_with fuse)
|
||||||
|
$(use_with glusterfs)
|
||||||
|
$(use_with glusterfs storage-gluster)
|
||||||
|
$(use_with iscsi storage-iscsi)
|
||||||
|
$(use_with iscsi-direct storage-iscsi-direct)
|
||||||
|
$(use_with libvirtd)
|
||||||
|
$(use_with libssh)
|
||||||
|
$(use_with lvm storage-lvm)
|
||||||
|
$(use_with lvm storage-mpath)
|
||||||
|
$(use_with lxc)
|
||||||
|
$(use_with macvtap)
|
||||||
|
$(use_enable nls)
|
||||||
|
$(use_with numa numactl)
|
||||||
|
$(use_with numa numad)
|
||||||
|
$(use_with openvz)
|
||||||
|
$(use_with parted storage-disk)
|
||||||
|
$(use_with pcap libpcap)
|
||||||
|
$(use_with policykit polkit)
|
||||||
|
$(use_with qemu)
|
||||||
|
$(use_with qemu yajl)
|
||||||
|
$(use_with rbd storage-rbd)
|
||||||
|
$(use_with sasl)
|
||||||
|
$(use_with selinux)
|
||||||
|
$(use_with udev)
|
||||||
|
$(use_with vepa virtualport)
|
||||||
|
$(use_with virt-network network)
|
||||||
|
$(use_with wireshark-plugins wireshark-dissector)
|
||||||
|
$(use_with xen libxl)
|
||||||
|
$(use_with zfs storage-zfs)
|
||||||
|
|
||||||
|
--without-hal
|
||||||
|
--without-netcf
|
||||||
|
--without-sanlock
|
||||||
|
|
||||||
|
--with-esx
|
||||||
|
--with-init-script=systemd
|
||||||
|
--with-qemu-group=$(usex caps qemu root)
|
||||||
|
--with-qemu-user=$(usex caps qemu root)
|
||||||
|
--with-remote
|
||||||
|
--with-storage-fs
|
||||||
|
--with-vmware
|
||||||
|
|
||||||
|
--disable-static
|
||||||
|
--disable-werror
|
||||||
|
|
||||||
|
--localstatedir=/var
|
||||||
|
--with-runstatedir=/run
|
||||||
|
--enable-dependency-tracking
|
||||||
|
)
|
||||||
|
|
||||||
|
if use virtualbox && has_version app-emulation/virtualbox-ose; then
|
||||||
|
myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
|
||||||
|
else
|
||||||
|
myeconfargs+=( $(use_with virtualbox vbox) )
|
||||||
|
fi
|
||||||
|
|
||||||
|
econf "${myeconfargs[@]}"
|
||||||
|
}
|
||||||
|
|
||||||
|
my_src_test() {
|
||||||
|
# remove problematic tests, bug #591416, bug #591418
|
||||||
|
sed -i -e 's#commandtest$(EXEEXT) # #' \
|
||||||
|
-e 's#virfirewalltest$(EXEEXT) # #' \
|
||||||
|
-e 's#nwfilterebiptablestest$(EXEEXT) # #' \
|
||||||
|
-e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
|
||||||
|
tests/Makefile
|
||||||
|
|
||||||
|
export VIR_TEST_DEBUG=1
|
||||||
|
HOME="${T}" emake check
|
||||||
|
}
|
||||||
|
|
||||||
|
my_src_install() {
|
||||||
|
emake DESTDIR="${D}" \
|
||||||
|
SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
|
||||||
|
|
||||||
|
find "${D}" -name '*.la' -delete || die
|
||||||
|
|
||||||
|
# Remove bogus, empty directories. They are either not used, or
|
||||||
|
# libvirtd is able to create them on demand
|
||||||
|
rm -rf "${D}"/etc/sysconfig
|
||||||
|
rm -rf "${D}"/var
|
||||||
|
rm -rf "${D}"/run
|
||||||
|
|
||||||
|
newbashcomp "${S}/tools/bash-completion/vsh" virsh
|
||||||
|
bashcomp_alias virsh virt-admin
|
||||||
|
|
||||||
|
use libvirtd || return 0
|
||||||
|
# From here, only libvirtd-related instructions, be warned!
|
||||||
|
|
||||||
|
systemd_install_serviced \
|
||||||
|
"${FILESDIR}"/libvirtd.service.conf libvirtd.service
|
||||||
|
|
||||||
|
systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
|
||||||
|
|
||||||
|
newinitd "${S}/libvirtd.init" libvirtd
|
||||||
|
newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
|
||||||
|
newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd
|
||||||
|
newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd
|
||||||
|
|
||||||
|
newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
|
||||||
|
newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
|
||||||
|
|
||||||
|
DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
|
||||||
|
DISABLE_AUTOFORMATTING=true
|
||||||
|
readme.gentoo_create_doc
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_preinst() {
|
||||||
|
# we only ever want to generate this once
|
||||||
|
if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
|
||||||
|
rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_postinst() {
|
||||||
|
if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
|
||||||
|
touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
|
||||||
|
fi
|
||||||
|
|
||||||
|
use libvirtd || return 0
|
||||||
|
# From here, only libvirtd-related instructions, be warned!
|
||||||
|
|
||||||
|
readme.gentoo_print_elog
|
||||||
|
}
|
||||||
Binary file not shown.
Binary file not shown.
@ -0,0 +1,139 @@
|
|||||||
|
# Copyright 2017-2020 Gentoo Authors
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=7
|
||||||
|
|
||||||
|
CRATES="
|
||||||
|
aho-corasick-0.7.3
|
||||||
|
ansi_term-0.11.0
|
||||||
|
arrayref-0.3.6
|
||||||
|
arrayvec-0.4.10
|
||||||
|
arrayvec-0.5.1
|
||||||
|
atty-0.2.11
|
||||||
|
autocfg-0.1.7
|
||||||
|
base64-0.11.0
|
||||||
|
bitflags-1.0.4
|
||||||
|
blake2b_simd-0.5.10
|
||||||
|
cc-1.0.31
|
||||||
|
cfg-if-0.1.7
|
||||||
|
chrono-0.4.6
|
||||||
|
clap-2.32.0
|
||||||
|
constant_time_eq-0.1.5
|
||||||
|
crossbeam-0.7.3
|
||||||
|
crossbeam-channel-0.4.0
|
||||||
|
crossbeam-deque-0.2.0
|
||||||
|
crossbeam-deque-0.7.2
|
||||||
|
crossbeam-epoch-0.3.1
|
||||||
|
crossbeam-epoch-0.8.0
|
||||||
|
crossbeam-queue-0.2.1
|
||||||
|
crossbeam-utils-0.2.2
|
||||||
|
crossbeam-utils-0.7.0
|
||||||
|
darling-0.10.2
|
||||||
|
darling_core-0.10.2
|
||||||
|
darling_macro-0.10.2
|
||||||
|
derive_builder-0.9.0
|
||||||
|
derive_builder_core-0.9.0
|
||||||
|
dirs-2.0.2
|
||||||
|
dirs-sys-0.3.4
|
||||||
|
either-1.5.1
|
||||||
|
env_logger-0.6.1
|
||||||
|
fnv-1.0.6
|
||||||
|
fuzzy-matcher-0.3.4
|
||||||
|
getrandom-0.1.6
|
||||||
|
humantime-1.2.0
|
||||||
|
ident_case-1.0.1
|
||||||
|
lazy_static-1.3.0
|
||||||
|
libc-0.2.58
|
||||||
|
log-0.4.6
|
||||||
|
memchr-2.2.0
|
||||||
|
memoffset-0.2.1
|
||||||
|
memoffset-0.5.3
|
||||||
|
nix-0.14.0
|
||||||
|
nodrop-0.1.13
|
||||||
|
num-integer-0.1.39
|
||||||
|
num-traits-0.2.6
|
||||||
|
num_cpus-1.10.0
|
||||||
|
proc-macro2-1.0.6
|
||||||
|
quick-error-1.2.2
|
||||||
|
quote-1.0.2
|
||||||
|
rayon-1.0.3
|
||||||
|
rayon-core-1.4.1
|
||||||
|
redox_syscall-0.1.51
|
||||||
|
redox_termios-0.1.1
|
||||||
|
redox_users-0.3.4
|
||||||
|
regex-1.1.6
|
||||||
|
regex-syntax-0.6.6
|
||||||
|
rust-argon2-0.7.0
|
||||||
|
rustc_version-0.2.3
|
||||||
|
scopeguard-0.3.3
|
||||||
|
scopeguard-1.0.0
|
||||||
|
semver-0.9.0
|
||||||
|
semver-parser-0.7.0
|
||||||
|
shlex-0.1.1
|
||||||
|
skim-0.8.1
|
||||||
|
spin-0.5.2
|
||||||
|
strsim-0.7.0
|
||||||
|
strsim-0.9.3
|
||||||
|
syn-1.0.11
|
||||||
|
term-0.6.1
|
||||||
|
termcolor-1.0.4
|
||||||
|
termion-1.5.1
|
||||||
|
textwrap-0.10.0
|
||||||
|
thread_local-0.3.6
|
||||||
|
thread_local-1.0.0
|
||||||
|
time-0.1.42
|
||||||
|
timer-0.2.0
|
||||||
|
tuikit-0.3.2
|
||||||
|
ucd-util-0.1.3
|
||||||
|
unicode-width-0.1.5
|
||||||
|
unicode-xid-0.2.0
|
||||||
|
utf8-ranges-1.0.2
|
||||||
|
utf8parse-0.1.1
|
||||||
|
vec_map-0.8.1
|
||||||
|
void-1.0.2
|
||||||
|
vte-0.3.3
|
||||||
|
winapi-0.3.6
|
||||||
|
winapi-i686-pc-windows-gnu-0.4.0
|
||||||
|
winapi-util-0.1.2
|
||||||
|
winapi-x86_64-pc-windows-gnu-0.4.0
|
||||||
|
wincolor-1.0.1
|
||||||
|
"
|
||||||
|
|
||||||
|
inherit cargo
|
||||||
|
|
||||||
|
DESCRIPTION="Command-line fuzzy finder"
|
||||||
|
HOMEPAGE="https://github.com/lotabout/skim"
|
||||||
|
SRC_URI="$(cargo_crate_uris ${CRATES})"
|
||||||
|
|
||||||
|
LICENSE="Apache-2.0 MIT MPL-2.0 Unlicense"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~amd64 ~ppc64 ~x86"
|
||||||
|
IUSE="tmux vim"
|
||||||
|
|
||||||
|
RDEPEND="
|
||||||
|
tmux? ( app-misc/tmux )
|
||||||
|
vim? ( || ( app-editors/vim app-editors/gvim ) )
|
||||||
|
"
|
||||||
|
|
||||||
|
QA_FLAGS_IGNORED="usr/bin/sk"
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
# prevent cargo_src_install() blowing up on man installation
|
||||||
|
mv man manpages || die
|
||||||
|
|
||||||
|
cargo_src_install
|
||||||
|
dodoc CHANGELOG.md README.md
|
||||||
|
doman manpages/man1/*
|
||||||
|
|
||||||
|
use tmux && dobin bin/sk-tmux
|
||||||
|
|
||||||
|
if use vim; then
|
||||||
|
insinto /usr/share/vim/vimfiles/plugin
|
||||||
|
doins plugin/skim.vim
|
||||||
|
fi
|
||||||
|
|
||||||
|
# install bash/zsh completion and keybindings
|
||||||
|
# since provided completions override a lot of commands, install to /usr/share
|
||||||
|
insinto /usr/share/${PN}
|
||||||
|
doins shell/{*.bash,*.zsh}
|
||||||
|
}
|
||||||
@ -1,2 +1 @@
|
|||||||
DIST sphinx-2.1.9-release.tar.gz 2443797 BLAKE2B d741d0bc915ece01c3ddcbfacd44f34ef5d772d2bdf07aecb3a704dc0c5ef551e9d3829af200b1c96e41be2a037552c28a83647af78e827d7a9627f1d9d536a8 SHA512 7f4538011db5d68bd00c00978d476f780fc2d355113bd2819996bacbaef90b0de5b14c946a9aad83157b818d9b6b01ee0a26bc72862cfd151067ad9967c18f56
|
|
||||||
DIST sphinx-2.2.11-release.tar.gz 3061998 BLAKE2B 63abdf3d08046ebafcdfd67d3445325b9b127e4dd66ba9d36b3b7053ba80f1f3308b74fd1e01caae6174850e1db22c743454894584bad4a4bec78d533a002668 SHA512 cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689
|
DIST sphinx-2.2.11-release.tar.gz 3061998 BLAKE2B 63abdf3d08046ebafcdfd67d3445325b9b127e4dd66ba9d36b3b7053ba80f1f3308b74fd1e01caae6174850e1db22c743454894584bad4a4bec78d533a002668 SHA512 cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689
|
||||||
|
|||||||
@ -1,93 +0,0 @@
|
|||||||
# Copyright 1999-2019 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=5
|
|
||||||
|
|
||||||
WANT_AUTOMAKE=1.15
|
|
||||||
|
|
||||||
inherit eutils autotools toolchain-funcs
|
|
||||||
|
|
||||||
#MY_P=${P/_/-}
|
|
||||||
MY_P=${P}-release
|
|
||||||
|
|
||||||
DESCRIPTION="Full-text search engine with support for MySQL and PostgreSQL"
|
|
||||||
HOMEPAGE="http://www.sphinxsearch.com/"
|
|
||||||
SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
|
|
||||||
IUSE="debug id64 mysql odbc postgres stemmer syslog test xml"
|
|
||||||
RESTRICT="!test? ( test )"
|
|
||||||
|
|
||||||
RDEPEND="mysql? ( virtual/mysql )
|
|
||||||
postgres? ( dev-db/postgresql:* )
|
|
||||||
odbc? ( dev-db/unixODBC )
|
|
||||||
stemmer? ( dev-libs/snowball-stemmer )
|
|
||||||
xml? ( dev-libs/expat )
|
|
||||||
virtual/libiconv"
|
|
||||||
|
|
||||||
S=${WORKDIR}/${MY_P}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
epatch "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch
|
|
||||||
|
|
||||||
# drop nasty hardcoded search path breaking Prefix
|
|
||||||
# We patch configure directly since otherwise we need to run
|
|
||||||
# eautoreconf twice and that causes problems, bug 425380
|
|
||||||
sed -i -e 's/\/usr\/local\//\/someplace\/nonexisting\//g' configure || die
|
|
||||||
|
|
||||||
# Fix QA compilation warnings.
|
|
||||||
sed -i -e '19i#include <string.h>' api/libsphinxclient/test.c || die
|
|
||||||
|
|
||||||
pushd api/libsphinxclient || die
|
|
||||||
eautoreconf
|
|
||||||
popd || die
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
# fix libiconv detection
|
|
||||||
use !elibc_glibc && export ac_cv_search_iconv=-liconv
|
|
||||||
|
|
||||||
econf \
|
|
||||||
--sysconfdir="${EPREFIX}/etc/${PN}" \
|
|
||||||
$(use_enable id64) \
|
|
||||||
$(use_with debug) \
|
|
||||||
$(use_with mysql) \
|
|
||||||
$(use_with odbc unixodbc) \
|
|
||||||
$(use_with postgres pgsql) \
|
|
||||||
$(use_with stemmer libstemmer) \
|
|
||||||
$(use_with syslog syslog) \
|
|
||||||
$(use_with xml libexpat )
|
|
||||||
|
|
||||||
cd api/libsphinxclient || die
|
|
||||||
econf STRIP=:
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
emake AR="$(tc-getAR)"
|
|
||||||
|
|
||||||
emake -j 1 -C api/libsphinxclient
|
|
||||||
}
|
|
||||||
|
|
||||||
src_test() {
|
|
||||||
elog "Tests require access to a live MySQL database and may require configuration."
|
|
||||||
elog "You will find them in /usr/share/${PN}/test and they require dev-lang/php"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
emake DESTDIR="${D}" install
|
|
||||||
emake DESTDIR="${D}" -C api/libsphinxclient install
|
|
||||||
|
|
||||||
dodoc doc/*
|
|
||||||
|
|
||||||
dodir /var/lib/sphinx
|
|
||||||
dodir /var/log/sphinx
|
|
||||||
|
|
||||||
newinitd "${FILESDIR}"/searchd.rc searchd
|
|
||||||
|
|
||||||
if use test; then
|
|
||||||
insinto /usr/share/${PN}
|
|
||||||
doins -r test
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
@ -1,2 +1 @@
|
|||||||
DIST trash-cli-0.12.9.14.tar.gz 62090 BLAKE2B b227fe852aa204156b197e14e8dd34e1f9883f0dde11512842a2705ea20d781db031552f4b355096521fe720cd48d6fded74aa5d173d423bd3b6b8e77f413a1a SHA512 3846ec4e2e491b09ad93134313a875fb3e072abe3e895956b62a3e4f350c1f10dd1ded3fea0caec3fa8a6bd39f2d0a63ac6a3a070a6204fd2f27f1e447f5ba6c
|
|
||||||
DIST trash-cli-0.17.1.14_p20170816.tar.gz 69713 BLAKE2B f995c22ba0704eba96abac2c130f9118cc98ad5c5f21903601ea60ee1f52c594b7f8b16ebcaabb4b34086f5f9f66ad02cd628c379ed5139bcb1f691016b435ab SHA512 9d35620b55c63b53b7255179a6304f4d7190c2a90f68c102f64b9616ee897460939633e9c77826968a1682fc5fa090b0f3ea1daad82a44cc96704dc54da45dcd
|
DIST trash-cli-0.17.1.14_p20170816.tar.gz 69713 BLAKE2B f995c22ba0704eba96abac2c130f9118cc98ad5c5f21903601ea60ee1f52c594b7f8b16ebcaabb4b34086f5f9f66ad02cd628c379ed5139bcb1f691016b435ab SHA512 9d35620b55c63b53b7255179a6304f4d7190c2a90f68c102f64b9616ee897460939633e9c77826968a1682fc5fa090b0f3ea1daad82a44cc96704dc54da45dcd
|
||||||
|
|||||||
@ -1,20 +0,0 @@
|
|||||||
# Copyright 1999-2015 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=5
|
|
||||||
|
|
||||||
PYTHON_COMPAT=( python2_7 )
|
|
||||||
|
|
||||||
inherit distutils-r1 vcs-snapshot
|
|
||||||
|
|
||||||
DESCRIPTION="Python scripts to manipulate trash cans via the command line"
|
|
||||||
HOMEPAGE="https://github.com/andreafrancia/trash-cli"
|
|
||||||
SRC_URI="https://github.com/andreafrancia/${PN}/tarball/${PV} ->
|
|
||||||
${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="amd64 x86"
|
|
||||||
IUSE=""
|
|
||||||
|
|
||||||
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
|
|
||||||
@ -0,0 +1,30 @@
|
|||||||
|
# Copyright 1999-2020 Gentoo Authors
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=7
|
||||||
|
|
||||||
|
PYTHON_COMPAT=( python3_{6,7,8} )
|
||||||
|
DISTUTILS_USE_SETUPTOOLS=no
|
||||||
|
|
||||||
|
inherit distutils-r1
|
||||||
|
|
||||||
|
GIT_REF=5abecd53e1d84f2a5fd3fc60d2f5d71e518826c5
|
||||||
|
|
||||||
|
DESCRIPTION="Python scripts to manipulate trash cans via the command line"
|
||||||
|
HOMEPAGE="https://github.com/andreafrancia/trash-cli"
|
||||||
|
SRC_URI="https://github.com/andreafrancia/${PN}/archive/${GIT_REF}.tar.gz -> ${P}.tar.gz"
|
||||||
|
|
||||||
|
LICENSE="GPL-2"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~amd64 ~x86"
|
||||||
|
IUSE="test"
|
||||||
|
RESTRICT="!test? ( test )"
|
||||||
|
|
||||||
|
S="${WORKDIR}/${PN}-${GIT_REF}"
|
||||||
|
|
||||||
|
DEPEND="
|
||||||
|
test? (
|
||||||
|
dev-python/mock[${PYTHON_USEDEP}]
|
||||||
|
)"
|
||||||
|
|
||||||
|
distutils_enable_tests nose
|
||||||
Binary file not shown.
Binary file not shown.
@ -0,0 +1,15 @@
|
|||||||
|
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||||
|
index e9c2a407c279..16ad04bf660a 100644
|
||||||
|
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||||
|
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||||
|
@@ -563,7 +563,9 @@ void PDFOutDev::processLink(Link* link, Catalog*)
|
||||||
|
if (!(pAction && pAction->getKind() == actionURI))
|
||||||
|
return;
|
||||||
|
|
||||||
|
-#if POPPLER_CHECK_VERSION(0, 72, 0)
|
||||||
|
+#if POPPLER_CHECK_VERSION(0, 86, 0)
|
||||||
|
+ const char* pURI = static_cast<LinkURI*>(pAction)->getURI().c_str();
|
||||||
|
+#elif POPPLER_CHECK_VERSION(0, 72, 0)
|
||||||
|
const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str();
|
||||||
|
#else
|
||||||
|
const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString();
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue