diff options
author | Marek Szuba <marecki@gentoo.org> | 2020-12-29 22:12:55 +0000 |
---|---|---|
committer | Marek Szuba <marecki@gentoo.org> | 2020-12-29 22:16:20 +0000 |
commit | 77f0eb0e607e1febe878b05110ea4d2dd1f93126 (patch) | |
tree | 3c07a81b6f1def4674bb6ab292a972020a893a92 /x11-wm | |
parent | media-tv/v4l-utils: Don't perform clang target check in binpkgs (diff) | |
download | gentoo-77f0eb0e607e1febe878b05110ea4d2dd1f93126.tar.gz gentoo-77f0eb0e607e1febe878b05110ea4d2dd1f93126.tar.bz2 gentoo-77f0eb0e607e1febe878b05110ea4d2dd1f93126.zip |
x11-wm/awesome: add LDoc version bounds to migrated ebuilds
Weird things could happen if in the course of updating a system to slotted
dev-lang/lua, the package manager decided to update dev-lua/ldoc AFTER
updating a package using it.
Signed-off-by: Marek Szuba <marecki@gentoo.org>
Diffstat (limited to 'x11-wm')
-rw-r--r-- | x11-wm/awesome/awesome-4.3-r100.ebuild | 8 | ||||
-rw-r--r-- | x11-wm/awesome/awesome-9999.ebuild | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/x11-wm/awesome/awesome-4.3-r100.ebuild b/x11-wm/awesome/awesome-4.3-r100.ebuild index 2c4b67994de6..b0898a645c68 100644 --- a/x11-wm/awesome/awesome-4.3-r100.ebuild +++ b/x11-wm/awesome/awesome-4.3-r100.ebuild @@ -41,7 +41,11 @@ RDEPEND="${LUA_DEPS} " # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282 -# ldoc is used by invoking its executable, hence no need for LUA_SINGLE_USEDEP +# ldoc is used by invoking its executable, hence no need for LUA_SINGLE_USEDEP. +# On the other hand, it means that we should explicitly depend on a version +# migrated to Lua eclasses so that during the upgrade from unslotted +# to slotted dev-lang/lua, the package manager knows to emerge migrated +# ldoc before migrated awesome. DEPEND="${RDEPEND} >=app-text/asciidoc-8.4.5 app-text/xmlto @@ -50,7 +54,7 @@ DEPEND="${RDEPEND} media-gfx/imagemagick[png] >=x11-base/xcb-proto-1.5 x11-base/xorg-proto - doc? ( dev-lua/ldoc ) + doc? ( >=dev-lua/ldoc-1.4.6-r100 ) test? ( app-shells/zsh x11-base/xorg-server[xvfb] diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild index f74884da2777..13a5021a6cc9 100644 --- a/x11-wm/awesome/awesome-9999.ebuild +++ b/x11-wm/awesome/awesome-9999.ebuild @@ -47,6 +47,10 @@ RDEPEND="${LUA_DEPS} # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282 # ldoc is used by invoking its executable, hence no need for LUA_SINGLE_USEDEP +# On the other hand, it means that we should explicitly depend on a version +# migrated to Lua eclasses so that during the upgrade from unslotted +# to slotted dev-lang/lua, the package manager knows to emerge migrated +# ldoc before migrated awesome. DEPEND="${RDEPEND} x11-base/xcb-proto x11-base/xorg-proto @@ -61,7 +65,7 @@ BDEPEND=" app-text/asciidoc media-gfx/imagemagick[png] virtual/pkgconfig - doc? ( dev-lua/ldoc ) + doc? ( >=dev-lua/ldoc-1.4.6-r100 ) test? ( app-shells/zsh )" # Skip installation of README.md by einstalldocs, which leads to broken symlink |