pkgrepl: update

5440da8a · Vitaly Lipatov · 0d0c93b5 · 5440da8a · 5440da8a · 5440da8a
Commit 5440da8a authored May 20, 2023 by Vitaly Lipatov
46 changed files
--- a/share/eterbuild/pkgrepl/pkgrepl.alt.c7
+++ b/share/eterbuild/pkgrepl/pkgrepl.alt.c7
@@ -16,3 +16,7 @@ libmozjs17-devel|libmozjs17-devel
 libsystemd-devel|libsystemd-devel

 libgnutls30|libgnutls26
+
+# missed
+libXfont2-devel|
+patchelf|
--- a/share/eterbuild/pkgrepl/pkgrepl.alt.c8
+++ b/share/eterbuild/pkgrepl/pkgrepl.alt.c8
@@ -24,3 +24,7 @@ libtiff5|libtiff5
 llvm6.0-devel|llvm-devel
 llvm6.0|llvm
 clang6.0|clang
+
+# restore after c7
+libXfont2-devel|libXfont2-devel
+patchelf|patchelf
--- a/share/eterbuild/pkgrepl/pkgrepl.alteros
+++ b/share/eterbuild/pkgrepl/pkgrepl.alteros
+pkgrepl.centos
\ No newline at end of file
--- a/share/eterbuild/pkgrepl/pkgrepl.alteros.5
+++ b/share/eterbuild/pkgrepl/pkgrepl.alteros.5
+pkgrepl.centos.5
\ No newline at end of file
--- a/share/eterbuild/pkgrepl/pkgrepl.alteros.6
+++ b/share/eterbuild/pkgrepl/pkgrepl.alteros.6
+pkgrepl.centos.6
\ No newline at end of file
--- a/share/eterbuild/pkgrepl/pkgrepl.alteros.7
+++ b/share/eterbuild/pkgrepl/pkgrepl.alteros.7
+pkgrepl.centos.7
\ No newline at end of file
--- a/share/eterbuild/pkgrepl/pkgrepl.alteros.7.i586
+++ b/share/eterbuild/pkgrepl/pkgrepl.alteros.7.i586
+# missed
+cabextract|
--- a/share/eterbuild/pkgrepl/pkgrepl.alteros.7.x86_64-i586
+++ b/share/eterbuild/pkgrepl/pkgrepl.alteros.7.x86_64-i586
+pkgrepl.centos.7.x86_64-i586
\ No newline at end of file
--- a/share/eterbuild/pkgrepl/pkgrepl.alteros.8
+++ b/share/eterbuild/pkgrepl/pkgrepl.alteros.8
+pkgrepl.centos.8
\ No newline at end of file
--- a/share/eterbuild/pkgrepl/pkgrepl.alteros.x86_64-i586
+++ b/share/eterbuild/pkgrepl/pkgrepl.alteros.x86_64-i586
+pkgrepl.centos.x86_64-i586
\ No newline at end of file
--- a/share/eterbuild/pkgrepl/pkgrepl.archlinux
+++ b/share/eterbuild/pkgrepl/pkgrepl.archlinux
@@ -138,6 +138,8 @@ libtiff5|libtiff
 # obsoleted, needed for old wine packages
 libfontconfig|fontconfig

+libfontconfig1|fontconfig
+
 libunixODBC-devel|unixodbc
 libunixODBC1|unixodbc
 libunixODBC2|unixodbc

--- a/share/eterbuild/pkgrepl/pkgrepl.astra
+++ b/share/eterbuild/pkgrepl/pkgrepl.astra

-# is missed?
-libwxGTK|libwxgtk3.0
-libwxGTK-devel|libwxgtk3.0-dev
-
 libXxf86misc-devel|
 libpng16|libpng16-16
 libpng-devel|libpng-dev
@@ -61,7 +57,7 @@ gcc5-c++|g++-6.3 gcc-multilib
 libmpg123-devel|libmpg123-dev
 libmpg123|libmpg123-0
 #NX
-xkbcomp|x11-xkb-utils
+#xkbcomp|x11-xkb-utils
 xorg-font-utils|xfonts-utils
 sessreg|x11-xserver-utils
 numlockx|
@@ -72,6 +68,7 @@ libwxGTK3.1|libwxgtk3.0-0v5
 libwxGTK3.1-devel|libwxgtk3.0-dev
 libwxGTK|libwxgtk3.0-0v5
 libwxGTK-devel|libwxgtk3.0-dev
+libwxBase3.0|libwxbase3.0-0v5

 cifs-utils|cifs-utils
 libcrypto1.1|libssl1.1
@@ -82,6 +79,7 @@ libcrypto1.1|libssl1.1
 #               Depends: libgles2-mesa-dev but it is not going to be installed
 #               Depends: libglu1-mesa-dev but it is not going to be installed
 libSDL2-devel|
+libSDL2|

 libGL|libgl1
 libGL-devel|libgl-dev

--- a/share/eterbuild/pkgrepl/pkgrepl.astra.1.7.x86_64-i586
+++ b/share/eterbuild/pkgrepl/pkgrepl.astra.1.7.x86_64-i586
+# wine-etersoft:i386 : Depends: ia32-libs:i386 (>= 20180423.2) but it is not installable
+#                      Depends: libc6-i386:i386 (>= 2.17) but it is not installable
+#                      Depends: libcairo2:i386 but it is not installable
+#                      Depends: libcap-ng-utils:i386 but it is not installable
+#                      Depends: libpcap0.8:i386 but it is not installable
+# ia32-libs:i386
+# libc6-i386:i386
+
+# use headers from it (not provided by ia32-libs-dev)
+# need fix link
+libvulkan-devel|
+#libvulkan1|
+libXpm-devel|
+
+# need fix link in /usr/lib32/i386-*
+## cat /usr/lib32/i386-linux-gnu/libusb-1.0.so 
+#GROUP ( /lib32/i386-linux-gnu/libusb-1.0.so.0.1.0 )
+libusb|
+libusb-devel|libusb-1.0-0-dev:amd64
+
+# no 32-bit dbus, drop devel due wrong detection (gcc -m32 -Xlinker --verbose | grep SEARCH)
+libdbus-devel|
+libdbus|
+
+# missed libv4l-0
+libv4l|
+# not for 32 bit
+samba-libs|
+
+# /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libodbc.so: error adding symbols: file in wrong format
+libunixODBC-devel|
+libunixODBC2|
+unixODBC|
--- a/share/eterbuild/pkgrepl/pkgrepl.astra.2.12
+++ b/share/eterbuild/pkgrepl/pkgrepl.astra.2.12
+libtirpc|libtirpc1
--- a/share/eterbuild/pkgrepl/pkgrepl.astra.2.12.x86_64-i586
+++ b/share/eterbuild/pkgrepl/pkgrepl.astra.2.12.x86_64-i586
+# wine-etersoft:i386 : Depends: ia32-libs:i386 (>= 20180423.2) but it is not installable
+#                      Depends: libc6-i386:i386 (>= 2.17) but it is not installable
+#                      Depends: libcairo2:i386 but it is not installable
+#                      Depends: libcap-ng-utils:i386 but it is not installable
+#                      Depends: libpcap0.8:i386 but it is not installable
+# ia32-libs:i386
+# libc6-i386:i386
+
+libvulkan-devel|
+libvulkan1|
+libXpm-devel|
+
+
+# need fix link in /usr/lib32/i386-*
+## cat /usr/lib32/i386-linux-gnu/libusb-1.0.so 
+#GROUP ( /lib32/i386-linux-gnu/libusb-1.0.so.0.1.0 )
+libusb|
+libusb-devel|libusb-1.0-0-dev:amd64
+
+# missed libv4l-0
+libv4l|
+# not for 32 bit
+samba-libs|
--- a/share/eterbuild/pkgrepl/pkgrepl.astra.x86_64-i586
+++ b/share/eterbuild/pkgrepl/pkgrepl.astra.x86_64-i586
@@ -12,29 +12,20 @@ libcrypto1.1|ia32-libs:amd64
 libgtk+3-devel|
 libgtk+3|

+# ia32-libs-dev have no headers!!!
+#libX11-devel|libx11-dev:amd64
+#fontconfig-devel|libfontconfig1-dev
+
 libGLU-devel|ia32-libs:amd64
 libGLU|ia32-libs:amd64
 libmesa-devel|ia32-libs:amd64

-# libgl-dev conflicts with ia32-libs-devel, so we use hack in Dockerfile
+# libgl-dev conflicts with ia32-libs-dev, so we use hack in Dockerfile
 libGL-devel|ia32-libs:amd64
 # dummy package
 #libGL|ia32-libs
 libGL|ia32-libs:amd64

-# wine-etersoft:i386 : Depends: ia32-libs:i386 (>= 20180423.2) but it is not installable
-#                      Depends: libc6-i386:i386 (>= 2.17) but it is not installable
-#                      Depends: libcairo2:i386 but it is not installable
-#                      Depends: libcap-ng-utils:i386 but it is not installable
-#                      Depends: libpcap0.8:i386 but it is not installable
-# ia32-libs:i386
-# libc6-i386:i386
-
-# missed packages:
-libvulkan-devel|
-libXpm-devel|
-libvulkan1|
-
 # not provides by ia32-libs-dev (missed .so)
 #E: Unable to locate package libattr1-dev:i386
 libattr-devel|
@@ -101,8 +92,3 @@ libvkd3d1|
 glibc-devel|
 glibc-devel-static|

-# need fix link in /usr/lib32/i386-*
-## cat /usr/lib32/i386-linux-gnu/libusb-1.0.so 
-#GROUP ( /lib32/i386-linux-gnu/libusb-1.0.so.0.1.0 )
-libusb|
-libusb-devel|libusb-1.0-0-dev:amd64
--- a/share/eterbuild/pkgrepl/pkgrepl.centos.7
+++ b/share/eterbuild/pkgrepl/pkgrepl.centos.7
@@ -57,7 +57,11 @@ python3-module-pykwalify|python36-pykwalify
 python3-module-ruamel-yaml|python36-ruamel-yaml
 python3-module-redis-py|python3-redis
 python3-base|python3
-php7-redis|php-pecl-redis
+
+# FIXME
+#nginx|
+php7-redis|
+#php7-redis|php-pecl-redis

 # REMOVE after fix prev redos issue:
 libX11-locales|libX11-common
@@ -66,4 +70,6 @@ xorg-font-utils|xorg-x11-font-utils
 libcups-devel|cups-devel zlib-devel libcom_err-devel

 #libcap-utils|
-libpcap0.8|libpcap
+
+libSDL2|
+libSDL2-devel|
--- a/share/eterbuild/pkgrepl/pkgrepl.centos.7.x86_64-i586
+++ b/share/eterbuild/pkgrepl/pkgrepl.centos.7.x86_64-i586
@@ -2,3 +2,4 @@ libtool|libtool(x86-64)
 glibc-nss|glibc(x86-32)
 glibc-thread|glibc(x86-32)
 fontconfig|fontconfig(x86-32)
+libfontconfig1|fontconfig(x86-32)
--- a/share/eterbuild/pkgrepl/pkgrepl.centos.8
+++ b/share/eterbuild/pkgrepl/pkgrepl.centos.8
-coreutils|coreutils-single
+coreutils|coreutils-common
--- a/share/eterbuild/pkgrepl/pkgrepl.deb
+++ b/share/eterbuild/pkgrepl/pkgrepl.deb
 # Debian replacements

+update-kernel|
 /proc|
 libe2fs|e2fslibs
 libe2fs-devel|e2fslibs-dev
@@ -14,6 +15,7 @@ liblcms2|liblcms2-2
 liblcms2-devel|liblcms2-dev
 libldap-devel|libldap2-dev
 libldap|libldap-2.4-2
+libldap2|libldap-2.4-2
 glibc-devel|libc6-dev
 glibc-devel-static|libc6-dev
 libfreetype-devel|libfreetype6-dev
@@ -23,7 +25,6 @@ fontconfig-devel|libfontconfig1-dev
 libxslt-devel|libxslt1-dev
 libncurses-devel|libncurses5-dev
 libncursesw-devel|libncursesw5-dev
-libldap-devel|libldap2-dev
 libjpeg-devel|libjpeg-dev
 libjpeg|libjpeg62-turbo
 libcups-devel|libcups2-dev
@@ -145,6 +146,8 @@ libwxGTK3.0|libwxgtk2.8-0
 libwxGTK3.0-devel|libwxgtk2.8-dev
 libwxGTK3.1|libwxgtk2.8-0
 libwxGTK3.1-devel|libwxgtk2.8-dev
+libwxBase3.0|libwxbase3.0-0v5
+libwxBase3.0-devel|libwxbase3.0-dev
 libtinfo-devel|libncurses5-dev
 libtinfo|libncurses5
 terminfo|ncurses-term
@@ -400,7 +403,7 @@ libXfont-devel|libxfont-dev
 libXfont2-devel|libxfont-dev
 libXfont|libxfont2
 libXfont2|libxfont2
-libtirpc|libtirpc1
+libtirpc|libtirpc3
 libpixman|libpixman-1-0
 libpixman-devel|libpixman-1-dev
 xorg-proto-devel|x11proto-core-dev
@@ -408,6 +411,8 @@ libtxc_dxtn|
 python-module-psutil|python-psutil
 python3-module-psutil|python3-psutil
 python3-base|python3
+# TODO: autorule?
+python3-module-setuptools|python3-setuptools

 bashrc|
 libnetapi-devel|
@@ -424,6 +429,8 @@ iconv|
 #libvulkan1|
 libva|

+libunwind|libunwind8
+
 distro_info|rpm
 librpm|librpm3

@@ -438,3 +445,9 @@ p7zip|p7zip-full
 libkrb5-devel|libkrb5-dev krb5-multidev

 fonts-ttf-core|fonts-liberation
+
+libSDL2|libsdl2-2.0-0
+
+catch-devel|catch
+rpm-macros-cmake|
+ctest|cmake
--- a/share/eterbuild/pkgrepl/pkgrepl.debian.12
+++ b/share/eterbuild/pkgrepl/pkgrepl.debian.12
+libssl1.1|libssl3
+libcrypto1.1|libssl3
--- a/share/eterbuild/pkgrepl/pkgrepl.debian.9
+++ b/share/eterbuild/pkgrepl/pkgrepl.debian.9
@@ -23,5 +23,3 @@ libtiff-devel|libtiff-dev

 fonts-ttf-core|fonts-liberation2
 fonts-ttf-liberation|fonts-liberation2
-
-libtirpc|libtirpc3
--- a/share/eterbuild/pkgrepl/pkgrepl.freebsd
+++ b/share/eterbuild/pkgrepl/pkgrepl.freebsd
@@ -20,6 +20,7 @@ libjpeg|jpeg
 liblcms|lcms2
 liblcms2|lcms2
 libldap|
+libldap2|
 libpam|
 libmpg123|mpg123
 libncurses|ncurses
@@ -48,4 +49,6 @@ libhal|
 # obsoleted, needed for old wine packages
 libfontconfig|fontconfig

+libfontconfig1|fontconfig
+
 distro_info|rpm
--- a/share/eterbuild/pkgrepl/pkgrepl.gentoo
+++ b/share/eterbuild/pkgrepl/pkgrepl.gentoo
@@ -133,6 +133,7 @@ libcups-devel|cups
 libcups|cups
 libldap-devel|openldap
 libldap|openldap
+libldap2|openldap
 libtiff-devel|tiff
 libtiff5|tiff


--- a/share/eterbuild/pkgrepl/pkgrepl.mdv
+++ b/share/eterbuild/pkgrepl/pkgrepl.mdv
@@ -166,6 +166,7 @@ libdbus|libdbus-1_3

 libldap-devel|libldap2.4_2-devel
 libldap|libldap2.4_2
+libldap2|libldap2.4_2

 libxslt-devel|libxslt-devel
 libxslt|libxslt1

--- a/share/eterbuild/pkgrepl/pkgrepl.mdv.2010
+++ b/share/eterbuild/pkgrepl/pkgrepl.mdv.2010
@@ -13,6 +13,7 @@ libssl-devel|libopenssl-devel
 libXt-devel|libxt-devel
 libldap-devel|libldap2.4_2-devel
 libldap|libldap2.4_2
+libldap2|libldap2.4_2

 libsqlite3|libsqlite3_0
 #libsqlite3-devel|libsqlite3_0-devel

--- a/share/eterbuild/pkgrepl/pkgrepl.nld
+++ b/share/eterbuild/pkgrepl/pkgrepl.nld
@@ -8,6 +8,7 @@ liblcms-devel|liblcms-devel
 liblcms|liblcms
 libldap-devel|openldap2-devel
 libldap|openldap2-client
+libldap2|openldap2-client
 libsane|sane
 libsane-devel|sane
 # one package

--- a/share/eterbuild/pkgrepl/pkgrepl.pclinux
+++ b/share/eterbuild/pkgrepl/pkgrepl.pclinux
@@ -20,6 +20,7 @@ libfreetype|libfreetype6
 libfreetype-devel|libfreetype6-devel
 libldap-devel|libldap2.3_0-devel
 libldap|libldap2.3_0
+libldap2|libldap2.3_0
 libsane-devel|libsane1-devel
 libsane|libsane1
 jackit-devel|libjack-devel

--- a/share/eterbuild/pkgrepl/pkgrepl.redhat
+++ b/share/eterbuild/pkgrepl/pkgrepl.redhat
 # RedHat replacements rules
 gpm-devel|
 libungif-devel|
-libcups|cups-libs
 perl-devel|perl
--- a/share/eterbuild/pkgrepl/pkgrepl.rockylinux.8
+++ b/share/eterbuild/pkgrepl/pkgrepl.rockylinux.8
+su|coreutils-single
 coreutils|coreutils-single
 mount|util-linux-core
 patchelf|
+# TODO:
+libudev-devel|
+
--- a/share/eterbuild/pkgrepl/pkgrepl.rosa
+++ b/share/eterbuild/pkgrepl/pkgrepl.rosa
@@ -166,6 +166,7 @@ libdbus|libdbus-1_3

 libldap-devel|libldap2.4_2-devel
 libldap|libldap2.4_2
+libldap2|libldap2.4_2

 libxslt-devel|libxslt-devel
 libxslt|libxslt1

--- a/share/eterbuild/pkgrepl/pkgrepl.rosa.2021
+++ b/share/eterbuild/pkgrepl/pkgrepl.rosa.2021
@@ -7,7 +7,7 @@ libvulkan-devel|libvulkan-devel
 libvulkan1|libvulkan1

 libgtk+2-devel|libgtk+2.0-devel
-libgtk+2|libgtk+2_0
+libgtk+2|lib64gtk+2.0_0

 libgtk+3-devel|libgtk+3.0-devel
 libgtk+3|libgtk+3_0
@@ -34,6 +34,7 @@ libkrb5-devel|libkrb5-devel
 libkrb5|libkrb5_3

 libSDL2-devel|libSDL2-devel
+#libSDL2|libSDL2

 libsasl2-devel|libsasl2-devel
 libsasl2|libsasl2
@@ -67,3 +68,11 @@ libGLU|libglu1

 libGL-devel|libGL-devel
 libGL|libGL1
+
+libSDL2|libSDL2_2.0_0
+libpcap0.8|libpcap1
+libunwind|libunwind8
+
+xorg-proto-devel|x11-proto-devel
+
+libexpat-devel|libexpat-devel
--- a/share/eterbuild/pkgrepl/pkgrepl.rosafresh
+++ b/share/eterbuild/pkgrepl/pkgrepl.rosafresh
+pkgrepl.rosa
\ No newline at end of file
--- a/share/eterbuild/pkgrepl/pkgrepl.rosafresh.2011
+++ b/share/eterbuild/pkgrepl/pkgrepl.rosafresh.2011
+pkgrepl.rosa.2011
\ No newline at end of file
--- a/share/eterbuild/pkgrepl/pkgrepl.rosafresh.2012
+++ b/share/eterbuild/pkgrepl/pkgrepl.rosafresh.2012
+pkgrepl.rosa.2012
\ No newline at end of file
--- a/share/eterbuild/pkgrepl/pkgrepl.rosafresh.2014
+++ b/share/eterbuild/pkgrepl/pkgrepl.rosafresh.2014
+pkgrepl.rosa.2014
\ No newline at end of file
--- a/share/eterbuild/pkgrepl/pkgrepl.rosafresh.2021.1
+++ b/share/eterbuild/pkgrepl/pkgrepl.rosafresh.2021.1
+pkgrepl.rosa.2021
\ No newline at end of file
--- a/share/eterbuild/pkgrepl/pkgrepl.rosafresh.2021.1.x86_64-i586
+++ b/share/eterbuild/pkgrepl/pkgrepl.rosafresh.2021.1.x86_64-i586
+pkgrepl.rosa.2021.x86_64-i586
\ No newline at end of file
--- a/share/eterbuild/pkgrepl/pkgrepl.rpm
+++ b/share/eterbuild/pkgrepl/pkgrepl.rpm
 # Base replacements rules

+update-kernel|
 /proc|
 # FIXME
 makedepend|
@@ -54,7 +55,7 @@ freetype2-devel|freetype-devel
 freetype2|freetype
 libfreetype-devel|freetype-devel
 libcups-devel|cups-devel
-libcups|cups
+libcups|cups-libs
 # for rpmcs
 cups|cups
 libalsa-devel|alsa-lib-devel alsa-lib
@@ -68,6 +69,7 @@ libcapi-devel|
 prelink|
 libldap-devel|openldap-devel
 libldap|openldap
+libldap2|openldap
 liblcms-devel|lcms-devel
 liblcms|lcms
 liblcms2-devel|lcms2-devel
@@ -258,10 +260,13 @@ docbook-style-dsssl-utils|docbook-utils

 # obsoleted, needed for old wine packages
 libfontconfig|fontconfig
+# new
+libfontconfig1|fontconfig

 # TODO: сделать замену всех python-module- на просто python-
 python-module-setuptools|python-setuptools
 python-module-psutil|python2-psutil
+python3-module-psutil|python3-psutil

 python3-module-redis-py|python3-redis

@@ -304,15 +309,14 @@ iconv|
 #vkd3d-devel|rpm
 # TODO: они будут добавляться для alt и придётся отовсюду выключать
 #libfaudio-devel|
-libvulkan-devel|vulkan-loader-devel
-libvulkan1|vulkan-loader
+libvulkan-devel|vulkan-devel
+libvulkan1|vulkan
 libva|

 distro_info|rpm
 libcap-utils|libcap-ng-utils

 libjxr-devel|jxrlib-devel
-libSDL2-devel|SDL2-devel
 libsasl2-devel|cyrus-sasl-devel

 libcairo|cairo
@@ -321,3 +325,13 @@ libcairo-devel|cairo-devel
 # FIXME: unneeded and missed
 libXevie-devel|
 libXxf86misc-devel|
+
+libdbus-glib-devel|dbus-glib-devel
+libdconf-devel|dconf-devel
+librsvg-devel|librsvg2-devel
+libgtk-layer-shell-devel|gtk-layer-shell-devel|
+
+libSDL2|SDL2
+libSDL2-devel|SDL2-devel
+
+libpcap0.8|libpcap
--- a/share/eterbuild/pkgrepl/pkgrepl.rpm.x86_64-i586
+++ b/share/eterbuild/pkgrepl/pkgrepl.rpm.x86_64-i586
 wine-etersoft-devel-tools|wine32-etersoft-devel-tools
-libwine-etersoft-devel|wine32-etersoft-devel-tools
-libwine-devel|wine32-etersoft-devel-tools
\ No newline at end of file
+libwine-etersoft-devel|
+# breaks WINE@Etersoft 2.1
+#wine32-etersoft-devel-tools
+#libwine-devel|
+# breaks WINE@Etersoft 2.1
+#wine32-etersoft-devel-tools
+
+# missed internal deps, see https://bugs.etersoft.ru/show_bug.cgi?id=16241
+libgphoto2-devel|libgphoto2-devel libexif-devel
+libfreetype-devel|bzip2-devel libpng-devel brotli-devel
--- a/share/eterbuild/pkgrepl/pkgrepl.slackware
+++ b/share/eterbuild/pkgrepl/pkgrepl.slackware
@@ -46,6 +46,7 @@ libjpeg|libjpeg
 liblcms|lcms
 liblcms2|lcms2
 libldap|openldap-client
+libldap2|openldap-client
 libmpg123|mpg123
 libncursesw|
 libopenal-devel|
@@ -90,5 +91,6 @@ libtiff5|libtiff
 fontconfig-devel|fontconfig
 # obsoleted, needed for old wine packages
 libfontconfig|fontconfig
+libfontconfig1|fontconfig
 su|shadow
 libpulseaudio|pulseaudio
--- a/share/eterbuild/pkgrepl/pkgrepl.suse
+++ b/share/eterbuild/pkgrepl/pkgrepl.suse
@@ -15,6 +15,7 @@ libalsa-devel|alsa-devel
 libalsa|libasound2
 libldap-devel|openldap2-devel
 libldap|openldap2-client
+libldap2|openldap2-client
 libieee1284-devel|libieee1284
 libsane|sane-backends
 libsane-devel|sane-backends

--- a/share/eterbuild/pkgrepl/pkgrepl.ubuntu.14.04
+++ b/share/eterbuild/pkgrepl/pkgrepl.ubuntu.14.04
@@ -15,3 +15,5 @@ libgphoto2_port-12|libgphoto2-6
 libwxGTK|libwxgtk2.8-0
 libwxGTK-devel|libwxgtk2.8-dev
 nx-dev|nx-devel
+
+libXxf86misc-devel|
--- a/share/eterbuild/pkgrepl/pkgrepl.ubuntu.14.10
+++ b/share/eterbuild/pkgrepl/pkgrepl.ubuntu.14.10
-libXxf86misc-devel|
--- a/share/eterbuild/pkgrepl/pkgrepl.ubuntu.19.04
+++ b/share/eterbuild/pkgrepl/pkgrepl.ubuntu.19.04
@@ -4,7 +4,6 @@ libreadline7|libreadline8
 libreadline-devel|libreadline-dev
 libicu|libicu63
 libicu64|libicu63
-libtirpc|libtirpc3

 libncurses-devel|libncurses-dev
 libtinfo-devel|libncurses-dev

--- a/share/eterbuild/pkgrepl/pkgrepl.ubuntu.22.04
+++ b/share/eterbuild/pkgrepl/pkgrepl.ubuntu.22.04
 libldap|libldap-2.5-0
+libldap2|libldap-2.5-0
 libssl1.1|libssl3
 libcrypto1.1|libssl3