diff --git a/Manifest b/Manifest
index 45fc021eadf4..dd44ecd72131 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-MANIFEST Manifest.files.gz 29661 BLAKE2B 443176d632888c3657a7e771d3086d0d00f66d871816c6603fb7d2b3fa2fa25992333da60087f4c6f91dbbbb18767a31d10eb722e36f5e738393e5bf64d00d5f SHA512 4bb48486a20b4610efaeb33f443387db00edb3defa940b6dd4f85647d24085e5e49934592edab740b42bf372db4f9987ca727600a96c8f27ff641bd4beaed5ac
-TIMESTAMP 2022-10-28T06:09:50Z
+MANIFEST Manifest.files.gz 29621 BLAKE2B f1f7c053d1f932d61dae1c692ef4ec2b467fe4790f149d583087467cd84220f942190fbf02b7f19dd6792a9e8d9227051213fcd26dc106c9559e7dc54fcdd81b SHA512 bf90caec1368f3ad0ff5c4e3b4ebe87aba02a9c64404ccb3993440e09ebe845583b8e7e684f56283d720e5a0fc2b6e494b27c97542d5cc11d2d9226a47b49cd1
+TIMESTAMP 2022-10-30T17:39:44Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNbci5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNetuBfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCFIw/5AVmCN4KCwxvImzK2fkBDuAFSjm0Q2LkcpYisREBGBU3ng4D0uKwoEqQk
-ygMIN9YqFrLmNMWUOExEEI0wu8s28INYD9zCYbHu5qvSevleNvzZNfCDL4x4fKi7
-sGObWMo3q6+vVK8rYazxbZ3lVqUBG/FREAi4+0RYenHSF2LtFa43PVo4q4oehFFF
-i2T3Ns7t5vjA1CdUV2r4+Ym3KxdVm5UdfiwBS44mFnKPBcTps/5CGrlMLaSGbW9p
-kr4FfJgb3VDrfWaEC7vy0X/Vfq8KsvT+7uH+akddu5SyhAM4VNYUOuKiK99ZzXxi
-bPrwIJzEEOPjMFM3xEgD/5Smn/3Qcki8Q1bBOawHt4lDjwj2jgjNSEBhmr7Eq9iA
-4RvoOCBuzcWUoNUUJBZmP9tILvBO/Dyb8h4ma4YXDQcxohI5aU9IEZ2fTJM2EAPb
-63w4G6/Kr1bBB1BpcejVgehoKHyNsmmjFoaolUv8140U56KwPgyUjcTAMvkcEGKV
-0LhWZeFc7GZBKhlmftK4EqzWl07sCJyyjkgdSpXoIOvJcKQfd2XzlqP0SX+WODpu
-RasBmVkHfB2dfKu0SWRp4rfAhClnXluTnDLiasXP/xytoVR5cRFuQ2z0ZSlV9YJp
-pHQcDQh72pxvMUNHqROur4rfvMuaZH8JGtY0QCaoSs1IDZX1s+4=
-=ctp3
+klBYXg//RwTF0YlqXX07UFdS0LalsF52Nmha64G37YVR78G6GMfWcvIPVnxePyb3
+G3vQ/Fq0NQ9GlFTP5URxWHu3zQ6dY1JnjI550pyZMqucEwl0Te9soA7qw88q/7Aw
+hr4YQEGzn31yJP5zhNoyH+yYOcEcOAH5vIu5F884tnSwMbPmzVa+Y5Fs2UQ2+CVR
+bdxpMwJrYjwuH0DxGtURt30oW4YFRj8Frs6THfW5g2PNNSGVoGKK3r8DFE6/3OPh
+IUVm76OpY3wEjpBZUEvd0F0AP1ETl5iRD26pKBIYaQ8tfqfdpyYZZ85Tiux+cfWn
+gTxTZpToj/ezSm02Q9erkPAchNj8mpaHYvxaEtCylLcSaUJj1XMVCC8wd1K/ZQ3C
+vFw9EkhS9GD44XwHA+GDWOmatIYD2bPoylkuqcEul7QOm3Lus66cqyynI3qy2y52
+vn2zfExIrySS4q9j79YMfr4+KsFQCb1/e5SfGpKY0i/21S/A88lLVDbn7qKXC8Ue
+NhfrqytZ4SZ9mu4Mu92mgGrfZZPOQfBiswYV5IZCntdUr+lBJX7TkljQL+YupS9O
++g7M0EO25f6tHfGW8GnZ2uwcDfNoEapeCh/wSc8u2mInE2EGQLFZb/y2LtXiBZXm
+fA/cGqhS80DBwMb3aMJZ0R+5ofJ0kMdhrCyF5LYD3TIz2Jjhak8=
+=tuH5
-----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index bea5ed2d9984..db1b967cc1b6 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index e5dae061608f..5df15ec2a4e1 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/accerciser/Manifest b/app-accessibility/accerciser/Manifest
index 256d4690df73..28582cb2c837 100644
--- a/app-accessibility/accerciser/Manifest
+++ b/app-accessibility/accerciser/Manifest
@@ -1,3 +1,3 @@
DIST accerciser-3.40.0.tar.xz 1991256 BLAKE2B adcaa37b64d91cf4348fdd1b15d22aa977585c2c9d3ad81b41c7711f82ce010c7b75a44de6ec780fbbdadacad856a1f15b4f492971f5a7acfcea0568f0edc2df SHA512 78a7ce4a69de9a237c75b8df25665c8e9e8173969fb146cb608f4b51ff042c3abdcd49225f8f420c1c1bfab3736a8607eb6b555106c8a1e6e3399c83bad8f198
-EBUILD accerciser-3.40.0.ebuild 1195 BLAKE2B 27d16ba9f098e3de99d8bc272b8334746d04098710e1f168051ba12224b18ee08c1fc6d912de85eab6edbf9b7422cbcbb562dfd1097b6b0bfa6ab08609d9bf2a SHA512 e92b21e3d73cede0e690cce057fe9d8a2f6ddc88cfb7b9f9204bc1cdf502ea3791bbfc2f479d50be8997951a88ad1ff2a1249d6fc9914ad04d4f84f75b62c959
-MISC metadata.xml 745 BLAKE2B 518fe07b4ea66b8d20d643d1fd35994973c5505e43c6940a1e09a4e333a9f35afab96d7499bc047b162e76eb9c358dc5aa71c4b151155d007a888edb1c2664e9 SHA512 bc3838e3bbe28df24c4edc51930f9517d3fea3fdab0aa8717c988aeb920639a78156557c00d2b82db54b9a1cdc7b259df30b27ed859f7b2f992ac2947ff0422d
+EBUILD accerciser-3.40.0.ebuild 1195 BLAKE2B 2f415e0dbd96a5a8b9cd32693292f603ef35b239b024bc3c1c407eb1e059ebf1b448548f4226c4ae54962939f421ca5f1e7eab89a476c9e65dadac8b13222b7e SHA512 9e3b51acd889c9702e3629896767a495fca369be63c0a9d1be4055f165344c92252ee56670023813f4f31c53effa65376da30505badefe68acc1649b13a0234f
+MISC metadata.xml 836 BLAKE2B c267ec04334d6652d6e402d58cc8b3d5d9665c83fa127ba3a168ff7437dd8aa60f699196c71be10e0a63bd52931a0b157fb92ac65ef8a601331ceb8404560d7f SHA512 ebc2a15a8a2f0c107a0c24261806a06efc63a018e94e1ff5e9e67b37c73cf80830f79084627559e743e7267c4a0cddc90ab7a852881664c6324d00479c6fb425
diff --git a/app-accessibility/accerciser/accerciser-3.40.0.ebuild b/app-accessibility/accerciser/accerciser-3.40.0.ebuild
index 687347c02c7b..803f1ccca367 100644
--- a/app-accessibility/accerciser/accerciser-3.40.0.ebuild
+++ b/app-accessibility/accerciser/accerciser-3.40.0.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
PYTHON_REQ_USE="xml(+)"
inherit gnome2 python-single-r1
diff --git a/app-accessibility/accerciser/metadata.xml b/app-accessibility/accerciser/metadata.xml
index fe0297f348e9..3d77751efc4b 100644
--- a/app-accessibility/accerciser/metadata.xml
+++ b/app-accessibility/accerciser/metadata.xml
@@ -10,4 +10,7 @@
In essence, Accerciser is a next generation at-poke tool.
+
+ GNOME/accerciser
+
diff --git a/app-accessibility/at-spi2-atk/Manifest b/app-accessibility/at-spi2-atk/Manifest
index a210029e792e..6f7478d60656 100644
--- a/app-accessibility/at-spi2-atk/Manifest
+++ b/app-accessibility/at-spi2-atk/Manifest
@@ -1,4 +1,4 @@
DIST at-spi2-atk-2.38.0.tar.xz 97464 BLAKE2B c5a62bd157ac6dcbf19495eb8f92bd6346651b8df64e15acf4d25c1ab35790f154bead1e012714da36c700e58e164527755137a33812f3a1844aa34f0293ebf5 SHA512 2f40ecbc55b0fbaa57ade952a75583bc8fbfde234cce9248489e9ae06e0597d98c2f4c77d8279758dec29da97e06cde5708d30a1238d91bebd023b2320f38528
EBUILD at-spi2-atk-2.38.0.ebuild 960 BLAKE2B b5dca22d3494e21559877b0d10e06d5611b017dd23c5faaa40f0a76adf737f1f8d46d99268d308172c5baef843b9f4e89bb0913a5a6a1179d08790b74d86c784 SHA512 36dbaa6aa77bd69867d31a756596015d0536a1e817d222809b257733803150d343f710a69df2aa9385840d463d82af8cd959b082a389b330dfe2194ca8838a14
EBUILD at-spi2-atk-2.46.0.ebuild 484 BLAKE2B a67343410bf86342fe00e470a48c9cf6655805c588d120709623552fa20d5034a24b3f4205918ba942d53e6d891dcf99e44f714dacc4d945a6c0d487c874864d SHA512 b2a6ad1d0ebe31e8fb834c1c0222a728c93bbc1cebe2f8b2f5544b3b42b8b0fcfa67f533ac7b0fc27b5cf184bc6ecfacb73729305680d30751964ec671613a79
-MISC metadata.xml 563 BLAKE2B cbab93e9dc8986c36e95b236a43268223d3c8a09b2bf3ad8e96463495097a4a38d5de4628e081ab523bff11ccd5cd42fe3baa7ab4901e732a2210405edbe4587 SHA512 45687b123b0a245e9719f9cf9c9ae1f59d9821b1963c6d2d371409b33eaa5de7dc0d8b79538aa0b203b80914ee087387c64303958cb810643da9db94a4044d91
+MISC metadata.xml 686 BLAKE2B ca44ad61b3381eacbda034c60a5bd9e7d215e4b7d792f283b61bb82e419a4d31c3c2a17a1842ea811fd472074539e90382ad1ad5060d72d3146aef66f2c3fede SHA512 20973a48f912dac88635c6df92f3237c0f800481b08014457e1876fb86670968535604127af85ca2d9fd729f1f48da2be664ab49f5520c10cadd4da06bb0db60
diff --git a/app-accessibility/at-spi2-atk/metadata.xml b/app-accessibility/at-spi2-atk/metadata.xml
index f7da9e6ff556..2df23ac8ea0d 100644
--- a/app-accessibility/at-spi2-atk/metadata.xml
+++ b/app-accessibility/at-spi2-atk/metadata.xml
@@ -1,13 +1,17 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
-at-spi2-atk is the library used to bridge ATK to AT-SPI, allowing applications
-exposing information via ATK to interface with clients that use AT-SPI. This
-module provides the necessary inter-process communication to allow
-accessibility-oriented software to operate.
-
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+ at-spi2-atk is the library used to bridge ATK to AT-SPI, allowing applications
+ exposing information via ATK to interface with clients that use AT-SPI. This
+ module provides the necessary inter-process communication to allow
+ accessibility-oriented software to operate.
+
+
+ GNOME/at-spi2-atk
+
diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index 8758c5ea9f0e..39ec58967686 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -3,4 +3,4 @@ DIST at-spi2-core-2.44.1.tar.xz 209780 BLAKE2B e76f0b0c478564181db774633dfc9613b
DIST at-spi2-core-2.46.0.tar.xz 540600 BLAKE2B e3ed9915c39a9f71b64a9753c7f91208d15289fe09a9505b4766df7fa04c3e6e5cdc7b3702315eabbdf70f9fc08b4cca4546353485328ab101e2950a672885d6 SHA512 633af2c02fab3b8cb02e37f929ce80dd5ce28ca5641046ef5e25cb29299530b90028e6c6f318a0c098a4270bed3eab48fb55d6967a76bfadd2520f49de47c770
EBUILD at-spi2-core-2.44.1.ebuild 1466 BLAKE2B 572e617a22ab16d1cfb42fbab8c318840174b8bea5e05d02fc88b7ddedb48757b587a3414cb772960b20212350931d6f9272933fb439e4cc6ea2ff6bcf7ab358 SHA512 2740ff17261253dd6a0ab6ae5e8f1aa9bdba5ebd4cf28808ed9bc055f8dd520e21094889773c8d3990a623a3344036b661b78bd772b3a93e581411ee845e37c6
EBUILD at-spi2-core-2.46.0.ebuild 1473 BLAKE2B 9b690174b553d947c24ad4ac0978532637082e68c44a8eb7e60864fcbb5ad029dc2bbf50fd235976c957b5c05f9cae90d359ddb00dd5484475c09ab47d5cd09a SHA512 cb629f9ad0823a5ad778d2548dafedca4292c6d4bae06bf97a6a5aaf3687b091b3f6fc7bbde0b371114991470b8f379c3f950ccc09bbdc34aad7f71d70d6da16
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 353 BLAKE2B a11426ebcc6d7d5d3b6af03001b0da28239ca8374757211ed13e13b2d23f0580a4bbd8a7bdc2f6db655dbff2f4dba8288f45385f628e8b95fb3d5f8ad74fce3b SHA512 ccd21495d004a42ffeb05aeac3667f198b2c21b10c7df7ce7cded2593c668be08c5c5dc3315f52dbda423a3236be6d1ad9a4769f9d753760d5e84a06ffb62281
diff --git a/app-accessibility/at-spi2-core/metadata.xml b/app-accessibility/at-spi2-core/metadata.xml
index 7b343b06be8a..32089b0df716 100644
--- a/app-accessibility/at-spi2-core/metadata.xml
+++ b/app-accessibility/at-spi2-core/metadata.xml
@@ -1,8 +1,11 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+ GNOME/at-spi2-core
+
diff --git a/app-accessibility/orca/Manifest b/app-accessibility/orca/Manifest
index df6bb79c55ef..02efdd2c59b9 100644
--- a/app-accessibility/orca/Manifest
+++ b/app-accessibility/orca/Manifest
@@ -2,4 +2,4 @@ DIST orca-42.3.tar.xz 3707048 BLAKE2B b1a03cee97ba2ad17e32b863effba46974f86e5cbd
DIST orca-43.0.tar.xz 3758480 BLAKE2B 05c31777c1c88452e165bd7fb6fe75fe727149f5337828b5f4e7679430ed5065a03de7074536c4433bedd81c3090c72e02a775db46f4673d6e3264a57732ad7a SHA512 20248e6065c1daa9c3d6ba37515bab60a3ceb14065b862d6d0610a7659bddc04f49a1cda7850646b45bb0afb5c2a89f1894de96f505831b11b77d332adb747d3
EBUILD orca-42.3.ebuild 1562 BLAKE2B 23c0907b11da9aca993aed45ea94f9bed04553d421fcf76bd241d582f3189943edb8d7e9dd7d09ce158573b06bd71a231126e854cab047a31a2323a52da7d484 SHA512 9ce417d9e0175bf2dd5790a85bfdc6feec6a00b919b18c6dc9ea28d4b899860cc41e8e949f1a2d441dd3d9cf0ff79442bf62b8afc6b12dbe933ff5b6ead149ce
EBUILD orca-43.0.ebuild 1537 BLAKE2B 53a39f2996779cdbbcd28606174bce7ee08841a654991602cfe51aebed12e45a0ff01cbcc1fd1c5802dea28c276c154f9d32aa24f1ec7fa6dbfee133020b8072 SHA512 5840a3e903c1bc1bac79a2dcb8555a3940c36eba5713426e9a40f34986267f3945bfe29ec6faad9d71faa4eb6ba62a61f1dbb677a30eb11fdfdba6fb0c44edc5
-MISC metadata.xml 641 BLAKE2B 2a9a0582cf597e46cf71f11034a17ed3146f5d2709855be3f64530c94be53bdbb7ac8e8be859969706c67e6b32e1f8a33fe97b3e54d41b27a4f6ee3807f19fd6 SHA512 4119f9cc00c1978ada19d63f559ba35bec6299732bf50e3fb724c531dae3c3052e26fb1e7ec7830c55c98ef800ff0a6ecbb01df98e3b64781ff42eb7ef9ce7fb
+MISC metadata.xml 762 BLAKE2B fca9ee6ac93d2e860f6791af78380e9d8d29ac10b254299946911a29b5893028e561a18320bc026dd7e9421f3c572e1c3ac63264276a1b292996db93e1cba4a3 SHA512 6bbe0cff5af52cb48adccbb61620fd75a0811cad313867b63cb09b5a7c259230019a54ad607ee46c986188ff11ac2f6878ef20381ef34965dfe918c88ec945d0
diff --git a/app-accessibility/orca/metadata.xml b/app-accessibility/orca/metadata.xml
index 6697d5324869..576805b0538e 100644
--- a/app-accessibility/orca/metadata.xml
+++ b/app-accessibility/orca/metadata.xml
@@ -1,18 +1,21 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
-
-
- Orca is a flexible, extensible, and powerful assistive technology
- for people with visual impairments. Using various combinations of
- speech synthesis, braille, and magnification, Orca helps provide
- access to applications and toolkits that support the AT-SPI (e.g.,
- the GNOME desktop).
-
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+
+ Orca is a flexible, extensible, and powerful assistive technology
+ for people with visual impairments. Using various combinations of
+ speech synthesis, braille, and magnification, Orca helps provide
+ access to applications and toolkits that support the AT-SPI (e.g.,
+ the GNOME desktop).
+
+
+ GNOME/orca
+
diff --git a/app-accessibility/speech-dispatcher/Manifest b/app-accessibility/speech-dispatcher/Manifest
index f8fa8aeff2fd..729f45699e07 100644
--- a/app-accessibility/speech-dispatcher/Manifest
+++ b/app-accessibility/speech-dispatcher/Manifest
@@ -1,6 +1,8 @@
AUX speech-dispatcher-0.11.1-include-pthread_h.patch 367 BLAKE2B 54e4cb3556f066c7291c6c601a0a9cf13c75dc14bfc2ef493d5fd6e38226d10b119612ed57ea4a44d65819653e76a2e74e54e286214f3fd353b8149c00de1ed2 SHA512 d7afc36cd26052576e0fb3af44ba438b5184d32b1d80c98409e227cc86858dfcfcb9287cf44f986042e2733004f30d30a9431e00653779e312543cf43e108537
+AUX speech-dispatcher-0.11.3-fix-dlopen.patch 2518 BLAKE2B 99490232eb3ea43451caf942ff605ca4f94a3917c525a4a67fd21183a0e7c8a99a2bc883c5a22c47ad3c3712a5560278105a5f35439c8d18215b8d5cf8d4e6af SHA512 2b6970624c3f7f88e80266760bc801c0b895c0e5730767ac66adf0cbc147fdd2ad2eaae7662e4939938555e30e0de57a6caa0e783dafaeeee1d04d10126fe2cc
DIST speech-dispatcher-0.11.2.tar.gz 7147526 BLAKE2B 6b11949736275d900e5e1d3909fab51fc04fbb45baf470a4c98aed19f61b7adb8cedf6b11f1a1aa69d9625383627beab4122c74ec78d9c07a5d0ddf4646669d6 SHA512 038ecaa5b9d56e3f915ec49fe7768cb4eebe1c8be79b95635f09fb3f6067e4c0ade13d2dd355e0b326579dcdf509dd180889b27282410b6bb252a2f642f028d4
DIST speech-dispatcher-0.11.3.tar.gz 7150632 BLAKE2B 92bad589e453a243362a9e0142d2897b9651fa648012f2bd7ef00bc1ded389fd2c01b6f38f19002289357f7aa6361a6e7fa3ee35ec2ad7c044f34d87e7f2c409 SHA512 e9f5b862066c0292230fda32f16782f9a2d66e8d0c0e3aa0ccdb4628c1182661d2f40894f480ae5206af7fbbc49338189312afe02092f5d472095b053afd75c7
EBUILD speech-dispatcher-0.11.2.ebuild 2868 BLAKE2B 343ddf0cbd7f970e93175e60385aa3869ab173ac51db10ee3f12b38dce0c68724e36b3da03682fe6b850b07a996e2f10d3921eba73c10d8b50bf3954869f7c23 SHA512 42539976ba09a7dfc6853201a23ca60bc6abb0e957bf1e69bd10b14f674c8724aa092ec487fbe5eb5551fa4336adf113a5b62b8445f55f3ad138ffb23867a162
+EBUILD speech-dispatcher-0.11.3-r1.ebuild 2912 BLAKE2B 0ac187c72682eb88a03e9382be2d2c3758ea53a96f0f4d188870fa955a5bc5a1e307dc6ac7eb7d8f0b106550e2cc40e6415a7c36739a4d8becda131384f05d70 SHA512 6ba9d5976a808bd3fa0fbae4d9e5c5375d83aa6cbb232740b22f9be7dd21c4884400b0a67aad040f2ec847c6312a610350c6a49c73ba471402d815aa975c6651
EBUILD speech-dispatcher-0.11.3.ebuild 2875 BLAKE2B 7e43633fa593175d1bf889e1f11004c5d95973a0eaa25b9005dc7abc116e9cf393d2a708b92849a2d1581c3d5adf5da4cad711d2cefc7e53e91129a3095dab06 SHA512 e0180013b2599505b0bbcae9dc4dfaf1621af0b699bae5c88f81f7b550791371139113cef98ffcbc3de4a7bd689bf068c5e1e300ddc96cbd00b4dd28ca99a91c
MISC metadata.xml 708 BLAKE2B fdccc4d8de7f22eb64469021786480527bd87f3718dd5746426874266b8a46dcb6cc2b7bb25a4561a523362b919e0ed77e3f829f3fe269d90060d17a69f1b2ed SHA512 770e54e5ddeacc46165b90d41dd3ea0d1060adfdfb95055a9dab778f757189b892250e66b515773ce7b4d8b1bbdd692386b4d8cb49d670af7af8dadfed5c8788
diff --git a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.3-fix-dlopen.patch b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.3-fix-dlopen.patch
new file mode 100644
index 000000000000..f520fdc6adfb
--- /dev/null
+++ b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.3-fix-dlopen.patch
@@ -0,0 +1,93 @@
+https://github.com/brailcom/speechd/commit/db21e5fe4b3155734f60a67c8ab5da6b53174e1b
+https://github.com/brailcom/speechd/pull/783
+https://bugs.gentoo.org/877339
+
+From db21e5fe4b3155734f60a67c8ab5da6b53174e1b Mon Sep 17 00:00:00 2001
+From: Bernard Cafarelli
+Date: Mon, 17 Oct 2022 15:28:37 +0200
+Subject: [PATCH] Fix audio plugin loading with dlopen
+
+dlopen needs the full name including .so extension
+Set SPD_AUDIO_PLUGIN_ENTRY to correct name (ltdl adds a prefix)
+--- a/src/audio/alsa.c
++++ b/src/audio/alsa.c
+@@ -37,7 +37,11 @@
+ #include
+ #include
+
++#ifdef USE_DLOPEN
++#define SPD_AUDIO_PLUGIN_ENTRY spd_audio_plugin_get
++#else
+ #define SPD_AUDIO_PLUGIN_ENTRY spd_alsa_LTX_spd_audio_plugin_get
++#endif
+ #include
+
+ typedef struct {
+--- a/src/audio/libao.c
++++ b/src/audio/libao.c
+@@ -32,7 +32,11 @@
+ #include
+ #include
+
++#ifdef USE_DLOPEN
++#define SPD_AUDIO_PLUGIN_ENTRY spd_audio_plugin_get
++#else
+ #define SPD_AUDIO_PLUGIN_ENTRY spd_libao_LTX_spd_audio_plugin_get
++#endif
+ #include
+
+ /* send a packet of XXX bytes to the sound device */
+--- a/src/audio/nas.c
++++ b/src/audio/nas.c
+@@ -32,7 +32,11 @@
+
+ #include
+
++#ifdef USE_DLOPEN
++#define SPD_AUDIO_PLUGIN_ENTRY spd_audio_plugin_get
++#else
+ #define SPD_AUDIO_PLUGIN_ENTRY spd_nas_LTX_spd_audio_plugin_get
++#endif
+ #include
+
+ typedef struct {
+--- a/src/audio/oss.c
++++ b/src/audio/oss.c
+@@ -39,7 +39,11 @@
+
+ #include
+
++#ifdef USE_DLOPEN
++#define SPD_AUDIO_PLUGIN_ENTRY spd_audio_plugin_get
++#else
+ #define SPD_AUDIO_PLUGIN_ENTRY spd_oss_LTX_spd_audio_plugin_get
++#endif
+ #include
+
+ typedef struct {
+--- a/src/audio/pulse.c
++++ b/src/audio/pulse.c
+@@ -51,7 +51,11 @@
+ #include
+ #include
+
++#ifdef USE_DLOPEN
++#define SPD_AUDIO_PLUGIN_ENTRY spd_audio_plugin_get
++#else
+ #define SPD_AUDIO_PLUGIN_ENTRY spd_pulse_LTX_spd_audio_plugin_get
++#endif
+ #include
+
+ typedef struct {
+--- a/src/common/spd_audio.c
++++ b/src/common/spd_audio.c
+@@ -120,7 +120,7 @@ AudioID *spd_audio_open(const char *name, void **pars, char **error)
+ plugin_dir = PLUGIN_DIR;
+
+ #ifdef USE_DLOPEN
+- libname = g_strdup_printf("%s/" SPD_AUDIO_LIB_PREFIX "%s", plugin_dir, name);
++ libname = g_strdup_printf("%s/" SPD_AUDIO_LIB_PREFIX "%s.so", plugin_dir, name);
+ dlhandle = dlopen(libname, RTLD_NOW | RTLD_GLOBAL);
+
+ g_free(libname);
+
diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.3-r1.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.3-r1.ebuild
new file mode 100644
index 000000000000..93309e5e9e06
--- /dev/null
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.3-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit python-r1 systemd
+
+DESCRIPTION="Speech synthesis interface"
+HOMEPAGE="https://freebsoft.org/speechd"
+SRC_URI="https://github.com/brailcom/speechd/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="alsa ao espeak +espeak-ng flite nas pulseaudio python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="python? ( ${PYTHON_DEPS} )
+ >=dev-libs/dotconf-1.3
+ >=dev-libs/glib-2.36:2
+ >=media-libs/libsndfile-1.0.2
+ alsa? ( media-libs/alsa-lib )
+ ao? ( media-libs/libao )
+ espeak? ( app-accessibility/espeak )
+ espeak-ng? ( app-accessibility/espeak-ng )
+ flite? ( app-accessibility/flite )
+ nas? ( media-libs/nas )
+ pulseaudio? ( media-sound/pulseaudio )"
+RDEPEND="${DEPEND}
+ python? ( dev-python/pyxdg[${PYTHON_USEDEP}] )"
+BDEPEND="
+ sys-apps/help2man
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.11.1-include-pthread_h.patch
+ "${FILESDIR}"/${P}-fix-dlopen.patch
+)
+
+src_configure() {
+ # bug 573732
+ export GIT_CEILING_DIRECTORIES="${WORKDIR}"
+
+ local myeconfargs=(
+ --disable-ltdl
+ --disable-python
+ --disable-static
+ --with-baratinoo=no
+ --with-ibmtts=no
+ --with-kali=no
+ --with-pico=no
+ --with-voxin=no
+ $(use_with alsa)
+ $(use_with ao libao)
+ $(use_with espeak)
+ $(use_with espeak-ng)
+ $(use_with flite)
+ $(use_with nas)
+ $(use_with pulseaudio pulse)
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ use python && python_copy_sources
+
+ emake
+
+ if use python; then
+ building() {
+ cd src/api/python || die
+ emake \
+ pyexecdir="$(python_get_sitedir)" \
+ pythondir="$(python_get_sitedir)"
+ }
+ python_foreach_impl run_in_build_dir building
+ fi
+}
+
+src_install() {
+ default
+
+ if use python; then
+ installation() {
+ cd src/api/python || die
+ emake \
+ DESTDIR="${D}" \
+ pyexecdir="$(python_get_sitedir)" \
+ pythondir="$(python_get_sitedir)" \
+ install
+ }
+ python_foreach_impl run_in_build_dir installation
+ python_replicate_script "${ED}"/usr/bin/spd-conf
+ python_foreach_impl python_optimize
+ fi
+
+ find "${D}" -name '*.la' -type f -delete || die
+}
+
+pkg_postinst() {
+ local editconfig="n"
+ if ! use espeak-ng; then
+ ewarn "You have disabled espeak-ng, which is speech-dispatcher's"
+ ewarn "default speech synthesizer."
+ ewarn
+ editconfig="y"
+ fi
+ if ! use pulseaudio; then
+ ewarn "You have disabled pulseaudio support."
+ ewarn "pulseaudio is speech-dispatcher's default audio subsystem."
+ ewarn
+ editconfig="y"
+ fi
+ if [[ "${editconfig}" == "y" ]]; then
+ ewarn "You must edit ${EROOT}/etc/speech-dispatcher/speechd.conf"
+ ewarn "and make sure the settings there match your system."
+ ewarn
+ fi
+}
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index dca41697a2bb..8d5ad6642c45 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/ansible-molecule/Manifest b/app-admin/ansible-molecule/Manifest
index dd5d5ed44a2a..d28a146b8b4a 100644
--- a/app-admin/ansible-molecule/Manifest
+++ b/app-admin/ansible-molecule/Manifest
@@ -1,3 +1,3 @@
DIST ansible-molecule-4.0.1.tar.gz 301517 BLAKE2B 73cf7a2257368c737b9003236bf77011de167dd6f692166702e7948c136202b33bcce1c70893b61a95af9baa90e7b5266a5fa889e3bba0e5a8c9c1e6f48fec9a SHA512 7515e07bf791d5586e1f5fb4ce0d2f731c94c8268c589155340b2bdc1528534084870e66e492b2d883f9e9764293c93799a4c75478523502a2f37ad0642a472d
-EBUILD ansible-molecule-4.0.1.ebuild 2845 BLAKE2B 7900ccb41af0a1a4d2199a41c140530e6abccb76aec3e17325410f62971637b6ba07d08e0b20110054b2931f065f3599194dd506aa7e350e8bcb77587b00b182 SHA512 d3a6f8256654c06b86a8daada3d8a58af11c6b35777c0e4c830e0fa7b3a2d639850e85800f83f216d71cc528d71996a69d7c5bf8cb95ad95ff69d33d745d9da7
+EBUILD ansible-molecule-4.0.1.ebuild 2794 BLAKE2B 276dbb430a10c95a7362711c58ec694d4617d4c17d7bc5f1c7b0b3b2524fb84b786702d87e6bf92d810c4cea90c5f2b62df2b053f81f6ff1da89bcbc2ec1711a SHA512 5cbbd964a57f2fd1b08ca9aa04fda3ffb26a4199bcf80d3c5a1fc25ca8dbca071e6236852b964eb3f809c13bb8a0f7e8b4ca139503fe60b48fa2bb595e422558
MISC metadata.xml 407 BLAKE2B 869b6c1d6da66568eeac2daaca56567876dbfb057f50add7bbc95fef8a3fc38b99279d359a90573f8d6af47d0e451445827f6efeefa8fb0e7954e8b624783855 SHA512 e6dbbe2c0536ea84bdfea0168a743dbe3de424b442757441bc4f978e07d41ca6022eb2d6f269c921f42b4e7d858788f967c1c35bd4241a35dbe25a161f5744de
diff --git a/app-admin/ansible-molecule/ansible-molecule-4.0.1.ebuild b/app-admin/ansible-molecule/ansible-molecule-4.0.1.ebuild
index 3e827f95a347..603414d23bdf 100644
--- a/app-admin/ansible-molecule/ansible-molecule-4.0.1.ebuild
+++ b/app-admin/ansible-molecule/ansible-molecule-4.0.1.ebuild
@@ -48,7 +48,6 @@ BDEPEND="$(python_gen_cond_dep '
>=dev-python/ansi2html-1.6.0[${PYTHON_USEDEP}]
dev-python/filelock[${PYTHON_USEDEP}]
=dev-python/pytest-html-3.0.0[${PYTHON_USEDEP}]
>=dev-python/pytest-mock-3.3.1[${PYTHON_USEDEP}]
>=dev-python/pytest-plus-0.2[${PYTHON_USEDEP}]
>=dev-python/pytest-testinfra-6.1.0[${PYTHON_USEDEP}]
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 6cf167b298a9..9e2590772194 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -3,9 +3,13 @@ DIST aws-cli-1.25.97.gh.tar.gz 2290672 BLAKE2B 4fbff8d9747b615f7b8633ce2a1c7a688
DIST aws-cli-1.26.0.gh.tar.gz 2291209 BLAKE2B ad2b9380d45d986b2cc4219a93ee30fdc1e86e35e66dc095c76f29e6062601d0e443a96fa93edbc65562580eb9815a8d3f31a59a0c850513793df3870e809be8 SHA512 5b7e87b4fe02d7fbca0482cb93616b8f78f0bb074ed779ca553532be54f914c827a30b8458e209e6fbd23d22b5e734dfe14fb79e8833c3055c771a1766153d2d
DIST aws-cli-1.26.1.gh.tar.gz 2291902 BLAKE2B 04df153b4b7608ab3c2e86c230065f7b935a911e88e1a5b788dee545d328d9839ba9aba44b334522f2afafef8fa613aea6e749a2a7f9089f40993544f3cec9e9 SHA512 418257a8e4c92a6d21c89f7725cd70f463f4dd53c798783b29c4166daac644501e4a03a180257dfe356bf30228dedcf7a672ad46ff6f36afd40a8efd9ad786f9
DIST aws-cli-1.26.2.gh.tar.gz 2292384 BLAKE2B 72a24a647ba73ce492f2c7c43984af2c7185da8415c3124c4d55acd81bb8bb8895d5d01232bf2267166094ba0ca24fa690c81838f28ef5b40fbcdaaa6fd93c5a SHA512 fc3569a9c81481fa2b1b04c74b89073724cea0c0f035f60ceb5a8f47f848a2a6c8e104ef1e1ed883c1d330c4b5c240c2b79e86d6eaf28c7a120d1c3cae826e92
+DIST aws-cli-1.26.3.gh.tar.gz 2292758 BLAKE2B b872cf8412628e1b8409fa96f2e1954cbb055bef0bb09485e42d458bbe43cc525fa4fd09bbe6060a6391f2f73952527e2b7aca59bb68bbb1d680884b0fd339c0 SHA512 9a74439c4a4ea43a32df1ab3022dab213ebd62401540bdebba6d263305582f538ce3dba128ac7723972c921c90e3f05fb86a1b5d533a3d36436f057799a9b506
+DIST aws-cli-1.26.4.gh.tar.gz 2293891 BLAKE2B 5565375f74d88b5e0ddc1a96ab461c63bad04ee7a624a7b77e71a3bfee44f75175e892d2a91a1d8e32f7d9cce9888f87109db0bc4aa5b032947d94cbf713b910 SHA512 74df7c09d4edad09745ee9d0412d288ef34230d8fced1b4c8471fb278032b4141c077fc5c3f458c6d76bd593d672c59f650f1372cf324a15e3b12afcabecec42
EBUILD awscli-1.25.89.ebuild 1856 BLAKE2B 554e1053c19d16d4e0aeccddbd3a49b42ab412ba342ddd888b11552f1abede7a405f743edbabbda0cb4d42dfc95c0f29da64aab08d09c0cf3b24b0771438f23b SHA512 563c00bd712002ea3b3771e7f6c2f27b478fb78cd91b1009cf498e487b81c8abe04e754873f77f625e56594f34e282307c325cc6609bee2f6e856d0e461aa252
EBUILD awscli-1.25.97.ebuild 1858 BLAKE2B 1ee53dfc682ba96eb15476dd37b44e1e0833eee35faf61ccad6f24f402a9eb18590e19cad2faa40e11490c13db91f2609859cdd4bcc5caae36a89cecea3143dd SHA512 8370816db2c51b0e6146a031ea1100b47fede8d1ceb82104206f0a55ffbe995a1792d6872913e0d72497b4726f763816ba77c6215441c993554d3065a5f9d3f6
EBUILD awscli-1.26.0.ebuild 1843 BLAKE2B 1c4942076455cb7b7f201cb909bb946c5ee231bbe589efdf2d58074413ff88fa08afec6c5b0d485bd5b24f0b997857acb0cf25eff2e78e7fca11ff2700c5164c SHA512 e1b7932cd3fb4de8d18b62c8d3cff4c0620b5997bd1a4739ccbd6914a969958eddde42ff99aeb819a3b68674c15f5cbceb768c210f5f4f8fdfb082642ca6636a
EBUILD awscli-1.26.1.ebuild 1843 BLAKE2B 1c4942076455cb7b7f201cb909bb946c5ee231bbe589efdf2d58074413ff88fa08afec6c5b0d485bd5b24f0b997857acb0cf25eff2e78e7fca11ff2700c5164c SHA512 e1b7932cd3fb4de8d18b62c8d3cff4c0620b5997bd1a4739ccbd6914a969958eddde42ff99aeb819a3b68674c15f5cbceb768c210f5f4f8fdfb082642ca6636a
EBUILD awscli-1.26.2.ebuild 1843 BLAKE2B 1c4942076455cb7b7f201cb909bb946c5ee231bbe589efdf2d58074413ff88fa08afec6c5b0d485bd5b24f0b997857acb0cf25eff2e78e7fca11ff2700c5164c SHA512 e1b7932cd3fb4de8d18b62c8d3cff4c0620b5997bd1a4739ccbd6914a969958eddde42ff99aeb819a3b68674c15f5cbceb768c210f5f4f8fdfb082642ca6636a
+EBUILD awscli-1.26.3.ebuild 1843 BLAKE2B 1c4942076455cb7b7f201cb909bb946c5ee231bbe589efdf2d58074413ff88fa08afec6c5b0d485bd5b24f0b997857acb0cf25eff2e78e7fca11ff2700c5164c SHA512 e1b7932cd3fb4de8d18b62c8d3cff4c0620b5997bd1a4739ccbd6914a969958eddde42ff99aeb819a3b68674c15f5cbceb768c210f5f4f8fdfb082642ca6636a
+EBUILD awscli-1.26.4.ebuild 1843 BLAKE2B 1c4942076455cb7b7f201cb909bb946c5ee231bbe589efdf2d58074413ff88fa08afec6c5b0d485bd5b24f0b997857acb0cf25eff2e78e7fca11ff2700c5164c SHA512 e1b7932cd3fb4de8d18b62c8d3cff4c0620b5997bd1a4739ccbd6914a969958eddde42ff99aeb819a3b68674c15f5cbceb768c210f5f4f8fdfb082642ca6636a
MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.26.3.ebuild b/app-admin/awscli/awscli-1.26.3.ebuild
new file mode 100644
index 000000000000..7bff39ee809a
--- /dev/null
+++ b/app-admin/awscli/awscli-1.26.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+ https://github.com/aws/aws-cli/
+ https://pypi.org/project/awscli/
+"
+SRC_URI="
+ https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+ -> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+ >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+ dev-python/colorama[${PYTHON_USEDEP}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/rsa[${PYTHON_USEDEP}]
+ >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ !app-admin/awscli-bin
+"
+BDEPEND="
+ test? (
+ dev-python/pytest-forked[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ # do not rely on bundled deps in botocore (sic!)
+ find -name '*.py' -exec sed -i \
+ -e 's:from botocore[.]vendored import:import:' \
+ -e 's:from botocore[.]vendored[.]:from :' \
+ {} + || die
+ # strip overzealous upper bounds on requirements
+ sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ # integration tests require AWS credentials and Internet access
+ epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+ newbashcomp bin/aws_bash_completer aws
+
+ insinto /usr/share/zsh/site-functions
+ newins bin/aws_zsh_completer.sh _aws
+
+ distutils-r1_python_install_all
+
+ rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/awscli/awscli-1.26.4.ebuild b/app-admin/awscli/awscli-1.26.4.ebuild
new file mode 100644
index 000000000000..7bff39ee809a
--- /dev/null
+++ b/app-admin/awscli/awscli-1.26.4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+ https://github.com/aws/aws-cli/
+ https://pypi.org/project/awscli/
+"
+SRC_URI="
+ https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+ -> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+ >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+ dev-python/colorama[${PYTHON_USEDEP}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/rsa[${PYTHON_USEDEP}]
+ >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ !app-admin/awscli-bin
+"
+BDEPEND="
+ test? (
+ dev-python/pytest-forked[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ # do not rely on bundled deps in botocore (sic!)
+ find -name '*.py' -exec sed -i \
+ -e 's:from botocore[.]vendored import:import:' \
+ -e 's:from botocore[.]vendored[.]:from :' \
+ {} + || die
+ # strip overzealous upper bounds on requirements
+ sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ # integration tests require AWS credentials and Internet access
+ epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+ newbashcomp bin/aws_bash_completer aws
+
+ insinto /usr/share/zsh/site-functions
+ newins bin/aws_zsh_completer.sh _aws
+
+ distutils-r1_python_install_all
+
+ rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 5cd466e166cd..9b8010a05141 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -3,5 +3,5 @@ DIST conky-1.13.1.tar.gz 2443276 BLAKE2B e51610172e830d0368e8c9a48ea056285efe482
DIST conky-1.15.0.tar.gz 1800684 BLAKE2B e3b8c682e99be42cd28ed9507c346f16afefb525269c31bf9731169fa2c52bcaac4f523ecd0ec8c722fb4e269226254f8579876e68a2b27c3a3f5685dd50b423 SHA512 d317b0a141355ce56c9dce5ba6e4b9dbe73b05b9b0b85d93d491f6d6da4194c1aceefbbc7e1b10e5fc233a9732933949e273630845194f6c16dce34a77ee5841
EBUILD conky-1.12.2.ebuild 4790 BLAKE2B 233fd89ef019a015d1ebad697126bd2417410241cc377a81d5bdebd85cbe1ee664ca61db8b5a83d39a8dea05c63b8dbbf7b4bf7fed3ac0b76c7ae349d477b625 SHA512 36f90f9eae1c783a02dfca917ffcdc48694f8ec9175832c95b6867bbc94def480be40abeca1d172a2a7f4cb944ec827c3dd1766b5ae8310a2aa4ef700283a4e5
EBUILD conky-1.13.1.ebuild 4793 BLAKE2B bd580ca59a442b7bb164095cd3091742ec26b41c0d7181474f71259e384ff9147706c2ca35c577dab4dca4489b1256a58755f46120b7b69d08494c8f4db30104 SHA512 c16e1710f4c6bad79afd54187b236e5fb583e727264c5522f818f9bedc01187816ac5169a58671d9180a01347cdab58f695bb5f98c5f7e4d5ed8c31a0b89d5ca
-EBUILD conky-1.15.0.ebuild 4520 BLAKE2B 4fdb448db2b1f7c8236be63f094f80b09c786a0466c2eaec511b6b7f452c714fe0ee5e56f01235e58e6998f81ff72954b4cd387c87f58b1894bdeae405cab058 SHA512 0a8acea091b5eab390a4afb0ef2e83cef6c735fd9680045e8f6419a0e9f33f23867b4a8af1f71830e08c182281360c2e959cd4afcfc1328fd3b8219c6da29897
+EBUILD conky-1.15.0.ebuild 4551 BLAKE2B 9be98d2a3b5498cceb2f8c9c2dafe86decc37f7a831bbd5b29cfd99ef58c69edf266407f15fae4f5a80958c04a04aa98362b9c927c24179012d03f803ecf7a31 SHA512 9cfbb6353e2c1dd362c124f0976fadb47bf726b9f29dd8466df2f4d5f13f1982c440e88235133a64e75a73f25d4e63bf9b6469f14e920dfe739acf79ef685190
MISC metadata.xml 2576 BLAKE2B 428d10d3666770317f470e6898d103180370866abdfcc55c81450c3df58a7c0eef5a2cf4d4980a36d22803479af7f10aaf3a4245041f729fefe26ccb0a29a516 SHA512 6db4ad92cf3d3afc81b7047c8f23d157d1efc6cf02aa5e4ab435c8785355445d6929e314fcadb007b2d084560c0f1afeff8889ff390852846fad8f52c29d8e48
diff --git a/app-admin/conky/conky-1.15.0.ebuild b/app-admin/conky/conky-1.15.0.ebuild
index 8803596b5d27..ec41cde86063 100644
--- a/app-admin/conky/conky-1.15.0.ebuild
+++ b/app-admin/conky/conky-1.15.0.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 ~arm64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="apcupsd bundled-toluapp cmus curl doc extras hddtemp ical iconv imlib
intel-backlight iostats irc lua-cairo lua-imlib lua-rsvg math moc mpd
mysql ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype
diff --git a/app-admin/doas/Manifest b/app-admin/doas/Manifest
index 4f9430ecb865..4d87dea670fa 100644
--- a/app-admin/doas/Manifest
+++ b/app-admin/doas/Manifest
@@ -1,5 +1,5 @@
DIST OpenDoas-6.8.1.tar.gz 32398 BLAKE2B cdaa01efaf3d164bcf6993693c86039fa4866dc1ce619731b455985ca1ebb5ebec889b540f4720c590318202de8a4b2fdf5d715f2170346818e706857b5adfa3 SHA512 d96fe1cdd70e9211de9996ad05bcf7a127facd02af48f7ab2561869d9d16708f1b61722c6e6b9fe15a62e9ef501e09b1ba444b7b43a066f1895e543ebc9402e7
DIST OpenDoas-6.8.2.tar.gz 32430 BLAKE2B 14c418537b17cb82ceb1d789acc74d17364390c04d0a8d81b65de2ce3feca800e48158c6a8ea066176edeea44252f4baa99d1abde0dfbdc548c06f96e6409984 SHA512 4a93ff477413c859ba2702e688fa4f83248fff85e61e12336838a1e9aa1a8d9963a9782e4bc5e58e8d04b86c2c8ceb6b235ae9d3b32b3e548a2514a43653137d
EBUILD doas-6.8.1-r1.ebuild 1362 BLAKE2B 4896ec32b6b00850d7452a765b0ac1644ac42995dd7b60857a57e1d2d73388b49c4b70330bdff918f521dbd4cc3ef64249861765a5f6baf0b4f073466b838b11 SHA512 8bd3e23ebb8f24c1ac71a7d4d624d32be42fd92bd4c0a617e6e0761bb3f9a0a48d5f088eac03d4caa4cecfd42a098412a3bd06fd2800624fe51d95e6bf6b8ea7
-EBUILD doas-6.8.2.ebuild 1302 BLAKE2B 838a808e7ea7aa86e780c1651d0e9cbee8935149fcb233145f90cd95caa68e500f687301291bc0f7a1c2ebe86872d2d0c343d22dd2ff45c5b5e958e52fdbaead SHA512 0fb2269c78fc0e6e512224ff58b33b1755f0450c2678dc61b7991ca5fd9363caa414b120a20425fe178cd73b17b5bd04364d4ceeb0b2fe06138efb10c6076ceb
+EBUILD doas-6.8.2.ebuild 1299 BLAKE2B 9e2afcb4395fb1e013fa70e8d8d9c8822311f31fdc7f00bdaeae02184dfb6d506f8ef0600cacb98926201341352818a83caf2f166f199ac3e46fd2a4bfd774c5 SHA512 547be5fff6c1b49df890dab3bb700f96bbc2e802586f6df145cd11acf14537f9c2f0fabfffc4573a1b587fa4a40e3719324831abc19ab933aaaac25e64908d8f
MISC metadata.xml 558 BLAKE2B 2f308d787a7b1f5d51fa36c63c4e0fe79171d6967a34f00c5b5e47035d4176a83403ca1ab6e74c44e7e32a8988ae363fac045c4771a9f2f3975e87593f53aa94 SHA512 3a69c68de5619d4377931c9331e00a5fd5c478930b1fff95ee308ad110c6b7607a491ec9f16b2e59491f9c8634eb22d0c703f62246f79e3bb1684a47b17f8ea5
diff --git a/app-admin/doas/doas-6.8.2.ebuild b/app-admin/doas/doas-6.8.2.ebuild
index 25d4f3a7608d..8d775443d9b9 100644
--- a/app-admin/doas/doas-6.8.2.ebuild
+++ b/app-admin/doas/doas-6.8.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${MY_P}
LICENSE="ISC"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="pam persist"
BDEPEND="virtual/yacc"
diff --git a/app-admin/eclean-kernel/Manifest b/app-admin/eclean-kernel/Manifest
index dee7726aa3f1..e56dab4a73f8 100644
--- a/app-admin/eclean-kernel/Manifest
+++ b/app-admin/eclean-kernel/Manifest
@@ -1,8 +1,8 @@
DIST eclean-kernel-0.4.3.tar.gz 10650 BLAKE2B 228d17cfc5bed34e892dd6340498b87cbc32f22e83aff70824ef24f88836e3ad2306eda8704e25b7cfbadb33984edee8effd613dad67ada25519c601ec6b6ec7 SHA512 a2ffbfe800672ad0cd105425497dae72c0779ec9da5ba6a6b4efd8846762467acf6b8e70c67744e7c7639d5ba2ba4643ad344aae193e72d12d12f48b1793ff4c
DIST eclean-kernel-1.99.4.tar.bz2 78909 BLAKE2B 0cac3a001c3180c57bdf9a63366d9950928690328fd560f984c1d35bcf88712e897462a153bc3f0250ebbbb42518798e3407c3533351543ff32bd68ecee2ee5e SHA512 f3263b83b36878104e21fe122eb96a16c5c5a930b062fdd62d6a574db597644222d5a19d7833cbb894a955076b06bcb1a22c94d5f87c2787420dd1de32d0f789
DIST eclean-kernel-2.99.3.tar.gz 20031 BLAKE2B 70830639eb00bde810e29361dec7c7b90f5b85b79b5be865f23cf45254cbf6139ef335fb5bfef08e2512512e57867df62f6468ce8de1da58cc9a4cfa27a26244 SHA512 edbe373b81a2eb5c7fca8794f9577c68ab66305e9085cc7535cd5d8a8fdd549b2035cb0b5f3e5a69cc735146c2eef81dc5c1f5284ef255420aca0cda9e518b14
-EBUILD eclean-kernel-0.4.3.ebuild 502 BLAKE2B 068b3533ebd4613a0a8204e883d26db1070189d4baaeadb2d070d96aca0a75c23c2bddd1ac4ed1f37ecdf1702a16d0bf27d5863451781ba560113141e00bc0d0 SHA512 80bd3a50c8d8d9dc52d93f59583db74fc8a5b351f83c8b063e63cb8bae71830f5d44541f857f0129e7ce82da13fef17a32d8cc14b917027be21e916853f570c9
-EBUILD eclean-kernel-1.99.4.ebuild 362 BLAKE2B 20894519cc3270ab4880c0373894638d18ecfeb34fa49a7f801e4889d22f78702c87201c3cba929092b38149f3b14109b058f95f597eea8c1507011af37b14d8 SHA512 61b64ce5d1f0e842de988f1d62bb41af6e16ef73a05ab35b90d97410292c5409c3873fac6dbd9a09e4be033cd19e70a283cfd6be48183409822c29ef26abdc85
-EBUILD eclean-kernel-2.99.3.ebuild 704 BLAKE2B bd5574ecfd358398e6e4a93fd34f0fafd3f5e2dd244c2d09928020346a3614597d24154d00e4a64d9d516a67923fea00ed8cff99f524a5bf7fcdf2f26df10252 SHA512 0ab2f95de828025c7dc833f9cf1c9b067a51cf9dc44a4d8d192b4933ed981fdfdf7c49b914667a3b497daa0bf630918a7e0418f09edbf8c57ae6e3893f257417
-EBUILD eclean-kernel-9999.ebuild 668 BLAKE2B 1aa2d52aa66affce28d23a1ca9616456faea4a33c285ffead283f7866492aa63af16e84463d1618d83c8280e7cf14f19d7b6a51ce8bed2adea4766fe1e2fdc57 SHA512 d1789ceaf3d2b00a1ba35c3dcd257a08ab416557bbc77dbd4e1566dd9d49b2fee73aecfba0e92872be1d29e95e7aa46f0665e7b07bbe8d61d829503a6baf7e8b
-MISC metadata.xml 618 BLAKE2B 5a88b3d477e80a853ac3eb5ee55fa5cc202b7a78d370a32fe47acb7e571cc23886b7f31e6684d9463e8ecfcaceb9157e2c2d3df74abc7866850f5dc37586ba94 SHA512 afd67bf9c6f53d807cf00b206113815e672a120231ba809143efac0395e3fefa443c7a69a9c702a7d60e3404e622ec562492f0497421cc0feb08f15ac2f3d779
+EBUILD eclean-kernel-0.4.3.ebuild 498 BLAKE2B 155331b3a5ab1a7adcf6b007b720824d7c64c0e70a3d31da0d58e7d4a788358b83eb05a58e368c0b341b173f489e4f4dc90b9c8ca1f86b01066105c8fbea5eb8 SHA512 0bf0cc9cd1a81eefe73d4e89743690c9ebb65887c02a17483edf191236be6ae327a803712baba437c48381621e0c49cda25bce765712a9f98e09565c7a5adefb
+EBUILD eclean-kernel-1.99.4.ebuild 359 BLAKE2B 1ffe12f3282966393c97ca22ebd5ea0c5e889de811496153ba69dda2f3d43f930d44a1a85149e3d4a7475ece8d9da1307ad6a372dbb1d3a4026a6954780f61d4 SHA512 ddf7e7e8da6c052c73b22fec42a828216f1048c30fad53d1d74c30b6309a54ce67861eebef73b5fa1733d7fd7c2efb5cb2a3e306c16e3723e56a4e5d66075c4d
+EBUILD eclean-kernel-2.99.3.ebuild 711 BLAKE2B f054c67ee96d123ccb08f5ae15ab3988ae7dd14fd2528d7b88f8e18a06f894a6d30a31e2bfd75a7b877175e4ca70a0cc781e949e190ef0cc68e7adf0de6d7057 SHA512 4afbbb46e46397f335d6fdd2ffbe2e75ec140b4e601e91832b90d53d5708fe8accfc04b2fa15618d5d7f5ca6e2b6d82d5f213bb77ea934955a90426565c91193
+EBUILD eclean-kernel-9999.ebuild 675 BLAKE2B 61d7d339215c4f7ba0df5da1733256f73f1e67bb1c9b1f727ae5f1c4f82581211fd94dc9087d0e8cd7602d10ec5c3a7c916a0b3ad426b2525c2da31eaa690739 SHA512 4997f02fad19819758b14d0e5fa8596de842ff8502551505975c3d67522151d019fadecb921c70abe350977fc668cc92d922449e983019bb6de1b70b37632529
+MISC metadata.xml 618 BLAKE2B 1629b132706b5bdd9d30ab55b929b679d846523b1d9d40fdf26600917af18514c1774d8f5dfb2c39d0bf3476371aaf5f1f952b18269660862b7ae96f3c567e22 SHA512 a07b907aea8d1859d6fd7384a65b10cdfb9d0e19a9712f7e1dbf910b444d21a7c573a73549b6d1aedc7b234988a4911c6d759533a9ecba571002611ff26b3549
diff --git a/app-admin/eclean-kernel/eclean-kernel-0.4.3.ebuild b/app-admin/eclean-kernel/eclean-kernel-0.4.3.ebuild
index 0c366b25ea8b..7c8bf73a2541 100644
--- a/app-admin/eclean-kernel/eclean-kernel-0.4.3.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-0.4.3.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
inherit distutils-r1
DESCRIPTION="Remove outdated built kernels"
-HOMEPAGE="https://github.com/mgorny/eclean-kernel/"
-SRC_URI="https://github.com/mgorny/eclean-kernel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/projg2/eclean-kernel/"
+SRC_URI="https://github.com/projg2/eclean-kernel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
diff --git a/app-admin/eclean-kernel/eclean-kernel-1.99.4.ebuild b/app-admin/eclean-kernel/eclean-kernel-1.99.4.ebuild
index ae41700c874d..575548e459c4 100644
--- a/app-admin/eclean-kernel/eclean-kernel-1.99.4.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-1.99.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
DESCRIPTION="Clean up old and stale kernel files"
-HOMEPAGE="https://github.com/mgorny/eclean-kernel2"
-SRC_URI="https://github.com/mgorny/eclean-kernel2/releases/download/v${PV}/${P}.tar.bz2"
+HOMEPAGE="https://github.com/projg2/eclean-kernel2"
+SRC_URI="https://github.com/projg2/eclean-kernel2/releases/download/v${PV}/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
diff --git a/app-admin/eclean-kernel/eclean-kernel-2.99.3.ebuild b/app-admin/eclean-kernel/eclean-kernel-2.99.3.ebuild
index 27c2c00785a0..1ddf5d99f8da 100644
--- a/app-admin/eclean-kernel/eclean-kernel-2.99.3.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-2.99.3.ebuild
@@ -9,8 +9,8 @@ PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
DESCRIPTION="Remove outdated built kernels"
-HOMEPAGE="https://github.com/mgorny/eclean-kernel/"
-SRC_URI="https://github.com/mgorny/eclean-kernel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/projg2/eclean-kernel/"
+SRC_URI="https://github.com/projg2/eclean-kernel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
@@ -21,7 +21,7 @@ RDEPEND="
kernel_linux? ( dev-python/pymountboot[${PYTHON_USEDEP}] )
lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
lzo? ( dev-python/python-lzo[${PYTHON_USEDEP}] )
- zstd? ( dev-python/zstandard[${PYTHON_USEDEP}] )
+ zstd? ( dev-python/python-zstandard[${PYTHON_USEDEP}] )
"
distutils_enable_tests pytest
diff --git a/app-admin/eclean-kernel/eclean-kernel-9999.ebuild b/app-admin/eclean-kernel/eclean-kernel-9999.ebuild
index c4682a7d1918..879888b0e4be 100644
--- a/app-admin/eclean-kernel/eclean-kernel-9999.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-9999.ebuild
@@ -9,8 +9,8 @@ PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1 git-r3
DESCRIPTION="Remove outdated built kernels"
-HOMEPAGE="https://github.com/mgorny/eclean-kernel/"
-EGIT_REPO_URI="https://github.com/mgorny/eclean-kernel.git"
+HOMEPAGE="https://github.com/projg2/eclean-kernel/"
+EGIT_REPO_URI="https://github.com/projg2/eclean-kernel.git"
LICENSE="BSD"
SLOT="0"
@@ -21,7 +21,7 @@ RDEPEND="
kernel_linux? ( dev-python/pymountboot[${PYTHON_USEDEP}] )
lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
lzo? ( dev-python/python-lzo[${PYTHON_USEDEP}] )
- zstd? ( dev-python/zstandard[${PYTHON_USEDEP}] )
+ zstd? ( dev-python/python-zstandard[${PYTHON_USEDEP}] )
"
distutils_enable_tests pytest
diff --git a/app-admin/eclean-kernel/metadata.xml b/app-admin/eclean-kernel/metadata.xml
index 6c3f7b45181f..11fd9db9c6da 100644
--- a/app-admin/eclean-kernel/metadata.xml
+++ b/app-admin/eclean-kernel/metadata.xml
@@ -11,7 +11,7 @@
mgorny@gentoo.org
Michał Górny
- https://github.com/mgorny/eclean-kernel2/issues/
- mgorny/eclean-kernel2
+ https://github.com/projg2/eclean-kernel2/issues/
+ projg2/eclean-kernel2
diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest
index 991898040c1f..b7afc7d1a062 100644
--- a/app-admin/hddtemp/Manifest
+++ b/app-admin/hddtemp/Manifest
@@ -11,4 +11,4 @@ DIST hddtemp-0.3-beta15.tar.bz2 256372 BLAKE2B 1c928234c36172c387a002190045cd050
DIST hddtemp-20080531.db.bz2 5627 BLAKE2B b973a981ee55033c8ba190efd9dc8586589292ef1f2b00542be7db2be64df812847665abefc7517f7c71dc70df153766570f62b69fc4891e758e82200ff8d589 SHA512 cd03cc300aece4f7427fde1b58840643c8e41e6c0ce30b418a62bf44b268f249ef3dc4f5f4bcbc9cc0cfe0346c18d4f1da22451c87efc3d46faebcb81a1fe059
DIST hddtemp_0.3-beta15-53.diff.gz 52845 BLAKE2B ae4ef1f98ff39a39bdb49b2752f6f442c6ebe8ea6b0e8e743cc3ab9ef39d07abe8970648b841b3974cd814fdef72bc59cfe93c4b4d1cf2a85de1a0d94c4409b9 SHA512 1006ffa92f9973eb1da6444f8e8eed681e641efd17a52954b0e6c5041ecae13108af4ed89534ec4f2799685f96191769d3b168dbbb96085dc801150c7c547511
EBUILD hddtemp-0.3_beta15-r29.ebuild 2727 BLAKE2B 864d2d8ab62869133c4f95bb8c50456effa2729286dd83a44bd292fa8d32d074e0d105b2098ce757d527aa2378a7f4bfa89f3895f2ab21f98252cc1961e8226f SHA512 8955a3ac9fdd650388f957e6a25a1d7a0802d18ff88fe4cae58e7e9865c5499ba7b9032ee5c0e917d50c0e50bac18a3b3c0bea1b92d95dc2147b96bb515da4e5
-MISC metadata.xml 261 BLAKE2B ad85ce24f1ddb319b32b2092fc7367c4c8874d9ad594b35b26b6d389d8c713454c11763b592cdd75fa9c3b5aae1faf1a08ddbce48b27b414e52d9cf85fa8efcd SHA512 e5a808d82e549cc05a1fc6dfa295f39c3ac2a983c5ebeb7093dfb63c7478181f93cb3cc434b2447e600c593da4d14e246d1f9633d6e94a211bd662ec76f75c39
+MISC metadata.xml 337 BLAKE2B f61e34c2b24d7aacee0b73de9c50c49a515eecf46360446fa08aec2f6ea83ea04d59fb1d7d876aad31180847217437d1aadb84ce509c23474a9e22179cde5809 SHA512 e46a12105caf6c3f1fe63af7dc2d182fa66796bc38ec09043aabdc561765bc35b5fae2468a1dba767514cad9f3c1a60f26508d3d099ae34fb28d6363ba5a4efd
diff --git a/app-admin/hddtemp/metadata.xml b/app-admin/hddtemp/metadata.xml
index f057c474627f..c3e338c7db9a 100644
--- a/app-admin/hddtemp/metadata.xml
+++ b/app-admin/hddtemp/metadata.xml
@@ -3,8 +3,9 @@
+
+ hddtemp
+
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 7c61467a8f54..da0d6f6cfe30 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,7 +1,10 @@
AUX keepassxc-2.7.3-tests.patch 396 BLAKE2B 998b55785d7b43dfc00ed96548a31816440c49c4241ac702e479127c714d67a6d8980c90bd3775f3a650adcfe10ebbacb3373073f0da28a28464ef6246dee722 SHA512 8948d78c55b2ccad43e1155535b2c7cc980bc05bb01b9e4d732de63946d03f3b2d49bb7cd6ce77f76f8e1192e47d712f3e12bab352138f5ef3ecdc22a41f17bb
+AUX keepassxc-2.7.4-tests.patch 402 BLAKE2B d1d88059d70e8c43f51bdd94ba17222a919059efadc68712e4f6b8e72885f3088ed96793c8ad26f53000e76414b13b9ebcd52ea447b17e7822ce7d3245f30414 SHA512 e401e341c34a117395cb5852f561770a1f65904e6f649cdd2904a89f7b068c53f46e8509d2e4cafc3c213e2326a01838f719d360fde21d63f29962969f3d16ef
DIST keepassxc-2.7.1.tar.gz 11168642 BLAKE2B 4708821c596e8fc736e086a700d5526be6d9c4cfcb270e3a0a8b73395e9ca3544cbb5973494b15d66e0b98264f4e79d9fa122961407211d346275a9aa1bd5cae SHA512 c2f780ba1f464b32f741d1c6e83734ff220de56dce382f3c38d940abf255d689559c13bff6ad565c38c18cfdb1d883aca52650dba0486e3e28bb4ef872253cc9
DIST keepassxc-2.7.3-src.tar.xz 8963496 BLAKE2B 7f467960eb618d771e24980caa41ee15ecbb2bbfc6c0d37ddf1c8209e06b81a30b157c9ce00b3fd6c91c39ebaad60cec3513f7c1a64c8b7e0e2f0a116246f080 SHA512 29bf067308915d5ac7843eff3bcfb6c4c53a2108e9e2f5349ed03a0b8893f143dcc743cfc175c0831709bafef566d66baa31c5fe3e6fa5fc9c621bf87362e842
+DIST keepassxc-2.7.4-src.tar.xz 8957372 BLAKE2B 5b8ea105c35956f85779187df624f373f9e6937e1edc454b2a5cbc851ddd2ef0dd556ec74242e3a67c314c1e4b0750987a498d245c3463a5e92254ad0c394ab4 SHA512 76b6ba0891d9ba92a5794ba6f25dc8a28f7c1c0f010c31dd49d52ac4c5f186d9c4b51e6f054102b6dfe2d8e766607455829c1994c7ea238efc8f172bbe29b8eb
EBUILD keepassxc-2.7.1-r1.ebuild 2368 BLAKE2B e1d3f23456beb2057c29f4040e9244ca2f2452a2dbd75ee8bb807b4921b2a0aa1519aecd31a21a6caa8c4c7b6295cd87bf66f9c01d50c4c98425728429287aeb SHA512 e90e777e8c8ea57551af72b11d82fa5e4fa6bcbe4bb424e0de39b99dddbd8d21b80e5cd1c49c12485da414e3670145144f31a6aa77b0ff163bcccbdb08e23207
EBUILD keepassxc-2.7.3.ebuild 2528 BLAKE2B 36e886583566784815abf90873c09c1e5698d67b6f68945df44aac762e95b3d9866926a2e7592bbe2ad52074d048bdf725daa15674c7caace351a28e70e0ef7f SHA512 fb853fd1a83b2d83bc33b145535f703282e4a726da1f81df6e60186e45ed6d6b26bba0086922fa71ef9cc6f1308c75a5ea3d1c6620a82b7a9646bf3b3277abca
+EBUILD keepassxc-2.7.4.ebuild 2528 BLAKE2B 36e886583566784815abf90873c09c1e5698d67b6f68945df44aac762e95b3d9866926a2e7592bbe2ad52074d048bdf725daa15674c7caace351a28e70e0ef7f SHA512 fb853fd1a83b2d83bc33b145535f703282e4a726da1f81df6e60186e45ed6d6b26bba0086922fa71ef9cc6f1308c75a5ea3d1c6620a82b7a9646bf3b3277abca
EBUILD keepassxc-9999.ebuild 2484 BLAKE2B e01ba45106ef10b452c746cb31b82359aebc7e0149574c39202ac34ceeb28a0f5dfcdaec363f07af580e89bafb6fd2000d20a37f835050538c26bc84eb3b774b SHA512 bca31898fdf2b92c2728f2c4023702268d797993acee7ed7517b051b43f22a3c6e46d1775b2fa5ff2835f4906a16868cfb7977eaa3247ddbaa27263df592793e
MISC metadata.xml 1028 BLAKE2B bc89e683ead8dfcedd9c1794c35df27ca535b69ce0036641d71c7df8a2db70060adc0d34a007c9da69765dea4fbfe5df5349d880197e2cbdb7f6c5347baed78f SHA512 abe1527cdd2c26b8f64d6b7e8651325146ffbbd53dc9cf273599901e9e9ac31bd43f2c85d8aad1067ccf807cbcad3d921d76df3666b8983eafe69589c7bd0647
diff --git a/app-admin/keepassxc/files/keepassxc-2.7.4-tests.patch b/app-admin/keepassxc/files/keepassxc-2.7.4-tests.patch
new file mode 100644
index 000000000000..ccee26cb5ba9
--- /dev/null
+++ b/app-admin/keepassxc/files/keepassxc-2.7.4-tests.patch
@@ -0,0 +1,13 @@
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -231,10 +231,6 @@ if(WITH_XC_BROWSER)
+ LIBS ${TEST_LIBRARIES})
+ endif()
+
+-add_unit_test(NAME testcli SOURCES TestCli.cpp
+- LIBS testsupport cli ${TEST_LIBRARIES})
+-target_compile_definitions(testcli PRIVATE KEEPASSX_CLI_PATH="$")
+-
+ if(WITH_GUI_TESTS)
+ add_subdirectory(gui)
+ endif(WITH_GUI_TESTS)
diff --git a/app-admin/keepassxc/keepassxc-2.7.4.ebuild b/app-admin/keepassxc/keepassxc-2.7.4.ebuild
new file mode 100644
index 000000000000..eced3151172f
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.7.4.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://keepassxc.org/
+ https://github.com/keepassxreboot/keepassxc/"
+
+if [[ "${PV}" != *9999 ]] ; then
+ if [[ "${PV}" == *_beta* ]] ; then
+ SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/${P/_/-}"
+ else
+ #SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+ fi
+else
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
+ [[ "${PV}" != 9999 ]] && EGIT_BRANCH="master"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="X autotype browser doc keeshare +network test yubikey"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="autotype? ( X )"
+
+RDEPEND="
+ app-crypt/argon2:=
+ dev-libs/botan:2=
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ media-gfx/qrencode:=
+ sys-libs/readline:0=
+ sys-libs/zlib:=
+ X? ( dev-qt/qtx11extras:5 )
+ autotype? (
+ x11-libs/libX11
+ x11-libs/libXtst
+ )
+ keeshare? ( sys-libs/zlib:=[minizip] )
+ yubikey? (
+ dev-libs/libusb:1
+ sys-apps/pcsc-lite
+ )
+"
+DEPEND="${RDEPEND}
+ dev-qt/qttest:5
+"
+BDEPEND="
+ dev-qt/linguist-tools:5
+ doc? ( dev-ruby/asciidoctor )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-tests.patch )
+
+src_prepare() {
+ if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; then
+ printf '%s' "${PV}" > .version || die
+ fi
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ # https://github.com/keepassxreboot/keepassxc/issues/5801
+ filter-flags -flto*
+
+ local mycmakeargs=(
+ # Gentoo users enable ccache via e.g. FEATURES=ccache or
+ # other means. We don't want the build system to enable it for us.
+ -DWITH_CCACHE=OFF
+ -DWITH_GUI_TESTS=OFF
+ -DWITH_TESTS="$(usex test)"
+ -DWITH_XC_AUTOTYPE="$(usex autotype)"
+ -DWITH_XC_DOCS="$(usex doc)"
+ -DWITH_XC_BROWSER="$(usex browser)"
+ -DWITH_XC_FDOSECRETS=ON
+ -DWITH_XC_KEESHARE="$(usex keeshare)"
+ -DWITH_XC_NETWORKING="$(usex network)"
+ -DWITH_XC_SSHAGENT=ON
+ -DWITH_XC_UPDATECHECK=OFF
+ -DWITH_XC_YUBIKEY="$(usex yubikey)"
+ -DWITH_XC_X11="$(usex X)"
+ )
+ if [[ "${PV}" == *_beta* ]] ; then
+ mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
+ fi
+ cmake_src_configure
+}
diff --git a/app-admin/metalog/Manifest b/app-admin/metalog/Manifest
index 6ab4b1005f4b..cfb1268c42ff 100644
--- a/app-admin/metalog/Manifest
+++ b/app-admin/metalog/Manifest
@@ -5,4 +5,4 @@ AUX metalog.initd-r1 651 BLAKE2B 7b7739ca48acd3ce646478b51639c14f7cf131a698570f7
AUX metalog.service-r1 153 BLAKE2B 0353f6c1983b7146ce6471be82540aeb87d930e5c9f7334a4133754c52c2c8770c04a9eeb6f9f20ecc41359b1eae135e525d2dbde2471f2d973bb751690703d7 SHA512 72076f6aeab9975dedd824ea1d48b96f6a964d06f529923d4f7a1280a1123a63c0e958f74c6a1417c6362487a69d165bf3eb6c417aae3887ff43ae726f5a30d8
DIST metalog-20220214.tar.gz 40898 BLAKE2B 7ef04b9e0cd1ba878a11d988ec4b4bffa3d733f86c6b8cec57d32dcf837fe48a001a233a2b09378443b26f6e69869b8de7afeb25f11bb7729b66e1aa3a305f67 SHA512 44a1443e8f9e92460f128aa35125d50ae247ba4f2ce8fd8cc32b96a491e29963cdc27be12a6db28f286e2d5a2bc6243e126a77ae3eb642e7c969d58446a18fcd
EBUILD metalog-20220214.ebuild 1608 BLAKE2B ac154c3a01f80ecc0ebb64ce9bb37b69e5335a5f53d9531872faa82164700442299b9d172f16e975f5f27cc9e32b9a0f815b56e96008003d683413733cf10213 SHA512 7db94f90f6e6e2f43032d6b01a20e79f1749cb8c9eaed5ddf5795ec387f23c9cbff5503eb4f1d0993d905c90f0e03938ed5af71e0d3a61572e0870ce859129ba
-MISC metadata.xml 335 BLAKE2B 79615a8fc010da3c58df284f7c0490ca2a56bf0a31761090e4fdbde48f70f98660ab5e682f272a21cd820fb3b52a75b48d42f63d5b5debc5fa767f62eea8a938 SHA512 6ccfe49519ce8c5d9d76bf305993e09c76c2d095e0eea30c3de32947dbe80d6c99385a8bb743f4c78697324d9ae24bfb97b2f79385e5cca16dd753c448f517dd
+MISC metadata.xml 390 BLAKE2B 84c414c7f1c23c5eff546e465a36844c13f5f774c0e53117a1d3584af4f16a1bebeba681f6714af316437f2125ee2f65f0a1fb110699438e8d6a28f4aa0fd6f8 SHA512 5656e552504213e621d2804cc877f623feb243a166b7da0507a3ac1d934db9d438b6d087ba9d7b0d2c38551227bd0c190e42374771bdc4422fc263b894101998
diff --git a/app-admin/metalog/metadata.xml b/app-admin/metalog/metadata.xml
index acdb1bbf3594..61646ab7d054 100644
--- a/app-admin/metalog/metadata.xml
+++ b/app-admin/metalog/metadata.xml
@@ -7,5 +7,6 @@
metalog
+ hvisage/metalog
diff --git a/app-admin/openrc-settingsd/Manifest b/app-admin/openrc-settingsd/Manifest
index 8771a624d8b9..887582652d97 100644
--- a/app-admin/openrc-settingsd/Manifest
+++ b/app-admin/openrc-settingsd/Manifest
@@ -1,3 +1,3 @@
DIST openrc-settingsd-v1.1.0.tar.bz2 41781 BLAKE2B 1a508c5751a3b2c734b533ebdf72d4c5fa97b67743caf5e47f06fc505a286e92167715e0ec706528a4e9a74d0aed9d78d6b6b2d542c1df3781d5bd76ff700b91 SHA512 f63aa624097a806094c51a6da8fc6f4962c3302ea0acf02be17744db9d5caf4cfd68294a8e8916e62eeeca722cadc571715b9751730f9d9cf1f9be66e93510f7
EBUILD openrc-settingsd-1.1.0.ebuild 1477 BLAKE2B a7dab01a14659405662a156514646cb8eeb338e132e577e562e129e3da2d4b7d022d4fd9ef47db48d36f9e9f8e1fa3fc709c002c54e1516cf2de6d3a8d649017 SHA512 cad7413f725f60200ca8bdee649cf35432450513c1be10d3ee2a14fa1e063ffb798101f3d23425786eb241dee91af3b9bbcf144582ce2cb136f0b0cc8e5d1d4d
-MISC metadata.xml 376 BLAKE2B f8dda587a8dc49454836f273cafa051b2f62ed0e0931e56f69ede04e40d88c79ed9202f62c33d68b68a54cd5c8ae3422d0909e9a5311e9c570aa35085276165e SHA512 77df97d0d15b5212f2432702b7bac3b2254f2139b4123be6fb79f41c21094907624e4e1fe3e9a303dc3b5bb2c122c1fedb94eca003e10bede624ddb17c4589ac
+MISC metadata.xml 489 BLAKE2B 9da8f8d72d161ece48f9f2bd5ac900836bf5be45de25e604b3742b3aa38820f2fb6b4039062a8701a1aa0e9b6f5893f389b99e178dd31f70ec008928587f661c SHA512 aeab0c7da85043d609af29f344fdefb7d8fcf62b7bdd113dd56131c99d82e738a2ea7d261b4de365443d9dd1747bce4069ec3e0fdcfe2de91fe117726024e127
diff --git a/app-admin/openrc-settingsd/metadata.xml b/app-admin/openrc-settingsd/metadata.xml
index e9500dd5af81..c24b007e3b95 100644
--- a/app-admin/openrc-settingsd/metadata.xml
+++ b/app-admin/openrc-settingsd/metadata.xml
@@ -1,12 +1,14 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
-
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+
+ postmarketOS/openrc-settingsd
+
diff --git a/app-admin/ryzen_smu/Manifest b/app-admin/ryzen_smu/Manifest
index 50212d134fa9..5e4e1e93d245 100644
--- a/app-admin/ryzen_smu/Manifest
+++ b/app-admin/ryzen_smu/Manifest
@@ -4,5 +4,5 @@ DIST ryzen_smu-0.1.2_p20210627.tar.xz 151900 BLAKE2B c3845755753256aeee4e68d106e
DIST ryzen_smu-0.1.2_p20211205.tar.xz 386260 BLAKE2B eea0466f6abd93a18c670fbbf603be7efb60807865151543341b6a0a9f248eff8a99d8ecda864bebab6e5e2471ff7239681a83ae9b3dded3b1350a7f363ee62c SHA512 93f7eaac4811ac6e3d46abeb012b1ff4e334fc9247a3747ca67489a35ea04dce20806ae2e57f46e930e5238d1d2a966e8d0b83f8bf090a735d0c2d078f3256f3
EBUILD ryzen_smu-0.1.2.ebuild 734 BLAKE2B 12d6de1f710039e5db92698e3bd2af0d2b658d9e84719f2961578d4710f171dc850e9b83a377134a42f4a2109a00fe08510c043698da2c724caadf5b984965bd SHA512 80ae58556632ab6095a9a48699abbc54e0bdca84a1c8b57052ae47336d2e35a82d22c5e0667ed9c01ab14dc0878a794c47787bc01c0a9d9d8eb70ed0790602bc
EBUILD ryzen_smu-0.1.2_p20210627.ebuild 727 BLAKE2B d2230e9a14222da60f4ba256d968a677ec8266649344fd9ef377cf3607ec03a8f52da414e97328f26e4ff526d0a417cbe516608e07981c79f18b75f99f402daf SHA512 7077291d2dd35fe457286e01f94bf6909cf0644d31020bf56f0266201a0d5b9a96001094d5027ad5ec3fbe5fc28a5070b3f4b617d254beded70930f486c362bb
-EBUILD ryzen_smu-0.1.2_p20211205.ebuild 725 BLAKE2B 0aaaa80179b45a0187e91baa96b70af042764de193128354f823d8b8f8e14a498790f0e685a1fd392e91fb50d42437753902d0120f7997152791d2ecd0fdf919 SHA512 a5ef2de43ffc369bfff54575cc1d5f9643cd03a5c1d1d240662ca270239469e76f80885866df4ef796ee4e75dd8388abf6572b3c497b897ed698e81dd55cbc8d
+EBUILD ryzen_smu-0.1.2_p20211205.ebuild 1105 BLAKE2B e233be9cabda04df8a4499a6b61bcde68851faf3e55e16f8f1026d55cdbd6acfc9bb8b83f9f233713e49d8db0b1a2bae5447a0c2cb6bc2b600df9dc04044c131 SHA512 0a9148920ed2bc25e74295700018bc5ad75ae8ce0effad5a1c2bf1a56434b6307c89050240e440cc8e20ad2179ae7241898ca0bc2f90e5bd0fcb6ac864b98466
MISC metadata.xml 253 BLAKE2B ac07d0a4457abddec76b322a6e7f175661559091067a6f3d92658d4e6c2f1f90a57f5d0c139de0a91a19a5a797fed39fc66fd90ca25bfd0c66497ee8e4088810 SHA512 40abc637528fae614d2eb151b5834c323cb151d5c9ebbee415d70efb4603df0fa7483e0d689ea1658a424ac1e54fb944d8eca37a4bd80bbc15222ed9259096df
diff --git a/app-admin/ryzen_smu/ryzen_smu-0.1.2_p20211205.ebuild b/app-admin/ryzen_smu/ryzen_smu-0.1.2_p20211205.ebuild
index aa763072c39c..96e15892d055 100644
--- a/app-admin/ryzen_smu/ryzen_smu-0.1.2_p20211205.ebuild
+++ b/app-admin/ryzen_smu/ryzen_smu-0.1.2_p20211205.ebuild
@@ -26,7 +26,17 @@ pkg_setup() {
linux-mod_pkg_setup
BUILD_TARGETS="modules"
- BUILD_PARAMS="CC=$(tc-getCC) KERNEL_BUILD=${KERNEL_DIR}"
+ BUILD_PARAMS="KERNEL_BUILD=${KERNEL_DIR}"
+ if linux_chkconfig_present CC_IS_CLANG; then
+ BUILD_PARAMS+=" CC=${CHOST}-clang"
+ if linux_chkconfig_present LD_IS_LLD; then
+ BUILD_PARAMS+=' LD=ld.lld'
+ if linux_chkconfig_present LTO_CLANG_THIN; then
+ # kernel enables cache by default leading to sandbox violations
+ BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir='
+ fi
+ fi
+ fi
}
src_install() {
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 83ede090e3b6..710081740af2 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,8 +1,9 @@
+AUX sudo-1.9.12-mips-build.patch 1148 BLAKE2B 6c31a0095b7d615b0f8001f2484e2df5aa975b025bb4747344e1b9d55a0544f3e89f02cd7ebfd5a4cdf1712e1887b97ff3443a98ec6884724f70f3505c7ef05d SHA512 da98b5a163f8e843a8aed7736b84c50985180910a3d78a5014c91e958d0d8571f374d8b98803733864b6cbf3c8a938f8655063f491b55411c03f2c34352f505f
DIST sudo-1.9.11p3.tar.gz 4826520 BLAKE2B f8508f65b514abd9979a11628d8bc0e085b2625993281e7d1f8794a576e88970bda6939d2f2f50d9485f00276970aba3489b19c102eca5625e389c9610f338dd SHA512 ad5c3d623547d1e3016e1a721676fee6d6b7348e77b2c234041e0af40c7220e8934c8c27beef0d12fa6df11708d37de711dacfefc135d26de46abca7f91c55d1
DIST sudo-1.9.11p3.tar.gz.sig 566 BLAKE2B 8caf03b051222f0446eaf333b48563aa18d52acbd9f7e2d880f0a97043df1ec8d25d87cfd7b1b9543ab8f52f5dacff4cf031fe3e6b94593d576d1d351eb05aa4 SHA512 ea728cddbab50746a2cbb8ce6cb55df3def1c5e806a1d91ec6f2d65c8d246079bdb5799b961ab0da1cc2c347a36d93cc00d32c10856141a467b25e1224876e50
DIST sudo-1.9.12.tar.gz 4906320 BLAKE2B dfe7e45dab9848e7eec30b9c3e96683b2a90c02c8468507a338cda26d8b28206f511c63c2330e1a33e2b0b2d263211d7e2b222d5729dc0670eaafea09603e586 SHA512 34ee165baa2e37ba2530901d49bf0dad30159f27aeccd2519d4719bf93be8281edff71220a49ba2e41dacaa3c58031de1464df48d75a8caea7b9568a76f80b67
DIST sudo-1.9.12.tar.gz.sig 566 BLAKE2B 98c80addcea18d320a54473e34111411dc3e67bdec45ae1c34e98c5a95a0e0377b08e7d42d9cbf92f68160f6e5dfb2990e6cd3c773ba20484b15aecfe3104433 SHA512 67c2c0234345ff17ed9bef2a974a37dd7e4ba791bda4e6f1cc90620d6541e4549e1e2a8525b4092bc615ae035cd2f97eb4165e2e671a3056ac10585709045ae2
EBUILD sudo-1.9.11_p3-r1.ebuild 7412 BLAKE2B 1ddfa12c7fed0f71ba2ed700009aee4dfbdf08aaee350e61e67e0ede62904f0eac97233285b94c820dd3da75c4fc4aa09c31673db42b973f3ac18519ec8fd814 SHA512 13254ff59e0360c2979d6e31d3f9491560cd43a03b03628640426a9535ecde6568706db7037cb4b1e4e74fb555381cc2d42d24b2a4b2b97d7d142179e61df46e
-EBUILD sudo-1.9.12.ebuild 7420 BLAKE2B b0b6e8f5e645b6a9b082693ebbfdb2f5ee6e5fc9564b0e74cd9fa03fe061f10c3816f3073bf2922cbfe6e9f8fae78f292fd0fdc1fec213ec6939e879e59259cb SHA512 f3f70b8015ee9a42261514c9206ddf8f91a1eb58a70fd67154884c972cbfec302135a0ae5a3bbfea99f28e953683bdf05deede217a91bf56dae78f385c1748df
+EBUILD sudo-1.9.12.ebuild 7470 BLAKE2B 167e7eb6aa3ab20ab4dbfa1e082afa5dd69c44bf43f42aa519e88952c56114b73347a65840365021612f8b4e87ef23d4c6ec4952fde8db38bc1cd4e5b10c5a48 SHA512 e653968c91d7219b60daf53dce5bd2fb16997635b35f07b22fe0974a18c7304b72ad526c5418a5603d315b2ec2667621dfcdc6dcbbf4245739109038a3da179a
EBUILD sudo-9999.ebuild 7420 BLAKE2B b0b6e8f5e645b6a9b082693ebbfdb2f5ee6e5fc9564b0e74cd9fa03fe061f10c3816f3073bf2922cbfe6e9f8fae78f292fd0fdc1fec213ec6939e879e59259cb SHA512 f3f70b8015ee9a42261514c9206ddf8f91a1eb58a70fd67154884c972cbfec302135a0ae5a3bbfea99f28e953683bdf05deede217a91bf56dae78f385c1748df
MISC metadata.xml 1107 BLAKE2B a18b1d280445ea98ba686021abf08ab47a5ac590795018c125008f2a8e44f7ea45e256e32a737781030960cb984bc16d8fd23175fd1e88b294e5036c86085367 SHA512 8cacbd9a1a23fc7734c5ad8b95c769b8506ec35490b5e3f69439bf71bd51d1eaf04fe699a82cbb3ac56182195fff570d75e3b20c33d86774480a2939122752a6
diff --git a/app-admin/sudo/files/sudo-1.9.12-mips-build.patch b/app-admin/sudo/files/sudo-1.9.12-mips-build.patch
new file mode 100644
index 000000000000..d45393dba443
--- /dev/null
+++ b/app-admin/sudo/files/sudo-1.9.12-mips-build.patch
@@ -0,0 +1,33 @@
+https://github.com/sudo-project/sudo/commit/7944494196d4a9b33e0ae64a7e20f86e19c336d3
+https://bugs.gentoo.org/878401
+
+From 7944494196d4a9b33e0ae64a7e20f86e19c336d3 Mon Sep 17 00:00:00 2001
+From: "Todd C. Miller"
+Date: Wed, 26 Oct 2022 16:35:30 -0600
+Subject: [PATCH] Fix compilation error on Linux/mips.
+
+--- a/src/exec_ptrace.c
++++ b/src/exec_ptrace.c
+@@ -282,16 +282,17 @@ set_sc_arg4(struct sudo_ptrace_regs *regs, unsigned long addr)
+ static bool
+ ptrace_getregs(int pid, struct sudo_ptrace_regs *regs, int compat)
+ {
++ struct iovec iov;
+ debug_decl(ptrace_getregs, SUDO_DEBUG_EXEC);
+
++ iov.iov_base = ®s->u;
++ iov.iov_len = sizeof(regs->u);
++
+ # ifdef __mips__
+ /* PTRACE_GETREGSET has bugs with the MIPS o32 ABI at least. */
+- if (ptrace(PTRACE_GETREGS, pid, NULL, ®s->u) == -1)
++ if (ptrace(PTRACE_GETREGS, pid, NULL, iov.iov_base) == -1)
+ debug_return_bool(false);
+ # else
+- struct iovec iov;
+- iov.iov_base = ®s->u;
+- iov.iov_len = sizeof(regs->u);
+ if (ptrace(PTRACE_GETREGSET, pid, (void *)NT_PRSTATUS, &iov) == -1)
+ debug_return_bool(false);
+ # endif /* __mips__ */
+
diff --git a/app-admin/sudo/sudo-1.9.12.ebuild b/app-admin/sudo/sudo-1.9.12.ebuild
index 046d001b4139..d3e78ea71235 100644
--- a/app-admin/sudo/sudo-1.9.12.ebuild
+++ b/app-admin/sudo/sudo-1.9.12.ebuild
@@ -82,6 +82,10 @@ REQUIRED_USE="
MAKEOPTS+=" SAMPLES="
+PATCHES=(
+ "${FILESDIR}"/${P}-mips-build.patch
+)
+
src_prepare() {
default
diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
index e19e190da4a1..daf686afd287 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -6,4 +6,4 @@ DIST sysklogd-2.4.4.tar.gz 451938 BLAKE2B 218d9487440ab3fa395f596e5e4a9fa95df9df
EBUILD sysklogd-2.3.0.ebuild 2112 BLAKE2B 1f8cb90a6f5ab144eaebc6625b6ab1bffe003a1e3a1ce8e182da214f9bb77ddcfd2a59b95192f8b68230a2315003792bafd68aa9470b7e8412d3e735de32fd55 SHA512 0c2ab19307e93aee1773fd759c734de47869b555b2abe968e3db5ebfb6ad9bbc01c94d2be128fe7e1553a584bd69bbdb59919cd495a6d272022f49ddb486c39b
EBUILD sysklogd-2.4.4.ebuild 2100 BLAKE2B 9445ba98080898d1423312f377c871742a2d3c1cc14555418743cbe567d2e165dd1aca21ec8ce713e679a343140b914e140ea95c4d3eb58e7c704511d1a4ce9b SHA512 6098d606062db317788d64b74d0acdc5425c7dae3180c4a08bdca4c182482d3a02c05511604f00adb09175a10a6a99456c482f2aea1dc11921eaa98045902f39
EBUILD sysklogd-9999.ebuild 2106 BLAKE2B a8385ac39db7d3a9b2b92d338f4aab266f2773d6f53ef8fe479417477172fa25330cc61e95a51d7e640edf2488f5c3229161cfc8f5067c4cfa2d8034cef3da37 SHA512 b7e2e4f7b55e9d55ee01d4bc6541f87a8f9e4ab5c57d9a7686a9cfd4ec4591b6183e7f8b6a4574586c88e65c2abea60292d284ca44086fbe57ae0f1a70aacab6
-MISC metadata.xml 444 BLAKE2B 9225bc0d7317c6040d656f84c24818e3172741e79d3b2af8806061fe89d00ee1d278b2cf6168c3a1ee4bdf91bcb68ec08162e2340a7a9fffff2c4827b95b3543 SHA512 51daa61fe2af9155c526d2ba89e840867bcbdeb3c346c305fc812c1e8016c86e82c89578ab02c9ff46810a8a45894f4a0384097d07b7c571f0f55cfa2822cc28
+MISC metadata.xml 527 BLAKE2B c425ac629ecb84dc5e6df9d943d5366594bcfc95eac4f529720c97825f4192d4ecba8d3f5174110e654775faf368a73ef91117eb63123d09f5f6ae9880d6ddb6 SHA512 9a4deed01fed81180553cdac43d0a03967fea0aa2a1ce1747faf592abee998c8fde4744b5cd90adc3dbc324e62df7479c686297364010aeeafc09128981fee27
diff --git a/app-admin/sysklogd/metadata.xml b/app-admin/sysklogd/metadata.xml
index 820601cdf92a..deb7717010d8 100644
--- a/app-admin/sysklogd/metadata.xml
+++ b/app-admin/sysklogd/metadata.xml
@@ -9,4 +9,7 @@
Build the logger program
use app-admin/logrotate for rotating logs rather than custom cron scripts
+
+ troglobit/sysklogd
+
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 8398236cefc3..9a3218e9cbdf 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -10,8 +10,10 @@ DIST syslog-ng-3.34.1.tar.gz 5903489 BLAKE2B ae94dacb324f2db68fdaad6d41d1974e450
DIST syslog-ng-3.35.1.tar.gz 5901321 BLAKE2B 9ee93c22358703bc95c951f6fc9207da0291b3d5a6dedf0222302ca16576f49734d31891265c8c1d218a0308a76074301babbaa39b37e1564107e2ab6adf8a92 SHA512 7a0aa149d3e01b256e0f3168ceabebcbeadb0d8bbee6838d646cb425571b26330cccbcdd3a221f7b57a4605e875f48e48cd367825623299dc43d5ba77f94c50d
DIST syslog-ng-3.36.1.tar.gz 5968598 BLAKE2B b74536e20ae2a2eac056fe278f2e7973b3c97657cd80962ee551812633045dbdeb65fe34b66448d565a6f1b9edb2f1066fc1934d3f7ffbd43b9527a73a181e58 SHA512 b74c10e708616f7f5f5d529de5c1a3ce8ac888c05aa4b0fcf390d70082e9bc3432f3752998a5a258663fd47b8e4d0c2735240a3e4eda28178579b18308ebb376
DIST syslog-ng-3.37.1.tar.gz 6033219 BLAKE2B fe3787daec137d5eb61c6bf55d6066b642e7944738ec0655fcc7ddf8d0c841a734ec423b0710f424576fa78bbecfb1121475921e6f8bf896c10470c89dbf98c8 SHA512 beebd89c54a415469dc58630ac1900d632ef351f6a13fad4a95ce7bb1760b16d6cfdcede02225a35e97ebce7dae151c6aa228f3d378463e8b873c4f71ed86ab7
-EBUILD syslog-ng-3.34.1.ebuild 4875 BLAKE2B 67e9fec7003b0f0da9a90873a009f20ed3f4aa66fc33b3acb6bbfd0a317d380c1b2306b6043a135535cc44b7802568c611820eaf23fc4819dc7c8968286c8481 SHA512 1c5bd39853364a1e1dcc79e97ac88bc4bf38b4e94152eb7f4a8acafabca9da8e6a71a509b28658b92871672a1e518ca8ac2355515c3506a742e182c2eef04e72
-EBUILD syslog-ng-3.35.1.ebuild 4876 BLAKE2B 91ff5899b72a81743ab3dc7fb26076ce83788b2068e5ac7cc30ff5e375add7fb5f4957ed2e5e0320f80c47e4dc803778c3423079426649f6d47dc16bb7e7426b SHA512 24e3c0b98dd9b50e442d4be5fefa9fe12aba92847bc2f173ee59aaa27a75b9d1323566b3f2deea065ac7a3ef620dba11b1cf152206c77e650b1c55780be54eca
-EBUILD syslog-ng-3.36.1.ebuild 4885 BLAKE2B a6e10cd408691ee8aae45c2ffa874f870038673289b756fbce720db491bc87dcbdade0cfbde4e605fa1255664ab73282904d1522f744e2ba2cba65b990947c71 SHA512 1793e5bcb7ee2ad400c71a611578bac44f4c8a2cbf3bfcf2d8dce49ef44ffba198999a3b98895d1fd8d8a4ecba146a55441ec11527b7e52fdf38e0c1e54c942b
-EBUILD syslog-ng-3.37.1.ebuild 4898 BLAKE2B fd9245c70b04b247ca5f463acc0ed923b25aebef5716a92096ed218f739181884fe18d725ad0e53cdf0be2f0507b1336665a08994d4a0335d202ef169f50af8d SHA512 e208187804c1bb9fd62668c23fd3072c5305e7041299a98e4c1748574cbbc1384636137143967754a4e4f2f52bf9b1adf46adcbe3bd51c0e236308e40ec88936
-MISC metadata.xml 1283 BLAKE2B 22643ccf254541685f0b58255d42ef6bdfc4af8800b871f96cc2e17e1f7aa05c3380672fe293260a7a395e0e7431c81abed871f248805a6dda991fcb877400b6 SHA512 37610fc48a1e169c478250a36634afae6de03c49b257e27d81cdef3243200c1fb3a00b84d4efc8e30020f9a6c1f6ed5828b2444e4b92fa5801e15c3bece8e25a
+DIST syslog-ng-3.38.1.tar.gz 5405048 BLAKE2B 7819cbe0caab7f580ca9f71181c84d64da838a238a6f8b8b79c8816e37e5691e72e1284de57d5066d3c681d8751950e5a32d65a1b1af4e064dd82f2c59899fe3 SHA512 3a3ef5c72d8c211ed2914791380061dcd48ea1ea95f636a1a8649dc5dee731a11e9ae000a37cbeeba624f4053b623b697e6c7f945a81153106c2365f4f09a847
+EBUILD syslog-ng-3.34.1.ebuild 4889 BLAKE2B 1ae23a11a372441c56a361cdba6592551ac19ecb1595fdb8c30024ecade0139957c1c40df19444627e72d1498bf7665ae9212855bc244a57e76007298208a3f2 SHA512 62b1b068ecb483509e24233ded2d04478e98c218928e2cfb4cf13fca6cee98438fbe1fb4e5a85df3e6b839e0313e6555d5dfc405f93ee2698e30da3d7950ea41
+EBUILD syslog-ng-3.35.1.ebuild 4890 BLAKE2B bba9a0ec5902ed72742980909971a79f4ee4bc1cb4eaaf0db620be55b17680a7d8878a931d68889b42d7451b9b36035bf61b0a7b941f3d8f07972c3dd7221e14 SHA512 152d923c2909be1353093320ecd29b47c330fd81374bf51c2c454b0cb65bff192713a21859be25a0c5412a5ef7731affa56b7e6054082f5503e6b11c784f4d61
+EBUILD syslog-ng-3.36.1.ebuild 4899 BLAKE2B 2aefb6ee7b9f68bc1b9021866b648c0d03565709cb05b400c5133e1156dad43297277dce06ef9555c5797579650eca6444be6f68fcfc55d80c9fc82248a2493f SHA512 78b06fc516246d452ed5ff88f216ea1fc74e63719d2008fbe60be26946daec59d9aed57498c5882dde1eacfba1b5dc3b45b081b4772a699fd860441d0078a068
+EBUILD syslog-ng-3.37.1.ebuild 4912 BLAKE2B 42364de5ecdd051138ef0552363850348ff27cd61daaf862ab40857ecf51ece29fca8f2dc81f3c360c0f1d8c606fd3d7a1ab3baab097f52ac3c3c2696fccc009 SHA512 88539999285634ffb27146492ff342b310ecab24bf50e46fdc6715e8c9b73d8cf8356abef882f371c3074b8e769a4276f4a381559f1258f2e10bcde3ffdde2c0
+EBUILD syslog-ng-3.38.1.ebuild 4912 BLAKE2B 42364de5ecdd051138ef0552363850348ff27cd61daaf862ab40857ecf51ece29fca8f2dc81f3c360c0f1d8c606fd3d7a1ab3baab097f52ac3c3c2696fccc009 SHA512 88539999285634ffb27146492ff342b310ecab24bf50e46fdc6715e8c9b73d8cf8356abef882f371c3074b8e769a4276f4a381559f1258f2e10bcde3ffdde2c0
+MISC metadata.xml 1285 BLAKE2B 91f0ecae07c9131f516a2b9dd6b71d021c84cde055ec58b21734b36f540f65b02452ac20dffaac4a3edc8942ad9a1a1afc3c9837ea4775d40d0d8b3d41083316 SHA512 80924020dccf9bd8d1a83d995af57644eaab761204e2b75a3ef997a2b7582506ba25f476b6203446d116af841629520adfa1cfe443c6e1547755e72956161eb2
diff --git a/app-admin/syslog-ng/metadata.xml b/app-admin/syslog-ng/metadata.xml
index ba670d623e06..d14d65a0a573 100644
--- a/app-admin/syslog-ng/metadata.xml
+++ b/app-admin/syslog-ng/metadata.xml
@@ -22,6 +22,6 @@
Enable support for spoofed source addresses
- balabit/syslog-ng
+ syslog-ng/syslog-ng
diff --git a/app-admin/syslog-ng/syslog-ng-3.34.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.34.1.ebuild
index 1f9d4085ac77..d6092f450695 100644
--- a/app-admin/syslog-ng/syslog-ng-3.34.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.34.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ 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"
+HOMEPAGE="https://www.syslog-ng.com/products/open-source-log-management/"
SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/app-admin/syslog-ng/syslog-ng-3.35.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.35.1.ebuild
index e90b2ae809a2..370e085506e5 100644
--- a/app-admin/syslog-ng/syslog-ng-3.35.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.35.1.ebuild
@@ -8,7 +8,7 @@ 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"
+HOMEPAGE="https://www.syslog-ng.com/products/open-source-log-management/"
SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/app-admin/syslog-ng/syslog-ng-3.36.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.36.1.ebuild
index 18cd7826fd7b..bc68263f9a85 100644
--- a/app-admin/syslog-ng/syslog-ng-3.36.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.36.1.ebuild
@@ -8,7 +8,7 @@ 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"
+HOMEPAGE="https://www.syslog-ng.com/products/open-source-log-management/"
SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/app-admin/syslog-ng/syslog-ng-3.37.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.37.1.ebuild
index 6914d08d03e8..29cc2377063b 100644
--- a/app-admin/syslog-ng/syslog-ng-3.37.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.37.1.ebuild
@@ -8,7 +8,7 @@ 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"
+HOMEPAGE="https://www.syslog-ng.com/products/open-source-log-management/"
SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/app-admin/syslog-ng/syslog-ng-3.38.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.38.1.ebuild
new file mode 100644
index 000000000000..29cc2377063b
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.38.1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit autotools python-single-r1 systemd
+
+MY_PV_MM=$(ver_cut 1-2)
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="https://www.syslog-ng.com/products/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 ~loong ~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} )
+ test? ( python )"
+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/bison-3.7.6
+ 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/system-config-printer/Manifest b/app-admin/system-config-printer/Manifest
index b662d8db02a8..bdea13d95416 100644
--- a/app-admin/system-config-printer/Manifest
+++ b/app-admin/system-config-printer/Manifest
@@ -2,4 +2,4 @@ DIST system-config-printer-1.5.16.tar.xz 1382124 BLAKE2B 37548bd470f8e80026e014d
DIST system-config-printer-1.5.18.tar.xz 1396808 BLAKE2B 910e853829ee876edc597a3103b5ab857b3b8c1cb87096f25213b1088e35d9f4d320dad61f55b530283a7650b07abe028a53b4e144b33b1b66c733cb2caa8011 SHA512 33dc9c52d92f4234e055fb10a99cadd58424dcdb62554797b44bdd5319f1c3662bd2fa33417ac3a3f5ec51216d64e81e1897f3e671eb49f6be34057d7c38f3f4
EBUILD system-config-printer-1.5.16-r1.ebuild 2074 BLAKE2B 6064a0cccc81f78fab6769164ddc870adbf2e2472421f162c0d6aa7bec9a67a8ed1cb19e7327bf8835b051a710fe5aeaca49b04722db40950631c23368728990 SHA512 0d077bc93964462ff9a79ebfcce6c5bef72e15bea4790549c9318bed814a7bf6b2702a7acd57c680010c1e76abb316099e54e53fd427985c6359c80a9ff1a3e6
EBUILD system-config-printer-1.5.18.ebuild 2079 BLAKE2B c71d502bb5cb4e41b2e43faf2db3cd1e73cf0a12271a7aa7ae57d0052e36ff91ddc16af1fa2f4c0e0193c344190096356e91e4130bbfda4a54560f743505b82a SHA512 ebea287b17f3528335eba688f436a0518e5944af93ceaf3ce41892c5c8bf32c88760383ad3d44a5421024c0e0bec061b56a7b7bdd3e2b81bee35f1b7ce0fae3a
-MISC metadata.xml 464 BLAKE2B 6b9e1c83ddd541fa865336261d248c43e24354dbe1fdb585436bdaacd6cbbca9949b54961c0ad32220326b168650c377862640c50c2f40ad61106fbbb59fa3c4 SHA512 20f80adda8d894d92410585732a88565196b6cd10177bf5ed93966cf450d6dced89f46a840fd5c5ce26a9d7ac2fc42e59fbb8f789eb1f7f594e95da7a0cf60b8
+MISC metadata.xml 597 BLAKE2B 4691f7f385a864b26ed00b5d05310d45aa52d1cbcfb118ec4b1323df470a761162bb7c037cc8eec253f1dd5302d0036379044e83257ba6be43d878b28ebf11e6 SHA512 e4b52d3a4070116472e4fb617796a7cdaef0b3cfc825ccdc39392b5ba63afdedad4232a9eacf89c209a3202d95c2c0cadf17ae8d3698d2e2258310cebfa89744
diff --git a/app-admin/system-config-printer/metadata.xml b/app-admin/system-config-printer/metadata.xml
index b1e4e8c877ae..e34a1cb28469 100644
--- a/app-admin/system-config-printer/metadata.xml
+++ b/app-admin/system-config-printer/metadata.xml
@@ -1,16 +1,19 @@
-
- reavertm@gentoo.org
- Maciej Mrozowski
-
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
-
- kde@gentoo.org
- Gentoo KDE Project
-
+
+ reavertm@gentoo.org
+ Maciej Mrozowski
+
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+ kde@gentoo.org
+ Gentoo KDE Project
+
+
+ OpenPrinting/system-config-printer
+
diff --git a/app-admin/xtail/Manifest b/app-admin/xtail/Manifest
index fa9d58c6a6c6..7ead38adde75 100644
--- a/app-admin/xtail/Manifest
+++ b/app-admin/xtail/Manifest
@@ -4,6 +4,5 @@ AUX xtail-2.1_p8-rename-configure.patch 841 BLAKE2B 78a524fabd83ff46a1e2288bcd64
DIST 20120219-patch-aalto.zip 4991 BLAKE2B 6b3e228508bb12c1e18f3d2982c1bf23c996e1be231b4b08b640a310f9c5e9642b9f6ea25d45c717902cdf1024509fca6d804f8e64d3bb764eac8bc3e9bd0846 SHA512 ae20448944e25aa04879bdab8d61bd910b1aa6f85c3d8287e712c6d37b1154af480edc6569467e31b3b404d7f90f771ec3e4c20c58132d9125303b40a6f102f2
DIST xtail-2.1.tar.gz 26769 BLAKE2B 9a5c47810b2a8cd7aa4d8cc543ec9edce7a24ee446627f658063547276a43dfb72503f10c4d2d6a35f25415a32a2aa177dc5fde79e8ed834cf8ade5aaf9fb447 SHA512 a8519969ef960af97c4dcb75c679daa5687f553c909817ede1134dfa5d70ed71c5264f0e61c8c579cc253ccb7739a68c5213811169489a98e676ef8941d9446f
DIST xtail_2.1-8.debian.tar.xz 7168 BLAKE2B c04a239aabd307f36b983b83384ace6f7abbe7215f84921da159da57b338affb9840e3bfb9886121fd140e1a412f017cfdc1f22afe2ac8484fc1d8b641ef196e SHA512 6c00f87f905a94c579085e5f18e27fce94642d0a5a1376deb618f464a9ca6bb2f7ac0529ef7a2439b28c5314de7ee733f86dda0d7577d3575ce085e2a02c39fc
-EBUILD xtail-2.1-r1.ebuild 755 BLAKE2B 31ca3dd7ee5ebeb9fbcb28be16bf5d127b4ebe813b6988a1a0c4b5e752cadd2a3f8710640db0627d7d5cc33c82ace85191b1de32d8865fef0c737a92fe020e19 SHA512 190a8e7362c30ba5d1d53048859c64194db7e40d8a4fc1bab9e061ba8747524d9b1e9f0b07b80a63d0f6b0504e8666c89a28b53c07be884a0c67f76d88722c10
EBUILD xtail-2.1_p8.ebuild 1025 BLAKE2B b3fb0bb8057fa1203c6e40269910e0019782295e850dec3849eeaa979fb05676afe25bb8cb69e7f05c6e2aaecb813090c5d74e02bb2e0301fb779df57222ae70 SHA512 81f4a8c132c50990ca83fe527e22e5ffedf9ece7dc7e79b6946dc7a8b89177f80cd452d625816169f1b1cec1f95d3181c1ae0ad41a6792ca154e5346ae561776
MISC metadata.xml 391 BLAKE2B 5e2a05efa60fb020077edf3a5c4dc026ab1ca6d3cea217c4252ae18b175a4ba5fcc7956ca079aeab704f187105839ea2f35e330567e8d47760cff23562f2466b SHA512 786871c7f378de616b4a0dfb8222fb1ec744886c2919e364f2bc4b783c46d4e6f394a463556dcae7d6bed678886c9aefb98d71682e38ab126b8f823e0d85f607
diff --git a/app-admin/xtail/xtail-2.1-r1.ebuild b/app-admin/xtail/xtail-2.1-r1.ebuild
deleted file mode 100644
index 9f010062d31f..000000000000
--- a/app-admin/xtail/xtail-2.1-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Tail multiple logfiles at once, even if rotated"
-HOMEPAGE="http://www.unicom.com/sw/xtail/"
-SRC_URI="
- http://www.unicom.com/sw/xtail/${P}.tar.gz
- http://www.unicom.com/files/20120219-patch-aalto.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-PATCHES=(
- "${WORKDIR}"/0001-Use-ISO8601-Fix-Gcc-header-Use-C-c.patch
- "${WORKDIR}"/0001-xtail.1-remove-SIGQUIT.patch
- "${WORKDIR}"/xtail_2.1-5-debian-local-changes.patch
-)
-
-src_configure() {
- tc-export CC
- default
-}
-
-src_install() {
- dobin xtail
- doman xtail.1
- dodoc README
- newdoc ../README README.patches
-}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 21088578b95c..0e682a5b087b 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index 13c97717083e..7d2a22810ce0 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -9,4 +9,4 @@ DIST bzip2-1.0.8.tar.gz 810029 BLAKE2B 22ab3acd84f4db8c3d6f59340c252faedfd4447ce
DIST bzip2-1.0.8.tar.gz.sig 310 BLAKE2B 0d702dcb19f7738da9f05ee9d719f5cd3653540365e78db143404e599ea54bc6f9d5e6a38cdf5cdd3c6550243d34266343467c6b1db9d5d3c134f9353b00f395 SHA512 4a4a3fa0ec1c10a704b9870e8e629fd007cca55184423c6bfc3049a702fb41e4aeb73bfe9ca7442c27d32d278f1f34f27523a6be67d35b37896acdded12bf40d
EBUILD bzip2-1.0.8-r3.ebuild 3343 BLAKE2B b0b9c71705eb40decdb293ac36edfbb9beb03a5d418c9397d575182b1a41b885fc2dffe57fcd2bc41320eb957e87daf4e4b05a534b0b696e1a4cb14bb1862edd SHA512 0d731c721a9c2df13a70ca40a13ce4cffb4f91dfc2787dd5e86fac97b3dc2d1e6bc0e86d58d50905a39b31d08c1890d02478ce61e5f04fbefc895f2113b4f3ff
EBUILD bzip2-9999.ebuild 1362 BLAKE2B ef5a5447c068dea75b0ffce542583532deee44154ecfa9946ad3a21bb0a4bbd5b09c04d92bffe3da7d77c5f62d2d1200f92436923b443ed8f7e79313f5476db6 SHA512 392f1dee22e823b5973a0fe7c023b48c23769aace842d299a0389ace5ab7809fc67f76fe4e7aa28ba16a404c843a3c54b39ef97043ba89db3586a1e2b0940281
-MISC metadata.xml 333 BLAKE2B 88bbfff022309d663b728da241623e9a9dd2cd00d4638cc97c4809433a3645421239d2f51360f9d848617891e7600ad6b63b17acf8c6ecd65a4e355dc1372084 SHA512 15620686ec250b2547fc7ff369c9c0854a7217e731da556db1224896cfd4e63eba836469722b12115e359a9701acea0ac09d7ecc89fa1dbf8683106432f1f9bb
+MISC metadata.xml 384 BLAKE2B e74083bed23efd0279d23ea4f9fc048a9a0c253d48757f74a6c0044f5ca6a6b4cb86908db25d42f304b72a8dbf4c3627371ad6ab69aeab9267e8eb21c2053898 SHA512 c358db6bdaabfa401452ceaa8f85298b75ae00e5f7f189768741b4c74ed123be79405c03c7b94707db29b7d60710c441d089c10fa511262ad5a88cd106fb54f4
diff --git a/app-arch/bzip2/metadata.xml b/app-arch/bzip2/metadata.xml
index 87e613c2ed69..e3880e673f7f 100644
--- a/app-arch/bzip2/metadata.xml
+++ b/app-arch/bzip2/metadata.xml
@@ -7,5 +7,6 @@
cpe:/a:bzip:bzip2
+ bzip2/bzip2
diff --git a/app-arch/cpio/Manifest b/app-arch/cpio/Manifest
index e6134eb74a47..8daff37d7c3c 100644
--- a/app-arch/cpio/Manifest
+++ b/app-arch/cpio/Manifest
@@ -7,6 +7,5 @@ DIST cpio-2.12.tar.bz2 1258605 BLAKE2B 4b6d42a1d8aaeaa980cab5894b2e264451e96a108
DIST cpio-2.13-CVE-2021-38185.patch.xz 7844 BLAKE2B e338950e03c3eed3b4288435c9c75af8f0c3497b43680be4ee347e628db7cfac616b437a848094bf82cfc2c7f29d59b388bf0f6368b3b99770022e3f9533be11 SHA512 4d2cafefcd1ae9d86cb5171de2896799713490dfd9ed27d3dce0886fa4588c8df2b16ad8508a5dbb9155c9de6e40b6d1083bdb4774d967193a270a1dcbe37a33
DIST cpio-2.13.tar.bz2 1354559 BLAKE2B 45d77723acb55f15c8574ab5a2fdff6fb1767629d177dd3416b0268e9f82ee6bdd11b4fa591ef020efccbdc3f4918cf77263169da1a0f6422dfe1a9712295778 SHA512 459398e69f7f48201c04d1080218c50f75edcf114ffcbb236644ff6fcade5fcc566929bdab2ebe9be5314828d6902e43b348a8adf28351df978c8989590e93a3
EBUILD cpio-2.12-r1.ebuild 828 BLAKE2B dbb7332b54ed751015b8e17c687f088344244543447ddd6f7bd1c66caf0af578f4fe96a8fa0389009aafff3fec0f9a433334dd4c4b047ff9bc0ef675542d2ef9 SHA512 803b31960635ce881ec7c2ce3a3f4e7176899d000c8e30c7a00ab9597c1c09a291e2f6b157226d41e527be740b9b54c7f1655641c52e395351611db7b61944cd
-EBUILD cpio-2.13-r2.ebuild 1159 BLAKE2B 22b32689c424595ca277f9c090afa22d375967c45c5c4b49fcad4cb9b720b585940be056b419b0d6f5f1b1e4d4f975392173ec74bc59646c57b7da5b1f296f71 SHA512 ea6bd48e0dfd7475bbc094f81217ae0af9892d70844b433c298c82c90943a786f07fbb5b98f4cf2fc4c514b8ca3d7df4128e2c7649d81534ca4f0d4c803bf3bd
-EBUILD cpio-2.13.ebuild 819 BLAKE2B 0c7c7f0166c1557cc7ad9cef1e471e5a24cb9378682b7a4fc204e9eeddaa0edeea436f5de2a1a58abf9106e4fdbb743b4161df45a6d1a2285251a197e200e15d SHA512 fac44856237a01f8284526ed1743220c4cf5bf65aca048a6d6bfe69be9c27d23cd6a820716950734f1ed4347c5b2e17808420d9517e01f5e73da3e6a203e5982
+EBUILD cpio-2.13-r3.ebuild 1364 BLAKE2B 0928510f98e6ad7ad51c7c0de3f488284f59d9c5716806f185bdd252ceaa9e3c1930de501c5ef5f1a17629b0c8347965d6a19b5cbf80dc4831415b82d12ab1ac SHA512 8fc572c47585462e46ea60a8aab904494b1fe5075117115736d479c21c3e9e875355d00e6544f337fb3265e66677af38ee63f32859130f083bcd6d682c98ca78
MISC metadata.xml 328 BLAKE2B f8b8bff5b160351a92837553de20eda1da31a6c0594c1118e1f71b3cd19d9ea8d3420bdce943d83644f5ffc234950f95fb9229a213660767dc5281120085b26f SHA512 08e1c6a03b894946bf6332bf46c8a7534ed0998777b30cb9eecb9c746bb333b65fb41dfeeb6938cbc08d0ad0a303d752ea70a6a6a6ae2c5c2935b2b4e4d9928f
diff --git a/app-arch/cpio/cpio-2.13-r2.ebuild b/app-arch/cpio/cpio-2.13-r3.ebuild
similarity index 68%
rename from app-arch/cpio/cpio-2.13-r2.ebuild
rename to app-arch/cpio/cpio-2.13-r3.ebuild
index c3924649236b..a09ffc983c4c 100644
--- a/app-arch/cpio/cpio-2.13-r2.ebuild
+++ b/app-arch/cpio/cpio-2.13-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-CVE-2021
LICENSE="GPL-3+"
SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~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"
PATCHES=(
@@ -34,7 +34,17 @@ src_configure() {
$(use_enable nls)
--bindir="${EPREFIX}"/bin
--with-rmt="${EPREFIX}"/usr/sbin/rmt
+ # install as gcpio for better compatibility with non-GNU userland
+ --program-prefix=g
)
econf "${myeconfargs[@]}"
}
+
+src_install() {
+ default
+
+ # make cpio a symlink
+ dosym gcpio /bin/cpio
+ dosym gcpio.1 /usr/share/man/man1/cpio.1
+}
diff --git a/app-arch/cpio/cpio-2.13.ebuild b/app-arch/cpio/cpio-2.13.ebuild
deleted file mode 100644
index e2628b6b7e94..000000000000
--- a/app-arch/cpio/cpio-2.13.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A file archival tool which can also read and write tar files"
-HOMEPAGE="https://www.gnu.org/software/cpio/cpio.html"
-SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.12-non-gnu-compilers.patch #275295
- "${FILESDIR}"/${PN}-2.12-gcc-10.patch #705900
-)
-
-src_configure() {
- local myeconfargs=(
- $(use_enable nls)
- --bindir="${EPREFIX}"/bin
- --with-rmt="${EPREFIX}"/usr/sbin/rmt
- )
- econf "${myeconfargs[@]}"
-}
diff --git a/app-arch/createrepo_c/Manifest b/app-arch/createrepo_c/Manifest
index 8b438ad5c034..ae0f44d71033 100644
--- a/app-arch/createrepo_c/Manifest
+++ b/app-arch/createrepo_c/Manifest
@@ -3,4 +3,4 @@ DIST createrepo_c-0.16.2.tar.gz 601935 BLAKE2B 8b9f279d97744e9eeb68cfcc7e9a229ab
DIST createrepo_c-0.20.1.tar.gz 614968 BLAKE2B 8eb35c121e1beaa960310d10bfe616799b3a6b13d99f1e8c9d4077975cc929c9f786dec7d26a17d7efbd1859e2e7d8a614147c36a0a82c87f1c1c1a652afa6f3 SHA512 54a2cc7c7cd3f3b9a0c23cd8c136ae1331e7fa7cc995189088e7e6f2276c78b2b84e21c2a2b93f4528b5e9e4018dd6525262c8aaba3bc8a1412a51dfafd101f7
EBUILD createrepo_c-0.16.2.ebuild 893 BLAKE2B fab974fff5538cd99a0d05962e64f7a2e281b550ace9ef60be73de72dee03e196da3b72a1efc0a506034722e530513c07c3697285c8ecc7256451c2e35882f75 SHA512 ad9a48768e0ee3ecc59ac12f31e06d3387a7ae9d514b0a02420de01d503a5ac870012799f00b2287c17d3db64a26adee53e27eed9baab0a1944bb88d728228fd
EBUILD createrepo_c-0.20.1.ebuild 978 BLAKE2B 0206efeb167f932d0565005e5d8e274d4251adf4dd8d46672a9652906b2f901d459103b3beac7eecf7f79a50d4c81afa19c27b3a989b4f45612f76a281bb7ddd SHA512 18e5a7aab9240fcb8026d0a25709dcccb57fe1c4781895e1e649b673a913b11f8dd7d3d2ff9c8347644707f0a4147bf47d7d99a8ad1a9af36ad3e3e4fe489c26
-MISC metadata.xml 355 BLAKE2B 0f1f9a26467829205a7a6306a869c967b7d815b31dd4597b3a0e7b0b770cc3b8bc26ce2617e26497037b1a57f6fe74d2161a9f8b86c07a755b430d79ffc6d64c SHA512 9dbcd303be654dccbc854247225199eeef70f5cc7c3fcaaf8b097c4bc6bc40c2a50c9fc3053ca4d24db5c224411afb51457a8d0510255568d9a62a1cd450ae7d
+MISC metadata.xml 456 BLAKE2B 3a11a7c27b90c9b0fbefa878722da0c6d79a63c6e2f0a913a7ab1b409746cd7ab6c35631d9d19c3b0ed76e20bf02e63d4bff77ae46da0663cd096334bdc7f92b SHA512 65bc8020ece881e15fb1a0c9da195033bc0cdd780508500688ba500eab54359a9aa6f21bb071613c6cf240977ed52f94472c18869df538ac04caa2732fbd1e08
diff --git a/app-arch/createrepo_c/metadata.xml b/app-arch/createrepo_c/metadata.xml
index a8e77b1ab467..142bf59db6a8 100644
--- a/app-arch/createrepo_c/metadata.xml
+++ b/app-arch/createrepo_c/metadata.xml
@@ -9,4 +9,7 @@
sam@gentoo.org
Sam James
+
+ rpm-software-management/createrepo_c
+
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index 429078b78738..6db9d5aad4a4 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -3,4 +3,4 @@ DIST file-roller-3.42.0.tar.xz 878968 BLAKE2B af3a8bb566a0549434f20911315358dbcf
DIST file-roller-43.0.tar.xz 894308 BLAKE2B 85bf73947e153a3b40507e524c35f8be98a08a9ce5916e24ef44559400d7d44e4e0fbd94de8b5638fd1da967ff007894011624ccf9ad8c3481cac63aba3da6e5 SHA512 dff3d9ef5c96e5957fb4ca146072b5fdf0309299d0b1a4ab6db55e24a0652b52ba45915121db4d59d9b1ab60b4c3c64bbb56799a46a0eac5609236f4e1251837
EBUILD file-roller-3.42.0.ebuild 2244 BLAKE2B b36266be2187e3472bd06cd572982f9cb543c31192e847b91d1921b6b9c779a7d40727d8477735146ce0666fa9de68bc725d49b0d279233877c242a62bcf74d9 SHA512 e199dd0ad875976b75c249b51e86070a0fb5f0a4d9a4af93e5e78198246f609c8d65043fe0b5541823be6c7d37543f85e35664f568f67c7b22c026a7e13472a8
EBUILD file-roller-43.0.ebuild 2515 BLAKE2B d11277cc7069f9c5f65d121ab62f012cb77a8469456491ad2069d5db01823278475a0799a8819173b489fd22abc60e532294a54aaaf8b235f40ae5a4d4f48bb1 SHA512 805ff69fbf24b4743c883de736f5e3b9706ca9c4cae5413576dbef9b3c22f228ffc25c3c75a7fb85837a198dfcf3d5b4b8ae9f784df6192c99ffa4cd3a28ff22
-MISC metadata.xml 523 BLAKE2B 44d1f4c6636070d561c1d0fdb6bfaaae0f92b81608f52de78f6b5168ca717a7ab0c54ca24a8bde59cd7a7e0be96f195bd8f7eb5e53e820917fec5cf692cea7ec SHA512 79b172bc5f64b91f389c6dee90da6dca10705f07fd469b04486eb90d11988a07002233c0718c3f223df9fd63050b3fb17dc3d5f56b8923e47dfbcc231834fdc9
+MISC metadata.xml 544 BLAKE2B 395aff0ef64dd1ae52ecf07df0a723454f648ae54468c611a3d3c10c2930bf25413f892a02dca15dad5930ad24baa45adb2df41e740c4d2dbdce9104f8f89e0d SHA512 3639aa10a6e40e9ea901842e40b9e33857254a00f84aa61403fc663e8ef1f356850d77ffa9ee61c7fb05a1152a9cd1ab0adb972edd3d1020308da06680a64410
diff --git a/app-arch/file-roller/metadata.xml b/app-arch/file-roller/metadata.xml
index 9f23dc396c05..95e520228548 100644
--- a/app-arch/file-roller/metadata.xml
+++ b/app-arch/file-roller/metadata.xml
@@ -1,16 +1,15 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
-
-
- fileroller
- cpe:/a:paolo_bacchilega:file_roller
-
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+
+ cpe:/a:paolo_bacchilega:file_roller
+ GNOME/file-roller
+
diff --git a/app-arch/gcab/Manifest b/app-arch/gcab/Manifest
index 1abb0a3d29f6..e5c8b69266d9 100644
--- a/app-arch/gcab/Manifest
+++ b/app-arch/gcab/Manifest
@@ -3,4 +3,4 @@ DIST gcab-1.4.tar.xz 78240 BLAKE2B 8b857c116fab636db93463cee7d6b809c3c7b2bdf3896
DIST gcab-1.5.tar.xz 81728 BLAKE2B ba1793a8374e2dac412ca2807343781013f5be8d79e444ef0a136fbf903dd9a47809b3dec4703ebd19d196a7046a0c8405ae8463c2f7338fdc5eaf979436e8e1 SHA512 2a9b7d2720abbb5527d478ac760898ae254d08b7aa929fbb21753296e5a07c51d62e134a3f8b1b21d9b557d4093505194e09823ddbaf58465d37b372f37534b7
EBUILD gcab-1.4.ebuild 1123 BLAKE2B b8169f5333b10bb26ec27ce57bb3f471c96fa9678bd7ed58db34a18a938054373e07ad8d8e2e9f2b585c2acd054f337219cce083eda6d4516267dbf136767023 SHA512 70ad8b8ec248aebb03e3806e50db1b370a7040ebec8e16e481fd343591fe20f84a160b1a476acc185c9acd70f8c3de7e993d307a3f14cd793691651c49249ebd
EBUILD gcab-1.5.ebuild 1203 BLAKE2B 9c045a7fbe745907a30b02b061ad4e2c4793fedc1dff32db73b899e4c4a6ca7858090fab8207cf71b823044e7498fe4839da8a343c14b57a8b1967ad44f84af4 SHA512 4e6b0d75d5682950d3b9cb0ff6223ac37d378b6d70fb251285eff834466670e79c53e60844ec5f039c759532223b5bb688cc6f19e5092ad754a57117ac575f62
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 345 BLAKE2B d32d83f8c7d6db7c4d0c22125c547f3e838fd8154b2aa80c230ecc9c64a5edc84814f50bbc159c5921fcd767eea8c2eb65e08217eb284094a6fe122ee5a1e34a SHA512 83301d336de47bf8ab99a9b50097981433220039e2769c4dfe4779a7c2309fa69e5613fa209470f19e21de17a40177757e6abaa73c58f4145f0ef7ef1f1af5d4
diff --git a/app-arch/gcab/metadata.xml b/app-arch/gcab/metadata.xml
index 7b343b06be8a..ca769f6cf4a9 100644
--- a/app-arch/gcab/metadata.xml
+++ b/app-arch/gcab/metadata.xml
@@ -1,8 +1,11 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+ GNOME/gcab
+
diff --git a/app-arch/gnome-autoar/Manifest b/app-arch/gnome-autoar/Manifest
index 842dcf97b5da..a2f98e311086 100644
--- a/app-arch/gnome-autoar/Manifest
+++ b/app-arch/gnome-autoar/Manifest
@@ -1,3 +1,3 @@
DIST gnome-autoar-0.4.3.tar.xz 50860 BLAKE2B ab7360d422e3f2d06cc00d765c203e6472a50d8cd9c220cc87b6fc40ca9bdfc3677a2a7d50b383b8f195bba1ffe72773b23773f703cbd24e5768f0f907790e10 SHA512 9f1ba584c4fc8e82d842fb21d3a113d64faa85f8f27cb7afb5d09919f510e350608b6a4e2f3ac527162ab338d008271bd430fb5b8ead265098c1810ffcbcef30
EBUILD gnome-autoar-0.4.3.ebuild 1113 BLAKE2B 986bf33ec6114f06370df787b174ed4b661d6d1e67daa85a345c8b378b7ad382a384ec9533a6fe8537a2d37873e0d7480da96332d6c6da564472604d52350990 SHA512 d07257ec3fbf74eaec67079b3b0033d84ac911108accf70cdfd5c17827f502bf7f83762b489bb1144fec01e2fb53163fd22b3cc2187c09e92b2dea90cf4f7962
-MISC metadata.xml 465 BLAKE2B 11413058ead980c52d3389e3aeb7daf756c4a39e3caddee888e4da23e32490e912debf6448ff4a7d0222132545ec9bea295018d9c438475cb920e24cada3d81c SHA512 082d48f638537b52bce8cd7dcf3ac68cbd01cc5f4ab2a6a4dacf25e28c062bcd6cf7f20cebb9f1ad23ed4ce33ee9dfd1e5bac59965ea200ed28c1bc095a3510d
+MISC metadata.xml 568 BLAKE2B 9080855f261c70b0ec720b1d4cfd72910991625e83504813107eba7782275e26726352298c893c9688f78e10f1d9db2f4a5e18e45594e79513b101fa33f8cc24 SHA512 58985c869210ef88e0f49af3dd8e8f2cc09bbbf3998098f44525cd4be856fffe32a159bf7ebaf7cb9bc45d2f2be9ae17589fa5ecd3f5a0f1b7cc0611d8281525
diff --git a/app-arch/gnome-autoar/metadata.xml b/app-arch/gnome-autoar/metadata.xml
index 98b32ae2f3a4..28848d12a0dd 100644
--- a/app-arch/gnome-autoar/metadata.xml
+++ b/app-arch/gnome-autoar/metadata.xml
@@ -1,11 +1,14 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
-
- gnome-autoar provides functions, widgets, and gschemas for GNOME applications which want to use archives as a method to transfer directories over the Internet.
-
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+ gnome-autoar provides functions, widgets, and gschemas for GNOME applications which want to use archives as a method to transfer directories over the Internet.
+
+
+ GNOME/gnome-autoar
+
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index 334747e481cb..27ec9baa8836 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -1,5 +1,6 @@
AUX rmt 263 BLAKE2B 7535dd27d5ba367066cd519dee06f053cde9d4f1e86728059935fb80e9a9880e7a934076949af54e47ee7de3f91452f2c642780e7d56619f166574633d1e4759 SHA512 2f1a9d3a522fc1f0d5385d1ea4c27da88a1c9357b866340432c6310604c01d3e328e33080ed1e951c0da6f025c3ee2a0c9f170d4b86a1d235ebb56be48fef152
DIST tar-1.34.tar.xz 2226068 BLAKE2B 741a662457509a6775338ffe5d2d84872fcf38b93ace70c8b748a81055b9b62f65a48c4e541955d08ae99e6f528509e89eacd7c799a65bcc3d017a259110c115 SHA512 5e77c4a7b49983ad7d15238c2bce28be7a8aa437b4b1815fc00abd13096da308b6bba196cc6e3ed79d85e62823d520ae0d8fcda2d93873842cf84dc3369fc902
DIST tar-1.34.tar.xz.sig 181 BLAKE2B 2fae91293a9dacda0374706e1f83498042a9d5224f80f6f0e14abdb914cb5a8e980f720eb4a453485844c7fe26e0525f230c0eab11c7fa89159a1a929370795c SHA512 55297f41549deee511f5b14c6b5dc7bb3d9282dad52bcc85f9dddfad24b677f989ba86387ad9b133c3698feedbd6b6cd7e9f005e8e4c89f72c80543eeceb78f7
+EBUILD tar-1.34-r1.ebuild 2217 BLAKE2B 37c22ae778857a27fa5a1d5e11842533ea3b546a073472707ed7df4f5c70f5c26554eee6b32d2d2e4dc3c3c0d6dccaf11ed8fb82464c0071df8729655f8e4e15 SHA512 eeffe0637d8a5ad354dd5f7a347dc52ebd82b8b359523da872e918d02a299771b9acd0e614e1a7aea1c138f261f66017352cf26bf93428072c94aea29528eaf8
EBUILD tar-1.34.ebuild 1970 BLAKE2B a09388c9f7daa6a088185230d456add799c9e1aadf7c9ef96c984599fe7561de7b74ff6d265d0019fe62ed5347605413a329c65c79db4f32c16e881692013974 SHA512 c2f47fd426b78f8e077e9b08b68ab32b65fa9b4a9fb64493d171e81042b5e95455d9850b53f9a1d08c58d07bb2bdcda0b3b57ba1721ba452b5d2b0da03696787
MISC metadata.xml 388 BLAKE2B 85aba561c0c0ad8c72d8d33f66ef6504bed7747957059c19fc5b0267b048bbddbd1112239bd4d3bcdf1c2f465018a2128e086a253253205dd7b815c11f3cc6ca SHA512 83e4c69e150b6420ab2ef4b777d930fd5e0f5cc1244bf8cd9a7cf0f867219100578a4777043fccf5f95a6a44ee264b88381d94924f4f18c80cb2ff339efbce64
diff --git a/app-arch/tar/tar-1.34-r1.ebuild b/app-arch/tar/tar-1.34-r1.ebuild
new file mode 100644
index 000000000000..35df40e4465b
--- /dev/null
+++ b/app-arch/tar/tar-1.34-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/tar.asc
+inherit verify-sig
+
+DESCRIPTION="Use this to make tarballs :)"
+HOMEPAGE="https://www.gnu.org/software/tar/"
+SRC_URI="mirror://gnu/tar/${P}.tar.xz
+ https://alpha.gnu.org/gnu/tar/${P}.tar.xz"
+SRC_URI+=" verify-sig? (
+ mirror://gnu/tar/${P}.tar.xz.sig
+ https://alpha.gnu.org/gnu/tar/${P}.tar.xz.sig
+ )"
+
+LICENSE="GPL-3+"
+SLOT="0"
+if [[ -z "$(ver_cut 3)" ]] || [[ "$(ver_cut 3)" -lt 90 ]] ; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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
+IUSE="acl minimal nls selinux xattr"
+
+RDEPEND="
+ acl? ( virtual/acl )
+ selinux? ( sys-libs/libselinux )
+"
+DEPEND="${RDEPEND}
+ xattr? ( elibc_glibc? ( sys-apps/attr ) )
+"
+BDEPEND="
+ nls? ( sys-devel/gettext )
+ verify-sig? ( sec-keys/openpgp-keys-tar )
+"
+
+src_configure() {
+ local myeconfargs=(
+ --bindir="${EPREFIX}"/bin
+ --enable-backup-scripts
+ --libexecdir="${EPREFIX}"/usr/sbin
+ $(use_with acl posix-acls)
+ $(use_enable nls)
+ $(use_with selinux)
+ $(use_with xattr xattrs)
+
+ # autoconf looks for gtar before tar (in configure scripts), hence
+ # in Prefix it is important that it is there, otherwise, a gtar from
+ # the host system (FreeBSD, Solaris, Darwin) will be found instead
+ # of the Prefix provided (GNU) tar
+ --program-prefix=g
+ )
+
+ FORCE_UNSAFE_CONFIGURE=1 econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ # a nasty yet required piece of baggage
+ exeinto /etc
+ doexe "${FILESDIR}"/rmt
+
+ mv "${ED}"/usr/sbin/{gbackup,backup-tar} || die
+ mv "${ED}"/usr/sbin/{grestore,restore-tar} || die
+ mv "${ED}"/usr/sbin/{g,}backup.sh || die
+ mv "${ED}"/usr/sbin/{g,}dump-remind || die
+
+ if use minimal ; then
+ find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \
+ -type f -a '!' -name gtar \
+ -delete || die
+ fi
+
+ # make tar a symlink
+ dosym gtar /bin/tar
+
+ if ! use minimal; then
+ dosym grmt /usr/sbin/rmt
+ fi
+
+ dosym gtar.1 /usr/share/man/man1/tar.1
+ dosym grmt.8 /usr/share/man/man8/rmt.8
+}
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 38eb8e3495f5..f4c094f1d6f2 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,11 +1,8 @@
-DIST xz-5.2.6.tar.gz 2069602 BLAKE2B 3cc160dc76944ad2a181fbfb23ce386dbbd04e75bbeb0b159aaaf82e2e8157ea8b2bb80b216d79a7c25339bfbd13bd9d8c261789829cc7c3cb86fc893a7b4b94 SHA512 090958dd6c202c989746686094c86707ad4ae835026640080fc0a9d0fad699821b7d5cb3a67e6700661a0938818ba153662366f89ab8ec47e0bae4a3fe9b1961
-DIST xz-5.2.6.tar.gz.sig 566 BLAKE2B 7c6114d93b4e3c8553108da3985029fc4585bfea5d72fc5028024221e91cc43c3b6cd3b7d169e4c8afed445a6beef7c255ef8420c5266a22ee9449a57cacec5d SHA512 50a1ac0f8f87f8c04c25c69870ba054094abf20b668bdecd42ed247a2eff24b8e52178b6442da84c125a9401a6f98d40ca76b27453833a30807c83128ab70eee
DIST xz-5.2.7.tar.gz 2105803 BLAKE2B 5363c5d0403e041c6d2e35b5d3321feeb8e63b8556496373c820975850b50e28e0da903446a49ba516fd9f40e0101dd39cfa9a9b8dd143c9849c84a715bb5d7b SHA512 06329fdbd1d897aa99dc96900c6246457288c586d02bb4869a92dd2f97973f95acb3a2fa9598a20613ea029f816836a8e3b65e36fec2b807b5e7553141429ab9
DIST xz-5.2.7.tar.gz.sig 566 BLAKE2B 00702dff24d655ebf30f2bf8bee94406e002164408b9eabb4f461a789482584c2b9c90675b8d1d5e030913e674946aa7392b73fcedf6ac62e3b1e3bc05bf92e6 SHA512 556e05107437fae2c75cc1a93465fce04426707e979403f41c6ee5b748fe7c3f985812a4e3b07785a84f68ef9d9f362ded470af1cceb9f4e8c80620a2699163f
DIST xz-5.3.3alpha.tar.gz 2119150 BLAKE2B 031e1a1556cbbd49565c2b72676e46a22c00e0e25bca2938c21d56f2d7f585c294d2a3a5712a3ae5d62fe8fef6e7b2f411fcc3c0ccac4714786209599b599d25 SHA512 c780c6854cb7599ed97629dbf923f5c6802b48e12aa25638c863e2403e56557abffb2b501823d4d53c852b7d09360b9ede355989756fef1daa1fa8cd9395da8d
DIST xz-5.3.3alpha.tar.gz.sig 566 BLAKE2B 2a02fd8a84c27967384021aa879efdf598b40ca9ff552080be2d057f402b3aace13bb0d98574e0185edd6ee3084793767f9941d4c1f21f5c5d55f886025cb845 SHA512 e6a849f2dd6f67ad3d51f50fe5f3e7f2a57e97e9d89499e2f88b94ab9716f1db5de34c3bb6f17b6fd55498ee5f4653d3d25e1a495b9c682b3200b2603a85479f
-EBUILD xz-utils-5.2.6.ebuild 2951 BLAKE2B fe70288d4b6b9582600339ef3800546aacb734665593cafa8ece0cc2781262906ad8dffaeabe5610e2769d7a006bc08763634822c6d9f978ac3463ddd460a1d8 SHA512 caddd665690b8acb03c3697566a9e977eed8a003e3f56bf25dc77ab74877994bfec86965334ce6683f582e07e4c6d53b6bab10f3322880b6d6342a92ad726f94
-EBUILD xz-utils-5.2.7.ebuild 2854 BLAKE2B 4f81034fecadbdba9f3ca090245d928b400a0d72ac8124087205702de949633d9b800d648e56eab6e6c57d545b22f39cbca6cc6fca741ed0c24a7b2f436d2e29 SHA512 7434fd38809e14799b2ef67ae049894412d2fd1d711cad01192e0373af4ea6c8a26b51b1d4b3395f004a2ee1d9b27184f3dfcedb56c76e4933f4256d125489bc
+EBUILD xz-utils-5.2.7.ebuild 2847 BLAKE2B f7e07afe31018ac1aaa06ce82467d8fb119abb0185a6415fb6d63586f9c924d85b21279cb845b8b8da3db8a6927c7cc27b6f056b1b7669a9b6661f8a824fe258 SHA512 79c90863cae998c4393da6bb1d877b15248ad81ecdbdde77ab0bdde1222933abf725c7c5b42142e0698bf293cedf14b66dea251d62fa5cef3815026611e27294
EBUILD xz-utils-5.3.3_alpha.ebuild 2885 BLAKE2B 00cedd70d450943dd489e6b9e05ce1d7a0f5f4472b501f4587cf482c2294fcd7f86d5811a7325b6812f468738a0144838291033eb83afb79aaaba640b34800d1 SHA512 8172456c5fcfd424a4f2bf7e6993fc67b782dc8a7fc3c4c433610cae31252acb2a022cde8a128d5e20d5842ceee4a3b5eeeff9f8a4e9c0f667505d7397a37398
EBUILD xz-utils-9999.ebuild 2761 BLAKE2B 909cd4550713dd2eaae9f242ec5c45e5aedcaa78748569bfcaeac3c867638bfe2f0e8ecc0a7dbd0b1220f7a2860cfe1430545e272c0a97cbf9877ebc5190cc27 SHA512 88b9523cb3c31be766d78198716489fc9b26ac39897b20ded7c775c9c74969028a84241af1ee688149442ab9c333f1ec25f7d134a8182bfd4396c8f17995b3ad
MISC metadata.xml 539 BLAKE2B 57809a0b57c640a42eca00c3cfbec8a549647b82afc6229b904c769b94b3ee109610d412af69cefe6b86c7cce9a7c363cf376bb87c19b5cee96b45bdd980cddc SHA512 5b86a0f7c76d5b33f32e5db91dafe675dc01399659c5304fafd77adf83b403c936019afadeed1f075834bbb31169d60c87c9d9e69783e7c7a720890f512172a7
diff --git a/app-arch/xz-utils/xz-utils-5.2.6.ebuild b/app-arch/xz-utils/xz-utils-5.2.6.ebuild
deleted file mode 100644
index e2fc3bcfe2f8..000000000000
--- a/app-arch/xz-utils/xz-utils-5.2.6.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Remember: we cannot leverage autotools in this ebuild in order
-# to avoid circular deps with autotools
-
-EAPI=7
-
-inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
-
-if [[ ${PV} == 9999 ]] ; then
- EGIT_REPO_URI="https://git.tukaani.org/xz.git"
- inherit git-r3 autotools
-
- # bug #272880 and bug #286068
- BDEPEND="sys-devel/gettext >=sys-devel/libtool-2"
-else
- VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/lassecollin.asc
- inherit verify-sig
-
- MY_P="${PN/-utils}-${PV/_}"
- SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
- SRC_URI+=" verify-sig? ( https://tukaani.org/xz/${MY_P}.tar.gz.sig )"
-
- if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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
-
- S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Utils for managing LZMA compressed files"
-HOMEPAGE="https://tukaani.org/xz/"
-
-# See top-level COPYING file as it outlines the various pieces and their licenses.
-LICENSE="public-domain LGPL-2.1+ GPL-2+"
-SLOT="0"
-IUSE="+extra-filters nls static-libs"
-
-RDEPEND="! ${P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="lz4 static-libs +threads"
-
-RDEPEND="app-arch/xz-utils
- lz4? ( app-arch/lz4 )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- default
- multilib_copy_sources
-}
-
-mymake() {
- emake \
- CC="$(tc-getCC)" \
- CXX="$(tc-getCXX)" \
- AR="$(tc-getAR)" \
- PREFIX="${EPREFIX}/usr" \
- LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
- V=1 \
- "${@}"
-}
-
-multilib_src_compile() {
- local libzstd_targets=( libzstd{,.a}$(usex threads '-mt' '') )
-
- mymake -C lib ${libzstd_targets[@]} libzstd.pc
-
- if multilib_is_native_abi ; then
- mymake HAVE_LZ4="$(usex lz4 1 0)" zstd
-
- mymake -C contrib/pzstd
- fi
-}
-
-multilib_src_install() {
- mymake -C lib DESTDIR="${D}" install
-
- if multilib_is_native_abi ; then
- mymake -C programs DESTDIR="${D}" install
-
- mymake -C contrib/pzstd DESTDIR="${D}" install
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- if ! use static-libs; then
- find "${ED}" -name "*.a" -delete || die
- fi
-}
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index d46ff66c9d66..75a916686c4c 100644
Binary files a/app-cdr/Manifest.gz and b/app-cdr/Manifest.gz differ
diff --git a/app-cdr/brasero/Manifest b/app-cdr/brasero/Manifest
index 6ace4f6f99ce..05af35e16b6e 100644
--- a/app-cdr/brasero/Manifest
+++ b/app-cdr/brasero/Manifest
@@ -1,3 +1,3 @@
DIST brasero-3.12.3.tar.xz 3156012 BLAKE2B e657f29719164b786e29a4974102cf6b0eb3316bec84a08838bd62b952c43994e0187f6cfeaa5080fa794b1ff1684553a3d643cd309b2957a8d4191c7ea8cfbf SHA512 0e3c97b2a754f7178207db390e33b832fcaed3856ae5dee447e5c26d712728302dbebbf839a4fb7565f63b3ebb1e4936e20739482a8114e6fe2700805659270a
EBUILD brasero-3.12.3.ebuild 1811 BLAKE2B 84e138caf14fea363de23817d23c7ab47719f0c2b22613f5cbc4dda3e4e4ce5d989d932146b798bd6861ab600d4bce24aeadb46b40ff64808ae14b81149d8100 SHA512 d49cba2dc1d4c0e0bf3d6ca5e48914bd7cb05178614c44553debe7cdc1914831016e2aaef6d744c0082406a0a89272e86965e26a0ed54f73176060b0ebe429ae
-MISC metadata.xml 642 BLAKE2B 7ac9b4e7b0568b7d608eee9280b15f04218e931daac55cc6fcbafbc01fdc4bc0fcc3631403f25451dc13f07854eb366e2028903be22d8740cc9d0e1ed9074c9e SHA512 7f5c7b80d484710f9dcecd6266331054a90789f0c5e4942b0f26d6da861bdcd754f495d505562bce8a5fcf70e59f57cf54e1ab2ef521798b213eee4d2dbe2b4f
+MISC metadata.xml 737 BLAKE2B 6660d69e0f3e33cd34c7ca424ad04e94e8b806c00d786d7d8aff8c543bc2ba3b89423175635957d83b8ec8eea948f5f6811b2103ba8301a489d3af99bc847125 SHA512 02493f9f119572a902e2e54976799881d570a78e942c86429d0c49a06b5efe7b314ce403773a08ece15c56b14d5cc8ed5b700e030835d4cdcd7d16f87bce805b
diff --git a/app-cdr/brasero/metadata.xml b/app-cdr/brasero/metadata.xml
index 25591ecd5ced..670cc5b16e45 100644
--- a/app-cdr/brasero/metadata.xml
+++ b/app-cdr/brasero/metadata.xml
@@ -1,17 +1,17 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
-
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+
+ GNOME/brasero
+
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 2525c6b8f961..41bfd382845f 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/argon2/Manifest b/app-crypt/argon2/Manifest
index ba28dc63bd85..810fbdc59a7e 100644
--- a/app-crypt/argon2/Manifest
+++ b/app-crypt/argon2/Manifest
@@ -1,3 +1,3 @@
DIST argon2-20190702.tar.gz 1505307 BLAKE2B fa9c3dde7b39c8d797a3d6b52992ebfe35f5eba1c7d7b3aa02c440edc36a3f5186cacee2e39e27ed7c6356dc1970dac0e8198d6f2065eb63ff77f9dfb2937cf8 SHA512 0a4cb89e8e63399f7df069e2862ccd05308b7652bf4ab74372842f66bcc60776399e0eaf979a7b7e31436b5e6913fe5b0a6949549d8c82ebd06e0629b106e85f
EBUILD argon2-20190702-r1.ebuild 1394 BLAKE2B eab650e88c4ab4590cf8a7a59c06fed6be40f1f2394a1a8bfbcb1d54dd5e54d55ba83e657c2da27075fcabd7ffe143cde9e7f4cb1cd5769a957ecba725c930ee SHA512 ec0011ca3ce9e4a95ff68ddce9f4db2916c62503ffc4ebe7d0887ded8f632be374e85cbbda112608ef17a25be98497f7d6925a6b94fccb2d9b4882823ee34ddc
-MISC metadata.xml 669 BLAKE2B a29e9ed5c8f1d6a91cefed3273a3e6a81258c44d4653e98cc32c5a92c3b5d7ea88a316795f56c345c18e0cc6166939ae85e05d538c24245c7141e1dc5c644745 SHA512 acf451c558fc2b080d398c8f94f9d0a42b6c15b13bd8020271199f3616774207c820ee3e2d5d3c674b56e2f7de8b8a60bef171c1eab7fc9fe16dd9bfcd9245a8
+MISC metadata.xml 734 BLAKE2B 5e4e6180919071e9e58305f0f9230f3d1848723dbcdcd104965d48c453bde4e88dcf480b5481f35accef2ed9142857a6da2d1dc8c2bb4dd8f495f3720a8d407a SHA512 d377e8e1e551aaff81cd7d802c7a17bae38cc7686c339b1465086aa1cc5d940e3ee9bdb6fe24142afa455d29c7cfdce5e7e72c60db4880a63b9913c44aff5781
diff --git a/app-crypt/argon2/metadata.xml b/app-crypt/argon2/metadata.xml
index 950b7c84aecd..e1a7b6edc5a5 100644
--- a/app-crypt/argon2/metadata.xml
+++ b/app-crypt/argon2/metadata.xml
@@ -17,6 +17,7 @@
Reflect ABI of libargon2.so.
+ cpe:/a:argon2_project:argon2
P-H-C/phc-winner-argon2
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index 2adf3e7bc3fa..aaecb3c3510d 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -4,4 +4,4 @@ DIST gcr-4.0.0.tar.xz 715600 BLAKE2B 8f656cea44bc9c2ab710d33db61f26b7c7f1df73a59
EBUILD gcr-3.41.1-r1.ebuild 2345 BLAKE2B 3f6159f35643b42d19eb6e809dff86c532040d34b42350f4dd1695b67a370acbeed1fc92baca7cbaa2346580ee375b9c87ad3bfd700ef670d563f936df0e747b SHA512 d1704a569597b3cb7ff2479bc8f05a598e9c36346fb1666beb33521c13cc0c985d45f9d3aac7dc4183155f95f101b18826e6abb64ee4390c6e0dd9f1accb9540
EBUILD gcr-3.41.1.ebuild 2093 BLAKE2B 0790692215e78f89bdbbd7c88cc6be3745f9089f860ff8d3418e45b8b53548ec5261c4b3118d4eca4fb6348be0a89b17e7aaf1e7fd1abb57f2d1731d86f17c97 SHA512 d53bda6a7bc7ed1e9bc35be40c725722ea0b0137b3010788a98ca01b38777a32c40454aa3439f4b429fb0f05941c9d4f67b8ca8793f85cf3783bb5641da51c4a
EBUILD gcr-4.0.0.ebuild 2083 BLAKE2B d5fef74e67683292de1d1efedfa1b67199bdd766df35f25ab1f2bf6827041104a5d210798e22ea0f72bdd1e5fcea02433b51af98063f02079ab37be1903454eb SHA512 f4d4627d35b63d8123da7849eea8b6090d75d25476dc811218484a55588a39680555bcf081b9b0787c11228f284dae44b20630c4bc622a02d7fcdaed52ba1105
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 344 BLAKE2B a5b129a4c722cc7b8b0e40ba087dab0449ed91ffeaec73b433fc2fcaa1d1c67a1f1db3ab639676880f526bb9ea55d71c7e876a947116c279cbc186d14090b10c SHA512 502308ab38854c2b61212f4b049bd20534147b9a7c565f5a5246a129fbcd12dc4a7cf1d39b560dd991a3211628afaf964a6c8f020c4e446ef0b8cb8688df0028
diff --git a/app-crypt/gcr/metadata.xml b/app-crypt/gcr/metadata.xml
index 7b343b06be8a..11816fc8230a 100644
--- a/app-crypt/gcr/metadata.xml
+++ b/app-crypt/gcr/metadata.xml
@@ -1,8 +1,11 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+ GNOME/gcr
+
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 5a673e086a64..497effed58b6 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,16 +1,12 @@
AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048 BLAKE2B 36f37b74da309100191f4d8f9c27d08a1b00d2d30fbaf169dbb74ebbe42293357a4fb62332e286fe5725dcfdc30645a602dc2a51c51924b06215b68fd5235658 SHA512 fd12827150e96cd7979ea9611d64ed4ab9e6c61cfecdd697b8fb4d162f20985b734c2bfc365a921809b9029e86a85a9b36c10ec472b3dd49c25ea18f5aef56ce
AUX gnupg-2.2.40-fix-no-ldap-build.patch 1017 BLAKE2B b260be86597a20ac1daa331d87fa741f1e17bdf65ca81f1e24d5465292567f16c6320271adbdf74cc2f93f2b8d8fda799a23bfedc45de9ce63fe34803da4eea2 SHA512 5a08a2e6737203761358adadfbc781f81923cf1add2614666dc47d25cd012e71779d749cc614f86c73f41d38ff05c2223bfe2b1f409879f020f1343edcb4b0a5
-AUX gnupg-2.3.7-yubikey-workaround-fix.patch 2010 BLAKE2B 9baaa3781e7fcdc7379eb838c965078127dba25eb90285504110bc4e81cc3d5018c0a391a065c33f0b3e29d48b5acbee79e47d4b6b281f11f083b7f44d5b7be1 SHA512 3a59955582af9abc576d533f548c9d6670a089415afbb23de9131d4c8cfab0a285ca71efcc7a423bcff0ec2b759d9428146b90a86413d7c6be6b1b0bbca41056
DIST gnupg-2.2.39.tar.bz2 7290098 BLAKE2B a9e31830f3ef9ec6d8d461a85fcbe4b91bcac9607d3b5f13f5edc0c54505afb6c6c119cd397023b1378d96c7d0f15c0d60da1d15721e9a18eb3ea8c7b69fba83 SHA512 73f881c12c82010aeaada500517ff39ab22b27ff21b1248bc2228b60a2d75385a44a53c5cfadb8f6b84ef22ad9db0105096b6620fb689560809b324019713940
DIST gnupg-2.2.39.tar.bz2.sig 119 BLAKE2B 584d7d36671670ac507948257e9c6be556ed2a2d3c0100bb2746edfe96df5ee1d4c6172fe0cae39d85fc290097bc5f6e1b351debc8ec2f5cc78047354fbed016 SHA512 6f7d7c2d1fae706b03c735cf453976c3aebef3f23659426f39a88c63d979f4d873ae09280d75dee9000805468d2a7f49d348609061939000f7cedf34ec5c6019
DIST gnupg-2.2.40.tar.bz2 7301631 BLAKE2B c9a077e28b22888573bdd12029205eb5f79a463a297e400a623bc86a39eeb6454cd884d05bd96734998613c695f2c9dcc68963c7275b89938ac38ddc7ba1e229 SHA512 4c2f5fbf37ba6fbad0045aad23129186963010c673ea0b81801adc4f98efe14d6c7228e22815b6b26307c1fe5bb51cd088aa6a0f06a9325d3c021849ef81c594
DIST gnupg-2.2.40.tar.bz2.sig 119 BLAKE2B baaffad8203169fca54be031b3c77f818ecf973c73b9389cb3cbcd8217ae8a6018f0d3d4d2d5b6f0611f7643b78467f91902add3107e9538273607c6ba3a49bf SHA512 fccc06c709450d58e64716c505cd79556edac440462613c47c6ec78714355425c045418946b4b4b2a5c79e33e0e75b20f0699ae6de9921add4877fd6c8cc2d64
-DIST gnupg-2.3.7.tar.bz2 7599853 BLAKE2B 3e9e33c8357222f42cc0e2af538e9f1f1f0453f35d790aaadf47ce9df24229efa91457b6014b34f19084448a3a6603c82e7d07714b89a68c6a84a08af6fa0e02 SHA512 c7fe169050ef17051cdaac9ad476e7ea792483baad1208fc359d568fa9e138d920ecaa2cd9cae73b20f5472a7d8ca6540a62062ff7a06055cc656b0eb4b917b9
-DIST gnupg-2.3.7.tar.bz2.sig 119 BLAKE2B c2652adf203bc828ed0aaf778542e990028156c16b435cd35aa6fe57ca0a5b798087c98e16589685c8ab9b8b92e16c3f7d4da56a4b1209b9adf2c24ea548ae6e SHA512 0257034b3e7ac390dadb151c656ff59822dacedaddca4ad6b5980b3e03a468ada47553e6a1fcff6a12c64ae2f9c15b245df855cd424b010041df8daaaab9a1b8
DIST gnupg-2.3.8.tar.bz2 7644926 BLAKE2B afb960adb877398363d92585d54bccc82c816f87b4489835950c19fc330edbf5302f7f958fdc6333b80d2e34730c9518e6abffea721891fd76c1b2ff2aa704be SHA512 6df8b1c53f0112c358f9f9eac732dd4ca13bcec24fc55a7d4a606587da988c5b7bb4c61be52b8b7769f1536dd2043087e6eb5cf224991cb0b2ed38ad00717ee2
DIST gnupg-2.3.8.tar.bz2.sig 119 BLAKE2B 29a133605d72dc4c102ec9a82d654cb980a72463fdc6e255d595e0559bb08860dcb1b014681e1d177eb29c0d32f4ce4ef6caefa6558f1cb97c87c42fb426ea63 SHA512 d97a92c245df997dbff800b25872e9f0769b20e9336b12682b4539fd4fe0e9c2dada7af397b8afeeeba316100b8f4dd86ba96e1dc62cee70158927229b0a015d
EBUILD gnupg-2.2.39.ebuild 5348 BLAKE2B c1aa7063d623fd45825d528ff392e309620b37a484787151ee786401d067c451c9a4d068d505c114630dbe812aeb0ee497d3ac2149d59abc373c48385b76ba29 SHA512 cf8f0474601831b51a333167257b3f4e18d91e34a2c16ccd27f81092ecf0a19a79056469a715e602379435c7e0699051ef130d014b7239d7d926c8661535ff6c
EBUILD gnupg-2.2.40.ebuild 5400 BLAKE2B 32ab43b2f518b7c546e598e995a813fed600c42df75f819d3675f7d799ec92f15e6550017b5f37481e2baadbbd534302701a0353098f06068b4b9abed53db4a1 SHA512 7f448909d4923573792daa4d0ab84a1aa0fde9ddbd6c0b5019f887f52144d33063c889a511cfbdd206c035d107687fadbca4ffe62d7adf6e8ad4264add5b23c6
-EBUILD gnupg-2.3.7-r1.ebuild 5574 BLAKE2B 7d32a90de93a16381bc7b8622504b61f08dba7e2f719719e0e0233c77f5e33e9a6763e113aec9446ec3760b8c87132a51b39d93b4fb7deba141ea0f804156385 SHA512 3a7bb0a4465cfb9fb6d0d173f0d19ec6e4e0efeeea467fc0310b3046dd5edbe13d1e67b40c9116b05d30f2a7d943a78f7fe71b2f2270ff863cdd1203bb2fea76
EBUILD gnupg-2.3.8.ebuild 5577 BLAKE2B dcb32e4f411c1aba0954ba2cd2c30528a82ecb9988c334e65d3c92db42fb2442464e719d6f6a738c61ef05dd9548e1dab90a9b033cf75d7f39c528469d9b07c5 SHA512 ce7ec66d3543a61a6ab7c9a36c88ec8bf5308ec72a78f7b0a3406fbdfd1b04b78623963104157e64b215ba056fcdb855d169b4ffc918e52c2f8a258d40f42619
MISC metadata.xml 1297 BLAKE2B 2d1b2b6f7e6fdf5b73797347e9a3bf7758f1efc86e53d0d0f4b2c0012152ebc50630ff4f3b2c965063f608cf03b3da2794978a3e3659957970d91d3a735ad604 SHA512 0e9f3d5255ac70d6a08b251bfd20f13ff25f63e763ab9385924fb2cb5ac233b0ae97cc43e8a2d950b9662f088ef65af87f9af4dbb355e122e3fcb118bee1c0de
diff --git a/app-crypt/gnupg/files/gnupg-2.3.7-yubikey-workaround-fix.patch b/app-crypt/gnupg/files/gnupg-2.3.7-yubikey-workaround-fix.patch
deleted file mode 100644
index 94062c885b5b..000000000000
--- a/app-crypt/gnupg/files/gnupg-2.3.7-yubikey-workaround-fix.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commit;h=f34b9147eb3070bce80d53febaa564164cd6c977
-
-From f34b9147eb3070bce80d53febaa564164cd6c977 Mon Sep 17 00:00:00 2001
-From: NIIBE Yutaka
-Date: Wed, 13 Jul 2022 10:40:55 +0900
-Subject: [PATCH] scd:openpgp: Fix workaround for Yubikey heuristics.
-
-* scd/app-openpgp.c (parse_algorithm_attribute): Handle the case
-of firmware 5.4, too.
-
---
-
-GnuPG-bug-id: 6070
-Signed-off-by: NIIBE Yutaka
---- a/scd/app-openpgp.c
-+++ b/scd/app-openpgp.c
-@@ -6259,15 +6259,28 @@ parse_algorithm_attribute (app_t app, int keyno)
- app->app_local->keyattr[keyno].ecc.algo = *buffer;
- app->app_local->keyattr[keyno].ecc.flags = 0;
-
-- if (APP_CARD(app)->cardtype == CARDTYPE_YUBIKEY
-- || buffer[buflen-1] == 0x00 || buffer[buflen-1] == 0xff)
-- { /* Found "pubkey required"-byte for private key template. */
-- oidlen--;
-- if (buffer[buflen-1] == 0xff)
-- app->app_local->keyattr[keyno].ecc.flags |= ECC_FLAG_PUBKEY;
-+ if (APP_CARD(app)->cardtype == CARDTYPE_YUBIKEY)
-+ {
-+ /* Yubikey implementations vary.
-+ * Firmware version 5.2 returns "pubkey required"-byte with
-+ * 0x00, but after removal and second time insertion, it
-+ * returns bogus value there.
-+ * Firmware version 5.4 returns none.
-+ */
-+ curve = ecc_curve (buffer + 1, oidlen);
-+ if (!curve)
-+ curve = ecc_curve (buffer + 1, oidlen - 1);
-+ }
-+ else
-+ {
-+ if (buffer[buflen-1] == 0x00 || buffer[buflen-1] == 0xff)
-+ { /* Found "pubkey required"-byte for private key template. */
-+ oidlen--;
-+ if (buffer[buflen-1] == 0xff)
-+ app->app_local->keyattr[keyno].ecc.flags |= ECC_FLAG_PUBKEY;
-+ }
-+ curve = ecc_curve (buffer + 1, oidlen);
- }
--
-- curve = ecc_curve (buffer + 1, oidlen);
-
- if (!curve)
- {
diff --git a/app-crypt/gnupg/gnupg-2.3.7-r1.ebuild b/app-crypt/gnupg/gnupg-2.3.7-r1.ebuild
deleted file mode 100644
index 15ad16f6e513..000000000000
--- a/app-crypt/gnupg/gnupg-2.3.7-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Maintainers should:
-# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/
-# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159
-# (find the one for the current release then subscribe to it +
-# any subsequent ones linked within so you're covered for a while.)
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
-inherit flag-o-matic systemd toolchain-funcs verify-sig
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="https://gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( tofu )"
-
-# Existence of executables is checked during configuration.
-# Note: On each bump, update dep bounds on each version from configure.ac!
-DEPEND=">=dev-libs/libassuan-2.5.0
- >=dev-libs/libgcrypt-1.9.1:=
- >=dev-libs/libgpg-error-1.41
- >=dev-libs/libksba-1.3.4
- >=dev-libs/npth-1.2
- >=net-misc/curl-7.10
- sys-libs/zlib
- bzip2? ( app-arch/bzip2 )
- ldap? ( net-nds/openldap:= )
- readline? ( sys-libs/readline:0= )
- smartcard? ( usb? ( virtual/libusb:1 ) )
- tofu? ( >=dev-db/sqlite-3.27 )
- tpm? ( >=app-crypt/tpm2-tss-2.4.0:= )
- ssl? ( >=net-libs/gnutls-3.0:0= )
-"
-
-RDEPEND="${DEPEND}
- app-crypt/pinentry
- nls? ( virtual/libintl )
- selinux? ( sec-policy/selinux-gpg )
- wks-server? ( virtual/mta )"
-
-BDEPEND="virtual/pkgconfig
- doc? ( sys-apps/texinfo )
- nls? ( sys-devel/gettext )
- verify-sig? ( sec-keys/openpgp-keys-gnupg )"
-
-DOCS=(
- ChangeLog NEWS README THANKS TODO VERSION
- doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
-)
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
- "${FILESDIR}"/${P}-yubikey-workaround-fix.patch
-)
-
-src_prepare() {
- default
-
- # Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
- # idea borrowed from libdbus, see
- # https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
- #
- # This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
- # which in turn requires discovery in Autoconf, something that upstream deeply resents.
- sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
- -i doc/examples/systemd-user/gpg-agent-ssh.socket || die
-}
-
-src_configure() {
- local myconf=(
- $(use_enable bzip2)
- $(use_enable nls)
- $(use_enable smartcard scdaemon)
- $(use_enable ssl gnutls)
- $(use_enable test all-tests)
- $(use_enable test tests)
- $(use_enable tofu)
- $(use_enable tofu keyboxd)
- $(use_enable tofu sqlite)
- $(usex tpm '--with-tss=intel' '--disable-tpm2d')
- $(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
- $(use_enable wks-server wks-tools)
- $(use_with ldap)
- $(use_with readline)
- --with-mailprog=/usr/libexec/sendmail
- --disable-ntbtls
- --enable-gpgsm
- --enable-large-secmem
-
- CC_FOR_BUILD="$(tc-getBUILD_CC)"
- GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
- KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
- LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
- LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
- NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
-
- $("${S}/configure" --help | grep -o -- '--without-.*-prefix')
- )
-
- if use prefix && use usb; then
- # bug #649598
- append-cppflags -I"${ESYSROOT}/usr/include/libusb-1.0"
- fi
-
- # bug #663142
- if use user-socket; then
- myconf+=( --enable-run-gnupg-user-socket )
- fi
-
- # glib fails and picks up clang's internal stdint.h causing weird errors
- tc-is-clang && export gl_cv_absolute_stdint_h="${ESYSROOT}"/usr/include/stdint.h
-
- # Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
- # As of GnuPG 2.3, the mailprog substitution is used for the binary called
- # by wks-client & wks-server; and if it's autodetected but not not exist at
- # build time, then then 'gpg-wks-client --send' functionality will not
- # work. This has an unwanted side-effect in stage3 builds: there was a
- # [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
- # the build where the install guide previously make the user chose the
- # logger & mta early in the install.
-
- econf "${myconf[@]}"
-}
-
-src_compile() {
- default
-
- use doc && emake -C doc html
-}
-
-src_test() {
- # bug #638574
- use tofu && export TESTFLAGS=--parallel
-
- default
-}
-
-src_install() {
- default
-
- use tools &&
- dobin \
- tools/{convert-from-106,gpg-check-pattern} \
- tools/{gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
- tools/make-dns-cert
-
- dosym gpg /usr/bin/gpg2
- dosym gpgv /usr/bin/gpgv2
- echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
- echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
-
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
-
- use doc && dodoc doc/gnupg.html/* doc/*.png
-
- systemd_douserunit doc/examples/systemd-user/*.{service,socket}
-}
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index 29179655f33a..1141155e9f7e 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1,3 +1,3 @@
DIST libsecret-0.20.5.tar.xz 187340 BLAKE2B cde5094eaaf54f251c19afb015c39cc88435dafe6ee682ca8f9d1917dd5b3dc8cc1609cdbf2a3a42d2592c2a149bec5fe28b2f4ec179b92c0d0f07d2f14c1792 SHA512 61ca248aafd265e1f31d56c9084c68d880ebf03660ace3d4a6c6622ab306b56e921ac24647b6a60633bfa99c8a0407d4ae1aa6148511f289bf5ce2025b72692a
-EBUILD libsecret-0.20.5-r3.ebuild 3714 BLAKE2B 47abd028419ab7e1006740e343f01b634ebd358edb59f231f38bb504108ec36d268230027284ab092d6dfbd090d905b845f7b9b30f3de09750010f7ef41feca9 SHA512 e28093adb9b27d778c31fb059699aae9d03f80b615dba6b2ad45571243d4650207e74a265c8ab7c448a77b8ce7e45f0db550546a42c4ff7df3c860bbd76e16d0
-MISC metadata.xml 368 BLAKE2B b1730ea71fc0ee02e7971533562f7bbf0e0479304c22dbeb13a4620dde8083031cffa63077ac5dc725de4f17c4a826df2cd6091d378682d04e9cab2f3072c97f SHA512 b5a3db4438a1a98846c2e24b269966b7d9fdbe7419f7a169557a16544ba1846b470e0835720d039bdea56d8cf02667cc6435169029f9ef40365cb4642a9a3b04
+EBUILD libsecret-0.20.5-r3.ebuild 3690 BLAKE2B 7a3bb091228b49fcbb7abb1c65863364853775fe7dcd1bf126057ccc51aa62b17d62956b7aa0937da9f7c466cbe9482d8fe318e667e26104f687f7ca3ce5ffbc SHA512 626352b9c0f0c341a6cefad4ca87db5ae7371a8717bddd425dbce053216d6d92c17dc56b34f0b89276f03a2250c49dcf1700ee6e2b2a618b0402e1cac25330ff
+MISC metadata.xml 468 BLAKE2B 21e70edb5acfc8b52a7d10f0c9e9452b04d8124b3d52bb7f816019cc2cf6f50275c7cb19c8853aec0c5fb2a6c93d56dfed3f4e5b8c41e9b2c08c2eff5efc5206 SHA512 7cc80dd7bbef252a09524ad511e12e621fdceca3482411f605e4c8aabb66e473c10e6a2b446df866644a4749b58dd3bb6f83cf118ff9949e17ca4a427a3ce3de
diff --git a/app-crypt/libsecret/libsecret-0.20.5-r3.ebuild b/app-crypt/libsecret/libsecret-0.20.5-r3.ebuild
index bddb8f0cc181..3315eccf0ea2 100644
--- a/app-crypt/libsecret/libsecret-0.20.5-r3.ebuild
+++ b/app-crypt/libsecret/libsecret-0.20.5-r3.ebuild
@@ -2,8 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-VALA_USE_DEPEND=vapigen
+PYTHON_COMPAT=( python3_{8..11} )
inherit bash-completion-r1 gnome2 meson-multilib python-any-r1 vala virtualx
diff --git a/app-crypt/libsecret/metadata.xml b/app-crypt/libsecret/metadata.xml
index 7318f81748ab..3d7258d053bc 100644
--- a/app-crypt/libsecret/metadata.xml
+++ b/app-crypt/libsecret/metadata.xml
@@ -1,11 +1,14 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
-
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+
+ GNOME/libsecret
+
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index d3bb4207f2a2..55370ebed5db 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -2,4 +2,4 @@ DIST seahorse-42.0.tar.xz 1395040 BLAKE2B ae40d587c881851014b1989af986993768598a
DIST seahorse-43.0.tar.xz 1392460 BLAKE2B b7ae8b42042ad8e07eaf2633583b566f9757f83bd066eb8b0786d5e89353901f5526ed925bb6152820a5b2a36defb0c0f38dea634c3ae78ebf8d29ab07ff9cfb SHA512 168fdfc829134915f513028b1d35b647aa18a0390786cbf512f7ddb7b125b239f3f3d880a847119a5aa22580354f0b594e553fe3940a3afbda5861e69dd88e5d
EBUILD seahorse-42.0-r1.ebuild 1705 BLAKE2B 910b89fabca9d67cca465829cbd8812f150c807d90c106f156ee8b0cfb0fd3e784397a73cbd9e78292d173ae5e66574e6310d5153c7a822920afd3f5d6606042 SHA512 7abbbb9a657174d9b59056d793525e202e7945b7eb140738baad329186d71e7c455601c699254b1e967ab3a0b8313ffdf400c5a4bb10647c45136875965038d3
EBUILD seahorse-43.0.ebuild 1697 BLAKE2B 0447b676a82e7935bdc67bb2b0282e32e608bc0f3d8df8c250121bdf9c084b4f3346a5c5291bed76ac5d523d88008b628510d24e8b7094868fbf57d0823747cd SHA512 29416c13a2b2a97d54700b63a7b71f58840ee5ab504d45a036441059cd0da32d4488fa852edf27864a44ab47a853f1e1e12df8bee670544e3420befc3ae9322d
-MISC metadata.xml 743 BLAKE2B 90fed564b56f7e7a781f197eb09ebbca90ac0bd3c93ee1b65eec7e35420fcdd8bf0c0bf67cbf2109a55de590f32b48d3837a70844bb7e6e50819a8b67c868369 SHA512 99872b87aa52c0fe0584d11186fed74d0ade69e083395b030af3a22ba031a91467247c9c72e8cfa45b114192ebc13ed593a2634aec7db5a2b8efa1e2af6a0791
+MISC metadata.xml 874 BLAKE2B 5aa0d587b2dc015d9030160fb1fa89a2fe670a56ecd10972096199deafa321f9c1ded0702c74a27b42224f356a623817beb831f50ab7aeb3e00f8470a72d15a5 SHA512 59d1aa71802cff633f84c2500126dbfb729fb5e1a0f08fad496f53692be2b7c5db7e509a7289ba7521a916ebae13f772e35c6d52f6b2cb6c421134a1caa5bae7
diff --git a/app-crypt/seahorse/metadata.xml b/app-crypt/seahorse/metadata.xml
index 10379b458c7f..e641ba504704 100644
--- a/app-crypt/seahorse/metadata.xml
+++ b/app-crypt/seahorse/metadata.xml
@@ -1,18 +1,22 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
-
-Seahorse is a GNOME application for managing encryption keys.
-It also integrates with nautilus, gedit and other places for encryption operations.
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+
+ Seahorse is a GNOME application for managing encryption keys.
+ It also integrates with nautilus, gedit and other places for encryption operations.
-With seahorse you can create and manage PGP keys, create and manage SSH keys,
-publish and retrieve keys from key servers, cache your passphrase so you
-don't have to keep typing it and backup your keys and keyring.
-
+ With seahorse you can create and manage PGP keys, create and manage SSH keys,
+ publish and retrieve keys from key servers, cache your passphrase so you
+ don't have to keep typing it and backup your keys and keyring.
+
+
+ GNOME/seahorse
+
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 7dde41cf76df..f0125ca8091a 100644
Binary files a/app-dicts/Manifest.gz and b/app-dicts/Manifest.gz differ
diff --git a/app-dicts/gnome-dictionary/Manifest b/app-dicts/gnome-dictionary/Manifest
index dae2b3e5dcf1..c537354ab973 100644
--- a/app-dicts/gnome-dictionary/Manifest
+++ b/app-dicts/gnome-dictionary/Manifest
@@ -1,4 +1,4 @@
AUX gnome-dictionary-40.0-meson-0.61.patch 3469 BLAKE2B ad1290e8727ce222746dca3c72c42d53dfe276ebbf54c39f0efea847da6768103f5176ed1f4715418058cbb650426ab55412d1e275551230fc440cc3414fdc21 SHA512 31e5232edd1f00468dc870037a831a99092de956c9faa65c4513fad2c6c470fd948d812d309b4bcced93e0bbab3d1ae72c142afa49dfd075c8f2db299f1fcb48
DIST gnome-dictionary-40.0.tar.xz 603388 BLAKE2B 1fae73ea5b554786f1ee1bf641b0dc94ee8953a045e4a59b72823075b8c0905d0098827ad35f94e26d26fcbdbed1fd2980391ce582871ae6df4d273d9de5add4 SHA512 96e8c5efbba43e1a7d247703ac17cbcb8579cc633f6db74b6fe4431e0b1aed47ab76fd15cc114497b5ee76fb33b57fd9936cc869ffe905f208c836b5a231b126
EBUILD gnome-dictionary-40.0-r1.ebuild 1187 BLAKE2B e43fd3259885e591cf2f756bf5f046ddb60ef69cc5756c4e3605add8b4f31a74534e820c560f4155579bf9a2a70ddd93d8470956e68e2bf0faeb7f120bdc6df5 SHA512 cff6a14ded8c9a849661504ad3699194e387563b6d1c97eea6b40d62bed77e159a71d5ff09ea8cfc8e7ced934657ed405d379b08477f282070549c0933b84edb
-MISC metadata.xml 317 BLAKE2B 0f99dd59faa31be1761a21290c1d34ed89467c22582727cb88030c0dba83bc7ee9d390f655ab7a63a0b5cb25e8efa2f17b90fbd08c093fece6d4d873018ea201 SHA512 28137d259d69aae3d9ea5161100a0063718bf43c3447ad5d42e75c4ab212288b07f5cbc281e44d648817c2fe7bc05af0a2428a9f9d5f495b2ecefa66f16bda34
+MISC metadata.xml 431 BLAKE2B 1c73a2683e05393ea2662fcf061f69ba61c8140c1b8f1964946b3e0065ef8131609c9d3d0ea144c1fd83a435989036cdeebc2eb1450b267fbcb04388bce0e9f8 SHA512 1cb99414f989d2e3bd770270e906b498cfce3e74c4e47453c98f38fc95f58c2f56148c85c2461366867f348cf16155bea9b888d31b0fe20fb0cece3645426e5b
diff --git a/app-dicts/gnome-dictionary/metadata.xml b/app-dicts/gnome-dictionary/metadata.xml
index f74c6767f432..38142274dd23 100644
--- a/app-dicts/gnome-dictionary/metadata.xml
+++ b/app-dicts/gnome-dictionary/metadata.xml
@@ -1,11 +1,14 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
-
- libgdict-1.0 soname version
-
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+ libgdict-1.0 soname version
+
+
+ GNOME/gnome-dictionary
+
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 668f7d5540fc..bae7586d12ad 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/xmltoman/Manifest b/app-doc/xmltoman/Manifest
index ade2a135762f..5387bb7be684 100644
--- a/app-doc/xmltoman/Manifest
+++ b/app-doc/xmltoman/Manifest
@@ -1,3 +1,6 @@
+AUX xmltoman-0.6-generate-man-pages.patch 2083 BLAKE2B 3f4136a06607d0c1b0d07acc5d82b977b1e3d1097d08bb29d8a626e1d5d86493892e58001fdd2946c5de96e62702bef5fc4f982507e89d5ac4069933d8638196 SHA512 879c11f14b33a3b134817c62a6f6e6470213e7aa7663b1676444746ab177b5b750114b5023dfa563fd85997ca0c7f7f2683264d0d1f985f363365529941a2ed7
DIST xmltoman-0.4.tar.gz 15250 BLAKE2B d8641a19742d845fdab0e11703a60c16656c63529a4d86931a8038cbdb87e0fbf241b7ff38ed05ddab62daab608407bd5d7778c060fe3cbef1750976fa588dee SHA512 347722731e2101ecd0619f88f4efdbca534810c96977a1281af685e8a61f4c1a826a71a9f0e3af43cc899936640787366a78077f36d23a9efcfeb789dbcfae22
+DIST xmltoman-0.6.tar.gz 15862 BLAKE2B f33ebfb1dfdd0f055f18e68f923e96c07495740e361cec2ba7a10a63889b6b6c4c851f3df6b74947b24811403d2745dbdc7e5d2d67d3566ec65b7be6fae616c8 SHA512 f2b0689ca37212253eaa127c3a2c299facac7c3909991b8872da0adf0fbb34aa02c32144c485135c06c17b1ac5e5753d627969e97ae4938e6dcee9ddbd79582d
EBUILD xmltoman-0.4-r2.ebuild 739 BLAKE2B 387cf48885ba847e614eceec70cc92d4db957199a25e63ce4ef5f6b38ea015623e9060697f64044127526174377db69abb18a1af13f90814ac16c457506ae25c SHA512 9ef6e984f597544559b07fed1a7142bf190c3210b9efc8ce81326f836fc1e1db8e549986830dd477f0604bb6f5e5280481ce462df3e96d448aa3724507ebc2e1
-MISC metadata.xml 246 BLAKE2B 3279ce7a8126c02eb17f7ff8402fbeaf20f919c9953ff16d0b572ac0e802a701a699e98d293bf34a0542ff17a8c39034fba5878207c5d34035eeea845cc3ebdb SHA512 be48ff15d61e6dda9219ef65943e9b462c71b60ec0cefb8012db9abfab1e6d835209a085f92172679b66f4f40493728dec68d2d546134f576b2c33f84814b9c1
+EBUILD xmltoman-0.6.ebuild 825 BLAKE2B f19207ce37a8c580ca659ab1fddd86c34d161bc2120cf4f2247d28cb8a2fc477be6dc0209f69528b2d3d9c7cabe9c6f80bcc48e31e3977dfc619038c2001248e SHA512 1ca8dcab49ff248533fc7f3e4620b965d1e1072d77be5593aac8baf04950827f05646eff8f682fdd29079fedcbb72f965eb8f7443ab656f55111f49c61be8b97
+MISC metadata.xml 299 BLAKE2B 5bb9887ce9510e2a71a5b30e8b2ada78236ec6f2489bf27d6536b47fcdcaae262b7ada77d3f0f8b00f7a2223e7344a4f130f4636a1c61d64bebb923c916c2d6e SHA512 6fef6c50b720fd2aec25ede9b037c5973de9f4e41383c2836f27f42e68b73c32dcac0d31e1a9ec209d5d685e50ccd8c8347ec0822530be23624bd98d2b9f3095
diff --git a/app-doc/xmltoman/files/xmltoman-0.6-generate-man-pages.patch b/app-doc/xmltoman/files/xmltoman-0.6-generate-man-pages.patch
new file mode 100644
index 000000000000..a902ddd07b84
--- /dev/null
+++ b/app-doc/xmltoman/files/xmltoman-0.6-generate-man-pages.patch
@@ -0,0 +1,55 @@
+From 39553c816cb8a18d798a6f947d2901f7a3228439 Mon Sep 17 00:00:00 2001
+From: Sam James
+Date: Sat, 29 Oct 2022 18:02:25 +0100
+Subject: [PATCH] Generate man pages
+
+Generate the man pages so that the tool doesn't have to run itself
+during installation. It's a hack to workaround Perl upgrade problems.
+--- /dev/null
++++ b/xmlmantohtml.1
+@@ -0,0 +1,18 @@
++.TH xmlmantohtml 1 User Manuals
++.SH NAME
++xmlmantohtml \- xml to html converter
++.SH SYNOPSIS
++\fBxmlmantohtml \fIfile.1.xml\fB > file.1.html
++\f1
++.SH DESCRIPTION
++xmlmantohtml is a small script to convert XML/MAN(GROFF) to HTML.
++
++You will find the DTD in \fI/usr/share/xmltoman/\f1 on a Debian GNU/Linux system. There is also an XSL file to generate HTML using \fBxsltproc(1)\f1.
++.SH AUTHOR
++xmltoman was written by Oliver Kurth
++.SH MAINTAINER
++xmltoman is currently maintained by Adam Bilbrough
++.SH SEE ALSO
++\fBxmlmantohtml(1)\f1
++.SH COMMENTS
++This man page was written using \fBxmltoman(1)\f1 by the same author and / or maintainer.
+--- /dev/null
++++ b/xmltoman.1
+@@ -0,0 +1,24 @@
++.TH xmltoman 1 User Manuals
++.SH NAME
++xmltoman \- xml to man converter
++.SH SYNOPSIS
++\fBxmltoman \fIfile.1.xml\fB > file.1
++\f1
++.SH DESCRIPTION
++xmltoman is a small script to convert XML to a MAN page in GROFF format. It features the usual man page items such a description, options, see also etc. The XML format also supports converting to HTML pages.
++
++You will find the DTD in \fI/usr/share/xmltoman/\f1 on a Debian GNU/Linux system. There is also an XSL file to generate html using \fBxsltproc(1)\f1.
++.SH FILES
++\fI/usr/share/xmltoman/xmltoman.dtd\f1 the DTD file.
++
++\fI/usr/share/xmltoman/xmltoman.xsl\f1 XSLT stylesheet to generate HTML.
++
++\fI/usr/share/xmltoman/xmltoman.css\f1 stylesheet to be used for HTML.
++.SH AUTHOR
++xmltoman was written by Oliver Kurth
++.SH MAINTAINER
++xmltoman is currently maintained by Adam Bilbrough
++.SH SEE ALSO
++\fBxmlmantohtml(1)\f1
++.SH COMMENTS
++This man page was written using \fBxmltoman(1)\f1 by the same author and / or maintainer.
diff --git a/app-doc/xmltoman/metadata.xml b/app-doc/xmltoman/metadata.xml
index 379211a297a0..cdc9d054966e 100644
--- a/app-doc/xmltoman/metadata.xml
+++ b/app-doc/xmltoman/metadata.xml
@@ -4,5 +4,6 @@
xmltoman
+ atsb/xmltoman
diff --git a/app-doc/xmltoman/xmltoman-0.6.ebuild b/app-doc/xmltoman/xmltoman-0.6.ebuild
new file mode 100644
index 000000000000..5faec34d22f1
--- /dev/null
+++ b/app-doc/xmltoman/xmltoman-0.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Simple scripts for converting xml to groff or html"
+HOMEPAGE="https://sourceforge.net/projects/xmltoman/"
+SRC_URI="https://github.com/atsb/xmltoman/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+ dev-lang/perl
+ dev-perl/XML-Parser
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-generate-man-pages.patch
+)
+
+src_install() {
+ # 'make install' requires GNU install, upstream is dead and carrying
+ # a patch is more space than redoing it here
+ dobin xmltoman xmlmantohtml
+
+ insinto /usr/share/xmltoman
+ doins xmltoman.{css,dtd,xsl}
+
+ dodoc README
+ doman xmltoman.1 xmlmantohtml.1
+}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index b38aafde84c3..1acc9706dcb0 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index 99bfd208fc32..3dd32b7d0d28 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,3 +1,3 @@
DIST gedit-plugins-42.1.tar.xz 946368 BLAKE2B 6ee8c42d5d5214cdb9095bce71623f9486c973ade69aad91eed4ae13a1ad5ab59bcc43d30078bdb9db46527160f8bc6b183a56c255d10f8027c4ff2e603fffa6 SHA512 2e36919f7b7232e4471e2c1277c33e2f79ff513b76574cf765e451064979587c170ae003c9517d33f3b9cfce916cb7f25f9e3d0a4f6a6b203086fcfff9f265aa
-EBUILD gedit-plugins-42.1.ebuild 2732 BLAKE2B 18574c00784c8bf1457bb57ab8d639e1038f4d1f2cca2c141392e2c91049334f0fa341d0fc004e25db2ae4e2441fd2b2897e2e0ba3dc174926f9712ca95f42ed SHA512 068a0070323daa44d4faf44b98ad15cccf5ab846868a1cb0040cfec68946a6cabccd79c8638368c69b8168d27db3673daf250189999c79b65e3a877529be61d1
-MISC metadata.xml 481 BLAKE2B 5fbf2df78aa40fce971741bb7d04de00cdc7a6371c2652ae0ae4bf253ee469c4bbb5e5a7c2b88226f95bb8865930dd19e9adedb191fd5a173ce915890ce40b32 SHA512 3b4b858659d1597e6c1ee574143de4864be8b75d4a6399d47bff85c4b18ec35472523bfeaa0815189a9008764405ee3b2fa53e73fcdc3edc8eda00a5f943f762
+EBUILD gedit-plugins-42.1.ebuild 2704 BLAKE2B 996f031b83848d81288aaaf91a02db69e0241946234284e2b579e67e31d733c1d31adec4fe18c7cf889461a62aea62edf0aac32ed2d6ea6e36f5d0a7143b10d6 SHA512 5f14b805ddee568ff88e03f710a280ae42d1088c2432a0d63284c75d372aeabcb8101f3b859d2657cd63086eb420b2c4b8c41153503b86de9c4fbac4d0a11b45
+MISC metadata.xml 596 BLAKE2B cf545e591c160fc584c5c2b1e3f5fa6a47922a958f981daa5c85f3f6c8f7eaed2a520d6265241998dfe211098f70c75a0fdfff033e55e892e5775b678ea9ef5b SHA512 0a3b9e748bc2d22ea16a694f8ebd6196d05e6652f552523bfe6fa60f1c69ab50110692cda7a59239c8f6946c06d3139a4225f1744e0dd40ccbdef3e8b396f692
diff --git a/app-editors/gedit-plugins/gedit-plugins-42.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-42.1.ebuild
index 2c43fcc16023..32801b416540 100644
--- a/app-editors/gedit-plugins/gedit-plugins-42.1.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-42.1.ebuild
@@ -2,9 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
PYTHON_REQ_USE="xml(+)"
-VALA_MIN_API_VERSION="0.28"
inherit gnome.org gnome2-utils meson python-single-r1 vala xdg
diff --git a/app-editors/gedit-plugins/metadata.xml b/app-editors/gedit-plugins/metadata.xml
index eb35a3df50f2..2695ac239950 100644
--- a/app-editors/gedit-plugins/metadata.xml
+++ b/app-editors/gedit-plugins/metadata.xml
@@ -1,14 +1,16 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
-
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+
+ GNOME/gedit-plugins
+
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 7176e1332255..018e60536d50 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,3 +1,3 @@
DIST gedit-42.2.tar.xz 6917596 BLAKE2B fd7b0a1c113e944b1b3f0c2bb55a061e76e7ee71ebbfe8d64c6d5b0c7e47b8dd54519bde1b7b095a1cab27a169427eecdf35d06422c1a984f51dab82e19c7cb0 SHA512 d50f021f33764e0cdd3ac51650db0e37dacb5b6edeadddfd8136e8120e83eb740db66ada25ae43eac810896714859d6f8876640a8976ddfd6e7e602c278dcc99
EBUILD gedit-42.2.ebuild 1882 BLAKE2B fd260e8df390c8bfc7fa296a3a90260df9de3d9b3594449ee485867eabf382bea8f2c8331800f1227bedea8f22c16d4c2c4d4eb8e70cf8e5975f3c4725f477ed SHA512 cf12494d027f6f150520ffb5d3966a2c801204d89071de3dfab4ab5c4eebb0d8300c11db80ee064df4538a0331c324a7f2041d3d89c7eadd699ac8be012c26d5
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 346 BLAKE2B 59226b3220bd9b1770fad0f5acf3b1888a57a3496f9e0a6eb0eb09c12b7a5aa461961753dd8a5a6f01db1cdb97af5b28d6a8d1d632b60f499f86e0864e29264f SHA512 3e1d83ad67b85a681b85f8fece9d6c2c3eab2f2f726447230dc1f2399a21cba211d97e11d8c06d0d1b1803fafe67be4b32c04b39c5f8586a421c525624f6697d
diff --git a/app-editors/gedit/metadata.xml b/app-editors/gedit/metadata.xml
index 7b343b06be8a..25826770e3dd 100644
--- a/app-editors/gedit/metadata.xml
+++ b/app-editors/gedit/metadata.xml
@@ -1,8 +1,11 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+ GNOME/gedit
+
diff --git a/app-editors/ghex/Manifest b/app-editors/ghex/Manifest
index bd871d76e6b4..9d2f6fc04885 100644
--- a/app-editors/ghex/Manifest
+++ b/app-editors/ghex/Manifest
@@ -3,4 +3,4 @@ DIST ghex-43.0.tar.xz 1020716 BLAKE2B e4b6590f9af11d6fbec31266ef9959b827937697ee
EBUILD ghex-42.3.ebuild 1141 BLAKE2B 4115c3ce3a4d786dbc56b9d25f529306c6d9e1495dd8d8fa5544c494b2ef5c83c24935ec1de544bc0937320f80470eeb02624a7a091dc09c811ad39fdae8ed30 SHA512 ddcd5e958f36b07a77a08a57a0f63be8755047427881b1e306c28a7b2a0e92bc36cf31a32e9b88d0f070b13034f93e9e6042545fbd9d7b089a09fa3026da5ea4
EBUILD ghex-43.0.ebuild 1292 BLAKE2B d0d628849dd93185e7802174726c92211f999142fb2ee8359a9d22edaf522326de806e95d00b830a4b369afc3f80b1c647a3fa39f127590560e75ab812e13538 SHA512 ae01eb04a1458d233add7e73d9f9cd021b49ed5d96dcfddddf860610d0003a7cb8b9ca2a56828bac3d65f0fc847aee6add97b50f4862564eedcb64db553ac46c
EBUILD ghex-9999.ebuild 1292 BLAKE2B d0d628849dd93185e7802174726c92211f999142fb2ee8359a9d22edaf522326de806e95d00b830a4b369afc3f80b1c647a3fa39f127590560e75ab812e13538 SHA512 ae01eb04a1458d233add7e73d9f9cd021b49ed5d96dcfddddf860610d0003a7cb8b9ca2a56828bac3d65f0fc847aee6add97b50f4862564eedcb64db553ac46c
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 345 BLAKE2B 4c2385371bb42d47643f2a9d48ee5ed675267f812467fa03f69151bcdbeb996602be0a3995f976b61e0c018c8d69e3dcd37392f5927bbe24942f11c23794bac4 SHA512 c3f3cc3f436137299082ccdcaa57221d1b3f490b34febfcd6ca586769b0a8c76ce11cc5b8be823c8c88b942effc0b68d9c078ba3a28594c41419830dff04fcad
diff --git a/app-editors/ghex/metadata.xml b/app-editors/ghex/metadata.xml
index 7b343b06be8a..ffc72ffa12d6 100644
--- a/app-editors/ghex/metadata.xml
+++ b/app-editors/ghex/metadata.xml
@@ -1,8 +1,11 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+ GNOME/ghex
+
diff --git a/app-editors/gnome-latex/Manifest b/app-editors/gnome-latex/Manifest
index c3b658656882..ecb51f26e6df 100644
--- a/app-editors/gnome-latex/Manifest
+++ b/app-editors/gnome-latex/Manifest
@@ -1,3 +1,3 @@
DIST gnome-latex-3.40.0.tar.xz 1050088 BLAKE2B bd8764450ee122599fd96a7e889291805fc09d854d77aa4e7d3b01709cda8bf0c38327d05de6117a19f325ca6a61ab42e014d27b941ed8e40f0bfd963dd65680 SHA512 822d86eac81994593e71428f1c893ce7d6970bb8e98349c8ad9cc6a113e3fdb49209f1bc7f19fb8d5a22da98d7650a822c8f8ab1f5aa096e6ea0cbaf74dfafca
EBUILD gnome-latex-3.40.0.ebuild 1128 BLAKE2B 03a5c6c42afc5037644a514bd015406f373e4f134b55535d6f4d8c3ff2b421571a278d50097ab8700bd371f90a528c9b9d24a564fce33b549d4fa14f723ca653 SHA512 c1726566142ad8529b445a3fb7894587e578471d461ebd296795422d0c49349b9293e1f7fc90555077d0b276d49cfaf94b046d7e97faa7a498bd254f15d533d1
-MISC metadata.xml 465 BLAKE2B a26c9cc411d697492d945046338c0f37c5a41dc750cb28237cb527db1d55716323f9c6520ffc4d86e838e05b9aabe42101985362fb130d6941082ea3e3af297e SHA512 e01b512e26c05fad079c5cec65df8ed58cadb60b230c87a89de128caad648d243b46c1dc6eea64c21c2e0e319edcbde3a952dece428035db04176c8e144706a7
+MISC metadata.xml 575 BLAKE2B 73604444b6c40826ddad63c484b35ed2bb7c3edf6ab59e40994881769051c96b2ebb211d47d2f67b562c48e15ca589863f6cad9984accaf40567bc8f697b15e6 SHA512 6a6bbbcd0f1e3119f624828a3f008d12377c835f4235fe6fe232f326dc8d3bcc960406d1c33ababd00b0a941f9c7160c3f6a7b106a9f70ccb505b0eb0349e5b6
diff --git a/app-editors/gnome-latex/metadata.xml b/app-editors/gnome-latex/metadata.xml
index 6c684e071d5f..eb53c84a44e7 100644
--- a/app-editors/gnome-latex/metadata.xml
+++ b/app-editors/gnome-latex/metadata.xml
@@ -1,14 +1,15 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
-
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+
+ swilmet/gnome-latex
+
diff --git a/app-editors/gnome-text-editor/Manifest b/app-editors/gnome-text-editor/Manifest
index 187c4692ee28..64d18b38c1e7 100644
--- a/app-editors/gnome-text-editor/Manifest
+++ b/app-editors/gnome-text-editor/Manifest
@@ -2,4 +2,4 @@ DIST gnome-text-editor-42.2.tar.xz 1168504 BLAKE2B 0bbd02fab92c3ac2df2a38352561d
DIST gnome-text-editor-43.1.tar.xz 601588 BLAKE2B 0e3b7231327898b554360cfa45c3ba9f8ff005f61b6f68f6ea431d1c9e459b429af4da794b06ce6f4618de06c96a191477f1cadd61cfa6ae9e1ae350b75658a1 SHA512 aab2fcf5d0ad705833802bec3ccacce175c16dc717b521e0b220ddf5420760ec76a90db9b4f4ee0722c2b19a40304e1c379f06f2983e4597df233ade67a0f725
EBUILD gnome-text-editor-42.2.ebuild 1034 BLAKE2B 529a22dedf22189af0f29a43f858cf45a85407ebe0a2e3381d0822c482c3106ed306f9d566615fce747114f002d1b7ef723a22e3858a5cb8fb26b9dd21e47447 SHA512 a42fe9bc4648c8f32beb360c20531ca0df19055231467214280b50390cb22463f4b2683d12d67a22400544753fa801840ac38c45a732914ac5c845d8b60384a8
EBUILD gnome-text-editor-43.1.ebuild 1017 BLAKE2B 0a70bdb76dfe9dc0cf5105b96cd1e370b28d353b32c2dca6213aaa0b748e9ab17ec991ee46506c56b1ae3b100f2dce1e9b19d1c68c815d200a25020e86587f63 SHA512 b1970bfe3ba30187bc041f042166bfa488151cd2c9a980a0675e31bf1374f120569bf66e874be4ca0cf824aa66b45ebbe964b879df6d3332eff5b1a86b4a67f0
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 358 BLAKE2B 908c67ba226a7e65b72a1cbaea99350f05fe9f904644c99b9c4e1e0c81f795c1420a0ca9cba1d56f59fb1b841151ffcf7d088add9f36a0e88314f7f52da94fcf SHA512 5862fb965119f76e19ed997e53e651778458604f1f9b69a1ee04db8eac52bdb6352da84ecb92555b31d3b8c62aa544c57c6040ed358af3beddd35fe356744d85
diff --git a/app-editors/gnome-text-editor/metadata.xml b/app-editors/gnome-text-editor/metadata.xml
index 7b343b06be8a..b96389a37794 100644
--- a/app-editors/gnome-text-editor/metadata.xml
+++ b/app-editors/gnome-text-editor/metadata.xml
@@ -1,8 +1,11 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+ GNOME/gnome-text-editor
+
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index e076d97b7240..ce93086ef31f 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,8 +1,5 @@
-AUX gentoo.nanorc 4212 BLAKE2B e8e50c1b98f0b593d83bc35c84e79d5d0db6b076862635498bbe81c4413d4818cae3027c163556335c6ae7284545c99477c7269a0df78a9ac694912b28de1939 SHA512 b347ab4e92b2418f59e1f2e0f1d6993102fd2c237eb4cb7daac373f48cc0071f0c3b47f4354e2e4fef00285fe5df22958694238fb4b017f7eff745c84166dc10
AUX gentoo.nanorc-r1 5378 BLAKE2B 0d9a506a87ec75eab5cf04d94f65c3089f0cb442e705fbefc70b4a5b1d08fd360bfc136b6e1cdc4ed480f4ffb6b37b81a019869aa7e322b3f96219241a2d1569 SHA512 bc8db27b8509059833ce1939a3c63d8389968366118596f2a832e188ea5f3e8eb2b66e781ceaabd58c941bbb8ca6818b363189ac267a96f0943bbd64983b5c65
-DIST nano-6.3.tar.xz 1581772 BLAKE2B 92ef2acac0dacebc0bf8364bfee928a8394d8e4323e622ad6ba9d35bebd18d3976ab0ca747f7c9b5597874775b44ba4b5560e7392606aa68736158c2bda62b92 SHA512 42279bee54f4d83a0dc06e93c2f385798c304a41e995461b018f5724010213761455563cb53e2411e12bc43c7245e289f4254c359717ca1b89a34d5af8b8c3f3
DIST nano-6.4.tar.xz 1593804 BLAKE2B b59ff7a741ce4c8b31afdbbfaf1d704cccbceddcd7f1421f30a6dd40495ec456ca891aeb9777c070c6cce4e9c594f83798ff0cdacdfe06e81b0aa0b700033da3 SHA512 cff2d9d90f1a23ab8905320e651f8bbc9d38046153a4f64bbc21927687d9628135915468b00b28f88a0eb7d395d1bcb0b9b7abcf367e5a46a5f3da01d8d6e72b
-EBUILD nano-6.3.ebuild 2636 BLAKE2B 79f9097ec7bb0052b66c476767c7d1e5ccfdd96f4c8b5ff539b7a1d65f7f171b88c124c88e31ed99ce1f39742ec1cec34e1e254d2541faec5fbef6ed8a173c39 SHA512 8ab371ea08c4afce84d74962a61bdb62e30cb5a1a1db049e6a9493b9b8fde6dce6d67424938f335654af7b997f0c239a61b69aa93fa55382599d6c9eac4915f7
EBUILD nano-6.4.ebuild 2669 BLAKE2B 17f06b3f4370205742d036f7ca81964532bd22ba7274373429ad148a353335d3fce1eb9ce9a17c5782c3d9e292b274ee2c8a7ff934b04d7f526cf91e6ddc2d6e SHA512 e126669ae0ea24fd3f7d5d173832a6e252b92f5b5be2d8220a24d1b617b361ff6b3d16bc621a2f59497ad6950c0065419b7d9c91fd3b4502660d65d59673815e
EBUILD nano-9999.ebuild 2677 BLAKE2B 5b2697a9c63c708506d47657c7cc599edbe1779250e42625c8862510c5d526a6ff73b62b040a930021e1f1cc2c58aff3cf76c85e9da1bd5cbc3987f49fdef5dd SHA512 d7f0aa86e0f655e796a78622c216ea8fb4047791234ec3d0e77e736763a76c675267f51ed5a3cdc0cd0bf5a32855bf434886c5119dd29eb6c5ebe6ce3c05adb1
MISC metadata.xml 1677 BLAKE2B f6ed764002859bb082787004b858cc2098273fe034df9215ab380c90d2b6dcea168cd92b2fb6ea69ea157e9f9cb239e5499fb1dd8337d167c13031f8b5505343 SHA512 cf2a9a4224b47bc7657c2bfedacba1db7f66e8f1de25fa6203eb9fcd779bc646cc19ddfcc2b7f2555c8f1d8f173c87792db16667535cd053f1a21fc658ad518f
diff --git a/app-editors/nano/files/gentoo.nanorc b/app-editors/nano/files/gentoo.nanorc
deleted file mode 100644
index edf4ae109b1e..000000000000
--- a/app-editors/nano/files/gentoo.nanorc
+++ /dev/null
@@ -1,74 +0,0 @@
-## Syntax highlighting for Gentoo ebuilds/eclasses,
-## and (further down) for Portage control files.
-
-syntax ebuild "\.e(build|class)$"
-comment "#"
-
-## All the standard portage functions:
-color brightgreen "(^|\"
-color brightgreen "^pkg_(config|nofetch|info|pretend|setup|(pre|post)(inst|rm))\>"
-color brightgreen "\"
-## Bash-related syntax:
-color green "\<(break|case|continue|do|done|elif|else|esac|exit|fi|for|function|if|in|read|return|select|shift|then|time|until|while)\>"
-color green "\<(declare|eval|exec|export|let|local)\>"
-color green "[][{}():;|`$<>!=&\]"
-color green "-[defhnrsuwxzL]\>"
-color green "-(eq|ne|gt|lt|ge|le)\>"
-## Variables... official portage ones in red, all others in bright red:
-color brightred "\$[-0-9@*#?$!]" "\$[[:alpha:]_][[:alnum:]_]*"
-color brightred "\$\{[#!]?([-@*#?$!]|[0-9]+|[[:alpha:]_][[:alnum:]_]*)(\[([[:digit:]]|@)+\])?(([#%/]|:?[-=?+])[^}]*\}|\[|\})"
-color red "\<(EAPI|ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|[BIPR]?DEPEND|PROVIDE|PROPERTIES|REQUIRED_USE|RESTRICT|USERLAND)\>"
-color red "\<(S|E?D|T|PV|PF|P|PN|PR|PVR|A|CATEGORY|DISTDIR|FILESDIR|EPREFIX|(B|E|E?SYS)?ROOT|WORKDIR)\>"
-color red "\<(AS|C(PP|XX)?|LD)FLAGS\>" "\" "\<(MERGE_TYPE|REPLACING_VERSIONS|REPLACED_BY_VERSION)\>"
-color red "\"
-color red "\"
-color red "\<(PATCHES|(HTML_)?DOCS)\>" "\" "\"
-## Portage commands:
-color magenta "\<(use(_(with|enable|if_iuse)|x)?|in_iuse) [!a-zA-Z0-9_+ -]*" "inherit.*"
-color brightblue "\"
-color brightblue "\" "\"
-color brightblue "\" "\" "\" "\"
-color brightblue "\" "\"
-color brightblue "\<(die|hasv?|inherit|nonfatal)\>" "\<(use(_(with|enable|if_iuse)|x)?|in_iuse)\>" "\<(has|best)_version\>"
-color brightblue "\<(do|new)(ins|s?bin|doc|header|lib(\.so|\.a)?|man|info|exe|initd|confd|envd|pam|menu|icon)\>"
-color brightblue "\" "\"
-color brightblue "\" "\"
-color brightblue "\<(doc|ins|exe)?into\>" "\" "\<(exe|ins|dir)opts\>"
-color brightblue "\"
-color brightblue "\"
-## Common commands used in ebuilds:
-color blue "\<(awk|cat|cd|chmod|chown|cp|echo|env|find|e?grep|ln|make|mkdir|mv|popd|printf|pushd|rm|rmdir|sed|set|tar|touch|unset|xargs)\>"
-## Comments (doesn't work that well):
-color yellow "(^|[[:space:]])#.*"
-## Strings (doesn't work that well):
-color brightyellow ""([^"\]|\\.)*"|'([^'\]|\\.)*'"
-## Trailing space is bad!
-color ,green "[[:space:]]+$"
-## Mixed whitespace is also bad.
-color ,green " "
-
-
-syntax /etc/portage "\.(accept_keywords|env|keywords|mask|unmask|use)(/.+)?$"
-comment "#"
-
-## Base text:
-color green ".+"
-## Likely version and slot numbers:
-color magenta "-[[:digit:].]+(_(alpha|beta|pre|rc|p)[[:digit:]]*)*(-r[[:digit:]]+)?([:[:space:]]|$)"
-color magenta ":[^[:space:]]+([[:space:]]|$)"
-## Use flags (must come after version/slot):
-color brightred "[[:space:]]+\+?[A-Za-z0-9+_@-]+"
-color brightblue "[[:space:]]+-[A-Za-z0-9+_@-]+"
-## Accepted arches:
-color white "[~-]?\<(alpha|amd64|arm(64)?|hppa|ia64|loong|m68k|mips|ppc(64)?|riscv|s390|sparc|x86)(-(cygwin|linux|macos|solaris|winnt))?\>"
-color white "[[:space:]][*~-]?\*"
-## Categories:
-color cyan "^[[:space:]]*[^/]*/"
-## Masking regulators:
-color brightmagenta "^[[:space:]]*(=|~|<|<=|>|>=)"
-## Comments:
-color yellow "#.*"
-## Trailing space is bad!
-color ,green "[[:space:]]+$"
-## Mixed whitespace is also bad.
-color ,green " "
diff --git a/app-editors/nano/nano-6.3.ebuild b/app-editors/nano/nano-6.3.ebuild
deleted file mode 100644
index 2c97dc70df95..000000000000
--- a/app-editors/nano/nano-6.3.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git"
- inherit git-r3 autotools
-else
- MY_P="${PN}-${PV/_}"
- SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode"
-
-LIB_DEPEND="
- >=sys-libs/ncurses-5.9-r1:=[unicode(+)?]
- sys-libs/ncurses:=[static-libs(+)]
- magic? ( sys-apps/file[static-libs(+)] )
- nls? ( virtual/libintl )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-BDEPEND="
- nls? ( sys-devel/gettext )
- virtual/pkgconfig
-"
-
-REQUIRED_USE="
- magic? ( !minimal )
-"
-
-src_prepare() {
- default
- if [[ ${PV} == "9999" ]] ; then
- eautoreconf
- fi
-}
-
-src_configure() {
- use static && append-ldflags -static
- local myconf=(
- --bindir="${EPREFIX}"/bin
- --htmldir=/trash
- $(use_enable !minimal color)
- $(use_enable !minimal multibuffer)
- $(use_enable !minimal nanorc)
- $(use_enable magic libmagic)
- $(use_enable spell speller)
- $(use_enable justify)
- $(use_enable debug)
- $(use_enable nls)
- $(use_enable unicode utf8)
- $(use_enable minimal tiny)
- )
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
- # don't use "${ED}" here or things break (#654534)
- rm -r "${D}"/trash || die
-
- dodoc doc/sample.nanorc
- docinto html
- dodoc doc/faq.html
- insinto /etc
- newins doc/sample.nanorc nanorc
- if ! use minimal ; then
- # Enable colorization by default.
- sed -i \
- -e '/^# include /s:# *::' \
- "${ED}"/etc/nanorc || die
-
- # Since nano-5.0 these are no longer being "enabled" by default
- # (bug #736848)
- local rcdir="/usr/share/nano"
- mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die
- rmdir "${ED}"${rcdir}/extra || die
-
- insinto "${rcdir}"
- doins "${FILESDIR}/gentoo.nanorc"
- fi
-
- use split-usr && dosym ../../bin/nano /usr/bin/nano
-}
-
-pkg_postrm() {
- local e
- [[ -n ${REPLACED_BY_VERSION} ]] && return
- e=$(unset EDITOR; . "${EROOT}"/etc/profile &>/dev/null; echo "${EDITOR}")
- if [[ ${e##*/} == nano ]]; then
- ewarn "The EDITOR variable is still set to ${e}."
- ewarn "You can update it with \"eselect editor\"."
- fi
-}
diff --git a/app-editors/qemacs/Manifest b/app-editors/qemacs/Manifest
index 2f417e7f88d9..48ca746b6ab2 100644
--- a/app-editors/qemacs/Manifest
+++ b/app-editors/qemacs/Manifest
@@ -3,4 +3,4 @@ AUX qemacs-0.4.1_pre20170225-manpage.patch 372 BLAKE2B 68e2d415700e576c570678803
AUX qemacs-0.4.1_pre20170225-nostrip.patch 1771 BLAKE2B af8ad554ea5dbdcd8e7a3df32a4ff5402e84f56642a74f228b0c5be8166895b82b90e291f043a5e18a757b6e6de69ed50af3950c719f2b40be1e3d1e031c2031 SHA512 9ad3c3cd4a7744894718099ff8df2648e11385c6926a137f3f04ed33ef449d658cfb873476276bc52de7a7cee5ed2a2319893d8f47e7a2413d00d61378123656
DIST qemacs-0.4.1_pre20170225.tar.xz 1147408 BLAKE2B 369f3c5ff1b1f7b22bbd1f70f0c150e425a5b68828e62db427e4b41c58c8ee9ae0449a83693e9354d88fc482691d7a5f3661360ef602aeaba963776c4725b894 SHA512 a17c8901c917f91401e16b4f857735957ab0d3533d9dcc7a0decf768f453b68023f45e1241225a84d35ba793beb69754e0f2caa857165f8223882d5041d56c99
EBUILD qemacs-0.4.1_pre20170225.ebuild 1523 BLAKE2B 2cb0eb2d3aa9061f6e4e71e04797e4cf12dad9ec0ea58fd1d43aa13a8f6af6b6a1cc913b5a97fa67e0c72e034ab680cfc316e2616d214233456335663d29c4b7 SHA512 a6b57e99ab0421357863d8d58ce0a8e9cfa49ac24b4ea6ab3b039680a5051bb8cd9078034f819bfc007aaf98ecc0808c2203e1ba1bcfa630007334a35b88d1b6
-MISC metadata.xml 1938 BLAKE2B c5293f8a3aeaf7f3ff131dc4067ffea4d4bf10708cff068dee871bb95254f9d5d60d97752e5c8180870a69f404de1a44004cb0174dd11d71a1adfda23cd6fe7c SHA512 24ad0431bc56a92856391904c28053b48da8b63db03d7ed1b643b4ea5b7f9c344dda47f340352c311bf5987a841f6fce514d3a02f4c0f745b6e51198ddadb4ac
+MISC metadata.xml 2016 BLAKE2B 9e154f975526e4a36555d752924cdd7610c01a7f643351bd6cdbadf027c2e62f7bbd3296b74a9693331aa3092afd7edf8977460d4420c7b9772fa0d6f168e683 SHA512 8445c0dfc407c03f87799917d1f422bf50cbd39956b679131461f903aea439b80474f9f4677e82d2d50759d88cf7460b32ef6e246098186e393cd5e3dbbdc7f7
diff --git a/app-editors/qemacs/metadata.xml b/app-editors/qemacs/metadata.xml
index fd4cdb06be09..579725de06cb 100644
--- a/app-editors/qemacs/metadata.xml
+++ b/app-editors/qemacs/metadata.xml
@@ -35,4 +35,7 @@
* Small! Full version is about 150KB. Smaller custom versions can be built
by removing modules.
+
+ qemacs
+
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index a4eb41230af8..d000f9e6c115 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/bbdb/Manifest b/app-emacs/bbdb/Manifest
index 78ecb31f58c0..9b0b3f3d4cfa 100644
--- a/app-emacs/bbdb/Manifest
+++ b/app-emacs/bbdb/Manifest
@@ -7,4 +7,4 @@ DIST bbdb-3.2.2b.tar.gz 199518 BLAKE2B d6eef625636689d204ed9c6c7f299380924da5b02
EBUILD bbdb-3.1.2-r2.ebuild 1236 BLAKE2B 4fe817fd96846ec01e582eb9852b5e8bfd2ff695206b67ecbb6f47cda5eff6627efaeec21d7b99e87e35c1b499f9fe42dc4e89fb11a60e3956410d96f2f5ccd5 SHA512 ce494c3108c49a36f09160e023575351daad22b0ae4f42c9cc1732019cdaaf6fbff0da245ab4ef8aa4833c0d9d6dfe5ea2b65d6e370702a9c396695a69596f96
EBUILD bbdb-3.2.2a-r1.ebuild 1553 BLAKE2B 43bc79c22aa12b2abf422087e8210ff02d0aa550c81d9300409a7f79c7fec3a5ba630f3e1007ef73254e6831ea83934d3e4ef583373cb33745862daf3a54c10e SHA512 b8e08a3ebfdf6a7dd9c48bbeb8c3550771c2b130e4d0db0e1f2704687647a9a3c7b62db7d189ca2340f0d52bdc2cae4b8ef159fcd4f12ff16a23db561a5c64d6
EBUILD bbdb-3.2.2b.ebuild 1484 BLAKE2B 56a9ffd2a784c92b6c5d4e36982566e7ef7432f1cf6654a719abfb1558eb4a7bade4871de0211f621d4a35f6d38be03e071083c3067bc0074f41efac6c26d637 SHA512 b3ae5049f0ad3cb9e500be94833fc26fc819ff70a3d483717819b8650180aa0ba6bee6acce6467e5284a59f993b8f69462d5e4c391cc9892d516f34351963b9f
-MISC metadata.xml 835 BLAKE2B 8079066283e974e301b6f75a0a61907634425cb0b0e1406aaf80003c07b562b93c0e5deabfc6273443f36b7667215f7840ff8bd54febb862ffc23ebb1bb669dc SHA512 2921d9e1f452a42c1752a4f2d533f8ad1eba3a08d48855c8bc81e1b3532990a4728adbfdb4cde12b83b19e02f395bcf2293600ad670a4bcf8b036179e7e783fa
+MISC metadata.xml 888 BLAKE2B 72afc8fbf4be6831c0d832612654ecd58fa3be9843f196a0b1ff1a036dc4840aa97d435cd70dfa649031b35b2350972698ce0268e089c38a8abe741b8019dc83 SHA512 cbb62c59a3fe33f1a8d568406a5a8ca99754de4dd7bb681bdb839f07250b70d6063d1ce596e61741a1e524a4728804ccfc5951a4f897568e45e863e3e7e21ceb
diff --git a/app-emacs/bbdb/metadata.xml b/app-emacs/bbdb/metadata.xml
index aaffcca93625..66ad8f6e5c9c 100644
--- a/app-emacs/bbdb/metadata.xml
+++ b/app-emacs/bbdb/metadata.xml
@@ -18,5 +18,6 @@
bbdb
+ bbdb
diff --git a/app-emacs/boogie-friends/Manifest b/app-emacs/boogie-friends/Manifest
index ddb30d86b500..31be6fe34454 100644
--- a/app-emacs/boogie-friends/Manifest
+++ b/app-emacs/boogie-friends/Manifest
@@ -1,5 +1,8 @@
AUX 50boogie-friends-gentoo.el 468 BLAKE2B aa47d15fbff7c60b4997a1d857066cc0451217d035a59c65f291afd13093df64001aa3619e5b10bc0f8424d0469e5882737b2c875e16f78b2b0235d6fe7b2191 SHA512 051ded39d076ffd0c10bf22a27e58f066c61e022fa62c2da00436be140a6f5b2cf32a371911761994ca0d16dea06a6a0b5e960f890cf3cf939a46e910c65797d
+AUX boogie-friends-flycheck-dfy-exe.patch 465 BLAKE2B b7f67a31d7842c974ba8d12edfd7a0d50f6d77b2b6c07548835a1f114e0bc3c07deb7315de2febdfb8a79341ef1da13a53d13fe26be0b2582b1739b12db5ebc5 SHA512 934f28a70f5e29ab1b44cef3d8aa21a349705da10c7bdee180605cdf96f0243bf79ae8953cfb2bdddd5ecabc046de8738717c0884f3c792a3ab7c20a1d0a8576
AUX boogie-friends-paths.patch 451 BLAKE2B 5a964d94d6e2c7d491942d9ca7a6cd9ed84efd678a3db73e9dabbe64dbc11311f7ecd1b4711c0507cfde503d60f3607ebe13d6402fb30f796da8c7c3ba2f4fca SHA512 1697d0268c624f47e0f89314a51cedd63cd42d6cb0b0184118307258dd3e01ece26185386b152f67520c364f568bac296161ce4e46d6a3397da6cb5f555dfbd5
-DIST boogie-friends-20210703.tar.gz 410267 BLAKE2B dd00a175e1a5f11916b35f852e90b4cbb6f5f59947075efd1b12b5bea341731a0cba3ba7f42d515d2b8600a96d52d1f2b51ee4fe68274df5e00993443ebc4ecd SHA512 23488a452bd1baa1bc562efe3f7b53b94d58e4bc542a6c3d7c1baa255d379dd056c0cb4168e1d79caaaf746426f612aa5dea1e545931c549dcd0fa3f50751324
-EBUILD boogie-friends-20210703.ebuild 970 BLAKE2B f1420420e41a01e769d7a63ec3170f03f24d48279962d3c43d37bd3b75f9d7c45a0c2e5e9d62be9ba8eb1ed2071aba66f8b3c7930caf332fe57805242fdce5e1 SHA512 ea33ddffc2620e6479f2b1632dfcc247b944958f9b9f60f229166cb4475aabd0671855eac06bda9aaa6d2dac505bffddc5f577b81114daa24e0ff7a7b1c4ecc0
+DIST boogie-friends-0.1_p20210703.tar.gz 410267 BLAKE2B dd00a175e1a5f11916b35f852e90b4cbb6f5f59947075efd1b12b5bea341731a0cba3ba7f42d515d2b8600a96d52d1f2b51ee4fe68274df5e00993443ebc4ecd SHA512 23488a452bd1baa1bc562efe3f7b53b94d58e4bc542a6c3d7c1baa255d379dd056c0cb4168e1d79caaaf746426f612aa5dea1e545931c549dcd0fa3f50751324
+DIST boogie-friends-0.1_p20220922.tar.gz 411351 BLAKE2B ca5b500f009254ee07199c538c0372756599b1ba89e735ee19a007233a181b6cad148eda13a8c1e7ebd604e882808e2daa8743b3cdcb0f5f71d46f3f2a91cb5f SHA512 4d76a31335dd795617106421dbc9c4833e93831fb9235d34a371aac7c1f68920798b43d9034ff3ca99e8bb20d645c5b7134d60cd46fc111ff2f92984613f8b4a
+EBUILD boogie-friends-0.1_p20210703.ebuild 970 BLAKE2B f1420420e41a01e769d7a63ec3170f03f24d48279962d3c43d37bd3b75f9d7c45a0c2e5e9d62be9ba8eb1ed2071aba66f8b3c7930caf332fe57805242fdce5e1 SHA512 ea33ddffc2620e6479f2b1632dfcc247b944958f9b9f60f229166cb4475aabd0671855eac06bda9aaa6d2dac505bffddc5f577b81114daa24e0ff7a7b1c4ecc0
+EBUILD boogie-friends-0.1_p20220922.ebuild 1014 BLAKE2B 03cbbe906bfaa172f7bd0a07d334c7a6547016002301a91b01680ee9ec308442cedfffaf151fc7bf114ad68c362992ec05c00e8310014f881f99a78ffffe857f SHA512 27d4b86d21580bf3848690a7efeb8f003b298b2293d28cebf310c3c87cae05ebf5a41e4aa6e93322e373959eef232ca9f67790058ffbfee97317127d12887012
MISC metadata.xml 667 BLAKE2B a08efa1145ce0d914e3e588bdf8c8380318ba958709cf725422d5ab66f9a170421babaf874db640c7589499baac3354e6355a9f0cbafb21c77dadaa4ca89bfb2 SHA512 307a812a135acd79f9bb4efb22a1ae1e7010b797afab63486ff7468cfd4da10113d845e863857d4a6b7c95204b18ee69126e961bc93ed6103f2bdf3c4e8534a3
diff --git a/app-emacs/boogie-friends/boogie-friends-20210703.ebuild b/app-emacs/boogie-friends/boogie-friends-0.1_p20210703.ebuild
similarity index 100%
rename from app-emacs/boogie-friends/boogie-friends-20210703.ebuild
rename to app-emacs/boogie-friends/boogie-friends-0.1_p20210703.ebuild
diff --git a/app-emacs/boogie-friends/boogie-friends-0.1_p20220922.ebuild b/app-emacs/boogie-friends/boogie-friends-0.1_p20220922.ebuild
new file mode 100644
index 000000000000..df8519fe6a52
--- /dev/null
+++ b/app-emacs/boogie-friends/boogie-friends-0.1_p20220922.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=8d1bafab5dffc3c63324b5306503943e67497ddc
+
+inherit elisp
+
+DESCRIPTION="Emacs tools for interacting with Boogie, Dafny and Z3 (SMT2)"
+HOMEPAGE="https://github.com/boogie-org/boogie-friends/"
+SRC_URI="https://github.com/boogie-org/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${H}/emacs"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test" # broken tests - no "tests.dfy" file
+
+RDEPEND="
+ app-emacs/company-mode
+ app-emacs/dash
+ app-emacs/flycheck
+ app-emacs/yasnippet
+"
+BDEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-flycheck-dfy-exe.patch
+ "${FILESDIR}"/${PN}-paths.patch
+)
+
+ELISP_REMOVE="boogie-friends-pkg.el"
+SITEFILE="50${PN}-gentoo.el"
+
+DOCS=( ../README.md pictures )
+
+src_prepare() {
+ elisp_src_prepare
+
+ sed -i "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" ./boogie-friends.el || die
+}
+
+src_install() {
+ elisp_src_install
+
+ insinto "${SITEETC}/${PN}"
+ doins -r etc
+}
diff --git a/app-emacs/boogie-friends/files/boogie-friends-flycheck-dfy-exe.patch b/app-emacs/boogie-friends/files/boogie-friends-flycheck-dfy-exe.patch
new file mode 100644
index 000000000000..4f297a247244
--- /dev/null
+++ b/app-emacs/boogie-friends/files/boogie-friends-flycheck-dfy-exe.patch
@@ -0,0 +1,11 @@
+--- a/dafny-mode.el
++++ b/dafny-mode.el
+@@ -553,7 +553,7 @@ open Dafny buffers."
+
+ (flycheck-define-command-checker 'dafny
+ "Flycheck checker for the Dafny programming language."
+- :command '("Dafny" (eval (boogie-friends-compute-prover-args)) source-inplace)
++ :command '("dafny" (eval (boogie-friends-compute-prover-args)) source-inplace)
+ :error-patterns boogie-friends-error-patterns
+ :error-filter #'dafny-error-filter
+ :predicate #'dafny-predicate
diff --git a/app-emacs/nxml-libvirt-schemas/Manifest b/app-emacs/nxml-libvirt-schemas/Manifest
index 74197cda87f3..d7744f6855db 100644
--- a/app-emacs/nxml-libvirt-schemas/Manifest
+++ b/app-emacs/nxml-libvirt-schemas/Manifest
@@ -1,10 +1,6 @@
AUX 60nxml-libvirt-schemas-gentoo.el 206 BLAKE2B ae9d1fe1da9c86d14796c09597ca34b10dd0e28abb02fdeac4607b8d950bfdf636f5f3c1de49cd5b9cf1fa808513522ab43272f3c26361b871ad0d630a942ed6 SHA512 5592edb5663066fcccaf5b05c3df671b4069d4d259376a8a91ef3f7ae5990687b15dfdf40e6f7aa6cc7d62b7cdaa5090fd851de0ed2718d20ecfe3e3a78530ea
AUX Makefile-trang 108 BLAKE2B 4f80e5f4e0550bd4732668ae5298d890d2293d34379902cf204c43bbea5db01626847af7ab96854efcbcc34e7fe9b1c32873ad22ef13873a1a06790e9580371d SHA512 3544959cc57ce1b273e4b9de95f51e1e21d23cc35fb48e02f179a055a61ee9092efdc43405f72c3aacb3c74eada7fabf5952eb49e3ff0514fd69a3092268dc4f
AUX schemas.xml 560 BLAKE2B 32f01d2dd047aa7109112b47155a21825686385845fae2af0f6d052dbd36f3e1ca5027ec39d654735e390ef9aa8a31f7ae5c86b15b0cd9c4ef84128326e87ee9 SHA512 82ef6189610fc4e1a0d5546ae15f2f315e7c0d460fa141201c43a93e59d147613c7186302fdc3e6b2f0ec5c343e5566966892d4e9f55dc4957e4ad58793fc3ff
-DIST libvirt-7.10.0.tar.xz 8798000 BLAKE2B 6cb2ab5913d382b11d24b46154dc3250355050cd3038f64ba571b35f33ae5bd0a322d4b96469bd6c78fd848c87f2e6fc7213c33e5bdb9d375a9b81d2a40899bb SHA512 c7eecc9538b68852a8cc67565566d64ec7b087b6f009858b2eb524bc3ef0f6ca3c0da67edf801e6a3ae3fcc0364e65e108fa92bcb01ee810c85fa5f37785aa32
-DIST libvirt-8.7.0.tar.xz 8937316 BLAKE2B 131d46206662627e952b6daa3ceeab187321ff5fb1984980bc2816dfedf730c6ccd4b5a1cbfb46f33cc9e84508621e2625fa661f06b9e35561e8de52906824e5 SHA512 35d33d0e0dab525e8f0a8a592d286e9d17fc5c5d1ff2fab5af5c40b85248481dd17b5c3daf64e8c6e1b8a93328eebee6ece3e95edacff208a81d8b78dc102d7a
DIST libvirt-8.8.0.tar.xz 8941928 BLAKE2B f3b8cb4fe30a156884a03e5c873f3fcef0c8d13315c79b865f387ea053635ae2435a3b4d6e81c988cfcd087d55223450e7b874e24e4503479d152b417c398250 SHA512 868e49b369afe200c5af6e2cd0606de2eeebfa92523b5ad3c653203c8838d304bd0cdc5acfb3c4d4c33c0a87ab8e769b84cc62e3f06e055936c43573a23d7190
-EBUILD nxml-libvirt-schemas-7.10.0.ebuild 873 BLAKE2B 02b97f936c302f2657280e597ed595b6061e6c71d6fe4c1e2f06c667da87dc51f5b6554ee4392b85f5f12e29f33df7a5a2ab6c4fa1fbe3fa09e66ab786d1ef5f SHA512 1f143986674b1878271a4c6e49fc7473ebbb8900ebfcf662467a84437f072de2e665395381e619e0cffafaefc24ecaf99ae26ccc22e3c0ae0783ab4a55a5be35
-EBUILD nxml-libvirt-schemas-8.7.0.ebuild 1052 BLAKE2B 2f66499763abab90bc7ff91c49853d5c2be7dda44b0c708443f531db1d2e82fafc8db3c8c5363695b65e40a46cea9838eadd53aca68285e22bd9d31e9b3bc94e SHA512 e633a25db9d1c550952d94b8a37ed74cc37c645e14f01463a62ed4d41c6aae26abd325ec0535691a9be61b6c653853cf99f21633ace83ddc0bd1cc34416583c8
EBUILD nxml-libvirt-schemas-8.8.0.ebuild 1052 BLAKE2B 2f66499763abab90bc7ff91c49853d5c2be7dda44b0c708443f531db1d2e82fafc8db3c8c5363695b65e40a46cea9838eadd53aca68285e22bd9d31e9b3bc94e SHA512 e633a25db9d1c550952d94b8a37ed74cc37c645e14f01463a62ed4d41c6aae26abd325ec0535691a9be61b6c653853cf99f21633ace83ddc0bd1cc34416583c8
MISC metadata.xml 390 BLAKE2B 05bd110c71244cf02d22bcf823d3285e73bdb03f3bb06b8c9e2c13cd346f2367380345747d5eb0861f37983be970dc6c9fe5e7d93b422205a7b447dc3330852e SHA512 bb803aed730418caf43baf132b989963e84f5e0e0d8db915a48cae407f20fb52e27c147725cac88fc94303db070f300a7ce3bf6c18e7dc66dec37bf9ccea5f5b
diff --git a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-7.10.0.ebuild b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-7.10.0.ebuild
deleted file mode 100644
index c3597d40e521..000000000000
--- a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-7.10.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-MY_P="libvirt-${PV}"
-DESCRIPTION="Extension for nxml-mode with libvirt schemas"
-HOMEPAGE="https://www.libvirt.org/"
-SRC_URI="https://libvirt.org/sources/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P%-rc*}/docs/schemas"
-
-# This is the license of the package, but the schema files are
-# provided without license, maybe it's bad.
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# Yes this requires Java, but I'd rather not repackage this, if you
-# know something better in C, I'll be glad to use that.
-BDEPEND="app-text/trang"
-
-SITEFILE="60${PN}-gentoo.el"
-
-src_compile() {
- emake -f "${FILESDIR}"/Makefile-trang
-}
-
-src_install() {
- insinto "${SITEETC}/${PN}"
- doins "${FILESDIR}"/schemas.xml *.rnc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-}
diff --git a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-8.7.0.ebuild b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-8.7.0.ebuild
deleted file mode 100644
index 1c0188f9655a..000000000000
--- a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-8.7.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Packages which get releases together:
-# app-emacs/nxml-libvirt-schemas
-# dev-python/libvirt-python
-# dev-perl/Sys-Virt
-# app-emulation/libvirt
-# Please bump them together!
-
-inherit elisp
-
-MY_P="libvirt-${PV}"
-DESCRIPTION="Extension for nxml-mode with libvirt schemas"
-HOMEPAGE="https://www.libvirt.org/"
-SRC_URI="https://libvirt.org/sources/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P%-rc*}/src/conf/schemas"
-
-# This is the license of the package, but the schema files are
-# provided without license, maybe it's bad.
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# Yes this requires Java, but I'd rather not repackage this, if you
-# know something better in C, I'll be glad to use that.
-BDEPEND="app-text/trang"
-
-SITEFILE="60${PN}-gentoo.el"
-
-src_compile() {
- emake -f "${FILESDIR}"/Makefile-trang
-}
-
-src_install() {
- insinto "${SITEETC}/${PN}"
- doins "${FILESDIR}"/schemas.xml *.rnc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-}
diff --git a/app-emacs/quilt-el/Manifest b/app-emacs/quilt-el/Manifest
index 115c99be4cac..7331558f988f 100644
--- a/app-emacs/quilt-el/Manifest
+++ b/app-emacs/quilt-el/Manifest
@@ -2,4 +2,4 @@ AUX 50quilt-el-gentoo.el 295 BLAKE2B 2179c4c7635fc79dcfc5444f37c2c38d35468a9c117
AUX quilt-el-0.45.4-header-window.patch 297 BLAKE2B 87d5157dcf03d8975afd0b72d223c2a2133039aecafd9f283ec2729e440fee56719d1ca02be7565c22bc3e1c887ac57677dd771ed4b4d11681e1d21315036bc3 SHA512 fe12a4a4326bf586441b838dbc52bf8bd32fe639208ce5078627f24f13a5e49547ac1361117f8fc9578689d1b953ba2724981b9e563ab14192cdc1d78c59fff5
DIST quilt-0.66.tar.gz 413069 BLAKE2B 41201d54cb26d4761413365fe19b65bd6971ada1e69198d2edbc346df6a3060ff3af4d80551d68ab4ffe003183bc0a28515ce1d070db95f2b1a04a0680ac4fb2 SHA512 c2cb75c0937612e1e0da25b713acf629b6b5aacbd8254d8bd17220b63c7b8ca996cd9d0315a32d67d54a4a7dc01b212cdda33afaacf3db063da757f1973306f4
EBUILD quilt-el-0.66.ebuild 565 BLAKE2B eba5e233c6eef9c74b9c401041787265f6d2ad1c1626cce9661bccd7b4518becd8b96f68d023ef56ff5ad7ebd5650c193a3041b8eb559c7aa24b542054d8d341 SHA512 b17776fb8fca02d937121c91cc983fb583cde42ad972e50a4dba5bcd055b46190805d90950b2dcfbad06e13a5676951ddebfb38de719888036aa5e3971e5360b
-MISC metadata.xml 658 BLAKE2B 467b68d21d514645d14db8d540e68c99029a7b370b553eb3c9bcc89417c14b5cf2266e6380d283489fde05edb90564a41a7b924126720ee8718f216d8da57857 SHA512 f22819125715dba94298e9d60cd29ab9dc560442722b9ec9ff28b3c4a69b24d25991f977158314c61f7bed1b3a3c24248cf990d162080796c389ee5de9c9a517
+MISC metadata.xml 735 BLAKE2B c5c988359ffac934cbc7ad06c4fd248166dc7ee2abfc7274a84ec07501bb7826802ac4dcf69c574eabfbff75ecc7a22dd60c0a6d5f24aba33c55f5b15eaa6131 SHA512 fe9594e2d6345d4c9e8d0ab5be963059eb1a4f3fb92d68f0c6ac8cbfb9af9356bc79ba2ad021aad3b56932970953ad7a9452d88d74209a3503c9648e3f1e7448
diff --git a/app-emacs/quilt-el/metadata.xml b/app-emacs/quilt-el/metadata.xml
index 48e768fb5660..1adcbf2c04d4 100644
--- a/app-emacs/quilt-el/metadata.xml
+++ b/app-emacs/quilt-el/metadata.xml
@@ -14,4 +14,7 @@
* Some handy shortcut keys of quilt commands.
+
+ quilt
+
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 94748ea10a88..3a0b5ab146a4 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 7dc9c571979e..b6cbfca38bf0 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,8 +1,5 @@
AUX README.gentoo-r3 2065 BLAKE2B f3677b916121126c431ba32e324bcc9f04b4dfeef1ee54517cae1118c67274592d890d6d919a48af6709e9220379797549277904a02fea740a69b1bf8f2397aa SHA512 77ede8a3e1a380b334595e65ae148acd2e52d594200253dc67d68dd256db5bf72ce7ce222d067c739ce53f84634421e74726f30c0ab7a1c76b86ccdc191c8a69
AUX libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch 1281 BLAKE2B 631f813ad29db29a6eb537ecd7b9d12aed097c5e0e01c07161adac1dec8a6f129bc098172fe6de4e78a2fbe5e67052005a7c5d1d17cbbb63ad27025662b9fa34 SHA512 dc80c9fc459207dd1ff77548054ea5a51c41a2d36e1b8917eca5f69293a86168af3da47466d8ff954a8b2e0ead9f28ed7d6c2c3671cf67d0ebb4039003a0dde2
-AUX libvirt-6.7.0-do-not-use-sysconfig.patch 5001 BLAKE2B 65e6dfacc598ba771fccc1c45c504aadcc83d0d8df211e70721dd0d7e3653c2c4d44a892ece19ee7e22d95552950e21f9d9e0a4ff960d66ebd2f9999c4cd52d1 SHA512 7dd3e4cf03dd8351a644a1669be70fcc6397b27983c0ec7b716dde61c92cf7dc9c46fc841cead5ae616897d9ed60209b03d5d78a4247215f4e79d11282da91ad
-AUX libvirt-6.7.0-fix-paths-for-apparmor.patch 1974 BLAKE2B b5e9a151aa6bfbccf76ef0d6638b00cfbc3f8c4d5a722ba83699d29a32ef2f9a7d9eb678c1f61a128b0fee958a3349a4b843be08cec940f7d1e22757bc66bb95 SHA512 f81627e9c3d6c117e76a7a30af162a8ff8fafa191313155ceecf39bae2c457417152a0380d06cd3a4958b52a6ba410730cf66cd912072f7ec951b507c0a83f96
-AUX libvirt-8.1.0-docs-Fix-template-matching-in-page.xsl.patch 2214 BLAKE2B f36e1e3fecb846834d09699a914e1e79afd8f283cdef1ce1085574d1ec5b573075af26854be2e3002db49aad87d005995606bc1cb501476209ed6eba5c514928 SHA512 24f49141cfe21eee27bc9cd4c3766bca4dec10afb8e2249198e083f5f3980d157c84aa59816f448993bf6ed30d4fe2795714adf16066e8fd185df87f363a18d8
AUX libvirt-8.2.0-do-not-use-sysconfig.patch 8420 BLAKE2B 37856003bc58b69531be6b55fcc3304b71558b7a5306c2da3fbad2d5eac006ca3ebb54bd56f8e761363311a5c865d2cd072c418794fcb605562fc32f997c88a9 SHA512 84a693b870aebe0f87f518473d28d97e613b6069f497e6e49c3e8feffc96c2e709d0a7a3530c52d4d034c6b0bc7374ab61f40ddd2f071735c5baacdebcfca8b6
AUX libvirt-8.2.0-fix-paths-for-apparmor.patch 3006 BLAKE2B 641c8942d28b8f3050f67809f332b76acb9d46ccfba30387603a7f3a60f80162a290b0b3ba3dac51c488ba14ac457ecc49526e98251380eb1fd3aaf293f444c2 SHA512 1b267df41892dcf5791720a9e7cd819b65024eaa3469d7b9496b86fc67d89d90dcebddcb5baf627fdde3277400fbc6611d056267a0aa4baa4083da3f532679ec
AUX libvirt-guests.confd 2430 BLAKE2B 9d56477c9377e02503782e6d653579c6d149b292c43f37926f4646374e8aae05ca812b6a3a561811482861f8fe67dfdbe63851963326ddbbf2f4644c85411120 SHA512 78f419a89de7aabaad860903c24f1c070786fc1296d987e61dd537705b0e7f71a46c315888028f3826c3417e42861ca8471788be4ec5695e98427c5f18ae63fc
@@ -12,17 +9,11 @@ AUX libvirtd.init-r19 1124 BLAKE2B 0effd71cd3dfda0892c37e4d6d69f5d6d02320a3f0793
AUX libvirtd.tmpfiles.conf 36 BLAKE2B fa0e1dac4117dcb2a2e826c82c4c63e20156db47abf4088167484f1f3149a4998840cf1aba745621851d7e2653df5c7f7268d8d61be3a3731ea053a88f35c13b SHA512 2b1c3c64dd6fa03d8c2ae24e7ce4aa7d754913214542a68a4e99f10fbc251fd23ee26e297a957d7b4b70eec8ef028c41fc915da3a85fbbd16143bb92d1de3aed
AUX virtlockd.init-r2 573 BLAKE2B 83bbd228bd59fa29f1d974bc5eec8af0b701328a0a64bbb9e2d9cb918d5d0b3c0d5e791afa18f47ffa2c429082083912fda3f2401c3c5b3d8d85ea8b7cacf440 SHA512 11bf7208e8da8cf7b907049100d095f4d6b5d215a0955fa620e50d6d541d3ecd9d779a7903c64feb25d17545c45491d52441e14a04f2c793f3b03dee7784c482
AUX virtlogd.init-r2 572 BLAKE2B e6a86e34eda78fc032df17e1bd94095e357770f4036e19fff895266b58df7e31774f6004fec56fad9e69bf7d1afa5d898bdebe018013877f8844d05b3a46d509 SHA512 d5d83edee8a4bdf0dac79abc129ff7ec11573aa580e32963d7c7d47133e276a4427d8653683fc8b0a6c1c2aba631e5875c73454d6fef3bcac6dcaca542e69f34
-DIST libvirt-7.7.0.tar.xz 8670212 BLAKE2B 93c72117941b0a74484c7510c8437054e66fc3ad20c02cead3ce917a38868da2acff9b1e70bbb823122ba647763a3682aaa0da04d82fa75e1acc67449301ae8c SHA512 a0d585c9ac46be08d2865d66456d681b7233291d17f6e0ed2564d0f29dc38ea7afc846ab382f58a193d3cd9acaf25fcc526feb3c98e12a6b4b8ae5aa4aec2f3e
-DIST libvirt-7.7.0.tar.xz.asc 833 BLAKE2B 86a77bf461e353776d79f31f1d0c82fa13e28348bd9c6ae7cb653b98886c7e070d67ed0db55f5e1f3b5e5bd2a3861a5cb08dbf95799b14df1037139f8001b030 SHA512 d5f8cd6accd3bfaebfb7c8761e321aaa9a090c7705256785c5507aa88d985f78a788047dc881f37ea6f64a4634c65c9718d8b1ee0a24744acc3ad5ed6e517bdf
-DIST libvirt-8.2.0.tar.xz 8871236 BLAKE2B 85c4fd7323f4ea0564e6fcb37dffe643d0ff54f228a695476c1b24c78022402a86cf967503e40fad003d82528f24a02bef79466e38c133c5ad37cbcd5783f01d SHA512 fbdc2953e86117643aafb3198a3d9327188d94abfd155eae4439ee0e722737a57ee44dbb2929746c0a28e10e275c35f4a8190e99668e4cba4025555358591544
-DIST libvirt-8.2.0.tar.xz.asc 833 BLAKE2B 3dba2fe7dc76052307ab8b1d7f2a61445759ed15e130615ca2a6325e981ae5c1a7143e7d78ee67f2bf9001cdf82126dff89f4f1eb3b39b77620721a5b75f4cfa SHA512 33ecc465da1b7e4b53733611255d01414f8c1081c96fdcb0a9f1a0e194823872b7f9f9032938527f6d1d8bbebc3b61f2dc393875b8d11fdd47bec40e9408475b
DIST libvirt-8.7.0.tar.xz 8937316 BLAKE2B 131d46206662627e952b6daa3ceeab187321ff5fb1984980bc2816dfedf730c6ccd4b5a1cbfb46f33cc9e84508621e2625fa661f06b9e35561e8de52906824e5 SHA512 35d33d0e0dab525e8f0a8a592d286e9d17fc5c5d1ff2fab5af5c40b85248481dd17b5c3daf64e8c6e1b8a93328eebee6ece3e95edacff208a81d8b78dc102d7a
DIST libvirt-8.7.0.tar.xz.asc 833 BLAKE2B ebea1430670bcb44e9ffb4460388b2ab41e8b409d1513d09ac56b12f379621f5ad39af0dba9691b36220bbed5634ad24b2efda8315b41bb2e7f3f6a65e9b028c SHA512 5ac09b10de74283c474fb80cfe600a171d6b49039df73113702cda565889f6c6919e99aff6ce60538ee7fda52287ef035ee15e8f47e5f724384c6ec474e6bed8
DIST libvirt-8.8.0.tar.xz 8941928 BLAKE2B f3b8cb4fe30a156884a03e5c873f3fcef0c8d13315c79b865f387ea053635ae2435a3b4d6e81c988cfcd087d55223450e7b874e24e4503479d152b417c398250 SHA512 868e49b369afe200c5af6e2cd0606de2eeebfa92523b5ad3c653203c8838d304bd0cdc5acfb3c4d4c33c0a87ab8e769b84cc62e3f06e055936c43573a23d7190
DIST libvirt-8.8.0.tar.xz.asc 833 BLAKE2B 3919af7c208d9a5f863a9351cfcf72916ff67cbef26fe7b86bb3b1042b5556f75a4a0c5210cdb67aee79bd3706047d2d2244c967297dbf2aba2d28c625797361 SHA512 9bc3c0ae6f7fa9d6ee17ca183e218b0f2f6e413b303bd429cda090828ac0521c142178ca4c3c3bc6030c9e58f36ae5d33c7c8a9d6c8147f214e1740a78f66d2a
-EBUILD libvirt-7.7.0-r2.ebuild 8711 BLAKE2B b233dceaa93b4116d831d449dff6775f672a4b2c78b4fa4f176c1840c34bbbf73bbd5763b8e5ca65296caa2514f06a5300afdce4f37c833aeba16c912d3669f2 SHA512 0a0c8d7f1aeeb0986409f0b4031650f7bea7d45bbbae55606c3a72d1e895d9cdd973251085d75f796fc14f6997ce0999cd2affff857f113d683677071d26af96
-EBUILD libvirt-8.2.0.ebuild 8798 BLAKE2B fbaeb243dd5c1490ef864cb8b67e2a6d7e2e15c953b4d25354c4a4a02a3985495f2222de7f413f0c274f817e41e0ff0c324e65b47d13fb11c290e8793ff011ba SHA512 7db8b2a53380f65e072c4b8d943536bab752ce2f237fd8c68f1a671378686a7cb449e659004195237e69d5f21cadeea9e8c8097e1687e08e8880a15b01cb4cc0
-EBUILD libvirt-8.7.0.ebuild 8930 BLAKE2B 62b0b6de101cd6bdea2a4f88124f81d1e34d3dbae832a5d3cca2a2b0eb0be6cdf8d2ccc6ece6c2da596db593ffb055d08c5dbfb6bfb52b1774fd3a278fa64aa0 SHA512 d2faa9f8abcbfa59019686f18f2ad004b88acb4f5b7d3c22fcbb1a2959e0276412c2cced12031a1e2083c85765f7e2b59ab2428b7dc1ce0681f2e554d9964597
-EBUILD libvirt-8.8.0.ebuild 8935 BLAKE2B cae306db4cf53cdbc883a6bc57f18da32deac98354b0ca60f389e355553b3bb8b3dc747111852bdccf237ca416829db29cbd39a14b0871613d465d43fdabe098 SHA512 e15e9726a857de579f395bb0cfd68349f71affbfaa8be6b71a2cd2582f64a7d59601d2785d427f8b06ff395b0725c4866a4f9a1e0137bf95cca7eca286092b8e
-EBUILD libvirt-9999.ebuild 8930 BLAKE2B 64e5e6065478fb32a58f4bd476cf27289eb2e63b05d2d097f2897680435586d5e662290b59b0aa433e073583001a22b06cae35009e3e5c6c53722b6b33edda15 SHA512 9f2ac622ada386a8e280c9a0038aeafee1b6962c9cc89a4e5fe19ec48e6428cdb5a043357737758df397a4887caa34dfb84bd21842a52892fffbc5e9ac3013c5
+EBUILD libvirt-8.7.0-r1.ebuild 8892 BLAKE2B 47bf4c928885c5851d40a24988464dc07bca48ba25d063ccf4543181e3302173102fb39c752b0b12a983475dc671241d85c795f208802d0901dc47b4d85373b5 SHA512 da44b1181cef1ddb22e9a23fec90ce37b5bccff61777e6d9645581a96080cb518b0aceac6d7611f48bb7b52c39859f7dc17b0c9f1d455fc6ff122ebbf60a8ae8
+EBUILD libvirt-8.8.0-r1.ebuild 8897 BLAKE2B 043c99143cb6a4826e54f330de311c0cc1076fc2e1344371e1c5bf7e63f39c42a30cca0c1c6e69dfa803dece2e582dff3f22174cb5b5f0bc851968d1cb33f33b SHA512 b840590e3314a21ad9dd5c169f2c12c02005711b28d6c3f48be535c7a219457ca205b2db2e9eeb6eeba02dcab83853299605259bf1a6af36eb3d689301d50a51
+EBUILD libvirt-9999.ebuild 8892 BLAKE2B e2b769812ecffd2f7ef6d5967d538a1fbd5140ff91f7a8fde62014232a5590ac1a2b12403d143ac2c83d7d243cef5949a5c64b39a91cb392d745c62550d6817d SHA512 63741913f7725b5b7530a3b2d4384eb0a360db12dc0b9be8b3195b1545e999ee3330e4b4c46e1cf945f31704ce2f1abf47db5a69d28277f220eeb500a5d9602f
MISC metadata.xml 3729 BLAKE2B 2e68676afb3820c7b8cd3d76b0a5c42886e246fc6b440ce49c71cbe60c124cdccd4ed8fb97f7153529b758d56dfba98b6a98a31b2fbff7e738f52bce796a3476 SHA512 0dfe519af8b740de9d41b1e2c40133026718a782b654a261c54cbe22b5f694cda8b73036c59411317757b73c40acaea77f70d7ab86ae8325e78d61151e6c64f1
diff --git a/app-emulation/libvirt/files/libvirt-6.7.0-do-not-use-sysconfig.patch b/app-emulation/libvirt/files/libvirt-6.7.0-do-not-use-sysconfig.patch
deleted file mode 100644
index f3d2e3c39162..000000000000
--- a/app-emulation/libvirt/files/libvirt-6.7.0-do-not-use-sysconfig.patch
+++ /dev/null
@@ -1,169 +0,0 @@
---- a/src/interface/virtinterfaced.service.in
-+++ b/src/interface/virtinterfaced.service.in
-@@ -13,7 +13,6 @@
-
- [Service]
- Type=notify
--EnvironmentFile=-@sysconfdir@/sysconfig/virtinterfaced
- ExecStart=@sbindir@/virtinterfaced $VIRTINTERFACED_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- Restart=on-failure
---- a/src/libxl/virtxend.service.in
-+++ b/src/libxl/virtxend.service.in
-@@ -17,7 +17,6 @@
-
- [Service]
- Type=notify
--EnvironmentFile=-@sysconfdir@/sysconfig/virtxend
- ExecStart=@sbindir@/virtxend $VIRTXEND_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- Restart=on-failure
---- a/src/locking/virtlockd.service.in
-+++ b/src/locking/virtlockd.service.in
-@@ -7,8 +7,7 @@
- Documentation=https://libvirt.org
-
- [Service]
--EnvironmentFile=-@sysconfdir@/sysconfig/virtlockd
--ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS
-+ExecStart=@sbindir@/virtlockd
- ExecReload=/bin/kill -USR1 $MAINPID
- # Loosing the locks is a really bad thing that will
- # cause the machine to be fenced (rebooted), so make
---- a/src/logging/virtlogd.service.in
-+++ b/src/logging/virtlogd.service.in
-@@ -7,8 +7,7 @@
- Documentation=https://libvirt.org
-
- [Service]
--EnvironmentFile=-@sysconfdir@/sysconfig/virtlogd
--ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS
-+ExecStart=@sbindir@/virtlogd
- ExecReload=/bin/kill -USR1 $MAINPID
- # Loosing the logs is a really bad thing that will
- # cause the machine to be fenced (rebooted), so make
---- a/src/lxc/virtlxcd.service.in
-+++ b/src/lxc/virtlxcd.service.in
-@@ -18,7 +18,6 @@
-
- [Service]
- Type=notify
--EnvironmentFile=-@sysconfdir@/sysconfig/virtlxcd
- ExecStart=@sbindir@/virtlxcd $VIRTLXCD_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- KillMode=process
---- a/src/network/virtnetworkd.service.in
-+++ b/src/network/virtnetworkd.service.in
-@@ -16,7 +16,6 @@
-
- [Service]
- Type=notify
--EnvironmentFile=-@sysconfdir@/sysconfig/virtnetworkd
- ExecStart=@sbindir@/virtnetworkd $VIRTNETWORKD_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- Restart=on-failure
---- a/src/node_device/virtnodedevd.service.in
-+++ b/src/node_device/virtnodedevd.service.in
-@@ -13,7 +13,6 @@
-
- [Service]
- Type=notify
--EnvironmentFile=-@sysconfdir@/sysconfig/virtnodedevd
- ExecStart=@sbindir@/virtnodedevd $VIRTNODEDEVD_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- Restart=on-failure
---- a/src/nwfilter/virtnwfilterd.service.in
-+++ b/src/nwfilter/virtnwfilterd.service.in
-@@ -13,7 +13,6 @@
-
- [Service]
- Type=notify
--EnvironmentFile=-@sysconfdir@/sysconfig/virtnwfilterd
- ExecStart=@sbindir@/virtnwfilterd $VIRTNWFILTERD_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- Restart=on-failure
---- a/src/qemu/virtqemud.service.in
-+++ b/src/qemu/virtqemud.service.in
-@@ -18,7 +18,6 @@
-
- [Service]
- Type=notify
--EnvironmentFile=-@sysconfdir@/sysconfig/virtqemud
- ExecStart=@sbindir@/virtqemud $VIRTQEMUD_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- KillMode=process
---- a/src/remote/libvirtd.service.in
-+++ b/src/remote/libvirtd.service.in
-@@ -28,8 +28,7 @@
-
- [Service]
- Type=notify
--EnvironmentFile=-@sysconfdir@/sysconfig/libvirtd
--ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
-+ExecStart=@sbindir@/libvirtd
- ExecReload=/bin/kill -HUP $MAINPID
- KillMode=process
- Restart=on-failure
---- a/src/remote/virtproxyd.service.in
-+++ b/src/remote/virtproxyd.service.in
-@@ -13,7 +13,6 @@
-
- [Service]
- Type=notify
--EnvironmentFile=-@sysconfdir@/sysconfig/virtproxyd
- ExecStart=@sbindir@/virtproxyd $VIRTPROXYD_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- Restart=on-failure
---- a/src/secret/virtsecretd.service.in
-+++ b/src/secret/virtsecretd.service.in
-@@ -13,7 +13,6 @@
-
- [Service]
- Type=notify
--EnvironmentFile=-@sysconfdir@/sysconfig/virtsecretd
- ExecStart=@sbindir@/virtsecretd $VIRTSECRETD_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- Restart=on-failure
---- a/src/storage/virtstoraged.service.in
-+++ b/src/storage/virtstoraged.service.in
-@@ -15,7 +15,6 @@
-
- [Service]
- Type=notify
--EnvironmentFile=-@sysconfdir@/sysconfig/virtstoraged
- ExecStart=@sbindir@/virtstoraged $VIRTSTORAGED_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- Restart=on-failure
---- a/src/vbox/virtvboxd.service.in
-+++ b/src/vbox/virtvboxd.service.in
-@@ -14,7 +14,6 @@
-
- [Service]
- Type=notify
--EnvironmentFile=-@sysconfdir@/sysconfig/virtvboxd
- ExecStart=@sbindir@/virtvboxd $VIRTVBOXD_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- Restart=on-failure
---- a/tools/libvirt-guests.service.in
-+++ b/tools/libvirt-guests.service.in
-@@ -10,7 +10,7 @@
- Documentation=https://libvirt.org
-
- [Service]
--EnvironmentFile=-@sysconfdir@/sysconfig/libvirt-guests
-+EnvironmentFile=-/etc/libvirt/libvirt-guests.conf
- # Hack just call traditional service until we factor
- # out the code
- ExecStart=@libexecdir@/libvirt-guests.sh start
---- a/tools/libvirt-guests.sysconf
-+++ b/tools/libvirt-guests.sysconf
-@@ -1,3 +1,9 @@
-+#
-+# Warning: This configuration file is only sourced by the systemd
-+# libvirt-guests.service unit. The coresponding openrc facility is in
-+# /etc/init.d/libvirtd and /etc/conf.d/libvirtd
-+#
-+
- # Customizations for the libvirt-guests.service systemd unit
-
- # URIs to check for running guests
diff --git a/app-emulation/libvirt/files/libvirt-6.7.0-fix-paths-for-apparmor.patch b/app-emulation/libvirt/files/libvirt-6.7.0-fix-paths-for-apparmor.patch
deleted file mode 100644
index 18e7ef2daa0b..000000000000
--- a/app-emulation/libvirt/files/libvirt-6.7.0-fix-paths-for-apparmor.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/src/security/apparmor/libvirt-qemu b/src/security/apparmor/libvirt-qemu
-index 80986ae..d550d8c 100644
---- a/src/security/apparmor/libvirt-qemu
-+++ b/src/security/apparmor/libvirt-qemu
-@@ -88,6 +88,7 @@
- /usr/share/sgabios/** r,
- /usr/share/slof/** r,
- /usr/share/vgabios/** r,
-+ /usr/share/seavgabios/** r,
-
- # pki for libvirt-vnc and libvirt-spice (LP: #901272, #1690140)
- /etc/pki/CA/ r,
-
---- a/src/security/apparmor/meson.build 2020-10-06 17:45:18.590000000 +0100
-+++ b/src/security/apparmor/meson.build 2020-10-06 17:45:07.044000000 +0100
-@@ -1,5 +1,5 @@
- apparmor_gen_profiles = [
-- 'usr.lib.libvirt.virt-aa-helper',
-+ 'usr.libexec.libvirt.virt-aa-helper',
- 'usr.sbin.libvirtd',
- ]
-
-@@ -32,7 +32,7 @@ install_data(
- )
-
- install_data(
-- 'usr.lib.libvirt.virt-aa-helper.local',
-+ 'usr.libexec.libvirt.virt-aa-helper.local',
- install_dir: apparmor_dir / 'local',
-- rename: 'usr.lib.libvirt.virt-aa-helper',
-+ rename: 'usr.libexec.libvirt.virt-aa-helper',
- )
-
-diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in b/src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.in
-similarity index 97%
-rename from src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
-rename to src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.in
-index dd18c8a..d06f9cb 100644
---- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
-+++ b/src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.in
-@@ -69,5 +69,5 @@ profile virt-aa-helper @libexecdir@/virt-aa-helper {
- /**.[iI][sS][oO] r,
- /**/disk{,.*} r,
-
-- #include
-+ #include
- }
-diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local b/src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.local
-similarity index 100%
-rename from src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local
-rename to src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.local
diff --git a/app-emulation/libvirt/files/libvirt-8.1.0-docs-Fix-template-matching-in-page.xsl.patch b/app-emulation/libvirt/files/libvirt-8.1.0-docs-Fix-template-matching-in-page.xsl.patch
deleted file mode 100644
index 5207c6d81ec7..000000000000
--- a/app-emulation/libvirt/files/libvirt-8.1.0-docs-Fix-template-matching-in-page.xsl.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 54814c87f3706cc8eb894634ebef0f9cf7dabae6 Mon Sep 17 00:00:00 2001
-Message-Id: <54814c87f3706cc8eb894634ebef0f9cf7dabae6.1645458252.git.mprivozn@redhat.com>
-From: Martin Kletzander
-Date: Mon, 21 Feb 2022 09:26:13 +0100
-Subject: [PATCH] docs: Fix template matching in page.xsl
-
-Our last default template had a match of "node()" which incidentally matched
-everything, including text nodes. Since this has the same priority according to
-the XSLT spec, section 5.5:
-
- https://www.w3.org/TR/1999/REC-xslt-19991116#conflict
-
-this is an error. Also according to the same spec section, the XSLT processor
-may signal the error or pick the last rule.
-
-This was uncovered with libxslt 1.1.35 which contains the following commit:
-
- https://gitlab.gnome.org/GNOME/libxslt/-/commit/b0074eeca3c6b21b4da14fdf712b853900c51635
-
-which makes the build fail with:
-
- runtime error: file ../docs/page.xsl line 223 element element
- xsl:element: The effective name '' is not a valid QName.
-
-because our last rule also matches text nodes and we are trying to extract the
-node name out of them.
-
-To fix this we change the match to "*" which only matches elements and not all
-the nodes, and to avoid any possible errors with different XSLT processors we
-also bump the priority of the match="text()" rule a little higher, just in case
-someone needs to use an XSLT processor that chooses signalling the error instead
-of the optional recovery.
-
-https://bugs.gentoo.org/833586
-
-Signed-off-by: Martin Kletzander
-Signed-off-by: Michal Privoznik
----
- docs/page.xsl | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/docs/page.xsl b/docs/page.xsl
-index fd67918d3b..72a6fa0842 100644
---- a/docs/page.xsl
-+++ b/docs/page.xsl
-@@ -215,11 +215,11 @@
-
-
-
--
-+
-
-
-
--
-+
-
-
-
---
-2.34.1
-
diff --git a/app-emulation/libvirt/libvirt-7.7.0-r2.ebuild b/app-emulation/libvirt/libvirt-7.7.0-r2.ebuild
deleted file mode 100644
index d796c4c01e60..000000000000
--- a/app-emulation/libvirt/libvirt-7.7.0-r2.ebuild
+++ /dev/null
@@ -1,336 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
- EGIT_BRANCH="master"
- SRC_URI=""
- SLOT="0"
-else
- SRC_URI="https://libvirt.org/sources/${P}.tar.xz
- verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
- KEYWORDS="amd64 arm64 ~ppc64 x86"
- SLOT="0/${PV}"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
-LICENSE="LGPL-2.1"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
-IUSE="
- apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
- iscsi iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz
- parted pcap policykit +qemu rbd sasl selinux +udev
- virtualbox +virt-network wireshark-plugins xen zfs
-"
-
-REQUIRED_USE="
- firewalld? ( virt-network )
- libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
- lxc? ( caps libvirtd )
- openvz? ( libvirtd )
- qemu? ( libvirtd )
- virt-network? ( libvirtd )
- virtualbox? ( libvirtd )
- xen? ( libvirtd )"
-
-BDEPEND="
- app-text/xhtml1
- dev-lang/perl
- dev-libs/libxslt
- dev-perl/XML-XPath
- dev-python/docutils
- virtual/pkgconfig
- net-libs/rpcsvc-proto
- bash-completion? ( >=app-shells/bash-completion-2.0 )
- verify-sig? ( sec-keys/openpgp-keys-libvirt )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="
- acct-user/qemu
- app-misc/scrub
- >=dev-libs/glib-2.48.0
- dev-libs/libgcrypt:0
- dev-libs/libnl:3
- >=dev-libs/libxml2-2.7.6
- >=net-analyzer/openbsd-netcat-1.105-r1
- >=net-libs/gnutls-1.0.25:0=
- net-libs/libssh2
- net-libs/libtirpc
- >=net-misc/curl-7.18.0
- sys-apps/dbus
- sys-apps/dmidecode
- sys-devel/gettext
- sys-libs/readline:=
- virtual/acl
- apparmor? ( sys-libs/libapparmor )
- audit? ( sys-process/audit )
- caps? ( sys-libs/libcap-ng )
- dtrace? ( dev-util/systemtap )
- firewalld? ( >=net-firewall/firewalld-0.6.3 )
- fuse? ( sys-fs/fuse:0= )
- glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
- iscsi? ( sys-block/open-iscsi )
- iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
- libssh? ( net-libs/libssh )
- lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
- lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
- nfs? ( net-fs/nfs-utils )
- numa? (
- >sys-process/numactl-2.0.2
- sys-process/numad
- )
- parted? (
- >=sys-block/parted-1.8[device-mapper]
- sys-fs/lvm2[-device-mapper-only(-)]
- )
- pcap? ( >=net-libs/libpcap-1.0.0 )
- policykit? (
- acct-group/libvirt
- >=sys-auth/polkit-0.9
- )
- qemu? (
- >=app-emulation/qemu-2.11
- dev-libs/yajl
- )
- rbd? ( sys-cluster/ceph )
- sasl? ( dev-libs/cyrus-sasl )
- selinux? ( >=sys-libs/libselinux-2.0.85 )
- virt-network? (
- net-dns/dnsmasq[dhcp,ipv6(+),script]
- net-firewall/ebtables
- >=net-firewall/iptables-1.4.10[ipv6(+)]
- net-misc/radvd
- sys-apps/iproute2[-minimal]
- )
- wireshark-plugins? ( =app-emulation/xen-4.9.0
- app-emulation/xen-tools:=
- )
- udev? (
- virtual/libudev
- >=x11-libs/libpciaccess-0.10.9
- )
- zfs? ( sys-fs/zfs )"
-
-DEPEND="${BDEPEND}
- ${RDEPEND}
- ${PYTHON_DEPS}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
- "${FILESDIR}"/${PN}-6.7.0-do-not-use-sysconfig.patch
- "${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch
- "${FILESDIR}"/${PN}-8.1.0-docs-Fix-template-matching-in-page.xsl.patch
-)
-
-pkg_setup() {
- # Check kernel configuration:
- CONFIG_CHECK=""
- use fuse && CONFIG_CHECK+="
- ~FUSE_FS"
-
- use lvm && CONFIG_CHECK+="
- ~BLK_DEV_DM
- ~DM_MULTIPATH
- ~DM_SNAPSHOT"
-
- use lxc && CONFIG_CHECK+="
- ~BLK_CGROUP
- ~CGROUP_CPUACCT
- ~CGROUP_DEVICE
- ~CGROUP_FREEZER
- ~CGROUP_NET_PRIO
- ~CGROUP_PERF
- ~CGROUPS
- ~CGROUP_SCHED
- ~CPUSETS
- ~IPC_NS
- ~MACVLAN
- ~NAMESPACES
- ~NET_CLS_CGROUP
- ~NET_NS
- ~PID_NS
- ~POSIX_MQUEUE
- ~SECURITYFS
- ~USER_NS
- ~UTS_NS
- ~VETH
- ~!GRKERNSEC_CHROOT_MOUNT
- ~!GRKERNSEC_CHROOT_DOUBLE
- ~!GRKERNSEC_CHROOT_PIVOT
- ~!GRKERNSEC_CHROOT_CHMOD
- ~!GRKERNSEC_CHROOT_CAPS"
-
- kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
- ~DEVPTS_MULTIPLE_INSTANCES"
-
- use virt-network && CONFIG_CHECK+="
- ~BRIDGE_EBT_MARK_T
- ~BRIDGE_NF_EBTABLES
- ~NETFILTER_ADVANCED
- ~NETFILTER_XT_CONNMARK
- ~NETFILTER_XT_MARK
- ~NETFILTER_XT_TARGET_CHECKSUM
- ~IP_NF_FILTER
- ~IP_NF_MANGLE
- ~IP_NF_NAT
- ~IP_NF_TARGET_MASQUERADE
- ~IP6_NF_FILTER
- ~IP6_NF_MANGLE
- ~IP6_NF_NAT"
- # Bandwidth Limiting Support
- use virt-network && CONFIG_CHECK+="
- ~BRIDGE_EBT_T_NAT
- ~IP_NF_TARGET_REJECT
- ~NET_ACT_POLICE
- ~NET_CLS_FW
- ~NET_CLS_U32
- ~NET_SCH_HTB
- ~NET_SCH_INGRESS
- ~NET_SCH_SFQ"
-
- ERROR_USER_NS="Optional depending on LXC configuration."
-
- if [[ -n ${CONFIG_CHECK} ]]; then
- linux-info_pkg_setup
- fi
-
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- touch "${S}/.mailmap" || die
-
- default
- python_fix_shebang .
-
- # Skip fragile tests which relies on pristine environment
- # (Breaks because of sandbox environment variables)
- # bug #802876
- sed -i -e "/commandtest/d" tests/meson.build || die
-
- # Tweak the init script:
- cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
- sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
- -i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_feature apparmor)
- $(meson_feature apparmor apparmor_profiles)
- $(meson_feature audit)
- $(meson_feature caps capng)
- $(meson_feature dtrace)
- $(meson_feature firewalld)
- $(meson_feature fuse)
- $(meson_feature glusterfs)
- $(meson_feature glusterfs storage_gluster)
- $(meson_feature iscsi storage_iscsi)
- $(meson_feature iscsi-direct storage_iscsi_direct)
- $(meson_feature libvirtd driver_libvirtd)
- $(meson_feature libssh)
- $(meson_feature lvm storage_lvm)
- $(meson_feature lvm storage_mpath)
- $(meson_feature lxc driver_lxc)
- $(meson_feature nls)
- $(meson_feature numa numactl)
- $(meson_feature numa numad)
- $(meson_feature openvz driver_openvz)
- $(meson_feature parted storage_disk)
- $(meson_feature pcap libpcap)
- $(meson_feature policykit polkit)
- $(meson_feature qemu driver_qemu)
- $(meson_feature qemu yajl)
- $(meson_feature rbd storage_rbd)
- $(meson_feature sasl)
- $(meson_feature selinux)
- $(meson_feature udev)
- $(meson_feature virt-network driver_network)
- $(meson_feature virtualbox driver_vbox)
- $(meson_feature wireshark-plugins wireshark_dissector)
- $(meson_feature xen driver_libxl)
- $(meson_feature zfs storage_zfs)
-
- -Dnetcf=disabled
- -Dsanlock=disabled
-
- -Ddriver_esx=enabled
- -Dinit_script=systemd
- -Dqemu_user=$(usex caps qemu root)
- -Dqemu_group=$(usex caps qemu root)
- -Ddriver_remote=enabled
- -Dstorage_fs=enabled
- -Ddriver_vmware=enabled
-
- --localstatedir="${EPREFIX}/var"
- -Drunstatedir="${EPREFIX}/run"
- -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
- )
-
- meson_src_configure
-}
-
-src_test() {
- export VIR_TEST_DEBUG=1
- # Don't run the syntax check tests, they're fragile and not relevant
- # to us downstream anyway.
- # We also crank up the timeout (as Fedora does) just to preempt failures
- # on slower arches.
- meson_src_test --no-suite syntax-check --timeout-multiplier 10
-}
-
-src_install() {
- meson_src_install
-
- # Depending on configuration option, libvirt will create some bogus
- # directoreis. They are either not used, or libvirtd is able to create
- # them on demand, so let's remove them.
- #
- # Note, we are using -f here so that rm does not fail or warn if the
- # directory is nonexistent.
- rm -rf "${D}"/etc/sysconfig
- rm -rf "${D}"/var
- rm -rf "${D}"/run
-
- use libvirtd || return 0
- # From here, only libvirtd-related instructions, be warned!
-
- newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
- newinitd "${S}/libvirtd.init" libvirtd
- newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
- newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
- newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
-
- newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
- newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
- DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
- DISABLE_AUTOFORMATTING=true
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
- touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
- fi
-
- use libvirtd || return 0
- # From here, only libvirtd-related instructions, be warned!
- tmpfiles_process libvirtd.conf
- readme.gentoo_print_elog
-}
diff --git a/app-emulation/libvirt/libvirt-8.2.0.ebuild b/app-emulation/libvirt/libvirt-8.2.0.ebuild
deleted file mode 100644
index 6011891826fc..000000000000
--- a/app-emulation/libvirt/libvirt-8.2.0.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Please bump with dev-python/libvirt-python!
-
-PYTHON_COMPAT=( python3_{8..10} )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
-inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
- EGIT_BRANCH="master"
-else
- SRC_URI="https://libvirt.org/sources/${P}.tar.xz
- verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
- KEYWORDS="amd64 arm64 ~ppc64 x86"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-IUSE="
- apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
- iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz
- parted pcap policykit +qemu rbd sasl selinux +udev
- virtualbox +virt-network wireshark-plugins xen zfs
-"
-
-REQUIRED_USE="
- firewalld? ( virt-network )
- libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
- lxc? ( caps libvirtd )
- openvz? ( libvirtd )
- qemu? ( libvirtd )
- virt-network? ( libvirtd )
- virtualbox? ( libvirtd )
- xen? ( libvirtd )"
-
-BDEPEND="
- app-text/xhtml1
- dev-lang/perl
- dev-libs/libxslt
- dev-perl/XML-XPath
- dev-python/docutils
- virtual/pkgconfig
- net-libs/rpcsvc-proto
- bash-completion? ( >=app-shells/bash-completion-2.0 )
- verify-sig? ( sec-keys/openpgp-keys-libvirt )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="
- acct-user/qemu
- app-misc/scrub
- >=dev-libs/glib-2.56.0
- dev-libs/libgcrypt
- dev-libs/libnl:3
- >=dev-libs/libxml2-2.9.1
- >=net-analyzer/openbsd-netcat-1.105-r1
- >=net-libs/gnutls-3.2.0:=
- net-libs/libtirpc:=
- >=net-misc/curl-7.18.0
- sys-apps/dbus
- sys-apps/dmidecode
- sys-devel/gettext
- >=sys-libs/readline-7.0:=
- virtual/acl
- apparmor? ( sys-libs/libapparmor )
- audit? ( sys-process/audit )
- caps? ( sys-libs/libcap-ng )
- dtrace? ( dev-util/systemtap )
- firewalld? ( >=net-firewall/firewalld-0.6.3 )
- fuse? ( sys-fs/fuse:= )
- glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
- iscsi? ( >=sys-block/open-iscsi-1.18.0 )
- iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
- libssh? ( >=net-libs/libssh-0.7:= )
- libssh2? ( >=net-libs/libssh2-1.3 )
- lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
- lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
- nfs? ( net-fs/nfs-utils )
- numa? (
- >sys-process/numactl-2.0.2
- sys-process/numad
- )
- parted? (
- >=sys-block/parted-1.8[device-mapper]
- sys-fs/lvm2[-device-mapper-only(-)]
- )
- pcap? ( >=net-libs/libpcap-1.8.0 )
- policykit? (
- acct-group/libvirt
- >=sys-auth/polkit-0.9
- )
- qemu? (
- >=app-emulation/qemu-2.11
- >=dev-libs/yajl-2.0.3:=
- )
- rbd? ( sys-cluster/ceph )
- sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
- selinux? ( >=sys-libs/libselinux-2.0.85 )
- virt-network? (
- net-dns/dnsmasq[dhcp,ipv6(+),script]
- net-firewall/ebtables
- >=net-firewall/iptables-1.4.10[ipv6(+)]
- net-misc/radvd
- sys-apps/iproute2[-minimal]
- )
- wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
- xen? (
- >=app-emulation/xen-4.9.0
- app-emulation/xen-tools:=
- )
- udev? (
- virtual/libudev:=
- >=x11-libs/libpciaccess-0.10.9
- )
- zfs? ( sys-fs/zfs )
- kernel_linux? ( sys-apps/util-linux )"
-DEPEND="${BDEPEND}
- ${RDEPEND}
- ${PYTHON_DEPS}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
- "${FILESDIR}"/${PN}-8.2.0-do-not-use-sysconfig.patch
- "${FILESDIR}"/${PN}-8.2.0-fix-paths-for-apparmor.patch
-)
-
-pkg_setup() {
- # Check kernel configuration:
- CONFIG_CHECK=""
- use fuse && CONFIG_CHECK+="
- ~FUSE_FS"
-
- use lvm && CONFIG_CHECK+="
- ~BLK_DEV_DM
- ~DM_MULTIPATH
- ~DM_SNAPSHOT"
-
- use lxc && CONFIG_CHECK+="
- ~BLK_CGROUP
- ~CGROUP_CPUACCT
- ~CGROUP_DEVICE
- ~CGROUP_FREEZER
- ~CGROUP_NET_PRIO
- ~CGROUP_PERF
- ~CGROUPS
- ~CGROUP_SCHED
- ~CPUSETS
- ~IPC_NS
- ~MACVLAN
- ~NAMESPACES
- ~NET_CLS_CGROUP
- ~NET_NS
- ~PID_NS
- ~POSIX_MQUEUE
- ~SECURITYFS
- ~USER_NS
- ~UTS_NS
- ~VETH
- ~!GRKERNSEC_CHROOT_MOUNT
- ~!GRKERNSEC_CHROOT_DOUBLE
- ~!GRKERNSEC_CHROOT_PIVOT
- ~!GRKERNSEC_CHROOT_CHMOD
- ~!GRKERNSEC_CHROOT_CAPS"
-
- kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
- ~DEVPTS_MULTIPLE_INSTANCES"
-
- use virt-network && CONFIG_CHECK+="
- ~BRIDGE_EBT_MARK_T
- ~BRIDGE_NF_EBTABLES
- ~NETFILTER_ADVANCED
- ~NETFILTER_XT_CONNMARK
- ~NETFILTER_XT_MARK
- ~NETFILTER_XT_TARGET_CHECKSUM
- ~IP_NF_FILTER
- ~IP_NF_MANGLE
- ~IP_NF_NAT
- ~IP_NF_TARGET_MASQUERADE
- ~IP6_NF_FILTER
- ~IP6_NF_MANGLE
- ~IP6_NF_NAT"
- # Bandwidth Limiting Support
- use virt-network && CONFIG_CHECK+="
- ~BRIDGE_EBT_T_NAT
- ~IP_NF_TARGET_REJECT
- ~NET_ACT_POLICE
- ~NET_CLS_FW
- ~NET_CLS_U32
- ~NET_SCH_HTB
- ~NET_SCH_INGRESS
- ~NET_SCH_SFQ"
-
- ERROR_USER_NS="Optional depending on LXC configuration."
-
- if [[ -n ${CONFIG_CHECK} ]]; then
- linux-info_pkg_setup
- fi
-
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- touch "${S}/.mailmap" || die
-
- default
- python_fix_shebang .
-
- # Skip fragile tests which relies on pristine environment
- # (Breaks because of sandbox environment variables)
- # bug #802876
- sed -i -e "/commandtest/d" tests/meson.build || die
-
- # Tweak the init script:
- cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
- sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
- -i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_feature apparmor)
- $(meson_feature apparmor apparmor_profiles)
- $(meson_feature audit)
- $(meson_feature caps capng)
- $(meson_feature dtrace)
- $(meson_feature firewalld)
- $(meson_feature fuse)
- $(meson_feature glusterfs)
- $(meson_feature glusterfs storage_gluster)
- $(meson_feature iscsi storage_iscsi)
- $(meson_feature iscsi-direct storage_iscsi_direct)
- $(meson_feature libvirtd driver_libvirtd)
- $(meson_feature libssh)
- $(meson_feature libssh2)
- $(meson_feature lvm storage_lvm)
- $(meson_feature lvm storage_mpath)
- $(meson_feature lxc driver_lxc)
- $(meson_feature nls)
- $(meson_feature numa numactl)
- $(meson_feature numa numad)
- $(meson_feature openvz driver_openvz)
- $(meson_feature parted storage_disk)
- $(meson_feature pcap libpcap)
- $(meson_feature policykit polkit)
- $(meson_feature qemu driver_qemu)
- $(meson_feature qemu yajl)
- $(meson_feature rbd storage_rbd)
- $(meson_feature sasl)
- $(meson_feature selinux)
- $(meson_feature udev)
- $(meson_feature virt-network driver_network)
- $(meson_feature virtualbox driver_vbox)
- $(meson_feature wireshark-plugins wireshark_dissector)
- $(meson_feature xen driver_libxl)
- $(meson_feature zfs storage_zfs)
-
- -Dnetcf=disabled
- -Dsanlock=disabled
-
- -Ddriver_esx=enabled
- -Dinit_script=systemd
- -Dqemu_user=$(usex caps qemu root)
- -Dqemu_group=$(usex caps qemu root)
- -Ddriver_remote=enabled
- -Dstorage_fs=enabled
- -Ddriver_vmware=enabled
-
- --localstatedir="${EPREFIX}/var"
- -Drunstatedir="${EPREFIX}/run"
- -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
- )
-
- meson_src_configure
-}
-
-src_test() {
- export VIR_TEST_DEBUG=1
- # Don't run the syntax check tests, they're fragile and not relevant
- # to us downstream anyway.
- # We also crank up the timeout (as Fedora does) just to preempt failures
- # on slower arches.
- meson_src_test --no-suite syntax-check --timeout-multiplier 10
-}
-
-src_install() {
- meson_src_install
-
- # Depending on configuration option, libvirt will create some bogus
- # directoreis. They are either not used, or libvirtd is able to create
- # them on demand, so let's remove them.
- #
- # Note, we are using -f here so that rm does not fail or warn if the
- # directory is nonexistent.
- rm -rf "${D}"/etc/sysconfig
- rm -rf "${D}"/var
- rm -rf "${D}"/run
-
- use libvirtd || return 0
- # From here, only libvirtd-related instructions, be warned!
-
- newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
- newinitd "${S}/libvirtd.init" libvirtd
- newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
- newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
- newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
-
- newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
- newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
- DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
- DISABLE_AUTOFORMATTING=true
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
- touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
- fi
-
- use libvirtd || return 0
- # From here, only libvirtd-related instructions, be warned!
- tmpfiles_process libvirtd.conf
- readme.gentoo_print_elog
-}
diff --git a/app-emulation/libvirt/libvirt-8.7.0.ebuild b/app-emulation/libvirt/libvirt-8.7.0-r1.ebuild
similarity index 98%
rename from app-emulation/libvirt/libvirt-8.7.0.ebuild
rename to app-emulation/libvirt/libvirt-8.7.0-r1.ebuild
index 972e3dbc1d25..947a2eab6796 100644
--- a/app-emulation/libvirt/libvirt-8.7.0.ebuild
+++ b/app-emulation/libvirt/libvirt-8.7.0-r1.ebuild
@@ -88,7 +88,7 @@ RDEPEND="
iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
libssh? ( >=net-libs/libssh-0.7:= )
libssh2? ( >=net-libs/libssh2-1.3 )
- lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
+ lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
nfs? ( net-fs/nfs-utils )
numa? (
@@ -97,7 +97,7 @@ RDEPEND="
)
parted? (
>=sys-block/parted-1.8[device-mapper]
- sys-fs/lvm2[-device-mapper-only(-)]
+ sys-fs/lvm2[lvm]
)
pcap? ( >=net-libs/libpcap-1.8.0 )
policykit? (
diff --git a/app-emulation/libvirt/libvirt-8.8.0.ebuild b/app-emulation/libvirt/libvirt-8.8.0-r1.ebuild
similarity index 98%
rename from app-emulation/libvirt/libvirt-8.8.0.ebuild
rename to app-emulation/libvirt/libvirt-8.8.0-r1.ebuild
index 92cd83c672f7..bc8725e909ff 100644
--- a/app-emulation/libvirt/libvirt-8.8.0.ebuild
+++ b/app-emulation/libvirt/libvirt-8.8.0-r1.ebuild
@@ -88,7 +88,7 @@ RDEPEND="
iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
libssh? ( >=net-libs/libssh-0.8.1:= )
libssh2? ( >=net-libs/libssh2-1.3 )
- lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
+ lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
nfs? ( net-fs/nfs-utils )
numa? (
@@ -97,7 +97,7 @@ RDEPEND="
)
parted? (
>=sys-block/parted-1.8[device-mapper]
- sys-fs/lvm2[-device-mapper-only(-)]
+ sys-fs/lvm2[lvm]
)
pcap? ( >=net-libs/libpcap-1.8.0 )
policykit? (
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index ceff67f6442c..41862ff36a59 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -88,7 +88,7 @@ RDEPEND="
iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
libssh? ( >=net-libs/libssh-0.8.1:= )
libssh2? ( >=net-libs/libssh2-1.3 )
- lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
+ lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
nfs? ( net-fs/nfs-utils )
numa? (
@@ -97,7 +97,7 @@ RDEPEND="
)
parted? (
>=sys-block/parted-1.8[device-mapper]
- sys-fs/lvm2[-device-mapper-only(-)]
+ sys-fs/lvm2[lvm]
)
pcap? ( >=net-libs/libpcap-1.8.0 )
policykit? (
diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 3739fa1a3cfe..705340cbe29c 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,3 +1,3 @@
DIST vice-3.6.1.tar.gz 11454300 BLAKE2B 129171380f3bd23d579dc29a96419446169cf9a98d2fec82951fa192914846053d213a19b395c9ca30596859cce35bcfea0de0c0a7461c45cb38511a546ca4b2 SHA512 9aeb1c84dc71976d12a9907d60c637ec4cc938aad103340b70a13906bbf2bebab579edc78221c7fba47f0750be3f9ded947200b42fcfc8a9169fb4bb9f288cb7
-EBUILD vice-3.6.1-r2.ebuild 4607 BLAKE2B f9197bc70f47f469180515c44e90c57bb7c8292eb31d195ea789cf33394d73813e305db0d1a9d5e1e3845470aa16e258f512c4354323f493ee5d8c0df2f54eec SHA512 7e14ecee203007e656c865c72bcd1108eb63aa4754f775982aeb2a3b94507c9760e4efdd135c0401c5fbc4a3116c31683e3560090c83871c06a102899b1fc94a
+EBUILD vice-3.6.1-r2.ebuild 4612 BLAKE2B ee2749c8712c0c362a55c61b5722b09255fcc4d9b2252bfa56d93b2c4c02ae855cafe43d4eec2c03765c0fd727180739124002006548e2452b76291e421906e8 SHA512 fbb9321f6314218944ddb06c8460e31fee7a64d314d2bc396b751323864fe0110be3f73ed6218c955ff2ab72f6c6aea53e234bf33ad401cbe83156fa34c707b4
MISC metadata.xml 785 BLAKE2B 1dc59c7b40fda968680e97b1ad83e741faf223143bbc1ab2d523e37312badd3a3aaedc3bbffbd158531c74ae73dab1bb1ee03666a081eb17d819dc9e0b783ee2 SHA512 b483d325702723d1395bca771d215709fc68b6ca8309c4297c6a668d5940502c9c8d5d4149e1f52b8fd6d5062cf04b2e3d7046ecfc0555d2703b064e329af283
diff --git a/app-emulation/vice/vice-3.6.1-r2.ebuild b/app-emulation/vice/vice-3.6.1-r2.ebuild
index 2374e9497e2d..a6f84bd6d1b2 100644
--- a/app-emulation/vice/vice-3.6.1-r2.ebuild
+++ b/app-emulation/vice/vice-3.6.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE="
alsa cpuhistory debug doc ethernet ffmpeg flac gif +gtk headless jpeg
lame mpg123 ogg openmp oss parport pci png portaudio pulseaudio sdl zlib"
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 78cbe534513e..69467f27edd4 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,7 +1,7 @@
DIST VBoxGuestAdditions_6.1.36.iso 63803392 BLAKE2B bcd795e4f4ed5b25542011370b0d0ede0a163c89df597d085d731627bf041a5bc8eb8d60c2041bfe1654986751e16bb382680ad487d90def2e8a7d9fab21dd24 SHA512 cf07e77ac882eb9cd6da39c6491f2536ac8c1e4bddb27e50bb6d1016ab7a291746cd59c6966c54ba007bb4cb79b82ebcfacec5984a6e7453f60ad167014542aa
DIST VBoxGuestAdditions_6.1.38.iso 63887360 BLAKE2B 36688f43d8be5b0f408715f9ad902caf1e298d01f77e5fbb236e15c56da5097c91a4df846b786cb3fa4aa9b97d0360c627b757eebc0503a675b7eb6b752015a0 SHA512 df7051988174227af733d2fb4fd703c885f9637345077090034f3392b2c4deef8ac87d0b9e76f29149609b6e2b7158109377c9af5fdbcdc5691ae6e401c4731b
DIST VBoxGuestAdditions_6.1.40.iso 63883264 BLAKE2B b9a22604b7dc135e9944bb46e7fb59e6202e692dd75de89763c6fe432328f65bacf4d893221a5e6f90ed3236fd36af2f6608932402e0ae967eb1ed24f6b1153a SHA512 149311a826c20f9bc8212e7580d3b552b4cd82f7e9dbaf4e44f363807f8132f0a81eb39082fc8876fcd5fb527d7d7c8ae1b3b6d8372b9bb39273d88fbd84a185
-EBUILD virtualbox-additions-6.1.36.ebuild 698 BLAKE2B 964287e281587ca7c9f0be58f785b9ebac268fd1546ae405b325aaafbc1c05d523d3cf0f1bdf0317ce2099810682192f905bb857a3415b14e36285e42000b072 SHA512 e7c0a43549bddf6e5c0bc655c468b093108eaf1e283e2addcbc8aa8f4631f2bc441d504376321d7404392351cb66ecd72c5bd66a4a08fd7084842be5e85ba415
-EBUILD virtualbox-additions-6.1.38.ebuild 698 BLAKE2B 964287e281587ca7c9f0be58f785b9ebac268fd1546ae405b325aaafbc1c05d523d3cf0f1bdf0317ce2099810682192f905bb857a3415b14e36285e42000b072 SHA512 e7c0a43549bddf6e5c0bc655c468b093108eaf1e283e2addcbc8aa8f4631f2bc441d504376321d7404392351cb66ecd72c5bd66a4a08fd7084842be5e85ba415
-EBUILD virtualbox-additions-6.1.40.ebuild 698 BLAKE2B 964287e281587ca7c9f0be58f785b9ebac268fd1546ae405b325aaafbc1c05d523d3cf0f1bdf0317ce2099810682192f905bb857a3415b14e36285e42000b072 SHA512 e7c0a43549bddf6e5c0bc655c468b093108eaf1e283e2addcbc8aa8f4631f2bc441d504376321d7404392351cb66ecd72c5bd66a4a08fd7084842be5e85ba415
+EBUILD virtualbox-additions-6.1.36.ebuild 680 BLAKE2B 5efac8e251e240afa37b3d09b31ef640f257ad287760a7767abe211a8d5923fde9443fcff577726207174a035b40f06f1bf91d320a86c9aa50e010ef41eeff93 SHA512 2eeea3e4d51ad440b3bbd604d9dfa2e3fbd2d10e9941eed7c4a5c502dfcfd82b98f6e2706cdbf01d7c78f08dbf3a94b7acf89351f77c65741667128bec24623b
+EBUILD virtualbox-additions-6.1.38.ebuild 680 BLAKE2B 5efac8e251e240afa37b3d09b31ef640f257ad287760a7767abe211a8d5923fde9443fcff577726207174a035b40f06f1bf91d320a86c9aa50e010ef41eeff93 SHA512 2eeea3e4d51ad440b3bbd604d9dfa2e3fbd2d10e9941eed7c4a5c502dfcfd82b98f6e2706cdbf01d7c78f08dbf3a94b7acf89351f77c65741667128bec24623b
+EBUILD virtualbox-additions-6.1.40.ebuild 616 BLAKE2B a27ef3f2df7299725bd7cc949692f730c14926e3e6c8c2891039c381232e884722f8badcfc01148d23712a1d471cf2c112172e3e036458f04c6edee74ce495fa SHA512 3d4f31e4347d449e0e3713b977086d1f9d9bc1bb547c847a061656689eb07a8d15e89b2586b78146ef23d870cbda1d56158159a878320b1f88199c9ca75ef9e6
MISC metadata.xml 415 BLAKE2B 9b88f53744c7399cfd98a2a06bd6a61f9e73214b6cf2c126936ffb608400b49a0328eeb1e226679ffd3b43a0d5dd6c353ea56df549b222a4ca851c0c34137ee9 SHA512 6206d0e6ab3dfdde8e022e630f8598b3ba167c0b532d1ea77f4666d83202ef721a9b07d47ebd1770d01b36e18e8adfc6027a337c4e0415008085c2d9f0495c23
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.36.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.36.ebuild
index e65627f19d6c..7cc456fe3207 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.36.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.36.ebuild
@@ -17,7 +17,6 @@ SLOT="0/$(ver_cut 1-2)"
[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
KEYWORDS="amd64"
IUSE=""
-RESTRICT="mirror"
S="${WORKDIR}"
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.38.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.38.ebuild
index e65627f19d6c..7cc456fe3207 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.38.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.38.ebuild
@@ -17,7 +17,6 @@ SLOT="0/$(ver_cut 1-2)"
[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
KEYWORDS="amd64"
IUSE=""
-RESTRICT="mirror"
S="${WORKDIR}"
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.40.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.40.ebuild
index e65627f19d6c..48dd1cb5ae28 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.40.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.40.ebuild
@@ -14,10 +14,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
SLOT="0/$(ver_cut 1-2)"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
KEYWORDS="amd64"
-IUSE=""
-RESTRICT="mirror"
S="${WORKDIR}"
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index c08a65a6b609..1533e6fe992f 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-postgresql/Manifest b/app-eselect/eselect-postgresql/Manifest
index 70749c6ab15f..576a187f6449 100644
--- a/app-eselect/eselect-postgresql/Manifest
+++ b/app-eselect/eselect-postgresql/Manifest
@@ -1,3 +1,3 @@
DIST eselect-postgresql-2.4.tbz2 4518 BLAKE2B 726c59f0511b2e27493cceb9b9a7b3c58e7d7bb0cba2fef705eef9190ef384c3116c42079566d8761192b9c288ef57c550f659a0398ba90fa069f6be335550ff SHA512 4eed12905e97a45420a299cc9232be62a1ac88257a047d9d16ef7d8c8a0e0ddbd4177415797defe352cc82cd87b7777907a51a8cadfdb28064faa78a28e0099d
-EBUILD eselect-postgresql-2.4.ebuild 1005 BLAKE2B f8a0684f04df9b13215cef7fb550a2088ef6e3f29fec7ebbde45873ecc900c0af27bc015daee5cd7d3b0dc3c956ef23cc87ffe22d70adc46f2f7315d7d8d67ce SHA512 b2c9693f44a4ce49c403b62f02e90ca800df55b54a12b89e43fe13241c31852ddbf8e63c2d1947698bb64d94ec296537ed0af79a0f96c68c9e756668b8af5f9c
+EBUILD eselect-postgresql-2.4-r1.ebuild 1005 BLAKE2B 02e313cd958fa9f0420fa3d103373a6664c9209a89ec7a22ea6ded2f6d8613fafd51df1985a4f2bc56c125d93260d2d80a3d33ce5e9664dc9e57fba95d7341b1 SHA512 4829947f94a9d843459c0e2231c2d38e87d12a46377df80ecb85cc26c082bf1b96bacb5f2e522452e8b1346433b52446095072b4e5a6cdc603e99d04efa79222
MISC metadata.xml 472 BLAKE2B bc882374c0ef29d329f77ffc165e0f44b26962646fb9884a91120a54ed403b86dd219d16e9e25c8795db416dedfacc8b4009e3b161fbbac603da6e4c07efc50c SHA512 dbf98bbc7ac4edd814d055932d21ff4c2fe0c89943433377b52578762219a458b426870d68d5aee3e23605069a5a456d5e31f1bbcceb2cb728a200f8e498dff5
diff --git a/app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild b/app-eselect/eselect-postgresql/eselect-postgresql-2.4-r1.ebuild
similarity index 99%
rename from app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild
rename to app-eselect/eselect-postgresql/eselect-postgresql-2.4-r1.ebuild
index 8062c5d32747..b61be76cac38 100644
--- a/app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild
+++ b/app-eselect/eselect-postgresql/eselect-postgresql-2.4-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
DESCRIPTION="Utility to select the default PostgreSQL slot"
HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index e334230ec064..9427f3e76f9f 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/fcitx-qt5/Manifest b/app-i18n/fcitx-qt5/Manifest
index 349f3149ab05..fa547a0b853d 100644
--- a/app-i18n/fcitx-qt5/Manifest
+++ b/app-i18n/fcitx-qt5/Manifest
@@ -1,4 +1,4 @@
-AUX fcitx-qt5-1.2.5-QFcitxPlatformInputContext_recursion.patch 859 BLAKE2B 6dc1a1d4b942600ec953cb18134a9e5fd9a812af8eb1629f942edd0e2a927596eba3ca276be1228d09a2ac14fbb4735d299473e915a90644fb869d979a10283d SHA512 39657019234402ee385667dcb8071209502d4b8e471bdff7fa13980afe2a358891d78447fb95d0f2c14a5aaccdb878d4cc8b9e95a85bb9c22cbdea475523c3a4
+AUX fcitx-qt5-1.2.5-QFcitxPlatformInputContext_recursion.patch 861 BLAKE2B d8b5da5a55de746e72ad131beccab8fe107b19d501dad81591022e25efb76c00f28f10617e00c74c84d91870188cd32d2991f33598e4cc546ed022285e312c47 SHA512 0db3c7566915f544293e1555cf7173d6c69c0ce8dff92580dd5a4c176c131d94d4379e768659910dc57348a934c018ae1d74636b62ac7e9e3e5f05c38f1fd819
DIST fcitx-qt5-1.2.5.tar.xz 98604 BLAKE2B 07f3d62c3c47e5ce0805a087cc4819dec44d8038cc428a3f9b39d640e409372eeaf0f8326a00be8b4af1ef6ec21870dd5ebdabfe39a2cf92ab9cec8c32be059f SHA512 238ebd02e4b07a1bffcbf2d1534492589bce206c3bce0197e075e8cd3f1b16a2867b5e9beb3bc2a0a5e9391acbf20c07d4d5a35f1550b4e71ee663712a8d56c6
EBUILD fcitx-qt5-1.2.5.ebuild 1043 BLAKE2B 41ded2b7088775805bcd9afe4ced7bdeb4b7499549505612c882b6b74ce359a3d894ae60c64917b9014311b2ce4bba4588a271a234dc59760a6f9201501c7269 SHA512 3a710f4a354b550d94f1e748dc8d58f75de18e0f7da0a839960f6cf7b784c36076f2e080abcd70f30fb6734ab8ae47adcebab15e345a1d776e1247fc4d534cd5
EBUILD fcitx-qt5-4.9999.ebuild 928 BLAKE2B 5967c2e2b9ea9fc3accf378978ad1c5d29d452502c8614ad70feae710fc72266f1974850871bd96ce522ce6b27c4240afd805a461528a165a969ba1c9af5cb4e SHA512 25a3395f1309f09aaace89cfe2e38c7693108b8b72891994d73f15a847c8a9e5c38a0a686890e50ecd0a98a8580d6a1c7d99deb149e6ea8e4c4289b1a1fd572e
diff --git a/app-i18n/fcitx-qt5/files/fcitx-qt5-1.2.5-QFcitxPlatformInputContext_recursion.patch b/app-i18n/fcitx-qt5/files/fcitx-qt5-1.2.5-QFcitxPlatformInputContext_recursion.patch
index f3e31991b53d..385abd8495ad 100644
--- a/app-i18n/fcitx-qt5/files/fcitx-qt5-1.2.5-QFcitxPlatformInputContext_recursion.patch
+++ b/app-i18n/fcitx-qt5/files/fcitx-qt5-1.2.5-QFcitxPlatformInputContext_recursion.patch
@@ -1,7 +1,7 @@
https://github.com/fcitx/fcitx-qt5/commit/6f2033c497fe0da1fd197bc3be35695b11eafd93
---- /platforminputcontext/qfcitxplatforminputcontext.cpp
-+++ /platforminputcontext/qfcitxplatforminputcontext.cpp
+--- a/platforminputcontext/qfcitxplatforminputcontext.cpp
++++ b/platforminputcontext/qfcitxplatforminputcontext.cpp
@@ -291,8 +291,21 @@
return;
}
diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index e3fa518f1627..a13dd48d3100 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -1,5 +1,5 @@
-AUX fcitx-4.2.9.8-enchant.patch 855 BLAKE2B 86337ed49c8b6ceee8ac11034e89248f66a3bfbac94a19c5949e94ce9e6ab7d57367701ef7e0cfe89a06cc0a5fdf48115edb13c1da43141ac7fe7eed2723d2d6 SHA512 4d1a03793d4156d7867afbbd362086d40a62f56777428e9d5b27a36120377c69b37fbfdfc709b1ae1c9faa534769051f1eaa8c9fbbaa193b28cc24bcd155e486
-AUX fcitx-4.2.9.8-xkb.patch 794 BLAKE2B e95f44dfa529bdb2f91d31f2e6f1f94c4d0c9c08927a0fd19c544e5e5983ad0509222756bd6feeb3fb8aec1deb7a09ad85d55def1993c766b0dbb46687e0ac89 SHA512 3cb7c0267a8f758366aa09ae07596d20f3c72a4cd940f5e6c4a469fb72c3284282c883402f3ff09a1c4eb695fdd214433026b5899638e00c11cab6b168e49349
+AUX fcitx-4.2.9.8-enchant.patch 857 BLAKE2B 2de4fa00bf532b3b95af0ca0fe4b2fc61af4e6883d5b272682346751e66b83c5a6c9ce3323a6540c10474873afc4df0c279ec4dd1f1c57090a0e0f551abc46de SHA512 908501484c535ba88e4b4179752edb4b456e2294031fe4476d6b5ca972edd3568d992822622a293433690dd15fdac6e834fa979ea1cb6a1f8f7754eb0fbf5f01
+AUX fcitx-4.2.9.8-xkb.patch 796 BLAKE2B 8325574736faebd7938d8fdb19bb149586a8c83ba2342f454d3c665a22e6de642ac36cbf90a4e23a87fd2a9759fd51a42e96930fb429b98fde82cebb6dfa23e8 SHA512 321b73519c442e0595866a692a30e9cfb0464817d79162a7075b00711a73bc4c33fde5ec760bd48ca53ec842d62f98e8d8e8fed2474523d15ca4477dccfa8a2b
DIST fcitx-4.2.9.8_dict.tar.xz 8737888 BLAKE2B 2de3ccbf1b37a9bcf1a3cb257d7837669e946765722c3d6f442ad071d7d81a6e8178e47051fc3aa53b9b4771d3aca602c2e22fa7a3d117a9e1f2779497e02c52 SHA512 50a954c3178f53fd2d441cdaf81fb44a7fe8dfb263fa6d8dd4ee4884fc7ae8321880c726c9366d11e2a4ac8da2233268d06e5d0800d4527ba0bdb1a1430248ed
DIST fcitx-data-en_dict-20121020.tar.gz 630491 BLAKE2B 2df897b1c9fb3a2ce186ee590e5f3ccbc7930f047218bf0fefa317f74b3287fc0be9c393d3310fe07208379118ec4c46608a1c703ef37b3aee65b2d790cb7f0d SHA512 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2
DIST fcitx-data-pinyin.tar.gz 1608886 BLAKE2B 3b7e72559bb838b4f2245e6faf2d627df17e9383ef8fe382e10333c1a95d79409ec042caa7d77c9bcd956b1c5d5456dab9d82208cd89d90e2be759c76f56f3d1 SHA512 1ee19eed3ee58be6cd6562ec363fe3bf630fff5e8820b3bfdd6d4618fceb082695e888dec5366a3685d58706f720e19319d891c223227237aed12674ea982131
diff --git a/app-i18n/fcitx/files/fcitx-4.2.9.8-enchant.patch b/app-i18n/fcitx/files/fcitx-4.2.9.8-enchant.patch
index f152f1dc6e5a..25b4fc1d12ac 100644
--- a/app-i18n/fcitx/files/fcitx-4.2.9.8-enchant.patch
+++ b/app-i18n/fcitx/files/fcitx-4.2.9.8-enchant.patch
@@ -1,7 +1,7 @@
https://github.com/fcitx/fcitx/issues/475
---- /cmake/FindEnchant.cmake
-+++ /cmake/FindEnchant.cmake
+--- a/cmake/FindEnchant.cmake
++++ b/cmake/FindEnchant.cmake
@@ -16,15 +16,15 @@
endif(ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
diff --git a/app-i18n/fcitx/files/fcitx-4.2.9.8-xkb.patch b/app-i18n/fcitx/files/fcitx-4.2.9.8-xkb.patch
index e21c3a1db7e8..dbb82afa7443 100644
--- a/app-i18n/fcitx/files/fcitx-4.2.9.8-xkb.patch
+++ b/app-i18n/fcitx/files/fcitx-4.2.9.8-xkb.patch
@@ -1,7 +1,7 @@
https://github.com/fcitx/fcitx/issues/250
---- /CMakeLists.txt
-+++ /CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
@@ -96,12 +96,15 @@
endif()
endif()
diff --git a/app-i18n/ibus-sunpinyin/Manifest b/app-i18n/ibus-sunpinyin/Manifest
index e3782f2fa087..94ac8fede0b6 100644
--- a/app-i18n/ibus-sunpinyin/Manifest
+++ b/app-i18n/ibus-sunpinyin/Manifest
@@ -1,4 +1,4 @@
-AUX ibus-sunpinyin-2.0.4_pre20200306162733-python-3.patch 4691 BLAKE2B 162301e028b0b8f864c394368897d635b3fea8939e52c9068884b08752f51a5d550381680dda65b42e80f471bd0ab616940f138fd53c79655454d6fbfa070b3c SHA512 e67e202fe2587a4b985b047c893164d3a68ba7ff4ae08d9cf5dde501614c9d71bc4d9628858f7bd9ef2f954c9826134d8965c59f8548723df6e94ab8652daafd
+AUX ibus-sunpinyin-2.0.4_pre20200306162733-python-3.patch 4693 BLAKE2B 1cc396678b14eb1d42909b1448c7f9f53c370fa3a9c061574fcb13149b8f791e988cb4f6a5f4018eeb248e0cb49dcad6332e23d8207f42bf142462d81e689c43 SHA512 c32d569dfc42947afece3650409bbbe1c56bddd73e43a0c609d2fc989711cf80a3cf728c5ce7de9dc446bcb5f37d44f1ea6965ddc630a7af2bf01305802567b1
DIST sunpinyin-2.0.4_pre20200306162733.tar.gz 547519 BLAKE2B 6e0e4457217d7b85221cab15173f588a5c7c039208a8f6cd48ed5fb21c5b5eae2f4616d6fddbf6eff8a006193097de26c866d5385d4602f41059ee8d7e52a2d5 SHA512 e8cf73aeca8dcbc7dd6f51f034a9a0363201bc14a814800e071c987933935b0e8039aa84178a6bd1cba1c7dee4b25b2d5546e78ea683e68e8981afea48fdab33
EBUILD ibus-sunpinyin-2.0.4_pre20200306162733.ebuild 2161 BLAKE2B 0aa5bf0da7d17c2b15b75dee6d87b8eb430c502ab45088d602a623859c1012407e290ec44dbe32b826fbb2624d6926195842a8b16839a0710b5089426cfd9e3d SHA512 28375c8cc311379a9eb49d5f3a4eb295b93ef5ee8a8ef060d32e61236dd60bb0f775607bf6148c875335a899609589320f8291c8fa2c8209d367bf280d80e5ad
MISC metadata.xml 421 BLAKE2B 3b413555276753d7d056c926cc5aa5d22dc5f1350fa7f87b9a4b22390e26e0373f5ffc14830b9abca9d048f405955f565e1a6487c7f33ae2c47a6c22e9f48867 SHA512 1786c309e3e4f974a57f49d8e10f02e2dccb5101b9d27d4933c30077c78a067f3c6f3a9e74f83a051a2b0d802b46f482a30ecb1aad7a0bf08b5c73897c5bfb6d
diff --git a/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-2.0.4_pre20200306162733-python-3.patch b/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-2.0.4_pre20200306162733-python-3.patch
index 25b11f0a8009..09bc30d44cfb 100644
--- a/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-2.0.4_pre20200306162733-python-3.patch
+++ b/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-2.0.4_pre20200306162733-python-3.patch
@@ -1,7 +1,7 @@
https://github.com/sunpinyin/sunpinyin/issues/111
---- /wrapper/ibus/setup/main.py
-+++ /wrapper/ibus/setup/main.py
+--- a/wrapper/ibus/setup/main.py
++++ b/wrapper/ibus/setup/main.py
@@ -63,7 +63,7 @@
class Logger:
@staticmethod
diff --git a/app-i18n/librime/Manifest b/app-i18n/librime/Manifest
index fd113a0d25e6..4dc390dd7c1d 100644
--- a/app-i18n/librime/Manifest
+++ b/app-i18n/librime/Manifest
@@ -1,4 +1,4 @@
-AUX librime-1.6.0-boost-1.76.patch 717 BLAKE2B 9abca897e4a3a23ec7ea2355148e34ef93b331b084634b0011815ec0d7d231626ebc0af53c71cd0b76ee3a5de50e1779a79de118433eca399e17ad06026d0eb2 SHA512 f2dad5927e7c0c95a09900581dff04f99d26ebc877ed4cd2c0fc3f226cb072fbe769fe67166976cbb848599a19b9a8ece926b2538ae2df0cb09a4e5b7b83fe11
+AUX librime-1.6.0-boost-1.76.patch 721 BLAKE2B 460b2e007c900b746958b93bb39e378de20f181f89fea7c7422d222ab00754347c12cf24c92ca7ae3b269127785fb3eac462541201ff7d24fe37c9b18417ca24 SHA512 7c44aba7f6cbc5bb829dc6b7f30e96fdcb8955ae1f8a3fced56860e3d68c499a82a1a5a240070663d8e298d2785d68cb5932a35c8b5a33f092acaa630ec57bde
DIST librime-1.7.3.tar.gz 2859513 BLAKE2B 834622860cdc3038d1b983f476bca70f211dfbc3bc2b565a998163e22688841ee3a0c7f9a64bce285e2f3f5b5a9a802bd5506f17904ccb3291babf80d4748fb5 SHA512 8767d17c3d14a5a1bbb8269fab1627b907de72c288b362fdbc6191223937da21e8b18471b4ae8f83ce5afc0ec5c3ab12fbcb49930eb9969c1764c7390d9ee4b0
EBUILD librime-1.7.3-r1.ebuild 1591 BLAKE2B 4025461ed363d5daa101b4f4bf84f77fe0f797a819e80a77b061d6bbc461b9d6762f724fd74387eacb0a40177c7795c0a9c414505b7236ec9c6cff745f2b9340 SHA512 eed4ef1ae787c410212729955f021d7732f178442fae6e347c3da05c4fb4cbaea476b9c4fab41832447c3730c8dcc481d8aa1cde512eea08e776ff57ff6ab3c2
MISC metadata.xml 777 BLAKE2B 1ac91ae089dff08373d0e0c7a4b95e952a9e697c8ea462f08d3894e01ffeace211eaccafe5d9737912418d254c8343e7b999dd02e79eba3feaeef35191d74d5b SHA512 d06cdebe5baa6d639074a739b9e996deb29f6e553d333f3d852dce03b3e4eef44690a610d6d358493bf91836d9d6a6cb471779ba8eada084528416405a0240b2
diff --git a/app-i18n/librime/files/librime-1.6.0-boost-1.76.patch b/app-i18n/librime/files/librime-1.6.0-boost-1.76.patch
index 5ed1447359d6..31eff9268bfc 100644
--- a/app-i18n/librime/files/librime-1.6.0-boost-1.76.patch
+++ b/app-i18n/librime/files/librime-1.6.0-boost-1.76.patch
@@ -2,8 +2,8 @@ https://github.com/rime/librime/issues/462
https://github.com/rime/librime/pull/463
https://github.com/rime/librime/commit/57cffcd02ac70148e21ce982be834876b3df87db
---- /src/rime/gear/script_translator.cc
-+++ /src/rime/gear/script_translator.cc
+--- a/src/rime/gear/script_translator.cc
++++ b/src/rime/gear/script_translator.cc
@@ -8,6 +8,7 @@
//
#include
@@ -12,8 +12,8 @@ https://github.com/rime/librime/commit/57cffcd02ac70148e21ce982be834876b3df87db
#include
#include
#include
---- /src/rime/gear/table_translator.cc
-+++ /src/rime/gear/table_translator.cc
+--- a/src/rime/gear/table_translator.cc
++++ b/src/rime/gear/table_translator.cc
@@ -6,6 +6,7 @@
//
#include
diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest
index 05c07edc91fd..28517cc95535 100644
--- a/app-i18n/mozc/Manifest
+++ b/app-i18n/mozc/Manifest
@@ -1,9 +1,9 @@
AUX 50mozc-gentoo.el 121 BLAKE2B 0cad49e4a5a04d1cbdcd063cfd5a06c14bf4bab47890bbc089d8bba9889abb5197bea2cfb912f638052f912d7aca51a7e71b743b4742fd90b9d5ab5a60779fe5 SHA512 2d67a6723374872717ab7132f02f4030f00ddecabb8a1fc20c9d69d64406dc2ba2a1109734378fae7b4718a8ae9601beff4b6f27cb43a280fa2e0f946da70685
-AUX mozc-2.26.4220-environmental_variables.patch 3039 BLAKE2B 474d5f47a79f62db398a1b2a8e661640e2bcd3fb0271ec070a12973eb507d890ef2e8dd2033886e6b46723c07127304c9f736a639a0421d3c607fa126649a41f SHA512 978cd425e4c9ac183fd3c27720510889835c0f07ece2f80bd2c6038662a5384aff58dec636c78ce64f6573c1493b04d4a0b374ca2da85da39e76b81c6bcfb515
-AUX mozc-2.26.4220-server_path_check.patch 3453 BLAKE2B 18dc82bfd4f05e8c54216dd43ff6c1d763ae3f7999193854e226e7425d848d43e3d11c2f1a70c19133731ad2e809ad38fa7113fbd623866467317a649ae5f56e SHA512 44d4647ede6759810355122b4ea972312587f5b520ffa59ba8dc5a04455c3f20b72fd91a3bc7f55f8b2e7ad88a0ce40e660b262825ec330e5f9280b03fee6cec
-AUX mozc-2.26.4220-system_abseil-cpp.patch 14328 BLAKE2B 3900b3826cc46fdd2e9d74b3129033fb3ff31184f73f7f31806291f8e4db0fd175d139407e7cca3d3362fe47f546843c19056c90d483429c0b46d28a132e54cc SHA512 d59789fbeabf4309dbd5f99754b7c57e483f752ffe7fae2ba269ae75b64a31e6f4652af1c205462a40ae86fe0333b4178a37e9ca9ff839e630d50e447e96e6ec
-AUX mozc-2.26.4220-system_gtest.patch 4751 BLAKE2B 3a5f0f5c2bb6d5a503d0078576b72baced4cc88f2b3ffed8d75c42d64047d48003565f29deafd1675e5efae2cf7584e414fe2a9e7a87fdceef5986edc88557ef SHA512 f5fe8cd973b3a5c45ab95ec44b0cd3e5ee64dbb9f1094d0ac1d5f7fbee43900aa64936006238ba1405cb6b7cd67cbe75a7040ef9b3744358c5bffe3ae8dcc4a5
-AUX mozc-2.26.4220-system_jsoncpp.patch 3469 BLAKE2B 0fc4e66efd03bb966c8071fc35b9c9d51fa8b6588ed7cebe4e21ba750d0fb5e2ac3bcf834991e669fba613ef01c983d4d493945daa865418159cf5bb3b110d78 SHA512 c6236dff4ff44de028017b34ade7091a38ae21e237e39c50cd1125cfccd55ae0952fa0c8d7b19fe6dd863633fffa07843b7e0a2510e03a5230fbfbc02d90b545
+AUX mozc-2.26.4220-environmental_variables.patch 3041 BLAKE2B 335a52c2a8e173fff12b0e391578d578ee04b0db6b6666c5227a1eccd9983983a280f0cc58b3f1bec5fbb31bc7d27eeb246f0786037ad659db1769c8fb910dbb SHA512 bd57afa49320953ae2f909a5b0df640d7b857a3af40c9b99d2d2871b8067316f2ed27ff821bda1bd3bfe1e966d9f4571aa2d09df0dfd5e99d33ff8844ddc603c
+AUX mozc-2.26.4220-server_path_check.patch 3455 BLAKE2B aa54893a6efb49e111a83e5b993bc15c6740285f338fd09bcf4ddb492e5a02bc7a5702a84dd5cc955cc3a86d2e3ef8b13432caf2a40990cb68c7b40d33510dab SHA512 63dd304c6dfc1edd643ab114bb4ef7b22ac77bdda7039277b4f54aec369f55f412dbe2e24c4432e6862ef5b37abb1cfc1e37db237a5e6229f6513316546a103c
+AUX mozc-2.26.4220-system_abseil-cpp.patch 14344 BLAKE2B d64e3abde60eb856bfb7bee6de68b6d8fa0939dafc9b02ee398a89ccf566e3235a86123067dc0fd98d63a395b9e0815c281f3baa578a64d67ace39e7f114f8e2 SHA512 8fd816e665f1aa84faa036e71be443bc4811b538449a1a8475c6ff9a674a20a5d4fac07c9a0c5e265cc4570120f4606c470964421704da321cc0f8129342d363
+AUX mozc-2.26.4220-system_gtest.patch 4755 BLAKE2B c0d98f949e8942bc4f3025c77be8d7949b131209a2383eed809ffbb0f5527f16a3388ce69e6101e7d219ebb830e16ca65772bab9d4ad8620d2e970e6debd2e37 SHA512 cd1260d0b10b40a4d832a50cd81e79a7ebe6e7d3a215ec80fd01c596161ad6fd69b78a046cda80f35bd5fac7d874e0ad08ae79a01ccf3d5e3f9e2a285de8e3fc
+AUX mozc-2.26.4220-system_jsoncpp.patch 3475 BLAKE2B e6643c1cb2f87d55aec6359fca8f0cdbae34f5b4f57456532e9bae40cf5a6a2debcba662e931dc6bb76157972a479ed773703fa6954af290b3d4c2bca986fd74 SHA512 5f65d9f1019ddfddc18bf60abbd3d88fc0add4c247b869e74e1bf1dcc7fca180dc7364807a4c46f5cae1536a46e6179af851a8012398f7d19fc3aa7dbddae24c
DIST fcitx-mozc-2.26.4220-20201219202429.tar.gz 37174759 BLAKE2B 3f320523103ee7a35a763f6613889e282e8a654db8ef11b5a1168db12611387e300621f015977875ffec3c10c055e36b3cb525a1e8559013f3ac42bc5b0cc296 SHA512 823e64267aa69e4d30dd7408f946a54072994f9a2d68691a3d393b216a15e70fd28bcb24705f9d9f483a2291517c48c5a1aeda893d2315f9a1d9cd352fb3feb2
DIST japanese-usage-dictionary-20180701040110.tar.gz 71285 BLAKE2B dfad056a1d5061b6764f583da15b9ad60a3c4421cee0430c4665d1c2779a64f9b31473c1746a3e2b9bda5167349432e51dcf7d4d48f75fde9543e9c16ff74c0d SHA512 68b4d3f52dd6cd4f00a8012a870b4f5929519cd69815b1729f3881d1f964802308f4aa101e236824b4c0f832183a9e8097437ed620403f2a652f126e7cdc1eb3
DIST mozc-2.26.4220-20201212102434.tar.gz 37106063 BLAKE2B 7d3c236809c8feb017f35e3f7a9b024ac34204f483c69913a2d1ae6b771054548f7f81afde35ed3a6887c9f7503584cee0fc646653fc7cde6fd015158de9c3d3 SHA512 9d87947b9b9256a3cc66cb23ab6caf4b6974142090b0d315c101bdc700fd289c259d09cb7f02f5f9e7462f48d652cd2d5b4822a645751fdcaed88b939520c429
diff --git a/app-i18n/mozc/files/mozc-2.26.4220-environmental_variables.patch b/app-i18n/mozc/files/mozc-2.26.4220-environmental_variables.patch
index dccdff76f15d..44a60ed4fc9f 100644
--- a/app-i18n/mozc/files/mozc-2.26.4220-environmental_variables.patch
+++ b/app-i18n/mozc/files/mozc-2.26.4220-environmental_variables.patch
@@ -1,7 +1,7 @@
https://github.com/google/mozc/issues/470
---- /src/base/system_util.cc
-+++ /src/base/system_util.cc
+--- a/src/base/system_util.cc
++++ b/src/base/system_util.cc
@@ -226,6 +226,11 @@
std::string UserProfileDirectoryImpl::GetUserProfileDirectory() const {
diff --git a/app-i18n/mozc/files/mozc-2.26.4220-server_path_check.patch b/app-i18n/mozc/files/mozc-2.26.4220-server_path_check.patch
index 8dbabeac0038..b12c3d370e37 100644
--- a/app-i18n/mozc/files/mozc-2.26.4220-server_path_check.patch
+++ b/app-i18n/mozc/files/mozc-2.26.4220-server_path_check.patch
@@ -1,7 +1,7 @@
https://github.com/google/mozc/issues/471
---- /src/ipc/ipc_path_manager.cc
-+++ /src/ipc/ipc_path_manager.cc
+--- a/src/ipc/ipc_path_manager.cc
++++ b/src/ipc/ipc_path_manager.cc
@@ -340,9 +340,21 @@
return false;
}
diff --git a/app-i18n/mozc/files/mozc-2.26.4220-system_abseil-cpp.patch b/app-i18n/mozc/files/mozc-2.26.4220-system_abseil-cpp.patch
index 33f72b8f7a63..da6b40265804 100644
--- a/app-i18n/mozc/files/mozc-2.26.4220-system_abseil-cpp.patch
+++ b/app-i18n/mozc/files/mozc-2.26.4220-system_abseil-cpp.patch
@@ -1,7 +1,7 @@
https://github.com/google/mozc/issues/490
---- /src/base/absl.gyp
-+++ /src/base/absl.gyp
+--- a/src/base/absl.gyp
++++ b/src/base/absl.gyp
@@ -28,119 +28,209 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@@ -301,8 +301,8 @@ https://github.com/google/mozc/issues/490
],
},
],
---- /src/config/config_test.gyp
-+++ /src/config/config_test.gyp
+--- a/src/config/config_test.gyp
++++ b/src/config/config_test.gyp
@@ -36,6 +36,7 @@
'config_handler_test.cc',
],
@@ -319,8 +319,8 @@ https://github.com/google/mozc/issues/490
'../testing/testing.gyp:gtest_main',
'config.gyp:character_form_manager',
],
---- /src/gyp/common.gypi
-+++ /src/gyp/common.gypi
+--- a/src/gyp/common.gypi
++++ b/src/gyp/common.gypi
@@ -194,7 +194,13 @@
'include_dirs': [
'<(abs_depth)',
@@ -336,8 +336,8 @@ https://github.com/google/mozc/issues/490
],
'mac_framework_headers': [],
'target_conditions': [
---- /src/gyp/common_win.gypi
-+++ /src/gyp/common_win.gypi
+--- a/src/gyp/common_win.gypi
++++ b/src/gyp/common_win.gypi
@@ -307,10 +307,16 @@
'include_dirs': [
'<(abs_depth)',
@@ -356,8 +356,8 @@ https://github.com/google/mozc/issues/490
'msvs_configuration_attributes': {
'CharacterSet': '<(win_char_set_unicode)',
},
---- /src/gyp/defines.gypi
-+++ /src/gyp/defines.gypi
+--- a/src/gyp/defines.gypi
++++ b/src/gyp/defines.gypi
@@ -63,6 +63,10 @@
# use_libibus represents if ibus library is used or not.
# This option is only for Linux.
@@ -369,8 +369,8 @@ https://github.com/google/mozc/issues/490
},
'target_defaults': {
'defines': [
---- /src/gyp/directories.gypi
-+++ /src/gyp/directories.gypi
+--- a/src/gyp/directories.gypi
++++ b/src/gyp/directories.gypi
@@ -31,7 +31,12 @@
'variables': {
# Top directory of third party libraries.
@@ -385,8 +385,8 @@ https://github.com/google/mozc/issues/490
# Top directory of additional third party libraries.
'ext_third_party_dir%': '<(abs_depth)/third_party',
---- /src/session/session_test.gyp
-+++ /src/session/session_test.gyp
+--- a/src/session/session_test.gyp
++++ b/src/session/session_test.gyp
@@ -221,6 +221,7 @@
'internal/key_event_transformer_test.cc',
],
@@ -395,8 +395,8 @@ https://github.com/google/mozc/issues/490
'../base/base.gyp:base',
'../converter/converter_base.gyp:converter_mock',
'../engine/engine.gyp:mock_converter_engine',
---- /src/storage/storage_test.gyp
-+++ /src/storage/storage_test.gyp
+--- a/src/storage/storage_test.gyp
++++ b/src/storage/storage_test.gyp
@@ -41,6 +41,7 @@
'tiny_storage_test.cc',
],
diff --git a/app-i18n/mozc/files/mozc-2.26.4220-system_gtest.patch b/app-i18n/mozc/files/mozc-2.26.4220-system_gtest.patch
index 47891fab9b47..0d52bcab9e10 100644
--- a/app-i18n/mozc/files/mozc-2.26.4220-system_gtest.patch
+++ b/app-i18n/mozc/files/mozc-2.26.4220-system_gtest.patch
@@ -1,7 +1,7 @@
https://github.com/google/mozc/issues/490
---- /src/gyp/defines.gypi
-+++ /src/gyp/defines.gypi
+--- a/src/gyp/defines.gypi
++++ b/src/gyp/defines.gypi
@@ -67,6 +67,10 @@
# use_system_abseil_cpp represents if system version or bundled version
# of abseil-cpp library is used.
@@ -13,8 +13,8 @@ https://github.com/google/mozc/issues/490
},
'target_defaults': {
'defines': [
---- /src/testing/testing.gyp
-+++ /src/testing/testing.gyp
+--- a/src/testing/testing.gyp
++++ b/src/testing/testing.gyp
@@ -59,54 +59,76 @@
'targets': [
{
diff --git a/app-i18n/mozc/files/mozc-2.26.4220-system_jsoncpp.patch b/app-i18n/mozc/files/mozc-2.26.4220-system_jsoncpp.patch
index 7ff132eaa591..479759ba6e40 100644
--- a/app-i18n/mozc/files/mozc-2.26.4220-system_jsoncpp.patch
+++ b/app-i18n/mozc/files/mozc-2.26.4220-system_jsoncpp.patch
@@ -1,7 +1,7 @@
https://github.com/google/mozc/issues/490
---- /src/gyp/defines.gypi
-+++ /src/gyp/defines.gypi
+--- a/src/gyp/defines.gypi
++++ b/src/gyp/defines.gypi
@@ -71,6 +71,10 @@
# use_system_gtest represents if system version or bundled version
# of gtest library is used.
@@ -13,8 +13,8 @@ https://github.com/google/mozc/issues/490
},
'target_defaults': {
'defines': [
---- /src/net/jsoncpp.gyp
-+++ /src/net/jsoncpp.gyp
+--- a/src/net/jsoncpp.gyp
++++ b/src/net/jsoncpp.gyp
@@ -31,32 +31,60 @@
'targets': [
{
@@ -101,8 +101,8 @@ https://github.com/google/mozc/issues/490
},
],
}
---- /src/net/jsoncpp.h
-+++ /src/net/jsoncpp.h
+--- a/src/net/jsoncpp.h
++++ b/src/net/jsoncpp.h
@@ -35,7 +35,11 @@
// Mozc basically disables C++ exception.
#define JSON_USE_EXCEPTION 0
diff --git a/app-i18n/transifex-client/Manifest b/app-i18n/transifex-client/Manifest
index 4cd2fb4e8528..c7d1292d3a05 100644
--- a/app-i18n/transifex-client/Manifest
+++ b/app-i18n/transifex-client/Manifest
@@ -1,7 +1,7 @@
DIST transifex-client-1.3.0-deps.tar.bz 241930614 BLAKE2B 7855172504f3fe1208556e0030bcaec7dac4b21ed948926368b0b91c1984cb73e6d0bda0110bdd592cf3be7835f847fe54009f2c5c41fd14899b7b5d37932937 SHA512 5eb88614b354aeac0acd02cfe416c884adb8070614946dd71de512030e410a20ca7eb6b426876c218ef9b6ec1d4faf9eb557e2daf84cf9895cce04c33a937655
DIST transifex-client-1.3.0.tar.gz 87395 BLAKE2B 90da67d49e1b2e09d509b0ff373f0403eddc5c29a63ca64f747006ed3cb95c51add58e442a139e7e17d28b44e700aed249d0e5ca563f6af832578640f8f7164d SHA512 6e81d94e95157322d0fc74386d7e6f218f589bb81ce36b0967c09ca9199d641b13953f491373d9e7ec9f6ddc50c243801a24da985a2e577b733bf364623e3d75
-DIST transifex-client-1.3.1-deps.tar.bz 241386467 BLAKE2B fb0e2c6c3f722afee5b6ce0eb8536b53139ec816411eba9bfa6fdf17d850c3cce0bce5f662e770da582001b7f34709d362d2ac3cfc8149f4affa5878a9f475f9 SHA512 f2d77065a31c2aa8c6518b5ce382ed82ee6eb34d03c2981daf9563ab09367d8f2a8b0be37947a23dfca56d59c987e555b89b6728fffba190b56b54871b161895
-DIST transifex-client-1.3.1.tar.gz 87320 BLAKE2B 5fa402f8b9dbcde3030335b544ff5b7982f3477d7f3484d324709467dd694e2d4368e2e78c8ac7203eff92c079814594d7251372cc023bc22c21d966a5ef6a7a SHA512 8692c8d98511240672e1252e309c714eda89c83e34b53826cc8fb0d24059a3fc46ad3f5159c57ce974d63f26c35281cf7100207d3d5932f26c87692f80dac7d2
+DIST transifex-client-1.4.1-deps.tar.bz 241665608 BLAKE2B 88fcdf188c0086c3a8438cee0408e1df8ea17fa7c5724347d8af9b3f94fd843e8a3d68e988c33ceb55f6f8723d6a97fb189027d36fe9f443cbfd39d6f6ddf257 SHA512 a7f6a8e04211756761b2b1295c3cc1ae0c2a3b6486607f0514c38f9314678f48d2f743f681bf1f990310ef89345f02cc06f15908db3df5c4a1c0c7d0fa7601a3
+DIST transifex-client-1.4.1.tar.gz 91054 BLAKE2B 55bde1faf526a633923691cd3dc14d9d481cd4eec040e95eae385c63593545dc2158e0d3518c53a08db70661abf4fb864157d5e7e1fdab403ef02e47d83665fe SHA512 66ad08c9a22e09dbb5690c4da830924e0bd76c9ecf73dbeadc849c7b1911b4439a456c478a5688883278e90903015b0968220f36f7cd951650f364857ac0e08e
EBUILD transifex-client-1.3.0.ebuild 826 BLAKE2B 039e9a694cdbb1486dd998a9458f795721a0a30160874a4b66f6e9b687a9a60419d27e5bfadd2c9782a59c14da619ab0fa6a6225c03e0733aa4b28927d3e5555 SHA512 b5a3e37c0c407277983fe034b66bcd17546759431eae69a301974dc2871426338cb53d21fae5eb1819d87df359362d7a3b81e52b0600f695e8e4426003f417d2
-EBUILD transifex-client-1.3.1.ebuild 828 BLAKE2B c51a8c2e057ffa0b2fa3e5d47ccdb615c255ebaf5832761f816545182e3772dab95227906cc294af53415f15571fee66434b52c4daa962a76c7c42a1872ee000 SHA512 7aa398b9b13a0eda42c424ad8213dccd7160d82658ec020d20a3a17d2823b4330a7578a581721feb2fe08e594c237a921afb1827a5a7732b963f7003571e1d0a
+EBUILD transifex-client-1.4.1.ebuild 828 BLAKE2B c51a8c2e057ffa0b2fa3e5d47ccdb615c255ebaf5832761f816545182e3772dab95227906cc294af53415f15571fee66434b52c4daa962a76c7c42a1872ee000 SHA512 7aa398b9b13a0eda42c424ad8213dccd7160d82658ec020d20a3a17d2823b4330a7578a581721feb2fe08e594c237a921afb1827a5a7732b963f7003571e1d0a
MISC metadata.xml 542 BLAKE2B c848737ba110443b53155e2e499f0b55f25fe1f6eb0fe35009eac80a42e34b45a00e56d40d9eea42e94129ef87ba446dbf19a1a3469a46801ab0c5c981c05c2d SHA512 a19b2e39fb736dca1c05c21097e9e75baad16ce4632767582dc634f41280fc9b41ee1ed3beca01f6992a1217b3abe63f36ac638dcb29e06ee8b2b76de338b7c9
diff --git a/app-i18n/transifex-client/transifex-client-1.3.1.ebuild b/app-i18n/transifex-client/transifex-client-1.4.1.ebuild
similarity index 100%
rename from app-i18n/transifex-client/transifex-client-1.3.1.ebuild
rename to app-i18n/transifex-client/transifex-client-1.4.1.ebuild
diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index 086bfdace25b..244c3e7e5ae3 100644
Binary files a/app-laptop/Manifest.gz and b/app-laptop/Manifest.gz differ
diff --git a/app-laptop/ibam/Manifest b/app-laptop/ibam/Manifest
index b44f5e901ae1..ed8330c6e4d0 100644
--- a/app-laptop/ibam/Manifest
+++ b/app-laptop/ibam/Manifest
@@ -1,4 +1,4 @@
-AUX ibam-0.5.2-build.patch 1314 BLAKE2B 86cac05680bc47dbf63b19f1d00c0306a5f4304c1f66eee2456475b923b7ddf775fb84a694d06a7ce0b783f7d028f361db0f35142a5863358ace9b9d406a35d3 SHA512 878aa0066a7acd22d797b8b6c17778960566d90dd794bfd95a2cc9bb71b328fdf099d3b1137cd8f9a10563405be3552a72f27c9b39da0b64656a4ae6e4d90fc0
+AUX ibam-0.5.2-build.patch 1316 BLAKE2B 200652e267f32eafdaf0d702f64fba10cec8f4e43776ddb8b6079ed845968e04cfb8ddd1143e4961bb2d157b2d78d498941c2abd6248249cf57563cf6128d6a1 SHA512 d8e9902b8fa68e1fed33723c70cfdcc24d15b4fd9c03ccc415ad742be46423dd00119de60ba9ae79fe6cb300c494f729798723d49de5a41e371034d747ee425b
DIST ibam-0.5.2.tar.gz 22149 BLAKE2B a3d9398dc34004203643d3198a3994ef3b432b909bdf9713a91a1d938a19ab9d0345105a60f3357288c2f3d2a325498a0787138e50fb445f1ea11851f1d7de1c SHA512 c70d728a2f1250ed291e663bd9f4e9ba01308fce14edf1ffd1902057de7e5527548bd06e2e3caaaeabc064d0ee123f536a626fd50b84092f6fc9201fc6bdba58
DIST ibam_0.5.2-2.1.diff.gz 6115 BLAKE2B 8a1ada53ed39a379f11158583b337166d74d17de808a44e3d3fb225eecef5e3f3b782088072f94dbad387b258254ccbe3fdce7d5655ff201c41d66dbeb7c6d61 SHA512 f6707e42626891aa87697bc28f124345f9f1d0dfb35620f6386dc1dca6b9c5e3a73571bf04e933091c1995d1156925029c0199c5caace497ff891c93f9011ac3
EBUILD ibam-0.5.2-r5.ebuild 1135 BLAKE2B e2c1ae89f275152c15580ec631fcc31cd5cac9323383addd38e9b46fa930cbb2455da5087398f8d7ceadfc8246af59014e78a7b421133a67650b75223fe64bc7 SHA512 c29ec9ff1853f2a7b59c108e98ecd07df049981b54a2c36ce97b187a5d5884ad7552fcee6e92cd55d5330b8c25ba3dd5a78389d67e68463d7818d08c710ef7ba
diff --git a/app-laptop/ibam/files/ibam-0.5.2-build.patch b/app-laptop/ibam/files/ibam-0.5.2-build.patch
index 57459f544e5b..3c2207133fad 100644
--- a/app-laptop/ibam/files/ibam-0.5.2-build.patch
+++ b/app-laptop/ibam/files/ibam-0.5.2-build.patch
@@ -1,5 +1,5 @@
---- /Makefile
-+++ /Makefile
+--- a/Makefile
++++ b/Makefile
@@ -17,8 +17,8 @@
#
IBAM_VERSION=0.5.2
diff --git a/app-laptop/tpb/Manifest b/app-laptop/tpb/Manifest
index 8d2fca1c4eb5..b6f5325698c8 100644
--- a/app-laptop/tpb/Manifest
+++ b/app-laptop/tpb/Manifest
@@ -2,4 +2,4 @@ AUX tpb-0.6.4-nvram.patch 2174 BLAKE2B 2447519c4dba81ae15593dc7ab38dd63486014cc6
AUX tpb-configure-fix.diff 324 BLAKE2B 67a11beb4ed0f52da1de194917eeb5043ee50c9867657a8fb56aff9c890b786b4b1fee7574a7aab5b5b8f717e00dcbe4a5e00cb7ceebc5bcbe51a40bb69de4ca SHA512 57ed816377f5030adc1ca37a70bf75ee8e7029b411a45a550a3a025c69d7fe45f2e0fcae175d4ed3ce51b4441115d865ac2dec44992fa0776cdfc67ed1c4d74a
DIST tpb-0.6.4.tar.gz 280316 BLAKE2B c629840245d2e749f3669e274da72baffb2856f969346d1f1feed3e45b9909f1ba12d125e48baa4cd29d021a04cba9cddec35edad80bd3ccff1ffea1423157a3 SHA512 1a12f4231b86bc3da2867670d5800f8f99f347743cf40b229c92485b6fe52e12b0222356d95d071ec26162ac778d2fe40867b4e635701620bc52236dbdb7b76a
EBUILD tpb-0.6.4-r1.ebuild 777 BLAKE2B 90db4cd802893e58725e8a4e7c3e1f07670723cf7caff1cc59e5bcccdcc2165017156a4e55e03b6ab4784110836cf34b0f37c25b984602d9d4673fccd68a2bf7 SHA512 c6b5e86fd2ac5d0b32db41fa77be9b320ab6e0d77643e59572b4f5b071c6f0d91f0a8e655d83e8089d214b0505467311cb5315f82e37d11fe3d3171e571f255c
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+MISC metadata.xml 245 BLAKE2B 4cbc7d9f811c790f5d9481868ad7cfe47274626396c2fa07c922cea11d4b3e782fcdb864accaede4c07fe2edde3a2630db0812d97ba1a6473d188c3fcbcf8872 SHA512 63f9a2d530596ec24f6dcb503ca16c03cdee5fa09b9208c3e4780b76a22e2726692d9ccb527ce81ad026596fbe7ffa8850b2a0eac3c9bad55431c5fa8f7a9c4f
diff --git a/app-laptop/tpb/metadata.xml b/app-laptop/tpb/metadata.xml
index 85e4ed814fa2..38f2737a0212 100644
--- a/app-laptop/tpb/metadata.xml
+++ b/app-laptop/tpb/metadata.xml
@@ -1,5 +1,8 @@
-
+
+
+ tpb
+
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index d1584b864db7..7e2e42393d90 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/bijiben/Manifest b/app-misc/bijiben/Manifest
index afd3226015bc..65857bb30267 100644
--- a/app-misc/bijiben/Manifest
+++ b/app-misc/bijiben/Manifest
@@ -1,4 +1,4 @@
AUX bijiben-40.1-meson-0.61.patch 978 BLAKE2B 35dfc7084a7b1795dd6c3b36434e94031bf16abba31401942760c095e076f817857e90b09356ec9f1540fa5821b4f31014d71d63b2a32d83bcff73bb39599a92 SHA512 0b3cd4ea3cee7a6368ff18edc4e5206f2e354b4d8be6a88b2ce10c0dc7a7a1fbbee7fe596592d239d1ed21d394297519579c08c9254a4677dcf48d037a37b959
DIST bijiben-40.1.tar.xz 687344 BLAKE2B 187e6d0af40649ef35453af4ce51f286196bfd0570370136611cd2191e6c0c6b578e95eb4b6edf448bac6ae7b93b729afef161d3cd4d2cbd9c40f873ed5004c3 SHA512 5d2e0694f9eddca9a152eac5c208b51a15d2a5651ab77c79c1bb94425c0f1541c916887c3aab5fb8b105ca50d0f14c432ac18cd8ac64d03e2a0ee46c91901f10
-EBUILD bijiben-40.1.ebuild 1182 BLAKE2B 7b5aa9655f530389942442433933590b42c81822fc3abe3b323f0e9fd1db29f22585bb00f7b3708aaecfc9bd2f04afb396b4ae16f0d87fe8ea6db678eb5edf89 SHA512 90bc0a8ccdca650984bd206ef358702e5ec9fdb76d477e715800d0d882d572eb66be107069190fb5ca75fa2200402fdc30a224348fc73c37996975a7d194a895
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+EBUILD bijiben-40.1.ebuild 1182 BLAKE2B f9a379bc9575d2ca4f6d2f9646377810e30436f3e23c1c013ca857e3c10464a8ff82eef174ebcd8bbcf39e874d8df93c6dfb0a0357e85c16ee0c7272758cddeb SHA512 f2d46da1084c3edb9f9c0a1c13e788839a154b76b36fe7661c469ba1b923c031e308c8b3864b4d15060f822e073286a508dc62fe648bcefe3ba41dcadd17612a
+MISC metadata.xml 352 BLAKE2B 6b4663f449c7bc89e79e73ee48468119ca68a60098cc2704e669c343bb2412da39278d17cac49c7fdb3a8713670a9f47667547f93630752c1db8e3c7f03f6ddb SHA512 295962556d2723af978fe2b3f2887dd569ca437ad6248f321051a36c760cfc7ebab7336314198de376a328d2f474aa625a01da8550b065f6d8d5806f10ad141d
diff --git a/app-misc/bijiben/bijiben-40.1.ebuild b/app-misc/bijiben/bijiben-40.1.ebuild
index 53f12fc62f75..0756c1deabdc 100644
--- a/app-misc/bijiben/bijiben-40.1.ebuild
+++ b/app-misc/bijiben/bijiben-40.1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit gnome.org gnome2-utils meson python-any-r1 xdg
DESCRIPTION="Note editor designed to remain simple to use"
diff --git a/app-misc/bijiben/metadata.xml b/app-misc/bijiben/metadata.xml
index 7b343b06be8a..4de392269fc0 100644
--- a/app-misc/bijiben/metadata.xml
+++ b/app-misc/bijiben/metadata.xml
@@ -1,8 +1,11 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+ GNOME/gnome-notes
+
diff --git a/app-misc/broot/Manifest b/app-misc/broot/Manifest
index 1315caa429b1..a829cf9d2fd5 100644
--- a/app-misc/broot/Manifest
+++ b/app-misc/broot/Manifest
@@ -15,11 +15,13 @@ DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856
DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
DIST bet-1.0.1.crate 7163 BLAKE2B 173f38b378ec7a3bfbe6c180d0988af381cbec39d7637406c1d9a70ede2ba097dffcffe79161be9fbe82816c9b02e6d950eeec035882974232bf160db29459e5 SHA512 15309942fd6d8365d7dd31dd0051fc795236c08b098edb605465375d2132a40bc898bdefbac71f5717b248cea6d7b70b8cc72b9046daf684db76458d99288b48
+DIST bet-1.0.2.crate 7388 BLAKE2B 12f4177fe03ba6aabc8f09834c52f68d00d55331d27881afd0f1bde4d19284d3202e11dfecc8b4b5ce4874e0c18ecf70d66c9b01b725d80288e0df2e4181c890 SHA512 f674a4aec85da8aea93d07babed4f18700137332538eaf8dde5ce7a2eacac049b913758026af32987b1931b0047751a855409ce2c88108840677fb120320585e
DIST bincode-1.3.3.crate 28958 BLAKE2B ea01d2efd8149ecba5e240ed989268b683d542a5f369902d316a4fd1ae4b8edd94e2d4a8cbff0e96646eb29facb04a84b249d74f0781dc3d29c8797ac975aa9f SHA512 49e39d71214dbb623a18e3852f6f2f2a5c3f951b64107d66c8adaa95a442a3283fba978bca41b126c9879b12833b945f478d2c77d35482b3577fc1a894e8e5f3
DIST bit_field-0.10.1.crate 10576 BLAKE2B 3a906092be85cce6af9e2ac48632d8545864c5fd1610e7e28731bd5cc44c9513f2c7eb52fa1be0b4eed65bffe130ddc98c95dfeba2f9de28ada4091396e5695d SHA512 4848d7ec592642913c7bd06cd3a0da49d3bb14291866cd22ead8e9a6b2939a787035d5cded87be3d2d3491283e31ea2cfb105885df4114720da98beb82990ee6
DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
DIST broot-1.14.2.tar.gz 10043403 BLAKE2B eabedf5eb0830b78563f8cdf146f86d972efacbc490db73937a1a3dcd2108e798b90cb4e24c53d5a62172c5f053ec25f006ea995ae233b200640e6a6090c87ef SHA512 ae48ca96a4c99a50bcb1ad752b3a83b6831c337ddfab6b7c4618f5b57f6262bab7ac677f5dea351d57eb708364be6213eab0f74aef9b18a800b38fdf91f991d5
DIST broot-1.15.0.tar.gz 10107762 BLAKE2B 753cb852483316ecb0a7ce74042fe53550f344eef2576951271d0290b9f6001c0c84a85b13f481698c6054ae06aa085e6c80e3e4cc5bb735a38fa8c1f256d853 SHA512 0a0e4c800ed43ed317c81202a5d18a8b6a4df4362d2e1c9383955dfc4a30b6b28e0bfb07e89a66ec10edc37250a65c0206a816e07bec6f810df32a2c48f4cc65
+DIST broot-1.16.1.tar.gz 10131628 BLAKE2B 645dc29aa994badd0f6ca8f2f52374edaad089618d0255a8ab61bc12a4207e7ea8c77af7e351908190ccd77bdd49bd824d14c9a188ddf867da54fff4c31e35b0 SHA512 4f71d4a1b46d346b7281fe7ae6d6f649bc8bd6ca0f8a0b138c36d13e2febdfa29d4a117253408b1834312c68702ceb4496ed768846dd5e3b1ea9f820b526adbf
DIST bstr-0.2.17.crate 330350 BLAKE2B 90c3a48d78b73d7e36a3da9fda0beae6e91ce534d17198ea8ceee0b613d03297f9dd8bca30e1ec5da01d1da359a1da72b2c2771b77c82bebab5006cafd665192 SHA512 883eac8210d14f89517b4dd5e25d02c97cf31602ec74498b5e186112ba0f154d47de8d1c41a8f4e5503f3b53c064e2c976b60bbfd63fc28b186bc006e00f20c2
DIST bumpalo-3.10.0.crate 78915 BLAKE2B 94515190837765b47feaf94946c7e4da5b84e6faf7975bd5452bd9388d34e51c84315b80bc15b37c7f4ea8b4aaa0112707cdfc82d0651eeb8b63d2e7bd247660 SHA512 60c686534588524250ea7cb43510dba69d24999769b719127ee07f6015530ac2c5778d9b93477ab075bfc15c13e3ef9adc29ac24059067ac32e109347cd509f8
DIST bumpalo-3.11.0.crate 80945 BLAKE2B a740a674d0922794cc71b87a8bd686f677f8d0b38d88cc43467b7f8f6d1368ef5cff99bf10867d3c8af9b79b71deca7e5bfe78670b7890b04e468359780d8c76 SHA512 f747b5743bd2825c62c363ec49f1eccc492d7cf8cca8101aa9733f32489685c1777344dc6183f83c772f1067f9648b953d3ae1034976a14295f252f1ee7788fa
@@ -149,6 +151,7 @@ DIST memmap-0.7.0.crate 15214 BLAKE2B 44a5bde9b85b2c378fd4c6ebfaa322ef8d0076472d
DIST memmap2-0.5.7.crate 26229 BLAKE2B 4e7751946a870dc3a3978daa51e524a7bb993f100debb778fe1fabe64f61dbe9c01042f02242d8b8be583a35672696454355e79981accc29fdb78989f8e0f12f SHA512 467e55a193497749f3dc7ed228f85622d072e07929a0c76904f0aa7a605f7689188e2b980ab17737301656edfcf86d851a482088c2f73f2132421612bbf08375
DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
DIST minimad-0.9.0.crate 19223 BLAKE2B 2d54da14a5eccb00e34b475d394f58a4fd24924ffc83fd8693659c0c5983806af41f9d17acfe50cc58e5e3f764074ed53fba15917b81cec0eafbddd4913d001b SHA512 e4deb76ea2f9e1cb0ca05406108ffa1d9a9ecf8af3752f6d3272e0fa595c4b659357084dc12f769ac843e13f7a9216fb7b470801788d9b0476001251bb950845
+DIST minimad-0.9.1.crate 19494 BLAKE2B e2380d676d1635409d013dda401289f52c0db05e6e0318c8c73ef109c7d5c4f99ebc731d2164a22d19ef63af020887faa792c552c4f5e116abf9043c47b6a197 SHA512 6b98b28322db8bcac5e1b6a095baf335e8049eff8430fdf5ec50c78589e971b32abe5821dc2151d39c3ae64a1f47c16f677c78b53393f9eaf321a59a32a1ccf8
DIST miniz_oxide-0.5.3.crate 53452 BLAKE2B ae99baa01c493b5eb779595be0d77a064c4624397676d3a023cc2a54941b0b3e7c80492ac47c8a28d78ec36e2f04aebe5af79f0e714380061c5e0139b9dfd9fb SHA512 cc2971ee2a2e891cdb05c1942f533b11a557199421910266ec2e4848a16dfe6882f1c08843035443935d695882720402356b4df4a50ed131a8f5fcc0591a72c5
DIST miniz_oxide-0.5.4.crate 53485 BLAKE2B 8836697bdc3707f89fa869e6b09a36ee4d83ce2ae0a53bc7b06bbad70ed7ac25f8f67d841f3f611f6756d891f0eddb0abf7fcaf87570f8ab32220f113583ea6d SHA512 589dac16ca9c2f94e6fa92b68bcf51d140f46562cbb3a1b791b75c59feae51da5ec16042604bbd6bcb7d7f0c7f75e98ea1af8cf42d177133a5eaa86429cf3114
DIST mio-0.8.4.crate 93013 BLAKE2B bc9722d2211195dcfaf574d83b2967d299eb02ff40b4fb4df2eb6b08d78e018ae1a9e198f43268ab2d38733feaa8298e9736dec9fb9add66c401d57406fd1292 SHA512 b44675c90daa37336a25e7eef53cdc664e6f52590ed4955bac82641baf8099d3d94850da79d985255eb74b61a499b1ea4a9d7309f6ea4c41454b3dbb090b70ee
@@ -248,8 +251,10 @@ DIST syntect-no-panic-4.6.1.crate 732925 BLAKE2B c93d1a0c3ad61c4c091968b5c033022
DIST tempfile-3.3.0.crate 27578 BLAKE2B e98c5ed4c59b6ff411e89ad4eb529bbe15264d6744edca8675c89bfb4397fbbb8da60bbc582da24bf9953afd9bb17cdb22654d933468697e9fa9e9903e6a7c77 SHA512 ba6faafb2dd56d694efe424752099a2efb50316afc0a4db9fdb7620ae3f1a31dfbb2a7b41724878cb977fa11f7568a406bd3b6a4f7cfc0b88b86b2cc616b953e
DIST termcolor-1.1.3.crate 17242 BLAKE2B 5aef69c0004081bd3cc4d531d13d63627cc02313868c0faab62358d13abfa7b4ba82f142c2801d25a6ae46ecbc8b7bdbeaa21c9105ea3b8950ab6a38cdb88513 SHA512 5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a
DIST termimad-0.20.2.crate 353272 BLAKE2B f5b79041f015c4891772184764e6f8fbdf96b5fe1b8a9e5df5212f24ee4c065d6aa65352f1cc45eade14ee499a97f547f12f73003fdcbf575aab43b2888715cb SHA512 424a54b7368ba9aba244f857f5600c0719e6be28dd968d6542080ae1ea646ad24de934ffe3abd27f6edbb42e0c103c7baffa3be691d3015fb36d319528323f60
+DIST termimad-0.20.3.crate 354190 BLAKE2B e405b20d67f5d54805d2906569e7a817a040693b1e2c15b7b9a3603701a9d4cc30ea64b69cbc1419e43590b0367d5ca24951774eee6177214c1d15c3453ab307 SHA512 7d83d49c0ce02ae91872c92f4d9a4c6ecc52d59afa4d948ee32bb7bfea01527b4af61557bca1b8bee1378fc72d22ed68b43e959dc96eee4f18c47ed6b35c51c7
DIST terminal-clipboard-0.3.1.crate 5597 BLAKE2B a05f67c1ebce2129a2b8130cd84fbed579c67ae4d46bc4f233e6ae647a2693e5c1257ce3882a21345b596c487cbf5b339ef907f417aafea4bb6f980113aa31eb SHA512 b29a81d2737271cc4e60115e473ea3af80ce45f078c99fee573cbd35da8e27c939ff1aa86dd86a3e2ea9352a28f2fd3492e28be63c3eb0dad53974d06b43c346
DIST terminal-light-1.0.0.crate 38533 BLAKE2B b4b42796d84d18414955eabac8798ca26479e1189ecd0ba037c89ad4ec6fd3f9291cc2d6f87bdb3e9e4bf671006c8b0555b9e18d95f195ee4e82d4611109b6c9 SHA512 2414c6cd98ae293556552ad0a5fb198f148be05dc1336bee65b31d864aaecf4f85442ed9f1c34bd1a5968e10e6d015307e32173e75c2a80fca9f3df3374db598
+DIST terminal-light-1.0.1.crate 39115 BLAKE2B b4a8ec843c84a22b7de0f607ed4ad212f503142ff3e0085903c7faa2a9c0058f7de019501dd04becb7913f7ab6f988d79d07efdd6d42cfe233f0ba3468367edb SHA512 0547e006add17b0a363bbe792a1cab67832af3fe148e85b5a00a70651a01e8d8fd8a7cc1e720093d4223e50fe10277389d72acd5b3b738bfa6027be35e7fbb80
DIST termux-clipboard-0.1.0.crate 2033 BLAKE2B 33003b25e6236370b2423472e87deaac8ee282c375e02faa3575aaec7ef547674f0218a50f0a2d42ff75dcf088ef31d94f44c4b05c0f526dddbaef2e06a8c722 SHA512 acd972d9c9eaa20dfadf1ec01274ed27fb33d16d97b504d8f41fea9c6598557a32d939d0a8a8585d919ee9d1b411d714851d662b5bc7d1a5f3b97d8cd423a434
DIST textwrap-0.15.0.crate 52998 BLAKE2B f6c3057ea6ffde88dd9824cd3159d398316d9d21f327d2af59239ff84d79f893a9d0e96dfbd883aab6c64b631dc99457018e38baf14d40789f02d633425ded86 SHA512 f44271c542c22f17a4e3a459255f95e6c02d999f7d6bc8414d3973fd4ac9353aa4ef436932a45340738126905463d776902715feaa9329371f8a14f14b5a7bfd
DIST thiserror-1.0.31.crate 18013 BLAKE2B 5a46332efc602f8ce864024a538379b23b4586c04b18bf01b32b3cafae3ad90ae0c1ae5639cad555c01767c20f0109f87384918cb15a7ce51437094e70a2e544 SHA512 0e11aba54d38fc164c65b9357d1738ca96af2bc7bc2bcacfc4efc6f5c26a594effbb5e47aef46772ccafbe88871825a517920030572b79fae3d305550bfa6431
@@ -310,4 +315,5 @@ DIST xterm-query-0.2.0.crate 6342 BLAKE2B fd6a99cdc190d4e7bbf03467f1493c909cfd1c
DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
EBUILD broot-1.14.2.ebuild 5724 BLAKE2B 078794cdec951e8e1142e4be2e1586c03c56439db69ddac356de226738bb4dcefb6cb91a8281d73e781dd42a9079e49a0ea8a18a88fbc31d1752cb39a23bf4a5 SHA512 4efca025ee02615d770bc323744b0079f0d4390ad45e0c49b9cf5f242543ebcd7499f01291a40e80d7621e89674057da056f4c2ab7893005973d81f8ade2404b
EBUILD broot-1.15.0.ebuild 5749 BLAKE2B b95f74dacc192ae729970b92083f50b9146edc0eeee9e795cbcb77a708ecd87a768f39375fa5a82daee191ab698e3408c195859487ccd25067e4312339cefb7c SHA512 036238be8dbec252ae23bc130f0cbb7b968802486ff2f4799c5dd51b47df2a292daba38d3da17c00752f844ed1f1740dc1b2672d83f89a5b8dc4cfd4aeea4bdf
+EBUILD broot-1.16.1.ebuild 5435 BLAKE2B 33ba7bed3be90c6dac83d4222ce0a9f58c06d79f0cdd4835f5c0c2f2be31b043279576ceaee25a7193fb555c1dea1fb491e897656600cd60fd40da785b391255 SHA512 bd3a7a25fb5045663bca52a260a528ad038aa09add3a15a1d8d4b6ebf19f91e36a3dbd5a841c3908a99b2fa8fde6f964ee02533594f4310057851d1fff42b221
MISC metadata.xml 564 BLAKE2B 0c694d4996ceefd6b05c3ff74f313d775c820d3eb0ae327cc2c130a608fd8595c64aa1217599d61952c6ade05415eaac53056c3fad30ccb5347df134715bb573 SHA512 5533ba0526ff6cbb801696c8ddba2dc393b158bdc2cf5dedc3b245362d924172e4bd321412cd6976735bcabe01d5e7e191e11b2718412b5e389e9251ca5ea695
diff --git a/app-misc/broot/broot-1.16.1.ebuild b/app-misc/broot/broot-1.16.1.ebuild
new file mode 100644
index 000000000000..9eb76229ba4c
--- /dev/null
+++ b/app-misc/broot/broot-1.16.1.ebuild
@@ -0,0 +1,301 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+adler-1.0.2
+ahash-0.4.7
+ahash-0.7.6
+aho-corasick-0.7.19
+android_system_properties-0.1.5
+ansi_colours-1.1.1
+anyhow-1.0.64
+argh-0.1.8
+argh_derive-0.1.8
+argh_shared-0.1.8
+atty-0.2.14
+autocfg-1.1.0
+base64-0.13.0
+bet-1.0.2
+bincode-1.3.3
+bit_field-0.10.1
+bitflags-1.3.2
+bstr-0.2.17
+bumpalo-3.11.0
+bytemuck-1.12.1
+byteorder-1.4.3
+cc-1.0.73
+cfg-if-1.0.0
+char_reader-0.1.1
+chrono-0.4.22
+clap-3.2.20
+clap_complete-3.2.4
+clap_derive-3.2.18
+clap_lex-0.2.4
+cli-log-2.0.0
+clipboard-win-4.4.2
+color_quant-1.1.0
+coolor-0.5.0
+core-foundation-sys-0.8.3
+crc32fast-1.3.2
+crokey-0.4.3
+crokey-proc_macros-0.4.0
+crossbeam-0.8.2
+crossbeam-channel-0.5.6
+crossbeam-deque-0.8.2
+crossbeam-epoch-0.9.10
+crossbeam-queue-0.3.6
+crossbeam-utils-0.8.11
+crossterm-0.23.2
+crossterm_winapi-0.9.0
+csv-1.1.6
+csv-core-0.1.10
+csv2svg-0.1.8
+custom_error-1.9.2
+deser-hjson-1.0.2
+directories-4.0.1
+directories-next-2.0.0
+dirs-sys-0.3.7
+dirs-sys-next-0.1.2
+doc-comment-0.3.3
+either-1.8.0
+error-code-2.3.1
+exr-1.5.0
+fallible-iterator-0.2.0
+fallible-streaming-iterator-0.1.9
+fastrand-1.8.0
+file-size-1.0.3
+flate2-1.0.24
+flume-0.10.14
+fnv-1.0.7
+form_urlencoded-1.1.0
+futures-core-0.3.24
+futures-sink-0.3.24
+getrandom-0.2.7
+gif-0.11.4
+git2-0.14.4
+glassbench-0.3.3
+glob-0.3.0
+half-1.8.2
+hashbrown-0.12.3
+hashbrown-0.9.1
+hashlink-0.6.0
+heck-0.3.3
+heck-0.4.0
+hermit-abi-0.1.19
+iana-time-zone-0.1.47
+id-arena-2.2.1
+idna-0.3.0
+image-0.24.3
+include_dir-0.7.2
+include_dir_macros-0.7.2
+indexmap-1.9.1
+instant-0.1.12
+is_executable-1.0.1
+itoa-0.4.8
+itoa-1.0.3
+jobserver-0.1.24
+jpeg-decoder-0.2.6
+js-sys-0.3.60
+lazy-regex-2.3.0
+lazy-regex-proc_macros-2.3.0
+lazy_static-1.4.0
+lebe-0.5.2
+lfs-core-0.11.0
+libc-0.2.132
+libgit2-sys-0.13.4+1.4.2
+libsqlite3-sys-0.20.1
+libz-sys-1.1.8
+line-wrap-0.1.1
+linked-hash-map-0.5.6
+lock_api-0.4.8
+log-0.4.17
+memchr-2.5.0
+memmap2-0.5.7
+memoffset-0.6.5
+minimad-0.9.1
+miniz_oxide-0.5.4
+mio-0.8.4
+nanorand-0.7.0
+nix-0.22.3
+num-integer-0.1.45
+num-rational-0.4.1
+num-traits-0.2.15
+num_cpus-1.13.1
+num_threads-0.1.6
+once_cell-1.14.0
+onig-6.4.0
+onig_sys-69.8.1
+open-1.7.1
+opener-0.5.0
+os_str_bytes-6.3.0
+parking_lot-0.12.1
+parking_lot_core-0.9.3
+pathdiff-0.2.1
+percent-encoding-2.2.0
+phf-0.10.1
+phf_generator-0.10.0
+phf_macros-0.10.0
+phf_shared-0.10.0
+pin-project-1.0.12
+pin-project-internal-1.0.12
+pkg-config-0.3.25
+plist-1.3.1
+png-0.17.6
+ppv-lite86-0.2.16
+proc-macro-error-1.0.4
+proc-macro-error-attr-1.0.4
+proc-macro-hack-0.5.19
+proc-macro2-1.0.43
+proc-status-0.1.1
+quick-xml-0.22.0
+quote-1.0.21
+rand-0.8.5
+rand_chacha-0.3.1
+rand_core-0.6.3
+rayon-1.5.3
+rayon-core-1.9.3
+redox_syscall-0.2.16
+redox_users-0.4.3
+regex-1.6.0
+regex-automata-0.1.10
+regex-syntax-0.6.27
+remove_dir_all-0.5.3
+rgb-0.8.33
+rusqlite-0.24.2
+ryu-1.0.11
+safemem-0.3.3
+same-file-1.0.6
+scoped_threadpool-0.1.9
+scopeguard-1.1.0
+secular-1.0.1
+serde-1.0.144
+serde_derive-1.0.144
+serde_json-1.0.85
+signal-hook-0.3.14
+signal-hook-mio-0.2.3
+signal-hook-registry-1.4.0
+siphasher-0.3.10
+smallvec-1.9.0
+snafu-0.7.1
+snafu-derive-0.7.1
+spin-0.9.4
+splitty-1.0.0
+str-buf-1.0.6
+strict-0.1.4
+strsim-0.10.0
+svg-0.8.2
+svg-0.10.0
+syn-1.0.99
+syntect-no-panic-4.6.1
+tempfile-3.3.0
+termcolor-1.1.3
+termimad-0.20.3
+terminal-clipboard-0.3.1
+terminal-light-1.0.1
+termux-clipboard-0.1.0
+textwrap-0.15.0
+thiserror-1.0.34
+thiserror-impl-1.0.34
+threadpool-1.8.1
+tiff-0.7.3
+time-0.1.44
+time-0.3.14
+tinyvec-1.6.0
+tinyvec_macros-0.1.0
+toml-0.5.9
+umask-2.0.0
+unicode-bidi-0.3.8
+unicode-ident-1.0.3
+unicode-normalization-0.1.21
+unicode-segmentation-1.9.0
+unicode-width-0.1.9
+url-2.3.1
+users-0.11.0
+vcpkg-0.2.15
+version_check-0.9.4
+walkdir-2.3.2
+wasi-0.10.0+wasi-snapshot-preview1
+wasi-0.11.0+wasi-snapshot-preview1
+wasm-bindgen-0.2.83
+wasm-bindgen-backend-0.2.83
+wasm-bindgen-macro-0.2.83
+wasm-bindgen-macro-support-0.2.83
+wasm-bindgen-shared-0.2.83
+weezl-0.1.7
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+windows-sys-0.36.1
+windows_aarch64_msvc-0.36.1
+windows_i686_gnu-0.36.1
+windows_i686_msvc-0.36.1
+windows_x86_64_gnu-0.36.1
+windows_x86_64_msvc-0.36.1
+x11-clipboard-0.5.3
+xcb-0.10.1
+xml-rs-0.8.4
+xterm-query-0.1.0
+xterm-query-0.2.0
+yaml-rust-0.4.5
+"
+
+inherit bash-completion-r1 cargo
+
+DESCRIPTION="A new way to see and navigate directory trees"
+HOMEPAGE="https://dystroy.org/broot/ https://github.com/Canop/broot"
+SRC_URI="https://github.com/Canop/broot/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ $(cargo_crate_uris)"
+
+LICENSE="Apache-2.0 BSD-2 BSD LGPL-3+ MIT ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="X"
+
+RDEPEND="
+ dev-libs/libgit2:=
+ sys-libs/zlib
+ X? ( x11-libs/libxcb:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND=">=virtual/rust-1.60"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_configure() {
+ export RUSTFLAGS="-Cstrip=none ${RUSTFLAGS}" #835400
+ local myfeatures=( $(usev X clipboard) )
+
+ cargo_src_configure --no-default-features
+}
+
+src_prepare() {
+ default
+
+ local mandate=$(date -r man/page +'%Y/%m/%d' || die)
+ sed -e "s|#version|${PV}|" \
+ -e "s|#date|${mandate}|" \
+ man/page > "${T}"/${PN}.1 || die
+}
+
+src_install() {
+ cargo_src_install
+
+ doman "${T}"/${PN}.1
+
+ local build_dir=( target/$(usex debug{,} release)/build/${PN}-*/out )
+ cd ${build_dir[0]} || die
+
+ newbashcomp ${PN}.bash ${PN}
+ newbashcomp br.bash br
+
+ insinto /usr/share/zsh/site-functions
+ doins _${PN}
+ doins _br
+
+ insinto /usr/share/fish/vendor_completions.d
+ doins ${PN}.fish
+ doins br.fish
+}
diff --git a/app-misc/cw/Manifest b/app-misc/cw/Manifest
index 03634ee34276..f4375f6894d0 100644
--- a/app-misc/cw/Manifest
+++ b/app-misc/cw/Manifest
@@ -4,7 +4,7 @@ AUX 1.0.16-ldflags.patch 417 BLAKE2B ec4399063c9b082ea2b51cc33ba684f5b583392e350
AUX 1.0.16-path.patch 479 BLAKE2B 17108f1ff61d1ff3e4625f86589b6cc372cef6e849851df193093bef8f9fd43706f70eaec98544c3a2e4da20298b21c597d87dc56354e6317859f05b12bc9c38 SHA512 6ecc5cc11e65db11617b1ba902a414900e7e4f0ac319c60e4d5131769560b07a1dac3496b33dd07d44cf9ea6d95924114fb9361ef7b15235604a53b2b517bb53
AUX cw-1.0.16-Respect-CPPFLAGS.patch 649 BLAKE2B c08bef1d8f6adf4b1a84b58c697bb1858d45b4fe619dcd67b5e13068f27e07c37b90c6d26826b3ed3dcb13010c6fd50f2cbaad0554768172d1f4bc99656cc77a SHA512 c3e52cab72c149f5b319e3cff5d9ab8f3fb9a575e6f1ec9fa99a07e5105a86f39ed524715afe6ced8483fa1f562bec0431073b74b1e4f9070ae5146b21f9bfbb
AUX cw-1.0.16-fix-configure-for-newer-autotools.patch 491 BLAKE2B 109ea5f7777205c87f6f52abb75fa0870d46a66b4ef869ac6cbc12eef1852afb3136cff4f8a8e9eef348e525fca4571aef85b398c6d1ed94c802798e48e4e092 SHA512 704dd7899d6316d2ae1ad478235370943f1bb42cc75a594e2eba36758afa2b81e0f3fff78445e03140de8ff7b41ba1f8a7fa81fbe9ea67df510838b7dc778125
-AUX cw-1.0.16-replace-isastream-with-fcntl.patch 530 BLAKE2B 31719713817c810c4368b1842186711b1f9190d62eaa644bfe3981aa31a7733ccb4f85d0a3b5bfbfdfdca6357455cdb3fe030b4fa1be6c1cc85cc07c0190683e SHA512 3de7d966cbf1ccc86dd45a797c62af75b0e38e9f9e08547090d3eef6b947386b4bc1118e3f9bc5213e9c8d35e5f59e0e86b59823dd3883fd15eecc505c3b160d
+AUX cw-1.0.16-replace-isastream-with-fcntl.patch 470 BLAKE2B 454da68da8a32bf980837c28fb5fa392325bd7c7ee186386c5347fb21949a05b7cad8c6da02b74a4bc0dd7dd997360c60095a3e62e22e1f21abc3f014e477570 SHA512 84e3fdc906880691a0b87715e76729a3c00da0edef838c169113e7c9122c8d5dc421007f1b47214a12cd4f08bf01ab1dd42d635b1bf3a35c5cb215eaf15ea589
DIST cw-1.0.16.tar.bz2 76035 BLAKE2B 4257dad6df2122efabd9d5f51e7d0f0f5103afa261b4d7781ec27a81d9efc903c55a56e7b9bb1d16bb3c6bc856f15ec6f8d7ae69935511659bbfe82475377e38 SHA512 6a5da4e4dbb4d042d8b4e1e0727039f3103f9d7124a6f7c37ac094d7fee0ae10d9bacc6739fc133ca9fb682501bcafecd39a660abfe19fbf1fd9bf7ec06cfa32
EBUILD cw-1.0.16-r3.ebuild 1536 BLAKE2B 48af35f48ed2693c7ce6307dc7eb1f178d5d039a4a34abb6811943be3a8cd31392ddf5ff847097a3b1f14ffbb35acb8107ecf06cf246774c1449d94ff2b87263 SHA512 c537ae708fb5ab3439edb76b525f8dfa8c406ddc3e2777c3c2b1a84b605dee34a0a513d1f2bfe4d48e2582b5f94eb533cfa44f263a517e2a256e5e704455cc13
EBUILD cw-1.0.16-r5.ebuild 1862 BLAKE2B 89c7000f7bc3ee243650958653d23010210d0684245a956832d9e1db52199ec26d01873a0fce8308c6008d52b066eaed3fecba92ec09b6d9e394bad89eb954f0 SHA512 46d45d3589de44032130170577f2e783966185d11210e6e49f5ad2ead8a5f22e705c432c59738031dd69eaac7367e66d49b624e964b7c1b1bea05f40c52a1a23
diff --git a/app-misc/cw/files/cw-1.0.16-replace-isastream-with-fcntl.patch b/app-misc/cw/files/cw-1.0.16-replace-isastream-with-fcntl.patch
index 18f2dba953d2..978c23bb9b71 100644
--- a/app-misc/cw/files/cw-1.0.16-replace-isastream-with-fcntl.patch
+++ b/app-misc/cw/files/cw-1.0.16-replace-isastream-with-fcntl.patch
@@ -1,5 +1,5 @@
---- /var/tmp/portage/app-misc/cw-1.0.16-r3/work/cw-1.0.16/src/cw.c
-+++ cw-1.0.16/src/cw.c
+--- a/src/cw.c
++++ b/src/cw.c
@@ -1173,7 +1173,7 @@
close(master);
return(0);
diff --git a/app-misc/geoclue/Manifest b/app-misc/geoclue/Manifest
index ab2fea53de2a..db27f433e6cf 100644
--- a/app-misc/geoclue/Manifest
+++ b/app-misc/geoclue/Manifest
@@ -1,3 +1,3 @@
DIST geoclue-2.6.0.tar.bz2 94890 BLAKE2B d579752482e77e6ec6df3cb34f6b1c7ca61ea425f1c29195f1bcd031afe22644aed2f5b3f75e82c20e0e3cf0d415ca858b30351b2ee3835fff0ca25e63fc6395 SHA512 13205ab88cbd9748c155081318ae1909fddedce4250e3ece39a9f379b8cfea91dfe571961e278406ba54f8efd3a1070967479feb8256f50170112b28246b3103
-EBUILD geoclue-2.6.0.ebuild 2324 BLAKE2B 536a60815b6a0501ddac9073c72e6c85d63bb0a82cf7f623780b671e945a4a0b069a4e99d4fde96726fb9bb21ff593dff76692bbb1dcf23ca194517d5a49c0b6 SHA512 c88d9e09e3751cf9f9c3ad84835432056f0177f1f30f5d181c84e11d10ac117ccb9fecdec0646a24c5f0a249d9f386ee0cbd57efd40d4ac85b41bb6a2bfd4f46
-MISC metadata.xml 523 BLAKE2B 42629fc7fb9ed88748d53c9f521666436eb8b65d33d004410c577c32235dacc8618def18da640986b8e64ecfb8b0b9c4085797a40b9aebc3d8f9471ca4e163b2 SHA512 33aa5cf04b48ab8c9b805aff3ee9d33193314bff55e4ec47ee2cadd0f5b7cb2c9d6ee86a27a4a2bb9286ee4637c9d04b5eedea41467b6a8da605f8b0eaf71a5c
+EBUILD geoclue-2.6.0.ebuild 2324 BLAKE2B 8d1d8e6f154d1b176b0beb7be9d476570875342806dd9a4f04925bbd1f71160c4e149a7cbaa10e3cb88aab7432df7dfa9522abace393339e3c0317962b0b2390 SHA512 51391de232418e6b6afd95b34821ac218685bc6d9d87e009ea070f90fdc397887aa276d85f686ed443281aaba328dafb8a5ec4078d4178e489bab22155bf2e1f
+MISC metadata.xml 639 BLAKE2B 28c6064146f33d2aa2dec003d4c54f975a89569105a08d7dc39a72a4ae31036920883b5f0355d08f6bada68e693d86458d02fd63300713b338fa15f9a4409dfc SHA512 504f0f8270c7d2e1f098308826fd2141a996af007996aa75569d85a3d256bf76e3599d89d8d908b11437e8bb00d28ecfdcba59b81e23f2646d6f723f686c18f9
diff --git a/app-misc/geoclue/geoclue-2.6.0.ebuild b/app-misc/geoclue/geoclue-2.6.0.ebuild
index 7f5425d4334e..78cc6ffc358a 100644
--- a/app-misc/geoclue/geoclue-2.6.0.ebuild
+++ b/app-misc/geoclue/geoclue-2.6.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
PYTHON_REQ_USE="xml(+)"
inherit meson python-any-r1 systemd vala xdg
diff --git a/app-misc/geoclue/metadata.xml b/app-misc/geoclue/metadata.xml
index 668d225821c3..e64fa36fc587 100644
--- a/app-misc/geoclue/metadata.xml
+++ b/app-misc/geoclue/metadata.xml
@@ -1,12 +1,15 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
-
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+
+ geoclue/geoclue
+
diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index dfa3fb487f64..51eaf1627ffc 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -2,4 +2,4 @@ DIST gnote-42.0.tar.xz 3330504 BLAKE2B 847c1c66b86902c13a7e9cd349e0b1e565f046ba8
DIST gnote-43.0.tar.xz 3325232 BLAKE2B 9e56aa164262b710aab872be48fded2a6c70a062ddfe7c95ae633c38269390a6b3c3143c788f0ee43fb37d0229443a600d71e5edfbab1aa387a20e135210a0dc SHA512 34133ba1cef12c02a6518017f6b5b07b6781f05af787034ceb3dd8bc4d59fff2a7cdc17615511e7008c39bebf52e6b78a973840bdd5b6b1e5199226fdd12d91c
EBUILD gnote-42.0.ebuild 1529 BLAKE2B 25b2bbbc16b22e051f3bf98dbded4ae9151b64330003b84b8b529c428fcb076d4c40f493f66a02d9138f415d7819a1dd64701785e80e3e3b961f8d501461a234 SHA512 c0e89681d3b0acb65c66d0050cedc52cdaa63c094721d57589abab87f8c7de1095d91cbfdbb0d92867d8f45eecc68e6d8f3a903001267a92d1d6caca5a0ca54f
EBUILD gnote-43.0.ebuild 1531 BLAKE2B 701bbd0c3c162abb1e5dd6df41fe3f35b065e502934096853272238761ed9bf0590c2533550452790acafd4bd01d7300df81cc0ab759fc08dd508664c50419e7 SHA512 1199fc10659751737c226278e3ffad458c3ddb4a8ff4e57c63c807f72d82c7eb6895798e9db823c6b60500264bbc42d2d2e17196b30a4335517f3a8f02b4c9a9
-MISC metadata.xml 343 BLAKE2B 7ee97c51a3909fa5375a7ad9ee680ef0e52cbf09098f385eb3a11441af6a31b76e8c7674a0b57d7adc8a07546b9b5c31f8eb4007e58e030cf348fc5ca2499718 SHA512 d304542c83029fc3ff18100e14539f9b9a01474b5847e1495d4f01ee48d8b16f06a7efeb3919a9f3f1686770f23b30185441cfacd4c081eab4a34c21b3307a50
+MISC metadata.xml 346 BLAKE2B dd5d67f5f5f2bd3205f8087ee8abab196289213b451493bcb0e059f902482449329bf03e9cd44e13cb72a347b4ee97f6b1cdf771c0723bcb93b06dcda9a3cb00 SHA512 0f177f3c20fb7215c21a2df360abfdab37bac8cc8b1405d31cd76d552d65661762a929972b0bed0a4c46b7f9c4b053b9a544209282db688699208b5ba0ccec64
diff --git a/app-misc/gnote/metadata.xml b/app-misc/gnote/metadata.xml
index 9eb47218781f..5a6a7a8f19f2 100644
--- a/app-misc/gnote/metadata.xml
+++ b/app-misc/gnote/metadata.xml
@@ -6,6 +6,6 @@
Gentoo GNOME Desktop
- tsuna/boost.m4
+ GNOME/gnote
diff --git a/app-misc/rox-filer/Manifest b/app-misc/rox-filer/Manifest
index 18b3cff77147..60b6369f299b 100644
--- a/app-misc/rox-filer/Manifest
+++ b/app-misc/rox-filer/Manifest
@@ -1,5 +1,5 @@
AUX rox-filer-2.11-gcc10.patch 694 BLAKE2B 4f701a9df153045d92490ae590bd001b67059b5956240970594471016607538e703ef09acc6881a9d2995bc8fa8eda059e8bc8232fddd35afd656db6f1c2e46a SHA512 bdae97a9a005b8993ffd96a22d6584949f01c28e1ac1494ad41bc2b20ac8b44d9b60e8f960f3259867455ae269dafdf7fde51e3a0852638a5414aa34eac70b31
-AUX rox-filer-2.11-in-source-build.patch 429 BLAKE2B fdbc342e0f6a7abaf01fe0a2f5411a6aea7a833f2679d9f47a783631443bf2618a4d6be293e5ce14da295713bd7b97af36edaffa3aedbfcea3de513ac1fd455b SHA512 28cb208bc51c500ad766bf832f8098bd44813626be2ed3c50c37d0cff5193e1dc1a4430ec40ee7290befb1f20b4a506f03c8c327760b75e06d08ec646b24638c
+AUX rox-filer-2.11-in-source-build.patch 351 BLAKE2B e049b01dfe38658e832a12ecbac4549cb1d93730cfe340e9d63cf31a1193eee6dfbe8620dbb53c40528192e4f7975d7090f4776d8d402fa5f1b6dfcd3fff5819 SHA512 f0100cad03a6163993ce59848aca5d280183ad7d6530bac5c759789fbc24509105da96d8eda0c530deb807422a9b3a86b8f12e67589f019acb2fabfb60186dbf
AUX rox.desktop 157 BLAKE2B e13b788f78bb5f3af73e6f9c0e5cc9729b7221cf37a7b1952d78ed9d1f3ba8ada67d523ae08d7280d5152e3e5f0cafbf55e65bbb75d558d4c77b14095ac7fffd SHA512 968b930f97a25c58a0aeee0789161b98b0bfa93978beb0d7e57e40affe45b65940f67b612df93ac64c0c5244de7dbf913b1083cf7aa4a357e929a7f9f4ab366a
DIST rox-filer-2.11.tar.bz2 1907026 BLAKE2B b1afd0e2df7152bd1160632c0e7eee71c1d3e9140d453f0fafb2d8049b593513db7ca051282ecef2ce06831883d2f057774e3d37175a64d4bd5a8158e4bbb4bd SHA512 2ef5e7a5d6f4bbb825d6f01725ad4149b9cabfb6fe82c33631bb145f5a3c84e345c372b7698170c1ef78b30ffbc4665495cc266da4828cc8b4b256b592b2c50b
EBUILD rox-filer-2.11.ebuild 2433 BLAKE2B 5b30db35aa9b774d134df54a9caba91655c3cc4de28730bfa8f99c1d4f7e8d4dc0cba8ffc943f468da6d330f71443b7ca8d2acf59c564ca024e2495dbd36b4ea SHA512 fbcce87625850a70c6835c5828d84b896bfef4c317f24f5a908b77f442dde10557d0ef8af81816038109643d418c036a67bc269faf0bead8ecceb4ca93994342
diff --git a/app-misc/rox-filer/files/rox-filer-2.11-in-source-build.patch b/app-misc/rox-filer/files/rox-filer-2.11-in-source-build.patch
index d5400ec5f63f..d793a4e97fb9 100644
--- a/app-misc/rox-filer/files/rox-filer-2.11-in-source-build.patch
+++ b/app-misc/rox-filer/files/rox-filer-2.11-in-source-build.patch
@@ -1,5 +1,5 @@
---- /root/configure 2015-03-09 16:39:03.921516152 +0800
-+++ src/configure 2015-03-09 16:39:08.455516081 +0800
+--- a/configure
++++ b/configure
@@ -2133,12 +2133,6 @@
ac_config_headers="$ac_config_headers config.h"
diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index 2b915d9e2ce6..4b1da54aa9f9 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -1,6 +1,8 @@
DIST tracker-miners-3.3.1.tar.xz 7244032 BLAKE2B 0233ba74ed6c697055c12fb758fefc0f71dba7e17db0e92950491cf51e228896e46d27485e2cedd16a5a3a8e4d46eca66baf57824e6340bad9f177b206908e2e SHA512 bc0cb53a7296a2836f05d5d5413418af936ef7f0a4794705e5970699d69c27f513812d0daa182f5359d665a3b6111de06cd9fc671ad769472e0cde2550f66dcb
DIST tracker-miners-3.4.0.tar.xz 7250524 BLAKE2B 9112c078899a7ab1aaab06d1c3ca0244410f21e13b724f1815e5334733bb851cf50c05ed424c80e62b2cfc5d7f16a1a065eeb6cb6a4befdb2d776cb7808e1cbc SHA512 0abafd3692c24683282f52e33a6b4d063a9d938b2f1b6dcb636409102890f6ebd9f33a8e406a482c1d16d26ebcf58874651d04f0c488b9d83e188feb6e5b1f91
+DIST tracker-miners-3.4.1.tar.xz 7244576 BLAKE2B a9f00a0f57b1af1a53b2552d4a1570a4c5576537c48eee9ebe2428e06170ff099e8876ec933bfe9f47adc69e7c61552e886aa2c3149bd3e02f37be8df844083d SHA512 2bd0b8450e1df40b4fa35b17f4209eba4f0d91a603b2d2f7b5bd6da07bcb60755b36d72b3b567ae6bf2d97c3a4294c8f14b1115825886c3f61528a092aa268bb
EBUILD tracker-miners-3.3.1.ebuild 4674 BLAKE2B 31a7fc6f2b343740e48421a64f559ebd5b2ec97145a911f3fd8b65ebc6a8d697c2cd586a8c2410cc52b370c7a43110bf6d46d5cb1714521df5b0c250f9f83ffe SHA512 364bb3d7f1511617b6a5843277423db42fe9ed5922beadaa649a247a59cdfdd623b4706739850bd3068aa4a2928b808c23e15c75537107bad7b50883f8f03820
EBUILD tracker-miners-3.4.0-r1.ebuild 4679 BLAKE2B 760b4259af5fe25b077dcc5939007093faa0def24bdfaf8839a3948ab27ee8727608c5d14fdf4b825ed50b1a0378b4c50de819498e4be396cfe1137cef55b54a SHA512 fd723f08aaab86ae3328fc11ab9306b3e102e8ae3b9a7691ec0aeeb073d01cd326affdc3ce9f754e1cce05521093512739c011b47da88012caf94efde618f412
EBUILD tracker-miners-3.4.0.ebuild 4677 BLAKE2B 1d17ae2be4badeb37844711b26bae94bb6a573375348ee4ac34dde8291b2fc43bc2242a35845df21af7369dc9f150c39823470d4040898dbd0a6b24f7453f1c9 SHA512 604a4bcb91bd106751a39ef2b1cdf6d66102dfa207e8ee0d78b882740acd87a9518b008648dc9c9b1ea0fdce67c4ac29d1b85ebfe24a4dec4bee6a37c49edc4f
-MISC metadata.xml 740 BLAKE2B 038c1a4f3d5a1dce875cdd315187b3299b9a5ac0831dbd6d7967b9d5ea99610e134d9ccbffe3717819b88843e4836fc74c125bdfaa827f7b8479565cebd521d3 SHA512 474d28d444a83797a8f8bf287fd67b8e432dc7e93dccb30774e5eed254547840ae72eff5ccffbff6a020385a4d55fa1d7b0e3fc36280d6a6968f8b53ceff50a7
+EBUILD tracker-miners-3.4.1.ebuild 4679 BLAKE2B 760b4259af5fe25b077dcc5939007093faa0def24bdfaf8839a3948ab27ee8727608c5d14fdf4b825ed50b1a0378b4c50de819498e4be396cfe1137cef55b54a SHA512 fd723f08aaab86ae3328fc11ab9306b3e102e8ae3b9a7691ec0aeeb073d01cd326affdc3ce9f754e1cce05521093512739c011b47da88012caf94efde618f412
+MISC metadata.xml 835 BLAKE2B a7f0c667be6eaaebcd62fd782c72831f8f95f778d2ff1ee36c278fc3a902761ca10d73fd7e6b15afa83d36a960d5f20dc765b62dc6f85022db01d9d0d356bcbd SHA512 9d348dbec07ab8e344dab0d6f3acdc48e91d80171e411353b233f8b49989f4152817c8ed522c234d5dd9a3849cdab3d46f41256702a5d50bbf1e591f112cddd5
diff --git a/app-misc/tracker-miners/metadata.xml b/app-misc/tracker-miners/metadata.xml
index ef8b20013172..fd19944d2284 100644
--- a/app-misc/tracker-miners/metadata.xml
+++ b/app-misc/tracker-miners/metadata.xml
@@ -14,4 +14,7 @@
Add support for playlists
Add support for XPS file format through app-text/libgxps.
+
+ GNOME/tracker-miners
+
diff --git a/app-misc/tracker-miners/tracker-miners-3.4.1.ebuild b/app-misc/tracker-miners/tracker-miners-3.4.1.ebuild
new file mode 100644
index 000000000000..de587e96a954
--- /dev/null
+++ b/app-misc/tracker-miners/tracker-miners-3.4.1.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit flag-o-matic gnome.org gnome2-utils meson python-any-r1 systemd xdg
+
+DESCRIPTION="Collection of data extractors for Tracker/Nepomuk"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="3"
+IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg networkmanager +pdf +playlist raw +rss seccomp test +tiff upower +xml xmp xps"
+
+REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
+RDEPEND="
+ >=dev-libs/glib-2.70:2
+ >=app-misc/tracker-3.4.0:3
+ gstreamer? (
+ >=media-libs/gstreamer-1.20:1.0
+ >=media-libs/gst-plugins-base-1.20:1.0
+ >=media-plugins/gst-plugins-meta-1.20:1.0 )
+ !gstreamer? (
+ ffmpeg? ( media-video/ffmpeg:0= ) )
+
+ >=sys-apps/dbus-1.3.1
+ xmp? ( >=media-libs/exempi-2.1.0:= )
+ raw? ( media-libs/gexiv2 )
+ >=dev-libs/icu-4.8.1.2:=
+ cue? ( media-libs/libcue:= )
+ exif? ( >=media-libs/libexif-0.6 )
+ gsf? ( >=gnome-extra/libgsf-1.14.24:= )
+ xps? ( app-text/libgxps )
+ iptc? ( media-libs/libiptcdata )
+ jpeg? ( media-libs/libjpeg-turbo:0= )
+ iso? ( >=sys-libs/libosinfo-1.10.0-r1 )
+ >=media-libs/libpng-1.2:0=
+ seccomp? ( >=sys-libs/libseccomp-2.0 )
+ tiff? ( media-libs/tiff:0 )
+ xml? ( >=dev-libs/libxml2-2.6 )
+ pdf? ( >=app-text/poppler-0.16.0:=[cairo] )
+ playlist? ( >=dev-libs/totem-pl-parser-3:= )
+ upower? ( >=sys-power/upower-0.9.0 )
+ sys-libs/zlib:0
+ gif? ( media-libs/giflib:= )
+
+ networkmanager? ( net-misc/networkmanager )
+
+ rss? ( >=net-libs/libgrss-0.7:0 )
+ app-arch/gzip
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ app-text/asciidoc
+ dev-libs/libxslt
+ dev-util/glib-utils
+ dev-util/gdbus-codegen
+
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ test? (
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/pygobject[${PYTHON_USEDEP}]')
+ $(python_gen_any_dep 'dev-python/tappy[${PYTHON_USEDEP}]')
+ gstreamer? (
+ media-libs/gstreamer:1.0[introspection]
+ || (
+ media-plugins/gst-plugins-libav:1.0
+ media-plugins/gst-plugins-openh264:1.0
+ )
+ )
+ )
+"
+
+python_check_deps() {
+ python_has_version -b \
+ "dev-python/pygobject[${PYTHON_USEDEP}]" \
+ "dev-python/tappy[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ # Avoid gst-inspect calls that may trigger sandbox; instead assume the detection will succeed and add the needed test deps for that
+ if use gstreamer; then
+ sed -i -e 's:detect-h264-codec.sh:/bin/true:' tests/functional-tests/meson.build || die
+ else
+ sed -i -e 's:detect-h264-codec.sh:/bin/false:' tests/functional-tests/meson.build || die
+ fi
+ gnome2_environment_reset # sets gstreamer safety variables
+}
+
+src_configure() {
+ append-cflags -DTRACKER_DEBUG -DG_DISABLE_CAST_CHECKS
+
+ local media_extractor="none"
+ if use gstreamer ; then
+ media_extractor="gstreamer"
+ elif use ffmpeg ; then
+ media_extractor="libav"
+ fi
+
+ local emesonargs=(
+ -Dtracker_core=system
+
+ -Dman=true
+ -Dextract=true
+ $(meson_use test functional_tests)
+ $(meson_use test tests_tap_protocol)
+ -Dminer_fs=true
+ $(meson_use rss miner_rss)
+ -Dwriteback=true
+ -Dabiword=true
+ -Dicon=true
+ -Dmp3=true
+ -Dps=true
+ -Dtext=true
+ -Dunzip_ps_gz_files=true # spawns gunzip
+
+ $(meson_feature networkmanager network_manager)
+ $(meson_feature cue)
+ $(meson_feature exif)
+ $(meson_feature gif)
+ $(meson_feature gsf)
+ $(meson_feature iptc)
+ $(meson_feature iso)
+ $(meson_feature jpeg)
+ $(meson_feature pdf)
+ $(meson_feature playlist)
+ -Dpng=enabled
+ $(meson_feature raw)
+ $(meson_feature tiff)
+ $(meson_feature xml)
+ $(meson_feature xmp)
+ $(meson_feature xps)
+
+ -Dbattery_detection=$(usex upower upower none)
+ -Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca
+ -Dgeneric_media_extractor=${media_extractor}
+ # gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default
+ -Dsystemd_user_services_dir="$(systemd_get_userunitdir)"
+ )
+ meson_src_configure
+}
+
+src_test() {
+ export GSETTINGS_BACKEND="dconf" # Tests require dconf and explicitly check for it (env_reset set it to "memory")
+ dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index a104eb3d4317..7e76d8b2d842 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,6 +1,8 @@
DIST tracker-3.3.3.tar.xz 1976160 BLAKE2B aa61b83ac499736b1cc6273813ef0bf44dae9c4a30d49f28d97205b31ead7e55021312297973cf37be67edc76bf66ca19edd746ae2269e59da406d23bcc018c7 SHA512 0f8ad998a5de6914d1e24da1b2021967339a2e637996b3e672fe4991177e69b750cdd9eb894e5e6f5f394d991b680d40afc05b95f69171ec38278e30c9729a15
DIST tracker-3.4.0.tar.xz 1876476 BLAKE2B 9745a496df30ebcd2f7e4a525bcd047d48ec4f68e12ef9775958e01939b538832e4d2622498a8ffd358d1a404c67365c70437e083497e8c12e1cbbb0c07713f7 SHA512 0a765d93cbe737a9cf902d1dc1ca00463065c1e7b3f93a7a8132919dfed97acdf80d99cf8f49b61e1a2bfc77a115f74e88731b3b0739651d2f727215c83f077f
+DIST tracker-3.4.1.tar.xz 1865584 BLAKE2B 78a1c461e628095ca134241d7f8580806f8de018608c991644422503a3af6bab2c317859624cb811dd2907f2965af3ab2cfb1a58fa35017ed6a71b24e68f3c97 SHA512 102d61abd98feb6e39575c3df25cd4604e89106ed928b8edb1a3adc1bccd41f4ab92fc8bfd33d96b48c3b2cf5a3d901130ac6bf6f657faebe7339fffb95eed26
EBUILD tracker-3.3.3.ebuild 2738 BLAKE2B 0905188614de0fc0fe90b33ed9dbdf0f4737efbdea78bfc3216c582bf672357bcdba311f19a8a5b4517f10674f809cf71190e38fe2275f5cfd9d946aac6a8289 SHA512 cf7ed294fb2b662995fb6cb4bca2bdcef3f4f6a8507e2584f24bb1553677d80eb32303721a07d1bfd81e405719393559244140387a9cf610ae1b57503bce56c3
EBUILD tracker-3.4.0-r1.ebuild 2715 BLAKE2B daebd42de05e1141cbd4960d691609cb2d8492d3cf23dd05b0e681cf9c32308442c406303398dbbfbc754dea2b599198b8b6ec1d71d94026a7d45a728e040412 SHA512 d3a180bb54a0c96b2bf696676fcdf057598eaadf503d296098985c89ad0138fbde03e9d59aa51f52cc7b6c5b2332e39e37798565119055214e09c86686ce8d0d
EBUILD tracker-3.4.0.ebuild 2715 BLAKE2B c795901173d1ae05d6e6306f504d5fff2cc2492154f0ea5e33031af25a05e861161e42642b770a11562611c05beec3f6f08c81d23087a0c56cbbb7d237631e6d SHA512 b0589a2b9a6db1d155b7de6588871e6dad8a49a65d84c458efdfb056337b28d7f28e9163502d84d7a8d4fbe98c69b2df8812008f60a728cc328e4c0aabbde573
-MISC metadata.xml 498 BLAKE2B 53cd3148f5755776613afbd38fa6b0eac4d10bb60765e7af7922ff70c5875f78ba25a78ef81af69f7767bc9da9fc854d9c833f4aa8bf18e52811fc4292dc47f7 SHA512 b81b2eb4705e5280286c6b6d9cc37945c671cd9ab635d31d7cef7d7ed2a3cf7a2ba5107e37363a78d8c707a2095a3d002e4ca6c233555a075ae21a9f8885d6db
+EBUILD tracker-3.4.1.ebuild 2715 BLAKE2B daebd42de05e1141cbd4960d691609cb2d8492d3cf23dd05b0e681cf9c32308442c406303398dbbfbc754dea2b599198b8b6ec1d71d94026a7d45a728e040412 SHA512 d3a180bb54a0c96b2bf696676fcdf057598eaadf503d296098985c89ad0138fbde03e9d59aa51f52cc7b6c5b2332e39e37798565119055214e09c86686ce8d0d
+MISC metadata.xml 586 BLAKE2B 8244e6f8d9491a0c224ed84f17ee6ad64b22e0c373243a319e7911739a7db6223ce47693ed5b31053b4465f35d20108db1469d74afcebb36b4516a53cbd7f98a SHA512 0a60b0e4b077bb03d02b7990511041695c5dff7a8a0972fa80abe9968b643ad5c2ba65182c079e8d5f3d1ef72a2c4dcc659d6ec283bf80813135c94cab2dddef
diff --git a/app-misc/tracker/metadata.xml b/app-misc/tracker/metadata.xml
index 71d97616a56b..bd542fc2ff01 100644
--- a/app-misc/tracker/metadata.xml
+++ b/app-misc/tracker/metadata.xml
@@ -9,4 +9,7 @@
Install the app-misc/tracker-miners package for actual data mining support for tracker
Add word stemming via dev-libs/snowball-stemmer.
+
+ GNOME/tracker
+
diff --git a/app-misc/tracker/tracker-3.4.1.ebuild b/app-misc/tracker/tracker-3.4.1.ebuild
new file mode 100644
index 000000000000..35fbb815057c
--- /dev/null
+++ b/app-misc/tracker/tracker-3.4.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit bash-completion-r1 flag-o-matic gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
+
+DESCRIPTION="A tagging metadata database, search tool and indexer"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tracker https://gitlab.gnome.org/GNOME/tracker"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="3/0" # libtracker-sparql-3.0 soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="gtk-doc +miners stemmer test"
+RESTRICT="!test? ( test )"
+
+PV_SERIES=$(ver_cut 1-2)
+
+RDEPEND="
+ >=dev-libs/glib-2.52:2
+ >=sys-apps/dbus-1.3.2
+ >=dev-libs/gobject-introspection-1.54:=
+ >=dev-libs/icu-4.8.1.2:=
+ >=dev-libs/json-glib-1.4
+ >=net-libs/libsoup-2.99.2:3.0
+ >=dev-libs/libxml2-2.7
+ >=dev-db/sqlite-3.29.0:3
+ stemmer? ( dev-libs/snowball-stemmer:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/glib-utils
+ app-text/asciidoc
+ dev-libs/libxslt
+ $(vala_depend)
+ gtk-doc? (
+ >=dev-util/gtk-doc-1.8
+ app-text/docbook-xml-dtd:4.1.2
+ app-text/docbook-xml-dtd:4.5
+ )
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ test? (
+ $(python_gen_any_dep 'dev-python/pygobject[${PYTHON_USEDEP}]')
+ $(python_gen_any_dep 'dev-python/tappy[${PYTHON_USEDEP}]')
+ )
+ ${PYTHON_DEPS}
+"
+PDEPEND="miners? ( >=app-misc/tracker-miners-${PV_SERIES} )"
+
+function inotify_enabled() {
+ if linux_config_exists; then
+ if ! linux_chkconfig_present INOTIFY_USER; then
+ ewarn "You should enable the INOTIFY support in your kernel."
+ ewarn "Check the 'Inotify support for userland' under the 'File systems'"
+ ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
+ die 'missing CONFIG_INOTIFY'
+ fi
+ else
+ einfo "Could not check for INOTIFY support in your kernel."
+ fi
+}
+
+python_check_deps() {
+ python_has_version -b \
+ "dev-python/pygobject[${PYTHON_USEDEP}]" \
+ "dev-python/tappy[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ linux-info_pkg_setup
+ inotify_enabled
+
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ vala_setup
+ xdg_environment_reset
+}
+
+src_configure() {
+ append-cflags -DTRACKER_DEBUG -DG_DISABLE_CAST_CHECKS
+
+ local emesonargs=(
+ $(meson_use gtk-doc docs)
+ -Dman=true
+ $(meson_feature stemmer)
+ -Dunicode_support=icu
+ -Dbash_completion_dir="$(get_bashcompdir)"
+ -Dsystemd_user_services_dir="$(systemd_get_userunitdir)"
+ $(meson_use test tests)
+ -Dintrospection=enabled
+ -Dsoup=soup3
+ )
+ meson_src_configure
+}
+
+src_test() {
+ dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 8e094bc1cd9f..712d2f37b4c8 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index b1a6acac0f8a..8226cea1fb3f 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -2,4 +2,4 @@ AUX abiword-3.0.5-musl-lose-precision-fix.patch 1340 BLAKE2B 4e2f9d2d82d7ef2c00a
DIST abiword-3.0.4-patchset-r3.txz 14752 BLAKE2B 2faaaf333a38ea181b83819fd53fd97c5e98a0cbb0b2ad6e668254a88cb69e922fd3b70a181fc7edd789bc313d929915460a0524ff463166400d8e46d878c034 SHA512 e8d2508cf561b49581441b3b581dd663a966da67175f2a39d4a95a6035d8c8c7c3198ca99f253f8d6f3993a66be752265f612b6c59c7712592e464a1da0f240e
DIST abiword-3.0.5.tar.gz 11084159 BLAKE2B c34361c2ae1604ef1ec913781c98f3707f3c98c3fb5ed5328212b51081706fe5177fb8b5a3805431c0ee451f04d8d95fdc6e7dbc3fc38d9d5037b576e115ee54 SHA512 a2484268901ff47307c9d1f1928622e364f1006f22ce38257c585144df9411dfe3c2dea28c1f1f50a6e545e8cc579cce34117a89dfa771e20312e3ea1a9989d6
EBUILD abiword-3.0.5.ebuild 4457 BLAKE2B 917eb4ce1f3edf41d9a10e889ca4ecb3c6f8e5964c7e0b8543c3bc905e73f9af06bb32c7baa2829a656b2dc1d65662e5c462076834a7d2918eb748802ff88cee SHA512 939d1a1e928651c078ec46e0b2ea349a0a8316c24ac06b583928cd9ba55972647a3a501daef61967af2f6493b9f93196b5697a3b62ff0c9104d8e180909ecb06
-MISC metadata.xml 1227 BLAKE2B edcbab9c01d27e816d0f7523b7159527b6886c28015e0a4814ca65e5370657a351afe1a1d42d25293ef0926ae22d6bd564bdcfc087fe0838377f111b04d38a3d SHA512 06e659852c2fc4649c736135fa156e679387f4df1e46b26909391c4094ccea9ef4d7901e456dc4e5cd4d568ed35bc59ae327ecd4a8cb147369e68bd8b72b0edd
+MISC metadata.xml 1349 BLAKE2B 9fb8f6e4be91a6d056ae6389051f37d832ab3fdbef471ed730d22ec3ef24dd956a35e25f38e4c8d75facf0196664d4c3d093b701d498ae0851229fee1144347e SHA512 0be805faf1b5d87c9973c4b2ef21022cc1de970b57d2f72a4cb7a59f4a325bc66d649bd02cd4fbb0a376c849cfc77beeedc962a16b2fdead055d4f80708b2bdc
diff --git a/app-office/abiword/metadata.xml b/app-office/abiword/metadata.xml
index 4cbe5fcc9127..61f8e29b6277 100644
--- a/app-office/abiword/metadata.xml
+++ b/app-office/abiword/metadata.xml
@@ -1,24 +1,27 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
-
- soap@gentoo.org
- David Seifert
-
-
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+ soap@gentoo.org
+ David Seifert
+
+
+
+ World/abiword
+
diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest
index f182d93694d5..705a42bfa3b8 100644
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -4,4 +4,4 @@ AUX dia-0.97.3-freetype_pkgconfig.patch 2574 BLAKE2B 870617b939e4ab7ecdfbf5bba4e
AUX dia-0.97.3-slibtool.patch 316 BLAKE2B bec9fe48c0107b9cccdafa9fe5e92dfbd29ae723c33b354c288034fb61d96bb8526315d723ff4acf0e7cbdaf7f3c5e075637d7b1ddd581c0df8f284190c98151 SHA512 a2a2c2983c633e85d2bab48bc4a9df4125b6f745b819ca7b7e1a433d9ea69e8498e71d05bd4874d62cc7b45deae92719c361887a36aa3ec8b2135d0a5138a580
DIST dia-0.97.3.tar.xz 5548500 BLAKE2B ab476ce48e57c1def01095a8d6d92208c11817580cfca1cfcf38af12943153116b31149ca187c65e5121ef9fb281bacc4c3e7f1726ed23b46ba14902faaaa34f SHA512 34298980be930b87cb4a636344e4cb2a7e43eedc00b0969a5e446cee9b74b616fdc8c798efcb9a5832b98741f2e20632a44037b2bcb436f59591d531ef441efa
EBUILD dia-0.97.3-r1.ebuild 2613 BLAKE2B d4226603733e928f7bedf79d241e27e525e65c33abfa68149e12b25e73cf2b579a3e7a474b38a5168ed121cfb17dd04f6688a4ba1058903b69eb58d854aa977f SHA512 fc6d093ed65840347ce786c1892ddcc3abc75b5ff5d6a0e0065a1f10565f26064dd7bb04bc438121c5b5380f2e8fb37f690da3fa50a1f37b045dff29869af99f
-MISC metadata.xml 669 BLAKE2B cc1b8764a7e966c224835ad37511053d0c233de35dc0df299c4700b969dc43121a6b3d9b28ffcb02844d79b0a3c2e1ac51297a6c7f44e52453b5143c304f336f SHA512 22764e312b7ba894fb6cfad92d6c0b86e77c0fde074f46d032ac19f87f770be4eb2d3d3da1685638646be4a6410335e33f8a4056938283ead145b8bc1a8335de
+MISC metadata.xml 773 BLAKE2B c654cf30f7cac3a198911772f4af09dce74ead25e1b2e501f092929c5967640a1df80d110579a7ffc3777f735ca5f485a5348eb707243266af574ccd8f38f160 SHA512 949a675449bdd4533153d890d5d8106d4c447fce85b33624e9ae693d0dc485b8e764a8d52174c509077ab7c304093313a894d41ed267f100a31923a89356e72f
diff --git a/app-office/dia/metadata.xml b/app-office/dia/metadata.xml
index 174329ca7d6a..595bd9c2d63f 100644
--- a/app-office/dia/metadata.xml
+++ b/app-office/dia/metadata.xml
@@ -1,16 +1,19 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
-
- Dia is a gtk+ based diagram creation program. It can be used to
- draw many different kinds of diagrams. It currently has special
- objects to help draw entity relationship diagrams, UML diagrams,
- flowcharts, network diagrams, and simple circuits. It is also
- possible to add support for new shapes by writing simple XML
- files, using a subset of SVG to draw the shape.
-
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+ Dia is a gtk+ based diagram creation program. It can be used to
+ draw many different kinds of diagrams. It currently has special
+ objects to help draw entity relationship diagrams, UML diagrams,
+ flowcharts, network diagrams, and simple circuits. It is also
+ possible to add support for new shapes by writing simple XML
+ files, using a subset of SVG to draw the shape.
+
+
+ GNOME/dia
+
diff --git a/app-office/endeavour/Manifest b/app-office/endeavour/Manifest
index d8bfd1abbf07..82926c1b75db 100644
--- a/app-office/endeavour/Manifest
+++ b/app-office/endeavour/Manifest
@@ -2,4 +2,4 @@ AUX 42.0-build-Generate-enum-headers-first.patch 1889 BLAKE2B ce11acb08003adf6bc
DIST Endeavour-v42.0.tar.bz2 606645 BLAKE2B f9575eeaa67f837e465cbf8e8790a477c299bea12410ceda3c1f9ab5df69948087c7c8679cee5651eac828b69fe64f2b22ff759c2174f044166b94a25270668c SHA512 6312bad832f864adc3e4e01112efccb9c867b31485460791a1d1cf0d515586e7fdb7dd9dca3790201f764b72c39cff69626794f7020b4b084034fdbd0e07d94a
EBUILD endeavour-42.0-r1.ebuild 1799 BLAKE2B b501bf977fbc447e1c6636a3646a00fa99e74abd813a6a2adf5c9cd6dab02a75cd2388006186946c0e6a1176253f9e5750b3c473012d1323e798b77c84e77278 SHA512 81d23bbc417ee486dbda6208e1d8dd48818e64392b987d1d73417e388a66f813f55c6541dba98b59a9765d927267893ab7885cd4b6503d0cbcdce05b577a900f
EBUILD endeavour-9999.ebuild 1492 BLAKE2B e48f749e13ad4de817fba6ce0c7e2865adca4451e125555f4507a320112e89e91ab8e1c235772fe22cdb8c45be5383f2e12449e0bb711594d9970a1be92d86d9 SHA512 c5633a21897e5bb5e4e35679fee6e321875b084f30146847418413446419db7043719fbb946e78871e88140ced369e7c14ca1863cad432a0f8c644e8165b4614
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 350 BLAKE2B 341539b054e9607ce3d11070534b024ecedd4a7384fc5607de9d7bfbf9f22d5c3a6eab618cd85c48682ad3ccad0c562c26da7ca9a648af9069234444fe4f9c16 SHA512 1a08468d736fbf0514a90dcb2e0ac6dec36e5683013f845e12ac501beee1f503e4f6e202f3fe1df6f80f06ef8d72015207eebd35fb7b670170d4999e6f3325fb
diff --git a/app-office/endeavour/metadata.xml b/app-office/endeavour/metadata.xml
index 7b343b06be8a..407b55270f12 100644
--- a/app-office/endeavour/metadata.xml
+++ b/app-office/endeavour/metadata.xml
@@ -1,8 +1,11 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+ World/endeavour
+
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index b1edc131f8ba..e07a26dee9d5 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -3,4 +3,4 @@ DIST gnumeric-1.12.52.tar.xz 18115444 BLAKE2B 6d8489c27b6f7bd0ffad7d255b606a48ca
DIST gnumeric-1.12.53.tar.xz 18125272 BLAKE2B 6c25107977492391152c403d2ad6fef79161bc9045660090e12cdd281e5832b4f9e414a0ef5e67f93c10ca789097b510fafed712dcea5b6210f67428a2dc7dd7 SHA512 6e9d7b12f9448c75d39985984fac9880c61583fbac10ad9070f5ec7a5bd573874d79e13372d9a185616a5cdb5f53d3f67aeda6ca4bae33e3f5ca0a2160045d7b
EBUILD gnumeric-1.12.52-r1.ebuild 2426 BLAKE2B 66ef68bfbb8151af8827d7228740d01fc20fb7a71fce21fefc0c74e21369b8a4f6d4d9c22f9ab1533e7c4ad2f904aa618cca474e11cfdb1093a878984b01ec28 SHA512 62349a143dcf081a2a8111b021994059a38761247bb6eb2261aa8b637aba1f64ea1bdecb97f40518cddc9b7ec781d47595953051304b32c060cab48ea10c0645
EBUILD gnumeric-1.12.53-r1.ebuild 2370 BLAKE2B b75434b713cb79c62359dd0468678e990b8f95a670c3bcb6c51d6f7876291af95afade3e8e7b8adaa0983eefe69f0254a11eac6f831bd7aba3408cd9b241edc8 SHA512 4cbc73e9e6980732f614ecd1f8c0186fd434a287e9bfb5ae9ff5fa645bba422fee5493f8fd9e94a49ebe52628400e13bcce931557f64511957f97f39e048dc47
-MISC metadata.xml 520 BLAKE2B cdd4d61e6b2192b820c122370c47ea2ff0c8b4130474a1273f59ccb83d74decccc174632d0a605b17c5d2efd3312409f4afeb45b66adb332b5c5b1fbce305ef9 SHA512 50a15120cea4f1b2cdadac5819bd215175fb4e9e468647f2228b229c1b50fc01c3a35f125b2404ab0c45e4174c028e39873bb91c8a53f7cbb8d0ec488b5c96e7
+MISC metadata.xml 627 BLAKE2B 6704cf7889bf073ee97e1af9145395462f326aa44ad6fa04f4cc4908bbde8a486518c0f11e3a9ab887835c0af862868b8a86ca29191ac1bdf179aa060c621020 SHA512 451313a3c0d62af5f647bcdce0ac76bf1948189bb70c555f6aa871245bf3ce62b0ad306c8835a7c42b24333c3e9ce449a209d3d6967e487ec061792969092107
diff --git a/app-office/gnumeric/metadata.xml b/app-office/gnumeric/metadata.xml
index e5d956a2d746..8ae5ed87e43c 100644
--- a/app-office/gnumeric/metadata.xml
+++ b/app-office/gnumeric/metadata.xml
@@ -1,16 +1,19 @@
-
- soap@gentoo.org
- David Seifert
-
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
-
+
+ soap@gentoo.org
+ David Seifert
+
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+
+ GNOME/gnumeric
+
diff --git a/app-office/grisbi/Manifest b/app-office/grisbi/Manifest
index 4a66e5f0dbb1..91ed63ef1a42 100644
--- a/app-office/grisbi/Manifest
+++ b/app-office/grisbi/Manifest
@@ -1,3 +1,3 @@
DIST grisbi-2.0.5.tar.bz2 7465632 BLAKE2B c70fd313660d8fbc0d93d86d89f7470564a0865b8423ae0e8a2f40fc1f4dbe959ed37141963dbc5ab9e6154ff71af3120303bd4c6ccc5554d1da75200c6e8a84 SHA512 16535cbdf0647abc60878bc5a21b22d76090d6a5dab89a9e1ff4029eef25f284a627555ec0724977ba01313f33aee06489b908aaa6600a566f86a87b5f33b7f9
EBUILD grisbi-2.0.5.ebuild 981 BLAKE2B 3790dc59704e8270bccebca02e305f41e0cc40e21eeae6871a07b66fb4beb78ceefddeb314b029d73f7d42e23dace4b9d088b62abde3271a30dcd33c5b894570 SHA512 e409b63a1c305e28d2f2ee64e692638cd87066d138ead34079549256d901794567f55b428cd258a75b4dd2bd59fa780b5b935e4fff7e0f9eeccd6b40c02329f7
-MISC metadata.xml 666 BLAKE2B 2c85bf497e6486582a837e3060bd159ce16c24344977d2388c400293ec4690dca4c3cab95083cf17ee2e3b957b0ea1df7cafb6e6be4603ceb336ef8a21b172dd SHA512 75ef4856515e42a90f033998c5af716a3317558c3e07c9d9106bf3db5a46a39e25f948ee605dd678bfcd4657f346268e9ec10f87964f4dcdc7fe11a3d9000d97
+MISC metadata.xml 747 BLAKE2B a3ed1c02ab9865c1ad704be927f386525b5b56cca7ef584f650daa121d16fb26c0241afd366efb5c4047ff767857d908f4c8db97e3ad31e12bf69c4febf807ab SHA512 54a1be10f8b0cc97cc598d26315f3363b0ce687afc7061365e7b02b92dd0089aa0ec6b75be0f5face90c111ff2ac830f98dcb3989439ea9ed2a6282f3d0f8151
diff --git a/app-office/grisbi/metadata.xml b/app-office/grisbi/metadata.xml
index 85867855f80b..6584f4e3eb98 100644
--- a/app-office/grisbi/metadata.xml
+++ b/app-office/grisbi/metadata.xml
@@ -1,22 +1,23 @@
-
- casta@xwing.info
- Guillaume Castagnino
-
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
-
- grisbi
-
-
+
+ casta@xwing.info
+ Guillaume Castagnino
+
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ grisbi
+ grisbi/grisbi
+
+
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 433bb8819ba2..c79a456e50c3 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -31,13 +31,16 @@ DIST libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz 5005888 BLAKE2B 8
DIST libreoffice-7.3.4.2.tar.xz 256373724 BLAKE2B 98a3a450e8b16caafdbe914b542c32e3e251ac6f2fe528e593640397d50b533f146b1cfd262c633bfee9766a5ef659f7ce606453952978c71c08f249da7d7125 SHA512 10ea93d380b8c59ec15aefc4c4f6f5cbc76b03cf444e2f172fdb8cdde637e8d3de4aa2b7adbd55ec04ba8ad5db73a1bd80e8b692ca328c416d229526f01bd4a0
DIST libreoffice-7.3.5.2-patchset-01.tar.xz 12700 BLAKE2B 353f6552d31616dfeb32287173bbd70366045ec437c8735e701bff357032f5ef2358920c5d8495142551116999b034db6611a72536edf14fe13ea9cace3a931c SHA512 dbd8b4b494159845efbe9ad76d5822188b9868aff8ef488793f4e2b0f2f0290942322651e8b53dd71db81cba559e3510732801d0c643cb2af9526cb1e1837891
DIST libreoffice-7.3.6.2.tar.xz 256616324 BLAKE2B 52456e529ae2898101824882f124a5b039a1dfb98fd77dfceef39a41a3af871123c56b83a73d0aaf92e1cea57f35af442ca0a17814a1374538a9495ac601cee0 SHA512 8f61e9c09b344cf120bc6f9463344b28644e52738360ddeb1a29d9d2294d24132b070902a089531869e11487f5a7153fc4752e6636af7ef57269d23c8187ec86
+DIST libreoffice-7.3.7.2.tar.xz 256653492 BLAKE2B aa3e096ba46d6e23b0e6439a435a6d75fdc9da309885a28d96dc5a4fc05d854a8e4f633d9f4d623af18f6a80ca036409fb26b9a9843fb9a18144468b58ef5ad4 SHA512 f7b6279f5ef9f5ad8290d2bdf4fd54f8df7775a21094ba762dbd9299effab31d4f2c6dff9f4b3d9c5673596931df1d16b195474b547007bfc9a396c47e5e181c
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.3.4.2.tar.xz 112208564 BLAKE2B a47b428d69c62ba38d74ee5eca1dfeba66389ea0c7ef103f97292180d43ddc92a5e6ca4f9377f802318b89fca7aab6278c23171d9480e3961e521c161ec42fd3 SHA512 68af32f017b46f7d3e664bc8cfc69de6939c33f26248273372cc7ba5a29299c79795cc13b92a921b8e2508045e0447319ad0c0cd3678929355db6ef8a79a8614
DIST libreoffice-help-7.3.6.2.tar.xz 112209384 BLAKE2B 629a9dae6464adb33ed4494df8cbf59305a686b0bab21d55e3c139b87c5e3eee3e77ef1f22be84973d6e51a1ffb74aa74fd7f91b82223b2e3cc6d3bc900e7305 SHA512 7a98e8d3b146638bdb608d86b617bb45ff2649957ad9391aadfbb32fb18a4c8d15675bd24076dbb2b635569bfdab988f7cac461cfe04e53b3febfb2aa35d6189
+DIST libreoffice-help-7.3.7.2.tar.xz 112210852 BLAKE2B 3a3148d6ff9c743c97c0371290b3264f8e9eb8eb5aba3176b2e88f296abc2856f364866ba6ebb9f6364b5c98255c8593d23e3d54db6bcc27eecde53ac9a1b393 SHA512 c223ee49626e36b11a86c077001efc27ca2df9aa10ddb068e04c8ab8a0ea1942ca71b97c2f7379bf856ba7d12a5ca94f2fd8d8058703e2276af3595b75049030
DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
EBUILD libreoffice-7.3.4.2-r1.ebuild 19800 BLAKE2B 4002944e91e4858ecda8656f706688ea49f409eab5060302fecec5d06732b64268441b43c95d0e99ac578a421118409cb9700a82233eeccf24722326ca2d8842 SHA512 e218c35b5ee4ace9f26908829f0438de60437461cd72862235006924b8293e22cc3c96affae71ed5c2e9c35cf8fbbd80ed40c309c6a4640b51dcac675d378774
EBUILD libreoffice-7.3.6.2.ebuild 19389 BLAKE2B 7a28ac2463557cba63dbd9580bfafaa9d2571161f8476c71365b351c88993b00d8af2e2398c0270634d3bf0d3451a42aac29a616c5c63d659748ec6b4b2749ff SHA512 261699ef9b9bdf161ed426ee1961cf98747eab3e04fdb1671fe917970d2da28cace1a43cdf480417a878f484658c44f8d9c8f7d0a263d8ba07e319dc04872f7c
-EBUILD libreoffice-7.3.9999.ebuild 19391 BLAKE2B e295cfb0354d1df6f540cd7682e6c763ab530f8b89e88e6f7c71916d42f99c0816e2c81880ce6c00dc1c1455f11f218cd36d8d1942172641d12610af5099b531 SHA512 00c7e74665a90a164569b29feb748d3036dd355dd88fed3ade0875eb365e89ac8a94edae446f5ecd05a616953dc7bcd079f809e5161652a35cae4249868dee9b
+EBUILD libreoffice-7.3.7.2.ebuild 19323 BLAKE2B 76bb0b7a2f9caa0b8a50b61826c4bc57f5ed675a17d38445533021177c058b51f300f60de16aed83f5cd98650dedd5ed91557a42e3af59635be61292a3a0a98a SHA512 79362f9bfbdea9691434f5258e058c2ab45759841f352fbe788168d8a2d431ab8ce123ae36397395f35e81483a3c91ef45ec08269a3cf56b94cfc57eb6d8bd17
+EBUILD libreoffice-7.3.9999.ebuild 19319 BLAKE2B cf387136ab36554b453c4e30644ada5d0006b484fa8f6a0b394b992557430f22cd5d79fe11508c439f9a14fd3a122097bc009c17fbb240b1078c59500ad313f8 SHA512 322c44cba0e4f3b572d4c5695110b7d8a4ae3b0890edc6b762e90fc94e9d1f7f86ea52275efe0251d79edc7a88234dec708bdf342c97aae760dde2c7d24b1ae9
EBUILD libreoffice-9999.ebuild 19232 BLAKE2B f3a648480c8c44ba7c14691d378578af9b751a226381959aee0eed33cf6f0eb2ae9ec3626e601103288592b2391fb0497dff9263b0571ba915ddc93037acce48 SHA512 59c637260e6ea0632beef8aabb7e02005cce692b572621bb97c7ece3e102d215077645373eca3c202cd339778c1f2194186b672765fe65e3e32ae920ae11a217
MISC metadata.xml 1233 BLAKE2B f93989caf1340cda4c3327a3d3d033d224050848b32b9d80e0b093b024bf124d238f1aae9852d1a6173e8aee79314517dd12e589079e58378e5f63626a80957c SHA512 3af0cefdceeba7a45658a2151b0534f44b9dfe6d3af8374f3061cb098f607a36a2fe134e3c0280ce6d807b523f68e708b51e6f1b4178292a528405e18f12d686
diff --git a/app-office/libreoffice/libreoffice-7.3.7.2.ebuild b/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
new file mode 100644
index 000000000000..e2c4656f8321
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
@@ -0,0 +1,655 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+PATCHSET="${PN}-7.3.5.2-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~xen0n/distfiles/app-office/libreoffice/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # broken against latest upstream release, too many patches on top:
+ # https://github.com/tdf/libcmis/pull/43
+ "${ADDONS_URI}/libcmis-0.5.2.tar.xz"
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird
+googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( firebird java )
+ bluetooth? ( dbus )
+ gtk? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+# [[ ${MY_PV} == *9999* ]] || \
+# KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme:=[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ dev-cpp/abseil-cpp:=
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.5.2
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.17.2:0/0.17
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ >=games-engines/box2d-2.4.1:0
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ >=media-libs/freetype-2.11.0-r1:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libjpeg-turbo:=
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ media-libs/openjpeg:=
+ media-libs/zxing-cpp:=
+ >=net-libs/neon-0.31.1:=
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus[X] )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl(+)]
+ x11-libs/gtk+:3[X]
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap:= )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c:= )
+ !mariadb? ( dev-db/mysql-connector-c:= )
+ pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/2.0
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-11
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ acct-group/libreoffice
+ acct-user/libreoffice
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-11 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+BDEPEND="
+ dev-util/intltool
+ sys-apps/which
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ clang? (
+ || (
+ ( sys-devel/clang:15
+ sys-devel/llvm:15
+ =sys-devel/lld-15* )
+ ( sys-devel/clang:14
+ sys-devel/llvm:14
+ =sys-devel/lld-14* )
+ ( sys-devel/clang:13
+ sys-devel/llvm:13
+ =sys-devel/lld-13* )
+ )
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+ # 7.4 branch
+ "${FILESDIR}/${PN}-7.3.5.2-gpgme-1.18.0.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://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_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+
+ # Apparently the Clang flags get used even for GCC builds sometimes.
+ # bug #838115
+ sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ if use vulkan && ! use clang ; then
+ ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
+ fi
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-qt6
+ --with-extra-buildid="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-abseil
+ --with-system-openjpeg
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-webdav="neon"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-jfreereport
+ --without-system-libcmis
+ --without-system-sane
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home="${JAVA_HOME}"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ default
+}
+
+src_test() {
+ emake unitcheck
+ emake slowcheck
+}
+
+src_install() {
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+
+ newinitd "${FILESDIR}/libreoffice.initd" libreoffice
+ newconfd "${FILESDIR}/libreoffice.confd" libreoffice
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
index 956e03914be1..7890edc7daa9 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -294,9 +294,6 @@ PATCHES=(
# 7.4 branch
"${FILESDIR}/${PN}-7.3.5.2-gpgme-1.18.0.patch"
-
- # pending upstream
- "${FILESDIR}/${PN}-7.3.5.2-poppler-22.09.0.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-office/planner/Manifest b/app-office/planner/Manifest
index b08f2bb81239..64592186c5bd 100644
--- a/app-office/planner/Manifest
+++ b/app-office/planner/Manifest
@@ -1,3 +1,5 @@
DIST planner-0.14.6_p20130520.tar.xz 4200624 BLAKE2B 4dd3965a3091fe69d9ac125745f7d3ac54cbe1d81f794c0dded02c0983867d2469848af7f74f1eb745a2e2c42c79be7955d6790f0b263faa5ee821bc28c6a339 SHA512 d658b68c96742340a06a9e96d7910f70fb296cb7a19cc335afdcbec01b36326b1574522155cf19fec012363e1e4d4120c35e1319c699613833be2eb0fa999024
EBUILD planner-0.14.6_p20130520-r2.ebuild 1663 BLAKE2B 02c3c3765d6da0d1468a5f9788155ea90b63a75446c49415bbd1e74c83110f3eb1ca455cb0459b3108b479f7dc6f32baf5b21ae18da3f367b14bc5cb0f3ecf4e SHA512 0a476057b17d1467ec184e872f1afe9d43014c255099a4eeb2850a10005515b741b7d2d9c53ccf9f40c5660a8ae721fa37ac2a0a7fe1c99f5231a867834697e3
-MISC metadata.xml 260 BLAKE2B 74a7980ab34785ba7920342b0a2708af439bed09b7ffdc1ae3ca6cbbaba8b7dbd7a6894375c6d5adf00819685f44f58b1e069dcd1062a70e99f0dbcfe39dc3d3 SHA512 f4c15c784194c80663c49692140afcfef3450b722254b99b2bd7fd0d7a08c57b463afcfa3b5609e799d0b2d6ff6451172eace91e93b886856d2591d491585c0c
+EBUILD planner-0.14.6_p20130520-r3.ebuild 1580 BLAKE2B b7ca3ac654cd83e5c01e65419cf5db87dfdf018c21a198900045e3e76bd8f5bb65c6561fc49632113bb5339cc261f68acb5b0b47fc89ac857a9357899697f2d0 SHA512 930619cf94fbabab7ffcafb90d924f6e1fb5aace3f0c901672df3887dc141e68b1c13806322a2c74ebb158260c8e03645e72f2c17d95983d3a6dc01f891b0131
+EBUILD planner-9999.ebuild 1397 BLAKE2B 2002f4e43f243d0481c8e7941b7febfaf4b3de3c84a826bb35c27eb2d2b474043416dbeb588dfe7b09f7c7bc55b42080a21fd87174bbe018106dc8acd350adea SHA512 9f875495c7acae63b918653525bb165786892603e1794f0ba66cc91409a0ccdc0da0fa4aa46200328e828f8ed46d04cdfd858d28fd0a0d7bb1a3dc7125fe70cd
+MISC metadata.xml 417 BLAKE2B 539a490f9b6e00cbff3fc951a25b938c2ed52bfe181ebf578b39559074852729c7ed628dbba0bdd1afea3cc9d590f19ec17bece72ca46f92452c6e1a1b690768 SHA512 2aa152beb3aee59531eda5a62097dad7ff624da1de3eb5b7917e208ae2fb770e86d0ad4a039d4f03a16b355912eaa6a6c5f258a69a5f88d0356655a4dfb808f4
diff --git a/app-office/planner/metadata.xml b/app-office/planner/metadata.xml
index c6e394b17a27..2f8642fe363a 100644
--- a/app-office/planner/metadata.xml
+++ b/app-office/planner/metadata.xml
@@ -5,4 +5,10 @@
gnome@gentoo.org
Gentoo GNOME Desktop
+
+
+ World/planner
+
diff --git a/app-office/planner/planner-0.14.6_p20130520-r3.ebuild b/app-office/planner/planner-0.14.6_p20130520-r3.ebuild
new file mode 100644
index 000000000000..2604b71025a6
--- /dev/null
+++ b/app-office/planner/planner-0.14.6_p20130520-r3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2
+
+DESCRIPTION="Project manager for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/Planner"
+if [[ "${PV}" == "9999" ]] ; then
+ EGIT_REPO_URI="https://gitlab.gnome.org/World/planner.git"
+ inherit git-r3
+ SRC_URI=""
+else
+ SRC_URI="https://dev.gentoo.org/~eva/distfiles/${PN}/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+fi
+
+SLOT="0"
+LICENSE="GPL-2"
+
+IUSE="examples"
+
+RDEPEND="
+ >=dev-libs/glib-2.6:2
+ >=x11-libs/gtk+-2.24:2
+ >=gnome-base/gconf-2.10:2
+ >=gnome-base/libgnomecanvas-2.10
+ >=gnome-base/libglade-2.4:2.0
+ >=dev-libs/libxml2-2.6.27:2
+ >=dev-libs/libxslt-1.1.23
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+ dev-util/gtk-doc-am
+ app-text/docbook-xml-dtd:4.1.2
+ >=dev-util/intltool-0.35.5
+ gnome-base/gnome-common
+ virtual/pkgconfig
+ app-text/rarian
+"
+
+S="${WORKDIR}/${PN}-0.14.6"
+src_configure() {
+ # FIXME: disable eds backend for now, it fails, upstream bug #654005
+ # FIXME: disable eds for now, bug #784086
+ # We need to set compile-warnings to a different value as it doesn't use
+ # standard macro: https://bugzilla.gnome.org/703067
+ gnome2_src_configure \
+ --disable-python \
+ --disable-python-plugin \
+ --disable-eds \
+ --disable-eds-backend \
+ --with-database=no \
+ --disable-update-mimedb \
+ --enable-compile-warnings=yes
+}
+
+src_install() {
+ MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
+ mv "${ED}"/usr/share/doc/planner "${ED}"/usr/share/doc/${PF} || die
+ if ! use examples; then
+ rm -rf "${D}/usr/share/doc/${PF}/examples"
+ fi
+}
diff --git a/app-office/planner/planner-9999.ebuild b/app-office/planner/planner-9999.ebuild
new file mode 100644
index 000000000000..b3239ac6b40b
--- /dev/null
+++ b/app-office/planner/planner-9999.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Project manager for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/Planner"
+if [[ "${PV}" == "9999" ]] ; then
+ EGIT_REPO_URI="https://gitlab.gnome.org/World/planner.git"
+ inherit git-r3
+ SRC_URI=""
+else
+ KEYWORDS="~amd64"
+fi
+
+SLOT="0"
+LICENSE="GPL-2+"
+IUSE="examples gtk-doc libgda" # eds
+
+RDEPEND="
+ >=dev-libs/glib-2.50:2
+ >=x11-libs/gtk+-3.22:3
+ >=dev-libs/libxml2-2.6.27:2
+ >=dev-libs/libxslt-1.1.23
+ libgda? ( >=gnome-extra/libgda-1.0:5 )
+"
+ # eds support is broken for now
+ # eds? (
+ # >=gnome-extra/evolution-data-server-3.6:=
+ # )
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+ gtk-doc? (
+ dev-util/gtk-doc
+ app-text/docbook-xml-dtd:4.1.2
+ )
+ virtual/pkgconfig
+ sys-devel/gettext
+"
+
+src_configure() {
+ local emesonargs=(
+ $(meson_feature libgda database-gda)
+ # $(meson_feature eds)
+ -Deds=disabled # upstream says it's broken
+ $(meson_use examples)
+ $(meson_use gtk-doc gtk_doc)
+ -Dsimple-priority-scheduling=false # upstream says it's experimental
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+ if use examples; then
+ mv "${ED}"/usr/share/doc/planner "${ED}"/usr/share/doc/${PF} || die
+ fi
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/app-office/wps-office/Manifest b/app-office/wps-office/Manifest
index 9a5fa1b441dd..61c9532009ba 100644
--- a/app-office/wps-office/Manifest
+++ b/app-office/wps-office/Manifest
@@ -1,5 +1,5 @@
-DIST wps-office_11.1.0.10976.XA_amd64.deb 276985802 BLAKE2B f886577e0446d012de8f28866410a6aefad6ba0ba4c0388402bda40de81859f86f4d342055363ee96123af0be4a78c1867fce7b4118fc8447807e01ecec3cac5 SHA512 744a054b78c0b5742b5af86a1d058af982b5d673205d690bd393c29a35558f2fb45081c109a406dd87078a50a09b8f6242cb469e8b93824a6b9d93af84c6f128
DIST wps-office_11.1.0.11664.XA_amd64.deb 319591396 BLAKE2B 35e94cca54b964731edd4d7bc33d9dbd97f6f9f4502896edcb0cbc0ff21e49953c825c46dbc5b6230443c45d4914a5bf75027c1b98f56307c98ec9ad3d65f955 SHA512 0ea03b27246b796b80187bb252dce0446ae497fd1a9a18da3fd3c0e13531d56fca22157cf1d0e7542b77d3bce8cbdaa407ccebfbf1d7d1d9732e51369608ac36
-EBUILD wps-office-11.1.0.10976-r1.ebuild 2115 BLAKE2B d9a2903d2dc9ee5ea71422a82a94bc2bb225e2056af80b76324f11b8a2184ca831290b128fe2905dc504b4597c8fa1debbe9735e274543b5ed4b266db34a5e63 SHA512 a12c836a59c4c73532a03af6600f7d598344d48ebbb92b2fec40e24f942a68195de6cbc64eee2e95260dd59b9ce13e6acc50843224881ad7970d0e4b004f1d77
+DIST wps-office_11.1.0.11664_amd64.deb 413652340 BLAKE2B 5bca47eef4c0c6a418ff5d79cef46ddd8841400333e72d3ac6fb5337d81fc7265503226da7d78b9a1df0cccf8d021852c69d2f65ed88ed74fc531638ef557f08 SHA512 6dbe7df259d989389df9d3c5730966693538ab1ef95c18a66cd50609894c83b028190f7381e1c998b0470d389c8c6969d8528ef88bc6428fdb0123586880de08
EBUILD wps-office-11.1.0.11664-r1.ebuild 2115 BLAKE2B d9a2903d2dc9ee5ea71422a82a94bc2bb225e2056af80b76324f11b8a2184ca831290b128fe2905dc504b4597c8fa1debbe9735e274543b5ed4b266db34a5e63 SHA512 a12c836a59c4c73532a03af6600f7d598344d48ebbb92b2fec40e24f942a68195de6cbc64eee2e95260dd59b9ce13e6acc50843224881ad7970d0e4b004f1d77
+EBUILD wps-office-11.1.0.11664-r2.ebuild 2476 BLAKE2B 95340f7cb3264633ae22ba636ab5c4eea5f8c874346095e6ea0317535ad00e86cd286c98f3c8ccbd9e41196c75a7007ba798c505b49ab9be170da30162edada2 SHA512 cab10f60e30c78df281c9f86bdd3f4e393f5f4f49d868c88d8406337e369fae59914ce2e65c8dccc65b2b3746dfcb8bfde3b4206823450e7d42d0bece748aa18
MISC metadata.xml 240 BLAKE2B 1f4d972fe6e8f4096f8905fe5ec3f77b8689f3b0e01ac676ae4e55ce3aa66c18473cc82b5766131f155b9f4cd3fa6c541ab3bd32bfd233ff89722937105f968a SHA512 2e9f28bd0e525aa062cb098048dd176668b1ca2220e0018279ec4779eb80a2e8ad4f1ea73899aded97b7d27379e88d2f60cc80af4a6992880edf6e301b7e1090
diff --git a/app-office/wps-office/wps-office-11.1.0.10976-r1.ebuild b/app-office/wps-office/wps-office-11.1.0.11664-r2.ebuild
similarity index 78%
rename from app-office/wps-office/wps-office-11.1.0.10976-r1.ebuild
rename to app-office/wps-office/wps-office-11.1.0.11664-r2.ebuild
index 67b0072d6049..51854735aea4 100644
--- a/app-office/wps-office/wps-office-11.1.0.10976-r1.ebuild
+++ b/app-office/wps-office/wps-office-11.1.0.11664-r2.ebuild
@@ -11,13 +11,14 @@ HOMEPAGE="https://www.wps.com/office/linux/"
KEYWORDS="~amd64"
-SRC_URI="https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${MY_PV}/${PN}_${PV}.XA_amd64.deb"
+#SRC_URI="https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${MY_PV}/${PN}_${PV}.XA_amd64.deb"
+SRC_URI="https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2019/${MY_PV}/${PN}_${PV}_amd64.deb"
SLOT="0"
RESTRICT="bindist strip mirror" # mirror as explained at bug #547372
QA_PREBUILT="*"
LICENSE="WPS-EULA"
-IUSE=""
+IUSE="systemd"
# Deps got from this (listed in order):
# rpm -qpR wps-office-10.1.0.5707-1.a21.x86_64.rpm
@@ -39,7 +40,7 @@ RDEPEND="
dev-libs/nss
media-libs/fontconfig:1.0
media-libs/freetype:2
- || ( media-libs/flac:0/0 media-libs/flac-compat:8.3.0 )
+ || ( media-libs/flac:0/0 media-libs/flac-compat:8.3.0 )
media-libs/libogg
media-libs/libsndfile
media-libs/libvorbis
@@ -72,6 +73,7 @@ RDEPEND="
dev-libs/libxslt
x11-libs/pango
virtual/glu
+ systemd? ( sys-apps/systemd )
"
DEPEND=""
BDEPEND=""
@@ -90,5 +92,11 @@ src_install() {
insinto /opt/kingsoft/wps-office
doins -r "${S}"/opt/kingsoft/wps-office/{office6,templates}
+ # https://bugs.gentoo.org/878451
+ rm "${S}"/opt/kingsoft/wps-office/office6/libstdc++.so* || die
+
+ # https://bugs.gentoo.org/813138
+ use systemd || { rm "${S}"/opt/kingsoft/wps-office/office6/libdbus-1.so* || die ; }
+
fperms 0755 /opt/kingsoft/wps-office/office6/{et,wpp,wps,wpspdf}
}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index b17cfac329fd..540845e02c68 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/porticron/Manifest b/app-portage/porticron/Manifest
index cfeb1cf02de8..f207eab4fd00 100644
--- a/app-portage/porticron/Manifest
+++ b/app-portage/porticron/Manifest
@@ -1,3 +1,3 @@
DIST porticron-0.7.1.tar.gz 6530 BLAKE2B 6eec2bcab3e3d7661783c4fcf8f5521aac5700e4c642112d074187af372ea51137a7bfc06cd14c86f55e6b1414b2af766454a829c815294606a8bd18141e7c07 SHA512 ba2f365011e1ad2f7cb67d655839fa425791ab95309753719b4a4206db735f141d473d24bbb68da25a88db54919d033f53efaf497c26de71f3edb4a39dcc957c
-EBUILD porticron-0.7.1.ebuild 567 BLAKE2B d24ff81ea68fe8eef0319ca700c776a18fae10840745f7bdda6061f654938ed7d7e17077b94936a9d15528691a488fa95ca4259b9383b10978e3f61ab0f5a225 SHA512 ef8d65513f2847549e4602fc65fbc497f37ba3e79a3b03925b6159d2bc27d9c1d4ae0120cfddd5f68e6402a7fe5f51246d1040f053273b4671b2d872d0dd21b4
+EBUILD porticron-0.7.1-r1.ebuild 525 BLAKE2B 2af6fb842fce08d448608cfa8e33a13e4129d89119531e97a6dcab540f6f06f733ab00f3b913401a847a664f18e5c76915a6a0b20fb0cc78f74dc02ef1387fdd SHA512 f01ea83efde07eb4862d1e9bfce6f272bbfbca1820c3249a5f36eeeab2bdf090969f1c5829d850b9997246d9fb13ab9a975974cf73922f6417afbcb451634f3b
MISC metadata.xml 254 BLAKE2B e8873c09a7b18372b964c2e8bb515bf6843f441b58da5e41d6a51e433a9660ae8f6fc913adcdc000c8907f02f271139ef50220acd2d3330c73aa45091de0a82f SHA512 1a705c11d078bc0fb97a7bb51fdf41e35d88c41a74d1b7a3b13cd5cf78a70fc1dd064ac097509cb6c58669fbdb268861f494f28205bbceaacc4c1ead705610e8
diff --git a/app-portage/porticron/porticron-0.7.1.ebuild b/app-portage/porticron/porticron-0.7.1-r1.ebuild
similarity index 84%
rename from app-portage/porticron/porticron-0.7.1.ebuild
rename to app-portage/porticron/porticron-0.7.1-r1.ebuild
index 68254d6cc552..01786328001d 100644
--- a/app-portage/porticron/porticron-0.7.1.ebuild
+++ b/app-portage/porticron/porticron-0.7.1-r1.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
-
-inherit vcs-snapshot
+EAPI=8
DESCRIPTION="cron script to sync portage and send update mails to root"
HOMEPAGE="https://github.com/gentoo/porticron"
@@ -12,13 +10,11 @@ SRC_URI="https://github.com/gentoo/porticron/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 arm arm64 ~hppa ppc ~ppc64 x86"
-IUSE=""
RDEPEND="
app-portage/gentoolkit
net-dns/bind-tools
"
-DEPEND=""
src_install() {
dosbin bin/porticron
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index a12a240cb581..0c0fe4ea8758 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/autojump/Manifest b/app-shells/autojump/Manifest
index 08ac217c1d25..01761982f409 100644
--- a/app-shells/autojump/Manifest
+++ b/app-shells/autojump/Manifest
@@ -1,4 +1,4 @@
AUX 22.5.3-Use-mock-from-unittest.patch 689 BLAKE2B b0d518d66efb7511b8bbd8d31f5ce00c7561e90e259289a4dff051665c19bc9f3537cb04ed77e89d18c9b3fd6edcb6e0b912f0b9dfc9db1fc491b11a21957828 SHA512 a15cf9369527535dd475db53aa014108af2fe6cc72b04b166589c2c9d7464dd2eb999998aa8d55fc306bd6432b3926dc11caf00009b7b45562221957dc748dcd
DIST autojump-22.5.3.tar.gz 55429 BLAKE2B 3a2773669f81d1a54c01cce9fe75bc01609265998b035b4ba1aa064f1132acf852b59eb04ebfa744e628152f0ab478cbef24e5aff326bf84cec6e2c9348e8360 SHA512 d1dd3cbb67fda4e0a17ec5028b947faf46be8a95a6cd8418127b927f42bc95b71538a06658b38b479c77d147a6cd5e8cef77639ef538c7d449414c469c13f140
-EBUILD autojump-22.5.3-r1.ebuild 2029 BLAKE2B 80760df8de8c6791e7bf678cdde30f55cc03d1b0352c5b13119f60e56691f4a412495766f06129bed58a7a437ead0efaec9c90ae52f1aed0cb76d024c9655cd0 SHA512 3df977555288100c30f7a808743758d9882dab22634468fe78cbffb865f083a8f689008f2f420e810b4b50175b67cfb45c761f30689075ef1943ce3b6b73f6c7
+EBUILD autojump-22.5.3-r1.ebuild 2029 BLAKE2B e0948a8f0a5cd4f9d7be4fc3a7d09eede2fb687610dcab71ac59552159c33724366f0eaf11056e04dcb610d415f59c76ad59e394d5a6f2a0e4a3e08f660b60c6 SHA512 a775bc9aaf92758c1112af3899f4d414e930b4405628d84b4657cd050f2c402528278d304274579b98e416c75c911ff4b40946988a4c1eb4a882a041b2ddc18e
MISC metadata.xml 491 BLAKE2B 775beb745c9218ed955dca11149ccb5b17c3efacc8f916ca15a65f67632e01feac271d5a36c39316de8024f352427b658cf35e54f5d03682d681920b730af4bb SHA512 d26e3c132c90c94bae47c1f7a4af71eaf873a12546d429632736885c515764aa612fb8155003643678d2156b42e94a692b0e3174d2b4825b559426c29eaa863c
diff --git a/app-shells/autojump/autojump-22.5.3-r1.ebuild b/app-shells/autojump/autojump-22.5.3-r1.ebuild
index 6c1430f5a0b7..470039c09d20 100644
--- a/app-shells/autojump/autojump-22.5.3-r1.ebuild
+++ b/app-shells/autojump/autojump-22.5.3-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
DISTUTILS_SINGLE_IMPL=1
DISTUTILS_USE_SETUPTOOLS=no
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 37cdcfbd6ee8..8ba6846db850 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -396,8 +396,7 @@ EBUILD bash-4.3_p48-r2.ebuild 6035 BLAKE2B 408bffd82a0375ccfbe706fd3799a3dc34ce8
EBUILD bash-4.4_p23-r2.ebuild 6090 BLAKE2B d09c2e76a0766ec38ace27c76b5219a52a6fa5cf2ec87e932950e3d5e3f6dadb84a5e594863b53739314aaad953f5a5fd1427bd9101ab1b4ca69c38e37ba9847 SHA512 9507a94d51dfce866e7ffe36880ad1879cc8a328f941103fb12ff84ab05492edfebee5deab7a19d8f8ff192c2b180656a7e0227f417b771ec32702dc4b549367
EBUILD bash-5.0_p18.ebuild 7423 BLAKE2B ca28a57b4407a5971bdf25f477e4c6b40b6c2b1f79aaffaf778838f41490dcf7da7eb7dbe4652b47164210c25e764751f8ec60d4dc1c30751373bc0636d9d3ea SHA512 bddcc1a7813ed881f8ba6bf440a890f5ac633335e743ea1393082a6a55d99a3604b36271c6f15c9e2a7b06eefac1820f8f6ee4f92f582afc9ea86181c43ace6b
EBUILD bash-5.1_p16-r1.ebuild 8047 BLAKE2B 920477ad40a57b693a034c2a526b9769e90d6a8c71a7e956551f198e4cb84605abe32e580df99f78340c183e85590640f213b76a437b825d7710b5c5d755a493 SHA512 d3dba26ef514f9dd93c9743d73dd5ea6041e006bc3f4e5d330898f4579267d08d87cdd0634de57e7f740d065e6f4e518119c141447f691679a0b4a3df7a0a147
-EBUILD bash-5.1_p16-r2.ebuild 8234 BLAKE2B f5b26b6ad263cd92f91f8c6fe0896b90cb43bb5faa4b92c80e123ec3fa74316f43e441fd50a54d47257fc3e4baec625a4274e5ec58b125a9e899d21c1be6263a SHA512 c848cfea6401643d2517cc18a6018f206e384264728dcc040aa8d5d22ec901c37f0e8a49758933b794d6381770f4549ad4d6fd3521f6db14f91c1798895b03d0
+EBUILD bash-5.1_p16-r2.ebuild 8226 BLAKE2B f14fc9e50ffa1e89643c2702a52bc89dc0255c5bde3dfca94d7de28baf8a54f121efe1096b673554e324ccd831147f318962c3bca5e7679979a5f58952a66e72 SHA512 aadde860015cf550415fce75a0d8ea0b207f590b597ee8b0ed10ad2d8802ce72389b3f0f6b19d2bac52edccbf26650296820a64fa14b9cc66bb9a09abebc9928
EBUILD bash-5.2_p2-r2.ebuild 9477 BLAKE2B c16b5f06f20e14a0401f3acde5bab9e5e260117f75b12a8db2d2557f9d98d60231931f141a93a340895896bfade9a8e3de41928e5a26ddcad6ef7068c1562afa SHA512 4377489d3ad2f3d2e50715e10c364fa5e73e0aff7d36399e0176add2f573db9a0b9816c62055d4bf34818fd11e80e7323a9cb8e6bd02d4daaf47e45c10742dbb
-EBUILD bash-5.2_p2.ebuild 9350 BLAKE2B e1e028bcef06fbbadaa200376a7d33bd2fa2b1c4ce5a5711805ea9b7bf3426a4785b147cc9cb1a8f2314b004ecef0d95c0b212a935946225b11e9334031e55eb SHA512 deced834f4d2cf6ed25405b45018fbd20e9da7cf2e64bba75979a19e8c13fe6404569a58555a233cdcd4dafa039b8f2bde89e014c0b12194e6c1c326ee0dfb8b
EBUILD bash-9999.ebuild 9350 BLAKE2B e1e028bcef06fbbadaa200376a7d33bd2fa2b1c4ce5a5711805ea9b7bf3426a4785b147cc9cb1a8f2314b004ecef0d95c0b212a935946225b11e9334031e55eb SHA512 deced834f4d2cf6ed25405b45018fbd20e9da7cf2e64bba75979a19e8c13fe6404569a58555a233cdcd4dafa039b8f2bde89e014c0b12194e6c1c326ee0dfb8b
MISC metadata.xml 1009 BLAKE2B f71587b0a6d05b907f82b26be93b071290d91dc8f612f7b008a05eaa94d45be2ef8c1d992b7ac886648a9dcf964c30e8d9a7aff90d44835beb452e0d635b9533 SHA512 8aa1cb4c3206a76d10181394a91c315967fd9d3b359194f430f075fdd5a0b4b32149eec36b85412ef7e84b55e7b01955c75486b2df82b392a5acb3df8229a88d
diff --git a/app-shells/bash/bash-5.1_p16-r2.ebuild b/app-shells/bash/bash-5.1_p16-r2.ebuild
index 27cc205c5d91..54d56596e605 100644
--- a/app-shells/bash/bash-5.1_p16-r2.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r2.ebuild
@@ -73,7 +73,7 @@ fi
LICENSE="GPL-3"
SLOT="0"
[[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~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="afs bashlogger examples mem-scramble +net nls plugins +readline"
DEPEND="
diff --git a/app-shells/bash/bash-5.2_p2.ebuild b/app-shells/bash/bash-5.2_p2.ebuild
deleted file mode 100644
index f679e4cd77dc..000000000000
--- a/app-shells/bash/bash-5.2_p2.ebuild
+++ /dev/null
@@ -1,344 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/chetramey.asc
-inherit flag-o-matic toolchain-funcs prefix verify-sig
-
-# Uncomment if we have a patchset
-#GENTOO_PATCH_DEV="sam"
-#GENTOO_PATCH_VER="${PV}"
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
-PLEVEL="${PV##*_p}"
-MY_PV="${PV/_p*}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-MY_PATCHES=()
-
-is_release() {
- case ${PV} in
- 9999|*_alpha*|*_beta*|*_rc*)
- return 1
- ;;
- *)
- return 0
- ;;
- esac
-}
-
-[[ ${PV} != *_p* ]] && PLEVEL=0
-
-# The version of readline this bash normally ships with.
-# Note: right now, we don't use the system copy of readline for bash for non-releases.
-READLINE_VER="8.2"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git"
-
-if [[ ${PV} == 9999 ]] ; then
- EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git"
- EGIT_BRANCH=devel
- inherit git-r3
-elif is_release ; then
- SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz"
- SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
-
- if [[ ${PLEVEL} -gt 0 ]] ; then
- # bash-5.1 -> bash51
- my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
-
- patch_url=
- my_patch_index=
-
- for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do
- for url in mirror://gnu/${pn} ftp://ftp.cwru.edu/pub/bash ; do
- patch_url=$(printf "${url}/${PN}-$(ver_cut 1-2)-patches/${my_p}-%03d" ${my_patch_index})
- SRC_URI+=" ${patch_url}"
- SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
- done
-
- MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d ${my_patch_index}) )
- done
-
- unset my_pn patch_url my_patch_index
- fi
-else
- SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
- SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
-fi
-
-if [[ -n ${GENTOO_PATCH_VER} ]] ; then
- SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-if is_release ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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
-IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
-
-DEPEND="
- >=sys-libs/ncurses-5.2-r2:=
- nls? ( virtual/libintl )
-"
-if is_release ; then
- DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )"
-fi
-RDEPEND="
- ${DEPEND}
-"
-# We only need yacc when the .y files get patched (bash42-005, bash51-011)
-#BDEPEND="virtual/yacc"
-BDEPEND="
- pgo? ( dev-util/gperf )
- verify-sig? ( sec-keys/openpgp-keys-chetramey )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-# EAPI 8 tries to append it but it doesn't exist here
-QA_CONFIGURE_OPTIONS="--disable-static"
-
-PATCHES=(
- #"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
-
- # Patches from Chet sent to bashbug ml
- "${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
-)
-
-pkg_setup() {
- # bug #7332
- if is-flag -malign-double ; then
- eerror "Detected bad CFLAGS '-malign-double'. Do not use this"
- eerror "as it breaks LFS (struct stat64) on x86."
- die "remove -malign-double from your CFLAGS mr ricer"
- fi
-
- if use bashlogger ; then
- ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
- ewarn "This will log ALL output you enter into the shell, you have been warned."
- fi
-}
-
-src_unpack() {
- if [[ ${PV} == 9999 ]] ; then
- git-r3_src_unpack
- else
- if use verify-sig ; then
- verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.sig}
- fi
-
- unpack ${MY_P}.tar.gz
-
- if [[ -n ${GENTOO_PATCH_VER} ]] ; then
- unpack ${PN}-${GENTOO_PATCH_VER}-patches.tar.xz
- fi
- fi
-}
-
-src_prepare() {
- # Include official patches
- [[ ${PLEVEL} -gt 0 ]] && eapply -p0 "${MY_PATCHES[@]}"
-
- # Clean out local libs so we know we use system ones w/releases.
- if is_release ; then
- rm -rf lib/{readline,termcap}/* || die
- touch lib/{readline,termcap}/Makefile.in || die # for config.status
- sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die
- fi
-
- # Prefixify hardcoded path names. No-op for non-prefix.
- hprefixify pathnames.h.in
-
- # Avoid regenerating docs after patches, bug #407985
- sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
- touch -r . doc/* || die
-
- eapply -p0 "${PATCHES[@]}"
- eapply_user
-}
-
-src_configure() {
- local myconf=(
- --disable-profiling
-
- # Force linking with system curses ... the bundled termcap lib
- # sucks bad compared to ncurses. For the most part, ncurses
- # is here because readline needs it. But bash itself calls
- # ncurses in one or two small places :(.
- --with-curses
-
- $(use_enable mem-scramble)
- $(use_enable net net-redirections)
- $(use_enable readline)
- $(use_enable readline bang-history)
- $(use_enable readline history)
- $(use_with afs)
- $(use_with mem-scramble bash-malloc)
- )
-
- # For descriptions of these, see config-top.h
- # bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
- append-cppflags \
- -DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
- -DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
- -DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
- -DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
- -DNON_INTERACTIVE_LOGIN_SHELLS \
- -DSSH_SOURCE_BASHRC \
- $(use bashlogger && echo -DSYSLOG_HISTORY)
-
- # Don't even think about building this statically without
- # reading bug #7714 first. If you still build it statically,
- # don't come crying to us with bugs ;).
- #use static && export LDFLAGS="${LDFLAGS} -static"
- use nls || myconf+=( --disable-nls )
-
- if is_release ; then
- # Historically, we always used the builtin readline, but since
- # our handling of SONAME upgrades has gotten much more stable
- # in the PM (and the readline ebuild itself preserves the old
- # libs during upgrades), linking against the system copy should
- # be safe.
- # Exact cached version here doesn't really matter as long as it
- # is at least what's in the DEPEND up above.
- export ac_cv_rl_version=${READLINE_VER%%_*}
-
- # Use system readline only with released versions.
- myconf+=( --with-installed-readline=. )
- fi
-
- if use plugins ; then
- append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/bash
- else
- # Disable the plugins logic by hand since bash doesn't
- # provide a way of doing it.
- export ac_cv_func_dl{close,open,sym}=no \
- ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
-
- sed -i \
- -e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
- configure || die
- fi
-
- # bug #444070
- tc-export AR
-
- econf "${myconf[@]}"
-}
-
-src_compile() {
- if use pgo ; then
- # Build Bash and run its tests to generate profiles.
- emake CFLAGS="${CFLAGS} -fprofile-generate=${T}/pgo -fprofile-dir=${T}/pgo"
-
- # Used in test suite.
- unset A
-
- emake CFLAGS="${CFLAGS} -fprofile-generate=${T}/pgo -fprofile-dir=${T}/pgo" -k check
-
- # Rebuild Bash using the profiling data we just generated.
- emake clean
- emake CFLAGS="${CFLAGS} -fprofile-use=${T}/pgo -fprofile-dir=${T}/pgo"
-
- use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} -fprofile-use=${T}/pgo -fprofile-dir=${T}/pgo" all others
- else
- emake
-
- use plugins && emake -C examples/loadables all others
- fi
-}
-
-src_test() {
- # Used in test suite.
- unset A
-
- default
-}
-
-src_install() {
- local d f
-
- default
-
- dodir /bin
- mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
- dosym bash /bin/rbash
-
- insinto /etc/bash
- doins "${FILESDIR}"/bash_logout
- doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
-
- keepdir /etc/bash/bashrc.d
-
- insinto /etc/skel
- for f in bash{_logout,_profile,rc} ; do
- newins "${FILESDIR}"/dot-${f} .${f}
- done
-
- local sed_args=(
- -e "s:#${USERLAND}#@::"
- -e '/#@/d'
- )
-
- if ! use readline ; then
- # bug #432338
- sed_args+=(
- -e '/^shopt -s histappend/s:^:#:'
- -e 's:use_color=true:use_color=false:'
- )
- fi
-
- sed -i \
- "${sed_args[@]}" \
- "${ED}"/etc/skel/.bashrc \
- "${ED}"/etc/bash/bashrc || die
-
- if use plugins ; then
- exeinto /usr/$(get_libdir)/bash
- doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
-
- insinto /usr/include/bash-plugins
- doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
- fi
-
- if use examples ; then
- for d in examples/{functions,misc,scripts,startup-files} ; do
- exeinto /usr/share/doc/${PF}/${d}
- docinto ${d}
- for f in ${d}/* ; do
- if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
- doexe ${f}
- else
- dodoc ${f}
- fi
- done
- done
- fi
-
- # Install bash_builtins.1 and rbash.1
- emake -C doc DESTDIR="${D}" install_builtins
- sed 's:bash\.1:man1/&:' doc/rbash.1 > "${T}"/rbash.1 || die
- doman "${T}"/rbash.1
-
- newdoc CWRU/changelog ChangeLog
- dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
- if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
- mkdir -p "${EROOT}"/etc/bash
- mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
- fi
-}
-
-pkg_postinst() {
- # If /bin/sh does not exist, provide it
- if [[ ! -e ${EROOT}/bin/sh ]] ; then
- ln -sf bash "${EROOT}"/bin/sh
- fi
-}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 437470720b10..f9fff0bb9486 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index 056bb4f65406..6e9f6c67f944 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -3,4 +3,4 @@ DIST enchant-1.6.1.tar.gz 642124 BLAKE2B d41aa9b313e7fe8b0887728b55f3c5218e270c7
DIST enchant-2.3.3.tar.gz 990877 BLAKE2B 310b66931e803ccb643a47c1476122a558de7a192b50f532d4cdababe55d398268bf5bfcc0ed556d665af88f6c183c1871147d302ad39a7ebd4fc29e1ab16967 SHA512 c97764a8f219033b440cbfb820624f54993b19ba1f38b56f20336889304f753c7c513008bb92cd1424bfbf528c2d473f35bef93d9140063612e3a270fd000deb
EBUILD enchant-1.6.1-r2.ebuild 1402 BLAKE2B 82313fac47e2aa83cba94e715ea231ae1f2185c534a47efb591ad0c4f03a87b5439bb35343e2c25dc2d5713e77831e74746e46c3a159d3683321a728f8a1d94e SHA512 b91a1745d398a453cbe34d320079e9f17a29c4ebf23eab5dd69006f433593acc4cfe0c184d3b6ffa1211e36851a0e17ea98e2c0cfbcf4df3d5d41a9d6b4e013e
EBUILD enchant-2.3.3-r1.ebuild 1306 BLAKE2B 85894066783b9e967f865134070e6850c8858156c823569fd931ae1f1fc34cc0a8e8e617c6129cae4f492954bf05a992d58ac26bd749aa164c428a50012f2705 SHA512 a54ec38dfdb6214bad21a10fd8c4158774c5146150d5d9a56888f66120ccde11c80d65fb743d4da9b3fccc19b976c9ffd6f2db449077fbff2ad949c0d0fc93d5
-MISC metadata.xml 626 BLAKE2B 292276574828700f2688f2a5b1fc09a1c57a0e39ea89067bb728ac773654ab7ae073be8d2af1cd68f8d4f28f7fcf9fb2f7782db63c0ab7f457d389ab66c95c18 SHA512 894afee900f5a285cbd7715b7fd689e645013c134dbf5a8b5bd8aee9dd886793010a907ed6164d393896648a1932721bc404a7a96e38fe1705705dbd5848bbff
+MISC metadata.xml 726 BLAKE2B fcab9997afd2447879cfcbe3b3c679f5de4374f3e5529bf6e36ae8a4ed7a8e8575d5ffc0c7b9de61685646efc15559656137397c3f02b98d787cf51171915817 SHA512 fa71282d374a9ab1a37665cfc2e6a4c33bd4e8aa9d57e223002603326f7c754bed82a4802d37c7f34adc33bd9b289e59d725e1fe835302f58e962271acb8cd34
diff --git a/app-text/enchant/metadata.xml b/app-text/enchant/metadata.xml
index 3d5f422a24ed..4b8be47deda0 100644
--- a/app-text/enchant/metadata.xml
+++ b/app-text/enchant/metadata.xml
@@ -1,14 +1,17 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
-
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+
+ AbiWord/enchant
+
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 2b66abc91cee..dbbcbf06fab4 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,5 +1,7 @@
DIST evince-42.3.tar.xz 2856080 BLAKE2B 55711dd1869e9cce783845683093bb621b416de66f1d53f901353f6f66ff97ec80ce45e0d32e346b2b37d18285568d01ee96cfe851b09f893565d277651d837c SHA512 4ec212e90c3fd259a2afe191592c135938766b11c6891297a10dc34152f69bba9350a467c394ec6cacde5bd16ced02d0c38b7a112dd7d676f53b12fd1b29a62e
DIST evince-43.0.tar.xz 2908508 BLAKE2B 5f1a9a697693a64c2b54ae5d5499ae8993b02f2df0b1706d0335770037285bb13e2af5254d7ff65ae4abb5a0c8ed6e338c61306f47e121de8c6546407c8968d5 SHA512 dd50ba45c4eb56f8af1df38f7a12c3c13747a1053bb97c8600d85cbc398e340d7bc5db73f441b68cfb8294ab985be361e48605cdc5e3dccb051d917869a12ba9
+DIST evince-43.1.tar.xz 2909512 BLAKE2B 1695320814aca28df17e5bbe6f4000b0191b9b600895c529d4ccd5628335fc4dd4fa788ddfe54c06fe37da12705add93f7df99a8c0dfb1060b8fd497aabae596 SHA512 c12d7b6e961a74c8e31b604f232483576289ba9e5a37faa766f4e5aaa95bdcbf37cf98c1d28de45ad1728452b0a2408fe4fe245dc76289a21e7664c96237d09f
EBUILD evince-42.3.ebuild 2982 BLAKE2B e5c9636f07a3753ee22b51a7cc93c62d18f85358b659a03695956e1de463af926103b638734757d7312ab774a369e8006936e9692594d274366ee52354cedd05 SHA512 d513cd58ac2215971eabf20012122c6c16a85340f5e2990120913deab38342de25c5ff3ba44ecf6f0908cad97ba4a9b528a5fdf74bc222207bb5afcd760be79f
EBUILD evince-43.0.ebuild 3012 BLAKE2B be4266d51eac2ac84706a65e919447829bf1a0f5bcd7adbb3cf2891c299cd3ffcf82a34ef9d22f9193964d1d282e88586d8a9447c746785670df4f3f50aaa38f SHA512 4e686499fc5c8076270222c6ca7a9a860e615e9115ea47bcc31df87293a434d206e8005738dc9b3fcc87145a90bf81a08fdb50e6c48ca2aa5329668fe2cb2bb3
-MISC metadata.xml 769 BLAKE2B 3ad6f00e7633640decc7dcd6725a5ebbfbccf41b5feda031eba03c0b532a2a191f17a1e6e666046e8c65e5f8e694894e66938ff4b9f3df6464e242bfa7de345a SHA512 5397254ba7d615a65633baefdd23c23e9d96a8e13326975f3c8df784c6bd182840d7db29a0e67d24accffe9d62099bb7b59ca96719c68db7fcfedfaf1678f74b
+EBUILD evince-43.1.ebuild 3064 BLAKE2B 689265e2bb4bc7a718349bd97583f0c244d082c8652eb85790c444b8771591afb1b65134bde32dd8b023e593cbdacf746b2abe69be2a1af5575bdff9a9f1e09d SHA512 6315c2512018573b65cb80952db3bdce35f2d043e1c980d88fec9621e2c7950a94beceea1f17b3ea59914e5c988eca6e8d114e7eb1db1d02484244edba721a2e
+MISC metadata.xml 874 BLAKE2B be19d36175d5ca322e89689e69b18ae720b40450ce63fa3e5056c3b0af6f81be3481050b6a005db2d79f3c86b3de1eb7fabdde3d3ce9d84fffb13b13c5c04eac SHA512 d3128343855fd9c76ee8b68b19ec61a8ec479ee48c539bce17a09770f0f5661b8b1eb9d27ab0d52aaa450131b81f237fa54e8854ca0cbb3a2f487073b7107433
diff --git a/app-text/evince/evince-43.1.ebuild b/app-text/evince/evince-43.1.ebuild
new file mode 100644
index 000000000000..ca49f79daed2
--- /dev/null
+++ b/app-text/evince/evince-43.1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson systemd xdg
+
+DESCRIPTION="Simple document viewer for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
+SLOT="0/evd3.4-evv3.3"
+IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus postscript spell tiff xps"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+
+# atk used in libview
+# bundles unarr
+DEPEND="
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0
+ dev-libs/atk
+ )
+ >=dev-libs/glib-2.44.0:2
+ >=gui-libs/libhandy-1.5.0:1=
+ >=dev-libs/libxml2-2.5:2
+ sys-libs/zlib:=
+ >=x11-libs/gdk-pixbuf-2.40:2
+ >=x11-libs/gtk+-3.22.0:3[cups?,introspection?]
+ gnome-base/gsettings-desktop-schemas
+ >=x11-libs/cairo-1.10:=
+ >=app-text/poppler-22.02.0[cairo]
+ >=app-arch/libarchive-3.6.0
+ djvu? ( >=app-text/djvu-3.5.22:= )
+ dvi? (
+ >=app-text/libspectre-0.2:=
+ dev-libs/kpathsea:=
+ )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ media-libs/gst-plugins-good:1.0 )
+ gnome? ( gnome-base/gnome-desktop:3= )
+ gnome-keyring? ( >=app-crypt/libsecret-0.5 )
+ introspection? ( >=dev-libs/gobject-introspection-1:= )
+ nautilus? ( >=gnome-base/nautilus-3.28.0 =app-text/libspectre-0.2:= )
+ spell? ( >=app-text/gspell-1.6.0:= )
+ tiff? ( >=media-libs/tiff-4.0:0= )
+ xps? ( >=app-text/libgxps-0.2.1:= )
+"
+RDEPEND="${DEPEND}
+ gnome-base/gvfs
+ gnome-base/librsvg
+ || (
+ >=x11-themes/adwaita-icon-theme-2.17.1
+ >=x11-themes/hicolor-icon-theme-0.10
+ )
+"
+BDEPEND="
+ gtk-doc? (
+ >=dev-util/gi-docgen-2021.1
+ app-text/docbook-xml-dtd:4.3
+ )
+ dev-libs/appstream-glib
+ dev-util/gdbus-codegen
+ dev-util/glib-utils
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ default
+ xdg_environment_reset
+
+ # Do not depend on adwaita-icon-theme, bug #326855, #391859
+ # https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7
+ sed -i '/adwaita_icon_theme_dep/d' meson.build shell/meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ -Ddevelopment=false
+ -Dplatform=gnome
+
+ -Dviewer=true
+ -Dpreviewer=true
+ -Dthumbnailer=true
+ $(meson_use nautilus)
+
+ -Dcomics=enabled
+ $(meson_feature djvu)
+ $(meson_feature dvi)
+ -Dpdf=enabled
+ $(meson_feature postscript ps)
+ $(meson_feature tiff)
+ $(meson_feature xps)
+
+ $(meson_use gtk-doc gtk_doc)
+ -Duser_doc=true
+ $(meson_use introspection)
+ -Ddbus=true
+ $(meson_feature gnome-keyring keyring)
+ $(meson_feature cups gtk_unix_print)
+ $(meson_feature gnome thumbnail_cache)
+ $(meson_feature gstreamer multimedia)
+ $(meson_feature spell gspell)
+
+ -Dinternal_synctex=true
+
+ -Dsystemduserunitdir="$(systemd_get_userunitdir)"
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/app-text/evince/metadata.xml b/app-text/evince/metadata.xml
index 87c11128663d..afa0e10cc24f 100644
--- a/app-text/evince/metadata.xml
+++ b/app-text/evince/metadata.xml
@@ -1,15 +1,18 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
-
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+
+ GNOME/evince
+
diff --git a/app-text/gnome-doc-utils/Manifest b/app-text/gnome-doc-utils/Manifest
index be3cc7df8bcd..6fca73b0b48d 100644
--- a/app-text/gnome-doc-utils/Manifest
+++ b/app-text/gnome-doc-utils/Manifest
@@ -1,5 +1,5 @@
AUX gnome-doc-utils-0.20.10-fix-out-of-tree-build.patch 2140 BLAKE2B 181f2405c7d762242314a96df3674360f9f98edf168dee983332b58be81db967d6fbee6e1e8c5a622d13dcfdd86f4bba7757c192ef2cd2a0575e16f31eaa12a5 SHA512 384e2d0571621402b9e3cfa0cc666d244e93e42e6520c1d88651c26d3fed1cd3d7b443e7d0e87d7eb4518798a779ee075ff51390d3835b043f4e82ce4e2ad9b8
DIST gnome-doc-utils-0.20.10-python3.patch 21576 BLAKE2B 487b2f7d3758d1df475178154ed92ee548c63fd492d59fb0c6cc3a75e6378ebe75e74e3bdc60b46a74ea0670ca77f9bbad279b625bb64d4cb8a432a869eb426b SHA512 500e952f12c1baae08a0f520ea7e08c09d20ee58c3ed5fdc5f6dd1b7a192d90f66de26956306ab685ef62298df9770af184c0f33b7d4e015023ef2129da351bf
DIST gnome-doc-utils-0.20.10.tar.xz 526700 BLAKE2B 6019aa9b1d2c8153ddc1e6af589f79628ceafb6c14b0de5dc8f9ef518b5e626bbafdc2a4d93bfb70c6823ba0605a5abe899989e9f893c976d7a5fcd9c99a90dc SHA512 1cb5e3b9ca9e45e6c551801e9c9c4aac725c2ce85238c230a4c70b36c90419886b921d8dd464df0643fc3bbb877df075abaa83a36d1609c5664960c31e11d151
-EBUILD gnome-doc-utils-0.20.10-r2.ebuild 1939 BLAKE2B c4a6ceecdb733ed619f03e4e2c66ac8641c90dde6e1e35434ee50de1fb8da2aacf7c336870d7835368b6f1423b9b7d0891d7a9bc287f953fdff07706ebbc6042 SHA512 995d3f9bbc1496a4af8d238a139e88d50fd6e339506c198ba65af711f808ebe5fe4bdabba86fe837b55f49a031944625441e5206ab3631cea41b4b134dce3dac
-MISC metadata.xml 260 BLAKE2B 74a7980ab34785ba7920342b0a2708af439bed09b7ffdc1ae3ca6cbbaba8b7dbd7a6894375c6d5adf00819685f44f58b1e069dcd1062a70e99f0dbcfe39dc3d3 SHA512 f4c15c784194c80663c49692140afcfef3450b722254b99b2bd7fd0d7a08c57b463afcfa3b5609e799d0b2d6ff6451172eace91e93b886856d2591d491585c0c
+EBUILD gnome-doc-utils-0.20.10-r3.ebuild 2039 BLAKE2B 1187c4476fceb492869dde37ba7fcd84ca0348f0366b8be20073a66099ab2e6c68e52f00a3c7f925b34c35735e346ccdf0bc7f3a0456461e0a7691de7ba8e19f SHA512 1dedea65fd173f3b7009a299d01c361eeaf57aebc4ebcf5ff4ae5f4730487bbfbd45f801f40003ee5bc085933b069d70f986e6f2e7fa7fdee9e8eec3e6136138
+MISC metadata.xml 358 BLAKE2B 2eea9f0df67157d1f3fb590f9b48dfd4ec8e5c04daadd2cb540787cbd3eaafe8fda16dfe1f5c871bb90d6d9346e6519f0f9c351664a762845f1500fd35ae57a6 SHA512 791f779816b0edcadecef7e96b767ff3867fe3e296b9fb2c84442bb27562906920f593971f2b733aebfc95e522a2ed275ecfcdc31e06737be835a1316e24deb8
diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r3.ebuild
similarity index 86%
rename from app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild
rename to app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r3.ebuild
index 748e7a382e70..3c536ca4e4ca 100644
--- a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r3.ebuild
@@ -1,20 +1,19 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-PYTHON_COMPAT=( python3_{7..10} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
-inherit gnome2 multibuild python-r1
+inherit gnome2 python-r1
DESCRIPTION="A collection of documentation utilities for the Gnome project"
HOMEPAGE="https://wiki.gnome.org/Projects/GnomeDocUtils"
-SRC_URI+=" https://dev.gentoo.org/~juippis/distfiles/tmp/gnome-doc-utils-0.20.10-python3.patch"
+SRC_URI+=" https://dev.gentoo.org/~juippis/distfiles/tmp/${P}-python3.patch"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
@@ -24,6 +23,8 @@ RDEPEND="${PYTHON_DEPS}
DEPEND="${RDEPEND}
app-text/docbook-xml-dtd:4.4
app-text/scrollkeeper-dtd
+"
+BDEPEND="
>=dev-util/intltool-0.35
sys-devel/gettext
virtual/awk
@@ -39,6 +40,10 @@ src_prepare() {
eapply "${FILESDIR}"/${P}-fix-out-of-tree-build.patch
eapply "${DISTDIR}"/${P}-python3.patch
+ # Empty py-compile, so it doesn't write its own pyo/pyc files
+ echo > "${S}"/py-compile
+ chmod a+x "${S}"/py-compile || die
+
gnome2_src_prepare
# Leave shebang alone
diff --git a/app-text/gnome-doc-utils/metadata.xml b/app-text/gnome-doc-utils/metadata.xml
index c6e394b17a27..b176e403791e 100644
--- a/app-text/gnome-doc-utils/metadata.xml
+++ b/app-text/gnome-doc-utils/metadata.xml
@@ -5,4 +5,7 @@
gnome@gentoo.org
Gentoo GNOME Desktop
+
+ Archive/gnome-doc-utils
+
diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest
index 8a281d2f03ff..11a69d77e89c 100644
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@@ -2,4 +2,4 @@ DIST gspell-1.11.1.tar.xz 432216 BLAKE2B aa6e6873fcb9cc7d3e7e05fe0abdd3b2e271c04
DIST gspell-1.12.0.tar.xz 433068 BLAKE2B 5726f40b07ee1d23a5a2e22ed012b52d6090a645b3141ecaf6a92cc850442be605ff2481a28ec87ee0d5b727b792fe2812a3e32ffd05978ed984d92b593910ec SHA512 7a9fea40c6b8298c48ee48cb6f67d66b0a950fd4d7902ffce0d2f620270614ea01b7ada0adba6778090b16f4561625aea6f39de76b743b2cd06a61a24520c549
EBUILD gspell-1.11.1.ebuild 1519 BLAKE2B b12f98d398de58a2637682c055a02691d61fa4f8ce7d6716a1bf8bd711b7f3447d61d2e6b9e5b9d1c88713bc2c663572328aa7039a1316e64f17c51e01adbe6f SHA512 30a043c539861fc4fb9f6f36d46b553f5d3ee77a89dbea2538eea82605c28bb293972f685450527676924ff6d165ecad72c49c4237565951a4622a7ffd40cabf
EBUILD gspell-1.12.0.ebuild 1524 BLAKE2B e661270fff866f6f14d00ac6be9fab9e2b3c5db69c261d2d5ddb944e0e1cc23e65a9ecb99133b2407073a65b39dd3cb96471225f4257905a858dddf71032e931 SHA512 b05191ad4a46ced2f3814d13894d26b6ce087e3efc33e9c37f95703efd0f5cb8d8bf13c972c76541b90dcbee81fc414fa29a4182fcbf8c724508ce7f59163dc7
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 347 BLAKE2B 3b91db6ff2ea521010e0437fc23b5f69567011240291483423ec748b70cf2baba234824c41cc493f8d30106dad208b9e4b376e69ca3d8e495072b97dd2f271de SHA512 4691f9bc67d5e5372945a4aa319185c4478b58e463c9c1b853a2503c80ab7dacebc433c8ffc247d0fce9e7b2f0f03fd4e0216d27e135598efa26e2988ac7bc73
diff --git a/app-text/gspell/metadata.xml b/app-text/gspell/metadata.xml
index 7b343b06be8a..b05cd3f331a8 100644
--- a/app-text/gspell/metadata.xml
+++ b/app-text/gspell/metadata.xml
@@ -1,8 +1,11 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+ GNOME/gspell
+
diff --git a/app-text/gtranslator/Manifest b/app-text/gtranslator/Manifest
index 7affb31121f5..7caa48c0de8e 100644
--- a/app-text/gtranslator/Manifest
+++ b/app-text/gtranslator/Manifest
@@ -4,4 +4,4 @@ DIST gtranslator-40.0.tar.xz 1509940 BLAKE2B dbf4c4a8765167177959c058b29563a2c31
DIST gtranslator-42.0.tar.xz 1526376 BLAKE2B 3d6834c201601415a1fb761bcef471a6c63aae311d22cb1ef5d615e20d124d05b165abb92590da2502b79456c9130e14dd7733746f5006a3c219aaf7f0505ba7 SHA512 785f2757360425b735948faca9eb8ef5f4433394f4fd99ff6e1f78f41d382c7769318ad8d329906910bcdd5a64b4ee0aa2df2e218a3c4b7576938e3d870077b6
EBUILD gtranslator-40.0.ebuild 1132 BLAKE2B d18a39afdffb04a671590c994422457ea050c78e7024dd59338b7c8638ef6b4da6297eb6ebcebd542d93ed039177fd2e4ce4b8e0da495922246b735b5181a3e4 SHA512 a463faa8b570d2de8d13662c2ce5ed0b55f15bac63074fb44c2e6f54adbd1a0155c467353897a048186ce6705644130faee6b50ed1a4c3e75534114e2ada488e
EBUILD gtranslator-42.0.ebuild 1151 BLAKE2B b5e8ffa355792a90399c40adbe9df3650e39f90370f316a66382ce128cb09ab3bf916258d65aa1109af17ba62ce925773eb4ebfd7687844958214eeb4ae20bb1 SHA512 577c730e615134352cf556d803a1296e9a7e2659ced17b44f5f01a0f78800bcae80893f9177f3736a423eb95746101203f962f48313feeb0b69bd146f6aa525d
-MISC metadata.xml 813 BLAKE2B e88f712bb4475618b3f4c55a56becdb271752ce7c14a870893a243719124100e4d95dbc090fdb8069132f7b6d024738568ed6ff1c649486ae054302b73bd213e SHA512 e8b69861262d570c05ad69f30891ac979d5860d34de4aa85531111c6c8cad321dad8a395325c687a459e2e72b83374a9a986304e081ae93afa985d8b06c07364
+MISC metadata.xml 846 BLAKE2B c244024e319608bf5c645ee2b6925965afedec192795bddfa491c2f04c85e08f001c4631f84f8dd952d9cc14dd2bc43bb3cbdd4b007edc6cb974e8798c50b35c SHA512 60cf7c8221d9104495bec227dc50a7126a1acfd221dee45c8e6dba723467d41e7401acfc3a9c066a36bb859622f2bbc2a05ac1feffd13b5ede45869b73ee35a1
diff --git a/app-text/gtranslator/metadata.xml b/app-text/gtranslator/metadata.xml
index 64f3ff5e69dd..b5c704d5c64a 100644
--- a/app-text/gtranslator/metadata.xml
+++ b/app-text/gtranslator/metadata.xml
@@ -1,20 +1,20 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
-
- Gtranslator is an enhanced gettext po file editor for the GNOME desktop
- environment.
- It handles all forms of gettext po files and includes very useful features
- like find/replace, translation memory, different translator profiles,
- messages table (for having an overview of the translations/messages in the
- po file), easy navigation and editing of translation messages and comments
- of the translation where accurate.
-
-
- gtranslator
-
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+ Gtranslator is an enhanced gettext po file editor for the GNOME desktop
+ environment.
+ It handles all forms of gettext po files and includes very useful features
+ like find/replace, translation memory, different translator profiles,
+ messages table (for having an overview of the translations/messages in the
+ po file), easy navigation and editing of translation messages and comments
+ of the translation where accurate.
+
+
+ GNOME/gtranslator
+
diff --git a/app-text/idnits/Manifest b/app-text/idnits/Manifest
new file mode 100644
index 000000000000..d7752f0145b4
--- /dev/null
+++ b/app-text/idnits/Manifest
@@ -0,0 +1,3 @@
+DIST idnits-2.17.1.tar.gz 60480 BLAKE2B b2248236590bf025f9e06a4d804ac9d0cd207406809f17a2393dfbce2d0712c60aef58c8a4d7388c61495956ce0d2b0c5c491e290b178b7c46dcbc711615a847 SHA512 deed0c73e95e292443ec3e2ca447d2e6ceb9cbafd0775163e247185c158e74b7a4cd1e906474ca45ab40d92eac6e881e417df4c6e84a15277c71c711c590f55a
+EBUILD idnits-2.17.1.ebuild 496 BLAKE2B 4afb192ebaa1618f148121ffafaa08e592f25839dce5d0fa01d9e309e112394478be214bed0fcf9491d7e8b02fe0551f4e25cfc10b0918c280316c58258cfbf6 SHA512 035af6199a9f520eadee86b70e44f326c38bde72bdd8cc09cf8a5cdcaa1c892c683b98f5f80bd33e7fcca903094d9b33212f723c363c299b97689df42d5b8d60
+MISC metadata.xml 328 BLAKE2B 95be330bd0f0b2ce18f8a58e6a3d15a7a8b34643a6c72139866ec3a0f32f6403479d417b5ceb1019d0b7fee5151e21708e129b19a473576e7d2656a5589fa4b3 SHA512 4aa1d18ffa5223ef93ab981c033dad607ecdf4c7fbd39ac45f201b5f6a6d2d06733f57efc3c856370a7b4d6d87b79c041fe36ff7d55c0028eadd1a695c73772e
diff --git a/app-text/idnits/idnits-2.17.1.ebuild b/app-text/idnits/idnits-2.17.1.ebuild
new file mode 100644
index 000000000000..5a0345d2fdc0
--- /dev/null
+++ b/app-text/idnits/idnits-2.17.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A tool to check internet-drafts (IDs) for submission nits"
+HOMEPAGE="https://www.ietf.org/tools/idnits/"
+SRC_URI="https://github.com/ietf-tools/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2+"
+
+SLOT="0"
+
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+ app-shells/bash
+ sys-apps/coreutils
+ virtual/awk
+"
+
+src_install() {
+ dobin idnits
+ dodoc about changelog todo
+}
diff --git a/app-text/idnits/metadata.xml b/app-text/idnits/metadata.xml
new file mode 100644
index 000000000000..2b0b24ef145c
--- /dev/null
+++ b/app-text/idnits/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ Florian Schmaus
+ flow@gentoo.org
+
+
+ ietf-tools/idnits
+
+
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index 36a2b33268fa..2616fa41ed5e 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -1,5 +1,3 @@
-DIST lesspipe-2.05.tar.gz 167135 BLAKE2B 6f54a68a3857fcafa19148ba798d6ac49b2693e547e88a4a4fb6a178768d75ba8ae08e808a9e08aabfe903538bd401e3bd25e22ec240bf3a52365df729d87b9e SHA512 b4220b28fb609060735663067f5a738cae32d12e90efc397db3749e4dcfa7bfc063a4458c1f39b8a43be3b04effdc00a25c4feebd6e9a3b23f0064b879bbb698
DIST lesspipe-2.06.tar.gz 168100 BLAKE2B a7447efa85cd422343f9dbb06001e85fa7b33c92db752f8248e4b4a0d9ecce4ef0241240d6993c5a71157c44da2f4ffc3efd41ac5e0a31e89ed5b80ac99f71fe SHA512 b2411c5e6b287fb67e1ea9b6d10377fe19b58e8c0f54587f825d1ee4c1a85f9a8ed3244a7cf339bcba960094e95821d9a56929951d862eb697f1d12fe55ef20d
-EBUILD lesspipe-2.05-r1.ebuild 1240 BLAKE2B 7ec7fc28cf35072aeddaaa1740dcb4a2305468712795507f793709e663d026011c861827c6f527433de95ab7a26ee85629dc25173a69531307d517d6826be74d SHA512 f85f611a71a28eb501151bd16c3603d9591e140a802b1d13235d262e964d40f0616191d47057f38d8ecde42b96531960ff29f2b5b38a109bab6971eef00be4ec
EBUILD lesspipe-2.06.ebuild 1316 BLAKE2B b99b541d48f1e922523adb46433756503d93d2c6060f47c4a056be59820a520f0a7bfc45fc93ac9dde7a32ac75dd7ebe624bfa87190c6e452ac2957a8b179fd3 SHA512 ebedbad0bed5cf740f3cdcf908de5246a4143d5d030a9915cf08729c25dc2ceb2dfee14c711bdb08920e7c18206ec824b607aafb5f69f5f9a29717e26e73bc9c
MISC metadata.xml 304 BLAKE2B bb5be96b5fd22ce82d800f6bd5ed3ceb04b955182eaadc1f34b6f4b633c21efd6148013fc29b5567f7ada4da5de6efd7e0e420fa63a2976a5cf6bcf719c34f2e SHA512 2c217e67c6c487f7f7f98588a50086daf434bc25ad229b68d37bc12f7ecc4f904b5bc4a3b7b6db4a1daa0267c7e13fde8538de1c16d11e95be6b8071ee675105
diff --git a/app-text/lesspipe/lesspipe-2.05-r1.ebuild b/app-text/lesspipe/lesspipe-2.05-r1.ebuild
deleted file mode 100644
index a795a3880db9..000000000000
--- a/app-text/lesspipe/lesspipe-2.05-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1
-
-DESCRIPTION="A preprocessor for less"
-HOMEPAGE="https://github.com/wofr06/lesspipe"
-SRC_URI="https://github.com/wofr06/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Please check again on bumps!
-# bug #734896
-RESTRICT="test"
-
-BDEPEND="dev-lang/perl"
-RDEPEND="${BDEPEND}"
-
-src_configure() {
- # Not an autoconf script.
- ./configure --fixed || die
-}
-
-src_compile() {
- # Nothing to build (avoids the "all" target)
- :
-}
-
-src_install() {
- emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
- einstalldocs
-
- rm -r "${ED}"/etc/bash_completion.d || die
- newbashcomp less_completion less
-}
-
-pkg_preinst() {
- if [[ -z ${REPLACING_VERSIONS} ]] ; then
- elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
- elog "The latter is the Gentoo-specific version. Make sure to update your"
- elog "LESSOPEN environment variable if you wish to use this copy."
- fi
-}
diff --git a/app-text/libgepub/Manifest b/app-text/libgepub/Manifest
index a040d09899fc..f78ee7b6d99e 100644
--- a/app-text/libgepub/Manifest
+++ b/app-text/libgepub/Manifest
@@ -2,4 +2,4 @@ DIST libgepub-0.6.0.tar.xz 26092 BLAKE2B e578ce1085f35ef56ae32e7c32dcd5aa3b54c4d
DIST libgepub-0.7.0.tar.xz 28536 BLAKE2B beeab3d3911353cb0cac78207cc9e18e3341afce94213757c8d246a2d01c42aa0eb37618cc066307ce2ec8f21dbb89982271f25a9552d6872d5e86a4345407c6 SHA512 2ab661a6379899ff818313205d818ef1239654afde9ebcc22fa55b5d961aee20dd9c8295a58ff1d1fb1ea281ddb6ee8644942a860b3ee9f6a4ba9d7447efc517
EBUILD libgepub-0.6.0.ebuild 688 BLAKE2B 6403a39233e409d7f3ac26d342e1d6439ff9771f585363b6b1906020818bce7be222bd12fa518bfae2d04c5d03c3950cf24fbd99e6a1353ab03620abc2cc7d80 SHA512 214a6a8b039c93213918e2a302415952c8adb3a8bd8d42938509fb31e0dc4945eef641ecb27ad22145a84102684b10ad7e5c2eebb791995911e9bd3131599106
EBUILD libgepub-0.7.0.ebuild 920 BLAKE2B 9a1e52448981c7a32a15ff1fcf9814003523f6b72d281b0a672b6445bb82f8ad43a661d333ae6accf9776b34565e3d89c012f3d9c0d6e193b93c7f64cbdb4dee SHA512 57ffbb31065abcf8273e8850034683c4a7fd17c311b21f72f236891b28a9966c76cddbbfbefe5b3578a739cde7b81f6e27151a593df29cd9c4c5d4de91a1a94b
-MISC metadata.xml 347 BLAKE2B ff0f53373d5c9219f0d001bc62df96b9f74a2c498b3571abfc3d0edbba9f0bfd71ddea664355035941e29833b1cbf8a8520b9b21cd86897d2091874935efa0fc SHA512 805ef3bdb80f05c835773b0c18bb8770b2f73bf9df75662b2937f10c8827895a73dcf9caff46b5fee30dcab1880e88a5cde4f3d207bea046b0ebe18a71a59e8e
+MISC metadata.xml 436 BLAKE2B d829d0b00fef946cbc3356048e1499b944197362474a044f916cfe128f99d9ac041924315c1fb845f6e823d37a710e1f420f2fcff41306aad89f65223fa1d63c SHA512 6753be33014461b9eee51648ea9086e00bdd8406468ca5914a0ba42102b130defc2f1a9e28be8f1ffd99056bd8ec6ede0c86f958ec7181131353d5e03ca9c43c
diff --git a/app-text/libgepub/metadata.xml b/app-text/libgepub/metadata.xml
index 8d4a44e6f8dd..e45303093deb 100644
--- a/app-text/libgepub/metadata.xml
+++ b/app-text/libgepub/metadata.xml
@@ -8,4 +8,7 @@
+
+ GNOME/libgepub
+
diff --git a/app-text/libgxps/Manifest b/app-text/libgxps/Manifest
index 42d9df3f7e9b..1dee620404dc 100644
--- a/app-text/libgxps/Manifest
+++ b/app-text/libgxps/Manifest
@@ -1,3 +1,3 @@
DIST libgxps-0.3.2.tar.xz 79956 BLAKE2B 4e41361a90fe24816aff33e90dc1084d0c1c799a4c9368364e73d9a5df34a45be75bb9906ee272cd1956b3631894d4be63070cce57983e2401dc1496f08c3e33 SHA512 d3d56e4906477b68d088bf83bde666f9ea8bf383add592772aad53dd571e727f1bc0410dd020e12212ede5ff8e26cb46150a9860a6f7af29c4d195f03e946fe9
EBUILD libgxps-0.3.2-r1.ebuild 1256 BLAKE2B d548f16f6a90319a3db686a935982a51042d49fa6e28f640d35ea0b6921785b945f0d0150ad71e857bf278e093f2f0b351b4adc3941f28a3bd409f9210d1d1cf SHA512 e8a7c5bd2b599fab55fa089a57214c4688a3d9c53b4e92aecf48bbde6df7555803f3db16071784768a9ecfbb85c578a3827e8d878b901e2303783d914bfa9e82
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 348 BLAKE2B eb0e9351af58c8388b0e8f7f04f055acee196d41bcd3db80cf52e783c1226429de3ced9a2060d15e853f511ad4d1b2d40c919def3da8de34f1d4385b52fd2f1d SHA512 1dc5d52bc4ff9b5a943aa51a7617899e26316bac94dfbd21d8ed19ddf33829affbb751f7dd9427e950b1d5161d7ad058b29a20eecb5c49bcca1d224401fd319a
diff --git a/app-text/libgxps/metadata.xml b/app-text/libgxps/metadata.xml
index 7b343b06be8a..d3a4eae54712 100644
--- a/app-text/libgxps/metadata.xml
+++ b/app-text/libgxps/metadata.xml
@@ -1,8 +1,11 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+ GNOME/libgxps
+
diff --git a/app-text/pdftk/Manifest b/app-text/pdftk/Manifest
index 10cd2d8d8477..2ea1e506161d 100644
--- a/app-text/pdftk/Manifest
+++ b/app-text/pdftk/Manifest
@@ -1,6 +1,4 @@
-DIST pdftk-v3.3.2.tar.gz 2343475 BLAKE2B cfa3cac4b78695d757e9cd3ba02f2a3e304343c481a44b0b6165e239d90e5ef72be3385faa1a72cd36194844f441fd1e93194e8d815807d2d0b364d0421553d2 SHA512 44056737e3b9b3cb988f46e96a0f3ec13193cfc662946f6def93add0ed56608fc026181254165440f1172e9fdda00771c3c018c20bf20ce87dad322fc1394893
DIST pdftk-v3.3.3.tar.gz 2380289 BLAKE2B b370777f5b87706ed811e424214db23b5622ef4e2420fe00c7e5e7d03fb51314589e7a1588d911c0734c075612adab9af17a1ad4ddcaac7a5dfc407c1aa28392 SHA512 2fd8dce8787856955984d6396ccb9a57d4e7a255cd74f10b31a7d87c84fac80143c0067d76bf6d8c0ec1a55dfb7d1e90f4898706e8ae26ccdf657b38d88e6cd6
-EBUILD pdftk-3.3.2-r1.ebuild 1893 BLAKE2B ca3c168e1a446049c2430e71ec61530141e1a6a310a464efec1fe49a20a6fb048fcebbb2efe81e4593865dc7de97807ef34a2b3e9b0e8afa6246fcf49924879a SHA512 91a7dec0d586ee3863a936ca46bd54167bc875343dfe0caf3c4d7725b0c78b6ab846e0bf2cc8e41986b3f240f7ef1c9e056eb55e525ce81ffb5bb866a53c5d4a
EBUILD pdftk-3.3.3.ebuild 1926 BLAKE2B 6ba722118bc28b42436039d270844002fa75aad0bb927b22fefa683818a35b7dffc0c55d31fe23cb442cdf06085576d2ab743a0180f0d41e289c00a8dae41369 SHA512 4abc5b436f94a182b8a5d5c14377fe3fc314ec6c04845030b367596fa92328104543128c58134ca8baf6552e514f3e7676296f1786fc4cf96a2a924c0dd576c3
EBUILD pdftk-9999.ebuild 906 BLAKE2B bbc5a168431ff4f4f8a51ee581c1dde06c3044212be071360168a7f192cf7f257fa3b0bf966cc66532763b3cbe5ac74fca56de276f8afbf17cfe49fa7a837a5a SHA512 312c2f2bfb40abc41c2b67f96ecb54b1cdaeeb083dffb2d395e5fb757e56b7b1d128850f64c6427a4066734a2cf33d29ebbf3841497cbc8a106edb1c305de55a
MISC metadata.xml 349 BLAKE2B 3fd6e82540ef8da6c46195a90af4638d914e5f3f6a1e6f3e3dbf0bfb940f23ed7b26578185219ef1fd00f069bb38a308056a39edea7661e263ac523c3bd40a2e SHA512 364f75cc6a80de2e1d517b094c1073fab7fc10738182d1fb37f0723fdcfc5238704f905a0f6ec8e373e1a91f2a7ad0990891beb26f94010eab13e8f688d230ad
diff --git a/app-text/pdftk/pdftk-3.3.2-r1.ebuild b/app-text/pdftk/pdftk-3.3.2-r1.ebuild
deleted file mode 100644
index 5f977f542e10..000000000000
--- a/app-text/pdftk/pdftk-3.3.2-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.gitlab.pdftk-java:pdftk-java:3.3.2"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A port of pdftk into java"
-HOMEPAGE="https://gitlab.com/pdftk-java/pdftk"
-SRC_URI="https://gitlab.com/pdftk-java/pdftk/-/archive/v${PV}/pdftk-v${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-CP_DEPEND="
- dev-java/bcprov:0
- dev-java/commons-lang:3.6
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? com.github.stefanbirkner:system-rules:1.19.0 -> !!!groupId-not-found!!!
-# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
-
-DEPEND="
- >=virtual/jdk-1.8:*
- ${CP_DEPEND}
- test? (
- app-text/poppler[cairo]
- dev-java/system-rules:0
- )
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CP_DEPEND}"
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-JAVA_LAUNCHER_FILENAME="${PN}"
-JAVA_MAIN_CLASS="com.gitlab.pdftk_java.pdftk"
-JAVA_SRC_DIR="java"
-JAVA_RESOURCE_DIRS="resources/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,system-rules"
-JAVA_TEST_SRC_DIR="test"
-
-src_prepare() {
- default
- mkdir resources || die
- cp -r {,resources/}java || die
- rm -r resources/java/com/gitlab/pdftk_java/com/lowagie/text/pdf/codec || die
- find resources/java -type f \( -name '*.java' -o -name '*.sh' \) -exec rm -rf {} + || die
-}
-
-src_test() {
- # some tests seem to need special treatment
- einfo "Runnig first test"
- JAVA_TEST_RUN_ONLY=(
- com.gitlab.pdftk_java.CatTest
- com.gitlab.pdftk_java.DataTest
- com.gitlab.pdftk_java.FormTest
- com.gitlab.pdftk_java.MultipleTest
- )
- java-pkg-simple_src_test
- einfo "Running second test"
- JAVA_TEST_RUN_ONLY=()
- JAVA_TEST_EXCLUDES=(
- com.gitlab.pdftk_java.CatTest
- com.gitlab.pdftk_java.DataTest
- com.gitlab.pdftk_java.FormTest
- com.gitlab.pdftk_java.MultipleTest
- )
- java-pkg-simple_src_test
-}
diff --git a/app-text/sdcv/Manifest b/app-text/sdcv/Manifest
index d7c7e4b80d87..ee60c2dbc006 100644
--- a/app-text/sdcv/Manifest
+++ b/app-text/sdcv/Manifest
@@ -2,5 +2,7 @@ AUX sdcv-0.5.3-t_list.patch 592 BLAKE2B 7f1618750a8d9c452f8db257a2b4791b803f45f1
AUX sdcv-synonyms-bin-search.patch 3409 BLAKE2B e40f32a2e0e401ae5b996992fa227ef70a439f928d762285094237871b7dded242928bab8206a146acf1abf716cdbcaa8a8d0ed5a430ec4dff5cae3a3a014b34 SHA512 bf4cf297abed05f4052cbff8decac2069a52657b3cfc21435e72731536ab9605ddde9053fa8b39d9a2f1dc67416126b1b10a1c31cabca37a6fb31d2272ba5e13
AUX sdcv-t_interactive.patch 324 BLAKE2B ecdb0d89c4a26050927272f244e43b28e945e3ef5cb93167eaea7c09912e504af2061ec34c2b5f5a32665c784093e2d35ed92e10a00824b619da71e53049e5dc SHA512 9067330c6fa95910b5dd67716c9bc378d29a9ccc5d60c1eb0c1aca12e58478ea381b91c5122c1951bd2f4c9e8b629243ea885bdbbc87a2f88174340919f5cf8d
DIST sdcv-0.5.3.tar.gz 62105 BLAKE2B 1424510cff2fa355d17884a31f8136f4c8a7bde071f387dd8a69b1d2d6b9c8e52869cd602b27b9966725370cf128fb62b8628e735f1faa92b78f75215462804f SHA512 73a305baad74d0584912e115d3de7395c8e88745fb69b4e5f1a345061629b0d4e05898bd589e96ce07948d52ba7c508ec4ab77862c8fadca5a2f19c5244e1442
+DIST sdcv-0.5.4.tar.gz 66706 BLAKE2B 9cb481f497483b502bec18765b9cbc31e8dd278e30ebd29005158a724669e171181a82c837b63016b9e88a84973831587d2b137bbbdb2290a89a73d3f0917f81 SHA512 6bae3a2c0f37ed9380f54715626efeea0df75d2525baa583c0915bba4d082d9ece40ee799a1e1bb5d36b7ccebace853653b6fab57d472a432b910f690235ee21
EBUILD sdcv-0.5.3.ebuild 1599 BLAKE2B d1b997b6d9b39686690b1cecf6f51a79144e90d3a6f398a84c720071b99e5f707f286b58c029dd6d452632f9408aa156aefb5dbae5a9671532d5beb53222b5d8 SHA512 2ee3c48aff47225c46f9767d22c671db627a939168d20d1ab462266da12712b0c04933fda126479541811c78923d461cc48ec81d8a237ffa37a7da02e392a6a5
+EBUILD sdcv-0.5.4.ebuild 1554 BLAKE2B 0283b15a20ead0855b0b300c8577985423d4aabe6131954ca60de10355588a207a485d234b3d740e3d355e4e60109efb96d3df291de6dd17dba193cbb6292b59 SHA512 9c15ee609b8efdd06ec42b1bf824dc7c1a2c582e633868754c1da872a137f5793fa3848ecdb97d5554aefc7902a7a4173348434826f75f3c4c02d4271c8450e5
MISC metadata.xml 449 BLAKE2B 3a4834d7d93e7b98e85a6ef09ae438ad9623eadcfbe3a0d50465b7cb1e9417bd0e4c8d4c005f45c9fb759926a35b566d3763b19311d3bb0fbcfdea9b147598c4 SHA512 b00e28f9c0c46e3068f53f98453dd351b3b7a305acd0aa68b286bd4e73ddc94bf4e7f16ec93a5945e05fc6dead340755d5949daa49fb878a80b1f18aa95f9b21
diff --git a/app-text/sdcv/sdcv-0.5.4.ebuild b/app-text/sdcv/sdcv-0.5.4.ebuild
new file mode 100644
index 000000000000..e345ee7b990d
--- /dev/null
+++ b/app-text/sdcv/sdcv-0.5.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="cs fr ru sk uk zh_CN zh_TW"
+inherit cmake plocale
+
+DESCRIPTION="Console version of Stardict program"
+HOMEPAGE="https://dushistov.github.io/sdcv/"
+SRC_URI="https://github.com/Dushistov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="darkterm nls readline test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/glib-2.36
+ sys-libs/zlib
+ readline? ( sys-libs/readline:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ nls? ( >=sys-devel/gettext-0.14.1 )
+ test? ( app-misc/jq )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.5.3-t_list.patch"
+ "${FILESDIR}/${PN}-t_interactive.patch"
+)
+
+src_prepare() {
+ if use darkterm; then
+ sed -i 's/;34m/;36m/' src/libwrapper.cpp || die
+ fi
+
+ rm_loc() {
+ rm "po/${1}.po" || die
+ }
+ plocale_for_each_disabled_locale rm_loc
+
+ # do not install locale-specific man pages unless asked to
+ if ! has uk ${LINGUAS-uk}; then
+ sed -ni '/share\/man\/uk/!p' CMakeLists.txt || die
+ fi
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_NLS="$(usex nls)"
+ -DWITH_READLINE="$(usex readline)"
+ -DBUILD_TESTS="$(usex test ON OFF)"
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+ use nls && cmake_src_compile lang
+}
+
+src_install() {
+ # with USE=nls, but empty intersection of LINGUAS and list of
+ # supported translations, this directory is required, see bug 583386
+ mkdir -p "${BUILD_DIR}/locale"
+ cmake_src_install
+ dodoc doc/DICTFILE_FORMAT
+}
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index fb5b3a952d07..3c9320e447e5 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -1,11 +1,5 @@
-DIST xapian-omega-1.4.17.tar.xz 547372 BLAKE2B d164ee2f96d395e2a45919aea821d1bae9b028b64389b4a6e6f1179c0e1c2a92983a3fe7a71f68fe11e04eb61e9f011c21f2edf5660f9feedccd41de8ed2f445 SHA512 0388714ae307044b486e92eacac2d8c09c334e1b77be6cc2c36f8c0c679b4fee660c9b12074e9a278e2981b4a5b4a607d068a5d16c852bef719245bb70b7ce7c
-DIST xapian-omega-1.4.18.tar.xz 549892 BLAKE2B 440f7ac93acca5803c80d905a90db854f36a5fb1e486d5178c25db0490bc01812f2173feb8abb97a2e399449950524db7b557b303c671d1e9a50f062f332008a SHA512 35da36bdaa6997353554604db5ced3f3a05d0862ce5cf357fae639ca88a65ea83bf0be039629e6aedd67f8cb369a7eaeba7f279980c9e2f585083c737c61ea43
DIST xapian-omega-1.4.19.tar.xz 553680 BLAKE2B 1008376d2ba6d72d3cc267ee3bda78a1d37491d706417010e0f4ca7dddf78ddd3d9ad07108874eabfffd0280016ce1fad49c86ee89eed9b37ae571586f838c9b SHA512 82b682bc9d244256afffc2ab1b12b0f577184296a979dc42b2865b689c6d46eca6b838b95a5d040dc228de0c2e2261e81279e0a748eaff2d018732ce4bc07fae
-DIST xapian-omega-1.4.20.tar.xz 563324 BLAKE2B 3836cc1f219f228edbd910dd92eb5bf7f91c6e0e5a1be2fad271dc9246ef0e5dd68d99d48f15c8ac9c449112d492e3becd501413a8c190d0b611d2506f8d82cb SHA512 026ca234d072da39a29d47b5b53033ec7677d51f93a6fedffb2a57ff5b788cc08d94d1dc43ff8c0062639470b8fe3150781008e4b50abd3ec5526b2b98a3a676
DIST xapian-omega-1.4.21.tar.xz 568440 BLAKE2B 445152c23f58471402d8017906083123c0a0e55eb8feed8908dae46680148471a65c51ef146c693cbbb807ce7a70d6589c0a77c2508c39417b95f292d5e8b9f1 SHA512 a313725084c3c336655a3beaa2c1e6c9186027bf6c90f0c5261f748a08e1e8d1ef9d43b0c6bad5bbd5a5af9d1f3db49b915435e5e815f9e97d452590522e85ec
-EBUILD xapian-omega-1.4.17.ebuild 1155 BLAKE2B 94dac57941897f814698abc23b3f6dab6d474ba32c287149ad0ec0fa60a2b9f7267c8a6f54461b6806ff80feeafaaf22ae2d9eaa1389c6c2e7e42a2b3608b647 SHA512 89fdd79a01417932e68eed66b129b6fd70180c11d135155a40797e5fd8a86e769cc665f69702b3ed1e599cfac2edd07b40b0ef71f329723812f6f456a5272b95
-EBUILD xapian-omega-1.4.18.ebuild 1163 BLAKE2B dae372708867c009c83bc637ad3e1bcab78ebd8337890eae447236367109096f1bdb96e70ac9ed80b0b09adb37358d763d2db08f5aff37576b810f23f7429a52 SHA512 dfa45c4f78539ea8f1e485f3c0381645f44c95cf9ff10df293d8b1244b0a3b64b865c98fb5323db6594389e1550ec3338b711de9eb67198f854a57d7bac0ed0f
-EBUILD xapian-omega-1.4.19.ebuild 1185 BLAKE2B 654cfa4db30dd554cea03b391bfb26ec39b5b50f46d1c6aafb79e4f429165f7fc760226e0353a294ef78e9999b4c96e92a7e7f31275ffa67539d4c4dcdb4b6b9 SHA512 6766388cb1bd412e1befbfff41574a77e1f546b19873de81e0cc1b93e0cdf5b28936a077ca113e7ac119040f256ac53f93d5969b91ef53130f41dd9d1b7b4eeb
-EBUILD xapian-omega-1.4.20.ebuild 1189 BLAKE2B 903109b97d7bdf608a4919f51e4ebe983dd91ee1f147a340dd522206f4e10ce0b232888a8b2b166f08ce38e94297e480015e19cc5e2e939d98f5cc8ae5146673 SHA512 eea182953545f5d24fdb6d09f2c8084c6ebc3eb9fa1f57e55ccfade81efd15a2df5850eac475531cc7f99673ab683e3cfba9b418f19055faeb38933ea76f7156
-EBUILD xapian-omega-1.4.21.ebuild 1189 BLAKE2B 903109b97d7bdf608a4919f51e4ebe983dd91ee1f147a340dd522206f4e10ce0b232888a8b2b166f08ce38e94297e480015e19cc5e2e939d98f5cc8ae5146673 SHA512 eea182953545f5d24fdb6d09f2c8084c6ebc3eb9fa1f57e55ccfade81efd15a2df5850eac475531cc7f99673ab683e3cfba9b418f19055faeb38933ea76f7156
+EBUILD xapian-omega-1.4.19.ebuild 1183 BLAKE2B 860088e7f9d5818b0de08d8aa5d5e1b7c83b98ea892dbf579934c069bd275f6580651afe3ed7f280deaa66e76d8a105be8b001b7d5d968ed6e15a366063c209c SHA512 8abda4b0e180124d2f6c514d800dfaf005f1873555609479d72588ce3100bd711be9b8224fb61951ca3224c81d9a26b4476d771a0fd6b443a996570db6d68c12
+EBUILD xapian-omega-1.4.21.ebuild 1185 BLAKE2B ebcc315601beab32dc7051543a98610473a04e81bdba5e82d44189049700d2b890f6b6e8ee2d3831bc7cb1e6bfa47d0f7c493d102aff09324e7f4dc1b134965a SHA512 9915145ed02528276f97fb31907bb733c90b8a8a1f2c9e769d06af509702f5e4c18286b517196e6d5980047c7c5d9b5a51087d1f7966069334e13c1b0998fa55
MISC metadata.xml 253 BLAKE2B abd5250029676d23201d38d764a87f155a72fdb12c27eb98faea12eb441fd986c1cf2f230265e7e7d257e5dcc81b6710ec90ebf8dbc3a6597a04c4fff95eb771 SHA512 96c2922337805fd36723b0f847b2b15365e7207a21d57f6c6ab7e3cf8ca089b781635eaaf3ef01cbe61c34ee8b3f4c1c6234242db390ccc3c3bf0b1ab660b467
diff --git a/app-text/xapian-omega/xapian-omega-1.4.17.ebuild b/app-text/xapian-omega/xapian-omega-1.4.17.ebuild
deleted file mode 100644
index 51e7f7c7a19d..000000000000
--- a/app-text/xapian-omega/xapian-omega-1.4.17.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="https://xapian.org/"
-S="${WORKDIR}/xapian-omega-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="dev-libs/xapian:0/30
- dev-lang/perl
- dev-libs/libpcre
- sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install() {
- emake DESTDIR="${D}" install
-
- # Protect /etc/omega.conf
- echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
- doenvd "${T}"/20xapian-omega
- dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-
- # Directory containing Xapian databases:
- keepdir /var/lib/omega/data
-
- # Directory containing OmegaScript templates:
- keepdir /var/lib/omega/templates
- mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
-
- # Directory to write Omega logs to:
- keepdir /var/log/omega
-
- # Directory containing any cdb files for the $lookup OmegaScript command:
- keepdir /var/lib/omega/cdb
-}
diff --git a/app-text/xapian-omega/xapian-omega-1.4.18.ebuild b/app-text/xapian-omega/xapian-omega-1.4.18.ebuild
deleted file mode 100644
index 83d47defb376..000000000000
--- a/app-text/xapian-omega/xapian-omega-1.4.18.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="https://xapian.org/"
-S="${WORKDIR}/xapian-omega-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="~dev-libs/xapian-1.4.18:0/30
- dev-lang/perl
- dev-libs/libpcre
- sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install() {
- emake DESTDIR="${D}" install
-
- # Protect /etc/omega.conf
- echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
- doenvd "${T}"/20xapian-omega
- dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-
- # Directory containing Xapian databases:
- keepdir /var/lib/omega/data
-
- # Directory containing OmegaScript templates:
- keepdir /var/lib/omega/templates
- mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
-
- # Directory to write Omega logs to:
- keepdir /var/log/omega
-
- # Directory containing any cdb files for the $lookup OmegaScript command:
- keepdir /var/lib/omega/cdb
-}
diff --git a/app-text/xapian-omega/xapian-omega-1.4.19.ebuild b/app-text/xapian-omega/xapian-omega-1.4.19.ebuild
index a4f6177030f8..4ab0cfef4675 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.19.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.19.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/xapian-omega-${PV}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
DEPEND="~dev-libs/xapian-${PV}:0/30
diff --git a/app-text/xapian-omega/xapian-omega-1.4.20.ebuild b/app-text/xapian-omega/xapian-omega-1.4.20.ebuild
deleted file mode 100644
index 91ff25791e25..000000000000
--- a/app-text/xapian-omega/xapian-omega-1.4.20.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="https://xapian.org/"
-S="${WORKDIR}/xapian-omega-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="~dev-libs/xapian-${PV}:0/30
- dev-lang/perl
- dev-libs/libpcre
- sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="${EPREFIX}" install
-
- # Protect /etc/omega.conf
- echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
- doenvd "${T}"/20xapian-omega
- dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-
- # Directory containing Xapian databases:
- keepdir /var/lib/omega/data
-
- # Directory containing OmegaScript templates:
- keepdir /var/lib/omega/templates
- mv "${S}"/templates/* "${ED}"/var/lib/omega/templates || die
-
- # Directory to write Omega logs to:
- keepdir /var/log/omega
-
- # Directory containing any cdb files for the $lookup OmegaScript command:
- keepdir /var/lib/omega/cdb
-}
diff --git a/app-text/xapian-omega/xapian-omega-1.4.21.ebuild b/app-text/xapian-omega/xapian-omega-1.4.21.ebuild
index 91ff25791e25..e56c0e7e5905 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.21.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.21.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/xapian-omega-${PV}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86"
IUSE=""
DEPEND="~dev-libs/xapian-${PV}:0/30
diff --git a/app-text/xml2rfc/Manifest b/app-text/xml2rfc/Manifest
new file mode 100644
index 000000000000..48b845ae317a
--- /dev/null
+++ b/app-text/xml2rfc/Manifest
@@ -0,0 +1,4 @@
+AUX xml2rfc-Remove-broken-test.patch 3455 BLAKE2B a5faf688b52a7dc34a99e096a56433103e01f28f8c4b4cf75b4816683b1e7fcd60131d2170f5fdf65fc1c4621099694de682e5b017d6d045bc795bf3f8ecbd31 SHA512 9f54ef323f7f89f89b847fc00731115d2ee8302b7352c43549176cbdcafd79edd8a91dcf2e329e690833bb19f0f6ed0fd8ca5ee22e92299df54b505f2af0aaa7
+DIST xml2rfc-3.15.2.gh.tar.gz 2849091 BLAKE2B e792d07a2c8123dc32f4c2cfe794420f98db13da1812a4a7e82a4f2a2e2e70fa0e6b7385e189e70eba47c9be7e0ac281d3858437103b828ea8dbaaf8cef73b87 SHA512 5953ae40ad479b0aa6ab90f08f235ceddfa9c7e1edd868ee43bfd261f4c4d0fdfbbe052ff8a3274c39d283efc1105a0be3b4578fa372269f3274a72acdc950e8
+EBUILD xml2rfc-3.15.2.ebuild 1448 BLAKE2B 9bae39e448d758f2cc3e945a934523adff76f241cce9b6805f21752075251ed439e020fa3590d7cd557be10b1e0b6cfbbc6d187239a370c2c7e1506e50998dd0 SHA512 14fe82df07f7e4ec7138a0f5a071af148963934df62ebebdc9bdb1d119b3d47f318d5422e22b9db89136cae3be2af9ffa657d492ee7f5816bef161639cf8749b
+MISC metadata.xml 374 BLAKE2B 3514fd485c7ca895f1b9f4a809ed97bb55396c1abd6a52ae6602e61b836fac3a0fbcbeec7dcb0789a6510cabb9920a33bfae4dfeb9bfba86ad9d02fbf917a720 SHA512 0e4697e08615993939416355b5d112f5f6ab1aad0bc74a3e33f6d3e7d0178ddf9b5fba70aa50fc6babed1ca27d89d1b0bff53223c1a55e636e82b6c617860cb9
diff --git a/app-text/xml2rfc/files/xml2rfc-Remove-broken-test.patch b/app-text/xml2rfc/files/xml2rfc-Remove-broken-test.patch
new file mode 100644
index 000000000000..d7d027962c24
--- /dev/null
+++ b/app-text/xml2rfc/files/xml2rfc-Remove-broken-test.patch
@@ -0,0 +1,79 @@
+From ed27e2983c27065bd88ac82cd26a5b9128544b45 Mon Sep 17 00:00:00 2001
+From: Florian Schmaus
+Date: Fri, 28 Oct 2022 20:18:10 +0200
+Subject: [PATCH] Remove broken test
+
+--- a/test.py
++++ b/test.py
+@@ -466,71 +466,6 @@ class WriterRfcTest(WriterRootTest):
+ return self.status_test()
+
+
+-class PdfWriterTests(unittest.TestCase):
+- elements_root = None
+- elements_pdfxml = None
+-
+- @classmethod
+- def setUpClass(cls) -> None:
+- # Putting this in setUpClass() allows this module to be imported even if this
+- # procedure will fail. This improves some error messages and makes debugging
+- # a little bit easier. The setUpClass() method is run by unittest during init.
+- # This happens only once, avoiding repeated execution of slow operations.
+- def _pdfwriter(path):
+- """ Parse a minimal RFC tree and instantiate a writer """
+- parser = xml2rfc.XmlRfcParser(path, quiet=True, **options_for_xmlrfcparser)
+- xmlrfc = parser.parse()
+- writer = xml2rfc.writers.pdf.PdfWriter(xmlrfc, quiet=True, )
+- return writer
+-
+- elements_writer = _pdfwriter('tests/input/elements.xml')
+- try:
+- elements_pdfdoc = elements_writer.pdf() # has side effects on .root
+- except Exception as e:
+- print(e)
+- raise
+- cls.pdf_writer = elements_writer
+- cls.elements_root = elements_writer.root
+- cls.elements_pdfxml = xmldoc(None, bytes=elements_pdfdoc)
+-
+- def setUp(self):
+- xml2rfc.log.quiet = True
+- self.pdfxml = copy.deepcopy(self.elements_pdfxml)
+- self.root = copy.deepcopy(self.elements_root)
+-
+- def test_text_content(self):
+- def norm(t):
+- return re.sub(r'\s+', ' ', t).strip()
+- #
+- text = norm('\n'.join( p.text for p in self.pdfxml.xpath('.//Page/text') ))
+- for e in self.root.xpath('./middle//*'):
+- if e.text and e.text.strip() and e.tag not in xml2rfc.util.unicode.unicode_content_tags and not xml2rfc.util.unicode.is_svg(e):
+- t = norm(e.text.split(None, 1)[0])
+- self.assertIn(t, text)
+-
+- def test_included_fonts(self):
+- if xml2rfc.HAVE_WEASYPRINT and xml2rfc.HAVE_PANGO:
+- font_families = set([ f.text for f in self.pdfxml.xpath('.//FontFamily') ])
+- for script in self.root.get('scripts').split(','):
+- family = xml2rfc.util.fonts.get_noto_serif_family_for_script(script)
+- self.assertIn(family, font_families, 'Missing font match for %s' % script)
+-
+- def test_flatten_unicode_spans(self):
+- input_html = 'foobar
'
+- output_html = self.pdf_writer.flatten_unicode_spans(input_html)
+- self.assertEqual(output_html, 'foobar
')
+-
+- def test_get_serif_fonts(self):
+- fonts = self.pdf_writer.get_serif_fonts()
+- for font in ['Noto Serif', 'Noto Sans Cherokee', 'Noto Serif CJK SC', 'Noto Serif Hebrew']:
+- self.assertIn(font, fonts)
+-
+- def test_get_mono_fonts(self):
+- fonts = self.pdf_writer.get_mono_fonts()
+- for font in ['Roboto Mono', 'Noto Sans Cherokee', 'Noto Serif CJK SC', 'Noto Serif Hebrew']:
+- self.assertIn(font, fonts)
+-
+-
+ class HtmlWriterTest(unittest.TestCase):
+ '''HtmlWriter tests'''
+
diff --git a/app-text/xml2rfc/metadata.xml b/app-text/xml2rfc/metadata.xml
new file mode 100644
index 000000000000..53c1b948fa53
--- /dev/null
+++ b/app-text/xml2rfc/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ Florian Schmaus
+ flow@gentoo.org
+
+
+ xml2rfc
+ ietf-tools/xml2rfc
+
+
diff --git a/app-text/xml2rfc/xml2rfc-3.15.2.ebuild b/app-text/xml2rfc/xml2rfc-3.15.2.ebuild
new file mode 100644
index 000000000000..fb60768a8577
--- /dev/null
+++ b/app-text/xml2rfc/xml2rfc-3.15.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Generates RFCs and IETF drafts from document source in XML"
+HOMEPAGE="https://ietf-tools.github.io/xml2rfc/ https://github.com/ietf-tools/xml2rfc"
+SRC_URI="https://github.com/ietf-tools/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+RESTRICT="!test? ( test )"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+ test? (
+ dev-python/PyPDF2[${PYTHON_USEDEP}]
+ dev-python/decorator[${PYTHON_USEDEP}]
+ dev-python/dict2xml[${PYTHON_USEDEP}]
+ dev-python/weasyprint[${PYTHON_USEDEP}]
+ media-fonts/noto[cjk]
+ )
+"
+
+RDEPEND="
+ dev-python/appdirs[${PYTHON_USEDEP}]
+ dev-python/ConfigArgParse[${PYTHON_USEDEP}]
+ dev-python/intervaltree[${PYTHON_USEDEP}]
+ dev-python/google-i18n-address[${PYTHON_USEDEP}]
+ >=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
+ >=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ >=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}]
+ dev-python/pycountry[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+ "${FILESDIR}/xml2rfc-Remove-broken-test.patch"
+)
+
+distutils_enable_tests setup.py
+
+#src_test() {
+ # https://github.com/ietf-tools/xml2rfc/issues/561
+# emake tests-no-network
+#}
diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest
index ef726ab82c2b..df8d4dcc7bd4 100644
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@@ -3,6 +3,5 @@ AUX xmlto-0.0.28-allow-links.patch 535 BLAKE2B 71412bff616c9499ed6cf045a5d7ea1e6
AUX xmlto-0.0.28-dont-hardcode-paths.patch 845 BLAKE2B 37618989b609bc7dd2d94d22fad0562d6e0580541d8f6ec2a222316da89a6744a16cac9b4cd446ef80f58cf415f4a784aefedf53349ea85e98cf33000b7799b6 SHA512 9947787a1c3ebbd0a73e271ebab3dfcd01b7aad3bcaa627e7a236947bc7edbc23696c38f96aae62785013e2ac8c5171ce6f386f655676a4cde8d820f49d5df7d
AUX xmlto-0.0.28-fix-warnings.patch 3085 BLAKE2B 2c9e6323dda3fed36bdd999e10d76b8cfcc3c2bef3893ec044588c22519609889101d65f656f8ebb7b70a2819d009fb81d1f34ad2659b1398d7d3c7b9d565ffc SHA512 b16699d6e592c74ca7400f1a4a0ff6b158eb44cb6e77b73bebab03e10535f44890241bfd53d16382266da4102a42c4db7905481115324a76e667d1b91ec61fe1
DIST xmlto-0.0.28.tar.bz2 127921 BLAKE2B 12ef3e2e1436c330e7b003d08f4a4d4032d70255777956949eb8b47b6f5466e7c158b0f85dc87069c1e379603cac0b01c88589f98ca1ef9e862f0aef31169f6d SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1
-EBUILD xmlto-0.0.28-r8.ebuild 1495 BLAKE2B fb48fd354d2837e842b3400014f768119d962345f9dd37cba16ef65517d8bf3c9933ed306d558f408809e513d171727383f7a54c207edd773dd46a15d4880fd9 SHA512 09a4b2c9467c8dc35301dd733207f82bc7f6ccdd9f764da50bfdba5de120ce66c388e181e709ae22e08164e5fdde79ea74aca8a95bf8658b6004e3bf1645022f
EBUILD xmlto-0.0.28-r9.ebuild 1588 BLAKE2B 08eb600ac325d39ca62f975064c01f5b95314203e3360fc7ede32e923f2fc1a6ec578d9616acb2691f454898531c9f397252fb8898f8708a2d54229883f2aa6a SHA512 024f784a10445fa2796449f5c27fdcd27724dca51a08e53255c817a9c40ee52bd35b81b07d0e012285b1c59c944904f62bd15758229361a030d3b49453ead373
MISC metadata.xml 324 BLAKE2B 3cabb2600d6843ebecec023a16fef87a40432202ff195a6130e57f97802d4c0ed2e82ffee506c65afe554291f05c64c7ae2fe524c708db7a9c6bf4a71c4c8710 SHA512 19ed2fabc04f96b1b61495e2fdba674ca4b4a9a1cee11b3cb13baec6d9e7fe0d82b653a0cbb523de3fcd4ed1ef18d8111686f8b618db9924674ee274ae5a21ed
diff --git a/app-text/xmlto/xmlto-0.0.28-r8.ebuild b/app-text/xmlto/xmlto-0.0.28-r8.ebuild
deleted file mode 100644
index dd8d9b968fc9..000000000000
--- a/app-text/xmlto/xmlto-0.0.28-r8.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Script for converting XML and DocBook documents to a variety of output formats"
-HOMEPAGE="https://pagure.io/xmlto"
-SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="latex text"
-
-RDEPEND="
- app-text/docbook-xsl-stylesheets
- app-text/docbook-xml-dtd:4.2
- dev-libs/libxslt
- || ( sys-apps/util-linux app-misc/getopt )
- text? ( || ( virtual/w3m www-client/elinks www-client/links www-client/lynx ) )
- latex? ( dev-texlive/texlive-formatsextra )
-"
-# We only depend on flex when we patch the input lexer.
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch
- "${FILESDIR}"/${PN}-0.0.28-allow-links.patch
- "${FILESDIR}"/${PN}-0.0.28-dont-hardcode-paths.patch
-)
-
-src_prepare() {
- default
-
- # fix symbol clash on Solaris
- if [[ ${CHOST} == *-solaris* ]] ; then
- sed -i -e 's/\(attrib\|val\)/XMLTO\1/g' xmlif/xmlif.l || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- # We don't want the script to detect /bin/sh if it is bash.
- export ac_cv_path_BASH="${BASH}"
- has_version sys-apps/util-linux || export GETOPT=getopt-long
-
- econf
-}
diff --git a/app-text/yelp-tools/Manifest b/app-text/yelp-tools/Manifest
index d32b1efa3886..9ce82a22f856 100644
--- a/app-text/yelp-tools/Manifest
+++ b/app-text/yelp-tools/Manifest
@@ -1,3 +1,3 @@
DIST yelp-tools-42.0.tar.xz 38788 BLAKE2B 9dc34f4b32c9e705f427bccad5ff3c2cd222a1391a780dde145ea894e1065fc873fd4ef020d1b7809b653c8237fbedb7f0b07d684d8d906b7af7a0fd8ebf79e4 SHA512 ff6168a33b2dedd12f7fb5d5aa6394a554b7ad8956cc7121e5f1a520f9fb20bd4cad93e22b5e8b2f8aa82ca5a1711a0634d8619c731e46730084e28f29725786
-EBUILD yelp-tools-42.0.ebuild 942 BLAKE2B 3dc8a1bfe0c5c1d121a0107381a2b9296d1cce570c71b76976c28165ee0e4ffd19b1405581eb4600b396cfc97fcd83474ae05a3472d62921481027a4faa1673b SHA512 9dacfce48e6b616c4ad87f95e527878f1d1183c897d0ec1deb572a6cfa791a1169b2a477ed4f7fc5b8c042aff7aefbba7a20faca98e7fd9e590fee297f8e834e
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+EBUILD yelp-tools-42.0.ebuild 942 BLAKE2B 278d2168f61a266497df7502b5d243f9ed5ae8d59a581c247a91124e370301aff7b28f826b5c7b78fbefa73d4af1cd100eeda2b7d05eb75f0bdde72d6a2b65ec SHA512 391128b9c1aa1a597ebd30852339f2c0b10feebab5f21dd0b00629dabb44046fb56c93696422fdf3ba02d5ac7b4cdd8e364b9d1f50f18b9a60579d769799936d
+MISC metadata.xml 351 BLAKE2B 855082b254e97a1ffe3ea35ce22c13e7ce4f48439a13d4bf247b838e80b58b784fdfb7974428d61c8ecf2289a73fd53414ffbf695ce7f78601cb3aaf83e6a162 SHA512 4ed64fb35de4e069dd55c0b4affd587507bbb47560b1e632d425c660fb3edc79d89a36003039558aba832344584e1467bd734c4079197322be282cb77957d880
diff --git a/app-text/yelp-tools/metadata.xml b/app-text/yelp-tools/metadata.xml
index 7b343b06be8a..ff91c5812f07 100644
--- a/app-text/yelp-tools/metadata.xml
+++ b/app-text/yelp-tools/metadata.xml
@@ -1,8 +1,11 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+ GNOME/yelp-tools
+
diff --git a/app-text/yelp-tools/yelp-tools-42.0.ebuild b/app-text/yelp-tools/yelp-tools-42.0.ebuild
index 7ef91ca39aa5..e39e783c10fe 100644
--- a/app-text/yelp-tools/yelp-tools-42.0.ebuild
+++ b/app-text/yelp-tools/yelp-tools-42.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit gnome2 meson python-single-r1
DESCRIPTION="Collection of tools for building and converting documentation"
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index 70101b0b6b60..ae125a4942ae 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -2,6 +2,6 @@ AUX zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch 719 BLAKE2B e8fee9b67dd4e3156
DIST zathura-pdf-mupdf-0.3.8.tar.gz 9198 BLAKE2B b873d3352d4f324d5dfceebe0ca1cd13e5e5b9bbedf89a5fdae553a2d2cf59ece455bbe931fc021310a7be3c765663ef73931016d48abaedaf2d3488f96d0866 SHA512 5742f22fc919af390a8a42f64640c36aaf1499a20d1c6603e70cc47b3f6634dafc94a31bfbb30c88524ac0c18c040f0fd6c63d236dbb556784cb17a9b0446374
DIST zathura-pdf-mupdf-0.3.9.tar.gz 9201 BLAKE2B a74621e6330889363e25875e25984d8f9d9250a654ddb628849a8750fc4bbbb730cb6707d1959d0d28189d99af6bc041e1806036737b3daaa739373e632e304d SHA512 12537ca4c579be6dfa4c94195eafea09e45a08207eb131ed806ab868a71d781dbe6fef5e4442f77bcc0a70921d44654d97d48a6f4bfdbe28e0bdb9fec67f69b1
EBUILD zathura-pdf-mupdf-0.3.8-r2.ebuild 783 BLAKE2B 87ad7d1eadc88026806ec9999bfc3486257362db0b3e0a6546c98f00b32dd89c8a699362c3085e822110fdd4b0645b3b968538917bbafd852eb69bcd49b01e2f SHA512 677fb3b5ced87f54d9d69367cba816f781bc08800f32219dea880e1cb767252401410b67c211908e815e3d54a2d3e7754d16d818439e9291bacbff9a182267a9
-EBUILD zathura-pdf-mupdf-0.3.9.ebuild 787 BLAKE2B 942b51d2a72ed0a3b26eb4f88deb4f1fc510c0a8551e563c6799cbcd653bca158fc1467f1bda0a768d78aa5464714ee15bfc308bbf70f95fa2cd0424118a1195 SHA512 253121b5df0ec0322f7393c748470d062f834df39560a14755a14ba79fe28ad60523717a117b6f4d774e62fde71b1712b813cdc059b61d2fa774544de60009c8
+EBUILD zathura-pdf-mupdf-0.3.9.ebuild 784 BLAKE2B cc9ff02db43aa1f51fff3ce73d51cb84e5070fae3fe130cf124da98191ca840c985b0b5ffd6fb48bfa7512b5fa9032043cef28fa0cc1470cb3c55e5945645cd4 SHA512 1877ff3986f1c4a507d6c8a68b6f31b159b42789bcb3bbdd65be56b287c8ad7cdfa344ef2a68652d72153255b5f4987b87e58aac1e5068e5d39b2675bcde1ff8
EBUILD zathura-pdf-mupdf-9999.ebuild 787 BLAKE2B 942b51d2a72ed0a3b26eb4f88deb4f1fc510c0a8551e563c6799cbcd653bca158fc1467f1bda0a768d78aa5464714ee15bfc308bbf70f95fa2cd0424118a1195 SHA512 253121b5df0ec0322f7393c748470d062f834df39560a14755a14ba79fe28ad60523717a117b6f4d774e62fde71b1712b813cdc059b61d2fa774544de60009c8
MISC metadata.xml 827 BLAKE2B 3260695042be5b2fa3df9337f1888467d43d79c210d466c9cad94c12f50400563e3c7a34aaa920d43160835fa90267c39a8266a927c184b60b86ab520a9deafc SHA512 1129c85640589275b1a973de6b5b61cfd1e54a294cb405e9e6b42e6b58bc92e3f82cfded1f6e7e8d49f2d81203f761a871085771c4eb0b2fe11cb1da190b3e5c
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.9.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.9.ebuild
index 5ca8fe3fc822..22828fa1fcc3 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.9.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.9.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
EGIT_BRANCH="develop"
else
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="amd64 arm x86"
SRC_URI="https://git.pwmt.org/pwmt/${PN}/-/archive/${PV}/${P}.tar.gz"
fi
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 0783fc53288a..8503ef37224b 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest
index 078d8d2b040c..77e7e7c940b8 100644
--- a/dev-cpp/abseil-cpp/Manifest
+++ b/dev-cpp/abseil-cpp/Manifest
@@ -1,7 +1,7 @@
-AUX abseil-cpp-20200923-arm_no_crypto.patch 1038 BLAKE2B 2443144b968f22e29503fb4a58ac45b623c104d298445b68b5ab34a5a08a5398a9b16cf6563e3127dfc4ba7ed211d53c2e1fb8f72fb120749065dce77fb67158 SHA512 5e2c192379d7190d97065973861d76e3680728a2e723c7cfb8b9ead4e02c94c3b12061c75f2f619cf1c9c217c3f29eaa36b59ff73e23417bf56f600a97128ff3
+AUX abseil-cpp-20200923-arm_no_crypto.patch 1040 BLAKE2B f46ebc05b370e8ecfdaf0a6b409fd08c2a384eb16224709802d7a9e84f038ae0ab51c4638297ed3abb9f6dded86833b710871d3f38d33de4843d5dfcdc149d03 SHA512 fea33008cdab6e229b074f6683f3f688a59d291038d89d96a62e91fee571cc885baf84b8a1435b8f757bb26a2a65b8383b49c874c9e472d229d14b259de874df
AUX abseil-cpp-20210324.1-glibc-2.34.patch 720 BLAKE2B d24511a6b929d8bc15fce316f46ce6a3f8686357f72d97f2ebc8365ac04cc93afbf801c24ad8a488a4cbefa615ddc3141ccd25890b005bfba8e53e45276ec664 SHA512 05e53e5175328c2907a346ed01163bf8d0c6d51ffb85c58aeed507ca10444fde29adc86dfd259f9cbaafa35aa6723f531fdf05749b6c1248f094ed672d74fa14
-AUX abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch 2439 BLAKE2B 7640ea553046a8935b173d2043dbf2cd0fc26c4918fed0387f8cfdb924a897dba6b25165d154a9bc351d44dd01b971cbbe2705745eaecc432beee32030fa66df SHA512 ab0461284e0e3a1e40a3bf727d52ca6a6fa77b1cb36565cd7466aaba8064522195f0e22217603f4ceb304eb75170418e3fcb5e3a114c58aab29f46a33ad1f99d
-AUX abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch 866 BLAKE2B 18c6ebc915080d4851a13763c30f9e3edc8224640546ac0b4cbc26671498bca2b69f55628ec889b00be76ba7a6246684c6273eaf00a967b96faa42c6882afa2b SHA512 b56cd0bd7accd243c0a8b0b759fb1e0c51e6167d8a9882513ed2b21760414b3f3dd329f5965f4c914b16f6d2a2ebe5c34b469401432e2914b5a10316f86a6be2
+AUX abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch 2138 BLAKE2B c52ca02f2cdfe8a843416011f171a1e957321e1a75f2e7f06aaf1591b2144731a6db0c2d65f400af041d25319d5fcce4cbbab75373260719633d82e63e96e665 SHA512 5a9f0a0289a2b7d808fe64cbd4e9bc02a78b50641314a510f66e90bb5f2bb3be9287f0892c93263a914ffa216916a0a154b2631f502b51564a90fb5294257711
+AUX abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch 741 BLAKE2B 22bc89e5b0edbcfcb4d4c7552e591d43742f399e6939b8dbf80c8c40e8ba46076265a374dd3d889a77ba9ab4ce747803aa031fe631898d9d90f3a6a30fb88023 SHA512 a4924d9e95c1ec8c1f31a1ead48063a7a6d6295bfa4dbe6ad3902c459e23973e75ec961eeb4ba6c17518cf48d7edeff315e65d0f5c6d3d6f07154127f370977b
AUX abseil-cpp-20211102.0-r2-gcc-13.patch 951 BLAKE2B ad2a13d2260d7cfdfe95b07f1582bbf5ce627d8d8bf1e32b70834611065359b95d17b198c2b0aef70ff353dc289903c70ee9be95d40ef38f75c1872f08987eb1 SHA512 73aae8c3c90d87da47a8a37b68721fa06f44abcf02e829fecdcc076999f420a513005e946662bfeb073cf19a06916b1b400b3f35811ddfbe9b0fde75b4d87a53
AUX abseil-cpp-20211102.0-r2-loong.patch 739 BLAKE2B a3082b6da75719f57287dfac5b67e70ced0ebdbf3e2682c273d7022b024a92fedc8d33c781bafe167675a6a1cd592dbaf915c4031e6dca6aca2513451717cdc8 SHA512 d77e896e145e71b96be32779adb12cbaeabb3a69e5e57a0f47fdf428baf3b6ea22484e9a02979bf15f839417b13e74d0629a6d7207ad0bfa4f44eb9e1eb82867
DIST abseil-cpp-20200923.3.tar.gz 1783980 BLAKE2B 66d46fd6aafe0bf0d3fccd8a4e0a72fb0545a405d9c92d36ffcb1cf791b6d0eb85fd55218f740ba34c05c7bc952ad1aeaa367963b1f540f03a4f510fd02cd6d5 SHA512 7d9e2bc001a397b983afe1e5ca4d779bd27d0d30fad7f44e564a675e228f2fc29c203ef89dd1b0ff4a1832c6d99ae7627c9103a0daa6cccb426472528109ef85
diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20200923-arm_no_crypto.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20200923-arm_no_crypto.patch
index 762476a10184..d9e9963f5bae 100644
--- a/dev-cpp/abseil-cpp/files/abseil-cpp-20200923-arm_no_crypto.patch
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20200923-arm_no_crypto.patch
@@ -5,8 +5,8 @@ extensions (by passing -DABSL_ARCH_ARM_NO_CRYPTO). This could
be done by the build system instead in future.
https://bugs.gentoo.org/778926
---- /absl/random/internal/randen_hwaes.cc
-+++ /absl/random/internal/randen_hwaes.cc
+--- a/absl/random/internal/randen_hwaes.cc
++++ b/absl/random/internal/randen_hwaes.cc
@@ -50,8 +50,11 @@
(defined(__ARM_NEON) && defined(__ARM_FEATURE_CRYPTO))
#define ABSL_RANDEN_HWAES_IMPL 1
diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch
index 45a9fc5406e8..0933c62660a6 100644
--- a/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch
@@ -25,13 +25,6 @@ Our Linux CI does this, but for some reason was never enabled on macOS
PiperOrigin-RevId: 425668638
GitOrigin-RevId: 121db1a08321eaa3006726cc32b459cf17880e35
Change-Id: Id51645df90b6a0808dd5b18eb636a10f798e24ea
----
- absl/container/internal/inlined_vector.h | 8 ++++----
- ci/macos_xcode_bazel.sh | 10 +++++++++-
- 2 files changed, 13 insertions(+), 5 deletions(-)
-
-diff --git a/absl/container/internal/inlined_vector.h b/absl/container/internal/inlined_vector.h
-index cd34a413a..2baf26f3e 100644
--- a/absl/container/internal/inlined_vector.h
+++ b/absl/container/internal/inlined_vector.h
@@ -925,8 +925,8 @@ auto Storage::Swap(Storage* other_storage_ptr) -> void {
diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch
index 59efc0f321e3..28347d489c17 100644
--- a/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch
@@ -1,5 +1,3 @@
-diff --git a/absl/strings/internal/string_constant.h b/absl/strings/internal/string_constant.h
-index a11336b..e1596b1 100644
--- a/absl/strings/internal/string_constant.h
+++ b/absl/strings/internal/string_constant.h
@@ -35,12 +35,18 @@ namespace strings_internal {
diff --git a/dev-cpp/atkmm/Manifest b/dev-cpp/atkmm/Manifest
index 355d340d6109..8a24c706fc8b 100644
--- a/dev-cpp/atkmm/Manifest
+++ b/dev-cpp/atkmm/Manifest
@@ -4,4 +4,4 @@ DIST atkmm-2.36.2.tar.xz 744596 BLAKE2B 2eee35605eee2e569eca1053f0c50449ce2a1cf4
EBUILD atkmm-2.28.2-r1.ebuild 892 BLAKE2B ec6b8ade343a33b1fadf0306a7b03808946208d25f4e5d182bf8a334352ebc8c6682feca19eab533b932ecb84585848c6f369e8682fcd7df913b81b9ce16a0de SHA512 b380c9678a83b1e70dbdfff3e10edb8005fb2f66deec5e7f74341cbf7ed94b93fbe1bb41fe57d74187a9a8cae5b8acc9e39fd2ea9ec27dafe3e6bbcc90477c62
EBUILD atkmm-2.28.3.ebuild 948 BLAKE2B 444725d914d2dbca70bea58433cc477573b191bc42577eacb2108754f79c082653e89e6c2f9e43136bb8df807560b08d672f4ea59a1120799e72f1d665c1277a SHA512 b3f1da55b30841a194b308b6f2573a4ad2c4a180b370fa997d670ffe6a0e0ee5999122bc455ab801ce3f5e4544fa4840dff64c2b3cee43f77c6794fb34616603
EBUILD atkmm-2.36.2-r1.ebuild 883 BLAKE2B 006a514a5417896bdae065b0f3ae2a939b8994b5df7917da8b6966ffc5939f790caba9c8435bc37f95643517ade8031931e62c53ab46b91e053b4dcfb5a1cd8c SHA512 0f77baf7286dd1b6ab4be4d09db0fce54af271632c36e26cc3295cea22ae20c11a56f4bdda291e5b47f692de37132c338ef08bd9aa256ac8d3569e315c4ab915
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 346 BLAKE2B 646d3c728888a3ee86d200f002a01e147bcbaae64fbc55f63e09bfeebfbc364b062160b2fcedae549f5e256fe2498b004e6cd42e501a58040cafde009efcc4bf SHA512 e755038a33f9933af455a04e88d1c468620461c6e959581fbe87ba278988e59f5adff6fbb099ff6d3fe2d672d57cb4d005e675842d97a78cb67b96a7bc98a6c1
diff --git a/dev-cpp/atkmm/metadata.xml b/dev-cpp/atkmm/metadata.xml
index 7b343b06be8a..73dadc014fdd 100644
--- a/dev-cpp/atkmm/metadata.xml
+++ b/dev-cpp/atkmm/metadata.xml
@@ -1,8 +1,11 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+ GNOME/atkmm
+
diff --git a/dev-cpp/cairomm/Manifest b/dev-cpp/cairomm/Manifest
index a33bb8588d3d..4e5f2eb03814 100644
--- a/dev-cpp/cairomm/Manifest
+++ b/dev-cpp/cairomm/Manifest
@@ -6,4 +6,4 @@ EBUILD cairomm-1.14.3-r1.ebuild 1060 BLAKE2B d385872c3d3e082f0d8087ff78198f12e60
EBUILD cairomm-1.14.4.ebuild 1245 BLAKE2B cd80d7759010d35b8c33fd3ebdc874ff1885da4265c191af5bd9f77298198cd24cbd29be65982aaef1cee343c9fa10f3329d45189bb6d934cc256819b734fcb8 SHA512 9bc8fe353e0f33f5e8144eca0850bbf5b8583c6b21cee64ac43485a13f3e28da9866aa427bb22b1cbce5dc8edfd6a0de7ef17c6575c91400cb80fe54fc8d5a97
EBUILD cairomm-1.16.1-r1.ebuild 1055 BLAKE2B 22b8ea78868caa14c653e7d802b068b63918a9c5b9eb7d17dd97fd122ee2d3a82851a880ea716a2e5d6014ffe0706a5ef8905f8f6a341f8b9b89572d301fee18 SHA512 7623cb576b56afff48ab1acd0504fd7dc01037e7c4c17c67a039c0dc1d745fa416c61931318b4f831a8222cba5df7c74e99c57895c4f81fd4c08e3db18c6f767
EBUILD cairomm-1.16.2.ebuild 1234 BLAKE2B 75ea58858040bad20ba48be805565f512ff179ab04e4ec4a96422fe716b6f5a660ddfd8fc2d323ed0c9171bc4da701ffc62411fa8382da052fedc0498cb0844b SHA512 f466d7577b5ce1fc4b116503d9cff311da09c96ef051f65dbb43e401bb525a6097c78a0edb3b036ccfcea2d94a79b23332b2fb64dd862d5befd15ad20fb7782d
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 354 BLAKE2B 89439085126a4fb94f11d8d498cf44b7024a82eb0296e7378f408a983f692bde88e1d9d4e53efdd2fa682524c12f441b2e30df64c600179ce07f488befa74cfc SHA512 2df4139278fd773753caf2030e0eff1c6d5e62fa509cb4196f3c2726a62395fc289b3439f762b677cc751a292302622658ccff73cdea100c77dcf2838637d06b
diff --git a/dev-cpp/cairomm/metadata.xml b/dev-cpp/cairomm/metadata.xml
index 7b343b06be8a..04715ff9071f 100644
--- a/dev-cpp/cairomm/metadata.xml
+++ b/dev-cpp/cairomm/metadata.xml
@@ -1,8 +1,11 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+ cairo/cairomm
+
diff --git a/dev-cpp/clucene/Manifest b/dev-cpp/clucene/Manifest
index ad2ab0ae7c2e..9b430c0b3fd9 100644
--- a/dev-cpp/clucene/Manifest
+++ b/dev-cpp/clucene/Manifest
@@ -1,5 +1,5 @@
AUX clucene-2.3.3.4-contrib.patch 1697 BLAKE2B 2aebc143ff0dafb2765cb3bd5d8e5183bdcfa7cb51a6109e957650412394796c7825c38dab9f1f9637c436b10714624dcbcfd3b6ab88dbfef9c5de9582e65ccc SHA512 0aa92635949089196e4e7c579e78761e8751987ef5036320a161a4aaa67da3c63756398c903419c76ea0fbdc8a949e871fcb65be98179a9853a24a5a4cacfde3
-AUX clucene-2.3.3.4-fix-clang.patch 2219 BLAKE2B 7572c05d9e2676eedb3aabc8030eea6b97a19af9f02eb1c336b40606105bc89800a8da8ea6f899ef550fa114776133fec962622ac3e337ca0f52fc0305c81bd3 SHA512 f3822c5d127b37fdb0a405a3fa0a2d2a168133da106a222de0311c2074aaacb7d9651a1be7ad7afda44da22cc2c8baa8d5db756aaaef5c344e12d52625e2c2e1
+AUX clucene-2.3.3.4-fix-clang.patch 1982 BLAKE2B 2b330b21715d29a1c825d16cb8309319af4267812a68dea4ff045c3a4aaf0e258b22457d7635dc63886bd8856bccad2f8602432b889449b67fb7490c2f604763 SHA512 26e3705682ad970a012a38188ccc8cac89ab22a509474c4401a57200c98b49423ccf63fb70ccbd57265dd62ec2944fe498b217911d1886ea924881699c9968dc
AUX clucene-2.3.3.4-gcc6.patch 1102 BLAKE2B c7a264585532237d38ad5d06d1e1b96559e47145dc9ecbfe73ec6b8a493fd9c0eef73611305de213e432dd94736dc49dbc140b47d0c65081228989aa21a3fe62 SHA512 367e97d9b5d59bca880d8ec70b37078406f581267a896ff6b35cd3ab21f983f4b21152482bb34fb813e426b4cae14a6d319ccdb08e3bf968de8ece3c28a18722
AUX clucene-2.3.3.4-gmtime.patch 477 BLAKE2B 0c453684f6850ad7eb2eeff2624a9d23c7ea5f78321447b75acea625add44b7cae8c8c220c8848ed8ac39c66f8329f20e9c60005a1e2d237097771ecb0c2370f SHA512 1c23c08edf5512c29a061e4a8515dfa209151af83e46680842f0aeee1269d529a14fd4a89aab7c25312fd7dbb9daf80912a265d21fcf08ac892a467be4a59a60
AUX clucene-2.3.3.4-libcxx.patch 1486 BLAKE2B 237f5a6b674a56c238ffb42282b610d92f8500e5dad4423536ef1dd7184fbbfadd223ac5e79794370c086780ae91863bb3f5444cc0ad8aebc77512b33b6cd487 SHA512 7602a10f3fdd5f4a40a10603abf65f2661eb3cddda9d2c38382f7d362564c0eb8ca1968755090ae78ec5a9a9e6c7d3f889c11fefe9f140c10818c824c7c5f77f
diff --git a/dev-cpp/clucene/files/clucene-2.3.3.4-fix-clang.patch b/dev-cpp/clucene/files/clucene-2.3.3.4-fix-clang.patch
index f743fa8c4480..f81f812c4978 100644
--- a/dev-cpp/clucene/files/clucene-2.3.3.4-fix-clang.patch
+++ b/dev-cpp/clucene/files/clucene-2.3.3.4-fix-clang.patch
@@ -1,5 +1,5 @@
---- /src/core/CLucene/queryParser/QueryParser.cpp.original 2018-08-02 15:11:33.157174224 +0200
-+++ /src/core/CLucene/queryParser/QueryParser.cpp 2018-08-02 15:12:33.189175705 +0200
+--- a/src/core/CLucene/queryParser/QueryParser.cpp
++++ b/src/core/CLucene/queryParser/QueryParser.cpp
@@ -79,7 +79,7 @@
_T("")
};
@@ -9,8 +9,8 @@
const int32_t QueryParser::jj_la1_1[] = {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,0x0,0x0,0x0,0x0};
struct QueryParser::JJCalls {
---- /src/core/CLucene/queryParser/QueryParserTokenManager.cpp.original 2018-08-02 15:14:27.104178515 +0200
-+++ /src/core/CLucene/queryParser/QueryParserTokenManager.cpp 2018-08-02 15:15:10.399179583 +0200
+--- a/src/core/CLucene/queryParser/QueryParserTokenManager.cpp
++++ b/src/core/CLucene/queryParser/QueryParserTokenManager.cpp
@@ -15,9 +15,9 @@
CL_NS_DEF(queryParser)
@@ -23,8 +23,8 @@
};
const int32_t QueryParserTokenManager::jjnextStates[]={
15, 17, 18, 29, 32, 23, 33, 30, 20, 21, 32, 23, 33, 31, 34, 27,
---- /src/core/CLucene/document/DateTools.cpp.original 2018-08-02 15:20:28.903187441 +0200
-+++ /src/core/CLucene/document/DateTools.cpp 2018-08-02 15:20:35.441187602 +0200
+--- a/src/core/CLucene/document/DateTools.cpp
++++ b/src/core/CLucene/document/DateTools.cpp
@@ -8,6 +8,7 @@
#include "DateTools.h"
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index f8415653699b..7f5f432b0882 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -6,4 +6,4 @@ EBUILD glibmm-2.66.4-r1.ebuild 1313 BLAKE2B ec3f2682b3a1792884568b6d2d8d90e8391a
EBUILD glibmm-2.66.5.ebuild 1320 BLAKE2B 899d5ed9c0d46bd63ea862ae919fdd58d9e2e511121e6c510983e074f4d15f7ad19cc4e7a164d42f04551306e0aa7879c58add5614da6203e3f02c901b746240 SHA512 4c0c4085aae04626a841b7343a2ad8cd947f6f774073b37dbd21774d95432129b7e6730a243289c7655252a4e0cb91b296ca2e6a58fcc19c669bb77d20724455
EBUILD glibmm-2.72.1-r1.ebuild 1229 BLAKE2B 943fe600b92dec6a39009587152105dbc9ec41bd4abbb6fcbc8f9fb58ce799b26a3597d9d2d2ead5c2274e8c787789ccbfb0426829b78e2f775abbe761c21e3e SHA512 e15e69706dd0bb900a9497667851159c2965eb37ccc0558ea1870e1c77c46398029a08daa241e56b79ed76f4c8c124254ab9ae5834b05af90ff3b3747e3e9fd9
EBUILD glibmm-2.74.0.ebuild 1274 BLAKE2B d11d64551b60228ec8d84474292c20af60da8c54db411eeb3bfe9df224644d7a9c4cae3caf1db6d0642f6fadcbd707ca8150d82ae39236f8b72843a485cabe8c SHA512 b770ae4954bac8012a695d931f1a6318229811296536b94290663f52099989bbaa8f4ece9b31810ec4ee0dd17022802fd66257ac200700eba642f1ea1c12f023
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 347 BLAKE2B 0f49cb5cb997a9eaaf002de24fc194635c44b9ec75b7ca00dfb7157d6d65750dcdea3ae269fab353e06f80ee3cfd5a316e9ac909e90bbfb348b024ae66f460ce SHA512 6a9c01425d4df29d240bcc8ce91ce042f80ae8bddf78776bc1180beea36ad7657cf3337e7c2cdb0b560f3e146ab20a2ecf9d631f87004421cbfbd8d0dee2d558
diff --git a/dev-cpp/glibmm/metadata.xml b/dev-cpp/glibmm/metadata.xml
index 7b343b06be8a..ec700d09051c 100644
--- a/dev-cpp/glibmm/metadata.xml
+++ b/dev-cpp/glibmm/metadata.xml
@@ -1,8 +1,11 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+ GNOME/glibmm
+
diff --git a/dev-cpp/glog/Manifest b/dev-cpp/glog/Manifest
index f7f3b6c1b3c8..77d5f2c07827 100644
--- a/dev-cpp/glog/Manifest
+++ b/dev-cpp/glog/Manifest
@@ -1,8 +1,8 @@
AUX glog-0.4.0-errnos.patch 4580 BLAKE2B 9a7f86fb2dbcab68948914dcef74e1e08750462e58f56b3f337ad845e1ff4bcdf831e7e231e274bce7db9a4228c307b6bb3baa85ce6cb3eee8625414da6273c9 SHA512 8be72be6d6c27bdbe74dbb95cc2534dcfcd7adc1d85fc5f7022a2b7599ae6b148431623140141ed9863d54febaa414673d18b8fbc8c5aea7f0e43b0f92a54432
AUX glog-0.4.0-fix-test-on-ports.patch 804 BLAKE2B a06a45c977ab55f086e707ad2ea113d93dedb2710fc1cf12fafc700702eb8be5812b73ea4b941355ec948d4659963e1bc7829df12a4da9ba7b80caa3d6ca20e7 SHA512 dd787c363a08810abec89f64b5aa0f77206a0963af1a0fcf5b91549528df875e83cf736cfc2d9eff63007c2d25d0ba71092368272bb5588525cf9af6300ea9a0
AUX glog-0.4.0-fix-x32-build.patch 913 BLAKE2B fc7d4e452580b8ca073439782204da8d04fd36dfc6f06e19426d980127b505a68fc8044b62b04fee5a9b218167a2e119307ea4ec1915807ee6a3ebf89aea83a9 SHA512 2c0bd65824e0ed9923c328554a6dad25d9a02b776e465044a8197416a14da5d986ea9b9394e2da2e6981a1d4149ad67d22b753566177da8c13c0e481432f4e54
-AUX glog-0.5.0-IsGoogleLoggingInitialized_public.patch 3029 BLAKE2B 3b46cca54d2fdfdb51a64d9322246c26848c876c19c6aa13cd344d56fb938879339f41aa89348a1ed5fd7d52182f2803be00033052e7460d9776211df2f6448f SHA512 e83c818d4307ded63c6ee750c76f48594f8dc484b45c56b344a761ab4ed4d9e3c3fa66c78456c40d60ed19a9b0b5e07946de6971285d3779704e85eeb95dea98
-AUX glog-0.5.0-vmodule_levels_changeability.patch 5974 BLAKE2B 1ba487bdc097f6ec021d44496c72beaca0239445eadb4bd11f022d6abdfdb5b97bc9e8bebc5f79255999bf655fde5572009e6fa71e7d8a0af785581a574cc5ec SHA512 db883cd941cab39954f06a75929520c94d824344de81c712d495d03bdd438a2cd79a1d975330848c84f0b482bcbf8c4fb120c45171e51c37dce960bf9cf4c2d5
+AUX glog-0.5.0-IsGoogleLoggingInitialized_public.patch 3039 BLAKE2B 3df4edd58d1aa8380a722baab1b09d6d93d3750bd87d45e7496f81e3115ade12d925f4a4804f467d9a114a753ddbd78651f56b2b78076f026b8f85e7bbcd7d24 SHA512 362f1bc727e38bf17c68df90d33aa229b9ffd60618e80ed26d8127f2d80fee4792ea7179039ad8bd109c87cbfcc40fe2d9e6104397b63ee5221f8cc5b4b599d9
+AUX glog-0.5.0-vmodule_levels_changeability.patch 5980 BLAKE2B e6d57f0570e7ef849a52cf1cba91f1b39e7a8e08e994585dee7948effe54c9a53fcbf50468891d1122b1fbbd9763bf5b51a2a37c34035fc7380d90076cd3b8bc SHA512 53ff691227f8c9386ddc1b223001021ab31fbf8ccc2fe06a0372952e66ebe4903e99ccb4139c65efd06b1ccd9a5c73592466195de263b69f3c45ce89ea9517f8
DIST glog-0.4.0.tar.gz 200955 BLAKE2B 083da6117af3e85697724942bfcb5a7831d447666945b06b149d8d324231b10923887bd8c507e8027136d12bffd30a657cb225df8c449f234381e3876f132953 SHA512 b585f1819ade2075f6b61dc5aaca5c3f9d25601dba2bd08b6c49b96ac5f79db23c6b7f2042df003f7130497dd7241fcaa8b107d1f97385cb66ce52d3c554b176
DIST glog-0.5.0.tar.gz 183346 BLAKE2B 9109a9a4bd3c74ba5d4c1d9ed44ffe0e16d5d3b9b12bf9dd5d31c6e728292ea50f39b4e1b96d55fbb35653a448af4dc8a978e266a2b0f34261c5108099e90845 SHA512 445e4338f3d81cd0b065f2da9c6ce343c243263ca144cea424ef97531a4e9e09c06ffd6942ac01c5213a8003c75cfbbede3c4028d12f0134f23ff29314769c1a
DIST glog-0.6.0.tar.gz 193267 BLAKE2B b42112cdfd54280ce7a9592c3af6b6e10dcb854fe9dbe0db7445c60801d1c12a240c4b3709b45e41aedeb8876d2e08fc3368296e088be6a66126858888cc274e SHA512 fd2c42583d0dd72c790a8cf888f328a64447c5fb9d99b2e2a3833d70c102cb0eb9ae874632c2732424cc86216c8a076a3e24b23a793eaddb5da8a1dc52ba9226
diff --git a/dev-cpp/glog/files/glog-0.5.0-IsGoogleLoggingInitialized_public.patch b/dev-cpp/glog/files/glog-0.5.0-IsGoogleLoggingInitialized_public.patch
index a19ebdcf0fac..d08e4b17882f 100644
--- a/dev-cpp/glog/files/glog-0.5.0-IsGoogleLoggingInitialized_public.patch
+++ b/dev-cpp/glog/files/glog-0.5.0-IsGoogleLoggingInitialized_public.patch
@@ -2,8 +2,8 @@ https://github.com/google/glog/issues/125
https://github.com/google/glog/pull/651
https://github.com/google/glog/commit/81e0d616edeb73cbd06d6c40bc4f90593ac0c5d1
---- /src/glog/logging.h.in
-+++ /src/glog/logging.h.in
+--- a/src/glog/logging.h.in
++++ b/src/glog/logging.h.in
@@ -594,6 +594,9 @@
void* prefix_callback_data = NULL);
#endif
@@ -14,8 +14,8 @@ https://github.com/google/glog/commit/81e0d616edeb73cbd06d6c40bc4f90593ac0c5d1
// Shutdown google's logging library.
GOOGLE_GLOG_DLL_DECL void ShutdownGoogleLogging();
---- /src/logging_custom_prefix_unittest.cc
-+++ /src/logging_custom_prefix_unittest.cc
+--- a/src/logging_custom_prefix_unittest.cc
++++ b/src/logging_custom_prefix_unittest.cc
@@ -221,11 +221,15 @@
LogWithLevels(0, 0, 0, 0); // simulate "before global c-tors"
const string early_stderr = GetCapturedTestStderr();
@@ -43,8 +43,8 @@ https://github.com/google/glog/commit/81e0d616edeb73cbd06d6c40bc4f90593ac0c5d1
}
_START_GOOGLE_NAMESPACE_
---- /src/logging_unittest.cc
-+++ /src/logging_unittest.cc
+--- a/src/logging_unittest.cc
++++ b/src/logging_unittest.cc
@@ -197,8 +197,12 @@
LogWithLevels(0, 0, 0, 0); // simulate "before global c-tors"
const string early_stderr = GetCapturedTestStderr();
@@ -69,8 +69,8 @@ https://github.com/google/glog/commit/81e0d616edeb73cbd06d6c40bc4f90593ac0c5d1
}
_START_GOOGLE_NAMESPACE_
---- /src/utilities.cc
-+++ /src/utilities.cc
+--- a/src/utilities.cc
++++ b/src/utilities.cc
@@ -62,6 +62,10 @@
static const char* g_program_invocation_short_name = NULL;
@@ -93,8 +93,8 @@ https://github.com/google/glog/commit/81e0d616edeb73cbd06d6c40bc4f90593ac0c5d1
#ifdef OS_WINDOWS
struct timeval {
long tv_sec, tv_usec;
---- /src/utilities.h
-+++ /src/utilities.h
+--- a/src/utilities.h
++++ b/src/utilities.h
@@ -163,8 +163,6 @@
const char* ProgramInvocationShortName();
diff --git a/dev-cpp/glog/files/glog-0.5.0-vmodule_levels_changeability.patch b/dev-cpp/glog/files/glog-0.5.0-vmodule_levels_changeability.patch
index f9b90c1521aa..ed1f6a17d8df 100644
--- a/dev-cpp/glog/files/glog-0.5.0-vmodule_levels_changeability.patch
+++ b/dev-cpp/glog/files/glog-0.5.0-vmodule_levels_changeability.patch
@@ -2,8 +2,8 @@ https://github.com/google/glog/issues/649
https://github.com/google/glog/pull/650
https://github.com/google/glog/commit/86fea1ab254c463cbb72e5ce8bcc6855bc4e1e9c
---- /src/glog/vlog_is_on.h.in
-+++ /src/glog/vlog_is_on.h.in
+--- a/src/glog/vlog_is_on.h.in
++++ b/src/glog/vlog_is_on.h.in
@@ -81,10 +81,10 @@
// parsing of --vmodule flag and/or SetVLOGLevel calls.
#define VLOG_IS_ON(verboselevel) \
@@ -41,8 +41,8 @@ https://github.com/google/glog/commit/86fea1ab254c463cbb72e5ce8bcc6855bc4e1e9c
@ac_google_namespace@::int32* site_default,
const char* fname,
@ac_google_namespace@::int32 verbose_level);
---- /src/logging_unittest.cc
-+++ /src/logging_unittest.cc
+--- a/src/logging_unittest.cc
++++ b/src/logging_unittest.cc
@@ -98,6 +98,7 @@
static void TestRawLogging();
static void LogWithLevels(int v, int severity, bool err, bool alsoerr);
@@ -84,8 +84,8 @@ https://github.com/google/glog/commit/86fea1ab254c463cbb72e5ce8bcc6855bc4e1e9c
TEST(DeathRawCHECK, logging) {
ASSERT_DEATH(RAW_CHECK(false, "failure 1"),
"RAW: Check false failed: failure 1");
---- /src/vlog_is_on.cc
-+++ /src/vlog_is_on.cc
+--- a/src/vlog_is_on.cc
++++ b/src/vlog_is_on.cc
@@ -125,6 +125,8 @@
// Pointer to head of the VModuleInfo list.
// It's a map from module pattern to logging level for those module(s).
diff --git a/dev-cpp/gstreamermm/Manifest b/dev-cpp/gstreamermm/Manifest
index 89670a9e941c..2f1052561476 100644
--- a/dev-cpp/gstreamermm/Manifest
+++ b/dev-cpp/gstreamermm/Manifest
@@ -1,4 +1,4 @@
AUX gstreamermm-1.10.0-no-volatile.patch 856 BLAKE2B 40e2735424873d2dedda0a8ee2fcac848362741a08acb291ffe532e3b6a1d9af8967345f535148692b7322ecc74fb94a244c0841a57f571e6d6a37eda095c1fe SHA512 6babe0b607646c77850512df029be989256403e86010bcc198f782a04f357fbb3580c1015924b46af0ec2f3b9bb3c5b2f96b8a21befba8ee24c877dc32f59660
DIST gstreamermm-1.10.0.tar.xz 3529640 BLAKE2B 29b99928cd1b21fd295683b4a1ad0a1b0f8ae959237fcbfef7d5a9296a70a140a04fa390fbbcb8d3151d28239f281e72feb30a0466478e38dfb4e172beaf21f1 SHA512 34eeb9eec5958c96acf7c7791eef80138e5d55fea6ddf1bf9ace6b1ec7f052da2abf04d87089e4c9ead51c631ef7afceaf9fceb946ec3d105da522187c69e429
EBUILD gstreamermm-1.10.0-r1.ebuild 1510 BLAKE2B 51f000e27bd006e22a86dcdb47a2eacf7cc857cfe94a8a17e4c1b5eeceb40dfe35878f9fd7740a0d75150582b97acf985c60b638d3a567780cf9b1ec9724ea24 SHA512 bad63b8fa16352c6c58894c8191ff6dd1ca0d7c2ecfb7907f0a63b1d05ddb7c85a0f4fb1fff4547259744d61a4649e245799e59153252360411df5ef6d4f9024
-MISC metadata.xml 260 BLAKE2B 74a7980ab34785ba7920342b0a2708af439bed09b7ffdc1ae3ca6cbbaba8b7dbd7a6894375c6d5adf00819685f44f58b1e069dcd1062a70e99f0dbcfe39dc3d3 SHA512 f4c15c784194c80663c49692140afcfef3450b722254b99b2bd7fd0d7a08c57b463afcfa3b5609e799d0b2d6ff6451172eace91e93b886856d2591d491585c0c
+MISC metadata.xml 352 BLAKE2B 9a3468cbb99cc6d617b86d3ab5d63613435aec6e3b27025f67ea2476ae316b4ecfea8cb5eeed83b16723cd8c459d727038d9740ac40f11bf27c41fe81ffb480a SHA512 b160f16ea4fd4667ea70e5b7006723607555a7e337040767f038fb0bc2e8325ce0c630463a1742400b18191b07d1b311fb9416ac382a4cf978a6ef8dfa0d615b
diff --git a/dev-cpp/gstreamermm/metadata.xml b/dev-cpp/gstreamermm/metadata.xml
index c6e394b17a27..79ee74f2fa98 100644
--- a/dev-cpp/gstreamermm/metadata.xml
+++ b/dev-cpp/gstreamermm/metadata.xml
@@ -5,4 +5,7 @@
gnome@gentoo.org
Gentoo GNOME Desktop
+
+ GNOME/gstreamermm
+
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index f0d1912e2a67..5edda319b100 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -8,4 +8,4 @@ EBUILD gtkmm-3.24.6-r1.ebuild 1447 BLAKE2B 32c69e044d0fb042d24912cfbff4f591fa9fa
EBUILD gtkmm-3.24.7.ebuild 1454 BLAKE2B 780e991a0ff11f3c8af7b0c0102eb7d0857e4fdaf88686eba98513776ade88caef5198dd0f65444d50f93b8a3e99360140c8cedcf00a580490b5d8ba4c3abb80 SHA512 64f0d460238213b3e0ac715ec96cc49ef6b3566d1785e76b742801fd850360d4e535820d472fbd0238cf3129b705efeb235040175f26831fa16a26290d772635
EBUILD gtkmm-4.6.1-r1.ebuild 1044 BLAKE2B d6c13c0a15e42c883a31e2abfc3bd5313487cad64b478af8e77e410749456d63c1069363b7476a033102b4969493cae5b0fe9fd2380b2cd563eaa44db4b9eeb9 SHA512 98e10d0238f8c91e68aae78e03b097a54397456fff06469a38306ed70b527050ef9c13ac74feae0a2313df6e967e1a2110add752cd49647a20b7f323064f01ef
EBUILD gtkmm-4.8.0-r1.ebuild 1045 BLAKE2B 648aa98f8613ec24a39ffb429adca87bd2dbe9cb1d69929044dc9bcdea9a0b7519991596748b0f813d2881b44a015e985609485721558a618550beeaf4b8f0cb SHA512 e15de95972c435570f9c21a1f1799690737a247da6ef28e4f758defa79320557534edde993cbbe6a28c22a1bab81a04b51e01ba78007d93b9532ed9c8ba039bc
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 346 BLAKE2B 590b61bebe118f44f4ac99d2590e6285138507599c79325441d534c727fa610f587d2c4eab35ef34f5a60f8c7f08346924c5ebcfcd74bafe704f81f3144710fd SHA512 2c4cca6bfad460aa0d0730f2e1355384be69fe30598145e4a2c22c46bbea4c3d9dbc46f863da35be01a54ad091a4b0d70e3f09b7e89013c1beb367eda0fb490d
diff --git a/dev-cpp/gtkmm/metadata.xml b/dev-cpp/gtkmm/metadata.xml
index 7b343b06be8a..0cb7765fe8c2 100644
--- a/dev-cpp/gtkmm/metadata.xml
+++ b/dev-cpp/gtkmm/metadata.xml
@@ -1,8 +1,11 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+ GNOME/gtkmm
+
diff --git a/dev-cpp/gtksourceviewmm/Manifest b/dev-cpp/gtksourceviewmm/Manifest
index 969dd05865cd..1f398605fb88 100644
--- a/dev-cpp/gtksourceviewmm/Manifest
+++ b/dev-cpp/gtksourceviewmm/Manifest
@@ -1,3 +1,3 @@
DIST gtksourceviewmm-3.18.0.tar.xz 1079780 BLAKE2B 973f06a3baed8d5ab541b2f179f773391fe562cab2fceffd0366748acafc4bfc1d4717d969bdd5a5716f892ff497b89338f8b3cd085aebb9c033a40b29d3c0b4 SHA512 143de4a650f2a6090efeba359e78d1f4982519a9e7a2be838f9888732c57dcc42db8b6ab45bd23ccd261d8f17bc743846a3bb572566f233cee9b4238c017c64c
EBUILD gtksourceviewmm-3.18.0-r2.ebuild 613 BLAKE2B d232c1f3241ba542c4f32ffb4cf41bf357eea8406a52d4cf9ea090bacb880d5d737c92bafbb0d9f774f11fcf21b29429733d83ad659ed0f79a221cddb7601d8d SHA512 2e6f691ae7c33d1b56c267f66bdd2eaf8839cb2c46cde28ee93fe97e6d47a2f05f0e473c4f5a2c984a51dd86fb2d48ca955fd37fbcd5d593763a72baf4415855
-MISC metadata.xml 260 BLAKE2B 74a7980ab34785ba7920342b0a2708af439bed09b7ffdc1ae3ca6cbbaba8b7dbd7a6894375c6d5adf00819685f44f58b1e069dcd1062a70e99f0dbcfe39dc3d3 SHA512 f4c15c784194c80663c49692140afcfef3450b722254b99b2bd7fd0d7a08c57b463afcfa3b5609e799d0b2d6ff6451172eace91e93b886856d2591d491585c0c
+MISC metadata.xml 356 BLAKE2B 68285b658d28ed7bf30e978344265275272982c38e1ccd00ced67163fef9f68f76e8af9116d75a40364c1a95e815a024c9596809f0e4330d3f5896d93f8770a9 SHA512 35bf135208b2f8855f35683872a6270263c168cc996ca78ec1bb8f175318326aaab83cc3ad509387c033203b64f92f36a713129d6f1f67de3acf7e81377705c1
diff --git a/dev-cpp/gtksourceviewmm/metadata.xml b/dev-cpp/gtksourceviewmm/metadata.xml
index c6e394b17a27..df689d1fb575 100644
--- a/dev-cpp/gtksourceviewmm/metadata.xml
+++ b/dev-cpp/gtksourceviewmm/metadata.xml
@@ -5,4 +5,7 @@
gnome@gentoo.org
Gentoo GNOME Desktop
+
+ GNOME/gtksourceviewmm
+
diff --git a/dev-cpp/libxmlpp/Manifest b/dev-cpp/libxmlpp/Manifest
index 32b26e3fb285..16dcd48510ed 100644
--- a/dev-cpp/libxmlpp/Manifest
+++ b/dev-cpp/libxmlpp/Manifest
@@ -2,4 +2,4 @@ DIST libxml++-2.40.1.tar.xz 955220 BLAKE2B 44c55ab0e9018af859097e1a753c1457f5694
DIST libxml++-3.0.1.tar.xz 948796 BLAKE2B cdfa37f3aebdd8109653c50d6e977a443173fe4ff18b3644a030bba065c7ced01bedc98a273ab3a8def73f78efd2458afd16ec68df9f9109b816527383904025 SHA512 9b8ccea9df11d70bb23d7d9983b18d28c648aa0107f9654a79d1cfe97db4633b69dd4b97b76d155aca8553d014a314247851f18d0371717e44a056ee804ccd95
EBUILD libxmlpp-2.40.1-r2.ebuild 823 BLAKE2B 6ec040a8204a91bfc25ec328ac5faee112c5ea8c5d9e817fc1672750d622ae1080790279a75301b64c843dde7d055e32e05551ceac7be709c44f8bed682dc583 SHA512 ea6684a160055b6ae5b9cfe8ec6f38ac7f06098c8e081acc636c597f0d1011f8b0fe905800393b525e6cd8136b6aa7f5d650f5030f038cc511e109a5d0d78202
EBUILD libxmlpp-3.0.1-r1.ebuild 808 BLAKE2B 783c46a256126c5e2598394651d6cd3845617ed03a3a66247ff1196508b582277cc4ca54a66036b99acf14784f8954608b0cecb902e98d98b6b24041c2913571 SHA512 d43ad56c0d16fcf1f39e5964a1c6b9e60eac77cb30ad8575ae872e0183be95645250817abaa2c1bf6ddbde6048721dd557cdc7cb818b466d903445d22d34bf42
-MISC metadata.xml 338 BLAKE2B 9c96a9077c38ffe30382bf2566a2e095eb24e2952a1d758b2853fe217a4d1bde2e16f66b424fe5d99195d0a919300f39aeadb77d9525d0d6deb032391e69774c SHA512 b493478db21e762a8109f34bd354be3cad41977aa4ad6f3df7ebaa3177728ae04418c57dfa215cfb3c584cee84f7975cc14421268acfc44b8d62c33701bee236
+MISC metadata.xml 358 BLAKE2B 8b582150db49d0c4ac43268c59fa182078c0c2d8e4b7db6f4a0008cc4bc0376038024de6adbbd438528025419d480c456d1eca6e4b27bf7cd610730ba2af5940 SHA512 fc5f35fa1bab9635e576db3cff7b5151ca60a74401cbe182dc2aa923717a10ca87002773339c2fbf234feddd8f16a7c7a2f6b47ea8fd14424cbf7f900effca57
diff --git a/dev-cpp/libxmlpp/metadata.xml b/dev-cpp/libxmlpp/metadata.xml
index b5c22b75a1f7..7b0dcfdb7c39 100644
--- a/dev-cpp/libxmlpp/metadata.xml
+++ b/dev-cpp/libxmlpp/metadata.xml
@@ -1,11 +1,11 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
-
- libxmlplusplus
-
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+ libxmlplusplus/libxmlplusplus
+
diff --git a/dev-cpp/mm-common/Manifest b/dev-cpp/mm-common/Manifest
index 0b0ca83a7c9d..cf0d84e1a567 100644
--- a/dev-cpp/mm-common/Manifest
+++ b/dev-cpp/mm-common/Manifest
@@ -1,3 +1,3 @@
DIST mm-common-1.0.4.tar.xz 290164 BLAKE2B 2731c501ed79d2481b9094639bad1971e5a27e6416a7433982481e939bd44202f7e5769f3a9dbe5b7fd2e09a3f7bd4687d7ce85d79dafa877f5cc3c333f9d526 SHA512 e686f19cb4d40a3dda68e30b98b43fca3db51b387e28f5569bef0cfbb1cc3a7d72503ec5dfa0f2621dd349ac4c9c21f0fe93bdda224026534c509fbb60400243
-EBUILD mm-common-1.0.4.ebuild 575 BLAKE2B 8d7a2e986cc7ab14bc18a81cb0d1e48d2e919521a39e45fa4f7e84cc9e28736ea79a4482da9c1346b058b5471bd1abb813767c6e71ca9154e8a0f38e58c4b7ae SHA512 23ceaba9a38c846ffcb328f498385561602a1c29b3cb90db93c8cf5b04779b98447cd3717069eeb4dfab806728813f04399f4f29ad8c95c4c22467e559b21969
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+EBUILD mm-common-1.0.4.ebuild 575 BLAKE2B a99bbda380391a48ae226f383c44eee5de37110d3f3af790c86a8ff4fee18dd959df212c70319b57064d0c7ed64ba5f160a8757e8930cb7e84c1de857b1f674f SHA512 944a5657f9cf14f98166418f3b0c869ed42b00d5c56767824ba6938c168b914224bc9d9242c6265a95bae550cf508a5e5ba154ebc5ae2707555d04fb5cfc7108
+MISC metadata.xml 350 BLAKE2B 71cfcc31b82d4e5b436e057bb316fd64d708c1bb1db999e846e7aaac613b6c8a96df013b5f8a4e24f1d17e1d9174744a0e37dcfb7530c73714244287cd05c8e8 SHA512 51ebdb736b213dd635a99dc0ae4a5012eed8b28c1c1e7f5fba0db59b847368f18de2bb0e16c621e97331d23d1779d1f71f63c9f61fc0f10fb7f74fd439a914bd
diff --git a/dev-cpp/mm-common/metadata.xml b/dev-cpp/mm-common/metadata.xml
index 7b343b06be8a..2c285e4de70a 100644
--- a/dev-cpp/mm-common/metadata.xml
+++ b/dev-cpp/mm-common/metadata.xml
@@ -1,8 +1,11 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+ GNOME/mm-common
+
diff --git a/dev-cpp/mm-common/mm-common-1.0.4.ebuild b/dev-cpp/mm-common/mm-common-1.0.4.ebuild
index 8f3b8c291bea..cae8372119fb 100644
--- a/dev-cpp/mm-common/mm-common-1.0.4.ebuild
+++ b/dev-cpp/mm-common/mm-common-1.0.4.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit gnome.org python-any-r1 meson
DESCRIPTION="Build infrastructure and utilities for GNOME C++ bindings"
diff --git a/dev-cpp/pangomm/Manifest b/dev-cpp/pangomm/Manifest
index 5031aac373e5..f667a439ef57 100644
--- a/dev-cpp/pangomm/Manifest
+++ b/dev-cpp/pangomm/Manifest
@@ -6,4 +6,4 @@ EBUILD pangomm-2.46.2-r1.ebuild 960 BLAKE2B 8de280da99a46073829d04d4e68028ce1656
EBUILD pangomm-2.46.3.ebuild 1019 BLAKE2B 5da6f3b2e9c003255efec9f9461a854c48e41a2ee503b297e2c49d84ede67fda94e77b5b3e845f67dbebaaa8824083f039001479e1dcea568d1e2d1f9d0aef81 SHA512 55e848db5bf603931d102315a7c0bcfc75557b528b08c71d40c17f3c300c72e6439817b0544d1bf5e675b62e32f367c815f6664ea1485a040c5bc584d25259b0
EBUILD pangomm-2.50.0-r1.ebuild 971 BLAKE2B bec0577c0c03350dc622ae825dfc51c67c91fec65428a5a329d89c147dd66784002f1cc7a3b3bb28ffbd92774d27bac7a87b6b8aa1cffa936d7a94c93c463ee5 SHA512 4ba4a0e684cd31f73ee8efbabe1dd2bb99ab1714865adb216588e34fbe42ab6ab6e7da02efae22baffb98f171e2cdbf58489c517704d4893cf738c838d4d0de2
EBUILD pangomm-2.50.1.ebuild 1024 BLAKE2B 25c0f26472a469b0a1bc8bbc771663053f8233b3d20c0378f87accc9785f465df15be311dc4e521c6088ae8a5a08704cf3856bd719c4edf97804b70818644e23 SHA512 1ecf808ccce278cd7f1aec4498c9558665345787bf654a4254f9c8aa39e86ad8c908c99a9e6de087b5ef5c8f73fbb6aa5ebfc87a4698fef77f30ddf363baddb4
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
+MISC metadata.xml 348 BLAKE2B 1718eee689e97a9159c1372c9dc7509914a1cd11301fec1f13ab62234f063d123620c8dc524264851ed915cb5723b0925be33938f601d19b6b239963feeec0c2 SHA512 c74344baf34d5f2ace67d3f226bff6bdb8b4ccbd85c39345a4861b66765bfd666daa9aef1512b4e0d9c0cf3e4268b96b2d7abc92bb87be67ba304b2e4284888a
diff --git a/dev-cpp/pangomm/metadata.xml b/dev-cpp/pangomm/metadata.xml
index 7b343b06be8a..897bd48f1fa3 100644
--- a/dev-cpp/pangomm/metadata.xml
+++ b/dev-cpp/pangomm/metadata.xml
@@ -1,8 +1,11 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+ GNOME/pangomm
+
diff --git a/dev-cpp/rapidfuzz-cpp/Manifest b/dev-cpp/rapidfuzz-cpp/Manifest
index 9ba780b719df..aaa27edff7c1 100644
--- a/dev-cpp/rapidfuzz-cpp/Manifest
+++ b/dev-cpp/rapidfuzz-cpp/Manifest
@@ -1,7 +1,5 @@
-DIST rapidfuzz-cpp-1.7.0.gh.tar.gz 252646 BLAKE2B 5d79c07e26b6bb8e84d3280c3401bad60a3ca9846977a5bf9b13787ed7951c3805c71b7e6e2e03b14e2b988381484d969e1cc885c316bcb805b403e53332b31b SHA512 ed8af678a40161aa738bd3606b41fd54c1dba603c47fbdb1182527abd5667736e50f458af252e7bde954f263040cdbd662ad1c6be0a5caa5289f0a351dfd6d9e
-DIST rapidfuzz-cpp-1.8.0.gh.tar.gz 280419 BLAKE2B ae6b7694df3f8ba97b369608bb02783bdd48572e80a9d4f0ee51585975aaee1c0ee058862b94a7a8e46f835b03c04d134143ed07fb5c6d412b4b5cff8686c6d3 SHA512 35729c90494b419fefd9c6bbd03e42cc485d421defcd65bf5dee776d4d0756318a90456980914ccebc100b1bb388474db54638a8628efd496764c604d6221688
+DIST rapidfuzz-cpp-1.10.0.gh.tar.gz 283171 BLAKE2B d126134f3250b5c5320d5776bb913b6458f5bcc61629c1ffd5957b3ddf79e5ff1ccc1c67a9c33271942e7f59846c73d2fdc672a99141964dae716c4ac8057193 SHA512 5d9b184e2b7975b0ba3f29e2698b80906afffa7c561f8b7c49988f99c92ff480bf0a471cb48f7e8024f3e048fb2b01ebbbf1bc28afacee78890f6a595cf10517
DIST rapidfuzz-cpp-1.9.0.gh.tar.gz 281385 BLAKE2B 4afc48edd9c8270200645eb77065bf212b9579b90b3916e261bbe69fd60f67c1e510c3ae4ef9877a26c3313063717b362e01c6cf799a0f9fc3429799d9b2dca6 SHA512 d95c90f9118811d650d859a20f847c71427acbc8c4f907f49d23b069cd6d1a848749d32f8fbff7326828b7a030c3f488acacba5845a72a0057ccf4c3088badf4
-EBUILD rapidfuzz-cpp-1.7.0.ebuild 825 BLAKE2B b4323c2873210fe0bd3ed5fdd79d45fa552f2e9c48bea3144c98dc4a2e9cc52119b4b16926d08a8a12d0c92f89d2598662da22a4d4130192e5c40958e9000289 SHA512 bcb6ff63843c3e50ad6c80cee4b2c94a98c96946fee0970ca1997a1185c0587e5f87e88c6051803813791f1f9537f9e4927f3903e5974954b1485939c4198998
-EBUILD rapidfuzz-cpp-1.8.0.ebuild 832 BLAKE2B 5fdd97deaab9825fa681d7e3368532acd52e441d0e7d904ce4d039a85ec1f4a92c78083a6969a55b6a8681d128f17ed21d99bc62125cf85bfa408e58c45aa825 SHA512 c10d398604743e5804720ccafe52a76cab39d3ff59d6f6a97d8fb9ef45df5a8a49d48f94246785189d02bca1c96cdd9dcf33c1223df26e5655d752fd28cff35a
-EBUILD rapidfuzz-cpp-1.9.0.ebuild 832 BLAKE2B 5fdd97deaab9825fa681d7e3368532acd52e441d0e7d904ce4d039a85ec1f4a92c78083a6969a55b6a8681d128f17ed21d99bc62125cf85bfa408e58c45aa825 SHA512 c10d398604743e5804720ccafe52a76cab39d3ff59d6f6a97d8fb9ef45df5a8a49d48f94246785189d02bca1c96cdd9dcf33c1223df26e5655d752fd28cff35a
+EBUILD rapidfuzz-cpp-1.10.0.ebuild 837 BLAKE2B e799436fa0a6d40a84c78765a614402394f2135693c2e251003190d908452d93267207708ddff21b4b72a400593715b28eac0f88e2799f68d71005c5e41072da SHA512 19bec3a050d32f7d8b6e27382b3a23372839d179eaeae634a9e8a1ad1ed56a6c4c0161fafe87182410f650482ef023731de5c68e92f1b5e5973cd13758dfedad
+EBUILD rapidfuzz-cpp-1.9.0.ebuild 837 BLAKE2B e799436fa0a6d40a84c78765a614402394f2135693c2e251003190d908452d93267207708ddff21b4b72a400593715b28eac0f88e2799f68d71005c5e41072da SHA512 19bec3a050d32f7d8b6e27382b3a23372839d179eaeae634a9e8a1ad1ed56a6c4c0161fafe87182410f650482ef023731de5c68e92f1b5e5973cd13758dfedad
MISC metadata.xml 338 BLAKE2B 43c0cb99a03961ca48146b237a22fbf56c90312b7a39b57a3d01dd532f4f01891e713c802b372b4efb0af528198d8f2c0febae6ffec65da152e8e23f7a67b8a4 SHA512 a54d78c951d15319a2e467dc5d5692d9af5ef9e79c9c9135ee5e26853361ec6bcfebab8e82e3299314f9b7c8cd703365ff6d144e7e6876f486ca5f3a02a3b0f7
diff --git a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.8.0.ebuild b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.10.0.ebuild
similarity index 96%
rename from dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.8.0.ebuild
rename to dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.10.0.ebuild
index 6fb280d52d37..32f8979b752f 100644
--- a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.8.0.ebuild
+++ b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.10.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="~amd64 ~arm ~riscv"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.7.0.ebuild b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.7.0.ebuild
deleted file mode 100644
index 99e66055cc0f..000000000000
--- a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.7.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Rapid fuzzy string matching in C++"
-HOMEPAGE="https://github.com/maxbachmann/rapidfuzz-cpp/"
-SRC_URI="
- https://github.com/maxbachmann/rapidfuzz-cpp/archive/v${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- test? (
- >=dev-cpp/catch-3
- )
-"
-
-src_prepare() {
- # apparently "C++ best practices" don't mind fetching random stuff
- # at build time
- sed -i -e '/aminya/,/^)/d' test/CMakeLists.txt || die
- find -name 'CMakeLists.txt' -exec \
- sed -i -e 's:project_warnings::' {} + || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DRAPIDFUZZ_BUILD_TESTING=$(usex test)
- )
- cmake_src_configure
-}
diff --git a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.9.0.ebuild b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.9.0.ebuild
index 6fb280d52d37..32f8979b752f 100644
--- a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.9.0.ebuild
+++ b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.9.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="~amd64 ~arm ~riscv"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-cpp/taskflow/Manifest b/dev-cpp/taskflow/Manifest
index daf0f7daeabe..8565547dcdcd 100644
--- a/dev-cpp/taskflow/Manifest
+++ b/dev-cpp/taskflow/Manifest
@@ -1,6 +1,6 @@
AUX taskflow-3.3.0-fix_doctest.patch 11940 BLAKE2B 05b8b67289ea904548635183db8798a17c1fe2dfd8fdc7866703cfbc19a986c07c486fedcfbd57ce6061f374f1024ce54c4017d008f205cf8f68256a97efcfda SHA512 508c124ce728d02a98f76461a7d0612b6f5a68c29e4bbcc8039d9a8e43e537fc4521e13f76e77bdcc22620ff14897015dd48bac47b58e2e2f09c67a5473ae028
AUX taskflow-9999-fix_doctest.patch 12005 BLAKE2B 02df64614f0692beb127ff498b6a28f2d02279e76e8379c55d70c39ded8c207c0ec43aaaacafd2c334c552444ac31b35e4b9b6a9f72afed9c1d82dbd9ae7d5db SHA512 df4cad42467361c2988030ccb66076d621bf60c074634d03686bb4e28f2dbe7e38599a0ba6993e59d35df59e4eb63469b04a447c038824d5c77680d6e2e1bb44
DIST taskflow-3.3.0.tar.gz 64446007 BLAKE2B 07878a03bd90af64914f1dc80850bcf5d4140f20ecfa998237039b6f37cc668e8c2b5dffafb75f4518209b3ac01f9935f5e30a020871334f131e6fe7654748bf SHA512 08ab20bf38927d49c8332fc103cb7b4b6358efa06466cb8471f2004eb27b79b9eadc9971ec4acd110c8f369686b6f99bf3e21192285c3f28b9cb855bfd9ab0b5
-EBUILD taskflow-3.3.0.ebuild 963 BLAKE2B e4c4f9d79ab18458372be324faf5265dc8f83803f7ca50b6d04ef61b4900989f288687f497d1bd7bc766f3a60c8de6f32b9a54cd8b66631cef618966e033b929 SHA512 a2216e5b331c40795071c761051a22da4962b1193c0c343bd4b63b3be4c61d938f6066f0e63219baf93a6cf188d8c0992353be64ee2b0ee87cb6174d11207e0a
+EBUILD taskflow-3.3.0.ebuild 968 BLAKE2B 0260a2084f63ec35c9d7e1ccbd5443eeedf5701b3d5215cacd690d5c727befb9a39f14453b9dcef474ed4bfb9bd9169d2ed6af9f82eacaa6260818d6b1e80fbe SHA512 6fe3c892aa142836ae0a5cd083ba467c1eb666982a1ffa67903cedb568b7d26b246e403253cf39f883f8192745479cc8af986b2d4685b4d64f5004a077f5ebdf
EBUILD taskflow-9999.ebuild 955 BLAKE2B f05ffb61825b989838487a762e6440c88eedc296174da5c7c4288efaa8b42d345a26d14de263662e8c51ebc485b0cc350ad30d5e537d6646183faced957cf953 SHA512 1dabc3aae2c06983a9f1fabb48a9a5f7486d12440099b9588d602989c60cf5b7de792c219589aed4989e5c305abcb36e57a9b58ad63fd78a4967270401a3180a
MISC metadata.xml 651 BLAKE2B e10047de786b002d6c270c5e7bd4b618a435188c4d15d907e771b7d638832e41e1e7b6d4a367878c8b46a2ea774afdbdf6e5f054e90dadfd87dac3042c471fea SHA512 44ef280af91998e08aa97e8dfb9b3a5d26b67f1416d58c7e8975f12516549a76b9b9763158207add9b581bb08559d95721fedc35984916011e5af4eda155a87d
diff --git a/dev-cpp/taskflow/taskflow-3.3.0.ebuild b/dev-cpp/taskflow/taskflow-3.3.0.ebuild
index 2082d0df3f00..90c7c0a78d6d 100644
--- a/dev-cpp/taskflow/taskflow-3.3.0.ebuild
+++ b/dev-cpp/taskflow/taskflow-3.3.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
S="${WORKDIR}/taskflow-${PV}"
else
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm ~riscv ~x86"
S="${WORKDIR}/taskflow-${PV}"
fi
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 30eca8c75f22..40d511593ff1 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/citus/Manifest b/dev-db/citus/Manifest
index 7727bca5a64a..413ebb82eed2 100644
--- a/dev-db/citus/Manifest
+++ b/dev-db/citus/Manifest
@@ -1,9 +1,7 @@
DIST citus-10.2.7.tar.gz 5549985 BLAKE2B cb562437757624cc34f80219e8039fdcaf27ebc4a63b30714beafe5555a85769f44a92d74173fb94085f48d09bedaffc019463ec6db67217f8554154a91e2e74 SHA512 32441e964d97d3a69eed309c8d52f65ae31a3a7b79c6e765e967025c7f6a041420925dfb5fb0835cec1ae66549f59fe256994f4120514ec2e781169b771c85e6
DIST citus-11.0.6.tar.gz 6021221 BLAKE2B 7b19328890b79ce639599cf2f99ee15f6dc7e87a062fbd538b288895a3ec6e4af36eabad0a7111de8b53029670be8d6a66ba692a66101c43120640f4fffc37d4 SHA512 4b5667fcfdc89a171ae8e15095d5e688a1d8b4707d13cd4742f5695f9e57e76190e11c4fe933044a64ac00b0982da91d6a253cd272af6ba58131b787ad4b13ef
-DIST citus-11.1.1.tar.gz 6354348 BLAKE2B 2cd4da30af0e0deee3a1dc05ef636b850bc9e244aa81920f9a7692cc3ddecd7802d41ebc76070072453001bd1ea620c6863ead538df4d9cca281979132fde917 SHA512 295702b9ff33bb89487fd2bfe46382391fcad457922847575babae78e1866ec5a55f51e9899b42c8a1193fdbac5df2386a60977ecf3b41631472cd7de97abbe8
-DIST citus-11.1.2.tar.gz 6361264 BLAKE2B 836d381cf3186e690fd4cdb23315964c83dd7de0efa9c8461170a8d0b6e262dfde9da65b6396ce240daf8c115e05cdccc64681fe9a06d0abc8a66fab267b9f30 SHA512 a20cd6d1f42a5b8b00b80ef65dd766251ea9b392fd9e0e62c07c3233ec2c5614723ebe69d684c15e499fb995fc86ca90811b76b595f6d5b414e42de6e7050bc7
+DIST citus-11.1.4.tar.gz 6369400 BLAKE2B aca772fbb7fb632c73d92b1f3841e7772d797373891a40c007a147ab9f44ef42eec325553915d7fd11b56f0f60f302b286061ea4ce55351ce9f9d8cd0d9d084b SHA512 f0c4cbbaa0e8ed173d3ba68b24815272ce7c04186bf628c561119833ddd648928ac31adc1784e25f268d45e8d5c02792088f695ad8dbf2ab425093dc1f241f99
EBUILD citus-10.2.7.ebuild 576 BLAKE2B 2139c10495f8b7c23e0fbc6be85012c24ffce7481f614e2f6134efeab79780b6b8bb7d5f8e7ed1866021fd577dbd8cd8400aa250c37bf568829b55879ef85ddc SHA512 25e3cb723a51b31bf85722098a40e31ecb3f4852dd2806fb91f73d52b2cfeb20159722c3a01d3d17238fb9d9e3ac754def12782c9bd64fe1d0f36f5e94a6ec05
EBUILD citus-11.0.6.ebuild 643 BLAKE2B 112b8708755f1459308b7b421f5d70562ebbce7e602a4c85a60767bb051e994a72811d127eb9ad6153b574eb5557b0759ae3e7222b9dd3e269eb1eec8ed8cc09 SHA512 de47a96f5146f66e713e9ff18508a2b6f7eb11ff5abb134bd9a2fc8410e321e8afd1e96bcb9fabfa998784e525a8d4df778736e2d27e8029e40bc5f807b68624
-EBUILD citus-11.1.1.ebuild 643 BLAKE2B 112b8708755f1459308b7b421f5d70562ebbce7e602a4c85a60767bb051e994a72811d127eb9ad6153b574eb5557b0759ae3e7222b9dd3e269eb1eec8ed8cc09 SHA512 de47a96f5146f66e713e9ff18508a2b6f7eb11ff5abb134bd9a2fc8410e321e8afd1e96bcb9fabfa998784e525a8d4df778736e2d27e8029e40bc5f807b68624
-EBUILD citus-11.1.2.ebuild 643 BLAKE2B 112b8708755f1459308b7b421f5d70562ebbce7e602a4c85a60767bb051e994a72811d127eb9ad6153b574eb5557b0759ae3e7222b9dd3e269eb1eec8ed8cc09 SHA512 de47a96f5146f66e713e9ff18508a2b6f7eb11ff5abb134bd9a2fc8410e321e8afd1e96bcb9fabfa998784e525a8d4df778736e2d27e8029e40bc5f807b68624
+EBUILD citus-11.1.4.ebuild 646 BLAKE2B 0a53954e30a7a8170971367fc333e92e946be56e247fa6b6bd3301d98cdee73f26347124cb4af8e3ad00b8289c9382a4db8896be77daf7699b923602153ef8de SHA512 529fbf5739ef635b46aca44fe3c48200fc08122ce39ccf0240d91d112806e93df7b3fe756d4d3bd975c1b9fce8655414519e0a3638fb37812393e65545218d98
MISC metadata.xml 281 BLAKE2B 85a0d31b886497ac44662bb58420de2f6af5444882f008f902287c6a8265f6e76afa7513b0edeca5b34a26d69d9aa61832c5fb3287c577a7f047180aa3fb242e SHA512 9e9007a37a7acc9948a6eb15bd1bdfea46c95eacc88e96a878237baaf01298b1f849d6e170f04638bbfb68f2c8b8a3bf227e563b5309f859cfcd23d43bc5dd85
diff --git a/dev-db/citus/citus-11.1.2.ebuild b/dev-db/citus/citus-11.1.2.ebuild
deleted file mode 100644
index a1add589578c..000000000000
--- a/dev-db/citus/citus-11.1.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-POSTGRES_COMPAT=( 13 14 )
-
-inherit postgres-multi
-
-DESCRIPTION="Open-source postgresql extension for clustering/multi-node setups"
-HOMEPAGE="https://www.citusdata.com/"
-
-MY_PV="${PV/beta0/beta}"
-SRC_URI="https://github.com/citusdata/citus/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-IUSE=""
-LICENSE="POSTGRESQL AGPL-3"
-
-KEYWORDS="~amd64"
-
-SLOT=0
-
-RESTRICT="test"
-
-DEPEND="${POSTGRES_DEP}
- app-arch/lz4
- app-arch/zstd
- "
-RDEPEND="${DEPEND}"
-
-src_configure() {
- postgres-multi_foreach econf
-}
diff --git a/dev-db/citus/citus-11.1.1.ebuild b/dev-db/citus/citus-11.1.4.ebuild
similarity index 95%
rename from dev-db/citus/citus-11.1.1.ebuild
rename to dev-db/citus/citus-11.1.4.ebuild
index a1add589578c..7282c5e932b4 100644
--- a/dev-db/citus/citus-11.1.1.ebuild
+++ b/dev-db/citus/citus-11.1.4.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-POSTGRES_COMPAT=( 13 14 )
+POSTGRES_COMPAT=( 13 14 15 )
inherit postgres-multi
diff --git a/dev-db/m17n-db/Manifest b/dev-db/m17n-db/Manifest
index acfdbf16a0a5..ddaa7257faa8 100644
--- a/dev-db/m17n-db/Manifest
+++ b/dev-db/m17n-db/Manifest
@@ -1,3 +1,3 @@
DIST m17n-db-1.8.0.tar.gz 1977364 BLAKE2B 303afaf8eb105b8cc034be96efc7790f774870c5cbb688dc33da02847b545b42b20fc041c3842d9fbf9d17417472815e8185df37b58f4d2d72fac762a2669272 SHA512 b21abfdcb5eb42e71fbd5edd1a99eca4a05df14f5a57eac7cdd3dc657337bd143a419f4b3f3dd0b74b82c827ede4d3666dd213af9041593cef50118ee43898d5
EBUILD m17n-db-1.8.0.ebuild 572 BLAKE2B 319adfbf3a2d7771f65a5a1f8594bc9b9a18d39b5f65f64cdd3a0a6163b30b6bb0f207a27b57c2353e3b060c2974a0769ef798f2233e47910d0b4217d244039e SHA512 56da3f886e1e82556a16b56164b1750f9c0fac9780584beefbdb4acc69772d090c5dd05c2725e38c2913f246f589a583c471b08343790ba3fc0c4c8f3529db4a
-MISC metadata.xml 235 BLAKE2B a3e5a3109b59e3f97ef14f8d55ba13b16dc5371a1b7d6f238230aa4494db32dd4a42e3ee012ec8b18fae394feb2b1b56882bc70504aa7c6b969c1b20140f0ece SHA512 7c4e5f5dea465e45c662f5f53513626088aff514e1326593426af227d77e63d8a00d8af05aa208881a399f83dd41e73cd2ef81c8b7f275a2fa891f295231d67c
+MISC metadata.xml 313 BLAKE2B a280c675a102285022654a8b20bc06c7bf3dcd5cac118fdd95b9d453d2adba18c44adae95b4b70835e5f1d03a49dcd3a837e36ef79b2f82dbe91a478171b10d2 SHA512 76e6031dc40226735274b26085dbd3c5b7419f50c445611df406d75422769dd6c23442fc9afa446e979143d5ba3c5b99e42fba3fcf6f20cdfd7fb6e55c202a11
diff --git a/dev-db/m17n-db/metadata.xml b/dev-db/m17n-db/metadata.xml
index a94766977fa6..739c3bd44f1a 100644
--- a/dev-db/m17n-db/metadata.xml
+++ b/dev-db/m17n-db/metadata.xml
@@ -5,4 +5,7 @@
cjk@gentoo.org
Cjk
+
+ m17n
+
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index b903f4382a35..004dcdf87e09 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -6,15 +6,27 @@ DIST mariadb-10.2.43-patches-01.tar.xz 5940 BLAKE2B f8658b799485942c4415b3966743
DIST mariadb-10.2.44.tar.gz 74425890 BLAKE2B 1a5d41ebf209dec54aa68a935ad4c6bac528aa7f8def64efea2bd146011daea0a701276ea037282b927b41b063f86f2cf4667c5d3309cd03a5489074ed351505 SHA512 29b17abfe82667053c3137e4e70e12854dab1312376fe8bdcfc76bf105aa3cddae49bcb07cc607a9c8f0a336bd8e537c6f57e2cdbbd06e48a45d125e3bb006a6
DIST mariadb-10.3.34-patches-01.tar.xz 4696 BLAKE2B 36643b83f773a10180d5f94b4318c19abd441550701ca9e98ff8b7adf037648032023bb93c03efd58e25a650df5650e9b76ee8237cd3b61523f69521e505e643 SHA512 d33c52ad39e249daaae52fde09334f49285212aeb691f3caa7bf8776f95e82eff54bd6a942f24276aa7d945bd030d73e3b1f0ba15f9217236115bd448697d62c
DIST mariadb-10.3.35.tar.gz 73496487 BLAKE2B 3ab05276fc22098be11ce8e2f5c9323c05c28b7617b31655506fe97131cccebe70a525dda0856b05c8196fabf50243865adf91ed6914ca750bbdf27c915767e8 SHA512 9355de944eccef4e0bc01b19ffc3c0c72cf88befae7385c6f0ee1ea47dbd98d23f6bb46af9c140acc48d9d9613552870684bc0b7ca1f3cff1dc09c1a2c801573
+DIST mariadb-10.3.36-patches-01.tar.xz 4548 BLAKE2B 24ae803afe38f406a37380e4d49d7e8434b7b549c9633fdd24bd35a23bf8b5d72fa6e8174c4ddc8dda9a994bd2fd2feecddcb5650029067dcbc578ea525e48cb SHA512 8fd0c6ed0fe6c99ff2219c1f4a6abe24050f91bcf808e1bcc0be3e194244440d5fe5717a0dc4c4c3ef12642b9d722197b780f9fb999ed8770a748d2c0e40ea4b
+DIST mariadb-10.3.36.tar.gz 73944352 BLAKE2B 75090969802783de59ed73338a9a77c70f4dafa14b03334edd5f48593c89b39e752548f34c81875e93263c0b7f2648e83962ef568b07ea11160faf880a9800ed SHA512 321b4c48fcea4413eb239c4904c806306de660f2844edfa1d2a2a15213db287070d0f923db976588dfe329559d565bd98bddef3aaf8f14502f8c3db2ee27757a
DIST mariadb-10.4.25-patches-01.tar.xz 4496 BLAKE2B f710bed49c53bda4cd1bfc8cc8bbde8588a5600a25aba62f90be61e78879729b6b34ec18bfc0729f8330b9fc9858079e2d924c2b72080b86c73b85a9294f2894 SHA512 5545b6fa879ba99c38b52b5c4e1347efea0f1fd098c8593388a6e9c11ae7ffbca5ebe69a3c418420f49a0a7671bf26102dd2dc024fd60e8f9072ae920a16cb58
DIST mariadb-10.4.25.tar.gz 88680777 BLAKE2B 993ed640ad579c2726ae241165d024a87fff580a4461fedee7c41a2bd70d668ed56b31219032096b4bd264543d6a93457947422b8a1384d3d3b94e7ca2f6ecb4 SHA512 27ad62985e19c877623d1512adcbec44e714ca50da9d303eab12bc2ad67dcae45d48a1aa010ad554341c46a1c5db7ee26c14570b9fa55fb71caf9979dd12671e
+DIST mariadb-10.4.26-patches-01.tar.xz 4528 BLAKE2B 0e1683ca254fa4beb06239c377f241e6db2306b386d125491ea39dddbe82c9471f1dc7c26001f2c5ba105913f1ec707ce43482e9581b807723a8690c26fc6e6e SHA512 7b54419ea7a974bc275c72770e63d37e116a2724ed5ce404a04acb622a95ae652f9a81c2ece0dd3d1ea41401dd5428627af19f7689fd01eb68471309ef4400f7
+DIST mariadb-10.4.26.tar.gz 96095606 BLAKE2B 313e3e9561bf2805327141bf1d1e0834e6e3997bb1cd523452555b23ecfc1dddcb91e53478113dff56486bb77d172211c16c9e375d7e451f6af2346de338d3db SHA512 4dadd786f902eb4fec702a863b790215b284eb5d6ecce2cb550e97e055ec4d21ef383f08938020ebbdf3a9150e1d4412817c2fa24f36e907deb0fe5b4ce96cb0
DIST mariadb-10.5.15-patches-01.tar.xz 5116 BLAKE2B 57759c61e672668be8ed991ca023007a4e0c10b2352cc621e88b825097cfde3eb83078804af7afaaa0c6f47900c34046773141a9e3dc3c220b33ecc16435784d SHA512 e3d21b3499ec9f6b5fd32978a6a779ecaca671cccadf241700207a1a3822a6b05ba2e13e1a6cb20e4d5fe4e6db6e5f46e9af650c736bdc3e3de9a4d8bad7ce19
DIST mariadb-10.5.16.tar.gz 105798374 BLAKE2B fc8ba002a876cd9d357c9762e531082f22380480f8713d3f3882c29ad31c6b14065079b6cdde2e698382d2be668e9e7af2d900b93cd976e8fa27e876f33acff4 SHA512 28cea63cc3c5e1b236fb13593285e5d4b9aac5eaf259784e760def42bca8b09954510d39014a7a7c9e8656d61f5995a356df2f2ebb0df2696dd739ff3de5865d
+DIST mariadb-10.5.17-patches-01.tar.xz 5124 BLAKE2B 74976beee48142294d1dcab73e9cdad40392619115184ab5da5553d28b9a10e415711fac84c4290affe301abe0047c99c5a31ce9dfd58c923cfa15346b9c5acc SHA512 b3ffc4a227fcb4a85575fd093b399810c433686a97518cb0d2b47d61c623bbb760b40c5c9d7752fdbb24e3e41740e8a85c3096f6269c80f6ecc2ffc73d5ee94b
+DIST mariadb-10.5.17.tar.gz 113314849 BLAKE2B 6b2efabc620f38d3b0d35930aa4c9b2e63f01d106de57056b5e4b8d629c5669ac1e64d120ce9cd77d3ddd857eeee9630af3dcb52fe6db9c7f7413248b748d4ef SHA512 5a68126aac7072bed549404c89f7215bc47dede8f72559076988469372b96523a800fd6bbf11ff3003a277ee30788ca99a21507b7d7e2b7e98437ca70b5ca0fc
+DIST mariadb-10.6.10-patches-01.tar.xz 5240 BLAKE2B 4c41bbb5a81ecca3e9ccbdfb0861189575e5b3edfb1019465c8dbceee641a8bbeb3e54f061ff3ec44fb5ff3bca960419893429897db4a919177c390b44ef7e49 SHA512 aee039f5e771c840e2a5bb6f6f5fcbec06c0bbd7fd5ce155f0e6f3694595d5d2a0e38f25972c328fc9f69dd68354434e40c5e9a7b2d509d7ea795e097a57864d
+DIST mariadb-10.6.10.tar.gz 96453293 BLAKE2B 889d141ab9e0e9a0cd3fc9b191a15192170029a5fddcff8ebfe482cc3cfdfec6307c014fe09719c7c254a3941034f53ee7ff6187f3d502e3f3edb4d586dff8f3 SHA512 912219878e2201280f5927ee8a34dafe83ac2c3ce8c6fa3d90731d10fd693c369872aff840edc8329b82c53e9908fbdb1ba731ba140e2b99048edb5eb21f22c4
DIST mariadb-10.6.8-patches-01.tar.xz 5220 BLAKE2B 0ad1caecbd05defd9d60e3c438cb0f36dfe7db5fa78e08f43cdd298613cb34691c013f7c44f6bddd39a56f0bf267d257e116defeea5022635b3b6e9b105e0eae SHA512 4cbc527b7307417e0cbf3056487e688474183f0db223ea9107d9a911ef1594691344f2b283402b45ddbc82e29023f0545301a8407f9711f7d8242e3001e3f095
DIST mariadb-10.6.8.tar.gz 88794744 BLAKE2B 1cd036bc686864b497d04454388d9366261f6cc69ad233ab3783063a893c8814ca6c95166415c5b76f2bec2462bffe0bc44d3543502932d03805e972f63b6abc SHA512 b4327000eb3e5fc75bbd78de9890b0464217a432c8aac744948af94e092ffeef1f101885b81ec49029900a92b0018838e46efcf225056a9b06f35a04ecf26aab
EBUILD mariadb-10.2.44.ebuild 41812 BLAKE2B 4e306d7415dbc8b66175bfd70cae2cee4e5ab0a20fee28bd7e7b046817757207c3006b84c01b4aa91a803724018417a64393aea20f15830d60ac503d3ebb6a3e SHA512 cf8389baa9b9b5baa1a5feabbd89910287bb232155142c750df83fe33d67ff11e3072af3a0a975f63208e9c1e242977919e78666c5bf4a39905dbc3bc81ecdaf
EBUILD mariadb-10.3.35.ebuild 41381 BLAKE2B 12f53cb7380434c2acd075fbbfdbfc3075503870689c0f39809d50fca5853469993c40252bdc413d6b36d78b092569f34deca9a53e8c9ed7029e14fcdd03147c SHA512 a5e196fff6a2c216cc48297597893b40e5dedf6a577c9d665325b67097e8a7487c4f918976f3a2a9bd04b0a9d41c290db5f9dae019ff1a4fe8d0b335cf3a6216
+EBUILD mariadb-10.3.36.ebuild 41387 BLAKE2B a2cb91f31d7ede2e70a4f3f9be24a3503ef4dd23b4443474ae1d9173408cceae07929e33d581abbc48e2fe5c7d3f84b973ebed0ed09f96bb08cd57a5f63c054a SHA512 206aeec1b653868bf801985612491964a46337f221ce9e52576b0203bee7a652338ac48fdc141ccb1c302d24fdd0f96753ff6d71bc680f762a67a867ff609e02
EBUILD mariadb-10.4.25.ebuild 42084 BLAKE2B 9d87852855f9cc7ca947bf51c366d1421797f7c68a69536cc54622eef6891408d035f2b0d64dea7cfdc60eb4e3e594ccf41941ab4d3f99ff04f4e1dc6852be7e SHA512 c0e5869c73560d4913ca8cd796a6eae1041e69bebef43f10053707c9adbc13cebf307d82c12c88875728523257b38f564173ed201a1e04e7c06381aeb96b1482
+EBUILD mariadb-10.4.26.ebuild 42090 BLAKE2B b749d9c8332d6c041305b3c600935adb5fdcb5661a94f937818c3be5a6f87240c196c513e4c39901bd563bbb68578ef0c4746ee80822054801afe2c1336fc5ed SHA512 0eca9f0a73cbda9904c83df4354a0b20d4f0a01199f19b877a1584192f4d93e730a7fd3534cfd77abc730756a15e816c0190b2e07af1009c7a306f0c76301264
EBUILD mariadb-10.5.16.ebuild 42042 BLAKE2B 91f25979f77ce2f6a1892613a2f03eab3bd4e04f36b3e3109c8ff7068f574fa3a6bab92c733f51147d2f99cd4d87907913387df26361db28b1cc114550660a8b SHA512 f8ac560b2262a1c1d37059d7ad584116631e806a0bcc5e8be2d804cf7aa865d187a05e3f7f309a08ec07d36266f12bdbc519492e85fecb1426e415aac24ce6b9
+EBUILD mariadb-10.5.17.ebuild 42049 BLAKE2B 44532c7155cec6a1021df578336d7f381c4b3482940cff8545641e6b0f7894cbf7ab769560b25679d48695f007d15f60e608317efad0f202eca713c220ab5442 SHA512 2c94847ee06f3fb9a58352450790a18f67698eef27bd5a301e6c73b93749714343f885ffdaa9a6fe3785d78102144395a2ef2067c9eb2b22ce476480937f756c
+EBUILD mariadb-10.6.10.ebuild 42417 BLAKE2B bd430ea7545679d7d32900a1c2bb288d428add4f8326fbb1fc5994623b3b7aaebf6f61878a257b2ef10f68eb290cd55a309086deb2636df725e5be716050091a SHA512 bd51e7981f4c5e6a91e5781cc04c97363480a14f5e7733fe96f56d6365f56aecddf395ea65b6c0eb50513ea2b50c726012b65395a0e66a188defe9eb2ea14170
EBUILD mariadb-10.6.8-r1.ebuild 42459 BLAKE2B 21000edb09ae6c7ef1e52b2f3557045787859f5ad7b54e2db8623541660011ee788093c30f336784bb5e280a0bdc16136bda3f60d162635736add777411df9a3 SHA512 0f056cf06a3576fec20d1a807c5895fe75cc19490faa5ce850d1bf800a3a7cab89158f154579831ec54fec893f422af8f4cfa823c7d087e04a9b050b19a3f71e
MISC metadata.xml 2712 BLAKE2B 5bfc30a0cfb251168f7c539a0d5ed916790ce93f20d68168264cdde5f56473b8e0586944ac319ab742f5afe73bf40ccf9b77e75a1c1561abc2d5432e48095cee SHA512 4c5d26be5bd2573aead82270c3b6be29a198c0ea334cb2754cb21aabeb095a031009be3497f242c55d6131a8d44d9a54d32d94be5829f60bdb23db530bedfd33
diff --git a/dev-db/mariadb/mariadb-10.3.36.ebuild b/dev-db/mariadb/mariadb-10.3.36.ebuild
new file mode 100644
index 000000000000..efe73d65e955
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.3.36.ebuild
@@ -0,0 +1,1287 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+SUBSLOT="18"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+inherit systemd flag-o-matic prefix toolchain-funcs \
+ multiprocessing java-pkg-opt-2 cmake
+
+# Patch version
+PATCH_SET="https://github.com/hydrapolic/gentoo-dist/raw/master/${PN}/${PN}-10.3.36-patches-01.tar.xz"
+
+SRC_URI="mirror://mariadb/${PN}-${PV}/source/${P}.tar.gz
+ ${PATCH_SET}"
+
+HOMEPAGE="https://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2 LGPL-2.1+"
+SLOT="$(ver_cut 1-2)/${SUBSLOT:-0}"
+IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
+ innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
+ numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
+ sst-rsync sst-mariabackup static systemd systemtap tcmalloc
+ test tokudb xml yassl"
+
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
+
+REQUIRED_USE="jdbc? ( extraengine server !static )
+ server? ( tokudb? ( jemalloc !tcmalloc ) )
+ ?? ( tcmalloc jemalloc )
+ static? ( yassl !extraengine !pam )"
+
+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"
+
+# Shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+COMMON_DEPEND="
+ kernel_linux? (
+ sys-process/procps:0=
+ dev-libs/libaio:0=
+ )
+ >=sys-apps/sed-4
+ >=sys-apps/texinfo-4.7-r1
+ jemalloc? ( dev-libs/jemalloc:0= )
+ tcmalloc? ( dev-util/google-perftools:0= )
+ systemtap? ( >=dev-util/systemtap-1.3:0= )
+ >=sys-libs/zlib-1.2.3:0=
+ kerberos? ( virtual/krb5 )
+ yassl? ( net-libs/gnutls:0= )
+ !yassl? (
+ >=dev-libs/openssl-1.0.0:0=
+ )
+ sys-libs/ncurses:0=
+ !bindist? (
+ sys-libs/binutils-libs:0=
+ >=sys-libs/readline-4.1:0=
+ )
+ server? (
+ backup? ( app-arch/libarchive:0= )
+ cracklib? ( sys-libs/cracklib:0= )
+ extraengine? (
+ odbc? ( dev-db/unixODBC:0= )
+ xml? ( dev-libs/libxml2:2= )
+ )
+ innodb-lz4? ( app-arch/lz4 )
+ innodb-lzo? ( dev-libs/lzo )
+ innodb-snappy? ( app-arch/snappy )
+ mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 )
+ numa? ( sys-process/numactl )
+ oqgraph? (
+ dev-libs/boost:=
+ dev-libs/judy:0=
+ )
+ pam? ( sys-libs/pam:0= )
+ systemd? ( sys-apps/systemd:= )
+ tokudb? ( app-arch/snappy )
+ )
+ >=dev-libs/libpcre-8.41-r1:3=
+ virtual/libcrypt:=
+"
+BDEPEND="virtual/yacc"
+DEPEND="static? ( sys-libs/ncurses[static-libs] )
+ server? (
+ extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) )
+ test? ( acct-group/mysql acct-user/mysql )
+ )
+ ${COMMON_DEPEND}"
+RDEPEND="selinux? ( sec-policy/selinux-mysql )
+ !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
+ !dev-db/mariadb:0
+ !dev-db/mariadb:5.5
+ !dev-db/mariadb:10.1
+ !dev-db/mariadb:10.2
+ !dev-db/mariadb:10.4
+ !dev-db/mariadb:10.5
+ !dev-db/mariadb:10.6
+ !dev-db/mariadb:10.7
+ !dev-db/mariadb:10.8
+ !=virtual/jre-1.8 ) )
+ )
+"
+# For other stuff to bring us in
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+
+mysql_init_vars() {
+ MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
+ MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+ MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+ MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
+
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ MY_DATADIR=""
+ if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
+ MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
+ | sed -ne '/datadir/s|^--datadir=||p' \
+ | tail -n1)
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ MY_DATADIR=$(grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
+ | sed -e 's/.*=\s*//' \
+ | tail -n1)
+ fi
+ fi
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ MY_DATADIR="${MY_LOCALSTATEDIR}"
+ einfo "Using default MY_DATADIR"
+ fi
+ elog "MySQL MY_DATADIR is ${MY_DATADIR}"
+
+ if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
+ if [[ -e "${MY_DATADIR}" ]] ; then
+ # If you get this and you're wondering about it, see bug #207636
+ elog "MySQL datadir found in ${MY_DATADIR}"
+ elog "A new one will not be created."
+ PREVIOUS_DATADIR="yes"
+ else
+ PREVIOUS_DATADIR="no"
+ fi
+ export PREVIOUS_DATADIR
+ fi
+ else
+ if [[ ${EBUILD_PHASE} == "config" ]]; then
+ local new_MY_DATADIR
+ new_MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
+ | sed -ne '/datadir/s|^--datadir=||p' \
+ | tail -n1)
+
+ if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
+ ewarn "MySQL MY_DATADIR has changed"
+ ewarn "from ${MY_DATADIR}"
+ ewarn "to ${new_MY_DATADIR}"
+ MY_DATADIR="${new_MY_DATADIR}"
+ fi
+ fi
+ fi
+
+ export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+ export MY_LOCALSTATEDIR MY_LOGDIR
+ export MY_DATADIR
+}
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != binary ]] ; then
+ if has test ${FEATURES} ; then
+ # Bug #213475 - MySQL _will_ object strenuously if your machine is named
+ # localhost. Also causes weird failures.
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+ if ! has userpriv ${FEATURES} ; then
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+ fi
+ fi
+ fi
+
+ java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+ unpack ${A}
+
+ mv -f "${WORKDIR}/${P/_rc/}" "${S}" || die
+}
+
+src_prepare() {
+ eapply "${WORKDIR}"/mariadb-patches
+
+ eapply_user
+
+ _disable_plugin() {
+ echo > "${S}/plugin/${1}/CMakeLists.txt" || die
+ }
+ _disable_engine() {
+ echo > "${S}/storage/${1}/CMakeLists.txt" || die
+ }
+
+ if use jemalloc; then
+ echo "TARGET_LINK_LIBRARIES(mysqld LINK_PUBLIC jemalloc)" >> "${S}/sql/CMakeLists.txt"
+ elif use tcmalloc; then
+ echo "TARGET_LINK_LIBRARIES(mysqld LINK_PUBLIC tcmalloc)" >> "${S}/sql/CMakeLists.txt"
+ fi
+
+ # Don't build bundled xz-utils for tokudb
+ echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
+ sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
+ sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
+
+ local plugin
+ local server_plugins=( handler_socket auth_socket feedback metadata_lock_info
+ locale_info qc_info server_audit sql_errlog auth_ed25519 )
+ local test_plugins=( audit_null auth_examples daemon_example fulltext
+ debug_key_management example_key_management versioning )
+ if ! use server; then # These plugins are for the server
+ for plugin in "${server_plugins[@]}" ; do
+ _disable_plugin "${plugin}"
+ done
+ fi
+
+ if ! use test; then # These plugins are only used during testing
+ for plugin in "${test_plugins[@]}" ; do
+ _disable_plugin "${plugin}"
+ done
+ _disable_engine test_sql_discovery
+ fi
+
+ _disable_engine example
+
+ if ! use oqgraph ; then # avoids extra library checks
+ _disable_engine oqgraph
+ fi
+
+ if use mroonga ; then
+ # Remove the bundled groonga
+ # There is no CMake flag, it simply checks for existance
+ rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga"
+ else
+ _disable_engine mroonga
+ fi
+
+ # Fix galera_recovery.sh script
+ sed -i -e "s~@bindir@/my_print_defaults~${EPREFIX}/usr/libexec/mariadb/my_print_defaults~" \
+ scripts/galera_recovery.sh || die
+
+ cmake_src_prepare
+ java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+ # bug 508724 mariadb cannot use ld.gold
+ tc-ld-disable-gold
+ # Bug #114895, bug #110149
+ filter-flags "-O" "-O[01]"
+
+ append-cxxflags -felide-constructors
+
+ # bug #283926, with GCC4.4, this is required to get correct behavior.
+ append-flags -fno-strict-aliasing
+
+ CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+ # debug hack wrt #497532
+ mycmakeargs=(
+ -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+ -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+ -DSYSCONFDIR="${EPREFIX}/etc/mysql"
+ -DINSTALL_BINDIR=bin
+ -DINSTALL_DOCDIR=share/doc/${PF}
+ -DINSTALL_DOCREADMEDIR=share/doc/${PF}
+ -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_INFODIR=share/info
+ -DINSTALL_LIBDIR=$(get_libdir)
+ -DINSTALL_MANDIR=share/man
+ -DINSTALL_MYSQLSHAREDIR=share/mariadb
+ -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
+ -DINSTALL_SCRIPTDIR=bin
+ -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
+ -DINSTALL_SBINDIR=sbin
+ -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
+ -DWITH_COMMENT="Gentoo Linux ${PF}"
+ -DWITH_UNIT_TESTS=$(usex test ON OFF)
+ -DWITH_LIBEDIT=0
+ -DWITH_ZLIB=system
+ -DWITHOUT_LIBWRAP=1
+ -DENABLED_LOCAL_INFILE=1
+ -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+ -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+ -DWITH_DEFAULT_COMPILER_OPTIONS=0
+ -DWITH_DEFAULT_FEATURE_SET=0
+ -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
+ # The build forces this to be defined when cross-compiling. We pass it
+ # all the time for simplicity and to make sure it is actually correct.
+ -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
+ -DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)"
+ -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+ -DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
+ -DCONC_WITH_EXTERNAL_ZLIB=YES
+ -DWITH_EXTERNAL_ZLIB=YES
+ -DSUFFIX_INSTALL_DIR=""
+ -DWITH_UNITTEST=OFF
+ -DWITHOUT_CLIENTLIBS=YES
+ -DCLIENT_PLUGIN_DIALOG=OFF
+ -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT=OFF
+ -DCLIENT_PLUGIN_CLIENT_ED25519=OFF
+ -DCLIENT_PLUGIN_MYSQL_CLEAR_PASSWORD=STATIC
+ -DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=OFF
+ )
+ if use test ; then
+ mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
+ else
+ mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
+ fi
+
+ if ! use yassl ; then
+ mycmakeargs+=( -DWITH_SSL=system -DCLIENT_PLUGIN_SHA256_PASSWORD=STATIC )
+ else
+ mycmakeargs+=( -DWITH_SSL=bundled )
+ fi
+
+ # bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
+ mycmakeargs+=(
+ -DWITH_READLINE=$(usex bindist 1 0)
+ -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
+ -DENABLE_DTRACE=$(usex systemtap)
+ )
+
+ if use server ; then
+ # Connect and Federated{,X} must be treated special
+ # otherwise they will not be built as plugins
+ if ! use extraengine ; then
+ mycmakeargs+=(
+ -DPLUGIN_CONNECT=NO
+ -DPLUGIN_FEDERATED=NO
+ -DPLUGIN_FEDERATEDX=NO
+ )
+ fi
+
+ mycmakeargs+=(
+ -DWITH_PCRE=system
+ -DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
+ -DPLUGIN_SPHINX=$(usex sphinx YES NO)
+ -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
+ -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+ -DPLUGIN_AWS_KEY_MANAGEMENT=NO
+ -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
+ -DPLUGIN_CASSANDRA=NO
+ -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
+ -DPLUGIN_SPIDER=$(usex extraengine YES NO)
+ -DCONNECT_WITH_MYSQL=1
+ -DCONNECT_WITH_LIBXML2=$(usex xml)
+ -DCONNECT_WITH_ODBC=$(usex odbc)
+ -DCONNECT_WITH_JDBC=$(usex jdbc)
+ # Build failure and autodep wrt bug 639144
+ -DCONNECT_WITH_MONGO=OFF
+ -DWITH_WSREP=$(usex galera)
+ -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
+ -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
+ -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
+ -DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO)
+ -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+ -DWITH_MARIABACKUP=$(usex backup ON OFF)
+ -DWITH_LIBARCHIVE=$(usex backup ON OFF)
+ -DINSTALL_SQLBENCHDIR=""
+ -DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO)
+ # systemd is only linked to for server notification
+ -DWITH_SYSTEMD=$(usex systemd yes no)
+ -DWITH_NUMA=$(usex numa ON OFF)
+ )
+
+ # Workaround for MDEV-14524
+ use tokudb && mycmakeargs+=( -DTOKUDB_OK=1 )
+
+ if use test ; then
+ # This is needed for the new client lib which tests a real, open server
+ mycmakeargs+=( -DSKIP_TESTS=ON )
+ fi
+
+ if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
+ ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+ ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+ ewarn "You MUST file bugs without these variables set."
+
+ mycmakeargs+=(
+ -DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+ -DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+ )
+
+ elif ! use latin1 ; then
+ mycmakeargs+=(
+ -DDEFAULT_CHARSET=utf8
+ -DDEFAULT_COLLATION=utf8_general_ci
+ )
+ else
+ mycmakeargs+=(
+ -DDEFAULT_CHARSET=latin1
+ -DDEFAULT_COLLATION=latin1_swedish_ci
+ )
+ fi
+ mycmakeargs+=(
+ -DEXTRA_CHARSETS=all
+ -DMYSQL_USER=mysql
+ -DDISABLE_SHARED=$(usex static YES NO)
+ -DWITH_DEBUG=$(usex debug)
+ -DWITH_EMBEDDED_SERVER=OFF
+ -DWITH_PROFILING=$(usex profiling)
+ )
+
+ if use static; then
+ mycmakeargs+=( -DWITH_PIC=1 )
+ fi
+
+ if use jemalloc || use tcmalloc ; then
+ mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
+ fi
+
+ # Storage engines
+ mycmakeargs+=(
+ -DWITH_ARCHIVE_STORAGE_ENGINE=1
+ -DWITH_BLACKHOLE_STORAGE_ENGINE=1
+ -DWITH_CSV_STORAGE_ENGINE=1
+ -DWITH_HEAP_STORAGE_ENGINE=1
+ -DWITH_INNOBASE_STORAGE_ENGINE=1
+ -DWITH_MYISAMMRG_STORAGE_ENGINE=1
+ -DWITH_MYISAM_STORAGE_ENGINE=1
+ -DWITH_PARTITION_STORAGE_ENGINE=1
+ )
+ else
+ mycmakeargs+=(
+ -DWITHOUT_SERVER=1
+ -DWITH_EMBEDDED_SERVER=OFF
+ -DEXTRA_CHARSETS=none
+ -DINSTALL_SQLBENCHDIR=
+ -DWITH_SYSTEMD=no
+ )
+ fi
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+}
+
+# Official test instructions:
+# USE='extraengine perl server xml' \
+# FEATURES='test userpriv' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+ _disable_test() {
+ local rawtestname bug reason
+ rawtestname="${1}" ; shift
+ bug="${1}" ; shift
+ reason="${@}"
+ ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})"
+ echo "${rawtestname} : BUG#${bug} ${reason}" >> "${T}/disabled.def"
+ }
+
+ local TESTDIR="${BUILD_DIR}/mysql-test"
+ local retstatus_tests
+
+ if ! use server ; then
+ einfo "Skipping server tests due to minimal build."
+ return 0
+ fi
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ if [[ -z "${MTR_PARALLEL}" ]] ; then
+ local -x MTR_PARALLEL=$(makeopts_jobs)
+
+ if [[ ${MTR_PARALLEL} -gt 4 ]] ; then
+ # Running multiple tests in parallel usually require higher ulimit
+ # and fs.aio-max-nr setting. In addition, tests like main.multi_update
+ # are known to hit timeout when system is busy.
+ # To avoid test failure we will limit MTR_PARALLEL to 4 instead of
+ # using "auto".
+ local info_msg="Parallel MySQL test suite jobs limited to 4 (MAKEOPTS=${MTR_PARALLEL})"
+ info_msg+=" to avoid test failures. Set MTR_PARALLEL if you know what you are doing!"
+ einfo "${info_msg}"
+ unset info_msg
+ MTR_PARALLEL=4
+ fi
+ else
+ einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'"
+ fi
+
+ # Try to increase file limits to increase test coverage
+ if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
+ # Upper limit comes from parts.partition_* tests
+ ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
+
+ if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
+ # Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
+ ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
+
+ if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
+ ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
+ else
+ einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
+ fi
+ else
+ einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
+ fi
+ else
+ einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
+ fi
+
+ # create directories because mysqladmin might run out of order
+ mkdir -p "${T}"/var-tests{,/log} || die
+
+ if [[ ! -f "${S}/mysql-test/unstable-tests" ]] ; then
+ touch "${S}"/mysql-test/unstable-tests || die
+ fi
+
+ cp "${S}"/mysql-test/unstable-tests "${T}/disabled.def" || die
+
+ local -a disabled_tests
+ disabled_tests+=( "compat/oracle.plugin;0;Needs example plugin which Gentoo disables" )
+ disabled_tests+=( "innodb_gis.1;25095;Known rounding error with latest AMD processors" )
+ disabled_tests+=( "innodb_gis.gis;25095;Known rounding error with latest AMD processors" )
+ disabled_tests+=( "main.explain_non_select;0;Sporadically failing test" )
+ disabled_tests+=( "main.func_time;0;Dependent on time test was written" )
+ disabled_tests+=( "main.grant;0;Sporadically failing test" )
+ disabled_tests+=( "main.plugin_auth;0;Needs client libraries built" )
+ disabled_tests+=( "main.selectivity_no_engine;26320;Sporadically failing test" )
+ disabled_tests+=( "main.stat_tables;0;Sporadically failing test" )
+ disabled_tests+=( "main.stat_tables_innodb;0;Sporadically failing test" )
+ disabled_tests+=( "mariabackup.*;0;Broken test suite" )
+ disabled_tests+=( "plugins.auth_ed25519;0;Needs client libraries built" )
+ disabled_tests+=( "plugins.cracklib_password_check;0;False positive due to varying policies" )
+ disabled_tests+=( "plugins.two_password_validations;0;False positive due to varying policies" )
+ disabled_tests+=( "roles.acl_statistics;0;False positive due to a user count mismatch caused by previous test" )
+
+ if ! use latin1 ; then
+ disabled_tests+=( "funcs_1.is_columns_mysql;0;Requires USE=latin1" )
+ disabled_tests+=( "main.information_schema;0;Requires USE=latin1" )
+ disabled_tests+=( "main.sp2;24177;Requires USE=latin1" )
+ disabled_tests+=( "main.system_mysql_db;0;Requires USE=latin1" )
+ fi
+
+ local test_infos_str test_infos_arr
+ for test_infos_str in "${disabled_tests[@]}" ; do
+ IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}"
+
+ if [[ ${#test_infos_arr[@]} != 3 ]] ; then
+ die "Invalid test data set, not matching format: ${test_infos_str}"
+ fi
+
+ _disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}"
+ done
+ unset test_infos_str test_infos_arr
+
+ # run mysql-test tests
+ pushd "${TESTDIR}" &>/dev/null || die
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
+ retstatus_tests=$?
+
+ popd &>/dev/null || die
+
+ # Cleanup is important for these testcases.
+ pkill -9 -f "${S}/ndb" 2>/dev/null
+ pkill -9 -f "${S}/sql" 2>/dev/null
+
+ local failures=""
+ [[ ${retstatus_tests} -eq 0 ]] || failures="${failures} tests"
+
+ [[ -z "${failures}" ]] || die "Test failures: ${failures}"
+ einfo "Tests successfully completed"
+}
+
+src_install() {
+ cmake_src_install
+
+ # Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
+ if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
+ rm "${ED}/usr/include/mysql/server/private/config.h" || die
+ fi
+
+ # Make sure the vars are correctly initialized
+ mysql_init_vars
+
+ # Convenience links
+ einfo "Making Convenience links for mysqlcheck multi-call binary"
+ dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
+ dosym "mysqlcheck" "/usr/bin/mysqlrepair"
+ dosym "mysqlcheck" "/usr/bin/mysqloptimize"
+
+ # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+ if [[ -d "${ED}/usr/data" ]] ; then
+ rm -Rf "${ED}/usr/data" || die
+ fi
+
+ # Unless they explicitly specific USE=test, then do not install the
+ # testsuite. It DOES have a use to be installed, esp. when you want to do a
+ # validation of your database configuration after tuning it.
+ if ! use test ; then
+ rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
+ fi
+
+ # Configuration stuff
+ einfo "Building default configuration ..."
+ insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+ [[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
+ cp "${FILESDIR}/my.cnf-10.2" "${TMPDIR}/my.cnf" || die
+ eprefixify "${TMPDIR}/my.cnf"
+ doins "${TMPDIR}/my.cnf"
+ insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d"
+ cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
+ eprefixify "${TMPDIR}/50-distro-client.cnf"
+ doins "${TMPDIR}/50-distro-client.cnf"
+
+ if use server ; then
+ mycnf_src="my.cnf.distro-server"
+ sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+ "${FILESDIR}/${mycnf_src}" \
+ > "${TMPDIR}/my.cnf.ok" || die
+ if use prefix ; then
+ sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
+ "${TMPDIR}/my.cnf.ok" || die
+ fi
+ if use latin1 ; then
+ sed -i \
+ -e "/character-set/s|utf8|latin1|g" \
+ "${TMPDIR}/my.cnf.ok" || die
+ fi
+ eprefixify "${TMPDIR}/my.cnf.ok"
+ newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
+
+ einfo "Including support files and sample configurations"
+ docinto "support-files"
+ local script
+ for script in \
+ "${S}"/support-files/magic
+ do
+ [[ -f "$script" ]] && dodoc "${script}"
+ done
+
+ docinto "scripts"
+ for script in "${S}"/scripts/mysql* ; do
+ [[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
+ done
+ # Manually install supporting files that conflict with other packages
+ # but are needed for galera and initial installation
+ exeinto /usr/libexec/mariadb
+ doexe "${BUILD_DIR}/extra/my_print_defaults" "${BUILD_DIR}/extra/perror"
+ fi
+
+ # Remove bundled mytop in favor of dev-db/mytop
+ local mytop_file
+ for mytop_file in \
+ "${ED}/usr/bin/mytop" \
+ "${ED}/usr/share/man/man1/mytop.1" \
+ ; do
+ if [[ -e "${mytop_file}" ]] ; then
+ rm -v "${mytop_file}" || die
+ fi
+ done
+
+ # Fix a dangling symlink when galera is not built
+ if [[ -L "${ED}/usr/bin/wsrep_sst_rsync_wan" ]] && ! use galera ; then
+ rm "${ED}/usr/bin/wsrep_sst_rsync_wan" || die
+ fi
+
+ # Remove broken SST scripts that are incompatible
+ local scriptremove
+ for scriptremove in wsrep_sst_xtrabackup wsrep_sst_xtrabackup-v2 ; do
+ if [[ -e "${ED}/usr/bin/${scriptremove}" ]] ; then
+ rm "${ED}/usr/bin/${scriptremove}" || die
+ fi
+ done
+
+ # Remove dangling symlink
+ rm "${ED}/usr/$(get_libdir)/libmariadb.a" || die
+}
+
+pkg_preinst() {
+ java-pkg-opt-2_pkg_preinst
+
+ # Here we need to see if the implementation switched client libraries
+ # We check if this is a new instance of the package and a client library already exists
+ local SHOW_ABI_MESSAGE libpath
+ if [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}/usr/$(get_libdir)/libmysqlclient.so" ]] ; then
+ libpath=$(readlink "${EROOT}/usr/$(get_libdir)/libmysqlclient.so")
+ elog "Due to ABI changes when switching between different client libraries,"
+ elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient."
+ elog "Please run: revdep-rebuild --library ${libpath}"
+ ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries"
+ fi
+}
+
+pkg_postinst() {
+ # Make sure the vars are correctly initialized
+ mysql_init_vars
+
+ # Create log directory securely if it does not exist
+ [[ -d "${ROOT}/${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}/${MY_LOGDIR}"
+
+ if use server ; then
+ if use pam; then
+ einfo
+ elog "This install includes the PAM authentication plugin."
+ elog "To activate and configure the PAM plugin, please read:"
+ elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/"
+ einfo
+ fi
+
+ if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+ einfo
+ elog "You might want to run:"
+ elog "\"emerge --config =${CATEGORY}/${PF}\""
+ elog "if this is a new install."
+ elog
+ elog "If you are switching server implentations, you should run the"
+ elog "mysql_upgrade tool."
+ einfo
+ else
+ einfo
+ elog "If you are upgrading major versions, you should run the"
+ elog "mysql_upgrade tool."
+ einfo
+ fi
+
+ if use galera ; then
+ einfo
+ elog "Be sure to edit the my.cnf file to activate your cluster settings."
+ elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
+ elog "The first time the cluster is activated, you should add"
+ elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
+ elog "This option should then be removed for subsequent starts."
+ einfo
+ fi
+ fi
+
+ # Note about configuration change
+ einfo
+ elog "This version of mariadb reorganizes the configuration from a single my.cnf"
+ elog "to several files in /etc/mysql/${PN}.d."
+ elog "Please backup any changes you made to /etc/mysql/my.cnf"
+ elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension."
+ elog "You may have as many files as needed and they are read alphabetically."
+ elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
+ einfo
+}
+
+pkg_config() {
+ _getoptval() {
+ local section="${1}"
+ local option="--${2}"
+ local extra_options="${3}"
+ local cmd=(
+ "${my_print_defaults_binary}"
+ "${extra_options}"
+ "${section}"
+ )
+
+ local values=()
+ local parameters=( $(eval "${cmd[@]}" 2>/dev/null) )
+ for parameter in "${parameters[@]}"
+ do
+ # my_print_defaults guarantees output of options, one per line,
+ # in the form that they would be specified on the command line.
+ # So checking for --option=* should be safe.
+ case ${parameter} in
+ ${option}=*)
+ values+=( "${parameter#*=}" )
+ ;;
+ esac
+ done
+
+ if [[ ${#values[@]} -gt 0 ]] ; then
+ # Option could have been set multiple times
+ # in which case only the last occurrence
+ # contains the current value
+ echo "${values[-1]}"
+ fi
+ }
+
+ _mktemp_dry() {
+ # emktemp has no --dry-run option
+ local template="${1}"
+
+ if [[ -z "${template}" ]] ; then
+ if [[ -z "${T}" ]] ; then
+ template="/tmp/XXXXXXX"
+ else
+ template="${T}/XXXXXXX"
+ fi
+ fi
+
+ local template_wo_X=${template//X/}
+ local n_X
+ let n_X=${#template}-${#template_wo_X}
+ if [[ ${n_X} -lt 3 ]] ; then
+ echo "${FUNCNAME[0]}: too few X's in template ‘${template}’" >&2
+ return
+ fi
+
+ local attempts=0
+ local character tmpfile
+ while [[ true ]] ; do
+ let attempts=attempts+1
+
+ new_file=
+ while read -n1 character ; do
+ if [[ "${character}" == "X" ]] ; then
+ tmpfile+="${RANDOM:0:1}"
+ else
+ tmpfile+="${character}"
+ fi
+ done < <(echo -n "${template}")
+
+ if [[ ! -f "${tmpfile}" ]]
+ then
+ echo "${tmpfile}"
+ return
+ fi
+
+ if [[ ${attempts} -ge 100 ]] ; then
+ echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2
+ return
+ fi
+ done
+ }
+
+ local mysql_binary="${EROOT}/usr/bin/mysql"
+ if [[ ! -x "${mysql_binary}" ]] ; then
+ die "'${mysql_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+ fi
+
+ local mysqld_binary="${EROOT}/usr/sbin/mysqld"
+ if [[ ! -x "${mysqld_binary}" ]] ; then
+ die "'${mysqld_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+ fi
+
+ local mysql_install_db_binary="${EROOT}/usr/bin/mysql_install_db"
+ if [[ ! -x "${mysql_install_db_binary}" ]] ; then
+ die "'${mysql_install_db_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+ fi
+
+ local my_print_defaults_binary="${EROOT}/usr/bin/my_print_defaults"
+ if [[ ! -x "${my_print_defaults_binary}" ]] ; then
+ die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!"
+ fi
+
+ if [[ -z "${MYSQL_USER}" ]] ; then
+ MYSQL_USER=mysql
+ if use prefix ; then
+ MYSQL_USER=$(id -u -n 2>/dev/null)
+ if [[ -z "${MYSQL_USER}" ]] ; then
+ die "Failed to determine current username!"
+ fi
+ fi
+ fi
+
+ if [[ -z "${MYSQL_GROUP}" ]] ; then
+ MYSQL_GROUP=mysql
+ if use prefix ; then
+ MYSQL_GROUP=$(id -g -n 2>/dev/null)
+ if [[ -z "${MYSQL_GROUP}" ]] ; then
+ die "Failed to determine current user groupname!"
+ fi
+ fi
+ fi
+
+ # my_print_defaults needs to read stuff in $HOME/.my.cnf
+ local -x HOME="${EROOT}/root"
+
+ # Make sure the vars are correctly initialized
+ mysql_init_vars
+
+ # Read currently set data directory
+ MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named
+ # localhost. Also causes weird failures.
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ die "Sorry, unable to find MY_DATADIR!"
+ elif [[ -d "${MY_DATADIR}/mysql" ]] ; then
+ ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!"
+ ewarn "Please rename or delete its content if you wish to initialize a new data directory."
+ die "${PN} data directory at '${MY_DATADIR}' looks already initialized!"
+ fi
+
+ MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+ MYSQL_TMPDIR=${MYSQL_TMPDIR%/}
+ # These are dir+prefix
+ MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+ MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+ MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+ MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+
+ # Create missing directories.
+ # Always check if mysql user can write to directory even if we just
+ # created directory because a parent directory might be not
+ # accessible for that user.
+ PID_DIR="${EROOT}/run/mysqld"
+ if [[ ! -d "${PID_DIR}" ]] ; then
+ einfo "Creating ${PN} PID directory '${PID_DIR}' ..."
+ install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \
+ || die "Failed to create PID directory '${PID_DIR}'!"
+ fi
+
+ local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_pid_dir_testfile}" ]] \
+ && die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_pid_dir_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!"
+ else
+ rm "${_pid_dir_testfile}" || die
+ unset _pid_dir_testfile
+ fi
+
+ if [[ ! -d "${MY_DATADIR}" ]] ; then
+ einfo "Creating ${PN} data directory '${MY_DATADIR}' ..."
+ install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \
+ || die "Failed to create ${PN} data directory '${MY_DATADIR}'!"
+ fi
+
+ local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_my_datadir_testfile}" ]] \
+ && die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_my_datadir_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!"
+ else
+ rm "${_my_datadir_testfile}" || die
+ unset _my_datadir_testfile
+ fi
+
+ if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then
+ einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..."
+ install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \
+ || die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!"
+ fi
+
+ if [[ -z "${MYSQL_TMPDIR}" ]] ; then
+ MYSQL_TMPDIR="$(_mktemp_dry "${EROOT}/tmp/mysqld-tmp.XXXXXXXXX")"
+ [[ -z "${MYSQL_TMPDIR}" ]] \
+ && die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!"
+
+ mkdir "${MYSQL_TMPDIR}" || die
+ chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die
+ fi
+
+ # Now we need to test MYSQL_TMPDIR...
+ local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_my_tmpdir_testfile}" ]] \
+ && die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_my_tmpdir_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into tmpdir '${MYSQL_TMPDIR}'!"
+ else
+ rm "${_my_tmpdir_testfile}" || die
+ unset _my_tmpdir_testfile
+ fi
+
+ if [[ "${MYSQL_LOG_BIN}" == /* && ! -d "${MYSQL_LOG_BIN}" ]] ; then
+ # Only create directory when MYSQL_LOG_BIN is an absolute path
+ einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..."
+ install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \
+ || die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'"
+ fi
+
+ if [[ "${MYSQL_LOG_BIN}" == /* ]] ; then
+ # Only test when MYSQL_LOG_BIN is an absolute path
+ local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_my_logbin_testfile}" ]] \
+ && die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_my_logbin_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!"
+ else
+ rm "${_my_logbin_testfile}" || die
+ unset _my_logbin_testfile
+ fi
+ fi
+
+ if [[ "${MYSQL_RELAY_LOG}" == /* && ! -d "${MYSQL_RELAY_LOG}" ]] ; then
+ # Only create directory when MYSQL_RELAY_LOG is an absolute path
+ einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..."
+ install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \
+ || die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!"
+ fi
+
+ if [[ "${MYSQL_RELAY_LOG}" == /* ]] ; then
+ # Only test when MYSQL_RELAY_LOG is an absolute path
+ local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_my_relaylog_testfile}" ]] \
+ && die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_my_relaylog_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!"
+ else
+ rm "${_my_relaylog_testfile}" || die
+ unset _my_relaylog_testfile
+ fi
+ fi
+
+ local SETUP_TMPDIR=$(mktemp -d "/tmp/${PN}-config.XXXXXXXXX" 2>/dev/null)
+ [[ -z "${SETUP_TMPDIR}" ]] && die "Failed to create setup tmpdir"
+
+ # Limit access
+ chmod 0770 "${SETUP_TMPDIR}" || die
+ chown ${MYSQL_USER} "${SETUP_TMPDIR}" || die
+
+ local mysql_install_log="${SETUP_TMPDIR}/install_db.log"
+ local mysqld_logfile="${SETUP_TMPDIR}/mysqld.log"
+
+ echo ""
+ einfo "Detected settings:"
+ einfo "=================="
+ einfo "MySQL User:\t\t\t\t${MYSQL_USER}"
+ einfo "MySQL Group:\t\t\t\t${MYSQL_GROUP}"
+ einfo "MySQL DATA directory:\t\t${MY_DATADIR}"
+ einfo "MySQL TMP directory:\t\t\t${MYSQL_TMPDIR}"
+
+ if [[ "${MYSQL_LOG_BIN}" == /* ]] ; then
+ # Absolute path for binary log files specified
+ einfo "MySQL Binary Log File location:\t${MYSQL_LOG_BIN}"
+ fi
+
+ if [[ "${MYSQL_RELAY_LOG}" == /* ]] ; then
+ # Absolute path for relay log files specified
+ einfo "MySQL Relay Log File location:\t${MYSQL_RELAY_LOG}"
+ fi
+
+ einfo "PID DIR:\t\t\t\t${PID_DIR}"
+ einfo "Install db log:\t\t\t${mysql_install_log}"
+ einfo "Install server log:\t\t\t${mysqld_logfile}"
+
+ echo
+
+ if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+ local tmp_mysqld_password_source=
+
+ for tmp_mysqld_password_source in mysql client ; do
+ einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
+ MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
+ if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
+ if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then
+ ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
+ MYSQL_ROOT_PASSWORD=
+ continue
+ fi
+
+ einfo "Found password in '${tmp_mysqld_password_source}' section!"
+ break
+ fi
+ done
+
+ # Sometimes --show is required to display passwords in some implementations of my_print_defaults
+ if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then
+ MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
+ fi
+
+ unset tmp_mysqld_password_source
+ fi
+
+ if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+ local pwd1="a"
+ local pwd2="b"
+
+ echo
+ einfo "No password for mysql 'root' user was specified via environment"
+ einfo "variable MYSQL_ROOT_PASSWORD and no password was found in config"
+ einfo "file like '${HOME}/.my.cnf'."
+ einfo "To continue please provide a password for the mysql 'root' user"
+ einfo "now on console:"
+ ewarn "NOTE: Please avoid [\"'\\_%] characters in the password!"
+ read -rsp " >" pwd1 ; echo
+
+ einfo "Retype the password"
+ read -rsp " >" pwd2 ; echo
+
+ if [[ "x${pwd1}" != "x${pwd2}" ]] ; then
+ die "Passwords are not the same!"
+ fi
+
+ MYSQL_ROOT_PASSWORD="${pwd1}"
+ unset pwd1 pwd2
+
+ echo
+ fi
+
+ local -a mysqld_options
+
+ # Fix bug 446200. Don't reference host my.cnf, needs to come first,
+ # see http://bugs.mysql.com/bug.php?id=31312
+ use prefix && mysqld_options+=( "--defaults-file='${MY_SYSCONFDIR}/my.cnf'" )
+
+ # Figure out which options we need to disable to do the setup
+ local helpfile="${TMPDIR}/mysqld-help"
+ "${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+
+ local opt optexp optfull
+ for opt in host-cache name-resolve networking slave-start \
+ federated ssl log-bin relay-log slow-query-log external-locking \
+ log-slave-updates \
+ ; do
+ optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+ grep -E -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
+ done
+
+ # Prepare timezones, see
+ # https://dev.mysql.com/doc/mysql/en/time-zone-support.html
+ local tz_sql="${SETUP_TMPDIR}/tz.sql"
+
+ echo "USE mysql;" >"${tz_sql}"
+ "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" >> "${tz_sql}" 2>/dev/null
+ if [[ $? -ne 0 ]] ; then
+ die "mysql_tzinfo_to_sql failed!"
+ fi
+
+ local cmd=(
+ "${mysql_install_db_binary}"
+ "${mysqld_options[@]}"
+ "--init-file='${tz_sql}'"
+ "--basedir='${EROOT}/usr'"
+ "--datadir='${MY_DATADIR}'"
+ "--tmpdir='${MYSQL_TMPDIR}'"
+ "--log-error='${mysql_install_log}'"
+ "--rpm"
+ "--cross-bootstrap"
+ "--skip-test-db"
+ "--user=${MYSQL_USER}"
+ )
+
+ einfo "Initializing ${PN} data directory: ${cmd[@]}"
+ eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1
+
+ if [[ $? -ne 0 || ! -f "${MY_DATADIR}/mysql/user.frm" ]] ; then
+ grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2
+ die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!"
+ fi
+
+ local x=${RANDOM}
+ local socket="${PID_DIR}/mysqld.${x}.sock"
+ [[ -f "${socket}" ]] && die "Randomness failed; Socket ${socket} already exists!"
+ local pidfile="${PID_DIR}/mysqld.${x}.pid"
+ [[ -f "${pidfile}" ]] && die "Randomness failed; Pidfile ${pidfile} already exists!"
+ unset x
+
+ cmd=(
+ "${mysqld_binary}"
+ "${mysqld_options[@]}"
+ "--basedir='${EROOT}/usr'"
+ "--datadir='${MY_DATADIR}'"
+ "--tmpdir='${MYSQL_TMPDIR}'"
+ --max_allowed_packet=8M
+ --net_buffer_length=16K
+ "--socket='${socket}'"
+ "--pid-file='${pidfile}'"
+ "--log-error='${mysqld_logfile}'"
+ "--user=${MYSQL_USER}"
+ )
+
+ einfo "Starting mysqld to finalize initialization: ${cmd[@]}"
+ eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 &
+
+ echo -n "Waiting for mysqld to accept connections "
+ local maxtry=15
+ while [[ ! -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+ maxtry=$((${maxtry}-1))
+ echo -n "."
+ sleep 1
+ done
+
+ if [[ -S "${socket}" ]] ; then
+ # Even with a socket we don't know if mysqld will abort
+ # start due to an error so just wait a little bit more...
+ maxtry=5
+ while [[ -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+ maxtry=$((${maxtry}-1))
+ echo -n "."
+ sleep 1
+ done
+ fi
+
+ echo
+
+ if [[ ! -S "${socket}" ]] ; then
+ grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2
+ die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!"
+ fi
+
+ local mysql_logfile="${SETUP_TMPDIR}/set_root_pw.log"
+ touch "${mysql_logfile}" || die
+
+ ebegin "Setting root password"
+ # Do this from memory, as we don't want clear text passwords in temp files
+ local sql="ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}'"
+ cmd=(
+ "${mysql_binary}"
+ --no-defaults
+ "--socket='${socket}'"
+ -hlocalhost
+ "-e \"${sql}\""
+ )
+ eval "${cmd[@]}" >"${mysql_logfile}" 2>&1
+ local rc=$?
+ eend ${rc}
+
+ if [[ ${rc} -ne 0 ]] ; then
+ # Poor man's solution which tries to avoid having password
+ # in log. NOTE: sed can fail if user didn't follow advice
+ # and included character which will require escaping...
+ sed -i -e "s/${MYSQL_ROOT_PASSWORD}/*****/" "${mysql_logfile}" 2>/dev/null
+
+ grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_logfile}"
+ die "Failed to set ${PN} root password. Please review '${mysql_logfile}'!"
+ fi
+
+ # Stop the server
+ if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+ echo -n "Stopping the server "
+ pkill -F "${pidfile}" &>/dev/null
+
+ maxtry=10
+ while [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; do
+ maxtry=$((${maxtry}-1))
+ echo -n "."
+ sleep 1
+ done
+
+ echo
+
+ if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+ # We somehow failed to stop server.
+ # However, not a fatal error. Just warn the user.
+ ewarn "WARNING: mysqld[$(cat "${pidfile}")] is still running!"
+ fi
+ fi
+
+ rm -r "${SETUP_TMPDIR}" || die
+
+ einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!"
+}
diff --git a/dev-db/mariadb/mariadb-10.4.26.ebuild b/dev-db/mariadb/mariadb-10.4.26.ebuild
new file mode 100644
index 000000000000..42db40bc5f57
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.4.26.ebuild
@@ -0,0 +1,1308 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+SUBSLOT="18"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+inherit systemd flag-o-matic prefix toolchain-funcs \
+ multiprocessing java-pkg-opt-2 cmake
+
+# Patch version
+PATCH_SET="https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.4.26-patches-01.tar.xz"
+
+SRC_URI="mirror://mariadb/${PN}-${PV}/source/${P}.tar.gz
+ ${PATCH_SET}"
+
+HOMEPAGE="https://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2 LGPL-2.1+"
+SLOT="$(ver_cut 1-2)/${SUBSLOT:-0}"
+IUSE="+backup bindist cracklib debug extraengine galera innodb-lz4
+ innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
+ numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
+ sst-rsync sst-mariabackup static systemd systemtap tcmalloc
+ test tokudb xml yassl"
+
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
+
+REQUIRED_USE="jdbc? ( extraengine server !static )
+ server? ( tokudb? ( jemalloc !tcmalloc ) )
+ ?? ( tcmalloc jemalloc )
+ static? ( yassl !pam )"
+
+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"
+
+# Shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+COMMON_DEPEND="
+ kernel_linux? (
+ sys-process/procps:0=
+ dev-libs/libaio:0=
+ )
+ >=sys-apps/sed-4
+ >=sys-apps/texinfo-4.7-r1
+ jemalloc? ( dev-libs/jemalloc:0= )
+ tcmalloc? ( dev-util/google-perftools:0= )
+ systemtap? ( >=dev-util/systemtap-1.3:0= )
+ >=sys-libs/zlib-1.2.3:0=
+ kerberos? ( virtual/krb5 )
+ yassl? ( net-libs/gnutls:0= )
+ !yassl? (
+ >=dev-libs/openssl-1.0.0:0=
+ )
+ sys-libs/ncurses:0=
+ !bindist? (
+ sys-libs/binutils-libs:0=
+ >=sys-libs/readline-4.1:0=
+ )
+ server? (
+ backup? ( app-arch/libarchive:0= )
+ cracklib? ( sys-libs/cracklib:0= )
+ extraengine? (
+ odbc? ( dev-db/unixODBC:0= )
+ xml? ( dev-libs/libxml2:2= )
+ )
+ innodb-lz4? ( app-arch/lz4 )
+ innodb-lzo? ( dev-libs/lzo )
+ innodb-snappy? ( app-arch/snappy )
+ mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 )
+ numa? ( sys-process/numactl )
+ oqgraph? (
+ dev-libs/boost:=
+ dev-libs/judy:0=
+ )
+ pam? ( sys-libs/pam:0= )
+ systemd? ( sys-apps/systemd:= )
+ tokudb? ( app-arch/snappy )
+ )
+ >=dev-libs/libpcre-8.41-r1:3=
+ virtual/libcrypt:=
+"
+BDEPEND="virtual/yacc"
+DEPEND="static? ( sys-libs/ncurses[static-libs] )
+ server? (
+ extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) )
+ test? ( acct-group/mysql acct-user/mysql )
+ )
+ ${COMMON_DEPEND}"
+RDEPEND="selinux? ( sec-policy/selinux-mysql )
+ !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
+ !dev-db/mariadb:0
+ !dev-db/mariadb:5.5
+ !dev-db/mariadb:10.1
+ !dev-db/mariadb:10.2
+ !dev-db/mariadb:10.3
+ !dev-db/mariadb:10.5
+ !dev-db/mariadb:10.6
+ !dev-db/mariadb:10.7
+ !dev-db/mariadb:10.8
+ !=virtual/jre-1.8 ) )
+ )
+"
+# For other stuff to bring us in
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+
+mysql_init_vars() {
+ MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
+ MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+ MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+ MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
+
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ MY_DATADIR=""
+ if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
+ MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
+ | sed -ne '/datadir/s|^--datadir=||p' \
+ | tail -n1)
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ MY_DATADIR=$(grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
+ | sed -e 's/.*=\s*//' \
+ | tail -n1)
+ fi
+ fi
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ MY_DATADIR="${MY_LOCALSTATEDIR}"
+ einfo "Using default MY_DATADIR"
+ fi
+ elog "MySQL MY_DATADIR is ${MY_DATADIR}"
+
+ if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
+ if [[ -e "${MY_DATADIR}" ]] ; then
+ # If you get this and you're wondering about it, see bug #207636
+ elog "MySQL datadir found in ${MY_DATADIR}"
+ elog "A new one will not be created."
+ PREVIOUS_DATADIR="yes"
+ else
+ PREVIOUS_DATADIR="no"
+ fi
+ export PREVIOUS_DATADIR
+ fi
+ else
+ if [[ ${EBUILD_PHASE} == "config" ]]; then
+ local new_MY_DATADIR
+ new_MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
+ | sed -ne '/datadir/s|^--datadir=||p' \
+ | tail -n1)
+
+ if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
+ ewarn "MySQL MY_DATADIR has changed"
+ ewarn "from ${MY_DATADIR}"
+ ewarn "to ${new_MY_DATADIR}"
+ MY_DATADIR="${new_MY_DATADIR}"
+ fi
+ fi
+ fi
+
+ export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+ export MY_LOCALSTATEDIR MY_LOGDIR
+ export MY_DATADIR
+}
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != binary ]] ; then
+ if has test ${FEATURES} ; then
+ # Bug #213475 - MySQL _will_ object strenuously if your machine is named
+ # localhost. Also causes weird failures.
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+ if ! has userpriv ${FEATURES} ; then
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+ fi
+ fi
+ fi
+
+ java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+ unpack ${A}
+
+ mv -f "${WORKDIR}/${P/_rc/}" "${S}" || die
+}
+
+src_prepare() {
+ eapply "${WORKDIR}"/mariadb-patches
+
+ eapply_user
+
+ _disable_plugin() {
+ echo > "${S}/plugin/${1}/CMakeLists.txt" || die
+ }
+ _disable_engine() {
+ echo > "${S}/storage/${1}/CMakeLists.txt" || die
+ }
+
+ if use jemalloc; then
+ echo "TARGET_LINK_LIBRARIES(mysqld LINK_PUBLIC jemalloc)" >> "${S}/sql/CMakeLists.txt"
+ elif use tcmalloc; then
+ echo "TARGET_LINK_LIBRARIES(mysqld LINK_PUBLIC tcmalloc)" >> "${S}/sql/CMakeLists.txt"
+ fi
+
+ # Don't build bundled xz-utils for tokudb
+ echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
+ sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
+ sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
+
+ local plugin
+ local server_plugins=( handler_socket auth_socket feedback metadata_lock_info
+ locale_info qc_info server_audit sql_errlog auth_ed25519 )
+ local test_plugins=( audit_null auth_examples daemon_example fulltext
+ debug_key_management example_key_management versioning )
+ if ! use server; then # These plugins are for the server
+ for plugin in "${server_plugins[@]}" ; do
+ _disable_plugin "${plugin}"
+ done
+ fi
+
+ if ! use test; then # These plugins are only used during testing
+ for plugin in "${test_plugins[@]}" ; do
+ _disable_plugin "${plugin}"
+ done
+ _disable_engine test_sql_discovery
+ echo > "${S}/plugin/auth_pam/testing/CMakeLists.txt" || die
+ fi
+
+ _disable_engine example
+
+ if ! use oqgraph ; then # avoids extra library checks
+ _disable_engine oqgraph
+ fi
+
+ if use mroonga ; then
+ # Remove the bundled groonga
+ # There is no CMake flag, it simply checks for existance
+ rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga"
+ else
+ _disable_engine mroonga
+ fi
+
+ # Fix static bindings in galera replication
+ sed -i -e 's~add_library(wsrep_api_v26$~add_library(wsrep_api_v26 STATIC~' \
+ "${S}"/wsrep-lib/wsrep-API/CMakeLists.txt || die
+ sed -i -e 's~add_library(wsrep-lib$~add_library(wsrep-lib STATIC~' \
+ "${S}"/wsrep-lib/src/CMakeLists.txt || die
+
+ # Fix galera_recovery.sh script
+ sed -i -e "s~@bindir@/my_print_defaults~${EPREFIX}/usr/libexec/mariadb/my_print_defaults~" \
+ scripts/galera_recovery.sh || die
+
+ sed -i -e 's~ \$basedir/lib/\*/mariadb19/plugin~~' \
+ "${S}"/scripts/mysql_install_db.sh || die
+
+ cmake_src_prepare
+ java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+ # bug 508724 mariadb cannot use ld.gold
+ tc-ld-disable-gold
+ # Bug #114895, bug #110149
+ filter-flags "-O" "-O[01]"
+
+ # It fails on alpha without this
+ use alpha && append-ldflags "-Wl,--no-relax"
+
+ append-cxxflags -felide-constructors
+
+ # bug #283926, with GCC4.4, this is required to get correct behavior.
+ append-flags -fno-strict-aliasing
+
+ CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+ # debug hack wrt #497532
+ mycmakeargs=(
+ -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+ -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+ -DSYSCONFDIR="${EPREFIX}/etc/mysql"
+ -DINSTALL_BINDIR=bin
+ -DINSTALL_DOCDIR=share/doc/${PF}
+ -DINSTALL_DOCREADMEDIR=share/doc/${PF}
+ -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_INFODIR=share/info
+ -DINSTALL_LIBDIR=$(get_libdir)
+ -DINSTALL_MANDIR=share/man
+ -DINSTALL_MYSQLSHAREDIR=share/mariadb
+ -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
+ -DINSTALL_SCRIPTDIR=bin
+ -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
+ -DINSTALL_SBINDIR=sbin
+ -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
+ -DWITH_COMMENT="Gentoo Linux ${PF}"
+ -DWITH_UNIT_TESTS=$(usex test ON OFF)
+ -DWITH_LIBEDIT=0
+ -DWITH_ZLIB=system
+ -DWITHOUT_LIBWRAP=1
+ -DENABLED_LOCAL_INFILE=1
+ -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+ -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+ -DWITH_DEFAULT_COMPILER_OPTIONS=0
+ -DWITH_DEFAULT_FEATURE_SET=0
+ -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
+ # The build forces this to be defined when cross-compiling. We pass it
+ # all the time for simplicity and to make sure it is actually correct.
+ -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
+ -DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)"
+ -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+ -DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
+ -DCONC_WITH_EXTERNAL_ZLIB=YES
+ -DWITH_EXTERNAL_ZLIB=YES
+ -DSUFFIX_INSTALL_DIR=""
+ -DWITH_UNITTEST=OFF
+ -DWITHOUT_CLIENTLIBS=YES
+ -DCLIENT_PLUGIN_DIALOG=OFF
+ -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT=OFF
+ -DCLIENT_PLUGIN_CLIENT_ED25519=OFF
+ -DCLIENT_PLUGIN_MYSQL_CLEAR_PASSWORD=STATIC
+ -DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=OFF
+ )
+ if use test ; then
+ mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
+ else
+ mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
+ fi
+
+ if ! use yassl ; then
+ mycmakeargs+=( -DWITH_SSL=system -DCLIENT_PLUGIN_SHA256_PASSWORD=STATIC )
+ else
+ mycmakeargs+=( -DWITH_SSL=bundled )
+ fi
+
+ # bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
+ mycmakeargs+=(
+ -DWITH_READLINE=$(usex bindist 1 0)
+ -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
+ -DENABLE_DTRACE=$(usex systemtap)
+ )
+
+ if use server ; then
+ # Connect and Federated{,X} must be treated special
+ # otherwise they will not be built as plugins
+ if ! use extraengine ; then
+ mycmakeargs+=(
+ -DPLUGIN_CONNECT=NO
+ -DPLUGIN_FEDERATED=NO
+ -DPLUGIN_FEDERATEDX=NO
+ )
+ fi
+
+ mycmakeargs+=(
+ -DWITH_PCRE=system
+ -DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
+ -DPLUGIN_SPHINX=$(usex sphinx YES NO)
+ -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
+ -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+ -DPLUGIN_AWS_KEY_MANAGEMENT=NO
+ -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
+ -DPLUGIN_CASSANDRA=NO
+ -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
+ -DPLUGIN_SPIDER=$(usex extraengine YES NO)
+ -DCONNECT_WITH_MYSQL=1
+ -DCONNECT_WITH_LIBXML2=$(usex xml)
+ -DCONNECT_WITH_ODBC=$(usex odbc)
+ -DCONNECT_WITH_JDBC=$(usex jdbc)
+ # Build failure and autodep wrt bug 639144
+ -DCONNECT_WITH_MONGO=OFF
+ -DWITH_WSREP=$(usex galera)
+ -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
+ -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
+ -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
+ -DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO)
+ -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+ -DWITH_MARIABACKUP=$(usex backup ON OFF)
+ -DWITH_LIBARCHIVE=$(usex backup ON OFF)
+ -DINSTALL_SQLBENCHDIR=""
+ -DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO)
+ # systemd is only linked to for server notification
+ -DWITH_SYSTEMD=$(usex systemd yes no)
+ -DWITH_NUMA=$(usex numa ON OFF)
+ )
+
+ # Workaround for MDEV-14524
+ use tokudb && mycmakeargs+=( -DTOKUDB_OK=1 )
+
+ if use test ; then
+ # This is needed for the new client lib which tests a real, open server
+ mycmakeargs+=( -DSKIP_TESTS=ON )
+ fi
+
+ if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
+ ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+ ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+ ewarn "You MUST file bugs without these variables set."
+
+ mycmakeargs+=(
+ -DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+ -DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+ )
+
+ elif ! use latin1 ; then
+ mycmakeargs+=(
+ -DDEFAULT_CHARSET=utf8
+ -DDEFAULT_COLLATION=utf8_general_ci
+ )
+ else
+ mycmakeargs+=(
+ -DDEFAULT_CHARSET=latin1
+ -DDEFAULT_COLLATION=latin1_swedish_ci
+ )
+ fi
+ mycmakeargs+=(
+ -DEXTRA_CHARSETS=all
+ -DMYSQL_USER=mysql
+ -DDISABLE_SHARED=$(usex static YES NO)
+ -DWITH_DEBUG=$(usex debug)
+ -DWITH_EMBEDDED_SERVER=OFF
+ -DWITH_PROFILING=$(usex profiling)
+ )
+
+ if use static; then
+ mycmakeargs+=( -DWITH_PIC=1 )
+ fi
+
+ if use jemalloc || use tcmalloc ; then
+ mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
+ fi
+
+ # Storage engines
+ mycmakeargs+=(
+ -DWITH_ARCHIVE_STORAGE_ENGINE=1
+ -DWITH_BLACKHOLE_STORAGE_ENGINE=1
+ -DWITH_CSV_STORAGE_ENGINE=1
+ -DWITH_HEAP_STORAGE_ENGINE=1
+ -DWITH_INNOBASE_STORAGE_ENGINE=1
+ -DWITH_MYISAMMRG_STORAGE_ENGINE=1
+ -DWITH_MYISAM_STORAGE_ENGINE=1
+ -DWITH_PARTITION_STORAGE_ENGINE=1
+ )
+ else
+ mycmakeargs+=(
+ -DWITHOUT_SERVER=1
+ -DWITH_EMBEDDED_SERVER=OFF
+ -DEXTRA_CHARSETS=none
+ -DINSTALL_SQLBENCHDIR=
+ -DWITH_SYSTEMD=no
+ )
+ fi
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+}
+
+# Official test instructions:
+# USE='extraengine perl server xml' \
+# FEATURES='test userpriv' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+ _disable_test() {
+ local rawtestname bug reason
+ rawtestname="${1}" ; shift
+ bug="${1}" ; shift
+ reason="${@}"
+ ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})"
+ echo "${rawtestname} : BUG#${bug} ${reason}" >> "${T}/disabled.def"
+ }
+
+ local TESTDIR="${BUILD_DIR}/mysql-test"
+ local retstatus_tests
+
+ if ! use server ; then
+ einfo "Skipping server tests due to minimal build."
+ return 0
+ fi
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ if [[ -z "${MTR_PARALLEL}" ]] ; then
+ local -x MTR_PARALLEL=$(makeopts_jobs)
+
+ if [[ ${MTR_PARALLEL} -gt 4 ]] ; then
+ # Running multiple tests in parallel usually require higher ulimit
+ # and fs.aio-max-nr setting. In addition, tests like main.multi_update
+ # are known to hit timeout when system is busy.
+ # To avoid test failure we will limit MTR_PARALLEL to 4 instead of
+ # using "auto".
+ local info_msg="Parallel MySQL test suite jobs limited to 4 (MAKEOPTS=${MTR_PARALLEL})"
+ info_msg+=" to avoid test failures. Set MTR_PARALLEL if you know what you are doing!"
+ einfo "${info_msg}"
+ unset info_msg
+ MTR_PARALLEL=4
+ fi
+ else
+ einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'"
+ fi
+
+ # Try to increase file limits to increase test coverage
+ if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
+ # Upper limit comes from parts.partition_* tests
+ ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
+
+ if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
+ # Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
+ ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
+
+ if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
+ ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
+ else
+ einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
+ fi
+ else
+ einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
+ fi
+ else
+ einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
+ fi
+
+ # create directories because mysqladmin might run out of order
+ mkdir -p "${T}"/var-tests{,/log} || die
+
+ if [[ ! -f "${S}/mysql-test/unstable-tests" ]] ; then
+ touch "${S}"/mysql-test/unstable-tests || die
+ fi
+
+ cp "${S}"/mysql-test/unstable-tests "${T}/disabled.def" || die
+
+ local -a disabled_tests
+ disabled_tests+=( "compat/oracle.plugin;0;Needs example plugin which Gentoo disables" )
+ disabled_tests+=( "innodb_gis.1;25095;Known rounding error with latest AMD processors" )
+ disabled_tests+=( "innodb_gis.gis;25095;Known rounding error with latest AMD processors" )
+ disabled_tests+=( "main.explain_non_select;0;Sporadically failing test" )
+ disabled_tests+=( "main.func_time;0;Dependent on time test was written" )
+ disabled_tests+=( "main.plugin_auth;0;Needs client libraries built" )
+ disabled_tests+=( "main.selectivity_no_engine;26320;Sporadically failing test" )
+ disabled_tests+=( "main.stat_tables;0;Sporadically failing test" )
+ disabled_tests+=( "main.stat_tables_innodb;0;Sporadically failing test" )
+ disabled_tests+=( "main.upgrade_MDEV-19650;25096;Known to be broken" )
+ disabled_tests+=( "mariabackup.*;0;Broken test suite" )
+ disabled_tests+=( "perfschema.nesting;23458;Known to be broken" )
+ disabled_tests+=( "plugins.auth_ed25519;0;Needs client libraries built" )
+ disabled_tests+=( "plugins.cracklib_password_check;0;False positive due to varying policies" )
+ disabled_tests+=( "plugins.two_password_validations;0;False positive due to varying policies" )
+ disabled_tests+=( "roles.acl_statistics;0;False positive due to a user count mismatch caused by previous test" )
+ disabled_tests+=( "sys_vars.wsrep_on_without_provider;25625;Known to be broken" )
+
+ if ! use latin1 ; then
+ disabled_tests+=( "funcs_1.is_columns_mysql;0;Requires USE=latin1" )
+ disabled_tests+=( "main.information_schema;0;Requires USE=latin1" )
+ disabled_tests+=( "main.sp2;24177;Requires USE=latin1" )
+ disabled_tests+=( "main.system_mysql_db;0;Requires USE=latin1" )
+ disabled_tests+=( "main.upgrade_MDEV-19650;24178;Requires USE=latin1" )
+ fi
+
+ local test_infos_str test_infos_arr
+ for test_infos_str in "${disabled_tests[@]}" ; do
+ IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}"
+
+ if [[ ${#test_infos_arr[@]} != 3 ]] ; then
+ die "Invalid test data set, not matching format: ${test_infos_str}"
+ fi
+
+ _disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}"
+ done
+ unset test_infos_str test_infos_arr
+
+ # run mysql-test tests
+ pushd "${TESTDIR}" &>/dev/null || die
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
+ retstatus_tests=$?
+
+ popd &>/dev/null || die
+
+ # Cleanup is important for these testcases.
+ pkill -9 -f "${S}/ndb" 2>/dev/null
+ pkill -9 -f "${S}/sql" 2>/dev/null
+
+ local failures=""
+ [[ ${retstatus_tests} -eq 0 ]] || failures="${failures} tests"
+
+ [[ -z "${failures}" ]] || die "Test failures: ${failures}"
+ einfo "Tests successfully completed"
+}
+
+src_install() {
+ cmake_src_install
+
+ # Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
+ if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
+ rm "${ED}/usr/include/mysql/server/private/config.h" || die
+ fi
+
+ # Make sure the vars are correctly initialized
+ mysql_init_vars
+
+ # Convenience links
+ einfo "Making Convenience links for mysqlcheck multi-call binary"
+ dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
+ dosym "mysqlcheck" "/usr/bin/mysqlrepair"
+ dosym "mysqlcheck" "/usr/bin/mysqloptimize"
+
+ # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+ if [[ -d "${ED}/usr/data" ]] ; then
+ rm -Rf "${ED}/usr/data" || die
+ fi
+
+ # Unless they explicitly specific USE=test, then do not install the
+ # testsuite. It DOES have a use to be installed, esp. when you want to do a
+ # validation of your database configuration after tuning it.
+ if ! use test ; then
+ rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
+ fi
+
+ # Configuration stuff
+ einfo "Building default configuration ..."
+ insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+ [[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
+ cp "${FILESDIR}/my.cnf-10.2" "${TMPDIR}/my.cnf" || die
+ eprefixify "${TMPDIR}/my.cnf"
+ doins "${TMPDIR}/my.cnf"
+ insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d"
+ cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
+ eprefixify "${TMPDIR}/50-distro-client.cnf"
+ doins "${TMPDIR}/50-distro-client.cnf"
+
+ if use server ; then
+ mycnf_src="my.cnf.distro-server"
+ sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+ "${FILESDIR}/${mycnf_src}" \
+ > "${TMPDIR}/my.cnf.ok" || die
+ if use prefix ; then
+ sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
+ "${TMPDIR}/my.cnf.ok" || die
+ fi
+ if use latin1 ; then
+ sed -i \
+ -e "/character-set/s|utf8|latin1|g" \
+ "${TMPDIR}/my.cnf.ok" || die
+ fi
+ eprefixify "${TMPDIR}/my.cnf.ok"
+ newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
+
+ einfo "Including support files and sample configurations"
+ docinto "support-files"
+ local script
+ for script in \
+ "${S}"/support-files/magic
+ do
+ [[ -f "$script" ]] && dodoc "${script}"
+ done
+
+ docinto "scripts"
+ for script in "${S}"/scripts/mysql* ; do
+ [[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
+ done
+ # Manually install supporting files that conflict with other packages
+ # but are needed for galera and initial installation
+ exeinto /usr/libexec/mariadb
+ doexe "${BUILD_DIR}/extra/my_print_defaults" "${BUILD_DIR}/extra/perror"
+
+ if use pam ; then
+ keepdir /usr/$(get_libdir)/mariadb/plugin/auth_pam_tool_dir
+ fi
+ fi
+
+ # Remove bundled mytop in favor of dev-db/mytop
+ local mytop_file
+ for mytop_file in \
+ "${ED}/usr/bin/mytop" \
+ "${ED}/usr/share/man/man1/mytop.1" \
+ ; do
+ if [[ -e "${mytop_file}" ]] ; then
+ rm -v "${mytop_file}" || die
+ fi
+ done
+
+ # Fix a dangling symlink when galera is not built
+ if [[ -L "${ED}/usr/bin/wsrep_sst_rsync_wan" ]] && ! use galera ; then
+ rm "${ED}/usr/bin/wsrep_sst_rsync_wan" || die
+ fi
+
+ # Remove dangling symlink
+ rm "${ED}/usr/$(get_libdir)/libmariadb.a" || die
+
+ # Remove broken SST scripts that are incompatible
+ local scriptremove
+ for scriptremove in wsrep_sst_xtrabackup wsrep_sst_xtrabackup-v2 ; do
+ if [[ -e "${ED}/usr/bin/${scriptremove}" ]] ; then
+ rm "${ED}/usr/bin/${scriptremove}" || die
+ fi
+ done
+}
+
+pkg_preinst() {
+ java-pkg-opt-2_pkg_preinst
+}
+
+pkg_postinst() {
+ # Make sure the vars are correctly initialized
+ mysql_init_vars
+
+ # Create log directory securely if it does not exist
+ [[ -d "${ROOT}/${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}/${MY_LOGDIR}"
+
+ if use server ; then
+ if use pam; then
+ einfo
+ elog "This install includes the PAM authentication plugin."
+ elog "To activate and configure the PAM plugin, please read:"
+ elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/"
+ einfo
+ chown mysql:mysql "${EROOT}/usr/$(get_libdir)/mariadb/plugin/auth_pam_tool_dir" || die
+ fi
+
+ if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+ einfo
+ elog "You might want to run:"
+ elog "\"emerge --config =${CATEGORY}/${PF}\""
+ elog "if this is a new install."
+ elog
+ elog "If you are switching server implentations, you should run the"
+ elog "mysql_upgrade tool."
+ einfo
+ else
+ einfo
+ elog "If you are upgrading major versions, you should run the"
+ elog "mysql_upgrade tool."
+ einfo
+ fi
+
+ if use galera ; then
+ einfo
+ elog "Be sure to edit the my.cnf file to activate your cluster settings."
+ elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
+ elog "The first time the cluster is activated, you should add"
+ elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
+ elog "This option should then be removed for subsequent starts."
+ einfo
+ if [[ -n "${REPLACING_VERSIONS}" ]] ; then
+ local rver
+ for rver in ${REPLACING_VERSIONS} ; do
+ if ver_test "${rver}" -lt "10.4.0" ; then
+ ewarn "Upgrading galera from a previous version requires admin restart of the entire cluster."
+ ewarn "Please refer to https://mariadb.com/kb/en/library/changes-improvements-in-mariadb-104/#galera-4"
+ ewarn "for more information"
+ fi
+ done
+ fi
+ fi
+ fi
+
+ # Note about configuration change
+ einfo
+ elog "This version of mariadb reorganizes the configuration from a single my.cnf"
+ elog "to several files in /etc/mysql/${PN}.d."
+ elog "Please backup any changes you made to /etc/mysql/my.cnf"
+ elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension."
+ elog "You may have as many files as needed and they are read alphabetically."
+ elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
+ einfo
+}
+
+pkg_config() {
+ _getoptval() {
+ local section="${1}"
+ local option="--${2}"
+ local extra_options="${3}"
+ local cmd=(
+ "${my_print_defaults_binary}"
+ "${extra_options}"
+ "${section}"
+ )
+
+ local values=()
+ local parameters=( $(eval "${cmd[@]}" 2>/dev/null) )
+ for parameter in "${parameters[@]}"
+ do
+ # my_print_defaults guarantees output of options, one per line,
+ # in the form that they would be specified on the command line.
+ # So checking for --option=* should be safe.
+ case ${parameter} in
+ ${option}=*)
+ values+=( "${parameter#*=}" )
+ ;;
+ esac
+ done
+
+ if [[ ${#values[@]} -gt 0 ]] ; then
+ # Option could have been set multiple times
+ # in which case only the last occurrence
+ # contains the current value
+ echo "${values[-1]}"
+ fi
+ }
+
+ _mktemp_dry() {
+ # emktemp has no --dry-run option
+ local template="${1}"
+
+ if [[ -z "${template}" ]] ; then
+ if [[ -z "${T}" ]] ; then
+ template="/tmp/XXXXXXX"
+ else
+ template="${T}/XXXXXXX"
+ fi
+ fi
+
+ local template_wo_X=${template//X/}
+ local n_X
+ let n_X=${#template}-${#template_wo_X}
+ if [[ ${n_X} -lt 3 ]] ; then
+ echo "${FUNCNAME[0]}: too few X's in template ‘${template}’" >&2
+ return
+ fi
+
+ local attempts=0
+ local character tmpfile
+ while [[ true ]] ; do
+ let attempts=attempts+1
+
+ new_file=
+ while read -n1 character ; do
+ if [[ "${character}" == "X" ]] ; then
+ tmpfile+="${RANDOM:0:1}"
+ else
+ tmpfile+="${character}"
+ fi
+ done < <(echo -n "${template}")
+
+ if [[ ! -f "${tmpfile}" ]]
+ then
+ echo "${tmpfile}"
+ return
+ fi
+
+ if [[ ${attempts} -ge 100 ]] ; then
+ echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2
+ return
+ fi
+ done
+ }
+
+ local mysql_binary="${EROOT}/usr/bin/mysql"
+ if [[ ! -x "${mysql_binary}" ]] ; then
+ die "'${mysql_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+ fi
+
+ local mysqld_binary="${EROOT}/usr/sbin/mysqld"
+ if [[ ! -x "${mysqld_binary}" ]] ; then
+ die "'${mysqld_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+ fi
+
+ local mysql_install_db_binary="${EROOT}/usr/bin/mysql_install_db"
+ if [[ ! -x "${mysql_install_db_binary}" ]] ; then
+ die "'${mysql_install_db_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+ fi
+
+ local my_print_defaults_binary="${EROOT}/usr/bin/my_print_defaults"
+ if [[ ! -x "${my_print_defaults_binary}" ]] ; then
+ die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!"
+ fi
+
+ if [[ -z "${MYSQL_USER}" ]] ; then
+ MYSQL_USER=mysql
+ if use prefix ; then
+ MYSQL_USER=$(id -u -n 2>/dev/null)
+ if [[ -z "${MYSQL_USER}" ]] ; then
+ die "Failed to determine current username!"
+ fi
+ fi
+ fi
+
+ if [[ -z "${MYSQL_GROUP}" ]] ; then
+ MYSQL_GROUP=mysql
+ if use prefix ; then
+ MYSQL_GROUP=$(id -g -n 2>/dev/null)
+ if [[ -z "${MYSQL_GROUP}" ]] ; then
+ die "Failed to determine current user groupname!"
+ fi
+ fi
+ fi
+
+ # my_print_defaults needs to read stuff in $HOME/.my.cnf
+ local -x HOME="${EROOT}/root"
+
+ # Make sure the vars are correctly initialized
+ mysql_init_vars
+
+ # Read currently set data directory
+ MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named
+ # localhost. Also causes weird failures.
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ die "Sorry, unable to find MY_DATADIR!"
+ elif [[ -d "${MY_DATADIR}/mysql" ]] ; then
+ ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!"
+ ewarn "Please rename or delete its content if you wish to initialize a new data directory."
+ die "${PN} data directory at '${MY_DATADIR}' looks already initialized!"
+ fi
+
+ MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+ MYSQL_TMPDIR=${MYSQL_TMPDIR%/}
+ # These are dir+prefix
+ MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+ MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+ MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+ MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+
+ # Create missing directories.
+ # Always check if mysql user can write to directory even if we just
+ # created directory because a parent directory might be not
+ # accessible for that user.
+ PID_DIR="${EROOT}/run/mysqld"
+ if [[ ! -d "${PID_DIR}" ]] ; then
+ einfo "Creating ${PN} PID directory '${PID_DIR}' ..."
+ install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \
+ || die "Failed to create PID directory '${PID_DIR}'!"
+ fi
+
+ local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_pid_dir_testfile}" ]] \
+ && die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_pid_dir_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!"
+ else
+ rm "${_pid_dir_testfile}" || die
+ unset _pid_dir_testfile
+ fi
+
+ if [[ ! -d "${MY_DATADIR}" ]] ; then
+ einfo "Creating ${PN} data directory '${MY_DATADIR}' ..."
+ install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \
+ || die "Failed to create ${PN} data directory '${MY_DATADIR}'!"
+ fi
+
+ local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_my_datadir_testfile}" ]] \
+ && die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_my_datadir_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!"
+ else
+ rm "${_my_datadir_testfile}" || die
+ unset _my_datadir_testfile
+ fi
+
+ if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then
+ einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..."
+ install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \
+ || die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!"
+ fi
+
+ if [[ -z "${MYSQL_TMPDIR}" ]] ; then
+ MYSQL_TMPDIR="$(_mktemp_dry "${EROOT}/tmp/mysqld-tmp.XXXXXXXXX")"
+ [[ -z "${MYSQL_TMPDIR}" ]] \
+ && die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!"
+
+ mkdir "${MYSQL_TMPDIR}" || die
+ chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die
+ fi
+
+ # Now we need to test MYSQL_TMPDIR...
+ local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_my_tmpdir_testfile}" ]] \
+ && die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_my_tmpdir_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into tmpdir '${MYSQL_TMPDIR}'!"
+ else
+ rm "${_my_tmpdir_testfile}" || die
+ unset _my_tmpdir_testfile
+ fi
+
+ if [[ "${MYSQL_LOG_BIN}" == /* && ! -d "${MYSQL_LOG_BIN}" ]] ; then
+ # Only create directory when MYSQL_LOG_BIN is an absolute path
+ einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..."
+ install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \
+ || die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'"
+ fi
+
+ if [[ "${MYSQL_LOG_BIN}" == /* ]] ; then
+ # Only test when MYSQL_LOG_BIN is an absolute path
+ local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_my_logbin_testfile}" ]] \
+ && die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_my_logbin_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!"
+ else
+ rm "${_my_logbin_testfile}" || die
+ unset _my_logbin_testfile
+ fi
+ fi
+
+ if [[ "${MYSQL_RELAY_LOG}" == /* && ! -d "${MYSQL_RELAY_LOG}" ]] ; then
+ # Only create directory when MYSQL_RELAY_LOG is an absolute path
+ einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..."
+ install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \
+ || die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!"
+ fi
+
+ if [[ "${MYSQL_RELAY_LOG}" == /* ]] ; then
+ # Only test when MYSQL_RELAY_LOG is an absolute path
+ local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_my_relaylog_testfile}" ]] \
+ && die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_my_relaylog_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!"
+ else
+ rm "${_my_relaylog_testfile}" || die
+ unset _my_relaylog_testfile
+ fi
+ fi
+
+ local SETUP_TMPDIR=$(mktemp -d "/tmp/${PN}-config.XXXXXXXXX" 2>/dev/null)
+ [[ -z "${SETUP_TMPDIR}" ]] && die "Failed to create setup tmpdir"
+
+ # Limit access
+ chmod 0770 "${SETUP_TMPDIR}" || die
+ chown ${MYSQL_USER} "${SETUP_TMPDIR}" || die
+
+ local mysql_install_log="${SETUP_TMPDIR}/install_db.log"
+ local mysqld_logfile="${SETUP_TMPDIR}/mysqld.log"
+
+ echo ""
+ einfo "Detected settings:"
+ einfo "=================="
+ einfo "MySQL User:\t\t\t\t${MYSQL_USER}"
+ einfo "MySQL Group:\t\t\t\t${MYSQL_GROUP}"
+ einfo "MySQL DATA directory:\t\t${MY_DATADIR}"
+ einfo "MySQL TMP directory:\t\t\t${MYSQL_TMPDIR}"
+
+ if [[ "${MYSQL_LOG_BIN}" == /* ]] ; then
+ # Absolute path for binary log files specified
+ einfo "MySQL Binary Log File location:\t${MYSQL_LOG_BIN}"
+ fi
+
+ if [[ "${MYSQL_RELAY_LOG}" == /* ]] ; then
+ # Absolute path for relay log files specified
+ einfo "MySQL Relay Log File location:\t${MYSQL_RELAY_LOG}"
+ fi
+
+ einfo "PID DIR:\t\t\t\t${PID_DIR}"
+ einfo "Install db log:\t\t\t${mysql_install_log}"
+ einfo "Install server log:\t\t\t${mysqld_logfile}"
+
+ echo
+
+ if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+ local tmp_mysqld_password_source=
+
+ for tmp_mysqld_password_source in mysql client ; do
+ einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
+ MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
+ if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
+ if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then
+ ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
+ MYSQL_ROOT_PASSWORD=
+ continue
+ fi
+
+ einfo "Found password in '${tmp_mysqld_password_source}' section!"
+ break
+ fi
+ done
+
+ # Sometimes --show is required to display passwords in some implementations of my_print_defaults
+ if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then
+ MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
+ fi
+
+ unset tmp_mysqld_password_source
+ fi
+
+ if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+ local pwd1="a"
+ local pwd2="b"
+
+ echo
+ einfo "No password for mysql 'root' user was specified via environment"
+ einfo "variable MYSQL_ROOT_PASSWORD and no password was found in config"
+ einfo "file like '${HOME}/.my.cnf'."
+ einfo "To continue please provide a password for the mysql 'root' user"
+ einfo "now on console:"
+ ewarn "NOTE: Please avoid [\"'\\_%] characters in the password!"
+ read -rsp " >" pwd1 ; echo
+
+ einfo "Retype the password"
+ read -rsp " >" pwd2 ; echo
+
+ if [[ "x${pwd1}" != "x${pwd2}" ]] ; then
+ die "Passwords are not the same!"
+ fi
+
+ MYSQL_ROOT_PASSWORD="${pwd1}"
+ unset pwd1 pwd2
+
+ echo
+ fi
+
+ local -a mysqld_options
+
+ # Fix bug 446200. Don't reference host my.cnf, needs to come first,
+ # see http://bugs.mysql.com/bug.php?id=31312
+ use prefix && mysqld_options+=( "--defaults-file='${MY_SYSCONFDIR}/my.cnf'" )
+
+ # Figure out which options we need to disable to do the setup
+ local helpfile="${TMPDIR}/mysqld-help"
+ "${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+
+ local opt optexp optfull
+ for opt in host-cache name-resolve networking slave-start \
+ federated ssl log-bin relay-log slow-query-log external-locking \
+ log-slave-updates \
+ ; do
+ optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+ grep -E -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
+ done
+
+ # Prepare timezones, see
+ # https://dev.mysql.com/doc/mysql/en/time-zone-support.html
+ local tz_sql="${SETUP_TMPDIR}/tz.sql"
+
+ echo "USE mysql;" >"${tz_sql}"
+ "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" >> "${tz_sql}" 2>/dev/null
+ if [[ $? -ne 0 ]] ; then
+ die "mysql_tzinfo_to_sql failed!"
+ fi
+
+ local cmd=(
+ "${mysql_install_db_binary}"
+ "${mysqld_options[@]}"
+ "--init-file='${tz_sql}'"
+ "--basedir='${EROOT}/usr'"
+ "--datadir='${MY_DATADIR}'"
+ "--tmpdir='${MYSQL_TMPDIR}'"
+ "--log-error='${mysql_install_log}'"
+ "--rpm"
+ "--cross-bootstrap"
+ "--skip-test-db"
+ "--user=${MYSQL_USER}"
+ )
+
+ einfo "Initializing ${PN} data directory: ${cmd[@]}"
+ eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1
+
+ if [[ $? -ne 0 || ! -f "${MY_DATADIR}/mysql/user.frm" ]] ; then
+ grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2
+ die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!"
+ fi
+
+ local x=${RANDOM}
+ local socket="${PID_DIR}/mysqld.${x}.sock"
+ [[ -f "${socket}" ]] && die "Randomness failed; Socket ${socket} already exists!"
+ local pidfile="${PID_DIR}/mysqld.${x}.pid"
+ [[ -f "${pidfile}" ]] && die "Randomness failed; Pidfile ${pidfile} already exists!"
+ unset x
+
+ cmd=(
+ "${mysqld_binary}"
+ "${mysqld_options[@]}"
+ "--basedir='${EROOT}/usr'"
+ "--datadir='${MY_DATADIR}'"
+ "--tmpdir='${MYSQL_TMPDIR}'"
+ --max_allowed_packet=8M
+ --net_buffer_length=16K
+ "--socket='${socket}'"
+ "--pid-file='${pidfile}'"
+ "--log-error='${mysqld_logfile}'"
+ "--user=${MYSQL_USER}"
+ )
+
+ einfo "Starting mysqld to finalize initialization: ${cmd[@]}"
+ eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 &
+
+ echo -n "Waiting for mysqld to accept connections "
+ local maxtry=15
+ while [[ ! -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+ maxtry=$((${maxtry}-1))
+ echo -n "."
+ sleep 1
+ done
+
+ if [[ -S "${socket}" ]] ; then
+ # Even with a socket we don't know if mysqld will abort
+ # start due to an error so just wait a little bit more...
+ maxtry=5
+ while [[ -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+ maxtry=$((${maxtry}-1))
+ echo -n "."
+ sleep 1
+ done
+ fi
+
+ echo
+
+ if [[ ! -S "${socket}" ]] ; then
+ grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2
+ die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!"
+ fi
+
+ local mysql_logfile="${SETUP_TMPDIR}/set_root_pw.log"
+ touch "${mysql_logfile}" || die
+
+ ebegin "Setting root password"
+ # Do this from memory, as we don't want clear text passwords in temp files
+ local sql="ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}'"
+ cmd=(
+ "${mysql_binary}"
+ --no-defaults
+ "--socket='${socket}'"
+ -hlocalhost
+ "-e \"${sql}\""
+ )
+ eval "${cmd[@]}" >"${mysql_logfile}" 2>&1
+ local rc=$?
+ eend ${rc}
+
+ if [[ ${rc} -ne 0 ]] ; then
+ # Poor man's solution which tries to avoid having password
+ # in log. NOTE: sed can fail if user didn't follow advice
+ # and included character which will require escaping...
+ sed -i -e "s/${MYSQL_ROOT_PASSWORD}/*****/" "${mysql_logfile}" 2>/dev/null
+
+ grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_logfile}"
+ die "Failed to set ${PN} root password. Please review '${mysql_logfile}'!"
+ fi
+
+ # Stop the server
+ if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+ echo -n "Stopping the server "
+ pkill -F "${pidfile}" &>/dev/null
+
+ maxtry=10
+ while [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; do
+ maxtry=$((${maxtry}-1))
+ echo -n "."
+ sleep 1
+ done
+
+ echo
+
+ if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+ # We somehow failed to stop server.
+ # However, not a fatal error. Just warn the user.
+ ewarn "WARNING: mysqld[$(cat "${pidfile}")] is still running!"
+ fi
+ fi
+
+ rm -r "${SETUP_TMPDIR}" || die
+
+ einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!"
+}
diff --git a/dev-db/mariadb/mariadb-10.5.17.ebuild b/dev-db/mariadb/mariadb-10.5.17.ebuild
new file mode 100644
index 000000000000..605403717fad
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.5.17.ebuild
@@ -0,0 +1,1315 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+SUBSLOT="18"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+inherit systemd flag-o-matic prefix toolchain-funcs \
+ multiprocessing java-pkg-opt-2 cmake
+
+# Patch version
+PATCH_SET="https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.5.17-patches-01.tar.xz"
+
+SRC_URI="mirror://mariadb/${PN}-${PV}/source/${P}.tar.gz
+ ${PATCH_SET}"
+
+HOMEPAGE="https://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2 LGPL-2.1+"
+SLOT="$(ver_cut 1-2)/${SUBSLOT:-0}"
+IUSE="+backup bindist columnstore cracklib debug extraengine galera innodb-lz4
+ innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
+ numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
+ sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc
+ test xml yassl"
+
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
+
+REQUIRED_USE="jdbc? ( extraengine server !static )
+ ?? ( tcmalloc jemalloc )
+ static? ( yassl !pam )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+
+# Shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+COMMON_DEPEND="
+ >=dev-libs/libpcre2-10.34:=
+ >=sys-apps/sed-4
+ >=sys-apps/texinfo-4.7-r1
+ sys-libs/ncurses:0=
+ >=sys-libs/zlib-1.2.3:0=
+ virtual/libcrypt:=
+ !bindist? (
+ sys-libs/binutils-libs:0=
+ >=sys-libs/readline-4.1:0=
+ )
+ jemalloc? ( dev-libs/jemalloc:0= )
+ kerberos? ( virtual/krb5 )
+ kernel_linux? (
+ sys-process/procps:0=
+ dev-libs/libaio:0=
+ )
+ server? (
+ app-arch/bzip2
+ app-arch/xz-utils
+ backup? ( app-arch/libarchive:0= )
+ columnstore? (
+ app-arch/snappy
+ dev-libs/boost:=
+ dev-libs/libxml2:2=
+ )
+ cracklib? ( sys-libs/cracklib:0= )
+ extraengine? (
+ odbc? ( dev-db/unixODBC:0= )
+ xml? ( dev-libs/libxml2:2= )
+ )
+ innodb-lz4? ( app-arch/lz4 )
+ innodb-lzo? ( dev-libs/lzo )
+ innodb-snappy? ( app-arch/snappy )
+ mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 )
+ numa? ( sys-process/numactl )
+ oqgraph? (
+ dev-libs/boost:=
+ dev-libs/judy:0=
+ )
+ pam? ( sys-libs/pam:0= )
+ s3? ( net-misc/curl )
+ systemd? ( sys-apps/systemd:= )
+ )
+ systemtap? ( >=dev-util/systemtap-1.3:0= )
+ tcmalloc? ( dev-util/google-perftools:0= )
+ yassl? ( net-libs/gnutls:0= )
+ !yassl? (
+ >=dev-libs/openssl-1.0.0:0=
+ )
+"
+BDEPEND="virtual/yacc"
+DEPEND="${COMMON_DEPEND}
+ server? (
+ extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) )
+ test? ( acct-group/mysql acct-user/mysql )
+ )
+ static? ( sys-libs/ncurses[static-libs] )
+"
+RDEPEND="${COMMON_DEPEND}
+ !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
+ !dev-db/mariadb:0
+ !dev-db/mariadb:5.5
+ !dev-db/mariadb:10.1
+ !dev-db/mariadb:10.2
+ !dev-db/mariadb:10.3
+ !dev-db/mariadb:10.4
+ !dev-db/mariadb:10.6
+ !dev-db/mariadb:10.7
+ !dev-db/mariadb:10.8
+ !=virtual/jre-1.8 ) )
+ galera? (
+ sys-apps/iproute2
+ =sys-cluster/galera-26*
+ sst-rsync? ( sys-process/lsof )
+ sst-mariabackup? ( net-misc/socat[ssl] )
+ )
+ !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql )
+ )
+"
+# For other stuff to bring us in
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+
+mysql_init_vars() {
+ MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
+ MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+ MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+ MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
+
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ MY_DATADIR=""
+ if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
+ MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
+ | sed -ne '/datadir/s|^--datadir=||p' \
+ | tail -n1)
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ MY_DATADIR=$(grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
+ | sed -e 's/.*=\s*//' \
+ | tail -n1)
+ fi
+ fi
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ MY_DATADIR="${MY_LOCALSTATEDIR}"
+ einfo "Using default MY_DATADIR"
+ fi
+ elog "MySQL MY_DATADIR is ${MY_DATADIR}"
+
+ if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
+ if [[ -e "${MY_DATADIR}" ]] ; then
+ # If you get this and you're wondering about it, see bug #207636
+ elog "MySQL datadir found in ${MY_DATADIR}"
+ elog "A new one will not be created."
+ PREVIOUS_DATADIR="yes"
+ else
+ PREVIOUS_DATADIR="no"
+ fi
+ export PREVIOUS_DATADIR
+ fi
+ else
+ if [[ ${EBUILD_PHASE} == "config" ]]; then
+ local new_MY_DATADIR
+ new_MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
+ | sed -ne '/datadir/s|^--datadir=||p' \
+ | tail -n1)
+
+ if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
+ ewarn "MySQL MY_DATADIR has changed"
+ ewarn "from ${MY_DATADIR}"
+ ewarn "to ${new_MY_DATADIR}"
+ MY_DATADIR="${new_MY_DATADIR}"
+ fi
+ fi
+ fi
+
+ export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+ export MY_LOCALSTATEDIR MY_LOGDIR
+ export MY_DATADIR
+}
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != binary ]] ; then
+ if has test ${FEATURES} ; then
+ # Bug #213475 - MySQL _will_ object strenuously if your machine is named
+ # localhost. Also causes weird failures.
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+ if ! has userpriv ${FEATURES} ; then
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+ fi
+ fi
+ fi
+
+ java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+ unpack ${A}
+
+ mv -f "${WORKDIR}/${P/_rc/}" "${S}" || die
+}
+
+src_prepare() {
+ eapply "${WORKDIR}"/mariadb-patches
+
+ eapply_user
+
+ _disable_plugin() {
+ echo > "${S}/plugin/${1}/CMakeLists.txt" || die
+ }
+ _disable_engine() {
+ echo > "${S}/storage/${1}/CMakeLists.txt" || die
+ }
+
+ if use jemalloc; then
+ echo "TARGET_LINK_LIBRARIES(mariadbd LINK_PUBLIC jemalloc)" >> "${S}/sql/CMakeLists.txt"
+ elif use tcmalloc; then
+ echo "TARGET_LINK_LIBRARIES(mariadbd LINK_PUBLIC tcmalloc)" >> "${S}/sql/CMakeLists.txt"
+ fi
+
+ local plugin
+ local server_plugins=( handler_socket auth_socket feedback metadata_lock_info
+ locale_info qc_info server_audit sql_errlog auth_ed25519 )
+ local test_plugins=( audit_null auth_examples daemon_example fulltext
+ debug_key_management example_key_management versioning )
+ if ! use server; then # These plugins are for the server
+ for plugin in "${server_plugins[@]}" ; do
+ _disable_plugin "${plugin}"
+ done
+ fi
+
+ if ! use test; then # These plugins are only used during testing
+ for plugin in "${test_plugins[@]}" ; do
+ _disable_plugin "${plugin}"
+ done
+ _disable_engine test_sql_discovery
+ echo > "${S}/plugin/auth_pam/testing/CMakeLists.txt" || die
+ fi
+
+ _disable_engine example
+
+ if ! use oqgraph ; then # avoids extra library checks
+ _disable_engine oqgraph
+ fi
+
+ if use mroonga ; then
+ # Remove the bundled groonga
+ # There is no CMake flag, it simply checks for existance
+ rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga"
+ else
+ _disable_engine mroonga
+ fi
+
+ # Fix static bindings in galera replication
+ sed -i -e 's~add_library(wsrep_api_v26$~add_library(wsrep_api_v26 STATIC~' \
+ "${S}"/wsrep-lib/wsrep-API/CMakeLists.txt || die
+ sed -i -e 's~add_library(wsrep-lib$~add_library(wsrep-lib STATIC~' \
+ "${S}"/wsrep-lib/src/CMakeLists.txt || die
+
+ # Fix galera_recovery.sh script
+ sed -i -e "s~@bindir@/my_print_defaults~${EPREFIX}/usr/libexec/mariadb/my_print_defaults~" \
+ scripts/galera_recovery.sh || die
+
+ sed -i -e 's~ \$basedir/lib/\*/mariadb19/plugin~~' \
+ "${S}"/scripts/mysql_install_db.sh || die
+
+ cmake_src_prepare
+ java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+ # bug 508724 mariadb cannot use ld.gold
+ tc-ld-disable-gold
+ # Bug #114895, bug #110149
+ filter-flags "-O" "-O[01]"
+
+ # It fails on alpha without this
+ use alpha && append-ldflags "-Wl,--no-relax"
+
+ append-cxxflags -felide-constructors
+
+ # bug #283926, with GCC4.4, this is required to get correct behavior.
+ append-flags -fno-strict-aliasing
+
+ CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+ # debug hack wrt #497532
+ mycmakeargs=(
+ -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+ -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+ -DSYSCONFDIR="${EPREFIX}/etc/mysql"
+ -DINSTALL_BINDIR=bin
+ -DINSTALL_DOCDIR=share/doc/${PF}
+ -DINSTALL_DOCREADMEDIR=share/doc/${PF}
+ -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_INFODIR=share/info
+ -DINSTALL_LIBDIR=$(get_libdir)
+ -DINSTALL_MANDIR=share/man
+ -DINSTALL_MYSQLSHAREDIR=share/mariadb
+ -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
+ -DINSTALL_SCRIPTDIR=bin
+ -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
+ -DINSTALL_SBINDIR=sbin
+ -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
+ -DWITH_COMMENT="Gentoo Linux ${PF}"
+ -DWITH_UNIT_TESTS=$(usex test ON OFF)
+ -DWITH_LIBEDIT=0
+ -DWITH_ZLIB=system
+ -DWITHOUT_LIBWRAP=1
+ -DENABLED_LOCAL_INFILE=1
+ -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+ -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+ -DWITH_DEFAULT_COMPILER_OPTIONS=0
+ -DWITH_DEFAULT_FEATURE_SET=0
+ -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
+ # The build forces this to be defined when cross-compiling. We pass it
+ # all the time for simplicity and to make sure it is actually correct.
+ -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
+ -DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)"
+ -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+ -DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
+ -DCONC_WITH_EXTERNAL_ZLIB=YES
+ -DWITH_EXTERNAL_ZLIB=YES
+ -DSUFFIX_INSTALL_DIR=""
+ -DWITH_UNITTEST=OFF
+ -DWITHOUT_CLIENTLIBS=YES
+ -DCLIENT_PLUGIN_DIALOG=OFF
+ -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT=OFF
+ -DCLIENT_PLUGIN_CLIENT_ED25519=OFF
+ -DCLIENT_PLUGIN_MYSQL_CLEAR_PASSWORD=STATIC
+ -DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=OFF
+ )
+ if use test ; then
+ mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
+ else
+ mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
+ fi
+
+ if ! use yassl ; then
+ mycmakeargs+=( -DWITH_SSL=system -DCLIENT_PLUGIN_SHA256_PASSWORD=STATIC )
+ else
+ mycmakeargs+=( -DWITH_SSL=bundled )
+ fi
+
+ # bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
+ mycmakeargs+=(
+ -DWITH_READLINE=$(usex bindist 1 0)
+ -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
+ -DENABLE_DTRACE=$(usex systemtap)
+ )
+
+ if use server ; then
+ # Connect and Federated{,X} must be treated special
+ # otherwise they will not be built as plugins
+ if ! use extraengine ; then
+ mycmakeargs+=(
+ -DPLUGIN_CONNECT=NO
+ -DPLUGIN_FEDERATED=NO
+ -DPLUGIN_FEDERATEDX=NO
+ )
+ fi
+
+ mycmakeargs+=(
+ -DWITH_PCRE=system
+ -DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
+ -DPLUGIN_SPHINX=$(usex sphinx YES NO)
+ -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+ -DPLUGIN_AWS_KEY_MANAGEMENT=NO
+ -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
+ -DPLUGIN_CASSANDRA=NO
+ -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
+ -DPLUGIN_SPIDER=$(usex extraengine YES NO)
+ -DPLUGIN_S3=$(usex s3 YES NO)
+ -DPLUGIN_COLUMNSTORE=$(usex columnstore YES NO)
+ -DCONNECT_WITH_MYSQL=1
+ -DCONNECT_WITH_LIBXML2=$(usex xml)
+ -DCONNECT_WITH_ODBC=$(usex odbc)
+ -DCONNECT_WITH_JDBC=$(usex jdbc)
+ # Build failure and autodep wrt bug 639144
+ -DCONNECT_WITH_MONGO=OFF
+ -DWITH_WSREP=$(usex galera)
+ -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
+ -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
+ -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
+ -DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO)
+ -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+ -DWITH_MARIABACKUP=$(usex backup ON OFF)
+ -DWITH_LIBARCHIVE=$(usex backup ON OFF)
+ -DINSTALL_SQLBENCHDIR=""
+ -DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO)
+ # systemd is only linked to for server notification
+ -DWITH_SYSTEMD=$(usex systemd yes no)
+ -DWITH_NUMA=$(usex numa ON OFF)
+ )
+
+ if use test ; then
+ # This is needed for the new client lib which tests a real, open server
+ mycmakeargs+=( -DSKIP_TESTS=ON )
+ fi
+
+ if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
+ ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+ ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+ ewarn "You MUST file bugs without these variables set."
+
+ mycmakeargs+=(
+ -DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+ -DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+ )
+
+ elif ! use latin1 ; then
+ mycmakeargs+=(
+ -DDEFAULT_CHARSET=utf8
+ -DDEFAULT_COLLATION=utf8_general_ci
+ )
+ else
+ mycmakeargs+=(
+ -DDEFAULT_CHARSET=latin1
+ -DDEFAULT_COLLATION=latin1_swedish_ci
+ )
+ fi
+ mycmakeargs+=(
+ -DEXTRA_CHARSETS=all
+ -DMYSQL_USER=mysql
+ -DDISABLE_SHARED=$(usex static YES NO)
+ -DWITH_DEBUG=$(usex debug)
+ -DWITH_EMBEDDED_SERVER=OFF
+ -DWITH_PROFILING=$(usex profiling)
+ )
+
+ if use static; then
+ mycmakeargs+=( -DWITH_PIC=1 )
+ fi
+
+ if use jemalloc || use tcmalloc ; then
+ mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
+ fi
+
+ # Storage engines
+ mycmakeargs+=(
+ -DWITH_ARCHIVE_STORAGE_ENGINE=1
+ -DWITH_BLACKHOLE_STORAGE_ENGINE=1
+ -DWITH_CSV_STORAGE_ENGINE=1
+ -DWITH_HEAP_STORAGE_ENGINE=1
+ -DWITH_INNOBASE_STORAGE_ENGINE=1
+ -DWITH_MYISAMMRG_STORAGE_ENGINE=1
+ -DWITH_MYISAM_STORAGE_ENGINE=1
+ -DWITH_PARTITION_STORAGE_ENGINE=1
+ )
+ else
+ mycmakeargs+=(
+ -DWITHOUT_SERVER=1
+ -DWITH_EMBEDDED_SERVER=OFF
+ -DEXTRA_CHARSETS=none
+ -DINSTALL_SQLBENCHDIR=
+ -DWITH_SYSTEMD=no
+ )
+ fi
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+}
+
+# Official test instructions:
+# USE='extraengine perl server' \
+# FEATURES='test userpriv' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+ _disable_test() {
+ local rawtestname bug reason
+ rawtestname="${1}" ; shift
+ bug="${1}" ; shift
+ reason="${@}"
+ ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})"
+ echo "${rawtestname} : BUG#${bug} ${reason}" >> "${T}/disabled.def"
+ }
+
+ local TESTDIR="${BUILD_DIR}/mysql-test"
+ local retstatus_tests
+
+ if ! use server ; then
+ einfo "Skipping server tests due to minimal build."
+ return 0
+ fi
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ if [[ -z "${MTR_PARALLEL}" ]] ; then
+ local -x MTR_PARALLEL=$(makeopts_jobs)
+
+ if [[ ${MTR_PARALLEL} -gt 4 ]] ; then
+ # Running multiple tests in parallel usually require higher ulimit
+ # and fs.aio-max-nr setting. In addition, tests like main.multi_update
+ # are known to hit timeout when system is busy.
+ # To avoid test failure we will limit MTR_PARALLEL to 4 instead of
+ # using "auto".
+ local info_msg="Parallel MySQL test suite jobs limited to 4 (MAKEOPTS=${MTR_PARALLEL})"
+ info_msg+=" to avoid test failures. Set MTR_PARALLEL if you know what you are doing!"
+ einfo "${info_msg}"
+ unset info_msg
+ MTR_PARALLEL=4
+ fi
+ else
+ einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'"
+ fi
+
+ # Try to increase file limits to increase test coverage
+ if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
+ # Upper limit comes from parts.partition_* tests
+ ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
+
+ if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
+ # Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
+ ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
+
+ if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
+ ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
+ else
+ einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
+ fi
+ else
+ einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
+ fi
+ else
+ einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
+ fi
+
+ # create directories because mysqladmin might run out of order
+ mkdir -p "${T}"/var-tests{,/log} || die
+
+ if [[ ! -f "${S}/mysql-test/unstable-tests" ]] ; then
+ touch "${S}"/mysql-test/unstable-tests || die
+ fi
+
+ cp "${S}"/mysql-test/unstable-tests "${T}/disabled.def" || die
+
+ local -a disabled_tests
+ disabled_tests+=( "compat/oracle.plugin;0;Needs example plugin which Gentoo disables" )
+ disabled_tests+=( "innodb_gis.1;25095;Known rounding error with latest AMD processors" )
+ disabled_tests+=( "innodb_gis.gis;25095;Known rounding error with latest AMD processors" )
+ disabled_tests+=( "main.explain_non_select;0;Sporadically failing test" )
+ disabled_tests+=( "main.func_time;0;Dependent on time test was written" )
+ disabled_tests+=( "main.plugin_auth;0;Needs client libraries built" )
+ disabled_tests+=( "main.selectivity_no_engine;26320;Sporadically failing test" )
+ disabled_tests+=( "main.stat_tables;0;Sporadically failing test" )
+ disabled_tests+=( "main.stat_tables_innodb;0;Sporadically failing test" )
+ disabled_tests+=( "main.upgrade_MDEV-19650;25096;Known to be broken" )
+ disabled_tests+=( "mariabackup.*;0;Broken test suite" )
+ disabled_tests+=( "perfschema.nesting;23458;Known to be broken" )
+ disabled_tests+=( "plugins.auth_ed25519;0;Needs client libraries built" )
+ disabled_tests+=( "plugins.cracklib_password_check;0;False positive due to varying policies" )
+ disabled_tests+=( "plugins.two_password_validations;0;False positive due to varying policies" )
+ disabled_tests+=( "roles.acl_statistics;0;False positive due to a user count mismatch caused by previous test" )
+ disabled_tests+=( "sys_vars.wsrep_on_without_provider;25625;Known to be broken" )
+
+ if ! use latin1 ; then
+ disabled_tests+=( "funcs_1.is_columns_mysql;0;Requires USE=latin1" )
+ disabled_tests+=( "main.information_schema;0;Requires USE=latin1" )
+ disabled_tests+=( "main.sp2;24177;Requires USE=latin1" )
+ disabled_tests+=( "main.system_mysql_db;0;Requires USE=latin1" )
+ disabled_tests+=( "main.upgrade_MDEV-19650;24178;Requires USE=latin1" )
+ fi
+
+ local test_infos_str test_infos_arr
+ for test_infos_str in "${disabled_tests[@]}" ; do
+ IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}"
+
+ if [[ ${#test_infos_arr[@]} != 3 ]] ; then
+ die "Invalid test data set, not matching format: ${test_infos_str}"
+ fi
+
+ _disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}"
+ done
+ unset test_infos_str test_infos_arr
+
+ # run mysql-test tests
+ pushd "${TESTDIR}" &>/dev/null || die
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test-list="${T}/disabled.def"
+ retstatus_tests=$?
+
+ popd &>/dev/null || die
+
+ # Cleanup is important for these testcases.
+ pkill -9 -f "${S}/ndb" 2>/dev/null
+ pkill -9 -f "${S}/sql" 2>/dev/null
+
+ local failures=""
+ [[ ${retstatus_tests} -eq 0 ]] || failures="${failures} tests"
+
+ [[ -z "${failures}" ]] || die "Test failures: ${failures}"
+ einfo "Tests successfully completed"
+}
+
+src_install() {
+ cmake_src_install
+
+ # Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
+ if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
+ rm "${ED}/usr/include/mysql/server/private/config.h" || die
+ fi
+
+ # Make sure the vars are correctly initialized
+ mysql_init_vars
+
+ # Convenience links
+ einfo "Making Convenience links for mysqlcheck multi-call binary"
+ dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
+ dosym "mysqlcheck" "/usr/bin/mysqlrepair"
+ dosym "mysqlcheck" "/usr/bin/mysqloptimize"
+
+ # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+ if [[ -d "${ED}/usr/data" ]] ; then
+ rm -Rf "${ED}/usr/data" || die
+ fi
+
+ # Unless they explicitly specific USE=test, then do not install the
+ # testsuite. It DOES have a use to be installed, esp. when you want to do a
+ # validation of your database configuration after tuning it.
+ if ! use test ; then
+ rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
+ fi
+
+ # Configuration stuff
+ einfo "Building default configuration ..."
+ insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+ [[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
+ cp "${FILESDIR}/my.cnf-10.2" "${TMPDIR}/my.cnf" || die
+ eprefixify "${TMPDIR}/my.cnf"
+ doins "${TMPDIR}/my.cnf"
+ insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d"
+ cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
+ eprefixify "${TMPDIR}/50-distro-client.cnf"
+ doins "${TMPDIR}/50-distro-client.cnf"
+
+ if use server ; then
+ mycnf_src="my.cnf.distro-server"
+ sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+ "${FILESDIR}/${mycnf_src}" \
+ > "${TMPDIR}/my.cnf.ok" || die
+ if use prefix ; then
+ sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
+ "${TMPDIR}/my.cnf.ok" || die
+ fi
+ if use latin1 ; then
+ sed -i \
+ -e "/character-set/s|utf8|latin1|g" \
+ "${TMPDIR}/my.cnf.ok" || die
+ fi
+ eprefixify "${TMPDIR}/my.cnf.ok"
+ newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
+
+ einfo "Including support files and sample configurations"
+ docinto "support-files"
+ local script
+ for script in \
+ "${S}"/support-files/magic
+ do
+ [[ -f "$script" ]] && dodoc "${script}"
+ done
+
+ docinto "scripts"
+ for script in "${S}"/scripts/mysql* ; do
+ [[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
+ done
+ # Manually install supporting files that conflict with other packages
+ # but are needed for galera and initial installation
+ exeinto /usr/libexec/mariadb
+ doexe "${BUILD_DIR}/extra/my_print_defaults" "${BUILD_DIR}/extra/perror"
+
+ if use pam ; then
+ keepdir /usr/$(get_libdir)/mariadb/plugin/auth_pam_tool_dir
+ fi
+ fi
+
+ # Conflicting files
+ conflicting_files=()
+
+ # We prefer my_print_defaults from dev-db/mysql-connector-c
+ conflicting_files=( "${ED}/usr/share/man/man1/my_print_defaults.1" )
+
+ # Remove bundled mytop in favor of dev-db/mytop
+ conflicting_files+=( "${ED}/usr/bin/mytop" )
+ conflicting_files+=( "${ED}/usr/share/man/man1/mytop.1" )
+
+ local conflicting_file
+ for conflicting_file in "${conflicting_files[@]}" ; do
+ if [[ -e "${conflicting_file}" ]] ; then
+ rm -v "${conflicting_file}" || die
+ fi
+ done
+
+ # Fix a dangling symlink when galera is not built
+ if [[ -L "${ED}/usr/bin/wsrep_sst_rsync_wan" ]] && ! use galera ; then
+ rm "${ED}/usr/bin/wsrep_sst_rsync_wan" || die
+ fi
+
+ # Remove dangling symlink
+ rm "${ED}/usr/$(get_libdir)/libmariadb.a" || die
+
+ # Remove broken SST scripts that are incompatible
+ local scriptremove
+ for scriptremove in wsrep_sst_xtrabackup wsrep_sst_xtrabackup-v2 ; do
+ if [[ -e "${ED}/usr/bin/${scriptremove}" ]] ; then
+ rm "${ED}/usr/bin/${scriptremove}" || die
+ fi
+ done
+}
+
+pkg_preinst() {
+ java-pkg-opt-2_pkg_preinst
+}
+
+pkg_postinst() {
+ # Make sure the vars are correctly initialized
+ mysql_init_vars
+
+ # Create log directory securely if it does not exist
+ [[ -d "${ROOT}/${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}/${MY_LOGDIR}"
+
+ if use server ; then
+ if use pam; then
+ einfo
+ elog "This install includes the PAM authentication plugin."
+ elog "To activate and configure the PAM plugin, please read:"
+ elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/"
+ einfo
+ chown mysql:mysql "${EROOT}/usr/$(get_libdir)/mariadb/plugin/auth_pam_tool_dir" || die
+ fi
+
+ if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+ einfo
+ elog "You might want to run:"
+ elog "\"emerge --config =${CATEGORY}/${PF}\""
+ elog "if this is a new install."
+ elog
+ elog "If you are switching server implentations, you should run the"
+ elog "mysql_upgrade tool."
+ einfo
+ else
+ einfo
+ elog "If you are upgrading major versions, you should run the"
+ elog "mysql_upgrade tool."
+ einfo
+ fi
+
+ if use galera ; then
+ einfo
+ elog "Be sure to edit the my.cnf file to activate your cluster settings."
+ elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
+ elog "The first time the cluster is activated, you should add"
+ elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
+ elog "This option should then be removed for subsequent starts."
+ einfo
+ if [[ -n "${REPLACING_VERSIONS}" ]] ; then
+ local rver
+ for rver in ${REPLACING_VERSIONS} ; do
+ if ver_test "${rver}" -lt "10.4.0" ; then
+ ewarn "Upgrading galera from a previous version requires admin restart of the entire cluster."
+ ewarn "Please refer to https://mariadb.com/kb/en/library/changes-improvements-in-mariadb-104/#galera-4"
+ ewarn "for more information"
+ fi
+ done
+ fi
+ fi
+ fi
+
+ # Note about configuration change
+ einfo
+ elog "This version of mariadb reorganizes the configuration from a single my.cnf"
+ elog "to several files in /etc/mysql/${PN}.d."
+ elog "Please backup any changes you made to /etc/mysql/my.cnf"
+ elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension."
+ elog "You may have as many files as needed and they are read alphabetically."
+ elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
+ einfo
+}
+
+pkg_config() {
+ _getoptval() {
+ local section="${1}"
+ local option="--${2}"
+ local extra_options="${3}"
+ local cmd=(
+ "${my_print_defaults_binary}"
+ "${extra_options}"
+ "${section}"
+ )
+
+ local values=()
+ local parameters=( $(eval "${cmd[@]}" 2>/dev/null) )
+ for parameter in "${parameters[@]}"
+ do
+ # my_print_defaults guarantees output of options, one per line,
+ # in the form that they would be specified on the command line.
+ # So checking for --option=* should be safe.
+ case ${parameter} in
+ ${option}=*)
+ values+=( "${parameter#*=}" )
+ ;;
+ esac
+ done
+
+ if [[ ${#values[@]} -gt 0 ]] ; then
+ # Option could have been set multiple times
+ # in which case only the last occurrence
+ # contains the current value
+ echo "${values[-1]}"
+ fi
+ }
+
+ _mktemp_dry() {
+ # emktemp has no --dry-run option
+ local template="${1}"
+
+ if [[ -z "${template}" ]] ; then
+ if [[ -z "${T}" ]] ; then
+ template="/tmp/XXXXXXX"
+ else
+ template="${T}/XXXXXXX"
+ fi
+ fi
+
+ local template_wo_X=${template//X/}
+ local n_X
+ let n_X=${#template}-${#template_wo_X}
+ if [[ ${n_X} -lt 3 ]] ; then
+ echo "${FUNCNAME[0]}: too few X's in template ‘${template}’" >&2
+ return
+ fi
+
+ local attempts=0
+ local character tmpfile
+ while [[ true ]] ; do
+ let attempts=attempts+1
+
+ new_file=
+ while read -n1 character ; do
+ if [[ "${character}" == "X" ]] ; then
+ tmpfile+="${RANDOM:0:1}"
+ else
+ tmpfile+="${character}"
+ fi
+ done < <(echo -n "${template}")
+
+ if [[ ! -f "${tmpfile}" ]]
+ then
+ echo "${tmpfile}"
+ return
+ fi
+
+ if [[ ${attempts} -ge 100 ]] ; then
+ echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2
+ return
+ fi
+ done
+ }
+
+ local mysql_binary="${EROOT}/usr/bin/mysql"
+ if [[ ! -x "${mysql_binary}" ]] ; then
+ die "'${mysql_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+ fi
+
+ local mysqld_binary="${EROOT}/usr/sbin/mysqld"
+ if [[ ! -x "${mysqld_binary}" ]] ; then
+ die "'${mysqld_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+ fi
+
+ local mysql_install_db_binary="${EROOT}/usr/bin/mysql_install_db"
+ if [[ ! -x "${mysql_install_db_binary}" ]] ; then
+ die "'${mysql_install_db_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+ fi
+
+ local my_print_defaults_binary="${EROOT}/usr/bin/my_print_defaults"
+ if [[ ! -x "${my_print_defaults_binary}" ]] ; then
+ die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!"
+ fi
+
+ if [[ -z "${MYSQL_USER}" ]] ; then
+ MYSQL_USER=mysql
+ if use prefix ; then
+ MYSQL_USER=$(id -u -n 2>/dev/null)
+ if [[ -z "${MYSQL_USER}" ]] ; then
+ die "Failed to determine current username!"
+ fi
+ fi
+ fi
+
+ if [[ -z "${MYSQL_GROUP}" ]] ; then
+ MYSQL_GROUP=mysql
+ if use prefix ; then
+ MYSQL_GROUP=$(id -g -n 2>/dev/null)
+ if [[ -z "${MYSQL_GROUP}" ]] ; then
+ die "Failed to determine current user groupname!"
+ fi
+ fi
+ fi
+
+ # my_print_defaults needs to read stuff in $HOME/.my.cnf
+ local -x HOME="${EROOT}/root"
+
+ # Make sure the vars are correctly initialized
+ mysql_init_vars
+
+ # Read currently set data directory
+ MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named
+ # localhost. Also causes weird failures.
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ die "Sorry, unable to find MY_DATADIR!"
+ elif [[ -d "${MY_DATADIR}/mysql" ]] ; then
+ ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!"
+ ewarn "Please rename or delete its content if you wish to initialize a new data directory."
+ die "${PN} data directory at '${MY_DATADIR}' looks already initialized!"
+ fi
+
+ MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+ MYSQL_TMPDIR=${MYSQL_TMPDIR%/}
+ # These are dir+prefix
+ MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+ MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+ MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+ MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+
+ # Create missing directories.
+ # Always check if mysql user can write to directory even if we just
+ # created directory because a parent directory might be not
+ # accessible for that user.
+ PID_DIR="${EROOT}/run/mysqld"
+ if [[ ! -d "${PID_DIR}" ]] ; then
+ einfo "Creating ${PN} PID directory '${PID_DIR}' ..."
+ install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \
+ || die "Failed to create PID directory '${PID_DIR}'!"
+ fi
+
+ local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_pid_dir_testfile}" ]] \
+ && die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_pid_dir_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!"
+ else
+ rm "${_pid_dir_testfile}" || die
+ unset _pid_dir_testfile
+ fi
+
+ if [[ ! -d "${MY_DATADIR}" ]] ; then
+ einfo "Creating ${PN} data directory '${MY_DATADIR}' ..."
+ install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \
+ || die "Failed to create ${PN} data directory '${MY_DATADIR}'!"
+ fi
+
+ local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_my_datadir_testfile}" ]] \
+ && die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_my_datadir_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!"
+ else
+ rm "${_my_datadir_testfile}" || die
+ unset _my_datadir_testfile
+ fi
+
+ if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then
+ einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..."
+ install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \
+ || die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!"
+ fi
+
+ if [[ -z "${MYSQL_TMPDIR}" ]] ; then
+ MYSQL_TMPDIR="$(_mktemp_dry "${EROOT}/tmp/mysqld-tmp.XXXXXXXXX")"
+ [[ -z "${MYSQL_TMPDIR}" ]] \
+ && die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!"
+
+ mkdir "${MYSQL_TMPDIR}" || die
+ chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die
+ fi
+
+ # Now we need to test MYSQL_TMPDIR...
+ local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_my_tmpdir_testfile}" ]] \
+ && die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_my_tmpdir_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into tmpdir '${MYSQL_TMPDIR}'!"
+ else
+ rm "${_my_tmpdir_testfile}" || die
+ unset _my_tmpdir_testfile
+ fi
+
+ if [[ "${MYSQL_LOG_BIN}" == /* && ! -d "${MYSQL_LOG_BIN}" ]] ; then
+ # Only create directory when MYSQL_LOG_BIN is an absolute path
+ einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..."
+ install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \
+ || die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'"
+ fi
+
+ if [[ "${MYSQL_LOG_BIN}" == /* ]] ; then
+ # Only test when MYSQL_LOG_BIN is an absolute path
+ local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_my_logbin_testfile}" ]] \
+ && die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_my_logbin_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!"
+ else
+ rm "${_my_logbin_testfile}" || die
+ unset _my_logbin_testfile
+ fi
+ fi
+
+ if [[ "${MYSQL_RELAY_LOG}" == /* && ! -d "${MYSQL_RELAY_LOG}" ]] ; then
+ # Only create directory when MYSQL_RELAY_LOG is an absolute path
+ einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..."
+ install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \
+ || die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!"
+ fi
+
+ if [[ "${MYSQL_RELAY_LOG}" == /* ]] ; then
+ # Only test when MYSQL_RELAY_LOG is an absolute path
+ local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_my_relaylog_testfile}" ]] \
+ && die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_my_relaylog_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!"
+ else
+ rm "${_my_relaylog_testfile}" || die
+ unset _my_relaylog_testfile
+ fi
+ fi
+
+ local SETUP_TMPDIR=$(mktemp -d "/tmp/${PN}-config.XXXXXXXXX" 2>/dev/null)
+ [[ -z "${SETUP_TMPDIR}" ]] && die "Failed to create setup tmpdir"
+
+ # Limit access
+ chmod 0770 "${SETUP_TMPDIR}" || die
+ chown ${MYSQL_USER} "${SETUP_TMPDIR}" || die
+
+ local mysql_install_log="${SETUP_TMPDIR}/install_db.log"
+ local mysqld_logfile="${SETUP_TMPDIR}/mysqld.log"
+
+ echo ""
+ einfo "Detected settings:"
+ einfo "=================="
+ einfo "MySQL User:\t\t\t\t${MYSQL_USER}"
+ einfo "MySQL Group:\t\t\t\t${MYSQL_GROUP}"
+ einfo "MySQL DATA directory:\t\t${MY_DATADIR}"
+ einfo "MySQL TMP directory:\t\t\t${MYSQL_TMPDIR}"
+
+ if [[ "${MYSQL_LOG_BIN}" == /* ]] ; then
+ # Absolute path for binary log files specified
+ einfo "MySQL Binary Log File location:\t${MYSQL_LOG_BIN}"
+ fi
+
+ if [[ "${MYSQL_RELAY_LOG}" == /* ]] ; then
+ # Absolute path for relay log files specified
+ einfo "MySQL Relay Log File location:\t${MYSQL_RELAY_LOG}"
+ fi
+
+ einfo "PID DIR:\t\t\t\t${PID_DIR}"
+ einfo "Install db log:\t\t\t${mysql_install_log}"
+ einfo "Install server log:\t\t\t${mysqld_logfile}"
+
+ echo
+
+ if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+ local tmp_mysqld_password_source=
+
+ for tmp_mysqld_password_source in mysql client ; do
+ einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
+ MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
+ if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
+ if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then
+ ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
+ MYSQL_ROOT_PASSWORD=
+ continue
+ fi
+
+ einfo "Found password in '${tmp_mysqld_password_source}' section!"
+ break
+ fi
+ done
+
+ # Sometimes --show is required to display passwords in some implementations of my_print_defaults
+ if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then
+ MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
+ fi
+
+ unset tmp_mysqld_password_source
+ fi
+
+ if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+ local pwd1="a"
+ local pwd2="b"
+
+ echo
+ einfo "No password for mysql 'root' user was specified via environment"
+ einfo "variable MYSQL_ROOT_PASSWORD and no password was found in config"
+ einfo "file like '${HOME}/.my.cnf'."
+ einfo "To continue please provide a password for the mysql 'root' user"
+ einfo "now on console:"
+ ewarn "NOTE: Please avoid [\"'\\_%] characters in the password!"
+ read -rsp " >" pwd1 ; echo
+
+ einfo "Retype the password"
+ read -rsp " >" pwd2 ; echo
+
+ if [[ "x${pwd1}" != "x${pwd2}" ]] ; then
+ die "Passwords are not the same!"
+ fi
+
+ MYSQL_ROOT_PASSWORD="${pwd1}"
+ unset pwd1 pwd2
+
+ echo
+ fi
+
+ local -a mysqld_options
+
+ # Fix bug 446200. Don't reference host my.cnf, needs to come first,
+ # see http://bugs.mysql.com/bug.php?id=31312
+ use prefix && mysqld_options+=( "--defaults-file='${MY_SYSCONFDIR}/my.cnf'" )
+
+ # Figure out which options we need to disable to do the setup
+ local helpfile="${TMPDIR}/mysqld-help"
+ "${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+
+ local opt optexp optfull
+ for opt in host-cache name-resolve networking slave-start \
+ federated ssl log-bin relay-log slow-query-log external-locking \
+ log-slave-updates \
+ ; do
+ optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+ grep -E -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
+ done
+
+ # Prepare timezones, see
+ # https://dev.mysql.com/doc/mysql/en/time-zone-support.html
+ local tz_sql="${SETUP_TMPDIR}/tz.sql"
+
+ echo "USE mysql;" >"${tz_sql}"
+ "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" >> "${tz_sql}" 2>/dev/null
+ if [[ $? -ne 0 ]] ; then
+ die "mysql_tzinfo_to_sql failed!"
+ fi
+
+ local cmd=(
+ "${mysql_install_db_binary}"
+ "${mysqld_options[@]}"
+ "--init-file='${tz_sql}'"
+ "--basedir='${EROOT}/usr'"
+ "--datadir='${MY_DATADIR}'"
+ "--tmpdir='${MYSQL_TMPDIR}'"
+ "--log-error='${mysql_install_log}'"
+ "--rpm"
+ "--cross-bootstrap"
+ "--skip-test-db"
+ "--user=${MYSQL_USER}"
+ )
+
+ einfo "Initializing ${PN} data directory: ${cmd[@]}"
+ eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1
+
+ if [[ $? -ne 0 || ! -f "${MY_DATADIR}/mysql/user.frm" ]] ; then
+ grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2
+ die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!"
+ fi
+
+ local x=${RANDOM}
+ local socket="${PID_DIR}/mysqld.${x}.sock"
+ [[ -f "${socket}" ]] && die "Randomness failed; Socket ${socket} already exists!"
+ local pidfile="${PID_DIR}/mysqld.${x}.pid"
+ [[ -f "${pidfile}" ]] && die "Randomness failed; Pidfile ${pidfile} already exists!"
+ unset x
+
+ cmd=(
+ "${mysqld_binary}"
+ "${mysqld_options[@]}"
+ "--basedir='${EROOT}/usr'"
+ "--datadir='${MY_DATADIR}'"
+ "--tmpdir='${MYSQL_TMPDIR}'"
+ --max_allowed_packet=8M
+ --net_buffer_length=16K
+ "--socket='${socket}'"
+ "--pid-file='${pidfile}'"
+ "--log-error='${mysqld_logfile}'"
+ "--user=${MYSQL_USER}"
+ )
+
+ einfo "Starting mysqld to finalize initialization: ${cmd[@]}"
+ eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 &
+
+ echo -n "Waiting for mysqld to accept connections "
+ local maxtry=15
+ while [[ ! -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+ maxtry=$((${maxtry}-1))
+ echo -n "."
+ sleep 1
+ done
+
+ if [[ -S "${socket}" ]] ; then
+ # Even with a socket we don't know if mysqld will abort
+ # start due to an error so just wait a little bit more...
+ maxtry=5
+ while [[ -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+ maxtry=$((${maxtry}-1))
+ echo -n "."
+ sleep 1
+ done
+ fi
+
+ echo
+
+ if [[ ! -S "${socket}" ]] ; then
+ grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2
+ die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!"
+ fi
+
+ local mysql_logfile="${SETUP_TMPDIR}/set_root_pw.log"
+ touch "${mysql_logfile}" || die
+
+ ebegin "Setting root password"
+ # Do this from memory, as we don't want clear text passwords in temp files
+ local sql="ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}'"
+ cmd=(
+ "${mysql_binary}"
+ --no-defaults
+ "--socket='${socket}'"
+ -hlocalhost
+ "-e \"${sql}\""
+ )
+ eval "${cmd[@]}" >"${mysql_logfile}" 2>&1
+ local rc=$?
+ eend ${rc}
+
+ if [[ ${rc} -ne 0 ]] ; then
+ # Poor man's solution which tries to avoid having password
+ # in log. NOTE: sed can fail if user didn't follow advice
+ # and included character which will require escaping...
+ sed -i -e "s/${MYSQL_ROOT_PASSWORD}/*****/" "${mysql_logfile}" 2>/dev/null
+
+ grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_logfile}"
+ die "Failed to set ${PN} root password. Please review '${mysql_logfile}'!"
+ fi
+
+ # Stop the server
+ if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+ echo -n "Stopping the server "
+ pkill -F "${pidfile}" &>/dev/null
+
+ maxtry=10
+ while [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; do
+ maxtry=$((${maxtry}-1))
+ echo -n "."
+ sleep 1
+ done
+
+ echo
+
+ if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+ # We somehow failed to stop server.
+ # However, not a fatal error. Just warn the user.
+ ewarn "WARNING: mysqld[$(cat "${pidfile}")] is still running!"
+ fi
+ fi
+
+ rm -r "${SETUP_TMPDIR}" || die
+
+ einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!"
+}
diff --git a/dev-db/mariadb/mariadb-10.6.10.ebuild b/dev-db/mariadb/mariadb-10.6.10.ebuild
new file mode 100644
index 000000000000..afb1b69d821c
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.6.10.ebuild
@@ -0,0 +1,1319 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+SUBSLOT="18"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+inherit systemd flag-o-matic prefix toolchain-funcs \
+ multiprocessing java-pkg-opt-2 cmake
+
+# Patch version
+PATCH_SET="https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.6.10-patches-01.tar.xz"
+
+SRC_URI="mirror://mariadb/${PN}-${PV}/source/${P}.tar.gz
+ ${PATCH_SET[@]}"
+
+HOMEPAGE="https://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2 LGPL-2.1+"
+SLOT="$(ver_cut 1-2)/${SUBSLOT:-0}"
+IUSE="+backup bindist columnstore cracklib debug extraengine galera innodb-lz4
+ innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
+ numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
+ sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc
+ test xml yassl"
+
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
+
+REQUIRED_USE="jdbc? ( extraengine server !static )
+ ?? ( tcmalloc jemalloc )
+ static? ( yassl !pam )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+
+# Shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+COMMON_DEPEND="
+ >=dev-libs/libpcre2-10.34:=
+ >=sys-apps/sed-4
+ >=sys-apps/texinfo-4.7-r1
+ sys-libs/ncurses:0=
+ >=sys-libs/zlib-1.2.3:0=
+ virtual/libcrypt:=
+ !bindist? (
+ sys-libs/binutils-libs:0=
+ >=sys-libs/readline-4.1:0=
+ )
+ jemalloc? ( dev-libs/jemalloc:0= )
+ kerberos? ( virtual/krb5 )
+ kernel_linux? (
+ sys-process/procps:0=
+ dev-libs/libaio:0=
+ )
+ server? (
+ app-arch/bzip2
+ app-arch/xz-utils
+ backup? ( app-arch/libarchive:0= )
+ columnstore? (
+ app-arch/snappy
+ dev-libs/boost:=
+ dev-libs/libxml2:2=
+ )
+ cracklib? ( sys-libs/cracklib:0= )
+ extraengine? (
+ odbc? ( dev-db/unixODBC:0= )
+ xml? ( dev-libs/libxml2:2= )
+ )
+ innodb-lz4? ( app-arch/lz4 )
+ innodb-lzo? ( dev-libs/lzo )
+ innodb-snappy? ( app-arch/snappy )
+ mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 )
+ numa? ( sys-process/numactl )
+ oqgraph? (
+ dev-libs/boost:=
+ dev-libs/judy:0=
+ )
+ pam? ( sys-libs/pam:0= )
+ s3? ( net-misc/curl )
+ systemd? ( sys-apps/systemd:= )
+ )
+ systemtap? ( >=dev-util/systemtap-1.3:0= )
+ tcmalloc? ( dev-util/google-perftools:0= )
+ yassl? ( net-libs/gnutls:0= )
+ !yassl? (
+ >=dev-libs/openssl-1.0.0:0=
+ )
+"
+BDEPEND="virtual/yacc"
+DEPEND="${COMMON_DEPEND}
+ server? (
+ extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) )
+ test? ( acct-group/mysql acct-user/mysql )
+ )
+ static? ( sys-libs/ncurses[static-libs] )
+"
+RDEPEND="${COMMON_DEPEND}
+ !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
+ !dev-db/mariadb:0
+ !dev-db/mariadb:5.5
+ !dev-db/mariadb:10.1
+ !dev-db/mariadb:10.2
+ !dev-db/mariadb:10.3
+ !dev-db/mariadb:10.4
+ !dev-db/mariadb:10.5
+ !dev-db/mariadb:10.7
+ !dev-db/mariadb:10.8
+ !=virtual/jre-1.8 ) )
+ galera? (
+ sys-apps/iproute2
+ =sys-cluster/galera-26*
+ sst-rsync? ( sys-process/lsof )
+ sst-mariabackup? ( net-misc/socat[ssl] )
+ )
+ !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql )
+ )
+"
+# For other stuff to bring us in
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+
+mysql_init_vars() {
+ MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
+ MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+ MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+ MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
+
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ MY_DATADIR=""
+ if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
+ MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
+ | sed -ne '/datadir/s|^--datadir=||p' \
+ | tail -n1)
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ MY_DATADIR=$(grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
+ | sed -e 's/.*=\s*//' \
+ | tail -n1)
+ fi
+ fi
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ MY_DATADIR="${MY_LOCALSTATEDIR}"
+ einfo "Using default MY_DATADIR"
+ fi
+ elog "MySQL MY_DATADIR is ${MY_DATADIR}"
+
+ if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
+ if [[ -e "${MY_DATADIR}" ]] ; then
+ # If you get this and you're wondering about it, see bug #207636
+ elog "MySQL datadir found in ${MY_DATADIR}"
+ elog "A new one will not be created."
+ PREVIOUS_DATADIR="yes"
+ else
+ PREVIOUS_DATADIR="no"
+ fi
+ export PREVIOUS_DATADIR
+ fi
+ else
+ if [[ ${EBUILD_PHASE} == "config" ]]; then
+ local new_MY_DATADIR
+ new_MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
+ | sed -ne '/datadir/s|^--datadir=||p' \
+ | tail -n1)
+
+ if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
+ ewarn "MySQL MY_DATADIR has changed"
+ ewarn "from ${MY_DATADIR}"
+ ewarn "to ${new_MY_DATADIR}"
+ MY_DATADIR="${new_MY_DATADIR}"
+ fi
+ fi
+ fi
+
+ export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+ export MY_LOCALSTATEDIR MY_LOGDIR
+ export MY_DATADIR
+}
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != binary ]] ; then
+ if has test ${FEATURES} ; then
+ # Bug #213475 - MySQL _will_ object strenuously if your machine is named
+ # localhost. Also causes weird failures.
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+ if ! has userpriv ${FEATURES} ; then
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+ fi
+ fi
+ fi
+
+ java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+ unpack ${A}
+
+ mv -f "${WORKDIR}/${P/_rc/}" "${S}" || die
+}
+
+src_prepare() {
+ eapply "${WORKDIR}"/mariadb-patches
+
+ eapply_user
+
+ _disable_plugin() {
+ echo > "${S}/plugin/${1}/CMakeLists.txt" || die
+ }
+ _disable_engine() {
+ echo > "${S}/storage/${1}/CMakeLists.txt" || die
+ }
+
+ if use jemalloc; then
+ echo "TARGET_LINK_LIBRARIES(mariadbd LINK_PUBLIC jemalloc)" >> "${S}/sql/CMakeLists.txt"
+ elif use tcmalloc; then
+ echo "TARGET_LINK_LIBRARIES(mariadbd LINK_PUBLIC tcmalloc)" >> "${S}/sql/CMakeLists.txt"
+ fi
+
+ local plugin
+ local server_plugins=( handler_socket auth_socket feedback metadata_lock_info
+ locale_info qc_info server_audit sql_errlog auth_ed25519 )
+ local test_plugins=( audit_null auth_examples daemon_example fulltext
+ debug_key_management example_key_management versioning )
+ if ! use server; then # These plugins are for the server
+ for plugin in "${server_plugins[@]}" ; do
+ _disable_plugin "${plugin}"
+ done
+ fi
+
+ if ! use test; then # These plugins are only used during testing
+ for plugin in "${test_plugins[@]}" ; do
+ _disable_plugin "${plugin}"
+ done
+ _disable_engine test_sql_discovery
+ echo > "${S}/plugin/auth_pam/testing/CMakeLists.txt" || die
+ fi
+
+ _disable_engine example
+
+ if ! use oqgraph ; then # avoids extra library checks
+ _disable_engine oqgraph
+ fi
+
+ if use mroonga ; then
+ # Remove the bundled groonga
+ # There is no CMake flag, it simply checks for existance
+ rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga"
+ else
+ _disable_engine mroonga
+ fi
+
+ # Fix static bindings in galera replication
+ sed -i -e 's~add_library(wsrep_api_v26$~add_library(wsrep_api_v26 STATIC~' \
+ "${S}"/wsrep-lib/wsrep-API/CMakeLists.txt || die
+ sed -i -e 's~add_library(wsrep-lib$~add_library(wsrep-lib STATIC~' \
+ "${S}"/wsrep-lib/src/CMakeLists.txt || die
+
+ # Fix galera_recovery.sh script
+ sed -i -e "s~@bindir@/my_print_defaults~${EPREFIX}/usr/libexec/mariadb/my_print_defaults~" \
+ scripts/galera_recovery.sh || die
+
+ sed -i -e 's~ \$basedir/lib/\*/mariadb19/plugin~~' \
+ "${S}"/scripts/mysql_install_db.sh || die
+
+ cmake_src_prepare
+ java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+ # bug 508724 mariadb cannot use ld.gold
+ tc-ld-disable-gold
+ # Bug #114895, bug #110149
+ filter-flags "-O" "-O[01]"
+
+ # It fails on alpha without this
+ use alpha && append-ldflags "-Wl,--no-relax"
+
+ append-cxxflags -felide-constructors
+
+ # bug #283926, with GCC4.4, this is required to get correct behavior.
+ append-flags -fno-strict-aliasing
+
+ CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+ # debug hack wrt #497532
+ mycmakeargs=(
+ -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+ -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+ -DSYSCONFDIR="${EPREFIX}/etc/mysql"
+ -DINSTALL_BINDIR=bin
+ -DINSTALL_DOCDIR=share/doc/${PF}
+ -DINSTALL_DOCREADMEDIR=share/doc/${PF}
+ -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_INFODIR=share/info
+ -DINSTALL_LIBDIR=$(get_libdir)
+ -DINSTALL_MANDIR=share/man
+ -DINSTALL_MYSQLSHAREDIR=share/mariadb
+ -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
+ -DINSTALL_SCRIPTDIR=bin
+ -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
+ -DINSTALL_SBINDIR=sbin
+ -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
+ -DWITH_COMMENT="Gentoo Linux ${PF}"
+ -DWITH_UNIT_TESTS=$(usex test ON OFF)
+ -DWITH_LIBEDIT=0
+ -DWITH_ZLIB=system
+ -DWITHOUT_LIBWRAP=1
+ -DENABLED_LOCAL_INFILE=1
+ -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+ -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+ -DWITH_DEFAULT_COMPILER_OPTIONS=0
+ -DWITH_DEFAULT_FEATURE_SET=0
+ -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
+ # The build forces this to be defined when cross-compiling. We pass it
+ # all the time for simplicity and to make sure it is actually correct.
+ -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
+ -DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)"
+ -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+ -DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
+ -DCONC_WITH_EXTERNAL_ZLIB=YES
+ -DWITH_EXTERNAL_ZLIB=YES
+ -DSUFFIX_INSTALL_DIR=""
+ -DWITH_UNITTEST=OFF
+ -DWITHOUT_CLIENTLIBS=YES
+ -DCLIENT_PLUGIN_DIALOG=OFF
+ -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT=OFF
+ -DCLIENT_PLUGIN_CLIENT_ED25519=OFF
+ -DCLIENT_PLUGIN_MYSQL_CLEAR_PASSWORD=STATIC
+ -DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=OFF
+ )
+ if use test ; then
+ mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
+ else
+ mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
+ fi
+
+ if ! use yassl ; then
+ mycmakeargs+=( -DWITH_SSL=system -DCLIENT_PLUGIN_SHA256_PASSWORD=STATIC )
+ else
+ mycmakeargs+=( -DWITH_SSL=bundled )
+ fi
+
+ # bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
+ mycmakeargs+=(
+ -DWITH_READLINE=$(usex bindist 1 0)
+ -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
+ -DENABLE_DTRACE=$(usex systemtap)
+ )
+
+ if use server ; then
+ # Connect and Federated{,X} must be treated special
+ # otherwise they will not be built as plugins
+ if ! use extraengine ; then
+ mycmakeargs+=(
+ -DPLUGIN_CONNECT=NO
+ -DPLUGIN_FEDERATED=NO
+ -DPLUGIN_FEDERATEDX=NO
+ )
+ fi
+
+ mycmakeargs+=(
+ -DWITH_PCRE=system
+ -DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
+ -DPLUGIN_SPHINX=$(usex sphinx YES NO)
+ -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+ -DPLUGIN_AWS_KEY_MANAGEMENT=NO
+ -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
+ -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
+ -DPLUGIN_SPIDER=$(usex extraengine YES NO)
+ -DPLUGIN_S3=$(usex s3 YES NO)
+ -DPLUGIN_COLUMNSTORE=$(usex columnstore YES NO)
+ -DCONNECT_WITH_MYSQL=1
+ -DCONNECT_WITH_LIBXML2=$(usex xml)
+ -DCONNECT_WITH_ODBC=$(usex odbc)
+ -DCONNECT_WITH_JDBC=$(usex jdbc)
+ # Build failure and autodep wrt bug 639144
+ -DCONNECT_WITH_MONGO=OFF
+ -DWITH_WSREP=$(usex galera)
+ -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
+ -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
+ -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
+ -DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO)
+ -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+ -DWITH_MARIABACKUP=$(usex backup ON OFF)
+ -DWITH_LIBARCHIVE=$(usex backup ON OFF)
+ -DINSTALL_SQLBENCHDIR=""
+ -DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO)
+ # systemd is only linked to for server notification
+ -DWITH_SYSTEMD=$(usex systemd yes no)
+ -DWITH_NUMA=$(usex numa ON OFF)
+ )
+
+ if use test ; then
+ # This is needed for the new client lib which tests a real, open server
+ mycmakeargs+=( -DSKIP_TESTS=ON )
+ fi
+
+ if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
+ ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+ ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+ ewarn "You MUST file bugs without these variables set."
+
+ mycmakeargs+=(
+ -DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+ -DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+ )
+
+ elif ! use latin1 ; then
+ mycmakeargs+=(
+ -DDEFAULT_CHARSET=utf8mb4
+ -DDEFAULT_COLLATION=utf8mb4_unicode_520_ci
+ )
+ else
+ mycmakeargs+=(
+ -DDEFAULT_CHARSET=latin1
+ -DDEFAULT_COLLATION=latin1_swedish_ci
+ )
+ fi
+ mycmakeargs+=(
+ -DEXTRA_CHARSETS=all
+ -DMYSQL_USER=mysql
+ -DDISABLE_SHARED=$(usex static YES NO)
+ -DWITH_DEBUG=$(usex debug)
+ -DWITH_EMBEDDED_SERVER=OFF
+ -DWITH_PROFILING=$(usex profiling)
+ )
+
+ if use static; then
+ mycmakeargs+=( -DWITH_PIC=1 )
+ fi
+
+ if use jemalloc || use tcmalloc ; then
+ mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
+ fi
+
+ # Storage engines
+ mycmakeargs+=(
+ -DWITH_ARCHIVE_STORAGE_ENGINE=1
+ -DWITH_BLACKHOLE_STORAGE_ENGINE=1
+ -DWITH_CSV_STORAGE_ENGINE=1
+ -DWITH_HEAP_STORAGE_ENGINE=1
+ -DWITH_INNOBASE_STORAGE_ENGINE=1
+ -DWITH_MYISAMMRG_STORAGE_ENGINE=1
+ -DWITH_MYISAM_STORAGE_ENGINE=1
+ -DWITH_PARTITION_STORAGE_ENGINE=1
+ )
+ else
+ mycmakeargs+=(
+ -DWITHOUT_SERVER=1
+ -DWITH_EMBEDDED_SERVER=OFF
+ -DEXTRA_CHARSETS=none
+ -DINSTALL_SQLBENCHDIR=
+ -DWITH_SYSTEMD=no
+ )
+ fi
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+}
+
+# Official test instructions:
+# USE='extraengine perl server' \
+# FEATURES='test userpriv' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+ _disable_test() {
+ local rawtestname bug reason
+ rawtestname="${1}" ; shift
+ bug="${1}" ; shift
+ reason="${@}"
+ ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})"
+ echo "${rawtestname} : BUG#${bug} ${reason}" >> "${T}/disabled.def"
+ }
+
+ local TESTDIR="${BUILD_DIR}/mysql-test"
+ local retstatus_tests
+
+ if ! use server ; then
+ einfo "Skipping server tests due to minimal build."
+ return 0
+ fi
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ if [[ -z "${MTR_PARALLEL}" ]] ; then
+ local -x MTR_PARALLEL=$(makeopts_jobs)
+
+ if [[ ${MTR_PARALLEL} -gt 4 ]] ; then
+ # Running multiple tests in parallel usually require higher ulimit
+ # and fs.aio-max-nr setting. In addition, tests like main.multi_update
+ # are known to hit timeout when system is busy.
+ # To avoid test failure we will limit MTR_PARALLEL to 4 instead of
+ # using "auto".
+ local info_msg="Parallel MySQL test suite jobs limited to 4 (MAKEOPTS=${MTR_PARALLEL})"
+ info_msg+=" to avoid test failures. Set MTR_PARALLEL if you know what you are doing!"
+ einfo "${info_msg}"
+ unset info_msg
+ MTR_PARALLEL=4
+ fi
+ else
+ einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'"
+ fi
+
+ # Try to increase file limits to increase test coverage
+ if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
+ # Upper limit comes from parts.partition_* tests
+ ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
+
+ if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
+ # Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
+ ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
+
+ if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
+ ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
+ else
+ einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
+ fi
+ else
+ einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
+ fi
+ else
+ einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
+ fi
+
+ # create directories because mysqladmin might run out of order
+ mkdir -p "${T}"/var-tests{,/log} || die
+
+ if [[ ! -f "${S}/mysql-test/unstable-tests" ]] ; then
+ touch "${S}"/mysql-test/unstable-tests || die
+ fi
+
+ cp "${S}"/mysql-test/unstable-tests "${T}/disabled.def" || die
+
+ local -a disabled_tests
+ disabled_tests+=( "compat/oracle.plugin;0;Needs example plugin which Gentoo disables" )
+ disabled_tests+=( "innodb_gis.1;25095;Known rounding error with latest AMD processors" )
+ disabled_tests+=( "innodb_gis.gis;25095;Known rounding error with latest AMD processors" )
+ disabled_tests+=( "main.gis;25095;Known rounding error with latest AMD processors" )
+ disabled_tests+=( "main.explain_non_select;0;Sporadically failing test" )
+ disabled_tests+=( "main.func_time;0;Dependent on time test was written" )
+ disabled_tests+=( "main.mysql_upgrade;27044;Sporadically failing test" )
+ disabled_tests+=( "main.plugin_auth;0;Needs client libraries built" )
+ disabled_tests+=( "main.selectivity_no_engine;26320;Sporadically failing test" )
+ disabled_tests+=( "main.stat_tables;0;Sporadically failing test" )
+ disabled_tests+=( "main.stat_tables_innodb;0;Sporadically failing test" )
+ disabled_tests+=( "main.upgrade_MDEV-19650;25096;Known to be broken" )
+ disabled_tests+=( "mariabackup.*;0;Broken test suite" )
+ disabled_tests+=( "perfschema.nesting;23458;Known to be broken" )
+ disabled_tests+=( "perfschema.prepared_statements;0;Broken test suite" )
+ disabled_tests+=( "perfschema.privilege_table_io;27045;Sporadically failing test" )
+ disabled_tests+=( "plugins.auth_ed25519;0;Needs client libraries built" )
+ disabled_tests+=( "plugins.cracklib_password_check;0;False positive due to varying policies" )
+ disabled_tests+=( "plugins.two_password_validations;0;False positive due to varying policies" )
+ disabled_tests+=( "roles.acl_statistics;0;False positive due to a user count mismatch caused by previous test" )
+ disabled_tests+=( "spider.*;0;Fails with network sandbox" )
+ disabled_tests+=( "sys_vars.wsrep_on_without_provider;25625;Known to be broken" )
+
+ if ! use latin1 ; then
+ disabled_tests+=( "funcs_1.is_columns_mysql;0;Requires USE=latin1" )
+ disabled_tests+=( "main.information_schema;0;Requires USE=latin1" )
+ disabled_tests+=( "main.sp2;24177;Requires USE=latin1" )
+ disabled_tests+=( "main.system_mysql_db;0;Requires USE=latin1" )
+ disabled_tests+=( "main.upgrade_MDEV-19650;24178;Requires USE=latin1" )
+ fi
+
+ local test_infos_str test_infos_arr
+ for test_infos_str in "${disabled_tests[@]}" ; do
+ IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}"
+
+ if [[ ${#test_infos_arr[@]} != 3 ]] ; then
+ die "Invalid test data set, not matching format: ${test_infos_str}"
+ fi
+
+ _disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}"
+ done
+ unset test_infos_str test_infos_arr
+
+ # run mysql-test tests
+ pushd "${TESTDIR}" &>/dev/null || die
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test-list="${T}/disabled.def"
+ retstatus_tests=$?
+
+ popd &>/dev/null || die
+
+ # Cleanup is important for these testcases.
+ pkill -9 -f "${S}/ndb" 2>/dev/null
+ pkill -9 -f "${S}/sql" 2>/dev/null
+
+ local failures=""
+ [[ ${retstatus_tests} -eq 0 ]] || failures="${failures} tests"
+
+ [[ -z "${failures}" ]] || die "Test failures: ${failures}"
+ einfo "Tests successfully completed"
+}
+
+src_install() {
+ cmake_src_install
+
+ # Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
+ if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
+ rm "${ED}/usr/include/mysql/server/private/config.h" || die
+ fi
+
+ # Make sure the vars are correctly initialized
+ mysql_init_vars
+
+ # Convenience links
+ einfo "Making Convenience links for mysqlcheck multi-call binary"
+ dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
+ dosym "mysqlcheck" "/usr/bin/mysqlrepair"
+ dosym "mysqlcheck" "/usr/bin/mysqloptimize"
+
+ # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+ if [[ -d "${ED}/usr/data" ]] ; then
+ rm -Rf "${ED}/usr/data" || die
+ fi
+
+ # Unless they explicitly specific USE=test, then do not install the
+ # testsuite. It DOES have a use to be installed, esp. when you want to do a
+ # validation of your database configuration after tuning it.
+ if ! use test ; then
+ rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
+ fi
+
+ # Configuration stuff
+ einfo "Building default configuration ..."
+ insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+ [[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
+ cp "${FILESDIR}/my.cnf-10.2" "${TMPDIR}/my.cnf" || die
+ eprefixify "${TMPDIR}/my.cnf"
+ doins "${TMPDIR}/my.cnf"
+ insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d"
+ cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
+ eprefixify "${TMPDIR}/50-distro-client.cnf"
+ doins "${TMPDIR}/50-distro-client.cnf"
+
+ if use server ; then
+ mycnf_src="my.cnf.distro-server"
+ sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+ "${FILESDIR}/${mycnf_src}" \
+ > "${TMPDIR}/my.cnf.ok" || die
+ if use prefix ; then
+ sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
+ "${TMPDIR}/my.cnf.ok" || die
+ fi
+ if use latin1 ; then
+ sed -i \
+ -e "/character-set/s|utf8|latin1|g" \
+ "${TMPDIR}/my.cnf.ok" || die
+ fi
+ eprefixify "${TMPDIR}/my.cnf.ok"
+ newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
+
+ einfo "Including support files and sample configurations"
+ docinto "support-files"
+ local script
+ for script in \
+ "${S}"/support-files/magic
+ do
+ [[ -f "$script" ]] && dodoc "${script}"
+ done
+
+ docinto "scripts"
+ for script in "${S}"/scripts/mysql* ; do
+ [[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
+ done
+ # Manually install supporting files that conflict with other packages
+ # but are needed for galera and initial installation
+ exeinto /usr/libexec/mariadb
+ doexe "${BUILD_DIR}/extra/my_print_defaults" "${BUILD_DIR}/extra/perror"
+
+ if use pam ; then
+ keepdir /usr/$(get_libdir)/mariadb/plugin/auth_pam_tool_dir
+ fi
+ fi
+
+ # Conflicting files
+ conflicting_files=()
+
+ # We prefer my_print_defaults from dev-db/mysql-connector-c
+ conflicting_files=( "${ED}/usr/share/man/man1/my_print_defaults.1" )
+
+ # Remove bundled mytop in favor of dev-db/mytop
+ conflicting_files+=( "${ED}/usr/bin/mytop" )
+ conflicting_files+=( "${ED}/usr/share/man/man1/mytop.1" )
+
+ local conflicting_file
+ for conflicting_file in "${conflicting_files[@]}" ; do
+ if [[ -e "${conflicting_file}" ]] ; then
+ rm -v "${conflicting_file}" || die
+ fi
+ done
+
+ # Fix a dangling symlink when galera is not built
+ if [[ -L "${ED}/usr/bin/wsrep_sst_rsync_wan" ]] && ! use galera ; then
+ rm "${ED}/usr/bin/wsrep_sst_rsync_wan" || die
+ fi
+
+ # Remove dangling symlink
+ rm "${ED}/usr/$(get_libdir)/libmariadb.a" || die
+
+ # Remove broken SST scripts that are incompatible
+ local scriptremove
+ for scriptremove in wsrep_sst_xtrabackup wsrep_sst_xtrabackup-v2 ; do
+ if [[ -e "${ED}/usr/bin/${scriptremove}" ]] ; then
+ rm "${ED}/usr/bin/${scriptremove}" || die
+ fi
+ done
+}
+
+pkg_preinst() {
+ java-pkg-opt-2_pkg_preinst
+}
+
+pkg_postinst() {
+ # Make sure the vars are correctly initialized
+ mysql_init_vars
+
+ # Create log directory securely if it does not exist
+ [[ -d "${ROOT}/${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}/${MY_LOGDIR}"
+
+ if use server ; then
+ if use pam; then
+ einfo
+ elog "This install includes the PAM authentication plugin."
+ elog "To activate and configure the PAM plugin, please read:"
+ elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/"
+ einfo
+ chown mysql:mysql "${EROOT}/usr/$(get_libdir)/mariadb/plugin/auth_pam_tool_dir" || die
+ fi
+
+ if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+ einfo
+ elog "You might want to run:"
+ elog "\"emerge --config =${CATEGORY}/${PF}\""
+ elog "if this is a new install."
+ elog
+ elog "If you are switching server implentations, you should run the"
+ elog "mysql_upgrade tool."
+ einfo
+ else
+ einfo
+ elog "If you are upgrading major versions, you should run the"
+ elog "mysql_upgrade tool."
+ einfo
+ fi
+
+ if use galera ; then
+ einfo
+ elog "Be sure to edit the my.cnf file to activate your cluster settings."
+ elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
+ elog "The first time the cluster is activated, you should add"
+ elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
+ elog "This option should then be removed for subsequent starts."
+ einfo
+ if [[ -n "${REPLACING_VERSIONS}" ]] ; then
+ local rver
+ for rver in ${REPLACING_VERSIONS} ; do
+ if ver_test "${rver}" -lt "10.4.0" ; then
+ ewarn "Upgrading galera from a previous version requires admin restart of the entire cluster."
+ ewarn "Please refer to https://mariadb.com/kb/en/library/changes-improvements-in-mariadb-104/#galera-4"
+ ewarn "for more information"
+ fi
+ done
+ fi
+ fi
+ fi
+
+ # Note about configuration change
+ einfo
+ elog "This version of mariadb reorganizes the configuration from a single my.cnf"
+ elog "to several files in /etc/mysql/${PN}.d."
+ elog "Please backup any changes you made to /etc/mysql/my.cnf"
+ elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension."
+ elog "You may have as many files as needed and they are read alphabetically."
+ elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
+ einfo
+}
+
+pkg_config() {
+ _getoptval() {
+ local section="${1}"
+ local option="--${2}"
+ local extra_options="${3}"
+ local cmd=(
+ "${my_print_defaults_binary}"
+ "${extra_options}"
+ "${section}"
+ )
+
+ local values=()
+ local parameters=( $(eval "${cmd[@]}" 2>/dev/null) )
+ for parameter in "${parameters[@]}"
+ do
+ # my_print_defaults guarantees output of options, one per line,
+ # in the form that they would be specified on the command line.
+ # So checking for --option=* should be safe.
+ case ${parameter} in
+ ${option}=*)
+ values+=( "${parameter#*=}" )
+ ;;
+ esac
+ done
+
+ if [[ ${#values[@]} -gt 0 ]] ; then
+ # Option could have been set multiple times
+ # in which case only the last occurrence
+ # contains the current value
+ echo "${values[-1]}"
+ fi
+ }
+
+ _mktemp_dry() {
+ # emktemp has no --dry-run option
+ local template="${1}"
+
+ if [[ -z "${template}" ]] ; then
+ if [[ -z "${T}" ]] ; then
+ template="/tmp/XXXXXXX"
+ else
+ template="${T}/XXXXXXX"
+ fi
+ fi
+
+ local template_wo_X=${template//X/}
+ local n_X
+ let n_X=${#template}-${#template_wo_X}
+ if [[ ${n_X} -lt 3 ]] ; then
+ echo "${FUNCNAME[0]}: too few X's in template ‘${template}’" >&2
+ return
+ fi
+
+ local attempts=0
+ local character tmpfile
+ while [[ true ]] ; do
+ let attempts=attempts+1
+
+ new_file=
+ while read -n1 character ; do
+ if [[ "${character}" == "X" ]] ; then
+ tmpfile+="${RANDOM:0:1}"
+ else
+ tmpfile+="${character}"
+ fi
+ done < <(echo -n "${template}")
+
+ if [[ ! -f "${tmpfile}" ]]
+ then
+ echo "${tmpfile}"
+ return
+ fi
+
+ if [[ ${attempts} -ge 100 ]] ; then
+ echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2
+ return
+ fi
+ done
+ }
+
+ local mysql_binary="${EROOT}/usr/bin/mysql"
+ if [[ ! -x "${mysql_binary}" ]] ; then
+ die "'${mysql_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+ fi
+
+ local mysqld_binary="${EROOT}/usr/sbin/mysqld"
+ if [[ ! -x "${mysqld_binary}" ]] ; then
+ die "'${mysqld_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+ fi
+
+ local mysql_install_db_binary="${EROOT}/usr/bin/mysql_install_db"
+ if [[ ! -x "${mysql_install_db_binary}" ]] ; then
+ die "'${mysql_install_db_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+ fi
+
+ local my_print_defaults_binary="${EROOT}/usr/bin/my_print_defaults"
+ if [[ ! -x "${my_print_defaults_binary}" ]] ; then
+ die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!"
+ fi
+
+ if [[ -z "${MYSQL_USER}" ]] ; then
+ MYSQL_USER=mysql
+ if use prefix ; then
+ MYSQL_USER=$(id -u -n 2>/dev/null)
+ if [[ -z "${MYSQL_USER}" ]] ; then
+ die "Failed to determine current username!"
+ fi
+ fi
+ fi
+
+ if [[ -z "${MYSQL_GROUP}" ]] ; then
+ MYSQL_GROUP=mysql
+ if use prefix ; then
+ MYSQL_GROUP=$(id -g -n 2>/dev/null)
+ if [[ -z "${MYSQL_GROUP}" ]] ; then
+ die "Failed to determine current user groupname!"
+ fi
+ fi
+ fi
+
+ # my_print_defaults needs to read stuff in $HOME/.my.cnf
+ local -x HOME="${EROOT}/root"
+
+ # Make sure the vars are correctly initialized
+ mysql_init_vars
+
+ # Read currently set data directory
+ MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named
+ # localhost. Also causes weird failures.
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+ if [[ -z "${MY_DATADIR}" ]] ; then
+ die "Sorry, unable to find MY_DATADIR!"
+ elif [[ -d "${MY_DATADIR}/mysql" ]] ; then
+ ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!"
+ ewarn "Please rename or delete its content if you wish to initialize a new data directory."
+ die "${PN} data directory at '${MY_DATADIR}' looks already initialized!"
+ fi
+
+ MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+ MYSQL_TMPDIR=${MYSQL_TMPDIR%/}
+ # These are dir+prefix
+ MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+ MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+ MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+ MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+
+ # Create missing directories.
+ # Always check if mysql user can write to directory even if we just
+ # created directory because a parent directory might be not
+ # accessible for that user.
+ PID_DIR="${EROOT}/run/mysqld"
+ if [[ ! -d "${PID_DIR}" ]] ; then
+ einfo "Creating ${PN} PID directory '${PID_DIR}' ..."
+ install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \
+ || die "Failed to create PID directory '${PID_DIR}'!"
+ fi
+
+ local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_pid_dir_testfile}" ]] \
+ && die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_pid_dir_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!"
+ else
+ rm "${_pid_dir_testfile}" || die
+ unset _pid_dir_testfile
+ fi
+
+ if [[ ! -d "${MY_DATADIR}" ]] ; then
+ einfo "Creating ${PN} data directory '${MY_DATADIR}' ..."
+ install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \
+ || die "Failed to create ${PN} data directory '${MY_DATADIR}'!"
+ fi
+
+ local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_my_datadir_testfile}" ]] \
+ && die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_my_datadir_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!"
+ else
+ rm "${_my_datadir_testfile}" || die
+ unset _my_datadir_testfile
+ fi
+
+ if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then
+ einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..."
+ install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \
+ || die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!"
+ fi
+
+ if [[ -z "${MYSQL_TMPDIR}" ]] ; then
+ MYSQL_TMPDIR="$(_mktemp_dry "${EROOT}/tmp/mysqld-tmp.XXXXXXXXX")"
+ [[ -z "${MYSQL_TMPDIR}" ]] \
+ && die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!"
+
+ mkdir "${MYSQL_TMPDIR}" || die
+ chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die
+ fi
+
+ # Now we need to test MYSQL_TMPDIR...
+ local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_my_tmpdir_testfile}" ]] \
+ && die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_my_tmpdir_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into tmpdir '${MYSQL_TMPDIR}'!"
+ else
+ rm "${_my_tmpdir_testfile}" || die
+ unset _my_tmpdir_testfile
+ fi
+
+ if [[ "${MYSQL_LOG_BIN}" == /* && ! -d "${MYSQL_LOG_BIN}" ]] ; then
+ # Only create directory when MYSQL_LOG_BIN is an absolute path
+ einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..."
+ install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \
+ || die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'"
+ fi
+
+ if [[ "${MYSQL_LOG_BIN}" == /* ]] ; then
+ # Only test when MYSQL_LOG_BIN is an absolute path
+ local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_my_logbin_testfile}" ]] \
+ && die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_my_logbin_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!"
+ else
+ rm "${_my_logbin_testfile}" || die
+ unset _my_logbin_testfile
+ fi
+ fi
+
+ if [[ "${MYSQL_RELAY_LOG}" == /* && ! -d "${MYSQL_RELAY_LOG}" ]] ; then
+ # Only create directory when MYSQL_RELAY_LOG is an absolute path
+ einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..."
+ install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \
+ || die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!"
+ fi
+
+ if [[ "${MYSQL_RELAY_LOG}" == /* ]] ; then
+ # Only test when MYSQL_RELAY_LOG is an absolute path
+ local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")"
+ [[ -z "${_my_relaylog_testfile}" ]] \
+ && die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+ if use prefix ; then
+ touch "${_my_relaylog_testfile}" &>/dev/null
+ else
+ su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null
+ fi
+
+ if [[ $? -ne 0 ]] ; then
+ die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!"
+ else
+ rm "${_my_relaylog_testfile}" || die
+ unset _my_relaylog_testfile
+ fi
+ fi
+
+ local SETUP_TMPDIR=$(mktemp -d "/tmp/${PN}-config.XXXXXXXXX" 2>/dev/null)
+ [[ -z "${SETUP_TMPDIR}" ]] && die "Failed to create setup tmpdir"
+
+ # Limit access
+ chmod 0770 "${SETUP_TMPDIR}" || die
+ chown ${MYSQL_USER} "${SETUP_TMPDIR}" || die
+
+ local mysql_install_log="${SETUP_TMPDIR}/install_db.log"
+ local mysqld_logfile="${SETUP_TMPDIR}/mysqld.log"
+
+ echo ""
+ einfo "Detected settings:"
+ einfo "=================="
+ einfo "MySQL User:\t\t\t\t${MYSQL_USER}"
+ einfo "MySQL Group:\t\t\t\t${MYSQL_GROUP}"
+ einfo "MySQL DATA directory:\t\t${MY_DATADIR}"
+ einfo "MySQL TMP directory:\t\t\t${MYSQL_TMPDIR}"
+
+ if [[ "${MYSQL_LOG_BIN}" == /* ]] ; then
+ # Absolute path for binary log files specified
+ einfo "MySQL Binary Log File location:\t${MYSQL_LOG_BIN}"
+ fi
+
+ if [[ "${MYSQL_RELAY_LOG}" == /* ]] ; then
+ # Absolute path for relay log files specified
+ einfo "MySQL Relay Log File location:\t${MYSQL_RELAY_LOG}"
+ fi
+
+ einfo "PID DIR:\t\t\t\t${PID_DIR}"
+ einfo "Install db log:\t\t\t${mysql_install_log}"
+ einfo "Install server log:\t\t\t${mysqld_logfile}"
+
+ echo
+
+ if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+ local tmp_mysqld_password_source=
+
+ for tmp_mysqld_password_source in mysql client ; do
+ einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
+ MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
+ if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
+ if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then
+ ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
+ MYSQL_ROOT_PASSWORD=
+ continue
+ fi
+
+ einfo "Found password in '${tmp_mysqld_password_source}' section!"
+ break
+ fi
+ done
+
+ # Sometimes --show is required to display passwords in some implementations of my_print_defaults
+ if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then
+ MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
+ fi
+
+ unset tmp_mysqld_password_source
+ fi
+
+ if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+ local pwd1="a"
+ local pwd2="b"
+
+ echo
+ einfo "No password for mysql 'root' user was specified via environment"
+ einfo "variable MYSQL_ROOT_PASSWORD and no password was found in config"
+ einfo "file like '${HOME}/.my.cnf'."
+ einfo "To continue please provide a password for the mysql 'root' user"
+ einfo "now on console:"
+ ewarn "NOTE: Please avoid [\"'\\_%] characters in the password!"
+ read -rsp " >" pwd1 ; echo
+
+ einfo "Retype the password"
+ read -rsp " >" pwd2 ; echo
+
+ if [[ "x${pwd1}" != "x${pwd2}" ]] ; then
+ die "Passwords are not the same!"
+ fi
+
+ MYSQL_ROOT_PASSWORD="${pwd1}"
+ unset pwd1 pwd2
+
+ echo
+ fi
+
+ local -a mysqld_options
+
+ # Fix bug 446200. Don't reference host my.cnf, needs to come first,
+ # see http://bugs.mysql.com/bug.php?id=31312
+ use prefix && mysqld_options+=( "--defaults-file='${MY_SYSCONFDIR}/my.cnf'" )
+
+ # Figure out which options we need to disable to do the setup
+ local helpfile="${TMPDIR}/mysqld-help"
+ "${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+
+ local opt optexp optfull
+ for opt in host-cache name-resolve networking slave-start \
+ federated ssl log-bin relay-log slow-query-log external-locking \
+ log-slave-updates \
+ ; do
+ optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+ grep -E -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
+ done
+
+ # Prepare timezones, see
+ # https://dev.mysql.com/doc/mysql/en/time-zone-support.html
+ local tz_sql="${SETUP_TMPDIR}/tz.sql"
+
+ echo "USE mysql;" >"${tz_sql}"
+ "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" >> "${tz_sql}" 2>/dev/null
+ if [[ $? -ne 0 ]] ; then
+ die "mysql_tzinfo_to_sql failed!"
+ fi
+
+ local cmd=(
+ "${mysql_install_db_binary}"
+ "${mysqld_options[@]}"
+ "--init-file='${tz_sql}'"
+ "--basedir='${EROOT}/usr'"
+ "--datadir='${MY_DATADIR}'"
+ "--tmpdir='${MYSQL_TMPDIR}'"
+ "--log-error='${mysql_install_log}'"
+ "--rpm"
+ "--cross-bootstrap"
+ "--skip-test-db"
+ "--user=${MYSQL_USER}"
+ )
+
+ einfo "Initializing ${PN} data directory: ${cmd[@]}"
+ eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1
+
+ if [[ $? -ne 0 || ! -f "${MY_DATADIR}/mysql/user.frm" ]] ; then
+ grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2
+ die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!"
+ fi
+
+ local x=${RANDOM}
+ local socket="${PID_DIR}/mysqld.${x}.sock"
+ [[ -f "${socket}" ]] && die "Randomness failed; Socket ${socket} already exists!"
+ local pidfile="${PID_DIR}/mysqld.${x}.pid"
+ [[ -f "${pidfile}" ]] && die "Randomness failed; Pidfile ${pidfile} already exists!"
+ unset x
+
+ cmd=(
+ "${mysqld_binary}"
+ "${mysqld_options[@]}"
+ "--basedir='${EROOT}/usr'"
+ "--datadir='${MY_DATADIR}'"
+ "--tmpdir='${MYSQL_TMPDIR}'"
+ --max_allowed_packet=8M
+ --net_buffer_length=16K
+ "--socket='${socket}'"
+ "--pid-file='${pidfile}'"
+ "--log-error='${mysqld_logfile}'"
+ "--user=${MYSQL_USER}"
+ )
+
+ einfo "Starting mysqld to finalize initialization: ${cmd[@]}"
+ eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 &
+
+ echo -n "Waiting for mysqld to accept connections "
+ local maxtry=15
+ while [[ ! -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+ maxtry=$((${maxtry}-1))
+ echo -n "."
+ sleep 1
+ done
+
+ if [[ -S "${socket}" ]] ; then
+ # Even with a socket we don't know if mysqld will abort
+ # start due to an error so just wait a little bit more...
+ maxtry=5
+ while [[ -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+ maxtry=$((${maxtry}-1))
+ echo -n "."
+ sleep 1
+ done
+ fi
+
+ echo
+
+ if [[ ! -S "${socket}" ]] ; then
+ grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2
+ die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!"
+ fi
+
+ local mysql_logfile="${SETUP_TMPDIR}/set_root_pw.log"
+ touch "${mysql_logfile}" || die
+
+ ebegin "Setting root password"
+ # Do this from memory, as we don't want clear text passwords in temp files
+ local sql="ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}'"
+ cmd=(
+ "${mysql_binary}"
+ --no-defaults
+ "--socket='${socket}'"
+ -hlocalhost
+ "-e \"${sql}\""
+ )
+ eval "${cmd[@]}" >"${mysql_logfile}" 2>&1
+ local rc=$?
+ eend ${rc}
+
+ if [[ ${rc} -ne 0 ]] ; then
+ # Poor man's solution which tries to avoid having password
+ # in log. NOTE: sed can fail if user didn't follow advice
+ # and included character which will require escaping...
+ sed -i -e "s/${MYSQL_ROOT_PASSWORD}/*****/" "${mysql_logfile}" 2>/dev/null
+
+ grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_logfile}"
+ die "Failed to set ${PN} root password. Please review '${mysql_logfile}'!"
+ fi
+
+ # Stop the server
+ if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+ echo -n "Stopping the server "
+ pkill -F "${pidfile}" &>/dev/null
+
+ maxtry=10
+ while [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; do
+ maxtry=$((${maxtry}-1))
+ echo -n "."
+ sleep 1
+ done
+
+ echo
+
+ if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+ # We somehow failed to stop server.
+ # However, not a fatal error. Just warn the user.
+ ewarn "WARNING: mysqld[$(cat "${pidfile}")] is still running!"
+ fi
+ fi
+
+ rm -r "${SETUP_TMPDIR}" || die
+
+ einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!"
+}
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 2a248a5b5815..2746ee0c3f28 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,11 +1,5 @@
-DIST sqlite-doc-3390200.zip 10683207 BLAKE2B 745aedf0c71da6c0d802aed2b64b6e10ef57f4a72210b12276a3019ccc5408bef537ad93c64eb972a7f24117df5780e35f75246d2ba9cd74c4537588eb6cba3c SHA512 54b9e632244b95ebf35fcaa5ce9c02381601eb442eec2ec2a809a7fe24d2cfed751581bb82fd243aaede2c935864da39fd1f1685e762826dd76fc754c7f79c0b
-DIST sqlite-doc-3390300.zip 10312031 BLAKE2B 53e4490a0b2fdc8a8ee76615cef3c9e3006e79d91c7b21d92fcaecb7bb07190b761c506cb6af6cafb9e876974ece6647f33a663959d4ff83bb65310402e74709 SHA512 edab798f777bec097a20798a71c8ea01e4c59034da1f696ce1574a57719edd252a0004a268866e338803dd4c46980754ed1b5ddd05a5fc01b59397b6fda172ae
DIST sqlite-doc-3390400.zip 10853153 BLAKE2B 617927351809e5ec7489011f963337e92b539a83b135daa7ccd48f840d35716d08e8adc08a67e17d674a6bc64ca24fa92b56573c0065105386fc9c75f1f7f9ef SHA512 75d97b0f2f0d530b2e0ad505574af3bf657d82f0859bb5de7ee45c40a80351e933944845cedca56b579925a3d07505c6f4721f756f27862ffafdfc2caff539fb
-DIST sqlite-src-3390200.zip 13403722 BLAKE2B 24ab8cfe5fda267c7a90939875e87bc9f9914f2690f195c21ff2b774ba83a7d6914f57648cf618fd79b37e54ad85121f86310a733a87e6c76bf729716a937d02 SHA512 a838386a48654391590ea0e1cb355d29f6f93033c3e582df7c63139adaf5119dd5a1550e913dbad0d3eafb0bfa03c4fc6dc48a334d9c45ffb8a7205a528b38f1
-DIST sqlite-src-3390300.zip 13404886 BLAKE2B 46c0a39aa1da33b3ab2f3353d641f2e93073531d9db8c7088ce2578eca5c742a4b9d2ac10f1c6488248e103f421cef214596eb692fdf54ef54c113b55961ab89 SHA512 19827a3dc0b57046b3d50e9538dfcf2e0453a04b2d8ccfee94effa3eee1b1a56837740ecef0e6ee4ec0a94d7185fae9f4a5e158291468acbbcead5335196e776
DIST sqlite-src-3390400.zip 13405169 BLAKE2B aa0e0abbdcafced086a604ec910dbfd1e4df28e83e0edb6056019391e96367050e59478ee8847d930191a65b21cf0bf9957c35ef056abd9be4947a3838d78eb2 SHA512 0acb8afc87f911c91ec555cc97af5b77b6b0e80cc8672711ddd87c651d9e11b697c9669ff9ba2b58da12b972bb46acdf8b8fe35993950f10735b4036501b73bb
-EBUILD sqlite-3.39.2.ebuild 13252 BLAKE2B a11cf6540941038ac710c9bf6bce657da353b520f44119c6a68ace2d73ef9f8ea26062d8fa8bc6008bec0917a45597ae1dd1a35c9c4b7a162993e59b51df89b3 SHA512 df3d005656e2e4447cbf0beb950859870e33867d86716af2b92174ad0e40afa43c7efdba40bde85f3aa72cac8405dcf64688a3eb6e16a93a0441c661b1561e18
-EBUILD sqlite-3.39.3.ebuild 13260 BLAKE2B 92c5bc279bd338b62cb19a9e1dacfe483c81a48c104e50f5fc1d8c413136031c9f20794f4eb5fcfecc2c3b1b926596788806934ab9eb57b03f635bdd3d81f835 SHA512 95af9af81ff7063c1d1b3497fb02525b36ff8495c08f933f5e226185d040efb3a6c87ba129fb3989ae96640bffc726fd40e8416379c8af3d8883ddfb3ea4005f
EBUILD sqlite-3.39.4.ebuild 13252 BLAKE2B a11cf6540941038ac710c9bf6bce657da353b520f44119c6a68ace2d73ef9f8ea26062d8fa8bc6008bec0917a45597ae1dd1a35c9c4b7a162993e59b51df89b3 SHA512 df3d005656e2e4447cbf0beb950859870e33867d86716af2b92174ad0e40afa43c7efdba40bde85f3aa72cac8405dcf64688a3eb6e16a93a0441c661b1561e18
EBUILD sqlite-9999.ebuild 13254 BLAKE2B 70c6c1f542340b97a48d1742acb9d1b1f804ce711fe7bfaa8feb5c3fe164d1cb5535e7451f598d810463e4dd7c2640d42179a03c5670475f20195f076617d7d0 SHA512 188c4356483f4031a1e6dfdb9e4b36c999916bbda4608e58cd70abf845f8a1bc366a24535d8d47c5d96041656df1b66a2b817df9d8d1e99e298598e532229f77
MISC metadata.xml 824 BLAKE2B 8ab2e8f230bf3a2b26077d90944bca7bf35ae905310205b90bf243365148488303256606c0ee7c3fb736300686466a1c2583bf103693c20063ca668fe9e52647 SHA512 ed4a89e3c2d633cb6ebf8bcbf3ca055d0d1b2ffd801ba559395f812faeaafdfedd97dae11a5a53a4c068e43026fbd4eed4cb12c8b89a7fda6dabe6f78a2e0b38
diff --git a/dev-db/sqlite/sqlite-3.39.2.ebuild b/dev-db/sqlite/sqlite-3.39.2.ebuild
deleted file mode 100644
index a2eb7c1e987f..000000000000
--- a/dev-db/sqlite/sqlite-3.39.2.ebuild
+++ /dev/null
@@ -1,436 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-
-if [[ "${PV}" != "9999" ]]; then
- SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))"
- DOC_PV="${SRC_PV}"
- # DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))"
-fi
-
-DESCRIPTION="SQL database engine"
-HOMEPAGE="https://sqlite.org/"
-
-# On version updates, make sure to read the forum (https://sqlite.org/forum/forum)
-# for hints regarding test failures, backports, etc.
-if [[ "${PV}" == "9999" ]]; then
- SRC_URI=""
-else
- SRC_URI="https://sqlite.org/2022/${PN}-src-${SRC_PV}.zip
- doc? ( https://sqlite.org/2022/${PN}-doc-${DOC_PV}.zip )"
-fi
-
-LICENSE="public-domain"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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="debug doc icu +readline secure-delete static-libs tcl test tools"
-if [[ "${PV}" == "9999" ]]; then
- PROPERTIES="live"
-fi
-RESTRICT="!test? ( test )"
-
-if [[ "${PV}" == "9999" ]]; then
- BDEPEND=">=dev-lang/tcl-8.6:0
- dev-vcs/fossil"
-else
- BDEPEND="app-arch/unzip
- >=dev-lang/tcl-8.6:0"
-fi
-RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
- icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
- readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
- tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
- tools? ( dev-lang/tcl:0= )"
-DEPEND="${RDEPEND}
- test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )"
-
-if [[ "${PV}" == "9999" ]]; then
- S="${WORKDIR}/${PN}"
-else
- S="${WORKDIR}/${PN}-src-${SRC_PV}"
-fi
-
-_fossil_fetch() {
- local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
- local repo_id="${1}"
- local repo_uri="${2}"
-
- local -x FOSSIL_HOME="${HOME}"
-
- mkdir -p "${T}/fossil/${repo_id}" || die
- pushd "${T}/fossil/${repo_id}" > /dev/null || die
-
- if [[ -n "${EVCS_OFFLINE}" ]]; then
- if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
- die "Network activity disabled using EVCS_OFFLINE and clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
- fi
- else
- if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
- einfo fossil clone --verbose "${repo_uri}" "${repo_id}.fossil"
- fossil clone --verbose "${repo_uri}" "${repo_id}.fossil" || die
- echo
- else
- cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" . || die
- einfo fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}"
- fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}" || die
- echo
- fi
-
- (
- addwrite "${distdir}"
- mkdir -p "${distdir}/fossil-src/${repo_id}" || die
- cp -p "${repo_id}.fossil" "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" || die
- )
- fi
-
- popd > /dev/null || die
-}
-
-_fossil_checkout() {
- local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
- local repo_id="${1}"
- local branch_or_commit="${2}"
- local target_directory="${3}"
-
- local -x FOSSIL_HOME="${HOME}"
-
- if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
- die "Clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
- fi
-
- if [[ ! -f "${T}/fossil/${repo_id}/${repo_id}.fossil" ]]; then
- mkdir -p "${T}/fossil/${repo_id}" || die
- cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" "${T}/fossil/${repo_id}" || die
- fi
-
- mkdir "${target_directory}" || die
- pushd "${target_directory}" > /dev/null || die
-
- einfo fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}"
- fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}" || die
- echo
-
- popd > /dev/null || die
-}
-
-fossil_fetch() {
- local repo_id="${1}"
- local repo_uri="${2}"
- local target_directory="${3}"
-
- local branch_or_commit="${EFOSSIL_COMMIT:-${EFOSSIL_BRANCH:-trunk}}"
-
- _fossil_fetch "${repo_id}" "${repo_uri}"
- _fossil_checkout "${repo_id}" "${branch_or_commit}" "${target_directory}"
-}
-
-src_unpack() {
- if [[ "${PV}" == "9999" ]]; then
- fossil_fetch sqlite https://sqlite.org/src "${WORKDIR}/${PN}"
- if use doc; then
- fossil_fetch sqlite-doc https://sqlite.org/docsrc "${WORKDIR}/${PN}-doc"
- fi
- else
- default
- fi
-}
-
-src_prepare() {
- eapply_user
-
- eautoreconf
-
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- local -x CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}"
- local options=()
-
- options+=(
- --enable-load-extension
- --enable-threadsafe
- )
-
- # Support detection of misuse of SQLite API.
- # https://sqlite.org/compile.html#enable_api_armor
- append-cppflags -DSQLITE_ENABLE_API_ARMOR
-
- # Support bytecode and tables_used virtual tables.
- # https://sqlite.org/compile.html#enable_bytecode_vtab
- # https://sqlite.org/bytecodevtab.html
- append-cppflags -DSQLITE_ENABLE_BYTECODE_VTAB
-
- # Support column metadata functions.
- # https://sqlite.org/compile.html#enable_column_metadata
- # https://sqlite.org/c3ref/column_database_name.html
- append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
-
- # Support sqlite_dbpage virtual table.
- # https://sqlite.org/compile.html#enable_dbpage_vtab
- # https://sqlite.org/dbpage.html
- append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB
-
- # Support dbstat virtual table.
- # https://sqlite.org/compile.html#enable_dbstat_vtab
- # https://sqlite.org/dbstat.html
- append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
-
- # Support sqlite3_serialize() and sqlite3_deserialize() functions.
- # https://sqlite.org/compile.html#enable_deserialize
- # https://sqlite.org/c3ref/serialize.html
- # https://sqlite.org/c3ref/deserialize.html
- append-cppflags -DSQLITE_ENABLE_DESERIALIZE
-
- # Support comments in output of EXPLAIN.
- # https://sqlite.org/compile.html#enable_explain_comments
- append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
-
- # Support Full-Text Search versions 3, 4 and 5.
- # https://sqlite.org/compile.html#enable_fts3
- # https://sqlite.org/compile.html#enable_fts3_parenthesis
- # https://sqlite.org/compile.html#enable_fts4
- # https://sqlite.org/compile.html#enable_fts5
- # https://sqlite.org/fts3.html
- # https://sqlite.org/fts5.html
- append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
- options+=(--enable-fts5)
-
- # Support hidden columns.
- append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
-
- # Support memsys5 memory allocator.
- # https://sqlite.org/compile.html#enable_memsys5
- # https://sqlite.org/malloc.html#memsys5
- append-cppflags -DSQLITE_ENABLE_MEMSYS5
-
- # Support sqlite3_normalized_sql() function.
- # https://sqlite.org/c3ref/expanded_sql.html
- append-cppflags -DSQLITE_ENABLE_NORMALIZE
-
- # Support sqlite_offset() function.
- # https://sqlite.org/compile.html#enable_offset_sql_func
- # https://sqlite.org/lang_corefunc.html#sqlite_offset
- append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC
-
- # Support pre-update hook functions.
- # https://sqlite.org/compile.html#enable_preupdate_hook
- # https://sqlite.org/c3ref/preupdate_count.html
- append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK
-
- # Support Resumable Bulk Update extension.
- # https://sqlite.org/compile.html#enable_rbu
- # https://sqlite.org/rbu.html
- append-cppflags -DSQLITE_ENABLE_RBU
-
- # Support R*Trees.
- # https://sqlite.org/compile.html#enable_rtree
- # https://sqlite.org/compile.html#enable_geopoly
- # https://sqlite.org/rtree.html
- # https://sqlite.org/geopoly.html
- append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY
-
- # Support Session extension.
- # https://sqlite.org/compile.html#enable_session
- # https://sqlite.org/sessionintro.html
- append-cppflags -DSQLITE_ENABLE_SESSION
-
- # Support scan status functions.
- # https://sqlite.org/compile.html#enable_stmt_scanstatus
- # https://sqlite.org/c3ref/stmt_scanstatus.html
- # https://sqlite.org/c3ref/stmt_scanstatus_reset.html
- append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
-
- # Support sqlite_stmt virtual table.
- # https://sqlite.org/compile.html#enable_stmtvtab
- # https://sqlite.org/stmt.html
- append-cppflags -DSQLITE_ENABLE_STMTVTAB
-
- # Support unknown() function.
- # https://sqlite.org/compile.html#enable_unknown_sql_function
- append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
-
- # Support unlock notification.
- # https://sqlite.org/compile.html#enable_unlock_notify
- # https://sqlite.org/c3ref/unlock_notify.html
- # https://sqlite.org/unlock_notify.html
- append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
-
- # Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements.
- # https://sqlite.org/compile.html#enable_update_delete_limit
- # https://sqlite.org/lang_delete.html#optional_limit_and_order_by_clauses
- # https://sqlite.org/lang_update.html#optional_limit_and_order_by_clauses
- append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
-
- # Support soundex() function.
- # https://sqlite.org/compile.html#soundex
- # https://sqlite.org/lang_corefunc.html#soundex
- append-cppflags -DSQLITE_SOUNDEX
-
- # Support URI filenames.
- # https://sqlite.org/compile.html#use_uri
- # https://sqlite.org/uri.html
- append-cppflags -DSQLITE_USE_URI
-
- # debug USE flag.
- options+=($(use_enable debug))
-
- # icu USE flag.
- if use icu; then
- # Support ICU extension.
- # https://sqlite.org/compile.html#enable_icu
- append-cppflags -DSQLITE_ENABLE_ICU
- sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
- fi
-
- # readline USE flag.
- options+=(
- --disable-editline
- $(use_enable readline)
- )
- if use readline; then
- options+=(--with-readline-inc="-I${ESYSROOT}/usr/include/readline")
- fi
-
- # secure-delete USE flag.
- if use secure-delete; then
- # Enable secure_delete pragma by default.
- # https://sqlite.org/compile.html#secure_delete
- # https://sqlite.org/pragma.html#pragma_secure_delete
- append-cppflags -DSQLITE_SECURE_DELETE
- fi
-
- # static-libs USE flag.
- options+=($(use_enable static-libs static))
-
- # tcl, test, tools USE flags.
- if use tcl || use test || { use tools && multilib_is_native_abi; }; then
- options+=(
- --enable-tcl
- --with-tcl="${ESYSROOT}/usr/$(get_libdir)"
- )
- else
- options+=(--disable-tcl)
- fi
-
- if [[ "${ABI}" == "x86" ]]; then
- if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
- append-cflags -mfpmath=sse
- else
- append-cflags -ffloat-store
- fi
-
- # Skip known-broken test for now
- # https://sqlite.org/forum/forumpost/d97caf168f
- # https://sqlite.org/forum/forumpost/50f136d91d
- if use test ; then
- rm test/atof1.test || die
- fi
- fi
-
- econf "${options[@]}"
-}
-
-multilib_src_compile() {
- emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
-
- if use tools && multilib_is_native_abi; then
- emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh
- fi
-
- if [[ "${PV}" == "9999" ]] && use doc && multilib_is_native_abi; then
- emake tclsqlite3.c
-
- local build_directory="$(pwd)"
- build_directory="${build_directory##*/}"
-
- mkdir "${WORKDIR}/${PN}-doc-build" || die
- pushd "${WORKDIR}/${PN}-doc-build" > /dev/null || die
-
- emake -f "../${PN}-doc/Makefile" -j1 SRC="../${PN}" BLD="../${build_directory}" DOC="../${PN}-doc" CC="$(tc-getBUILD_CC)" TCLINC="" TCLFLAGS="$($(tc-getBUILD_PKG_CONFIG) --libs tcl) -ldl -lm" base doc
- rmdir doc/matrix{/*,} || die
-
- popd > /dev/null || die
- fi
-}
-
-multilib_src_test() {
- if [[ "${EUID}" -eq 0 ]]; then
- ewarn "Skipping tests due to root permissions"
- return
- fi
-
- local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}"
-
- # e_uri.test tries to open files in /.
- # https://bugs.gentoo.org/839798
- local SANDBOX_PREDICT=${SANDBOX_PREDICT}
- addpredict "/test.db:/ÿ.db"
-
- emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
-
- if use tools && multilib_is_native_abi; then
- install_tool() {
- if [[ -f ".libs/${1}" ]]; then
- newbin ".libs/${1}" "${2}"
- else
- newbin "${1}" "${2}"
- fi
- }
-
- install_tool changeset sqlite3-changeset
- install_tool dbdump sqlite3-db-dump
- install_tool dbhash sqlite3-db-hash
- install_tool dbtotxt sqlite3-db-to-txt
- install_tool index_usage sqlite3-index-usage
- install_tool rbu sqlite3-rbu
- install_tool scrub sqlite3-scrub
- install_tool showdb sqlite3-show-db
- install_tool showjournal sqlite3-show-journal
- install_tool showshm sqlite3-show-shm
- install_tool showstat4 sqlite3-show-stat4
- install_tool showwal sqlite3-show-wal
- install_tool sqldiff sqlite3-diff
- install_tool sqlite3_analyzer sqlite3-analyzer
- install_tool sqlite3_checker sqlite3-checker
- install_tool sqlite3_expert sqlite3-expert
- install_tool sqltclsh sqlite3-tclsh
-
- unset -f install_tool
- fi
-}
-
-multilib_src_install_all() {
- find "${ED}" -name "*.la" -delete || die
-
- doman sqlite3.1
-
- if use doc; then
- if [[ "${PV}" == "9999" ]]; then
- pushd "${WORKDIR}/${PN}-doc-build/doc" > /dev/null || die
- else
- pushd "${WORKDIR}/${PN}-doc-${DOC_PV}" > /dev/null || die
- fi
-
- find "(" -name "*.db" -o -name "*.txt" ")" -delete || die
- if [[ "${PV}" != "9999" ]]; then
- rm search search.d/admin || die
- rmdir search.d || die
- find -name "*~" -delete || die
- fi
-
- (
- docinto html
- dodoc -r *
- )
-
- popd > /dev/null || die
- fi
-}
diff --git a/dev-db/sqlite/sqlite-3.39.3.ebuild b/dev-db/sqlite/sqlite-3.39.3.ebuild
deleted file mode 100644
index c69a893b551d..000000000000
--- a/dev-db/sqlite/sqlite-3.39.3.ebuild
+++ /dev/null
@@ -1,436 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-
-if [[ "${PV}" != "9999" ]]; then
- SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))"
- DOC_PV="${SRC_PV}"
- # DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))"
-fi
-
-DESCRIPTION="SQL database engine"
-HOMEPAGE="https://sqlite.org/"
-
-# On version updates, make sure to read the forum (https://sqlite.org/forum/forum)
-# for hints regarding test failures, backports, etc.
-if [[ "${PV}" == "9999" ]]; then
- SRC_URI=""
-else
- SRC_URI="https://sqlite.org/2022/${PN}-src-${SRC_PV}.zip
- doc? ( https://sqlite.org/2022/${PN}-doc-${DOC_PV}.zip )"
-fi
-
-LICENSE="public-domain"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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="debug doc icu +readline secure-delete static-libs tcl test tools"
-if [[ "${PV}" == "9999" ]]; then
- PROPERTIES="live"
-fi
-RESTRICT="!test? ( test )"
-
-if [[ "${PV}" == "9999" ]]; then
- BDEPEND=">=dev-lang/tcl-8.6:0
- dev-vcs/fossil"
-else
- BDEPEND="app-arch/unzip
- >=dev-lang/tcl-8.6:0"
-fi
-RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
- icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
- readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
- tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
- tools? ( dev-lang/tcl:0= )"
-DEPEND="${RDEPEND}
- test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )"
-
-if [[ "${PV}" == "9999" ]]; then
- S="${WORKDIR}/${PN}"
-else
- S="${WORKDIR}/${PN}-src-${SRC_PV}"
-fi
-
-_fossil_fetch() {
- local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
- local repo_id="${1}"
- local repo_uri="${2}"
-
- local -x FOSSIL_HOME="${HOME}"
-
- mkdir -p "${T}/fossil/${repo_id}" || die
- pushd "${T}/fossil/${repo_id}" > /dev/null || die
-
- if [[ -n "${EVCS_OFFLINE}" ]]; then
- if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
- die "Network activity disabled using EVCS_OFFLINE and clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
- fi
- else
- if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
- einfo fossil clone --verbose "${repo_uri}" "${repo_id}.fossil"
- fossil clone --verbose "${repo_uri}" "${repo_id}.fossil" || die
- echo
- else
- cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" . || die
- einfo fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}"
- fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}" || die
- echo
- fi
-
- (
- addwrite "${distdir}"
- mkdir -p "${distdir}/fossil-src/${repo_id}" || die
- cp -p "${repo_id}.fossil" "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" || die
- )
- fi
-
- popd > /dev/null || die
-}
-
-_fossil_checkout() {
- local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
- local repo_id="${1}"
- local branch_or_commit="${2}"
- local target_directory="${3}"
-
- local -x FOSSIL_HOME="${HOME}"
-
- if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
- die "Clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
- fi
-
- if [[ ! -f "${T}/fossil/${repo_id}/${repo_id}.fossil" ]]; then
- mkdir -p "${T}/fossil/${repo_id}" || die
- cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" "${T}/fossil/${repo_id}" || die
- fi
-
- mkdir "${target_directory}" || die
- pushd "${target_directory}" > /dev/null || die
-
- einfo fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}"
- fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}" || die
- echo
-
- popd > /dev/null || die
-}
-
-fossil_fetch() {
- local repo_id="${1}"
- local repo_uri="${2}"
- local target_directory="${3}"
-
- local branch_or_commit="${EFOSSIL_COMMIT:-${EFOSSIL_BRANCH:-trunk}}"
-
- _fossil_fetch "${repo_id}" "${repo_uri}"
- _fossil_checkout "${repo_id}" "${branch_or_commit}" "${target_directory}"
-}
-
-src_unpack() {
- if [[ "${PV}" == "9999" ]]; then
- fossil_fetch sqlite https://sqlite.org/src "${WORKDIR}/${PN}"
- if use doc; then
- fossil_fetch sqlite-doc https://sqlite.org/docsrc "${WORKDIR}/${PN}-doc"
- fi
- else
- default
- fi
-}
-
-src_prepare() {
- eapply_user
-
- eautoreconf
-
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- local -x CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}"
- local options=()
-
- options+=(
- --enable-load-extension
- --enable-threadsafe
- )
-
- # Support detection of misuse of SQLite API.
- # https://sqlite.org/compile.html#enable_api_armor
- append-cppflags -DSQLITE_ENABLE_API_ARMOR
-
- # Support bytecode and tables_used virtual tables.
- # https://sqlite.org/compile.html#enable_bytecode_vtab
- # https://sqlite.org/bytecodevtab.html
- append-cppflags -DSQLITE_ENABLE_BYTECODE_VTAB
-
- # Support column metadata functions.
- # https://sqlite.org/compile.html#enable_column_metadata
- # https://sqlite.org/c3ref/column_database_name.html
- append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
-
- # Support sqlite_dbpage virtual table.
- # https://sqlite.org/compile.html#enable_dbpage_vtab
- # https://sqlite.org/dbpage.html
- append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB
-
- # Support dbstat virtual table.
- # https://sqlite.org/compile.html#enable_dbstat_vtab
- # https://sqlite.org/dbstat.html
- append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
-
- # Support sqlite3_serialize() and sqlite3_deserialize() functions.
- # https://sqlite.org/compile.html#enable_deserialize
- # https://sqlite.org/c3ref/serialize.html
- # https://sqlite.org/c3ref/deserialize.html
- append-cppflags -DSQLITE_ENABLE_DESERIALIZE
-
- # Support comments in output of EXPLAIN.
- # https://sqlite.org/compile.html#enable_explain_comments
- append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
-
- # Support Full-Text Search versions 3, 4 and 5.
- # https://sqlite.org/compile.html#enable_fts3
- # https://sqlite.org/compile.html#enable_fts3_parenthesis
- # https://sqlite.org/compile.html#enable_fts4
- # https://sqlite.org/compile.html#enable_fts5
- # https://sqlite.org/fts3.html
- # https://sqlite.org/fts5.html
- append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
- options+=(--enable-fts5)
-
- # Support hidden columns.
- append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
-
- # Support memsys5 memory allocator.
- # https://sqlite.org/compile.html#enable_memsys5
- # https://sqlite.org/malloc.html#memsys5
- append-cppflags -DSQLITE_ENABLE_MEMSYS5
-
- # Support sqlite3_normalized_sql() function.
- # https://sqlite.org/c3ref/expanded_sql.html
- append-cppflags -DSQLITE_ENABLE_NORMALIZE
-
- # Support sqlite_offset() function.
- # https://sqlite.org/compile.html#enable_offset_sql_func
- # https://sqlite.org/lang_corefunc.html#sqlite_offset
- append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC
-
- # Support pre-update hook functions.
- # https://sqlite.org/compile.html#enable_preupdate_hook
- # https://sqlite.org/c3ref/preupdate_count.html
- append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK
-
- # Support Resumable Bulk Update extension.
- # https://sqlite.org/compile.html#enable_rbu
- # https://sqlite.org/rbu.html
- append-cppflags -DSQLITE_ENABLE_RBU
-
- # Support R*Trees.
- # https://sqlite.org/compile.html#enable_rtree
- # https://sqlite.org/compile.html#enable_geopoly
- # https://sqlite.org/rtree.html
- # https://sqlite.org/geopoly.html
- append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY
-
- # Support Session extension.
- # https://sqlite.org/compile.html#enable_session
- # https://sqlite.org/sessionintro.html
- append-cppflags -DSQLITE_ENABLE_SESSION
-
- # Support scan status functions.
- # https://sqlite.org/compile.html#enable_stmt_scanstatus
- # https://sqlite.org/c3ref/stmt_scanstatus.html
- # https://sqlite.org/c3ref/stmt_scanstatus_reset.html
- append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
-
- # Support sqlite_stmt virtual table.
- # https://sqlite.org/compile.html#enable_stmtvtab
- # https://sqlite.org/stmt.html
- append-cppflags -DSQLITE_ENABLE_STMTVTAB
-
- # Support unknown() function.
- # https://sqlite.org/compile.html#enable_unknown_sql_function
- append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
-
- # Support unlock notification.
- # https://sqlite.org/compile.html#enable_unlock_notify
- # https://sqlite.org/c3ref/unlock_notify.html
- # https://sqlite.org/unlock_notify.html
- append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
-
- # Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements.
- # https://sqlite.org/compile.html#enable_update_delete_limit
- # https://sqlite.org/lang_delete.html#optional_limit_and_order_by_clauses
- # https://sqlite.org/lang_update.html#optional_limit_and_order_by_clauses
- append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
-
- # Support soundex() function.
- # https://sqlite.org/compile.html#soundex
- # https://sqlite.org/lang_corefunc.html#soundex
- append-cppflags -DSQLITE_SOUNDEX
-
- # Support URI filenames.
- # https://sqlite.org/compile.html#use_uri
- # https://sqlite.org/uri.html
- append-cppflags -DSQLITE_USE_URI
-
- # debug USE flag.
- options+=($(use_enable debug))
-
- # icu USE flag.
- if use icu; then
- # Support ICU extension.
- # https://sqlite.org/compile.html#enable_icu
- append-cppflags -DSQLITE_ENABLE_ICU
- sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
- fi
-
- # readline USE flag.
- options+=(
- --disable-editline
- $(use_enable readline)
- )
- if use readline; then
- options+=(--with-readline-inc="-I${ESYSROOT}/usr/include/readline")
- fi
-
- # secure-delete USE flag.
- if use secure-delete; then
- # Enable secure_delete pragma by default.
- # https://sqlite.org/compile.html#secure_delete
- # https://sqlite.org/pragma.html#pragma_secure_delete
- append-cppflags -DSQLITE_SECURE_DELETE
- fi
-
- # static-libs USE flag.
- options+=($(use_enable static-libs static))
-
- # tcl, test, tools USE flags.
- if use tcl || use test || { use tools && multilib_is_native_abi; }; then
- options+=(
- --enable-tcl
- --with-tcl="${ESYSROOT}/usr/$(get_libdir)"
- )
- else
- options+=(--disable-tcl)
- fi
-
- if [[ "${ABI}" == "x86" ]]; then
- if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
- append-cflags -mfpmath=sse
- else
- append-cflags -ffloat-store
- fi
-
- # Skip known-broken test for now
- # https://sqlite.org/forum/forumpost/d97caf168f
- # https://sqlite.org/forum/forumpost/50f136d91d
- if use test ; then
- rm test/atof1.test || die
- fi
- fi
-
- econf "${options[@]}"
-}
-
-multilib_src_compile() {
- emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
-
- if use tools && multilib_is_native_abi; then
- emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh
- fi
-
- if [[ "${PV}" == "9999" ]] && use doc && multilib_is_native_abi; then
- emake tclsqlite3.c
-
- local build_directory="$(pwd)"
- build_directory="${build_directory##*/}"
-
- mkdir "${WORKDIR}/${PN}-doc-build" || die
- pushd "${WORKDIR}/${PN}-doc-build" > /dev/null || die
-
- emake -f "../${PN}-doc/Makefile" -j1 SRC="../${PN}" BLD="../${build_directory}" DOC="../${PN}-doc" CC="$(tc-getBUILD_CC)" TCLINC="" TCLFLAGS="$($(tc-getBUILD_PKG_CONFIG) --libs tcl) -ldl -lm" base doc
- rmdir doc/matrix{/*,} || die
-
- popd > /dev/null || die
- fi
-}
-
-multilib_src_test() {
- if [[ "${EUID}" -eq 0 ]]; then
- ewarn "Skipping tests due to root permissions"
- return
- fi
-
- local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}"
-
- # e_uri.test tries to open files in /.
- # https://bugs.gentoo.org/839798
- local SANDBOX_PREDICT=${SANDBOX_PREDICT}
- addpredict "/test.db:/ÿ.db"
-
- emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
-
- if use tools && multilib_is_native_abi; then
- install_tool() {
- if [[ -f ".libs/${1}" ]]; then
- newbin ".libs/${1}" "${2}"
- else
- newbin "${1}" "${2}"
- fi
- }
-
- install_tool changeset sqlite3-changeset
- install_tool dbdump sqlite3-db-dump
- install_tool dbhash sqlite3-db-hash
- install_tool dbtotxt sqlite3-db-to-txt
- install_tool index_usage sqlite3-index-usage
- install_tool rbu sqlite3-rbu
- install_tool scrub sqlite3-scrub
- install_tool showdb sqlite3-show-db
- install_tool showjournal sqlite3-show-journal
- install_tool showshm sqlite3-show-shm
- install_tool showstat4 sqlite3-show-stat4
- install_tool showwal sqlite3-show-wal
- install_tool sqldiff sqlite3-diff
- install_tool sqlite3_analyzer sqlite3-analyzer
- install_tool sqlite3_checker sqlite3-checker
- install_tool sqlite3_expert sqlite3-expert
- install_tool sqltclsh sqlite3-tclsh
-
- unset -f install_tool
- fi
-}
-
-multilib_src_install_all() {
- find "${ED}" -name "*.la" -delete || die
-
- doman sqlite3.1
-
- if use doc; then
- if [[ "${PV}" == "9999" ]]; then
- pushd "${WORKDIR}/${PN}-doc-build/doc" > /dev/null || die
- else
- pushd "${WORKDIR}/${PN}-doc-${DOC_PV}" > /dev/null || die
- fi
-
- find "(" -name "*.db" -o -name "*.txt" ")" -delete || die
- if [[ "${PV}" != "9999" ]]; then
- rm search search.d/admin || die
- rmdir search.d || die
- find -name "*~" -delete || die
- fi
-
- (
- docinto html
- dodoc -r *
- )
-
- popd > /dev/null || die
- fi
-}
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 7066302849f9..6d9dffde0bf1 100644
Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ
diff --git a/dev-embedded/libjaylink/Manifest b/dev-embedded/libjaylink/Manifest
index dd12ef52e9f9..5eefc280ede2 100644
--- a/dev-embedded/libjaylink/Manifest
+++ b/dev-embedded/libjaylink/Manifest
@@ -1,5 +1,3 @@
-DIST libjaylink-0.2.0.tar.bz2 59078 BLAKE2B 7928875248972bc00ec46511861e160491f7a53f729e0fbfe3a6d08335532fffc9e285e8a354a390037bebe696b6740bdc422164238947baf5e0fcf8f55c0dd5 SHA512 5a8c458982fdea2025aa3ce774d41cc58a283824dcd90a94531ee5e6ca50d9961b0ebb40a6dd3a97fdfcb44625437d685151560185449c3161fe399e0651da44
DIST libjaylink-0.3.1.tar.bz2 61062 BLAKE2B 7a220b7e1ae1818b9d65d6bb92b282516ce6e4144ce77ee8b77088ebc92f9a091ae04a78c043afaa90ee9f737baa7c2fcd0a9237b60662af0d858fb24cef1c5e SHA512 4964e522cb59f59db444ca350529dd3695e2ccb451f7607e2c14074bafe47688f35b2e8b3304170a611db2d21040f3f98c95def179cf4f95733287986811fd78
-EBUILD libjaylink-0.2.0.ebuild 823 BLAKE2B c388faf02a0292265ff13db4ded9aca6d912de9952cd7b7fe043eea361ce334c07f663a67901525af24afc60b4b7c72057fd092ad2b93aaeb908ca959dd62913 SHA512 c55fcab380cbc8c0e1442c959d60180dbd972857e369ad19d7ce68ef6d03364fb53d6410b525f164b2ca8059b4745b3c361a77792ab5e9a9637863b5f9595068
-EBUILD libjaylink-0.3.1.ebuild 819 BLAKE2B 6a17f87c8067b5e99cef4c66ed60d1c587a82d2a9ff8ca560e098f9c180b4f3f62484a20cb4707b665fb2cb3a141b8bbca14a99aab760bd36d5634d35cbb7f21 SHA512 872cf96a5c017ef2fcdfaf97f81e0f98026e787af1664353b7d9e85fb9f9863193b2391ad43b115ee9d6d661ff93fa7d748b107371f50bb7cfdd6abfd34315fe
+EBUILD libjaylink-0.3.1.ebuild 816 BLAKE2B 20ff8b374f93b5058507dccbbbd4caf2ee4ceb7c329f433c0c2b18ab73687cd479b4841b2d533ec46126541ced09b28dc27236382574680dc8716e252a7f5013 SHA512 f8748b4d3459372f74f3de3e57e8f12b5ab9a96bca6b11b2f35fb9051d892f134e98c2a4b6dfd75676eac169cf83e3114fe92c0c14da3af5e438932527061888
MISC metadata.xml 248 BLAKE2B 9858a97a2186d5b06e272fe28021e0e668897630d8b99023000e8e58e852e80e16b399d8f864b9dff6c9fda25e1519ac8b4331792a4b441be23922707c4ad6a9 SHA512 a1e8f757e473af3ab0ccf695f849dc91e1be877dd505d339bdd26e35a2cf7fb5ffd8f5bf34e933873a462023aecb0edbddefbbda455289279182059cd6c1b0e5
diff --git a/dev-embedded/libjaylink/libjaylink-0.2.0.ebuild b/dev-embedded/libjaylink/libjaylink-0.2.0.ebuild
deleted file mode 100644
index 81f3e444b538..000000000000
--- a/dev-embedded/libjaylink/libjaylink-0.2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Library to access J-Link devices"
-HOMEPAGE="https://gitlab.zapb.de/libjaylink/libjaylink"
-
-SRC_URI="https://gitlab.zapb.de/libjaylink/libjaylink/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm ~riscv x86"
-IUSE="static-libs"
-
-DEPEND="virtual/libusb:1[${MULTILIB_USEDEP}]"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
- sed -i -e "/^JAYLINK_CFLAGS=/ s/ -Werror / /" configure.ac || die
- eapply_user
- eautoreconf
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
- einstalldocs
- use static-libs || find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-embedded/libjaylink/libjaylink-0.3.1.ebuild b/dev-embedded/libjaylink/libjaylink-0.3.1.ebuild
index 8601f4cec5f0..acb1508d8178 100644
--- a/dev-embedded/libjaylink/libjaylink-0.3.1.ebuild
+++ b/dev-embedded/libjaylink/libjaylink-0.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.zapb.de/libjaylink/libjaylink/-/archive/${PV}/${P}.tar.b
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
+KEYWORDS="amd64 arm ~riscv x86"
DEPEND="virtual/libusb:1"
RDEPEND="${DEPEND}"
diff --git a/dev-embedded/uisp/Manifest b/dev-embedded/uisp/Manifest
index 7186d2e0799f..b322964722d3 100644
--- a/dev-embedded/uisp/Manifest
+++ b/dev-embedded/uisp/Manifest
@@ -3,4 +3,4 @@ AUX uisp-20050207-clang.patch 2558 BLAKE2B 50832b8a6a61d6c2d1daf46dc469ea8ab6a61
AUX uisp-20050207-mega-48-88-168.patch 1723 BLAKE2B 7b52560d9a516b9d04efc5b3bc6b59759437217bf1632b3d3de952e3975f58762af3733f63ff35dde687e1c3591ef5805f25c00d164ac48b8aee1b12cacfa087 SHA512 5c850c08320bc5888b8d6556e05c06f5e201a6cc311a89c394d6ad76a9a1332bfe2296731d952cf0b911c8ab94ea34520535fa8011976829abc9cd4b48303fa5
DIST uisp-20050207.tar.gz 166745 BLAKE2B a99bd0d39a053797d3dee0a4390d0ffcca014bed465ba2aea3e99022fff8c3f5f4dbe96a0e33422ffcfa33621d94f42d37dac17862fd25e7902b3bf79aa90692 SHA512 1dd62d97c2a459abaed4ce60302e7153564d0fd87689c40d175757549fe8e797749fd2f76c6c02bcb85e56600d7e4c790c396dc2b56e152ead486df8e1bc2fe7
EBUILD uisp-20050207-r1.ebuild 589 BLAKE2B effc7bb35521f4b8c367923aa8f975f33b882bfb0f219b055f109243ce70ca3cae88d1a0dcb66df76295f9517fa817e3a118f16f38ea17d1d50e294ac2e4edaa SHA512 54b75a808c928fe7e808978b141546c1bfe2d4cdc0d66ccea7b15f3d14907306452e70583b57489f8b4c6c6c4da7a073b1c6e3a1a612253597035483fcaa065d
-MISC metadata.xml 248 BLAKE2B 9858a97a2186d5b06e272fe28021e0e668897630d8b99023000e8e58e852e80e16b399d8f864b9dff6c9fda25e1519ac8b4331792a4b441be23922707c4ad6a9 SHA512 a1e8f757e473af3ab0ccf695f849dc91e1be877dd505d339bdd26e35a2cf7fb5ffd8f5bf34e933873a462023aecb0edbddefbbda455289279182059cd6c1b0e5
+MISC metadata.xml 330 BLAKE2B 5b5e00beb84cb295b2aacc7d6a15f4c0ac153dd5f19ef6cfd036c937457c74ae8ea8e042dced345d59d9cd060291f67a91bf5f5115646533be84ffb48ac98637 SHA512 06cf4e9bbefbc7620517723d1e75dbe36df93d5f2a0248bddcb87a07b46be976817ecbee767a88be6343715bb5ecb0aa04b845989e7d36940d619a6bffd518a3
diff --git a/dev-embedded/uisp/metadata.xml b/dev-embedded/uisp/metadata.xml
index 98ae10b3c34a..e7bfe1daed8f 100644
--- a/dev-embedded/uisp/metadata.xml
+++ b/dev-embedded/uisp/metadata.xml
@@ -1,8 +1,11 @@
-
- embedded@gentoo.org
- Embedded Gentoo
-
+
+ embedded@gentoo.org
+ Embedded Gentoo
+
+
+ uisp
+
diff --git a/dev-embedded/xa/Manifest b/dev-embedded/xa/Manifest
index ccf464990535..2af09d9f3594 100644
--- a/dev-embedded/xa/Manifest
+++ b/dev-embedded/xa/Manifest
@@ -1,4 +1,4 @@
AUX xa-2.3.10-Makefile.patch 1840 BLAKE2B 1d8b4d7ed1ed97991dd611f77ff8daf6bb404e2892e271404d9b4b02e475b863e8ad3c45c79d07f5bbb9e69c19fd64f4b895a1868444729137ae97837e698b73 SHA512 b16462153b12604c6e3d8fba54e3d1fe19b5d907bed4141319d863d497582fe46fddfa15b0ab1c697ea4536e6fa3e5f86b68266a3b8da2c7d43f9577a10036e7
DIST xa-2.3.13.tar.gz 155606 BLAKE2B 8196f8f88bee29dbab9ad026c0d4e3519159c4ed7579dc7db391c0bdd7b1bfe31e2884644258d863e299ac3b5fcc43718b3d95b9b7d7802541a9d58366728ffe SHA512 b8a4c1856e51bbe212b98be06895987d6fb926a229511a67ea90a934da1fcc84daf29bd289c3c4c2254d2bce345333bb92747947f3286376761613b2e181e99b
-EBUILD xa-2.3.13.ebuild 565 BLAKE2B 696b9b1a0b3db25f556735a01fd7a4e8c8da3dce11e8e73b735f7b1131ec97cd7f06fff5f9bbebf8551c80986195319e6d00f9e5211ff6e82a1870a508fff9b1 SHA512 5b6ddac46427087ff233ff9512909e720a589ded5762609ffd03ef119f493b8a246ae17679a8143f8638c370620c1ebf3a6a41320649e45858321c1196e37b54
+EBUILD xa-2.3.13.ebuild 570 BLAKE2B 1a893dde63dc4d49e663aba4f51b0c60add907575cbf42c1c002094dd5822d5e8201ccd98e17a04d2d2b244340196bdd1b92a171d62c3b9a18b621d7ed48d76e SHA512 8e6e6889519838291647320d347b9116dcc0d669fec8d11f7ef52988ea4d697a13bf59223402a96c5b15b6bf1fb3a419246648a75095516a9653da77245555ea
MISC metadata.xml 548 BLAKE2B 3acb4c1e9192f25578d0e57f4527c1fd9af3738f48978cd5af39e9728336a23576f19e48568028c47b9db1394539280553590bcd29c206d11ab4acba50c5dbda SHA512 6b1274a1ee5456a5e2cdee2e1bfd34777b66d5178034b11f314549640c3085d069d96e71da9d476c03977540b6a08f8acb034b8df938b8caac1005eee4d2066d
diff --git a/dev-embedded/xa/xa-2.3.13.ebuild b/dev-embedded/xa/xa-2.3.13.ebuild
index 8ae78aaa630a..ddaef3e9cb4a 100644
--- a/dev-embedded/xa/xa-2.3.13.ebuild
+++ b/dev-embedded/xa/xa-2.3.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.floodgap.com/retrotech/xa/dists/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
PATCHES=(
"${FILESDIR}"/${PN}-2.3.10-Makefile.patch
diff --git a/dev-erlang/Manifest.gz b/dev-erlang/Manifest.gz
index b538ab30bbbc..54c4008f4099 100644
Binary files a/dev-erlang/Manifest.gz and b/dev-erlang/Manifest.gz differ
diff --git a/dev-erlang/esip/Manifest b/dev-erlang/esip/Manifest
index a570093b01f0..ea1ef235805a 100644
--- a/dev-erlang/esip/Manifest
+++ b/dev-erlang/esip/Manifest
@@ -1,3 +1,5 @@
DIST esip-1.0.47.tar.gz 91238 BLAKE2B 041a04009d4687187699bfb78381dd6baefb503bdbdd4b31efeb81786e3e0a4e47085336888fd481ecf28c4e32c296adef05eba7ff17eb084da14e645773cb31 SHA512 68be1c8cf507180e73f3a16dfd8ca44ffad825c40df0d1874888afa41f3cb89b445b033036d041af29ec3fdbdab7acc68f770124171ba4af73abd0775a03c0ba
+DIST esip-1.0.48.tar.gz 91251 BLAKE2B ff78a01dd46c73a550b123c87542aebbe988a5e3c19efd83ad82251399287faf8cd97ad39debe52a28a2ddd5bd025cbeec6132658663989470509906111dcb93 SHA512 9acc47fee89ee99f3de892c568052ad614305dbecfb9742269672772393d95c60440f7c676c62b0b8fc69854332924c3d3f661a5972df4f27f58358e591373aa
EBUILD esip-1.0.47.ebuild 595 BLAKE2B 6c184a4bc942d33b67cd12c2dabe711776ecd7948d611729d56597dc3688bf7b00e26242f138af21410efdcd45803dda24b4a5769cbe0f460de46f8f460de7e3 SHA512 b97a9d19d3696bc8a45c0e74a1f4d0371524d92d9abd40d047316634009902e7fa54410dbdd20eefd4598faaa4477f0c619d0d5ef9ba8e875c512c231f040363
+EBUILD esip-1.0.48.ebuild 596 BLAKE2B 6ee955048f0883daa42542c498e89178b61647e28a39104f1770787f6a5381f1ab6bcd11f3371da66d9b42487af95ffb1a9d6f07ab82c901292947db93f6cc35 SHA512 9eacd15125d0a07d200aa7368aa6e4dc04f0f88a0900c62a45f2e650d1fd4cdf845334dd4d89c09e3eaa852190f62fa6e71fbed598f4a75ede9887efba9171bb
MISC metadata.xml 301 BLAKE2B 347b9651a389555260467eb39fa0cd3e784fa15718a30a7908861cb0650da45b74cba5ad07537659e09e8437af8f35d0ec246b7d5f853a12bae171a6a8a0355a SHA512 e055c88ec26cfea40085c04618ad7ffb6ce4b71eca39edc4787d9654e58f23a4aa6643eb9295e972408d6cb2cf9ca0187f5a004a61e72f1f5a67d86923673cf9
diff --git a/dev-erlang/esip/esip-1.0.48.ebuild b/dev-erlang/esip/esip-1.0.48.ebuild
new file mode 100644
index 000000000000..77f33750e708
--- /dev/null
+++ b/dev-erlang/esip/esip-1.0.48.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rebar
+
+DESCRIPTION="ProcessOne SIP server component"
+HOMEPAGE="https://github.com/processone/esip"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND="
+ >=dev-erlang/fast_tls-1.1.16
+ >=dev-erlang/stun-1.2.6
+ >=dev-erlang/p1_utils-1.0.25
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+ rebar_src_prepare
+ rebar_fix_include_path stun
+}
diff --git a/dev-erlang/fast_tls/Manifest b/dev-erlang/fast_tls/Manifest
index 0b4f6334ca5b..277cd40ce63e 100644
--- a/dev-erlang/fast_tls/Manifest
+++ b/dev-erlang/fast_tls/Manifest
@@ -1,3 +1,5 @@
DIST fast_tls-1.1.15.tar.gz 83705 BLAKE2B 234c2e10a0661a46482a3db9da21831b0c3c370daff502d3275efcb69337f70977b6509a3b4c1306bf3687eb611b5efe46927c9702fcbe96e6f92f1b378b8293 SHA512 fcbdb9ffbb61c07fb3706bdae9d6d10f425968e722bcd03e2c86a99ca62d3ff0cb1298bf625adb679c627f38953fd3ef0b4263ae34ea100e9134488d9c55e192
+DIST fast_tls-1.1.16.tar.gz 83971 BLAKE2B 979435e067c0365d933c784501e95501cadfbc83a2fd743b694bb365eb2eab3818d743eb0c0586f216858045f2e4fb8bc7dc4e2d7ad4e1bb1e969670bd26d4b8 SHA512 c143eacf3b36b21c51cbf3c6fbb9327bc9a987ac88ef72f85981352efc3361a703caab970ae3f08bbcb1b99ded89160f9ccf798f718935d6c1950a51231abfbf
EBUILD fast_tls-1.1.15.ebuild 518 BLAKE2B 7fc75b0497c54fa4bcc3ae04ee2c4e48aeb10bc75041f2fd35d8286335861513394e84ae80b902b7ce09fecfbddb2d31534dbf9d1d85f921cabb036c34db7337 SHA512 5eb78c15204e17b65184d76d4b685701aa99cb87931a406f7bc93fca620297acd8c80c3907f75f9d18d15ee9c3b1fc8c08c7aaa9b4bbc0d1c6c96934878a2727
+EBUILD fast_tls-1.1.16.ebuild 519 BLAKE2B aea84cf7cc471f6c206ddbedf77f1400a51b9055d24cb0eb0534584715e8614bbbed8536cbbbad45c6436c37670a190d4a935ec65f2882cc3dab639f10d7a3e3 SHA512 352131ec8ece1df749d9f877731f032394c84cff05727a7e3946c3ed3e6772586d8903ae308fa2d079750d2b27274ac5dd41824431dd0d757a3ac496ce69d89f
MISC metadata.xml 305 BLAKE2B bf0b25ceb535ebd859716f30269451360238f1afd799ac49c58cfacc5e0bf9352ca245cdce61fd120807942cbc1e41ebcaaaa0c4f3916cabea51b49d3231c8f1 SHA512 d6afb7f8ccc5b82cf9b6deaa1713a7dae1b863b3bfe28b2a57b915eecaa7022d626373880f600a6ec95492859c5e2ab424b3aad9f2c7dfcd20252205dd5a7717
diff --git a/dev-erlang/fast_tls/fast_tls-1.1.16.ebuild b/dev-erlang/fast_tls/fast_tls-1.1.16.ebuild
new file mode 100644
index 000000000000..c386b4c39dc5
--- /dev/null
+++ b/dev-erlang/fast_tls/fast_tls-1.1.16.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rebar
+
+DESCRIPTION="TLS/SSL native driver for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/fast_tls"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="
+ >=dev-erlang/p1_utils-1.0.25
+ dev-libs/openssl:0=
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/fast_yaml/Manifest b/dev-erlang/fast_yaml/Manifest
index 4b2ab251a7f0..190da07f9522 100644
--- a/dev-erlang/fast_yaml/Manifest
+++ b/dev-erlang/fast_yaml/Manifest
@@ -1,5 +1,7 @@
DIST fast_yaml-1.0.32.tar.gz 59969 BLAKE2B 690b9f463fde3fdde4a0b0b72b4f2d88e24e3bc2f79a650c3f2f2d0d627efec32a0d604e3575860c52c7238642da7e80b71cefbea3379c46b2809073b2dfd639 SHA512 8ae75b68417513e72eff61311c5cc989866ac9b885e4e2d80844d3eb20b7c688f77daf41415d24fb9cac7a7dc08df870efc9c3edcac61a2bd1fc68e7d8937702
DIST fast_yaml-1.0.33.tar.gz 60314 BLAKE2B 3a4e807ef88d460d7e1f98f8f5567efe18ea153e8fb038bf6baaa4e1951491bd7504fd6d5013f77a3ddafa3c1ab14d54f7b64652fc002897de266de7297c97e6 SHA512 ace64e8818604031180955c2527cbd4eb73246f60d9d23e2fcde54d25451c3e2b0625e97df817a48cb23593f10555063aa894dd84fa64e5a2d68884a8d75a4f5
+DIST fast_yaml-1.0.34.tar.gz 60367 BLAKE2B 076b90e575b36ba3d3f920351ec749d6f7cd25d246cc1d80b826a463e91a62f8dd9a36d54ea2a3fa7a753a5e1bc137b3ab03ec6636b3844f13b987986979fb8d SHA512 d1f0081075fe0009658d83eb23da046f4e12a25eda293cb061ff33825324445059cafeec95c3e53f3eca94085188c63b436d2057b6266b32076c33b9ecd1e347
EBUILD fast_yaml-1.0.32.ebuild 509 BLAKE2B 548f67a433680904383a76ccb6c1bbccfda12dac4b5e4d4619edfd15ad49d8c41e0e3ec6ae05377c10b29bb3d29259555dfe8e06c2485530a7e5c75dbddb5d18 SHA512 d512e404a104c1c807e4ad386fa7feb85c69bb58a5ba2bdd43557114e4d8a3234874e8cc4ae42dda5bfc3ef6682806980146dee14d874b8e045356645e33bb6e
EBUILD fast_yaml-1.0.33.ebuild 511 BLAKE2B ad2c11de984d914cc8550296a01a265418c19205fed9c568bdc54cdbc45fc7764969011373969c72134bb5bf3fd89dea2622785653325865a24159fe954c9bf4 SHA512 89718821f209901c23d85fc704d8c9b698c38fe7e7318f2a8eb6d4f0669d545e08ae0aaf379ae3a4d62c7f78d05e317762ae56f2062554a6b1bc6e37412a3815
+EBUILD fast_yaml-1.0.34.ebuild 512 BLAKE2B 555334b3278d6f4582fae3d7bf1c015222ea99e69a6e907c1af5f4f93b0b4058c5265b279907dc821eeb3aaa3cef6789d065538ce2a5dc8177be20b79345b974 SHA512 d810df9923493231e79d4bb150b37ca07e630d65ad05c1e11a973d4b46fcb3e0c25e961bcdf8e9c26ef6d889bf5c093e8fd6938852cf0b9b1f469a08c6ba2a6b
MISC metadata.xml 306 BLAKE2B 9ce6768498bb68673f916041055acad0df077c31a840fbc63e538417736a5544e6f3e2f530c7f16f799d12603d91389747058a10082f10ca7203e5362547c4ec SHA512 9018400010c756b3e33d308d747742ac25cb5ff2ebff5fa0de6d15b7142b40c74158fc28886c9a81ca28ef9d19685a3464e28681e20dd79bc9d75fc5888c5c5d
diff --git a/dev-erlang/fast_yaml/fast_yaml-1.0.34.ebuild b/dev-erlang/fast_yaml/fast_yaml-1.0.34.ebuild
new file mode 100644
index 000000000000..4b1ade0bbc2f
--- /dev/null
+++ b/dev-erlang/fast_yaml/fast_yaml-1.0.34.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rebar
+
+DESCRIPTION="Fast Yaml native library for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/fast_yaml"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND="
+ >=dev-erlang/p1_utils-1.0.25
+ dev-libs/libyaml
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/p1_acme/Manifest b/dev-erlang/p1_acme/Manifest
index 4460931386c9..acadfa3ef655 100644
--- a/dev-erlang/p1_acme/Manifest
+++ b/dev-erlang/p1_acme/Manifest
@@ -1,3 +1,5 @@
DIST p1_acme-1.0.19.tar.gz 223303 BLAKE2B 48027739d46582c7acc72ea22fe08376dd67295b2f9161782abbb786a421fb976a2447e86cdcbfd30663fb02ac5fec58dc1285096e57c474d93dbc4e9624aa87 SHA512 d0896ca53fd48798f0e3f502a09e9df6ea88e4248968b5273b1a6e0f6735c39d680de251e0f2c49d04271018a5664252771be1746cf9d18ddd9d42e2ddf90b24
+DIST p1_acme-1.0.20.tar.gz 223319 BLAKE2B a12213a84b473659c7b639cdf766d189312f7a09377c909e131d4e0e6412444db519eb30160741ff5d722fd2747085024b16eff4d42d6f428501eb126e498a74 SHA512 5bb82183e361d795ae59dc620b0677a9daeb52d9587f19d1c2e2b39ef45f50eb229244dd148cf99a740ac7c2e9d7571ebc9b1a271b4bca7263c3e898e36c2a7c
EBUILD p1_acme-1.0.19.ebuild 757 BLAKE2B 6987dd6a454f413dcbcbb946ec26b37f07c0316c80dcc9b6bea7460295d646a4d3dcdbc2683656af6387220cd7c0aef817284954520e320f75cd58b260dee782 SHA512 933868cd219d5a660cfd51ad491b4c792db1ca32855b1737cf98afca6482c4a63b49b765cabaeface514177d0ef3a4907a0d4f5a7bb92411ce937574a206380b
+EBUILD p1_acme-1.0.20.ebuild 607 BLAKE2B 853efc685c635bd682c7e4e3e6a9dd043a89cb3ac2b51bca96c4299a91d882815722deb2d5ce48a722e6ea65fa422f46967f69687a6abd86081d16669a652032 SHA512 33c294c772692b9e0a7ee76fbb234df49a8b2a043d42b0db335fdab490c37248badcf2bde1165f8fee28b5a75ffd45d71dea284f7d8d4460fe59afb9667c0872
MISC metadata.xml 304 BLAKE2B b426590d7bbfeed55f57348118fe55c96fe7bb77ffb55ee569631a8b61c979d7c5e4d07cb83a74cae313d238f9297ec908abc68264edc6170cbd269449fc99e2 SHA512 463012c44e87a736e73fbceebd5df376bb8dcf1b9ecb0e696a30857683c09fd761e9c2a8822da48da4bc36cc55d4e23c119b210d10cc92fb0a8968c6b2a9d9d6
diff --git a/dev-erlang/p1_acme/p1_acme-1.0.20.ebuild b/dev-erlang/p1_acme/p1_acme-1.0.20.ebuild
new file mode 100644
index 000000000000..ca684d0853fc
--- /dev/null
+++ b/dev-erlang/p1_acme/p1_acme-1.0.20.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit rebar
+
+DESCRIPTION="ACME client library for Erlang"
+HOMEPAGE="https://github.com/processone/p1_acme"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND="
+ >=dev-lang/erlang-17.1
+ >=dev-erlang/jiffy-1.1.1
+ >=dev-erlang/yconf-1.0.14
+ >=dev-erlang/idna-6.0.0-r1
+ >=dev-erlang/jose-1.11.1
+ >=dev-erlang/base64url-1.0.1
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/p1_mysql/Manifest b/dev-erlang/p1_mysql/Manifest
index d39729eb2df0..4b5c26d1ae03 100644
--- a/dev-erlang/p1_mysql/Manifest
+++ b/dev-erlang/p1_mysql/Manifest
@@ -1,3 +1,5 @@
DIST p1_mysql-1.0.19.tar.gz 27476 BLAKE2B 14acb400c08c6b49fc2f3569dbb8891b52dd27c42fade7ad79858728a4c12bbc5cbd5aedc86432d61fbbdcc8df1277227b39343288d200cb056ab511ab0d0ae1 SHA512 eee2402661cc7d58228641057c571c383c09261a0022287ca19ab56a51530ea575478971fea944919aeb910e37cd9dedfea629bdd949b8dae7892aa5590ac675
+DIST p1_mysql-1.0.20.tar.gz 26257 BLAKE2B cdd6ac6c497f2fff7b2854a7e6b8533109c5929994d4565d844866495b72857ad94a6c146d3bcc0bd58e0e6de69b8b0a74039b1597b2c9a5eb10261eeb75617a SHA512 b23aa5227a9a8a505448c3eb36caeba769ae8142c2aefb2125263d0dbabeac7507229d654e4bc08133175f2cd13a7742e28dfec064d75b8af112d81485c6b38b
EBUILD p1_mysql-1.0.19.ebuild 455 BLAKE2B 6b24d34fce9c8d9fa18e0d376ef336cfc3f3bed5fe9714d14abde83305a0ca22b6726e609b1c6556ff6c79f5f0345b0852d9d5ad01a9691f6fdb61dc0d20611d SHA512 d18df288e3871ca91c7047063a1e1defbf264b09202276c75a8f636c28764b83f0f1d0c2aab25bb69f1c5b26777a9e684ef9f466a5a22a7c838164f187b5ba78
+EBUILD p1_mysql-1.0.20.ebuild 456 BLAKE2B bbcf1d744b032c4e589f5725461b8347ec3d6c1f6ec7789f1e77febc653808c0d0715116936674d3372d21c86dc20283748e99e518fab1d75dbda66955320c06 SHA512 132805917c63cf3a08ccd948d2846f4fc94ad8f47c8bc3c5c8a63e495a7d2c1e27bedcf6aa1a42961eac37a7c7f5059dfa1a32537e5a4dc852970f7169e0c8dd
MISC metadata.xml 305 BLAKE2B ce7dede50a0249ac238414f103c1428ab898801e31d0e056d617af54cfc45d8c14b5442699bddd38c3f1b349966d540fc2efa02821789006ce88fc4f8643be61 SHA512 e59321091144f587b0f0afbae340b91c58dc638881fabfc3141431375e873a79937453496c37b558a3486fee7f81b337d46f9196871c1186e55aef6e2b6d6c06
diff --git a/dev-erlang/p1_mysql/p1_mysql-1.0.20.ebuild b/dev-erlang/p1_mysql/p1_mysql-1.0.20.ebuild
new file mode 100644
index 000000000000..584abcc6bc91
--- /dev/null
+++ b/dev-erlang/p1_mysql/p1_mysql-1.0.20.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rebar
+
+DESCRIPTION="Pure Erlang MySQL driver"
+HOMEPAGE="https://github.com/processone/p1_mysql"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/p1_pgsql/Manifest b/dev-erlang/p1_pgsql/Manifest
index 89996c225b49..5bcb7f678af3 100644
--- a/dev-erlang/p1_pgsql/Manifest
+++ b/dev-erlang/p1_pgsql/Manifest
@@ -1,3 +1,5 @@
DIST p1_pgsql-1.1.18.tar.gz 27186 BLAKE2B 114e407630f61d4f9b7aed116f5b7f604c2ea2c18a963c6d74ddb65001f7f98556b5bb7f208afbb604b217c145ce3361e242034e6b382fcea9d86f2c44aa8eb0 SHA512 b075475a8729ca4d24d8cf05dc82b17a5c1e05c38d22586fe490c39194640e36145b0732126bb023881d6b258411a87046ab81a25fd85a1d3505d28da0d50122
+DIST p1_pgsql-1.1.19.tar.gz 27194 BLAKE2B 94335b49d9515bd07fe8598906679d466497852c0a3c9a7d5cb76befe98217743839aa0e2a3cc180f632b2932865b6cbaf4d2059e0884bbc42bc1362427921e9 SHA512 d789cadaf504f13a7533447f1f1ec56a7d95608da0fe90d4ff5c8f93157928439603dba8f19863704736cefe21c5c288a96c81ac17f9a428e0a0be535564b9fc
EBUILD p1_pgsql-1.1.18.ebuild 494 BLAKE2B eb16037d99c6801b8edb3084d0fb25f8fcb01b018d75ba21bfe84d9f5d2139ad98a7dfda64bcc4772d706227d18464df5addbaded82de2f4516a376f03569aa3 SHA512 6baae052c552f0c2ca2887be7da711c07352edb9a1fae07932637e7b76174333b6975b016f6c2e2f853f7247245a7632ba104561be7d6d5db70a6b145033ad4e
+EBUILD p1_pgsql-1.1.19.ebuild 495 BLAKE2B bccafc08c78e8fc096044c4e0aacd8fe83666fb73e1db15a1f16e4a0fd6a36a953906fb5828ed9b8f5a18de0e1463e2b6fbff19ad0a841cc6e81efa5b1a3f048 SHA512 572a1650908dec367cc1652e6429a778c99caa23a16e89cecddd0d04a8808edb34750992c1a32402587704f98529756637359dc59aad36006c259cfbf60478a9
MISC metadata.xml 305 BLAKE2B 8efb10b662fb1bcf472b8f132766873ab121002fb64103ab386b95bfcee9d3f9feb92be34b79f11df91e0e3f5e9d53e4978ce99f75b41843f24c4737a2e1701d SHA512 8bf58e143d49aae6a416c756da20665557edf472a48adec5f6fd2e05a7892603b73b56e19e8b82d51fa4d0c3c6624351269f0d7e05e917ce8b367f0930afedbe
diff --git a/dev-erlang/p1_pgsql/p1_pgsql-1.1.19.ebuild b/dev-erlang/p1_pgsql/p1_pgsql-1.1.19.ebuild
new file mode 100644
index 000000000000..330c443d7513
--- /dev/null
+++ b/dev-erlang/p1_pgsql/p1_pgsql-1.1.19.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rebar
+
+DESCRIPTION="Pure Erlang PostgreSQL driver"
+HOMEPAGE="https://github.com/processone/p1_pgsql"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="ErlPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND="
+ >=dev-erlang/xmpp-1.6.0
+ >=dev-lang/erlang-17.1
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/stringprep/Manifest b/dev-erlang/stringprep/Manifest
index bb3895b8d963..f0c51a337cf1 100644
--- a/dev-erlang/stringprep/Manifest
+++ b/dev-erlang/stringprep/Manifest
@@ -1,3 +1,5 @@
DIST stringprep-1.0.28.tar.gz 100057 BLAKE2B f9bb2b326bfe8f59771929dc087f019445edcfaf455f530b390ab79ab98df76d2d154329e70eee584ce6851c54cafb1a92c15a1ebf7af3210e5285518f239744 SHA512 1bedef40b38494ff42f551fedb83e47a2938eb29871b8649a76521035f16a7a2575d6524e12dfdfc45379c3cbe50af2988daa9ae9ab82632156514c86e06df7e
+DIST stringprep-1.0.29.tar.gz 100076 BLAKE2B 8dee25a1c65de617ae682bca061d747c56e694d1f6eb41d4ffbe18dbd955cddf6b4437b22b6492677235577e624dce381825869a5619714d7c2e67779b805222 SHA512 53b24c166d9328efab8e01b3e7ee7df3d66d240a6ac95f5338d0237ae4e6db20a4f53b487d632cbe6ae46c5f2c62001f7afb77172b27840a824944e51e08ef56
EBUILD stringprep-1.0.28.ebuild 530 BLAKE2B ab6e23de73625b945375ffa17c962169ddf98a4a83e6ce70ef7ecbd4fc3bb6154ace56c1b69a54fdd83c0fded9632422733a16752e3ccd971489e7bb954cf3d5 SHA512 1fcba2843ab907a92cfba77acffe3410160349c2d903362844e02bf0297cb21c7ebcb39b3d8bf12755fe46fdb71de9bd91333cca39845a9752b1400859910c3b
+EBUILD stringprep-1.0.29.ebuild 531 BLAKE2B 99b58ab1c6af65e3782d85a98ab226163c02bfe10540b1d667bbedb162239df8056cf95800a2bb73249f0315a348ca6f508b7f52947eb36502ce352386853b73 SHA512 7b6409a02ce1b8ed81e574d830c865a162ba5017a33fa67f6c6d14eb10007e5e99fb2a96b462e4589493e8f92308d37574004c9ac006fc8e8e5e27c9c920ed37
MISC metadata.xml 505 BLAKE2B c9380bcf16d6c65c4c39247a85f6cacbac24786e1ce393363b50db558f8ad6de5b90a4f2a05ff654b27f7c44d5ab822715509bd0539a10cabfbb58cb013919d9 SHA512 a162b2b304f806c7a852f5b4ba15afdafd1ca64918ccb4d81707514e1fa7f309248ed0ba76971d3a94df27b72b30cf114a77490859d7d4845068e252deb7d902
diff --git a/dev-erlang/stringprep/stringprep-1.0.29.ebuild b/dev-erlang/stringprep/stringprep-1.0.29.ebuild
new file mode 100644
index 000000000000..5a4e0c05a3cf
--- /dev/null
+++ b/dev-erlang/stringprep/stringprep-1.0.29.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit rebar
+
+DESCRIPTION="Fast Stringprep implementation for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/stringprep"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 tcltk"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND="
+ >=dev-lang/erlang-17.1
+ >=dev-erlang/p1_utils-1.0.25
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/stun/Manifest b/dev-erlang/stun/Manifest
index e4f2ae325458..559d6e7dc5c0 100644
--- a/dev-erlang/stun/Manifest
+++ b/dev-erlang/stun/Manifest
@@ -1,5 +1,7 @@
DIST stun-1.0.47.tar.gz 41277 BLAKE2B c40e326688dbddc37c82a0850cd2f8c4676898f208789960c0af346e0e27cc5aca199605e431ce7eb012dd2469b8938be39e02c59daea8d039d73c043f449ffd SHA512 921064bdaa6838d30c8fdd161f525ab11f91011700cfee222a9bac0c56a01efa63ad104bdf29068a32338387c3be5df1265612ebddd979e408b0c07825607d66
DIST stun-1.2.2.tar.gz 41090 BLAKE2B fbcebb9a30dc547ab4fcf75cd78f57d141368c726629f4958f019d670de1d2b4c1f98594cd99befaa08ea4fffbabb28822484f8684adf7b9624b1d2eda976e74 SHA512 ddbb13300c1cc2ac09d7049fbd97fcd67e7f2e0dbb56569279ea1b1e4fe5e106712178e683757a4c205ddc54d1b2a0291369affc42a23325d7ad6ad61b648fd9
+DIST stun-1.2.6.tar.gz 42153 BLAKE2B 26d36d5ed878117f45105d3f8f65787026b8544e1e8568c249dc85bc7d7d14349450cb841c64e43ca4dcb27367dad5a0351ee5813edceb20da310371cb43da05 SHA512 6d6d0468c0272662326286a31402f748abce174c04edfcc9f49f08bf78019f6d34c62f706c8b3cf7e1d556ded72c227f55037926e2f4724f05cde9fac67cbe64
EBUILD stun-1.0.47.ebuild 506 BLAKE2B 8123f73b447b9640cf8e6c2394cdf59d57d33f3d350211da27a14cf4ce6dcea953ab15834350c13f100c1464f2dab2d9951d2d1f976de918c3a416967b06e425 SHA512 6863a5adf9d1d8d42bb740da013fb1e375a9515d2d3a68e498956df300b368f3d39203eb55a59702cbd3eb9a1dce1591ac46e5f0e32a89f010af8e348baa480b
EBUILD stun-1.2.2.ebuild 508 BLAKE2B 50f38a9893723de5a7596df24e3631ef8d35be315c9da0b5932e9e8e8978620a578b5e6331688bbf093d05142d723d850064187edd86505f76e7682661e7187f SHA512 44d23d37d00bc7623deed74632651ba58c30a164c15a4f51ec6047e374a610f63a65827cbc983ea23ca567dab7c71271ae5f3d8d9f884bfd0f68e35ce31ff0be
+EBUILD stun-1.2.6.ebuild 509 BLAKE2B 1a62f624d1b9f33a200a27b54140cb3acbb8000d21c7e3b31e6731337d09fe156976b6b2eddf4fcfc872e10996d9d54dea12199ceb7d4e806ec47ffcd9dd92b7 SHA512 b51fb96dcf17995ea3926f47f5159c10da88aa5401b518592c59533fb707fae92e6fe577557bbfa1c91856b35ded92626a59f6f6cbea39254987fa43d1a374ff
MISC metadata.xml 301 BLAKE2B 9e48b7579f660552d7296803c63e853d3d9b50d6f62812ced09141bc944063561f3a91e6fae78e88cf0ce062b5a0ae55d7480975e4e0119eba02ff72216b57ff SHA512 09b39cd79708f6f9c76f6be52a645ba089d9681fec069cd392a4dae1c1880f090919759935867a85a37ce326e9d4e809cb95ce6e4b696257ef9002c3557b132f
diff --git a/dev-erlang/stun/stun-1.2.6.ebuild b/dev-erlang/stun/stun-1.2.6.ebuild
new file mode 100644
index 000000000000..02adc6445dbe
--- /dev/null
+++ b/dev-erlang/stun/stun-1.2.6.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rebar
+
+DESCRIPTION="STUN and TURN library for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/stun"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND="
+ >=dev-erlang/fast_tls-1.1.15
+ >=dev-erlang/p1_utils-1.0.25
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/xmpp/Manifest b/dev-erlang/xmpp/Manifest
index 3008af9a6724..961d5723f374 100644
--- a/dev-erlang/xmpp/Manifest
+++ b/dev-erlang/xmpp/Manifest
@@ -1,3 +1,5 @@
DIST xmpp-1.5.8.tar.gz 557974 BLAKE2B 63a0a0481ab5f527417aed68e798f46f0562b0e882bb3c91d6dde43b4190901dec49fb0838db3466928a2db9088a1f09b87f8a1a56f4de98682fe304f8fa891e SHA512 0ef76dd65741072276ef3590e4c82456c832dda530f857a30072acc6444532865b716c82e60e972320ddab191ac1fb0a72be2bc71b01a72e16892015381086e3
+DIST xmpp-1.6.0.tar.gz 561026 BLAKE2B 52797606d0aa88d5e72f8855da108c6c0f0b8e43c8fd131a65fa5ac863d51b8fe0be5582965bd65f2c5ea001dd0ee343cf70447fd669f951efbf57b87ea37eef SHA512 296a2f6c06e1a82e74e5484ae082124ad9ba05830aee2ecfea49ccf01a4fc4d46d94b8960ac5309911db66f0e8f2d06f48a0571f31cd5873c6e003b394f34300
EBUILD xmpp-1.5.8.ebuild 718 BLAKE2B f65bdacf3881e3ace19dbc7a4e02b3bd682de136e63b5ab0051dc961e99281cdb3872a9812eaa010c9fcfa307ac4329a9126a0935efc64b7fc5eacd97ed08602 SHA512 f77ff9a6379583f0b2775345242597259ad5a4e733341f8c580c03c821b39eff203d8d089fe6c6baac7c85d4990c1b5ba2bc60d21c311860312ebf60e9f03494
+EBUILD xmpp-1.6.0.ebuild 719 BLAKE2B b0e721e3fa2fecbe2ba8c56fa3821ba766a2f0eb4b4625806847114943e1c46294761a50a28d9c0a05bc90ba46fbcdca2d4e69daeec0278a0f91ac208ab5182e SHA512 0b088851d1cedb03cfc7f161cb8f65aa0c52ea4aa3aa08b8f9fbd3ce256cfc647815f50550e927bea32d0e9aa51b3cc73b86dd2ce019ad370a03e3e8aa601e67
MISC metadata.xml 301 BLAKE2B af92d4a8015e515dbb3098a7187b06425cb18e6845156ad471a2e1fa24e632f5397292d461cd79e8464578d527367b73719091143780fa959f587d1da9ae01a8 SHA512 b884fa199850f7935b8b81b3b47b7ee5b0686a30729c1152d9f5a9b215d84a8d4264b8bb3de541af4f0623581199ee9204cf2911e24fcfc49084b3746fa74976
diff --git a/dev-erlang/xmpp/xmpp-1.6.0.ebuild b/dev-erlang/xmpp/xmpp-1.6.0.ebuild
new file mode 100644
index 000000000000..f797d4db1469
--- /dev/null
+++ b/dev-erlang/xmpp/xmpp-1.6.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rebar
+
+DESCRIPTION="XMPP parsing and serialization library on top of Fast XML"
+HOMEPAGE="https://github.com/processone/xmpp"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+ >=dev-erlang/ezlib-1.0.12
+ >=dev-erlang/fast_tls-1.1.16
+ >=dev-erlang/fast_xml-1.1.49
+ >=dev-erlang/p1_utils-1.0.25
+ >=dev-erlang/stringprep-1.0.29
+ >=dev-erlang/idna-6.0.0-r1
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+ rebar_src_prepare
+ rebar_fix_include_path fast_xml
+}
diff --git a/dev-erlang/yconf/Manifest b/dev-erlang/yconf/Manifest
index 9dccd052d4ea..25fdd16bab0d 100644
--- a/dev-erlang/yconf/Manifest
+++ b/dev-erlang/yconf/Manifest
@@ -1,3 +1,5 @@
DIST yconf-1.0.13.tar.gz 223970 BLAKE2B 877094613a89afa3c819b8b8254b83091b3ff302534366ef9e0b321e1b65eb8cb52e03a7074f4836359bb8af566caf6f23ba2b04bfd7fc3a22fc27415b752778 SHA512 1e5df69421a82e8c442e17ed74738a4717e84521570f48a885de3e4fda2cbbc6d7567736d87255050d21e85edf976532ba6659b8a51d3150d1ac5e2c19d89a61
+DIST yconf-1.0.14.tar.gz 223966 BLAKE2B 1f910a47f55822d2e5d71ee53f26e40a1967245ca5959011c3062d2c69107aa9f63ef5ae0adb3f2557677cbc8f0e7155345c9510600de1d7a7bdeee19997a87b SHA512 5b495f6975a7d844f28af9295423b90d3e003122ef9b15a5734caf2bc46ad78c982a2fd36b4c1890ec0325ca0c72b029e470fd3e89ce52d9616047353a296e82
EBUILD yconf-1.0.13.ebuild 496 BLAKE2B aca0b3b0a86b2c5107d378a1735c2e85e820fa7a0e801a710c2d50e8917daac836ea697bcefd688fc943a13f129ac5a24b5b7dd2a1c482aab2bd48a529a12c07 SHA512 1521b550f60d299c32c5c7e84893f139bd71a71aff867c967d5107a34baf73df6383acc4e46d43be85224fc850443c81575635cbec80f2f7cb44091c332d71cc
+EBUILD yconf-1.0.14.ebuild 497 BLAKE2B 0d0aaa10cc831b913fcb6fb6e1a01f330dbcad3419b7075feae7c0bfda011a98c171dcdae5ae12e185966e60328beb3815c31b655dcca0d13eec6af3577120ce SHA512 7c4dc46f1cc3edd48011f3ded231c62b38886860f9db9526b3e5f62625f02c31734bee4e51b0d54efc626b505b885e602baee28032c86538fc6530178d872114
MISC metadata.xml 302 BLAKE2B 380c4945098b812c322f2a72fafd625b247f113c4166846cba400aa535a749df312848a4d2cfba220e0fee663d9b89222681670e8a975f107921bde7c9a283c0 SHA512 ca22951b464148ff558e6b84217375d5aa753560c4deb68257eda4015ebe249715d812ccbc5e79e342d94896a284c58f2ed0b3d3697e04c60de4c991e6556716
diff --git a/dev-erlang/yconf/yconf-1.0.14.ebuild b/dev-erlang/yconf/yconf-1.0.14.ebuild
new file mode 100644
index 000000000000..82bd486fcf94
--- /dev/null
+++ b/dev-erlang/yconf/yconf-1.0.14.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rebar
+
+DESCRIPTION="YAML configuration processor"
+HOMEPAGE="https://github.com/processone/yconf"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND="
+ >=dev-lang/erlang-17.1
+ >=dev-erlang/fast_yaml-1.0.34
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 020ac00907c9..81c8b1bfd1a1 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/clanlib/Manifest b/dev-games/clanlib/Manifest
index e2b4ae6dbf4f..7ec9699e4d91 100644
--- a/dev-games/clanlib/Manifest
+++ b/dev-games/clanlib/Manifest
@@ -11,11 +11,17 @@ AUX clanlib-2.3.7-32bit-opengl.patch 515 BLAKE2B 96823139c5235c5e780727c8be48615
AUX clanlib-2.3.7-autotools.patch 1458 BLAKE2B ecf797fa09893422b94364ac0df8156b3e2c3b2164530cd845201ad266977426b692860efce1b2cf6f6dee0cb098c6e28e8c3e203567c81713f63fc6099c30a9 SHA512 170580de7780e638e3a1788eb2bfcfe58f64d5f5695cbbd550ddc5bf59933303dea7970191792adefc8b1408647d4e3c816c30aaf253a9ceb139f9300b9e5807
AUX clanlib-2.3.7-doc.patch 434 BLAKE2B e17cedc12f9b840231dae739edb933a6c8dffaac7feb53e4d4ce2639603e6ce03e716476bfa3b75f964aa1799676f18f19dfc09f3fa918d40b66519878f78904 SHA512 993edfcf9955bf89c6458933b1db9b4cdf6b3935f856c71aa82c3f9ad0f9a2d3704657fa8bd6f6760262a0f8d0669998f7c1ab426ecee7c57954f5674a24f8e4
AUX clanlib-2.3.7-freetype_pkgconfig.patch 1069 BLAKE2B 48fe4d540a9dd5cce20efcea7802b45b13d8e56831abcf1f1d9aef9aa747dc40e4209a1a37f061b4162459619e8174fbba18963c3c3acb4b0457642c1a9a6142 SHA512 db151e1b5a07f01890ec0a164a3a82217f5a0f47fa6c15f566991965feedae50b69e99d801f04d1ca7583a6192e1d0f4766d66a0cbcca6278c03713ae7837233
+AUX clanlib-2.3.7-gcc47.patch 4702 BLAKE2B 638e7abe09cd0684e3fff6ef0a6fa51eeb92a26b67e37499dd8760fe17373a3da8ad7264d73e36b926ce949ef6eb09495b300715f53569c625f315ea3c9b7561 SHA512 f8eaa5281271893afccf546655cc3cbe85790507570f4a2f54e1acc346aab18c179e06149b40851fcf599a79e042d54c5b762952f6d31aea3b1232b9b49e2273
+AUX clanlib-2.3.7-gcc7.patch 614 BLAKE2B 72988b4a399478504c6d1153a23148eb37bb235a1bfb680a5feba083e69309f03d60e1bbb4e005bfb5aa8062a005c29e55a586038e324b6cf2895eb07263d679 SHA512 495ce3b400de9fa6aa2ebe8aac7b38ab1b6ddfa70ea7b4e3c3da59e584dc5950a032868f8d3111033cfcf6b1b80fb5e1a893d48e7ee5b4ab76a76ff954e03908
AUX clanlib-2.3.7-glibc2.34.patch 612 BLAKE2B 7a1c5407a228fe7c245f6e4aa530a371d5e9c424935cd3688a4cd34e543ddfbfbfe77a31e3845226679409d2aebb6bfc0b96d5817a3284940f85f6a07f6e4e1d SHA512 dfa58ec02fd0e5f0a767203e9518504f0255078688dd97e47e6c0dc8207122318e80bf9a42ee02bb8f2501b621e3538437b37a5102b50186cd3c83315369789f
+AUX clanlib-2.3.7-no-ldflags-for-conftest.patch 892 BLAKE2B ba3117c2194021fb4f1d6853fab08ba4043bf1b371f3cf1f7c59ef6f37c0f5065f5c1277b75254f60e07ffb5b8066a3d3e3c407f7c48cbc83322985dd8f5543e SHA512 fad2323d879fc342d915295c4b33a0b44b8f3e486c64d31680b8a226fa0c1c11cc5d4606b49338bbd2046caa64c5c959e2893ba5b19cb4e5c0f966c53e10682e
+AUX clanlib-2.3.7-no-wm_type-in-fs.patch 659 BLAKE2B b3a5498bb706225d828622e8dead234c2df4755151e017921df52f6072258e77eb05e71135cf8ecbd02fc591daf277f8f68a8af86079883bf7d2d9c6a0f5cd70 SHA512 efd99cf2e6c0cedf6a4752981c6e9931512de7140b4b83e636e2d3db96d4eed0a92413c833c9ac95d0bf0a1017b7119141c5c815a00420765032b17923643103
+AUX clanlib-2.3.7-non-x86.patch 1263 BLAKE2B af0f26f0148e66ed20cc226539b30fe44a455f221689d8baa62f543e1f512e84bcc54d908893ac3386d5058872243ec422586488d938373589ddeae5c2d82c62 SHA512 e28e4dac473b6a71b0bfc207c42b68cf2bf57e29b88400e32a829af27bffba7f07e58445588e18f40e70593e245ebd33a4b4de0d26bd23b2718e6fcc0d7fe335
DIST ClanLib-0.8.1.tgz 7629019 BLAKE2B 7f238111931212e3f9c82ed43842706bf16ee145896735ca35595e29dd357e52364cc592be55d88e231f962adc313bc8f57357bc74c9f1b8b134bc411497f5e9 SHA512 277daaf1055ae0198be7a6bbfd415c79cfae9e2145f62553e83849d670f56e50b8484c83f8b85f23290002e0b0c72c1e01ca597ad608a0954a4add828177293b
DIST ClanLib-2.3.7.tgz 26132425 BLAKE2B 109ba92baf21174022c8dbc4044e39ec16ec77c730b57590733418e246ab71d18d81bbf281cd469dd9e2aebd4ac4302fbb581f27dc7fc0054a8c7ce69699e19d SHA512 73169afc0f639390f80403150757a8a14f842bc291a9457c9bca1319642b78bc4d03a93327d75254230e39545c5b4b690e56dc0149ed7b60b223e5a5364e882a
DIST clanlib-4.1.0.tar.gz 6871886 BLAKE2B 0aeb9e89998a9ef6975bf16a2e77f461e6415aacda9a26a5c0a9c6ec3c19a136a5f092c7866b60898251fbd6cb8aa7e96c86f6b87afb564824298fac77bf20c3 SHA512 34f5d1fdb7b071a218f081a6b06a6018a9c20cedc4c8500a9796be02d335f06fa148304379eeb1a35e08b9a734e504ceb490a6558a43d1611187bd97be01f4b0
EBUILD clanlib-0.8.1-r2.ebuild 2288 BLAKE2B ccb633ddd4ff1148a4c35f94a835888050552576bfa5e23adf367cb56b24bf9896244b11d59894bdeb7f4b1b0146ea7e114d9a0376215fbeb821a5055b47b3d6 SHA512 2d0279c1526e9e25bb94d5e849552c89879ea0265ce9e5e1540e29411adc040ea1a9049d78b7afcdb8ffd0c49725d1cd339a6999a04eaf74966d3e279bb7aace
EBUILD clanlib-2.3.7-r2.ebuild 2224 BLAKE2B d9275002067b10c5955502b13f15c7a03849f7039d2b6e0dbe985ea5ab2785416be6241bb9b4e9bddaeeef22fea10fc092cc7229324b9dde96ab2704578e1f5a SHA512 6fe0fcc5f837e4db9126f3b0e090c4a72d0d5add331a96c847ce3905a7696f86c95e3957e1ac6b8c3d3657bbdefe31f029f73a0b430f5249018360549afadf9b
+EBUILD clanlib-2.3.7-r3.ebuild 2491 BLAKE2B 68b05e491439f17ff9f10638435fddcdc9080a4b90424bef9907caad57f70906c6e1f6eb9b087aa8e7ce41c35b6780de915b76ce71e08e834f59e339e27692e5 SHA512 c5dcb125cdb1ebaea960715348b64934b64d6401ad21695ff06398f2bd995d3df5b1bfdaa399e10add3bc090ce00d3820504d6d00a9c2b152c3020d7e943cec4
EBUILD clanlib-4.1.0.ebuild 1491 BLAKE2B da46029e71367101d4ecbe76015b13660255732d93df2bfcc6f3d2b53feb7b0a70a85a5bd9f691822582a140eb0a5e1a800ece9f56ea2d25d3fefd373c24d1c9 SHA512 2548f5db4749ad2d4b569a1992370c1d56ad0d8120e67b246a9a787ce3c78da0ed350a626a0507a30d55a4ec2dd46b19d895f8287b78a1d41c7b4ddb65b98878
MISC metadata.xml 3097 BLAKE2B a17189a5334540d64d105470c7785d223628d8cff00f5ac162084acc0b4905c537abfbe9383bfa293c751b2efbe5d30a9a3280c92c7954cb3c4a8e04d2c925c5 SHA512 e86eda205bb05a47d49160a458c27d6eb9d67ff1f23921880f6dd46e4c16a930b405f6f2fc41fcd1623458f50452ea5ccdea36abafee802cc6933a7b3b471992
diff --git a/dev-games/clanlib/clanlib-2.3.7-r3.ebuild b/dev-games/clanlib/clanlib-2.3.7-r3.ebuild
new file mode 100644
index 000000000000..d5d41ff83ea1
--- /dev/null
+++ b/dev-games/clanlib/clanlib-2.3.7-r3.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+MY_P=ClanLib-${PV}
+DESCRIPTION="Multi-platform game development library"
+HOMEPAGE="http://www.clanlib.org/"
+SRC_URI="http://clanlib.org/download/releases-2.0/${MY_P}.tgz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="ZLIB"
+SLOT="2.3"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ipv6 mikmod opengl sound sqlite cpu_flags_x86_sse2 static-libs vorbis X"
+REQUIRED_USE="opengl? ( X )"
+
+BDEPEND="
+ virtual/pkgconfig
+ doc? (
+ app-doc/doxygen
+ dev-lang/perl
+ media-gfx/graphviz
+ )
+"
+RDEPEND="
+ sys-libs/zlib
+ X? (
+ app-arch/bzip2
+ media-libs/libpng:0
+ media-libs/freetype
+ media-libs/fontconfig
+ media-libs/libjpeg-turbo:0=
+ x11-libs/libX11
+ opengl? ( virtual/opengl )
+ )
+ mikmod? (
+ media-libs/alsa-lib
+ media-libs/libmikmod
+ )
+ sqlite? ( dev-db/sqlite:3 )
+ sound? ( media-libs/alsa-lib )
+ vorbis? (
+ media-libs/alsa-lib
+ media-libs/libogg
+ media-libs/libvorbis
+ )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-autotools.patch
+ "${FILESDIR}"/${P}-doc.patch
+ "${FILESDIR}"/${P}-freetype_pkgconfig.patch #764902
+ "${FILESDIR}"/${P}-glibc2.34.patch
+ "${FILESDIR}"/${P}-32bit-opengl.patch
+ # From Fedora
+ "${FILESDIR}"/${P}-gcc47.patch
+ "${FILESDIR}"/${P}-gcc7.patch
+ "${FILESDIR}"/${P}-non-x86.patch
+ "${FILESDIR}"/${P}-no-ldflags-for-conftest.patch
+ "${FILESDIR}"/${P}-no-wm_type-in-fs.patch
+)
+
+DOCS=( CODING_STYLE CREDITS PATCHES README )
+
+src_prepare() {
+ default
+
+ eautoreconf
+
+ ln -sf ../../../Sources/API Documentation/Utilities/ReferenceDocs/ClanLib || die
+}
+
+src_configure() {
+ # Add -DPACKAGE_BUGREPORT?
+ local myeconfargs=(
+ $(use_enable doc docs)
+ $(use_enable cpu_flags_x86_sse2 sse2)
+ $(use_enable opengl clanGL)
+ $(use_enable opengl clanGL1)
+ $(use_enable opengl clanGUI)
+ $(use_enable X clanDisplay)
+ $(use_enable vorbis clanVorbis)
+ $(use_enable mikmod clanMikMod)
+ $(use_enable sqlite clanSqlite)
+ $(use_enable ipv6 getaddr)
+ )
+
+ use sound \
+ || use vorbis \
+ || use mikmod \
+ || myeconfargs+=( --disable-clanSound )
+
+ tc-export PKG_CONFIG
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ emake
+
+ use doc && emake html
+}
+
+# html files are keeped in a directory that is dependent on the SLOT
+# so to keep eventual bookmarks to the doc from version to version
+src_install() {
+ default
+
+ find "${ED}" -type f -name '*.la' -delete || die
+
+ if use doc ; then
+ emake DESTDIR="${D}" install-html
+ dodoc -r Examples Resources
+ fi
+}
diff --git a/dev-games/clanlib/files/clanlib-2.3.7-gcc47.patch b/dev-games/clanlib/files/clanlib-2.3.7-gcc47.patch
new file mode 100644
index 000000000000..58b55ccf0291
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-2.3.7-gcc47.patch
@@ -0,0 +1,107 @@
+diff -up ClanLib-2.3.4/Sources/Core/IOData/file_help.cpp~ ClanLib-2.3.4/Sources/Core/IOData/file_help.cpp
+--- ClanLib-2.3.4/Sources/Core/IOData/file_help.cpp~ 2011-07-22 10:03:21.000000000 +0200
++++ ClanLib-2.3.4/Sources/Core/IOData/file_help.cpp 2012-01-12 22:16:39.779011207 +0100
+@@ -34,6 +34,7 @@
+ #include "API/Core/System/exception.h"
+
+ #ifndef WIN32
++#include
+ #include
+ #endif
+
+diff -up ClanLib-2.3.4/Sources/Core/IOData/path_help.cpp~ ClanLib-2.3.4/Sources/Core/IOData/path_help.cpp
+--- ClanLib-2.3.4/Sources/Core/IOData/path_help.cpp~ 2011-08-03 10:13:57.000000000 +0200
++++ ClanLib-2.3.4/Sources/Core/IOData/path_help.cpp 2012-01-12 22:18:30.754009662 +0100
+@@ -43,6 +43,7 @@
+
+ #ifndef WIN32
+ #include
++#include
+ #endif
+
+ /////////////////////////////////////////////////////////////////////////////
+diff -up ClanLib-2.3.4/Sources/Core/IOData/iodevice_provider_pipe_connection.cpp~ ClanLib-2.3.4/Sources/Core/IOData/iodevice_provider_pipe_connection.cpp
+--- ClanLib-2.3.4/Sources/Core/IOData/iodevice_provider_pipe_connection.cpp~ 2011-01-27 10:03:39.000000000 +0100
++++ ClanLib-2.3.4/Sources/Core/IOData/iodevice_provider_pipe_connection.cpp 2012-01-12 22:24:55.536004557 +0100
+@@ -33,6 +33,7 @@
+ #include "API/Core/Text/string_help.h"
+ #include "API/Core/Text/string_format.h"
+ #ifndef WIN32
++#include
+ #include
+ #include
+ #ifndef UNIX_PATH_MAX
+diff -up ClanLib-2.3.4/Sources/Core/IOData/pipe_listen_impl.cpp~ ClanLib-2.3.4/Sources/Core/IOData/pipe_listen_impl.cpp
+--- ClanLib-2.3.4/Sources/Core/IOData/pipe_listen_impl.cpp~ 2011-01-13 12:17:34.000000000 +0100
++++ ClanLib-2.3.4/Sources/Core/IOData/pipe_listen_impl.cpp 2012-01-12 22:25:17.359004259 +0100
+@@ -36,6 +36,7 @@
+ #include "API/Core/Text/string_help.h"
+ #ifndef WIN32
+ #include "Network/Socket/event_provider_unixsocket.h"
++#include
+ #include
+ #include
+ #ifndef UNIX_PATH_MAX
+diff -up ClanLib-2.3.4/Sources/Core/IOData/security_identifier.cpp~ ClanLib-2.3.4/Sources/Core/IOData/security_identifier.cpp
+--- ClanLib-2.3.4/Sources/Core/IOData/security_identifier.cpp~ 2011-01-13 12:17:34.000000000 +0100
++++ ClanLib-2.3.4/Sources/Core/IOData/security_identifier.cpp 2012-01-12 22:26:06.047003649 +0100
+@@ -31,6 +31,9 @@
+ #include "API/Core/System/exception.h"
+ #ifdef WIN32
+ #include
++#else
++#include
++#include
+ #endif
+
+ /////////////////////////////////////////////////////////////////////////////
+diff -up ClanLib-2.3.4/Sources/Core/IOData/virtual_directory.cpp~ ClanLib-2.3.4/Sources/Core/IOData/virtual_directory.cpp
+--- ClanLib-2.3.4/Sources/Core/IOData/virtual_directory.cpp~ 2011-11-25 09:16:46.000000000 +0100
++++ ClanLib-2.3.4/Sources/Core/IOData/virtual_directory.cpp 2012-01-12 22:26:37.583003215 +0100
+@@ -38,6 +38,10 @@
+ #include "API/Core/System/weakptr.h"
+ #include "API/Core/Text/string_help.h"
+
++#ifndef WIN32
++#include
++#endif
++
+ /////////////////////////////////////////////////////////////////////////////
+ // CL_VirtualDirectory_Impl Class:
+
+diff -up ClanLib-2.3.4/Sources/Core/System/Unix/service_unix.cpp~ ClanLib-2.3.4/Sources/Core/System/Unix/service_unix.cpp
+--- ClanLib-2.3.4/Sources/Core/System/Unix/service_unix.cpp~ 2011-01-13 12:17:34.000000000 +0100
++++ ClanLib-2.3.4/Sources/Core/System/Unix/service_unix.cpp 2012-01-12 22:29:12.478001042 +0100
+@@ -35,6 +35,7 @@
+ #include "service_unix.h"
+ #include
+ #include
++#include
+
+ /////////////////////////////////////////////////////////////////////////////
+ // CL_Service_Unix Construction:
+diff -up ClanLib-2.3.4/Sources/Core/Text/console_logger.cpp~ ClanLib-2.3.4/Sources/Core/Text/console_logger.cpp
+--- ClanLib-2.3.4/Sources/Core/Text/console_logger.cpp~ 2011-01-13 12:17:34.000000000 +0100
++++ ClanLib-2.3.4/Sources/Core/Text/console_logger.cpp 2012-01-12 22:27:54.446002158 +0100
+@@ -33,6 +33,10 @@
+ #include "API/Core/Text/string_format.h"
+ #include "API/Core/System/datetime.h"
+
++#ifndef WIN32
++#include
++#endif
++
+ /////////////////////////////////////////////////////////////////////////////
+ // CL_ConsoleLogger Construction:
+
+diff -up ClanLib-2.3.4/Sources/Display/X11/x11_window.cpp~ ClanLib-2.3.4/Sources/Display/X11/x11_window.cpp
+--- ClanLib-2.3.4/Sources/Display/X11/x11_window.cpp~ 2012-01-12 22:18:49.000000000 +0100
++++ ClanLib-2.3.4/Sources/Display/X11/x11_window.cpp 2012-01-12 22:30:46.492999847 +0100
+@@ -50,6 +50,7 @@
+ #include "display_message_queue_x11.h"
+ #include
+ #include
++#include
+ #include "../Window/input_context_impl.h"
+ #include
+ #include
diff --git a/dev-games/clanlib/files/clanlib-2.3.7-gcc7.patch b/dev-games/clanlib/files/clanlib-2.3.7-gcc7.patch
new file mode 100644
index 000000000000..22cce76debfb
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-2.3.7-gcc7.patch
@@ -0,0 +1,20 @@
+diff -up ClanLib-2.3.7/configure.ac~ ClanLib-2.3.7/configure.ac
+--- ClanLib-2.3.7/configure.ac~ 2012-04-11 08:55:49.000000000 +0200
++++ ClanLib-2.3.7/configure.ac 2017-02-21 11:57:23.482504683 +0100
+@@ -119,7 +119,6 @@ case $target in
+ *)
+ X11="yes"
+ WIN32="no"
+- CXXFLAGS="$CXXFLAGS -std=c++0x"
+ ;;
+ esac
+
+@@ -259,7 +258,7 @@ if test "$use_sse2" != "no"; then
+ fi
+
+ if test "$WIN32" = "no"; then
+- extra_CFLAGS_clanCore="$extra_CFLAGS_clanCore -pthread -std=c++0x"
++ extra_CFLAGS_clanCore="$extra_CFLAGS_clanCore -pthread"
+ else
+ extra_CFLAGS_clanCore="$extra_CFLAGS_clanCore -mthreads -std=c++0x"
+ fi
diff --git a/dev-games/clanlib/files/clanlib-2.3.7-no-ldflags-for-conftest.patch b/dev-games/clanlib/files/clanlib-2.3.7-no-ldflags-for-conftest.patch
new file mode 100644
index 000000000000..c22e58106485
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-2.3.7-no-ldflags-for-conftest.patch
@@ -0,0 +1,19 @@
+diff -up ClanLib-2.3.7/acinclude.m4~ ClanLib-2.3.7/acinclude.m4
+--- ClanLib-2.3.7/acinclude.m4~ 2011-11-24 11:57:30.000000000 +0100
++++ ClanLib-2.3.7/acinclude.m4 2015-04-02 15:22:52.060631122 +0200
+@@ -5,6 +5,7 @@ dnl CLANLIB_CHECK_LIB(lib, testprog, mod
+ define([CLANLIB_CHECK_LIB],[if test "$enable_$3" != "no"; then
+ OLDLIBS="$LIBS"; LIBS="$5"; AC_MSG_CHECKING(for $1)
+ OLD_CXXFLAGS="$CXXFLAGS"; CXXFLAGS="$6";
++ OLD_LDFLAGS="$LDFLAGS"; LDFLAGS=;
+ AC_RUN_IFELSE([AC_LANG_SOURCE($2)], [CL_RESULT=yes], [CL_RESULT=no], [AC_LINK_IFELSE([AC_LANG_SOURCE($2)], [CL_RESULT="yes, linked"],[CL_RESULT=no])])
+ AC_MSG_RESULT([$CL_RESULT])
+ if test "$CL_RESULT" = "no"; then
+@@ -14,6 +15,7 @@ define([CLANLIB_CHECK_LIB],[if test "$en
+ extra_LIBS_$3=" $extra_LIBS_$3 $LIBS "
+ fi
+ CXXFLAGS="$OLD_CXXFLAGS"
++ LDFLAGS="$OLD_LDFLAGS"
+ LIBS="$OLDLIBS"
+ fi])
+
diff --git a/dev-games/clanlib/files/clanlib-2.3.7-no-wm_type-in-fs.patch b/dev-games/clanlib/files/clanlib-2.3.7-no-wm_type-in-fs.patch
new file mode 100644
index 000000000000..48799baa42c2
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-2.3.7-no-wm_type-in-fs.patch
@@ -0,0 +1,12 @@
+diff -up ClanLib-2.3.7/Sources/Display/X11/x11_window.cpp~ ClanLib-2.3.7/Sources/Display/X11/x11_window.cpp
+--- ClanLib-2.3.7/Sources/Display/X11/x11_window.cpp~ 2013-08-01 16:32:37.866001296 +0200
++++ ClanLib-2.3.7/Sources/Display/X11/x11_window.cpp 2013-08-01 16:33:26.267001811 +0200
+@@ -289,7 +289,7 @@ void CL_X11Window::create(XVisualInfo *v
+ // Retrieve the frame size (emulating microsoft windows)
+ bool window_is_frameless = false;
+ bool window_has_thin_frame = false;
+- if ((!desc.has_caption()) || (!desc.get_decorations()))
++ if (!desc.is_fullscreen() && (!desc.has_caption() || !desc.get_decorations()))
+ {
+ if (desc.is_tool_window())
+ {
diff --git a/dev-games/clanlib/files/clanlib-2.3.7-non-x86.patch b/dev-games/clanlib/files/clanlib-2.3.7-non-x86.patch
new file mode 100644
index 000000000000..acaa8520b645
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-2.3.7-non-x86.patch
@@ -0,0 +1,38 @@
+diff -up ClanLib-2.3.6/Sources/Core/System/detect_cpu_ext.cpp.non-x86 ClanLib-2.3.6/Sources/Core/System/detect_cpu_ext.cpp
+--- ClanLib-2.3.6/Sources/Core/System/detect_cpu_ext.cpp.non-x86 2011-11-15 13:15:42.000000000 +0100
++++ ClanLib-2.3.6/Sources/Core/System/detect_cpu_ext.cpp 2013-01-08 13:33:20.000000000 +0100
+@@ -30,7 +30,7 @@
+ #include "Core/precomp.h"
+ #include "API/Core/System/system.h"
+
+-#ifdef CL_ARM_PLATFORM
++#if ! (defined(__i386__) || defined(__x86_64__) || defined(__amd64__))
+ bool CL_System::detect_cpu_extension(CL_CPU_ExtensionPPC ext)
+ {
+ throw ("Congratulations, you've just been selected to code this feature!");
+@@ -48,11 +48,12 @@ bool CL_System::detect_cpu_extension(CL_
+ #ifdef __GNUC__
+
+
+-#ifdef __amd64__
++#if defined(__amd64__) || defined(__x86_64__)
+
+ #define __cpuid(out, infoType)\
+ asm("cpuid": "=a" ((out)[0]), "=b" ((out)[1]), "=c" ((out)[2]), "=d" ((out)[3]): "a" (infoType));
+-#else
++
++#elif defined(__i386__)
+
+ #define __cpuid(out, infoType) \
+ asm volatile( "pushl %%ebx \n" \
+@@ -61,6 +62,10 @@ bool CL_System::detect_cpu_extension(CL_
+ "popl %%ebx" \
+ : "=a" ((out)[0]), "=r" ((out)[1]), "=c" ((out)[2]), "=d" ((out)[3]): "a" (infoType));
+
++#else
++
++#define __cpuid(out, infoType) {}
++
+ #endif
+
+ #endif
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index a4e7c6a9c5b0..cefc7adfe4a1 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/bcel/Manifest b/dev-java/bcel/Manifest
index 953e5851a316..1eaa327530d0 100644
--- a/dev-java/bcel/Manifest
+++ b/dev-java/bcel/Manifest
@@ -1,5 +1,8 @@
DIST bcel-6.5.0-sources.tar.gz 1009051 BLAKE2B fd07d8a5144112efe38e30a8d10c3b6a189a4ec70defa96c402fa88027acf84b07c15138d235354baac18bdb798d407c11ccfada7bbe7339532f829e814e2d2c SHA512 c6da4b4d4cbad3ad2b3a4c0208063e3858170356fc4f6670c95ce819f0aea69f103914875a12bf2715a869c2b19a3e79fcb55a695eb269d9937520db25da1e3d
DIST bcel-6.5.0-src.tar.gz 1009051 BLAKE2B fd07d8a5144112efe38e30a8d10c3b6a189a4ec70defa96c402fa88027acf84b07c15138d235354baac18bdb798d407c11ccfada7bbe7339532f829e814e2d2c SHA512 c6da4b4d4cbad3ad2b3a4c0208063e3858170356fc4f6670c95ce819f0aea69f103914875a12bf2715a869c2b19a3e79fcb55a695eb269d9937520db25da1e3d
+DIST bcel-6.6.0-src.tar.gz 1009654 BLAKE2B 9043cc077773383aebf9b56e8c67de9ffb9e278db1737eefb5966b32cbe36131bd6ec14454361daaf424a8114de21e804dadaebfbee6d11493026b8a98135668 SHA512 13f361be498625c3276860ae14c225c49135687f4ba69de4afaac2d135df4e5c6b51277e3cd4c05bac27156e4fab5316c102a25a67d8abb6c640499917d01917
+DIST bcel-6.6.0-src.tar.gz.asc 488 BLAKE2B b3d07f9d6f8f2b92215173d390281cab03b98dea2e926f5fe7f3ced74610c56dfa2915c5bfeeca360cd3904773cb66f8d9042062e6b3821f707853ef5c82fc73 SHA512 65830fcd5f5adb1deb92edd0b9181b9aeaf3d5357858a348606416dcfb416f58420ceb6c8ea58a550d5d7b4d1909dcff125b31496c00a9107ae211936c1d6e1d
EBUILD bcel-6.5.0-r3.ebuild 2846 BLAKE2B 9fc25e787de06a3b795707fd1bb0a5c34f8c2a2b447fcd0ffee564bfb606e8479784c133f8e7c54ef90d0c318bb60ef1e0545aeffb0a289741f2f10541602f50 SHA512 5e519ae1f796b45092a2f3183c060ce0f81bdf13e91e25f3f2da5698001e664dd522dd0777ba7faf0314e0719f08a5e8d4d11b7154fdfe8a05a3700cbae9dae1
EBUILD bcel-6.5.0.ebuild 1076 BLAKE2B 53a7a80536e25669860ec17e197bb5219c965690de1c89832187ebea88738908daf8887772090b20fabcf8f5eca07f033a68f628ea3c8675ce743b0a68a79561 SHA512 c1acb164288524653f5f0aa80b7a7bf9cb0e4003015b100a727940d00cab00d4186c33faed1bf02805b9d2944ef0d7c120a7fb571686feda7e7f351d5e4989a8
-MISC metadata.xml 824 BLAKE2B bc553409e03ae7f58cc3122683ff49d86133fcae7b528d8a224ec126e1a43ff6dc1d329f84e54ee296c9c00e077ff732309c5a7bfdf516caad770a9f9a98ad2c SHA512 86cc34324c04905815cb84b4e7aaf5395d2d61eae42d521dda76ad74bd9a03614c0ac5ab67ce0c67312f1e150cc48d397efbd2615ee8520835621ad01b667b21
+EBUILD bcel-6.6.0.ebuild 1994 BLAKE2B 13f05979be506b837ee5553a850a26676e55afdcad6c33ee13be2a587c32a4790a756e6c4e4ac2babf9fac3af3a0df3cc22bdc45a6b474ad3432b8b072022d80 SHA512 b8956d570f43318bf46c22e50cfde5e248e95be5ded129dc7af5baadeee76a0fc5ff65cc2424c5afa17e855ee68002c1c30d2f144215ae1a81c8b45cfd394891
+MISC metadata.xml 897 BLAKE2B fdd417f23c2717d0ff95cbf4decc58768b60710baa803f71c956a3fb4c5049fd83b14679f0ebdb95185f3212541706e2b598617e2a61d6399cd254bd66d031a2 SHA512 99ea77ae905471f571c87a43fd9e8621ea169cf2b41bf3025fc2ecf2e4eed0088c6cc6cbc5c5d756f9083b9c6b11c2f8d0cb05090dcef9f69a797f6c887cab57
diff --git a/dev-java/bcel/bcel-6.6.0.ebuild b/dev-java/bcel/bcel-6.6.0.ebuild
new file mode 100644
index 000000000000..894881257b80
--- /dev/null
+++ b/dev-java/bcel/bcel-6.6.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/commons/bcel/source/bcel-6.6.0-src.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" --ebuild bcel-6.6.0.ebuild
+
+EAPI=8
+
+# No tests, junit-jupiter is not packaged
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.bcel:bcel:6.6.0"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Apache Commons Bytecode Engineering Library"
+HOMEPAGE="https://commons.apache.org/proper/commons-bcel/"
+SRC_URI="mirror://apache/commons/${PN}/source/${P}-src.tar.gz
+ verify-sig? ( https://downloads.apache.org/commons/bcel/source/bcel-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# Common dependencies
+# POM: pom.xml
+# org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
+
+CP_DEPEND="
+ dev-java/commons-lang:3.6
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? javax:javaee-api:6.0 -> !!!groupId-not-found!!!
+# test? net.java.dev.jna:jna:5.12.1 -> !!!suitable-mavenVersion-not-found!!!
+# test? net.java.dev.jna:jna-platform:5.12.1 -> !!!artifactId-not-found!!!
+# test? org.apache.commons:commons-exec:1.3 -> !!!artifactId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter:5.9.1 -> !!!groupId-not-found!!!
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}"
+
+BDEPEND="
+ verify-sig? ( sec-keys/openpgp-keys-apache-commons )
+"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/commons.apache.org.asc"
+
+DOCS=( NOTICE.txt RELEASE-NOTES.txt )
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.apache.bcel"
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/bcel/metadata.xml b/dev-java/bcel/metadata.xml
index fedca9bbcd0c..5b5f89c96e8e 100644
--- a/dev-java/bcel/metadata.xml
+++ b/dev-java/bcel/metadata.xml
@@ -1,19 +1,20 @@
-
- java@gentoo.org
- Java
-
-
- This is the main Reference implementation of the BCEL JavaClass API.
- The Byte Code Engineering Library (formerly known as JavaClass) is intended
- to give users a convenient possibility to analyze, create, and manipulate
- (binary) Java class files (those ending with .class). Classes are represented
- by objects which contain all the symbolic information of the given class:
- methods, fields and byte code instructions, in particular.
-
-
- apache/commons-bcel
-
+
+ java@gentoo.org
+ Java
+
+
+ This is the main Reference implementation of the BCEL JavaClass API.
+ The Byte Code Engineering Library (formerly known as JavaClass) is intended
+ to give users a convenient possibility to analyze, create, and manipulate
+ (binary) Java class files (those ending with .class). Classes are represented
+ by objects which contain all the symbolic information of the given class:
+ methods, fields and byte code instructions, in particular.
+
+
+ https://downloads.apache.org/commons/bcel/RELEASE-NOTES.txt
+ apache/commons-bcel
+
diff --git a/dev-java/logback-core/Manifest b/dev-java/logback-core/Manifest
index ec4ac7b676e9..cbf79f05dec9 100644
--- a/dev-java/logback-core/Manifest
+++ b/dev-java/logback-core/Manifest
@@ -1,5 +1,4 @@
AUX logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch 799 BLAKE2B 5ed73567f9ef6f6fb08c1f9d6fff43e71a22760a31bddcc454a75c62d26b50bad46510f6c748c019ab90e69e6e6007ee3de2507104f956b4c24b658716a6b6ed SHA512 5214fab891a28e02b6748a307e1741207c16dbf0f9fbfcef86f1303c2ab15714348a1f1750965ee928ed422ffa7261f0bc7340756805ba196fe86dce66039ae5
DIST logback-1.2.11.tar.gz 4133000 BLAKE2B 09ef74fb92c5a3f10a9ed401b0cc687f9dbc05daf17646f96fa216aefef1a150434b7ba4ca25b6ed751c01dab906c56be5c65908ca9baf6e29cc1a9f55e14773 SHA512 2482f7af5696034e9b412fb3d37be7f0bc7c8a2549808f88b0ae693c0be4f95c41acd82649f76a4572ea5c0bb9f8d7a78b9a64d7af6dd76a0b1b926d7419c084
EBUILD logback-core-1.2.11-r1.ebuild 3482 BLAKE2B 40590d0ec60cf62a6a4c64e34c68c84077a0917d18aa944dcdb835b97a585d2fc6cc30e80bf8966fb2e046baa1d4172b02576e8d610edf58f1e75a0dbee7e9ae SHA512 8e6a348b53c6b2ae9230dd8958b68f57e8a3dc7f05903f75b0c407c6b700b2e437ac925ef515d35963b33f99d5c1f0ecf576a745cc65ff456a096277276b08f4
-EBUILD logback-core-1.2.11.ebuild 3571 BLAKE2B 1a57d13feba258d96db96f632056abe972f464cf2194a996b8550681a7b09896c8e80ddec34b660cd9239809567a360b53b6ebc7d6e7ef284785a673dff364af SHA512 f45a45c16eb7297b9f15bd68233715c36ec4c683e672d8c74ce3ff2c9457a1aacef857661506e60752cf6dde6ad35156684b5483c5b679ff89238b9ec4e52b2c
MISC metadata.xml 413 BLAKE2B 3ae8c9f27dadfe978d070866e0c0368b89b8532f2aa6fbd3e3fab9e057320e1c6b5c2bc7367cc191e189acaa88384a0b86741d674d1cd711d4dd5ee8a29c9662 SHA512 7c2739ff8e878766487804fabcb39cda969c81e47af7fd51ffebfcb85dbdec10b7eef85b1d9c873561456e1592f6cdb8f82fbb4233abee1f43f323a1c10f9ba2
diff --git a/dev-java/logback-core/logback-core-1.2.11.ebuild b/dev-java/logback-core/logback-core-1.2.11.ebuild
deleted file mode 100644
index 954b29679ba8..000000000000
--- a/dev-java/logback-core/logback-core-1.2.11.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/qos-ch/logback/archive/v_1.2.11.tar.gz --slot 0 --keywords "~amd64" --ebuild logback-core-1.2.11.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="ch.qos.logback:logback-core:1.2.11"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="logback-core module"
-HOMEPAGE="https://logback.qos.ch"
-SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${PV}.tar.gz"
-
-LICENSE="EPL-1.0 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# javax.mail:mail:1.4 -> !!!groupId-not-found!!!
-# javax.servlet:javax.servlet-api:3.1.0 -> !!!groupId-not-found!!!
-# org.codehaus.janino:janino:3.0.6 -> >=dev-java/janino-3.1.6:0
-# org.fusesource.jansi:jansi:1.9 -> >=dev-java/jansi-1.13:0
-
-CP_DEPEND="
- dev-java/javax-mail:0
- dev-java/janino:0
- dev-java/jansi:0
- java-virtuals/servlet-api:3.1
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? joda-time:joda-time:2.9.2 -> >=dev-java/joda-time-2.10.10:0
-# test? junit:junit:4.10 -> >=dev-java/junit-4.13.2:4
-# test? org.assertj:assertj-core:1.7.1 -> >=dev-java/assertj-core-2.3.0:2
-# test? org.mockito:mockito-core:2.7.9 -> >=dev-java/mockito-4.4.0:4
-
-DEPEND="
- >=virtual/jdk-1.8:*
- ${CP_DEPEND}
- test? (
- dev-java/assertj-core:2
- dev-java/joda-time:0
- dev-java/mockito:4
- )
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CP_DEPEND}"
-
-DOCS=( ../README.md )
-
-S="${WORKDIR}/logback-v_${PV}/logback-core"
-
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="joda-time,junit-4,assertj-core-2,mockito-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-src_prepare() {
- default
- sed \
- -e 's:org.mockito.Matchers:org.mockito.ArgumentMatchers:' \
- -i 'src/test/java/ch/qos/logback/core/net/AbstractSocketAppenderIntegrationTest.java' || die
-
- # Ignore test failing under Java 16
- # See https://github.com/qos-ch/logback/commit/d6a8200cea6d960bf6832b9b95aed64e87474afb
- local vm_version="$(java-config -g PROVIDES_VERSION)"
- if [[ "${vm_version}" -ge "17" ]] ; then
- eapply "${FILESDIR}/logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch"
- fi
-}
-
-src_test() {
- # 67,73 logback-core/pom.xml
- #
- # **/All*Test.java
- # **/PackageTest.java
- #
- # **/ConsoleAppenderTest.java
- #
- #
- pushd src/test/java || die
- local JAVA_TEST_RUN_ONLY=$(find * \
- -name "*Test.java" \
- ! -wholename "**/All*Test.java" \
- ! -wholename "**/PackageTest.java" \
- ! -name "AbstractAppenderTest.java" \
- ! -name "AbstractPatternLayoutBaseTest.java" \
- ! -name "AbstractSocketAppenderIntegrationTest.java" \
- )
- JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
- JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
- popd
-
- # accessible: module java.base does not "opens java.lang" to unnamed module @42bb2aee
- local vm_version="$(java-config -g PROVIDES_VERSION)"
- if [[ "${vm_version}" -ge "17" ]] ; then
- JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
- JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
- fi
- java-pkg-simple_src_test
-}
-
-src_install() {
- default # https://bugs.gentoo.org/789582
- java-pkg-simple_src_install
-}
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 6e915a0a9bd6..e6e06f18d61c 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,6 +1,6 @@
DIST protobuf-3.19.3.tar.gz 5293258 BLAKE2B c05b70ffca97f7166ea6a511a36907eed125edf1ebf17f908718221d9b851be84dfb2b1b39973f2faf35f6ade630e6ba4f9e8b91b8fbc922c5db97079323ee6e SHA512 1c003e7cbc8eae6a038f46e688b401ee202ba47f502561e909df79770f6e8b7daf3dc1ccc727e31bfb5b52cd04cb4fef7d2d2a28d650c13f396872ad4aa076c6
DIST protobuf-3.21.9.tar.gz 5112917 BLAKE2B 1788652e89ccb77feeaf2a3f4ce8e8554b29c1bccf3f58d79c66f3e5f080659a9b7eb4f2b4a07ce640549749f376deaf725d20e19674348b5bce9168aad5d095 SHA512 d54843a4ed66edf6cab7262849216b909313d70e9758aa7f00d02902c576396f0a77bb224fe2ce408da37aefaf7da9f568dea7bda4e397fc1e3666c8aaf9cb0f
EBUILD protobuf-java-3.19.3.ebuild 1451 BLAKE2B c0bad09302e1e52cff018223c055939e2d4335874f2be95e913705368926106c6967b5a98d7f0a392037060c040fd3116210f0d1de567dc17e66bfc252202e4b SHA512 a74e044d91db564a682f8d9b82fa73608fc10f2b0a917b1eb696375f5993e62cf03289a31b7e28aa27cbfdf027bf62160083ff39186d1f8333b52633ba5ed0fb
-EBUILD protobuf-java-3.21.9.ebuild 2121 BLAKE2B 8aeb2736d4c6792c9d1501a5eca3109c0c52ead3d23b91bf1ca2ed2418b879e0161f6602e4847bd28d6c7b3264e0835897f146dbf51234275145264906a8d74b SHA512 c98b04131dce5437c0b3e258046141266a0f4d6852e018adde7494adef0973d7466208cbfbc8895a53cfce595cf45620d8f62155454e0aff6735e21a0c5afed4
-EBUILD protobuf-java-9999.ebuild 2995 BLAKE2B e1538e1a635ba897a9c2f75db235384cb4122c4390ed8bab3a9f46c57f74b1db58ef54e6df65e328df6458067e6b671b3dda4a08226c94e9929388aaa8efe386 SHA512 94b01edfaee931cc4a5944940429e89cf8837f74c25efe026c3ad7fb3a637da21f794b68d7fda90e9bbef58251bab3f3b0271fc4a50ea29c4389578fa3597e16
+EBUILD protobuf-java-3.21.9.ebuild 2250 BLAKE2B aa87469f2d9d6e6dc53d11ef39c1c5e79ca958b2072762f3afb993a543e632632eb537aba96200b76ff245cc07bcf3b9f3661fc402820ffcb725050b92340faf SHA512 b8460526eac3a04da27c3eab28b459a377655eb1819c69f192bc599181bf2cf0d5beaabfdb677203a1cbd944d0acd55712504664f58b064e95d6b7f970e1c1ff
+EBUILD protobuf-java-9999.ebuild 3078 BLAKE2B 837383cde2c29c4605564b30a071eeb8240c9a447a03cae8c63526d0c0011146faf0a914fe13c0cfe6952f49fef01c08e928fb7568a1f7930393ae851a87f484 SHA512 4be8eef3afd89a5e0248d4181d0ae7e1fdde18adfa9e7e3e9aa869e174adff77ce066ae346393d201ba585c7dd686b7ee0826ba9f76729f11569717b5655441c
MISC metadata.xml 625 BLAKE2B 13394b9a2148b9117ce719954591e79088f845ac1ceb667bbdd2645b989daadcfea09525f9dde68c405e3f1cce5cc1af32de9fb4dff629e4745e13fa92727dd7 SHA512 47f693db57dbde04f419ed65494d81b0a800c9ac49d790c9b794baef34fb1f876da29c5a0662c45aa3c01cecd34af648e196fb76110fcc0066198c59543049b3
diff --git a/dev-java/protobuf-java/protobuf-java-3.21.9.ebuild b/dev-java/protobuf-java/protobuf-java-3.21.9.ebuild
index 96fc4a9564e1..c393a3769bea 100644
--- a/dev-java/protobuf-java/protobuf-java-3.21.9.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.21.9.ebuild
@@ -9,7 +9,7 @@ MAVEN_ID="com.google.protobuf:protobuf-java:3.21.9"
# https://github.com/protocolbuffers/protobuf/blob/v3.21.6/java/core/pom.xml#L35-L39"
# JAVA_TESTING_FRAMEWORKS="junit-4"
-inherit java-pkg-2 java-pkg-simple
+inherit edo java-pkg-2 java-pkg-simple
DESCRIPTION="Google's Protocol Buffers - Java bindings"
HOMEPAGE="https://developers.google.com/protocol-buffers/"
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> pr
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
DEPEND="
>=virtual/jdk-1.8:*
@@ -44,17 +44,25 @@ JAVA_TEST_SRC_DIR="core/src/test/java"
src_prepare() {
default
java-pkg-2_src_prepare
+
+ # There is also compiler/plugin, but not in this list because in a subdirectory
+ core_protos=( any api descriptor duration empty field_mask source_context struct timestamp type wrappers )
+
# Copy resources from ../src/google/protobuf according to
# https://github.com/protocolbuffers/protobuf/blob/v3.21.6/java/core/pom.xml#L45-L61
- mkdir -p core/src/main/resources/google/protobuf/compiler || die
- cp {../src,core/src/main/resources}/google/protobuf/compiler/plugin.proto || die
- cp ../src/google/protobuf/{any,api,descriptor,duration,empty,field_mask,source_context,struct,timestamp,type,wrappers}.proto \
- "${JAVA_RESOURCE_DIRS}/google/protobuf" || die
+ mkdir -p "${JAVA_RESOURCE_DIRS}/google/protobuf/compiler" || die
+ local core_proto
+ for core_proto in "${core_protos[@]}"; do
+ cp "../src/google/protobuf/${core_proto}.proto" \
+ "${JAVA_RESOURCE_DIRS}/google/protobuf" \
+ || die
+ done
+ cp {../src,"${JAVA_RESOURCE_DIRS}"}/google/protobuf/compiler/plugin.proto || die
# Generate 146 .java files according to
- # https://github.com/protocolbuffers/protobuf/blob/v3.21.6/java/core/generate-sources-build.xml
- for proto in any api compiler/plugin descriptor duration empty field_mask source_context struct timestamp type wrappers; do
- "${BROOT}/usr/bin/protoc" \
- --java_out=core/src/main/java -I../src ../src/google/protobuf/$proto.proto || die
+ # https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/generate-sources-build.xml
+ for core_proto in "${core_protos[@]}" compiler/plugin; do
+ edo "${BROOT}/usr/bin/protoc" \
+ --java_out="${JAVA_SRC_DIR}" -I../src ../src/google/protobuf/"${core_proto}".proto
done
}
diff --git a/dev-java/protobuf-java/protobuf-java-9999.ebuild b/dev-java/protobuf-java/protobuf-java-9999.ebuild
index ab4856250e05..f269a7bc8533 100644
--- a/dev-java/protobuf-java/protobuf-java-9999.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-9999.ebuild
@@ -12,7 +12,7 @@ MAVEN_ID="com.google.protobuf:${PN}:3.21.7"
# https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/pom.xml#L35-L40
# JAVA_TESTING_FRAMEWORKS="junit-4"
-inherit java-pkg-2 java-pkg-simple
+inherit edo java-pkg-2 java-pkg-simple
PARENT_PN="${PN/-java/}"
PARENT_PV="${PV}"
@@ -92,14 +92,18 @@ src_prepare() {
# Copy resources from ../src/google/protobuf according to
# https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/pom.xml#L45-L61
mkdir -p "${JAVA_RESOURCE_DIRS}/google/protobuf/compiler" || die
- cp "../src/google/protobuf/${core_protos[@]}.proto" \
- "${JAVA_RESOURCE_DIRS}/google/protobuf" || die
+ local core_proto
+ for core_proto in "${core_protos[@]}"; do
+ cp "../src/google/protobuf/${core_proto}.proto" \
+ "${JAVA_RESOURCE_DIRS}/google/protobuf" \
+ || die
+ done
cp {../src,"${JAVA_RESOURCE_DIRS}"}/google/protobuf/compiler/plugin.proto || die
# Generate 146 .java files according to
# https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/generate-sources-build.xml
- for proto in "${core_protos[@]}" compiler/plugin; do
- "${BROOT}/usr/bin/protoc" \
- --java_out="${JAVA_SRC_DIR}" -I../src ../src/google/protobuf/"${proto}".proto || die
+ for core_proto in "${core_protos[@]}" compiler/plugin; do
+ edo "${BROOT}/usr/bin/protoc" \
+ --java_out="${JAVA_SRC_DIR}" -I../src ../src/google/protobuf/"${core_proto}".proto
done
}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 17cae0c5002a..e0b9188071e5 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -1,7 +1,6 @@
AUX 2.5-build-r1.xml 3084 BLAKE2B 6eb6025444ad6b2af035217bc7c1410a1238e25eaafdfdfe4ac706137791b329b05a28f56f77c57fa8de30b77d457e912208068b97bf6b8fbee7d7af168d07a5 SHA512 1bf5789c683896ffde160f96dc6fcb2ef58dd645a208b3d8e08863fd176337ae81e4d29535bb18df909cfe233576f25d93c35ad1072fca3a79b19e784638f5fb
AUX jsp-api-2.0-manifest 474 BLAKE2B 51ae750bf0caa563387eb51f0fb1be53c693c7cb0d1e0b8193fa80d70a776c0cf24b2eee585cf77292bc2112b60075414a4d05ebe16dc26eb3c2976a44420774 SHA512 f2e21cee74fd1c3f1403eb3e26c1c7a59be420bc25da842af0cfae851fcf4bb22575b147feb2ffd3a52410e0e552bafb4414b9f8ef5f9a0f4df1d061f2c6be41
AUX servlet-api-2.4-manifest 310 BLAKE2B 8400197ebfe43615dbea9ac8fad2b85f89abe9e8414cbc1ce835f09ccc2921e3aa50bffc3d3c38364bd61d38f14e979219f93125c3b61403ebecebd16226fa56 SHA512 bb16a0fd2d277d2b7990294bfc730def285d6e390c8ab3166d8ffb08e9d9c62c9f462893fdd9eb84cfa93685262a8800622acdbf0fd9a7f2ffb5709f0387f9ca
-DIST apache-tomcat-10.0.23-src.tar.gz 6136614 BLAKE2B 4eaf963187b9a754ed459d7f85e6f7d329927b949bb4a390a602cdc6651aa037aeec559c511ddb9880b6ec4d7cd97b96d82da341509370e412e1b21b799d8c2e SHA512 19ec026bae75318e9ffbe2e619ad2e12ec116382ea88a1064696275afb3fd13e6f08efe497dde79689bfc828f76e27d114ad3a9284b79c8d956a6a85bdac6360
DIST apache-tomcat-10.0.26-src.tar.gz 6153701 BLAKE2B fb16f83cf71dc97f21739c3714d2d3d201aa6b6b4242c351fabfc04ee767e59b6e376c7c8984dcda12d6942835221c55d4451b2d0a1245a2dbb73636c93da47c SHA512 f66387a3ca67b6b3df8504c4ae089e8f30e389811a8d0b7d2241e115b8cf712a38f3d0fea938cef7fa9745f412aa70ad47840e40e2385fbd1435b636e93b45b4
DIST apache-tomcat-10.0.27-src.tar.gz 6154411 BLAKE2B 87a66acacf5443189620af3c8f306e1ae7d8572f9d6ba657379f8a9691c01530e2f1cb17bb1daef5504459480395f4eabdbb626b6da3a879c5a11910029e002b SHA512 ab7c2ae4134ec9652dc0d19343be7d3bf298b1c7a367b51bcceb88f1aaf70ecb45b3a7b9682e2deac70a1e9b00aca974b77110d3363bc5d1c88dc3ae95015e15
DIST apache-tomcat-10.1.0-src.tar.gz 6060833 BLAKE2B 49f36131c1e809b298ac915e671b9f4df55b55c2ba34d21ee3fdeb8759ddaf53a6780b177e8049446079d91186c52669969f30762ddf776d9f8615e527d5a975 SHA512 08323eec0403473fa97f419d7911980c3dfe7b1607a64741bbe972a737dfa70ea04ea80ca9ab28bf72bdde9d24cf8f7161eeb8b194204c777d1628d00c78611c
@@ -12,11 +11,9 @@ DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713
DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
DIST apache-tomcat-8.5.82-src.tar.gz 6011553 BLAKE2B ea34c0485877ace8c84144f0e75f370c0ac461b5b725d97a07e27014b7a14b1ab88fad4230d4fae60190d7bff3836f691615b57b9f085797477acc69560a57ce SHA512 3e0a0a808fb78493930ce8832731eba4ab3cc440387c3b5226ff6e4ac2faf5fd70eff1560d840d34f14a8acfd7e60fc8b7f638f3dbe0c0ed4569dc4271a9c3f2
DIST apache-tomcat-8.5.83-src.tar.gz 6025934 BLAKE2B 29df8c53819d90abf1b1bda3f5c3e6013c354ee847760849d83a5e7ec4a39688f25cc5f8226fe37c235e717761de123e4e480ae834e8f9f37a5c6b5819b9823d SHA512 26dcb71025ab714a4fc78379aeb026e88d1de1b5c268a4a3f753a122127aa738a9b40b2d743799db70c0364d8eb786f0fe3ec9733e8ccf1f22f88ea34d68318f
-DIST apache-tomcat-9.0.65-src.tar.gz 6195265 BLAKE2B 13ca956b58e9f1831700f67d1fa8883f6471ab6b700b2af169bf284552658a4e9ad4130451b36976af4dd366cc987e228e0b0f98e688cccf577c626dfc78aae7 SHA512 3ff344370cc36f5bed389ed198054783a4f5bc86476a751cda280618457a06bae38c1e764b0c110c2f68efe2d34243a4e24596e8b90e8fbd171bf584a22fd3bc
DIST apache-tomcat-9.0.67-src.tar.gz 6211392 BLAKE2B 273b921ce580be6fb76d8567e5b0aec01b936518875f8470c1cee4b159519f723e606680d9986f61fbbab79cea2d027195f3debe9af59dfac786b0d0566d7c02 SHA512 33319d70c50fde71d163f66dc388ed2d5855aa4f087f7e2259adc27cc7ed30ace079d81e52def43a904c88ac670bb0c71667938b931a214470d77679108914cc
DIST apache-tomcat-9.0.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be
-EBUILD tomcat-servlet-api-10.0.23.ebuild 3021 BLAKE2B 5a7b1fc041750ed25e2b2ebd91a46d422b8b84455814a95f0ecc4b13634e8df876a1cc95e4f6318380392feb80f8a748bfe21898e18169ddb05eea7a0f086c2f SHA512 da77418b28127f4d7e05f691f835e7eb01a59e2f33daf15ecc2f76ccbc1f136e7b446d14104d9cbc62f9d251f926dc698e8051b877c61f4adbce45c51b21822a
-EBUILD tomcat-servlet-api-10.0.26.ebuild 3025 BLAKE2B 2198be652150c8c8d0cb4c7dab9beca30094e184e1812038df79b193a8c3c148d076fe8164a9d0b746b667dfbe9b261da266513573352229980b3481faf4fb56 SHA512 5ea6ad3fba96aef3ff05897fb1a13f58b7b106a6b9a8dc265851747719592dda261fa6b7fca1640c1dc1b3aa4e4e75b5ba8e22d4a2797a66f8b708bdfb5ed32b
+EBUILD tomcat-servlet-api-10.0.26.ebuild 3021 BLAKE2B 5a7b1fc041750ed25e2b2ebd91a46d422b8b84455814a95f0ecc4b13634e8df876a1cc95e4f6318380392feb80f8a748bfe21898e18169ddb05eea7a0f086c2f SHA512 da77418b28127f4d7e05f691f835e7eb01a59e2f33daf15ecc2f76ccbc1f136e7b446d14104d9cbc62f9d251f926dc698e8051b877c61f4adbce45c51b21822a
EBUILD tomcat-servlet-api-10.0.27-r1.ebuild 1175 BLAKE2B 8251cf902d082fae48bd5f0906bb23ad4dd2a69008ea6f127a50d009eb2e6f70a274b775d8edbc5eadd4c421b4d2d23d3176d92aebe017ada09186cca396c557 SHA512 cbc958b1ca9385a5bc04f9a689386b787a580f72f379217d3ddad8915d072f4f8c600a77bcb072972efa16f17a89b6f1e631215ce2d27777b739319ee82d08af
EBUILD tomcat-servlet-api-10.1.0-r1.ebuild 1172 BLAKE2B 4f7067a7e31c04bf55c66c0fa25c10a3744bc6e010db04ad922739b4ad57130e667da67c3513636ecbd61f126866e9edafa0c05dedaed2a60ce4adc875183971 SHA512 73640743378e8914d06fd4ab02cb7418356b03b152e24272a3600a14eaaaa85045c8e4f47378c3bb397a6bf08a9366fe13aa3f2bf574cdc6cc33ed1ed10756e6
EBUILD tomcat-servlet-api-10.1.1.ebuild 1172 BLAKE2B a0e939bb1464ee12c11cd92ccba5ea6c868aaeea83fe0dd4a65d44ff5b04e9bbc7a8723575796833123232b351456e313530aa86cb9fdb94f1cd336bb355f9dd SHA512 98311d5bdcbb1e784bb8228b185c78bec7d46f06ec9ef6bae0f6bfc6f58dc0d5e5bc36b84df604864a332a4b53da5b750a092c99dcde8e1175b996b3a97433f5
@@ -26,7 +23,6 @@ EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 961 BLAKE2B 66d34a80d320dd032acd712b2
EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
EBUILD tomcat-servlet-api-8.5.82.ebuild 3002 BLAKE2B c45468894337c7e25099a50e10280a0e08b4be3c6f058ff4b1ead323f5c9713dbb618b8c47e8106cb7f1a8ca84e75cb14191bf263ec2ccc9f25e8220bb92992f SHA512 f05643a5452a73dbb03d451f576404b75fe1cd615aca31855d741223b70ec081b914311b063e16ec28c2779d92edcfa264a354a75bcc59ec56670b1ff426f634
EBUILD tomcat-servlet-api-8.5.83-r1.ebuild 1328 BLAKE2B 385d32707719ae49dff0255a2a5a432adfdd02ab57467c2b71e7edf70bcd6f502c30707e3a02ae80d243fa9453bcd4b6da0345a1f462b28a40c58aa3097607bc SHA512 4b22424585b88d442cf0441a810752d1dc8243d23cac139ab5259393a522a342d340b376e0adab288e6520732bad221950063c0b76eff7b165387b08c62ab254
-EBUILD tomcat-servlet-api-9.0.65.ebuild 3009 BLAKE2B bfcd05fd52b9fe8828076b1727c38fb62f3019f271e95c17a6b5a4ead3f0704e2e3449216dba58bc27c399c9c242e48bc3dc9f7e4b4f5d6c7a242ad36cce243a SHA512 e6ddc9b3168c85061a67941dc8860933df8d6479a966cd627ef9d3eb9d5d5a9e925a950cc8c740604b1c7520a3e7faf47dab41f07223a8bc1250219053a7444a
EBUILD tomcat-servlet-api-9.0.67.ebuild 3009 BLAKE2B bfcd05fd52b9fe8828076b1727c38fb62f3019f271e95c17a6b5a4ead3f0704e2e3449216dba58bc27c399c9c242e48bc3dc9f7e4b4f5d6c7a242ad36cce243a SHA512 e6ddc9b3168c85061a67941dc8860933df8d6479a966cd627ef9d3eb9d5d5a9e925a950cc8c740604b1c7520a3e7faf47dab41f07223a8bc1250219053a7444a
EBUILD tomcat-servlet-api-9.0.68-r1.ebuild 1168 BLAKE2B 772b7aa6f72ba5aa6534e8e866c167864415c780e431c3304413abdfb0f568630108c8ab2bbd388edcc4e88ed816de8992d341bd7a42823ca311ff43761c9fc1 SHA512 070aedbac428440cfe68810109c5a598fcb9ccc8a6a3cdf205f15e5769f91809c75a2ab6c3cb50214dcf6289b4a5b9f0bcfccb5901ba5d6684771caf2e5e8c79
MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.23.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.23.ebuild
deleted file mode 100644
index 0d28b0e15cd3..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.23.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_A="apache-${PN}-${PV}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="5.0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${MY_P}/"
-
-JAVA_TEST_SRC_DIR="src/test"
-
-SERVLET_API_JAR="servlet-api.jar"
-SERVLET_API_SRC="src/main/servlet-api"
-SERVLET_API_RESOURCES="src/resources/servlet-api"
-EL_API_JAR="el-api.jar"
-EL_API_SRC="src/main/el-api"
-EL_API_RESOURCES="src/resources/el-api"
-JSP_API_JAR="jsp-api.jar"
-JSP_API_SRC="src/main/jsp-api"
-JSP_API_RESOURCES="src/resources/jsp-api"
-
-src_prepare() {
- default
-
- # The sources and also resources are mixed together so we first give it a structure to make it easier to compile and package
- mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
- ${EL_API_SRC} ${EL_API_RESOURCES} \
- ${JSP_API_SRC}/jakarta/servlet ${JSP_API_RESOURCES} \
- ${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
-
- pushd java || die "Failed to cd to java dir"
-
- cp --parents -R jakarta/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
- mv "${S}/${SERVLET_API_SRC}/jakarta/servlet/jsp" "${S}/${JSP_API_SRC}/jakarta/servlet" || die "Failed to copy jsp-api sources"
- cp --parents -R jakarta/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
-
- popd
-
- for file in $(find src -type f | grep -vE "\.java$"); do
- target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
- mkdir -p ${target_dir} || die "Failed to create resource directory"
- mv $file ${target_dir} || die "Failed to move resource file"
- done
-
- mv test/jakarta ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
-
- java-pkg-2_src_prepare
-}
-
-src_compile() {
- JAVA_SRC_DIR="${SERVLET_API_SRC}"
- JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
- JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
- java-pkg-simple_src_compile
- rm -fr target || die "Failed to remove compiled files"
-
- JAVA_SRC_DIR="${EL_API_SRC}"
- JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
- JAVA_JAR_FILENAME="${EL_API_JAR}"
- java-pkg-simple_src_compile
- rm -fr target || die "Failed to remove compiled files"
-
- JAVA_SRC_DIR="${JSP_API_SRC}"
- JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
- JAVA_JAR_FILENAME="${JSP_API_JAR}"
- JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
- java-pkg-simple_src_compile
-}
-
-src_install() {
- JAVA_SRC_DIR="${SERVLET_API_SRC}"
- JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
- java-pkg-simple_src_install
-
- JAVA_SRC_DIR="${EL_API_SRC}"
- JAVA_JAR_FILENAME="${EL_API_JAR}"
- java-pkg-simple_src_install
-
- JAVA_SRC_DIR="${JSP_API_SRC}"
- JAVA_JAR_FILENAME="${JSP_API_JAR}"
- java-pkg-simple_src_install
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.26.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.26.ebuild
index acb0d6c5fcea..0d28b0e15cd3 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.26.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.26.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="5.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.65.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.65.ebuild
deleted file mode 100644
index f1c865a27bec..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.65.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_A="apache-${PN}-${PV}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4.0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${MY_P}/"
-
-JAVA_TEST_SRC_DIR="src/test"
-
-SERVLET_API_JAR="servlet-api.jar"
-SERVLET_API_SRC="src/main/servlet-api"
-SERVLET_API_RESOURCES="src/resources/servlet-api"
-EL_API_JAR="el-api.jar"
-EL_API_SRC="src/main/el-api"
-EL_API_RESOURCES="src/resources/el-api"
-JSP_API_JAR="jsp-api.jar"
-JSP_API_SRC="src/main/jsp-api"
-JSP_API_RESOURCES="src/resources/jsp-api"
-
-src_prepare() {
- default
-
- # The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package
-
- mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
- ${EL_API_SRC} ${EL_API_RESOURCES} \
- ${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \
- ${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
-
- pushd java || die "Failed to cd to java dir"
-
- cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
- mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources"
- cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
-
- popd
-
- for file in $(find src -type f | grep -vE "\.java$"); do
- target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
- mkdir -p ${target_dir} || die "Failed to create resource directory"
- mv $file ${target_dir} || die "Failed to move resource file"
- done
-
- mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
-
- java-pkg-2_src_prepare
-}
-
-src_compile() {
- JAVA_SRC_DIR="${SERVLET_API_SRC}"
- JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
- JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
- java-pkg-simple_src_compile
- rm -fr target || die "Failed to remove compiled files"
-
- JAVA_SRC_DIR="${EL_API_SRC}"
- JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
- JAVA_JAR_FILENAME="${EL_API_JAR}"
- java-pkg-simple_src_compile
- rm -fr target || die "Failed to remove compiled files"
-
- JAVA_SRC_DIR="${JSP_API_SRC}"
- JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
- JAVA_JAR_FILENAME="${JSP_API_JAR}"
- JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
- java-pkg-simple_src_compile
-}
-
-src_install() {
- JAVA_SRC_DIR="${SERVLET_API_SRC}"
- JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
- java-pkg-simple_src_install
-
- JAVA_SRC_DIR="${EL_API_SRC}"
- JAVA_JAR_FILENAME="${EL_API_JAR}"
- java-pkg-simple_src_install
-
- JAVA_SRC_DIR="${JSP_API_SRC}"
- JAVA_JAR_FILENAME="${JSP_API_JAR}"
- java-pkg-simple_src_install
-}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 5793c086a868..238fde9013d2 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/jsonnet/Manifest b/dev-lang/jsonnet/Manifest
index 0da736e38385..ebf803e296e4 100644
--- a/dev-lang/jsonnet/Manifest
+++ b/dev-lang/jsonnet/Manifest
@@ -1,10 +1,12 @@
AUX jsonnet-0.12.1-dont-call-make-from-setuppy.patch 387 BLAKE2B 8c0223b10cf1b61707b10361cfb96a01f492d234b3318554628dfc51a49728022db2f6573cf78d66a38cae0f59e2054e985e189268254563c0bf9e6854b3c129 SHA512 287a17a6b3aaf8c9a971874ff2a507c8d301caf84d243bd1d063d58e21e93bbecc2b417767e0d56d87f300cef9811f7aec0caa8616292950b11eb3103f7bebbb
-AUX jsonnet-0.14.0-makefile.patch 752 BLAKE2B 5acf8e07cd0f1b9af658015e6ee560f31a25b4b17402e0516bc8a861db4f31d9cb23e86943389d36f0885f4afc179b433764a331aea7a0164368e3561490da61 SHA512 18230b761ec3d3d106e06d02680b54229eb20c681b7591209dbb7d5ee138edc3a5015d1e53d3238dd9c86753bcc3f5ef3352a733e9a950fca4b37af8d83c9888
AUX jsonnet-0.16.0-cp-var.patch 824 BLAKE2B 111fff8e8b897864e14defa677c1a9b8589ef6a859b2344b24e16a940d90cdeff1affde6cd53c0a1a443a82553ee90d554990160f07c49e98c15a5fc7ea3e03a SHA512 96ecfb8a6b49d31e6a827ed401566b5eef39deb8a3542a6f1b3a5df148bfd93479038468585dc47a76fbb9e7953bf9a6c7161abc7acaff7b81cb8dffe3de2f6d
AUX jsonnet-0.16.0-libdir.patch 963 BLAKE2B c4b71c01230710bf81fca03b1411bbd21ee02d9957b12997f629c9b4c8e543889658308868d48fe20e0bb9647848bd1b1fa2100c58426785bab1c9bfbbaa8bcb SHA512 9a85c5b8d80f6975ddd3e3c369adb44f6f49382a1e50e9848129c53f81846e69f60a44f401a8a1042657a03f94daaaeb5747632414fa7cb0dc9e2f014ec17a1d
+AUX jsonnet-0.18.0-gcc-13.patch 533 BLAKE2B 02d0b945f4a2fd9db923debff2c50f9f9ce3387f911022bba887fef42300b253cf006414351e77b931902cbe6a62a72ec0576621920e7fb0f611eda544386e8a SHA512 5926f6d15e5b2fd3a4db5787974ca26e7e7f59a3e3b30d49510d7ee47cb043bce220633c89c65b6be958c07874331e2d7484effd948ecffdd5e742b1936f61f0
AUX jsonnet-0.18.0-unbundle.patch 2564 BLAKE2B 8945b6b17af162a99b7d561a68a48c218d0d939ba74784f35eaa8f8dbafe568e9b4db258d45cf9ce5d87504e3d265697f074d4202c8210e878daf07b56514ef5 SHA512 5bae8d02062ecd29d9650c2b623631e7f7a172148be052620a47ef42788ee272f795011ecc98df9d2000947f0ced4c76776e09f5143058b030cc61a54355bbbf
DIST jsonnet-0.18.0.tar.gz 22472162 BLAKE2B 4f931a44b0cbeea0dc7705c28ca49817e2b3abe19ba4fdcd550d5df1ce9ad6b06b1b740a9306d36caa3970c88df9d31700373e4997dd52c6c2219cdd9bf125c1 SHA512 08a64a4b132df1519292378cef93deb3c60d21636b2a71bce6c13e29cfd93cab465cad77e11f000fb984c5c75a4ca1c92504654fd2e5201343df767ea0e610d1
DIST jsonnet-0.19.0.tar.gz 22478380 BLAKE2B 0a1612ca0525342763099e70921181578fcf7ab25c2a3811ffede944953e4ce114f1949642038d6147c96d52193cf701473fab8581d50c3e74036139fbd5c19a SHA512 f4e30d977df7840a4f13c7ba75614badd964a5c4484fb264d7b05d6de04aa2a2d3c4c5161523d6fa6559460ea94b94562b07ea6590a34876545c529474c4b9fa
-EBUILD jsonnet-0.18.0-r1.ebuild 2076 BLAKE2B 84ce1cd4819f2fddfa26271f9311a1eb57e66936822c9e9dd94201935e985101a7e11e4a660db95178891053e99ba5079548a7584ef5f8896d15717bb03fff90 SHA512 41e4ddfc52a89de20852f91f0d615a1a01e47ea34f99a7ead2ad43a7e3e0210f67f8eb017a8922274db60334cfcd6681d8a023075dfc09a7508bf329da417350
+DIST jsonnet-0.19.1.tar.gz 22480685 BLAKE2B 7d86bc963f5ced622e91adf015c250b8cae2e817b6af5d60820d8731e04caecc1b2b8142d320414d253ef1fa3558d61aeb1b59480eab0823915d2b15c5d87aab SHA512 21312de71f63f4a74005f563290d67fcc2d220f043291a123af2fc834f4118f8bbc311ea8acc5dd52b13eff8c32f026a5ce6bfe3d88b4c6c770e585dd1f0b688
+EBUILD jsonnet-0.18.0-r1.ebuild 2119 BLAKE2B 38f132f1ec652aaca2280fe5f9e12094ef47b8b670373a5783a46932b5d1629b5d9cc1c5ab4f03baeb2ccbf64bcf5213ffa512d5571ad06da455ab5d4ff67dd1 SHA512 1125926a054884fcd213d5917288f65f19de60966bd2a9f6468de47046ead25fcb50ec4e0f097d771f90cd43d7b739577fd798c5cc2b32644c6e19fe9ce6b266
EBUILD jsonnet-0.19.0-r1.ebuild 2128 BLAKE2B a4ff0c29853483e5093b469bb811305f7955561bff84349682cce40fcf9e31c4d03d7b974bf3d0227f3e6fcd308ade37911271df1464190c01c973eba0df64f8 SHA512 574237bf6c1992845d83749d00fb7c74bb01c42ae02e7e2b3fd1872a8a9c453117ecab0e81a2a6ff5210a4156ad456797f524cd0da71f5cf7f1a9b3e7365e79b
+EBUILD jsonnet-0.19.1.ebuild 2132 BLAKE2B a22914221574b5844057fb3718998187b15076def31ee6932efb3df954af3597c2c7a3c5fe366f14f4e75e302e9bfd64b4a79d2d1810eb5f732bf3dbfabdd607 SHA512 5a9c1b69fbd19f8c54247f42a801f1e2ba3adef7c6a419627abf3395fc1cf5e1f3be9094b41b26bb6cbfe1664e363b18b3967b2341fe1943a42e8f4713efb32b
MISC metadata.xml 636 BLAKE2B b4f30bead9e90492366ba9d8fd393cfa6610efcb1dbe7cf11307445f2b7aa596585b576e550aa0df3bcfd14c7a8b068d09040ea94dc815db76d6d15e0f09fccb SHA512 a106617bce041fc24e1fab61d08add74f450742e7c1be14633cd49b5137c86cf52bd5baf9ea8f5f2f51a90619c7dfad7e6bf749894d8e4df8063857f29a0492a
diff --git a/dev-lang/jsonnet/files/jsonnet-0.14.0-makefile.patch b/dev-lang/jsonnet/files/jsonnet-0.14.0-makefile.patch
deleted file mode 100644
index a6107a4e10cd..000000000000
--- a/dev-lang/jsonnet/files/jsonnet-0.14.0-makefile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 474655c..89c396c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -31,9 +31,9 @@ OPT ?= -O3
-
- PREFIX ?= /usr/local
-
--CXXFLAGS ?= -g $(OPT) -Wall -Wextra -Woverloaded-virtual -pedantic -std=c++0x -fPIC
-+CXXFLAGS += -Wall -Wextra -Woverloaded-virtual -pedantic -std=c++0x -fPIC
- CXXFLAGS += -Iinclude -Ithird_party/md5 -Ithird_party/json
--CFLAGS ?= -g $(OPT) -Wall -Wextra -pedantic -std=c99 -fPIC
-+CFLAGS += -Wall -Wextra -pedantic -std=c99 -fPIC
- CFLAGS += -Iinclude
- MAKEDEPENDFLAGS += -Iinclude -Ithird_party/md5 -Ithird_party/json
- EMCXXFLAGS = $(CXXFLAGS) -g0 -Os --memory-init-file 0 -s DISABLE_EXCEPTION_CATCHING=0 -s OUTLINING_LIMIT=10000 -s RESERVED_FUNCTION_POINTERS=20 -s ASSERTIONS=1 -s ALLOW_MEMORY_GROWTH=1
diff --git a/dev-lang/jsonnet/files/jsonnet-0.18.0-gcc-13.patch b/dev-lang/jsonnet/files/jsonnet-0.18.0-gcc-13.patch
new file mode 100644
index 000000000000..b2adca81a351
--- /dev/null
+++ b/dev-lang/jsonnet/files/jsonnet-0.18.0-gcc-13.patch
@@ -0,0 +1,18 @@
+https://github.com/google/jsonnet/pull/1020
+From: WANG Xuerui
+Date: Thu, 6 Oct 2022 15:04:47 +0800
+Subject: [PATCH] Add #include for gcc-13 builds
+
+See https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes.
+
+This fixes Gentoo bug https://bugs.gentoo.org/875569.
+--- a/include/libjsonnet++.h
++++ b/include/libjsonnet++.h
+@@ -17,6 +17,7 @@ limitations under the License.
+ #ifndef CPP_JSONNET_H_
+ #define CPP_JSONNET_H_
+
++#include
+ #include
+ #include
+ #include