use new ebuilds

sdata/dist-gentoo/illogical-impulse-bibata-modern-classic-bin/illogical-impulse-bibata-modern-classic-bin-2.0.6-r1.ebuild

@@ -2,11 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-Bibata_VER=2.0.6
 
 DESCRIPTION="Material Based Cursor Theme, installed for illogical-impulse dotfiles"
 HOMEPAGE=""
-SRC_URI="https://github.com/ful1e5/Bibata_Cursor/releases/download/v${Bibata_VER}/Bibata-Modern-Classic.tar.xz -> bibata-modern-classic.tar.xz"
+SRC_URI="https://github.com/ful1e5/Bibata_Cursor/releases/download/v${PV}/Bibata-Modern-Classic.tar.xz -> bibata-modern-classic.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"

sdata/dist-gentoo/illogical-impulse-fonts-themes/illogical-impulse-fonts-themes-1.0-r1.ebuild

@@ -2,23 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-DART_SASS_VER=1.78.0
-SPACE_GROTESK_VER=1.1.4
 
 DESCRIPTION="Illogical Impulse Fonts and Theming Dependencies"
-HOMEPAGE=""
+
-SRC_URI="
-https://github.com/Bali10050/Darkly/archive/refs/heads/main.tar.gz -> ${P}-darkly.tar.gz
-https://github.com/naipefoundry/gabarito/archive/refs/heads/main.tar.gz -> ${P}-gabarito.tar.gz
-https://github.com/googlefonts/rubik/archive/refs/heads/main.tar.gz -> ${P}-rubik.tar.gz
-https://github.com/ThomasJockin/readexpro/archive/refs/heads/master.tar.gz -> ${P}-readexpro.tar.gz
-https://github.com/mjkim0727/breeze-plus/archive/refs/heads/main.tar.gz -> ${P}-breeze-plus.tar.gz
-https://github.com/lassekongo83/adw-gtk3/archive/refs/heads/main.tar.gz -> ${P}-adw-gtk3.tar.gz
-https://github.com/google/material-design-icons/raw/refs/heads/master/variablefont/MaterialSymbolsOutlined%5BFILL,GRAD,opsz,wght%5D.ttf -> MaterialSymbolsOutlined.ttf
-    https://github.com/google/material-design-icons/raw/refs/heads/master/variablefont/MaterialSymbolsRounded%5BFILL,GRAD,opsz,wght%5D.ttf -> MaterialSymbolsRounded.ttf
-    https://github.com/google/material-design-icons/raw/refs/heads/master/variablefont/MaterialSymbolsSharp%5BFILL,GRAD,opsz,wght%5D.ttf -> MaterialSymbolsSharp.ttf
-https://github.com/floriankarsten/space-grotesk/archive/refs/tags/${SPACE_GROTESK_VER}.tar.gz -> ${P}-space-grotesk-${SPACE_GROTESK_VER}.tar.gz
-"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
@@ -26,66 +12,30 @@ RESTRICT="strip"
 
 DEPEND=""
 RDEPEND="
+	x11-themes/adw-gtk3
 	kde-plasma/breeze
+	kde-plasma/breeze-plus
+	app-misc/darkly
 	sys-apps/eza
 	app-shells/fish
 	media-libs/fontconfig
 	x11-terms/kitty
 	x11-misc/matugen
+	media-fonts/space-grotesk
 	app-shells/starship
+	media-fonts/gabarito
 	media-fonts/jetbrains-mono
+	media-fonts/material-symbols-variable
+	media-fonts/readex-pro
+
+	media-fonts/rubik-vf
 	media-fonts/twemoji
 "
-
+##### CUSTOM EBUILDS
-# Source directories
+# x11-themes/adw-gtk3
-S="${WORKDIR}"
+# app-misc/darkly
-S_DARKLY="${S}/Darkly-main"
+# media-fonts/space-grotesk
-S_GABARITO="${S}/gabarito-main"
+# media-fonts/gabarito
-S_RUBIK="${S}/rubik-main"
+# media-fonts/material-symbols-variable
-S_READEXPRO="${S}/readexpro-master"
+# media-fonts/readex-pro
-S_ADW_GTK3="${S}/adw-gtk3-main"
+# media-fonts/rubik-vf
-S_BREEZE_PLUS="${S}/breeze-plus-main"
-S_SPACE_GROTESK="${S}/space-grotesk-${SPACE_GROTESK_VER}"
-
-src_unpack() {
-	default
-
-	mv "${WORKDIR}/dart-sass-${DART_SASS_VER}-linux-x64" "${S_DART_SASS}"
-}
-
-src_compile() {
-	cd "${S_DARKLY}"
-	mkdir -p build
-	cd build
-	cmake .. -DBUILD_QT5=OFF -DBUILD_QT6=ON
-	cmake --build . --parallel=$(nproc)
-
-	cd "${S_ADW_GTK3}"
-	meson setup build
-	meson compile -C build
-}
-
-src_install() {
-	cd "${S_DARKLY}/build"
-	cmake --install . --destdir="${D}"
-
-	insinto /usr/share/fonts/ttf-gabarito
-	doins "${S_GABARITO}"/fonts/ttf/*.ttf
-
-	insinto /usr/share/fonts/ttf-readex-pro
-	doins "${S_READEXPRO}"/fonts/ttf/*.ttf
-
-	insinto /usr/share/fonts/material-symbols
-	doins "${DISTDIR}"/MaterialSymbols*.ttf
-
-	insinto /usr/share/fonts/OTF
-	doins "${S_SPACE_GROTESK}"/fonts/otf/*.otf
-
-	insinto /usr/share/themes
-	doins -r "${S_BREEZE_PLUS}"/src/breeze-plus*
-
-	cd "${S_ADW_GTK3}"
-	meson install -C build --destdir="${D}"
-
-	fc-cache -f
-}

sdata/dist-gentoo/illogical-impulse-microtex-git/illogical-impulse-microtex-git-1.0-r1.ebuild

@@ -21,7 +21,6 @@ RDEPEND="
 	dev-cpp/cairomm
 "
 
-# Use WORKDIR directly after stripping top-level folder
 S="${WORKDIR}"
 
 src_unpack() {
@@ -38,7 +37,7 @@ src_prepare() {
 }
 
 src_compile() {
-	cd "${S}" || die
+	cd "${S}"
 	mkdir -p build
 	cmake -B build -S . -DCMAKE_BUILD_TYPE=None
 	cmake --build build

sdata/dist-gentoo/illogical-impulse-oneui4-icons-git/illogical-impulse-oneui4-icons-git-1.0-r1.ebuild

@@ -9,7 +9,7 @@ SRC_URI="https://github.com/end-4/OneUI4-Icons/archive/main.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64 ~x86"
 RESTRICT="strip"
 
 DEPEND=""

sdata/dist-gentoo/illogical-impulse-widgets/illogical-impulse-widgets-1.0-r3.ebuild

@@ -3,17 +3,12 @@
 
 EAPI=8
 
-SONGREC_VER="0.4.3"
-
 DESCRIPTION="Illogicall Impulse Widget Dependencies"
 HOMEPAGE=""
-SRC_URI="https://github.com/marin-m/SongRec/archive/${SONGREC_VER}.tar.gz -> ${P}-SongRec.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-# need for cargo fetch, idk how to get around it if possible
-RESTRICT="strip network-sandbox"
 
 DEPEND=""
 RDEPEND="
@@ -21,47 +16,11 @@ RDEPEND="
 	dev-libs/glib
 	media-gfx/imagemagick
 	gui-apps/hypridle
-	gui-libs/hyprutils
 	gui-apps/hyprlock
 	gui-apps/hyprpicker
+	app-misc/songrec
 	app-i18n/translate-shell
 	gui-apps/wlogout
 "
-
+##### CUSTOM EBUILDS
-S="${WORKDIR}/SongRec-${SONGREC_VER}"
+# app-misc/songrec
-
-src_prepare() {
-	default
-	export CARGO_HOME="${WORKDIR}/cargo"
-	cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
-}
-
-src_compile() {
-		export CARGO_HOME="${WORKDIR}/cargo"
-	cargo build --release --frozen --offline
-
-}
-
-src_install() {
-	dobin target/release/songrec
-	insinto /usr/share/applications
-
-	doins packaging/rootfs/usr/share/applications/com.github.marinm.songrec.desktop
-
-	insinto /usr/share/icons/hicolor/scalable/apps
-	doins packaging/rootfs/usr/share/icons/hicolor/scalable/apps/com.github.marinm.songrec.svg
-
-	insinto /usr/share/metainfo
-	doins packaging/rootfs/usr/share/metainfo/com.github.marinm.songrec.metainfo.xml
-
-	insinto /usr/share/songrec/translations
-	doins -r translations/*
-
-	dodoc README.md
-}
-
-
-
-
-
-

sdata/dist-gentoo/import-local-pkgs.sh

@@ -0,0 +1,33 @@
+HYPR_DIR="local-pkgs/hyprland"
+FT_DIR="local-pkgs/fonts-and-themes"
+WIDGETS_DIR="local-pkgs/widgets"
+
+function import_ebuild(){
+	from_dir="$1"
+	to_dir="$2"
+	ename="$3"
+	x sudo rm -rf "${ebuild_dir}/${to_dir}/${ename}"
+	x sudo mkdir -p "${ebuild_dir}/${to_dir}/${ename}"
+	v sudo cp ./sdata/dist-gentoo/${from_dir}/${ename}*.ebuild "${ebuild_dir}/${to_dir}/${ename}"
+	v sudo ebuild "${ebuild_dir}/${to_dir}/${ename}/${ename}"*.ebuild digest
+}
+
+############### HYPRLAND
+import_ebuild "${HYPR_DIR}" "dev-libs" "hyprgraphics"
+import_ebuild "${HYPR_DIR}" "gui-libs" "hyprland-qt-support"
+import_ebuild "${HYPR_DIR}" "gui-libs" "hyprland-qtutils"
+import_ebuild "${HYPR_DIR}" "dev-libs" "hyprlang"
+import_ebuild "${HYPR_DIR}" "dev-util" "hyprwayland-scanner"
+
+############### FONTS AND THEMES
+import_ebuild "${HYPR_DIR}" "dev-libs" "hyprgraphics"
+import_ebuild "${FT_DIR}" "media-fonts" "gabarito"
+import_ebuild "${FT_DIR}" "media-fonts" "material-symbols-variable"
+import_ebuild "${FT_DIR}" "media-fonts" "readex-pro"
+import_ebuild "${FT_DIR}" "media-fonts" "rubik-vf"
+import_ebuild "${FT_DIR}" "media-fonts" "space-grotesk"
+import_ebuild "${FT_DIR}" "kde-plasma" "breeze-plus"
+import_ebuild "${FT_DIR}" "x11-themes" "darkly"
+
+############### WIDGETS
+import_ebuild "${WIDGETS_DIR}" "app-misc" "songrec"

sdata/dist-gentoo/install-deps.sh

@@ -18,8 +18,8 @@ printf "${STY_RST}"
 pause
 
 printf "${STY_YELLOW}"
-printf "https://github.com/end-4/dots-hyprland/blob/main/sdata/dist-gentoo/README.md"
+printf "https://github.com/end-4/dots-hyprland/blob/main/sdata/dist-gentoo/README.md\n"
-printf "Checkout the above README for potential bug fixes or additional information"
+printf "Checkout the above README for potential bug fixes or additional information\n\n"
 printf "${STY_RST}"
 pause
 
@@ -60,27 +60,7 @@ 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-*
 
-###### LIVE EBUILDS START
+source ./sdata/dist-gentoo/import-local-pkgs.sh
-HYPR_DIR="illogical-impulse-hyprland"
-x sudo mkdir -p ${ebuild_dir}/dev-libs/hyprgraphics/
-x sudo mkdir -p ${ebuild_dir}/gui-libs/hyprland-qt-support
-x sudo mkdir -p ${ebuild_dir}/gui-libs/hyprland-qtutils
-x sudo mkdir -p ${ebuild_dir}/dev-libs/hyprlang
-x sudo mkdir -p ${ebuild_dir}/dev-libs/hyprlang
-x sudo mkdir -p ${ebuild_dir}/dev-util/hyprwayland-scanner
-
-v sudo cp ./sdata/dist-gentoo/${HYPR_DIR}/hyprgraphics*.ebuild ${ebuild_dir}/dev-libs/hyprgraphics
-v sudo cp ./sdata/dist-gentoo/${HYPR_DIR}/hyprland-qt-support*.ebuild ${ebuild_dir}/gui-libs/hyprland-qt-support
-v sudo cp ./sdata/dist-gentoo/${HYPR_DIR}/hyprland-qtutils*.ebuild ${ebuild_dir}/gui-libs/hyprland-qtutils
-v sudo cp ./sdata/dist-gentoo/${HYPR_DIR}/hyprlang*.ebuild ${ebuild_dir}/dev-libs/hyprlang
-v sudo cp ./sdata/dist-gentoo/${HYPR_DIR}/hyprwayland-scanner*.ebuild ${ebuild_dir}/dev-util/hyprwayland-scanner
-
-v sudo ebuild ${ebuild_dir}/dev-libs/hyprgraphics/hyprgraphics*9999.ebuild digest
-v sudo ebuild ${ebuild_dir}/gui-libs/hyprland-qt-support/hyprland-qt-support*9999.ebuild digest
-v sudo ebuild ${ebuild_dir}/gui-libs/hyprland-qtutils/hyprland-qtutils*9999.ebuild digest
-v sudo ebuild ${ebuild_dir}/dev-libs/hyprlang/hyprlang*9999.ebuild digest
-v sudo ebuild ${ebuild_dir}/dev-util/hyprwayland-scanner/hyprwayland-scanner*9999.ebuild digest
-###### LIVE EBUILDS END
 
 # Install dependencies
 for i in "${metapkgs[@]}"; do

sdata/dist-gentoo/keywords

@@ -43,3 +43,10 @@ x11-libs/libxkbcommon
 dev-util/breakpad
 dev-libs/linux-syscall-support
 dev-embedded/libdisasm
+kde-plasma/breeze-plus
+media-fonts/space-grotesk
+media-fonts/gabarito **
+media-fonts/material-symbols-variable **
+media-fonts/readex-pro
+media-fonts/rubik-vf
+app-misc/songrec

sdata/dist-gentoo/local-pkgs/fonts-and-themes/breeze-plus-6.2.5-r1.ebuild

@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mjkim0727/breeze-plus/archive/refs/tags/${PV}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 RDEPEND="kde-plasma/breeze"
 BDEPEND=""
 

sdata/dist-gentoo/local-pkgs/fonts-and-themes/material-symbols-variable-9999.ebuild

@@ -0,0 +1,40 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit font
+
+DESCRIPTION="Material Design icons by Google - variable fonts"
+HOMEPAGE="https://github.com/google/material-design-icons"
+
+BASE_URL="https://github.com/google/material-design-icons/raw/refs/heads/master"
+
+SRC_URI="
+	${BASE_URL}/variablefont/MaterialSymbolsOutlined%5BFILL,GRAD,opsz,wght%5D.ttf -> MaterialSymbolsOutlined-FILL-GRAD-opsz-wght.ttf
+	${BASE_URL}/variablefont/MaterialSymbolsRounded%5BFILL,GRAD,opsz,wght%5D.ttf -> MaterialSymbolsRounded-FILL-GRAD-opsz-wght.ttf
+	${BASE_URL}/variablefont/MaterialSymbolsSharp%5BFILL,GRAD,opsz,wght%5D.ttf -> MaterialSymbolsSharp-FILL-GRAD-opsz-wght.ttf
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+
+S="${WORKDIR}"
+
+FONT_SUFFIX="ttf"
+
+src_unpack() {
+	mkdir -p "${S}"
+	cp "${DISTDIR}/MaterialSymbolsOutlined-FILL-GRAD-opsz-wght.ttf" \
+		"${S}/MaterialSymbolsOutlined[FILL,GRAD,opsz,wght].ttf"
+	cp "${DISTDIR}/MaterialSymbolsRounded-FILL-GRAD-opsz-wght.ttf"
+		"${S}/MaterialSymbolsRounded[FILL,GRAD,opsz,wght].ttf"
+	cp "${DISTDIR}/MaterialSymbolsSharp-FILL-GRAD-opsz-wght.ttf" \
+		"${S}/MaterialSymbolsSharp[FILL,GRAD,opsz,wght].ttf"
+}
+
+src_install() {
+	font_src_install
+}
+

sdata/dist-gentoo/local-pkgs/fonts-and-themes/readex-pro-1.0-r1.ebuild

@@ -17,5 +17,5 @@ S="${WORKDIR}/readexpro-master"
 
 src_install() {
 	insinto /usr/share/fonts/ttf-readex-pro
-	doins "${S_READEXPRO}"/fonts/ttf/*.ttf
+	doins "${S}"/fonts/ttf/*.ttf
 }

sdata/dist-gentoo/local-pkgs/fonts-and-themes/rubik-vf-1.0-r1.ebuild

@@ -13,6 +13,7 @@ SRC_URI="https://github.com/googlefonts/rubik/archive/${COMMIT}.tar.gz -> ${P}.t
 
 LICENSE="OFL-1.1"
 SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 S="${WORKDIR}/rubik-${COMMIT}"
 

sdata/dist-gentoo/local-pkgs/fonts-and-themes/space-grotesk-1.1.4-r1.ebuild

@@ -0,0 +1,28 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit font
+
+DESCRIPTION="Space Grotesk OTF font from 38C3 styleguide"
+HOMEPAGE="https://events.ccc.de/congress/2024/infos/styleguide.html"
+SRC_URI="https://events.ccc.de/congress/2024/infos/styleguide/38c3-styleguide-full-v2.zip"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/fonts/space-grotesk-${PV}"
+
+FONT_S="${S}/otf"
+FONT_SUFFIX="otf"
+
+src_install() {
+	font_src_install
+
+	dodoc OFL.txt
+}
+

sdata/dist-gentoo/local-pkgs/widgets/songrec-0.4.3-r1.ebuild

@@ -0,0 +1,48 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Illogicall Impulse Widget Dependencies"
+HOMEPAGE=""
+SRC_URI="https://github.com/marin-m/SongRec/archive/${PV}.tar.gz -> ${P}-SongRec.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+# need for cargo fetch, idk how to get around it if possible
+RESTRICT="strip network-sandbox"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/SongRec-${PV}"
+
+src_prepare() {
+	default
+	export CARGO_HOME="${WORKDIR}/cargo"
+	cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
+}
+
+src_compile() {
+	export CARGO_HOME="${WORKDIR}/cargo"
+	cargo build --release --frozen --offline
+}
+
+src_install() {
+	dobin target/release/songrec
+	insinto /usr/share/applications
+
+	doins packaging/rootfs/usr/share/applications/com.github.marinm.songrec.desktop
+
+	insinto /usr/share/icons/hicolor/scalable/apps
+	doins packaging/rootfs/usr/share/icons/hicolor/scalable/apps/com.github.marinm.songrec.svg
+
+	insinto /usr/share/metainfo
+	doins packaging/rootfs/usr/share/metainfo/com.github.marinm.songrec.metainfo.xml
+
+	insinto /usr/share/songrec/translations
+	doins -r translations/*
+
+	dodoc README.md
+}