1 |
commit: fb574fa21e6a0c2ff3cdca7313c6b7ca431507c2 |
2 |
Author: Matthias Coppens <coppens.matthias.abc <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Sep 10 11:43:14 2020 +0000 |
4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
5 |
CommitDate: Thu Sep 10 12:15:25 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fb574fa2 |
7 |
|
8 |
gui-apps/wdisplays: Port patch to 9999 |
9 |
|
10 |
Port patch for version 1.0 to the live ebuild, I thought upstream |
11 |
would've pulled the PR already. |
12 |
Add GitHub link to HOMEPAGE. |
13 |
Fixed style to recommendations for proxy-maint ebuilds. |
14 |
|
15 |
Package-Manager: Portage-3.0.6, Repoman-3.0.1 |
16 |
Signed-off-by: Matthias Coppens <coppens.matthias.abc <AT> gmail.com> |
17 |
|
18 |
gui-apps/wdisplays/wdisplays-1.0-r2.ebuild | 21 ++++++++++----------- |
19 |
gui-apps/wdisplays/wdisplays-9999.ebuild | 21 +++++++++++---------- |
20 |
2 files changed, 21 insertions(+), 21 deletions(-) |
21 |
|
22 |
diff --git a/gui-apps/wdisplays/wdisplays-1.0-r2.ebuild b/gui-apps/wdisplays/wdisplays-1.0-r2.ebuild |
23 |
index f77ab59f..3959f430 100644 |
24 |
--- a/gui-apps/wdisplays/wdisplays-1.0-r2.ebuild |
25 |
+++ b/gui-apps/wdisplays/wdisplays-1.0-r2.ebuild |
26 |
@@ -3,19 +3,18 @@ |
27 |
|
28 |
EAPI=7 |
29 |
|
30 |
-EGIT_REPO_URI="https://github.com/cyclopsian/${PN}" |
31 |
-case "${PV}" in |
32 |
- "9999") |
33 |
- inherit git-r3 |
34 |
- ;; |
35 |
- *) |
36 |
- SRC_URI="${EGIT_REPO_URI}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
37 |
- KEYWORDS="~amd64" |
38 |
-esac |
39 |
+if [[ "${PV}" == 9999 ]] |
40 |
+then |
41 |
+ inherit git-r3 |
42 |
+ EGIT_REPO_URI="https://github.com/cyclopsian/wdisplays.git" |
43 |
+else |
44 |
+ SRC_URI="https://github.com/cyclopsian/wdisplays/archive/${PV}.tar.gz -> ${P}.tar.gz" |
45 |
+ KEYWORDS="~amd64" |
46 |
+fi |
47 |
inherit meson xdg |
48 |
|
49 |
DESCRIPTION="GUI display configurator for wlroots compositors" |
50 |
-HOMEPAGE="https://cyclopsian.github.io/${PN}" |
51 |
+HOMEPAGE="https://cyclopsian.github.io/wdisplays https://github.com/cyclopsian/wdisplays" |
52 |
|
53 |
BDEPEND=" |
54 |
x11-libs/gtk+:3[wayland] |
55 |
@@ -25,4 +24,4 @@ DEPEND="${BDEPEND}" |
56 |
LICENSE="GPL-3+" |
57 |
SLOT="0" |
58 |
|
59 |
-PATCHES=("${FILESDIR}/${P}-pull20.patch") |
60 |
+PATCHES=("${FILESDIR}/${PN}-1.0-pull20.patch") |
61 |
|
62 |
diff --git a/gui-apps/wdisplays/wdisplays-9999.ebuild b/gui-apps/wdisplays/wdisplays-9999.ebuild |
63 |
index e277e11a..3959f430 100644 |
64 |
--- a/gui-apps/wdisplays/wdisplays-9999.ebuild |
65 |
+++ b/gui-apps/wdisplays/wdisplays-9999.ebuild |
66 |
@@ -3,19 +3,18 @@ |
67 |
|
68 |
EAPI=7 |
69 |
|
70 |
-EGIT_REPO_URI="https://github.com/cyclopsian/${PN}" |
71 |
-case "${PV}" in |
72 |
- "9999") |
73 |
- inherit git-r3 |
74 |
- ;; |
75 |
- *) |
76 |
- SRC_URI="${EGIT_REPO_URI}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
77 |
- KEYWORDS="~amd64" |
78 |
-esac |
79 |
+if [[ "${PV}" == 9999 ]] |
80 |
+then |
81 |
+ inherit git-r3 |
82 |
+ EGIT_REPO_URI="https://github.com/cyclopsian/wdisplays.git" |
83 |
+else |
84 |
+ SRC_URI="https://github.com/cyclopsian/wdisplays/archive/${PV}.tar.gz -> ${P}.tar.gz" |
85 |
+ KEYWORDS="~amd64" |
86 |
+fi |
87 |
inherit meson xdg |
88 |
|
89 |
DESCRIPTION="GUI display configurator for wlroots compositors" |
90 |
-HOMEPAGE="https://cyclopsian.github.io/${PN}" |
91 |
+HOMEPAGE="https://cyclopsian.github.io/wdisplays https://github.com/cyclopsian/wdisplays" |
92 |
|
93 |
BDEPEND=" |
94 |
x11-libs/gtk+:3[wayland] |
95 |
@@ -24,3 +23,5 @@ DEPEND="${BDEPEND}" |
96 |
|
97 |
LICENSE="GPL-3+" |
98 |
SLOT="0" |
99 |
+ |
100 |
+PATCHES=("${FILESDIR}/${PN}-1.0-pull20.patch") |