From 78d6f0ffcb82a7a70074d9df4d6122e08916ad6e Mon Sep 17 00:00:00 2001
From: David Seifert <soap@gentoo.org>
Date: Wed, 4 Jan 2023 10:33:07 +0100
Subject: [PATCH 1/2] x11-libs/librfm: update EAPI 6 -> 8
Signed-off-by: David Seifert <soap@gentoo.org>
---
....16.3-r1.ebuild => librfm-5.3.16.3-r2.ebuild} | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
rename x11-libs/librfm/{librfm-5.3.16.3-r1.ebuild => librfm-5.3.16.3-r2.ebuild} (80%)
diff --git a/x11-libs/librfm/librfm-5.3.16.3-r1.ebuild b/x11-libs/librfm/librfm-5.3.16.3-r2.ebuild
similarity index 80%
rename from x11-libs/librfm/librfm-5.3.16.3-r1.ebuild
rename to x11-libs/librfm/librfm-5.3.16.3-r2.ebuild
index cdb51d8462313..ee43305cac246 100644
--- a/x11-libs/librfm/librfm-5.3.16.3-r1.ebuild
+++ b/x11-libs/librfm/librfm-5.3.16.3-r2.ebuild
@@ -1,7 +1,8 @@
-# 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 autotools
MY_P="${PN}5-${PV}"
@@ -9,11 +10,11 @@ MY_P="${PN}5-${PV}"
DESCRIPTION="The basic library used by some rfm applications, such as Rodent filemanager"
HOMEPAGE="http://xffm.org/libxffm.html"
SRC_URI="mirror://sourceforge/xffm/${PN}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE=""
RDEPEND="
>=dev-libs/glib-2.22.5:2
@@ -25,17 +26,14 @@ RDEPEND="
>=x11-libs/cairo-1.12.6[X]
>=x11-libs/gtk+-3.12:3[X]
>=x11-libs/pango-1.28.0[X]
- !<x11-misc/rodent-5
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
-S="${WORKDIR}/${MY_P}"
+PATCHES=( "${FILESDIR}"/${P}-autotools.patch )
src_prepare() {
default
- sed -i -e "s|-O2|${CFLAGS}|" m4/rfm-conditionals.m4 || die
eautoreconf
}
--
2.39.0
From 755ac0976aa0ddceca51e8f541a9c4b66acd196e Mon Sep 17 00:00:00 2001
From: David Seifert <soap@gentoo.org>
Date: Wed, 4 Jan 2023 10:36:37 +0100
Subject: [PATCH 2/2] x11-libs/dnd: update EAPI 6 -> 8
Signed-off-by: David Seifert <soap@gentoo.org>
---
.../dnd/{dnd-1.1-r3.ebuild => dnd-1.1-r4.ebuild} | 14 +++++---------
x11-libs/dnd/files/Makefile-fix.patch | 9 +++++----
2 files changed, 10 insertions(+), 13 deletions(-)
rename x11-libs/dnd/{dnd-1.1-r3.ebuild => dnd-1.1-r4.ebuild} (83%)
diff --git a/x11-libs/dnd/dnd-1.1-r3.ebuild b/x11-libs/dnd/dnd-1.1-r4.ebuild
similarity index 83%
rename from x11-libs/dnd/dnd-1.1-r3.ebuild
rename to x11-libs/dnd/dnd-1.1-r4.ebuild
index 09bc04cde8f63..f62563274f358 100644
--- a/x11-libs/dnd/dnd-1.1-r3.ebuild
+++ b/x11-libs/dnd/dnd-1.1-r4.ebuild
@@ -1,19 +1,21 @@
-# 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="OffiX' Drag'n'drop library"
HOMEPAGE="http://leb.net/offix"
SRC_URI="http://leb.net/offix/${PN}.${PV}.tgz"
+S="${WORKDIR}/DND/DNDlib"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-RDEPEND="x11-libs/libICE
+RDEPEND="
+ x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
x11-libs/libXaw
@@ -27,13 +29,7 @@ PATCHES=(
"${FILESDIR}"/Makefile-fix.patch
)
-S="${WORKDIR}/DND/DNDlib"
-
src_configure() {
tc-export CC CXX RANLIB AR
econf --with-x
}
-
-src_install() {
- emake DESTDIR="${D}" install
-}
diff --git a/x11-libs/dnd/files/Makefile-fix.patch b/x11-libs/dnd/files/Makefile-fix.patch
index 3a11282d1ccc9..df621f745a0b4 100644
--- a/x11-libs/dnd/files/Makefile-fix.patch
+++ b/x11-libs/dnd/files/Makefile-fix.patch
@@ -1,15 +1,16 @@
---- a/Makefile.in 1997-05-22 22:18:22.000000000 -0400
-+++ a/Makefile.in 2004-06-16 14:41:19.673035936 -0400
-@@ -16,7 +16,7 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -16,8 +16,8 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
-LIB_DIR = @libdir@
-+LIB_DIR = $(DESTDIR)@libdir@
-INC_DIR = @includedir@/OffiX
++LIB_DIR = $(DESTDIR)@libdir@
+INC_DIR = $(DESTDIR)@includedir@/OffiX
COMPILE = $(CC) $(INCLUDES) $(CFLAGS) -c
+ CXXCOMPILE = $(CXX) $(INCLUDES) $(CXXFLAGS) -c
@@ -42,19 +42,22 @@
$(COMPILE) dndtest.c
$(LINK) dndtest.o -L. -lDnd $(LIBS)
--
2.39.0
$ pkgcheck scan --commits
pkgcheck scan: error: Traceback (most recent call last):
File "/usr/lib/python3.11/site-packages/pkgcheck/pipeline.py", line 237, in _run
if results := tuple(runner.run(restriction)):
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib/python3.11/site-packages/pkgcheck/runners.py", line 71, in run
yield from check.feed(item)
File "/usr/lib/python3.11/site-packages/pkgcheck/checks/git.py", line 371, in feed
yield from self.removal_checks(list(pkg_map["D"]))
File "/usr/lib/python3.11/site-packages/pkgcheck/checks/git.py", line 280, in removal_checks
old_keywords = set().union(*(p.keywords for p in removal_repo.match(pkg.unversioned_atom)))
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib/python3.11/site-packages/pkgcore/repository/prototype.py", line 227, in match
return list(self.itermatch(atom, **kwds))
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib/python3.11/site-packages/pkgcore/repository/prototype.py", line 317, in _internal_match
for pkg in self._internal_gen_candidates(candidates, **kwargs):
File "/usr/lib/python3.11/site-packages/pkgcore/repository/prototype.py", line 312, in _internal_gen_candidates
yield from sorter(pkg_filter(pkgs))
File "/usr/lib/python3.11/site-packages/pkgcore/ebuild/repository.py", line 574, in _pkg_filter
if not pkg.is_supported:
^^^^^^^^^^^^^^^^
File "/usr/lib/python3.11/site-packages/snakeoil/klass.py", line 389, in __call__
return self.getter(obj)
^^^^^^^^^^^^^^^^
File "/usr/lib/python3.11/site-packages/pkgcore/package/base.py", line 97, in dynamic_getattr_dict
val = functor(self)
^^^^^^^^^^^^^
File "/usr/lib/python3.11/site-packages/pkgcore/ebuild/ebuild_src.py", line 289, in eapi
i = fileutils.readlines_utf8(ebuild.path)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib/python3.11/site-packages/snakeoil/_fileutils.py", line 85, in native_readlines
handle = open(mypath, mode, encoding=encoding)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
FileNotFoundError: [Errno 2] No such file or directory: '/tmp/tmp-pkgcheck-12rzhs7i.repo/x11-libs/librfm/librfm-5.3.16.3.ebuild'
67efd39ceb3e1d62410f46fa6c84008e248aa977git am:pkgcheck scan --commits