summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2014-09-21 10:53:27 +0000
committerJeroen Roovers <jer@gentoo.org>2014-09-21 10:53:27 +0000
commit98c4473341994b309fe8d64bb4148d2b2b43244f (patch)
treeba77e2ff04dc4dd6dab0c906635801160a1f1292 /x11-misc
parentStable for sparc, wrt bug #522778 (diff)
downloadhistorical-98c4473341994b309fe8d64bb4148d2b2b43244f.tar.gz
historical-98c4473341994b309fe8d64bb4148d2b2b43244f.tar.bz2
historical-98c4473341994b309fe8d64bb4148d2b2b43244f.zip
Convert patch to tarball (bug #523360 by Alex Efros).
Package-Manager: portage-2.2.13/cvs/Linux x86_64 Manifest-Sign-Key: 0xA792A613
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/xxkb/ChangeLog5
-rw-r--r--x11-misc/xxkb/Manifest11
-rw-r--r--x11-misc/xxkb/xxkb-1.11-r3.ebuild15
3 files changed, 20 insertions, 11 deletions
diff --git a/x11-misc/xxkb/ChangeLog b/x11-misc/xxkb/ChangeLog
index fbeaac5dffbf..ab3291897b62 100644
--- a/x11-misc/xxkb/ChangeLog
+++ b/x11-misc/xxkb/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-misc/xxkb
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/ChangeLog,v 1.28 2014/09/21 09:34:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/ChangeLog,v 1.29 2014/09/21 10:53:26 jer Exp $
+
+ 21 Sep 2014; Jeroen Roovers <jer@gentoo.org> xxkb-1.11-r3.ebuild:
+ Convert patch to tarball (bug #523360 by Alex Efros).
21 Sep 2014; Jeroen Roovers <jer@gentoo.org> files/svg-appdefaults.patch:
Fix patch cleanup (Alex Efros).
diff --git a/x11-misc/xxkb/Manifest b/x11-misc/xxkb/Manifest
index 54e0659f2245..1ea99f4d61f0 100644
--- a/x11-misc/xxkb/Manifest
+++ b/x11-misc/xxkb/Manifest
@@ -10,14 +10,15 @@ AUX pl48.xpm 2591 SHA256 557ac51268061af4c910f94a6d97aeac06123a6a63e7a60400fb9a8
AUX svg-appdefaults.patch 777 SHA256 fb30d8203a51d36bec73a1b4cfc95fa1cd013d43710b47747cebac398d048d2f SHA512 e98fa8ac9f9eae38547bae5dc7f1c5e7ad1f5ffc64706a0e2dbd98860eff2b33d7736048727898c28f53bfc2466efc3d52aef995f32733e0d2754320dc38db64 WHIRLPOOL 55bbfcdaff67f403e1b7730106e2f1b12acc25fdd1f4b4647814a678dc6ddb6628efb330a455c4da62a84eb92e5c429531d76a588428b1f863c37d6590dd8475
AUX svg-flags.patch 7143 SHA256 0102385fe0d201460781b12ecddc2a96ac03856ae664d272b7762ff92d614ae7 SHA512 e2d6bc62dc75d664007e4cb1d192ce4366ef9c859606e3ff4481d56bc8d0deeca32fa5727cab127bda832b5172ce7e33d5c2039463c9bc46df0679c24dd14ecd WHIRLPOOL e3724d1531139264b5f84171421965f0422970fcb53623729c0b2672e37df59fedfc5d26502d8f9fdb3029eccde17d13b7f3daf47159e318879fff4794a40e9b
DIST xxkb-1.11-src.tar.gz 37262 SHA256 596d465bd39b2b660c1d19390a82cc5515cbf8f7e9600e82135564469e11bd3c SHA512 12675bee3be5a37b5e471fa763e2f8600859d5621dcf7ea9f004bad8f2200035582661cfb36938e9606582a86570e6de99c30dcf2d988c96604daf1185592c14 WHIRLPOOL da14d3ee40c35efa1dc3eb3b5df17a53540ed9eb007a7b8a42039dbf8bb97052d27ee77d04b3f115c002daebc0a7229aafb855621b057ab294b45cecb5beed87
+DIST xxkb-flags.tar.bz2 2541 SHA256 f777c676a58ecab97c242efd703c0e8056cc2a93bb5b7a2fdb1f677348d6727c SHA512 c75929bf78a8aa84ffb615c85c2ad70110a9f7b0465891651a57e4772eae5e0ded61d10197f430f9cdd0cf707903af3d0af4250ff1743fdd59d9ff19bc0c33a9 WHIRLPOOL 7c626b2e6ec805b888ebcaeba658978efcbd4528729966a087ac7692b6c2e18ee5deb6dcb5eefea5a31826dce3ebb9c81a87cfc9e01efa5c18d800d8cd0bad6f
EBUILD xxkb-1.11-r2.ebuild 1621 SHA256 9967b271ef7dc5e9a7096a3ed0a3df6f8144831f227292b723961608fa070263 SHA512 ad62044b79f8b36fc84fec3994e89310bc77a436f23a1232163fe753e98e6f972944bf85e4745b389371f600a305fc5249c4b460cf39512b3ffbff40ff5ca28b WHIRLPOOL 07311e6d0039b253da500a4a9eaf68ef052653e7a9b85630c41a1d4a201118422452ab38299daa2a5b373e86c950a9e1337deeb1e524cda28a07f323a004a39f
-EBUILD xxkb-1.11-r3.ebuild 1574 SHA256 648201010543df10b20c6c7ae8455efd350629ce8bdaa9fa5a0945fe996e628c SHA512 9a64229958d3cadc356dd1a99595cbb2b1e0dbb890d72ae1541d4309a125ce25818112fccafe569e1eb498a0c8aef4e49cc8b4ade009a0c2e7e758789dc51e5d WHIRLPOOL ffafc52d77bb187030919faa43379c15778cbd8528251d3abb15b55d04a9dbb8886fb0136bf7303f392f78d4be839bca12a7053a827641bae763864f89de0a12
-MISC ChangeLog 3690 SHA256 f95c6c4aebd2acb509cfee9027b3e99e34feda62f412e194e5fd6f3db38ead29 SHA512 4f2942b16eaad935add310fa294cff7097d908a11a80b981355be77080434ea4ca64f31972cf84f187e66a15487313f9a6564535319167d0c13b65f3769a7b57 WHIRLPOOL 76119b4efa56477082f2622484eac595b6c71e81cbcb3af3605e9e8c78732bf6c31c06772c9cc0e69905aeb519b4b6dc9b0d762d78614031c947f7e3dfc3034e
+EBUILD xxkb-1.11-r3.ebuild 1624 SHA256 d2653d77ba6e558873d59b2d736182491e4fbc79692d6afc8e52dcf239abf459 SHA512 c81aad219af5e0a485f0e84a6d2aae42bdbf8b59bfe24c3c159f757a069229ddfaa40005b4891207d473d91d6ca26679a564ac68437604f712c44d7ab9c9fedf WHIRLPOOL 3fccee1bc75f50507a4b9cfad701525a7b8b3ce28a404d0e06c6c954100f2f9f407e91863b01d244b1e469db54ef04e0ac2c89f6496108192bcb9833bb19895e
+MISC ChangeLog 3815 SHA256 0b6c3aa6d865a49d591a2a66b3277df97f41d7e9e35d3ecac1e8eb0bea366f34 SHA512 454b2108c4e9f047b0644d1112195289a05c537ed3fd871cf33b68eba30819042a997aca6031a55f361df7c3b55827686c5ac274009754608e73b3a445aabf1e WHIRLPOOL d5f8b47c3e0043b0b485cf4a004320910d08468dc05ded191a7db1fa6555ec10bcb6e56b2f5e2b912385c28d4b1b47a1f9a59823c20467cdc29ed2301e9dd106
MISC metadata.xml 165 SHA256 d7da9ed29b7afb87ac00580d48a49d248f89c92269e9a7791782dc72f4490aec SHA512 243d1391ff105563c9bf0f75b1eab39434cfb69e084e81cebf6e4eb3aa391cd7e36210b2c3808895bf876dd761eb72330144af2a81e467453c60b37ccdf0e63c WHIRLPOOL f63c52b91f14d86972c7de46b5a50b2d47822a1347d627e05845027ff75299dc79a135988141e1dec933925c4e0213287ef6933ed76ed2fd3fcdff3757c1766b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iEYEAREIAAYFAlQem7MACgkQVWmRsqeSphM60ACfXpYPtS6N8Y407WMMmJTmNHgX
-B6AAn03dR/eAynkhJx1MJJAxOzNcfH1y
-=mwLi
+iEYEAREIAAYFAlQericACgkQVWmRsqeSphObZQCcCISXSgAbKylcTtxBc3Dma7HQ
+S38An1D22WahuXXu9+GzMMqTvbxhjdF3
+=Gxmh
-----END PGP SIGNATURE-----
diff --git a/x11-misc/xxkb/xxkb-1.11-r3.ebuild b/x11-misc/xxkb/xxkb-1.11-r3.ebuild
index 61a02d79208d..16adee7a999b 100644
--- a/x11-misc/xxkb/xxkb-1.11-r3.ebuild
+++ b/x11-misc/xxkb/xxkb-1.11-r3.ebuild
@@ -1,13 +1,16 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/xxkb-1.11-r3.ebuild,v 1.1 2014/09/18 18:40:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/xxkb-1.11-r3.ebuild,v 1.2 2014/09/21 10:53:26 jer Exp $
EAPI=5
inherit eutils multilib
DESCRIPTION="eXtended XKB - assign different keymaps to different windows"
HOMEPAGE="http://sourceforge.net/projects/xxkb/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
+SRC_URI="
+ mirror://sourceforge/${PN}/${P}-src.tar.gz
+ svg? ( https://dev.gentoo.org/~jer/${PN}-flags.tar.bz2 )
+"
LICENSE="Artistic"
SLOT="0"
@@ -34,9 +37,11 @@ DEPEND="
S="${WORKDIR}/${PN}"
src_prepare() {
- mkdir flags
- epatch "${FILESDIR}"/svg-flags.patch
- use svg && epatch "${FILESDIR}"/svg-appdefaults.patch
+ if use svg; then
+ mv "${WORKDIR}"/flags . || die
+ epatch "${FILESDIR}"/svg-flags.patch
+ fi
+
epatch "${FILESDIR}"/missing_init.patch
}