subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: x11\-wm\/herbstluftwm\/"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2024-04-03 Thread Florian Schmaus

commit: 622e077c0c7498d551cb5da7e82c46bace0c7e00
Author: Florian Schmaus  gentoo  org>
AuthorDate: Wed Apr  3 19:16:01 2024 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Wed Apr  3 19:17:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=622e077c

x11-wm/herbstluftwm: enable py3.12

Signed-off-by: Florian Schmaus  gentoo.org>

 x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild
index 47d995e179c6..ceda002ab268 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_OPTIONAL=1

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2024-04-03 Thread Florian Schmaus

commit: 08cb254f3c89a9dfd5b84c2475ac7daee2ab0303
Author: Florian Schmaus  gentoo  org>
AuthorDate: Wed Apr  3 19:15:10 2024 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Wed Apr  3 19:17:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08cb254f

x11-wm/herbstluftwm: adjust src_test for pep517

Closes: https://bugs.gentoo.org/927549
Signed-off-by: Florian Schmaus  gentoo.org>

 x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild | 15 ++-
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild
index 83a22e20d0e4..47d995e179c6 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,7 +24,10 @@ LICENSE="BSD-2"
 SLOT="0"
 IUSE="+doc python test"
 RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="
+   python? ( ${PYTHON_REQUIRED_USE} )
+   test? ( python )
+"
 
 COMMON_DEPEND="
x11-libs/libX11
@@ -137,11 +140,5 @@ src_test() {
ln -s "${BUILD_DIR}/herbstclient" || die "Could not symlink 
herbstclient"
ln -s "${BUILD_DIR}/herbstluftwm" || die "Could not symlink 
herbstluftwm"
 
-   pushd python > /dev/null || die
-   distutils_install_for_testing
-   popd > /dev/null || die
-
-   # Ensure PYTHONPATH is exported, see https://bugs.gentoo.org/801658.
-   export PYTHONPATH
-   python_test
+   distutils-r1_src_test
 }

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2024-04-03 Thread Florian Schmaus

commit: 341f8fb96589ad4624c97f5f6f4f64676331a15b
Author: Florian Schmaus  gentoo  org>
AuthorDate: Wed Apr  3 19:16:16 2024 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Wed Apr  3 19:17:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=341f8fb9

x11-wm/herbstluftwm: sync live

Signed-off-by: Florian Schmaus  gentoo.org>

 x11-wm/herbstluftwm/herbstluftwm-.ebuild | 26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/x11-wm/herbstluftwm/herbstluftwm-.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
index 7c5b5aaecbda..f9a7de769844 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_OPTIONAL=1
 
-inherit cmake distutils-r1
+inherit cmake desktop distutils-r1
 
 DESCRIPTION="A manual tiling window manager for X"
 HOMEPAGE="https://herbstluftwm.org/;
@@ -24,7 +24,10 @@ LICENSE="BSD-2"
 SLOT="0"
 IUSE="+doc python test"
 RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="
+   python? ( ${PYTHON_REQUIRED_USE} )
+   test? ( python )
+"
 
 COMMON_DEPEND="
x11-libs/libX11
@@ -130,21 +133,18 @@ src_install() {
herbstluftwm-tutorial.7
)
for man_page in "${man_pages[@]}"; do
-   doman "${BUILD_DIR}/doc/${man_page}"
+   doman "doc/${man_page}"
done
fi
+
+   # Do not only install the herbstluftwm.desktop file in xsessions/ but
+   # also in applications/. This allows herbstluftwm to be used as
+   # window manager of a Gnome flashback session.
+   domenu "${ED}"/usr/share/xsessions/herbstluftwm.desktop
 }
 
 distutils_enable_tests pytest
 
-python_test() {
-   pushd python > /dev/null || die
-   distutils_install_for_testing
-   popd > /dev/null || die
-
-   distutils-r1_python_test
-}
-
 src_test() {
if [[ -n "${EGIT_REPO_URI}" ]]; then
ln -s "${BUILD_DIR}/doc/hlwm-doc.json" "doc/hlwm-doc.json" || 
die "Could not symlink hlwm-doc.json"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2023-10-14 Thread Florian Schmaus

commit: 4bcb4f4314c239cce29d4d7eb4be264fb01eb968
Author: Florian Schmaus  gentoo  org>
AuthorDate: Sat Oct 14 15:20:17 2023 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Sat Oct 14 15:20:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bcb4f43

x11-wm/herbstluftwm: drop 0.9.5-r1

Signed-off-by: Florian Schmaus  gentoo.org>

 x11-wm/herbstluftwm/herbstluftwm-0.9.5-r1.ebuild | 146 ---
 1 file changed, 146 deletions(-)

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r1.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r1.ebuild
deleted file mode 100644
index 27636824401a..
--- a/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_OPTIONAL=1
-
-inherit cmake desktop distutils-r1
-
-DESCRIPTION="A manual tiling window manager for X"
-HOMEPAGE="https://herbstluftwm.org/;
-
-if [[ "${PV}" == "" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; then
-   EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm;
-   inherit git-r3
-else
-   SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
-   KEYWORDS="amd64 x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="+doc python test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-   x11-libs/libX11
-   x11-libs/libXext
-   x11-libs/libXfixes
-   x11-libs/libXft
-   x11-libs/libXinerama
-   x11-libs/libXrandr
-   x11-libs/libXrender
-"
-DEPEND="
-   ${COMMON_DEPEND}
-   test? (
-   dev-python/ewmh
-   dev-python/python-xlib
-   x11-apps/xsetroot
-   x11-base/xorg-server[xephyr,xvfb]
-   x11-misc/xdotool
-   x11-terms/xterm
-   )
-"
-RDEPEND="
-   ${COMMON_DEPEND}
-   app-shells/bash
-   python? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
-   ${PYTHON_DEPS}
-   virtual/pkgconfig
-"
-
-if [[ -n "${EGIT_REPO_URI}" ]]; then
-   # Herbstluftwm tarballs ship with pre-compiled documentation, only
-   # if we build from git asciidoc is needed.
-   BDEPEND+=" doc? ( app-text/asciidoc )"
-fi
-
-src_prepare() {
-   # Do not install LICENSE and respect CMAKE_INSTALL_DOCDIR.
-   sed -i \
-   -e '/^install.*LICENSEDIR/d' \
-   -e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
-   CMakeLists.txt || die
-   cmake_src_prepare
-
-   if use python; then
-   pushd "${S}"/python > /dev/null || die
-   distutils-r1_src_prepare
-   popd > /dev/null || die
-   fi
-}
-
-src_configure() {
-   # Ensure that 'python3' is in PATH. #765118
-   python_setup
-
-   local mycmakeargs=(
-   -DWITH_DOCUMENTATION=$(usex doc)
-   )
-   cmake_src_configure
-}
-
-src_compile() {
-   cmake_src_compile
-
-   if use python; then
-   pushd python > /dev/null || die
-   distutils-r1_src_compile
-   popd >/dev/null || die
-   fi
-}
-
-src_install() {
-   cmake_src_install
-
-   if ! use doc; then
-   rm -r "${ED}"/usr/share/doc/${PF}/examples || die
-   fi
-
-   if use python; then
-   pushd python > /dev/null || die
-   distutils-r1_src_install
-   popd > /dev/null || die
-   fi
-
-   # The man pages exists in src_install either in non-live ebuilds,
-   # since they are then shipped pre-compiled in herbstluftwm's
-   # release tarbal. Or they exist in live ebuilds if the 'doc' USE
-   # flag is enabled.
-   if [[ "${PV}" !=  ]] || use doc; then
-   local man_pages=(
-   herbstluftwm.1
-   herbstclient.1
-   herbstluftwm-tutorial.7
-   )
-   for man_page in "${man_pages[@]}"; do
-   doman "doc/${man_page}"
-   done
-   fi
-
-   # Do not only install the herbstluftwm.desktop file in xsessions/ but
-   # also in applications/. This allows herbstluftwm to be used as
-   # window manager of a Gnome flashback session.
-   domenu "${ED}"/usr/share/xsessions/herbstluftwm.desktop
-}
-
-distutils_enable_tests pytest
-
-src_test() {
-   ln -s "${BUILD_DIR}/herbstclient" || die "Could not symlink 
herbstclient"
-   ln -s "${BUILD_DIR}/herbstluftwm" || die "Could not symlink 
herbstluftwm"
-
-   pushd python > /dev/null || die
-   distutils_install_for_testing
-   popd > /dev/null || die
-
-   # Ensure PYTHONPATH is exported, see https://bugs.gentoo.org/801658.
-   export PYTHONPATH
-   python_test
-}

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2023-09-18 Thread Florian Schmaus

commit: d4ce36aeda2f512065f05fa9a23f9a17e2dcf88a
Author: Florian Schmaus  gentoo  org>
AuthorDate: Mon Sep 18 09:31:00 2023 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Mon Sep 18 09:34:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4ce36ae

x11-wm/herbstluftwm: stabilize 0.9.5-r2 for amd64, x86

Signed-off-by: Florian Schmaus  gentoo.org>

 x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild
index 31baa0f5fafc..83a22e20d0e4 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" == "" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; 
then
inherit git-r3
 else
SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 LICENSE="BSD-2"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2023-07-16 Thread Florian Schmaus

commit: 1b70343fefee4dd870f4365591c60f98aa299f35
Author: Florian Schmaus  gentoo  org>
AuthorDate: Sun Jul 16 16:31:44 2023 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Sun Jul 16 16:31:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b70343f

x11-wm/herbstluftwm: switch to DISTUTILS_USE_PEP517

Bug: https://bugs.gentoo.org/910047
Signed-off-by: Florian Schmaus  gentoo.org>

 ...wm-.ebuild => herbstluftwm-0.9.5-r2.ebuild} | 41 +-
 x11-wm/herbstluftwm/herbstluftwm-.ebuild   |  3 +-
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/x11-wm/herbstluftwm/herbstluftwm-.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild
similarity index 82%
copy from x11-wm/herbstluftwm/herbstluftwm-.ebuild
copy to x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild
index 051f9ba720c9..31baa0f5fafc 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild
@@ -4,9 +4,10 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_OPTIONAL=1
 
-inherit cmake distutils-r1
+inherit cmake desktop distutils-r1
 
 DESCRIPTION="A manual tiling window manager for X"
 HOMEPAGE="https://herbstluftwm.org/;
@@ -51,15 +52,11 @@ RDEPEND="
python? ( ${PYTHON_DEPS} )
 "
 BDEPEND="
-   ${PYTHON_DEPS}
+   ${DISTUTILS_DEPS}
virtual/pkgconfig
 "
 
 if [[ -n "${EGIT_REPO_URI}" ]]; then
-   # If hlwm is build from VCS, then hlwm-doc.json, which is used in
-   # the tests, needs to generated by the WITH_DOCUMENTATION option.
-   REQUIRED_USE+=" test? ( doc )"
-
# Herbstluftwm tarballs ship with pre-compiled documentation, only
# if we build from git asciidoc is needed.
BDEPEND+=" doc? ( app-text/asciidoc )"
@@ -71,11 +68,6 @@ src_prepare() {
-e '/^install.*LICENSEDIR/d' \
-e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
CMakeLists.txt || die
-
-   # Do not install MAN pages, we use doman in src_install() for that.
-   sed -i '/MANDIR/d' \
-   doc/CMakeLists.txt || die
-
cmake_src_prepare
 
if use python; then
@@ -129,28 +121,27 @@ src_install() {
herbstluftwm-tutorial.7
)
for man_page in "${man_pages[@]}"; do
-   doman "${BUILD_DIR}/doc/${man_page}"
+   doman "doc/${man_page}"
done
fi
+
+   # Do not only install the herbstluftwm.desktop file in xsessions/ but
+   # also in applications/. This allows herbstluftwm to be used as
+   # window manager of a Gnome flashback session.
+   domenu "${ED}"/usr/share/xsessions/herbstluftwm.desktop
 }
 
 distutils_enable_tests pytest
 
-python_test() {
-   pushd python > /dev/null || die
-   distutils_install_for_testing
-   popd > /dev/null || die
-
-   distutils-r1_python_test
-}
-
 src_test() {
-   if [[ -n "${EGIT_REPO_URI}" ]]; then
-   ln -s "${BUILD_DIR}/doc/hlwm-doc.json" "doc/hlwm-doc.json" || 
die "Could not symlink hlwm-doc.json"
-   fi
-
ln -s "${BUILD_DIR}/herbstclient" || die "Could not symlink 
herbstclient"
ln -s "${BUILD_DIR}/herbstluftwm" || die "Could not symlink 
herbstluftwm"
 
-   distutils-r1_src_test
+   pushd python > /dev/null || die
+   distutils_install_for_testing
+   popd > /dev/null || die
+
+   # Ensure PYTHONPATH is exported, see https://bugs.gentoo.org/801658.
+   export PYTHONPATH
+   python_test
 }

diff --git a/x11-wm/herbstluftwm/herbstluftwm-.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
index 051f9ba720c9..7c5b5aaecbda 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_OPTIONAL=1
 
 inherit cmake distutils-r1
@@ -51,7 +52,7 @@ RDEPEND="
python? ( ${PYTHON_DEPS} )
 "
 BDEPEND="
-   ${PYTHON_DEPS}
+   ${DISTUTILS_DEPS}
virtual/pkgconfig
 "

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2023-01-31 Thread Florian Schmaus

commit: f3f73d1bfa8d37e01efd59a81373e75ac0fb2dda
Author: Florian Schmaus  gentoo  org>
AuthorDate: Tue Jan 31 11:18:13 2023 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Tue Jan 31 11:18:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3f73d1b

x11-wm/herbstluftwm: install desktop file

Signed-off-by: Florian Schmaus  gentoo.org>

 .../{herbstluftwm-0.9.5.ebuild => herbstluftwm-0.9.5-r1.ebuild}| 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.5.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r1.ebuild
similarity index 91%
rename from x11-wm/herbstluftwm/herbstluftwm-0.9.5.ebuild
rename to x11-wm/herbstluftwm/herbstluftwm-0.9.5-r1.ebuild
index e732c8be90e1..27636824401a 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.9.5.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_OPTIONAL=1
 
-inherit cmake distutils-r1
+inherit cmake desktop distutils-r1
 
 DESCRIPTION="A manual tiling window manager for X"
 HOMEPAGE="https://herbstluftwm.org/;
@@ -123,6 +123,11 @@ src_install() {
doman "doc/${man_page}"
done
fi
+
+   # Do not only install the herbstluftwm.desktop file in xsessions/ but
+   # also in applications/. This allows herbstluftwm to be used as
+   # window manager of a Gnome flashback session.
+   domenu "${ED}"/usr/share/xsessions/herbstluftwm.desktop
 }
 
 distutils_enable_tests pytest

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2022-10-27 Thread Florian Schmaus

commit: b6d21d7a6292afc47f756ac1ffe47c59c5cb439b
Author: Florian Schmaus  gentoo  org>
AuthorDate: Thu Oct 27 20:14:47 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Thu Oct 27 20:14:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6d21d7a

x11-wm/herbstluftwm: drop 0.9.4

Signed-off-by: Florian Schmaus  gentoo.org>

 x11-wm/herbstluftwm/Manifest  |   1 -
 x11-wm/herbstluftwm/herbstluftwm-0.9.4.ebuild | 141 --
 2 files changed, 142 deletions(-)

diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index 0db1ba96e2d5..7f40a3fb76c1 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,2 +1 @@
-DIST herbstluftwm-0.9.4.tar.gz 549029 BLAKE2B 
23f1dbf212c4d0a64f2e2d8442ac7c2465a54a13af74de6c949c4d6eda85fd4e66b73188c526d0968372eb45691ffca43e387c8410691fd134f662e1e8c501b3
 SHA512 
068438d14b0addcd17a0c0bda1d33ec4aaff08a3c85698a49e9d3dd0c07f91e315f936d73c11b0c159b8735373ea1efe8a572a0976fc327f4aaa6a0f08436e9d
 DIST herbstluftwm-0.9.5.tar.gz 556773 BLAKE2B 
db851f02ce249be74f0104dd0b335fb1ed50b4a19e5f7de17cdc34b7eba99ac2f348c5a4a4e0afd2c68576f650029203c735ccb293a60d321769d56f746d6593
 SHA512 
a85fd1ab16b873f512d6965cc4a93524e3ed4a15079d0d4ee54012e217bd41db3b54729c1b30ee361c34b38799f95bc537099056ba7a5f791bf2be6724bc92c3

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.4.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.9.4.ebuild
deleted file mode 100644
index d69cb69d2351..
--- a/x11-wm/herbstluftwm/herbstluftwm-0.9.4.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_OPTIONAL=1
-
-inherit cmake distutils-r1
-
-DESCRIPTION="A manual tiling window manager for X"
-HOMEPAGE="https://herbstluftwm.org/;
-
-if [[ "${PV}" == "" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; then
-   EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm;
-   inherit git-r3
-else
-   SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
-   KEYWORDS="amd64 x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="+doc python test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-   x11-libs/libX11
-   x11-libs/libXext
-   x11-libs/libXfixes
-   x11-libs/libXft
-   x11-libs/libXinerama
-   x11-libs/libXrandr
-   x11-libs/libXrender
-"
-DEPEND="
-   ${COMMON_DEPEND}
-   test? (
-   dev-python/ewmh
-   dev-python/python-xlib
-   x11-apps/xsetroot
-   x11-base/xorg-server[xephyr,xvfb]
-   x11-misc/xdotool
-   x11-terms/xterm
-   )
-"
-RDEPEND="
-   ${COMMON_DEPEND}
-   app-shells/bash
-   python? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
-   ${PYTHON_DEPS}
-   virtual/pkgconfig
-"
-
-if [[ -n "${EGIT_REPO_URI}" ]]; then
-   # Herbstluftwm tarballs ship with pre-compiled documentation, only
-   # if we build from git asciidoc is needed.
-   BDEPEND+=" doc? ( app-text/asciidoc )"
-fi
-
-src_prepare() {
-   # Do not install LICENSE and respect CMAKE_INSTALL_DOCDIR.
-   sed -i \
-   -e '/^install.*LICENSEDIR/d' \
-   -e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
-   CMakeLists.txt || die
-   cmake_src_prepare
-
-   if use python; then
-   pushd "${S}"/python > /dev/null || die
-   distutils-r1_src_prepare
-   popd > /dev/null || die
-   fi
-}
-
-src_configure() {
-   # Ensure that 'python3' is in PATH. #765118
-   python_setup
-
-   mycmakeargs=(
-   -DWITH_DOCUMENTATION=$(usex doc)
-   )
-   cmake_src_configure
-}
-
-src_compile() {
-   cmake_src_compile
-
-   if use python; then
-   pushd python > /dev/null || die
-   distutils-r1_src_compile
-   popd >/dev/null || die
-   fi
-}
-
-src_install() {
-   cmake_src_install
-
-   if ! use doc; then
-   rm -r "${ED}"/usr/share/doc/${PF}/examples || die
-   fi
-
-   if use python; then
-   pushd python > /dev/null || die
-   distutils-r1_src_install
-   popd > /dev/null || die
-   fi
-
-   # The man pages exists in src_install either in non-live ebuilds,
-   # since they are then shipped pre-compiled in herbstluftwm's
-   # release tarbal. Or they exist in live ebuilds if the 'doc' USE
-   # flag is enabled.
-   if [[ "${PV}" !=  ]] || use doc; then
-   local man_pages=(
-   herbstluftwm.1
-   herbstclient.1
-   herbstluftwm-tutorial.7
-   )
-   for man_page in "${man_pages[@]}"; do
-   doman "doc/${man_page}"
-

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2022-10-27 Thread Florian Schmaus

commit: 071e4f15c8fb27a2c16590d667fa6ef8adc610a2
Author: Florian Schmaus  gentoo  org>
AuthorDate: Thu Oct 27 20:14:37 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Thu Oct 27 20:14:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=071e4f15

x11-wm/herbstluftwm: stabilize 0.9.5 for amd64, x86

Signed-off-by: Florian Schmaus  gentoo.org>

 x11-wm/herbstluftwm/herbstluftwm-0.9.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.5.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.9.5.ebuild
index 4989b68eb8db..d69cb69d2351 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.9.5.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.5.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == "" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; 
then
inherit git-r3
 else
SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 LICENSE="BSD-2"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2022-09-26 Thread Florian Schmaus

commit: f0a4706bb5f4b1c0c6ecf131a61d75f3ebaa865d
Author: Florian Schmaus  gentoo  org>
AuthorDate: Mon Sep 26 16:38:27 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Mon Sep 26 16:40:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0a4706b

x11-wm/herbstluftwm: add 0.9.5

Signed-off-by: Florian Schmaus  gentoo.org>

 x11-wm/herbstluftwm/Manifest  |   1 +
 x11-wm/herbstluftwm/herbstluftwm-0.9.5.ebuild | 141 ++
 2 files changed, 142 insertions(+)

diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index 2462e486361d..0db1ba96e2d5 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1 +1,2 @@
 DIST herbstluftwm-0.9.4.tar.gz 549029 BLAKE2B 
23f1dbf212c4d0a64f2e2d8442ac7c2465a54a13af74de6c949c4d6eda85fd4e66b73188c526d0968372eb45691ffca43e387c8410691fd134f662e1e8c501b3
 SHA512 
068438d14b0addcd17a0c0bda1d33ec4aaff08a3c85698a49e9d3dd0c07f91e315f936d73c11b0c159b8735373ea1efe8a572a0976fc327f4aaa6a0f08436e9d
+DIST herbstluftwm-0.9.5.tar.gz 556773 BLAKE2B 
db851f02ce249be74f0104dd0b335fb1ed50b4a19e5f7de17cdc34b7eba99ac2f348c5a4a4e0afd2c68576f650029203c735ccb293a60d321769d56f746d6593
 SHA512 
a85fd1ab16b873f512d6965cc4a93524e3ed4a15079d0d4ee54012e217bd41db3b54729c1b30ee361c34b38799f95bc537099056ba7a5f791bf2be6724bc92c3

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.5.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.9.5.ebuild
new file mode 100644
index ..4989b68eb8db
--- /dev/null
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.5.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_OPTIONAL=1
+
+inherit cmake distutils-r1
+
+DESCRIPTION="A manual tiling window manager for X"
+HOMEPAGE="https://herbstluftwm.org/;
+
+if [[ "${PV}" == "" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; then
+   EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm;
+   inherit git-r3
+else
+   SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="+doc python test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+   x11-libs/libX11
+   x11-libs/libXext
+   x11-libs/libXfixes
+   x11-libs/libXft
+   x11-libs/libXinerama
+   x11-libs/libXrandr
+   x11-libs/libXrender
+"
+DEPEND="
+   ${COMMON_DEPEND}
+   test? (
+   dev-python/ewmh
+   dev-python/python-xlib
+   x11-apps/xsetroot
+   x11-base/xorg-server[xephyr,xvfb]
+   x11-misc/xdotool
+   x11-terms/xterm
+   )
+"
+RDEPEND="
+   ${COMMON_DEPEND}
+   app-shells/bash
+   python? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+   ${PYTHON_DEPS}
+   virtual/pkgconfig
+"
+
+if [[ -n "${EGIT_REPO_URI}" ]]; then
+   # Herbstluftwm tarballs ship with pre-compiled documentation, only
+   # if we build from git asciidoc is needed.
+   BDEPEND+=" doc? ( app-text/asciidoc )"
+fi
+
+src_prepare() {
+   # Do not install LICENSE and respect CMAKE_INSTALL_DOCDIR.
+   sed -i \
+   -e '/^install.*LICENSEDIR/d' \
+   -e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
+   CMakeLists.txt || die
+   cmake_src_prepare
+
+   if use python; then
+   pushd "${S}"/python > /dev/null || die
+   distutils-r1_src_prepare
+   popd > /dev/null || die
+   fi
+}
+
+src_configure() {
+   # Ensure that 'python3' is in PATH. #765118
+   python_setup
+
+   mycmakeargs=(
+   -DWITH_DOCUMENTATION=$(usex doc)
+   )
+   cmake_src_configure
+}
+
+src_compile() {
+   cmake_src_compile
+
+   if use python; then
+   pushd python > /dev/null || die
+   distutils-r1_src_compile
+   popd >/dev/null || die
+   fi
+}
+
+src_install() {
+   cmake_src_install
+
+   if ! use doc; then
+   rm -r "${ED}"/usr/share/doc/${PF}/examples || die
+   fi
+
+   if use python; then
+   pushd python > /dev/null || die
+   distutils-r1_src_install
+   popd > /dev/null || die
+   fi
+
+   # The man pages exists in src_install either in non-live ebuilds,
+   # since they are then shipped pre-compiled in herbstluftwm's
+   # release tarbal. Or they exist in live ebuilds if the 'doc' USE
+   # flag is enabled.
+   if [[ "${PV}" !=  ]] || use doc; then
+   local man_pages=(
+   herbstluftwm.1
+   herbstclient.1
+   herbstluftwm-tutorial.7
+   )
+   for man_page in "${man_pages[@]}"; do
+   doman "doc/${man_page}"
+   done

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2022-06-13 Thread Florian Schmaus

commit: 7558c21dee27834e7516d1672886777e456d
Author: Florian Schmaus  gentoo  org>
AuthorDate: Mon Jun 13 09:06:20 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Mon Jun 13 09:06:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7558c21d

x11-wm/herbstluftwm: drop 0.9.3

Signed-off-by: Florian Schmaus  gentoo.org>

 x11-wm/herbstluftwm/Manifest  |   1 -
 x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild | 140 --
 2 files changed, 141 deletions(-)

diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index 4fdba79f51c1..2462e486361d 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,2 +1 @@
-DIST herbstluftwm-0.9.3.tar.gz 497523 BLAKE2B 
1936924f86201b6ad6ec33426d366912fd72e2a5e5a4964cafcb40d76624c2a1398c9330cde472343b436d16c9299aba495e1a224c6ea8bb173bbf76b7209cb3
 SHA512 
73e4193a2d79c452c08b4ac1c8fea1e93b88b07baa0c9006b74a76ed84de578d3234789e3666a9299ef3942695225c9a7f85eb3698a44edb1234f6042dbea47c
 DIST herbstluftwm-0.9.4.tar.gz 549029 BLAKE2B 
23f1dbf212c4d0a64f2e2d8442ac7c2465a54a13af74de6c949c4d6eda85fd4e66b73188c526d0968372eb45691ffca43e387c8410691fd134f662e1e8c501b3
 SHA512 
068438d14b0addcd17a0c0bda1d33ec4aaff08a3c85698a49e9d3dd0c07f91e315f936d73c11b0c159b8735373ea1efe8a572a0976fc327f4aaa6a0f08436e9d

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
deleted file mode 100644
index fe478ccf2e52..
--- a/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-DISTUTILS_OPTIONAL=1
-
-inherit cmake distutils-r1 toolchain-funcs
-
-DESCRIPTION="A manual tiling window manager for X"
-HOMEPAGE="https://herbstluftwm.org/;
-
-if [[ "${PV}" == "" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; then
-   EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm;
-   inherit git-r3
-else
-   SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
-   KEYWORDS="amd64 x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="+doc python test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-   media-libs/freetype
-   x11-libs/libX11
-   x11-libs/libXext
-   x11-libs/libXft
-   x11-libs/libXinerama
-   x11-libs/libXrandr
-"
-DEPEND="
-   ${COMMON_DEPEND}
-   test? (
-   dev-python/ewmh
-   dev-python/python-xlib
-   x11-apps/xsetroot
-   x11-base/xorg-server[xephyr,xvfb]
-   x11-misc/xdotool
-   x11-terms/xterm
-   )
-"
-RDEPEND="
-   ${COMMON_DEPEND}
-   app-shells/bash
-   python? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
-   ${PYTHON_DEPS}
-   virtual/pkgconfig
-"
-
-if [[ -n "${EGIT_REPO_URI}" ]]; then
-   # Herbstluftwm tarballs ship with pre-compiled documentation, only
-   # if we build from git asciidoc is needed.
-   BDEPEND+=" doc? ( app-text/asciidoc )"
-fi
-
-src_prepare() {
-   # Do not install LICENSE and respect CMAKE_INSTALL_DOCDIR.
-   sed -i \
-   -e '/^install.*LICENSEDIR/d' \
-   -e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
-   CMakeLists.txt || die
-   cmake_src_prepare
-
-   if use python; then
-   pushd "${S}"/python > /dev/null || die
-   distutils-r1_src_prepare
-   popd > /dev/null || die
-   fi
-}
-
-src_configure() {
-   # Ensure that 'python3' is in PATH. #765118
-   python_setup
-
-   mycmakeargs=(
-   -DWITH_DOCUMENTATION=$(usex doc)
-   )
-   cmake_src_configure
-}
-
-src_compile() {
-   cmake_src_compile
-
-   if use python; then
-   pushd python > /dev/null || die
-   distutils-r1_src_compile
-   popd >/dev/null || die
-   fi
-}
-
-src_install() {
-   cmake_src_install
-
-   if ! use doc; then
-   rm -r "${ED}"/usr/share/doc/${PF}/examples || die
-   fi
-
-   if use python; then
-   pushd python > /dev/null || die
-   distutils-r1_src_install
-   popd > /dev/null || die
-   fi
-
-   # The man pages exists in src_install either in non-live ebuilds,
-   # since they are then shipped pre-compiled in herbstluftwm's
-   # release tarbal. Or they exist in live ebuilds if the 'doc' USE
-   # flag is enabled.
-   if [[ "${PV}" !=  ]] || use doc; then
-   local man_pages=(
-   herbstluftwm.1
-   herbstclient.1
-   herbstluftwm-tutorial.7
-   )
-   for man_page in "${man_pages[@]}"; do
-   doman "doc/${man_page}"
-   done
-

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2022-06-13 Thread Florian Schmaus

commit: 2d0127d7c5e0d927407ffd0316d897452c34bc5a
Author: Florian Schmaus  gentoo  org>
AuthorDate: Mon Jun 13 09:06:08 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Mon Jun 13 09:06:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d0127d7

x11-wm/herbstluftwm: stabilize 0.9.4 for amd64, x86

Signed-off-by: Florian Schmaus  gentoo.org>

 x11-wm/herbstluftwm/herbstluftwm-0.9.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.4.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.9.4.ebuild
index 4989b68eb8db..d69cb69d2351 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.9.4.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.4.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == "" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; 
then
inherit git-r3
 else
SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 LICENSE="BSD-2"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2022-05-30 Thread Florian Schmaus

commit: b61607903da2c3d6f766912283b2ad58fdbffc61
Author: Florian Schmaus  gentoo  org>
AuthorDate: Mon May 30 06:58:10 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Mon May 30 07:19:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6160790

x11-wm/herbstluftwm: add 0.9.4

Signed-off-by: Florian Schmaus  gentoo.org>

 x11-wm/herbstluftwm/Manifest  |   1 +
 x11-wm/herbstluftwm/herbstluftwm-0.9.4.ebuild | 141 ++
 2 files changed, 142 insertions(+)

diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index 1241dd364d07..4fdba79f51c1 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1 +1,2 @@
 DIST herbstluftwm-0.9.3.tar.gz 497523 BLAKE2B 
1936924f86201b6ad6ec33426d366912fd72e2a5e5a4964cafcb40d76624c2a1398c9330cde472343b436d16c9299aba495e1a224c6ea8bb173bbf76b7209cb3
 SHA512 
73e4193a2d79c452c08b4ac1c8fea1e93b88b07baa0c9006b74a76ed84de578d3234789e3666a9299ef3942695225c9a7f85eb3698a44edb1234f6042dbea47c
+DIST herbstluftwm-0.9.4.tar.gz 549029 BLAKE2B 
23f1dbf212c4d0a64f2e2d8442ac7c2465a54a13af74de6c949c4d6eda85fd4e66b73188c526d0968372eb45691ffca43e387c8410691fd134f662e1e8c501b3
 SHA512 
068438d14b0addcd17a0c0bda1d33ec4aaff08a3c85698a49e9d3dd0c07f91e315f936d73c11b0c159b8735373ea1efe8a572a0976fc327f4aaa6a0f08436e9d

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.4.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.9.4.ebuild
new file mode 100644
index ..4989b68eb8db
--- /dev/null
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.4.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_OPTIONAL=1
+
+inherit cmake distutils-r1
+
+DESCRIPTION="A manual tiling window manager for X"
+HOMEPAGE="https://herbstluftwm.org/;
+
+if [[ "${PV}" == "" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; then
+   EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm;
+   inherit git-r3
+else
+   SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="+doc python test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+   x11-libs/libX11
+   x11-libs/libXext
+   x11-libs/libXfixes
+   x11-libs/libXft
+   x11-libs/libXinerama
+   x11-libs/libXrandr
+   x11-libs/libXrender
+"
+DEPEND="
+   ${COMMON_DEPEND}
+   test? (
+   dev-python/ewmh
+   dev-python/python-xlib
+   x11-apps/xsetroot
+   x11-base/xorg-server[xephyr,xvfb]
+   x11-misc/xdotool
+   x11-terms/xterm
+   )
+"
+RDEPEND="
+   ${COMMON_DEPEND}
+   app-shells/bash
+   python? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+   ${PYTHON_DEPS}
+   virtual/pkgconfig
+"
+
+if [[ -n "${EGIT_REPO_URI}" ]]; then
+   # Herbstluftwm tarballs ship with pre-compiled documentation, only
+   # if we build from git asciidoc is needed.
+   BDEPEND+=" doc? ( app-text/asciidoc )"
+fi
+
+src_prepare() {
+   # Do not install LICENSE and respect CMAKE_INSTALL_DOCDIR.
+   sed -i \
+   -e '/^install.*LICENSEDIR/d' \
+   -e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
+   CMakeLists.txt || die
+   cmake_src_prepare
+
+   if use python; then
+   pushd "${S}"/python > /dev/null || die
+   distutils-r1_src_prepare
+   popd > /dev/null || die
+   fi
+}
+
+src_configure() {
+   # Ensure that 'python3' is in PATH. #765118
+   python_setup
+
+   mycmakeargs=(
+   -DWITH_DOCUMENTATION=$(usex doc)
+   )
+   cmake_src_configure
+}
+
+src_compile() {
+   cmake_src_compile
+
+   if use python; then
+   pushd python > /dev/null || die
+   distutils-r1_src_compile
+   popd >/dev/null || die
+   fi
+}
+
+src_install() {
+   cmake_src_install
+
+   if ! use doc; then
+   rm -r "${ED}"/usr/share/doc/${PF}/examples || die
+   fi
+
+   if use python; then
+   pushd python > /dev/null || die
+   distutils-r1_src_install
+   popd > /dev/null || die
+   fi
+
+   # The man pages exists in src_install either in non-live ebuilds,
+   # since they are then shipped pre-compiled in herbstluftwm's
+   # release tarbal. Or they exist in live ebuilds if the 'doc' USE
+   # flag is enabled.
+   if [[ "${PV}" !=  ]] || use doc; then
+   local man_pages=(
+   herbstluftwm.1
+   herbstclient.1
+   herbstluftwm-tutorial.7
+   )
+   for man_page in "${man_pages[@]}"; do
+   doman "doc/${man_page}"
+   done

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2022-05-30 Thread Florian Schmaus

commit: 99c231296b5f352d271f274cc7c9a3043ae441af
Author: Florian Schmaus  gentoo  org>
AuthorDate: Mon May 30 07:16:02 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Mon May 30 07:19:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99c23129

x11-wm/herbstluftwm: update EAPI 7 -> 8 and adjustments

Signed-off-by: Florian Schmaus  gentoo.org>

 x11-wm/herbstluftwm/herbstluftwm-.ebuild | 18 --
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/x11-wm/herbstluftwm/herbstluftwm-.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
index ed397f906c24..4bb6c21b60f1 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_OPTIONAL=1
 
-inherit cmake distutils-r1 toolchain-funcs
+inherit cmake distutils-r1
 
 DESCRIPTION="A manual tiling window manager for X"
 HOMEPAGE="https://herbstluftwm.org/;
@@ -26,12 +26,13 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 COMMON_DEPEND="
-   media-libs/freetype
x11-libs/libX11
x11-libs/libXext
+   x11-libs/libXfixes
x11-libs/libXft
x11-libs/libXinerama
x11-libs/libXrandr
+   x11-libs/libXrender
 "
 DEPEND="
${COMMON_DEPEND}
@@ -70,6 +71,11 @@ src_prepare() {
-e '/^install.*LICENSEDIR/d' \
-e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
CMakeLists.txt || die
+
+   # Do not install MAN pages, we use doman in src_install() for that.
+   sed -i '/MANDIR/d' \
+   doc/CMakeLists.txt || die
+
cmake_src_prepare
 
if use python; then
@@ -123,7 +129,7 @@ src_install() {
herbstluftwm-tutorial.7
)
for man_page in "${man_pages[@]}"; do
-   doman "doc/${man_page}"
+   doman "${BUILD_DIR}/doc/${man_page}"
done
fi
 }

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2022-04-13 Thread Sam James

commit: d2eeefd6fe6428c5c14f5dd090fc4179af97ed80
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr 13 14:46:03 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr 13 14:46:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2eeefd6

x11-wm/herbstluftwm: retire andrey_utkin

Signed-off-by: Sam James  gentoo.org>

 x11-wm/herbstluftwm/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/x11-wm/herbstluftwm/metadata.xml b/x11-wm/herbstluftwm/metadata.xml
index c2cf555c9a58..aa699bc6190d 100644
--- a/x11-wm/herbstluftwm/metadata.xml
+++ b/x11-wm/herbstluftwm/metadata.xml
@@ -5,10 +5,6 @@
f...@gentoo.org
Florian Schmaus

-   
-   andrey_ut...@gentoo.org
-   Andrey Utkin
-   

herbstluftwm/herbstluftwm

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2021-07-28 Thread Florian Schmaus

commit: a70ed336e8cce6efe9baf0ba764b5bc927b1d526
Author: Florian Schmaus  gentoo  org>
AuthorDate: Wed Jul 28 08:36:09 2021 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Wed Jul 28 08:37:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a70ed336

x11-wm/herbstluftwm: improve src_test, use distutils-r1_src_test

Using distutils' src_test facilities also means that we can get rid of
the "export PYTHONPATH" workaround.

Signed-off-by: Florian Schmaus  gentoo.org>

 x11-wm/herbstluftwm/herbstluftwm-.ebuild | 24 +---
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/x11-wm/herbstluftwm/herbstluftwm-.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
index 37035a6a5ff..ed397f906c2 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
@@ -55,6 +55,10 @@ BDEPEND="
 "
 
 if [[ -n "${EGIT_REPO_URI}" ]]; then
+   # If hlwm is build from VCS, then hlwm-doc.json, which is used in
+   # the tests, needs to generated by the WITH_DOCUMENTATION option.
+   REQUIRED_USE+=" test? ( doc )"
+
# Herbstluftwm tarballs ship with pre-compiled documentation, only
# if we build from git asciidoc is needed.
BDEPEND+=" doc? ( app-text/asciidoc )"
@@ -126,15 +130,21 @@ src_install() {
 
 distutils_enable_tests pytest
 
-src_test() {
-   ln -s "${BUILD_DIR}/herbstclient" || die "Could not symlink 
herbstclient"
-   ln -s "${BUILD_DIR}/herbstluftwm" || die "Could not symlink 
herbstluftwm"
-
+python_test() {
pushd python > /dev/null || die
distutils_install_for_testing
popd > /dev/null || die
 
-   # Ensure PYTHONPATH is exported, see https://bugs.gentoo.org/801658.
-   export PYTHONPATH
-   python_test
+   distutils-r1_python_test
+}
+
+src_test() {
+   if [[ -n "${EGIT_REPO_URI}" ]]; then
+   ln -s "${BUILD_DIR}/doc/hlwm-doc.json" "doc/hlwm-doc.json" || 
die "Could not symlink hlwm-doc.json"
+   fi
+
+   ln -s "${BUILD_DIR}/herbstclient" || die "Could not symlink 
herbstclient"
+   ln -s "${BUILD_DIR}/herbstluftwm" || die "Could not symlink 
herbstluftwm"
+
+   distutils-r1_src_test
 }

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2021-07-12 Thread Florian Schmaus

commit: 1fa0ed9fd7fb3abbd6b2fd5f7f6b6ec638742bf7
Author: Florian Schmaus  gentoo  org>
AuthorDate: Mon Jul 12 07:24:53 2021 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Mon Jul 12 07:24:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fa0ed9f

x11-wm/herbstluftwm: use distutils_install_for_testing in src_test

Bug: https://bugs.gentoo.org/801658
Signed-off-by: Florian Schmaus  gentoo.org>

 x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild | 7 +++
 x11-wm/herbstluftwm/herbstluftwm-.ebuild  | 7 +++
 2 files changed, 14 insertions(+)

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
index 65e8342992a..fe478ccf2e5 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
@@ -129,5 +129,12 @@ distutils_enable_tests pytest
 src_test() {
ln -s "${BUILD_DIR}/herbstclient" || die "Could not symlink 
herbstclient"
ln -s "${BUILD_DIR}/herbstluftwm" || die "Could not symlink 
herbstluftwm"
+
+   pushd python > /dev/null || die
+   distutils_install_for_testing
+   popd > /dev/null || die
+
+   # Ensure PYTHONPATH is exported, see https://bugs.gentoo.org/801658.
+   export PYTHONPATH
python_test
 }

diff --git a/x11-wm/herbstluftwm/herbstluftwm-.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
index c167e7f353e..37035a6a5ff 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
@@ -129,5 +129,12 @@ distutils_enable_tests pytest
 src_test() {
ln -s "${BUILD_DIR}/herbstclient" || die "Could not symlink 
herbstclient"
ln -s "${BUILD_DIR}/herbstluftwm" || die "Could not symlink 
herbstluftwm"
+
+   pushd python > /dev/null || die
+   distutils_install_for_testing
+   popd > /dev/null || die
+
+   # Ensure PYTHONPATH is exported, see https://bugs.gentoo.org/801658.
+   export PYTHONPATH
python_test
 }

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2021-07-07 Thread Florian Schmaus

commit: 6f55d16dfe1aa0c4182cd9003ee2d5bf258a9dae
Author: Florian Schmaus  gentoo  org>
AuthorDate: Wed Jul  7 11:56:47 2021 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Wed Jul  7 11:56:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f55d16d

x11-wm/herbstluftwm: drop 0.7.2-r1

Signed-off-by: Florian Schmaus  gentoo.org>

 x11-wm/herbstluftwm/Manifest |  1 -
 x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild | 72 
 2 files changed, 73 deletions(-)

diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index 5001a621c3b..1241dd364d0 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,2 +1 @@
-DIST herbstluftwm-0.7.2.tar.gz 245506 BLAKE2B 
72d0bb2a77e519161d193ac7b2b9f1f878ccb6cfe4914b6c75d060e2daa0bec4203ee4ebf203b9fa1dfb844d71d50aa7c03257c78aa22e906bf42519d1e592af
 SHA512 
abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c
 DIST herbstluftwm-0.9.3.tar.gz 497523 BLAKE2B 
1936924f86201b6ad6ec33426d366912fd72e2a5e5a4964cafcb40d76624c2a1398c9330cde472343b436d16c9299aba495e1a224c6ea8bb173bbf76b7209cb3
 SHA512 
73e4193a2d79c452c08b4ac1c8fea1e93b88b07baa0c9006b74a76ed84de578d3234789e3666a9299ef3942695225c9a7f85eb3698a44edb1234f6042dbea47c

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild
deleted file mode 100644
index 74f4e1a1a6d..000
--- a/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs bash-completion-r1
-
-if [[ ${PV} == * ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm;
-   BDEPEND="app-text/asciidoc"
-else
-   SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
-   KEYWORDS="amd64 x86"
-   BDEPEND=""
-fi
-
-DESCRIPTION="A manual tiling window manager for X"
-HOMEPAGE="https://herbstluftwm.org/;
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="examples xinerama zsh-completion"
-
-DEPEND="
-   >=dev-libs/glib-2.24:2
-   x11-libs/libX11
-   x11-libs/libXext
-   xinerama? ( x11-libs/libXinerama )
-"
-RDEPEND="
-   ${DEPEND}
-   app-shells/bash
-   zsh-completion? ( app-shells/zsh )
-"
-BDEPEND+="
-   virtual/pkgconfig
-"
-
-src_compile() {
-   tc-export CC CXX LD PKG_CONFIG
-
-   emake LDXX="$(tc-getCXX)" COLOR=0 VERBOSE= \
-   $(use xinerama || echo XINERAMAFLAGS= XINERAMALIBS= )
-}
-
-src_install() {
-   dobin herbstluftwm herbstclient
-   dodoc BUGS MIGRATION NEWS README.md
-
-   doman doc/{herbstluftwm,herbstclient}.1
-
-   exeinto /etc/xdg/herbstluftwm
-   doexe share/{autostart,panel.sh,restartpanels.sh}
-
-   insinto /usr/share/xsessions
-   doins share/herbstluftwm.desktop
-
-   newbashcomp share/herbstclient-completion herbstclient
-
-   if use zsh-completion ; then
-   insinto /usr/share/zsh/site-functions
-   doins share/_herbstclient
-   fi
-
-   if use examples ; then
-   exeinto /usr/share/doc/${PF}/examples
-   doexe scripts/*.sh
-   docinto examples
-   dodoc scripts/README
-   docompress -x /usr/share/doc/${PF}/examples
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2021-07-07 Thread Florian Schmaus

commit: 92268805efceaf171c7b6e531cf9a00ea7c25093
Author: Florian Schmaus  gentoo  org>
AuthorDate: Wed Jul  7 11:54:17 2021 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Wed Jul  7 11:56:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92268805

x11-wm/herbstluftwm: Stabilize 0.9.3 amd64 x86, #800881

Closes: https://bugs.gentoo.org/800881
Signed-off-by: Florian Schmaus  gentoo.org>

 x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
index c167e7f353e..65e8342992a 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == "" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; 
then
inherit git-r3
 else
SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 LICENSE="BSD-2"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2021-06-24 Thread Florian Schmaus

commit: 19b8294c23c80422f8e44bf1c04609bccba25945
Author: Florian Schmaus  gentoo  org>
AuthorDate: Thu Jun 24 06:52:55 2021 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Thu Jun 24 06:52:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19b8294c

x11-wm/herbstluftwm: add missing xterm test dependency

Signed-off-by: Florian Schmaus  gentoo.org>

 x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild | 1 +
 x11-wm/herbstluftwm/herbstluftwm-.ebuild  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
index 652478161a9..c167e7f353e 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
@@ -41,6 +41,7 @@ DEPEND="
x11-apps/xsetroot
x11-base/xorg-server[xephyr,xvfb]
x11-misc/xdotool
+   x11-terms/xterm
)
 "
 RDEPEND="

diff --git a/x11-wm/herbstluftwm/herbstluftwm-.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
index 652478161a9..c167e7f353e 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
@@ -41,6 +41,7 @@ DEPEND="
x11-apps/xsetroot
x11-base/xorg-server[xephyr,xvfb]
x11-misc/xdotool
+   x11-terms/xterm
)
 "
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2021-06-23 Thread Florian Schmaus

commit: fbb9f94fca4a20f0e9ab92d9a4ac06a93a05c05f
Author: Florian Schmaus  gentoo  org>
AuthorDate: Wed Jun 23 12:00:54 2021 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Wed Jun 23 12:09:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbb9f94f

x11-wm/herbstluftwm: enable tests

Closes: https://bugs.gentoo.org/797496
Signed-off-by: Florian Schmaus  gentoo.org>

 x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild | 25 ++---
 x11-wm/herbstluftwm/herbstluftwm-.ebuild  | 25 ++---
 2 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
index f374bfa2fc7..652478161a9 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
@@ -21,10 +21,11 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="+doc python"
+IUSE="+doc python test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-DEPEND="
+COMMON_DEPEND="
media-libs/freetype
x11-libs/libX11
x11-libs/libXext
@@ -32,8 +33,18 @@ DEPEND="
x11-libs/libXinerama
x11-libs/libXrandr
 "
+DEPEND="
+   ${COMMON_DEPEND}
+   test? (
+   dev-python/ewmh
+   dev-python/python-xlib
+   x11-apps/xsetroot
+   x11-base/xorg-server[xephyr,xvfb]
+   x11-misc/xdotool
+   )
+"
 RDEPEND="
-   ${DEPEND}
+   ${COMMON_DEPEND}
app-shells/bash
python? ( ${PYTHON_DEPS} )
 "
@@ -111,3 +122,11 @@ src_install() {
done
fi
 }
+
+distutils_enable_tests pytest
+
+src_test() {
+   ln -s "${BUILD_DIR}/herbstclient" || die "Could not symlink 
herbstclient"
+   ln -s "${BUILD_DIR}/herbstluftwm" || die "Could not symlink 
herbstluftwm"
+   python_test
+}

diff --git a/x11-wm/herbstluftwm/herbstluftwm-.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
index f374bfa2fc7..652478161a9 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
@@ -21,10 +21,11 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="+doc python"
+IUSE="+doc python test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-DEPEND="
+COMMON_DEPEND="
media-libs/freetype
x11-libs/libX11
x11-libs/libXext
@@ -32,8 +33,18 @@ DEPEND="
x11-libs/libXinerama
x11-libs/libXrandr
 "
+DEPEND="
+   ${COMMON_DEPEND}
+   test? (
+   dev-python/ewmh
+   dev-python/python-xlib
+   x11-apps/xsetroot
+   x11-base/xorg-server[xephyr,xvfb]
+   x11-misc/xdotool
+   )
+"
 RDEPEND="
-   ${DEPEND}
+   ${COMMON_DEPEND}
app-shells/bash
python? ( ${PYTHON_DEPS} )
 "
@@ -111,3 +122,11 @@ src_install() {
done
fi
 }
+
+distutils_enable_tests pytest
+
+src_test() {
+   ln -s "${BUILD_DIR}/herbstclient" || die "Could not symlink 
herbstclient"
+   ln -s "${BUILD_DIR}/herbstluftwm" || die "Could not symlink 
herbstluftwm"
+   python_test
+}

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2021-06-22 Thread Florian Schmaus

commit: 0273757ac20f1d665117690c2ab05e2995448a45
Author: Florian Schmaus  gentoo  org>
AuthorDate: Tue Jun 22 06:31:02 2021 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Tue Jun 22 06:34:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0273757a

x11-wm/herbstluftwm: add myself as maintainer

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Florian Schmaus  gentoo.org>

 x11-wm/herbstluftwm/metadata.xml | 9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/x11-wm/herbstluftwm/metadata.xml b/x11-wm/herbstluftwm/metadata.xml
index 272d4aa6b4c..5d43bb6e9eb 100644
--- a/x11-wm/herbstluftwm/metadata.xml
+++ b/x11-wm/herbstluftwm/metadata.xml
@@ -1,12 +1,9 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   f...@geekplace.eu
-   
-   
-   proxy-ma...@gentoo.org
-   Proxy Maintainers
+   
+   f...@gentoo.org
+   Florian Schmaus


andrey_ut...@gentoo.org

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2021-06-05 Thread Sam James

commit: f23a9019ac3062f86ef25b2a87a0f44aa1cf01b9
Author: Florian Schmaus  geekplace  eu>
AuthorDate: Mon May  3 17:06:20 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun  5 21:26:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f23a9019

x11-wm/herbstluftwm: sync - with latest release ebuild

Signed-off-by: Florian Schmaus  geekplace.eu>
Closes: https://github.com/gentoo/gentoo/pull/20672
Signed-off-by: Sam James  gentoo.org>

 x11-wm/herbstluftwm/herbstluftwm-.ebuild | 67 +---
 1 file changed, 61 insertions(+), 6 deletions(-)

diff --git a/x11-wm/herbstluftwm/herbstluftwm-.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
index 28d103f5405..f374bfa2fc7 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
@@ -3,40 +3,64 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
+DISTUTILS_OPTIONAL=1
 
-inherit cmake git-r3 python-any-r1 toolchain-funcs
+inherit cmake distutils-r1 toolchain-funcs
 
 DESCRIPTION="A manual tiling window manager for X"
 HOMEPAGE="https://herbstluftwm.org/;
-EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm;
+
+if [[ "${PV}" == "" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; then
+   EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm;
+   inherit git-r3
+else
+   SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
+   KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="doc examples"
+IUSE="+doc python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 DEPEND="
+   media-libs/freetype
x11-libs/libX11
x11-libs/libXext
+   x11-libs/libXft
x11-libs/libXinerama
x11-libs/libXrandr
 "
 RDEPEND="
${DEPEND}
app-shells/bash
+   python? ( ${PYTHON_DEPS} )
 "
 BDEPEND="
${PYTHON_DEPS}
virtual/pkgconfig
-   doc? ( app-text/asciidoc )
 "
 
+if [[ -n "${EGIT_REPO_URI}" ]]; then
+   # Herbstluftwm tarballs ship with pre-compiled documentation, only
+   # if we build from git asciidoc is needed.
+   BDEPEND+=" doc? ( app-text/asciidoc )"
+fi
+
 src_prepare() {
+   # Do not install LICENSE and respect CMAKE_INSTALL_DOCDIR.
sed -i \
-e '/^install.*LICENSEDIR/d' \
-e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
CMakeLists.txt || die
cmake_src_prepare
+
+   if use python; then
+   pushd "${S}"/python > /dev/null || die
+   distutils-r1_src_prepare
+   popd > /dev/null || die
+   fi
 }
 
 src_configure() {
@@ -49,10 +73,41 @@ src_configure() {
cmake_src_configure
 }
 
+src_compile() {
+   cmake_src_compile
+
+   if use python; then
+   pushd python > /dev/null || die
+   distutils-r1_src_compile
+   popd >/dev/null || die
+   fi
+}
+
 src_install() {
cmake_src_install
 
-   if ! use examples; then
+   if ! use doc; then
rm -r "${ED}"/usr/share/doc/${PF}/examples || die
fi
+
+   if use python; then
+   pushd python > /dev/null || die
+   distutils-r1_src_install
+   popd > /dev/null || die
+   fi
+
+   # The man pages exists in src_install either in non-live ebuilds,
+   # since they are then shipped pre-compiled in herbstluftwm's
+   # release tarbal. Or they exist in live ebuilds if the 'doc' USE
+   # flag is enabled.
+   if [[ "${PV}" !=  ]] || use doc; then
+   local man_pages=(
+   herbstluftwm.1
+   herbstclient.1
+   herbstluftwm-tutorial.7
+   )
+   for man_page in "${man_pages[@]}"; do
+   doman "doc/${man_page}"
+   done
+   fi
 }

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2021-06-05 Thread Sam James

commit: 61bdb3decb38a4dc913b90918a2fef72ebeae347
Author: Florian Schmaus  geekplace  eu>
AuthorDate: Sat May  8 08:15:01 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun  5 21:26:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61bdb3de

x11-wm/herbstluftwm: drop 0.9.1

Signed-off-by: Florian Schmaus  geekplace.eu>
Signed-off-by: Sam James  gentoo.org>

 x11-wm/herbstluftwm/Manifest  |  1 -
 x11-wm/herbstluftwm/herbstluftwm-0.9.1.ebuild | 59 ---
 2 files changed, 60 deletions(-)

diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index 91e0df75ff9..164b1cba2ab 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,3 +1,2 @@
 DIST herbstluftwm-0.7.2.tar.gz 245506 BLAKE2B 
72d0bb2a77e519161d193ac7b2b9f1f878ccb6cfe4914b6c75d060e2daa0bec4203ee4ebf203b9fa1dfb844d71d50aa7c03257c78aa22e906bf42519d1e592af
 SHA512 
abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c
-DIST herbstluftwm-0.9.1.tar.gz 432926 BLAKE2B 
38f8626f3f8957cae32d71202b03515c26a4e174ce550ed6b31e7e024c3a3095374ad68f5aecc55c608c0a8565063ff39f85596444884557f38ff39043bd1d7d
 SHA512 
c69cc5a77e98e2e0a1c84938394fe97cd985bfedb8bb1e2dceddb0268f30597cdf9b30048aa3618c20ec549f2113b7a694f2fbcc578b8f0117bdd8cac85d
 DIST herbstluftwm-0.9.2.tar.gz 448757 BLAKE2B 
f969e4a02aad11c5bd75ac261c7dd8c9448234a050f82f0cdd9bc29c998c4f6bb496f6e32d20016b06849218952c6a2f993f46aa94c29d011f4ff6865a2197bc
 SHA512 
5426b4d1810f01cf043cf43644d4c65692a5aa207893be484c86eb0eeb96ca6259c86b843146a9eebdf4de988f2d2ed742674907be47262c6029d8aa7ab2265c

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.1.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.9.1.ebuild
deleted file mode 100644
index cd643535927..000
--- a/x11-wm/herbstluftwm/herbstluftwm-0.9.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake python-any-r1 toolchain-funcs
-
-DESCRIPTION="A manual tiling window manager for X"
-HOMEPAGE="https://herbstluftwm.org/;
-SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="doc examples"
-
-DEPEND="
-   x11-libs/libX11
-   x11-libs/libXext
-   x11-libs/libXinerama
-   x11-libs/libXrandr
-"
-RDEPEND="
-   ${DEPEND}
-   app-shells/bash
-"
-BDEPEND="
-   ${PYTHON_DEPS}
-   virtual/pkgconfig
-   doc? ( app-text/asciidoc )
-"
-
-src_prepare() {
-   sed -i \
-   -e '/^install.*LICENSEDIR/d' \
-   -e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
-   CMakeLists.txt || die
-   cmake_src_prepare
-}
-
-src_configure() {
-   # Ensure that 'python3' is in PATH. #765118
-   python_setup
-
-   mycmakeargs=(
-   -DWITH_DOCUMENTATION=$(usex doc)
-   )
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-
-   if ! use examples; then
-   rm -r "${ED}"/usr/share/doc/${PF}/examples || die
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2021-06-05 Thread Sam James

commit: 7bcb4761570bdf9fa59d97fa3c05dab45b06f5fb
Author: Florian Schmaus  geekplace  eu>
AuthorDate: Sat May  8 08:18:13 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun  5 21:26:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bcb4761

x11-wm/herbstluftwm: add 0.9.3, drop 0.9.2

This also drops the 'examples' USE flag, as the examples are to small
to justify their own USE flag. Furthermore, app-text/asciidoc is only
needed when building from git, as the release tarballs of herbstluftwm
contain precompiled HTML files.

Closes: https://bugs.gentoo.org/787848
Signed-off-by: Florian Schmaus  geekplace.eu>
Signed-off-by: Sam James  gentoo.org>

 x11-wm/herbstluftwm/Manifest   |  2 +-
 ...ftwm-0.9.2.ebuild => herbstluftwm-0.9.3.ebuild} | 28 ++
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index 164b1cba2ab..5001a621c3b 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,2 +1,2 @@
 DIST herbstluftwm-0.7.2.tar.gz 245506 BLAKE2B 
72d0bb2a77e519161d193ac7b2b9f1f878ccb6cfe4914b6c75d060e2daa0bec4203ee4ebf203b9fa1dfb844d71d50aa7c03257c78aa22e906bf42519d1e592af
 SHA512 
abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c
-DIST herbstluftwm-0.9.2.tar.gz 448757 BLAKE2B 
f969e4a02aad11c5bd75ac261c7dd8c9448234a050f82f0cdd9bc29c998c4f6bb496f6e32d20016b06849218952c6a2f993f46aa94c29d011f4ff6865a2197bc
 SHA512 
5426b4d1810f01cf043cf43644d4c65692a5aa207893be484c86eb0eeb96ca6259c86b843146a9eebdf4de988f2d2ed742674907be47262c6029d8aa7ab2265c
+DIST herbstluftwm-0.9.3.tar.gz 497523 BLAKE2B 
1936924f86201b6ad6ec33426d366912fd72e2a5e5a4964cafcb40d76624c2a1398c9330cde472343b436d16c9299aba495e1a224c6ea8bb173bbf76b7209cb3
 SHA512 
73e4193a2d79c452c08b4ac1c8fea1e93b88b07baa0c9006b74a76ed84de578d3234789e3666a9299ef3942695225c9a7f85eb3698a44edb1234f6042dbea47c

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.2.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
similarity index 68%
rename from x11-wm/herbstluftwm/herbstluftwm-0.9.2.ebuild
rename to x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
index 31f1710a7b3..f374bfa2fc7 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.9.2.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 DISTUTILS_OPTIONAL=1
 
 inherit cmake distutils-r1 toolchain-funcs
@@ -21,7 +21,7 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="doc examples python"
+IUSE="+doc python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 DEPEND="
@@ -40,10 +40,16 @@ RDEPEND="
 BDEPEND="
${PYTHON_DEPS}
virtual/pkgconfig
-   doc? ( app-text/asciidoc )
 "
 
+if [[ -n "${EGIT_REPO_URI}" ]]; then
+   # Herbstluftwm tarballs ship with pre-compiled documentation, only
+   # if we build from git asciidoc is needed.
+   BDEPEND+=" doc? ( app-text/asciidoc )"
+fi
+
 src_prepare() {
+   # Do not install LICENSE and respect CMAKE_INSTALL_DOCDIR.
sed -i \
-e '/^install.*LICENSEDIR/d' \
-e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
@@ -80,7 +86,7 @@ src_compile() {
 src_install() {
cmake_src_install
 
-   if ! use examples; then
+   if ! use doc; then
rm -r "${ED}"/usr/share/doc/${PF}/examples || die
fi
 
@@ -90,4 +96,18 @@ src_install() {
popd > /dev/null || die
fi
 
+   # The man pages exists in src_install either in non-live ebuilds,
+   # since they are then shipped pre-compiled in herbstluftwm's
+   # release tarbal. Or they exist in live ebuilds if the 'doc' USE
+   # flag is enabled.
+   if [[ "${PV}" !=  ]] || use doc; then
+   local man_pages=(
+   herbstluftwm.1
+   herbstclient.1
+   herbstluftwm-tutorial.7
+   )
+   for man_page in "${man_pages[@]}"; do
+   doman "doc/${man_page}"
+   done
+   fi
 }

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2021-04-11 Thread Joonas Niilola

commit: ae3794e3280ad609cd7a6ff28c275603d908b3a8
Author: Florian Schmaus  geekplace  eu>
AuthorDate: Thu Apr  1 06:54:22 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Apr 11 07:39:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae3794e3

x11-wm/herbstluftwm: add 0.9.2

Closes: https://bugs.gentoo.org/779646
Signed-off-by: Florian Schmaus  geekplace.eu>
Closes: https://github.com/gentoo/gentoo/pull/20215
Signed-off-by: Joonas Niilola  gentoo.org>

 x11-wm/herbstluftwm/Manifest  |  1 +
 x11-wm/herbstluftwm/herbstluftwm-0.9.2.ebuild | 93 +++
 2 files changed, 94 insertions(+)

diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index f311a69b334..91e0df75ff9 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,2 +1,3 @@
 DIST herbstluftwm-0.7.2.tar.gz 245506 BLAKE2B 
72d0bb2a77e519161d193ac7b2b9f1f878ccb6cfe4914b6c75d060e2daa0bec4203ee4ebf203b9fa1dfb844d71d50aa7c03257c78aa22e906bf42519d1e592af
 SHA512 
abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c
 DIST herbstluftwm-0.9.1.tar.gz 432926 BLAKE2B 
38f8626f3f8957cae32d71202b03515c26a4e174ce550ed6b31e7e024c3a3095374ad68f5aecc55c608c0a8565063ff39f85596444884557f38ff39043bd1d7d
 SHA512 
c69cc5a77e98e2e0a1c84938394fe97cd985bfedb8bb1e2dceddb0268f30597cdf9b30048aa3618c20ec549f2113b7a694f2fbcc578b8f0117bdd8cac85d
+DIST herbstluftwm-0.9.2.tar.gz 448757 BLAKE2B 
f969e4a02aad11c5bd75ac261c7dd8c9448234a050f82f0cdd9bc29c998c4f6bb496f6e32d20016b06849218952c6a2f993f46aa94c29d011f4ff6865a2197bc
 SHA512 
5426b4d1810f01cf043cf43644d4c65692a5aa207893be484c86eb0eeb96ca6259c86b843146a9eebdf4de988f2d2ed742674907be47262c6029d8aa7ab2265c

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.2.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.9.2.ebuild
new file mode 100644
index 000..31f1710a7b3
--- /dev/null
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_OPTIONAL=1
+
+inherit cmake distutils-r1 toolchain-funcs
+
+DESCRIPTION="A manual tiling window manager for X"
+HOMEPAGE="https://herbstluftwm.org/;
+
+if [[ "${PV}" == "" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; then
+   EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm;
+   inherit git-r3
+else
+   SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="doc examples python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+   media-libs/freetype
+   x11-libs/libX11
+   x11-libs/libXext
+   x11-libs/libXft
+   x11-libs/libXinerama
+   x11-libs/libXrandr
+"
+RDEPEND="
+   ${DEPEND}
+   app-shells/bash
+   python? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+   ${PYTHON_DEPS}
+   virtual/pkgconfig
+   doc? ( app-text/asciidoc )
+"
+
+src_prepare() {
+   sed -i \
+   -e '/^install.*LICENSEDIR/d' \
+   -e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
+   CMakeLists.txt || die
+   cmake_src_prepare
+
+   if use python; then
+   pushd "${S}"/python > /dev/null || die
+   distutils-r1_src_prepare
+   popd > /dev/null || die
+   fi
+}
+
+src_configure() {
+   # Ensure that 'python3' is in PATH. #765118
+   python_setup
+
+   mycmakeargs=(
+   -DWITH_DOCUMENTATION=$(usex doc)
+   )
+   cmake_src_configure
+}
+
+src_compile() {
+   cmake_src_compile
+
+   if use python; then
+   pushd python > /dev/null || die
+   distutils-r1_src_compile
+   popd >/dev/null || die
+   fi
+}
+
+src_install() {
+   cmake_src_install
+
+   if ! use examples; then
+   rm -r "${ED}"/usr/share/doc/${PF}/examples || die
+   fi
+
+   if use python; then
+   pushd python > /dev/null || die
+   distutils-r1_src_install
+   popd > /dev/null || die
+   fi
+
+}

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2021-01-27 Thread Joonas Niilola

commit: b86b57ab49a223b2e84cc49dbb7977ca1095ece4
Author: Florian Schmaus  geekplace  eu>
AuthorDate: Tue Jan 12 18:42:08 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jan 28 07:36:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b86b57ab

x11-wm/herbstluftwm: drop old

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Florian Schmaus  geekplace.eu>
Signed-off-by: Joonas Niilola  gentoo.org>

 x11-wm/herbstluftwm/Manifest  |  2 -
 x11-wm/herbstluftwm/herbstluftwm-0.8.2.ebuild | 58 ---
 x11-wm/herbstluftwm/herbstluftwm-0.8.3.ebuild | 53 
 3 files changed, 113 deletions(-)

diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index d6d31204504..086357fa5b0 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,4 +1,2 @@
 DIST herbstluftwm-0.7.2.tar.gz 245506 BLAKE2B 
72d0bb2a77e519161d193ac7b2b9f1f878ccb6cfe4914b6c75d060e2daa0bec4203ee4ebf203b9fa1dfb844d71d50aa7c03257c78aa22e906bf42519d1e592af
 SHA512 
abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c
-DIST herbstluftwm-0.8.2.tar.gz 377790 BLAKE2B 
88cee9937f134f6784fb5917435f629db67971339b09da8c6b91b55286fc50a7ba9d8dbea98dc583a92f5ae6e0e427dd487265cfb7d1ca4bbc10f865a2532e3e
 SHA512 
1a2bf3861ce23e33bb09afed285f7d85450307b46d00a666d02eaf9c454d53904e4d54ca8b0245da5ef095667a0adf9cdfc3aff170089c99df6b7f01e9038d5f
-DIST herbstluftwm-0.8.3.tar.gz 379052 BLAKE2B 
e8216d856df7111951842001992cac07b37efa89ba8cd52c804a763135a91512f92902910e726193a2cc902e93dacc1bae1e701ff4c669e164080992a3410bca
 SHA512 
ff6acb64a6609030abfe315452567f7011088b39e123f3fd988448183c4bf1c65aa0ba49ba1b0ab18b959448e12638a8198093db25bcfba828791e3305966ef1
 DIST herbstluftwm-0.9.0.tar.gz 406897 BLAKE2B 
06a2d6f303e1cf3990ae5247104952936e374b39ec4be316885718a94741f21c868f084ac7c3d4854d3e2870c26b4037153f3f18bffdb7458e56b3039eb4f1e1
 SHA512 
a9d4486729a65c8eb87b0d36f0cc28349f670abee82e20c9649e1348298ca5e73f9b349921007d555d620327cc09dab4c24e9c76dd971afc7f4de98b9408d925

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.8.2.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.8.2.ebuild
deleted file mode 100644
index 716b6043cb6..000
--- a/x11-wm/herbstluftwm/herbstluftwm-0.8.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs cmake-utils
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm;
-   BDEPEND="app-text/asciidoc"
-else
-   SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
-   KEYWORDS="~amd64 ~x86"
-   BDEPEND=""
-fi
-
-DESCRIPTION="A manual tiling window manager for X"
-HOMEPAGE="https://herbstluftwm.org/;
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="examples zsh-completion"
-
-DEPEND="
-   x11-libs/libX11
-   x11-libs/libXext
-   x11-libs/libXinerama
-   x11-libs/libXrandr
-"
-RDEPEND="
-   ${DEPEND}
-   app-shells/bash
-   zsh-completion? ( app-shells/zsh )
-"
-BDEPEND+="
-   virtual/pkgconfig
-"
-
-src_configure() {
-   sed -i \
-   -e '/^install.*LICENSEDIR/d' \
-   -e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
-   CMakeLists.txt || die
-
-   cmake-utils_src_configure
-}
-
-src_install() {
-   cmake-utils_src_install
-
-   if ! use examples; then
-   rm -r "${ED}"/usr/share/doc/${PF}/examples || die
-   fi
-
-   if ! use zsh-completion; then
-   rm -r "${ED}"/usr/share/zsh || die
-   fi
-}

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.8.3.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.8.3.ebuild
deleted file mode 100644
index a27ee0ea3e0..000
--- a/x11-wm/herbstluftwm/herbstluftwm-0.8.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs cmake-utils
-
-DESCRIPTION="A manual tiling window manager for X"
-HOMEPAGE="https://herbstluftwm.org/;
-SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="doc examples"
-
-DEPEND="
-   x11-libs/libX11
-   x11-libs/libXext
-   x11-libs/libXinerama
-   x11-libs/libXrandr
-"
-RDEPEND="
-   ${DEPEND}
-   app-shells/bash
-"
-BDEPEND="
-   virtual/pkgconfig
-   doc? ( app-text/asciidoc )
-"
-
-src_prepare() {
-   sed -i \
-   -e '/^install.*LICENSEDIR/d' \
-   -e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
-   CMakeLists.txt || die
-   cmake-utils_src_prepare
-}
-
-src_configure() {
-   mycmakeargs=(
-   -DWITH_DOCUMENTATION=$(usex doc)
-   )
-
-

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2021-01-27 Thread Joonas Niilola

commit: ecf6dc462918697e92f9e21d37b681aa2be275aa
Author: Florian Schmaus  geekplace  eu>
AuthorDate: Tue Jan 12 18:56:44 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jan 28 07:36:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecf6dc46

x11-wm/herbstluftwm: fix python-exec[-native-symlinks], add 0.9.1

Closes: https://bugs.gentoo.org/765118
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Florian Schmaus  geekplace.eu>
Closes: https://github.com/gentoo/gentoo/pull/19045
Signed-off-by: Joonas Niilola  gentoo.org>

 x11-wm/herbstluftwm/Manifest |  2 +-
 .../{herbstluftwm-0.9.0.ebuild => herbstluftwm-0.9.1.ebuild} | 12 +---
 x11-wm/herbstluftwm/herbstluftwm-.ebuild | 12 +---
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index 086357fa5b0..f311a69b334 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,2 +1,2 @@
 DIST herbstluftwm-0.7.2.tar.gz 245506 BLAKE2B 
72d0bb2a77e519161d193ac7b2b9f1f878ccb6cfe4914b6c75d060e2daa0bec4203ee4ebf203b9fa1dfb844d71d50aa7c03257c78aa22e906bf42519d1e592af
 SHA512 
abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c
-DIST herbstluftwm-0.9.0.tar.gz 406897 BLAKE2B 
06a2d6f303e1cf3990ae5247104952936e374b39ec4be316885718a94741f21c868f084ac7c3d4854d3e2870c26b4037153f3f18bffdb7458e56b3039eb4f1e1
 SHA512 
a9d4486729a65c8eb87b0d36f0cc28349f670abee82e20c9649e1348298ca5e73f9b349921007d555d620327cc09dab4c24e9c76dd971afc7f4de98b9408d925
+DIST herbstluftwm-0.9.1.tar.gz 432926 BLAKE2B 
38f8626f3f8957cae32d71202b03515c26a4e174ce550ed6b31e7e024c3a3095374ad68f5aecc55c608c0a8565063ff39f85596444884557f38ff39043bd1d7d
 SHA512 
c69cc5a77e98e2e0a1c84938394fe97cd985bfedb8bb1e2dceddb0268f30597cdf9b30048aa3618c20ec549f2113b7a694f2fbcc578b8f0117bdd8cac85d

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.0.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.9.1.ebuild
similarity index 81%
rename from x11-wm/herbstluftwm/herbstluftwm-0.9.0.ebuild
rename to x11-wm/herbstluftwm/herbstluftwm-0.9.1.ebuild
index c2dc9d85fed..cd643535927 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.9.0.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.1.ebuild
@@ -1,8 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake toolchain-funcs
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit cmake python-any-r1 toolchain-funcs
 
 DESCRIPTION="A manual tiling window manager for X"
 HOMEPAGE="https://herbstluftwm.org/;
@@ -24,6 +27,7 @@ RDEPEND="
app-shells/bash
 "
 BDEPEND="
+   ${PYTHON_DEPS}
virtual/pkgconfig
doc? ( app-text/asciidoc )
 "
@@ -37,10 +41,12 @@ src_prepare() {
 }
 
 src_configure() {
+   # Ensure that 'python3' is in PATH. #765118
+   python_setup
+
mycmakeargs=(
-DWITH_DOCUMENTATION=$(usex doc)
)
-
cmake_src_configure
 }
 

diff --git a/x11-wm/herbstluftwm/herbstluftwm-.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
index 383fa9d17ea..28d103f5405 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
@@ -1,8 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit git-r3 toolchain-funcs cmake
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit cmake git-r3 python-any-r1 toolchain-funcs
 
 DESCRIPTION="A manual tiling window manager for X"
 HOMEPAGE="https://herbstluftwm.org/;
@@ -23,6 +26,7 @@ RDEPEND="
app-shells/bash
 "
 BDEPEND="
+   ${PYTHON_DEPS}
virtual/pkgconfig
doc? ( app-text/asciidoc )
 "
@@ -36,10 +40,12 @@ src_prepare() {
 }
 
 src_configure() {
+   # Ensure that 'python3' is in PATH. #765118
+   python_setup
+
mycmakeargs=(
-DWITH_DOCUMENTATION=$(usex doc)
)
-
cmake_src_configure
 }

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2020-12-01 Thread Andrey Utkin

commit: dcd2a537b8533c5b6a62cb5d529e55a03fc138f3
Author: Andrey Utkin  gentoo  org>
AuthorDate: Tue Dec  1 13:59:44 2020 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Tue Dec  1 14:01:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcd2a537

x11-wm/herbstluftwm: revert "remove old 0.7.2-r1, 0.8.2"

This reverts commit f47143995e6272d766ff41e752a10f1344a0c84e.

0.7.2-r1 was the last stabilized version.

Signed-off-by: Andrey Utkin  gentoo.org>

 x11-wm/herbstluftwm/Manifest |  2 +
 x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild | 72 
 x11-wm/herbstluftwm/herbstluftwm-0.8.2.ebuild| 58 +++
 3 files changed, 132 insertions(+)

diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index e8dfa9556e3..d6d31204504 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,2 +1,4 @@
+DIST herbstluftwm-0.7.2.tar.gz 245506 BLAKE2B 
72d0bb2a77e519161d193ac7b2b9f1f878ccb6cfe4914b6c75d060e2daa0bec4203ee4ebf203b9fa1dfb844d71d50aa7c03257c78aa22e906bf42519d1e592af
 SHA512 
abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c
+DIST herbstluftwm-0.8.2.tar.gz 377790 BLAKE2B 
88cee9937f134f6784fb5917435f629db67971339b09da8c6b91b55286fc50a7ba9d8dbea98dc583a92f5ae6e0e427dd487265cfb7d1ca4bbc10f865a2532e3e
 SHA512 
1a2bf3861ce23e33bb09afed285f7d85450307b46d00a666d02eaf9c454d53904e4d54ca8b0245da5ef095667a0adf9cdfc3aff170089c99df6b7f01e9038d5f
 DIST herbstluftwm-0.8.3.tar.gz 379052 BLAKE2B 
e8216d856df7111951842001992cac07b37efa89ba8cd52c804a763135a91512f92902910e726193a2cc902e93dacc1bae1e701ff4c669e164080992a3410bca
 SHA512 
ff6acb64a6609030abfe315452567f7011088b39e123f3fd988448183c4bf1c65aa0ba49ba1b0ab18b959448e12638a8198093db25bcfba828791e3305966ef1
 DIST herbstluftwm-0.9.0.tar.gz 406897 BLAKE2B 
06a2d6f303e1cf3990ae5247104952936e374b39ec4be316885718a94741f21c868f084ac7c3d4854d3e2870c26b4037153f3f18bffdb7458e56b3039eb4f1e1
 SHA512 
a9d4486729a65c8eb87b0d36f0cc28349f670abee82e20c9649e1348298ca5e73f9b349921007d555d620327cc09dab4c24e9c76dd971afc7f4de98b9408d925

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild
new file mode 100644
index 000..74f4e1a1a6d
--- /dev/null
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs bash-completion-r1
+
+if [[ ${PV} == * ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm;
+   BDEPEND="app-text/asciidoc"
+else
+   SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
+   KEYWORDS="amd64 x86"
+   BDEPEND=""
+fi
+
+DESCRIPTION="A manual tiling window manager for X"
+HOMEPAGE="https://herbstluftwm.org/;
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="examples xinerama zsh-completion"
+
+DEPEND="
+   >=dev-libs/glib-2.24:2
+   x11-libs/libX11
+   x11-libs/libXext
+   xinerama? ( x11-libs/libXinerama )
+"
+RDEPEND="
+   ${DEPEND}
+   app-shells/bash
+   zsh-completion? ( app-shells/zsh )
+"
+BDEPEND+="
+   virtual/pkgconfig
+"
+
+src_compile() {
+   tc-export CC CXX LD PKG_CONFIG
+
+   emake LDXX="$(tc-getCXX)" COLOR=0 VERBOSE= \
+   $(use xinerama || echo XINERAMAFLAGS= XINERAMALIBS= )
+}
+
+src_install() {
+   dobin herbstluftwm herbstclient
+   dodoc BUGS MIGRATION NEWS README.md
+
+   doman doc/{herbstluftwm,herbstclient}.1
+
+   exeinto /etc/xdg/herbstluftwm
+   doexe share/{autostart,panel.sh,restartpanels.sh}
+
+   insinto /usr/share/xsessions
+   doins share/herbstluftwm.desktop
+
+   newbashcomp share/herbstclient-completion herbstclient
+
+   if use zsh-completion ; then
+   insinto /usr/share/zsh/site-functions
+   doins share/_herbstclient
+   fi
+
+   if use examples ; then
+   exeinto /usr/share/doc/${PF}/examples
+   doexe scripts/*.sh
+   docinto examples
+   dodoc scripts/README
+   docompress -x /usr/share/doc/${PF}/examples
+   fi
+}

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.8.2.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.8.2.ebuild
new file mode 100644
index 000..716b6043cb6
--- /dev/null
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.8.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs cmake-utils
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm;
+   BDEPEND="app-text/asciidoc"
+else
+   SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
+   KEYWORDS="~amd64 ~x86"
+

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2020-12-01 Thread Andrey Utkin

commit: f47143995e6272d766ff41e752a10f1344a0c84e
Author: Andrey Utkin  gentoo  org>
AuthorDate: Tue Dec  1 13:45:33 2020 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Tue Dec  1 13:48:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4714399

x11-wm/herbstluftwm: remove old 0.7.2-r1, 0.8.2

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andrey Utkin  gentoo.org>

 x11-wm/herbstluftwm/Manifest |  2 -
 x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild | 72 
 x11-wm/herbstluftwm/herbstluftwm-0.8.2.ebuild| 58 ---
 3 files changed, 132 deletions(-)

diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index d6d31204504..e8dfa9556e3 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,4 +1,2 @@
-DIST herbstluftwm-0.7.2.tar.gz 245506 BLAKE2B 
72d0bb2a77e519161d193ac7b2b9f1f878ccb6cfe4914b6c75d060e2daa0bec4203ee4ebf203b9fa1dfb844d71d50aa7c03257c78aa22e906bf42519d1e592af
 SHA512 
abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c
-DIST herbstluftwm-0.8.2.tar.gz 377790 BLAKE2B 
88cee9937f134f6784fb5917435f629db67971339b09da8c6b91b55286fc50a7ba9d8dbea98dc583a92f5ae6e0e427dd487265cfb7d1ca4bbc10f865a2532e3e
 SHA512 
1a2bf3861ce23e33bb09afed285f7d85450307b46d00a666d02eaf9c454d53904e4d54ca8b0245da5ef095667a0adf9cdfc3aff170089c99df6b7f01e9038d5f
 DIST herbstluftwm-0.8.3.tar.gz 379052 BLAKE2B 
e8216d856df7111951842001992cac07b37efa89ba8cd52c804a763135a91512f92902910e726193a2cc902e93dacc1bae1e701ff4c669e164080992a3410bca
 SHA512 
ff6acb64a6609030abfe315452567f7011088b39e123f3fd988448183c4bf1c65aa0ba49ba1b0ab18b959448e12638a8198093db25bcfba828791e3305966ef1
 DIST herbstluftwm-0.9.0.tar.gz 406897 BLAKE2B 
06a2d6f303e1cf3990ae5247104952936e374b39ec4be316885718a94741f21c868f084ac7c3d4854d3e2870c26b4037153f3f18bffdb7458e56b3039eb4f1e1
 SHA512 
a9d4486729a65c8eb87b0d36f0cc28349f670abee82e20c9649e1348298ca5e73f9b349921007d555d620327cc09dab4c24e9c76dd971afc7f4de98b9408d925

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild
deleted file mode 100644
index 74f4e1a1a6d..000
--- a/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs bash-completion-r1
-
-if [[ ${PV} == * ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm;
-   BDEPEND="app-text/asciidoc"
-else
-   SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
-   KEYWORDS="amd64 x86"
-   BDEPEND=""
-fi
-
-DESCRIPTION="A manual tiling window manager for X"
-HOMEPAGE="https://herbstluftwm.org/;
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="examples xinerama zsh-completion"
-
-DEPEND="
-   >=dev-libs/glib-2.24:2
-   x11-libs/libX11
-   x11-libs/libXext
-   xinerama? ( x11-libs/libXinerama )
-"
-RDEPEND="
-   ${DEPEND}
-   app-shells/bash
-   zsh-completion? ( app-shells/zsh )
-"
-BDEPEND+="
-   virtual/pkgconfig
-"
-
-src_compile() {
-   tc-export CC CXX LD PKG_CONFIG
-
-   emake LDXX="$(tc-getCXX)" COLOR=0 VERBOSE= \
-   $(use xinerama || echo XINERAMAFLAGS= XINERAMALIBS= )
-}
-
-src_install() {
-   dobin herbstluftwm herbstclient
-   dodoc BUGS MIGRATION NEWS README.md
-
-   doman doc/{herbstluftwm,herbstclient}.1
-
-   exeinto /etc/xdg/herbstluftwm
-   doexe share/{autostart,panel.sh,restartpanels.sh}
-
-   insinto /usr/share/xsessions
-   doins share/herbstluftwm.desktop
-
-   newbashcomp share/herbstclient-completion herbstclient
-
-   if use zsh-completion ; then
-   insinto /usr/share/zsh/site-functions
-   doins share/_herbstclient
-   fi
-
-   if use examples ; then
-   exeinto /usr/share/doc/${PF}/examples
-   doexe scripts/*.sh
-   docinto examples
-   dodoc scripts/README
-   docompress -x /usr/share/doc/${PF}/examples
-   fi
-}

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.8.2.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.8.2.ebuild
deleted file mode 100644
index 716b6043cb6..000
--- a/x11-wm/herbstluftwm/herbstluftwm-0.8.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs cmake-utils
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm;
-   BDEPEND="app-text/asciidoc"
-else
-   SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
-   KEYWORDS="~amd64 ~x86"
-   BDEPEND=""
-fi
-
-DESCRIPTION="A manual tiling window

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2020-12-01 Thread Andrey Utkin

commit: 78a166152bf8b2a1a4f73bb43e724d81a7b70aea
Author: Florian Schmaus  geekplace  eu>
AuthorDate: Tue Dec  1 10:14:50 2020 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Tue Dec  1 13:48:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78a16615

x11-wm/herbstluftwm: port - ebuild from cmake-utils to cmake

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Florian Schmaus  geekplace.eu>
Signed-off-by: Andrey Utkin  gentoo.org>

 x11-wm/herbstluftwm/herbstluftwm-.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/x11-wm/herbstluftwm/herbstluftwm-.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
index 4ebb6b1f0ad..383fa9d17ea 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit git-r3 toolchain-funcs cmake-utils
+inherit git-r3 toolchain-funcs cmake
 
 DESCRIPTION="A manual tiling window manager for X"
 HOMEPAGE="https://herbstluftwm.org/;
@@ -32,7 +32,7 @@ src_prepare() {
-e '/^install.*LICENSEDIR/d' \
-e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
CMakeLists.txt || die
-   cmake-utils_src_prepare
+   cmake_src_prepare
 }
 
 src_configure() {
@@ -40,11 +40,11 @@ src_configure() {
-DWITH_DOCUMENTATION=$(usex doc)
)
 
-   cmake-utils_src_configure
+   cmake_src_configure
 }
 
 src_install() {
-   cmake-utils_src_install
+   cmake_src_install
 
if ! use examples; then
rm -r "${ED}"/usr/share/doc/${PF}/examples || die

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2020-12-01 Thread Andrey Utkin

commit: 5d8371ddfb15d4b0af99271fd4c9b29abbcbc331
Author: Florian Schmaus  geekplace  eu>
AuthorDate: Tue Dec  1 10:59:42 2020 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Tue Dec  1 13:48:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d8371dd

x11-wm/herbstluftwm: add myself as (proxied) maintainer

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Florian Schmaus  geekplace.eu>
Signed-off-by: Andrey Utkin  gentoo.org>

 x11-wm/herbstluftwm/metadata.xml | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/x11-wm/herbstluftwm/metadata.xml b/x11-wm/herbstluftwm/metadata.xml
index 0ac55efdb20..f0e2dd8bb7b 100644
--- a/x11-wm/herbstluftwm/metadata.xml
+++ b/x11-wm/herbstluftwm/metadata.xml
@@ -1,7 +1,13 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-
+   
+   f...@geekplace.eu
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   

herbstluftwm/herbstluftwm

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2020-12-01 Thread Andrey Utkin

commit: 68013ebcb8ffbe8b681aecc6fb0b916a61ee1a03
Author: Andrey Utkin  gentoo  org>
AuthorDate: Tue Dec  1 13:43:27 2020 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Tue Dec  1 13:48:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68013ebc

x11-wm/herbstluftwm: add myself as co-maintainer

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andrey Utkin  gentoo.org>

 x11-wm/herbstluftwm/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/x11-wm/herbstluftwm/metadata.xml b/x11-wm/herbstluftwm/metadata.xml
index f0e2dd8bb7b..213c6935745 100644
--- a/x11-wm/herbstluftwm/metadata.xml
+++ b/x11-wm/herbstluftwm/metadata.xml
@@ -8,6 +8,10 @@
proxy-ma...@gentoo.org
Proxy Maintainers

+   
+   andrey_ut...@gentoo.org
+   Andrey Utkin
+   

herbstluftwm/herbstluftwm

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2020-12-01 Thread Andrey Utkin

commit: dad575e58726c6e240f790c0153f7c508594
Author: Andrey Utkin  gentoo  org>
AuthorDate: Tue Dec  1 13:32:00 2020 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Tue Dec  1 13:48:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dad575e5

x11-wm/herbstluftwm: add new version 0.9.0

Copied from 0.8.3 ebuild verbatim.

Bug: https://bugs.gentoo.org/757732
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andrey Utkin  gentoo.org>

 x11-wm/herbstluftwm/Manifest  |  1 +
 x11-wm/herbstluftwm/herbstluftwm-0.9.0.ebuild | 53 +++
 2 files changed, 54 insertions(+)

diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index 687620995a4..d6d31204504 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,3 +1,4 @@
 DIST herbstluftwm-0.7.2.tar.gz 245506 BLAKE2B 
72d0bb2a77e519161d193ac7b2b9f1f878ccb6cfe4914b6c75d060e2daa0bec4203ee4ebf203b9fa1dfb844d71d50aa7c03257c78aa22e906bf42519d1e592af
 SHA512 
abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c
 DIST herbstluftwm-0.8.2.tar.gz 377790 BLAKE2B 
88cee9937f134f6784fb5917435f629db67971339b09da8c6b91b55286fc50a7ba9d8dbea98dc583a92f5ae6e0e427dd487265cfb7d1ca4bbc10f865a2532e3e
 SHA512 
1a2bf3861ce23e33bb09afed285f7d85450307b46d00a666d02eaf9c454d53904e4d54ca8b0245da5ef095667a0adf9cdfc3aff170089c99df6b7f01e9038d5f
 DIST herbstluftwm-0.8.3.tar.gz 379052 BLAKE2B 
e8216d856df7111951842001992cac07b37efa89ba8cd52c804a763135a91512f92902910e726193a2cc902e93dacc1bae1e701ff4c669e164080992a3410bca
 SHA512 
ff6acb64a6609030abfe315452567f7011088b39e123f3fd988448183c4bf1c65aa0ba49ba1b0ab18b959448e12638a8198093db25bcfba828791e3305966ef1
+DIST herbstluftwm-0.9.0.tar.gz 406897 BLAKE2B 
06a2d6f303e1cf3990ae5247104952936e374b39ec4be316885718a94741f21c868f084ac7c3d4854d3e2870c26b4037153f3f18bffdb7458e56b3039eb4f1e1
 SHA512 
a9d4486729a65c8eb87b0d36f0cc28349f670abee82e20c9649e1348298ca5e73f9b349921007d555d620327cc09dab4c24e9c76dd971afc7f4de98b9408d925

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.0.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.9.0.ebuild
new file mode 100644
index 000..a27ee0ea3e0
--- /dev/null
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs cmake-utils
+
+DESCRIPTION="A manual tiling window manager for X"
+HOMEPAGE="https://herbstluftwm.org/;
+SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="doc examples"
+
+DEPEND="
+   x11-libs/libX11
+   x11-libs/libXext
+   x11-libs/libXinerama
+   x11-libs/libXrandr
+"
+RDEPEND="
+   ${DEPEND}
+   app-shells/bash
+"
+BDEPEND="
+   virtual/pkgconfig
+   doc? ( app-text/asciidoc )
+"
+
+src_prepare() {
+   sed -i \
+   -e '/^install.*LICENSEDIR/d' \
+   -e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
+   CMakeLists.txt || die
+   cmake-utils_src_prepare
+}
+
+src_configure() {
+   mycmakeargs=(
+   -DWITH_DOCUMENTATION=$(usex doc)
+   )
+
+   cmake-utils_src_configure
+}
+
+src_install() {
+   cmake-utils_src_install
+
+   if ! use examples; then
+   rm -r "${ED}"/usr/share/doc/${PF}/examples || die
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2020-12-01 Thread Andrey Utkin

commit: bb72c45f0e4016e5fc22cb0fd46cc585ad51c64f
Author: Florian Schmaus  geekplace  eu>
AuthorDate: Tue Dec  1 10:58:24 2020 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Tue Dec  1 13:48:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb72c45f

x11-wm/herbstluftwm: add upstream information to metadata.xml

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Florian Schmaus  geekplace.eu>
Signed-off-by: Andrey Utkin  gentoo.org>

 x11-wm/herbstluftwm/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/x11-wm/herbstluftwm/metadata.xml b/x11-wm/herbstluftwm/metadata.xml
index 6f49eba8f49..0ac55efdb20 100644
--- a/x11-wm/herbstluftwm/metadata.xml
+++ b/x11-wm/herbstluftwm/metadata.xml
@@ -2,4 +2,7 @@
 http://www.gentoo.org/dtd/metadata.dtd;>
 
 
+   
+   herbstluftwm/herbstluftwm
+

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2020-12-01 Thread Andrey Utkin

commit: 06fbf2126862be6ef2d2d08f53cce53404e64455
Author: Andrey Utkin  gentoo  org>
AuthorDate: Tue Dec  1 13:33:07 2020 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Tue Dec  1 13:48:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06fbf212

x11-wm/herbstluftwm: 0.9.0: migrate from 'cmake-utils' to 'cmake'

Based on work by Florian Schmaus  geekplace.eu>

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andrey Utkin  gentoo.org>

 x11-wm/herbstluftwm/herbstluftwm-0.9.0.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.0.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.9.0.ebuild
index a27ee0ea3e0..c2dc9d85fed 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.9.0.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit toolchain-funcs cmake-utils
+inherit cmake toolchain-funcs
 
 DESCRIPTION="A manual tiling window manager for X"
 HOMEPAGE="https://herbstluftwm.org/;
@@ -33,7 +33,7 @@ src_prepare() {
-e '/^install.*LICENSEDIR/d' \
-e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
CMakeLists.txt || die
-   cmake-utils_src_prepare
+   cmake_src_prepare
 }
 
 src_configure() {
@@ -41,11 +41,11 @@ src_configure() {
-DWITH_DOCUMENTATION=$(usex doc)
)
 
-   cmake-utils_src_configure
+   cmake_src_configure
 }
 
 src_install() {
-   cmake-utils_src_install
+   cmake_src_install
 
if ! use examples; then
rm -r "${ED}"/usr/share/doc/${PF}/examples || die

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2020-06-08 Thread Jeroen Roovers

commit: 00a39081c78b9582f8ecbdef6ddd1652e418b8d2
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Jun  8 08:20:15 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Jun  8 08:28:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00a39081

x11-wm/herbstluftwm: Depend on app-text/asciidoc

- Add USE=doc for app-text/asciidoc
- Drop USE=zsh-completion and install ~200 bytes unconditionally
- Run sed command in src_prepare()

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Closes: https://bugs.gentoo.org/727484
Signed-off-by: Jeroen Roovers  gentoo.org>

 x11-wm/herbstluftwm/herbstluftwm-0.8.3.ebuild | 31 +++---
 x11-wm/herbstluftwm/herbstluftwm-.ebuild  | 32 +++
 2 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.8.3.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.8.3.ebuild
index 716b6043cb6..a27ee0ea3e0 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.8.3.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.8.3.ebuild
@@ -4,22 +4,14 @@
 EAPI=7
 inherit toolchain-funcs cmake-utils
 
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm;
-   BDEPEND="app-text/asciidoc"
-else
-   SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
-   KEYWORDS="~amd64 ~x86"
-   BDEPEND=""
-fi
-
 DESCRIPTION="A manual tiling window manager for X"
 HOMEPAGE="https://herbstluftwm.org/;
+SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
+KEYWORDS="~amd64 ~x86"
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="examples zsh-completion"
+IUSE="doc examples"
 
 DEPEND="
x11-libs/libX11
@@ -30,17 +22,24 @@ DEPEND="
 RDEPEND="
${DEPEND}
app-shells/bash
-   zsh-completion? ( app-shells/zsh )
 "
-BDEPEND+="
+BDEPEND="
virtual/pkgconfig
+   doc? ( app-text/asciidoc )
 "
 
-src_configure() {
+src_prepare() {
sed -i \
-e '/^install.*LICENSEDIR/d' \
-e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
CMakeLists.txt || die
+   cmake-utils_src_prepare
+}
+
+src_configure() {
+   mycmakeargs=(
+   -DWITH_DOCUMENTATION=$(usex doc)
+   )
 
cmake-utils_src_configure
 }
@@ -51,8 +50,4 @@ src_install() {
if ! use examples; then
rm -r "${ED}"/usr/share/doc/${PF}/examples || die
fi
-
-   if ! use zsh-completion; then
-   rm -r "${ED}"/usr/share/zsh || die
-   fi
 }

diff --git a/x11-wm/herbstluftwm/herbstluftwm-.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
index 716b6043cb6..4ebb6b1f0ad 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
@@ -2,24 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit toolchain-funcs cmake-utils
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm;
-   BDEPEND="app-text/asciidoc"
-else
-   SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
-   KEYWORDS="~amd64 ~x86"
-   BDEPEND=""
-fi
+inherit git-r3 toolchain-funcs cmake-utils
 
 DESCRIPTION="A manual tiling window manager for X"
 HOMEPAGE="https://herbstluftwm.org/;
+EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm;
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="examples zsh-completion"
+IUSE="doc examples"
 
 DEPEND="
x11-libs/libX11
@@ -30,17 +21,24 @@ DEPEND="
 RDEPEND="
${DEPEND}
app-shells/bash
-   zsh-completion? ( app-shells/zsh )
 "
-BDEPEND+="
+BDEPEND="
virtual/pkgconfig
+   doc? ( app-text/asciidoc )
 "
 
-src_configure() {
+src_prepare() {
sed -i \
-e '/^install.*LICENSEDIR/d' \
-e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
CMakeLists.txt || die
+   cmake-utils_src_prepare
+}
+
+src_configure() {
+   mycmakeargs=(
+   -DWITH_DOCUMENTATION=$(usex doc)
+   )
 
cmake-utils_src_configure
 }
@@ -51,8 +49,4 @@ src_install() {
if ! use examples; then
rm -r "${ED}"/usr/share/doc/${PF}/examples || die
fi
-
-   if ! use zsh-completion; then
-   rm -r "${ED}"/usr/share/zsh || die
-   fi
 }

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2020-06-07 Thread Jeroen Roovers

commit: 72ac66b1bef9728aaf4c7d647f6c453f5a13951a
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Jun  7 11:14:37 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Jun  7 11:15:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72ac66b1

x11-wm/herbstluftwm: Depend on x11-libs/libXrandr

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Closes: https://bugs.gentoo.org/727274
Signed-off-by: Jeroen Roovers  gentoo.org>

 x11-wm/herbstluftwm/herbstluftwm-0.8.2.ebuild | 1 +
 x11-wm/herbstluftwm/herbstluftwm-0.8.3.ebuild | 1 +
 x11-wm/herbstluftwm/herbstluftwm-.ebuild  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.8.2.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.8.2.ebuild
index 7488230f4eb..716b6043cb6 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.8.2.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.8.2.ebuild
@@ -25,6 +25,7 @@ DEPEND="
x11-libs/libX11
x11-libs/libXext
x11-libs/libXinerama
+   x11-libs/libXrandr
 "
 RDEPEND="
${DEPEND}

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.8.3.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.8.3.ebuild
index 7488230f4eb..716b6043cb6 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.8.3.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.8.3.ebuild
@@ -25,6 +25,7 @@ DEPEND="
x11-libs/libX11
x11-libs/libXext
x11-libs/libXinerama
+   x11-libs/libXrandr
 "
 RDEPEND="
${DEPEND}

diff --git a/x11-wm/herbstluftwm/herbstluftwm-.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
index 7488230f4eb..716b6043cb6 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
@@ -25,6 +25,7 @@ DEPEND="
x11-libs/libX11
x11-libs/libXext
x11-libs/libXinerama
+   x11-libs/libXrandr
 "
 RDEPEND="
${DEPEND}

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2020-06-06 Thread Jeroen Roovers

commit: f6ca3c80586b54f9acb366d19bcc21b1064a3756
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Jun  7 00:08:26 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Jun  7 00:09:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6ca3c80

x11-wm/herbstluftwm: Version 0.8.3

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Jeroen Roovers  gentoo.org>

 x11-wm/herbstluftwm/Manifest  |  1 +
 x11-wm/herbstluftwm/herbstluftwm-0.8.3.ebuild | 57 +++
 2 files changed, 58 insertions(+)

diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index aa572b05893..687620995a4 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,2 +1,3 @@
 DIST herbstluftwm-0.7.2.tar.gz 245506 BLAKE2B 
72d0bb2a77e519161d193ac7b2b9f1f878ccb6cfe4914b6c75d060e2daa0bec4203ee4ebf203b9fa1dfb844d71d50aa7c03257c78aa22e906bf42519d1e592af
 SHA512 
abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c
 DIST herbstluftwm-0.8.2.tar.gz 377790 BLAKE2B 
88cee9937f134f6784fb5917435f629db67971339b09da8c6b91b55286fc50a7ba9d8dbea98dc583a92f5ae6e0e427dd487265cfb7d1ca4bbc10f865a2532e3e
 SHA512 
1a2bf3861ce23e33bb09afed285f7d85450307b46d00a666d02eaf9c454d53904e4d54ca8b0245da5ef095667a0adf9cdfc3aff170089c99df6b7f01e9038d5f
+DIST herbstluftwm-0.8.3.tar.gz 379052 BLAKE2B 
e8216d856df7111951842001992cac07b37efa89ba8cd52c804a763135a91512f92902910e726193a2cc902e93dacc1bae1e701ff4c669e164080992a3410bca
 SHA512 
ff6acb64a6609030abfe315452567f7011088b39e123f3fd988448183c4bf1c65aa0ba49ba1b0ab18b959448e12638a8198093db25bcfba828791e3305966ef1

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.8.3.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.8.3.ebuild
new file mode 100644
index 000..7488230f4eb
--- /dev/null
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.8.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs cmake-utils
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm;
+   BDEPEND="app-text/asciidoc"
+else
+   SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
+   KEYWORDS="~amd64 ~x86"
+   BDEPEND=""
+fi
+
+DESCRIPTION="A manual tiling window manager for X"
+HOMEPAGE="https://herbstluftwm.org/;
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="examples zsh-completion"
+
+DEPEND="
+   x11-libs/libX11
+   x11-libs/libXext
+   x11-libs/libXinerama
+"
+RDEPEND="
+   ${DEPEND}
+   app-shells/bash
+   zsh-completion? ( app-shells/zsh )
+"
+BDEPEND+="
+   virtual/pkgconfig
+"
+
+src_configure() {
+   sed -i \
+   -e '/^install.*LICENSEDIR/d' \
+   -e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
+   CMakeLists.txt || die
+
+   cmake-utils_src_configure
+}
+
+src_install() {
+   cmake-utils_src_install
+
+   if ! use examples; then
+   rm -r "${ED}"/usr/share/doc/${PF}/examples || die
+   fi
+
+   if ! use zsh-completion; then
+   rm -r "${ED}"/usr/share/zsh || die
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2020-06-04 Thread Jeroen Roovers

commit: 79a7568abbfc00d4f920c01bdb9b90c2be5e52cd
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Jun  5 05:44:12 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Jun  5 05:44:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79a7568a

x11-wm/herbstluftwm: Old

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Closes: https://bugs.gentoo.org/716922
Signed-off-by: Jeroen Roovers  gentoo.org>

 x11-wm/herbstluftwm/Manifest  |  2 -
 x11-wm/herbstluftwm/herbstluftwm-0.8.0.ebuild | 61 ---
 x11-wm/herbstluftwm/herbstluftwm-0.8.1.ebuild | 61 ---
 3 files changed, 124 deletions(-)

diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index af18d0708d9..aa572b05893 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,4 +1,2 @@
 DIST herbstluftwm-0.7.2.tar.gz 245506 BLAKE2B 
72d0bb2a77e519161d193ac7b2b9f1f878ccb6cfe4914b6c75d060e2daa0bec4203ee4ebf203b9fa1dfb844d71d50aa7c03257c78aa22e906bf42519d1e592af
 SHA512 
abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c
-DIST herbstluftwm-0.8.0.tar.gz 358434 BLAKE2B 
770aa66c2e8926d5f73b36ae2376e33ac92f9f72e2d45f55caa3247710f88b0eef72bed8a7242ba4ef298d9e8a7af3768114bd5149aa5596aa4682caef7e9e91
 SHA512 
108ef76e6f81d98742c37a1a5ecf1ce998d6fc8ee43642acb08716a5bee2e7a691f1f8defe9c81ecc8930f8b29ba7a49efe2eb00a3699c22de1a5f841266873c
-DIST herbstluftwm-0.8.1.tar.gz 369291 BLAKE2B 
7f500c0d3b5b8e4c30778e8cf4af97ef3605c8cad7d3825d2edc04fc3be56f4eaa3889e505b48c9a83277b0e495a894d96b68b5b683590c0f286a8438ad4a429
 SHA512 
ba845e91242d08fdd264c6354651e84dba3b8941bab3756102570c82c78d5ca734694fd3fcbc9c035776133be8a98a62cc8218378ecddb22aca4cda1ae1fb5be
 DIST herbstluftwm-0.8.2.tar.gz 377790 BLAKE2B 
88cee9937f134f6784fb5917435f629db67971339b09da8c6b91b55286fc50a7ba9d8dbea98dc583a92f5ae6e0e427dd487265cfb7d1ca4bbc10f865a2532e3e
 SHA512 
1a2bf3861ce23e33bb09afed285f7d85450307b46d00a666d02eaf9c454d53904e4d54ca8b0245da5ef095667a0adf9cdfc3aff170089c99df6b7f01e9038d5f

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.8.0.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.8.0.ebuild
deleted file mode 100644
index 30dd0c6dd26..000
--- a/x11-wm/herbstluftwm/herbstluftwm-0.8.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs cmake-utils
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm;
-   BDEPEND="app-text/asciidoc"
-else
-   SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
-   KEYWORDS="~amd64 ~x86"
-   BDEPEND=""
-fi
-
-DESCRIPTION="A manual tiling window manager for X"
-HOMEPAGE="https://herbstluftwm.org/;
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="examples xinerama zsh-completion"
-
-DEPEND="
-   x11-libs/libX11
-   x11-libs/libXext
-   xinerama? ( x11-libs/libXinerama )
-"
-RDEPEND="
-   ${DEPEND}
-   app-shells/bash
-   zsh-completion? ( app-shells/zsh )
-"
-BDEPEND+="
-   virtual/pkgconfig
-"
-
-src_configure() {
-   sed -i \
-   -e '/^install.*LICENSEDIR/d' \
-   -e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
-   CMakeLists.txt || die
-
-   mycmakeargs=(
-   -DWITH_XINERAMA=$(usex xinerama)
-   )
-
-   cmake-utils_src_configure
-}
-
-src_install() {
-   cmake-utils_src_install
-
-   if ! use examples; then
-   rm -r "${ED}"/usr/share/doc/${PF}/examples || die
-   fi
-
-   if ! use zsh-completion; then
-   rm -r "${ED}"/usr/share/zsh || die
-   fi
-}

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.8.1.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.8.1.ebuild
deleted file mode 100644
index 30dd0c6dd26..000
--- a/x11-wm/herbstluftwm/herbstluftwm-0.8.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs cmake-utils
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm;
-   BDEPEND="app-text/asciidoc"
-else
-   SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
-   KEYWORDS="~amd64 ~x86"
-   BDEPEND=""
-fi
-
-DESCRIPTION="A manual tiling window manager for X"
-HOMEPAGE="https://herbstluftwm.org/;
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="examples xinerama zsh-completion"
-
-DEPEND="
-   x11-libs/libX11
-   x11-libs/libXext
-   xinerama? ( x11-libs/libXinerama )
-"
-RDEPEND="
-   ${DEPEND}
-   app-shells/bash
-   zsh-completion? ( app-shells/zsh )
-"
-BDEPEND+="
-   virtual/pkgconfig
-"
-
-src_configure() {
-   sed -i \
-   -e

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2020-06-04 Thread Jeroen Roovers

commit: 9f0937e7d769533bf2e167d19132dbd80ce97b3b
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Jun  5 05:42:30 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Jun  5 05:44:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f0937e7

x11-wm/herbstluftwm: Drop USE=xinerama

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Bug: https://bugs.gentoo.org/716922
Signed-off-by: Jeroen Roovers  gentoo.org>

 x11-wm/herbstluftwm/herbstluftwm-0.8.2.ebuild | 8 ++--
 x11-wm/herbstluftwm/herbstluftwm-.ebuild  | 8 ++--
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.8.2.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.8.2.ebuild
index 30dd0c6dd26..7488230f4eb 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.8.2.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.8.2.ebuild
@@ -19,12 +19,12 @@ HOMEPAGE="https://herbstluftwm.org/;
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="examples xinerama zsh-completion"
+IUSE="examples zsh-completion"
 
 DEPEND="
x11-libs/libX11
x11-libs/libXext
-   xinerama? ( x11-libs/libXinerama )
+   x11-libs/libXinerama
 "
 RDEPEND="
${DEPEND}
@@ -41,10 +41,6 @@ src_configure() {
-e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
CMakeLists.txt || die
 
-   mycmakeargs=(
-   -DWITH_XINERAMA=$(usex xinerama)
-   )
-
cmake-utils_src_configure
 }
 

diff --git a/x11-wm/herbstluftwm/herbstluftwm-.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
index 30dd0c6dd26..7488230f4eb 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
@@ -19,12 +19,12 @@ HOMEPAGE="https://herbstluftwm.org/;
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="examples xinerama zsh-completion"
+IUSE="examples zsh-completion"
 
 DEPEND="
x11-libs/libX11
x11-libs/libXext
-   xinerama? ( x11-libs/libXinerama )
+   x11-libs/libXinerama
 "
 RDEPEND="
${DEPEND}
@@ -41,10 +41,6 @@ src_configure() {
-e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
CMakeLists.txt || die
 
-   mycmakeargs=(
-   -DWITH_XINERAMA=$(usex xinerama)
-   )
-
cmake-utils_src_configure
 }

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2020-05-04 Thread Jeroen Roovers

commit: 72e06f10648e851c700b148a37c531e3c81ba72c
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon May  4 20:58:17 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon May  4 20:58:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72e06f10

x11-wm/herbstluftwm: Version 0.8.2

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Jeroen Roovers  gentoo.org>

 x11-wm/herbstluftwm/Manifest  |  1 +
 x11-wm/herbstluftwm/herbstluftwm-0.8.2.ebuild | 61 +++
 2 files changed, 62 insertions(+)

diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index f942fbb164d..af18d0708d9 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,3 +1,4 @@
 DIST herbstluftwm-0.7.2.tar.gz 245506 BLAKE2B 
72d0bb2a77e519161d193ac7b2b9f1f878ccb6cfe4914b6c75d060e2daa0bec4203ee4ebf203b9fa1dfb844d71d50aa7c03257c78aa22e906bf42519d1e592af
 SHA512 
abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c
 DIST herbstluftwm-0.8.0.tar.gz 358434 BLAKE2B 
770aa66c2e8926d5f73b36ae2376e33ac92f9f72e2d45f55caa3247710f88b0eef72bed8a7242ba4ef298d9e8a7af3768114bd5149aa5596aa4682caef7e9e91
 SHA512 
108ef76e6f81d98742c37a1a5ecf1ce998d6fc8ee43642acb08716a5bee2e7a691f1f8defe9c81ecc8930f8b29ba7a49efe2eb00a3699c22de1a5f841266873c
 DIST herbstluftwm-0.8.1.tar.gz 369291 BLAKE2B 
7f500c0d3b5b8e4c30778e8cf4af97ef3605c8cad7d3825d2edc04fc3be56f4eaa3889e505b48c9a83277b0e495a894d96b68b5b683590c0f286a8438ad4a429
 SHA512 
ba845e91242d08fdd264c6354651e84dba3b8941bab3756102570c82c78d5ca734694fd3fcbc9c035776133be8a98a62cc8218378ecddb22aca4cda1ae1fb5be
+DIST herbstluftwm-0.8.2.tar.gz 377790 BLAKE2B 
88cee9937f134f6784fb5917435f629db67971339b09da8c6b91b55286fc50a7ba9d8dbea98dc583a92f5ae6e0e427dd487265cfb7d1ca4bbc10f865a2532e3e
 SHA512 
1a2bf3861ce23e33bb09afed285f7d85450307b46d00a666d02eaf9c454d53904e4d54ca8b0245da5ef095667a0adf9cdfc3aff170089c99df6b7f01e9038d5f

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.8.2.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.8.2.ebuild
new file mode 100644
index 000..30dd0c6dd26
--- /dev/null
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.8.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs cmake-utils
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm;
+   BDEPEND="app-text/asciidoc"
+else
+   SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
+   KEYWORDS="~amd64 ~x86"
+   BDEPEND=""
+fi
+
+DESCRIPTION="A manual tiling window manager for X"
+HOMEPAGE="https://herbstluftwm.org/;
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="examples xinerama zsh-completion"
+
+DEPEND="
+   x11-libs/libX11
+   x11-libs/libXext
+   xinerama? ( x11-libs/libXinerama )
+"
+RDEPEND="
+   ${DEPEND}
+   app-shells/bash
+   zsh-completion? ( app-shells/zsh )
+"
+BDEPEND+="
+   virtual/pkgconfig
+"
+
+src_configure() {
+   sed -i \
+   -e '/^install.*LICENSEDIR/d' \
+   -e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
+   CMakeLists.txt || die
+
+   mycmakeargs=(
+   -DWITH_XINERAMA=$(usex xinerama)
+   )
+
+   cmake-utils_src_configure
+}
+
+src_install() {
+   cmake-utils_src_install
+
+   if ! use examples; then
+   rm -r "${ED}"/usr/share/doc/${PF}/examples || die
+   fi
+
+   if ! use zsh-completion; then
+   rm -r "${ED}"/usr/share/zsh || die
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2020-04-21 Thread Jeroen Roovers

commit: 6c0083191a755722ff62412ade5ab42994345fea
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Tue Apr 21 08:28:30 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Tue Apr 21 08:28:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c008319

x11-wm/herbstluftwm: Drop dev-libs/glib dependency

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Closes: https://bugs.gentoo.org/718712
Signed-off-by: Jeroen Roovers  gentoo.org>

 x11-wm/herbstluftwm/herbstluftwm-0.8.0.ebuild | 1 -
 x11-wm/herbstluftwm/herbstluftwm-0.8.1.ebuild | 1 -
 x11-wm/herbstluftwm/herbstluftwm-.ebuild  | 1 -
 3 files changed, 3 deletions(-)

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.8.0.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.8.0.ebuild
index c6dbf314e58..30dd0c6dd26 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.8.0.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.8.0.ebuild
@@ -22,7 +22,6 @@ SLOT="0"
 IUSE="examples xinerama zsh-completion"
 
 DEPEND="
-   >=dev-libs/glib-2.24:2
x11-libs/libX11
x11-libs/libXext
xinerama? ( x11-libs/libXinerama )

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.8.1.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.8.1.ebuild
index c6dbf314e58..30dd0c6dd26 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.8.1.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.8.1.ebuild
@@ -22,7 +22,6 @@ SLOT="0"
 IUSE="examples xinerama zsh-completion"
 
 DEPEND="
-   >=dev-libs/glib-2.24:2
x11-libs/libX11
x11-libs/libXext
xinerama? ( x11-libs/libXinerama )

diff --git a/x11-wm/herbstluftwm/herbstluftwm-.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
index c6dbf314e58..30dd0c6dd26 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
@@ -22,7 +22,6 @@ SLOT="0"
 IUSE="examples xinerama zsh-completion"
 
 DEPEND="
-   >=dev-libs/glib-2.24:2
x11-libs/libX11
x11-libs/libXext
xinerama? ( x11-libs/libXinerama )

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2020-04-20 Thread Jeroen Roovers

commit: 88d0bd4111827575a4c535a04682e0b49425f922
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Tue Apr 21 05:39:00 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Tue Apr 21 05:39:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88d0bd41

x11-wm/herbstluftwm: Version 0.8.1

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Jeroen Roovers  gentoo.org>

 x11-wm/herbstluftwm/Manifest  |  1 +
 x11-wm/herbstluftwm/herbstluftwm-0.8.1.ebuild | 62 +++
 2 files changed, 63 insertions(+)

diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index 2a770ba3b3a..f942fbb164d 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,2 +1,3 @@
 DIST herbstluftwm-0.7.2.tar.gz 245506 BLAKE2B 
72d0bb2a77e519161d193ac7b2b9f1f878ccb6cfe4914b6c75d060e2daa0bec4203ee4ebf203b9fa1dfb844d71d50aa7c03257c78aa22e906bf42519d1e592af
 SHA512 
abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c
 DIST herbstluftwm-0.8.0.tar.gz 358434 BLAKE2B 
770aa66c2e8926d5f73b36ae2376e33ac92f9f72e2d45f55caa3247710f88b0eef72bed8a7242ba4ef298d9e8a7af3768114bd5149aa5596aa4682caef7e9e91
 SHA512 
108ef76e6f81d98742c37a1a5ecf1ce998d6fc8ee43642acb08716a5bee2e7a691f1f8defe9c81ecc8930f8b29ba7a49efe2eb00a3699c22de1a5f841266873c
+DIST herbstluftwm-0.8.1.tar.gz 369291 BLAKE2B 
7f500c0d3b5b8e4c30778e8cf4af97ef3605c8cad7d3825d2edc04fc3be56f4eaa3889e505b48c9a83277b0e495a894d96b68b5b683590c0f286a8438ad4a429
 SHA512 
ba845e91242d08fdd264c6354651e84dba3b8941bab3756102570c82c78d5ca734694fd3fcbc9c035776133be8a98a62cc8218378ecddb22aca4cda1ae1fb5be

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.8.1.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.8.1.ebuild
new file mode 100644
index 000..c6dbf314e58
--- /dev/null
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.8.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs cmake-utils
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm;
+   BDEPEND="app-text/asciidoc"
+else
+   SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
+   KEYWORDS="~amd64 ~x86"
+   BDEPEND=""
+fi
+
+DESCRIPTION="A manual tiling window manager for X"
+HOMEPAGE="https://herbstluftwm.org/;
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="examples xinerama zsh-completion"
+
+DEPEND="
+   >=dev-libs/glib-2.24:2
+   x11-libs/libX11
+   x11-libs/libXext
+   xinerama? ( x11-libs/libXinerama )
+"
+RDEPEND="
+   ${DEPEND}
+   app-shells/bash
+   zsh-completion? ( app-shells/zsh )
+"
+BDEPEND+="
+   virtual/pkgconfig
+"
+
+src_configure() {
+   sed -i \
+   -e '/^install.*LICENSEDIR/d' \
+   -e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
+   CMakeLists.txt || die
+
+   mycmakeargs=(
+   -DWITH_XINERAMA=$(usex xinerama)
+   )
+
+   cmake-utils_src_configure
+}
+
+src_install() {
+   cmake-utils_src_install
+
+   if ! use examples; then
+   rm -r "${ED}"/usr/share/doc/${PF}/examples || die
+   fi
+
+   if ! use zsh-completion; then
+   rm -r "${ED}"/usr/share/zsh || die
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2020-04-09 Thread Jeroen Roovers

commit: 5f53289df2f67fe7c494feedad9ea8f9070bdadf
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu Apr  9 20:04:55 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu Apr  9 20:07:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f53289d

x11-wm/herbstluftwm: Version 0.8.0

Package-Manager: Portage-2.3.98, Repoman-2.3.22
Closes: https://bugs.gentoo.org/716842
Signed-off-by: Jeroen Roovers  gentoo.org>

 x11-wm/herbstluftwm/Manifest  |  1 +
 x11-wm/herbstluftwm/herbstluftwm-0.8.0.ebuild | 62 +++
 2 files changed, 63 insertions(+)

diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index 4672f63b3e3..2a770ba3b3a 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1 +1,2 @@
 DIST herbstluftwm-0.7.2.tar.gz 245506 BLAKE2B 
72d0bb2a77e519161d193ac7b2b9f1f878ccb6cfe4914b6c75d060e2daa0bec4203ee4ebf203b9fa1dfb844d71d50aa7c03257c78aa22e906bf42519d1e592af
 SHA512 
abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c
+DIST herbstluftwm-0.8.0.tar.gz 358434 BLAKE2B 
770aa66c2e8926d5f73b36ae2376e33ac92f9f72e2d45f55caa3247710f88b0eef72bed8a7242ba4ef298d9e8a7af3768114bd5149aa5596aa4682caef7e9e91
 SHA512 
108ef76e6f81d98742c37a1a5ecf1ce998d6fc8ee43642acb08716a5bee2e7a691f1f8defe9c81ecc8930f8b29ba7a49efe2eb00a3699c22de1a5f841266873c

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.8.0.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.8.0.ebuild
new file mode 100644
index 000..c6dbf314e58
--- /dev/null
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.8.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs cmake-utils
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm;
+   BDEPEND="app-text/asciidoc"
+else
+   SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
+   KEYWORDS="~amd64 ~x86"
+   BDEPEND=""
+fi
+
+DESCRIPTION="A manual tiling window manager for X"
+HOMEPAGE="https://herbstluftwm.org/;
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="examples xinerama zsh-completion"
+
+DEPEND="
+   >=dev-libs/glib-2.24:2
+   x11-libs/libX11
+   x11-libs/libXext
+   xinerama? ( x11-libs/libXinerama )
+"
+RDEPEND="
+   ${DEPEND}
+   app-shells/bash
+   zsh-completion? ( app-shells/zsh )
+"
+BDEPEND+="
+   virtual/pkgconfig
+"
+
+src_configure() {
+   sed -i \
+   -e '/^install.*LICENSEDIR/d' \
+   -e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
+   CMakeLists.txt || die
+
+   mycmakeargs=(
+   -DWITH_XINERAMA=$(usex xinerama)
+   )
+
+   cmake-utils_src_configure
+}
+
+src_install() {
+   cmake-utils_src_install
+
+   if ! use examples; then
+   rm -r "${ED}"/usr/share/doc/${PF}/examples || die
+   fi
+
+   if ! use zsh-completion; then
+   rm -r "${ED}"/usr/share/zsh || die
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2020-04-07 Thread Jeroen Roovers

commit: bba660c62dd9609c47c2a7d58fb01e2b4ff72b7f
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Tue Apr  7 07:00:06 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Tue Apr  7 07:00:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bba660c6

x11-wm/herbstluftwm: Update live ebuild

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Jeroen Roovers  gentoo.org>

 x11-wm/herbstluftwm/herbstluftwm-.ebuild | 44 +++-
 1 file changed, 17 insertions(+), 27 deletions(-)

diff --git a/x11-wm/herbstluftwm/herbstluftwm-.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
index 191f2848d3b..c6dbf314e58 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit toolchain-funcs bash-completion-r1
+inherit toolchain-funcs cmake-utils
 
-if [[ ${PV} == * ]] ; then
+if [[ ${PV} == * ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm;
BDEPEND="app-text/asciidoc"
@@ -36,37 +36,27 @@ BDEPEND+="
virtual/pkgconfig
 "
 
-src_compile() {
-   tc-export CC CXX LD PKG_CONFIG
+src_configure() {
+   sed -i \
+   -e '/^install.*LICENSEDIR/d' \
+   -e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
+   CMakeLists.txt || die
 
-   emake LDXX="$(tc-getCXX)" COLOR=0 VERBOSE= \
-   $(use xinerama || echo XINERAMAFLAGS= XINERAMALIBS= )
+   mycmakeargs=(
+   -DWITH_XINERAMA=$(usex xinerama)
+   )
+
+   cmake-utils_src_configure
 }
 
 src_install() {
-   dobin herbstluftwm herbstclient
-   dodoc BUGS MIGRATION NEWS README.md
-
-   doman doc/{herbstluftwm,herbstclient}.1
-
-   exeinto /etc/xdg/herbstluftwm
-   doexe share/{autostart,panel.sh,restartpanels.sh}
-
-   insinto /usr/share/xsessions
-   doins share/herbstluftwm.desktop
-
-   newbashcomp share/herbstclient-completion herbstclient
+   cmake-utils_src_install
 
-   if use zsh-completion ; then
-   insinto /usr/share/zsh/site-functions
-   doins share/_herbstclient
+   if ! use examples; then
+   rm -r "${ED}"/usr/share/doc/${PF}/examples || die
fi
 
-   if use examples ; then
-   exeinto /usr/share/doc/${PF}/examples
-   doexe scripts/*.sh
-   docinto examples
-   dodoc scripts/README
-   docompress -x /usr/share/doc/${PF}/examples
+   if ! use zsh-completion; then
+   rm -r "${ED}"/usr/share/zsh || die
fi
 }

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2020-02-06 Thread Jeroen Roovers

commit: b712a7cb0bf0f9c4b2ef9a6b3160b95b20cc8e37
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu Feb  6 11:14:30 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu Feb  6 11:14:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b712a7cb

x11-wm/herbstluftwm: Update EGIT_REPO_URI

Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Jeroen Roovers  gentoo.org>

 x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild
index ccc89776a45..74f4e1a1a6d 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ inherit toolchain-funcs bash-completion-r1
 
 if [[ ${PV} == * ]] ; then
inherit git-r3
-   EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm.git;
+   EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm;
BDEPEND="app-text/asciidoc"
 else
SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2020-02-06 Thread Jeroen Roovers

commit: beef6ab354b5fd345a643249797bcce4e9d72eae
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu Feb  6 11:13:15 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu Feb  6 11:13:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beef6ab3

x11-wm/herbstluftwm: Update EGIT_REPO_URI

Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Jeroen Roovers  gentoo.org>

 x11-wm/herbstluftwm/herbstluftwm-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-wm/herbstluftwm/herbstluftwm-.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
index c68ba3acf29..191f2848d3b 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ inherit toolchain-funcs bash-completion-r1
 
 if [[ ${PV} == * ]] ; then
inherit git-r3
-   EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm.git;
+   EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm;
BDEPEND="app-text/asciidoc"
 else
SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2019-12-29 Thread Jeroen Roovers

commit: c40ab934fc36c2a80d19e7367910e1426f1b8712
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Dec 29 12:40:29 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Dec 29 12:43:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c40ab934

x11-wm/herbstluftwm: Old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jeroen Roovers  gentoo.org>

 x11-wm/herbstluftwm/herbstluftwm-0.7.2.ebuild | 68 ---
 1 file changed, 68 deletions(-)

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.7.2.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.7.2.ebuild
deleted file mode 100644
index 3ca73c0e801..000
--- a/x11-wm/herbstluftwm/herbstluftwm-0.7.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs bash-completion-r1
-
-if [[ ${PV} == * ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm.git;
-   EXTRA_DEPEND="app-text/asciidoc"
-else
-   SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
-   KEYWORDS="amd64 x86"
-   EXTRA_DEPEND=""
-fi
-
-DESCRIPTION="A manual tiling window manager for X"
-HOMEPAGE="https://herbstluftwm.org/;
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="examples xinerama zsh-completion"
-
-CDEPEND=">=dev-libs/glib-2.24:2
-   x11-libs/libX11
-   x11-libs/libXext
-   xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${CDEPEND}
-   app-shells/bash
-   zsh-completion? ( app-shells/zsh )"
-DEPEND="${CDEPEND}
-   ${EXTRA_DEPEND}
-   virtual/pkgconfig"
-
-src_compile() {
-   tc-export CC LD CXX
-
-   emake LDXX="$(tc-getCXX)" COLOR=0 VERBOSE= \
-   $(use xinerama || echo XINERAMAFLAGS= XINERAMALIBS= )
-}
-
-src_install() {
-   dobin herbstluftwm herbstclient
-   dodoc BUGS MIGRATION NEWS README.md
-
-   doman doc/{herbstluftwm,herbstclient}.1
-
-   exeinto /etc/xdg/herbstluftwm
-   doexe share/{autostart,panel.sh,restartpanels.sh}
-
-   insinto /usr/share/xsessions
-   doins share/herbstluftwm.desktop
-
-   newbashcomp share/herbstclient-completion herbstclient
-
-   if use zsh-completion ; then
-   insinto /usr/share/zsh/site-functions
-   doins share/_herbstclient
-   fi
-
-   if use examples ; then
-   exeinto /usr/share/doc/${PF}/examples
-   doexe scripts/*.sh
-   docinto examples
-   dodoc scripts/README
-   docompress -x /usr/share/doc/${PF}/examples
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2019-12-29 Thread Jeroen Roovers

commit: b425e70d5b8869054391cbfa0b2f3c83100ad32a
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Dec 29 12:39:27 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Dec 29 12:43:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b425e70d

x11-wm/herbstluftwm: Stable for amd64 x86 too

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --ignore-arches
Signed-off-by: Jeroen Roovers  gentoo.org>

 x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild
index c68ba3acf29..ccc89776a45 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == * ]] ; then
BDEPEND="app-text/asciidoc"
 else
SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 x86"
BDEPEND=""
 fi

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2019-12-06 Thread Jeroen Roovers

commit: 90581d54dac720e4e093deccaa4da3ed2bf2c074
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Dec  6 11:10:18 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Dec  6 11:10:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90581d54

x11-wm/herbstluftwm: Export PKG_CONFIG

Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Jeroen Roovers  gentoo.org>

 x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild | 18 --
 x11-wm/herbstluftwm/herbstluftwm-.ebuild | 18 --
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild
index 9fe9d04ef46..c68ba3acf29 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild
@@ -21,17 +21,23 @@ LICENSE="BSD-2"
 SLOT="0"
 IUSE="examples xinerama zsh-completion"
 
-DEPEND=">=dev-libs/glib-2.24:2
+DEPEND="
+   >=dev-libs/glib-2.24:2
x11-libs/libX11
x11-libs/libXext
-   xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${DEPEND}
+   xinerama? ( x11-libs/libXinerama )
+"
+RDEPEND="
+   ${DEPEND}
app-shells/bash
-   zsh-completion? ( app-shells/zsh )"
-BDEPEND+=" virtual/pkgconfig"
+   zsh-completion? ( app-shells/zsh )
+"
+BDEPEND+="
+   virtual/pkgconfig
+"
 
 src_compile() {
-   tc-export CC LD CXX
+   tc-export CC CXX LD PKG_CONFIG
 
emake LDXX="$(tc-getCXX)" COLOR=0 VERBOSE= \
$(use xinerama || echo XINERAMAFLAGS= XINERAMALIBS= )

diff --git a/x11-wm/herbstluftwm/herbstluftwm-.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
index 9fe9d04ef46..c68ba3acf29 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
@@ -21,17 +21,23 @@ LICENSE="BSD-2"
 SLOT="0"
 IUSE="examples xinerama zsh-completion"
 
-DEPEND=">=dev-libs/glib-2.24:2
+DEPEND="
+   >=dev-libs/glib-2.24:2
x11-libs/libX11
x11-libs/libXext
-   xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${DEPEND}
+   xinerama? ( x11-libs/libXinerama )
+"
+RDEPEND="
+   ${DEPEND}
app-shells/bash
-   zsh-completion? ( app-shells/zsh )"
-BDEPEND+=" virtual/pkgconfig"
+   zsh-completion? ( app-shells/zsh )
+"
+BDEPEND+="
+   virtual/pkgconfig
+"
 
 src_compile() {
-   tc-export CC LD CXX
+   tc-export CC CXX LD PKG_CONFIG
 
emake LDXX="$(tc-getCXX)" COLOR=0 VERBOSE= \
$(use xinerama || echo XINERAMAFLAGS= XINERAMALIBS= )

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2019-11-18 Thread Jeroen Roovers

commit: 9c0191107f0796010226569d4c2f8ebaea1647ab
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Tue Nov 19 06:37:27 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Tue Nov 19 06:37:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c019110

x11-wm/herbstluftwm: Maintain

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Jeroen Roovers  gentoo.org>

 x11-wm/herbstluftwm/metadata.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/x11-wm/herbstluftwm/metadata.xml b/x11-wm/herbstluftwm/metadata.xml
index 6f49eba8f49..5ba62861f1c 100644
--- a/x11-wm/herbstluftwm/metadata.xml
+++ b/x11-wm/herbstluftwm/metadata.xml
@@ -1,5 +1,7 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-
+
+j...@gentoo.org
+

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2019-11-18 Thread Tim Harder

commit: 57d412a4e9843b7bbef232b04819540abab0577b
Author: Tim Harder  gentoo  org>
AuthorDate: Mon Nov 18 22:34:40 2019 +
Commit: Tim Harder  gentoo  org>
CommitDate: Mon Nov 18 22:34:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57d412a4

x11-wm/herbstluftwm: fix BDEPEND

Signed-off-by: Tim Harder  gentoo.org>

 ...herbstluftwm-.ebuild => herbstluftwm-0.7.2-r1.ebuild} | 12 +---
 x11-wm/herbstluftwm/herbstluftwm-.ebuild | 12 +---
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/x11-wm/herbstluftwm/herbstluftwm-.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild
similarity index 89%
copy from x11-wm/herbstluftwm/herbstluftwm-.ebuild
copy to x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild
index 0cea06f49ee..9fe9d04ef46 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild
@@ -7,11 +7,11 @@ inherit toolchain-funcs bash-completion-r1
 if [[ ${PV} == * ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm.git;
-   EXTRA_DEPEND="app-text/asciidoc"
+   BDEPEND="app-text/asciidoc"
 else
SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
KEYWORDS="~amd64 ~x86"
-   EXTRA_DEPEND=""
+   BDEPEND=""
 fi
 
 DESCRIPTION="A manual tiling window manager for X"
@@ -21,16 +21,14 @@ LICENSE="BSD-2"
 SLOT="0"
 IUSE="examples xinerama zsh-completion"
 
-CDEPEND=">=dev-libs/glib-2.24:2
+DEPEND=">=dev-libs/glib-2.24:2
x11-libs/libX11
x11-libs/libXext
xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
app-shells/bash
zsh-completion? ( app-shells/zsh )"
-DEPEND="${CDEPEND}
-   ${EXTRA_DEPEND}
-   virtual/pkgconfig"
+BDEPEND+=" virtual/pkgconfig"
 
 src_compile() {
tc-export CC LD CXX

diff --git a/x11-wm/herbstluftwm/herbstluftwm-.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
index 0cea06f49ee..9fe9d04ef46 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
@@ -7,11 +7,11 @@ inherit toolchain-funcs bash-completion-r1
 if [[ ${PV} == * ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm.git;
-   EXTRA_DEPEND="app-text/asciidoc"
+   BDEPEND="app-text/asciidoc"
 else
SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
KEYWORDS="~amd64 ~x86"
-   EXTRA_DEPEND=""
+   BDEPEND=""
 fi
 
 DESCRIPTION="A manual tiling window manager for X"
@@ -21,16 +21,14 @@ LICENSE="BSD-2"
 SLOT="0"
 IUSE="examples xinerama zsh-completion"
 
-CDEPEND=">=dev-libs/glib-2.24:2
+DEPEND=">=dev-libs/glib-2.24:2
x11-libs/libX11
x11-libs/libXext
xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
app-shells/bash
zsh-completion? ( app-shells/zsh )"
-DEPEND="${CDEPEND}
-   ${EXTRA_DEPEND}
-   virtual/pkgconfig"
+BDEPEND+=" virtual/pkgconfig"
 
 src_compile() {
tc-export CC LD CXX

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2019-11-18 Thread Tim Harder

commit: 5cb209947192f6efde17611c8ef246bdd0da058f
Author: Tim Harder  gentoo  org>
AuthorDate: Mon Nov 18 22:34:55 2019 +
Commit: Tim Harder  gentoo  org>
CommitDate: Mon Nov 18 22:34:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cb20994

x11-wm/herbstluftwm: drop myself as a maintainer

Signed-off-by: Tim Harder  gentoo.org>

 x11-wm/herbstluftwm/metadata.xml | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/x11-wm/herbstluftwm/metadata.xml b/x11-wm/herbstluftwm/metadata.xml
index 78e64a5cf1a..6f49eba8f49 100644
--- a/x11-wm/herbstluftwm/metadata.xml
+++ b/x11-wm/herbstluftwm/metadata.xml
@@ -1,8 +1,5 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   radher...@gentoo.org
-   Tim Harder
-   
+

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2019-11-17 Thread Tim Harder

commit: e19da55a37f16c67848413101a99832a641e88fb
Author: Tim Harder  gentoo  org>
AuthorDate: Sun Nov 17 21:46:22 2019 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sun Nov 17 22:09:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e19da55a

x11-wm/herbstluftwm: remove old

Signed-off-by: Tim Harder  gentoo.org>

 x11-wm/herbstluftwm/Manifest  |  2 -
 x11-wm/herbstluftwm/herbstluftwm-0.7.0.ebuild | 66 --
 x11-wm/herbstluftwm/herbstluftwm-0.7.1.ebuild | 68 ---
 3 files changed, 136 deletions(-)

diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index 1e703b7ad0c..4672f63b3e3 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,3 +1 @@
-DIST herbstluftwm-0.7.0.tar.gz 247469 BLAKE2B 
3ee6c4709bd52ad330706aa941fba4372003f6d494759bc0fc87bcf34cffd07a55d5d4b550de13af059d4455ce240e6be3151b8f7563f3fb0d1dc4ef79306c58
 SHA512 
792e517dff5cfb075b8b5a42b076a7809e983953620212de6d571d3d606c573c83606a0f7694e25d3351c288473f5129191a416fe8977db8438c1016503eacd8
-DIST herbstluftwm-0.7.1.tar.gz 244726 BLAKE2B 
bdc8b769c3991276f03540024212315310aab4c5980321a3f019d5dc044b862aa606746d968e01bb0d8280b10ecf2f7f300710e2ac5cba46afd3129c316df5ae
 SHA512 
1eb25c6e64bc046fca4b93cb9158515dba793bb14676229cc9c9194660eeccfc0c907ddcc4b15581b9ffb8b7f261ad3e2c8efe60a5d11eeb836208dd289dc199
 DIST herbstluftwm-0.7.2.tar.gz 245506 BLAKE2B 
72d0bb2a77e519161d193ac7b2b9f1f878ccb6cfe4914b6c75d060e2daa0bec4203ee4ebf203b9fa1dfb844d71d50aa7c03257c78aa22e906bf42519d1e592af
 SHA512 
abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.7.0.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.7.0.ebuild
deleted file mode 100644
index 0f5e7d231d5..000
--- a/x11-wm/herbstluftwm/herbstluftwm-0.7.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs bash-completion-r1
-
-if [[ ${PV} == * ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm.git;
-   EXTRA_DEPEND="app-text/asciidoc"
-else
-   SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
-   KEYWORDS="amd64 x86"
-   EXTRA_DEPEND=""
-fi
-
-DESCRIPTION="A manual tiling window manager for X"
-HOMEPAGE="https://herbstluftwm.org/;
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="examples xinerama zsh-completion"
-
-CDEPEND=">=dev-libs/glib-2.24:2
-   x11-libs/libX11
-   x11-libs/libXext
-   xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${CDEPEND}
-   app-shells/bash
-   zsh-completion? ( app-shells/zsh )"
-DEPEND="${CDEPEND}
-   ${EXTRA_DEPEND}
-   virtual/pkgconfig"
-
-src_compile() {
-   emake CC="$(tc-getCC)" LD="$(tc-getCC)" COLOR=0 VERBOSE= \
-   $(use xinerama || echo XINERAMAFLAGS= XINERAMALIBS= )
-}
-
-src_install() {
-   dobin herbstluftwm herbstclient
-   dodoc BUGS MIGRATION NEWS README.md
-
-   doman doc/{herbstluftwm,herbstclient}.1
-
-   exeinto /etc/xdg/herbstluftwm
-   doexe share/{autostart,panel.sh,restartpanels.sh}
-
-   insinto /usr/share/xsessions
-   doins share/herbstluftwm.desktop
-
-   newbashcomp share/herbstclient-completion herbstclient
-
-   if use zsh-completion ; then
-   insinto /usr/share/zsh/site-functions
-   doins share/_herbstclient
-   fi
-
-   if use examples ; then
-   exeinto /usr/share/doc/${PF}/examples
-   doexe scripts/*.sh
-   docinto examples
-   dodoc scripts/README
-   docompress -x /usr/share/doc/${PF}/examples
-   fi
-}

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.7.1.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.7.1.ebuild
deleted file mode 100644
index f9e402083ad..000
--- a/x11-wm/herbstluftwm/herbstluftwm-0.7.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs bash-completion-r1
-
-if [[ ${PV} == * ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm.git;
-   EXTRA_DEPEND="app-text/asciidoc"
-else
-   SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
-   KEYWORDS="~amd64 ~x86"
-   EXTRA_DEPEND=""
-fi
-
-DESCRIPTION="A manual tiling window manager for X"
-HOMEPAGE="https://herbstluftwm.org/;
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="examples xinerama zsh-completion"
-
-CDEPEND=">=dev-libs/glib-2.24:2
-   x11-libs/libX11
-   x11-libs/libXext
-   xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${CDEPEND}
-   app-shells/bash
-   zsh-completion? ( app-shells/zsh )"
-DEPEND="${CDEPEND}
-

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2019-11-17 Thread Tim Harder

commit: c77e1319a475c80da6275e5f653e1f1a7ec1cfcf
Author: Tim Harder  gentoo  org>
AuthorDate: Sun Nov 17 21:46:01 2019 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sun Nov 17 22:09:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c77e1319

x11-wm/herbstluftwm: stabilize 0.7.2

Signed-off-by: Tim Harder  gentoo.org>

 x11-wm/herbstluftwm/herbstluftwm-0.7.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.7.2.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.7.2.ebuild
index 0cea06f49ee..3ca73c0e801 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.7.2.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.7.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == * ]] ; then
EXTRA_DEPEND="app-text/asciidoc"
 else
SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 x86"
EXTRA_DEPEND=""
 fi

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2019-06-07 Thread Tim Harder

commit: aa4e14e5e8ef312c478082e11510003135d913cd
Author: Tim Harder  gentoo  org>
AuthorDate: Fri Jun  7 08:03:55 2019 +
Commit: Tim Harder  gentoo  org>
CommitDate: Fri Jun  7 08:04:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa4e14e5

x11-wm/herbstluftwm: version bump to 0.7.2

Closes: https://bugs.gentoo.org/686942

Signed-off-by: Tim Harder  gentoo.org>

 x11-wm/herbstluftwm/Manifest  | 1 +
 .../{herbstluftwm-.ebuild => herbstluftwm-0.7.2.ebuild}   | 4 ++--
 x11-wm/herbstluftwm/herbstluftwm-.ebuild  | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index 319a132be78..1e703b7ad0c 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,2 +1,3 @@
 DIST herbstluftwm-0.7.0.tar.gz 247469 BLAKE2B 
3ee6c4709bd52ad330706aa941fba4372003f6d494759bc0fc87bcf34cffd07a55d5d4b550de13af059d4455ce240e6be3151b8f7563f3fb0d1dc4ef79306c58
 SHA512 
792e517dff5cfb075b8b5a42b076a7809e983953620212de6d571d3d606c573c83606a0f7694e25d3351c288473f5129191a416fe8977db8438c1016503eacd8
 DIST herbstluftwm-0.7.1.tar.gz 244726 BLAKE2B 
bdc8b769c3991276f03540024212315310aab4c5980321a3f019d5dc044b862aa606746d968e01bb0d8280b10ecf2f7f300710e2ac5cba46afd3129c316df5ae
 SHA512 
1eb25c6e64bc046fca4b93cb9158515dba793bb14676229cc9c9194660eeccfc0c907ddcc4b15581b9ffb8b7f261ad3e2c8efe60a5d11eeb836208dd289dc199
+DIST herbstluftwm-0.7.2.tar.gz 245506 BLAKE2B 
72d0bb2a77e519161d193ac7b2b9f1f878ccb6cfe4914b6c75d060e2daa0bec4203ee4ebf203b9fa1dfb844d71d50aa7c03257c78aa22e906bf42519d1e592af
 SHA512 
abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c

diff --git a/x11-wm/herbstluftwm/herbstluftwm-.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.7.2.ebuild
similarity index 97%
copy from x11-wm/herbstluftwm/herbstluftwm-.ebuild
copy to x11-wm/herbstluftwm/herbstluftwm-0.7.2.ebuild
index f9e402083ad..0cea06f49ee 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.7.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit toolchain-funcs bash-completion-r1
 
 if [[ ${PV} == * ]] ; then

diff --git a/x11-wm/herbstluftwm/herbstluftwm-.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
index f9e402083ad..0cea06f49ee 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit toolchain-funcs bash-completion-r1
 
 if [[ ${PV} == * ]] ; then

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2018-12-11 Thread Tim Harder

commit: 7bbd4434026212ff0f98a1b130745948ddab3438
Author: Tim Harder  gentoo  org>
AuthorDate: Tue Dec 11 08:12:44 2018 +
Commit: Tim Harder  gentoo  org>
CommitDate: Tue Dec 11 08:19:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bbd4434

x11-wm/herbstluftwm: version bump to 0.7.1

Closes: https://bugs.gentoo.org/672200
Closes: https://github.com/gentoo/gentoo/pull/10514

Signed-off-by: Tim Harder  gentoo.org>

 x11-wm/herbstluftwm/Manifest  | 1 +
 .../{herbstluftwm-.ebuild => herbstluftwm-0.7.1.ebuild}   | 4 +++-
 x11-wm/herbstluftwm/herbstluftwm-.ebuild  | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index 40a778b18b3..319a132be78 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1 +1,2 @@
 DIST herbstluftwm-0.7.0.tar.gz 247469 BLAKE2B 
3ee6c4709bd52ad330706aa941fba4372003f6d494759bc0fc87bcf34cffd07a55d5d4b550de13af059d4455ce240e6be3151b8f7563f3fb0d1dc4ef79306c58
 SHA512 
792e517dff5cfb075b8b5a42b076a7809e983953620212de6d571d3d606c573c83606a0f7694e25d3351c288473f5129191a416fe8977db8438c1016503eacd8
+DIST herbstluftwm-0.7.1.tar.gz 244726 BLAKE2B 
bdc8b769c3991276f03540024212315310aab4c5980321a3f019d5dc044b862aa606746d968e01bb0d8280b10ecf2f7f300710e2ac5cba46afd3129c316df5ae
 SHA512 
1eb25c6e64bc046fca4b93cb9158515dba793bb14676229cc9c9194660eeccfc0c907ddcc4b15581b9ffb8b7f261ad3e2c8efe60a5d11eeb836208dd289dc199

diff --git a/x11-wm/herbstluftwm/herbstluftwm-.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.7.1.ebuild
similarity index 95%
copy from x11-wm/herbstluftwm/herbstluftwm-.ebuild
copy to x11-wm/herbstluftwm/herbstluftwm-0.7.1.ebuild
index 162cddd0578..f9e402083ad 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.7.1.ebuild
@@ -33,7 +33,9 @@ DEPEND="${CDEPEND}
virtual/pkgconfig"
 
 src_compile() {
-   emake CC="$(tc-getCC)" LD="$(tc-getCC)" COLOR=0 VERBOSE= \
+   tc-export CC LD CXX
+
+   emake LDXX="$(tc-getCXX)" COLOR=0 VERBOSE= \
$(use xinerama || echo XINERAMAFLAGS= XINERAMALIBS= )
 }
 

diff --git a/x11-wm/herbstluftwm/herbstluftwm-.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
index 162cddd0578..f9e402083ad 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
@@ -33,7 +33,9 @@ DEPEND="${CDEPEND}
virtual/pkgconfig"
 
 src_compile() {
-   emake CC="$(tc-getCC)" LD="$(tc-getCC)" COLOR=0 VERBOSE= \
+   tc-export CC LD CXX
+
+   emake LDXX="$(tc-getCXX)" COLOR=0 VERBOSE= \
$(use xinerama || echo XINERAMAFLAGS= XINERAMALIBS= )
 }

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2018-12-08 Thread Patrice Clement

commit: c35eae654f18fd460c698f27bb541b9ed4c56794
Author: Francesco Turco  fastmail  fm>
AuthorDate: Wed Nov 14 19:56:22 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sat Dec  8 22:17:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c35eae65

x11-wm/herbstluftwm: use HTTPS for HOMEPAGE and SRC_URI.

Signed-off-by: Francesco Turco  fastmail.fm>
Closes: https://github.com/gentoo/gentoo/pull/10420
Signed-off-by: Patrice Clement  gentoo.org>

 x11-wm/herbstluftwm/herbstluftwm-0.7.0.ebuild | 6 +++---
 x11-wm/herbstluftwm/herbstluftwm-.ebuild  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.7.0.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.7.0.ebuild
index 3bf86325130..0f5e7d231d5 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.7.0.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,13 +9,13 @@ if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm.git;
EXTRA_DEPEND="app-text/asciidoc"
 else
-   SRC_URI="http://herbstluftwm.org/tarballs/${P}.tar.gz;
+   SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
KEYWORDS="amd64 x86"
EXTRA_DEPEND=""
 fi
 
 DESCRIPTION="A manual tiling window manager for X"
-HOMEPAGE="http://herbstluftwm.org;
+HOMEPAGE="https://herbstluftwm.org/;
 
 LICENSE="BSD-2"
 SLOT="0"

diff --git a/x11-wm/herbstluftwm/herbstluftwm-.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
index ee1ebe87276..162cddd0578 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,13 +9,13 @@ if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm.git;
EXTRA_DEPEND="app-text/asciidoc"
 else
-   SRC_URI="http://herbstluftwm.org/tarballs/${P}.tar.gz;
+   SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz;
KEYWORDS="~amd64 ~x86"
EXTRA_DEPEND=""
 fi
 
 DESCRIPTION="A manual tiling window manager for X"
-HOMEPAGE="http://herbstluftwm.org;
+HOMEPAGE="https://herbstluftwm.org/;
 
 LICENSE="BSD-2"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2017-05-04 Thread Tim Harder

commit: 706f9715d5cb92d73e35111dba8abdab4ec2819d
Author: Tim Harder  gentoo  org>
AuthorDate: Thu May  4 08:52:52 2017 +
Commit: Tim Harder  gentoo  org>
CommitDate: Thu May  4 08:54:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=706f9715

x11-wm/herbstluftwm: update to EAPI 6

 x11-wm/herbstluftwm/herbstluftwm-0.7.0.ebuild | 4 ++--
 x11-wm/herbstluftwm/herbstluftwm-.ebuild  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.7.0.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.7.0.ebuild
index 4f24a7f994b..ee1ebe87276 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.7.0.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.7.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 inherit toolchain-funcs bash-completion-r1
 
 if [[ ${PV} == * ]] ; then

diff --git a/x11-wm/herbstluftwm/herbstluftwm-.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
index 4f24a7f994b..ee1ebe87276 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 inherit toolchain-funcs bash-completion-r1
 
 if [[ ${PV} == * ]] ; then

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2017-05-04 Thread Tim Harder

commit: 56d96526bb259fc4072b1809f14fc657ad5cfc14
Author: Tim Harder  gentoo  org>
AuthorDate: Thu May  4 08:53:09 2017 +
Commit: Tim Harder  gentoo  org>
CommitDate: Thu May  4 08:54:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56d96526

x11-wm/herbstluftwm: stabilize 0.7.0

 x11-wm/herbstluftwm/herbstluftwm-0.7.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.7.0.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.7.0.ebuild
index ee1ebe87276..3bf86325130 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.7.0.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.7.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == * ]] ; then
EXTRA_DEPEND="app-text/asciidoc"
 else
SRC_URI="http://herbstluftwm.org/tarballs/${P}.tar.gz;
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 x86"
EXTRA_DEPEND=""
 fi

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2017-05-04 Thread Tim Harder

commit: 89c1d2fc567bee135b83b06486c2264926df00fa
Author: Tim Harder  gentoo  org>
AuthorDate: Thu May  4 08:53:27 2017 +
Commit: Tim Harder  gentoo  org>
CommitDate: Thu May  4 08:54:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89c1d2fc

x11-wm/herbstclient: remove old

 x11-wm/herbstluftwm/Manifest |  1 -
 x11-wm/herbstluftwm/herbstluftwm-0.6.2-r1.ebuild | 66 
 2 files changed, 67 deletions(-)

diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index b61f16c1e44..b36df8020a1 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,2 +1 @@
-DIST herbstluftwm-0.6.2.tar.gz 224191 SHA256 
a89f5c397aee7f1aa3b39dd53bc67e282679f02f1c0bf3c33c41a608e217f0ac SHA512 
3fa70a285e21c9e0717f3301227b2fcc578e819c50d2bf380311253db2f5c864d6e42020b8b278ba4e555b5d75e0572144e06c0e8f2a395155415a4902a95421
 WHIRLPOOL 
1a70cd8728c1a32ac429af5eff7d15b2d6744cd494ce1a434e49213ac747346c39956d459c4abc5c5ff4687ee2276c39911638c47e363e7103c52330ba875b71
 DIST herbstluftwm-0.7.0.tar.gz 247469 SHA256 
7e2ffc30b7911407230a5eeb61e044cea78557999107d372bc2dbc3d82d0ae27 SHA512 
792e517dff5cfb075b8b5a42b076a7809e983953620212de6d571d3d606c573c83606a0f7694e25d3351c288473f5129191a416fe8977db8438c1016503eacd8
 WHIRLPOOL 
4343d7efcf1eb6b3a9c9c5bed033063b6a4a46a2f78dccc9f64011503c3af1835ed22d63a140f37e007560b988f8fb11c8bbc09875d9bf373c5e41f292271652

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.6.2-r1.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.6.2-r1.ebuild
deleted file mode 100644
index fb10e5b9f33..000
--- a/x11-wm/herbstluftwm/herbstluftwm-0.6.2-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs bash-completion-r1
-
-if [[ ${PV} == * ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="git://git.cs.fau.de/hlwm"
-   EXTRA_DEPEND="app-text/asciidoc"
-else
-   SRC_URI="http://herbstluftwm.org/tarballs/${P}.tar.gz;
-   KEYWORDS="~amd64 ~x86"
-   EXTRA_DEPEND=""
-fi
-
-DESCRIPTION="A manual tiling window manager for X"
-HOMEPAGE="http://herbstluftwm.org;
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="examples xinerama zsh-completion"
-
-CDEPEND=">=dev-libs/glib-2.24:2
-   x11-libs/libX11
-   x11-libs/libXext
-   xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${CDEPEND}
-   app-shells/bash
-   zsh-completion? ( app-shells/zsh )"
-DEPEND="${CDEPEND}
-   ${EXTRA_DEPEND}
-   virtual/pkgconfig"
-
-src_compile() {
-   emake CC="$(tc-getCC)" LD="$(tc-getCC)" COLOR=0 VERBOSE= \
-   $(use xinerama || echo XINERAMAFLAGS= XINERAMALIBS= )
-}
-
-src_install() {
-   dobin herbstluftwm herbstclient
-   dodoc BUGS MIGRATION NEWS README
-
-   doman doc/{herbstluftwm,herbstclient}.1
-
-   exeinto /etc/xdg/herbstluftwm
-   doexe share/{autostart,panel.sh,restartpanels.sh}
-
-   insinto /usr/share/xsessions
-   doins share/herbstluftwm.desktop
-
-   newbashcomp share/herbstclient-completion herbstclient
-
-   if use zsh-completion ; then
-   insinto /usr/share/zsh/site-functions
-   doins share/_herbstclient
-   fi
-
-   if use examples ; then
-   exeinto /usr/share/doc/${PF}/examples
-   doexe scripts/*.sh
-   docinto examples
-   dodoc scripts/README
-   docompress -x /usr/share/doc/${PF}/examples
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2016-04-08 Thread Tim Harder

commit: 6f5766c1d57281587a8bc9b40a50591dab4a4da0
Author: Tim Harder  gentoo  org>
AuthorDate: Sat Apr  9 02:17:16 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sat Apr  9 02:17:16 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f5766c1

x11-wm/herbstluftwm: version bump to 0.7.0

 x11-wm/herbstluftwm/Manifest| 1 +
 .../{herbstluftwm-.ebuild => herbstluftwm-0.7.0.ebuild} | 2 +-
 x11-wm/herbstluftwm/herbstluftwm-.ebuild| 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index 5439a42..b61f16c 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1 +1,2 @@
 DIST herbstluftwm-0.6.2.tar.gz 224191 SHA256 
a89f5c397aee7f1aa3b39dd53bc67e282679f02f1c0bf3c33c41a608e217f0ac SHA512 
3fa70a285e21c9e0717f3301227b2fcc578e819c50d2bf380311253db2f5c864d6e42020b8b278ba4e555b5d75e0572144e06c0e8f2a395155415a4902a95421
 WHIRLPOOL 
1a70cd8728c1a32ac429af5eff7d15b2d6744cd494ce1a434e49213ac747346c39956d459c4abc5c5ff4687ee2276c39911638c47e363e7103c52330ba875b71
+DIST herbstluftwm-0.7.0.tar.gz 247469 SHA256 
7e2ffc30b7911407230a5eeb61e044cea78557999107d372bc2dbc3d82d0ae27 SHA512 
792e517dff5cfb075b8b5a42b076a7809e983953620212de6d571d3d606c573c83606a0f7694e25d3351c288473f5129191a416fe8977db8438c1016503eacd8
 WHIRLPOOL 
4343d7efcf1eb6b3a9c9c5bed033063b6a4a46a2f78dccc9f64011503c3af1835ed22d63a140f37e007560b988f8fb11c8bbc09875d9bf373c5e41f292271652

diff --git a/x11-wm/herbstluftwm/herbstluftwm-.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-0.7.0.ebuild
similarity index 97%
copy from x11-wm/herbstluftwm/herbstluftwm-.ebuild
copy to x11-wm/herbstluftwm/herbstluftwm-0.7.0.ebuild
index 46c126c..fd88905 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 

diff --git a/x11-wm/herbstluftwm/herbstluftwm-.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
index 46c126c..fd88905 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

2015-09-15 Thread Michael Weber

commit: 3a415b590a01e221b6234ab46f79eaf90c345118
Author: Michael Weber  gentoo  org>
AuthorDate: Tue Sep 15 12:50:21 2015 +
Commit: Michael Weber  gentoo  org>
CommitDate: Tue Sep 15 12:52:28 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a415b59

x11-wm/herbstluftwm: Update EGIT_REPO_URI according to 
https://git.informatik.uni-erlangen.de/?p=hlwm;a=summary

Package-Manager: portage-2.2.20.1

 x11-wm/herbstluftwm/herbstluftwm-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/herbstluftwm/herbstluftwm-.ebuild 
b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
index e63f775..46c126c 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs bash-completion-r1
 
 if [[ ${PV} == * ]] ; then
inherit git-r3
-   EGIT_REPO_URI="git://git.cs.fau.de/hlwm"
+   EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm.git;
EXTRA_DEPEND="app-text/asciidoc"
 else
SRC_URI="http://herbstluftwm.org/tarballs/${P}.tar.gz;

64 matches

Mail list logo