Install app defaults into /usr/share/X11/app-defaults. Fix wrong libdir in app-defaults removal (bug #496116).

Package-Manager: portage-2.2.13/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 19 insertions, 12 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/Manifest b/x11-misc/xvkbd/Manifest
index e866a700887d..2b94ab1a84e1 100644
--- a/x11-misc/xvkbd/Manifest
+++ b/x11-misc/xvkbd/Manifest
@@ -4,13 +4,13 @@ Hash: SHA256
 DIST xvkbd-3.4a.tar.gz 79694 SHA256 a81dd585d642ee6df71fb8d2b86290ec33930fa2c029a412aeae1b4af665fb7b SHA512 f905c6c57c9b1243354dd0c3f7865cfbe26a53ebb66cfa9f46f5176882a5e05a074ac50555c4fe0195264b3e9d79f5191820aa3aac51e995ca286a4df8031f1d WHIRLPOOL 0d7b98db90a4e96502827cfb485c0915e5c0e0fa447518ab4d48a80349af728dfd877306bbc7084667ea02031b8001ce5db591b9be760ee85c15b727f18f6880
 DIST xvkbd-3.5.tar.gz 108351 SHA256 8819bdba359f1d0894bfc0b3314d5cdb9107387de6f19d2f409dba15e82b8fee SHA512 e847512bf023a540127297420829cb73cc142fa06e3044a6a8b3d051f3fca38427f2a262c50e57afc94317acdd05f9d4e880faf4826887255e081c460bc4d305 WHIRLPOOL 1615c1095acd99b4c89cde08dcced1dcf055229032f14e5f3b3583a0251733f98a0eadd3ca2fd552316733a8a1e12e678fc67c9870a34a1ff199baf256196c8e
 EBUILD xvkbd-3.4a-r1.ebuild 1131 SHA256 25fbd9639eea4013dc05ae621ab68131ee70d99d4d744a9c7d2251bd231db7cd SHA512 5ded90153fe53f03373be1a941cfe114820ae18cf0e07e19fef9560cd3e3fc83e0c78e13d010a6bebf501e867baac3d5de7a9d6c44329fb02d03dceffebc5264 WHIRLPOOL d5a6f61bbe93141c0a62cc616482a46384c516d6c67e7352778927bf7601af10974edeeb44555b1d3ba7e26670fa878dff0e5b71ec0646efb8dffe758087712a
-EBUILD xvkbd-3.5.ebuild 1129 SHA256 c174a4a76eedd8d4a9fc51c3abf6ecab65380ac8a20d2d69a8eaebc812de592f SHA512 56d9cd2d6d4424a7bab404d611ec337ff9b07fc54d4ea5cc36e3cf59c571b4a7fa04fb014901c30f2bbaac7932015a5e7e9e27170eadc819eec852cd74f2361b WHIRLPOOL 006618190c0b87b02a2d4846c55fe216bd757d7ebd674699066985c36b5a73115bbab65a8287ea6be74a6fdb16b8c02eb84fdb67f17701529a0d1822f057dbde
-MISC ChangeLog 4019 SHA256 05796a99ad73054dc6640c8b36261a011bb36b1f5410e2b9c3a3eac2c30103ef SHA512 5ed329730b0cc3a116c556fad15e1b334628721818ceb75a77858da383e4b94d37c941a71ac4dae4c0158d04205f7d7035f2097f57fd927c5455b5f180fd4f5e WHIRLPOOL 2819f5b1620b1dc7a63a897603482e22d1336464c97787def74395301815a00699c2303f8cd4648856730d03dc41464d65f987ef751535601f598a2f0c9b25e7
+EBUILD xvkbd-3.5-r1.ebuild 1162 SHA256 78702e69cb437d28d81a81b47a3a72ba1a7577632f2da9dcbf7782c7630c9361 SHA512 bdf3ef871b6684c97fcc35a008e16d9610fe80fa0be13ff88b5038d92deaf2f5a0b8fe4c22bfd55cfa099775ba75d427066c3707ff2b2b7a075898e6e24b048e WHIRLPOOL 6c8027aa23b0feb03ab618b3567da6c5391431bb6cc8b56c38c9f6cddb611d7d221fcb65f98ae80ec9f3c325f04305e2172fd6c42034a6d74f6386ee4ad9e614
+MISC ChangeLog 4254 SHA256 d3d719e647fdb01616bb474d3ef32efe844bf8b7a3f604a10ce5d37a69b9e895 SHA512 6d323adfab50ce1aff150a60bcb1ed1ae0d4edbd1fcba1a5fbb5b59d52cbcd8bba62798333b760787a2ed3989bbcc31660b0852c5895e3546dd4d09f8bbd5ad2 WHIRLPOOL b4d499aee75f3a8d0d8856f5993525a939b1f81c1f3f604812e0159d20654acc3c684dda7129f12af12a8a2390a5c9aba12adae2297bb9a86b79911a18859ed6
 MISC metadata.xml 166 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 SHA512 23980b683f9a89f988407b1dcc27a4465a18912f6e6cf8e1fed46182f00c4023d4802434f36b9482121ba9ffe9bc5d6e91b5d3a4ba9067fcfd8e57799c128fe3 WHIRLPOOL 96d79ff499e108ad89b80507c2e94a09af1e8031e5e2a7f9cecb2dddbf517872361436bdb983dc580660064a62663ad63aa1fad8f49dd3758253f4e378bfd297
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlN4O/4ACgkQVWmRsqeSphOttgCfQ7O6NVHtIKWOTlkaof9maSY+
-6wQAniKWrLfLhoDz3AhnVcxhQBbPYjVW
-=QwXu
+iEYEAREIAAYFAlQbI4wACgkQVWmRsqeSphN0rgCfVcuzaq5dqHr0mQuAJs4XCUIs
+6wwAn3EvWXRlW0ds0x7RAsd7fGqR+xDv
+=rjdN
 -----END PGP SIGNATURE-----
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