Old.

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

4 files changed, 11 insertions, 86 deletions

diff --git a/x11-misc/xkeycaps/ChangeLog b/x11-misc/xkeycaps/ChangeLog
index 776fdfb0f7da..af6e9dbaad3a 100644
--- a/x11-misc/xkeycaps/ChangeLog
+++ b/x11-misc/xkeycaps/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xkeycaps
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeycaps/ChangeLog,v 1.27 2012/12/23 20:23:24 ulm Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeycaps/ChangeLog,v 1.28 2014/06/09 20:29:24 jer Exp $
+
+  09 Jun 2014; Jeroen Roovers <jer@gentoo.org> -xkeycaps-2.46.ebuild,
+  -files/Imakefile.patch:
+  Old.
 
   23 Dec 2012; Ulrich Müller <ulm@gentoo.org> xkeycaps-2.46.ebuild,
   xkeycaps-2.47-r1.ebuild:
diff --git a/x11-misc/xkeycaps/Manifest b/x11-misc/xkeycaps/Manifest
index 899444ed3ad0..a35bb0583e58 100644
--- a/x11-misc/xkeycaps/Manifest
+++ b/x11-misc/xkeycaps/Manifest
@@ -1,29 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX Imakefile.patch 664 SHA256 a4f64f4ec83c755655aac25b5a3d60e3f13bc52b71c261d7880fe5851e9d1935 SHA512 383765b5f15dae5848d893f396cd45be5c8a1914d85b02c920b2463fdc0c8d160020f53b65dee3a950fcb50620382f140cc595a082dec2c6eea5ab8fc6cfe02c WHIRLPOOL 461d17180b513d279d4bfe64aabbf54b7a954378fad3de63fd8768d37d1ffd0409d73e5f916416d8d6768dd22c277679705a25027f5d55930add41b0168ca91e
 AUX xkeycaps-2.47-Imakefile.patch 758 SHA256 6d82c2e6cfcdc12c27a64ea690485ae1b7ab8fbe2d678bbb0fafe2a4d60f38d6 SHA512 f3bef8615e6a040ab05fc71cf45323515f752ffc8cc1914098b1a8433a77c91c0f9aaba11e73bc984c808d1e5421f94c5dab4562e5f442a8558d2987145928a5 WHIRLPOOL 2615cd49da00cabb4a2bc72b987a121844f89e65f4cac8922e90d6303dfb0c7d2c0cc0de12a61b508fbd238fb0e6f913c20878568216328a53ae0b265183e006
 AUX xkeycaps-2.47-man.patch 639 SHA256 c56ceda9483ebf96c040deff495a8c03a2a629c1a32d209817a331bd6182127b SHA512 6eab220c2c5c274ae5bfdc5bcf9c028409a3f0ee1b764aaaae81b2b7496fea48e64ea6fbcba0bf175ee10bcc81309ddcaeed3c4b9b831b9f8d8341df20a9c950 WHIRLPOOL 1142b75ca96a51c4cc880607cd37839b40316109803b41ae2b650aaa38e1c6db85096747e08b3ec1126924003f08058695a8267b58f64b2cad0273091623b6a7
-DIST xkeycaps-2.46.tar.Z 489439 SHA256 40da137109e0ef0b687a72b71a1ef0b3d08a10749fdda05fc16c52b4cbed763e
 DIST xkeycaps_2.47.orig.tar.gz 351418 SHA256 efd92e6179ec4506cbb08db11091185f3bd1567eecb2291f91f70980e175d8f4
-EBUILD xkeycaps-2.46.ebuild 987 SHA256 dcfffd0bd566ec4bc651fc86724ab86b02c63bf4a25e68a68c463b4923ebf5f4 SHA512 c94cdc6fe73a25c5af9cab884f93fb867e708e0bc85b0cc49d9c794650c57c754076af901dbfce877bb2e57e4bf9561853904e05f2c3cd7a89f3d7b9af207ee4 WHIRLPOOL d419bc6e9628f38eaaea368faac655c51f1c4b215af671725eda7a1b6317e2cd238f00e1abe163f0adb46eb7686e6da021ebe75bbb140bff64d2c66e5a684db0
 EBUILD xkeycaps-2.47-r1.ebuild 1100 SHA256 3cc78807a6013f74d4d68717fd90787990c61916a24b81e06fbca9a8efef0024 SHA512 1c38ba497ceac68fb392dc7c6e51bf7c6a7e45005aeb0784bcb24e2956e5f7df6b38160363bafb66ec08183fd183fb4cb57d46fa7112035ee4f37cf172eecabd WHIRLPOOL ebb2bac3d8d97e5bfda341195b098c932f158a2e33fe8860ac3a5307fe9ee62de7668674479c3177fd2263e122cfa59851a367b5b31181520efc5d40ef0d2c1b
-MISC ChangeLog 3508 SHA256 59e7b764e18a98ae7708361568752bb654e69e3fb420c480396e93b0cc5974b0 SHA512 9d84be0b1d8e05578e18cf31ce1d5f853ab72c57442f97ac66d71da882a9fa50ee9ac3f40339252a04a8526bb91f57c8295ef726de369f71f021caa10bd2eb61 WHIRLPOOL 238315f6fbe4a3ce0393c301ea15f9e75a2413a2d378028e2ff29c818bf77c0b4add440b5d21b929aa826b14de9f0beb9d9252c2a69d00de1e6fc4a7bda2df1c
+MISC ChangeLog 3612 SHA256 6034810228e74b283cd86a54d7c967f17ed8accbd5404b6bb8eecedcbbd39432 SHA512 4e945f2dd9ec6fc95e55bff425189e97c20638c1d09801f9433116e3ebf6d302e664792519d9a478a727e4bfd177841a0e533571d44fe7d92b87c0e83cfef9cc WHIRLPOOL 8a7fb241898416be49f7c994a070d4b2d3944a4f0addf35692a90350f9ab6bb1e307c9864848061f694368ec42b52dc5588d42e500229a48d0f179a1387b6c81
 MISC metadata.xml 166 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 SHA512 23980b683f9a89f988407b1dcc27a4465a18912f6e6cf8e1fed46182f00c4023d4802434f36b9482121ba9ffe9bc5d6e91b5d3a4ba9067fcfd8e57799c128fe3 WHIRLPOOL 96d79ff499e108ad89b80507c2e94a09af1e8031e5e2a7f9cecb2dddbf517872361436bdb983dc580660064a62663ad63aa1fad8f49dd3758253f4e378bfd297
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ12i9AAoJEDxpGckxwJCB99wQAKV4D5UjshqwN+tfDNSKYwHW
-QJDqaxui2wB6Nq0aI/ZrCZP96hPYOVJXDN77/lwfeDbetPsE+WC1s9+pJatFb3tH
-DqWzc/F6Po6I6OoXSUkBligIvtDSyZZ9AdK2mhQlt+ynEf3bOwam1uYeVs1zO7gs
-ehku3i4+Wo/jq+TiMoyYxNeviHQiBHiSDS+i6IB4HWqONXESaPnKmvMxV6JYBjSK
-N2fap/4z6PUK4pX/elK7raqpecMovGKESEv7/y+LIH3sul/mUSl7iVc6VwFPzff5
-psJIbXIBtUKhyraufwzyVUn+Npq1w60UI0M8iqY1FWkd6FgGLpJKyjhmenWu5ipv
-S6UYJQV64+H7tP6qWMg0j/K1MeLtgKMnri93TXOqIIe4dBQynfg5MED4wSrATxIt
-4IMNRfWpadRkI5hH6+YjCFTVOVcrsLXvZBBtzcdqOjN+woTF3b9+vFFuhwL94sfn
-mdfNJN4WM648jPNcJoMc9IqB0MjUUMi5MrPH18UJSo0OkOuOc/NEa1s/inYB+f8g
-vsInhHcKvPZ1N2nCMRC6iIVHEDy/wBOqpxqGAM5DV+TUa77VAsWUk+be0x6AAXAm
-WfoDNvamSGe5nWRR/kdwJg9QzGjZM/4mFf0H/1bIZJ36sfiLjqIk4eTIPjejD2UP
-9K70zs+913WT7bun+jlT
-=0uvQ
+iEYEAREIAAYFAlOWGSUACgkQVWmRsqeSphPyuACeNGvsq4bkH1BuvuCSIZDTLBSW
+/EsAn2EaMs5gKZw8/UuBTZgp0Sz7ZsSI
+=nKHm
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xkeycaps/files/Imakefile.patch b/x11-misc/xkeycaps/files/Imakefile.patch
deleted file mode 100644
index ba19a5b54c53..000000000000
--- a/x11-misc/xkeycaps/files/Imakefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- Imakefile_	2003-12-06 18:09:23.845935720 +0100
-+++ Imakefile	2003-12-06 18:10:02.620041160 +0100
-@@ -1,5 +1,5 @@
--/**/# Imakefile for xkeycaps;
--/**/# Copyright (c) 1991, 1992, 1993, 1994, 1995, 1999 Jamie Zawinski.
-+/* Imakefile for xkeycaps;
-+   Copyright (c) 1991, 1992, 1993, 1994, 1995, 1999 Jamie Zawinski. */
- 
- /*
-  *  To specify a different default keyboard (for when the vendor display
-@@ -353,8 +353,8 @@
-             TAR = tar
-        COMPRESS = compress
-    COMPRESS_EXT = Z
--/**/#      COMPRESS = gzip --verbose --best
--/**/#  COMPRESS_EXT = gz
-+/* COMPRESS = gzip --verbose --best */
-+/* COMPRESS_EXT = gz */
- 
- ComplexProgramTarget(xkeycaps)
- 
diff --git a/x11-misc/xkeycaps/xkeycaps-2.46.ebuild b/x11-misc/xkeycaps/xkeycaps-2.46.ebuild
deleted file mode 100644
index 2e610f891007..000000000000
--- a/x11-misc/xkeycaps/xkeycaps-2.46.ebuild
+++ /dev/null
@@ -1,45 +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/xkeycaps/xkeycaps-2.46.ebuild,v 1.23 2012/12/23 20:23:24 ulm Exp $
-
-inherit eutils
-
-DESCRIPTION="GUI frontend to xmodmap"
-SRC_URI="http://www.jwz.org/${PN}/${P}.tar.Z"
-HOMEPAGE="http://www.jwz.org/xkeycaps/"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="x11-misc/xbitmaps
-	x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXaw
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-misc/imake
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/Imakefile.patch"
-}
-
-src_compile() {
-	xmkmf || die
-	sed -i \
-		-e "s,all:: xkeycaps.\$(MANSUFFIX).html,all:: ,g" \
-		Makefile || \
-			die "sed Makefile failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc README *.txt        || die "dodoc failed"
-}