diff --git a/sys-block/partclone/Manifest b/sys-block/partclone/Manifest index 67f57cdb..66270fb1 100644 --- a/sys-block/partclone/Manifest +++ b/sys-block/partclone/Manifest @@ -1,6 +1,7 @@ AUX automake.patch 435 BLAKE2B f5b4680cdc5708b2636018296d4831d2ea89faa5a7f385750e0caca961184eb36bf7504e03709de47d9acaae6f6f5a56fdc7489ab4808fb67b19efd6214a7943 SHA512 5dcb3ff62df4356f622ade738c94c89eeda54c45163bede17cc9f465898d1da1ec2a17b454177bfbde673bd271e6e449084f07af8d101f3a9d2e430c442bbd0d AUX jfsclone-no-return.patch 448 BLAKE2B 3edf4a785b00aaf92d2a6ffd37caa42b665cd74428b714c9c435c2caf9405b5198a1f2cb6b1987773d84bce4ad7953d87d66905033e35aa153d05df992c58d84 SHA512 4ca41efb405cafcc072f51a5bf0c43281a909c1ac215b46ab99e2e486f52a41426acb719d9bc60e0ea5b720c76e0d7a9b9f9c9f28bdfd36bc8d8bbcdc626cf96 +AUX partclone-0.3.47-reiserfs3-compat.patch 2729 BLAKE2B 8501f55ede07dc53b64b4562e89a41fc13eefe1d40400b9a033e819d56f34ed11ab587133218a3e8a2945e756abcd052ae3efe2955931ee581f2eb8abbed84b0 SHA512 5892bb436f4cb21e1abeb30826c14d8842f0360c13704c94025f361377ea9dcaebca8a94a11c7c19950573a756cf290041ec8b33f35823306f2cfc333328df00 DIST partclone-0.3.47.tar.gz 1656636 BLAKE2B 1d2c1d1f215bb98964fbded290894f60b5c3261b9190b7e90b4b70e3254eeb864a57035f7b3af0e3b5efed1b5cf304d851588f0610c8cb4fa95effb13bba8ff4 SHA512 acad16e894091c95f9318eba27984a7483278b6aef7d658d84719b5d2d3550df1d15f5655f62bb9e1d014440b0ffcebf8626f27d44afe97d55ff26cb2bcbe3a9 -EBUILD partclone-0.3.47.ebuild 1733 BLAKE2B 130715f2b2c7a4d314aabd6931e26bffc6cbf797455ce178a76496f7b19c4b6eeee8978e545f3ab1a33237b1aa84f133f41e6898f4d5e0ca1cc456a6e4f5d784 SHA512 4c3804f56bc2d5bf7d770794de03a887dd99fce6d5e4e13397bcfa91015ccaf50a2efa262aa4bcbb250c45cfcd4767d73d924e649589637faaba6681ed978dd8 +EBUILD partclone-0.3.47.ebuild 1891 BLAKE2B a4fe5eb24b62a9932211cd06b62724d3f6e897214d70434d3c2aabe8815da268f02b71291221e4e8145ea0eb84ee56e99a01d1cc2f218cb49c46fe7e3c91608e SHA512 5b0df5426611e4e3c8741eebfd73eecbb719be599d0c5caebf46c8ea67b6503f3ec883082639e1a2389fb8b6333f425165acf5b4a5b9460fccc1dcc82d89ad9d MISC ChangeLog 2051 BLAKE2B 7630480e3cb7b9d62ed206374a48467560013f3a4d44ec50904db84175374e73a8f2cf4004f69b3ebe5bed5dd35e73b9ea74df1fc8744cd960104c04cc847498 SHA512 00081312a70d6cee05367a43267d384ef0a7f3dbe0509ae3af1446518ce226e003e83d8b8fd1b661d55408b90e68cc99cb9283686a743d36f919ce04e11fb869 MISC metadata.xml 800 BLAKE2B bc38be0959d90d2e953fa8e360e1ee284a204a8cb4686e300b19e84c0e4fa8e52c06e9f821a35fc56dd5de1b3ae953bfacd49101154cacba08f0dcfe0dd8a190 SHA512 a9730fd39808dc13e8feb65f02c30a430a36a8d7aa73af9590d85eb7dbedef490930b590e4c2aa80b538dee7c3fef1a3f1e689748e8d44ef7aadb94617e262c2 diff --git a/sys-block/partclone/files/partclone-0.3.47-reiserfs3-compat.patch b/sys-block/partclone/files/partclone-0.3.47-reiserfs3-compat.patch new file mode 100644 index 00000000..1ed9efa2 --- /dev/null +++ b/sys-block/partclone/files/partclone-0.3.47-reiserfs3-compat.patch @@ -0,0 +1,59 @@ +diff -urN partclone-0.3.47/configure.ac partclone-0.3.47/configure.ac +--- partclone-0.3.47/configure.ac 2026-03-11 07:47:30.000000000 +0100 ++++ partclone-0.3.47/configure.ac 2026-06-29 22:36:49.512721917 +0200 +@@ -198,13 +198,13 @@ + + dnl Check for REISERFS + AS_MESSAGE([checking for Reiserfs Library and Header files ... ...]) +-AC_CHECK_HEADERS([reiserfs/reiserfs.h], , +- AC_MSG_ERROR([*** reiserfs header files (reiserfs/reiserfs.h) not found]) ++AC_CHECK_HEADERS([reiserfs3/reiserfs.h], , ++ AC_MSG_ERROR([*** reiserfs header files (reiserfs3/reiserfs.h) not found]) + ) +-AC_CHECK_LIB([dal], [file_dal_open], [], +- AC_MSG_ERROR([*** Reiserfs depend library (libdal) not found])) +-AC_CHECK_LIB([reiserfs], [reiserfs_fs_open], [], +- AC_MSG_ERROR([*** Reiserfs library (libreiserfs) not found])) ++AC_CHECK_LIB([dal3], [file_dal_open], [], ++ AC_MSG_ERROR([*** Reiserfs depend library (libdal3) not found])) ++AC_CHECK_LIB([reiserfs3], [reiserfs_fs_open], [], ++ AC_MSG_ERROR([*** Reiserfs library (libreiserfs3) not found])) + AC_MSG_CHECKING(version of libreiserfs) + supported_fs=$supported_fs" reiserfs" + reiserfs_version="unknown, suggest 0.3.0.5" +diff -urN partclone-0.3.47/src/Makefile.am partclone-0.3.47/src/Makefile.am +--- partclone-0.3.47/src/Makefile.am 2026-03-11 07:47:30.000000000 +0100 ++++ partclone-0.3.47/src/Makefile.am 2026-06-29 22:36:49.512981849 +0200 +@@ -79,7 +79,7 @@ + sbin_PROGRAMS += partclone.reiserfs + partclone_reiserfs_SOURCES=$(main_files) reiserfsclone.c reiserfsclone.h + partclone_reiserfs_CFLAGS=-DREISERFS +-partclone_reiserfs_LDADD=torrent_helper.o -lreiserfs -ldal $(PCL_XXHASH_LIBS) $(CRYPTO_DEPS) ${LDADD_static} ++partclone_reiserfs_LDADD=torrent_helper.o -lreiserfs3 -ldal3 $(PCL_XXHASH_LIBS) $(CRYPTO_DEPS) ${LDADD_static} + endif + + if ENABLE_REISER4 +diff -urN partclone-0.3.47/src/deplib_version.c partclone-0.3.47/src/deplib_version.c +--- partclone-0.3.47/src/deplib_version.c 2026-03-11 07:47:30.000000000 +0100 ++++ partclone-0.3.47/src/deplib_version.c 2026-06-29 22:36:49.513067263 +0200 +@@ -4,7 +4,7 @@ + #ifdef EXTFS + #include + #elif REISERFS +- #include ++ #include + #elif REISER4 + #include + #elif XFS +diff -urN partclone-0.3.47/src/reiserfsclone.c partclone-0.3.47/src/reiserfsclone.c +--- partclone-0.3.47/src/reiserfsclone.c 2026-03-11 07:47:30.000000000 +0100 ++++ partclone-0.3.47/src/reiserfsclone.c 2026-06-29 22:36:49.513111544 +0200 +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + #include + #include "partclone.h" + #include "reiserfsclone.h" diff --git a/sys-block/partclone/partclone-0.3.47.ebuild b/sys-block/partclone/partclone-0.3.47.ebuild index 09888102..54270910 100644 --- a/sys-block/partclone/partclone-0.3.47.ebuild +++ b/sys-block/partclone/partclone-0.3.47.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit autotools +inherit autotools flag-o-matic DESCRIPTION="Partition cloning tool" HOMEPAGE="https://partclone.org https://github.com/Thomas-Tsai/partclone" @@ -30,7 +30,7 @@ DEPEND=" nilfs2? ( sys-fs/nilfs-utils ) ntfs? ( sys-fs/ntfs3g[ntfsprogs] ) reiser4? ( >=sys-fs/reiser4progs-1.0.7 ) - reiserfs? ( = 199901L) + # include + #else + typedef enum { + false = 0, + true = 1 + } bool; +-#endif /* HAVE_STDBOOL_H */ ++#endif diff --git a/sys-fs/jfsutils/files/jfsutils-1.1.15-musl-fix-includes.patch b/sys-fs/jfsutils/files/jfsutils-1.1.15-musl-fix-includes.patch new file mode 100644 index 00000000..08599a2d --- /dev/null +++ b/sys-fs/jfsutils/files/jfsutils-1.1.15-musl-fix-includes.patch @@ -0,0 +1,23 @@ +Closes: https://bugs.gentoo.org/715568 + +From https://git.alpinelinux.org/aports/commit/main/jfsutils/musl-fix-includes.patch?id=d9768c312ddc047df6c2c9b1674b2ab37ddf4e2a 2013-12-17 13:59:36 +0000 +From Timo Teräs + +--- a/libfs/fssubs.c ++++ b/libfs/fssubs.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + #if HAVE_MNTENT_H + #include +@@ -31,7 +32,6 @@ + #endif + + #if HAVE_GETMNTINFO +-#include + #include + #include + #endif diff --git a/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild b/sys-fs/jfsutils/jfsutils-1.1.15-r2.ebuild similarity index 76% rename from sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild rename to sys-fs/jfsutils/jfsutils-1.1.15-r2.ebuild index 2ccd405f..51ddc8c8 100644 --- a/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild +++ b/sys-fs/jfsutils/jfsutils-1.1.15-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=8 +EAPI=7 inherit autotools flag-o-matic @@ -11,7 +11,7 @@ SRC_URI="http://jfs.sourceforge.net/project/pub/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" IUSE="static" LIB_DEPEND="sys-apps/util-linux:=[static-libs]" @@ -29,7 +29,9 @@ PATCHES=( "${FILESDIR}"/${P}-check-for-ar.patch #726032 "${FILESDIR}"/${P}-gcc10.patch #707314 "${FILESDIR}"/${P}-format-security-errors.patch #557140 - "${FILESDIR}"/jfsutils-1.1.12-libjfs.patch + "${FILESDIR}"/${P}-musl-fix-includes.patch # 715568 + "${FILESDIR}"/${P}-c23-bool.patch + "${FILESDIR}"/jfsutils-1.1.12-libjfs.patch ) src_prepare() { @@ -39,6 +41,10 @@ src_prepare() { } src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/863905 + filter-lto + # It doesn't compile on alpha without this LDFLAGS use alpha && append-ldflags "-Wl,--no-relax" diff --git a/sys-fs/progsreiserfs/Manifest b/sys-fs/progsreiserfs/Manifest index 2969a3bc..906b6d7f 100644 --- a/sys-fs/progsreiserfs/Manifest +++ b/sys-fs/progsreiserfs/Manifest @@ -1,6 +1,7 @@ AUX progsreiserfs-0.3.0.5-autotools.patch 315 BLAKE2B f8233f5a35c696dccd672287562fe2286b4413dc6e0e6cf65eded5f9e3ed36861298b632e64e284f0f0be9ae156d83dafa73b1a18d83dc63ccfeb76b5a9745b6 SHA512 bbb8f0e4932fd9d67744b86e83e28f18068860256288b8bc7c85ddfbb193265127e38aa3be84a8a04f5d6470271c9c282e76d2b4ac8894d0d1c683b9bed1745b AUX progsreiserfs-0.3.0.5-lib.patch 1382691 BLAKE2B 7ce2b8c58883a8399f9361f72b0ba4b1fed8efe33dd16aa8eaa991ba79ed05e768ebbb104400362e10482bd7f54e1173a5955ab85a154f17b36980f70aa5491b SHA512 6dda4381f8227ce9c8d56788c71fdaa4223f70d92f54a29b0faef48256ea3f24e74b69ab836d08467021a95e2979e01422bcf62bfbebdf11ce3e3c09510f1a3f +AUX progsreiserfs-0.3.0.5-reiserfs3-compat.patch 10969 BLAKE2B 5670f77882a3c8de579bf71aff8961b354658c6e05ebfd651dc1ab969ffa4229892c65fd1c82c88748e0b9b953497193dceea3e8501b4f1fe2ad4898c03160dc SHA512 9c0e07ea54616fda858553ff3a6373e38d8cbd5d83230a6af42c90e324c66ee166077270a9029d274bdd18e389c547261968b7a66d278aef4ccbf262bef81e09 DIST progsreiserfs-0.3.0.5.tar.gz 446099 BLAKE2B 8b13193c6b27ad868db5f898dee4dd25e8fee91f72bb69799c745afe292a89300bef3670b22da02b8941ace04fbcda5e0a5038994cb1091a4334bf3295b60b76 SHA512 e2b94c778796492e66578b3dde8601d8670c11344dca2082eccf648f8bf26a226d07c26333d91357b081c50b09aed4b7f9a5bb1a6c985808c55db02c83e24ce3 -EBUILD progsreiserfs-0.3.0.5.ebuild 1415 BLAKE2B 5158e64a708a8c77aef47f6b4f0931d30a9e8ed23fcee6974f42a8ae9c45750d26fd6fbb9472835a42a5254fc587898438c7399c3dfa8b8baacae41c5329f52e SHA512 b2c1cc690b817b4d8e544a58030bc558c0b863f16e91fdec2e70cf2ce121425165a5aa6651a5282cd1949218dd44658309bec09e0f65ba1ca98d1d8e9dacec1a +EBUILD progsreiserfs-0.3.0.5.ebuild 1836 BLAKE2B 8b2eec2a5fc83e7eead5150e87d07df3a9bd476ef1a28b77b0a3553cfdc5f4bdc20d09f48729fa62db79df1ac13a840339a416650dc6cc2a7c7f8c661f4e2373 SHA512 ad3b9ea5ac6b4dea930efe6e37afc0a85c0d56593dc90c1c25e25e99412627994e338a81a4575ed6da0fbc31ed312d595313dde6bd53008c5be69f60fe3f6835 MISC ChangeLog 477 BLAKE2B 623c47066457afa41202c32e3e14b16be60f0dcc5c1fe20993fc1c6e2e63bf7705643211fb0fde6546073cfead9fabee7d09ac85375b235d2d85d6fe0d3e39bb SHA512 fc6552d165c68c3946ed9c6c6a1a75a5ee2736269404bef555d21a64322452d90244cb7e0282a32d18a5458ca277c3bf683dac212bfe3fa0568702c664d04922 MISC metadata.xml 324 BLAKE2B e0442e30aa6d9ef9fae7ce9c1ce190316f7700d74786a671cc70a6cc5cdb7964ac5c635d4398c6d2df8711f5043c73664e86239677681761a530732624cd4c19 SHA512 4c2759854c282ad20e98a75082fcad6c2262f20d86f40f0189fb9d693f3701667c17440535bb4773e653eda71dfbb29419b5cd7a1e3b037872a787e26dcc1543 diff --git a/sys-fs/progsreiserfs/files/progsreiserfs-0.3.0.5-reiserfs3-compat.patch b/sys-fs/progsreiserfs/files/progsreiserfs-0.3.0.5-reiserfs3-compat.patch new file mode 100644 index 00000000..3b0b4807 --- /dev/null +++ b/sys-fs/progsreiserfs/files/progsreiserfs-0.3.0.5-reiserfs3-compat.patch @@ -0,0 +1,251 @@ +diff -urN progsreiserfs-0.3.0.5/Makefile.am progsreiserfs-0.3.0.5/Makefile.am +--- progsreiserfs-0.3.0.5/Makefile.am 2004-04-18 21:39:54.000000000 +0200 ++++ progsreiserfs-0.3.0.5/Makefile.am 2026-06-29 22:25:11.475495027 +0200 +@@ -1,10 +1,10 @@ +-SUBDIRS = libdal libreiserfs progs demos include doc debug ++SUBDIRS = libdal libreiserfs include + + EXTRA_DIST = ABOUT-NLS AUTHORS BUGS COPYING TODO NEWS THANKS README \ + progsreiserfs.spec.in progsreiserfs.m4 + + aclocaldir = $(datadir)/aclocal +-aclocal_DATA = progsreiserfs.m4 ++aclocal_DATA = + + dist-hook: progsreiserfs.spec + cp progsreiserfs.spec $(distdir) +diff -urN progsreiserfs-0.3.0.5/Makefile.in progsreiserfs-0.3.0.5/Makefile.in +--- progsreiserfs-0.3.0.5/Makefile.in 2026-06-29 22:23:04.314002436 +0200 ++++ progsreiserfs-0.3.0.5/Makefile.in 2026-06-29 22:25:11.475663576 +0200 +@@ -165,14 +165,14 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-SUBDIRS = libdal libreiserfs progs demos include doc debug ++SUBDIRS = libdal libreiserfs include + + EXTRA_DIST = ABOUT-NLS AUTHORS BUGS COPYING TODO NEWS THANKS README \ + progsreiserfs.spec.in progsreiserfs.m4 + + + aclocaldir = $(datadir)/aclocal +-aclocal_DATA = progsreiserfs.m4 ++aclocal_DATA = + subdir = . + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -563,7 +563,7 @@ + + info-am: + +-install-data-am: install-aclocalDATA ++install-data-am: + + install-exec-am: + +diff -urN progsreiserfs-0.3.0.5/include/Makefile.am progsreiserfs-0.3.0.5/include/Makefile.am +--- progsreiserfs-0.3.0.5/include/Makefile.am 2004-04-18 22:30:22.000000000 +0200 ++++ progsreiserfs-0.3.0.5/include/Makefile.am 2026-06-29 22:25:11.479720154 +0200 +@@ -1 +1 @@ +-SUBDIRS = dal reiserfs progs ++SUBDIRS = dal reiserfs +diff -urN progsreiserfs-0.3.0.5/include/Makefile.in progsreiserfs-0.3.0.5/include/Makefile.in +--- progsreiserfs-0.3.0.5/include/Makefile.in 2026-06-29 22:23:04.314002436 +0200 ++++ progsreiserfs-0.3.0.5/include/Makefile.in 2026-06-29 22:25:11.479843435 +0200 +@@ -165,7 +165,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-SUBDIRS = dal reiserfs progs ++SUBDIRS = dal reiserfs + subdir = include + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +diff -urN progsreiserfs-0.3.0.5/include/dal/Makefile.am progsreiserfs-0.3.0.5/include/dal/Makefile.am +--- progsreiserfs-0.3.0.5/include/dal/Makefile.am 2002-04-15 10:55:02.000000000 +0200 ++++ progsreiserfs-0.3.0.5/include/dal/Makefile.am 2026-06-29 22:25:11.483408092 +0200 +@@ -1,2 +1,2 @@ +-dalincludedir = $(includedir)/dal ++dalincludedir = $(includedir)/reiserfs3/dal + dalinclude_HEADERS = dal.h file_dal.h +diff -urN progsreiserfs-0.3.0.5/include/dal/Makefile.in progsreiserfs-0.3.0.5/include/dal/Makefile.in +--- progsreiserfs-0.3.0.5/include/dal/Makefile.in 2026-06-29 22:23:04.314002436 +0200 ++++ progsreiserfs-0.3.0.5/include/dal/Makefile.in 2026-06-29 22:25:11.483547435 +0200 +@@ -165,7 +165,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-dalincludedir = $(includedir)/dal ++dalincludedir = $(includedir)/reiserfs3/dal + dalinclude_HEADERS = dal.h file_dal.h + subdir = include/dal + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +diff -urN progsreiserfs-0.3.0.5/include/reiserfs/Makefile.am progsreiserfs-0.3.0.5/include/reiserfs/Makefile.am +--- progsreiserfs-0.3.0.5/include/reiserfs/Makefile.am 2004-04-18 22:30:09.000000000 +0200 ++++ progsreiserfs-0.3.0.5/include/reiserfs/Makefile.am 2026-06-29 22:25:11.486977558 +0200 +@@ -1,4 +1,4 @@ +-reiserfsincludedir = $(includedir)/reiserfs ++reiserfsincludedir = $(includedir)/reiserfs3 + reiserfsinclude_HEADERS = bitmap.h filesystem.h journal.h tools.h \ + block.h hashes.h key.h reiserfs.h \ + exception.h gauge.h endian.h tree.h \ +diff -urN progsreiserfs-0.3.0.5/include/reiserfs/Makefile.in progsreiserfs-0.3.0.5/include/reiserfs/Makefile.in +--- progsreiserfs-0.3.0.5/include/reiserfs/Makefile.in 2026-06-29 22:23:04.314002436 +0200 ++++ progsreiserfs-0.3.0.5/include/reiserfs/Makefile.in 2026-06-29 22:25:11.487085752 +0200 +@@ -165,7 +165,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-reiserfsincludedir = $(includedir)/reiserfs ++reiserfsincludedir = $(includedir)/reiserfs3 + reiserfsinclude_HEADERS = bitmap.h filesystem.h journal.h tools.h \ + block.h hashes.h key.h reiserfs.h \ + exception.h gauge.h endian.h tree.h \ +diff -urN progsreiserfs-0.3.0.5/libdal/Makefile.am progsreiserfs-0.3.0.5/libdal/Makefile.am +--- progsreiserfs-0.3.0.5/libdal/Makefile.am 2002-04-15 10:55:11.000000000 +0200 ++++ progsreiserfs-0.3.0.5/libdal/Makefile.am 2026-06-29 22:25:11.490481448 +0200 +@@ -1,9 +1,9 @@ + LIBS = @INTLLIBS@ @LIBS@ + + includedir = -I$(top_srcdir)/include +-lib_LTLIBRARIES = libdal.la +-libdal_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) ++lib_LTLIBRARIES = libdal3.la ++libdal3_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + +-libdal_la_SOURCES = dal.c file_dal.c ++libdal3_la_SOURCES = dal.c file_dal.c + + INCLUDES = $(includedir) @INTLINCS@ +diff -urN progsreiserfs-0.3.0.5/libdal/Makefile.in progsreiserfs-0.3.0.5/libdal/Makefile.in +--- progsreiserfs-0.3.0.5/libdal/Makefile.in 2026-06-29 22:23:04.314002436 +0200 ++++ progsreiserfs-0.3.0.5/libdal/Makefile.in 2026-06-29 22:25:11.490601306 +0200 +@@ -166,10 +166,10 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-lib_LTLIBRARIES = libdal.la +-libdal_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) ++lib_LTLIBRARIES = libdal3.la ++libdal3_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + +-libdal_la_SOURCES = dal.c file_dal.c ++libdal3_la_SOURCES = dal.c file_dal.c + + INCLUDES = $(includedir) @INTLINCS@ + subdir = libdal +@@ -179,9 +179,9 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(lib_LTLIBRARIES) + +-libdal_la_LIBADD = +-am_libdal_la_OBJECTS = dal.lo file_dal.lo +-libdal_la_OBJECTS = $(am_libdal_la_OBJECTS) ++libdal3_la_LIBADD = ++am_libdal3_la_OBJECTS = dal.lo file_dal.lo ++libdal3_la_OBJECTS = $(am_libdal3_la_OBJECTS) + + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp +@@ -194,9 +194,9 @@ + CCLD = $(CC) + LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(libdal_la_SOURCES) ++DIST_SOURCES = $(libdal3_la_SOURCES) + DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +-SOURCES = $(libdal_la_SOURCES) ++SOURCES = $(libdal3_la_SOURCES) + + all: all-am + +@@ -235,8 +235,8 @@ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +-libdal.la: $(libdal_la_OBJECTS) $(libdal_la_DEPENDENCIES) +- $(LINK) -rpath $(libdir) $(libdal_la_LDFLAGS) $(libdal_la_OBJECTS) $(libdal_la_LIBADD) $(LIBS) ++libdal3.la: $(libdal3_la_OBJECTS) $(libdal3_la_DEPENDENCIES) ++ $(LINK) -rpath $(libdir) $(libdal3_la_LDFLAGS) $(libdal3_la_OBJECTS) $(libdal3_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) core *.core +diff -urN progsreiserfs-0.3.0.5/libreiserfs/Makefile.am progsreiserfs-0.3.0.5/libreiserfs/Makefile.am +--- progsreiserfs-0.3.0.5/libreiserfs/Makefile.am 2002-05-03 16:57:30.000000000 +0200 ++++ progsreiserfs-0.3.0.5/libreiserfs/Makefile.am 2026-06-29 22:25:11.494221801 +0200 +@@ -1,12 +1,12 @@ + LIBS = @INTLLIBS@ @LIBS@ + + includedir = -I$(top_srcdir)/include +-lib_LTLIBRARIES = libreiserfs.la +-libreiserfs_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) ++lib_LTLIBRARIES = libreiserfs3.la ++libreiserfs3_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + +-libreiserfs_la_LIBADD = $(top_builddir)/libdal/libdal.la ++libreiserfs3_la_LIBADD = $(top_builddir)/libdal/libdal3.la + +-libreiserfs_la_SOURCES = libreiserfs.c debug.c gauge.c exception.c \ ++libreiserfs3_la_SOURCES = libreiserfs.c debug.c gauge.c exception.c \ + core.c bitmap.c block.c tools.c journal.c \ + hashes.c key.c tree.c object.c geom.c path.c \ + dir.c file.c strsep.c +diff -urN progsreiserfs-0.3.0.5/libreiserfs/Makefile.in progsreiserfs-0.3.0.5/libreiserfs/Makefile.in +--- progsreiserfs-0.3.0.5/libreiserfs/Makefile.in 2026-06-29 22:23:04.314002436 +0200 ++++ progsreiserfs-0.3.0.5/libreiserfs/Makefile.in 2026-06-29 22:25:11.494340392 +0200 +@@ -166,12 +166,12 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-lib_LTLIBRARIES = libreiserfs.la +-libreiserfs_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -L$(top_builddir)/libdal/.libs ++lib_LTLIBRARIES = libreiserfs3.la ++libreiserfs3_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -L$(top_builddir)/libdal/.libs + +-libreiserfs_la_LIBADD = $(top_builddir)/libdal/libdal.la ++libreiserfs3_la_LIBADD = $(top_builddir)/libdal/libdal3.la + +-libreiserfs_la_SOURCES = libreiserfs.c debug.c gauge.c exception.c \ ++libreiserfs3_la_SOURCES = libreiserfs.c debug.c gauge.c exception.c \ + core.c bitmap.c block.c tools.c journal.c \ + hashes.c key.c tree.c object.c geom.c path.c \ + dir.c file.c strsep.c +@@ -185,12 +185,12 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(lib_LTLIBRARIES) + +-libreiserfs_la_DEPENDENCIES = $(top_builddir)/libdal/libdal.la +-am_libreiserfs_la_OBJECTS = libreiserfs.lo debug.lo gauge.lo \ ++libreiserfs3_la_DEPENDENCIES = $(top_builddir)/libdal/libdal3.la ++am_libreiserfs3_la_OBJECTS = libreiserfs.lo debug.lo gauge.lo \ + exception.lo core.lo bitmap.lo block.lo tools.lo journal.lo \ + hashes.lo key.lo tree.lo object.lo geom.lo path.lo dir.lo \ + file.lo strsep.lo +-libreiserfs_la_OBJECTS = $(am_libreiserfs_la_OBJECTS) ++libreiserfs3_la_OBJECTS = $(am_libreiserfs3_la_OBJECTS) + + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp +@@ -211,9 +211,9 @@ + CCLD = $(CC) + LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(libreiserfs_la_SOURCES) ++DIST_SOURCES = $(libreiserfs3_la_SOURCES) + DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +-SOURCES = $(libreiserfs_la_SOURCES) ++SOURCES = $(libreiserfs3_la_SOURCES) + + all: all-am + +@@ -252,8 +252,8 @@ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +-libreiserfs.la: $(libreiserfs_la_OBJECTS) $(libreiserfs_la_DEPENDENCIES) +- $(LINK) -rpath $(libdir) $(libreiserfs_la_LDFLAGS) $(libreiserfs_la_OBJECTS) $(libreiserfs_la_LIBADD) $(LIBS) ++libreiserfs3.la: $(libreiserfs3_la_OBJECTS) $(libreiserfs3_la_DEPENDENCIES) ++ $(LINK) -rpath $(libdir) $(libreiserfs3_la_LDFLAGS) $(libreiserfs3_la_OBJECTS) $(libreiserfs3_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) core *.core diff --git a/sys-fs/progsreiserfs/progsreiserfs-0.3.0.5.ebuild b/sys-fs/progsreiserfs/progsreiserfs-0.3.0.5.ebuild index a77cb8fa..3e0410df 100644 --- a/sys-fs/progsreiserfs/progsreiserfs-0.3.0.5.ebuild +++ b/sys-fs/progsreiserfs/progsreiserfs-0.3.0.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ SRC_URI="http://reiserfs.linux.kiev.ua/snapshots/${MY_P}.tar.gz S="${WORKDIR}"/${MY_P} LICENSE="GPL-2" -SLOT="0" +SLOT="0.3/0.3" KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86" IUSE="debug examples nls static-libs" @@ -25,16 +25,21 @@ DEPEND=" virtual/libintl ) " +BDEPEND="sys-devel/gettext" PATCHES=( "${FILESDIR}"/${P}-lib.patch "${FILESDIR}"/${P}-autotools.patch + "${FILESDIR}"/${P}-reiserfs3-compat.patch ) src_prepare() { default elibtoolize + cp "${EPREFIX}"/usr/share/gettext/config.rpath . || die + find . \( -name Makefile.in -o -name aclocal.m4 -o -name configure -o -name config.h.in \) \ + -exec touch {} + || die } src_configure() { @@ -45,6 +50,13 @@ src_configure() { --disable-Werror \ $(use_enable nls) \ $(use_enable debug) + + find . -name Makefile -exec sed -i \ + -e 's|^ACLOCAL =.*|ACLOCAL = :|' \ + -e 's|^AUTOCONF =.*|AUTOCONF = :|' \ + -e 's|^AUTOHEADER =.*|AUTOHEADER = :|' \ + -e 's|^AUTOMAKE =.*|AUTOMAKE = :|' \ + {} + || die } src_install() { @@ -56,8 +68,6 @@ src_install() { fi find "${ED}" -name '*.la' -delete || die - - rm -r "${ED}"/usr/{sbin,share/man} || die } pkg_postinst() {