diff options
| author | Liguros - Gitlab CI/CD [master] <gitlab@liguros.net> | 2021-03-01 00:37:58 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [master] <gitlab@liguros.net> | 2021-03-01 00:37:58 +0000 |
| commit | 8ddb1a3d1229412a438971f82d37d518a0223726 (patch) | |
| tree | 83438b5ddb9d23a390f1a3fc505303d3d2223bf2 /app-emulation | |
| parent | 9acab46e1a820daece7b2e631485c157ce2210ad (diff) | |
| download | baldeagleos-repo-21.1.5.tar.gz baldeagleos-repo-21.1.5.tar.xz baldeagleos-repo-21.1.5.zip | |
Adding metadatav21.1.5
Diffstat (limited to 'app-emulation')
205 files changed, 2661 insertions, 4350 deletions
diff --git a/app-emulation/aqemu/metadata.xml b/app-emulation/aqemu/metadata.xml index 077b4f4c7acc..3462d3a1564f 100644 --- a/app-emulation/aqemu/metadata.xml +++ b/app-emulation/aqemu/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">aqemu</remote-id> - <remote-id type="github">tobimensch/aqemu</remote-id> - </upstream> -</pkgmetadata> + <upstream> + <remote-id type="sourceforge">aqemu</remote-id> + <remote-id type="github">tobimensch/aqemu</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/aranym/metadata.xml b/app-emulation/aranym/metadata.xml index a9d26d2bbfb7..5400047fd571 100644 --- a/app-emulation/aranym/metadata.xml +++ b/app-emulation/aranym/metadata.xml @@ -1,19 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>chewi@gentoo.org</email> - <name>James Le Cuirot</name> - </maintainer> - <upstream> - <remote-id type="github">aranym/aranym</remote-id> - </upstream> - <use> - <flag name="clipboard">Enable bidirectional clipboard transfer between the host and FreeMiNT</flag> - <flag name="jit">Build Just-In-Time compiler variant with increased performance</flag> - <flag name="lilo">Enable support for directly booting kernels such as Linux</flag> - <flag name="osmesa">Allow images to be rendered in memory using the host CPU</flag> - <flag name="pmmu">Build full PMMU variant, required for running mainline Linux</flag> - <flag name="standard">Build standard (no JIT or PMMU) variant</flag> - </use> -</pkgmetadata> + <maintainer type="person"> + <email>chewi@gentoo.org</email> + <name>James Le Cuirot</name> + </maintainer> + <upstream> + <remote-id type="github">aranym/aranym</remote-id> + </upstream> + <use> + <flag name="clipboard">Enable bidirectional clipboard transfer between the host and FreeMiNT</flag> + <flag name="jit">Build Just-In-Time compiler variant with increased performance</flag> + <flag name="lilo">Enable support for directly booting kernels such as Linux</flag> + <flag name="osmesa">Allow images to be rendered in memory using the host CPU</flag> + <flag name="pmmu">Build full PMMU variant, required for running mainline Linux</flag> + <flag name="standard">Build standard (no JIT or PMMU) variant</flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/bochs/metadata.xml b/app-emulation/bochs/metadata.xml index 4e953a303483..240425b293fa 100644 --- a/app-emulation/bochs/metadata.xml +++ b/app-emulation/bochs/metadata.xml @@ -1,17 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>lu_zero@gentoo.org</email> - </maintainer> - <use> - <flag name="3dnow">Enable support for emulating 3DNow! instructions (incomplete)</flag> - <flag name="avx">Enable support for emulating Advanced Vector Extensions (AVX)</flag> - <flag name="debugger">Enable debugger (slows down emulation)</flag> - <flag name="gdb">Enable support for the remote GDB stub</flag> - <flag name="x86-64">Enable support for emulation of 64-bit CPUs</flag> - </use> - <upstream> - <remote-id type="sourceforge">bochs</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="person"> + <email>lu_zero@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="sourceforge">bochs</remote-id> + <remote-id type="cpe">cpe:/a:bochs_project:bochs</remote-id> + </upstream> + <use> + <flag name="3dnow">Enable support for emulating 3DNow! instructions (incomplete)</flag> + <flag name="avx">Enable support for emulating Advanced Vector Extensions (AVX)</flag> + <flag name="debugger">Enable debugger (slows down emulation)</flag> + <flag name="gdb">Enable support for the remote GDB stub</flag> + <flag name="x86-64">Enable support for emulation of 64-bit CPUs</flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest index 37a7c8f236f6..e615275cd360 100644 --- a/app-emulation/buildah/Manifest +++ b/app-emulation/buildah/Manifest @@ -1,3 +1,2 @@ -DIST buildah-1.14.11.tar.gz 10660686 BLAKE2B ae24982b2da66b536a0bbba21d07da8c54af7726e065545c2ab6167395ec45f7298c25811ab0e2aec5ffccd084557107313baa36f873327d7b520a61dd8081af SHA512 6522ef39cdf6166ddb6eca6e43025953d025b92a677055ec026f4e163b0bb4b3334e20369e5850593189822c74fe82e39807ea387ad22ee64b3557bbaf8e30ce -DIST buildah-1.15.1.tar.gz 10344892 BLAKE2B e84f8d245536f8864f057f576d92c218420ac975fabfbdc8b6bf591c2ef43494d49fe9095320a07de450f2ea64d046aa4ad680f08be80210e0dce1ffa874a286 SHA512 61cbe91867dc664a9e76b367e0f99bf5c797c68dda7182ed43c6a6a5a72a0f0519e45db6b2746b26933d829834757cc93bdbd30c62ce6a947ee546dbc1f930be DIST buildah-1.16.1.tar.gz 10525480 BLAKE2B d7a174049b9a99d11fa31a1b52fa6acfe037197171c7112607d755c788509b0798af315d1fde5c229bd6e029fdd3e57ae93042044f373d4ff63fcb121264730d SHA512 c17358d71e9102ef5da530df54648eaa13a1384b06cd43fe74094cdbaa2dfda6aa6d1a218fb88e12898ae4b9dca2d8c555643326779c5f09b6a118f0a440d17a +DIST buildah-1.19.6.tar.gz 10815708 BLAKE2B c5ad1405d907f6d5973f55c15b86e4341dc4c7c0db32854b5b54655fe1af1606b1206f3c7a3e86f83962c2ab1355c9e2b770ada97abfd9b9f8f231bd4b77e981 SHA512 81a865b795588b86a61fdada40045c06f9f3bbf8bdc3f6e4c70a9e4c7b28bf3fc31dd080c9f7555a8924f8bffac10fad776275619053fee8039176d6d6b69571 diff --git a/app-emulation/buildah/buildah-1.14.11.ebuild b/app-emulation/buildah/buildah-1.14.11.ebuild deleted file mode 100644 index 717adf3f3541..000000000000 --- a/app-emulation/buildah/buildah-1.14.11.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit bash-completion-r1 go-module - -KEYWORDS="~amd64" -DESCRIPTION="A tool that facilitates building OCI images" -HOMEPAGE="https://github.com/containers/buildah" -LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0" -SLOT="0" -IUSE="selinux" -EGIT_COMMIT="v${PV}" -GIT_COMMIT=7a921ff79b -SRC_URI="https://github.com/containers/buildah/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" -RDEPEND="app-crypt/gpgme:= - app-emulation/skopeo - dev-libs/libgpg-error:= - dev-libs/libassuan:= - sys-fs/lvm2:= - sys-libs/libseccomp:= - selinux? ( sys-libs/libselinux:= )" -DEPEND="${RDEPEND}" -RESTRICT+=" test" - -src_prepare() { - default - [[ -f selinux_tag.sh ]] || die - use selinux || { echo -e "#!/bin/sh\ntrue" > \ - selinux_tag.sh || die; } -} - -src_compile() { - emake GIT_COMMIT=${GIT_COMMIT} all -} - -src_install() { - dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md - doman docs/*.1 - dodoc -r docs/tutorials - dobin ${PN} imgtype - dobashcomp contrib/completions/bash/buildah -} - -src_test() { - emake test-unit -} diff --git a/app-emulation/buildah/buildah-1.15.1.ebuild b/app-emulation/buildah/buildah-1.19.6.ebuild index ef3db50fcacf..dd54c70e89b9 100644 --- a/app-emulation/buildah/buildah-1.15.1.ebuild +++ b/app-emulation/buildah/buildah-1.19.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0" SLOT="0" IUSE="selinux" EGIT_COMMIT="v${PV}" -GIT_COMMIT=c967e88ef6 +GIT_COMMIT=7aedb16428 SRC_URI="https://github.com/containers/buildah/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" RDEPEND="app-crypt/gpgme:= app-emulation/skopeo @@ -38,7 +38,7 @@ src_install() { dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md doman docs/*.1 dodoc -r docs/tutorials - dobin ${PN} imgtype + dobin bin/{${PN},imgtype} dobashcomp contrib/completions/bash/buildah } diff --git a/app-emulation/buildah/metadata.xml b/app-emulation/buildah/metadata.xml index 491730ac55c1..b1fa431cd51f 100644 --- a/app-emulation/buildah/metadata.xml +++ b/app-emulation/buildah/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>zmedico@gentoo.org</email> - <name>Zac Medico</name> - </maintainer> - <upstream> - <remote-id type="github">containers/buildah</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="person"> + <email>zmedico@gentoo.org</email> + <name>Zac Medico</name> + </maintainer> + <upstream> + <remote-id type="github">containers/buildah</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/cadvisor/metadata.xml b/app-emulation/cadvisor/metadata.xml index 054ff1968a44..9e9135f5a765 100644 --- a/app-emulation/cadvisor/metadata.xml +++ b/app-emulation/cadvisor/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>williamh@gentoo.org</email> - <name>William Hubbs</name> - </maintainer> - <upstream> - <remote-id type="github">google/cadvisor</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="person"> + <email>williamh@gentoo.org</email> + <name>William Hubbs</name> + </maintainer> + <upstream> + <remote-id type="github">google/cadvisor</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/cinf/metadata.xml b/app-emulation/cinf/metadata.xml index 7d439e8aba91..7cf1ac1fff23 100644 --- a/app-emulation/cinf/metadata.xml +++ b/app-emulation/cinf/metadata.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>toffanin.mauro@gmail.com</email> - <name>Mauro Toffanin</name> - <description>Maintainer. Assign bugs to him</description> - </maintainer> -</pkgmetadata> + <maintainer type="person"> + <email>toffanin.mauro@gmail.com</email> + <name>Mauro Toffanin</name> + <description>Maintainer. Assign bugs to him</description> + </maintainer> + + <origin>go-overlay</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/cloud-init/metadata.xml b/app-emulation/cloud-init/metadata.xml index 997452569a62..214b66caea06 100644 --- a/app-emulation/cloud-init/metadata.xml +++ b/app-emulation/cloud-init/metadata.xml @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>prometheanfire@gentoo.org</email> - <name>Matthew Thode</name> - </maintainer> - <maintainer type="person"> - <email>eva@gentoo.org</email> - <name>Gilles Dartiguelongue</name> - </maintainer> - <longdescription lang="en"> + <maintainer type="person"> + <email>prometheanfire@gentoo.org</email> + <name>Matthew Thode</name> + </maintainer> + <maintainer type="person"> + <email>eva@gentoo.org</email> + <name>Gilles Dartiguelongue</name> + </maintainer> + <longdescription lang="en"> Cloud-init is the industry standard multi-distribution method for cross-platform cloud instance initialization. It is supported across all major public cloud providers, provisioning systems for private cloud infrastructure, and bare-metal installations. </longdescription> - <upstream> - <remote-id type="launchpad">cloud-init</remote-id> - </upstream> -</pkgmetadata> + <upstream> + <remote-id type="launchpad">cloud-init</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/coldfire/metadata.xml b/app-emulation/coldfire/metadata.xml index 71b1461e1146..0b07b855e939 100644 --- a/app-emulation/coldfire/metadata.xml +++ b/app-emulation/coldfire/metadata.xml @@ -1,8 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>embedded@gentoo.org</email> - <name>Embedded Gentoo</name> -</maintainer> -</pkgmetadata> + <maintainer type="project"> + <email>embedded@gentoo.org</email> + <name>Embedded Gentoo</name> + </maintainer> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/conmon/Manifest b/app-emulation/conmon/Manifest index b88f13d27b26..a64b4fce7cda 100644 --- a/app-emulation/conmon/Manifest +++ b/app-emulation/conmon/Manifest @@ -1,2 +1,2 @@ -DIST conmon-2.0.20.tar.gz 64716 BLAKE2B d7eb464f5be0b117824571134f08077955f56e1637dd2cbc6b70413dc9a6f109a1b9b207f5523103f205659ac20cc65f5f2340475d771fdf4b852d6895887975 SHA512 b719e41e1ead0d38c0874a30901c5660dc8612dc7aa1c025068480846a1e458a744b55bb8d5d74d2c2ce38fdbbe03505fce216a2f2c0748740983e3272a82f0e DIST conmon-2.0.22.tar.gz 103371 BLAKE2B f509ba800c847886ec2350e141d2b965ff1cc09822467718fb0d94acdabdc86c6f40dff9428679e4c4171ac6a522b3ba7622d66ebd8108be1a68cbf7418d5c09 SHA512 819e1d9279c1a22388220d710b975cdeb3c0b56413afb177afe1c96b649e2dce496d5f51fe4094f572111f771102ccd0ae86f1776e99fedb2e76e6e9130c2d5c +DIST conmon-2.0.26.tar.gz 104681 BLAKE2B fc8369258a414d3a169b64019199c604d1d8bded70d5a38230f243053dcf09c6f9aee931b328913e6cbbe3c495aab4894647897f40f537a79eb587ecee58517a SHA512 5cbb66053fb48b514f93b3be4d4ac428f9eea8a3e1452b4df232250e9cd01202ecb7477c05e1e4dfb21595f2d1881be35cdea9b23f43c02bb7c0e67a3161396e diff --git a/app-emulation/conmon/conmon-2.0.20.ebuild b/app-emulation/conmon/conmon-2.0.26.ebuild index 8aa13fbc4d2a..e2e8f1c90b90 100644 --- a/app-emulation/conmon/conmon-2.0.20.ebuild +++ b/app-emulation/conmon/conmon-2.0.26.ebuild @@ -1,9 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -EGIT_COMMIT="13244db638cf987c415298a3c23393ae5abeb885" +inherit toolchain-funcs + +EGIT_COMMIT="0e155c83aa739ef0a0540ec9f9d265f57f68038b" DESCRIPTION="An OCI container runtime monitor" HOMEPAGE="https://github.com/containers/conmon" SRC_URI="https://github.com/containers/conmon/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" @@ -16,7 +18,8 @@ RESTRICT="test" RDEPEND="dev-libs/glib:= systemd? ( sys-apps/systemd:= )" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + dev-go/go-md2man" S="${WORKDIR}/${PN}-${EGIT_COMMIT}" @@ -28,9 +31,12 @@ src_prepare() { -e 's| $(PKG_CONFIG) --exists libsystemd | false |' \ -i Makefile || die fi + sed -e 's|make -C tools|$(MAKE) -C tools|' -i Makefile || die + sed -e 's|^GOMD2MAN = .*|GOMD2MAN = go-md2man|' -i docs/Makefile || die } src_compile() { + tc-export CC emake GIT_COMMIT="${EGIT_COMMIT}" \ all } diff --git a/app-emulation/conmon/metadata.xml b/app-emulation/conmon/metadata.xml index 15f05bae08e9..a90d593c4d89 100644 --- a/app-emulation/conmon/metadata.xml +++ b/app-emulation/conmon/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>zmedico@gentoo.org</email> - <name>Zac Medico</name> - </maintainer> - <upstream> - <remote-id type="github">containers/conmon</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="person"> + <email>zmedico@gentoo.org</email> + <name>Zac Medico</name> + </maintainer> + <upstream> + <remote-id type="github">containers/conmon</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/container-diff/container-diff-0.15.0.ebuild b/app-emulation/container-diff/container-diff-0.15.0.ebuild index 93347b097158..b456d2c90eee 100644 --- a/app-emulation/container-diff/container-diff-0.15.0.ebuild +++ b/app-emulation/container-diff/container-diff-0.15.0.ebuild @@ -1,7 +1,6 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2020-2021 Liguros Authors # Distributed under the terms of the GNU General Public License v2 - -EAPI=6 +EAPI=7 EGO_PN="github.com/GoogleContainerTools/${PN}/..." S="${WORKDIR}/${P}/src/${EGO_PN%/*}" diff --git a/app-emulation/container-diff/container-diff-0.16.0.ebuild b/app-emulation/container-diff/container-diff-0.16.0.ebuild new file mode 100644 index 000000000000..8e944ef2a759 --- /dev/null +++ b/app-emulation/container-diff/container-diff-0.16.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 2020-2021 Liguros Authors +# Distributed under the terms of the GNU General Public License v2 +EAPI=7 + +EGO_PN="github.com/GoogleContainerTools/${PN}/..." +S="${WORKDIR}/${P}/src/${EGO_PN%/*}" + +inherit golang-vcs-snapshot git-r3 + +DESCRIPTION="tool for analyzing and comparing container images" +HOMEPAGE="https://github.com/GoogleContainerTools/container-diff" + +EGIT_REPO_URI="https://github.com/GoogleContainerTools/container-diff.git" +EGIT_COMMIT="v0.16.0" +EGIT_CHECKOUT_DIR="${S}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm" +IUSE="" + +DEPEND="" + +src_compile() { + GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \ + go build -v -x ${EGO_BUILD_FLAGS} "${EGO_PN}" ./... +} + +src_install() { + GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \ + go install -v -x ${EGO_BUILD_FLAGS} "${EGO_PN}" + dobin ${WORKDIR}/${P}/bin/container-diff +} diff --git a/app-emulation/container-diff/metadata.xml b/app-emulation/container-diff/metadata.xml new file mode 100644 index 000000000000..45eec7736cb7 --- /dev/null +++ b/app-emulation/container-diff/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>dev@liguros.net</email> + <name>Development</name> + </maintainer> + <upstream> + <remote-id type="github">GoogleContainerTools/container-diff</remote-id> + </upstream> + <origin>ports</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/containerd/metadata.xml b/app-emulation/containerd/metadata.xml index 0795c4ce61ef..ef20be2bcdcc 100644 --- a/app-emulation/containerd/metadata.xml +++ b/app-emulation/containerd/metadata.xml @@ -1,28 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <longdescription> + <maintainer type="person"> + <email>williamh@gentoo.org</email> + <name>William Hubbs</name> + </maintainer> + <maintainer type="person"> + <email>gyakovlev@gentoo.org</email> + <name>Georgy Yakovlev</name> + </maintainer> + <longdescription> Containerd is a daemon with an API and a command line client, to manage containers on one machine. It uses runC to run containers according to the OCI specification. Containerd has advanced features such as seccomp and user namespace support as well as checkpoint and restore for cloning and live migration of containers. </longdescription> - <maintainer type="person"> - <email>williamh@gentoo.org</email> - <name>William Hubbs</name> - </maintainer> - <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> - </maintainer> - <use> - <flag name="apparmor">Support for AppArmor</flag> - <flag name="btrfs">Support for BTRFS snapshot driver</flag> - <flag name="cri">Support for Kubernetes CRI</flag> - <flag name="device-mapper">Support for device mapper snapshot driver</flag> - </use> - <upstream> - <remote-id type="github">containerd/containerd</remote-id> - </upstream> -</pkgmetadata> + <upstream> + <remote-id type="github">containerd/containerd</remote-id> + </upstream> + <use> + <flag name="apparmor">Support for AppArmor</flag> + <flag name="btrfs">Support for BTRFS snapshot driver</flag> + <flag name="cri">Support for Kubernetes CRI</flag> + <flag name="device-mapper">Support for device mapper snapshot driver</flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/containers-storage/metadata.xml b/app-emulation/containers-storage/metadata.xml index ea691c789838..c119944ce55b 100644 --- a/app-emulation/containers-storage/metadata.xml +++ b/app-emulation/containers-storage/metadata.xml @@ -1,21 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>zmedico@gentoo.org</email> - <name>Zac Medico</name> - </maintainer> - <use> - <flag name="btrfs"> + <maintainer type="person"> + <email>zmedico@gentoo.org</email> + <name>Zac Medico</name> + </maintainer> + <upstream> + <remote-id type="github">containers/storage</remote-id> + </upstream> + <use> + <flag name="btrfs"> Enables dependencies for the "btrfs" graph driver, including necessary kernel flags. </flag> - <flag name="device-mapper"> + <flag name="device-mapper"> Enables dependencies for the "devicemapper" graph driver, including necessary kernel flags. </flag> - </use> - <upstream> - <remote-id type="github">containers/storage</remote-id> - </upstream> -</pkgmetadata> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/cri-o/metadata.xml b/app-emulation/cri-o/metadata.xml index ec23ec09fcc9..333b7df0224d 100644 --- a/app-emulation/cri-o/metadata.xml +++ b/app-emulation/cri-o/metadata.xml @@ -1,28 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>zmedico@gentoo.org</email> - <name>Zac Medico</name> - </maintainer> - <longdescription lang="en"> + <maintainer type="person"> + <email>zmedico@gentoo.org</email> + <name>Zac Medico</name> + </maintainer> + <longdescription lang="en"> CRI-O is meant to provide an integration path between OCI conformant runtimes and the kubelet. Specifically, it implements the Kubelet Container Runtime Interface (CRI) using OCI conformant runtimes. The scope of CRI-O is tied to the scope of the CRI. </longdescription> - <use> - <flag name="btrfs"> + <upstream> + <remote-id type="github">cri-o/cri-o</remote-id> + </upstream> + <use> + <flag name="btrfs"> Enables dependencies for the "btrfs" graph driver, including necessary kernel flags. </flag> - <flag name="device-mapper"> + <flag name="device-mapper"> Enables dependencies for the "devicemapper" graph driver, including necessary kernel flags. </flag> - </use> - <upstream> - <remote-id type="github">cri-o/cri-o</remote-id> - </upstream> -</pkgmetadata> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/cri-tools/metadata.xml b/app-emulation/cri-tools/metadata.xml index ded6fbaced72..05c0aa10a7e8 100644 --- a/app-emulation/cri-tools/metadata.xml +++ b/app-emulation/cri-tools/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="github">kubernetes-sigs/cri-tools</remote-id> - </upstream> -</pkgmetadata> + <upstream> + <remote-id type="github">kubernetes-sigs/cri-tools</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/crossover-bin/metadata.xml b/app-emulation/crossover-bin/metadata.xml index 5c532a244c89..8c0300d6cbdc 100644 --- a/app-emulation/crossover-bin/metadata.xml +++ b/app-emulation/crossover-bin/metadata.xml @@ -1,12 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <use> - <flag name="capi">Enable ISDN support via CAPI</flag> - <flag name="osmesa">Add support for OpenGL in bitmaps using libOSMesa</flag> - <flag name="opencl">Enable OpenCL support</flag> - <flag name="pcap">Support packet capture software (e.g. wireshark)</flag> - <flag name="vulkan">Enable Vulkan drivers</flag> - </use> -</pkgmetadata> + + <use> + <flag name="capi">Enable ISDN support via CAPI</flag> + <flag name="osmesa">Add support for OpenGL in bitmaps using libOSMesa</flag> + <flag name="opencl">Enable OpenCL support</flag> + <flag name="pcap">Support packet capture software (e.g. wireshark)</flag> + <flag name="vulkan">Enable Vulkan drivers</flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/crun/metadata.xml b/app-emulation/crun/metadata.xml index 11d539113887..4a8cf5d4c06b 100644 --- a/app-emulation/crun/metadata.xml +++ b/app-emulation/crun/metadata.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>robert@gnzler.io</email> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <longdescription lang="en"> + <maintainer type="person"> + <email>robert@gnzler.io</email> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription lang="en"> While most of the tools used in the Linux containers ecosystem are written in Go, crun authors believe C is a better fit for a lower level tool like a container runtime. runc; the most used implementation of the OCI runtime specs @@ -18,14 +18,15 @@ crun aims to be also usable as a library that can be easily included in programs without requiring an external process for managing OCI containers. </longdescription> - <upstream> - <changelog>https://github.com/containers/crun/releases</changelog> - <remote-id type="github">containers/crun</remote-id> - </upstream> - <use> - <flag name="bpf">Enable in Kernel, eBPF (enhanced Berkley Packet Filter) + <upstream> + <remote-id type="github">containers/crun</remote-id> + <changelog>https://github.com/containers/crun/releases</changelog> + </upstream> + <use> + <flag name="bpf">Enable in Kernel, eBPF (enhanced Berkley Packet Filter) support for managing device controllers. </flag> - <flag name="criu">Enable CRIU based checkpoint/restore support</flag> - </use> -</pkgmetadata> + <flag name="criu">Enable CRIU based checkpoint/restore support</flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/dinero/metadata.xml b/app-emulation/dinero/metadata.xml index 6f49eba8f496..83d00b14c8d4 100644 --- a/app-emulation/dinero/metadata.xml +++ b/app-emulation/dinero/metadata.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> -</pkgmetadata> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/diskimage-builder/metadata.xml b/app-emulation/diskimage-builder/metadata.xml index f8379974f846..ee1379367841 100644 --- a/app-emulation/diskimage-builder/metadata.xml +++ b/app-emulation/diskimage-builder/metadata.xml @@ -1,21 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>prometheanfire@gentoo.org</email> - <name>Matthew Thode</name> - </maintainer> - <maintainer type="project"> - <email>openstack@gentoo.org</email> - <name>Openstack</name> - </maintainer> - <longdescription lang="en"> + <maintainer type="person"> + <email>prometheanfire@gentoo.org</email> + <name>Matthew Thode</name> + </maintainer> + <maintainer type="project"> + <email>openstack@gentoo.org</email> + <name>Openstack</name> + </maintainer> + <longdescription lang="en"> diskimage-builder is a flexible suite of components for building a wide-range of disk images, filesystem images and ramdisk images for use with OpenStack. </longdescription> - <upstream> - <remote-id type="pypi">diskimage-builder</remote-id> - <remote-id type="github">openstack/diskimage-builder</remote-id> - </upstream> -</pkgmetadata> + <upstream> + <remote-id type="pypi">diskimage-builder</remote-id> + <remote-id type="github">openstack/diskimage-builder</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/distrobuilder/metadata.xml b/app-emulation/distrobuilder/metadata.xml index b495e2e1bb0b..e7248d2592cf 100644 --- a/app-emulation/distrobuilder/metadata.xml +++ b/app-emulation/distrobuilder/metadata.xml @@ -1,16 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>williamh@gentoo.org</email> - <name>William Hubbs</name> - </maintainer> - <maintainer type="person"> - <email>posting@vodacomm.ca</email> - <name>Stephen Bosch</name> - </maintainer> - <maintainer type="project"> - <email>virtualization@gentoo.org</email> - <name>Gentoo Virtualization Project</name> - </maintainer> -</pkgmetadata> + <maintainer type="person"> + <email>williamh@gentoo.org</email> + <name>William Hubbs</name> + </maintainer> + <maintainer type="person"> + <email>posting@vodacomm.ca</email> + <name>Stephen Bosch</name> + </maintainer> + <maintainer type="project"> + <email>virtualization@gentoo.org</email> + <name>Gentoo Virtualization Project</name> + </maintainer> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/dlx/metadata.xml b/app-emulation/dlx/metadata.xml index 6f49eba8f496..83d00b14c8d4 100644 --- a/app-emulation/dlx/metadata.xml +++ b/app-emulation/dlx/metadata.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> -</pkgmetadata> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/docker-bench-security/metadata.xml b/app-emulation/docker-bench-security/metadata.xml index eb6d1553ceb4..1e19b93f20ac 100644 --- a/app-emulation/docker-bench-security/metadata.xml +++ b/app-emulation/docker-bench-security/metadata.xml @@ -1,12 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>williamh@gentoo.org</email> - <name>William Hubbs</name> - </maintainer> - <longdescription lang="en"> + <maintainer type="person"> + <email>williamh@gentoo.org</email> + <name>William Hubbs</name> + </maintainer> + <longdescription lang="en"> The Docker Bench for Security is a script that checks for dozens of common best-practices around deploying Docker containers in production. </longdescription> -</pkgmetadata> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/docker-cli/metadata.xml b/app-emulation/docker-cli/metadata.xml index 3c49bd23955c..53c5cdf5c8dd 100644 --- a/app-emulation/docker-cli/metadata.xml +++ b/app-emulation/docker-cli/metadata.xml @@ -1,8 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>williamh@gentoo.org</email> - <name>William Hubbs</name> - </maintainer> - </pkgmetadata> + <maintainer type="person"> + <email>williamh@gentoo.org</email> + <name>William Hubbs</name> + </maintainer> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest index cdd2d5e78c7e..7c5219f5250b 100644 --- a/app-emulation/docker-compose/Manifest +++ b/app-emulation/docker-compose/Manifest @@ -1,3 +1,3 @@ DIST docker-compose-1.27.4.tar.gz 309308 BLAKE2B 098af5e0308de4fe72f8f7d5c9cbdb285ec1cb6fbd492baef8a4223f93591321c585ebabd4c7e4a40d7a1bce3ab2d7ccf4cee1d0a15e7f59bb80eb4df5b6c8d6 SHA512 b41b7cf88b1380021a30f9becb7567d1e154ef875c42b37483673b5107f1a26dae6868b92c6a61f695001eb63759b25f3729e6783272eb784047717cafea3b80 -DIST docker-compose-1.28.0.tar.gz 318112 BLAKE2B 2e721f2aed08f8c63c7c75aa91e6ee28d997763a7d93921e9a62c41b7d48943221aa2135e6ba3925db67b2376f662f81ef71df15180895ea4d5ced1edd0cc493 SHA512 c673f25ff993e7dcaf75512c378339bb7435d96310bf9a47ee3fd3a515967b323ed911b77c030a8e9c1d04b8aca235565a0ca0eaeab401c4ac48110712da405e -DIST docker-compose-1.28.2.tar.gz 318196 BLAKE2B 60827043135b1b1455ce0fe8cd3b6bdfad025af80d32b805e7a7a9df7949808b6575555e860a2d0f57bf07af44cb7847b38146accbb2c4eec9a8919bc4ec4141 SHA512 ababba47717e31187243478ba4a9d4082e2f64a05a0bf48cbafb2a44b62138d7dfb1cbb88da4c388b559cb35d53bcf4c42617f6ae02412b7a65f02cb09255e45 +DIST docker-compose-1.28.4.tar.gz 318110 BLAKE2B 97a39c52a2e9819fa4632a16080b9b3a029c5b81caa1bcb5143e78b9c6f3981aa462ef23c6c08fcafe80f8b786ce4962959dc84fd4fe2003ceee3dddcb85f438 SHA512 ba0b8a8a87e154c36b499b0fbb422847bcec421bdcbb6a7fc4a4d8169ae410f6bb71867fbff42b670b3d5ae61101527eeb71e68d57458906796e2d64adc0e367 +DIST docker-compose-1.28.5.tar.gz 318236 BLAKE2B 32aca16fdebd00c5b211404e82b44b9486340bfa379d4739d164d5aa75d4f35b95d914065c05fef585ea7e412035e582d8058f2b942a4ce17a9b2bc25ff0cd31 SHA512 1f2cc87b82d18c023e8c2d9eb2e991393c96f7a3ab17fa6871d0969a28162b6832f98b42c76cadc641416629f74eb00763c89e044ae8cf02a062bd74b58371c9 diff --git a/app-emulation/docker-compose/docker-compose-1.28.2.ebuild b/app-emulation/docker-compose/docker-compose-1.28.4.ebuild index 12e856573d56..a24b4f98416a 100644 --- a/app-emulation/docker-compose/docker-compose-1.28.2.ebuild +++ b/app-emulation/docker-compose/docker-compose-1.28.4.ebuild @@ -22,7 +22,7 @@ RESTRICT="!test? ( test )" RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}] >=dev-python/distro-1.5.0[${PYTHON_USEDEP}] - >=dev-python/docker-py-4.4.0[${PYTHON_USEDEP}] + >=dev-python/docker-py-4.4.3[${PYTHON_USEDEP}] >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}] >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}] >=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}] @@ -46,7 +46,7 @@ S="${WORKDIR}/compose-${MY_PV}" PATCHES=( # Bug #679968 -- https://bugs.gentoo.org/679968 # Bug #681002 -- https://bugs.gentoo.org/681002 - "${FILESDIR}"/${PN}-1.28.0_rc2-setup-py.patch + "${FILESDIR}"/${PN}-1.28.4-setup-py.patch ) DOCS=( CHANGELOG.md README.md ) diff --git a/app-emulation/docker-compose/docker-compose-1.28.0.ebuild b/app-emulation/docker-compose/docker-compose-1.28.5.ebuild index 12e856573d56..99a5fe375bb4 100644 --- a/app-emulation/docker-compose/docker-compose-1.28.0.ebuild +++ b/app-emulation/docker-compose/docker-compose-1.28.5.ebuild @@ -22,7 +22,7 @@ RESTRICT="!test? ( test )" RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}] >=dev-python/distro-1.5.0[${PYTHON_USEDEP}] - >=dev-python/docker-py-4.4.0[${PYTHON_USEDEP}] + >=dev-python/docker-py-4.4.4[${PYTHON_USEDEP}] >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}] >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}] >=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}] @@ -46,7 +46,7 @@ S="${WORKDIR}/compose-${MY_PV}" PATCHES=( # Bug #679968 -- https://bugs.gentoo.org/679968 # Bug #681002 -- https://bugs.gentoo.org/681002 - "${FILESDIR}"/${PN}-1.28.0_rc2-setup-py.patch + "${FILESDIR}"/${PN}-1.28.5-setup-py.patch ) DOCS=( CHANGELOG.md README.md ) diff --git a/app-emulation/docker-compose/files/docker-compose-1.28.0_rc2-setup-py.patch b/app-emulation/docker-compose/files/docker-compose-1.28.4-setup-py.patch index 0eaac41d742a..79b1c168170f 100644 --- a/app-emulation/docker-compose/files/docker-compose-1.28.0_rc2-setup-py.patch +++ b/app-emulation/docker-compose/files/docker-compose-1.28.4-setup-py.patch @@ -22,7 +22,7 @@ index 57e1313..94a3337 100644 - 'texttable >= 0.9.0, < 2', - 'websocket-client >= 0.32.0, < 1', - 'distro >= 1.5.0, < 2', -- 'docker[ssh] >= 4.4.0, < 5', +- 'docker[ssh] >= 4.4.3, < 5', - 'dockerpty >= 0.4.1, < 1', - 'jsonschema >= 2.5.1, < 4', - 'python-dotenv >= 0.13.0, < 1', @@ -33,7 +33,7 @@ index 57e1313..94a3337 100644 + 'texttable >= 0.9.0', + 'websocket-client >= 0.32.0', + 'distro >= 1.5.0', -+ 'docker[ssh] >= 4.4.0', ++ 'docker[ssh] >= 4.4.3', + 'dockerpty >= 0.4.1', + 'jsonschema >= 2.5.1', + 'python-dotenv >= 0.13.0', diff --git a/app-emulation/docker-compose/files/docker-compose-1.28.5-setup-py.patch b/app-emulation/docker-compose/files/docker-compose-1.28.5-setup-py.patch new file mode 100644 index 000000000000..75967139165a --- /dev/null +++ b/app-emulation/docker-compose/files/docker-compose-1.28.5-setup-py.patch @@ -0,0 +1,67 @@ +From 7a5520d0b478e9bb20c9c3ff2614a8afd392b020 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebastian@pipping.org> +Date: Mon, 4 Jan 2021 17:36:44 +0100 +Subject: [PATCH] setup.py: Drop generic upper version boundaries + +--- + setup.py | 34 +++++++++++++++++----------------- + 1 file changed, 17 insertions(+), 17 deletions(-) + +diff --git a/setup.py b/setup.py +index 57e1313..94a3337 100644 +--- a/setup.py ++++ b/setup.py +@@ -25,33 +25,33 @@ def find_version(*file_paths): + + + install_requires = [ +- 'cached-property >= 1.2.0, < 2', +- 'docopt >= 0.6.1, < 1', +- 'PyYAML >= 3.10, < 6', +- 'requests >= 2.20.0, < 3', +- 'texttable >= 0.9.0, < 2', +- 'websocket-client >= 0.32.0, < 1', +- 'distro >= 1.5.0, < 2', +- 'docker[ssh] >= 4.4.4, < 5', +- 'dockerpty >= 0.4.1, < 1', +- 'jsonschema >= 2.5.1, < 4', +- 'python-dotenv >= 0.13.0, < 1', ++ 'cached-property >= 1.2.0', ++ 'docopt >= 0.6.1', ++ 'PyYAML >= 3.10', ++ 'requests >= 2.20.0', ++ 'texttable >= 0.9.0', ++ 'websocket-client >= 0.32.0', ++ 'distro >= 1.5.0', ++ 'docker[ssh] >= 4.4.4', ++ 'dockerpty >= 0.4.1', ++ 'jsonschema >= 2.5.1', ++ 'python-dotenv >= 0.13.0', + ] + + + tests_require = [ +- 'ddt >= 1.2.2, < 2', +- 'pytest < 6', ++ 'ddt >= 1.2.2', ++ 'pytest', + ] + + + if sys.version_info[:2] < (3, 4): +- tests_require.append('mock >= 1.0.1, < 4') ++ tests_require.append('mock >= 1.0.1') + + extras_require = { +- ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'], +- ':sys_platform == "win32"': ['colorama >= 0.4, < 1'], +- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'], ++ ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'], ++ ':sys_platform == "win32"': ['colorama >= 0.4'], ++ 'socks': ['PySocks >= 1.5.6, != 1.5.7'], + 'tests': tests_require, + } + +-- +2.30.0.rc2 + diff --git a/app-emulation/docker-compose/metadata.xml b/app-emulation/docker-compose/metadata.xml index a501de3afddc..2f5ad47da2d2 100644 --- a/app-emulation/docker-compose/metadata.xml +++ b/app-emulation/docker-compose/metadata.xml @@ -1,12 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>sping@gentoo.org</email> - <name>Sebastian Pipping</name> - </maintainer> - <upstream> - <remote-id type="pypi">docker-compose</remote-id> - <remote-id type="github">docker/compose</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="person"> + <email>sping@gentoo.org</email> + <name>Sebastian Pipping</name> + </maintainer> + <upstream> + <remote-id type="pypi">docker-compose</remote-id> + <remote-id type="github">docker/compose</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/docker-credential-helpers/metadata.xml b/app-emulation/docker-credential-helpers/metadata.xml index 196e66de1e6e..59abe2c010fa 100644 --- a/app-emulation/docker-credential-helpers/metadata.xml +++ b/app-emulation/docker-credential-helpers/metadata.xml @@ -1,27 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <longdescription> + <maintainer type="person"> + <email>rkitover@gmail.com</email> + <name>Rafael Kitover</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription> A suite of programs to use native stores to keep Docker credentials safe. Currently provides docker-credential-secretservice to use the D-Bus secret service APIs, and docker-credential-pass to use the pass framework. </longdescription> - <maintainer type="person"> - <email>rkitover@gmail.com</email> - <name>Rafael Kitover</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <use> - <flag name="gnome-keyring"> + + <use> + <flag name="gnome-keyring"> Build secretservice helper which works with gnome-keyring or kwallet using D-Bus. </flag> - <flag name="pass"> + <flag name="pass"> Build pass helper for the pass utility. </flag> - </use> -</pkgmetadata> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/docker-gc/metadata.xml b/app-emulation/docker-gc/metadata.xml index 444c94200f5c..3b5f7193466c 100644 --- a/app-emulation/docker-gc/metadata.xml +++ b/app-emulation/docker-gc/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="github">spotify/docker-gc</remote-id> - </upstream> -</pkgmetadata> + <upstream> + <remote-id type="github">spotify/docker-gc</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/docker-machine-kvm/metadata.xml b/app-emulation/docker-machine-kvm/metadata.xml index 92a59d8fc1b9..5edb5444b7e2 100644 --- a/app-emulation/docker-machine-kvm/metadata.xml +++ b/app-emulation/docker-machine-kvm/metadata.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>zmedico@gentoo.org</email> - </maintainer> - <upstream> - <remote-id type="github">dhiltgen/docker-machine-kvm</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="person"> + <email>zmedico@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">dhiltgen/docker-machine-kvm</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/docker-machine/metadata.xml b/app-emulation/docker-machine/metadata.xml index 8549b7fc81f3..097eb187ad7c 100644 --- a/app-emulation/docker-machine/metadata.xml +++ b/app-emulation/docker-machine/metadata.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>zmedico@gentoo.org</email> - </maintainer> - <upstream> - <remote-id type="github">docker/machine</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="person"> + <email>zmedico@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">docker/machine</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20201105.ebuild b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20201105.ebuild index feb57a0f2c36..40d357a97cd0 100644 --- a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20201105.ebuild +++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20201105.ebuild @@ -26,7 +26,8 @@ S=${WORKDIR}/${P}/src/${EGO_PN} RESTRICT="test" src_compile() { - GOPATH="${WORKDIR}/${P}" go build -o "bin/docker-proxy" ./cmd/proxy || die + GO111MODULE=auto GOPATH="${WORKDIR}/${P}" \ + go build -o "bin/docker-proxy" ./cmd/proxy || die } src_install() { diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20201215.ebuild b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20201215.ebuild index 61b8e08632b5..374292183eec 100644 --- a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20201215.ebuild +++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20201215.ebuild @@ -26,7 +26,8 @@ S=${WORKDIR}/${P}/src/${EGO_PN} RESTRICT="strip test" src_compile() { - GOPATH="${WORKDIR}/${P}" go build -o "bin/docker-proxy" ./cmd/proxy || die + GO111MODULE=auto GOPATH="${WORKDIR}/${P}" \ + go build -o "bin/docker-proxy" ./cmd/proxy || die } src_install() { diff --git a/app-emulation/docker-proxy/metadata.xml b/app-emulation/docker-proxy/metadata.xml index 46bc689bb8cd..d357e3185ed5 100644 --- a/app-emulation/docker-proxy/metadata.xml +++ b/app-emulation/docker-proxy/metadata.xml @@ -1,15 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>williamh@gentoo.org</email> - <name>William Hubbs</name> - </maintainer> - <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> - </maintainer> - <upstream> - <remote-id type="github">docker/libnetwork</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="person"> + <email>williamh@gentoo.org</email> + <name>William Hubbs</name> + </maintainer> + <maintainer type="person"> + <email>gyakovlev@gentoo.org</email> + <name>Georgy Yakovlev</name> + </maintainer> + <upstream> + <remote-id type="github">docker/libnetwork</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/docker-registry/metadata.xml b/app-emulation/docker-registry/metadata.xml index 4f66ba32a890..68313df8f7cc 100644 --- a/app-emulation/docker-registry/metadata.xml +++ b/app-emulation/docker-registry/metadata.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>zmedico@gentoo.org</email> - </maintainer> - <upstream> - <remote-id type="github">docker/distribution</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="person"> + <email>zmedico@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">docker/distribution</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/docker-swarm/metadata.xml b/app-emulation/docker-swarm/metadata.xml index 127ef4728e20..1aecc05ece11 100644 --- a/app-emulation/docker-swarm/metadata.xml +++ b/app-emulation/docker-swarm/metadata.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>zmedico@gentoo.org</email> - </maintainer> - <upstream> - <remote-id type="github">docker/swarm</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="person"> + <email>zmedico@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">docker/swarm</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest index 3e4cec29ef02..6bfba2207360 100644 --- a/app-emulation/docker/Manifest +++ b/app-emulation/docker/Manifest @@ -1,5 +1,2 @@ -DIST docker-19.03.13.tar.gz 18242693 BLAKE2B c19afed62694274298b42fc9af3b36c4cc6429b40f7e5447a996b87636a0d2e916476875652e20abd7aeab4e5e0e1cf887a04dcade1de03ded549fc36d911ac4 SHA512 5f34a14ef0b36a309d4a08926ac482ca82d24cdd873aa359c5ba7c65473cbb2e987fe615c38c1bc1c50135284da78a7eb98a8a0106d7d073aeda0cd8f1c31873 -DIST docker-19.03.14.tar.gz 18278132 BLAKE2B 5e32cb482fdc40531aa4ba79dd447093859f568b3d8b5c3ed584c78d5709fabf2a1e05e82af2686cd87462e1abd899bd3f0a746f97937b7d16950f5e94264dff SHA512 5e48185a7787d5637fc11f43f6af604d56a5fa4367fd5a558bb3a5ef3c0d767f1c7f83ecef369453696b68eed81e49520453f267fbe8c2b840b3f62d35f25c28 DIST docker-19.03.15.tar.gz 18284803 BLAKE2B a1fac5d841934382d12c781353546b7c7a8167d0f2dc4150659a4aece210ea7361c59de25e3d450dae20fd536ea8dc33a18e55f9565ee4fdc818166810391fbf SHA512 ffd8e683a93a6ce69789603d24457aebe3379594692cb3dadc25bc8d407771a29d76087b0ca70856707f151622b1853f283a1071311c033ff90a1e44b0d9ffbc -DIST docker-20.10.2.tar.gz 11045195 BLAKE2B 182ceabbabfa091eaae8ecf12a50dfbe296722072ee24cdde48c3ed2ad40f47d6f939830a00e1dbe7d5dfb1fa25ccda7efe25ce3e4f9a7bbf6ad85dac109168c SHA512 b514e98e3f71874fcf5374eeaaabc2c879691b48937dbc962be3577d834f571353d4f946aebfa69f1a62b1388c9220bfdff09b62bf62c134bd41f494e8506f56 DIST docker-20.10.3.tar.gz 11063792 BLAKE2B 9309573dd83d0746bb492cf68e06d69e60550718f8f934a065b33d1538847a4effcf6310638daa9b535515bc43cc1b47636482c90d4499f2b46b74aa37882dd7 SHA512 8389980e0b47e34872301bbe703d7abfc7819946736bab0ef4fee983daa4f798c7c6373d823dc62a3995076e71ca6bc86dc793f736b68e8ec1040332193cfdb8 diff --git a/app-emulation/docker/docker-19.03.13-r2.ebuild b/app-emulation/docker/docker-19.03.13-r2.ebuild deleted file mode 100644 index b4de621c665c..000000000000 --- a/app-emulation/docker/docker-19.03.13-r2.ebuild +++ /dev/null @@ -1,333 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGO_PN="github.com/docker/docker-ce" - -if [[ ${PV} = *9999* ]]; then - # Docker cannot be fetched via "go get", thanks to autogenerated code - EGIT_REPO_URI="https://${EGO_PN}.git" - EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}" - inherit git-r3 -else - DOCKER_GITCOMMIT=4484c46d9d - MY_PV=${PV/_/-} - SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm arm64 ppc64 ~x86" - [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" - inherit golang-vcs-snapshot -fi -inherit bash-completion-r1 golang-base linux-info systemd udev - -DESCRIPTION="The core functions you need to create Docker images and run Docker containers" -HOMEPAGE="https://www.docker.com/" -LICENSE="Apache-2.0" -SLOT="0" -IUSE="apparmor aufs btrfs +container-init device-mapper hardened overlay seccomp selinux" - -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies -BDEPEND=" - >=dev-lang/go-1.13.12 - dev-go/go-md2man - virtual/pkgconfig -" - -DEPEND=" - acct-group/docker - >=dev-db/sqlite-3.7.9:3 - apparmor? ( sys-libs/libapparmor ) - btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) - device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) - seccomp? ( >=sys-libs/libseccomp-2.2.1 ) -" - -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies -# https://github.com/docker/docker-ce/tree/master/components/engine/hack/dockerfile/install -# make sure containerd, docker-proxy, runc and tini pinned to exact versions from ^, -# for appropriate brachch/version of course -RDEPEND=" - ${DEPEND} - !sys-apps/systemd[-cgroup-hybrid(+)] - >=net-firewall/iptables-1.4 - sys-process/procps - >=dev-vcs/git-1.7 - >=app-arch/xz-utils-4.9 - dev-libs/libltdl - ~app-emulation/containerd-1.3.7[apparmor?,btrfs?,device-mapper?,seccomp?,selinux?] - ~app-emulation/runc-1.0.0_rc10[apparmor?,seccomp?,selinux(-)?] - ~app-emulation/docker-proxy-0.8.0_p20200617 - container-init? ( >=sys-process/tini-0.18.0[static] ) -" - -RESTRICT="installsources strip" - -S="${WORKDIR}/${P}/src/${EGO_PN}" - -# see "contrib/check-config.sh" from upstream's sources -CONFIG_CHECK=" - ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS - ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG - ~KEYS - ~VETH ~BRIDGE ~BRIDGE_NETFILTER - ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE - ~NETFILTER_NETLINK ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS - ~IP_NF_NAT ~NF_NAT - ~POSIX_MQUEUE - - ~USER_NS - ~SECCOMP - ~CGROUP_PIDS - ~MEMCG_SWAP - - ~BLK_CGROUP ~BLK_DEV_THROTTLING - ~CGROUP_PERF - ~CGROUP_HUGETLB - ~NET_CLS_CGROUP - ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED - ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR - - ~VXLAN - ~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER - ~IPVLAN - ~MACVLAN ~DUMMY - - ~OVERLAY_FS ~!OVERLAY_FS_REDIRECT_DIR - ~EXT4_FS_SECURITY - ~EXT4_FS_POSIX_ACL -" - -ERROR_KEYS="CONFIG_KEYS: is mandatory" -ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" -ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering" - -ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering" -ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering" -ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering" -ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering" -ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks" -ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks" - -pkg_setup() { - if kernel_is lt 3 10; then - ewarn "" - ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported." - ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies" - fi - - if kernel_is le 3 18; then - CONFIG_CHECK+=" - ~RESOURCE_COUNTERS - " - fi - - if kernel_is le 3 13; then - CONFIG_CHECK+=" - ~NETPRIO_CGROUP - " - else - CONFIG_CHECK+=" - ~CGROUP_NET_PRIO - " - fi - - if kernel_is lt 4 5; then - CONFIG_CHECK+=" - ~MEMCG_KMEM - " - ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional" - fi - - if kernel_is lt 4 7; then - CONFIG_CHECK+=" - ~DEVPTS_MULTIPLE_INSTANCES - " - fi - - if kernel_is lt 5 1; then - CONFIG_CHECK+=" - ~NF_NAT_IPV4 - ~IOSCHED_CFQ - ~CFQ_GROUP_IOSCHED - " - fi - - if kernel_is lt 5 2; then - CONFIG_CHECK+=" - ~NF_NAT_NEEDED - " - fi - - if kernel_is lt 5 8; then - CONFIG_CHECK+=" - ~MEMCG_SWAP_ENABLED - " - fi - - if use aufs; then - CONFIG_CHECK+=" - ~AUFS_FS - ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY - " - ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs is patched to kernel instead of using standalone" - fi - - if use btrfs; then - CONFIG_CHECK+=" - ~BTRFS_FS - ~BTRFS_FS_POSIX_ACL - " - fi - - if use device-mapper; then - CONFIG_CHECK+=" - ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY - " - fi - - linux-info_pkg_setup -} - -src_compile() { - export GOPATH="${WORKDIR}/${P}" - - # setup CFLAGS and LDFLAGS for separate build target - # see https://github.com/tianon/docker-overlay/pull/10 - export CGO_CFLAGS="-I${ROOT}/usr/include" - export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)" - - # if we're building from a tarball, we need the GITCOMMIT value - [[ ${DOCKER_GITCOMMIT} ]] && export DOCKER_GITCOMMIT - - # fake golang layout - ln -s docker-ce/components/engine ../docker || die - ln -s docker-ce/components/cli ../cli || die - - # let's set up some optional features :) - export DOCKER_BUILDTAGS='' - for gd in aufs btrfs device-mapper overlay; do - if ! use $gd; then - DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}" - fi - done - - for tag in apparmor seccomp selinux; do - if use $tag; then - DOCKER_BUILDTAGS+=" $tag" - fi - done - - pushd components/engine || die - - if use hardened; then - sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die - grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed' - sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ - -i hack/make/dynbinary-daemon || die - grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed' - fi - - # build daemon - VERSION="$(cat ../../VERSION)" \ - ./hack/make.sh dynbinary || die 'dynbinary failed' - - popd || die # components/engine - - pushd components/cli || die - - # build cli - DISABLE_WARN_OUTSIDE_CONTAINER=1 emake \ - LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \ - VERSION="$(cat ../../VERSION)" \ - GITCOMMIT="${DOCKER_GITCOMMIT}" \ - dynbinary - - # build man pages - go build -o gen-manpages github.com/docker/cli/man || die - ./gen-manpages --root . --target ./man/man1 || die - ./man/md2man-all.sh -q || die - rm gen-manpages || die - # see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man) - - popd || die # components/cli -} - -src_install() { - dosym containerd /usr/bin/docker-containerd - dosym containerd-shim /usr/bin/docker-containerd-shim - dosym runc /usr/bin/docker-runc - use container-init && dosym tini /usr/bin/docker-init - - pushd components/engine || die - newbin bundles/dynbinary-daemon/dockerd-${PV} dockerd - - newinitd contrib/init/openrc/docker.initd docker - newconfd contrib/init/openrc/docker.confd docker - - systemd_dounit contrib/init/systemd/docker.{service,socket} - - udev_dorules contrib/udev/*.rules - - dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md - dodoc -r docs/* - - insinto /usr/share/vim/vimfiles - doins -r contrib/syntax/vim/ftdetect - doins -r contrib/syntax/vim/syntax - - # note: intentionally not using "doins" so that we preserve +x bits - dodir /usr/share/${PN}/contrib - cp -R contrib/* "${ED}/usr/share/${PN}/contrib" - popd || die # components/engine - - pushd components/cli || die - - newbin build/docker-* docker - - doman man/man*/* - - sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die - dobashcomp contrib/completion/bash/* - bashcomp_alias docker dockerd - insinto /usr/share/fish/vendor_completions.d/ - doins contrib/completion/fish/docker.fish - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/_* - popd || die # components/cli -} - -pkg_postinst() { - udev_reload - - elog - elog "To use Docker, the Docker daemon must be running as root. To automatically" - elog "start the Docker daemon at boot:" - if systemd_is_booted || has_version sys-apps/systemd; then - elog " systemctl enable docker.service" - else - elog " rc-update add docker default" - fi - elog - elog "To use Docker as a non-root user, add yourself to the 'docker' group:" - elog ' usermod -aG docker <youruser>' - elog - - if use device-mapper; then - elog " Devicemapper storage driver has been deprecated" - elog " It will be removed in a future release" - elog - fi - - if use overlay; then - elog " Overlay storage driver/USEflag has been deprecated" - elog " in favor of overlay2 (enabled unconditionally)" - elog - fi - - if has_version sys-fs/zfs; then - elog " ZFS storage driver is available" - elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info" - elog - fi -} diff --git a/app-emulation/docker/docker-19.03.14.ebuild b/app-emulation/docker/docker-19.03.14.ebuild deleted file mode 100644 index 7524b7a23f46..000000000000 --- a/app-emulation/docker/docker-19.03.14.ebuild +++ /dev/null @@ -1,333 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGO_PN="github.com/docker/docker-ce" - -if [[ ${PV} = *9999* ]]; then - # Docker cannot be fetched via "go get", thanks to autogenerated code - EGIT_REPO_URI="https://${EGO_PN}.git" - EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}" - inherit git-r3 -else - DOCKER_GITCOMMIT="5eb3275" - MY_PV=${PV/_/-} - SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm arm64 ppc64 ~x86" - [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" - inherit golang-vcs-snapshot -fi -inherit bash-completion-r1 golang-base linux-info systemd udev - -DESCRIPTION="The core functions you need to create Docker images and run Docker containers" -HOMEPAGE="https://www.docker.com/" -LICENSE="Apache-2.0" -SLOT="0" -IUSE="apparmor aufs btrfs +container-init device-mapper hardened overlay seccomp selinux" - -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies -BDEPEND=" - >=dev-lang/go-1.13.12 - dev-go/go-md2man - virtual/pkgconfig -" - -DEPEND=" - acct-group/docker - >=dev-db/sqlite-3.7.9:3 - apparmor? ( sys-libs/libapparmor ) - btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) - device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) - seccomp? ( >=sys-libs/libseccomp-2.2.1 ) -" - -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies -# https://github.com/docker/docker-ce/tree/master/components/engine/hack/dockerfile/install -# make sure containerd, docker-proxy, runc and tini pinned to exact versions from ^, -# for appropriate brachch/version of course -RDEPEND=" - ${DEPEND} - !sys-apps/systemd[-cgroup-hybrid(+)] - >=net-firewall/iptables-1.4 - sys-process/procps - >=dev-vcs/git-1.7 - >=app-arch/xz-utils-4.9 - dev-libs/libltdl - ~app-emulation/containerd-1.3.9[apparmor?,btrfs?,device-mapper?,seccomp?,selinux?] - ~app-emulation/runc-1.0.0_rc10[apparmor?,seccomp?,selinux(-)?] - ~app-emulation/docker-proxy-0.8.0_p20201105 - container-init? ( >=sys-process/tini-0.18.0[static] ) -" - -RESTRICT="installsources strip" - -S="${WORKDIR}/${P}/src/${EGO_PN}" - -# see "contrib/check-config.sh" from upstream's sources -CONFIG_CHECK=" - ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS - ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG - ~KEYS - ~VETH ~BRIDGE ~BRIDGE_NETFILTER - ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE - ~NETFILTER_NETLINK ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS - ~IP_NF_NAT ~NF_NAT - ~POSIX_MQUEUE - - ~USER_NS - ~SECCOMP - ~CGROUP_PIDS - ~MEMCG_SWAP - - ~BLK_CGROUP ~BLK_DEV_THROTTLING - ~CGROUP_PERF - ~CGROUP_HUGETLB - ~NET_CLS_CGROUP - ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED - ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR - - ~VXLAN - ~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER - ~IPVLAN - ~MACVLAN ~DUMMY - - ~OVERLAY_FS ~!OVERLAY_FS_REDIRECT_DIR - ~EXT4_FS_SECURITY - ~EXT4_FS_POSIX_ACL -" - -ERROR_KEYS="CONFIG_KEYS: is mandatory" -ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" -ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering" - -ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering" -ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering" -ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering" -ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering" -ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks" -ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks" - -pkg_setup() { - if kernel_is lt 3 10; then - ewarn "" - ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported." - ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies" - fi - - if kernel_is le 3 18; then - CONFIG_CHECK+=" - ~RESOURCE_COUNTERS - " - fi - - if kernel_is le 3 13; then - CONFIG_CHECK+=" - ~NETPRIO_CGROUP - " - else - CONFIG_CHECK+=" - ~CGROUP_NET_PRIO - " - fi - - if kernel_is lt 4 5; then - CONFIG_CHECK+=" - ~MEMCG_KMEM - " - ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional" - fi - - if kernel_is lt 4 7; then - CONFIG_CHECK+=" - ~DEVPTS_MULTIPLE_INSTANCES - " - fi - - if kernel_is lt 5 1; then - CONFIG_CHECK+=" - ~NF_NAT_IPV4 - ~IOSCHED_CFQ - ~CFQ_GROUP_IOSCHED - " - fi - - if kernel_is lt 5 2; then - CONFIG_CHECK+=" - ~NF_NAT_NEEDED - " - fi - - if kernel_is lt 5 8; then - CONFIG_CHECK+=" - ~MEMCG_SWAP_ENABLED - " - fi - - if use aufs; then - CONFIG_CHECK+=" - ~AUFS_FS - ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY - " - ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs is patched to kernel instead of using standalone" - fi - - if use btrfs; then - CONFIG_CHECK+=" - ~BTRFS_FS - ~BTRFS_FS_POSIX_ACL - " - fi - - if use device-mapper; then - CONFIG_CHECK+=" - ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY - " - fi - - linux-info_pkg_setup -} - -src_compile() { - export GOPATH="${WORKDIR}/${P}" - - # setup CFLAGS and LDFLAGS for separate build target - # see https://github.com/tianon/docker-overlay/pull/10 - export CGO_CFLAGS="-I${ROOT}/usr/include" - export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)" - - # if we're building from a tarball, we need the GITCOMMIT value - [[ ${DOCKER_GITCOMMIT} ]] && export DOCKER_GITCOMMIT - - # fake golang layout - ln -s docker-ce/components/engine ../docker || die - ln -s docker-ce/components/cli ../cli || die - - # let's set up some optional features :) - export DOCKER_BUILDTAGS='' - for gd in aufs btrfs device-mapper overlay; do - if ! use $gd; then - DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}" - fi - done - - for tag in apparmor seccomp selinux; do - if use $tag; then - DOCKER_BUILDTAGS+=" $tag" - fi - done - - pushd components/engine || die - - if use hardened; then - sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die - grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed' - sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ - -i hack/make/dynbinary-daemon || die - grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed' - fi - - # build daemon - VERSION="$(cat ../../VERSION)" \ - ./hack/make.sh dynbinary || die 'dynbinary failed' - - popd || die # components/engine - - pushd components/cli || die - - # build cli - DISABLE_WARN_OUTSIDE_CONTAINER=1 emake \ - LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \ - VERSION="$(cat ../../VERSION)" \ - GITCOMMIT="${DOCKER_GITCOMMIT}" \ - dynbinary - - # build man pages - go build -o gen-manpages github.com/docker/cli/man || die - ./gen-manpages --root . --target ./man/man1 || die - ./man/md2man-all.sh -q || die - rm gen-manpages || die - # see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man) - - popd || die # components/cli -} - -src_install() { - dosym containerd /usr/bin/docker-containerd - dosym containerd-shim /usr/bin/docker-containerd-shim - dosym runc /usr/bin/docker-runc - use container-init && dosym tini /usr/bin/docker-init - - pushd components/engine || die - newbin bundles/dynbinary-daemon/dockerd-${PV} dockerd - - newinitd contrib/init/openrc/docker.initd docker - newconfd contrib/init/openrc/docker.confd docker - - systemd_dounit contrib/init/systemd/docker.{service,socket} - - udev_dorules contrib/udev/*.rules - - dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md - dodoc -r docs/* - - insinto /usr/share/vim/vimfiles - doins -r contrib/syntax/vim/ftdetect - doins -r contrib/syntax/vim/syntax - - # note: intentionally not using "doins" so that we preserve +x bits - dodir /usr/share/${PN}/contrib - cp -R contrib/* "${ED}/usr/share/${PN}/contrib" - popd || die # components/engine - - pushd components/cli || die - - newbin build/docker-* docker - - doman man/man*/* - - sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die - dobashcomp contrib/completion/bash/* - bashcomp_alias docker dockerd - insinto /usr/share/fish/vendor_completions.d/ - doins contrib/completion/fish/docker.fish - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/_* - popd || die # components/cli -} - -pkg_postinst() { - udev_reload - - elog - elog "To use Docker, the Docker daemon must be running as root. To automatically" - elog "start the Docker daemon at boot:" - if systemd_is_booted || has_version sys-apps/systemd; then - elog " systemctl enable docker.service" - else - elog " rc-update add docker default" - fi - elog - elog "To use Docker as a non-root user, add yourself to the 'docker' group:" - elog ' usermod -aG docker <youruser>' - elog - - if use device-mapper; then - elog " Devicemapper storage driver has been deprecated" - elog " It will be removed in a future release" - elog - fi - - if use overlay; then - elog " Overlay storage driver/USEflag has been deprecated" - elog " in favor of overlay2 (enabled unconditionally)" - elog - fi - - if has_version sys-fs/zfs; then - elog " ZFS storage driver is available" - elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info" - elog - fi -} diff --git a/app-emulation/docker/docker-20.10.2.ebuild b/app-emulation/docker/docker-20.10.2.ebuild deleted file mode 100644 index 0330740f9dcc..000000000000 --- a/app-emulation/docker/docker-20.10.2.ebuild +++ /dev/null @@ -1,293 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -EGO_PN=github.com/docker/docker -GIT_COMMIT=f0014860c1 -inherit bash-completion-r1 linux-info systemd udev golang-vcs-snapshot - -DESCRIPTION="The core functions you need to create Docker images and run Docker containers" -HOMEPAGE="https://www.docker.com/" -MY_PV=${PV/_/-} -SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="apparmor aufs btrfs +cli +container-init device-mapper hardened overlay seccomp" - -DEPEND=" - acct-group/docker - >=dev-db/sqlite-3.7.9:3 - apparmor? ( sys-libs/libapparmor ) - btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) - device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) - seccomp? ( >=sys-libs/libseccomp-2.2.1 ) -" - -# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies -# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies -# https://github.com/moby/moby/tree/master//hack/dockerfile/install -# make sure containerd, docker-proxy, runc and tini pinned to exact versions from ^, -# for appropriate branchch/version of course -RDEPEND=" - ${DEPEND} - >=net-firewall/iptables-1.4 - sys-process/procps - >=dev-vcs/git-1.7 - >=app-arch/xz-utils-4.9 - dev-libs/libltdl - ~app-emulation/containerd-1.4.3[apparmor?,btrfs?,device-mapper?,seccomp?] - ~app-emulation/runc-1.0.0_rc92[apparmor?,seccomp?] - ~app-emulation/docker-proxy-0.8.0_p20201215 - cli? ( app-emulation/docker-cli ) - container-init? ( >=sys-process/tini-0.19.0[static] ) -" - -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies -BDEPEND=" - >=dev-lang/go-1.13.12 - dev-go/go-md2man - virtual/pkgconfig -" - -RESTRICT="installsources strip" - -S="${WORKDIR}/${P}/src/${EGO_PN}" - -# see "contrib/check-config.sh" from upstream's sources -CONFIG_CHECK=" - ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS - ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG - ~KEYS - ~VETH ~BRIDGE ~BRIDGE_NETFILTER - ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE - ~NETFILTER_NETLINK ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS - ~IP_NF_NAT ~NF_NAT - ~POSIX_MQUEUE - - ~USER_NS - ~SECCOMP - ~CGROUP_PIDS - ~MEMCG_SWAP - - ~BLK_CGROUP ~BLK_DEV_THROTTLING - ~CGROUP_PERF - ~CGROUP_HUGETLB - ~NET_CLS_CGROUP - ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED - ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR - - ~VXLAN - ~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER - ~IPVLAN - ~MACVLAN ~DUMMY - - ~OVERLAY_FS ~!OVERLAY_FS_REDIRECT_DIR - ~EXT4_FS_SECURITY - ~EXT4_FS_POSIX_ACL -" - -ERROR_KEYS="CONFIG_KEYS: is mandatory" -ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" -ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering" - -ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering" -ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering" -ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering" -ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering" -ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks" -ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks" - -pkg_setup() { - if kernel_is lt 3 10; then - ewarn "" - ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported." - ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies" - fi - - if kernel_is le 3 18; then - CONFIG_CHECK+=" - ~RESOURCE_COUNTERS - " - fi - - if kernel_is le 3 13; then - CONFIG_CHECK+=" - ~NETPRIO_CGROUP - " - else - CONFIG_CHECK+=" - ~CGROUP_NET_PRIO - " - fi - - if kernel_is lt 4 5; then - CONFIG_CHECK+=" - ~MEMCG_KMEM - " - ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional" - fi - - if kernel_is lt 4 7; then - CONFIG_CHECK+=" - ~DEVPTS_MULTIPLE_INSTANCES - " - fi - - if kernel_is lt 5 1; then - CONFIG_CHECK+=" - ~NF_NAT_IPV4 - ~IOSCHED_CFQ - ~CFQ_GROUP_IOSCHED - " - fi - - if kernel_is lt 5 2; then - CONFIG_CHECK+=" - ~NF_NAT_NEEDED - " - fi - - if kernel_is lt 5 8; then - CONFIG_CHECK+=" - ~MEMCG_SWAP_ENABLED - " - fi - - if use aufs; then - CONFIG_CHECK+=" - ~AUFS_FS - ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY - " - ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs is patched to kernel instead of using standalone" - fi - - if use btrfs; then - CONFIG_CHECK+=" - ~BTRFS_FS - ~BTRFS_FS_POSIX_ACL - " - fi - - if use device-mapper; then - CONFIG_CHECK+=" - ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY - " - fi - - linux-info_pkg_setup -} - -src_compile() { - export DOCKER_GITCOMMIT="${GIT_COMMIT}" - export GOPATH="${WORKDIR}/${P}" - - # setup CFLAGS and LDFLAGS for separate build target - # see https://github.com/tianon/docker-overlay/pull/10 - export CGO_CFLAGS="-I${ROOT}/usr/include" - export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)" - - # let's set up some optional features :) - export DOCKER_BUILDTAGS='' - for gd in aufs btrfs device-mapper overlay; do - if ! use $gd; then - DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}" - fi - done - - for tag in apparmor seccomp; do - if use $tag; then - DOCKER_BUILDTAGS+=" $tag" - fi - done - - if use hardened; then - sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die - grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed' - sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ - -i hack/make/dynbinary-daemon || die - grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed' - fi - - # build daemon - ./hack/make.sh dynbinary || die 'dynbinary failed' -} - -src_install() { - dosym containerd /usr/bin/docker-containerd - dosym containerd-shim /usr/bin/docker-containerd-shim - dosym runc /usr/bin/docker-runc - use container-init && dosym tini /usr/bin/docker-init - newbin bundles/dynbinary-daemon/dockerd dockerd - - newinitd contrib/init/openrc/docker.initd docker - newconfd contrib/init/openrc/docker.confd docker - - systemd_dounit contrib/init/systemd/docker.{service,socket} - - udev_dorules contrib/udev/*.rules - - dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md - dodoc -r docs/* - - # note: intentionally not using "doins" so that we preserve +x bits - dodir /usr/share/${PN}/contrib - cp -R contrib/* "${ED}/usr/share/${PN}/contrib" -} - -pkg_postinst() { - udev_reload - - elog - elog "To use Docker, the Docker daemon must be running as root. To automatically" - elog "start the Docker daemon at boot:" - if systemd_is_booted || has_version sys-apps/systemd; then - elog " systemctl enable docker.service" - else - elog " rc-update add docker default" - fi - elog - elog "To use Docker as a non-root user, add yourself to the 'docker' group:" - elog ' usermod -aG docker <youruser>' - elog - - if use device-mapper; then - elog " Devicemapper storage driver has been deprecated" - elog " It will be removed in a future release" - elog - fi - - if use overlay; then - elog " Overlay storage driver/USEflag has been deprecated" - elog " in favor of overlay2 (enabled unconditionally)" - elog - fi - - if has_version sys-fs/zfs; then - elog " ZFS storage driver is available" - elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info" - elog - fi - - if use cli; then - ewarn "Starting with docker 20.10.2, docker has been split into" - ewarn "two packages upstream, so Gentoo has followed suit." - ewarn - ewarn "app-emulation/docker contains the daemon and" - ewarn "app-emulation/docker-cli contains the docker command." - ewarn - ewarn "docker currently installs docker-cli using the cli use flag." - ewarn - ewarn "This use flag is temporary, so you need to take the" - ewarn "following actions:" - ewarn - ewarn "First, disable the cli use flag for app-emulation/docker" - ewarn - ewarn "Then, if you need docker-cli and docker on the same machine," - ewarn "run the following command:" - ewarn - ewarn "# emerge --noreplace docker-cli" - ewarn - fi -} diff --git a/app-emulation/docker/docker-20.10.3.ebuild b/app-emulation/docker/docker-20.10.3.ebuild index b8b0e6129674..fdb096725858 100644 --- a/app-emulation/docker/docker-20.10.3.ebuild +++ b/app-emulation/docker/docker-20.10.3.ebuild @@ -61,7 +61,7 @@ CONFIG_CHECK=" ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG ~KEYS ~VETH ~BRIDGE ~BRIDGE_NETFILTER - ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE + ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE ~NETFILTER_XT_MARK ~NETFILTER_NETLINK ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS ~IP_NF_NAT ~NF_NAT ~POSIX_MQUEUE diff --git a/app-emulation/docker/metadata.xml b/app-emulation/docker/metadata.xml index 1ec7d353074c..bb79d79c96db 100644 --- a/app-emulation/docker/metadata.xml +++ b/app-emulation/docker/metadata.xml @@ -1,53 +1,54 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <longdescription> + <maintainer type="person"> + <email>williamh@gentoo.org</email> + <name>William Hubbs</name> + </maintainer> + <maintainer type="person"> + <email>gyakovlev@gentoo.org</email> + <name>Georgy Yakovlev</name> + </maintainer> + <longdescription> Docker is an open-source project to easily create lightweight, portable, self-sufficient containers from any application. The same container that a developer builds and tests on a laptop can run at scale, in production, on VMs, bare metal, OpenStack clusters, public clouds and more. </longdescription> - <maintainer type="person"> - <email>williamh@gentoo.org</email> - <name>William Hubbs</name> - </maintainer> - <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> - </maintainer> - <use> - <flag name="aufs"> + <upstream> + <remote-id type="github">moby/moby</remote-id> + </upstream> + <use> + <flag name="aufs"> Enables dependencies for the "aufs" graph driver, including necessary kernel flags. </flag> - <flag name="apparmor"> + <flag name="apparmor"> Enable AppArmor support. </flag> - <flag name="btrfs"> + <flag name="btrfs"> Enables dependencies for the "btrfs" graph driver, including necessary kernel flags. </flag> - <flag name="cli"> + <flag name="cli"> This is a temporary use flag which pulls in app-emulation/docker-cli, the docker command line client. This flag is here to assist in the transition to split packages and will be removed in a future release. </flag> - <flag name="container-init"> + <flag name="container-init"> Makes the a staticly-linked init system tini available inside a container. </flag> - <flag name="device-mapper"> + <flag name="device-mapper"> Enables dependencies for the "devicemapper" graph driver, including necessary kernel flags. </flag> - <flag name="overlay"> + <flag name="overlay"> Enables dependencies for the "overlay" graph driver, including necessary kernel flags. </flag> - </use> - <upstream> - <remote-id type="github">moby/moby</remote-id> - </upstream> -</pkgmetadata> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/dosemu/metadata.xml b/app-emulation/dosemu/metadata.xml index 02fe93487b16..b9057283b6c6 100644 --- a/app-emulation/dosemu/metadata.xml +++ b/app-emulation/dosemu/metadata.xml @@ -1,14 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>slyfox@gentoo.org</email> - <name>Sergei Trofimovich</name> - </maintainer> - <use> - <flag name="fluidsynth">use <pkg>media-sound/fluidsynth</pkg> for MIDI emulation</flag> - </use> - <upstream> - <remote-id type="sourceforge">dosemu</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="person"> + <email>slyfox@gentoo.org</email> + <name>Sergei Trofimovich</name> + </maintainer> + <upstream> + <remote-id type="sourceforge">dosemu</remote-id> + </upstream> + <use> + <flag name="fluidsynth">use <pkg>media-sound/fluidsynth</pkg> for MIDI emulation</flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/dynamips/Manifest b/app-emulation/dynamips/Manifest index 0a80e67861e2..4c2341a41c36 100644 --- a/app-emulation/dynamips/Manifest +++ b/app-emulation/dynamips/Manifest @@ -1,2 +1 @@ -DIST dynamips-0.2.18.tar.gz 833554 BLAKE2B 8152b436e8fc43061c5603a44ceae8feebdd4593649d2fb6a1814ca22cfce2f671f6f98df5f03ee6eeef10cf09fc444d406edd8d3b4a6037a89cf0e8301774ac SHA512 d66e32d72ecc9ebff5232377ac9aa5b966ceb08884cc7f8dc4a8cf3f56305e7cefd677624ba66278f6603a3b275c384bd0ff3905932461b1f8056106cd272a4c DIST dynamips-0.2.21.tar.gz 833863 BLAKE2B a3162de26839a4c99fd1f147fe0a12e04f4b225b6539aa1599550c40c6a9e21deed950b47f7afbbc1cfbe2f61a351a4185a18f56c4b63c191eccc7122e2c0115 SHA512 c7251963897b65ed5696f47f03be727cea79fe2245850c86fa6b4d8718afa10002b1e39bccefe1c7f2ba86fe6b8f52fe8663ee34f72ca3d9f846522b9b9b4d29 diff --git a/app-emulation/dynamips/dynamips-0.2.18.ebuild b/app-emulation/dynamips/dynamips-0.2.18.ebuild deleted file mode 100644 index 1b58ec9cfdad..000000000000 --- a/app-emulation/dynamips/dynamips-0.2.18.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="Cisco 7200/3600 Simulator" -HOMEPAGE="https://github.com/GNS3/dynamips" -SRC_URI="https://github.com/GNS3/dynamips/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="ipv6" - -RDEPEND="dev-libs/elfutils - net-libs/libpcap" -DEPEND="${RDEPEND} - app-arch/unzip" - -DOCS=( ChangeLog README.md RELEASE-NOTES ) - -PATCHES=( "${FILESDIR}/${P}-docs.patch" ) - -src_prepare() { - # comment out DYNAMIPS_FLAGS to respect CFLAGS - sed -e "s:^set ( DYNAMIPS_FLAGS:#&:" -i cmake/dependencies.cmake || die - - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DANY_COMPILER=1 - -DENABLE_IPV6="$(usex ipv6)" - ) - cmake-utils_src_configure -} diff --git a/app-emulation/dynamips/dynamips-0.2.21.ebuild b/app-emulation/dynamips/dynamips-0.2.21.ebuild index 21b04e6456e7..ad971daa108b 100644 --- a/app-emulation/dynamips/dynamips-0.2.21.ebuild +++ b/app-emulation/dynamips/dynamips-0.2.21.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake-utils +inherit cmake DESCRIPTION="Cisco 7200/3600 Simulator" HOMEPAGE="https://github.com/GNS3/dynamips" @@ -16,7 +16,8 @@ KEYWORDS="~amd64 ~x86" IUSE="ipv6" BDEPEND="app-arch/unzip" -RDEPEND="dev-libs/elfutils +RDEPEND=" + dev-libs/elfutils net-libs/libpcap" DEPEND="${RDEPEND}" @@ -28,7 +29,7 @@ src_prepare() { # comment out DYNAMIPS_FLAGS to respect CFLAGS sed -e "s:^set ( DYNAMIPS_FLAGS:#&:" -i cmake/dependencies.cmake || die - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { @@ -36,5 +37,5 @@ src_configure() { -DANY_COMPILER=1 -DENABLE_IPV6="$(usex ipv6)" ) - cmake-utils_src_configure + cmake_src_configure } diff --git a/app-emulation/dynamips/metadata.xml b/app-emulation/dynamips/metadata.xml index bd4be58c8f43..a5fae4de7238 100644 --- a/app-emulation/dynamips/metadata.xml +++ b/app-emulation/dynamips/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">gns-3</remote-id> - <remote-id type="github">GNS3/dynamips</remote-id> - </upstream> -</pkgmetadata> + <upstream> + <remote-id type="sourceforge">gns-3</remote-id> + <remote-id type="github">GNS3/dynamips</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/edumips64/metadata.xml b/app-emulation/edumips64/metadata.xml index dfc7b27fde63..105cefe4d8f2 100644 --- a/app-emulation/edumips64/metadata.xml +++ b/app-emulation/edumips64/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">edumips64</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="project"> + <email>java@gentoo.org</email> + <name>Java</name> + </maintainer> + <upstream> + <remote-id type="sourceforge">edumips64</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/faudio/metadata.xml b/app-emulation/faudio/metadata.xml index e5eb47a51e63..ec8a3107af09 100644 --- a/app-emulation/faudio/metadata.xml +++ b/app-emulation/faudio/metadata.xml @@ -1,30 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>wine@gentoo.org</email> - <name>Wine</name> - <description> - This package must be kept in sync with repo/proj/wine repository. - Any changes need to be run past the maintainer to ensure the two repositories are kept in sync. - </description> - </maintainer> - <longdescription> + <maintainer type="project"> + <email>wine@gentoo.org</email> + <name>Wine</name> + <description>
			This package must be kept in sync with repo/proj/wine repository.
			Any changes need to be run past the maintainer to ensure the two repositories are kept in sync.
		</description> + </maintainer> + <longdescription> FAudio, is an XAudio reimplementation that focuses solely on developing fully accurate DirectX Audio runtime libraries for the FNA project, including XAudio2, X3DAudio, XAPO, and XACT3. Project Website: http://fna-xna.github.io/ </longdescription> - <use> - <flag name="dumpvoices">FAudio dumps buffer data to individual files with RIFF/XWMA headers, usable with players like ffplay/testxwma.</flag> - <flag name="ffmpeg">FAudio has optional support for decoding xWMA resources using FFmpeg, requiring: + <upstream> + <remote-id type="github">FNA-XNA/FAudio</remote-id> + </upstream> + <use> + <flag name="dumpvoices">FAudio dumps buffer data to individual files with RIFF/XWMA headers, usable with players like ffplay/testxwma.</flag> + <flag name="ffmpeg">FAudio has optional support for decoding xWMA resources using FFmpeg, requiring: <pkg>media-video/ffmpeg</pkg></flag> - <flag name="xnasong">Build support for optional XNG_SONG component (note: this not required by + <flag name="xnasong">Build support for optional XNG_SONG component (note: this not required by <pkg>app-emulation/wine-staging</pkg>, <pkg>app-emulation/wine-vanilla</pkg> for faudio XAudio support).</flag> - <flag name="test">Build and run faudio testsuite.</flag> - <flag name="utils">Build all faudio utilities.</flag> - </use> - <upstream> - <remote-id type="github">FNA-XNA/FAudio</remote-id> - </upstream> -</pkgmetadata> + <flag name="test">Build and run faudio testsuite.</flag> + <flag name="utils">Build all faudio utilities.</flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/firecracker-bin/Manifest b/app-emulation/firecracker-bin/Manifest index b9099ffe20ea..eda9019e0493 100644 --- a/app-emulation/firecracker-bin/Manifest +++ b/app-emulation/firecracker-bin/Manifest @@ -1,10 +1,4 @@ -DIST firecracker-v0.23.0-aarch64 1596888 BLAKE2B 94453641206b32c42f86542d7c38a1e24e991abc1d425183e624f8a72cc74a51cf36e3463bd1c20b309a4bc4e97ebfb8cd95c47061e51cecdb8a8b28120879ad SHA512 08a51979e5979cbc5e8477e9400bcc03757a416e606903296764982f78a432749d168c4566d31df20a9bf68894b3e7cb1cbf39aee559513daa25280a9c891d2f -DIST firecracker-v0.23.0-x86_64 2041024 BLAKE2B cb6a0d356a734ffb28ef6b88517983d1b9efac4127f8979fad085dab503446471d851ec00ff4da39b216f6fc9ba6a5d9d744455c0f1c1cbd7ef881d624536873 SHA512 5a24a95805240c1125f7fd17e69d5fea92781c3767f0a884aa8e433200e8f469b33502342d47843e5612d83d3157df59bf94a960a202978ca70dcf8f31865882 -DIST firecracker-v0.23.1-aarch64 3328424 BLAKE2B 2191e73700c9107fc30e84a044c0377c4486ecfee99deba99b0f6400036befca0d2f3f101154d851f0d7423208f8afc28e87678ed6005235ea9757a1913df3f6 SHA512 a1f5245cbe637f42f1145eb9daf3578610102535a046ea4be93dcd122194fd90305fde32840d59c50b798aa8326ea0d7ed715ab96f980a7d0e66608c33aa7ce0 -DIST firecracker-v0.23.1-x86_64 3290472 BLAKE2B 62315d4962b4debbdac383098e656e6c469b491f7303a7aaab06c885ec653b202f6a49a43ae0b76188d2f73b229c68435e19d316992eed64645decef3f611d5e SHA512 4bfb756a2ee2942a158857dfe82de838b52bc161d0ba97255eace1af4b57c3a630dfbb51413433a4fbfb3d95ba02719a608c1ea3f28a5485d005daa2c71abbef DIST firecracker-v0.24.1-aarch64.tgz 1427360 BLAKE2B 17d85c6843dfa90bf871d5ff7dc5f5286c7bd11559cb9a507f57fafaba7d5abbf1019239ea39529e29a8bb4fa32b9a8a44f096f1379dc2d3d801502890690024 SHA512 cbedc62e5b98cdfd6dfb565bc1b977d84fcd0fa28eb36e18922ec56c3c2dfa34c84c549c7a4e23aee9d16c53b212ef87128d42e68f1a6b9997cbec42e613a82d DIST firecracker-v0.24.1-x86_64.tgz 1434986 BLAKE2B a6b206042fe4dfa873cfa1da4f591242f0224d2c98b367635534497d2bf82e218c409e473be618bd2902594ea24a8c710c853f2f1a00ac96f917a100e80aec0b SHA512 b719520464e3d5c9ff072c73639af71895bfcca9ac4964f2a255ed2d8d3b264a92566f7b87078c163c0f1ce21b9d5bd11cb38eb7cb784c5e18581ee531a0bcaf -DIST jailer-v0.23.0-aarch64 1350040 BLAKE2B def85c85daa27c648c638ed14128fef941a416269c536c55413116a686d5a0e614976fd718576a6e275ff12a1873885e1d569e2e054cb054f1278ecbe1279d74 SHA512 48de8688cf40e696f0a56689a2e6256f2be159fb1b593b223a9547c4760c1e94e245e1de77bfeeefbeffb8046b33768da1915482a62d6b36321b8c225bdef791 -DIST jailer-v0.23.0-x86_64 1457312 BLAKE2B 9a92c415e27a8442da18ab3134023acdc7b49f1246d332a864fb700180914c6b9a7f8747b1eef1657290df5287a946e0d5b0b689bd0b7a60486b472ba7b55290 SHA512 203d24794c3125afdd8cb1b07e69da4fcc40bdc9a3ec7c8e8a2deb8dc1a691156294eb4168c2422f631136a4fed7413136631b3957999fe00fb645aaed16f87d -DIST jailer-v0.23.1-aarch64 2812344 BLAKE2B ef0b98a5438880d8473117dc051421faf4c9f4640fe017ba9cedeb88a02ff2a34fe6e0333bb7cb31cd436a95536efe5237d6a49ead6c7d1d3777928cc54f0baf SHA512 38876afcf6c5883b30156246b4b74905157b668a3e6fbe852b38a09a7f5ab5814fb9eaec87ef94390d2a40806c7b387b4266c8a0c4b4fba5e720f61d571bbcd7 -DIST jailer-v0.23.1-x86_64 2589888 BLAKE2B b22a908d551b3da8f882b9c18031f0904808d8f77783c046f9a8855e713074ea61327b7c8c5f875361728bd33e33e4cd84431ead5f1fae68bdca8161e88bdd1c SHA512 a6829ffbacd35349214087f4ba1b88304c6bfd23b50d9f97319a93fae5c94c6d0590649fbd0917f9d82b6a2a6faab1f7e37a447864a4960e0b77407ae535212a +DIST firecracker-v0.24.2-aarch64.tgz 1429004 BLAKE2B 8d5624f6f6f154678ffab945bbb293e3ab53c75fa324273d9cd99366d78230aef1ce0a23c0b8efdca9fd87edabc0e196dda0cacabf7ebb33ec86edf7c46dd92e SHA512 9bd83d278c3f4f294c4391aac1bd82712bde7190ad706e1b84a0ec9ad489c09f5fa77bd448a25a08b932230b38e44b3dbcdcc37b2ccacfd87d37c7ee65e6c1c6 +DIST firecracker-v0.24.2-x86_64.tgz 1434481 BLAKE2B d2b81e2b3341317f296c63f14b2699dbf207e2e3a83871e38ef1666c105112788308c773afad61a85f7c6f4009f2373c80f12a52549120d92a42bae54891bf59 SHA512 2a574276296685117acf4e1d425ca75ecb8ad06680ae81e183d73853ff57cbca2f4cf4f42cb013d8d88d18146c0d84d2b098829ca5f6e9402213fecdf539a283 diff --git a/app-emulation/firecracker-bin/firecracker-bin-0.23.0.ebuild b/app-emulation/firecracker-bin/firecracker-bin-0.23.0.ebuild deleted file mode 100644 index a23df2299d2b..000000000000 --- a/app-emulation/firecracker-bin/firecracker-bin-0.23.0.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-info - -DESCRIPTION="Secure and fast microVMs for serverless computing (static build)" -HOMEPAGE="https://firecracker-microvm.github.io https://github.com/firecracker-microvm/firecracker" -SRC_URI=" - amd64? ( - https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/firecracker-v${PV}-x86_64 - https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/jailer-v${PV}-x86_64 - ) - arm64? ( - https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/firecracker-v${PV}-aarch64 - https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/jailer-v${PV}-aarch64 - )" - -LICENSE="|| ( Apache-2.0 MIT Apache-2.0-with-LLVM-exceptions ) MPL-2.0" -SLOT="0" -KEYWORDS="~amd64" - -RESTRICT="test strip" - -RDEPEND="!app-emulation/firecracker - acct-group/kvm" - -QA_PREBUILT="/usr/bin/firecracker - /usr/bin/jailer" - -S="${WORKDIR}" - -pkg_pretend() { - if use kernel_linux && kernel_is lt 4 14; then - eerror "Firecracker requires a host kernel of 4.14 or higher." - elif use kernel_linux; then - if ! linux_config_exists; then - eerror "Unable to check your kernel for KVM support" - else - CONFIG_CHECK="~KVM ~TUN ~BRIDGE ~VHOST_VSOCK" - ERROR_KVM="You must enable KVM in your kernel to continue" - ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in" - ERROR_KVM_AMD+=" your kernel configuration." - ERROR_KVM_INTEL="If you have an Intel CPU, you must enable" - ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration." - ERROR_TUN="You will need the Universal TUN/TAP driver compiled" - ERROR_TUN+=" into your kernel or loaded as a module to use" - ERROR_TUN+=" virtual network devices." - ERROR_BRIDGE="You will also need support for 802.1d" - ERROR_BRIDGE+=" Ethernet Bridging for some network configurations." - ERROR_VHOST_VSOCK="To use AF_VSOCK sockets for communication" - ERROR_VHOST_VSOCK+=" between host and guest, you will need to enable" - ERROR_VHOST_VSOCK+=" the vhost virtio-vsock driver in your kernel." - - if use amd64 || use amd64-linux; then - if grep -q AuthenticAMD /proc/cpuinfo; then - CONFIG_CHECK+=" ~KVM_AMD" - elif grep -q GenuineIntel /proc/cpuinfo; then - CONFIG_CHECK+=" ~KVM_INTEL" - fi - fi - - # Now do the actual checks setup above - check_extra_config - fi - fi -} - -src_unpack() { :; } -src_compile() { :; } - -src_install() { - if use amd64; then - my_arch=x86_64 - elif use arm64; then - my_arch=aarch64 - fi - - newbin "${DISTDIR}/firecracker-v${PV}-${my_arch}" firecracker - newbin "${DISTDIR}/jailer-v${PV}-${my_arch}" jailer -} diff --git a/app-emulation/firecracker-bin/firecracker-bin-0.23.1.ebuild b/app-emulation/firecracker-bin/firecracker-bin-0.24.2.ebuild index a23df2299d2b..c8d53efcad41 100644 --- a/app-emulation/firecracker-bin/firecracker-bin-0.23.1.ebuild +++ b/app-emulation/firecracker-bin/firecracker-bin-0.24.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,12 +9,10 @@ DESCRIPTION="Secure and fast microVMs for serverless computing (static build)" HOMEPAGE="https://firecracker-microvm.github.io https://github.com/firecracker-microvm/firecracker" SRC_URI=" amd64? ( - https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/firecracker-v${PV}-x86_64 - https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/jailer-v${PV}-x86_64 + https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/firecracker-v${PV}-x86_64.tgz ) arm64? ( - https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/firecracker-v${PV}-aarch64 - https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/jailer-v${PV}-aarch64 + https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/firecracker-v${PV}-aarch64.tgz )" LICENSE="|| ( Apache-2.0 MIT Apache-2.0-with-LLVM-exceptions ) MPL-2.0" @@ -67,7 +65,6 @@ pkg_pretend() { fi } -src_unpack() { :; } src_compile() { :; } src_install() { @@ -77,6 +74,6 @@ src_install() { my_arch=aarch64 fi - newbin "${DISTDIR}/firecracker-v${PV}-${my_arch}" firecracker - newbin "${DISTDIR}/jailer-v${PV}-${my_arch}" jailer + newbin "firecracker-v${PV}-${my_arch}" firecracker + newbin "jailer-v${PV}-${my_arch}" jailer } diff --git a/app-emulation/firecracker-bin/metadata.xml b/app-emulation/firecracker-bin/metadata.xml index 7f6b797d9b1f..3ad4104bdf19 100644 --- a/app-emulation/firecracker-bin/metadata.xml +++ b/app-emulation/firecracker-bin/metadata.xml @@ -1,12 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>gentoo-bugs@ares-macrotechnology.com</email> - <name>Sebastian Hamann</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> -</pkgmetadata> + <maintainer type="person"> + <email>gentoo-bugs@ares-macrotechnology.com</email> + <name>Sebastian Hamann</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/firecracker/metadata.xml b/app-emulation/firecracker/metadata.xml index 6698a4ab7883..352f85facc8c 100644 --- a/app-emulation/firecracker/metadata.xml +++ b/app-emulation/firecracker/metadata.xml @@ -1,8 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>zlogene@gentoo.org</email> - <name>Mikle Kolyada</name> - </maintainer> -</pkgmetadata> + <maintainer type="person"> + <email>zlogene@gentoo.org</email> + <name>Mikle Kolyada</name> + </maintainer> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/flannel/metadata.xml b/app-emulation/flannel/metadata.xml index 26007a60b41b..a0d843d1cdaf 100644 --- a/app-emulation/flannel/metadata.xml +++ b/app-emulation/flannel/metadata.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>zmedico@gentoo.org</email> - </maintainer> - <upstream> - <remote-id type="github">coreos/flannel</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="person"> + <email>zmedico@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">coreos/flannel</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest index 1fc5e05f4e81..b76a025ba880 100644 --- a/app-emulation/free42/Manifest +++ b/app-emulation/free42/Manifest @@ -1,4 +1,2 @@ -DIST free42-nologo-2.0.20.tgz 7390214 BLAKE2B 306f3378bcbb44fa7982c5d9c29bfbea62e915ca50ca5e5216f46fbf483f110a1288d4800991a74622a042517496ff8dd94c3fa3249e8bb4181957e6b23d5ea3 SHA512 9b540fbc50df2f94b135b5e778354f330df77a54ef2ad99b257b5b91d1e3e8d1241e8a834522fc46fe33571ea2695ad8889b427dbcf653870672e89cd56d60f5 -DIST free42-nologo-2.5.22.tgz 7418457 BLAKE2B 18086ef181d846291b9f8762c9c293997e3d61e92a80e5556c41b7a777c4324151b0662d6b8a79e9b191b83312c97e46691e90577eed276ea315a12d73c5a5d4 SHA512 16c7cfb44f0fac12e3516b065f085af884b2652af9c1acb61251c8ede5c45b34f65bc8a3e53f0aa685ff5e1a74c7a17d9c8f76bc89537d790f878d8924a1080c DIST free42-nologo-2.5.24.tgz 7423183 BLAKE2B e10425af8d5c30be6ab5b728130bbe3068c414e24f033b65623951f915bcfeea0672857ff8def3e9f2766aba79411a1022d4b83592281567de38e82613d8a832 SHA512 a0702c3e4b2f3f38f73c54de4e51da8d1dc90585b253d1ae087d59dfabbe83be9c80086df8540cb6420dae8c6e766cd1ccce875d9bcb94ecbc85791e3fa89b8b DIST free42-nologo-2.5.25.tgz 7423321 BLAKE2B 23d69045df8e7a96669a14e5760da4e1f8578b050ff6ddb19b000c8254b04883449c38e78c5af93a9341485363ae52ce41e6398b9954a6eac61aae6276e20488 SHA512 cedc05ad60cf56b4634e0b1525ef75fac8ad16ce14ae80752fda12a6373cc2cf42d4b696e99c121b1dc42087e477ca2d948f173c9128acc91d5bc266259b2836 diff --git a/app-emulation/free42/files/free42-2.0.10-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-2.0.10-fix-build-intel-lib.patch deleted file mode 100644 index 543595c6a1a1..000000000000 --- a/app-emulation/free42/files/free42-2.0.10-fix-build-intel-lib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nuar a/gtk/build-intel-lib.sh b/gtk/build-intel-lib.sh ---- a/gtk/build-intel-lib.sh -+++ b/gtk/build-intel-lib.sh -@@ -4,7 +4,7 @@ - cd IntelRDFPMathLib20U1 - patch -p0 <../intel-lib-linux.patch - cd LIBRARY --make CC=gcc CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 -+make A=a CC=gcc CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 - mv libbid.a ../../gcc111libbid.a - cd ../.. - ( echo '#ifdef FREE42_FPTEST'; echo 'const char *readtest_lines[] = {'; tr -d '\r' < IntelRDFPMathLib20U1/TESTS/readtest.in | sed 's/^\(.*\)$/"\1",/'; echo '0 };'; echo '#endif' ) > readtest_lines.cc diff --git a/app-emulation/free42/files/free42-2.0.10-fix-makefile.patch b/app-emulation/free42/files/free42-2.0.10-fix-makefile.patch deleted file mode 100644 index 0fb915df2983..000000000000 --- a/app-emulation/free42/files/free42-2.0.10-fix-makefile.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -Nuar a/gtk/Makefile b/gtk/Makefile ---- a/gtk/Makefile -+++ b/gtk/Makefile -@@ -15,11 +15,11 @@ - # along with this program; if not, see http://www.gnu.org/licenses/. - ############################################################################### - --CFLAGS = -MMD \ -+CFLAGS := -MMD \ - -Wall \ - -Wno-parentheses \ - -Wno-write-strings \ -- -g \ -+ -Wno-error=narrowing \ - -I/usr/X11R6/include \ - $(shell pkg-config --cflags gtk+-2.0) \ - -DVERSION="\"$(shell cat ../VERSION)\"" \ -@@ -27,21 +27,25 @@ - -DDECIMAL_GLOBAL_ROUNDING=1 \ - -DDECIMAL_GLOBAL_ROUNDING_ACCESS_FUNCTIONS=1 \ - -DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \ -- -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 -+ -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 \ -+ ${CFLAGS} - --CXXFLAGS = $(CFLAGS) \ -+CXXFLAGS := $(CFLAGS) \ - -fno-exceptions \ - -fno-rtti \ -- -D_WCHAR_T_DEFINED -+ -D_WCHAR_T_DEFINED \ -+ ${CXXFLAGS} - --LDFLAGS = -L/usr/X11R6/lib --LIBS = gcc111libbid.a -lXmu $(shell pkg-config --libs gtk+-2.0) -+MYLDFLAGS = -L/usr/X11R6/lib -+LIBS = gcc111libbid.a -lX11 -ldl -lXmu $(shell pkg-config --libs gtk+-2.0) - - ifeq "$(shell uname -s)" "Linux" --LDFLAGS += -Wl,--hash-style=both -+MYLDFLAGS += -Wl,--hash-style=both - LIBS += -lpthread - endif - -+MYLDFLAGS += ${LDFLAGS} -+ - SRCS = shell_main.cc shell_skin.cc skins.cc keymap.cc shell_loadimage.cc \ - shell_spool.cc core_main.cc core_commands1.cc core_commands2.cc \ - core_commands3.cc core_commands4.cc core_commands5.cc \ -@@ -83,7 +87,7 @@ - endif - - $(EXE): $(OBJS) -- $(CXX) -o $(EXE) $(LDFLAGS) $(OBJS) $(LIBS) -+ $(CXX) -o $(EXE) $(MYLDFLAGS) $(OBJS) $(LIBS) - - $(SRCS) skin2cc.cc keymap2cc.cc skin2cc.conf: symlinks - -@@ -107,7 +111,7 @@ - - symlinks: - for fn in `cd ../common; /bin/ls`; do ln -s ../common/$$fn; done -- sh ./build-intel-lib.sh -+ +sh ./build-intel-lib.sh - ln -s IntelRDFPMathLib20U1/TESTS/readtest.c - touch symlinks - diff --git a/app-emulation/free42/free42-2.0.20.ebuild b/app-emulation/free42/free42-2.0.20.ebuild deleted file mode 100644 index 2bc7d946d94b..000000000000 --- a/app-emulation/free42/free42-2.0.20.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils toolchain-funcs - -MY_PV="${PN}-nologo-${PV}" - -DESCRIPTION="An HP-42S Calculator Simulator" -HOMEPAGE="https://thomasokken.com/free42/" -SRC_URI="https://thomasokken.com/free42/upstream/${MY_PV}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="alsa" - -DEPEND="dev-libs/atk - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/gtk+:2 - x11-libs/pango - alsa? ( media-libs/alsa-lib )" - -RDEPEND="${DEPEND} - x11-libs/libX11 - x11-libs/libXmu" - -S="${WORKDIR}/${MY_PV}" - -PATCHES=( - "${FILESDIR}/${PN}-2.0.10-fix-makefile.patch" - "${FILESDIR}/${PN}-2.0.10-fix-build-intel-lib.patch" -) - -src_prepare() { - default -} - -src_compile() { - local myconf - use alsa && myconf="AUDIO_ALSA=yes" - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C "${S}/gtk" -} - -src_install() { - dodoc CREDITS HISTORY README - dobin gtk/free42dec -} diff --git a/app-emulation/free42/free42-2.5.22.ebuild b/app-emulation/free42/free42-2.5.22.ebuild deleted file mode 100644 index bd3148a0b387..000000000000 --- a/app-emulation/free42/free42-2.5.22.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -MY_PV="${PN}-nologo-${PV}" - -DESCRIPTION="An HP-42S Calculator Simulator" -HOMEPAGE="https://thomasokken.com/free42/" -SRC_URI="https://thomasokken.com/free42/upstream/${MY_PV}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+alsa" - -DEPEND="dev-libs/atk - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/gtk+:3 - alsa? ( media-libs/alsa-lib )" - -RDEPEND="${DEPEND}" - -DOCS=( CREDITS HISTORY README ) -S="${WORKDIR}/${MY_PV}" - -PATCHES=( - "${FILESDIR}/${PN}-2.5.16-fix-makefile.patch" - "${FILESDIR}/${PN}-2.5.3-fix-build-intel-lib.patch" -) - -src_prepare() { - default -} - -src_compile() { - local myconf - use alsa && myconf="AUDIO_ALSA=yes" - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk - emake -C gtk clean - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk -} - -src_install() { - default - dobin gtk/free42bin gtk/free42dec -} diff --git a/app-emulation/free42/free42-2.5.24.ebuild b/app-emulation/free42/free42-2.5.24.ebuild index d25a89b2d1c4..a8ede08965a1 100644 --- a/app-emulation/free42/free42-2.5.24.ebuild +++ b/app-emulation/free42/free42-2.5.24.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://thomasokken.com/free42/upstream/${MY_PV}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+alsa" DEPEND="dev-libs/atk diff --git a/app-emulation/free42/metadata.xml b/app-emulation/free42/metadata.xml index ff7b9a7bc947..71c8a96f8e99 100644 --- a/app-emulation/free42/metadata.xml +++ b/app-emulation/free42/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>voyageur@gentoo.org</email> - <name>Bernard Cafarelli</name> - </maintainer> - <upstream> - <remote-id type="github">thomasokken/free42</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="person"> + <email>voyageur@gentoo.org</email> + <name>Bernard Cafarelli</name> + </maintainer> + <upstream> + <remote-id type="github">thomasokken/free42</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.5.ebuild b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.5.ebuild index abc29fa1e97d..48ea4aa5cfdf 100644 --- a/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.5.ebuild +++ b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/app-emulation/fs-uae-launcher/metadata.xml b/app-emulation/fs-uae-launcher/metadata.xml index 84e4eb59046e..419aa9a9c4bc 100644 --- a/app-emulation/fs-uae-launcher/metadata.xml +++ b/app-emulation/fs-uae-launcher/metadata.xml @@ -1,14 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>chewi@gentoo.org</email> - <name>James Le Cuirot</name> - </maintainer> - <upstream> - <remote-id type="github">FrodeSolheim/fs-uae-launcher</remote-id> - </upstream> - <use> - <flag name="lha">Enable LHA archive support</flag> - </use> -</pkgmetadata> + <maintainer type="person"> + <email>chewi@gentoo.org</email> + <name>James Le Cuirot</name> + </maintainer> + <upstream> + <remote-id type="github">FrodeSolheim/fs-uae-launcher</remote-id> + </upstream> + <use> + <flag name="lha">Enable LHA archive support</flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/fs-uae/metadata.xml b/app-emulation/fs-uae/metadata.xml index e92d93d760f7..3117da3d277c 100644 --- a/app-emulation/fs-uae/metadata.xml +++ b/app-emulation/fs-uae/metadata.xml @@ -1,15 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>chewi@gentoo.org</email> - <name>James Le Cuirot</name> - </maintainer> - <upstream> - <remote-id type="github">FrodeSolheim/fs-uae</remote-id> - </upstream> - <use> - <flag name="fmv">Enable support for CD32 FMV (full motion video)</flag> - <flag name="glew">Enable support for The OpenGL Extension Wrangler Library (<pkg>media-libs/glew</pkg>)</flag> - </use> -</pkgmetadata> + <maintainer type="person"> + <email>chewi@gentoo.org</email> + <name>James Le Cuirot</name> + </maintainer> + <upstream> + <remote-id type="github">FrodeSolheim/fs-uae</remote-id> + </upstream> + <use> + <flag name="fmv">Enable support for CD32 FMV (full motion video)</flag> + <flag name="glew">Enable support for The OpenGL Extension Wrangler Library (<pkg>media-libs/glew</pkg>)</flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/fuse-utils/metadata.xml b/app-emulation/fuse-utils/metadata.xml index 31a5bcaf4749..e797bfea44eb 100644 --- a/app-emulation/fuse-utils/metadata.xml +++ b/app-emulation/fuse-utils/metadata.xml @@ -1,19 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>0xe2.0x9a.0x9b@gmail.com</email> - <name>Jan Ziak</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Gentoo Proxy Maintainers Project</name> - </maintainer> - <use> - <flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> for low-level crypto of some + <maintainer type="person"> + <email>0xe2.0x9a.0x9b@gmail.com</email> + <name>Jan Ziak</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Gentoo Proxy Maintainers Project</name> + </maintainer> + <upstream> + <remote-id type="sourceforge">fuse-emulator</remote-id> + </upstream> + <use> + <flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> for low-level crypto of some features, including logfiles.</flag> - </use> - <upstream> - <remote-id type="sourceforge">fuse-emulator</remote-id> - </upstream> -</pkgmetadata> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/fuse/metadata.xml b/app-emulation/fuse/metadata.xml index 38319f64f42e..a2d19ea3466d 100644 --- a/app-emulation/fuse/metadata.xml +++ b/app-emulation/fuse/metadata.xml @@ -1,22 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>0xe2.0x9a.0x9b@gmail.com</email> - <name>Jan Ziak</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Gentoo Proxy Maintainers Project</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">fuse-emulator</remote-id> - </upstream> - <use> - <flag name="backend-fbcon">Use framebuffer rendering backend</flag> - <flag name="backend-sdl">Use SDL rendering backend</flag> - <flag name="backend-svga">Use svgalib rendering backend</flag> - <flag name="backend-X">Use X11 rendering backend</flag> - <flag name="memlimit">Add compile-time memory usage limiting</flag> - </use> -</pkgmetadata> + <maintainer type="person"> + <email>0xe2.0x9a.0x9b@gmail.com</email> + <name>Jan Ziak</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Gentoo Proxy Maintainers Project</name> + </maintainer> + <upstream> + <remote-id type="sourceforge">fuse-emulator</remote-id> + </upstream> + <use> + <flag name="backend-fbcon">Use framebuffer rendering backend</flag> + <flag name="backend-sdl">Use SDL rendering backend</flag> + <flag name="backend-svga">Use svgalib rendering backend</flag> + <flag name="backend-X">Use X11 rendering backend</flag> + <flag name="memlimit">Add compile-time memory usage limiting</flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/gallium-nine-standalone/files/0.7-no-libwine.patch b/app-emulation/gallium-nine-standalone/files/0.7-no-libwine.patch new file mode 100644 index 000000000000..abcf7ad4ea3b --- /dev/null +++ b/app-emulation/gallium-nine-standalone/files/0.7-no-libwine.patch @@ -0,0 +1,34 @@ +From bddb53abdd1a77b1c019457f7eea4a6404a5e492 Mon Sep 17 00:00:00 2001 +From: Andre Heider <a.heider@gmail.com> +Date: Sun, 17 Jan 2021 11:42:57 +0100 +Subject: [PATCH] meson: stop checking for libwine + +From the WINE 6.0 release notes: +The libwine library is no longer used, but it's still provided to +support running Winelib modules built against older versions. It is +deprecated however, and will be removed in a future Wine release. + +libwine wasn't used anymore anyway, this just ensures that this tree can +be built against future WINE versions. +--- + meson.build | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/meson.build b/meson.build +index 0969777..47ee51a 100644 +--- a/meson.build ++++ b/meson.build +@@ -35,12 +35,10 @@ code = '''#ifndef __WINE__ + #error 1 + #endif''' + +-if not cc.compiles(code, name: 'winelib check') ++if not cc.compiles(code, name: 'winegcc check') + error('A WINE cross compiler is required') + endif + +-dep_wine = cc.find_library('wine') +- + if not cc.has_header_symbol('windows.h', 'wine_get_unix_file_name') + error('WINE headers not found') + endif diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild index 3e96326a2fc8..ea3ad385cab5 100644 --- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild +++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -38,6 +38,7 @@ DEPEND=" " PATCHES=( + "${FILESDIR}"/0.7-no-libwine.patch "${FILESDIR}"/0.7-cross-files.patch "${FILESDIR}"/0.3-nine-dll-path.patch ) diff --git a/app-emulation/gallium-nine-standalone/metadata.xml b/app-emulation/gallium-nine-standalone/metadata.xml index 99949f5b76d0..86ac307db239 100644 --- a/app-emulation/gallium-nine-standalone/metadata.xml +++ b/app-emulation/gallium-nine-standalone/metadata.xml @@ -1,20 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>chewi@gentoo.org</email> - <name>James Le Cuirot</name> - </maintainer> - <maintainer type="project"> - <email>wine@gentoo.org</email> - <name>Wine</name> - </maintainer> - <longdescription> + <maintainer type="person"> + <email>chewi@gentoo.org</email> + <name>James Le Cuirot</name> + </maintainer> + <maintainer type="project"> + <email>wine@gentoo.org</email> + <name>Wine</name> + </maintainer> + <longdescription> Gallium Nine Standalone, as the name implies, is a standalone version of the WINE parts of Gallium Nine. This decouples Gallium Nine from the WINE tree, so that it can be used with any WINE version. There is no need for any WINE patches. A stable, development, or staging WINE release is sufficient. </longdescription> - <upstream> - <remote-id type="github">iXit/wine-nine-standalone</remote-id> - </upstream> -</pkgmetadata> + <upstream> + <remote-id type="github">iXit/wine-nine-standalone</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/ganeti-os-noop/metadata.xml b/app-emulation/ganeti-os-noop/metadata.xml index 0be915a90eff..570f968062a8 100644 --- a/app-emulation/ganeti-os-noop/metadata.xml +++ b/app-emulation/ganeti-os-noop/metadata.xml @@ -1,11 +1,12 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>robbat2@gentoo.org</email> - <name>Robin H. Johnson</name> - </maintainer> - <upstream> - <remote-id type="github">grnet/ganeti-os-noop</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="person"> + <email>robbat2@gentoo.org</email> + <name>Robin H. Johnson</name> + </maintainer> + <upstream> + <remote-id type="github">grnet/ganeti-os-noop</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/genymotion-bin/metadata.xml b/app-emulation/genymotion-bin/metadata.xml index cc2aa77ecc42..63fcb0ed7291 100644 --- a/app-emulation/genymotion-bin/metadata.xml +++ b/app-emulation/genymotion-bin/metadata.xml @@ -1,12 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>fedeliallalinea@gmail.com</email> - <name>Marco Genasci</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> -</pkgmetadata> + <maintainer type="person"> + <email>fedeliallalinea@gmail.com</email> + <name>Marco Genasci</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/glean/Manifest b/app-emulation/glean/Manifest index d3929ac5af78..fe77c58672fb 100644 --- a/app-emulation/glean/Manifest +++ b/app-emulation/glean/Manifest @@ -1 +1,2 @@ DIST glean-1.17.0.tar.gz 62791 BLAKE2B 6429bd721655499732f84dc8db4bd31bdb128289956ab65fab78ea5461cf7945ced893fd832ac6a3cdcedb331f3885004eaa530be1ee4fcc4168870b5c345dd3 SHA512 55c8ceae941296c038acff3f40cf4d6b783d7c6530ebd6fbd6d87938de11a1be1403741a559802c9135d3fc4d904b1936319dcf7a0179f95ac3f909667f5622c +DIST glean-1.18.2.tar.gz 67642 BLAKE2B b346fc63b361e7c7bf0b8fc100da4a047004950aff3e17fce96d47ae5a7887828a09f4b107f2af1afcf9d866e5bc0857049ddd2d9c49413e9fe4b61d1de99fd3 SHA512 de80c06952ebbbc24c8cf198f61be788fb32974652c8253787ed5a165e26bb162b48c84836779420bb7c331edeb50a7796f5a2ff578d2e612068c5fbadd343c7 diff --git a/app-emulation/glean/glean-1.18.2.ebuild b/app-emulation/glean/glean-1.18.2.ebuild new file mode 100644 index 000000000000..ed65fa11326e --- /dev/null +++ b/app-emulation/glean/glean-1.18.2.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 + +DESCRIPTION="Simple program to write static config from config-drive" +HOMEPAGE="https://opendev.org/opendev/glean" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="dev-python/pbr[${PYTHON_USEDEP}]" +RDEPEND="${DEPEND}" + +src_install() { + distutils-r1_src_install + newinitd "${FILESDIR}/${PN}.initd" ${PN} +} diff --git a/app-emulation/glean/metadata.xml b/app-emulation/glean/metadata.xml index 04eb5e5e3c1b..fa8d710a61d8 100644 --- a/app-emulation/glean/metadata.xml +++ b/app-emulation/glean/metadata.xml @@ -1,18 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>alexxy@gentoo.org</email> - <name>Alexey Shvetsov</name> - </maintainer> - <maintainer type="project"> - <email>openstack@gentoo.org</email> - <name>Openstack</name> - </maintainer> - <longdescription lang="en"> + <maintainer type="person"> + <email>alexxy@gentoo.org</email> + <name>Alexey Shvetsov</name> + </maintainer> + <maintainer type="person"> + <email>prometheanfire@gentoo.org</email> + <name>Matthew Thode</name> + </maintainer> + <maintainer type="project"> + <email>openstack@gentoo.org</email> + <name>Openstack</name> + </maintainer> + <longdescription lang="en"> Glean is a program intended to configure a system based on configuration provided in a configuration drive. </longdescription> - <upstream> - <remote-id type="pypi">glean</remote-id> - </upstream> -</pkgmetadata> + <upstream> + <remote-id type="pypi">glean</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/go-secbench/metadata.xml b/app-emulation/go-secbench/metadata.xml index c36c37139fad..53c5cdf5c8dd 100644 --- a/app-emulation/go-secbench/metadata.xml +++ b/app-emulation/go-secbench/metadata.xml @@ -1,8 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>williamh@gentoo.org</email> - <name>William Hubbs</name> - </maintainer> -</pkgmetadata> + <maintainer type="person"> + <email>williamh@gentoo.org</email> + <name>William Hubbs</name> + </maintainer> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/grub-xen-host/metadata.xml b/app-emulation/grub-xen-host/metadata.xml index 84e79366a42d..7ae6722c701f 100644 --- a/app-emulation/grub-xen-host/metadata.xml +++ b/app-emulation/grub-xen-host/metadata.xml @@ -1,12 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>xen@gentoo.org</email> - </maintainer> - <longdescription lang="en"> + <maintainer type="project"> + <email>xen@gentoo.org</email> + </maintainer> + <longdescription lang="en"> A grub 2 built to run in dom0 which is a PV grub that can chain load a guest installed PV grub (grub legacy or grub 2) or handle a guest supplied grub 2 config file. </longdescription> -</pkgmetadata> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/gxemul/metadata.xml b/app-emulation/gxemul/metadata.xml index ce46ccfd0e80..2ccecfd2fe38 100644 --- a/app-emulation/gxemul/metadata.xml +++ b/app-emulation/gxemul/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <longdescription>Machine Emulator. Supports emulation across several architectures. Primarily for MIPS support, but other platform support coming soon.</longdescription> - <upstream> - <remote-id type="sourceforge">gxemul</remote-id> - </upstream> -</pkgmetadata> + <longdescription>Machine Emulator. Supports emulation across several architectures. Primarily for MIPS support, but other platform support coming soon.</longdescription> + <upstream> + <remote-id type="sourceforge">gxemul</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/hercules/metadata.xml b/app-emulation/hercules/metadata.xml index cb2f36c44dd8..e204c4d69914 100644 --- a/app-emulation/hercules/metadata.xml +++ b/app-emulation/hercules/metadata.xml @@ -1,14 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>s390@gentoo.org</email> - <name>Gentoo Linux s390 Development</name> - </maintainer> - <longdescription> + <maintainer type="project"> + <email>s390@gentoo.org</email> + <name>Gentoo Linux s390 Development</name> + </maintainer> + <longdescription> Hercules is an emulator for the IBM System/360, System/370, ESA/390, and z/Architecture series of mainframe computer systems. It will run any software that will run on those computers, provided the peripheral devices the program requires are present in the configuration. </longdescription> -</pkgmetadata> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/hyperd/metadata.xml b/app-emulation/hyperd/metadata.xml index 2babf919ffdd..9e5d1ae1f208 100644 --- a/app-emulation/hyperd/metadata.xml +++ b/app-emulation/hyperd/metadata.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <use> - <flag name="libvirt">Enable support for KVM via libvirt</flag> - <flag name="xen">Enable support for the Xen Hypervisor</flag> - </use> - <upstream> - <remote-id type="github">hyperhq/hyperd</remote-id> - </upstream> -</pkgmetadata> + <upstream> + <remote-id type="github">hyperhq/hyperd</remote-id> + </upstream> + <use> + <flag name="libvirt">Enable support for KVM via libvirt</flag> + <flag name="xen">Enable support for the Xen Hypervisor</flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/img/metadata.xml b/app-emulation/img/metadata.xml index 236a80be46df..1e7a622e281b 100644 --- a/app-emulation/img/metadata.xml +++ b/app-emulation/img/metadata.xml @@ -1,15 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>email@linxon.ru</email> - <name>Yury Martynov</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <upstream> - <remote-id type="github">genuinetools/img</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="person"> + <email>email@linxon.ru</email> + <name>Yury Martynov</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">genuinetools/img</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/kompose/metadata.xml b/app-emulation/kompose/metadata.xml index 35b5754e5e51..1d42342e4528 100644 --- a/app-emulation/kompose/metadata.xml +++ b/app-emulation/kompose/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>williamh@gentoo.org</email> - <name>William Hubbs</name> - </maintainer> - <upstream> - <remote-id type="github">kubernetes/kompose</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="person"> + <email>williamh@gentoo.org</email> + <name>William Hubbs</name> + </maintainer> + <upstream> + <remote-id type="github">kubernetes/kompose</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/libcacard/metadata.xml b/app-emulation/libcacard/metadata.xml index 0fa99318f0a7..256bc69da10e 100644 --- a/app-emulation/libcacard/metadata.xml +++ b/app-emulation/libcacard/metadata.xml @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>virtualization@gentoo.org</email> - <name>Gentoo Virtualization Project</name> - </maintainer> - <use> - <flag name="passthrough">Enable smartcard passthrough support via <pkg>sys-apps/pcsc-lite</pkg></flag> - </use> -</pkgmetadata> + <maintainer type="project"> + <email>virtualization@gentoo.org</email> + <name>Gentoo Virtualization Project</name> + </maintainer> + + <use> + <flag name="passthrough">Enable smartcard passthrough support via <pkg>sys-apps/pcsc-lite</pkg></flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/libco/libco-20.ebuild b/app-emulation/libco/libco-20.ebuild index a1d7136088e5..09d11f16c7cd 100644 --- a/app-emulation/libco/libco-20.ebuild +++ b/app-emulation/libco/libco-20.ebuild @@ -1,5 +1,5 @@ +# Copyright 2020-2021 LiGurOs Authors # Distributed under the terms of the GNU General Public License v2 - EAPI=7 DESCRIPTION="libco is a cross-platform, permissively licensed implementation of cooperative-multithreading" diff --git a/app-emulation/libco/metadata.xml b/app-emulation/libco/metadata.xml index 5313778d7201..8c7eea6b4e97 100644 --- a/app-emulation/libco/metadata.xml +++ b/app-emulation/libco/metadata.xml @@ -1,9 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <!--maintainer-needed--> - <upstream> - <remote-id type="github">byuu/higan</remote-id> - </upstream> - <origin>ports</origin> -</pkgmetadata> + <maintainer type="project"> + <email>dev@liguros.net</email> + <name>Development</name> + </maintainer> + <upstream> + <remote-id type="github">byuu/higan</remote-id> + </upstream> + <origin>ports</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/libdsk/metadata.xml b/app-emulation/libdsk/metadata.xml index 7a38bb900964..83d00b14c8d4 100644 --- a/app-emulation/libdsk/metadata.xml +++ b/app-emulation/libdsk/metadata.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> -</pkgmetadata> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/libguestfs-appliance/metadata.xml b/app-emulation/libguestfs-appliance/metadata.xml index daba43ce47c2..83d00b14c8d4 100644 --- a/app-emulation/libguestfs-appliance/metadata.xml +++ b/app-emulation/libguestfs-appliance/metadata.xml @@ -1,12 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> -<!-- -<maintainer type="person"> - <email>rich@annexia.org</email> - <name>Richard Jones</name> - <description>Upstream - please CC on bugs that concerns upstream</description> -</maintainer> ---> -</pkgmetadata> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/libguestfs/metadata.xml b/app-emulation/libguestfs/metadata.xml index c8cefa609d7b..9f06e51df410 100644 --- a/app-emulation/libguestfs/metadata.xml +++ b/app-emulation/libguestfs/metadata.xml @@ -1,19 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> -<!-- -<maintainer type="person"> - <email>rich@annexia.org</email> - <name>Richard Jones</name> - <description>Upstream - please CC on bugs that concerns upstream</description> -</maintainer> ---> -<use> - <flag name="erlang">Build Erlang bindings</flag> - <flag name="fuse">Enable image mount support via fuse</flag> - <flag name="inspect-icons">Use <pkg>media-gfx/icoutils</pkg> for acces icon file in image and inspect it</flag> - <flag name="libvirt">Use <pkg>app-emulation/libvirt</pkg> to manipulate VMs</flag> - <flag name="systemtap">Use <pkg>dev-util/systemtap</pkg> to inspect VM via "probes" way</flag> -</use> -</pkgmetadata> + + <use> + <flag name="erlang">Build Erlang bindings</flag> + <flag name="fuse">Enable image mount support via fuse</flag> + <flag name="inspect-icons">Use <pkg>media-gfx/icoutils</pkg> for acces icon file in image and inspect it</flag> + <flag name="libvirt">Use <pkg>app-emulation/libvirt</pkg> to manipulate VMs</flag> + <flag name="systemtap">Use <pkg>dev-util/systemtap</pkg> to inspect VM via "probes" way</flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/libspectrum/metadata.xml b/app-emulation/libspectrum/metadata.xml index 68b09e35fe36..4bd2c48d2861 100644 --- a/app-emulation/libspectrum/metadata.xml +++ b/app-emulation/libspectrum/metadata.xml @@ -1,25 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>0xe2.0x9a.0x9b@gmail.com</email> - <name>Jan Ziak</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Gentoo Proxy Maintainers Project</name> - </maintainer> - <longdescription> + <maintainer type="person"> + <email>0xe2.0x9a.0x9b@gmail.com</email> + <name>Jan Ziak</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Gentoo Proxy Maintainers Project</name> + </maintainer> + <longdescription> libspectrum is a library designed to make the input and output of some ZX Spectrum emulator files slightly easier. It is intended to be usable on Unix variants, Win32 and Mac OS X. Currently, it is mainly (only?) used by Fuse, but other Spectrum emulator and utility authors are encouraged to use it. </longdescription> - <use> - <flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> for low-level crypto of some + <upstream> + <remote-id type="sourceforge">fuse-emulator</remote-id> + </upstream> + <use> + <flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> for low-level crypto of some features, including logfiles.</flag> - </use> - <upstream> - <remote-id type="sourceforge">fuse-emulator</remote-id> - </upstream> -</pkgmetadata> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/libvirt-glib/metadata.xml b/app-emulation/libvirt-glib/metadata.xml index 8f96b900ccf3..c68d77c830e7 100644 --- a/app-emulation/libvirt-glib/metadata.xml +++ b/app-emulation/libvirt-glib/metadata.xml @@ -1,12 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -<maintainer type="person"> - <email>tamiko@gentoo.org</email> - <name>Matthias Maier</name> -</maintainer> -</pkgmetadata> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <maintainer type="person"> + <email>tamiko@gentoo.org</email> + <name>Matthias Maier</name> + </maintainer> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/libvirt-snmp/metadata.xml b/app-emulation/libvirt-snmp/metadata.xml index 1b2becffa26c..83d00b14c8d4 100644 --- a/app-emulation/libvirt-snmp/metadata.xml +++ b/app-emulation/libvirt-snmp/metadata.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> -</pkgmetadata> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/libvirt/libvirt-7.0.0-r1.ebuild b/app-emulation/libvirt/libvirt-7.0.0-r1.ebuild index b55d4ca7cd0f..704e39ae28ec 100644 --- a/app-emulation/libvirt/libvirt-7.0.0-r1.ebuild +++ b/app-emulation/libvirt/libvirt-7.0.0-r1.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} = *9999* ]]; then SLOT="0" else SRC_URI="https://libvirt.org/sources/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm64 ~ppc64 x86" SLOT="0/${PV}" fi diff --git a/app-emulation/libvirt/metadata.xml b/app-emulation/libvirt/metadata.xml index 5151b9df4986..458f52779a29 100644 --- a/app-emulation/libvirt/metadata.xml +++ b/app-emulation/libvirt/metadata.xml @@ -1,79 +1,77 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>tamiko@gentoo.org</email> - <name>Matthias Maier</name> -</maintainer> -<maintainer type="project"> - <email>virtualization@gentoo.org</email> - <name>Gentoo Virtualization Project</name> -</maintainer> -<use> - <!-- Pool backend flags --> - <flag name="iscsi-direct"> + <maintainer type="person"> + <email>tamiko@gentoo.org</email> + <name>Matthias Maier</name> + </maintainer> + <maintainer type="project"> + <email>virtualization@gentoo.org</email> + <name>Gentoo Virtualization Project</name> + </maintainer> + + <use> + <flag name="iscsi-direct"> Allow using libiscsi for iSCSI storage pool backend </flag> - <flag name="iscsi"> + <flag name="iscsi"> Allow using an iSCSI remote storage server as pool for disk image storage </flag> - <flag name="lvm"> + <flag name="lvm"> Allow using the Logical Volume Manager (<pkg>sys-fs/lvm2</pkg>) as pool for disk image storage </flag> - <flag name="nfs"> + <flag name="nfs"> Allow using Network File System mounts as pool for disk image storage </flag> - <flag name="parted"> + <flag name="parted"> Allow using real disk partitions as pool for disk image storage, using <pkg>sys-block/parted</pkg> to create, resize and delete them. </flag> - <flag name="rbd"> + <flag name="rbd"> Enable rados block device support via <pkg>sys-cluster/ceph</pkg> </flag> - <!-- Virtualisation backends --> - <flag name="lxc"> + <flag name="lxc"> Support management of Linux Containers virtualisation (<pkg>app-emulation/lxc</pkg>) </flag> - <flag name="openvz"> + <flag name="openvz"> Support management of OpenVZ virtualisation (openvz-sources) </flag> - <flag name="qemu"> + <flag name="qemu"> Support management of QEMU virtualisation (<pkg>app-emulation/qemu</pkg>) </flag> - <flag name="xen"> + <flag name="xen"> Support management of Xen virtualisation (<pkg>app-emulation/xen</pkg>) </flag> - <flag name="virtualbox"> + <flag name="virtualbox"> Support management of VirtualBox virtualisation (<pkg>app-emulation/virtualbox</pkg>) </flag> - <!-- Miscellaneous flags --> - <flag name="apparmor">Enable AppArmor support</flag> - <flag name="dtrace">Enable dtrace support via <pkg>dev-util/systemtap</pkg></flag> - <flag name="fuse">Allow LXC to use <pkg>sys-fs/fuse</pkg> for mount + <flag name="apparmor">Enable AppArmor support</flag> + <flag name="dtrace">Enable dtrace support via <pkg>dev-util/systemtap</pkg></flag> + <flag name="fuse">Allow LXC to use <pkg>sys-fs/fuse</pkg> for mount points</flag> - <flag name="numa"> + <flag name="numa"> Use NUMA for memory segmenting via <pkg>sys-process/numactl</pkg> and <pkg>sys-process/numad</pkg> </flag> - <flag name="libvirtd"> + <flag name="libvirtd"> Builds the libvirtd daemon as well as the client utilities instead of just the client utilities </flag> - <flag name="libssh"> + <flag name="libssh"> Use <pkg>net-libs/libssh</pkg> to communicate with remote libvirtd hosts, for example: qemu+libssh://server/system </flag> - <flag name="pcap"> + <flag name="pcap"> Support auto learning IP addreses for routing </flag> - <flag name="macvtap"> + <flag name="macvtap"> Support for MAC-based TAP (macvlan/macvtap). For networking instead of the normal TUN/TAP. </flag> - <flag name="vepa">Virtual Ethernet Port Aggregator (VEPA) / 802.1Qbg + <flag name="vepa">Virtual Ethernet Port Aggregator (VEPA) / 802.1Qbg support. Relies on macvtap support.</flag> - <flag name="virt-network"> + <flag name="virt-network"> Enable virtual networking (NAT) support for guests. Includes all the dependencies for NATed network mode. Effectively any network setup that relies on libvirt to setup and configure network @@ -82,16 +80,17 @@ the underlying devices for you. In some cases this requires enabling the 'netcf' USE flag (currently unavailable). </flag> - <flag name="firewalld">DBus interface to iptables/ebtables allowing + <flag name="firewalld">DBus interface to iptables/ebtables allowing for better runtime management of your firewall.</flag> - <flag name="wireshark-plugins"> + <flag name="wireshark-plugins"> Build the <pkg>net-analyzer/wireshark</pkg> plugin for the Libvirt RPC protocol </flag> - <flag name="glusterfs"> + <flag name="glusterfs"> Enable GlusterFS support via <pkg>sys-cluster/glusterfs</pkg> </flag> - <flag name="zfs"> + <flag name="zfs"> Enable ZFS backend storage <pkg>sys-fs/zfs</pkg> </flag> -</use> -</pkgmetadata> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/lxc-templates/metadata.xml b/app-emulation/lxc-templates/metadata.xml index 5b1f35473c2e..4424b498f8e0 100644 --- a/app-emulation/lxc-templates/metadata.xml +++ b/app-emulation/lxc-templates/metadata.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>dev@liguros.net</email> - <name>Development</name> - </maintainer> - <upstream> - <remote-id type="github">lxc/lxc-templates</remote-id> - </upstream> - <origin>ports</origin> -</pkgmetadata> + <maintainer type="project"> + <email>dev@liguros.net</email> + <name>Development</name> + </maintainer> + <upstream> + <remote-id type="github">lxc/lxc-templates</remote-id> + </upstream> + <origin>ports</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/lxc/metadata.xml b/app-emulation/lxc/metadata.xml index 71e574b11294..b51d63cac159 100644 --- a/app-emulation/lxc/metadata.xml +++ b/app-emulation/lxc/metadata.xml @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>dev@liguros.net</email> - <name>Development</name> - </maintainer> - <use> - <flag name="apparmor">Enable AppArmor support</flag> - <flag name="cgmanager">Enable support for cgroup management using <pkg>app-admin/cgmanager</pkg></flag> - <flag name="templates">Install old style templates through <pkg>app-emulation/lxc-templates</pkg></flag> - <flag name="tools">Build and install additional command line tools</flag> - <flag name="libs-only">Install only libs</flag> - </use> - <upstream> - <remote-id type="github">lxc/lxc</remote-id> - <remote-id type="cpe">cpe:/a:linuxcontainers:lxc</remote-id> - </upstream> - <origin>ports</origin> -</pkgmetadata> + <maintainer type="project"> + <email>dev@liguros.net</email> + <name>Development</name> + </maintainer> + <upstream> + <remote-id type="github">lxc/lxc</remote-id> + <remote-id type="cpe">cpe:/a:linuxcontainers:lxc</remote-id> + </upstream> + <use> + <flag name="apparmor">Enable AppArmor support</flag> + <flag name="cgmanager">Enable support for cgroup management using <pkg>app-admin/cgmanager</pkg></flag> + <flag name="templates">Install old style templates through <pkg>app-emulation/lxc-templates</pkg></flag> + <flag name="tools">Build and install additional command line tools</flag> + <flag name="libs-only">Install only libs</flag> + </use> + <origin>ports</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/lxd/lxd-4.11-r1.ebuild b/app-emulation/lxd/lxd-4.11-r1.ebuild new file mode 100644 index 000000000000..5a4dd1d1891d --- /dev/null +++ b/app-emulation/lxd/lxd-4.11-r1.ebuild @@ -0,0 +1,237 @@ +# Copyright 2020-2021 LiGurOs Authors +# Distributed under the terms of the GNU General Public License v2 +EAPI=7 + +DESCRIPTION="Fast, dense and secure container management" +HOMEPAGE="https://linuxcontainers.org/lxd/introduction/" + +LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 x86" + +IUSE="+daemon +ipv6 +dnsmasq nls test +tools" + +inherit autotools bash-completion-r1 linux-info systemd user + +SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz" + +DEPEND=" + >=app-emulation/raft-0.9.22 + >=dev-db/sqlite-3.25 + dev-lang/tcl + >=dev-lang/go-1.9.4 + dev-libs/libuv + dev-libs/protobuf + nls? ( sys-devel/gettext ) + test? ( + app-misc/jq + net-misc/curl + sys-devel/gettext + ) +" + +RDEPEND=" + daemon? ( + app-emulation/raft + app-arch/xz-utils + >=app-emulation/lxc-4.0.0[seccomp,libs-only] + dev-libs/libuv + dev-libs/lzo + dev-util/xdelta:3 + dnsmasq? ( + net-dns/dnsmasq[dhcp,ipv6?] + ) + net-firewall/ebtables + net-firewall/iptables[ipv6?] + net-libs/libnfnetlink + net-libs/libnsl:0= + net-misc/rsync[xattr] + sys-apps/iproute2[ipv6?] + sys-fs/fuse + sys-fs/lxcfs + sys-fs/squashfs-tools[lzma] + virtual/acl + ) +" + +CONFIG_CHECK=" + ~BRIDGE + ~DUMMY + ~IP6_NF_NAT + ~IP6_NF_TARGET_MASQUERADE + ~IPV6 + ~IP_NF_NAT + ~IP_NF_TARGET_MASQUERADE + ~MACVLAN + ~NETFILTER_XT_MATCH_COMMENT + ~NET_IPGRE + ~NET_IPGRE_DEMUX + ~NET_IPIP + ~NF_NAT_MASQUERADE_IPV4 + ~NF_NAT_MASQUERADE_IPV6 + ~VXLAN +" + +ERROR_BRIDGE="BRIDGE: needed for network commands" +ERROR_DUMMY="DUMMY: needed for network commands" +ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands" +ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network commands" +ERROR_IPV6="IPV6: needed for network commands" +ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands" +ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network commands" +ERROR_MACVLAN="MACVLAN: needed for network commands" +ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for network commands" +ERROR_NET_IPGRE="NET_IPGRE: needed for network commands" +ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands" +ERROR_NET_IPIP="NET_IPIP: needed for network commands" +ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network commands" +ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network commands" +ERROR_VXLAN="VXLAN: needed for network commands" + +EGO_PN="github.com/lxc/lxd" + +src_prepare() { + default + eapply_user + + cd "${S}/_dist/deps/dqlite" || die "Can't cd to dqlite dir" + eautoreconf +} + +src_configure() { + export GOPATH="${S}/_dist" + + cd "${GOPATH}/deps/dqlite" || die "Can't cd to dqlite dir" + econf --libdir=${EPREFIX}/usr/lib/lxd +} + +src_compile() { + export GOPATH="${S}/_dist" + + cd "${GOPATH}/deps/dqlite" || die "Can't cd to dqlite dir" + emake CFLAGS="-I${GOPATH}/deps/sqlite" LDFLAGS="-L${GOPATH}/deps/sqlite" + + # We don't use the Makefile here because it builds targets with the + # assumption that `pwd` is in a deep gopath namespace, which we're not. + # It's simpler to manually call "go install" than patching the Makefile. + cd "${S}" + GO111MODULE=auto go install -v -x ${EGO_PN}/lxc || die "Failed to build the client" + + if use daemon; then + + # LXD depends on a patched, bundled sqlite with replication + # capabilities. + export CGO_CFLAGS="-I${GOPATH}/deps/dqlite/include/" + export CGO_LDFLAGS="-L${GOPATH}/deps/dqlite/.libs/ -Wl,-rpath,${EPREFIX}/usr/lib/lxd" + export LD_LIBRARY_PATH="${GOPATH}/deps/dqlite/.libs/" + + GO111MODULE=auto go install -v -x ${EGO_PN}/lxd || die "Failed to build the daemon" + fi + + if use tools; then + GO111MODULE=auto go install -v -x ${EGO_PN}/fuidshift || die "Failed to build fuidshift" + GO111MODULE=auto go install -v -x ${EGO_PN}/lxc-to-lxd || die "Failed to build lxc-to-lxd" + GO111MODULE=auto go install -v -x ${EGO_PN}/lxd-agent || die "Failed to build lxd-agent" + GO111MODULE=auto go install -v -x ${EGO_PN}/lxd-benchmark || die "Failed to build lxd-benchmark" + GO111MODULE=auto go install -v -x ${EGO_PN}/lxd-p2c || die "Failed to build lxd-p2c" + fi + + use nls && emake build-mo + + mkdir _dist/man + ./_dist/bin/lxc manpage _dist/man/ +} + +src_test() { + if use daemon; then + export GOPATH="${S}/_dist" + # This is mostly a copy/paste from the Makefile's "check" rule, but + # patching the Makefile to work in a non "fully-qualified" go namespace + # was more complicated than this modest copy/paste. + # Also: sorry, for now a network connection is needed to run tests. + # Will properly bundle test dependencies later. + go get -v -x github.com/rogpeppe/godeps + go get -v -x github.com/remyoudompheng/go-misc/deadcode + go get -v -x github.com/golang/lint/golint + go test -v ${EGO_PN}/lxd + else + einfo "No tests to run for client-only builds" + fi +} + +src_install() { + local bindir="_dist/bin" + dobin ${bindir}/lxc + if use daemon; then + + export GOPATH="${S}/_dist" + + cd "${GOPATH}/deps/dqlite" || die "Can't cd to dqlite dir" + emake DESTDIR="${D}" install + + # Must only install libs + rm -r "${D}/usr/include" || die "Can't remove include directory" + + cd "${S}" || die "Can't cd to \${S}" + dosbin ${bindir}/lxd + fi + + if use tools; then + dobin ${bindir}/fuidshift + dobin ${bindir}/lxc-to-lxd + dobin ${bindir}/lxd-agent + dobin ${bindir}/lxd-benchmark + dobin ${bindir}/lxd-p2c + fi + + insinto /etc/sysctl.d + newins "${FILESDIR}/${PN}-sysctl.conf" 60-${PN}.conf + + if use nls; then + domo po/*.mo + fi + + if use daemon; then + newinitd "${FILESDIR}"/${PN}.initd lxd + newconfd "${FILESDIR}"/${PN}.confd lxd + + systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service + fi + + newbashcomp scripts/bash/lxd-client lxc + + doman _dist/man/* + + dodoc AUTHORS doc/* +} + +pkg_postinst() { + elog + elog "Consult https://wiki.gentoo.org/wiki/LXD for more information," + elog "including a Quick Start." + + # The messaging below only applies to daemon installs + use daemon || return 0 + + # The control socket will be owned by (and writeable by) this group. + enewgroup lxd + + # Ubuntu also defines an lxd user but it appears unused (the daemon + # must run as root) + elog + elog "Though not strictly required, some features are enabled at run-time" + elog "when the relevant helper programs are detected:" + elog "- sys-apps/apparmor" + elog "- sys-fs/btrfs-progs" + elog "- sys-fs/lvm2" + elog "- sys-fs/zfs" + elog "- sys-process/criu" + elog + elog "Since these features can't be disabled at build-time they are" + elog "not USE-conditional." + elog + elog "Be sure to add your local user to the lxd group." + elog + elog "Networks with bridge.mode=fan are unsupported due to requiring" + elog "a patched kernel and iproute2." +} diff --git a/app-emulation/lxd/metadata.xml b/app-emulation/lxd/metadata.xml index b4170d6a83a2..9f9b4003d5fa 100644 --- a/app-emulation/lxd/metadata.xml +++ b/app-emulation/lxd/metadata.xml @@ -1,26 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>dev@liguros.net</email> - <name>Development</name> - </maintainer> - <longdescription> + <maintainer type="project"> + <email>dev@liguros.net</email> + <name>Development</name> + </maintainer> + <longdescription> By combining the speed and density of containers with the security of traditional virtual machines, LXD is the next-generation of container hypervisor for Linux from Canonical. </longdescription> - <upstream> - <remote-id type="github">lxc/lxd</remote-id> - </upstream> - <use> - <flag name="daemon"> + <upstream> + <remote-id type="github">lxc/lxd</remote-id> + </upstream> + <use> + <flag name="daemon"> Build the system daemon, not just the client tool </flag> - <flag name="dnsmasq"> + <flag name="dnsmasq"> Depend on dnsmasq to provide DHCP and DNS. </flag> - </use> - <origin>ports</origin> -</pkgmetadata> + </use> + <origin>ports</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/nemu/metadata.xml b/app-emulation/nemu/metadata.xml index b2ce9edb9146..bb65990cb0e0 100644 --- a/app-emulation/nemu/metadata.xml +++ b/app-emulation/nemu/metadata.xml @@ -1,15 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>monsieurp@gentoo.org</email> - <name>Patrice Clement</name> - </maintainer> - <use> - <flag name="vnc-client">Adds support for external VNC client</flag> - <flag name="savevm">Adds support for QEMU savevm snapshots (experimental, QEMU must be patched)</flag> - <flag name="spice">Adds Spice protocol support</flag> - <flag name="ovf">Adds support for OVA/OVF import</flag> - <flag name="network-map">Adds possibility of exporting network map to SVG</flag> - </use> -</pkgmetadata> + <maintainer type="person"> + <email>monsieurp@gentoo.org</email> + <name>Patrice Clement</name> + </maintainer> + + <use> + <flag name="vnc-client">Adds support for external VNC client</flag> + <flag name="savevm">Adds support for QEMU savevm snapshots (experimental, QEMU must be patched)</flag> + <flag name="spice">Adds Spice protocol support</flag> + <flag name="ovf">Adds support for OVA/OVF import</flag> + <flag name="network-map">Adds possibility of exporting network map to SVG</flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/nvidia-container-runtime/metadata.xml b/app-emulation/nvidia-container-runtime/metadata.xml index a9e2adeb5926..c545399125a2 100644 --- a/app-emulation/nvidia-container-runtime/metadata.xml +++ b/app-emulation/nvidia-container-runtime/metadata.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>dev@liguros.net</email> - <name>Development</name> - </maintainer> - <upstream> - <remote-id type="github">NVIDIA/nvidia-container-runtime</remote-id> - </upstream> - <origin>ports</origin> -</pkgmetadata> + <maintainer type="project"> + <email>dev@liguros.net</email> + <name>Development</name> + </maintainer> + <upstream> + <remote-id type="github">NVIDIA/nvidia-container-runtime</remote-id> + </upstream> + <origin>ports</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/nvidia-container-toolkit/metadata.xml b/app-emulation/nvidia-container-toolkit/metadata.xml index edb1419a2429..799d959420ca 100644 --- a/app-emulation/nvidia-container-toolkit/metadata.xml +++ b/app-emulation/nvidia-container-toolkit/metadata.xml @@ -1,18 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>dev@liguros.net</email> - <name>Development</name> - </maintainer> - <maintainer type="person"> - <email>vowstar@gmail.com</email> - <name>Huang Rui</name> - </maintainer> - <upstream> - <remote-id type="github">NVIDIA/nvidia-container-toolkit</remote-id> - </upstream> - <longdescription lang="en"> + <maintainer type="project"> + <email>dev@liguros.net</email> + <name>Development</name> + </maintainer> + <maintainer type="person"> + <email>vowstar@gmail.com</email> + <name>Huang Rui</name> + </maintainer> + <longdescription lang="en"> NVIDIA container runtime toolkit, build and run containers leveraging NVIDIA GPUs. tl;dr: nvidia-docker is deprecated because docker now has native gpu support, which this package is required to use. The NVIDIA @@ -21,5 +18,8 @@ production use. Vulkan support is currently in beta. This only works for Linux containers running on Linux host systems with NVIDIA GPUs. </longdescription> - <origin>ports</origin> -</pkgmetadata> + <upstream> + <remote-id type="github">NVIDIA/nvidia-container-toolkit</remote-id> + </upstream> + <origin>ports</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/nvidia-docker/metadata.xml b/app-emulation/nvidia-docker/metadata.xml index 3d04e7fd50e6..9d1a84403158 100644 --- a/app-emulation/nvidia-docker/metadata.xml +++ b/app-emulation/nvidia-docker/metadata.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>dev@liguros.net</email> - <name>Development</name> - </maintainer> - <upstream> - <remote-id type="github">NVIDIA/nvidia-docker</remote-id> - </upstream> - <origin>ports</origin> -</pkgmetadata> + <maintainer type="project"> + <email>dev@liguros.net</email> + <name>Development</name> + </maintainer> + <upstream> + <remote-id type="github">NVIDIA/nvidia-docker</remote-id> + </upstream> + <origin>ports</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/open-vm-tools/metadata.xml b/app-emulation/open-vm-tools/metadata.xml index b3da7a11a515..c9bd0a0ab865 100644 --- a/app-emulation/open-vm-tools/metadata.xml +++ b/app-emulation/open-vm-tools/metadata.xml @@ -1,27 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>floppym@gentoo.org</email> - <name>Mike Gilbert</name> - </maintainer> - <longdescription> + <maintainer type="person"> + <email>floppym@gentoo.org</email> + <name>Mike Gilbert</name> + </maintainer> + <longdescription> The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools. They are a set of guest operating system virtualization components that enhance performance and user experience of virtual machines. </longdescription> - <use> - <flag name="deploypkg">Build deploypkg plugin</flag> - <flag name="dnet">Enable support for nicinfo</flag> - <flag name="doc">Generate API documentation</flag> - <flag name="fuse">Enable vmblock-fuse/vmhgfs-fuse</flag> - <flag name="gtkmm">Compile with Gtkmm and sigc++ (Recommended)</flag> - <flag name="multimon">Enable multimon (Requires X)</flag> - <flag name="resolutionkms">Build the linux/unix resolutionkms module</flag> - <flag name="vgauth">Build vgauth</flag> - </use> - <upstream> - <remote-id type="github">vmware/open-vm-tools</remote-id> - </upstream> -</pkgmetadata> + <upstream> + <remote-id type="github">vmware/open-vm-tools</remote-id> + </upstream> + <use> + <flag name="deploypkg">Build deploypkg plugin</flag> + <flag name="dnet">Enable support for nicinfo</flag> + <flag name="doc">Generate API documentation</flag> + <flag name="fuse">Enable vmblock-fuse/vmhgfs-fuse</flag> + <flag name="gtkmm">Compile with Gtkmm and sigc++ (Recommended)</flag> + <flag name="multimon">Enable multimon (Requires X)</flag> + <flag name="resolutionkms">Build the linux/unix resolutionkms module</flag> + <flag name="vgauth">Build vgauth</flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/pcem/metadata.xml b/app-emulation/pcem/metadata.xml index b25ac367e489..606cee6db99f 100644 --- a/app-emulation/pcem/metadata.xml +++ b/app-emulation/pcem/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>conikost@gentoo.org</email> - <name>Conrad Kostecki</name> - </maintainer> - <longdescription> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <longdescription> PCem (an acronym for Personal Computer emulator) is an open-source, low-level PC emulator developed for Windows and Linux by Sarah Walker. @@ -13,11 +13,12 @@ A variety of operating systems can be installed in the emulator, which can then be used to launch programs. </longdescription> - <use> - <flag name="networking">Enable support for emulation of network cards.</flag> - </use> - <upstream> - <bugs-to>https://pcem-emulator.co.uk/phpBB3/viewforum.php?f=2</bugs-to> - <remote-id type="github">sarah-walker-pcem/pcem</remote-id> - </upstream> -</pkgmetadata> + <upstream> + <remote-id type="github">sarah-walker-pcem/pcem</remote-id> + <bugs-to>https://pcem-emulator.co.uk/phpBB3/viewforum.php?f=2</bugs-to> + </upstream> + <use> + <flag name="networking">Enable support for emulation of network cards.</flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/phpvirtualbox/metadata.xml b/app-emulation/phpvirtualbox/metadata.xml index 2ee0da8b117c..5386c2906324 100644 --- a/app-emulation/phpvirtualbox/metadata.xml +++ b/app-emulation/phpvirtualbox/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="google-code">phpvirtualbox</remote-id> - <remote-id type="sourceforge">phpvirtualbox</remote-id> - </upstream> -</pkgmetadata> + <upstream> + <remote-id type="google-code">phpvirtualbox</remote-id> + <remote-id type="sourceforge">phpvirtualbox</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/podman/Manifest b/app-emulation/podman/Manifest index 41fac5271911..f8087bc702c9 100644 --- a/app-emulation/podman/Manifest +++ b/app-emulation/podman/Manifest @@ -1 +1 @@ -DIST podman-2.2.1.tar.gz 9653842 BLAKE2B 4e86903fc8fb51b9b1aa2b46704c1828b4ea11b738eccf198260c678b175e0a8699120e0280a2803f7898c9b28040a75d489ccd09ebd9c1f45d10a86e2a26c8f SHA512 4c6eda9320daf18b5f0e892c0f3019a5658d983936c25a195bcb1fbc28c18a9a65e87043faddeb47e9f62c9b445efc2906a2b7ccedca877941fadb21b1b68367 +DIST podman-3.0.1.tar.gz 10365348 BLAKE2B 93a227bf1395145ebaec8e18aa8ad8101704e8e0f7344c8850ee9e1532b191aef96b1cbbba2e21bd716591d68969cfd16ee811621a383cb2d31e4105a44834bf SHA512 4addc986ad94b512d90b675a5a1988eeef365fff02c3449fd310582245a91d4ee96ff9fd3c56ce333a972dca627aa28fbd468a4a363c5c8963524bb67bc26754 diff --git a/app-emulation/podman/metadata.xml b/app-emulation/podman/metadata.xml index 64831477a766..df50c8f8bb7a 100644 --- a/app-emulation/podman/metadata.xml +++ b/app-emulation/podman/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>zmedico@gentoo.org</email> - <name>Zac Medico</name> - </maintainer> - <longdescription lang="en"> + <maintainer type="person"> + <email>zmedico@gentoo.org</email> + <name>Zac Medico</name> + </maintainer> + <longdescription lang="en"> Podman (the POD MANager) is a tool for managing containers and images, volumes mounted into those containers, and pods made from groups of containers. Podman is based on libpod, @@ -14,23 +14,24 @@ APIs for managing containers, pods, container images, and volumes. </longdescription> - <use> - <flag name="apparmor"> + <upstream> + <remote-id type="github">containers/podman</remote-id> + </upstream> + <use> + <flag name="apparmor"> Enable AppArmor support. </flag> - <flag name="btrfs"> + <flag name="btrfs"> Enables dependencies for the "btrfs" graph driver, including necessary kernel flags. </flag> - <flag name="fuse"> + <flag name="fuse"> Enables fuse dependencies (fuse-overlayfs is especially useful for rootless mode). </flag> - <flag name="rootless"> + <flag name="rootless"> Enables dependencies for running in rootless mode. </flag> - </use> - <upstream> - <remote-id type="github">containers/podman</remote-id> - </upstream> -</pkgmetadata> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/podman/podman-2.2.1.ebuild b/app-emulation/podman/podman-3.0.1.ebuild index 32c38f9a7901..f82494e1737f 100644 --- a/app-emulation/podman/podman-2.2.1.ebuild +++ b/app-emulation/podman/podman-3.0.1.ebuild @@ -3,8 +3,6 @@ EAPI=7 -EGIT_COMMIT="d8868746fd3f45b9bfd79e37bf2aa0c7103245fd" - inherit bash-completion-r1 flag-o-matic go-module DESCRIPTION="Library and podman tool for running OCI-based containers in Pods" @@ -63,6 +61,12 @@ src_prepare() { } src_compile() { + local git_commit + git_commit=$(grep '^[[:space:]]*gitCommit[[:space:]]' vendor/k8s.io/client-go/pkg/version/base.go) + git_commit=${git_commit#*\"} + git_commit=${git_commit%\"*} + [[ ${git_commit} ]] || die "failed to determine gitCommit" + # Filter unsupported linker flags filter-flags '-Wl,*' @@ -100,8 +104,8 @@ src_compile() { emake all \ GIT_BRANCH=master \ GIT_BRANCH_CLEAN=master \ - COMMIT_NO="${EGIT_COMMIT}" \ - GIT_COMMIT="${EGIT_COMMIT}" + COMMIT_NO="${git_commit}" \ + GIT_COMMIT="${git_commit}" } src_install() { diff --git a/app-emulation/protontricks/Manifest b/app-emulation/protontricks/Manifest index d8eb5a72e40a..1209278b1790 100644 --- a/app-emulation/protontricks/Manifest +++ b/app-emulation/protontricks/Manifest @@ -1,3 +1,2 @@ DIST protontricks-1.4.1.tar.gz 31838 BLAKE2B b8c94a1b96fa7df14eaf1cc6d11cb96e43ae4e8c7bd232687a50cae9c79cf2d0e7864b1af0e1dc4cc20086952e1fcefeb16cb71a9c3a977f6feafad1b17d6857 SHA512 7635c9830afa3c64617514cd86edc7d7f9f33e6e81a1da995ec8bee70adc1cf8b5d9de92036c372134e408d735615b267b46a9afc9246f14ff161cb2ee1fc8f9 -DIST protontricks-1.4.2.gh.tar.gz 41381 BLAKE2B 9030c5cc0781303834af3b478e78f9ba43f01c68c5e203df20a9db80492dd5e641134b796158011a15e65f6907f27a67c542323ea8f9e10c49dca3f5c663458a SHA512 8b60233723130e5f7cd1a7ce7b9563ba1cc8595352b6d942d9ce66a6906f18d86cf97e2b49cbdb8e276fad6cd038eaf1de8a704a8b900b29de5dfb7327b045d0 DIST protontricks-1.4.3.tar.gz 43573 BLAKE2B 3a3050ba6e940182d81d98498a5558433ceaa4282f5a23fb93b3cfc299699381493eb2912c5f03bb6a8092be5c50b94bf7181208cda3d4c0f4c90c0f438f7f1b SHA512 7ca8c7c273d92f7c4526caaa8c9db6988c642913c33c6b6188d285d5cfbe30924533a9f024135865cdc1a25bd867ac00bd915b0a61417d17fe0e5ee451417e64 diff --git a/app-emulation/protontricks/files/protontricks-1.4.1_no-setuptools-scm.patch b/app-emulation/protontricks/files/protontricks-1.4.1_no-setuptools-scm.patch deleted file mode 100644 index fac3ed813d4e..000000000000 --- a/app-emulation/protontricks/files/protontricks-1.4.1_no-setuptools-scm.patch +++ /dev/null @@ -1,36 +0,0 @@ -Since version 1.4.1 upstream has used setuptools-scm to determine the -current version number. Unfortunately the package in question does not -support GitHub release archives, using GitHub VCS snapshots would require -retrieving and updating commit hashes corresponding to release tags, and -PyPI tarballs do not contain tests. setuptools_scm_git_archive does not -help because it requires extra files to be included in the repository, -which upstream has not done. - -Seeing as we already know the version number, bypass setuptools_scm -altogether and create the version file ourselves. For obvious reasons the -latter cannot be done with a patch alone - have to call sed in src_prepare. - ---- a/setup.py -+++ b/setup.py -@@ -16,9 +16,6 @@ - - setup( - name="protontricks", -- use_scm_version={ -- "write_to": "src/protontricks/_version.py" -- }, - description=DESCRIPTION, - long_description=LONG_DESCRIPTION, - author=AUTHOR, -@@ -28,7 +25,6 @@ - packages=["protontricks"], - package_data={"": ["LICENSE"]}, - package_dir={"protontricks": "src/protontricks"}, -- setup_requires=["setuptools_scm"], - install_requires=["vdf>=2.4"], - entry_points={ - "console_scripts": [ ---- /dev/null -+++ b/src/protontricks/_version.py -@@ -0,0 +1 @@ -+version = '@VERSION@' diff --git a/app-emulation/protontricks/metadata.xml b/app-emulation/protontricks/metadata.xml index e18d1ed94ac5..6a9a7aa19d1a 100644 --- a/app-emulation/protontricks/metadata.xml +++ b/app-emulation/protontricks/metadata.xml @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>marecki@gentoo.org</email> - <name>Marek Szuba</name> - </maintainer> - <longdescription lang="en"> + <maintainer type="person"> + <email>marecki@gentoo.org</email> + <name>Marek Szuba</name> + </maintainer> + <longdescription lang="en"> A simple wrapper script that allows you to easily run Winetricks commands for Steam Play/Proton games. This is often useful when a game requires closed-source runtime libraries that are not included with Proton, or to activate Gallium Nine (native Direct3D 9 support) for a Proton game, without all the tedious messing around with Wine prefixes. </longdescription> - <upstream> - <remote-id type="github">Matoking/protontricks</remote-id> - <remote-id type="pypi">protontricks</remote-id> - </upstream> -</pkgmetadata> + <upstream> + <remote-id type="github">Matoking/protontricks</remote-id> + <remote-id type="pypi">protontricks</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/protontricks/protontricks-1.4.2.ebuild b/app-emulation/protontricks/protontricks-1.4.2.ebuild deleted file mode 100644 index 07089d3447da..000000000000 --- a/app-emulation/protontricks/protontricks-1.4.2.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 ) -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit distutils-r1 - -DESCRIPTION="app-emulation/winetricks wrapper for Proton (Steam Play) games" -HOMEPAGE="https://github.com/Matoking/protontricks" -# Will remove the .gh bit come next version bump -SRC_URI="https://github.com/Matoking/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+gui" - -RDEPEND="app-emulation/winetricks - $(python_gen_cond_dep ' - dev-python/vdf[${PYTHON_USEDEP}] - ') - gui? ( gnome-extra/zenity - || ( - app-emulation/winetricks[gtk] - app-emulation/winetricks[kde] - ) - )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.4.1_no-setuptools-scm.patch -) - -DOCS=( CHANGELOG.md README.md ) - -distutils_enable_tests pytest - -python_prepare_all() { - distutils-r1_python_prepare_all - sed -i -e "s/@VERSION@/${PV}/" "${S}"/src/${PN}/_version.py || die -} - -pkg_postinst() { - elog - - if ! use gui; then - ewarn "Please note that disabling USE=gui does *not* presently remove the --gui command-line option," - ewarn "it just means using this option will fail unless gnome-extra/zenity happens to be installed." - ewarn - fi - - elog "Protontricks can only find games for which a Proton prefix already exists." - elog "Make sure to run a Proton game at least once before trying to use protontricks on it." - elog -} diff --git a/app-emulation/punes/metadata.xml b/app-emulation/punes/metadata.xml index 23b1c9a0b21e..4dae570641e3 100644 --- a/app-emulation/punes/metadata.xml +++ b/app-emulation/punes/metadata.xml @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>azamat.hackimov@gmail.com</email> - <name>Azamat H. Hackimov</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <use> - <flag name="cg">Add support for Nvidia CG Toolkit</flag> - </use> - <upstream> - <remote-id type="github">punesemu/puNES</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="person"> + <email>azamat.hackimov@gmail.com</email> + <name>Azamat H. Hackimov</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">punesemu/puNES</remote-id> + </upstream> + <use> + <flag name="cg">Add support for Nvidia CG Toolkit</flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/q4wine/metadata.xml b/app-emulation/q4wine/metadata.xml index 098a455159e2..37412b4bdb6c 100644 --- a/app-emulation/q4wine/metadata.xml +++ b/app-emulation/q4wine/metadata.xml @@ -1,17 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> - <use> - <flag name="ico">Enable ico support via <pkg>media-gfx/icoutils</pkg></flag> - <flag name="iso">Support unprivileged mounting of ISO9660 images via <pkg>sys-fs/fuseiso</pkg></flag> - <flag name="wineappdb">Enable Wine AppDB browser support</flag> - </use> - <upstream> - <remote-id type="github">brezerk/q4wine</remote-id> - <remote-id type="sourceforge">q4wine</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="project"> + <email>qt@gentoo.org</email> + <name>Gentoo Qt Project</name> + </maintainer> + <upstream> + <remote-id type="github">brezerk/q4wine</remote-id> + <remote-id type="sourceforge">q4wine</remote-id> + </upstream> + <use> + <flag name="ico">Enable ico support via <pkg>media-gfx/icoutils</pkg></flag> + <flag name="iso">Support unprivileged mounting of ISO9660 images via <pkg>sys-fs/fuseiso</pkg></flag> + <flag name="wineappdb">Enable Wine AppDB browser support</flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/qemu-guest-agent/metadata.xml b/app-emulation/qemu-guest-agent/metadata.xml index 88bcd95b4c70..588f5ba1e616 100644 --- a/app-emulation/qemu-guest-agent/metadata.xml +++ b/app-emulation/qemu-guest-agent/metadata.xml @@ -1,12 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>tamiko@gentoo.org</email> - <name>Matthias Maier</name> - </maintainer> - <maintainer type="project"> - <email>virtualization@gentoo.org</email> - <name>Gentoo Virtualization Project</name> - </maintainer> -</pkgmetadata> + <maintainer type="person"> + <email>tamiko@gentoo.org</email> + <name>Matthias Maier</name> + </maintainer> + <maintainer type="project"> + <email>virtualization@gentoo.org</email> + <name>Gentoo Virtualization Project</name> + </maintainer> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/qemu-init-scripts/metadata.xml b/app-emulation/qemu-init-scripts/metadata.xml index 7a38bb900964..83d00b14c8d4 100644 --- a/app-emulation/qemu-init-scripts/metadata.xml +++ b/app-emulation/qemu-init-scripts/metadata.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> -</pkgmetadata> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/qemu-riscv64-bin/metadata.xml b/app-emulation/qemu-riscv64-bin/metadata.xml index 304c5d2c5ff3..c088d3e482a2 100644 --- a/app-emulation/qemu-riscv64-bin/metadata.xml +++ b/app-emulation/qemu-riscv64-bin/metadata.xml @@ -1,16 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>riscv@gentoo.org</email> - <name>RISC-V</name> - </maintainer> - <maintainer type="person"> - <email>tamiko@gentoo.org</email> - <name>Matthias Maier</name> - </maintainer> - <maintainer type="project"> - <email>virtualization@gentoo.org</email> - <name>Gentoo Virtualization Project</name> - </maintainer> -</pkgmetadata> + <maintainer type="project"> + <email>riscv@gentoo.org</email> + <name>RISC-V</name> + </maintainer> + <maintainer type="person"> + <email>tamiko@gentoo.org</email> + <name>Matthias Maier</name> + </maintainer> + <maintainer type="project"> + <email>virtualization@gentoo.org</email> + <name>Gentoo Virtualization Project</name> + </maintainer> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml index 0016d14bf2d9..109f37fb2705 100644 --- a/app-emulation/qemu/metadata.xml +++ b/app-emulation/qemu/metadata.xml @@ -1,69 +1,71 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>tamiko@gentoo.org</email> - <name>Matthias Maier</name> - </maintainer> - <maintainer type="person"> - <email>slyfox@gentoo.org</email> - <name>Sergei Trofimovich</name> - </maintainer> - <maintainer type="project"> - <email>virtualization@gentoo.org</email> - <name>Gentoo Virtualization Project</name> - </maintainer> - <use> - <flag name="accessibility">Adds support for braille displays using brltty</flag> - <flag name="aio">Enables support for Linux's Async IO</flag> - <flag name="alsa">Enable alsa output for sound emulation</flag> - <flag name="capstone">Enable disassembly support with <pkg>dev-libs/capstone</pkg></flag> - <flag name="curl">Support ISOs / -cdrom directives via HTTP or HTTPS.</flag> - <flag name="fdt">Enables firmware device tree support</flag> - <flag name="glusterfs">Enables GlusterFS cluster fileystem via + <maintainer type="person"> + <email>tamiko@gentoo.org</email> + <name>Matthias Maier</name> + </maintainer> + <maintainer type="person"> + <email>slyfox@gentoo.org</email> + <name>Sergei Trofimovich</name> + </maintainer> + <maintainer type="project"> + <email>virtualization@gentoo.org</email> + <name>Gentoo Virtualization Project</name> + </maintainer> + + <use> + <flag name="accessibility">Adds support for braille displays using brltty</flag> + <flag name="aio">Enables support for Linux's Async IO</flag> + <flag name="alsa">Enable alsa output for sound emulation</flag> + <flag name="capstone">Enable disassembly support with <pkg>dev-libs/capstone</pkg></flag> + <flag name="curl">Support ISOs / -cdrom directives via HTTP or HTTPS.</flag> + <flag name="fdt">Enables firmware device tree support</flag> + <flag name="glusterfs">Enables GlusterFS cluster fileystem via <pkg>sys-cluster/glusterfs</pkg></flag> - <flag name="gnutls">Enable TLS support for the VNC console server. + <flag name="gnutls">Enable TLS support for the VNC console server. For 1.4 and newer this also enables WebSocket support. For 2.0 through 2.3 also enables disk quorum support.</flag> - <flag name="iscsi">Enable direct iSCSI support via + <flag name="iscsi">Enable direct iSCSI support via <pkg>net-libs/libiscsi</pkg> instead of indirectly via the Linux block layer that <pkg>sys-block/open-iscsi</pkg> does.</flag> - <flag name="io-uring">Enable efficient I/O via <pkg>sys-libs/liburing</pkg>.</flag> - <flag name="multipath">Enable multipath persistent reservation passthrough via + <flag name="io-uring">Enable efficient I/O via <pkg>sys-libs/liburing</pkg>.</flag> + <flag name="multipath">Enable multipath persistent reservation passthrough via <pkg>sys-fs/multipath-tools</pkg>.</flag> - <flag name="ncurses">Enable the ncurses-based console</flag> - <flag name="nfs">Enable NFS support</flag> - <flag name="numa">Enable NUMA support</flag> - <flag name="pin-upstream-blobs">Pin the versions of BIOS firmware to the version included in the upstream release. + <flag name="ncurses">Enable the ncurses-based console</flag> + <flag name="nfs">Enable NFS support</flag> + <flag name="numa">Enable NUMA support</flag> + <flag name="pin-upstream-blobs">Pin the versions of BIOS firmware to the version included in the upstream release. This is needed to sanely support migration/suspend/resume/snapshotting/etc... of instances. When the blobs are different, random corruption/bugs/crashes/etc... may be observed.</flag> - <flag name="plugins">Enable qemu plugin API via shared library loading.</flag> - <flag name="pulseaudio">Enable pulseaudio output for sound emulation</flag> - <flag name="rbd">Enable rados block device backend support, see http://ceph.newdream.net/wiki/QEMU-RBD</flag> - <flag name="sdl">Enable the SDL-based console</flag> - <flag name="sdl-image">SDL Image support for icons</flag> - <flag name="slirp">Enable TCP/IP in hypervisor via <pkg>net-libs/libslirp</pkg></flag> - <flag name="spice">Enable Spice protocol support via <pkg>app-emulation/spice</pkg></flag> - <flag name="ssh">Enable SSH based block device support via <pkg>net-libs/libssh2</pkg></flag> - <flag name="static-user">Build the User targets as static binaries</flag> - <flag name="static">Build the User and Software MMU (system) targets as well as tools as static binaries</flag> - <flag name="systemtap">Enable SystemTAP/DTrace tracing</flag> - <flag name="jemalloc">Enable jemalloc allocator support</flag> - <flag name="jpeg">Enable jpeg image support for the VNC console server</flag> - <flag name="png">Enable png image support for the VNC console server</flag> - <flag name="usb">Enable USB passthrough via <pkg>dev-libs/libusb</pkg></flag> - <flag name="usbredir">Use <pkg>sys-apps/usbredir</pkg> to redirect USB devices to another machine over TCP</flag> - <flag name="vde">Enable VDE-based networking</flag> - <flag name="vhost-net">Enable accelerated networking using vhost-net, see http://www.linux-kvm.org/page/VhostNet</flag> - <flag name="vhost-user-fs">Enable shared file system access using the FUSE protocol carried over virtio.</flag> - <flag name="virgl">Enable experimental Virgil 3d (virtual software GPU)</flag> - <flag name="virtfs">Enable VirtFS via virtio-9p-pci / fsdev. See http://wiki.qemu.org/Documentation/9psetup</flag> - <flag name="vte">Enable terminal support (<pkg>x11-libs/vte</pkg>) in the GTK+ interface</flag> - <flag name="xattr">Add support for getting and setting POSIX extended attributes, through + <flag name="plugins">Enable qemu plugin API via shared library loading.</flag> + <flag name="pulseaudio">Enable pulseaudio output for sound emulation</flag> + <flag name="rbd">Enable rados block device backend support, see http://ceph.newdream.net/wiki/QEMU-RBD</flag> + <flag name="sdl">Enable the SDL-based console</flag> + <flag name="sdl-image">SDL Image support for icons</flag> + <flag name="slirp">Enable TCP/IP in hypervisor via <pkg>net-libs/libslirp</pkg></flag> + <flag name="spice">Enable Spice protocol support via <pkg>app-emulation/spice</pkg></flag> + <flag name="ssh">Enable SSH based block device support via <pkg>net-libs/libssh2</pkg></flag> + <flag name="static-user">Build the User targets as static binaries</flag> + <flag name="static">Build the User and Software MMU (system) targets as well as tools as static binaries</flag> + <flag name="systemtap">Enable SystemTAP/DTrace tracing</flag> + <flag name="jemalloc">Enable jemalloc allocator support</flag> + <flag name="jpeg">Enable jpeg image support for the VNC console server</flag> + <flag name="png">Enable png image support for the VNC console server</flag> + <flag name="usb">Enable USB passthrough via <pkg>dev-libs/libusb</pkg></flag> + <flag name="usbredir">Use <pkg>sys-apps/usbredir</pkg> to redirect USB devices to another machine over TCP</flag> + <flag name="vde">Enable VDE-based networking</flag> + <flag name="vhost-net">Enable accelerated networking using vhost-net, see http://www.linux-kvm.org/page/VhostNet</flag> + <flag name="vhost-user-fs">Enable shared file system access using the FUSE protocol carried over virtio.</flag> + <flag name="virgl">Enable experimental Virgil 3d (virtual software GPU)</flag> + <flag name="virtfs">Enable VirtFS via virtio-9p-pci / fsdev. See http://wiki.qemu.org/Documentation/9psetup</flag> + <flag name="vte">Enable terminal support (<pkg>x11-libs/vte</pkg>) in the GTK+ interface</flag> + <flag name="xattr">Add support for getting and setting POSIX extended attributes, through <pkg>sys-apps/attr</pkg>. Requisite for the virtfs backend.</flag> - <flag name="xen">Enables support for Xen backends</flag> - <flag name="xfs">Support xfsctl() notification and syncing for XFS backed + <flag name="xen">Enables support for Xen backends</flag> + <flag name="xfs">Support xfsctl() notification and syncing for XFS backed virtual disks.</flag> - <flag name="xkb">Depend on x11-libs/libxkbcommon to build qemu-keymap tool for converting xkb keymaps</flag> - </use> -</pkgmetadata> + <flag name="xkb">Depend on x11-libs/libxkbcommon to build qemu-keymap tool for converting xkb keymaps</flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/qemu/qemu-5.2.0-r1.ebuild b/app-emulation/qemu/qemu-5.2.0-r1.ebuild index baec579454d4..1d529a45b31a 100644 --- a/app-emulation/qemu/qemu-5.2.0-r1.ebuild +++ b/app-emulation/qemu/qemu-5.2.0-r1.ebuild @@ -23,7 +23,7 @@ if [[ ${PV} = *9999* ]]; then SRC_URI="" else SRC_URI="https://download.qemu.org/${P}.tar.xz" - KEYWORDS="amd64 ~arm64 ~ppc ppc64 x86" + KEYWORDS="amd64 arm64 ~ppc ppc64 x86" fi DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" diff --git a/app-emulation/raft/metadata.xml b/app-emulation/raft/metadata.xml index a4ab5a34865a..34a46158e075 100644 --- a/app-emulation/raft/metadata.xml +++ b/app-emulation/raft/metadata.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>dev@liguros.net</email> - <name>Development</name> - </maintainer> - <upstream> - <remote-id type="github">canonical/raft</remote-id> - </upstream> - <origin>ports</origin> -</pkgmetadata> + <maintainer type="project"> + <email>dev@liguros.net</email> + <name>Development</name> + </maintainer> + <upstream> + <remote-id type="github">canonical/raft</remote-id> + </upstream> + <origin>ports</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/reg/metadata.xml b/app-emulation/reg/metadata.xml index 7496d961803e..02e0ec991cc7 100644 --- a/app-emulation/reg/metadata.xml +++ b/app-emulation/reg/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>williamh@gentoo.org</email> - <name>William Hubbs</name> - </maintainer> - <upstream> - <remote-id type="github">genuinetools/reg</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="person"> + <email>williamh@gentoo.org</email> + <name>William Hubbs</name> + </maintainer> + <upstream> + <remote-id type="github">genuinetools/reg</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/runc/metadata.xml b/app-emulation/runc/metadata.xml index 8b7ea39239c3..0a837d8fb2f2 100644 --- a/app-emulation/runc/metadata.xml +++ b/app-emulation/runc/metadata.xml @@ -1,30 +1,31 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <longdescription lang="en"> + <maintainer type="person"> + <email>williamh@gentoo.org</email> + <name>William Hubbs</name> + </maintainer> + <maintainer type="person"> + <email>gyakovlev@gentoo.org</email> + <name>Georgy Yakovlev</name> + </maintainer> + <longdescription lang="en"> runc is a CLI tool for spawning and running containers according to the OCF (Open Container Format) specification. </longdescription> - <maintainer type="person"> - <email>williamh@gentoo.org</email> - <name>William Hubbs</name> - </maintainer> - <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> - </maintainer> - <use> - <flag name="ambient"> + <upstream> + <remote-id type="github">opencontainers/runc</remote-id> + </upstream> + <use> + <flag name="ambient"> Enable support for ambient capabilities set (Requires Linux kernel 4.3 or later). </flag> - <flag name="apparmor"> + <flag name="apparmor"> Enable AppArmor support. </flag> - <flag name="kmem"> + <flag name="kmem"> Enable Kernel Memory Accounting. </flag> - </use> - <upstream> - <remote-id type="github">opencontainers/runc</remote-id> - </upstream> -</pkgmetadata> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/runv/metadata.xml b/app-emulation/runv/metadata.xml index af5a58145e7f..bab53a315fd9 100644 --- a/app-emulation/runv/metadata.xml +++ b/app-emulation/runv/metadata.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <use> - <flag name="libvirt">Enable support for KVM via libvirt</flag> - <flag name="xen">Enable support for the Xen Hypervisor</flag> - </use> - <upstream> - <remote-id type="github">hyperhq/runv</remote-id> - </upstream> -</pkgmetadata> + <upstream> + <remote-id type="github">hyperhq/runv</remote-id> + </upstream> + <use> + <flag name="libvirt">Enable support for KVM via libvirt</flag> + <flag name="xen">Enable support for the Xen Hypervisor</flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/s6-overlay/metadata.xml b/app-emulation/s6-overlay/metadata.xml index eae269410bf0..7651e2aad770 100644 --- a/app-emulation/s6-overlay/metadata.xml +++ b/app-emulation/s6-overlay/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>williamh@gentoo.org</email> - <name>William Hubbs</name> - </maintainer> - <upstream> - <remote-id type="github">just-containers/s6-overlay</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="person"> + <email>williamh@gentoo.org</email> + <name>William Hubbs</name> + </maintainer> + <upstream> + <remote-id type="github">just-containers/s6-overlay</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/sen/metadata.xml b/app-emulation/sen/metadata.xml index 75bfa9b4d173..5859349c7f94 100644 --- a/app-emulation/sen/metadata.xml +++ b/app-emulation/sen/metadata.xml @@ -1,20 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>nelo@wallus.de</email> - <name>Nelo-Thara Wallus</name> - </maintainer> - <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <upstream> - <remote-id type="github">TomasTomecek/sen</remote-id> - <remote-id type="pypi">sen</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="person"> + <email>nelo@wallus.de</email> + <name>Nelo-Thara Wallus</name> + </maintainer> + <maintainer type="person"> + <email>polynomial-c@gentoo.org</email> + <name>Lars Wendler</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">TomasTomecek/sen</remote-id> + <remote-id type="pypi">sen</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/simh/metadata.xml b/app-emulation/simh/metadata.xml index c5298995d2d4..6f45e891f6c2 100644 --- a/app-emulation/simh/metadata.xml +++ b/app-emulation/simh/metadata.xml @@ -1,8 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>slyfox@gentoo.org</email> - <name>Sergei Trofimovich</name> - </maintainer> -</pkgmetadata> + <maintainer type="person"> + <email>slyfox@gentoo.org</email> + <name>Sergei Trofimovich</name> + </maintainer> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/simplevirt/metadata.xml b/app-emulation/simplevirt/metadata.xml index 37f1f5f77e60..11deb9104333 100644 --- a/app-emulation/simplevirt/metadata.xml +++ b/app-emulation/simplevirt/metadata.xml @@ -1,12 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <maintainer status="active"> - <email>rafael@rafaelmartins.eng.br</email> - <name>Rafael G. Martins</name> - </maintainer> - <remote-id type="github">rafaelmartins/simplevirt</remote-id> - </upstream> -</pkgmetadata> + <upstream> + <remote-id type="github">rafaelmartins/simplevirt</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/ski/metadata.xml b/app-emulation/ski/metadata.xml index ab1c2fb53a4b..2ca9d369c2ec 100644 --- a/app-emulation/ski/metadata.xml +++ b/app-emulation/ski/metadata.xml @@ -1,14 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>slyfox@gentoo.org</email> - <name>Sergei Trofimovich</name> - </maintainer> - <use> - <flag name='debug'>enable extra binary emulation debugging via <pkg>sys-libs/binutils-libs</pkg></flag> - </use> - <upstream> - <remote-id type="sourceforge">ski</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="person"> + <email>slyfox@gentoo.org</email> + <name>Sergei Trofimovich</name> + </maintainer> + <upstream> + <remote-id type="sourceforge">ski</remote-id> + </upstream> + <use> + <flag name="debug">enable extra binary emulation debugging via <pkg>sys-libs/binutils-libs</pkg></flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/skopeo/metadata.xml b/app-emulation/skopeo/metadata.xml index 6027ac0be078..b1c46eb975ad 100644 --- a/app-emulation/skopeo/metadata.xml +++ b/app-emulation/skopeo/metadata.xml @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>williamh@gentoo.org</email> - <name>William Hubbs</name> - </maintainer> - <use> - <flag name="btrfs">Enables dependencies for the "btrfs" graph driver.</flag> - </use> -</pkgmetadata> + <maintainer type="person"> + <email>williamh@gentoo.org</email> + <name>William Hubbs</name> + </maintainer> + + <use> + <flag name="btrfs">Enables dependencies for the "btrfs" graph driver.</flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/slirp4netns/Manifest b/app-emulation/slirp4netns/Manifest index 33e69c6c548b..4ec0c31a67e8 100644 --- a/app-emulation/slirp4netns/Manifest +++ b/app-emulation/slirp4netns/Manifest @@ -1,2 +1,2 @@ -DIST slirp4netns-1.1.4.tar.gz 55346 BLAKE2B 86716ec9f42ae0087e9e7d142683f53b986275bce20b5ab0a33d0cdd63778adfeeadc86e5abb52d4a7e3e89baa0440c1a99bde920eeb2ed5293046e451d8ad01 SHA512 a6a26c55bdd4f50e668f7feeee3cd1d077e1ca9bd5bad5bbb8c47b15d366af4b1f2900241bedcd5a974a7597f43b17f970662271ec1987fbb6291c50470fa0a8 DIST slirp4netns-1.1.8.tar.gz 58022 BLAKE2B cb65af6a5298411c158dd3da8160f8e4999ce5cb6bafc85f233d4d64a58c545ff7e9db21501f718ce7990d2497a6960853ecb9ff548859b1be19f3d74e86610b SHA512 28b2dd73cfd0a0fc71338c55a7f4ae448456620a0d27eb1e7c79f2d58da2a90f2f9af363c9abf5148d4d6435f69ea26809e5f20721fec5daf4c9897bb29c3547 +DIST slirp4netns-1.1.9.tar.gz 58951 BLAKE2B e4fde408b3cd55dec0cca495c58936ec32c6201a0fe63c1a9fc9502ac41da615f92271d5fb365475f6864dd3c195097c81f01268b1b8d10d0f888c4e154cac34 SHA512 6471bf2b2eff9bd3ef037de986ab612f20bfce7a52bfd2b1b434d0606a3d2e6170b3fc43b168c8cc6f56ffb82f8361f21a26522ac1092c71f6e694a9588d5854 diff --git a/app-emulation/slirp4netns/metadata.xml b/app-emulation/slirp4netns/metadata.xml index e7dbf873de1f..00b8bf167b19 100644 --- a/app-emulation/slirp4netns/metadata.xml +++ b/app-emulation/slirp4netns/metadata.xml @@ -1,15 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>zmedico@gentoo.org</email> - <name>Zac Medico</name> - </maintainer> - <maintainer type="person"> - <email>g.braeunlich@disroot.org</email> - <name>Gerhard Bräunlich</name> - </maintainer> - <upstream> - <remote-id type="github">rootless-containers/slirp4netns</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="person"> + <email>zmedico@gentoo.org</email> + <name>Zac Medico</name> + </maintainer> + <maintainer type="person"> + <email>g.braeunlich@disroot.org</email> + <name>Gerhard Bräunlich</name> + </maintainer> + <upstream> + <remote-id type="github">rootless-containers/slirp4netns</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/slirp4netns/slirp4netns-1.1.4.ebuild b/app-emulation/slirp4netns/slirp4netns-1.1.9.ebuild index ab7c659fa363..619879cf45b4 100644 --- a/app-emulation/slirp4netns/slirp4netns-1.1.4.ebuild +++ b/app-emulation/slirp4netns/slirp4netns-1.1.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/app-emulation/snapd/metadata.xml b/app-emulation/snapd/metadata.xml index 2d641fece55b..52a73c22acf3 100644 --- a/app-emulation/snapd/metadata.xml +++ b/app-emulation/snapd/metadata.xml @@ -1,22 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>zmedico@gentoo.org</email> - <name>Zac Medico</name> - </maintainer> - <upstream> - <remote-id type="github">snapcore/snapd</remote-id> - </upstream> - <use> - <flag name="apparmor"> + <maintainer type="person"> + <email>zmedico@gentoo.org</email> + <name>Zac Medico</name> + </maintainer> + <upstream> + <remote-id type="github">snapcore/snapd</remote-id> + </upstream> + <use> + <flag name="apparmor"> Enable AppArmor support. </flag> - <flag name="cgroup-hybrid"> + <flag name="cgroup-hybrid"> Default to hybrid (legacy) cgroup hierarchy instead of unified (modern). </flag> - <flag name="forced-devmode"> + <flag name="forced-devmode"> Automatically disable application confinement if feature detection fails. </flag> - </use> -</pkgmetadata> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/softgun/metadata.xml b/app-emulation/softgun/metadata.xml index a1d277727e3a..96b33ba46311 100644 --- a/app-emulation/softgun/metadata.xml +++ b/app-emulation/softgun/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>arm@gentoo.org</email> - <name>Gentoo Linux ARM Development</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">softgun</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="project"> + <email>arm@gentoo.org</email> + <name>Gentoo Linux ARM Development</name> + </maintainer> + <upstream> + <remote-id type="sourceforge">softgun</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/softgun/softgun-0.22.ebuild b/app-emulation/softgun/softgun-0.22.ebuild index 99531de6b345..554f0386ca0f 100644 --- a/app-emulation/softgun/softgun-0.22.ebuild +++ b/app-emulation/softgun/softgun-0.22.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit toolchain-funcs eutils +inherit flag-o-matic toolchain-funcs DESCRIPTION="ARM software emulator" HOMEPAGE="https://sourceforge.net/projects/softgun/" @@ -12,13 +12,15 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" DEPEND="media-libs/alsa-lib" -RDEPEND="" +RDEPEND="${DEPEND}" -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.22-make.patch +PATCHES=( "${FILESDIR}"/${PN}-0.22-make.patch ) + +src_configure() { + append-cflags -fcommon + default } src_compile() { diff --git a/app-emulation/spectemu/metadata.xml b/app-emulation/spectemu/metadata.xml index 6f49eba8f496..83d00b14c8d4 100644 --- a/app-emulation/spectemu/metadata.xml +++ b/app-emulation/spectemu/metadata.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> -</pkgmetadata> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/spice-html5/metadata.xml b/app-emulation/spice-html5/metadata.xml index 4567d53b9b82..97688ae517b8 100644 --- a/app-emulation/spice-html5/metadata.xml +++ b/app-emulation/spice-html5/metadata.xml @@ -1,16 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>prometheanfire@gentoo.org</email> - <name>Matthew Thode</name> - </maintainer> - <maintainer type="project"> - <email>openstack@gentoo.org</email> - <name>Openstack</name> - </maintainer> - <maintainer type="project"> - <email>virtualization@gentoo.org</email> - <name>Gentoo Virtualization Project</name> - </maintainer> -</pkgmetadata> + <maintainer type="person"> + <email>prometheanfire@gentoo.org</email> + <name>Matthew Thode</name> + </maintainer> + <maintainer type="project"> + <email>openstack@gentoo.org</email> + <name>Openstack</name> + </maintainer> + <maintainer type="project"> + <email>virtualization@gentoo.org</email> + <name>Gentoo Virtualization Project</name> + </maintainer> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/spice-protocol/metadata.xml b/app-emulation/spice-protocol/metadata.xml index 121cd46cb5e1..a18f7729c1f3 100644 --- a/app-emulation/spice-protocol/metadata.xml +++ b/app-emulation/spice-protocol/metadata.xml @@ -1,8 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>virtualization@gentoo.org</email> - <name>Gentoo Virtualization Project</name> - </maintainer> -</pkgmetadata> + <maintainer type="project"> + <email>virtualization@gentoo.org</email> + <name>Gentoo Virtualization Project</name> + </maintainer> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/spice-protocol/spice-protocol-9999.ebuild b/app-emulation/spice-protocol/spice-protocol-9999.ebuild index a2dc0bc3006d..d2d8fbb6a858 100644 --- a/app-emulation/spice-protocol/spice-protocol-9999.ebuild +++ b/app-emulation/spice-protocol/spice-protocol-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,6 @@ if [[ ${PV} = *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-protocol.git" SRC_URI="" - KEYWORDS="" else SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2" KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" diff --git a/app-emulation/spice-vdagent/metadata.xml b/app-emulation/spice-vdagent/metadata.xml index 121cd46cb5e1..a18f7729c1f3 100644 --- a/app-emulation/spice-vdagent/metadata.xml +++ b/app-emulation/spice-vdagent/metadata.xml @@ -1,8 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>virtualization@gentoo.org</email> - <name>Gentoo Virtualization Project</name> - </maintainer> -</pkgmetadata> + <maintainer type="project"> + <email>virtualization@gentoo.org</email> + <name>Gentoo Virtualization Project</name> + </maintainer> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/spice/metadata.xml b/app-emulation/spice/metadata.xml index ee309bddf45f..99d535e8ebd0 100644 --- a/app-emulation/spice/metadata.xml +++ b/app-emulation/spice/metadata.xml @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>virtualization@gentoo.org</email> - <name>Gentoo Virtualization Project</name> - </maintainer> - <use> - <flag name="smartcard">Enable smartcard remoting using <pkg>app-emulation/libcacard</pkg></flag> - </use> -</pkgmetadata> + <maintainer type="project"> + <email>virtualization@gentoo.org</email> + <name>Gentoo Virtualization Project</name> + </maintainer> + + <use> + <flag name="smartcard">Enable smartcard remoting using <pkg>app-emulation/libcacard</pkg></flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/spim/metadata.xml b/app-emulation/spim/metadata.xml index 9d9f29c5239c..ed937a1357ab 100644 --- a/app-emulation/spim/metadata.xml +++ b/app-emulation/spim/metadata.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <longdescription lang="en"> + <longdescription lang="en"> A self-contained simulator that will run MIPS32 assembly language programs. It also provides a simple debugger and a minimal set of operating system services. </longdescription> - <upstream> - <remote-id type="sourceforge">spimsimulator</remote-id> - </upstream> -</pkgmetadata> + <upstream> + <remote-id type="sourceforge">spimsimulator</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/stellar/metadata.xml b/app-emulation/stellar/metadata.xml index 7d439e8aba91..7cf1ac1fff23 100644 --- a/app-emulation/stellar/metadata.xml +++ b/app-emulation/stellar/metadata.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>toffanin.mauro@gmail.com</email> - <name>Mauro Toffanin</name> - <description>Maintainer. Assign bugs to him</description> - </maintainer> -</pkgmetadata> + <maintainer type="person"> + <email>toffanin.mauro@gmail.com</email> + <name>Mauro Toffanin</name> + <description>Maintainer. Assign bugs to him</description> + </maintainer> + + <origin>go-overlay</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/uade/metadata.xml b/app-emulation/uade/metadata.xml index 78274e0fa550..1b8db8b4c1d6 100644 --- a/app-emulation/uade/metadata.xml +++ b/app-emulation/uade/metadata.xml @@ -1,8 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>games@gentoo.org</email> - <name>Gentoo Games Project</name> -</maintainer> -</pkgmetadata> + <maintainer type="project"> + <email>games@gentoo.org</email> + <name>Gentoo Games Project</name> + </maintainer> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/umoci/Manifest b/app-emulation/umoci/Manifest index 826a5a188950..0f09907185d6 100644 --- a/app-emulation/umoci/Manifest +++ b/app-emulation/umoci/Manifest @@ -1 +1,2 @@ DIST umoci-0.2.1.tar.gz 241472 BLAKE2B 2802fcb14e717a6460f9dc06226d3b430cce2181838a32064e86987131317947a4b117e91d11f981fa1df027804dbf2d92472b5c21749783b4f2ed371c699e7e SHA512 dfd7bbd1afd232400a9bffaf6c074d28ce4ce696c9f3c70bd436cc41b96928415d0793d57b1cf34dd70efd7d0e5eb567eaeea65d793c27ff9ea46fb190bd1807 +DIST umoci-0.4.6.tar.gz 2273608 BLAKE2B d5a36c78918697b9c8f54a5c4b914a9124b5e989dff3efc81a9f64f1bd276189d15a565a6ec2e8d4021925017e9a7a17f7cc5359a552f7c57dda414c25d2fb02 SHA512 0614dd583e00b6e2e69256f1ae1d3316e5bb5989a177d18c5ceacf3af18ab82ccf8edef879b6c813855d878d5af53c541ac433d81e6c20796885a26c57564118 diff --git a/app-emulation/umoci/metadata.xml b/app-emulation/umoci/metadata.xml index c36c37139fad..53c5cdf5c8dd 100644 --- a/app-emulation/umoci/metadata.xml +++ b/app-emulation/umoci/metadata.xml @@ -1,8 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>williamh@gentoo.org</email> - <name>William Hubbs</name> - </maintainer> -</pkgmetadata> + <maintainer type="person"> + <email>williamh@gentoo.org</email> + <name>William Hubbs</name> + </maintainer> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/umoci/umoci-0.4.6.ebuild b/app-emulation/umoci/umoci-0.4.6.ebuild new file mode 100644 index 000000000000..f315c80c886b --- /dev/null +++ b/app-emulation/umoci/umoci-0.4.6.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +COMMIT=5efa06acfb3bb4e65d2711cf5255970948e047cf +inherit go-module + +DESCRIPTION="Manipulation tool for OCI images" +HOMEPAGE="https://github.com/opencontainers/umoci" +SRC_URI="https://github.com/opencontainers/umoci/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" + +BDEPEND="dev-go/go-md2man" + +RESTRICT+=" test " + +src_compile() { + go build -buildmode=pie -mod=vendor \ + -ldflags "-w -X main.gitCommit=${COMMIT} -X main.version=${PV}" \ + -o "bin/${PN}" ./cmd/${PN} || die + cd doc/man + for f in *.1.md; do + go-md2man -in ${f} -out ${f%%.md} || die + done +} + +src_install() { + dobin bin/${PN} + doman doc/man/*.1 + dodoc CHANGELOG.md + einstalldocs +} diff --git a/app-emulation/vagrant/metadata.xml b/app-emulation/vagrant/metadata.xml index 4f92768cfae5..24caf2f5246e 100644 --- a/app-emulation/vagrant/metadata.xml +++ b/app-emulation/vagrant/metadata.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <use> - <flag name="virtualbox"> + <upstream> + <remote-id type="github">hashicorp/vagrant</remote-id> + </upstream> + <use> + <flag name="virtualbox"> Use VirtualBox provider. </flag> - </use> - <upstream> - <remote-id type="github">hashicorp/vagrant</remote-id> - </upstream> -</pkgmetadata> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/vendor-reset/metadata.xml b/app-emulation/vendor-reset/metadata.xml index 95a133672a10..eaa271407b35 100644 --- a/app-emulation/vendor-reset/metadata.xml +++ b/app-emulation/vendor-reset/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>sarnex@gentoo.org</email> - <name>Nick Sarnie</name> - </maintainer> - <upstream> - <remote-id type="github">gnif/vendor-reset</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="person"> + <email>sarnex@gentoo.org</email> + <name>Nick Sarnie</name> + </maintainer> + <upstream> + <remote-id type="github">gnif/vendor-reset</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/vice/metadata.xml b/app-emulation/vice/metadata.xml index 2294b11c8d08..8a7e409c1fe1 100644 --- a/app-emulation/vice/metadata.xml +++ b/app-emulation/vice/metadata.xml @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>games@gentoo.org</email> - <name>Gentoo Games Project</name> - </maintainer> - <use> - <flag name="ethernet">Enable ethernet emulation</flag> - <flag name="headless">Include the headless variant of the emulator</flag> - <flag name="mpg123">Enable mp3@64 cartridge support</flag> - <flag name="parport">Enable parallel port SID support</flag> - <flag name="pci">Enable PCI device discovery using <pkg>sys-apps/pciutils</pkg></flag> - </use> - <upstream> - <remote-id type="sourceforge">vice-emu</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="project"> + <email>games@gentoo.org</email> + <name>Gentoo Games Project</name> + </maintainer> + <upstream> + <remote-id type="sourceforge">vice-emu</remote-id> + </upstream> + <use> + <flag name="ethernet">Enable ethernet emulation</flag> + <flag name="headless">Include the headless variant of the emulator</flag> + <flag name="mpg123">Enable mp3@64 cartridge support</flag> + <flag name="parport">Enable parallel port SID support</flag> + <flag name="pci">Enable PCI device discovery using <pkg>sys-apps/pciutils</pkg></flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/virt-manager/metadata.xml b/app-emulation/virt-manager/metadata.xml index 024a5205e500..8d098657544e 100644 --- a/app-emulation/virt-manager/metadata.xml +++ b/app-emulation/virt-manager/metadata.xml @@ -1,19 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>virtualization@gentoo.org</email> - <name>Gentoo Virtualization Project</name> - </maintainer> - <use> - <flag name="policykit"> + <maintainer type="project"> + <email>virtualization@gentoo.org</email> + <name>Gentoo Virtualization Project</name> + </maintainer> + + <use> + <flag name="policykit"> Enables <pkg>sys-auth/polkit</pkg> authentication support, required when using <pkg>app-emulation/libvirt</pkg> with PolicyKit authentication </flag> - <flag name="sasl"> + <flag name="sasl"> Depend on the proper libraries needed to connect to SASL-enabled libvirtd instances (e.g. Kerberos-protected instances). </flag> - </use> -</pkgmetadata> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/virt-viewer/metadata.xml b/app-emulation/virt-viewer/metadata.xml index 3311e82897cd..82e7d0069bf4 100644 --- a/app-emulation/virt-viewer/metadata.xml +++ b/app-emulation/virt-viewer/metadata.xml @@ -1,16 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>virtualization@gentoo.org</email> - <name>Gentoo Virtualization Project</name> - </maintainer> - <use> - <flag name="libvirt">Support connecting to virtual machines + <maintainer type="project"> + <email>virtualization@gentoo.org</email> + <name>Gentoo Virtualization Project</name> + </maintainer> + + <use> + <flag name="libvirt">Support connecting to virtual machines managed by libvirt.</flag> - <flag name="spice">Support connecting to SPICE-enabled virtual + <flag name="spice">Support connecting to SPICE-enabled virtual machines.</flag> - <flag name="vnc">Support connecting to VNC-enabled virtual + <flag name="vnc">Support connecting to VNC-enabled virtual machines.</flag> - </use> -</pkgmetadata> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/virt-what/metadata.xml b/app-emulation/virt-what/metadata.xml index 5bdec46056c4..c7021c746dad 100644 --- a/app-emulation/virt-what/metadata.xml +++ b/app-emulation/virt-what/metadata.xml @@ -1,15 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>eva@gentoo.org</email> - <name>Gilles Dartiguelongue</name> - </maintainer> - <maintainer type="person"> - <email>prometheanfire@gentoo.org</email> - <name>Matthew Thode</name> - </maintainer> - <use> - <flag name="dmi">Use <pkg>sys-apps/dmidecode</pkg> to read firmware data</flag> - </use> -</pkgmetadata> + <maintainer type="person"> + <email>eva@gentoo.org</email> + <name>Gilles Dartiguelongue</name> + </maintainer> + <maintainer type="person"> + <email>prometheanfire@gentoo.org</email> + <name>Matthew Thode</name> + </maintainer> + + <use> + <flag name="dmi">Use <pkg>sys-apps/dmidecode</pkg> to read firmware data</flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/virtio-win/metadata.xml b/app-emulation/virtio-win/metadata.xml index d155fdbc0406..5e360b52f664 100644 --- a/app-emulation/virtio-win/metadata.xml +++ b/app-emulation/virtio-win/metadata.xml @@ -1,12 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>gentoo@aisha.cc</email> - <name>Aisha Tammy</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> -</pkgmetadata> + <maintainer type="person"> + <email>gentoo@aisha.cc</email> + <name>Aisha Tammy</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/virtualbox-additions/metadata.xml b/app-emulation/virtualbox-additions/metadata.xml index 8dafc466cde2..995059d8dc6c 100644 --- a/app-emulation/virtualbox-additions/metadata.xml +++ b/app-emulation/virtualbox-additions/metadata.xml @@ -1,9 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> - </maintainer> - </pkgmetadata> - + <maintainer type="person"> + <email>polynomial-c@gentoo.org</email> + <name>Lars Wendler</name> + </maintainer> + <upstream> + <remote-id type="cpe">cpe:/a:oracle:vm_virtualbox</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/virtualbox-extpack-oracle/metadata.xml b/app-emulation/virtualbox-extpack-oracle/metadata.xml index 8dafc466cde2..f1864795debb 100644 --- a/app-emulation/virtualbox-extpack-oracle/metadata.xml +++ b/app-emulation/virtualbox-extpack-oracle/metadata.xml @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> - </maintainer> - </pkgmetadata> - + <maintainer type="person"> + <email>polynomial-c@gentoo.org</email> + <name>Lars Wendler</name> + </maintainer> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/virtualbox-guest-additions/metadata.xml b/app-emulation/virtualbox-guest-additions/metadata.xml index 8dafc466cde2..995059d8dc6c 100644 --- a/app-emulation/virtualbox-guest-additions/metadata.xml +++ b/app-emulation/virtualbox-guest-additions/metadata.xml @@ -1,9 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> - </maintainer> - </pkgmetadata> - + <maintainer type="person"> + <email>polynomial-c@gentoo.org</email> + <name>Lars Wendler</name> + </maintainer> + <upstream> + <remote-id type="cpe">cpe:/a:oracle:vm_virtualbox</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.18-linux-5.11.patch b/app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.18-linux-5.11.patch new file mode 100644 index 000000000000..844e37e9fda7 --- /dev/null +++ b/app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.18-linux-5.11.patch @@ -0,0 +1,16 @@ +Fixes build with kernel 5.11. + +Bug: https://www.virtualbox.org/ticket/20198 +Bug: https://bugs.gentoo.org/762994 +From: jospezial@gmx.de + +--- a/vboxnetflt/linux/VBoxNetFlt-linux.c ++++ b/vboxnetflt/linux/VBoxNetFlt-linux.c +@@ -38,6 +38,7 @@ + #include <linux/nsproxy.h> + #endif + #include <linux/netdevice.h> ++#include <linux/ethtool.h> + #include <linux/etherdevice.h> + #include <linux/rtnetlink.h> + #include <linux/miscdevice.h> diff --git a/app-emulation/virtualbox-modules/metadata.xml b/app-emulation/virtualbox-modules/metadata.xml index b55a81b4e004..9b774ab6a536 100644 --- a/app-emulation/virtualbox-modules/metadata.xml +++ b/app-emulation/virtualbox-modules/metadata.xml @@ -1,12 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> - </maintainer> - <use> - <flag name="pax_kernel">Apply patch needed for pax enabled kernels</flag> - </use> -</pkgmetadata> - + <maintainer type="person"> + <email>polynomial-c@gentoo.org</email> + <name>Lars Wendler</name> + </maintainer> + <upstream> + <remote-id type="cpe">cpe:/a:oracle:vm_virtualbox</remote-id> + </upstream> + <use> + <flag name="pax_kernel">Apply patch needed for pax enabled kernels</flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild index a884e1456d03..bbc7f312dbe5 100644 --- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild +++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild @@ -29,6 +29,10 @@ MODULESD_VBOXDRV_ENABLED="yes" MODULESD_VBOXNETADP_ENABLED="no" MODULESD_VBOXNETFLT_ENABLED="no" +PATCHES=( + "${FILESDIR}/${P}-linux-5.11.patch" #762994 +) + pkg_setup() { linux-mod_pkg_setup BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1" diff --git a/app-emulation/virtualbox/metadata.xml b/app-emulation/virtualbox/metadata.xml index 3a2ea79813a6..bf938fa03958 100644 --- a/app-emulation/virtualbox/metadata.xml +++ b/app-emulation/virtualbox/metadata.xml @@ -1,11 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> - </maintainer> - <use> + <maintainer type="person"> + <email>polynomial-c@gentoo.org</email> + <name>Lars Wendler</name> + </maintainer> + <upstream> + <remote-id type="cpe">cpe:/a:oracle:vm_virtualbox</remote-id> + </upstream> + <use> <flag name="dtrace">Install dtrace Extension Pack</flag> <flag name="headless">Build without any graphic frontend</flag> <flag name="lvm">Build VBoxVolInfo that needs devicemapper from <pkg>sys-fs/lvm2</pkg>.</flag> @@ -13,6 +16,6 @@ <flag name="sdk">Enable building of SDK</flag> <flag name="udev">Controls installation of special USB udev rules.</flag> <flag name="vboxwebsrv">Build and install the VirtualBox webservice</flag> -</use> -</pkgmetadata> - + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/vkd3d/metadata.xml b/app-emulation/vkd3d/metadata.xml index cad91c2cdfde..39ab6a54b4c3 100644 --- a/app-emulation/vkd3d/metadata.xml +++ b/app-emulation/vkd3d/metadata.xml @@ -1,15 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>wine@gentoo.org</email> - <name>Wine</name> - <description> - This package must be kept in sync with repo/proj/wine repository. - Any changes need to be run past the maintainer to ensure the two repositories are kept in sync. - </description> - </maintainer> - <use> - <flag name="spirv-tools">Enable SPIRV shader debugging support using <pkg>dev-util/spirv-tools</pkg></flag> - </use> -</pkgmetadata> + <maintainer type="project"> + <email>wine@gentoo.org</email> + <name>Wine</name> + <description>
			This package must be kept in sync with repo/proj/wine repository.
			Any changes need to be run past the maintainer to ensure the two repositories are kept in sync.
		</description> + </maintainer> + + <use> + <flag name="spirv-tools">Enable SPIRV shader debugging support using <pkg>dev-util/spirv-tools</pkg></flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/vmware-modules/metadata.xml b/app-emulation/vmware-modules/metadata.xml index 7d9b42fbb205..f902059e5aec 100644 --- a/app-emulation/vmware-modules/metadata.xml +++ b/app-emulation/vmware-modules/metadata.xml @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>stefantalpalaru@yahoo.com</email> - <name>Ștefan Talpalaru</name> - </maintainer> - <longdescription> + <maintainer type="person"> + <email>stefantalpalaru@yahoo.com</email> + <name>Ștefan Talpalaru</name> + </maintainer> + <longdescription> VMware kernel modules. </longdescription> -</pkgmetadata> + + <origin>stefantalpalaru-overlay</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/vmware-workstation/metadata.xml b/app-emulation/vmware-workstation/metadata.xml index bb5a91dad9ce..70804ede79d3 100644 --- a/app-emulation/vmware-workstation/metadata.xml +++ b/app-emulation/vmware-workstation/metadata.xml @@ -1,33 +1,35 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>stefantalpalaru@yahoo.com</email> - <name>Ștefan Talpalaru</name> - </maintainer> - <longdescription> + <maintainer type="person"> + <email>stefantalpalaru@yahoo.com</email> + <name>Ștefan Talpalaru</name> + </maintainer> + <longdescription> VMWare Workstation is a virtual machine which can be used to install other operating systems in a virtual environment to run on top of Gentoo. </longdescription> - <use> - <flag name="macos-guests">Support macOS guests.</flag> - <flag name="modules">Install <pkg>app-emulation/vmware-modules</pkg> in order to run VMs locally.</flag> - <flag name="ovftool">Install OVF tool.</flag> - <flag name="vix">Install VIX. The VIX API allows you to write programs and scripts + <upstream> + <remote-id type="github">akhuettel/systemd-vmware</remote-id> + <remote-id type="cpe">cpe:/a:vmware:workstation</remote-id> + </upstream> + <use> + <flag name="macos-guests">Support macOS guests.</flag> + <flag name="modules">Install <pkg>app-emulation/vmware-modules</pkg> in order to run VMs locally.</flag> + <flag name="ovftool">Install OVF tool.</flag> + <flag name="vix">Install VIX. The VIX API allows you to write programs and scripts that automate virtual machine operations, and run programs or manipulate files within guest operating systems. </flag> - <flag name="vmware-tools-darwin">Install VMware Tools for OS X (El Capitan and later) guests.</flag> - <flag name="vmware-tools-darwinPre15">Install VMware Tools for OS X (up to Yosemite) guests.</flag> - <flag name="vmware-tools-linux">Install VMware Tools for Linux guests.</flag> - <flag name="vmware-tools-linuxPreGlibc25">Install VMware Tools for Linux (glibc older than 2.5) guests.</flag> - <flag name="vmware-tools-netware">Install VMware Tools for Netware guests.</flag> - <flag name="vmware-tools-solaris">Install VMware Tools for Solaris guests.</flag> - <flag name="vmware-tools-windows">Install VMware Tools for Windows (Vista and later) guests.</flag> - <flag name="vmware-tools-winPre2k">Install VMware Tools for Windows (before 2000) guests.</flag> - <flag name="vmware-tools-winPreVista">Install VMware Tools for Windows (after 2000, before Vista) guests.</flag> - </use> - <upstream> - <remote-id type="github">akhuettel/systemd-vmware</remote-id> - </upstream> -</pkgmetadata> + <flag name="vmware-tools-darwin">Install VMware Tools for OS X (El Capitan and later) guests.</flag> + <flag name="vmware-tools-darwinPre15">Install VMware Tools for OS X (up to Yosemite) guests.</flag> + <flag name="vmware-tools-linux">Install VMware Tools for Linux guests.</flag> + <flag name="vmware-tools-linuxPreGlibc25">Install VMware Tools for Linux (glibc older than 2.5) guests.</flag> + <flag name="vmware-tools-netware">Install VMware Tools for Netware guests.</flag> + <flag name="vmware-tools-solaris">Install VMware Tools for Solaris guests.</flag> + <flag name="vmware-tools-windows">Install VMware Tools for Windows (Vista and later) guests.</flag> + <flag name="vmware-tools-winPre2k">Install VMware Tools for Windows (before 2000) guests.</flag> + <flag name="vmware-tools-winPreVista">Install VMware Tools for Windows (after 2000, before Vista) guests.</flag> + </use> + <origin>stefantalpalaru-overlay</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/wine-desktop-common/metadata.xml b/app-emulation/wine-desktop-common/metadata.xml index 751c88a7bada..bf4eacaef37d 100644 --- a/app-emulation/wine-desktop-common/metadata.xml +++ b/app-emulation/wine-desktop-common/metadata.xml @@ -1,15 +1,16 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>NP-Hardass@gentoo.org</email> - <name>NP-Hardass</name> - </maintainer> - <maintainer type="project"> - <email>wine@gentoo.org</email> - <name>Wine</name> - </maintainer> - <upstream> - <remote-id type="github">NP-Hardass/wine-desktop-common</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="person"> + <email>NP-Hardass@gentoo.org</email> + <name>NP-Hardass</name> + </maintainer> + <maintainer type="project"> + <email>wine@gentoo.org</email> + <name>Wine</name> + </maintainer> + <upstream> + <remote-id type="github">NP-Hardass/wine-desktop-common</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/wine-gecko/metadata.xml b/app-emulation/wine-gecko/metadata.xml index 921f5a737f83..0ac360d226f4 100644 --- a/app-emulation/wine-gecko/metadata.xml +++ b/app-emulation/wine-gecko/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>wine@gentoo.org</email> - <name>Wine</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">wine/wine-gecko</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="project"> + <email>wine@gentoo.org</email> + <name>Wine</name> + </maintainer> + <upstream> + <remote-id type="sourceforge">wine/wine-gecko</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/wine-mono/Manifest b/app-emulation/wine-mono/Manifest index 89c21b04c9df..da1ab8c9e1b4 100644 --- a/app-emulation/wine-mono/Manifest +++ b/app-emulation/wine-mono/Manifest @@ -13,3 +13,4 @@ DIST wine-mono-4.9.4.msi 95266304 BLAKE2B fb9c81f8ac8fca104f766d62b02c8751b5b7b9 DIST wine-mono-5.0.0-x86.msi 79537664 BLAKE2B f5a4185a7a63a1c1966d871d4c8d5bae07d3bbbc3153f20847c3919ac87be5644e15b45764286483641d9ce19176f79c7c7544e543fad62032ef5302a66ea8ea SHA512 8f83122d4b552b3a3d8b000abbd19b7a72edf45e52fa63a9220228240d8e4c014531bb265d062a38f6924fae07dd45420a5c7566f99e0c471e116fb80906c08c DIST wine-mono-5.1.0-x86.msi 84094976 BLAKE2B 25b044696f46810a843c17117f61532de3d4922f202e5acc2106b67f99eda6d359a799dd53ac4801380e81fdb5929c29e09a4923df99bf104b462ac77c682f29 SHA512 c4013307ba43121346f11881a30ff83d4921e0563a1ad3ff1adc34373f7bda5d5f6ad8c46bafe11c13ca372075333562864e073fe944428225b01fb885f9532f DIST wine-mono-5.1.1-x86.msi 84130304 BLAKE2B 05a5344b59249a758443cf91670eaef71d9ad3a3024b11442a8d3512ba54356439d503629fa799e2454975f47c0eaf6ff9e25ed61b020f29efceacc78347d578 SHA512 c518b93a470cc897abaf1dba18cc773dca0df62a28d35f32f2ddbe39b4de616c0307545bea5dc3ca87a01fd96b47feb3e1d8c3778106304b9cc08ebb3d1d665f +DIST wine-mono-6.0.0-x86.msi 87507456 BLAKE2B b3cd3c767ecab3f679f82ad5efe393c10bd87261b48d25804ac4fa200eeadae74f73ca59b6b31f2d64695f1ea28e43ea333fadc78bb4f0c3d97d22087667548d SHA512 04a499429572a88308c3b906d4f729648b0a5bdf53f24e3630b14f644aaaf6d9be603f08cc76e25a35010f9e347b4b93c308bab417e5e64a801050f932ea176b diff --git a/app-emulation/wine-mono/metadata.xml b/app-emulation/wine-mono/metadata.xml index a64284bc1ee9..2155dd3f67ed 100644 --- a/app-emulation/wine-mono/metadata.xml +++ b/app-emulation/wine-mono/metadata.xml @@ -1,14 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>wine@gentoo.org</email> - <name>Wine</name> - </maintainer> - <longdescription> + <maintainer type="project"> + <email>wine@gentoo.org</email> + <name>Wine</name> + </maintainer> + <longdescription> Wine Mono is a package containing Mono and other projects, intended as a replacement for the .NET runtime and class libraries in Wine. It works in conjunction with Wine's builtin mscoree.dll, and it is not intended to be useful for any other purpose. </longdescription> - <upstream> - <remote-id type="github">madewokherd/wine-mono</remote-id> - </upstream> -</pkgmetadata> + <upstream> + <remote-id type="github">madewokherd/wine-mono</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/wine-mono/wine-mono-6.0.0.ebuild b/app-emulation/wine-mono/wine-mono-6.0.0.ebuild new file mode 100644 index 000000000000..0860b6bcb4b4 --- /dev/null +++ b/app-emulation/wine-mono/wine-mono-6.0.0.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Wine Mono is a replacement for the .NET runtime and class libraries in Wine" +HOMEPAGE="https://www.winehq.org/" +SRC_URI="https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.msi" + +LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1" +SLOT="${PV}" +KEYWORDS="~amd64 ~x86" + +DEPEND="!!app-emulation/wine:0" + +S="${WORKDIR}" + +src_install() { + insinto /usr/share/wine/mono + doins "${DISTDIR}/${P}-x86.msi" +} diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest index b6998a2cec34..3c1cd9c18d5c 100644 --- a/app-emulation/wine-staging/Manifest +++ b/app-emulation/wine-staging/Manifest @@ -1,11 +1,9 @@ DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75 -DIST wine-5.20.tar.xz 24177960 BLAKE2B 50169bc00497feef91f5cf7fd56bce8f7784f70d2a24776494d0ab98cdb70b4387a92dece4571b2b22b15c42d82672595f39079a0678e551331f2bee4460f0f8 SHA512 30299287857376a827579335ba410d0575379df300860c8fdd50473f3eec074372d3602e5027f9e75fb13e272f28f51950ec652109839573a168aed23ba9c8f4 -DIST wine-5.21.tar.xz 24178740 BLAKE2B 9d6b2766536fb019d69dbffc8dbae0004eeb6d5b3d3f57d0577b4952159b9a5388d1f767d982b3837d713175ac7baec47c7b017e21f4fb586d3d97707491066e SHA512 0879e4edeca60880799736ac831f8ae28c6e5156dde161685aa84a5d8bd20c4f3a51a178fa2b130a9e8af44432bb239160a04829fcef5d8332e2bbf829d2bc18 -DIST wine-5.22.tar.xz 24214812 BLAKE2B 7bc093501cb20fbe52e277aadb867e4f55abc9898ae570aebf3496c2f7938129498e6ad8b6de7f8efe28ccffee734c94754da703e0c5d6bad6c1293cefb42c0e SHA512 9e86a1f74a142513121c155ffa5e1dd863ecc00092952878f44185725e81793fd7291e0e3c93275cd0d083d17af99eb1d8feba1c96e8607f44919b9045737271 DIST wine-6.0.tar.xz 24192280 BLAKE2B baf0eee582190ede8d210390b51d330c1879cb442100bc2e957052898fbd84bcc047a885065f9bf96ac4f072f92eee44f0e1c3baddc68937286e7cc6f976bd4e SHA512 c0732fbab1da8737d595a876b28ce87eef1440c317746e798642b59b44b34e890de562e0c0cc674e97096f39db82f8e9c3b1cc1ba9edc246b7266a0f7cb00057 DIST wine-6.1.tar.xz 24227160 BLAKE2B 968405fb8a4060732a6070687e28aecc9169692bf18e058d358e859a2626281b5adb67b94d849628ecbfa87ad772a367f62fd3c5f45aecdf7d0a7e7aa8167c33 SHA512 49ee77c41e2fb1c4f22417117b26f8a467ec6c99583fca66f147003f776fcaf5ca42227153c7ca3325dfe70141ae9bfb88e3eb6e4cf25dd31a5ba5115d2685d0 -DIST wine-staging-5.20.tar.gz 10378427 BLAKE2B 75910b198ca5b79f41f4aa115a962cb01a4dd208512feffc2ef9bc327d9c82d0c0babd543ea011917257c5dfd7c5f2f2815dae81d553dd4b239b627bafba1635 SHA512 64913c3af44890a959593c610c713113f068811a8fe79e234a61f262af963d194d1d71d336361c6a473ad0f3f64fc5a88cee36facdc0824cea6856fc74da9634 -DIST wine-staging-5.21.tar.gz 10362610 BLAKE2B 41f40c33b7d0853c63b81da863145f242b640a0e491b3ee92e1c687d33b85344676e764ae93921f00643b4bd3247e9c9aef4ba92cf80aa43785db1f762eac8cc SHA512 079a7fccd66d886b3498c45057b1bb215d3897e44e0c8d6afb56174fad583e8a578ea888d70d62a18da1566bb9649fdefd08227efecd21fc71b0b3d739dab636 -DIST wine-staging-5.22.tar.gz 10342905 BLAKE2B 9f59a0d8c06f29b52fec71cc09915c8a7a23a1ad9945cedeced179657645970048846517f4eced051989b0ef1ee555c9f8176de073a66b3633f3fe1fd90e0836 SHA512 0ce0314b470e90c741fd02ede522b6dd754fb69595b527e3ad5ac62d944bc7eca43eca88aa2b85d99a9945fbad05872cdcd2ac87ed809dcd41a9ce56bfcc1147 +DIST wine-6.2.tar.xz 24270924 BLAKE2B b83e7ff097d8f48cc46588a672515e8c1eafeafd592d4ced6a8347eaa33c31f9c5a2603958a10ce02463993c8ca5db77b227d0fbce452c1e3a637e5ea42cf635 SHA512 d28870ba58fc4ed9dc083f843d7f4ee8921722bb33e0b84c89f281fc27e5f827c0998ad629eb21c92f860dade77194d3c8a0f5b4c6ae3407fe7acef245cfa9a4 +DIST wine-6.3.tar.xz 24301496 BLAKE2B d36e46e369abc619d351dd3209c0c86c5e5924509fe98a9e158fd10b9ca57650b9bc20e64dc801ec1b09315ed77fd81b549ebce7f383a3f772717a2031878588 SHA512 20108ea5036d612e8dd61fe9254d67cad02d757ede87174ed27774e4e3537e0d1f4d67156fd430f1d01d5c68b899cb0c7b4be298d897a1ce823913efef822242 DIST wine-staging-6.0.tar.gz 9863425 BLAKE2B b51e0c3dc426c637de4ee89ee7d519847edcb04b1fb160f5f196e5560ce570ced682165ac74958433de79e104765d4811f004d323f357b753cf56108b9a631bb SHA512 33845e398e9c3d4bacbd9cd369983e72517fd648747433eabd933b446f9d86f1d61660959ff4e05cb661cf4038550b3df3384f588f3f5504b1f8056196ca3c38 DIST wine-staging-6.1.tar.gz 9855125 BLAKE2B e5bd41294b7f17cd283d4ab90cce4f362740c2b3de2a867ef50c44639f5472392b3c11e199a66da63018f18df2f2a99579b50f27d6dd0163bd989efe1e7983e2 SHA512 50bf3f07cf8008731cee131852cbce43c5ec44219e8e96fb70a0fc82954b0a2a9d25ee8b25b7c62b47abd131591ca8fe0461214287601465edccda80be6d598f +DIST wine-staging-6.2.tar.gz 9820682 BLAKE2B 3de0c0ecbdabc1ffb965e6d5ebf5689fbeaf24ee33aaa2ff078db39d1542aa935b6d4d940fef570f1c60260748f4ef52b9789625b840f73e70ed3482995d505d SHA512 558c46250babaacda92885c35c438797baff7b8eb45cb3cdf7f7572c35e6412e621182061a3a4e31444cc7580f99a61de6bd433bf2bb2b8139cdd718afd9cd2e +DIST wine-staging-6.3.tar.gz 9796930 BLAKE2B b24e5ec57435a0d797e4d913b027226b3c891477d9df5d098be52348dff4eb704275c7c59d09f6cbdf7f86940a0e6c96bf28f94bd703fd32d6770a31426043fc SHA512 ed9b3b03c466de03941d7fec00c73ff77df863c3f4ba201e7f920810675ff416995557cb62b6701dcec6928f2ab9e4d608f17b79eda0267094e506a5e66f47f2 diff --git a/app-emulation/wine-staging/metadata.xml b/app-emulation/wine-staging/metadata.xml index d0c5202e160f..413b6cf64329 100644 --- a/app-emulation/wine-staging/metadata.xml +++ b/app-emulation/wine-staging/metadata.xml @@ -1,57 +1,56 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>wine@gentoo.org</email> - <name>Wine</name> - <description> - This package must be kept in sync with repo/proj/wine repository. - Any changes need to be run past the maintainer to ensure the two repositories are kept in sync. - </description> - </maintainer> - <longdescription> + <maintainer type="project"> + <email>wine@gentoo.org</email> + <name>Wine</name> + <description>
			This package must be kept in sync with repo/proj/wine repository.
			Any changes need to be run past the maintainer to ensure the two repositories are kept in sync.
		</description> + </maintainer> + <longdescription> Wine is an Open Source implementation of the Windows API on top of X and Unix. Think of Wine as a compatibility layer for running Windows programs. Wine does not require Microsoft Windows, as it is a completely free alternative implementation of the Windows API consisting of 100% non-Microsoft code, however Wine can optionally use native Windows DLLs if they are available. Wine provides both a development toolkit for porting Windows source code to Unix as well as a program loader, allowing many unmodified Windows programs to run on x86-based Unixes, including Linux, FreeBSD, and Solaris. This variant of the Wine packaging includes the Wine-Staging patchset. </longdescription> - <use> - <flag name="capi">Enable ISDN support via CAPI</flag> - <flag name="custom-cflags">Bypass strip-flags; use at your own peril</flag> - <flag name="dos">Pull in <pkg>games-emulation/dosbox</pkg> to run DOS applications</flag> - <flag name="faudio">Pull in <pkg>app-emulation/faudio</pkg> to provide XAudio2 functionality</flag> - <flag name="gcrypt">Add support for the Diffie-Hellman key exchanges using dev-libs/libgcrypt</flag> - <flag name="gecko">Add support for the Gecko engine when using iexplore</flag> - <flag name="gssapi">Use GSSAPI (Kerberos SSP support)</flag> - <flag name="gstreamer">Use <pkg>media-libs/gstreamer</pkg> to provide DirectShow functionality;</flag> - <flag name="mingw">Build PE files using a MinGW cross compiler</flag> - <flag name="mono">Add support for .NET using Wine's Mono add-on</flag> - <flag name="netapi">Use libnetapi from <pkg>net-fs/samba</pkg> to support Windows networks in netapi32.dll</flag> - <flag name="opencl">Enable OpenCL support</flag> - <flag name="osmesa">Add support for OpenGL in bitmaps using libOSMesa</flag> - <flag name="pcap">Support packet capture software (e.g. wireshark)</flag> - <flag name="perl">Install helpers written in perl (winedump/winemaker)</flag> - <flag name="pipelight">Apply Wine-Staging patches for Pipelight/Silverlight support</flag> - <flag name="prelink">Run prelink on DLLs during build; + <upstream> + <remote-id type="github">wine-compholio/wine-staging</remote-id> + <remote-id type="sourceforge">wine</remote-id> + <remote-id type="cpe">cpe:/a:wine:wine</remote-id> + </upstream> + <use> + <flag name="capi">Enable ISDN support via CAPI</flag> + <flag name="custom-cflags">Bypass strip-flags; use at your own peril</flag> + <flag name="dos">Pull in <pkg>games-emulation/dosbox</pkg> to run DOS applications</flag> + <flag name="faudio">Pull in <pkg>app-emulation/faudio</pkg> to provide XAudio2 functionality</flag> + <flag name="gcrypt">Add support for the Diffie-Hellman key exchanges using dev-libs/libgcrypt</flag> + <flag name="gecko">Add support for the Gecko engine when using iexplore</flag> + <flag name="gssapi">Use GSSAPI (Kerberos SSP support)</flag> + <flag name="gstreamer">Use <pkg>media-libs/gstreamer</pkg> to provide DirectShow functionality;</flag> + <flag name="mingw">Build PE files using a MinGW cross compiler</flag> + <flag name="mono">Add support for .NET using Wine's Mono add-on</flag> + <flag name="netapi">Use libnetapi from <pkg>net-fs/samba</pkg> to support Windows networks in netapi32.dll</flag> + <flag name="opencl">Enable OpenCL support</flag> + <flag name="osmesa">Add support for OpenGL in bitmaps using libOSMesa</flag> + <flag name="pcap">Support packet capture software (e.g. wireshark)</flag> + <flag name="perl">Install helpers written in perl (winedump/winemaker)</flag> + <flag name="pipelight">Apply Wine-Staging patches for Pipelight/Silverlight support</flag> + <flag name="prelink">Run prelink on DLLs during build; For Gentoo hardened, do not disable if you do not know what this means as it can break things at runtime</flag> - <flag name="realtime">Pull in <pkg>sys-auth/rtkit</pkg> for low-latency pulseaudio support</flag> - <flag name="run-exes">Use Wine to open and run .EXE and .MSI files</flag> - <flag name="samba">Add support for NTLM auth. See: + <flag name="realtime">Pull in <pkg>sys-auth/rtkit</pkg> for low-latency pulseaudio support</flag> + <flag name="run-exes">Use Wine to open and run .EXE and .MSI files</flag> + <flag name="samba">Add support for NTLM auth. See: https://web.archive.org/web/20160108123008/http://wiki.winehq.org:80/NtlmAuthSetupGuide and https://web.archive.org/web/20150906013746/http://wiki.winehq.org/NtlmSigningAndSealing (these pages are not currently in the updated WineHQ Wiki).</flag> - <flag name="sdl">Add support for gamepad detection using SDL</flag> - <flag name="staging">Apply Wine-Staging patches for advanced feature support that haven't made it into upstream Wine yet</flag> - <flag name="themes">Support GTK+:3 window theming through Wine-Staging</flag> - <flag name="udev">Use <pkg>virtual/libudev</pkg> to provide plug and play support</flag> - <flag name="unwind">Use <pkg>sys-libs/libunwind</pkg> to unwind the stack</flag> - <flag name="usb">Use <pkg>virtual/libusb</pkg> to provide USB support</flag> - <flag name="vkd3d">Use <pkg>app-emulation/vkd3d</pkg> to provide Direct3D 12 support</flag> - <flag name="vulkan">Enable Vulkan drivers</flag> - </use> - <upstream> - <remote-id type="github">wine-compholio/wine-staging</remote-id> - <remote-id type="sourceforge">wine</remote-id> - </upstream> -</pkgmetadata> + <flag name="sdl">Add support for gamepad detection using SDL</flag> + <flag name="staging">Apply Wine-Staging patches for advanced feature support that haven't made it into upstream Wine yet</flag> + <flag name="themes">Support GTK+:3 window theming through Wine-Staging</flag> + <flag name="udev">Use <pkg>virtual/libudev</pkg> to provide plug and play support</flag> + <flag name="unwind">Use <pkg>sys-libs/libunwind</pkg> to unwind the stack</flag> + <flag name="usb">Use <pkg>virtual/libusb</pkg> to provide USB support</flag> + <flag name="vkd3d">Use <pkg>app-emulation/vkd3d</pkg> to provide Direct3D 12 support</flag> + <flag name="vulkan">Enable Vulkan drivers</flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/wine-staging/wine-staging-5.21.ebuild b/app-emulation/wine-staging/wine-staging-5.21.ebuild deleted file mode 100644 index 9c6e2a76fa30..000000000000 --- a/app-emulation/wine-staging/wine-staging-5.21.ebuild +++ /dev/null @@ -1,621 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW" -PLOCALE_BACKUP="en" - -inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils - -MY_PN="${PN%%-*}" -MY_P="${MY_PN}-${PV}" - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://source.winehq.org/git/wine.git" - EGIT_BRANCH="master" - inherit git-r3 - SRC_URI="" - #KEYWORDS="" -else - MAJOR_V=$(ver_cut 1) - SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz" - KEYWORDS="-* ~amd64 ~x86" -fi -S="${WORKDIR}/${MY_P}" - -STAGING_P="wine-staging-${PV}" -STAGING_DIR="${WORKDIR}/${STAGING_P}" -GWP_V="20200523" -PATCHDIR="${WORKDIR}/gentoo-wine-patches" - -DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset" -HOMEPAGE="https://www.winehq.org/" -SRC_URI="${SRC_URI} - https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz -" - -if [[ ${PV} == "9999" ]] ; then - STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git" -else - SRC_URI="${SRC_URI} - staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )" -fi - -LICENSE="LGPL-2.1" -SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" -REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) - X? ( truetype ) - elibc_glibc? ( threads ) - osmesa? ( opengl ) - pipelight? ( staging ) - test? ( abi_x86_32 ) - themes? ( staging ) - vaapi? ( staging ) - vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124 - -# FIXME: the test suite is unsuitable for us; many tests require net access -# or fail due to Xvfb's opengl limitations. -RESTRICT="test" - -COMMON_DEPEND=" - X? ( - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] - x11-libs/libXrandr[${MULTILIB_USEDEP}] - x11-libs/libXi[${MULTILIB_USEDEP}] - x11-libs/libXxf86vm[${MULTILIB_USEDEP}] - ) - alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) - capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) - cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) - faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] ) - fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) - gcrypt? ( dev-libs/libgcrypt:=[${MULTILIB_USEDEP}] ) - gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) - gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) - gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] ) - gstreamer? ( - media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] - media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] - ) - jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) - kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] ) - lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] ) - ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) - mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] ) - ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] ) - netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] ) - nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] ) - odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] ) - openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] ) - opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) - opengl? ( - virtual/glu[${MULTILIB_USEDEP}] - virtual/opengl[${MULTILIB_USEDEP}] - ) - osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] ) - pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] ) - png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) - pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) - scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) - sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] ) - ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) - staging? ( sys-apps/attr[${MULTILIB_USEDEP}] ) - themes? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - x11-libs/cairo[${MULTILIB_USEDEP}] - x11-libs/gtk+:3[${MULTILIB_USEDEP}] - ) - truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) - udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) - udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) - unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) - v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) - vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] ) - vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] ) - vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) - xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) - xml? ( - dev-libs/libxml2[${MULTILIB_USEDEP}] - dev-libs/libxslt[${MULTILIB_USEDEP}] - )" - -RDEPEND="${COMMON_DEPEND} - app-emulation/wine-desktop-common - >app-eselect/eselect-wine-0.3 - !app-emulation/wine:0 - dos? ( >=games-emulation/dosbox-0.74_p20160629 ) - gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] ) - mono? ( app-emulation/wine-mono:5.1.1 ) - perl? ( - dev-lang/perl - dev-perl/XML-Simple - ) - pulseaudio? ( - realtime? ( sys-auth/rtkit ) - ) - samba? ( >=net-fs/samba-3.0.25[winbind] ) - selinux? ( sec-policy/selinux-wine ) - udisks? ( sys-fs/udisks:2 )" - -# tools/make_requests requires perl -DEPEND="${COMMON_DEPEND} - sys-devel/flex - >=sys-kernel/linux-headers-2.6 - virtual/pkgconfig - virtual/yacc - X? ( x11-base/xorg-proto ) - prelink? ( sys-devel/prelink ) - staging? ( - dev-lang/perl - dev-perl/XML-Simple - ) - xinerama? ( x11-base/xorg-proto )" - -# These use a non-standard "Wine" category, which is provided by -# /etc/xdg/applications-merged/wine.menu -QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop -usr/share/applications/wine-notepad.desktop -usr/share/applications/wine-uninstaller.desktop -usr/share/applications/wine-winecfg.desktop" - -PATCHES=( - "${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726 - "${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 - "${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch" -) -PATCHES_BIN=() - -# https://bugs.gentoo.org/show_bug.cgi?id=635222 -if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then - DEPEND+=" dev-util/patchbin" -fi - -wine_compiler_check() { - [[ ${MERGE_TYPE} = "binary" ]] && return 0 - - # GCC-specific bugs - if tc-is-gcc; then - # bug #549768 - if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then - ebegin "Checking for gcc-5 ms_abi compiler bug" - $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die - # Run in subshell to prevent "Aborted" message - ( "${T}"/pr66838 || false ) >/dev/null 2>&1 - if ! eend $?; then - eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" - eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," - eerror "or use gcc-config to select a different compiler version." - eerror "See https://bugs.gentoo.org/549768" - eerror - return 1 - fi - fi - # bug #574044 - if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then - ebegin "Checking for gcc-5-3 stack realignment compiler bug" - # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 - if ! eend $?; then - eerror "Wine cannot be built with this version of gcc-5.3" - eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," - eerror "or use gcc-config to select a different compiler version." - eerror "See https://bugs.gentoo.org/574044" - eerror - return 1 - fi - fi - fi - - # Ensure compiler support - if use abi_x86_64; then - ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" - # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) - if ! eend $?; then - eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" - eerror - eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" - eerror - return 1 - fi - fi -} - -wine_build_environment_check() { - [[ ${MERGE_TYPE} = "binary" ]] && return 0 - - if use abi_x86_64; then - if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then - eerror "You need gcc-4.4+ to compile 64-bit wine" - die - elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then - eerror "You need clang-3.8+ to compile 64-bit wine" - die - fi - fi - if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then - ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" - ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" - ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" - fi - if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then - if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then - ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" - ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." - ewarn "See package.env in man 5 portage for more information on how to do this." - ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" - fi - fi - - if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then - eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." - eerror "See https://bugs.gentoo.org/487864 for more details." - eerror - return 1 - fi -} - -wine_env_vcs_vars() { - local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT" - local pn_live_val="${pn_live_var}" - eval pn_live_val='$'${pn_live_val} - if [[ ! -z ${pn_live_val} ]]; then - if use staging; then - eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" - eerror "cannot be used to set the commit. Instead, you may use the" - eerror "environment variables:" - eerror " EGIT_OVERRIDE_COMMIT_WINE" - eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" - eerror - return 1 - fi - fi - if [[ ! -z ${EGIT_COMMIT} ]]; then - eerror "Commits must now be specified using the environment variables:" - eerror " EGIT_OVERRIDE_COMMIT_WINE" - eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" - eerror - return 1 - fi -} - -pkg_pretend() { - wine_build_environment_check || die - - # Verify OSS support - if use oss && ! use kernel_FreeBSD; then - if ! has_version ">=media-sound/oss-4"; then - eerror "You cannot build wine with USE=oss without having support from a" - eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)" - eerror - die - fi - fi -} - -pkg_setup() { - wine_build_environment_check || die - wine_env_vcs_vars || die - - WINE_VARIANT="${PN#wine}-${PV}" - WINE_VARIANT="${WINE_VARIANT#-}" - - MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}" - MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}" - MY_DATADIR="${MY_DATAROOTDIR}" - MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" - MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}" - MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}" - MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}" - MY_MANDIR="${MY_DATADIR}/man" -} - -src_unpack() { - if [[ ${PV} == "9999" ]] ; then - EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack - if use staging; then - local CURRENT_WINE_COMMIT=${EGIT_VERSION} - - EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack - - local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die - - if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then - einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." - einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." - einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" - fi - fi - fi - - default - - l10n_find_plocales_changes "${S}/po" "" ".po" -} - -src_prepare() { - - eapply_bin(){ - local patch - for patch in ${PATCHES_BIN[@]}; do - patchbin --nogit < "${patch}" || die - done - } - - local md5="$(md5sum server/protocol.def)" - - if use staging; then - ewarn "Applying the Wine-Staging patchset. Any bug reports to the" - ewarn "Wine bugzilla should explicitly state that staging was used." - - local STAGING_EXCLUDE="-W winemenubuilder-Desktop_Icon_Path" #652176 - use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight" - - # Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches - ebegin "Running Wine-Staging patch installer" - ( - set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE} - cd "${STAGING_DIR}/patches" - source "${STAGING_DIR}/patches/patchinstall.sh" - ) - eend $? || die "Failed to apply Wine-Staging patches" - fi - - default - eapply_bin - eautoreconf - - # Modification of the server protocol requires regenerating the server requests - if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then - einfo "server/protocol.def was patched; running tools/make_requests" - tools/make_requests || die #432348 - fi - sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die - if ! use run-exes; then - sed -i '/^MimeType/d' loader/wine.desktop || die #117785 - fi - - # Edit wine.desktop to work for specific variant - sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die - - # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 - cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die - - l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS - - # Fix manpage generation for locales #469418 and abi_x86_64 #617864 - - # Duplicate manpages input files for wine64 - local f - for f in loader/*.man.in; do - cp ${f} ${f/wine/wine64} || die - done - # Add wine64 manpages to Makefile - if use abi_x86_64; then - sed -i "/wine.man.in/i \ - \\\twine64.man.in \\\\" loader/Makefile.in || die - sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\ -\164\2/' loader/Makefile.in || die - fi - - rm_man_file(){ - local file="${1}" - loc=${2} - sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die - } - - while read f; do - l10n_for_each_disabled_locale_do rm_man_file "${f}" - done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print) -} - -src_configure() { - wine_compiler_check || die - - export LDCONFIG=/bin/true - use custom-cflags || strip-flags - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myconf=( - --prefix="${MY_PREFIX}" - --datarootdir="${MY_DATAROOTDIR}" - --datadir="${MY_DATADIR}" - --docdir="${MY_DOCDIR}" - --includedir="${MY_INCLUDEDIR}" - --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}" - --libexecdir="${MY_LIBEXECDIR}" - --localstatedir="${MY_LOCALSTATEDIR}" - --mandir="${MY_MANDIR}" - --sysconfdir="${EPREFIX}/etc/wine" - $(use_with alsa) - $(use_with capi) - $(use_with lcms cms) - $(use_with cups) - $(use_with ncurses curses) - $(use_with udisks dbus) - $(use_with faudio) - $(use_with fontconfig) - $(use_with ssl gnutls) - $(use_enable gecko mshtml) - $(use_with gcrypt) - $(use_with gphoto2 gphoto) - $(use_with gsm) - $(use_with gssapi) - $(use_with gstreamer) - --without-hal - $(use_with jpeg) - $(use_with kerberos krb5) - $(use_with ldap) - --without-mingw # linux LDFLAGS leak in mingw32: bug #685172 - $(use_enable mono mscoree) - $(use_with mp3 mpg123) - $(use_with netapi) - $(use_with nls gettext) - $(use_with openal) - $(use_with opencl) - $(use_with opengl) - $(use_with osmesa) - $(use_with oss) - $(use_with pcap) - $(use_with png) - $(use_with pulseaudio pulse) - $(use_with threads pthread) - $(use_with scanner sane) - $(use_with sdl) - $(use_enable test tests) - $(use_with truetype freetype) - $(use_with udev) - $(use_with unwind) - $(use_with v4l v4l2) - $(use_with vkd3d) - $(use_with vulkan) - $(use_with X x) - $(use_with X xfixes) - $(use_with xcomposite) - $(use_with xinerama) - $(use_with xml) - $(use_with xml xslt) - ) - - use staging && myconf+=( - --with-xattr - $(use_with themes gtk3) - $(use_with vaapi va) - ) - - local PKG_CONFIG AR RANLIB - # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038 - # set AR and RANLIB to make QA scripts happy; #483342 - tc-export PKG_CONFIG AR RANLIB - - if use amd64; then - if [[ ${ABI} == amd64 ]]; then - myconf+=( --enable-win64 ) - else - myconf+=( --disable-win64 ) - fi - - # Note: using --with-wine64 results in problems with multilib.eclass - # CC/LD hackery. We're using separate tools instead. - fi - - ECONF_SOURCE=${S} \ - econf "${myconf[@]}" - emake depend -} - -multilib_src_test() { - # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader" - if [[ ${ABI} == x86 ]]; then - if [[ $(id -u) == 0 ]]; then - ewarn "Skipping tests since they cannot be run under the root user." - ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf" - return - fi - - WINEPREFIX="${T}/.wine-${ABI}" \ - Xemake test - fi -} - -multilib_src_install_all() { - local DOCS=( ANNOUNCE AUTHORS README ) - add_locale_docs() { - local locale_doc="documentation/README.$1" - [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} ) - } - l10n_for_each_locale_do add_locale_docs - - einstalldocs - prune_libtool_files --all - - if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script - rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \ - "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die - fi - - # Remove wineconsole if neither backend is installed #551124 - if ! use X && ! use ncurses; then - rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die - rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die - rm_wineconsole() { - rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die - } - multilib_foreach_abi rm_wineconsole - fi - - use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055 - use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} - - # Avoid double prefix from dosym and make_wrapper - MY_PREFIX=${MY_PREFIX#${EPREFIX}} - - if use abi_x86_64 && ! use abi_x86_32; then - dosym wine64 "${MY_PREFIX}"/bin/wine # 404331 - dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader - fi - - # Failglob for binloops, shouldn't be necessary, but including to stay safe - eshopts_push -s failglob #615218 - # Make wrappers for binaries for handling multiple variants - # Note: wrappers instead of symlinks because some are shell which use basename - local b - for b in "${ED%/}${MY_PREFIX}"/bin/*; do - make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" - done - eshopts_pop -} - -pkg_postinst() { - eselect wine register ${P} - if [[ ${PN} == "wine-vanilla" ]]; then - eselect wine register --vanilla ${P} || die - else - if use staging; then - eselect wine register --staging ${P} || die - fi - fi - - eselect wine update --all --if-unset || die - - xdg_desktop_database_update - - if ! use gecko; then - ewarn "Without Wine Gecko, wine prefixes will not have a default" - ewarn "implementation of iexplore. Many older windows applications" - ewarn "rely upon the existence of an iexplore implementation, so" - ewarn "you will likely need to install an external one, like via winetricks" - fi - if ! use mono; then - ewarn "Without Wine Mono, wine prefixes will not have a default" - ewarn "implementation of .NET. Many windows applications rely upon" - ewarn "the existence of a .NET implementation, so you will likely need" - ewarn "to install an external one, like via winetricks" - fi -} - -pkg_prerm() { - eselect wine deregister ${P} - if [[ ${PN} == "wine-vanilla" ]]; then - eselect wine deregister --vanilla ${P} || die - else - if use staging; then - eselect wine deregister --staging ${P} || die - fi - fi - - eselect wine update --all --if-unset || die -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/app-emulation/wine-staging/wine-staging-6.0.ebuild b/app-emulation/wine-staging/wine-staging-6.0.ebuild index 28716e74fdc2..954abe1eca77 100644 --- a/app-emulation/wine-staging/wine-staging-6.0.ebuild +++ b/app-emulation/wine-staging/wine-staging-6.0.ebuild @@ -16,7 +16,6 @@ if [[ ${MY_PV} == "9999" ]] ; then EGIT_BRANCH="master" inherit git-r3 SRC_URI="" - #KEYWORDS="" else MAJOR_V=$(ver_cut 1) MINOR_V=$(ver_cut 2) diff --git a/app-emulation/wine-staging/wine-staging-6.1.ebuild b/app-emulation/wine-staging/wine-staging-6.1.ebuild index 28716e74fdc2..954abe1eca77 100644 --- a/app-emulation/wine-staging/wine-staging-6.1.ebuild +++ b/app-emulation/wine-staging/wine-staging-6.1.ebuild @@ -16,7 +16,6 @@ if [[ ${MY_PV} == "9999" ]] ; then EGIT_BRANCH="master" inherit git-r3 SRC_URI="" - #KEYWORDS="" else MAJOR_V=$(ver_cut 1) MINOR_V=$(ver_cut 2) diff --git a/app-emulation/wine-staging/wine-staging-5.20.ebuild b/app-emulation/wine-staging/wine-staging-6.2.ebuild index 9c6e2a76fa30..0d4d6cdf1e7b 100644 --- a/app-emulation/wine-staging/wine-staging-5.20.ebuild +++ b/app-emulation/wine-staging/wine-staging-6.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -7,24 +7,27 @@ PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko PLOCALE_BACKUP="en" inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils - MY_PN="${PN%%-*}" -MY_P="${MY_PN}-${PV}" +MY_PV="${PV/_/-}" +MY_P="${MY_PN}-${MY_PV}" -if [[ ${PV} == "9999" ]] ; then +if [[ ${MY_PV} == "9999" ]] ; then EGIT_REPO_URI="https://source.winehq.org/git/wine.git" EGIT_BRANCH="master" inherit git-r3 SRC_URI="" - #KEYWORDS="" else MAJOR_V=$(ver_cut 1) - SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz" + MINOR_V=$(ver_cut 2) + if [[ ${MINOR_V} != "0" ]] ; then + MINOR_V="x" + fi + SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz" KEYWORDS="-* ~amd64 ~x86" fi S="${WORKDIR}/${MY_P}" -STAGING_P="wine-staging-${PV}" +STAGING_P="wine-staging-${MY_PV}" STAGING_DIR="${WORKDIR}/${STAGING_P}" GWP_V="20200523" PATCHDIR="${WORKDIR}/gentoo-wine-patches" @@ -35,16 +38,16 @@ SRC_URI="${SRC_URI} https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz " -if [[ ${PV} == "9999" ]] ; then +if [[ ${MY_PV} == "9999" ]] ; then STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git" else SRC_URI="${SRC_URI} - staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )" + staging? ( https://github.com/wine-staging/wine-staging/archive/v${MY_PV}.tar.gz -> ${STAGING_P}.tar.gz )" fi LICENSE="LGPL-2.1" -SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" +SLOT="${MY_PV}" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) @@ -86,7 +89,6 @@ COMMON_DEPEND=" lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] ) ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] ) - ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] ) netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] ) nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] ) odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] ) @@ -113,6 +115,7 @@ COMMON_DEPEND=" udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) + usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] ) v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] ) vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] ) @@ -129,8 +132,8 @@ RDEPEND="${COMMON_DEPEND} >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) - gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] ) - mono? ( app-emulation/wine-mono:5.1.1 ) + gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) + mono? ( app-emulation/wine-mono:6.0.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple @@ -172,7 +175,7 @@ PATCHES=( PATCHES_BIN=() # https://bugs.gentoo.org/show_bug.cgi?id=635222 -if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${MY_PV} == 9999 ]]; then DEPEND+=" dev-util/patchbin" fi @@ -286,15 +289,45 @@ wine_env_vcs_vars() { } pkg_pretend() { - wine_build_environment_check || die + if [[ ${MERGE_TYPE} != binary ]] ; then + wine_build_environment_check || die + + # Verify OSS support + if use oss && ! use kernel_FreeBSD; then + if ! has_version ">=media-sound/oss-4"; then + eerror "You cannot build wine with USE=oss without having support from a" + eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)" + eerror + die + fi + fi - # Verify OSS support - if use oss && ! use kernel_FreeBSD; then - if ! has_version ">=media-sound/oss-4"; then - eerror "You cannot build wine with USE=oss without having support from a" - eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)" + if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then eerror - die + eerror "USE=\"mingw\" is currently experimental, and requires the" + eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds." + eerror + eerror "These can be installed by using 'sys-devel/crossdev':" + eerror + eerror "crossdev --target i686-w64-mingw32" + eerror + eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw" + eerror + die "MinGW build was enabled, but no compiler to support it was found." + fi + + if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then + eerror + eerror "USE=\"mingw\" is currently experimental, and requires the" + eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds." + eerror + eerror "These can be installed by using 'sys-devel/crossdev':" + eerror + eerror "crossdev --target x86_64-w64-mingw32" + eerror + eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw" + eerror + die "MinGW build was enabled, but no compiler to support it was found." fi fi } @@ -303,7 +336,7 @@ pkg_setup() { wine_build_environment_check || die wine_env_vcs_vars || die - WINE_VARIANT="${PN#wine}-${PV}" + WINE_VARIANT="${PN#wine}-${MY_PV}" WINE_VARIANT="${WINE_VARIANT#-}" MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}" @@ -317,7 +350,7 @@ pkg_setup() { } src_unpack() { - if [[ ${PV} == "9999" ]] ; then + if [[ ${MY_PV} == "9999" ]] ; then EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack if use staging; then local CURRENT_WINE_COMMIT=${EGIT_VERSION} @@ -420,6 +453,9 @@ src_configure() { export LDCONFIG=/bin/true use custom-cflags || strip-flags + if use mingw; then + export CROSSCFLAGS="${CFLAGS}" + fi multilib-minimal_src_configure } @@ -440,7 +476,6 @@ multilib_src_configure() { $(use_with capi) $(use_with lcms cms) $(use_with cups) - $(use_with ncurses curses) $(use_with udisks dbus) $(use_with faudio) $(use_with fontconfig) @@ -455,7 +490,8 @@ multilib_src_configure() { $(use_with jpeg) $(use_with kerberos krb5) $(use_with ldap) - --without-mingw # linux LDFLAGS leak in mingw32: bug #685172 + # TODO: Will bug 685172 still need special handling? + $(use_with mingw) $(use_enable mono mscoree) $(use_with mp3 mpg123) $(use_with netapi) @@ -475,6 +511,7 @@ multilib_src_configure() { $(use_with truetype freetype) $(use_with udev) $(use_with unwind) + $(use_with usb) $(use_with v4l v4l2) $(use_with vkd3d) $(use_with vulkan) @@ -544,12 +581,20 @@ multilib_src_install_all() { fi # Remove wineconsole if neither backend is installed #551124 - if ! use X && ! use ncurses; then + if ! use X; then rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die - rm_wineconsole() { - rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die - } + + if ! use mingw; then + rm_wineconsole() { + rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/{,fakedlls/}wineconsole.exe* || die + } + else + rm_wineconsole() { + rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/wineconsole.exe* || die + } + fi + multilib_foreach_abi rm_wineconsole fi @@ -576,12 +621,12 @@ multilib_src_install_all() { } pkg_postinst() { - eselect wine register ${P} + eselect wine register ${PN}-${MY_PV} if [[ ${PN} == "wine-vanilla" ]]; then - eselect wine register --vanilla ${P} || die + eselect wine register --vanilla ${PN}-${MY_PV} || die else if use staging; then - eselect wine register --staging ${P} || die + eselect wine register --staging ${PN}-${MY_PV} || die fi fi @@ -604,12 +649,12 @@ pkg_postinst() { } pkg_prerm() { - eselect wine deregister ${P} + eselect wine deregister ${PN}-${MY_PV} if [[ ${PN} == "wine-vanilla" ]]; then - eselect wine deregister --vanilla ${P} || die + eselect wine deregister --vanilla ${PN}-${MY_PV} || die else if use staging; then - eselect wine deregister --staging ${P} || die + eselect wine deregister --staging ${PN}-${MY_PV}|| die fi fi diff --git a/app-emulation/wine-staging/wine-staging-5.22-r2.ebuild b/app-emulation/wine-staging/wine-staging-6.3.ebuild index 00e7c18d4b69..9bb1565d0057 100644 --- a/app-emulation/wine-staging/wine-staging-5.22-r2.ebuild +++ b/app-emulation/wine-staging/wine-staging-6.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -7,11 +7,11 @@ PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko PLOCALE_BACKUP="en" inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils - MY_PN="${PN%%-*}" -MY_P="${MY_PN}-${PV}" +MY_PV="${PV/_/-}" +MY_P="${MY_PN}-${MY_PV}" -if [[ ${PV} == "9999" ]] ; then +if [[ ${MY_PV} == "9999" ]] ; then EGIT_REPO_URI="https://source.winehq.org/git/wine.git" EGIT_BRANCH="master" inherit git-r3 @@ -19,12 +19,16 @@ if [[ ${PV} == "9999" ]] ; then #KEYWORDS="" else MAJOR_V=$(ver_cut 1) - SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz" + MINOR_V=$(ver_cut 2) + if [[ ${MINOR_V} != "0" ]] ; then + MINOR_V="x" + fi + SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz" KEYWORDS="-* ~amd64 ~x86" fi S="${WORKDIR}/${MY_P}" -STAGING_P="wine-staging-${PV}" +STAGING_P="wine-staging-${MY_PV}" STAGING_DIR="${WORKDIR}/${STAGING_P}" GWP_V="20200523" PATCHDIR="${WORKDIR}/gentoo-wine-patches" @@ -35,16 +39,16 @@ SRC_URI="${SRC_URI} https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz " -if [[ ${PV} == "9999" ]] ; then +if [[ ${MY_PV} == "9999" ]] ; then STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git" else SRC_URI="${SRC_URI} - staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )" + staging? ( https://github.com/wine-staging/wine-staging/archive/v${MY_PV}.tar.gz -> ${STAGING_P}.tar.gz )" fi LICENSE="LGPL-2.1" -SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" +SLOT="${MY_PV}" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) @@ -112,6 +116,7 @@ COMMON_DEPEND=" udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) + usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] ) v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] ) vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] ) @@ -128,8 +133,8 @@ RDEPEND="${COMMON_DEPEND} >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) - gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] ) - mono? ( app-emulation/wine-mono:5.1.1 ) + gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) + mono? ( app-emulation/wine-mono:6.0.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple @@ -171,7 +176,7 @@ PATCHES=( PATCHES_BIN=() # https://bugs.gentoo.org/show_bug.cgi?id=635222 -if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${MY_PV} == 9999 ]]; then DEPEND+=" dev-util/patchbin" fi @@ -285,44 +290,46 @@ wine_env_vcs_vars() { } pkg_pretend() { - wine_build_environment_check || die + if [[ ${MERGE_TYPE} != binary ]] ; then + wine_build_environment_check || die - # Verify OSS support - if use oss && ! use kernel_FreeBSD; then - if ! has_version ">=media-sound/oss-4"; then - eerror "You cannot build wine with USE=oss without having support from a" - eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)" - eerror - die + # Verify OSS support + if use oss && ! use kernel_FreeBSD; then + if ! has_version ">=media-sound/oss-4"; then + eerror "You cannot build wine with USE=oss without having support from a" + eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)" + eerror + die + fi fi - fi - if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then - eerror - eerror "USE=\"mingw\" is currently experimental, and requires the" - eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds." - eerror - eerror "These can be installed by using 'sys-devel/crossdev':" - eerror - eerror "crossdev --target i686-w64-mingw32" - eerror - eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw" - eerror - die "MinGW build was enabled, but no compiler to support it was found." - fi + if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then + eerror + eerror "USE=\"mingw\" is currently experimental, and requires the" + eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds." + eerror + eerror "These can be installed by using 'sys-devel/crossdev':" + eerror + eerror "crossdev --target i686-w64-mingw32" + eerror + eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw" + eerror + die "MinGW build was enabled, but no compiler to support it was found." + fi - if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then - eerror - eerror "USE=\"mingw\" is currently experimental, and requires the" - eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds." - eerror - eerror "These can be installed by using 'sys-devel/crossdev':" - eerror - eerror "crossdev --target x86_64-w64-mingw32" - eerror - eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw" - eerror - die "MinGW build was enabled, but no compiler to support it was found." + if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then + eerror + eerror "USE=\"mingw\" is currently experimental, and requires the" + eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds." + eerror + eerror "These can be installed by using 'sys-devel/crossdev':" + eerror + eerror "crossdev --target x86_64-w64-mingw32" + eerror + eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw" + eerror + die "MinGW build was enabled, but no compiler to support it was found." + fi fi } @@ -330,7 +337,7 @@ pkg_setup() { wine_build_environment_check || die wine_env_vcs_vars || die - WINE_VARIANT="${PN#wine}-${PV}" + WINE_VARIANT="${PN#wine}-${MY_PV}" WINE_VARIANT="${WINE_VARIANT#-}" MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}" @@ -344,7 +351,7 @@ pkg_setup() { } src_unpack() { - if [[ ${PV} == "9999" ]] ; then + if [[ ${MY_PV} == "9999" ]] ; then EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack if use staging; then local CURRENT_WINE_COMMIT=${EGIT_VERSION} @@ -505,6 +512,7 @@ multilib_src_configure() { $(use_with truetype freetype) $(use_with udev) $(use_with unwind) + $(use_with usb) $(use_with v4l v4l2) $(use_with vkd3d) $(use_with vulkan) @@ -614,12 +622,12 @@ multilib_src_install_all() { } pkg_postinst() { - eselect wine register ${P} + eselect wine register ${PN}-${MY_PV} if [[ ${PN} == "wine-vanilla" ]]; then - eselect wine register --vanilla ${P} || die + eselect wine register --vanilla ${PN}-${MY_PV} || die else if use staging; then - eselect wine register --staging ${P} || die + eselect wine register --staging ${PN}-${MY_PV} || die fi fi @@ -642,12 +650,12 @@ pkg_postinst() { } pkg_prerm() { - eselect wine deregister ${P} + eselect wine deregister ${PN}-${MY_PV} if [[ ${PN} == "wine-vanilla" ]]; then - eselect wine deregister --vanilla ${P} || die + eselect wine deregister --vanilla ${PN}-${MY_PV} || die else if use staging; then - eselect wine deregister --staging ${P} || die + eselect wine deregister --staging ${PN}-${MY_PV}|| die fi fi diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index 28716e74fdc2..0d4d6cdf1e7b 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -16,7 +16,6 @@ if [[ ${MY_PV} == "9999" ]] ; then EGIT_BRANCH="master" inherit git-r3 SRC_URI="" - #KEYWORDS="" else MAJOR_V=$(ver_cut 1) MINOR_V=$(ver_cut 2) @@ -134,7 +133,7 @@ RDEPEND="${COMMON_DEPEND} !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) - mono? ( app-emulation/wine-mono:5.1.1 ) + mono? ( app-emulation/wine-mono:6.0.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest index 9e4b8f544811..0d0cc62dcc39 100644 --- a/app-emulation/wine-vanilla/Manifest +++ b/app-emulation/wine-vanilla/Manifest @@ -2,8 +2,7 @@ DIST gentoo-wine-patches-20191222.tar.xz 59236 BLAKE2B 1b2c7b3ab69e5603d0f176a88 DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75 DIST wine-5.0.2.tar.xz 22484932 BLAKE2B 93253a86605b32dc8f7c79a16336643e6f84937094f8c96ea336289c2076a4d9f759fc1ad128f7b1a009da5eb2ed25cdc893da99e338093608bf5fc0ef1a85fc SHA512 9ff902ff929d9ac8c81843eea141c96446d26b14f70781a40a3ea1fdef5f412ca4c87374a5a3af9b42b52236159645e55d6e54f8b06178a4d210a72fb1d5358e DIST wine-5.0.3.tar.xz 22495496 BLAKE2B 459399b940111fb573d3060e74c17423ff43b510a196d70eadb5d57e7d57b44c990f8c9bb69eb258a76515c2d50fb756f82229a1a7cd391a32c407bedc1e9f14 SHA512 3217cc8a91e898e15130314fb7ebc2cdd93e2a4e88a46d3778ff4790a635b28e951ba974b83a56414d387b710da21a998e519f1df0cde636ff5fffdceff7f652 -DIST wine-5.20.tar.xz 24177960 BLAKE2B 50169bc00497feef91f5cf7fd56bce8f7784f70d2a24776494d0ab98cdb70b4387a92dece4571b2b22b15c42d82672595f39079a0678e551331f2bee4460f0f8 SHA512 30299287857376a827579335ba410d0575379df300860c8fdd50473f3eec074372d3602e5027f9e75fb13e272f28f51950ec652109839573a168aed23ba9c8f4 -DIST wine-5.21.tar.xz 24178740 BLAKE2B 9d6b2766536fb019d69dbffc8dbae0004eeb6d5b3d3f57d0577b4952159b9a5388d1f767d982b3837d713175ac7baec47c7b017e21f4fb586d3d97707491066e SHA512 0879e4edeca60880799736ac831f8ae28c6e5156dde161685aa84a5d8bd20c4f3a51a178fa2b130a9e8af44432bb239160a04829fcef5d8332e2bbf829d2bc18 -DIST wine-5.22.tar.xz 24214812 BLAKE2B 7bc093501cb20fbe52e277aadb867e4f55abc9898ae570aebf3496c2f7938129498e6ad8b6de7f8efe28ccffee734c94754da703e0c5d6bad6c1293cefb42c0e SHA512 9e86a1f74a142513121c155ffa5e1dd863ecc00092952878f44185725e81793fd7291e0e3c93275cd0d083d17af99eb1d8feba1c96e8607f44919b9045737271 DIST wine-6.0.tar.xz 24192280 BLAKE2B baf0eee582190ede8d210390b51d330c1879cb442100bc2e957052898fbd84bcc047a885065f9bf96ac4f072f92eee44f0e1c3baddc68937286e7cc6f976bd4e SHA512 c0732fbab1da8737d595a876b28ce87eef1440c317746e798642b59b44b34e890de562e0c0cc674e97096f39db82f8e9c3b1cc1ba9edc246b7266a0f7cb00057 DIST wine-6.1.tar.xz 24227160 BLAKE2B 968405fb8a4060732a6070687e28aecc9169692bf18e058d358e859a2626281b5adb67b94d849628ecbfa87ad772a367f62fd3c5f45aecdf7d0a7e7aa8167c33 SHA512 49ee77c41e2fb1c4f22417117b26f8a467ec6c99583fca66f147003f776fcaf5ca42227153c7ca3325dfe70141ae9bfb88e3eb6e4cf25dd31a5ba5115d2685d0 +DIST wine-6.2.tar.xz 24270924 BLAKE2B b83e7ff097d8f48cc46588a672515e8c1eafeafd592d4ced6a8347eaa33c31f9c5a2603958a10ce02463993c8ca5db77b227d0fbce452c1e3a637e5ea42cf635 SHA512 d28870ba58fc4ed9dc083f843d7f4ee8921722bb33e0b84c89f281fc27e5f827c0998ad629eb21c92f860dade77194d3c8a0f5b4c6ae3407fe7acef245cfa9a4 +DIST wine-6.3.tar.xz 24301496 BLAKE2B d36e46e369abc619d351dd3209c0c86c5e5924509fe98a9e158fd10b9ca57650b9bc20e64dc801ec1b09315ed77fd81b549ebce7f383a3f772717a2031878588 SHA512 20108ea5036d612e8dd61fe9254d67cad02d757ede87174ed27774e4e3537e0d1f4d67156fd430f1d01d5c68b899cb0c7b4be298d897a1ce823913efef822242 diff --git a/app-emulation/wine-vanilla/metadata.xml b/app-emulation/wine-vanilla/metadata.xml index a57d62f758b0..3fa6048ca342 100644 --- a/app-emulation/wine-vanilla/metadata.xml +++ b/app-emulation/wine-vanilla/metadata.xml @@ -1,52 +1,51 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>wine@gentoo.org</email> - <name>Wine</name> - <description> - This package must be kept in sync with repo/proj/wine repository. - Any changes need to be run past the maintainer to ensure the two repositories are kept in sync. - </description> - </maintainer> - <longdescription> + <maintainer type="project"> + <email>wine@gentoo.org</email> + <name>Wine</name> + <description>
			This package must be kept in sync with repo/proj/wine repository.
			Any changes need to be run past the maintainer to ensure the two repositories are kept in sync.
		</description> + </maintainer> + <longdescription> Wine is an Open Source implementation of the Windows API on top of X and Unix. Think of Wine as a compatibility layer for running Windows programs. Wine does not require Microsoft Windows, as it is a completely free alternative implementation of the Windows API consisting of 100% non-Microsoft code, however Wine can optionally use native Windows DLLs if they are available. Wine provides both a development toolkit for porting Windows source code to Unix as well as a program loader, allowing many unmodified Windows programs to run on x86-based Unixes, including Linux, FreeBSD, and Solaris. This variant of the Wine packaging does not include external patchsets </longdescription> - <use> - <flag name="capi">Enable ISDN support via CAPI</flag> - <flag name="custom-cflags">Bypass strip-flags; use at your own peril</flag> - <flag name="dos">Pull in <pkg>games-emulation/dosbox</pkg> to run DOS applications</flag> - <flag name="faudio">Pull in <pkg>app-emulation/faudio</pkg> to provide XAudio2 functionality</flag> - <flag name="gecko">Add support for the Gecko engine when using iexplore</flag> - <flag name="gssapi">Use GSSAPI (Kerberos SSP support)</flag> - <flag name="gstreamer">Use <pkg>media-libs/gstreamer</pkg> to provide DirectShow functionality;</flag> - <flag name="mingw">Build PE files using a MinGW cross compiler</flag> - <flag name="mono">Add support for .NET using Wine's Mono add-on</flag> - <flag name="netapi">Use libnetapi from <pkg>net-fs/samba</pkg> to support Windows networks in netapi32.dll</flag> - <flag name="opencl">Enable OpenCL support</flag> - <flag name="osmesa">Add support for OpenGL in bitmaps using libOSMesa</flag> - <flag name="pcap">Support packet capture software (e.g. wireshark)</flag> - <flag name="perl">Install helpers written in perl (winedump/winemaker)</flag> - <flag name="prelink">Run prelink on DLLs during build; + <upstream> + <remote-id type="sourceforge">wine</remote-id> + <remote-id type="cpe">cpe:/a:wine:wine</remote-id> + </upstream> + <use> + <flag name="capi">Enable ISDN support via CAPI</flag> + <flag name="custom-cflags">Bypass strip-flags; use at your own peril</flag> + <flag name="dos">Pull in <pkg>games-emulation/dosbox</pkg> to run DOS applications</flag> + <flag name="faudio">Pull in <pkg>app-emulation/faudio</pkg> to provide XAudio2 functionality</flag> + <flag name="gecko">Add support for the Gecko engine when using iexplore</flag> + <flag name="gssapi">Use GSSAPI (Kerberos SSP support)</flag> + <flag name="gstreamer">Use <pkg>media-libs/gstreamer</pkg> to provide DirectShow functionality;</flag> + <flag name="mingw">Build PE files using a MinGW cross compiler</flag> + <flag name="mono">Add support for .NET using Wine's Mono add-on</flag> + <flag name="netapi">Use libnetapi from <pkg>net-fs/samba</pkg> to support Windows networks in netapi32.dll</flag> + <flag name="opencl">Enable OpenCL support</flag> + <flag name="osmesa">Add support for OpenGL in bitmaps using libOSMesa</flag> + <flag name="pcap">Support packet capture software (e.g. wireshark)</flag> + <flag name="perl">Install helpers written in perl (winedump/winemaker)</flag> + <flag name="prelink">Run prelink on DLLs during build; For Gentoo hardened, do not disable if you do not know what this means as it can break things at runtime</flag> - <flag name="realtime">Pull in <pkg>sys-auth/rtkit</pkg> for low-latency pulseaudio support</flag> - <flag name="run-exes">Use Wine to open and run .EXE and .MSI files</flag> - <flag name="samba">Add support for NTLM auth. See: + <flag name="realtime">Pull in <pkg>sys-auth/rtkit</pkg> for low-latency pulseaudio support</flag> + <flag name="run-exes">Use Wine to open and run .EXE and .MSI files</flag> + <flag name="samba">Add support for NTLM auth. See: https://web.archive.org/web/20160108123008/http://wiki.winehq.org:80/NtlmAuthSetupGuide and https://web.archive.org/web/20150906013746/http://wiki.winehq.org/NtlmSigningAndSealing - (these pages are not currently in the updated WineHQ Wiki).</flag> - <flag name="sdl">Add support for gamepad detection using SDL</flag> - <flag name="udev">Use <pkg>virtual/libudev</pkg> to provide plug and play support</flag> - <flag name="unwind">Use <pkg>sys-libs/libunwind</pkg> to unwind the stack</flag> - <flag name="usb">Use <pkg>virtual/libusb</pkg> to provide USB support</flag> - <flag name="vkd3d">Use <pkg>app-emulation/vkd3d</pkg> to provide Direct3D 12 support</flag> - <flag name="vulkan">Enable Vulkan drivers</flag> - </use> - <upstream> - <remote-id type="sourceforge">wine</remote-id> - </upstream> -</pkgmetadata> + (these pages are not currently in the updated WineHQ Wiki).</flag> + <flag name="sdl">Add support for gamepad detection using SDL</flag> + <flag name="udev">Use <pkg>virtual/libudev</pkg> to provide plug and play support</flag> + <flag name="unwind">Use <pkg>sys-libs/libunwind</pkg> to unwind the stack</flag> + <flag name="usb">Use <pkg>virtual/libusb</pkg> to provide USB support</flag> + <flag name="vkd3d">Use <pkg>app-emulation/vkd3d</pkg> to provide Direct3D 12 support</flag> + <flag name="vulkan">Enable Vulkan drivers</flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.0.2.ebuild index c13d5834460c..2efdd7b61d9b 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-5.0.2.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-5.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,7 +16,6 @@ if [[ ${PV} == "9999" ]] ; then EGIT_BRANCH="master" inherit git-r3 SRC_URI="" - #KEYWORDS="" else MAJOR_V=$(ver_cut 1) SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz" diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.0.3-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.0.3-r1.ebuild index 5f25770ac604..625841699e98 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-5.0.3-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-5.0.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,7 +16,6 @@ if [[ ${PV} == "9999" ]] ; then EGIT_BRANCH="master" inherit git-r3 SRC_URI="" - #KEYWORDS="" else MAJOR_V=$(ver_cut 1) SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz" diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.20.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.20.ebuild deleted file mode 100644 index 226b93efb90f..000000000000 --- a/app-emulation/wine-vanilla/wine-vanilla-5.20.ebuild +++ /dev/null @@ -1,539 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW" -PLOCALE_BACKUP="en" - -inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils - -MY_PN="${PN%%-*}" -MY_P="${MY_PN}-${PV}" - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://source.winehq.org/git/wine.git" - EGIT_BRANCH="master" - inherit git-r3 - SRC_URI="" - #KEYWORDS="" -else - MAJOR_V=$(ver_cut 1) - SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz" - KEYWORDS="-* ~amd64 ~x86" -fi -S="${WORKDIR}/${MY_P}" - -GWP_V="20200523" -PATCHDIR="${WORKDIR}/gentoo-wine-patches" - -DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" -HOMEPAGE="https://www.winehq.org/" -SRC_URI="${SRC_URI} - https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz -" - -LICENSE="LGPL-2.1" -SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind v4l vkd3d vulkan +X +xcomposite xinerama +xml" -REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) - X? ( truetype ) - elibc_glibc? ( threads ) - osmesa? ( opengl ) - test? ( abi_x86_32 ) - vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124 - -# FIXME: the test suite is unsuitable for us; many tests require net access -# or fail due to Xvfb's opengl limitations. -RESTRICT="test" - -COMMON_DEPEND=" - X? ( - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] - x11-libs/libXrandr[${MULTILIB_USEDEP}] - x11-libs/libXi[${MULTILIB_USEDEP}] - x11-libs/libXxf86vm[${MULTILIB_USEDEP}] - ) - alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) - capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) - cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) - faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] ) - fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) - gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) - gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) - gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] ) - gstreamer? ( - media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] - media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] - ) - jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) - kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) - lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] ) - ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) - mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] ) - ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] ) - netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] ) - nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] ) - odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] ) - openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] ) - opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) - opengl? ( - virtual/glu[${MULTILIB_USEDEP}] - virtual/opengl[${MULTILIB_USEDEP}] - ) - osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] ) - pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] ) - png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) - pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) - scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) - sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] ) - ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) - truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) - udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) - udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) - unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) - v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) - vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] ) - vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) - xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) - xml? ( - dev-libs/libxml2[${MULTILIB_USEDEP}] - dev-libs/libxslt[${MULTILIB_USEDEP}] - )" - -RDEPEND="${COMMON_DEPEND} - app-emulation/wine-desktop-common - >app-eselect/eselect-wine-0.3 - !app-emulation/wine:0 - dos? ( >=games-emulation/dosbox-0.74_p20160629 ) - gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] ) - mono? ( app-emulation/wine-mono:5.1.1 ) - perl? ( - dev-lang/perl - dev-perl/XML-Simple - ) - pulseaudio? ( - realtime? ( sys-auth/rtkit ) - ) - samba? ( >=net-fs/samba-3.0.25[winbind] ) - selinux? ( sec-policy/selinux-wine ) - udisks? ( sys-fs/udisks:2 )" - -# tools/make_requests requires perl -DEPEND="${COMMON_DEPEND} - sys-devel/flex - >=sys-kernel/linux-headers-2.6 - virtual/pkgconfig - virtual/yacc - X? ( x11-base/xorg-proto ) - prelink? ( sys-devel/prelink ) - xinerama? ( x11-base/xorg-proto )" - -# These use a non-standard "Wine" category, which is provided by -# /etc/xdg/applications-merged/wine.menu -QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop -usr/share/applications/wine-notepad.desktop -usr/share/applications/wine-uninstaller.desktop -usr/share/applications/wine-winecfg.desktop" - -PATCHES=( - "${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726 - "${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 - "${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch" -) -PATCHES_BIN=() - -# https://bugs.gentoo.org/show_bug.cgi?id=635222 -if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then - DEPEND+=" dev-util/patchbin" -fi - -wine_compiler_check() { - [[ ${MERGE_TYPE} = "binary" ]] && return 0 - - # GCC-specific bugs - if tc-is-gcc; then - # bug #549768 - if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then - ebegin "Checking for gcc-5 ms_abi compiler bug" - $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die - # Run in subshell to prevent "Aborted" message - ( "${T}"/pr66838 || false ) >/dev/null 2>&1 - if ! eend $?; then - eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" - eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," - eerror "or use gcc-config to select a different compiler version." - eerror "See https://bugs.gentoo.org/549768" - eerror - return 1 - fi - fi - # bug #574044 - if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then - ebegin "Checking for gcc-5-3 stack realignment compiler bug" - # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 - if ! eend $?; then - eerror "Wine cannot be built with this version of gcc-5.3" - eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," - eerror "or use gcc-config to select a different compiler version." - eerror "See https://bugs.gentoo.org/574044" - eerror - return 1 - fi - fi - fi - - # Ensure compiler support - if use abi_x86_64; then - ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" - # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) - if ! eend $?; then - eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" - eerror - eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" - eerror - return 1 - fi - fi -} - -wine_build_environment_check() { - [[ ${MERGE_TYPE} = "binary" ]] && return 0 - - if use abi_x86_64; then - if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then - eerror "You need gcc-4.4+ to compile 64-bit wine" - die - elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then - eerror "You need clang-3.8+ to compile 64-bit wine" - die - fi - fi - if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then - ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" - ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" - ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" - fi - if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then - if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then - ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" - ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." - ewarn "See package.env in man 5 portage for more information on how to do this." - ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" - fi - fi - - if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then - eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." - eerror "See https://bugs.gentoo.org/487864 for more details." - eerror - return 1 - fi -} - -wine_env_vcs_vars() { - local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT" - local pn_live_val="${pn_live_var}" - eval pn_live_val='$'${pn_live_val} - if [[ ! -z ${EGIT_COMMIT} ]]; then - eerror "Commits must now be specified using the environmental variables" - eerror "EGIT_OVERRIDE_COMMIT_WINE" - eerror - return 1 - fi -} - -pkg_pretend() { - wine_build_environment_check || die - - # Verify OSS support - if use oss && ! use kernel_FreeBSD; then - if ! has_version ">=media-sound/oss-4"; then - eerror "You cannot build wine with USE=oss without having support from a" - eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)" - eerror - die - fi - fi -} - -pkg_setup() { - wine_build_environment_check || die - wine_env_vcs_vars || die - - WINE_VARIANT="${PN#wine}-${PV}" - WINE_VARIANT="${WINE_VARIANT#-}" - - MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}" - MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}" - MY_DATADIR="${MY_DATAROOTDIR}" - MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" - MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}" - MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}" - MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}" - MY_MANDIR="${MY_DATADIR}/man" -} - -src_unpack() { - if [[ ${PV} == "9999" ]] ; then - EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack - fi - - default - - l10n_find_plocales_changes "${S}/po" "" ".po" -} - -src_prepare() { - - eapply_bin(){ - local patch - for patch in ${PATCHES_BIN[@]}; do - patchbin --nogit < "${patch}" || die - done - } - - local md5="$(md5sum server/protocol.def)" - - default - eapply_bin - eautoreconf - - # Modification of the server protocol requires regenerating the server requests - if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then - einfo "server/protocol.def was patched; running tools/make_requests" - tools/make_requests || die #432348 - fi - sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die - if ! use run-exes; then - sed -i '/^MimeType/d' loader/wine.desktop || die #117785 - fi - - # Edit wine.desktop to work for specific variant - sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die - - # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 - cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die - - l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS - - # Fix manpage generation for locales #469418 and abi_x86_64 #617864 - - # Duplicate manpages input files for wine64 - local f - for f in loader/*.man.in; do - cp ${f} ${f/wine/wine64} || die - done - # Add wine64 manpages to Makefile - if use abi_x86_64; then - sed -i "/wine.man.in/i \ - \\\twine64.man.in \\\\" loader/Makefile.in || die - sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\ -\164\2/' loader/Makefile.in || die - fi - - rm_man_file(){ - local file="${1}" - loc=${2} - sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die - } - - while read f; do - l10n_for_each_disabled_locale_do rm_man_file "${f}" - done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print) -} - -src_configure() { - wine_compiler_check || die - - export LDCONFIG=/bin/true - use custom-cflags || strip-flags - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myconf=( - --prefix="${MY_PREFIX}" - --datarootdir="${MY_DATAROOTDIR}" - --datadir="${MY_DATADIR}" - --docdir="${MY_DOCDIR}" - --includedir="${MY_INCLUDEDIR}" - --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}" - --libexecdir="${MY_LIBEXECDIR}" - --localstatedir="${MY_LOCALSTATEDIR}" - --mandir="${MY_MANDIR}" - --sysconfdir="${EPREFIX}/etc/wine" - $(use_with alsa) - $(use_with capi) - $(use_with lcms cms) - $(use_with cups) - $(use_with ncurses curses) - $(use_with udisks dbus) - $(use_with faudio) - $(use_with fontconfig) - $(use_with ssl gnutls) - $(use_enable gecko mshtml) - $(use_with gphoto2 gphoto) - $(use_with gsm) - $(use_with gssapi) - $(use_with gstreamer) - --without-hal - $(use_with jpeg) - $(use_with kerberos krb5) - $(use_with ldap) - --without-mingw # linux LDFLAGS leak in mingw32: bug #685172 - $(use_enable mono mscoree) - $(use_with mp3 mpg123) - $(use_with netapi) - $(use_with nls gettext) - $(use_with openal) - $(use_with opencl) - $(use_with opengl) - $(use_with osmesa) - $(use_with oss) - $(use_with pcap) - $(use_with png) - $(use_with pulseaudio pulse) - $(use_with threads pthread) - $(use_with scanner sane) - $(use_with sdl) - $(use_enable test tests) - $(use_with truetype freetype) - $(use_with udev) - $(use_with unwind) - $(use_with v4l v4l2) - $(use_with vkd3d) - $(use_with vulkan) - $(use_with X x) - $(use_with X xfixes) - $(use_with xcomposite) - $(use_with xinerama) - $(use_with xml) - $(use_with xml xslt) - ) - - local PKG_CONFIG - # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038 - tc-export PKG_CONFIG - - if use amd64; then - if [[ ${ABI} == amd64 ]]; then - myconf+=( --enable-win64 ) - else - myconf+=( --disable-win64 ) - fi - - # Note: using --with-wine64 results in problems with multilib.eclass - # CC/LD hackery. We're using separate tools instead. - fi - - ECONF_SOURCE=${S} \ - econf "${myconf[@]}" - emake depend -} - -multilib_src_test() { - # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader" - if [[ ${ABI} == x86 ]]; then - if [[ $(id -u) == 0 ]]; then - ewarn "Skipping tests since they cannot be run under the root user." - ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf" - return - fi - - WINEPREFIX="${T}/.wine-${ABI}" \ - Xemake test - fi -} - -multilib_src_install_all() { - local DOCS=( ANNOUNCE AUTHORS README ) - add_locale_docs() { - local locale_doc="documentation/README.$1" - [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} ) - } - l10n_for_each_locale_do add_locale_docs - - einstalldocs - prune_libtool_files --all - - if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script - rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \ - "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die - fi - - # Remove wineconsole if neither backend is installed #551124 - if ! use X && ! use ncurses; then - rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die - rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die - rm_wineconsole() { - rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die - } - multilib_foreach_abi rm_wineconsole - fi - - use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055 - use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} - - # Avoid double prefix from dosym and make_wrapper - MY_PREFIX=${MY_PREFIX#${EPREFIX}} - - if use abi_x86_64 && ! use abi_x86_32; then - dosym wine64 "${MY_PREFIX}"/bin/wine # 404331 - dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader - fi - - # Failglob for binloops, shouldn't be necessary, but including to stay safe - eshopts_push -s failglob #615218 - # Make wrappers for binaries for handling multiple variants - # Note: wrappers instead of symlinks because some are shell which use basename - local b - for b in "${ED%/}${MY_PREFIX}"/bin/*; do - make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" - done - eshopts_pop -} - -pkg_postinst() { - eselect wine register ${P} - if [[ ${PN} == "wine-vanilla" ]]; then - eselect wine register --vanilla ${P} || die - fi - - eselect wine update --all --if-unset || die - - xdg_desktop_database_update - - if ! use gecko; then - ewarn "Without Wine Gecko, wine prefixes will not have a default" - ewarn "implementation of iexplore. Many older windows applications" - ewarn "rely upon the existence of an iexplore implementation, so" - ewarn "you will likely need to install an external one, like via winetricks" - fi - if ! use mono; then - ewarn "Without Wine Mono, wine prefixes will not have a default" - ewarn "implementation of .NET. Many windows applications rely upon" - ewarn "the existence of a .NET implementation, so you will likely need" - ewarn "to install an external one, like via winetricks" - fi -} - -pkg_prerm() { - eselect wine deregister ${P} - if [[ ${PN} == "wine-vanilla" ]]; then - eselect wine deregister --vanilla ${P} || die - fi - - eselect wine update --all --if-unset || die -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.0.ebuild index 8234054004a2..ab66fc3ad9a5 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-6.0.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-6.0.ebuild @@ -16,7 +16,6 @@ if [[ ${PV} == "9999" ]] ; then EGIT_BRANCH="master" inherit git-r3 SRC_URI="" - #KEYWORDS="" else MAJOR_V=$(ver_cut 1) SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz" diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.1.ebuild index c5ffac5326bb..6acf7ba85bfe 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-6.1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-6.1.ebuild @@ -16,7 +16,6 @@ if [[ ${PV} == "9999" ]] ; then EGIT_BRANCH="master" inherit git-r3 SRC_URI="" - #KEYWORDS="" else MAJOR_V=$(ver_cut 1) SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz" diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.21.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.2.ebuild index 226b93efb90f..5aefd6ebbfac 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-5.21.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-6.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,7 +16,6 @@ if [[ ${PV} == "9999" ]] ; then EGIT_BRANCH="master" inherit git-r3 SRC_URI="" - #KEYWORDS="" else MAJOR_V=$(ver_cut 1) SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz" @@ -35,7 +34,7 @@ SRC_URI="${SRC_URI} LICENSE="LGPL-2.1" SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind v4l vkd3d vulkan +X +xcomposite xinerama +xml" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama +xml" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) @@ -73,7 +72,6 @@ COMMON_DEPEND=" lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] ) ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] ) - ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] ) netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] ) nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] ) odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] ) @@ -94,6 +92,7 @@ COMMON_DEPEND=" udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) + usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] ) v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] ) vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) @@ -109,8 +108,8 @@ RDEPEND="${COMMON_DEPEND} >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) - gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] ) - mono? ( app-emulation/wine-mono:5.1.1 ) + gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) + mono? ( app-emulation/wine-mono:6.0.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple @@ -261,6 +260,34 @@ pkg_pretend() { die fi fi + + if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then + eerror + eerror "USE=\"mingw\" is currently experimental, and requires the" + eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds." + eerror + eerror "These can be installed by using 'sys-devel/crossdev':" + eerror + eerror "crossdev --target i686-w64-mingw32" + eerror + eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw" + eerror + die "MinGW build was enabled, but no compiler to support it was found." + fi + + if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then + eerror + eerror "USE=\"mingw\" is currently experimental, and requires the" + eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds." + eerror + eerror "These can be installed by using 'sys-devel/crossdev':" + eerror + eerror "crossdev --target x86_64-w64-mingw32" + eerror + eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw" + eerror + die "MinGW build was enabled, but no compiler to support it was found." + fi } pkg_setup() { @@ -354,6 +381,9 @@ src_configure() { export LDCONFIG=/bin/true use custom-cflags || strip-flags + if use mingw; then + export CROSSCFLAGS="${CFLAGS}" + fi multilib-minimal_src_configure } @@ -374,7 +404,6 @@ multilib_src_configure() { $(use_with capi) $(use_with lcms cms) $(use_with cups) - $(use_with ncurses curses) $(use_with udisks dbus) $(use_with faudio) $(use_with fontconfig) @@ -388,7 +417,8 @@ multilib_src_configure() { $(use_with jpeg) $(use_with kerberos krb5) $(use_with ldap) - --without-mingw # linux LDFLAGS leak in mingw32: bug #685172 + # TODO: Will bug 685172 still need special handling? + $(use_with mingw) $(use_enable mono mscoree) $(use_with mp3 mpg123) $(use_with netapi) @@ -408,6 +438,7 @@ multilib_src_configure() { $(use_with truetype freetype) $(use_with udev) $(use_with unwind) + $(use_with usb) $(use_with v4l v4l2) $(use_with vkd3d) $(use_with vulkan) @@ -470,12 +501,20 @@ multilib_src_install_all() { fi # Remove wineconsole if neither backend is installed #551124 - if ! use X && ! use ncurses; then + if ! use X; then rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die - rm_wineconsole() { - rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die - } + + if ! use mingw; then + rm_wineconsole() { + rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/{,fakedlls/}wineconsole.exe* || die + } + else + rm_wineconsole() { + rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/wineconsole.exe* || die + } + fi + multilib_foreach_abi rm_wineconsole fi diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.22-r2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.3.ebuild index 97ea9019cb11..045e3bfde6b8 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-5.22-r2.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-6.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -35,7 +35,7 @@ SRC_URI="${SRC_URI} LICENSE="LGPL-2.1" SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind v4l vkd3d vulkan +X +xcomposite xinerama +xml" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama +xml" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) @@ -93,6 +93,7 @@ COMMON_DEPEND=" udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) + usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] ) v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] ) vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) @@ -108,8 +109,8 @@ RDEPEND="${COMMON_DEPEND} >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) - gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] ) - mono? ( app-emulation/wine-mono:5.1.1 ) + gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) + mono? ( app-emulation/wine-mono:6.0.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple @@ -438,6 +439,7 @@ multilib_src_configure() { $(use_with truetype freetype) $(use_with udev) $(use_with unwind) + $(use_with usb) $(use_with v4l v4l2) $(use_with vkd3d) $(use_with vulkan) diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index c5ffac5326bb..5aefd6ebbfac 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -16,7 +16,6 @@ if [[ ${PV} == "9999" ]] ; then EGIT_BRANCH="master" inherit git-r3 SRC_URI="" - #KEYWORDS="" else MAJOR_V=$(ver_cut 1) SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz" @@ -110,7 +109,7 @@ RDEPEND="${COMMON_DEPEND} !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) - mono? ( app-emulation/wine-mono:5.1.1 ) + mono? ( app-emulation/wine-mono:6.0.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple diff --git a/app-emulation/winetricks/metadata.xml b/app-emulation/winetricks/metadata.xml index 15c062872f15..917887d0ff8d 100644 --- a/app-emulation/winetricks/metadata.xml +++ b/app-emulation/winetricks/metadata.xml @@ -1,24 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>chiitoo@gentoo.org</email> - <name>Jimi Huotari</name> - </maintainer> - <maintainer type="person"> - <email>NP-Hardass@gentoo.org</email> - <name>NP-Hardass</name> - </maintainer> - <maintainer type="project"> - <email>wine@gentoo.org</email> - <name>Wine</name> - </maintainer> - <upstream> - <remote-id type="google-code">winetricks</remote-id> - <remote-id type="github">Winetricks/winetricks</remote-id> - </upstream> - <use> - <flag name="rar">Pull in <pkg>app-arch/unrar</pkg> for extraction of + <maintainer type="person"> + <email>chiitoo@gentoo.org</email> + <name>Jimi Huotari</name> + </maintainer> + <maintainer type="person"> + <email>NP-Hardass@gentoo.org</email> + <name>NP-Hardass</name> + </maintainer> + <maintainer type="project"> + <email>wine@gentoo.org</email> + <name>Wine</name> + </maintainer> + <upstream> + <remote-id type="google-code">winetricks</remote-id> + <remote-id type="github">Winetricks/winetricks</remote-id> + </upstream> + <use> + <flag name="rar">Pull in <pkg>app-arch/unrar</pkg> for extraction of rar-compressed game files</flag> - </use> -</pkgmetadata> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/x48/metadata.xml b/app-emulation/x48/metadata.xml index e4472f348708..9ae8e1c822b2 100644 --- a/app-emulation/x48/metadata.xml +++ b/app-emulation/x48/metadata.xml @@ -1,14 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>voyageur@gentoo.org</email> - <name>Bernard Cafarelli</name> - </maintainer> - <use> - <flag name="readline">Enables support for libreadline</flag> - </use> - <upstream> - <remote-id type="sourceforge">x48.berlios</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="person"> + <email>voyageur@gentoo.org</email> + <name>Bernard Cafarelli</name> + </maintainer> + <upstream> + <remote-id type="sourceforge">x48.berlios</remote-id> + </upstream> + <use> + <flag name="readline">Enables support for libreadline</flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/xcpc/metadata.xml b/app-emulation/xcpc/metadata.xml index 55dccaa5b8f2..45b5de77feb0 100644 --- a/app-emulation/xcpc/metadata.xml +++ b/app-emulation/xcpc/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">xcpc</remote-id> - </upstream> -</pkgmetadata> + <upstream> + <remote-id type="sourceforge">xcpc</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/xe-guest-utilities/metadata.xml b/app-emulation/xe-guest-utilities/metadata.xml index b1dc4728a9d2..96a57ffc08af 100644 --- a/app-emulation/xe-guest-utilities/metadata.xml +++ b/app-emulation/xe-guest-utilities/metadata.xml @@ -1,26 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>chicago@blkid.net</email> - <name>Chicago</name> -</maintainer> -<maintainer type="person"> - <email>robbat2@gentoo.org</email> -</maintainer> -<maintainer type="project"> - <email>openstack@gentoo.org</email> - <name>Openstack</name> -</maintainer> -<maintainer type="project"> - <email>virtualization@gentoo.org</email> - <name>Gentoo Virtualization Project</name> -</maintainer> -<maintainer type="project"> - <email>xen@gentoo.org</email> - <name>Gentoo Xen Project</name> -</maintainer> -<use> - <flag name="xenstore">Use xenstore binaries bundled by Citrix instead of building app-emulation/xen-tools</flag> -</use> -</pkgmetadata> + <maintainer type="person"> + <email>chicago@blkid.net</email> + <name>Chicago</name> + </maintainer> + <maintainer type="person"> + <email>robbat2@gentoo.org</email> + </maintainer> + <maintainer type="project"> + <email>openstack@gentoo.org</email> + <name>Openstack</name> + </maintainer> + <maintainer type="project"> + <email>virtualization@gentoo.org</email> + <name>Gentoo Virtualization Project</name> + </maintainer> + <maintainer type="project"> + <email>xen@gentoo.org</email> + <name>Gentoo Xen Project</name> + </maintainer> + + <use> + <flag name="xenstore">Use xenstore binaries bundled by Citrix instead of building app-emulation/xen-tools</flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/xen-pvgrub/metadata.xml b/app-emulation/xen-pvgrub/metadata.xml index fd12a2726425..94833361f96a 100644 --- a/app-emulation/xen-pvgrub/metadata.xml +++ b/app-emulation/xen-pvgrub/metadata.xml @@ -1,16 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>hydrapolic@gmail.com</email> - <name>Tomáš Mózes</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <maintainer type="project"> - <email>xen@gentoo.org</email> - <name>Gentoo Xen Project</name> - </maintainer> -</pkgmetadata> + <maintainer type="person"> + <email>hydrapolic@gmail.com</email> + <name>Tomáš Mózes</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <maintainer type="project"> + <email>xen@gentoo.org</email> + <name>Gentoo Xen Project</name> + </maintainer> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/xen-tools/metadata.xml b/app-emulation/xen-tools/metadata.xml index 71d5db7e3eba..83ce794b5d46 100644 --- a/app-emulation/xen-tools/metadata.xml +++ b/app-emulation/xen-tools/metadata.xml @@ -1,31 +1,33 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>hydrapolic@gmail.com</email> - <name>Tomáš Mózes</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <maintainer type="project"> - <email>xen@gentoo.org</email> - <name>Gentoo Xen Project</name> - </maintainer> - <use> - <flag name="api">Build the C libxenapi bindings</flag> - <flag name="flask">Enable the Flask XSM module from NSA</flag> - <flag name="hvm">Enable support for hardware based virtualization (VT-x,AMD-v)</flag> - <flag name="ipxe">Enable ipxe support</flag> - <flag name="ovmf">Enable support to boot UEFI guest vm, needed by hvm</flag> - <flag name="pygrub">Install the pygrub boot loader</flag> - <flag name="qemu">Enable IOEMU support via the use of qemu-dm</flag> - <flag name="qemu-traditional">Build the old qemu traditional device model (useful only if you cannot change to the new device model e.g. Windows VMs)</flag> - <flag name="rombios">Enable rombios support, needed by ipxe</flag> - <flag name="screen">Enable support for running domain U console in an <pkg>app-misc/screen</pkg> session</flag> - <flag name="system-ipxe">Using <pkg>sys-firmware/ipxe</pkg> instead of the bundled one</flag> - <flag name="system-qemu">Using <pkg>app-emulation/qemu</pkg> instead of the bundled one</flag> - <flag name="system-seabios">Using <pkg>sys-firmware/seabios</pkg> instead of the bundled one</flag> - </use> -</pkgmetadata> + <maintainer type="person"> + <email>hydrapolic@gmail.com</email> + <name>Tomáš Mózes</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <maintainer type="project"> + <email>xen@gentoo.org</email> + <name>Gentoo Xen Project</name> + </maintainer> + + <use> + <flag name="api">Build the C libxenapi bindings</flag> + <flag name="flask">Enable the Flask XSM module from NSA</flag> + <flag name="hvm">Enable support for hardware based virtualization (VT-x,AMD-v)</flag> + <flag name="ipxe">Enable ipxe support</flag> + <flag name="ovmf">Enable support to boot UEFI guest vm, needed by hvm</flag> + <flag name="pygrub">Install the pygrub boot loader</flag> + <flag name="qemu">Enable IOEMU support via the use of qemu-dm</flag> + <flag name="qemu-traditional">Build the old qemu traditional device model (useful only if you cannot change to the new device model e.g. Windows VMs)</flag> + <flag name="rombios">Enable rombios support, needed by ipxe</flag> + <flag name="screen">Enable support for running domain U console in an <pkg>app-misc/screen</pkg> session</flag> + <flag name="system-ipxe">Using <pkg>sys-firmware/ipxe</pkg> instead of the bundled one</flag> + <flag name="system-qemu">Using <pkg>app-emulation/qemu</pkg> instead of the bundled one</flag> + <flag name="system-seabios">Using <pkg>sys-firmware/seabios</pkg> instead of the bundled one</flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest index e33f7425bb5c..6a5899a75960 100644 --- a/app-emulation/xen/Manifest +++ b/app-emulation/xen/Manifest @@ -1,3 +1,5 @@ DIST xen-4.13.2-upstream-patches-3.tar.xz 63660 BLAKE2B 80abc9529ff49e782b64d4b5032f724e7d95fd255c2a06b7065c693d5765e1db1df44ebd5ce00c5a1e1ff24e1e5d344b0c2e459c68282e58fa20963e208272d2 SHA512 35288a1feac1316c33586dad55685e2c6a30100795e31852f78455003ce3dd6906074bea023655ee545a97fe4a0a8ad9a05ab91fd83186e61e5b57d10aa6b155 +DIST xen-4.13.2-upstream-patches-4.tar.xz 65324 BLAKE2B 0e71e4600fffcf1341a52103a6318485c1da54101ec59dbdb9824be5a5ed1f977135a9c3e4ce48cf14922aa0a2e3ff5097dc870286e3b142d060c22d78079cb3 SHA512 3f0e41b685655c7753204862ea6b8e502ff4b4f76e4788ca07ab93a4bb3c636d24ad933c578f7c6e4c866cfb0d6b7b7234124da7c2fed0a4b34f2fbe401c56e1 DIST xen-4.13.2.tar.gz 39037826 BLAKE2B ad2b7c3003ca29e5e60a85c581f706ef87d99eadf939ed36ebe8f6698582f7a29dbdaf502039b60a0afe7ad4ae6ce89713e69dc8b8a7d5abe65063da7f1baa5b SHA512 cd3092281c97e9421e303aa288aac04dcccd5536ba7c0ff4d51fbf3d07b5ffacfe3456ba06f5cf63577dafbf8cf3a5d9825ceb5e9ef8ca1427900cc3e57b50a3 +DIST xen-4.14.1-upstream-patches-1.tar.xz 11676 BLAKE2B 0d593b34e3b1b95b57c54ccc96666eb5bf36d63ba742dd9d6e6f5facdf57be62e1f8375beb23926967e6ea23c1e4fa459bb5087652716d7e45b2309440f81b0d SHA512 e530883d17738b4821fa36fd39a7597bdb42810e40740c7a3363c22945d71af80312340f6d33b18f5999498e59036f22033b7babe217bac7700702d007d5d881 DIST xen-4.14.1.tar.gz 39970115 BLAKE2B 21e5838b2b4d78420dcaaae2b8fc98ac876230217e6a3764aa643920150b8cef96025663e6a2fc423ab15f7f470b62547e91ce1be0337fc78f00c148c7ff40ab SHA512 c75cbec82793435f5a7026626ffdb2e9a2166b42d2be4b2f1194240e0312458124f0ebd53eeb02ce7330c22afe402a28a96b32f8af66e41e9416fe94535724c9 diff --git a/app-emulation/xen/metadata.xml b/app-emulation/xen/metadata.xml index 574d6261f8e3..197a490c43bd 100644 --- a/app-emulation/xen/metadata.xml +++ b/app-emulation/xen/metadata.xml @@ -1,20 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>hydrapolic@gmail.com</email> - <name>Tomáš Mózes</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <maintainer type="project"> - <email>xen@gentoo.org</email> - <name>Gentoo Xen Project</name> - </maintainer> - <use> - <flag name="flask">Enable the Flask XSM module from NSA</flag> - <flag name="efi">Adds efi boot support, requires LDFLAG -melf_x86_64 for amd64</flag> - </use> -</pkgmetadata> + <maintainer type="person"> + <email>hydrapolic@gmail.com</email> + <name>Tomáš Mózes</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <maintainer type="project"> + <email>xen@gentoo.org</email> + <name>Gentoo Xen Project</name> + </maintainer> + <upstream> + <remote-id type="cpe">cpe:/a:citrix:xen</remote-id> + </upstream> + <use> + <flag name="flask">Enable the Flask XSM module from NSA</flag> + <flag name="efi">Adds efi boot support, requires LDFLAG -melf_x86_64 for amd64</flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/app-emulation/xen/xen-4.13.2-r5.ebuild b/app-emulation/xen/xen-4.13.2-r5.ebuild new file mode 100644 index 000000000000..4a5fb0db306d --- /dev/null +++ b/app-emulation/xen/xen-4.13.2-r5.ebuild @@ -0,0 +1,165 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) + +inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs + +MY_PV=${PV/_/-} +MY_P=${PN}-${MY_PV} + +if [[ $PV == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="git://xenbits.xen.org/xen.git" + SRC_URI="" +else + KEYWORDS="amd64 ~arm -x86" + UPSTREAM_VER=4 + SECURITY_VER= + GENTOO_VER= + + [[ -n ${UPSTREAM_VER} ]] && \ + UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz + https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" + [[ -n ${SECURITY_VER} ]] && \ + SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz" + [[ -n ${GENTOO_VER} ]] && \ + GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz" + SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz + ${UPSTREAM_PATCHSET_URI} + ${SECURITY_PATCHSET_URI} + ${GENTOO_PATCHSET_URI}" +fi + +DESCRIPTION="The Xen virtual machine monitor" +HOMEPAGE="https://www.xenproject.org" +LICENSE="GPL-2" +SLOT="0" +IUSE="debug efi flask" + +DEPEND="${PYTHON_DEPS} + efi? ( >=sys-devel/binutils-2.22[multitarget] ) + !efi? ( >=sys-devel/binutils-2.22 )" +RDEPEND="" +PDEPEND="~app-emulation/xen-tools-${PV}" + +# no tests are available for the hypervisor +# prevent the silliness of /usr/lib/debug/usr/lib/debug files +# prevent stripping of the debug info from the /usr/lib/debug/xen-syms +RESTRICT="test splitdebug strip" + +# Approved by QA team in bug #144032 +QA_WX_LOAD="boot/xen-syms-${PV}" + +REQUIRED_USE="arm? ( debug )" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + python-any-r1_pkg_setup + if [[ -z ${XEN_TARGET_ARCH} ]]; then + if use amd64; then + export XEN_TARGET_ARCH="x86_64" + elif use arm; then + export XEN_TARGET_ARCH="arm32" + elif use arm64; then + export XEN_TARGET_ARCH="arm64" + else + die "Unsupported architecture!" + fi + fi + + if use flask ; then + export "XSM_ENABLE=y" + export "FLASK_ENABLE=y" + fi +} + +src_prepare() { + # Upstream's patchset + [[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream + + # Security patchset + if [[ -n ${SECURITY_VER} ]]; then + einfo "Try to apply Xen Security patch set" + # apply main xen patches + # Two parallel systems, both work side by side + # Over time they may concdense into one. This will suffice for now + source "${WORKDIR}"/patches-security/${PV}.conf + + local i + for i in ${XEN_SECURITY_MAIN}; do + eapply "${WORKDIR}"/patches-security/xen/$i + done + fi + + # Gentoo's patchset + [[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo + + eapply "${FILESDIR}"/${PN}-4.11-efi.patch + + # Drop .config + sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" + + if use efi; then + export EFI_VENDOR="gentoo" + export EFI_MOUNTPOINT="/boot" + fi + + default +} + +src_configure() { + use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i" + + use debug && myopt="${myopt} debug=y" + + # remove flags + unset CFLAGS + unset LDFLAGS + unset ASFLAGS + + tc-ld-disable-gold # Bug 700374 +} + +src_compile() { + # Send raw LDFLAGS so that --as-needed works + emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt} +} + +src_install() { + local myopt + use debug && myopt="${myopt} debug=y" + + # The 'make install' doesn't 'mkdir -p' the subdirs + if use efi; then + mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die + fi + + emake LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" DESTDIR="${D}" -C xen ${myopt} install + + # make install likes to throw in some extra EFI bits if it built + use efi || rm -rf "${D}/usr/$(get_libdir)/efi" +} + +pkg_postinst() { + elog "Official Xen Guide:" + elog " https://wiki.gentoo.org/wiki/Xen" + + use efi && einfo "The efi executable is installed in /boot/efi/gentoo" + + elog "You can optionally block the installation of /boot/xen-syms by an entry" + elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK" + elog "e.g. echo ${msg} > /etc/portage/env/xen.conf" + + ewarn + ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause" + ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems" + ewarn "to work fine." + ewarn + ewarn "Add sched=credit to xen command line options to use the legacy scheduler." + ewarn + ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B" +} diff --git a/app-emulation/xen/xen-4.14.1.ebuild b/app-emulation/xen/xen-4.14.1-r1.ebuild index bd7ef7b71e8a..97cfe2f833a0 100644 --- a/app-emulation/xen/xen-4.14.1.ebuild +++ b/app-emulation/xen/xen-4.14.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then SRC_URI="" else KEYWORDS="~amd64 ~arm -x86" - UPSTREAM_VER= + UPSTREAM_VER=1 SECURITY_VER= GENTOO_VER= @@ -138,7 +138,7 @@ src_install() { mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die fi - emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install + emake LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" DESTDIR="${D}" -C xen ${myopt} install # make install likes to throw in some extra EFI bits if it built use efi || rm -rf "${D}/usr/$(get_libdir)/efi" diff --git a/app-emulation/xtrs/metadata.xml b/app-emulation/xtrs/metadata.xml index c7db543a8141..edaa869f8b53 100644 --- a/app-emulation/xtrs/metadata.xml +++ b/app-emulation/xtrs/metadata.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> + <maintainer type="person"> <email>ulm@gentoo.org</email> -</maintainer> -<longdescription> + </maintainer> + <longdescription> xtrs is a Radio Shack TRS-80 Model I/III/4/4P emulator for Unix and the X Window System. It includes lower case, the real time clock, hi-res graphics, serial port, parallel printer, mouse, cassette, sound and music @@ -17,7 +17,9 @@ Physical cassettes can be read and written too. The user interface is a bit spartan, but it gets the job done. </longdescription> -<use> + + <use> <flag name="ls-dos">Install LS-DOS disk images for Model 4P</flag> -</use> -</pkgmetadata> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file |