Gentoo Archives: gentoo-commits

From: Marek Szuba <marecki@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, x11-misc/devilspie2/, x11-misc/devilspie2/files/
Date: Sun, 29 Nov 2020 19:42:21
Message-Id: 1606678922.f69df3c1e7978b9bdca93b194a898d5baf239a2c.marecki@gentoo
1 commit: f69df3c1e7978b9bdca93b194a898d5baf239a2c
2 Author: Ionen Wolkens <sudinave <AT> gmail <DOT> com>
3 AuthorDate: Thu Nov 5 14:46:50 2020 +0000
4 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 29 19:42:02 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f69df3c1
7
8 x11-misc/devilspie2: port to lua-single eclass
9
10 With some cosmetic changes made and package.mask entry added by Marek
11 Szuba at merge time.
12
13 Closes: https://bugs.gentoo.org/752885
14 Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
15 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
16
17 profiles/package.mask | 1 +
18 x11-misc/devilspie2/devilspie2-0.43-r100.ebuild | 48 ++++++++++++++++++++++
19 .../files/devilspie2-0.43-lua-pkgconfig.patch | 12 ++++++
20 3 files changed, 61 insertions(+)
21
22 diff --git a/profiles/package.mask b/profiles/package.mask
23 index 1f8a52a3556..772346c25fa 100644
24 --- a/profiles/package.mask
25 +++ b/profiles/package.mask
26 @@ -567,6 +567,7 @@ dev-lua/luacrypto
27 >=www-client/elinks-0.13.5-r100
28 >=www-client/luakit-2.2.1-r100
29 >=www-servers/lighttpd-1.4.55-r100
30 +>=x11-misc/devilspie2-0.43-r100
31 >=dev-lua/lpeg-1.0.2-r100
32 >=dev-lua/lgi-0.9.2-r100
33
34
35 diff --git a/x11-misc/devilspie2/devilspie2-0.43-r100.ebuild b/x11-misc/devilspie2/devilspie2-0.43-r100.ebuild
36 new file mode 100644
37 index 00000000000..e9c87f823d3
38 --- /dev/null
39 +++ b/x11-misc/devilspie2/devilspie2-0.43-r100.ebuild
40 @@ -0,0 +1,48 @@
41 +# Copyright 1999-2020 Gentoo Authors
42 +# Distributed under the terms of the GNU General Public License v2
43 +
44 +EAPI=7
45 +
46 +LUA_COMPAT=( lua5-{1..3} luajit )
47 +PLOCALES="fi fr it ja nl pt_BR ru sv"
48 +
49 +inherit lua-single toolchain-funcs l10n
50 +
51 +DESCRIPTION="Devilspie like window matching utility, using LUA for scripting"
52 +HOMEPAGE="https://www.nongnu.org/devilspie2/"
53 +SRC_URI="https://download.savannah.gnu.org/releases/devilspie2/devilspie2_${PV}-src.tar.gz"
54 +
55 +LICENSE="GPL-3"
56 +SLOT="0"
57 +KEYWORDS="~amd64 ~x86"
58 +REQUIRED_USE="${LUA_REQUIRED_USE}"
59 +
60 +RDEPEND="
61 + ${LUA_DEPS}
62 + >=dev-libs/glib-2.32.4:2
63 + >=x11-libs/gtk+-3.4.4:3
64 + >=x11-libs/libwnck-3.4.4:3
65 + x11-libs/libX11
66 +"
67 +DEPEND="
68 + ${RDEPEND}
69 + x11-base/xorg-proto
70 +"
71 +BDEPEND="
72 + sys-devel/gettext
73 + virtual/pkgconfig
74 +"
75 +
76 +PATCHES=(
77 + "${FILESDIR}/${PN}-0.43-lua-pkgconfig.patch"
78 +)
79 +
80 +src_compile() {
81 + emake CC="$(tc-getCC)" PREFIX="/usr" LANGUAGES="$(l10n_get_locales)"
82 +}
83 +
84 +src_install() {
85 + emake PREFIX="/usr" DESTDIR="${ED}" LANGUAGES="$(l10n_get_locales)" install
86 + einstalldocs
87 + doman devilspie2.1
88 +}
89
90 diff --git a/x11-misc/devilspie2/files/devilspie2-0.43-lua-pkgconfig.patch b/x11-misc/devilspie2/files/devilspie2-0.43-lua-pkgconfig.patch
91 new file mode 100644
92 index 00000000000..89c74d0bbb4
93 --- /dev/null
94 +++ b/x11-misc/devilspie2/files/devilspie2-0.43-lua-pkgconfig.patch
95 @@ -0,0 +1,12 @@
96 +--- a/Makefile
97 ++++ b/Makefile
98 +@@ -60,7 +60,7 @@
99 + endif
100 +
101 +-LIB_CFLAGS=$(shell pkg-config --cflags --silence-errors $(PKG_GTK) $(PKG_WNCK) lua5.1 || pkg-config --cflags $(PKG_GTK) $(PKG_WNCK) lua)
102 ++LIB_CFLAGS=$(shell pkg-config --cflags $(PKG_GTK) $(PKG_WNCK) lua)
103 + STD_LDFLAGS=
104 +-LIBS=-lX11 $(shell pkg-config --libs --silence-errors $(PKG_GTK) $(PKG_WNCK) lua5.1 || pkg-config --libs $(PKG_GTK) $(PKG_WNCK) lua)
105 ++LIBS=-lX11 $(shell pkg-config --libs $(PKG_GTK) $(PKG_WNCK) lua)
106 +
107 + LOCAL_CFLAGS=$(STD_CFLAGS) $(DEPRECATED) $(CFLAGS) $(LIB_CFLAGS)