diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-05-11 23:50:24 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-05-11 23:50:24 +0000 |
| commit | 282084f5e6c93dd6d37a313e18c6addae51be212 (patch) | |
| tree | c26bf1d99495856e51cc74f02ed978b49f1ef67d | |
| parent | 2021-05-10 19:50:36 UTC (diff) | |
| parent | dev-perl/XML-Compile-WSDL11: Add missing test dependency (diff) | |
| download | gentoo-282084f5e6c93dd6d37a313e18c6addae51be212.tar.gz gentoo-282084f5e6c93dd6d37a313e18c6addae51be212.tar.bz2 gentoo-282084f5e6c93dd6d37a313e18c6addae51be212.zip | |
Merge updates from master
286 files changed, 7109 insertions, 3993 deletions
diff --git a/app-admin/conky/conky-1.12.1-r1.ebuild b/app-admin/conky/conky-1.12.1-r1.ebuild index d07d5d164cff..2876405f75a4 100644 --- a/app-admin/conky/conky-1.12.1-r1.ebuild +++ b/app-admin/conky/conky-1.12.1-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="GPL-3 BSD LGPL-2.1 MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ppc ppc64 ~sparc x86" IUSE="apcupsd bundled-toluapp cmus curl doc hddtemp ical iconv imlib iostats ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest index 2f31fef003de..0993b4dc57b2 100644 --- a/app-admin/filebeat/Manifest +++ b/app-admin/filebeat/Manifest @@ -31,6 +31,7 @@ DIST code.cloudfoundry.org%2Frfc5424%2F@v%2Fv0.0.0-20180905210152-236a6d29298a.z DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1 DIST filebeat-7.10.2.tar.gz 87244727 BLAKE2B 77e5967d4ee6b5390ebe19c3c9de9e5cbf6b8d5ffd1c81e2e72a8c3ae6e1aad146f0b5496816785893a51ea77b1ec3fbd050d9f2b54fd2c95ad2228d5a5b5e04 SHA512 eba0cda8521068f4d15dfb39808695a8de47a568e4d11949746a8f698aaff6825848d5e524bd16b0e555786e277512014dfe33d4daee8c3acef9a9867653c1c3 DIST filebeat-7.12.0.tar.gz 94231781 BLAKE2B 3e90888bbf204c8e96066f894ba211feb893d89915dbad9ab023dd7a12551c3f1f839b1d266170637646b1cdfbed3652abae09e5b97babb68efa429fc7b3a682 SHA512 46049bf6e98bc7f29bd312f39afa185fcaec9d11bd7349ab58b2a21095dda25c0dafabaaefe618a47e084191ed8c1a24bc7e7ead32628c15934f8aeffe2e3c81 +DIST filebeat-7.12.1.tar.gz 94237879 BLAKE2B 7f7c1ed0ded8bc52b1830d3448d910bae5b2e775a9b1264271a8e3420fa95d0e4c1e7ee3545d198583af2b90b390f3f8bca0c871ca2ecdd077fcbe284648ba42 SHA512 3e2c49ddab59461f82abc5e3ea0f12941f2ed73a6f23c2f062ec88c85d577ce2b5efb234a110e62e9949490bec4f355f3118508572b93883adc7122d76d33cb1 DIST filebeat-7.9.3.tar.gz 82872010 BLAKE2B e437905a13e556e1bec9b59a8837eb4649f063e4ddb9815a3e18efdc291758e39b5abc0465295f8526f042aecdfc2b8e49ebb6980aeb8b3b13be9d4431863401 SHA512 35c2c8038f0f540e467feef341f3248eadda5e5b1a80c247bcd54c073153a7839f797be327b65c4eee255f4d656e36c57d112b7ff0e637342ccc13f4f59366d7 DIST github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.mod 372 BLAKE2B 80a7e0aac984acb79239b3309290cd8ef1eeca8d9f53b3c91628cbe6dd112706d2313c47e33ac52ea9e8a6417289dacae8e2e72a03e679836d3ed89cb86c0aee SHA512 6db1a52bbab1332ab7e761532cb110394afa1dd69cc5f7443c3fb733c7d95fa712cf6bf8a78fc3f51d89b2d368a248e532bab06bc93e2e663b8f836c91aef0de DIST github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.zip 29788 BLAKE2B c1e493471bca24ac64c8119e624ea077a74678a492b036deb907ede12b5e93c3ef699820cb2ec9468a98d00e83d84c6bb45cf274b4812a0f319a0248610a4d2c SHA512 a412fbe597ab0c47223d733303ed2277656fe35866f52e4ed1f25cc03b691f15f5592cb07b3c5fb39d4cb98c6d73dbc8e1e7869cea17241a33dfc29db0a1d121 @@ -312,6 +313,8 @@ DIST github.com%2Felastic%2Fgosigar%2F@v%2Fv0.10.6-0.20200715000138-f115143bb233 DIST github.com%2Felastic%2Fgosigar%2F@v%2Fv0.10.6-0.20200715000138-f115143bb233.zip 111274 BLAKE2B f7d8f3c732b9349dc7c324b107764ef1aaa6fbad9668dc1d5b85edf914bfcd76795b7860436761a8a5aa9dc2d6df3a3ceb2653f33b643a02577e736e5afcac27 SHA512 cbe1480fd09a7c14eb5c977ca85f3268da634861075847ffe86bdd1338d1d3b87c3441e9ed00b02400179f2651016cc3b6d9d3396c1c980a47137752dbfa7543 DIST github.com%2Felastic%2Fgosigar%2F@v%2Fv0.14.0.mod 175 BLAKE2B c9861c8c57b45cf8f62ce5f238c6f1c56ef12a165df01af9f00d03866f52cbc0604015bf49ce2cee558f0a2c206d264e1606cc82892befbbbe0786c5dc6712c1 SHA512 a6b71a6c74d5b3b5bbd2ba0b899084bd3848d22ac31267b86a0129a98d61fbaf273a0d51b486b784960e7026912775f02fe265b46328c73a55d13bcc4800cc14 DIST github.com%2Felastic%2Fgosigar%2F@v%2Fv0.14.0.zip 115566 BLAKE2B 9f5db34d8ad7d2992cecc64b4888bf25094c1734cd5c65adcd9229ed01d452ca0482ff333242ab115ca366ef11ce8aad6d916fc481b2858012671eb31e3afde4 SHA512 1beec1202f58ba4bcd744b351173bc94d9863f4402b2185234e722a1aa5ddc8b7b357e8ea98b9962078ffd1cabd86ea12d3819cda6a932998a01eab05306c971 +DIST github.com%2Felastic%2Fgosigar%2F@v%2Fv0.14.1.mod 175 BLAKE2B c9861c8c57b45cf8f62ce5f238c6f1c56ef12a165df01af9f00d03866f52cbc0604015bf49ce2cee558f0a2c206d264e1606cc82892befbbbe0786c5dc6712c1 SHA512 a6b71a6c74d5b3b5bbd2ba0b899084bd3848d22ac31267b86a0129a98d61fbaf273a0d51b486b784960e7026912775f02fe265b46328c73a55d13bcc4800cc14 +DIST github.com%2Felastic%2Fgosigar%2F@v%2Fv0.14.1.zip 115821 BLAKE2B c3980759bc2fd41d2639c31163de98c85afb1c6469e0cd5edf7bfac3085b7ab13b395f411e0894f99c489cd5c28a567165d887f5838cabee6b9f9d367fcae9da SHA512 2e9688cd053157c6824e76747d8513bc9d8cab9a565580e780cf55d73b0f6b85be86f23921bd5c1691ff8aa7572475f6515b4f39e0be989277bf4c70fd77d6a2 DIST github.com%2Felastic%2Fsarama%2F@v%2Fv1.19.1-0.20200629123429-0e7b69039eec.mod 1375 BLAKE2B 2078c8e8bb7e18fc469ef77acbfefbd44e6d76c492bd18a8008adf28c5d1fae9cc60d4fc8503a7d66b16a74299e56f673ed6701b34d7a9840afa2fa61be0d2c6 SHA512 31a41e1f8a619aa9dd438be4dcc185d75984a1dd6d7efc5bfd37bf74f63be6a6fb2ca3b4d584bb66f343ca1693b59a2156745689fee29588395ab369fbe32391 DIST github.com%2Felastic%2Fsarama%2F@v%2Fv1.19.1-0.20200629123429-0e7b69039eec.zip 393905 BLAKE2B 91e13d3eaa5fbae1d48d5e02a64fcf2c12237eedb2f5a171795ddee5c1830b2e3006576d37f58468bcbae3fe65ee7a37b1ee8a4c1f78869d5d0b1f9c877e3fc5 SHA512 599747a3a5deac56741c09bd0655c7dea2a3e6e25c1c2d5a851472a6b5cec4bc599d9ed873d6f71fc27a1956ebbf9c30c84ab0d11954d3e02de7352839d2d2eb DIST github.com%2Felastic%2Fsarama%2F@v%2Fv1.19.1-0.20210120173147-5c8cb347d877.mod 1502 BLAKE2B 4f8b3f4403e79cab17ac0de1e8514ac3854cd5b964751b8f3eb19d6fd6623d603e79d1c4e73b2f678ec9e3f3973c44b80a795bfbcea967fccf78e88b652a1653 SHA512 a38dce9a939a1545354ba356e822515c28c39a29ec6be1d3198811303a71298273856ac0898951efd088e8e6fff9371b4ac596b73238b506d753017f6a62e6c8 diff --git a/app-admin/filebeat/filebeat-7.12.1.ebuild b/app-admin/filebeat/filebeat-7.12.1.ebuild new file mode 100644 index 000000000000..a23e00f32a7c --- /dev/null +++ b/app-admin/filebeat/filebeat-7.12.1.ebuild @@ -0,0 +1,1076 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit go-module + +EGO_SUM=( + "4d63.com/embedfiles v0.0.0-20190311033909-995e0740726f" + "4d63.com/embedfiles v0.0.0-20190311033909-995e0740726f/go.mod" + "4d63.com/tz v1.1.1-0.20191124060701-6d37baae851b" + "4d63.com/tz v1.1.1-0.20191124060701-6d37baae851b/go.mod" + "bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod" + "cloud.google.com/go v0.26.0/go.mod" + "cloud.google.com/go v0.34.0/go.mod" + "cloud.google.com/go v0.38.0/go.mod" + "cloud.google.com/go v0.44.1/go.mod" + "cloud.google.com/go v0.44.2/go.mod" + "cloud.google.com/go v0.45.1/go.mod" + "cloud.google.com/go v0.46.3/go.mod" + "cloud.google.com/go v0.51.0" + "cloud.google.com/go v0.51.0/go.mod" + "cloud.google.com/go/bigquery v1.0.1" + "cloud.google.com/go/bigquery v1.0.1/go.mod" + "cloud.google.com/go/datastore v1.0.0" + "cloud.google.com/go/datastore v1.0.0/go.mod" + "cloud.google.com/go/pubsub v1.0.1" + "cloud.google.com/go/pubsub v1.0.1/go.mod" + "cloud.google.com/go/storage v1.0.0" + "cloud.google.com/go/storage v1.0.0/go.mod" + "code.cloudfoundry.org/go-diodes v0.0.0-20190809170250-f77fb823c7ee" + "code.cloudfoundry.org/go-diodes v0.0.0-20190809170250-f77fb823c7ee/go.mod" + "code.cloudfoundry.org/go-loggregator v7.4.0+incompatible" + "code.cloudfoundry.org/go-loggregator v7.4.0+incompatible/go.mod" + "code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f" + "code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f/go.mod" + "code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a" + "code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a/go.mod" + "dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod" + "github.com/Azure/azure-amqp-common-go/v3 v3.0.0" + "github.com/Azure/azure-amqp-common-go/v3 v3.0.0/go.mod" + "github.com/Azure/azure-event-hubs-go/v3 v3.1.2" + "github.com/Azure/azure-event-hubs-go/v3 v3.1.2/go.mod" + "github.com/Azure/azure-pipeline-go v0.1.8/go.mod" + "github.com/Azure/azure-pipeline-go v0.1.9/go.mod" + "github.com/Azure/azure-pipeline-go v0.2.1" + "github.com/Azure/azure-pipeline-go v0.2.1/go.mod" + "github.com/Azure/azure-sdk-for-go v37.1.0+incompatible" + "github.com/Azure/azure-sdk-for-go v37.1.0+incompatible/go.mod" + "github.com/Azure/azure-storage-blob-go v0.6.0/go.mod" + "github.com/Azure/azure-storage-blob-go v0.8.0" + "github.com/Azure/azure-storage-blob-go v0.8.0/go.mod" + "github.com/Azure/go-amqp v0.12.6" + "github.com/Azure/go-amqp v0.12.6/go.mod" + "github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78" + "github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod" + "github.com/Azure/go-autorest/autorest v0.9.0/go.mod" + "github.com/Azure/go-autorest/autorest v0.9.3/go.mod" + "github.com/Azure/go-autorest/autorest v0.9.6" + "github.com/Azure/go-autorest/autorest v0.9.6/go.mod" + "github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod" + "github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod" + "github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod" + "github.com/Azure/go-autorest/autorest/adal v0.8.2" + "github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod" + "github.com/Azure/go-autorest/autorest/azure/auth v0.4.2" + "github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod" + "github.com/Azure/go-autorest/autorest/azure/cli v0.3.1" + "github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod" + "github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod" + "github.com/Azure/go-autorest/autorest/date v0.2.0" + "github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod" + "github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod" + "github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod" + "github.com/Azure/go-autorest/autorest/mocks v0.3.0" + "github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod" + "github.com/Azure/go-autorest/autorest/to v0.3.0" + "github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod" + "github.com/Azure/go-autorest/autorest/validation v0.2.0" + "github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod" + "github.com/Azure/go-autorest/logger v0.1.0" + "github.com/Azure/go-autorest/logger v0.1.0/go.mod" + "github.com/Azure/go-autorest/tracing v0.5.0" + "github.com/Azure/go-autorest/tracing v0.5.0/go.mod" + "github.com/BurntSushi/toml v0.3.1" + "github.com/BurntSushi/toml v0.3.1/go.mod" + "github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod" + "github.com/DataDog/zstd v1.4.1" + "github.com/DataDog/zstd v1.4.1/go.mod" + "github.com/Masterminds/semver v1.4.2" + "github.com/Masterminds/semver v1.4.2/go.mod" + "github.com/Microsoft/hcsshim v0.8.7" + "github.com/Microsoft/hcsshim v0.8.7/go.mod" + "github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod" + "github.com/OneOfOne/xxhash v1.2.2" + "github.com/OneOfOne/xxhash v1.2.2/go.mod" + "github.com/PuerkitoBio/purell v1.0.0/go.mod" + "github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod" + "github.com/Shopify/toxiproxy v2.1.4+incompatible" + "github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod" + "github.com/StackExchange/wmi v0.0.0-20170221213301-9f32b5905fd6" + "github.com/StackExchange/wmi v0.0.0-20170221213301-9f32b5905fd6/go.mod" + "github.com/adriansr/fsnotify v0.0.0-20180417234312-c9bbe1f46f1d" + "github.com/adriansr/fsnotify v0.0.0-20180417234312-c9bbe1f46f1d/go.mod" + "github.com/adriansr/gopacket v1.1.18-0.20200327165309-dd62abfa8a41" + "github.com/adriansr/gopacket v1.1.18-0.20200327165309-dd62abfa8a41/go.mod" + "github.com/aerospike/aerospike-client-go v1.27.1-0.20170612174108-0f3b54da6bdc" + "github.com/aerospike/aerospike-client-go v1.27.1-0.20170612174108-0f3b54da6bdc/go.mod" + "github.com/akavel/rsrc v0.8.0" + "github.com/akavel/rsrc v0.8.0/go.mod" + "github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod" + "github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod" + "github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod" + "github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod" + "github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20" + "github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20/go.mod" + "github.com/andrewkroh/sys v0.0.0-20151128191922-287798fe3e43" + "github.com/andrewkroh/sys v0.0.0-20151128191922-287798fe3e43/go.mod" + "github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod" + "github.com/antlr/antlr4 v0.0.0-20200820155224-be881fa6b91d" + "github.com/antlr/antlr4 v0.0.0-20200820155224-be881fa6b91d/go.mod" + "github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77" + "github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77/go.mod" + "github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod" + "github.com/armon/go-radix v1.0.0" + "github.com/armon/go-radix v1.0.0/go.mod" + "github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5" + "github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod" + "github.com/aws/aws-lambda-go v1.6.0" + "github.com/aws/aws-lambda-go v1.6.0/go.mod" + "github.com/aws/aws-sdk-go-v2 v0.9.0" + "github.com/aws/aws-sdk-go-v2 v0.9.0/go.mod" + "github.com/awslabs/goformation/v3 v3.1.0/go.mod" + "github.com/awslabs/goformation/v4 v4.1.0" + "github.com/awslabs/goformation/v4 v4.1.0/go.mod" + "github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod" + "github.com/beorn7/perks v1.0.0/go.mod" + "github.com/beorn7/perks v1.0.1" + "github.com/beorn7/perks v1.0.1/go.mod" + "github.com/bi-zone/go-winio v0.4.15" + "github.com/bi-zone/go-winio v0.4.15/go.mod" + "github.com/blakerouse/service v1.1.1-0.20200924160513-057808572ffa" + "github.com/blakerouse/service v1.1.1-0.20200924160513-057808572ffa/go.mod" + "github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2" + "github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2/go.mod" + "github.com/blang/semver v3.1.0+incompatible/go.mod" + "github.com/bsm/sarama-cluster v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible" + "github.com/bsm/sarama-cluster v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible/go.mod" + "github.com/cavaliercoder/badio v0.0.0-20160213150051-ce5280129e9e" + "github.com/cavaliercoder/badio v0.0.0-20160213150051-ce5280129e9e/go.mod" + "github.com/cavaliercoder/go-rpm v0.0.0-20190131055624-7a9c54e3d83e" + "github.com/cavaliercoder/go-rpm v0.0.0-20190131055624-7a9c54e3d83e/go.mod" + "github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod" + "github.com/cespare/xxhash v1.1.0" + "github.com/cespare/xxhash v1.1.0/go.mod" + "github.com/cespare/xxhash/v2 v2.1.1" + "github.com/cespare/xxhash/v2 v2.1.1/go.mod" + "github.com/chzyer/logex v1.1.10/go.mod" + "github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod" + "github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod" + "github.com/client9/misspell v0.3.4/go.mod" + "github.com/cloudfoundry-community/go-cfclient v0.0.0-20190808214049-35bcce23fc5f" + "github.com/cloudfoundry-community/go-cfclient v0.0.0-20190808214049-35bcce23fc5f/go.mod" + "github.com/cloudfoundry/noaa v2.1.0+incompatible" + "github.com/cloudfoundry/noaa v2.1.0+incompatible/go.mod" + "github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4" + "github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4/go.mod" + "github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod" + "github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0" + "github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod" + "github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod" + "github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod" + "github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod" + "github.com/containerd/containerd v1.3.3" + "github.com/containerd/containerd v1.3.3/go.mod" + "github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod" + "github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41" + "github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41/go.mod" + "github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod" + "github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c" + "github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c/go.mod" + "github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod" + "github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod" + "github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod" + "github.com/coreos/etcd v3.3.10+incompatible/go.mod" + "github.com/coreos/go-etcd v2.0.0+incompatible/go.mod" + "github.com/coreos/go-semver v0.2.0/go.mod" + "github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e" + "github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod" + "github.com/coreos/go-systemd/v22 v22.0.0" + "github.com/coreos/go-systemd/v22 v22.0.0/go.mod" + "github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea" + "github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod" + "github.com/cpuguy83/go-md2man v1.0.10/go.mod" + "github.com/creack/pty v1.1.9/go.mod" + "github.com/cucumber/godog v0.8.1" + "github.com/cucumber/godog v0.8.1/go.mod" + "github.com/cyphar/filepath-securejoin v0.2.2" + "github.com/cyphar/filepath-securejoin v0.2.2/go.mod" + "github.com/davecgh/go-spew v1.1.0/go.mod" + "github.com/davecgh/go-spew v1.1.1" + "github.com/davecgh/go-spew v1.1.1/go.mod" + "github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892" + "github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892/go.mod" + "github.com/denisenkom/go-mssqldb v0.0.0-20200206145737-bbfc9a55622e" + "github.com/denisenkom/go-mssqldb v0.0.0-20200206145737-bbfc9a55622e/go.mod" + "github.com/devigned/tab v0.1.1/go.mod" + "github.com/devigned/tab v0.1.2-0.20190607222403-0c15cf42f9a2" + "github.com/devigned/tab v0.1.2-0.20190607222403-0c15cf42f9a2/go.mod" + "github.com/dgraph-io/badger/v2 v2.2007.3-0.20201012072640-f5a7e0a1c83b" + "github.com/dgraph-io/badger/v2 v2.2007.3-0.20201012072640-f5a7e0a1c83b/go.mod" + "github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de" + "github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod" + "github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod" + "github.com/dgrijalva/jwt-go v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible" + "github.com/dgrijalva/jwt-go v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible/go.mod" + "github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2" + "github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod" + "github.com/digitalocean/go-libvirt v0.0.0-20180301200012-6075ea3c39a1" + "github.com/digitalocean/go-libvirt v0.0.0-20180301200012-6075ea3c39a1/go.mod" + "github.com/dimchansky/utfbom v1.1.0" + "github.com/dimchansky/utfbom v1.1.0/go.mod" + "github.com/dlclark/regexp2 v1.1.7-0.20171009020623-7632a260cbaf" + "github.com/dlclark/regexp2 v1.1.7-0.20171009020623-7632a260cbaf/go.mod" + "github.com/docker/distribution v2.7.1+incompatible" + "github.com/docker/distribution v2.7.1+incompatible/go.mod" + "github.com/docker/engine v0.0.0-20191113042239-ea84732a7725" + "github.com/docker/engine v0.0.0-20191113042239-ea84732a7725/go.mod" + "github.com/docker/go-connections v0.4.0" + "github.com/docker/go-connections v0.4.0/go.mod" + "github.com/docker/go-metrics v0.0.1" + "github.com/docker/go-metrics v0.0.1/go.mod" + "github.com/docker/go-units v0.3.3/go.mod" + "github.com/docker/go-units v0.4.0" + "github.com/docker/go-units v0.4.0/go.mod" + "github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96" + "github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod" + "github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod" + "github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6" + "github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6/go.mod" + "github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod" + "github.com/dustin/go-humanize v1.0.0" + "github.com/dustin/go-humanize v1.0.0/go.mod" + "github.com/eapache/go-resiliency v1.2.0" + "github.com/eapache/go-resiliency v1.2.0/go.mod" + "github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21" + "github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod" + "github.com/eapache/queue v1.1.0" + "github.com/eapache/queue v1.1.0/go.mod" + "github.com/eclipse/paho.mqtt.golang v1.2.1-0.20200121105743-0d940dd29fd2" + "github.com/eclipse/paho.mqtt.golang v1.2.1-0.20200121105743-0d940dd29fd2/go.mod" + "github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3" + "github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3/go.mod" + "github.com/elastic/ecs v1.8.0" + "github.com/elastic/ecs v1.8.0/go.mod" + "github.com/elastic/elastic-agent-client/v7 v7.0.0-20200709172729-d43b7ad5833a" + "github.com/elastic/elastic-agent-client/v7 v7.0.0-20200709172729-d43b7ad5833a/go.mod" + "github.com/elastic/fsevents v0.0.0-20181029231046-e1d381a4d270" + "github.com/elastic/fsevents v0.0.0-20181029231046-e1d381a4d270/go.mod" + "github.com/elastic/go-concert v0.1.0" + "github.com/elastic/go-concert v0.1.0/go.mod" + "github.com/elastic/go-libaudit/v2 v2.2.0" + "github.com/elastic/go-libaudit/v2 v2.2.0/go.mod" + "github.com/elastic/go-licenser v0.3.1" + "github.com/elastic/go-licenser v0.3.1/go.mod" + "github.com/elastic/go-lookslike v0.3.0" + "github.com/elastic/go-lookslike v0.3.0/go.mod" + "github.com/elastic/go-lumber v0.1.0" + "github.com/elastic/go-lumber v0.1.0/go.mod" + "github.com/elastic/go-perf v0.0.0-20191212140718-9c656876f595" + "github.com/elastic/go-perf v0.0.0-20191212140718-9c656876f595/go.mod" + "github.com/elastic/go-plugins-helpers v0.0.0-20200207104224-bdf17607b79f" + "github.com/elastic/go-plugins-helpers v0.0.0-20200207104224-bdf17607b79f/go.mod" + "github.com/elastic/go-seccomp-bpf v1.1.0" + "github.com/elastic/go-seccomp-bpf v1.1.0/go.mod" + "github.com/elastic/go-structform v0.0.7" + "github.com/elastic/go-structform v0.0.7/go.mod" + "github.com/elastic/go-sysinfo v1.1.1/go.mod" + "github.com/elastic/go-sysinfo v1.6.0" + "github.com/elastic/go-sysinfo v1.6.0/go.mod" + "github.com/elastic/go-txfile v0.0.7" + "github.com/elastic/go-txfile v0.0.7/go.mod" + "github.com/elastic/go-ucfg v0.7.0/go.mod" + "github.com/elastic/go-ucfg v0.8.3" + "github.com/elastic/go-ucfg v0.8.3/go.mod" + "github.com/elastic/go-windows v1.0.0/go.mod" + "github.com/elastic/go-windows v1.0.1" + "github.com/elastic/go-windows v1.0.1/go.mod" + "github.com/elastic/gosigar v0.14.1" + "github.com/elastic/gosigar v0.14.1/go.mod" + "github.com/elastic/sarama v1.19.1-0.20210120173147-5c8cb347d877" + "github.com/elastic/sarama v1.19.1-0.20210120173147-5c8cb347d877/go.mod" + "github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153" + "github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod" + "github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod" + "github.com/envoyproxy/go-control-plane v0.9.0/go.mod" + "github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod" + "github.com/envoyproxy/go-control-plane v0.9.4/go.mod" + "github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod" + "github.com/evanphx/json-patch v4.9.0+incompatible" + "github.com/evanphx/json-patch v4.9.0+incompatible/go.mod" + "github.com/fatih/color v1.9.0" + "github.com/fatih/color v1.9.0/go.mod" + "github.com/fortytw2/leaktest v1.3.0" + "github.com/fortytw2/leaktest v1.3.0/go.mod" + "github.com/frankban/quicktest v1.10.2" + "github.com/frankban/quicktest v1.10.2/go.mod" + "github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod" + "github.com/ghodss/yaml v1.0.0/go.mod" + "github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod" + "github.com/go-kit/kit v0.8.0/go.mod" + "github.com/go-kit/kit v0.9.0" + "github.com/go-kit/kit v0.9.0/go.mod" + "github.com/go-logfmt/logfmt v0.3.0/go.mod" + "github.com/go-logfmt/logfmt v0.4.0" + "github.com/go-logfmt/logfmt v0.4.0/go.mod" + "github.com/go-logr/logr v0.1.0/go.mod" + "github.com/go-logr/logr v0.2.0" + "github.com/go-logr/logr v0.2.0/go.mod" + "github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab" + "github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod" + "github.com/go-ole/go-ole v1.2.5-0.20190920104607-14974a1cf647" + "github.com/go-ole/go-ole v1.2.5-0.20190920104607-14974a1cf647/go.mod" + "github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod" + "github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod" + "github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod" + "github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod" + "github.com/go-sourcemap/sourcemap v2.1.2+incompatible" + "github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod" + "github.com/go-sql-driver/mysql v1.4.0/go.mod" + "github.com/go-sql-driver/mysql v1.4.1" + "github.com/go-sql-driver/mysql v1.4.1/go.mod" + "github.com/go-stack/stack v1.8.0" + "github.com/go-stack/stack v1.8.0/go.mod" + "github.com/go-test/deep v1.0.7" + "github.com/go-test/deep v1.0.7/go.mod" + "github.com/gobuffalo/here v0.6.0" + "github.com/gobuffalo/here v0.6.0/go.mod" + "github.com/gocarina/gocsv v0.0.0-20170324095351-ffef3ffc77be" + "github.com/gocarina/gocsv v0.0.0-20170324095351-ffef3ffc77be/go.mod" + "github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e" + "github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod" + "github.com/godbus/dbus/v5 v5.0.3" + "github.com/godbus/dbus/v5 v5.0.3/go.mod" + "github.com/godror/godror v0.10.4" + "github.com/godror/godror v0.10.4/go.mod" + "github.com/gofrs/flock v0.7.1/go.mod" + "github.com/gofrs/flock v0.7.2-0.20190320160742-5135e617513b" + "github.com/gofrs/flock v0.7.2-0.20190320160742-5135e617513b/go.mod" + "github.com/gofrs/uuid v3.3.0+incompatible" + "github.com/gofrs/uuid v3.3.0+incompatible/go.mod" + "github.com/gogo/protobuf v1.1.1/go.mod" + "github.com/gogo/protobuf v1.2.1/go.mod" + "github.com/gogo/protobuf v1.3.1" + "github.com/gogo/protobuf v1.3.1/go.mod" + "github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe" + "github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod" + "github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod" + "github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod" + "github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7" + "github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod" + "github.com/golang/mock v1.1.1/go.mod" + "github.com/golang/mock v1.2.0/go.mod" + "github.com/golang/mock v1.3.1/go.mod" + "github.com/golang/protobuf v1.2.0/go.mod" + "github.com/golang/protobuf v1.3.1/go.mod" + "github.com/golang/protobuf v1.3.2/go.mod" + "github.com/golang/protobuf v1.3.3/go.mod" + "github.com/golang/protobuf v1.4.0-rc.1/go.mod" + "github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod" + "github.com/golang/protobuf v1.4.0-rc.2/go.mod" + "github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod" + "github.com/golang/protobuf v1.4.0/go.mod" + "github.com/golang/protobuf v1.4.1/go.mod" + "github.com/golang/protobuf v1.4.2" + "github.com/golang/protobuf v1.4.2/go.mod" + "github.com/golang/snappy v0.0.1" + "github.com/golang/snappy v0.0.1/go.mod" + "github.com/gomodule/redigo v1.8.3" + "github.com/gomodule/redigo v1.8.3/go.mod" + "github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod" + "github.com/google/btree v1.0.0/go.mod" + "github.com/google/flatbuffers v1.7.2-0.20170925184458-7a6b2bf521e9" + "github.com/google/flatbuffers v1.7.2-0.20170925184458-7a6b2bf521e9/go.mod" + "github.com/google/go-cmp v0.2.0/go.mod" + "github.com/google/go-cmp v0.3.0/go.mod" + "github.com/google/go-cmp v0.3.1/go.mod" + "github.com/google/go-cmp v0.4.0/go.mod" + "github.com/google/go-cmp v0.5.2" + "github.com/google/go-cmp v0.5.2/go.mod" + "github.com/google/gofuzz v1.0.0/go.mod" + "github.com/google/gofuzz v1.1.0" + "github.com/google/gofuzz v1.1.0/go.mod" + "github.com/google/licenseclassifier v0.0.0-20200402202327-879cb1424de0" + "github.com/google/licenseclassifier v0.0.0-20200402202327-879cb1424de0/go.mod" + "github.com/google/martian v2.1.0+incompatible" + "github.com/google/martian v2.1.0+incompatible/go.mod" + "github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod" + "github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod" + "github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod" + "github.com/google/renameio v0.1.0/go.mod" + "github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510" + "github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod" + "github.com/google/uuid v1.1.1/go.mod" + "github.com/google/uuid v1.1.2-0.20190416172445-c2e93f3ae59f" + "github.com/google/uuid v1.1.2-0.20190416172445-c2e93f3ae59f/go.mod" + "github.com/googleapis/gax-go/v2 v2.0.4/go.mod" + "github.com/googleapis/gax-go/v2 v2.0.5" + "github.com/googleapis/gax-go/v2 v2.0.5/go.mod" + "github.com/googleapis/gnostic v0.4.1" + "github.com/googleapis/gnostic v0.4.1/go.mod" + "github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1" + "github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod" + "github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75" + "github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75/go.mod" + "github.com/gorilla/mux v1.7.2" + "github.com/gorilla/mux v1.7.2/go.mod" + "github.com/gorilla/websocket v1.4.1" + "github.com/gorilla/websocket v1.4.1/go.mod" + "github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod" + "github.com/grpc-ecosystem/grpc-gateway v1.13.0" + "github.com/grpc-ecosystem/grpc-gateway v1.13.0/go.mod" + "github.com/h2non/filetype v1.1.1-0.20201130172452-f60988ab73d5" + "github.com/h2non/filetype v1.1.1-0.20201130172452-f60988ab73d5/go.mod" + "github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod" + "github.com/hashicorp/errwrap v1.0.0" + "github.com/hashicorp/errwrap v1.0.0/go.mod" + "github.com/hashicorp/go-cleanhttp v0.5.1" + "github.com/hashicorp/go-cleanhttp v0.5.1/go.mod" + "github.com/hashicorp/go-hclog v0.9.2" + "github.com/hashicorp/go-hclog v0.9.2/go.mod" + "github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod" + "github.com/hashicorp/go-multierror v1.1.0" + "github.com/hashicorp/go-multierror v1.1.0/go.mod" + "github.com/hashicorp/go-retryablehttp v0.6.6" + "github.com/hashicorp/go-retryablehttp v0.6.6/go.mod" + "github.com/hashicorp/go-rootcerts v1.0.2" + "github.com/hashicorp/go-rootcerts v1.0.2/go.mod" + "github.com/hashicorp/go-uuid v1.0.2" + "github.com/hashicorp/go-uuid v1.0.2/go.mod" + "github.com/hashicorp/go-version v1.0.0" + "github.com/hashicorp/go-version v1.0.0/go.mod" + "github.com/hashicorp/golang-lru v0.5.0/go.mod" + "github.com/hashicorp/golang-lru v0.5.1/go.mod" + "github.com/hashicorp/golang-lru v0.5.2-0.20190520140433-59383c442f7d" + "github.com/hashicorp/golang-lru v0.5.2-0.20190520140433-59383c442f7d/go.mod" + "github.com/hashicorp/hcl v1.0.0/go.mod" + "github.com/hashicorp/nomad/api v0.0.0-20200303134319-e31695b5bbe6" + "github.com/hashicorp/nomad/api v0.0.0-20200303134319-e31695b5bbe6/go.mod" + "github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95" + "github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95/go.mod" + "github.com/hpcloud/tail v1.0.0" + "github.com/hpcloud/tail v1.0.0/go.mod" + "github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod" + "github.com/imdario/mergo v0.3.5/go.mod" + "github.com/imdario/mergo v0.3.6" + "github.com/imdario/mergo v0.3.6/go.mod" + "github.com/inconshreveable/mousetrap v1.0.0" + "github.com/inconshreveable/mousetrap v1.0.0/go.mod" + "github.com/jarcoal/httpmock v1.0.4" + "github.com/jarcoal/httpmock v1.0.4/go.mod" + "github.com/jcmturner/gofork v1.0.0" + "github.com/jcmturner/gofork v1.0.0/go.mod" + "github.com/jessevdk/go-flags v1.4.0/go.mod" + "github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af" + "github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod" + "github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5" + "github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5/go.mod" + "github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901" + "github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901/go.mod" + "github.com/joho/godotenv v1.3.0" + "github.com/joho/godotenv v1.3.0/go.mod" + "github.com/jonboulle/clockwork v0.1.0/go.mod" + "github.com/jonboulle/clockwork v0.2.2" + "github.com/jonboulle/clockwork v0.2.2/go.mod" + "github.com/josephspurrier/goversioninfo v0.0.0-20190209210621-63e6d1acd3dd" + "github.com/josephspurrier/goversioninfo v0.0.0-20190209210621-63e6d1acd3dd/go.mod" + "github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod" + "github.com/jpillora/backoff v1.0.0" + "github.com/jpillora/backoff v1.0.0/go.mod" + "github.com/json-iterator/go v1.1.6/go.mod" + "github.com/json-iterator/go v1.1.7/go.mod" + "github.com/json-iterator/go v1.1.10" + "github.com/json-iterator/go v1.1.10/go.mod" + "github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod" + "github.com/jstemmer/go-junit-report v0.9.1" + "github.com/jstemmer/go-junit-report v0.9.1/go.mod" + "github.com/jtolds/gls v4.20.0+incompatible" + "github.com/jtolds/gls v4.20.0+incompatible/go.mod" + "github.com/julienschmidt/httprouter v1.2.0/go.mod" + "github.com/karrick/godirwalk v1.15.6" + "github.com/karrick/godirwalk v1.15.6/go.mod" + "github.com/kisielk/errcheck v1.1.0/go.mod" + "github.com/kisielk/errcheck v1.2.0/go.mod" + "github.com/kisielk/gotool v1.0.0/go.mod" + "github.com/klauspost/compress v1.11.0" + "github.com/klauspost/compress v1.11.0/go.mod" + "github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod" + "github.com/konsorten/go-windows-terminal-sequences v1.0.2" + "github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod" + "github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515" + "github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod" + "github.com/kr/pretty v0.1.0/go.mod" + "github.com/kr/pretty v0.2.0/go.mod" + "github.com/kr/pretty v0.2.1" + "github.com/kr/pretty v0.2.1/go.mod" + "github.com/kr/pty v1.1.1/go.mod" + "github.com/kr/text v0.1.0/go.mod" + "github.com/kr/text v0.2.0" + "github.com/kr/text v0.2.0/go.mod" + "github.com/lib/pq v1.0.0/go.mod" + "github.com/lib/pq v1.1.2-0.20190507191818-2ff3cb3adc01" + "github.com/lib/pq v1.1.2-0.20190507191818-2ff3cb3adc01/go.mod" + "github.com/magefile/mage v1.9.0/go.mod" + "github.com/magefile/mage v1.11.0" + "github.com/magefile/mage v1.11.0/go.mod" + "github.com/magiconair/properties v1.8.0/go.mod" + "github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod" + "github.com/mailru/easyjson v0.7.1" + "github.com/mailru/easyjson v0.7.1/go.mod" + "github.com/markbates/pkger v0.17.0" + "github.com/markbates/pkger v0.17.0/go.mod" + "github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11" + "github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11/go.mod" + "github.com/mattn/go-colorable v0.1.4/go.mod" + "github.com/mattn/go-colorable v0.1.6" + "github.com/mattn/go-colorable v0.1.6/go.mod" + "github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod" + "github.com/mattn/go-ieproxy v0.0.0-20191113090002-7c0f6868bffe" + "github.com/mattn/go-ieproxy v0.0.0-20191113090002-7c0f6868bffe/go.mod" + "github.com/mattn/go-isatty v0.0.8/go.mod" + "github.com/mattn/go-isatty v0.0.11/go.mod" + "github.com/mattn/go-isatty v0.0.12" + "github.com/mattn/go-isatty v0.0.12/go.mod" + "github.com/mattn/go-sqlite3 v1.9.0" + "github.com/mattn/go-sqlite3 v1.9.0/go.mod" + "github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod" + "github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369" + "github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod" + "github.com/miekg/dns v1.1.15" + "github.com/miekg/dns v1.1.15/go.mod" + "github.com/mitchellh/go-homedir v1.1.0" + "github.com/mitchellh/go-homedir v1.1.0/go.mod" + "github.com/mitchellh/go-testing-interface v1.0.0" + "github.com/mitchellh/go-testing-interface v1.0.0/go.mod" + "github.com/mitchellh/gox v1.0.1" + "github.com/mitchellh/gox v1.0.1/go.mod" + "github.com/mitchellh/hashstructure v0.0.0-20170116052023-ab25296c0f51" + "github.com/mitchellh/hashstructure v0.0.0-20170116052023-ab25296c0f51/go.mod" + "github.com/mitchellh/iochan v1.0.0" + "github.com/mitchellh/iochan v1.0.0/go.mod" + "github.com/mitchellh/mapstructure v1.1.2" + "github.com/mitchellh/mapstructure v1.1.2/go.mod" + "github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod" + "github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd" + "github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod" + "github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod" + "github.com/modern-go/reflect2 v1.0.1" + "github.com/modern-go/reflect2 v1.0.1/go.mod" + "github.com/morikuni/aec v1.0.0" + "github.com/morikuni/aec v1.0.0/go.mod" + "github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod" + "github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod" + "github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod" + "github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e" + "github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod" + "github.com/oklog/ulid v1.3.1" + "github.com/oklog/ulid v1.3.1/go.mod" + "github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod" + "github.com/onsi/ginkgo v1.5.0/go.mod" + "github.com/onsi/ginkgo v1.6.0/go.mod" + "github.com/onsi/ginkgo v1.10.1/go.mod" + "github.com/onsi/ginkgo v1.11.0" + "github.com/onsi/ginkgo v1.11.0/go.mod" + "github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod" + "github.com/onsi/gomega v1.2.0/go.mod" + "github.com/onsi/gomega v1.4.3/go.mod" + "github.com/onsi/gomega v1.7.0" + "github.com/onsi/gomega v1.7.0/go.mod" + "github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod" + "github.com/opencontainers/go-digest v1.0.0-rc1/go.mod" + "github.com/opencontainers/go-digest v1.0.0-rc1.0.20190228220655-ac19fd6e7483" + "github.com/opencontainers/go-digest v1.0.0-rc1.0.20190228220655-ac19fd6e7483/go.mod" + "github.com/opencontainers/image-spec v1.0.1/go.mod" + "github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6" + "github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6/go.mod" + "github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod" + "github.com/opencontainers/runc v1.0.0-rc9" + "github.com/opencontainers/runc v1.0.0-rc9/go.mod" + "github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod" + "github.com/opencontainers/runtime-spec v1.0.1/go.mod" + "github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod" + "github.com/otiai10/copy v1.2.0" + "github.com/otiai10/copy v1.2.0/go.mod" + "github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod" + "github.com/otiai10/curr v1.0.0" + "github.com/otiai10/curr v1.0.0/go.mod" + "github.com/otiai10/mint v1.3.0/go.mod" + "github.com/otiai10/mint v1.3.1" + "github.com/otiai10/mint v1.3.1/go.mod" + "github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2" + "github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2/go.mod" + "github.com/pelletier/go-toml v1.2.0/go.mod" + "github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod" + "github.com/pierrec/lz4 v2.5.2+incompatible" + "github.com/pierrec/lz4 v2.5.2+incompatible/go.mod" + "github.com/pierrre/gotestcover v0.0.0-20160517101806-924dca7d15f0" + "github.com/pierrre/gotestcover v0.0.0-20160517101806-924dca7d15f0/go.mod" + "github.com/pkg/errors v0.8.0/go.mod" + "github.com/pkg/errors v0.8.1-0.20170505043639-c605e284fe17/go.mod" + "github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod" + "github.com/pkg/errors v0.8.1/go.mod" + "github.com/pkg/errors v0.9.1" + "github.com/pkg/errors v0.9.1/go.mod" + "github.com/pmezard/go-difflib v1.0.0" + "github.com/pmezard/go-difflib v1.0.0/go.mod" + "github.com/poy/eachers v0.0.0-20181020210610-23942921fe77" + "github.com/poy/eachers v0.0.0-20181020210610-23942921fe77/go.mod" + "github.com/prometheus/client_golang v0.9.1/go.mod" + "github.com/prometheus/client_golang v1.0.0/go.mod" + "github.com/prometheus/client_golang v1.1.0/go.mod" + "github.com/prometheus/client_golang v1.1.1-0.20190913103102-20428fa0bffc" + "github.com/prometheus/client_golang v1.1.1-0.20190913103102-20428fa0bffc/go.mod" + "github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod" + "github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod" + "github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4" + "github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod" + "github.com/prometheus/common v0.4.1/go.mod" + "github.com/prometheus/common v0.6.0/go.mod" + "github.com/prometheus/common v0.7.0" + "github.com/prometheus/common v0.7.0/go.mod" + "github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod" + "github.com/prometheus/procfs v0.0.0-20190425082905-87a4384529e0/go.mod" + "github.com/prometheus/procfs v0.0.2/go.mod" + "github.com/prometheus/procfs v0.0.3/go.mod" + "github.com/prometheus/procfs v0.0.5/go.mod" + "github.com/prometheus/procfs v0.0.11" + "github.com/prometheus/procfs v0.0.11/go.mod" + "github.com/prometheus/prometheus v2.5.0+incompatible" + "github.com/prometheus/prometheus v2.5.0+incompatible/go.mod" + "github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0" + "github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod" + "github.com/rogpeppe/fastuuid v1.2.0/go.mod" + "github.com/rogpeppe/go-internal v1.3.0/go.mod" + "github.com/russross/blackfriday v1.5.2/go.mod" + "github.com/samuel/go-parser v0.0.0-20130731160455-ca8abbf65d0e" + "github.com/samuel/go-parser v0.0.0-20130731160455-ca8abbf65d0e/go.mod" + "github.com/samuel/go-thrift v0.0.0-20140522043831-2187045faa54" + "github.com/samuel/go-thrift v0.0.0-20140522043831-2187045faa54/go.mod" + "github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b" + "github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b/go.mod" + "github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522/go.mod" + "github.com/sanathkr/yaml v1.0.1-0.20170819201035-0056894fa522" + "github.com/sanathkr/yaml v1.0.1-0.20170819201035-0056894fa522/go.mod" + "github.com/santhosh-tekuri/jsonschema v1.2.4" + "github.com/santhosh-tekuri/jsonschema v1.2.4/go.mod" + "github.com/satori/go.uuid v1.2.0" + "github.com/satori/go.uuid v1.2.0/go.mod" + "github.com/sergi/go-diff v1.0.0/go.mod" + "github.com/sergi/go-diff v1.1.0" + "github.com/sergi/go-diff v1.1.0/go.mod" + "github.com/shirou/gopsutil v3.20.12+incompatible" + "github.com/shirou/gopsutil v3.20.12+incompatible/go.mod" + "github.com/shopspring/decimal v1.2.0" + "github.com/shopspring/decimal v1.2.0/go.mod" + "github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod" + "github.com/sirupsen/logrus v1.2.0/go.mod" + "github.com/sirupsen/logrus v1.4.1/go.mod" + "github.com/sirupsen/logrus v1.4.2" + "github.com/sirupsen/logrus v1.4.2/go.mod" + "github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d" + "github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod" + "github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a" + "github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod" + "github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod" + "github.com/spaolacci/murmur3 v1.1.0" + "github.com/spaolacci/murmur3 v1.1.0/go.mod" + "github.com/spf13/afero v1.1.2/go.mod" + "github.com/spf13/afero v1.2.2/go.mod" + "github.com/spf13/cast v1.3.0/go.mod" + "github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod" + "github.com/spf13/cobra v0.0.5" + "github.com/spf13/cobra v0.0.5/go.mod" + "github.com/spf13/jwalterweatherman v1.0.0/go.mod" + "github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod" + "github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod" + "github.com/spf13/pflag v1.0.3/go.mod" + "github.com/spf13/pflag v1.0.5" + "github.com/spf13/pflag v1.0.5/go.mod" + "github.com/spf13/viper v1.3.2/go.mod" + "github.com/stretchr/objx v0.1.0/go.mod" + "github.com/stretchr/objx v0.1.1/go.mod" + "github.com/stretchr/objx v0.2.0" + "github.com/stretchr/objx v0.2.0/go.mod" + "github.com/stretchr/testify v1.1.5-0.20170601210322-f6abca593680/go.mod" + "github.com/stretchr/testify v1.2.2/go.mod" + "github.com/stretchr/testify v1.3.0/go.mod" + "github.com/stretchr/testify v1.4.0/go.mod" + "github.com/stretchr/testify v1.5.0/go.mod" + "github.com/stretchr/testify v1.5.1/go.mod" + "github.com/stretchr/testify v1.6.1" + "github.com/stretchr/testify v1.6.1/go.mod" + "github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod" + "github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b" + "github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b/go.mod" + "github.com/tsg/gopacket v0.0.0-20200626092518-2ab8e397a786" + "github.com/tsg/gopacket v0.0.0-20200626092518-2ab8e397a786/go.mod" + "github.com/ugorji/go v1.1.8" + "github.com/ugorji/go v1.1.8/go.mod" + "github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod" + "github.com/ugorji/go/codec v1.1.8" + "github.com/ugorji/go/codec v1.1.8/go.mod" + "github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod" + "github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797" + "github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797/go.mod" + "github.com/urso/go-bin v0.0.0-20180220135811-781c575c9f0e" + "github.com/urso/go-bin v0.0.0-20180220135811-781c575c9f0e/go.mod" + "github.com/urso/magetools v0.0.0-20190919040553-290c89e0c230" + "github.com/urso/magetools v0.0.0-20190919040553-290c89e0c230/go.mod" + "github.com/urso/qcgen v0.0.0-20180131103024-0b059e7db4f4" + "github.com/urso/qcgen v0.0.0-20180131103024-0b059e7db4f4/go.mod" + "github.com/urso/sderr v0.0.0-20200210124243-c2a16f3d43ec" + "github.com/urso/sderr v0.0.0-20200210124243-c2a16f3d43ec/go.mod" + "github.com/vbatts/tar-split v0.11.1/go.mod" + "github.com/vmware/govmomi v0.0.0-20170802214208-2cad15190b41" + "github.com/vmware/govmomi v0.0.0-20170802214208-2cad15190b41/go.mod" + "github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c" + "github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod" + "github.com/xdg/stringprep v1.0.0" + "github.com/xdg/stringprep v1.0.0/go.mod" + "github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod" + "github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb" + "github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod" + "github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415" + "github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod" + "github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod" + "github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56" + "github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56/go.mod" + "github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod" + "github.com/yuin/gopher-lua v0.0.0-20170403160031-b402f3114ec7" + "github.com/yuin/gopher-lua v0.0.0-20170403160031-b402f3114ec7/go.mod" + "go.elastic.co/apm v1.7.2/go.mod" + "go.elastic.co/apm v1.8.1-0.20200909061013-2aef45b9cf4b" + "go.elastic.co/apm v1.8.1-0.20200909061013-2aef45b9cf4b/go.mod" + "go.elastic.co/apm/module/apmelasticsearch v1.7.2" + "go.elastic.co/apm/module/apmelasticsearch v1.7.2/go.mod" + "go.elastic.co/apm/module/apmhttp v1.7.2" + "go.elastic.co/apm/module/apmhttp v1.7.2/go.mod" + "go.elastic.co/ecszap v0.3.0" + "go.elastic.co/ecszap v0.3.0/go.mod" + "go.elastic.co/fastjson v1.0.0/go.mod" + "go.elastic.co/fastjson v1.1.0" + "go.elastic.co/fastjson v1.1.0/go.mod" + "go.elastic.co/go-licence-detector v0.4.0" + "go.elastic.co/go-licence-detector v0.4.0/go.mod" + "go.etcd.io/bbolt v1.3.4" + "go.etcd.io/bbolt v1.3.4/go.mod" + "go.opencensus.io v0.21.0/go.mod" + "go.opencensus.io v0.22.0/go.mod" + "go.opencensus.io v0.22.2" + "go.opencensus.io v0.22.2/go.mod" + "go.uber.org/atomic v1.5.0" + "go.uber.org/atomic v1.5.0/go.mod" + "go.uber.org/goleak v1.0.0" + "go.uber.org/goleak v1.0.0/go.mod" + "go.uber.org/multierr v1.3.0" + "go.uber.org/multierr v1.3.0/go.mod" + "go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee" + "go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod" + "go.uber.org/zap v1.14.0" + "go.uber.org/zap v1.14.0/go.mod" + "golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod" + "golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod" + "golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod" + "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod" + "golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod" + "golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod" + "golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod" + "golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod" + "golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod" + "golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod" + "golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a" + "golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod" + "golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod" + "golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod" + "golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod" + "golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod" + "golang.org/x/exp v0.0.0-20191227195350-da58074b4299" + "golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod" + "golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod" + "golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod" + "golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod" + "golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod" + "golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod" + "golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod" + "golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod" + "golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod" + "golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod" + "golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod" + "golang.org/x/lint v0.0.0-20200130185559-910be7a94367" + "golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod" + "golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod" + "golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod" + "golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod" + "golang.org/x/mod v0.1.0/go.mod" + "golang.org/x/mod v0.3.0" + "golang.org/x/mod v0.3.0/go.mod" + "golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod" + "golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod" + "golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod" + "golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod" + "golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod" + "golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod" + "golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod" + "golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod" + "golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod" + "golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod" + "golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod" + "golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod" + "golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod" + "golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod" + "golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod" + "golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod" + "golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod" + "golang.org/x/net v0.0.0-20191021144547-ec77196f6094/go.mod" + "golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod" + "golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod" + "golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod" + "golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod" + "golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod" + "golang.org/x/net v0.0.0-20200904194848-62affa334b73" + "golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod" + "golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod" + "golang.org/x/oauth2 v0.0.0-20190130055435-99b60b757ec1/go.mod" + "golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod" + "golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod" + "golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod" + "golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d" + "golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod" + "golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod" + "golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod" + "golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod" + "golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod" + "golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod" + "golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod" + "golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a" + "golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod" + "golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0/go.mod" + "golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod" + "golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod" + "golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod" + "golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod" + "golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod" + "golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod" + "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod" + "golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod" + "golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod" + "golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67/go.mod" + "golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod" + "golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod" + "golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod" + "golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod" + "golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod" + "golang.org/x/sys v0.0.0-20190529164535-6a60838ec259/go.mod" + "golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod" + "golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod" + "golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod" + "golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod" + "golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod" + "golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod" + "golang.org/x/sys v0.0.0-20191025021431-6c3a3bfe00ae/go.mod" + "golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod" + "golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod" + "golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod" + "golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod" + "golang.org/x/sys v0.0.0-20200102141924-c96a22e43c9c/go.mod" + "golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod" + "golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod" + "golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod" + "golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod" + "golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod" + "golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod" + "golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod" + "golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634" + "golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod" + "golang.org/x/text v0.3.0/go.mod" + "golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod" + "golang.org/x/text v0.3.2/go.mod" + "golang.org/x/text v0.3.3" + "golang.org/x/text v0.3.3/go.mod" + "golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod" + "golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod" + "golang.org/x/time v0.0.0-20191024005414-555d28b269f0" + "golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod" + "golang.org/x/tools v0.0.0-20200602230032-c00d67ef29d0" + "golang.org/x/tools v0.0.0-20200602230032-c00d67ef29d0/go.mod" + "golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod" + "golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod" + "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod" + "golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1" + "golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod" + "google.golang.org/api v0.4.0/go.mod" + "google.golang.org/api v0.7.0/go.mod" + "google.golang.org/api v0.8.0/go.mod" + "google.golang.org/api v0.9.0/go.mod" + "google.golang.org/api v0.15.0" + "google.golang.org/api v0.15.0/go.mod" + "google.golang.org/appengine v1.1.0/go.mod" + "google.golang.org/appengine v1.2.0/go.mod" + "google.golang.org/appengine v1.4.0/go.mod" + "google.golang.org/appengine v1.5.0/go.mod" + "google.golang.org/appengine v1.6.1/go.mod" + "google.golang.org/appengine v1.6.5" + "google.golang.org/appengine v1.6.5/go.mod" + "google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod" + "google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod" + "google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod" + "google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod" + "google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod" + "google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod" + "google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod" + "google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod" + "google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c/go.mod" + "google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod" + "google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013" + "google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod" + "google.golang.org/grpc v1.19.0/go.mod" + "google.golang.org/grpc v1.20.1/go.mod" + "google.golang.org/grpc v1.21.1/go.mod" + "google.golang.org/grpc v1.23.0/go.mod" + "google.golang.org/grpc v1.24.0/go.mod" + "google.golang.org/grpc v1.25.1/go.mod" + "google.golang.org/grpc v1.26.0/go.mod" + "google.golang.org/grpc v1.27.0/go.mod" + "google.golang.org/grpc v1.27.1/go.mod" + "google.golang.org/grpc v1.29.1" + "google.golang.org/grpc v1.29.1/go.mod" + "google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod" + "google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod" + "google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod" + "google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod" + "google.golang.org/protobuf v1.21.0/go.mod" + "google.golang.org/protobuf v1.22.0/go.mod" + "google.golang.org/protobuf v1.23.0/go.mod" + "google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod" + "google.golang.org/protobuf v1.24.0" + "google.golang.org/protobuf v1.24.0/go.mod" + "gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod" + "gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod" + "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod" + "gopkg.in/check.v1 v1.0.0-20161208181325-20d25e280405/go.mod" + "gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod" + "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod" + "gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b" + "gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod" + "gopkg.in/errgo.v2 v2.1.0/go.mod" + "gopkg.in/fsnotify.v1 v1.4.7" + "gopkg.in/fsnotify.v1 v1.4.7/go.mod" + "gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod" + "gopkg.in/inf.v0 v0.9.1" + "gopkg.in/inf.v0 v0.9.1/go.mod" + "gopkg.in/jcmturner/aescts.v1 v1.0.1" + "gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod" + "gopkg.in/jcmturner/dnsutils.v1 v1.0.1" + "gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod" + "gopkg.in/jcmturner/goidentity.v3 v3.0.0" + "gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod" + "gopkg.in/jcmturner/gokrb5.v7 v7.5.0" + "gopkg.in/jcmturner/gokrb5.v7 v7.5.0/go.mod" + "gopkg.in/jcmturner/rpc.v1 v1.1.0" + "gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod" + "gopkg.in/mgo.v2 v2.0.0-20160818020120-3f83fa500528" + "gopkg.in/mgo.v2 v2.0.0-20160818020120-3f83fa500528/go.mod" + "gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7" + "gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod" + "gopkg.in/yaml.v2 v2.2.1/go.mod" + "gopkg.in/yaml.v2 v2.2.2/go.mod" + "gopkg.in/yaml.v2 v2.2.3/go.mod" + "gopkg.in/yaml.v2 v2.2.4/go.mod" + "gopkg.in/yaml.v2 v2.2.7/go.mod" + "gopkg.in/yaml.v2 v2.2.8/go.mod" + "gopkg.in/yaml.v2 v2.3.0" + "gopkg.in/yaml.v2 v2.3.0/go.mod" + "gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod" + "gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776" + "gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod" + "gotest.tools v2.2.0+incompatible" + "gotest.tools v2.2.0+incompatible/go.mod" + "gotest.tools/gotestsum v0.6.0" + "gotest.tools/gotestsum v0.6.0/go.mod" + "gotest.tools/v3 v3.0.3" + "gotest.tools/v3 v3.0.3/go.mod" + "honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod" + "honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod" + "honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod" + "honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod" + "honnef.co/go/tools v0.0.1-2019.2.3" + "honnef.co/go/tools v0.0.1-2019.2.3/go.mod" + "howett.net/plist v0.0.0-20181124034731-591f970eefbb" + "howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod" + "k8s.io/api v0.19.4" + "k8s.io/api v0.19.4/go.mod" + "k8s.io/apimachinery v0.19.4" + "k8s.io/apimachinery v0.19.4/go.mod" + "k8s.io/client-go v0.19.4" + "k8s.io/client-go v0.19.4/go.mod" + "k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod" + "k8s.io/klog/v2 v2.0.0/go.mod" + "k8s.io/klog/v2 v2.2.0" + "k8s.io/klog/v2 v2.2.0/go.mod" + "k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6" + "k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod" + "k8s.io/kubernetes v1.13.0/go.mod" + "k8s.io/utils v0.0.0-20200729134348-d5654de09c73" + "k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod" + "rsc.io/binaryregexp v0.2.0/go.mod" + "sigs.k8s.io/structured-merge-diff/v4 v4.0.1" + "sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod" + "sigs.k8s.io/yaml v1.1.0/go.mod" + "sigs.k8s.io/yaml v1.2.0" + "sigs.k8s.io/yaml v1.2.0/go.mod" +) + +go-module_set_globals + +DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch" +HOMEPAGE="https://www.elastic.co/products/beats" +SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz + ${EGO_SUM_SRC_URI}" + +LICENSE="Apache-2.0 BSD-2 MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +RESTRICT="test" + +S="${WORKDIR}/beats-${PV}" + +src_prepare() { + default + + # avoid Elastic license + rm -r x-pack || die + + # use ${PV} instead of git commit id + sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die +} + +src_compile() { + emake -C "${S}/filebeat" +} + +src_install() { + keepdir /etc/${PN} + keepdir /var/{lib,log}/${PN} + + fperms 0750 /var/{lib,log}/${PN} + + newconfd "${FILESDIR}/${PN}.confd" ${PN} + newinitd "${FILESDIR}/${PN}.initd.1" ${PN} + + docinto examples + dodoc ${PN}/{filebeat.yml,filebeat.reference.yml} + + dobin filebeat/filebeat +} + +pkg_postinst() { + if [[ -n "${REPLACING_VERSIONS}" ]]; then + elog "Please read the migration guide at:" + elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html" + elog "" + fi + + elog "Example configurations:" + elog "${EROOT}/usr/share/doc/${PF}/examples" +} diff --git a/app-admin/github-backup-utils/Manifest b/app-admin/github-backup-utils/Manifest index 1451a343fdfc..0d3f9532f640 100644 --- a/app-admin/github-backup-utils/Manifest +++ b/app-admin/github-backup-utils/Manifest @@ -1 +1,2 @@ DIST github-backup-utils-2.22.0.tar.gz 102576 BLAKE2B ce9007c8a5d2843ccc2b3d11b03c13840b89d6ae7906d63420cc0e18191766c92c91e1072723439610ae8bdfdd0174601d1e3b7211cd6a1c9a748f9f793ff760 SHA512 e77b4afc6f90b16caf61dc4313787dab0751590b4819dca2d7e21acd0ca774d19ea359171b76f2892ca0fb4f86fd4240e77b00e107de79d496fea429fb12cee8 +DIST github-backup-utils-3.0.0.tar.gz 104088 BLAKE2B f01229e6b152231eb832dec8bef41bb158cc200bbdd3c59c1abab299c572902efe6d27d093491bd8b0bf8f3e834d2938eb0127d5f28700ba75dcbdbcc8a21bb8 SHA512 e86420ef9d86d44560e27e00361ff1bb8ba7c15fb116ad9981e3196bc4c7c25bcff9a9f7dc8dae9bbbb9b2f3380b434199dbbe1ef7db5b1ba04ec1233aec320d diff --git a/app-admin/github-backup-utils/github-backup-utils-3.0.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-3.0.0.ebuild new file mode 100644 index 000000000000..d50a44c1f6fb --- /dev/null +++ b/app-admin/github-backup-utils/github-backup-utils-3.0.0.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# Python3 support: https://github.com/github/backup-utils/pull/627 +PYTHON_COMPAT=(python3_{7,8,9}) +inherit python-any-r1 + +DESCRIPTION="Backup and recovery utilities for GitHub Enterprise" +HOMEPAGE="https://github.com/github/backup-utils" +SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" +RESTRICT="!test? ( test )" + +# moreutils parallel is now used for speedups in main code: +# https://github.com/github/backup-utils/pull/635 +RDEPEND="net-misc/rsync + sys-apps/moreutils" + +# tests invoke parallel & rsync +DEPEND="test? ( + ${RDEPEND} + dev-util/checkbashisms + ${PYTHON_DEPS} +)" + +MY_PN="${PN/#github-/}" +S="${WORKDIR}/${MY_PN}-${PV}" + +src_compile() { + :; +} + +src_install() { + dobin bin/* + insinto usr/share/${PN} + doins share/${PN}/version + + exeinto usr/share/${PN} + doexe share/${PN}/bm.sh + doexe share/${PN}/ghe-* + + insinto etc/${PN} + newins backup.config-example backup.config + + dodoc -r docs/* +} + +src_test() { + emake test +} diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest index ab52504552fb..dc178438def7 100644 --- a/app-admin/logstash-bin/Manifest +++ b/app-admin/logstash-bin/Manifest @@ -1,6 +1,8 @@ DIST logstash-6.8.15.tar.gz 176912362 BLAKE2B 68178b2cbf0ad3ecafc83fddf4c50ef767862fbb90ba7a0dd0527de4f8d3bddc485a99a7e774c6d0efd5b3eb4bf701be042cfc58dcb546c7436db39ff4594841 SHA512 bb42b1284f6ca8d4b10cac96b57cae0f28a33047164f9f9a352ed906a960e11fea3d9c58b23cdd607e0d76eee7aa07fbb6ce8870323e3cc6cba472578d99fb01 DIST logstash-7.10.2-linux-x86_64.tar.gz 351170815 BLAKE2B 536a33de4be4bd1b6dfccf7d4cedc064b0f0b9c0569545d195244cf14f38d9c83159439d7710a76fdc4e4394b5f7d5a1919460c1c03186b4fc7f054744a46016 SHA512 34099b34a05c6b85b1b355310bd190b606aa0bcce1cad07bf5fd98959e54f61860bdd697cca8f3cdab2d2b815bbc2a788d2e14dcac4b3d85a0d5bafd72d2b170 DIST logstash-7.12.0-linux-x86_64.tar.gz 368429061 BLAKE2B 7bf60eeeec072e99aec807c8cb64cfd5cd46270d297c717fee539531286f487ef254738a439947e40bfc039778d20fa746566aa4d0c031a8f1a22deaaab9ce74 SHA512 ba32cb97e81cc3f4369c752b860aea7a85d212921954e5829f0b63526584d01c79731dd094905d91ed35f9887ae70bfffd5324b25dc3f23e60745462493e8195 +DIST logstash-7.12.1-linux-x86_64.tar.gz 368465800 BLAKE2B eea395286408de50cf61b2a69f6a673f81c4021370eab9b04fb1a9ad993a5b625145d6710e5045f9572a6a923455fe8613c2262bd488f6e76d467850b1bfa5c5 SHA512 9ef32dbeb4269d904a775a1cf5833b09cc5b8b71c03f953641fd5de5c27ba51ec878d9e74cdd98255d37fcd39d592deea72832bdce26cbb2827db4ae3b294834 DIST logstash-oss-6.8.15.tar.gz 176782145 BLAKE2B 20cdd28d9c6e43edb3cc6d60b961155880aaf2e22d100b6641246a56194ba87aef3c41e039be2ab6bca75e646b83a3f42c935472776aa87a4baa774cca74458d SHA512 c74f189af58ca936b3d3e19970f29a78b8f041f5771163c5ed28466e84cf456f4814a9f4c5a9def2706c39daaebaca948c14e683a6aa82b2e1c1e7ee57592dc2 DIST logstash-oss-7.10.2-linux-x86_64.tar.gz 350992238 BLAKE2B f31207af62b6ff36af4be6fae9c6ede18a481317d28ba2ee6469cd095acba9b41ad4d7598756a51a078bf3d4269ae2f11750e4117842e496811a79825f284aef SHA512 5425483a7d3ec5ba186574940031a529efa683f452f5e3e38ffd9bd07771beabdd5c54a8147ed42fe761b700ea5c294018f1efb22fa6fdcf23189f2aea314b5b DIST logstash-oss-7.12.0-linux-x86_64.tar.gz 368251521 BLAKE2B 0959b29335dba2728d2e7a76ee482fb713f9d504a52bea1dcde99f042cfd52d9e18067cb3fffe6ca28b2eddddfd4ded1a19de616f4ddd3b6889e373a908706a0 SHA512 5d7bd5ec3ea5907771bb7590277e54be3407cebe6bc89dd7f5d73b02e9e8907855d19500787b21c8ffcff9cdbbb68a4bbb286131d03ce5585ec89e5c2a76dc60 +DIST logstash-oss-7.12.1-linux-x86_64.tar.gz 368287628 BLAKE2B 72e758e6962cc5a24c2a5f6ea4c268be1bc0b5a0ae1d73cb056d0d321b20495df346233e58661f11a37fc5e6c0750f28501af24511a7a29c2e698ce933c7380f SHA512 cefdfdaf2f1d0190d35bc5da2244a5bc09659e9f225cfd05acbdacd0f5f89cc13b928704491d18ac0d54c3500f8c15dc7ca64341bf0d7ed56a49c10eb82a55d4 diff --git a/app-admin/logstash-bin/logstash-bin-7.12.1.ebuild b/app-admin/logstash-bin/logstash-bin-7.12.1.ebuild new file mode 100644 index 000000000000..aea75866ef6f --- /dev/null +++ b/app-admin/logstash-bin/logstash-bin-7.12.1.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit java-pkg-2 + +MY_PN="${PN%-bin}" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Tool for managing events and logs" +HOMEPAGE="https://www.elastic.co/products/logstash" +SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz ) + !x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz )" + +# source: LICENSE.txt and NOTICE.txt +LICENSE="Apache-2.0 MIT x-pack? ( Elastic )" +SLOT="0" +KEYWORDS="~amd64" +IUSE="x-pack" + +RESTRICT="strip" +QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so" + +RDEPEND="acct-group/logstash + acct-user/logstash + virtual/jre" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + + local d + for d in aarch64-Linux arm-Linux Darwin i386-Linux i386-SunOS \ + i386-Windows mips64el-Linux ppc64-AIX ppc64le-Linux ppc64-Linux \ + ppc-AIX sparcv9-Linux sparcv9-SunOS x86_64-DragonFlyBSD \ + x86_64-FreeBSD x86_64-OpenBSD x86_64-SunOS x86_64-Windows; do + rm -r vendor/jruby/lib/jni/$d || die + done + + # remove bundled java + rm -r jdk || die +} + +src_install() { + keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins} + keepdir "/var/log/${MY_PN}" + + insinto "/usr/share/${MY_PN}" + newins "${FILESDIR}/agent.conf.sample" agent.conf + + rm -v config/{pipelines.yml,startup.options} || die + insinto /etc/${MY_PN} + doins -r config/. + doins "${FILESDIR}/pipelines.yml" + rm -rv config data || die + + insinto "/opt/${MY_PN}" + doins -r . + fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin" + + newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}" + newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}" + + insinto /usr/share/eselect/modules + doins "${FILESDIR}"/logstash-plugin.eselect +} + +pkg_postinst() { + ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)" + ewarn "Install the plugins via eselect module that will automatically re-install" + ewarn "all self installed plugins after Logstash upgrades." + elog + elog "Installing plugins:" + elog "eselect logstash-plugin install logstash-output-gelf" + elog + + elog "Reinstalling self installed plugins (installed via eselect module):" + eselect logstash-plugin reinstall + + elog + elog "Sample configuration:" + elog "${EROOT}/usr/share/${MY_PN}" + elog + elog "The default pipeline configuration expects the configuration(s) to be found in:" + elog "${EROOT}/etc/logstash/conf.d/*.conf" +} diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest index 77b7e1de5549..0e30bc1283e9 100644 --- a/app-admin/syslog-ng/Manifest +++ b/app-admin/syslog-ng/Manifest @@ -1,4 +1,2 @@ -DIST syslog-ng-3.26.1.tar.gz 5040993 BLAKE2B 235971547c8febe61191014d971b9e5d71560f51ebc3a74fbae1c95b86653f1de8d0b99788f5b00cc75926dc67e7a80f650e9d2d12f191a4400c5b8edbbd01b7 SHA512 2cf6a8bd70addec3bef0888539f4a4686c30655698835d0c211ea929a0cae91a6f3dc9903f29fe717fd9d48b5cdc9918796f196ca84af6f5733bedff09ffab5a -DIST syslog-ng-3.28.1.tar.gz 5149671 BLAKE2B bfc33f2a595cb4fbcc5a69b60d283673922873434b21ca8ce9685a0f54b355f162b11242704419349a561f412573c84df30a49a4dc0cc95699e98720e3e65247 SHA512 d70b435a6c9d1d0d22ecebc051dc294b6e7f841159edabf229c772c40342a28014ea1599b2277f0514236f545bac63c9879988fd85d634e9ab4fe4f079c984cb -DIST syslog-ng-3.29.1.tar.gz 5111614 BLAKE2B 1dba62290d6354d0cda7d43783327a19f69e05963c6d2e75f42c61c30984d49d28f1c6474e68ccdd806f38022bf6799e69e12f2444da391b2bccb736ca597c72 SHA512 c8ec6527cab9e46effe23aaa1306b5bde1e13c3e62a092a62af630a744cc41e81d861e6e2ebfbaad8a9199d3b75ba4ac5fb4b4215d03f80a41f57a2e7a074a49 DIST syslog-ng-3.30.1.tar.gz 5707042 BLAKE2B 3e6ee58b3732ae4863de43c7d22799a74074e94dbbf735368c09c11382b641a5554a4a25ad836b4ac25c8a4f64781dbfb1d9ddd6961ba3aa70c4213cfec81bfd SHA512 ac7ed4978c6db9464add30aa7aeb71a646f841593b02884c8d4ad34c0508c8d3243bcbe6ee98e81c04698895305334eadd9e624ba71e510c14d79155723efb52 +DIST syslog-ng-3.31.2.tar.gz 5727835 BLAKE2B a71190fe1580702a4d904c8a4d31a123d2aa0d01bb5a6e21f32f8502ec99f6109b45537c1a5022b0baeae89456b4b919bb8c88077d00aa9724398b7588254d89 SHA512 22a647c37f87fb1a45c8c69c2b0a022d1886cde5b0d585c3384b606d967c3f320a18e34810655174e82c797c0dc23c481732ecefd5be16da8fba4983b2ed0385 diff --git a/app-admin/syslog-ng/files/patches/syslog-ng-fno-common.patch b/app-admin/syslog-ng/files/patches/syslog-ng-fno-common.patch deleted file mode 100644 index abec9213cd18..000000000000 --- a/app-admin/syslog-ng/files/patches/syslog-ng-fno-common.patch +++ /dev/null @@ -1,320 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e9b4183fc..1f8f16c13 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -331,8 +331,7 @@ endif() - add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} -j $$(nproc) --output-on-failure) - - set(IMPORTANT_WARNINGS -- -Wshadow -- -fcommon) -+ -Wshadow) - - set(ACCEPTABLE_WARNINGS - -Wno-stack-protector -diff --git a/Makefile.am b/Makefile.am -index 8b24eeaed..86c090638 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -54,8 +54,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)/modules -I$(top_builddir)/lib - - # Important warnings - AM_CFLAGS = \ -- -Wshadow \ -- -fcommon -+ -Wshadow - - # Acceptable warnings - AM_CFLAGS += \ -diff --git a/lib/logmsg/tests/test_log_message.c b/lib/logmsg/tests/test_log_message.c -index 245568ce5..e51d78b94 100644 ---- a/lib/logmsg/tests/test_log_message.c -+++ b/lib/logmsg/tests/test_log_message.c -@@ -32,6 +32,8 @@ - #include <stdlib.h> - #include <glib/gprintf.h> - -+MsgFormatOptions parse_options; -+ - typedef struct _LogMessageTestParams - { - LogMessage *message; -@@ -151,7 +153,7 @@ void - setup(void) - { - app_startup(); -- init_and_load_syslogformat_module(); -+ init_parse_options_and_load_syslogformat(&parse_options); - } - - void -diff --git a/libtest/cr_template.c b/libtest/cr_template.c -index 35e47aa3f..4f0913368 100644 ---- a/libtest/cr_template.c -+++ b/libtest/cr_template.c -@@ -34,10 +34,12 @@ - - #include "msg_parse_lib.h" - -+static MsgFormatOptions parse_options; -+ - void - init_template_tests(void) - { -- init_and_load_syslogformat_module(); -+ init_parse_options_and_load_syslogformat(&parse_options); - } - - void -diff --git a/libtest/msg_parse_lib.c b/libtest/msg_parse_lib.c -index ae0d1654b..b3c7cb652 100644 ---- a/libtest/msg_parse_lib.c -+++ b/libtest/msg_parse_lib.c -@@ -27,15 +27,13 @@ - - #include <criterion/criterion.h> - --MsgFormatOptions parse_options; -- - void --init_and_load_syslogformat_module(void) -+init_parse_options_and_load_syslogformat(MsgFormatOptions *parse_options) - { - configuration = cfg_new_snippet(); - cfg_load_module(configuration, "syslogformat"); -- msg_format_options_defaults(&parse_options); -- msg_format_options_init(&parse_options, configuration); -+ msg_format_options_defaults(parse_options); -+ msg_format_options_init(parse_options, configuration); - } - - void -diff --git a/libtest/msg_parse_lib.h b/libtest/msg_parse_lib.h -index d86f178c2..5a9b4277b 100644 ---- a/libtest/msg_parse_lib.h -+++ b/libtest/msg_parse_lib.h -@@ -30,9 +30,7 @@ - #include "cfg.h" - #include "logmsg/logmsg.h" - --extern MsgFormatOptions parse_options; -- --void init_and_load_syslogformat_module(void); -+void init_parse_options_and_load_syslogformat(MsgFormatOptions *parse_options); - void deinit_syslogformat_module(void); - - void assert_log_messages_equal(LogMessage *log_message_a, LogMessage *log_message_b); -diff --git a/libtest/proto_lib.c b/libtest/proto_lib.c -index b69195865..105e390b9 100644 ---- a/libtest/proto_lib.c -+++ b/libtest/proto_lib.c -@@ -23,7 +23,7 @@ - */ - - #include "proto_lib.h" --#include "msg_parse_lib.h" -+#include "cfg.h" - - #include <string.h> - #include <criterion/criterion.h> -@@ -164,7 +164,8 @@ assert_proto_server_fetch_ignored_eof(LogProtoServer *proto) - void - init_proto_tests(void) - { -- init_and_load_syslogformat_module(); -+ configuration = cfg_new_snippet(); -+ cfg_load_module(configuration, "syslogformat"); - log_proto_server_options_defaults(&proto_server_options); - } - -@@ -172,5 +173,7 @@ void - deinit_proto_tests(void) - { - log_proto_server_options_destroy(&proto_server_options); -- deinit_syslogformat_module(); -+ -+ if (configuration) -+ cfg_free(configuration); - } -diff --git a/modules/linux-kmsg-format/tests/test_linux_format_kmsg.c b/modules/linux-kmsg-format/tests/test_linux_format_kmsg.c -index 79a4b97ad..d4d0d45a9 100644 ---- a/modules/linux-kmsg-format/tests/test_linux_format_kmsg.c -+++ b/modules/linux-kmsg-format/tests/test_linux_format_kmsg.c -@@ -31,6 +31,8 @@ - - #include <criterion/criterion.h> - -+MsgFormatOptions parse_options; -+ - static LogMessage * - kmsg_parse_message(const gchar *raw_message_str) - { -diff --git a/modules/python/tests/test_python_logmsg.c b/modules/python/tests/test_python_logmsg.c -index 9a0343b07..51651ee9d 100644 ---- a/modules/python/tests/test_python_logmsg.c -+++ b/modules/python/tests/test_python_logmsg.c -@@ -30,6 +30,8 @@ - static PyObject *_python_main; - static PyObject *_python_main_dict; - -+MsgFormatOptions parse_options; -+ - static void - _py_init_interpreter(void) - { -@@ -95,7 +97,7 @@ void setup(void) - { - app_startup(); - -- init_and_load_syslogformat_module(); -+ init_parse_options_and_load_syslogformat(&parse_options); - - _py_init_interpreter(); - _init_python_main(); -diff --git a/modules/stardate/tests/test_stardate.c b/modules/stardate/tests/test_stardate.c -index e48cfb6cd..7d55fc1d0 100644 ---- a/modules/stardate/tests/test_stardate.c -+++ b/modules/stardate/tests/test_stardate.c -@@ -33,6 +33,8 @@ - - #include "msg_parse_lib.h" - -+MsgFormatOptions parse_options; -+ - void - stardate_assert(const gchar *msg_str, const int precision, const gchar *expected) - { -@@ -58,6 +60,7 @@ void - setup(void) - { - app_startup(); -+ init_parse_options_and_load_syslogformat(&parse_options); - init_template_tests(); - cfg_load_module(configuration, "stardate"); - } -@@ -66,6 +69,7 @@ void - teardown(void) - { - deinit_template_tests(); -+ deinit_syslogformat_module(); - app_shutdown(); - } - -diff --git a/persist-tool/add.h b/persist-tool/add.h -index 981e0cc61..2d3524cb0 100644 ---- a/persist-tool/add.h -+++ b/persist-tool/add.h -@@ -32,8 +32,8 @@ - #include "cfg.h" - #include "persist-tool.h" - --gchar *persist_state_dir; --gchar *persist_state_name; -+extern gchar *persist_state_dir; -+extern gchar *persist_state_name; - - gint add_main(int argc, char *argv[]); - -diff --git a/persist-tool/generate.h b/persist-tool/generate.h -index 237a8ae24..34f7dfec9 100644 ---- a/persist-tool/generate.h -+++ b/persist-tool/generate.h -@@ -32,8 +32,8 @@ - #include "persist-state.h" - #include "cfg.h" - --gboolean force_generate; --gchar *generate_output_dir; -+extern gboolean force_generate; -+extern gchar *generate_output_dir; - - gint generate_main(int argc, char *argv[]); - -diff --git a/persist-tool/persist-tool.c b/persist-tool/persist-tool.c -index fd96c856d..4e4adc88f 100644 ---- a/persist-tool/persist-tool.c -+++ b/persist-tool/persist-tool.c -@@ -135,11 +135,17 @@ void persist_tool_free(PersistTool *self) - g_free(self); - } - -+gchar *persist_state_dir; -+gchar *persist_state_name; -+gboolean force_generate; -+gchar *generate_output_dir; -+ - static GOptionEntry dump_options[] = - { - { NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL } - }; - -+ - static GOptionEntry add_options[] = - { - { "output-dir", 'o', 0, G_OPTION_ARG_STRING, &persist_state_dir, "The directory where persist file is located.", "<directory>" }, -diff --git a/tests/unit/test_clone_logmsg.c b/tests/unit/test_clone_logmsg.c -index 57c0b181f..7b738b1e5 100644 ---- a/tests/unit/test_clone_logmsg.c -+++ b/tests/unit/test_clone_logmsg.c -@@ -38,6 +38,8 @@ - #include <stdlib.h> - #include <stdio.h> - -+MsgFormatOptions parse_options; -+ - void - assert_new_log_message_attributes(LogMessage *log_message) - { -@@ -69,7 +71,7 @@ void - setup(void) - { - app_startup(); -- init_and_load_syslogformat_module(); -+ init_parse_options_and_load_syslogformat(&parse_options); - } - - void -diff --git a/tests/unit/test_matcher.c b/tests/unit/test_matcher.c -index a92c8e458..d43755bea 100644 ---- a/tests/unit/test_matcher.c -+++ b/tests/unit/test_matcher.c -@@ -31,6 +31,8 @@ - #include <stdlib.h> - #include <string.h> - -+MsgFormatOptions parse_options; -+ - static LogMessage * - _create_log_message(const gchar *log) - { -@@ -128,7 +130,7 @@ void - setup(void) - { - app_startup(); -- init_and_load_syslogformat_module(); -+ init_parse_options_and_load_syslogformat(&parse_options); - } - - void -diff --git a/tests/unit/test_msgparse.c b/tests/unit/test_msgparse.c -index 6b9e1045f..0ed91f638 100644 ---- a/tests/unit/test_msgparse.c -+++ b/tests/unit/test_msgparse.c -@@ -49,6 +49,8 @@ struct sdata_pair - struct sdata_pair ignore_sdata_pairs[] = { { NULL, NULL } }; - struct sdata_pair empty_sdata_pairs[] = { { NULL, NULL } }; - -+MsgFormatOptions parse_options; -+ - static unsigned long - _absolute_value(signed long diff) - { -@@ -130,7 +132,7 @@ setup(void) - app_startup(); - setenv("TZ", "MET-1METDST", TRUE); - tzset(); -- init_and_load_syslogformat_module(); -+ init_parse_options_and_load_syslogformat(&parse_options); - /* Fri Feb 8 09:37:49 CET 2019 */ - fake_time(1549615069); - } diff --git a/app-admin/syslog-ng/files/patches/syslog-ng-glib-2.64-support.patch b/app-admin/syslog-ng/files/patches/syslog-ng-glib-2.64-support.patch deleted file mode 100644 index fdd98624a6ea..000000000000 --- a/app-admin/syslog-ng/files/patches/syslog-ng-glib-2.64-support.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/lib/compat/glib.c b/lib/compat/glib.c -index 8b6e52447..5b8ed8891 100644 ---- a/lib/compat/glib.c -+++ b/lib/compat/glib.c -@@ -315,3 +315,18 @@ slng_g_hash_table_insert(GHashTable *hash_table, gpointer key, gpointer value) - return exists; - } - #endif -+ -+ -+#if !GLIB_CHECK_VERSION(2, 64, 0) -+gunichar -+g_utf8_get_char_validated_fixed(const gchar *p, gssize max_len) -+{ -+ // https://github.com/GNOME/glib/commit/1963821a57584b4674c20895e8a5adccd2d9effd -+ -+#undef g_utf8_get_char_validated -+ if (*p == '\0' && max_len > 0) -+ return (gunichar)-2; -+ -+ return g_utf8_get_char_validated(p, max_len); -+} -+#endif -diff --git a/lib/compat/glib.h b/lib/compat/glib.h -index a9782ed2d..0fbdbd12d 100644 ---- a/lib/compat/glib.h -+++ b/lib/compat/glib.h -@@ -109,4 +109,9 @@ gchar *g_base64_encode_fixed(const guchar *data, gsize len); - gboolean slng_g_hash_table_insert (GHashTable *hash_table, gpointer key, gpointer value); - #endif - -+#if !GLIB_CHECK_VERSION(2, 64, 0) -+#define g_utf8_get_char_validated g_utf8_get_char_validated_fixed -+gunichar g_utf8_get_char_validated_fixed (const gchar *p, gssize max_len); -+#endif -+ - #endif -diff --git a/modules/cef/tests/test-format-cef-extension.c b/modules/cef/tests/test-format-cef-extension.c -index d7f6ee3c1..f4233f96f 100644 ---- a/modules/cef/tests/test-format-cef-extension.c -+++ b/modules/cef/tests/test-format-cef-extension.c -@@ -104,7 +104,7 @@ Test(format_cef, test_null_in_value) - - configuration->template_options.on_error = ON_ERROR_DROP_MESSAGE | ON_ERROR_SILENT; - log_msg_set_value_by_name(msg, ".cef.k", "a\0b", 3); -- assert_template_format_msg("$(format-cef-extension --subkeys .cef.)", "k=a\\u0000b", msg); -+ assert_template_format_msg("$(format-cef-extension --subkeys .cef.)", "k=a\\x00b", msg); - log_msg_unref(msg); - } - -diff --git a/modules/json/tests/test_format_json.c b/modules/json/tests/test_format_json.c -index 92c61e9f1..1224ddb33 100644 ---- a/modules/json/tests/test_format_json.c -+++ b/modules/json/tests/test_format_json.c -@@ -55,7 +55,7 @@ Test(format_json, test_format_json) - assert_template_format("$(format-json MSG=$escaping)", - "{\"MSG\":\"binary stuff follows \\\"\\\\xad árvíztűrőtükörfúrógép\"}"); - assert_template_format("$(format-json MSG=$escaping2)", "{\"MSG\":\"\\\\xc3\"}"); -- assert_template_format("$(format-json MSG=$null)", "{\"MSG\":\"binary\\u0000stuff\"}"); -+ assert_template_format("$(format-json MSG=$null)", "{\"MSG\":\"binary\\\\x00stuff\"}"); - assert_template_format_with_context("$(format-json MSG=$MSG)", - "{\"MSG\":\"árvíztűrőtükörfúrógép\"}{\"MSG\":\"árvíztűrőtükörfúrógép\"}"); - assert_template_format("$(format-json --scope rfc3164)", diff --git a/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild b/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild deleted file mode 100644 index c720da246944..000000000000 --- a/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) -inherit autotools python-single-r1 systemd - -MY_PV_MM=$(ver_cut 1-2) -DESCRIPTION="syslog replacement with advanced filtering features" -HOMEPAGE="https://syslog-ng.com/open-source-log-management" -SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/glib-2.10.1:2 - >=dev-libs/ivykis-0.42.4 - >=dev-libs/libpcre-6.1:= - !dev-libs/eventlog - amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) - caps? ( sys-libs/libcap ) - dbi? ( >=dev-db/libdbi-0.9.0 ) - geoip2? ( dev-libs/libmaxminddb:= ) - http? ( net-misc/curl ) - json? ( >=dev-libs/json-c-0.9:= ) - kafka? ( >=dev-libs/librdkafka-1.0.0:= ) - mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) - python? ( ${PYTHON_DEPS} ) - redis? ( >=dev-libs/hiredis-0.11.0:= ) - smtp? ( net-libs/libesmtp ) - snmp? ( net-analyzer/net-snmp ) - spoof-source? ( net-libs/libnet:1.1= ) - systemd? ( sys-apps/systemd:= ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - dev-libs/openssl:0=" -DEPEND="${RDEPEND} - test? ( dev-libs/criterion )" -BDEPEND=" - sys-devel/flex - virtual/pkgconfig" - -DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc} - contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened" - "${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" ) - -PATCHES=( "${FILESDIR}/patches/syslog-ng-glib-2.64-support.patch" ) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - local f - - use python && python_fix_shebang . - - # remove bundled libs - rm -r lib/ivykis || die - - # drop scl modules requiring json - if use !json; then - sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d' scl/Makefile.am || die - fi - - # drop scl modules requiring http - if use !http; then - sed -i -r '/slack|telegram/d' scl/Makefile.am || die - fi - - # use gentoo default path - if use systemd; then - sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \ - -i contrib/systemd/syslog-ng@default || die - fi - - for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do - sed \ - -e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \ - "/etc/init.d/syslog-ng reload")#g" \ - "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die - done - - for f in syslog-ng.conf.gentoo.hardened.in \ - syslog-ng.conf.gentoo.in; do - sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die - done - - default - eautoreconf -} - -src_configure() { - local myconf=( - --disable-docs - --disable-java - --disable-java-modules - --disable-riemann - --enable-manpages - --localstatedir=/var/lib/syslog-ng - --sysconfdir=/etc/syslog-ng - --with-embedded-crypto - --with-ivykis=system - --with-module-dir=/usr/$(get_libdir)/syslog-ng - --with-pidfile-dir=/var/run - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - $(use_enable amqp) - $(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client) - $(use_enable caps linux-caps) - $(use_enable dbi sql) - $(use_enable geoip2) - $(use_enable http) - $(use_enable ipv6) - $(use_enable json) - $(use_enable kafka) - $(use_enable mongodb) - $(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options") - $(use_enable pacct) - $(use_enable python) - $(use_enable redis) - $(use_enable smtp) - $(use_enable snmp snmp-dest) - $(use_enable spoof-source) - $(use_enable systemd) - $(use_enable tcpd tcp-wrapper) - ) - - econf "${myconf[@]}" -} - -src_install() { - default - - # Install default configuration - insinto /etc/default - doins contrib/systemd/syslog-ng@default - - insinto /etc/syslog-ng - newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf - - insinto /etc/logrotate.d - newins "${T}/syslog-ng.logrotate" syslog-ng - - newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng - newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng - keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng - find "${D}" -name '*.la' -delete || die - - use python && python_optimize -} - -pkg_postinst() { - # bug #355257 - if ! has_version app-admin/logrotate ; then - elog "It is highly recommended that app-admin/logrotate be emerged to" - elog "manage the log files. ${PN} installs a file in /etc/logrotate.d" - elog "for logrotate to use." - fi - - if use systemd; then - ewarn "The service file for systemd has changed to support multiple instances." - ewarn "To start the default instance issue:" - ewarn "# systemctl start syslog-ng@default" - fi -} diff --git a/app-admin/syslog-ng/syslog-ng-3.28.1-r2.ebuild b/app-admin/syslog-ng/syslog-ng-3.28.1-r2.ebuild deleted file mode 100644 index 80e2a64e5b52..000000000000 --- a/app-admin/syslog-ng/syslog-ng-3.28.1-r2.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -inherit autotools python-single-r1 systemd - -MY_PV_MM=$(ver_cut 1-2) -DESCRIPTION="syslog replacement with advanced filtering features" -HOMEPAGE="https://syslog-ng.com/open-source-log-management" -SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/glib-2.10.1:2 - >=dev-libs/ivykis-0.42.4 - >=dev-libs/libpcre-6.1:= - !dev-libs/eventlog - amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) - caps? ( sys-libs/libcap ) - dbi? ( >=dev-db/libdbi-0.9.0 ) - geoip2? ( dev-libs/libmaxminddb:= ) - http? ( net-misc/curl ) - json? ( >=dev-libs/json-c-0.9:= ) - kafka? ( >=dev-libs/librdkafka-1.0.0:= ) - mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) - python? ( ${PYTHON_DEPS} ) - redis? ( >=dev-libs/hiredis-0.11.0:= ) - smtp? ( net-libs/libesmtp ) - snmp? ( net-analyzer/net-snmp:0= ) - spoof-source? ( net-libs/libnet:1.1= ) - systemd? ( sys-apps/systemd:= ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - dev-libs/openssl:0=" -DEPEND="${RDEPEND} - test? ( dev-libs/criterion )" -BDEPEND=" - sys-devel/flex - virtual/pkgconfig" - -DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc} - contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened" - "${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" ) -PATCHES=( - "${FILESDIR}"/${PN}-3.28.1-net-snmp.patch -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - local f - - use python && python_fix_shebang . - - # remove bundled libs - rm -r lib/ivykis || die - - # drop scl modules requiring json - if use !json; then - sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d' scl/Makefile.am || die - fi - - # drop scl modules requiring http - if use !http; then - sed -i -r '/slack|telegram/d' scl/Makefile.am || die - fi - - # use gentoo default path - if use systemd; then - sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \ - -i contrib/systemd/syslog-ng@default || die - fi - - for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do - sed \ - -e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \ - "/etc/init.d/syslog-ng reload")#g" \ - "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die - done - - for f in syslog-ng.conf.gentoo.hardened.in \ - syslog-ng.conf.gentoo.in; do - sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die - done - - default - eautoreconf -} - -src_configure() { - local myconf=( - --disable-docs - --disable-java - --disable-java-modules - --disable-riemann - --enable-manpages - --localstatedir=/var/lib/syslog-ng - --sysconfdir=/etc/syslog-ng - --with-embedded-crypto - --with-ivykis=system - --with-module-dir=/usr/$(get_libdir)/syslog-ng - --with-pidfile-dir=/var/run - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - $(use_enable amqp) - $(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client) - $(use_enable caps linux-caps) - $(use_enable dbi sql) - $(use_enable geoip2) - $(use_enable http) - $(use_enable ipv6) - $(use_enable json) - $(use_enable kafka) - $(use_enable mongodb) - $(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options") - $(use_enable pacct) - $(use_enable python) - $(use_enable redis) - $(use_enable smtp) - $(use_enable snmp afsnmp) - $(use_enable spoof-source) - $(use_enable systemd) - $(use_enable tcpd tcp-wrapper) - ) - - econf "${myconf[@]}" -} - -src_install() { - default - - # Install default configuration - insinto /etc/default - doins contrib/systemd/syslog-ng@default - - insinto /etc/syslog-ng - newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf - - insinto /etc/logrotate.d - newins "${T}/syslog-ng.logrotate" syslog-ng - - newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng - newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng - keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng - find "${D}" -name '*.la' -delete || die - - use python && python_optimize -} - -pkg_postinst() { - # bug #355257 - if ! has_version app-admin/logrotate ; then - elog "It is highly recommended that app-admin/logrotate be emerged to" - elog "manage the log files. ${PN} installs a file in /etc/logrotate.d" - elog "for logrotate to use." - fi - - if use systemd; then - ewarn "The service file for systemd has changed to support multiple instances." - ewarn "To start the default instance issue:" - ewarn "# systemctl start syslog-ng@default" - fi -} diff --git a/app-admin/syslog-ng/syslog-ng-3.29.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.31.2.ebuild index 80e2a64e5b52..2c85e035f7e0 100644 --- a/app-admin/syslog-ng/syslog-ng-3.29.1.ebuild +++ b/app-admin/syslog-ng/syslog-ng-3.31.2.ebuild @@ -33,7 +33,7 @@ RDEPEND=" mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( ${PYTHON_DEPS} ) redis? ( >=dev-libs/hiredis-0.11.0:= ) - smtp? ( net-libs/libesmtp ) + smtp? ( >=net-libs/libesmtp-1.0.6_p20200824:= ) snmp? ( net-analyzer/net-snmp:0= ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) @@ -50,6 +50,7 @@ DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunO "${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" ) PATCHES=( "${FILESDIR}"/${PN}-3.28.1-net-snmp.patch + "${FILESDIR}"/${PN}-3.30.1-esmtp-pkgconfig.patch ) pkg_setup() { diff --git a/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild b/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild index 88a12cb71287..492f3b4e4761 100644 --- a/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild +++ b/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz LICENSE="BSD-1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" DEPEND="" diff --git a/app-arch/unzip/unzip-6.0_p26.ebuild b/app-arch/unzip/unzip-6.0_p26.ebuild index b852ce2ca07c..398013305c5d 100644 --- a/app-arch/unzip/unzip-6.0_p26.ebuild +++ b/app-arch/unzip/unzip-6.0_p26.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz LICENSE="Info-ZIP" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 ) diff --git a/app-crypt/openpgp-keys-tor/Manifest b/app-crypt/openpgp-keys-tor/Manifest new file mode 100644 index 000000000000..1ca61f0acddc --- /dev/null +++ b/app-crypt/openpgp-keys-tor/Manifest @@ -0,0 +1,2 @@ +DIST 7A02B3521DC75C542BA015456AFEE6D49E92B601.asc 21639 BLAKE2B 6aa893ed68a06ec546bb6c09202f1fa72a1f9437f683fed9adbdd46d93439465d13e5f8b78b79de1e3b0de33333be8940b8e285b67e34efc4df39e9879c8900c SHA512 e8512c35861caea88148cc16bf8f0df95d9526b1025e263e17dca53f5a9957913f4b3248c00dd61d12b7f823ee9782accc3faf98ac8008473fa74ab7c01d91f2 +DIST EF6E286DDA85EA2A4BA7DE684E2C6E8793298290.asc 21351 BLAKE2B b2225df2f0c345d113d5c138b3e8d5d87ba6019616fd03e7609faeab0df497acfeb7de589ef8ef13d781d10ab9e0d335cb00646ca5c92e98419b610808c8721d SHA512 40bc1add049a3bb02bd1ee7644161f0b60fb2fbe5172998b9e0a14e6fd7ee116905ee4a64c9f23f8f9bdde7b96b7716d4afd9016ae6a28dd761325c556eb92e8 diff --git a/dev-php/PEAR-Net_LDAP3/metadata.xml b/app-crypt/openpgp-keys-tor/metadata.xml index 5b159fbcadd1..1597a03e6f39 100644 --- a/dev-php/PEAR-Net_LDAP3/metadata.xml +++ b/app-crypt/openpgp-keys-tor/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>pinkbyte@gentoo.org</email> - <name>Sergey Popov</name> + <maintainer type="project"> + <email>blueness@gentoo.org</email> </maintainer> + <stabilize-allarches/> </pkgmetadata> diff --git a/app-crypt/openpgp-keys-tor/openpgp-keys-tor-20210425.ebuild b/app-crypt/openpgp-keys-tor/openpgp-keys-tor-20210425.ebuild new file mode 100644 index 000000000000..82f183c49de6 --- /dev/null +++ b/app-crypt/openpgp-keys-tor/openpgp-keys-tor-20210425.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="OpenPGP keys used by the Tor project" +HOMEPAGE="https://www.torproject.org/" +SRC_URI="https://keys.openpgp.org/vks/v1/by-fingerprint/EF6E286DDA85EA2A4BA7DE684E2C6E8793298290 -> EF6E286DDA85EA2A4BA7DE684E2C6E8793298290.asc + https://keys.openpgp.org/vks/v1/by-fingerprint/7A02B3521DC75C542BA015456AFEE6D49E92B601 -> 7A02B3521DC75C542BA015456AFEE6D49E92B601.asc" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" + +S="${WORKDIR}" + +src_install() { + local files=( ${A} ) + insinto /usr/share/openpgp-keys + newins - torproject.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die) +} diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest index d911db7e487c..41c35f702a09 100644 --- a/app-emulation/xen-tools/Manifest +++ b/app-emulation/xen-tools/Manifest @@ -3,14 +3,12 @@ DIST berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz 148741 B DIST brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz 23855739 BLAKE2B 7406ec5b29ac66afbcd7c1376bb3208f298d19b6592b2869c52173aa64947d58bd443f9a61c67deaf046be910a0e31c0b843e5508e97e0e1f5e7bce100d86904 SHA512 df8e90562c4fd7f0e787949df6bc4f5a165b39bd333f442d27874fe65640fbba268f9350d7113e6761a5acceb66d78e75f1a296e5a89b94574edf28109cdc812 DIST edk2-06dc822d045c2bb42e497487935485302486e151.tar.gz 13192042 BLAKE2B 81afa7fd5f6f14fff35baa3c6c64583fa21c7b793ed847a3362fd05a926bb4402db911f9f78f4ffd76a6de9b815171dfa245ae41afac3b022cd108597e8c1ac3 SHA512 a032a1496db7ddc32a7d6d1a7d5fe4122ab43b13547ec019855166d785f162268ad82ceb3c41efafe1687e73fc72599ee6852741652451e1cb329fd655c69b6c DIST ipxe-git-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz 3810726 BLAKE2B b95266ec7fcee5c27065ba999b023ded9eb42a3690555e626911493f1dc995927fa67071bdc6432b3995df82134f8c49ea0d72eaf407f455dd1e2675d5b8d844 SHA512 8120696ba6d79fd9189664deed9b0489825d8d1edf7b931023b3979b7b9f82248e5b808c4517036cd40a85442ddf51a8dcad3b05d7f3c3cc6650654d53da4050 -DIST seabios-1.12.1.tar.gz 613450 BLAKE2B cb926b650c41a9962db407945cb5b6558079b061bd61f32ea56aedf0d37a00d10ad4434acbe717ffbc0dd1d1c0767304af8e640a53b0fc3784969dfa1590f681 SHA512 58755ce842adcb99c0f2f3ebbf9ec6d4a5072753966ab46805a96db1570847b109a90e6e03d61f9088ef877ca8ba96a8006777dc38ec434fce6b487f6c1f91d0 -DIST seabios-1.13.0.tar.gz 620952 BLAKE2B 460a7dd2b2775b981bbd890ed0a50fe905794c68b0b895799667dd1378bb84125712330c2f6945112709d42cfb7b01196c7fff99051e44b6211d47d19531cfae SHA512 7f158badf7deecc2998eab2a08f3615dfe5a7c0a51323f7b4568a4d1280935bc32bb466c8226d87d2ca7e13f9f117ff0092befcc0699bc31c5018e84754e8393 -DIST xen-4.13.2-upstream-patches-2.tar.xz 58992 BLAKE2B 535d67ae6a30e23feb975172a9e4abd6d7feb6c8c969aa243fdf672ed6580fe46bf57ea5530eab70457e22af9163f95061fdf97d10faa3be9f4c92033187c950 SHA512 6b6cdf72d13c0e595be65e3107c0f68299e932b74d4a1c4d59bfe3be8b76840c47f6adeaddd0efac71d5158cee8d778a0be863eea8f032cb9acf4191f629d8ae -DIST xen-4.13.2-upstream-patches-6.tar.xz 80980 BLAKE2B a20643c4f89f197e4001c0181249bc1a22b60874bc077ba2abee716b8e64bbbea0885a64632f3120960425a741328ceba1b44dc10a7a24039b328e1ded28f752 SHA512 0b097dfb04404ec6c609d35d924b3d2306c5f2de0501aa0b8e007e0af9a4ef394fae2d736435401bf8bd1fd661171c71ba712585bdb195649e3350ef9f953115 -DIST xen-4.13.2.tar.gz 39037826 BLAKE2B ad2b7c3003ca29e5e60a85c581f706ef87d99eadf939ed36ebe8f6698582f7a29dbdaf502039b60a0afe7ad4ae6ce89713e69dc8b8a7d5abe65063da7f1baa5b SHA512 cd3092281c97e9421e303aa288aac04dcccd5536ba7c0ff4d51fbf3d07b5ffacfe3456ba06f5cf63577dafbf8cf3a5d9825ceb5e9ef8ca1427900cc3e57b50a3 +DIST ipxe-git-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz 3931642 BLAKE2B bf0b5d9ea1d44803bc5c4aa0bf9188636e292b226ab759f32e3c2bfa3f80dd3f546526b9a11c1f67193793ede5309bfa67bdce80aba62ccca54597dc6e7e4ba4 SHA512 0a63f83c9135d05c6bfe7c4d12da3ff76271e35305a4d5654bd5aefa9ee59f5363546c65820c42133deb0fb5a0a0bcaa9b1c48396f9f996acea0d492a5f03f33 +DIST seabios-1.12.0.tar.gz 613542 BLAKE2B f145c2db716996bfa9e5c014086ccfaa8ae96ebc158f34303b122b7bf209408c567665d8691364df8d8e886f63e0e72a3f3cd319dfa86ef581023201b5d94e53 SHA512 e52c5363e5bb37b5286e55545aa06bd126218f9d0e3a06ac2e189de68fe3de3256c11ca1bb13357a9c384d7e3af6284083ff3aa587688b5de04ef11b97bdfa27 +DIST seabios-1.14.0.tar.gz 628985 BLAKE2B cc1126925dab1551a655680d20d06ebf28c12c386500d1ee4df9e1a99403b4c5bc6a66c2cc5ef58b4c3d6d7226f35007506a6a1855c2cf2742469dcb7aba05bb SHA512 215c42f59425f8abd062be7b11fc0e39c977cee5001a2381551b0f851ac337d0dd53c065267e6dee0e710ffd700fa635f9007b89da8dfce0f47122c984ee8146 DIST xen-4.13.3.tar.gz 39044539 BLAKE2B 5d0e57c76e12e1b86b78bbf561e947d70b9569a24412617a640346d2358b141a2741e7a3be454df52d198ad63e58b1519288de62330417c70e72445703f3fac2 SHA512 622127d824b9c49b57282a887fb404e0bad05ff60bccade82e4e0e9b5ad975ff9aa1fba83392e6d8379e9a15340e8ae9785c0913eb11027816e4600432eea6b6 -DIST xen-4.14.1-upstream-patches-3.tar.xz 27864 BLAKE2B 69a67e863a30c0079f7955dd5306f69890a4f6db91d4cf2d1806a2bbd8afad88db7789c7eda8da0ff2a945da04916ff4ab5eaa9e529a417112ae01e31151d0dc SHA512 19e5ef39616fffbff20b2f658d61e50e21741fe3c5c4ca89f67e72a1606b3a593f93e9090fb0b5c76c1c801f931c237d2be6329bd174fa911d66b81ad4a332dd -DIST xen-4.14.1.tar.gz 39970115 BLAKE2B 21e5838b2b4d78420dcaaae2b8fc98ac876230217e6a3764aa643920150b8cef96025663e6a2fc423ab15f7f470b62547e91ce1be0337fc78f00c148c7ff40ab SHA512 c75cbec82793435f5a7026626ffdb2e9a2166b42d2be4b2f1194240e0312458124f0ebd53eeb02ce7330c22afe402a28a96b32f8af66e41e9416fe94535724c9 +DIST xen-4.14.2.tar.gz 39973157 BLAKE2B db5d3570f79e0fd97872f5e5dd57a4eb39e005728387bfef3b51fabe1c693cfd8108d09b1026f5a5a7eb79de71be6f4af36d252f7e0b35a65a1567b7949e3e29 SHA512 83c9333b70dbee3e29c6bf08e5ad030676e6c4a32b976f3f5e6a8f8d0dd9e4898bac88dd8e1c9d2ad3509cebb5d212e1745f9392a469d7afeb841d79801ccf39 +DIST xen-4.15.0-upstream-patches-0.tar.xz 15744 BLAKE2B e2abb68524a7c190db8d91beb79731aea5290e82f54fb21218739dab666f6f5ea85c203575ec248b46830f1862408d50d3ceea1104fcd9325babfccf3574c515 SHA512 f1a2800d15a61f08eda4d6bafaead95a9d72cc9e4d90a19278d89c696b7e2d5d6353b28dba7ed0eb0c9aeb8604d3697db6a8f4ac38047e2510279d88181752f9 +DIST xen-4.15.0.tar.gz 40785399 BLAKE2B 8b0530f5516c39656506f4bb705952da0555a8ab7f47323473b171caeb7692f3107e9d94f13171d40576600064589eed35f4d210af02db4cc4706dd4fc202100 SHA512 93683b8a97387ca5f003c635a11d163e61c87dbdc9a03081f9155fe87b49f1dfa74ce243fcd5e04dc009353a36e2375b786f1ebde828b5951a094cd64197b4c7 DIST xen-gentoo-patches-21.tar.xz 18280 BLAKE2B 95446da72fc16cb82e4e51df8796c64db05a30894a351a98dbd6700ce354c34956ca09a1af98125a4e56c337936e8fae296d806519b8afa23a82b078aa0db8f1 SHA512 3cffac162606a09b10b47dca604f167897e6ac8d153411d3464ef29a7a4d46ac5b92340884cb21279cb2d053b131f1ea5cb2111e3e9a21b3298b5ab3320ee34d -DIST xen-gentoo-patches-22.tar.xz 18764 BLAKE2B e0da49b39fbc6b689db47e40a4fbb4f6568644fe192b114cce01b0406cba4bf23339ad1bf39b972f895df004916827b6e774f97fc079aeb8ac436763efda5fc3 SHA512 5b7959af4ed30edd2526698ab60a86353e35d9dc48dc941b6df7659a7c4904260461e0decbd8d788542bd69384736f2175861d4943c3738618d20788b19ea9b1 -DIST xen-security-patches-29.tar.xz 1536 BLAKE2B 7723e9d971a2385f7a4a85dd63412afc41ba20991d15732423f03d0c5455c504ecccec08102edbec0db47ed019c88cc86f4146e080075d829aff03ccded362bc SHA512 eff572fed812c38bc3c014d47b951d3614bfb1255d41a2d35ddcbe9228cf9550aaf867adde0f2365f49d0d4e5229c19a78aa538eb64de7cd3d1ef5f7f0c4a079 +DIST xen-gentoo-patches-23.tar.xz 20536 BLAKE2B 0064f79f8794a21ab13047a4ee296e37efa616e16ca6cd65b31fdafeb458fd9b80f0443758343c8328b1901d7169618346becfe75f16dcaeff08fc975f1d08d5 SHA512 09248e17ff7865feb2a505169d62ee5c8c60bd672fa8c4c7c4e3a2e4af58bfad0379d37b395bab3e3393af8d53d882f56749dfeb560edeea6b7ab56c902a3c49 diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf index 56028e12ee1b..4b1aac4eae65 100644 --- a/app-emulation/xen-tools/files/gentoo-patches.conf +++ b/app-emulation/xen-tools/files/gentoo-patches.conf @@ -51,16 +51,6 @@ _gx056=" xen-tools-4.12.2-libxenstat-makefile.patch" # Fix building with gcc 10, bug #722930 _gx060=" xen-tools-4.13.0-gcc10.patch" -# xen-tools-4.13.2 patches set (v1) -_gpv_xen_tools_4132_1=" -${_gx038} -${_gx027} -${_gx028} ${_gx029} -${_gx037} -${_gx053} ${_gx050} ${_gx051} -${_gx054} ${_gx056} -" - # xen-tools-4.13.3 patches set _gpv_xen_tools_4133_0=" ${_gx038} @@ -71,12 +61,32 @@ ${_gx053} ${_gx050} ${_gx051} ${_gx054} ${_gx056} " -# xen-tools-4.14.1 patches set -_gpv_xen_tools_4141_0=" -${_gx039} -${_gx027} -${_gx028} ${_gx029} -${_gx037} -${_gx053} ${_gx050} ${_gx052} -${_gx054} ${_gx056} +# xen-tools-4.14.2 patches set +_gpv_xen_tools_4142_0=" + xen-tools-4.12.0-gcc8.patch + xen-tools-4.12.0-shim.patch + xen-tools-4.12.0-unbundle-ipxe.patch + xen-tools-4.12.2-libxenstat-makefile.patch + xen-tools-4.14-ar-cc.patch + xen-tools-4.14-qemu-bridge.patch + xen-tools-4.15.0-disable-werror.patch + xen-tools-4.15.0-gcc11.patch + xen-tools-4.4.1-tinfo.patch + xen-tools-4.6-increase-stack-size.patch + xen-tools-4-anti-ovmf-download.patch + xen-tools-4-qemu-fix-po-collision.patch +" + +# xen-tools-4.15.0 patches set +_gpv_xen_tools_4150_0=" + xen-tools-4.14-ar-cc.patch + xen-tools-4.15.0-disable-werror.patch + xen-tools-4.15.0-gcc11.patch + xen-tools-4.15.0-libxenstat-makefile.patch + xen-tools-4.15.0-no-ld-no-pie.patch + xen-tools-4.15.0-qemu-bridge.patch + xen-tools-4.15.0-unbundle-ipxe.patch + xen-tools-4.4.1-tinfo.patch + xen-tools-4-anti-ovmf-download.patch + xen-tools-4-qemu-fix-po-collision.patch " diff --git a/app-emulation/xen-tools/xen-tools-4.13.2-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.13.2-r2.ebuild deleted file mode 100644 index 3eb28b929850..000000000000 --- a/app-emulation/xen-tools/xen-tools-4.13.2-r2.ebuild +++ /dev/null @@ -1,512 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -PYTHON_REQ_USE='ncurses,xml,threads(+)' - -inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs - -MY_PV=${PV/_/-} - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - REPO="xen.git" - EGIT_REPO_URI="git://xenbits.xen.org/${REPO}" - S="${WORKDIR}/${REPO}" -else - KEYWORDS="amd64 ~arm ~arm64 x86" - UPSTREAM_VER=2 - SECURITY_VER=29 - # xen-tools's gentoo patches tarball - GENTOO_VER=21 - # xen-tools's gentoo patches version which apply to this specific ebuild - GENTOO_GPV=1 - # xen-tools ovmf's patches - OVMF_VER= - - SEABIOS_VER="1.12.1" - EDK2_COMMIT="06dc822d045c2bb42e497487935485302486e151" - EDK2_OPENSSL_VERSION="1_1_1g" - EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037" - EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d" - IPXE_COMMIT="1dd56dbd11082fb622c2ed21cfaced4f47d798a6" - - [[ -n ${UPSTREAM_VER} ]] && \ - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz - https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" - [[ -n ${SECURITY_VER} ]] && \ - SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz - https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-security-patches-${SECURITY_VER}.tar.xz" - [[ -n ${GENTOO_VER} ]] && \ - GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz - https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz" - [[ -n ${OVMF_VER} ]] && \ - OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz" - - SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz - https://github.com/qemu/seabios/archive/rel-${SEABIOS_VER}.tar.gz -> seabios-${SEABIOS_VER}.tar.gz - ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz ) - ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz - https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz - https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz - https://github.com/google/brotli/archive/${EDK2_BROTLI_COMMIT}.tar.gz -> brotli-${EDK2_BROTLI_COMMIT}.tar.gz - ${OVMF_PATCHSET_URI} ) - ${UPSTREAM_PATCHSET_URI} - ${SECURITY_PATCHSET_URI} - ${GENTOO_PATCHSET_URI}" - - S="${WORKDIR}/xen-${MY_PV}" -fi - -DESCRIPTION="Xen tools including QEMU and xl" -HOMEPAGE="https://www.xenproject.org" -DOCS=( README ) - -LICENSE="GPL-2" -SLOT="0/$(ver_cut 1-2)" -# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make -# >=dev-lang/ocaml-4 stable -# Masked in profiles/eapi-5-files instead -IUSE="api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - ipxe? ( rombios ) - ovmf? ( hvm ) - pygrub? ( python ) - rombios? ( hvm ) - system-ipxe? ( rombios ) - ?? ( ipxe system-ipxe ) - ?? ( qemu system-qemu )" - -COMMON_DEPEND=" - sys-apps/pciutils - dev-libs/lzo:2 - dev-libs/glib:2 - dev-libs/yajl - dev-libs/libaio - dev-libs/libgcrypt:0 - sys-libs/zlib - ${PYTHON_DEPS} -" - -DEPEND="${COMMON_DEPEND} - >=sys-kernel/linux-headers-4.11 - $(python_gen_cond_dep ' - dev-python/lxml[${PYTHON_MULTI_USEDEP}] - pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] ) - ') - x86? ( sys-devel/dev86 - system-ipxe? ( sys-firmware/ipxe[qemu] ) - sys-power/iasl ) - api? ( dev-libs/libxml2 - net-misc/curl ) - - ovmf? ( - !arm? ( !arm64? ( dev-lang/nasm ) ) - $(python_gen_impl_dep sqlite) - ) - !amd64? ( >=sys-apps/dtc-1.4.0 ) - amd64? ( sys-power/iasl - system-seabios? ( sys-firmware/seabios ) - system-ipxe? ( sys-firmware/ipxe[qemu] ) - rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) - dev-lang/perl - app-misc/pax-utils - doc? ( - app-text/ghostscript-gpl - app-text/pandoc - $(python_gen_cond_dep ' - dev-python/markdown[${PYTHON_MULTI_USEDEP}] - ') - dev-texlive/texlive-latexextra - media-gfx/transfig - ) - hvm? ( x11-base/xorg-proto ) - qemu? ( - app-arch/snappy:= - x11-libs/pixman - sdl? ( - media-libs/libsdl[X] - media-libs/libsdl2[X] - ) - ) - system-qemu? ( app-emulation/qemu[xen] ) - ocaml? ( dev-ml/findlib - >=dev-lang/ocaml-4 ) - python? ( >=dev-lang/swig-4.0.0 )" - -RDEPEND="${COMMON_DEPEND} - sys-apps/iproute2[-minimal] - net-misc/bridge-utils - screen? ( - app-misc/screen - app-admin/logrotate - )" - -# hvmloader is used to bootstrap a fully virtualized kernel -# Approved by QA team in bug #144032 -QA_WX_LOAD=" - usr/libexec/xen/boot/hvmloader - usr/share/qemu-xen/qemu/hppa-firmware.img - usr/share/qemu-xen/qemu/s390-ccw.img - usr/share/qemu-xen/qemu/u-boot.e500 -" - -QA_PREBUILT=" - usr/libexec/xen/bin/elf2dmp - usr/libexec/xen/bin/ivshmem-client - usr/libexec/xen/bin/ivshmem-server - usr/libexec/xen/bin/qemu-edid - usr/libexec/xen/bin/qemu-img - usr/libexec/xen/bin/qemu-io - usr/libexec/xen/bin/qemu-keymap - usr/libexec/xen/bin/qemu-nbd - usr/libexec/xen/bin/qemu-pr-helper - usr/libexec/xen/bin/qemu-system-i386 - usr/libexec/xen/bin/virtfs-proxy-helper - usr/libexec/xen/libexec/xen-bridge-helper - usr/share/qemu-xen/qemu/s390-ccw.img - usr/share/qemu-xen/qemu/s390-netboot.img - usr/share/qemu-xen/qemu/u-boot.e500 -" - -RESTRICT="test" - -pkg_setup() { - python_setup - export "CONFIG_LOMOUNT=y" - - #bug 522642, disable compile tools/tests - export "CONFIG_TESTS=n" - - if [[ -z ${XEN_TARGET_ARCH} ]] ; then - if use x86 && use amd64; then - die "Confusion! Both x86 and amd64 are set in your use flags!" - elif use x86; then - export XEN_TARGET_ARCH="x86_32" - elif 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 -} - -src_prepare() { - local i - - # Upstream's patchset - if [[ -n ${UPSTREAM_VER} ]]; then - einfo "Try to apply Xen Upstream patch set" - eapply "${WORKDIR}"/patches-upstream - fi - - # 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 - EPATCH_SUFFIX="patch" - EPATCH_FORCE="yes" - - source "${WORKDIR}"/patches-security/${PV}.conf || die - - for i in ${XEN_SECURITY_MAIN}; do - eapply "${WORKDIR}"/patches-security/xen/$i - done - - # apply qemu-xen/upstream patches - pushd "${S}"/tools/qemu-xen/ > /dev/null - for i in ${XEN_SECURITY_QEMUU}; do - eapply "${WORKDIR}"/patches-security/qemuu/$i - done - popd > /dev/null - - # apply qemu-traditional patches - pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null - for i in ${XEN_SECURITY_QEMUT}; do - eapply "${WORKDIR}"/patches-security/qemut/$i - done - popd > /dev/null - fi - - # move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err - mv ../seabios-rel-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die - pushd tools/firmware/ > /dev/null - ln -s seabios-dir-remote seabios-dir || die - popd > /dev/null - - # Gentoo's patchset - if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then - einfo "Try to apply Gentoo specific patch set" - source "${FILESDIR}"/gentoo-patches.conf || die - _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV} - for i in ${!_gpv}; do - eapply "${WORKDIR}"/patches-gentoo/$i - done - fi - - # Ovmf's patchset - if use ovmf; then - if [[ -n ${OVMF_VER} ]];then - einfo "Try to apply Ovmf patch set" - pushd "${WORKDIR}"/edk2-*/ > /dev/null - eapply "${WORKDIR}"/patches-ovmf - popd > /dev/null - fi - mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die - rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die - rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die - rm -r tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die - rm -r tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die - mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die - mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die - cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die - cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die - cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die - fi - - # ipxe - if use ipxe; then - cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die - - # gcc 10 - cp "${WORKDIR}/patches-gentoo/xen-tools-4.13.0-ipxe-gcc10.patch" tools/firmware/etherboot/patches/ipxe-gcc10.patch || die - echo ipxe-gcc10.patch >> tools/firmware/etherboot/patches/series || die - fi - - mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die - - # Fix texi2html build error with new texi2html, qemu.doc.html - sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die - - use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die - sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \ - -i tools/firmware/Makefile || die - - # Drop .config, fixes to gcc-4.6 - sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" - - # drop flags - unset CFLAGS - unset LDFLAGS - unset ASFLAGS - unset CPPFLAGS - - if ! use pygrub; then - sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die - fi - - if ! use python; then - sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die - fi - - if ! use hvm; then - sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die - # Bug 351648 - elif ! use x86 && ! has x86 $(get_all_abis); then - mkdir -p "${WORKDIR}"/extra-headers/gnu || die - touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die - export CPATH="${WORKDIR}"/extra-headers - fi - - if use qemu; then - if use sdl; then - sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \ - tools/Makefile || die - else - sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \ - tools/qemu-xen-traditional/xen-setup || die - sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \ - tools/Makefile || die - fi - else - # Don't bother with qemu, only needed for fully virtualised guests - sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die - fi - - # Reset bash completion dir; Bug 472438 - sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \ - -i Config.mk || die - sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die - - # xencommons, Bug #492332, sed lighter weight than patching - sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \ - -i tools/hotplug/Linux/init.d/xencommons.in || die - - # fix bashishm - sed -e '/Usage/s/\$//g' \ - -i tools/hotplug/Linux/init.d/xendriverdomain.in || die - - # respect multilib, usr/lib/libcacard.so.0.0.0 - sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \ - -i tools/qemu-xen/configure || die - - #bug 518136, don't build 32bit exactuable for nomultilib profile - if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then - sed -i -e "/x86_emulator/d" tools/tests/Makefile || die - fi - - # uncomment lines in xl.conf - sed -e 's:^#autoballoon=:autoballoon=:' \ - -e 's:^#lockfile=:lockfile=:' \ - -e 's:^#vif.default.script=:vif.default.script=:' \ - -i tools/examples/xl.conf || die - - # disable capstone (Bug #673474) - sed -e "s:\$\$source/configure:\0 --disable-capstone:" \ - -i tools/Makefile || die - - # disable glusterfs - sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \ - -i tools/Makefile || die - - default -} - -src_configure() { - local myconf="--prefix=${PREFIX}/usr \ - --libdir=${PREFIX}/usr/$(get_libdir) \ - --libexecdir=${PREFIX}/usr/libexec \ - --localstatedir=${EPREFIX}/var \ - --disable-werror \ - --disable-xen \ - --enable-tools \ - --enable-docs \ - $(use_enable api xenapi) \ - $(use_enable ipxe) \ - $(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') \ - $(use_enable ocaml ocamltools) \ - $(use_enable ovmf) \ - $(use_enable pam) \ - $(use_enable rombios) \ - --with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \ - " - - use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin" - use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64" - use amd64 && myconf+=" $(use_enable qemu-traditional)" - tc-ld-disable-gold # Bug 669570 - econf ${myconf} -} - -src_compile() { - local myopt - use debug && myopt="${myopt} debug=y" - use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y" - - if test-flag-CC -fno-strict-overflow; then - append-flags -fno-strict-overflow - fi - - emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt} - - if use doc; then - emake -C docs build - else - emake -C docs man-pages - fi -} - -src_install() { - # Override auto-detection in the build system, bug #382573 - export INITD_DIR=/tmp/init.d - export CONFIG_LEAF_DIR=../tmp/default - - # Let the build system compile installed Python modules. - local PYTHONDONTWRITEBYTECODE - export PYTHONDONTWRITEBYTECODE - - emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \ - XEN_PYTHON_NATIVE_INSTALL=y install-tools - - # Created at runtime - rm -rv "${ED}/var/run" || die - - # Fix the remaining Python shebangs. - python_fix_shebang "${D}" - - # Remove RedHat-specific stuff - rm -rf "${D}"/tmp || die - - if use doc; then - emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs - dodoc -r docs/{pdf,txt} - else - emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032 - fi - dodoc ${DOCS[@]} - - newconfd "${FILESDIR}"/xendomains.confd xendomains - newconfd "${FILESDIR}"/xenstored.confd xenstored - newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled - newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains - newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored - newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled - newinitd "${FILESDIR}"/xencommons.initd xencommons - newconfd "${FILESDIR}"/xencommons.confd xencommons - newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev - newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev - newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog - - if use screen; then - cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die - cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die - keepdir /var/log/xen-consoles - fi - - # For -static-libs wrt Bug 384355 - if ! use static-libs; then - rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a - fi - - # for xendomains - keepdir /etc/xen/auto - - # Remove files failing QA AFTER emake installs them, avoiding seeking absent files - find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \ - -o -name openbios-ppc -o -name palcode-clipper \) -delete || die - - keepdir /var/lib/xen/dump - keepdir /var/lib/xen/xenpaging - keepdir /var/lib/xenstored - keepdir /var/log/xen - - if use python; then - python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/xenstat.py" - python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/_xenstat.so" - fi - - python_optimize -} - -pkg_postinst() { - elog "Official Xen Guide and the offical wiki page:" - elog "https://wiki.gentoo.org/wiki/Xen" - elog "https://wiki.xen.org/wiki/Main_Page" - elog "" - elog "Recommended to utilise the xencommons script to config system at boot" - elog "Add by use of rc-update on completion of the install" - - if ! use hvm; then - echo - elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" - elog "support enable the hvm use flag." - elog "An x86 or amd64 system is required to build HVM support." - fi - - if use qemu; then - elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source" - elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently" - elog "with the qemu capable xen. It is up to the user to distinguish between and utilise" - elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise" - fi -} diff --git a/app-emulation/xen-tools/xen-tools-4.13.2-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.13.2-r3.ebuild deleted file mode 100644 index 17e66b730650..000000000000 --- a/app-emulation/xen-tools/xen-tools-4.13.2-r3.ebuild +++ /dev/null @@ -1,512 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -PYTHON_REQ_USE='ncurses,xml,threads(+)' - -inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs - -MY_PV=${PV/_/-} - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - REPO="xen.git" - EGIT_REPO_URI="git://xenbits.xen.org/${REPO}" - S="${WORKDIR}/${REPO}" -else - KEYWORDS="~amd64 ~arm ~arm64 ~x86" - UPSTREAM_VER=6 - SECURITY_VER=29 - # xen-tools's gentoo patches tarball - GENTOO_VER=21 - # xen-tools's gentoo patches version which apply to this specific ebuild - GENTOO_GPV=1 - # xen-tools ovmf's patches - OVMF_VER= - - SEABIOS_VER="1.12.1" - EDK2_COMMIT="06dc822d045c2bb42e497487935485302486e151" - EDK2_OPENSSL_VERSION="1_1_1g" - EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037" - EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d" - IPXE_COMMIT="1dd56dbd11082fb622c2ed21cfaced4f47d798a6" - - [[ -n ${UPSTREAM_VER} ]] && \ - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz - https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" - [[ -n ${SECURITY_VER} ]] && \ - SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz - https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-security-patches-${SECURITY_VER}.tar.xz" - [[ -n ${GENTOO_VER} ]] && \ - GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz - https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz" - [[ -n ${OVMF_VER} ]] && \ - OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz" - - SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz - https://github.com/qemu/seabios/archive/rel-${SEABIOS_VER}.tar.gz -> seabios-${SEABIOS_VER}.tar.gz - ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz ) - ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz - https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz - https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz - https://github.com/google/brotli/archive/${EDK2_BROTLI_COMMIT}.tar.gz -> brotli-${EDK2_BROTLI_COMMIT}.tar.gz - ${OVMF_PATCHSET_URI} ) - ${UPSTREAM_PATCHSET_URI} - ${SECURITY_PATCHSET_URI} - ${GENTOO_PATCHSET_URI}" - - S="${WORKDIR}/xen-${MY_PV}" -fi - -DESCRIPTION="Xen tools including QEMU and xl" -HOMEPAGE="https://www.xenproject.org" -DOCS=( README ) - -LICENSE="GPL-2" -SLOT="0/$(ver_cut 1-2)" -# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make -# >=dev-lang/ocaml-4 stable -# Masked in profiles/eapi-5-files instead -IUSE="api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - ipxe? ( rombios ) - ovmf? ( hvm ) - pygrub? ( python ) - rombios? ( hvm ) - system-ipxe? ( rombios ) - ?? ( ipxe system-ipxe ) - ?? ( qemu system-qemu )" - -COMMON_DEPEND=" - sys-apps/pciutils - dev-libs/lzo:2 - dev-libs/glib:2 - dev-libs/yajl - dev-libs/libaio - dev-libs/libgcrypt:0 - sys-libs/zlib - ${PYTHON_DEPS} -" - -DEPEND="${COMMON_DEPEND} - >=sys-kernel/linux-headers-4.11 - $(python_gen_cond_dep ' - dev-python/lxml[${PYTHON_MULTI_USEDEP}] - pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] ) - ') - x86? ( sys-devel/dev86 - system-ipxe? ( sys-firmware/ipxe[qemu] ) - sys-power/iasl ) - api? ( dev-libs/libxml2 - net-misc/curl ) - - ovmf? ( - !arm? ( !arm64? ( dev-lang/nasm ) ) - $(python_gen_impl_dep sqlite) - ) - !amd64? ( >=sys-apps/dtc-1.4.0 ) - amd64? ( sys-power/iasl - system-seabios? ( sys-firmware/seabios ) - system-ipxe? ( sys-firmware/ipxe[qemu] ) - rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) - dev-lang/perl - app-misc/pax-utils - doc? ( - app-text/ghostscript-gpl - app-text/pandoc - $(python_gen_cond_dep ' - dev-python/markdown[${PYTHON_MULTI_USEDEP}] - ') - dev-texlive/texlive-latexextra - media-gfx/transfig - ) - hvm? ( x11-base/xorg-proto ) - qemu? ( - app-arch/snappy:= - x11-libs/pixman - sdl? ( - media-libs/libsdl[X] - media-libs/libsdl2[X] - ) - ) - system-qemu? ( app-emulation/qemu[xen] ) - ocaml? ( dev-ml/findlib - >=dev-lang/ocaml-4 ) - python? ( >=dev-lang/swig-4.0.0 )" - -RDEPEND="${COMMON_DEPEND} - sys-apps/iproute2[-minimal] - net-misc/bridge-utils - screen? ( - app-misc/screen - app-admin/logrotate - )" - -# hvmloader is used to bootstrap a fully virtualized kernel -# Approved by QA team in bug #144032 -QA_WX_LOAD=" - usr/libexec/xen/boot/hvmloader - usr/share/qemu-xen/qemu/hppa-firmware.img - usr/share/qemu-xen/qemu/s390-ccw.img - usr/share/qemu-xen/qemu/u-boot.e500 -" - -QA_PREBUILT=" - usr/libexec/xen/bin/elf2dmp - usr/libexec/xen/bin/ivshmem-client - usr/libexec/xen/bin/ivshmem-server - usr/libexec/xen/bin/qemu-edid - usr/libexec/xen/bin/qemu-img - usr/libexec/xen/bin/qemu-io - usr/libexec/xen/bin/qemu-keymap - usr/libexec/xen/bin/qemu-nbd - usr/libexec/xen/bin/qemu-pr-helper - usr/libexec/xen/bin/qemu-system-i386 - usr/libexec/xen/bin/virtfs-proxy-helper - usr/libexec/xen/libexec/xen-bridge-helper - usr/share/qemu-xen/qemu/s390-ccw.img - usr/share/qemu-xen/qemu/s390-netboot.img - usr/share/qemu-xen/qemu/u-boot.e500 -" - -RESTRICT="test" - -pkg_setup() { - python_setup - export "CONFIG_LOMOUNT=y" - - #bug 522642, disable compile tools/tests - export "CONFIG_TESTS=n" - - if [[ -z ${XEN_TARGET_ARCH} ]] ; then - if use x86 && use amd64; then - die "Confusion! Both x86 and amd64 are set in your use flags!" - elif use x86; then - export XEN_TARGET_ARCH="x86_32" - elif 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 -} - -src_prepare() { - local i - - # Upstream's patchset - if [[ -n ${UPSTREAM_VER} ]]; then - einfo "Try to apply Xen Upstream patch set" - eapply "${WORKDIR}"/patches-upstream - fi - - # 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 - EPATCH_SUFFIX="patch" - EPATCH_FORCE="yes" - - source "${WORKDIR}"/patches-security/${PV}.conf || die - - for i in ${XEN_SECURITY_MAIN}; do - eapply "${WORKDIR}"/patches-security/xen/$i - done - - # apply qemu-xen/upstream patches - pushd "${S}"/tools/qemu-xen/ > /dev/null - for i in ${XEN_SECURITY_QEMUU}; do - eapply "${WORKDIR}"/patches-security/qemuu/$i - done - popd > /dev/null - - # apply qemu-traditional patches - pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null - for i in ${XEN_SECURITY_QEMUT}; do - eapply "${WORKDIR}"/patches-security/qemut/$i - done - popd > /dev/null - fi - - # move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err - mv ../seabios-rel-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die - pushd tools/firmware/ > /dev/null - ln -s seabios-dir-remote seabios-dir || die - popd > /dev/null - - # Gentoo's patchset - if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then - einfo "Try to apply Gentoo specific patch set" - source "${FILESDIR}"/gentoo-patches.conf || die - _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV} - for i in ${!_gpv}; do - eapply "${WORKDIR}"/patches-gentoo/$i - done - fi - - # Ovmf's patchset - if use ovmf; then - if [[ -n ${OVMF_VER} ]];then - einfo "Try to apply Ovmf patch set" - pushd "${WORKDIR}"/edk2-*/ > /dev/null - eapply "${WORKDIR}"/patches-ovmf - popd > /dev/null - fi - mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die - rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die - rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die - rm -r tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die - rm -r tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die - mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die - mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die - cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die - cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die - cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die - fi - - # ipxe - if use ipxe; then - cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die - - # gcc 10 - cp "${WORKDIR}/patches-gentoo/xen-tools-4.13.0-ipxe-gcc10.patch" tools/firmware/etherboot/patches/ipxe-gcc10.patch || die - echo ipxe-gcc10.patch >> tools/firmware/etherboot/patches/series || die - fi - - mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die - - # Fix texi2html build error with new texi2html, qemu.doc.html - sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die - - use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die - sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \ - -i tools/firmware/Makefile || die - - # Drop .config, fixes to gcc-4.6 - sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" - - # drop flags - unset CFLAGS - unset LDFLAGS - unset ASFLAGS - unset CPPFLAGS - - if ! use pygrub; then - sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die - fi - - if ! use python; then - sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die - fi - - if ! use hvm; then - sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die - # Bug 351648 - elif ! use x86 && ! has x86 $(get_all_abis); then - mkdir -p "${WORKDIR}"/extra-headers/gnu || die - touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die - export CPATH="${WORKDIR}"/extra-headers - fi - - if use qemu; then - if use sdl; then - sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \ - tools/Makefile || die - else - sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \ - tools/qemu-xen-traditional/xen-setup || die - sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \ - tools/Makefile || die - fi - else - # Don't bother with qemu, only needed for fully virtualised guests - sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die - fi - - # Reset bash completion dir; Bug 472438 - sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \ - -i Config.mk || die - sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die - - # xencommons, Bug #492332, sed lighter weight than patching - sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \ - -i tools/hotplug/Linux/init.d/xencommons.in || die - - # fix bashishm - sed -e '/Usage/s/\$//g' \ - -i tools/hotplug/Linux/init.d/xendriverdomain.in || die - - # respect multilib, usr/lib/libcacard.so.0.0.0 - sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \ - -i tools/qemu-xen/configure || die - - #bug 518136, don't build 32bit exactuable for nomultilib profile - if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then - sed -i -e "/x86_emulator/d" tools/tests/Makefile || die - fi - - # uncomment lines in xl.conf - sed -e 's:^#autoballoon=:autoballoon=:' \ - -e 's:^#lockfile=:lockfile=:' \ - -e 's:^#vif.default.script=:vif.default.script=:' \ - -i tools/examples/xl.conf || die - - # disable capstone (Bug #673474) - sed -e "s:\$\$source/configure:\0 --disable-capstone:" \ - -i tools/Makefile || die - - # disable glusterfs - sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \ - -i tools/Makefile || die - - default -} - -src_configure() { - local myconf="--prefix=${PREFIX}/usr \ - --libdir=${PREFIX}/usr/$(get_libdir) \ - --libexecdir=${PREFIX}/usr/libexec \ - --localstatedir=${EPREFIX}/var \ - --disable-werror \ - --disable-xen \ - --enable-tools \ - --enable-docs \ - $(use_enable api xenapi) \ - $(use_enable ipxe) \ - $(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') \ - $(use_enable ocaml ocamltools) \ - $(use_enable ovmf) \ - $(use_enable pam) \ - $(use_enable rombios) \ - --with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \ - " - - use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin" - use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64" - use amd64 && myconf+=" $(use_enable qemu-traditional)" - tc-ld-disable-gold # Bug 669570 - econf ${myconf} -} - -src_compile() { - local myopt - use debug && myopt="${myopt} debug=y" - use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y" - - if test-flag-CC -fno-strict-overflow; then - append-flags -fno-strict-overflow - fi - - emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt} - - if use doc; then - emake -C docs build - else - emake -C docs man-pages - fi -} - -src_install() { - # Override auto-detection in the build system, bug #382573 - export INITD_DIR=/tmp/init.d - export CONFIG_LEAF_DIR=../tmp/default - - # Let the build system compile installed Python modules. - local PYTHONDONTWRITEBYTECODE - export PYTHONDONTWRITEBYTECODE - - emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \ - XEN_PYTHON_NATIVE_INSTALL=y install-tools - - # Created at runtime - rm -rv "${ED}/var/run" || die - - # Fix the remaining Python shebangs. - python_fix_shebang "${D}" - - # Remove RedHat-specific stuff - rm -rf "${D}"/tmp || die - - if use doc; then - emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs - dodoc -r docs/{pdf,txt} - else - emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032 - fi - dodoc ${DOCS[@]} - - newconfd "${FILESDIR}"/xendomains.confd xendomains - newconfd "${FILESDIR}"/xenstored.confd xenstored - newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled - newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains - newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored - newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled - newinitd "${FILESDIR}"/xencommons.initd xencommons - newconfd "${FILESDIR}"/xencommons.confd xencommons - newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev - newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev - newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog - - if use screen; then - cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die - cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die - keepdir /var/log/xen-consoles - fi - - # For -static-libs wrt Bug 384355 - if ! use static-libs; then - rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a - fi - - # for xendomains - keepdir /etc/xen/auto - - # Remove files failing QA AFTER emake installs them, avoiding seeking absent files - find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \ - -o -name openbios-ppc -o -name palcode-clipper \) -delete || die - - keepdir /var/lib/xen/dump - keepdir /var/lib/xen/xenpaging - keepdir /var/lib/xenstored - keepdir /var/log/xen - - if use python; then - python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/xenstat.py" - python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/_xenstat.so" - fi - - python_optimize -} - -pkg_postinst() { - elog "Official Xen Guide and the offical wiki page:" - elog "https://wiki.gentoo.org/wiki/Xen" - elog "https://wiki.xen.org/wiki/Main_Page" - elog "" - elog "Recommended to utilise the xencommons script to config system at boot" - elog "Add by use of rc-update on completion of the install" - - if ! use hvm; then - echo - elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" - elog "support enable the hvm use flag." - elog "An x86 or amd64 system is required to build HVM support." - fi - - if use qemu; then - elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source" - elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently" - elog "with the qemu capable xen. It is up to the user to distinguish between and utilise" - elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise" - fi -} diff --git a/app-emulation/xen-tools/xen-tools-4.13.3.ebuild b/app-emulation/xen-tools/xen-tools-4.13.3-r1.ebuild index 37bd7fd1281d..0f16bbc10d4e 100644 --- a/app-emulation/xen-tools/xen-tools-4.13.3.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.13.3-r1.ebuild @@ -26,7 +26,7 @@ else # xen-tools ovmf's patches OVMF_VER= - SEABIOS_VER="1.12.1" + SEABIOS_VER="1.12.0" EDK2_COMMIT="06dc822d045c2bb42e497487935485302486e151" EDK2_OPENSSL_VERSION="1_1_1g" EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037" @@ -46,7 +46,7 @@ else OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz" SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz - https://github.com/qemu/seabios/archive/rel-${SEABIOS_VER}.tar.gz -> seabios-${SEABIOS_VER}.tar.gz + https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz diff --git a/app-emulation/xen-tools/xen-tools-4.14.1-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.14.1-r1.ebuild deleted file mode 100644 index 93372ecabe5b..000000000000 --- a/app-emulation/xen-tools/xen-tools-4.14.1-r1.ebuild +++ /dev/null @@ -1,512 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6..9} ) -PYTHON_REQ_USE='ncurses,xml,threads(+)' - -inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs - -MY_PV=${PV/_/-} - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - REPO="xen.git" - EGIT_REPO_URI="git://xenbits.xen.org/${REPO}" - S="${WORKDIR}/${REPO}" -else - KEYWORDS="~amd64 ~arm ~arm64 ~x86" - UPSTREAM_VER=3 - SECURITY_VER= - # xen-tools's gentoo patches tarball - GENTOO_VER=22 - # xen-tools's gentoo patches version which apply to this specific ebuild - GENTOO_GPV=0 - # xen-tools ovmf's patches - OVMF_VER= - - SEABIOS_VER="1.13.0" - EDK2_COMMIT="06dc822d045c2bb42e497487935485302486e151" - EDK2_OPENSSL_VERSION="1_1_1g" - EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037" - EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d" - IPXE_COMMIT="1dd56dbd11082fb622c2ed21cfaced4f47d798a6" - - [[ -n ${UPSTREAM_VER} ]] && \ - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz - https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" - [[ -n ${SECURITY_VER} ]] && \ - SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz - https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-security-patches-${SECURITY_VER}.tar.xz" - [[ -n ${GENTOO_VER} ]] && \ - GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz - https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz" - [[ -n ${OVMF_VER} ]] && \ - OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz" - - SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz - https://github.com/qemu/seabios/archive/rel-${SEABIOS_VER}.tar.gz -> seabios-${SEABIOS_VER}.tar.gz - ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz ) - ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz - https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz - https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz - https://github.com/google/brotli/archive/${EDK2_BROTLI_COMMIT}.tar.gz -> brotli-${EDK2_BROTLI_COMMIT}.tar.gz - ${OVMF_PATCHSET_URI} ) - ${UPSTREAM_PATCHSET_URI} - ${SECURITY_PATCHSET_URI} - ${GENTOO_PATCHSET_URI}" - - S="${WORKDIR}/xen-${MY_PV}" -fi - -DESCRIPTION="Xen tools including QEMU and xl" -HOMEPAGE="https://www.xenproject.org" -DOCS=( README ) - -LICENSE="GPL-2" -SLOT="0/$(ver_cut 1-2)" -# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make -# >=dev-lang/ocaml-4 stable -# Masked in profiles/eapi-5-files instead -IUSE="api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - ipxe? ( rombios ) - ovmf? ( hvm ) - pygrub? ( python ) - rombios? ( hvm ) - system-ipxe? ( rombios ) - ?? ( ipxe system-ipxe ) - ?? ( qemu system-qemu )" - -COMMON_DEPEND=" - sys-apps/pciutils - dev-libs/lzo:2 - dev-libs/glib:2 - dev-libs/yajl - dev-libs/libaio - dev-libs/libgcrypt:0 - sys-libs/zlib - ${PYTHON_DEPS} -" - -DEPEND="${COMMON_DEPEND} - app-misc/pax-utils - dev-lang/perl - >=sys-kernel/linux-headers-4.11 - x11-libs/pixman - $(python_gen_cond_dep ' - dev-python/lxml[${PYTHON_MULTI_USEDEP}] - pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] ) - ') - x86? ( sys-devel/dev86 - system-ipxe? ( sys-firmware/ipxe[qemu] ) - sys-power/iasl ) - api? ( dev-libs/libxml2 - net-misc/curl ) - - ovmf? ( - !arm? ( !arm64? ( dev-lang/nasm ) ) - $(python_gen_impl_dep sqlite) - ) - !amd64? ( >=sys-apps/dtc-1.4.0 ) - amd64? ( sys-power/iasl - system-seabios? ( sys-firmware/seabios ) - system-ipxe? ( sys-firmware/ipxe[qemu] ) - rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) - doc? ( - app-text/ghostscript-gpl - app-text/pandoc - $(python_gen_cond_dep ' - dev-python/markdown[${PYTHON_MULTI_USEDEP}] - ') - dev-texlive/texlive-latexextra - media-gfx/transfig - ) - hvm? ( x11-base/xorg-proto ) - qemu? ( - app-arch/snappy:= - sdl? ( - media-libs/libsdl[X] - media-libs/libsdl2[X] - ) - ) - system-qemu? ( app-emulation/qemu[xen] ) - ocaml? ( dev-ml/findlib - >=dev-lang/ocaml-4 ) - python? ( >=dev-lang/swig-4.0.0 )" - -RDEPEND="${COMMON_DEPEND} - sys-apps/iproute2[-minimal] - net-misc/bridge-utils - screen? ( - app-misc/screen - app-admin/logrotate - )" - -# hvmloader is used to bootstrap a fully virtualized kernel -# Approved by QA team in bug #144032 -QA_WX_LOAD=" - usr/libexec/xen/boot/hvmloader - usr/share/qemu-xen/qemu/hppa-firmware.img - usr/share/qemu-xen/qemu/s390-ccw.img - usr/share/qemu-xen/qemu/u-boot.e500 -" - -QA_PREBUILT=" - usr/libexec/xen/bin/elf2dmp - usr/libexec/xen/bin/ivshmem-client - usr/libexec/xen/bin/ivshmem-server - usr/libexec/xen/bin/qemu-edid - usr/libexec/xen/bin/qemu-img - usr/libexec/xen/bin/qemu-io - usr/libexec/xen/bin/qemu-keymap - usr/libexec/xen/bin/qemu-nbd - usr/libexec/xen/bin/qemu-pr-helper - usr/libexec/xen/bin/qemu-system-i386 - usr/libexec/xen/bin/virtfs-proxy-helper - usr/libexec/xen/libexec/xen-bridge-helper - usr/share/qemu-xen/qemu/s390-ccw.img - usr/share/qemu-xen/qemu/s390-netboot.img - usr/share/qemu-xen/qemu/u-boot.e500 -" - -RESTRICT="test" - -pkg_setup() { - python_setup - export "CONFIG_LOMOUNT=y" - - #bug 522642, disable compile tools/tests - export "CONFIG_TESTS=n" - - if [[ -z ${XEN_TARGET_ARCH} ]] ; then - if use x86 && use amd64; then - die "Confusion! Both x86 and amd64 are set in your use flags!" - elif use x86; then - export XEN_TARGET_ARCH="x86_32" - elif 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 -} - -src_prepare() { - local i - - # Upstream's patchset - if [[ -n ${UPSTREAM_VER} ]]; then - einfo "Try to apply Xen Upstream patch set" - eapply "${WORKDIR}"/patches-upstream - fi - - # 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 - EPATCH_SUFFIX="patch" - EPATCH_FORCE="yes" - - source "${WORKDIR}"/patches-security/${PV}.conf || die - - for i in ${XEN_SECURITY_MAIN}; do - eapply "${WORKDIR}"/patches-security/xen/$i - done - - # apply qemu-xen/upstream patches - pushd "${S}"/tools/qemu-xen/ > /dev/null - for i in ${XEN_SECURITY_QEMUU}; do - eapply "${WORKDIR}"/patches-security/qemuu/$i - done - popd > /dev/null - - # apply qemu-traditional patches - pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null - for i in ${XEN_SECURITY_QEMUT}; do - eapply "${WORKDIR}"/patches-security/qemut/$i - done - popd > /dev/null - fi - - # move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err - mv ../seabios-rel-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die - pushd tools/firmware/ > /dev/null - ln -s seabios-dir-remote seabios-dir || die - popd > /dev/null - - # Gentoo's patchset - if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then - einfo "Try to apply Gentoo specific patch set" - source "${FILESDIR}"/gentoo-patches.conf || die - _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV} - for i in ${!_gpv}; do - eapply "${WORKDIR}"/patches-gentoo/$i - done - fi - - # Ovmf's patchset - if use ovmf; then - if [[ -n ${OVMF_VER} ]];then - einfo "Try to apply Ovmf patch set" - pushd "${WORKDIR}"/edk2-*/ > /dev/null - eapply "${WORKDIR}"/patches-ovmf - popd > /dev/null - fi - mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die - rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die - rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die - rm -r tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die - rm -r tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die - mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die - mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die - cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die - cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die - cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die - fi - - # ipxe - if use ipxe; then - cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die - - # gcc 10 - cp "${WORKDIR}/patches-gentoo/xen-tools-4.13.0-ipxe-gcc10.patch" tools/firmware/etherboot/patches/ipxe-gcc10.patch || die - echo ipxe-gcc10.patch >> tools/firmware/etherboot/patches/series || die - fi - - mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die - - # Fix texi2html build error with new texi2html, qemu.doc.html - sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die - - use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die - sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \ - -i tools/firmware/Makefile || die - - # Drop .config, fixes to gcc-4.6 - sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" - - # drop flags - unset CFLAGS - unset LDFLAGS - unset ASFLAGS - unset CPPFLAGS - - if ! use pygrub; then - sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die - fi - - if ! use python; then - sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die - fi - - if ! use hvm; then - sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die - # Bug 351648 - elif ! use x86 && ! has x86 $(get_all_abis); then - mkdir -p "${WORKDIR}"/extra-headers/gnu || die - touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die - export CPATH="${WORKDIR}"/extra-headers - fi - - if use qemu; then - if use sdl; then - sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \ - tools/Makefile || die - else - sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \ - tools/qemu-xen-traditional/xen-setup || die - sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \ - tools/Makefile || die - fi - else - # Don't bother with qemu, only needed for fully virtualised guests - sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die - fi - - # Reset bash completion dir; Bug 472438 - sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \ - -i Config.mk || die - sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die - - # xencommons, Bug #492332, sed lighter weight than patching - sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \ - -i tools/hotplug/Linux/init.d/xencommons.in || die - - # fix bashishm - sed -e '/Usage/s/\$//g' \ - -i tools/hotplug/Linux/init.d/xendriverdomain.in || die - - # respect multilib, usr/lib/libcacard.so.0.0.0 - sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \ - -i tools/qemu-xen/configure || die - - #bug 518136, don't build 32bit exactuable for nomultilib profile - if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then - sed -i -e "/x86_emulator/d" tools/tests/Makefile || die - fi - - # uncomment lines in xl.conf - sed -e 's:^#autoballoon=:autoballoon=:' \ - -e 's:^#lockfile=:lockfile=:' \ - -e 's:^#vif.default.script=:vif.default.script=:' \ - -i tools/examples/xl.conf || die - - # disable capstone (Bug #673474) - sed -e "s:\$\$source/configure:\0 --disable-capstone:" \ - -i tools/Makefile || die - - # disable glusterfs - sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \ - -i tools/Makefile || die - - default -} - -src_configure() { - local myconf="--prefix=${PREFIX}/usr \ - --libdir=${PREFIX}/usr/$(get_libdir) \ - --libexecdir=${PREFIX}/usr/libexec \ - --localstatedir=${EPREFIX}/var \ - --disable-werror \ - --disable-xen \ - --enable-tools \ - --enable-docs \ - $(use_enable api xenapi) \ - $(use_enable ipxe) \ - $(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') \ - $(use_enable ocaml ocamltools) \ - $(use_enable ovmf) \ - $(use_enable pam) \ - $(use_enable rombios) \ - --with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \ - " - - use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin" - use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64" - use amd64 && myconf+=" $(use_enable qemu-traditional)" - tc-ld-disable-gold # Bug 669570 - econf ${myconf} -} - -src_compile() { - local myopt - use debug && myopt="${myopt} debug=y" - use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y" - - if test-flag-CC -fno-strict-overflow; then - append-flags -fno-strict-overflow - fi - - emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt} - - if use doc; then - emake -C docs build - else - emake -C docs man-pages - fi -} - -src_install() { - # Override auto-detection in the build system, bug #382573 - export INITD_DIR=/tmp/init.d - export CONFIG_LEAF_DIR=../tmp/default - - # Let the build system compile installed Python modules. - local PYTHONDONTWRITEBYTECODE - export PYTHONDONTWRITEBYTECODE - - emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \ - XEN_PYTHON_NATIVE_INSTALL=y install-tools - - # Created at runtime - rm -rv "${ED}/var/run" || die - - # Fix the remaining Python shebangs. - python_fix_shebang "${D}" - - # Remove RedHat-specific stuff - rm -rf "${D}"/tmp || die - - if use doc; then - emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs - dodoc -r docs/{pdf,txt} - else - emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032 - fi - dodoc ${DOCS[@]} - - newconfd "${FILESDIR}"/xendomains.confd xendomains - newconfd "${FILESDIR}"/xenstored.confd xenstored - newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled - newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains - newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored - newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled - newinitd "${FILESDIR}"/xencommons.initd xencommons - newconfd "${FILESDIR}"/xencommons.confd xencommons - newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev - newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev - newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog - - if use screen; then - cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die - cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die - keepdir /var/log/xen-consoles - fi - - # For -static-libs wrt Bug 384355 - if ! use static-libs; then - rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a - fi - - # for xendomains - keepdir /etc/xen/auto - - # Remove files failing QA AFTER emake installs them, avoiding seeking absent files - find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \ - -o -name openbios-ppc -o -name palcode-clipper \) -delete || die - - keepdir /var/lib/xen/dump - keepdir /var/lib/xen/xenpaging - keepdir /var/lib/xenstored - keepdir /var/log/xen - - if use python; then - python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/xenstat.py" - python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/_xenstat.so" - fi - - python_optimize -} - -pkg_postinst() { - elog "Official Xen Guide and the offical wiki page:" - elog "https://wiki.gentoo.org/wiki/Xen" - elog "https://wiki.xen.org/wiki/Main_Page" - elog "" - elog "Recommended to utilise the xencommons script to config system at boot" - elog "Add by use of rc-update on completion of the install" - - if ! use hvm; then - echo - elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" - elog "support enable the hvm use flag." - elog "An x86 or amd64 system is required to build HVM support." - fi - - if use qemu; then - elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source" - elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently" - elog "with the qemu capable xen. It is up to the user to distinguish between and utilise" - elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise" - fi -} diff --git a/app-emulation/xen-tools/xen-tools-4.14.1.ebuild b/app-emulation/xen-tools/xen-tools-4.14.1.ebuild deleted file mode 100644 index 22eeb91a3f84..000000000000 --- a/app-emulation/xen-tools/xen-tools-4.14.1.ebuild +++ /dev/null @@ -1,512 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6..9} ) -PYTHON_REQ_USE='ncurses,xml,threads(+)' - -inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs - -MY_PV=${PV/_/-} - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - REPO="xen.git" - EGIT_REPO_URI="git://xenbits.xen.org/${REPO}" - S="${WORKDIR}/${REPO}" -else - KEYWORDS="~amd64 ~arm ~arm64 ~x86" - UPSTREAM_VER= - SECURITY_VER= - # xen-tools's gentoo patches tarball - GENTOO_VER=22 - # xen-tools's gentoo patches version which apply to this specific ebuild - GENTOO_GPV=0 - # xen-tools ovmf's patches - OVMF_VER= - - SEABIOS_VER="1.13.0" - EDK2_COMMIT="06dc822d045c2bb42e497487935485302486e151" - EDK2_OPENSSL_VERSION="1_1_1g" - EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037" - EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d" - IPXE_COMMIT="1dd56dbd11082fb622c2ed21cfaced4f47d798a6" - - [[ -n ${UPSTREAM_VER} ]] && \ - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz - https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" - [[ -n ${SECURITY_VER} ]] && \ - SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz - https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-security-patches-${SECURITY_VER}.tar.xz" - [[ -n ${GENTOO_VER} ]] && \ - GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz - https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz" - [[ -n ${OVMF_VER} ]] && \ - OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz" - - SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz - https://github.com/qemu/seabios/archive/rel-${SEABIOS_VER}.tar.gz -> seabios-${SEABIOS_VER}.tar.gz - ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz ) - ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz - https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz - https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz - https://github.com/google/brotli/archive/${EDK2_BROTLI_COMMIT}.tar.gz -> brotli-${EDK2_BROTLI_COMMIT}.tar.gz - ${OVMF_PATCHSET_URI} ) - ${UPSTREAM_PATCHSET_URI} - ${SECURITY_PATCHSET_URI} - ${GENTOO_PATCHSET_URI}" - - S="${WORKDIR}/xen-${MY_PV}" -fi - -DESCRIPTION="Xen tools including QEMU and xl" -HOMEPAGE="https://www.xenproject.org" -DOCS=( README ) - -LICENSE="GPL-2" -SLOT="0/$(ver_cut 1-2)" -# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make -# >=dev-lang/ocaml-4 stable -# Masked in profiles/eapi-5-files instead -IUSE="api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - ipxe? ( rombios ) - ovmf? ( hvm ) - pygrub? ( python ) - rombios? ( hvm ) - system-ipxe? ( rombios ) - ?? ( ipxe system-ipxe ) - ?? ( qemu system-qemu )" - -COMMON_DEPEND=" - sys-apps/pciutils - dev-libs/lzo:2 - dev-libs/glib:2 - dev-libs/yajl - dev-libs/libaio - dev-libs/libgcrypt:0 - sys-libs/zlib - ${PYTHON_DEPS} -" - -DEPEND="${COMMON_DEPEND} - app-misc/pax-utils - dev-lang/perl - >=sys-kernel/linux-headers-4.11 - x11-libs/pixman - $(python_gen_cond_dep ' - dev-python/lxml[${PYTHON_MULTI_USEDEP}] - pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] ) - ') - x86? ( sys-devel/dev86 - system-ipxe? ( sys-firmware/ipxe[qemu] ) - sys-power/iasl ) - api? ( dev-libs/libxml2 - net-misc/curl ) - - ovmf? ( - !arm? ( !arm64? ( dev-lang/nasm ) ) - $(python_gen_impl_dep sqlite) - ) - !amd64? ( >=sys-apps/dtc-1.4.0 ) - amd64? ( sys-power/iasl - system-seabios? ( sys-firmware/seabios ) - system-ipxe? ( sys-firmware/ipxe[qemu] ) - rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) - doc? ( - app-text/ghostscript-gpl - app-text/pandoc - $(python_gen_cond_dep ' - dev-python/markdown[${PYTHON_MULTI_USEDEP}] - ') - dev-texlive/texlive-latexextra - media-gfx/transfig - ) - hvm? ( x11-base/xorg-proto ) - qemu? ( - app-arch/snappy:= - sdl? ( - media-libs/libsdl[X] - media-libs/libsdl2[X] - ) - ) - system-qemu? ( app-emulation/qemu[xen] ) - ocaml? ( dev-ml/findlib - >=dev-lang/ocaml-4 ) - python? ( >=dev-lang/swig-4.0.0 )" - -RDEPEND="${COMMON_DEPEND} - sys-apps/iproute2[-minimal] - net-misc/bridge-utils - screen? ( - app-misc/screen - app-admin/logrotate - )" - -# hvmloader is used to bootstrap a fully virtualized kernel -# Approved by QA team in bug #144032 -QA_WX_LOAD=" - usr/libexec/xen/boot/hvmloader - usr/share/qemu-xen/qemu/hppa-firmware.img - usr/share/qemu-xen/qemu/s390-ccw.img - usr/share/qemu-xen/qemu/u-boot.e500 -" - -QA_PREBUILT=" - usr/libexec/xen/bin/elf2dmp - usr/libexec/xen/bin/ivshmem-client - usr/libexec/xen/bin/ivshmem-server - usr/libexec/xen/bin/qemu-edid - usr/libexec/xen/bin/qemu-img - usr/libexec/xen/bin/qemu-io - usr/libexec/xen/bin/qemu-keymap - usr/libexec/xen/bin/qemu-nbd - usr/libexec/xen/bin/qemu-pr-helper - usr/libexec/xen/bin/qemu-system-i386 - usr/libexec/xen/bin/virtfs-proxy-helper - usr/libexec/xen/libexec/xen-bridge-helper - usr/share/qemu-xen/qemu/s390-ccw.img - usr/share/qemu-xen/qemu/s390-netboot.img - usr/share/qemu-xen/qemu/u-boot.e500 -" - -RESTRICT="test" - -pkg_setup() { - python_setup - export "CONFIG_LOMOUNT=y" - - #bug 522642, disable compile tools/tests - export "CONFIG_TESTS=n" - - if [[ -z ${XEN_TARGET_ARCH} ]] ; then - if use x86 && use amd64; then - die "Confusion! Both x86 and amd64 are set in your use flags!" - elif use x86; then - export XEN_TARGET_ARCH="x86_32" - elif 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 -} - -src_prepare() { - local i - - # Upstream's patchset - if [[ -n ${UPSTREAM_VER} ]]; then - einfo "Try to apply Xen Upstream patch set" - eapply "${WORKDIR}"/patches-upstream - fi - - # 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 - EPATCH_SUFFIX="patch" - EPATCH_FORCE="yes" - - source "${WORKDIR}"/patches-security/${PV}.conf || die - - for i in ${XEN_SECURITY_MAIN}; do - eapply "${WORKDIR}"/patches-security/xen/$i - done - - # apply qemu-xen/upstream patches - pushd "${S}"/tools/qemu-xen/ > /dev/null - for i in ${XEN_SECURITY_QEMUU}; do - eapply "${WORKDIR}"/patches-security/qemuu/$i - done - popd > /dev/null - - # apply qemu-traditional patches - pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null - for i in ${XEN_SECURITY_QEMUT}; do - eapply "${WORKDIR}"/patches-security/qemut/$i - done - popd > /dev/null - fi - - # move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err - mv ../seabios-rel-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die - pushd tools/firmware/ > /dev/null - ln -s seabios-dir-remote seabios-dir || die - popd > /dev/null - - # Gentoo's patchset - if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then - einfo "Try to apply Gentoo specific patch set" - source "${FILESDIR}"/gentoo-patches.conf || die - _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV} - for i in ${!_gpv}; do - eapply "${WORKDIR}"/patches-gentoo/$i - done - fi - - # Ovmf's patchset - if use ovmf; then - if [[ -n ${OVMF_VER} ]];then - einfo "Try to apply Ovmf patch set" - pushd "${WORKDIR}"/edk2-*/ > /dev/null - eapply "${WORKDIR}"/patches-ovmf - popd > /dev/null - fi - mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die - rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die - rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die - rm -r tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die - rm -r tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die - mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die - mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die - cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die - cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die - cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die - fi - - # ipxe - if use ipxe; then - cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die - - # gcc 10 - cp "${WORKDIR}/patches-gentoo/xen-tools-4.13.0-ipxe-gcc10.patch" tools/firmware/etherboot/patches/ipxe-gcc10.patch || die - echo ipxe-gcc10.patch >> tools/firmware/etherboot/patches/series || die - fi - - mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die - - # Fix texi2html build error with new texi2html, qemu.doc.html - sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die - - use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die - sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \ - -i tools/firmware/Makefile || die - - # Drop .config, fixes to gcc-4.6 - sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" - - # drop flags - unset CFLAGS - unset LDFLAGS - unset ASFLAGS - unset CPPFLAGS - - if ! use pygrub; then - sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die - fi - - if ! use python; then - sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die - fi - - if ! use hvm; then - sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die - # Bug 351648 - elif ! use x86 && ! has x86 $(get_all_abis); then - mkdir -p "${WORKDIR}"/extra-headers/gnu || die - touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die - export CPATH="${WORKDIR}"/extra-headers - fi - - if use qemu; then - if use sdl; then - sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \ - tools/Makefile || die - else - sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \ - tools/qemu-xen-traditional/xen-setup || die - sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \ - tools/Makefile || die - fi - else - # Don't bother with qemu, only needed for fully virtualised guests - sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die - fi - - # Reset bash completion dir; Bug 472438 - sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \ - -i Config.mk || die - sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die - - # xencommons, Bug #492332, sed lighter weight than patching - sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \ - -i tools/hotplug/Linux/init.d/xencommons.in || die - - # fix bashishm - sed -e '/Usage/s/\$//g' \ - -i tools/hotplug/Linux/init.d/xendriverdomain.in || die - - # respect multilib, usr/lib/libcacard.so.0.0.0 - sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \ - -i tools/qemu-xen/configure || die - - #bug 518136, don't build 32bit exactuable for nomultilib profile - if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then - sed -i -e "/x86_emulator/d" tools/tests/Makefile || die - fi - - # uncomment lines in xl.conf - sed -e 's:^#autoballoon=:autoballoon=:' \ - -e 's:^#lockfile=:lockfile=:' \ - -e 's:^#vif.default.script=:vif.default.script=:' \ - -i tools/examples/xl.conf || die - - # disable capstone (Bug #673474) - sed -e "s:\$\$source/configure:\0 --disable-capstone:" \ - -i tools/Makefile || die - - # disable glusterfs - sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \ - -i tools/Makefile || die - - default -} - -src_configure() { - local myconf="--prefix=${PREFIX}/usr \ - --libdir=${PREFIX}/usr/$(get_libdir) \ - --libexecdir=${PREFIX}/usr/libexec \ - --localstatedir=${EPREFIX}/var \ - --disable-werror \ - --disable-xen \ - --enable-tools \ - --enable-docs \ - $(use_enable api xenapi) \ - $(use_enable ipxe) \ - $(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') \ - $(use_enable ocaml ocamltools) \ - $(use_enable ovmf) \ - $(use_enable pam) \ - $(use_enable rombios) \ - --with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \ - " - - use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin" - use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64" - use amd64 && myconf+=" $(use_enable qemu-traditional)" - tc-ld-disable-gold # Bug 669570 - econf ${myconf} -} - -src_compile() { - local myopt - use debug && myopt="${myopt} debug=y" - use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y" - - if test-flag-CC -fno-strict-overflow; then - append-flags -fno-strict-overflow - fi - - emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt} - - if use doc; then - emake -C docs build - else - emake -C docs man-pages - fi -} - -src_install() { - # Override auto-detection in the build system, bug #382573 - export INITD_DIR=/tmp/init.d - export CONFIG_LEAF_DIR=../tmp/default - - # Let the build system compile installed Python modules. - local PYTHONDONTWRITEBYTECODE - export PYTHONDONTWRITEBYTECODE - - emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \ - XEN_PYTHON_NATIVE_INSTALL=y install-tools - - # Created at runtime - rm -rv "${ED}/var/run" || die - - # Fix the remaining Python shebangs. - python_fix_shebang "${D}" - - # Remove RedHat-specific stuff - rm -rf "${D}"/tmp || die - - if use doc; then - emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs - dodoc -r docs/{pdf,txt} - else - emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032 - fi - dodoc ${DOCS[@]} - - newconfd "${FILESDIR}"/xendomains.confd xendomains - newconfd "${FILESDIR}"/xenstored.confd xenstored - newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled - newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains - newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored - newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled - newinitd "${FILESDIR}"/xencommons.initd xencommons - newconfd "${FILESDIR}"/xencommons.confd xencommons - newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev - newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev - newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog - - if use screen; then - cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die - cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die - keepdir /var/log/xen-consoles - fi - - # For -static-libs wrt Bug 384355 - if ! use static-libs; then - rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a - fi - - # for xendomains - keepdir /etc/xen/auto - - # Remove files failing QA AFTER emake installs them, avoiding seeking absent files - find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \ - -o -name openbios-ppc -o -name palcode-clipper \) -delete || die - - keepdir /var/lib/xen/dump - keepdir /var/lib/xen/xenpaging - keepdir /var/lib/xenstored - keepdir /var/log/xen - - if use python; then - python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/xenstat.py" - python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/_xenstat.so" - fi - - python_optimize -} - -pkg_postinst() { - elog "Official Xen Guide and the offical wiki page:" - elog "https://wiki.gentoo.org/wiki/Xen" - elog "https://wiki.xen.org/wiki/Main_Page" - elog "" - elog "Recommended to utilise the xencommons script to config system at boot" - elog "Add by use of rc-update on completion of the install" - - if ! use hvm; then - echo - elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" - elog "support enable the hvm use flag." - elog "An x86 or amd64 system is required to build HVM support." - fi - - if use qemu; then - elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source" - elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently" - elog "with the qemu capable xen. It is up to the user to distinguish between and utilise" - elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise" - fi -} diff --git a/app-emulation/xen-tools/xen-tools-4.14.1-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.14.2.ebuild index dfd8b2e0b73a..112aaab069f5 100644 --- a/app-emulation/xen-tools/xen-tools-4.14.1-r2.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.14.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6..9} ) +PYTHON_COMPAT=( python3_{7..9} ) PYTHON_REQ_USE='ncurses,xml,threads(+)' inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs @@ -17,21 +17,21 @@ if [[ ${PV} == *9999 ]]; then S="${WORKDIR}/${REPO}" else KEYWORDS="~amd64 ~arm ~arm64 ~x86" - UPSTREAM_VER=3 + UPSTREAM_VER= SECURITY_VER= # xen-tools's gentoo patches tarball - GENTOO_VER=22 + GENTOO_VER=23 # xen-tools's gentoo patches version which apply to this specific ebuild GENTOO_GPV=0 # xen-tools ovmf's patches OVMF_VER= - SEABIOS_VER="1.13.0" + SEABIOS_VER="1.14.0" EDK2_COMMIT="06dc822d045c2bb42e497487935485302486e151" EDK2_OPENSSL_VERSION="1_1_1g" EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037" EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d" - IPXE_COMMIT="1dd56dbd11082fb622c2ed21cfaced4f47d798a6" + IPXE_COMMIT="988d2c13cdf0f0b4140685af35ced70ac5b3283c" [[ -n ${UPSTREAM_VER} ]] && \ UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz @@ -46,7 +46,7 @@ else OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz" SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz - https://github.com/qemu/seabios/archive/rel-${SEABIOS_VER}.tar.gz -> seabios-${SEABIOS_VER}.tar.gz + https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz @@ -239,7 +239,7 @@ src_prepare() { fi # move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err - mv ../seabios-rel-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die + mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die pushd tools/firmware/ > /dev/null ln -s seabios-dir-remote seabios-dir || die popd > /dev/null @@ -278,9 +278,9 @@ src_prepare() { if use ipxe; then cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die - # gcc 10 - cp "${WORKDIR}/patches-gentoo/xen-tools-4.13.0-ipxe-gcc10.patch" tools/firmware/etherboot/patches/ipxe-gcc10.patch || die - echo ipxe-gcc10.patch >> tools/firmware/etherboot/patches/series || die + # gcc 11 + cp "${WORKDIR}/patches-gentoo/xen-tools-4.15.0-ipxe-gcc11.patch" tools/firmware/etherboot/patches/ipxe-gcc11.patch || die + echo ipxe-gcc11.patch >> tools/firmware/etherboot/patches/series || die fi mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die @@ -377,6 +377,10 @@ src_prepare() { sed -e "s:\$\$source/configure:\0 --disable-vnc-png:" \ -i tools/Makefile || die + # disable docker (Bug #732970) + sed -e "s:\$\$source/configure:\0 --disable-containers:" \ + -i tools/Makefile || die + default } @@ -385,6 +389,7 @@ src_configure() { --libdir=${PREFIX}/usr/$(get_libdir) \ --libexecdir=${PREFIX}/usr/libexec \ --localstatedir=${EPREFIX}/var \ + --disable-golang \ --disable-werror \ --disable-xen \ --enable-tools \ diff --git a/app-emulation/xen-tools/xen-tools-4.13.2-r4.ebuild b/app-emulation/xen-tools/xen-tools-4.15.0.ebuild index e7e7510eb1f6..c19f2eb37adc 100644 --- a/app-emulation/xen-tools/xen-tools-4.13.2-r4.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.15.0.ebuild @@ -17,21 +17,21 @@ if [[ ${PV} == *9999 ]]; then S="${WORKDIR}/${REPO}" else KEYWORDS="~amd64 ~arm ~arm64 ~x86" - UPSTREAM_VER=6 - SECURITY_VER=29 + UPSTREAM_VER=0 + SECURITY_VER= # xen-tools's gentoo patches tarball - GENTOO_VER=21 + GENTOO_VER=23 # xen-tools's gentoo patches version which apply to this specific ebuild - GENTOO_GPV=1 + GENTOO_GPV=0 # xen-tools ovmf's patches OVMF_VER= - SEABIOS_VER="1.12.1" + SEABIOS_VER="1.14.0" EDK2_COMMIT="06dc822d045c2bb42e497487935485302486e151" EDK2_OPENSSL_VERSION="1_1_1g" EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037" EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d" - IPXE_COMMIT="1dd56dbd11082fb622c2ed21cfaced4f47d798a6" + IPXE_COMMIT="988d2c13cdf0f0b4140685af35ced70ac5b3283c" [[ -n ${UPSTREAM_VER} ]] && \ UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz @@ -46,7 +46,7 @@ else OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz" SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz - https://github.com/qemu/seabios/archive/rel-${SEABIOS_VER}.tar.gz -> seabios-${SEABIOS_VER}.tar.gz + https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz @@ -93,7 +93,10 @@ COMMON_DEPEND=" " DEPEND="${COMMON_DEPEND} + app-misc/pax-utils + dev-lang/perl >=sys-kernel/linux-headers-4.11 + x11-libs/pixman $(python_gen_cond_dep ' dev-python/lxml[${PYTHON_MULTI_USEDEP}] pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] ) @@ -113,8 +116,6 @@ DEPEND="${COMMON_DEPEND} system-seabios? ( sys-firmware/seabios ) system-ipxe? ( sys-firmware/ipxe[qemu] ) rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) - dev-lang/perl - app-misc/pax-utils doc? ( app-text/ghostscript-gpl app-text/pandoc @@ -127,7 +128,6 @@ DEPEND="${COMMON_DEPEND} hvm? ( x11-base/xorg-proto ) qemu? ( app-arch/snappy:= - x11-libs/pixman sdl? ( media-libs/libsdl[X] media-libs/libsdl2[X] @@ -150,6 +150,7 @@ RDEPEND="${COMMON_DEPEND} # Approved by QA team in bug #144032 QA_WX_LOAD=" usr/libexec/xen/boot/hvmloader + usr/libexec/xen/boot/xen-shim usr/share/qemu-xen/qemu/hppa-firmware.img usr/share/qemu-xen/qemu/s390-ccw.img usr/share/qemu-xen/qemu/u-boot.e500 @@ -165,8 +166,13 @@ QA_PREBUILT=" usr/libexec/xen/bin/qemu-keymap usr/libexec/xen/bin/qemu-nbd usr/libexec/xen/bin/qemu-pr-helper + usr/libexec/xen/bin/qemu-storage-daemon usr/libexec/xen/bin/qemu-system-i386 usr/libexec/xen/bin/virtfs-proxy-helper + usr/libexec/xen/boot/xen-shim + usr/libexec/xen/libexec/qemu-pr-helper + usr/libexec/xen/libexec/virtfs-proxy-helper + usr/libexec/xen/libexec/virtiofsd usr/libexec/xen/libexec/xen-bridge-helper usr/share/qemu-xen/qemu/s390-ccw.img usr/share/qemu-xen/qemu/s390-netboot.img @@ -239,7 +245,7 @@ src_prepare() { fi # move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err - mv ../seabios-rel-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die + mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die pushd tools/firmware/ > /dev/null ln -s seabios-dir-remote seabios-dir || die popd > /dev/null @@ -278,9 +284,9 @@ src_prepare() { if use ipxe; then cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die - # gcc 10 - cp "${WORKDIR}/patches-gentoo/xen-tools-4.13.0-ipxe-gcc10.patch" tools/firmware/etherboot/patches/ipxe-gcc10.patch || die - echo ipxe-gcc10.patch >> tools/firmware/etherboot/patches/series || die + # gcc 11 + cp "${WORKDIR}/patches-gentoo/${P}-ipxe-gcc11.patch" tools/firmware/etherboot/patches/ipxe-gcc11.patch || die + echo ipxe-gcc11.patch >> tools/firmware/etherboot/patches/series || die fi mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die @@ -336,7 +342,6 @@ src_prepare() { # Reset bash completion dir; Bug 472438 sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \ -i Config.mk || die - sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die # xencommons, Bug #492332, sed lighter weight than patching sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \ @@ -377,6 +382,10 @@ src_prepare() { sed -e "s:\$\$source/configure:\0 --disable-vnc-png:" \ -i tools/Makefile || die + # disable docker (Bug #732970) + sed -e "s:\$\$source/configure:\0 --disable-containers:" \ + -i tools/Makefile || die + default } @@ -385,6 +394,7 @@ src_configure() { --libdir=${PREFIX}/usr/$(get_libdir) \ --libexecdir=${PREFIX}/usr/libexec \ --localstatedir=${EPREFIX}/var \ + --disable-golang \ --disable-werror \ --disable-xen \ --enable-tools \ @@ -409,7 +419,8 @@ src_configure() { src_compile() { local myopt use debug && myopt="${myopt} debug=y" - use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y" + # Currently broken + #use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y" if test-flag-CC -fno-strict-overflow; then append-flags -fno-strict-overflow @@ -488,10 +499,11 @@ src_install() { keepdir /var/lib/xenstored keepdir /var/log/xen - if use python; then - python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/xenstat.py" - python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/_xenstat.so" - fi + # Currently broken + #if use python; then + #python_domodule "${S}/tools/libs/stat/bindings/swig/python/xenstat.py" + #python_domodule "${S}/tools/libs/stat/bindings/swig/python/_xenstat.so" + #fi python_optimize } diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest index 0c2a0faab070..5c6027c833f8 100644 --- a/app-emulation/xen/Manifest +++ b/app-emulation/xen/Manifest @@ -1,8 +1,4 @@ -DIST xen-4.13.2-upstream-patches-4.tar.xz 65324 BLAKE2B 0e71e4600fffcf1341a52103a6318485c1da54101ec59dbdb9824be5a5ed1f977135a9c3e4ce48cf14922aa0a2e3ff5097dc870286e3b142d060c22d78079cb3 SHA512 3f0e41b685655c7753204862ea6b8e502ff4b4f76e4788ca07ab93a4bb3c636d24ad933c578f7c6e4c866cfb0d6b7b7234124da7c2fed0a4b34f2fbe401c56e1 -DIST xen-4.13.2-upstream-patches-5.tar.xz 76580 BLAKE2B 8eeab100c14d769174e7d935d4e081ffc2d72b771f8022ce5c31b89d860ddba5381baf55b87443dc3bc555b404595492d30bc7f2a103c77762004acfce70446e SHA512 5dd5c63267e9542626315efec94642901cff55f4a1f8148c58f86677254381242fce3d6c5c0ae72665b452441c54647d0b9a132a2a18ffb4ff7eaad86ef227de -DIST xen-4.13.2-upstream-patches-6.tar.xz 80980 BLAKE2B a20643c4f89f197e4001c0181249bc1a22b60874bc077ba2abee716b8e64bbbea0885a64632f3120960425a741328ceba1b44dc10a7a24039b328e1ded28f752 SHA512 0b097dfb04404ec6c609d35d924b3d2306c5f2de0501aa0b8e007e0af9a4ef394fae2d736435401bf8bd1fd661171c71ba712585bdb195649e3350ef9f953115 -DIST xen-4.13.2.tar.gz 39037826 BLAKE2B ad2b7c3003ca29e5e60a85c581f706ef87d99eadf939ed36ebe8f6698582f7a29dbdaf502039b60a0afe7ad4ae6ce89713e69dc8b8a7d5abe65063da7f1baa5b SHA512 cd3092281c97e9421e303aa288aac04dcccd5536ba7c0ff4d51fbf3d07b5ffacfe3456ba06f5cf63577dafbf8cf3a5d9825ceb5e9ef8ca1427900cc3e57b50a3 DIST xen-4.13.3.tar.gz 39044539 BLAKE2B 5d0e57c76e12e1b86b78bbf561e947d70b9569a24412617a640346d2358b141a2741e7a3be454df52d198ad63e58b1519288de62330417c70e72445703f3fac2 SHA512 622127d824b9c49b57282a887fb404e0bad05ff60bccade82e4e0e9b5ad975ff9aa1fba83392e6d8379e9a15340e8ae9785c0913eb11027816e4600432eea6b6 -DIST xen-4.14.1-upstream-patches-2.tar.xz 22920 BLAKE2B 890cd9bcc3c72b4ed192476a913de0377d50ddeb180e0d6dc4720e86662387a699ad74b263adf2b867b2421fcf3efdcacaa17bf581643afc50c9dc7e8a3dfc60 SHA512 ca0e53f40fe23d9a6c6374b460fcc0c8063e511f03ca86c02291fcb73bf9f91594de6fd615609997e0aac2e9c59ccc8512e4151a1d2646a70f3b5bacd95ad325 -DIST xen-4.14.1-upstream-patches-3.tar.xz 27864 BLAKE2B 69a67e863a30c0079f7955dd5306f69890a4f6db91d4cf2d1806a2bbd8afad88db7789c7eda8da0ff2a945da04916ff4ab5eaa9e529a417112ae01e31151d0dc SHA512 19e5ef39616fffbff20b2f658d61e50e21741fe3c5c4ca89f67e72a1606b3a593f93e9090fb0b5c76c1c801f931c237d2be6329bd174fa911d66b81ad4a332dd -DIST xen-4.14.1.tar.gz 39970115 BLAKE2B 21e5838b2b4d78420dcaaae2b8fc98ac876230217e6a3764aa643920150b8cef96025663e6a2fc423ab15f7f470b62547e91ce1be0337fc78f00c148c7ff40ab SHA512 c75cbec82793435f5a7026626ffdb2e9a2166b42d2be4b2f1194240e0312458124f0ebd53eeb02ce7330c22afe402a28a96b32f8af66e41e9416fe94535724c9 +DIST xen-4.14.2.tar.gz 39973157 BLAKE2B db5d3570f79e0fd97872f5e5dd57a4eb39e005728387bfef3b51fabe1c693cfd8108d09b1026f5a5a7eb79de71be6f4af36d252f7e0b35a65a1567b7949e3e29 SHA512 83c9333b70dbee3e29c6bf08e5ad030676e6c4a32b976f3f5e6a8f8d0dd9e4898bac88dd8e1c9d2ad3509cebb5d212e1745f9392a469d7afeb841d79801ccf39 +DIST xen-4.15.0-upstream-patches-0.tar.xz 15744 BLAKE2B e2abb68524a7c190db8d91beb79731aea5290e82f54fb21218739dab666f6f5ea85c203575ec248b46830f1862408d50d3ceea1104fcd9325babfccf3574c515 SHA512 f1a2800d15a61f08eda4d6bafaead95a9d72cc9e4d90a19278d89c696b7e2d5d6353b28dba7ed0eb0c9aeb8604d3697db6a8f4ac38047e2510279d88181752f9 +DIST xen-4.15.0.tar.gz 40785399 BLAKE2B 8b0530f5516c39656506f4bb705952da0555a8ab7f47323473b171caeb7692f3107e9d94f13171d40576600064589eed35f4d210af02db4cc4706dd4fc202100 SHA512 93683b8a97387ca5f003c635a11d163e61c87dbdc9a03081f9155fe87b49f1dfa74ce243fcd5e04dc009353a36e2375b786f1ebde828b5951a094cd64197b4c7 diff --git a/app-emulation/xen/files/xen-4.15-efi.patch b/app-emulation/xen/files/xen-4.15-efi.patch new file mode 100644 index 000000000000..01133e98dde3 --- /dev/null +++ b/app-emulation/xen/files/xen-4.15-efi.patch @@ -0,0 +1,38 @@ +diff --git a/xen/Makefile b/xen/Makefile +index acb2d28..b9dbd9c 100644 +--- a/xen/Makefile ++++ b/xen/Makefile +@@ -272,9 +272,17 @@ _install: Z=$(CONFIG_XEN_INSTALL_SUFFIX) + _install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX) + [ -d $(D)$(BOOT_DIR) ] || $(INSTALL_DIR) $(D)$(BOOT_DIR) + $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_FULLVERSION)$(Z) +- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z) +- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z) +- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z) ++ ++ if [ 'x$(EFI_VENDOR)' == 'x' ]; then \ ++ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \ ++ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z); \ ++ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z); \ ++ else \ ++ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \ ++ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z); \ ++ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z); \ ++ fi; ++ + [ -d "$(D)$(DEBUG_DIR)" ] || $(INSTALL_DIR) $(D)$(DEBUG_DIR) + $(INSTALL_DATA) $(TARGET)-syms $(D)$(DEBUG_DIR)/$(T)-syms-$(XEN_FULLVERSION) + $(INSTALL_DATA) $(TARGET)-syms.map $(D)$(DEBUG_DIR)/$(T)-syms-$(XEN_FULLVERSION).map +diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile +index b6567c4..0320a4a 100644 +--- a/xen/arch/x86/Makefile ++++ b/xen/arch/x86/Makefile +@@ -123,7 +123,7 @@ ifneq ($(efi-y),) + # Check if the compiler supports the MS ABI. + export XEN_BUILD_EFI := $(shell $(CC) $(XEN_CFLAGS) -c efi/check.c -o efi/check.o 2>/dev/null && echo y) + # Check if the linker supports PE. +-EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(XEN_LDFLAGS)) --subsystem=10 --strip-debug ++EFI_LDFLAGS = -mi386pep $(patsubst -m%,-mi386pep,$(XEN_LDFLAGS)) --subsystem=10 --strip-debug + XEN_BUILD_PE := $(if $(XEN_BUILD_EFI),$(shell $(LD) $(EFI_LDFLAGS) -o efi/check.efi efi/check.o 2>/dev/null && echo y)) + CFLAGS-$(XEN_BUILD_EFI) += -DXEN_BUILD_EFI + # Check if the linker produces fixups in PE by default (we need to disable it doing so for now). diff --git a/app-emulation/xen/xen-4.13.2-r5.ebuild b/app-emulation/xen/xen-4.13.2-r5.ebuild deleted file mode 100644 index 1c318430ddcc..000000000000 --- a/app-emulation/xen/xen-4.13.2-r5.ebuild +++ /dev/null @@ -1,165 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6..9} ) - -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.13.2-r6.ebuild b/app-emulation/xen/xen-4.13.2-r6.ebuild deleted file mode 100644 index bae6d65988c1..000000000000 --- a/app-emulation/xen/xen-4.13.2-r6.ebuild +++ /dev/null @@ -1,165 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6..9} ) - -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=5 - 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-r2.ebuild b/app-emulation/xen/xen-4.14.1-r2.ebuild deleted file mode 100644 index 1c207fc9ecaf..000000000000 --- a/app-emulation/xen/xen-4.14.1-r2.ebuild +++ /dev/null @@ -1,165 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6..9} ) - -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=2 - 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.14-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-r3.ebuild b/app-emulation/xen/xen-4.14.2.ebuild index e3002595a4ce..93ea93f278af 100644 --- a/app-emulation/xen/xen-4.14.1-r3.ebuild +++ b/app-emulation/xen/xen-4.14.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6..9} ) +PYTHON_COMPAT=( python3_{7..9} ) inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs @@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then SRC_URI="" else KEYWORDS="~amd64 ~arm -x86" - UPSTREAM_VER=3 + UPSTREAM_VER= SECURITY_VER= GENTOO_VER= @@ -98,8 +98,12 @@ src_prepare() { # Gentoo's patchset [[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo + # Symlinks do not work on fat32 volumes eapply "${FILESDIR}"/${PN}-4.14-efi.patch + # Workaround new gcc-11 options + sed -e '/^CFLAGS/s/-Werror//g' -i xen/Makefile || die + # Drop .config sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" diff --git a/app-emulation/xen/xen-4.13.2-r7.ebuild b/app-emulation/xen/xen-4.15.0.ebuild index 4f243abd0510..eaf463b8786b 100644 --- a/app-emulation/xen/xen-4.13.2-r7.ebuild +++ b/app-emulation/xen/xen-4.15.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6..9} ) +PYTHON_COMPAT=( python3_{7..9} ) inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs @@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then SRC_URI="" else KEYWORDS="~amd64 ~arm -x86" - UPSTREAM_VER=6 + UPSTREAM_VER=0 SECURITY_VER= GENTOO_VER= @@ -98,7 +98,11 @@ src_prepare() { # Gentoo's patchset [[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo - eapply "${FILESDIR}"/${PN}-4.11-efi.patch + # Symlinks do not work on fat32 volumes + eapply "${FILESDIR}"/${PN}-4.15-efi.patch + + # Workaround new gcc-11 options + sed -e '/^CFLAGS/s/-Werror//g' -i xen/Makefile || die # Drop .config sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest index 054f737244f5..4c19d811a8c8 100644 --- a/app-misc/elasticsearch/Manifest +++ b/app-misc/elasticsearch/Manifest @@ -1,5 +1,6 @@ DIST elasticsearch-6.8.15.tar.gz 149102328 BLAKE2B 0ce9ba565d751cd27721f3d49dd24761937c3476cee4896ba1a4d84e4fc238296129481f18cad64270fe8af71a043c2e8e583df14f2a084850fb10c93fcea0ef SHA512 c62c4d9d1bb83e10d3e1079f56b834f2f89b1f712c29d9ce7e81786199c71d287ecbf6df158eca56a7af711eafe13dfb276e12b34e1a0a6cf6719e1fbb44a142 DIST elasticsearch-7.10.2-no-jdk-linux-x86_64.tar.gz 164380146 BLAKE2B 16797ed48c4cb6f91ed891014f275ad86a4852579232df1827413389fc9e505327412729f70783750252190a34b0e0d552ec0b5f25f3d0a811724191eccc6568 SHA512 bd3def00af04670ad04556c911ef8c68b639e1c3b621f36a8973d9700f95873d10bc706a4e3a98f892ac59c1b761d56035a236068d6958af772874e428940dc4 DIST elasticsearch-7.12.0-no-jdk-linux-x86_64.tar.gz 173069694 BLAKE2B 5de74b1e6de743246cf48e32254f9646fa25c2820d0be9df886fdefe131a302ddb8906546147f0d284e2fc0faf8cc0238bf854fe1611d28bf1e7cb1518bd4e31 SHA512 205aa2a2fa2ab7eb7b54087420e0123aa97e5456e2e1f31cad9ea7b84be3f9823a2a7c47d4cf1697833e5f795359477d3a3b0ea4955a8f92583cf2228071827e +DIST elasticsearch-7.12.1-no-jdk-linux-x86_64.tar.gz 173079845 BLAKE2B 98214508c2c1dcb631f59d9e51d5949f9a7c5d1f68ff78c8d93af04c6a21fa1e1c6e2051f04bbdb8154443d6295ad54af2016695fcb9193b7595e1486777ba98 SHA512 c91fd66668977280d7339caf6b4fef9fce5640492f0e2a65bc537c6da8397c801a3727f1ff56b7a1591b11ea47195720c588a4eba473043f829a87cd3dcc0af4 DIST elasticsearch-oss-6.8.15.tar.gz 68240776 BLAKE2B 431d845e02f2118a98021af4422ece34274b6d0811a32c5a3e679da3f8f56ca9cd45949307268811edbb83327a4a80fb84866cbbaaf01f7d3af042412b1e1bfa SHA512 7e6a819339ac6043af218f9d97d5d68c50ac46900e4293e7fa18992f7a50b10b0ab2434e26ff0dc1546204ae7526de8ac6ef6545fc0db9c862ceeaa0d96c56f5 DIST elasticsearch-oss-7.10.2-no-jdk-linux-x86_64.tar.gz 76383466 BLAKE2B e99c04b0d10ef5755986515c7127ebde00b58e0eba69b6a05e12bd0bffee70266bbb023680584bfe0f321d5a3cf79af89cce3a5191923ad721a9f6039ab82743 SHA512 7b63237996569ccdc7c9d9e7cc097fcb23865396eddac30e5f02543484220d2fc70a7285b430877e5e76a5d8716d9682de9fc40d5e57a08f331e82011fc59756 diff --git a/app-misc/elasticsearch/elasticsearch-7.12.1.ebuild b/app-misc/elasticsearch/elasticsearch-7.12.1.ebuild new file mode 100644 index 000000000000..e2035c21e8ff --- /dev/null +++ b/app-misc/elasticsearch/elasticsearch-7.12.1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd tmpfiles + +DESCRIPTION="Free and Open, Distributed, RESTful Search Engine" +HOMEPAGE="https://www.elastic.co/elasticsearch/" +SRC_URI="https://artifacts.elastic.co/downloads/${PN}/${P}-no-jdk-linux-x86_64.tar.gz" +LICENSE="Apache-2.0 BSD-2 Elastic-2.0 LGPL-3 MIT public-domain" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND="acct-group/elasticsearch + acct-user/elasticsearch + virtual/jre" + +QA_PREBUILT="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*" +QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*" + +src_prepare() { + default + + rm LICENSE.txt NOTICE.txt || die + rmdir logs || die +} + +src_install() { + keepdir /etc/${PN} + keepdir /etc/${PN}/scripts + + insinto /etc/${PN} + doins -r config/. + rm -r config || die + + fowners root:${PN} /etc/${PN} + fperms 2750 /etc/${PN} + + insinto /usr/share/${PN} + doins -r . + + exeinto /usr/share/${PN}/bin + doexe "${FILESDIR}/elasticsearch-systemd-pre-exec" + + fperms -R +x /usr/share/${PN}/bin + fperms -R +x /usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin + + keepdir /var/{lib,log}/${PN} + fowners ${PN}:${PN} /var/{lib,log}/${PN} + fperms 0750 /var/{lib,log}/${PN} + dodir /usr/share/${PN}/plugins + + insinto /etc/sysctl.d + newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf + + newconfd "${FILESDIR}/${PN}.conf.4" ${PN} + newinitd "${FILESDIR}/${PN}.init.8" ${PN} + + systemd_install_serviced "${FILESDIR}/${PN}.service.conf" + systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service + + newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.d ${PN}.conf +} + +pkg_postinst() { + tmpfiles_process /usr/lib/tmpfiles.d/${PN}.conf + + elog + elog "You may create multiple instances of ${PN} by" + elog "symlinking the init script:" + elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance" + elog + elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts" + elog "from /etc/${PN} into the configuration directory of the instance:" + elog "/etc/${PN}/instance" + elog + ewarn "Please make sure you have proper permissions on /etc/${PN}" + ewarn "prior to keystore generation or you may experience startup fails." + ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}" + ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore" +} diff --git a/app-portage/elt-patches/elt-patches-20201205.ebuild b/app-portage/elt-patches/elt-patches-20201205.ebuild index 93f53bbffe0c..272378929948 100644 --- a/app-portage/elt-patches/elt-patches-20201205.ebuild +++ b/app-portage/elt-patches/elt-patches-20201205.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" RDEPEND="sys-apps/gentoo-functions" BDEPEND="app-arch/xz-utils" diff --git a/app-portage/gentoolkit/gentoolkit-0.5.1.ebuild b/app-portage/gentoolkit/gentoolkit-0.5.1.ebuild index 5b0ee71b3532..dd0c74111423 100644 --- a/app-portage/gentoolkit/gentoolkit-0.5.1.ebuild +++ b/app-portage/gentoolkit/gentoolkit-0.5.1.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} = 9999* ]]; then inherit git-r3 else SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="Collection of administration scripts for Gentoo" diff --git a/app-text/pandoc/files/pandoc-2.13-trypandoc.patch b/app-text/pandoc/files/pandoc-2.13-trypandoc.patch new file mode 100644 index 000000000000..1a0dacce99bc --- /dev/null +++ b/app-text/pandoc/files/pandoc-2.13-trypandoc.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/785268 +--- a/pandoc.cabal ++++ b/pandoc.cabal +@@ -729,7 +729,7 @@ executable trypandoc + main-is: trypandoc.hs + hs-source-dirs: trypandoc + if flag(trypandoc) +- build-depends: aeson, http-types, wai >= 0.3, wai-extra >= 3.0.24 ++ build-depends: aeson, http-types, wai >= 0.3, wai-extra >= 3.0.24, text + buildable: True + else + buildable: False diff --git a/app-text/pandoc/pandoc-2.13.ebuild b/app-text/pandoc/pandoc-2.13.ebuild index 72c73a65465f..f0ae5e9a8249 100644 --- a/app-text/pandoc/pandoc-2.13.ebuild +++ b/app-text/pandoc/pandoc-2.13.ebuild @@ -94,6 +94,8 @@ DEPEND="${RDEPEND} >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 ) " +PATCHES=("${FILESDIR}"/${P}-trypandoc.patch) + src_prepare() { default # optimisations require ~16GB of memory on ghc-8.8.3 diff --git a/dev-db/myodbc/myodbc-8.0.24-r1.ebuild b/dev-db/myodbc/myodbc-8.0.24-r1.ebuild index 888d9f95fe16..47d507edc552 100644 --- a/dev-db/myodbc/myodbc-8.0.24-r1.ebuild +++ b/dev-db/myodbc/myodbc-8.0.24-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar LICENSE="GPL-2" SLOT="${MAJOR}" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" IUSE="" RDEPEND=" diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.24.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.24.ebuild index a7c6ee2c2274..04d6b4c67116 100644 --- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.24.ebuild +++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.24.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz" LICENSE="Artistic GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86" IUSE="+legacy" RDEPEND=" diff --git a/dev-haskell/semirings/Manifest b/dev-haskell/semirings/Manifest index 8f69d00a2c8b..b3a84b13d652 100644 --- a/dev-haskell/semirings/Manifest +++ b/dev-haskell/semirings/Manifest @@ -1 +1,2 @@ DIST semirings-0.5.3.tar.gz 18622 BLAKE2B 70075ef121969652ec666531f42681af759863247811425e43eef590e73b6c0d139274fb57821d28f405f0bd44cc4bed1e48506f08f880aee71f0ff986a30136 SHA512 cd038746d1ce36eb04040954b0a969f17bf67ff45750a221284550724dd0ab563896fc3012c8d58aaf5c11a008b5526088711655e165895a4dead2d054cbf5e7 +DIST semirings-0.5.4.tar.gz 18490 BLAKE2B d3d67bca474ae7cbf3e016ef17da5ead593250d9cdda051a0fcd84bdb142ced3af74a0f287921e6edcde9916dea4d128f11cc77d8a65bff85470d533565e4749 SHA512 d24a178031e494e1b337585272e0cc960da7935007affc0fea893fe1cac0acd79569a6d8dc9cfddbb7f435a48c34b7aa0d6e589a16741c7c9b5fe00d52b95441 diff --git a/dev-haskell/semirings/semirings-0.5.4.ebuild b/dev-haskell/semirings/semirings-0.5.4.ebuild new file mode 100644 index 000000000000..37ae6599ef4c --- /dev/null +++ b/dev-haskell/semirings/semirings-0.5.4.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# ebuild generated by hackport 0.6.7.9999 + +CABAL_FEATURES="lib profile haddock hoogle hscolour" +inherit haskell-cabal + +DESCRIPTION="two monoids as one, in holy haskimony" +HOMEPAGE="https://github.com/chessai/semirings" +SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+containers +hashable +unordered-containers" + +RDEPEND="dev-haskell/base-compat-batteries:=[profile?] + >=dev-lang/ghc-7.10.1:=[gmp] + hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] + unordered-containers? ( >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] ) ) +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.22.2.0 +" + +src_configure() { + haskell-cabal_src_configure \ + $(cabal_flag containers containers) \ + $(cabal_flag hashable hashable) \ + $(cabal_flag unordered-containers unordered-containers) +} diff --git a/dev-java/assertj-core/assertj-core-2.3.0.ebuild b/dev-java/assertj-core/assertj-core-2.3.0.ebuild index 6ef61f2b87f5..994e879012f6 100644 --- a/dev-java/assertj-core/assertj-core-2.3.0.ebuild +++ b/dev-java/assertj-core/assertj-core-2.3.0.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="Java library that provides a fluent interface for writing assertion HOMEPAGE="http://joel-costigliola.github.io/assertj/" SRC_URI="https://github.com/joel-costigliola/${PN}/archive/${P}.tar.gz" LICENSE="Apache-2.0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~ppc64 x86" SLOT="2" CDEPEND="dev-java/cglib:3 diff --git a/dev-java/junitparams/junitparams-1.1.1.ebuild b/dev-java/junitparams/junitparams-1.1.1.ebuild index 8177e81b47d4..447018f31e5d 100644 --- a/dev-java/junitparams/junitparams-1.1.1.ebuild +++ b/dev-java/junitparams/junitparams-1.1.1.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://github.com/Pragmatists/JUnitParams/archive/refs/tags/JUnitParam LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc64 ~x86" # Common dependencies # POM: pom.xml diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest index cc5dba61485e..6264c609f1eb 100644 --- a/dev-lang/erlang/Manifest +++ b/dev-lang/erlang/Manifest @@ -1,4 +1,5 @@ DIST erlang-23.3.1.tar.gz 56654422 BLAKE2B b1ccd870d4a47f12d1a65b424d6c6b0f59a4654c0779c595fb28fdc2d3e179bb9b12d2473770b239b65665b2f6a3281d239f9fb3d6b86548df3ee69fce8fe5ed SHA512 03d4be9b25a14359e9f8db52d8e7d8edff1e8c53686a189caae15373c7e15d03f05e1138c549b8b41b8e6b7c55ab154cea47356f6fe79f7b72d5fb4ce759c4b0 DIST erlang-23.3.3.tar.gz 56671339 BLAKE2B 19455670d411adfb6a34a42e27ee8ff9eda052c9e096404f1d1061376ffecb136b912cb89a21cb84a7758c925ccccee5bbbb4ca31ac6b164af4813b0a5e9e747 SHA512 191243df10e0ee03db1a16c94253fefd4b008915464b2966f6fbe93faae3053b2a8950297054a6a8554c180fd3fcc18eda16e2f87e0c1a7a73570e753ec557d4 +DIST erlang-23.3.4.tar.gz 56664814 BLAKE2B ef8aa8d5a6fd1efc02a35459d1cb15eecf5f948127266bf782544e1da9a59765aca15070ea92df5558a4de017cc810e3542e2393e9470243fc6d9be13e9f37b6 SHA512 c8c5a9676163058276c703a0db0373508fad0ed9dff0aa9806ce59115ca766ff1d343c5a3917a920b249655fe188b974482ff378e9173c9fe00ea3907e618da5 DIST erlang_doc_html_23.3.tar.gz 36224657 BLAKE2B 7e2a3e16f4cfa0f15c01074740e02af7a45b480b4a94e764463717658ab7e5d0281f928c3ec585582b10168645e3e06cfe72cf6a0ba1b88f539b80f2b7ad99be SHA512 8be4aae46839239604b875b39339e7b6b6c677c099b3d749d5f1041c4508c1c3b4aa8136a93df12b1e5cb6333ef907276f5965c9726ed2b9e77a6043c8ef53b1 DIST erlang_doc_man_23.3.tar.gz 1456501 BLAKE2B 414bedee0e316d97b26d9d6418b799a9434a22e9980e7d3a83e2478d184d63d1633c0e10d0e180d929a3cacd82b4d703be86cbc8e99996037f6b37ea122f7a8c SHA512 6c661c210ffec4752afe624fa46700a0f62cc6589b74b859ab1dfde77d289e992988ac8744f7b4126d7512cd6d0aab3321f710a6324552b259bd7acd5b54a05e diff --git a/dev-lang/erlang/erlang-23.3.4.ebuild b/dev-lang/erlang/erlang-23.3.4.ebuild new file mode 100644 index 000000000000..257dbb6d4a2c --- /dev/null +++ b/dev-lang/erlang/erlang-23.3.4.ebuild @@ -0,0 +1,155 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +WX_GTK_VER="3.0-gtk3" + +inherit elisp-common java-pkg-opt-2 systemd wxwidgets + +# NOTE: If you need symlinks for binaries please tell maintainers or +# open up a bug to let it be created. + +UPSTREAM_V="$(ver_cut 1-2)" + +DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)" +HOMEPAGE="https://www.erlang.org/" +SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz + http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz + doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )" + +LICENSE="Apache-2.0" +# We use this subslot because Compiled HiPE Code can be loaded on the exact +# same build of ERTS that was used when compiling the code. See +# http://erlang.org/doc/system_principles/misc.html for more information. +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="doc emacs +hipe java +kpoll odbc sctp ssl systemd tk wxwidgets" + +RDEPEND=" + acct-group/epmd + acct-user/epmd + sys-libs/ncurses:0 + sys-libs/zlib + emacs? ( >=app-editors/emacs-23.1:* ) + java? ( >=virtual/jdk-1.8:* ) + odbc? ( dev-db/unixODBC ) + sctp? ( net-misc/lksctp-tools ) + ssl? ( >=dev-libs/openssl-0.9.7d:0= ) + systemd? ( sys-apps/systemd ) + wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] ) +" +DEPEND="${RDEPEND} + dev-lang/perl +" + +S="${WORKDIR}/otp-OTP-${PV}" + +PATCHES=( + "${FILESDIR}"/18.2.1-wx3.0.patch + "${FILESDIR}"/${PN}-22.0-dont-ignore-LDFLAGS.patch +) + +SITEFILE=50"${PN}"-gentoo.el + +src_prepare() { + default + + ./otp_build autoconf || die +} + +src_configure() { + use wxwidgets && setup-wxwidgets + + local myconf=( + --disable-builtin-zlib + $(use_enable hipe) + $(use_enable kpoll kernel-poll) + $(use_with java javac) + $(use_enable sctp) + $(use_with ssl ssl "${EPREFIX}"/usr) + $(use_enable ssl dynamic-ssl-lib) + $(use_enable systemd) + $(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null") + ) + econf "${myconf[@]}" +} + +src_compile() { + emake + + if use emacs ; then + pushd lib/tools/emacs &>/dev/null || die + elisp-compile *.el + popd &>/dev/null || die + fi +} + +extract_version() { + local path="$1" + local var_name="$2" + sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed" +} + +src_install() { + local erl_libdir_rel="$(get_libdir)/erlang" + local erl_libdir="/usr/${erl_libdir_rel}" + local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)" + local erl_erts_ver="$(extract_version erts VSN)" + local my_manpath="/usr/share/${PN}/man" + + [[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version" + [[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version" + + emake INSTALL_PREFIX="${D}" install + + if use doc ; then + # Note: we explicitly install docs into: + # /usr/share/doc/${PF}/{doc,lib,erts-*} + # To maintain that layout we gather everything in 'html-docs'. + # See bug #684376. + mkdir html-docs || die + mv "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* html-docs/ || die + local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" html-docs/. ) + docompress -x /usr/share/doc/${PF} + else + local DOCS=("README.md") + fi + + einstalldocs + + dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl + dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc + dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript + dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call + dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp + + ## Clean up the no longer needed files + rm "${ED}/${erl_libdir}/Install" || die + + insinto "${my_manpath}" + doins -r "${WORKDIR}"/man/* + # extend MANPATH, so the normal man command can find it + # see bug 189639 + newenvd - "90erlang" <<-_EOF_ + MANPATH="${my_manpath}" + _EOF_ + + if use emacs ; then + elisp-install erlang lib/tools/emacs/*.{el,elc} + sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \ + "${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die + elisp-site-file-install "${T}/${SITEFILE}" + fi + + newinitd "${FILESDIR}"/epmd.init-r2 epmd + newconfd "${FILESDIR}"/epmd.confd-r2 epmd + use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-lang/ferite/ferite-1.1.17-r1.ebuild b/dev-lang/ferite/ferite-1.1.17-r1.ebuild index 89bf1582aa04..25c134b1f337 100644 --- a/dev-lang/ferite/ferite-1.1.17-r1.ebuild +++ b/dev-lang/ferite/ferite-1.1.17-r1.ebuild @@ -20,11 +20,15 @@ RDEPEND=" " DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/${PN}-pcre.patch + "${FILESDIR}"/${P}-bool.patch + "${FILESDIR}"/${P}-slibtool.patch +) + src_prepare() { default - eapply "${FILESDIR}"/ferite-pcre.patch - # use docsdir variable, install to DESTDIR sed \ -e '/docsdir =/!s:$(prefix)/share/doc/ferite:$(DESTDIR)$(docsdir):' \ @@ -38,23 +42,6 @@ src_prepare() { scripts/test/Makefile.am \ scripts/test/rmi/Makefile.am || die - # Don't override the user's LDFLAGS - sed \ - -e 's:_LDFLAGS = :&$(AM_LDFLAGS) :' \ - -e '/^LDFLAGS/s:^:AM_:' \ - -i modules/*/Makefile.am \ - libs/{aphex,triton}/src/Makefile.am \ - src/Makefile.am || die - - # Only build/install shared libs for modules (can't use static anyway) - sed -i -e '/_LDFLAGS/s:-module:& -shared:' modules/*/Makefile.am || die - - # use LIBADD to ensure proper deps (fix parallel build) - sed \ - -e '/^stream_la_LDFLAGS/s:-L\. -lferitestream::' \ - -e '/^stream_la_LIBADD/s:$:libferitestream.la:' \ - -i modules/stream/Makefile.am || die - # Make sure we install in $(get_libdir), not lib sed -i -e "s|\$prefix/lib|\$prefix/$(get_libdir)|g" configure.ac || die @@ -67,7 +54,7 @@ src_prepare() { } src_configure() { - econf --libdir="${EPREFIX}/usr/$(get_libdir)" + econf --libdir="${EPREFIX}/usr/$(get_libdir)" --disable-static } src_install() { diff --git a/dev-lang/ferite/files/ferite-1.1.17-bool.patch b/dev-lang/ferite/files/ferite-1.1.17-bool.patch new file mode 100644 index 000000000000..ef92a2b41517 --- /dev/null +++ b/dev-lang/ferite/files/ferite-1.1.17-bool.patch @@ -0,0 +1,62 @@ +commit 797ba18741a03c6a1ccd8070b5f2629bcd6cf87f +Author: orbea <orbea@riseup.net> +Date: Tue May 11 07:13:35 2021 -0700 + + modules/xml: Rename the bool variable. + + This fixes compilation failures under some environments. + + xml_XML_TreeParser.c: In function ‘ferite_xml_XML_TreeParser_keepBlanks_b’: + xml_XML_TreeParser.c:10:9: error: two or more data types in declaration specifiers + 10 | char bool = FE_FALSE; + | ^~~~ + xml_XML_TreeParser.c:10:14: error: expected identifier or ‘(’ before ‘=’ token + + Signed-off-by: orbea <orbea@riseup.net> + +diff --git a/modules/xml/xml_XML_TreeParser.c b/modules/xml/xml_XML_TreeParser.c +index 886a901..25a2105 100644 +--- a/modules/xml/xml_XML_TreeParser.c ++++ b/modules/xml/xml_XML_TreeParser.c +@@ -7,17 +7,17 @@ + + FE_NATIVE_FUNCTION( ferite_xml_XML_TreeParser_keepBlanks_b ) + { +- char bool = FE_FALSE; ++ char fe_bool = FE_FALSE; + FeriteObject *self = FE_CONTAINER_TO_OBJECT; + FeriteObject *super = FE_CONTAINER_TO_OBJECT; + +- ferite_get_parameters( params, 1, &bool ); ++ ferite_get_parameters( params, 1, &fe_bool ); + + { /* Main function body. */ + #line 417 "xml.fec" + + XMLDoc *tree = (XMLDoc*)self->odata; +- tree->keepBlanks = bool; ++ tree->keepBlanks = fe_bool; + + } + FE_RETURN_VOID; +@@ -151,17 +151,17 @@ FE_NATIVE_FUNCTION( ferite_xml_XML_TreeParser_saveToFile_s ) + + FE_NATIVE_FUNCTION( ferite_xml_XML_TreeParser_validation_b ) + { +- char bool = FE_FALSE; ++ char fe_bool = FE_FALSE; + FeriteObject *self = FE_CONTAINER_TO_OBJECT; + FeriteObject *super = FE_CONTAINER_TO_OBJECT; + +- ferite_get_parameters( params, 1, &bool ); ++ ferite_get_parameters( params, 1, &fe_bool ); + + { /* Main function body. */ + #line 403 "xml.fec" + + +- if( bool == FE_FALSE ) ++ if( fe_bool == FE_FALSE ) + xmlDoValidityCheckingDefaultValue = 0; + else + xmlDoValidityCheckingDefaultValue = 1; diff --git a/dev-lang/ferite/files/ferite-1.1.17-slibtool.patch b/dev-lang/ferite/files/ferite-1.1.17-slibtool.patch new file mode 100644 index 000000000000..4a6fc15de6e8 --- /dev/null +++ b/dev-lang/ferite/files/ferite-1.1.17-slibtool.patch @@ -0,0 +1,569 @@ +commit 3cbead845f607628a44d78583534e6c0a74e9af1 +Author: orbea <orbea@riseup.net> +Date: Mon May 10 09:38:47 2021 -0700 + + Fix the build with -no-undefined. + + This adds correct usage of LDFLAGS and LIBADD. + + Signed-off-by: orbea <orbea@riseup.net> + +diff --git a/builder/builder.h b/builder/builder.h +index e92b410..fa0055a 100644 +--- a/builder/builder.h ++++ b/builder/builder.h +@@ -51,10 +51,6 @@ typedef struct __builder_module { + "MAINTAINERCLEANFILES = %s*.h %s*.c %s*~\n\n" \ + "CLEANFILES = \n" \ + "\n" \ +- "if NEED_FERITE_LIB\n" \ +- "libferite = -L${top_builddir}/src -lferite\n" \ +- "endif\n\n" \ +- "LDFLAGS = $(libferite) -L${libdir} @%s_LIBS@\n" \ + "INCLUDES = -I$(top_srcdir)/include -I$(prefix)/include -I. @%s_CFLAGS@\n" \ + "DEFS = @thread_defs@\n" \ + "\nscripts_DATA = %s\nscriptsdir = @FE_XPLAT_LIBRARY_PATH@\n\n" \ +@@ -65,7 +61,7 @@ typedef struct __builder_module { + "\n" \ + "%s_la_SOURCES = %s %s\n" \ + "%s_la_LDFLAGS = -no-undefined -module -avoid-version\n" \ +- "%s_la_LIBADD =\n" \ ++ "%s_la_LIBADD = ${top_builddir}/src/libferite.la\n" \ + "\n" \ + "%s_core.c: %s\n" \ + "\t%s -m %s %s/%s/%s\n\n%s" +diff --git a/configure.ac b/configure.ac +index 5b2f644..d5e713d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -78,8 +78,6 @@ AC_DEFINE_UNQUOTED([PLATFORM], "$platform", [The Platform on which we exist]) + CFLAGS="-DHAVE_CONFIG_HEADER -L$prefix/lib $CFLAGS" + CCFLAGS="-DHAVE_CONFIG_HEADER -L$prefix/lib $CCFLAGS" + +-AM_CONDITIONAL(NEED_FERITE_LIB, test "$system" = "Darwin" -o "$system" = "CYGWIN" -o "$system" = "SunOS" -o "$system" = "MINGW") +- + AC_PROG_INSTALL + AC_PROG_MAKE_SET + +diff --git a/libs/aphex/src/Makefile.am b/libs/aphex/src/Makefile.am +index 2b14cb7..57a8311 100644 +--- a/libs/aphex/src/Makefile.am ++++ b/libs/aphex/src/Makefile.am +@@ -6,8 +6,6 @@ AUTOMAKE_OPTIONS = no-dependencies foreign + + MAINTAINERCLEANFILES = Makefile.in + +-LDFLAGS = -L${prefix}/lib +- + INCLUDES = -I${top_srcdir}/libs/aphex/include -I${top_srcdir}/include -I${prefix}/include -I$(includedir) @aphex_INCS@ + + +@@ -18,7 +16,7 @@ noinst_LTLIBRARIES = libaphex.la + include_HEADERS = + + libaphex_la_DEPENDENCIES = $(top_builddir)/config.h +-libaphex_la_LDFLAGS = -no-undefined $(LDFLAGS) -m @aphex_LDFLAGS@ ++libaphex_la_LDFLAGS = -no-undefined -m @aphex_LDFLAGS@ + libaphex_la_LIBADD = @thread_libs@ @gc_libs@ + + libaphex_la_SOURCES = aphex_file.c aphex_directory.c aphex_config.c aphex_match.c aphex_thread.c aphex_notify.c poll.c poll.h +diff --git a/libs/triton/src/Makefile.am b/libs/triton/src/Makefile.am +index 0572996..0b25ba3 100644 +--- a/libs/triton/src/Makefile.am ++++ b/libs/triton/src/Makefile.am +@@ -6,8 +6,6 @@ AUTOMAKE_OPTIONS = no-dependencies foreign + + MAINTAINERCLEANFILES = Makefile.in + +-LDFLAGS = -L/usr/local/lib +- + INCLUDES = -I${top_srcdir} -I${top_srcdir}/libs/triton/include -I${top_srcdir}/include -I${prefix}/include -I$(includedir) @TRITON_INCS@ + + DEFS = @debugdefs@ +@@ -23,6 +21,6 @@ CLEANFILES = libltdl.la libltdlc.la + include_HEADERS = + + libtriton_la_DEPENDENCIES = $(top_builddir)/config.h +-libtriton_la_LDFLAGS = -no-undefined $(LDFLAGS) -m @TRITON_LDFLAGS@ ++libtriton_la_LDFLAGS = -no-undefined -m @TRITON_LDFLAGS@ + + libtriton_la_SOURCES = triton_core.c triton_loader_dlfcn.c triton_loader_ltdl.c triton_loader_darwin.c triton_loader_win32.c +diff --git a/modules/array/Makefile.am b/modules/array/Makefile.am +index 9f0475d..8bef2b8 100644 +--- a/modules/array/Makefile.am ++++ b/modules/array/Makefile.am +@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = array*.h array*.c array*~ + + CLEANFILES = + +-if NEED_FERITE_LIB +-libferite = -L${top_builddir}/src -lferite +-endif +- +-LDFLAGS = $(libferite) -L${libdir} @array_LIBS@ + INCLUDES = -I$(top_srcdir)/include -I$(prefix)/include -I. @array_CFLAGS@ + DEFS = @thread_defs@ + +@@ -27,7 +22,7 @@ pkg_LTLIBRARIES = array.la + + array_la_SOURCES = array_core.c array_misc.c array_Array.c array_header.h util.c util.h + array_la_LDFLAGS = -no-undefined -module -avoid-version +-array_la_LIBADD = ++array_la_LIBADD = ${top_builddir}/src/libferite.la + + array_core.c: @MODULE_SRC_PREFIX@/array/array.fec + @BUILDER@ -m array @MODULE_SRC_PREFIX@/array/array.fec +diff --git a/modules/date/Makefile.am b/modules/date/Makefile.am +index ab646b4..976baa0 100644 +--- a/modules/date/Makefile.am ++++ b/modules/date/Makefile.am +@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = date*.h date*.c date*~ + + CLEANFILES = + +-if NEED_FERITE_LIB +-libferite = -L${top_builddir}/src -lferite -L${top_builddir}/modules/stream -lferitestream +-endif +- +-LDFLAGS = $(libferite) -L${libdir} @date_LIBS@ + INCLUDES = -I$(top_srcdir)/include -I$(prefix)/include -I. @date_CFLAGS@ + DEFS = @thread_defs@ + +@@ -27,7 +22,7 @@ pkg_LTLIBRARIES = date.la + + date_la_SOURCES = date_core.c date_header.h date_misc.c date_Alarm.c date_Date.c util_date.c util_date.h strptime.c + date_la_LDFLAGS = -no-undefined -module -avoid-version +-date_la_LIBADD = ++date_la_LIBADD = ${top_builddir}/modules/stream/libferitestream.la + + date_core.c: @MODULE_SRC_PREFIX@/date/date.fec + @BUILDER@ -m date @MODULE_SRC_PREFIX@/date/date.fec +diff --git a/modules/filesystem/Makefile.am b/modules/filesystem/Makefile.am +index ac5b5e9..227a5ab 100644 +--- a/modules/filesystem/Makefile.am ++++ b/modules/filesystem/Makefile.am +@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = filesystem*.h filesystem*.c filesystem*~ + + CLEANFILES = + +-if NEED_FERITE_LIB +-libferite = -L${top_builddir}/src -lferite -L${top_builddir}/modules/stream -lferitestream +-endif +- +-LDFLAGS = $(libferite) -L${libdir} @filesystem_LIBS@ + INCLUDES = -I$(top_srcdir)/include -I$(prefix)/include -I. @filesystem_CFLAGS@ + DEFS = @thread_defs@ + +@@ -27,7 +22,7 @@ pkg_LTLIBRARIES = filesystem.la + + filesystem_la_SOURCES = filesystem_core.c filesystem_misc.c filesystem_FileSystem.c filesystem_Directory.c filesystem_File.c filesystem_header.h + filesystem_la_LDFLAGS = -no-undefined -module -avoid-version +-filesystem_la_LIBADD = ++filesystem_la_LIBADD = ${top_builddir}/modules/stream/libferitestream.la + + filesystem_core.c: @MODULE_SRC_PREFIX@/filesystem/filesystem.fec + @BUILDER@ -m filesystem @MODULE_SRC_PREFIX@/filesystem/filesystem.fec +diff --git a/modules/ipc/Makefile.am b/modules/ipc/Makefile.am +index 3367aa2..18f9593 100644 +--- a/modules/ipc/Makefile.am ++++ b/modules/ipc/Makefile.am +@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = ipc*.h ipc*.c ipc*~ + + CLEANFILES = + +-if NEED_FERITE_LIB +-libferite = -L${top_builddir}/src -lferite +-endif +- +-LDFLAGS = $(libferite) -L${libdir} @ipc_LIBS@ + INCLUDES = -I$(top_srcdir)/include -I$(prefix)/include -I. @ipc_CFLAGS@ + DEFS = @thread_defs@ + +@@ -27,7 +22,7 @@ pkg_LTLIBRARIES = ipc.la + + ipc_la_SOURCES = ipc_core.c ipc_misc.c ipc_IPCObject.c ipc_header.h + ipc_la_LDFLAGS = -no-undefined -module -avoid-version +-ipc_la_LIBADD = ++ipc_la_LIBADD = ${top_builddir}/src/libferite.la + + ipc_core.c: @MODULE_SRC_PREFIX@/ipc/ipc.fec + @BUILDER@ -m ipc @MODULE_SRC_PREFIX@/ipc/ipc.fec +diff --git a/modules/math/Makefile.am b/modules/math/Makefile.am +index 21a2ebc..f3a7f09 100644 +--- a/modules/math/Makefile.am ++++ b/modules/math/Makefile.am +@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = math*.h math*.c math*~ + + CLEANFILES = + +-if NEED_FERITE_LIB +-libferite = -L${top_builddir}/src -lferite +-endif +- +-LDFLAGS = $(libferite) -L${libdir} @math_LIBS@ + INCLUDES = -I$(top_srcdir)/include -I$(prefix)/include -I. @math_CFLAGS@ + DEFS = @thread_defs@ + +@@ -27,7 +22,7 @@ pkg_LTLIBRARIES = math.la + + math_la_SOURCES = math_core.c math_misc.c math_Math.c math_Math_Complex.c math_header.h + math_la_LDFLAGS = -no-undefined -module -avoid-version +-math_la_LIBADD = ++math_la_LIBADD = ${top_builddir}/src/libferite.la + + math_core.c: @MODULE_SRC_PREFIX@/math/complex.fec @MODULE_SRC_PREFIX@/math/math.fec + @BUILDER@ -m math @MODULE_SRC_PREFIX@/math/math.fec +diff --git a/modules/network/Makefile.am b/modules/network/Makefile.am +index 91aff1a..d753ed7 100644 +--- a/modules/network/Makefile.am ++++ b/modules/network/Makefile.am +@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = network*.h network*.c network*~ + + CLEANFILES = + +-if NEED_FERITE_LIB +-libferite = -L${top_builddir}/src -lferite -L${top_builddir}/modules/stream -lferitestream +-endif +- +-LDFLAGS = $(libferite) -L${libdir} @network_LIBS@ + INCLUDES = -I$(top_srcdir)/include -I$(prefix)/include -I. @network_CFLAGS@ + DEFS = @thread_defs@ + +@@ -27,7 +22,7 @@ pkg_LTLIBRARIES = network.la + + network_la_SOURCES = network_core.c network_misc.c network_Network.c network_Network_TCP.c network_Network_TCP_Stream.c network_Network_Host.c network_Network_UDP.c network_Network_UDP_Stream.c network_Network_Service.c network_header.h util_network.c util_network.h + network_la_LDFLAGS = -no-undefined -module -avoid-version +-network_la_LIBADD = ++network_la_LIBADD = ${top_builddir}/modules/stream/libferitestream.la + + network_core.c: @MODULE_SRC_PREFIX@/network/network.fec + @BUILDER@ -m network @MODULE_SRC_PREFIX@/network/network.fec +diff --git a/modules/number/Makefile.am b/modules/number/Makefile.am +index 6a39962..1203c68 100644 +--- a/modules/number/Makefile.am ++++ b/modules/number/Makefile.am +@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = number*.h number*.c number*~ + + CLEANFILES = + +-if NEED_FERITE_LIB +-libferite = -L${top_builddir}/src -lferite +-endif +- +-LDFLAGS = $(libferite) -L${libdir} @number_LIBS@ + INCLUDES = -I$(top_srcdir)/include -I$(prefix)/include -I. @number_CFLAGS@ + DEFS = @thread_defs@ + +@@ -27,7 +22,7 @@ pkg_LTLIBRARIES = number.la + + number_la_SOURCES = number_core.c number_misc.c number_Number.c number_header.h + number_la_LDFLAGS = -no-undefined -module -avoid-version +-number_la_LIBADD = ++number_la_LIBADD = ${top_builddir}/src/libferite.la + + number_core.c: @MODULE_SRC_PREFIX@/number/number.fec + @BUILDER@ -m number @MODULE_SRC_PREFIX@/number/number.fec +diff --git a/modules/posix/Makefile.am b/modules/posix/Makefile.am +index 8c5d8e9..bfd96fa 100644 +--- a/modules/posix/Makefile.am ++++ b/modules/posix/Makefile.am +@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = posix*.h posix*.c posix*~ + + CLEANFILES = + +-if NEED_FERITE_LIB +-libferite = -L${top_builddir}/src -lferite -L${top_builddir}/modules/stream -lferitestream +-endif +- +-LDFLAGS = $(libferite) -L${libdir} @posix_LIBS@ + INCLUDES = -I$(top_srcdir)/include -I$(prefix)/include -I. @posix_CFLAGS@ + DEFS = @thread_defs@ + +@@ -27,7 +22,7 @@ pkg_LTLIBRARIES = posix.la + + posix_la_SOURCES = posix_core.c posix_misc.c posix_Posix.c posix_Posix_Uname.c posix_Posix_Rlimit.c posix_Posix_User.c posix_Posix_Pipe.c posix_Posix_Rusage.c posix_Posix_ProcessStream.c posix_Posix_Stat.c posix_Posix_SelectResult.c posix_Posix_Group.c posix_header.h util_posix.c util_posix.h util_user.c util_user.h util_signal.c util_signal.h + posix_la_LDFLAGS = -no-undefined -module -avoid-version +-posix_la_LIBADD = ++posix_la_LIBADD = ${top_builddir}/modules/stream/libferitestream.la + + posix_core.c: @MODULE_SRC_PREFIX@/posix/posix.fec @MODULE_SRC_PREFIX@/posix/posix_consts.fec + @BUILDER@ -m posix @MODULE_SRC_PREFIX@/posix/posix.fec +diff --git a/modules/reflection/Makefile.am b/modules/reflection/Makefile.am +index 8d02b47..0509819 100644 +--- a/modules/reflection/Makefile.am ++++ b/modules/reflection/Makefile.am +@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = reflection*.h reflection*.c reflection*~ + + CLEANFILES = + +-if NEED_FERITE_LIB +-libferite = -L${top_builddir}/src -lferite +-endif +- +-LDFLAGS = $(libferite) -L${libdir} @reflection_LIBS@ + INCLUDES = -I$(top_srcdir)/include -I$(prefix)/include -I. @reflection_CFLAGS@ + DEFS = @thread_defs@ + +@@ -27,7 +22,7 @@ pkg_LTLIBRARIES = reflection.la + + reflection_la_SOURCES = reflection_core.c reflection_misc.c reflection_Reflection.c reflection_Namespace.c reflection_Function.c reflection_Class.c reflection_Variable.c reflection_Object.c reflection_header.h utility.c + reflection_la_LDFLAGS = -no-undefined -module -avoid-version +-reflection_la_LIBADD = ++reflection_la_LIBADD = ${top_builddir}/src/libferite.la + + reflection_core.c: @MODULE_SRC_PREFIX@/reflection/reflection.fec + @BUILDER@ -m reflection @MODULE_SRC_PREFIX@/reflection/reflection.fec +diff --git a/modules/regexp/Makefile.am b/modules/regexp/Makefile.am +index 9bf9df6..4bf74be 100644 +--- a/modules/regexp/Makefile.am ++++ b/modules/regexp/Makefile.am +@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = regexp*.h regexp*.c regexp*~ + + CLEANFILES = + +-if NEED_FERITE_LIB +-libferite = -L${top_builddir}/src -lferite +-endif +- +-LDFLAGS = $(libferite) -L${libdir} @regexp_LIBS@ + INCLUDES = -I$(top_srcdir)/include -I$(prefix)/include -I. @regexp_CFLAGS@ + DEFS = @thread_defs@ + +@@ -27,7 +22,7 @@ pkg_LTLIBRARIES = regexp.la + + regexp_la_SOURCES = regexp_core.c regexp_misc.c regexp_MatchObject.c regexp_Regexp.c regexp_header.h + regexp_la_LDFLAGS = -no-undefined -module -avoid-version +-regexp_la_LIBADD = ++regexp_la_LIBADD = ${top_builddir}/src/libferite.la + + regexp_core.c: @MODULE_SRC_PREFIX@/regexp/regexp.fec + @BUILDER@ -m regexp @MODULE_SRC_PREFIX@/regexp/regexp.fec +diff --git a/modules/serialize/Makefile.am b/modules/serialize/Makefile.am +index 0d40c38..ac58c8a 100644 +--- a/modules/serialize/Makefile.am ++++ b/modules/serialize/Makefile.am +@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = serialize*.h serialize*.c serialize*~ + + CLEANFILES = + +-if NEED_FERITE_LIB +-libferite = -L${top_builddir}/src -lferite +-endif +- +-LDFLAGS = $(libferite) -L${libdir} @serialize_LIBS@ + INCLUDES = -I$(top_srcdir)/include -I$(prefix)/include -I. @serialize_CFLAGS@ + DEFS = @thread_defs@ + +@@ -27,7 +22,7 @@ pkg_LTLIBRARIES = serialize.la + + serialize_la_SOURCES = serialize_core.c serialize_misc.c serialize_Serialize.c serialize_header.h utility.c utility.h + serialize_la_LDFLAGS = -no-undefined -module -avoid-version +-serialize_la_LIBADD = ++serialize_la_LIBADD = ${top_builddir}/src/libferite.la + + serialize_core.c: @MODULE_SRC_PREFIX@/serialize/serialize.fec + @BUILDER@ -m serialize @MODULE_SRC_PREFIX@/serialize/serialize.fec +diff --git a/modules/stream/Makefile.am b/modules/stream/Makefile.am +index 5f6adf1..1ed7e61 100644 +--- a/modules/stream/Makefile.am ++++ b/modules/stream/Makefile.am +@@ -7,18 +7,12 @@ MAINTAINERCLEANFILES = stream*.h stream*.c stream*~ + + CLEANFILES = + +-if NEED_FERITE_LIB +-libferite = -L${top_builddir}/src -lferite +-endif +- +-LDFLAGS = $(libferite) -L${libdir} @stream_LIBS@ + INCLUDES = -I$(top_srcdir)/include -I$(prefix)/include -I. @stream_CFLAGS@ + DEFS = @thread_defs@ + + lib_LTLIBRARIES = libferitestream.la + libferitestream_la_SOURCES = util_stream.c +-libferitestream_la_LIBADD = $(LDFLAGS) +-libferitestream_la_DEPENDENCIES = ++libferitestream_la_LIBADD = ${top_builddir}/src/libferite.la + libferitestream_la_LDFLAGS = -version-info 1:0:0 -export-dynamic -no-undefined + + fsl_DATA = util_stream.h +@@ -36,7 +30,7 @@ pkg_LTLIBRARIES = stream.la + + stream_la_SOURCES = stream_core.c stream_misc.c stream_Stream.c stream_Stream_Stream.c stream_Stream_StdioStream.c stream_Stream_StringStream.c stream_Stream_PointerObject.c stream_header.h util_stream.c util_stream.h + stream_la_LDFLAGS = -no-undefined -module -avoid-version -L. -lferitestream +-stream_la_LIBADD = ++stream_la_LIBADD = libferitestream.la + + stream_core.c: @MODULE_SRC_PREFIX@/stream/stream.fec + @BUILDER@ -m stream @MODULE_SRC_PREFIX@/stream/stream.fec +diff --git a/modules/string/Makefile.am b/modules/string/Makefile.am +index 851d2ff..ff83887 100644 +--- a/modules/string/Makefile.am ++++ b/modules/string/Makefile.am +@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = string*.h string*.c string*~ + + CLEANFILES = + +-if NEED_FERITE_LIB +-libferite = -L${top_builddir}/src -lferite +-endif +- +-LDFLAGS = $(libferite) -L${libdir} @string_LIBS@ + INCLUDES = -I$(top_srcdir)/include -I$(prefix)/include -I. @string_CFLAGS@ + DEFS = @thread_defs@ + +@@ -27,7 +22,7 @@ pkg_LTLIBRARIES = string.la + + string_la_SOURCES = string_core.c string_misc.c string_String.c string_header.h + string_la_LDFLAGS = -no-undefined -module -avoid-version +-string_la_LIBADD = ++string_la_LIBADD = ${top_builddir}/src/libferite.la + + string_core.c: @MODULE_SRC_PREFIX@/string/string.fec + @BUILDER@ -m string @MODULE_SRC_PREFIX@/string/string.fec +diff --git a/modules/sys/Makefile.am b/modules/sys/Makefile.am +index ac60b56..01c7e8f 100644 +--- a/modules/sys/Makefile.am ++++ b/modules/sys/Makefile.am +@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = sys*.h sys*.c sys*~ + + CLEANFILES = + +-if NEED_FERITE_LIB +-libferite = -L${top_builddir}/src -lferite -L${top_builddir}/modules/stream -lferitestream +-endif +- +-LDFLAGS = $(libferite) -L${libdir} @sys_LIBS@ + INCLUDES = -I$(top_srcdir)/include -I$(prefix)/include -I. @sys_CFLAGS@ + DEFS = @thread_defs@ + +@@ -27,7 +22,7 @@ pkg_LTLIBRARIES = sys.la + + sys_la_SOURCES = sys_core.c sys_misc.c sys_Sys.c sys_Sys_env.c sys_header.h + sys_la_LDFLAGS = -no-undefined -module -avoid-version +-sys_la_LIBADD = ++sys_la_LIBADD = ${top_builddir}/modules/stream/libferitestream.la + + sys_core.c: @MODULE_SRC_PREFIX@/sys/env.fec @MODULE_SRC_PREFIX@/sys/std.fec @MODULE_SRC_PREFIX@/sys/sys.fec + @BUILDER@ -m sys @MODULE_SRC_PREFIX@/sys/sys.fec +diff --git a/modules/test/Makefile.am b/modules/test/Makefile.am +index aeb7940..b99b0de 100644 +--- a/modules/test/Makefile.am ++++ b/modules/test/Makefile.am +@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = test*.h test*.c test*~ + + CLEANFILES = + +-if NEED_FERITE_LIB +-libferite = -L${top_builddir}/src -lferite +-endif +- +-LDFLAGS = $(libferite) -L${libdir} @test_LIBS@ + INCLUDES = -I$(top_srcdir)/include -I$(prefix)/include -I. @test_CFLAGS@ + DEFS = @thread_defs@ + +@@ -27,7 +22,7 @@ pkg_LTLIBRARIES = test.la + + test_la_SOURCES = test_core.c test_misc.c test_Test.c test_header.h utility.c utility.h + test_la_LDFLAGS = -no-undefined -module -avoid-version +-test_la_LIBADD = ++test_la_LIBADD = ${top_builddir}/src/libferite.la + + test_core.c: @MODULE_SRC_PREFIX@/test/test.fec + @BUILDER@ -m test @MODULE_SRC_PREFIX@/test/test.fec +diff --git a/modules/thread/Makefile.am b/modules/thread/Makefile.am +index 3d6cfb2..c5438e4 100644 +--- a/modules/thread/Makefile.am ++++ b/modules/thread/Makefile.am +@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = thread*.h thread*.c thread*~ + + CLEANFILES = + +-if NEED_FERITE_LIB +-libferite = -L${top_builddir}/src -lferite +-endif +- +-LDFLAGS = $(libferite) -L${libdir} @thread_LIBS@ + INCLUDES = -I$(top_srcdir)/include -I$(prefix)/include -I. @thread_CFLAGS@ + DEFS = @thread_defs@ + +@@ -27,7 +22,7 @@ pkg_LTLIBRARIES = thread.la + + thread_la_SOURCES = thread_core.c thread_misc.c thread_Thread.c thread_Mutex.c thread_Event.c thread_header.h utility.c + thread_la_LDFLAGS = -no-undefined -module -avoid-version +-thread_la_LIBADD = ++thread_la_LIBADD = ${top_builddir}/src/libferite.la + + thread_core.c: @MODULE_SRC_PREFIX@/thread/thread.fec + @BUILDER@ -m thread @MODULE_SRC_PREFIX@/thread/thread.fec +diff --git a/modules/unix/Makefile.am b/modules/unix/Makefile.am +index 7999784..8fea3e7 100644 +--- a/modules/unix/Makefile.am ++++ b/modules/unix/Makefile.am +@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = unix*.h unix*.c unix*~ + + CLEANFILES = + +-if NEED_FERITE_LIB +-libferite = -L${top_builddir}/src -lferite -L${top_builddir}/modules/stream -lferitestream +-endif +- +-LDFLAGS = $(libferite) -L${libdir} @unix_LIBS@ + INCLUDES = -I$(top_srcdir)/include -I$(prefix)/include -I. @unix_CFLAGS@ + DEFS = @thread_defs@ + +@@ -27,7 +22,7 @@ pkg_LTLIBRARIES = unix.la + + unix_la_SOURCES = unix_core.c unix_misc.c unix_Unix.c unix_Unix_SyslogStream.c unix_Network.c unix_Network_Unix.c unix_Network_Unix_Stream.c unix_header.h + unix_la_LDFLAGS = -no-undefined -module -avoid-version +-unix_la_LIBADD = ++unix_la_LIBADD = ${top_builddir}/modules/stream/libferitestream.la + + unix_core.c: @MODULE_SRC_PREFIX@/unix/unix.fec @MODULE_SRC_PREFIX@/unix/syslog.fec @MODULE_SRC_PREFIX@/unix/unixsocket.fec + @BUILDER@ -m unix @MODULE_SRC_PREFIX@/unix/unix.fec +diff --git a/modules/xml/Makefile.am b/modules/xml/Makefile.am +index 71a88a9..26c7cbb 100644 +--- a/modules/xml/Makefile.am ++++ b/modules/xml/Makefile.am +@@ -7,11 +7,6 @@ MAINTAINERCLEANFILES = xml*.h xml*.c xml*~~ + + CLEANFILES = + +-if NEED_FERITE_LIB +-libferite = -L${top_builddir}/src -lferite +-endif +- +-LDFLAGS = $(libferite) -L${libdir} @xml_LIBS@ + INCLUDES = -I$(top_srcdir)/include -I$(prefix)/include -I. @xml_CFLAGS@ + DEFS = @thread_defs@ + +@@ -27,7 +22,7 @@ pkg_LTLIBRARIES = xml.la + + xml_la_SOURCES = xml_core.c xml_misc.c xml_XML.c xml_XML_SAXParser.c xml_XML_TreeParser.c xml_header.h sax_handlers.c sax_handlers.h tree_handlers.c tree_handlers.h xpath_handlers.c xpath_handlers.h xml_XML_Element.c + xml_la_LDFLAGS = -no-undefined -module -avoid-version +-xml_la_LIBADD = ++xml_la_LIBADD = ${top_builddir}/src/libferite.la @xml_LIBS@ + + xml_core.c: @MODULE_SRC_PREFIX@/xml/xml.fec + @BUILDER@ -m xml @MODULE_SRC_PREFIX@/xml/xml.fec +diff --git a/src/Makefile.am b/src/Makefile.am +index 01c8649..fa2e41e 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -8,8 +8,6 @@ MAINTAINERCLEANFILES = Makefile.in + + CLEANFILES = *~ + +-LDFLAGS = -L${prefix}/lib -lm +- + INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libs/aphex/include -I$(top_srcdir)/libs/triton/include -I${top_srcdir}/include -I${prefix}/include -I$(includedir) -I${top_srcdir}/include/ferite/ @pcre_cflags@ + + DEFS = @debugdefs@ @thread_defs@ @gc_defs@ +@@ -69,6 +67,6 @@ EXTRA_DIST = ferite_parser.y ferite_scanner.l + + libferite_la_LIBADD = $(top_builddir)/libs/triton/src/libtriton.la \ + $(top_builddir)/libs/aphex/src/libaphex.la \ +- -lm @pcre_libs@ @thread_libs@ @gc_libs@ $(LDFLAGS) ++ -lm @pcre_libs@ @thread_libs@ @gc_libs@ + libferite_la_DEPENDENCIES = $(top_builddir)/config.h $(top_builddir)/libs/triton/src/libtriton.la $(top_builddir)/libs/aphex/src/libaphex.la + libferite_la_LDFLAGS = -version-info 1:1:0 -export-dynamic -no-undefined diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest index 13cdef5417f9..84616d9f3bc5 100644 --- a/dev-lang/gnat-gpl/Manifest +++ b/dev-lang/gnat-gpl/Manifest @@ -11,11 +11,15 @@ DIST gcc-7-gpl-2018-src.tar.gz 90302033 BLAKE2B 2f79137e176bff04c4fb17ab86330294 DIST gcc-7.3.0-patches-1.8.tar.bz2 14435 BLAKE2B 3e5c1abad56ccd6e0aa7739cb7cd651ec07ef9bf25be554343f1fa0444f251de41bde5fe6f8bb9e85e3f7a5cf8b2b83515647d93d62f338fa7843581fcaff2f8 SHA512 4d9d76b3d47f1af4f23cae15278d165b22065a3d1512323d1e31b5e0cb47e4654733dc43fa11906a3bd18e827621c9a5ec62b73563f8e5ead663c29f7d0d7345 DIST gcc-8-2019-20190517-18C94-src.tar.gz 95266904 BLAKE2B 8dc1983317517e9d7221ffd3d1c804367c98a7142b3964e6382ee037da2cfebc9e044640549c77905646727e97ba108445b00f36916a65c326e862230608a7dc SHA512 50933d7eab927a2d118e01c5cb85336203544f6fbc3f245a148e952320d6f8452fcd5d355019a144e8af03357d129bb145397506db0a62fddf1f746b6671e7fc DIST gcc-8.3.0-patches-4.tar.bz2 17095 BLAKE2B 449d83371bf5a70020f4caad38d7b8f79bc4b3aeb13b060d28b56506fdd33e15527ab38c41baa3134dc9a25208dadfafab5992e93b2e9719dda420f830e7a8bf SHA512 0dcc5ce887b5c1dd9977ca1b1d8760563edf7ce2d39644f6212397c55c325ee441e1e02aea623bff157d95827db25528791137edc24931a88baad6499d0d15d5 +DIST gcc-9-2020-20200429-19AA7-src.tar.gz 101030094 BLAKE2B 843d7a92f206a08aa6c0fb41b8b93db494eee26c15872b8d8547685c1013559856cd83c5a4139d8ba68aa6737c0270502fd5547664b458cb8fd023f5ce9601e8 SHA512 2eaf999f4ef7f0216b7bab9963ce1cb9dd4be4d4645415183a0e0706ce0f0f119a5437c482d60db16ea152ebcb36186fc7900ec196fc7b8022d4d9cea2e5a631 +DIST gcc-9.3.0-patches-4.tar.bz2 15474 BLAKE2B b06fdfce4402850bb1c6c211ace4c3a07ad2114ffa48eac58d1624124d5d1bddd6d2b4faa18be3291a340272c022bea26dfcaf17929828ceb6474a5211401389 SHA512 54904a4a1c4a784f1a707cbdd9f6f498457e4aa550dc6f3d6eff71ed05a75685e23e6b71c2a614b1dea7e506b9f42fb0109ecfde00ef00373275bbc0409cb7e0 DIST gcc-interface-4.9-gpl-2016-src.tar.gz 339037 BLAKE2B 8218ea3a3e3ddb11febb5f2fbcfad69ec25251d3ed6bf4f9c70dc9b3720cc2fb3310d704db40bd0c749be89b17a2b3766ddae3d6158313480073856057ad4bcf SHA512 507df314d1890c228c19f458bd51197377deaaa2d6082fe1e71b62b683252ee5fba4adfe2386246e14618b1c77288e0dcb5bf501e2daaca249b6299462c2f6bd DIST gcc-interface-6-gpl-2017-src.tar.gz 347016 BLAKE2B 934c6dac491abece9a6868d28fe9d2a6a1109238fe25c9b94abe83dfc22a1085489f0e0384626da0a3abeebe7537c5715df49a7e2d40577c96eb7ac897b84fd8 SHA512 5833303fce5bf812ccbc71f3d3726c0cb877937d75327edb15097c0b7dba58024a52688392906695ab92fb4e5d7a6623671eac9a05d17937dc0270bafcde920a DIST gcc-interface-7-gpl-2018-src.tar.gz 339461 BLAKE2B e6009c0b287b1cd8f055226e6919c12f2ba08f8ef24101608691b05b70a7fb0ca708e2ecd126499fb84a126436d3841f1a13be0b6d3442ef3bd3871391f8e1d5 SHA512 9dc942a39dd983778756be2951b4c66ac3835bf456dc389f80ffbafdacde4ebcb80720ac9eca8fef8734d6d052c061db37c88dba642d85add10940164d120381 DIST gcc-interface-8-2019-20190510-18F59-src.tar.gz 352408 BLAKE2B d08867737fd5a2e8aa87e61efff47757b587baff67810eb9193fe72b68578bcb130f0c1491599588d130663d908b9c6c9a604b1352aeccb79e9dd3bfef4b9f61 SHA512 c4a048725517e674cc43b7b72e3b1bdb4f1cf9d81fe3b84dd177a2fda8c7af11c3135e883072b640c8aa351625f49573727c859064683e8b5f096fdbd3990c38 +DIST gcc-interface-9-2020-20200429-19B10-src.tar.gz 351113 BLAKE2B a786532194a5ac57dd91b5c207aaf4543e99a3305dccf175908bee80cc96d112b9c5531497516ad1edc33e9bcff62374dd473aed93bfb1d0aea13e017473d98e SHA512 445744a745eee5e3a686ec59f7880a3792d4fd30425a38090e40e5cc85379e6f877745d7ea61ffabb42ed177ee90f01e2309dfdd5f060027cfc86ac77fddebba DIST gnat-2019-20190517-18C94-src.tar.gz 8950160 BLAKE2B ce6b8ca0687b3d345db72a8b3216e67ba706cfd7f6ca98f45ec2ae356d9c5b3a42a4b3aac5e89285871157ddaca3aff1b970934de88f8190d84aff060bf1fc4b SHA512 4d57c97fc1f3d5274e0c4ffa536ec056e7c3f1619010affff008cd07a0bfa638d18fee1705a5dd76f12d168baef85677cc34ef40f5e52fd5292ac886c0d4c5ee +DIST gnat-2020-20200429-19B04-src.tar.gz 8485156 BLAKE2B 79683138873b236d832939602f084058723a908e1b709b4bab72e7ae5404336d0ad7b8417eca80e1e1e3a1c260d953ac8326da41429c95729129f88caa2dd3e7 SHA512 bf93a7b877b44422513a4658b29ddd9edcc320d8ac73d3044f4ce868f10be368993e915e710ed45be287e07e9d6c117e51fa73027ed311b04458c9cae1984253 DIST gnat-gpl-2014-x86-linux-bin.tar.gz 233049287 BLAKE2B 2e8bab113f6a319533ec12fdf71c481f72aee227c22bd0cc42a53bd727b323caba1e7b6298053db8b4d3016236b31649b0b255f4ebcbb81a08a69f29f78f13fc SHA512 ac7f53fb4bd71b0e8fbd62abc45de76f7f8f2f405b80e9b60b4b65a6cef6ee98e3b06848e4b752af3c8268237e5a0529cf6145ebc5b33cd6e5cf4928d85f5be2 DIST gnat-gpl-2014-x86_64-linux-bin.tar.gz 236253400 BLAKE2B c1db70db9442ba24688b8e323d5a02e2e9707ba1f02835ea551038d0a09aafede93a224091e5186f2f2a9d0f96144027af2184ee05ca1c19cc997a6cf3902df7 SHA512 5e40a251baac3d0ace78352956ca21a7d294d902d344a9ed7a8d376e900468c283721ebfb773adfedbf4d623ace02536505c0147815a0c1908933ad611ea085e DIST gnat-gpl-2016-src.tar.gz 8857249 BLAKE2B 3ff0fe247990e2a612ac989aa389e9ccae2e29c16177975c327b53ae1471030d0a70e5a2e3af219ad9a3288c241f2d18da349d0650f7fde01d439f4e4720de88 SHA512 4a5cb58ede5b4ae2887e64f0f2e12e0e06470d320796f06d02f7ddd932ff0d3b40e6d3e98a81138fff6906548a55153c2a186ff4a6e3d23b9dbe01ca582da1f8 diff --git a/dev-lang/gnat-gpl/files/gnat-gpl-2020-gentoo.patch b/dev-lang/gnat-gpl/files/gnat-gpl-2020-gentoo.patch new file mode 100644 index 000000000000..878b4f82cf55 --- /dev/null +++ b/dev-lang/gnat-gpl/files/gnat-gpl-2020-gentoo.patch @@ -0,0 +1,41 @@ +--- a/gcc-9-2020-20200429-19AA7-src/gcc/ada/osint.adb 2017-03-10 21:58:02.600710156 +0100 ++++ b/gcc-9-2020-20200429-19AA7-src/gcc/ada/osint.adb 2017-03-10 21:59:38.033983293 +0100 +@@ -2229,14 +2229,11 @@ + for J in Start_Of_Prefix .. Name_Len - Prog'Length + 1 loop + if Name_Buffer (J .. J + Prog'Length - 1) = Prog then + End_Of_Prefix := J - 1; ++ Start_Of_Suffix := J + Prog'Length; + exit; + end if; + end loop; + +- if End_Of_Prefix > 1 then +- Start_Of_Suffix := End_Of_Prefix + Prog'Length + 1; +- end if; +- + -- Create the new program name + + return new String' +--- a/patch/04_all_nossp-on-nostdlib.patch 2021-05-10 21:37:05.733985417 +0200 ++++ b/patch/04_all_nossp-on-nostdlib.patch 2021-05-10 21:38:02.925029050 +0200 +@@ -4,7 +4,7 @@ + --- a/gcc/gcc.c 2017-07-04 09:15:57.740793000 +0200 + +++ b/gcc/gcc.c 2018-03-02 13:58:44.387741114 +0100 + @@ -857,6 +857,12 @@ proper position among the other output f +- #define LINK_GCC_C_SEQUENCE_SPEC "%G %L %G" ++ #define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:%L %G}" + #endif + + +#ifdef ENABLE_DEFAULT_SSP +@@ -19,9 +19,9 @@ + @@ -1131,7 +1148,7 @@ static const char *cc1_options = + %{-version:--version}\ + %{-help=*:--help=%*}\ +- %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %b.s}}}\ ++ %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %w%b.s}}}\ + - %{fsyntax-only:-o %j} %{-param*}\ + + %{fsyntax-only:-o %j} %{-param*} " NO_SSP_SPEC "\ + %{coverage:-fprofile-arcs -ftest-coverage}\ ++ %{fdump-scos:-fpreserve-decisions-generic}\ + %{fprofile-arcs|fprofile-generate*|coverage:\ +- %{!fprofile-update=singel:\ diff --git a/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild new file mode 100644 index 000000000000..1e59a7091c9f --- /dev/null +++ b/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild @@ -0,0 +1,140 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PATCH_GCC_VER=9.3.0 +PATCH_VER="4" + +TOOLCHAIN_GCC_PV=9.3.1 + +REL=9 +MYP=gcc-${REL}-${PV}-20200429-19AA7-src +GNATDIR=gnat-${PV}-20200429-19B04-src +INTFDIR=gcc-interface-${REL}-${PV}-20200429-19B10-src +BTSTRP_X86=gnat-gpl-2014-x86-linux-bin +BTSTRP_AMD64=gnat-gpl-2014-x86_64-linux-bin + +# we provide own tarball below +GCC_TARBALL_SRC_URI=" + https://community.download.adacore.com/v1/649a561ec6de9e476c54b02715b79f7503600ce5?filename=${GNATDIR}.tar.gz + -> ${GNATDIR}.tar.gz + https://community.download.adacore.com/v1/e6b6a3e318e13248456bd37b758435e602b367da?filename=${MYP}.tar.gz + -> ${MYP}.tar.gz + https://community.download.adacore.com/v1/c7a97636b31f3575df85f1eb0965462a353630dd?filename=${INTFDIR}.tar.gz + -> ${INTFDIR}.tar.gz + bootstrap? ( + amd64? ( + http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> + ${BTSTRP_AMD64}.tar.gz + ) + x86? ( + http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> + ${BTSTRP_X86}.tar.gz + ) + )" + +inherit toolchain-funcs toolchain + +DESCRIPTION="GNAT Ada Compiler - GPL version" +HOMEPAGE="http://libre.adacore.com/" + +LICENSE+=" GPL-2 GPL-3" +KEYWORDS="~amd64 ~x86" +IUSE="+ada +bootstrap" +RESTRICT="test" + +RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}" +DEPEND="${RDEPEND} + elibc_glibc? ( >=sys-libs/glibc-2.13 ) + >=sys-devel/binutils-2.20" + +S="${WORKDIR}"/${MYP} +PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )" + +pkg_setup() { + toolchain_pkg_setup + + if use amd64; then + BTSTRP=${BTSTRP_AMD64} + else + BTSTRP=${BTSTRP_X86} + fi + + if use bootstrap; then + GCC="${WORKDIR}"/${BTSTRP}/bin/gcc + else + GCC=${ADA:-$(tc-getCC)} + fi + + gnatbase=$(basename ${GCC}) + gnatpath=$(dirname ${GCC}) + + GNATMAKE=${gnatbase/gcc/gnatmake} + if [[ ${gnatpath} != "." ]] ; then + GNATMAKE="${gnatpath}/${GNATMAKE}" + fi +} + +src_unpack() { + if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then + eerror "You need a gcc compiler that provides the Ada Compiler:" + eerror "1) use gcc-config to select the right compiler or" + eerror "2) set the bootstrap use flag" + die "ada compiler not available" + fi + + toolchain_src_unpack + if use bootstrap; then + rm ${BTSTRP}/libexec/gcc/*/4.7.4/ld || die + fi +} + +src_prepare() { + CC=${GCC} + CXX="${gnatbase/gcc/g++}" + GNATBIND="${gnatbase/gcc/gnatbind}" + GNATLINK="${gnatbase/gcc/gnatlink}" + GNATLS="${gnatbase/gcc/gnatls}" + if [[ ${gnatpath} != "." ]] ; then + CXX="${gnatpath}/${CXX}" + GNATBIND="${gnatpath}/${GNATBIND}" + GNATLINK="${gnatpath}/${GNATLINK}" + GNATLS="${gnatpath}/${GNATLS}" + fi + mkdir bin || die + ln -s $(which ${GCC}) bin/gcc || die + ln -s $(which ${CXX}) bin/g++ || die + ln -s $(which ${GNATMAKE}) bin/gnatmake || die + ln -s $(which ${GNATBIND}) bin/gnatbind || die + ln -s $(which ${GNATLINK}) bin/gnatlink || die + ln -s $(which ${GNATLS}) bin/gnatls || die + + cd .. + mv ${GNATDIR}/src/ada ${MYP}/gcc/ || die + mv ${INTFDIR} ${MYP}/gcc/ada/gcc-interface || die + eapply "${FILESDIR}"/${P}-gentoo.patch + rm patch/32*.patch || die + cd - + sed -i \ + -e 's:$(P) ::g' \ + gcc/ada/gcc-interface/Makefile.in \ + || die "sed failed" + toolchain_src_prepare +} + +src_configure() { + export PATH=${PWD}/bin:${PATH} + downgrade_arch_flags "$(gcc-version)" + toolchain_src_configure +} + +pkg_postinst() { + toolchain_pkg_postinst + einfo "This provide the GNAT compiler with gcc for ada/c/c++ and more" + einfo "The compiler binary is ${CTARGET}-gcc-${TOOLCHAIN_GCC_PV}" + einfo "Even if the c/c++ compilers are using almost the same patched" + einfo "source as the sys-devel/gcc package its use is not extensively" + einfo "tested, and not supported for updating your system, except for ada" + einfo "related packages" +} diff --git a/dev-lang/gnat-gpl/metadata.xml b/dev-lang/gnat-gpl/metadata.xml index d3aadec0e515..d22ee4a1f672 100644 --- a/dev-lang/gnat-gpl/metadata.xml +++ b/dev-lang/gnat-gpl/metadata.xml @@ -10,6 +10,7 @@ Window Toolkit (AWT) peer support on top of GTK+</flag> <flag name="bootstrap">Used to bootstrap gnat-gpl</flag> <flag name="cilk">Support the Cilk Plus language (C/C++ based languages for parallel programming)</flag> + <flag name="d">Enable support for the D programming language</flag> <flag name="fixed-point">Enable fixed-point arithmetic support for MIPS targets in gcc (Warning: significantly increases compile time!) </flag> @@ -21,6 +22,7 @@ <flag name="libssp">Build SSP support into a dedicated library rather than use the code in the C library (DO NOT ENABLE THIS IF YOU DON'T KNOW WHAT IT DOES)</flag> + <flag name="lto">Build using Link Time Optimizations (LTO)</flag> <flag name="nopie">Disable PIE support (NOT FOR GENERAL USE)</flag> <flag name="nossp">Disable SSP support (NOT FOR GENERAL USE)</flag> <flag name="nptl">Enable support for Native POSIX Threads Library, the new threading module (requires linux-2.6 or better usually)</flag> diff --git a/dev-lang/php/php-7.3.28.ebuild b/dev-lang/php/php-7.3.28.ebuild index 9c21520780b2..e95cd1b6fa44 100644 --- a/dev-lang/php/php-7.3.28.ebuild +++ b/dev-lang/php/php-7.3.28.ebuild @@ -19,7 +19,7 @@ LICENSE="PHP-3.01 unicode? ( BSD-2 LGPL-2.1 )" SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" S="${WORKDIR}/${PN}-${MY_PV}" diff --git a/dev-lang/php/php-7.4.19.ebuild b/dev-lang/php/php-7.4.19.ebuild index 4b642a7c7929..83528047016b 100644 --- a/dev-lang/php/php-7.4.19.ebuild +++ b/dev-lang/php/php-7.4.19.ebuild @@ -21,7 +21,7 @@ LICENSE="PHP-3.01 unicode? ( BSD-2 LGPL-2.1 )" SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" S="${WORKDIR}/${PN}-${MY_PV}" diff --git a/dev-libs/apr/apr-1.6.3-r4.ebuild b/dev-libs/apr/apr-1.6.3-r5.ebuild index ce047e457b5f..977176aee5c6 100644 --- a/dev-libs/apr/apr-1.6.3-r4.ebuild +++ b/dev-libs/apr/apr-1.6.3-r5.ebuild @@ -109,6 +109,14 @@ src_configure() { myconf+=( --disable-nonportable-atomics ) ;; esac + else + if use ppc || use sparc; then + # Avoid libapr containing undefined references (underlinked) + # undefined reference to `__sync_val_compare_and_swap_8' + # (May be possible to fix via libatomic linkage in future?) + # bug #740464 + myconf+=( --disable-nonportable-atomics ) + fi fi econf "${myconf[@]}" diff --git a/dev-libs/apr/apr-1.6.5-r1.ebuild b/dev-libs/apr/apr-1.6.5-r2.ebuild index 2e6c0d4627e7..c7f60001d874 100644 --- a/dev-libs/apr/apr-1.6.5-r1.ebuild +++ b/dev-libs/apr/apr-1.6.5-r2.ebuild @@ -108,6 +108,14 @@ src_configure() { myconf+=( --disable-nonportable-atomics ) ;; esac + else + if use ppc || use sparc; then + # Avoid libapr containing undefined references (underlinked) + # undefined reference to `__sync_val_compare_and_swap_8' + # (May be possible to fix via libatomic linkage in future?) + # bug #740464 + myconf+=( --disable-nonportable-atomics ) + fi fi econf "${myconf[@]}" diff --git a/dev-libs/apr/apr-1.7.0-r1.ebuild b/dev-libs/apr/apr-1.7.0-r2.ebuild index ec551265391b..8a231aa627f6 100644 --- a/dev-libs/apr/apr-1.7.0-r1.ebuild +++ b/dev-libs/apr/apr-1.7.0-r2.ebuild @@ -109,6 +109,14 @@ src_configure() { myconf+=( --disable-nonportable-atomics ) ;; esac + else + if use ppc || use sparc; then + # Avoid libapr containing undefined references (underlinked) + # undefined reference to `__sync_val_compare_and_swap_8' + # (May be possible to fix via libatomic linkage in future?) + # bug #740464 + myconf+=( --disable-nonportable-atomics ) + fi fi econf "${myconf[@]}" diff --git a/dev-libs/efl/efl-1.25.1-r11.ebuild b/dev-libs/efl/efl-1.25.1-r11.ebuild index a0b95b1aba75..59f6f41ed9a8 100644 --- a/dev-libs/efl/efl-1.25.1-r11.ebuild +++ b/dev-libs/efl/efl-1.25.1-r11.ebuild @@ -10,7 +10,7 @@ DOCS_DIR="${S}/doc" LUA_REQ_USE="deprecated(+)" LUA_COMPAT=( lua5-{1..3} luajit ) -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{7..10} ) inherit docs lua-single meson python-any-r1 xdg-utils diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest index c5b5b5f9777a..8b1770753ef0 100644 --- a/dev-libs/elfutils/Manifest +++ b/dev-libs/elfutils/Manifest @@ -1 +1,2 @@ DIST elfutils-0.183.tar.bz2 9109254 BLAKE2B 8dd92e7c2df13d51bb51085f6cf762ea1ec7b803dcebf1202a4441ba152ed0e3332b1267276de4650d5ed5c5bed656f72f4c4e9bbf20700be45312a202351574 SHA512 bdafdd738a33cebe4f87849e5e6f1133881e77ef71b27faa0f0234ff80e9674f506957898326c2a55fd8438cbd189f7930597d0b4b9ca6c77921cc0cbd83b6b7 +DIST elfutils-0.184.tar.bz2 9185468 BLAKE2B 8e45aa603a039fb128b96a1ffee4a0137fd1808d7087a2ddc8682a9bec1d65a56e6e6ad1419ac5e9f4490cc258c8ac0ee3e49775aab278efb1889bdceaf842bf SHA512 5920c354edd6b28bb7e713d674bf6f2221e8ee91b90d582de39b1f45446aea1e7e3d4b6671024c391675b5e7530fe952c1320d730bb625c02d4c647ceb938bc8 diff --git a/dev-libs/elfutils/elfutils-0.184.ebuild b/dev-libs/elfutils/elfutils-0.184.ebuild new file mode 100644 index 000000000000..5860b8abf503 --- /dev/null +++ b/dev-libs/elfutils/elfutils-0.184.ebuild @@ -0,0 +1,86 @@ +# Copyright 2003-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic multilib-minimal + +DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)" +HOMEPAGE="http://elfutils.org/" +SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2" + +LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind zstd" + +RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}] + bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] ) + zstd? ( app-arch/zstd:=[static-libs?,${MULTILIB_USEDEP}] ) + !dev-libs/libelf +" +DEPEND="${RDEPEND} + valgrind? ( dev-util/valgrind ) +" +BDEPEND="nls? ( sys-devel/gettext ) + >=sys-devel/flex-2.5.4a + sys-devel/m4 +" +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}"/${PN}-0.175-disable-biarch-test-PR24158.patch + "${FILESDIR}"/${PN}-0.177-disable-large.patch + "${FILESDIR}"/${PN}-0.180-PaX-support.patch +) + +src_prepare() { + default + + if ! use static-libs; then + sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die + fi + # https://sourceware.org/PR23914 + sed -i 's:-Werror::' */Makefile.in || die +} + +src_configure() { + use test && append-flags -g #407135 + + # Symbol aliases are implemented as asm statements. + # Will require porting: https://gcc.gnu.org/PR48200 + filter-flags '-flto*' + + multilib-minimal_src_configure +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf \ + $(use_enable nls) \ + $(use_enable threads thread-safety) \ + $(use_enable valgrind) \ + --disable-debuginfod \ + --disable-libdebuginfod \ + --program-prefix="eu-" \ + --with-zlib \ + $(use_with bzip2 bzlib) \ + $(use_with lzma) \ + $(use_with zstd) +} + +multilib_src_test() { + env LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \ + LC_ALL="C" \ + emake check VERBOSE=1 +} + +multilib_src_install_all() { + einstalldocs + dodoc NOTES + # These build quick, and are needed for most tests, so don't + # disable their building when the USE flag is disabled. + if ! use utils; then + rm -rf "${ED}"/usr/bin || die + fi +} diff --git a/dev-libs/libpcre2/libpcre2-10.36-r1.ebuild b/dev-libs/libpcre2/libpcre2-10.36-r1.ebuild index fef7d58e331a..785bb4d0b8e9 100644 --- a/dev-libs/libpcre2/libpcre2-10.36-r1.ebuild +++ b/dev-libs/libpcre2/libpcre2-10.36-r1.ebuild @@ -25,7 +25,7 @@ fi LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib" REQUIRED_USE="?? ( libedit readline )" diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest index e724f3b88e59..19c84f474b33 100644 --- a/dev-libs/librdkafka/Manifest +++ b/dev-libs/librdkafka/Manifest @@ -4,3 +4,4 @@ DIST librdkafka-1.5.2.tar.gz 2771823 BLAKE2B 61a56d36ba49539eb52f89a0d5b48e0245b DIST librdkafka-1.5.3.tar.gz 2773929 BLAKE2B f23ed9fe04af5d17ee2066366d32701a07f1360d665fd06126008f42e2512434848829eeb2578b35bd7f8fb26663d72c3d2ee22a5b3f33b7029df28f919b2b77 SHA512 24c93658462f933766a026fede5f09e1056ee9532f27b56da64bdde5626ac6f2460bc92b950337a7c3a99d75201a3c3bc5aaa78e888ffd9665e248d62f2c87d9 DIST librdkafka-1.6.0.tar.gz 2909665 BLAKE2B 64b9098531febc0c4b06ce8d6d6cc65b9895cda9b40c9d9fd8b70d5febbb2c851856fb71a355d606074dae9e026277da5e65d0e9ed44a3dfd76b2b55cc142651 SHA512 b58d701f71342eb2c29ecd5aa0514af351b5a5d2282768e034b5995300fcbe2c416d6b4e15dfaddaacf2ec3b7571a320bf5356ade3fe33598d3f05f99f6553ba DIST librdkafka-1.6.1.tar.gz 2920909 BLAKE2B 03d949319b022bc933a9b816660f87498cf9df460f41c65f08e5f6aa22cf5766974f4abe5fe0078054a21df45cc0b46f30383ce83743348fd3124e3b9ffed7f5 SHA512 19f64f275c7cd1c60f026a466c79021549e4acced60e6c01b364944ddb2f4a2c0784ab35031275c406b638a14b958c6f904177e51e2fcb4d058c541d046677dc +DIST librdkafka-1.7.0.tar.gz 2946082 BLAKE2B ea74e2dbd0e25ed998a80a0c964e78993f233c3fec1555dbefe11e0e9a407badcc903fbdef47289c82627a67cfce0d995a2786b90e810d874ccba04ba81fbc67 SHA512 2fb1eb1821d6eb2e3c4346aebd26a96c612f18a055e6861c49231957e8694758bd31aafa45c066280d6b1359e95e5a61927a276dab161356448da0685f5658fa diff --git a/dev-libs/librdkafka/librdkafka-1.7.0.ebuild b/dev-libs/librdkafka/librdkafka-1.7.0.ebuild new file mode 100644 index 000000000000..0057ccda8dd3 --- /dev/null +++ b/dev-libs/librdkafka/librdkafka-1.7.0.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{7..10} ) + +inherit python-any-r1 toolchain-funcs + +DESCRIPTION="Apache Kafka C/C++ client library" +HOMEPAGE="https://github.com/edenhill/librdkafka" + +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="https://github.com/edenhill/${PN}.git" + + inherit git-r3 +else + SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +fi + +LICENSE="BSD-2" + +# subslot = soname version +SLOT="0/1" + +IUSE="lz4 sasl ssl static-libs zstd" + +LIB_DEPEND=" + lz4? ( app-arch/lz4:=[static-libs(+)] ) + sasl? ( dev-libs/cyrus-sasl:=[static-libs(+)] ) + ssl? ( dev-libs/openssl:0=[static-libs(+)] ) + zstd? ( app-arch/zstd:=[static-libs(+)] ) + sys-libs/zlib:=[static-libs(+)] +" + +BDEPEND=" + virtual/pkgconfig + ${PYTHON_DEPS} +" + +RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )" + +DEPEND=" + ${RDEPEND} + static-libs? ( ${LIB_DEPEND} ) +" + +pkg_setup() { + python-any-r1_pkg_setup +} + +src_prepare() { + default + + if [[ ${PV} != "9999" ]]; then + sed -i \ + -e "s/^\(export RDKAFKA_GITVER=\).*/\1\"${PV}@release\"/" \ + tests/run-test.sh || die + fi +} + +src_configure() { + tc-export AR CC CXX LD NM OBJDUMP PKG_CONFIG STRIP + + local myeconf=( + --no-cache + --no-download + --disable-debug-symbols + $(use_enable lz4) + $(use_enable sasl) + $(usex static-libs '--enable-static' '') + $(use_enable ssl) + $(use_enable zstd) + ) + + econf ${myeconf[@]} +} + +src_test() { + # Simulate CI so we do not fail when tests are running longer than expected, + # https://github.com/edenhill/librdkafka/blob/v1.6.1/tests/0062-stats_event.c#L101-L116 + local -x CI=true + + emake -C tests run_local +} + +src_install() { + emake -j1 \ + DESTDIR="${D}" \ + docdir="/usr/share/doc/${PF}" \ + install + + if ! use static-libs; then + find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die + fi +} diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild index b7e66ae652f6..d2650c1bb749 100644 --- a/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild +++ b/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN/-compat}/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="debug examples static-libs" RDEPEND=">=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}] diff --git a/dev-libs/libvoikko/libvoikko-4.3.1.ebuild b/dev-libs/libvoikko/libvoikko-4.3.1.ebuild index 772aa6d83de7..856038cdcd8a 100644 --- a/dev-libs/libvoikko/libvoikko-4.3.1.ebuild +++ b/dev-libs/libvoikko/libvoikko-4.3.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{7..10} ) inherit python-r1 verify-sig diff --git a/dev-libs/voikko-fi/voikko-fi-2.4.ebuild b/dev-libs/voikko-fi/voikko-fi-2.4.ebuild index d469446b332e..b2351309f371 100644 --- a/dev-libs/voikko-fi/voikko-fi-2.4.ebuild +++ b/dev-libs/voikko-fi/voikko-fi-2.4.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{7..10} ) inherit python-any-r1 verify-sig diff --git a/dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.220.0-r1.ebuild b/dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.220.0-r1.ebuild index 314ac3e0eb79..4aad28258c7f 100644 --- a/dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.220.0-r1.ebuild +++ b/dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.220.0-r1.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Wrap OP check callbacks" SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/Class-Method-Modifiers/Class-Method-Modifiers-2.130.0.ebuild b/dev-perl/Class-Method-Modifiers/Class-Method-Modifiers-2.130.0.ebuild index b0d2b8160441..2048e22486aa 100644 --- a/dev-perl/Class-Method-Modifiers/Class-Method-Modifiers-2.130.0.ebuild +++ b/dev-perl/Class-Method-Modifiers/Class-Method-Modifiers-2.130.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="provides Moose-like method modifiers" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~hppa ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" +KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/Crypt-CBC/Crypt-CBC-3.30.0.ebuild b/dev-perl/Crypt-CBC/Crypt-CBC-3.30.0.ebuild index 5f400b2ac90b..db5f457ffe19 100644 --- a/dev-perl/Crypt-CBC/Crypt-CBC-3.30.0.ebuild +++ b/dev-perl/Crypt-CBC/Crypt-CBC-3.30.0.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Encrypt Data with Cipher Block Chaining Mode" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~ia64" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.130.0.ebuild b/dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.130.0.ebuild new file mode 100644 index 000000000000..1fe3f9b8bbb8 --- /dev/null +++ b/dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.130.0.ebuild @@ -0,0 +1,29 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DIST_AUTHOR=AKIYM +DIST_VERSION=0.13 +inherit perl-module + +DESCRIPTION="Guess OpenSSL include path" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=virtual/perl-Exporter-5.570.0 + virtual/perl-File-Spec + dev-libs/openssl:0= +" +DEPEND=" + dev-libs/openssl:0= +" +BDEPEND="${RDEPEND} + >=virtual/perl-ExtUtils-MakeMaker-6.640.0 + test? ( + >=virtual/perl-Test-Simple-0.980.0 + ) +" diff --git a/dev-perl/Crypt-OpenSSL-Guess/Manifest b/dev-perl/Crypt-OpenSSL-Guess/Manifest index e182ca76f5d7..a354956a98c0 100644 --- a/dev-perl/Crypt-OpenSSL-Guess/Manifest +++ b/dev-perl/Crypt-OpenSSL-Guess/Manifest @@ -1 +1,2 @@ DIST Crypt-OpenSSL-Guess-0.11.tar.gz 11346 BLAKE2B f22d09e23e91c36c722dc9800391b67a1f912f8af6a13ec95c9074e65559585c77e72596a6dae17db28e11f8449813777423a60d9af0147819dfcb91ba489152 SHA512 cdae7f20a15d24842cf117bfba4f3bc0ec7d1066251e0480cbadd8f0aa28c9c9573905726fc1333ea9fbbb3769a67dbf28043de8487dcce27dab5d14a0848b09 +DIST Crypt-OpenSSL-Guess-0.13.tar.gz 11832 BLAKE2B 4857fd301eb4348f8afe17b1b7780a404c5c2567323b37c36e1be9e0c545aabc78a27d06e86c4f0c34940a33ff43c78be006ef0365c346488646ced6f4d9939c SHA512 1b3286d536bcb7545be636e33b5ff37bf334fbb7f3a99f4fcb32cf1166b1bc7cc179e9d39af1c7ac537630a75066353a1d7a0ab97816757a444dc0068029da97 diff --git a/dev-perl/Crypt-PBKDF2/Crypt-PBKDF2-0.161.520.ebuild b/dev-perl/Crypt-PBKDF2/Crypt-PBKDF2-0.161.520.ebuild index 4f85eaf5b306..de487528eed4 100644 --- a/dev-perl/Crypt-PBKDF2/Crypt-PBKDF2-0.161.520.ebuild +++ b/dev-perl/Crypt-PBKDF2/Crypt-PBKDF2-0.161.520.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="The PBKDF2 password hashing algorithm" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~ia64" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/Crypt-PasswdMD5/Crypt-PasswdMD5-1.400.0-r1.ebuild b/dev-perl/Crypt-PasswdMD5/Crypt-PasswdMD5-1.400.0-r1.ebuild index a6d037effc71..cde8a6aeef62 100644 --- a/dev-perl/Crypt-PasswdMD5/Crypt-PasswdMD5-1.400.0-r1.ebuild +++ b/dev-perl/Crypt-PasswdMD5/Crypt-PasswdMD5-1.400.0-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 @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Provides interoperable MD5-based crypt() functions" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 sparc x86" IUSE="test" RESTRICT="!test? ( test )" RDEPEND=" diff --git a/dev-perl/Crypt-PasswdMD5/Crypt-PasswdMD5-1.410.0.ebuild b/dev-perl/Crypt-PasswdMD5/Crypt-PasswdMD5-1.410.0.ebuild new file mode 100644 index 000000000000..16a10576fe47 --- /dev/null +++ b/dev-perl/Crypt-PasswdMD5/Crypt-PasswdMD5-1.410.0.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DIST_AUTHOR=RSAVAGE +DIST_VERSION=1.41 +DIST_A_EXT=tgz +inherit perl-module + +DESCRIPTION="Provides interoperable MD5-based crypt() functions" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=virtual/perl-Digest-MD5-2.530.0 +" +BDEPEND=" + ${RDEPEND} + virtual/perl-ExtUtils-MakeMaker + test? ( + >=virtual/perl-Test-Simple-1.1.2 + ) +" diff --git a/dev-perl/Crypt-PasswdMD5/Manifest b/dev-perl/Crypt-PasswdMD5/Manifest index 8e324a6d65ab..64dbaf53d570 100644 --- a/dev-perl/Crypt-PasswdMD5/Manifest +++ b/dev-perl/Crypt-PasswdMD5/Manifest @@ -1 +1,2 @@ DIST Crypt-PasswdMD5-1.40.tgz 6683 BLAKE2B f12458349b2444a944d84a4c4c5df644fcdc0c6ec49f885edff5416ea44587b2bb78106df523ac6711c5f22e9019f3c248f4f6a8e8af03100e2d59b7f2684540 SHA512 c00f76210a9c07ad610b4698b15d142c3859100a13af620919e32bf046ab2febf8ebedafcffa4dde62f7e9af0e9ff137dae623e0bab60380fca003f7b35bfc77 +DIST Crypt-PasswdMD5-1.41.tgz 14275 BLAKE2B 179982aab63463bb3469d219a5304574f5a59b2a2601c48460c75bcc367043fc007571d3c8a8002f8b3c232f9051aae62f4fe8ae8431d580c6093bc9a9c7ccf1 SHA512 eee16e08f5cdca4d5bc2056e39e18bbbeb5e8bcf403fb44eb632a9a09496fc8b34ede4b2feaffacceafef99be390e44ca49767d98c05a62a2208e1c7e7ff5430 diff --git a/dev-perl/Crypt-Primes/Crypt-Primes-0.500.0-r1.ebuild b/dev-perl/Crypt-Primes/Crypt-Primes-0.500.0-r1.ebuild deleted file mode 100644 index 8274c3c481d5..000000000000 --- a/dev-perl/Crypt-Primes/Crypt-Primes-0.500.0-r1.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -MODULE_AUTHOR=VIPUL -MODULE_VERSION=0.50 -inherit perl-module - -DESCRIPTION="Provable Prime Number Generator suitable for Cryptographic Applications" - -SLOT="0" -KEYWORDS="~alpha amd64 ~hppa sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" -IUSE="" - -RDEPEND="dev-perl/Math-Pari - dev-perl/Crypt-Random" -DEPEND="${RDEPEND}" - -SRC_TEST="do" diff --git a/dev-perl/Crypt-Primes/Crypt-Primes-0.500.0-r2.ebuild b/dev-perl/Crypt-Primes/Crypt-Primes-0.500.0-r2.ebuild index 76c556cbca39..917f7463984a 100644 --- a/dev-perl/Crypt-Primes/Crypt-Primes-0.500.0-r2.ebuild +++ b/dev-perl/Crypt-Primes/Crypt-Primes-0.500.0-r2.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Provable Prime Number Generator suitable for Cryptographic Applications" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" +KEYWORDS="~alpha amd64 ~hppa sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" RDEPEND=" >=dev-perl/Math-Pari-2.1.804 diff --git a/dev-perl/Crypt-RC4/Crypt-RC4-2.020.0-r1.ebuild b/dev-perl/Crypt-RC4/Crypt-RC4-2.020.0-r1.ebuild deleted file mode 100644 index 0ac9ba62aa1a..000000000000 --- a/dev-perl/Crypt-RC4/Crypt-RC4-2.020.0-r1.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -MODULE_AUTHOR=SIFUKURT -MODULE_VERSION=2.02 -inherit perl-module - -DESCRIPTION="Implements the RC4 encryption algorithm" - -LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" -IUSE="" - -SRC_TEST="do" diff --git a/dev-perl/Crypt-RC4/Crypt-RC4-2.20.0-r2.ebuild b/dev-perl/Crypt-RC4/Crypt-RC4-2.20.0-r2.ebuild index 9b2d443ad76a..17c6d1fdf255 100644 --- a/dev-perl/Crypt-RC4/Crypt-RC4-2.20.0-r2.ebuild +++ b/dev-perl/Crypt-RC4/Crypt-RC4-2.20.0-r2.ebuild @@ -10,4 +10,4 @@ inherit perl-module DESCRIPTION="Implements the RC4 encryption algorithm" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" diff --git a/dev-perl/Crypt-RIPEMD160/Crypt-RIPEMD160-0.60.0-r1.ebuild b/dev-perl/Crypt-RIPEMD160/Crypt-RIPEMD160-0.60.0-r1.ebuild index 3ca7172fea05..307278cfbc52 100644 --- a/dev-perl/Crypt-RIPEMD160/Crypt-RIPEMD160-0.60.0-r1.ebuild +++ b/dev-perl/Crypt-RIPEMD160/Crypt-RIPEMD160-0.60.0-r1.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Perl extension for the RIPEMD-160 Hash function" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" +KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/Crypt-RIPEMD160/Crypt-RIPEMD160-0.80.0.ebuild b/dev-perl/Crypt-RIPEMD160/Crypt-RIPEMD160-0.80.0.ebuild new file mode 100644 index 000000000000..1f2c97ca4e1a --- /dev/null +++ b/dev-perl/Crypt-RIPEMD160/Crypt-RIPEMD160-0.80.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DIST_AUTHOR=TODDR +DIST_VERSION=0.08 +inherit perl-module + +DESCRIPTION="Perl extension for the RIPEMD-160 Hash function" + +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND=" + virtual/perl-ExtUtils-MakeMaker + test? ( virtual/perl-Test-Simple ) +" + +src_compile() { + mymake=( + "OPTIMIZE=${CFLAGS}" + ) + perl-module_src_compile +} diff --git a/dev-perl/Crypt-RIPEMD160/Manifest b/dev-perl/Crypt-RIPEMD160/Manifest index 636428fc6045..cd919658da75 100644 --- a/dev-perl/Crypt-RIPEMD160/Manifest +++ b/dev-perl/Crypt-RIPEMD160/Manifest @@ -1 +1,2 @@ DIST Crypt-RIPEMD160-0.06.tar.gz 58766 BLAKE2B 91d59a068be8a37243f21610a0ca490affcbe3d7b49081710e60bd46036ed68db38b7c1731172b6e8ef9c916b87e4c26099517c3a4dc2d3c1af9e65a8a14f075 SHA512 5c009f8e3a9e42d5fb172f74eb97ab9b7e2912b23d62556f999d6d4f244ff972f7925d357cc3dd5d1e9e708a8350f8f131f8875aae076927c6bfb506bafcc755 +DIST Crypt-RIPEMD160-0.08.tar.gz 60041 BLAKE2B c237fc8ff1ddb88eaa6fb93be6efc7ba4a45366e113651aab9570e836ca514db82d8a1392143d5fb04370fb5a01b6b2cb5ae6762784566ce85eb326167a1d972 SHA512 435e0239c67aebdeaaa328c10bb6d12934b72c436e4eb21f177281ecd77204fdf300c0a7f38ee59bc1ca61b08cf632989ab513c4ee51c78415c722329ab9486c diff --git a/dev-perl/Crypt-RSA/Crypt-RSA-1.990.0-r2.ebuild b/dev-perl/Crypt-RSA/Crypt-RSA-1.990.0-r2.ebuild index 22791806cbe1..978022b2a4e7 100644 --- a/dev-perl/Crypt-RSA/Crypt-RSA-1.990.0-r2.ebuild +++ b/dev-perl/Crypt-RSA/Crypt-RSA-1.990.0-r2.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 @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="RSA public-key cryptosystem" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~x86 ~x86-solaris" +KEYWORDS="~alpha amd64 ~hppa x86 ~x86-solaris" RDEPEND=" >=dev-perl/Class-Loader-2.0.0 diff --git a/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.150.0.ebuild b/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.150.0.ebuild index 9c3e767fe3a5..fa4634b8ce2d 100644 --- a/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.150.0.ebuild +++ b/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.150.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Crypt::CBC compliant Rijndael encryption module" LICENSE="LGPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.160.0.ebuild b/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.160.0.ebuild new file mode 100644 index 000000000000..fbd9bf32d97c --- /dev/null +++ b/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.160.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DIST_AUTHOR=LEONT +DIST_VERSION=1.16 +inherit perl-module + +DESCRIPTION="Crypt::CBC compliant Rijndael encryption module" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND=" + virtual/perl-ExtUtils-MakeMaker + test? ( + virtual/perl-Test-Simple + ) +" + +src_compile() { + mymake=( + "OPTIMIZE=${CFLAGS}" + ) + perl-module_src_compile +} diff --git a/dev-perl/Crypt-Rijndael/Manifest b/dev-perl/Crypt-Rijndael/Manifest index 08310d0bdb6f..e723cce50624 100644 --- a/dev-perl/Crypt-Rijndael/Manifest +++ b/dev-perl/Crypt-Rijndael/Manifest @@ -1,2 +1,3 @@ DIST Crypt-Rijndael-1.14.tar.gz 71759 BLAKE2B 2d3d9d4126fe8d6bb22fa9bd86fd05c186459453b605176f403e89c23f51d671ac26eac7ae9dc0d3bff065e1e95684731e783a4bf192781ca8f71c59399958d6 SHA512 a3c419142954dc2b430422f532b5349d0fb902a704335ba0708504a6a4a5d617835409916b76bc1b8dc8669c0f03356dab3ef90e5f7ea530b5fcc70bd1bf4eff DIST Crypt-Rijndael-1.15.tar.gz 71407 BLAKE2B 8f2ca89b80ea68b9874092941520e566c7ea43eaf52c15acfd1f0a03e9d4efbd0c83259f36abccb77fa38b41f74acd1fa79d1d231e970f80545126fbb86ebc41 SHA512 ea4dbbd731483132274752bdb78a7e7cc012bc18d9f88c073f23e6903d05c1cad1e83ad00cf7f593c15e543c5c53e7a68e5fdd064a9c260c444105d47f468308 +DIST Crypt-Rijndael-1.16.tar.gz 71818 BLAKE2B 73cf5b0efb7822e1427acfef4b9134f8a693e9e8e9e7efe51a34a48fc202200616534cefce7018ee3c846f8a6f96525d79bad88b3bf2be74ab14ae31f6484d46 SHA512 e33cb691cd62d9b98f26c8f0d1365437f8a77154a4100be4969a88ad094074fb2f855fcb11541dc63743f861ef0c45944831b7f887df9bbb0b4ec36d6e0fd66d diff --git a/dev-perl/CryptX/CryptX-0.72.0.ebuild b/dev-perl/CryptX/CryptX-0.72.0.ebuild index 63d1cc48caa9..25eba736b308 100644 --- a/dev-perl/CryptX/CryptX-0.72.0.ebuild +++ b/dev-perl/CryptX/CryptX-0.72.0.ebuild @@ -9,7 +9,7 @@ inherit perl-module DESCRIPTION="Self-contained crypto toolkit" LICENSE="|| ( Artistic GPL-1+ ) public-domain" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~hppa ~ia64 ~x86" IUSE="test minimal" RESTRICT="!test? ( test )" diff --git a/dev-perl/Digest-SHA3/Digest-SHA3-1.40.0.ebuild b/dev-perl/Digest-SHA3/Digest-SHA3-1.40.0.ebuild index c433160f733b..6bfe5629641e 100644 --- a/dev-perl/Digest-SHA3/Digest-SHA3-1.40.0.ebuild +++ b/dev-perl/Digest-SHA3/Digest-SHA3-1.40.0.ebuild @@ -9,4 +9,4 @@ inherit perl-module DESCRIPTION="Perl extension for SHA-3" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~hppa ~ia64" diff --git a/dev-perl/Hash-FieldHash/Hash-FieldHash-0.150.0-r1.ebuild b/dev-perl/Hash-FieldHash/Hash-FieldHash-0.150.0-r1.ebuild index 62622f583801..c4f1daf6f15c 100644 --- a/dev-perl/Hash-FieldHash/Hash-FieldHash-0.150.0-r1.ebuild +++ b/dev-perl/Hash-FieldHash/Hash-FieldHash-0.150.0-r1.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Lightweight field hash for inside-out objects" SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/Lexical-SealRequireHints/Lexical-SealRequireHints-0.11.0.ebuild b/dev-perl/Lexical-SealRequireHints/Lexical-SealRequireHints-0.11.0.ebuild index 6aeaee99aebf..f62fc49fecc9 100644 --- a/dev-perl/Lexical-SealRequireHints/Lexical-SealRequireHints-0.11.0.ebuild +++ b/dev-perl/Lexical-SealRequireHints/Lexical-SealRequireHints-0.11.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Prevent leakage of lexical hints" SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/Math-Int128/Math-Int128-0.220.0.ebuild b/dev-perl/Math-Int128/Math-Int128-0.220.0.ebuild index 693b54d44fd5..887c7979dd92 100644 --- a/dev-perl/Math-Int128/Math-Int128-0.220.0.ebuild +++ b/dev-perl/Math-Int128/Math-Int128-0.220.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Manipulate 128 bits integers in Perl" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ia64 ~x86" IUSE="test" RESTRICT="!test? ( test )" RDEPEND=" diff --git a/dev-perl/Math-Int64/Math-Int64-0.540.0.ebuild b/dev-perl/Math-Int64/Math-Int64-0.540.0.ebuild index f823edafd09e..e741197a8b6e 100644 --- a/dev-perl/Math-Int64/Math-Int64-0.540.0.ebuild +++ b/dev-perl/Math-Int64/Math-Int64-0.540.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Manipulate 64 bits integers in Perl" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~hppa ~ia64 ~x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/Moo/Moo-2.3.3.ebuild b/dev-perl/Moo/Moo-2.3.3.ebuild index e4007258ab7e..924333e665a8 100644 --- a/dev-perl/Moo/Moo-2.3.3.ebuild +++ b/dev-perl/Moo/Moo-2.3.3.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Minimalist Object Orientation (with Moose compatiblity)" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~hppa ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" +KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/Regexp-Util/Regexp-Util-0.3.0.ebuild b/dev-perl/Regexp-Util/Regexp-Util-0.3.0.ebuild index 31df432c9dfb..644ab1e7ceaf 100644 --- a/dev-perl/Regexp-Util/Regexp-Util-0.3.0.ebuild +++ b/dev-perl/Regexp-Util/Regexp-Util-0.3.0.ebuild @@ -9,7 +9,7 @@ inherit perl-module DESCRIPTION="General purpose utilities for working with Regular Expressions" SLOT="0" -KEYWORDS="amd64 ~hppa ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~hppa ~ia64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/Tk-JPEG-Lite/Manifest b/dev-perl/Tk-JPEG-Lite/Manifest index 8ff9933cc0fb..4df052a75ca9 100644 --- a/dev-perl/Tk-JPEG-Lite/Manifest +++ b/dev-perl/Tk-JPEG-Lite/Manifest @@ -1,2 +1 @@ -DIST Tk-JPEG-Lite-2.01403.tar.gz 19328 BLAKE2B c5b67db84cbc6fa74fb586eadcbf84909d62dd7bc99ea04986e3601c0a51cb5878af1e84452e6a297eb056fcd9fcf7f3bfc00ef091e634cbd814b37ca05e20a1 SHA512 1c90cadbaff4a9ba39eec7e83d82ccba262d320dfe82968a7ed8b9c2eaec76d24f10177fd70425f2072b498fdd0ef19720af737fff667187a7be5712977c42c5 DIST Tk-JPEG-Lite-2.015.tar.gz 21406 BLAKE2B a9499ef3a8fdec43d184e385885ca18926f70f972b47bc3871b15bf7660e22cd8477ee04c9eaa66548cf435055d283428134523cfd67c33f6bfb4a3e8667635d SHA512 959586f7cdfa516fc05eac352d626367fc5cf37f452713afea1d87e017f427c15c425a722e66db66d90dc98f942831e5437a4c8a2aac3179824105481a28c1a8 diff --git a/dev-perl/Tk-JPEG-Lite/Tk-JPEG-Lite-2.14.30-r1.ebuild b/dev-perl/Tk-JPEG-Lite/Tk-JPEG-Lite-2.14.30-r1.ebuild deleted file mode 100644 index fe4ff06d75f8..000000000000 --- a/dev-perl/Tk-JPEG-Lite/Tk-JPEG-Lite-2.14.30-r1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -MODULE_AUTHOR=SREZIC -MODULE_VERSION=2.01403 -inherit perl-module - -DESCRIPTION="lite JPEG loader for Tk::Photo" - -SLOT="0" -KEYWORDS="amd64 ~ia64 ~ppc sparc x86" -IUSE="" - -RDEPEND="virtual/jpeg - dev-perl/Tk" -DEPEND="${RDEPEND}" - -src_prepare() { - perl-module_src_prepare - sed -i -e 's:tkjpeg:tkjpeg-lite:' Makefile.PL tkjpeg MANIFEST || die - mv tkjpeg tkjpeg-lite || die -} - -pkg_postinst() { - elog - elog "To avoid collisions, the command line program has been renamed from tkjpeg to tkjpeg-lite" - elog -} diff --git a/dev-perl/Tk/Manifest b/dev-perl/Tk/Manifest index 8077e15dcf9d..f22c4ec21df4 100644 --- a/dev-perl/Tk/Manifest +++ b/dev-perl/Tk/Manifest @@ -1,2 +1,3 @@ DIST Tk-804.033.tar.gz 6924238 BLAKE2B 72ea4ca69a7602e3c7386254995983e6896c5d722f06e552b423df2dc9d5fc0a70bed6408cc1b797e803560b00a17223503a2807b847360721104a3edc324df2 SHA512 ea56be8246123bbc570d86a7d4f1610349cced91ad92ab740baca4c280822aac2e3acab6334bef60b10a70d5840f331fa40b507aba47a7929f44960df95f2aee DIST Tk-804.034.tar.gz 6937691 BLAKE2B ee676f82bc805ecb193c2fe999c3d451281a16a4bcd8072f0687859e6634d16cd1db40cc252b1540a3f7b883b4ca585d2b5ef1fa48f12cacffd72ca84693bdc4 SHA512 8d04fd902db72f80f749256453703e40c94fd009c6a196c608dd3bde4eeb99f974a154d5f52b28baa9e67f75529f0180619989c16cae28a9417b647908de04b6 +DIST Tk-804.036.tar.gz 7024993 BLAKE2B 0ec47bc7f24af7ea5cf3fb539b2636e978a22707d591cea0a5c1ba9182a70afcf749a9fbc03fd2bf7e969ddb1a57572bd6e1b7b68210ad38b1804c877cb771ee SHA512 7d8b82127a5fdbb2f0387f541af8844a09f1230f377b92d511ecb12e81bfd5ef56d4fe925cac064a798a96a003bb8465b6df37cff18a960f3631bb3a214cd812 diff --git a/dev-perl/Tk/Tk-804.36.0.ebuild b/dev-perl/Tk/Tk-804.36.0.ebuild new file mode 100644 index 000000000000..dad56628ee87 --- /dev/null +++ b/dev-perl/Tk/Tk-804.36.0.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DIST_AUTHOR=SREZIC +DIST_VERSION=804.036 +DIST_EXAMPLES=("examples/*") +inherit multilib perl-module virtualx + +DESCRIPTION="A Perl Module for Tk" + +LICENSE+=" tcltk BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" +IUSE="" + +DEPEND=" + media-libs/freetype + >=media-libs/libpng-1.4:0 + virtual/jpeg + x11-libs/libX11 + x11-libs/libXft" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-804.034-xorg.patch +) + +PERL_RM_FILES=( "t/pod.t" ) + +src_prepare() { + MAKEOPTS+=" -j1" #333049 + myconf=( X11ROOT=${EPREFIX}/usr XFT=1 -I${EPREFIX}/usr/include/ -l${EPREFIX}/usr/$(get_libdir) ) + mydoc="ToDo VERSIONS" + + perl-module_src_prepare + # fix detection logic for Prefix, bug #385621 + sed -i -e "s:/usr:${EPREFIX}/usr:g" myConfig || die + # having this around breaks with perl-module and a case-IN-sensitive fs + rm build_ptk || die + + # Remove all bundled libs, fixes #488194 + local BUNDLED="PNG/libpng \ + PNG/zlib \ + JPEG/jpeg" + + # Move files required for tests temporarily + + mkdir -p "${T}/stash" || die "can't create temporary stash" + mv "${S}/JPEG/jpeg/testimg.jpg" "${T}/stash/testimg.jpg" || die "can't move testimg.jpg" + + for dir in ${BUNDLED}; do + einfo "Removing bundled: ${dir}" + rm -r "${S}/${dir}" || die "Can't remove bundle" + # Makefile.PL can copy files to ${S}/${dir}, so recreate them back. + mkdir -p "${S}/${dir}" || die "Can't restore bundled dir" + sed -i "\#^${dir}#d" "${S}"/MANIFEST || die 'Can not remove bundled libs from MANIFEST' + done + + # Restore test files + mv "${T}/stash/testimg.jpg" "${S}/JPEG/jpeg/testimg.jpg" || die "can't restore testimg.jpg" +} + +src_test() { + virtx perl-module_src_test +} diff --git a/dev-perl/Type-Tie/Type-Tie-0.9.0.ebuild b/dev-perl/Type-Tie/Type-Tie-0.9.0.ebuild index cdfc4505ce42..31e83edd13c1 100644 --- a/dev-perl/Type-Tie/Type-Tie-0.9.0.ebuild +++ b/dev-perl/Type-Tie/Type-Tie-0.9.0.ebuild @@ -9,7 +9,7 @@ inherit perl-module DESCRIPTION="Tie a variable to a type constraint" SLOT="0" -KEYWORDS="amd64 ~hppa ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" +KEYWORDS="amd64 ~hppa ~ia64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" IUSE="test minimal" RESTRICT="!test? ( test )" diff --git a/dev-perl/Type-Tiny-XS/Type-Tiny-XS-0.12.0.ebuild b/dev-perl/Type-Tiny-XS/Type-Tiny-XS-0.12.0.ebuild index 6601b7695f2d..ffec92f0ed1a 100644 --- a/dev-perl/Type-Tiny-XS/Type-Tiny-XS-0.12.0.ebuild +++ b/dev-perl/Type-Tiny-XS/Type-Tiny-XS-0.12.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="provides an XS boost for some of Type::Tiny's built-in type constraints" SLOT="0" -KEYWORDS="amd64 ~hppa ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" +KEYWORDS="amd64 ~hppa ~ia64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" IUSE="test minimal" RESTRICT="!test? ( test )" diff --git a/dev-perl/Type-Tiny/Type-Tiny-1.2.1.ebuild b/dev-perl/Type-Tiny/Type-Tiny-1.2.1.ebuild index 9a7724a7c55a..aa3c8a332986 100644 --- a/dev-perl/Type-Tiny/Type-Tiny-1.2.1.ebuild +++ b/dev-perl/Type-Tiny/Type-Tiny-1.2.1.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="tiny, yet Moo(se)-compatible type constraint" SLOT="0" -KEYWORDS="amd64 ~hppa ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" +KEYWORDS="amd64 ~hppa ~ia64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" IUSE="test minimal" RESTRICT="!test? ( test )" diff --git a/dev-perl/XML-Compile-WSDL11/XML-Compile-WSDL11-3.60.0-r1.ebuild b/dev-perl/XML-Compile-WSDL11/XML-Compile-WSDL11-3.60.0-r1.ebuild index f4eb235aee98..66834bb0d557 100644 --- a/dev-perl/XML-Compile-WSDL11/XML-Compile-WSDL11-3.60.0-r1.ebuild +++ b/dev-perl/XML-Compile-WSDL11/XML-Compile-WSDL11-3.60.0-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DIST_AUTHOR=MARKOV DIST_VERSION=3.06 @@ -20,9 +20,12 @@ RDEPEND=" >=dev-perl/XML-Compile-Cache-1.30.0 >=dev-perl/XML-Compile-SOAP-3.160.0 " -DEPEND="${RDEPEND} + +# bug 774777 +BEPEND="${RDEPEND} virtual/perl-ExtUtils-MakeMaker test? ( + dev-perl/Test-Deep dev-perl/XML-Compile-Tester >=virtual/perl-Test-Simple-0.540.0 ) diff --git a/dev-perl/bareword-filehandles/bareword-filehandles-0.7.0-r1.ebuild b/dev-perl/bareword-filehandles/bareword-filehandles-0.7.0-r1.ebuild index 6f197d9d616b..10d25239a1ee 100644 --- a/dev-perl/bareword-filehandles/bareword-filehandles-0.7.0-r1.ebuild +++ b/dev-perl/bareword-filehandles/bareword-filehandles-0.7.0-r1.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Disables bareword filehandles" SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/indirect/indirect-0.370.0.ebuild b/dev-perl/indirect/indirect-0.370.0.ebuild index 4fa7c080890a..8a3d74e4adcc 100644 --- a/dev-perl/indirect/indirect-0.370.0.ebuild +++ b/dev-perl/indirect/indirect-0.370.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Lexically warn about using the indirect method call syntax" SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/multidimensional/multidimensional-0.13.0.ebuild b/dev-perl/multidimensional/multidimensional-0.13.0.ebuild index 1b2399f858b2..8ddc9cb0f566 100644 --- a/dev-perl/multidimensional/multidimensional-0.13.0.ebuild +++ b/dev-perl/multidimensional/multidimensional-0.13.0.ebuild @@ -9,7 +9,7 @@ inherit perl-module DESCRIPTION="disables multidimensional array emulation" SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-perl/strictures/strictures-2.0.3.ebuild b/dev-perl/strictures/strictures-2.0.3.ebuild index 51bf6a6c5e32..25c20c73d6f6 100644 --- a/dev-perl/strictures/strictures-2.0.3.ebuild +++ b/dev-perl/strictures/strictures-2.0.3.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Turn on strict and make most warnings fatal" SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test minimal" RESTRICT="!test? ( test )" diff --git a/dev-php/PEAR-Net_LDAP3/Manifest b/dev-php/PEAR-Net_LDAP3/Manifest deleted file mode 100644 index 7e44f3943d0a..000000000000 --- a/dev-php/PEAR-Net_LDAP3/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST PEAR-Net_LDAP3-1.0.5_pre20160405.tar.gz 37059 BLAKE2B bf73ff426b7260e65fe467643b238c4e7cfdb4409728b74e09820ade8b79d5ca75187952f2f945f941956bb372871015f9cddfd0ce2cfb892191f81615bc7ea8 SHA512 c24e3af5b8ae03ff598f05e64419ff23b6efe51f4e56a15492cd0f41b9fae815199057f63b12212f2d3707bd14cdbda75b03e6155d755bd6408739f987ccf75d diff --git a/dev-php/PEAR-Net_LDAP3/PEAR-Net_LDAP3-1.0.5_pre20160405.ebuild b/dev-php/PEAR-Net_LDAP3/PEAR-Net_LDAP3-1.0.5_pre20160405.ebuild deleted file mode 100644 index f420f5da0320..000000000000 --- a/dev-php/PEAR-Net_LDAP3/PEAR-Net_LDAP3-1.0.5_pre20160405.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="PEAR:Net_LDAP2 successor, provides functionality for accessing LDAP" -HOMEPAGE="https://gitlab.com/roundcube/net_ldap3" -SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 arm ~hppa ppc ppc64 sparc x86" - -RDEPEND=" - dev-lang/php:*[ldap] - dev-php/PEAR-Net_LDAP2 -" - -S="${WORKDIR}" - -src_install() { - insinto "/usr/share/php" - doins -r lib/* -} diff --git a/dev-python/aesara/aesara-2.0.7.ebuild b/dev-python/aesara/aesara-2.0.7.ebuild index ddca7befcd2d..610a9a36bd3c 100644 --- a/dev-python/aesara/aesara-2.0.7.ebuild +++ b/dev-python/aesara/aesara-2.0.7.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 x86" RDEPEND=" dev-python/filelock[${PYTHON_USEDEP}] diff --git a/dev-python/bcrypt/bcrypt-3.2.0.ebuild b/dev-python/bcrypt/bcrypt-3.2.0.ebuild index e5b8f95aa9f1..e8803e782e6f 100644 --- a/dev-python/bcrypt/bcrypt-3.2.0.ebuild +++ b/dev-python/bcrypt/bcrypt-3.2.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} pypy3 ) +PYTHON_COMPAT=( python3_{7..10} pypy3 ) inherit distutils-r1 diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest index eeaf416022ae..587f9859e691 100644 --- a/dev-python/boto3/Manifest +++ b/dev-python/boto3/Manifest @@ -5,3 +5,4 @@ DIST boto3-1.17.65.tar.gz 367905 BLAKE2B d6aa552a8f5a40613577dcb4d43de185662799f DIST boto3-1.17.67.tar.gz 368242 BLAKE2B 72e612816c45d49c74430d82f4ede59f6b6e7c128d5cb60b8f7d0f07808776b2a1b7656fa8acdf1b8c0d18b4b0a33479aeeebb57355b07ea2e9b6970f84bc4e0 SHA512 a80ea576a60c21f67f43a556ebead8caffcfd18fb9e777693375f591c5e842bfefff86d0d15252057b7ec1ef5cc54b66019d023880a30c88bc8bce012c9b063d DIST boto3-1.17.68.tar.gz 368708 BLAKE2B 4ed78bae6e8c9ee6e8f1a5a4009f89b1c5efac1ddfa8189a6ec76f1ba47b8113dd479ed935e1d6f4631fcd1e40659398a5189bab77b15e1efe5acf706871b90f SHA512 c8a4a78da518530b3e47c1f3e37f51a61070f9b626b29ee4b1a990bfb2dfce49332add6674a0ec8b156c50e922736a500f2b265cf9ba286000aca55a272a7257 DIST boto3-1.17.69.tar.gz 369006 BLAKE2B 6ad2e9ccb71872c5936f63b786b4b7addd5ff6ff9ccc9b8a65361006ae77861175692fd8a7d4075cf170f92aac4c0f3072a598a99191356909cd95122c34d3ba SHA512 7dfe8ceb621a63ac3e2c2d0852d8ba380200cd91f9f548109c8c5f6b0704a5c56acb645cdec6b7974bb30402a5832d001f5cc9e8d30f940560a06f88407c5385 +DIST boto3-1.17.70.tar.gz 369851 BLAKE2B 31416aed68f340842962dca12f77e169f87f2f2a63fa5189c298678d0672f1edf349e0884856624faa971dd2e1c248e320c92dc8189fc63612cce24680971e5c SHA512 fa0bbcdc9027f09007780f75d3a41aef7656c934bc10f710f5787fd7cd7a7124475437e62e7d507e24f773668102a75c4b3b5cfffa5d2834f75fa930894ce227 diff --git a/dev-python/boto3/boto3-1.17.70.ebuild b/dev-python/boto3/boto3-1.17.70.ebuild new file mode 100644 index 000000000000..74b9170a9119 --- /dev/null +++ b/dev-python/boto3/boto3-1.17.70.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..9} ) +DISTUTILS_USE_SETUPTOOLS=bdepend +inherit distutils-r1 + +DESCRIPTION="The AWS SDK for Python" +HOMEPAGE="https://github.com/boto/boto3" +LICENSE="Apache-2.0" +SLOT="0" + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/boto/boto3" + inherit git-r3 + BOTOCORE_PV=${PV} +else + SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" + + # botocore is x.(y+3).z + BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)" +fi + +RDEPEND=" + >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] + >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}] + >=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/mock[${PYTHON_USEDEP}] + ) +" + +distutils_enable_sphinx docs/source \ + 'dev-python/guzzle_sphinx_theme' +distutils_enable_tests nose + +python_prepare_all() { + # don't lock versions to narrow ranges + sed -e '/botocore/ d' \ + -e '/jmespath/ d' \ + -e '/s3transfer/ d' \ + -i setup.py || die + + # prevent an infinite loop + rm tests/functional/docs/test_smoke.py || die + + distutils-r1_python_prepare_all +} + +python_test() { + nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}" +} diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest index 61bd28909614..4457861ca1e7 100644 --- a/dev-python/botocore/Manifest +++ b/dev-python/botocore/Manifest @@ -5,3 +5,4 @@ DIST botocore-1.20.65.tar.gz 7689179 BLAKE2B 4f831519c785747b48351b9820fe00efb39 DIST botocore-1.20.67.tar.gz 7691087 BLAKE2B b56cb7e80179b7c5c2b4daa27907870c075b0cc5b0c14da1d96583701df6d764f0e80cff7973f501263a4edd4e70e4adb613cbe7fa05d7855602db508b509539 SHA512 d0feea0042ef5bbe1fc76ca107cb2450bdf564d82542c483f3b484aa3e32986d649bea9e7e65ea7a36e23582c73c7b341bdb1b07722f09b67334b97ca423999c DIST botocore-1.20.68.tar.gz 7692876 BLAKE2B a5de44db992688a7ceff14e2663e21f370811871d87286215d04db9d0ba9649c67c047b6ec290967eddcdc8cc6fd12bbe9c99589fea183ec2b2036dc69f4d7e6 SHA512 f3de8f5cb621174dc0ed1b8c8d4cbbc3cee56f0b0f4363767cfc68a879fc6e837225e82538640736687efa4340d62ff3d1923abc315f914b0a9189f775c65b6b DIST botocore-1.20.69.tar.gz 7695769 BLAKE2B 994e5415c278a0c021deb1749c59ee5c654c7212cc2a1961fb2c528b7f5aea0a4d3f70c88a72489410cda935c8498cb3c4b1ec4830b3150ee043eb3429174781 SHA512 dbb0e77484a545489b54a1f71c78d2cf7d95b7f3a4f4ec54a9c07d7af354e9037d6eaa3100cf6a8e89d778bb0ed19f9475d68dceee98666bd69a4b05662c5939 +DIST botocore-1.20.70.tar.gz 7700136 BLAKE2B ab7ea88763dd4637754a5d9eb955e0947efd9c5fa87856276056d6eaac341f57d5edd43ca830dd35c1283c6f41de43be2f9b06e8f328a8900cde41ec5953bf9d SHA512 d992b88df31a77b153fd3110119d1523587e98d56e4b80ac14d0c5351d76b3e4c188295fbbeafcd8efd3f414a1c0af0d78f21555b2d3285d6f8e88eefab282dc diff --git a/dev-python/botocore/botocore-1.20.70.ebuild b/dev-python/botocore/botocore-1.20.70.ebuild new file mode 100644 index 000000000000..4e5d698e619b --- /dev/null +++ b/dev-python/botocore/botocore-1.20.70.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..9} ) + +inherit distutils-r1 + +DESCRIPTION="Low-level, data-driven core of boto 3" +HOMEPAGE="https://github.com/boto/botocore" +LICENSE="Apache-2.0" +SLOT="0" + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/boto/botocore" + inherit git-r3 +else + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" +fi + +RDEPEND=" + dev-python/six[${PYTHON_USEDEP}] + dev-python/jmespath[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + >=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/mock[${PYTHON_USEDEP}] + dev-python/jsonschema[${PYTHON_USEDEP}] + ) +" + +PATCHES=( + "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch" +) + +distutils_enable_sphinx docs/source \ + 'dev-python/guzzle_sphinx_theme' +distutils_enable_tests nose + +src_prepare() { + # unpin deps + sed -i -e "s:>=.*':':" setup.py || die + # very unstable + sed -i -e 's:test_stress_test_token_bucket:_&:' \ + tests/functional/retries/test_bucket.py || die + distutils-r1_src_prepare +} + +python_test() { + # note: suites need to be run separately as one of the unit tests + # seems to be leaking mocks and breaking a few functional tests + nosetests -v tests/unit || + die "unit tests failed under ${EPYTHON}" + nosetests -v tests/functional || + die "functional tests failed under ${EPYTHON}" +} diff --git a/dev-python/cjkwrap/cjkwrap-2.2-r1.ebuild b/dev-python/cjkwrap/cjkwrap-2.2-r1.ebuild index dd0f3cdb1863..8673743ef0dc 100644 --- a/dev-python/cjkwrap/cjkwrap-2.2-r1.ebuild +++ b/dev-python/cjkwrap/cjkwrap-2.2-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{7..10} ) inherit distutils-r1 DESCRIPTION="A library for wrapping and filling UTF-8 CJK text" diff --git a/dev-python/configargparse/Manifest b/dev-python/configargparse/Manifest index 71da88c8a697..3d51f3ffb426 100644 --- a/dev-python/configargparse/Manifest +++ b/dev-python/configargparse/Manifest @@ -1 +1,2 @@ +DIST ConfigArgParse-1.4.1.gh.tar.gz 30343 BLAKE2B 8aaed3b0e85b4006c04e7910c6f7ae2c2a07d586ade777eedf078afeea4561a4504614484316afd9d234b2871c0cc45ef47f30254797f9df260373309cf67927 SHA512 304d5981c5685188edb22a63966d25a8943e4c443f2aefc323492f141885f50657e9f9200514df65683f1e13e64173d4def80cdbebcff941c3ee66ff4af0cbd4 DIST ConfigArgParse-1.4.gh.tar.gz 30079 BLAKE2B c070e245665bc331efb3a0b4d2e5ad0486859a7f28dbad2669d897d1857b58b1b1b48cb57d34ab2e5de5c21aa2a3554d728d6e48d5aa4c3a8c494fdc2ad9f615 SHA512 a2284da53e2417022c60dc637c6e4f6c7eea6b56790926982e35483bdcdce0cb349c09d02968625ac3888a0cb13cd0b5182f739c31a95425f9daf12c8b00f5c0 diff --git a/dev-python/configargparse/configargparse-1.4.1.ebuild b/dev-python/configargparse/configargparse-1.4.1.ebuild new file mode 100644 index 000000000000..7a65871f9e14 --- /dev/null +++ b/dev-python/configargparse/configargparse-1.4.1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) + +inherit distutils-r1 + +MY_PN="ConfigArgParse" +MY_P="${MY_PN}-${PV}" +DESCRIPTION="Drop-in replacement for argparse supporting config files and env variables" +HOMEPAGE=" + https://github.com/bw2/ConfigArgParse/ + https://pypi.org/project/ConfigArgParse/" +SRC_URI=" + https://github.com/bw2/ConfigArgParse/archive/v${PV}.tar.gz + -> ${MY_P}.gh.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND="test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )" + +distutils_enable_tests unittest + +src_test() { + local -x COLUMNS=80 + distutils-r1_src_test +} diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest index 08c706c62926..e82185694928 100644 --- a/dev-python/denonavr/Manifest +++ b/dev-python/denonavr/Manifest @@ -1,2 +1,3 @@ DIST denonavr-0.10.6.tar.gz 124692 BLAKE2B f0af92e0160d0533389e69dfad5740c432d52b3b6446288a572ef62aa9c8610397d3d8d5770ce6b46b4ad224b2782fc8a63a4f548a4237251d52695f5b4dde95 SHA512 336183e04e2f3f98faa1878a472ce69cc2fe7519398b34a61126cd6539ae6e40c60329d5b2f914e3dc85a9dbb11a1eb8fe9669f4e2910838d5ffcee0da7633c5 DIST denonavr-0.10.7.tar.gz 148282 BLAKE2B a5168c1b00ce1e8223d619a8e2e7ae663fa913d673b6f62580daf57ff76d8da4306681d92df0e32e612376038255bc52e25a1f59dd5f6a429685c8bd9146d843 SHA512 6667edeb4272ce909f8bc2dfa51b31d78915ae6085064bbf0f53714f8b473e0fad24eb6484a10abb093ef27d59faeaebdffdb55eadb03f8b64e864642364a791 +DIST denonavr-0.10.8.tar.gz 148387 BLAKE2B 1ad6687655abe70e6f83119c893187efe88143521e5c91987ae6b3d393fe7a327bf34941d87a4ba37107ef415493471be0630a1f3c643f94cfb3e22460c80806 SHA512 fea1b2a03d83d520c837323939db503879ec0c973bbf9409087298977f4d07f8ed8b25c2d287c1529786a4e42cd59b0f0708a8a4b7df3d5f630967110d7fe906 diff --git a/dev-python/denonavr/denonavr-0.10.8.ebuild b/dev-python/denonavr/denonavr-0.10.8.ebuild new file mode 100644 index 000000000000..744cc8df1076 --- /dev/null +++ b/dev-python/denonavr/denonavr-0.10.8.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_REQ_USE="xml(+)" + +inherit distutils-r1 + +DESCRIPTION="Automation Library for Denon AVR receivers" +HOMEPAGE="https://github.com/scarface-4711/denonavr" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-python/asyncstdlib[${PYTHON_USEDEP}] + dev-python/attrs[${PYTHON_USEDEP}] + dev-python/defusedxml[${PYTHON_USEDEP}] + dev-python/httpx[${PYTHON_USEDEP}] + dev-python/netifaces[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/pytest-asyncio[${PYTHON_USEDEP}] + dev-python/pytest-httpx[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest diff --git a/dev-python/falcon/Manifest b/dev-python/falcon/Manifest index 8aeea13a6f49..2db507b61295 100644 --- a/dev-python/falcon/Manifest +++ b/dev-python/falcon/Manifest @@ -1 +1,2 @@ DIST falcon-2.0.0.tar.gz 1075333 BLAKE2B 338e0b2474d743171fb0bc9dc3a05da428e6d46fc25e7cf1e978f799ed70e76bf265f32ba2cdf16d6eec8ea03b7b6111f70aa5b8f59141b7029d8ba9b03cd0d1 SHA512 d5365f91eb312cd058773d0a3809b5d8631acc188b9ee884e7c7db35664138608998f397d3fd831c568cafaf261cca2734b9dc7fb60590062e316ad1dbc74614 +DIST falcon-3.0.1.tar.gz 1300689 BLAKE2B 76dd59d0274cc2e78052b800e6e5b4c4244e1f5e47169a424882cda5bb59c38cd69c1c0942d506867728da9ddaf5d35b88195a1b003ca5f66549248293b7006d SHA512 c6a5763264b497979129df26d83a04323f53861b6d453a2b642d22208d0dad2ec1fcb88b13a53c2cb2b2988a1c0d19b94021099b458e23d640984b4d03880edc diff --git a/dev-python/falcon/falcon-3.0.1.ebuild b/dev-python/falcon/falcon-3.0.1.ebuild new file mode 100644 index 000000000000..5c8184be6612 --- /dev/null +++ b/dev-python/falcon/falcon-3.0.1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +inherit distutils-r1 + +DESCRIPTION="A supersonic micro-framework for building cloud APIs" +HOMEPAGE="https://falconframework.org/ https://pypi.org/project/falcon/" +SRC_URI="https://github.com/falconry/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-python/six[${PYTHON_USEDEP}] + dev-python/python-mimeparse[${PYTHON_USEDEP}] +" +BDEPEND=" + dev-python/cython[${PYTHON_USEDEP}] + test? ( + dev-python/aiofiles[${PYTHON_USEDEP}] + dev-python/cbor2[${PYTHON_USEDEP}] + dev-python/httpx[${PYTHON_USEDEP}] + dev-python/msgpack[${PYTHON_USEDEP}] + dev-python/pytest-asyncio[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/uvicorn[${PYTHON_USEDEP}] + dev-python/websockets[${PYTHON_USEDEP}] + )" + +distutils_enable_tests pytest + +src_prepare() { + # do not install 'examples' + sed -i -e "s:'tests':'examples', &:" setup.py || die + distutils-r1_src_prepare +} + +python_test() { + local deselect=( + # mujson is unpackaged, test-only dep + --ignore tests/test_media_handlers.py + ) + + cp -r tests "${BUILD_DIR}" || die + cd "${BUILD_DIR}" || die + epytest tests "${deselect[@]}" +} diff --git a/dev-python/falcon/metadata.xml b/dev-python/falcon/metadata.xml index eaf3015e2fca..a3ab6baa9537 100644 --- a/dev-python/falcon/metadata.xml +++ b/dev-python/falcon/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="project"> + <email>python@gentoo.org</email> + <name>Python</name> + </maintainer> <use> <flag name="cython">Build cython-based python modules</flag> </use> diff --git a/dev-python/fastimport/fastimport-0.9.11.ebuild b/dev-python/fastimport/fastimport-0.9.11.ebuild index a000b6debba9..9703a9d9986a 100644 --- a/dev-python/fastimport/fastimport-0.9.11.ebuild +++ b/dev-python/fastimport/fastimport-0.9.11.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( pypy3 python3_{7..9} ) +PYTHON_COMPAT=( pypy3 python3_{7..10} ) inherit distutils-r1 diff --git a/dev-python/fastimport/fastimport-0.9.12.ebuild b/dev-python/fastimport/fastimport-0.9.12.ebuild index 1903c77d28c4..c1f987bb42a4 100644 --- a/dev-python/fastimport/fastimport-0.9.12.ebuild +++ b/dev-python/fastimport/fastimport-0.9.12.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( pypy3 python3_{7..9} ) +PYTHON_COMPAT=( pypy3 python3_{7..10} ) inherit distutils-r1 diff --git a/dev-python/marshmallow/Manifest b/dev-python/marshmallow/Manifest index b7c12afe777e..34e3ffbc41b3 100644 --- a/dev-python/marshmallow/Manifest +++ b/dev-python/marshmallow/Manifest @@ -1,2 +1,3 @@ DIST marshmallow-3.11.1.tar.gz 173844 BLAKE2B edd816ccd254dc52e01a2e067ff3037fa5206ae5badb1e9b46d83d3bdcd926d324c39321e4fa2b4fdf276158d36c2d3634086f76086dececaa24213bbb765e42 SHA512 ebb6b20ffc1b199408ede0c88d1512cada14cf7220315100398137b8374940c03dda2e6449ab9135963598ab321669068a9eca0e1c4cd2f3f2454eba19db04bd DIST marshmallow-3.12.0.tar.gz 174790 BLAKE2B 07539540f361137dd2fa2d5c884e279137a82f69e8a9e294d6abe4c566c98f74a1836018618682ac0a08f1e0d1510dbffa6d9c030a98e2cba48230697742b7e3 SHA512 7b91ec42dffbb979bede21fbab17cfb081068eea54d02aaef991b58e884cc5675fb17d5f56278794e5c33960bf29951ba74533abb9a025228a524a4e413bd312 +DIST marshmallow-3.12.1.tar.gz 174784 BLAKE2B d3540ba833950d730db719c8ac7e8d66a54a4b06d0decc161d9b1f82d2012db2df7cc376bf3fb322e8d07e60057409f2e6ab761561e822c942d189418c70b9fa SHA512 aadbf9c3b45a5b435ce7fd7f60a4318f393221f23687be7b48af43deee111f48806489169815122f297539614a81700a435cc579cf5b7d0fffea2a2809368db9 diff --git a/dev-python/marshmallow/marshmallow-3.12.1.ebuild b/dev-python/marshmallow/marshmallow-3.12.1.ebuild new file mode 100644 index 000000000000..97790c85ad17 --- /dev/null +++ b/dev-python/marshmallow/marshmallow-3.12.1.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_{7..10} ) + +inherit distutils-r1 + +DESCRIPTION="A library for converting to and from native Python datatypes" +HOMEPAGE="https://github.com/marshmallow-code/marshmallow/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" + +RDEPEND=" + dev-python/python-dateutil[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/pytz[${PYTHON_USEDEP}] + dev-python/simplejson[${PYTHON_USEDEP}] + )" + +distutils_enable_tests pytest diff --git a/dev-python/monotonic/Manifest b/dev-python/monotonic/Manifest deleted file mode 100644 index a408ab93cee0..000000000000 --- a/dev-python/monotonic/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST monotonic-1.5.tar.gz 7525 BLAKE2B e6022a9c134031f1b89e643b4f7b37417366e08de213f580a39706e7cd57b1045e8f1625be213c90fba48b69c40461d0c90255e6a9f20e565ea9a857780e2143 SHA512 05485e0baa51df95f9812d463306ce0bbe7228170b43aed8faa9d77d2b613ffede6b57b3dd273c352e0d1c04782043bec2f36be88cb1acde182a5aeb0538f970 -DIST monotonic-1.6.tar.gz 7246 BLAKE2B 4caa822956eaa2f124fedcb39d15d2597fafe7e7cd27d2f5dfea1e70d6ff9c70b35c5ea668819fd18dde268c793abb1f5e1107c186c31ac970abf8847000483f SHA512 9bb01f4b34ce10b90dee2e49dd70bc37462333e0da9490893bf642ceea9bed5f9bdbd8f59c58350609ac4c89809039d7375f1f1583ab8fbf9c13d4064849ea18 diff --git a/dev-python/monotonic/metadata.xml b/dev-python/monotonic/metadata.xml deleted file mode 100644 index 9d2e85429a8f..000000000000 --- a/dev-python/monotonic/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>python@gentoo.org</email> - <name>Python</name> - </maintainer> - <stabilize-allarches/> - <upstream> - <remote-id type="pypi">monotonic</remote-id> - <remote-id type="github">atdt/monotonic</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-python/monotonic/monotonic-1.5-r1.ebuild b/dev-python/monotonic/monotonic-1.5-r1.ebuild deleted file mode 100644 index a8d9f439ae91..000000000000 --- a/dev-python/monotonic/monotonic-1.5-r1.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="An implementation of time.monotonic() for Python 2 & < 3.3" -HOMEPAGE="https://github.com/atdt/monotonic" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos" -IUSE="" - -# no tests diff --git a/dev-python/monotonic/monotonic-1.6.ebuild b/dev-python/monotonic/monotonic-1.6.ebuild deleted file mode 100644 index f9c9c61920bf..000000000000 --- a/dev-python/monotonic/monotonic-1.6.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="An implementation of time.monotonic() for Python 2 & < 3.3" -HOMEPAGE="https://github.com/atdt/monotonic" -SRC_URI=" - https://github.com/atdt/monotonic/archive/${PV}.tar.gz - -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos" - -# no tests -# NB: this package is dead and should not be required for py3.4+ -# last rite it when revdeps are fixed not to use it diff --git a/dev-python/mysql-connector-python/mysql-connector-python-8.0.24.ebuild b/dev-python/mysql-connector-python/mysql-connector-python-8.0.24.ebuild index 454f690c682b..98d012be9e7f 100644 --- a/dev-python/mysql-connector-python/mysql-connector-python-8.0.24.ebuild +++ b/dev-python/mysql-connector-python/mysql-connector-python-8.0.24.ebuild @@ -10,7 +10,7 @@ DESCRIPTION="Python client library for MariaDB/MySQL" HOMEPAGE="https://dev.mysql.com/downloads/connector/python/" SRC_URI="https://github.com/mysql/mysql-connector-python/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="amd64 ~arm x86" LICENSE="GPL-2" SLOT="0" IUSE="examples test" diff --git a/dev-python/namespace-paste/namespace-paste-1-r1.ebuild b/dev-python/namespace-paste/namespace-paste-1-r1.ebuild index d549dc639e05..e149c6442c23 100644 --- a/dev-python/namespace-paste/namespace-paste-1-r1.ebuild +++ b/dev-python/namespace-paste/namespace-paste-1-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} pypy3 ) +PYTHON_COMPAT=( python3_{7..10} pypy3 ) inherit python-r1 DESCRIPTION="Namespace package declaration for paste" diff --git a/dev-python/numpy/metadata.xml b/dev-python/numpy/metadata.xml index 28902614586a..d16c69eb8aaf 100644 --- a/dev-python/numpy/metadata.xml +++ b/dev-python/numpy/metadata.xml @@ -18,6 +18,7 @@ It is the successor of Numeric and numarray. </longdescription> <upstream> + <remote-id type="github">dev-python/numpy</remote-id> <remote-id type="pypi">numpy</remote-id> </upstream> </pkgmetadata> diff --git a/dev-python/pallets-sphinx-themes/Manifest b/dev-python/pallets-sphinx-themes/Manifest index 3eecb453dd82..73e6b603e75d 100644 --- a/dev-python/pallets-sphinx-themes/Manifest +++ b/dev-python/pallets-sphinx-themes/Manifest @@ -1 +1,2 @@ DIST pallets-sphinx-themes-1.1.2.tar.gz 17054 BLAKE2B 2c106be4a8ba68c6c270035ad6764bf87c65a20ca3515991f6287e3bd6a280d3ad0df121c6bad995fe8964425bee4c6ec4d229eef15489c3ae4e4e98eebe4d22 SHA512 0537f1e24b22612720909f1e19f2893b35622411d72298a407cb19318eaf33a0f7c97ee6f69874a172c135b65c9c16726115c1decd6d7a3d6cbda3e1dbdb50fb +DIST pallets-sphinx-themes-2.0.0.tar.gz 20242 BLAKE2B d1a75b26deced5fe3adb2a71f06486770fa29ec0e087fcfb59ca19a8c250ca7d780217612bd218a828368a7208e6bbddcfe1c672b078573516adba18b57490e3 SHA512 f75a3498438a04e3213caa7ecb2f91adad896f070b61a8a24623f1613efbc38cb8c2fd27e5e9ae125d5851801b58da9dbc22237cc9c7482b49dd89c2af79c4e9 diff --git a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.0.ebuild b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.0.ebuild new file mode 100644 index 000000000000..7dc51e33d765 --- /dev/null +++ b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} pypy3 ) +inherit distutils-r1 + +DESCRIPTION="Sphinx themes for Pallets and related projects" +HOMEPAGE="https://github.com/pallets/pallets-sphinx-themes" +SRC_URI="https://github.com/pallets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + +RDEPEND="dev-python/jinja[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/importlib_metadata[${PYTHON_USEDEP}] + ' python3_7 pypy3)" diff --git a/dev-python/paste/paste-3.5.0.ebuild b/dev-python/paste/paste-3.5.0.ebuild index a6676874a12a..541b33f53a13 100644 --- a/dev-python/paste/paste-3.5.0.ebuild +++ b/dev-python/paste/paste-3.5.0.ebuild @@ -4,7 +4,7 @@ EAPI=7 DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{7..9} pypy3 ) +PYTHON_COMPAT=( python3_{7..10} pypy3 ) inherit distutils-r1 @@ -30,7 +30,7 @@ python_prepare_all() { -i tests/test_httpserver.py || die # Remove a test that runs against the paste website. - rm -f tests/test_proxy.py || die + rm tests/test_proxy.py || die distutils-r1_python_prepare_all } @@ -38,5 +38,5 @@ python_prepare_all() { python_install_all() { distutils-r1_python_install_all - find "${D}" -name '*.pth' -delete || die + find "${ED}" -name '*.pth' -delete || die } diff --git a/dev-python/polib/polib-1.1.1.ebuild b/dev-python/polib/polib-1.1.1.ebuild index daf3ed9a7524..3867ed7a6b9c 100644 --- a/dev-python/polib/polib-1.1.1.ebuild +++ b/dev-python/polib/polib-1.1.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{7..10} ) inherit distutils-r1 diff --git a/dev-python/pycares/Manifest b/dev-python/pycares/Manifest index abdf8a584040..a70bc1f15fde 100644 --- a/dev-python/pycares/Manifest +++ b/dev-python/pycares/Manifest @@ -1 +1,2 @@ DIST pycares-3.1.1.tar.gz 216259 BLAKE2B 4481689e418695838c456f1e15b38dcdabadb106f393f52ec21a358b06621650d4e82086ca913abb341b9d8658db1c9ddd0064e68413e71a4ddded070647edfb SHA512 52c529510e3342c0b97ad0b4b9277d1f364da7719817a31a3cfac1f88613ea82f127182eab7c52c2fcd08008c689885bb4196f887a0f81b769f08f7cbf39909e +DIST pycares-3.2.3.tar.gz 214612 BLAKE2B e06f45a8b8e9312596ff6a56262cc91c32cd578ea2dc4c54c0a9e52ec1aa1cb8174aa03c486c74c98bbc22e7801e231244e64a943d40407f7731fe00400723f6 SHA512 126c4cc1390b558da4ce82dfbd11c56ad6be038ce5eda93641548faa4a59cd81f08265b71de31d5b54238ccf8e7d937272c13611111b04230c6ee7e4f01cb8d8 diff --git a/dev-python/pycares/metadata.xml b/dev-python/pycares/metadata.xml index afce7552c1ca..64863d5a9f0b 100644 --- a/dev-python/pycares/metadata.xml +++ b/dev-python/pycares/metadata.xml @@ -8,4 +8,8 @@ <maintainer type="person"> <email>zmedico@gentoo.org</email> </maintainer> + <maintainer type="project"> + <email>python@gentoo.org</email> + <name>Python</name> + </maintainer> </pkgmetadata> diff --git a/dev-python/pycares/pycares-3.2.3.ebuild b/dev-python/pycares/pycares-3.2.3.ebuild new file mode 100644 index 000000000000..dfc12ae28b0c --- /dev/null +++ b/dev-python/pycares/pycares-3.2.3.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_{7..10} ) + +inherit distutils-r1 + +DESCRIPTION="Python interface for c-ares" +HOMEPAGE="https://github.com/saghul/pycares/" +SRC_URI="https://github.com/saghul/pycares/archive/${P/_p/-fix}.tar.gz" +S=${WORKDIR}/${PN}-${P/_p/-fix} + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +# Tests fail with network-sandbox, since they try to resolve google.com +RESTRICT="test" + +# uses bundled/patched c-ares +RDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]" +BDEPEND=${RDEPEND} + +python_test() { + "${EPYTHON}" tests/tests.py -v || die +} diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild index 76504eb3fcad..a063b7e0f3b6 100644 --- a/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild +++ b/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{7..9} ) PYTHON_REQ_USE="ssl(+)" inherit distutils-r1 @@ -64,10 +64,17 @@ python_test() { # https://bugs.gentoo.org/758686 pyftpdlib/test/test_functional.py::ThreadedFTPTests::test_idle_timeout pyftpdlib/test/test_functional.py::ThreadedFTPTests::test_stou_max_tries + # https://github.com/giampaolo/pyftpdlib/issues/550 + # https://bugs.gentoo.org/759040 + pyftpdlib/test/test_functional.py::TestConfigurableOptions::test_masquerade_address + pyftpdlib/test/test_functional.py::TestConfigurableOptions::test_masquerade_address_map + pyftpdlib/test/test_functional_ssl.py::TestConfigurableOptions::test_masquerade_address + pyftpdlib/test/test_functional_ssl.py::TestConfigurableOptions::test_masquerade_address_map + pyftpdlib/test/test_functional_ssl.py::TestConfigurableOptionsTLSMixin::test_masquerade_address + pyftpdlib/test/test_functional_ssl.py::TestConfigurableOptionsTLSMixin::test_masquerade_address_map ) # Tests fail with TZ=GMT, see https://bugs.gentoo.org/666623 - TZ=UTC+1 pytest -vv ${skipped_tests[@]/#/--deselect } \ - || die "Tests failed with ${EPYTHON}" + TZ=UTC+1 epytest ${skipped_tests[@]/#/--deselect } } python_install_all() { diff --git a/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild b/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild index ef041451533a..95693a93178d 100644 --- a/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild +++ b/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{7..10} ) inherit distutils-r1 diff --git a/dev-python/pypy/pypy-7.3.3_p3.ebuild b/dev-python/pypy/pypy-7.3.3_p3.ebuild index 1d7884fb3329..88ca89d62cc7 100644 --- a/dev-python/pypy/pypy-7.3.3_p3.ebuild +++ b/dev-python/pypy/pypy-7.3.3_p3.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}-src" LICENSE="MIT" # pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")' SLOT="0/73" -KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" IUSE="bzip2 gdbm +jit ncurses sqlite tk" RDEPEND=" diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_p37_p2.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_p37_p2.ebuild index c510ad0dd412..277fe587ef6d 100644 --- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_p37_p2.ebuild +++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_p37_p2.ebuild @@ -21,7 +21,7 @@ S="${WORKDIR}" LICENSE="MIT" SLOT="${PV%_p*}" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND=">=sys-libs/zlib-1.1.3:0/1 dev-libs/libffi:0/7 diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.3_p37_p2.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.3_p37_p2.ebuild index d73c07c82d82..3b5b032c10e7 100644 --- a/dev-python/pypy3-exe/pypy3-exe-7.3.3_p37_p2.ebuild +++ b/dev-python/pypy3-exe/pypy3-exe-7.3.3_p37_p2.ebuild @@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}-src" LICENSE="MIT" SLOT="${PV%_p*}" -KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2" RDEPEND=">=sys-libs/zlib-1.1.3:0= diff --git a/dev-python/pypy3/pypy3-7.3.3_p37_p3.ebuild b/dev-python/pypy3/pypy3-7.3.3_p37_p3.ebuild index f3f0a7435433..901b875029bb 100644 --- a/dev-python/pypy3/pypy3-7.3.3_p37_p3.ebuild +++ b/dev-python/pypy3/pypy3-7.3.3_p37_p3.ebuild @@ -20,7 +20,7 @@ LICENSE="MIT" # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))' # also check pypy/interpreter/pycode.py -> pypy_incremental_magic SLOT="0/pypy37-pp73" -KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" IUSE="bzip2 gdbm +jit ncurses sqlite test tk" # pypy3.7 is in alpha state and a lot of tests are failing RESTRICT="test" diff --git a/dev-python/retry-decorator/retry-decorator-1.1.1.ebuild b/dev-python/retry-decorator/retry-decorator-1.1.1.ebuild index ae3d1adf0544..29acc4e66599 100644 --- a/dev-python/retry-decorator/retry-decorator-1.1.1.ebuild +++ b/dev-python/retry-decorator/retry-decorator-1.1.1.ebuild @@ -2,8 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{7..10} ) inherit distutils-r1 DESCRIPTION="Decorator for retrying when exceptions occur" diff --git a/dev-python/retrying/retrying-1.3.3.ebuild b/dev-python/retrying/retrying-1.3.3.ebuild index 19420def73d0..a62d08a1890e 100644 --- a/dev-python/retrying/retrying-1.3.3.ebuild +++ b/dev-python/retrying/retrying-1.3.3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..9} pypy3 ) +PYTHON_COMPAT=( python3_{7..10} pypy3 ) inherit distutils-r1 diff --git a/dev-python/rfc3339-validator/metadata.xml b/dev-python/rfc3339-validator/metadata.xml index 4b41bde5a774..35a51d448450 100644 --- a/dev-python/rfc3339-validator/metadata.xml +++ b/dev-python/rfc3339-validator/metadata.xml @@ -3,6 +3,7 @@ <pkgmetadata> <maintainer type="project"> <email>python@gentoo.org</email> + <name>Python</name> </maintainer> <stabilize-allarches/> <upstream> diff --git a/dev-python/rfc3339-validator/rfc3339-validator-0.1.3.ebuild b/dev-python/rfc3339-validator/rfc3339-validator-0.1.3.ebuild index c66998ee2197..39aebb33d57c 100644 --- a/dev-python/rfc3339-validator/rfc3339-validator-0.1.3.ebuild +++ b/dev-python/rfc3339-validator/rfc3339-validator-0.1.3.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} pypy3 ) +PYTHON_COMPAT=( python3_{7..10} pypy3 ) inherit distutils-r1 DESCRIPTION="A pure python RFC3339 validator" diff --git a/dev-python/scrypt/scrypt-0.8.16.ebuild b/dev-python/scrypt/scrypt-0.8.16.ebuild index 42f2c3ca37df..39a840266ab6 100644 --- a/dev-python/scrypt/scrypt-0.8.16.ebuild +++ b/dev-python/scrypt/scrypt-0.8.16.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} pypy3 ) +PYTHON_COMPAT=( python3_{7..10} pypy3 ) inherit distutils-r1 diff --git a/dev-python/scrypt/scrypt-0.8.18.ebuild b/dev-python/scrypt/scrypt-0.8.18.ebuild index 0cd1c015be55..d7034e8ceaf9 100644 --- a/dev-python/scrypt/scrypt-0.8.18.ebuild +++ b/dev-python/scrypt/scrypt-0.8.18.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} pypy3 ) +PYTHON_COMPAT=( python3_{7..10} pypy3 ) inherit distutils-r1 diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest index 20427c9b618c..0b8f7b8059f3 100644 --- a/dev-python/sqlalchemy/Manifest +++ b/dev-python/sqlalchemy/Manifest @@ -3,3 +3,4 @@ DIST SQLAlchemy-1.4.11.tar.gz 7551299 BLAKE2B 65f560223f1f1656ec90a2b46b5447e929 DIST SQLAlchemy-1.4.12.tar.gz 7583069 BLAKE2B a3097c53ba1c8e979c3eab712e51da39214710e174a90cdabd5f5588fcb01d2d45436e8019a1026780474e2fde7663495cffa411c58b255e847aa584a38ca26a SHA512 5863e4982c260d39e79db3a8fffd7ca6710b7f6ab0f73f9ddb09860e27d679fe2c92e0eaab9fe6914b38be4390c0eb685adef6624b06874fb43d96027b545659 DIST SQLAlchemy-1.4.13.tar.gz 7589942 BLAKE2B 08e9fb6112aa71738f27dc4ce86ebe2274dd2513f39ded7211a5617ecd677f37fe31de754a24ecd519b227b141287ad86d0d0337f3d278d4c4ca5b67e2a1a79d SHA512 fb81c71922a768221f6675686fb2696b5e6d1f2e72231611e9afd20b7659193247eef4191841799fb1fe6a51304629efb6d3fba5dc298fdf70f248010bce8bb3 DIST SQLAlchemy-1.4.14.tar.gz 7599698 BLAKE2B 500a6257829244e1181b8ef5cb39fb87b62ae2d7ca054fedb580b7431b32d15c8f68600b881eb67eb97a73301660ab96793ab12094ae901782ce4eebdc8929db SHA512 2f33ab034467344ffb19aa3934148faaa4a57e4ffa5f97008d814d54149da4e15cfca14d138b9fb656227e25932ca95cf7321209c31c2706405d3916dc2fb9c0 +DIST SQLAlchemy-1.4.15.tar.gz 7621840 BLAKE2B 74299b92e8ae9d6017c961c44281cc43921f8505e9b141c75cc19899f693a2276b2849daef6dbe35f0d62179354740c76adc318b6b37d551679cc8ba3c47681f SHA512 b9a640ccfb7caabb88c4891748699442073db2bea6d1e5a33eb508863616c94ddbf162b3ecd5e502daf20d798d20b8ef5b4b29ed679af9161e117a23862327c2 diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.15.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.15.ebuild new file mode 100644 index 000000000000..358669239962 --- /dev/null +++ b/dev-python/sqlalchemy/sqlalchemy-1.4.15.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( pypy3 python3_{7..9} ) +PYTHON_REQ_USE="sqlite?" + +inherit distutils-r1 multiprocessing optfeature + +MY_PN="SQLAlchemy" +MY_P="${MY_PN}-${PV/_beta/b}" + +DESCRIPTION="Python SQL toolkit and Object Relational Mapper" +HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/" +SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="examples +sqlite test" + +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/importlib_metadata[${PYTHON_USEDEP}] + ' python3_7 pypy3) +" +# Use pytest-xdist to speed up tests +BDEPEND=" + test? ( + $(python_gen_impl_dep sqlite) + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +src_prepare() { + # remove optional/partial dep on greenlet, greenlet is not very portable + sed -i -e '/greenlet/d' setup.cfg || die + + distutils-r1_src_prepare +} + +python_test() { + # Disable tests hardcoding function call counts specific to Python versions. + epytest --ignore test/aaa_profiling \ + -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" +} + +python_install_all() { + if use examples; then + docompress -x "/usr/share/doc/${PF}/examples" + dodoc -r examples + fi + + distutils-r1_python_install_all +} + +pkg_postinst() { + optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \ + dev-python/mysql-connector-python + optfeature "mssql support" dev-python/pymssql + optfeature "postgresql support" dev-python/psycopg:2 +} diff --git a/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild b/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild index c005434b76e8..83059b990226 100644 --- a/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild +++ b/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild @@ -4,8 +4,7 @@ EAPI=7 DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{7,8,9} pypy3 ) - +PYTHON_COMPAT=( python3_{7..10} pypy3 ) inherit distutils-r1 MY_PN="${PN}-version" @@ -14,11 +13,10 @@ MY_P="${MY_PN}-${PV}" DESCRIPTION="Strict, simple, lightweight RFC3339 functions" HOMEPAGE="https://pypi.org/project/strict-rfc3339/ https://github.com/danielrichman/strict-rfc3339" SRC_URI="https://github.com/danielrichman/${PN}/archive/version-${PV}.tar.gz -> ${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" -SLOT="0" LICENSE="GPL-3+" +SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" -S="${WORKDIR}/${MY_P}" - distutils_enable_tests unittest diff --git a/dev-python/sympy/sympy-1.8.ebuild b/dev-python/sympy/sympy-1.8.ebuild index 727e2d95fbc8..2502957ec456 100644 --- a/dev-python/sympy/sympy-1.8.ebuild +++ b/dev-python/sympy/sympy-1.8.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${P}" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="examples imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano" RDEPEND=" diff --git a/dev-python/terminado/Manifest b/dev-python/terminado/Manifest index 49405556f0a7..ceb79d543266 100644 --- a/dev-python/terminado/Manifest +++ b/dev-python/terminado/Manifest @@ -1 +1,2 @@ DIST terminado-0.9.4.tar.gz 13934 BLAKE2B 8544d70a7c561005370bbb2b16db593ac9e4453b729b58d641b99066dc1255e294b712958d54a35a92d85e30b918a1122d24e97400b967858b542498d76305b5 SHA512 ab297e60c1adb25b5fbfcd0246db12f5df3acceeac3357af310602da3915345cb2d4fb460cc303cc4b5b5df237e750ce123ac0ed98a9bf7c6e8493783398cbc9 +DIST terminado-0.9.5.tar.gz 13953 BLAKE2B fcd67a5193fe20b17ff815c934fb20cbcb5d5ca29818c7064534017c13db7ab2326f0be00a4cb541ef877bb7d208eb93685fbb0c2ff08b8640cd5befb1c5eab5 SHA512 7b9f9b81bd30d7b5493faf92c2cecc251c68709ab4c8364e5da1aaf42507919563ee368c30d94c30913f116df9113612500473c6bdf5bc673a96ef1d6c7337a4 diff --git a/dev-python/terminado/terminado-0.9.5.ebuild b/dev-python/terminado/terminado-0.9.5.ebuild new file mode 100644 index 000000000000..f329d3d887b8 --- /dev/null +++ b/dev-python/terminado/terminado-0.9.5.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=pyproject.toml +PYTHON_COMPAT=( python3_{7..9} ) + +inherit distutils-r1 + +DESCRIPTION="Terminals served to term.js using Tornado websockets" +HOMEPAGE="https://pypi.org/project/terminado/ https://github.com/jupyter/terminado" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +SLOT="0" +LICENSE="BSD-2" +KEYWORDS="" + +RDEPEND=" + dev-python/ptyprocess[${PYTHON_USEDEP}] + www-servers/tornado[${PYTHON_USEDEP}]" + +distutils_enable_tests pytest + +src_test() { + # workaround new readline defaults + echo "set enable-bracketed-paste off" > "${T}"/inputrc || die + local -x INPUTRC="${T}"/inputrc + distutils-r1_src_test +} diff --git a/dev-python/texttable/texttable-1.6.3.ebuild b/dev-python/texttable/texttable-1.6.3.ebuild index 51902acd7fe2..ec0eced974cc 100644 --- a/dev-python/texttable/texttable-1.6.3.ebuild +++ b/dev-python/texttable/texttable-1.6.3.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{7..10} ) inherit distutils-r1 optfeature diff --git a/dev-python/visitor/visitor-0.1.3-r1.ebuild b/dev-python/visitor/visitor-0.1.3-r1.ebuild index 0dae1af04f46..7deb9bd59a3b 100644 --- a/dev-python/visitor/visitor-0.1.3-r1.ebuild +++ b/dev-python/visitor/visitor-0.1.3-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( pypy3 python3_{7,8,9} ) +PYTHON_COMPAT=( pypy3 python3_{7..10} ) inherit distutils-r1 diff --git a/dev-python/waitress/waitress-2.0.0.ebuild b/dev-python/waitress/waitress-2.0.0.ebuild index c8fcb9d46c88..c39c028a2f1b 100644 --- a/dev-python/waitress/waitress-2.0.0.ebuild +++ b/dev-python/waitress/waitress-2.0.0.ebuild @@ -3,8 +3,7 @@ EAPI=7 -DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{7..9} pypy3 ) +PYTHON_COMPAT=( python3_{7..10} pypy3 ) inherit distutils-r1 diff --git a/dev-python/webob/webob-1.8.7.ebuild b/dev-python/webob/webob-1.8.7.ebuild index a27b41c0fbe7..fb18c79b8392 100644 --- a/dev-python/webob/webob-1.8.7.ebuild +++ b/dev-python/webob/webob-1.8.7.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( pypy3 python3_{7..9} ) +PYTHON_COMPAT=( pypy3 python3_{7..10} ) inherit distutils-r1 diff --git a/dev-ruby/jquery-rails/jquery-rails-4.4.0.ebuild b/dev-ruby/jquery-rails/jquery-rails-4.4.0.ebuild index 35c067115537..46d399100cb0 100644 --- a/dev-ruby/jquery-rails/jquery-rails-4.4.0.ebuild +++ b/dev-ruby/jquery-rails/jquery-rails-4.4.0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -USE_RUBY="ruby24 ruby25 ruby26" +USE_RUBY="ruby25 ruby26 ruby27" RUBY_FAKEGEM_TASK_DOC="" RUBY_FAKEGEM_TASK_TEST="" diff --git a/dev-ruby/terminal-table/Manifest b/dev-ruby/terminal-table/Manifest index 92a431fae55d..c7d45862b14a 100644 --- a/dev-ruby/terminal-table/Manifest +++ b/dev-ruby/terminal-table/Manifest @@ -1,3 +1,4 @@ DIST terminal-table-1.8.0.tar.gz 13407 BLAKE2B cf1653a18d2b6b72757b149295e01aee83d75241075912d145032e3bc73deb3e33fd00bef033f4bc90dcd51e4bd994b6966805ed7f81833392aba17bbdd7e179 SHA512 4ea4a66e8db384e448d57027e6314f9ce7a0e1511bbfa6e246e26c15a8ff3e44b46c8b6ca03dd521ffdd63b58976d400359131bc1869bf2dc04b3057f399e269 DIST terminal-table-2.0.0.tar.gz 14286 BLAKE2B aa4e132338a8bbdb8e665584fca947a5b92ee9b8126545b1fffd727d26c7158a9b1cf2959aa917bb93a47e01a4d605ca400d8ddb3be2f73da256ab2f96e91cde SHA512 568542f1fc60cfdb37b14f9d52d6fb6c3ccc36b5c0103c95e3d70fd5e1371c124c97cdea5a4d5a2ec63e34550624b38bd11e0af1073a8eefb3c5fd9eef427576 DIST terminal-table-3.0.0.tar.gz 23237 BLAKE2B caa8e3a4edd3be491cdcb914d3ad409da434c9dd0fbea407ced8db52f32c3490d6ae09864d3aaeb543944ce3f79d150e983baf656ceaf32bf23fceb7b8582dae SHA512 69ed7d76894e95c4456442d2c2b40ef7b5ee2b90fa2760f1e5271f1ceb569161ee34cb77e8bd9885c2543eed6c37df904c79d28cacf6dc7ddabcc1ab369206c0 +DIST terminal-table-3.0.1.tar.gz 25205 BLAKE2B af474858223e6a6a7d2339beea74c7610e2a7f20f8e3a72956d24b7a1078586f651235d708637c37399dd0c99d44c1d9b1e38b267ceabf3dbc5c40f5f1cad1d2 SHA512 fae7d19f92fc570ec0d23977a523f9381b14de6396d59c91d0e1e635de613876abeb3edfef9507955c93c29cb18ecf1dc717d7b227f118eb3b7e254835282251 diff --git a/dev-ruby/terminal-table/terminal-table-3.0.1.ebuild b/dev-ruby/terminal-table/terminal-table-3.0.1.ebuild new file mode 100644 index 000000000000..98afda9cb1c4 --- /dev/null +++ b/dev-ruby/terminal-table/terminal-table-3.0.1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +USE_RUBY="ruby25 ruby26 ruby27" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +RUBY_FAKEGEM_EXTRADOC="History.rdoc README.md Todo.rdoc" + +RUBY_FAKEGEM_RECIPE_DOC="rdoc" + +RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" + +inherit ruby-fakegem + +DESCRIPTION="Simple, feature rich ascii table generation library" +HOMEPAGE="https://github.com/tj/terminal-table" +SRC_URI="https://github.com/tj/terminal-table/archive/v${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="MIT" + +KEYWORDS="~amd64 ~arm64" +SLOT="$(ver_cut 1)" +IUSE="test" + +ruby_add_rdepend "|| ( dev-ruby/unicode-display_width:2 >=dev-ruby/unicode-display_width-1.1.1:1 )" + +ruby_add_bdepend "test? ( dev-ruby/term-ansicolor )" + +all_ruby_prepare() { + sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die +} diff --git a/dev-ruby/unicode-display_width/unicode-display_width-2.0.0.ebuild b/dev-ruby/unicode-display_width/unicode-display_width-2.0.0.ebuild index bb32c9542642..916c168b40f8 100644 --- a/dev-ruby/unicode-display_width/unicode-display_width-2.0.0.ebuild +++ b/dev-ruby/unicode-display_width/unicode-display_width-2.0.0.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -USE_RUBY="ruby25 ruby26 ruby27" +USE_RUBY="ruby25 ruby26 ruby27 ruby30" RUBY_FAKEGEM_RECIPE_TEST="rspec3" diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest index 474cb0254145..cbbdfedebd8b 100644 --- a/dev-util/ccache/Manifest +++ b/dev-util/ccache/Manifest @@ -1 +1,2 @@ DIST ccache-4.2.1.tar.xz 431484 BLAKE2B 10bb0d1e263e441d91c2dfcd2b2c89f64dfb10b4c5aa66012c388fea2c99d8488538e84b5cef86abf0c9f9aaa0a562b7c7be8a9d4a4073ae3c046e7fe28b7eda SHA512 46bb760ddad5999c5bdff4f3ce6e405eb2018c4a591ad76ba3dd7921b8bfd59a257d992d285e38d69aaf86537962602689175b8741894094819775eec9493b77 +DIST ccache-4.3.tar.xz 433508 BLAKE2B 6ab48aa587b4dc86020e3b0f722003dc5c03709626e143a1d38506b6072f9963fc76e89b6d18128dfc28035bf8d24e46ea44f219db69a1b3a294416f0b023090 SHA512 ec082de95ea8b22154ce1e67e0a0fc28266cfb71f382205f7eab14e6ac1c7841027d063041131832b3227d833d99ec874e90df238f35f433de4c381566931c7f diff --git a/dev-util/ccache/ccache-4.3.ebuild b/dev-util/ccache/ccache-4.3.ebuild new file mode 100644 index 000000000000..3f58044c6822 --- /dev/null +++ b/dev-util/ccache/ccache-4.3.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake toolchain-funcs + +DESCRIPTION="fast compiler cache" +HOMEPAGE="https://ccache.dev/" +SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz" + +LICENSE="GPL-3 LGPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="test" + +DEPEND="" +RDEPEND="${DEPEND} + app-arch/zstd:0= + dev-util/shadowman + sys-apps/gentoo-functions +" +# clang-specific tests use dev-libs/elfutils to compare objects for equality. +# Let's pull in the dependency unconditionally. +DEPEND+=" + test? ( dev-libs/elfutils ) +" +BDEPEND=" + app-text/asciidoc +" + +RESTRICT="!test? ( test )" + +DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md ) + +PATCHES=( + "${FILESDIR}"/${PN}-3.5-nvcc-test.patch + "${FILESDIR}"/${PN}-4.0-objdump.patch + "${FILESDIR}"/${PN}-4.1-avoid-run-user.patch +) + +src_prepare() { + cmake_src_prepare + + sed \ + -e "/^EPREFIX=/s:'':'${EPREFIX}':" \ + "${FILESDIR}"/ccache-config-3 > ccache-config || die + + # mainly used in tests + tc-export CC OBJDUMP +} + +src_configure() { + local mycmakeargs=( + -DUSE_CCACHE=OFF + -DUSE_FASTER_LINKER=OFF + -DZSTD_FROM_INTERNET=OFF + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + dobin ccache-config + insinto /usr/share/shadowman/tools + newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin" +} + +pkg_prerm() { + if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then + eselect compiler-shadow remove ccache + fi +} + +pkg_postinst() { + if [[ ${ROOT:-/} == / ]]; then + eselect compiler-shadow update ccache + fi +} diff --git a/dev-util/glade/glade-3.38.2.ebuild b/dev-util/glade/glade-3.38.2.ebuild index ebf254857d28..5ef0df7443f6 100644 --- a/dev-util/glade/glade-3.38.2.ebuild +++ b/dev-util/glade/glade-3.38.2.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://glade.gnome.org/" LICENSE="GPL-2+ FDL-1.1+" SLOT="3.10/13" # subslot = suffix of libgladeui-2.so -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86" IUSE="gjs gtk-doc +introspection python webkit" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/dev-util/shellcheck/files/shellcheck-0.7.2-haddock.patch b/dev-util/shellcheck/files/shellcheck-0.7.2-haddock.patch new file mode 100644 index 000000000000..db6297064bad --- /dev/null +++ b/dev-util/shellcheck/files/shellcheck-0.7.2-haddock.patch @@ -0,0 +1,53 @@ +From 9e60b3ea841bcaf48780bfcfc2e44aa6563a62de Mon Sep 17 00:00:00 2001 +From: Vidar Holen <spam@vidarholen.net> +Date: Thu, 22 Apr 2021 22:17:51 -0700 +Subject: [PATCH] Fix haddock failures (fixes #2216) + +--- + src/ShellCheck/Analytics.hs | 12 ++++++------ + test/buildtest | 2 ++ + 2 files changed, 8 insertions(+), 6 deletions(-) + +--- a/src/ShellCheck/Analytics.hs ++++ b/src/ShellCheck/Analytics.hs +@@ -4155,11 +4155,11 @@ checkEqualsInCommand params originalToken = + _ | "===" `isPrefixOf` s -> borderMsg (getId originalToken) + _ -> prefixMsg (getId cmd) + +- -- $var==42 ++ -- '$var==42' + _ | "==" `isInfixOf` s -> + badComparisonMsg (getId cmd) + +- -- ${foo[x]}=42 and $foo=42 ++ -- '${foo[x]}=42' and '$foo=42' + [T_DollarBraced id braced l] | "=" `isPrefixOf` s -> do + let variableStr = concat $ oversimplify l + let variableReference = getBracedReference variableStr +@@ -4172,22 +4172,22 @@ checkEqualsInCommand params originalToken = + && "]" `isSuffixOf` variableModifier + + case () of +- -- $foo=bar should already have caused a parse-time SC1066 ++ -- '$foo=bar' should already have caused a parse-time SC1066 + -- _ | not braced && isPlain -> + -- return () + + _ | variableStr == "" -> -- Don't try to fix ${}=foo + genericMsg (getId cmd) + +- -- $#=42 or ${#var}=42 ++ -- '$#=42' or '${#var}=42' + _ | "#" `isPrefixOf` variableStr -> + genericMsg (getId cmd) + +- -- ${0}=42 ++ -- '${0}=42' + _ | variableStr == "0" -> + assign0Msg id $ fixWith [replaceToken id params "BASH_ARGV0"] + +- -- $2=2 ++ -- '$2=2' + _ | isPositional -> + positionalMsg id + diff --git a/dev-util/shellcheck/shellcheck-0.7.2.ebuild b/dev-util/shellcheck/shellcheck-0.7.2.ebuild index f6704b2938fb..012df314142a 100644 --- a/dev-util/shellcheck/shellcheck-0.7.2.ebuild +++ b/dev-util/shellcheck/shellcheck-0.7.2.ebuild @@ -31,3 +31,5 @@ RDEPEND="dev-haskell/aeson:=[profile?] DEPEND="${RDEPEND} >=dev-haskell/cabal-2.2.0.1 " + +PATCHES=("${FILESDIR}"/${P}-haddock.patch) diff --git a/games-emulation/zsnes/files/zsnes-1.51-ao-crash.patch b/games-emulation/zsnes/files/zsnes-1.51-ao-crash.patch new file mode 100644 index 000000000000..6ce142d9c27c --- /dev/null +++ b/games-emulation/zsnes/files/zsnes-1.51-ao-crash.patch @@ -0,0 +1,30 @@ +Fix frash in uninitialized driver_format.matrix. + +Thread 1 "zsnes" received signal SIGSEGV, Segmentation fault. +__strlen_sse2_bsf () at ../sysdeps/i386/i686/multiarch/strlen-sse2-bsf.S:50 +50 ../sysdeps/i386/i686/multiarch/strlen-sse2-bsf.S: Нет такого файла или каталога. +(gdb) bt +#0 __strlen_sse2_bsf () at ../sysdeps/i386/i686/multiarch/strlen-sse2-bsf.S:50 +#1 0xf7e3c491 in _sanitize_matrix (maxchannels=2, matrix=0x1c00200 <error: Cannot access memory at address 0x1c00200>, device=device@entry=0x57057100) + at ../../libao-1.2.2/src/audio_out.c:634 +#2 0xf7e3e9bc in _open_device (driver_id=<optimized out>, format=format@entry=0xffffc638, options=options@entry=0x0, file=0x0) at ../../libao-1.2.2/src/audio_out.c:991 +#3 0xf7e3f579 in ao_open_live (driver_id=<optimized out>, format=0xffffc638, options=0x0) at ../../libao-1.2.2/src/audio_out.c:1337 +#4 0x5699fbb5 in SoundInit_ao () at linux/audio.c:197 +#5 InitSound () at linux/audio.c:338 +#6 0x569a2f7f in initwinvideo () at linux/sdllink.c:1080 +#7 0x569a07d3 in initvideo () +#8 0x56ad59bc in regptwa () +#9 0x56a3c490 in SA1tableG () +#10 0xffffc808 in ?? () +#11 0xf78619b5 in __libc_start_main (main=0x1, argc=1450015920, argv=0x0, init=0x566d7ce1 <_start+49>, fini=0x566d7c00 <main>, rtld_fini=0x1, stack_end=0xffffc8c4) at ../csu/libc-start.c:332 +#12 0x569cd000 in ?? () +--- a/linux/audio.c ++++ b/linux/audio.c +@@ -166,6 +166,7 @@ static int SoundInit_ao() + if (driver_id < 0) { driver_id = ao_default_driver_id(); } + + ao_sample_format driver_format; ++ memset(&driver_format, 0, sizeof(driver_format)); + driver_format.bits = 16; + driver_format.channels = StereoSound+1; + driver_format.rate = freqtab[SoundQuality = ((SoundQuality > 6) ? 1 : SoundQuality)]; diff --git a/games-emulation/zsnes/files/zsnes-1.51-stack-align-v3.patch b/games-emulation/zsnes/files/zsnes-1.51-stack-align-v3.patch new file mode 100644 index 000000000000..914c9afc4495 --- /dev/null +++ b/games-emulation/zsnes/files/zsnes-1.51-stack-align-v3.patch @@ -0,0 +1,40 @@ +--- a/linux/sdllink.c ++++ b/linux/sdllink.c +@@ -133,7 +133,7 @@ extern unsigned char romispal; + + /* FUNCTION DECLARATIONS */ + void clearwin (void); +-void drawscreenwin(void); ++void __attribute__((force_align_arg_pointer)) drawscreenwin(void); + void initwinvideo(); + unsigned int sdl_keysym_to_pc_scancode(int); + void ProcessKeyBuf(int); +--- a/ztimec.c ++++ b/ztimec.c +@@ -25,7 +25,7 @@ short SystemTimewHour; + short SystemTimewMinute; + short SystemTimewSecond; + +-void GetLocalTime() ++void __attribute__((force_align_arg_pointer)) GetLocalTime() + { + time_t current; + struct tm *timeptr; +@@ -37,7 +37,7 @@ void GetLocalTime() + SystemTimewSecond = timeptr->tm_sec; + } + +-unsigned int GetTime() ++unsigned __attribute__((force_align_arg_pointer)) int GetTime() + { + unsigned int value; + struct tm *newtime; +@@ -52,7 +52,7 @@ unsigned int GetTime() + return(value); + } + +-unsigned int GetDate() ++unsigned __attribute__((force_align_arg_pointer)) int GetDate() + { + unsigned int value; + struct tm *newtime; diff --git a/games-emulation/zsnes/zsnes-1.51-r10.ebuild b/games-emulation/zsnes/zsnes-1.51-r10.ebuild new file mode 100644 index 000000000000..ffa490ba20b5 --- /dev/null +++ b/games-emulation/zsnes/zsnes-1.51-r10.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools desktop flag-o-matic toolchain-funcs pax-utils + +DESCRIPTION="SNES (Super Nintendo) emulator that uses x86 assembly" +HOMEPAGE="https://www.zsnes.com/ http://ipherswipsite.com/zsnes/" +SRC_URI="mirror://sourceforge/zsnes/${PN}${PV//./}src.tar.bz2 -> ${P}-20071031.tar.bz2" +S="${WORKDIR}/${PN}_${PV//./_}/src" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="ao custom-cflags +debug opengl png" + +RDEPEND=" + media-libs/libsdl[sound,video,abi_x86_32(-)] + >=sys-libs/zlib-1.2.3-r1[abi_x86_32(-)] + ao? ( media-libs/libao[abi_x86_32(-)] ) + debug? ( sys-libs/ncurses:0=[abi_x86_32(-)] ) + opengl? ( virtual/opengl[abi_x86_32(-)] ) + png? ( media-libs/libpng:0=[abi_x86_32(-)] ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-lang/nasm + debug? ( virtual/pkgconfig ) +" + +PATCHES=( + # Fixing compilation without libpng installed + "${FILESDIR}"/${P}-libpng.patch + + # Fix bug #186111 + # Fix bug #214697 + # Fix bug #170108 + # Fix bug #260247 + "${FILESDIR}"/${P}-gcc43-20071031.patch + "${FILESDIR}"/${P}-libao-thread.patch + "${FILESDIR}"/${P}-depbuild.patch + "${FILESDIR}"/${P}-CC-quotes.patch + + # Fix compability with libpng15 wrt #378735 + "${FILESDIR}"/${P}-libpng15.patch + + # Fix buffer overwrite #257963 + "${FILESDIR}"/${P}-buffer.patch + # Fix gcc47 compile #419635 + "${FILESDIR}"/${P}-gcc47.patch + # Fix stack alignment issue #503138 + "${FILESDIR}"/${P}-stack-align-v2.patch + + "${FILESDIR}"/${P}-cross-compile.patch + "${FILESDIR}"/${P}-arch.patch + + "${FILESDIR}"/${P}-gcc-10.patch + "${FILESDIR}"/${P}-c++17.patch + "${FILESDIR}"/${P}-ao-crash.patch + "${FILESDIR}"/${P}-stack-align-v3.patch +) + +src_prepare() { + default + + # The sdl detection logic uses AC_PROG_PATH instead of + # AC_PROG_TOOL, so force the var to get set the way we + # need for things to work correctly. + tc-is-cross-compiler && export ac_cv_path_SDL_CONFIG=${CHOST}-sdl-config + + sed -i -e '67i#define OF(x) x' zip/zunzip.h || die + + # Remove hardcoded CFLAGS and LDFLAGS + sed -i \ + -e '/^CFLAGS=.*local/s:-pipe.*:-Wall -I.":' \ + -e '/^LDFLAGS=.*local/d' \ + -e '/\w*CFLAGS=.*fomit/s:-O3.*$STRIP::' \ + -e '/lncurses/s:-lncurses:`pkg-config ncurses --libs`:' \ + -e '/lcurses/s:-lcurses:`pkg-config ncurses --libs`:' \ + configure.in || die + sed -i \ + -e 's/configure.in/configure.ac/' \ + Makefile.in || die + mv configure.in configure.ac || die + eautoreconf +} + +src_configure() { + tc-export CC + export BUILD_CXX=$(tc-getBUILD_CXX) + export NFLAGS=-O1 + use amd64 && multilib_toolchain_setup x86 + use custom-cflags || strip-flags + + append-cppflags -U_FORTIFY_SOURCE #257963 + + econf \ + $(use_enable ao libao) \ + $(use_enable debug debugger) \ + $(use_enable png libpng) \ + $(use_enable opengl) \ + --disable-debug \ + --disable-cpucheck +} + +src_compile() { + emake makefile.dep + emake +} + +src_install() { + # Uses pic-unfriendly assembly code, bug #427104 + QA_TEXTRELS="usr/bin/zsnes" + + dobin zsnes + pax-mark m "${ED}"/usr/bin/zsnes + + newman linux/zsnes.1 zsnes.6 + + dodoc \ + ../docs/{readme.1st,authors.txt,srcinfo.txt,stdards.txt,support.txt,thanks.txt,todo.txt,README.LINUX} \ + ../docs/readme.txt/* + HTML_DOCS="../docs/readme.htm/*" einstalldocs + + make_desktop_entry zsnes ZSNES + newicon icons/48x48x32.png ${PN}.png +} diff --git a/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-gcc11-include.patch b/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-gcc11-include.patch new file mode 100644 index 000000000000..31cca620a3fc --- /dev/null +++ b/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-gcc11-include.patch @@ -0,0 +1,12 @@ +https://github.com/Return-To-The-Roots/libsiedler2/commit/cb2994d5bb6407d4b12f681268e6b123d9b366f5.patch +https://bugs.gentoo.org/787299 +--- a/external/libsiedler2/include/libsiedler2/XMIDI_TrackConverter.h ++++ b/external/libsiedler2/include/libsiedler2/XMIDI_TrackConverter.h +@@ -18,6 +18,7 @@ + #pragma once + + #include <array> ++#include <cstddef> + #include <cstdint> + #include <vector> + diff --git a/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild b/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild index 001f1128ae10..dc54ef2deafe 100644 --- a/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild +++ b/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.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 @@ -59,6 +59,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-0.9.0_pre20200723-cmake_lua_version.patch + "${FILESDIR}"/${P}-gcc11-include.patch ) S="${WORKDIR}/s25client-${COMMIT}" @@ -102,6 +103,9 @@ src_configure() { -DLUA_VERSION=$(lua_get_version) ) + # bug #787299 + append-cxxflags -std=gnu++14 + if use test && tc-is-gcc; then # Work around libasan and libsandbox both wanting to be first. append-ldflags -static-libasan diff --git a/media-gfx/graphviz/graphviz-2.47.1.ebuild b/media-gfx/graphviz/graphviz-2.47.1.ebuild index 17d8c281d0e1..2c8ab4b79137 100644 --- a/media-gfx/graphviz/graphviz-2.47.1.ebuild +++ b/media-gfx/graphviz/graphviz-2.47.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/graphviz/graphviz/-/package_files/9573974/download - LICENSE="CPL-1.0" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris" IUSE="+cairo devil doc examples gtk gts guile java lasi nls pdf perl postscript python qt5 ruby svg tcl X" REQUIRED_USE=" diff --git a/media-libs/libplacebo/metadata.xml b/media-libs/libplacebo/metadata.xml index 898246a18559..b672de855c67 100644 --- a/media-libs/libplacebo/metadata.xml +++ b/media-libs/libplacebo/metadata.xml @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>gentoo@haasn.xyz</email> - <name>Niklas Haas</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Gentoo Proxy Maintainers Project</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="glslang">Use <pkg>dev-util/glslang</pkg> to compile GLSL</flag> <flag name="lcms">Add support for color management via <pkg>media-libs/lcms</pkg></flag> diff --git a/media-libs/phonon-vlc/phonon-vlc-0.11.3.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.11.3-r1.ebuild index 053592789a18..b87d9b50405a 100644 --- a/media-libs/phonon-vlc/phonon-vlc-0.11.3.ebuild +++ b/media-libs/phonon-vlc/phonon-vlc-0.11.3-r1.ebuild @@ -26,7 +26,7 @@ DEPEND=" dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=media-libs/phonon-4.11.0 - media-video/vlc:=[dbus,ogg,vorbis] + media-video/vlc:=[dbus,ogg,vorbis(+)] " RDEPEND="${DEPEND}" diff --git a/media-libs/shaderc/shaderc-2020.5_pre20201216.ebuild b/media-libs/shaderc/shaderc-2020.5_pre20201216.ebuild index aea9fc518e26..f5b20c3034d9 100644 --- a/media-libs/shaderc/shaderc-2020.5_pre20201216.ebuild +++ b/media-libs/shaderc/shaderc-2020.5_pre20201216.ebuild @@ -79,7 +79,7 @@ multilib_src_configure() { multilib_src_compile() { if multilib_is_native_abi && use doc; then - cmake_src_make glslc_doc_README + cmake_src_compile glslc_doc_README fi cmake_src_compile } diff --git a/media-libs/shaderc/shaderc-2020.6_pre20210327.ebuild b/media-libs/shaderc/shaderc-2020.6_pre20210327.ebuild index 871135cebb08..cdce13da42b0 100644 --- a/media-libs/shaderc/shaderc-2020.6_pre20210327.ebuild +++ b/media-libs/shaderc/shaderc-2020.6_pre20210327.ebuild @@ -79,7 +79,7 @@ multilib_src_configure() { multilib_src_compile() { if multilib_is_native_abi && use doc; then - cmake_src_make glslc_doc_README + cmake_src_compile glslc_doc_README fi cmake_src_compile } diff --git a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r4.ebuild b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r4.ebuild new file mode 100644 index 000000000000..ba684b7d6a6b --- /dev/null +++ b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r4.ebuild @@ -0,0 +1,76 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit vdr-plugin-2 + +MY_PV=0.9.13-MKIV-pre3 +MY_P=${PN}-${MY_PV} + +DESCRIPTION="VDR Plugin: play mp3 and ogg on VDR" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI="http://vdr.websitec.de/download/${PN}/${PN}-0.9.13-MKIV-pre3.tar.gz + mirror://gentoo/${PN}-pictures-0.0.1.tar.gz + mirror://gentoo/${PN}-0.0.1_pre4-span-0.0.3.diff.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="oss vorbis" + +DEPEND="media-libs/imlib2 + media-libs/libmad + media-libs/libid3tag + media-libs/libsndfile + media-video/vdr + sys-libs/zlib + vorbis? ( media-libs/libvorbis )" + +DOCS=(HISTORY MANUAL README README-MORONIMO examples/network.sh.example) + +S=${WORKDIR}/mp3ng-0.9.13-MKIV-pre3 + +src_prepare() { + vdr-plugin-2_src_prepare + + # wrt bug 595248 + append-cxxflags $(test-flags-CXX -std=gnu++03) -std=gnu++03 + + eapply -p0 "${FILESDIR}/${PN}-0.0.1_pre4-gentoo.diff" + eapply "${FILESDIR}/${PN}-0.0.1_pre4-gcc4.diff" + eapply "${WORKDIR}/${PN}-0.0.1_pre4-span.diff" + eapply "${FILESDIR}/${PN}-0.0.1_pre4-vdr-1.5.1.diff" + eapply "${FILESDIR}/${PN}-0.0.1_pre4-glibc-2.10.patch" + + use !vorbis && sed -e "s:#WITHOUT_LIBVORBISFILE:WITHOUT_LIBVORBISFILE:" -i Makefile + use oss && sed -e "s:#WITH_OSS_OUTPUT:WITH_OSS_OUTPUT:" -i Makefile + + has_version ">=media-video/vdr-1.3.37" && eapply "${FILESDIR}/${PN}-0.0.1_pre4-1.3.37.diff" + has_version ">=media-gfx/imagemagick-6.4" && eapply "${FILESDIR}/imagemagick-6.4.x.diff" + + sed -i mp3ng.c -e "s:RegisterI18n:// RegisterI18n:" || die + + # >=vdr-2.1.2 + sed -e "s#VideoDirectory#cVideoDirectory::Name\(\)#" -i decoder.c || die + + #wrt bug 705372 + eapply "${FILESDIR}/${P}_gcc-9.patch" + + #wrt bug 740247, 786240 + sed -e "s:while(fgets(buffer,sizeof(buffer),f)>0:while(fgets(buffer,sizeof(buffer),f)> (char *)0:" \ + -i data-mp3.c || die +} + +src_install() { + vdr-plugin-2_src_install + + insinto /etc/vdr/plugins/mp3ng + doins "${FILESDIR}/mp3ngsources" + + insinto /usr/share/vdr/mp3ng + doins "${WORKDIR}/${PN}-pictures-0.0.1"/*.jpg + doins "${S}/images/mp3MKIV-spectrum-analyzer-bg.png" + + newbin examples/mount.sh.example mount-mp3ng.sh +} diff --git a/media-radio/wsjtx/wsjtx-2.3.1.ebuild b/media-radio/wsjtx/wsjtx-2.3.1.ebuild index 87a6ab1b29f6..258aa7b07859 100644 --- a/media-radio/wsjtx/wsjtx-2.3.1.ebuild +++ b/media-radio/wsjtx/wsjtx-2.3.1.ebuild @@ -16,7 +16,7 @@ KEYWORDS="amd64 x86" IUSE="doc" RDEPEND=" - dev-libs/boost:=[python] + dev-libs/boost:=[nls,python] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 diff --git a/media-sound/ecasound/metadata.xml b/media-sound/ecasound/metadata.xml index 7a9880111e68..5b03d2766abd 100644 --- a/media-sound/ecasound/metadata.xml +++ b/media-sound/ecasound/metadata.xml @@ -20,4 +20,7 @@ <flag name="oil">Use <pkg>dev-libs/liboil</pkg> for inner loop optimizations</flag> <flag name="lv2">Add support for Ladspa V2</flag> </use> +<upstream> + <remote-id type="github">kaivehmanen/ecasound</remote-id> +</upstream> </pkgmetadata> diff --git a/media-sound/gigedit/Manifest b/media-sound/gigedit/Manifest index 792c3d0bc999..1ed128009f0a 100644 --- a/media-sound/gigedit/Manifest +++ b/media-sound/gigedit/Manifest @@ -1 +1,2 @@ DIST gigedit-1.1.1.tar.bz2 1146369 BLAKE2B 3a8a42db746d9fdaf713ae29e238c6f0fddcf4f5c1542fe980fb26babd28707bd3831db4f0d9e8aa58621bf1c7e08113315893515e1f445c5be9600e4e1bef12 SHA512 223702628e83e12a292f902e32baa355aca31ee82f1f8b9fed586ec9c0aaec56956d7bdc958238ec64e79b2f4c5ef9246face669b2b3645046e51d8c8289a964 +DIST gigedit-1.2.0.tar.bz2 1174502 BLAKE2B 049e4c60b345c192255669a71588df1e2905590f95351d8a79134b210d03087ac9cc33f12cbf2e38208b95ad452f299c78877632989cd914d98a05c5967087d5 SHA512 b991a5193af34be70db6eb8c18fc58e01b822b6997bfc6c3ee06eca42f57375d341316e8abc594824668c7cb916b0643a1ee1b5c34426bf3ec5e202dfc565c8f diff --git a/media-sound/gigedit/gigedit-1.2.0.ebuild b/media-sound/gigedit/gigedit-1.2.0.ebuild new file mode 100644 index 000000000000..4d2a0ef9057a --- /dev/null +++ b/media-sound/gigedit/gigedit-1.2.0.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools desktop flag-o-matic xdg + +DESCRIPTION="An instrument editor for gig files" +HOMEPAGE="http://www.linuxsampler.org/" +SRC_URI="http://download.linuxsampler.org/packages/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-cpp/gtkmm:2.4 + media-libs/libgig + media-libs/libsndfile + media-sound/linuxsampler" +DEPEND="${RDEPEND}" +BDEPEND=" + sys-devel/gettext + dev-util/intltool + virtual/pkgconfig" + +src_prepare() { + default + # docdir is not propagated there + sed -i '/docdir/d' doc/quickstart/Makefile.am || die + # file missing in pot file + echo src/gigedit/ScriptPatchVars.cpp >> "po/POTFILES.in" || die + eautoreconf +} + +src_configure() { + append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/linuxsampler" + econf --disable-static +} + +src_install() { + default + make_desktop_entry gigedit GigEdit "" "AudioVideo;AudioVideoEditing" + + find "${ED}" -name '*.la' -delete || die +} diff --git a/media-sound/gigedit/gigedit-9999.ebuild b/media-sound/gigedit/gigedit-9999.ebuild index 6aee05e17e9a..aaef3a74634e 100644 --- a/media-sound/gigedit/gigedit-9999.ebuild +++ b/media-sound/gigedit/gigedit-9999.ebuild @@ -2,7 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools desktop xdg subversion + +inherit autotools desktop flag-o-matic xdg subversion DESCRIPTION="An instrument editor for gig files" HOMEPAGE="http://www.linuxsampler.org/" @@ -10,44 +11,35 @@ ESVN_REPO_URI="https://svn.linuxsampler.org/svn/gigedit/trunk" LICENSE="GPL-2" SLOT="0" -KEYWORDS="" -IUSE="" -BDEPEND=" - sys-devel/gettext - >=dev-util/intltool-0.35.0 - virtual/pkgconfig -" -CDEPEND=" +RDEPEND=" dev-cpp/gtkmm:2.4 - >=media-libs/libgig-3.3.0 - >=media-libs/libsndfile-1.0.2 - >=media-sound/linuxsampler-0.5.1 -" + media-libs/libgig + media-libs/libsndfile + media-sound/linuxsampler" DEPEND="${RDEPEND}" -RDEPEND="${CDEPEND}" +BDEPEND=" + sys-devel/gettext + dev-util/intltool + virtual/pkgconfig" src_prepare() { default - # docdir is not propagated there - sed -i "s%\$(datadir)/doc/\$(PACKAGE)%\$(datadir)/doc/${P}%g" doc/quickstart/Makefile.am || die + sed -i '/docdir/d' doc/quickstart/Makefile.am || die + # file missing in pot file + echo src/gigedit/ScriptPatchVars.cpp >> "po/POTFILES.in" || die eautoreconf } src_configure() { + append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/linuxsampler" econf --disable-static } -src_compile() { - emake LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/$(get_libdir)/linuxsampler" -} - src_install() { default - - einfo "Removing static libs..." - find "${D}" -name "*.la" -delete || die "Failed to remove static libs" - make_desktop_entry gigedit GigEdit "" "AudioVideo;AudioVideoEditing" + + find "${ED}" -name '*.la' -delete || die } diff --git a/media-sound/linuxsampler/Manifest b/media-sound/linuxsampler/Manifest index 8bec786238e3..a65394301109 100644 --- a/media-sound/linuxsampler/Manifest +++ b/media-sound/linuxsampler/Manifest @@ -1 +1,2 @@ DIST linuxsampler-2.1.1.tar.bz2 1410461 BLAKE2B dacaab33601f25954ea1a3380c8e28358d2111b664982f25ec9cac46adb99241ecfd53101ca3b23428c1a16fcef738b1e7e481b1c7eeb6d9659773f5b8856b55 SHA512 3f172efe40bbe130a2ac09f9393a46a30cc327a6754a80fdb36e65276518ec82befa2075acc567ccd99c22d9859c1a65f58ff2ad7af70cd9e4649ae14fd5357c +DIST linuxsampler-2.2.0.tar.bz2 1507276 BLAKE2B 9650938d0aace876e817884121b824713dd2f747505344d7895e7d99da62f2214fb4c4bf43c398f4e486202e23e7a57288e19734e8c565a917d823169deb717a SHA512 9015bb8d3af125e13c5c2ef3ae2d3987f7b7dda72e238cff25e622a3291019f5e392195dd27e7e783c70d877d9b267915fc443369eb17117e5eb7c54b8496c68 diff --git a/media-sound/linuxsampler/linuxsampler-2.2.0.ebuild b/media-sound/linuxsampler/linuxsampler-2.2.0.ebuild new file mode 100644 index 000000000000..db469f65a3ab --- /dev/null +++ b/media-sound/linuxsampler/linuxsampler-2.2.0.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic + +DESCRIPTION="Software audio sampler engine with professional grade features" +HOMEPAGE="https://www.linuxsampler.org/" +SRC_URI="https://download.linuxsampler.org/packages/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="alsa doc jack lv2 sf2 sqlite" +REQUIRED_USE="|| ( alsa jack )" + +RDEPEND=" + media-libs/libgig + media-libs/libsndfile[-minimal] + alsa? ( media-libs/alsa-lib ) + jack? ( virtual/jack ) + lv2? ( media-libs/lv2 ) + sqlite? ( dev-db/sqlite ) +" +DEPEND="${RDEPEND} + media-libs/dssi + media-libs/ladspa-sdk +" +BDEPEND=" + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" + +PATCHES=( + "${FILESDIR}/${PN}-2.0.0-nptl-hardened.patch" + "${FILESDIR}/${PN}-2.0.0-lv2-automagic.patch" + "${FILESDIR}/${PN}-2.1.1-fix-yyterror-not-declared.patch" +) + +DOCS=( AUTHORS ChangeLog NEWS README ) + +src_prepare() { + default + # Force regeneration of the file to let it build with all bison + # versions, bug #556204 + rm src/network/lscpparser.cpp || die + eautoreconf +} + +src_configure() { + local myeconfargs=( + --disable-arts-driver + --disable-static + $(use_enable alsa alsa-driver) + $(use_enable jack jack-driver) + $(use_enable lv2) + $(use_enable sqlite instruments-db) + $(use_enable sf2 sf2-engine) + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + emake + use doc && emake docs +} + +src_install() { + use doc && local HTML_DOCS=( doc/html/. ) + default + find "${D}" -name '*.la' -delete || die + + # lscp files conflict with nilfs-utils, bug #556330 + mv "${D}/usr/bin/lscp" "${D}/usr/bin/lscp-${PN}" || die + mv "${D}/usr/share/man/man1/lscp.1" "${D}/usr/share/man/man1/lscp-${PN}.1" || die +} diff --git a/media-sound/linuxsampler/linuxsampler-9999.ebuild b/media-sound/linuxsampler/linuxsampler-9999.ebuild index bd097fd3cce7..d33e3b81f2f0 100644 --- a/media-sound/linuxsampler/linuxsampler-9999.ebuild +++ b/media-sound/linuxsampler/linuxsampler-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,12 +16,12 @@ IUSE="alsa doc jack lv2 sf2 sqlite" REQUIRED_USE="|| ( alsa jack )" RDEPEND=" - >=media-libs/libgig-4.2.0 + media-libs/libgig media-libs/libsndfile[-minimal] alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) lv2? ( media-libs/lv2 ) - sqlite? ( >=dev-db/sqlite-3.3 ) + sqlite? ( dev-db/sqlite ) " DEPEND="${RDEPEND} media-libs/dssi diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index bedf9da95111..2b38b101ed45 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -1,2 +1,3 @@ DIST vlc-3.0-3.0.12.1.tar.gz 34233801 BLAKE2B 0bc571d8f3f8aa40eee93fe8ab13bd1f37e288372d46b13998986899d03bf327b300a98ec5736bb9fe7bb58aae65c1d469786a4dfdb80f4cf8b5bbbb250ee45d SHA512 05b079dcfd4a21cdae7bb19e9d71f2fad33ca846852683c5d2ca6d45f779749ead420d5211b4acce76971d7ec2265d0d07f970f35f647dd446e337dc31aa0ec1 DIST vlc-3.0-3.0.13.tar.gz 34356102 BLAKE2B 93490278f47ab389c927a44bc84727b8067a9792e5621b3a9caa90c23a25ecb11244ebd62aa2dfb6d03df692c1ce3ae2aaec20aff001bb805f3965357298b4c9 SHA512 58439ef605ddc43aaf3fbd41715d3e341565590db3d73256ea3a977544f287d8f5001eb334a70674b707ccdc584125a24a3f320b3b4d166c01450d53741a4f85 +DIST vlc-3.0-3.0.14.tar.gz 34355555 BLAKE2B e8182229da1fe4f73b640fad8005ec3fc49da70f289bd32c33fcec51bf81d393b067a795626bad57c87499e8de181ac3ce159e572431e794586753c4a7c32597 SHA512 6d366c0f17a8bda7f588ab1818d985bccd076dd821bc83dd7d06827d463931e56cb06ca934622ee2cda4a76b0fbe265a66e4566e9307abc768b76174020f0150 diff --git a/media-video/vlc/vlc-3.0.14.ebuild b/media-video/vlc/vlc-3.0.14.ebuild new file mode 100644 index 000000000000..935a496030c1 --- /dev/null +++ b/media-video/vlc/vlc-3.0.14.ebuild @@ -0,0 +1,513 @@ +# Copyright 2000-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..2} ) + +MY_PV="${PV/_/-}" +MY_PV="${MY_PV/-beta/-test}" +MY_P="${PN}-${MY_PV}" +if [[ ${PV} = *9999 ]] ; then + if [[ ${PV%.9999} != ${PV} ]] ; then + EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git" + else + EGIT_REPO_URI="https://git.videolan.org/git/vlc.git" + fi + inherit git-r3 +else + SRC_URI="https://code.videolan.org/videolan/vlc-$(ver_cut 1-2)/-/archive/${PV}/vlc-$(ver_cut 1-2)-${PV}.tar.gz" + S="${WORKDIR}/${PN}-$(ver_cut 1-2)-${PV}" + #if [[ ${MY_P} = ${P} ]] ; then + # SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz" + #else + # SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz" + #fi + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86" +fi + +inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg + +DESCRIPTION="Media player and framework with support for most multimedia files and streaming" +HOMEPAGE="https://www.videolan.org/vlc/" + +LICENSE="LGPL-2.1 GPL-2" +SLOT="0/5-9" # vlc - vlccore + +IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast + dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac + fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate + libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc + live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses + nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp + run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib + theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X + x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx + cpu_flags_x86_sse +" +REQUIRED_USE=" + chromecast? ( encode ) + directx? ( ffmpeg ) + fontconfig? ( truetype ) + libcaca? ( X ) + libtar? ( skins ) + libtiger? ( kate ) + lua? ( ${LUA_REQUIRED_USE} ) + skins? ( qt5 truetype X xml ) + ssl? ( gcrypt ) + vaapi? ( ffmpeg X ) + vdpau? ( ffmpeg X ) +" +BDEPEND=" + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + lua? ( ${LUA_DEPS} ) + amd64? ( dev-lang/yasm ) + x86? ( dev-lang/yasm ) +" +RDEPEND=" + media-libs/libvorbis + net-dns/libidn:= + sys-libs/zlib[minizip] + virtual/libintl + virtual/opengl + a52? ( media-libs/a52dec ) + alsa? ( media-libs/alsa-lib ) + aom? ( media-libs/libaom:= ) + archive? ( app-arch/libarchive:= ) + aribsub? ( media-libs/aribb24 ) + bidi? ( + dev-libs/fribidi + media-libs/freetype:2[harfbuzz] + media-libs/harfbuzz + virtual/ttf-fonts + ) + bluray? ( >=media-libs/libbluray-1.3.0:= ) + cddb? ( media-libs/libcddb ) + chromaprint? ( media-libs/chromaprint:= ) + chromecast? ( + >=dev-libs/protobuf-2.5.0:= + >=net-libs/libmicrodns-0.1.2:= + ) + dav1d? ( media-libs/dav1d:= ) + dbus? ( sys-apps/dbus ) + dc1394? ( + media-libs/libdc1394:2 + sys-libs/libraw1394 + ) + dts? ( media-libs/libdca ) + dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) + dvd? ( + >=media-libs/libdvdnav-6.1.1:0= + >=media-libs/libdvdread-6.1.2:0= + ) + faad? ( media-libs/faad2 ) + fdk? ( media-libs/fdk-aac:= ) + ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) + flac? ( + media-libs/flac + media-libs/libogg + ) + fluidsynth? ( media-sound/fluidsynth:= ) + fontconfig? ( media-libs/fontconfig:1.0 ) + gcrypt? ( + dev-libs/libgcrypt:0= + dev-libs/libgpg-error + ) + gme? ( media-libs/game-music-emu ) + gnome-keyring? ( app-crypt/libsecret ) + gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) + ieee1394? ( + sys-libs/libavc1394 + sys-libs/libraw1394 + ) + jack? ( virtual/jack ) + jpeg? ( virtual/jpeg:0 ) + kate? ( media-libs/libkate ) + libass? ( + media-libs/fontconfig:1.0 + media-libs/libass:= + ) + libcaca? ( media-libs/libcaca ) + libnotify? ( + dev-libs/glib:2 + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/libnotify + ) + libsamplerate? ( media-libs/libsamplerate ) + libtar? ( dev-libs/libtar ) + libtiger? ( media-libs/libtiger ) + linsys? ( media-libs/zvbi ) + lirc? ( app-misc/lirc ) + live? ( media-plugins/live:= ) + lua? ( ${LUA_DEPS} ) + mad? ( media-libs/libmad ) + matroska? ( + >=dev-libs/libebml-1.4.2:= + media-libs/libmatroska:= + ) + modplug? ( >=media-libs/libmodplug-0.8.9.0 ) + mp3? ( media-sound/mpg123 ) + mpeg? ( media-libs/libmpeg2 ) + mtp? ( media-libs/libmtp:= ) + musepack? ( media-sound/musepack-tools ) + ncurses? ( sys-libs/ncurses:0=[unicode] ) + nfs? ( >=net-fs/libnfs-0.10.0:= ) + ogg? ( media-libs/libogg ) + opus? ( >=media-libs/opus-1.0.3 ) + png? ( media-libs/libpng:0= ) + projectm? ( + media-fonts/dejavu + media-libs/libprojectm:0= + ) + pulseaudio? ( media-sound/pulseaudio ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + X? ( + dev-qt/qtx11extras:5 + x11-libs/libX11 + ) + ) + rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) + samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) + sdl-image? ( media-libs/sdl-image ) + sftp? ( net-libs/libssh2 ) + shout? ( media-libs/libshout ) + sid? ( media-libs/libsidplay:2 ) + skins? ( + x11-libs/libXext + x11-libs/libXinerama + x11-libs/libXpm + ) + soxr? ( >=media-libs/soxr-0.1.2 ) + speex? ( + >=media-libs/speex-1.2.0 + media-libs/speexdsp + ) + srt? ( >=net-libs/srt-1.4.2 ) + ssl? ( net-libs/gnutls:= ) + svg? ( + gnome-base/librsvg:2 + x11-libs/cairo + ) + taglib? ( >=media-libs/taglib-1.9 ) + theora? ( media-libs/libtheora ) + tremor? ( media-libs/tremor ) + truetype? ( + media-libs/freetype:2 + virtual/ttf-fonts + !fontconfig? ( media-fonts/dejavu ) + ) + twolame? ( media-sound/twolame ) + udev? ( virtual/udev ) + upnp? ( net-libs/libupnp:=[ipv6] ) + v4l? ( media-libs/libv4l:= ) + vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) + vdpau? ( x11-libs/libvdpau ) + vnc? ( net-libs/libvncserver ) + vpx? ( media-libs/libvpx:= ) + wayland? ( + >=dev-libs/wayland-1.15 + dev-libs/wayland-protocols + ) + X? ( + x11-libs/libX11 + x11-libs/libxcb + x11-libs/xcb-util + x11-libs/xcb-util-keysyms + ) + x264? ( >=media-libs/x264-0.0.20190214:= ) + x265? ( media-libs/x265:= ) + xml? ( dev-libs/libxml2:2 ) + zeroconf? ( net-dns/avahi[dbus] ) + zvbi? ( media-libs/zvbi ) +" +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system + "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164 + "${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290 + "${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch + "${FILESDIR}"/${PN}-3.0.11.1-srt-1.4.2.patch # bug 758062 + "${FILESDIR}"/${PN}-3.0.13-srt-1.3.0.patch +) + +DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) + +pkg_setup() { + if use lua; then + lua-single_pkg_setup + fi +} + +src_prepare() { + xdg_src_prepare # bug 608256 + + has_version 'net-libs/libupnp:1.8' && \ + eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch + + # Bootstrap when we are on a git checkout. + if [[ ${PV} = *9999 ]] ; then + ./bootstrap + fi + + # Make it build with libtool 1.5 + #rm m4/lt* m4/libtool.m4 || die + + # We are not in a real git checkout due to the absence of a .git directory. + touch src/revision.txt || die + + # Don't use --started-from-file when not using dbus. + if ! use dbus ; then + sed -i 's/ --started-from-file//' share/vlc.desktop.in || die + fi + + # Disable running of vlc-cache-gen, we do that in pkg_postinst + sed -e "/test.*build.*host/s/\$(host)/nothanks/" \ + -i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen" + + # Fix gettext version mismatch errors. + sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die + + eautoreconf + + # Disable automatic running of tests. + find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die +} + +src_configure() { + local -x BUILDCC=$(tc-getBUILD_CC) + + local myeconfargs=( + --disable-aa + --disable-optimizations + --disable-rpath + --disable-update-check + --enable-fast-install + --enable-screen + --enable-vcd + --enable-vlc + --enable-vorbis + $(use_enable a52) + $(use_enable alsa) + $(use_enable aom) + $(use_enable archive) + $(use_enable aribsub) + $(use_enable bidi fribidi) + $(use_enable bidi harfbuzz) + $(use_enable bluray) + $(use_enable cddb libcddb) + $(use_enable chromaprint) + $(use_enable chromecast) + $(use_enable chromecast microdns) + $(use_enable cpu_flags_arm_neon neon) + $(use_enable cpu_flags_ppc_altivec altivec) + $(use_enable cpu_flags_x86_mmx mmx) + $(use_enable cpu_flags_x86_sse sse) + $(use_enable dav1d) + $(use_enable dbus) + $(use_enable dbus kwallet) + $(use_enable dc1394) + $(use_enable debug) + $(use_enable directx) + $(use_enable directx d3d11va) + $(use_enable directx dxva2) + $(use_enable dts dca) + $(use_enable dvbpsi) + $(use_enable dvd dvdnav) + $(use_enable dvd dvdread) + $(use_enable encode sout) + $(use_enable encode vlm) + $(use_enable faad) + $(use_enable fdk fdkaac) + $(use_enable ffmpeg avcodec) + $(use_enable ffmpeg avformat) + $(use_enable ffmpeg postproc) + $(use_enable ffmpeg swscale) + $(use_enable flac) + $(use_enable fluidsynth) + $(use_enable fontconfig) + $(use_enable gcrypt libgcrypt) + $(use_enable gme) + $(use_enable gnome-keyring secret) + $(use_enable gstreamer gst-decode) + $(use_enable ieee1394 dv1394) + $(use_enable jack) + $(use_enable jpeg) + $(use_enable kate) + $(use_enable libass) + $(use_enable libcaca caca) + $(use_enable libnotify notify) + $(use_enable libsamplerate samplerate) + $(use_enable libtar) + $(use_enable libtiger tiger) + $(use_enable linsys) + $(use_enable lirc) + $(use_enable live live555) + $(use_enable lua) + $(use_enable macosx-notifications osx-notifications) + $(use_enable mad) + $(use_enable matroska) + $(use_enable modplug mod) + $(use_enable mp3 mpg123) + $(use_enable mpeg libmpeg2) + $(use_enable mtp) + $(use_enable musepack mpc) + $(use_enable ncurses) + $(use_enable nfs) + $(use_enable ogg) + $(use_enable omxil) + $(use_enable omxil omxil-vout) + $(use_enable optimisememory optimize-memory) + $(use_enable opus) + $(use_enable png) + $(use_enable projectm) + $(use_enable pulseaudio pulse) + $(use_enable qt5 qt) + $(use_enable rdp freerdp) + $(use_enable run-as-root) + $(use_enable samba smbclient) + $(use_enable sdl-image) + $(use_enable sftp) + $(use_enable shout) + $(use_enable sid) + $(use_enable skins skins2) + $(use_enable soxr) + $(use_enable speex) + $(use_enable srt) + $(use_enable ssl gnutls) + $(use_enable svg) + $(use_enable svg svgdec) + $(use_enable taglib) + $(use_enable theora) + $(use_enable tremor) + $(use_enable twolame) + $(use_enable udev) + $(use_enable upnp) + $(use_enable v4l v4l2) + $(use_enable vaapi libva) + $(use_enable vdpau) + $(use_enable vnc) + $(use_enable vpx) + $(use_enable wayland) + $(use_with X x) + $(use_enable X xcb) + $(use_enable X xvideo) + $(use_enable x264) + $(use_enable x264 x26410b) + $(use_enable x265) + $(use_enable xml libxml2) + $(use_enable zeroconf avahi) + $(use_enable zvbi) + $(use_enable !zvbi telx) + --with-kde-solid="${EPREFIX}"/usr/share/solid/actions + --disable-asdcp + --disable-coverage + --disable-cprof + --disable-crystalhd + --disable-decklink + --disable-gles2 + --disable-goom + --disable-kai + --disable-kva + --disable-libplacebo + --disable-maintainer-mode + --disable-merge-ffmpeg + --disable-mfx + --disable-mmal + --disable-opencv + --disable-opensles + --disable-oss + --disable-rpi-omxil + --disable-schroedinger + --disable-shine + --disable-sndio + --disable-spatialaudio + --disable-vsxu + --disable-wasapi + --disable-wma-fixed + ) + # ^ We don't have these disabled libraries in the Portage tree yet. + + # Compatibility fix for Samba 4. + use samba && append-cppflags "-I/usr/include/samba-4.0" + + if use x86; then + # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996 + append-cflags $(test-flags-CC -fno-stack-check) + # Bug 569774 + replace-flags -Os -O2 + fi + + # VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8 + append-cxxflags -std=c++11 + + if use omxil; then + # bug #723006 + # https://trac.videolan.org/vlc/ticket/24617 + append-cflags -fcommon + fi + + # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory... + append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/" + + if use truetype || use bidi; then + myeconfargs+=( --enable-freetype ) + else + myeconfargs+=( --disable-freetype ) + fi + + if use truetype || use projectm; then + local dejavu="${EPREFIX}/usr/share/fonts/dejavu/" + myeconfargs+=( + --with-default-font=${dejavu}/DejaVuSans.ttf + --with-default-font-family=Sans + --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf + --with-default-monospace-font-family=Monospace + ) + fi + + econf "${myeconfargs[@]}" + + # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo. + # Other values may break the build (bug 523144), so definition should not be removed. + # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h + sed -i '1i#undef _FORTIFY_SOURCE' config.h || die +} + +src_test() { + virtx emake check-TESTS +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then + einfo "Running ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/" + "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" "${EROOT}/usr/$(get_libdir)/vlc/plugins/" + else + ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)" + ewarn "Please run ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen manually" + ewarn "If you do not do it, vlc will take a long time to load." + fi + + xdg_pkg_postinst +} + +pkg_postrm() { + if [[ -e "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then + rm "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat" + fi + + xdg_pkg_postrm +} diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild index 2017c3d83411..ae09b448136d 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.9999.ebuild @@ -38,7 +38,7 @@ IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame - udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X x264 x265 xml zeroconf zvbi + udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse " REQUIRED_USE=" @@ -62,6 +62,7 @@ BDEPEND=" x86? ( dev-lang/yasm ) " RDEPEND=" + media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl @@ -204,7 +205,6 @@ RDEPEND=" vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) - vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 @@ -290,6 +290,7 @@ src_configure() { --enable-screen --enable-vcd --enable-vlc + --enable-vorbis $(use_enable a52) $(use_enable alsa) $(use_enable aom) @@ -390,7 +391,6 @@ src_configure() { $(use_enable vaapi libva) $(use_enable vdpau) $(use_enable vnc) - $(use_enable vorbis) $(use_enable vpx) $(use_enable wayland) $(use_with X x) diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index 875389cc8ba9..d8edc34b878c 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -38,7 +38,7 @@ IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d loudness lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype - twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X x264 x265 xml zeroconf + twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse " REQUIRED_USE=" @@ -62,6 +62,7 @@ BDEPEND=" x86? ( dev-lang/yasm ) " RDEPEND=" + media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl @@ -206,7 +207,6 @@ RDEPEND=" vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) - vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 @@ -292,6 +292,7 @@ src_configure() { --enable-screen --enable-vcd --enable-vlc + --enable-vorbis $(use_enable a52) $(use_enable alsa) $(use_enable aom) @@ -394,7 +395,6 @@ src_configure() { $(use_enable vaapi libva) $(use_enable vdpau) $(use_enable vnc) - $(use_enable vorbis) $(use_enable vpx) $(use_enable wayland) $(use_with X x) diff --git a/media-video/webcamoid/files/webcamoid-8.7.1-gcc11.patch b/media-video/webcamoid/files/webcamoid-8.7.1-gcc11.patch new file mode 100644 index 000000000000..d228210a19ee --- /dev/null +++ b/media-video/webcamoid/files/webcamoid-8.7.1-gcc11.patch @@ -0,0 +1,12 @@ +diff --git a/libAvKys/Plugins/VirtualCamera/src/VCamUtils/src/image/videoformat.cpp b/libAvKys/Plugins/VirtualCamera/src/VCamUtils/src/image/videoformat.cpp +index 2a32732..5175d1d 100644 +--- a/libAvKys/Plugins/VirtualCamera/src/VCamUtils/src/image/videoformat.cpp ++++ b/libAvKys/Plugins/VirtualCamera/src/VCamUtils/src/image/videoformat.cpp +@@ -19,6 +19,7 @@ + + #include <map> + #include <algorithm> ++#include <limits> + + #include "videoformat.h" + #include "../utils.h" diff --git a/media-video/webcamoid/webcamoid-8.7.1.ebuild b/media-video/webcamoid/webcamoid-8.7.1.ebuild index e2492b146025..eb5217846b13 100644 --- a/media-video/webcamoid/webcamoid-8.7.1.ebuild +++ b/media-video/webcamoid/webcamoid-8.7.1.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 @@ -44,6 +44,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/${PN}-8.7.1-gcc11.patch +) + src_configure() { local myqmakeargs=( "CONFIG+=debug" diff --git a/net-analyzer/suricata/files/suricata-5.0.6_configure-no-sphinx-pdflatex-automagic.patch b/net-analyzer/suricata/files/suricata-5.0.6_configure-no-sphinx-pdflatex-automagic.patch new file mode 100644 index 000000000000..be5805e67f87 --- /dev/null +++ b/net-analyzer/suricata/files/suricata-5.0.6_configure-no-sphinx-pdflatex-automagic.patch @@ -0,0 +1,26 @@ +No configure options to disable looking for these, redundant for releases +because the tarballs already contain both PDF documentation and man pages, +and as of 2021-05-11 doc generation is not compatible with sphinx-4.0.0+ +due to conf.py calling long-deprecated app.add_stylesheet() rather +than app.add_css_file(). + +--- a/configure.ac ++++ b/configure.ac +@@ -2423,7 +2423,7 @@ + fi + + # sphinx for documentation +- AC_PATH_PROG(HAVE_SPHINXBUILD, sphinx-build, "no") ++ HAVE_SPHINXBUILD="no" + if test "$HAVE_SPHINXBUILD" = "no"; then + enable_sphinxbuild=no + if test -e "$srcdir/doc/userguide/suricata.1"; then +@@ -2434,7 +2434,7 @@ + AM_CONDITIONAL([HAVE_SURICATA_MAN], [test "x$have_suricata_man" = "xyes"]) + + # pdflatex for the pdf version of the user manual +- AC_PATH_PROG(HAVE_PDFLATEX, pdflatex, "no") ++ HAVE_PDFLATEX="no" + if test "$HAVE_PDFLATEX" = "no"; then + enable_pdflatex=no + fi diff --git a/net-analyzer/suricata/suricata-5.0.6.ebuild b/net-analyzer/suricata/suricata-5.0.6.ebuild index 46d1458df40e..defd0c6f7f87 100644 --- a/net-analyzer/suricata/suricata-5.0.6.ebuild +++ b/net-analyzer/suricata/suricata-5.0.6.ebuild @@ -56,6 +56,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch" "${FILESDIR}/${PN}-5.0.1_default-config.patch" + "${FILESDIR}/${PN}-5.0.6_configure-no-sphinx-pdflatex-automagic.patch" ) pkg_pretend() { diff --git a/net-analyzer/suricata/suricata-6.0.2.ebuild b/net-analyzer/suricata/suricata-6.0.2.ebuild index 7171dc94415d..061242b9a529 100644 --- a/net-analyzer/suricata/suricata-6.0.2.ebuild +++ b/net-analyzer/suricata/suricata-6.0.2.ebuild @@ -55,6 +55,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch" + "${FILESDIR}/${PN}-5.0.6_configure-no-sphinx-pdflatex-automagic.patch" "${FILESDIR}/${PN}-6.0.0_default-config.patch" ) diff --git a/net-libs/gnutls/gnutls-3.7.1.ebuild b/net-libs/gnutls/gnutls-3.7.1.ebuild index 46883e05c481..2a251871c77b 100644 --- a/net-libs/gnutls/gnutls-3.7.1.ebuild +++ b/net-libs/gnutls/gnutls-3.7.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz" LICENSE="GPL-3 LGPL-2.1+" SLOT="0/30" # libgnutls.so number -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind" REQUIRED_USE=" diff --git a/net-mail/notmuch/notmuch-0.31.3.ebuild b/net-mail/notmuch/notmuch-0.31.3.ebuild index 57d73612bb36..b1be4d8f3e52 100644 --- a/net-mail/notmuch/notmuch-0.31.3.ebuild +++ b/net-mail/notmuch/notmuch-0.31.3.ebuild @@ -35,7 +35,7 @@ BDEPEND=" dev-lang/perl ) doc? ( - dev-python/sphinx + <dev-python/sphinx-4 sys-apps/texinfo ) python? ( dev-python/pytest[${PYTHON_USEDEP}] ) diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest index ee1e802a5b95..8cb68e041dc7 100644 --- a/net-misc/asterisk/Manifest +++ b/net-misc/asterisk/Manifest @@ -1,5 +1,7 @@ DIST asterisk-13.38.2.tar.gz 33708267 BLAKE2B f8c188f6500a01e807982518486972c18f8f903285910e64b4d8e2a4f553d42534f910696a02ab13e371dbd83dfd932c5cb7a6cea08817862ecaddcc7afd99d2 SHA512 bd9755503048cd8dcf8e39947dd5cfb617c20c4b1ad5033ae297499a4967c06ba11b6e43233c1ae0d33f8f11a81dbb9b4487f16a1f4786007172028caf1ee051 DIST asterisk-16.16.2.tar.gz 27808852 BLAKE2B dc05fe7c797f9b848c918121ffe7e7648bca75fccb70412fcd39f37beb3fd33e7d64cd198919cb6ae2867cd685651497ae15a30fb280988a9c7184e80de235ae SHA512 9e47ea2906a2c0d1a2f527d106ef6200a8d0cce76a31a6cfb3ca720a2ef7b5f723ae5c6266c74b0bdfd5718346e8d01a30fc346981463fa4ee7a4b7c99a67928 DIST asterisk-16.17.0.tar.gz 27836573 BLAKE2B f01b499cdd9659403df2d422dc4140f3ade66384fc4bf72b220c4179ada5723e2ce07f0c76c473d9fb5bd14a83357c55145c7d5c840ef29c754b05d337f8709e SHA512 ea142028974beffc6e8e87a780eb3928c4542eb7886246eb689fc4f61191e4bf05477aabd24c98f14e69504e5afec29cea33aeab4fefcc8fbd48c72592b630c2 +DIST asterisk-16.18.0.tar.gz 27843069 BLAKE2B 643c371b4747111e233c0758efb529e7f54f1deeff10e65fb05f3a1a58c4ba5c139bdb583d2a2552e29aacac5d0f3980fd9aeb19fda2513843fbe0c849dec217 SHA512 025a30a1eed1d2cd14eb1345e1e0edfcc23b4c517e0d33da7d06d97b3ffa3c9ce9c2fe9449109eefade6d62b6205b598fecb69245adb04f03bd53f8482fbd7ad DIST asterisk-18.2.2.tar.gz 27888521 BLAKE2B 5837b6434568a8e9f7a8963098994ccb487cfe9b85d59b30e5866e4eb67d222c4ac2c77036f7d461de72acc6ffd07fcd2d56bcaa618f4aecdbdba60d609eeb93 SHA512 e15fe3c7f46d49991bcb6f6f565f15e4af0d658b4cd6b091079209dd95a8027858effdc2f2314d72ed46a73cdebc089d3c27d5cf8db50d2d21f3c317a8a4a546 DIST asterisk-18.3.0.tar.gz 27917957 BLAKE2B df4589291a1b8c815acc63650c1a1c6febef4147b849114fad13c84754f23c8a960b1ebc865c4e4fa33e63a841c11f2d0a5474980a406df94a654622b4a4b6f0 SHA512 7625d6c2c1069acde8dcb94f54dc3016cbb63c70eab7e0a86768be79ffe2286691367cd32df372d695e63f58919246e5c2dca98bec9389d7a4b09dced5bf8ecb +DIST asterisk-18.4.0.tar.gz 27926601 BLAKE2B 1a4089ee274732462a8e480d449e4043f7393a6df0b78dd3ea341d3996b9e433066e6d7c53b3ab334db5946a4b847ac02abb4afc5747b6f541cad81a6d58d468 SHA512 024d0a5c75d55fe614ba6219aece62778e9522a0f8365d57192aa5aa22be94d45a3bed69ac14659738e97dd98967533c13096a855366083e6df2b7800e684602 diff --git a/net-misc/asterisk/asterisk-13.38.2-r1.ebuild b/net-misc/asterisk/asterisk-13.38.2-r2.ebuild index f5cfeb45ac9c..44754c3a017f 100644 --- a/net-misc/asterisk/asterisk-13.38.2-r1.ebuild +++ b/net-misc/asterisk/asterisk-13.38.2-r2.ebuild @@ -32,6 +32,7 @@ PATCHES=( "${FILESDIR}/${PN}-13.38.1-r1-func_lock-fix-races.patch" "${FILESDIR}/${PN}-13.18.1-r2-autoconf-2.70.patch" "${FILESDIR}/${PN}-13.38.2-r1-menuselect-exitcodes.patch" + "${FILESDIR}/${PN}-13.38.2-r2-func_odbc_minargs-ARGC.patch" ) DEPEND="acct-user/asterisk diff --git a/net-misc/asterisk/asterisk-16.18.0.ebuild b/net-misc/asterisk/asterisk-16.18.0.ebuild new file mode 100644 index 000000000000..fd51937b8461 --- /dev/null +++ b/net-misc/asterisk/asterisk-16.18.0.ebuild @@ -0,0 +1,318 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..4} ) + +inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles + +DESCRIPTION="Asterisk: A Modular Open Source PBX System" +HOMEPAGE="https://www.asterisk.org/" +SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0/${PV%%.*}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + +IUSE_VOICEMAIL_STORAGE=( + +voicemail_storage_file + voicemail_storage_odbc + voicemail_storage_imap +) +IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog unbound vorbis xmpp" +IUSE_EXPAND="VOICEMAIL_STORAGE" +REQUIRED_USE="gtalk? ( xmpp ) + lua? ( ${LUA_REQUIRED_USE} ) + ^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} ) + voicemail_storage_odbc? ( odbc ) +" + +PATCHES=( + "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch" +) + +DEPEND="acct-user/asterisk + acct-group/asterisk + dev-db/sqlite:3 + dev-libs/popt + >=dev-libs/jansson-2.11 + dev-libs/libedit + dev-libs/libxml2:2 + dev-libs/libxslt + sys-apps/util-linux + sys-libs/ncurses:0= + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + bluetooth? ( net-wireless/bluez:= ) + calendar? ( + net-libs/neon:= + dev-libs/libical:= + dev-libs/iksemel + ) + caps? ( sys-libs/libcap ) + blocks? ( sys-libs/blocksruntime ) + cluster? ( sys-cluster/corosync ) + codec2? ( media-libs/codec2:= ) + curl? ( net-misc/curl ) + dahdi? ( + net-libs/libpri + net-misc/dahdi-tools + ) + freetds? ( dev-db/freetds ) + gtalk? ( dev-libs/iksemel ) + http? ( dev-libs/gmime:2.6 ) + iconv? ( virtual/libiconv ) + ilbc? ( media-libs/libilbc ) + ldap? ( net-nds/openldap ) + lua? ( ${LUA_DEPS} ) + mysql? ( dev-db/mysql-connector-c:= ) + newt? ( dev-libs/newt ) + odbc? ( dev-db/unixODBC ) + pjproject? ( >=net-libs/pjproject-2.9 ) + portaudio? ( media-libs/portaudio ) + postgres? ( dev-db/postgresql:* ) + radius? ( net-dialup/freeradius-client ) + snmp? ( net-analyzer/net-snmp:= ) + span? ( media-libs/spandsp ) + speex? ( + media-libs/libogg + media-libs/speex + media-libs/speexdsp + ) + srtp? ( net-libs/libsrtp:0 ) + ssl? ( + dev-libs/openssl:0= + ) + unbound? ( net-dns/unbound ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) + voicemail_storage_imap? ( virtual/imap-c-client ) + xmpp? ( dev-libs/iksemel ) +" + +RDEPEND="${DEPEND} + net-misc/asterisk-core-sounds + net-misc/asterisk-extra-sounds + net-misc/asterisk-moh-opsound + selinux? ( sec-policy/selinux-asterisk ) + syslog? ( virtual/logger )" + +BDEPEND="dev-libs/libxml2:2 + virtual/pkgconfig" + +QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" + +pkg_pretend() { + CONFIG_CHECK="~!NF_CONNTRACK_SIP" + local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users + have reported that this module dropped critical SIP packets in their deployments. You + may want to disable it if you see such problems." + check_extra_config + + [[ "${MERGE_TYPE}" == binary ]] && return + + if tc-is-clang; then + use blocks || die "CC=clang requires USE=blocks" + else + use blocks && die "USE=blocks can only be used with CC=clang" + fi +} + +pkg_setup() { + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf +} + +src_configure() { + local vmst + + econf \ + LUA_VERSION="${ELUA#lua}" \ + --libdir="/usr/$(get_libdir)" \ + --localstatedir="/var" \ + --with-crypto \ + --with-gsm=internal \ + --with-popt \ + --with-z \ + --with-libedit \ + --without-jansson-bundled \ + --without-pjproject-bundled \ + $(use_with caps cap) \ + $(use_with codec2) \ + $(use_with lua lua) \ + $(use_with http gmime) \ + $(use_with newt) \ + $(use_with pjproject) \ + $(use_with portaudio) \ + $(use_with ssl) \ + $(use_with unbound) + + _menuselect() { + menuselect/menuselect "$@" || die "menuselect $* failed." + } + + _use_select() { + local state=$(use "$1" && echo enable || echo disable) + shift # remove use from parameters + + while [[ -n $1 ]]; do + _menuselect --${state} "$1" menuselect.makeopts + shift + done + } + + # Blank out sounds/sounds.xml file to prevent + # asterisk from installing sounds files (we pull them in via + # asterisk-{core,extra}-sounds and asterisk-moh-opsound. + >"${S}"/sounds/sounds.xml + + # That NATIVE_ARCH chatter really is quite bothersome + sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system" + + # Compile menuselect binary for optional components + emake NOISY_BUILD=yes menuselect.makeopts + + # Disable BUILD_NATIVE (bug #667498) + _menuselect --disable build_native menuselect.makeopts + + # Broken functionality is forcibly disabled (bug #360143) + _menuselect --disable chan_misdn menuselect.makeopts + _menuselect --disable chan_ooh323 menuselect.makeopts + + # Utility set is forcibly enabled (bug #358001) + _menuselect --enable smsq menuselect.makeopts + _menuselect --enable streamplayer menuselect.makeopts + _menuselect --enable aelparse menuselect.makeopts + _menuselect --enable astman menuselect.makeopts + + # this is connected, otherwise it would not find + # ast_pktccops_gate_alloc symbol + _menuselect --enable chan_mgcp menuselect.makeopts + _menuselect --enable res_pktccops menuselect.makeopts + + # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available + _menuselect --enable pbx_dundi menuselect.makeopts + _menuselect --enable func_aes menuselect.makeopts + _menuselect --enable chan_iax2 menuselect.makeopts + + # SQlite3 is now the main database backend, enable related features + _menuselect --enable cdr_sqlite3_custom menuselect.makeopts + _menuselect --enable cel_sqlite3_custom menuselect.makeopts + + # The others are based on USE-flag settings + _use_select alsa chan_alsa + _use_select bluetooth chan_mobile + _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} + _use_select cluster res_corosync + _use_select codec2 codec_codec2 + _use_select curl func_curl res_config_curl res_curl + _use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi + _use_select freetds {cdr,cel}_tds + _use_select gtalk chan_motif + _use_select http res_http_post + _use_select iconv func_iconv + _use_select ilbc codec_ilbc format_ilbc + _use_select ldap res_config_ldap + _use_select lua pbx_lua + _use_select mysql app_mysql cdr_mysql res_config_mysql + _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc + _use_select oss chan_oss + _use_select postgres {cdr,cel}_pgsql res_config_pgsql + _use_select radius {cdr,cel}_radius + _use_select snmp res_snmp + _use_select span res_fax_spandsp + _use_select speex {codec,func}_speex + _use_select speex format_ogg_speex + _use_select srtp res_srtp + _use_select statsd res_statsd res_{endpoint,chan}_stats + _use_select syslog cdr_syslog + _use_select vorbis format_ogg_vorbis + _use_select xmpp res_xmpp + + # Voicemail storage ... + for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do + if use "${vmst#+}"; then + _menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts + fi + done + + if use debug; then + for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do + _menuselect --enable "${o}" menuselect.makeopts + done + fi +} + +src_compile() { + emake ASTCFLAGS="${CFLAGS}" ASTLDFLAGS="${LDFLAGS}" NOISY_BUILD=yes +} + +src_install() { + local d + + dodir "/usr/$(get_libdir)/pkgconfig" + emake DESTDIR="${D}" NOISY_BUILD=yes install + + if use radius; then + insinto /etc/radiusclient/ + doins contrib/dictionary.digium + fi + diropts -m 0750 -o root -g asterisk + keepdir /etc/asterisk + emake NOISY_BUILD=yes DESTDIR="${D}" CONFIG_SRC=configs/samples CONFIG_EXTEN=.sample install-configs + chown root:root "${ED}/etc/asterisk/"* || die "chown root:root of config files failed." + chmod 644 "${ED}/etc/asterisk/"* || die "chmod 644 of config files failed." + + # keep directories + diropts -m 0750 -o asterisk -g root + keepdir /var/lib/asterisk + keepdir /var/spool/asterisk + keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording} + diropts -m 0750 -o asterisk -g asterisk + keepdir /var/log/asterisk/{cdr-csv,cdr-custom} + + newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk + newconfd "${FILESDIR}"/confd-13.32.0 asterisk + + systemd_dounit "${FILESDIR}"/asterisk.service + newtmpfiles "${FILESDIR}"/asterisk.tmpfiles2.conf asterisk.conf + systemd_install_serviced "${FILESDIR}"/asterisk.service.conf + + # Reset diropts else dodoc uses it for doc installations. + diropts -m0755 + + # install the upgrade documentation + dodoc UPGRADE* BUGS CREDITS + + # install extra documentation + use doc && dodoc doc/*.{txt,pdf} + + # install logrotate snippet; bug #329281 + # + insinto /etc/logrotate.d + newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk + + # Asterisk installs a few folders that's empty by design, + # but still required. This finds them, and marks them for + # portage. + while read d < <(find "${ED}"/var -type d -empty || die "Find failed."); do + keepdir "${d#${ED}}" + done +} + +pkg_postinst() { + if [ -z "${REPLACING_VERSIONS}" ]; then + elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net" + elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then + elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:" + elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net" + fi +} diff --git a/net-misc/asterisk/asterisk-18.4.0.ebuild b/net-misc/asterisk/asterisk-18.4.0.ebuild new file mode 100644 index 000000000000..7af5c494233a --- /dev/null +++ b/net-misc/asterisk/asterisk-18.4.0.ebuild @@ -0,0 +1,361 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..4} ) + +inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles + +DESCRIPTION="Asterisk: A Modular Open Source PBX System" +HOMEPAGE="https://www.asterisk.org/" +SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0/${PV%%.*}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + +IUSE_VOICEMAIL_STORAGE=( + voicemail_storage_odbc + voicemail_storage_imap +) +IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug -deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp" +IUSE_EXPAND="VOICEMAIL_STORAGE" +REQUIRED_USE="gtalk? ( xmpp ) + lua? ( ${LUA_REQUIRED_USE} ) + voicemail_storage_odbc? ( odbc ) +" + +PATCHES=( + "${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch" +) + +DEPEND="acct-user/asterisk + acct-group/asterisk + dev-db/sqlite:3 + dev-libs/popt + >=dev-libs/jansson-2.11 + dev-libs/libedit + dev-libs/libxml2:2 + dev-libs/libxslt + sys-apps/util-linux + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + bluetooth? ( net-wireless/bluez:= ) + calendar? ( + net-libs/neon:= + dev-libs/libical:= + dev-libs/iksemel + ) + caps? ( sys-libs/libcap ) + blocks? ( sys-libs/blocksruntime ) + cluster? ( sys-cluster/corosync ) + codec2? ( media-libs/codec2:= ) + curl? ( net-misc/curl ) + dahdi? ( + net-libs/libpri + net-misc/dahdi-tools + ) + freetds? ( dev-db/freetds ) + gtalk? ( dev-libs/iksemel ) + http? ( dev-libs/gmime:2.6 ) + iconv? ( virtual/libiconv ) + ilbc? ( media-libs/libilbc ) + ldap? ( net-nds/openldap ) + lua? ( ${LUA_DEPS} ) + mysql? ( dev-db/mysql-connector-c:= ) + newt? ( dev-libs/newt ) + odbc? ( dev-db/unixODBC ) + pjproject? ( >=net-libs/pjproject-2.9:= ) + portaudio? ( media-libs/portaudio ) + postgres? ( dev-db/postgresql:* ) + radius? ( net-dialup/freeradius-client ) + snmp? ( net-analyzer/net-snmp:= ) + span? ( media-libs/spandsp ) + speex? ( + media-libs/libogg + media-libs/speex + media-libs/speexdsp + ) + srtp? ( net-libs/libsrtp:0 ) + ssl? ( + dev-libs/openssl:0= + ) + systemd? ( sys-apps/systemd ) + !systemd? ( !sys-apps/systemd ) + unbound? ( net-dns/unbound ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) + voicemail_storage_imap? ( virtual/imap-c-client ) + xmpp? ( dev-libs/iksemel ) +" + +RDEPEND="${DEPEND} + net-misc/asterisk-core-sounds + net-misc/asterisk-extra-sounds + net-misc/asterisk-moh-opsound + selinux? ( sec-policy/selinux-asterisk ) + syslog? ( virtual/logger )" + +BDEPEND="dev-libs/libxml2:2 + virtual/pkgconfig" + +QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" + +_make_args=( + "NOISY_BUILD=yes" + "ASTDBDIR=\$(ASTDATADIR)/astdb" + "ASTCACHEDIR=/var/cache/asterisk" + "OPTIMIZE=" + "DEBUG=" + "DESTDIR=${D}" + "CONFIG_SRC=configs/samples" + "CONFIG_EXTEN=.sample" +) + +pkg_pretend() { + CONFIG_CHECK="~!NF_CONNTRACK_SIP" + local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users + have reported that this module dropped critical SIP packets in their deployments. You + may want to disable it if you see such problems." + check_extra_config + + [[ "${MERGE_TYPE}" == binary ]] && return + + if tc-is-clang; then + use blocks || die "CC=clang requires USE=blocks" + else + use blocks && die "USE=blocks can only be used with CC=clang" + fi +} + +pkg_setup() { + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf +} + +src_configure() { + local vmst + local copt cstate + + econf \ + LUA_VERSION="${ELUA#lua}" \ + --libdir="/usr/$(get_libdir)" \ + --localstatedir="/var" \ + --with-crypto \ + --with-gsm=internal \ + --with-popt \ + --with-z \ + --with-libedit \ + --without-jansson-bundled \ + --without-pjproject-bundled \ + $(use_with caps cap) \ + $(use_with codec2) \ + $(use_with lua lua) \ + $(use_with http gmime) \ + $(use_with newt) \ + $(use_with pjproject) \ + $(use_with portaudio) \ + $(use_with ssl) \ + $(use_with unbound) + + _menuselect() { + menuselect/menuselect "$@" || die "menuselect $* failed." + } + + _use_select() { + local state=$(use "$1" && echo enable || echo disable) + shift # remove use from parameters + + while [[ -n $1 ]]; do + _menuselect --${state} "$1" menuselect.makeopts + shift + done + } + + # Blank out sounds/sounds.xml file to prevent + # asterisk from installing sounds files (we pull them in via + # asterisk-{core,extra}-sounds and asterisk-moh-opsound. + >"${S}"/sounds/sounds.xml + + # That NATIVE_ARCH chatter really is quite bothersome + sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system" + + # Compile menuselect binary for optional components + emake "${_make_args[@]}" menuselect.makeopts + + # Disable BUILD_NATIVE (bug #667498) + _menuselect --disable build_native menuselect.makeopts + + # Broken functionality is forcibly disabled (bug #360143) + _menuselect --disable chan_misdn menuselect.makeopts + _menuselect --disable chan_ooh323 menuselect.makeopts + + # Utility set is forcibly enabled (bug #358001) + _menuselect --enable smsq menuselect.makeopts + _menuselect --enable streamplayer menuselect.makeopts + _menuselect --enable aelparse menuselect.makeopts + _menuselect --enable astman menuselect.makeopts + + # this is connected, otherwise it would not find + # ast_pktccops_gate_alloc symbol + _menuselect --enable chan_mgcp menuselect.makeopts + _menuselect --enable res_pktccops menuselect.makeopts + + # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available + _menuselect --enable pbx_dundi menuselect.makeopts + _menuselect --enable func_aes menuselect.makeopts + _menuselect --enable chan_iax2 menuselect.makeopts + + # SQlite3 is now the main database backend, enable related features + _menuselect --enable cdr_sqlite3_custom menuselect.makeopts + _menuselect --enable cel_sqlite3_custom menuselect.makeopts + + # The others are based on USE-flag settings + _use_select alsa chan_alsa + _use_select bluetooth chan_mobile + _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} + _use_select cluster res_corosync + _use_select codec2 codec_codec2 + _use_select curl func_curl res_config_curl res_curl + _use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi + _use_select deprecated app_macro + _use_select freetds {cdr,cel}_tds + _use_select gtalk chan_motif + _use_select http res_http_post + _use_select iconv func_iconv + _use_select ilbc codec_ilbc format_ilbc + _use_select ldap res_config_ldap + _use_select lua pbx_lua + _use_select mysql app_mysql cdr_mysql res_config_mysql + _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc + _use_select oss chan_oss + _use_select postgres {cdr,cel}_pgsql res_config_pgsql + _use_select radius {cdr,cel}_radius + _use_select snmp res_snmp + _use_select span res_fax_spandsp + _use_select speex {codec,func}_speex + _use_select speex format_ogg_speex + _use_select srtp res_srtp + _use_select statsd res_statsd res_{endpoint,chan}_stats + _use_select syslog cdr_syslog + _use_select vorbis format_ogg_vorbis + _use_select xmpp res_xmpp + + # Voicemail storage ... + _menuselect --enable app_voicemail menuselect.makeopts + for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do + if use "${vmst#+}"; then + _menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts + fi + done + + if use debug; then + for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do + _menuselect --enable "${o}" menuselect.makeopts + done + fi + + if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then + for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do + cstate=--enable + [[ "${copt}" == -* ]] && cstate=--disable + ebegin "Custom option ${copt#[-+]} ${cstate:2}d" + _menuselect ${cstate} "${copt#[-+]}" + eend $? + done + fi +} + +src_compile() { + emake "${_make_args[@]}" +} + +src_install() { + local d + + dodir "/usr/$(get_libdir)/pkgconfig" + + diropts -m 0750 -o root -g asterisk + dodir /etc/asterisk + + emake "${_make_args[@]}" install install-headers install-configs + + fowners asterisk: /var/lib/asterisk/astdb + + if use radius; then + insinto /etc/radiusclient/ + doins contrib/dictionary.digium + fi + + # keep directories + diropts -m 0750 -o asterisk -g root + keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording} + diropts -m 0750 -o asterisk -g asterisk + keepdir /var/log/asterisk/{cdr-csv,cdr-custom} + + newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk + newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk + + systemd_dounit "${FILESDIR}"/asterisk.service + newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf + systemd_install_serviced "${FILESDIR}"/asterisk.service.conf + + # Reset diropts else dodoc uses it for doc installations. + diropts -m0755 + + # install the upgrade documentation + dodoc UPGRADE* BUGS CREDITS + + # install extra documentation + use doc && dodoc doc/*.{txt,pdf} + + # install logrotate snippet; bug #329281 + # + insinto /etc/logrotate.d + newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk + + # Asterisk installs a few folders that's empty by design, + # but still required. This finds them, and marks them for + # portage. + while read d < <(find "${ED}"/var -type d -empty || die "Find failed."); do + keepdir "${d#${ED}}" + done +} + +pkg_postinst() { + if [ -z "${REPLACING_VERSIONS}" ]; then + elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net" + elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then + elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:" + elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net" + fi + + if use deprecated; then + ewarn "You really aught to port whatever code you have that depends on this since these are going to go away." + ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation" + fi + + if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then + ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used" + ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org" + fi + + if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then + ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb" + ewarn "You still have a /var/lib/asterisk/astdb.sqlite file. You need to either set" + ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these" + ewarn "steps to migrate:" + ewarn "1. /etc/init.d/asterisk stop" + ewarn "2. mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/" + ewarn "3. /etc/init.d/asterisk start" + ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned." + fi +} diff --git a/net-misc/asterisk/files/asterisk-13.38.2-r2-func_odbc_minargs-ARGC.patch b/net-misc/asterisk/files/asterisk-13.38.2-r2-func_odbc_minargs-ARGC.patch new file mode 100644 index 000000000000..db3817b5242b --- /dev/null +++ b/net-misc/asterisk/files/asterisk-13.38.2-r2-func_odbc_minargs-ARGC.patch @@ -0,0 +1,180 @@ +From d847f7e8f8736e5f51fd11df2992fac87131c1d8 Mon Sep 17 00:00:00 2001 +From: Jaco Kroon <jaco@uls.co.za> +Date: Wed, 17 Feb 2021 22:51:17 +0200 +Subject: [PATCH] func_odbc: Introduce minargs config and expose ARGC in + addition to ARGn. + +minargs enables enforcing of minimum count of arguments to pass to +func_odbc, so if you're unconditionally using ARG1 through ARG4 then +this should be set to 4. func_odbc will generate an error in this case, +so for example + +[FOO] +minargs = 4 + +and ODBC_FOO(a,b,c) in dialplan will now error out instead of using a +potentially leaked ARG4 from Gosub(). + +ARGC is needed if you're using optional argument, to verify whether or +not an argument has been passed, else it's possible to use a leaked ARGn +from Gosub (app_stack). So now you can safely do +${IF($[${ARGC}>3]?${ARGV}:default value)} kind of thing. + +Change-Id: I6ca0b137d90b03f6aa9c496991f6cbf1518f6c24 +Signed-off-by: Jaco Kroon <jaco@uls.co.za> +--- + configs/samples/func_odbc.conf.sample | 11 +++++++ + .../func_odbc_ARGC_minargs.txt | 20 ++++++++++++ + funcs/func_odbc.c | 31 +++++++++++++++++-- + 3 files changed, 60 insertions(+), 2 deletions(-) + create mode 100644 doc/CHANGES-staging/func_odbc_ARGC_minargs.txt + +diff --git a/configs/samples/func_odbc.conf.sample b/configs/samples/func_odbc.conf.sample +index c467f7ec06..b825974ea7 100644 +--- a/configs/samples/func_odbc.conf.sample ++++ b/configs/samples/func_odbc.conf.sample +@@ -23,6 +23,10 @@ + ; For substitution, you have ${ARG1}, ${ARG2} ... ${ARGn} + ; for the arguments to each SQL statement. + ; ++; Additionally you can use ${ARGC} to determine the number of arguments that ++; was actually passed (or risk using leaked ARGn variables from the channel). ++; Also reference the minargs configuration option. ++; + ; In addition, for write statements, you have ${VAL1}, ${VAL2} ... ${VALn} + ; parsed, just like arguments, for the values. In addition, if you want the + ; whole value, never mind the parsing, you can get that with ${VALUE}. +@@ -87,6 +91,13 @@ + ; These additional rows can be returned by using the name of the + ; function which was called to retrieve the first row as an + ; argument to ODBC_FETCH(). ++; minargs The minimum number of ARGUMENTS that has to be passed to the ++; function. If fewer arguments than this is passed, then the call ++; will fail. It is important to note that unlike Gosub() and friends, ++; func_odbc will not mask out ARGn variables that it's not actively ++; using, as such, without this, it's entirely possible to use say ++; ARG2 from the Gosub() inside func_odbc when the intent was to ++; use an argument passed to func_odbc, but it simply was never passed. + + + ; ODBC_SQL - Allow an SQL statement to be built entirely in the dialplan +diff --git a/doc/CHANGES-staging/func_odbc_ARGC_minargs.txt b/doc/CHANGES-staging/func_odbc_ARGC_minargs.txt +new file mode 100644 +index 0000000000..0984b5022d +--- /dev/null ++++ b/doc/CHANGES-staging/func_odbc_ARGC_minargs.txt +@@ -0,0 +1,20 @@ ++Subject: func_odbc ++ ++Introduce an ARGC variable for func_odbc functions, along with a minargs ++per-function configuration option. ++ ++minargs enables enforcing of minimum count of arguments to pass to ++func_odbc, so if you're unconditionally using ARG1 through ARG4 then ++this should be set to 4. func_odbc will generate an error in this case, ++so for example ++ ++[FOO] ++minargs = 4 ++ ++and ODBC_FOO(a,b,c) in dialplan will now error out instead of using a ++potentially leaked ARG4 from Gosub(). ++ ++ARGC is needed if you're using optional argument, to verify whether or ++not an argument has been passed, else it's possible to use a leaked ARGn ++from Gosub (app_stack). So now you can safely do ++${IF($[${ARGC}>3]?${ARGV}:default value)} kind of thing. +diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c +index 5cc0faaa98..9d6d0fc304 100644 +--- a/funcs/func_odbc.c ++++ b/funcs/func_odbc.c +@@ -120,6 +120,7 @@ struct acf_odbc_query { + char *sql_insert; + unsigned int flags; + int rowlimit; ++ int minargs; + struct ast_custom_function *acf; + }; + +@@ -545,6 +546,14 @@ static int acf_odbc_write(struct ast_channel *chan, const char *cmd, char *s, co + return -1; + } + ++ AST_STANDARD_APP_ARGS(args, s); ++ if (args.argc < query->minargs) { ++ ast_log(LOG_ERROR, "%d arguments supplied to '%s' requiring minimum %d\n", ++ args.argc, cmd, query->minargs); ++ AST_RWLIST_UNLOCK(&queries); ++ return -1; ++ } ++ + if (!chan) { + if (!(chan = ast_dummy_channel_alloc())) { + AST_RWLIST_UNLOCK(&queries); +@@ -578,7 +587,8 @@ static int acf_odbc_write(struct ast_channel *chan, const char *cmd, char *s, co + return -1; + } + +- AST_STANDARD_APP_ARGS(args, s); ++ snprintf(varname, sizeof(varname), "%u", args.argc); ++ pbx_builtin_pushvar_helper(chan, "ARGC", varname); + for (i = 0; i < args.argc; i++) { + snprintf(varname, sizeof(varname), "ARG%d", i + 1); + pbx_builtin_pushvar_helper(chan, varname, args.field[i]); +@@ -603,6 +613,8 @@ static int acf_odbc_write(struct ast_channel *chan, const char *cmd, char *s, co + chan = ast_channel_unref(chan); + } else { + /* Restore prior values */ ++ pbx_builtin_setvar_helper(chan, "ARGC", NULL); ++ + for (i = 0; i < args.argc; i++) { + snprintf(varname, sizeof(varname), "ARG%d", i + 1); + pbx_builtin_setvar_helper(chan, varname, NULL); +@@ -756,6 +768,14 @@ static int acf_odbc_read(struct ast_channel *chan, const char *cmd, char *s, cha + return -1; + } + ++ AST_STANDARD_APP_ARGS(args, s); ++ if (args.argc < query->minargs) { ++ ast_log(LOG_ERROR, "%d arguments supplied to '%s' requiring minimum %d\n", ++ args.argc, cmd, query->minargs); ++ AST_RWLIST_UNLOCK(&queries); ++ return -1; ++ } ++ + if (!chan) { + if (!(chan = ast_dummy_channel_alloc())) { + AST_RWLIST_UNLOCK(&queries); +@@ -768,7 +788,8 @@ static int acf_odbc_read(struct ast_channel *chan, const char *cmd, char *s, cha + ast_autoservice_start(chan); + } + +- AST_STANDARD_APP_ARGS(args, s); ++ snprintf(varname, sizeof(varname), "%u", args.argc); ++ pbx_builtin_pushvar_helper(chan, "ARGC", varname); + for (x = 0; x < args.argc; x++) { + snprintf(varname, sizeof(varname), "ARG%d", x + 1); + pbx_builtin_pushvar_helper(chan, varname, args.field[x]); +@@ -780,6 +801,8 @@ static int acf_odbc_read(struct ast_channel *chan, const char *cmd, char *s, cha + chan = ast_channel_unref(chan); + } else { + /* Restore prior values */ ++ pbx_builtin_setvar_helper(chan, "ARGC", NULL); ++ + for (x = 0; x < args.argc; x++) { + snprintf(varname, sizeof(varname), "ARG%d", x + 1); + pbx_builtin_setvar_helper(chan, varname, NULL); +@@ -1290,6 +1313,10 @@ static int init_acf_query(struct ast_config *cfg, char *catg, struct acf_odbc_qu + sscanf(tmp, "%30d", &((*query)->rowlimit)); + } + ++ if ((tmp = ast_variable_retrieve(cfg, catg, "minargs"))) { ++ sscanf(tmp, "%30d", &((*query)->minargs)); ++ } ++ + (*query)->acf = ast_calloc(1, sizeof(struct ast_custom_function)); + if (!(*query)->acf) { + free_acf_query(*query); +-- +2.26.3 + diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest index 6c9cdbb749d8..ecc8ae5adbd7 100644 --- a/net-misc/remmina/Manifest +++ b/net-misc/remmina/Manifest @@ -1,3 +1,2 @@ -DIST Remmina-v1.4.12.tar.gz 2338965 BLAKE2B 86ec07a2c5ff0957cc3d855a4cc86c9675aa474110d7d40d202817f01c4d5815c008a5f0f78802e9b3ef14b3590d58ccbb124e2b6c6f0b14ea8c8592a4d8bd50 SHA512 7ae8031ff64c113b0ed792c6ba56c42918ccce5a30fe0255f730ef7a5a712dc500495e591598fd6cc553c09c6d5a2457e33f4dc1019403e89b25cc02e491515d DIST Remmina-v1.4.13.tar.gz 2519879 BLAKE2B ff2410ffbdea4509866b41e47eaa8caafb7f45091047eff9a830590b7a04c25cbbdec5788ccf9f35afdee613722e74e7595b73b4c3c8eea2fa3ffb4e09411d99 SHA512 cf82dc90f021635bcde906a73a2ad59087fe7cbe1bdd69a828ffc1e04ea0cc1bfa23386b70c36df85ae41dfa17f2d4379bedff29c03d9838c6ac18347e06b6dc -DIST Remmina-v1.4.14.tar.gz 2613799 BLAKE2B 07f6c78bb825395001054cb6274e3a1f45a4b2f678ee2ef629f112550742350a7e3c779a9fcd554a6654ae689cf373d7f6ed543768bdc403b9d3ef96a2ca0a2e SHA512 4114edafd2847c081f0a12cf7c7b4c2f34af554312be755a9897e161002c8dce3708041f6a3fcb340f577a2c3ccc3582909b7d0d4ecbf186f54394e4c6a98c35 +DIST Remmina-v1.4.16.tar.gz 2615347 BLAKE2B 5cff71d94bf66dd0116be739646c33a601a83deb8fef1cfcddf9c197eb34458ea97f6e45e96e7e0bab7fbfb6d95c6150e5c72c6d5aae5f23bfedc8f080e00ade SHA512 a9b42ba95ab9c5f985c5c359d0fb138d73ca5f0f9199cb9e84e522d1e11c50f9fe2b8c943d64242e367f4185fd9eb0c764321ba9d4ab9a09c5c5c1dc37c0ba78 diff --git a/net-misc/remmina/remmina-1.4.12.ebuild b/net-misc/remmina/remmina-1.4.12.ebuild deleted file mode 100644 index a680d0156b38..000000000000 --- a/net-misc/remmina/remmina-1.4.12.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake optfeature xdg - -MY_P="${PN^}-v${PV}" - -DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client" -HOMEPAGE="https://remmina.org/" -SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz" - -LICENSE="GPL-2+-with-openssl-exception" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="appindicator crypt cups examples gnome-keyring kwallet nls spice ssh rdp telemetry telepathy vnc webkit zeroconf" - -DEPEND=" - dev-libs/glib:2 - dev-libs/json-glib - dev-libs/libsodium:= - net-libs/libsoup - x11-libs/gdk-pixbuf - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/libxkbfile - appindicator? ( dev-libs/libappindicator:3 ) - crypt? ( dev-libs/libgcrypt:0= ) - rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] - <net-misc/freerdp-3[X] - cups? ( net-print/cups:= ) ) - gnome-keyring? ( app-crypt/libsecret ) - kwallet? ( kde-frameworks/kwallet ) - dev-libs/openssl:0= - spice? ( net-misc/spice-gtk[gtk3] ) - ssh? ( net-libs/libssh:0=[sftp] - x11-libs/vte:2.91 ) - telepathy? ( net-libs/telepathy-glib ) - vnc? ( net-libs/libvncserver[jpeg] ) - webkit? ( net-libs/webkit-gtk:4 ) - zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) -" -BDEPEND=" - dev-util/intltool - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -RDEPEND=" - ${DEPEND} - virtual/freedesktop-icon-theme -" - -DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md ) - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - xdg_environment_reset - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DWITH_APPINDICATOR=$(usex appindicator) - -DWITH_GCRYPT=$(usex crypt) - -DWITH_EXAMPLES=$(usex examples) - -DWITH_LIBSECRET=$(usex gnome-keyring) - -DWITH_KF5WALLET=$(usex kwallet) - -DWITH_GETTEXT=$(usex nls) - -DWITH_TRANSLATIONS=$(usex nls) - -DWITH_FREERDP=$(usex rdp) - -DWITH_FREERDP3=OFF - -DWITH_CUPS=$(usex cups) - -DWITH_SPICE=$(usex spice) - -DWITH_LIBSSH=$(usex ssh) - -DWITH_VTE=$(usex ssh) - -DWITH_TELEPATHY=$(usex telepathy) - -DWITH_LIBVNCSERVER=$(usex vnc) - -DWITH_WWW=$(usex webkit) - -DWITH_AVAHI=$(usex zeroconf) - -DWITH_NEWS=$(usex telemetry) - -DWITH_ICON_CACHE=OFF - -DWITH_UPDATE_DESKTOP_DB=OFF - # when this feature is stable, add python eclass usage to optionally enable - -DWITH_PYTHON=OFF - ) - cmake_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - - optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt] - optfeature "XDMCP support" x11-base/xorg-server[xephyr] -} diff --git a/net-misc/remmina/remmina-1.4.14.ebuild b/net-misc/remmina/remmina-1.4.16.ebuild index e7bceef93c0f..e7bceef93c0f 100644 --- a/net-misc/remmina/remmina-1.4.14.ebuild +++ b/net-misc/remmina/remmina-1.4.16.ebuild diff --git a/net-nds/gssproxy/gssproxy-0.8.4.ebuild b/net-nds/gssproxy/gssproxy-0.8.4.ebuild index a9ded0f79874..dd5999942c52 100644 --- a/net-nds/gssproxy/gssproxy-0.8.4.ebuild +++ b/net-nds/gssproxy/gssproxy-0.8.4.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/gssapi/${PN}/releases/download/v${PV}/${P}.tar.gz" LICENSE="BSD-1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86" IUSE="debug selinux systemd hardened" COMMON_DEPEND=">=dev-libs/libverto-0.2.2 diff --git a/net-p2p/torrentinfo/torrentinfo-1.8.6-r2.ebuild b/net-p2p/torrentinfo/torrentinfo-1.8.6-r2.ebuild index 3b5ca0b936e6..e07d37d49483 100644 --- a/net-p2p/torrentinfo/torrentinfo-1.8.6-r2.ebuild +++ b/net-p2p/torrentinfo/torrentinfo-1.8.6-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( pypy3 python3_{7,8,9} ) +PYTHON_COMPAT=( pypy3 python3_{7..10} ) # The package uses distutils DISTUTILS_USE_SETUPTOOLS=no @@ -15,13 +15,11 @@ SRC_URI="https://github.com/Fuuzetsu/torrentinfo/archive/v${PV}.tar.gz -> ${P}.t LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 x86" -IUSE="test" -RESTRICT="!test? ( test )" - -BDEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )" PATCHES=( "${FILESDIR}/${P}-fix-tests.patch" ) +distutils_enable_tests nose + # distutils_enable_tests nose doesn't work here, # probably because the test file has a non-standard name python_test() { diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest index fab1724c1851..3b9c308ce34b 100644 --- a/net-vpn/tor/Manifest +++ b/net-vpn/tor/Manifest @@ -1,3 +1,6 @@ DIST tor-0.4.4.8.tar.gz 7699461 BLAKE2B 4d314cefdcf49d41367764028ed38b5acb320dae73601632c7ed8275d65f84e98cd34cbb2c3ee9c89782473d380a3c9d196bd6283800d031812b8a0ed3b4f89c SHA512 5a0063afa7ab89e4b3a8ec281650e947c445fbad709fb79aa155ae6a487a8131b98ed6246f0a6c2902c8bb6749551c1e80016f710e3cb3d3a380d3f8b365d8c3 +DIST tor-0.4.4.8.tar.gz.asc 833 BLAKE2B b69ab73743b5c18eb006113fe0ac561f6b44536bd6e320015dc1aada7592fdab9a5d5a36efe5e878623f424154fe67475424d3572446ee546c25b22494ad82bb SHA512 50280a788a1751c85f22080e933b6c80820f01003b23e9eb788b952ed0a6ced5374b2e927cec4d287cef7ff27ca8d86da93d3e7af7351fc6e1a8160fbb49c60a DIST tor-0.4.5.7.tar.gz 7816158 BLAKE2B 839a81b237e29f12ace8be518d6aed87dce8cc162f8e0701480676996ebe76ad1093f785c8148484e3f14c6bae01499a1a3434d07c465aa6130c18fcbf66236c SHA512 1ca0e35eff5b344ee416de4cb958d7f04d4e5e9f2efff524576b1fc3c2882dbc068d35f25670e7efe5fcb51308b165393b1078fc46585ec6d40052daa0628a05 +DIST tor-0.4.5.7.tar.gz.asc 833 BLAKE2B ede473bd1083acf96c05a1469651a89bc38147f8cb82eaaa4bf2eea8731b1a7a05ccf7d26c59bda51cb46e3a9e762c93a813d05a9e07f24b6d8edb65c4a4e079 SHA512 f41009b3683584a2a6df2609f2bd6b134d5cd02547f53a60aa18a847f3aa8e9a1b0edbd45a52930ba15b19e48c7d6d80a94f8be69a3e4b4e1c39acc810cfacee DIST tor-0.4.6.2-alpha.tar.gz 7726760 BLAKE2B 01bd4b5b1b5f675b880b8ded422871a0f7538f3206ab86c6ddb12d99f6279c052d5b1d6f139231f9f9b989c18b0027854530e7a66a1a48ab5cbd5496747c23a3 SHA512 4a3d20389cc5516b45448a001d50488a30e959f256be45e91dafdadb0f13339099d183d3b1a7e4f5ca1f4861312151849f8ad8e360d5f07e8135ea7cfbb2ed5f +DIST tor-0.4.6.2-alpha.tar.gz.asc 833 BLAKE2B 06afc9a4d5b8baa57cd8fbcf2a2c13ebb0f3e26c3682d4d2317557885a6f7f840cef2afe7cc7817e7c665ccdc6a6687c2bdbb645ae2734b95a2766b44671044d SHA512 72b2930c741f8fd6d9c3b97ccb296ad6f6a2ca0b62421ac2b8d1bc81c1d294e664c95659c1ebe884a89200a7b2eeaf6eb1fd646881417833fe67882f4d9ff3f3 diff --git a/net-vpn/tor/tor-0.4.4.8.ebuild b/net-vpn/tor/tor-0.4.4.8.ebuild index 87ab91dad673..6a411102af45 100644 --- a/net-vpn/tor/tor-0.4.4.8.ebuild +++ b/net-vpn/tor/tor-0.4.4.8.ebuild @@ -3,21 +3,24 @@ EAPI="7" -inherit flag-o-matic readme.gentoo-r1 systemd +inherit flag-o-matic readme.gentoo-r1 systemd verify-sig MY_PV="$(ver_rs 4 -)" MY_PF="${PN}-${MY_PV}" DESCRIPTION="Anonymizing overlay network for TCP" HOMEPAGE="http://www.torproject.org/" SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz - https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz" + https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz + verify-sig? ( https://dist.torproject.org/${MY_PF}.tar.gz.asc )" S="${WORKDIR}/${MY_PF}" LICENSE="BSD GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos" IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd" +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/torproject.org.asc +BDEPEND="verify-sig? ( app-crypt/openpgp-keys-tor )" DEPEND=" dev-libs/libevent:=[ssl] sys-libs/zlib diff --git a/net-vpn/tor/tor-0.4.5.7.ebuild b/net-vpn/tor/tor-0.4.5.7.ebuild index c06dbc2d79e0..5616d54e5b3c 100644 --- a/net-vpn/tor/tor-0.4.5.7.ebuild +++ b/net-vpn/tor/tor-0.4.5.7.ebuild @@ -3,21 +3,24 @@ EAPI="7" -inherit flag-o-matic readme.gentoo-r1 systemd +inherit flag-o-matic readme.gentoo-r1 systemd verify-sig MY_PV="$(ver_rs 4 -)" MY_PF="${PN}-${MY_PV}" DESCRIPTION="Anonymizing overlay network for TCP" HOMEPAGE="http://www.torproject.org/" SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz - https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz" + https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz + verify-sig? ( https://dist.torproject.org/${MY_PF}.tar.gz.asc )" S="${WORKDIR}/${MY_PF}" LICENSE="BSD GPL-2" SLOT="0" KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86 ~ppc-macos" IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd" +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/torproject.org.asc +BDEPEND="verify-sig? ( app-crypt/openpgp-keys-tor )" DEPEND=" dev-libs/libevent:=[ssl] sys-libs/zlib diff --git a/net-vpn/tor/tor-0.4.6.2_alpha.ebuild b/net-vpn/tor/tor-0.4.6.2_alpha.ebuild index 1ace955550cb..b44a8e126c1f 100644 --- a/net-vpn/tor/tor-0.4.6.2_alpha.ebuild +++ b/net-vpn/tor/tor-0.4.6.2_alpha.ebuild @@ -3,21 +3,24 @@ EAPI="7" -inherit flag-o-matic readme.gentoo-r1 systemd +inherit flag-o-matic readme.gentoo-r1 systemd verify-sig MY_PV="$(ver_rs 4 -)" MY_PF="${PN}-${MY_PV}" DESCRIPTION="Anonymizing overlay network for TCP" HOMEPAGE="http://www.torproject.org/" SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz - https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz" + https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz + verify-sig? ( https://dist.torproject.org/${MY_PF}.tar.gz.asc )" S="${WORKDIR}/${MY_PF}" LICENSE="BSD GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos" IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd" +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/torproject.org.asc +BDEPEND="verify-sig? ( app-crypt/openpgp-keys-tor )" DEPEND=" dev-libs/libevent:=[ssl] sys-libs/zlib diff --git a/profiles/arch/arm/package.use.force b/profiles/arch/arm/package.use.force index 442c1611b3de..e6ca6de1aefb 100644 --- a/profiles/arch/arm/package.use.force +++ b/profiles/arch/arm/package.use.force @@ -1,6 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Thomas Deutschmann <whissi@gentoo.org> (2021-05-11) +# Satisfy REQUIRED_USE on arm +app-emulation/xen debug + # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-06-18) # Force host target dev-libs/keystone llvm_targets_ARM diff --git a/profiles/package.mask b/profiles/package.mask index 0a9d154c5446..a019112810d7 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -665,10 +665,6 @@ x11-themes/gtk-engines-aurora dev-java/odfdom dev-java/saaj -# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-04-14) -# QA: Mask sys-apps/openrc-0.43 because of bug 782808 -=sys-apps/openrc-0.43* - # Jonas Stein <jstein@gentoo.org> (2021-04-14) # Open bugs, dead upstream. # Removal on 2021-06-01. Bug #782730. @@ -679,22 +675,10 @@ x11-misc/superswitcher # Removal on 2021-06-01. Bug #782727. x11-misc/xstroke -# Michał Górny <mgorny@gentoo.org> (2021-04-10) -# Obsolete backport to Python < 3.4. No reverse dependencies left. -# Removal on 2021-05-10. Bug #781902. -dev-python/monotonic - # Lars Wendler <polynomial-c@gentoo.org> (2021-04-08) # Masked for testing >=app-crypt/gnupg-2.3.0 -# Sergey Popov <pinkbyte@gentoo.org> (2021-04-06) -# Ancient version, currently no consumers in main tree -# The only one consumer was mail-client/roundcube -# and now it uses bundled version -# Masked for removal in 30 days. -dev-php/PEAR-Net_LDAP3 - # Sam James <sam@gentoo.org> (2021-03-30) # Seems to break dev-tex/culmus-latex # Masking until we can investigate & fix diff --git a/sci-chemistry/gromacs/gromacs-2018.8.ebuild b/sci-chemistry/gromacs/gromacs-2018.8.ebuild index dfe7923415e4..7c0c24d883f4 100644 --- a/sci-chemistry/gromacs/gromacs-2018.8.ebuild +++ b/sci-chemistry/gromacs/gromacs-2018.8.ebuild @@ -198,7 +198,7 @@ src_compile() { src_test() { for x in ${GMX_DIRS}; do BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake_src_make check + cmake_src_compile check done } diff --git a/sci-chemistry/gromacs/gromacs-2019.6.ebuild b/sci-chemistry/gromacs/gromacs-2019.6.ebuild index 37058195e940..5ba8f9df146a 100644 --- a/sci-chemistry/gromacs/gromacs-2019.6.ebuild +++ b/sci-chemistry/gromacs/gromacs-2019.6.ebuild @@ -211,7 +211,7 @@ src_compile() { src_test() { for x in ${GMX_DIRS}; do BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake_src_make check + cmake_src_compile check done } diff --git a/sci-chemistry/gromacs/gromacs-2020.4.ebuild b/sci-chemistry/gromacs/gromacs-2020.4.ebuild index e8417cf59475..3c700bbb99a6 100644 --- a/sci-chemistry/gromacs/gromacs-2020.4.ebuild +++ b/sci-chemistry/gromacs/gromacs-2020.4.ebuild @@ -296,7 +296,7 @@ src_compile() { src_test() { for x in ${GMX_DIRS}; do BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake_src_make check + cmake_src_compile check done } diff --git a/sci-chemistry/gromacs/gromacs-2020.5.ebuild b/sci-chemistry/gromacs/gromacs-2020.5.ebuild index 393fdad3162e..ff5aa7c43fdc 100644 --- a/sci-chemistry/gromacs/gromacs-2020.5.ebuild +++ b/sci-chemistry/gromacs/gromacs-2020.5.ebuild @@ -296,7 +296,7 @@ src_compile() { src_test() { for x in ${GMX_DIRS}; do BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake_src_make check + cmake_src_compile check done } diff --git a/sci-chemistry/gromacs/gromacs-2020.6.ebuild b/sci-chemistry/gromacs/gromacs-2020.6.ebuild index 393fdad3162e..ff5aa7c43fdc 100644 --- a/sci-chemistry/gromacs/gromacs-2020.6.ebuild +++ b/sci-chemistry/gromacs/gromacs-2020.6.ebuild @@ -296,7 +296,7 @@ src_compile() { src_test() { for x in ${GMX_DIRS}; do BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake_src_make check + cmake_src_compile check done } diff --git a/sci-chemistry/gromacs/gromacs-2020.9999.ebuild b/sci-chemistry/gromacs/gromacs-2020.9999.ebuild index 393fdad3162e..ff5aa7c43fdc 100644 --- a/sci-chemistry/gromacs/gromacs-2020.9999.ebuild +++ b/sci-chemistry/gromacs/gromacs-2020.9999.ebuild @@ -296,7 +296,7 @@ src_compile() { src_test() { for x in ${GMX_DIRS}; do BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake_src_make check + cmake_src_compile check done } diff --git a/sci-chemistry/gromacs/gromacs-2021.1.ebuild b/sci-chemistry/gromacs/gromacs-2021.1.ebuild index 2a4610540b55..75d52731734e 100644 --- a/sci-chemistry/gromacs/gromacs-2021.1.ebuild +++ b/sci-chemistry/gromacs/gromacs-2021.1.ebuild @@ -303,7 +303,7 @@ src_compile() { src_test() { for x in ${GMX_DIRS}; do BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake_src_make check + cmake_src_compile check done } diff --git a/sci-chemistry/gromacs/gromacs-2021.9999.ebuild b/sci-chemistry/gromacs/gromacs-2021.9999.ebuild index dbeed6f4fec5..82fafe89e639 100644 --- a/sci-chemistry/gromacs/gromacs-2021.9999.ebuild +++ b/sci-chemistry/gromacs/gromacs-2021.9999.ebuild @@ -298,7 +298,7 @@ src_compile() { src_test() { for x in ${GMX_DIRS}; do BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake_src_make check + cmake_src_compile check done } diff --git a/sci-chemistry/gromacs/gromacs-2021.ebuild b/sci-chemistry/gromacs/gromacs-2021.ebuild index 069792626140..b5e91e41ba15 100644 --- a/sci-chemistry/gromacs/gromacs-2021.ebuild +++ b/sci-chemistry/gromacs/gromacs-2021.ebuild @@ -300,7 +300,7 @@ src_compile() { src_test() { for x in ${GMX_DIRS}; do BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake_src_make check + cmake_src_compile check done } diff --git a/sci-chemistry/gromacs/gromacs-9999.ebuild b/sci-chemistry/gromacs/gromacs-9999.ebuild index dbeed6f4fec5..82fafe89e639 100644 --- a/sci-chemistry/gromacs/gromacs-9999.ebuild +++ b/sci-chemistry/gromacs/gromacs-9999.ebuild @@ -298,7 +298,7 @@ src_compile() { src_test() { for x in ${GMX_DIRS}; do BUILD_DIR="${WORKDIR}/${P}_${x}"\ - cmake_src_make check + cmake_src_compile check done } diff --git a/sci-chemistry/gromacs/metadata.xml b/sci-chemistry/gromacs/metadata.xml index 23a4ee60ef76..4235f32ded67 100644 --- a/sci-chemistry/gromacs/metadata.xml +++ b/sci-chemistry/gromacs/metadata.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <stabilize-allarches/> <maintainer type="person"> <email>alexxy@gentoo.org</email> <name>Alexey Shvetsov</name> diff --git a/sci-visualization/dash-html-components/Manifest b/sci-visualization/dash-html-components/Manifest new file mode 100644 index 000000000000..0d3e160c52bc --- /dev/null +++ b/sci-visualization/dash-html-components/Manifest @@ -0,0 +1 @@ +DIST v1.1.3.tar.gz 375680 BLAKE2B e489d8d5fe3c832ae8be82ea1eac83b8a8c8df8b6ac9ce1d122178f63c4ce355c39195bd828e503c51605ed5e774eaff38cf16da9a1c486fd0eff404cd85694f SHA512 dfcc41ef7a52f0d5cc97db9e94b00eb7707cea7c5f95e89832d1b74a1554d9d9f9c3b5df57509fe959b06c53f2a281b7070adde45d3c19003c13983a10ca2509 diff --git a/sci-visualization/dash-html-components/dash-html-components-1.1.3.ebuild b/sci-visualization/dash-html-components/dash-html-components-1.1.3.ebuild new file mode 100644 index 000000000000..a075efb3db4f --- /dev/null +++ b/sci-visualization/dash-html-components/dash-html-components-1.1.3.ebuild @@ -0,0 +1,19 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8,9} ) +inherit distutils-r1 + +DESCRIPTION="Vanilla HTML components for Dash" +HOMEPAGE="https://plot.ly/dash" +SRC_URI="https://github.com/plotly/${PN}/archive/refs/tags/v${PV}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="" +RDEPEND="${DEPEND}" +BDEPEND="" diff --git a/sci-visualization/dash-html-components/metadata.xml b/sci-visualization/dash-html-components/metadata.xml new file mode 100644 index 000000000000..7b7b1ad6d03c --- /dev/null +++ b/sci-visualization/dash-html-components/metadata.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>tupone@gentoo.org</email> + <name>Tupone Alfredo</name> + </maintainer> + <longdescription lang="en"> + Instead of writing HTML or using an HTML templating engine, you + compose your layout using Python structures with the + dash-html-components library. + </longdescription> + <upstream> + <remote-id type="github">plotly/dash-html-components</remote-id> + </upstream> +</pkgmetadata> diff --git a/sci-visualization/dash-table/Manifest b/sci-visualization/dash-table/Manifest new file mode 100644 index 000000000000..fb78f350a952 --- /dev/null +++ b/sci-visualization/dash-table/Manifest @@ -0,0 +1 @@ +DIST dash-table-4.11.3.tar.gz 9504642 BLAKE2B d48e1448caf19f555d8e8436de295d6999dc4caabd4e80d188ec9921278dc4e48b6631dbf4a572cd190210bb83f0a73986c0c93c269b931aeff1fd52e152e248 SHA512 580de0b92ae114cd65e5a2a85aa96a78cbf3364173135ddb29ac3d2edd3ad2aa7b526d447481f78379da2c2420ed9cc8d6a83836565ccac31249ecc4a94a3db5 diff --git a/sci-visualization/dash-table/dash-table-4.11.3.ebuild b/sci-visualization/dash-table/dash-table-4.11.3.ebuild new file mode 100644 index 000000000000..54da85f007fe --- /dev/null +++ b/sci-visualization/dash-table/dash-table-4.11.3.ebuild @@ -0,0 +1,20 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8,9} ) +inherit distutils-r1 + +DESCRIPTION="First-Class interactive DataTable for Dash" +HOMEPAGE="https://plot.ly/dash" +SRC_URI="https://github.com/plotly/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="" +RDEPEND="${DEPEND}" +BDEPEND="" diff --git a/sci-visualization/dash-table/metadata.xml b/sci-visualization/dash-table/metadata.xml new file mode 100644 index 000000000000..1c496d826f34 --- /dev/null +++ b/sci-visualization/dash-table/metadata.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>tupone@gentoo.org</email> + <name>Tupone Alfredo</name> + </maintainer> + <longdescription lang="en"> + Dash DataTable is an interactive table component designed for viewing, + editing, and exploring large datasets. + </longdescription> + <upstream> + <remote-id type="pypi">dash-table</remote-id> + <remote-id type="github">plotly/dash-table</remote-id> + </upstream> +</pkgmetadata> diff --git a/sci-visualization/paraview/files/paraview-5.9.0-gcc11-include.patch b/sci-visualization/paraview/files/paraview-5.9.0-gcc11-include.patch new file mode 100644 index 000000000000..b9fad8c094fe --- /dev/null +++ b/sci-visualization/paraview/files/paraview-5.9.0-gcc11-include.patch @@ -0,0 +1,20 @@ +--- a/VTK/Common/Core/vtkGenericDataArrayLookupHelper.h ++++ b/VTK/Common/Core/vtkGenericDataArrayLookupHelper.h +@@ -25,6 +25,7 @@ + #include "vtkIdList.h" + #include <algorithm> + #include <cmath> ++#include <limits> + #include <unordered_map> + #include <vector> + +--- a/VTK/Common/DataModel/vtkPiecewiseFunction.cxx ++++ b/VTK/Common/DataModel/vtkPiecewiseFunction.cxx +@@ -22,6 +22,7 @@ + #include <cassert> + #include <cmath> + #include <iterator> ++#include <limits> + #include <set> + #include <vector> + diff --git a/sci-visualization/paraview/paraview-5.9.0.ebuild b/sci-visualization/paraview/paraview-5.9.0.ebuild index 826f9ea31de5..f91083500a23 100644 --- a/sci-visualization/paraview/paraview-5.9.0.ebuild +++ b/sci-visualization/paraview/paraview-5.9.0.ebuild @@ -105,6 +105,7 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch "${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch + "${FILESDIR}"/${PN}-5.9.0-gcc11-include.patch ) pkg_setup() { diff --git a/sys-apps/findutils/findutils-4.8.0.ebuild b/sys-apps/findutils/findutils-4.8.0.ebuild index 82d8eda096ac..61e4004cda6e 100644 --- a/sys-apps/findutils/findutils-4.8.0.ebuild +++ b/sys-apps/findutils/findutils-4.8.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="nls selinux static test" RESTRICT="!test? ( test )" diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest index c7c03bb64ded..9789eaad3bd7 100644 --- a/sys-apps/hdparm/Manifest +++ b/sys-apps/hdparm/Manifest @@ -1,3 +1,3 @@ DIST hdparm-9.58.tar.gz 138845 BLAKE2B 29e2697afaedcfbb1d7dea2238f9477afd932d553166437abbf068b8b3f3a5445a0b8542714d8a15e3c64f42a794c2603fe626ed936b4dbdeb8e4fe63afc5f46 SHA512 42fb70f494aae4cc205ca68c3e883e1f4fc33e8ced1914e280e9f3faa7233d3f839e59178ec09ddb9d32e9d2bca122ce324645ecb5ac73defa284030ac7d3cea -DIST hdparm-9.60.tar.gz 155220 BLAKE2B c09a2bd7a61a77d87f7bbd45881d5956392dbedf1f329be59049de68ee8491857b1958f8e5e85086ed53deaad37fc476cfb87f45bf27084719c07d25608ffdc0 SHA512 e40b3b48b409014acd0ec0bd7ff821e850b127627b1f5114c442eeaf0b93f02c6933f93a221037255499b741071c0a5cb4d9cf7f9a06ff92a416caf82673a0ed DIST hdparm-9.61.tar.gz 139879 BLAKE2B b67ed28dad06870fed9fc7b7f1513887e17456babacf8b37530d0b90bc5ebef022dbe169b8729b215a94862d46e23cb667c173d54b7033a8ba7c7d4988494000 SHA512 d46c7681d9000d09a8f59b0b6084bb80118c806e124fbfe8903411aafb05101bb2134b8890bd96f1c542fa1061e660ceb546c369ce008961ca0d263eebd841ce +DIST hdparm-9.62.tar.gz 139976 BLAKE2B 83ea59e35eeec7fa2a9e2f9f4b7a9a0d44cd4366d95e529c08bf38b04f6d78862bfefdfb905d4fceadbb81453ee92a60aa55db8d4c0bd164ec67181b46f197bf SHA512 ac6c4d285d081ecd8c7b231192a5a0fc268d934eeeb59794ae9a9db01ecbdd0afa0cade6ed42a1fd26ad543c52a3b380ac4f1b679992d167becb4ed6251fd369 diff --git a/sys-apps/hdparm/hdparm-9.60.ebuild b/sys-apps/hdparm/hdparm-9.62.ebuild index 1bfffb80b2fa..f0bb282156d7 100644 --- a/sys-apps/hdparm/hdparm-9.60.ebuild +++ b/sys-apps/hdparm/hdparm-9.62.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/sys-apps/sandbox/sandbox-2.24.ebuild b/sys-apps/sandbox/sandbox-2.24.ebuild index 844b1e1fe4cc..fe66e82819fc 100644 --- a/sys-apps/sandbox/sandbox-2.24.ebuild +++ b/sys-apps/sandbox/sandbox-2.24.ebuild @@ -25,6 +25,15 @@ sandbox_death_notice() { ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox" } +src_prepare() { + default + + # sandbox uses `__asm__ (".symver "...` which does + # not play well with gcc's LTO: https://gcc.gnu.org/PR48200 + append-flags -fno-lto + append-ldflags -fno-lto +} + multilib_src_configure() { filter-lfs-flags #90228 diff --git a/sys-apps/smartmontools/smartmontools-7.2.ebuild b/sys-apps/smartmontools/smartmontools-7.2.ebuild index d534a7dc2e2e..0ab20504d088 100644 --- a/sys-apps/smartmontools/smartmontools-7.2.ebuild +++ b/sys-apps/smartmontools/smartmontools-7.2.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then inherit subversion else SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" fi DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation" diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index 20ac01eac7d2..35bd262712af 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -1,4 +1,4 @@ DIST util-linux-2.35.2.tar.xz 5150488 BLAKE2B 93eb90ab33db7795b46425ec4ec87f8a2d3d6e0dad671345375ea02efd654bf72041932d30b41bea494e4b62952e2fd14ea9f9e6c738d4eb4b050bd170b9bb0e SHA512 59e038ba71aa74c9af6f927b357483a965f675ab3ffcd25cf0c1b043656312d2d2d07c55659fd3da69ede165bec313e0ae7e1cd73758e49681ae610604b399a2 DIST util-linux-2.36.2.tar.xz 5348032 BLAKE2B 17e49515f8d0430f3ed26b80bf1d6e811d847141020d0dae1340dc92887549b7b711f3db6e3913120871fc912435def73586a7aef09d8d9cc6ff7ca331b2770f SHA512 6ab141f44ca4cb6b600081f10eae17e15d23abd122a37eb3ac6c845513a6a4396dc9dcff30b3032de80116ddde50e27dfbc86f92708c1051f84f0c919194664b -DIST util-linux-2.37-rc1-manpages.tar.xz 160524 BLAKE2B 3d301478b772f944c7d4cd713130fe9800cc32fb14ac46967c6a64fdca6e561d91f642f839c77cded6f4af8b4487cf3f36ac3f6a72aea50a75c020a1c9862ee0 SHA512 44f45356c2a97f482dc4b0a762e4c2e04fbce0d2268cd765fcff87c40554d0ef3016ff5e1c1165ba93c05ff8390d76ea14fd30f419ce4c86fc5678858cede54b -DIST util-linux-2.37-rc1.tar.xz 5269776 BLAKE2B cc964e8f1bb50f704d7f207bd166b41d6b70d138b52e140687fe58f77626097d6151ae3f3efdb655b8495a67ad33cdf7fcdb0cf71839ba34963b0f14aace98a5 SHA512 5c3125a0ac42e17c8837f398cc3d59a538f18e823fab4feb9d7756a4c7523dd70fe7a5c94baab2a329d1ce99d85bdb19a14dd5d32d72d479a398f7dbc3003c1a +DIST util-linux-2.37-rc2-manpages.tar.xz 160480 BLAKE2B 9d9ad7a74fe8bdd523fa5075c1031c43596c16e7db6bc04e3c8cf0447200ec9c24db9b973a1e47b3aada4ae48f3b82d16105fdc8f98373c1d6cc6aa82bcac454 SHA512 2dd6050dec6732231087cf83c6db6593ed47cc986be9e6b28d57cb3fa03eb31992fd0cb92bd6f0ab971dc33e633c3b27bf7f9d53dee20f011d5461a9af68e23c +DIST util-linux-2.37-rc2.tar.xz 5437912 BLAKE2B 8fb6183537bc3a6d2831d2f91c7222518dd844e080b86e1f927f8418f7c075e3ae816d2bac2d8d493bf297f30f26a0deaaa0d37e1437f7caf625f92370606970 SHA512 9a7f301604c2ae914b8c33f17a22563ec0128e45d7687bf11142d190bb1f51adeff7f392efc27b87ac088c615097ccc270a886a5c912e363f4748b3ed6f5a6ef diff --git a/sys-apps/util-linux/util-linux-2.37_rc1.ebuild b/sys-apps/util-linux/util-linux-2.37_rc2.ebuild index 66a36a6cd0cb..66a36a6cd0cb 100644 --- a/sys-apps/util-linux/util-linux-2.37_rc1.ebuild +++ b/sys-apps/util-linux/util-linux-2.37_rc2.ebuild diff --git a/sys-auth/nss-mdns/Manifest b/sys-auth/nss-mdns/Manifest index 349b16521558..12f39cf56983 100644 --- a/sys-auth/nss-mdns/Manifest +++ b/sys-auth/nss-mdns/Manifest @@ -1 +1,2 @@ DIST nss-mdns-0.14.1.tar.gz 369978 BLAKE2B d1539ff5c1830a120d6ed4fafa36aa6effb9bb973b275317f5d8f4515aad7d2f69f095296a6b95ad8cc19d6eeb076b19b7987c5eabf29fd21f54cfe4a652ed3a SHA512 7c06b984443881a6c0a1f850ee33f14780562cc6168fe1cda176303eb799ece510d51d3830928616723bb95250ad6462978cd8b857f2b79d87116da2c1aeaa5e +DIST nss-mdns-0.15.tar.gz 374714 BLAKE2B a85051604bb7ae7661e6f1d08a99327363a4101641f1441d04388c09e67b651f5721ddac592676bd993314835c8da91bb1f8df52ec0cc1545926df433f490595 SHA512 e71b625a1ac9c36cb3db71e599b89b7ac237250cd9c99ae2e392c8fc1309eb7ba2d2c32f0695eb0b7bb993142a8803065de152cf002bea967e9c263aacd4b7ac diff --git a/sys-auth/nss-mdns/nss-mdns-0.15.ebuild b/sys-auth/nss-mdns/nss-mdns-0.15.ebuild new file mode 100644 index 000000000000..3f730ac134f6 --- /dev/null +++ b/sys-auth/nss-mdns/nss-mdns-0.15.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit multilib-minimal + +DESCRIPTION="Name Service Switch module for Multicast DNS" +HOMEPAGE="https://github.com/lathiat/nss-mdns" +SRC_URI="https://github.com/lathiat/nss-mdns/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=">=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + test? ( >=dev-libs/check-0.11[${MULTILIB_USEDEP}] )" + +multilib_src_configure() { + local myconf=( + # $(localstatedir)/run/... is used to locate avahi-daemon socket + --localstatedir=/var + + $(use_enable test tests) + ) + + ECONF_SOURCE=${S} \ + econf "${myconf[@]}" +} + +multilib_src_install_all() { + dodoc *.md + + insinto /etc + doins "${FILESDIR}"/mdns.allow +} + +pkg_postinst() { + ewarn "You have to modify your name service switch look up file to enable" + ewarn "multicast DNS lookups. If you wish to resolve only IPv6 addresses" + ewarn "use mdns6. For IPv4 addresses only, use mdns4. To resolve both" + ewarn "use mdns. Keep in mind that mdns will be slower if there are no" + ewarn "IPv6 addresses published via mDNS on the network. There are also" + ewarn "minimal (mdns?_minimal) libraries which only lookup .local hosts" + ewarn "and 169.254.x.x addresses." + ewarn + ewarn "Add the appropriate mdns into the hosts line in /etc/nsswitch.conf." + ewarn "An example line looks like:" + ewarn "hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4" + ewarn + ewarn "If you want to perform mDNS lookups for domains other than the ones" + ewarn "ending in .local, add them to /etc/mdns.allow." +} diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest index 1efba30ad96b..f78dee9dc148 100644 --- a/sys-devel/distcc/Manifest +++ b/sys-devel/distcc/Manifest @@ -1 +1,2 @@ DIST distcc-3.3.3.tar.gz 1195666 BLAKE2B b393fdb20eb555dec794bf55c1287dd804a576e0a5db9f2fa84c3924a40185a193231aea807353918430297c9c83c7592aaaafd521cf73c92a72bf30b8a69caa SHA512 d5e7fc67f49ee640cef753038b5c0ebcbbac61c6ac29f20ee4736b045a89979ced765717c46383a4fadc50a4fe34e94e58e307509144414a9ca19eb4cc68a135 +DIST distcc-3.4.tar.gz 1239519 BLAKE2B 8dc9baa6b1f65f2bb3621e4e643d7d15d55e2338de4d6a7f20a572d9ec280925b4421a294f40c9fcfba8d4193a6bd1871eb8caf13dd2c2a8a81834671f6bc8bc SHA512 de09329fdfa25e08a9b9529190ddaa9ceccb34c8655692edb86f367a8db4a71b750c6e928cb8e5a670f51fbbc02fd1c8524f72e01b3ebaacc1106dc676d18eef diff --git a/sys-devel/distcc/distcc-3.4.ebuild b/sys-devel/distcc/distcc-3.4.ebuild new file mode 100644 index 000000000000..314dfd4b44be --- /dev/null +++ b/sys-devel/distcc/distcc-3.4.ebuild @@ -0,0 +1,178 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) + +inherit autotools flag-o-matic prefix python-single-r1 systemd \ + toolchain-funcs xdg-utils + +DESCRIPTION="Distribute compilation of C code across several machines on a network" +HOMEPAGE="https://github.com/distcc/distcc" +SRC_URI="https://github.com/distcc/distcc/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="gssapi gtk hardened ipv6 selinux xinetd zeroconf" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + dev-libs/popt + gssapi? ( net-libs/libgssglue ) + gtk? ( x11-libs/gtk+:3 ) + zeroconf? ( >=net-dns/avahi-0.6[dbus] ) +" +DEPEND="${RDEPEND} + sys-libs/binutils-libs" +BDEPEND=" + sys-devel/autoconf-archive + virtual/pkgconfig" +RDEPEND+=" + acct-user/distcc + dev-util/shadowman + >=sys-devel/gcc-config-1.4.1 + selinux? ( sec-policy/selinux-distcc ) + xinetd? ( sys-apps/xinetd )" + +src_prepare() { + eapply "${FILESDIR}/${PN}-3.0-xinetd.patch" + # SOCKSv5 support needed for Portage, bug #537616 + eapply "${FILESDIR}/${PN}-3.2_rc1-socks5.patch" + eapply_user + + # Bugs #120001, #167844 and probably more. See patch for description. + use hardened && eapply "${FILESDIR}/distcc-hardened.patch" + + sed -i \ + -e "/PATH/s:\$distcc_location:${EPREFIX}/usr/lib/distcc/bin:" \ + -e "s:@PYTHON@:${EPYTHON}:" \ + pump.in || die "sed failed" + + sed \ + -e "s:@EPREFIX@:${EPREFIX:-/}:" \ + -e "s:@libdir@:/usr/lib:" \ + "${FILESDIR}/distcc-config" > "${T}/distcc-config" || die + + # TODO: gdb tests fail due to gdb failing to find .c file + sed -i -e '/Gdb.*Case,/d' test/testdistcc.py || die + + hprefixify update-distcc-symlinks.py src/{serve,daemon}.c + python_fix_shebang update-distcc-symlinks.py "${T}/distcc-config" + eautoreconf +} + +src_configure() { + local myconf=( + --disable-Werror + --libdir=/usr/lib + $(use_enable ipv6 rfc2553) + $(use_with gtk) + --without-gnome + $(use_with gssapi auth) + $(use_with zeroconf avahi) + ) + + econf "${myconf[@]}" +} + +src_test() { + # sandbox breaks some tests, and hangs some too + # retest once #590084 is fixed + local -x SANDBOX_ON=0 + emake -j1 check +} + +src_install() { + # override GZIP_BIN to stop it from compressing manpages + emake -j1 DESTDIR="${D}" GZIP_BIN=false install + python_optimize + + newinitd "${FILESDIR}/distccd.initd" distccd + systemd_newunit "${FILESDIR}/distccd.service-1" distccd.service + systemd_install_serviced "${FILESDIR}/distccd.service.conf" + + cp "${FILESDIR}/distccd.confd" "${T}/distccd" || die + if use zeroconf; then + cat >> "${T}/distccd" <<-EOF || die + + # Enable zeroconf support in distccd + DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf" + EOF + + sed -i '/ExecStart/ s|$| --zeroconf|' "${D}$(systemd_get_systemunitdir)"/distccd.service || die + fi + doconfd "${T}/distccd" + + newenvd - 02distcc <<-EOF || die + # This file is managed by distcc-config; use it to change these settings. + # DISTCC_LOG and DISTCC_DIR should not be set. + DISTCC_VERBOSE="${DISTCC_VERBOSE:-0}" + DISTCC_FALLBACK="${DISTCC_FALLBACK:-1}" + DISTCC_SAVE_TEMPS="${DISTCC_SAVE_TEMPS:-0}" + DISTCC_TCP_CORK="${DISTCC_TCP_CORK}" + DISTCC_SSH="${DISTCC_SSH}" + UNCACHED_ERR_FD="${UNCACHED_ERR_FD}" + DISTCC_ENABLE_DISCREPANCY_EMAIL="${DISTCC_ENABLE_DISCREPANCY_EMAIL}" + DCC_EMAILLOG_WHOM_TO_BLAME="${DCC_EMAILLOG_WHOM_TO_BLAME}" + EOF + + keepdir /usr/lib/distcc + + dobin "${T}/distcc-config" + + if use gtk; then + einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui" + einfo "This is to have a little sensability in naming schemes between distccmon programs" + mv "${ED}/usr/bin/distccmon-gnome" "${ED}/usr/bin/distccmon-gui" || die + dosym distccmon-gui /usr/bin/distccmon-gnome + fi + + if use xinetd; then + insinto /etc/xinetd.d + newins "doc/example/xinetd" distcc + fi + + insinto /usr/share/shadowman/tools + newins - distcc <<<"${EPREFIX}/usr/lib/distcc/bin" + newins - distccd <<<"${EPREFIX}/usr/lib/distcc" + + rm -r "${ED}/etc/default" || die + rm "${ED}/etc/distcc/clients.allow" || die + rm "${ED}/etc/distcc/commands.allow.sh" || die +} + +pkg_postinst() { + # remove the old paths when switching from libXX to lib + if [[ $(get_libdir) != lib && ${SYMLINK_LIB} != yes && \ + -d ${EROOT}/usr/$(get_libdir)/distcc ]]; then + rm -r -f "${EROOT}/usr/$(get_libdir)/distcc" || die + fi + + if [[ -z ${ROOT} ]]; then + eselect compiler-shadow update distcc + eselect compiler-shadow update distccd + fi + + elog + elog "Tips on using distcc with Gentoo can be found at" + elog "https://wiki.gentoo.org/wiki/Distcc" + elog + elog "distcc-pump is known to cause breakage with multiple packages." + elog "Do NOT enable it globally." + elog + elog "To use the distccmon programs with Gentoo you should use this command:" + elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-text 5" + + if use gtk; then + elog "Or:" + elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-gnome" + fi +} + +pkg_prerm() { + if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]]; then + eselect compiler-shadow remove distcc + fi +} diff --git a/sys-devel/rust-std/Manifest b/sys-devel/rust-std/Manifest index 18a6b1a1d76c..d5fdb2856af1 100644 --- a/sys-devel/rust-std/Manifest +++ b/sys-devel/rust-std/Manifest @@ -1 +1,2 @@ DIST rustc-1.51.0-src.tar.xz 109596164 BLAKE2B c1ac89655adfe7db8005476d42c748cf1896f52888141229fd6dda43855dbb08c21c8e1f11398d2f1f9dd5f8d508d9158a3bda4f1b282d1b184ea4c701100837 SHA512 ded91468ddf3e6627f00e7ec3d44452aa24eb727a183c0de9d90264f593119a54300d56b09251a88260db480b48554181ae195c538996a32d68d48b6587ac0df +DIST rustc-1.52.1-src.tar.xz 115109508 BLAKE2B c5d73f5884037d287d88ba9fdaf63a36678b692e1b510920045797ab29f1660f05cda901e19411ff83ec3084c4130034c269976b1056220f3e629cff116d07f0 SHA512 55f5053ce40d4eba4663052817aef6a6275139ca229c89cd1ec44711458b412720203301d8c7975aac5720a91fcaf21847f8184f641cbb0004f722520283c73c diff --git a/sys-devel/rust-std/files/1.51.0-bootstrap-panic.patch b/sys-devel/rust-std/files/1.51.0-bootstrap-panic.patch new file mode 100644 index 000000000000..529d5a1f402f --- /dev/null +++ b/sys-devel/rust-std/files/1.51.0-bootstrap-panic.patch @@ -0,0 +1,43 @@ +From 31c93397bde772764cda3058e16f9cef61895090 Mon Sep 17 00:00:00 2001 +From: Joshua Nelson <jyn514@gmail.com> +Date: Mon, 8 Feb 2021 22:51:21 -0500 +Subject: [PATCH] Use format string in bootstrap panic instead of a string + directly + +This fixes the following warning when compiling with nightly: + +``` +warning: panic message is not a string literal + --> src/bootstrap/builder.rs:1515:24 + | +1515 | panic!(out); + | ^^^ + | + = note: `#[warn(non_fmt_panic)]` on by default + = note: this is no longer accepted in Rust 2021 +help: add a "{}" format string to Display the message + | +1515 | panic!("{}", out); + | ^^^^^ +help: or use std::panic::panic_any instead + | +1515 | std::panic::panic_any(out); + | ^^^^^^^^^^^^^^^^^^^^^^ +``` +--- + src/bootstrap/builder.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs +index f1a160250dbe1..0f5fcb4af400d 100644 +--- a/src/bootstrap/builder.rs ++++ b/src/bootstrap/builder.rs +@@ -1490,7 +1490,7 @@ impl<'a> Builder<'a> { + for el in stack.iter().rev() { + out += &format!("\t{:?}\n", el); + } +- panic!(out); ++ panic!("{}", out); + } + if let Some(out) = self.cache.get(&step) { + self.verbose(&format!("{}c {:?}", " ".repeat(stack.len()), step)); diff --git a/sys-devel/rust-std/rust-std-1.51.0.ebuild b/sys-devel/rust-std/rust-std-1.51.0.ebuild index 7ca481644a6a..935388d41a01 100644 --- a/sys-devel/rust-std/rust-std-1.51.0.ebuild +++ b/sys-devel/rust-std/rust-std-1.51.0.ebuild @@ -38,6 +38,8 @@ QA_FLAGS_IGNORED="usr/lib/rust/${PV}/rustlib/.*/lib/lib.*.so" S="${WORKDIR}/${P/-std/c}-src" +PATCHES=( "${FILESDIR}"/1.51.0-bootstrap-panic.patch ) + # # The cross magic # diff --git a/sys-devel/rust-std/rust-std-1.52.1.ebuild b/sys-devel/rust-std/rust-std-1.52.1.ebuild new file mode 100644 index 000000000000..7ca481644a6a --- /dev/null +++ b/sys-devel/rust-std/rust-std-1.52.1.ebuild @@ -0,0 +1,154 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit flag-o-matic multiprocessing python-any-r1 rust-toolchain toolchain-funcs + +DESCRIPTION="Rust standard library, standalone (for crossdev)" +HOMEPAGE="https://www.rust-lang.org" +SRC_URI="https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz" + +LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA" +SLOT="stable/$(ver_cut 1-2)" +# please do not keyword +#KEYWORDS="" #nowarn +IUSE="debug" + +BDEPEND=" + ${PYTHON_DEPS} + ~dev-lang/rust-${PV}:= +" + +DEPEND="|| + ( + >="${CATEGORY}"/gcc-4.7:* + >="${CATEGORY}"/clang-3.5:* + ) +" + +RDEPEND="${DEPEND}" + +# need full compiler to run tests +RESTRICT="test" + +QA_FLAGS_IGNORED="usr/lib/rust/${PV}/rustlib/.*/lib/lib.*.so" + +S="${WORKDIR}/${P/-std/c}-src" + +# +# The cross magic +# +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} + fi +fi + +is_cross() { + [[ ${CHOST} != ${CTARGET} ]] +} + +toml_usex() { + usex "$1" true false +} + +pkg_pretend() { + is_cross || die "${PN} should only be used for cross" +} + +pkg_setup() { + python-any-r1_pkg_setup +} + +src_prepare() { + default +} + +src_configure() { + # do the great cleanup + strip-flags + filter-flags '-mcpu=*' '-march=*' '-mtune=*' '-m32' '-m64' + strip-unsupported-flags + + local rust_root x + rust_root="$(rustc --print sysroot)" + rtarget="$(rust_abi ${CTARGET})" + rtarget="${ERUST_STD_RTARGET:-${rtarget}}" # some targets need to be custom. + rbuild="$(rust_abi ${CBUILD})" + rhost="$(rust_abi ${CHOST})" + + echo + for x in CATEGORY rust_root rbuild rhost rtarget RUSTFLAGS CFLAGS CXXFLAGS LDFLAGS; do + einfo "$(printf '%10s' ${x^^}:) ${!x}" + done + + cat <<- EOF > "${S}"/config.toml + [build] + build = "${rbuild}" + host = ["${rhost}"] + target = ["${rtarget}"] + cargo = "${rust_root}/bin/cargo" + rustc = "${rust_root}/bin/rustc" + submodules = false + python = "${EPYTHON}" + locked-deps = true + vendor = true + extended = true + verbose = 2 + cargo-native-static = false + [install] + prefix = "${EPREFIX}/usr/lib/${PN}/${PV}" + sysconfdir = "etc" + docdir = "share/doc/rust" + bindir = "bin" + libdir = "lib" + mandir = "share/man" + [rust] + # https://github.com/rust-lang/rust/issues/54872 + codegen-units-std = 1 + optimize = true + debug = $(toml_usex debug) + debug-assertions = $(toml_usex debug) + debuginfo-level-rustc = 0 + backtrace = true + incremental = false + default-linker = "$(tc-getCC)" + rpath = false + dist-src = false + remap-debuginfo = true + jemalloc = false + [dist] + src-tarball = false + [target.${rtarget}] + cc = "$(tc-getCC ${CTARGET})" + cxx = "$(tc-getCXX ${CTARGET})" + linker = "$(tc-getCC ${CTARGET})" + ar = "$(tc-getAR ${CTARGET})" + $(usex elibc_musl 'crt-static = false' '') + EOF + + einfo "${PN^} configured with the following settings:" + cat "${S}"/config.toml || die +} + +src_compile() { + env RUST_BACKTRACE=1 \ + "${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) \ + library/std --stage 0 || die +} + +src_test() { + ewarn "${PN} can't run tests" +} + +src_install() { + local rustlib="lib/rust/${PV}/lib/rustlib" + dodir "/usr/${rustlib}" + pushd "build/${rhost}/stage0-sysroot/lib/rustlib" > /dev/null || die + cp -pPRv "${rtarget}" "${ED}/usr/${rustlib}" || die + popd > /dev/null || die +} diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest index 9664a8a3d2b5..55c726c7dae6 100644 --- a/sys-fs/btrfs-progs/Manifest +++ b/sys-fs/btrfs-progs/Manifest @@ -1,4 +1,3 @@ DIST btrfs-progs-v5.10.1.tar.xz 2204164 BLAKE2B ed83729754f9abd22d4d2e7ae9a7e90e80be9b63d49a4a9692e20e5939467dbd864834b71495661e1c7a1fca89e253a62fbda37f1d01d2eadecb13f5904f0dd0 SHA512 32e5b8bda1863e34613802db91946f240b2cde21288ff8f95c1807e7afd0a67c5a704aa4d2bc0d7b1ca094de6831adbfec83fe61f74e1caf6d1975be7d972f2d DIST btrfs-progs-v5.11.1.tar.xz 2213548 BLAKE2B f428e8ffb62f60e6772102f4623b9965edc5d18fa60aa8cb60fd92b4867ee29e3067a6b9d0935c738acce5f0abfc4b88c900121ee233aa881857ed4690e38e3b SHA512 f93a54bd2256851a74fc8e52b26f697bd7bf788cb2481512c92ebf1b9a2f2968b62d680f9f000d6162bd6f22b5d632b2149a88adad8c489e1332f810b439da90 -DIST btrfs-progs-v5.11.tar.xz 2212292 BLAKE2B e19933e1c0d3f80db931554c1cb4b1d25c5b2f2c5ea0ec19623696b24d696247536d615d569cc28c9a84b1484e38141945465251272b2d1df2cadde5af4dee88 SHA512 20b10ba0f6978d0cb202f055edf41abeb36b629fd6d5cc7cb9ebc82ef79d2bef31ff7c9681770c7ea7b126cfb4cafd6d610476fd5cc7506189f74dc214445cf0 -DIST btrfs-progs-v5.4.1.tar.xz 2107476 BLAKE2B 1ea58f49b0f8185e944010804e544643a2eafeea58fecb480b13095c362350c218f0602fbb43a96705a81befe88ec3e3abe35cc90d4732006479b059aa7fed32 SHA512 56381b37036aecea61b758fb4971abfeda24a387bb3a828f7d54eb068982a37763a8ebe2bcc6be61d6a8bc2057dddcd4754325b236e14d8ec02e58cf711f192f +DIST btrfs-progs-v5.12.tar.xz 2220396 BLAKE2B be3eaadca7386ab1348c4bef6cf10270a42ac34c8e7e1cb54b9db600fde6a5958cff9453e6c287fba23f928116eeccca5d90f78f9c042b972a3ac66a31566e3b SHA512 af9ab8bf232e0c62cc093d848b95991924cc3a84020fb9c85765a63a1cc132403e784bf18f81b71b2af9daa0038a7b11e578ee7b50d90481a888f7a967a5b197 diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.11.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.12.ebuild index e7da9aa59cf0..e7da9aa59cf0 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-5.11.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-5.12.ebuild diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.4.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.4.1.ebuild deleted file mode 100644 index f8cf24f4aed1..000000000000 --- a/sys-fs/btrfs-progs/btrfs-progs-5.4.1.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 2008-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) - -inherit bash-completion-r1 python-single-r1 - -libbtrfs_soname=0 - -if [[ ${PV} != 9999 ]]; then - MY_PV="v${PV/_/-}" - [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86" - SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" - S="${WORKDIR}/${PN}-${MY_PV}" -else - WANT_LIBTOOL=none - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git" - EGIT_BRANCH="devel" -fi - -DESCRIPTION="Btrfs filesystem utilities" -HOMEPAGE="https://btrfs.wiki.kernel.org" - -LICENSE="GPL-2" -SLOT="0/${libbtrfs_soname}" -IUSE="+convert doc python reiserfs static static-libs +zstd" - -RESTRICT=test # tries to mount repared filesystems - -RDEPEND=" - dev-libs/lzo:2= - sys-apps/util-linux:0=[static-libs(+)?] - sys-libs/zlib:0= - convert? ( - sys-fs/e2fsprogs:0= - sys-libs/e2fsprogs-libs:0= - reiserfs? ( - >=sys-fs/reiserfsprogs-3.6.27 - ) - ) - python? ( ${PYTHON_DEPS} ) - zstd? ( app-arch/zstd:0= ) -" -DEPEND="${RDEPEND} - convert? ( sys-apps/acl ) - python? ( - $(python_gen_cond_dep ' - dev-python/setuptools[${PYTHON_MULTI_USEDEP}] - ') - ) - static? ( - dev-libs/lzo:2[static-libs(+)] - sys-apps/util-linux:0[static-libs(+)] - sys-libs/zlib:0[static-libs(+)] - convert? ( - sys-fs/e2fsprogs:0[static-libs(+)] - sys-libs/e2fsprogs-libs:0[static-libs(+)] - reiserfs? ( - >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] - ) - ) - zstd? ( app-arch/zstd:0[static-libs(+)] ) - ) -" -BDEPEND=" - doc? ( - || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) - app-text/docbook-xml-dtd:4.5 - app-text/xmlto - ) -" - -if [[ ${PV} == 9999 ]]; then - DEPEND+=" sys-devel/gnuconfig" -fi - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - if [[ ${PV} == 9999 ]]; then - AT_M4DIR=m4 eautoreconf - mkdir config || die - local automakedir="$(autotools_run_tool --at-output automake --print-libdir)" - [[ -e ${automakedir} ]] || die "Could not locate automake directory" - ln -s "${automakedir}"/install-sh config/install-sh || die - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die - fi -} - -src_configure() { - local myeconfargs=( - --bindir="${EPREFIX}"/sbin - $(use_enable convert) - $(use_enable doc documentation) - $(use_enable elibc_glibc backtrace) - $(use_enable python) - $(use_enable static-libs static) - $(use_enable zstd) - --with-convert=ext2$(usex reiserfs ',reiserfs' '') - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - emake V=1 all $(usev static) -} - -src_install() { - local makeargs=( - $(usex python install_python '') - $(usex static install-static '') - ) - emake V=1 DESTDIR="${D}" install "${makeargs[@]}" - newbashcomp btrfs-completion btrfs - use python && python_optimize - - # install prebuilt subset of manuals - use doc || doman Documentation/*.[58] -} diff --git a/sys-fs/sysfsutils/sysfsutils-2.1.1.ebuild b/sys-fs/sysfsutils/sysfsutils-2.1.1.ebuild index f6d6c7a47465..41ccecdbd60f 100644 --- a/sys-fs/sysfsutils/sysfsutils-2.1.1.ebuild +++ b/sys-fs/sysfsutils/sysfsutils-2.1.1.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/linux-ras/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="static-libs" src_prepare() { diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest index de45009ef11a..a1918bddf952 100644 --- a/sys-fs/zfs-kmod/Manifest +++ b/sys-fs/zfs-kmod/Manifest @@ -1,4 +1,4 @@ DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce DIST zfs-2.0.4.tar.gz 13123872 BLAKE2B 7e4780092c0a87d5d187cd5734ddc736574db80b500f155287640ef2230e09335cc9b6b26ec1b7d8ab1b7942673ea49a3007a81da372a6d2ac36f3908913045c SHA512 1dda92d424372bce7020f5215545485eae69211b6f0fb6bea3c7c22efac76c6a2662f0dd14a03f723b6a6fe73b1228ecca211a4034b86cf885bcadf38ba0dc6b -DIST zfs-2.1.0-rc4.tar.gz 34806338 BLAKE2B b15b641ad322b7a50a5942500ef7c26f85074ef2672747f7391fcc785c3564c23fa5d49d51a146d284309905b4f1e1f96bb1e48f5cd1aeaebe6c55bc74a1f46f SHA512 1739798ea4fa552300004cbcb16ab0d3b02bba7cbd3bb31f9282af2dab9606478754abb49b8f170b0dfedfc4e2484e16cc8c160d02fa72a9b6720660c663e7bc -DIST zfs-2.1.0-rc4.tar.gz.asc 195 BLAKE2B 99fd0599ed81838a1c416dbfbaa1bace607576544d5a49918d98c1c8ddf879be694f8c3213c5f5d28f7806a99bc08027ab45d46d55eed3b0e3952ec51af204ae SHA512 ed331cc7db67590d62c19fb37babd0303fddf8255d93d0742659c98af26da31d45685770ec86b086e2ba4468d48bb2c3faba1763e4b00d0c5624a308ee751527 +DIST zfs-2.1.0-rc5.tar.gz 34811108 BLAKE2B fd785dd9a77a55b734fd96526e5805cd8e90a517cef48bed95fccc4849f7be45210b3cc6f6bdfb30f3ee3a9a9814308eb1599c4df143aca46b23f968dc088a54 SHA512 37dd4f40a8ab8265a4f8c1d67d1a4327b1376bbd2d53b166261d501ffc01521deaa03f8bcce992158d50482def184b840d2596df6d9291697b1fc1938731d6d8 +DIST zfs-2.1.0-rc5.tar.gz.asc 195 BLAKE2B 452c211af7ad3b5f7e2b7bc96985305dabcedde0f70825353b18d45e569f2bbd39b717d7e7b790794735295ec5dcc4ed751f5256fffa7b892627056191f02b79 SHA512 85908fbb2cb49965ce015d20182aef035fbd76195a1a72aa36a48af05bd355a95998087ec3b6c73b6de6eebd66e578bef28db6ecbf679274ce6aade303b66cae diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.0_rc4.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.0_rc5.ebuild index f72fc5b216bc..d09744c5227c 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-2.1.0_rc4.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.0_rc5.ebuild @@ -17,9 +17,9 @@ else MY_PV="${PV/_rc/-rc}" SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz" - SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )" + SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )" S="${WORKDIR}/zfs-${PV%_rc?}" - ZFS_KERNEL_COMPAT="5.11" + ZFS_KERNEL_COMPAT="5.12" if [[ ${PV} != *_rc* ]]; then KEYWORDS="~amd64 ~arm64 ~ppc64" diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild index f72fc5b216bc..d09744c5227c 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild @@ -17,9 +17,9 @@ else MY_PV="${PV/_rc/-rc}" SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz" - SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )" + SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )" S="${WORKDIR}/zfs-${PV%_rc?}" - ZFS_KERNEL_COMPAT="5.11" + ZFS_KERNEL_COMPAT="5.12" if [[ ${PV} != *_rc* ]]; then KEYWORDS="~amd64 ~arm64 ~ppc64" diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest index de45009ef11a..a1918bddf952 100644 --- a/sys-fs/zfs/Manifest +++ b/sys-fs/zfs/Manifest @@ -1,4 +1,4 @@ DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce DIST zfs-2.0.4.tar.gz 13123872 BLAKE2B 7e4780092c0a87d5d187cd5734ddc736574db80b500f155287640ef2230e09335cc9b6b26ec1b7d8ab1b7942673ea49a3007a81da372a6d2ac36f3908913045c SHA512 1dda92d424372bce7020f5215545485eae69211b6f0fb6bea3c7c22efac76c6a2662f0dd14a03f723b6a6fe73b1228ecca211a4034b86cf885bcadf38ba0dc6b -DIST zfs-2.1.0-rc4.tar.gz 34806338 BLAKE2B b15b641ad322b7a50a5942500ef7c26f85074ef2672747f7391fcc785c3564c23fa5d49d51a146d284309905b4f1e1f96bb1e48f5cd1aeaebe6c55bc74a1f46f SHA512 1739798ea4fa552300004cbcb16ab0d3b02bba7cbd3bb31f9282af2dab9606478754abb49b8f170b0dfedfc4e2484e16cc8c160d02fa72a9b6720660c663e7bc -DIST zfs-2.1.0-rc4.tar.gz.asc 195 BLAKE2B 99fd0599ed81838a1c416dbfbaa1bace607576544d5a49918d98c1c8ddf879be694f8c3213c5f5d28f7806a99bc08027ab45d46d55eed3b0e3952ec51af204ae SHA512 ed331cc7db67590d62c19fb37babd0303fddf8255d93d0742659c98af26da31d45685770ec86b086e2ba4468d48bb2c3faba1763e4b00d0c5624a308ee751527 +DIST zfs-2.1.0-rc5.tar.gz 34811108 BLAKE2B fd785dd9a77a55b734fd96526e5805cd8e90a517cef48bed95fccc4849f7be45210b3cc6f6bdfb30f3ee3a9a9814308eb1599c4df143aca46b23f968dc088a54 SHA512 37dd4f40a8ab8265a4f8c1d67d1a4327b1376bbd2d53b166261d501ffc01521deaa03f8bcce992158d50482def184b840d2596df6d9291697b1fc1938731d6d8 +DIST zfs-2.1.0-rc5.tar.gz.asc 195 BLAKE2B 452c211af7ad3b5f7e2b7bc96985305dabcedde0f70825353b18d45e569f2bbd39b717d7e7b790794735295ec5dcc4ed751f5256fffa7b892627056191f02b79 SHA512 85908fbb2cb49965ce015d20182aef035fbd76195a1a72aa36a48af05bd355a95998087ec3b6c73b6de6eebd66e578bef28db6ecbf679274ce6aade303b66cae diff --git a/sys-fs/zfs/zfs-2.1.0_rc4.ebuild b/sys-fs/zfs/zfs-2.1.0_rc5.ebuild index 4292b09c8391..621ef35d32be 100644 --- a/sys-fs/zfs/zfs-2.1.0_rc4.ebuild +++ b/sys-fs/zfs/zfs-2.1.0_rc5.ebuild @@ -4,6 +4,7 @@ EAPI=7 DISTUTILS_OPTIONAL=1 +DISTUTILS_USE_SETUPTOOLS=manual PYTHON_COMPAT=( python3_{7,8,9} ) inherit autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index 4292b09c8391..621ef35d32be 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-9999.ebuild @@ -4,6 +4,7 @@ EAPI=7 DISTUTILS_OPTIONAL=1 +DISTUTILS_USE_SETUPTOOLS=manual PYTHON_COMPAT=( python3_{7,8,9} ) inherit autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest index 132fb9d2b881..3446e73ce786 100644 --- a/sys-kernel/vanilla-sources/Manifest +++ b/sys-kernel/vanilla-sources/Manifest @@ -10,7 +10,7 @@ DIST patch-4.14.232.xz 4228268 BLAKE2B 259de6445dcfd1d407bbe0d2d0489e8b7fb2a99a5 DIST patch-4.19.190.xz 3933168 BLAKE2B 301dcd17bfc0c94ad09bdcf6261da09ad9f1c36c1a047df94e7040d1b2c2b6224b08b596c3b4583a884ea7d5a70b9d3652ccd72e49aff54f61ee4afb30e514d7 SHA512 cf70f27725e3c9e4b9a5a0062734ebf20672bc4378f33dc882b3ed3abfccf31ed70c211c3e13a8b1d3971d7f0a71b089e080a49083cb39e738b80f77d0215a65 DIST patch-4.4.268.xz 3528152 BLAKE2B 10c2018a5470ee88b04f6e1917422967bbf15e470a28e0840948d022dd5d4f73b14842aa384408a4dbf32085f2f756208dbd0e0cb280a6cfd566de4735277f84 SHA512 0a9a78c7b45c9bee2e0fb83cbaf70d98217907ee1b0bca3efd666038099401fac503f686e108bbffd3b77c36562b896cea613ef2477abf10e998a7875efe0828 DIST patch-4.9.268.xz 3938996 BLAKE2B 2b8da0525ede5cbf2d52b6063b914263c687847b64a475c4053d308fa434f6b6379d94f933dde3d86998c08dafd28e5b49b43bc90041ae3c4a09c08597e62d2f SHA512 8bd64323a109e8aa37d131e0bad6588313e064cb7866815c0c3ce893fc8d4ec9120c4ee2804aaeeca7445af53ad1a762e56ca640b58210255ef1775ed737ba5e -DIST patch-5.10.35.xz 1081212 BLAKE2B 714413b61e5fab9eeab9271edf09092fe8148d9d787e388770b0a5357d423bf278d8ac8db20e969ed89293dba0e7d84a0a56b94692ca9f3cda0f38ef002bcd63 SHA512 9771da96b4f79b5ff5927379f5a939ff3c0f70724fab5cdc7d6fc81ed993fac89244c1c0e26e8c6c034a27f5f670f813071ea33e1d1d36a2e1a5370644d67112 +DIST patch-5.10.36.xz 1154140 BLAKE2B 705c82a3c9a5f3c0d1ca5f2393507f1c7a40371fbef44ec63356d1bc60452569d1457be730957042c8acad36545ead3846f448395be8248fd28c67fb65946b89 SHA512 badb51b4b3a163d67df9d7c77218b46ac69d8445eaa20db28529eb6594d525f14a27e87c4a174b96bed2b17f901928a15b6f982f00d5423c3719b9b49f2d6173 DIST patch-5.11.19.xz 658972 BLAKE2B aa1baee33262f43b6ebe2736cda35d03d31c327cb2684f89bdce425e73961b546cf2669781ccd7753a602df74a16864122d6f91367fb763dd89a2cd49b79afa7 SHA512 e5323c9f41408fa6dcad107f73aa764c74098861f1e18a592b4d5183b64081380f65bdd0605918e33586febbb8a9c135949dfd705ca18b8714d58e6e239a7634 DIST patch-5.12.2.xz 7220 BLAKE2B e9417941de68a488add40f4fedb023a4a2aee57520098a32177ef8877f8ab6b94041349cbfea727c47739c9de9828cddaf8cb203e0d760bafa5d7a585b08af6e SHA512 bf654385f6dbf05e8e53d9dfd488dd7d5cafe820c77af3c330940fc9b68ba576edabd75262ca9b8fefdbedc77683602b002432ea9cab0b6b01646f04c941e98a -DIST patch-5.4.117.xz 2850136 BLAKE2B c5f0bb61309092355a27bdd8e6447f3ba7f3ae1926b5c5b41ad417b02e4c42ecc7a216e509c699f74898f51c49fd934d71701bb226a419f8e3c2e34cc35c6921 SHA512 ca1d22d45736f705dabc319509fd5257bacc2bb61afa3faa18470adb502b492118beff7f2b35b55f1091c20b9ae0b16aafd47d04a07768a9fe9051c26ef4a153 +DIST patch-5.4.118.xz 2886624 BLAKE2B bd129027e8ab00d6a21b8f6cfc1e5c1f8ca21663435ded6605f7255c1ee8cf710713447a553fe4542aab5a43ff04a2933c8144f42722e45f5a7991af27efcf72 SHA512 e3035a71e9e2071f8d59e4169559a2b4d6e71576b2f215282783bcd6d533f68aa718ab8375016f2a8eb40fcbec0faf00974baaaab3e95360c6b1345f3e343d45 diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.10.35.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.10.36.ebuild index 7083facc514b..7083facc514b 100644 --- a/sys-kernel/vanilla-sources/vanilla-sources-5.10.35.ebuild +++ b/sys-kernel/vanilla-sources/vanilla-sources-5.10.36.ebuild diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.117.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.118.ebuild index 7083facc514b..7083facc514b 100644 --- a/sys-kernel/vanilla-sources/vanilla-sources-5.4.117.ebuild +++ b/sys-kernel/vanilla-sources/vanilla-sources-5.4.118.ebuild diff --git a/sys-libs/glibc/glibc-2.33.ebuild b/sys-libs/glibc/glibc-2.33.ebuild index 8cda845c34b6..f2eabcd84c0f 100644 --- a/sys-libs/glibc/glibc-2.33.ebuild +++ b/sys-libs/glibc/glibc-2.33.ebuild @@ -649,21 +649,6 @@ sanity_prechecks() { ewarn "hypervisor, which is probably not what you want." fi - # Check for sanity of /etc/nsswitch.conf - if [[ -e ${EROOT}/etc/nsswitch.conf ]] ; then - local entry - for entry in passwd group shadow; do - if ! egrep -q "^[ \t]*${entry}:.*files" "${EROOT}"/etc/nsswitch.conf; then - eerror "Your ${EROOT}/etc/nsswitch.conf is out of date." - eerror "Please make sure you have 'files' entries for" - eerror "'passwd:', 'group:' and 'shadow:' databases." - eerror "For more details see:" - eerror " https://wiki.gentoo.org/wiki/Project:Toolchain/nsswitch.conf_in_glibc-2.26" - die "nsswitch.conf has no 'files' provider in '${entry}'." - fi - done - fi - # ABI-specific checks follow here. Hey, we have a lot more specific conditions that # we test for... if ! is_crosscompile ; then diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index 95493a554e20..d99367f1bca2 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -650,21 +650,6 @@ sanity_prechecks() { ewarn "hypervisor, which is probably not what you want." fi - # Check for sanity of /etc/nsswitch.conf - if [[ -e ${EROOT}/etc/nsswitch.conf ]] ; then - local entry - for entry in passwd group shadow; do - if ! egrep -q "^[ \t]*${entry}:.*files" "${EROOT}"/etc/nsswitch.conf; then - eerror "Your ${EROOT}/etc/nsswitch.conf is out of date." - eerror "Please make sure you have 'files' entries for" - eerror "'passwd:', 'group:' and 'shadow:' databases." - eerror "For more details see:" - eerror " https://wiki.gentoo.org/wiki/Project:Toolchain/nsswitch.conf_in_glibc-2.26" - die "nsswitch.conf has no 'files' provider in '${entry}'." - fi - done - fi - # ABI-specific checks follow here. Hey, we have a lot more specific conditions that # we test for... if ! is_crosscompile ; then diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest index afea72927c18..307ee2643684 100644 --- a/www-apps/kibana-bin/Manifest +++ b/www-apps/kibana-bin/Manifest @@ -1,5 +1,6 @@ DIST kibana-6.8.15-linux-x86_64.tar.gz 188083650 BLAKE2B ce12b1f564f9059952402d53a43c4e2b5a550b69b8835460f870fdf772ce8881325239165677659f6bfc295e148831b3e0459e7a059f73d03e218260c8e5139e SHA512 7afbcd42f332b281106fc58397d7229aa3e3ac38aa9ffcd5d7e3edf32b084f6bf812eac002166099b4e270019651a0d6cb3a9ea06f93f5927c4b4329eb36a14e DIST kibana-7.10.2-linux-x86_64.tar.gz 249171053 BLAKE2B 279b1f67a9aaaf6d4bd0a8ba6028794ce8a9a996c9e9daad0815f9dfe9c696748d4210a7496907ee4be8fac111a2f08cc6d84d8fdac0b959b4ce6ee48f712d1a SHA512 aa68f850cc09cf5dcb7c0b48bb8df788ca58eaad38d96141b8e59917fd38b42c728c0968f7cb2c8132c5aaeb595525cdde0859554346c496f53c569e03abe412 DIST kibana-7.12.0-linux-x86_64.tar.gz 281022115 BLAKE2B 6400dc95f0d2eb357cce46679ab3eb1043f873dcc5904cb1d1169d44fefdc8ca5bcde8c8d3990f951754c2448c12514ac4d0a355f817e5b9b5ce7bf52fb41d00 SHA512 0b6a9596698c64a65d82cc146dad8e24118eb8991b9ed36e13f309d2e3d7af408c35358a8b39899bf2daf260ddd8d50678d437a3dba32923fe026da99a526006 +DIST kibana-7.12.1-linux-x86_64.tar.gz 281051589 BLAKE2B 041ac27f3d58ad419cf6410fcd452dad34a205699701088eeea11056974429e27a1c980ddc2609a592ee1c33f73bde39724603c17c604973a5c80bf1c36e3a70 SHA512 f215ae38c6976e0926b57a3dcb639ba532b724a8195e791a33a09540865a49e7180bed1692a6530b149e0bd6c4dd130c1d6c2dc6022b3ec5b8ec7ec4dc977b17 DIST kibana-oss-6.8.15-linux-x86_64.tar.gz 70468224 BLAKE2B 5ad359cef5082035eaefe277128f8badce8539484f30399d504efe8fe645b1e925f22126a48bf3ef89efc466eff641241e109372ca84f34d2ac4014aeec1868a SHA512 ef67258e2f3d3f447a53ec23d519f13ea50a65f3fde7215352178a6efad9b20c9ce5ade14c4a185c2005b9ec29c997e40e435a0129dd4d03adeaaa21868c9a22 DIST kibana-oss-7.10.2-linux-x86_64.tar.gz 111701314 BLAKE2B b72ebac1d628cdf486b815d7b9bc87d14d09d21d86affdafa2b7809486649bd10f7d63ba832bb0841102915d5efefce2d4324df8314272a37774ea031fa59ef4 SHA512 77ebb247d5326f3f9ab97d57ecc00c7f70deae0e1857d8b5d8f9a5d05d6713e27514cca342df666be79ab85a580e9dc5c7fa9676d67e95db64a0d69546d8d699 diff --git a/www-apps/kibana-bin/kibana-bin-7.12.1.ebuild b/www-apps/kibana-bin/kibana-bin-7.12.1.ebuild new file mode 100644 index 000000000000..394a86442834 --- /dev/null +++ b/www-apps/kibana-bin/kibana-bin-7.12.1.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd + +MY_PN="${PN%-bin}" +MY_P=${MY_PN}-${PV} + +DESCRIPTION="Analytics and search dashboard for Elasticsearch" +HOMEPAGE="https://www.elastic.co/products/kibana" +SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz" + +# source: LICENSE.txt and NOTICE.txt +LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 Elastic-2.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + acct-group/kibana + acct-user/kibana + dev-libs/expat + dev-libs/nss + >=net-libs/nodejs-14.16.0 + <net-libs/nodejs-15 +" + +# Do not complain about CFLAGS etc since we don't use them +QA_FLAGS_IGNORED='.*' +QA_PRESTRIPPED=" + opt/kibana/x-pack/plugins/reporting/chromium/headless_shell-linux_x64/headless_shell + opt/kibana/x-pack/plugins/reporting/chromium/headless_shell-linux_x64/swiftshader/libEGL.so + opt/kibana/x-pack/plugins/reporting/chromium/headless_shell-linux_x64/swiftshader/libGLESv2.so + opt/kibana/node_modules/re2/build/Release/re2.node +" + +S="${WORKDIR}/${MY_P}-linux-x86_64" + +src_prepare() { + default + + # remove unused directory + rm -r data || die + + # remove bundled nodejs + rm -r node || die + sed -i 's@\(^NODE="\).*@\1/usr/bin/node"@g' \ + bin/kibana || die + + # move plugins to /var/lib/kibana + rm -r plugins || die + + # handle node.js version with RDEPEND + sed -i /node_version_validator/d \ + src/setup_node_env/index.js \ + src/setup_node_env/no_transpilation.js || die +} + +src_install() { + insinto /etc/${MY_PN} + doins -r config/. + rm -r config || die + + insinto /etc/logrotate.d + newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN} + + newconfd "${FILESDIR}"/${MY_PN}.confd ${MY_PN} + newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN} + systemd_dounit "${FILESDIR}"/${MY_PN}.service + + insinto /opt/${MY_PN} + doins -r . + + fperms -R +x /opt/${MY_PN}/bin + + diropts -m 0750 -o ${MY_PN} -g ${MY_PN} + keepdir /var/lib/${MY_PN}/plugins + keepdir /var/log/${MY_PN} + + dosym ../../var/lib/kibana/plugins /opt/kibana/plugins +} + +pkg_postinst() { + elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and" + elog "Node.js 14. Some plugins may fail with other versions of Node.js (Bug #656008)." + elog + elog "To set a customized Elasticsearch instance:" + elog " OpenRC: set ES_INSTANCE in /etc/conf.d/${MY_PN}" + elog " systemd: set elasticsearch.url in /etc/${MY_PN}/kibana.yml" + elog + elog "Elasticsearch can run local or remote." +} diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 5df4788d36cb..81afee6b5500 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,4 +1,5 @@ DIST chromium-90-patchset-7.tar.xz 3892 BLAKE2B 3ba169baaaf74b548749be3f845f505256cc9573f798e10929b5d1f0f534d739e657e3fa134c78ec3f7987a3b89adfc4bee0d1a6585ad8fe4bdc3ffd1181042c SHA512 5e1aa834ee5668ee40fc3af5cda7325da710dd1a0dea7ce535e89e36fd7d321db63d520a9b6ce6372ed941473dff18d1276316567af810c18e1478a04d3f23f8 +DIST chromium-90.0.4430.212.tar.xz 917430448 BLAKE2B dbea5515a62c3f3a12596da6d77cad106d377ddda8956da81b8fe8c0c1e3bfa90ba82bca8c1c4fd95282ee0c00a5f3f5206a05728043eb967395a8cf8bda960d SHA512 7cd300d22725e3457b9e3347fb34d6f5728c91aa178d6960d4243bc80122c446890c2276334a01f9c81a43479339e9e266c3bbb040081a22c521b3c4250850f5 DIST chromium-90.0.4430.93.tar.xz 917357836 BLAKE2B 5c2643d7d96775491243a4e5b1ba6793523edd3991f04167f51cfbdc5b035c753d80ef4b427785a05f6628b90f4a483e88ddc219358e118e4f3a5020dbf82d77 SHA512 c409df621ec849bcfd5c9f6dbeeddde86e75e54be8f8d51a73daf69a216f4c26b083d32e5f5b9f0c7baf833c495322fb2543d1565cddd6f0b8f914db14a13d4e DIST chromium-91-patchset-5.tar.xz 3648 BLAKE2B 6c8636f63dc857886d09c8ed69b4c61adc627d2280decdf03b548be8ff2cb522ef0def7a240d1c3c9ee71920304a43af571e2146e2828b89c3b6f87373b8c4a1 SHA512 1554feec958291ad3140e2685683befe4b6e0b0ab6a8694c0e02d5b4bf4b7fcad410f17e72099653456fd95ed24a732dd28f2dcfaf146eb3bf68052e2342a481 DIST chromium-91.0.4472.38.tar.xz 949887092 BLAKE2B 4887efcd6af80ab75c5ec4f894b398dd896843c2560158f15f3f8c8150aa475723311344c4d3715265a026af6a9db45e8fc23f27d1bbf5b18200c7b1397b8955 SHA512 7073a1831ce0ba0a53607ef5b17d517313a540757c95ad07b8f6de1d8915fe31edab464fdc26d4ba22bbe34ddf19a0b815614eb34e14256f0425c486549dfb86 diff --git a/www-client/chromium/chromium-90.0.4430.212.ebuild b/www-client/chromium/chromium-90.0.4430.212.ebuild new file mode 100644 index 000000000000..ef8367ffc917 --- /dev/null +++ b/www-client/chromium/chromium-90.0.4430.212.ebuild @@ -0,0 +1,926 @@ +# Copyright 2009-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="xml" + +CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he + hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr + sv sw ta te th tr uk vi zh-CN zh-TW" + +inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils + +DESCRIPTION="Open-source version of Google Chrome web browser" +HOMEPAGE="https://chromium.org/" +PATCHSET="7" +PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}" +SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz + https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip + https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-icu +tcmalloc vaapi wayland widevine" +REQUIRED_USE=" + component-build? ( !suid ) + screencast? ( wayland ) +" + +COMMON_X_DEPEND=" + media-libs/mesa:=[gbm] + x11-libs/libX11:= + x11-libs/libXcomposite:= + x11-libs/libXcursor:= + x11-libs/libXdamage:= + x11-libs/libXext:= + x11-libs/libXfixes:= + >=x11-libs/libXi-1.6.0:= + x11-libs/libXrandr:= + x11-libs/libXrender:= + x11-libs/libXtst:= + x11-libs/libxcb:= + x11-libs/libxshmfence:= + vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) +" + +COMMON_DEPEND=" + app-arch/bzip2:= + cups? ( >=net-print/cups-1.3.11:= ) + dev-libs/expat:= + dev-libs/glib:2 + >=dev-libs/libxml2-2.9.4-r3:=[icu] + dev-libs/nspr:= + >=dev-libs/nss-3.26:= + >=media-libs/alsa-lib-1.0.19:= + media-libs/fontconfig:= + media-libs/freetype:= + >=media-libs/harfbuzz-2.4.0:0=[icu(-)] + media-libs/libjpeg-turbo:= + media-libs/libpng:= + pulseaudio? ( media-sound/pulseaudio:= ) + system-ffmpeg? ( + >=media-video/ffmpeg-4.3:= + || ( + media-video/ffmpeg[-samba] + >=net-fs/samba-4.5.10-r1[-debug(-)] + ) + >=media-libs/opus-1.3.1:= + ) + sys-apps/dbus:= + sys-apps/pciutils:= + virtual/udev + x11-libs/cairo:= + x11-libs/gdk-pixbuf:2 + x11-libs/libxkbcommon:= + x11-libs/pango:= + media-libs/flac:= + >=media-libs/libwebp-0.4.0:= + sys-libs/zlib:=[minizip] + kerberos? ( virtual/krb5 ) + !headless? ( + ${COMMON_X_DEPEND} + >=app-accessibility/at-spi2-atk-2.26:2 + >=app-accessibility/at-spi2-core-2.26:2 + >=dev-libs/atk-2.26 + x11-libs/gtk+:3[X] + wayland? ( + dev-libs/wayland:= + screencast? ( media-video/pipewire:0/0.3 ) + x11-libs/gtk+:3[wayland,X] + x11-libs/libdrm:= + ) + ) +" +# For nvidia-drivers blocker, see bug #413637 . +RDEPEND="${COMMON_DEPEND} + x11-misc/xdg-utils + virtual/opengl + virtual/ttf-fonts + selinux? ( sec-policy/selinux-chromium ) + tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) +" +DEPEND="${COMMON_DEPEND} +" +# dev-vcs/git - https://bugs.gentoo.org/593476 +BDEPEND=" + ${PYTHON_DEPS} + >=app-arch/gzip-1.7 + app-arch/unzip + dev-lang/perl + >=dev-util/gn-0.1807 + dev-vcs/git + >=dev-util/gperf-3.0.3 + >=dev-util/ninja-1.7.2 + >=net-libs/nodejs-7.6.0[inspector] + sys-apps/hwids[usb(+)] + >=sys-devel/bison-2.4.3 + sys-devel/flex + virtual/pkgconfig + js-type-check? ( virtual/jre ) +" + +# These are intended for ebuild maintainer use to force clang if GCC is broken. +: ${CHROMIUM_FORCE_CLANG=no} +: ${CHROMIUM_FORCE_LIBCXX=no} + +if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then + BDEPEND+=" >=sys-devel/clang-12" +fi + +if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then + RDEPEND+=" >=sys-libs/libcxx-12" + DEPEND+=" >=sys-libs/libcxx-12" +else + COMMON_DEPEND=" + app-arch/snappy:= + dev-libs/libxslt:= + >=dev-libs/re2-0.2019.08.01:= + >=media-libs/openh264-1.6.0:= + system-icu? ( >=dev-libs/icu-68.1:= ) + " + RDEPEND+="${COMMON_DEPEND}" + DEPEND+="${COMMON_DEPEND}" +fi + +if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then + EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; +fi + +DISABLE_AUTOFORMATTING="yes" +DOC_CONTENTS=" +Some web pages may require additional fonts to display properly. +Try installing some of the following packages if some characters +are not displayed properly: +- media-fonts/arphicfonts +- media-fonts/droid +- media-fonts/ipamonafont +- media-fonts/noto +- media-fonts/ja-ipafonts +- media-fonts/takao-fonts +- media-fonts/wqy-microhei +- media-fonts/wqy-zenhei + +To fix broken icons on the Downloads page, you should install an icon +theme that covers the appropriate MIME types, and configure this as your +GTK+ icon theme. + +For native file dialogs in KDE, install kde-apps/kdialog. + +To make password storage work with your desktop environment you may +have install one of the supported credentials management applications: +- app-crypt/libsecret (GNOME) +- kde-frameworks/kwallet (KDE) +If you have one of above packages installed, but don't want to use +them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS +in /etc/chromium/default. +" + +pre_build_checks() { + if [[ ${MERGE_TYPE} != binary ]]; then + local -x CPP="$(tc-getCXX) -E" + if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then + die "At least gcc 9.2 is required" + fi + # component build hangs with tcmalloc enabled due to sandbox issue, bug #695976. + if has usersandbox ${FEATURES} && use tcmalloc && use component-build; then + die "Component build with tcmalloc requires FEATURES=-usersandbox." + fi + if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || tc-is-clang; then + CPP="${CHOST}-clang++ -E" + if ! ver_test "$(clang-major-version)" -ge 12; then + die "At least clang 12 is required" + fi + fi + fi + + # Check build requirements, bug #541816 and bug #471810 . + CHECKREQS_MEMORY="3G" + CHECKREQS_DISK_BUILD="8G" + if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then + if use custom-cflags || use component-build; then + CHECKREQS_DISK_BUILD="25G" + fi + if ! use component-build; then + CHECKREQS_MEMORY="16G" + fi + fi + check-reqs_pkg_setup +} + +pkg_pretend() { + pre_build_checks +} + +pkg_setup() { + pre_build_checks + + chromium_suid_sandbox_check_kernel_config + + # nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams + if use wayland && ! use headless && has_version "x11-drivers/nvidia-drivers"; then + ewarn "Proprietary nVidia driver does not work with Wayland. You can disable" + ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in /etc/chromium/default." + fi +} + +src_prepare() { + # Calling this here supports resumption via FEATURES=keepwork + python_setup + + local PATCHES=( + "${WORKDIR}/patches" + "${FILESDIR}/chromium-89-EnumTable-crash.patch" + "${FILESDIR}/chromium-shim_headers.patch" + ) + + # seccomp sandbox is broken if compiled against >=sys-libs/glibc-2.33, bug #769989 + if has_version -d ">=sys-libs/glibc-2.33"; then + ewarn "Adding experimental glibc-2.33 sandbox patch. Seccomp sandbox might" + ewarn "still not work correctly. In case of issues, try to disable seccomp" + ewarn "sandbox by adding --disable-seccomp-filter-sandbox to CHROMIUM_FLAGS" + ewarn "in /etc/chromium/default." + PATCHES+=( + "${FILESDIR}/chromium-glibc-2.33.patch" + ) + fi + + default + + mkdir -p third_party/node/linux/node-linux-x64/bin || die + ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die + + local keeplibs=( + base/third_party/cityhash + base/third_party/double_conversion + base/third_party/dynamic_annotations + base/third_party/icu + base/third_party/nspr + base/third_party/superfasthash + base/third_party/symbolize + base/third_party/valgrind + base/third_party/xdg_mime + base/third_party/xdg_user_dirs + buildtools/third_party/libc++ + buildtools/third_party/libc++abi + chrome/third_party/mozilla_security_manager + courgette/third_party + net/third_party/mozilla_security_manager + net/third_party/nss + net/third_party/quic + net/third_party/uri_template + third_party/abseil-cpp + third_party/angle + third_party/angle/src/common/third_party/base + third_party/angle/src/common/third_party/smhasher + third_party/angle/src/common/third_party/xxhash + third_party/angle/src/third_party/compiler + third_party/angle/src/third_party/libXNVCtrl + third_party/angle/src/third_party/trace_event + third_party/angle/src/third_party/volk + third_party/apple_apsl + third_party/axe-core + third_party/blink + third_party/boringssl + third_party/boringssl/src/third_party/fiat + third_party/breakpad + third_party/breakpad/breakpad/src/third_party/curl + third_party/brotli + third_party/catapult + third_party/catapult/common/py_vulcanize/third_party/rcssmin + third_party/catapult/common/py_vulcanize/third_party/rjsmin + third_party/catapult/third_party/beautifulsoup4 + third_party/catapult/third_party/html5lib-python + third_party/catapult/third_party/polymer + third_party/catapult/third_party/six + third_party/catapult/tracing/third_party/d3 + third_party/catapult/tracing/third_party/gl-matrix + third_party/catapult/tracing/third_party/jpeg-js + third_party/catapult/tracing/third_party/jszip + third_party/catapult/tracing/third_party/mannwhitneyu + third_party/catapult/tracing/third_party/oboe + third_party/catapult/tracing/third_party/pako + third_party/ced + third_party/cld_3 + third_party/closure_compiler + third_party/crashpad + third_party/crashpad/crashpad/third_party/lss + third_party/crashpad/crashpad/third_party/zlib + third_party/crc32c + third_party/cros_system_api + third_party/dav1d + third_party/dawn + third_party/dawn/third_party/khronos + third_party/depot_tools + third_party/devscripts + third_party/devtools-frontend + third_party/devtools-frontend/src/front_end/third_party/acorn + third_party/devtools-frontend/src/front_end/third_party/axe-core + third_party/devtools-frontend/src/front_end/third_party/chromium + third_party/devtools-frontend/src/front_end/third_party/codemirror + third_party/devtools-frontend/src/front_end/third_party/fabricjs + third_party/devtools-frontend/src/front_end/third_party/i18n + third_party/devtools-frontend/src/front_end/third_party/intl-messageformat + third_party/devtools-frontend/src/front_end/third_party/lighthouse + third_party/devtools-frontend/src/front_end/third_party/lit-html + third_party/devtools-frontend/src/front_end/third_party/lodash-isequal + third_party/devtools-frontend/src/front_end/third_party/marked + third_party/devtools-frontend/src/front_end/third_party/puppeteer + third_party/devtools-frontend/src/front_end/third_party/wasmparser + third_party/devtools-frontend/src/third_party + third_party/dom_distiller_js + third_party/eigen3 + third_party/emoji-segmenter + third_party/farmhash + third_party/fdlibm + third_party/fft2d + third_party/flatbuffers + third_party/freetype + third_party/fusejs + third_party/libgifcodec + third_party/liburlpattern + third_party/libzip + third_party/gemmlowp + third_party/google_input_tools + third_party/google_input_tools/third_party/closure_library + third_party/google_input_tools/third_party/closure_library/third_party/closure + third_party/googletest + third_party/harfbuzz-ng/utils + third_party/hunspell + third_party/iccjpeg + third_party/inspector_protocol + third_party/jinja2 + third_party/jsoncpp + third_party/jstemplate + third_party/khronos + third_party/leveldatabase + third_party/libXNVCtrl + third_party/libaddressinput + third_party/libaom + third_party/libaom/source/libaom/third_party/fastfeat + third_party/libaom/source/libaom/third_party/vector + third_party/libaom/source/libaom/third_party/x86inc + third_party/libavif + third_party/libgav1 + third_party/libjingle + third_party/libphonenumber + third_party/libsecret + third_party/libsrtp + third_party/libsync + third_party/libudev + third_party/libva_protected_content + third_party/libvpx + third_party/libvpx/source/libvpx/third_party/x86inc + third_party/libwebm + third_party/libx11 + third_party/libxcb-keysyms + third_party/libxml/chromium + third_party/libyuv + third_party/llvm + third_party/lottie + third_party/lss + third_party/lzma_sdk + third_party/mako + third_party/markupsafe + third_party/mesa + third_party/metrics_proto + third_party/minigbm + third_party/modp_b64 + third_party/nasm + third_party/nearby + third_party/neon_2_sse + third_party/node + third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2 + third_party/one_euro_filter + third_party/opencv + third_party/openscreen + third_party/openscreen/src/third_party/mozilla + third_party/openscreen/src/third_party/tinycbor/src/src + third_party/ots + third_party/pdfium + third_party/pdfium/third_party/agg23 + third_party/pdfium/third_party/base + third_party/pdfium/third_party/bigint + third_party/pdfium/third_party/freetype + third_party/pdfium/third_party/lcms + third_party/pdfium/third_party/libopenjpeg20 + third_party/pdfium/third_party/libpng16 + third_party/pdfium/third_party/libtiff + third_party/pdfium/third_party/skia_shared + third_party/perfetto + third_party/perfetto/protos/third_party/chromium + third_party/pffft + third_party/ply + third_party/polymer + third_party/private-join-and-compute + third_party/private_membership + third_party/protobuf + third_party/protobuf/third_party/six + third_party/pyjson5 + third_party/qcms + third_party/rnnoise + third_party/s2cellid + third_party/schema_org + third_party/securemessage + third_party/shell-encryption + third_party/simplejson + third_party/skia + third_party/skia/include/third_party/skcms + third_party/skia/include/third_party/vulkan + third_party/skia/third_party/skcms + third_party/skia/third_party/vulkan + third_party/smhasher + third_party/sqlite + third_party/swiftshader + third_party/swiftshader/third_party/astc-encoder + third_party/swiftshader/third_party/llvm-subzero + third_party/swiftshader/third_party/marl + third_party/swiftshader/third_party/subzero + third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1 + third_party/tensorflow-text + third_party/tflite + third_party/tflite/src/third_party/eigen3 + third_party/tflite/src/third_party/fft2d + third_party/tflite-support + third_party/tint + third_party/ruy + third_party/ukey2 + third_party/unrar + third_party/usrsctp + third_party/utf + third_party/vulkan + third_party/web-animations-js + third_party/webdriver + third_party/webrtc + third_party/webrtc/common_audio/third_party/ooura + third_party/webrtc/common_audio/third_party/spl_sqrt_floor + third_party/webrtc/modules/third_party/fft + third_party/webrtc/modules/third_party/g711 + third_party/webrtc/modules/third_party/g722 + third_party/webrtc/rtc_base/third_party/base64 + third_party/webrtc/rtc_base/third_party/sigslot + third_party/widevine + third_party/woff2 + third_party/wuffs + third_party/x11proto + third_party/xcbproto + third_party/zxcvbn-cpp + third_party/zlib/google + tools/grit/third_party/six + url/third_party/mozilla + v8/src/third_party/siphash + v8/src/third_party/valgrind + v8/src/third_party/utf8-decoder + v8/third_party/inspector_protocol + v8/third_party/v8 + + # gyp -> gn leftovers + base/third_party/libevent + third_party/speech-dispatcher + third_party/usb_ids + third_party/xdg-utils + ) + if ! use system-ffmpeg; then + keeplibs+=( third_party/ffmpeg third_party/opus ) + fi + if ! use system-icu; then + keeplibs+=( third_party/icu ) + fi + if use tcmalloc; then + keeplibs+=( third_party/tcmalloc ) + fi + if use wayland && ! use headless ; then + keeplibs+=( third_party/wayland ) + fi + if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then + keeplibs+=( third_party/libxml ) + keeplibs+=( third_party/libxslt ) + keeplibs+=( third_party/openh264 ) + keeplibs+=( third_party/re2 ) + keeplibs+=( third_party/snappy ) + if use system-icu; then + keeplibs+=( third_party/icu ) + fi + fi + if use arm64 || use ppc64 ; then + keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 ) + fi + # we need to generate ppc64 stuff because upstream does not ship it yet + # it has to be done before unbundling. + if use ppc64; then + pushd third_party/libvpx >/dev/null || die + mkdir -p source/config/linux/ppc64 || die + ./generate_gni.sh || die + popd >/dev/null || die + fi + + # Remove most bundled libraries. Some are still needed. + build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die +} + +src_configure() { + # Calling this here supports resumption via FEATURES=keepwork + python_setup + + local myconf_gn="" + + # Make sure the build system will use the right tools, bug #340795. + tc-export AR CC CXX NM + + if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then + # Force clang since gcc is pretty broken at the moment. + CC=${CHOST}-clang + CXX=${CHOST}-clang++ + strip-unsupported-flags + fi + + if tc-is-clang; then + myconf_gn+=" is_clang=true clang_use_chrome_plugins=false" + else + if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then + die "Compiling with sys-libs/libcxx requires clang." + fi + myconf_gn+=" is_clang=false" + fi + + # Define a custom toolchain for GN + myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\"" + + if tc-is-cross-compiler; then + tc-export BUILD_{AR,CC,CXX,NM} + myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\"" + myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\"" + else + myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\"" + fi + + # GN needs explicit config for Debug/Release as opposed to inferring it from build directory. + myconf_gn+=" is_debug=false" + + # Component build isn't generally intended for use by end users. It's mostly useful + # for development and debugging. + myconf_gn+=" is_component_build=$(usex component-build true false)" + + myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")" + + # Disable nacl, we can't build without pnacl (http://crbug.com/269560). + myconf_gn+=" enable_nacl=false" + + # Use system-provided libraries. + # TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733). + # TODO: use_system_hunspell (upstream changes needed). + # TODO: use_system_libsrtp (bug #459932). + # TODO: use_system_protobuf (bug #525560). + # TODO: use_system_ssl (http://crbug.com/58087). + # TODO: use_system_sqlite (http://crbug.com/22208). + + # libevent: https://bugs.gentoo.org/593458 + local gn_system_libraries=( + flac + fontconfig + freetype + # Need harfbuzz_from_pkgconfig target + #harfbuzz-ng + libdrm + libjpeg + libpng + libwebp + zlib + ) + if use system-ffmpeg; then + gn_system_libraries+=( ffmpeg opus ) + fi + if use system-icu; then + gn_system_libraries+=( icu ) + fi + if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then + # unbundle only without libc++, because libc++ is not fully ABI compatible with libstdc++ + gn_system_libraries+=( libxml ) + gn_system_libraries+=( libxslt ) + gn_system_libraries+=( openh264 ) + gn_system_libraries+=( re2 ) + gn_system_libraries+=( snappy ) + fi + build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die + + # See dependency logic in third_party/BUILD.gn + myconf_gn+=" use_system_harfbuzz=true" + + # Disable deprecated libgnome-keyring dependency, bug #713012 + myconf_gn+=" use_gnome_keyring=false" + + # Optional dependencies. + myconf_gn+=" enable_js_type_check=$(usex js-type-check true false)" + myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)" + myconf_gn+=" enable_widevine=$(usex widevine true false)" + myconf_gn+=" use_cups=$(usex cups true false)" + myconf_gn+=" use_kerberos=$(usex kerberos true false)" + myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)" + myconf_gn+=" use_vaapi=$(usex vaapi true false)" + myconf_gn+=" rtc_use_pipewire=$(usex screencast true false) rtc_pipewire_version=\"0.3\"" + + # TODO: link_pulseaudio=true for GN. + + myconf_gn+=" fieldtrial_testing_like_official_build=true" + + # Never use bundled gold binary. Disable gold linker flags for now. + # Do not use bundled clang. + # Trying to use gold results in linker crash. + myconf_gn+=" use_gold=false use_sysroot=false use_custom_libcxx=false" + + # Disable forced lld, bug 641556 + myconf_gn+=" use_lld=false" + + ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)" + myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)" + myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\"" + + # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . + # Note: these are for Gentoo use ONLY. For your own distribution, + # please get your own set of keys. Feel free to contact chromium@gentoo.org + # for more info. + local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc" + local google_default_client_id="329227923882.apps.googleusercontent.com" + local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu" + myconf_gn+=" google_api_key=\"${google_api_key}\"" + myconf_gn+=" google_default_client_id=\"${google_default_client_id}\"" + myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\"" + local myarch="$(tc-arch)" + + # Avoid CFLAGS problems, bug #352457, bug #390147. + if ! use custom-cflags; then + replace-flags "-Os" "-O2" + strip-flags + + # Debug info section overflows without component build + # Prevent linker from running out of address space, bug #471810 . + if ! use component-build || use x86; then + filter-flags "-g*" + fi + + # Prevent libvpx build failures. Bug 530248, 544702, 546984. + if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then + filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4 + fi + fi + + if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then + append-flags -stdlib=libc++ + append-ldflags -stdlib=libc++ + fi + + if [[ $myarch = amd64 ]] ; then + myconf_gn+=" target_cpu=\"x64\"" + ffmpeg_target_arch=x64 + elif [[ $myarch = x86 ]] ; then + myconf_gn+=" target_cpu=\"x86\"" + ffmpeg_target_arch=ia32 + + # This is normally defined by compiler_cpu_abi in + # build/config/compiler/BUILD.gn, but we patch that part out. + append-flags -msse2 -mfpmath=sse -mmmx + elif [[ $myarch = arm64 ]] ; then + myconf_gn+=" target_cpu=\"arm64\"" + ffmpeg_target_arch=arm64 + elif [[ $myarch = arm ]] ; then + myconf_gn+=" target_cpu=\"arm\"" + ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm) + elif [[ $myarch = ppc64 ]] ; then + myconf_gn+=" target_cpu=\"ppc64\"" + ffmpeg_target_arch=ppc64 + else + die "Failed to determine target arch, got '$myarch'." + fi + + # Make sure that -Werror doesn't get added to CFLAGS by the build system. + # Depending on GCC version the warnings are different and we don't want + # the build to fail because of that. + myconf_gn+=" treat_warnings_as_errors=false" + + # Disable fatal linker warnings, bug 506268. + myconf_gn+=" fatal_linker_warnings=false" + + # Bug 491582. + export TMPDIR="${WORKDIR}/temp" + mkdir -p -m 755 "${TMPDIR}" || die + + # https://bugs.gentoo.org/654216 + addpredict /dev/dri/ #nowarn + + #if ! use system-ffmpeg; then + if false; then + local build_ffmpeg_args="" + if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then + build_ffmpeg_args+=" --disable-asm" + fi + + # Re-configure bundled ffmpeg. See bug #491378 for example reasons. + einfo "Configuring bundled ffmpeg..." + pushd third_party/ffmpeg > /dev/null || die + chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \ + --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die + chromium/scripts/copy_config.sh || die + chromium/scripts/generate_gn.py || die + popd > /dev/null || die + fi + + # Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470 + append-cxxflags $(test-flags-CXX -flax-vector-conversions=all) + + # Disable unknown warning message from clang. + tc-is-clang && append-flags -Wno-unknown-warning-option + + # Explicitly disable ICU data file support for system-icu builds. + if use system-icu; then + myconf_gn+=" icu_use_data_file=false" + fi + + # Enable ozone wayland and/or headless support + if use wayland || use headless; then + myconf_gn+=" use_ozone=true ozone_auto_platforms=false" + myconf_gn+=" ozone_platform_headless=true" + if use headless; then + myconf_gn+=" ozone_platform=\"headless\"" + myconf_gn+=" use_x11=false" + else + myconf_gn+=" ozone_platform_wayland=true" + myconf_gn+=" use_system_libdrm=true" + myconf_gn+=" use_system_minigbm=true" + myconf_gn+=" use_xkbcommon=true" + myconf_gn+=" ozone_platform=\"wayland\"" + fi + else + myconf_gn+=" use_ozone=false" + fi + + # Enable official builds + myconf_gn+=" is_official_build=$(usex official true false)" + if use official; then + # Allow building against system libraries in official builds + sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \ + tools/generate_shim_headers/generate_shim_headers.py || die + # Disable CFI: unsupported for GCC, requires clang+lto+lld + myconf_gn+=" is_cfi=false" + # Disable PGO, because profile data is only compatible with >=clang-11 + myconf_gn+=" chrome_pgo_phase=0" + fi + + einfo "Configuring Chromium..." + set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release + echo "$@" + "$@" || die +} + +src_compile() { + # Final link uses lots of file descriptors. + ulimit -n 2048 + + # Calling this here supports resumption via FEATURES=keepwork + python_setup + + # https://bugs.gentoo.org/717456 + # don't inherit PYTHONPATH from environment, bug #789021 + local -x PYTHONPATH="${WORKDIR}/setuptools-44.1.0" + + #"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die + + # Build mksnapshot and pax-mark it. + local x + for x in mksnapshot v8_context_snapshot_generator; do + if tc-is-cross-compiler; then + eninja -C out/Release "host/${x}" + pax-mark m "out/Release/host/${x}" + else + eninja -C out/Release "${x}" + pax-mark m "out/Release/${x}" + fi + done + + # Even though ninja autodetects number of CPUs, we respect + # user's options, for debugging with -j 1 or any other reason. + eninja -C out/Release chrome chromedriver + use suid && eninja -C out/Release chrome_sandbox + + pax-mark m out/Release/chrome + + # Build manpage; bug #684550 + sed -e 's|@@PACKAGE@@|chromium-browser|g; + s|@@MENUNAME@@|Chromium|g;' \ + chrome/app/resources/manpage.1.in > \ + out/Release/chromium-browser.1 || die + + # Build desktop file; bug #706786 + sed -e 's|@@MENUNAME@@|Chromium|g; + s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g; + s|@@PACKAGE@@|chromium-browser|g; + s|\(^Exec=\)/usr/bin/|\1|g;' \ + chrome/installer/linux/common/desktop.template > \ + out/Release/chromium-browser-chromium.desktop || die +} + +src_install() { + local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser" + exeinto "${CHROMIUM_HOME}" + doexe out/Release/chrome + + if use suid; then + newexe out/Release/chrome_sandbox chrome-sandbox + fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox" + fi + + doexe out/Release/chromedriver + + local sedargs=( -e + "s:/usr/lib/:/usr/$(get_libdir)/:g; + s:@@OZONE_AUTO_SESSION@@:$(usex wayland true false):g; + s:@@FORCE_OZONE_PLATFORM@@:$(usex headless true false):g" + ) + sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r6.sh" > chromium-launcher.sh || die + doexe chromium-launcher.sh + + # It is important that we name the target "chromium-browser", + # xdg-utils expect it; bug #355517. + dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser + # keep the old symlink around for consistency + dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium + + dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver + + # Allow users to override command-line options, bug #357629. + insinto /etc/chromium + newins "${FILESDIR}/chromium.default" "default" + + pushd out/Release/locales > /dev/null || die + chromium_remove_language_paks + popd + + insinto "${CHROMIUM_HOME}" + doins out/Release/*.bin + doins out/Release/*.pak + ( + shopt -s nullglob + local files=(out/Release/*.so out/Release/*.so.[0-9]) + [[ ${#files[@]} -gt 0 ]] && doins "${files[@]}" + ) + + if ! use system-icu; then + doins out/Release/icudtl.dat + fi + + doins -r out/Release/locales + doins -r out/Release/resources + + if [[ -d out/Release/swiftshader ]]; then + insinto "${CHROMIUM_HOME}/swiftshader" + doins out/Release/swiftshader/*.so + fi + + # Install icons + local branding size + for size in 16 24 32 48 64 128 256 ; do + case ${size} in + 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;; + *) branding="chrome/app/theme/chromium" ;; + esac + newicon -s ${size} "${branding}/product_logo_${size}.png" \ + chromium-browser.png + done + + # Install desktop entry + domenu out/Release/chromium-browser-chromium.desktop + + # Install GNOME default application entry (bug #303100). + insinto /usr/share/gnome-control-center/default-apps + newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml + + # Install manpage; bug #684550 + doman out/Release/chromium-browser.1 + dosym chromium-browser.1 /usr/share/man/man1/chromium.1 + + readme.gentoo_create_doc +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update + readme.gentoo_print_elog + + if use vaapi; then + elog "VA-API is disabled by default at runtime. Either enable it" + elog "by navigating to chrome://flags/#enable-accelerated-video-decode" + elog "inside Chromium or add --enable-accelerated-video-decode" + elog "to CHROMIUM_FLAGS in /etc/chromium/default." + fi + if use screencast; then + elog "Screencast is disabled by default at runtime. Either enable it" + elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer" + elog "inside Chromium or add --enable-webrtc-pipewire-capturer" + elog "to CHROMIUM_FLAGS in /etc/chromium/default." + fi +} diff --git a/www-client/chromium/chromium-90.0.4430.93.ebuild b/www-client/chromium/chromium-90.0.4430.93.ebuild index ff4555efaf8b..02f536bbf2ee 100644 --- a/www-client/chromium/chromium-90.0.4430.93.ebuild +++ b/www-client/chromium/chromium-90.0.4430.93.ebuild @@ -781,7 +781,8 @@ src_compile() { python_setup # https://bugs.gentoo.org/717456 - local -x PYTHONPATH="${WORKDIR}/setuptools-44.1.0:${PYTHONPATH+:}${PYTHONPATH}" + # don't inherit PYTHONPATH from environment, bug #789021 + local -x PYTHONPATH="${WORKDIR}/setuptools-44.1.0" #"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die diff --git a/www-client/chromium/chromium-91.0.4472.38.ebuild b/www-client/chromium/chromium-91.0.4472.38.ebuild index 0c19e8a896be..e3aafc961b99 100644 --- a/www-client/chromium/chromium-91.0.4472.38.ebuild +++ b/www-client/chromium/chromium-91.0.4472.38.ebuild @@ -779,7 +779,8 @@ src_compile() { python_setup # https://bugs.gentoo.org/717456 - local -x PYTHONPATH="${WORKDIR}/setuptools-44.1.0:${PYTHONPATH+:}${PYTHONPATH}" + # don't inherit PYTHONPATH from environment, bug #789021 + local -x PYTHONPATH="${WORKDIR}/setuptools-44.1.0" #"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die diff --git a/www-client/chromium/chromium-92.0.4496.0.ebuild b/www-client/chromium/chromium-92.0.4496.0.ebuild index 0b017ced49aa..fd45bf86b045 100644 --- a/www-client/chromium/chromium-92.0.4496.0.ebuild +++ b/www-client/chromium/chromium-92.0.4496.0.ebuild @@ -785,7 +785,8 @@ src_compile() { python_setup # https://bugs.gentoo.org/717456 - local -x PYTHONPATH="${WORKDIR}/setuptools-44.1.0:${PYTHONPATH+:}${PYTHONPATH}" + # don't inherit PYTHONPATH from environment, bug #789021 + local -x PYTHONPATH="${WORKDIR}/setuptools-44.1.0" #"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest index d057036fee67..ec3cb7aa6463 100644 --- a/www-client/google-chrome-unstable/Manifest +++ b/www-client/google-chrome-unstable/Manifest @@ -1 +1 @@ -DIST google-chrome-unstable_92.0.4496.0-1_amd64.deb 80019592 BLAKE2B db0f493a6f9a4b8892031d4681d8ff751315a04ad871d9eba550f3b819e01963a8746e66952f166b9d2f99205b7a2d71e609f0b7e2172f36db0d064196c2039d SHA512 c89d46fb7279f546324407290631f345d4ffbf7a41a074de48bf9f8f94580867b9ffd073e8ae94715ebf2ab4f4ea08ed13695b9446e59182bbd44538bb046b49 +DIST google-chrome-unstable_92.0.4503.0-1_amd64.deb 80400956 BLAKE2B cf08df54268a883be8512cad4a4cf8be59d815e432dddd501149ab1cccf5c9a6370256dbae9ae59e4f09bdcd983447818d53c5e826b8fea1f08ecfb5f31e0f11 SHA512 ee099526b98ca4cf93cf60ddc24173e0cb84361f0c6e4f2e58fa274a3f6d129fdf1a7c20541800b2c904f3ee26417e08ec12b3eddc180fafeed1ce67eb36fb22 diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-92.0.4496.0.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-92.0.4503.0.ebuild index 823e4a8ef49e..823e4a8ef49e 100644 --- a/www-client/google-chrome-unstable/google-chrome-unstable-92.0.4496.0.ebuild +++ b/www-client/google-chrome-unstable/google-chrome-unstable-92.0.4503.0.ebuild diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest index 6f1c0c4c01e3..7d40bf782eb0 100644 --- a/www-plugins/chrome-binary-plugins/Manifest +++ b/www-plugins/chrome-binary-plugins/Manifest @@ -1,3 +1,3 @@ DIST google-chrome-beta_91.0.4472.38-1_amd64.deb 78710244 BLAKE2B b3fd055e64e47e505a5f66af4afb9919c1f917b0a3378713a19f1fa1882d510b353d128141ae69bb6c525c4bdf742ca77b2afd13b2fc77509f6f3edfe9d4578e SHA512 eeeb92af73a4d4eace8f18828af3dc86c333d5331470cf7a47404bcb37dfd2b8aec27b75d26a71061fbd40881072395d0d07e90dbe461f6333e68a6253846c78 DIST google-chrome-stable_90.0.4430.212-1_amd64.deb 83325072 BLAKE2B ec9848bf93af6d210e5d9a44c33b1bec6e610b23316946958011f299178e8178be86af0d814f971f7c4c69547cab1c29ca3deb7e57fca0f9cbb619819f560f29 SHA512 88161900c0173e4832e504b92dea8e21e7a7ea6a30c898cfc161b4c71dc005f53710ea8b40c70936c7a76ef81c18d1f1a11c3df102d95eda2daef2eff30808bd -DIST google-chrome-unstable_92.0.4496.0-1_amd64.deb 80019592 BLAKE2B db0f493a6f9a4b8892031d4681d8ff751315a04ad871d9eba550f3b819e01963a8746e66952f166b9d2f99205b7a2d71e609f0b7e2172f36db0d064196c2039d SHA512 c89d46fb7279f546324407290631f345d4ffbf7a41a074de48bf9f8f94580867b9ffd073e8ae94715ebf2ab4f4ea08ed13695b9446e59182bbd44538bb046b49 +DIST google-chrome-unstable_92.0.4503.0-1_amd64.deb 80400956 BLAKE2B cf08df54268a883be8512cad4a4cf8be59d815e432dddd501149ab1cccf5c9a6370256dbae9ae59e4f09bdcd983447818d53c5e826b8fea1f08ecfb5f31e0f11 SHA512 ee099526b98ca4cf93cf60ddc24173e0cb84361f0c6e4f2e58fa274a3f6d129fdf1a7c20541800b2c904f3ee26417e08ec12b3eddc180fafeed1ce67eb36fb22 diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-92.0.4496.0_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-92.0.4503.0_alpha.ebuild index 969dd2f57c6a..969dd2f57c6a 100644 --- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-92.0.4496.0_alpha.ebuild +++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-92.0.4503.0_alpha.ebuild diff --git a/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild b/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild index fd3656658546..a0505646508a 100644 --- a/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild +++ b/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.polypux.org/projects/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" IUSE="vbe-mode" DEPEND="vbe-mode? ( >=dev-libs/libx86-1.1 )" diff --git a/x11-terms/alacritty/Manifest b/x11-terms/alacritty/Manifest index 3c39cf1efddb..28599c93c78e 100644 --- a/x11-terms/alacritty/Manifest +++ b/x11-terms/alacritty/Manifest @@ -1,7 +1,7 @@ DIST ab_glyph_rasterizer-0.1.4.crate 6641 BLAKE2B fc70a45030d969f8af31d1bc3f83069acc014b33cde31817063ab1d40f8caebe12f3896b6a249620a8f2a2d0adc149fcc402f2af25b31ebe223ad0779028d843 SHA512 a942a3b0848386677ed5c651034b001c0e24c7bd101be6a25bfed815310f3a530c8cb9e67e96ea3c36f4d7f09731552f734d5e73f705e3e8f2bf40d5151a7a91 DIST adler32-1.2.0.crate 6411 BLAKE2B 51d44ccfd774158687b8244e83377e40ff896364e3d41e9015665131cc2a176d4ca0ab5a84df027dec0869ee735ee36f5687a06c1d2341de666070cdbab89483 SHA512 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3 DIST alacritty-0.7.2.tar.gz 1412164 BLAKE2B 64c85c71fdde41be67337f4ea230ddfb3544592ba71c0c0c9c0032fa37eb28a5e669da6777590c3e1f84a6a5d13583b2b7e339c277c60307bcd43458879da8a4 SHA512 6f5d9037038d0ebb7fdaa958bbddc4c68036ee8fbb2b89ff2d49637d46805983f47d1900a11a865c821553bfffde55caef4e0308f176724c3107457c04a6161c -DIST alacritty-0.8.0_rc5.tar.gz 1415558 BLAKE2B f7f50e4674eafa04b6a654663aeaefc3ddeea898ddcbfd96ee7266d64d6d413163037a98c509493d7c0cc0b95594583cb2ac62ed274ba2cd1ce853d9df0b25a6 SHA512 7e69cd5a06b4bf083aaa1ec75f3904831a202a7052fc959ba63751486cdc6c7e55f4f1b445661ea13dfeabb651fbe7e192ec5386867e0fdf7e378c21d6433332 +DIST alacritty-0.8.0_rc6.tar.gz 1415721 BLAKE2B 4e434bd4c45f1df7359ba4a2a6c222ebb6316a763e845f0b7fa27cd1c48fa8ec901eaa9b1ff25b82238160dd29feb93bfb3f014a8ba7182c7b60bbe0355147c1 SHA512 d7a39c6d066824f9403e240f6d2ee722da3b6bf70b0e3acfb00946f12f9db17b45d984da378134e6eb494d5ca59d6cad0b6d4927b0a9149d0d2133d545a74612 DIST andrew-0.3.1.crate 14030 BLAKE2B 5224eb5a5ad5ba7dd07259a98b8dc04f92154dcc7b5a53c89b4f7fd3c1a12d834093350ce9f7cd69a935d70cff50c0fbc68305eea9f918b334ec1a6e9e979ae2 SHA512 c4fc8903d4c2542c91e7f099d5d9d2b9179ade3f4c3e83ccd8027b06cb582ef700777cf440a07c2478311c1b7c2f7ca64d53fb390f9f5753dcb32491003db8d3 DIST android_glue-0.2.3.crate 1572 BLAKE2B 8404cc69af7d1c9e851e67a69b5b18195388b50924b6a8afc7203bc5101babe9ae007724e552a929947fa9c639eb8ae13cdae0aedbc2d54b0b8d48373f15b7a3 SHA512 16ff1f0e1f50cd120dfbe57d45ebac1725fa75447c964a5b05a1a0565b13b0bc3b6c153edb4a50083ef5d802a889c9f9007e2e21a58dc408f9fb12e9437bd01b DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa diff --git a/x11-terms/alacritty/alacritty-0.8.0_rc5.ebuild b/x11-terms/alacritty/alacritty-0.8.0_rc6.ebuild index 67647f577e2b..67647f577e2b 100644 --- a/x11-terms/alacritty/alacritty-0.8.0_rc5.ebuild +++ b/x11-terms/alacritty/alacritty-0.8.0_rc6.ebuild diff --git a/x11-terms/kitty/files/kitty-9999-flags.patch b/x11-terms/kitty/files/kitty-9999-flags.patch index 3bc0431b569a..39042dbd458a 100644 --- a/x11-terms/kitty/files/kitty-9999-flags.patch +++ b/x11-terms/kitty/files/kitty-9999-flags.patch @@ -1,26 +1,28 @@ diff --git a/setup.py b/setup.py -index ce5309ee..9cb59461 100755 +index f751107f..69bf39d4 100755 --- a/setup.py +++ b/setup.py -@@ -278,7 +278,7 @@ def init_env( +@@ -293,7 +293,7 @@ def init_env( df += ' -Og' float_conversion = '-Wfloat-conversion' - fortify_source = '-D_FORTIFY_SOURCE=2' + fortify_source = '' if sanitize and is_macos else '-D_FORTIFY_SOURCE=2' - optimize = df if debug or sanitize else '-O3' + optimize = '' sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set() cppflags_ = os.environ.get( 'OVERRIDE_CPPFLAGS', '-D{}DEBUG'.format('' if debug else 'N'), -@@ -289,7 +289,7 @@ def init_env( +@@ -308,8 +308,8 @@ def init_env( cflags_ = os.environ.get( 'OVERRIDE_CFLAGS', ( - '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes {}' -- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden {}' -+ ' -pedantic-errors {} {} -fwrapv {} {} {} -fvisibility=hidden {}' - ).format( - float_conversion, - '' if is_openbsd else '-std=c11', -@@ -306,7 +306,7 @@ def init_env( + f'-Wextra {float_conversion} -Wno-missing-field-initializers -Wall -Wstrict-prototypes {std}' +- f' {werror} {optimize} {sanitize_flag} -fwrapv {stack_protector} {missing_braces}' +- f' -pipe {march} -fvisibility=hidden {fortify_source}' ++ f' -pedantic-errors {optimize} {sanitize_flag} -fwrapv {stack_protector} {missing_braces}' ++ f' {march} -fvisibility=hidden {fortify_source}' + ) + ) + cflags = shlex.split(cflags_) + shlex.split( +@@ -317,7 +317,7 @@ def init_env( ) ldflags_ = os.environ.get( 'OVERRIDE_LDFLAGS', @@ -29,16 +31,18 @@ index ce5309ee..9cb59461 100755 ) ldflags = shlex.split(ldflags_) ldflags.append('-shared') -@@ -764,7 +764,7 @@ def safe_makedirs(path: str) -> None: +@@ -789,9 +789,7 @@ def safe_makedirs(path: str) -> None: def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 'source') -> None: - cflags = '-Wall -Werror -fpie'.split() +- if args.build_universal_binary: +- cflags += '-arch x86_64 -arch arm64'.split() + cflags = '-Wall -fpie'.split() cppflags = [] libs: List[str] = [] if args.profile or args.sanitize: -@@ -776,8 +776,6 @@ def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 's +@@ -803,8 +801,6 @@ def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 's cflags.append('-g') if args.profile: libs.append('-lprofiler') diff --git a/x11-terms/terminology/terminology-1.9.0.ebuild b/x11-terms/terminology/terminology-1.9.0.ebuild index 7cf32c2d8128..64d957e9b8a7 100644 --- a/x11-terms/terminology/terminology-1.9.0.ebuild +++ b/x11-terms/terminology/terminology-1.9.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{7..10} ) inherit meson python-any-r1 xdg-utils diff --git a/x11-wm/ctwm/ctwm-4.0.3.ebuild b/x11-wm/ctwm/ctwm-4.0.3.ebuild index 7c24c6682a8f..5b1573d82a08 100644 --- a/x11-wm/ctwm/ctwm-4.0.3.ebuild +++ b/x11-wm/ctwm/ctwm-4.0.3.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://ctwm.org/dist/${P}.tar.xz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ~ppc x86" IUSE="jpeg rplay test xpm" RESTRICT="!test? ( test )" |