From a9b102b2eb13a04aeb7be8e3433945b592bd0054 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 29 Jan 2024 17:11:48 +0100 Subject: [PATCH] overlay: Update to use new package names --- ...{coreos-dev-0.1.0-r84.ebuild => coreos-dev-0.1.0-r85.ebuild} | 0 .../coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild | 2 +- .../{coreos-0.0.1-r310.ebuild => coreos-0.0.1-r311.ebuild} | 0 .../coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild | 2 +- ...ds-0.0.1-r208.ebuild => hard-host-depends-0.0.1-r209.ebuild} | 0 .../hard-host-depends/hard-host-depends-0.0.1.ebuild | 2 +- .../{dbus-glib-0.112.ebuild => dbus-glib-0.112-r1.ebuild} | 2 +- .../{openssh-9.6_p1-r1.ebuild => openssh-9.6_p1-r2.ebuild} | 2 +- .../dbus/{dbus-1.14.4-r1.ebuild => dbus-1.14.4-r2.ebuild} | 2 +- .../sssd/{sssd-2.3.1-r5.ebuild => sssd-2.3.1-r6.ebuild} | 2 +- .../lvm2/{lvm2-2.02.188-r2.ebuild => lvm2-2.02.188-r3.ebuild} | 2 +- 11 files changed, 8 insertions(+), 8 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/{coreos-dev-0.1.0-r84.ebuild => coreos-dev-0.1.0-r85.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/{coreos-0.0.1-r310.ebuild => coreos-0.0.1-r311.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/{hard-host-depends-0.0.1-r208.ebuild => hard-host-depends-0.0.1-r209.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/{dbus-glib-0.112.ebuild => dbus-glib-0.112-r1.ebuild} (98%) rename sdk_container/src/third_party/coreos-overlay/net-misc/openssh/{openssh-9.6_p1-r1.ebuild => openssh-9.6_p1-r2.ebuild} (99%) rename sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/{dbus-1.14.4-r1.ebuild => dbus-1.14.4-r2.ebuild} (99%) rename sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/{sssd-2.3.1-r5.ebuild => sssd-2.3.1-r6.ebuild} (99%) rename sdk_container/src/third_party/coreos-overlay/sys-fs/lvm2/{lvm2-2.02.188-r2.ebuild => lvm2-2.02.188-r3.ebuild} (99%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r84.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r85.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r84.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r85.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild index c2e71d89de..3c16138144 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild @@ -20,9 +20,9 @@ RDEPEND=" coreos-base/coreos coreos-base/emerge-gitclone dev-debug/gdb + dev-debug/strace dev-lang/python dev-util/pahole - dev-util/strace dev-vcs/repo net-analyzer/netperf net-analyzer/traceroute diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r310.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r311.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r310.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r311.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild index 67d4fc6e02..3303cdd5ee 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild @@ -117,11 +117,11 @@ RDEPEND="${RDEPEND} coreos-base/update_engine coreos-base/ue-rs dev-db/etcdctl + dev-debug/strace dev-libs/libsodium dev-libs/openssl dev-util/bpftool dev-util/bsdiff - dev-util/strace dev-vcs/git net-analyzer/nmap net-analyzer/tcpdump diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r208.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r209.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r208.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r209.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild index e41c79f34e..88ff97adb1 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild @@ -34,6 +34,7 @@ RDEPEND="${RDEPEND} app-emulation/qemu app-text/asciidoc app-text/xmlto + dev-build/gtk-doc-am dev-lang/go-bootstrap dev-lang/go:1.19 dev-lang/go:1.20 @@ -55,7 +56,6 @@ RDEPEND="${RDEPEND} dev-python/wheel dev-util/gdbus-codegen dev-util/gperf - >=dev-util/gtk-doc-am-1.13 dev-util/patchutils >=dev-vcs/git-1.7.2 net-libs/libtirpc diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/dbus-glib-0.112.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/dbus-glib-0.112-r1.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/dbus-glib-0.112.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/dbus-glib-0.112-r1.ebuild index 248dee046e..78482ec9d6 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/dbus-glib-0.112.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/dbus-glib-0.112-r1.ebuild @@ -22,11 +22,11 @@ DEPEND=" " RDEPEND="${DEPEND}" BDEPEND=" + dev-build/gtk-doc-am >=dev-libs/expat-2.1.0-r3 >=dev-libs/glib-2.40:2 >=sys-apps/dbus-1.8 >=dev-util/glib-utils-2.40 - >=dev-util/gtk-doc-am-1.14 virtual/pkgconfig " # CBUILD dependencies are needed to make a native tool while cross-compiling. diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/openssh-9.6_p1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/openssh-9.6_p1-r2.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/net-misc/openssh/openssh-9.6_p1-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/net-misc/openssh/openssh-9.6_p1-r2.ebuild index eb005b627f..4d5e606146 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/openssh-9.6_p1-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/openssh-9.6_p1-r2.ebuild @@ -72,7 +72,7 @@ RDEPEND=" " # Weird dep construct for newer gcc-config for bug #872416 BDEPEND=" - sys-devel/autoconf + dev-build/autoconf virtual/pkgconfig || ( >=sys-devel/gcc-config-2.6 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.14.4-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.14.4-r2.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.14.4-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.14.4-r2.ebuild index 71a4c75bba..6be19d7913 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.14.4-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.14.4-r2.ebuild @@ -28,7 +28,7 @@ BDEPEND=" acct-user/messagebus app-text/xmlto app-text/docbook-xml-dtd:4.4 - sys-devel/autoconf-archive + dev-build/autoconf-archive virtual/pkgconfig doc? ( app-doc/doxygen ) " diff --git a/sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/sssd-2.3.1-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/sssd-2.3.1-r6.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/sssd-2.3.1-r5.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/sssd-2.3.1-r6.ebuild index ea87f1b4ba..8b21a46318 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/sssd-2.3.1-r5.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/sssd-2.3.1-r6.ebuild @@ -80,7 +80,7 @@ RDEPEND="${DEPEND} " # Flatcar: require only autoconf:2.69 BDEPEND=" - sys-devel/autoconf:2.69 + dev-build/autoconf:2.69 doc? ( app-doc/doxygen ) test? ( dev-libs/check diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-fs/lvm2/lvm2-2.02.188-r3.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-fs/lvm2/lvm2-2.02.188-r3.ebuild index 4a646e65df..b8d46580a6 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/lvm2/lvm2-2.02.188-r3.ebuild @@ -46,7 +46,7 @@ DEPEND="${DEPEND_COMMON} >=sys-apps/util-linux-2.16[static-libs] )" BDEPEND=" - sys-devel/autoconf-archive + dev-build/autoconf-archive virtual/pkgconfig "