| 1 |
commit: 77f0eb0e607e1febe878b05110ea4d2dd1f93126 |
| 2 |
Author: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 29 22:12:55 2020 +0000 |
| 4 |
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 29 22:16:20 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77f0eb0e |
| 7 |
|
| 8 |
x11-wm/awesome: add LDoc version bounds to migrated ebuilds |
| 9 |
|
| 10 |
Weird things could happen if in the course of updating a system to slotted |
| 11 |
dev-lang/lua, the package manager decided to update dev-lua/ldoc AFTER |
| 12 |
updating a package using it. |
| 13 |
|
| 14 |
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> |
| 15 |
|
| 16 |
x11-wm/awesome/awesome-4.3-r100.ebuild | 8 ++++++-- |
| 17 |
x11-wm/awesome/awesome-9999.ebuild | 6 +++++- |
| 18 |
2 files changed, 11 insertions(+), 3 deletions(-) |
| 19 |
|
| 20 |
diff --git a/x11-wm/awesome/awesome-4.3-r100.ebuild b/x11-wm/awesome/awesome-4.3-r100.ebuild |
| 21 |
index 2c4b67994de..b0898a645c6 100644 |
| 22 |
--- a/x11-wm/awesome/awesome-4.3-r100.ebuild |
| 23 |
+++ b/x11-wm/awesome/awesome-4.3-r100.ebuild |
| 24 |
@@ -41,7 +41,11 @@ RDEPEND="${LUA_DEPS} |
| 25 |
" |
| 26 |
|
| 27 |
# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282 |
| 28 |
-# ldoc is used by invoking its executable, hence no need for LUA_SINGLE_USEDEP |
| 29 |
+# ldoc is used by invoking its executable, hence no need for LUA_SINGLE_USEDEP. |
| 30 |
+# On the other hand, it means that we should explicitly depend on a version |
| 31 |
+# migrated to Lua eclasses so that during the upgrade from unslotted |
| 32 |
+# to slotted dev-lang/lua, the package manager knows to emerge migrated |
| 33 |
+# ldoc before migrated awesome. |
| 34 |
DEPEND="${RDEPEND} |
| 35 |
>=app-text/asciidoc-8.4.5 |
| 36 |
app-text/xmlto |
| 37 |
@@ -50,7 +54,7 @@ DEPEND="${RDEPEND} |
| 38 |
media-gfx/imagemagick[png] |
| 39 |
>=x11-base/xcb-proto-1.5 |
| 40 |
x11-base/xorg-proto |
| 41 |
- doc? ( dev-lua/ldoc ) |
| 42 |
+ doc? ( >=dev-lua/ldoc-1.4.6-r100 ) |
| 43 |
test? ( |
| 44 |
app-shells/zsh |
| 45 |
x11-base/xorg-server[xvfb] |
| 46 |
|
| 47 |
diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild |
| 48 |
index f74884da277..13a5021a6cc 100644 |
| 49 |
--- a/x11-wm/awesome/awesome-9999.ebuild |
| 50 |
+++ b/x11-wm/awesome/awesome-9999.ebuild |
| 51 |
@@ -47,6 +47,10 @@ RDEPEND="${LUA_DEPS} |
| 52 |
|
| 53 |
# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282 |
| 54 |
# ldoc is used by invoking its executable, hence no need for LUA_SINGLE_USEDEP |
| 55 |
+# On the other hand, it means that we should explicitly depend on a version |
| 56 |
+# migrated to Lua eclasses so that during the upgrade from unslotted |
| 57 |
+# to slotted dev-lang/lua, the package manager knows to emerge migrated |
| 58 |
+# ldoc before migrated awesome. |
| 59 |
DEPEND="${RDEPEND} |
| 60 |
x11-base/xcb-proto |
| 61 |
x11-base/xorg-proto |
| 62 |
@@ -61,7 +65,7 @@ BDEPEND=" |
| 63 |
app-text/asciidoc |
| 64 |
media-gfx/imagemagick[png] |
| 65 |
virtual/pkgconfig |
| 66 |
- doc? ( dev-lua/ldoc ) |
| 67 |
+ doc? ( >=dev-lua/ldoc-1.4.6-r100 ) |
| 68 |
test? ( app-shells/zsh )" |
| 69 |
|
| 70 |
# Skip installation of README.md by einstalldocs, which leads to broken symlink |
Archives