commit: 5164cec67df7d0b0524eb1f583fcbb92f8cfbfe3 Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com> AuthorDate: Fri Jul 27 23:47:03 2018 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sat Jul 28 00:38:28 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5164cec6
x11-misc/xkeyboard-config: port to EAPI 7 Package-Manager: Portage-2.3.41, Repoman-2.3.9 .../xkeyboard-config-2.23.1-r2.ebuild | 56 ++++++++++++++++++++++ .../xkeyboard-config-2.24-r1.ebuild | 52 ++++++++++++++++++++ 2 files changed, 108 insertions(+) diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r2.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r2.ebuild new file mode 100644 index 00000000000..c462673ea04 --- /dev/null +++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r2.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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 ~arm-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 +" + +PATCHES=( + "${FILESDIR}"/${P}_fix_typo_in_polish.patch +) + +src_prepare() { + default + [[ ${PV} == 9999 ]] && eautoreconf +} + +src_configure() { + local econfargs=( + --disable-selective-werror + --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-2.24-r1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.24-r1.ebuild new file mode 100644 index 00000000000..0f57cc43593 --- /dev/null +++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.24-r1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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 ~arm-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=( + --disable-selective-werror + --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[@]}" +}
