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@gmail.com>
Signed-off-by: Aaron Bauman <bman@gentoo.org>

diff --git a/dev-libs/swaylock/metadata.xml b/dev-libs/swaylock/metadata.xml
index 4155370f2f7c7f053e24d2ebab04894df8df982b..26cfed9c82aa39e9519fc6a60b9eaf85734b9c56 100644 (file)
--- 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 c6e0258c8c5269f03e3efd7a0a7c306653a63091..85539fb9095e4ad002066556888c4fba2b64af60 100644 (file)
--- 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
 }