diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2014-09-18 18:24:52 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2014-09-18 18:24:52 +0000 |
| commit | 40fc747d78b01eb4419f3a2fdcfa32cf472a36f2 (patch) | |
| tree | cda01a2f0395ed9b5c1ecba56a7136f16027e6d7 /x11-misc | |
| parent | version bump (diff) | |
| download | gentoo-2-40fc747d78b01eb4419f3a2fdcfa32cf472a36f2.tar.gz gentoo-2-40fc747d78b01eb4419f3a2fdcfa32cf472a36f2.tar.bz2 gentoo-2-40fc747d78b01eb4419f3a2fdcfa32cf472a36f2.zip | |
Install app defaults into /usr/share/X11/app-defaults. Fix wrong libdir in app-defaults removal (bug #496116).
(Portage version: 2.2.13/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/xvkbd/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-misc/xvkbd/xvkbd-3.5-r1.ebuild (renamed from x11-misc/xvkbd/xvkbd-3.5.ebuild) | 10 |
2 files changed, 13 insertions, 6 deletions
diff --git a/x11-misc/xvkbd/ChangeLog b/x11-misc/xvkbd/ChangeLog index 465e368afd78..098df6957513 100644 --- a/x11-misc/xvkbd/ChangeLog +++ b/x11-misc/xvkbd/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-misc/xvkbd # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvkbd/ChangeLog,v 1.33 2014/05/18 04:50:04 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvkbd/ChangeLog,v 1.34 2014/09/18 18:24:52 jer Exp $ + +*xvkbd-3.5-r1 (18 Sep 2014) + + 18 Sep 2014; Jeroen Roovers <jer@gentoo.org> -xvkbd-3.5.ebuild, + +xvkbd-3.5-r1.ebuild: + Install app defaults into /usr/share/X11/app-defaults. Fix wrong libdir in + app-defaults removal (bug #496116). *xvkbd-3.5 (18 May 2014) diff --git a/x11-misc/xvkbd/xvkbd-3.5.ebuild b/x11-misc/xvkbd/xvkbd-3.5-r1.ebuild index 13018c79dea7..91cdb87596a4 100644 --- a/x11-misc/xvkbd/xvkbd-3.5.ebuild +++ b/x11-misc/xvkbd/xvkbd-3.5-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvkbd/xvkbd-3.5.ebuild,v 1.1 2014/05/18 04:50:04 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvkbd/xvkbd-3.5-r1.ebuild,v 1.1 2014/09/18 18:24:52 jer Exp $ EAPI=5 -inherit eutils toolchain-funcs +inherit eutils multilib toolchain-funcs DESCRIPTION="virtual keyboard for X window system" HOMEPAGE="http://homepage3.nifty.com/tsato/xvkbd/" @@ -42,18 +42,18 @@ src_configure() { src_compile() { emake \ CC=$(tc-getCC) LD=$(tc-getCC) \ - XAPPLOADDIR="/etc/X11/app-defaults" \ + XAPPLOADDIR="/usr/share/X11/app-defaults" \ LOCAL_LDFLAGS="${LDFLAGS}" \ CDEBUGFLAGS="${CFLAGS}" } src_install() { emake \ - XAPPLOADDIR="/etc/X11/app-defaults" \ + XAPPLOADDIR="/usr/share/X11/app-defaults" \ DESTDIR="${D}" \ install - rm -rf "${D}"/usr/lib "${D}"/etc || die + rm -r "${D}"/usr/$(get_libdir) "${D}"/etc || die dodoc README newman ${PN}.man ${PN}.1 |