[gentoo-commits] repo/proj/guru:dev commit in: net-irc/srain/

2024-05-26 Thread Christopher Byrne 
commit: a5ff0e133d1ead549efcb5c03b424645b49d730f
Author: Christopher Byrne  gmail  com>
AuthorDate: Mon May 27 01:50:32 2024 +
Commit:     Christopher Byrne  gmail  com>
CommitDate: Mon May 27 01:54:41 2024 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a5ff0e13

net-irc/srain: add 1.7.0

Signed-off-by: Christopher Byrne  gmail.com>

 net-irc/srain/Manifest   |  1 +
 net-irc/srain/srain-1.7.0.ebuild | 60 
 2 files changed, 61 insertions(+)

diff --git a/net-irc/srain/Manifest b/net-irc/srain/Manifest
index bbccdeeec..64b5affb5 100644
--- a/net-irc/srain/Manifest
+++ b/net-irc/srain/Manifest
@@ -1 +1,2 @@
 DIST srain-1.6.0.tar.gz 2760635 BLAKE2B 
18676142c875b9715cd3e94b9877e6ae7235e035299284dc410b7ae6be26eb01450557da0c9cb050d71d79145583132601f12a395c28968b23361f84c1f08fce
 SHA512 
59d962ddbf71724d5f68decc1e3b873cea6c6bd2ca23b21a1a6fe937d53f2871398fdcda906840755efc6b454d2d5116ca620c047f1634fb68b45ab2c0443a57
+DIST srain-1.7.0.tar.gz 2760861 BLAKE2B 
2cbf4bc1a1777b851ea604e63350947851fa0a4c937fbd60c6192e2d197c137870bd2859d922de9ff6bd4b2da7e8fcdcd07493f68fd021ab775125de0dbda359
 SHA512 
0549a08379946cc4ea0c331f212f03b08a0c7248964984d01a64744058d116ec1af05b2aefd0d689438dafa9df4e70179bb8957d9992f02414a462577c5d99dc

diff --git a/net-irc/srain/srain-1.7.0.ebuild b/net-irc/srain/srain-1.7.0.ebuild
new file mode 100644
index 0..dcef04ffd
--- /dev/null
+++ b/net-irc/srain/srain-1.7.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+inherit meson python-any-r1 xdg
+
+DESCRIPTION="Modern, beautiful IRC client written in GTK+ 3"
+HOMEPAGE="https://github.com/SrainApp/srain";
+SRC_URI="https://github.com/SrainApp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="appindicator doc man"
+
+RDEPEND="
+   app-crypt/libsecret
+   dev-libs/glib:2
+   dev-libs/libconfig:=
+   dev-libs/openssl:=
+   net-libs/libsoup:3.0
+   x11-libs/gtk+:3
+   appindicator? ( dev-libs/libayatana-appindicator )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+   doc? ( $(python_gen_any_dep '
+   dev-python/sphinx[${PYTHON_USEDEP}]' ) )
+   man? ( $(python_gen_any_dep '
+   dev-python/sphinx[${PYTHON_USEDEP}]' ) )
+   ${PYTHON_DEPS}
+"
+
+python_check_deps() {
+   if use doc || use man; then
+   python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
+   fi
+}
+
+src_prepare() {
+   default
+
+   sed "s/\('doc'\), meson.project_name()/\1, '${PF}'/" \
+   -i meson.build || die
+}
+
+src_configure() {
+   local -a doc_builders=()
+   use doc && doc_builders+=( html )
+   use man && doc_builders+=( man )
+
+   local emesonargs=(
+   -Ddoc_builders="$(meson-format-array "${doc_builders[@]}")"
+   $(meson_use appindicator app_indicator)
+   )
+   meson_src_configure
+}

[gentoo-commits] repo/proj/guru:dev commit in: net-irc/srain/

2024-05-26 Thread Christopher Byrne 
commit: 46769d3aef20f8a36d08b59d48ae18ed2ff6249c
Author: Christopher Byrne  gmail  com>
AuthorDate: Mon May 27 01:54:18 2024 +
Commit:     Christopher Byrne  gmail  com>
CommitDate: Mon May 27 01:54:41 2024 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=46769d3a

net-irc/srain: drop 1.6.0

Signed-off-by: Christopher Byrne  gmail.com>

 net-irc/srain/Manifest   |  1 -
 net-irc/srain/srain-1.6.0.ebuild | 60 
 2 files changed, 61 deletions(-)

diff --git a/net-irc/srain/Manifest b/net-irc/srain/Manifest
index 64b5affb5..8b059ad35 100644
--- a/net-irc/srain/Manifest
+++ b/net-irc/srain/Manifest
@@ -1,2 +1 @@
-DIST srain-1.6.0.tar.gz 2760635 BLAKE2B 
18676142c875b9715cd3e94b9877e6ae7235e035299284dc410b7ae6be26eb01450557da0c9cb050d71d79145583132601f12a395c28968b23361f84c1f08fce
 SHA512 
59d962ddbf71724d5f68decc1e3b873cea6c6bd2ca23b21a1a6fe937d53f2871398fdcda906840755efc6b454d2d5116ca620c047f1634fb68b45ab2c0443a57
 DIST srain-1.7.0.tar.gz 2760861 BLAKE2B 
2cbf4bc1a1777b851ea604e63350947851fa0a4c937fbd60c6192e2d197c137870bd2859d922de9ff6bd4b2da7e8fcdcd07493f68fd021ab775125de0dbda359
 SHA512 
0549a08379946cc4ea0c331f212f03b08a0c7248964984d01a64744058d116ec1af05b2aefd0d689438dafa9df4e70179bb8957d9992f02414a462577c5d99dc

diff --git a/net-irc/srain/srain-1.6.0.ebuild b/net-irc/srain/srain-1.6.0.ebuild
deleted file mode 100644
index 8dcf030db..0
--- a/net-irc/srain/srain-1.6.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-inherit meson python-any-r1 xdg
-
-DESCRIPTION="Modern, beautiful IRC client written in GTK+ 3"
-HOMEPAGE="https://github.com/SrainApp/srain";
-SRC_URI="https://github.com/SrainApp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="appindicator doc man"
-
-RDEPEND="
-   app-crypt/libsecret
-   dev-libs/glib:2
-   dev-libs/libconfig:=
-   dev-libs/openssl:=
-   net-libs/libsoup:2.4
-   x11-libs/gtk+:3
-   appindicator? ( dev-libs/libayatana-appindicator )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-   doc? ( $(python_gen_any_dep '
-   dev-python/sphinx[${PYTHON_USEDEP}]' ) )
-   man? ( $(python_gen_any_dep '
-   dev-python/sphinx[${PYTHON_USEDEP}]' ) )
-   ${PYTHON_DEPS}
-"
-
-python_check_deps() {
-   if use doc || use man; then
-   python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
-   fi
-}
-
-src_prepare() {
-   default
-
-   sed "s/\('doc'\), meson.project_name()/\1, '${PF}'/" \
-   -i meson.build || die
-}
-
-src_configure() {
-   local -a doc_builders=()
-   use doc && doc_builders+=( html )
-   use man && doc_builders+=( man )
-
-   local emesonargs=(
-   -Ddoc_builders="$(meson-format-array "${doc_builders[@]}")"
-   $(meson_use appindicator app_indicator)
-   )
-   meson_src_configure
-}

[gentoo-commits] repo/proj/guru:dev commit in: app-misc/oddjob/

2024-05-20 Thread Christopher Byrne 
commit: 5df4c15276d0f8c7f2ecf7a3abafd25acc316834
Author: Christopher Byrne  gmail  com>
AuthorDate: Mon May 20 16:23:44 2024 +
Commit:     Christopher Byrne  gmail  com>
CommitDate: Mon May 20 16:24:51 2024 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5df4c152

app-misc/oddjob: Remove old

Signed-off-by: Christopher Byrne  gmail.com>

 app-misc/oddjob/oddjob-0.34.7.ebuild | 65 
 1 file changed, 65 deletions(-)

diff --git a/app-misc/oddjob/oddjob-0.34.7.ebuild 
b/app-misc/oddjob/oddjob-0.34.7.ebuild
deleted file mode 100644
index 7610d7dd59..00
--- a/app-misc/oddjob/oddjob-0.34.7.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-EAPI=8
-
-inherit autotools systemd
-
-DESCRIPTION="A D-Bus service which runs odd jobs on behalf of client 
applications"
-
-HOMEPAGE="https://pagure.io/oddjob";
-SRC_URI="https://releases.pagure.org/oddjob/${P}.tar.gz";
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc examples pam selinux"
-
-RESTRICT="test"
-
-RDEPEND="sys-apps/dbus[selinux?]
-   pam? ( sys-libs/pam )
-   selinux? (
-   sec-policy/selinux-oddjob
-   sys-libs/libselinux
-)"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-   doc? ( app-text/docbook-xml-dtd:4.3
-   app-text/xmlto
-   )"
-
-PATCHES=(
-   
"${FILESDIR}/${PN}-0.34.7-build-Fix-broken-AC_ARG_ENABLE-install-logic.patch"
-   
"${FILESDIR}/${PN}-0.34.7-build-Keep-non-PAM-mkhomedir-parts-when-PAM-support-.patch"
-   
"${FILESDIR}/${PN}-0.34.7-build-Remove-with-systemd-and-with-sysvinit.patch"
-   "${FILESDIR}/${PN}-0.34.7-build-Restore-conditional-with-pam-flag.patch"
-   "${FILESDIR}/${PN}-0.34.7-src-oddjobd.c-Fix-non-selinux-build.patch"
-)
-
-src_prepare() {
-   default
-   eautoreconf
-}
-
-src_configure() {
-local myeconfargs=(
-   --libdir=/$(get_libdir)
-   $(use_with pam)
-   $(use_with selinux selinux-labels)
-   $(use_with selinux selinux-acls)
-   $(use_enable examples sample)
-   $(use_enable doc xml-docs)
-   $(use_enable doc compat-dtd)
-   --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-   )
-
-   econf "${myeconfargs[@]}"
-}
-
-src_install() {
-   default
-   rm -f "${ED}/etc/rc.d/init.d/oddjobd"
-   newinitd "${FILESDIR}/oddjob.init.d" "oddjobd"
-
-   find "${ED}" -iname \*.la -type f -delete
-}

[gentoo-commits] repo/proj/guru:dev commit in: app-misc/oddjob/

2024-05-20 Thread Christopher Byrne 
commit: c3bdc7378119073b27d37aba5b43fb78a69509ef
Author: Christopher Byrne  gmail  com>
AuthorDate: Mon May 20 16:22:06 2024 +
Commit:     Christopher Byrne  gmail  com>
CommitDate: Mon May 20 16:24:51 2024 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c3bdc737

app-misc/oddjob: Add dev-libs/libxml2 to RDEPEND

Closes: https://bugs.gentoo.org/932287
Signed-off-by: Christopher Byrne  gmail.com>

 app-misc/oddjob/oddjob-0.34.7-r1.ebuild | 66 +
 1 file changed, 66 insertions(+)

diff --git a/app-misc/oddjob/oddjob-0.34.7-r1.ebuild 
b/app-misc/oddjob/oddjob-0.34.7-r1.ebuild
new file mode 100644
index 00..2436d31907
--- /dev/null
+++ b/app-misc/oddjob/oddjob-0.34.7-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+EAPI=8
+
+inherit autotools systemd
+
+DESCRIPTION="A D-Bus service which runs odd jobs on behalf of client 
applications"
+
+HOMEPAGE="https://pagure.io/oddjob";
+SRC_URI="https://releases.pagure.org/oddjob/${P}.tar.gz";
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples pam selinux"
+
+RESTRICT="test"
+
+RDEPEND="sys-apps/dbus[selinux?]
+   dev-libs/libxml2
+   pam? ( sys-libs/pam )
+   selinux? (
+   sec-policy/selinux-oddjob
+   sys-libs/libselinux
+)"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+   doc? ( app-text/docbook-xml-dtd:4.3
+   app-text/xmlto
+   )"
+
+PATCHES=(
+   
"${FILESDIR}/${PN}-0.34.7-build-Fix-broken-AC_ARG_ENABLE-install-logic.patch"
+   
"${FILESDIR}/${PN}-0.34.7-build-Keep-non-PAM-mkhomedir-parts-when-PAM-support-.patch"
+   
"${FILESDIR}/${PN}-0.34.7-build-Remove-with-systemd-and-with-sysvinit.patch"
+   "${FILESDIR}/${PN}-0.34.7-build-Restore-conditional-with-pam-flag.patch"
+   "${FILESDIR}/${PN}-0.34.7-src-oddjobd.c-Fix-non-selinux-build.patch"
+)
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+local myeconfargs=(
+   --libdir=/$(get_libdir)
+   $(use_with pam)
+   $(use_with selinux selinux-labels)
+   $(use_with selinux selinux-acls)
+   $(use_enable examples sample)
+   $(use_enable doc xml-docs)
+   $(use_enable doc compat-dtd)
+   --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+   )
+
+   econf "${myeconfargs[@]}"
+}
+
+src_install() {
+   default
+   rm -f "${ED}/etc/rc.d/init.d/oddjobd"
+   newinitd "${FILESDIR}/oddjob.init.d" "oddjobd"
+
+   find "${ED}" -iname \*.la -type f -delete
+}

[gentoo-commits] repo/proj/guru:dev commit in: gui-wm/swayfx/, gui-wm/swayfx/files/

2024-04-22 Thread Christopher Byrne 
commit: ae8130ca588d08497b9a593f3ef8131b58e4a011
Author: Christopher Byrne  gmail  com>
AuthorDate: Mon Apr 22 23:51:51 2024 +
Commit:     Christopher Byrne  gmail  com>
CommitDate: Mon Apr 22 23:54:40 2024 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ae8130ca

gui-wm/swayfx: Compile fix for USE="-X"

Closes: https://bugs.gentoo.org/907342
Signed-off-by: Christopher Byrne  gmail.com>

 ...ng-able-to-build-without-xwayland-support.patch | 37 ++
 gui-wm/swayfx/swayfx-0.3.2.ebuild  |  4 +++
 2 files changed, 41 insertions(+)

diff --git 
a/gui-wm/swayfx/files/swayfx-0.3.2-fix-not-being-able-to-build-without-xwayland-support.patch
 
b/gui-wm/swayfx/files/swayfx-0.3.2-fix-not-being-able-to-build-without-xwayland-support.patch
new file mode 100644
index 00..4b7d4f3a95
--- /dev/null
+++ 
b/gui-wm/swayfx/files/swayfx-0.3.2-fix-not-being-able-to-build-without-xwayland-support.patch
@@ -0,0 +1,37 @@
+From c47aa61c64925c72722dfbfa01cd47643a92c7d9 Mon Sep 17 00:00:00 2001
+From: Erik Reider <35975961+erikrei...@users.noreply.github.com>
+Date: Sat, 29 Jul 2023 19:13:26 +0200
+Subject: [PATCH] fix: not being able to build without xwayland support (#209)
+
+---
+ sway/tree/root.c | 12 
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/sway/tree/root.c b/sway/tree/root.c
+index 2c1b96b8..9df6f002 100644
+--- a/sway/tree/root.c
 b/sway/tree/root.c
+@@ -58,12 +58,16 @@ void root_destroy(struct sway_root *root) {
+ /* Set minimized state from scratchpad container `show` state */
+ static void root_scratchpad_set_minimize(struct sway_container *con, bool 
minimize) {
+   if (con->view) {
+-  struct wlr_foreign_toplevel_handle_v1 *foreign_toplevel = 
con->view->foreign_toplevel;
+-
++#if HAVE_XWAYLAND
+   if (wlr_surface_is_xwayland_surface(con->view->surface)) {
+-  struct wlr_xwayland_surface *xsurface = 
wlr_xwayland_surface_from_wlr_surface(con->view->surface);
++  struct wlr_xwayland_surface *xsurface
++  = 
wlr_xwayland_surface_from_wlr_surface(con->view->surface);
+   wlr_xwayland_surface_set_minimized(xsurface, minimize);
+-  } else if (foreign_toplevel) {
++  return;
++  }
++#endif
++  struct wlr_foreign_toplevel_handle_v1 *foreign_toplevel = NULL;
++  if ((foreign_toplevel = con->view->foreign_toplevel)) {
+   
wlr_foreign_toplevel_handle_v1_set_minimized(foreign_toplevel, minimize);
+   }
+   }
+-- 
+2.43.2
+

diff --git a/gui-wm/swayfx/swayfx-0.3.2.ebuild 
b/gui-wm/swayfx/swayfx-0.3.2.ebuild
index 7f2e37cb98..4f68c26819 100644
--- a/gui-wm/swayfx/swayfx-0.3.2.ebuild
+++ b/gui-wm/swayfx/swayfx-0.3.2.ebuild
@@ -62,6 +62,10 @@ BDEPEND="
 BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )"
 REQUIRED_USE="tray? ( swaybar )"
 
+PATCHES=(
+   
"${FILESDIR}/${PN}-0.3.2-fix-not-being-able-to-build-without-xwayland-support.patch"
+   )
+
 src_configure() {
local emesonargs=(
$(meson_feature man man-pages)

[gentoo-commits] repo/proj/guru:dev commit in: net-irc/srain/

2024-02-21 Thread Christopher Byrne 
commit: 0ca40195b558c072730c72dbf370513d4be43f1a
Author: Christopher Byrne  gmail  com>
AuthorDate: Thu Feb 22 03:52:41 2024 +
Commit:     Christopher Byrne  gmail  com>
CommitDate: Thu Feb 22 04:01:41 2024 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0ca40195

net-irc/srain: add 1.6.0

Closes: https://bugs.gentoo.org/887863
Closes: https://bugs.gentoo.org/897638
Signed-off-by: Christopher Byrne  gmail.com>

 net-irc/srain/Manifest   |  1 +
 net-irc/srain/srain-1.6.0.ebuild | 60 
 2 files changed, 61 insertions(+)

diff --git a/net-irc/srain/Manifest b/net-irc/srain/Manifest
index 1c8cbd2fea..dd77c791c7 100644
--- a/net-irc/srain/Manifest
+++ b/net-irc/srain/Manifest
@@ -1 +1,2 @@
 DIST srain-1.4.0.tar.gz 1935950 BLAKE2B 
7d3db119bcc07ccb427850530e551f643e202d3f2f276c8b347324f99474e57052368b8eed52e74ba6403a47b3bd4b7842ee007d9035bbba8e69beba8e3be9e6
 SHA512 
1708d1d1ec97c9f35a8702526a95bb60bf0ea50b742a76081508ef42a512e8c113ef1949c3b9f3db4585d8fb11cdb197f65fc7bc10480a533c69982c21185e55
+DIST srain-1.6.0.tar.gz 2760635 BLAKE2B 
18676142c875b9715cd3e94b9877e6ae7235e035299284dc410b7ae6be26eb01450557da0c9cb050d71d79145583132601f12a395c28968b23361f84c1f08fce
 SHA512 
59d962ddbf71724d5f68decc1e3b873cea6c6bd2ca23b21a1a6fe937d53f2871398fdcda906840755efc6b454d2d5116ca620c047f1634fb68b45ab2c0443a57

diff --git a/net-irc/srain/srain-1.6.0.ebuild b/net-irc/srain/srain-1.6.0.ebuild
new file mode 100644
index 00..8dcf030db3
--- /dev/null
+++ b/net-irc/srain/srain-1.6.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+inherit meson python-any-r1 xdg
+
+DESCRIPTION="Modern, beautiful IRC client written in GTK+ 3"
+HOMEPAGE="https://github.com/SrainApp/srain";
+SRC_URI="https://github.com/SrainApp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="appindicator doc man"
+
+RDEPEND="
+   app-crypt/libsecret
+   dev-libs/glib:2
+   dev-libs/libconfig:=
+   dev-libs/openssl:=
+   net-libs/libsoup:2.4
+   x11-libs/gtk+:3
+   appindicator? ( dev-libs/libayatana-appindicator )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+   doc? ( $(python_gen_any_dep '
+   dev-python/sphinx[${PYTHON_USEDEP}]' ) )
+   man? ( $(python_gen_any_dep '
+   dev-python/sphinx[${PYTHON_USEDEP}]' ) )
+   ${PYTHON_DEPS}
+"
+
+python_check_deps() {
+   if use doc || use man; then
+   python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
+   fi
+}
+
+src_prepare() {
+   default
+
+   sed "s/\('doc'\), meson.project_name()/\1, '${PF}'/" \
+   -i meson.build || die
+}
+
+src_configure() {
+   local -a doc_builders=()
+   use doc && doc_builders+=( html )
+   use man && doc_builders+=( man )
+
+   local emesonargs=(
+   -Ddoc_builders="$(meson-format-array "${doc_builders[@]}")"
+   $(meson_use appindicator app_indicator)
+   )
+   meson_src_configure
+}

[gentoo-commits] repo/proj/guru:dev commit in: net-irc/srain/

2024-02-21 Thread Christopher Byrne 
commit: 7d0a1b6a60284a483713a4ba0f03ab44a35f1dd8
Author: Christopher Byrne  gmail  com>
AuthorDate: Thu Feb 22 03:53:33 2024 +
Commit:     Christopher Byrne  gmail  com>
CommitDate: Thu Feb 22 04:01:41 2024 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7d0a1b6a

net-irc/srain: drop 1.4.0

Signed-off-by: Christopher Byrne  gmail.com>

 net-irc/srain/Manifest   |  1 -
 net-irc/srain/srain-1.4.0.ebuild | 54 
 2 files changed, 55 deletions(-)

diff --git a/net-irc/srain/Manifest b/net-irc/srain/Manifest
index dd77c791c7..bbccdeeec4 100644
--- a/net-irc/srain/Manifest
+++ b/net-irc/srain/Manifest
@@ -1,2 +1 @@
-DIST srain-1.4.0.tar.gz 1935950 BLAKE2B 
7d3db119bcc07ccb427850530e551f643e202d3f2f276c8b347324f99474e57052368b8eed52e74ba6403a47b3bd4b7842ee007d9035bbba8e69beba8e3be9e6
 SHA512 
1708d1d1ec97c9f35a8702526a95bb60bf0ea50b742a76081508ef42a512e8c113ef1949c3b9f3db4585d8fb11cdb197f65fc7bc10480a533c69982c21185e55
 DIST srain-1.6.0.tar.gz 2760635 BLAKE2B 
18676142c875b9715cd3e94b9877e6ae7235e035299284dc410b7ae6be26eb01450557da0c9cb050d71d79145583132601f12a395c28968b23361f84c1f08fce
 SHA512 
59d962ddbf71724d5f68decc1e3b873cea6c6bd2ca23b21a1a6fe937d53f2871398fdcda906840755efc6b454d2d5116ca620c047f1634fb68b45ab2c0443a57

diff --git a/net-irc/srain/srain-1.4.0.ebuild b/net-irc/srain/srain-1.4.0.ebuild
deleted file mode 100644
index 421adafc52..00
--- a/net-irc/srain/srain-1.4.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} pypy3 )
-inherit meson python-any-r1 xdg
-
-DESCRIPTION="Modern, beautiful IRC client written in GTK+ 3"
-HOMEPAGE="https://github.com/SrainApp/srain";
-SRC_URI="https://github.com/SrainApp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="doc man"
-
-RDEPEND="
-   app-crypt/libsecret
-   dev-libs/glib:2
-   dev-libs/libconfig:=
-   dev-libs/openssl:=
-   net-libs/libsoup:2.4
-   x11-libs/gtk+:3
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   doc? ( ${PYTHON_DEPS} )
-   man? ( ${PYTHON_DEPS} )
-"
-
-python_check_deps() {
-   if use doc || use man; then
-   has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" || return 1
-   fi
-}
-
-src_prepare() {
-   default
-
-   sed "s/\('doc'\), meson.project_name()/\1, '${PF}'/" \
-   -i meson.build || die
-}
-
-src_configure() {
-   local -a doc_builders=()
-   use doc && doc_builders+=( html )
-   use man && doc_builders+=( man )
-
-   local emesonargs=(
-   -Ddoc_builders="$(meson-format-array "${doc_builders[@]}")"
-   )
-   meson_src_configure
-}

[gentoo-commits] repo/proj/guru:dev commit in: app-misc/oddjob/, app-misc/oddjob/files/

2023-10-11 Thread Christopher Byrne 
commit: ad0022603bfad3436fc6618f6605bf857a6d63cc
Author: Christopher Byrne  gmail  com>
AuthorDate: Wed Oct 11 20:19:56 2023 +
Commit:     Christopher Byrne  gmail  com>
CommitDate: Wed Oct 11 20:19:56 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ad002260

app-misc/oddjob: new package, add 0.34.7

Signed-off-by: Christopher Byrne  gmail.com>

 app-misc/oddjob/Manifest   |   1 +
 ...ld-Fix-broken-AC_ARG_ENABLE-install-logic.patch |  59 +
 ...non-PAM-mkhomedir-parts-when-PAM-support-.patch |  39 ++
 ...ild-Remove-with-systemd-and-with-sysvinit.patch | 144 +
 ...7-build-Restore-conditional-with-pam-flag.patch |  66 ++
 34.7-src-oddjobd.c-Fix-non-selinux-build.patch |  35 +
 app-misc/oddjob/files/oddjob.init.d|  21 +++
 app-misc/oddjob/metadata.xml   |   9 ++
 app-misc/oddjob/oddjob-0.34.7.ebuild   |  65 ++
 9 files changed, 439 insertions(+)

diff --git a/app-misc/oddjob/Manifest b/app-misc/oddjob/Manifest
new file mode 100644
index 00..1fba06727b
--- /dev/null
+++ b/app-misc/oddjob/Manifest
@@ -0,0 +1 @@
+DIST oddjob-0.34.7.tar.gz 459131 BLAKE2B 
197083e0799897b1b9f753b0b6c9fa3db669305eb386475d9e18f0a6b2cce2c3cbc8bb220df465dfc0ac7374c7544bcf9cefd666e5c3667f4647ae85eab04a2b
 SHA512 
df98f3d2ce18de5d2db6d638995c01c80aec51f7ad979b879b2e8d8f7d6c2e464cbff3c70ed9b528399337f8fba31744f955ca17fdad1d4e9193fb0f10ea391a

diff --git 
a/app-misc/oddjob/files/oddjob-0.34.7-build-Fix-broken-AC_ARG_ENABLE-install-logic.patch
 
b/app-misc/oddjob/files/oddjob-0.34.7-build-Fix-broken-AC_ARG_ENABLE-install-logic.patch
new file mode 100644
index 00..5cfae2c9a6
--- /dev/null
+++ 
b/app-misc/oddjob/files/oddjob-0.34.7-build-Fix-broken-AC_ARG_ENABLE-install-logic.patch
@@ -0,0 +1,59 @@
+From 1112006e8de56fae69e2418b155622f96e2b9fea Mon Sep 17 00:00:00 2001
+From: Christopher Byrne 
+Date: Thu, 21 Sep 2023 19:35:24 -0500
+Subject: [PATCH 2/3] build: Fix broken AC_ARG_ENABLE install logic
+
+The arguments for AC_ARG_ENABLE were wrong. The 3rd argument is
+"if specified" and the 4th argument is "if not specified". So
+--disable-X did not work.
+
+Signed-off-by: Christopher Byrne 
+---
+ configure.ac | 18 +-
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0f6b497..632f47c 100644
+--- a/configure.ac
 b/configure.ac
+@@ -91,9 +91,9 @@ AC_SUBST(SYSTEMDSYSTEMUNITDIR)
+ 
+ AC_ARG_ENABLE(sample,
+ AS_HELP_STRING(--enable-sample,[Build and install a sample service.]),
+-sample=$withval,
+-sample=no)
+-AM_CONDITIONAL(INSTALL_SAMPLE,test x$sample = xyes)
++,
++[enables_sample=no])
++AM_CONDITIONAL(INSTALL_SAMPLE,test x$enable_sample = xyes)
+ 
+ AC_ARG_ENABLE(experimental,
+ AS_HELP_STRING(--enable-experimental,[Build experimental helpers.]),
+@@ -330,18 +330,18 @@ AC_DEFINE_UNQUOTED(DBUS_PACKAGE,"$DBUS_PACKAGE",[Define 
to the package name for
+ 
+ AC_ARG_ENABLE(xml-docs,
+ AS_HELP_STRING(--enable-xml-docs,[Reformat XML documentation.]),
+-xml_docs=$withval,
+-xml_docs=no)
+-AM_CONDITIONAL(REFORMAT_XML_DOCS,test x$xml_docs = xyes)
++,
++[enable_xml_docs=no])
++AM_CONDITIONAL(REFORMAT_XML_DOCS,test x$enable_xml_docs = xyes)
+ AC_PATH_PROGS(PATH_XMLTO,xmlto,:)
+ AC_SUBST(PATH_XMLTO)
+ 
+ AC_ARG_ENABLE(compat-dtd,
+ AS_HELP_STRING(--enable-compat-dtd,[Use DocBook 4.3 instead of DocBook 4.4.]),
+-compat_dtd=$withval,
+-compat_dtd=no)
++,
++[enable_xml_dtd=no])
+ AC_MSG_CHECKING([which version of the DocBook DTD to use])
+-if test x$compat_dtd = xyes ; then
++if test x$enable_compat_dtd = xyes ; then
+   DOCBOOK_PACKAGE_START=
+   DOCBOOK_PACKAGE_END=
+   DOCBOOK_VERSION=4.3
+-- 
+2.41.0
+

diff --git 
a/app-misc/oddjob/files/oddjob-0.34.7-build-Keep-non-PAM-mkhomedir-parts-when-PAM-support-.patch
 
b/app-misc/oddjob/files/oddjob-0.34.7-build-Keep-non-PAM-mkhomedir-parts-when-PAM-support-.patch
new file mode 100644
index 00..c6ec183fa0
--- /dev/null
+++ 
b/app-misc/oddjob/files/oddjob-0.34.7-build-Keep-non-PAM-mkhomedir-parts-when-PAM-support-.patch
@@ -0,0 +1,39 @@
+From da68ec0acc6cfdd40ccd0ad23971b66e4517811e Mon Sep 17 00:00:00 2001
+From: Christopher Byrne 
+Date: Wed, 4 Oct 2023 20:21:20 -0500
+Subject: [PATCH] build: Keep non-PAM mkhomedir parts when PAM support is
+ disabled
+
+Signed-off-by: Christopher Byrne 
+---
+ src/Makefile.am | 4 
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index e3af35d..5360168 100644
+--- a/src/Makefile.am
 b/src/Makefile.am
+@@ -25,9 +25,7 @@ endif
+ 
+ confddir = $(sysconfdir)/$(PACKAGE)d.conf.d
+ confd_DATA = oddjobd-introspection.conf
+-if BUILD_PAM
+ confd_DATA += oddjobd-mkhomedir.conf
+-endif
+ 
+ CLEANFILES = $(confd_DATA)
+ 
+@@ -40,10 +38,8 @@ install-data-hook:
+ pkgsysconfdir = $(sysconfdir)/$(PACKAGE)
+ systemdbusdir = $(sysconfdir)/@D

[gentoo-commits] repo/proj/guru:dev commit in: app-crypt/tpm2-openssl/files/, app-crypt/tpm2-openssl/

2023-03-14 Thread Christopher Byrne 
commit: 111cabeae34e03a8d729ef287adc27ecb3d3b87f
Author: Christopher Byrne  gmail  com>
AuthorDate: Tue Mar 14 23:28:52 2023 +
Commit:     Christopher Byrne  gmail  com>
CommitDate: Tue Mar 14 23:28:52 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=111cabea

app-crypt/tpm2-openssl: Fix failing test

Closes: https://bugs.gentoo.org/901005
Signed-off-by: Christopher Byrne  gmail.com>

 ...de-base-provider-required-to-load-ecparam.patch | 25 ++
 app-crypt/tpm2-openssl/metadata.xml|  4 
 app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild   |  4 
 3 files changed, 33 insertions(+)

diff --git 
a/app-crypt/tpm2-openssl/files/tpm2-openssl-1.1.1-tests-include-base-provider-required-to-load-ecparam.patch
 
b/app-crypt/tpm2-openssl/files/tpm2-openssl-1.1.1-tests-include-base-provider-required-to-load-ecparam.patch
new file mode 100644
index 0..5a5554628
--- /dev/null
+++ 
b/app-crypt/tpm2-openssl/files/tpm2-openssl-1.1.1-tests-include-base-provider-required-to-load-ecparam.patch
@@ -0,0 +1,25 @@
+From 483030d85563e26a62e4baeac3b0fdca0e314199 Mon Sep 17 00:00:00 2001
+From: Petr Gotthard 
+Date: Fri, 23 Dec 2022 10:46:40 +0100
+Subject: [PATCH] tests: include base provider required to load ecparam
+
+---
+ test/ec_genpkey_parameters.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/ec_genpkey_parameters.sh b/test/ec_genpkey_parameters.sh
+index 406b558..a4f68d7 100755
+--- a/test/ec_genpkey_parameters.sh
 b/test/ec_genpkey_parameters.sh
+@@ -6,7 +6,7 @@ set -eufx
+ openssl ecparam -name prime256v1 -out testparam.pem
+ 
+ # generate private key as PEM
+-openssl genpkey -provider tpm2 -paramfile testparam.pem -out testkey.pem
++openssl genpkey -provider tpm2 -provider base -paramfile testparam.pem -out 
testkey.pem
+ 
+ # display private key info
+ openssl ec -provider tpm2 -provider base -in testkey.pem -check -text -noout
+-- 
+2.39.2
+

diff --git a/app-crypt/tpm2-openssl/metadata.xml 
b/app-crypt/tpm2-openssl/metadata.xml
index cd1ce1c8a..aa195a46b 100644
--- a/app-crypt/tpm2-openssl/metadata.xml
+++ b/app-crypt/tpm2-openssl/metadata.xml
@@ -5,4 +5,8 @@
salah.coro...@gmail.com
    Christopher Byrne

+   
+   tpm2-software/tpm2-openssl
+   
 
+

diff --git a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild 
b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild
index fff830dd8..1033293fb 100644
--- a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild
+++ b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild
@@ -26,6 +26,10 @@ BDEPEND="sys-devel/autoconf-archive
 
 RESTRICT="!test? ( test )"
 
+PATCHES=(
+   
"${FILESDIR}/${PN}-1.1.1-tests-include-base-provider-required-to-load-ecparam.patch"
+   )
+
 dbus_run() {
(
# start isolated dbus session bus

[gentoo-commits] repo/proj/guru:dev commit in: profiles/

2023-01-01 Thread Christopher Byrne 
commit: a7198b06e45a0a37bfa3fdcf926c83d60f3db6fd
Author: Christopher Byrne  gmail  com>
AuthorDate: Sun Jan  1 23:31:22 2023 +
Commit:     Christopher Byrne  gmail  com>
CommitDate: Sun Jan  1 23:31:22 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a7198b06

profiles: Unmask app-crypt/openssl-engine now that dev-libs/openssl-3 is 
unmasked

Signed-off-by: Christopher Byrne  gmail.com>

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

diff --git a/profiles/package.mask b/profiles/package.mask
index e95eb0bf5..b740486f2 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -39,7 +39,3 @@ dev-python/pypandoc
 # Viorel Munteanu 
 # depends on dev-python/PyQt6, which is currently masked with all of qt6
 >=net-misc/maestral-qt-1.6.0
-
-# Christopher Byrne  (2022-04-15)
-# Depends on masked dev-libs/openssl-3.0.*
-app-crypt/tpm2-openssl

[gentoo-commits] repo/proj/guru:dev commit in: app-crypt/tpm2-openssl/

2022-10-09 Thread Christopher Byrne 
commit: be634817a1fda3a9584482c6d11ff992742f
Author: Christopher Byrne  gmail  com>
AuthorDate: Sun Oct  9 21:39:55 2022 +
Commit:     Christopher Byrne  gmail  com>
CommitDate: Sun Oct  9 21:42:50 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=be63

app-crypt/tpm2-openssl: drop 1.1.0

Signed-off-by: Christopher Byrne  gmail.com>

 app-crypt/tpm2-openssl/Manifest  |   1 -
 app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild | 112 ---
 2 files changed, 113 deletions(-)

diff --git a/app-crypt/tpm2-openssl/Manifest b/app-crypt/tpm2-openssl/Manifest
index 5bb40e0b3..06860f330 100644
--- a/app-crypt/tpm2-openssl/Manifest
+++ b/app-crypt/tpm2-openssl/Manifest
@@ -1,2 +1 @@
-DIST tpm2-openssl-1.1.0.tar.gz 415118 BLAKE2B 
c82410b1694b5db3e7b6614b1c4e2eef7354c87574334e1e81631bba707398e3d33d975dba2f2cbbf1b09d90f8ae94e7f01531c98b1efd666ca43298a02ead0a
 SHA512 
a57e25d8efcbaa3a898a2803d816169e4227466f9391e5dc7c80a44686865cae0c24ee1973c6376d86d5be8081850f7b35cd0d4cb0b3a8cf654d400d78ae383b
 DIST tpm2-openssl-1.1.1.tar.gz 415093 BLAKE2B 
4f05b04ad059b9e5232bde2426102628927c71360cda5c3a1df02f951a8ecd6e1e036a6373ac5d7fc8209415874c52544eca3195e2361a165bc2c91f99ad85b1
 SHA512 
be4f114b21d15e6baeb7e756a787619d01f20171e86ebc42ea098c98d59ffd2ba648885b345b9d1a9dc3339199eaa6db8335f039587be338c1126e23349b8812

diff --git a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild 
b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild
deleted file mode 100644
index 7ac127f02..0
--- a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="OpenSSL Provider for TPM2 integration"
-
-HOMEPAGE="https://github.com/tpm2-software/tpm2-openssl";
-SRC_URI="https://github.com/tpm2-software/tpm2-openssl/releases/download/${PV}/${P}.tar.gz";
-LICENSE="BSD"
-
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND=">=app-crypt/tpm2-tss-3.2.0:=
-   =dev-libs/openssl-3.0*:0="
-
-DEPEND="${RDEPEND}
-   test? ( app-crypt/swtpm
-   app-crypt/tpm2-abrmd
-   app-crypt/tpm2-tools )"
-
-BDEPEND="sys-devel/autoconf-archive
-virtual/pkgconfig"
-
-RESTRICT="!test? ( test )"
-
-dbus_run() {
-   (
-   # start isolated dbus session bus
-   dbus_data=$(dbus-launch --sh-syntax) || exit
-   eval "${dbus_data}"
-
-   $@
-   ret=${?}
-
-   kill "${DBUS_SESSION_BUS_PID}"
-   exit "${ret}"
-   ) || die
-}
-
-tpm2_run_with_emulator() {
-   export XDG_CONFIG_HOME="${T}/.config/swtpm"
-   "${BROOT}"/usr/share/swtpm/swtpm-create-user-config-files || die
-
-   mkdir -p "${XDG_CONFIG_HOME}/mytpm1" || die
-   swtpm_setup_args=(
-   --tpm2
-   --tpmstate "${XDG_CONFIG_HOME}/mytpm1"
-   --createek
-   --allow-signing
-   --decryption
-   --create-ek-cert
-   --create-platform-cert
-   --lock-nvram
-   --overwrite
-   --display
-   )
-   swtpm_setup "${swtpm_setup_args[@]}" || die
-
-   swtpm_socket_args=(
-   --tpm2
-   --tpmstate dir="${XDG_CONFIG_HOME}/mytpm1"
-   --flags startup-clear
-   --ctrl 
type=unixio,path="${XDG_CONFIG_HOME}/mytpm1/swtpm.socket.ctrl"
-   --server 
type=unixio,path="${XDG_CONFIG_HOME}/mytpm1/swtpm.socket"
-   --pid file="${XDG_CONFIG_HOME}/mytpm1/swtpm.pid"
-   --daemon
-   )
-   swtpm socket "${swtpm_socket_args[@]}" || die
-
-   tpm2_abrmd_args=(
-   --logger=stdout
-   --tcti=swtpm:path="${XDG_CONFIG_HOME}/mytpm1/swtpm.socket"
-   --session
-   --flush-all
-   )
-   tpm2-abrmd "${tpm2_abrmd_args[@]}" &
-
-   export TPM2OPENSSL_TCTI="tabrmd:bus_type=session"
-   export TPM2TOOLS_TCTI="tabrmd:bus_type=session"
-
-   $@ || die
-
-   # When swtpm dies, tmp2-abrmd will exit
-   kill $(< "${XDG_CONFIG_HOME}/mytpm1/swtpm.pid") || die
-}
-
-src_prepare() {
-   # See bug #833887 (and similar); eautoreconf means version information
-   # could be incorrectly embedded
-
-   sed -i \
-   "s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
-   "${S}/configure.ac" || die
-   eautoreconf
-   default
-}
-
-src_install() {
-   default
-   find "${ED}" -iname \*.la -delete || die
-
-   # No libtool files are install, so nothing to check for bug #833887
-}
-
-src_test() {
-   dbus_run tpm2_run_with_emulator make check
-}

[gentoo-commits] repo/proj/guru:dev commit in: app-crypt/tpm2-openssl/

2022-10-09 Thread Christopher Byrne 
commit: 0ebc305f15be628f1f0c163c6c52796b6a0105b0
Author: Christopher Byrne  gmail  com>
AuthorDate: Sun Oct  9 21:39:37 2022 +
Commit:     Christopher Byrne  gmail  com>
CommitDate: Sun Oct  9 21:42:48 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0ebc305f

app-crypt/tpm2-openssl: add 1.1.1

Signed-off-by: Christopher Byrne  gmail.com>

 app-crypt/tpm2-openssl/Manifest  |  1 +
 app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild | 97 
 2 files changed, 98 insertions(+)

diff --git a/app-crypt/tpm2-openssl/Manifest b/app-crypt/tpm2-openssl/Manifest
index f6034158c..5bb40e0b3 100644
--- a/app-crypt/tpm2-openssl/Manifest
+++ b/app-crypt/tpm2-openssl/Manifest
@@ -1 +1,2 @@
 DIST tpm2-openssl-1.1.0.tar.gz 415118 BLAKE2B 
c82410b1694b5db3e7b6614b1c4e2eef7354c87574334e1e81631bba707398e3d33d975dba2f2cbbf1b09d90f8ae94e7f01531c98b1efd666ca43298a02ead0a
 SHA512 
a57e25d8efcbaa3a898a2803d816169e4227466f9391e5dc7c80a44686865cae0c24ee1973c6376d86d5be8081850f7b35cd0d4cb0b3a8cf654d400d78ae383b
+DIST tpm2-openssl-1.1.1.tar.gz 415093 BLAKE2B 
4f05b04ad059b9e5232bde2426102628927c71360cda5c3a1df02f951a8ecd6e1e036a6373ac5d7fc8209415874c52544eca3195e2361a165bc2c91f99ad85b1
 SHA512 
be4f114b21d15e6baeb7e756a787619d01f20171e86ebc42ea098c98d59ffd2ba648885b345b9d1a9dc3339199eaa6db8335f039587be338c1126e23349b8812

diff --git a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild 
b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild
new file mode 100644
index 0..fff830dd8
--- /dev/null
+++ b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenSSL Provider for TPM2 integration"
+
+HOMEPAGE="https://github.com/tpm2-software/tpm2-openssl";
+SRC_URI="https://github.com/tpm2-software/tpm2-openssl/releases/download/${PV}/${P}.tar.gz";
+LICENSE="BSD"
+
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND=">=app-crypt/tpm2-tss-3.2.0:=
+   =dev-libs/openssl-3.0*:0="
+
+DEPEND="${RDEPEND}
+   test? ( app-crypt/swtpm
+   app-crypt/tpm2-abrmd
+   app-crypt/tpm2-tools )"
+
+BDEPEND="sys-devel/autoconf-archive
+virtual/pkgconfig"
+
+RESTRICT="!test? ( test )"
+
+dbus_run() {
+   (
+   # start isolated dbus session bus
+   dbus_data=$(dbus-launch --sh-syntax) || exit
+   eval "${dbus_data}"
+
+   $@
+   ret=${?}
+
+   kill "${DBUS_SESSION_BUS_PID}"
+   exit "${ret}"
+   ) || die
+}
+
+tpm2_run_with_emulator() {
+   export XDG_CONFIG_HOME="${T}/.config/swtpm"
+   "${BROOT}"/usr/share/swtpm/swtpm-create-user-config-files || die
+
+   mkdir -p "${XDG_CONFIG_HOME}/mytpm1" || die
+   swtpm_setup_args=(
+   --tpm2
+   --tpmstate "${XDG_CONFIG_HOME}/mytpm1"
+   --createek
+   --allow-signing
+   --decryption
+   --create-ek-cert
+   --create-platform-cert
+   --lock-nvram
+   --overwrite
+   --display
+   )
+   swtpm_setup "${swtpm_setup_args[@]}" || die
+
+   swtpm_socket_args=(
+   --tpm2
+   --tpmstate dir="${XDG_CONFIG_HOME}/mytpm1"
+   --flags startup-clear
+   --ctrl 
type=unixio,path="${XDG_CONFIG_HOME}/mytpm1/swtpm.socket.ctrl"
+   --server 
type=unixio,path="${XDG_CONFIG_HOME}/mytpm1/swtpm.socket"
+   --pid file="${XDG_CONFIG_HOME}/mytpm1/swtpm.pid"
+   --daemon
+   )
+   swtpm socket "${swtpm_socket_args[@]}" || die
+
+   tpm2_abrmd_args=(
+   --logger=stdout
+   --tcti=swtpm:path="${XDG_CONFIG_HOME}/mytpm1/swtpm.socket"
+   --session
+   --flush-all
+   )
+   tpm2-abrmd "${tpm2_abrmd_args[@]}" &
+
+   export TPM2OPENSSL_TCTI="tabrmd:bus_type=session"
+   export TPM2TOOLS_TCTI="tabrmd:bus_type=session"
+
+   $@ || die
+
+   # When swtpm dies, tmp2-abrmd will exit
+   kill $(< "${XDG_CONFIG_HOME}/mytpm1/swtpm.pid") || die
+}
+
+src_install() {
+   default
+   find "${ED}" -iname \*.la -delete || die
+}
+
+src_test() {
+   dbus_run tpm2_run_with_emulator make check
+}

[gentoo-commits] repo/proj/guru:dev commit in: app-crypt/tpm2-openssl/

2022-09-28 Thread Christopher Byrne 
commit: ce5b974bb8de3f14c9902669998e6ad8eb8901cb
Author: Christopher Byrne  gmail  com>
AuthorDate: Wed Sep 28 15:45:53 2022 +
Commit:     Christopher Byrne  gmail  com>
CommitDate: Wed Sep 28 15:45:53 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ce5b974b

app-crypt/tpm2-openssl: Add missing quoting

Signed-off-by: Christopher Byrne  gmail.com>

 app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild 
b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild
index 2cb119589..7ac127f02 100644
--- a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild
+++ b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild
@@ -43,13 +43,13 @@ dbus_run() {
 }
 
 tpm2_run_with_emulator() {
-   export XDG_CONFIG_HOME=${T}/.config/swtpm
+   export XDG_CONFIG_HOME="${T}/.config/swtpm"
"${BROOT}"/usr/share/swtpm/swtpm-create-user-config-files || die
 
-   mkdir -p ${XDG_CONFIG_HOME}/mytpm1 || die
+   mkdir -p "${XDG_CONFIG_HOME}/mytpm1" || die
swtpm_setup_args=(
--tpm2
-   --tpmstate ${XDG_CONFIG_HOME}/mytpm1
+   --tpmstate "${XDG_CONFIG_HOME}/mytpm1"
--createek
--allow-signing
--decryption
@@ -63,18 +63,18 @@ tpm2_run_with_emulator() {
 
swtpm_socket_args=(
--tpm2
-   --tpmstate dir=${XDG_CONFIG_HOME}/mytpm1
+   --tpmstate dir="${XDG_CONFIG_HOME}/mytpm1"
--flags startup-clear
-   --ctrl 
type=unixio,path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket.ctrl
-   --server type=unixio,path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket
-   --pid file=${XDG_CONFIG_HOME}/mytpm1/swtpm.pid
+   --ctrl 
type=unixio,path="${XDG_CONFIG_HOME}/mytpm1/swtpm.socket.ctrl"
+   --server 
type=unixio,path="${XDG_CONFIG_HOME}/mytpm1/swtpm.socket"
+   --pid file="${XDG_CONFIG_HOME}/mytpm1/swtpm.pid"
--daemon
)
swtpm socket "${swtpm_socket_args[@]}" || die
 
tpm2_abrmd_args=(
--logger=stdout
-   --tcti=swtpm:path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket
+   --tcti=swtpm:path="${XDG_CONFIG_HOME}/mytpm1/swtpm.socket"
--session
--flush-all
)
@@ -86,7 +86,7 @@ tpm2_run_with_emulator() {
$@ || die
 
# When swtpm dies, tmp2-abrmd will exit
-   kill $(< ${XDG_CONFIG_HOME}/mytpm1/swtpm.pid) || die
+   kill $(< "${XDG_CONFIG_HOME}/mytpm1/swtpm.pid") || die
 }
 
 src_prepare() {

[gentoo-commits] repo/proj/guru:dev commit in: app-crypt/tpm2-openssl/

2022-09-27 Thread Christopher Byrne 
commit: f967da3dc0d646f757b7a7807ee89f7e0181dbc7
Author: Christopher Byrne  gmail  com>
AuthorDate: Tue Sep 27 22:05:33 2022 +
Commit:     Christopher Byrne  gmail  com>
CommitDate: Tue Sep 27 22:09:12 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f967da3d

app-crypt/tpm2-openssl: Enable tests

Signed-off-by: Christopher Byrne  gmail.com>

 app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild | 76 ++--
 1 file changed, 72 insertions(+), 4 deletions(-)

diff --git a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild 
b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild
index bce9e94a4..2cb119589 100644
--- a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild
+++ b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild
@@ -13,18 +13,82 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
-
-# Needs IBM's software TPM simulator, which isn't in Portage
-RESTRICT="test"
+IUSE="test"
 
 RDEPEND=">=app-crypt/tpm2-tss-3.2.0:=
=dev-libs/openssl-3.0*:0="
 
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+   test? ( app-crypt/swtpm
+   app-crypt/tpm2-abrmd
+   app-crypt/tpm2-tools )"
 
 BDEPEND="sys-devel/autoconf-archive
 virtual/pkgconfig"
 
+RESTRICT="!test? ( test )"
+
+dbus_run() {
+   (
+   # start isolated dbus session bus
+   dbus_data=$(dbus-launch --sh-syntax) || exit
+   eval "${dbus_data}"
+
+   $@
+   ret=${?}
+
+   kill "${DBUS_SESSION_BUS_PID}"
+   exit "${ret}"
+   ) || die
+}
+
+tpm2_run_with_emulator() {
+   export XDG_CONFIG_HOME=${T}/.config/swtpm
+   "${BROOT}"/usr/share/swtpm/swtpm-create-user-config-files || die
+
+   mkdir -p ${XDG_CONFIG_HOME}/mytpm1 || die
+   swtpm_setup_args=(
+   --tpm2
+   --tpmstate ${XDG_CONFIG_HOME}/mytpm1
+   --createek
+   --allow-signing
+   --decryption
+   --create-ek-cert
+   --create-platform-cert
+   --lock-nvram
+   --overwrite
+   --display
+   )
+   swtpm_setup "${swtpm_setup_args[@]}" || die
+
+   swtpm_socket_args=(
+   --tpm2
+   --tpmstate dir=${XDG_CONFIG_HOME}/mytpm1
+   --flags startup-clear
+   --ctrl 
type=unixio,path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket.ctrl
+   --server type=unixio,path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket
+   --pid file=${XDG_CONFIG_HOME}/mytpm1/swtpm.pid
+   --daemon
+   )
+   swtpm socket "${swtpm_socket_args[@]}" || die
+
+   tpm2_abrmd_args=(
+   --logger=stdout
+   --tcti=swtpm:path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket
+   --session
+   --flush-all
+   )
+   tpm2-abrmd "${tpm2_abrmd_args[@]}" &
+
+   export TPM2OPENSSL_TCTI="tabrmd:bus_type=session"
+   export TPM2TOOLS_TCTI="tabrmd:bus_type=session"
+
+   $@ || die
+
+   # When swtpm dies, tmp2-abrmd will exit
+   kill $(< ${XDG_CONFIG_HOME}/mytpm1/swtpm.pid) || die
+}
+
 src_prepare() {
# See bug #833887 (and similar); eautoreconf means version information
# could be incorrectly embedded
@@ -42,3 +106,7 @@ src_install() {
 
# No libtool files are install, so nothing to check for bug #833887
 }
+
+src_test() {
+   dbus_run tpm2_run_with_emulator make check
+}

[gentoo-commits] repo/proj/guru:dev commit in: app-crypt/tpm2-openssl/

2022-04-16 Thread Christopher Byrne 
commit: 3792ef163b7f88687cbcdb0a28432ba152cf7c3b
Author: Christopher Byrne  gmail  com>
AuthorDate: Sat Apr 16 17:57:33 2022 +
Commit:     Christopher Byrne  gmail  com>
CommitDate: Sat Apr 16 17:59:49 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3792ef16

app-crypt/tpm2-openssl: Add missing DEPEND="${RDEPEND}"

Signed-off-by: Christopher Byrne  gmail.com>

 app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild 
b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild
index 036fbb971..10a17e8b5 100644
--- a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild
+++ b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild
@@ -20,6 +20,8 @@ RESTRICT="test"
 RDEPEND=">=app-crypt/tpm2-tss-3.2.0:=
=dev-libs/openssl-3.0*:0="
 
+DEPEND="${RDEPEND}"
+
 BDEPEND="sys-devel/autoconf-archive
 virtual/pkgconfig"

[gentoo-commits] repo/proj/guru:dev commit in: app-crypt/tpm2-openssl/

2022-04-15 Thread Christopher Byrne 
commit: 63290304faf483c3b020e115ef76162a9f9c29bf
Author: Christopher Byrne  gmail  com>
AuthorDate: Sat Apr 16 00:45:34 2022 +
Commit:     Christopher Byrne  gmail  com>
CommitDate: Sat Apr 16 00:47:40 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=63290304

app-crypt/tpm2-openssl: Add missing || die to find

Signed-off-by: Christopher Byrne  gmail.com>

 app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild 
b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild
index ac786eeec..036fbb971 100644
--- a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild
+++ b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild
@@ -36,7 +36,7 @@ src_prepare() {
 
 src_install() {
default
-   find ${ED} -iname \*.la -delete
+   find ${ED} -iname \*.la -delete || die
 
# No libtool files are install, so nothing to check for bug #833887
 }

[gentoo-commits] repo/proj/guru:dev commit in: profiles/, app-crypt/tpm2-openssl/

2022-04-15 Thread Christopher Byrne 
commit: 03ab7d4beb9b991a06c054c90e820610ed9be64e
Author: Christopher Byrne  gmail  com>
AuthorDate: Fri Apr 15 23:07:41 2022 +
Commit:     Christopher Byrne  gmail  com>
CommitDate: Fri Apr 15 23:19:17 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=03ab7d4b

app-crypt/tpm2-openssl: initial import

Signed-off-by: Christopher Byrne  gmail.com>

 app-crypt/tpm2-openssl/Manifest  |  1 +
 app-crypt/tpm2-openssl/metadata.xml  | 12 +++
 app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild | 42 
 profiles/package.mask|  4 +++
 4 files changed, 59 insertions(+)

diff --git a/app-crypt/tpm2-openssl/Manifest b/app-crypt/tpm2-openssl/Manifest
new file mode 100644
index 0..f6034158c
--- /dev/null
+++ b/app-crypt/tpm2-openssl/Manifest
@@ -0,0 +1 @@
+DIST tpm2-openssl-1.1.0.tar.gz 415118 BLAKE2B 
c82410b1694b5db3e7b6614b1c4e2eef7354c87574334e1e81631bba707398e3d33d975dba2f2cbbf1b09d90f8ae94e7f01531c98b1efd666ca43298a02ead0a
 SHA512 
a57e25d8efcbaa3a898a2803d816169e4227466f9391e5dc7c80a44686865cae0c24ee1973c6376d86d5be8081850f7b35cd0d4cb0b3a8cf654d400d78ae383b

diff --git a/app-crypt/tpm2-openssl/metadata.xml 
b/app-crypt/tpm2-openssl/metadata.xml
new file mode 100644
index 0..fdd29c016
--- /dev/null
+++ b/app-crypt/tpm2-openssl/metadata.xml
@@ -0,0 +1,12 @@
+
+https://www.gentoo.org/dtd/metadata.dtd";>
+
+   
+   salah.coro...@gmail.com
+   Christopher Byrne
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+

diff --git a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild 
b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild
new file mode 100644
index 0..ac786eeec
--- /dev/null
+++ b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="OpenSSL Provider for TPM2 integration"
+
+HOMEPAGE="https://github.com/tpm2-software/tpm2-openssl";
+SRC_URI="https://github.com/tpm2-software/tpm2-openssl/releases/download/${PV}/${P}.tar.gz";
+LICENSE="BSD"
+
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+
+# Needs IBM's software TPM simulator, which isn't in Portage
+RESTRICT="test"
+
+RDEPEND=">=app-crypt/tpm2-tss-3.2.0:=
+   =dev-libs/openssl-3.0*:0="
+
+BDEPEND="sys-devel/autoconf-archive
+virtual/pkgconfig"
+
+src_prepare() {
+   # See bug #833887 (and similar); eautoreconf means version information
+   # could be incorrectly embedded
+
+   sed -i \
+   "s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
+   "${S}/configure.ac" || die
+   eautoreconf
+   default
+}
+
+src_install() {
+   default
+   find ${ED} -iname \*.la -delete
+
+   # No libtool files are install, so nothing to check for bug #833887
+}

diff --git a/profiles/package.mask b/profiles/package.mask
index 8cc1d3aef..c0005fa2f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -9,6 +9,10 @@
 # TODO: Either fix per profile masking in overlays, or move
 # relevant entries to the relevant package.mask files in ::gentoo
 
+# Christopher Byrne  (2022-04-15)
+# Depends on masked dev-libs/openssl-3.0.*
+app-crypt/tpm2-openssl
+
 # Adrian Schollmeyer  (2022-03-15)
 # Package will be removed after 2022-04-15 from ::guru, since it is no longer
 # being used by net-im/abaddon and has no other reverse dependencies.