From 4718311d86d688e1c8439cf10de2635e5898df48 Mon Sep 17 00:00:00 2001 From: Sam James Date: Mon, 22 Jun 2026 23:51:07 +0100 Subject: [PATCH] Revert "sys-apps/pkgit: fix Manifest, variable order, and remote-id" This reverts commit fdd4a00f817e10dec642f99447a0eb2f313ab4f4. There are other issues still (not just the xanmod-sources one handled by a followup). Revert so it can be done properly (and slowly). Signed-off-by: Sam James --- sys-apps/pkgit/Manifest | 1 - sys-apps/pkgit/metadata.xml | 17 ----- sys-apps/pkgit/pkgit-1.0.0.ebuild | 24 ------ sys-apps/pkgit/pkgit-9999.ebuild | 26 ------- sys-kernel/xanmod-sources/Manifest | 4 - ...od-7.0.6-x86-l1-cache-shift-fallback.patch | 23 ------ .../xanmod-sources-7.0.11.ebuild | 74 ------------------- 7 files changed, 169 deletions(-) delete mode 100644 sys-apps/pkgit/Manifest delete mode 100644 sys-apps/pkgit/metadata.xml delete mode 100644 sys-apps/pkgit/pkgit-1.0.0.ebuild delete mode 100644 sys-apps/pkgit/pkgit-9999.ebuild delete mode 100644 sys-kernel/xanmod-sources/Manifest delete mode 100644 sys-kernel/xanmod-sources/files/xanmod-7.0.6-x86-l1-cache-shift-fallback.patch delete mode 100644 sys-kernel/xanmod-sources/xanmod-sources-7.0.11.ebuild diff --git a/sys-apps/pkgit/Manifest b/sys-apps/pkgit/Manifest deleted file mode 100644 index 4773ffcf8d..0000000000 --- a/sys-apps/pkgit/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pkgit-1.0.0.tar.gz 27864 BLAKE2B 5cbb8495c05e2321a70ca22e888aa31ebc6208025bb2b97d3806f30b31b8f6b1368e2602af389d705639a68de57182bcc609aff4ffe7e8675185c0b2bc9fcbf3 SHA512 d47277ad42432bbb11884fec2eb59089c55123eb1532dfa065a8450d00fb2f16311ab3a3cfbcd67766f2b49d2bf57aad2f226d61bd7c4d8c36ce39ac8194a9de diff --git a/sys-apps/pkgit/metadata.xml b/sys-apps/pkgit/metadata.xml deleted file mode 100644 index 72ec66bc19..0000000000 --- a/sys-apps/pkgit/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - theron.york@cloudnuke.org - Theron York - - - RealFCC/pkgit - - - pkgit is an unconventional package manager designed to compile and install - packages directly from their git repositories. It uses C with Lua for - configuration and supports dependency resolution, version pinning, and - custom build scripts (bldit.lua). - - diff --git a/sys-apps/pkgit/pkgit-1.0.0.ebuild b/sys-apps/pkgit/pkgit-1.0.0.ebuild deleted file mode 100644 index 85c2a930b5..0000000000 --- a/sys-apps/pkgit/pkgit-1.0.0.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Unconventional package manager that compiles & installs packages from git repos" -HOMEPAGE="https://git.symlinx.net/pkgit" -SRC_URI="https://codeberg.org/RealFCC/pkgit/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND="dev-lang/luajit:=" -DEPEND="${RDEPEND} - dev-build/make" - -src_compile() { - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install || die "install failed" -} diff --git a/sys-apps/pkgit/pkgit-9999.ebuild b/sys-apps/pkgit/pkgit-9999.ebuild deleted file mode 100644 index eeb50b01ce..0000000000 --- a/sys-apps/pkgit/pkgit-9999.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit git-r3 - -DESCRIPTION="Unconventional package manager that compiles & installs packages from git repos" -HOMEPAGE="https://git.symlinx.net/pkgit" -EGIT_REPO_URI="https://git.symlinx.net/pkgit" -EGIT_BRANCH="master" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" - -RDEPEND="dev-lang/luajit:=" -DEPEND="${RDEPEND} - dev-build/make" - -src_compile() { - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install || die "install failed" -} diff --git a/sys-kernel/xanmod-sources/Manifest b/sys-kernel/xanmod-sources/Manifest deleted file mode 100644 index 399795ffad..0000000000 --- a/sys-kernel/xanmod-sources/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST genpatches-7.0-7.base.tar.xz 160868 BLAKE2B 8afb04838c98c99385ca37027a8355c62d8f58973222dd9b3be55ef9fe714af7790c2b0dae1689b26788ff7349c3a2ac143337003e704f99b905099404d13009 SHA512 6bae3bb110afd2398a466ffa649f637694bd6ff8a0d337583650d1a3be0858fb8cc2ef2639a29b181f49943dfa283edd724ac54ae2d52f41ce7a619bbea14c95 -DIST genpatches-7.0-7.extras.tar.xz 3980 BLAKE2B a346d7e2c195a76cf687acf1d7547b4504f30c896b0be98d91f6962965bf9feca2b21a04fd7d511ac289fb7d18a83ae9c1cb2f9c590efa1ff92aba401cde7e7f SHA512 a27d7627bfec4fc3c85ab33d0686559f946a9cca8095440c0ba2f67b3859424f3696714e2064f33f9725848020282fe5b341fa50bd91be19ebc9f8d4fc340f41 -DIST linux-7.0.tar.xz 157143652 BLAKE2B 3d9795083c8938f80f480de0d10bfd9c525640e59d5c7f22983de3f12ee42c84c31be902cafb05579ddb1c32bac5ed06b0d4953f9705450be185bd2d9ab08f89 SHA512 8c85b708342f8f09ca25b2234b22e93b62b144a9ef919fbb21827f52fa47498e778c79db1559524dd7fb360f95b2ce174171443c1859656c281be41d2b6c5a0b -DIST patch-7.0.11-xanmod1.xz 861420 BLAKE2B 1956c31acabe0fbae00a078d7759856a81c50ca9548d6fd433f44ef5b737fdb81987d49e9a906de015f81f6aeafe4fc4219ab5c88ad8732c14a00108937a3f46 SHA512 2f117323890f8859808eb43fb3679b82ce7ff235aebbc1678b7af621233636153a13c114e6d80939d1ce7bd4900ceb98ed48d0506847ebfc06885e62af5f52f6 diff --git a/sys-kernel/xanmod-sources/files/xanmod-7.0.6-x86-l1-cache-shift-fallback.patch b/sys-kernel/xanmod-sources/files/xanmod-7.0.6-x86-l1-cache-shift-fallback.patch deleted file mode 100644 index 9018c6a3ab..0000000000 --- a/sys-kernel/xanmod-sources/files/xanmod-7.0.6-x86-l1-cache-shift-fallback.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: gentoo guru contributors -Subject: [PATCH] x86/Kconfig: add x86_64 L1 cache shift fallback - -XanMod adds X86_NATIVE_CPU to the x86-64 processor family choice. -Unlike concrete CPU family symbols, it does not match any default for -X86_L1_CACHE_SHIFT. If a config enables X86_NATIVE_CPU and does not -carry an old explicit cache-shift value, olddefconfig can leave -CONFIG_X86_L1_CACHE_SHIFT unset and derive CONFIG_X86_INTERNODE_CACHE_SHIFT=0. - -Keep existing CPU-specific defaults first, including the NetBurst MPSC -case that uses 7, then fall back to 6 for otherwise unmatched x86_64 -selections such as X86_NATIVE_CPU. - ---- a/arch/x86/Kconfig.cpu -+++ b/arch/x86/Kconfig.cpu -@@ -694,6 +694,7 @@ - default "6" if MK7 || MK8 || MPENTIUMM || MCORE2 || MATOM || MVIAC7 || X86_GENERIC || GENERIC_CPU || MK8SSE3 || MK10 || MBARCELONA || MBOBCAT || MJAGUAR || MBULLDOZER || MPILEDRIVER || MSTEAMROLLER || MEXCAVATOR || MZEN || MZEN2 || MZEN3 || MZEN4 || MZEN5 || MNEHALEM || MWESTMERE || MSILVERMONT || MGOLDMONT || MGOLDMONTPLUS || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MSKYLAKE || MSKYLAKEX || MCANNONLAKE || MICELAKE_CLIENT || MICELAKE_SERVER || MCASCADELAKE || MCOOPERLAKE || MTIGERLAKE || MSAPPHIRERAPIDS || MROCKETLAKE || MALDERLAKE || MRAPTORLAKE || MMETEORLAKE || MEMERALDRAPIDS - default "4" if MELAN || M486SX || M486 || MGEODEGX1 - default "5" if MWINCHIP3D || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX -+ default "6" if X86_64 - - config X86_F00F_BUG - def_bool y diff --git a/sys-kernel/xanmod-sources/xanmod-sources-7.0.11.ebuild b/sys-kernel/xanmod-sources/xanmod-sources-7.0.11.ebuild deleted file mode 100644 index f67bc7071e..0000000000 --- a/sys-kernel/xanmod-sources/xanmod-sources-7.0.11.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" -ETYPE="sources" -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="7" - -inherit check-reqs kernel-2 -detect_version -detect_arch - -MY_P=linux-${PV%.*} -GENPATCHES_P="genpatches-${PV%.*}-${K_GENPATCHES_VER}" -GENPATCHES_URI=" - https://distfiles.gentoo.org/pub/proj/kernel/genpatches/${GENPATCHES_P}.base.tar.xz - https://distfiles.gentoo.org/pub/proj/kernel/genpatches/${GENPATCHES_P}.extras.tar.xz -" -DESCRIPTION="Full XanMod source, including the Gentoo patchset and other patch options." -HOMEPAGE="https://xanmod.org" - -XANMOD_VERSION="1" -XANMOD_URI="https://downloads.sourceforge.net/project/xanmod/releases/main" -OKV="${PV}-xanmod${XANMOD_VERSION}" -SRC_URI=" - ${KERNEL_BASE_URI}/linux-${PV%.*}.tar.xz - ${GENPATCHES_URI} - ${XANMOD_URI}/${PV}-xanmod${XANMOD_VERSION}/patch-${PV}-xanmod${XANMOD_VERSION}.xz -" -S="${WORKDIR}/linux-${OKV}" - -LICENSE+=" CDDL" -KEYWORDS="~amd64" - -pkg_pretend() { - CHECKREQS_DISK_BUILD="4G" - check-reqs_pkg_pretend -} - -src_unpack() { - default -} - -src_prepare() { - eapply "${WORKDIR}/patch-${PV}-xanmod${XANMOD_VERSION}" - eapply "${FILESDIR}/xanmod-7.0.6-x86-l1-cache-shift-fallback.patch" - - rm -f "${WORKDIR}"/2902_Replace-CONST-CAST-with-const-cast.patch 2>/dev/null - rm -f "${WORKDIR}"/1510_fs-enable-link-security-restrictions-by-default.patch 2>/dev/null - rm -f "${WORKDIR}"/1730_parisc-Disable-prctl.patch 2>/dev/null - - for patch in "${WORKDIR}"/*.patch; do - [ -f "$patch" ] || continue - [[ "$patch" == *"2902_Replace"* ]] && continue - [[ "$patch" == *"1510_fs"* ]] && continue - [[ "$patch" == *"1730_parisc"* ]] && continue - eapply "$patch" - done - - rm -f "${S}/tools/testing/selftests/tc-testing/action-ebpf" 2>/dev/null - - kernel-2_src_prepare -} - -pkg_postinst() { - elog "MICROCODES" - elog "Use xanmod-sources with microcodes" - elog "Read https://wiki.gentoo.org/wiki/Intel_microcode" - kernel-2_pkg_postinst -} - -pkg_postrm() { - kernel-2_pkg_postrm -} \ No newline at end of file