diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2013-07-19 01:51:15 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2013-07-19 01:51:15 +0000 |
| commit | cbeec0ba04aff212711fbcc5d255c4a3381c6d87 (patch) | |
| tree | ac76a2917d6904dc4d80160b8b1143f6b2bc0c12 /x11-misc/xvkbd | |
| parent | Fix dependencies. (diff) | |
| download | gentoo-2-cbeec0ba04aff212711fbcc5d255c4a3381c6d87.tar.gz gentoo-2-cbeec0ba04aff212711fbcc5d255c4a3381c6d87.tar.bz2 gentoo-2-cbeec0ba04aff212711fbcc5d255c4a3381c6d87.zip | |
Fix app-defaults dir (bug #430376).
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'x11-misc/xvkbd')
| -rw-r--r-- | x11-misc/xvkbd/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-misc/xvkbd/xvkbd-3.3.ebuild | 44 | ||||
| -rw-r--r-- | x11-misc/xvkbd/xvkbd-3.4a-r1.ebuild (renamed from x11-misc/xvkbd/xvkbd-3.4a.ebuild) | 6 |
3 files changed, 10 insertions, 48 deletions
diff --git a/x11-misc/xvkbd/ChangeLog b/x11-misc/xvkbd/ChangeLog index 52a3f03e49fe..faa675121d0d 100644 --- a/x11-misc/xvkbd/ChangeLog +++ b/x11-misc/xvkbd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-misc/xvkbd # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvkbd/ChangeLog,v 1.27 2013/05/09 02:47:10 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvkbd/ChangeLog,v 1.28 2013/07/19 01:51:15 jer Exp $ + +*xvkbd-3.4a-r1 (19 Jul 2013) + + 19 Jul 2013; Jeroen Roovers <jer@gentoo.org> -xvkbd-3.3.ebuild, + -xvkbd-3.4a.ebuild, +xvkbd-3.4a-r1.ebuild: + Fix app-defaults dir (bug #430376). *xvkbd-3.4a (09 May 2013) diff --git a/x11-misc/xvkbd/xvkbd-3.3.ebuild b/x11-misc/xvkbd/xvkbd-3.3.ebuild deleted file mode 100644 index 790ec4251838..000000000000 --- a/x11-misc/xvkbd/xvkbd-3.3.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvkbd/xvkbd-3.3.ebuild,v 1.1 2012/06/04 18:19:27 xmw Exp $ - -DESCRIPTION="virtual keyboard for X window system" -HOMEPAGE="http://homepage3.nifty.com/tsato/xvkbd/" -SRC_URI="http://homepage3.nifty.com/tsato/xvkbd/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -RDEPEND="x11-libs/libXtst - x11-libs/libXmu - x11-libs/libXaw - x11-libs/libXaw3d - x11-libs/libXt" -DEPEND="${RDEPEND} - x11-misc/imake - x11-misc/gccmakedep - x11-proto/xproto - x11-proto/inputproto - app-text/rman - x11-proto/xextproto" - -src_compile() { - xmkmf -a || die - - emake \ - XAPPLOADDIR="/usr/share/X11/app-defaults" \ - LOCAL_LDFLAGS="${LDFLAGS}" \ - CDEBUGFLAGS="${CFLAGS}" || die -} - -src_install() { - emake XAPPLOADDIR="/usr/share/X11/app-defaults" DESTDIR="${D}" \ - install || die - - rm -rf "${D}"/usr/lib "${D}"/etc - - dodoc README - newman ${PN}.man ${PN}.1 -} diff --git a/x11-misc/xvkbd/xvkbd-3.4a.ebuild b/x11-misc/xvkbd/xvkbd-3.4a-r1.ebuild index 75b94df6219d..7bf8561ffa98 100644 --- a/x11-misc/xvkbd/xvkbd-3.4a.ebuild +++ b/x11-misc/xvkbd/xvkbd-3.4a-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvkbd/xvkbd-3.4a.ebuild,v 1.1 2013/05/09 02:47:10 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvkbd/xvkbd-3.4a-r1.ebuild,v 1.1 2013/07/19 01:51:15 jer Exp $ EAPI=5 inherit toolchain-funcs @@ -39,14 +39,14 @@ src_configure() { src_compile() { emake \ CC=$(tc-getCC) LD=$(tc-getCC) \ - XAPPLOADDIR="/usr/share/X11/app-defaults" \ + XAPPLOADDIR="/etc/X11/app-defaults" \ LOCAL_LDFLAGS="${LDFLAGS}" \ CDEBUGFLAGS="${CFLAGS}" } src_install() { emake \ - XAPPLOADDIR="/usr/share/X11/app-defaults" \ + XAPPLOADDIR="/etc/X11/app-defaults" \ DESTDIR="${D}" \ install |