diff --git a/sdata/dist-gentoo/illogical-impulse-quickshell-git/illogical-impulse-quickshell-git-9999-r5.ebuild b/sdata/dist-gentoo/illogical-impulse-quickshell-git/illogical-impulse-quickshell-git-0.1.0-r6.ebuild similarity index 70% rename from sdata/dist-gentoo/illogical-impulse-quickshell-git/illogical-impulse-quickshell-git-9999-r5.ebuild rename to sdata/dist-gentoo/illogical-impulse-quickshell-git/illogical-impulse-quickshell-git-0.1.0-r6.ebuild index f7bc4a155..5d8358638 100644 --- a/sdata/dist-gentoo/illogical-impulse-quickshell-git/illogical-impulse-quickshell-git-9999-r5.ebuild +++ b/sdata/dist-gentoo/illogical-impulse-quickshell-git/illogical-impulse-quickshell-git-0.1.0-r6.ebuild @@ -9,62 +9,62 @@ DESCRIPTION="Toolkit for building desktop widgets using QtQuick" HOMEPAGE="https://quickshell.org/" EGIT_REPO_URI="https://github.com/quickshell-mirror/quickshell.git" -EGIT_COMMIT="6e17efab83d3a5ad5d6e59bc08d26095c6660502" +EGIT_COMMIT="7511545ee20664e3b8b8d3322c0ffe7567c56f7a" KEYWORDS="~amd64 ~arm64 ~x86" LICENSE="LGPL-3" SLOT="0" -# Upstream recommends leaving all build options enabled by default -IUSE="+breakpad +jemalloc +sockets +wayland +layer-shell +session-lock +toplevel-management +screencopy +X +pipewire +tray +mpris +pam +hyprland +hyprland-global-shortcuts +hyprland-focus-grab +i3 +i3-ipc +bluetooth" + +IUSE="-breakpad +jemalloc +sockets +wayland +layer-shell +session-lock +toplevel-management +screencopy +X +pipewire +tray +mpris +pam +hyprland +hyprland-global-shortcuts +hyprland-focus-grab -i3 -i3-ipc +bluetooth" RDEPEND=" - dev-qt/qtbase:6 - dev-qt/qtsvg:6 - dev-qt/qt5compat:6 - - dev-qt/qtimageformats:6 - dev-qt/qtmultimedia:6 - dev-qt/qtpositioning:6 - dev-qt/qtquicktimeline:6 - dev-qt/qtsensors:6 - dev-qt/qtsvg:6 - dev-qt/qttools:6 - dev-qt/qttranslations:6 - dev-qt/qtvirtualkeyboard:6 - dev-qt/qtwayland:6 + dev-qt/qtbase:6= + dev-qt/qtdeclarative:6= + dev-qt/qt5compat:6= + kde-frameworks/kimageformats:6=[avif] + dev-cpp/cpptrace[unwind] + dev-qt/qtimageformats:6= + dev-qt/qtmultimedia:6= + dev-qt/qtpositioning:6= + dev-qt/qtquicktimeline:6= + dev-qt/qtsensors:6= + dev-qt/qtsvg:6= + dev-qt/qttools:6= + dev-qt/qttranslations:6= + dev-qt/qtvirtualkeyboard:6= + dev-qt/qtwayland:6= kde-apps/kdialog - kde-frameworks/syntax-highlighting:6 - kde-frameworks/kirigami + kde-frameworks/syntax-highlighting:6= + kde-frameworks/kirigami:6= - jemalloc? ( dev-libs/jemalloc ) + jemalloc? ( dev-libs/jemalloc:= ) wayland? ( dev-libs/wayland - dev-qt/qtwayland:6 + dev-qt/qtwayland:6= ) screencopy? ( x11-libs/libdrm media-libs/mesa ) - X? ( x11-libs/libxcb ) - pipewire? ( media-video/pipewire ) - mpris? ( dev-qt/qtdbus ) + X? ( x11-libs/libxcb:= ) + pipewire? ( media-video/pipewire:= ) + mpris? ( dev-qt/qtdbus:= ) pam? ( sys-libs/pam ) bluetooth? ( net-wireless/bluez ) " DEPEND="${RDEPEND}" BDEPEND=" - || ( >=sys-devel/gcc-14:* >=llvm-core/clang-17:* ) + dev-cpp/cli11 + dev-build/cmake + dev-vcs/git + dev-build/ninja + dev-qt/qtshadertools dev-util/spirv-tools - dev-qt/qtshadertools:6 wayland? ( dev-util/wayland-scanner dev-libs/wayland-protocols ) - dev-cpp/cli11 - dev-build/ninja - dev-build/cmake - dev-vcs/git virtual/pkgconfig breakpad? ( dev-util/breakpad ) dev-util/vulkan-headers @@ -74,7 +74,7 @@ src_configure(){ mycmakeargs=( -DCMAKE_BUILD_TYPE=RelWithDebInfo -DDISTRIBUTOR="Gentoo Illogical-Impulses" - -DINSTALL_QML_PREFIX="lib64/qt6/qml" + -DINSTALL_QML_PREFIX="$(get_libdir)/qt6/qml" -DCRASH_REPORTER=$(usex breakpad ON OFF) -DUSE_JEMALLOC=$(usex jemalloc ON OFF) -DSOCKETS=$(usex sockets ON OFF) diff --git a/sdata/dist-gentoo/install-deps.sh b/sdata/dist-gentoo/install-deps.sh index f763fdceb..1cbbdb966 100644 --- a/sdata/dist-gentoo/install-deps.sh +++ b/sdata/dist-gentoo/install-deps.sh @@ -52,7 +52,6 @@ v sudo sh -c 'cat ./sdata/dist-gentoo/additional-useflags >> /etc/portage/packag v sudo emerge --sync v sudo emerge --quiet --newuse --update --deep @world v sudo emerge --quiet @smart-live-rebuild -v sudo emerge --depclean # Remove old ebuilds (if this isn't done the wildcard will fuck upon a version change) x sudo rm -fr ${ebuild_dir}/app-misc/illogical-impulse-* @@ -66,3 +65,5 @@ for i in "${metapkgs[@]}"; do v sudo ebuild ${ebuild_dir}/app-misc/${i}/*.ebuild digest v sudo emerge --update --quiet app-misc/${i} done + +v sudo emerge --depclean diff --git a/sdata/dist-gentoo/keywords b/sdata/dist-gentoo/keywords index 238200763..0d4eaaf5e 100644 --- a/sdata/dist-gentoo/keywords +++ b/sdata/dist-gentoo/keywords @@ -54,3 +54,5 @@ media-fonts/readex-pro media-fonts/rubik-vf app-misc/songrec dev-cpp/glaze +dev-cpp/cpptrace +dev-libs/libdwarf diff --git a/sdata/dist-gentoo/useflags b/sdata/dist-gentoo/useflags index e94832d36..c3d979e6d 100644 --- a/sdata/dist-gentoo/useflags +++ b/sdata/dist-gentoo/useflags @@ -111,7 +111,9 @@ sys-power/upower introspection gui-apps/fuzzel png svg dev-libs/glib dbus elf introspection mime xattr # ngl idk about nm-connection-editor. Works fine without -gui-apps/quickshell -X -i3 -i3-ipc breakpad bluetooth hyprland hyprland-focus-grab hyprland-global-shortcuts jemalloc layer-shell mpris pam pipewire screencopy session-lock sockets toplevel-management tray wayland #app-i18n/translate-shell (nothing needed) #gui-apps/wlogout (no use flags) media-gfx/imagemagick xml + +################### OTHER ################### +dev-cpp/cpptrace unwind