From 40fc747d78b01eb4419f3a2fdcfa32cf472a36f2 Mon Sep 17 00:00:00 2001
From: Jeroen Roovers <jer@gentoo.org>
Date: Thu, 18 Sep 2014 18:24:52 +0000
Subject: 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)
---
 x11-misc/xvkbd/ChangeLog           |  9 +++++-
 x11-misc/xvkbd/xvkbd-3.5-r1.ebuild | 60 ++++++++++++++++++++++++++++++++++++++
 x11-misc/xvkbd/xvkbd-3.5.ebuild    | 60 --------------------------------------
 3 files changed, 68 insertions(+), 61 deletions(-)
 create mode 100644 x11-misc/xvkbd/xvkbd-3.5-r1.ebuild
 delete mode 100644 x11-misc/xvkbd/xvkbd-3.5.ebuild

(limited to 'x11-misc')

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-r1.ebuild b/x11-misc/xvkbd/xvkbd-3.5-r1.ebuild
new file mode 100644
index 000000000000..91cdb87596a4
--- /dev/null
+++ b/x11-misc/xvkbd/xvkbd-3.5-r1.ebuild
@@ -0,0 +1,60 @@
+# 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-r1.ebuild,v 1.1 2014/09/18 18:24:52 jer Exp $
+
+EAPI=5
+inherit eutils multilib toolchain-funcs
+
+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"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXaw3d
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXtst
+"
+DEPEND="
+	${RDEPEND}
+	app-text/rman
+	x11-misc/gccmakedep
+	x11-misc/imake
+	x11-proto/inputproto
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+
+src_prepare() {
+	epatch_user
+}
+
+src_configure() {
+	xmkmf -a || die
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) LD=$(tc-getCC) \
+		XAPPLOADDIR="/usr/share/X11/app-defaults" \
+		LOCAL_LDFLAGS="${LDFLAGS}" \
+		CDEBUGFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake \
+		XAPPLOADDIR="/usr/share/X11/app-defaults" \
+		DESTDIR="${D}" \
+		install
+
+	rm -r "${D}"/usr/$(get_libdir) "${D}"/etc || die
+
+	dodoc README
+	newman ${PN}.man ${PN}.1
+}
diff --git a/x11-misc/xvkbd/xvkbd-3.5.ebuild b/x11-misc/xvkbd/xvkbd-3.5.ebuild
deleted file mode 100644
index 13018c79dea7..000000000000
--- a/x11-misc/xvkbd/xvkbd-3.5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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 $
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-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"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXaw3d
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXtst
-"
-DEPEND="
-	${RDEPEND}
-	app-text/rman
-	x11-misc/gccmakedep
-	x11-misc/imake
-	x11-proto/inputproto
-	x11-proto/xextproto
-	x11-proto/xproto
-"
-
-src_prepare() {
-	epatch_user
-}
-
-src_configure() {
-	xmkmf -a || die
-}
-
-src_compile() {
-	emake \
-		CC=$(tc-getCC) LD=$(tc-getCC) \
-		XAPPLOADDIR="/etc/X11/app-defaults" \
-		LOCAL_LDFLAGS="${LDFLAGS}" \
-		CDEBUGFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake \
-		XAPPLOADDIR="/etc/X11/app-defaults" \
-		DESTDIR="${D}" \
-		install
-
-	rm -rf "${D}"/usr/lib "${D}"/etc || die
-
-	dodoc README
-	newman ${PN}.man ${PN}.1
-}
-- 
cgit v1.2.3-65-gdbad