x11-misc/xkeyboard-config: Version bump to 2.25

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

diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index a5443e9436cc0e77f239aa9ad987cfe921e13d9d..25ccf5de1cf035c7a5d66987561488ec211e398b 100644 (file)
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,2 +1,3 @@
 DIST xkeyboard-config-2.23.1.tar.bz2 1053991 BLAKE2B c5551eb39f4cb240d36943d1e2fd3f9156bada61bb33013f6c43d036fb55aef5332fdb133ab6cfb03ebdbc68dcb3df7d974e3972904936b1e6dd89eafc4ec647 SHA512 d651bb89c265e58abe8bba4af6683364a8023cb73af7d00f401f33960e44fa94a7d8a8fdd2483d6703d1c261ca72ae5f2b53f543cfb70b2f571cfe9dcb80c3ba
 DIST xkeyboard-config-2.24.tar.bz2 1057889 BLAKE2B be9c6e0e0885c8a40406b3cf761f854268026084f2025a1a9f3e0326570543dd7fa11a2355947da1018d35af2ab4818092abbef5b7bdc3da923fcfe65059977d SHA512 96b65d18a85443a9bf93d65a4423da6e2b3d44882dae6a03bf46768a92017e9762cf3721361ba399c2873d53782944d0292eb673484f1cd8a8bdbf643e7a1dc0
+DIST xkeyboard-config-2.25.tar.bz2 1055253 BLAKE2B 80de6393f7dc2af18c4ef0e31458c4ff10333213fc109e01db809f8362af53315601e276ed856edf0b15e264b499f6335c380cc33ba6e11448e686c6a0295fa0 SHA512 2d9d6bdd885edc8e03e5a2c136c3b29b4ea795122709fa210bf151c4e7416a44fa2928bb29137ee8c6691d8646c1f645748576dea3f940ce84c8d4d0f91e09eb

diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.25.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.25.ebuild
new file mode 100644 (file)
index 0000000..9c80616
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.25.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="X keyboard configuration database"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
+
+if [[ ${PV} == 9999 ]]; then
+       EGIT_REPO_URI="https://anongit.freedesktop.org/git/xkeyboard-config.git"
+       inherit autotools git-r3
+       # x11-misc/util-macros only required on live ebuilds
+       LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+else
+       SRC_URI="mirror://xorg/data/${PN}/${P}.tar.bz2"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+BDEPEND="
+       virtual/pkgconfig
+"
+RDEPEND="
+       !<x11-apps/xkbcomp-1.2.3
+       !<x11-libs/libX11-1.4.3
+"
+DEPEND="
+       ${LIVE_DEPEND}
+       dev-util/intltool
+       sys-devel/gettext
+"
+
+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
+       )
+
+       econf "${econfargs[@]}"
+}

diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
index e517c9fc8366521fe19687d3c0a3674d8ca0ba8d..9c806160acaade14406e3c43dd0da93886318c82 100644 (file)
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7