diff options
| author |   Johannes Huber <johu@gentoo.org> | 2013-11-30 12:56:05 +0000 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2013-11-30 12:56:05 +0000 |
| commit | 9a4f7b7259e08ccfee0bf0d4f2d5d9b9073bd682 (patch) | |
| tree | e3c52f9e5c3a16e3b2d9a6e5f4899152db4ab5e0 /app-vim | |
| parent | x86 stable wrt bug #481846 (diff) | |
| download | historical-9a4f7b7259e08ccfee0bf0d4f2d5d9b9073bd682.tar.gz historical-9a4f7b7259e08ccfee0bf0d4f2d5d9b9073bd682.tar.bz2 historical-9a4f7b7259e08ccfee0bf0d4f2d5d9b9073bd682.zip | |
x86 stable wrt bug #481852
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD
Diffstat (limited to 'app-vim')
| -rw-r--r-- | app-vim/splice/ChangeLog | 5 | ||||
| -rw-r--r-- | app-vim/splice/Manifest | 20 | ||||
| -rw-r--r-- | app-vim/splice/splice-1.0.1.ebuild | 4 |
3 files changed, 21 insertions, 8 deletions
diff --git a/app-vim/splice/ChangeLog b/app-vim/splice/ChangeLog index e6adc9c165f5..0ed7f1da8ab9 100644 --- a/app-vim/splice/ChangeLog +++ b/app-vim/splice/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-vim/splice # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-vim/splice/ChangeLog,v 1.3 2013/11/05 13:53:17 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-vim/splice/ChangeLog,v 1.4 2013/11/30 12:56:00 johu Exp $ + + 30 Nov 2013; Johannes Huber <johu@gentoo.org> splice-1.0.1.ebuild: + x86 stable wrt bug #481852 05 Nov 2013; Tony Vroon <chainsaw@gentoo.org> splice-1.0.1.ebuild: Marked stable on AMD64 based on arch testing by Elijah "Armageddon" El diff --git a/app-vim/splice/Manifest b/app-vim/splice/Manifest index 7d2115c60953..9611cff93a5a 100644 --- a/app-vim/splice/Manifest +++ b/app-vim/splice/Manifest @@ -2,13 +2,23 @@ Hash: SHA256 DIST splice-1.0.1.tar.bz2 12369 SHA256 30e7d947defb29971d8c750670bbdae6625e2238d4f892e6b5590609d6a6a81a SHA512 65826a9054163f59d8dc0a558e3b748f27015bb6075e8d158214e6824c922599552a69c7d09364599285d6effdfc42fa6dd98e858a8bfa47ebc21a4d18394ede WHIRLPOOL a8e4405f5169857c07b81f0a778757aebd198f4c0e73f4cf239a451dfae64911d5fb164121413799a750646df609fcb864a08393510d012a84383261f6c006ab -EBUILD splice-1.0.1.ebuild 807 SHA256 41dcfb11a7b8f21cf657fa713afee8f430bdff5907bb1f8a6e4990ffeb28c968 SHA512 308098879c7b8b49fc0542f77a645865933eaed18f9b7ad44ef9ac5ab72cd40b480a1cdaaa5f04ba89be1a74cd129321d4b4e7e811bb8599af90bbe67d3a1768 WHIRLPOOL c402541258e6f06b84cae91dff782410cb82be7d1e136a2cd9821ed5009694138c22156e784f273465af29b54a49657f39fb12b3c5d461534d6f3f2d6c5d141f -MISC ChangeLog 666 SHA256 4bd78b8286f061cabbfb3061d3efb35629c097d2394d95d3e3d308f8e887e10a SHA512 b1962c823766e5f6a817873048fdee636fd672fd497e32ac159e9cc0ea6dcd831af8d53c2c9e67d54afd4e98058fafb9bccac711c96f413148bfa46ab38a7e22 WHIRLPOOL 90018d68cbc4dfe1a0f018c32fe98ec3d56fa8d45b73ae5034bfe47477e73002952e464b9600de66d661d65907b0089567d7e1549861d16122df5c6a6feb4a65 +EBUILD splice-1.0.1.ebuild 802 SHA256 689849403721744d4d893116bd7205f42fb643bbb316921d344c97755f91d23c SHA512 bb935949e3557098882127a90228e5b7ce134ee6fa9b4301a6ef7d16bfcc1792238b2c3f9b46e71875dee08a47c0cd87414b3fd9b6d5376aa724be4981af268f WHIRLPOOL be6107a33f9486a8d9a1f1f8bbc2158616932e66d842c490865778bd6a915b51dd72cc74dd5beb920b1e0085cf3a9a0fce38b0c19cbe15a79f8204830571a43b +MISC ChangeLog 761 SHA256 43a099592a4374e116f88c38ff7bbd9426adedac87576dccafeece9f572c5cbc SHA512 98fd69fbca105b4ecc9f82190c1a2c7733063d0f8a8dae052c7a0435ed480802f76b3b5ea39e10d7ecd32625becc4781fc4d8068b0118a6ce85a29b992412420 WHIRLPOOL b669dd77d59ab8349b3f4a63dfa463f85c91a9e64b57f29e51ca2a2df52f0a38bd873a2e28e856ef0fde08612cd3d2a647475d5bff5511cae647f1e798e4f665 MISC metadata.xml 156 SHA256 64d20c782589b423a6e75ba6fff7edead1ec8fbae742d27dd57f5299e8328500 SHA512 7dc1d902106e794e1a12bde5dcacb8b7143584cba9c61e72ac5728dd952663144c1b0efc949fbbc9fcec03b396b5e060e8263eaad7d70cd82d6d5b350c62f0c1 WHIRLPOOL 4381a5d144e783e5979d394720b32f7d95818a8571f748e72c5ece965c4e0375b1aec0c34f6f506a9f9fc255f1b69a220fdb74d1dbb8aabc92ec48afa44ab883 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iEYEAREIAAYFAlJ4+EoACgkQp5vW4rUFj5rI+QCgvXGQYvUDZeep7mDY4Sr4ZpH5 -sOsAoKQVSRYdmu3cPBoLF4WaH27I9Isw -=sJsu +iQIcBAEBCAAGBQJSmeBiAAoJEGVpnaTzz9K9GysQALW8n8fV8IaJKIq3kJq2cx4J +z2Y4xO0AcgNSYYtkxovXQTRTEcHHDR2yJee0p9HJCWvqdXgGW5EIZkxOdrGg5xSz +hqOSiK+OAX/bgC67z5i/yZSaCKuov2E64sJ+hoWEP2zOzEcCKgRuXRnB0AFvTsi5 +X3veQY3aMdpilZ3Xb1m9OdTcUsNGw3usjLgpzIcSEv3H0rMDfdXiAERkECaa82uw +cXZnZ5wPQW4J0LEO54zMbUttJHY+eFAq3w+78mDzbWO5nlqVzup1pkWkfNQU7nn3 +ThAuFhutAkcEIWrO600PNJ0istYxoIkXB5HqPtboZAHwtHTCUcjo11kCtEC43JvL +Du0dILbWKX7cXKrtolORBJo9pzInJsiy9brIUTcKLrAdCVddTbNbQQOyOsdnXPrB +CtkGChM2mTw2M8V88ABOjs/ddPDL/sbHiJ9GHJ3HCTSDzRAdzkyu19+PiO2FRiZK +YxVDw0esBLTcS9eA2YFGuV9VP6SvNmKGwBZsOD4eqYccrdO0MjZp5L3ZMoKdNu+T +2RVC7xy13zJTobKXw11RYC9U/vx+E/8Q6j5fEf6ovMOBvgKxyNshIF5Zk+H7LBYY +g92FDd2D74hUBJjXDLYCmbxk0W65lLNJ4CkxujjGLETXLpSCsLgVhZ2CGYV4MU7E +X1+G/ocfMkzus8jTQzAe +=LfRY -----END PGP SIGNATURE----- diff --git a/app-vim/splice/splice-1.0.1.ebuild b/app-vim/splice/splice-1.0.1.ebuild index 492527cad4f6..2b46c22f156c 100644 --- a/app-vim/splice/splice-1.0.1.ebuild +++ b/app-vim/splice/splice-1.0.1.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/app-vim/splice/splice-1.0.1.ebuild,v 1.3 2013/11/05 13:53:17 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-vim/splice/splice-1.0.1.ebuild,v 1.4 2013/11/30 12:56:00 johu Exp $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) @@ -10,7 +10,7 @@ inherit vim-plugin python-single-r1 DESCRIPTION="vim plugin: resolve conflicts during three-way merges" HOMEPAGE="http://sjl.bitbucket.org/splice.vim/ http://vim.sourceforge.net/scripts/script.php?script_id=4026" LICENSE="MIT" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="|| ( app-editors/vim[python] app-editors/gvim[python] )" |