commit:     9dacf7f883240e7972c55d4238875fcf53629ccc
Author:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Tue Jan  2 09:24:33 2024 +0000
Commit:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
CommitDate: Tue Jan  2 11:28:36 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9dacf7f8

gui-apps/hyprland-plugins: add 9999
* seperate package for split-monitor-workspaces
* add me as Proxy Mantainer
* @MrRoy if you don't like the changes you can reverted

Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>

 gui-apps/hyprland-plugins/Manifest                 |  2 --
 .../hyprland-plugins-0.31.0.ebuild                 | 31 +++++++++-----------
 .../hyprland-plugins-0.32.3.ebuild                 | 31 +++++++++-----------
 ...-0.31.0.ebuild => hyprland-plugins-9999.ebuild} | 33 ++++++++++------------
 gui-apps/hyprland-plugins/metadata.xml             |  4 +++
 5 files changed, 47 insertions(+), 54 deletions(-)

diff --git a/gui-apps/hyprland-plugins/Manifest 
b/gui-apps/hyprland-plugins/Manifest
index 6fb306243c..0ee35e2452 100644
--- a/gui-apps/hyprland-plugins/Manifest
+++ b/gui-apps/hyprland-plugins/Manifest
@@ -1,4 +1,2 @@
-DIST hyprland-plugins-0.31.0-split-monitor-workspaces.gh.tar.gz 7711 BLAKE2B 
08d6e31fb23321058d9ae935e92b700281e6801a9f4d363c33a288730e2b5448916d2446a6ea8a3e071e052c886b4aae9df5b36abcfd42381094242a0396f4de
 SHA512 
0de58765faa242b5e87f7ce1eec3a9265b97b7a16ce45fbb099c07f94989bed0042d65e580cf20e81e45b306d8b7d8a605300c87a84b8f69053678e6e41ec094
 DIST hyprland-plugins-0.31.0.gh.tar.gz 13160 BLAKE2B 
fed8de62adb8521fb99541e5802ba3316fff6f5e3ba6036ac12c8f1f7186d9806163189cedb15e30ac3213af548562f007c85fe7df3e9151a062396521ca0578
 SHA512 
2e72038591bfd372962c2d842937bcc6011f8f5bd75b2dca11cc604fca337b8b4d4af68bc5377e6e7d3f49008ee73e6ef91f450a3c207f1c73d1a00552f29f59
-DIST hyprland-plugins-0.32.3-split-monitor-workspaces.gh.tar.gz 7757 BLAKE2B 
69d63bbf37c46b507a5983d6bf9bfc98f66c19c69e5543ba217c05b2c2feca88443968351bd27a2473ef7f297e866a88bc0f2047f78840dc7515c32942b803dc
 SHA512 
8ecec6895456b5b84a8f9c887fe54da0e5b23ca7eae22eacfb353115b361260437a398823bb8e973fa45e1676dc4c2755efd18820ebfd7a265571f9b4dd2dfda
 DIST hyprland-plugins-0.32.3.gh.tar.gz 21262 BLAKE2B 
262336d22d150579c43dcb5c9d4bb1823ea9cf2976a94f0df84568c8155785cdcf37322f10bcb7869a9c4b9b6688085d4ab7a85f170c9e219df35c67e601136b
 SHA512 
eac31a9e38cbfe2eaf27054be5a88cbf9adf969a58c4a7daf477040846d22882af9c4da2f5804dcb6a78ac4d5b9f2e9488ce6ce0cbe1a278f0e4a8c86701ac9c

diff --git a/gui-apps/hyprland-plugins/hyprland-plugins-0.31.0.ebuild 
b/gui-apps/hyprland-plugins/hyprland-plugins-0.31.0.ebuild
index 4b3f12a557..93834b0205 100644
--- a/gui-apps/hyprland-plugins/hyprland-plugins-0.31.0.ebuild
+++ b/gui-apps/hyprland-plugins/hyprland-plugins-0.31.0.ebuild
@@ -5,16 +5,18 @@ EAPI=8
 
 inherit meson
 
-COMMIT=fadbcdd24b6f24b169056ed6fcf43d98ef405f87
-SPLITCOMMIT=9b40de35aeb8c62df3326eae7979b438f3ee0fb1
+if [[ ${PV} == 9999 ]]; then
+       EGIT_REPO_URI="https://github.com/hyprwm/${PN}.git";
+       inherit git-r3
+       S="${WORKDIR}/${PN}-${COMMIT}"
+else
+       COMMIT=2cc193e6dc524baed841c016109b4f48fd0512a3
+       SRC_URI="https://github.com/hyprwm/${PN}/archive/${COMMIT}.tar.gz -> 
${P}.gh.tar.gz"
+       S="${WORKDIR}/${PN}-${COMMIT}"
+fi
+
 DESCRIPTION="A blazing fast wayland wallpaper utility"
 HOMEPAGE="https://github.com/hyprwm/hyprland-plugins";
-SRC_URI="https://github.com/hyprwm/${PN}/archive/${COMMIT}.tar.gz -> 
${P}.gh.tar.gz
-       
https://github.com/Duckonaut/split-monitor-workspaces/archive/${SPLITCOMMIT}.tar.gz
 \
-       -> ${P}-split-monitor-workspaces.gh.tar.gz
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -23,7 +25,10 @@ IUSE="+borders-plus-plus csgo-vulkan-fix +hyprbars 
split-monitor-workspaces"
 REQUIRED_USE="|| ( borders-plus-plus csgo-vulkan-fix hyprbars 
split-monitor-workspaces )"
 
 RDEPEND="gui-wm/hyprland"
-DEPEND="${RDEPEND}"
+DEPEND="
+       ${RDEPEND}
+       split-monitor-workspaces? ( 
~gui-apps/hyprland-split-monitor-workspaces-${PV} )
+"
 BDEPEND="
        ~gui-wm/hyprland-${PV}
        x11-libs/libdrm
@@ -69,10 +74,6 @@ src_compile() {
                EMESON_SOURCE="${S}/hyprbars"
                meson_src_compile
        fi
-
-       if use split-monitor-workspaces; then
-               emake -C "${WORKDIR}/split-monitor-workspaces-${SPLITCOMMIT}" 
split-monitor-workspaces.so
-       fi
 }
 
 src_install() {
@@ -89,10 +90,6 @@ src_install() {
        if use hyprbars; then
                newins "${WORKDIR}/${P}-build/hyprbars/libhyprbars.so" 
"hyprbars.so"
        fi
-
-       if use split-monitor-workspaces; then
-               doins 
"${WORKDIR}/split-monitor-workspaces-${SPLITCOMMIT}/split-monitor-workspaces.so"
-       fi
 }
 
 pkg_postinst() {

diff --git a/gui-apps/hyprland-plugins/hyprland-plugins-0.32.3.ebuild 
b/gui-apps/hyprland-plugins/hyprland-plugins-0.32.3.ebuild
index 605ebcc526..ea2b317ccd 100644
--- a/gui-apps/hyprland-plugins/hyprland-plugins-0.32.3.ebuild
+++ b/gui-apps/hyprland-plugins/hyprland-plugins-0.32.3.ebuild
@@ -5,16 +5,18 @@ EAPI=8
 
 inherit meson
 
-COMMIT=2cc193e6dc524baed841c016109b4f48fd0512a3
-SPLITCOMMIT=2b1abdbf9e9de9ee660540167c8f51903fa3d959
+if [[ ${PV} == 9999 ]]; then
+       EGIT_REPO_URI="https://github.com/hyprwm/${PN}.git";
+       inherit git-r3
+       S="${WORKDIR}/${PN}-${COMMIT}"
+else
+       COMMIT=2cc193e6dc524baed841c016109b4f48fd0512a3
+               
SRC_URI="https://github.com/hyprwm/${PN}/archive/${COMMIT}.tar.gz -> 
${P}.gh.tar.gz"
+       S="${WORKDIR}/${PN}-${COMMIT}"
+fi
+
 DESCRIPTION="A blazing fast wayland wallpaper utility"
 HOMEPAGE="https://github.com/hyprwm/hyprland-plugins";
-SRC_URI="https://github.com/hyprwm/${PN}/archive/${COMMIT}.tar.gz -> 
${P}.gh.tar.gz
-       
https://github.com/Duckonaut/split-monitor-workspaces/archive/${SPLITCOMMIT}.tar.gz
 \
-       -> ${P}-split-monitor-workspaces.gh.tar.gz
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -23,7 +25,10 @@ IUSE="+borders-plus-plus csgo-vulkan-fix +hyprbars 
split-monitor-workspaces"
 REQUIRED_USE="|| ( borders-plus-plus csgo-vulkan-fix hyprbars 
split-monitor-workspaces )"
 
 RDEPEND="gui-wm/hyprland"
-DEPEND="${RDEPEND}"
+DEPEND="
+       ${RDEPEND}
+       split-monitor-workspaces? ( 
~gui-apps/hyprland-split-monitor-workspaces-${PV} )
+"
 BDEPEND="
        ~gui-wm/hyprland-${PV}
        x11-libs/libdrm
@@ -69,10 +74,6 @@ src_compile() {
                EMESON_SOURCE="${S}/hyprbars"
                meson_src_compile
        fi
-
-       if use split-monitor-workspaces; then
-               emake -C "${WORKDIR}/split-monitor-workspaces-${SPLITCOMMIT}" 
split-monitor-workspaces.so
-       fi
 }
 
 src_install() {
@@ -89,10 +90,6 @@ src_install() {
        if use hyprbars; then
                newins "${WORKDIR}/${P}-build/hyprbars/libhyprbars.so" 
"hyprbars.so"
        fi
-
-       if use split-monitor-workspaces; then
-               doins 
"${WORKDIR}/split-monitor-workspaces-${SPLITCOMMIT}/split-monitor-workspaces.so"
-       fi
 }
 
 pkg_postinst() {

diff --git a/gui-apps/hyprland-plugins/hyprland-plugins-0.31.0.ebuild 
b/gui-apps/hyprland-plugins/hyprland-plugins-9999.ebuild
similarity index 75%
copy from gui-apps/hyprland-plugins/hyprland-plugins-0.31.0.ebuild
copy to gui-apps/hyprland-plugins/hyprland-plugins-9999.ebuild
index 4b3f12a557..d66473841d 100644
--- a/gui-apps/hyprland-plugins/hyprland-plugins-0.31.0.ebuild
+++ b/gui-apps/hyprland-plugins/hyprland-plugins-9999.ebuild
@@ -5,25 +5,30 @@ EAPI=8
 
 inherit meson
 
-COMMIT=fadbcdd24b6f24b169056ed6fcf43d98ef405f87
-SPLITCOMMIT=9b40de35aeb8c62df3326eae7979b438f3ee0fb1
+if [[ ${PV} == 9999 ]]; then
+       EGIT_REPO_URI="https://github.com/hyprwm/${PN}.git";
+       inherit git-r3
+       S="${WORKDIR}/${PN}-${PV}"
+else
+       COMMIT=2cc193e6dc524baed841c016109b4f48fd0512a3
+       SPLITCOMMIT=2b1abdbf9e9de9ee660540167c8f51903fa3d959
+       SRC_URI="https://github.com/hyprwm/${PN}/archive/${COMMIT}.tar.gz -> 
${P}.gh.tar.gz"
+       S="${WORKDIR}/${PN}-${COMMIT}"
+fi
+
 DESCRIPTION="A blazing fast wayland wallpaper utility"
 HOMEPAGE="https://github.com/hyprwm/hyprland-plugins";
-SRC_URI="https://github.com/hyprwm/${PN}/archive/${COMMIT}.tar.gz -> 
${P}.gh.tar.gz
-       
https://github.com/Duckonaut/split-monitor-workspaces/archive/${SPLITCOMMIT}.tar.gz
 \
-       -> ${P}-split-monitor-workspaces.gh.tar.gz
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
 IUSE="+borders-plus-plus csgo-vulkan-fix +hyprbars split-monitor-workspaces"
 REQUIRED_USE="|| ( borders-plus-plus csgo-vulkan-fix hyprbars 
split-monitor-workspaces )"
 
 RDEPEND="gui-wm/hyprland"
-DEPEND="${RDEPEND}"
+DEPEND="
+       ${RDEPEND}
+       split-monitor-workspaces? ( 
~gui-apps/hyprland-split-monitor-workspaces-${PV} )
+"
 BDEPEND="
        ~gui-wm/hyprland-${PV}
        x11-libs/libdrm
@@ -69,10 +74,6 @@ src_compile() {
                EMESON_SOURCE="${S}/hyprbars"
                meson_src_compile
        fi
-
-       if use split-monitor-workspaces; then
-               emake -C "${WORKDIR}/split-monitor-workspaces-${SPLITCOMMIT}" 
split-monitor-workspaces.so
-       fi
 }
 
 src_install() {
@@ -89,10 +90,6 @@ src_install() {
        if use hyprbars; then
                newins "${WORKDIR}/${P}-build/hyprbars/libhyprbars.so" 
"hyprbars.so"
        fi
-
-       if use split-monitor-workspaces; then
-               doins 
"${WORKDIR}/split-monitor-workspaces-${SPLITCOMMIT}/split-monitor-workspaces.so"
-       fi
 }
 
 pkg_postinst() {

diff --git a/gui-apps/hyprland-plugins/metadata.xml 
b/gui-apps/hyprland-plugins/metadata.xml
index bc2cc6a378..207733041e 100644
--- a/gui-apps/hyprland-plugins/metadata.xml
+++ b/gui-apps/hyprland-plugins/metadata.xml
@@ -5,6 +5,10 @@
                <name>Julien Roy</name>
                <email>[email protected]</email>
        </maintainer>
+       <maintainer type="person">
+               <name>Gonçalo Negrier Duarte</name>
+               <email>[email protected]</email>
+       </maintainer>
        <upstream>
                
<bugs-to>https://github.com/hyprwm/hyprland-plugins/issues</bugs-to>
                
<changelog>https://github.com/hyprwm/hyprland-plugins/releases</changelog>

Reply via email to