diff options
Diffstat (limited to 'app-arch')
-rw-r--r-- | app-arch/alien/alien-8.95.6.ebuild | 4 | ||||
-rw-r--r-- | app-arch/dpkg/dpkg-1.21.15-r3.ebuild | 2 | ||||
-rw-r--r-- | app-arch/engrampa/Manifest | 1 | ||||
-rw-r--r-- | app-arch/engrampa/engrampa-1.28.2.ebuild | 67 | ||||
-rw-r--r-- | app-arch/libpar2/libpar2-0.4-r1.ebuild | 2 | ||||
-rw-r--r-- | app-arch/libpar2/libpar2-0.4.ebuild | 37 | ||||
-rw-r--r-- | app-arch/par2cmdline/par2cmdline-0.8.1-r2.ebuild | 4 | ||||
-rw-r--r-- | app-arch/patool/Manifest | 2 | ||||
-rw-r--r-- | app-arch/patool/patool-3.0.3.ebuild (renamed from app-arch/patool/patool-2.3.0.ebuild) | 2 | ||||
-rw-r--r-- | app-arch/rpm/Manifest | 2 | ||||
-rw-r--r-- | app-arch/rpm/files/rpm-4.17.0-libdir.patch | 32 | ||||
-rw-r--r-- | app-arch/rpm/files/rpm-4.18.1-musl-nls.patch | 42 | ||||
-rw-r--r-- | app-arch/rpm/files/rpm-4.20.0-libdir.patch | 11 | ||||
-rw-r--r-- | app-arch/rpm/files/rpm-4.8.1-clang.patch | 52 | ||||
-rw-r--r-- | app-arch/rpm/files/rpm-4.8.1-db-path.patch | 26 | ||||
-rw-r--r-- | app-arch/rpm/rpm-4.18.1.ebuild | 172 | ||||
-rw-r--r-- | app-arch/rpm/rpm-4.20.0.ebuild | 145 | ||||
-rw-r--r-- | app-arch/sharutils/sharutils-4.15.2-r2.ebuild | 5 | ||||
-rw-r--r-- | app-arch/zip/zip-3.0-r7.ebuild | 2 |
19 files changed, 239 insertions, 371 deletions
diff --git a/app-arch/alien/alien-8.95.6.ebuild b/app-arch/alien/alien-8.95.6.ebuild index f2d6dfad91e1..8e7217a9c5f8 100644 --- a/app-arch/alien/alien-8.95.6.ebuild +++ b/app-arch/alien/alien-8.95.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.tar.xz -> ${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~alpha ~amd64 ~hppa ppc ppc64 ~riscv x86" IUSE="+bzip2" RDEPEND=" diff --git a/app-arch/dpkg/dpkg-1.21.15-r3.ebuild b/app-arch/dpkg/dpkg-1.21.15-r3.ebuild index d958c69f9c91..0f0a44ce7d17 100644 --- a/app-arch/dpkg/dpkg-1.21.15-r3.ebuild +++ b/app-arch/dpkg/dpkg-1.21.15-r3.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="+bzip2 +lzma nls selinux static-libs test +update-alternatives +zlib" RESTRICT="!test? ( test )" diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest index 6b6541ec5e82..1d9c4e869e2e 100644 --- a/app-arch/engrampa/Manifest +++ b/app-arch/engrampa/Manifest @@ -1 +1,2 @@ DIST engrampa-1.28.1.tar.xz 1720164 BLAKE2B a2776cbf7040bcb7baf992caa323afaabffe316ad94a222613cc8bc8c59490f389005ecdec66de519c88f2ad89167739b3934c2bed6c212846b20f6b4b60a6ae SHA512 912bec0e1b2bf8f79e89bda4cb72e28a96d4d1b2ab32fca14b3d28bf75be93cdd4a9e43315fe6ad2c8cac5af95686915cfa3d0a3182973a8b6e42817cfdd936f +DIST engrampa-1.28.2.tar.xz 1729320 BLAKE2B 4210b78b4c7e01d4fd42ec1574cce6fa0c173abb8ecd8e741dd487003c4aba7225af86d80d2ef410051e2e1704c8be0bca4fd41e73241832b8c6535af24f2d13 SHA512 063eebc98f777787c445a544d572a149e5ed67d5e0dfde5b9b3a093ff3cd19507cd5d353a7694c843574fefe6313f8725efe588d32c632fc0596449bb18f39dc diff --git a/app-arch/engrampa/engrampa-1.28.2.ebuild b/app-arch/engrampa/engrampa-1.28.2.ebuild new file mode 100644 index 000000000000..f0fa99ba4f21 --- /dev/null +++ b/app-arch/engrampa/engrampa-1.28.2.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MINOR=$(($(ver_cut 2) % 2)) +if [[ ${MINOR} -eq 0 ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" +fi + +inherit mate optfeature + +DESCRIPTION="Engrampa archive manager for MATE" +HOMEPAGE="https://mate-desktop.org/ https://github.com/mate-desktop/engrampa" + +LICENSE="FDL-1.1+ GPL-2+ LGPL-2+" +SLOT="0" +IUSE="caja magic" + +DEPEND=" + >=dev-libs/glib-2.50:2 + >=dev-libs/json-glib-0.14 + virtual/libintl + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-3.22:3[X] + x11-libs/libSM + x11-libs/pango + caja? ( >=mate-base/caja-1.17.1 ) + magic? ( >=sys-apps/file-5.38 ) +" +RDEPEND=" + ${DEPEND} + virtual/libintl +" +BDEPEND=" + app-text/yelp-tools + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +src_configure() { + mate_src_configure \ + --disable-run-in-place \ + $(use_enable caja caja-actions) \ + $(use_enable magic) \ + --disable-packagekit +} + +pkg_postinst() { + mate_pkg_postinst + + optfeature "Support for 7-zip" app-arch/p7zip + optfeature "Support for ace" app-arch/unace + optfeature "Support for arj" app-arch/arj + optfeature "Support for cpio" app-alternatives/cpio + optfeature "Support for deb" app-arch/dpkg + optfeature "Support for iso" app-cdr/cdrtools + optfeature "Support for jar,zip" app-arch/zip app-arch/unzip + optfeature "Support for lha" app-arch/lha + optfeature "Support for lzma" app-arch/xz-utils + optfeature "Support for lzop" app-arch/lzop + optfeature "Support for rar" app-arch/unrar + optfeature "Support for rpm" app-arch/rpm + optfeature "Support for unstuff" app-arch/stuffit + optfeature "Support for zoo" app-arch/zoo +} diff --git a/app-arch/libpar2/libpar2-0.4-r1.ebuild b/app-arch/libpar2/libpar2-0.4-r1.ebuild index a9f492e7e61a..21fbc06a9051 100644 --- a/app-arch/libpar2/libpar2-0.4-r1.ebuild +++ b/app-arch/libpar2/libpar2-0.4-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" RDEPEND="dev-libs/libsigc++:2" DEPEND="${RDEPEND}" diff --git a/app-arch/libpar2/libpar2-0.4.ebuild b/app-arch/libpar2/libpar2-0.4.ebuild deleted file mode 100644 index 2aa9e048718c..000000000000 --- a/app-arch/libpar2/libpar2-0.4.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit libtool - -DESCRIPTION="A library for par2, extracted from par2cmdline" -HOMEPAGE="https://launchpad.net/libpar2/" -SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" - -RDEPEND="dev-libs/libsigc++:2" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default - elibtoolize - - # broken distfile, see https://bugs.gentoo.org/939532 - touch config.h.in || die -} - -src_configure() { - econf --disable-static -} - -src_install() { - default - - # no static archives - find "${ED}" -name '*.la' -delete || die -} diff --git a/app-arch/par2cmdline/par2cmdline-0.8.1-r2.ebuild b/app-arch/par2cmdline/par2cmdline-0.8.1-r2.ebuild index e026448f3a80..298d780ee852 100644 --- a/app-arch/par2cmdline/par2cmdline-0.8.1-r2.ebuild +++ b/app-arch/par2cmdline/par2cmdline-0.8.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/Parchive/${PN}/releases/download/v${PV}/${P}.tar.bz2 LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~amd64 ~arm ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="openmp" PATCHES=( "${FILESDIR}"/${P}-big-endian.patch ) diff --git a/app-arch/patool/Manifest b/app-arch/patool/Manifest index 881fdd5c03d2..1385f5e8b188 100644 --- a/app-arch/patool/Manifest +++ b/app-arch/patool/Manifest @@ -1,2 +1,2 @@ -DIST patool-2.3.0.tar.gz 1996107 BLAKE2B 8fdb13eee3f60f136a93fad538d9f45b94a7aabe243e33fcd37da27d973a74dd8df8ac7f3daae8d0e8d70da4abb30889c9ea5d60f0de2953d539c316b1107b53 SHA512 0d6cad4b449706f2f5c012a40adf0dda3cbb654c4a7444cff31a755bb3bed8a5221fa4467879d97244922cbdc9789a7a0923d020bfb2e46bdd1345a9fb2f14c3 DIST patool-2.4.0.tar.gz 1996705 BLAKE2B b84fd4c469741de76ceeee90974cec71ba5bc123d31f6a1dd60cf3c336dcfd7da1def7fec2bbec27ce181d97c5dff96f15c1d4714b722718a1439749f7cee077 SHA512 bf6d680613fb996b3c0b12075a85acec1edd468b8cb58cafd233b31847a2b9c490d21c6d906e737218ca68f08d1cdce4a18a3e57e353a970be58da4e2ff0d794 +DIST patool-3.0.3.tar.gz 2003565 BLAKE2B 988b918f52c5f050c78fdd16351d95c2c23351e8e5e92c884e3ab32f9d0cfc33140db96ce309bb3e465c1a51fbade0c530cbfef3f222dcf89f26d4d35d67bf88 SHA512 c81d13f0183432ba4f3b98951b4f5716a95396eec063b09435c0e3cdf88734107e8a8b647ff6ffe84ea808cc12882b823f95b4edf871874913ca127597fe7348 diff --git a/app-arch/patool/patool-2.3.0.ebuild b/app-arch/patool/patool-3.0.3.ebuild index 4b7faf77c031..9fcc78d0b714 100644 --- a/app-arch/patool/patool-2.3.0.ebuild +++ b/app-arch/patool/patool-3.0.3.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://wummel.github.io/patool/" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" BDEPEND=" test? ( diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest index 1598162f1521..0cef50dbf2f4 100644 --- a/app-arch/rpm/Manifest +++ b/app-arch/rpm/Manifest @@ -1,2 +1,2 @@ -DIST rpm-4.18.1.tar.bz2 6396363 BLAKE2B 4bc582bdc34a89d83346a8e18133c4f1846f2e8741c85ae2d0fd3398166e5a5d81ed86869e34700d3ea414fbf8ccf6c918692e865b956b1e6b70830b64cd323e SHA512 0ede2138b9b4c3b50d7e914cf82655507fcc207ba67804c749ea17560002976cb26b95801e9138a51589b60459494a991213a1131dbef5af2eca9b5050a4f29c DIST rpm-4.19.1.1.tar.bz2 5849649 BLAKE2B 66ed845007f3767fd92e2384962927b93cef7b825b8ea60f81f0a4b51b9d6a09d1cbec1668226fa85de675347d52635cb25c4d11204ada0eed6c898425b21536 SHA512 3364c453c29903c144a3680ceca7a17426eb085c288b6313fb7e857a42a5e0a965f623882e0f58e633f8b8770e839d9df9f7653d99c73759af5c89d0a981908d +DIST rpm-4.20.0.tar.bz2 5984513 BLAKE2B c809e933cf7eb9ab63fa7693e634f7fcf744f94130199f674c5e76e77ead4de25b583daefdf651bbf0475012d262d1bdca605f19a520e160e90e3deb68c74f18 SHA512 b340c66cfda3abed38e81f91c4a789f2c6c0d3ce408de71d861fef27e180b607ae698e046b6925c7781a7177cde9df4075943714ed2aad7c62645eca348f5544 diff --git a/app-arch/rpm/files/rpm-4.17.0-libdir.patch b/app-arch/rpm/files/rpm-4.17.0-libdir.patch deleted file mode 100644 index 5bff26b71290..000000000000 --- a/app-arch/rpm/files/rpm-4.17.0-libdir.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -865,13 +865,7 @@ AC_ARG_WITH([rundir], - AC_DEFINE_UNQUOTED([RUNDIR],["${RUNDIR}"],[run-time variable directory]) - AC_SUBST(RUNDIR) - --if test X"$prefix" = XNONE ; then -- usrprefix="$ac_default_prefix" --else -- usrprefix=$prefix --fi -- --RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`" -+RPMCONFIGDIR="`echo ${libexecdir}/rpm/`" - AC_SUBST(RPMCONFIGDIR) - - AC_SUBST(OBJDUMP) ---- a/rpm.am -+++ b/rpm.am -@@ -1,10 +1,10 @@ - # Internal binaries - ## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm --rpmlibexecdir = $(prefix)/lib/rpm -+rpmlibexecdir = $(pkglibexecdir) - - # Host independent config files - ## HACK: it probably should be $(datadir)/rpm --rpmconfigdir = $(prefix)/lib/rpm -+rpmconfigdir = $(pkglibexecdir) - - # Libtool version (current-revision-age) for all our libraries - rpm_version_info = 11:0:2 diff --git a/app-arch/rpm/files/rpm-4.18.1-musl-nls.patch b/app-arch/rpm/files/rpm-4.18.1-musl-nls.patch deleted file mode 100644 index 7d1fde28bacf..000000000000 --- a/app-arch/rpm/files/rpm-4.18.1-musl-nls.patch +++ /dev/null @@ -1,42 +0,0 @@ -https://bugs.gentoo.org/888954 -https://github.com/rpm-software-management/rpm/commit/f401979a4c4829d68e9614860644bdb74b6dda66 - -From da222f0d82721d17e57d491d2749a4bc44754b9d Mon Sep 17 00:00:00 2001 -From: Takuya Wakazono <pastalian46@gmail.com> -Date: Thu, 18 Jan 2024 18:41:11 +0900 -Subject: [PATCH] Don't use _nl_msg_cat_cntr if __GLIC__ is not defined - -musl doesn't need to use libintl from GNU gettext because it has its -own NLS implementation. Assuming _nl_msg_cat_cntr exists breaks the -build against the musl system. ---- a/lib/tagexts.c -+++ b/lib/tagexts.c -@@ -532,7 +532,7 @@ static int filerequireTag(Header h, rpmtd td, headerGetFlags hgflags) - - /* I18N look aside diversions */ - --#if defined(ENABLE_NLS) -+#if defined(ENABLE_NLS) && (defined(__GLIBC__) || !defined(__linux__)) - extern int _nl_msg_cat_cntr; /* XXX GNU gettext voodoo */ - #endif - static const char * const language = "LANGUAGE"; -@@ -569,7 +569,9 @@ static int i18nTag(Header h, rpmTag tag, rpmtd td, headerGetFlags hgflags) - /* change to en_US for msgkey -> msgid resolution */ - langval = getenv(language); - (void) setenv(language, "en_US", 1); -+#if defined(__GLIBC__) || !defined(__linux__) - ++_nl_msg_cat_cntr; -+#endif - - msgid = NULL; - for (domain = dstring; domain != NULL; domain = de) { -@@ -584,7 +586,9 @@ static int i18nTag(Header h, rpmTag tag, rpmtd td, headerGetFlags hgflags) - (void) setenv(language, langval, 1); - else - unsetenv(language); -+#if defined(__GLIBC__) || !defined(__linux__) - ++_nl_msg_cat_cntr; -+#endif - - if (domain && msgid) { - td->data = dgettext(domain, msgid); diff --git a/app-arch/rpm/files/rpm-4.20.0-libdir.patch b/app-arch/rpm/files/rpm-4.20.0-libdir.patch new file mode 100644 index 000000000000..cc482015f5a4 --- /dev/null +++ b/app-arch/rpm/files/rpm-4.20.0-libdir.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,7 +41,7 @@ + option(WITH_LIBLZMA "Build with liblzma support" ON) + option(WITH_DOXYGEN "Build API docs with doxygen" OFF) + +-set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/lib/rpm" CACHE PATH "rpm home") ++set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/libexec/rpm" CACHE PATH "rpm home") + set(RPM_MACROSDIR "${RPM_CONFIGDIR}/macros.d") + set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string") + diff --git a/app-arch/rpm/files/rpm-4.8.1-clang.patch b/app-arch/rpm/files/rpm-4.8.1-clang.patch deleted file mode 100644 index 714fbc09b534..000000000000 --- a/app-arch/rpm/files/rpm-4.8.1-clang.patch +++ /dev/null @@ -1,52 +0,0 @@ -https://github.com/rpm-software-management/rpm/commit/6ad8a71407b173b6c50d389f01edd8a4aecd6807 ---- a/lib/fsm.c -+++ b/lib/fsm.c -@@ -1015,27 +1015,28 @@ - } - - setmeta: -- /* Special files require path-based ops */ -- int mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); -- if (!rc && fd == -1 && mayopen) { -- int flags = O_RDONLY; -- /* Only follow safe symlinks, and never on temporary files */ -- if (fp->suffix) -- flags |= AT_SYMLINK_NOFOLLOW; -- fd = fsmOpenat(di.dirfd, fp->fpath, flags, -- S_ISDIR(fp->sb.st_mode)); -- if (fd < 0) -- rc = RPMERR_OPEN_FAILED; -- } -+ { -+ /* Special files require path-based ops */ -+ int mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); -+ if (!rc && fd == -1 && mayopen) { -+ int flags = O_RDONLY; -+ /* Only follow safe symlinks, and never on temporary files */ -+ if (fp->suffix) -+ flags |= AT_SYMLINK_NOFOLLOW; -+ fd = fsmOpenat(di.dirfd, fp->fpath, flags, -+ S_ISDIR(fp->sb.st_mode)); -+ if (fd < 0) -+ rc = RPMERR_OPEN_FAILED; -+ } -+ if (!rc && fp->setmeta) { -+ rc = fsmSetmeta(fd, di.dirfd, fp->fpath, -+ fi, plugins, fp->action, -+ &fp->sb, nofcaps); -+ } - -- if (!rc && fp->setmeta) { -- rc = fsmSetmeta(fd, di.dirfd, fp->fpath, -- fi, plugins, fp->action, -- &fp->sb, nofcaps); -- } -- -- if (fd != firstlinkfile) -- fsmClose(&fd); -+ if (fd != firstlinkfile) -+ fsmClose(&fd); -+ } - } - - /* Notify on success. */ diff --git a/app-arch/rpm/files/rpm-4.8.1-db-path.patch b/app-arch/rpm/files/rpm-4.8.1-db-path.patch deleted file mode 100644 index 634dd2373ab8..000000000000 --- a/app-arch/rpm/files/rpm-4.8.1-db-path.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 587cfa7..498abfb 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -177,7 +177,7 @@ EXTRA_DIST += rpmpopt.in - - usrsrcdir = $(prefix)/src - --rpmvardir = $(localstatedir)/lib/rpm -+rpmvardir = $(localstatedir)/rpm - rpmvar_DATA = - - install-exec-hook: -diff --git a/macros.in b/macros.in -index ae46fcb..213b53c 100644 ---- a/macros.in -+++ b/macros.in -@@ -155,7 +155,7 @@ - %_bzip2bin %{__bzip2} - - # The location of the rpm database file(s). --%_dbpath %{_var}/lib/rpm -+%_dbpath %{_var}/rpm - - # The location of the rpm database file(s) after "rpm --rebuilddb". - %_dbpath_rebuild %{_dbpath} diff --git a/app-arch/rpm/rpm-4.18.1.ebuild b/app-arch/rpm/rpm-4.18.1.ebuild deleted file mode 100644 index 99b425069dfb..000000000000 --- a/app-arch/rpm/rpm-4.18.1.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{3,4} ) -PYTHON_COMPAT=( python3_{10..11} ) - -inherit autotools lua-single perl-module python-single-r1 toolchain-funcs - -DESCRIPTION="Red Hat Package Management Utils" -HOMEPAGE="https://rpm.org/ https://github.com/rpm-software-management/rpm" -SRC_URI=" - https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2 - http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2 -" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="acl audit caps +berkdb doc dbus nls openmp python readline selinux +sqlite test +zstd" -REQUIRED_USE=" - ${LUA_REQUIRED_USE} - python? ( ${PYTHON_REQUIRED_USE} ) -" -# Tests are broken. See bug #657500 -RESTRICT="test" - -DEPEND=" - ${LUA_DEPS} - !app-arch/rpm5 - app-arch/libarchive:= - >=app-arch/bzip2-1.0.1 - app-arch/xz-utils - >=app-crypt/gnupg-1.2 - >=dev-lang/perl-5.8.8 - dev-libs/elfutils - dev-libs/libgcrypt:= - >=dev-libs/popt-1.7 - sys-apps/file - >=sys-libs/zlib-1.2.3-r1 - virtual/libintl - acl? ( virtual/acl ) - audit? ( sys-process/audit ) - caps? ( >=sys-libs/libcap-2.0 ) - dbus? ( sys-apps/dbus ) - readline? ( sys-libs/readline:= ) - sqlite? ( dev-db/sqlite:3 ) - python? ( ${PYTHON_DEPS} ) - nls? ( virtual/libintl ) - zstd? ( app-arch/zstd:= ) -" -BDEPEND=" - virtual/pkgconfig - doc? ( app-text/doxygen ) - nls? ( sys-devel/gettext ) - test? ( sys-apps/fakechroot ) -" -RDEPEND=" - ${DEPEND} - selinux? ( sec-policy/selinux-rpm ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-4.8.1-db-path.patch - "${FILESDIR}"/${PN}-4.8.1-clang.patch - "${FILESDIR}"/${PN}-4.17.0-libdir.patch - "${FILESDIR}"/${PN}-4.18.1-musl-nls.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - lua-single_pkg_setup - - use python && python-single-r1_pkg_setup - - # bug #779769 - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - default - - # bug #356769 - sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed" - # bug #492642 - sed -i "s:@__PYTHON@:${PYTHON}:" macros.in || die "Fixing %__python failed" - - # Prevent automake maintainer mode from kicking in (bug #450448). - #touch -r Makefile.am preinstall.am || die - - eautoreconf -} - -src_configure() { - # rpm no longer supports berkdb, but has readonly support. - # https://github.com/rpm-software-management/rpm/commit/4290300e24c5ab17c615b6108f38438e31eeb1d0 - local myeconfargs=( - --enable-libelf - --without-selinux - --disable-inhibit-plugin - --with-crypto=libgcrypt - $(use_enable berkdb bdb-ro) - $(use_enable python) - $(use_enable nls) - $(use_enable openmp) - $(use_enable dbus inhibit-plugin) - $(use_enable sqlite) - $(use_with caps cap) - $(use_with acl) - $(use_with audit) - $(use_with readline) - $(use_enable zstd zstd $(usex zstd yes no)) - ) - - econf "${myeconfargs[@]}" -} - -src_test() { - # Known to fail with FEATURES=usersandbox (bug #657500) - if has usersandbox ${FEATURES} ; then - ewarn "You are emerging ${P} with 'usersandbox' enabled." \ - "Expect some test failures or emerge with 'FEATURES=-usersandbox'!" - fi - - emake check -} - -src_install() { - default - - # Remove la files - find "${ED}" -name '*.la' -delete || die - - # Fix symlinks to /bin/rpm (bug #349840) - for binary in rpmquery rpmverify; do - ln -sf rpm "${ED}"/usr/bin/${binary} || die - done - - if ! use nls; then - rm -rf "${ED}"/usr/share/man/?? || die - fi - - keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD} - - dodoc CREDITS README* - if use doc; then - local docname - for docname in librpm; do - docinto "html/${docname}" - dodoc -r "docs/${docname}/html/." - done - fi - - # Fix perllocal.pod file collision - perl_delete_localpod - - use python && python_optimize -} - -pkg_postinst() { - if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then - einfo "RPM database found... Rebuilding database (may take a while)..." - "${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}/" || die - else - einfo "No RPM database found... Creating database..." - "${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}/" || die - fi -} diff --git a/app-arch/rpm/rpm-4.20.0.ebuild b/app-arch/rpm/rpm-4.20.0.ebuild new file mode 100644 index 000000000000..a076561bbe6f --- /dev/null +++ b/app-arch/rpm/rpm-4.20.0.ebuild @@ -0,0 +1,145 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CMAKE_MAKEFILE_GENERATOR=emake +LUA_COMPAT=( lua5-{3,4} ) +PYTHON_COMPAT=( python3_{10..13} ) + +inherit cmake flag-o-matic lua-single python-single-r1 toolchain-funcs + +DESCRIPTION="The RPM Package Manager" +HOMEPAGE="https://rpm.org/ https://github.com/rpm-software-management/rpm" +SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" + +LICENSE="GPL-2 LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="acl audit bzip2 caps berkdb doc dbus iconv lzma nls openmp python + readline selinux +sequoia +sqlite +zstd" +REQUIRED_USE=" + ${LUA_REQUIRED_USE} + python? ( ${PYTHON_REQUIRED_USE} ) +" +# Tests run against a Fedora container. +RESTRICT="test" + +DEPEND=" + ${LUA_DEPS} + app-arch/libarchive:= + >=app-crypt/gnupg-1.2 + >=dev-lang/perl-5.8.8 + dev-libs/elfutils + >=dev-libs/popt-1.7 + sys-apps/file + >=sys-libs/zlib-1.2.3-r1 + acl? ( virtual/acl ) + audit? ( sys-process/audit ) + bzip2? ( >=app-arch/bzip2-1.0.1 ) + caps? ( >=sys-libs/libcap-2.0 ) + dbus? ( sys-apps/dbus ) + iconv? ( virtual/libiconv ) + lzma? ( app-arch/xz-utils ) + nls? ( virtual/libintl ) + python? ( ${PYTHON_DEPS} ) + readline? ( sys-libs/readline:= ) + selinux? ( sys-libs/libselinux ) + sequoia? ( app-crypt/rpm-sequoia ) + !sequoia? ( dev-libs/libgcrypt:= ) + sqlite? ( dev-db/sqlite:3 ) + zstd? ( app-arch/zstd:= ) +" +BDEPEND=" + virtual/pkgconfig + doc? ( app-text/doxygen ) + nls? ( sys-devel/gettext ) +" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-rpm ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.19.1.1-musl-compat.patch + "${FILESDIR}"/${P}-libdir.patch +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + lua-single_pkg_setup + + use python && python-single-r1_pkg_setup + + # bug #779769 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_configure() { + local mycmakeargs=( + -DENABLE_NDB=ON + -DENABLE_TESTSUITE=OFF + -DWITH_ARCHIVE=ON + -DWITH_FSVERITY=OFF + -DWITH_IMAEVM=OFF + -DWITH_FAPOLICYD=OFF + -DWITH_OPENSSL=OFF + -DWITH_LIBDW=ON + -DWITH_LIBELF=ON + -DENABLE_BDB_RO=$(usex berkdb) + -DENABLE_NLS=$(usex nls) + -DENABLE_OPENMP=$(usex openmp) + -DENABLE_PYTHON=$(usex python) + -DENABLE_SQLITE=$(usex sqlite) + -DWITH_CAP=$(usex caps) + -DWITH_ACL=$(usex acl) + -DWITH_SELINUX=$(usex selinux) + -DWITH_DBUS=$(usex dbus) + -DWITH_AUDIT=$(usex audit) + -DWITH_SEQUOIA=$(usex sequoia) + -DWITH_READLINE=$(usex readline) + -DWITH_BZIP2=$(usex bzip2) + -DWITH_ICONV=$(usex iconv) + -DWITH_ZSTD=$(usex zstd) + -DWITH_LIBLZMA=$(usex lzma) + -DWITH_DOXYGEN=$(usex doc) + ) + + # special handling for ASAN + # https://github.com/rpm-software-management/rpm/commit/ca8d1cf3f401d89ad3507aed8d7a70ad37026ca7 + if is-flagq -fsanitize=address; then + mycmakeargs+=( -DENABLE_ASAN=ON ) + fi + + cmake_src_configure +} + +src_test() { + emake -C "${BUILD_DIR}" check +} + +src_install() { + cmake_src_install + + if ! use doc; then + # Remove pre-built API docs. + rm -r "${ED}/usr/share/doc/${PF}" || die + fi + + dodoc CREDITS README + + use python && python_optimize +} + +pkg_postinst() { + if [[ -f "${EROOT}"/var/lib/rpm/rpmdb.sqlite ]] ; then + einfo "RPM database found... Rebuilding database (may take a while)..." + "${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}/" || die + else + einfo "No RPM database found... Creating database..." + "${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}/" || die + fi +} diff --git a/app-arch/sharutils/sharutils-4.15.2-r2.ebuild b/app-arch/sharutils/sharutils-4.15.2-r2.ebuild index 652b7b1926da..c39766d65c95 100644 --- a/app-arch/sharutils/sharutils-4.15.2-r2.ebuild +++ b/app-arch/sharutils/sharutils-4.15.2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -32,6 +32,9 @@ src_prepare() { # Upstream is aware but thinks this isn't a bug/problem in sharutils itself # See http://lists.gnu.org/archive/html/bug-gnu-utils/2013-10/msg00011.html append-cflags $(test-flags-CC -Wno-error=format-security) + + # bug #943901 + append-cflags -std=gnu17 } src_configure() { diff --git a/app-arch/zip/zip-3.0-r7.ebuild b/app-arch/zip/zip-3.0-r7.ebuild index 2962711cdf55..6cfcce9e073a 100644 --- a/app-arch/zip/zip-3.0-r7.ebuild +++ b/app-arch/zip/zip-3.0-r7.ebuild @@ -38,6 +38,8 @@ src_prepare() { } src_configure() { + # Needed for tricky configure tests w/ C23 (bug #943727) + export CC="$(tc-getCC) -std=gnu89" # Needed for Clang 16 append-flags -std=gnu89 |