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

2024-09-19 Thread Mike Gilbert
commit: 2dd22373a36be75ba0f5909ca65d5ec884aeca90
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Sep 19 19:46:26 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Sep 19 19:50:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dd22373

net-misc/inetutils: add sockets for talkd and tftpd

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

 ...utils-2.5-r6.ebuild => inetutils-2.5-r7.ebuild} | 39 ++
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/net-misc/inetutils/inetutils-2.5-r6.ebuild 
b/net-misc/inetutils/inetutils-2.5-r7.ebuild
similarity index 82%
rename from net-misc/inetutils/inetutils-2.5-r6.ebuild
rename to net-misc/inetutils/inetutils-2.5-r7.ebuild
index f6f5080ce0d9..c49d4a0d8a55 100644
--- a/net-misc/inetutils/inetutils-2.5-r6.ebuild
+++ b/net-misc/inetutils/inetutils-2.5-r7.ebuild
@@ -99,7 +99,9 @@ create_init() {
EOF
 }
 
-create_socket() {
+create_socket_stream() {
+   use "$1" || return
+
systemd_newunit - "$1.socket" <<-EOF
[Socket]
ListenStream=$2
@@ -120,6 +122,26 @@ create_socket() {
EOF
 }
 
+create_socket_datagram() {
+   use "$1" || return
+
+   systemd_newunit - "$1.socket" <<-EOF
+   [Socket]
+   ListenDatagram=$2
+
+   [Install]
+   WantedBy=sockets.target
+   EOF
+
+   systemd_newunit - "$1.service" <<-EOF
+   [Service]
+   ExecStart="${EPREFIX}/usr/libexec/$1"
+   KillMode=process
+   StandardInput=socket
+   StandardError=journal
+   EOF
+}
+
 src_install() {
default
iu_pamd rexecd rexec
@@ -135,10 +157,13 @@ src_install() {
create_init rlogind --daemon
create_init syslogd
 
-   create_socket ftpd 21
-   create_socket rexecd 512
-   create_socket rlogind 513
-   create_socket rshd 514
-   create_socket telnetd 23
-   create_socket uucpd 540
+   create_socket_stream ftpd 21
+   create_socket_stream rexecd 512
+   create_socket_stream rlogind 513
+   create_socket_stream rshd 514
+   create_socket_stream telnetd 23
+   create_socket_stream uucpd 540
+
+   create_socket_datagram tftpd 69
+   create_socket_datagram talkd 518
 }



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

2024-09-19 Thread Mike Gilbert
commit: e57052774fd974b91843da3f8c87edfd310a0ad6
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Sep 19 18:39:36 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Sep 19 18:39:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5705277

net-misc/inetutils: block app-admin/sysklogd

Bug: https://bugs.gentoo.org/939860
Signed-off-by: Mike Gilbert  gentoo.org>

 net-misc/inetutils/{inetutils-2.5-r5.ebuild => inetutils-2.5-r6.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-misc/inetutils/inetutils-2.5-r5.ebuild 
b/net-misc/inetutils/inetutils-2.5-r6.ebuild
similarity index 98%
rename from net-misc/inetutils/inetutils-2.5-r5.ebuild
rename to net-misc/inetutils/inetutils-2.5-r6.ebuild
index c42a36ef11c6..f6f5080ce0d9 100644
--- a/net-misc/inetutils/inetutils-2.5-r5.ebuild
+++ b/net-misc/inetutils/inetutils-2.5-r6.ebuild
@@ -40,6 +40,7 @@ RDEPEND="${DEPEND}
rlogin? ( !net-misc/netkit-rsh )
rsh? ( !net-misc/netkit-rsh )
logger? ( !sys-apps/util-linux[logger(+)] )
+   syslogd? ( !app-admin/sysklogd )
telnet? ( !net-misc/telnet-bsd !net-misc/netkit-telnetd )
telnetd? ( !net-misc/telnet-bsd !net-misc/netkit-telnetd )
tftp? ( !net-ftp/tftp-hpa )



[gentoo-commits] repo/gentoo:master commit in: app-admin/sysklogd/

2024-09-19 Thread Mike Gilbert
commit: 02b02437494edf17d65461b2bcf0e43344f4b437
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Sep 19 18:42:18 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Sep 19 18:42:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02b02437

app-admin/sysklogd: block net-misc/inetutils[syslogd]

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

 app-admin/sysklogd/{sysklogd-2.5.2.ebuild => sysklogd-2.5.2-r1.ebuild} | 1 +
 app-admin/sysklogd/{sysklogd-2.6.2.ebuild => sysklogd-2.6.2-r1.ebuild} | 1 +
 app-admin/sysklogd/sysklogd-.ebuild| 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-admin/sysklogd/sysklogd-2.5.2.ebuild 
b/app-admin/sysklogd/sysklogd-2.5.2-r1.ebuild
similarity index 98%
rename from app-admin/sysklogd/sysklogd-2.5.2.ebuild
rename to app-admin/sysklogd/sysklogd-2.5.2-r1.ebuild
index 348f7da8ddc7..56b5bae68e17 100644
--- a/app-admin/sysklogd/sysklogd-2.5.2.ebuild
+++ b/app-admin/sysklogd/sysklogd-2.5.2-r1.ebuild
@@ -28,6 +28,7 @@ DEPEND="
 RDEPEND="
${DEPEND}
logrotate? ( app-admin/logrotate )
+   !net-misc/inetutils[syslogd]
 "
 
 DOCS=( ChangeLog.md README.md )

diff --git a/app-admin/sysklogd/sysklogd-2.6.2.ebuild 
b/app-admin/sysklogd/sysklogd-2.6.2-r1.ebuild
similarity index 98%
rename from app-admin/sysklogd/sysklogd-2.6.2.ebuild
rename to app-admin/sysklogd/sysklogd-2.6.2-r1.ebuild
index 7a72c587b181..47b85d4229cc 100644
--- a/app-admin/sysklogd/sysklogd-2.6.2.ebuild
+++ b/app-admin/sysklogd/sysklogd-2.6.2-r1.ebuild
@@ -28,6 +28,7 @@ DEPEND="
 RDEPEND="
${DEPEND}
logrotate? ( app-admin/logrotate )
+   !net-misc/inetutils[syslogd]
 "
 
 DOCS=( ChangeLog.md README.md )

diff --git a/app-admin/sysklogd/sysklogd-.ebuild 
b/app-admin/sysklogd/sysklogd-.ebuild
index 268c09362cb3..47b85d4229cc 100644
--- a/app-admin/sysklogd/sysklogd-.ebuild
+++ b/app-admin/sysklogd/sysklogd-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -28,6 +28,7 @@ DEPEND="
 RDEPEND="
${DEPEND}
logrotate? ( app-admin/logrotate )
+   !net-misc/inetutils[syslogd]
 "
 
 DOCS=( ChangeLog.md README.md )



[gentoo-commits] repo/gentoo:master commit in: app-admin/sysklogd/

2024-09-19 Thread Mike Gilbert
commit: 2327865e88491f15eeabec33cd917a59dc4498ca
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Sep 19 18:40:47 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Sep 19 18:40:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2327865e

app-admin/sysklogd: drop 2.4.4, 2.5.0, 2.5.1

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

 app-admin/sysklogd/Manifest  |  3 --
 app-admin/sysklogd/sysklogd-2.4.4.ebuild | 88 
 app-admin/sysklogd/sysklogd-2.5.0.ebuild | 85 --
 app-admin/sysklogd/sysklogd-2.5.1.ebuild | 85 --
 4 files changed, 261 deletions(-)

diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
index faabe8b3d2cd..15eedbd5154f 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -1,5 +1,2 @@
-DIST sysklogd-2.4.4.tar.gz 451938 BLAKE2B 
218d9487440ab3fa395f596e5e4a9fa95df9dfa416470da658a9ac742437050c81a6e62b42763b038b8dc5d8cfab2ba30d049e269b08a66882f6d3f99863ee7b
 SHA512 
434609dd11951b37d62b5371a2aef66424bb15ae4c98cba44762e8338ac135b37a453e5a4f40492ab80bce9b72faefc9a0ad065753f4cc5f7595911477b26e4a
-DIST sysklogd-2.5.0.tar.gz 459695 BLAKE2B 
ab8185e114f7da2c35b6ba3e3b42e13f3697155b43ccfa923229d95150e3734f74db6f732bcbc999068d8a2f8124a404ee893d2e6ce4c154f89301b3b523df39
 SHA512 
4599f153b046317977de990455b1eea195967da81f68451f1bda4fadba6fe685d7fe533aba3b39f4daa456d6c4931743162a021067e0a16f072a7c77908286f9
-DIST sysklogd-2.5.1.tar.gz 461179 BLAKE2B 
efb1e1ef6456644935b0c5341bf844fe87ed910aec3fd0725da2cc2d6b3f0e1f8d4667e45525b61fa3a249387a23757291daa33aac2a72d4fcd89d325e12ab89
 SHA512 
24d8a76cab4c25b646d879676b46f98bb56c2079badab4f351bf983015479134e4a3e4d64fb50faade26fea8dd7e31c2c45610c17420c147c36bbbe054634983
 DIST sysklogd-2.5.2.tar.gz 459292 BLAKE2B 
c61a89e80d6fde10f5955cf3a7a563fbe9e00799eb1199bc9a2995585c074e7ab2b4fe6a30ae8bc224876448a521c3be9031853ae4710db2555279789aeda95d
 SHA512 
0c160236d0f5ec31d0c5679c04b6f0f40a35af2b5b159af8b2b9dd2d37f5959efbe550dfc50c0b0419bea702b91a6594f2e141c2fbb78fdb20715ee8b2d27805
 DIST sysklogd-2.6.2.tar.gz 462950 BLAKE2B 
591bf168cd9249af888feefd45ed10b8f90e7bdb71c75fbc8a95867dba0abfd20c08b0bbc13f80de2eb9ccf69ab9f77690978963ce96bf17472d2c036f96bb15
 SHA512 
4fb5ccba9e94c273e92ca4a55c6a7234a3dd6bbfd4568c8227b515c0ac5eeb6fdca452c82c989432e86a667dcf13df87f96aef302141e6023d630dc90466224d

diff --git a/app-admin/sysklogd/sysklogd-2.4.4.ebuild 
b/app-admin/sysklogd/sysklogd-2.4.4.ebuild
deleted file mode 100644
index f0192ff1d1e3..
--- a/app-admin/sysklogd/sysklogd-2.4.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="Standard log daemons"
-HOMEPAGE="https://troglobit.com/sysklogd.html 
https://github.com/troglobit/sysklogd";
-
-if [[ ${PV} == * ]] ; then
-   inherit autotools git-r3
-   EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git";
-else
-   
SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz";
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="logger logrotate"
-# Needs network access
-RESTRICT="test"
-
-DEPEND="
-   logger? (
-   !=sys-apps/util-linux-2.34-r3[logger]
-   )
-"
-RDEPEND="
-   ${DEPEND}
-   logrotate? ( app-admin/logrotate )
-"
-
-DOCS=( ChangeLog.md README.md )
-
-src_prepare() {
-   default
-
-   [[ ${PV} == * ]] && eautoreconf
-}
-
-src_configure() {
-   append-lfs-flags
-   tc-export CC
-
-   local myeconfargs=(
-   --disable-static
-   --runstatedir="${EPREFIX}"/run
-   --with-systemd=$(systemd_get_systemunitdir)
-   $(use_with logger)
-   )
-
-   econf "${myeconfargs[@]}"
-}
-
-src_install() {
-   default
-
-   insinto /etc
-   doins syslog.conf
-   keepdir /etc/syslog.d
-
-   newinitd "${FILESDIR}"/sysklogd.rc10 sysklogd
-   newconfd "${FILESDIR}"/sysklogd.confd3 sysklogd
-
-   if use logrotate ; then
-   insinto /etc/logrotate.d
-   newins "${FILESDIR}"/sysklogd.logrotate sysklogd
-   sed 's@ -r 10M:10@@' -i "${ED}"/etc/conf.d/sysklogd || die
-   fi
-
-   find "${ED}" -type f -name "*.la" -delete || die
-}
-
-pkg_postinst() {
-   if ! use logrotate && [[ -n ${REPLACING_VERSIONS} ]] && ver_test 
${REPLACING_VERSIONS} -lt 2.0 ; then
-   elog "Starting with version 2.0 syslogd has built in log 
rotation"
- 

[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2024-09-19 Thread Mike Gilbert
commit: fa3bb0237627b3251d751dc312599415146129c2
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Sep 19 18:08:29 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Sep 19 18:08:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa3bb023

net-dialup/ppp: remove workaround for pppgetpass.8

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

 net-dialup/ppp/ppp-2.5.1.ebuild | 12 +++-
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/net-dialup/ppp/ppp-2.5.1.ebuild b/net-dialup/ppp/ppp-2.5.1.ebuild
index 706d0b21237a..a09b7f10794b 100644
--- a/net-dialup/ppp/ppp-2.5.1.ebuild
+++ b/net-dialup/ppp/ppp-2.5.1.ebuild
@@ -7,10 +7,7 @@ inherit autotools linux-info pam tmpfiles
 
 DESCRIPTION="Point-to-Point Protocol (PPP)"
 HOMEPAGE="https://ppp.samba.org/";
-SRC_URI="
-   https://download.samba.org/pub/ppp/${P}.tar.gz
-   
https://raw.githubusercontent.com/ppp-project/ppp/${P}/contrib/pppgetpass/pppgetpass.8
-"
+SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz";
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
@@ -115,12 +112,9 @@ src_install() {
newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass
fi
 
-   newtmpfiles "${FILESDIR}/pppd.tmpfiles" pppd.conf
+   doman contrib/pppgetpass/pppgetpass.8
 
-   # Missing from upstream tarball
-   # https://github.com/ppp-project/ppp/pull/412
-   #doman contrib/pppgetpass/pppgetpass.8
-   doman "${DISTDIR}/pppgetpass.8"
+   newtmpfiles "${FILESDIR}/pppd.tmpfiles" pppd.conf
 
insinto /etc/ppp/radius
doins 
pppd/plugins/radius/etc/{dictionary*,issue,port-id-map,radiusclient.conf,realms,servers}



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2024-09-19 Thread Mike Gilbert
commit: 544b18e9bdbeae9279d4b4fccc171acf0ffcbc8d
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Sep 19 18:11:53 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Sep 19 18:11:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=544b18e9

net-dialup/ppp: drop eautoreconf

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

 net-dialup/ppp/ppp-2.5.1.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net-dialup/ppp/ppp-2.5.1.ebuild b/net-dialup/ppp/ppp-2.5.1.ebuild
index a09b7f10794b..8838554026f7 100644
--- a/net-dialup/ppp/ppp-2.5.1.ebuild
+++ b/net-dialup/ppp/ppp-2.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools linux-info pam tmpfiles
+inherit linux-info pam tmpfiles
 
 DESCRIPTION="Point-to-Point Protocol (PPP)"
 HOMEPAGE="https://ppp.samba.org/";
@@ -58,7 +58,6 @@ pkg_setup() {
 
 src_prepare() {
default
-   eautoreconf
 
# Set the right paths in radiusclient.conf
sed -e "s:/usr/local/etc:/etc:" \



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2024-09-19 Thread Mike Gilbert
commit: 5dc884107fa774e391a952b591d21d8dbd837037
Author: Jaco Kroon  uls  co  za>
AuthorDate: Thu Sep 19 13:29:42 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Sep 19 17:49:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dc88410

net-dialup/ppp: add 2.5.1

Signed-off-by: Jaco Kroon  uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/38683
Signed-off-by: Mike Gilbert  gentoo.org>

 net-dialup/ppp/Manifest |   1 +
 net-dialup/ppp/ppp-2.5.1.ebuild | 131 
 2 files changed, 132 insertions(+)

diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 84e1b64ccc57..1ca41536ecd5 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,5 +1,6 @@
 DIST ppp-2.4.9-patches-03.tar.xz 18520 BLAKE2B 
b3da095672fa57727ba11a5dba761ea3f24ee330f27252f0379dab5761d5381809176faafed86d97a6b89cc8a4cb958baa07f4900e22fe6e76b6c852e0703f0c
 SHA512 
9a035acf1915225340c12e6242f0c5db399b5f5970888d7f1799a5f125cf97b95d9fcb8c9aa2f6bd56c1544d2b10585f772d4fc1025002e3e8403011e3d2c029
 DIST ppp-2.4.9.tar.gz 719904 BLAKE2B 
7ba3eb8c98fec5599635dbd302399617e1075f3a1df090f1a94ce2bb8a5c7631e6eea82246adc33711aba5fe95e7ba7c982e2cbf1fb0d71e45f877d9b092ffb7
 SHA512 
c309f8f69f534c05547cd2f66dade0e0f198ea4c2928a7e899e660280786b3e965437a67b8c5bb81c59d0fa1818b4eb7b701d2dce015a420d380422d2bca4e1a
 DIST ppp-2.5.0.tar.gz 1170057 BLAKE2B 
6a0e9efcbff3cb499705071cc7d0e3411cf4871fd53b2bfedbb1f2cf3ad80728eb436050cf33b78e36d473be64f15907a21da17f283337455f0af379bc18272d
 SHA512 
094368ea2aa6c6e8dfba4443509857a7c1c7ff839bb6d6657743802477208c01e87db31593cef0932d3725c640e9c103179da6b742825034cda82bd31ddcc2ed
+DIST ppp-2.5.1.tar.gz 991639 BLAKE2B 
e3ece873ea25bde5ddffd0da168ffe6ba890693f20fb9f1d6a48f365331abdb4cf517fd0b3004d26a0c778ad4d750e39e38486544e2771b23223469db13c239c
 SHA512 
57b3bbf918c302dbc621f56b706efa1b35b2fc45b71c3a309c1cfee22c28fcf98d7f8965fbeba9260c124f2afb9e297885007256ee05469adca73fad032902b9
 DIST ppp-dhcpc.tgz 33497 BLAKE2B 
ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da
 SHA512 
aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738
 DIST pppgetpass.8 450 BLAKE2B 
4e9805cfecb4d07c302682c1ced42cc5d247d18fae904b909e126874af962cf48bb703cd75b0cefce4e19404f2e757602d3b57f187567fc23d4b93d9598d1486
 SHA512 
21f6dda908cf73ee27bfa39d2b50e7f76b371e50bd7d5a0586174b30129c119accbd260d7f9e0e6aa6aabfa5ba11a13ba560588a99672c9dd4e9f33254f88836

diff --git a/net-dialup/ppp/ppp-2.5.1.ebuild b/net-dialup/ppp/ppp-2.5.1.ebuild
new file mode 100644
index ..706d0b21237a
--- /dev/null
+++ b/net-dialup/ppp/ppp-2.5.1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools linux-info pam tmpfiles
+
+DESCRIPTION="Point-to-Point Protocol (PPP)"
+HOMEPAGE="https://ppp.samba.org/";
+SRC_URI="
+   https://download.samba.org/pub/ppp/${P}.tar.gz
+   
https://raw.githubusercontent.com/ppp-project/ppp/${P}/contrib/pppgetpass/pppgetpass.8
+"
+
+LICENSE="BSD GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+IUSE="activefilter atm gtk pam selinux systemd"
+
+DEPEND="
+   dev-libs/openssl:0=
+   virtual/libcrypt:=
+   activefilter? ( net-libs/libpcap )
+   atm? ( net-dialup/linux-atm )
+   gtk? ( x11-libs/gtk+:2 )
+   pam? ( sys-libs/pam )
+   systemd? ( sys-apps/systemd )
+"
+RDEPEND="
+   ${DEPEND}
+   selinux? ( sec-policy/selinux-ppp )
+"
+BDEPEND="virtual/pkgconfig"
+PDEPEND="net-dialup/ppp-scripts"
+
+pkg_setup() {
+   local CONFIG_CHECK="~PPP ~PPP_ASYNC ~PPP_SYNC_TTY"
+   local ERROR_PPP="CONFIG_PPP:\t missing PPP support (REQUIRED)"
+   local ERROR_PPP_ASYNC="CONFIG_PPP_ASYNC:\t missing asynchronous serial 
line discipline"
+   ERROR_PPP_ASYNC+=" (optional, but highly recommended)"
+   local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing synchronous 
serial line discipline"
+   WARNING_PPP_SYNC_TTY+=" (optional; used by 'sync' pppd option)"
+   if use activefilter ; then
+   CONFIG_CHECK+=" ~PPP_FILTER"
+   local ERROR_PPP_FILTER="CONFIG_PPP_FILTER:\t missing PPP 
filtering support (REQUIRED)"
+   fi
+   CONFIG_CHECK+=" ~PPP_DEFLATE ~PPP_BSDCOMP ~PPP_MPPE"
+   local ERROR_PPP_DEFLATE="CONFIG_PPP_DEFLATE:\t missing Deflate 
compression (optional, but highly recommended)"
+   local ERROR_PPP_BSDCOMP="CONFIG_PPP_BSDCOMP:\t missing BSD-Compress 
compressio

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

2024-09-18 Thread Mike Gilbert
commit: d792f4d4973642b22984214124653f4736fbbd8d
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Sep 18 20:44:30 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Wed Sep 18 20:44:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d792f4d4

net-misc/inetutils: fix CollectMode in units

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

 .../inetutils/{inetutils-2.5-r4.ebuild => inetutils-2.5-r5.ebuild}| 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net-misc/inetutils/inetutils-2.5-r4.ebuild 
b/net-misc/inetutils/inetutils-2.5-r5.ebuild
similarity index 99%
rename from net-misc/inetutils/inetutils-2.5-r4.ebuild
rename to net-misc/inetutils/inetutils-2.5-r5.ebuild
index 8604c35cfe10..c42a36ef11c6 100644
--- a/net-misc/inetutils/inetutils-2.5-r4.ebuild
+++ b/net-misc/inetutils/inetutils-2.5-r5.ebuild
@@ -109,8 +109,10 @@ create_socket() {
EOF
 
systemd_newunit - "$1@.service" <<-EOF
-   [Service]
+   [Unit]
CollectMode=inactive-or-failed
+
+   [Service]
ExecStart="${EPREFIX}/usr/libexec/$1"
StandardInput=socket
StandardError=journal



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

2024-09-17 Thread Mike Gilbert
commit: 9a965c94f7222bb3dab558c49f24e2cc6cb98783
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Sep 17 02:46:15 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Tue Sep 17 20:29:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a965c94

net-misc/inetutils: install init scripts

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

 ...utils-2.5-r3.ebuild => inetutils-2.5-r4.ebuild} | 54 +-
 1 file changed, 53 insertions(+), 1 deletion(-)

diff --git a/net-misc/inetutils/inetutils-2.5-r3.ebuild 
b/net-misc/inetutils/inetutils-2.5-r4.ebuild
similarity index 69%
rename from net-misc/inetutils/inetutils-2.5-r3.ebuild
rename to net-misc/inetutils/inetutils-2.5-r4.ebuild
index 82f4a8ee053b..8604c35cfe10 100644
--- a/net-misc/inetutils/inetutils-2.5-r3.ebuild
+++ b/net-misc/inetutils/inetutils-2.5-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit pam
+inherit pam systemd
 
 DESCRIPTION="Collection of common network programs"
 HOMEPAGE="https://www.gnu.org/software/inetutils/";
@@ -77,6 +77,46 @@ iu_pamd() {
fi
 }
 
+create_init() {
+   use "$1" || return
+
+   newinitd - "$1" <<-EOF
+   #!${EPREFIX}/sbin/openrc-run
+   command="${EPREFIX}/usr/libexec/$1"
+   command_args="$2"
+   pidfile="${EPREFIX}/var/run/$1.pid"
+   EOF
+
+   systemd_newunit - "$1.service" <<-EOF
+   [Service]
+   ExecStart="${EPREFIX}/usr/libexec/$1"${2:+ }$2
+   PIDFile=${EPREFIX}/var/run/$1.pid
+   Type=forking
+
+   [Install]
+   WantedBy=multi-user.target
+   EOF
+}
+
+create_socket() {
+   systemd_newunit - "$1.socket" <<-EOF
+   [Socket]
+   ListenStream=$2
+   Accept=yes
+
+   [Install]
+   WantedBy=sockets.target
+   EOF
+
+   systemd_newunit - "$1@.service" <<-EOF
+   [Service]
+   CollectMode=inactive-or-failed
+   ExecStart="${EPREFIX}/usr/libexec/$1"
+   StandardInput=socket
+   StandardError=journal
+   EOF
+}
+
 src_install() {
default
iu_pamd rexecd rexec
@@ -86,4 +126,16 @@ src_install() {
iu_pamd rlogind krlogin
iu_pamd rshd krsh
fi
+
+   create_init ftpd --daemon
+   create_init inetd
+   create_init rlogind --daemon
+   create_init syslogd
+
+   create_socket ftpd 21
+   create_socket rexecd 512
+   create_socket rlogind 513
+   create_socket rshd 514
+   create_socket telnetd 23
+   create_socket uucpd 540
 }



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

2024-09-16 Thread Mike Gilbert
commit: bc1a3c649de07fd5aa4959a7c5b5b5f7d80b9d77
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Sep 17 01:49:06 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Tue Sep 17 01:49:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc1a3c64

net-misc/inetutils: override localstatedir

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

 net-misc/inetutils/{inetutils-2.5-r2.ebuild => inetutils-2.5-r3.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-misc/inetutils/inetutils-2.5-r2.ebuild 
b/net-misc/inetutils/inetutils-2.5-r3.ebuild
similarity index 98%
rename from net-misc/inetutils/inetutils-2.5-r2.ebuild
rename to net-misc/inetutils/inetutils-2.5-r3.ebuild
index e0d06b2f2d8e..82f4a8ee053b 100644
--- a/net-misc/inetutils/inetutils-2.5-r2.ebuild
+++ b/net-misc/inetutils/inetutils-2.5-r3.ebuild
@@ -52,6 +52,7 @@ QA_CONFIG_IMPL_DECL_SKIP=( MIN static_assert alignof 
unreachable )
 
 src_configure() {
local myconf=(
+   --localstatedir="${EPREFIX}/var"
--disable-clients
--disable-servers
$(use_with idn)



[gentoo-commits] repo/gentoo:master commit in: virtual/inetd/

2024-09-16 Thread Mike Gilbert
commit: 005f47c5fea14849ab9a13061e9c6a149728807e
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Sep 16 18:18:51 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Sep 16 18:18:59 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=005f47c5

virtual/inetd: add net-misc/inetutils[inetd]

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

 virtual/inetd/{inetd-0.ebuild => inetd-1.ebuild} | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/virtual/inetd/inetd-0.ebuild b/virtual/inetd/inetd-1.ebuild
similarity index 83%
rename from virtual/inetd/inetd-0.ebuild
rename to virtual/inetd/inetd-1.ebuild
index 315b7f566e9a..b934be6d5c3d 100644
--- a/virtual/inetd/inetd-0.ebuild
+++ b/virtual/inetd/inetd-1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Virtual for the internet super-server daemon"
 
@@ -14,5 +14,6 @@ RDEPEND="
sys-apps/netkit-base
sys-apps/ucspi-tcp
net-misc/ipsvd
+   net-misc/inetutils[inetd]
)
 "



[gentoo-commits] repo/gentoo:master commit in: sys-apps/netkit-base/

2024-09-16 Thread Mike Gilbert
commit: 5175020a0239ec2bcf4c3aaf75fc7ec9f6203e2f
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Sep 16 17:54:24 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Sep 16 17:56:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5175020a

sys-apps/netkit-base: add blocker on net-misc/initutils

Bug: https://bugs.gentoo.org/939756
Signed-off-by: Mike Gilbert  gentoo.org>

 .../{netkit-base-0.17-r9.ebuild => netkit-base-0.17-r10.ebuild} | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sys-apps/netkit-base/netkit-base-0.17-r9.ebuild 
b/sys-apps/netkit-base/netkit-base-0.17-r10.ebuild
similarity index 93%
rename from sys-apps/netkit-base/netkit-base-0.17-r9.ebuild
rename to sys-apps/netkit-base/netkit-base-0.17-r10.ebuild
index c9c77170e7e0..2051ac7abf3c 100644
--- a/sys-apps/netkit-base/netkit-base-0.17-r9.ebuild
+++ b/sys-apps/netkit-base/netkit-base-0.17-r10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,6 +13,10 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 sparc x86"
 
+RDEPEND="
+   !net-misc/inetutils[inetd]
+"
+
 PATCHES=(
"${FILESDIR}"/003_all_netkit-base-0.17-gcc4.patch
"${FILESDIR}"/004_all_netkit-base-0.17-misc-fixes.patch



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

2024-09-16 Thread Mike Gilbert
commit: 9c0bb46ff6aa06cd597561753555deaf71e6a1ca
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Sep 16 17:55:43 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Sep 16 17:56:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c0bb46f

net-misc/inetutils: add blocker on sys-apps/netkit-base

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

 net-misc/inetutils/{inetutils-2.5-r1.ebuild => inetutils-2.5-r2.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-misc/inetutils/inetutils-2.5-r1.ebuild 
b/net-misc/inetutils/inetutils-2.5-r2.ebuild
similarity index 98%
rename from net-misc/inetutils/inetutils-2.5-r1.ebuild
rename to net-misc/inetutils/inetutils-2.5-r2.ebuild
index 3ebcf02e40ee..e0d06b2f2d8e 100644
--- a/net-misc/inetutils/inetutils-2.5-r1.ebuild
+++ b/net-misc/inetutils/inetutils-2.5-r2.ebuild
@@ -32,6 +32,7 @@ RDEPEND="${DEPEND}
ftp? ( !net-ftp/ftp )
dnsdomainname? ( !sys-apps/net-tools )
hostname? ( !sys-apps/coreutils[hostname(-)] 
!sys-apps/net-tools[hostname(+)] )
+   inetd? ( !sys-apps/netkit-base )
ping? ( !net-misc/iputils )
ping6? ( !net-misc/iputils[ipv6(+)] )
rcp? ( !net-misc/netkit-rsh )



[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/

2024-09-12 Thread Mike Gilbert
commit: b4efe21a38947ac8eef56424b79ae2e36c134325
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Sep 12 18:26:09 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Sep 12 18:26:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4efe21a

sys-boot/grub: enable device-mapper by default

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

 sys-boot/grub/grub-2.12-r5.ebuild | 2 +-
 sys-boot/grub/grub-.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-boot/grub/grub-2.12-r5.ebuild 
b/sys-boot/grub/grub-2.12-r5.ebuild
index b79c99dc9484..4669eb069663 100644
--- a/sys-boot/grub/grub-2.12-r5.ebuild
+++ b/sys-boot/grub/grub-2.12-r5.ebuild
@@ -74,7 +74,7 @@ SRC_URI+=" fonts? ( 
mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
 # Includes licenses for dejavu and unifont
 LICENSE="GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( 
CC-BY-SA-3.0 BitstreamVera )"
 SLOT="2/${PVR}"
-IUSE="device-mapper doc efiemu +fonts mount nls sdl test +themes truetype 
libzfs"
+IUSE="+device-mapper doc efiemu +fonts mount nls sdl test +themes truetype 
libzfs"
 
 GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot
qemu qemu-mips pc uboot xen xen-32 xen-pvh )

diff --git a/sys-boot/grub/grub-.ebuild b/sys-boot/grub/grub-.ebuild
index 31db1cdb8e2c..502541d5de17 100644
--- a/sys-boot/grub/grub-.ebuild
+++ b/sys-boot/grub/grub-.ebuild
@@ -75,7 +75,7 @@ SRC_URI+=" fonts? ( 
mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
 # Includes licenses for dejavu and unifont
 LICENSE="GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( 
CC-BY-SA-3.0 BitstreamVera )"
 SLOT="2/${PVR}"
-IUSE="device-mapper doc efiemu +fonts mount nls sdl test +themes truetype 
libzfs"
+IUSE="+device-mapper doc efiemu +fonts mount nls sdl test +themes truetype 
libzfs"
 
 GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot
qemu qemu-mips pc uboot xen xen-32 xen-pvh )



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

2024-09-11 Thread Mike Gilbert
commit: 2fb9949576f5f55b416d25682b4bfe9c89500df9
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Sep 11 15:24:03 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Wed Sep 11 15:30:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fb99495

dev-util/bcc: do not create conflicting symlinks in /usr/sbin

The same files are installed via python_newscript in /usr/bin.

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

 dev-util/bcc/{bcc-0.31.0.ebuild => bcc-0.31.0-r1.ebuild} | 8 
 1 file changed, 8 deletions(-)

diff --git a/dev-util/bcc/bcc-0.31.0.ebuild b/dev-util/bcc/bcc-0.31.0-r1.ebuild
similarity index 93%
rename from dev-util/bcc/bcc-0.31.0.ebuild
rename to dev-util/bcc/bcc-0.31.0-r1.ebuild
index 274d6f9b7d3a..445bbb4a71ca 100644
--- a/dev-util/bcc/bcc-0.31.0.ebuild
+++ b/dev-util/bcc/bcc-0.31.0-r1.ebuild
@@ -159,14 +159,6 @@ src_install() {
[trace]=1
)
 
-   local tool name
-   for tool in "${ED}"/usr/share/bcc/tools/*; do
-   [[ ! -x ${tool} && ! -L ${tool} || -d ${tool} ]] && continue
-   name=${tool##*/}
-   [[ -n ${rename_tools[${name}]} ]] && name=bcc-${name}
-   dosym -r "${tool#${ED}}" /usr/sbin/${name}
-   done
-
docompress /usr/share/${PN}/man
 
newenvd - "70${P}" <<-_EOF_



[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/

2024-09-11 Thread Mike Gilbert
commit: 986a98ecc0e29535d3a6c55fedf599aea56841f4
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Sep 11 14:50:51 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Wed Sep 11 14:50:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=986a98ec

sys-boot/grub: update device-mapper USE description

Bug: https://bugs.gentoo.org/939361
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-boot/grub/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/grub/metadata.xml b/sys-boot/grub/metadata.xml
index a5ad32e2e733..c8fd5827d3e5 100644
--- a/sys-boot/grub/metadata.xml
+++ b/sys-boot/grub/metadata.xml
@@ -11,7 +11,7 @@
 
 

-   Enable support for device-mapper from sys-fs/lvm2
+   Enable support for devmapper. Required for LUKS or LVM volume 
detection.


Build and install the efiemu runtimes



[gentoo-commits] repo/gentoo:master commit in: dev-vcs/hg-git/

2024-09-10 Thread Mike Gilbert
commit: c0c1985e342a67965af136e585394db71481e2e8
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Sep 10 18:22:44 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Tue Sep 10 18:22:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0c1985e

Revert "dev-vcs/hg-git-1.1.3: version bump"

>dev-python/dulwich-0.22.1 does not exist.

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

 dev-vcs/hg-git/Manifest|  1 -
 dev-vcs/hg-git/hg-git-1.1.3.ebuild | 24 
 2 files changed, 25 deletions(-)

diff --git a/dev-vcs/hg-git/Manifest b/dev-vcs/hg-git/Manifest
index cb36ee325609..7ddba70d6162 100644
--- a/dev-vcs/hg-git/Manifest
+++ b/dev-vcs/hg-git/Manifest
@@ -1,4 +1,3 @@
 DIST 1.0.2-hg65.patch 1697 BLAKE2B 
a620b6624eaad4ff233e9cda97d160acc11402e668a7837385bbf3d6384b19106084054e45d0f63dbe686267e636c3bd862a45b09f52ff93bb588ed3439dc69a
 SHA512 
3ac84637f89b97347cd01c243df9af8b37a8c694fab3e560c8e5fd8baed6e0d695c1cd2cb22580378c57afa01aeee25915ac033444e833d0719bc1defdebc305
 DIST hg-git-1.0.2.tar.bz2 171241 BLAKE2B 
fd953178daff4e283cdacfacafd64c40efff73d0e4a175faa4e032bf38ccc1ef04bd715c4f38dd5d83ab1b0f52a1f329d2a1fb95c13ea83311c47786c3738600
 SHA512 
8df398c059131b4a8f4ab68fde743cfd82b19b3a184ea92f53ac69ba74e0b9cb94366d4a22d595ea44667493f050bd31ee3e9d7632cdb16507c57e156cd611e9
 DIST hg-git-1.1.1.tar.bz2 179321 BLAKE2B 
8f6083be5c123d079dec0ca5ae150faa2658b1bd0ca235516fe13c99df19a570f3f6721c2760947a14356aa261568ac61e53000b1be6a5ee806dea3ccf3ff65e
 SHA512 
fc7f880683f423f2d44342f51325bb522749e33bedc418397bb2f42e46d90fd3b7c949d97ccb6e776bbfc8543bb6ecaef191b271fd7e618612bba5596f6849ef
-DIST hg-git-1.1.3.tar.bz2 180146 BLAKE2B 
286a408b63937ee15dea0d5c164b319735c716785e2ae1c649e61cb923544b398c3d51ff777b7d48d83e7d18d14359173f3f7e4f6dfe08ff66d8af0c182ebae1
 SHA512 
85a3970cd63c0cfd1352eb57e697a20ef59cfb38e9452ef613c05b8be3f0dc99bba10e36cf63c625900696a4e8ee4d604a24857b748b311e1ef36d0005fd6624

diff --git a/dev-vcs/hg-git/hg-git-1.1.3.ebuild 
b/dev-vcs/hg-git/hg-git-1.1.3.ebuild
deleted file mode 100644
index 6853903038b9..
--- a/dev-vcs/hg-git/hg-git-1.1.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{9..12} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-MY_PV=${PV/_rc/a}
-DESCRIPTION="push to and pull from a Git repository using Mercurial"
-HOMEPAGE="https://hg-git.github.io https://pypi.org/project/hg-git/";
-SRC_URI="https://foss.heptapod.net/mercurial/hg-git/-/archive/${MY_PV}/${PN}-${MY_PV}.tar.bz2";
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-   >=dev-vcs/mercurial-6.1[${PYTHON_USEDEP}]
-   >dev-python/dulwich-0.22.1[${PYTHON_USEDEP}]
-"



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

2024-09-05 Thread Mike Gilbert
commit: 3635b85482d9bbdfb6372a9cd1383c3340dd1ebe
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Sep  5 14:43:17 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Sep  5 14:43:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3635b854

profiles: drop sys-process/runit mask

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

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

diff --git a/profiles/package.mask b/profiles/package.mask
index 07ce3a1e85cf..08add0182322 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -163,14 +163,6 @@ kde-misc/latte-dock
 # and writeable. See https://github.com/nextcloud/desktop/issues/6863
 >=net-misc/nextcloud-client-3.13.1
 
-# William Hubbs  (2024-08-21)
-# Dead upstream, multiple related bugs in Gentoo.
-# Removal on 2024-09-20
-# Bug #575478, #611846, #814551, #892653, #904989, #934410, #935656,
-# #938262
-# Treeclean request: #938282
-sys-process/runit
-
 # Arsen Arsenović  (2024-08-02)
 # Guile rework masks.  Mask all packages or package versions that are
 # being bumped as part of the Guile reslotting process.



[gentoo-commits] repo/gentoo:master commit in: sys-process/runit/

2024-09-05 Thread Mike Gilbert
commit: f0506961c5d9a3edacdf0bfe041fc84753665e4f
Author: Z. Liu  gmail  com>
AuthorDate: Fri Aug 23 16:35:50 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Sep  5 14:40:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0506961

sys-process/runit: fix errors & warnings with clang 18/gcc 15

20 patches from https://github.com/clan/runit/tree/ftbfs.v4 , which are divided
into the following categories:

1. patch: 0001
   purpose: helpful for development & debug: make full command line & result
available in build.log, otherwise extra directives are required
when debug
2. patch: 0002, 0003, 0004, 0005, 0006
   purpose: required, build will failed if not apply
0005 & 0006 are warnings only for gcc < 14, errors if gcc >= 14
3. patch: 0007
   purpose: patch from author w/ new feature provided, but don't change any
"user-observable functionality"
4. patch: 0008
   purpose: documentation change: w/ tiny (unlikely to cause problem)
modification of source code
5. patch: 0009 - 0019
   purpose: fix compilation warnings reported by gcc/clang, with -Wall,
-Wextra
6. patch: 0020
   purpose: usleep is obsoleted in POSIX.1-2001, handled this in compile
time by feature test macro, replace w/ nanosleep if available

Closes: https://bugs.gentoo.org/934410
Closes: https://bugs.gentoo.org/938262
Closes: https://bugs.gentoo.org/938282
Closes: https://github.com/clan/runit/issues/2
Signed-off-by: Z. Liu  gmail.com>
Tested-by: Alex Efros  yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/38425
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-process/runit/Manifest   |  1 +
 sys-process/runit/metadata.xml   | 12 +++-
 .../{runit-2.1.2-r4.ebuild => runit-2.1.2-r5.ebuild} | 16 +++-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/sys-process/runit/Manifest b/sys-process/runit/Manifest
index 8331848d7bf9..86dd43dacbcb 100644
--- a/sys-process/runit/Manifest
+++ b/sys-process/runit/Manifest
@@ -1 +1,2 @@
+DIST runit-2.1.2-patches-20240905.tar.xz 20104 BLAKE2B 
ebdc123ea722f223eec3ad5d63a4c3e7c4ef771592796f2d5624f4308c1d08eede7d4fa0c2a9fdd23dbf74be6135c69bae495d89cf582678b9308b1d146ef883
 SHA512 
15c5acd865ecc7f6c3b9b1fc94dc00bc44ceefd1c0ca6b53963d94338712cd716ad961826cccd065029ee67464dc288428952004ffcec3a1a97a058696f4f233
 DIST runit-2.1.2.tar.gz 110916 BLAKE2B 
101e514aeed282685ebe636f401ca6f94d157281d08a3ac487340aebe945b82d2ee01d41e9917446f4ebd7b27fe9fd18ba4ad55739ab1b62a0e59e1c438b55e9
 SHA512 
a18773ebf1aa22305dd89ed67363165b9fcf86c192b2be4e268d08005dd82d51265160c637abe072f2f2e378c4b315a75bd3d3e602c3e75bdd451a3b0190f8cf

diff --git a/sys-process/runit/metadata.xml b/sys-process/runit/metadata.xml
index 115e9d64a669..73e765e89483 100644
--- a/sys-process/runit/metadata.xml
+++ b/sys-process/runit/metadata.xml
@@ -1,5 +1,15 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
-   
+  
+zhixu@gmail.com
+Z. Liu
+  
+  
+proxy-ma...@gentoo.org
+Proxy Maintainers
+  
+  
+clan/runit
+  
 

diff --git a/sys-process/runit/runit-2.1.2-r4.ebuild 
b/sys-process/runit/runit-2.1.2-r5.ebuild
similarity index 92%
rename from sys-process/runit/runit-2.1.2-r4.ebuild
rename to sys-process/runit/runit-2.1.2-r5.ebuild
index 2254657370c9..c64c0578d5e9 100644
--- a/sys-process/runit/runit-2.1.2-r4.ebuild
+++ b/sys-process/runit/runit-2.1.2-r5.ebuild
@@ -7,7 +7,11 @@ inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="A UNIX init scheme with service supervision"
 HOMEPAGE="https://smarden.org/runit/";
-SRC_URI="https://smarden.org/runit/${P}.tar.gz";
+PATCH_VER=20240905
+SRC_URI="
+   https://smarden.org/runit/${P}.tar.gz
+   
https://github.com/clan/runit/releases/download/${PV}-r5/${P}-patches-${PATCH_VER}.tar.xz
+"
 S=${WORKDIR}/admin/${P}/src
 
 LICENSE="BSD"
@@ -17,8 +21,18 @@ IUSE="static"
 
 RDEPEND="sys-apps/openrc"
 
+src_unpack() {
+   unpack ${P}.tar.gz
+   unpack ${P}-patches-${PATCH_VER}.tar.xz
+}
+
 src_prepare() {
default
+   cd "${S}"/..
+   eapply -p3 "${WORKDIR}"/patches
+
+   cd "${S}"
+
 
# We either build everything or nothing static
sed -i -e 's:-static: :' Makefile || die



[gentoo-commits] repo/gentoo:master commit in: sys-process/runit/

2024-09-05 Thread Mike Gilbert
commit: b28b765a56f848bccd25057856a9f4420123b664
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Sep  5 14:42:00 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Sep  5 14:42:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b28b765a

sys-process/runit: add || die and adjust whitespace

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

 sys-process/runit/runit-2.1.2-r5.ebuild | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/sys-process/runit/runit-2.1.2-r5.ebuild 
b/sys-process/runit/runit-2.1.2-r5.ebuild
index c64c0578d5e9..8d6056f4ffba 100644
--- a/sys-process/runit/runit-2.1.2-r5.ebuild
+++ b/sys-process/runit/runit-2.1.2-r5.ebuild
@@ -28,11 +28,10 @@ src_unpack() {
 
 src_prepare() {
default
-   cd "${S}"/..
-   eapply -p3 "${WORKDIR}"/patches
-
-   cd "${S}"
 
+   cd "${S}"/.. || die
+   eapply -p3 "${WORKDIR}"/patches
+   cd "${S}" || die
 
# We either build everything or nothing static
sed -i -e 's:-static: :' Makefile || die



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

2024-09-02 Thread Mike Gilbert
commit: e4d20ea1ff88f0502320748c263bcdd31a6b0a3e
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Sep  2 22:40:50 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Sep  2 22:44:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4d20ea1

sys-libs/efivar: fix prefix install

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

 sys-libs/efivar/{efivar-39.ebuild => efivar-39-r1.ebuild} | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys-libs/efivar/efivar-39.ebuild 
b/sys-libs/efivar/efivar-39-r1.ebuild
similarity index 94%
rename from sys-libs/efivar/efivar-39.ebuild
rename to sys-libs/efivar/efivar-39-r1.ebuild
index a88ff714f25d..f980d4096561 100644
--- a/sys-libs/efivar/efivar-39.ebuild
+++ b/sys-libs/efivar/efivar-39-r1.ebuild
@@ -42,7 +42,8 @@ src_configure() {
 
tc-ld-disable-gold
 
-   export libdir="/usr/$(get_libdir)"
+   export PREFIX="${EPREFIX}/usr"
+   export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
 
# https://bugs.gentoo.org/562004
unset LIBS



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

2024-09-02 Thread Mike Gilbert
commit: 3e4f021fa2f5b67348d97a2a44b5f1737d7ecbbe
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Sep  2 18:37:49 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Sep  2 18:37:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e4f021f

net-p2p/transmission: restore miniupnpc patch

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

 net-p2p/transmission/transmission-4.0.6-r5.ebuild | 4 
 1 file changed, 4 insertions(+)

diff --git a/net-p2p/transmission/transmission-4.0.6-r5.ebuild 
b/net-p2p/transmission/transmission-4.0.6-r5.ebuild
index 5e09d9018343..5f17ccd5c63e 100644
--- a/net-p2p/transmission/transmission-4.0.6-r5.ebuild
+++ b/net-p2p/transmission/transmission-4.0.6-r5.ebuild
@@ -67,6 +67,10 @@ RDEPEND="${COMMON_DEPEND}
${ACCT_DEPEND}
 "
 
+PATCHES=(
+   "${FILESDIR}/transmission-4.0.6-miniupnpc-2.2.8.patch"
+)
+
 src_configure() {
local mycmakeargs=(
-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}



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

2024-09-02 Thread Mike Gilbert
commit: 0a76ce32e199577d634c6a9c8bda50c21e30f7bd
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Sep  2 18:13:29 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Sep  2 18:13:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a76ce32

net-libs/gnutls: drop flag-o-matic

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

 net-libs/gnutls/gnutls-3.8.7.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/gnutls/gnutls-3.8.7.1-r1.ebuild 
b/net-libs/gnutls/gnutls-3.8.7.1-r1.ebuild
index 8dee2bec3d09..57a12bf55f89 100644
--- a/net-libs/gnutls/gnutls-3.8.7.1-r1.ebuild
+++ b/net-libs/gnutls/gnutls-3.8.7.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnutls.asc
-inherit autotools multilib-minimal verify-sig flag-o-matic
+inherit autotools multilib-minimal verify-sig
 
 DESCRIPTION="A secure communications library implementing the SSL, TLS and 
DTLS protocols"
 HOMEPAGE="https://www.gnutls.org/";



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

2024-09-02 Thread Mike Gilbert
commit: a9c3e38a8d4e551d306ce1da51c4aca161aaf85a
Author: Filip Kobierski  pm  me>
AuthorDate: Tue Aug 27 11:21:19 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Sep  2 18:07:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9c3e38a

net-libs/gnutls: improve tools USE flag description

Modeled after networkmanager's tools

Closes: https://bugs.gentoo.org/600738
Signed-off-by: Filip Kobierski  pm.me>
Signed-off-by: Mike Gilbert  gentoo.org>

 net-libs/gnutls/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/gnutls/metadata.xml b/net-libs/gnutls/metadata.xml
index 85a1b4066a43..f20c36397757 100644
--- a/net-libs/gnutls/metadata.xml
+++ b/net-libs/gnutls/metadata.xml
@@ -16,7 +16,7 @@
Add support for PKCS#11 through 
app-crypt/p11-kit


-   Build extra tools
+   Build cli tools such as gnutls-cli, certtool and 
oscptool


Enable the Heartbeat Extension in TLS and DTLS



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

2024-09-02 Thread Mike Gilbert
commit: fe128bcd6e3f2b834e804a13360ed297ad60f5ab
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Sep  2 17:51:42 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Sep  2 17:53:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe128bcd

sys-fs/e2fsprogs: work around broken Makefile

Bug: https://bugs.gentoo.org/936493
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild | 4 
 1 file changed, 4 insertions(+)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
index 4853a3a74bf5..9f3aa8fd7864 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
@@ -113,6 +113,10 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
+   # Parallel make issue #936493
+   emake -C lib/et V=1 compile_et
+   emake -C lib/ext2fs V=1 ext2_err.h
+
if multilib_is_native_abi && use tools ; then
emake V=1
else



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

2024-08-30 Thread Mike Gilbert
commit: 5e6e0943939b7dae788b7e3273cfd4b98b7b0353
Author: Mike Gilbert  gentoo  org>
AuthorDate: Fri Aug 30 17:37:54 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Fri Aug 30 17:40:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e6e0943

net-misc/freerdp: add 3.8.0

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

 net-misc/freerdp/Manifest |   2 +
 net-misc/freerdp/freerdp-3.8.0.ebuild | 199 ++
 2 files changed, 201 insertions(+)

diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 5363c7cee049..0b3e2356f48d 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -6,3 +6,5 @@ DIST freerdp-3.6.3.tar.gz 10199503 BLAKE2B 
ff4c76a7f2d808db09d22b6cf79caaa1f1aff
 DIST freerdp-3.6.3.tar.gz.asc 228 BLAKE2B 
4ea04f0d662afef34d61f06d36f3bd6f872f2a7cd8095df581f489306d88a761921a0a93325bdd4c5a627a1c47c612652697b9dc3338ebe0ea952a65b0783cc7
 SHA512 
6568362c2ad1032925e7dfcd04977c56a58e661b8eacc79d6d2ad77bb9e56d3dff3f13d004d50a88827aa9ccbd2f56c1019a53e18bf35856dbec81acba1dc142
 DIST freerdp-3.7.0.tar.gz 10223833 BLAKE2B 
6d1fab8a88dd9113c6daf0d609cac006d1303f30dd9a9e4b9a8d9d78df64281c86c3e30142be82b7e696983649114f31b9cbd35773e712331bf522a2928cdde3
 SHA512 
6af8962549bd259f1fb4ae15e60562602cdcc8a4492f35c93e2da45c315abdcf7c78f0525a5821a829f811fb759730a6980ee177d3864989701873ad70189f74
 DIST freerdp-3.7.0.tar.gz.asc 228 BLAKE2B 
87cd5f8cb8286eaf108098ee8baa7ed7c6e05b0d3e78050d16f96f6327c40f03bbe96b6aac719a8203240b4eb02e175daad57189dc7e0a0e022b02372aa69d6f
 SHA512 
b62cf129db113ae727669f26de8dc971e33b78cf0b83e5f84a518c30366ff74c14675701870e9e09aedaad23000b3316a04a76cb7df475f3e4d5465f206b0e30
+DIST freerdp-3.8.0.tar.gz 10235403 BLAKE2B 
96a788e6f394d21cc57c8dc729d1fe5f80b7dbd0119342358a59b63dda7e9e687f17aa0b6c812c33f4a3f3dd34c067e1206418083d2b61b3e5d20b75e6846093
 SHA512 
ebe724930ea56890a83514496bd11fcc6f77f170a3bb3de4b62506fa2e8bc919cf8593d7e93a9a421fdea22976ddc3f3dbd921fd9e0fb3c7dbd288e387a1c238
+DIST freerdp-3.8.0.tar.gz.asc 228 BLAKE2B 
442b48027cbb7fe8cee9a2599772d317f003635939c3f8201097fefd0e2d2f5ec8776a18db23cac47f153c02864b976893f2fccb9050c638f0b94d7b98b5bd40
 SHA512 
d6be8aa062544b6cb05b39b4036da5403786d02db1ccf11363bfb9ef71c64703051305dfd3de46ac8ec986a664c849521f22d3061112c851a7e40038b827a3e6

diff --git a/net-misc/freerdp/freerdp-3.8.0.ebuild 
b/net-misc/freerdp/freerdp-3.8.0.ebuild
new file mode 100644
index ..5907f28cdfca
--- /dev/null
+++ b/net-misc/freerdp/freerdp-3.8.0.ebuild
@@ -0,0 +1,199 @@
+# Copyright 2011-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git";
+   case ${PV} in
+   2.*) EGIT_BRANCH="stable-2.0";;
+   esac
+else
+   inherit verify-sig
+   MY_P=${P/_/-}
+   S="${WORKDIR}/${MY_P}"
+   SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz
+   verify-sig? ( 
https://pub.freerdp.com/releases/${MY_P}.tar.gz.asc )"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+   BDEPEND="verify-sig? ( sec-keys/openpgp-keys-akallabeth )"
+   VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/akallabeth.asc"
+fi
+
+DESCRIPTION="Free implementation of the Remote Desktop Protocol"
+HOMEPAGE="https://www.freerdp.com/";
+
+LICENSE="Apache-2.0"
+SLOT="3"
+IUSE="aad alsa cpu_flags_arm_neon +client cups debug +ffmpeg +fuse gstreamer 
+icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb 
valgrind wayland X xinerama xv"
+RESTRICT="!test? ( test )"
+
+BDEPEND+="
+   virtual/pkgconfig
+   app-text/docbook-xsl-stylesheets
+   dev-libs/libxslt
+"
+COMMON_DEPEND="
+   dev-libs/openssl:0=
+   sys-libs/zlib:0
+   aad? ( dev-libs/cJSON )
+   alsa? ( media-libs/alsa-lib )
+   cups? ( net-print/cups )
+   usb? (
+   virtual/libudev:0=
+   sys-apps/util-linux:0=
+   dev-libs/dbus-glib:0=
+   virtual/libusb:1=
+   )
+   X? (
+   x11-libs/libXcursor
+   x11-libs/libXext
+   x11-libs/libXi
+   x11-libs/libXrender
+   xinerama? ( x11-libs/libXinerama )
+   xv? ( x11-libs/libXv )
+   )
+   ffmpeg? ( media-video/ffmpeg:0= )
+   !ffmpeg? (
+   x11-libs/cairo:0=
+   )
+   fuse? ( sys-fs/fuse:3 )
+   gstreamer? (
+   media-libs/gstreamer:1.0
+   media-libs/gst-plugins-base:1.0
+   X? ( x11-libs/libXrandr )
+   )
+   icu? ( dev-libs/icu:0= )
+   jpeg? ( media-libs/libjpeg-turbo:0= )
+   kerberos? (

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

2024-08-30 Thread Mike Gilbert
commit: 0111035412002ce7a102a1f3d93e1f411c16f90c
Author: Mike Gilbert  gentoo  org>
AuthorDate: Fri Aug 30 17:35:13 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Fri Aug 30 17:40:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01110354

net-misc/freerdp: rework testing

Enabling the BUILD_TESTING option causes all symbols to be exported,
which is not desirable for installed libraries.

Create a separate test build to facilitate running tests without
installing the wonky test libraries.

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

 net-misc/freerdp/freerdp-.ebuild | 21 +++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/net-misc/freerdp/freerdp-.ebuild 
b/net-misc/freerdp/freerdp-.ebuild
index 51aab209a2db..5907f28cdfca 100644
--- a/net-misc/freerdp/freerdp-.ebuild
+++ b/net-misc/freerdp/freerdp-.ebuild
@@ -120,17 +120,27 @@ option_client() {
fi
 }
 
+run_for_testing() {
+   if use test; then
+   local BUILD_DIR="${WORKDIR}/${P}_testing"
+   "$@"
+   fi
+}
+
 src_configure() {
# bug #881695
filter-lto
+   freerdp_configure -DBUILD_TESTING=OFF
+   run_for_testing freerdp_configure -DBUILD_TESTING=ON
+}
 
+freerdp_configure() {
local mycmakeargs=(
-Wno-dev
 
# https://bugs.gentoo.org/927037
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF
 
-   -DBUILD_TESTING=$(option test)
-DCHANNEL_URBDRC=$(option usb)
-DWITH_AAD=$(option aad)
-DWITH_ALSA=$(option alsa)
@@ -166,14 +176,21 @@ src_configure() {
-DWITH_WAYLAND=$(option_client wayland)
-DWITH_WEBVIEW=OFF
-DWITH_WINPR_TOOLS=$(option server)
+
+   "$@"
)
cmake_src_configure
 }
 
+src_compile() {
+   cmake_src_compile
+   run_for_testing cmake_src_compile
+}
+
 src_test() {
local myctestargs=( -E TestBacktrace )
has network-sandbox ${FEATURES} && myctestargs+=( -E TestConnect )
-   cmake_src_test
+   run_for_testing cmake_src_test
 }
 
 src_install() {



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

2024-08-29 Thread Mike Gilbert
commit: c5552fd1faac0ba4997cc0ed08fcc4d4930800fd
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Aug 29 16:10:52 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Aug 29 16:12:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5552fd1

media-libs/openexr: add [zlib(+)] to libdeflate

Bug: https://bugs.gentoo.org/937883
Signed-off-by: Mike Gilbert  gentoo.org>

 .../openexr/{openexr-3.2.3-r1.ebuild => openexr-3.2.3-r2.ebuild}  | 4 ++--
 .../openexr/{openexr-3.2.4-r1.ebuild => openexr-3.2.4-r2.ebuild}  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-libs/openexr/openexr-3.2.3-r1.ebuild 
b/media-libs/openexr/openexr-3.2.3-r2.ebuild
similarity index 98%
rename from media-libs/openexr/openexr-3.2.3-r1.ebuild
rename to media-libs/openexr/openexr-3.2.3-r2.ebuild
index 7b883cfee438..574d441feb13 100644
--- a/media-libs/openexr/openexr-3.2.3-r1.ebuild
+++ b/media-libs/openexr/openexr-3.2.3-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
test? (
utils? (

https://github.com/AcademySoftwareFoundation/openexr-images/archive/refs/tags/v1.0.tar.gz
- -> openexr-images-1.0.tar.gz
+   -> openexr-images-1.0.tar.gz
)
)
 "
@@ -29,7 +29,7 @@ REQUIRED_USE="doc? ( utils )"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-   app-arch/libdeflate:=
+   app-arch/libdeflate:=[zlib(+)]
>=dev-libs/imath-3.1.6:=
 "
 DEPEND="${RDEPEND}"

diff --git a/media-libs/openexr/openexr-3.2.4-r1.ebuild 
b/media-libs/openexr/openexr-3.2.4-r2.ebuild
similarity index 98%
rename from media-libs/openexr/openexr-3.2.4-r1.ebuild
rename to media-libs/openexr/openexr-3.2.4-r2.ebuild
index 1207ed892873..8c58eef5d830 100644
--- a/media-libs/openexr/openexr-3.2.4-r1.ebuild
+++ b/media-libs/openexr/openexr-3.2.4-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
test? (
utils? (

https://github.com/AcademySoftwareFoundation/openexr-images/archive/refs/tags/v1.0.tar.gz
- -> openexr-images-1.0.tar.gz
+   -> openexr-images-1.0.tar.gz
)
)
 "
@@ -29,7 +29,7 @@ REQUIRED_USE="doc? ( utils )"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-   app-arch/libdeflate:=
+   app-arch/libdeflate:=[zlib(+)]
>=dev-libs/imath-3.1.6:=
 "
 DEPEND="${RDEPEND}"



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

2024-08-29 Thread Mike Gilbert
commit: 24e98b689088ee78a49f84010fcf970f11f2
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Aug 29 16:06:44 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Aug 29 16:12:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24e98b68

dev-util/maxcso: add [zlib(+)] to libdeflate

Bug: https://bugs.gentoo.org/937883
Signed-off-by: Mike Gilbert  gentoo.org>

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

diff --git a/dev-util/maxcso/maxcso-.ebuild 
b/dev-util/maxcso/maxcso-.ebuild
index a4889541abed..02c63f9d36a9 100644
--- a/dev-util/maxcso/maxcso-.ebuild
+++ b/dev-util/maxcso/maxcso-.ebuild
@@ -19,7 +19,7 @@ LICENSE="ISC LGPL-2.1+ Apache-2.0"
 SLOT="0"
 
 DEPEND="
-   app-arch/libdeflate
+   app-arch/libdeflate[zlib(+)]
app-arch/lz4:=
dev-libs/libuv:=
sys-libs/zlib



[gentoo-commits] repo/gentoo:master commit in: app-shells/zsh/

2024-08-27 Thread Mike Gilbert
commit: 9777826e1a168dee5c4ec9491ec1c62193586234
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Aug 28 01:17:51 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Wed Aug 28 01:17:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9777826e

app-shells/zsh: whitespace

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

 app-shells/zsh/zsh-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-shells/zsh/zsh-.ebuild b/app-shells/zsh/zsh-.ebuild
index bdc0d506d88e..0f3a08bbe6d2 100644
--- a/app-shells/zsh/zsh-.ebuild
+++ b/app-shells/zsh/zsh-.ebuild
@@ -14,7 +14,6 @@ else
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 
-
 DESCRIPTION="UNIX Shell similar to the Korn shell"
 HOMEPAGE="https://www.zsh.org/";
 



[gentoo-commits] repo/gentoo:master commit in: app-shells/zsh/

2024-08-27 Thread Mike Gilbert
commit: 872fae1e9dd278492f08bae1ceb1f5f09384fed2
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Aug 28 01:16:40 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Wed Aug 28 01:16:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=872fae1e

app-shells/zsh: fix doc build

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

 app-shells/zsh/zsh-.ebuild | 19 +++
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/app-shells/zsh/zsh-.ebuild b/app-shells/zsh/zsh-.ebuild
index 4511850c60c0..bdc0d506d88e 100644
--- a/app-shells/zsh/zsh-.ebuild
+++ b/app-shells/zsh/zsh-.ebuild
@@ -47,11 +47,7 @@ BDEPEND="
 if [[ ${PV} == * ]] ; then
BDEPEND+="
app-text/yodl
-   doc? (
-   sys-apps/texinfo
-   app-text/texi2html
-   virtual/latex-base
-   )
+   doc? ( virtual/texi2dvi )
"
 fi
 
@@ -166,7 +162,10 @@ src_test() {
 }
 
 src_install() {
-   emake DESTDIR="${D}" install $(usex doc "install.info" "")
+   emake DESTDIR="${D}" install
+   if use doc; then
+   emake -C Doc DESTDIR="${D}" install.html install.html
+   fi
 
insinto /etc/zsh
export PREFIX_QUOTE_CHAR='"' PREFIX_EXTRA_REGEX="/EUID/s,0,${EUID},"
@@ -199,12 +198,8 @@ src_install() {
 
dodoc ChangeLog* META-FAQ NEWS README config.modules
 
-   if use doc ; then
-   pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
-   dodoc Doc/zsh.{dvi,pdf}
-   docinto html
-   dodoc Doc/*.html
-   popd >/dev/null
+   if use doc; then
+   dodoc Doc/intro.{a4,us}.pdf Doc/zsh_{a4,us}.{dvi,pdf}
fi
 
docinto StartupFiles



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

2024-08-27 Thread Mike Gilbert
commit: 150b868c148fd709435bb05e9ccd4dbbe81adf61
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Aug 27 14:53:40 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Tue Aug 27 14:53:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=150b868c

sys-fs/xfsprogs: delete libtool archive

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

 sys-fs/xfsprogs/{xfsprogs-6.10.0.ebuild => xfsprogs-6.10.0-r1.ebuild} | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys-fs/xfsprogs/xfsprogs-6.10.0.ebuild 
b/sys-fs/xfsprogs/xfsprogs-6.10.0-r1.ebuild
similarity index 98%
rename from sys-fs/xfsprogs/xfsprogs-6.10.0.ebuild
rename to sys-fs/xfsprogs/xfsprogs-6.10.0-r1.ebuild
index 22a5e0675764..db059509605d 100644
--- a/sys-fs/xfsprogs/xfsprogs-6.10.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-6.10.0-r1.ebuild
@@ -97,6 +97,8 @@ src_install() {
if ! use static-libs; then
rm "${ED}/usr/$(get_libdir)/libhandle.a" || die
fi
+
+   find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postrm() {



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

2024-08-27 Thread Mike Gilbert
commit: de0b212b02b288a8cff2dd76698b9c72bcbb656a
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Aug 27 14:45:51 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Tue Aug 27 14:45:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de0b212b

sys-fs/xfsprogs: use EPREFIX in localstatedir

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

 sys-fs/xfsprogs/xfsprogs-6.10.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/xfsprogs/xfsprogs-6.10.0.ebuild 
b/sys-fs/xfsprogs/xfsprogs-6.10.0.ebuild
index 8cd182482540..22a5e0675764 100644
--- a/sys-fs/xfsprogs/xfsprogs-6.10.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-6.10.0.ebuild
@@ -69,7 +69,7 @@ src_configure() {
# Doesn't do anything beyond adding -flto (bug #930947).
--disable-lto
# The default value causes double 'lib'
-   --localstatedir=/var
+   --localstatedir="${EPREFIX}/var"
--with-crond-dir="${EPREFIX}/etc/cron.d"
--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
--with-udev-rule-dir="$(get_udevdir)/rules.d"



[gentoo-commits] repo/gentoo:master commit in: app-crypt/heimdal/

2024-08-26 Thread Mike Gilbert
commit: 226f5810815fd94678ee370f03e33f9003026aa4
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Aug 26 19:05:24 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Aug 26 19:05:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=226f5810

app-crypt/heimdal: drop 7.8.0-r1, 7.8.0-r2

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

 app-crypt/heimdal/heimdal-7.8.0-r1.ebuild | 190 -
 app-crypt/heimdal/heimdal-7.8.0-r2.ebuild | 191 --
 2 files changed, 381 deletions(-)

diff --git a/app-crypt/heimdal/heimdal-7.8.0-r1.ebuild 
b/app-crypt/heimdal/heimdal-7.8.0-r1.ebuild
deleted file mode 100644
index 2db7d36fe6fe..
--- a/app-crypt/heimdal/heimdal-7.8.0-r1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools db-use multilib-minimal python-any-r1 virtualx flag-o-matic
-
-MY_P="${P}"
-DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="https://www.heimdal.software/";
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz";
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 
sparc x86"
-IUSE="afs +berkdb caps gdbm hdb-ldap +lmdb otp selinux ssl static-libs test X"
-RESTRICT="!test? ( test )"
-
-# 717740
-REQUIRED_USE="otp? ( berkdb )"
-
-CDEPEND="
-   virtual/libcrypt:=[${MULTILIB_USEDEP}]
-   ssl? (
-   >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
-   )
-   berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] )
-   gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
-   lmdb? ( dev-db/lmdb:= )
-   caps? ( sys-libs/libcap-ng )
-   >=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-   >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
-   sys-libs/ncurses:0=
-   >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}]
-   afs? ( net-fs/openafs )
-   hdb-ldap? ( >=net-nds/openldap-2.3.0:= )
-   X? (
-   x11-libs/libX11
-   x11-libs/libXau
-   x11-libs/libXt
-   )
-   !!app-crypt/mit-krb5
-   !!app-crypt/mit-krb5-appl"
-
-DEPEND="${CDEPEND}
-   ${PYTHON_DEPS}
-   dev-perl/JSON
-   virtual/pkgconfig
-   sys-apps/texinfo
-   >=dev-build/autoconf-2.62
-   test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-
-RDEPEND="${CDEPEND}
-   selinux? ( sec-policy/selinux-kerberos )"
-
-MULTILIB_WRAPPED_HEADERS=(
-   /usr/include/krb5-types.h
-   /usr/include/cms_asn1.h
-   /usr/include/digest_asn1.h
-   /usr/include/hdb_asn1.h
-   /usr/include/krb5_asn1.h
-   /usr/include/pkcs12_asn1.h
-   /usr/include/pkinit_asn1.h
-   /usr/include/rfc2459_asn1.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-   /usr/bin/krb5-config
-)
-
-PATCHES=(
-   "${FILESDIR}/heimdal_disable-check-iprop.patch"
-   "${FILESDIR}/heimdal_tinfo.patch"
-   "${FILESDIR}/heimdal_build-headers-before-use.patch"
-   "${FILESDIR}/heimdal_fix-db60.patch"
-   "${FILESDIR}/heimdal-7.8.0-CVE-2022-45142.patch"
-)
-
-src_prepare() {
-   default
-   eautoreconf
-}
-
-src_configure() {
-   # QA
-   append-flags -fno-strict-aliasing
-
-   multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-   local myeconfargs=(
-   --enable-kcm
-   --disable-osfc2
-   --enable-shared
-   --with-libintl="${EPREFIX}"/usr
-   --with-readline="${EPREFIX}"/usr
-   --with-sqlite3="${EPREFIX}"/usr
-   --libexecdir="${EPREFIX}"/usr/sbin
-   --enable-pthread-support
-   --enable-kx509
-   --enable-pk-init
-   --with-ipv6
-   $(use_enable afs afs-support)
-   $(use_enable gdbm ndbm-db)
-   $(use_enable lmdb mdb-db)
-   $(use_enable otp)
-   $(use_enable static-libs static)
-   $(multilib_native_use_with caps capng)
-   $(multilib_native_use_with hdb-ldap openldap "${EPREFIX}"/usr)
-   $(use_with ssl openssl "${EPREFIX}"/usr)
-   $(multilib_native_use_with X x)
-   )
-   if use berkdb; then
-   myeconfargs+=(
-   --with-berkeley-db
-   --with-berkeley-db-include="$(db_includedir)"
-   )
-   else
-   myeconfargs+=(
-   --without-berkeley-db
-   )
-   fi
-
-   CONFIG_SHELL=&

[gentoo-commits] repo/gentoo:master commit in: sys-process/runit/

2024-08-22 Thread Mike Gilbert
commit: 9646b294a24fa9b7a6a89ba54e9ece4947635046
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Aug 22 14:33:13 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Aug 22 14:33:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9646b294

sys-process/runit: restore 2.1.2-r1

Allow users to downgrade to avoid reboot regression.

Bug: https://bugs.gentoo.org/938262
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-process/runit/runit-2.1.2-r1.ebuild | 138 
 1 file changed, 138 insertions(+)

diff --git a/sys-process/runit/runit-2.1.2-r1.ebuild 
b/sys-process/runit/runit-2.1.2-r1.ebuild
new file mode 100644
index ..2250a85f21de
--- /dev/null
+++ b/sys-process/runit/runit-2.1.2-r1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="A UNIX init scheme with service supervision"
+HOMEPAGE="http://smarden.org/runit/";
+SRC_URI="http://smarden.org/runit/${P}.tar.gz";
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc 
x86"
+IUSE="static"
+
+RDEPEND="sys-apps/openrc"
+
+S=${WORKDIR}/admin/${P}/src
+
+src_prepare() {
+   default
+
+   # we either build everything or nothing static
+   sed -i -e 's:-static: :' Makefile
+
+   # see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=726008
+   [[ ${COMPILER} == "diet" ]] &&
+   use ppc &&
+   filter-flags "-mpowerpc-gpopt"
+}
+
+src_configure() {
+   use static && append-ldflags -static
+
+   echo "$(tc-getCC) ${CFLAGS}"  > conf-cc
+   echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+}
+
+src_install() {
+   into /
+   dobin $(<../package/commands)
+   dodir /sbin
+   mv "${ED}"/bin/{runit-init,runit,utmpset} "${ED}"/sbin/ || die "dosbin"
+   dosym ../etc/runit/2 /sbin/runsvdir-start
+
+   DOCS=( ../package/{CHANGES,README,THANKS,TODO} )
+   HTML_DOCS=( ../doc/*.html )
+   einstalldocs
+   doman ../man/*.[18]
+
+   dodir /etc/runit
+   exeinto /etc/runit
+   doexe "${FILESDIR}"/ctrlaltdel
+   newexe "${FILESDIR}"/1-${PV} 1
+   newexe "${FILESDIR}"/2-${PV} 2
+   newexe "${FILESDIR}"/3-${PV} 3
+
+   dodir /etc/sv
+   for tty in tty1 tty2 tty3 tty4 tty5 tty6; do
+   exeinto /etc/sv/getty-$tty/
+   newexe "${FILESDIR}"/finish.getty finish
+   newexe "${FILESDIR}"/run.getty-${PV} run
+   for script in finish run; do
+   sed -i -e "s:TTY:${tty}:g" 
"${ED}"/etc/sv/getty-$tty/$script
+   done
+   done
+
+   # make sv command work
+   newenvd - 20runit <<- EOF
+   #/etc/env.d/20runit
+   SVDIR="/etc/service/"
+   EOF
+}
+
+default_config() {
+   local sv="${EROOT}"etc/sv
+   local service="${EROOT}"etc/service
+   mkdir -p "${service}" || die
+   for x in tty1 tty2 tty3 tty4 tty5 tty6; do
+   ln -sf "${sv}"/getty-$x "${service}"/getty-$x || die
+   done
+   einfo "The links to services runit will supervise are installed"
+   einfo "in $service."
+   einfo "If you need multiple runlevels, please see the documentation"
+   einfo "for how to set them up."
+   einfo
+}
+
+migrate_from_211() {
+   # Create /etc/service and /var/service if requested
+   if [ -e "${T}"/make_var_service ]; then
+   ln -sf "${EROOT}"etc/runit/runsvdir/current 
"${EROOT}"etc/service || die
+   ln -sf "${EROOT}"etc/runit/runsvdir/current 
"${EROOT}"var/service || die
+   fi
+   if [ -d "${T}"/runsvdir ]; then
+   cp -a "${T}"/runsvdir "${EROOT}"etc/runit || die
+   fi
+   return 0
+}
+
+pkg_preinst() {
+   if  has_version '

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

2024-08-22 Thread Mike Gilbert
commit: d3f9d31c110116765a124d8735c113bbab0b0208
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Aug 22 14:28:22 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Aug 22 14:28:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3f9d31c

profiles: add treeclean bug to runit mask

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

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

diff --git a/profiles/package.mask b/profiles/package.mask
index 23e37a95848a..7f354d921694 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -38,6 +38,7 @@
 # Removal on 2024-09-20
 # Bug #575478, #611846, #814551, #892653, #904989, #934410, #935656,
 # #938262
+# Treeclean request: #938282
 sys-process/runit
 
 # Arsen Arsenović  (2024-08-02)



[gentoo-commits] repo/gentoo:master commit in: sys-process/runit/

2024-08-22 Thread Mike Gilbert
commit: c3e38688c65897ac005a120104e61a84979639b9
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Aug 22 14:06:04 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Aug 22 14:06:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3e38688

sys-process/runit: drop to maintainer-needed

Bug: https://bugs.gentoo.org/938282
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-process/runit/metadata.xml | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/sys-process/runit/metadata.xml b/sys-process/runit/metadata.xml
index 70953e9fd813..115e9d64a669 100644
--- a/sys-process/runit/metadata.xml
+++ b/sys-process/runit/metadata.xml
@@ -1,11 +1,5 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
-
-   willi...@gentoo.org
-
-
-   base-sys...@gentoo.org
-   Gentoo Base System
-
+   
 



[gentoo-commits] repo/gentoo:master commit in: app-admin/socklog/

2024-08-21 Thread Mike Gilbert
commit: 553738df9359b59c2142a4bfa2bf9d6d7dc8f079
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Aug 21 19:03:13 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Wed Aug 21 19:03:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=553738df

app-admin/socklog: drop runit dependency

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

 app-admin/socklog/{socklog-2.1.0.ebuild => socklog-2.1.0-r1.ebuild} | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app-admin/socklog/socklog-2.1.0.ebuild 
b/app-admin/socklog/socklog-2.1.0-r1.ebuild
similarity index 92%
rename from app-admin/socklog/socklog-2.1.0.ebuild
rename to app-admin/socklog/socklog-2.1.0-r1.ebuild
index 367d62460e7e..06c852d19bc3 100644
--- a/app-admin/socklog/socklog-2.1.0.ebuild
+++ b/app-admin/socklog/socklog-2.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,8 +15,6 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="static"
 
-RDEPEND=">=sys-process/runit-1.4.0"
-
 PATCHES=(
"${FILESDIR}"/${PN}-2.1.0-headers.patch
"${FILESDIR}"/${PN}-2.1.0-respect-ar-ranlib.patch



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

2024-08-20 Thread Mike Gilbert
commit: 1f2079f01b0276fe5ac6f8d2270f3a2bad32de61
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Aug 20 20:16:58 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Tue Aug 20 20:16:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f2079f0

eclass: remove marecki from maintainers

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

 eclass/lua-single.eclass | 3 +--
 eclass/lua-utils.eclass  | 1 -
 eclass/lua.eclass| 3 +--
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/eclass/lua-single.eclass b/eclass/lua-single.eclass
index 8432df0583bb..ad7075955153 100644
--- a/eclass/lua-single.eclass
+++ b/eclass/lua-single.eclass
@@ -1,10 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: lua-single.eclass
 # @MAINTAINER:
 # William Hubbs 
-# Marek Szuba 
 # @AUTHOR:
 # Marek Szuba 
 # Based on python-single-r1.eclass by Michał Górny  et al.

diff --git a/eclass/lua-utils.eclass b/eclass/lua-utils.eclass
index c63ec369c1c2..7272f80d0370 100644
--- a/eclass/lua-utils.eclass
+++ b/eclass/lua-utils.eclass
@@ -4,7 +4,6 @@
 # @ECLASS: lua-utils.eclass
 # @MAINTAINER:
 # William Hubbs 
-# Marek Szuba 
 # @AUTHOR:
 # Marek Szuba 
 # Based on python-utils-r1.eclass by Michał Górny  et al.

diff --git a/eclass/lua.eclass b/eclass/lua.eclass
index bb2e41ef1061..380ec274167c 100644
--- a/eclass/lua.eclass
+++ b/eclass/lua.eclass
@@ -1,10 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: lua.eclass
 # @MAINTAINER:
 # William Hubbs 
-# Marek Szuba 
 # @AUTHOR:
 # Marek Szuba 
 # Based on python-r1.eclass by Michał Górny  et al.



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

2024-08-20 Thread Mike Gilbert
commit: e723fd6d0e2fe4cf134a6c6e064d3faaa77c8339
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Aug 18 18:19:23 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Tue Aug 20 20:06:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e723fd6d

lua-utils.eclass: use BROOT or ESYSROOT where appropriate

The LUA variable points to a lua binary that is likely to be executed by
the build system. Use BROOT for this.

Use ESYSROOT for the pkg-config symlink, since this is likely used for
linking a library.

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

 eclass/lua-utils.eclass | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/eclass/lua-utils.eclass b/eclass/lua-utils.eclass
index 0ff36734dc8f..c63ec369c1c2 100644
--- a/eclass/lua-utils.eclass
+++ b/eclass/lua-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: lua-utils.eclass
@@ -144,18 +144,18 @@ _lua_wrapper_setup() {
_lua_export "${impl}" ELUA LUA
 
# Lua interpreter
-   ln -s "${EPREFIX}"/usr/bin/${ELUA} "${workdir}"/bin/lua || die
+   ln -s "${LUA}" "${workdir}"/bin/lua || die
 
# Lua compiler, or a stub for it in case of luajit
if [[ ${ELUA} == luajit ]]; then
# Just in case
-   ln -s "${EPREFIX}"/bin/true "${workdir}"/bin/luac || die
+   ln -s "${BROOT}"/bin/true "${workdir}"/bin/luac || die
else
-   ln -s "${EPREFIX}"/usr/bin/${ELUA/a/ac} 
"${workdir}"/bin/luac || die
+   ln -s "${BROOT}"/usr/bin/${ELUA/a/ac} 
"${workdir}"/bin/luac || die
fi
 
# pkg-config
-   ln -s "${EPREFIX}"/usr/$(get_libdir)/pkgconfig/${ELUA}.pc \
+   ln -s "${ESYSROOT}"/usr/$(get_libdir)/pkgconfig/${ELUA}.pc \
"${workdir}"/pkgconfig/lua.pc || die
fi
 
@@ -264,7 +264,7 @@ _lua_export() {
debug-print "${FUNCNAME}: ELUA = ${ELUA}"
;;
LUA)
-   export LUA="${EPREFIX}"/usr/bin/${impl}
+   export LUA="${BROOT}"/usr/bin/${impl}
debug-print "${FUNCNAME}: LUA = ${LUA}"
;;
LUA_CFLAGS)



[gentoo-commits] repo/gentoo:master commit in: app-antivirus/clamav/

2024-08-18 Thread Mike Gilbert
commit: 4c31481f56895fa029b05943a84c26cd92162f13
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Aug 18 18:05:47 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sun Aug 18 18:05:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c31481f

Revert "app-antivirus/clamav: add 1.4.0"

The Manifest is missing several entries.

Reverts: 106b99de2fc267bde74c2e12b752641a8b67a8ce
Signed-off-by: Mike Gilbert  gentoo.org>

 app-antivirus/clamav/clamav-1.4.0.ebuild | 414 ---
 1 file changed, 414 deletions(-)

diff --git a/app-antivirus/clamav/clamav-1.4.0.ebuild 
b/app-antivirus/clamav/clamav-1.4.0.ebuild
deleted file mode 100644
index 83d6af40f1e5..
--- a/app-antivirus/clamav/clamav-1.4.0.ebuild
+++ /dev/null
@@ -1,414 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-# Upstream are working on updating clamav's LLVM bytecode interpreter to work
-# with later versions of LLVM, but it's not ready yet. See:
-# https://github.com/Cisco-Talos/clamav/issues/581
-# This does not impact the ability of the package to build with llvm/clang 
otherwise.
-LLVM_MAX_SLOT=13
-PYTHON_COMPAT=( python3_{11..13} )
-
-# Autogenerated by pycargoebuild 0.13.2
-CRATES="
-   adler32@1.2.0
-   adler@1.0.2
-   aho-corasick@1.1.3
-   android-tzdata@0.1.1
-   android_system_properties@0.1.5
-   autocfg@1.3.0
-   base64@0.21.7
-   bindgen@0.65.1
-   bit_field@0.10.2
-   bitflags@1.3.2
-   bitflags@2.5.0
-   block-buffer@0.10.4
-   bumpalo@3.16.0
-   bytemuck@1.15.0
-   byteorder@1.5.0
-   bytes@1.6.0
-   bzip2-rs@0.1.2
-   cbindgen@0.25.0
-   cc@1.0.97
-   cexpr@0.6.0
-   cfg-if@1.0.0
-   chrono@0.4.38
-   clang-sys@1.7.0
-   color_quant@1.1.0
-   core-foundation-sys@0.8.6
-   cpufeatures@0.2.12
-   crc32fast@1.4.0
-   crossbeam-deque@0.8.5
-   crossbeam-epoch@0.9.18
-   crossbeam-utils@0.8.19
-   crunchy@0.2.2
-   crypto-common@0.1.6
-   delharc@0.6.1
-   digest@0.10.7
-   either@1.11.0
-   encoding_rs@0.8.34
-   enum-primitive-derive@0.2.2
-   errno@0.3.8
-   exr@1.72.0
-   fastrand@2.1.0
-   fdeflate@0.3.4
-   flate2@1.0.30
-   flume@0.11.0
-   generic-array@0.14.7
-   gif@0.13.1
-   glob@0.3.1
-   half@2.4.1
-   hashbrown@0.12.3
-   heck@0.4.1
-   hex-literal@0.4.1
-   hex@0.4.3
-   home@0.5.9
-   iana-time-zone-haiku@0.1.2
-   iana-time-zone@0.1.60
-   image@0.24.9
-   indexmap@1.9.3
-   inflate@0.4.5
-   itertools@0.10.5
-   itoa@1.0.11
-   jpeg-decoder@0.3.1
-   js-sys@0.3.69
-   lazy_static@1.4.0
-   lazycell@1.3.0
-   lebe@0.5.2
-   libc@0.2.155
-   libloading@0.8.3
-   linux-raw-sys@0.4.13
-   lock_api@0.4.12
-   log@0.4.21
-   memchr@2.7.2
-   minimal-lexical@0.2.1
-   miniz_oxide@0.7.2
-   nom@7.1.3
-   num-complex@0.4.5
-   num-integer@0.1.46
-   num-traits@0.2.19
-   once_cell@1.19.0
-   paste@1.0.14
-   peeking_take_while@0.1.2
-   png@0.17.13
-   prettyplease@0.2.19
-   primal-check@0.3.3
-   proc-macro2@1.0.81
-   qoi@0.4.1
-   quote@1.0.36
-   rayon-core@1.12.1
-   rayon@1.10.0
-   regex-automata@0.4.6
-   regex-syntax@0.8.3
-   regex@1.10.4
-   rustc-hash@1.1.0
-   rustdct@0.7.1
-   rustfft@6.2.0
-   rustix@0.38.34
-   ryu@1.0.17
-   scopeguard@1.2.0
-   serde@1.0.200
-   serde_derive@1.0.200
-   serde_json@1.0.116
-   sha1@0.10.6
-   sha2@0.10.8
-   shlex@1.3.0
-   simd-adler32@0.3.7
-   smallvec@1.13.2
-   spin@0.9.8
-   strength_reduce@0.2.4
-   syn@1.0.109
-   syn@2.0.60
-   tempfile@3.10.1
-   thiserror-impl@1.0.59
-   thiserror@1.0.59
-   tiff@0.9.1
-   tinyvec@1.6.0
-   toml@0.5.

[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

2024-08-17 Thread Mike Gilbert
commit: c52b27ef4b39a59972b29e3e97cb584c70089583
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Aug 17 22:15:12 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sat Aug 17 22:15:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c52b27ef

app-arch/7zip: depend on app-arch/xz-utils[extra-filters(+)]

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

 app-arch/7zip/7zip-24.07.ebuild | 1 +
 app-arch/7zip/7zip-24.08.ebuild | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app-arch/7zip/7zip-24.07.ebuild b/app-arch/7zip/7zip-24.07.ebuild
index 8a1c6685947e..863cdc56fe57 100644
--- a/app-arch/7zip/7zip-24.07.ebuild
+++ b/app-arch/7zip/7zip-24.07.ebuild
@@ -26,6 +26,7 @@ HTML_DOCS=( MANUAL )
 
 DEPEND="${RDEPEND}"
 BDEPEND="
+   app-arch/xz-utils[extra-filters(+)]
uasm? ( dev-lang/uasm )
jwasm? ( dev-lang/jwasm )
 "

diff --git a/app-arch/7zip/7zip-24.08.ebuild b/app-arch/7zip/7zip-24.08.ebuild
index 59e13dc0c5e5..9197a468b7e9 100644
--- a/app-arch/7zip/7zip-24.08.ebuild
+++ b/app-arch/7zip/7zip-24.08.ebuild
@@ -26,6 +26,7 @@ HTML_DOCS=( MANUAL )
 
 DEPEND="${RDEPEND}"
 BDEPEND="
+   app-arch/xz-utils[extra-filters(+)]
uasm? ( dev-lang/uasm )
jwasm? ( dev-lang/jwasm )
 "



[gentoo-commits] repo/gentoo:master commit in: app-arch/upx-bin/

2024-08-17 Thread Mike Gilbert
commit: 4ce088849d59404fdc08166638a580d2dc1d04d6
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Aug 17 21:48:09 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sat Aug 17 21:48:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ce08884

app-arch/upx-bin: fix xz-utils dep

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

 app-arch/upx-bin/upx-bin-4.1.0.ebuild | 4 ++--
 app-arch/upx-bin/upx-bin-4.2.3.ebuild | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-arch/upx-bin/upx-bin-4.1.0.ebuild 
b/app-arch/upx-bin/upx-bin-4.1.0.ebuild
index c715b092fa07..227480774a77 100644
--- a/app-arch/upx-bin/upx-bin-4.1.0.ebuild
+++ b/app-arch/upx-bin/upx-bin-4.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,7 +25,7 @@ KEYWORDS="-* amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86"
 RESTRICT="strip"
 
 RDEPEND="!app-arch/upx"
-BDEPEND="app-arch/xz-utils[extra-filters]"
+BDEPEND="app-arch/xz-utils[extra-filters(+)]"
 
 QA_PREBUILT="/opt/bin/upx"
 

diff --git a/app-arch/upx-bin/upx-bin-4.2.3.ebuild 
b/app-arch/upx-bin/upx-bin-4.2.3.ebuild
index 1014c4fbaab6..98a09baa5225 100644
--- a/app-arch/upx-bin/upx-bin-4.2.3.ebuild
+++ b/app-arch/upx-bin/upx-bin-4.2.3.ebuild
@@ -25,7 +25,7 @@ KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
 RESTRICT="strip"
 
 RDEPEND="!app-arch/upx"
-BDEPEND="app-arch/xz-utils[extra-filters]"
+BDEPEND="app-arch/xz-utils[extra-filters(+)]"
 
 QA_PREBUILT="/opt/bin/upx"
 



[gentoo-commits] repo/gentoo:master commit in: app-laptop/tuxedo-control-center-bin/

2024-08-17 Thread Mike Gilbert
commit: 4788019a15d7b65c3ba5186c1f295e0177f5fb3f
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Aug 17 21:41:25 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sat Aug 17 21:47:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4788019a

app-laptop/tuxedo-control-center-bin: fix xz-utils dep

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

 .../tuxedo-control-center-bin/tuxedo-control-center-bin-2.0.2.ebuild  | 4 ++--
 .../tuxedo-control-center-bin-2.0.8-r1.ebuild | 4 ++--
 .../tuxedo-control-center-bin/tuxedo-control-center-bin-2.1.8.ebuild  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-2.0.2.ebuild 
b/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-2.0.2.ebuild
index 90d2bcb18d1b..a7fcba609c3c 100644
--- 
a/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-2.0.2.ebuild
+++ 
b/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ RESTRICT="strip splitdebug"
 DEPEND=">=app-laptop/tuxedo-drivers-3.2.14"
 RDEPEND="${DEPEND}"
 # See bug #827729
-BDEPEND="app-arch/xz-utils[extra-filters]"
+BDEPEND="app-arch/xz-utils[extra-filters(+)]"
 
 S="${WORKDIR}"
 QA_PREBUILT="opt/tuxedo-control-center/*"

diff --git 
a/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-2.0.8-r1.ebuild
 
b/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-2.0.8-r1.ebuild
index d10fedc44161..b6911ed12b85 100644
--- 
a/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-2.0.8-r1.ebuild
+++ 
b/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-2.0.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -38,7 +38,7 @@ RDEPEND="
x11-libs/pango
 "
 # See bug #827729
-BDEPEND="app-arch/xz-utils[extra-filters]"
+BDEPEND="app-arch/xz-utils[extra-filters(+)]"
 
 S="${WORKDIR}"
 QA_PREBUILT="opt/tuxedo-control-center/*"

diff --git 
a/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-2.1.8.ebuild 
b/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-2.1.8.ebuild
index 374b1c614f5a..643a2bb37d4e 100644
--- 
a/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-2.1.8.ebuild
+++ 
b/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-2.1.8.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
x11-libs/pango
 "
 # See bug #827729
-BDEPEND="app-arch/xz-utils[extra-filters]"
+BDEPEND="app-arch/xz-utils[extra-filters(+)]"
 
 QA_PREBUILT="opt/tuxedo-control-center/*"
 



[gentoo-commits] repo/gentoo:master commit in: app-admin/gentoo-perl-helpers/

2024-08-17 Thread Mike Gilbert
commit: c50d088da195957bdca89cd40d31fb5363d6ec3b
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Aug 17 21:39:06 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sat Aug 17 21:47:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c50d088d

app-admin/gentoo-perl-helpers: fix xz-utils dep

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

 app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0-r1.ebuild 
b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0-r1.ebuild
index 8e302419914b..e074edb4ed9a 100644
--- a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0-r1.ebuild
+++ b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,7 +26,7 @@ KEYWORDS="amd64 ~arm ~arm64 x86"
 RDEPEND="
>=app-portage/portage-utils-0.80_pre20190620
 "
-BDEPEND="app-arch/xz-utils[extra-filters]"
+BDEPEND="app-arch/xz-utils[extra-filters(+)]"
 
 src_prepare() {
sed -i -e "s^@@LIBDIR@@^${EPREFIX}/usr/lib/gentoo-perl-helpers^g"   
\



[gentoo-commits] repo/gentoo:master commit in: sys-auth/munge/

2024-08-17 Thread Mike Gilbert
commit: ad5baa76aeb05fb3eb9373db7ab8ab8fc7f96993
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Aug 17 21:46:38 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sat Aug 17 21:47:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad5baa76

sys-auth/munge: fix xz-utils dep

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

 sys-auth/munge/munge-0.5.15.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-auth/munge/munge-0.5.15.ebuild 
b/sys-auth/munge/munge-0.5.15.ebuild
index a1a5d61cf62c..3a83b4dae100 100644
--- a/sys-auth/munge/munge-0.5.15.ebuild
+++ b/sys-auth/munge/munge-0.5.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,7 +27,7 @@ RDEPEND="
acct-group/munge
acct-user/munge
 "
-BDEPEND="app-arch/xz-utils[extra-filters]"
+BDEPEND="app-arch/xz-utils[extra-filters(+)]"
 
 src_prepare() {
default



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

2024-08-17 Thread Mike Gilbert
commit: fdd2951906366dd2cb85bb8767990f72da0543fd
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Aug 17 21:43:47 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sat Aug 17 21:47:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdd29519

net-mail/notmuch: fix xz-utils dep

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

 net-mail/notmuch/notmuch-0.37-r1.ebuild | 2 +-
 net-mail/notmuch/notmuch-0.37-r2.ebuild | 2 +-
 net-mail/notmuch/notmuch-0.38.3.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-mail/notmuch/notmuch-0.37-r1.ebuild 
b/net-mail/notmuch/notmuch-0.37-r1.ebuild
index 8656ceca062a..2588b2085d3e 100644
--- a/net-mail/notmuch/notmuch-0.37-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.37-r1.ebuild
@@ -28,7 +28,7 @@ IUSE="apidoc crypt doc emacs mutt nmbug python test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
-   app-arch/xz-utils[extra-filters(-)]
+   app-arch/xz-utils[extra-filters(+)]
virtual/pkgconfig
apidoc? (
app-text/doxygen

diff --git a/net-mail/notmuch/notmuch-0.37-r2.ebuild 
b/net-mail/notmuch/notmuch-0.37-r2.ebuild
index 7a7621ec990b..6735eaaf64e8 100644
--- a/net-mail/notmuch/notmuch-0.37-r2.ebuild
+++ b/net-mail/notmuch/notmuch-0.37-r2.ebuild
@@ -29,7 +29,7 @@ IUSE="apidoc crypt doc emacs mutt nmbug python test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
-   app-arch/xz-utils[extra-filters(-)]
+   app-arch/xz-utils[extra-filters(+)]
virtual/pkgconfig
apidoc? (
app-text/doxygen

diff --git a/net-mail/notmuch/notmuch-0.38.3.ebuild 
b/net-mail/notmuch/notmuch-0.38.3.ebuild
index 4b36d3821319..efe514b7832b 100644
--- a/net-mail/notmuch/notmuch-0.38.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.38.3.ebuild
@@ -29,7 +29,7 @@ IUSE="apidoc crypt doc emacs mutt nmbug python test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
-   app-arch/xz-utils[extra-filters(-)]
+   app-arch/xz-utils[extra-filters(+)]
virtual/pkgconfig
apidoc? (
app-text/doxygen



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

2024-08-17 Thread Mike Gilbert
commit: a666bc1d518a7b6326d3f776620cfcbef62c6341
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Aug 17 21:44:29 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sat Aug 17 21:47:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a666bc1d

net-misc/teamviewer: fix xz-utils dep

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

 net-misc/teamviewer/teamviewer-15.53.6.ebuild | 2 +-
 net-misc/teamviewer/teamviewer-15.55.3.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/teamviewer/teamviewer-15.53.6.ebuild 
b/net-misc/teamviewer/teamviewer-15.53.6.ebuild
index 14af3c7d58bc..918c06657898 100644
--- a/net-misc/teamviewer/teamviewer-15.53.6.ebuild
+++ b/net-misc/teamviewer/teamviewer-15.53.6.ebuild
@@ -23,7 +23,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 RESTRICT="bindist mirror strip"
 
 # Unpack will fail without app-arch/xz-utils[extra-filters], bug #798027
-BDEPEND="app-arch/xz-utils[extra-filters]"
+BDEPEND="app-arch/xz-utils[extra-filters(+)]"
 
 RDEPEND="
dev-libs/glib:2

diff --git a/net-misc/teamviewer/teamviewer-15.55.3.ebuild 
b/net-misc/teamviewer/teamviewer-15.55.3.ebuild
index 14af3c7d58bc..918c06657898 100644
--- a/net-misc/teamviewer/teamviewer-15.55.3.ebuild
+++ b/net-misc/teamviewer/teamviewer-15.55.3.ebuild
@@ -23,7 +23,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 RESTRICT="bindist mirror strip"
 
 # Unpack will fail without app-arch/xz-utils[extra-filters], bug #798027
-BDEPEND="app-arch/xz-utils[extra-filters]"
+BDEPEND="app-arch/xz-utils[extra-filters(+)]"
 
 RDEPEND="
dev-libs/glib:2



[gentoo-commits] repo/gentoo:master commit in: sci-libs/mkl/

2024-08-17 Thread Mike Gilbert
commit: 79e2f6f8768fd0f6b9c4770808be6ee0003b73a7
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Aug 17 21:45:59 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sat Aug 17 21:47:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79e2f6f8

sci-libs/mkl: fix xz-utils dep

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

 sci-libs/mkl/mkl-2020.4.304.ebuild| 4 ++--
 sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild | 4 ++--
 sci-libs/mkl/mkl-2023.0.0.25398.ebuild| 4 ++--
 sci-libs/mkl/mkl-2023.1.0.46342.ebuild| 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sci-libs/mkl/mkl-2020.4.304.ebuild 
b/sci-libs/mkl/mkl-2020.4.304.ebuild
index daf81b2b41ea..b5764fafad09 100644
--- a/sci-libs/mkl/mkl-2020.4.304.ebuild
+++ b/sci-libs/mkl/mkl-2020.4.304.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,7 +30,7 @@ RDEPEND="
sys-libs/libomp[${MULTILIB_USEDEP}]
 "
 # bug #801460
-BDEPEND="app-arch/xz-utils[extra-filters]"
+BDEPEND="app-arch/xz-utils[extra-filters(+)]"
 
 QA_PREBUILT="*"
 QA_TEXTRELS="*"

diff --git a/sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild 
b/sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild
index 2db42ce2ecab..08673a4b5283 100644
--- a/sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild
+++ b/sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -33,7 +33,7 @@ RDEPEND="
sys-libs/libomp
 "
 # bug #801460
-BDEPEND="app-arch/xz-utils[extra-filters]"
+BDEPEND="app-arch/xz-utils[extra-filters(+)]"
 
 QA_PREBUILT="*"
 QA_TEXTRELS="*"

diff --git a/sci-libs/mkl/mkl-2023.0.0.25398.ebuild 
b/sci-libs/mkl/mkl-2023.0.0.25398.ebuild
index 159969761e31..55c1ca5a70c6 100644
--- a/sci-libs/mkl/mkl-2023.0.0.25398.ebuild
+++ b/sci-libs/mkl/mkl-2023.0.0.25398.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -33,7 +33,7 @@ RDEPEND="
 "
 # bug #801460
 BDEPEND="
-   app-arch/xz-utils[extra-filters]
+   app-arch/xz-utils[extra-filters(+)]
app-eselect/eselect-blas
app-eselect/eselect-lapack
 "

diff --git a/sci-libs/mkl/mkl-2023.1.0.46342.ebuild 
b/sci-libs/mkl/mkl-2023.1.0.46342.ebuild
index 973afe5ca76e..024336ac92b8 100644
--- a/sci-libs/mkl/mkl-2023.1.0.46342.ebuild
+++ b/sci-libs/mkl/mkl-2023.1.0.46342.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 "
 # bug #801460
 BDEPEND="
-   app-arch/xz-utils[extra-filters]
+   app-arch/xz-utils[extra-filters(+)]
app-eselect/eselect-blas
app-eselect/eselect-lapack
 "



[gentoo-commits] repo/gentoo:master commit in: net-dialup/isdn-firmware/

2024-08-17 Thread Mike Gilbert
commit: 8a5f6d46fe782ba25fd0d888a68b3f547da5780d
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Aug 17 21:42:43 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sat Aug 17 21:47:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a5f6d46

net-dialup/isdn-firmware: fix xz-utils dep

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

 net-dialup/isdn-firmware/isdn-firmware-2011.8.29.8.37.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-dialup/isdn-firmware/isdn-firmware-2011.8.29.8.37.ebuild 
b/net-dialup/isdn-firmware/isdn-firmware-2011.8.29.8.37.ebuild
index 8cd8bed27ef9..6dba2a61d018 100644
--- a/net-dialup/isdn-firmware/isdn-firmware-2011.8.29.8.37.ebuild
+++ b/net-dialup/isdn-firmware/isdn-firmware-2011.8.29.8.37.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
 # Bug #827318
-BDEPEND="app-arch/xz-utils[extra-filters]"
+BDEPEND="app-arch/xz-utils[extra-filters(+)]"
 
 S="${WORKDIR}/lib/firmware/isdn"
 



[gentoo-commits] repo/gentoo:master commit in: app-arch/upx/

2024-08-17 Thread Mike Gilbert
commit: 3bfe682893548e6fa2bdce8f2072fafca247027d
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Aug 17 21:39:55 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sat Aug 17 21:47:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bfe6828

app-arch/upx: fix xz-utils dep

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

 app-arch/upx/upx-4.1.0.ebuild | 4 ++--
 app-arch/upx/upx-4.2.3.ebuild | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-arch/upx/upx-4.1.0.ebuild b/app-arch/upx/upx-4.1.0.ebuild
index 44d1747d853c..1c96a769af18 100644
--- a/app-arch/upx/upx-4.1.0.ebuild
+++ b/app-arch/upx/upx-4.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="!app-arch/upx-bin"
-BDEPEND="app-arch/xz-utils[extra-filters]"
+BDEPEND="app-arch/xz-utils[extra-filters(+)]"
 
 src_configure() {
local mycmakeargs=(

diff --git a/app-arch/upx/upx-4.2.3.ebuild b/app-arch/upx/upx-4.2.3.ebuild
index 83d85276513a..b8b1c533287c 100644
--- a/app-arch/upx/upx-4.2.3.ebuild
+++ b/app-arch/upx/upx-4.2.3.ebuild
@@ -17,7 +17,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="!app-arch/upx-bin"
-BDEPEND="app-arch/xz-utils[extra-filters]"
+BDEPEND="app-arch/xz-utils[extra-filters(+)]"
 
 src_configure() {
local mycmakeargs=(



[gentoo-commits] repo/gentoo:master commit in: mail-client/s-nail/

2024-08-17 Thread Mike Gilbert
commit: 8bbe2247dd61eb6891795dcf38d60f0d63af604f
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Aug 17 21:42:15 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sat Aug 17 21:47:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bbe2247

mail-client/s-nail: fix xz-utils dep

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

 mail-client/s-nail/s-nail-14.9.24.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail-client/s-nail/s-nail-14.9.24.ebuild 
b/mail-client/s-nail/s-nail-14.9.24.ebuild
index b42c54f02541..c4dcbebe8a18 100644
--- a/mail-client/s-nail/s-nail-14.9.24.ebuild
+++ b/mail-client/s-nail/s-nail-14.9.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -28,7 +28,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
-   app-arch/xz-utils[extra-filters(-)]
+   app-arch/xz-utils[extra-filters(+)]
app-alternatives/awk
 "
 



[gentoo-commits] repo/gentoo:master commit in: app-backup/tsm/

2024-08-17 Thread Mike Gilbert
commit: 9cf080078cfd8bc45b8436ab071e5a33932863ce
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Aug 17 21:40:25 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sat Aug 17 21:47:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cf08007

app-backup/tsm: fix xz-utils dep

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

 app-backup/tsm/tsm-8.1.22.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/tsm/tsm-8.1.22.0.ebuild 
b/app-backup/tsm/tsm-8.1.22.0.ebuild
index de1a9b67bd7a..3f42e398b274 100644
--- a/app-backup/tsm/tsm-8.1.22.0.ebuild
+++ b/app-backup/tsm/tsm-8.1.22.0.ebuild
@@ -51,7 +51,7 @@ done
 unset lang
 
 BDEPEND="
-   app-arch/xz-utils[extra-filters]
+   app-arch/xz-utils[extra-filters(+)]
 "
 DEPEND="
acct-group/tsm



[gentoo-commits] repo/gentoo:master commit in: app-shells/zsh/

2024-08-17 Thread Mike Gilbert
commit: 427d7d08f7866c9f5d81f337849a8b712d3e942a
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Aug 17 17:15:10 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sat Aug 17 17:15:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=427d7d08

app-shells/zsh: restore live ebuild

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

 app-shells/zsh/zsh-.ebuild | 241 +
 1 file changed, 241 insertions(+)

diff --git a/app-shells/zsh/zsh-.ebuild b/app-shells/zsh/zsh-.ebuild
new file mode 100644
index ..4511850c60c0
--- /dev/null
+++ b/app-shells/zsh/zsh-.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic prefix
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.code.sf.net/p/zsh/code";
+else
+   SRC_URI="https://www.zsh.org/pub/${P}.tar.xz
+   doc? ( https://www.zsh.org/pub/${P}-doc.tar.xz )"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+fi
+
+
+DESCRIPTION="UNIX Shell similar to the Korn shell"
+HOMEPAGE="https://www.zsh.org/";
+
+LICENSE="ZSH gdbm? ( GPL-2 )"
+SLOT="0"
+IUSE="caps debug doc examples gdbm maildir pcre static valgrind"
+
+RDEPEND="
+   >=sys-libs/ncurses-5.1:0=
+   static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] )
+   caps? ( sys-libs/libcap )
+   pcre? (
+   dev-libs/libpcre2
+   static? ( dev-libs/libpcre2[static-libs] )
+   )
+   gdbm? (
+   sys-libs/gdbm:=
+   static? ( sys-libs/gdbm:=[static-libs] )
+   )
+"
+DEPEND="${RDEPEND}
+   valgrind? ( dev-debug/valgrind )
+"
+PDEPEND="
+   examples? ( app-doc/zsh-lovers )
+"
+BDEPEND="
+   sys-apps/groff
+"
+if [[ ${PV} == * ]] ; then
+   BDEPEND+="
+   app-text/yodl
+   doc? (
+   sys-apps/texinfo
+   app-text/texi2html
+   virtual/latex-base
+   )
+   "
+fi
+
+PATCHES=(
+   # Add openrc specific options for init.d completion
+   "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff
+)
+
+src_prepare() {
+   if [[ ${PV} != * ]]; then
+   # fix zshall problem with soelim
+   ln -s Doc man1 || die
+   mv Doc/zshall.1 Doc/zshall.1.soelim || die
+   soelim Doc/zshall.1.soelim > Doc/zshall.1 || die
+   fi
+
+   default
+
+   hprefixify configure.ac
+   if [[ ${PV} == * ]] ; then
+   sed -i "/^VERSION=/s@=.*@=${PV}@" Config/version.mk || die
+   fi
+   eautoreconf
+}
+
+src_configure() {
+   local myconf=(
+   --bindir="${EPREFIX}"/bin
+   --libdir="${EPREFIX}"/usr/$(get_libdir)
+   --enable-etcdir="${EPREFIX}"/etc/zsh
+   --enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help
+   --enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions
+   --enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions
+   --enable-function-subdirs
+   --with-tcsetpgrp
+   --enable-multibyte
+   --with-term-lib='tinfow ncursesw'
+   $(use_enable maildir maildir-support)
+   $(use_enable pcre)
+   $(use_enable caps cap)
+   $(use_enable gdbm)
+   $(use_enable valgrind zsh-valgrind)
+   )
+
+   if use static ; then
+   myconf+=( --disable-dynamic )
+   append-ldflags -static
+   fi
+   if use debug ; then
+   myconf+=(
+   --enable-zsh-debug
+   --enable-zsh-mem-debug
+   --enable-zsh-mem-warning
+   --enable-zsh-secure-free
+   --enable-zsh-hash-debug
+   )
+   fi
+
+   if [[ ${CHOST} == *-darwin* ]]; then
+   myconf+=( --enable-libs=-liconv )
+   append-ldflags -Wl,-x
+   fi
+
+   econf "${myconf[@]}"
+
+   if use static ; then
+   # compile all modules statically, see Bug #27392
+   # removed cap and curses because linking failes
+   sed -e "s,link=no,link=static,g" \
+   -e "/^name=zsh\/cap/s,link=static,link=no," \
+   -e "/^name=zsh\/curses/s,link=static,link=no," \
+   -i "${S}"/config.mo

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

2024-08-17 Thread Mike Gilbert
commit: 2a2d6fbe8ef24b0c33e04af4e92148af77da1f6f
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Aug 17 17:12:30 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sat Aug 17 17:13:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a2d6fbe

app-editors/neovim: pass full path in LUA_PRG

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

 app-editors/neovim/neovim-0.10.0-r1.ebuild | 3 +--
 app-editors/neovim/neovim-0.10.0.ebuild| 3 +--
 app-editors/neovim/neovim-0.10.1.ebuild| 3 +--
 app-editors/neovim/neovim-.ebuild  | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/app-editors/neovim/neovim-0.10.0-r1.ebuild 
b/app-editors/neovim/neovim-0.10.0-r1.ebuild
index 399df8c4faf1..cae241418746 100644
--- a/app-editors/neovim/neovim-0.10.0-r1.ebuild
+++ b/app-editors/neovim/neovim-0.10.0-r1.ebuild
@@ -89,13 +89,12 @@ src_prepare() {
 }
 
 src_configure() {
-   ln -s "${BROOT}"/usr/bin/luajit "${BUILD_DIR}"/luajit || die
# TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now
local mycmakeargs=(
# appends -flto
-DENABLE_LTO=OFF
-DPREFER_LUA=$(usex lua_single_target_luajit no 
"$(lua_get_version)")
-   -DLUA_PRG="${ELUA}"
+   -DLUA_PRG="${LUA}"
)
cmake_src_configure
 }

diff --git a/app-editors/neovim/neovim-0.10.0.ebuild 
b/app-editors/neovim/neovim-0.10.0.ebuild
index 1ae8d920bf61..8c1e075d2ee6 100644
--- a/app-editors/neovim/neovim-0.10.0.ebuild
+++ b/app-editors/neovim/neovim-0.10.0.ebuild
@@ -80,13 +80,12 @@ src_prepare() {
 }
 
 src_configure() {
-   ln -s "${BROOT}"/usr/bin/luajit "${BUILD_DIR}"/luajit || die
# TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now
local mycmakeargs=(
# appends -flto
-DENABLE_LTO=OFF
-DPREFER_LUA=$(usex lua_single_target_luajit no 
"$(lua_get_version)")
-   -DLUA_PRG="${ELUA}"
+   -DLUA_PRG="${LUA}"
)
cmake_src_configure
 }

diff --git a/app-editors/neovim/neovim-0.10.1.ebuild 
b/app-editors/neovim/neovim-0.10.1.ebuild
index 430fcb85153c..d7cc51448a72 100644
--- a/app-editors/neovim/neovim-0.10.1.ebuild
+++ b/app-editors/neovim/neovim-0.10.1.ebuild
@@ -90,13 +90,12 @@ src_prepare() {
 }
 
 src_configure() {
-   ln -s "${BROOT}"/usr/bin/luajit "${BUILD_DIR}"/luajit || die
# TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now
local mycmakeargs=(
# appends -flto
-DENABLE_LTO=OFF
-DPREFER_LUA=$(usex lua_single_target_luajit no 
"$(lua_get_version)")
-   -DLUA_PRG="${ELUA}"
+   -DLUA_PRG="${LUA}"
)
cmake_src_configure
 }

diff --git a/app-editors/neovim/neovim-.ebuild 
b/app-editors/neovim/neovim-.ebuild
index ee6477ed945e..a322637e75c8 100644
--- a/app-editors/neovim/neovim-.ebuild
+++ b/app-editors/neovim/neovim-.ebuild
@@ -90,13 +90,12 @@ src_prepare() {
 }
 
 src_configure() {
-   ln -s "${BROOT}"/usr/bin/luajit "${BUILD_DIR}"/luajit || die
# TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now
local mycmakeargs=(
# appends -flto
-DENABLE_LTO=OFF
-DPREFER_LUA=$(usex lua_single_target_luajit no 
"$(lua_get_version)")
-   -DLUA_PRG="${ELUA}"
+   -DLUA_PRG="${LUA}"
)
cmake_src_configure
 }



[gentoo-commits] repo/gentoo:master commit in: sys-power/cpupower/

2024-08-15 Thread Mike Gilbert
commit: 52a440cad7d4f9342f37bcc137627e4ecd9d9072
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Aug 15 19:45:38 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Aug 15 19:48:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52a440ca

sys-power/cpupower: add tarball instructions

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

 sys-power/cpupower/cpupower-6.10.ebuild | 5 +
 1 file changed, 5 insertions(+)

diff --git a/sys-power/cpupower/cpupower-6.10.ebuild 
b/sys-power/cpupower/cpupower-6.10.ebuild
index 37a30e496d42..1f0e7e8a85fd 100644
--- a/sys-power/cpupower/cpupower-6.10.ebuild
+++ b/sys-power/cpupower/cpupower-6.10.ebuild
@@ -9,6 +9,11 @@ DESCRIPTION="Shows and sets processor power related values"
 HOMEPAGE="https://www.kernel.org/";
 SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz";
 
+# Run from a kernel git repo to generate a tarball for version x.y:
+# PV=x.y
+# git archive --prefix=cpupower-${PV}/ v{PV} Makefile 
tools/scripts/Makefile.arch \
+# tools/power/cpupower | xz > /tmp/cpupower-${PV}.tar.xz
+
 LICENSE="GPL-2"
 SLOT="0/0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"



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

2024-08-15 Thread Mike Gilbert
commit: 5ee1a193982fce006aefbd5a6c5907392016b44d
Author: mid-kid  gmail  com>
AuthorDate: Sat Aug  3 15:04:43 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Aug 15 17:29:00 2024 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=5ee1a193

Make portage.util.compression_probe work when ctypes is unavailable

This is useful for bootstrapping purposes, as _ctypes requires a dynamic
linker.

Closes: https://github.com/gentoo/portage/pull/1363
Signed-off-by: Mike Gilbert  gentoo.org>

 lib/portage/util/compression_probe.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/portage/util/compression_probe.py 
b/lib/portage/util/compression_probe.py
index 0879754b21..268e5840cc 100644
--- a/lib/portage/util/compression_probe.py
+++ b/lib/portage/util/compression_probe.py
@@ -1,13 +1,13 @@
 # Copyright 2015-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-import ctypes
 import errno
 import re
 
 
 from portage import _encodings, _unicode_encode
 from portage.exception import FileNotFound, PermissionDenied
+from portage.util._ctypes import ctypes
 
 _compressors = {
 "bzip2": {
@@ -49,7 +49,7 @@ _compressors = {
 # if the current architecture can support it, which is true when
 # sizeof(long) is at least 8 bytes.
 "decompress": "zstd -d"
-+ (" --long=31" if ctypes.sizeof(ctypes.c_long) >= 8 else ""),
++ (" --long=31" if ctypes and ctypes.sizeof(ctypes.c_long) >= 8 else 
""),
 "package": "app-arch/zstd",
 },
 }



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

2024-08-15 Thread Mike Gilbert
commit: 76615b8c97ef9cd24fd282e1ec2d62998220c992
Author: Lucio Sauer  posteo  net>
AuthorDate: Fri Aug  9 00:14:00 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Aug 15 17:27:04 2024 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=76615b8c

ebuild.5: update QA variables affected by QA_PREBUILT

Signed-off-by: Lucio Sauer  posteo.net>
Closes: https://github.com/gentoo/portage/pull/1367
Signed-off-by: Mike Gilbert  gentoo.org>

 man/ebuild.5 | 44 ++--
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 36d65eb18f..b83ea46e17 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -862,28 +862,6 @@ This should contain a list of file paths, relative to the 
image directory, of
 desktop files which should not be validated. The paths may contain regular
 expressions with escape\-quoted special characters.
 .TP
-.B QA_DT_NEEDED
-This should contain a list of file paths, relative to the image directory, of
-shared libraries that lack NEEDED entries. The paths may contain regular
-expressions with escape\-quoted special characters.
-.TP
-.B QA_EXECSTACK
-This should contain a list of file paths, relative to the image directory, of
-objects that require executable stack in order to run.
-The paths may contain fnmatch patterns.
-
-This variable is intended to be used on objects that truly need executable
-stack (i.e. not those marked to need it which in fact do not).
-.TP
-.B QA_FLAGS_IGNORED
-This should contain a list of file paths, relative to the image directory, of
-files that do not contain .GCC.command.line sections or contain .hash sections.
-The paths may contain regular expressions with escape\-quoted special
-characters.
-
-This variable is intended to be used on files of binary packages which ignore
-CFLAGS, CXXFLAGS, FFLAGS, FCFLAGS, and LDFLAGS variables.
-.TP
 .B QA_MULTILIB_PATHS
 This should contain a list of file paths, relative to the image directory, of
 files that should be ignored for the multilib\-strict checks.
@@ -906,6 +884,28 @@ the QA_* variables that support regular expressions instead
 of fnmatch patterns. The translation mechanism simply replaces
 "*" with ".*".
 .TP
+.B QA_DT_NEEDED
+This should contain a list of file paths, relative to the image directory, of
+shared libraries that lack NEEDED entries. The paths may contain regular
+expressions with escape\-quoted special characters.
+.TP
+.B QA_EXECSTACK
+This should contain a list of file paths, relative to the image directory, of
+objects that require executable stack in order to run.
+The paths may contain fnmatch patterns.
+
+This variable is intended to be used on objects that truly need executable
+stack (i.e. not those marked to need it which in fact do not).
+.TP
+.B QA_FLAGS_IGNORED
+This should contain a list of file paths, relative to the image directory, of
+files that do not contain .GCC.command.line sections or contain .hash sections.
+The paths may contain regular expressions with escape\-quoted special
+characters.
+
+This variable is intended to be used on files of binary packages which ignore
+CFLAGS, CXXFLAGS, FFLAGS, FCFLAGS, and LDFLAGS variables.
+.TP
 .B QA_PRESTRIPPED
 This should contain a list of file paths, relative to the image directory, of
 files that contain pre-stripped binaries. The paths may contain regular



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

2024-08-15 Thread Mike Gilbert
commit: 70b0f876ed56a684054089a6af31a7484b5be190
Author: Lucio Sauer  posteo  net>
AuthorDate: Thu Aug  8 23:08:57 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Aug 15 17:25:31 2024 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=70b0f876

phase-functions: extend QA_PREBUILT handling to QA_SONAME_NO_SYMLINK

This behavior is implied by the ordering of QA variables in the man page
since the introduction of QA_SONAME_NO_SYMLINK.

Bug: https://bugs.gentoo.org/924953
Fixes: dcb42a417355510284a35c08a4bf849047122a5c
Signed-off-by: Lucio Sauer  posteo.net>
Signed-off-by: Mike Gilbert  gentoo.org>

 bin/phase-functions.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index 2c3f2d389f..5257101cf4 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -555,7 +555,8 @@ __dyn_install() {
 
# These ones support regular expressions, so translate
# fnmatch patterns to regular expressions
-   for x in QA_DT_NEEDED QA_FLAGS_IGNORED QA_PRESTRIPPED QA_SONAME 
; do
+   for x in QA_DT_NEEDED QA_FLAGS_IGNORED QA_PRESTRIPPED \
+   QA_SONAME QA_SONAME_NO_SYMLINK; do
if [[ $(declare -p ${x} 2>/dev/null) = declare\ -a* ]] 
; then
eval "${x}=(\"\${${x}[@]}\" 
${QA_PREBUILT//\*/.*})"
else



[gentoo-commits] repo/gentoo:master commit in: sys-power/cpupower/

2024-08-15 Thread Mike Gilbert
commit: 2f2c8e5e7c1c367ca3e6f1f317e5cbdae5c8aba6
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Aug 15 16:37:22 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Aug 15 16:37:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f2c8e5e

sys-power/cpupower: drop 5.18

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

 sys-power/cpupower/Manifest |  1 -
 sys-power/cpupower/cpupower-5.18.ebuild | 64 -
 2 files changed, 65 deletions(-)

diff --git a/sys-power/cpupower/Manifest b/sys-power/cpupower/Manifest
index cc8c6a513765..32cfa8996dfc 100644
--- a/sys-power/cpupower/Manifest
+++ b/sys-power/cpupower/Manifest
@@ -1,3 +1,2 @@
 DIST cpupower-6.10.tar.xz 96672 BLAKE2B 
379e1ce6a098fcbb8a16e1388a096e19503eda83babb0179cf056adadf655ad67ddb5bb2c702f4e8b929301c4cdc60690ed10c1823faed048f2d2b4449fadeaa
 SHA512 
58734cead2a0366e08edff5864b1d28b4af1473c860d7b032a880279a792c3d545f97a9349fb00bbd90fbaced817e31b5e4a8ea5d2c4d0bc9a40e51df4fca0e6
 DIST cpupower-6.2.tar.xz 97292 BLAKE2B 
08812ff41bb488d72fb9686e1d40bd369669832f5e23c13b06d14a418209c5db57ebed10a3e17ffd7102d20c0905a72c166dd0cfc4af999aba9d4a1aa38c14c5
 SHA512 
e7d910865da3cb3a1ff1595f67271e586b40244567226f8aa84b744a57add7e582e7d0ec0709ca31e7ec49a46d48d21957763f9d4fc7cd892fe014da86ee6cb0
-DIST linux-5.18.tar.xz 129790264 BLAKE2B 
e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb
 SHA512 
dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5

diff --git a/sys-power/cpupower/cpupower-5.18.ebuild 
b/sys-power/cpupower/cpupower-5.18.ebuild
deleted file mode 100644
index 22fc954d4b41..
--- a/sys-power/cpupower/cpupower-5.18.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2013-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="Shows and sets processor power related values"
-HOMEPAGE="https://www.kernel.org/";
-SRC_URI="https://cdn.kernel.org/pub/linux/kernel/v${PV%%.*}.x/linux-${PV}.tar.xz";
-
-LICENSE="GPL-2"
-SLOT="0/0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
-IUSE="nls"
-
-# File collision w/ headers of the deprecated cpufrequtils
-RDEPEND="sys-apps/pciutils"
-DEPEND="${RDEPEND}
-   virtual/os-headers
-   nls? ( sys-devel/gettext )"
-
-PATCHES=(
-   "${FILESDIR}/cpupower-5.4-cflags.patch"
-)
-
-S="${WORKDIR}/linux-${PV}"
-
-src_configure() {
-   export bindir="${EPREFIX}/usr/bin"
-   export sbindir="${EPREFIX}/usr/sbin"
-   export mandir="${EPREFIX}/usr/share/man"
-   export includedir="${EPREFIX}/usr/include"
-   export libdir="${EPREFIX}/usr/$(get_libdir)"
-   export localedir="${EPREFIX}/usr/share/locale"
-   export docdir="${EPREFIX}/usr/share/doc/${PF}"
-   export confdir="${EPREFIX}/etc"
-   export 
bash_completion_dir="${EPREFIX}/usr/share/bash-completion/completions"
-   export V=1
-   export NLS=$(usex nls true false)
-}
-
-src_compile() {
-   myemakeargs=(
-   AR="$(tc-getAR)"
-   CC="$(tc-getCC)"
-   LD="$(tc-getCC)"
-   VERSION=${PV}
-   )
-   emake -C tools/power/cpupower "${myemakeargs[@]}"
-}
-
-src_install() {
-   cd tools/power/cpupower || die
-   emake "${myemakeargs[@]}" DESTDIR="${D}" install
-   doheader lib/cpupower.h
-   einstalldocs
-
-   newconfd "${FILESDIR}"/conf.d-r2 cpupower
-   newinitd "${FILESDIR}"/init.d-r4 cpupower
-
-   systemd_dounit "${FILESDIR}"/cpupower-frequency-set.service
-   systemd_install_serviced 
"${FILESDIR}"/cpupower-frequency-set.service.conf
-}



[gentoo-commits] repo/gentoo:master commit in: sys-power/cpupower/

2024-08-15 Thread Mike Gilbert
commit: 593f9e32e502942955c42eb3b9a76850f9da1223
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Aug 15 16:35:40 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Aug 15 16:35:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=593f9e32

sys-power/cpupower: add 6.10

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

 sys-power/cpupower/Manifest |  1 +
 sys-power/cpupower/cpupower-6.10.ebuild | 61 +
 2 files changed, 62 insertions(+)

diff --git a/sys-power/cpupower/Manifest b/sys-power/cpupower/Manifest
index 81aebc5d268f..cc8c6a513765 100644
--- a/sys-power/cpupower/Manifest
+++ b/sys-power/cpupower/Manifest
@@ -1,2 +1,3 @@
+DIST cpupower-6.10.tar.xz 96672 BLAKE2B 
379e1ce6a098fcbb8a16e1388a096e19503eda83babb0179cf056adadf655ad67ddb5bb2c702f4e8b929301c4cdc60690ed10c1823faed048f2d2b4449fadeaa
 SHA512 
58734cead2a0366e08edff5864b1d28b4af1473c860d7b032a880279a792c3d545f97a9349fb00bbd90fbaced817e31b5e4a8ea5d2c4d0bc9a40e51df4fca0e6
 DIST cpupower-6.2.tar.xz 97292 BLAKE2B 
08812ff41bb488d72fb9686e1d40bd369669832f5e23c13b06d14a418209c5db57ebed10a3e17ffd7102d20c0905a72c166dd0cfc4af999aba9d4a1aa38c14c5
 SHA512 
e7d910865da3cb3a1ff1595f67271e586b40244567226f8aa84b744a57add7e582e7d0ec0709ca31e7ec49a46d48d21957763f9d4fc7cd892fe014da86ee6cb0
 DIST linux-5.18.tar.xz 129790264 BLAKE2B 
e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb
 SHA512 
dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5

diff --git a/sys-power/cpupower/cpupower-6.10.ebuild 
b/sys-power/cpupower/cpupower-6.10.ebuild
new file mode 100644
index ..37a30e496d42
--- /dev/null
+++ b/sys-power/cpupower/cpupower-6.10.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2013-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="Shows and sets processor power related values"
+HOMEPAGE="https://www.kernel.org/";
+SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz";
+
+LICENSE="GPL-2"
+SLOT="0/0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="nls"
+
+# File collision w/ headers of the deprecated cpufrequtils
+RDEPEND="sys-apps/pciutils"
+DEPEND="${RDEPEND}
+   virtual/os-headers
+   nls? ( sys-devel/gettext )"
+
+PATCHES=(
+   "${FILESDIR}/cpupower-5.4-cflags.patch"
+)
+
+src_configure() {
+   export bindir="${EPREFIX}/usr/bin"
+   export sbindir="${EPREFIX}/usr/sbin"
+   export mandir="${EPREFIX}/usr/share/man"
+   export includedir="${EPREFIX}/usr/include"
+   export libdir="${EPREFIX}/usr/$(get_libdir)"
+   export localedir="${EPREFIX}/usr/share/locale"
+   export docdir="${EPREFIX}/usr/share/doc/${PF}"
+   export confdir="${EPREFIX}/etc"
+   export 
bash_completion_dir="${EPREFIX}/usr/share/bash-completion/completions"
+   export V=1
+   export NLS=$(usex nls true false)
+}
+
+src_compile() {
+   myemakeargs=(
+   AR="$(tc-getAR)"
+   CC="$(tc-getCC)"
+   LD="$(tc-getCC)"
+   )
+   emake -C tools/power/cpupower "${myemakeargs[@]}"
+}
+
+src_install() {
+   cd tools/power/cpupower || die
+   emake "${myemakeargs[@]}" DESTDIR="${D}" install
+   doheader lib/cpupower.h
+   einstalldocs
+
+   newconfd "${FILESDIR}"/conf.d-r2 cpupower
+   newinitd "${FILESDIR}"/init.d-r4 cpupower
+
+   systemd_dounit "${FILESDIR}"/cpupower-frequency-set.service
+   systemd_install_serviced 
"${FILESDIR}"/cpupower-frequency-set.service.conf
+}



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

2024-08-14 Thread Mike Gilbert
commit: 892f5408a6ff1aa899cc62a10ec07af57001f5d0
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Aug 13 01:14:14 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Wed Aug 14 14:43:09 2024 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=892f5408

dispatch-conf: ignore SHELL in spawn_shell

There is no need to use SHELL here, and this can actually cause problems
when SHELL is set to "nologin" or "false".

Look for sh in PATH instead.

Bug: https://bugs.gentoo.org/910560
Signed-off-by: Mike Gilbert  gentoo.org>

 bin/dispatch-conf | 30 +++---
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/bin/dispatch-conf b/bin/dispatch-conf
index 93164d909e..2e72562439 100755
--- a/bin/dispatch-conf
+++ b/bin/dispatch-conf
@@ -574,26 +574,18 @@ def clear_screen():
 os.system("clear 2>/dev/null")
 
 
-shell = os.environ.get("SHELL")
-if not shell or not os.access(shell, os.EX_OK):
-shell = find_binary("sh")
-
-
 def spawn_shell(cmd):
-if shell:
-sys.__stdout__.flush()
-sys.__stderr__.flush()
-spawn(
-[shell, "-c", cmd],
-env=os.environ,
-fd_pipes={
-0: portage._get_stdin().fileno(),
-1: sys.__stdout__.fileno(),
-2: sys.__stderr__.fileno(),
-},
-)
-else:
-os.system(cmd)
+sys.__stdout__.flush()
+sys.__stderr__.flush()
+spawn(
+["sh", "-c", cmd],
+env=os.environ,
+fd_pipes={
+0: portage._get_stdin().fileno(),
+1: sys.__stdout__.fileno(),
+2: sys.__stderr__.fileno(),
+},
+)
 
 
 def usage(argv):



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

2024-08-13 Thread Mike Gilbert
commit: b8029cfa8bd51084e4c3f836212fe0b3f1b5702b
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Aug 13 20:44:08 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Tue Aug 13 20:44:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8029cfa

net-p2p/transmission: depend on app-arch/libdeflate[gzip]

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

 .../{transmission-4.0.6-r3.ebuild => transmission-4.0.6-r4.ebuild}  | 2 +-
 net-p2p/transmission/transmission-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-p2p/transmission/transmission-4.0.6-r3.ebuild 
b/net-p2p/transmission/transmission-4.0.6-r4.ebuild
similarity index 99%
rename from net-p2p/transmission/transmission-4.0.6-r3.ebuild
rename to net-p2p/transmission/transmission-4.0.6-r4.ebuild
index da35ac8b5679..df7714ef6386 100644
--- a/net-p2p/transmission/transmission-4.0.6-r3.ebuild
+++ b/net-p2p/transmission/transmission-4.0.6-r4.ebuild
@@ -41,7 +41,7 @@ BDEPEND="
qt6? ( dev-qt/qttools:6[linguist] )
 "
 COMMON_DEPEND="
-   app-arch/libdeflate:=
+   app-arch/libdeflate:=[gzip(+)]
>=dev-libs/libevent-2.1.0:=[threads(+)]
!mbedtls? ( dev-libs/openssl:0= )
mbedtls? ( net-libs/mbedtls:0= )

diff --git a/net-p2p/transmission/transmission-.ebuild 
b/net-p2p/transmission/transmission-.ebuild
index 38b587a61780..c129e9140880 100644
--- a/net-p2p/transmission/transmission-.ebuild
+++ b/net-p2p/transmission/transmission-.ebuild
@@ -41,7 +41,7 @@ BDEPEND="
qt6? ( dev-qt/qttools:6[linguist] )
 "
 COMMON_DEPEND="
-   app-arch/libdeflate:=
+   app-arch/libdeflate:=[gzip(+)]
>=dev-libs/libevent-2.1.0:=[threads(+)]
!mbedtls? ( dev-libs/openssl:0= )
mbedtls? ( net-libs/mbedtls:0= )



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

2024-08-13 Thread Mike Gilbert
commit: 73fc2f39f45b7bb6a01dd64630816e7224cffa92
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Aug 13 17:23:31 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Tue Aug 13 17:23:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73fc2f39

net-p2p/transmission: use system libdeflate

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

 .../{transmission-.ebuild => transmission-4.0.6-r3.ebuild} | 7 ++-
 net-p2p/transmission/transmission-.ebuild  | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/net-p2p/transmission/transmission-.ebuild 
b/net-p2p/transmission/transmission-4.0.6-r3.ebuild
similarity index 96%
copy from net-p2p/transmission/transmission-.ebuild
copy to net-p2p/transmission/transmission-4.0.6-r3.ebuild
index 84da9b553129..da35ac8b5679 100644
--- a/net-p2p/transmission/transmission-.ebuild
+++ b/net-p2p/transmission/transmission-4.0.6-r3.ebuild
@@ -41,6 +41,7 @@ BDEPEND="
qt6? ( dev-qt/qttools:6[linguist] )
 "
 COMMON_DEPEND="
+   app-arch/libdeflate:=
>=dev-libs/libevent-2.1.0:=[threads(+)]
!mbedtls? ( dev-libs/openssl:0= )
mbedtls? ( net-libs/mbedtls:0= )
@@ -76,6 +77,10 @@ RDEPEND="${COMMON_DEPEND}
${ACCT_DEPEND}
 "
 
+PATCHES=(
+   "${FILESDIR}/transmission-4.0.6-miniupnpc-2.2.8.patch"
+)
+
 src_configure() {
local mycmakeargs=(
-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
@@ -91,7 +96,7 @@ src_configure() {
 
-DUSE_GTK_VERSION=4
-DUSE_SYSTEM_EVENT2=ON
-   -DUSE_SYSTEM_DEFLATE=OFF
+   -DUSE_SYSTEM_DEFLATE=ON
-DUSE_SYSTEM_DHT=OFF
-DUSE_SYSTEM_MINIUPNPC=ON
-DUSE_SYSTEM_NATPMP=ON

diff --git a/net-p2p/transmission/transmission-.ebuild 
b/net-p2p/transmission/transmission-.ebuild
index 84da9b553129..38b587a61780 100644
--- a/net-p2p/transmission/transmission-.ebuild
+++ b/net-p2p/transmission/transmission-.ebuild
@@ -41,6 +41,7 @@ BDEPEND="
qt6? ( dev-qt/qttools:6[linguist] )
 "
 COMMON_DEPEND="
+   app-arch/libdeflate:=
>=dev-libs/libevent-2.1.0:=[threads(+)]
!mbedtls? ( dev-libs/openssl:0= )
mbedtls? ( net-libs/mbedtls:0= )
@@ -91,7 +92,7 @@ src_configure() {
 
-DUSE_GTK_VERSION=4
-DUSE_SYSTEM_EVENT2=ON
-   -DUSE_SYSTEM_DEFLATE=OFF
+   -DUSE_SYSTEM_DEFLATE=ON
-DUSE_SYSTEM_DHT=OFF
-DUSE_SYSTEM_MINIUPNPC=ON
-DUSE_SYSTEM_NATPMP=ON



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

2024-08-13 Thread Mike Gilbert
commit: d800bb25926fcd06f8c1f60dc3be72abc399adb2
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Aug 13 17:24:15 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Tue Aug 13 17:24:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d800bb25

net-p2p/transmission: drop 4.0.5-r1

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

 net-p2p/transmission/Manifest |   1 -
 net-p2p/transmission/transmission-4.0.5-r1.ebuild | 158 --
 2 files changed, 159 deletions(-)

diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index ee2b56c96a39..25fe0a891814 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -1,2 +1 @@
-DIST transmission-4.0.5.tar.xz 9745756 BLAKE2B 
60caa3bc615137b225d3ac3f25daa352c6960fcc848c91e5ea45488ae109d93b53e314e4683bd7c4ef3f9b2f364d796b6c5bb014ca647d3f44fb5c9df9f8c997
 SHA512 
9d3df965929ba18aa8186f89060aeacc8ead3df4a5acdc74a005dc62deadc5fa239af99c49ca2477cc5c1adfcd834481105f1dbc94e0efe210e9e6680bfec124
 DIST transmission-4.0.6.tar.xz 11908296 BLAKE2B 
3eb1d851322299cb1b79c799f431c09db5aee1be0372fa2877e16508ca6f9e78ea42ed75520ab29a3325e62efcfca63a83559db73c39c981c9e2eddb403ef65a
 SHA512 
d11654bd5174a990d8021fde890389bc7c073f63f80e1335bb2c250aff60f06d0b6481fb041ae4fdccd1c43278c71ddc36f692d7dda3ed2a1aaa9bd1bbc2cb0c

diff --git a/net-p2p/transmission/transmission-4.0.5-r1.ebuild 
b/net-p2p/transmission/transmission-4.0.5-r1.ebuild
deleted file mode 100644
index 84c29cb03a00..
--- a/net-p2p/transmission/transmission-4.0.5-r1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 2006-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic tmpfiles systemd xdg-utils
-
-if [[ ${PV} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/transmission/transmission";
-else
-   MY_PV="${PV/_beta/-beta.}"
-   MY_P="${PN}-${MY_PV}"
-   S="${WORKDIR}/${MY_P}"
-   
SRC_URI="https://github.com/transmission/transmission/releases/download/${MY_PV}/${MY_P}.tar.xz";
-   KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="A fast, easy, and free BitTorrent client"
-HOMEPAGE="https://transmissionbt.com/";
-
-# web/LICENSE is always GPL-2 whereas COPYING allows either GPL-2 or GPL-3 for 
the rest
-# transmission in licenses/ is for mentioning OpenSSL linking exception
-# MIT is in several libtransmission/ headers
-LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
-SLOT="0"
-IUSE="appindicator cli debug gtk nls mbedtls qt5 qt6 systemd test"
-REQUIRED_USE="?? ( qt5 qt6 )"
-RESTRICT="!test? ( test )"
-
-ACCT_DEPEND="
-   acct-group/transmission
-   acct-user/transmission
-"
-BDEPEND="
-   virtual/pkgconfig
-   nls? (
-   gtk? ( sys-devel/gettext )
-   )
-   qt5? ( dev-qt/linguist-tools:5 )
-   qt6? ( dev-qt/qttools:6[linguist] )
-"
-COMMON_DEPEND="
-   >=dev-libs/libevent-2.1.0:=[threads(+)]
-   !mbedtls? ( dev-libs/openssl:0= )
-   mbedtls? ( net-libs/mbedtls:0= )
-   net-libs/libnatpmp
-   >=net-libs/libpsl-0.21.1
-   =net-misc/curl-7.28.0[ssl]
-   sys-libs/zlib:=
-   nls? ( virtual/libintl )
-   gtk? (
-   >=dev-cpp/gtkmm-3.24.0:4.0
-   >=dev-cpp/glibmm-2.60.0:2.68
-   appindicator? ( dev-libs/libayatana-appindicator )
-   )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtdbus:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtsvg:5
-   dev-qt/qtwidgets:5
-   )
-   qt6? (
-   dev-qt/qtbase:6[dbus,gui,network,widgets]
-   dev-qt/qtsvg:6
-   )
-   systemd? ( >=sys-apps/systemd-209:= )
-"
-DEPEND="${COMMON_DEPEND}
-   nls? ( virtual/libintl )
-"
-RDEPEND="${COMMON_DEPEND}
-   ${ACCT_DEPEND}
-"
-
-src_configure() {
-   local mycmakeargs=(
-   -DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-
-   -DENABLE_GTK=$(usex gtk ON OFF)
-   -DENABLE_MAC=OFF
-   -DREBUILD_WEB=OFF
-   -DENABLE_CLI=$(usex cli ON OFF)
-   -DENABLE_TESTS=$(usex test ON OFF)
-   -DENABLE_NLS=$(usex nls ON OFF)
-
-   -DRUN_CLANG_TIDY=OFF
-
-   -DUSE_GTK_VERSION=4
-   -DUSE_SYSTEM_EVENT2=ON
-   -DUSE_SYSTEM_DEFLATE=OFF
-   -DUSE_SYSTEM_DHT=OFF
-   -DUSE_SYSTEM_MINIUPNPC=ON
-   -DUSE_SYSTEM_NATPMP=ON
-   -DUSE_SYSTEM_UTP=OFF
-   -DUSE_SYSTEM_B64=OFF
-   -DUSE_SYSTEM_PSL=ON
-
-   -DWITH_CRYPTO=$(usex mbedtls m

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

2024-08-12 Thread Mike Gilbert
commit: 7983e70fcf35c35bcf64e40ad73051b1c390dee1
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Aug 12 20:04:48 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Aug 12 20:04:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7983e70f

net-misc/freerdp: add 3.7.0

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

 net-misc/freerdp/Manifest |   2 +
 net-misc/freerdp/freerdp-3.7.0.ebuild | 182 ++
 2 files changed, 184 insertions(+)

diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 09d543e4268e..5363c7cee049 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -4,3 +4,5 @@ DIST freerdp-2.11.7.tar.gz.asc 228 BLAKE2B 
a374c22ada6da59fb66fcb8021d5bb27545df
 DIST freerdp-3.4.0.tar.gz 9331562 BLAKE2B 
888d6c5786c7b3c5eea89e41bca23ef2b323377b8115c5f5bfd0dd38e5ed2d3701ffc7603e4aa4253e9116804a12268f4b59dadeb2f60f5c39e8170e78ba6bd1
 SHA512 
b69f2a2a5f6c70b4a21f0768ce2050020af47b83a3cf06d3b3b46a0e6aa7c062ed2b9de04782a8d6651002ded4c267f8653dfdc2517323926aaab3675924b6c5
 DIST freerdp-3.6.3.tar.gz 10199503 BLAKE2B 
ff4c76a7f2d808db09d22b6cf79caaa1f1aff58c25d37d853d4244cf4b8d0f522cb3ad384c6284544a08e2092277e7b4ee8a6f9fa61bb24319d7c5d08aebfdc7
 SHA512 
e92b839bdaaed99f05c3ab883a864fb3a18a01b5e173317b1cf8210ad16cbf25f2133b8893dec9f9d3a92b0a2fbcb0230f549e1632ade0394b5c8ea0f7331e1e
 DIST freerdp-3.6.3.tar.gz.asc 228 BLAKE2B 
4ea04f0d662afef34d61f06d36f3bd6f872f2a7cd8095df581f489306d88a761921a0a93325bdd4c5a627a1c47c612652697b9dc3338ebe0ea952a65b0783cc7
 SHA512 
6568362c2ad1032925e7dfcd04977c56a58e661b8eacc79d6d2ad77bb9e56d3dff3f13d004d50a88827aa9ccbd2f56c1019a53e18bf35856dbec81acba1dc142
+DIST freerdp-3.7.0.tar.gz 10223833 BLAKE2B 
6d1fab8a88dd9113c6daf0d609cac006d1303f30dd9a9e4b9a8d9d78df64281c86c3e30142be82b7e696983649114f31b9cbd35773e712331bf522a2928cdde3
 SHA512 
6af8962549bd259f1fb4ae15e60562602cdcc8a4492f35c93e2da45c315abdcf7c78f0525a5821a829f811fb759730a6980ee177d3864989701873ad70189f74
+DIST freerdp-3.7.0.tar.gz.asc 228 BLAKE2B 
87cd5f8cb8286eaf108098ee8baa7ed7c6e05b0d3e78050d16f96f6327c40f03bbe96b6aac719a8203240b4eb02e175daad57189dc7e0a0e022b02372aa69d6f
 SHA512 
b62cf129db113ae727669f26de8dc971e33b78cf0b83e5f84a518c30366ff74c14675701870e9e09aedaad23000b3316a04a76cb7df475f3e4d5465f206b0e30

diff --git a/net-misc/freerdp/freerdp-3.7.0.ebuild 
b/net-misc/freerdp/freerdp-3.7.0.ebuild
new file mode 100644
index ..51aab209a2db
--- /dev/null
+++ b/net-misc/freerdp/freerdp-3.7.0.ebuild
@@ -0,0 +1,182 @@
+# Copyright 2011-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git";
+   case ${PV} in
+   2.*) EGIT_BRANCH="stable-2.0";;
+   esac
+else
+   inherit verify-sig
+   MY_P=${P/_/-}
+   S="${WORKDIR}/${MY_P}"
+   SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz
+   verify-sig? ( 
https://pub.freerdp.com/releases/${MY_P}.tar.gz.asc )"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+   BDEPEND="verify-sig? ( sec-keys/openpgp-keys-akallabeth )"
+   VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/akallabeth.asc"
+fi
+
+DESCRIPTION="Free implementation of the Remote Desktop Protocol"
+HOMEPAGE="https://www.freerdp.com/";
+
+LICENSE="Apache-2.0"
+SLOT="3"
+IUSE="aad alsa cpu_flags_arm_neon +client cups debug +ffmpeg +fuse gstreamer 
+icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb 
valgrind wayland X xinerama xv"
+RESTRICT="!test? ( test )"
+
+BDEPEND+="
+   virtual/pkgconfig
+   app-text/docbook-xsl-stylesheets
+   dev-libs/libxslt
+"
+COMMON_DEPEND="
+   dev-libs/openssl:0=
+   sys-libs/zlib:0
+   aad? ( dev-libs/cJSON )
+   alsa? ( media-libs/alsa-lib )
+   cups? ( net-print/cups )
+   usb? (
+   virtual/libudev:0=
+   sys-apps/util-linux:0=
+   dev-libs/dbus-glib:0=
+   virtual/libusb:1=
+   )
+   X? (
+   x11-libs/libXcursor
+   x11-libs/libXext
+   x11-libs/libXi
+   x11-libs/libXrender
+   xinerama? ( x11-libs/libXinerama )
+   xv? ( x11-libs/libXv )
+   )
+   ffmpeg? ( media-video/ffmpeg:0= )
+   !ffmpeg? (
+   x11-libs/cairo:0=
+   )
+   fuse? ( sys-fs/fuse:3 )
+   gstreamer? (
+   media-libs/gstreamer:1.0
+   media-libs/gst-plugins-base:1.0
+   X? ( x11-libs/libXrandr )
+   )
+   icu? ( dev-libs/icu:0= )
+   jpeg? ( media-libs/libjpeg-turbo:0= )
+   kerberos? (

[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/, sys-apps/kexec-tools/files/

2024-08-12 Thread Mike Gilbert
commit: 7e4187530a2f735606b51db72363c24a6c85e146
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Aug 12 17:48:24 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Aug 12 17:48:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e418753

sys-apps/kexec-tools: revert systemd changes for 2.0.28

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

 sys-apps/kexec-tools/files/kexec.service   | 4 ++--
 sys-apps/kexec-tools/files/{kexec.service => kexec.service-r1} | 0
 sys-apps/kexec-tools/kexec-tools-2.0.29-r1.ebuild  | 2 +-
 sys-apps/kexec-tools/kexec-tools-.ebuild   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-apps/kexec-tools/files/kexec.service 
b/sys-apps/kexec-tools/files/kexec.service
index ce9adf0e5da2..289aae0df0b1 100644
--- a/sys-apps/kexec-tools/files/kexec.service
+++ b/sys-apps/kexec-tools/files/kexec.service
@@ -9,8 +9,8 @@ ConditionPathExists=!/nokexec
 Type=oneshot
 RemainAfterExit=yes
 EnvironmentFile=/etc/kexec.conf
-ExecStart=/usr/sbin/kexec-auto-load
-ExecStop=/usr/sbin/kexec-auto-load
+ExecStart=/usr/sbin/kexec -l /boot/${KNAME} ${KEXEC_OPT_ARGS}
+ExecStop=/usr/sbin/kexec -l /boot/${KNAME} ${KEXEC_OPT_ARGS}
 
 [Install]
 WantedBy=multi-user.target

diff --git a/sys-apps/kexec-tools/files/kexec.service 
b/sys-apps/kexec-tools/files/kexec.service-r1
similarity index 100%
copy from sys-apps/kexec-tools/files/kexec.service
copy to sys-apps/kexec-tools/files/kexec.service-r1

diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.29-r1.ebuild 
b/sys-apps/kexec-tools/kexec-tools-2.0.29-r1.ebuild
index 761057097d28..c8af4693cfed 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.29-r1.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.29-r1.ebuild
@@ -98,7 +98,7 @@ src_install() {
dosym ../kexec.conf /etc/conf.d/kexec
 
dosbin "${FILESDIR}"/kexec-auto-load
-   systemd_dounit "${FILESDIR}"/kexec.service
+   systemd_newunit "${FILESDIR}"/kexec.service-r1 kexec.service
 }
 
 pkg_postinst() {

diff --git a/sys-apps/kexec-tools/kexec-tools-.ebuild 
b/sys-apps/kexec-tools/kexec-tools-.ebuild
index 761057097d28..c8af4693cfed 100644
--- a/sys-apps/kexec-tools/kexec-tools-.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-.ebuild
@@ -98,7 +98,7 @@ src_install() {
dosym ../kexec.conf /etc/conf.d/kexec
 
dosbin "${FILESDIR}"/kexec-auto-load
-   systemd_dounit "${FILESDIR}"/kexec.service
+   systemd_newunit "${FILESDIR}"/kexec.service-r1 kexec.service
 }
 
 pkg_postinst() {



[gentoo-commits] repo/gentoo:master commit in: sys-apps/gentoo-systemd-integration/

2024-08-12 Thread Mike Gilbert
commit: b1d0d4d178b39c103adc62b68b114ae50a3c5905
Author: Filip Kobierski  pm  me>
AuthorDate: Sat Aug 10 10:35:06 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Aug 12 17:19:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1d0d4d1

sys-apps/gentoo-systemd-integration: unify versions

KEYWORDS do not come into play for the live build and now the diff is clean

Signed-off-by: Filip Kobierski  pm.me>
Signed-off-by: Mike Gilbert  gentoo.org>

 .../gentoo-systemd-integration/gentoo-systemd-integration-.ebuild   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-.ebuild 
b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-.ebuild
index 693cb5671001..0023f2d5ed9d 100644
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-.ebuild
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]]; then
inherit autotools git-r3
 else
SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz";
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="systemd integration files for Gentoo"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/gentoo-systemd-integration/

2024-08-12 Thread Mike Gilbert
commit: c985f631ac947bd97f69670f4dd3b229c4a1ceca
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Aug 12 17:18:35 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Aug 12 17:19:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c985f631

sys-apps/gentoo-systemd-integration: drop empty IUSE assignment

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

 .../gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git 
a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild 
b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild
index 0023f2d5ed9d..7f0b220760d5 100644
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2013-2023 Gentoo Authors
+# Copyright 2013-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,6 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Systemd";
 
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
 
 RDEPEND="acct-group/floppy
acct-group/usb



[gentoo-commits] repo/gentoo:master commit in: sys-apps/gentoo-systemd-integration/

2024-08-12 Thread Mike Gilbert
commit: 2759b2373cc288f09a634982691c398460dd58ab
Author: Filip Kobierski  pm  me>
AuthorDate: Sat Aug 10 10:41:10 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Aug 12 17:19:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2759b237

sys-apps/gentoo-systemd-integration: drop nonexistent blockers

After taking a look at virtual/udev I think this would be good.

Signed-off-by: Filip Kobierski  pm.me>
Closes: https://github.com/gentoo/gentoo/pull/38052
Signed-off-by: Mike Gilbert  gentoo.org>

 .../gentoo-systemd-integration/gentoo-systemd-integration-9-r1.ebuild  | 3 +--
 .../gentoo-systemd-integration/gentoo-systemd-integration-.ebuild  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git 
a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9-r1.ebuild 
b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9-r1.ebuild
index 0961e3cf6ebb..1c79af84dbd4 100644
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9-r1.ebuild
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9-r1.ebuild
@@ -22,8 +22,7 @@ SLOT="0"
 RDEPEND="acct-group/floppy
acct-group/usb
>=sys-apps/systemd-207
-   !sys-fs/eudev
-   !sys-fs/udev"
+"
 DEPEND=">=sys-apps/systemd-207"
 BDEPEND="virtual/pkgconfig"
 

diff --git 
a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-.ebuild 
b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-.ebuild
index 1c92ed516365..64e5d83af27d 100644
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-.ebuild
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-.ebuild
@@ -22,8 +22,7 @@ SLOT="0"
 RDEPEND="acct-group/floppy
acct-group/usb
>=sys-apps/systemd-207
-   !sys-fs/eudev
-   !sys-fs/udev"
+"
 DEPEND=">=sys-apps/systemd-207"
 BDEPEND="virtual/pkgconfig"
 



[gentoo-commits] repo/gentoo:master commit in: sys-apps/gentoo-systemd-integration/

2024-08-12 Thread Mike Gilbert
commit: bf08c86d83872aa12d03b25a432da17e69b236b6
Author: Filip Kobierski  pm  me>
AuthorDate: Sat Aug 10 10:36:09 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Aug 12 17:19:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf08c86d

sys-apps/gentoo-systemd-integration: bump EAPI, fix pkgcheck issues

- remove empty IUSE
- fix variable order

Signed-off-by: Filip Kobierski  pm.me>
Signed-off-by: Mike Gilbert  gentoo.org>

 ...n-.ebuild => gentoo-systemd-integration-9-r1.ebuild} | 13 ++---
 .../gentoo-systemd-integration-.ebuild  | 11 +--
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git 
a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-.ebuild 
b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9-r1.ebuild
similarity index 85%
copy from 
sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-.ebuild
copy to 
sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9-r1.ebuild
index 0023f2d5ed9d..0961e3cf6ebb 100644
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-.ebuild
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9-r1.ebuild
@@ -1,24 +1,23 @@
-# Copyright 2013-2023 Gentoo Authors
+# Copyright 2013-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit systemd udev
 
+DESCRIPTION="systemd integration files for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Systemd";
+
 if [[ ${PV} ==  ]]; then

EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-systemd-integration.git";
inherit autotools git-r3
 else
SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz";
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
-DESCRIPTION="systemd integration files for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Systemd";
-
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
 
 RDEPEND="acct-group/floppy
acct-group/usb

diff --git 
a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-.ebuild 
b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-.ebuild
index 0023f2d5ed9d..1c92ed516365 100644
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-.ebuild
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-.ebuild
@@ -1,10 +1,13 @@
-# Copyright 2013-2023 Gentoo Authors
+# Copyright 2013-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit systemd udev
 
+DESCRIPTION="systemd integration files for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Systemd";
+
 if [[ ${PV} ==  ]]; then

EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-systemd-integration.git";
inherit autotools git-r3
@@ -13,12 +16,8 @@ else
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86"
 fi
 
-DESCRIPTION="systemd integration files for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Systemd";
-
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
 
 RDEPEND="acct-group/floppy
acct-group/usb



[gentoo-commits] repo/gentoo:master commit in: sys-apps/gentoo-systemd-integration/

2024-08-12 Thread Mike Gilbert
commit: 7325414a92cad6a9bccef2269cf1af1c26edd160
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Aug 12 17:17:48 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Aug 12 17:19:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7325414a

sys-apps/gentoo-systemd-integration: remove bitbucket upstream metadata

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

 sys-apps/gentoo-systemd-integration/metadata.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sys-apps/gentoo-systemd-integration/metadata.xml 
b/sys-apps/gentoo-systemd-integration/metadata.xml
index f8eca82e557f..04301828b6ed 100644
--- a/sys-apps/gentoo-systemd-integration/metadata.xml
+++ b/sys-apps/gentoo-systemd-integration/metadata.xml
@@ -6,7 +6,4 @@
Gentoo systemd team


-   
-   mgorny/gentoo-systemd-integration
-   
 



[gentoo-commits] data/gentoo-news:master commit in: 2024-08-09-dracut-crypt/

2024-08-12 Thread Mike Gilbert
commit: 8bbc33955cb33403d7a9482734edbda747bf8132
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Aug 12 15:40:15 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Aug 12 15:40:15 2024 +
URL:https://gitweb.gentoo.org/data/gentoo-news.git/commit/?id=8bbc3395

2024-08-09-dracut-crypt: grammar fixes

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

 2024-08-09-dracut-crypt/2024-08-09-dracut-crypt.en.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/2024-08-09-dracut-crypt/2024-08-09-dracut-crypt.en.txt 
b/2024-08-09-dracut-crypt/2024-08-09-dracut-crypt.en.txt
index 06ab340..106ba6b 100644
--- a/2024-08-09-dracut-crypt/2024-08-09-dracut-crypt.en.txt
+++ b/2024-08-09-dracut-crypt/2024-08-09-dracut-crypt.en.txt
@@ -1,7 +1,7 @@
 Title: dracut module config changes
 Author: Mike Gilbert 
 Posted: 2024-08-09
-Revision: 1
+Revision: 2
 News-Item-Format: 2.0
 Display-If-Installed: sys-kernel/dracut
 
@@ -15,11 +15,11 @@ Users who use the "dracutmodules" config option to 
explicitly name all
 modules to be included may be affected if they fail to update their
 dracut configuration to include the new "systemd-cryptsetup" module.
 
-Users who have not altered the default config, or who are not using the
+Users who have not altered the default config or who are not using the
 "dracutmodules" option should not be affected.
 
 The dracut.conf(5) manual page warns against using "dracutmodules".
-Instead, the "add_dracutmodules" and "omit_dracutmodules" can be used to
+Instead, "add_dracutmodules" and "omit_dracutmodules" can be used to
 to alter the default module list with less risk of omiting modules by
 accident.
 



[gentoo-commits] data/gentoo-news:master commit in: 2024-08-09-dracut-crypt/

2024-08-09 Thread Mike Gilbert
commit: 2ccc88ba7991f9c8a2690619d4e12acf38bfc911
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Aug  6 17:03:09 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sat Aug 10 01:13:53 2024 +
URL:https://gitweb.gentoo.org/data/gentoo-news.git/commit/?id=2ccc88ba

2024-08-09-dracut-crypt.en.txt: add news item

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

 .../2024-08-09-dracut-crypt.en.txt | 26 ++
 1 file changed, 26 insertions(+)

diff --git a/2024-08-09-dracut-crypt/2024-08-09-dracut-crypt.en.txt 
b/2024-08-09-dracut-crypt/2024-08-09-dracut-crypt.en.txt
new file mode 100644
index 000..06ab340
--- /dev/null
+++ b/2024-08-09-dracut-crypt/2024-08-09-dracut-crypt.en.txt
@@ -0,0 +1,26 @@
+Title: dracut module config changes
+Author: Mike Gilbert 
+Posted: 2024-08-09
+Revision: 1
+News-Item-Format: 2.0
+Display-If-Installed: sys-kernel/dracut
+
+Starting with dracut-102, cryptsetup support for systemd has been moved
+into a separate module "systemd-cryptsetup". Under specific conditions,
+this change may cause a failure to boot. [1]
+
+Users who are not using cryptsetup at all will not be affected.
+
+Users who use the "dracutmodules" config option to explicitly name all
+modules to be included may be affected if they fail to update their
+dracut configuration to include the new "systemd-cryptsetup" module.
+
+Users who have not altered the default config, or who are not using the
+"dracutmodules" option should not be affected.
+
+The dracut.conf(5) manual page warns against using "dracutmodules".
+Instead, the "add_dracutmodules" and "omit_dracutmodules" can be used to
+to alter the default module list with less risk of omiting modules by
+accident.
+
+[1] https://bugs.gentoo.org/937326



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

2024-08-08 Thread Mike Gilbert
commit: 69b71e800a83151c77f454b00b60d20e361a3b48
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Aug  8 20:36:55 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Aug  8 20:36:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69b71e80

dev-libs/openssl: drop 3.3.1-r1

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

 dev-libs/openssl/openssl-3.3.1-r1.ebuild | 307 ---
 1 file changed, 307 deletions(-)

diff --git a/dev-libs/openssl/openssl-3.3.1-r1.ebuild 
b/dev-libs/openssl/openssl-3.3.1-r1.ebuild
deleted file mode 100644
index b12a8eb58d2a..
--- a/dev-libs/openssl/openssl-3.3.1-r1.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssl.org.asc
-inherit edo flag-o-matic linux-info toolchain-funcs
-inherit multilib multilib-minimal multiprocessing preserve-libs verify-sig
-
-DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer 
Security (TLS)"
-HOMEPAGE="https://openssl-library.org/";
-
-MY_P=${P/_/-}
-
-if [[ ${PV} ==  ]] ; then
-   EGIT_REPO_URI="https://github.com/openssl/openssl.git";
-
-   inherit git-r3
-else
-   SRC_URI="
-   
https://github.com/openssl/openssl/releases/download/${P}/${P}.tar.gz
-   verify-sig? (
-   
https://github.com/openssl/openssl/releases/download/${P}/${P}.tar.gz.asc
-   )
-   "
-
-   if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 
~s390 ~sparc ~x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-   fi
-fi
-
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0/$(ver_cut 1)" # .so version of libssl/libcrypto
-IUSE="+asm cpu_flags_x86_sse2 fips ktls +quic rfc3779 sctp static-libs test 
tls-compression vanilla verify-sig weak-ssl-ciphers"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-   !=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-"
-BDEPEND="
-   >=dev-lang/perl-5
-   sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-   test? (
-   sys-apps/diffutils
-   app-alternatives/bc
-   sys-process/procps
-   )
-   verify-sig? ( >=sec-keys/openpgp-keys-openssl-20240424 )
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-PDEPEND="app-misc/ca-certificates"
-
-MULTILIB_WRAPPED_HEADERS=(
-   /usr/include/openssl/configuration.h
-)
-
-PATCHES=(
-   # bug 936311, drop on next version bump
-   "${FILESDIR}"/${P}-riscv.patch
-   # https://bugs.gentoo.org/936793
-   "${FILESDIR}"/openssl-3.3.1-pkg-config.patch
-)
-
-pkg_setup() {
-   if use ktls ; then
-   if kernel_is -lt 4 18 ; then
-   ewarn "Kernel implementation of TLS (USE=ktls) requires 
kernel >=4.18!"
-   else
-   CONFIG_CHECK="~TLS ~TLS_DEVICE"
-   ERROR_TLS="You will be unable to offload TLS to kernel 
because CONFIG_TLS is not set!"
-   ERROR_TLS_DEVICE="You will be unable to offload TLS to 
kernel because CONFIG_TLS_DEVICE is not set!"
-   use test && CONFIG_CHECK+=" ~CRYPTO_USER_API_SKCIPHER"
-
-   linux-info_pkg_setup
-   fi
-   fi
-
-   [[ ${MERGE_TYPE} == binary ]] && return
-
-   # must check in pkg_setup; sysctl doesn't work with userpriv!
-   if use test && use sctp ; then
-   # test_ssl_new will fail with "Ensure SCTP AUTH chunks are 
enabled in kernel"
-   # if sctp.auth_enable is not enabled.
-   local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 
2>/dev/null)
-   if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 
1 ]] ; then
-   die "FEATURES=test with USE=sctp requires 
net.sctp.auth_enable=1!"
-   fi
-   fi
-}
-
-src_unpack() {
-   # Can delete this once test fix patch is dropped
-   if use verify-sig ; then
-   # Needed for downloaded patch (which is unsigned, which is fine)
-   verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
-   fi
-
-   default
-}
-
-src_prepare() {
-   # Make sure we only ever touch Makefile.org and avoid patching a file
-   # that gets blown away anyways by the Configure script in src_configure
-   rm -f Makefile || die
-
-   if ! use vanilla ; then
-   PATCHES+=(
- 

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

2024-08-08 Thread Mike Gilbert
commit: 11ac41360b39e9383a18060b713412b10f3ac785
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Aug  8 20:33:40 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Aug  8 20:34:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11ac4136

dev-libs/openssl: keyword 3.3.1-r3 for ~arm64, ~hppa, ~ppc, ~ppc64

Bug: https://bugs.gentoo.org/936268
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-libs/openssl/openssl-3.3.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/openssl/openssl-3.3.1-r3.ebuild 
b/dev-libs/openssl/openssl-3.3.1-r3.ebuild
index ede3297ccbdf..732474fcf8be 100644
--- a/dev-libs/openssl/openssl-3.3.1-r3.ebuild
+++ b/dev-libs/openssl/openssl-3.3.1-r3.ebuild
@@ -25,7 +25,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~sparc ~x86 
~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 
~s390 ~sparc ~x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
fi
 fi
 



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

2024-08-08 Thread Mike Gilbert
commit: 3099ca2858e6ddf9444eea56cf89e76b00013720
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Aug  8 16:03:06 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Aug  8 16:03:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3099ca28

net-wireless/wpa_supplicant: fix live ebuild

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

 net-wireless/wpa_supplicant/wpa_supplicant-2.10-r4.ebuild | 2 +-
 net-wireless/wpa_supplicant/wpa_supplicant-2.10-r5.ebuild | 2 +-
 net-wireless/wpa_supplicant/wpa_supplicant-.ebuild| 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r4.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r4.ebuild
index 51b2075c6830..266a66cac9f5 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r4.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r4.ebuild
@@ -124,7 +124,7 @@ src_prepare() {
 
# bug (912315)
eapply "${FILESDIR}/${PN}-2.10-allow-legacy-renegotiation.patch"
-   eapply 
"${FILESDIR}/${P}-Drop-security-level-to-0-with-OpenSSL-3.0-wh.patch"
+   eapply 
"${FILESDIR}/${PN}-2.10-Drop-security-level-to-0-with-OpenSSL-3.0-wh.patch"
 
# bug (640492)
sed -i 's#-Werror ##' wpa_supplicant/Makefile || die

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r5.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r5.ebuild
index e2f919e5221e..962459094cc1 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r5.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r5.ebuild
@@ -124,7 +124,7 @@ src_prepare() {
 
# bug (912315)
eapply "${FILESDIR}/${PN}-2.10-allow-legacy-renegotiation.patch"
-   eapply 
"${FILESDIR}/${P}-Drop-security-level-to-0-with-OpenSSL-3.0-wh.patch"
+   eapply 
"${FILESDIR}/${PN}-2.10-Drop-security-level-to-0-with-OpenSSL-3.0-wh.patch"
 
# bug (640492)
sed -i 's#-Werror ##' wpa_supplicant/Makefile || die

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
index b6b9865b98bc..b4936dfc9817 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "" ]; then
inherit git-r3
EGIT_REPO_URI="https://w1.fi/hostap.git";
 else
-   KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~sparc x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86"
SRC_URI="https://w1.fi/releases/${P}.tar.gz";
 fi
 
@@ -124,7 +124,6 @@ src_prepare() {
 
# bug (912315)
eapply "${FILESDIR}/${PN}-2.10-allow-legacy-renegotiation.patch"
-   eapply 
"${FILESDIR}/${P}-Drop-security-level-to-0-with-OpenSSL-3.0-wh.patch"
 
# bug (640492)
sed -i 's#-Werror ##' wpa_supplicant/Makefile || die



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

2024-08-04 Thread Mike Gilbert
commit: db4e9704449722571dc5e185cfe8b2846f2aba0c
Author: Brahmajit Das  gmail  com>
AuthorDate: Sun Aug  4 19:55:10 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sun Aug  4 20:58:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db4e9704

sys-block/nbd: Fix passing incompatible pointer type

Closes: https://bugs.gentoo.org/937330
Signed-off-by: Brahmajit Das  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37959
Signed-off-by: Mike Gilbert  gentoo.org>

 .../files/nbd-3.25-fix-build-on-musl-gcc14.patch   | 34 +
 sys-block/nbd/nbd-3.25-r1.ebuild   | 86 ++
 2 files changed, 120 insertions(+)

diff --git a/sys-block/nbd/files/nbd-3.25-fix-build-on-musl-gcc14.patch 
b/sys-block/nbd/files/nbd-3.25-fix-build-on-musl-gcc14.patch
new file mode 100644
index ..91828c159d76
--- /dev/null
+++ b/sys-block/nbd/files/nbd-3.25-fix-build-on-musl-gcc14.patch
@@ -0,0 +1,34 @@
+https://github.com/NetworkBlockDevice/nbd/commit/4664b8dd3bc124c27b160720113339c1da97c2c4.patch
+From: Khem Raj 
+Date: Mon, 20 May 2024 17:50:51 -0700
+Subject: [PATCH] nbd-client: Fix build on musl + gcc14
+
+GCC-14 has promoted incompatible-pointer-types warning into error which is
+now flagged especially with when building on musl
+
+Fixes following error
+
+| ../nbd-3.26.1/nbd-client.c: In function 'openunix':
+| ../nbd-3.26.1/nbd-client.c:345:27: error: passing argument 2 of 'connect' 
from incompatible pointer type [-Wincompatible-pointer-types]
+|   345 | if (connect(sock, &un_addr, sizeof(un_addr)) == -1) {
+|   |   ^~~~
+|   |   |
+|   |   struct sockaddr_un *
+| In file included from ../nbd-3.26.1/nbd-client.c:25:
+| 
/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/nbd/3.26.1/recipe-sysroot/usr/include/sys/socket.h:386:19:
 note: expected 'const struct sockaddr *' but argument is of type 'struct 
sockaddr_un *'
+|   386 | int connect (int, const struct sockaddr *, socklen_t);
+|   |   ^~~
+
+Signed-off-by: Khem Raj 
+--- a/nbd-client.c
 b/nbd-client.c
+@@ -342,7 +342,7 @@ int openunix(const char *path) {
+   return -1;
+   };
+ 
+-  if (connect(sock, &un_addr, sizeof(un_addr)) == -1) {
++  if (connect(sock, (struct sockaddr*)&un_addr, sizeof(un_addr)) == -1) {
+   err_nonfatal("CONNECT failed");
+   close(sock);
+   return -1;
+

diff --git a/sys-block/nbd/nbd-3.25-r1.ebuild b/sys-block/nbd/nbd-3.25-r1.ebuild
new file mode 100644
index ..731fdfff88c4
--- /dev/null
+++ b/sys-block/nbd/nbd-3.25-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="Userland client/server for kernel network block device"
+HOMEPAGE="https://nbd.sourceforge.io/";
+
+if [[ ${PV} ==  ]] ; then
+   inherit autotools git-r3
+   EGIT_REPO_URI="https://github.com/NetworkBlockDevice/nbd.git";
+else
+   
SRC_URI="https://github.com/NetworkBlockDevice/nbd/releases/download/${P}/${P}.tar.xz";
+   SRC_URI+=" https://downloads.sourceforge.net/nbd/${P}.tar.xz";
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 
~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug gnutls netlink zlib"
+
+RDEPEND="
+   >=dev-libs/glib-2.32.0
+   gnutls? ( >=net-libs/gnutls-2.12.0 )
+   netlink? ( >=dev-libs/libnl-3.1 )
+   zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   sys-devel/bison
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-3.25-fix-build-on-musl-gcc14.patch"
+)
+
+if [[ ${PV} ==  ]] ; then
+   BDEPEND+="
+   app-text/docbook-sgml-dtd:4.5
+   app-text/docbook-sgml-utils
+   dev-build/autoconf-archive
+   "
+fi
+
+src_prepare() {
+   default
+
+   if [[ ${PV} ==  ]] ; then
+   emake -C man -f mans.mk \
+   nbd-server.1.sh.in \
+   nbd-server.5.sh.in \
+   nbd-client.8.sh.in \
+   nbd-trdump.1.sh.in \
+   nbd-trplay.1.sh.in \
+   nbdtab.5.sh.in
+
+   emake -C systemd -f Makefile.am n...@.service.sh.in
+
+   eautoreconf
+   fi
+}
+
+src_configure() {
+   # Needs Bison
+   unset YACC
+
+   local myeconfargs=(
+   --enable-lfs
+   # https://github.com/NetworkBlockDevice/nbd/issues/149
+   --disable-gznbd
+   $(use_enable !debug sysl

[gentoo-commits] repo/gentoo:master commit in: sys-fs/quota/files/, sys-fs/quota/

2024-08-04 Thread Mike Gilbert
commit: e3a356162a1a5781b91fdd1722bb75421ac9cad0
Author: Brahmajit Das  gmail  com>
AuthorDate: Mon Jul 22 17:15:36 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sun Aug  4 20:55:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3a35616

sys-fs/quota: Fix implicit declaration of function basename

Closes: https://bugs.gentoo.org/935812
Signed-off-by: Brahmajit Das  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37675
Signed-off-by: Mike Gilbert  gentoo.org>

 .../files/quota-4.09-fix-building-on-musl.patch| 187 +
 sys-fs/quota/quota-4.09-r1.ebuild  |  86 ++
 2 files changed, 273 insertions(+)

diff --git a/sys-fs/quota/files/quota-4.09-fix-building-on-musl.patch 
b/sys-fs/quota/files/quota-4.09-fix-building-on-musl.patch
new file mode 100644
index ..5c8e0fdbb4ad
--- /dev/null
+++ b/sys-fs/quota/files/quota-4.09-fix-building-on-musl.patch
@@ -0,0 +1,187 @@
+https://sourceforge.net/p/linuxquota/code/ci/e73c5b48e12c3f02e532864a1107cdc8a4feafc3/
+From: Brahmajit Das 
+Date: Sun, 14 Jul 2024 07:58:50 +
+Subject: [PATCH 1/1] Fix building on musl
+
+basename(3) is defined in libgen.h in MUSL. Include libgen.h where
+basename(3) is used.
+
+Signed-off-by: Brahmajit Das 
+Signed-off-by: Jan Kara 
+--- a/convertquota.c
 b/convertquota.c
+@@ -14,6 +14,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include 
+ 
+--- a/edquota.c
 b/edquota.c
+@@ -20,6 +20,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include "pot.h"
+ #include "quotaops.h"
+@@ -38,7 +39,7 @@ char *progname;
+ static int flags, quotatype;
+ static int fmt = -1;
+ static char *protoname;
+-static char *dirname;
++static char *dir_name;
+ 
+ static void usage(void)
+ {
+@@ -138,7 +139,7 @@ static int parse_options(int argc, char **argv)
+ exit(1);
+ break;
+ case 'f':
+-dirname = optarg;
++dir_name = optarg;
+ break;
+ case 256:
+ flags |= FL_NUMNAMES;
+@@ -176,7 +177,7 @@ static void copy_prototype(int argc, char **argv, struct 
quota_handle **handles)
+   protoprivs = getprivs(protoid, handles, 0);
+   while (argc-- > 0) {
+   id = name2id(*argv, quotatype, !!(flags & FL_NUMNAMES), NULL);
+-  curprivs = getprivs(id, handles, !dirname);
++  curprivs = getprivs(id, handles, !dir_name);
+   if (!curprivs)
+   die(1, _("Cannot get quota information for user %s\n"), 
*argv);
+   argv++;
+@@ -223,7 +224,7 @@ int main(int argc, char **argv)
+   argv += ret;
+ 
+   init_kernel_interface();
+-  handles = create_handle_list(dirname ? 1 : 0, dirname ? &dirname : 
NULL, quotatype, fmt,
++  handles = create_handle_list(dir_name ? 1 : 0, dir_name ? &dir_name : 
NULL, quotatype, fmt,
+   (flags & FL_NO_MIXED_PATHS) ? 0 : IOI_NFS_MIXED_PATHS,
+   (flags & FL_REMOTE) ? 0 : MS_LOCALONLY);
+   if (!handles[0]) {
+@@ -296,7 +297,7 @@ int main(int argc, char **argv)
+   else {
+   for (; argc > 0; argc--, argv++) {
+   id = name2id(*argv, quotatype, !!(flags & FL_NUMNAMES), 
NULL);
+-  curprivs = getprivs(id, handles, !dirname);
++  curprivs = getprivs(id, handles, !dir_name);
+   if (!curprivs)
+   die(1, _("Cannot get quota information for user 
%s.\n"), *argv);
+   if (flags & FL_EDIT_TIMES) {
+--- a/quota.c
 b/quota.c
+@@ -20,6 +20,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #ifdef RPC
+ #include 
+ #include "rquota.h"
+--- a/quota_nld.c
 b/quota_nld.c
+@@ -26,6 +26,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ 
+--- a/quotacheck.c
 b/quotacheck.c
+@@ -19,6 +19,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include 
+ #include 
+--- a/quotaon.c
 b/quotaon.c
+@@ -13,6 +13,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include "quotaon.h"
+ #include "quota.h"
+--- a/quotastats.c
 b/quotastats.c
+@@ -24,6 +24,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include "pot.h"
+ #include "common.h"
+--- a/quotasync.c
 b/quotasync.c
+@@ -7,6 +7,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include "pot.h"
+ #include "common.h"
+--- a/repquota.c
 b/repquota.c
+@@ -18,6 +18,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include "pot.h"
+ #include "common.h"
+--- a/rquota_svc.c
 b/rquota_svc.c
+@@ -34,6 +34,7 @@
+ #include 
+ #include 
+ #

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

2024-08-04 Thread Mike Gilbert
commit: 5cf9bf27e76c0afa977c6c6e3938f4408839c003
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Aug  4 20:35:36 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sun Aug  4 20:35:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cf9bf27

sys-kernel/dracut: destabilize 102

Bug: https://bugs.gentoo.org/937326
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-kernel/dracut/dracut-102.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-kernel/dracut/dracut-102.ebuild 
b/sys-kernel/dracut/dracut-102.ebuild
index b4e798640c50..76bce478b715 100644
--- a/sys-kernel/dracut/dracut-102.ebuild
+++ b/sys-kernel/dracut/dracut-102.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} ==  ]] ; then
EGIT_REPO_URI="https://github.com/dracut-ng/dracut-ng";
 else
if [[ "${PV}" != *_rc* ]]; then
-   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc 
ppc64 ~riscv ~sparc x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips 
~ppc ~ppc64 ~riscv ~sparc ~x86"
fi

SRC_URI="https://github.com/dracut-ng/dracut-ng/archive/refs/tags/${PV}.tar.gz 
-> ${P}.tar.gz"
S="${WORKDIR}/${PN}-ng-${PV}"



[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/

2024-08-04 Thread Mike Gilbert
commit: 051ee15e6afa5f5e911874ba3c4e1d3d41d66160
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Aug  4 15:27:50 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sun Aug  4 15:27:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=051ee15e

sys-boot/grub: mention sys-fs/mtools in optfeature

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

 sys-boot/grub/grub-2.12-r4.ebuild | 2 +-
 sys-boot/grub/grub-.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-boot/grub/grub-2.12-r4.ebuild 
b/sys-boot/grub/grub-2.12-r4.ebuild
index 66b37086f92f..5ce4953d88c4 100644
--- a/sys-boot/grub/grub-2.12-r4.ebuild
+++ b/sys-boot/grub/grub-2.12-r4.ebuild
@@ -334,7 +334,7 @@ pkg_postinst() {
else
elog
optfeature "detecting other operating systems (grub-mkconfig)" 
sys-boot/os-prober
-   optfeature "creating rescue media (grub-mkrescue)" 
dev-libs/libisoburn
+   optfeature "creating rescue media (grub-mkrescue)" 
dev-libs/libisoburn sys-fs/mtools
optfeature "enabling RAID device detection" sys-fs/mdadm
optfeature "automatically updating GRUB's configuration on each 
kernel installation" "sys-kernel/installkernel[grub]"
fi

diff --git a/sys-boot/grub/grub-.ebuild b/sys-boot/grub/grub-.ebuild
index 1061d6ebe58d..f007f3aaa884 100644
--- a/sys-boot/grub/grub-.ebuild
+++ b/sys-boot/grub/grub-.ebuild
@@ -331,7 +331,7 @@ pkg_postinst() {
else
elog
optfeature "detecting other operating systems (grub-mkconfig)" 
sys-boot/os-prober
-   optfeature "creating rescue media (grub-mkrescue)" 
dev-libs/libisoburn
+   optfeature "creating rescue media (grub-mkrescue)" 
dev-libs/libisoburn sys-fs/mtools
optfeature "enabling RAID device detection" sys-fs/mdadm
optfeature "automatically updating GRUB's configuration on each 
kernel installation" "sys-kernel/installkernel[grub]"
fi



[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/files/

2024-08-04 Thread Mike Gilbert
commit: 81e838bcee091ab342610d59feac08954a7667e1
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Aug  4 15:06:03 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sun Aug  4 15:06:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81e838bc

sys-boot/grub: update GRUB_GFXMODE description

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

 sys-boot/grub/files/grub.default-4 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-boot/grub/files/grub.default-4 
b/sys-boot/grub/files/grub.default-4
index 35d3060137a9..74f5d10aea3b 100644
--- a/sys-boot/grub/files/grub.default-4
+++ b/sys-boot/grub/files/grub.default-4
@@ -34,9 +34,9 @@ GRUB_DISTRIBUTOR="Gentoo"
 # Uncomment to disable graphical terminal (grub-pc only)
 #GRUB_TERMINAL=console
 
-# The resolution used on graphical terminal.
-# Note that you can use only modes which your graphic card supports via VBE.
-# You can see them in real GRUB with the command `vbeinfo'.
+# Resolution used on graphical terminal.
+# The list of valid modes may be obtained using the 'vbeinfo' (PC BIOS) or
+# 'videoinfo' (EFI) command from a GRUB boot prompt.
 #GRUB_GFXMODE=640x480
 
 # Set to 'text' to force the Linux kernel to boot in normal text



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

2024-08-03 Thread Mike Gilbert
commit: dbda29cd2dc296ccf0e2a92de7001b0f3a0abe3d
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Aug  3 16:50:01 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sat Aug  3 16:53:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbda29cd

net-misc/telnet-bsd: add blocker net-misc/inetutils

Bug: https://bugs.gentoo.org/927455
Signed-off-by: Mike Gilbert  gentoo.org>

 .../telnet-bsd/{telnet-bsd-1.2-r4.ebuild => telnet-bsd-1.2-r5.ebuild} | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net-misc/telnet-bsd/telnet-bsd-1.2-r4.ebuild 
b/net-misc/telnet-bsd/telnet-bsd-1.2-r5.ebuild
similarity index 91%
rename from net-misc/telnet-bsd/telnet-bsd-1.2-r4.ebuild
rename to net-misc/telnet-bsd/telnet-bsd-1.2-r5.ebuild
index 582837e7ab7c..1a89db5b5c43 100644
--- a/net-misc/telnet-bsd/telnet-bsd-1.2-r4.ebuild
+++ b/net-misc/telnet-bsd/telnet-bsd-1.2-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,6 +23,8 @@ RDEPEND="
selinux? ( sec-policy/selinux-telnet )
xinetd? ( sys-apps/xinetd )
!net-misc/netkit-telnetd
+   !net-misc/inetutils[telnet(-)]
+   !net-misc/inetutils[telnetd(-)]
 "
 BDEPEND="virtual/pkgconfig"
 



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

2024-08-03 Thread Mike Gilbert
commit: 56a5542fdf10edc16fb1984ae0d02b5caff2124c
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Aug  3 16:48:03 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sat Aug  3 16:53:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56a5542f

net-misc/inetutils: add blockers for telnetd

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

 net-misc/inetutils/{inetutils-2.5.ebuild => inetutils-2.5-r1.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-misc/inetutils/inetutils-2.5.ebuild 
b/net-misc/inetutils/inetutils-2.5-r1.ebuild
similarity index 97%
rename from net-misc/inetutils/inetutils-2.5.ebuild
rename to net-misc/inetutils/inetutils-2.5-r1.ebuild
index adc14e092684..3ebcf02e40ee 100644
--- a/net-misc/inetutils/inetutils-2.5.ebuild
+++ b/net-misc/inetutils/inetutils-2.5-r1.ebuild
@@ -40,6 +40,7 @@ RDEPEND="${DEPEND}
rsh? ( !net-misc/netkit-rsh )
logger? ( !sys-apps/util-linux[logger(+)] )
telnet? ( !net-misc/telnet-bsd !net-misc/netkit-telnetd )
+   telnetd? ( !net-misc/telnet-bsd !net-misc/netkit-telnetd )
tftp? ( !net-ftp/tftp-hpa )
whois? ( !net-misc/whois )
ifconfig? ( !sys-apps/net-tools )



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

2024-08-03 Thread Mike Gilbert
commit: b71454957dca853f5298fe8aa5f2d8d4e61c3058
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Aug  3 16:51:15 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sat Aug  3 16:53:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7145495

net-misc/netkit-telnetd: add blocker on net-misc/inetutils

Bug: https://bugs.gentoo.org/927455
Signed-off-by: Mike Gilbert  gentoo.org>

 ...{netkit-telnetd-0.17-r13.ebuild => netkit-telnetd-0.17-r14.ebuild} | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild 
b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r14.ebuild
similarity index 94%
rename from net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild
rename to net-misc/netkit-telnetd/netkit-telnetd-0.17-r14.ebuild
index 1cdb22da14b8..e4c30a44260e 100644
--- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -21,6 +21,8 @@ IUSE="selinux"
 DEPEND="
>=sys-libs/ncurses-5.2:=
!net-misc/telnet-bsd
+   !net-misc/inetutils[telnet(-)]
+   !net-misc/inetutils[telnetd(-)]
 "
 RDEPEND="
${DEPEND}



[gentoo-commits] repo/gentoo:master commit in: net-p2p/transmission-remote-gtk/

2024-08-03 Thread Mike Gilbert
commit: 8013f56419c69aa8d6af613565ef85fc9f85a7a4
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Aug  3 16:15:24 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sat Aug  3 16:15:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8013f564

net-p2p/transmission-remote-gtk: restore geoip USE flag

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

 net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.6.0.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.6.0.ebuild 
b/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.6.0.ebuild
index 61711172f8f8..722a196e1260 100644
--- a/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.6.0.ebuild
+++ b/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.6.0.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz";
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="appindicator debug geoip libproxy rss"
+IUSE="appindicator geoip"
 
 # RESTRICT="test"
 
@@ -23,6 +23,7 @@ RDEPEND="
>=dev-libs/json-glib-1.2.8
>=x11-libs/gtk+-3.22:3
appindicator? ( dev-libs/libayatana-appindicator )
+   geoip? ( dev-libs/geoip )
 "
 DEPEND="${RDEPEND}
 "
@@ -33,6 +34,7 @@ BDEPEND="
 
 src_configure() {
local emesonargs=(
+   $(meson_feature geoip)
$(meson_feature appindicator libappindicator)
)
meson_src_configure



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

2024-08-03 Thread Mike Gilbert
commit: f19ef2f7dee67f10f752038bf9b65a169ba9f6be
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Aug  3 16:09:25 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sat Aug  3 16:09:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f19ef2f7

sys-libs/efivar: update EAPI 7 -> 8

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

 sys-libs/efivar/efivar-39.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/efivar/efivar-39.ebuild b/sys-libs/efivar/efivar-39.ebuild
index be7185d01a41..a88ff714f25d 100644
--- a/sys-libs/efivar/efivar-39.ebuild
+++ b/sys-libs/efivar/efivar-39.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2014-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 



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

2024-08-03 Thread Mike Gilbert
commit: 7890c9c28a2f7e3531232bf115c409bcbe0d2b12
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Aug  3 16:08:03 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sat Aug  3 16:08:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7890c9c2

sys-libs/efivar: add 39

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

 sys-libs/efivar/Manifest |  1 +
 sys-libs/efivar/efivar-39.ebuild | 70 
 sys-libs/efivar/metadata.xml |  2 +-
 3 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/sys-libs/efivar/Manifest b/sys-libs/efivar/Manifest
index 70de2f8e537c..afd23f75ab3c 100644
--- a/sys-libs/efivar/Manifest
+++ b/sys-libs/efivar/Manifest
@@ -1 +1,2 @@
 DIST efivar-38.tar.bz2 320221 BLAKE2B 
0b96f3d71ddc2246e6a11a5cd32af3d007823c4a283186a428c3f145cd74425a31bd22c4671ad1ab252a3c572991bb1698381cb8bdf51efcbebd62befdc6c070
 SHA512 
c2f17297c863ece134a9dd758d237fd2df8c8d072f87af1d0bf2bcf9acfc7a53c25597f03fd4fb8cc664b205743d4ffa0ef1b068d0f73c58fa573d40993f3155
+DIST efivar-39.tar.gz 463349 BLAKE2B 
73ea4b3293cd708923bcd4332a8c7a5a8bbf539d81300c502a764a2ac205ba7cdf1e30b3432c42a101f56c0b6e31af2907a6a38ada69ace3b0d60e90515094cd
 SHA512 
04493c30efbfc2773abac9a3dd93aa13403c05e29e3bfc72877d2054930811fae99119aadcb1729b6ca85abf5a24db786ea0c27c16d5458ef1b19e74696f5ff7

diff --git a/sys-libs/efivar/efivar-39.ebuild b/sys-libs/efivar/efivar-39.ebuild
new file mode 100644
index ..be7185d01a41
--- /dev/null
+++ b/sys-libs/efivar/efivar-39.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2014-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Tools and library to manipulate EFI variables"
+HOMEPAGE="https://github.com/rhboot/efivar";
+SRC_URI="https://github.com/rhboot/efivar/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+   app-text/mandoc
+   test? ( sys-boot/grub:2 )
+"
+RDEPEND="
+   dev-libs/popt
+"
+DEPEND="${RDEPEND}
+   >=sys-kernel/linux-headers-3.18
+   virtual/pkgconfig
+"
+
+src_prepare() {
+   local PATCHES=(
+   # Rejected upstream, keep this for ia64 support
+   "${FILESDIR}"/efivar-38-ia64-relro.patch
+   )
+   default
+}
+
+src_configure() {
+   unset CROSS_COMPILE
+   export COMPILER=$(tc-getCC)
+   export HOSTCC=$(tc-getBUILD_CC)
+
+   tc-ld-disable-gold
+
+   export libdir="/usr/$(get_libdir)"
+
+   # https://bugs.gentoo.org/562004
+   unset LIBS
+
+   # Avoid -Werror
+   export ERRORS=
+
+   if [[ -n ${GCC_SPECS} ]]; then
+   # The environment overrides the command line.
+   GCC_SPECS+=":${S}/src/include/gcc.specs"
+   fi
+
+   # Used by tests/Makefile
+   export GRUB_PREFIX=grub
+}
+
+src_compile() {
+   # HOST_MARCH: https://bugs.gentoo.org/831334
+   emake HOST_MARCH=
+}
+
+src_test() {
+   # https://bugs.gentoo.org/924370
+   emake -j1 test
+}

diff --git a/sys-libs/efivar/metadata.xml b/sys-libs/efivar/metadata.xml
index 0a27d363fed2..09743f0f8998 100644
--- a/sys-libs/efivar/metadata.xml
+++ b/sys-libs/efivar/metadata.xml
@@ -6,6 +6,6 @@
Mike Gilbert


-   rhinstaller/efivar
+   rhboot/efivar

 



[gentoo-commits] repo/gentoo:master commit in: net-p2p/transmission-remote-gtk/

2024-08-03 Thread Mike Gilbert
commit: ba50e01f3baafb652eadf359b7eca14788c8924a
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Aug  3 15:49:32 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sat Aug  3 15:49:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba50e01f

net-p2p/transmission-remote-gtk: add 1.6.0

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

 net-p2p/transmission-remote-gtk/Manifest   |  1 +
 .../transmission-remote-gtk-1.6.0.ebuild   | 39 ++
 2 files changed, 40 insertions(+)

diff --git a/net-p2p/transmission-remote-gtk/Manifest 
b/net-p2p/transmission-remote-gtk/Manifest
index 1826905e5f79..f87ca32dae61 100644
--- a/net-p2p/transmission-remote-gtk/Manifest
+++ b/net-p2p/transmission-remote-gtk/Manifest
@@ -1 +1,2 @@
 DIST transmission-remote-gtk-1.5.1.tar.xz 236804 BLAKE2B 
b2aeb4641a0ab55d2a212cdb04e8929c8c580e2f20a9a60fce7977404d1f0af64b5fc9ff2f9d7dd7d5744dddc34181d689c8dcab34cc23a0989a7e7f03d84395
 SHA512 
4488714f483dfbf539e39dc4b742127dc47799b255e7bc0e27c33aea92cea26d229616a484b566f5d85034d841a34546b113fc0428908ada4876840ff25cc824
+DIST transmission-remote-gtk-1.6.0.tar.xz 216648 BLAKE2B 
256eee24f8060b526e6a7c7176c89e3d95451d28a684621d93100d245a6d62e3fc7a21e6e2de5ff1837d165113c2dc97ac6bf60b7e57da930636ea56e264c26c
 SHA512 
351079d91cc5b33c7955103cbc28d1010bf3d18668689ff5b690ff2214d9e44cdd9f841ebe207260d31c332650d6ae05a0d9ceb7696861c8be5beeae4d0a08d5

diff --git 
a/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.6.0.ebuild 
b/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.6.0.ebuild
new file mode 100644
index ..61711172f8f8
--- /dev/null
+++ b/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.6.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+DESCRIPTION="GTK+ client for management of the Transmission BitTorrent client, 
over HTTP RPC"
+HOMEPAGE="https://github.com/transmission-remote-gtk/transmission-remote-gtk";
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz";
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="appindicator debug geoip libproxy rss"
+
+# RESTRICT="test"
+
+# FIXME: bundles rss-glib-0.2.3
+RDEPEND="
+   net-libs/libsoup:3.0
+   >=dev-libs/glib-2.70:2
+   >=dev-libs/json-glib-1.2.8
+   >=x11-libs/gtk+-3.22:3
+   appindicator? ( dev-libs/libayatana-appindicator )
+"
+DEPEND="${RDEPEND}
+"
+BDEPEND="
+   sys-devel/gettext
+   virtual/pkgconfig
+"
+
+src_configure() {
+   local emesonargs=(
+   $(meson_feature appindicator libappindicator)
+   )
+   meson_src_configure
+}



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

2024-07-28 Thread Mike Gilbert
commit: 06a2a7a940e40c6057924e633c1504fd3e0292c8
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Jul 28 17:01:23 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sun Jul 28 17:01:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06a2a7a9

dev-libs/openssl: fix Libs.private in libcrypto.pc

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

 .../openssl/files/openssl-3.3.1-pkg-config.patch   | 31 ++
 ...penssl-3.3.1.ebuild => openssl-3.3.1-r1.ebuild} |  2 ++
 2 files changed, 33 insertions(+)

diff --git a/dev-libs/openssl/files/openssl-3.3.1-pkg-config.patch 
b/dev-libs/openssl/files/openssl-3.3.1-pkg-config.patch
new file mode 100644
index ..b915b963509a
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-3.3.1-pkg-config.patch
@@ -0,0 +1,31 @@
+https://github.com/openssl/openssl/pull/25018
+https://bugs.gentoo.org/936793
+
+From b7bd618fb12728b4a85b9159af95ca40a817674d Mon Sep 17 00:00:00 2001
+From: Richard Levitte 
+Date: Sun, 28 Jul 2024 10:47:08 +0200
+Subject: [PATCH] fix: util/mkinstallvars.pl mistreated LDLIBS on Unix (and
+ Windows)
+
+Don't do comma separation on those platforms.
+
+Fixes #24986
+---
+ util/mkinstallvars.pl | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/util/mkinstallvars.pl b/util/mkinstallvars.pl
+index 5fadb708e1b77..e2b7d9d08321f 100644
+--- a/util/mkinstallvars.pl
 b/util/mkinstallvars.pl
+@@ -124,7 +124,9 @@ package OpenSSL::safe::installdata;
+ our \$VERSION= '$ENV{VERSION}';
+ our \@LDLIBS =
+ # Unix and Windows use space separation, VMS uses comma separation
+-split(/ +| *, */, '$ENV{LDLIBS}');
++\$^O eq 'VMS'
++? split(/ *, */, '$ENV{LDLIBS}')
++: split(/ +/, '$ENV{LDLIBS}');
+ 
+ 1;
+ _

diff --git a/dev-libs/openssl/openssl-3.3.1.ebuild 
b/dev-libs/openssl/openssl-3.3.1-r1.ebuild
similarity index 99%
rename from dev-libs/openssl/openssl-3.3.1.ebuild
rename to dev-libs/openssl/openssl-3.3.1-r1.ebuild
index 18c0067df4fc..b91bebbeb911 100644
--- a/dev-libs/openssl/openssl-3.3.1.ebuild
+++ b/dev-libs/openssl/openssl-3.3.1-r1.ebuild
@@ -59,6 +59,8 @@ MULTILIB_WRAPPED_HEADERS=(
 PATCHES=(
# bug 936311, drop on next version bump
"${FILESDIR}"/${P}-riscv.patch
+   # https://bugs.gentoo.org/936793
+   "${FILESDIR}"/openssl-3.3.1-pkg-config.patch
 )
 
 pkg_setup() {



[gentoo-commits] repo/gentoo:master commit in: sys-apps/pciutils/files/

2024-07-27 Thread Mike Gilbert
commit: 12ec26086c33c4f620a9b8a2819b1953c986a8f6
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Jul 27 14:48:21 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sat Jul 27 14:49:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12ec2608

sys-apps/pciutils: remove dead link

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

 sys-apps/pciutils/files/conf.d-pciparm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sys-apps/pciutils/files/conf.d-pciparm 
b/sys-apps/pciutils/files/conf.d-pciparm
index f036b15ad20c..a1b08764187a 100644
--- a/sys-apps/pciutils/files/conf.d-pciparm
+++ b/sys-apps/pciutils/files/conf.d-pciparm
@@ -1,6 +1,3 @@
-# PCI tweaking article:
-# http://www.gentoo.org/doc/en/articles/hardware-stability-p2.xml
-#
 # Apply to all devices:
 # PCIPARM_ALL=""
 # Cards also can be addressed by vid:pid or by bus:slot.func



[gentoo-commits] repo/gentoo:master commit in: sys-process/audit/

2024-07-23 Thread Mike Gilbert
commit: 6338a5570e393dd912cd207035b4704868f68821
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Jul 23 16:08:19 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Tue Jul 23 16:08:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6338a557

sys-process/audit: set localstatedir=/var and runstatedir=/run

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

 sys-process/audit/{audit-4.0.1.ebuild => audit-4.0.1-r1.ebuild} | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys-process/audit/audit-4.0.1.ebuild 
b/sys-process/audit/audit-4.0.1-r1.ebuild
similarity index 98%
rename from sys-process/audit/audit-4.0.1.ebuild
rename to sys-process/audit/audit-4.0.1-r1.ebuild
index fead7ccba13f..0757b5e9644a 100644
--- a/sys-process/audit/audit-4.0.1.ebuild
+++ b/sys-process/audit/audit-4.0.1-r1.ebuild
@@ -72,6 +72,8 @@ src_prepare() {
 multilib_src_configure() {
local myeconfargs=(
--sbindir="${EPREFIX}"/sbin
+   --localstatedir="${EPREFIX}"/var
+   --runstatedir="${EPREFIX}"/run
$(use_enable gssapi gssapi-krb5)
$(use_enable ldap zos-remote)
$(use_enable static-libs static)



[gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/, net-misc/freerdp/files/

2024-07-23 Thread Mike Gilbert
commit: ce00779b11562ced94ae12e97007830e32cac4f6
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Jul 23 14:23:26 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Tue Jul 23 14:23:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce00779b

net-misc/freerdp: backport build fix

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

 .../freerdp/files/freerdp-3.6.3-backports.patch| 224 +
 net-misc/freerdp/freerdp-3.6.3.ebuild  |   4 +
 2 files changed, 228 insertions(+)

diff --git a/net-misc/freerdp/files/freerdp-3.6.3-backports.patch 
b/net-misc/freerdp/files/freerdp-3.6.3-backports.patch
new file mode 100644
index ..473b27cbab02
--- /dev/null
+++ b/net-misc/freerdp/files/freerdp-3.6.3-backports.patch
@@ -0,0 +1,224 @@
+https://bugs.gentoo.org/936406
+https://github.com/FreeRDP/FreeRDP/pull/10410
+
+From 776083234b61224f8e3412c31be406b11509b7db Mon Sep 17 00:00:00 2001
+From: akallabeth 
+Date: Tue, 23 Jul 2024 09:14:04 +0200
+Subject: [PATCH 1/2] [warnings] fix unused-but-set-variable
+
+---
+ channels/parallel/client/parallel_main.c | 4 
+ channels/printer/client/printer_main.c   | 2 ++
+ channels/serial/client/serial_main.c | 4 
+ channels/tsmf/client/tsmf_media.c| 2 +-
+ channels/urbdrc/client/data_transfer.c   | 3 +--
+ libfreerdp/core/gateway/tsg.c| 3 +--
+ libfreerdp/core/heartbeat.c  | 3 +--
+ libfreerdp/gdi/gfx.c | 7 ++-
+ winpr/libwinpr/ncrypt/ncrypt_pkcs11.c| 3 ---
+ 9 files changed, 16 insertions(+), 15 deletions(-)
+
+diff --git a/channels/parallel/client/parallel_main.c 
b/channels/parallel/client/parallel_main.c
+index ce574b87b084..4be078693870 100644
+--- a/channels/parallel/client/parallel_main.c
 b/channels/parallel/client/parallel_main.c
+@@ -160,6 +160,8 @@ static UINT parallel_process_irp_read(PARALLEL_DEVICE* 
parallel, IRP* irp)
+   return ERROR_INVALID_DATA;
+   Stream_Read_UINT32(irp->input, Length);
+   Stream_Read_UINT64(irp->input, Offset);
++  (void)Offset; /* [MS-RDPESP] 3.2.5.1.4 Processing a Server Read Request 
Message
++ * ignored */
+   buffer = (BYTE*)calloc(Length, sizeof(BYTE));
+ 
+   if (!buffer)
+@@ -220,6 +222,8 @@ static UINT parallel_process_irp_write(PARALLEL_DEVICE* 
parallel, IRP* irp)
+ 
+   Stream_Read_UINT32(irp->input, Length);
+   Stream_Read_UINT64(irp->input, Offset);
++  (void)Offset; /* [MS-RDPESP] 3.2.5.1.5 Processing a Server Write 
Request Message
++ * ignore offset */
+   if (!Stream_SafeSeek(irp->input, 20)) /* Padding */
+   return ERROR_INVALID_DATA;
+   const void* ptr = Stream_ConstPointer(irp->input);
+diff --git a/channels/printer/client/printer_main.c 
b/channels/printer/client/printer_main.c
+index 8d11f9b5ccd3..c458c0fdcfca 100644
+--- a/channels/printer/client/printer_main.c
 b/channels/printer/client/printer_main.c
+@@ -515,6 +515,8 @@ static UINT printer_process_irp_write(PRINTER_DEVICE* 
printer_dev, IRP* irp)
+   return ERROR_INVALID_DATA;
+   Stream_Read_UINT32(irp->input, Length);
+   Stream_Read_UINT64(irp->input, Offset);
++  (void)Offset; /* [MS-RDPEPC] 2.2.2.9 Server Printer Write Request 
(DR_PRN_WRITE_REQ)
++ * reserved for future use, ignore */
+   Stream_Seek(irp->input, 20); /* Padding */
+   const void* ptr = Stream_ConstPointer(irp->input);
+   if (!Stream_SafeSeek(irp->input, Length))
+diff --git a/channels/serial/client/serial_main.c 
b/channels/serial/client/serial_main.c
+index 22f799a16ba6..c98a27ea9040 100644
+--- a/channels/serial/client/serial_main.c
 b/channels/serial/client/serial_main.c
+@@ -241,6 +241,8 @@ static UINT serial_process_irp_read(SERIAL_DEVICE* serial, 
IRP* irp)
+ 
+   Stream_Read_UINT32(irp->input, Length); /* Length (4 bytes) */
+   Stream_Read_UINT64(irp->input, Offset); /* Offset (8 bytes) */
++  (void)Offset; /* [MS-RDPESP] 3.2.5.1.4 Processing a Server Read Request 
Message
++ * ignored */
+   Stream_Seek(irp->input, 20);/* Padding (20 bytes) */
+   buffer = (BYTE*)calloc(Length, sizeof(BYTE));
+ 
+@@ -301,6 +303,8 @@ static UINT serial_process_irp_write(SERIAL_DEVICE* 
serial, IRP* irp)
+ 
+   Stream_Read_UINT32(irp->input, Length); /* Length (4 bytes) */
+   Stream_Read_UINT64(irp->input, Offset); /* Offset (8 bytes) */
++  (void)Offset; /* [MS-RDPESP] 3.2.5.1.4 Processing a Server Read Request 
Message
++ * ignored */
+   if (!Stream_SafeSeek(irp->input, 20))   /* Padding (20 bytes) */
+   return ERROR_INVALID_DATA;
+ 
+diff --git a/channels/tsmf/client/tsmf_media.c 
b/channels/tsmf/client/tsmf_media.c
+index 5f47090ae37b..b20db415944d 100644
+--- a/channels/tsmf/

[gentoo-commits] proj/pax-utils:master commit in: /

2024-07-22 Thread Mike Gilbert
commit: a9440d0bf71c665aea026a7c06603bca2c80ae75
Author: Mathias Krause  grsecurity  net>
AuthorDate: Tue Jan 23 10:12:20 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Jul 22 21:05:57 2024 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=a9440d0b

seccomp: make socket() fail with -ENOSYS

At least Debian's glibc tries to make use of nscd by default leading to
the getpwuid() / getpwnam() calls in pspax trying to open up a local
connection to /var/run/nscd/socket. Neither socket() nor connect() are
allowed by the seccomp policy, leading to unavoidable killing of the
process:

  $ pspax
  USER PIDPAXMAPS ETYPE  NAME CAPS ATTR
  Bad system call (core dumped)

  $ strace pspax |& tail -3
  newfstatat(4, "stat", {st_mode=S_IFREG|0444, st_size=0, ...}, 
AT_SYMLINK_NOFOLLOW) = 0
  socket(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0) = 41
  +++ killed by SIGSYS (core dumped) +++

Fix this by making socket() fail with -ENOSYS instead:

  $ strace -e trace=socket ./build/pspax >/dev/null
  socket(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0) = -1 ENOSYS 
(Function not implemented)
  socket(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0) = -1 ENOSYS 
(Function not implemented)
  +++ exited with 0 +++

Signed-off-by: Mathias Krause  grsecurity.net>
Signed-off-by: Mike Gilbert  gentoo.org>

 seccomp-bpf.c | 16 +
 seccomp-bpf.h | 76 +--
 2 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/seccomp-bpf.c b/seccomp-bpf.c
index b56e9e4..5d34f33 100644
--- a/seccomp-bpf.c
+++ b/seccomp-bpf.c
@@ -10,6 +10,7 @@
 const char argv0[] = "seccomp-bpf";
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -49,7 +50,7 @@ static const struct {
 };
 
 /* Simple helper to add all of the syscalls in an array. */
-static int gen_seccomp_rules_add(scmp_filter_ctx ctx, const int syscalls[], 
size_t num)
+static int gen_seccomp_rules_add(scmp_filter_ctx ctx, const int syscalls[], 
size_t num, uint32_t action)
 {
static uint8_t prio;
size_t i;
@@ -58,14 +59,14 @@ static int gen_seccomp_rules_add(scmp_filter_ctx ctx, const 
int syscalls[], size
warn("seccomp_syscall_priority failed");
return -1;
}
-   if (seccomp_rule_add(ctx, SCMP_ACT_ALLOW, syscalls[i], 0) < 0) {
+   if (seccomp_rule_add(ctx, action, syscalls[i], 0) < 0) {
warn("seccomp_rule_add failed");
return -1;
}
}
return 0;
 }
-#define gen_seccomp_rules_add(ctx, syscalls) gen_seccomp_rules_add(ctx, 
syscalls, ARRAY_SIZE(syscalls))
+#define gen_seccomp_rules_add(ctx, syscalls, action) 
gen_seccomp_rules_add(ctx, syscalls, ARRAY_SIZE(syscalls), action)
 
 static void gen_seccomp_dump(scmp_filter_ctx ctx, const char *name)
 {
@@ -209,6 +210,9 @@ int main(void)
SCMP_SYS(waitid),
SCMP_SYS(waitpid),
};
+   static const int soft_error_syscalls[] = {
+   SCMP_SYS(socket),
+   };
 
/* TODO: Handle debug and KILL vs TRAP. */
 
@@ -241,11 +245,13 @@ int main(void)
printf("/* %s */\n", gen_seccomp_arches[i].name);
printf("#define SECCOMP_BPF_AVAILABLE\n");
 
-   if (gen_seccomp_rules_add(ctx, base_syscalls) < 0)
+   if (gen_seccomp_rules_add(ctx, base_syscalls, SCMP_ACT_ALLOW) < 
0)
+   err(1, "seccomp_rules_add failed");
+   if (gen_seccomp_rules_add(ctx, soft_error_syscalls, 
SCMP_ACT_ERRNO(ENOSYS)) < 0)
err(1, "seccomp_rules_add failed");
gen_seccomp_dump(ctx, "base");
 
-   if (gen_seccomp_rules_add(ctx, fork_syscalls) < 0)
+   if (gen_seccomp_rules_add(ctx, fork_syscalls, SCMP_ACT_ALLOW) < 
0)
err(1, "seccomp_rules_add failed");
gen_seccomp_dump(ctx, "fork");
 

diff --git a/seccomp-bpf.h b/seccomp-bpf.h
index 80d6d94..9f9c578 100644
--- a/seccomp-bpf.h
+++ b/seccomp-bpf.h
@@ -8,10 +8,10 @@
 /* AARCH64 */
 #define SECCOMP_BPF_AVAILABLE
 static const unsigned char seccomp_bpf_blks_base[] = {
-   
32,0,0,0,4,0,0,0,21,0,0,45,183,0,0,192,32,0,0,0,0,0,0,0,21,0,42,0,233,0,0,0,21,0,41,0,22,1,0,0,21,0,40,0,192,0,0,0,21,0,39,0,193,0,0,0,21,0,38,0,190,0,0,0,21,0,37,0,189,0,0,0,21,0,36,0,188,0,0,0,21,0,35,0,186,0,0,0,21,0,34,0,17,0,0,0,21,0,33,0,78,0,0,0,21,0,32,0,98,0,0,0,21,0,31,0,226,0,0,0,21,0,30,0,62,0,0,0,21,0,29,0,29,0,0,0,21,0,28,0,178,0,0,0,21,0,2

[gentoo-commits] proj/pax-utils:master commit in: /, tests/pspax/

2024-07-22 Thread Mike Gilbert
commit: 66417851bbfc2266513774e59aa32b36469a756b
Author: Mathias Krause  grsecurity  net>
AuthorDate: Tue Jan 23 11:17:18 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Jul 22 21:06:05 2024 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=66417851

tests: add basic pspax test

Add a basic test that simply makes sure pspax executes just fine, i.e.
doesn't get killed by the seccomp policy.

Signed-off-by: Mathias Krause  grsecurity.net>
Signed-off-by: Mike Gilbert  gentoo.org>

 meson.build |  1 +
 tests/pspax/dotest  | 12 
 tests/pspax/meson.build |  8 
 3 files changed, 21 insertions(+)

diff --git a/meson.build b/meson.build
index 319e3de..64fcc14 100644
--- a/meson.build
+++ b/meson.build
@@ -140,6 +140,7 @@ meson.add_dist_script('meson-build-dist-man.sh')
 do_tests = get_option('tests')
 if do_tests
   subdir('tests/lddtree')
+  subdir('tests/pspax')
   subdir('tests/scanelf')
   subdir('tests/source')
 endif

diff --git a/tests/pspax/dotest b/tests/pspax/dotest
new file mode 100755
index 000..f2ccc98
--- /dev/null
+++ b/tests/pspax/dotest
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+. "${0%/*}"/../lib.sh
+
+#
+# simple pspax execution check
+#
+${MESON_EXE_WRAPPER} sh -c "${builddir}/pspax" >/dev/null \
+   2> "${builddir}"/pspax.err
+testit pspax.err
+
+exit ${ret}

diff --git a/tests/pspax/meson.build b/tests/pspax/meson.build
new file mode 100644
index 000..a00a96d
--- /dev/null
+++ b/tests/pspax/meson.build
@@ -0,0 +1,8 @@
+test('pspax-test', files('dotest'),
+  workdir : meson.current_source_dir(),
+  env : {
+'builddir' : meson.project_build_root(),
+'srcdir' : meson.project_source_root(),
+'current_srcdir' : meson.current_source_dir(),
+  }
+)



[gentoo-commits] proj/pax-utils:master commit in: /

2024-07-22 Thread Mike Gilbert
commit: b16cce4ad0cb04e407252ab2f37331cd4bf3b19d
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Jul 22 20:03:13 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Jul 22 20:08:09 2024 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=b16cce4a

make-seccomp-filters.sh: split cflags/ldflags for libseccomp

Resolves a link failure with -Wl,--as-needed.
Thanks to Mathias Krause for noticing the problem.

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

 make-seccomp-filters.sh | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/make-seccomp-filters.sh b/make-seccomp-filters.sh
index 124646a..762670f 100755
--- a/make-seccomp-filters.sh
+++ b/make-seccomp-filters.sh
@@ -4,10 +4,12 @@ set -ufe
 >&2 echo YOU DO NOT NEED TO RUN IT UNLESS YOU EDITED seccomp-bpf.c
 
 : "${CC:=gcc}"
-: "${CCFLAGS:=$(pkg-config --cflags --libs libseccomp)}"
+: "${PKG_CONFIG:=pkg-config}"
+: "${SECCOMP_CFLAGS:=$(${PKG_CONFIG} --cflags libseccomp)}"
+: "${SECCOMP_LIBS:=$(${PKG_CONFIG} --libs libseccomp)}"
 
 generator="$(mktemp)"
 trap 'rm "${generator}"' EXIT
 
-"${CC}" -o "${generator}" -D_GNU_SOURCE ${CCFLAGS} seccomp-bpf.c && \
+${CC} -o "${generator}" -D_GNU_SOURCE ${SECCOMP_CFLAGS} ${CFLAGS-} ${LDFLAGS-} 
seccomp-bpf.c ${SECCOMP_LIBS} && \
"${generator}" > seccomp-bpf.h



[gentoo-commits] repo/gentoo:master commit in: dev-build/meson-format-array/

2024-07-18 Thread Mike Gilbert
commit: d5e08b1999d751bcb76f4989cfb5eb8f8124a4ea
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Jul 18 16:56:02 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Jul 18 16:56:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5e08b19

dev-build/meson-format-array: move S above LICENSE

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

 dev-build/meson-format-array/meson-format-array-0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/meson-format-array/meson-format-array-0.ebuild 
b/dev-build/meson-format-array/meson-format-array-0.ebuild
index 018d99e38bd9..d278f439afb0 100644
--- a/dev-build/meson-format-array/meson-format-array-0.ebuild
+++ b/dev-build/meson-format-array/meson-format-array-0.ebuild
@@ -8,6 +8,7 @@ inherit edo python-r1
 
 DESCRIPTION="Format shell expressions into a meson array"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage";
+S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -15,7 +16,6 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k 
~mips ppc ppc64 ~riscv
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}"
-S="${WORKDIR}"
 
 src_test() {
run_doctest() {



[gentoo-commits] repo/gentoo:master commit in: dev-build/meson-format-array/files/, dev-build/meson-format-array/

2024-07-18 Thread Mike Gilbert
commit: 8d06d85786d65f354a2d8a73c33958a4b7175200
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Jul 18 15:57:51 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Jul 18 15:57:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d06d857

dev-build/meson-format-array: add some doctests

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

 .../{meson-format-array => meson-format-array.py}   | 21 +++--
 .../meson-format-array/meson-format-array-0.ebuild  | 11 +--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/dev-build/meson-format-array/files/meson-format-array 
b/dev-build/meson-format-array/files/meson-format-array.py
similarity index 61%
rename from dev-build/meson-format-array/files/meson-format-array
rename to dev-build/meson-format-array/files/meson-format-array.py
index d2bf49ba8e59..84a490cf29eb 100644
--- a/dev-build/meson-format-array/files/meson-format-array
+++ b/dev-build/meson-format-array/files/meson-format-array.py
@@ -6,10 +6,22 @@ import itertools
 import shlex
 import sys
 
+
 def quote(s):
+""" Surround a value with quotes, escape embedded quotes.
+>>> quote("foo'bar")
+"'foo'bar'"
+"""
+
 return "'" + s.replace("\\", "").replace("'", "\\'") + "'"
 
-def main(args):
+
+def format_array(args):
+""" Format shell-compatible expressions as a meson array.
+>>> format_array(['-O2 -pipe -DFOO="bar baz"'])
+"['-O2', '-pipe', '-DFOO=bar baz']"
+"""
+
 # Split each argument according to shell rules
 args = (shlex.split(x) for x in args)
 
@@ -20,7 +32,12 @@ def main(args):
 args = (quote(x) for x in args)
 
 # Format the result
-print("[" + ", ".join(args) + "]")
+return "[" + ", ".join(args) + "]"
+
+
+def main(args):
+print(format_array(args))
+
 
 if __name__ == "__main__":
 main(sys.argv[1:])

diff --git a/dev-build/meson-format-array/meson-format-array-0.ebuild 
b/dev-build/meson-format-array/meson-format-array-0.ebuild
index d9e12ab903f2..018d99e38bd9 100644
--- a/dev-build/meson-format-array/meson-format-array-0.ebuild
+++ b/dev-build/meson-format-array/meson-format-array-0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 PYTHON_COMPAT=( python3_{10..13} )
 
-inherit python-r1
+inherit edo python-r1
 
 DESCRIPTION="Format shell expressions into a meson array"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage";
@@ -17,6 +17,13 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}"
 S="${WORKDIR}"
 
+src_test() {
+   run_doctest() {
+   edo ${EPYTHON} -B -m doctest "${FILESDIR}/meson-format-array.py"
+   }
+   python_foreach_impl run_doctest
+}
+
 src_install() {
-   python_foreach_impl python_doscript "${FILESDIR}"/meson-format-array
+   python_foreach_impl python_newscript 
"${FILESDIR}"/meson-format-array.py meson-format-array
 }



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

2024-07-16 Thread Mike Gilbert
commit: 46bbdc880587a7ffe9ad0a02668661336ad82989
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Jul 16 15:55:23 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Tue Jul 16 15:55:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46bbdc88

net-misc/freerdp: drop 2.11.6

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

 net-misc/freerdp/Manifest  |   2 -
 net-misc/freerdp/freerdp-2.11.6.ebuild | 172 -
 2 files changed, 174 deletions(-)

diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index ab6676d4224d..09d543e4268e 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,6 +1,4 @@
 DIST freerdp-2.11.5.tar.gz 7330372 BLAKE2B 
53adf40ca8f6c226f93cbc4599d857170bed2cbbe233860f52b30416b3a5d15c1ef2268c329790553dd1dbbcd93dedd834e5b62f67128029e551083d1053b357
 SHA512 
152dfef2783283ef703eb28ebe4d32fb02519ee6de9042b124af34395a2a6db36bd4cf1e96200ba3e93acf06c245109413e3e36e6143ed4409bd90ede6c383bd
-DIST freerdp-2.11.6.tar.gz 7337387 BLAKE2B 
6d6b338710fccc4ad5067f4cf7f17190409f5313cb0c2c4ad84c82326b605897e01e03e2f334346ae5e20642c7813b415d0123558c00565b4b8c11257ebac226
 SHA512 
4facaff07bc26434474776e2463c9ebf090cb6bcf7d3dc7a6b3d8e2de991925a92b7889b2c5dec50ee4cf28f94bb1016c36da207a00ead09005ea0ace36d
-DIST freerdp-2.11.6.tar.gz.asc 228 BLAKE2B 
cfcd673da04fcd749883b5dbbc27f12d6680442991d884006401521222385c7b325af35828683d96e1de866850a9c4eaae5f26d4b3cff4111391dc31f94ca1bd
 SHA512 
4ef9a1fcb6f97295affbe080657a5a812d73e3448e1f480b382774e6f6fd3276a4e251e94cac66fdc83ae974ccc0b9ca9ca2b82b76b5128915885a35fafd18e4
 DIST freerdp-2.11.7.tar.gz 7337520 BLAKE2B 
ad579b4c36d96a17ccceb26c4c34124a050c05c49c05e2d8b4fd46789929dd4581d26aad88de7a3b3e6ecdd330b9b2ac2d45616537c1c635d10706f14a36f5ca
 SHA512 
e1b4ac112090f2364ef2c360453f91b4643680cad75785cb214b48ebbc78c5eeca9fa8fe9f84f241a70825eefb5273e4e380483a5cdc86c92aa6ac1eb22c188e
 DIST freerdp-2.11.7.tar.gz.asc 228 BLAKE2B 
a374c22ada6da59fb66fcb8021d5bb27545df0c0875b929766dc9b468e9fbfb4a79b1c38b2dbf5c44f925fd44305b1798e5ede0e6726a85c98cac96ceb8020f2
 SHA512 
18a1b8f18bba14e0156e5eca8fad28efdadd2f87fa29221629ffd9cf53f74606392de0df0e11ae41809fad0509c87462ee29d1e01e9df0dfe08b29832378be76
 DIST freerdp-3.4.0.tar.gz 9331562 BLAKE2B 
888d6c5786c7b3c5eea89e41bca23ef2b323377b8115c5f5bfd0dd38e5ed2d3701ffc7603e4aa4253e9116804a12268f4b59dadeb2f60f5c39e8170e78ba6bd1
 SHA512 
b69f2a2a5f6c70b4a21f0768ce2050020af47b83a3cf06d3b3b46a0e6aa7c062ed2b9de04782a8d6651002ded4c267f8653dfdc2517323926aaab3675924b6c5

diff --git a/net-misc/freerdp/freerdp-2.11.6.ebuild 
b/net-misc/freerdp/freerdp-2.11.6.ebuild
deleted file mode 100644
index 2a7209cfab84..
--- a/net-misc/freerdp/freerdp-2.11.6.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 2011-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git";
-   case ${PV} in
-   2.*) EGIT_BRANCH="stable-2.0";;
-   esac
-else
-   inherit verify-sig
-   MY_P=${P/_/-}
-   S="${WORKDIR}/${MY_P}"
-   SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz
-   verify-sig? ( 
https://pub.freerdp.com/releases/${MY_P}.tar.gz.asc )"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-   BDEPEND="verify-sig? ( sec-keys/openpgp-keys-akallabeth )"
-   VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/akallabeth.asc"
-fi
-
-DESCRIPTION="Free implementation of the Remote Desktop Protocol"
-HOMEPAGE="https://www.freerdp.com/";
-
-LICENSE="Apache-2.0"
-SLOT="2"
-IUSE="alsa cpu_flags_arm_neon client cups debug +ffmpeg gstreamer icu jpeg 
kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland 
X xinerama xv"
-RESTRICT="!test? ( test )"
-
-BDEPEND+="
-   virtual/pkgconfig
-   app-text/docbook-xml-dtd:4.1.2
-   app-text/xmlto
-"
-
-COMMON_DEPEND="
-   dev-libs/openssl:0=
-   sys-libs/zlib:0
-   alsa? ( media-libs/alsa-lib )
-   cups? ( net-print/cups )
-   usb? (
-   virtual/libudev:0=
-   sys-apps/util-linux:0=
-   dev-libs/dbus-glib:0=
-   virtual/libusb:1=
-   )
-   X? (
-   x11-libs/libXcursor
-   x11-libs/libXext
-   x11-libs/libXi
-   x11-libs/libXrender
-   xinerama? ( x11-libs/libXinerama )
-   xv? ( x11-libs/libXv )
-   )
-   ffmpeg? ( media-video/ffmpeg:0= )
-   !ffmpeg? (
-   x11-libs/cairo:0=
-   )
-   gstreamer? (
-   media-libs/gstreamer:1.0
-   media-libs/gst-plugins-ba

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

2024-07-16 Thread Mike Gilbert
commit: a0ac8295e4f57c1d1fcb8804e19da65f165b5711
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Jul 16 15:40:18 2024 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Tue Jul 16 15:40:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0ac8295

net-misc/freerdp: update smartcard deps

Changes in 3.6.0 upstream:
pkcs11-helper is not needed.
p11-kit is used for pkcs11 module support.

Bug: https://bugs.gentoo.org/935874
Signed-off-by: Mike Gilbert  gentoo.org>

 net-misc/freerdp/freerdp-.ebuild | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/net-misc/freerdp/freerdp-.ebuild 
b/net-misc/freerdp/freerdp-.ebuild
index 0c7ce6eacd22..51aab209a2db 100644
--- a/net-misc/freerdp/freerdp-.ebuild
+++ b/net-misc/freerdp/freerdp-.ebuild
@@ -85,10 +85,7 @@ COMMON_DEPEND="
xinerama? ( x11-libs/libXinerama )
)
)
-   smartcard? (
-   dev-libs/pkcs11-helper
-   sys-apps/pcsc-lite
-   )
+   smartcard? ( sys-apps/pcsc-lite )
systemd? ( sys-apps/systemd:0= )
client? (
wayland? (
@@ -108,6 +105,7 @@ RDEPEND="${COMMON_DEPEND}
!net-misc/freerdp:0
client? ( !net-misc/freerdp:2[client] )
server? ( !net-misc/freerdp:2[server] )
+   smartcard? ( app-crypt/p11-kit )
 "
 
 option() {



  1   2   3   4   5   6   7   8   9   10   >