[gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeyboard-config/

[Matt Turner]

commit:     5fdc064015062341ed8047e5f4a4d5056c2779bc
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 23 19:42:58 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Jun 23 19:43:20 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fdc0640

x11-misc/xkeyboard-config: Switch to Meson

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 .../xkeyboard-config/xkeyboard-config-9999.ebuild  | 34 ++++++----------------
 1 file changed, 9 insertions(+), 25 deletions(-)

diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild 
b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
index 66e3276b4ab..5ae805ded96 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
@@ -4,16 +4,14 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit python-any-r1
+inherit meson python-any-r1
 
 DESCRIPTION="X keyboard configuration database"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig 
https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config";
 
 if [[ ${PV} == 9999 ]]; then
        
EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git";
-       inherit autotools git-r3
-       # x11-misc/util-macros only required on live ebuilds
-       LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+       inherit git-r3
 else
        SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2";
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris 
~x86-solaris"
@@ -23,36 +21,22 @@ LICENSE="MIT"
 SLOT="0"
 IUSE=""
 
+DEPEND=""
+RDEPEND=""
 BDEPEND="
        ${PYTHON_DEPS}
-       dev-util/intltool
+       dev-libs/libxslt
        sys-devel/gettext
-       virtual/pkgconfig
 "
-RDEPEND=""
-DEPEND="${LIVE_DEPEND}"
 
 pkg_setup() {
        python-any-r1_pkg_setup
 }
 
-src_prepare() {
-       default
-       [[ ${PV} == 9999 ]] && eautoreconf
-}
-
 src_configure() {
-       local econfargs=(
-               --with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
-               --enable-compat-rules
-               # do not check for runtime deps
-               --disable-runtime-deps
-               --with-xkb-rules-symlink=xorg
+       local emesonargs=(
+               -Dxkb-base="${EPREFIX}/usr/share/X11/xkb"
+               -Dcompat-rules=true
        )
-
-       econf "${econfargs[@]}"
-}
-
-src_test() {
-       :;
+       meson_src_configure
 }