Diff herbstluftwm-0.9.5-r2 with a herbstluftwm-9999

/usr/portage/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild 2023-10-09 14:52:36.000368514 +0300
7 7
DISTUTILS_USE_PEP517=setuptools
8 8
DISTUTILS_OPTIONAL=1
9 9

  
10
inherit cmake desktop distutils-r1
10
inherit cmake distutils-r1
11 11

  
12 12
DESCRIPTION="A manual tiling window manager for X"
13 13
HOMEPAGE="https://herbstluftwm.org/"
......
17 17
	inherit git-r3
18 18
else
19 19
	SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz"
20
	KEYWORDS="amd64 x86"
20
	KEYWORDS="~amd64 ~x86"
21 21
fi
22 22

  
23 23
LICENSE="BSD-2"
......
57 57
"
58 58

  
59 59
if [[ -n "${EGIT_REPO_URI}" ]]; then
60
	# If hlwm is build from VCS, then hlwm-doc.json, which is used in
61
	# the tests, needs to generated by the WITH_DOCUMENTATION option.
62
	REQUIRED_USE+=" test? ( doc )"
63

  
60 64
	# Herbstluftwm tarballs ship with pre-compiled documentation, only
61 65
	# if we build from git asciidoc is needed.
62 66
	BDEPEND+=" doc? ( app-text/asciidoc )"
......
68 72
		-e '/^install.*LICENSEDIR/d' \
69 73
		-e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
70 74
		CMakeLists.txt || die
75

  
76
	# Do not install MAN pages, we use doman in src_install() for that.
77
	sed -i '/MANDIR/d' \
78
		doc/CMakeLists.txt || die
79

  
71 80
	cmake_src_prepare
72 81

  
73 82
	if use python; then
......
121 130
			herbstluftwm-tutorial.7
122 131
		)
123 132
		for man_page in "${man_pages[@]}"; do
124
			doman "doc/${man_page}"
133
			doman "${BUILD_DIR}/doc/${man_page}"
125 134
		done
126 135
	fi
127

  
128
	# Do not only install the herbstluftwm.desktop file in xsessions/ but
129
	# also in applications/. This allows herbstluftwm to be used as
130
	# window manager of a Gnome flashback session.
131
	domenu "${ED}"/usr/share/xsessions/herbstluftwm.desktop
132 136
}
133 137

  
134 138
distutils_enable_tests pytest
135 139

  
136
src_test() {
137
	ln -s "${BUILD_DIR}/herbstclient" || die "Could not symlink herbstclient"
138
	ln -s "${BUILD_DIR}/herbstluftwm" || die "Could not symlink herbstluftwm"
139

  
140
python_test() {
140 141
	pushd python > /dev/null || die
141 142
	distutils_install_for_testing
142 143
	popd > /dev/null || die
143 144

  
144
	# Ensure PYTHONPATH is exported, see https://bugs.gentoo.org/801658.
145
	export PYTHONPATH
146
	python_test
145
	distutils-r1_python_test
146
}
147

  
148
src_test() {
149
	if [[ -n "${EGIT_REPO_URI}" ]]; then
150
		ln -s "${BUILD_DIR}/doc/hlwm-doc.json" "doc/hlwm-doc.json" || die "Could not symlink hlwm-doc.json"
151
	fi
152

  
153
	ln -s "${BUILD_DIR}/herbstclient" || die "Could not symlink herbstclient"
154
	ln -s "${BUILD_DIR}/herbstluftwm" || die "Could not symlink herbstluftwm"
155

  
156
	distutils-r1_src_test
147 157
}
Thank you!