[gentoo-commits] repo/gentoo:master commit in: x11-wm/awesome/

["Marek Szuba" <marecki@gentoo.org>]

commit:     77f0eb0e607e1febe878b05110ea4d2dd1f93126
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 29 22:12:55 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Dec 29 22:16:20 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77f0eb0e

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 <AT> gentoo.org>

 x11-wm/awesome/awesome-4.3-r100.ebuild | 8 ++++++--
 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 2c4b67994de..b0898a645c6 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 f74884da277..13a5021a6cc 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