commit: 9def9f3061a0158ebbe7c8639fb299e4d35402ac
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 16 12:35:34 2023 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Apr 16 12:35:34 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9def9f30
x11-misc/grabc: update EAPI 6 -> 8
Signed-off-by: David Seifert <soap <AT> gentoo.org>
x11-misc/grabc/files/grabc-1.1-makefile.patch | 28 ++++++++++------------
.../{grabc-1.1-r2.ebuild => grabc-1.1-r3.ebuild} | 15 +++++-------
2 files changed, 19 insertions(+), 24 deletions(-)
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 [email protected], 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-r3.ebuild
similarity index 82%
rename from x11-misc/grabc/grabc-1.1-r2.ebuild
rename to x11-misc/grabc/grabc-1.1-r3.ebuild
index 847aacb19a8d..d655831fd8a1 100644
--- a/x11-misc/grabc/grabc-1.1-r2.ebuild
+++ b/x11-misc/grabc/grabc-1.1-r3.ebuild
@@ -1,31 +1,28 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+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"
-IUSE=""
RDEPEND="x11-libs/libX11"
DEPEND="${RDEPEND}
- x11-base/xorg-proto
- virtual/pkgconfig
-"
+ x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
-S="${WORKDIR}/${PN}${PV}"
PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
-src_compile() {
+src_configure() {
tc-export CC PKG_CONFIG
- default
}
src_install() {
