diff options
Diffstat (limited to 'x11-misc/xxkb')
| -rw-r--r-- | x11-misc/xxkb/metadata.xml | 7 | ||||
| -rw-r--r-- | x11-misc/xxkb/xxkb-1.11.1-r1.ebuild (renamed from x11-misc/xxkb/xxkb-1.11.1.ebuild) | 30 |
2 files changed, 21 insertions, 16 deletions
diff --git a/x11-misc/xxkb/metadata.xml b/x11-misc/xxkb/metadata.xml index 855595694b79..c1da2d8e3086 100644 --- a/x11-misc/xxkb/metadata.xml +++ b/x11-misc/xxkb/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> +<!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">xxkb</remote-id> </upstream> diff --git a/x11-misc/xxkb/xxkb-1.11.1.ebuild b/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild index 16f2f9b64abe..1b5ae5edd57f 100644 --- a/x11-misc/xxkb/xxkb-1.11.1.ebuild +++ b/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild @@ -1,14 +1,15 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils multilib +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="eXtended XKB - assign different keymaps to different windows" HOMEPAGE="https://sourceforge.net/projects/xxkb/" SRC_URI=" mirror://sourceforge/${PN}/${P}-src.tar.gz - svg? ( https://dev.gentoo.org/~jer/${PN}-flags.tar.bz2 ) + svg? ( https://dev.gentoo.org/~jsmolic/distfiles/${PN}-flags.tar.bz2 ) " LICENSE="Artistic-2" @@ -17,6 +18,7 @@ KEYWORDS="amd64 ppc x86" IUSE="svg" RDEPEND=" + x11-libs/gdk-pixbuf-xlib x11-libs/libX11 x11-libs/libXpm x11-libs/libXt @@ -26,29 +28,35 @@ RDEPEND=" x11-libs/gtk+:2 ) " -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" app-text/rman + sys-devel/gcc + >=x11-misc/imake-1.0.8-r1 svg? ( virtual/pkgconfig ) - x11-misc/imake " src_prepare() { if use svg; then mv "${WORKDIR}"/flags . || die - epatch "${FILESDIR}"/svg-flags.patch - epatch "${FILESDIR}"/svg-appdefaults.patch + eapply "${FILESDIR}"/svg-flags.patch + eapply "${FILESDIR}"/svg-appdefaults.patch fi - epatch "${FILESDIR}"/missing_init.patch + eapply "${FILESDIR}"/missing_init.patch + + default } src_configure() { - xmkmf $(usex svg -DWITH_SVG_SUPPORT '') || die + CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ + IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" \ + xmkmf $(usex svg -DWITH_SVG_SUPPORT '') || die } src_compile() { emake \ + CC="$(tc-getCC)" \ CDEBUGFLAGS="${CFLAGS}" \ EXTRA_LIBRARIES="-lXext" \ LOCAL_LDFLAGS="${LDFLAGS}" \ |