From 7de38569be82fc1fa3082efedee2578ac6ec5e15 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Mon, 21 Jun 2021 22:42:13 -0400 Subject: [PATCH] sys-apps/vbetest: Update to work with latest gentoo repo. Seems they removed EAPI=4 support from eutils so now this ebuild doesn't work anymore. Update to EAPI=7 and tweak it. I notice that the vbetest source files are marked as "public domain" so update LICENSE accordingly. --- sys-apps/vbetest/Manifest | 8 ++-- .../vbetest/files/lrmi-0.10-ldflags.patch | 26 ------------ .../files/vbetest-0.10-external-include.patch | 16 +++++++ sys-apps/vbetest/files/vbetest-libx86.patch | 24 ----------- .../vbetest/files/vbetest-sharedlrmi.patch | 13 ------ sys-apps/vbetest/vbetest-0.10-r1.ebuild | 42 +++++++++++++++++++ sys-apps/vbetest/vbetest-0.10.ebuild | 34 --------------- 7 files changed, 61 insertions(+), 102 deletions(-) delete mode 100644 sys-apps/vbetest/files/lrmi-0.10-ldflags.patch create mode 100644 sys-apps/vbetest/files/vbetest-0.10-external-include.patch delete mode 100644 sys-apps/vbetest/files/vbetest-libx86.patch delete mode 100644 sys-apps/vbetest/files/vbetest-sharedlrmi.patch create mode 100644 sys-apps/vbetest/vbetest-0.10-r1.ebuild delete mode 100644 sys-apps/vbetest/vbetest-0.10.ebuild diff --git a/sys-apps/vbetest/Manifest b/sys-apps/vbetest/Manifest index 8e36b00..4abbcbb 100644 --- a/sys-apps/vbetest/Manifest +++ b/sys-apps/vbetest/Manifest @@ -1,5 +1,3 @@ -AUX lrmi-0.10-ldflags.patch 933 RMD160 8a00795f9cd3ccdfa69604907d22f6b50c8d022a SHA1 d2c485b780cc32119c0db949fc406e9b25e2543c SHA256 43356cc620593291d8ff079d36a770440b7cfa0c2318f869928c1968c08f2075 -AUX vbetest-libx86.patch 688 RMD160 eab54699c54e8f63f56862adca592ee1c1a8a08e SHA1 34b14043e20f37bd0bd09c053851cc9721f8b1ea SHA256 6981d1513d0d50794d9de5887e2ad27ee340aed04cb65faca43b73fd49fffdf3 -AUX vbetest-sharedlrmi.patch 436 RMD160 6e91c20ffe16b12394c813eafeea80d359254bde SHA1 475c462abdfb2704a09e3da9667f195a3bdc9174 SHA256 ce4a409752e5c4e3182f156edc1cf02c84f4490a5221f134104ede54a10017db -DIST lrmi-0.10.tar.gz 10271 RMD160 3805b41fd2a558ec145991c30a7f88101af48f1c SHA1 1495b3c2f3613979eb0396fd99a8e5e52d53ec80 SHA256 b0be55c14407f586dc10836e8f348b3a002c461a9b47a302071eac0ef85770da -EBUILD vbetest-0.10.ebuild 690 RMD160 66e142f2a722e125b265fc0eac8f220e24de598f SHA1 9677c2e703c5dd66033af2d3bce627294ecf92cb SHA256 e608d33c443cb940745d8680c0182b6d2f1543add32ba3539c9adeccfdab5489 +AUX vbetest-0.10-external-include.patch 329 BLAKE2B 076fd777fc357465d119de1de1449c66e47bcf3307ea951f1ac079fea5d399ffb86c1b8eaeca0365747b19877a0551880aeea967af9641714bfce21fed8e2543 SHA512 167bc4bb5972ab77ec7b173c7ae511ac30999d25b8fcb7923ad8f067c15a1ed5533370dedc821382a9ba3a0dcc808a48a626ef4ff3323a63678e2320e702fca0 +DIST lrmi-0.10.tar.gz 10271 BLAKE2B 7c8c5856dd3bf7fc977b303db4c0c2a419a6331ddc117ae6356bd48311a6871d6452ac681e3dbb8e32d4fdd99e1d2268604bf29ac52327457467e8bbf2fb5d95 SHA512 61d4f228ab712376cb8d47ef9e1049c89b9916f2fc04723ced03524b716f5e034ffb8ce7aa9b2b4d9d67aa93608020fc7dd1fb7a9778f211eb25a22713a538f1 +EBUILD vbetest-0.10-r1.ebuild 991 BLAKE2B ebfd90bdeb1d313d04d9928416df9a76e0ca5e68d8c064b3b69ec687c3c6793328fea0dbb658072f23f6d20192726c8064cc5baf0f24ead098de43946f3e6378 SHA512 1f9cb36b8102b0753fedf8a8367f295f8684707f5bc750043bb9cee9c4bf2fd74f5c3ae779ce7003886fd9a0b5613fcf941a236795d8fcf61d4f32315dd23c93 diff --git a/sys-apps/vbetest/files/lrmi-0.10-ldflags.patch b/sys-apps/vbetest/files/lrmi-0.10-ldflags.patch deleted file mode 100644 index 39d298c..0000000 --- a/sys-apps/vbetest/files/lrmi-0.10-ldflags.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naurp lrmi-0.10-orig/Makefile lrmi-0.10/Makefile ---- lrmi-0.10-orig/Makefile 2010-08-20 15:03:17.093144820 +0200 -+++ lrmi-0.10/Makefile 2010-08-20 15:03:47.761144267 +0200 -@@ -2,6 +2,7 @@ LIBDIR ?= /usr/local/lib - INCDIR ?= /usr/local/include - - CFLAGS = -g -Wall -+LDFLAGS = - - sources = lrmi.c - objects = lrmi.o -@@ -26,12 +27,12 @@ liblrmi.a: $(objects) - - liblrmi.so: $(pic_objects) - # $(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -shared -o $@ $^ -- $(CC) $(CPPFLAGS) $(CFLAGS) -Wl,-soname,$(LIBNAME).so.$(MAJOR) -fPIC -shared -o $(LIBNAME).so.$(VERSION) $^ -+ $(CC) $(CPPFLAGS) $(CFLAGS) -Wl,-soname,$(LIBNAME).so.$(MAJOR) $(LDFLAGS) -fPIC -shared -o $(LIBNAME).so.$(VERSION) $^ - ln -sf $(LIBNAME).so.$(VERSION) $(LIBNAME).so.$(MAJOR) - ln -sf $(LIBNAME).so.$(MAJOR) $(LIBNAME).so - - vbetest: vbetest.c liblrmi.a -- $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $^ -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ - - install: - mkdir -p $(LIBDIR) diff --git a/sys-apps/vbetest/files/vbetest-0.10-external-include.patch b/sys-apps/vbetest/files/vbetest-0.10-external-include.patch new file mode 100644 index 0000000..a962ce0 --- /dev/null +++ b/sys-apps/vbetest/files/vbetest-0.10-external-include.patch @@ -0,0 +1,16 @@ +diff --git a/vbetest.c b/vbetest.c +index a3e0621..f477122 100644 +--- a/vbetest.c ++++ b/vbetest.c +@@ -22,7 +22,10 @@ This program is in the public domain. + #include + #endif + +-#include "lrmi.h" ++#ifndef LRMI_INCLUDE ++# define LRMI_INCLUDE ++#endif ++#include LRMI_INCLUDE + #include "vbe.h" + + struct { diff --git a/sys-apps/vbetest/files/vbetest-libx86.patch b/sys-apps/vbetest/files/vbetest-libx86.patch deleted file mode 100644 index bd03e12..0000000 --- a/sys-apps/vbetest/files/vbetest-libx86.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- lrmi-0.10/vbetest.c.orig 2005-12-04 18:44:44.000000000 -0500 -+++ lrmi-0.10/vbetest.c 2008-06-01 15:03:34.000000000 -0400 -@@ -22,7 +22,7 @@ - #include - #endif - --#include "lrmi.h" -+#include - #include "vbe.h" - - struct { ---- lrmi-0.10/Makefile.orig 2005-12-04 18:33:57.000000000 -0500 -+++ lrmi-0.10/Makefile 2008-06-01 15:02:55.000000000 -0400 -@@ -30,8 +30,8 @@ - ln -sf $(LIBNAME).so.$(VERSION) $(LIBNAME).so.$(MAJOR) - ln -sf $(LIBNAME).so.$(MAJOR) $(LIBNAME).so - --vbetest: vbetest.c liblrmi.a -- $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ -+vbetest: vbetest.c -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lx86 - - install: - mkdir -p $(LIBDIR) diff --git a/sys-apps/vbetest/files/vbetest-sharedlrmi.patch b/sys-apps/vbetest/files/vbetest-sharedlrmi.patch deleted file mode 100644 index abe8e28..0000000 --- a/sys-apps/vbetest/files/vbetest-sharedlrmi.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- lrmi-0.10/Makefile.orig 2005-12-04 18:33:57.000000000 -0500 -+++ lrmi-0.10/Makefile 2008-06-01 15:39:08.000000000 -0400 -@@ -30,8 +30,8 @@ - ln -sf $(LIBNAME).so.$(VERSION) $(LIBNAME).so.$(MAJOR) - ln -sf $(LIBNAME).so.$(MAJOR) $(LIBNAME).so - --vbetest: vbetest.c liblrmi.a -- $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ -+vbetest: vbetest.c -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ -llrmi - - install: - mkdir -p $(LIBDIR) diff --git a/sys-apps/vbetest/vbetest-0.10-r1.ebuild b/sys-apps/vbetest/vbetest-0.10-r1.ebuild new file mode 100644 index 0000000..6851a61 --- /dev/null +++ b/sys-apps/vbetest/vbetest-0.10-r1.ebuild @@ -0,0 +1,42 @@ +# Copyright © 2009, 2012, 2021 Nick Bowler +# License GPLv3+: GNU General Public License version 3 or any later version. +# This is free software: you are free to change and redistribute it. +# There is NO WARRANTY, to the extent permitted by law. + +EAPI=7 + +inherit toolchain-funcs + +MY_PN=lrmi +MY_P=$MY_PN-$PV + +DESCRIPTION="Utility to display and test VESA BIOS Extensions (VBE) modes." +HOMEPAGE="http://www.sourceforge.net/projects/lrmi/" +SRC_URI="mirror://sourceforge/$MY_PN/$MY_P.tar.gz" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="lrmi" + +DEPEND="lrmi? ( =sys-libs/lrmi-${PV}* ) + !lrmi? ( dev-libs/libx86 )" +RDEPEND=$DEPEND + +PATCHES=( + "$FILESDIR/$P-external-include.patch" +) + +S=$WORKDIR/$MY_P + +src_compile() { + local inc= lib=-llrmi CC=$(tc-getCC) + use lrmi || { inc='-DLRMI_INCLUDE=' lib=-lx86; } + + (set -x; $CC $inc $CPPFLAGS $CFLAGS -c vbetest.c; ) || die + (set -x; $CC $CFLAGS $LDFLAGS -o vbetest vbetest.o $lib ) || die +} + +src_install() { + dobin vbetest +} diff --git a/sys-apps/vbetest/vbetest-0.10.ebuild b/sys-apps/vbetest/vbetest-0.10.ebuild deleted file mode 100644 index 566fc4c..0000000 --- a/sys-apps/vbetest/vbetest-0.10.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -EAPI=4 - -inherit eutils toolchain-funcs - -S="${WORKDIR}/lrmi-${PV}" - -DESCRIPTION="Utility to display and test VESA BIOS Extensions (VBE) modes." -HOMEPAGE="http://www.sourceforge.net/projects/lrmi/" -SRC_URI="mirror://sourceforge/lrmi/lrmi-${PV}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="lrmi" - -DEPEND="lrmi? ( =sys-libs/lrmi-${PV}* ) - !lrmi? ( dev-libs/libx86 )" - -src_prepare() { - epatch "${FILESDIR}/lrmi-${PV}-ldflags.patch" - if ! use lrmi ; then - epatch "${FILESDIR}/${PN}-libx86.patch" - else - epatch "${FILESDIR}/${PN}-sharedlrmi.patch" - fi -} - -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" vbetest -} - -src_install() { - dobin vbetest -} -- 2.43.0