From 67b143454008b70cd4f83bdc5c0cf4963263ed02 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Tue, 17 Feb 2015 09:45:47 +0000 Subject: [PATCH] Version bump. Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0xA792A613 --- x11-misc/xvkbd/ChangeLog | 10 ++- x11-misc/xvkbd/Manifest | 11 ++-- .../files/xvkbd-3.6-last_altgr_mask.patch | 11 ++++ x11-misc/xvkbd/xvkbd-3.6.ebuild | 62 +++++++++++++++++++ 4 files changed, 88 insertions(+), 6 deletions(-) create mode 100644 x11-misc/xvkbd/files/xvkbd-3.6-last_altgr_mask.patch create mode 100644 x11-misc/xvkbd/xvkbd-3.6.ebuild diff --git a/x11-misc/xvkbd/ChangeLog b/x11-misc/xvkbd/ChangeLog index 098df6957513..b7613b37895e 100644 --- a/x11-misc/xvkbd/ChangeLog +++ b/x11-misc/xvkbd/ChangeLog @@ -1,6 +1,12 @@ # 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.34 2014/09/18 18:24:52 jer Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvkbd/ChangeLog,v 1.35 2015/02/17 09:45:45 jer Exp $ + +*xvkbd-3.6 (17 Feb 2015) + + 17 Feb 2015; Jeroen Roovers +xvkbd-3.6.ebuild, + +files/xvkbd-3.6-last_altgr_mask.patch: + Version bump. *xvkbd-3.5-r1 (18 Sep 2014) diff --git a/x11-misc/xvkbd/Manifest b/x11-misc/xvkbd/Manifest index 2b94ab1a84e1..a2d832e5ddaa 100644 --- a/x11-misc/xvkbd/Manifest +++ b/x11-misc/xvkbd/Manifest @@ -1,16 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX xvkbd-3.6-last_altgr_mask.patch 202 SHA256 ded1f8b44e06a6e266ba5768e52e3da9bfcad41da0cf3dc35f884eaa534e7f6f SHA512 d3d58b1ba3a7dc71a0240ba3240fd06cc1719ac35ab8f1b119f7d79823fddcdbe1605a457722ec75d4b74804f0a68ec221c5ec3d6c15bd2c4130ce96c01f771e WHIRLPOOL 971bc2973b479d8087523bbb66ca9b48c88eeee451954280edf16097a49ae9b19ec4204c590f6a9349bde73c55e67db290b1146e4e38c6fc3ec445c6e22fa001 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 +DIST xvkbd-3.6.tar.gz 81613 SHA256 2678541c23336a0795bf5684c9f38d382a6566e6509794a39952d6da47da5bae SHA512 55f4ab7959e66320d094938e8c87bef5ae243c7e37f35aa7b01dc1be76182c18e493964e3dccc1ee78c797d380d9a55fcbebf3a0219c4a6d0bbb999840a31b6e WHIRLPOOL 54454523465ec3353eaebcdc64210040b4a83eedb407e2bc2814757749331996b376da7e1ba90eca849b3c143622a2a0c63429905459e1d4e588d368be3fa4dd EBUILD xvkbd-3.4a-r1.ebuild 1131 SHA256 25fbd9639eea4013dc05ae621ab68131ee70d99d4d744a9c7d2251bd231db7cd SHA512 5ded90153fe53f03373be1a941cfe114820ae18cf0e07e19fef9560cd3e3fc83e0c78e13d010a6bebf501e867baac3d5de7a9d6c44329fb02d03dceffebc5264 WHIRLPOOL d5a6f61bbe93141c0a62cc616482a46384c516d6c67e7352778927bf7601af10974edeeb44555b1d3ba7e26670fa878dff0e5b71ec0646efb8dffe758087712a EBUILD xvkbd-3.5-r1.ebuild 1162 SHA256 78702e69cb437d28d81a81b47a3a72ba1a7577632f2da9dcbf7782c7630c9361 SHA512 bdf3ef871b6684c97fcc35a008e16d9610fe80fa0be13ff88b5038d92deaf2f5a0b8fe4c22bfd55cfa099775ba75d427066c3707ff2b2b7a075898e6e24b048e WHIRLPOOL 6c8027aa23b0feb03ab618b3567da6c5391431bb6cc8b56c38c9f6cddb611d7d221fcb65f98ae80ec9f3c325f04305e2172fd6c42034a6d74f6386ee4ad9e614 -MISC ChangeLog 4254 SHA256 d3d719e647fdb01616bb474d3ef32efe844bf8b7a3f604a10ce5d37a69b9e895 SHA512 6d323adfab50ce1aff150a60bcb1ed1ae0d4edbd1fcba1a5fbb5b59d52cbcd8bba62798333b760787a2ed3989bbcc31660b0852c5895e3546dd4d09f8bbd5ad2 WHIRLPOOL b4d499aee75f3a8d0d8856f5993525a939b1f81c1f3f604812e0159d20654acc3c684dda7129f12af12a8a2390a5c9aba12adae2297bb9a86b79911a18859ed6 +EBUILD xvkbd-3.6.ebuild 1209 SHA256 7825801615a33f5af59232cada0bca74f01ac305dfe4ca58507c93377e5159f5 SHA512 313fbe25a1ade6f41ccc6a0943fbad0d75a4ed2a496bfed2046a8baea2bb7f7deb275562e121b776976958bc7d070652af50525934a096aa286757852634209d WHIRLPOOL 35fd2513c7dd377d2cce45cdf8b87dc66cb15dfe9d19e3af95ed9abc156bdc2366583406880b299c945ff5da1cac92384151fe6cc1fc9fd71aff78f5368bf375 +MISC ChangeLog 4405 SHA256 3b30d22113031d310467ac8afafaa3d90d6153442151f64862b018b6da8fbc77 SHA512 87e49e6ad6eb475647fed4018c1db91a0cfbfc5639530e43e7927193e930e72f2f88f4f1a82051661947eae7a94c51c8a1179fab2cf8cbbd1417f8d2f6cdea78 WHIRLPOOL eb3385a77e10cf84372ab8c0662b89bb6da019f0c3da5760142d10a47bbb2eccc122d1987f4787a66fb64be2efd7d39872d73af830a26f83bc15125a94d41143 MISC metadata.xml 166 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 SHA512 23980b683f9a89f988407b1dcc27a4465a18912f6e6cf8e1fed46182f00c4023d4802434f36b9482121ba9ffe9bc5d6e91b5d3a4ba9067fcfd8e57799c128fe3 WHIRLPOOL 96d79ff499e108ad89b80507c2e94a09af1e8031e5e2a7f9cecb2dddbf517872361436bdb983dc580660064a62663ad63aa1fad8f49dd3758253f4e378bfd297 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlQbI4wACgkQVWmRsqeSphN0rgCfVcuzaq5dqHr0mQuAJs4XCUIs -6wwAn3EvWXRlW0ds0x7RAsd7fGqR+xDv -=rjdN +iEYEAREIAAYFAlTjDcsACgkQVWmRsqeSphP67wCfVv9/SRTB+69L/RKHww3eVrbm +9jcAn3afmsmkR23j7jGNcFl4m5rI3knd +=UJvY -----END PGP SIGNATURE----- diff --git a/x11-misc/xvkbd/files/xvkbd-3.6-last_altgr_mask.patch b/x11-misc/xvkbd/files/xvkbd-3.6-last_altgr_mask.patch new file mode 100644 index 000000000000..7fe70773acca --- /dev/null +++ b/x11-misc/xvkbd/files/xvkbd-3.6-last_altgr_mask.patch @@ -0,0 +1,11 @@ +--- a/xvkbd.c ++++ b/xvkbd.c +@@ -681,7 +681,7 @@ + } + } + +- last_altgr_mask = (altgr_mask | last_altgr_mask); ++ last_altgr_mask = altgr_mask; + alt_mask = 0; + meta_mask = 0; + altgr_mask = 0; diff --git a/x11-misc/xvkbd/xvkbd-3.6.ebuild b/x11-misc/xvkbd/xvkbd-3.6.ebuild new file mode 100644 index 000000000000..b12dd2939c30 --- /dev/null +++ b/x11-misc/xvkbd/xvkbd-3.6.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvkbd/xvkbd-3.6.ebuild,v 1.1 2015/02/17 09:45:45 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 "${FILESDIR}"/${P}-last_altgr_mask.patch + + 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 +} -- 2.26.2