Fix app-defaults dir (bug #430376).

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

4 files changed, 16 insertions, 56 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/Manifest b/x11-misc/xvkbd/Manifest
index 530a267b6b10..0e6f7b881689 100644
--- a/x11-misc/xvkbd/Manifest
+++ b/x11-misc/xvkbd/Manifest
@@ -2,17 +2,15 @@
 Hash: SHA256
 
 DIST xvkbd-3.2.tar.gz 78617 SHA256 93c4bdced9f13f22c367d990e98ffbc53f8210fa28a816fa9c610d86e78bf807 SHA512 47578f3cc25bdaeb942e88c7bb3bb4bbb6d61e5cb718d34c92963e764451587eb5e3d95e69b72c2ba70db29c34a9e6f2adc60e61af775b714db35590d3306b48 WHIRLPOOL e1112062fd88e3a1ad97ea664dc44a943b1345d36bd782cb6fe810c865241e45093d0532342a0442609112746670e0806570dd166a55cf4947b53d20da9df218
-DIST xvkbd-3.3.tar.gz 79576 SHA256 414ba22cbbcddbb67abebe2a8919dae62c0bbbcb110aa691389500ac68e1679e SHA512 8fbcfbf2e3d280c2554f9b8ee9c17e6b400ef1598a05fe3864374b31129471422141bd7353872a738eed2b6573a083a4be8ad7ac5818fd8b6c4a4f98693444f2 WHIRLPOOL 080c5ef69bf36e6dd32af80fddce60a1f76c5bc27f4228d15bf18de3274606079234e47dcb2a42888ef25d0a84fa12732e8462d50b8c6475658b072129529ec2
 DIST xvkbd-3.4a.tar.gz 79694 SHA256 a81dd585d642ee6df71fb8d2b86290ec33930fa2c029a412aeae1b4af665fb7b SHA512 f905c6c57c9b1243354dd0c3f7865cfbe26a53ebb66cfa9f46f5176882a5e05a074ac50555c4fe0195264b3e9d79f5191820aa3aac51e995ca286a4df8031f1d WHIRLPOOL 0d7b98db90a4e96502827cfb485c0915e5c0e0fa447518ab4d48a80349af728dfd877306bbc7084667ea02031b8001ce5db591b9be760ee85c15b727f18f6880
 EBUILD xvkbd-3.2.ebuild 1002 SHA256 0c57ae6abbbb74eb700ae8116077131a271028d93ae165f55e7416b9db3118b5 SHA512 b52af281c75439713d3426a467cb88601ee3449105a605d1bbeb87cdbf80d0e2994f5c83cd8204859109ae1f59aa075a003800c4caee8ba73c3f175e62432b9b WHIRLPOOL e2785be7a0358f8813ccd72810881e8252be170b52d6ed037f70ec1df1f3cf4da38c3ced923771c4e5b4477f996d7d5b06f7ca0b8519b4711980fe20c65cf7cd
-EBUILD xvkbd-3.3.ebuild 1000 SHA256 f11d37fc4dd6ec2d61abf9c98b8ab779401b5dbdf7db0a6f84ed4dd8f190b0d0 SHA512 1f0dd4a648ea9d7b7ba496dcdf64747551da132e83ab793d072397284b22ff6c3e773273bc11b0e301c76df57e6e379ad809ab387d01c558f351cd2c67e5884d WHIRLPOOL 5504e30fb25b3941537c9d33607f33a9374b6a5d84f14d9371c7fbecfc433dfa1116d297ee7f81799bee19f4c68f2ae0948966e640dc111998c153c1cdad4e5c
-EBUILD xvkbd-3.4a.ebuild 1104 SHA256 153f34ef6b2b1af30e6a09cec9a927e6a2a9c87d79b8f984cc98b45cf55ae5f7 SHA512 9f04e4fc3c34502aabe342860ed45ae4b8436a39bc32a5f10ce9e5e5c934c9b37c51be83e815b6554798e5fdb2fbca4f302c4d044d44c4cb949c17f6bbe23271 WHIRLPOOL 5282cf725035ba144d02825103d352bf95c827c6533f1a2cc469a423a67c63ff7bf13830a9b5f5dd0028596cc123e92191a0f0603b295a16dbe45c00971f4790
-MISC ChangeLog 3307 SHA256 c2b031268948d1fecdcfe1c2ac3d3c437518a3dfd1a7b047f5a2e78b2af7c1c1 SHA512 781282c5b7f8af09d22070f7111dc69a0c8be31b84a42a40cbaef21b5a7489abbdddcd39df5c63c8030b70f25393ea8c22a55ea927485e5171e507833f339938 WHIRLPOOL 708103884f8eac27d42e1462d81ece7851a81183ba24fcdd04f12f9417c9edb723a5bf0f191bac4964e7b218b2f418b92b5a47ed9584c54e28e19c695910f46b
+EBUILD xvkbd-3.4a-r1.ebuild 1095 SHA256 b210a19c685fe04f153e1de33ebc74b8e5fc70d3e52ca1976e6f2ffc67ed2020 SHA512 fd080e827f63235a089add5793a1c75db26e453419fff494eacaaf78ffd16046605ad0155faa0f6cae7486a31de4dece34cc157377c1734196fa4fa81169039d WHIRLPOOL 0def3da1281c70bc164285bd04daaf721d4eb394dbc967231d8eaf9ab30f8478eb02b3bbe0c600d2d0c48355e84232ea229cc763f62e2b0adf52a784a17c0ca2
+MISC ChangeLog 3487 SHA256 d9d18ec287c0433aebfc4ba196a1b2aad45a35033ea09d63dd61a2bc5a749be1 SHA512 9833179487855d5cf9dd4467392d8e7c0cbe3b8e7c6d0aab864059a442565bb479f245c8774e8241247bb214da2bf1654c0c87e56a8b80c881c9a175d7bf506b WHIRLPOOL ad88632f48dfae2ed50c268be5565f984087224e16ceeace959de4ed90fd3e3b968b1dbc90d1d2c279127c4250e96838ef3fcc68505353687c30492dafd9e8b8
 MISC metadata.xml 166 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 SHA512 23980b683f9a89f988407b1dcc27a4465a18912f6e6cf8e1fed46182f00c4023d4802434f36b9482121ba9ffe9bc5d6e91b5d3a4ba9067fcfd8e57799c128fe3 WHIRLPOOL 96d79ff499e108ad89b80507c2e94a09af1e8031e5e2a7f9cecb2dddbf517872361436bdb983dc580660064a62663ad63aa1fad8f49dd3758253f4e378bfd297
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlGLDjAACgkQVWmRsqeSphOD/ACfeTzELGlvmntUauYXmVQj7zD3
-4NoAn03z3Ap3UlUsq1jwgLcLONDRcDJP
-=n/F2
+iEYEAREIAAYFAlHom5QACgkQVWmRsqeSphOMjwCePidDP1oqdRBNeMc2oqUSeixf
+iAQAn2nmVN3yrKahmNUFEF0Y7qdoq1wO
+=FRx0
 -----END PGP SIGNATURE-----
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