Trying out the merge-usr dry-run, there was an error due to two entries for `vpnc@.service` in `/lib/systemd` and `/usr/lib/systemd`. Both are installed by the package, one from `files/` and one from upstream, and the content differs. I assume that the one provided in `files/` was added first, and then at some point upstream added their own version. Reproducible: Always Steps to Reproduce: 1. emerge vpnc 2. qlist vpnc | grep service 3. Actual Results: /usr/lib/systemd/system/vpnc@.service /lib/systemd/system/vpnc@.service Expected Results: Only one service file installed. Portage 3.0.40 (python 3.10.8-final-0, default/linux/amd64/17.1/desktop/plasma/systemd, gcc-12, glibc-2.36-r6, 6.0.8-gentoo x86_64) ================================================================= System uname: Linux-6.0.8-gentoo-x86_64-AMD_Ryzen_7_1700X_Eight-Core_Processor-with-glibc2.36 KiB Mem: 16345172 total, 1525588 free KiB Swap: 11469820 total, 10518092 free Timestamp of repository gentoo: Sat, 03 Dec 2022 06:31:50 +0000 Head commit of repository gentoo: 2a644833aff5c1d1ebc84ca0dc7a4ef2aa60aedd sh bash 5.2_p12 ld GNU ld (Gentoo 2.39 p5) 2.39.0 ccache version 4.7.4 [enabled] app-misc/pax-utils: 1.3.5::gentoo app-shells/bash: 5.2_p12::gentoo dev-java/java-config: 2.3.1::gentoo dev-lang/perl: 5.36.0-r1::gentoo dev-lang/python: 3.10.8_p3::gentoo dev-lang/rust-bin: 1.65.0::gentoo dev-util/ccache: 4.7.4::gentoo dev-util/cmake: 3.25.0::gentoo dev-util/meson: 0.64.1::gentoo sys-apps/baselayout: 2.9::gentoo sys-apps/sandbox: 2.29::gentoo sys-apps/systemd: 252.2::gentoo sys-devel/autoconf: 2.13-r7::gentoo, 2.71-r5::gentoo sys-devel/automake: 1.16.5::gentoo sys-devel/binutils: 2.39-r4::gentoo sys-devel/binutils-config: 5.4.1::gentoo sys-devel/clang: 15.0.5::gentoo sys-devel/gcc: 12.2.1_p20221008::gentoo sys-devel/gcc-config: 2.8::gentoo sys-devel/libtool: 2.4.7::gentoo sys-devel/lld: 15.0.5::gentoo sys-devel/llvm: 15.0.5::gentoo sys-devel/make: 4.4::gentoo sys-kernel/linux-headers: 6.0::gentoo (virtual/os-headers) sys-libs/glibc: 2.36-r6::gentoo Repositories: gentoo location: /var/db/repos/gentoo sync-type: git sync-uri: https://github.com/gentoo-mirror/gentoo.git priority: -1000 ACCEPT_KEYWORDS="amd64 ~amd64" ACCEPT_LICENSE="* -@EULA" CBUILD="x86_64-pc-linux-gnu" CFLAGS="-O2 -pipe -march=native" CHOST="x86_64-pc-linux-gnu" CONFIG_PROTECT="/etc /usr/lib64/libreoffice/program/sofficerc /usr/share/config /usr/share/gnupg/qualified.txt" CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/dconf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/texmf/web2c" CXXFLAGS="-O2 -pipe -march=native" DISTDIR="/var/cache/distfiles" EMERGE_DEFAULT_OPTS="--keep-going=y --quiet-build=n" ENV_UNSET="CARGO_HOME DBUS_SESSION_BUS_ADDRESS DISPLAY GOBIN GOPATH PERL5LIB PERL5OPT PERLPREFIX PERL_CORE PERL_MB_OPT PERL_MM_OPT XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR XDG_STATE_HOME" FCFLAGS="-O2 -pipe" FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs binpkg-multi-instance buildpkg-live buildsyspkg ccache compressdebug config-protect-if-modified distlocks ebuild-locks fail-clean fixlafiles ipc-sandbox merge-sync multilib-strict network-sandbox news parallel-fetch pid-sandbox preserve-libs protect-owned qa-unresolved-soname-deps sandbox sfperms splitdebug strict unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr" FFLAGS="-O2 -pipe" GENTOO_MIRRORS="https://ftp.fau.de/gentoo http://ftp.halifax.rwth-aachen.de/gentoo/ ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/gentoo/ ftp://ftp.free.fr/mirrors/ftp.gentoo.org/ http://tux.rainside.sk/gentoo/" LANG="en_US.utf8" LDFLAGS="-Wl,-O1 -Wl,--as-needed" MAKEOPTS="-s -j12" PKGDIR="/var/cache/binpkgs" PORTAGE_CONFIGROOT="/" PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --exclude=/.git" PORTAGE_TMPDIR="/var/tmp" SHELL="/bin/zsh" USE="X a52 aac aacs acl acpi activities alsa amd64 archive avif bash-completion bittorrent bluetooth bluray branding brotli bzip2 cairo caps cdda cdparanoia cdr clang cli crypt css cups curl dbus declarative designer djvu dri dts dvd dvdr elfutils emacs encode epspdf evdev exif expat faac fdk ffmpeg flac fontconfig fortran fuse gdbm gif gimp git gnutls gold gpg gpm graphite graphviz gtk gtk3 gui gzip harfbuzz hdf5 heif http2 iconv icu idn imagemagick inotify ipv6 ipython jemalloc jpeg json kde lapack latex lcms libglvnd libnotify libssh libtirpc live lm-sensors lto lua lz4 lzma lzo mad man matplotlib mmap mng mp3 mp4 mpeg mtp multilib multimedia multitarget ncurses nftables nghttp2 notebook nptl nscd numpy nvenc occ ogg opengl openmp openssl opus pam pango pcap pcre pdf pdfimport perl plasma plotutils png policykit postproc postscript ppds pulseaudio python qml qt5 quicktime rar readline realtime recode rtc rtmp sdl seccomp smp snappy sndfile sockets sound sparse spell spice split-usr sqlite ssh sshdump ssl svg syslog systemd t1lib tbb test-rust tftp theora threads tiff tinfo tk truetype udev udisks unicode upower usb usbredir user-session utils uvm vaapi vdpau vim-syntax virtualbox vlc vnc vorbis vpx vte vulkan wayland webengine webp widgets wifi wxwidgets x264 x265 xattr xcb xetex xft xml xmp xpm xv xvfb xvid zeroconf zlib zsh-completion zstd" ABI_X86="64" ADA_TARGET="gnat_2021" ALSA_CARDS="snd_hda_intel" APACHE2_MODULES="authn_core authz_core socache_shmcb unixd actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" CALLIGRA_FEATURES="karbon sheets words" CAMERAS="directory" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" CPU_FLAGS_X86="aes avx avx2 fma3 mmx mmxext popcnt sse sse2 sse3 sse4_1 sse4_2 ssse3" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock greis isync itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf skytraq superstar2 timing tsip tripmate tnt ublox ubx" GRUB_PLATFORMS="efi-64" INPUT_DEVICES="libinput" KERNEL="linux" L10N="de en" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer" LLVM_TARGETS="X86 AArch64 ARM NVPTX BPF" LUA_SINGLE_TARGET="lua5-1" LUA_TARGETS="lua5-1" OFFICE_IMPLEMENTATION="libreoffice" POSTGRES_TARGETS="postgres12 postgres13" PYTHON_SINGLE_TARGET="python3_10" PYTHON_TARGETS="python3_10" QEMU_SOFTMMU_TARGETS="x86_64 i386 arm aarch64 mips64el" QEMU_USER_TARGETS="x86_64 i386 arm aarch64" RUBY_TARGETS="ruby31" USERLAND="GNU" VIDEO_CARDS="nvidia fbdev vesa" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq proto steal rawnat logmark ipmark dhcpmac delude chaos account" Unset: ADDR2LINE, AR, ARFLAGS, AS, ASFLAGS, CC, CCLD, CONFIG_SHELL, CPP, CPPFLAGS, CTARGET, CXX, CXXFILT, ELFEDIT, EXTRA_ECONF, F77FLAGS, FC, GCOV, GPROF, INSTALL_MASK, LC_ALL, LD, LEX, LFLAGS, LIBTOOL, LINGUAS, MAKE, MAKEFLAGS, NM, OBJCOPY, OBJDUMP, PORTAGE_BINHOST, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, RANLIB, READELF, RUSTFLAGS, SIZE, STRINGS, STRIP, YACC, YFLAGS
*** Bug 885321 has been marked as a duplicate of this bug. ***
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b3fa6aea4dc2f498b67bcebe8263f8f59df3d33 commit 0b3fa6aea4dc2f498b67bcebe8263f8f59df3d33 Author: Mike Gilbert <floppym@gentoo.org> AuthorDate: 2023-01-13 17:57:27 +0000 Commit: Mike Gilbert <floppym@gentoo.org> CommitDate: 2023-01-13 18:03:41 +0000 net-vpn/vpnc: use upstream systemd unit Closes: https://bugs.gentoo.org/884093 Signed-off-by: Mike Gilbert <floppym@gentoo.org> net-vpn/vpnc/vpnc-0.5.3_p20220927-r1.ebuild | 89 +++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+)
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36a57c18e98b08580cecec18f3c941c1e2fed283 commit 36a57c18e98b08580cecec18f3c941c1e2fed283 Author: Mike Gilbert <floppym@gentoo.org> AuthorDate: 2023-01-13 18:06:22 +0000 Commit: Mike Gilbert <floppym@gentoo.org> CommitDate: 2023-01-13 18:06:22 +0000 net-vpn/vpnc: sync live ebuild Bug: https://bugs.gentoo.org/884093 Signed-off-by: Mike Gilbert <floppym@gentoo.org> net-vpn/vpnc/vpnc-9999.ebuild | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
