From d83532aee7e94505bf23da29e6224ca164aac759 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 16 Apr 2023 17:51:01 +0100
Subject: gentoo auto-resync : 16:04:2023 - 17:51:01
---
x11-misc/grabc/Manifest | 4 ++--
x11-misc/grabc/files/grabc-1.1-makefile.patch | 28 ++++++++++------------
x11-misc/grabc/grabc-1.1-r2.ebuild | 34 ---------------------------
x11-misc/grabc/grabc-1.1-r3.ebuild | 31 ++++++++++++++++++++++++
4 files changed, 46 insertions(+), 51 deletions(-)
delete mode 100644 x11-misc/grabc/grabc-1.1-r2.ebuild
create mode 100644 x11-misc/grabc/grabc-1.1-r3.ebuild
(limited to 'x11-misc/grabc')
diff --git a/x11-misc/grabc/Manifest b/x11-misc/grabc/Manifest
index 14656a070c95..12908e7f2d49 100644
--- a/x11-misc/grabc/Manifest
+++ b/x11-misc/grabc/Manifest
@@ -1,4 +1,4 @@
-AUX grabc-1.1-makefile.patch 806 BLAKE2B 6b63617e25cbec0080970d891cd359b639186dae8580f8f12c375512564519408554b9ec82bc3c124f1e2f0b704bb6f5d42dac0b0ab522ea02059c8200e0c38d SHA512 5e959bc3d3d6b743374b6651ce0e98fc510ad573c4ee7c922bae2e3b48415f85926bbfd4c553cd392ec2e954fdd74a14f905d79ae55fe7771eb34ac942af435b
+AUX grabc-1.1-makefile.patch 710 BLAKE2B 675b191474de743673e4f21829342a2924edd003ba7308dc68f2e4ea27baa232c8f134f30186a97eb7c3f13f23494b50d3616c360884f530e8720e16f6744f5b SHA512 1b219cb0a31dfbd60b1e6836d8a3bea9bec329c0d910386cc9b2037cf9060e4061770baa2d4c1f0e569b5f6e44276b7277523304227bd0ad0622ae1316590095
DIST grabc1.1.tar.gz 2983 BLAKE2B 751d70fd1789e7b0cab8c8a9ac185c3f918de0a948f5514514dc0fe489cce0feb3fb9b17656cafb911735c84f5d8c990af571ed0ba454fb6021d4b6cd8a4aeee SHA512 9a2416fd0cda7bd6fb65092572e6ba932eeac33a8534efe53be8f4bac3576884003dd50075363acd2d8466a406ba8799a0cef51086700269728894913a748aeb
-EBUILD grabc-1.1-r2.ebuild 694 BLAKE2B d2e1de5cb3bf579f8380e64ade7b193a81fc048b37e66f4cf5c70b3f6864fd3c7481e0cd5829ff22a9981920528a45ecea476571ae153c2d4f538e997e05b179 SHA512 bcf037e111902ef6cfbf421b2825f7e28d19c8e7de193a44e1dda3654cabf467a643aea21dcc625b706cffb769737916b08cb152ca00cc41448dda6801439865
+EBUILD grabc-1.1-r3.ebuild 687 BLAKE2B 3a46c1a51d1852e6e505b938d8e0ae4d29f3fe9ced7914bcb1f1a7f1cb82e9536e1a21852dbd944600aa6f76cc6404f7c6aee3db4eeca2f73423ec453f1b7d68 SHA512 34870c20a6ab94e45706af4442b1c599637a6292306ac9952b01ed899d384cc368fdc2289d0cb889f0b5b42894753fb3a1b444857b2899a60b38602c167cb97c
MISC metadata.xml 277 BLAKE2B ebaa8353413cfc5519fce99f8627c71cf765fc6d42b42651e232274de315487c156d45dcb23a401dffb8f112600b0dadd56f93d2283ff86b4293dc5490ad4059 SHA512 c8ef9069153b124118a6be64375c6954ccc6f518a13805e4ff1c33c9cec136170132a580c4a9781930b709c93678c94d6448291625de34d18fea41bfd17f685d
diff --git a/x11-misc/grabc/files/grabc-1.1-makefile.patch b/x11-misc/grabc/files/grabc-1.1-makefile.patch
index ef2968ba0e14..80961ab40a04 100644
--- a/x11-misc/grabc/files/grabc-1.1-makefile.patch
+++ b/x11-misc/grabc/files/grabc-1.1-makefile.patch
@@ -1,6 +1,6 @@
--- a/Makefile
+++ b/Makefile
-@@ -2,17 +2,15 @@
+@@ -2,30 +2,16 @@
# Makefile automatically generated by genmake 1.0, Mar-16-97
# genmake 1.0 by ma_muquit@fccc.edu, RCS
##
@@ -8,30 +8,28 @@
DEFS=
PROGNAME= grabc
-LIBS= -L/usr/X11R6/lib -lX11
-+LIBS= $(shell ${PKG_CONFIG} --libs x11)
++LDLIBS= $(shell $(PKG_CONFIG) --libs x11)
INCLUDES= -I.
-# replace -O with -g in order to debug
-+# replace -O2 -pipe -Wall -march=athlon-xp with -g in order to debug
- DEFINES= $(INCLUDES) $(DEFS) -D__USE_FIXED_PROTOTYPES__ -DSYS_UNIX=1
+-DEFINES= $(INCLUDES) $(DEFS) -D__USE_FIXED_PROTOTYPES__ -DSYS_UNIX=1
-CFLAGS= -O $(DEFINES)
-
- SRCS = grabc.c
-
-@@ -20,12 +18,12 @@
-
- .c.o:
- rm -f $@
+-
+-SRCS = grabc.c
+-
+-OBJS = grabc.o
+-
+-.c.o:
+- rm -f $@
- $(CC) $(CFLAGS) -c $*.c
-+ $(CC) $(CFLAGS) $(DEFINES) -c $*.c
++CPPFLAGS += $(INCLUDES) $(DEFS) -D__USE_FIXED_PROTOTYPES__ -DSYS_UNIX=1
all: $(PROGNAME)
- $(PROGNAME) : $(OBJS)
+-$(PROGNAME) : $(OBJS)
- $(CC) $(CFLAGS) -o $(PROGNAME) $(OBJS) $(LIBS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROGNAME) $(OBJS) $(LIBS)
-
+-
clean:
rm -f $(OBJS) $(PROGNAME) core
diff --git a/x11-misc/grabc/grabc-1.1-r2.ebuild b/x11-misc/grabc/grabc-1.1-r2.ebuild
deleted file mode 100644
index 847aacb19a8d..000000000000
--- a/x11-misc/grabc/grabc-1.1-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Identify color of a pixel on the screen by clicking on a pixel on the screen"
-HOMEPAGE="https://www.muquit.com/muquit/software/grabc/grabc.html"
-SRC_URI="https://www.muquit.com/muquit/software/${PN}/${PN}${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto
- virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN}${PV}"
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
-
-src_compile() {
- tc-export CC PKG_CONFIG
- default
-}
-
-src_install() {
- dobin grabc
- einstalldocs
-}
diff --git a/x11-misc/grabc/grabc-1.1-r3.ebuild b/x11-misc/grabc/grabc-1.1-r3.ebuild
new file mode 100644
index 000000000000..d655831fd8a1
--- /dev/null
+++ b/x11-misc/grabc/grabc-1.1-r3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Identify color of a pixel on the screen by clicking on a pixel on the screen"
+HOMEPAGE="https://www.muquit.com/muquit/software/grabc/grabc.html"
+SRC_URI="https://www.muquit.com/muquit/software/${PN}/${PN}${PV}.tar.gz"
+S="${WORKDIR}/${PN}${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
+src_configure() {
+ tc-export CC PKG_CONFIG
+}
+
+src_install() {
+ dobin grabc
+ einstalldocs
+}
--
cgit v1.2.3