[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellmoon/

2023-02-03 Thread Sam James
commit: a6fac7c6223d0e087a5550e02e8e533295b8bdaf
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb  3 11:06:43 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  3 11:06:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6fac7c6

x11-plugins/gkrellmoon: adopt

Help very much still welcome, just adopting so it's not m-n and can fix

the easy bugs at least.

Signed-off-by: Sam James  gentoo.org>

 x11-plugins/gkrellmoon/metadata.xml | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/x11-plugins/gkrellmoon/metadata.xml 
b/x11-plugins/gkrellmoon/metadata.xml
index 7157545c0755..1eae391cc8de 100644
--- a/x11-plugins/gkrellmoon/metadata.xml
+++ b/x11-plugins/gkrellmoon/metadata.xml
@@ -1,7 +1,10 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-   
+   
+   s...@gentoo.org
+   Sam James
+   

gkrellmoon




[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellmoon/files/

2023-02-02 Thread Sam James
commit: e2d19a5100e7e05baeb57e6c4f0f87ea264578e4
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb  3 05:00:03 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  3 05:08:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2d19a51

x11-plugins/gkrellmoon: scrub patches

Bug: https://bugs.gentoo.org/892251
Signed-off-by: Sam James  gentoo.org>

 x11-plugins/gkrellmoon/files/gkrellmoon-0.6-makefile.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-plugins/gkrellmoon/files/gkrellmoon-0.6-makefile.patch 
b/x11-plugins/gkrellmoon/files/gkrellmoon-0.6-makefile.patch
index 4f4bd0e403f3..7cf07197431f 100644
--- a/x11-plugins/gkrellmoon/files/gkrellmoon-0.6-makefile.patch
+++ b/x11-plugins/gkrellmoon/files/gkrellmoon-0.6-makefile.patch
@@ -1,5 +1,5 @@
 a/Makefile 2002-12-11 04:36:06.0 +0100
-+++ b/Makefile_new 2013-03-16 13:04:00.963512605 +0100
+--- a/Makefile
 b/Makefile_new
 @@ -4,23 +4,26 @@
  INSTALLDIR = ${DESTDIR}/usr/lib/gkrellm2/plugins
  



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellmoon/

2022-08-29 Thread Andreas Sturmlechner
commit: 6f7f99d93d8ffc3fc0cf9ec85652d255bbcc0245
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Aug 29 07:33:46 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Aug 29 08:36:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f7f99d9

x11-plugins/gkrellmoon: drop 0.6-r2

Closes: https://bugs.gentoo.org/867175
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-plugins/gkrellmoon/gkrellmoon-0.6-r2.ebuild | 31 -
 1 file changed, 31 deletions(-)

diff --git a/x11-plugins/gkrellmoon/gkrellmoon-0.6-r2.ebuild 
b/x11-plugins/gkrellmoon/gkrellmoon-0.6-r2.ebuild
deleted file mode 100644
index 15a6d866c2d2..
--- a/x11-plugins/gkrellmoon/gkrellmoon-0.6-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin toolchain-funcs
-
-DESCRIPTION="A GKrellM2 plugin of the famous wmMoonClock dockapp"
-SRC_URI="mirror://sourceforge/gkrellmoon/${P}.tar.gz"
-HOMEPAGE="http://gkrellmoon.sourceforge.net/;
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~ppc sparc x86"
-IUSE=""
-
-RDEPEND="
-   app-admin/gkrellm:2[X]
-   media-libs/imlib2"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
-
-src_prepare() {
-   default
-   sed -i -e '/^#include /a#include ' CalcEphem.h || die
-}
-
-src_compile() {
-   emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
-}



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellmoon/

2022-08-29 Thread Agostino Sarubbo
commit: ee08b8a56713698c07545c77582c72d63b3e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Aug 29 07:20:53 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Aug 29 07:20:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee08b8a5

x11-plugins/gkrellmoon: x86 stable wrt bug #867175

Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-plugins/gkrellmoon/gkrellmoon-0.6-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-plugins/gkrellmoon/gkrellmoon-0.6-r3.ebuild 
b/x11-plugins/gkrellmoon/gkrellmoon-0.6-r3.ebuild
index 3ba2b10978c8..fc0bc2407693 100644
--- a/x11-plugins/gkrellmoon/gkrellmoon-0.6-r3.ebuild
+++ b/x11-plugins/gkrellmoon/gkrellmoon-0.6-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/gkrellmoon/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~ppc sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc sparc x86"
 
 RDEPEND="
app-admin/gkrellm:2[X]



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellmoon/

2022-08-29 Thread Agostino Sarubbo
commit: 97b4c7e8b01c78ccfca4bb97565b441914fe5244
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Aug 29 07:17:52 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Aug 29 07:17:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97b4c7e8

x11-plugins/gkrellmoon: amd64 stable wrt bug #867175

Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-plugins/gkrellmoon/gkrellmoon-0.6-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-plugins/gkrellmoon/gkrellmoon-0.6-r3.ebuild 
b/x11-plugins/gkrellmoon/gkrellmoon-0.6-r3.ebuild
index 8533fbf46741..3ba2b10978c8 100644
--- a/x11-plugins/gkrellmoon/gkrellmoon-0.6-r3.ebuild
+++ b/x11-plugins/gkrellmoon/gkrellmoon-0.6-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/gkrellmoon/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~ppc sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc sparc ~x86"
 
 RDEPEND="
app-admin/gkrellm:2[X]



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellmoon/

2022-08-28 Thread Arthur Zamarin
commit: 97c92e322e41cffc2ab7ee4f1db1955546aa56e5
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Aug 28 20:45:28 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Aug 28 20:45:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97c92e32

x11-plugins/gkrellmoon: Stabilize 0.6-r3 sparc, #867175

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-plugins/gkrellmoon/gkrellmoon-0.6-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-plugins/gkrellmoon/gkrellmoon-0.6-r3.ebuild 
b/x11-plugins/gkrellmoon/gkrellmoon-0.6-r3.ebuild
index 35005ac0c50a..8533fbf46741 100644
--- a/x11-plugins/gkrellmoon/gkrellmoon-0.6-r3.ebuild
+++ b/x11-plugins/gkrellmoon/gkrellmoon-0.6-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/gkrellmoon/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc sparc ~x86"
 
 RDEPEND="
app-admin/gkrellm:2[X]



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellmoon/, x11-plugins/gkrellmoon/files/

2022-04-21 Thread Sam James
commit: 47613a8b7f202daa0c1cfe1cdb12cbb8a7e5bf98
Author: Thomas Bracht Laumann Jespersen  laumann  xyz>
AuthorDate: Thu Mar 31 11:35:22 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr 21 19:54:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47613a8b

x11-plugins/gkrellmoon: update EAPI 6 -> 8

Signed-off-by: Thomas Bracht Laumann Jespersen  laumann.xyz>
Signed-off-by: Sam James  gentoo.org>

 .../files/gkrellmoon-0.6-r3-include-stringh.patch  | 14 ++
 .../files/gkrellmoon-0.6-r3-pkgconfig.patch| 12 +
 x11-plugins/gkrellmoon/gkrellmoon-0.6-r3.ebuild| 31 ++
 3 files changed, 57 insertions(+)

diff --git 
a/x11-plugins/gkrellmoon/files/gkrellmoon-0.6-r3-include-stringh.patch 
b/x11-plugins/gkrellmoon/files/gkrellmoon-0.6-r3-include-stringh.patch
new file mode 100644
index ..fc07da13f75b
--- /dev/null
+++ b/x11-plugins/gkrellmoon/files/gkrellmoon-0.6-r3-include-stringh.patch
@@ -0,0 +1,14 @@
+Include string.h
+--- a/CalcEphem.h
 b/CalcEphem.h
+@@ -13,6 +13,7 @@
+ #include 
+ 
+ #include 
++#include 
+ #include 
+ 
+ #define DegPerRad   57.29577951308232087680
+-- 
+2.34.1
+

diff --git a/x11-plugins/gkrellmoon/files/gkrellmoon-0.6-r3-pkgconfig.patch 
b/x11-plugins/gkrellmoon/files/gkrellmoon-0.6-r3-pkgconfig.patch
new file mode 100644
index ..80f7fa1a9a3e
--- /dev/null
+++ b/x11-plugins/gkrellmoon/files/gkrellmoon-0.6-r3-pkgconfig.patch
@@ -0,0 +1,12 @@
+Respect user's pkg-config
+--- a/Makefile
 b/Makefile
+@@ -1,5 +1,6 @@
+-GTK_INCLUDE = `pkg-config gtk+-2.0 --cflags`
+-GTK_LIB = `pkg-config gtk+-2.0 --libs`
++PKG_CONFIG ?= pkg-config
++GTK_INCLUDE = $(shell ${PKG_CONFIG} gtk+-2.0 --cflags)
++GTK_LIB = $(shel ${PKG_CONFIG} gtk+-2.0 --libs)
+ 
+ INSTALLDIR = ${DESTDIR}/usr/lib/gkrellm2/plugins
+ 

diff --git a/x11-plugins/gkrellmoon/gkrellmoon-0.6-r3.ebuild 
b/x11-plugins/gkrellmoon/gkrellmoon-0.6-r3.ebuild
new file mode 100644
index ..35005ac0c50a
--- /dev/null
+++ b/x11-plugins/gkrellmoon/gkrellmoon-0.6-r3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="A GKrellM2 plugin of the famous wmMoonClock dockapp"
+HOMEPAGE="http://gkrellmoon.sourceforge.net/;
+SRC_URI="mirror://sourceforge/gkrellmoon/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+   app-admin/gkrellm:2[X]
+   media-libs/imlib2"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-makefile.patch
+   "${FILESDIR}"/${P}-r3-pkgconfig.patch
+   "${FILESDIR}"/${P}-r3-include-stringh.patch
+)
+
+src_compile() {
+   tc-export PKG_CONFIG
+   emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellmoon/

2018-01-04 Thread David Seifert
commit: 174151db0850d0d11999dd3c55ecdc36535cc985
Author: David Seifert  gentoo  org>
AuthorDate: Wed Jan  3 22:34:34 2018 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Jan  4 09:16:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=174151db

x11-plugins/gkrellmoon: Eclass update

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 x11-plugins/gkrellmoon/gkrellmoon-0.6-r2.ebuild | 19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/x11-plugins/gkrellmoon/gkrellmoon-0.6-r2.ebuild 
b/x11-plugins/gkrellmoon/gkrellmoon-0.6-r2.ebuild
index 43e7a619c6c..1364430d690 100644
--- a/x11-plugins/gkrellmoon/gkrellmoon-0.6-r2.ebuild
+++ b/x11-plugins/gkrellmoon/gkrellmoon-0.6-r2.ebuild
@@ -1,28 +1,29 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit gkrellm-plugin toolchain-funcs
 
-IUSE=""
 DESCRIPTION="A GKrellM2 plugin of the famous wmMoonClock dockapp"
 SRC_URI="mirror://sourceforge/gkrellmoon/${P}.tar.gz"
 HOMEPAGE="http://gkrellmoon.sourceforge.net/;
 
-DEPEND="media-libs/imlib2"
-RDEPEND="${DEPEND}
-   app-admin/gkrellm[X]
-"
-
-SLOT="2"
 LICENSE="GPL-2"
+SLOT="2"
 KEYWORDS="alpha amd64 ppc sparc x86"
+IUSE=""
+
+RDEPEND="
+   app-admin/gkrellm:2[X]
+   media-libs/imlib2"
+DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
 src_prepare() {
default
-   sed -i -e '/^#include /a#include ' CalcEphem.h
+   sed -i -e '/^#include /a#include ' CalcEphem.h || die
 }
 
 src_compile() {



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellmoon/

2017-07-26 Thread Pacho Ramos
commit: 38578441becce4dd26064ff7c07408c11a0423a4
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed Jul 26 10:53:49 2017 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed Jul 26 11:34:24 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38578441

x11-plugins/gkrellmoon: Fix dependency on gkrellm[X]

Package-Manager: Portage-2.3.6, Repoman-2.3.2
RepoMan-Options: --force

 .../{gkrellmoon-0.6-r1.ebuild => gkrellmoon-0.6-r2.ebuild} | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/x11-plugins/gkrellmoon/gkrellmoon-0.6-r1.ebuild 
b/x11-plugins/gkrellmoon/gkrellmoon-0.6-r2.ebuild
similarity index 87%
rename from x11-plugins/gkrellmoon/gkrellmoon-0.6-r1.ebuild
rename to x11-plugins/gkrellmoon/gkrellmoon-0.6-r2.ebuild
index 945e5c98465..43e7a619c6c 100644
--- a/x11-plugins/gkrellmoon/gkrellmoon-0.6-r1.ebuild
+++ b/x11-plugins/gkrellmoon/gkrellmoon-0.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,11 +10,12 @@ SRC_URI="mirror://sourceforge/gkrellmoon/${P}.tar.gz"
 HOMEPAGE="http://gkrellmoon.sourceforge.net/;
 
 DEPEND="media-libs/imlib2"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+   app-admin/gkrellm[X]
+"
 
 SLOT="2"
 LICENSE="GPL-2"
-
 KEYWORDS="alpha amd64 ppc sparc x86"
 
 PATCHES=( "${FILESDIR}"/${P}-makefile.patch )



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellmoon/files/, x11-plugins/gkrellmoon/

2016-08-25 Thread Pacho Ramos
commit: 2f0afaa0a69744ab30d51315e50ae0c4a3a4c4e1
Author: Pacho Ramos  gentoo  org>
AuthorDate: Thu Aug 25 12:38:19 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Thu Aug 25 12:53:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f0afaa0

x11-plugins/gkrellmoon: Respect LDFLAGS (#338792 by Michael Mair-Keimberger 
(iamnr3))

Package-Manager: portage-2.3.0

 .../gkrellmoon/files/gkrellmoon-0.6-makefile.patch | 34 ++
 x11-plugins/gkrellmoon/gkrellmoon-0.6-r1.ebuild| 18 
 2 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/x11-plugins/gkrellmoon/files/gkrellmoon-0.6-makefile.patch 
b/x11-plugins/gkrellmoon/files/gkrellmoon-0.6-makefile.patch
new file mode 100644
index ..4f4bd0e
--- /dev/null
+++ b/x11-plugins/gkrellmoon/files/gkrellmoon-0.6-makefile.patch
@@ -0,0 +1,34 @@
+--- a/Makefile 2002-12-11 04:36:06.0 +0100
 b/Makefile_new 2013-03-16 13:04:00.963512605 +0100
+@@ -4,23 +4,26 @@
+ INSTALLDIR = ${DESTDIR}/usr/lib/gkrellm2/plugins
+ 
+ 
+-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE)
++FLAGS = -fPIC $(GTK_INCLUDE)
+ LIBS = $(GTK_LIB)
+ LFLAGS = -shared
+ 
+-CC = gcc $(CFLAGS) $(FLAGS)
++CC = $(CC)
+ 
+ OBJS = gkrellmoon.o MoonRise.o CalcEphem.o Moon.o
+ 
++all: gkrellmoon.so
++
++%.o: %.c
++  $(CC) $(CFLAGS) $(LDFLAGS) $(FLAGS) -c -o $@ $<
++
+ gkrellmoon.so: $(OBJS)
+-  $(CC) $(OBJS) -o gkrellmoon.so $(LFLAGS) $(LIBS)
++  $(CC) $(CFLAGS) $(FLAGS) $(LDFLAGS) $(OBJS) -o gkrellmoon.so $(LFLAGS) 
$(LIBS)
+ 
+ clean:
+   rm -f *.o core *.so* *.bak *~
+ 
+ gkrellmoon.o: gkrellmoon.c moon_60.xpm
+ 
+-# %.o: %.c
+-
+ install: gkrellmoon.so
+   install -c -s -m 644 gkrellmoon.so $(INSTALLDIR)

diff --git a/x11-plugins/gkrellmoon/gkrellmoon-0.6-r1.ebuild 
b/x11-plugins/gkrellmoon/gkrellmoon-0.6-r1.ebuild
index 19646d5..8333fd6 100644
--- a/x11-plugins/gkrellmoon/gkrellmoon-0.6-r1.ebuild
+++ b/x11-plugins/gkrellmoon/gkrellmoon-0.6-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-inherit gkrellm-plugin
+EAPI=6
+inherit gkrellm-plugin toolchain-funcs
 
 IUSE=""
 DESCRIPTION="A GKrellM2 plugin of the famous wmMoonClock dockapp"
@@ -10,13 +11,20 @@ SRC_URI="mirror://sourceforge/gkrellmoon/${P}.tar.gz"
 HOMEPAGE="http://gkrellmoon.sourceforge.net/;
 
 DEPEND="media-libs/imlib2"
+RDEPEND="${DEPEND}"
 
 SLOT="2"
 LICENSE="GPL-2"
+
 KEYWORDS="alpha amd64 ppc sparc x86"
 
-src_unpack() {
-   unpack ${A}
-   cd "${S}"
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
+src_prepare() {
+   default
sed -i -e '/^#include /a#include ' CalcEphem.h
 }
+
+src_compile() {
+   emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}