public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:master commit in: gui-apps/gtklock-extras/
@ 2023-07-08  2:43 Haelwenn Monnier
  0 siblings, 0 replies; 6+ messages in thread
From: Haelwenn Monnier @ 2023-07-08  2:43 UTC (permalink / raw
  To: gentoo-commits

commit:     a51f61a929e81c154c208188ca46d182b1089a47
Author:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Fri Jul  7 22:44:44 2023 +0000
Commit:     Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Fri Jul  7 22:47:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a51f61a9

gui-apps/gtklock-extras: fix metadata

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

 gui-apps/gtklock-extras/metadata.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gui-apps/gtklock-extras/metadata.xml b/gui-apps/gtklock-extras/metadata.xml
index 156af3f9f..f37f96ac1 100644
--- a/gui-apps/gtklock-extras/metadata.xml
+++ b/gui-apps/gtklock-extras/metadata.xml
@@ -6,7 +6,7 @@
 		<flag name="playerctl">gtklock module adding media player controls to the lockscreen</flag>
 		<flag name="userinfo">gtklock module adding user info to the lockscreen</flag>
 	</use>
-	<upstream>
-		<remote-id type="github">MrDuartePT/gtklock-modules-gentoo</remote-id>
-	</upstream>
+    <upstream>
+        <remote-id type="github">MrDuartePT/gtklock-modules-gentoo</remote-id>
+    </upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: gui-apps/gtklock-extras/
@ 2023-08-04  7:26 Florian Schmaus
  0 siblings, 0 replies; 6+ messages in thread
From: Florian Schmaus @ 2023-08-04  7:26 UTC (permalink / raw
  To: gentoo-commits

commit:     befeaae517d240e5fad8bd3947852ffbfbc722b1
Author:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Thu Aug  3 18:13:59 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Aug  3 18:14:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=befeaae5

gui-apps/gtklock-extras: fix /usr/local install location to /usr
 * update EAPI 7 -> 8

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

 gui-apps/gtklock-extras/gtklock-extras-9999.ebuild | 32 ++++++++++++----------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/gui-apps/gtklock-extras/gtklock-extras-9999.ebuild b/gui-apps/gtklock-extras/gtklock-extras-9999.ebuild
index 4968627f30..c38fd25a97 100644
--- a/gui-apps/gtklock-extras/gtklock-extras-9999.ebuild
+++ b/gui-apps/gtklock-extras/gtklock-extras-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit git-r3
 DESCRIPTION="Gtklock modules"
@@ -26,43 +26,47 @@ DEPEND="${RDEPEND}"
 IUSE="playerctl powerbar userinfo"
 REQUIRED_USE="|| ( playerctl powerbar userinfo )"
 
-src_compile() {
+src_prepare() {
 	if use powerbar; then
-		pushd gtklock-powerbar-module || die
-		emake
-		popd || die
+		cd "${S}/gtklock-powerbar-module" || die
+		eapply "${S}/gtklock-powerbar-module.patch"
+		cd "${S}" || die
 	fi
 
 	if use playerctl; then
-		pushd gtklock-playerctl-module || die
-		emake
-		popd || die
+		cd "${S}/gtklock-playerctl-module" || die
+		eapply "${S}/gtklock-playerctl-module.patch"
+		cd "${S}" || die
 	fi
 
 	if use userinfo; then
-		pushd gtklock-userinfo-module || die
-		emake
-		popd || die
+		cd "${S}/gtklock-userinfo-module" || die
+		eapply "${S}/gtklock-userinfo-module.patch"
+		cd "${S}" || die
 	fi
+	eapply_user
 }
 
 src_install() {
 	dodir /usr/local/lib/gtklock
 	if use powerbar; then
 		pushd gtklock-powerbar-module || die
-		insinto /usr/local/lib/gtklock && doins powerbar-module.so
+		emake
+		emake DESTDIR="${D}" install
 		popd || die
 	fi
 
 	if use playerctl; then
 		pushd gtklock-playerctl-module || die
-		insinto /usr/local/lib/gtklock && doins playerctl-module.so
+		emake
+		emake DESTDIR="${D}" install
 		popd || die
 	fi
 
 	if use userinfo; then
 		pushd gtklock-userinfo-module || die
-		insinto /usr/local/lib/gtklock && doins userinfo-module.so
+		emake
+		emake DESTDIR="${D}" install
 		popd || die
 	fi
 }


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: gui-apps/gtklock-extras/
@ 2023-07-27 12:04 David Roman
  0 siblings, 0 replies; 6+ messages in thread
From: David Roman @ 2023-07-27 12:04 UTC (permalink / raw
  To: gentoo-commits

commit:     bd64f156069872ac97ebfccaa14a1e069f9d5bd8
Author:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Wed Jul 26 13:26:50 2023 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Wed Jul 26 13:26:50 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bd64f156

gui-apps/gtklock-extras: fix playerctl useflag

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

 gui-apps/gtklock-extras/gtklock-extras-9999.ebuild | 30 ++++++++--------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/gui-apps/gtklock-extras/gtklock-extras-9999.ebuild b/gui-apps/gtklock-extras/gtklock-extras-9999.ebuild
index ca9b6c8ea6..4968627f30 100644
--- a/gui-apps/gtklock-extras/gtklock-extras-9999.ebuild
+++ b/gui-apps/gtklock-extras/gtklock-extras-9999.ebuild
@@ -16,7 +16,7 @@ RDEPEND="gui-apps/gtklock"
 BDEPEND="x11-libs/gtk+
 	virtual/pkgconfig
 	playerctl? ( dev-go/act )
-	playerctl? ( net-libs/libsoup )
+	playerctl? ( net-libs/libsoup:2.4 )
 	playerctl? ( media-sound/playerctl )
 	userinfo? ( sys-apps/accountsservice )
 "
@@ -33,11 +33,11 @@ src_compile() {
 		popd || die
 	fi
 
-	#if use playerctl; then
-	#	pushd gtklock-playerctl-module || die
-	#	emake
-	#	popd || die
-	#fi
+	if use playerctl; then
+		pushd gtklock-playerctl-module || die
+		emake
+		popd || die
+	fi
 
 	if use userinfo; then
 		pushd gtklock-userinfo-module || die
@@ -54,11 +54,11 @@ src_install() {
 		popd || die
 	fi
 
-	#if use playerctl; then
-	#	pushd gtklock-playerctl-module || die
-	#	insinto /usr/local/lib/gtklock && doins playerctl-module.so
-	#	popd || die
-	#fi
+	if use playerctl; then
+		pushd gtklock-playerctl-module || die
+		insinto /usr/local/lib/gtklock && doins playerctl-module.so
+		popd || die
+	fi
 
 	if use userinfo; then
 		pushd gtklock-userinfo-module || die
@@ -66,11 +66,3 @@ src_install() {
 		popd || die
 	fi
 }
-
-pkg_postinst() {
-	if use playerctl; then
-		ewarn "The MAKEFILE for playerctl gtklock module is broken i will try to fixit later"
-		ewarn "For now the useflag will be disable on guru overlay to prevent the package failing to build"
-		ewarn "If you have a idea on how to fix open a issue here:https://github.com/MrDuartePT/mrduarte-ebuilds"
-	fi
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: gui-apps/gtklock-extras/
@ 2023-07-27 12:04 David Roman
  0 siblings, 0 replies; 6+ messages in thread
From: David Roman @ 2023-07-27 12:04 UTC (permalink / raw
  To: gentoo-commits

commit:     db837b77e6da501bfb62c5bc834a9310fdd466c8
Author:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Wed Jul 26 11:30:56 2023 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Wed Jul 26 13:03:00 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=db837b77

gui-apps/gtklock-extras: add myself as a maintainer

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

 gui-apps/gtklock-extras/metadata.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gui-apps/gtklock-extras/metadata.xml b/gui-apps/gtklock-extras/metadata.xml
index 156af3f9f9..a028a6b59b 100644
--- a/gui-apps/gtklock-extras/metadata.xml
+++ b/gui-apps/gtklock-extras/metadata.xml
@@ -6,6 +6,10 @@
 		<flag name="playerctl">gtklock module adding media player controls to the lockscreen</flag>
 		<flag name="userinfo">gtklock module adding user info to the lockscreen</flag>
 	</use>
+	<maintainer type="person">
+		<email>gonegrier.duarte@gmail.com</email>
+		<name>Gonçalo Negrier Duarte</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">MrDuartePT/gtklock-modules-gentoo</remote-id>
 	</upstream>


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: gui-apps/gtklock-extras/
@ 2023-07-13  9:42 David Roman
  0 siblings, 0 replies; 6+ messages in thread
From: David Roman @ 2023-07-13  9:42 UTC (permalink / raw
  To: gentoo-commits

commit:     1caff2524091d635d292ddd6f6937cd0df3b810b
Author:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Wed Jul 12 10:54:31 2023 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Wed Jul 12 10:58:04 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1caff252

gui-apps/gtklock-extras: add warning to package
 * playerctl makefile is broken will be fix later

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

 gui-apps/gtklock-extras/gtklock-extras-9999.ebuild | 28 ++++++++++++++--------
 gui-apps/gtklock-extras/metadata.xml               |  6 ++---
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/gui-apps/gtklock-extras/gtklock-extras-9999.ebuild b/gui-apps/gtklock-extras/gtklock-extras-9999.ebuild
index 8ba329e4a..ca9b6c8ea 100644
--- a/gui-apps/gtklock-extras/gtklock-extras-9999.ebuild
+++ b/gui-apps/gtklock-extras/gtklock-extras-9999.ebuild
@@ -17,6 +17,7 @@ BDEPEND="x11-libs/gtk+
 	virtual/pkgconfig
 	playerctl? ( dev-go/act )
 	playerctl? ( net-libs/libsoup )
+	playerctl? ( media-sound/playerctl )
 	userinfo? ( sys-apps/accountsservice )
 "
 
@@ -32,11 +33,11 @@ src_compile() {
 		popd || die
 	fi
 
-	if use playerctl; then
-		pushd gtklock-playerctl-module || die
-		emake
-		popd || die
-	fi
+	#if use playerctl; then
+	#	pushd gtklock-playerctl-module || die
+	#	emake
+	#	popd || die
+	#fi
 
 	if use userinfo; then
 		pushd gtklock-userinfo-module || die
@@ -53,11 +54,11 @@ src_install() {
 		popd || die
 	fi
 
-	if use playerctl; then
-		pushd gtklock-playerctl-module || die
-		insinto /usr/local/lib/gtklock && doins playerctl-module.so
-		popd || die
-	fi
+	#if use playerctl; then
+	#	pushd gtklock-playerctl-module || die
+	#	insinto /usr/local/lib/gtklock && doins playerctl-module.so
+	#	popd || die
+	#fi
 
 	if use userinfo; then
 		pushd gtklock-userinfo-module || die
@@ -66,3 +67,10 @@ src_install() {
 	fi
 }
 
+pkg_postinst() {
+	if use playerctl; then
+		ewarn "The MAKEFILE for playerctl gtklock module is broken i will try to fixit later"
+		ewarn "For now the useflag will be disable on guru overlay to prevent the package failing to build"
+		ewarn "If you have a idea on how to fix open a issue here:https://github.com/MrDuartePT/mrduarte-ebuilds"
+	fi
+}

diff --git a/gui-apps/gtklock-extras/metadata.xml b/gui-apps/gtklock-extras/metadata.xml
index f37f96ac1..156af3f9f 100644
--- a/gui-apps/gtklock-extras/metadata.xml
+++ b/gui-apps/gtklock-extras/metadata.xml
@@ -6,7 +6,7 @@
 		<flag name="playerctl">gtklock module adding media player controls to the lockscreen</flag>
 		<flag name="userinfo">gtklock module adding user info to the lockscreen</flag>
 	</use>
-    <upstream>
-        <remote-id type="github">MrDuartePT/gtklock-modules-gentoo</remote-id>
-    </upstream>
+	<upstream>
+		<remote-id type="github">MrDuartePT/gtklock-modules-gentoo</remote-id>
+	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: gui-apps/gtklock-extras/
@ 2023-07-08  2:43 Haelwenn Monnier
  0 siblings, 0 replies; 6+ messages in thread
From: Haelwenn Monnier @ 2023-07-08  2:43 UTC (permalink / raw
  To: gentoo-commits

commit:     8a9f911b5a75b6402efc6ec14e8a4c9af60d27d1
Author:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Fri Jul  7 10:34:46 2023 +0000
Commit:     Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Fri Jul  7 10:34:46 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8a9f911b

gui-apps/gtklock-extras: fix spacing and metadata

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

 gui-apps/gtklock-extras/gtklock-extras-9999.ebuild | 16 ++++++++--------
 gui-apps/gtklock-extras/metadata.xml               |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/gui-apps/gtklock-extras/gtklock-extras-9999.ebuild b/gui-apps/gtklock-extras/gtklock-extras-9999.ebuild
index 81117c7e2..bac120786 100644
--- a/gui-apps/gtklock-extras/gtklock-extras-9999.ebuild
+++ b/gui-apps/gtklock-extras/gtklock-extras-9999.ebuild
@@ -28,14 +28,14 @@ REQUIRED_USE="|| ( playerctl powerbar userinfo )"
 src_compile() {
       if use powerbar; then
             pushd gtklock-powerbar-module || die
-	      emake
-	      popd || die
+            emake
+            popd || die
       fi
 
       if use playerctl; then
             pushd gtklock-playerctl-module || die
-	      emake
-	      popd || die
+            emake
+            popd || die
       fi
     
       if use userinfo; then
@@ -49,14 +49,14 @@ src_install() {
       dodir /usr/local/lib/gtklock
       if use powerbar; then
             pushd gtklock-powerbar-module || die
-	      insinto /usr/local/lib/gtklock && doins powerbar-module.so
-	      popd || die
+            insinto /usr/local/lib/gtklock && doins powerbar-module.so
+            popd || die
       fi
 
       if use playerctl; then
             pushd gtklock-playerctl-module || die
-	      insinto /usr/local/lib/gtklock && doins playerctl-module.so
-	      popd || die
+            insinto /usr/local/lib/gtklock && doins playerctl-module.so
+            popd || die
       fi
     
       if use userinfo; then

diff --git a/gui-apps/gtklock-extras/metadata.xml b/gui-apps/gtklock-extras/metadata.xml
index f37f96ac1..156af3f9f 100644
--- a/gui-apps/gtklock-extras/metadata.xml
+++ b/gui-apps/gtklock-extras/metadata.xml
@@ -6,7 +6,7 @@
 		<flag name="playerctl">gtklock module adding media player controls to the lockscreen</flag>
 		<flag name="userinfo">gtklock module adding user info to the lockscreen</flag>
 	</use>
-    <upstream>
-        <remote-id type="github">MrDuartePT/gtklock-modules-gentoo</remote-id>
-    </upstream>
+	<upstream>
+		<remote-id type="github">MrDuartePT/gtklock-modules-gentoo</remote-id>
+	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-08-04  7:26 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-08  2:43 [gentoo-commits] repo/proj/guru:master commit in: gui-apps/gtklock-extras/ Haelwenn Monnier
  -- strict thread matches above, loose matches on Subject: below --
2023-08-04  7:26 Florian Schmaus
2023-07-27 12:04 David Roman
2023-07-27 12:04 David Roman
2023-07-13  9:42 David Roman
2023-07-08  2:43 Haelwenn Monnier

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox