commit: 658e9638e12b59985cf9bafee21b702a6eb02126
parent 7c7abfd591ca3c50d0baa1a396f26329e8318596
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Sat, 7 Feb 2026 13:20:29 +0100
x11-misc/qarma: drop 9999, add 1.1.0
Diffstat:
5 files changed, 144 insertions(+), 32 deletions(-)
diff --git a/x11-misc/qarma/Manifest b/x11-misc/qarma/Manifest
@@ -0,0 +1 @@
+DIST qarma-1.1.0.tar.gz 31710 BLAKE2B 3d099fb3b570a5f17a20262b65475e7bbfcb00b4ceee0604e5b1899132c59eb3296e3614b408b1d2d43251237db2ceaae6e2363e7d73287e5d3d5dbcbc614c66 SHA512 a1b8c33eb670aa1b63fd86c021cb8b0269e755146fc6f9de12099c5db3b220ba8ff61a1951df0d6d551baea4ef439318364613f7e80f6bcb1297e9004ed42943
diff --git a/x11-misc/qarma/files/1.1.0-0001-Make-DBus-optionnal.patch b/x11-misc/qarma/files/1.1.0-0001-Make-DBus-optionnal.patch
@@ -0,0 +1,67 @@
+From 984683b6c0639f51040b4ad238183cd2b0e95776 Mon Sep 17 00:00:00 2001
+From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
+Date: Sat, 13 Jun 2020 06:49:18 +0200
+Subject: [PATCH 1/2] Make DBus optionnal
+
+---
+ Qarma.cpp | 4 ++++
+ qarma.pro | 7 ++++++-
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/Qarma.cpp b/Qarma.cpp
+index bc746f8..69e5b20 100644
+--- a/Qarma.cpp
++++ b/Qarma.cpp
+@@ -26,9 +26,11 @@
+ #include <QComboBox>
+ #include <QCryptographicHash>
+ #include <QDate>
++#ifdef DBUS_ENABLED
+ #include <QDBusConnection>
+ #include <QDBusConnectionInterface>
+ #include <QDBusInterface>
++#endif
+ #include <QDialogButtonBox>
+ #include <QEvent>
+ #include <QFileDialog>
+@@ -1150,6 +1152,7 @@ char Qarma::showList(const QStringList &args)
+
+ void Qarma::notify(const QString message, bool noClose)
+ {
++#ifdef DBUS_ENABLED
+ if (QDBusConnection::sessionBus().interface()->isServiceRegistered("org.freedesktop.Notifications")) {
+ QDBusInterface notifications("org.freedesktop.Notifications", "/org/freedesktop/Notifications", "org.freedesktop.Notifications");
+ const QString summary = (message.length() < 32) ? message : message.left(25) + "...";
+@@ -1181,6 +1184,7 @@ void Qarma::notify(const QString message, bool noClose)
+ SHOW_DIALOG
+ dlg->adjustSize();
+ dlg->move(QGuiApplication::screens().at(0)->availableGeometry().topRight() - QPoint(dlg->width() + 20, -20));
++#endif
+ }
+
+ char Qarma::showNotification(const QStringList &args)
+diff --git a/qarma.pro b/qarma.pro
+index 8cb4d2a..c904d66 100644
+--- a/qarma.pro
++++ b/qarma.pro
+@@ -1,11 +1,16 @@
+ HEADERS = Qarma.h
+ SOURCES = Qarma.cpp
+-QT += dbus gui widgets
++QT += gui widgets
+ lessThan(QT_MAJOR_VERSION, 6){
+ unix:!macx:QT += x11extras
+ }
+ TARGET = qarma
+
++!DISABLE_DBUS {
++ DEFINES += DBUS_ENABLED
++ QT += dbus
++}
++
+ unix:!macx:LIBS += -lX11
+ unix:!macx:DEFINES += WS_X11
+
+--
+2.52.0
+
diff --git a/x11-misc/qarma/files/1.1.0-0002-Allow-to-disable-X11-support.patch b/x11-misc/qarma/files/1.1.0-0002-Allow-to-disable-X11-support.patch
@@ -0,0 +1,43 @@
+From eec210940c85f92c93759abc1733d28a4af43163 Mon Sep 17 00:00:00 2001
+From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
+Date: Sat, 7 Feb 2026 13:06:59 +0100
+Subject: [PATCH 2/2] Allow to disable X11 support
+
+---
+ qarma.pro | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/qarma.pro b/qarma.pro
+index c904d66..eeee4b6 100644
+--- a/qarma.pro
++++ b/qarma.pro
+@@ -1,9 +1,6 @@
+ HEADERS = Qarma.h
+ SOURCES = Qarma.cpp
+ QT += gui widgets
+-lessThan(QT_MAJOR_VERSION, 6){
+- unix:!macx:QT += x11extras
+-}
+ TARGET = qarma
+
+ !DISABLE_DBUS {
+@@ -11,8 +8,14 @@ TARGET = qarma
+ QT += dbus
+ }
+
+-unix:!macx:LIBS += -lX11
+-unix:!macx:DEFINES += WS_X11
++!DISABLE_X11 {
++ unix:!macx:LIBS += -lX11
++ unix:!macx:DEFINES += WS_X11
++
++ lessThan(QT_MAJOR_VERSION, 6){
++ unix:!macx:QT += x11extras
++ }
++}
+
+ # override: qmake PREFIX=/some/where/else
+ isEmpty(PREFIX) {
+--
+2.52.0
+
diff --git a/x11-misc/qarma/qarma-1.1.0.ebuild b/x11-misc/qarma/qarma-1.1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2020-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils
+
+DESCRIPTION="Zenity Clone for Qt5 (lanodan's branch)"
+HOMEPAGE="https://github.com/lanodan/qarma"
+SRC_URI="https://github.com/luebking/qarma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+dbus +X"
+
+DEPEND="dev-qt/qtbase:6[X?,dbus?,gui,widgets]"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/1.1.0-0001-Make-DBus-optionnal.patch"
+ "${FILESDIR}/1.1.0-0002-Allow-to-disable-X11-support.patch"
+)
+
+src_configure() {
+ eqmake6 \
+ $(usex dbus "" "CONFIG+=DISABLE_DBUS") \
+ $(usex X "" "CONFIG+=DISABLE_X11")
+}
+
+src_install() {
+ dobin qarma
+}
diff --git a/x11-misc/qarma/qarma-9999.ebuild b/x11-misc/qarma/qarma-9999.ebuild
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit git-r3 qmake-utils
-
-DESCRIPTION="Zenity Clone for Qt5 (lanodan's branch)"
-HOMEPAGE="https://github.com/lanodan/qarma"
-EGIT_REPO_URI="https://github.com/lanodan/qarma"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="+dbus"
-
-DEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- dbus? ( dev-qt/qtdbus:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- eqmake5 $(usex dbus "" "CONFIG+=DISABLE_DBUS")
-}
-
-src_install() {
- dobin qarma
-}
