[gentoo-commits] repo/gentoo:master commit in: x11-misc/dxpc/files/, x11-misc/dxpc/

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dxpc/files/, x11-misc/dxpc/

[David Seifert]

commit:     3c026e863ea568ef6557d6ddd4c8eff477560107
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 16 12:35:36 2023 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Apr 16 12:35:36 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c026e86

x11-misc/dxpc: update EAPI 6 -> 8

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../{dxpc-3.9.2-r2.ebuild => dxpc-3.9.2-r3.ebuild} | 14 ++----
 x11-misc/dxpc/files/dxpc-3.9.2-makefile.patch      | 54 ++++++++++++++++++++++
 2 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/x11-misc/dxpc/dxpc-3.9.2-r2.ebuild b/x11-misc/dxpc/dxpc-3.9.2-r3.ebuild
similarity index 65%
rename from x11-misc/dxpc/dxpc-3.9.2-r2.ebuild
rename to x11-misc/dxpc/dxpc-3.9.2-r3.ebuild
index fb1d75627254..bbb2053edca4 100644
--- a/x11-misc/dxpc/dxpc-3.9.2-r2.ebuild
+++ b/x11-misc/dxpc/dxpc-3.9.2-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Differential X Protocol Compressor"
 HOMEPAGE="http://www.vigor.nu/dxpc/"
@@ -10,16 +10,12 @@ SRC_URI="http://www.vigor.nu/dxpc/${P}.tgz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ppc x86"
-IUSE=""
 
-RDEPEND="x11-libs/libXt
+RDEPEND="
+	x11-libs/libXt
 	>=dev-libs/lzo-2"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 DOCS=( CHANGES README TODO )
-
-src_install() {
-	emake prefix="${ED%/}"/usr man1dir="${ED%/}"/usr/share/man/man1 install
-	einstalldocs
-}

diff --git a/x11-misc/dxpc/files/dxpc-3.9.2-makefile.patch b/x11-misc/dxpc/files/dxpc-3.9.2-makefile.patch
new file mode 100644
index 000000000000..691a1504d977
--- /dev/null
+++ b/x11-misc/dxpc/files/dxpc-3.9.2-makefile.patch
@@ -0,0 +1,54 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -20,10 +20,7 @@
+ 
+ # We may have separate source and binary trees -- make sure we can find
+ # dxpcconf.h
+-CPPFLAGS = -I.
+-
+-.C.o:
+-	$(CXX) $(CPPFLAGS) -c $(CXXFLAGS) $<
++CPPFLAGS += -I.
+ 
+ TARGET=	dxpc$(EXEEXT)
+ 
+@@ -53,18 +50,18 @@
+ OBJS=	$(SRCS:.C=.o)
+ 
+ $(TARGET):	$(OBJS)
+-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ 
+ ifeq ($(MINGW32),true)
+ $(SECONDTARGET): $(OBJS)
+-	$(CXX) -mwindows $(CPPFLAGS) $(CXXFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(LIBS)
++	$(CXX) -mwindows $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ endif
+ 
+ pure_$(TARGET):	$(OBJS)
+-	purify $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(LIBS)
++	purify $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ 
+ quant_$(TARGET):	$(OBJS) $(OBJS)
+-	quantify $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(LIBS)
++	quantify $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ 
+ depends:
+ 	makedepend -f Makefile $(SRCS)
+@@ -72,12 +69,12 @@
+ install: install.bin install.man
+ 
+ install.bin:	$(TARGET)
+-	$(srcdir)/mkinstalldirs $(bindir)
+-	$(INSTALL) $(TARGET) $(bindir)/$(TARGET)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
++	$(INSTALL) $(TARGET) $(DESTDIR)$(bindir)/$(TARGET)
+ 
+ install.man:
+-	$(srcdir)/mkinstalldirs $(man1dir)
+-	$(INSTALL_DATA) $(TARGET).man $(man1dir)/$(TARGET).1
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(man1dir)
++	$(INSTALL_DATA) $(TARGET).man $(DESTDIR)$(man1dir)/$(TARGET).1
+ 
+ clean:
+ 	-rm -f *~ *.o $(TARGET) pure_* quant_* *.bak core gmon.out