commit: 192c9e77e35e91b3d03525ca5bab6d2e499e2f2c Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Wed Apr 1 21:37:03 2020 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Wed Apr 1 21:41:49 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=192c9e77
*/*: slotmove sys-libs/libunwind from SLOT=7 to SLOT=0 SLOT=7 does not mean much nowadays. Let's default to SLOT=0. Reported-by: Arfrever Frehtes Taifersar Arahesis Bug: https://bugs.gentoo.org/693250 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> app-backup/zbackup/zbackup-9999.ebuild | 4 ++-- dev-db/clickhouse/clickhouse-18.10.3-r1.ebuild | 4 ++-- dev-db/clickhouse/clickhouse-18.12.17-r1.ebuild | 4 ++-- dev-db/clickhouse/clickhouse-18.6.0-r1.ebuild | 4 ++-- dev-db/clickhouse/clickhouse-19.13.1.11-r2.ebuild | 4 ++-- dev-db/clickhouse/clickhouse-19.13.1.11-r3.ebuild | 4 ++-- dev-db/clickhouse/clickhouse-19.15.2.2.ebuild | 4 ++-- dev-db/clickhouse/clickhouse-19.5.3.8-r1.ebuild | 4 ++-- dev-db/clickhouse/clickhouse-19.9.5.36-r1.ebuild | 4 ++-- dev-lang/julia/julia-1.2.0.ebuild | 2 +- dev-lang/julia/julia-1.3.0.ebuild | 2 +- dev-lang/julia/julia-9999.ebuild | 2 +- mail-client/geary/geary-3.34.2-r3.ebuild | 2 +- mail-client/geary/geary-3.36.0.ebuild | 2 +- mail-client/geary/geary-3.36.1.ebuild | 2 +- profiles/updates/1Q-2020 | 1 + sys-libs/libunwind/libunwind-1.2.1-r3.ebuild | 2 +- sys-libs/libunwind/libunwind-1.3.1.ebuild | 2 +- 18 files changed, 27 insertions(+), 26 deletions(-) diff --git a/app-backup/zbackup/zbackup-9999.ebuild b/app-backup/zbackup/zbackup-9999.ebuild index 7b648c0e2b3..864251576a5 100644 --- a/app-backup/zbackup/zbackup-9999.ebuild +++ b/app-backup/zbackup/zbackup-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,7 +18,7 @@ IUSE="libressl tartool" DEPEND="app-arch/lzma dev-libs/lzo:2 dev-libs/protobuf:0= - sys-libs/libunwind:7 + sys-libs/libunwind:0 sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )" diff --git a/dev-db/clickhouse/clickhouse-18.10.3-r1.ebuild b/dev-db/clickhouse/clickhouse-18.10.3-r1.ebuild index 1b7533460cc..351b11c198b 100644 --- a/dev-db/clickhouse/clickhouse-18.10.3-r1.ebuild +++ b/dev-db/clickhouse/clickhouse-18.10.3-r1.ebuild @@ -42,7 +42,7 @@ RDEPEND=" dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 - sys-libs/libunwind:7 + sys-libs/libunwind:0 sys-libs/zlib || ( dev-db/unixODBC @@ -72,7 +72,7 @@ DEPEND="${RDEPEND} ) dev-libs/capnproto[static-libs] dev-libs/libltdl[static-libs] - sys-libs/libunwind:7[static-libs] + sys-libs/libunwind:0[static-libs] sys-libs/zlib[static-libs] || ( dev-db/unixODBC[static-libs] diff --git a/dev-db/clickhouse/clickhouse-18.12.17-r1.ebuild b/dev-db/clickhouse/clickhouse-18.12.17-r1.ebuild index 9e1192a2d42..fa18cc2e59f 100644 --- a/dev-db/clickhouse/clickhouse-18.12.17-r1.ebuild +++ b/dev-db/clickhouse/clickhouse-18.12.17-r1.ebuild @@ -42,7 +42,7 @@ RDEPEND=" dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 - sys-libs/libunwind:7 + sys-libs/libunwind:0 sys-libs/zlib || ( dev-db/unixODBC @@ -71,7 +71,7 @@ DEPEND="${RDEPEND} ) dev-libs/capnproto[static-libs] dev-libs/libltdl[static-libs] - sys-libs/libunwind:7[static-libs] + sys-libs/libunwind:0[static-libs] sys-libs/zlib[static-libs] || ( dev-db/unixODBC[static-libs] diff --git a/dev-db/clickhouse/clickhouse-18.6.0-r1.ebuild b/dev-db/clickhouse/clickhouse-18.6.0-r1.ebuild index e719a41a88a..f5c30296ab3 100644 --- a/dev-db/clickhouse/clickhouse-18.6.0-r1.ebuild +++ b/dev-db/clickhouse/clickhouse-18.6.0-r1.ebuild @@ -43,7 +43,7 @@ RDEPEND=" dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 - sys-libs/libunwind:7 + sys-libs/libunwind:0 sys-libs/zlib || ( dev-db/unixODBC @@ -73,7 +73,7 @@ DEPEND="${RDEPEND} ) dev-libs/capnproto[static-libs] dev-libs/libltdl[static-libs] - sys-libs/libunwind:7[static-libs] + sys-libs/libunwind:0[static-libs] sys-libs/zlib[static-libs] || ( dev-db/unixODBC[static-libs] diff --git a/dev-db/clickhouse/clickhouse-19.13.1.11-r2.ebuild b/dev-db/clickhouse/clickhouse-19.13.1.11-r2.ebuild index 7312dabfc20..0184d7fe5a7 100644 --- a/dev-db/clickhouse/clickhouse-19.13.1.11-r2.ebuild +++ b/dev-db/clickhouse/clickhouse-19.13.1.11-r2.ebuild @@ -42,7 +42,7 @@ RDEPEND=" dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 - sys-libs/libunwind:7 + sys-libs/libunwind:0 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= @@ -70,7 +70,7 @@ DEPEND="${RDEPEND} ) dev-libs/capnproto[static-libs] dev-libs/libltdl[static-libs] - sys-libs/libunwind:7[static-libs] + sys-libs/libunwind:0[static-libs] sys-libs/zlib[static-libs] || ( dev-db/unixODBC[static-libs] diff --git a/dev-db/clickhouse/clickhouse-19.13.1.11-r3.ebuild b/dev-db/clickhouse/clickhouse-19.13.1.11-r3.ebuild index c000b8b3778..aafc89dc781 100644 --- a/dev-db/clickhouse/clickhouse-19.13.1.11-r3.ebuild +++ b/dev-db/clickhouse/clickhouse-19.13.1.11-r3.ebuild @@ -42,7 +42,7 @@ RDEPEND=" dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 - sys-libs/libunwind:7 + sys-libs/libunwind:0 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= @@ -70,7 +70,7 @@ DEPEND="${RDEPEND} ) dev-libs/capnproto[static-libs] dev-libs/libltdl[static-libs] - sys-libs/libunwind:7[static-libs] + sys-libs/libunwind:0[static-libs] sys-libs/zlib[static-libs] || ( dev-db/unixODBC[static-libs] diff --git a/dev-db/clickhouse/clickhouse-19.15.2.2.ebuild b/dev-db/clickhouse/clickhouse-19.15.2.2.ebuild index e7161a38d1c..22b038f2ebd 100644 --- a/dev-db/clickhouse/clickhouse-19.15.2.2.ebuild +++ b/dev-db/clickhouse/clickhouse-19.15.2.2.ebuild @@ -42,7 +42,7 @@ RDEPEND=" dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 - sys-libs/libunwind:7 + sys-libs/libunwind:0 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= @@ -71,7 +71,7 @@ DEPEND="${RDEPEND} ) dev-libs/capnproto[static-libs] dev-libs/libltdl[static-libs] - sys-libs/libunwind:7[static-libs] + sys-libs/libunwind:0[static-libs] sys-libs/zlib[static-libs] || ( dev-db/unixODBC[static-libs] diff --git a/dev-db/clickhouse/clickhouse-19.5.3.8-r1.ebuild b/dev-db/clickhouse/clickhouse-19.5.3.8-r1.ebuild index 7219e35cdb1..80e66a29108 100644 --- a/dev-db/clickhouse/clickhouse-19.5.3.8-r1.ebuild +++ b/dev-db/clickhouse/clickhouse-19.5.3.8-r1.ebuild @@ -42,7 +42,7 @@ RDEPEND=" dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 - sys-libs/libunwind:7 + sys-libs/libunwind:0 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= @@ -69,7 +69,7 @@ DEPEND="${RDEPEND} ) dev-libs/capnproto[static-libs] dev-libs/libltdl[static-libs] - sys-libs/libunwind:7[static-libs] + sys-libs/libunwind:0[static-libs] sys-libs/zlib[static-libs] || ( dev-db/unixODBC[static-libs] diff --git a/dev-db/clickhouse/clickhouse-19.9.5.36-r1.ebuild b/dev-db/clickhouse/clickhouse-19.9.5.36-r1.ebuild index 7219e35cdb1..80e66a29108 100644 --- a/dev-db/clickhouse/clickhouse-19.9.5.36-r1.ebuild +++ b/dev-db/clickhouse/clickhouse-19.9.5.36-r1.ebuild @@ -42,7 +42,7 @@ RDEPEND=" dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 - sys-libs/libunwind:7 + sys-libs/libunwind:0 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= @@ -69,7 +69,7 @@ DEPEND="${RDEPEND} ) dev-libs/capnproto[static-libs] dev-libs/libltdl[static-libs] - sys-libs/libunwind:7[static-libs] + sys-libs/libunwind:0[static-libs] sys-libs/zlib[static-libs] || ( dev-db/unixODBC[static-libs] diff --git a/dev-lang/julia/julia-1.2.0.ebuild b/dev-lang/julia/julia-1.2.0.ebuild index 3c91154427a..cf072ca65b3 100644 --- a/dev-lang/julia/julia-1.2.0.ebuild +++ b/dev-lang/julia/julia-1.2.0.ebuild @@ -48,7 +48,7 @@ RDEPEND+=" sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= - >=sys-libs/libunwind-1.1:7= + >=sys-libs/libunwind-1.1:0= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 diff --git a/dev-lang/julia/julia-1.3.0.ebuild b/dev-lang/julia/julia-1.3.0.ebuild index e77a1b9a14e..86daa027e05 100644 --- a/dev-lang/julia/julia-1.3.0.ebuild +++ b/dev-lang/julia/julia-1.3.0.ebuild @@ -49,7 +49,7 @@ RDEPEND+=" sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= - >=sys-libs/libunwind-1.1:7= + >=sys-libs/libunwind-1.1:0= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild index 384659ad6da..fc5eddd7e62 100644 --- a/dev-lang/julia/julia-9999.ebuild +++ b/dev-lang/julia/julia-9999.ebuild @@ -39,7 +39,7 @@ RDEPEND+=" sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= - >=sys-libs/libunwind-1.1:7= + >=sys-libs/libunwind-1.1:0= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 diff --git a/mail-client/geary/geary-3.34.2-r3.ebuild b/mail-client/geary/geary-3.34.2-r3.ebuild index fae66e3a724..60b47844977 100644 --- a/mail-client/geary/geary-3.34.2-r3.ebuild +++ b/mail-client/geary/geary-3.34.2-r3.ebuild @@ -42,7 +42,7 @@ DEPEND=" >=gui-libs/libhandy-0.0.9:0.0= >=app-crypt/libsecret-0.11 >=net-libs/libsoup-2.48:2.4 - >=sys-libs/libunwind-1.1:7 + >=sys-libs/libunwind-1.1:0 >=dev-libs/libxml2-2.7.8:2 ytnef? ( >=net-mail/ytnef-1.9.3 ) " diff --git a/mail-client/geary/geary-3.36.0.ebuild b/mail-client/geary/geary-3.36.0.ebuild index 17409d7cf55..53757eb7516 100644 --- a/mail-client/geary/geary-3.36.0.ebuild +++ b/mail-client/geary/geary-3.36.0.ebuild @@ -38,7 +38,7 @@ DEPEND=" >=dev-libs/libpeas-1.24.0 >=app-crypt/libsecret-0.11 >=net-libs/libsoup-2.48:2.4 - >=sys-libs/libunwind-1.1:7 + >=sys-libs/libunwind-1.1:0 >=dev-libs/libxml2-2.7.8:2 ytnef? ( >=net-mail/ytnef-1.9.3 ) " diff --git a/mail-client/geary/geary-3.36.1.ebuild b/mail-client/geary/geary-3.36.1.ebuild index 17409d7cf55..53757eb7516 100644 --- a/mail-client/geary/geary-3.36.1.ebuild +++ b/mail-client/geary/geary-3.36.1.ebuild @@ -38,7 +38,7 @@ DEPEND=" >=dev-libs/libpeas-1.24.0 >=app-crypt/libsecret-0.11 >=net-libs/libsoup-2.48:2.4 - >=sys-libs/libunwind-1.1:7 + >=sys-libs/libunwind-1.1:0 >=dev-libs/libxml2-2.7.8:2 ytnef? ( >=net-mail/ytnef-1.9.3 ) " diff --git a/profiles/updates/1Q-2020 b/profiles/updates/1Q-2020 index ebc4ddf2c9b..f08a8319dd1 100644 --- a/profiles/updates/1Q-2020 +++ b/profiles/updates/1Q-2020 @@ -11,3 +11,4 @@ move dev-python/git-python dev-python/GitPython move www-servers/automx2 net-mail/automx2 move dev-python/pysnmp-apps net-analyzer/snmpclitools move net-im/slack-bin net-im/slack +slotmove sys-libs/libunwind 7 0 diff --git a/sys-libs/libunwind/libunwind-1.2.1-r3.ebuild b/sys-libs/libunwind/libunwind-1.2.1-r3.ebuild index 9482711db4d..2a393c6232e 100644 --- a/sys-libs/libunwind/libunwind-1.2.1-r3.ebuild +++ b/sys-libs/libunwind/libunwind-1.2.1-r3.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://savannah.nongnu.org/projects/libunwind"; SRC_URI="mirror://nongnu/libunwind/${MY_P}.tar.gz" LICENSE="MIT" -SLOT="7" +SLOT="0" KEYWORDS="amd64 arm arm64 hppa ia64 ~mips ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux" IUSE="debug debug-frame doc libatomic lzma +static-libs" diff --git a/sys-libs/libunwind/libunwind-1.3.1.ebuild b/sys-libs/libunwind/libunwind-1.3.1.ebuild index 908da4b4c86..94aac72ea36 100644 --- a/sys-libs/libunwind/libunwind-1.3.1.ebuild +++ b/sys-libs/libunwind/libunwind-1.3.1.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://savannah.nongnu.org/projects/libunwind"; SRC_URI="mirror://nongnu/libunwind/${MY_P}.tar.gz" LICENSE="MIT" -SLOT="7/8" # it should be a "0/8" where '8' is libunwind.so.8 +SLOT="0/8" # libunwind.so.8 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux" IUSE="debug debug-frame doc libatomic lzma +static-libs"
