Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/sway/
Date: Thu, 29 Dec 2016 12:56:53
Message-Id: 1483016164.aabb6d470cc680507d7ed5f15c6e1abb3872718c.soap@gentoo
1 commit: aabb6d470cc680507d7ed5f15c6e1abb3872718c
2 Author: Mykyta Holubakha <hilobakho <AT> gmail <DOT> com>
3 AuthorDate: Wed Dec 28 00:53:24 2016 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 29 12:56:04 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aabb6d47
7
8 dev-libs/sway: revbump to 0.11-r1
9
10 fix default LD_LIBRARY_PATH set for prefix support
11 Closes: https://github.com/gentoo/gentoo/pull/3258
12
13 dev-libs/sway/{sway-0.11.ebuild => sway-0.11-r1.ebuild} | 3 ++-
14 dev-libs/sway/sway-9999.ebuild | 3 ++-
15 2 files changed, 4 insertions(+), 2 deletions(-)
16
17 diff --git a/dev-libs/sway/sway-0.11.ebuild b/dev-libs/sway/sway-0.11-r1.ebuild
18 similarity index 96%
19 rename from dev-libs/sway/sway-0.11.ebuild
20 rename to dev-libs/sway/sway-0.11-r1.ebuild
21 index a52e617..3ca3576 100644
22 --- a/dev-libs/sway/sway-0.11.ebuild
23 +++ b/dev-libs/sway/sway-0.11-r1.ebuild
24 @@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
25 app-text/asciidoc"
26
27 src_prepare() {
28 - default
29 + cmake-utils_src_prepare
30
31 # remove bad CFLAGS that upstream is trying to add
32 sed -i -e '/FLAGS.*-Werror/d' CMakeLists.txt || die
33 @@ -53,6 +53,7 @@ src_configure() {
34 -Dzsh-completions=$(usex zsh-completion)
35
36 -DCMAKE_INSTALL_SYSCONFDIR="/etc"
37 + -DLD_LIBRARY_PATH="${EPREFIX}/usr/lib"
38 )
39
40 cmake-utils_src_configure
41
42 diff --git a/dev-libs/sway/sway-9999.ebuild b/dev-libs/sway/sway-9999.ebuild
43 index c68703d..9e9acbc 100644
44 --- a/dev-libs/sway/sway-9999.ebuild
45 +++ b/dev-libs/sway/sway-9999.ebuild
46 @@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
47 app-text/asciidoc"
48
49 src_prepare() {
50 - default
51 + cmake-utils_src_prepare
52
53 # remove bad CFLAGS that upstream is trying to add
54 sed -i -e '/FLAGS.*-Werror/d' CMakeLists.txt || die
55 @@ -53,6 +53,7 @@ src_configure() {
56 -Dzsh-completions=$(usex zsh-completion)
57
58 -DCMAKE_INSTALL_SYSCONFDIR="/etc"
59 + -DLD_LIBRARY_PATH="${EPREFIX}/usr/lib"
60 )
61
62 cmake-utils_src_configure