Sam James b97e3fb2b8 profiles: fix botched conflict resolution ...

Fixes: 7e1abbaf4d
Signed-off-by: Sam James <sam@gentoo.org>

2025-06-09 08:49:26 +01:00

..

arch

app-misc/localsearch: New package, pkgmove from app-misc/tracker-miners

2025-06-09 01:21:21 +01:00

base

app-misc/localsearch: New package, pkgmove from app-misc/tracker-miners

2025-06-09 01:21:21 +01:00

default/linux

profiles, m68k 23.0 time64: switch CHOST to aligned, enforce glibc with patch

2025-06-02 05:39:00 +09:00

desc

profiles/desc: Add amx_* to CPU_FLAGS_X86

2025-05-28 11:12:54 +02:00

embedded

…

features

app-misc/localsearch: New package, pkgmove from app-misc/tracker-miners

2025-06-09 01:21:21 +01:00

prefix

profiles/prefix/darwin/package.use.mask: mask USE=drm for ffmpeg

2025-04-27 09:26:40 +02:00

releases

…

targets

profiles: Mask >=kde-plasma/drkonqi-6.3.90 except for targets/systemd

2025-05-18 17:59:08 +02:00

updates

app-misc/localsearch: New package, pkgmove from app-misc/tracker-miners

2025-06-09 01:21:21 +01:00

arch.list

…

arches.desc

…

categories

…

eapi

…

info_pkgs

profiles: add dev-lang/erlang to info_pkgs

2025-05-26 17:42:24 +02:00

info_vars

…

license_groups

licenses/CDLA-Permissive-2.0: add license

2025-06-03 04:37:50 +01:00

package.deprecated

profiles: package.deprecated: Drop obsolete pyside2 entries

2025-04-23 00:30:58 +02:00

package.mask

profiles: fix botched conflict resolution

2025-06-09 08:49:26 +01:00

profiles.desc

profiles: remove repoman references

2025-05-24 00:23:31 +01:00

repo_name

…

thirdpartymirrors

profiles: thirdpartymirrors: refresh kde

2025-05-10 16:58:22 +01:00

use.desc

profiles: update berkdb USE description

2025-04-19 21:52:21 -04:00