From bae120faacb8ec8548c0ebb04e5623e1c5980fdf Mon Sep 17 00:00:00 2001 From: Naohiro Aota Date: Tue, 8 Jul 2014 00:43:15 +0000 Subject: Modify a patch to apply cleanly Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0xF8551514 --- app-i18n/freewnn/ChangeLog | 6 +++++- app-i18n/freewnn/Manifest | 24 ++++++++++++++++++++-- .../files/freewnn-1.1.1_alpha21-ldflags.patch | 13 ------------ 3 files changed, 27 insertions(+), 16 deletions(-) (limited to 'app-i18n') diff --git a/app-i18n/freewnn/ChangeLog b/app-i18n/freewnn/ChangeLog index f3cf8d6c1187..af729ae475fd 100644 --- a/app-i18n/freewnn/ChangeLog +++ b/app-i18n/freewnn/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-i18n/freewnn # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/freewnn/ChangeLog,v 1.48 2014/07/07 05:20:56 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/freewnn/ChangeLog,v 1.49 2014/07/08 00:43:02 naota Exp $ + + 08 Jul 2014; Naohiro Aota + files/freewnn-1.1.1_alpha21-ldflags.patch: + Modify a patch to apply cleanly 07 Jul 2014; Naohiro Aota freewnn-1.1.1_alpha22.ebuild: sed to ignore already sysmlink existence error. #515164 diff --git a/app-i18n/freewnn/Manifest b/app-i18n/freewnn/Manifest index 0675666407a4..41ea1849e416 100644 --- a/app-i18n/freewnn/Manifest +++ b/app-i18n/freewnn/Manifest @@ -1,10 +1,30 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX freewnn-1.1.1_alpha21-as-needed.patch 487 SHA256 02d4fb7bdc4b6764b20e15711bbbf3261ed9df0212f6b97aba80b7ae895a013c SHA512 6143cbaf4455b312adb7b17f5d959f25061f7b46d71c7722c62ed8c2f2b60ea0e0b7465d10873e5fd783ef2a02cb2c8467ded7a55a2255576acce89e90d11eb4 WHIRLPOOL 015f1f1701d29cce30b6ba89a43e7a64a526e6e34f432ec884ca7a6127c517b134bad26efb3f6bc561d693da307984609d6519dc275575bf4ec616a8e2112a45 AUX freewnn-1.1.1_alpha21-gcc45.patch 521 SHA256 96ee7df36e9824c873518ac9b5758c7b491d95322191f76013bfac3f87aab995 SHA512 e54126963077398fe897156c5474cc7f3be7f733c4f6f69b9697198f007f95a421c8509a5e7b8c476df1983a8334c03d121041795c99d239faee57a8af2e0f67 WHIRLPOOL e7b802e52065bc3ea3858b646efa3c50ad32a80c63737e637fdd457487e80f4ab74cfce44294b13bf0f88a26704f6bc3f8c9afbe87a537b4928d537d50ba07d5 -AUX freewnn-1.1.1_alpha21-ldflags.patch 1376 SHA256 3aa5f3a92ecbbd7596f74375585624439cc59b1fed847c08886f365e0d68affb SHA512 4b4995e405061a93a4b5bd1c0bd98a99fee7c44f8523a4bfc6fada59c686a82a6be8b89a30cb4805867ecaf9d56d9ac4cf657b94246aad2af11136f1a16d0721 WHIRLPOOL c58351afa981c0db29a25fb5c14bcbed487bb5a10ab7ec1c636cdff3ae7a2506133509627321207e3e785b89c70d131984988246f222bd350a2ff13dca2ff699 +AUX freewnn-1.1.1_alpha21-ldflags.patch 885 SHA256 c6d60f6aefbfe10599e4a769e5d43495448d6df47d3536038eb1282eaeb6014f SHA512 3cc4f78620c22a78f8139b03c0cff5715967471a935196bf06473149f73239a64f1a95a1ecbea04b2a32a9d4e8f91ac94482385f01696b342fdc6239937be25a WHIRLPOOL 80b868a0d805cb5d1706ce10c04794bd8bdc958daffff90236625d72d6aa48171c0f4fc6b3294013af18e3c35f43f675a26f28b8200d837f18b1cd3ade6c7b35 AUX freewnn.initd 296 SHA256 595c0dc6c5218d0227c1696934ff38774fe294337d95da470935c411d299d350 SHA512 5aed6abe3f7a4213bf8ad7f87805300000dfcef85788813d539a9dc3366176ec972686fcee050f7de4531ee8c1f4d0daa69bd5a4a2bd60059cf047630b3d4cc9 WHIRLPOOL 90766958f865c10d37cbdfa03c5cd1c286636b71197fdf8a7723f64c302535d6e1040550f58ac438c985f33693d25c1e17808dc7cd8387895b694e0a2ef53cac DIST FreeWnn-1.1.1-a021.tar.bz2 3108905 SHA256 df9523b2eea7cbc94d9d01c19a01394abe3b648c5ec3f1259adac06fc8ecbb86 SHA512 27a61949d4f9e969d09b7c698c07db0be8140e346dad4e84be72d54f9c087e317e7854ae02e2ebbd530b6b86b4a55c8d209a7dd27de1ed908731487aece5d7a8 WHIRLPOOL 3e34357a3925fdbedd1c71138053196799de9a7b0d5e3c1e23501a52cafac5eda52b6f33b5c75f7ed7e09174dfc36a63b25e3d7d620114b157e6dd82530f6013 DIST FreeWnn-1.1.1-a022.tar.bz2 3137954 SHA256 3728352fe9d3352ce16884bd0a517eaf227da0cf7e6f1d09b7a3f38f6bfb6dba SHA512 938c8bff69e2f43cce265a6a84822ae08b89725837f808addb66ba202dadafa60c213638f298d9efe1257fd96f7193fd711a3dacecd803289d925d8f6ea6eaf3 WHIRLPOOL f7462c2d6214ea416c8b726b0d086911b238efd39615c4eea5d2c1a9685974ce1c9f20d23d65e861753e64d796c8b98d72682d670d48bf5da80e8051df8d7de9 EBUILD freewnn-1.1.1_alpha21-r1.ebuild 1444 SHA256 210faee958541fd756b0c5ebf504689ad60546d0a77586437eb7810e781cb797 SHA512 b7cfea4c27902698204b187fc37f6d7c4456a16fab5d72e57ad9f71ab43827a57e80076c943c5fd87f763396fd932980cff9746f39dbf64b03ca0f9508bbaac2 WHIRLPOOL 75c36680e1d04880e0ccea13083ae0ee238e9de1b2a4cfd252f6754f2e34ad56bbf6dd96910a4409c1a0718c2f23f8cd3b5ce718771a1ef8f43d2a61b14ade4a EBUILD freewnn-1.1.1_alpha22.ebuild 1352 SHA256 8eb140d9b6f1e8d9402b1b7b70990ffd6d7a2e8659a3400c7df63c52c67f3154 SHA512 7402a2990ae4e43db01d9f690a492b822f33ab0b2639efff028ddaa316d5268b9ec72639bd26672311a60fdf722b7c64cf60a0cd85d843ad7adb9d17acb7f860 WHIRLPOOL 4fa1b7a97e6686638c0bd247f90683ab086f3bcf0d982d59cc936a4e71ad149da7c31174b85cf449bce6cad3ef285ab5e840ae1b7305fa55597f50bca310220d -MISC ChangeLog 7179 SHA256 aec320f16d9b23a5aeb39bbdd9cce4db066371aa044987f75ed037225a704553 SHA512 1d25da3259dfedeee1a66a2bb4641516498239f352a565368786f457f9b2f25694888752b4fd2f7ab0b1d5bafc9ed1995a7683f61368f6eabf90d6eb98a54a94 WHIRLPOOL 647487c8dd6b92946228f55d0fdd36e0ef88523b61df99ccf16d71e27f14fa8eed9e93ce413d804333cb3ad6ae7af0066c31a39f15e70ce610992d402d5e6515 +MISC ChangeLog 7306 SHA256 5c68983a77a8ce8f5c45802f1ada9c4e764477be04fc50da38c364026a21699f SHA512 0d56c514e5bd5b8fab9d630ada36f38d4af29cafc79c8559e082c4182baf778eb20cbc3f1bc002f2309be8b256115b0d8f357e814c63d0f8268c9f3c6c39ebdb WHIRLPOOL 4a726b49fe345c250a38614496c2afad5f82cc8cf38904892d4738af13954acb924653dbc2a592302ef86b299c3faeb9aef62de6db8dac7ead0b33404b5fed8d MISC metadata.xml 156 SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 SHA512 e46682afa9f674a8685beb29de6485f750484180d86f8980a3c5c220861f38495ac6f4ceda7cf21c317c640d0d218af3ea9bc1a406b207124c1ffb4bcc99628b WHIRLPOOL 347b826ae650374a01eb144ef127dea2fb96c8646b9a1e4b142bce523822988c4597bc2980cc29dcbfeabc1e44ba70136ddea73f1837d4c6ef7d5e3e9d1d1268 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQIcBAEBCAAGBQJTuz6cAAoJEDYO1FT4VRUU9TIP/jUFrjrNd5TOtAS2W6so7kC2 +hax7+gDjBVJ7TR9vWO/k0rRdnQkLNaw1CTjhJd3W3bdiNNU5y2CYRWj/njp1wvg1 +LWHqKHmvmpHx2wtCRarPee9+l7BOT1oVdNFU286m++311FaQNFcgiLA/nZ0kUTma +NKod1JCFoFQP8NS8aBEtrCn0ygbYIEb96SVxdYmkOmO94cGUk0BGzhWKbvgj06Eu +Ad95aHBj3NW97354Q+UQxpLPAAGxb0QbKYEK3OC/veecSkpHf0I8EhWG6oKvAMO5 +i78j4WaOAKfInMDM7aV89S0hjyelzmqpZa9gDQXtZ3BfGkpLbP7kEgYFCYjxigtJ +GuKszLF2k2tUKh72VidOmL4CgQF0+A9BK1hPbSKvh+5AY0VTJNdhGhvBRNO23xpR +u7PzHMkGMrujPv4MBlRKuroHhAIEoxNefk3nTMI/37FOTScEwzRV27sz+pOK+tjW +s8G+qXGe2SEg8EqU73HwV9WmGowVruIq7D1krJ1kN6MExSopcjxxXo/sIzXhqbu1 +mcIlCs8rI/cYduJc87Wvu0GUaJIMiyfhGHLNEkHYtJs6TgeH0MleenRv7x5MZ/R6 +l3pKXCTjRjIsP1CHMFpCprb2vd9/DKO7O0KjAoYR/BhvmKaqhQkH9/vemyChq1+c +4yKc5Vu2eET/yvJ1pKiG +=5HAD +-----END PGP SIGNATURE----- diff --git a/app-i18n/freewnn/files/freewnn-1.1.1_alpha21-ldflags.patch b/app-i18n/freewnn/files/freewnn-1.1.1_alpha21-ldflags.patch index a14ca33b79cb..f097892249e7 100644 --- a/app-i18n/freewnn/files/freewnn-1.1.1_alpha21-ldflags.patch +++ b/app-i18n/freewnn/files/freewnn-1.1.1_alpha21-ldflags.patch @@ -24,16 +24,3 @@ index 9d5b873..5b1bf23 100644 lintlib:: llib-ljd.ln -diff --git a/Wnn/jlib/Makefile.in b/Wnn/jlib/Makefile.in -index 234dea2..6cc5739 100644 ---- a/Wnn/jlib/Makefile.in -+++ b/Wnn/jlib/Makefile.in -@@ -101,7 +101,7 @@ clean:: - all:: libwnn.la - - libwnn.la: $(OBJS) $(EXTRALIBRARYDEPS) -- $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS:.o=.lo) @LIBS@ -rpath $(WNNLIBDIR) -version-info $(WNNJLIBVERSION) -+ $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS:.o=.lo) $(LDOPTIONS) @LIBS@ -rpath $(WNNLIBDIR) -version-info $(WNNJLIBVERSION) - - lintlib:: llib-lwnn.ln - -- cgit v1.2.3-65-gdbad