* [gentoo-commits] repo/gentoo:master commit in: dev-libs/swaylock/
@ 2019-02-09 2:23 Matthew Thode
0 siblings, 0 replies; 3+ messages in thread
From: Matthew Thode @ 2019-02-09 2:23 UTC (permalink / raw
To: gentoo-commits
commit: e8909f160eb2030fb69374795f70a93c6686f34a
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 9 01:13:09 2019 +0000
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Feb 9 02:22:54 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8909f16
dev-libs/swaylock: initial add
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
dev-libs/swaylock/Manifest | 1 +
dev-libs/swaylock/metadata.xml | 15 ++++++++++++
dev-libs/swaylock/swaylock-1.3.ebuild | 46 +++++++++++++++++++++++++++++++++++
3 files changed, 62 insertions(+)
diff --git a/dev-libs/swaylock/Manifest b/dev-libs/swaylock/Manifest
new file mode 100644
index 00000000000..ee04cb54cde
--- /dev/null
+++ b/dev-libs/swaylock/Manifest
@@ -0,0 +1 @@
+DIST swaylock-1.3.tar.gz 32848 BLAKE2B 81ed50839bcb0139e7fc2081bd37e738f3e6ef23e96a5108d1acf56cc3425285f7382576a54201f1bf188883b1da06492074c091877af13832c0140e4e6099fd SHA512 723d758d76f076f3f1539ea0d651f6ad2562659c72eef7e895d7827a0be21db663652fe4ce2609065aff45ff20230879599868cff327ab52b896330ca04d78c4
diff --git a/dev-libs/swaylock/metadata.xml b/dev-libs/swaylock/metadata.xml
new file mode 100644
index 00000000000..4155370f2f7
--- /dev/null
+++ b/dev-libs/swaylock/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>prometheanfire@gentoo.org</email>
+ <name>Matthew Thode</name>
+ </maintainer>
+ <longdescription lang="en">
+ Swaylock is a screen locking utility for Wayland compositors.
+ </longdescription>
+ <use>
+ <flag name="gdk-pixbuf">Enable additional image format support via the <pkg>x11-libs/gdk-pixbuf</pkg> library</flag>
+ <flag name="fish-completion">Enable fish completion support</flag>
+ </use>
+</pkgmetadata>
diff --git a/dev-libs/swaylock/swaylock-1.3.ebuild b/dev-libs/swaylock/swaylock-1.3.ebuild
new file mode 100644
index 00000000000..c6e0258c8c5
--- /dev/null
+++ b/dev-libs/swaylock/swaylock-1.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps meson
+
+DESCRIPTION="Screen locker for Wayland"
+HOMEPAGE="https://github.com/swaywm/swaylock"
+SRC_URI="https://github.com/swaywm/swaylock/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+pam +gdk-pixbuf zsh-completion bash-completion fish-completion +doc"
+
+RDEPEND="dev-libs/wayland
+ x11-libs/libxkbcommon
+ x11-libs/cairo
+ gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[jpeg] )
+ pam? ( virtual/pam )
+"
+DEPEND="${RDEPEND}
+ >=dev-libs/wayland-protocols-1.14
+ doc? ( app-text/scdoc )
+ !<dev-libs/sway-1.0_rc1
+"
+src_configure() {
+ local emesonargs=(
+ -Dman-pages=$(usex doc enabled disabled)
+ -Dpam=$(usex pam enabled disabled)
+ -Dgdk-pixbuf=$(usex gdk-pixbuf enabled disabled)
+ $(meson_use bash-completion bash-completions)
+ $(meson_use fish-completion fish-completions)
+ $(meson_use zsh-completion zsh-completions)
+ -Dswaylock-version=${PV}
+ )
+
+ meson_src_configure
+}
+
+pkg_postinst() {
+ if ! use pam; then
+ fcaps cap_sys_admin usr/bin/swaylock
+ fi
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/swaylock/
@ 2019-02-13 0:04 Aaron Bauman
0 siblings, 0 replies; 3+ messages in thread
From: Aaron Bauman @ 2019-02-13 0:04 UTC (permalink / raw
To: gentoo-commits
commit: 1ef7ee9af3d2b4475855a6a4e8f79a9b8757abb1
Author: Niccolò Scatena <speedjack95 <AT> gmail <DOT> com>
AuthorDate: Sat Feb 9 17:13:51 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Wed Feb 13 00:04:17 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ef7ee9a
dev-libs/swaylock: various fixes
- Use ${PN} wherever possible;
- Fix use flag order in IUSE;
- Remove bash-completion use flag: bash completions should be always
installed (see [1]);
- Rename use flag: doc -> man (doc is a global use flag used to install
additional documentation that most users does not want);
- Fix order of (R)DEPEND;
- Remove required use gdk-pixbuf[jpeg]: the jpeg use flag is not
required to be enabled. If the user wants support for JPEG images, he
can manually enable it in gdk-pixbuf;
- Move scdoc and wayland-protocols deps to BDEPEND (required only when
building);
- Fix dependency blocks: an user may install <=sway-1.0_beta2 with the
swaylock use flag disabled and then install the swaylock package;
- Add -Dwerror=false to meson args.
In metadata.xml:
- Add upstream infos;
- Improve longdescription;
- Add myself as maintainer.
[1] www.gentoo.org/support/news-items/2014-11-25-bash-completion-2_1-r90.html
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Niccolò Scatena <speedjack95 <AT> gmail.com>
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
dev-libs/swaylock/metadata.xml | 23 +++++++++++++++++++--
dev-libs/swaylock/swaylock-1.3.ebuild | 39 ++++++++++++++++++++++++-----------
2 files changed, 48 insertions(+), 14 deletions(-)
diff --git a/dev-libs/swaylock/metadata.xml b/dev-libs/swaylock/metadata.xml
index 4155370f2f7..26cfed9c82a 100644
--- a/dev-libs/swaylock/metadata.xml
+++ b/dev-libs/swaylock/metadata.xml
@@ -5,11 +5,30 @@
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
+ <maintainer type="person">
+ <email>speedjack95@gmail.com</email>
+ <name>Niccolò Scatena</name>
+ </maintainer>
<longdescription lang="en">
- Swaylock is a screen locking utility for Wayland compositors.
+ Swaylock is a screen locking utility for Wayland compositors. It is
+ compatible with any Wayland compositor which implements the following
+ Wayland protocols: wlr-layer-shell, wlr-input-inhibitor, xdg-output,
+ xdg-shell.
+
+ Swaylock is the official screen locker for <pkg>dev-libs/sway</pkg>.
</longdescription>
<use>
- <flag name="gdk-pixbuf">Enable additional image format support via the <pkg>x11-libs/gdk-pixbuf</pkg> library</flag>
<flag name="fish-completion">Enable fish completion support</flag>
+ <flag name="gdk-pixbuf">Enable additional image format support via the <pkg>x11-libs/gdk-pixbuf</pkg> library</flag>
+ <flag name="man">Build and install man pages</flag>
</use>
+ <upstream>
+ <remote-id type="github">swaywm/swaylock</remote-id>
+ <maintainer status="active">
+ <email>sir@cmpwn.com</email>
+ <name>Drew DeVault</name>
+ </maintainer>
+ <bugs-to>https://github.com/swaywm/swaylock/issues</bugs-to>
+ <changelog>https://github.com/swaywm/swaylock/releases</changelog>
+ </upstream>
</pkgmetadata>
diff --git a/dev-libs/swaylock/swaylock-1.3.ebuild b/dev-libs/swaylock/swaylock-1.3.ebuild
index c6e0258c8c5..85539fb9095 100644
--- a/dev-libs/swaylock/swaylock-1.3.ebuild
+++ b/dev-libs/swaylock/swaylock-1.3.ebuild
@@ -7,34 +7,49 @@ inherit fcaps meson
DESCRIPTION="Screen locker for Wayland"
HOMEPAGE="https://github.com/swaywm/swaylock"
-SRC_URI="https://github.com/swaywm/swaylock/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+else
+ SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+pam +gdk-pixbuf zsh-completion bash-completion fish-completion +doc"
+IUSE="fish-completion +gdk-pixbuf +man +pam zsh-completion"
-RDEPEND="dev-libs/wayland
- x11-libs/libxkbcommon
+DEPEND="
+ dev-libs/wayland
x11-libs/cairo
- gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[jpeg] )
+ x11-libs/libxkbcommon
+ gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 )
pam? ( virtual/pam )
"
-DEPEND="${RDEPEND}
+RDEPEND="
+ ${DEPEND}
+ !<=dev-libs/sway-1.0_beta2[swaylock]
+"
+BDEPEND="
>=dev-libs/wayland-protocols-1.14
- doc? ( app-text/scdoc )
- !<dev-libs/sway-1.0_rc1
+ virtual/pkgconfig
+ man? ( app-text/scdoc )
"
+
src_configure() {
local emesonargs=(
- -Dman-pages=$(usex doc enabled disabled)
+ -Dman-pages=$(usex man enabled disabled)
-Dpam=$(usex pam enabled disabled)
-Dgdk-pixbuf=$(usex gdk-pixbuf enabled disabled)
- $(meson_use bash-completion bash-completions)
$(meson_use fish-completion fish-completions)
$(meson_use zsh-completion zsh-completions)
- -Dswaylock-version=${PV}
+ "-Dbash-completions=true"
+ "-Dwerror=false"
)
+ if [[ ${PV} != 9999 ]]; then
+ emesonargs+=("-Dswaylock-version=${PV}")
+ fi
meson_src_configure
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/swaylock/
@ 2019-02-13 0:04 Aaron Bauman
0 siblings, 0 replies; 3+ messages in thread
From: Aaron Bauman @ 2019-02-13 0:04 UTC (permalink / raw
To: gentoo-commits
commit: e4b0393d66135ed19ef272429797d18415ae0331
Author: Niccolò Scatena <speedjack95 <AT> gmail <DOT> com>
AuthorDate: Sat Feb 9 17:14:56 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Wed Feb 13 00:04:17 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4b0393d
dev-libs/swaylock: Add 9999 live version
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Niccolò Scatena <speedjack95 <AT> gmail.com>
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
dev-libs/swaylock/swaylock-9999.ebuild | 61 ++++++++++++++++++++++++++++++++++
1 file changed, 61 insertions(+)
diff --git a/dev-libs/swaylock/swaylock-9999.ebuild b/dev-libs/swaylock/swaylock-9999.ebuild
new file mode 100644
index 00000000000..85539fb9095
--- /dev/null
+++ b/dev-libs/swaylock/swaylock-9999.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps meson
+
+DESCRIPTION="Screen locker for Wayland"
+HOMEPAGE="https://github.com/swaywm/swaylock"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+else
+ SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="fish-completion +gdk-pixbuf +man +pam zsh-completion"
+
+DEPEND="
+ dev-libs/wayland
+ x11-libs/cairo
+ x11-libs/libxkbcommon
+ gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 )
+ pam? ( virtual/pam )
+"
+RDEPEND="
+ ${DEPEND}
+ !<=dev-libs/sway-1.0_beta2[swaylock]
+"
+BDEPEND="
+ >=dev-libs/wayland-protocols-1.14
+ virtual/pkgconfig
+ man? ( app-text/scdoc )
+"
+
+src_configure() {
+ local emesonargs=(
+ -Dman-pages=$(usex man enabled disabled)
+ -Dpam=$(usex pam enabled disabled)
+ -Dgdk-pixbuf=$(usex gdk-pixbuf enabled disabled)
+ $(meson_use fish-completion fish-completions)
+ $(meson_use zsh-completion zsh-completions)
+ "-Dbash-completions=true"
+ "-Dwerror=false"
+ )
+ if [[ ${PV} != 9999 ]]; then
+ emesonargs+=("-Dswaylock-version=${PV}")
+ fi
+
+ meson_src_configure
+}
+
+pkg_postinst() {
+ if ! use pam; then
+ fcaps cap_sys_admin usr/bin/swaylock
+ fi
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-02-13 0:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-13 0:04 [gentoo-commits] repo/gentoo:master commit in: dev-libs/swaylock/ Aaron Bauman
-- strict thread matches above, loose matches on Subject: below --
2019-02-13 0:04 Aaron Bauman
2019-02-09 2:23 Matthew Thode
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox