Slot filesystem compat libraries for partclone

This commit is contained in:
Mario Fetka
2026-06-29 23:19:57 +02:00
parent 1ce3489c84
commit c8d8ff64bb
10 changed files with 388 additions and 13 deletions

View File

@@ -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

View File

@@ -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 <ext2fs/ext2fs.h>
#elif REISERFS
- #include <reiserfs/reiserfs.h>
+ #include <reiserfs3/reiserfs.h>
#elif REISER4
#include <reiser4/libreiser4.h>
#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 <unistd.h>
#include <sys/types.h>
#include <linux/types.h>
-#include <reiserfs/reiserfs.h>
+#include <reiserfs3/reiserfs.h>
#include <dal/file_dal.h>
#include "partclone.h"
#include "reiserfsclone.h"

View File

@@ -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? ( <sys-fs/progsreiserfs-0.3.1 )
reiserfs? ( ~sys-fs/progsreiserfs-0.3.0.5:0.3 )
xxhash? ( dev-libs/xxhash:= )
xfs? ( sys-fs/xfsprogs )
"
@@ -40,6 +40,10 @@ BDEPEND="
virtual/pkgconfig
"
PATCHES=(
"${FILESDIR}"/${P}-reiserfs3-compat.patch
)
src_prepare() {
default
@@ -51,6 +55,10 @@ src_prepare() {
}
src_configure() {
if use reiserfs; then
append-cppflags -I"${EPREFIX}"/usr/include/reiserfs3
fi
local myeconfargs=(
--enable-extfs
--enable-ncursesw

View File

@@ -1,10 +1,12 @@
AUX jfsutils-1.1.12-libjfs.patch 2776 BLAKE2B 34d5422f2cafe9c396f0dfcdbe008289933412ed1642ec5eb3fb2b1e2746b8374997ef46dcaa722c686f854e67b6fad4cc0d327cb7e54c9dd83ddb8a85634145 SHA512 0377319e16f8ed4100abfb69dfba152114cb92640d53f5f8e985fbb048a5fee36c6f69575af8f1f32eb8e859da2a7337f0db5b0f3af11073c3889c67178049cd
AUX jfsutils-1.1.15-c23-bool.patch 358 BLAKE2B 9c0de8e1589a3041613bd39cc9fb313bcc1bc09938615ffac892f40b5ba5caec21c417f50c92d4cead72fe2d500d3f4c91106ed37725cd9ebf0bcadef0f4fcdb SHA512 e809895b94dcdb6a915ef74880a4986299dbca4aa5dfc786899fd516a693e0f18a728607440630c5de540c91a1d4c81d05d564f760934c685659eb93111560ef
AUX jfsutils-1.1.15-check-for-ar.patch 207 BLAKE2B 52f709e4ddf5899245fe3cb2485124672ae7549f2fa9d39e5dc8eef1a5e5fe8f8accfddaab96b0502b19c3dc4119cb76602fff384c3a03604c7330098d52e3f3 SHA512 2596252cccc0c5cc3f570949c26d6b7dad0889e9afa0713276daf996141a184e1ac9f36e4875f5f95096d01628ba87989b7a1a0ccdaa333c8a38bf36100f0f90
AUX jfsutils-1.1.15-format-security-errors.patch 1057 BLAKE2B c5283e945fe5db2fdc87f35c21adb5d7135f04a80e3dd8f4a9ea29ce44a58ec718e7aa8334bcda0c42a5ae764242442fc41fa91aba004904e0cf7804a1851122 SHA512 10e0baed287338826e3ba5c73aa4f16e55892390e252d2874de9e39b5bcb63ff18cc6019af36de64bece5dd2c6c04566bb8a3a5bd6d2656da9b9f116dcce02d2
AUX jfsutils-1.1.15-gcc10.patch 2015 BLAKE2B 58accef19b804367f6801724a443e9eefd3bd18f74653486ea178b4d97c358c894f4eeb87380408f5e12c998d9462520cb124a63c38c3c4880155a634a8f00bb SHA512 e1804d55afd57a758247902e0e31f93406712e9ce42541b88e7c1126b949eb46ca44f47f191f032225cd57b01736296bfbb72034ad49fc18d5ad6e57050fd0f2
AUX jfsutils-1.1.15-linux-headers.patch 318 BLAKE2B c04fc414526ed854ed9fd0ac6cd8c1874c924e4446ade2ec85eec2ccbdd8a9c6f580fe6b4b91e61050a468855c46082f2373de08246640362ab81b8e74199cad SHA512 1fd097f403e0ffd434b433fcbf20664166b7ed9b9878f81719d45747fc96249ebac25f8afc9f1f6e532bfac90fe98f1474bb616da3c83fd69cc57d2fe3c11815
AUX jfsutils-1.1.15-musl-fix-includes.patch 542 BLAKE2B 3d9a7e88611685a8000d2a2395edcbf0671a10e1e49e826b1f87e919161eab30889f3236cf6d0b68c070fb2c26e4ad4fe9742f82bf4429ee226d42dc28f532c1 SHA512 3e1e0f83059f685b087b5d2d2a4b2c190d02b675bc826f3aee25a4a158e75544a27383251f5b2634d1d8f67fe70c5c9e4aa9c192b7a9bf01df1370d7ec64d0f1
AUX jfsutils-1.1.15-sysmacros.patch 276 BLAKE2B 5c45f4bfc1a03843f59d715bf1c837f33a455e74508b82360c7f77ecd19205e23bc53f445e1bb8c03ca5e88d210685e0dc0ac28f8dfa3eb0b88c4347888e94fd SHA512 3f6472cdfc706e32cc2cefdf673450cb98e81c24c16dea47cacd95f83d75461c8750a9f4dc73ac30782d91e2b7814efdc7e736ef30bffb6cc8ceaf6dba8d51d5
DIST jfsutils-1.1.15.tar.gz 539148 BLAKE2B 8fe3b4b157482311e7afd938b0d7d22af62a4d342c5d0e6527fc04a90ecc3a5b80de226a4faec582b17bb5a5f10371ab8e0f87e72dc5e1211a0b79180cc5a952 SHA512 fa8ba7f4997471da3e6ea7239564f3395046222cfbb2b10e37b24ad0bd107b7eadbb51ce328d89d193034360b4035ca5e0e5b0b416a74483d7a2c0a2b9c65858
EBUILD jfsutils-1.1.15-r1.ebuild 1270 BLAKE2B d7cabaea99765e34705da25dfa0aa0311e2a08d8070df2a4f66117efc26ef801f95833b20ceaf9f8a278c5ae1d16403ba5226e38415bf1c68cda94d27debf039 SHA512 62642dfc24e28cb5d81df2fc8ec4269427925c03cd67530ce9b510768cd5baa889339894eb8eabf2b0d4c00f6f06b36fc9c398e128205cc03f33fb072aec9182
EBUILD jfsutils-1.1.15-r2.ebuild 1435 BLAKE2B bea37bd1729bc9343bcd53ecfd446c6e823a6adb2e1f784c5fb69d1714dbcfd8c76ca3257dc3f8568829cd8693563beb54665c21bf92a7ea2bd73eb3e105409b SHA512 68c0fc124cbe11eedc45b656fa15af9f69b3d7830b118c4b37571dbd716a525605f0ca25f50db35a9fd8d0ae7a61203f2c13f482d92e3eae7c0bdd333628b319
MISC ChangeLog 12020 BLAKE2B bbd821c52cff6d99a2a7114f55a4adcc2a5ed18b9b670b3668eee710a10004853197f97a2f790380f53f912da79b87746c5dff829f58d355a3b3ada94546c8ec SHA512 f13f78c64d91bf4cc545a5f2f02d3daa2031af78740c1b2c91a964cf46447298d30e02b936f7a461ed59095286b81f1db7d97772432fab77cde0409e91ade3b4
MISC metadata.xml 684 BLAKE2B 71d427e0a1162565c4f80686a6aa79773ca773159b457e1301d294f0c6ab0ee45d540df797c0ce98309d21a444f488a0d94353a8a66881801ab108799ab0c42c SHA512 bb82a7efa250c1c2d328b54b8bd0548a6ecad5e3e448dba9bdc3a22ebd10e34578417cb1acf3909feddcc445bb3bf73d14b6af2fec7648aae4f6edf23e485543

View File

@@ -0,0 +1,14 @@
--- a/include/jfs_types.h
+++ b/include/jfs_types.h
@@ -41,11 +41,12 @@ typedef u_int64_t uint64_t;
-#ifdef HAVE_STDBOOL_H
+#if defined(__cplusplus)
+#elif defined(HAVE_STDBOOL_H) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
# include <stdbool.h>
#else
typedef enum {
false = 0,
true = 1
} bool;
-#endif /* HAVE_STDBOOL_H */
+#endif

View File

@@ -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 <timo.teras@iki.fi>
--- a/libfs/fssubs.c
+++ b/libfs/fssubs.c
@@ -24,6 +24,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <paths.h>
#if HAVE_MNTENT_H
#include <mntent.h>
@@ -31,7 +32,6 @@
#endif
#if HAVE_GETMNTINFO
-#include <paths.h>
#include <sys/param.h>
#include <sys/mount.h>
#endif

View File

@@ -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"

View File

@@ -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

View File

@@ -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

View File

@@ -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() {