gentoo auto-resync : 03:02:2023 - 09:09:48

5 files changed, 5 insertions, 49 deletions

diff --git a/x11-plugins/gkrellshoot/Manifest b/x11-plugins/gkrellshoot/Manifest
index 9c7d59918197..628b098e58d1 100644
--- a/x11-plugins/gkrellshoot/Manifest
+++ b/x11-plugins/gkrellshoot/Manifest
@@ -1,7 +1,6 @@
-AUX gkrellshoot-0.4.4-r4-pkgconfig.patch 657 BLAKE2B 83d9168314c216241894fc7ef354c8e271d1a551d4809bb03aedc7265314778ec3ae08f9bcf5070742fe45e40b90769cf7691bc27223cca7facdc3fb429adfb1 SHA512 02afe801966bc62dbd90cf573a25c196e0b4f4b3c31c98a464214cdf52dd6b09d5e686e04226160c90dfc392005e0ba9d8e4b1beac83f54693d7af6c520a3f87
-AUX gkrellshoot-0.4.4-r5-fix-implicit-int.patch 582 BLAKE2B 6fe1af328d8680f335dec6a6964c2ef72750364bbb5eccebf7fca16c25802253531bbcd1061eedeb4574c56fc75df9ad32e03198b34f046a632b1eb0148556c3 SHA512 c7968dcbadab4f3f32d4aa7dea896b950146bac822a32f09823cef52a6b13513d339163b11984f693b23f9d98ae33022148cc9edea64e2caf586045c3143a739
-AUX makefile-respect-flags.patch 663 BLAKE2B 1129e147524560fd8a5ff2979453ed9aa0a8abb03b940d989106f18f887b571cd09a72454da05325b94c369ee72c4bfca2981945910ddd6e7c3e9ab1fe35b0cc SHA512 a58b16f0b95533be587f2fe1a63ba7c19ade8dfd9b432d2423aee3ff7b99789d662cb7ed0e04854ed1b315c106586c4cd527427b5ce395b3bbeffedf2c5fff80
+AUX gkrellshoot-0.4.4-r4-pkgconfig.patch 520 BLAKE2B 7722fc94cf39453442dd671a5b90bd2a08a3c35081a584d2cad6e7d4dc35123e6cfa4087697dcb45b1a88318ea7be8505c45aafc36ea0c443bfd8887c70772a6 SHA512 3c3256ddc34ee0a93f4ed3d608323c53f7ee4cdff2339d90eeddf3d181503b39ce8d3b565631f4627d9a9d5832cc57235177fe1f6e7dc341896a3eb0695e7c6d
+AUX gkrellshoot-0.4.4-r5-fix-implicit-int.patch 435 BLAKE2B add22b30afd5d8c6859a96dff690eace7279a8b68bc5cb2f904cb728bdfed8dfe53817908e9768c8929ba8a7936fb2a12b33b86c3bc9c8843d741b80b2f59155 SHA512 7035d72ec0562480033590d0f09fd316895a7279c6636281d94f4ad3a8460a802d4b00320be892c8920c62e2bfac7bffa57b01d4831fb4885cbb4b7fea73063a
+AUX makefile-respect-flags.patch 591 BLAKE2B 1292c511830ce2d3cef2fa3946e079d6ddac51e01176f5df80577190153bb77d9a1780bfd0371b1deae5060194b4ecc3a8eb4ca49220f97e3f26428d8a3ff4f9 SHA512 b35f49b231aabd80905db10350aabea42b19e8691fc8dff10bf85f89833b6f562b6dad53f61113fae024d40ce12c652fd7c55979696fb8b87af230884d76f322
 DIST gkrellshoot-0.4.4.tar.gz 16556 BLAKE2B 417217ffa500d8b0cc4ddd80849b2da83e3e55bc489db83fd7c8992f42af9ebb385c1ece17cae65cb7393bffadaaffd70e11a4dea16aa4d2b2f19e0b828a6833 SHA512 9363c045a99c23f8fedf95ac82c7bab4ce21acb675fdabdd831f174d9816a14a22ed6d7048d475b4c4199b9e6a88f3f663702ac2f9304f08860339beb323322a
-EBUILD gkrellshoot-0.4.4-r4.ebuild 667 BLAKE2B 11ed230548f847cc54c2e92ac257d8fbce8ca8bf6f043b7601c2629824ee7d12f93c84ca696ba233a09abe71f21b292d9d79166e5f35d2c48ca776cd3d1699e6 SHA512 65a5c296d64ccf7f43b2edc643bc3da84713b7d3357f43dbc87e8a40cf9f1e4c81c6daf3b999924b6cdf11af411c75373800e7c5c928239c8e8f870939ce51d7
 EBUILD gkrellshoot-0.4.4-r5.ebuild 713 BLAKE2B 7d5f3a720b95a7becb5aabe1b8293170533fad741307b13d5ce71408b569cc2d09464d120a0371bc3b202f91dff11509a19ae83380c92aab5948d66eaa9434f0 SHA512 039444a6234681551ca983994303ab6bf676c37d33e1c93e9ce5312b4e64dad8d3759c73b5bfe329b880c92841109425e87e0507b821618c658edbcbde4243a7
 MISC metadata.xml 249 BLAKE2B 3035b160871880c8efce1239c00a3560c8c7b2b8eda5ebe8dab078c77496de9815444cdb9e7440687681828490e7684c2794406444eedf71fa380f5cd3c35b05 SHA512 01584093d9f32130ab091c0101ca41fba98d46fc3670c9598f052ef4393659bc8fc964d4b6232c7724eb7d0e03e32901b231799a595fa7f6626b3367dd116a68
diff --git a/x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r4-pkgconfig.patch b/x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r4-pkgconfig.patch
index d6dfb54e4354..1f3186f652f4 100644
--- a/x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r4-pkgconfig.patch
+++ b/x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r4-pkgconfig.patch
@@ -3,12 +3,6 @@ From: Thomas Bracht Laumann Jespersen <t@laumann.xyz>
 Date: Sat, 26 Mar 2022 10:32:18 +0100
 Subject: [PATCH] pkgconfig
 
----
- Makefile | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index e5a4895..296f807 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,5 +1,6 @@
diff --git a/x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r5-fix-implicit-int.patch b/x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r5-fix-implicit-int.patch
index fae0a519ba05..f9ee064b0a73 100644
--- a/x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r5-fix-implicit-int.patch
+++ b/x11-plugins/gkrellshoot/files/gkrellshoot-0.4.4-r5-fix-implicit-int.patch
@@ -3,12 +3,6 @@ By default clang16 will not allow implicit integer declarations in function para
 Bug: https://bugs.gentoo.org/874891
 
 Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
----
- gkrellshoot.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gkrellshoot.c b/gkrellshoot.c
-index 114a85e..0d74d1d 100755
 --- a/gkrellshoot.c
 +++ b/gkrellshoot.c
 @@ -436,7 +436,7 @@ double star_screenx[NUM_STARS];
diff --git a/x11-plugins/gkrellshoot/files/makefile-respect-flags.patch b/x11-plugins/gkrellshoot/files/makefile-respect-flags.patch
index 8de89009dbbc..9b3dd81c3d1b 100644
--- a/x11-plugins/gkrellshoot/files/makefile-respect-flags.patch
+++ b/x11-plugins/gkrellshoot/files/makefile-respect-flags.patch
@@ -1,5 +1,5 @@
---- a/Makefile	2006-12-09 04:24:36.000000000 +0100
-+++ b/Makefile	2013-03-16 13:50:00.147834790 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -1,16 +1,20 @@
  GTK_INCLUDE = `pkg-config gtk+-2.0 --cflags`
  GTK_LIB = `pkg-config gtk+-2.0 --libs`
diff --git a/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r4.ebuild b/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r4.ebuild
deleted file mode 100644
index dff19004a2c3..000000000000
--- a/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gkrellm-plugin toolchain-funcs
-
-DESCRIPTION="GKrellm2 plugin to take screen shots and lock screen"
-HOMEPAGE="http://gkrellshoot.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gkrellshoot/${P}.tar.gz"
-S="${WORKDIR}/${P/s/S}"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~ppc sparc x86"
-
-DEPEND="app-admin/gkrellm:2[X]"
-RDEPEND="
-	${DEPEND}
-	virtual/imagemagick-tools"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/makefile-respect-flags.patch
-	"${FILESDIR}/${P}"-r4-pkgconfig.patch
-)
-
-src_compile() {
-	tc-export PKG_CONFIG
-	default
-}