[gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/

2022-07-10 Thread Thomas Beierlein
commit: 15148d323f83a623e0192d7fcb23bf761b09fba1
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Mon Jul 11 05:05:00 2022 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Mon Jul 11 05:05:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15148d32

net-wireless/uhd: Calling udev_reload now

Closes: https://bugs.gentoo.org/849653
Signed-off-by: Thomas Beierlein  gentoo.org>

 net-wireless/uhd/uhd-4.2.0.0.ebuild | 8 
 1 file changed, 8 insertions(+)

diff --git a/net-wireless/uhd/uhd-4.2.0.0.ebuild 
b/net-wireless/uhd/uhd-4.2.0.0.ebuild
index cc566523aad6..05294ec529fe 100644
--- a/net-wireless/uhd/uhd-4.2.0.0.ebuild
+++ b/net-wireless/uhd/uhd-4.2.0.0.ebuild
@@ -131,3 +131,11 @@ src_install() {
insinto /usr/share/${PN}
doins -r "${WORKDIR}/images"
 }
+
+pkg_postinst() {
+   udev_reload
+}
+
+pkg_postrm() {
+   udev_reload
+}



[gentoo-commits] repo/gentoo:master commit in: x11-apps/xwud/

2022-07-10 Thread Matt Turner
commit: 7364fc7f73d3f153e9a6a81713f3ef84bed3e9b7
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Jul 11 04:35:24 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jul 11 04:57:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7364fc7f

x11-apps/xwud: Version bump to 1.0.6

Signed-off-by: Matt Turner  gentoo.org>

 x11-apps/xwud/Manifest  |  1 +
 x11-apps/xwud/xwud-1.0.6.ebuild | 15 +++
 2 files changed, 16 insertions(+)

diff --git a/x11-apps/xwud/Manifest b/x11-apps/xwud/Manifest
index 0afae32bda49..65b8fabe3780 100644
--- a/x11-apps/xwud/Manifest
+++ b/x11-apps/xwud/Manifest
@@ -1 +1,2 @@
 DIST xwud-1.0.5.tar.bz2 133376 BLAKE2B 
27ce8251ae2a2a87393655e1824121dd54f75839a8066405299e9052bf2c55c6946cd686f285dca1d7339029d8ca8b94e4adb3efb485b42bd347db212b12858d
 SHA512 
27a0ce7481978ae6cd94b0d94374af72185e270d68f2496620e148bb00945427c4827138d9efc48745e6382e3da3390ed0cdff7dbd02dcf9706e8ecccae97184
+DIST xwud-1.0.6.tar.xz 126696 BLAKE2B 
cd272963c7edc71d4d4a0863dacf39a3432f1b344fe90e698d167df1394b7d5f00e3481eaa97fa47d9dd4e18778193b15879fec73746517a4a6ac69b098c1ec3
 SHA512 
a7b964d9ef13e4726b2ef84dcc1040cdf510c8031c3e6e1dc1c711e65d9e56f1fc5921a7af3dbbd898b861c79e9da6242da23c2e73816e39152ae719052293e9

diff --git a/x11-apps/xwud/xwud-1.0.6.ebuild b/x11-apps/xwud/xwud-1.0.6.ebuild
new file mode 100644
index ..ad59e9402ee0
--- /dev/null
+++ b/x11-apps/xwud/xwud-1.0.6.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="image displayer for X"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+   x11-base/xorg-proto"



[gentoo-commits] repo/gentoo:master commit in: x11-apps/xcmsdb/

2022-07-10 Thread Matt Turner
commit: 0df8ad7b262e484744653fe34a250c337a719532
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Jul 11 04:25:59 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jul 11 04:57:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0df8ad7b

x11-apps/xcmsdb: Version bump to 1.0.6

Signed-off-by: Matt Turner  gentoo.org>

 x11-apps/xcmsdb/Manifest|  1 +
 x11-apps/xcmsdb/xcmsdb-1.0.6.ebuild | 14 ++
 2 files changed, 15 insertions(+)

diff --git a/x11-apps/xcmsdb/Manifest b/x11-apps/xcmsdb/Manifest
index aff9d5a4f3fe..2bd9a10337e7 100644
--- a/x11-apps/xcmsdb/Manifest
+++ b/x11-apps/xcmsdb/Manifest
@@ -1 +1,2 @@
 DIST xcmsdb-1.0.5.tar.bz2 145419 BLAKE2B 
41269ca270e4b11838f54669900a074dfbbc7339af84db8638498e220eb7abac2fe055ca003dba326babf368d26137eabc0f0bae9f69233d9c91f7e727c3ba30
 SHA512 
e47bfce87d7531e7809c300e01120c3e8d6001130d9a6c9f6de5bc19651d8712d273a6f54452223bd8c4bff4612b5ecae8db45eddb022da945ed6e14c9c84ae4
+DIST xcmsdb-1.0.6.tar.xz 136708 BLAKE2B 
847a29251d781cf616a7b74abb9130da08d2dd56d42db61923c9e82848bff12ff7c5f8ba3c9635b2a572116bb19ce0637432ea9c6fdaf5b76d7f7ae8e176be64
 SHA512 
e47d9498ce496effbc44a66e70af91d9fe65c344a17916fd4990a4c84fa8879aa09b6695aeb6ef595f475c16a13c7c31d4c48449234564de7de38d7436764fae

diff --git a/x11-apps/xcmsdb/xcmsdb-1.0.6.ebuild 
b/x11-apps/xcmsdb/xcmsdb-1.0.6.ebuild
new file mode 100644
index ..bab254e72f70
--- /dev/null
+++ b/x11-apps/xcmsdb/xcmsdb-1.0.6.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="Device Color Characterization utility for X Color Management 
System"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+   x11-base/xorg-proto"



[gentoo-commits] repo/gentoo:master commit in: x11-drivers/xf86-input-synaptics/

2022-07-10 Thread Matt Turner
commit: 77f75a678af220426bfdb8b8bdd7c2fe0656aa3a
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Jul 11 04:38:26 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jul 11 04:57:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77f75a67

x11-drivers/xf86-input-synaptics: Version bump to 1.9.2

Signed-off-by: Matt Turner  gentoo.org>

 x11-drivers/xf86-input-synaptics/Manifest  |  1 +
 .../xf86-input-synaptics-1.9.2.ebuild  | 45 ++
 2 files changed, 46 insertions(+)

diff --git a/x11-drivers/xf86-input-synaptics/Manifest 
b/x11-drivers/xf86-input-synaptics/Manifest
index b641d390de6c..5c91759e59f0 100644
--- a/x11-drivers/xf86-input-synaptics/Manifest
+++ b/x11-drivers/xf86-input-synaptics/Manifest
@@ -1 +1,2 @@
 DIST xf86-input-synaptics-1.9.1.tar.bz2 503722 BLAKE2B 
5ff2f792d187ff0f3fabb1ee194f4eae1397d993627ef3a74b1c838cd611fc2834c6453b57d0dc27d7a6e0bc69b717eb1cb76c87833dd1c66b1af5ac824e1d55
 SHA512 
978eddd456aa7361047bc3d72e5127b24b13de29b0dddb6a0acc9f9da93931baa2b22fb5d1e6be164f629a11e5d97d753b835426435396b45b1af5eb8d546c3f
+DIST xf86-input-synaptics-1.9.2.tar.xz 432380 BLAKE2B 
7ba94565f454fff8ddaf33695a7a16526810bf2677ef01e9ae740fd00a95810b4d42fb0077fe93120ac72398ca18ade48c7b389ecbc37f2438beaa97a6a21db5
 SHA512 
6fd46505f22bba79f612fbd484818f7d874cc29caac71840744de27f1d224c68861e3a18d2a866b78178924d2f093f5260e27b221aa1fb17dbc09d66b649

diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.2.ebuild 
b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.2.ebuild
new file mode 100644
index ..780964e36af6
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+inherit linux-info xorg-3
+
+DESCRIPTION="Driver for Synaptics touchpads"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+   >=x11-base/xorg-server-1.14
+   x11-libs/libX11
+   >=x11-libs/libXi-1.2
+   >=x11-libs/libXtst-1.1.0
+   kernel_linux? ( >=dev-libs/libevdev-0.4 )"
+DEPEND="
+   ${RDEPEND}
+   >=sys-kernel/linux-headers-2.6.37
+   x11-base/xorg-proto"
+
+check_reqs() {
+   linux-info_pkg_setup
+
+   # Just a friendly warning
+   if ! linux_config_exists \
+   || ! linux_chkconfig_present INPUT_EVDEV; then
+   ewarn
+   ewarn "This driver requires event interface support in your 
kernel"
+   ewarn "  Device Drivers --->"
+   ewarn "Input device support --->"
+   ewarn "  <*> Event interface"
+   ewarn
+   fi
+}
+
+pkg_pretend() {
+   check_reqs
+}
+
+pkg_setup() {
+   check_reqs
+}



[gentoo-commits] repo/gentoo:master commit in: x11-apps/xpr/

2022-07-10 Thread Matt Turner
commit: d083311201aaf7a6b632dbb3e7cee22e0785cecc
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Jul 11 04:34:27 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jul 11 04:57:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0833112

x11-apps/xpr: Version bump to 1.1.0

Signed-off-by: Matt Turner  gentoo.org>

 x11-apps/xpr/Manifest |  1 +
 x11-apps/xpr/xpr-1.1.0.ebuild | 16 
 2 files changed, 17 insertions(+)

diff --git a/x11-apps/xpr/Manifest b/x11-apps/xpr/Manifest
index 211e8b2fa350..3ab52d4af715 100644
--- a/x11-apps/xpr/Manifest
+++ b/x11-apps/xpr/Manifest
@@ -1 +1,2 @@
 DIST xpr-1.0.5.tar.bz2 150714 BLAKE2B 
89d20134a3a9a12e319d343ae20c3aac71d1d2d2cbbffe1ff71375211efb3a4b22c2d99099fb1621fba838778702cca8c088181218c5d2c5fcb6af706d23b359
 SHA512 
d5dfb936ec4ad0067d02654dec8e862fe337ff6a2c2f974b2b3a612a829c2e728a0d51e7aba00ed2a94dc96dc50cc69f2c59f522e0635013f5f4f5bb3f4ab967
+DIST xpr-1.1.0.tar.xz 140244 BLAKE2B 
b3525415b18615abe489466965fa414ee343d0ea2ebbad4e75e943a0e19fc29cb2a2cce4fde07c345d84f2c53eeb47c0162719d7322a93ddacfa80452153f45b
 SHA512 
53eb896cf1844036a13b1018ffcecbc6a0a56eebe0d7cb6331dbe691207498d2c41f3791655b7fc081acfef2ed9904987f363b710bf0eeff6c8d33f819a951cb

diff --git a/x11-apps/xpr/xpr-1.1.0.ebuild b/x11-apps/xpr/xpr-1.1.0.ebuild
new file mode 100644
index ..ca37c48d598a
--- /dev/null
+++ b/x11-apps/xpr/xpr-1.1.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="X.Org xpr application"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+
+RDEPEND="
+   x11-libs/libX11
+   x11-libs/libXmu"
+DEPEND="${RDEPEND}
+   x11-base/xorg-proto"



[gentoo-commits] repo/gentoo:master commit in: x11-drivers/xf86-video-mga/

2022-07-10 Thread Matt Turner
commit: dcbc93ee67d450aa28d3e91ef7a463d03f7f64ec
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Jul 11 04:38:05 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jul 11 04:57:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcbc93ee

x11-drivers/xf86-video-mga: Version bump to 2.0.1

Signed-off-by: Matt Turner  gentoo.org>

 x11-drivers/xf86-video-mga/Manifest|  1 +
 x11-drivers/xf86-video-mga/xf86-video-mga-2.0.1.ebuild | 18 ++
 2 files changed, 19 insertions(+)

diff --git a/x11-drivers/xf86-video-mga/Manifest 
b/x11-drivers/xf86-video-mga/Manifest
index b65a64d5121f..8792c1659193 100644
--- a/x11-drivers/xf86-video-mga/Manifest
+++ b/x11-drivers/xf86-video-mga/Manifest
@@ -1 +1,2 @@
 DIST xf86-video-mga-2.0.0.tar.bz2 452486 BLAKE2B 
e3c0d3d6ee3c1651f96fa2353d94d5f9f19ebf97b121a87749fdb8ba6d8d3bf7066c39c454910a2b1ad9d7e3d44dd3c31bbd432490855df4676bd4fcdafe71c9
 SHA512 
b92006486aef815ff4399f291d610c65d88c0b32a9dae97658c644715ff62b221b01495b5c7a2311745e26f699c1c1f753b81c7bf54cf75567af9f78ac015540
+DIST xf86-video-mga-2.0.1.tar.xz 403212 BLAKE2B 
2d7f4422defb0b57fc7f9bb3c27274f51185eac45445f83f1c9bdba1bff3066f05728e9996f13f8cd2d8a7275602dfc5cef7435b54498700a8ce6efae568631c
 SHA512 
d9a0abedb71f3354788c2f91b770bc00c4118cfa2c99072dea82c28f025bc87bb88ebaf969962a8f0e97e1ff7938aebd9c682b730b0e07d5174dd9e8dc2cdfb6

diff --git a/x11-drivers/xf86-video-mga/xf86-video-mga-2.0.1.ebuild 
b/x11-drivers/xf86-video-mga/xf86-video-mga-2.0.1.ebuild
new file mode 100644
index ..25eaf396b06b
--- /dev/null
+++ b/x11-drivers/xf86-video-mga/xf86-video-mga-2.0.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="Matrox video driver"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~loong ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
+
+src_configure() {
+   local XORG_CONFIGURE_OPTIONS=(
+   --disable-dri
+   )
+   xorg-3_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: x11-apps/xclipboard/

2022-07-10 Thread Matt Turner
commit: ed6ba79ca155d6e6577fcc9866d2d0df9b93d1ef
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Jul 11 01:53:18 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jul 11 04:57:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed6ba79c

x11-apps/xclipboard: Version bump to 1.1.4

Signed-off-by: Matt Turner  gentoo.org>

 x11-apps/xclipboard/Manifest|  1 +
 x11-apps/xclipboard/xclipboard-1.1.4.ebuild | 20 
 2 files changed, 21 insertions(+)

diff --git a/x11-apps/xclipboard/Manifest b/x11-apps/xclipboard/Manifest
index 550b21d88124..36bbb234df53 100644
--- a/x11-apps/xclipboard/Manifest
+++ b/x11-apps/xclipboard/Manifest
@@ -1 +1,2 @@
 DIST xclipboard-1.1.3.tar.bz2 132406 BLAKE2B 
5e2e77a297c32884cadc4bf6e4503a958218b11083c747a575bb05dd8218fd0759edcab5c8d12055f5b0a1875e8a2cfb6b2062795580358521b619ecca8d70d8
 SHA512 
84a51d11851756422eb23e67b2721d2bcb2ac248fa32c0837423b6169144dff76717c22611ad3c93633e09a44dc70c847a2470d3988eff0b24d77e252a4e147e
+DIST xclipboard-1.1.4.tar.xz 128912 BLAKE2B 
f90906d3abb2de0915113d651d5bd4c4cf2a75c4b15c681a7609cd9aa46ce9d3157cdfa5f60ad76ce6a56396d51ae726645b1b43d53125161f362cc3520b6a66
 SHA512 
efa7800e0c4fb0242362c4263d80182d591bded07d1064a36b157b6202b15b0c82f083658ced2b82392eca905fb57c04a537d67e75c1237a1667ed2ce0cb09fe

diff --git a/x11-apps/xclipboard/xclipboard-1.1.4.ebuild 
b/x11-apps/xclipboard/xclipboard-1.1.4.ebuild
new file mode 100644
index ..81b3a6199fee
--- /dev/null
+++ b/x11-apps/xclipboard/xclipboard-1.1.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="interchange between cut buffer and selection"
+
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+   x11-libs/libXaw
+   x11-libs/libxkbfile
+   x11-libs/libXmu
+   >=x11-libs/libXt-1.1
+   x11-libs/libX11"
+DEPEND="${RDEPEND}
+   x11-base/xorg-proto"



[gentoo-commits] repo/gentoo:master commit in: x11-apps/xconsole/

2022-07-10 Thread Matt Turner
commit: e24166c09f178460378837f90f3af6a33b7888cf
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Jul 11 04:26:15 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jul 11 04:57:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e24166c0

x11-apps/xconsole: Version bump to 1.0.8

Signed-off-by: Matt Turner  gentoo.org>

 x11-apps/xconsole/Manifest  |  1 +
 x11-apps/xconsole/xconsole-1.0.8.ebuild | 19 +++
 2 files changed, 20 insertions(+)

diff --git a/x11-apps/xconsole/Manifest b/x11-apps/xconsole/Manifest
index d17c09368668..bf21b78850e6 100644
--- a/x11-apps/xconsole/Manifest
+++ b/x11-apps/xconsole/Manifest
@@ -1 +1,2 @@
 DIST xconsole-1.0.7.tar.bz2 134832 BLAKE2B 
20f9729d0aad2aceb1c7197b2ae45f65088dc39fb5980eb41a39935fb180ee7181c560ef180b0413b28adf36882a13fbdbd454d8b6dbb0cc06f69632f903b546
 SHA512 
89f391058ea99904587bd1dac9e31fa3ff06cf63b899abe6c06e4897bbc9919500dd4773873b1a452de4f54cc6999bd496022b6d8df9d4147804448abbdca2f9
+DIST xconsole-1.0.8.tar.xz 129336 BLAKE2B 
3c00072944594b02d5cbc88e8243198502a1a418e4f0c3e86badf659a62bada126323af1b21517368fd6a6204397714cb8769b7a1702fe9b8d884c057cc429ee
 SHA512 
93fd8527abed4faaf0f6a3804ab08dbcb926b0aaf67fd814c003b6b1102e2f643be5362a020c7028ae928925ffd423df6eb456d4ed48cf30a4c5f00a7ce648fa

diff --git a/x11-apps/xconsole/xconsole-1.0.8.ebuild 
b/x11-apps/xconsole/xconsole-1.0.8.ebuild
new file mode 100644
index ..50e7b833e274
--- /dev/null
+++ b/x11-apps/xconsole/xconsole-1.0.8.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="monitor system console messages with X"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+
+RDEPEND="
+   x11-libs/libXaw
+   x11-libs/libXmu
+   x11-libs/libXt
+   x11-libs/libX11"
+DEPEND="${RDEPEND}
+   x11-base/xorg-proto"



[gentoo-commits] repo/gentoo:master commit in: x11-apps/xmodmap/

2022-07-10 Thread Matt Turner
commit: 9bdff5f60daf2efa8bdb26c6195870ba34bf76dd
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Jul 11 04:33:14 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jul 11 04:57:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bdff5f6

x11-apps/xmodmap: Version bump to 1.0.11

Signed-off-by: Matt Turner  gentoo.org>

 x11-apps/xmodmap/Manifest  |  1 +
 x11-apps/xmodmap/xmodmap-1.0.11.ebuild | 15 +++
 2 files changed, 16 insertions(+)

diff --git a/x11-apps/xmodmap/Manifest b/x11-apps/xmodmap/Manifest
index 80cc1c7d37b0..4d68c0b6ed89 100644
--- a/x11-apps/xmodmap/Manifest
+++ b/x11-apps/xmodmap/Manifest
@@ -1 +1,2 @@
 DIST xmodmap-1.0.10.tar.bz2 145489 BLAKE2B 
503e72882a1d6d5c916cb60b898156adbdccc3e90bda85b161ac7a57ee607605331be73bd779603cfab1013d065e28f3165cce2ef50d71579330ab0361078a22
 SHA512 
324c7dcef843186088f16b3bc47485eb3c9b4331e56ce43b692deb4bb3d4f4f27512480e91a379cceac8383df920dc5e37cd825246b50b6343291cec48134c04
+DIST xmodmap-1.0.11.tar.xz 139532 BLAKE2B 
d50611e762b665b18c370ea49d981d7820f16e2e10450bbb2ebc76c867a3a4e75d68e7dacfb9e610849770afa95f4d757863953217aac8e13509b386bdb8131d
 SHA512 
a78f916f048d2017f079733becc99232c087c360ece61ec6c4fa4b5b130b96a1b10c4ce1b64a15bdcab7ea05de3c7f16035503d5be6f8ce1a7612ce71d558510

diff --git a/x11-apps/xmodmap/xmodmap-1.0.11.ebuild 
b/x11-apps/xmodmap/xmodmap-1.0.11.ebuild
new file mode 100644
index ..fecaca0bd58d
--- /dev/null
+++ b/x11-apps/xmodmap/xmodmap-1.0.11.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="utility for modifying keymaps and pointer button mappings in X"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris 
~x86-solaris"
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+   x11-base/xorg-proto"



[gentoo-commits] repo/gentoo:master commit in: x11-apps/xfontsel/

2022-07-10 Thread Matt Turner
commit: 420a913389ee7bd42b07b3c8041ad52c2e1e774d
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Jul 11 04:31:45 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jul 11 04:57:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=420a9133

x11-apps/xfontsel: Version bump to 1.1.0

Signed-off-by: Matt Turner  gentoo.org>

 x11-apps/xfontsel/Manifest  |  1 +
 x11-apps/xfontsel/xfontsel-1.1.0.ebuild | 19 +++
 2 files changed, 20 insertions(+)

diff --git a/x11-apps/xfontsel/Manifest b/x11-apps/xfontsel/Manifest
index f7dfea48a36b..0fd155a26825 100644
--- a/x11-apps/xfontsel/Manifest
+++ b/x11-apps/xfontsel/Manifest
@@ -1 +1,2 @@
 DIST xfontsel-1.0.6.tar.bz2 146469 BLAKE2B 
9773430e51e63d23086403f91fd78f6ed2e7f3abf144fda5bba171d05145026d233474e9d055b31bd498a861994c4f59af52a8101fc1e10b891ea879cb2f0bb9
 SHA512 
2f6bc51549a302404cdaf9a5a825add383953fcbb2a0c7076691cefd4dd7e4a3c772c047be74101c8486f75d03ce0bd3e65ede14e91732cf2a932810441c9099
+DIST xfontsel-1.1.0.tar.xz 139560 BLAKE2B 
e4cb8f25b64e1feb68cdf7ae7982c8e8e6086fb6ad31019b115986220cd9f347edbe738d8d43d0650fd783ef96d2e93a247e462611b0fb33a3aa0a6dc2d2529e
 SHA512 
be67d223668431c9b5dd2ef74032d2f087be5f8f0ccc427bc7ee43e7ce42214edddb07d8c3d6d6de93ea35314392d384f1ab1ae5c48b2cfbce418610e3945a52

diff --git a/x11-apps/xfontsel/xfontsel-1.1.0.ebuild 
b/x11-apps/xfontsel/xfontsel-1.1.0.ebuild
new file mode 100644
index ..af4791bf525b
--- /dev/null
+++ b/x11-apps/xfontsel/xfontsel-1.1.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="point and click selection of X11 font names"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+   x11-libs/libXaw
+   x11-libs/libXmu
+   x11-libs/libXt
+   x11-libs/libX11"
+DEPEND="${RDEPEND}
+   x11-base/xorg-proto"



[gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/

2022-07-10 Thread Thomas Beierlein
commit: 056a5cc4b08d5eed9fa324738ddb9824c8d9027f
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Mon Jul 11 04:51:30 2022 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Mon Jul 11 04:51:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=056a5cc4

net-wireless/uhd: Fix mismatched version in pkg-config file

Closes: https://bugs.gentoo.org/857489
Signed-off-by: Thomas Beierlein  gentoo.org>

 net-wireless/uhd/uhd-4.2.0.0.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-wireless/uhd/uhd-4.2.0.0.ebuild 
b/net-wireless/uhd/uhd-4.2.0.0.ebuild
index 9af0519e9afe..cc566523aad6 100644
--- a/net-wireless/uhd/uhd-4.2.0.0.ebuild
+++ b/net-wireless/uhd/uhd-4.2.0.0.ebuild
@@ -86,6 +86,7 @@ src_configure() {
-DENABLE_OCTOCLOCK="$(usex octoclock)"
-DPYTHON_EXECUTABLE="${PYTHON}"
-DPKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+   -DUHD_VERSION="${PV}"
)
cmake_src_configure
 }



[gentoo-commits] repo/gentoo:master commit in: net-mail/dovecot/

2022-07-10 Thread Eray Aslan
commit: 33894390c6b3e33c46ff367ae4f4bcf40c452be8
Author: Eray Aslan  gentoo  org>
AuthorDate: Mon Jul 11 04:28:17 2022 +
Commit: Eray Aslan  gentoo  org>
CommitDate: Mon Jul 11 04:29:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33894390

net-mail/dovecot: drop 2.3.18-r1, 2.3.19.1

Bug: https://bugs.gentoo.org/856733
Signed-off-by: Eray Aslan  gentoo.org>

 net-mail/dovecot/Manifest |   2 -
 net-mail/dovecot/dovecot-2.3.18-r1.ebuild | 307 --
 net-mail/dovecot/dovecot-2.3.19.1.ebuild  | 302 -
 3 files changed, 611 deletions(-)

diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 8f9ea6d6f337..eb64874e282d 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,4 +1,2 @@
-DIST dovecot-2.3-pigeonhole-0.5.18.tar.gz 1953892 BLAKE2B 
478da07a2f507a3322c6b6035f8cb74a720c030cc9413496f90a793d165178617207e26b0b57f710a9b9c7671be3fffdbaccaacb8747198abf82943dcb4a24df
 SHA512 
44c3d945a5aebb8935e6e46751e44f505f2abd529c31e3efb689d3b5b9cdf9bca4f5231fc42a8d19837cb95c7618f5b64dfdf5964f40a0a6987144a37cdbaaec
 DIST dovecot-2.3-pigeonhole-0.5.19.tar.gz 1954148 BLAKE2B 
0c52293f9447260f3e95f31c5ea3c04a1971b1a5621b56be1c79a8575aceb4f7e7fef62e7d0a3d980dcb5b8e1a8eeec543adcf0b016b65eb34ca4a26e8d2fe23
 SHA512 
5b0a61c7711232ea3651b818a970b500b05bd340a04bcd5a5f0ea0529eda65f498912a845c8f3b3b80196d010bc22bd4a380e1f682cb42f62b80d2d43a94993a
-DIST dovecot-2.3.18.tar.gz 7763230 BLAKE2B 
ff3e0c2cad87d2e2632345a25825eebd0a6c1520376d85286453bde7505f22410d03911cd588a0d102b75f22cc1de051b01c43a57c90138340186e8cb024247a
 SHA512 
b5eccf790a3960614876f122efb6296fe49ab7c523b08c10347fd4d10ed293fbd327279511c227b420f7c0786975186157eaa0fb5cd3aab1f3be9a4c5c3ad233
 DIST dovecot-2.3.19.1.tar.gz 7790851 BLAKE2B 
6826977a0febfcb56eb99baf6e0dc0a130fc24a14f113ca7ce0f72b26b8c9755d8352999c5965e21320a62621787e02428c99dd6888768e8c35a46e4082ba071
 SHA512 
ceb87a5f76b6352d28fd030aae5ad2165a133e9a8a6309891e793911203fc0ada9fb254dc05d183eaaa7e2b9851d3f1755b33f08fa6ff5b4b415ac4272bfe150

diff --git a/net-mail/dovecot/dovecot-2.3.18-r1.ebuild 
b/net-mail/dovecot/dovecot-2.3.18-r1.ebuild
deleted file mode 100644
index 1017a340f6a0..
--- a/net-mail/dovecot/dovecot-2.3.18-r1.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 lua5-3 )
-# do not add a ssl USE flag.  ssl is mandatory
-SSL_DEPS_SKIP=1
-inherit autotools flag-o-matic lua-single ssl-cert systemd toolchain-funcs
-
-MY_P="${P/_/.}"
-#MY_S="${PN}-ce-${PV}"
-major_minor="$(ver_cut 1-2)"
-sieve_version="0.5.18"
-if [[ ${PV} == *_rc* ]]; then
-   rc_dir="rc/"
-else
-   rc_dir=""
-fi
-SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-   sieve? (
-   
https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-   )
-   managesieve? (
-   
https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-   ) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="https://www.dovecot.org/;
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
~sparc x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
-IUSE_DOVECOT_COMPRESS="lz4 zstd"
-IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 lucene managesieve rpc
-   selinux sieve solr static-libs stemmer suid systemd tcpd textcat unwind"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-DEPEND="
-   app-arch/bzip2
-   app-arch/xz-utils
-   dev-libs/icu:=
-   dev-libs/openssl:0=
-   sys-libs/zlib:=
-   virtual/libiconv
-   argon2? ( dev-libs/libsodium:= )
-   caps? ( sys-libs/libcap )
-   kerberos? ( virtual/krb5 )
-   ldap? ( net-nds/openldap:= )
-   lua? ( ${LUA_DEPS} )
-   lucene? ( >=dev-cpp/clucene-2.3 )
-   lz4? ( app-arch/lz4 )
-   mysql? ( dev-db/mysql-connector-c:0= )
-   pam? ( sys-libs/pam:= )
-   postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
-   rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto )
-   selinux? ( sec-policy/selinux-dovecot )
-   solr? ( net-misc/curl dev-libs/expat )
-   sqlite? ( dev-db/sqlite:* )
-   stemmer? ( dev-libs/snowball-stemmer:= )
-   suid? ( acct-group/mail )
-   systemd? ( sys-apps/systemd:= )
-   tcpd? ( sys-apps/tcp-wrappers )
-   textcat? ( app-text/libexttextcat )
-   unwind? ( sys-libs/libunwind:= )
-   zstd? ( app-arch/zstd:= )
-   virtual/libcrypt:=
-   "
-
-RDEPEND="
-   ${DEPEND}
-   acct-group/dovecot
-   acct-group/dovenull
-   

[gentoo-commits] repo/gentoo:master commit in: eclass/

2022-07-10 Thread Mike Gilbert
commit: 382e9878e970dd776b5f4d1c09eb59eea711f079
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Jun 28 18:06:49 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Jul 11 04:25:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=382e9878

epatch.eclass: drop support for EAPI 0 to 4

Signed-off-by: Mike Gilbert  gentoo.org>

 eclass/epatch.eclass | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/epatch.eclass b/eclass/epatch.eclass
index 7c53e5fcf539..181cd8963e4f 100644
--- a/eclass/epatch.eclass
+++ b/eclass/epatch.eclass
@@ -4,7 +4,7 @@
 # @ECLASS: epatch.eclass
 # @MAINTAINER:
 # base-sys...@gentoo.org
-# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6
+# @SUPPORTED_EAPIS: 5 6
 # @BLURB: easy patch application functions
 # @DEPRECATED: eapply from EAPI 7
 # @DESCRIPTION:
@@ -13,11 +13,11 @@
 
 if [[ -z ${_EPATCH_ECLASS} ]]; then
 
-case ${EAPI:-0} in
-   0|1|2|3|4|5|6)
+case ${EAPI} in
+   5|6)
;;
*)
-   die "${ECLASS}: banned in EAPI=${EAPI}; use eapply* instead";;
+   die "${ECLASS}: EAPI ${EAPI:-0} not supported";;
 esac
 
 inherit estack



[gentoo-commits] repo/gentoo:master commit in: eclass/

2022-07-10 Thread Mike Gilbert
commit: 7ff843c2cd8011c61617c8307a25db994110d93d
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Jun 27 18:50:34 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Jul 11 04:25:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ff843c2

epatch.eclass: call ebegin to balance eend

Closes: https://bugs.gentoo.org/840963
Signed-off-by: Mike Gilbert  gentoo.org>

 eclass/epatch.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/epatch.eclass b/eclass/epatch.eclass
index 6a9c460da0a3..6d000419b032 100644
--- a/eclass/epatch.eclass
+++ b/eclass/epatch.eclass
@@ -236,12 +236,12 @@ epatch() {
 
if [[ ${SINGLE_PATCH} == "yes" ]] ; then
if [[ -n ${EPATCH_SINGLE_MSG} ]] ; then
-   einfo "${EPATCH_SINGLE_MSG}"
+   ebegin "${EPATCH_SINGLE_MSG}"
else
-   einfo "Applying ${patchname} ..."
+   ebegin "Applying ${patchname}"
fi
else
-   einfo "  ${patchname} ..."
+   ebegin "  ${patchname}"
fi
 
# Handle aliased patch command #404447 #461568



[gentoo-commits] repo/gentoo:master commit in: eclass/

2022-07-10 Thread Mike Gilbert
commit: 829c4c6851ae5d306a7655293b436f2f620e77c8
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Jun 28 18:04:50 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Jul 11 04:25:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=829c4c68

epatch.eclass: drop support for EPATCH_SINGLE_MSG

Signed-off-by: Mike Gilbert  gentoo.org>

 eclass/epatch.eclass | 10 +-
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/eclass/epatch.eclass b/eclass/epatch.eclass
index 6d000419b032..7c53e5fcf539 100644
--- a/eclass/epatch.eclass
+++ b/eclass/epatch.eclass
@@ -52,10 +52,6 @@ EPATCH_COMMON_OPTS="-g0 -E --no-backup-if-mismatch"
 # List of patches not to apply. Note this is only file names,
 # and not the full path.  Globs accepted.
 EPATCH_EXCLUDE=""
-# @VARIABLE: EPATCH_SINGLE_MSG
-# @DESCRIPTION:
-# Change the printed message for a single patch.
-EPATCH_SINGLE_MSG=""
 # @VARIABLE: EPATCH_MULTI_MSG
 # @DESCRIPTION:
 # Change the printed message for multiple patches.
@@ -235,11 +231,7 @@ epatch() {
fi
 
if [[ ${SINGLE_PATCH} == "yes" ]] ; then
-   if [[ -n ${EPATCH_SINGLE_MSG} ]] ; then
-   ebegin "${EPATCH_SINGLE_MSG}"
-   else
-   ebegin "Applying ${patchname}"
-   fi
+   ebegin "Applying ${patchname}"
else
ebegin "  ${patchname}"
fi



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacious/

2022-07-10 Thread Miroslav Šulc
commit: a5879a120058dc57b3f04757f59a1a5486d0d84e
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Jul 11 04:21:45 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Jul 11 04:21:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5879a12

media-sound/audacious: bump to 4.2

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/audacious/Manifest |  1 +
 media-sound/audacious/audacious-4.2.ebuild | 67 ++
 2 files changed, 68 insertions(+)

diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index ea1f38dbd787..2dd85f0b1725 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,3 +1,4 @@
 DIST audacious-4.0.5.tar.bz2 577422 BLAKE2B 
a65810baf0f733327a3e37e6efd2af3d35245b1e99936a4cd39d8068e0df06779ab3c08e839e4b3586f70bec2d16a605c62328f863f747247181851ac7c151c2
 SHA512 
4be7ebeee937f9b29931a28e1d80782b9df8beec70eab3917f5adccd0bf02aa6003a5b8361359b792edac2d2f31a257b853db43d59dd0674e5a3fbec7e7c1e46
 DIST audacious-4.1.tar.bz2 586472 BLAKE2B 
baed9f47ddca9b6a4668da542483e8ead049126383e8d1b090b29153b698cc83042ce0620bc5c3e78e59c599cb9f1be72b9c8d2e8c3c87f36fae45554a743b24
 SHA512 
6e603108c245a146c3bb360e99d85e949b25a50a4d97eca6a0519cb457a93e8d73131504ae10f86c34c0e9d98fb5fdf6660accc0bb3bb480332cb674ac27ac9f
+DIST audacious-4.2.tar.bz2 612155 BLAKE2B 
04a910288278fa27cb4848663ab74f9e523f3cbea7851e28f5e197035c4ad17281e9b0d5756602efb531a65aeb8e6b7abd7b11274af3353f6ac1d21a0bd4c47c
 SHA512 
814bd865e87cf9bc39df07c9f9898eca1dd94d8b8299b2709f77046669ce12e9c31067d55084371f6797724e79872f7571b575cc766093ee2124b38b0409a853
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 BLAKE2B 
d3bf8dbfee675dd588bc0258f1015c76877b6b0a3835813d8e9621d149b924aaa33544d07f7ad44a01c058d41d7480b3908b0773c124af33b6e020c376b13d54
 SHA512 
e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05

diff --git a/media-sound/audacious/audacious-4.2.ebuild 
b/media-sound/audacious/audacious-4.2.ebuild
new file mode 100644
index ..816e06f4a4ea
--- /dev/null
+++ b/media-sound/audacious/audacious-4.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${P/_/-}"
+
+inherit xdg
+
+DESCRIPTION="Lightweight and versatile audio player"
+HOMEPAGE="https://audacious-media-player.org/;
+SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2;
+SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+KEYWORDS="~amd64 ~riscv ~x86"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="nls"
+
+BDEPEND="
+   virtual/pkgconfig
+   nls? ( dev-util/intltool )
+"
+DEPEND="
+   dev-libs/glib:2
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   virtual/freedesktop-icon-theme
+"
+RDEPEND="${DEPEND}"
+PDEPEND="~media-plugins/audacious-plugins-${PV}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+   default
+   if ! use nls; then
+   sed -e "/SUBDIRS/s/ po//" -i Makefile || die "failed to sed" # 
bug #512698
+   fi
+}
+
+src_configure() {
+   # D-Bus is a mandatory dependency, remote control,
+   # session management and some plugins depend on this.
+   # Building without D-Bus is *unsupported* and a USE-flag
+   # will not be added due to the bug reports that will result.
+   # Bugs #197894, #199069, #207330, #208606
+   local myeconfargs=(
+   --disable-valgrind
+   --disable-gtk
+   --enable-dbus
+   --enable-qt
+   $(use_enable nls)
+   )
+   econf "${myeconfargs[@]}"
+}
+
+src_install() {
+   default
+
+   # Gentoo_ice skin installation; bug #109772
+   insinto /usr/share/audacious/Skins/gentoo_ice
+   doins -r "${WORKDIR}"/gentoo_ice/.
+   docinto gentoo_ice
+   dodoc "${WORKDIR}"/README
+}



[gentoo-commits] repo/gentoo:master commit in: media-plugins/audacious-plugins/

2022-07-10 Thread Miroslav Šulc
commit: 12796e41e736f1ae388dc7ed6603079bd95422fb
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Jul 11 04:22:07 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Jul 11 04:22:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12796e41

media-plugins/audacious-plugins: bump to 4.2

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-plugins/audacious-plugins/Manifest   |   1 +
 .../audacious-plugins/audacious-plugins-4.2.ebuild | 162 +
 2 files changed, 163 insertions(+)

diff --git a/media-plugins/audacious-plugins/Manifest 
b/media-plugins/audacious-plugins/Manifest
index 5af822e4c403..0b49f6704c23 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,2 +1,3 @@
 DIST audacious-plugins-4.0.5.tar.bz2 1759133 BLAKE2B 
b806ac110875f94f6e0f1db757d2ec0c7a0391f83efeb068f3e79c7e994fa33d0045095669b5e7ec771714419aaa98b0d0125a5dd18a00f4ee23fc899142858f
 SHA512 
90ab2edbfc797fa835aae9937b5f478a0ca575f31c443d9e8ba7394e1615f605beb417372872874c94d4f804dba7bea9fbae2078e162178386683d8a3e36c108
 DIST audacious-plugins-4.1.tar.bz2 1802825 BLAKE2B 
253fddf82408708d8094836088bec1b9b7c932e75c959443579e4bbdc3a4b850757328d90b1ab7a6a0bdd85120d4b0a901f9fa22638f90938f19fd0fa35012ba
 SHA512 
4adad3b4e9c264d52c6523fe84db56b9a87476a4ad5a86f85456a7e0276758d61675022e9e3da07e061dac45f604e54f83f9db85a37f0aaf0b75b3356a63932f
+DIST audacious-plugins-4.2.tar.bz2 1947472 BLAKE2B 
405fe7d30f190590955e66540595059869aed920b5cbaffa84439a336b20e6016c704dd3d3775521bde5c3bef0954aae96d72587d6c383966d63dd955b7a6b4a
 SHA512 
632f1ac90c3a079bb92120e4bc6ef6b13f3f809f150809a64569fae49c908dafeb30e16a34d18bb081e099fe2a252a7ed8b76da129ffa0d51b16216f0b6d1282

diff --git a/media-plugins/audacious-plugins/audacious-plugins-4.2.ebuild 
b/media-plugins/audacious-plugins/audacious-plugins-4.2.ebuild
new file mode 100644
index ..23633544524d
--- /dev/null
+++ b/media-plugins/audacious-plugins/audacious-plugins-4.2.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Lightweight and versatile audio player"
+HOMEPAGE="https://audacious-media-player.org/;
+SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2;
+
+KEYWORDS="~amd64 ~riscv ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="
+   aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack
+   openmpt lame libnotify libsamplerate lirc mms modplug mp3 nls opengl
+   pulseaudio scrobbler sdl sid sndfile soxr speedpitch streamtuner vorbis
+   wavpack
+"
+
+REQUIRED_USE="ampache? ( http ) streamtuner? ( http )"
+
+# The following plugins REQUIRE a GUI build of audacious, because non-GUI
+# builds do NOT install the libaudgui library & headers.
+# Plugins without a configure option:
+#   alarm
+#   albumart
+#   delete-files
+#   ladspa
+#   playlist-manager
+#   search-tool
+#   skins
+#   vtx
+# Plugins with a configure option:
+#   glspectrum
+#   gtkui
+#   hotkey
+#   notify
+#   statusicon
+BDEPEND="
+   dev-util/gdbus-codegen
+   virtual/pkgconfig
+   nls? ( dev-util/intltool )
+"
+DEPEND="
+   app-arch/unzip
+   dev-libs/glib:2
+   dev-libs/libxml2:2
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtmultimedia:5
+   dev-qt/qtwidgets:5
+   ~media-sound/audacious-${PV}
+   sys-libs/zlib
+   x11-libs/gdk-pixbuf:2
+   aac? ( >=media-libs/faad2-2.7 )
+   alsa? ( >=media-libs/alsa-lib-1.0.16 )
+   ampache? ( =media-libs/ampache_browser-1* )
+   bs2b? ( media-libs/libbs2b )
+   cdda? (
+   dev-libs/libcdio:=
+   dev-libs/libcdio-paranoia:=
+   >=media-libs/libcddb-1.2.1
+   )
+   cue? ( media-libs/libcue:= )
+   ffmpeg? ( >=media-video/ffmpeg-0.7.3 )
+   flac? (
+   >=media-libs/flac-1.2.1-r1
+   >=media-libs/libvorbis-1.0
+   )
+   fluidsynth? ( media-sound/fluidsynth:= )
+   http? ( >=net-libs/neon-0.26.4 )
+   jack? (
+   >=media-libs/bio2jack-0.4
+   virtual/jack
+   )
+   lame? ( media-sound/lame )
+   libnotify? ( x11-libs/libnotify )
+   openmpt? ( media-libs/libopenmpt )
+   libsamplerate? ( media-libs/libsamplerate:= )
+   lirc? ( app-misc/lirc )
+   mms? ( >=media-libs/libmms-0.3 )
+   modplug? ( media-libs/libmodplug )
+   mp3? ( >=media-sound/mpg123-1.12.1 )
+   opengl? ( dev-qt/qtopengl:5 )
+   pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
+   scrobbler? ( net-misc/curl )
+   sdl? ( media-libs/libsdl2[sound] )
+   sid? ( >=media-libs/libsidplayfp-1.0.0 )
+   sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
+   soxr? ( media-libs/soxr )
+   speedpitch? ( media-libs/libsamplerate:= )
+   streamtuner? ( dev-qt/qtnetwork:5 )
+   vorbis? (
+  

[gentoo-commits] repo/gentoo:master commit in: media-sound/fluidsynth/

2022-07-10 Thread Miroslav Šulc
commit: cd4fc9a8a71637ac7c3558e43a43fee864ac5e21
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Jul 11 04:11:11 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Jul 11 04:11:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd4fc9a8

media-sound/fluidsynth: bump to 2.2.8

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/fluidsynth/Manifest|   1 +
 media-sound/fluidsynth/fluidsynth-2.2.8.ebuild | 120 +
 2 files changed, 121 insertions(+)

diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index c0e16a46a6e3..7eb8fb6aa4c0 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1 +1,2 @@
 DIST fluidsynth-2.2.7.tar.gz 1748897 BLAKE2B 
fd53603947ddf5a76676cfc3d77b1d904146ec7c30ab6e54a2c32cae0e76ec4b66397506072cac277febdd1b799801d5b13c7b37cc0ea4a545fae26077a1d881
 SHA512 
62709f96fa07bbafb9b907438da7376abdf1a4e679cd2b105c5bca257f1ff62c18bd4c646ef2ccba64ca5273604da996fb2caaf6144686bf45fef1ed83a7
+DIST fluidsynth-2.2.8.tar.gz 1751615 BLAKE2B 
7eaee4cc1c2f49e464cda2852890ec8e96bd86c258a39246ec5c84ea3e57c9869d1e88963daecc3fa8957df1d55ff6c6633a4900de3d6fc0a1adf830865adda0
 SHA512 
8173f2d368a214cf1eb7faae2f6326db43fb094ec9c83e652f953290c3f29c34ebd0b92cbb439bea8d814d3a7e4f9dc0c18c648df1d414989d5d8b4700c79535

diff --git a/media-sound/fluidsynth/fluidsynth-2.2.8.ebuild 
b/media-sound/fluidsynth/fluidsynth-2.2.8.ebuild
new file mode 100644
index ..51908c546139
--- /dev/null
+++ b/media-sound/fluidsynth/fluidsynth-2.2.8.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib systemd toolchain-funcs
+
+DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 
specifications"
+HOMEPAGE="https://www.fluidsynth.org;
+SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio 
pulseaudio +readline sdl +sndfile systemd threads"
+
+BDEPEND="
+   virtual/pkgconfig
+"
+DEPEND="
+   dev-libs/glib:2[${MULTILIB_USEDEP}]
+   alsa? (
+   media-libs/alsa-lib[${MULTILIB_USEDEP}]
+   lash? ( media-sound/lash[${MULTILIB_USEDEP}] )
+   )
+   dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+   jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+   ladspa? (
+   media-libs/ladspa-sdk[${MULTILIB_USEDEP}]
+   media-plugins/cmt-plugins[${MULTILIB_USEDEP}]
+   )
+   portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
+   pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+   readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+   sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
+   sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog README.md THANKS TODO doc/fluidsynth-v20-devdoc.txt )
+
+src_configure() {
+   local mycmakeargs=(
+   -DCMAKE_C_COMPILER="$(tc-getCC)"
+   -Denable-alsa=$(usex alsa)
+   -Denable-aufile=ON
+   -Denable-dbus=$(usex dbus)
+   -Denable-debug=$(usex debug)
+   -Denable-dsound=OFF # Windows
+   -Denable-floats=OFF # loat instead of double for DSP samples
+   -Denable-fpe-check=$(usex debug)
+   -Denable-ipv6=$(usex ipv6)
+   -Denable-jack=$(usex jack)
+   -Denable-ladspa=$(usex ladspa)
+   -Denable-libinstpatch=ON # https://github.com/swami/libinstpatch
+   -Denable-midishare=OFF # http://midishare.sourceforge.net/
+   -Denable-network=$(usex network)
+   -Denable-opensles=OFF
+   -Denable-oboe=OFF # requires OpenSLES and/or AAudio
+   -Denable-oss=$(usex oss)
+   -Denable-libsndfile=$(usex sndfile)
+   -Denable-pkgconfig=ON
+   -Denable-portaudio=$(usex portaudio)
+   -Denable-profiling=$(usex debug)
+   -Denable-pulseaudio=$(usex pulseaudio)
+   -Denable-readline=$(usex readline)
+   -Denable-sdl2=$(usex sdl)
+   -Denable-systemd=$(usex systemd)
+   -Denable-threads=$(usex threads)
+   -Denable-trap-on-fpe=$(usex debug)
+   -Denable-ubsan=OFF # compile and link against UBSan (for 
debugging fluidsynth internals)
+   -Denable-waveout=OFF # Windows
+   -Denable-winmidi=OFF # Windows
+   )
+
+   if use alsa; then
+   mycmakeargs+=( -Denable-lash=$(usex lash) )
+   else
+   mycmakeargs+=( -Denable-lash=OFF )
+   fi
+
+   if use systemd; then

[gentoo-commits] repo/gentoo:master commit in: eclass/

2022-07-10 Thread Mike Gilbert
commit: b8d4c6c6f7715711e68ea83cffaa208cc70dd7ed
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Jul 11 04:08:41 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Jul 11 04:08:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8d4c6c6

java-utils-2.eclass: drop pointless eend call

Closes: https://bugs.gentoo.org/842675
Signed-off-by: Mike Gilbert  gentoo.org>

 eclass/java-utils-2.eclass | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index 6576712e0104..4f50ce39c5dc 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -316,7 +316,6 @@ java-pkg_rm_files() {
[[ ! -f "${filename}" ]] && die "${filename} is not a regular 
file. Aborting."
einfo "Removing unneeded file ${filename}"
rm -f "${S}/${filename}" || die "cannot remove ${filename}"
-   eend $?
done
 }
 



[gentoo-commits] proj/portage:master commit in: lib/portage/xml/

2022-07-10 Thread Brian Dolbec
commit: b67c57cc2e0a17b8e6454dc316c59e8736582894
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon Jul 11 01:49:01 2022 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Mon Jul 11 03:59:02 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=b67c57cc

xml.metadata.py: Fix gentoolkit traceback in _Useflag class

brian@storm ~/Dev/git/gentoolkit $ equery u smartmontools
Traceback (most recent call last):
  File "/home/brian/Dev/git/gentoolkit/bin/equery", line 44, in 
equery.main(sys.argv)
  File "/home/brian/Dev/git/gentoolkit/pym/gentoolkit/equery/__init__.py", line 
359, in main
loaded_module.main(module_args)
  File "/home/brian/Dev/git/gentoolkit/pym/gentoolkit/equery/uses.py", line 
341, in main
output = get_output_descriptions(pkg, global_usedesc)
  File "/home/brian/Dev/git/gentoolkit/pym/gentoolkit/equery/uses.py", line 
201, in get_output_descriptions
local_usedesc = pkg.metadata.use()
  File "/usr/lib/python3.10/site-packages/portage/xml/metadata.py", line 337, 
in use
self._useflags = tuple(_Useflag(node) for node in iterate("flag"))
  File "/usr/lib/python3.10/site-packages/portage/xml/metadata.py", line 337, 
in 
self._useflags = tuple(_Useflag(node) for node in iterate("flag"))
  File "/usr/lib/python3.10/site-packages/portage/xml/metadata.py", line 109, 
in __init__
for child in node.getchildren():
AttributeError: 'xml.etree.ElementTree.Element' object has no attribute 
'getchildren'

Reported by: IRC user kurly

gentoolkit code class used node.iter()
Found another commmit where getchidren was deprecated and replaced.

Bug:https://bugs.gentoo.org/857537
Signed-off-by: Brian Dolbec  gentoo.org>

 lib/portage/xml/metadata.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/portage/xml/metadata.py b/lib/portage/xml/metadata.py
index 807847d7e..672f64358 100644
--- a/lib/portage/xml/metadata.py
+++ b/lib/portage/xml/metadata.py
@@ -106,7 +106,7 @@ class _Useflag:
 _desc = ""
 if node.text:
 _desc = node.text
-for child in node.getchildren():
+for child in node.iter():
 _desc += child.text if child.text else ""
 _desc += child.tail if child.tail else ""
 # This takes care of tabs and newlines left from the file



[gentoo-commits] repo/gentoo:master commit in: dev-db/oracle-instantclient/

2022-07-10 Thread Mike Gilbert
commit: 52430dfebf6ceb5140070f672a02bc4c5385c777
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Jul 11 04:05:12 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Jul 11 04:05:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52430dfe

dev-db/oracle-instantclient: call ebegin to balance eend

Closes: https://bugs.gentoo.org/842084
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-db/oracle-instantclient/oracle-instantclient-18.5.0.0.ebuild| 6 +++---
 dev-db/oracle-instantclient/oracle-instantclient-19.11.0.0.0.ebuild | 6 +++---
 dev-db/oracle-instantclient/oracle-instantclient-21.3.0.0.0.ebuild  | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dev-db/oracle-instantclient/oracle-instantclient-18.5.0.0.ebuild 
b/dev-db/oracle-instantclient/oracle-instantclient-18.5.0.0.ebuild
index 8fdee3830931..4bbd5242c42e 100644
--- a/dev-db/oracle-instantclient/oracle-instantclient-18.5.0.0.ebuild
+++ b/dev-db/oracle-instantclient/oracle-instantclient-18.5.0.0.ebuild
@@ -186,7 +186,7 @@ src_install() {
elog "Skipping unsupported ABI ${ABI}."
continue
fi
-   einfo "Installing runtime for ${MY_PLAT} ..."
+   ebegin "Installing runtime for ${MY_PLAT}"
 
cd "${MY_S}" || die
 
@@ -250,7 +250,7 @@ src_install() {
# doins precomp/admin/pcbcfg.cfg
fi
if use sdk; then
-   einfo "Installing SDK ..."
+   ebegin "Installing SDK"
DOCS+=( SDK_README )
scripts+=( sdk/ott )
insinto "${oracle_home}"/$(get_libdir)
@@ -285,7 +285,7 @@ src_install() {
paxbins+=( exp expdp imp impdp sqlldr wrc )
fi
 
-   einfo "Installing binaries for ${MY_PLAT} ..."
+   ebegin "Installing binaries for ${MY_PLAT}"
into "${oracle_home}"
dobin ${paxbins[*]} ${scripts[*]}
pushd "${ED}${oracle_home}/bin" >/dev/null || die

diff --git 
a/dev-db/oracle-instantclient/oracle-instantclient-19.11.0.0.0.ebuild 
b/dev-db/oracle-instantclient/oracle-instantclient-19.11.0.0.0.ebuild
index e3821520fedb..cef395201617 100644
--- a/dev-db/oracle-instantclient/oracle-instantclient-19.11.0.0.0.ebuild
+++ b/dev-db/oracle-instantclient/oracle-instantclient-19.11.0.0.0.ebuild
@@ -160,7 +160,7 @@ src_install() {
elog "Skipping unsupported ABI ${ABI}."
continue
fi
-   einfo "Installing runtime for ${MY_PLAT} ..."
+   ebegin "Installing runtime for ${MY_PLAT}"
 
cd "${MY_S}" || die
 
@@ -224,7 +224,7 @@ src_install() {
# doins precomp/admin/pcbcfg.cfg
fi
if use sdk; then
-   einfo "Installing SDK ..."
+   ebegin "Installing SDK"
DOCS+=( SDK_README )
scripts+=( sdk/ott )
insinto "${oracle_home}"/$(get_libdir)
@@ -259,7 +259,7 @@ src_install() {
paxbins+=( exp expdp imp impdp sqlldr wrc )
fi
 
-   einfo "Installing binaries for ${MY_PLAT} ..."
+   ebegin "Installing binaries for ${MY_PLAT}"
into "${oracle_home}"
dobin ${paxbins[*]} ${scripts[*]}
pushd "${ED}${oracle_home}/bin" >/dev/null || die

diff --git a/dev-db/oracle-instantclient/oracle-instantclient-21.3.0.0.0.ebuild 
b/dev-db/oracle-instantclient/oracle-instantclient-21.3.0.0.0.ebuild
index 33507719659a..aed8a1a49856 100644
--- a/dev-db/oracle-instantclient/oracle-instantclient-21.3.0.0.0.ebuild
+++ b/dev-db/oracle-instantclient/oracle-instantclient-21.3.0.0.0.ebuild
@@ -158,7 +158,7 @@ src_install() {
elog "Skipping unsupported ABI ${ABI}."
continue
fi
-   einfo "Installing runtime for ${MY_PLAT} ..."
+   ebegin "Installing runtime for ${MY_PLAT}"
 
cd "${MY_S}" || die
 
@@ -222,7 +222,7 @@ src_install() {
# doins precomp/admin/pcbcfg.cfg
fi
if use sdk; then
-   einfo "Installing SDK ..."
+   ebegin "Installing SDK"
DOCS+=( SDK_README )
scripts+=( sdk/ott )
insinto "${oracle_home}"/$(get_libdir)
@@ -257,7 +257,7 @@ src_install() {
paxbins+=( exp expdp imp impdp sqlldr wrc )
fi
 
-   einfo "Installing binaries for ${MY_PLAT} ..."
+   ebegin "Installing binaries for ${MY_PLAT}"
into "${oracle_home}"
dobin ${paxbins[*]} ${scripts[*]}
pushd "${ED}${oracle_home}/bin" >/dev/null || die



[gentoo-commits] repo/gentoo:master commit in: app-editors/pyvim/

2022-07-10 Thread Mike Gilbert
commit: ebc42648d10790326106e519a565a548aadc143a
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Jul 11 04:00:18 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Jul 11 04:00:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebc42648

app-editors/pyvim: call ebegin to balance eend

Closes: https://bugs.gentoo.org/841473
Signed-off-by: Mike Gilbert  gentoo.org>

 app-editors/pyvim/pyvim-3.0.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-editors/pyvim/pyvim-3.0.2.ebuild 
b/app-editors/pyvim/pyvim-3.0.2.ebuild
index f91be2260e41..14ad9912d076 100644
--- a/app-editors/pyvim/pyvim-3.0.2.ebuild
+++ b/app-editors/pyvim/pyvim-3.0.2.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
@@ -26,7 +26,7 @@ RDEPEND="
 "
 
 eselect_vi_update() {
-   einfo "Calling eselect vi update..."
+   ebegin "Calling eselect vi update"
eselect vi update --if-unset
eend $?
 }



[gentoo-commits] repo/gentoo:master commit in: dev-libs/libfmt/

2022-07-10 Thread Sam James
commit: 47c3ecd1cead17f2235e2f449dbb51019407370d
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 03:36:13 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 03:36:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47c3ecd1

dev-libs/libfmt: Stabilize 8.0.1-r1 arm64, #857531

Signed-off-by: Sam James  gentoo.org>

 dev-libs/libfmt/libfmt-8.0.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/libfmt/libfmt-8.0.1-r1.ebuild 
b/dev-libs/libfmt/libfmt-8.0.1-r1.ebuild
index 948238a60b6e..20ccc1a04e52 100644
--- a/dev-libs/libfmt/libfmt-8.0.1-r1.ebuild
+++ b/dev-libs/libfmt/libfmt-8.0.1-r1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
 else
SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv x86"
+   KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
S="${WORKDIR}/fmt-${PV}"
 fi
 



[gentoo-commits] repo/gentoo:master commit in: app-editors/texworks/

2022-07-10 Thread Sam James
commit: 08e0614804a8fdd24c86686281d33bd274d90dc3
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 03:35:48 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 03:35:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08e06148

app-editors/texworks: Stabilize 0.6.7 x86, #857543

Signed-off-by: Sam James  gentoo.org>

 app-editors/texworks/texworks-0.6.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/texworks/texworks-0.6.7.ebuild 
b/app-editors/texworks/texworks-0.6.7.ebuild
index 237789b21279..09d49dd99a5a 100644
--- a/app-editors/texworks/texworks-0.6.7.ebuild
+++ b/app-editors/texworks/texworks-0.6.7.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${PN}-release-${PV}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="lua python"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: app-editors/texworks/

2022-07-10 Thread Sam James
commit: 8a931c280e1a6f7295071d5028c026961bf0f0c0
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 03:35:32 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 03:35:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a931c28

app-editors/texworks: Stabilize 0.6.7 amd64, #857543

Signed-off-by: Sam James  gentoo.org>

 app-editors/texworks/texworks-0.6.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/texworks/texworks-0.6.7.ebuild 
b/app-editors/texworks/texworks-0.6.7.ebuild
index c0305cb4055c..237789b21279 100644
--- a/app-editors/texworks/texworks-0.6.7.ebuild
+++ b/app-editors/texworks/texworks-0.6.7.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${PN}-release-${PV}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 IUSE="lua python"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/

2022-07-10 Thread Sam James
commit: 62addd648bb30fe31d65ec87d7874216361d0f4a
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 03:27:14 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 03:27:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62addd64

media-video/mpv: fix sdl2

Closes: https://bugs.gentoo.org/857156
Signed-off-by: Sam James  gentoo.org>

 media-video/mpv/mpv-.ebuild | 4 
 1 file changed, 4 insertions(+)

diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index 0958d7c9fee9..6b7b10dfecd8 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.ebuild
@@ -187,6 +187,10 @@ src_configure() {
 
-Dlibavdevice=enabled
 
+   # Needed for either of the more specific audio or video options
+   # bug #857156
+   $(meson_feature sdl sdl2)
+
# Audio outputs:
$(meson_feature sdl sdl2-audio)
$(meson_feature pulseaudio pulse)



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libselinux/

2022-07-10 Thread Sam James
commit: 83fa98cc905788f2aaa42c8d3dc167f503acc674
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 03:19:54 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 03:19:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83fa98cc

sys-libs/libselinux: drop ruby25

Signed-off-by: Sam James  gentoo.org>

 sys-libs/libselinux/libselinux-3.3.ebuild | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/sys-libs/libselinux/libselinux-3.3.ebuild 
b/sys-libs/libselinux/libselinux-3.3.ebuild
index 8cb65e1d9e80..7273d65108be 100644
--- a/sys-libs/libselinux/libselinux-3.3.ebuild
+++ b/sys-libs/libselinux/libselinux-3.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 PYTHON_COMPAT=( python3_{7..10} )
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27"
 
 # No, I am not calling ruby-ng
 inherit python-r1 toolchain-funcs multilib-minimal
@@ -26,7 +26,7 @@ fi
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="pcre2 python ruby static-libs ruby_targets_ruby25 ruby_targets_ruby26 
ruby_targets_ruby27"
+IUSE="pcre2 python ruby static-libs ruby_targets_ruby26 ruby_targets_ruby27"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}]
@@ -34,7 +34,6 @@ RDEPEND=">=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}]
pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] )
python? ( ${PYTHON_DEPS} )
ruby? (
-   ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
)



[gentoo-commits] repo/gentoo:master commit in: net-mail/swaks/

2022-07-10 Thread Sam James
commit: 7f8930c49e657967d2239f3f0aefc6db65d60c9d
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 03:07:38 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 03:07:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f8930c4

net-mail/swaks: fix UnusedInherits

Signed-off-by: Sam James  gentoo.org>

 net-mail/swaks/swaks-20201014.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-mail/swaks/swaks-20201014.0.ebuild 
b/net-mail/swaks/swaks-20201014.0.ebuild
index 775eba5c9230..488f56a7a9e9 100644
--- a/net-mail/swaks/swaks-20201014.0.ebuild
+++ b/net-mail/swaks/swaks-20201014.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit optfeature perl-functions
+inherit optfeature
 
 DESCRIPTION="Swiss Army Knife SMTP; Command line SMTP testing, including TLS 
and AUTH"
 HOMEPAGE="https://www.jetmore.org/john/code/swaks/



[gentoo-commits] repo/gentoo:master commit in: net-misc/iputils/

2022-07-10 Thread Sam James
commit: 50bf0f2e017f7efff02701b707e116677654128c
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 03:05:59 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 03:05:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50bf0f2e

net-misc/iputils: fix UnusedInherits

Signed-off-by: Sam James  gentoo.org>

 net-misc/iputils/iputils-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/iputils/iputils-.ebuild 
b/net-misc/iputils/iputils-.ebuild
index 9022c8970b5d..6e435f7605da 100644
--- a/net-misc/iputils/iputils-.ebuild
+++ b/net-misc/iputils/iputils-.ebuild
@@ -12,7 +12,7 @@ EAPI="7"
 
 PLOCALES="de fr ja pt_BR tr uk zh_CN"
 
-inherit fcaps flag-o-matic meson plocale systemd toolchain-funcs
+inherit fcaps meson plocale systemd toolchain-funcs
 
 if [[ ${PV} ==  ]] ; then
EGIT_REPO_URI="https://github.com/iputils/iputils.git;



[gentoo-commits] repo/gentoo:master commit in: profiles/arch/amd64/x32/

2022-07-10 Thread Sam James
commit: cb6e28aeee17ccdcf18002804fc7da3ac596a5c8
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 02:58:56 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 02:58:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb6e28ae

profiles/arch/amd64/x32: mask app-metrics/ceph_exporter on x32

ceph_exporter -> ceph -> nodejs

Signed-off-by: Sam James  gentoo.org>

 profiles/arch/amd64/x32/package.mask | 1 +
 1 file changed, 1 insertion(+)

diff --git a/profiles/arch/amd64/x32/package.mask 
b/profiles/arch/amd64/x32/package.mask
index cd290cb6075e..13d3e606a289 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -143,6 +143,7 @@ dev-libs/amdgpu-pro-opencl
 # Patrick McLean  (2018-07-12)
 # requires nodejs
 >=sys-cluster/ceph-13
+app-metrics/ceph_exporter
 
 # Michał Górny  (2018-04-15)
 # Broken multilib dependencies.



[gentoo-commits] repo/gentoo:master commit in: net-fs/netatalk/

2022-07-10 Thread Sam James
commit: 9e93c38e2b88d5885668d7ac4150c7d320dddb97
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 03:09:00 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 03:09:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e93c38e

net-fs/netatalk: fix UnusedInherits

Signed-off-by: Sam James  gentoo.org>

 net-fs/netatalk/netatalk-3.1.12-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/netatalk/netatalk-3.1.12-r7.ebuild 
b/net-fs/netatalk/netatalk-3.1.12-r7.ebuild
index 88e38a3b10b2..5033147b7faf 100644
--- a/net-fs/netatalk/netatalk-3.1.12-r7.ebuild
+++ b/net-fs/netatalk/netatalk-3.1.12-r7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic multilib pam systemd
+inherit autotools flag-o-matic pam systemd
 
 DESCRIPTION="Open Source AFP server"
 HOMEPAGE="https://netatalk.sourceforge.net/;



[gentoo-commits] repo/gentoo:master commit in: net-print/cups/, net-print/cups/files/

2022-07-10 Thread Sam James
commit: 35ad85b847cedb28ab1c2fcd6dbc77ad9c8de75b
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 03:02:02 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 03:02:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35ad85b8

net-print/cups: drop 2.4.1

Signed-off-by: Sam James  gentoo.org>

 net-print/cups/Manifest|   1 -
 net-print/cups/cups-2.4.1.ebuild   | 320 --
 .../files/0001-Fix-some-web-interface-issues.patch | 667 -
 .../cups/files/0001-Footer-message-corrected.patch |  89 ---
 .../files/0001-cups-fix-uninit-value-jump.patch|  18 -
 ...ps-tls-gnutls.c-Use-always-GNUTLS_SHUT_WR.patch |  55 --
 .../files/cups-2.0.1-xinetd-installation-fix.patch |   9 -
 .../cups-2.0.2-rename-systemd-service-files.patch  |  46 --
 net-print/cups/files/cups-2.3.3-no-libtool.patch   |  25 -
 net-print/cups/files/cups-2.4.1-resolve-uri.patch  |  31 -
 10 files changed, 1261 deletions(-)

diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 70e6ff821ff8..9f36a740c252 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,3 +1,2 @@
 DIST cups-2.3.3op2-source.tar.gz 7993205 BLAKE2B 
8c115b91ec185a4820578561aaf681238280b22b5c68b68c484ffbd0fa3c4ec1beb4d426e3f0e33192e32bce78aa8b7f50ed6799732a467fa9e75c34787057ee
 SHA512 
db27dd6fb616bd7ad895b2bdf4ea7b010501358a50dc8f2e7e29558d1cfc088a572b1b35ac512654d3ed410c84df87dc34ca636533a4499117253915d4763117
-DIST cups-2.4.1-source.tar.gz 8113914 BLAKE2B 
690d9d92f9bc84c2bb360699191cd67e1489ffc3ab219376dfc1a8795379950c95bf58c2033a0dbd2918262c5d104e21e31c4585cb35d229b0fac6cf4967bfd7
 SHA512 
74e83728fcc3baf709176442b26711250fd4d4ede1e81e35b02a5607711067e28cd5a05d5bc3337953f6b2236c5a429b13f3a7f1218a08a2d3c30a8c9b0d96fd
 DIST cups-2.4.2-source.tar.gz 8128785 BLAKE2B 
97053feb502d4fdc28810b806000b6c84a6795d5adcec0789e73e5477d5802d46a99381366d16219f627166df088f6decde5c144bd0c38b5745815dc1e426bc5
 SHA512 
07474643bffe11c79b3226b70d28f1bb803dc19daa10711938cea303feacdcce3945ba8ff0334d94fdd5922ea7d6bf37a28c1ea62cce8ce946c2f90a0faf002f

diff --git a/net-print/cups/cups-2.4.1.ebuild b/net-print/cups/cups-2.4.1.ebuild
deleted file mode 100644
index be3e3b15e512..
--- a/net-print/cups/cups-2.4.1.ebuild
+++ /dev/null
@@ -1,320 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit autotools linux-info xdg multilib-minimal optfeature pam 
toolchain-funcs
-
-MY_PV="${PV/_beta/b}"
-MY_PV="${MY_PV/_rc/rc}"
-MY_PV="${MY_PV/_p/op}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-#  EGIT_REPO_URI="https://github.com/apple/cups.git;
-   EGIT_REPO_URI="https://github.com/OpenPrinting/cups.git;
-   [[ ${PV} !=  ]] && EGIT_BRANCH=branch-${PV/.}
-else
-#  
SRC_URI="https://github.com/apple/cups/releases/download/v${MY_PV}/${MY_P}-source.tar.gz;
-   
SRC_URI="https://github.com/OpenPrinting/cups/releases/download/v${MY_PV}/cups-${MY_PV}-source.tar.gz;
-   if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *_rc* ]] ; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips 
~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-   fi
-fi
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="https://www.cups.org/ https://github.com/OpenPrinting/cups;
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="acl dbus debug kerberos pam selinux +ssl static-libs systemd usb X 
xinetd zeroconf"
-
-# upstream includes an interactive test which is a nono for gentoo
-RESTRICT="test"
-
-BDEPEND="
-   acct-group/lp
-   acct-group/lpadmin
-   virtual/pkgconfig
-"
-DEPEND="
-   app-text/libpaper
-   sys-libs/zlib
-   acl? (
-   kernel_linux? (
-   sys-apps/acl
-   sys-apps/attr
-   )
-   )
-   dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-   kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-   pam? ( sys-libs/pam )
-   !pam? ( virtual/libcrypt:= )
-   ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] )
-   systemd? ( sys-apps/systemd )
-   usb? ( virtual/libusb:1 )
-   X? ( x11-misc/xdg-utils )
-   xinetd? ( sys-apps/xinetd )
-   zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}
-   acct-group/lp
-   acct-group/lpadmin
-   selinux? ( sec-policy/selinux-cups )
-"
-PDEPEND=">=net-print/cups-filters-1.0.43"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.4.1-nostrip.patch"
-   "${FILESDIR}/${PN}-2.4.1-user-AR.patch"
-
-   # Upstream patches applied by Fedora
-   # https://github.com/OpenPrinting/cups/pull/329
-   "${FILESDIR}"/0001-cups-fix-uninit-value-jump.patch
-   # https://github.com/OpenPrinting/cups/issues/340
-   "${FILESDIR}"/${PN}-2.4.1-resolve-uri.patch
-   # 

[gentoo-commits] repo/gentoo:master commit in: net-p2p/ed2k_hash/

2022-07-10 Thread Sam James
commit: 42c4ef61e2656e94fd2f0e9042ba875928d5534e
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 03:04:07 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 03:04:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42c4ef61

net-p2p/ed2k_hash: fix UnusedInherits

Signed-off-by: Sam James  gentoo.org>

 net-p2p/ed2k_hash/ed2k_hash-0.4.0-r2.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r2.ebuild 
b/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r2.ebuild
index 6434f3486bc6..d415e2ec2ecd 100644
--- a/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r2.ebuild
+++ b/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit flag-o-matic
+
+#inherit flag-o-matic
 
 DESCRIPTION="Tool for generating eDonkey2000 links"
 HOMEPAGE="http://ed2k-tools.sourceforge.net/ed2k_hash.shtml;



[gentoo-commits] repo/gentoo:master commit in: net-p2p/eiskaltdcpp/

2022-07-10 Thread Sam James
commit: b77592e0e2960c2a8a98806fcc6f0ee4eb8a1a95
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 03:03:38 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 03:03:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b77592e0

net-p2p/eiskaltdcpp: fix UnusedInherits

Signed-off-by: Sam James  gentoo.org>

 net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild | 4 ++--
 net-p2p/eiskaltdcpp/eiskaltdcpp-.ebuild  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild 
b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
index c293b4a3b6f3..355264d134ad 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.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
@@ -7,7 +7,7 @@ LUA_COMPAT=( lua5-1 lua5-2 )
 CMAKE_REMOVE_MODULES_LIST="FindASPELL FindLua"
 PLOCALES="be bg cs da de el en es eu fr hu ie it pl pt_BR ru sk sr sr@latin 
sv_SE tr uk vi zh_CN"
 
-inherit cmake lua-single plocale strip-linguas xdg-utils toolchain-funcs
+inherit cmake lua-single plocale strip-linguas xdg-utils
 [[ ${PV} = ** ]] && inherit git-r3
 
 DESCRIPTION="Qt/DC++ based client for DirectConnect and ADC protocols"

diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-.ebuild 
b/net-p2p/eiskaltdcpp/eiskaltdcpp-.ebuild
index 10dbd43956b6..c27953956943 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-.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
@@ -7,7 +7,7 @@ LUA_COMPAT=( lua5-1 lua5-2 )
 CMAKE_REMOVE_MODULES_LIST="FindASPELL FindLua"
 PLOCALES="be bg cs da de el en es eu fr hu ie it pl pt_BR ru sk sr sr@latin 
sv_SE tr uk vi zh_CN"
 
-inherit cmake lua-single plocale xdg-utils toolchain-funcs
+inherit cmake lua-single plocale xdg-utils
 [[ ${PV} = ** ]] && inherit git-r3
 
 DESCRIPTION="Qt/DC++ based client for DirectConnect and ADC protocols"



[gentoo-commits] repo/gentoo:master commit in: profiles/base/

2022-07-10 Thread Sam James
commit: 821aa7553dd04a2d68abdb1fe2106fa8bd4ef2bc
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 02:57:13 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 02:57:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=821aa755

profiles/base: drop obsolete ruby target masks

Signed-off-by: Sam James  gentoo.org>

 profiles/base/use.mask | 8 
 1 file changed, 8 deletions(-)

diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index c806a6f52c08..8058ff3f174c 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -22,10 +22,6 @@ php7-3
 # See e.g. bug #753323, bug #822690.
 pch
 
-# Hans de Graaff  (2021-07-09)
-# Mask Ruby 2.5 as EOL
-ruby_targets_ruby25
-
 # Brian Evans  (2021-01-07)
 # PHP 7.2 is security vulnerable and end-of-life
 # Please upgrade to a newer slot
@@ -38,10 +34,6 @@ php_targets_php7-2
 # See e.g. bug #741076
 ros_messages_eus
 
-# Hans de Graaff  (2020-06-13)
-# Mask Ruby 2.4 as EOL
-ruby_targets_ruby24
-
 # Matt Turner  (2019-09-01)
 # app-office/texmacs is package.mask'd. Bug #436400
 texmacs



[gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc/

2022-07-10 Thread Sam James
commit: c1c6af43517845dce452833e8f3b662c0e4f9b2d
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 02:56:06 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 02:56:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1c6af43

sys-devel/gcc: add 13.0.0_pre20220710

Signed-off-by: Sam James  gentoo.org>

 sys-devel/gcc/Manifest  |  1 +
 sys-devel/gcc/gcc-13.0.0_pre20220710.ebuild | 52 +
 2 files changed, 53 insertions(+)

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index af2b8ba7a0cc..841c5b9060a1 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -38,6 +38,7 @@ DIST gcc-12.1.0-patches-8.tar.xz 12020 BLAKE2B 
6138ef4d76a682ecfd05ba7c80d8f5db7
 DIST gcc-12.1.0-patches-9.tar.xz 12536 BLAKE2B 
ceb045b2a5c5a2a3047d73296fa1057421ef58c7f793d1f031f43dbd1a6faf49bdf1956e96a4f8e34c4d3fde2c26fcc9b146c223d8b1b3e1f944c2ec8574b786
 SHA512 
b899ec2d6da65df0f32838be3c89dbb1dc6b423133aa5121635547a1aa18b5d52b920e62522143682c0818baf185ebacb75ab84383ef0ad9768ba567807da5f4
 DIST gcc-12.1.0.tar.xz 82701928 BLAKE2B 
dca5df8fea680dbeda721742cce5c97de7eb4be490a32a158e06b88e2b9dd092150b7cfe490bb69e48e2f75d8bba231c8a54cd46b48ddcdc01bf9553ab57019d
 SHA512 
2121d295292814a6761edf1fba08c5f633ebe16f52b80e7b73a91050e71e1d2ed98bf17eebad263e191879561c02b48906c53faa4c4670c486a26fc75df23900
 DIST gcc-13-20220619.tar.xz 79328496 BLAKE2B 
8c5104870593803b5cc0df02d671522f576bb56ad957e453d9f2bbc7995ccff2a4549ffef5f3beef15f2b9db6b1dc11b1993e2e5fa09feb9a5f6585be315f3f9
 SHA512 
69dfaf4a54a73b22127dd5167dd7d92e26e33e1bbf45507b05c97342db16264f96d78764745e41ac4ecade989789ac186364dcf9d13d765a5a5e7326469a9852
+DIST gcc-13-20220710.tar.xz 79382072 BLAKE2B 
783b7c70c4ad0df6cd429adcc77a070c099c0e825205397d730316a9ec1d5dd2662f49e31a2a5b68854de4b1e8ce22a12a4098e333cf733ede26e9621fca8dee
 SHA512 
2ce33eb1c9f92f1fded3b38e4756a399956b29c45b49f792d03852aef506f06d923bcdd06a8e2a13329b950886d82914d218a578be623a8082175a28fb215b09
 DIST gcc-8.5.0-patches-2.tar.bz2 16921 BLAKE2B 
619a47f74edf05fa01c9de59d0ff7abb027a01cf0bdec91ac41046166192f4eae561684136c4a6a5e077f64754bb5b0710905129f31b0def21d88f92e6bba7fb
 SHA512 
b6095d4570895e2c4dd58fed5756194aea27391b813e5e2de42b2749cb318c4bea2087eb0ff92c70e7f98ae4482c49d476db57be83d7beb19fd462aa61714ab2
 DIST gcc-8.5.0.tar.xz 63841008 BLAKE2B 
aa81a1a730fd7371360f6abed6ba78b5843fd18c58d5de5687acc320741b9e430e85df3535a1ef7a26051409be8d2f0945f503e5968480d919103123a99d4b12
 SHA512 
92f599680e6b7fbce88bcdda810f468777d541e5fddfbb287f7977d51093de2a5178bd0e6a08dfe37090ea10a0508a43ccd00220041abbbec33f1179bfc174d8
 DIST gcc-9.4.0-patches-1.tar.bz2 14012 BLAKE2B 
d5fbfd73d9c3a5b66be5b124d981fe5a7468363c83784989a50731f87931435f4b6302e4c20a64b20680581ed40005eff7bdd5855526a093f73a04c3c1ddab31
 SHA512 
b84884c7d2197cb14229d3321b98cd66c783cf9ebf7e5d1b1186e6cf32ee9e47d004ebad26118f9c848f9bc0a3783ceb23d9b65101d98c3bfa99874e66ee7cbc

diff --git a/sys-devel/gcc/gcc-13.0.0_pre20220710.ebuild 
b/sys-devel/gcc/gcc-13.0.0_pre20220710.ebuild
new file mode 100644
index ..0c0625463882
--- /dev/null
+++ b/sys-devel/gcc/gcc-13.0.0_pre20220710.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_GCC_VER="13.1.0"
+MUSL_GCC_VER="13.1.0"
+TOOLCHAIN_USE_GIT_PATCHES=yes
+
+if [[ $(ver_cut 3) ==  ]] ; then
+   MY_PV_2=$(ver_cut 2)
+   MY_PV_3=$(($(ver_cut 3) - 9998))
+   if [[ ${MY_PV_2} == 0 ]] ; then
+   MY_PV_2=0
+   MY_PV_3=0
+   else
+   MY_PV_2=$(($(ver_cut 2) - 1))
+   fi
+
+   # e.g. 12.2. -> 12.1.1
+   TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
+fi
+
+inherit toolchain
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=master
+
+# Don't keyword live ebuilds
+if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+# Technically only if USE=hardened *too* right now, but no point in 
complicating it further.
+# If GCC is enabling CET by default, we need glibc to be built with support 
for it.
+# bug #830454
+RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+DEPEND="${RDEPEND}"
+BDEPEND="${CATEGORY}/binutils[cet(-)?]"
+
+src_prepare() {
+   local p upstreamed_patches=(
+   # add them here
+   )
+   for p in "${upstreamed_patches[@]}"; do
+   rm -v "${WORKDIR}/patch/${p}" || die
+   done
+
+   toolchain_src_prepare
+
+   eapply_user
+}



[gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/

2022-07-10 Thread Sam James
commit: b1d60fdb2d1ce212ed3ee0a07663d87df77344b9
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 02:48:29 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 02:48:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1d60fdb

media-libs/vigra: sync live (PYTHON_COMPAT)

Signed-off-by: Sam James  gentoo.org>

 media-libs/vigra/vigra-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/vigra/vigra-.ebuild 
b/media-libs/vigra/vigra-.ebuild
index f842c53d7500..f10aa9a71fbf 100644
--- a/media-libs/vigra/vigra-.ebuild
+++ b/media-libs/vigra/vigra-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+),xml"
 inherit cmake flag-o-matic python-r1
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/

2022-07-10 Thread Sam James
commit: 45ceacce3b7c21eecaa831c96bd38f3a13db2d76
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 02:48:00 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 02:48:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45ceacce

media-gfx/hugin: sync live (PYTHON_COMPAT)

Signed-off-by: Sam James  gentoo.org>

 media-gfx/hugin/hugin-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/hugin/hugin-.ebuild 
b/media-gfx/hugin/hugin-.ebuild
index 6762e901caa5..b581777198f5 100644
--- a/media-gfx/hugin/hugin-.ebuild
+++ b/media-gfx/hugin/hugin-.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit mercurial python-single-r1 wxwidgets cmake xdg
 



[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/pyephem/

2022-07-10 Thread Sam James
commit: 1802f740053a6e1017ab852fe131a1a0aae9949c
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 02:40:50 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 02:40:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1802f740

sci-astronomy/pyephem: skip broken test

Closes: https://bugs.gentoo.org/855461
Signed-off-by: Sam James  gentoo.org>

 sci-astronomy/pyephem/pyephem-4.1.1.ebuild | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/sci-astronomy/pyephem/pyephem-4.1.1.ebuild 
b/sci-astronomy/pyephem/pyephem-4.1.1.ebuild
index 1c43a235a7e4..423ccb34c62e 100644
--- a/sci-astronomy/pyephem/pyephem-4.1.1.ebuild
+++ b/sci-astronomy/pyephem/pyephem-4.1.1.ebuild
@@ -19,6 +19,12 @@ IUSE="doc"
 
 BDEPEND="doc? ( dev-python/sphinx )"
 
+EPYTEST_DESELECT=(
+   # Can't find its test files (class not loaded properly in test env?)
+   # bug #855461
+   tests/test_jpl.py::JPLTest::runTest
+)
+
 distutils_enable_tests pytest
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/pyephem/

2022-07-10 Thread Sam James
commit: 4c42fcee335109e1e656426a5cfd6d4acff5217c
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 02:40:22 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 02:40:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c42fcee

sci-astronomy/pyephem: add 4.1.3

Bug: https://bugs.gentoo.org/855461
Signed-off-by: Sam James  gentoo.org>

 sci-astronomy/pyephem/Manifest |  1 +
 sci-astronomy/pyephem/pyephem-4.1.3.ebuild | 57 ++
 2 files changed, 58 insertions(+)

diff --git a/sci-astronomy/pyephem/Manifest b/sci-astronomy/pyephem/Manifest
index c975c283041f..3c0359bd7977 100644
--- a/sci-astronomy/pyephem/Manifest
+++ b/sci-astronomy/pyephem/Manifest
@@ -1,2 +1,3 @@
 DIST pyephem-3.7.7.1.tar.gz 1622306 BLAKE2B 
aefdd7b7e4471140f1c2b5c065f663dfb1095d8d8325e23d4b5b9c683ff7a91020151429a992ad78be897ab738d9bc207afa337b7806fb244d6d6c8a1c680b7f
 SHA512 
ae0d9562f33ee25065b33ea3d4b24a74e32259bebb07edf37deacaa77e6d24b3a7a49e4602393b45a3c7cfc7d8088f038e68e96ec3576a796b5486fc2946ac5a
 DIST pyephem-4.1.1.gh.tar.gz 2659977 BLAKE2B 
e373857d3fb66e742f9db992165dbd1d50afbb6b91588f2cfcd299409d491ef1174c54a182dd59b5a8e298a07312899c8f8b5a8aaa63e6b31deb5f8b1cd3131e
 SHA512 
2539f36b7110cacd6cf95e9ba0be26ca837a66ba81f092d4be01405029adf22478184861f46ecf09d6cd35927140874e0f0d228b06537d05f3e2eddbcb35da85
+DIST pyephem-4.1.3.gh.tar.gz 2660800 BLAKE2B 
272a96dfe5debe083274f911737246ea90dc15b12b141e41c018d0b4eff13e548fe1d99cfb75ea7d06d7784cd9cbce7f43149a08de051cd9e12a4b5d6a306607
 SHA512 
1d113e1adbe5c8175364a29ae405d80005e54a4f60d475534d6721dc51b4f58d314ad161ddaf791614fcd4b0550e4b2142f4e52ec4771ca0d1be6b10f3f8cc4d

diff --git a/sci-astronomy/pyephem/pyephem-4.1.3.ebuild 
b/sci-astronomy/pyephem/pyephem-4.1.3.ebuild
new file mode 100644
index ..423ccb34c62e
--- /dev/null
+++ b/sci-astronomy/pyephem/pyephem-4.1.3.ebuild
@@ -0,0 +1,57 @@
+# 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 distutils-r1
+
+DESCRIPTION="Astronomical routines for the Python programming language"
+HOMEPAGE="https://rhodesmill.org/pyephem/;
+SRC_URI="https://github.com/brandon-rhodes/pyephem/archive/refs/tags/${PV}.tar.gz
 -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+BDEPEND="doc? ( dev-python/sphinx )"
+
+EPYTEST_DESELECT=(
+   # Can't find its test files (class not loaded properly in test env?)
+   # bug #855461
+   tests/test_jpl.py::JPLTest::runTest
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+   # Don't install rst files by default
+   sed -i -e "s:'doc/\*\.rst',::" setup.py || die
+   distutils-r1_src_prepare
+}
+
+src_compile() {
+   distutils-r1_src_compile
+   if use doc; then
+   PYTHONPATH=. emake -C ephem/doc html
+   fi
+}
+
+python_test() {
+   cd "${T}" || die
+   epytest --pyargs ephem
+}
+
+src_install() {
+   use doc && HTML_DOCS=( ephem/doc/_build/html/. )
+   distutils-r1_src_install
+}
+
+python_install() {
+   distutils-r1_python_install
+
+   rm -r "${D}$(python_get_sitedir)/ephem/tests" || die
+}



[gentoo-commits] repo/gentoo:master commit in: dev-cpp/commoncpp2/, profiles/

2022-07-10 Thread Sam James
commit: 4df49a0fdab4180b9438ff7eff7d4aeabcaa881d
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 02:15:01 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 02:15:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4df49a0f

dev-cpp/commoncpp2: treeclean

Closes: https://bugs.gentoo.org/850958
Signed-off-by: Sam James  gentoo.org>

 dev-cpp/commoncpp2/Manifest   |  2 -
 dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild | 75 ---
 dev-cpp/commoncpp2/metadata.xml   |  5 --
 profiles/package.mask |  6 ---
 4 files changed, 88 deletions(-)

diff --git a/dev-cpp/commoncpp2/Manifest b/dev-cpp/commoncpp2/Manifest
deleted file mode 100644
index 69b0098c2ce8..
--- a/dev-cpp/commoncpp2/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST commoncpp2-1.8.1-patches-r1.txz 7144 BLAKE2B 
0d464810afc9aab2b198495789ecfe4c84fab9edf33f85523dc711602a2f1c08c24a5c2cd7fd92ef799e049624159eb373a2accff193ddec1413fc9aa4450a4e
 SHA512 
d8df95b0963a47c7049fe80b21dadd004f0d4a4498139d629dcc65034211e58e2dffa5e2e6ab61eba10b265f2737eb6a78c0c92b6ec13ae50ab5826bf6e4d68b
-DIST commoncpp2-1.8.1.tar.gz 908678 BLAKE2B 
93868286230b4b0507127627f0a1c24b4f340e4af50d7592774b57bfc7a8f1e31bacc0cee5d17b4237aac85be0265cf3aabd65708e988159daaac85b4145c398
 SHA512 
949823461d20429c2b0acfa22554a5a9dacc977e3ee097f34416f65d322df84fbdb27c644435c6c6caaed800347dfbe789cee7f19b39b306165c97b4f4012bfe

diff --git a/dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild 
b/dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild
deleted file mode 100644
index 399a2c7ed176..
--- a/dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="C++ library offering portable support for system-related services"
-HOMEPAGE="https://www.gnu.org/software/commoncpp/;
-SRC_URI="
-   mirror://gnu/commoncpp/${P}.tar.gz
-   https://dev.gentoo.org/~soap/distfiles/${P}-patches-r1.txz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="debug doc examples gnutls ipv6 ssl"
-
-RDEPEND="
-   sys-libs/zlib:=
-   ssl? (
-   gnutls? (
-   dev-libs/libgcrypt:0=
-   net-libs/gnutls:=
-   )
-   !gnutls? (
-   dev-libs/openssl:0=
-   )
-   )"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( >=app-doc/doxygen-1.3.6 )"
-
-PATCHES=(
-   "${WORKDIR}"/patches/1.8.1-configure_detect_netfilter.patch
-   "${WORKDIR}"/patches/1.8.1-glibc212.patch
-   "${WORKDIR}"/patches/1.8.1-autoconf-update.patch
-   "${WORKDIR}"/patches/1.8.1-fix-buffer-overflow.patch
-   "${WORKDIR}"/patches/1.8.1-parallel-build.patch
-   "${WORKDIR}"/patches/1.8.1-libgcrypt.patch
-   "${WORKDIR}"/patches/1.8.1-fix-c++14.patch
-   "${WORKDIR}"/patches/1.8.1-gnutls-3.4.patch
-   "${WORKDIR}"/patches/1.8.1-fix-gcc9.patch
-   "${WORKDIR}"/patches/1.8.1-c++17.patch
-   "${WORKDIR}"/patches/1.8.1-openssl-1.1.patch
-)
-
-src_prepare() {
-   default
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   --disable-static \
-   $(use_enable debug) \
-   $(use_with ipv6) \
-   $(use_with ssl $(usex gnutls gnutls openssl)) \
-   $(use_with doc doxygen)
-}
-
-src_install() {
-   use doc && HTML_DOCS=( doc/html/. )
-   default
-
-   # package provides .pc files
-   find "${ED}" -name '*.la' -delete || die
-
-   dodoc COPYING.addendum
-
-   if use examples; then
-   docinto examples
-   dodoc demo/{*.cpp,*.h,*.xml,README}
-   docompress -x /usr/share/doc/${PF}/examples
-   fi
-}

diff --git a/dev-cpp/commoncpp2/metadata.xml b/dev-cpp/commoncpp2/metadata.xml
deleted file mode 100644
index 85e4ed814fa2..
--- a/dev-cpp/commoncpp2/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-https://www.gentoo.org/dtd/metadata.dtd;>
-
-
-

diff --git a/profiles/package.mask b/profiles/package.mask
index a0d96d2e8fc4..5f79e70439c8 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -252,12 +252,6 @@ sys-cluster/csync2
 # Removal on 2022-07-13.  Bug #851678.
 dev-python/editdistance-s
 
-# Sam James  (2022-06-10)
-# Masked for removal on 2022-07-10. No upstream activity in a long time,
-# no reverse dependencies, and Gentoo maintains a huge number of patches
-# w/ no hope of them being upstreamed. Bug #850958.
-dev-cpp/commoncpp2
-
 # Matt Turner  (2022-05-30)
 # libwacom-2 broke ABI compatibility; reverse dependencies need to be updated.
 # Bug #848501



[gentoo-commits] repo/gentoo:master commit in: dev-libs/protobuf-c/

2022-07-10 Thread Sam James
commit: 6ef86ad77ac20061ad417f415498bd98573fa5ec
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 02:01:17 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 02:01:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ef86ad7

dev-libs/protobuf-c: add 1.4.1

Bug: https://bugs.gentoo.org/856043
Signed-off-by: Sam James  gentoo.org>

 dev-libs/protobuf-c/Manifest|  1 +
 dev-libs/protobuf-c/protobuf-c-1.4.1.ebuild | 53 +
 2 files changed, 54 insertions(+)

diff --git a/dev-libs/protobuf-c/Manifest b/dev-libs/protobuf-c/Manifest
index 731c705df93b..0044b4089538 100644
--- a/dev-libs/protobuf-c/Manifest
+++ b/dev-libs/protobuf-c/Manifest
@@ -1 +1,2 @@
 DIST protobuf-c-1.4.0.tar.gz 505251 BLAKE2B 
5f53238c064f82de87012eb739bf6a44c202d0dbf2fc5af394accdc52a9934d1fb9cea2bb4a4d529fdf98959546aaa672c1c991a9a7016803d16f65accc907cd
 SHA512 
6a2e5031b85b5986e863661437dea002eba217257a50a27db88d29fa1a3db1014ed6ec7c21d89df700d181b18e169d1037146cb6475c10cd5a068a91e522e3c3
+DIST protobuf-c-1.4.1.tar.gz 513596 BLAKE2B 
b5e87a3154863581b81790a26b6b522c2b3ad138e966053f20c6264b4a7677d6c5bff8e27faa7c6cfa9e982b72b06e2f518a3def9f6db13241c3cb3ee9afc8f6
 SHA512 
190a4aa5c607853e6bf860b0974deb21e4f7f6209e810251eaca9612b59ea676779b0ca217fb1572914ffb8de3315a7d24f162b14d447ee671a9adc5b1271e41

diff --git a/dev-libs/protobuf-c/protobuf-c-1.4.1.ebuild 
b/dev-libs/protobuf-c/protobuf-c-1.4.1.ebuild
new file mode 100644
index ..7eedf12e47a5
--- /dev/null
+++ b/dev-libs/protobuf-c/protobuf-c-1.4.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Protocol Buffers implementation in C"
+HOMEPAGE="https://github.com/protobuf-c/protobuf-c;
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz;
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD-2"
+# Subslot == SONAME version
+SLOT="0/1.0.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND=">=dev-libs/protobuf-3:0
+   virtual/pkgconfig"
+DEPEND=">=dev-libs/protobuf-3:0=[${MULTILIB_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.4.0-include-path.patch
+)
+
+src_prepare() {
+   default
+
+   if ! use test; then
+   eapply "${FILESDIR}"/${PN}-1.3.0-no-build-tests.patch
+   fi
+
+   eautoreconf
+}
+
+multilib_src_configure() {
+   local myeconfargs=(
+   $(use_enable static-libs static)
+   )
+
+   ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+   find "${ED}" -name '*.la' -type f -delete || die
+   einstalldocs
+}



[gentoo-commits] proj/qa-scripts:master commit in: /

2022-07-10 Thread Sam James
commit: 89f4e8e0d6ce3be550ca01a8397763ad9efae9ca
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 01:41:59 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 01:41:59 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=89f4e8e0

keyrings-export.bash: use ${OUTPUT_DIR}

Signed-off-by: Sam James  gentoo.org>

 keyrings-export.bash | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyrings-export.bash b/keyrings-export.bash
index aee9af2..7445644 100755
--- a/keyrings-export.bash
+++ b/keyrings-export.bash
@@ -42,9 +42,9 @@ export_keys "${OUTPUT_DIR}"/keys/all-devs.gpg \
"${RETIRED_DEVS[@]}"
 
 for key in service-keys committing-devs active-devs infra-devs retired-devs 
all-devs ; do
-   if [[ ! -L keys/${key}.gpg ]] ; then
+   if [[ ! -L "${OUTPUT_DIR}"/keys/${key}.gpg ]] ; then
# Compatibility symlink
-   ln -s keys/${key}.gpg ${key}.gpg
+   ln -s "${OUTPUT_DIR}"/keys/${key}.gpg "${OUTPUT_DIR}"/${key}.gpg
fi
 
timestamp=$(date -u +%Y%m%d -d "monday")



[gentoo-commits] proj/qa-scripts:master commit in: /

2022-07-10 Thread Sam James
commit: deb5eca88bc5eae48fd36cdcb09a3dcb8e4629bc
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 01:26:03 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 01:26:03 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=deb5eca8

keyrings-export.bash: migrate keys into keys/

Signed-off-by: Sam James  gentoo.org>

 keyrings-export.bash | 17 +++--
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/keyrings-export.bash b/keyrings-export.bash
index a890daf..aee9af2 100755
--- a/keyrings-export.bash
+++ b/keyrings-export.bash
@@ -17,24 +17,24 @@ export -a NONCOMMITTING_DEVS=( $(grab_ldap_fingerprints -b 
"${DEV_BASE}" "${NONC
 export -a RETIRED_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" 
"${RETIRED_RULE}") )
 export -a SYSTEM_KEYS=( $(grab_ldap_fingerprints -b "${SYSTEM_BASE}" 
"${NONCOMMIT_RULE}") )
 
-export_keys "${OUTPUT_DIR}"/service-keys.gpg \
+export_keys "${OUTPUT_DIR}"/keys/service-keys.gpg \
"${SYSTEM_KEYS[@]}"
 
-export_keys "${OUTPUT_DIR}"/committing-devs.gpg \
+export_keys "${OUTPUT_DIR}"/keys/committing-devs.gpg \
"${COMMITTING_DEVS[@]}"
 
-export_keys "${OUTPUT_DIR}"/active-devs.gpg \
+export_keys "${OUTPUT_DIR}"/keys/active-devs.gpg \
"${COMMITTING_DEVS[@]}" \
"${NONCOMMITTING_DEVS[@]}"
 
-export_keys "${OUTPUT_DIR}"/infra-devs.gpg \
+export_keys "${OUTPUT_DIR}"/keys/infra-devs.gpg \
"${INFRA_DEVS[@]}"
 
-export_keys "${OUTPUT_DIR}"/retired-devs.gpg \
+export_keys "${OUTPUT_DIR}"/keys/retired-devs.gpg \
"${RETIRED_DEVS[@]}"
 
 # Everybody together now
-export_keys "${OUTPUT_DIR}"/all-devs.gpg \
+export_keys "${OUTPUT_DIR}"/keys/all-devs.gpg \
"${SYSTEM_KEYS[@]}" \
"${COMMITTING_DEVS[@]}" \
"${NONCOMMITTING_DEVS[@]}" \
@@ -42,6 +42,11 @@ export_keys "${OUTPUT_DIR}"/all-devs.gpg \
"${RETIRED_DEVS[@]}"
 
 for key in service-keys committing-devs active-devs infra-devs retired-devs 
all-devs ; do
+   if [[ ! -L keys/${key}.gpg ]] ; then
+   # Compatibility symlink
+   ln -s keys/${key}.gpg ${key}.gpg
+   fi
+
timestamp=$(date -u +%Y%m%d -d "monday")
 
# Don't clobber existing timestamped keys for this period (weekly)



[gentoo-commits] repo/gentoo:master commit in: media-sound/alsaplayer/, media-sound/alsaplayer/files/

2022-07-10 Thread Sam James
commit: 9c2417fc4192ca14ef8e57dac58db91d5e9f6d3a
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 01:15:43 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 01:15:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c2417fc

media-sound/alsaplayer: fix patch filename

Signed-off-by: Sam James  gentoo.org>

 media-sound/alsaplayer/alsaplayer-0.99.81-r3.ebuild | 2 +-
 ...ayer-0.99.81-autotools.ebuild => alsaplayer-0.99.81-autotools.patch} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/alsaplayer/alsaplayer-0.99.81-r3.ebuild 
b/media-sound/alsaplayer/alsaplayer-0.99.81-r3.ebuild
index 70ee1adcfa99..32fb30aa29da 100644
--- a/media-sound/alsaplayer/alsaplayer-0.99.81-r3.ebuild
+++ b/media-sound/alsaplayer/alsaplayer-0.99.81-r3.ebuild
@@ -38,7 +38,7 @@ BDEPEND="
virtual/pkgconfig
doc? ( app-doc/doxygen )"
 
-PATCHES=( "${FILESDIR}"/${P}-autotools.ebuild )
+PATCHES=( "${FILESDIR}"/${P}-autotools.patch )
 
 src_prepare() {
default

diff --git a/media-sound/alsaplayer/files/alsaplayer-0.99.81-autotools.ebuild 
b/media-sound/alsaplayer/files/alsaplayer-0.99.81-autotools.patch
similarity index 100%
rename from media-sound/alsaplayer/files/alsaplayer-0.99.81-autotools.ebuild
rename to media-sound/alsaplayer/files/alsaplayer-0.99.81-autotools.patch



[gentoo-commits] proj/qa-scripts:master commit in: /

2022-07-10 Thread Sam James
commit: 34dc0a6bfcc006a5c1d9d9fa7111fdb30d5a8ef4
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 01:08:47 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 01:08:47 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=34dc0a6b

keyrings-exports.bash: "next monday" -> "monday"

Signed-off-by: Sam James  gentoo.org>

 keyrings-export.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyrings-export.bash b/keyrings-export.bash
index 6e4ade9..a890daf 100755
--- a/keyrings-export.bash
+++ b/keyrings-export.bash
@@ -42,7 +42,7 @@ export_keys "${OUTPUT_DIR}"/all-devs.gpg \
"${RETIRED_DEVS[@]}"
 
 for key in service-keys committing-devs active-devs infra-devs retired-devs 
all-devs ; do
-   timestamp=$(date -u +%Y%m%d -d "next monday")
+   timestamp=$(date -u +%Y%m%d -d "monday")
 
# Don't clobber existing timestamped keys for this period (weekly)
# if we're running several times a day.



[gentoo-commits] proj/portage:master commit in: doc/package/, /

2022-07-10 Thread Sam James
commit: 331739235a5f07e225903ec4a37c227dbf786409
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 01:01:43 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 01:03:27 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=33173923

doc: ebuild.docbook: drop references to removed EAPIs 4-python and 5-progress

Fixes: 328a87e50b0559517ca4b6c016617afc5ac7a2f4
Bug: https://bugs.gentoo.org/857486
Signed-off-by: Sam James  gentoo.org>

 NEWS   | 6 ++
 doc/package/ebuild.docbook | 2 --
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 7a2d68499..f0495a520 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+portage-3.0.32 (UNRELEASED)
+--
+
+Bug fixes:
+* Fix doc generation by removing reference to removed EAPIs. See bug #857486.
+
 portage-3.0.31 (2022-07-10)
 --
 

diff --git a/doc/package/ebuild.docbook b/doc/package/ebuild.docbook
index 98084c8fa..d7255a0d3 100644
--- a/doc/package/ebuild.docbook
+++ b/doc/package/ebuild.docbook
@@ -9,9 +9,7 @@
 _ebuild_eapi_2;
 _ebuild_eapi_3;
 _ebuild_eapi_4;
-_ebuild_eapi_4_python;
 _ebuild_eapi_4_slot_abi;
 _ebuild_eapi_5;
-_ebuild_eapi_5_progress;
 
 



[gentoo-commits] proj/qa-scripts:master commit in: /

2022-07-10 Thread Sam James
commit: a9d640acbf75867a786cc50971521af8d95e921a
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 01:00:07 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 01:00:07 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=a9d640ac

keyrings-export.bash: put key snapshots in /keys/ to avoid clutter

Signed-off-by: Sam James  gentoo.org>

 keyrings-export.bash | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/keyrings-export.bash b/keyrings-export.bash
index eea3f20..6e4ade9 100755
--- a/keyrings-export.bash
+++ b/keyrings-export.bash
@@ -46,11 +46,13 @@ for key in service-keys committing-devs active-devs 
infra-devs retired-devs all-
 
# Don't clobber existing timestamped keys for this period (weekly)
# if we're running several times a day.
-   if [[ -f "${OUTPUT_DIR}"/${key}-${timestamp}.gpg ]] ; then
+   if [[ -f "${OUTPUT_DIR}"/keys/${key}-${timestamp}.gpg ]] ; then
continue
fi
 
-   cp "${OUTPUT_DIR}"/${key}.gpg "${OUTPUT_DIR}"/${key}-${timestamp}.gpg
+   mkdir -p "${OUTPUT_DIR}"/keys
+
+   cp "${OUTPUT_DIR}"/${key}.gpg 
"${OUTPUT_DIR}"/keys/${key}-${timestamp}.gpg
 done
 
 clean_tmp



[gentoo-commits] proj/qa-scripts:master commit in: /

2022-07-10 Thread Sam James
commit: 915cc80e0bc0246a852613d3b07bde7dc9242cae
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 00:58:38 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 00:58:38 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=915cc80e

keyrings-export.bash: run snapshot part weekly

Signed-off-by: Sam James  gentoo.org>

 keyrings-export.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyrings-export.bash b/keyrings-export.bash
index c9d4715..eea3f20 100755
--- a/keyrings-export.bash
+++ b/keyrings-export.bash
@@ -42,7 +42,7 @@ export_keys "${OUTPUT_DIR}"/all-devs.gpg \
"${RETIRED_DEVS[@]}"
 
 for key in service-keys committing-devs active-devs infra-devs retired-devs 
all-devs ; do
-   timestamp=$(date +%Y%m%d)
+   timestamp=$(date -u +%Y%m%d -d "next monday")
 
# Don't clobber existing timestamped keys for this period (weekly)
# if we're running several times a day.



[gentoo-commits] proj/qa-scripts:master commit in: /

2022-07-10 Thread Sam James
commit: f8df7314768c5f5ee309ae63dcabd22442cce50b
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 00:52:56 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 00:52:56 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=f8df7314

keyrings-export.bash: make weekly snapshots of keyring exports

Needed for making a sec-keys/ package.

Signed-off-by: Sam James  gentoo.org>

 keyrings-export.bash | 12 
 1 file changed, 12 insertions(+)

diff --git a/keyrings-export.bash b/keyrings-export.bash
index f07df83..c9d4715 100755
--- a/keyrings-export.bash
+++ b/keyrings-export.bash
@@ -41,4 +41,16 @@ export_keys "${OUTPUT_DIR}"/all-devs.gpg \
"${INFRA_DEVS[@]}" \
"${RETIRED_DEVS[@]}"
 
+for key in service-keys committing-devs active-devs infra-devs retired-devs 
all-devs ; do
+   timestamp=$(date +%Y%m%d)
+
+   # Don't clobber existing timestamped keys for this period (weekly)
+   # if we're running several times a day.
+   if [[ -f "${OUTPUT_DIR}"/${key}-${timestamp}.gpg ]] ; then
+   continue
+   fi
+
+   cp "${OUTPUT_DIR}"/${key}.gpg "${OUTPUT_DIR}"/${key}-${timestamp}.gpg
+done
+
 clean_tmp



[gentoo-commits] repo/gentoo:master commit in: sys-kernel/git-sources/

2022-07-10 Thread Mike Pagano
commit: 7abe9fb8349646a28056e08d51821c655d2a107a
Author: Mike Pagano  gentoo  org>
AuthorDate: Mon Jul 11 00:50:25 2022 +
Commit: Mike Pagano  gentoo  org>
CommitDate: Mon Jul 11 00:51:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7abe9fb8

sys-kernel/git-sources: add 5.19_rc6

Signed-off-by: Mike Pagano  gentoo.org>

 sys-kernel/git-sources/Manifest|  1 +
 sys-kernel/git-sources/git-sources-5.19_rc6.ebuild | 41 ++
 2 files changed, 42 insertions(+)

diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index a7afe55c2cb6..8215fa3222a2 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -4,3 +4,4 @@ DIST patch-5.19-rc2.patch 91368249 BLAKE2B 
bef883f4eb087216758ed81dd83652f24486d
 DIST patch-5.19-rc3.patch 91707998 BLAKE2B 
838fb540ad60b1e6f90e90d873d470ae6defe5762239ab0113b7c552f425ecbf2701846ca8788414b198dd9df541f4387c62fed8e111fa3d73f063b98b26a536
 SHA512 
18a9a9c3254417425a6a9a4f438322ea926f2667621102fd715f0557dbbdf282a73af0c786ecce7fdc0fcd58f33443f470594f6b6cfd52c983bbf9c35d1d55b2
 DIST patch-5.19-rc4.patch 92086340 BLAKE2B 
fec8a8ca4dc1f25f6f06c1b7b2031b9e5f40b4b6ef56effb9a6150ba88beda69ebe3a88cb5bd00ba8548490d3b98b573482a6cf5dc5ec2b8b006d61b67317279
 SHA512 
9a4f7b207d31e2a2299c47de8f3fbb01558512ebe899af132eb6b711a3dc92d57568b9479b559b4e1d1a7eb59c5731afe38673eb13d09b250ee8a3df2d7e4d4c
 DIST patch-5.19-rc5.patch 92286884 BLAKE2B 
869cd7384fe6d7cb2752f7144b1fc8a030d1721e2502c0e4c20888b117d22c6411ea568852aa9e58459477f3bcea0b40762ec2bc37e1cf6e4467ef192223f4ed
 SHA512 
237f3be30596050bf0654356511a77453e661e2724b67de9f3ba91db5260e30b5685cedc796f6ab39d5c28faf40c25ebf168f8153c95c9ee71e17af4a20378cf
+DIST patch-5.19-rc6.patch 92531798 BLAKE2B 
6298e7c38d27c7711176d24ab82ef8751aaf15769ed77081805ad515e495b9461e08df5a1aff29f9305895fceb03b592b8596eb269405634a057e5bd3a66b657
 SHA512 
5f893e2395dfb8049993a577d764856e005fb8561a6a7a162145be963a9d83ad987f1ac45b05235249d35510f37b090664a2480a08da78083c45380ae5c3501f

diff --git a/sys-kernel/git-sources/git-sources-5.19_rc6.ebuild 
b/sys-kernel/git-sources/git-sources-5.19_rc6.ebuild
new file mode 100644
index ..64a9dd30df4c
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-5.19_rc6.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="5.18"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+K_NODRYRUN="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org;
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list 
to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+   >=sys-devel/patch-2.7.6-r4"
+
+pkg_postinst() {
+   postinst_sources
+}



[gentoo-commits] repo/gentoo:master commit in: net-misc/spice-gtk/

2022-07-10 Thread Sam James
commit: 072baf809172a2d4280c7ea0c5cc6081eb29078e
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 00:09:21 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 00:09:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=072baf80

net-misc/spice-gtk: Stabilize 0.40-r1 amd64, #857522

Signed-off-by: Sam James  gentoo.org>

 net-misc/spice-gtk/spice-gtk-0.40-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/spice-gtk/spice-gtk-0.40-r1.ebuild 
b/net-misc/spice-gtk/spice-gtk-0.40-r1.ebuild
index a3293ca3b229..8da12e589470 100644
--- a/net-misc/spice-gtk/spice-gtk-0.40-r1.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.40-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == ** ]] ; then
 else
SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.xz;
SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-meson-0.63.patch.xz;
-   KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
SPICE_PROTOCOL_VER=0.14.3
 fi



[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/, games-emulation/dolphin/files/

2022-07-10 Thread Sam James
commit: 65e79039b9cd3898cdb300f36357d5cc82c4f35c
Author: Christopher Rudolph  b-tu  de>
AuthorDate: Fri Jul  8 17:23:52 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 00:08:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65e79039

games-emulation/dolphin: fix build w/ libfmt-9

Apply patch to make games-emulation/dolphin-5.0_p20220520 build with
dev-libs/libfmt-9.

Signed-off-by: Christopher Rudolph  b-tu.de>
Signed-off-by: Sam James  gentoo.org>

 ...0520.ebuild => dolphin-5.0_p20220520-r1.ebuild} |  4 ++-
 ...phin-5.0_p20220520-libfmt-9.0.0-fix-build.patch | 32 ++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/games-emulation/dolphin/dolphin-5.0_p20220520.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20220520-r1.ebuild
similarity index 98%
rename from games-emulation/dolphin/dolphin-5.0_p20220520.ebuild
rename to games-emulation/dolphin/dolphin-5.0_p20220520-r1.ebuild
index 381435640b8f..abcdeec7c45b 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20220520.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20220520-r1.ebuild
@@ -35,12 +35,14 @@ IUSE="
profile pulseaudio systemd upnp vulkan
 "
 
+PATCHES=("${FILESDIR}/${P}-libfmt-9.0.0-fix-build.patch")
+
 RDEPEND="
app-arch/bzip2:=
app-arch/xz-utils:=
app-arch/zstd:=
dev-libs/hidapi:=
-   =dev-libs/libfmt-8*:=
+   >=dev-libs/libfmt-8:=
dev-libs/lzo:=
dev-libs/pugixml:=
media-libs/cubeb:=

diff --git 
a/games-emulation/dolphin/files/dolphin-5.0_p20220520-libfmt-9.0.0-fix-build.patch
 
b/games-emulation/dolphin/files/dolphin-5.0_p20220520-libfmt-9.0.0-fix-build.patch
new file mode 100644
index ..5bc2ae3877f4
--- /dev/null
+++ 
b/games-emulation/dolphin/files/dolphin-5.0_p20220520-libfmt-9.0.0-fix-build.patch
@@ -0,0 +1,32 @@
+From: Christopher Rudolph
+Fix build with libfmt-9.0.0
+Upstream report: https://github.com/dolphin-emu/dolphin/pull/10825
+
+diff --git a/Source/Core/Common/MsgHandler.h b/Source/Core/Common/MsgHandler.h
+index 750da51..1d6a467 100644
+--- a/Source/Core/Common/MsgHandler.h
 b/Source/Core/Common/MsgHandler.h
+@@ -41,7 +41,11 @@ bool MsgAlertFmt(bool yes_no, MsgType style, 
Common::Log::LogType log_type, cons
+   static_assert(NumFields == sizeof...(args),
+ "Unexpected number of replacement fields in format string; 
did you pass too few or "
+ "too many arguments?");
++#if FMT_VERSION >= 9
++  static_assert(fmt::detail::is_compile_string::value);
++#else
+   static_assert(fmt::is_compile_string::value);
++#endif
+   return MsgAlertFmtImpl(yes_no, style, log_type, file, line, format,
+  fmt::make_format_args(args...));
+ }
+@@ -56,7 +60,11 @@ bool MsgAlertFmtT(bool yes_no, MsgType style, 
Common::Log::LogType log_type, con
+   static_assert(NumFields == sizeof...(args),
+ "Unexpected number of replacement fields in format string; 
did you pass too few or "
+ "too many arguments?");
++#if FMT_VERSION >= 9
++  static_assert(fmt::detail::is_compile_string::value);
++#else
+   static_assert(fmt::is_compile_string::value);
++#endif
+   auto arg_list = fmt::make_format_args(args...);
+   return MsgAlertFmtImpl(yes_no, style, log_type, file, line, 
translated_format, arg_list);
+ }



[gentoo-commits] repo/gentoo:master commit in: media-libs/libvpx/

2022-07-10 Thread Sam James
commit: 4b3d0aba16352a5982cabb02fb3c1f9e5c59b6bd
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 10 23:58:34 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 10 23:58:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b3d0aba

media-libs/libvpx: add 1.12.0

Signed-off-by: Sam James  gentoo.org>

 media-libs/libvpx/Manifest |   2 +
 media-libs/libvpx/libvpx-1.12.0.ebuild | 139 +
 2 files changed, 141 insertions(+)

diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index 09a825a81ef6..ffce50d7218d 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -1,4 +1,6 @@
 DIST libvpx-1.11.0.tar.gz 5347256 BLAKE2B 
2c350e14fc3b8a3c10a71e230e893fbb9a68e6eeb6a413cc359bdbfddda21cc5c15d0de4b6110889845f88f8a946ef1266980c0a1b26aaf55b52330fe038e261
 SHA512 
7aa5d30afa956dccda60917fd82f6f9992944ca893437c8cd53a04d1b7a94e0210431954aa136594dc400340123cc166dcc855753e493c8d929667f4c42b65a5
+DIST libvpx-1.12.0.tar.gz 5465627 BLAKE2B 
92e61ef91ef3bb7e09f359acdef6469843921345b1008a7a24042587fbcfc72c4671fc9eb4e1bf8c1e9de0fa5506ed751dcd6934a9164a6e0fe528cfe8c23154
 SHA512 
dc059bc3102b75524ae29989372334b3e0f2acf1520e5a4daa4073831bb55949d82897c498fb9d2d38b59f1a66bb0ad24407d0d086b1e3a8394a4933f04f2ed0
 DIST libvpx-1.9.0.tar.gz 5326239 BLAKE2B 
6403a5d8326235a8d27ca3727f45398556cbe72cd125ae358c22f729cc01d6a81917cca8a6e97ad0ed01e7fc04ca4212baf21f371323b93ccc8830c4a11acf91
 SHA512 
8d544552b35000ea5712aec220b78bb5f7dc210704b2f609365214cb95a4f5a0e343b362723d829cb4a9ac203b10d5443700ba84b28fd6b2fefbabb40663e298
 DIST libvpx-testdata-1.11.0.tar.xz 444614504 BLAKE2B 
ab6de4c46a771dc1c0dfb19326e580a492768c629eebbfb276db7da02e13256b2a66fdaadf76e5856879e871c7a17fcff657139582b1a3a84ad39c6018b912be
 SHA512 
772e9d69dc9fc8e5a9411e1a532d908e86d90b03019e958349115a74697dcb35972ce71325312193d3a84030c3ff1d9bdbd09ed58918fffcba39c120ce4be868
+DIST libvpx-testdata-1.12.0.tar.xz 499226656 BLAKE2B 
8172ecbed4c678593882702c0d24e30d3e5d20a19c55ae73d4470ecd07b03905f25c62e1c32756e27fca2d02c841c11b11f1768dee60fa3419b8b983f6e66bf9
 SHA512 
28034e5940cd6a433eb6f8924ba5f0f555cb7526ff3356fa66282830a11818c32d2d70f6f9e959b278499397512663bca7f9de17e04b8b209efdf89e9d68ab57
 DIST libvpx-testdata-1.9.0.tar.xz 450868860 BLAKE2B 
aaed7f2ef4f70ff352e39be2630e3a5cd803e8d2408c4fd5c3e06e040a75d2f593a10bc267a497aa91eaceb64286e81f69e86ca0940160e4f34b62c08e91df7b
 SHA512 
bcc89062a436d652d15d5852a842cb4985c4783855b943ab11667c022b5082887129fd9579b8da3af209a3031f95ff8dc625c380f79559db160501cd676736ea

diff --git a/media-libs/libvpx/libvpx-1.12.0.ebuild 
b/media-libs/libvpx/libvpx-1.12.0.ebuild
new file mode 100644
index ..aac80b0f5c8f
--- /dev/null
+++ b/media-libs/libvpx/libvpx-1.12.0.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo toolchain-funcs multilib-minimal
+
+# To create a new testdata tarball:
+# 1. Unpack source tarball or checkout git tag
+# 2. mkdir libvpx-testdata
+# 3. export LIBVPX_TEST_DATA_PATH=libvpx-testdata
+# 4. ./configure --enable-unit-tests --enable-vp9-highbitdepth
+# 5. make testdata
+# 6. tar -caf libvpx-testdata-${MY_PV}.tar.xz libvpx-testdata
+
+LIBVPX_TESTDATA_VER=1.12.0
+
+DESCRIPTION="WebM VP8 and VP9 Codec SDK"
+HOMEPAGE="https://www.webmproject.org;
+SRC_URI="https://github.com/webmproject/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz
+   test? ( 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-testdata-${LIBVPX_TESTDATA_VER}.tar.xz
 )"
+
+LICENSE="BSD"
+SLOT="0/7"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 
~amd64-linux ~x86-linux"
+IUSE="cpu_flags_ppc_vsx3 doc +highbitdepth postproc static-libs test +threads"
+
+REQUIRED_USE="test? ( threads )"
+
+# Disable test phase when USE="-test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="dev-lang/perl
+   abi_x86_32? ( dev-lang/yasm )
+   abi_x86_64? ( dev-lang/yasm )
+   abi_x86_x32? ( dev-lang/yasm )
+   doc? (
+   app-doc/doxygen
+   dev-lang/php
+   )
+"
+
+PATCHES=(
+   # bug #501010
+   "${FILESDIR}/libvpx-1.3.0-sparc-configure.patch"
+)
+
+src_configure() {
+   # bug #384585, bug #465988
+   # copied from php-pear-r1.eclass
+   addpredict /usr/share/snmp/mibs/.index
+   addpredict /var/lib/net-snmp/
+   addpredict /var/lib/net-snmp/mib_indexes
+   addpredict /session_mm_cli0.sem
+   multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+   # bug #357487
+   unset CODECS
+
+   # bug #498364: sse doesn't work without sse2 enabled,
+   local myconfargs=(
+   --prefix="${EPREFIX}"/usr
+   --libdir="${EPREFIX}"/usr/$(get_libdir)
+   --enable-pic
+   --enable-vp8
+   --enable-vp9
+   --enable-shared
+   

[gentoo-commits] repo/gentoo:master commit in: net-libs/gtk-vnc/

2022-07-10 Thread Sam James
commit: f9ba7d9840ff4387cbd80b4064221946b25d923b
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 10 23:51:49 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 10 23:51:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9ba7d98

net-libs/gtk-vnc: Stabilize 1.3.0-r1 arm64, #857525

Signed-off-by: Sam James  gentoo.org>

 net-libs/gtk-vnc/gtk-vnc-1.3.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/gtk-vnc/gtk-vnc-1.3.0-r1.ebuild 
b/net-libs/gtk-vnc/gtk-vnc-1.3.0-r1.ebuild
index 338f242ae0c3..45689e6c8b6d 100644
--- a/net-libs/gtk-vnc/gtk-vnc-1.3.0-r1.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-1.3.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-meson-0.
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="+introspection pulseaudio sasl +vala"
 REQUIRED_USE="vala? ( introspection )"
 



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2022-07-10 Thread Sam James
commit: 9dbafb5358afea52f0abca8c2536b1643f3cec82
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 10 23:51:47 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 10 23:51:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dbafb53

net-analyzer/wireshark: Stabilize 3.6.6 arm64, #856028

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/wireshark-3.6.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.6.6.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.6.ebuild
index 38bd8ecc25ad..373d120f39a6 100644
--- a/net-analyzer/wireshark/wireshark-3.6.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.6.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz;
S="${WORKDIR}/${P/_/}"
 
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"



[gentoo-commits] repo/gentoo:master commit in: net-misc/spice-gtk/

2022-07-10 Thread Sam James
commit: 42d26e8d0bd360aa02102664876d49024c1594ab
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 10 23:51:48 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 10 23:51:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42d26e8d

net-misc/spice-gtk: Stabilize 0.40-r1 arm64, #857522

Signed-off-by: Sam James  gentoo.org>

 net-misc/spice-gtk/spice-gtk-0.40-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/spice-gtk/spice-gtk-0.40-r1.ebuild 
b/net-misc/spice-gtk/spice-gtk-0.40-r1.ebuild
index 889d11f7e6fd..a3293ca3b229 100644
--- a/net-misc/spice-gtk/spice-gtk-0.40-r1.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.40-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == ** ]] ; then
 else
SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.xz;
SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-meson-0.63.patch.xz;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
SPICE_PROTOCOL_VER=0.14.3
 fi



[gentoo-commits] repo/gentoo:master commit in: app-editors/okteta/

2022-07-10 Thread Sam James
commit: ab034a88f3b1e71608314a8e4f56e7e3f6becb60
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 10 23:51:46 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 10 23:51:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab034a88

app-editors/okteta: Stabilize 0.26.9 arm64, #850610

Signed-off-by: Sam James  gentoo.org>

 app-editors/okteta/okteta-0.26.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/okteta/okteta-0.26.9.ebuild 
b/app-editors/okteta/okteta-0.26.9.ebuild
index 15dde8a9410e..486db94692b3 100644
--- a/app-editors/okteta/okteta-0.26.9.ebuild
+++ b/app-editors/okteta/okteta-0.26.9.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/okteta/ 
https://utils.kde.org/projects/okteta/;
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-   KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+   KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2 handbook? ( FDL-1.2 )"



[gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/

2022-07-10 Thread Sam James
commit: 61394887cd6ffc910afd42989d39359e86acc25e
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 10 23:51:44 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 10 23:51:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61394887

media-tv/kodi: Stabilize 19.4 arm64, #850262

Signed-off-by: Sam James  gentoo.org>

 media-tv/kodi/kodi-19.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-tv/kodi/kodi-19.4.ebuild b/media-tv/kodi/kodi-19.4.ebuild
index 4ad36d1fd22b..af42cf6a5e3a 100644
--- a/media-tv/kodi/kodi-19.4.ebuild
+++ b/media-tv/kodi/kodi-19.4.ebuild
@@ -27,7 +27,7 @@ else
MY_PV="${MY_PV}-${CODENAME}"
MY_P="${PN}-${MY_PV}"
SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> 
${MY_P}.tar.gz"
-   KEYWORDS="amd64 ~arm ~arm64 x86"
+   KEYWORDS="amd64 ~arm arm64 x86"
S=${WORKDIR}/xbmc-${MY_PV}
 fi
 



[gentoo-commits] repo/gentoo:master commit in: dev-util/cppcheck/

2022-07-10 Thread Sam James
commit: 661b7b58a203bdcce713c25edd118dcd113f3427
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 10 23:45:56 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 10 23:50:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=661b7b58

dev-util/cppcheck: PEP517

Also, the Python tests I was referring to earlier are.. gone?

Bug: https://bugs.gentoo.org/826970
Signed-off-by: Sam James  gentoo.org>

 dev-util/cppcheck/cppcheck-2.8.1-r1.ebuild | 118 +
 1 file changed, 118 insertions(+)

diff --git a/dev-util/cppcheck/cppcheck-2.8.1-r1.ebuild 
b/dev-util/cppcheck/cppcheck-2.8.1-r1.ebuild
new file mode 100644
index ..9ef2ad93ab6c
--- /dev/null
+++ b/dev-util/cppcheck/cppcheck-2.8.1-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Python is used both for htmlreport (USE flag) but also for various
+# helper scripts in /usr/share/cppcheck.
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 cmake
+
+DESCRIPTION="Static analyzer of C/C++ code"
+HOMEPAGE="https://github.com/danmar/cppcheck;
+SRC_URI="https://github.com/danmar/cppcheck/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+IUSE="htmlreport pcre qt5 test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   dev-libs/tinyxml2:=
+   htmlreport? (
+   $(python_gen_cond_dep '
+   dev-python/pygments[${PYTHON_USEDEP}]
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   ')
+   )
+   pcre? ( dev-libs/libpcre )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qthelp
+   dev-qt/qtprintsupport:5
+   )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   app-text/docbook-xsl-stylesheets
+   dev-libs/libxslt
+   virtual/pkgconfig
+   qt5? ( dev-qt/linguist-tools:5 )
+   test? (
+   htmlreport? (
+   $(python_gen_cond_dep 
'dev-python/unittest-or-fail[${PYTHON_USEDEP}]')
+   )
+   )
+"
+
+src_prepare() {
+   cmake_src_prepare
+
+   distutils-r1_src_prepare
+}
+
+python_prepare_all() {
+   distutils-r1_python_prepare_all
+
+   rm htmlreport/test_htmlreport.py || die
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DHAVE_RULES="$(usex pcre)"
+   -DBUILD_GUI="$(usex qt5)"
+   -DFILESDIR="${EPREFIX}/usr/share/${PN}/"
+   -DENABLE_OSS_FUZZ=OFF
+   -DUSE_BUNDLED_TINYXML2=OFF
+   -DBUILD_TESTS="$(usex test)"
+   )
+
+   cmake_src_configure
+}
+
+src_compile() {
+   cmake_src_compile
+
+   if use htmlreport ; then
+   pushd htmlreport || die
+   distutils-r1_src_compile
+   popd || die
+   fi
+}
+
+python_install() {
+   if use htmlreport ; then
+   pushd htmlreport || die
+   distutils-r1_python_install
+   popd || die
+   fi
+}
+
+python_install_all() {
+   distutils-r1_python_install_all
+
+   python_fix_shebang "${ED}"/usr/share/cppcheck/*
+}
+
+src_install() {
+   cmake_src_install
+
+   insinto /usr/share/${PN}/cfg
+   doins cfg/*.cfg
+
+   if use qt5 ; then
+   dobin "${WORKDIR}/${P}_build/bin/${PN}-gui"
+   dodoc gui/{projectfile.txt,gui.${PN}}
+   fi
+
+   distutils-r1_src_install
+
+   dodoc -r tools/triage
+}



[gentoo-commits] repo/gentoo:master commit in: net-libs/gtk-vnc/

2022-07-10 Thread Sam James
commit: 009efa4cc0bedf6a7bbd62fa34d7dc5bdb3e5389
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 10 23:14:50 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 10 23:14:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=009efa4c

net-libs/gtk-vnc: Stabilize 1.3.0-r1 amd64, #857525

Signed-off-by: Sam James  gentoo.org>

 net-libs/gtk-vnc/gtk-vnc-1.3.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/gtk-vnc/gtk-vnc-1.3.0-r1.ebuild 
b/net-libs/gtk-vnc/gtk-vnc-1.3.0-r1.ebuild
index ce015cdc3d5b..338f242ae0c3 100644
--- a/net-libs/gtk-vnc/gtk-vnc-1.3.0-r1.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-1.3.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-meson-0.
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="+introspection pulseaudio sasl +vala"
 REQUIRED_USE="vala? ( introspection )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-block/libzbc/files/, sys-block/libzbc/

2022-07-10 Thread Sam James
commit: c95d0ad1b89e7b7aab7859b0f0394110a30dbec0
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 10 23:08:27 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 10 23:08:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c95d0ad1

sys-block/libzbc: drop 5.5.1

Bug: https://bugs.gentoo.org/857462
Signed-off-by: Sam James  gentoo.org>

 sys-block/libzbc/Manifest  |  1 -
 sys-block/libzbc/files/libzbc-5.5.1-gcc-10.patch   | 64 --
 .../libzbc/files/libzbc-no-automagic-gtk-dep.patch | 29 --
 sys-block/libzbc/libzbc-5.5.1.ebuild   | 40 --
 4 files changed, 134 deletions(-)

diff --git a/sys-block/libzbc/Manifest b/sys-block/libzbc/Manifest
index 223f12cb75df..8b58f5626601 100644
--- a/sys-block/libzbc/Manifest
+++ b/sys-block/libzbc/Manifest
@@ -1,2 +1 @@
-DIST libzbc-5.5.1.tar.gz 128638 BLAKE2B 
3cb636f29ff29bb87c86bd800231a1b45f517822e5785af599a6385705dffa1e90574e4bd2c1b310d5a0dab094cf6e878fc80b6178ea4eb028d5d1d174e7559a
 SHA512 
cb060d06839ea207ed2e32e940348176dd0eff2279cbdb72f565bef177eb4a195feea67c4d1ed5f455e3839475e0f4557a45774129e3d9e009ea38f9134ae159
 DIST libzbc-5.9.0.tar.gz 131517 BLAKE2B 
eb05214ffea376930f1b4327152da687067023eab929ed1db123ea3bc80e0f036dfbe9889da2707f1c3842120d4fc3b2c8ab471731d45d5483fe947c21fc7cad
 SHA512 
bcdf294d86867736826af06ad6d18dec31630b3f5bc6e3e98c228bec6a30efcce76a27e3c66a08ce670614ca016dc079894320cff340bafe126fcb40973e8302

diff --git a/sys-block/libzbc/files/libzbc-5.5.1-gcc-10.patch 
b/sys-block/libzbc/files/libzbc-5.5.1-gcc-10.patch
deleted file mode 100644
index 78511bf521d2..
--- a/sys-block/libzbc/files/libzbc-5.5.1-gcc-10.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-https://github.com/hgst/libzbc/commit/1f3a63432bb5a4ca47a5839181c8f13512848b6c
-https://bugs.gentoo.org/707808
-
-From 1f3a63432bb5a4ca47a5839181c8f13512848b6c Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt 
-Date: Mon, 16 Mar 2020 08:01:44 +0100
-Subject: [PATCH] build: avoid double definition of zbc_log_drv etc.
-
-When -fno-common is in use, what compiler writers are trying to make
-a standard, libzbc fails to build.
-
-$ make V=1
-Making all in .
-make[1]: Entering directory '~/libzbc'
-/bin/sh ./libtool  --tag=CC   --mode=link gcc  -fPIC -fno-common -O2 -g 
-pthread -Wl,--version-script,./exports -release '5.8.5'  -o libzbc.la -rpath 
/usr/lib lib/libzbc_la-zbc.lo lib/libzbc_la-zbc_block.lo 
lib/libzbc_la-zbc_sg.lo lib/libzbc_la-zbc_scsi.lo lib/libzbc_la-zbc_ata.lo 
lib/libzbc_la-zbc_fake.lo
-libtool: link: gcc -shared  -fPIC -DPIC  lib/.libs/libzbc_la-zbc.o 
lib/.libs/libzbc_la-zbc_block.o lib/.libs/libzbc_la-zbc_sg.o 
lib/.libs/libzbc_la-zbc_scsi.o lib/.libs/libzbc_la-zbc_ata.o 
lib/.libs/libzbc_la-zbc_fake.o-O2 -g -pthread -Wl,--version-script 
-Wl,./exports   -pthread -Wl,-soname -Wl,libzbc-5.8.5.so -o 
.libs/libzbc-5.8.5.so
-/usr/lib64/gcc/x86_64-suse-linux/9/../../../../x86_64-suse-linux/bin/ld: 
lib/.libs/libzbc_la-zbc_block.o:~/libzbc/lib/zbc.h:269: multiple definition of 
`zbc_log_level'; lib/.libs/libzbc_la-zbc.o:~/libzbc/lib/zbc.h:269: first 
defined here
-/usr/lib64/gcc/x86_64-suse-linux/9/../../../../x86_64-suse-linux/bin/ld: 
lib/.libs/libzbc_la-zbc_block.o:~/libzbc/lib/zbc.h:195: multiple definition of 
`zbc_fake_drv'; lib/.libs/libzbc_la-zbc.o:~/libzbc/lib/zbc.h:195: first defined 
here
-
-References: https://bugzilla.suse.com/show_bug.cgi?id=1160244

- lib/zbc.h | 10 +-
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/lib/zbc.h b/lib/zbc.h
-index 7dec298..73d76db 100644
 a/lib/zbc.h
-+++ b/lib/zbc.h
-@@ -177,22 +177,22 @@ static inline void zbc_set_errno(enum zbc_sk sk, enum 
zbc_asc_ascq asc_ascq)
- /**
-  * Block device driver (requires kernel support).
-  */
--struct zbc_drv zbc_block_drv;
-+extern struct zbc_drv zbc_block_drv;
- 
- /**
-  * ZAC (ATA) device driver (uses SG_IO).
-  */
--struct zbc_drv zbc_ata_drv;
-+extern struct zbc_drv zbc_ata_drv;
- 
- /**
-  * ZBC (SCSI) device driver (uses SG_IO).
-  */
--struct zbc_drv zbc_scsi_drv;
-+extern struct zbc_drv zbc_scsi_drv;
- 
- /**
-  * ZBC emulation driver (file or block device).
-  */
--struct zbc_drv zbc_fake_drv;
-+extern struct zbc_drv zbc_fake_drv;
- 
- #define container_of(ptr, type, member) \
- ((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member)))
-@@ -266,7 +266,7 @@ enum {
- /**
-  * Library log level.
-  */
--int zbc_log_level;
-+extern int zbc_log_level;
- 
- #define zbc_print(stream,format,args...)  \
-   do {\

diff --git a/sys-block/libzbc/files/libzbc-no-automagic-gtk-dep.patch 
b/sys-block/libzbc/files/libzbc-no-automagic-gtk-dep.patch
deleted file mode 100644
index c6545033b435..
--- a/sys-block/libzbc/files/libzbc-no-automagic-gtk-dep.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 122fd22..5ab9783 100644
 

[gentoo-commits] repo/gentoo:master commit in: sys-block/libzbc/

2022-07-10 Thread Sam James
commit: 93477880c630c40e6ac929487c802eb37ec73053
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 10 23:07:46 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 10 23:07:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93477880

sys-block/libzbc: Stabilize 5.9.0 amd64, #857462

Signed-off-by: Sam James  gentoo.org>

 sys-block/libzbc/libzbc-5.9.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-block/libzbc/libzbc-5.9.0.ebuild 
b/sys-block/libzbc/libzbc-5.9.0.ebuild
index 1c4108e3e803..d478f8d6ecef 100644
--- a/sys-block/libzbc/libzbc-5.9.0.ebuild
+++ b/sys-block/libzbc/libzbc-5.9.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hgst/${PN}/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~s390 ~sparc x86"
 IUSE="gtk"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-python/myst_parser/

2022-07-10 Thread Sam James
commit: d9201c6e8d52342e1f0c090e9154ee90f50ffe59
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 10 23:07:43 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 10 23:07:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9201c6e

dev-python/myst_parser: Stabilize 0.18.0 amd64, #857330

Signed-off-by: Sam James  gentoo.org>

 dev-python/myst_parser/myst_parser-0.18.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/myst_parser/myst_parser-0.18.0.ebuild 
b/dev-python/myst_parser/myst_parser-0.18.0.ebuild
index a977da127b9f..0f26725c5194 100644
--- a/dev-python/myst_parser/myst_parser-0.18.0.ebuild
+++ b/dev-python/myst_parser/myst_parser-0.18.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="


[gentoo-commits] repo/gentoo:master commit in: dev-python/pikepdf/

2022-07-10 Thread Sam James
commit: 3605fb5b654314c6ee5c4d7c24ff51004a5c5286
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 10 23:07:39 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 10 23:07:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3605fb5b

dev-python/pikepdf: Stabilize 5.2.0-r1 amd64, #857372

Signed-off-by: Sam James  gentoo.org>

 dev-python/pikepdf/pikepdf-5.2.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/pikepdf/pikepdf-5.2.0-r1.ebuild 
b/dev-python/pikepdf/pikepdf-5.2.0-r1.ebuild
index 2b080c8a66ca..8968d3f1b5b7 100644
--- a/dev-python/pikepdf/pikepdf-5.2.0-r1.ebuild
+++ b/dev-python/pikepdf/pikepdf-5.2.0-r1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="
>=app-text/qpdf-10.6.2:0=



[gentoo-commits] repo/gentoo:master commit in: dev-python/pyu2f/

2022-07-10 Thread Sam James
commit: e5d2f3f618995e16958b53ffda23256e19146c10
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 10 23:07:29 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 10 23:07:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5d2f3f6

dev-python/pyu2f: Stabilize 0.1.5-r1 amd64, #857396

Signed-off-by: Sam James  gentoo.org>

 dev-python/pyu2f/pyu2f-0.1.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/pyu2f/pyu2f-0.1.5-r1.ebuild 
b/dev-python/pyu2f/pyu2f-0.1.5-r1.ebuild
index ddaba9573d9d..a69df87e81ac 100644
--- a/dev-python/pyu2f/pyu2f-0.1.5-r1.ebuild
+++ b/dev-python/pyu2f/pyu2f-0.1.5-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
dev-python/six[${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: dev-python/shapely/

2022-07-10 Thread Sam James
commit: dbee32c16e92febb1b3dd5d8a5ab133afa19f119
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 10 23:07:32 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 10 23:07:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbee32c1

dev-python/shapely: Stabilize 1.8.2 amd64, #857444

Signed-off-by: Sam James  gentoo.org>

 dev-python/shapely/shapely-1.8.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/shapely/shapely-1.8.2.ebuild 
b/dev-python/shapely/shapely-1.8.2.ebuild
index d32875dbc870..a437821df180 100644
--- a/dev-python/shapely/shapely-1.8.2.ebuild
+++ b/dev-python/shapely/shapely-1.8.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
>=sci-libs/geos-3.9



[gentoo-commits] repo/gentoo:master commit in: dev-util/stripe-mock/

2022-07-10 Thread Sam James
commit: da5acbf3648c27758909276cb1e35359cc563bb4
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 10 23:07:36 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 10 23:07:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da5acbf3

dev-util/stripe-mock: Stabilize 0.136.0 amd64, #857447

Signed-off-by: Sam James  gentoo.org>

 dev-util/stripe-mock/stripe-mock-0.136.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/stripe-mock/stripe-mock-0.136.0.ebuild 
b/dev-util/stripe-mock/stripe-mock-0.136.0.ebuild
index 441710e6dec3..dd59db8ef887 100644
--- a/dev-util/stripe-mock/stripe-mock-0.136.0.ebuild
+++ b/dev-util/stripe-mock/stripe-mock-0.136.0.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT ISC BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 src_compile() {
emake build



[gentoo-commits] repo/gentoo:master commit in: dev-python/sphinx-pytest/

2022-07-10 Thread Sam James
commit: 93e6f0d54fdb6be74a7237ed24d15d89b7c58129
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 10 23:07:42 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 10 23:07:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93e6f0d5

dev-python/sphinx-pytest: Stabilize 0.0.4 amd64, #857330

Signed-off-by: Sam James  gentoo.org>

 dev-python/sphinx-pytest/sphinx-pytest-0.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/sphinx-pytest/sphinx-pytest-0.0.4.ebuild 
b/dev-python/sphinx-pytest/sphinx-pytest-0.0.4.ebuild
index 942e5a8d5d8f..e742b2e7d9ff 100644
--- a/dev-python/sphinx-pytest/sphinx-pytest-0.0.4.ebuild
+++ b/dev-python/sphinx-pytest/sphinx-pytest-0.0.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
dev-python/pytest[${PYTHON_USEDEP}]



[gentoo-commits] repo/proj/libressl:master commit in: net-nds/openldap/, net-nds/openldap/files/

2022-07-10 Thread Quentin Retornaz
commit: 22d7398c75ccff4bcf6a7029e2fe5227e2d9f28f
Author: orbea  riseup  net>
AuthorDate: Fri Jul  8 15:42:32 2022 +
Commit: Quentin Retornaz  retornaz  com>
CommitDate: Sun Jul 10 22:51:15 2022 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=22d7398c

net-nds/openldap: Add 2.6.1-r1 + 2.6.2

Fix copied from OpenBSD:

  bypass autoconf check for OpenSSL 1.1.1+ function which is not
  actually used in OpenLDAP code

  export ac_cv_lib_ssl_SSL_export_keying_material_early=yes

Earlier 2.4.x versions now work with libressl-3.5.x using the ebuilds from
the ::gentoo repo while 2.5.4-r1 lacks keywords and is broken for unrelated
reasons.

Signed-off-by: orbea  riseup.net>
Signed-off-by: Quentin Retornaz  retornaz.com>

 net-nds/openldap/Manifest  |   2 +
 .../files/openldap-2.2.14-perlthreadsfix.patch |   5 +-
 .../openldap/files/openldap-2.4.11-libldap_r.patch |   5 +-
 .../openldap/files/openldap-2.4.15-ppolicy.patch   |   4 +-
 net-nds/openldap/files/openldap-2.4.17-gcc44.patch |   5 +-
 .../openldap/files/openldap-2.4.28-fix-dash.patch  |   2 -
 .../files/openldap-2.4.28-gnutls-gcrypt.patch  |   4 +-
 .../files/openldap-2.4.35-contrib-samba4.patch |   5 +-
 .../files/openldap-2.4.35-contrib-smbk5pwd.patch   |   5 +-
 .../files/openldap-2.4.42-mdb-unbundle.patch   |  16 +-
 ...enldap-2.4.45-fix-lmpasswd-gnutls-symbols.patch |   4 +-
 .../openldap/files/openldap-2.4.47-warnings.patch  |   6 -
 .../files/openldap-2.4.6-evolution-ntlm.patch  |  15 +-
 net-nds/openldap/files/openldap-2.6.1-cloak.patch  |  21 +
 .../openldap-2.6.1-fix-bashism-configure.patch |  11 +
 .../files/openldap-2.6.1-fix-missing-mapping.patch |  15 +
 net-nds/openldap/files/openldap-2.6.1-flags.patch  | 352 +
 .../openldap/files/openldap-2.6.1-make-flags.patch |  59 ++
 .../files/openldap-2.6.1-parallel-build.patch  |  46 ++
 ...undle.patch => openldap-2.6.1-system-mdb.patch} | 140 ++--
 net-nds/openldap/files/slapd-2.6.1.service |  12 +
 net-nds/openldap/files/slapd-confd-2.6.1   |  26 +
 net-nds/openldap/files/slapd-initd |  10 +-
 net-nds/openldap/files/slapd-initd-2.4.40-r2   |   4 +-
 net-nds/openldap/metadata.xml  |   7 +-
 net-nds/openldap/openldap-2.6.1-r1.ebuild  | 804 +
 net-nds/openldap/openldap-2.6.2.ebuild | 803 
 27 files changed, 2266 insertions(+), 122 deletions(-)

diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index cefb5ba..449821d 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -1,2 +1,4 @@
 DIST openldap-2.4.56.tgz 5885444 BLAKE2B 
cebb189346f9114ed6e2dbb11a836c0b802e28f42d49351d6e807cba9c0f49e85ab3dbb34260b7c5eb3849c181eb51046ef48f555083647e3ce83209d6224bbb
 SHA512 
cf371db5595d5b6643db3e6788ce56e34fe271c244dd39d781cadd2a7f85cec421a51c11a4857a7e286ba94a27c1f0dab0ff27e8de20208587471f4a589588e6
+DIST openldap-OPENLDAP_REL_ENG_2_6_1.tar.gz 6211863 BLAKE2B 
81f4591db483a214351c2e02631fef2875e17e0890fc621182d2ed61d927c3c029a4f290ee6c0788952495d6f7a76ed15e62557b8d8f2e241d867e19fdf223b7
 SHA512 
ca61c1dccf3194d8d149ca0c45a4834d6fadf67a3676cf348f5f62ab92c94bc7501216d7da681c3a6f87f646a18d0f3d116c3d3a24d2e5cbebc6c695c986e517
+DIST openldap-OPENLDAP_REL_ENG_2_6_2.tar.gz 6216063 BLAKE2B 
51c8d5ee712971c1aeeaedfc7bb89e65b2ccc2dc171bd0fb99e2b568d70ea5c66903194ab92a66de88fd9bc78511ffee0ab595b13a725933c7084943ac8c624a
 SHA512 
0668165e194a7b1a483f88bf6b0f6eab2707c404f6c3164948cb11896c5e5411972a0677a927c0e509e98bfebb75b79e514bb6346b23d35687d9234f973d7520
 DIST rfc2307bis.schema-20140524 12262 BLAKE2B 
98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99
 SHA512 
83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e

diff --git a/net-nds/openldap/files/openldap-2.2.14-perlthreadsfix.patch 
b/net-nds/openldap/files/openldap-2.2.14-perlthreadsfix.patch
index ddb6672..2a8c4bc 100644
--- a/net-nds/openldap/files/openldap-2.2.14-perlthreadsfix.patch
+++ b/net-nds/openldap/files/openldap-2.2.14-perlthreadsfix.patch
@@ -1,6 +1,5 @@
-diff -ur openldap-2.2.14.orig/servers/slapd/back-perl/Makefile.in 
openldap-2.2.14/servers/slapd/back-perl/Makefile.in
 openldap-2.2.14.orig/servers/slapd/back-perl/Makefile.in   2004-04-12 
11:20:14.0 -0700
-+++ openldap-2.2.14/servers/slapd/back-perl/Makefile.in2004-06-20 
18:43:41.0 -0700
+--- a/servers/slapd/back-perl/Makefile.in
 b/servers/slapd/back-perl/Makefile.in
 @@ -31,7 +31,7 @@
  
  shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)

diff --git a/net-nds/openldap/files/openldap-2.4.11-libldap_r.patch 
b/net-nds/openldap/files/openldap-2.4.11-libldap_r.patch
index 448249a..f63ad3c 100644
--- a/net-nds/openldap/files/openldap-2.4.11-libldap_r.patch
+++ 

[gentoo-commits] repo/proj/libressl:master commit in: net-nds/openldap/, net-nds/openldap/files/

2022-07-10 Thread Quentin Retornaz
commit: c56dc77a5eb29dc6ecdeacb6b74c153bcf1a86c0
Author: orbea  riseup  net>
AuthorDate: Fri Jul  8 15:46:11 2022 +
Commit: Quentin Retornaz  retornaz  com>
CommitDate: Sun Jul 10 22:51:15 2022 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=c56dc77a

net-nds/openldap: Remove old version

Signed-off-by: orbea  riseup.net>
Closes: https://github.com/gentoo/libressl/pull/446
Signed-off-by: Quentin Retornaz  retornaz.com>

 net-nds/openldap/Manifest  |   1 -
 .../openldap/files/openldap-2.4.47-libressl.patch  |  58 --
 net-nds/openldap/openldap-2.4.56.ebuild| 905 -
 3 files changed, 964 deletions(-)

diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 449821d..dfa5c56 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -1,4 +1,3 @@
-DIST openldap-2.4.56.tgz 5885444 BLAKE2B 
cebb189346f9114ed6e2dbb11a836c0b802e28f42d49351d6e807cba9c0f49e85ab3dbb34260b7c5eb3849c181eb51046ef48f555083647e3ce83209d6224bbb
 SHA512 
cf371db5595d5b6643db3e6788ce56e34fe271c244dd39d781cadd2a7f85cec421a51c11a4857a7e286ba94a27c1f0dab0ff27e8de20208587471f4a589588e6
 DIST openldap-OPENLDAP_REL_ENG_2_6_1.tar.gz 6211863 BLAKE2B 
81f4591db483a214351c2e02631fef2875e17e0890fc621182d2ed61d927c3c029a4f290ee6c0788952495d6f7a76ed15e62557b8d8f2e241d867e19fdf223b7
 SHA512 
ca61c1dccf3194d8d149ca0c45a4834d6fadf67a3676cf348f5f62ab92c94bc7501216d7da681c3a6f87f646a18d0f3d116c3d3a24d2e5cbebc6c695c986e517
 DIST openldap-OPENLDAP_REL_ENG_2_6_2.tar.gz 6216063 BLAKE2B 
51c8d5ee712971c1aeeaedfc7bb89e65b2ccc2dc171bd0fb99e2b568d70ea5c66903194ab92a66de88fd9bc78511ffee0ab595b13a725933c7084943ac8c624a
 SHA512 
0668165e194a7b1a483f88bf6b0f6eab2707c404f6c3164948cb11896c5e5411972a0677a927c0e509e98bfebb75b79e514bb6346b23d35687d9234f973d7520
 DIST rfc2307bis.schema-20140524 12262 BLAKE2B 
98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99
 SHA512 
83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e

diff --git a/net-nds/openldap/files/openldap-2.4.47-libressl.patch 
b/net-nds/openldap/files/openldap-2.4.47-libressl.patch
deleted file mode 100644
index 5e5b3e3..000
--- a/net-nds/openldap/files/openldap-2.4.47-libressl.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/libraries/libldap/tls_o.c b/libraries/libldap/tls_o.c
-index b0277dfe9..8a3f47a74 100644
 a/libraries/libldap/tls_o.c
-+++ b/libraries/libldap/tls_o.c
-@@ -50,7 +50,7 @@
- #include 
- #endif
- 
--#if OPENSSL_VERSION_NUMBER >= 0x1010
-+#if OPENSSL_VERSION_NUMBER >= 0x1010 && !defined(LIBRESSL_VERSION_NUMBER)
- #define ASN1_STRING_data(x)   ASN1_STRING_get0_data(x)
- #endif
- 
-@@ -200,7 +200,7 @@ tlso_init( void )
-   (void) tlso_seed_PRNG( lo->ldo_tls_randfile );
- #endif
- 
--#if OPENSSL_VERSION_NUMBER < 0x1010
-+#if OPENSSL_VERSION_NUMBER < 0x1010 || defined(LIBRESSL_VERSION_NUMBER)
-   SSL_load_error_strings();
-   SSL_library_init();
-   OpenSSL_add_all_digests();
-@@ -252,7 +252,7 @@ static void
- tlso_ctx_ref( tls_ctx *ctx )
- {
-   tlso_ctx *c = (tlso_ctx *)ctx;
--#if OPENSSL_VERSION_NUMBER < 0x1010
-+#if OPENSSL_VERSION_NUMBER < 0x1010 || defined(LIBRESSL_VERSION_NUMBER)
- #define   SSL_CTX_up_ref(ctx) CRYPTO_add( &(ctx->references), 1, 
CRYPTO_LOCK_SSL_CTX )
- #endif
-   SSL_CTX_up_ref( c );
-@@ -511,7 +511,7 @@ tlso_session_my_dn( tls_session *sess, struct berval 
*der_dn )
-   if (!x) return LDAP_INVALID_CREDENTIALS;
-   
-   xn = X509_get_subject_name(x);
--#if OPENSSL_VERSION_NUMBER < 0x1010
-+#if OPENSSL_VERSION_NUMBER < 0x1010 || defined(LIBRESSL_VERSION_NUMBER)
-   der_dn->bv_len = i2d_X509_NAME( xn, NULL );
-   der_dn->bv_val = xn->bytes->data;
- #else
-@@ -547,7 +547,7 @@ tlso_session_peer_dn( tls_session *sess, struct berval 
*der_dn )
-   return LDAP_INVALID_CREDENTIALS;
- 
-   xn = X509_get_subject_name(x);
--#if OPENSSL_VERSION_NUMBER < 0x1010
-+#if OPENSSL_VERSION_NUMBER < 0x1010 || defined(LIBRESSL_VERSION_NUMBER)
-   der_dn->bv_len = i2d_X509_NAME( xn, NULL );
-   der_dn->bv_val = xn->bytes->data;
- #else
-@@ -768,7 +768,7 @@ struct tls_data {
-   Sockbuf_IO_Desc *sbiod;
- };
- 
--#if OPENSSL_VERSION_NUMBER < 0x1010
-+#if OPENSSL_VERSION_NUMBER < 0x1010 || defined(LIBRESSL_VERSION_NUMBER)
- #define BIO_set_init(b, x)b->init = x
- #define BIO_set_data(b, x)b->ptr = x
- #define BIO_clear_flags(b, x) b->flags &= ~(x)

diff --git a/net-nds/openldap/openldap-2.4.56.ebuild 
b/net-nds/openldap/openldap-2.4.56.ebuild
deleted file mode 100644
index 074195f..000
--- a/net-nds/openldap/openldap-2.4.56.ebuild
+++ /dev/null
@@ -1,905 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-

[gentoo-commits] repo/proj/libressl:master commit in: net-libs/ldns/files/, net-libs/ldns/

2022-07-10 Thread Quentin Retornaz
commit: e3fce3694156e8fd4a82d973fd35706ed66ae3cc
Author: orbea  riseup  net>
AuthorDate: Thu Jul  7 23:05:41 2022 +
Commit: Quentin Retornaz  retornaz  com>
CommitDate: Sun Jul 10 22:51:02 2022 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=e3fce369

net-libs/ldns: Add package

Patch from OpenBSD.

Signed-off-by: orbea  riseup.net>
Signed-off-by: Quentin Retornaz  retornaz.com>

 net-libs/ldns/Manifest |   3 +
 net-libs/ldns/files/ldns-1.7.1-Makefile.patch  |  11 +++
 net-libs/ldns/files/ldns-1.7.1-libressl.patch  |  84 
 net-libs/ldns/files/ldns-1.8.1-pkgconfig.patch |  10 ++
 net-libs/ldns/ldns-1.7.1-r5.ebuild | 122 +++
 net-libs/ldns/ldns-1.7.1-r6.ebuild | 112 +
 net-libs/ldns/ldns-1.8.0-r1.ebuild | 132 +
 net-libs/ldns/ldns-1.8.0-r4.ebuild | 123 +++
 net-libs/ldns/ldns-1.8.1.ebuild|  93 +
 net-libs/ldns/metadata.xml |  24 +
 10 files changed, 714 insertions(+)

diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
new file mode 100644
index 000..fae7322
--- /dev/null
+++ b/net-libs/ldns/Manifest
@@ -0,0 +1,3 @@
+DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 
8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d
 SHA512 
e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
+DIST ldns-1.8.0.tar.gz 1283220 BLAKE2B 
f916a8c76d788ac7c52aea8bfe675ad4c614a0c6fb011b61f5a27d4a5dc1a2adb33b5c6992b4813b3758c9b7cceab1c77f8c1d66baaa4de993f23888bce69df1
 SHA512 
54b306160bb7fd76d181f4be0a13134017f6f98ae96e0c954409f31f262e9dbe611c4b76fb6dff47bb6155c652ed8d026b52a50dfcf611e54d9c204b314c4fd6
+DIST ldns-1.8.1.tar.gz 1284971 BLAKE2B 
ae01ef32571fe3996ddd41f911815239abb704ea1dee479fa612bfd701ca369222ab709923f014662248988cb4452a75bc5debad47d2b0386dc59169b353e6a3
 SHA512 
600f8e221716742caf439a425008827aef1814fc1d9e751f8f492d0235ff45ca48df90abba17979bac9f4485947bb9fe8102924d9cebe6cb56d5b788e1c4bd14

diff --git a/net-libs/ldns/files/ldns-1.7.1-Makefile.patch 
b/net-libs/ldns/files/ldns-1.7.1-Makefile.patch
new file mode 100644
index 000..d654bbd
--- /dev/null
+++ b/net-libs/ldns/files/ldns-1.7.1-Makefile.patch
@@ -0,0 +1,11 @@
+--- Makefile.in.orig   2019-09-29 15:17:24.728446345 +0200
 Makefile.in2019-09-29 15:18:09.544008785 +0200
+@@ -301,7 +301,7 @@
+   $(COMP_LIB) -I./include/ldns $(LIBSSL_CPPFLAGS) $(PYTHON_CPPFLAGS) 
$(PYTHON_X_CFLAGS) -c $(pywrapdir)/ldns_wrapper.c -o $@
+ 
+ _ldns.la: ldns_wrapper.lo libldns.la 
+-  $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(PYTHON_CFLAGS) 
$(LDFLAGS) $(PYTHON_LDFLAGS) -module -version-info $(version_info) 
-no-undefined -o $@ ldns_wrapper.lo -rpath $(python_site) -L. -L.libs -lldns 
$(LIBS)
++  $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(PYTHON_CFLAGS) 
-module -version-info $(version_info) -no-undefined -o $@ ldns_wrapper.lo 
-rpath $(python_site) -L. -L.libs -lldns $(LDFLAGS) $(PYTHON_LDFLAGS) $(LIBS) 
+ 
+ $(p5_dns_ldns_dir)/Makefile: $(p5_dns_ldns_dir)/Makefile.PL
+   BUILDDIR=`pwd`; cd $(p5_dns_ldns_dir); 
LD_LIBRARY_PATH="$$BUILDDIR/.libs:$$LD_LIBRARY_PATH" 
DYLD_LIBRARY_PATH="$$BUILDDIR/.libs:$$DYLD_LIBRARY_PATH" $(PERL) Makefile.PL 
LIBS="-L$$BUILDDIR/.libs -lldns" INC="-I$$BUILDDIR"

diff --git a/net-libs/ldns/files/ldns-1.7.1-libressl.patch 
b/net-libs/ldns/files/ldns-1.7.1-libressl.patch
new file mode 100644
index 000..916380b
--- /dev/null
+++ b/net-libs/ldns/files/ldns-1.7.1-libressl.patch
@@ -0,0 +1,84 @@
+From OpenBSD.
+
+Fix build with opaque DSA/RSA in LibreSSL 3.5.
+https://github.com/NLnetLabs/ldns/pull/151
+
+Index: dnssec.c
+--- a/dnssec.c.orig
 b/dnssec.c
+@@ -380,7 +380,7 @@ ldns_key_buf2dsa_raw(const unsigned char* key, size_t
+   BN_free(Y);
+   return NULL;
+   }
+-#if OPENSSL_VERSION_NUMBER < 0x1010 || defined(HAVE_LIBRESSL)
++#if OPENSSL_VERSION_NUMBER < 0x1010
+ #ifndef S_SPLINT_S
+   dsa->p = P;
+   dsa->q = Q;
+@@ -466,7 +466,7 @@ ldns_key_buf2rsa_raw(const unsigned char* key, size_t
+   BN_free(modulus);
+   return NULL;
+   }
+-#if OPENSSL_VERSION_NUMBER < 0x1010 || defined(HAVE_LIBRESSL)
++#if OPENSSL_VERSION_NUMBER < 0x1010
+ #ifndef S_SPLINT_S
+   rsa->n = modulus;
+
+Fix build with opaque DSA/RSA in LibreSSL 3.5.
+https://github.com/NLnetLabs/ldns/pull/151
+
+Index: host2str.c
+--- a/host2str.c.orig
 b/host2str.c
+@@ -2207,7 +2207,7 @@ ldns_key2buffer_str(ldns_buffer *output, const ldns_ke
+   const BIGNUM *n=NULL, *e=NULL, *d=NULL,
+   *p=NULL, *q=NULL, *dmp1=NULL,
+ 

[gentoo-commits] repo/proj/libressl:master commit in: mail-filter/opendkim/, mail-filter/opendkim/files/

2022-07-10 Thread Quentin Retornaz
commit: d800e2954ff4f087ee42605291e0c1e23bfadbee
Author: orbea  riseup  net>
AuthorDate: Thu Jul  7 23:23:33 2022 +
Commit: Quentin Retornaz  retornaz  com>
CommitDate: Sun Jul 10 22:51:02 2022 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=d800e295

mail-filter/opendkim: Remove package

Works with libressl-3.5.x and opendkim-2.10.3-r29::gentoo.

Signed-off-by: orbea  riseup.net>
Closes: https://github.com/gentoo/libressl/pull/445
Signed-off-by: Quentin Retornaz  retornaz.com>

 mail-filter/opendkim/Manifest  |   1 -
 .../opendkim-2.10.3-define-P-macro-in-libvbr.patch |  40 ---
 .../opendkim-2.10.3-fix-libmilter-search.patch | 223 
 .../files/opendkim-2.10.3-lua-pkgconfig-pt2.patch  |  51 
 .../files/opendkim-2.10.3-lua-pkgconfig.patch  | 174 
 .../opendkim/files/opendkim-2.10.3-openrc.patch| 295 -
 .../files/opendkim-2.10.3-openssl-1.1.1.patch.r2   | 170 
 mail-filter/opendkim/metadata.xml  |  59 -
 mail-filter/opendkim/opendkim-2.10.3-r17.ebuild| 224 
 mail-filter/opendkim/opendkim-2.10.3-r19.ebuild| 228 
 mail-filter/opendkim/opendkim-2.10.3-r26.ebuild| 248 -
 11 files changed, 1713 deletions(-)

diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
deleted file mode 100644
index c96ca4b..000
--- a/mail-filter/opendkim/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST opendkim-2.10.3.tar.gz 1210224 BLAKE2B 
affd4526568431fa1afee93a167c5569912c9344ea4e6eee3281a035bd0c76d2be5d2e8e144bbebabd681a73388a37ac56d9a2e4daf00af9baadad14ffb42265
 SHA512 
97923e533d072c07ae4d16a46cbed95ee799aa50f19468d8bc6d1dc534025a8616c3b4b68b5842bc899b509349a2c9a67312d574a726b048c0ea46dd4fcc45d8

diff --git 
a/mail-filter/opendkim/files/opendkim-2.10.3-define-P-macro-in-libvbr.patch 
b/mail-filter/opendkim/files/opendkim-2.10.3-define-P-macro-in-libvbr.patch
deleted file mode 100644
index bbb4eb8..000
--- a/mail-filter/opendkim/files/opendkim-2.10.3-define-P-macro-in-libvbr.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 50a91575cee8d08682f090d2d6bdb4806eccfbcd Mon Sep 17 00:00:00 2001
-From: Wynn Wolf Arbor 
-Date: Wed, 10 Jun 2020 09:37:03 +0200
-Subject: [PATCH] Define __P() macro in libvbr
-
-Definitions for this macro have been added throughout the codebase in
-commits 91e7407d, 705948fd, 227fa252, 842c1733, and b730bdc0, but one
-was still missing from libvbr. glibc contains a definition for legacy
-reasons, but other libcs might not. Particularly, the musl libc does not
-contain it, leading to build errors when enabling support for VBR.
-
-Add a definition for __P() to vbr.h to fix this.

- libvbr/vbr.h | 10 ++
- 1 file changed, 10 insertions(+)
-
-diff --git a/libvbr/vbr.h b/libvbr/vbr.h
-index 4bef1f36..3bcb9212 100644
 a/libvbr/vbr.h
-+++ b/libvbr/vbr.h
-@@ -12,6 +12,16 @@
- /* system includes */
- #include 
-
-+#ifdef __STDC__
-+# ifndef __P
-+#  define __P(x)  x
-+# endif /* ! __P */
-+#else /* __STDC__ */
-+# ifndef __P
-+#  define __P(x)  ()
-+# endif /* ! __P */
-+#endif /* __STDC__ */
-+
- /* strings */
- #define   VBR_ALL "all"
- #define   VBR_INFOHEADER  "VBR-Info"
---
-2.27.0
-

diff --git 
a/mail-filter/opendkim/files/opendkim-2.10.3-fix-libmilter-search.patch 
b/mail-filter/opendkim/files/opendkim-2.10.3-fix-libmilter-search.patch
deleted file mode 100644
index 5e03a99..000
--- a/mail-filter/opendkim/files/opendkim-2.10.3-fix-libmilter-search.patch
+++ /dev/null
@@ -1,223 +0,0 @@
-From a1371d8c81d5fc22cbc8ea2b1c9eb465e9a8e874 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky 
-Date: Fri, 6 Nov 2020 07:40:06 -0500
-Subject: [PATCH] configure.ac: simplify the search for libmilter.
-
-This commit (temporarily?) reverts the --with-milter flag to a boolean,
-disallowing the user to pass it a path. This is done for several reasons:
-
-  * There's only one standard major version of libmilter, so people are
-unlikely to have multiple copies of it installed side-by-side. And
-When only one copy is present and usable with "-lmilter", the
-ability to specify a path is redundant.
-
-  * The "milter path" was used for both the headers and the library
-itself. As a result, the user was expected to specify something
-like "/usr" as the milter path, whence OpenDKIM would infer that
-the headers live in /usr/include and that the libraries live
-in /usr/. If multiple libraries live in multiple
-somewheres -- as is the case with "lib" and "lib64" on multilib
-systems -- OpenDKIM is prone to guessing incorrectly. In other
-words, the "milter path" mechanism was not fine-grained enough
-to specify the correct library, and this led to link failures
-in some not-too-uncommon cases.
-
-  * Headers and libraries in non-standard paths should be handled with
-pkg-config, anyway.

- configure.ac 

[gentoo-commits] repo/proj/libressl:master commit in: mail-filter/imapfilter/

2022-07-10 Thread Quentin Retornaz
commit: 6d73e3a01765917917c7afe9bb8f8c14a5e22e2e
Author: orbea  riseup  net>
AuthorDate: Thu Jul  7 22:24:50 2022 +
Commit: Quentin Retornaz  retornaz  com>
CommitDate: Sun Jul 10 22:50:50 2022 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=6d73e3a0

mail-filter/imapfilter: Add 2.7.5-r1

Signed-off-by: orbea  riseup.net>
Signed-off-by: Quentin Retornaz  retornaz.com>

 mail-filter/imapfilter/imapfilter-2.7.5-r1.ebuild | 50 +++
 1 file changed, 50 insertions(+)

diff --git a/mail-filter/imapfilter/imapfilter-2.7.5-r1.ebuild 
b/mail-filter/imapfilter/imapfilter-2.7.5-r1.ebuild
new file mode 100644
index 000..deaa832
--- /dev/null
+++ b/mail-filter/imapfilter/imapfilter-2.7.5-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit lua-single toolchain-funcs
+
+DESCRIPTION="An IMAP mail filtering utility"
+HOMEPAGE="https://github.com/lefcha/imapfilter;
+SRC_URI="https://github.com/lefcha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+   dev-libs/openssl:0=
+   dev-libs/libpcre2
+   ${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS NEWS README samples/*"
+
+PATCHES=( "${FILESDIR}"/${P}-libressl.patch )
+
+src_prepare() {
+   default
+   sed -i -e "/^PREFIX/s:/usr/local:${EPREFIX}/usr:" \
+   -e "/^MANDIR/s:man:share/man:" \
+   -e "/^CFLAGS/s:CFLAGS =:CFLAGS +=:" \
+   -e "/^CFLAGS/s/-O//" \
+   src/Makefile || die
+}
+
+src_compile() {
+   emake \
+   CC="$(tc-getCC)" \
+   LDFLAGS="${LDFLAGS}" \
+   INCDIRS=$(lua_get_CFLAGS) \
+   LIBLUA=$(lua_get_LIBS)
+}
+
+src_install() {
+   default
+   doman doc/imapfilter.1 doc/imapfilter_config.5
+}



[gentoo-commits] repo/proj/libressl:master commit in: mail-filter/imapfilter/, mail-filter/imapfilter/files/

2022-07-10 Thread Quentin Retornaz
commit: b0c0d82e8fd48110da40fefb600399d2c6d0e014
Author: orbea  riseup  net>
AuthorDate: Thu Jul  7 22:26:39 2022 +
Commit: Quentin Retornaz  retornaz  com>
CommitDate: Sun Jul 10 22:50:50 2022 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=b0c0d82e

mail-filter/imapfilter: Remove old versions

Signed-off-by: orbea  riseup.net>
Closes: https://github.com/gentoo/libressl/pull/444
Signed-off-by: Quentin Retornaz  retornaz.com>

 mail-filter/imapfilter/Manifest|  1 -
 .../files/imapfilter-2.6.16-libressl.patch | 29 
 .../imapfilter/imapfilter-2.6.16-r100.ebuild   | 52 --
 mail-filter/imapfilter/imapfilter-2.6.16.ebuild| 42 -
 4 files changed, 124 deletions(-)

diff --git a/mail-filter/imapfilter/Manifest b/mail-filter/imapfilter/Manifest
index b6f3391..d5b5a10 100644
--- a/mail-filter/imapfilter/Manifest
+++ b/mail-filter/imapfilter/Manifest
@@ -1,2 +1 @@
-DIST imapfilter-2.6.16.tar.gz 59636 BLAKE2B 
9de58800ab88aa6e22ead001fd4e635b1991d23a2345d729a59438d3774148b1478b561c36848af155da7d15e84afdf900b73054ef268243f333843b71417d1e
 SHA512 
0500931143e593eb69357ef6a6a40be971abadd22d7e807685b88927da8db9a928470f5cad460252b95ccd42efcfd39b5c4001a8796fa79cbd35018405a7be19
 DIST imapfilter-2.7.5.tar.gz 59441 BLAKE2B 
0326a698f3be18da47c99cbe20e5e51cde8abcaebf365b3f00e5b1dba6bfaed5139b65766bd447dc596736da504063d5c87c21d1c5c11d6bc7ebd947d9d44835
 SHA512 
a64747d745ecd5a2f61d486cd8fec1bceeb97ce459ec57454311a960dbfce526c15e8bddeb16860b8efd9710de93845adec61ec892355a0bef7bddc4517e1442

diff --git a/mail-filter/imapfilter/files/imapfilter-2.6.16-libressl.patch 
b/mail-filter/imapfilter/files/imapfilter-2.6.16-libressl.patch
deleted file mode 100644
index 2454fc3..000
--- a/mail-filter/imapfilter/files/imapfilter-2.6.16-libressl.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From bf69bdbf674269e84b22461c50ce1016182b56d3 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin 
-Date: Sat, 28 Mar 2020 06:56:07 +0200
-Subject: [PATCH] Fix build with LibreSSL
-
-Bug: https://bugs.gentoo.org/714882
-Upstream-Status: Submitted
-[https://github.com/lefcha/imapfilter/pull/204]
-Signed-off-by: Stefan Strogin 

- src/socket.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/socket.c b/src/socket.c
-index 0a1874f..03e0d21 100644
 a/src/socket.c
-+++ b/src/socket.c
-@@ -143,7 +143,7 @@ open_secure_connection(session *ssn)
-   goto fail;
- 
-   if (get_option_boolean("certificates")) {
--#if OPENSSL_VERSION_NUMBER >= 0x1010L
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
-   SSL_set_hostflags(ssn->sslconn,
-   X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
-   if (!SSL_set1_host(ssn->sslconn, ssn->server)) {
--- 
-2.26.0
-

diff --git a/mail-filter/imapfilter/imapfilter-2.6.16-r100.ebuild 
b/mail-filter/imapfilter/imapfilter-2.6.16-r100.ebuild
deleted file mode 100644
index c1d6ea9..000
--- a/mail-filter/imapfilter/imapfilter-2.6.16-r100.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
-
-inherit lua-single toolchain-funcs
-
-DESCRIPTION="An IMAP mail filtering utility"
-HOMEPAGE="https://github.com/lefcha/imapfilter;
-SRC_URI="https://github.com/lefcha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="
-   dev-libs/openssl:0=
-   dev-libs/libpcre
-   ${LUA_DEPS}"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS NEWS README samples/*"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-2.6.16-libressl.patch
-)
-
-src_prepare() {
-   default
-   sed -i -e "/^PREFIX/s:/usr/local:${EPREFIX}/usr:" \
-   -e "/^MANDIR/s:man:share/man:" \
-   -e "/^CFLAGS/s:CFLAGS =:CFLAGS +=:" \
-   -e "/^CFLAGS/s/-O//" \
-   src/Makefile || die
-}
-
-src_compile() {
-   emake \
-   CC="$(tc-getCC)" \
-   LDFLAGS="${LDFLAGS}" \
-   INCDIRS=$(lua_get_CFLAGS) \
-   LIBLUA=$(lua_get_LIBS)
-}
-
-src_install() {
-   default
-   doman doc/imapfilter.1 doc/imapfilter_config.5
-}

diff --git a/mail-filter/imapfilter/imapfilter-2.6.16.ebuild 
b/mail-filter/imapfilter/imapfilter-2.6.16.ebuild
deleted file mode 100644
index 9a2348b..000
--- a/mail-filter/imapfilter/imapfilter-2.6.16.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="An IMAP mail filtering utility"
-HOMEPAGE="https://github.com/lefcha/imapfilter;
-SRC_URI="https://github.com/lefcha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND="

[gentoo-commits] repo/proj/libressl:master commit in: mail-filter/imapfilter/, mail-filter/imapfilter/files/

2022-07-10 Thread Quentin Retornaz
commit: 2bd21e7bccc480c25c47046a619368208d4be36d
Author: orbea  riseup  net>
AuthorDate: Thu Jul  7 22:21:24 2022 +
Commit: Quentin Retornaz  retornaz  com>
CommitDate: Sun Jul 10 22:50:49 2022 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=2bd21e7b

mail-filter/imapfilter: Update libressl patch

Also merges changes from ::gentoo.

Signed-off-by: orbea  riseup.net>
Signed-off-by: Quentin Retornaz  retornaz.com>

 .../files/imapfilter-2.7.5-libressl.patch  | 45 +++---
 mail-filter/imapfilter/imapfilter-2.7.5.ebuild |  2 +-
 mail-filter/imapfilter/metadata.xml|  2 +-
 3 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/mail-filter/imapfilter/files/imapfilter-2.7.5-libressl.patch 
b/mail-filter/imapfilter/files/imapfilter-2.7.5-libressl.patch
index fb665f8..e5b1882 100644
--- a/mail-filter/imapfilter/files/imapfilter-2.7.5-libressl.patch
+++ b/mail-filter/imapfilter/files/imapfilter-2.7.5-libressl.patch
@@ -1,26 +1,25 @@
-From 9a1132d8c8616b67156d49bea89d567ed31d42d6 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin 
-Date: Wed, 30 Dec 2020 06:48:40 +0300
-Subject: [PATCH] Fix build with LibreSSL
+From OpenBSD.
 
-Signed-off-by: Stefan Strogin 

- src/socket.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+Fix build with opaque HMAC_CTX in LibreSSL 3.5.
 
-diff --git a/src/socket.c b/src/socket.c
-index aa2ef4f..fa75de4 100644
 a/src/socket.c
-+++ b/src/socket.c
-@@ -143,7 +143,7 @@ open_secure_connection(session *ssn)
-   goto fail;
+Index: src/auth.c
+--- a/src/auth.c.orig
 b/src/auth.c
+@@ -20,7 +20,7 @@ auth_cram_md5(const char *user, const char *pass, unsi
+   unsigned char *resp, *buf, *out;
+   unsigned char md[EVP_MAX_MD_SIZE], mdhex[EVP_MAX_MD_SIZE * 2 + 1];
+   unsigned int mdlen;
+-#if OPENSSL_VERSION_NUMBER >= 0x101fL && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x101fL
+   HMAC_CTX *ctx;
+ #else
+   HMAC_CTX ctx;
+@@ -32,7 +32,7 @@ auth_cram_md5(const char *user, const char *pass, unsi
  
-   if (get_option_boolean("hostnames")) {
--#if OPENSSL_VERSION_NUMBER >= 0x1010L
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
-   SSL_set_hostflags(ssn->sslconn,
-   X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
-   if (!SSL_set1_host(ssn->sslconn, ssn->server)) {
--- 
-2.30.0
-
+   EVP_DecodeBlock(resp, chal, strlen((char *)(chal)));
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x101fL && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x101fL
+   ctx = HMAC_CTX_new();
+   HMAC_Init_ex(ctx, (const unsigned char *)pass, strlen(pass),
+   EVP_md5(), NULL);

diff --git a/mail-filter/imapfilter/imapfilter-2.7.5.ebuild 
b/mail-filter/imapfilter/imapfilter-2.7.5.ebuild
index 89738e8..911e6fe 100644
--- a/mail-filter/imapfilter/imapfilter-2.7.5.ebuild
+++ b/mail-filter/imapfilter/imapfilter-2.7.5.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/lefcha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 

diff --git a/mail-filter/imapfilter/metadata.xml 
b/mail-filter/imapfilter/metadata.xml
index 905d603..e32dccc 100644
--- a/mail-filter/imapfilter/metadata.xml
+++ b/mail-filter/imapfilter/metadata.xml
@@ -1,5 +1,5 @@
 
-http://www.gentoo.org/dtd/metadata.dtd;>
+https://www.gentoo.org/dtd/metadata.dtd;>
 





[gentoo-commits] repo/proj/libressl:master commit in: net-misc/seafile-client/files/, net-misc/seafile-client/

2022-07-10 Thread Quentin Retornaz
commit: c04c7ada7a1aa36b7f3711163af4dbb15ff968cc
Author: orbea  riseup  net>
AuthorDate: Thu Jul  7 22:10:12 2022 +
Commit: Quentin Retornaz  retornaz  com>
CommitDate: Sun Jul 10 22:50:32 2022 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=c04c7ada

net-misc/seafile-client: Remove old versions

Signed-off-by: orbea  riseup.net>
Closes: https://github.com/gentoo/libressl/pull/443
Signed-off-by: Quentin Retornaz  retornaz.com>

 net-misc/seafile-client/Manifest   |  3 --
 .../files/seafile-client-8.0.1-glib-2.68.0.patch   | 12 -
 .../seafile-client/seafile-client-8.0.1-r2.ebuild  | 55 
 .../seafile-client/seafile-client-8.0.2.ebuild | 59 --
 .../seafile-client/seafile-client-8.0.3.ebuild | 52 ---
 5 files changed, 181 deletions(-)

diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest
index cc152ae..5fcbcff 100644
--- a/net-misc/seafile-client/Manifest
+++ b/net-misc/seafile-client/Manifest
@@ -1,6 +1,3 @@
-DIST seafile-client-8.0.1.tar.gz 11679293 BLAKE2B 
52ad28fb316d99240692883218e626a8ca33f8265d62dadfc2eed400c889d47e9aa7887ea6c6fd994596537a5db163b334fb72c791b38529f7219c5a25c813d3
 SHA512 
ca5dd5a6b27316e1f6fb670e3286d24015d99391c0e1447e2ed42f3d4f72769d6a3dda78bc388ad8d303d4ab1167e4e50844574ecd6f61149b1966e99a3a7719
-DIST seafile-client-8.0.2.tar.gz 11694494 BLAKE2B 
7230b17e9b85a990b87b9fae7d2d7bfc3a388ae82a777b3fa3abf8a2e88bb3ad6d73c8ff60aef34587ced6665594a71c0020c90065f6bd4fcaac79e15b41f923
 SHA512 
f66ea240816ec09b56bf3b121947a26bfbafeacd34c1cdb77f8244c713f0aea3f920c6eb6c3cf161034001a7d8ddb451e507acfb6f97e21ac5ebbb792da7ebf4
-DIST seafile-client-8.0.3.tar.gz 11694141 BLAKE2B 
03a30d824ebe45a58a93baf127714b119c73254cdbc3f13f5cc81807dbf7ebfc333a2e1c36a325728d1bc60fa3392eb7c7eb6ea7d978808200abe2e93c63cc72
 SHA512 
944751e84b5336d07c0a24a69c10ef4e5a84b133c22d148226bceee9ae8f989c45de28950c0a16fb66eb9a5aa43ff83a21c5b0979e5421763383b93acdde5aff
 DIST seafile-client-8.0.5.tar.gz 11701650 BLAKE2B 
c9c436f53cf7effa6c2e1cdbb09f5cffd53f7ef8fa6f6b12bb92c0d3c2e54b38858c95a3ab4c511d16774a973c8c2a7e66842825e9535d1332e8589dc201d22a
 SHA512 
1f3eb643dce980a1aa0ff71e0ecca83b3db0848f9983bf7782adae6d181ddc28454a6cd75ebfcf439c17eb2008a5e0d4a684e5cee60fe7b83297e9fce1fcfec9
 DIST seafile-client-8.0.6.tar.gz 11702726 BLAKE2B 
bcba073b9ec17c33f653ae89e518f30f96ec8f9bdb780a9e06ae75d565c223c6b0505fd1ec9475b66bcd8d26f84846a99968fc006514d1eccb4a72b8600f0ae4
 SHA512 
fceb272fa521a7343609285ff5b299f66886b2ea53a1395178c3f05313e9439853422de65d20902669034c4edacdf32eb5674e16e64218b0444221c77cd4256c
 DIST seafile-client-8.0.7.tar.gz 11718265 BLAKE2B 
a48e259d809644cb1949f35e80459aa2267c9772438eb09ba894a795553368935c8b63c78fbabbea2202d3f23eb001836acce0975b086f66ec6d804405c5b534
 SHA512 
b4a6d5896f828e0e8ac4b202c5cc933e0ade4c373074e48e76e3b4ffe670faec0ef62bfcc72607891fb2c8b066fc448976285985077c48c6e3763619f35f4629

diff --git 
a/net-misc/seafile-client/files/seafile-client-8.0.1-glib-2.68.0.patch 
b/net-misc/seafile-client/files/seafile-client-8.0.1-glib-2.68.0.patch
deleted file mode 100644
index 9b2dd42..000
--- a/net-misc/seafile-client/files/seafile-client-8.0.1-glib-2.68.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fbf1d2f..05e8d4d 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -6,6 +6,7 @@ SET(SEAFILE_CLIENT_VERSION_MINOR 0)
- SET(SEAFILE_CLIENT_VERSION_PATCH 1)
- SET(PROJECT_VERSION 
"${SEAFILE_CLIENT_VERSION_MAJOR}.${SEAFILE_CLIENT_VERSION_MINOR}.${SEAFILE_CLIENT_VERSION_PATCH}")
- ADD_DEFINITIONS(-DSEAFILE_CLIENT_VERSION=${PROJECT_VERSION})
-+ADD_DEFINITIONS(-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26)
- INCLUDE(FindPkgConfig)
- 
- ## Build crash repoter on release build as default

diff --git a/net-misc/seafile-client/seafile-client-8.0.1-r2.ebuild 
b/net-misc/seafile-client/seafile-client-8.0.1-r2.ebuild
deleted file mode 100644
index 5abc392..000
--- a/net-misc/seafile-client/seafile-client-8.0.1-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Seafile desktop client"
-HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/;
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="shibboleth test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-db/sqlite:3
-   dev-libs/jansson
-   dev-libs/libevent
-   dev-qt/qtcore:5
-   dev-qt/qtdbus:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtwidgets:5
-   dev-libs/openssl:=
-   net-libs/libsearpc
-   ~net-misc/seafile-${PV}
-   shibboleth? ( dev-qt/qtwebengine:5[widgets] )"
-DEPEND="${RDEPEND}
-   test? ( dev-qt/qttest:5 )"
-BDEPEND="dev-qt/linguist-tools:5"

[gentoo-commits] repo/proj/libressl:master commit in: net-misc/seafile-client/, net-misc/seafile-client/files/

2022-07-10 Thread Quentin Retornaz
commit: 37172801895e71f6af6fd5ce4c7f8b0c3fbae1b4
Author: orbea  riseup  net>
AuthorDate: Thu Jul  7 22:09:03 2022 +
Commit: Quentin Retornaz  retornaz  com>
CommitDate: Sun Jul 10 22:50:32 2022 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=37172801

net-misc/seafile-client: Add 8.0.5, 8.0.6, 8.0.7

Signed-off-by: orbea  riseup.net>
Signed-off-by: Quentin Retornaz  retornaz.com>

 net-misc/seafile-client/Manifest   |  3 ++
 .../files/seafile-client-8.0.6-select-qt5.patch| 23 ++
 net-misc/seafile-client/metadata.xml   |  2 +-
 .../seafile-client/seafile-client-8.0.5.ebuild | 52 +
 .../seafile-client/seafile-client-8.0.6.ebuild | 53 ++
 .../seafile-client/seafile-client-8.0.7.ebuild | 53 ++
 6 files changed, 185 insertions(+), 1 deletion(-)

diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest
index bc6e50e..cc152ae 100644
--- a/net-misc/seafile-client/Manifest
+++ b/net-misc/seafile-client/Manifest
@@ -1,3 +1,6 @@
 DIST seafile-client-8.0.1.tar.gz 11679293 BLAKE2B 
52ad28fb316d99240692883218e626a8ca33f8265d62dadfc2eed400c889d47e9aa7887ea6c6fd994596537a5db163b334fb72c791b38529f7219c5a25c813d3
 SHA512 
ca5dd5a6b27316e1f6fb670e3286d24015d99391c0e1447e2ed42f3d4f72769d6a3dda78bc388ad8d303d4ab1167e4e50844574ecd6f61149b1966e99a3a7719
 DIST seafile-client-8.0.2.tar.gz 11694494 BLAKE2B 
7230b17e9b85a990b87b9fae7d2d7bfc3a388ae82a777b3fa3abf8a2e88bb3ad6d73c8ff60aef34587ced6665594a71c0020c90065f6bd4fcaac79e15b41f923
 SHA512 
f66ea240816ec09b56bf3b121947a26bfbafeacd34c1cdb77f8244c713f0aea3f920c6eb6c3cf161034001a7d8ddb451e507acfb6f97e21ac5ebbb792da7ebf4
 DIST seafile-client-8.0.3.tar.gz 11694141 BLAKE2B 
03a30d824ebe45a58a93baf127714b119c73254cdbc3f13f5cc81807dbf7ebfc333a2e1c36a325728d1bc60fa3392eb7c7eb6ea7d978808200abe2e93c63cc72
 SHA512 
944751e84b5336d07c0a24a69c10ef4e5a84b133c22d148226bceee9ae8f989c45de28950c0a16fb66eb9a5aa43ff83a21c5b0979e5421763383b93acdde5aff
+DIST seafile-client-8.0.5.tar.gz 11701650 BLAKE2B 
c9c436f53cf7effa6c2e1cdbb09f5cffd53f7ef8fa6f6b12bb92c0d3c2e54b38858c95a3ab4c511d16774a973c8c2a7e66842825e9535d1332e8589dc201d22a
 SHA512 
1f3eb643dce980a1aa0ff71e0ecca83b3db0848f9983bf7782adae6d181ddc28454a6cd75ebfcf439c17eb2008a5e0d4a684e5cee60fe7b83297e9fce1fcfec9
+DIST seafile-client-8.0.6.tar.gz 11702726 BLAKE2B 
bcba073b9ec17c33f653ae89e518f30f96ec8f9bdb780a9e06ae75d565c223c6b0505fd1ec9475b66bcd8d26f84846a99968fc006514d1eccb4a72b8600f0ae4
 SHA512 
fceb272fa521a7343609285ff5b299f66886b2ea53a1395178c3f05313e9439853422de65d20902669034c4edacdf32eb5674e16e64218b0444221c77cd4256c
+DIST seafile-client-8.0.7.tar.gz 11718265 BLAKE2B 
a48e259d809644cb1949f35e80459aa2267c9772438eb09ba894a795553368935c8b63c78fbabbea2202d3f23eb001836acce0975b086f66ec6d804405c5b534
 SHA512 
b4a6d5896f828e0e8ac4b202c5cc933e0ade4c373074e48e76e3b4ffe670faec0ef62bfcc72607891fb2c8b066fc448976285985077c48c6e3763619f35f4629

diff --git 
a/net-misc/seafile-client/files/seafile-client-8.0.6-select-qt5.patch 
b/net-misc/seafile-client/files/seafile-client-8.0.6-select-qt5.patch
new file mode 100644
index 000..4d3a3d1
--- /dev/null
+++ b/net-misc/seafile-client/files/seafile-client-8.0.6-select-qt5.patch
@@ -0,0 +1,23 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1c4a4447..5747df46 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -133,14 +133,12 @@ ENDIF()
+ 
+ ## BEGIN: QT configuration
+ 
+-FIND_PROGRAM(qmake_executable NAMES qmake qmake.exe)
+-EXECUTE_PROCESS(COMMAND
+-bash -c "${qmake_executable} --version | grep -iE '^using qt version 
[0-9.]+' | awk '{print $4}'"
+-OUTPUT_VARIABLE DETECTED_QT_VERSION
+-OUTPUT_STRIP_TRAILING_WHITESPACE)
++FIND_PACKAGE(Qt5Core)
++SET(DETECTED_QT_VERSION ${Qt5Core_VERSION})
+ MESSAGE("Qt version: ${DETECTED_QT_VERSION}")
++GET_TARGET_PROPERTY(QMAKE_EXECUTABLE_PATH Qt5::qmake IMPORTED_LOCATION)
+ EXECUTE_PROCESS(COMMAND
+-bash -c "qmake --version|grep -iE '^using qt version [0-9]'|awk '{print 
$4}'|grep -iE '^[0-9]'|awk -F . '{print $1}'"
++bash -c "${QMAKE_EXECUTABLE_PATH} --version|grep -iE '^using qt version 
[0-9]'|awk '{print $4}'|grep -iE '^[0-9]'|awk -F . '{print $1}'"
+ OUTPUT_VARIABLE QT_VERSION_MAJOR
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ MESSAGE("QT_VERSION_MAJOR: ${QT_VERSION_MAJOR}")

diff --git a/net-misc/seafile-client/metadata.xml 
b/net-misc/seafile-client/metadata.xml
index c37a654..652f773 100644
--- a/net-misc/seafile-client/metadata.xml
+++ b/net-misc/seafile-client/metadata.xml
@@ -1,5 +1,5 @@
 
-http://www.gentoo.org/dtd/metadata.dtd;>
+https://www.gentoo.org/dtd/metadata.dtd;>
 

gen...@retornaz.com

diff --git a/net-misc/seafile-client/seafile-client-8.0.5.ebuild 
b/net-misc/seafile-client/seafile-client-8.0.5.ebuild
new file mode 100644
index 000..a51f8ee
--- /dev/null
+++ 

[gentoo-commits] repo/proj/libressl:master commit in: sys-cluster/keepalived/, sys-cluster/keepalived/files/

2022-07-10 Thread Quentin Retornaz
commit: 854acd7d9f4df2c0d817417aefb878a9fb246072
Author: orbea  riseup  net>
AuthorDate: Thu Jul  7 01:20:31 2022 +
Commit: Quentin Retornaz  retornaz  com>
CommitDate: Sun Jul 10 22:49:53 2022 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=854acd7d

sys-cluster/keepalived: Remove old version

Signed-off-by: orbea  riseup.net>
Closes: https://github.com/gentoo/libressl/pull/440
Signed-off-by: Quentin Retornaz  retornaz.com>

 .../keepalived-1.4.0-fix-no-sorry-segfault.patch   | 28 -
 sys-cluster/keepalived/files/keepalived.confd  |  6 --
 sys-cluster/keepalived/files/keepalived.init   | 33 --
 sys-cluster/keepalived/keepalived-1.4.0-r1.ebuild  | 73 --
 4 files changed, 140 deletions(-)

diff --git 
a/sys-cluster/keepalived/files/keepalived-1.4.0-fix-no-sorry-segfault.patch 
b/sys-cluster/keepalived/files/keepalived-1.4.0-fix-no-sorry-segfault.patch
deleted file mode 100644
index cbababb..000
--- a/sys-cluster/keepalived/files/keepalived-1.4.0-fix-no-sorry-segfault.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 49559856e19a1a9fad590cc640da7df57c6b9a66 Mon Sep 17 00:00:00 2001
-From: Quentin Armitage 
-Date: Wed, 17 Jan 2018 12:08:07 +
-Subject: [PATCH] Fix segfault if no sorry server configured for a virtual
- server
-
-Issue #751 identified a segfault in vs_end_handler(), and it
-transpires that the forwarding method of the sorry server was being
-checked without first testing that a sorry server had been configured.
-
-Signed-off-by: Quentin Armitage 

- keepalived/check/check_parser.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/keepalived/check/check_parser.c b/keepalived/check/check_parser.c
-index b2518da7..170e47d4 100644
 a/keepalived/check/check_parser.c
-+++ b/keepalived/check/check_parser.c
-@@ -120,7 +120,7 @@ vs_end_handler(void)
- 
-   /* If the real (sorry) server uses tunnel forwarding, the address family
-* does not have to match the address family of the virtaul server */
--  if (vs->s_svr->forwarding_method != IP_VS_CONN_F_TUNNEL) {
-+  if (vs->s_svr && vs->s_svr->forwarding_method != IP_VS_CONN_F_TUNNEL) {
-   if (vs->af == AF_UNSPEC)
-   vs->af = vs->s_svr->addr.ss_family;
-   else if (vs->af != vs->s_svr->addr.ss_family) {

diff --git a/sys-cluster/keepalived/files/keepalived.confd 
b/sys-cluster/keepalived/files/keepalived.confd
deleted file mode 100644
index 5f56cb2..000
--- a/sys-cluster/keepalived/files/keepalived.confd
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Keepalived options
-# Increase logging:
-#KEEPALIVED_OPTS="-D"

diff --git a/sys-cluster/keepalived/files/keepalived.init 
b/sys-cluster/keepalived/files/keepalived.init
deleted file mode 100644
index c290c9d..000
--- a/sys-cluster/keepalived/files/keepalived.init
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-   use logger
-   # The interfaces do not actually need to exist to start, it handles 
them gracefully.
-   use net
-}
-
-command="/usr/sbin/keepalived"
-command_args="${KEEPALIVED_OPTS}"
-pidfile="/var/run/keepalived.pid"
-
-extra_commands="checkconfig reload"
-
-checkconfig() {
-   # keepalived has a config check command, but it does not work while the 
daemon is running!
-   if [ ! -e /etc/keepalived/keepalived.conf ] ; then
-   eerror "You need an /etc/keepalived/keepalived.conf file to run 
keepalived"
-   return 1
-   fi
-}
-
-start_pre() {
-   checkconfig || return 1
-}
-
-reload() {
-   ebegin "Reloading keepalived.conf"
-   start-stop-daemon --pidfile $pidfile --signal HUP
-   eend $?
-}

diff --git a/sys-cluster/keepalived/keepalived-1.4.0-r1.ebuild 
b/sys-cluster/keepalived/keepalived-1.4.0-r1.ebuild
deleted file mode 100644
index e7b7082..000
--- a/sys-cluster/keepalived/keepalived-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A strong & robust keepalive facility to the Linux Virtual Server 
project"
-HOMEPAGE="http://www.keepalived.org/;
-SRC_URI="http://www.keepalived.org/software/${P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="dbus debug ipv6 -json snmp"
-
-RDEPEND="dev-libs/libnl:=
-   dev-libs/openssl:0=
-   dev-libs/popt
-   net-libs/libnfnetlink
-   sys-apps/iproute2
-   dbus? ( sys-apps/dbus )
-   json? ( dev-libs/json-c:= )
-   snmp? ( net-analyzer/net-snmp )"
-DEPEND="${RDEPEND}
-   >=sys-kernel/linux-headers-4.4"
-
-DOCS=(
-   README CONTRIBUTORS 

[gentoo-commits] repo/proj/libressl:master commit in: net-misc/stunnel/files/, net-misc/stunnel/

2022-07-10 Thread Quentin Retornaz
commit: d18a63c82d7541b55c18eb1e30e65ad9df512c0a
Author: orbea  riseup  net>
AuthorDate: Thu Jul  7 21:46:19 2022 +
Commit: Quentin Retornaz  retornaz  com>
CommitDate: Sun Jul 10 22:50:19 2022 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=d18a63c8

net-misc/stunnel: Remove old version

Signed-off-by: orbea  riseup.net>
Closes: https://github.com/gentoo/libressl/pull/442
Signed-off-by: Quentin Retornaz  retornaz.com>

 net-misc/stunnel/Manifest  |   1 -
 net-misc/stunnel/files/stunnel |  42 
 net-misc/stunnel/files/stunnel-5.50-libressl.patch | 228 -
 net-misc/stunnel/files/stunnel-r1  |  51 -
 net-misc/stunnel/stunnel-5.50-r1.ebuild|  94 -
 5 files changed, 416 deletions(-)

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 5811970..d381987 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,3 +1,2 @@
-DIST stunnel-5.50.tar.gz 973685 BLAKE2B 
e4185fa0c4f15ea118a8f6590bae14a9e1d7ccf1f73b75e46d8c7f04e4ece471c29b0a3715a24568301c5220fe385cbf42295c91ae9b295e3d7ab2b0ffec45a1
 SHA512 
96029b4f0dc0f04130e847bf47e56e8fdd22f2aaddb5fe0f581a0da6b870049152216795a0a9d9cdb6b93621df0a7d999e968a8c59989d261fd81c5f02cc1bac
 DIST stunnel-5.59.tar.gz 995508 BLAKE2B 
12dc07e5ef04dcc505d97cefeaee98284a1c85ca886f731bfe7af3a1ad5448e47ea1fc08ab3b6f79b71c8d91ec4f09c355397e6e1052384f77cbd1cf2a17
 SHA512 
c9f93ff6a09baef6d85e883cb469de495f5c006b9f0d3e018ade7a21bb3521e3db7982701c752d6b117ff2ad03a7f7299afd399c8956006af2eade52358ac1c7
 DIST stunnel-5.64.tar.gz 869088 BLAKE2B 
c6be054b825e57c1ac44adf28d4546ab78250cf9d7b17bc9e039d2715ca2316fef674a3ed2c4419a5a7ad6fa85b56809f736d0dca0bc672521347d5f51d2ed23
 SHA512 
85ed22664420db3c97b871f1afeb6483e547f421f0419fed1ccb4f3563ea154b6aeb6ae7221f001557c786a3406ada4c7b0d44b208dcf98f16209229aee4e0aa

diff --git a/net-misc/stunnel/files/stunnel b/net-misc/stunnel/files/stunnel
deleted file mode 100644
index 42087c6..000
--- a/net-misc/stunnel/files/stunnel
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-SERVICENAME=${SVCNAME#*.}
-SERVICENAME=${SERVICENAME:-stunnel}
-STUNNEL_CONFIGFILE=${STUNNEL_CONFIGFILE:-/etc/stunnel/${SERVICENAME}.conf}
-
-depend() {
-need net
-before logger
-}
-
-get_config() {
-   if [ ! -e ${STUNNEL_CONFIGFILE} ] ; then
-   eerror "You need to create ${STUNNEL_CONFIGFILE} first."
-   return 1
-   fi
-   CHROOT=$(grep "^chroot" ${STUNNEL_CONFIGFILE} | sed "s;.*= *;;")
-   [ -n "${CHROOT}" ] && CHROOT="--chroot ${CHROOT}"
-   PIDFILE=$(grep "^pid" ${STUNNEL_CONFIGFILE} | sed "s;.*= *;;")
-   PIDFILE=${PIDFILE:-/run/stunnel/${SERVICENAME}.pid}
-}
-
-start() {
-   get_config || return 1
-   checkpath -d -m 0775 -o root:stunnel /run/stunnel
-   if [ "$(dirname ${PIDFILE})" != "/run" ]; then
-   checkpath -d -m 0755 -o stunnel:stunnel -q $(dirname ${PIDFILE})
-   fi
-   ebegin "Starting ${SVCNAME}"
-   start-stop-daemon --start --pidfile "${PIDFILE}" ${CHROOT} \
- --exec /usr/bin/stunnel -- ${STUNNEL_CONFIGFILE} 
${STUNNEL_OPTIONS}
-   eend $? "Failed to start ${SVCNAME}"
-}
-
-stop() {
-   get_config || return 1
-   ebegin "Stopping ${SVCNAME}"
-   start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
-   eend $? "Failed to stop ${SVCNAME}"
-}

diff --git a/net-misc/stunnel/files/stunnel-5.50-libressl.patch 
b/net-misc/stunnel/files/stunnel-5.50-libressl.patch
deleted file mode 100644
index 4481220..000
--- a/net-misc/stunnel/files/stunnel-5.50-libressl.patch
+++ /dev/null
@@ -1,228 +0,0 @@
-diff --git a/src/ctx.c b/src/ctx.c
-index cd59f4e..b41be1b 100644
 a/src/ctx.c
-+++ b/src/ctx.c
-@@ -118,7 +118,7 @@ NOEXPORT void sslerror_log(unsigned long, char *);
- 
- / initialize section->ctx */
- 
--#if OPENSSL_VERSION_NUMBER>=0x1010L
-+#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
- typedef long unsigned SSL_OPTIONS_TYPE;
- #else
- typedef long SSL_OPTIONS_TYPE;
-@@ -126,7 +126,7 @@ typedef long SSL_OPTIONS_TYPE;
- 
- int context_init(SERVICE_OPTIONS *section) { /* init TLS context */
- /* create TLS context */
--#if OPENSSL_VERSION_NUMBER>=0x1010L
-+#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
- if(section->option.client)
- section->ctx=SSL_CTX_new(TLS_client_method());
- else /* server mode */
-@@ -437,7 +437,7 @@ NOEXPORT int ecdh_init(SERVICE_OPTIONS *section) {
- / initialize OpenSSL CONF */
- 
- NOEXPORT int conf_init(SERVICE_OPTIONS *section) {
--#if OPENSSL_VERSION_NUMBER>=0x10002000L
-+#if OPENSSL_VERSION_NUMBER>=0x10002000L && 

[gentoo-commits] repo/proj/libressl:master commit in: net-misc/stunnel/, net-misc/stunnel/files/

2022-07-10 Thread Quentin Retornaz
commit: 8c50aade076444c3042de39523448ebd3614aefa
Author: orbea  riseup  net>
AuthorDate: Thu Jul  7 21:45:07 2022 +
Commit: Quentin Retornaz  retornaz  com>
CommitDate: Sun Jul 10 22:50:19 2022 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=8c50aade

net-misc/stunnel: Add 5.59 + 5.64

Signed-off-by: orbea  riseup.net>
Signed-off-by: Quentin Retornaz  retornaz.com>

 net-misc/stunnel/Manifest  |   2 +
 net-misc/stunnel/files/stunnel-5.59-libressl.patch | 237 +
 net-misc/stunnel/files/stunnel-r2  |  55 +
 net-misc/stunnel/metadata.xml  |   5 +-
 net-misc/stunnel/stunnel-5.59.ebuild   | 106 +
 net-misc/stunnel/stunnel-5.64.ebuild   | 106 +
 6 files changed, 510 insertions(+), 1 deletion(-)

diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 2368193..5811970 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1 +1,3 @@
 DIST stunnel-5.50.tar.gz 973685 BLAKE2B 
e4185fa0c4f15ea118a8f6590bae14a9e1d7ccf1f73b75e46d8c7f04e4ece471c29b0a3715a24568301c5220fe385cbf42295c91ae9b295e3d7ab2b0ffec45a1
 SHA512 
96029b4f0dc0f04130e847bf47e56e8fdd22f2aaddb5fe0f581a0da6b870049152216795a0a9d9cdb6b93621df0a7d999e968a8c59989d261fd81c5f02cc1bac
+DIST stunnel-5.59.tar.gz 995508 BLAKE2B 
12dc07e5ef04dcc505d97cefeaee98284a1c85ca886f731bfe7af3a1ad5448e47ea1fc08ab3b6f79b71c8d91ec4f09c355397e6e1052384f77cbd1cf2a17
 SHA512 
c9f93ff6a09baef6d85e883cb469de495f5c006b9f0d3e018ade7a21bb3521e3db7982701c752d6b117ff2ad03a7f7299afd399c8956006af2eade52358ac1c7
+DIST stunnel-5.64.tar.gz 869088 BLAKE2B 
c6be054b825e57c1ac44adf28d4546ab78250cf9d7b17bc9e039d2715ca2316fef674a3ed2c4419a5a7ad6fa85b56809f736d0dca0bc672521347d5f51d2ed23
 SHA512 
85ed22664420db3c97b871f1afeb6483e547f421f0419fed1ccb4f3563ea154b6aeb6ae7221f001557c786a3406ada4c7b0d44b208dcf98f16209229aee4e0aa

diff --git a/net-misc/stunnel/files/stunnel-5.59-libressl.patch 
b/net-misc/stunnel/files/stunnel-5.59-libressl.patch
new file mode 100644
index 000..1e61881
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel-5.59-libressl.patch
@@ -0,0 +1,237 @@
+From OpenBSD.
+
+Index: src/common.h
+--- a/src/common.h.orig
 b/src/common.h
+@@ -454,7 +454,7 @@ extern char *sys_errlist[];
+ #define OPENSSL_NO_TLS1_2
+ #endif /* OpenSSL older than 1.0.1 || defined(OPENSSL_NO_TLS1) */
+
+-#if OPENSSL_VERSION_NUMBER>=0x1010L
++#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+ #ifndef OPENSSL_NO_SSL2
+ #define OPENSSL_NO_SSL2
+ #endif /* !defined(OPENSSL_NO_SSL2) */
+Index: src/client.c
+--- a/src/client.c.orig
 b/src/client.c
+@@ -750,7 +750,7 @@ NOEXPORT void print_cipher(CLI *c) { /* print negotiat
+ NOEXPORT void transfer(CLI *c) {
+ int timeout; /* s_poll_wait timeout in seconds */
+ int pending; /* either processed on unprocessed TLS data */
+-#if OPENSSL_VERSION_NUMBER >= 0x1010L
++#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+ int has_pending=0, prev_has_pending;
+ #endif
+ int watchdog=0; /* a counter to detect an infinite loop */
+@@ -797,7 +797,7 @@ NOEXPORT void transfer(CLI *c) {
+
+ /** wait for an event */
+ pending=SSL_pending(c->ssl);
+-#if OPENSSL_VERSION_NUMBER >= 0x1010L
++#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+ /* only attempt to process SSL_has_pending() data once */
+ prev_has_pending=has_pending;
+ has_pending=SSL_has_pending(c->ssl);
+@@ -1202,7 +1202,7 @@ NOEXPORT void transfer(CLI *c) {
+ s_log(LOG_ERR,
+ "please report the problem to michal.trojn...@stunnel.org");
+ stunnel_info(LOG_ERR);
+-#if OPENSSL_VERSION_NUMBER >= 0x1010L
++#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+ s_log(LOG_ERR, "protocol=%s, SSL_pending=%d, SSL_has_pending=%d",
+ SSL_get_version(c->ssl),
+ SSL_pending(c->ssl), SSL_has_pending(c->ssl));
+Index: src/ctx.c
+--- a/src/ctx.c.orig
 b/src/ctx.c
+@@ -91,7 +91,7 @@ NOEXPORT void set_prompt(const char *);
+ NOEXPORT int ui_retry();
+
+ /* session tickets */
+-#if OPENSSL_VERSION_NUMBER >= 0x10101000L
++#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT int generate_session_ticket_cb(SSL *, void *);
+ NOEXPORT int decrypt_session_ticket_cb(SSL *, SSL_SESSION *,
+ const unsigned char *, size_t, SSL_TICKET_STATUS, void *);
+@@ -179,7 +179,7 @@ int context_init(SERVICE_OPTIONS *section) { /* init T
+ }
+ current_section=section; /* setup current section for callbacks */
+
+-#if OPENSSL_VERSION_NUMBER>=0x1010L
++#if OPENSSL_VERSION_NUMBER>=0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+ /* set the security level */
+ if(section->security_level>=0) {
+ 

[gentoo-commits] repo/proj/libressl:master commit in: www-servers/h2o/files/, www-servers/h2o/

2022-07-10 Thread Quentin Retornaz
commit: 267757bad990adc2c1923ccc5c344db89c3dda5d
Author: orbea  riseup  net>
AuthorDate: Thu Jul  7 21:08:58 2022 +
Commit: Quentin Retornaz  retornaz  com>
CommitDate: Sun Jul 10 22:50:13 2022 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=267757ba

www-servers/h2o: Remove old version

Signed-off-by: orbea  riseup.net>
Closes: https://github.com/gentoo/libressl/pull/441
Signed-off-by: Quentin Retornaz  retornaz.com>

 www-servers/h2o/files/h2o-2.2-libressl-2.7.patch |  23 -
 www-servers/h2o/h2o-2.2.6.ebuild | 107 ---
 2 files changed, 130 deletions(-)

diff --git a/www-servers/h2o/files/h2o-2.2-libressl-2.7.patch 
b/www-servers/h2o/files/h2o-2.2-libressl-2.7.patch
deleted file mode 100644
index 02942b4..000
--- a/www-servers/h2o/files/h2o-2.2-libressl-2.7.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From db50d885a87985310e65159a705b45de8646dc26 Mon Sep 17 00:00:00 2001
-From: AIZAWA Hina 
-Date: Fri, 23 Mar 2018 22:50:51 +0900
-Subject: [PATCH] Add supporting LibreSSL 2.7
-
-Signed-off-by: AIZAWA Hina 

- deps/neverbleed/neverbleed.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/deps/neverbleed/neverbleed.c b/deps/neverbleed/neverbleed.c
-index 29b35a9..42356a6 100644
 a/deps/neverbleed/neverbleed.c
-+++ b/deps/neverbleed/neverbleed.c
-@@ -547,7 +547,7 @@ static int sign_stub(struct expbuf_t *buf)
- return 0;
- }
- 
--#if !OPENSSL_1_1_API
-+#if !OPENSSL_1_1_API && (!defined(LIBRESSL_VERSION_NUMBER) || 
LIBRESSL_VERSION_NUMBER < 0x207fL)
- 
- static void RSA_get0_key(const RSA *rsa, const BIGNUM **n, const BIGNUM **e, 
const BIGNUM **d)
- {

diff --git a/www-servers/h2o/h2o-2.2.6.ebuild b/www-servers/h2o/h2o-2.2.6.ebuild
deleted file mode 100644
index ca1edb2..000
--- a/www-servers/h2o/h2o-2.2.6.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-CMAKE_MAKEFILE_GENERATOR="emake"
-SSL_DEPS_SKIP=1
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit cmake-utils ruby-single ssl-cert systemd toolchain-funcs user
-
-DESCRIPTION="H2O - the optimized HTTP/1, HTTP/2 server"
-HOMEPAGE="https://h2o.examp1e.net/;
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libh2o +mruby"
-
-RDEPEND="dev-lang/perl
-   sys-libs/zlib
-   libh2o? ( dev-libs/libuv )
-   dev-libs/openssl:0="
-DEPEND="${RDEPEND}
-   libh2o? ( virtual/pkgconfig )
-   mruby? (
-   ${RUBY_DEPS}
-   || (
-   dev-libs/onigmo
-   dev-libs/oniguruma
-   )
-   sys-devel/bison
-   virtual/pkgconfig
-   )"
-RDEPEND+="
-   !sci-libs/libh2o"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-2.2-libressl-2.7.patch
-   "${FILESDIR}"/${PN}-2.2-mruby.patch
-)
-
-pkg_setup() {
-   enewgroup ${PN}
-   enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-   cmake-utils_src_prepare
-
-   local ruby="ruby"
-   if use mruby; then
-   for ruby in ${RUBY_TARGETS_PREFERENCE}; do
-   if has_version dev-lang/ruby:${ruby:4:1}.${ruby:5}; then
-   break
-   fi
-   ruby=
-   done
-   [[ -z ${ruby} ]] && die "no suitable ruby version found"
-   fi
-
-   sed -i \
-   -e "/INSTALL/s:\(/doc/${PN}\) :\1/html :" \
-   -e "/INSTALL/s:\(/doc\)/${PN}:\1/${PF}:" \
-   -e "s: ruby: ${ruby}:" \
-   CMakeLists.txt
-
-   sed -i "s:pkg-config:$(tc-getPKG_CONFIG):g" deps/mruby/lib/mruby/gem.rb
-   tc-export CC
-   export LD="$(tc-getCC)"
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/${PN}
-   -DWITH_MRUBY=$(usex mruby)
-   -DWITHOUT_LIBS=$(usex !libh2o)
-   -DBUILD_SHARED_LIBS=$(usex libh2o)
-   )
-   cmake-utils_src_configure
-}
-
-src_install() {
-   cmake-utils_src_install
-
-   keepdir /var/www/localhost/htdocs
-
-   insinto /etc/${PN}
-   doins "${FILESDIR}"/${PN}.conf
-
-   newinitd "${FILESDIR}"/${PN}.initd ${PN}
-   systemd_dounit "${FILESDIR}"/${PN}.service
-
-   insinto /etc/logrotate.d
-   newins "${FILESDIR}"/${PN}.logrotate ${PN}
-
-   keepdir /var/log/${PN}
-   fowners ${PN}:${PN} /var/log/${PN}
-   fperms 0750 /var/log/${PN}
-}
-
-pkg_postinst() {
-   if [[ ! -f "${EROOT}"etc/ssl/${PN}/server.key ]]; then
-   install_cert /etc/ssl/${PN}/server
-   chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/server.*
-   fi
-}



[gentoo-commits] repo/proj/libressl:master commit in: www-servers/h2o/files/, www-servers/h2o/

2022-07-10 Thread Quentin Retornaz
commit: ccdc75130c19dcf17ef0b1770a7628d06b4c5930
Author: orbea  riseup  net>
AuthorDate: Thu Jul  7 21:08:34 2022 +
Commit: Quentin Retornaz  retornaz  com>
CommitDate: Sun Jul 10 22:50:13 2022 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=ccdc7513

www-servers/h2o: Add 2.2.6-r1

Signed-off-by: orbea  riseup.net>
Signed-off-by: Quentin Retornaz  retornaz.com>

 www-servers/h2o/files/h2o-2.2-libressl-3.5.patch |  29 +++
 www-servers/h2o/files/h2o.initd  |   2 +-
 www-servers/h2o/h2o-2.2.6-r1.ebuild  | 105 +++
 www-servers/h2o/metadata.xml |   2 +-
 4 files changed, 136 insertions(+), 2 deletions(-)

diff --git a/www-servers/h2o/files/h2o-2.2-libressl-3.5.patch 
b/www-servers/h2o/files/h2o-2.2-libressl-3.5.patch
new file mode 100644
index 000..5d9144d
--- /dev/null
+++ b/www-servers/h2o/files/h2o-2.2-libressl-3.5.patch
@@ -0,0 +1,29 @@
+Fix build with opaque RSA{,_METHOD} in LibreSSL 3.5. The relevant OpenSSL API
+has been available since LibreSSL 2.9. ECDSA support is thus also available.
+
+Index: deps/neverbleed/neverbleed.c
+--- a/deps/neverbleed/neverbleed.c.orig
 b/deps/neverbleed/neverbleed.c
+@@ -45,7 +45,7 @@
+ #endif
+ #include "neverbleed.h"
+ 
+-#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 
0x101fL)
++#if ((!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 
0x209fL) && OPENSSL_VERSION_NUMBER >= 0x101fL)
+ #define OPENSSL_1_1_API 1
+ #else
+ #define OPENSSL_1_1_API 0
+Silence compiler warning. The get_session_cb has had const since LibreSSL 2.8.
+
+Index: lib/common/socket.c
+--- a/lib/common/socket.c.orig
 b/lib/common/socket.c
+@@ -920,7 +920,7 @@ static void create_ossl(h2o_socket_t *sock)
+ }
+ 
+ static SSL_SESSION *on_async_resumption_get(SSL *ssl,
+-#if OPENSSL_VERSION_NUMBER >= 0x101fL && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x101fL && 
(!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x208fL)
+ const
+ #endif
+ unsigned char *data,

diff --git a/www-servers/h2o/files/h2o.initd b/www-servers/h2o/files/h2o.initd
index 7c7cb20..61944cc 100644
--- a/www-servers/h2o/files/h2o.initd
+++ b/www-servers/h2o/files/h2o.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 extra_commands="checkconfig"

diff --git a/www-servers/h2o/h2o-2.2.6-r1.ebuild 
b/www-servers/h2o/h2o-2.2.6-r1.ebuild
new file mode 100644
index 000..abb112d
--- /dev/null
+++ b/www-servers/h2o/h2o-2.2.6-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+CMAKE_MAKEFILE_GENERATOR="emake"
+SSL_DEPS_SKIP=1
+USE_RUBY="ruby26 ruby27"
+
+inherit cmake ruby-single ssl-cert systemd toolchain-funcs
+
+DESCRIPTION="H2O - the optimized HTTP/1, HTTP/2 server"
+HOMEPAGE="https://h2o.examp1e.net/;
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="libh2o +mruby"
+
+RDEPEND="acct-group/h2o
+   acct-user/h2o
+   dev-lang/perl
+   !sci-libs/libh2o
+   sys-libs/zlib
+   libh2o? ( dev-libs/libuv )
+   dev-libs/openssl:0="
+DEPEND="${RDEPEND}
+   mruby? (
+   ${RUBY_DEPS}
+   || (
+   dev-libs/onigmo
+   dev-libs/oniguruma
+   )
+   )"
+BDEPEND="libh2o? ( virtual/pkgconfig )
+   mruby? (
+   sys-devel/bison
+   virtual/pkgconfig
+   )"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.2-libressl-3.5.patch
+   "${FILESDIR}"/${PN}-2.2-mruby.patch
+)
+
+src_prepare() {
+   cmake_src_prepare
+
+   local ruby="ruby"
+   if use mruby; then
+   for ruby in ${RUBY_TARGETS_PREFERENCE}; do
+   if has_version dev-lang/ruby:${ruby:4:1}.${ruby:5}; then
+   break
+   fi
+   ruby=
+   done
+   [[ -z ${ruby} ]] && die "no suitable ruby version found"
+   fi
+
+   sed -i \
+   -e "/INSTALL/s:\(/doc/${PN}\) :\1/html :" \
+   -e "/INSTALL/s:\(/doc\)/${PN}:\1/${PF}:" \
+   -e "s: ruby: ${ruby}:" \
+   CMakeLists.txt
+
+   sed -i "s:pkg-config:$(tc-getPKG_CONFIG):g" deps/mruby/lib/mruby/gem.rb
+   tc-export CC
+   export LD="$(tc-getCC)"
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/${PN}
+   -DWITH_MRUBY=$(usex mruby)
+   -DWITHOUT_LIBS=$(usex !libh2o)
+   -DBUILD_SHARED_LIBS=$(usex libh2o)
+   )

[gentoo-commits] repo/proj/libressl:master commit in: net-wireless/hostapd/, net-wireless/hostapd/files/

2022-07-10 Thread Quentin Retornaz
commit: 0249cce4b236c2e4cb57b9d0a800141b8a9e8f55
Author: orbea  riseup  net>
AuthorDate: Thu Jul  7 00:35:37 2022 +
Commit: Quentin Retornaz  retornaz  com>
CommitDate: Sun Jul 10 22:49:42 2022 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=0249cce4

net-wireless/hostapd: Remove old versions

Signed-off-by: orbea  riseup.net>
Closes: https://github.com/gentoo/libressl/pull/439
Signed-off-by: Quentin Retornaz  retornaz.com>

 net-wireless/hostapd/Manifest  |   1 -
 .../hostapd/files/hostapd-2.6-libressl.patch   |  21 --
 net-wireless/hostapd/files/hostapd-conf.d  |   9 -
 net-wireless/hostapd/files/hostapd-init.d  |  39 
 net-wireless/hostapd/files/hostapd.service |   9 -
 net-wireless/hostapd/hostapd-2.6.ebuild| 219 --
 net-wireless/hostapd/hostapd-2.9-r3.ebuild | 252 -
 7 files changed, 550 deletions(-)

diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index f51e64a..f33599c 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1,4 +1,3 @@
 DIST hostapd-2.10.tar.gz 2440435 BLAKE2B 
dbeeae2f62a8ab52df3e2d05ff0467b643cd68349ef3b28814a11dfb67d4b23d14cf2461a3040694706ec614fcd7c2e0fe58f3597e877cf47296cd75e11c792f
 SHA512 
243baa82d621f859d2507d8d5beb0ebda15a75548a62451dc9bca42717dcc8607adac49b354919a41d8257d16d07ac7268203a79750db0cfb34b51f80ff1ce8f
-DIST hostapd-2.6.tar.gz 1822341 SHA256 
01526b90c1d23bec4b0f052039cc4456c2fd19347b4d830d1d58a0a6aea7117d SHA512 
e60baaa092786250b8de9935f5417c7626f5d749210cce9f83d776b65c19fc92a8141f41923389f05c16295d482a15ae8d8b744f4667425040c99e3c2f5b1bda
 WHIRLPOOL 
fa093c371a66f3aa834d44060330259dc20e3a1937ffacc4450c5c645291c2bd4b31bbe1827f7d27bfca724c5e26f53ea59f2e3aa69a4c87177212bb491b119a
 DIST hostapd-2.9.tar.gz 2244312 BLAKE2B 
07308376dd1576313513fba815b220e4ab2f30ed1a402e24b5c8e62ded79c6d718ff47aad1ac9e46ffb7334580b556f19a8aef013eab34a8d61d708d2f01
 SHA512 
66c729380152db18b64520bda55dfa00af3b0264f97b5de100b81a46e2593571626c4bdcf900f0988ea2131e30bc8788f75d8489dd1f57e37fd56e8098e48a9c
 DIST net-wireless_hostapd_2.7-r2_extras.tar.xz 1820 BLAKE2B 
5c4daf0e4fcf5ae0803cdbe2aabcc75e89b1e92048e8a01894d73639a16b049174b37eca6b6206c337a2874a6e6d5588d50fa5b8a4813e7f6c22bf02efca852f
 SHA512 
65bc4634c8314280ceab44d1f5d6d62092f4bca48253f107b076211020f6f6502388490aee907f9910846a25ba2da7e4122bdb1873eb2b12bf94e867e3295f4c

diff --git a/net-wireless/hostapd/files/hostapd-2.6-libressl.patch 
b/net-wireless/hostapd/files/hostapd-2.6-libressl.patch
deleted file mode 100644
index 2010ca8..000
--- a/net-wireless/hostapd/files/hostapd-2.6-libressl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur hostapd-2.6.orig/src/crypto/crypto_openssl.c 
hostapd-2.6/src/crypto/crypto_openssl.c
 hostapd-2.6.orig/src/crypto/crypto_openssl.c   2017-02-28 
12:49:32.286902599 -0800
-+++ hostapd-2.6/src/crypto/crypto_openssl.c2017-02-28 12:53:03.119653570 
-0800
-@@ -611,7 +611,7 @@
- 
- void * dh5_init(struct wpabuf **priv, struct wpabuf **publ)
- {
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
-   DH *dh;
-   struct wpabuf *pubkey = NULL, *privkey = NULL;
-   size_t publen, privlen;
-@@ -712,7 +712,7 @@
- 
- void * dh5_init_fixed(const struct wpabuf *priv, const struct wpabuf *publ)
- {
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
-   DH *dh;
- 
-   dh = DH_new();

diff --git a/net-wireless/hostapd/files/hostapd-conf.d 
b/net-wireless/hostapd/files/hostapd-conf.d
deleted file mode 100644
index 7d05735..000
--- a/net-wireless/hostapd/files/hostapd-conf.d
+++ /dev/null
@@ -1,9 +0,0 @@
-# Space separated List of interfaces which needs to be started before
-# hostapd
-INTERFACES="wlan0"
-
-# Space separated list of configuration files
-CONFIGS="/etc/hostapd/hostapd.conf"
-
-# Extra options to pass to hostapd, see hostapd(8)
-OPTIONS=""

diff --git a/net-wireless/hostapd/files/hostapd-init.d 
b/net-wireless/hostapd/files/hostapd-init.d
deleted file mode 100644
index fc423e7..000
--- a/net-wireless/hostapd/files/hostapd-init.d
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-pidfile="/run/${SVCNAME}.pid"
-command="/usr/sbin/hostapd"
-command_args="-P ${pidfile} -B ${OPTIONS} ${CONFIGS}"
-
-extra_started_commands="reload"
-
-depend() {
-   local myneeds=
-   for iface in ${INTERFACES}; do
-   myneeds="${myneeds} net.${iface}"
-   done
-
-   [ -n "${myneeds}" ] && need ${myneeds}
-   use logger
-}
-
-start_pre() {
-   local file
-
-   for file in ${CONFIGS}; do
-   if [ ! -r "${file}" ]; then
-   eerror "hostapd 

[gentoo-commits] repo/proj/libressl:master commit in: dev-libs/softhsm/

2022-07-10 Thread Quentin Retornaz
commit: 1f45717bcc3a2a537e19e3911fa908dd432ede2f
Author: orbea  riseup  net>
AuthorDate: Wed Jul  6 23:43:09 2022 +
Commit: Quentin Retornaz  retornaz  com>
CommitDate: Sun Jul 10 22:49:32 2022 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=1f45717b

dev-libs/softhsm: Add 2.6.1-r2

Adds dev-libs/botan::gentoo as a dependency as is done in OpenBSD to
avoid patching softhsm.

Signed-off-by: orbea  riseup.net>
Signed-off-by: Quentin Retornaz  retornaz.com>

 dev-libs/softhsm/Manifest|  1 +
 dev-libs/softhsm/metadata.xml|  2 +-
 dev-libs/softhsm/softhsm-2.6.1-r2.ebuild | 49 
 3 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest
index fd32042..c2da01d 100644
--- a/dev-libs/softhsm/Manifest
+++ b/dev-libs/softhsm/Manifest
@@ -1 +1,2 @@
 DIST softhsm-2.5.0.tar.gz 1078439 BLAKE2B 
f96f9e08f3ea568daccb64a5de94ac91b5efcee3dea09f460e98491e7fcdca1277ed52c339a2ec10dac2f78c9e7e44fe5c4a7d36c58e97afba6e749979d4d7e0
 SHA512 
a1e686729196dc25591eb3da57c2c8ea8494ed274ba711842b2dcae696f477a202acda13a975b8fb1eb68e8e44a79e839dbbc6ba500cab02ad13072c660752d9
+DIST softhsm-2.6.1.tar.gz 1066766 BLAKE2B 
0295c5f40235c8abd8879a8c6f7fbe8e8d686ee03355006e9c90c0f2f7135eaf6794a3d39febda1b1ed6e5d48dcacb1e14dae85fb0efb884d0d719bfc6624b92
 SHA512 
e77137096ff2ac2f5396971efbaa2007188855a8f723cb511182c6c5e5a353b3f98297442758e77a18c3a378c0ca3fce8abe090977f0f4f8d526de204fd523fb

diff --git a/dev-libs/softhsm/metadata.xml b/dev-libs/softhsm/metadata.xml
index b398526..73e6a5d 100644
--- a/dev-libs/softhsm/metadata.xml
+++ b/dev-libs/softhsm/metadata.xml
@@ -1,5 +1,5 @@
 
-http://www.gentoo.org/dtd/metadata.dtd;>
+https://www.gentoo.org/dtd/metadata.dtd;>
 



diff --git a/dev-libs/softhsm/softhsm-2.6.1-r2.ebuild 
b/dev-libs/softhsm/softhsm-2.6.1-r2.ebuild
new file mode 100644
index 000..76226e0
--- /dev/null
+++ b/dev-libs/softhsm/softhsm-2.6.1-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A software PKCS#11 implementation"
+HOMEPAGE="https://www.opendnssec.org/;
+SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="2"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~sparc x86"
+IUSE="gost migration-tool test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   migration-tool? ( dev-db/sqlite:3= )
+   dev-libs/botan
+   !~dev-libs/softhsm-2.0.0:0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   sys-devel/gcc:=[cxx]
+   virtual/pkgconfig
+   test? ( dev-util/cppunit )
+"
+
+DOCS=( NEWS README.md )
+
+src_configure() {
+   # Uses the botan crypto backend for libressl
+   econf \
+   --disable-static \
+   --with-crypto-backend=botan \
+   --disable-p11-kit \
+   --localstatedir="${EPREFIX}/var" \
+   --enable-ecc \
+   $(use_enable gost) \
+   $(use_with migration-tool migrate)
+}
+
+src_install() {
+   default
+
+   find "${ED}" -name '*.la' -delete || die
+
+   keepdir /var/lib/softhsm/tokens
+}



[gentoo-commits] repo/proj/libressl:master commit in: net-libs/pjproject/, net-libs/pjproject/files/

2022-07-10 Thread Quentin Retornaz
commit: de95d5bb2d85d57be5c31fad028d148f5321d542
Author: orbea  riseup  net>
AuthorDate: Wed Jul  6 04:11:55 2022 +
Commit: Quentin Retornaz  retornaz  com>
CommitDate: Sun Jul 10 22:49:23 2022 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=de95d5bb

net-libs/pjproject: Remove old version

Signed-off-by: orbea  riseup.net>
Closes: https://github.com/gentoo/libressl/pull/437
Signed-off-by: Quentin Retornaz  retornaz.com>

 net-libs/pjproject/Manifest|   1 -
 .../pjproject/files/pjproject-2.7.2-libressl.patch |  98 --
 .../files/pjproject-2.7.2-ssl-flipflop.patch   | 103 ---
 net-libs/pjproject/pjproject-2.7.2-r2.ebuild   | 114 -
 4 files changed, 316 deletions(-)

diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index 6adb41c..048f8a5 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -1,2 +1 @@
 DIST pjproject-2.10.tar.gz 8768705 BLAKE2B 
42d70867e2e0474313426f1e188586d203d6165c28a133a62dedacd2deb2899215212824d9402a48fcc66bb08a17b796d3625e1d51a8aedc9aa4b3a3bf1cb8fa
 SHA512 
a67f083df175b536b4e6a7b7fe39e07d3ee805d6917ec64a50694542a7455c33a100889191044ab3fa679b6656774a6be045621aa53510b5f04cdde9ddd59893
-DIST pjproject-2.7.2.tar.bz2 4994233 BLAKE2B 
44ecaf0997d5dd9b18e0b811cead7c9104e63894fa06fb1d64e79b60fa4210968fd90ef47e5f5be3629675363c8756ce3bc1834caa9700654ab4c53efe676ee7
 SHA512 
3d355ffcbbeed62cfc711e574a987dc06043ccf4f2625820adffa89167022b8306fcee3fada71d3d45e7b902fc9c65ac8221de101cbafed25362a3921f702afd

diff --git a/net-libs/pjproject/files/pjproject-2.7.2-libressl.patch 
b/net-libs/pjproject/files/pjproject-2.7.2-libressl.patch
deleted file mode 100644
index 07efa9c..000
--- a/net-libs/pjproject/files/pjproject-2.7.2-libressl.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-Index: /third_party/srtp/crypto/hash/hmac_ossl.c
-===
 /third_party/srtp/crypto/hash/hmac_ossl.c  (revision 5725)
-+++ /third_party/srtp/crypto/hash/hmac_ossl.c  (revision 5726)
-@@ -52,6 +52,8 @@
- #include 
- #include 
-+#include 
- 
- #define SHA1_DIGEST_SIZE  20
-+#define USING_LIBRESSL (defined(LIBRESSL_VERSION_NUMBER))
- 
- /* the debug module for authentiation */
-@@ -77,5 +79,5 @@
- /* OpenSSL 1.1.0 made HMAC_CTX an opaque structure, which must be allocated
-using HMAC_CTX_new.  But this function doesn't exist in OpenSSL 1.0.x. */
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if USING_LIBRESSL || OPENSSL_VERSION_NUMBER < 0x1010L
- {
- /* allocate memory for auth and HMAC_CTX structures */
-@@ -122,5 +124,5 @@
- hmac_ctx = (HMAC_CTX*)a->state;
- 
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if USING_LIBRESSL || OPENSSL_VERSION_NUMBER < 0x1010L
- HMAC_CTX_cleanup(hmac_ctx);
- 
-Index: /pjlib/src/pj/ssl_sock_ossl.c
-===
 /pjlib/src/pj/ssl_sock_ossl.c  (revision 5725)
-+++ /pjlib/src/pj/ssl_sock_ossl.c  (revision 5726)
-@@ -56,6 +56,10 @@
- #include 
- #include 
--
--#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL
-+#include 
-+
-+#define USING_LIBRESSL (defined(LIBRESSL_VERSION_NUMBER))
-+
-+#if !USING_LIBRESSL && !defined(OPENSSL_NO_EC) \
-+  && OPENSSL_VERSION_NUMBER >= 0x1000200fL
- 
- #   include 
-@@ -115,5 +119,5 @@
- 
- 
--#if OPENSSL_VERSION_NUMBER >= 0x1010L
-+#if !USING_LIBRESSL && OPENSSL_VERSION_NUMBER >= 0x1010L
- #  define OPENSSL_NO_SSL2 /* seems to be removed in 1.1.0 */
- #  define M_ASN1_STRING_data(x)   ASN1_STRING_get0_data(x)
-@@ -539,5 +543,5 @@
- 
- /* Init OpenSSL lib */
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if USING_LIBRESSL || OPENSSL_VERSION_NUMBER < 0x1010L
- SSL_library_init();
- SSL_load_error_strings();
-@@ -560,5 +564,7 @@
-   const char *cname;
- 
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if (USING_LIBRESSL && LIBRESSL_VERSION_NUMBER < 0x2020100fL)\
-+|| OPENSSL_VERSION_NUMBER < 0x1010L
-+
-   meth = (SSL_METHOD*)SSLv23_server_method();
-   if (!meth)
-@@ -603,5 +609,6 @@
-   SSL_set_session(ssl, SSL_SESSION_new());
- 
--#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL
-+#if !USING_LIBRESSL && !defined(OPENSSL_NO_EC) \
-+&& OPENSSL_VERSION_NUMBER >= 0x1000200fL
-   openssl_curves_num = SSL_get_shared_curve(ssl,-1);
-   if (openssl_curves_num > PJ_ARRAY_SIZE(openssl_curves))
-@@ -795,5 +802,6 @@
- 
- /* Determine SSL method to use */
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if (USING_LIBRESSL && LIBRESSL_VERSION_NUMBER < 0x2020100fL)\
-+|| OPENSSL_VERSION_NUMBER < 0x1010L
- switch (ssock->param.proto) {
- case PJ_SSL_SOCK_PROTO_TLS1:
-@@ -1232,5 +1240,6 @@
- static pj_status_t set_curves_list(pj_ssl_sock_t *ssock)
- {
--#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 

[gentoo-commits] repo/proj/libressl:master commit in: net-libs/pjproject/, net-libs/pjproject/files/

2022-07-10 Thread Quentin Retornaz
commit: df7659707786500b32825b8407c13c30b9ef4201
Author: orbea  riseup  net>
AuthorDate: Wed Jul  6 04:10:42 2022 +
Commit: Quentin Retornaz  retornaz  com>
CommitDate: Sun Jul 10 22:49:19 2022 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=df765970

net-libs/pjproject: Add 2.10-r2

Signed-off-by: orbea  riseup.net>
Signed-off-by: Quentin Retornaz  retornaz.com>

 net-libs/pjproject/Manifest|   1 +
 ...ct-2.10-CVE-2020-15260-tls-hostname-check.patch | 125 +
 ...-CVE-2021-21375-negotiation-failure-crash.patch |  45 
 ...21-32686-AST-2021-009-GHSA-cv8x-p47p-99wr.patch | 289 +
 .../pjproject/files/pjproject-2.10-libressl.patch  |  17 ++
 ...ion-between-transport-destroy-and-acquire.patch | 108 
 .../pjproject/files/pjproject-2.9-config_site.h|  74 ++
 .../pjproject/files/pjproject-2.9-ssl-enable.patch | 100 +++
 net-libs/pjproject/metadata.xml|   8 +-
 net-libs/pjproject/pjproject-2.10-r2.ebuild| 126 +
 10 files changed, 890 insertions(+), 3 deletions(-)

diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index 0b9f89a..6adb41c 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -1 +1,2 @@
+DIST pjproject-2.10.tar.gz 8768705 BLAKE2B 
42d70867e2e0474313426f1e188586d203d6165c28a133a62dedacd2deb2899215212824d9402a48fcc66bb08a17b796d3625e1d51a8aedc9aa4b3a3bf1cb8fa
 SHA512 
a67f083df175b536b4e6a7b7fe39e07d3ee805d6917ec64a50694542a7455c33a100889191044ab3fa679b6656774a6be045621aa53510b5f04cdde9ddd59893
 DIST pjproject-2.7.2.tar.bz2 4994233 BLAKE2B 
44ecaf0997d5dd9b18e0b811cead7c9104e63894fa06fb1d64e79b60fa4210968fd90ef47e5f5be3629675363c8756ce3bc1834caa9700654ab4c53efe676ee7
 SHA512 
3d355ffcbbeed62cfc711e574a987dc06043ccf4f2625820adffa89167022b8306fcee3fada71d3d45e7b902fc9c65ac8221de101cbafed25362a3921f702afd

diff --git 
a/net-libs/pjproject/files/pjproject-2.10-CVE-2020-15260-tls-hostname-check.patch
 
b/net-libs/pjproject/files/pjproject-2.10-CVE-2020-15260-tls-hostname-check.patch
new file mode 100644
index 000..0d7df68
--- /dev/null
+++ 
b/net-libs/pjproject/files/pjproject-2.10-CVE-2020-15260-tls-hostname-check.patch
@@ -0,0 +1,125 @@
+From 67e46c1ac45ad784db5b9080f5ed8b133c122872 Mon Sep 17 00:00:00 2001
+From: sauwming 
+Date: Mon, 8 Mar 2021 17:39:36 +0800
+Subject: [PATCH] Merge pull request from GHSA-8hcp-hm38-mfph
+
+* Check hostname during TLS transport selection
+
+* revision based on feedback
+
+* remove the code in create_request that has been moved
+---
+ pjsip/include/pjsip/sip_dialog.h |  1 +
+ pjsip/src/pjsip/sip_dialog.c | 15 +++
+ pjsip/src/pjsip/sip_transport.c  | 13 +
+ pjsip/src/pjsip/sip_util.c   | 11 ---
+ 4 files changed, 37 insertions(+), 3 deletions(-)
+
+diff --git a/pjsip/include/pjsip/sip_dialog.h 
b/pjsip/include/pjsip/sip_dialog.h
+index a0214d28c..e314c2ece 100644
+--- a/pjsip/include/pjsip/sip_dialog.h
 b/pjsip/include/pjsip/sip_dialog.h
+@@ -165,6 +165,7 @@ struct pjsip_dialog
+ pjsip_route_hdr   route_set;  /**< Route set. */
+ pj_bool_t route_set_frozen; /**< Route set has been set.  */
+ pjsip_auth_clt_sess   auth_sess;  /**< Client authentication session. 
*/
++pj_str_t  initial_dest;/**< Initial destination host. */
+ 
+ /** Session counter. */
+ int   sess_count; /**< Number of sessions.
*/
+diff --git a/pjsip/src/pjsip/sip_dialog.c b/pjsip/src/pjsip/sip_dialog.c
+index 27530e4f2..9571b5a35 100644
+--- a/pjsip/src/pjsip/sip_dialog.c
 b/pjsip/src/pjsip/sip_dialog.c
+@@ -467,6 +467,10 @@ pj_status_t create_uas_dialog( pjsip_user_agent *ua,
+ 
+ /* Save the remote info. */
+ pj_strdup(dlg->pool, >remote.info_str, );
++
++/* Save initial destination host from transport's info */
++pj_strdup(dlg->pool, >initial_dest,
++>tp_info.transport->remote_name.host);
+ 
+ 
+ /* Init remote's contact from Contact header.
+@@ -1192,6 +1196,12 @@ static pj_status_t dlg_create_request_throw( 
pjsip_dialog *dlg,
+   return status;
+ }
+ 
++/* Copy the initial destination host to tdata. This information can be
++ * used later by transport for transport selection.
++ */
++if (dlg->initial_dest.slen)
++  pj_strdup(tdata->pool, >dest_info.name, >initial_dest);
++
+ /* Done. */
+ *p_tdata = tdata;
+ 
+@@ -1822,6 +1832,11 @@ static void dlg_update_routeset(pjsip_dialog *dlg, 
const pjsip_rx_data *rdata)
+  * transaction as the initial transaction that establishes dialog.
+  */
+ if (dlg->role == PJSIP_ROLE_UAC) {
++  /* Save initial destination host from transport's info. */
++  if (!dlg->initial_dest.slen) {
++  pj_strdup(dlg->pool, >initial_dest,
++>tp_info.transport->remote_name.host);
++  }
+ 
+   

[gentoo-commits] repo/proj/libressl:master commit in: sys-cluster/keepalived/, sys-cluster/keepalived/files/

2022-07-10 Thread Quentin Retornaz
commit: 5399d5ffca2cdfcfe8d98fc261018251bc9a15a7
Author: orbea  riseup  net>
AuthorDate: Thu Jul  7 01:18:15 2022 +
Commit: Quentin Retornaz  retornaz  com>
CommitDate: Sun Jul 10 22:49:53 2022 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=5399d5ff

sys-cluster/keepalived: Add 2.2.7

Signed-off-by: orbea  riseup.net>
Signed-off-by: Quentin Retornaz  retornaz.com>

 sys-cluster/keepalived/Manifest|  1 +
 .../files/keepalived-2.2.7-libressl.patch  | 23 ++
 sys-cluster/keepalived/files/keepalived.confd-r1   |  3 +
 sys-cluster/keepalived/files/keepalived.init-r1| 21 ++
 sys-cluster/keepalived/files/keepalived.service| 13 
 sys-cluster/keepalived/files/keepalived.service-r1 | 15 
 .../keepalived/files/keepalived.service.conf   |  2 +
 sys-cluster/keepalived/keepalived-2.2.7.ebuild | 84 ++
 sys-cluster/keepalived/metadata.xml| 10 +--
 9 files changed, 168 insertions(+), 4 deletions(-)

diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index 6d62878..1ceeea4 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -1 +1,2 @@
 DIST keepalived-1.4.0.tar.gz 731936 BLAKE2B 
b6adf7925cc81a4c6e6f69afaa28bd72f6c13076be03f2971775a63c823dac5c6fec46e0b6724af1a7ac9036a749b285429ba3ffad2d9ecc39ccc213cbe2cb28
 SHA512 
485eda5912d68663f011b8e79263ce1e38ed785919055b113536f63aab52c0d5f581a9ab1951c7f62362ac0a68ee921efc41934a4e535d6df7e59249ef32d6d3
+DIST keepalived-2.2.7.tar.gz 1180180 BLAKE2B 
62c4534eb1eebeac596b628a1fa5fb4069498d532fdeff0dc51afbc71e90125bff7fcffb897da3fd34765c64f43d7b04dcf184169b1bc2cf33413e109f9f5cdc
 SHA512 
9869437fe6f0c10590b13088002b53474a51102da9838a6575d835d006c4871b61324ab80e0e81e0a23d0124e6f033cfc7114749e87b8f736408f3f0bedb3968

diff --git a/sys-cluster/keepalived/files/keepalived-2.2.7-libressl.patch 
b/sys-cluster/keepalived/files/keepalived-2.2.7-libressl.patch
new file mode 100644
index 000..c9876c1
--- /dev/null
+++ b/sys-cluster/keepalived/files/keepalived-2.2.7-libressl.patch
@@ -0,0 +1,23 @@
+From 27f3bc8e6e08dee4073ce87fd191a2b1f20d12ed Mon Sep 17 00:00:00 2001
+From: orbea 
+Date: Wed, 6 Jul 2022 18:03:09 -0700
+Subject: [PATCH] Fix the build with libressl
+
+check_ssl.c:240: undefined reference to `SSL_set0_wbio'
+---
+ keepalived/check/check_ssl.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/keepalived/check/check_ssl.c b/keepalived/check/check_ssl.c
+index 0155fce..889205e 100644
+--- a/keepalived/check/check_ssl.c
 b/keepalived/check/check_ssl.c
+@@ -234,7 +234,7 @@ ssl_connect(thread_ref_t thread, int new_req)
+   BIO_get_fd(req->bio, _fd);
+   if (fcntl(bio_fd, F_SETFD, fcntl(bio_fd, F_GETFD) | FD_CLOEXEC) 
== -1)
+   log_message(LOG_INFO, "Setting CLOEXEC failed on ssl 
socket - errno %d", errno);
+-#ifdef HAVE_SSL_SET0_RBIO
++#if defined(HAVE_SSL_SET0_RBIO) && !defined(LIBRESSL_VERSION_NUMBER)
+   BIO_up_ref(req->bio);
+   SSL_set0_rbio(req->ssl, req->bio);
+   SSL_set0_wbio(req->ssl, req->bio);

diff --git a/sys-cluster/keepalived/files/keepalived.confd-r1 
b/sys-cluster/keepalived/files/keepalived.confd-r1
new file mode 100644
index 000..5b273c1
--- /dev/null
+++ b/sys-cluster/keepalived/files/keepalived.confd-r1
@@ -0,0 +1,3 @@
+# Keepalived options
+# Increase logging:
+#KEEPALIVED_OPTS="-D"

diff --git a/sys-cluster/keepalived/files/keepalived.init-r1 
b/sys-cluster/keepalived/files/keepalived.init-r1
new file mode 100644
index 000..98277b0
--- /dev/null
+++ b/sys-cluster/keepalived/files/keepalived.init-r1
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+   use logger
+   # The interfaces do not actually need to exist to start, it handles 
them gracefully.
+   use net
+}
+
+command="/usr/sbin/keepalived"
+command_args="${KEEPALIVED_OPTS}"
+extra_started_commands="reload"
+pidfile="/run/${RC_SVCNAME}.pid"
+required_files="/etc/keepalived/keepalived.conf"
+
+reload() {
+   ebegin "Reloading ${RC_SVCNAME}"
+   start-stop-daemon --signal HUP --pidfile "${pidfile}"
+   eend $?
+}

diff --git a/sys-cluster/keepalived/files/keepalived.service 
b/sys-cluster/keepalived/files/keepalived.service
new file mode 100644
index 000..ec47a57
--- /dev/null
+++ b/sys-cluster/keepalived/files/keepalived.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=LVS and VRRP High Availability Monitor
+After=network-online.target syslog.target
+
+[Service]
+Type=forking
+PIDFile=/run/keepalived.pid
+KillMode=process
+ExecStart=/usr/sbin/keepalived $KEEPALIVED_OPTIONS
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target

diff --git a/sys-cluster/keepalived/files/keepalived.service-r1 

[gentoo-commits] repo/proj/libressl:master commit in: dev-libs/softhsm/, dev-libs/softhsm/files/

2022-07-10 Thread Quentin Retornaz
commit: 3a076f1a5894ca8aedba576fd88e4f23e82876be
Author: orbea  riseup  net>
AuthorDate: Wed Jul  6 23:44:47 2022 +
Commit: Quentin Retornaz  retornaz  com>
CommitDate: Sun Jul 10 22:49:32 2022 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=3a076f1a

dev-libs/softhsm: Remove old version

Signed-off-by: orbea  riseup.net>
Closes: https://github.com/gentoo/libressl/pull/438
Signed-off-by: Quentin Retornaz  retornaz.com>

 dev-libs/softhsm/Manifest  |  1 -
 .../softhsm/files/softhsm-2.5.0-libressl.patch | 32 --
 dev-libs/softhsm/softhsm-2.5.0.ebuild  | 49 --
 3 files changed, 82 deletions(-)

diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest
index c2da01d..ecf0dc9 100644
--- a/dev-libs/softhsm/Manifest
+++ b/dev-libs/softhsm/Manifest
@@ -1,2 +1 @@
-DIST softhsm-2.5.0.tar.gz 1078439 BLAKE2B 
f96f9e08f3ea568daccb64a5de94ac91b5efcee3dea09f460e98491e7fcdca1277ed52c339a2ec10dac2f78c9e7e44fe5c4a7d36c58e97afba6e749979d4d7e0
 SHA512 
a1e686729196dc25591eb3da57c2c8ea8494ed274ba711842b2dcae696f477a202acda13a975b8fb1eb68e8e44a79e839dbbc6ba500cab02ad13072c660752d9
 DIST softhsm-2.6.1.tar.gz 1066766 BLAKE2B 
0295c5f40235c8abd8879a8c6f7fbe8e8d686ee03355006e9c90c0f2f7135eaf6794a3d39febda1b1ed6e5d48dcacb1e14dae85fb0efb884d0d719bfc6624b92
 SHA512 
e77137096ff2ac2f5396971efbaa2007188855a8f723cb511182c6c5e5a353b3f98297442758e77a18c3a378c0ca3fce8abe090977f0f4f8d526de204fd523fb

diff --git a/dev-libs/softhsm/files/softhsm-2.5.0-libressl.patch 
b/dev-libs/softhsm/files/softhsm-2.5.0-libressl.patch
deleted file mode 100644
index 9aeaf29..000
--- a/dev-libs/softhsm/files/softhsm-2.5.0-libressl.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 308b0b2760d6cb218003768747346d31764f1cfe Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev 
-Date: Fri, 19 Oct 2018 23:19:48 +0300
-Subject: [PATCH] crypto: use ENGINE_load_rdrand with recent openssl
-
-libressl and probably older openssl do not support this.
-
-Signed-off-by: Alon Bar-Lev 

- src/lib/crypto/OSSLCryptoFactory.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-https://github.com/opendnssec/SoftHSMv2/pull/423
-
-diff --git a/src/lib/crypto/OSSLCryptoFactory.cpp 
b/src/lib/crypto/OSSLCryptoFactory.cpp
-index dc5f737..04d383d 100644
 a/src/lib/crypto/OSSLCryptoFactory.cpp
-+++ b/src/lib/crypto/OSSLCryptoFactory.cpp
-@@ -141,8 +141,10 @@ OSSLCryptoFactory::OSSLCryptoFactory()
-   // Initialise OpenSSL
-   OpenSSL_add_all_algorithms();
- 
-+#if !( OPENSSL_VERSION_NUMBER < 0x1010L || 
defined(LIBRESSL_VERSION_NUMBER) )
-   // Make sure RDRAND is loaded first
-   ENGINE_load_rdrand();
-+#endif
-   // Locate the engine
-   rdrand_engine = ENGINE_by_id("rdrand");
-   // Use RDRAND if available
--- 
-2.18.1
-

diff --git a/dev-libs/softhsm/softhsm-2.5.0.ebuild 
b/dev-libs/softhsm/softhsm-2.5.0.ebuild
deleted file mode 100644
index d2b2683..000
--- a/dev-libs/softhsm/softhsm-2.5.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A software PKCS#11 implementation"
-HOMEPAGE="https://www.opendnssec.org/;
-SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz;
-
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="bindist gost migration-tool test"
-RESTRICT="!test? ( test )"
-SLOT="2"
-LICENSE="BSD"
-
-RDEPEND="migration-tool? ( dev-db/sqlite:3= )
-   dev-libs/openssl:0=[bindist=]
-   !~dev-libs/softhsm-2.0.0:0"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-   sys-devel/gcc:=[cxx]
-   test? ( dev-util/cppunit )"
-
-DOCS=(
-   NEWS
-   README.md
-)
-
-PATCHES=(
-   "${FILESDIR}/${P}-libressl.patch"
-)
-
-src_configure() {
-   econf \
-   --disable-static \
-   --with-crypto-backend=openssl \
-   --disable-p11-kit \
-   --localstatedir="${EROOT}/var" \
-   $(use_enable !bindist ecc) \
-   $(use_enable gost) \
-   $(use_with migration-tool migrate)
-}
-
-src_install() {
-   default
-   find "${D}" -name '*.la' -delete || die
-
-   keepdir "${EROOT}/var/lib/softhsm/tokens"
-}



[gentoo-commits] repo/proj/libressl:master commit in: net-wireless/hostapd/files/, net-wireless/hostapd/

2022-07-10 Thread Quentin Retornaz
commit: ff0acc3cbecf9fb572c511744d6b5d3288cb8938
Author: orbea  riseup  net>
AuthorDate: Thu Jul  7 00:33:42 2022 +
Commit: Quentin Retornaz  retornaz  com>
CommitDate: Sun Jul 10 22:49:42 2022 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=ff0acc3c

net-wireless/hostapd: Add 2.9-r6 + 2.10

Signed-off-by: orbea  riseup.net>
Signed-off-by: Quentin Retornaz  retornaz.com>

 net-wireless/hostapd/Manifest  |   1 +
 .../hostapd/files/hostapd-2.10-libressl.patch  |  23 ++
 ...date-DigestAlgorithmIdentifier-parameters.patch | 115 +
 net-wireless/hostapd/hostapd-2.10.ebuild   | 266 
 net-wireless/hostapd/hostapd-2.9-r6.ebuild | 279 +
 net-wireless/hostapd/metadata.xml  |   7 +-
 6 files changed, 687 insertions(+), 4 deletions(-)

diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index fa52c27..f51e64a 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1,3 +1,4 @@
+DIST hostapd-2.10.tar.gz 2440435 BLAKE2B 
dbeeae2f62a8ab52df3e2d05ff0467b643cd68349ef3b28814a11dfb67d4b23d14cf2461a3040694706ec614fcd7c2e0fe58f3597e877cf47296cd75e11c792f
 SHA512 
243baa82d621f859d2507d8d5beb0ebda15a75548a62451dc9bca42717dcc8607adac49b354919a41d8257d16d07ac7268203a79750db0cfb34b51f80ff1ce8f
 DIST hostapd-2.6.tar.gz 1822341 SHA256 
01526b90c1d23bec4b0f052039cc4456c2fd19347b4d830d1d58a0a6aea7117d SHA512 
e60baaa092786250b8de9935f5417c7626f5d749210cce9f83d776b65c19fc92a8141f41923389f05c16295d482a15ae8d8b744f4667425040c99e3c2f5b1bda
 WHIRLPOOL 
fa093c371a66f3aa834d44060330259dc20e3a1937ffacc4450c5c645291c2bd4b31bbe1827f7d27bfca724c5e26f53ea59f2e3aa69a4c87177212bb491b119a
 DIST hostapd-2.9.tar.gz 2244312 BLAKE2B 
07308376dd1576313513fba815b220e4ab2f30ed1a402e24b5c8e62ded79c6d718ff47aad1ac9e46ffb7334580b556f19a8aef013eab34a8d61d708d2f01
 SHA512 
66c729380152db18b64520bda55dfa00af3b0264f97b5de100b81a46e2593571626c4bdcf900f0988ea2131e30bc8788f75d8489dd1f57e37fd56e8098e48a9c
 DIST net-wireless_hostapd_2.7-r2_extras.tar.xz 1820 BLAKE2B 
5c4daf0e4fcf5ae0803cdbe2aabcc75e89b1e92048e8a01894d73639a16b049174b37eca6b6206c337a2874a6e6d5588d50fa5b8a4813e7f6c22bf02efca852f
 SHA512 
65bc4634c8314280ceab44d1f5d6d62092f4bca48253f107b076211020f6f6502388490aee907f9910846a25ba2da7e4122bdb1873eb2b12bf94e867e3295f4c

diff --git a/net-wireless/hostapd/files/hostapd-2.10-libressl.patch 
b/net-wireless/hostapd/files/hostapd-2.10-libressl.patch
new file mode 100644
index 000..268cc27
--- /dev/null
+++ b/net-wireless/hostapd/files/hostapd-2.10-libressl.patch
@@ -0,0 +1,23 @@
+From 87deed487d8f27feb7c6f8180535e67d9e1847ca Mon Sep 17 00:00:00 2001
+From: orbea 
+Date: Wed, 6 Jul 2022 17:24:11 -0700
+Subject: [PATCH] Fix build with libressl-3.5.x
+
+Fails with a undefined reference to SSL_set_cert_cb.
+---
+ src/crypto/tls_openssl.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
+index c9e00b3..5f44a73 100644
+--- a/src/crypto/tls_openssl.c
 b/src/crypto/tls_openssl.c
+@@ -3048,7 +3048,7 @@ static int tls_set_conn_flags(struct tls_connection 
*conn, unsigned int flags,
+   /* Start with defaults from BoringSSL */
+   SSL_CTX_set_verify_algorithm_prefs(conn->ssl_ctx, NULL, 0);
+ #endif /* OPENSSL_IS_BORINGSSL */
+-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
++#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+   if (flags & TLS_CONN_SUITEB_NO_ECDH) {
+   const char *ciphers = "DHE-RSA-AES256-GCM-SHA384";
+ 

diff --git 
a/net-wireless/hostapd/files/hostapd-2.9-ASN-1-Validate-DigestAlgorithmIdentifier-parameters.patch
 
b/net-wireless/hostapd/files/hostapd-2.9-ASN-1-Validate-DigestAlgorithmIdentifier-parameters.patch
new file mode 100644
index 000..8c8ba93
--- /dev/null
+++ 
b/net-wireless/hostapd/files/hostapd-2.9-ASN-1-Validate-DigestAlgorithmIdentifier-parameters.patch
@@ -0,0 +1,115 @@
+From a0541334a6394f8237a4393b7372693cd7e96f15 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen 
+Date: Sat, 13 Mar 2021 18:19:31 +0200
+Subject: ASN.1: Validate DigestAlgorithmIdentifier parameters
+
+The supported hash algorithms do not use AlgorithmIdentifier parameters.
+However, there are implementations that include NULL parameters in
+addition to ones that omit the parameters. Previous implementation did
+not check the parameters value at all which supported both these cases,
+but did not reject any other unexpected information.
+
+Use strict validation of digest algorithm parameters and reject any
+unexpected value when validating a signature. This is needed to prevent
+potential forging attacks.
+
+Signed-off-by: Jouni Malinen 
+---
+ src/tls/pkcs1.c  | 21 +
+ src/tls/x509v3.c | 20 
+ 2 files changed, 41 insertions(+)
+
+diff --git a/src/tls/pkcs1.c b/src/tls/pkcs1.c
+index bbdb0d7..5761dfe 100644

[gentoo-commits] repo/gentoo:master commit in: sys-fs/loop-aes/

2022-07-10 Thread Sam James
commit: 21ae97310c98968d2e3f73201bad932af5f4698a
Author: Hank Leininger  korelogic  com>
AuthorDate: Sun Jul 10 18:12:51 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 10 22:49:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21ae9731

sys-fs/loop-aes: drop 3.7v

Signed-off-by: Hank Leininger  korelogic.com>
Closes: https://github.com/gentoo/gentoo/pull/26330
Signed-off-by: Sam James  gentoo.org>

 sys-fs/loop-aes/Manifest |  1 -
 sys-fs/loop-aes/loop-aes-3.7v.ebuild | 67 
 2 files changed, 68 deletions(-)

diff --git a/sys-fs/loop-aes/Manifest b/sys-fs/loop-aes/Manifest
index 5ef6ad30e214..523c94b316bf 100644
--- a/sys-fs/loop-aes/Manifest
+++ b/sys-fs/loop-aes/Manifest
@@ -1,3 +1,2 @@
-DIST loop-AES-v3.7v.tar.bz2 378465 BLAKE2B 
01d9c3719242846696c1e199a02a42254c06472abce6cee7ccc3882e456921176f7469e9c61331193dd86ee2fcf0d24972f9012026eadad150a8e6116dd4e275
 SHA512 
62c0bafd97bc07d78d128ba3bbcf471bf16bd979264ad9180132b83f01a1e8d4f6d9aa874c602a00bc85360abfefe16f72b28b2c73cc2ad863ea2d36eb7bc478
 DIST loop-AES-v3.7w.tar.bz2 379844 BLAKE2B 
00877a1711afa0a232f6cf0d568fd667fe891393c4cf4602666c68169c71b4a1308806e37ce48f7e5372d5e2416be2f5f1a680302d6ccc795057ccc1d3716f4b
 SHA512 
882653341edba90a4717624382826296d490cd71d4e8843c9f44f606eda0d30a9e685a5310ed3b996b04ab9095d7be6adccff2a16f1c68a2349c052a69fd0a15
 DIST loop-AES-v3.7x.tar.bz2 380098 BLAKE2B 
328e9eefcd22875ceb8b64b632032a63f5edac03c1ac6897cd05e0ca5d28b32a03428ba5da92c88361c1c115d28576c21c4d66e840137e203aab75926b5fd0fa
 SHA512 
2d5986e524e11e1c69c4052d9545bd270e1726e0128884a0a942fef4491a90549fac7bf914348f6a8a8a9c3c38b77ebbf4af78a95a5d12d4c1db9d2a2cd04fc2

diff --git a/sys-fs/loop-aes/loop-aes-3.7v.ebuild 
b/sys-fs/loop-aes/loop-aes-3.7v.ebuild
deleted file mode 100644
index 3061d50ad0a8..
--- a/sys-fs/loop-aes/loop-aes-3.7v.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-mod
-
-MY_P="${PN/aes/AES}-v${PV}"
-
-DESCRIPTION="Linux kernel module to encrypt disk partitions with AES cipher"
-HOMEPAGE="http://loop-aes.sourceforge.net/loop-AES.README;
-SRC_URI="http://loop-aes.sourceforge.net/loop-AES/${MY_P}.tar.bz2;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
-IUSE="cpu_flags_x86_aes extra-ciphers keyscrub cpu_flags_x86_padlock"
-
-DEPEND="app-crypt/loop-aes-losetup"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-   linux-mod_pkg_setup
-
-   CONFIG_CHECK="!BLK_DEV_LOOP"
-   MODULE_NAMES="loop(block::tmp-d-kbuild)"
-   BUILD_TARGETS="all"
-
-   BUILD_PARAMS=" \
-   V=1 \
-   LINUX_SOURCE=\"${KERNEL_DIR}\" \
-   KBUILD_OUTPUT=\"${KBUILD_OUTPUT}\" \
-   USE_KBUILD=y MODINST=n RUNDM=n"
-   use cpu_flags_x86_aes && BUILD_PARAMS+=" INTELAES=y"
-   use keyscrub && BUILD_PARAMS+=" KEYSCRUB=y"
-   use cpu_flags_x86_padlock && BUILD_PARAMS+=" PADLOCK=y"
-
-   if use extra-ciphers; then
-   MODULE_NAMES="${MODULE_NAMES}
-   loop_blowfish(block::tmp-d-kbuild)
-   loop_serpent(block::tmp-d-kbuild)
-   loop_twofish(block::tmp-d-kbuild)"
-   BUILD_PARAMS+=" EXTRA_CIPHERS=y"
-   fi
-}
-
-src_install() {
-   linux-mod_src_install
-
-   dodoc README
-   dodoc ChangeLog
-   dobin loop-aes-keygen
-   doman loop-aes-keygen.1
-
-   into /
-   dosbin build-initrd.sh
-}
-
-pkg_postinst() {
-   linux-mod_pkg_postinst
-
-   einfo
-   einfo "For more instructions take a look at examples in README at:"
-   einfo "'${EPREFIX}/usr/share/doc/${PF}'"
-   einfo
-}



[gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-guest-additions/

2022-07-10 Thread Sam James
commit: 4d871ba0037304177576fb06c6bb007e9c0f6c24
Author: Viorel Munteanu  gmail  com>
AuthorDate: Sun Jul 10 14:25:31 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 10 22:50:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d871ba0

app-emulation/virtualbox-guest-additions: fix VariableScope

Closes: https://bugs.gentoo.org/836037
Signed-off-by: Viorel Munteanu  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26326
Signed-off-by: Sam James  gentoo.org>

 .../virtualbox-guest-additions-6.1.34-r3.ebuild| 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.34-r3.ebuild
 
b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.34-r3.ebuild
index ead997d47a65..5c05b55625b7 100644
--- 
a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.34-r3.ebuild
+++ 
b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.34-r3.ebuild
@@ -64,7 +64,6 @@ pkg_setup() {
use X && MODULE_NAMES+=" 
vboxvideo(misc:${VBOX_MOD_SRC_DIR}/vboxvideo::${VBOX_MOD_SRC_DIR}/vboxvideo)"
 
linux-mod_pkg_setup
-   BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build 
KERNOUT=${KV_OUT_DIR} KBUILD_EXTRA_SYMBOLS=${S}/Module.symvers"
 }
 
 src_prepare() {
@@ -178,6 +177,8 @@ src_compile() {
# Now creating the kernel modules. We must do this _after_
# we compiled the user-space tools as we need two of the
# automatically generated header files. (>=3.2.0)
+   # Move this here for bug 836037
+   BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build 
KERNOUT=${KV_OUT_DIR} KBUILD_EXTRA_SYMBOLS=${S}/Module.symvers"
linux-mod_src_compile
 }
 



[gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-modules/, app-emulation/virtualbox-guest-additions/, ...

2022-07-10 Thread Sam James
commit: 9f6f3eba87025fa4dea571a14f45b9053e936082
Author: Viorel Munteanu  gmail  com>
AuthorDate: Sun Jul 10 07:32:05 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 10 22:50:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f6f3eba

app-emulation/virtualbox*: take maintainership

Signed-off-by: Viorel Munteanu  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 app-emulation/virtualbox-additions/metadata.xml   | 11 +--
 app-emulation/virtualbox-extpack-oracle/metadata.xml  | 11 +--
 app-emulation/virtualbox-guest-additions/metadata.xml | 11 +--
 app-emulation/virtualbox-modules/metadata.xml |  9 -
 app-emulation/virtualbox/metadata.xml |  9 -
 5 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/app-emulation/virtualbox-additions/metadata.xml 
b/app-emulation/virtualbox-additions/metadata.xml
index 2fb28cc9ebf7..3651025ac589 100644
--- a/app-emulation/virtualbox-additions/metadata.xml
+++ b/app-emulation/virtualbox-additions/metadata.xml
@@ -1,5 +1,12 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-  
+  
+ceamac.para...@gmail.com
+Viorel Munteanu
+  
+  
+proxy-ma...@gentoo.org
+Proxy Maintainers
+  
+

diff --git a/app-emulation/virtualbox-extpack-oracle/metadata.xml 
b/app-emulation/virtualbox-extpack-oracle/metadata.xml
index 2fb28cc9ebf7..3651025ac589 100644
--- a/app-emulation/virtualbox-extpack-oracle/metadata.xml
+++ b/app-emulation/virtualbox-extpack-oracle/metadata.xml
@@ -1,5 +1,12 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-  
+  
+ceamac.para...@gmail.com
+Viorel Munteanu
+  
+  
+proxy-ma...@gentoo.org
+Proxy Maintainers
+  
+

diff --git a/app-emulation/virtualbox-guest-additions/metadata.xml 
b/app-emulation/virtualbox-guest-additions/metadata.xml
index 2fb28cc9ebf7..3651025ac589 100644
--- a/app-emulation/virtualbox-guest-additions/metadata.xml
+++ b/app-emulation/virtualbox-guest-additions/metadata.xml
@@ -1,5 +1,12 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-  
+  
+ceamac.para...@gmail.com
+Viorel Munteanu
+  
+  
+proxy-ma...@gentoo.org
+Proxy Maintainers
+  
+

diff --git a/app-emulation/virtualbox-modules/metadata.xml 
b/app-emulation/virtualbox-modules/metadata.xml
index 58ac9b56f9b7..f2ab41b9825a 100644
--- a/app-emulation/virtualbox-modules/metadata.xml
+++ b/app-emulation/virtualbox-modules/metadata.xml
@@ -1,7 +1,14 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-  
+  
+ceamac.para...@gmail.com
+Viorel Munteanu
+  
+  
+proxy-ma...@gentoo.org
+Proxy Maintainers
+  
   
 Apply patch needed for pax enabled kernels
   

diff --git a/app-emulation/virtualbox/metadata.xml 
b/app-emulation/virtualbox/metadata.xml
index fd43e4e7234a..c23ebb8dcabd 100644
--- a/app-emulation/virtualbox/metadata.xml
+++ b/app-emulation/virtualbox/metadata.xml
@@ -1,7 +1,14 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-  
+  
+ceamac.para...@gmail.com
+Viorel Munteanu
+  
+  
+proxy-ma...@gentoo.org
+Proxy Maintainers
+  
   
   Install dtrace Extension Pack
   Build without any graphic frontend



[gentoo-commits] repo/gentoo:master commit in: sys-fs/loop-aes/

2022-07-10 Thread Sam James
commit: 461913cedd9ee4badfff9b1322ec54417a1ff92f
Author: Hank Leininger  korelogic  com>
AuthorDate: Sun Jul 10 18:10:39 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 10 22:49:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=461913ce

sys-fs/loop-aes: add 3.7x

Signed-off-by: Hank Leininger  korelogic.com>
Signed-off-by: Sam James  gentoo.org>

 sys-fs/loop-aes/Manifest |  1 +
 sys-fs/loop-aes/loop-aes-3.7x.ebuild | 69 
 2 files changed, 70 insertions(+)

diff --git a/sys-fs/loop-aes/Manifest b/sys-fs/loop-aes/Manifest
index 529b8e4b6fbb..5ef6ad30e214 100644
--- a/sys-fs/loop-aes/Manifest
+++ b/sys-fs/loop-aes/Manifest
@@ -1,2 +1,3 @@
 DIST loop-AES-v3.7v.tar.bz2 378465 BLAKE2B 
01d9c3719242846696c1e199a02a42254c06472abce6cee7ccc3882e456921176f7469e9c61331193dd86ee2fcf0d24972f9012026eadad150a8e6116dd4e275
 SHA512 
62c0bafd97bc07d78d128ba3bbcf471bf16bd979264ad9180132b83f01a1e8d4f6d9aa874c602a00bc85360abfefe16f72b28b2c73cc2ad863ea2d36eb7bc478
 DIST loop-AES-v3.7w.tar.bz2 379844 BLAKE2B 
00877a1711afa0a232f6cf0d568fd667fe891393c4cf4602666c68169c71b4a1308806e37ce48f7e5372d5e2416be2f5f1a680302d6ccc795057ccc1d3716f4b
 SHA512 
882653341edba90a4717624382826296d490cd71d4e8843c9f44f606eda0d30a9e685a5310ed3b996b04ab9095d7be6adccff2a16f1c68a2349c052a69fd0a15
+DIST loop-AES-v3.7x.tar.bz2 380098 BLAKE2B 
328e9eefcd22875ceb8b64b632032a63f5edac03c1ac6897cd05e0ca5d28b32a03428ba5da92c88361c1c115d28576c21c4d66e840137e203aab75926b5fd0fa
 SHA512 
2d5986e524e11e1c69c4052d9545bd270e1726e0128884a0a942fef4491a90549fac7bf914348f6a8a8a9c3c38b77ebbf4af78a95a5d12d4c1db9d2a2cd04fc2

diff --git a/sys-fs/loop-aes/loop-aes-3.7x.ebuild 
b/sys-fs/loop-aes/loop-aes-3.7x.ebuild
new file mode 100644
index ..5f6b4ed8f398
--- /dev/null
+++ b/sys-fs/loop-aes/loop-aes-3.7x.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod
+
+MY_P="${PN/aes/AES}-v${PV}"
+
+DESCRIPTION="Linux kernel module to encrypt disk partitions with AES cipher"
+HOMEPAGE="http://loop-aes.sourceforge.net/loop-AES.README;
+SRC_URI="http://loop-aes.sourceforge.net/loop-AES/${MY_P}.tar.bz2;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+IUSE="cpu_flags_x86_aes extra-ciphers keyscrub cpu_flags_x86_padlock"
+
+DEPEND="app-crypt/loop-aes-losetup"
+
+PATCHES=( "${FILESDIR}"/loop-aes-3.7w-build-initrd_explicit-losetup.patch )
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+   linux-mod_pkg_setup
+
+   CONFIG_CHECK="!BLK_DEV_LOOP"
+   MODULE_NAMES="loop(block::tmp-d-kbuild)"
+   BUILD_TARGETS="all"
+
+   BUILD_PARAMS=" \
+   V=1 \
+   LINUX_SOURCE=\"${KERNEL_DIR}\" \
+   KBUILD_OUTPUT=\"${KBUILD_OUTPUT}\" \
+   USE_KBUILD=y MODINST=n RUNDM=n"
+   use cpu_flags_x86_aes && BUILD_PARAMS+=" INTELAES=y"
+   use keyscrub && BUILD_PARAMS+=" KEYSCRUB=y"
+   use cpu_flags_x86_padlock && BUILD_PARAMS+=" PADLOCK=y"
+
+   if use extra-ciphers; then
+   MODULE_NAMES="${MODULE_NAMES}
+   loop_blowfish(block::tmp-d-kbuild)
+   loop_serpent(block::tmp-d-kbuild)
+   loop_twofish(block::tmp-d-kbuild)"
+   BUILD_PARAMS+=" EXTRA_CIPHERS=y"
+   fi
+}
+
+src_install() {
+   linux-mod_src_install
+
+   dodoc README
+   dodoc ChangeLog
+   dobin loop-aes-keygen
+   doman loop-aes-keygen.1
+
+   into /
+   dosbin build-initrd.sh
+}
+
+pkg_postinst() {
+   linux-mod_pkg_postinst
+
+   einfo
+   einfo "For more instructions take a look at examples in README at:"
+   einfo "'${EPREFIX}/usr/share/doc/${PF}'"
+   einfo
+}



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/flow-tools/files/

2022-07-10 Thread Sam James
commit: 7d22d15778eea9a548dff0e680a9530f374354e6
Author: orbea  riseup  net>
AuthorDate: Tue Jul  5 23:13:46 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 10 22:49:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d22d157

net-analyzer/flow-tools: Remove LibreSSL patch

This also fixes the build with libressl-3.5.x from the gentoo overlay.

Signed-off-by: orbea  riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/26240
Signed-off-by: Sam James  gentoo.org>

 .../flow-tools/files/flow-tools-0.68.5.1-openssl11.patch  | 15 ---
 1 file changed, 15 deletions(-)

diff --git a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-openssl11.patch 
b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-openssl11.patch
index 686d40ab8079..cbbddcaae68d 100644
--- a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-openssl11.patch
+++ b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-openssl11.patch
@@ -1,20 +1,5 @@
 --- a/lib/ftxlate.c
 +++ b/lib/ftxlate.c
-@@ -34,6 +34,14 @@
- #include 
- #include 
- #undef free_func
-+
-+/* fixup LibreSSL OpenSSL version numbering */
-+#include 
-+#if (defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x2000L)
-+#undef OPENSSL_VERSION_NUMBER
-+#define OPENSSL_VERSION_NUMBER 0x1000107fL
-+#endif
-+
- #endif /* HAVE_OPENSSL */
- 
- #include 
 @@ -2040,11 +2048,13 @@
  
  



[gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-guest-additions/

2022-07-10 Thread Sam James
commit: 38538583db6d847f7efdb151eaaf9a68
Author: Viorel Munteanu  gmail  com>
AuthorDate: Sun Jul 10 11:29:47 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 10 22:50:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3853

app-emulation/virtualbox-guest-additions: respect LDFLAGS

Closes: https://bugs.gentoo.org/759100
Closes: https://bugs.gentoo.org/854552
Signed-off-by: Viorel Munteanu  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 .../virtualbox-guest-additions-6.1.34-r3.ebuild| 279 +
 1 file changed, 279 insertions(+)

diff --git 
a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.34-r3.ebuild
 
b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.34-r3.ebuild
new file mode 100644
index ..ead997d47a65
--- /dev/null
+++ 
b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.34-r3.ebuild
@@ -0,0 +1,279 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo linux-mod systemd toolchain-funcs udev
+
+MY_PN="VirtualBox"
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P="${MY_PN}-${MY_PV}"
+[[ "${PV}" == *a ]] && DIR_PV="$(ver_cut 1-3)"
+
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
+HOMEPAGE="https://www.virtualbox.org/;
+SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2
+   
https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz;
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
+RDEPEND="
+   acct-group/vboxguest
+   acct-group/vboxsf
+   acct-user/vboxguest
+   X? ( x11-apps/xrandr
+   x11-apps/xrefresh
+   x11-libs/libXmu
+   x11-libs/libX11
+   x11-libs/libXt
+   x11-libs/libXext
+   x11-libs/libXau
+   x11-libs/libXdmcp
+   x11-libs/libSM
+   x11-libs/libICE )
+   sys-apps/dbus
+"
+DEPEND="
+   ${RDEPEND}
+   >=dev-util/kbuild-0.1.9998.3127
+   >=dev-lang/yasm-0.6.2
+   sys-devel/bin86
+   sys-libs/pam
+   sys-power/iasl
+   x11-base/xorg-proto
+"
+PDEPEND="
+   X? ( x11-drivers/xf86-video-vboxvideo )
+"
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+
+S="${WORKDIR}/${MY_PN}-${DIR_PV:-${PV}}"
+VBOX_MOD_SRC_DIR="${S}/out/linux.${ARCH}/release/bin/additions/src"
+
+pkg_setup() {
+   export DISTCC_DISABLE=1 #674256
+   
MODULE_NAMES="vboxguest(misc:${VBOX_MOD_SRC_DIR}/vboxguest:${VBOX_MOD_SRC_DIR}/vboxguest)
+   
vboxsf(misc:${VBOX_MOD_SRC_DIR}/vboxsf:${VBOX_MOD_SRC_DIR}/vboxsf)"
+   use X && MODULE_NAMES+=" 
vboxvideo(misc:${VBOX_MOD_SRC_DIR}/vboxvideo::${VBOX_MOD_SRC_DIR}/vboxvideo)"
+
+   linux-mod_pkg_setup
+   BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build 
KERNOUT=${KV_OUT_DIR} KBUILD_EXTRA_SYMBOLS=${S}/Module.symvers"
+}
+
+src_prepare() {
+   # Remove shipped binaries (kBuild,yasm), see bug #232775
+   rm -r kBuild/bin tools || die
+
+   # Provide kernel sources
+   pushd src/VBox/Additions &>/dev/null || die
+   ebegin "Extracting guest kernel module sources"
+   kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null
+   eend $? || die
+   popd &>/dev/null || die
+
+   # PaX fixes (see bug #298988)
+   pushd "${VBOX_MOD_SRC_DIR}" &>/dev/null || die
+   eapply "${FILESDIR}"/vboxguest-6.0.6-log-use-c99.patch
+   popd &>/dev/null || die
+
+   # Disable things unused or splitted into separate ebuilds
+   cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
+   use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
+
+   # Remove pointless GCC version check
+   sed -e '/^check_gcc$/d' -i configure || die
+
+   # Respect LDFLAGS (bug #759100)
+   sed -i -e '/TEMPLATE_VBOXR3EXE_LDFLAGS.linux[]*=/ s/$/ 
$(CCLDFLAGS)/' Config.kmk
+
+   # Do not use hard-coded ld (related to bug #488176)
+   #sed -e '/QUIET)ld /s@ld @$(LD) @' \
+   #   -i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
+
+   eapply "${WORKDIR}/patches"
+   eapply_user
+}
+
+src_configure() {
+   tc-export AR CC CXX LD RANLIB
+
+   # Build the user-space tools, warnings are harmless
+   local myconf=(
+   --with-gcc="$(tc-getCC)"
+   --with-g++="$(tc-getCXX)"
+
+   --nofatal
+   --disable-xpcom
+   --disable-sdl-ttf
+   --disable-pulse
+   --disable-alsa
+   --target-arch=${ARCH}
+   --with-linux="${KV_OUT_DIR}"
+   --build-headless
+   )
+
+   # bug 

[gentoo-commits] repo/gentoo:master commit in: net-voip/telepathy-gabble/files/

2022-07-10 Thread Sam James
commit: 96f41975119135ab535159e3807a454658547c00
Author: orbea  riseup  net>
AuthorDate: Thu Jul  7 01:45:52 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 10 22:49:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96f41975

net-voip/telepathy-gabble: Remove LibreSSL support

This also fixes the build with libressl-3.5.x from the libressl overlay.

Signed-off-by: orbea  riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/26253
Signed-off-by: Sam James  gentoo.org>

 .../telepathy-gabble-0.18.4-openssl-1.1.patch  | 30 +++---
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git 
a/net-voip/telepathy-gabble/files/telepathy-gabble-0.18.4-openssl-1.1.patch 
b/net-voip/telepathy-gabble/files/telepathy-gabble-0.18.4-openssl-1.1.patch
index 0e0d647b700c..c4707e849384 100644
--- a/net-voip/telepathy-gabble/files/telepathy-gabble-0.18.4-openssl-1.1.patch
+++ b/net-voip/telepathy-gabble/files/telepathy-gabble-0.18.4-openssl-1.1.patch
@@ -19,12 +19,12 @@ index b77fb4c..bb50523 100644
0x02,
};
DH *dh;
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x1010L
 +  int r = 0;
 +#endif
  
if ((dh=DH_new()) == NULL) return(NULL);
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x1010L
 +  r = DH_set0_pqg(dh, BN_bin2bn(dh1024_p,sizeof(dh1024_p),NULL),
 +  NULL, 
BN_bin2bn(dh1024_g,sizeof(dh1024_g),NULL));
 +  if (!r)
@@ -45,12 +45,12 @@ index c16deb7..d53ceda 100644
0x02,
};
DH *dh;
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x1010L
 +  int r = 0;
 +#endif
  
if ((dh=DH_new()) == NULL) return(NULL);
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x1010L
 +  r = DH_set0_pqg(dh, BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL),
 +  NULL, 
BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL));
 +  if (!r)
@@ -71,12 +71,12 @@ index 2854385..93fa7e5 100644
0x02,
};
DH *dh;
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x1010L
 +  int r = 0;
 +#endif
  
if ((dh=DH_new()) == NULL) return(NULL);
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x1010L
 +  r = DH_set0_pqg(dh, BN_bin2bn(dh4096_p,sizeof(dh4096_p),NULL),
 +  NULL, 
BN_bin2bn(dh4096_g,sizeof(dh4096_g),NULL));
 +  if (!r)
@@ -97,12 +97,12 @@ index 8e7a278..c2891cd 100644
0x02,
};
DH *dh;
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x1010L
 +  int r = 0;
 +#endif
  
if ((dh=DH_new()) == NULL) return(NULL);
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x1010L
 +  r = DH_set0_pqg(dh, BN_bin2bn(dh512_p,sizeof(dh512_p),NULL),
 +  NULL, 
BN_bin2bn(dh512_g,sizeof(dh512_g),NULL));
 +  if (!r)
@@ -124,7 +124,7 @@ index 2201213..18f9981 100644
gboolean rval = FALSE;
X509_NAME *subject = X509_get_subject_name (cert);
 -  X509_CINF *ci = cert->cert_info;
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x1010L
 +  const STACK_OF(X509_EXTENSION)* extensions = X509_get0_extensions(cert);
 +#else
 +  const STACK_OF(X509_EXTENSION)* extensions = cert->cert_info->extensions;
@@ -148,7 +148,7 @@ index 2201213..18f9981 100644
  long ni = OBJ_obj2nid (obj);
  const guchar *p;
  char *value = NULL;
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x1010L
 +const ASN1_OCTET_STRING* ext_value = X509_EXTENSION_get_data(ext);
 +int len = ASN1_STRING_length(ext_value);
 +#else
@@ -161,7 +161,7 @@ index 2201213..18f9981 100644
  if ((convert = (X509V3_EXT_METHOD *) X509V3_EXT_get (ext)) == NULL)
continue;
  
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x1010L
 +p = ASN1_STRING_get0_data(ext_value);
 +#else
  p = ext->value->data;
@@ -173,7 +173,7 @@ index 2201213..18f9981 100644
X509_STORE *store = SSL_CTX_get_cert_store(session->ctx);
X509 *cert = SSL_get_peer_certificate (session->ssl);
STACK_OF(X509) *chain = SSL_get_peer_cert_chain (session->ssl);

[gentoo-commits] repo/gentoo:master commit in: media-libs/pcaudiolib/

2022-07-10 Thread Sam James
commit: 3558043407a3f4b41d6ff483d8dbe31b23a88ad0
Author: orbea  riseup  net>
AuthorDate: Sat Jul  9 22:25:37 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 10 22:49:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35580434

media-libs/pcaudiolib: Fix install with slibtool

With slibtool the '.la' files are not installed by default.

Closes: https://bugs.gentoo.org/799617
Signed-off-by: orbea  riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/26315
Signed-off-by: Sam James  gentoo.org>

 media-libs/pcaudiolib/pcaudiolib-1.1.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-libs/pcaudiolib/pcaudiolib-1.1.ebuild 
b/media-libs/pcaudiolib/pcaudiolib-1.1.ebuild
index 19f3461c468a..5042a1891ca4 100644
--- a/media-libs/pcaudiolib/pcaudiolib-1.1.ebuild
+++ b/media-libs/pcaudiolib/pcaudiolib-1.1.ebuild
@@ -34,11 +34,12 @@ src_configure() {
$(use_with oss)
$(use_with alsa)
$(use_with pulseaudio)
+   --disable-static
)
econf "${econf_args[@]}"
 }
 
 src_install() {
default
-   rm "${ED}"/usr/lib*/libpcaudio.{a,la} || die
+   find "${ED}" -name '*.la' -delete || die
 }



[gentoo-commits] repo/gentoo:master commit in: dev-libs/libprelude/files/, dev-libs/libprelude/

2022-07-10 Thread Sam James
commit: 89c20c8ae004c2588546fdd02a69117c9c8a7348
Author: orbea  riseup  net>
AuthorDate: Sun Jul 10 16:36:53 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 10 22:49:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89c20c8a

dev-libs/libprelude: Fix the build with slibtool

Closes: https://bugs.gentoo.org/790647
Signed-off-by: orbea  riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/26328
Signed-off-by: Sam James  gentoo.org>

 .../files/libprelude-5.2.0-slibtool.patch  | 43 ++
 dev-libs/libprelude/libprelude-5.2.0-r10.ebuild|  1 +
 2 files changed, 44 insertions(+)

diff --git a/dev-libs/libprelude/files/libprelude-5.2.0-slibtool.patch 
b/dev-libs/libprelude/files/libprelude-5.2.0-slibtool.patch
new file mode 100644
index ..6a1bed0d5c0a
--- /dev/null
+++ b/dev-libs/libprelude/files/libprelude-5.2.0-slibtool.patch
@@ -0,0 +1,43 @@
+Bug: https://bugs.gentoo.org/790647
+
+From: orbea 
+Date: Sun, 10 Jul 2022 09:26:59 -0700
+Subject: [PATCH] Fix the build with slibtool
+
+The build system should not use the .libs directory which is for
+internal use by the libtool implementation only. GNU libtool is far less
+strict than slibtool in these cases.
+
+--- a/bindings/c++/Makefile.am
 b/bindings/c++/Makefile.am
+@@ -21,7 +21,7 @@ libpreludecpp_la_SOURCES = \
+   prelude-log.cxx
+ 
+ libpreludecpp_la_LDFLAGS = -no-undefined -version-info @LIBPRELUDECPP_SONAME@
+-libpreludecpp_la_LIBADD  = $(top_builddir)/src/.libs/libprelude.la
++libpreludecpp_la_LIBADD  = $(top_builddir)/src/libprelude.la
+ libpreludecpp_la_CPPFLAGS = -I$(top_builddir) -I$(top_builddir)/src/include 
-I$(top_srcdir)/src/include -I$(top_builddir)/src/libprelude-error 
-I$(top_builddir)/bindings/c++/include -I$(top_srcdir)/bindings/c++/include 
+ 
+ endif
+--- a/bindings/lua/Makefile.am
 b/bindings/lua/Makefile.am
+@@ -10,7 +10,7 @@ dist_swigdata_DATA = libpreludecpp-lua.i
+ AM_CPPFLAGS = -I@top_srcdir@ -I@top_builddir@/src/include 
-I@top_srcdir@/src/include -I@top_builddir@/src/libprelude-error 
-I@top_srcdir@/bindings/c++/include @LUA_CFLAGS@ -I@top_srcdir@/libmissing 
-I@top_builddir@/libmissing
+ 
+ prelude_la_LDFLAGS = -module -avoid-version
+-prelude_la_LIBADD = $(top_builddir)/bindings/c++/.libs/libpreludecpp.la
++prelude_la_LIBADD = $(top_builddir)/bindings/c++/libpreludecpp.la
+ prelude_la_SOURCES = prelude.cxx
+ preludedir = $(libdir)/lua/@LUA_VERSION@
+ prelude_LTLIBRARIES = prelude.la
+--- a/bindings/ruby/Makefile.am
 b/bindings/ruby/Makefile.am
+@@ -9,7 +9,7 @@ EXTRA_DIST = libpreludecpp-ruby.i Prelude.cxx
+ rbexec_LTLIBRARIES = Prelude.la
+ Prelude_la_CPPFLAGS = $(RUBY_INCLUDES) $(RUBY_CCFLAGS) -I@top_builddir@ 
-I$(top_srcdir)/src/include -I$(top_builddir)/src/include 
-I@top_builddir@/src/libprelude-error -I$(top_srcdir)/bindings/c++/include
+ Prelude_la_LDFLAGS = -module -avoid-version
+-Prelude_la_LIBADD = $(top_builddir)/bindings/c++/.libs/libpreludecpp.la 
$(RUBY_LIBS)
++Prelude_la_LIBADD = $(top_builddir)/bindings/c++/libpreludecpp.la $(RUBY_LIBS)
+ nodist_Prelude_la_SOURCES = Prelude.cxx
+ 
+ Prelude.cxx: $(top_srcdir)/bindings/c++/include/*.hxx 
$(top_srcdir)/bindings/libpreludecpp.i libpreludecpp-ruby.i 

diff --git a/dev-libs/libprelude/libprelude-5.2.0-r10.ebuild 
b/dev-libs/libprelude/libprelude-5.2.0-r10.ebuild
index 161d051dc157..aabb447f64d2 100644
--- a/dev-libs/libprelude/libprelude-5.2.0-r10.ebuild
+++ b/dev-libs/libprelude/libprelude-5.2.0-r10.ebuild
@@ -44,6 +44,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.0.0-fix-python-bindings.patch"
"${FILESDIR}/${PN}-5.1.0-fix_gtkdoc_1.32.patch"
"${FILESDIR}/${PN}-5.2.0-luabindings_liblua.patch"
+   "${FILESDIR}/${PN}-5.2.0-slibtool.patch" # 790647
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: dev-libs/libfmt/

2022-07-10 Thread Sam James
commit: ea2f96eaf36b224fade58d1ec181dec93d6f8f27
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 10 22:46:23 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 10 22:46:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea2f96ea

dev-libs/libfmt: Stabilize 8.0.1-r1 ppc, #857531

Signed-off-by: Sam James  gentoo.org>

 dev-libs/libfmt/libfmt-8.0.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/libfmt/libfmt-8.0.1-r1.ebuild 
b/dev-libs/libfmt/libfmt-8.0.1-r1.ebuild
index 7c1f0a42296c..e713a41ed9a7 100644
--- a/dev-libs/libfmt/libfmt-8.0.1-r1.ebuild
+++ b/dev-libs/libfmt/libfmt-8.0.1-r1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
 else
SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+   KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~riscv x86"
S="${WORKDIR}/fmt-${PV}"
 fi
 



  1   2   3   4   5   6   >