Revbump to add upstream fix for lilo build breakage (bug #491828)

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

3 files changed, 30 insertions, 22 deletions

diff --git a/sys-devel/bin86/ChangeLog b/sys-devel/bin86/ChangeLog
index 0cd62d0c3b89..e4ddb52bdf54 100644
--- a/sys-devel/bin86/ChangeLog
+++ b/sys-devel/bin86/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/bin86
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bin86/ChangeLog,v 1.29 2013/12/09 23:54:35 blueness Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bin86/ChangeLog,v 1.30 2014/01/02 07:37:38 polynomial-c Exp $
+
+*bin86-0.16.20-r2 (02 Jan 2014)
+
+  02 Jan 2014; Lars Wendler <polynomial-c@gentoo.org> -bin86-0.16.20-r1.ebuild,
+  +bin86-0.16.20-r2.ebuild:
+  Revbump to add upstream fix for lilo build breakage (bug #491828).
 
   09 Dec 2013; Anthony G. Basile <blueness@gentoo.org> ChangeLog:
   Fix gpg signing of manifest
diff --git a/sys-devel/bin86/Manifest b/sys-devel/bin86/Manifest
index 5e8685ae8476..8ef35e9ea93e 100644
--- a/sys-devel/bin86/Manifest
+++ b/sys-devel/bin86/Manifest
@@ -7,27 +7,28 @@ AUX bin86-0.16.20-remove-seg-ss-check.patch 988 SHA256 98b20ff15181cf91542f595f8
 DIST bin86-0.16.17.tar.gz 152400 SHA256 429ba36cb6220083ad7cf56d644b7265d401e631c93eb42f4b7ab9bb48c6829c SHA512 154b367772cca27f1ff65c6f5db21e20223e90a87129f0308d8a03d99c0a8df6918eafa8e5cb889909aca8f637b7aa24ea1a14a44e5f2d9ccd9af511c01374bd WHIRLPOOL b45758367090b2aab33dbdb6033f8ce66f1f122123eff38321216f513fa6b1fe49a91bafcb7f87568bf92e75d915635980447b37de95602611b10041d276840c
 DIST bin86-0.16.18.tar.gz 146383 SHA256 10b1aa5c0813e0bb01b8cab8b06543809e75b06b8e55db462351887c4a9ed831 SHA512 73751df158210ed75bd4238f7e10630e997ff5fd950860fd794c9dc1e32d682e0f6838063ab6961c1247d3d2c61fadeb56a4fabfba26959369a5248a76e0ca7b WHIRLPOOL d71828d24012fdeac580ed049708fa81c2cc94eac0ab9022fbd9e3e5d6c1ca6f432cdd042efc0a7249497f28b28b2104d06e591abf9ba97bc55da4342bdad2b6
 DIST bin86-0.16.19.tar.gz 151088 SHA256 35b99e05395264d0692f8b327f9b4f18de9e483484faa5ccbaa7c9f353d9c30c SHA512 7cd54b1425a2a631b8af3e3e3b26c91b287f6e14e94f7795eb9e6a746c5acfe9137689bb802adf30f355cb731d59b4753acfa829028380c89ef3259642cad454 WHIRLPOOL a9fee0d67c3b545c9ecf74f08910dcda49194a21b0f205ad50c1de2cbfd62db4828cef8a342c3cd29438492c054e69bf9f9f39242e948942f62c685e8a7679e6
+DIST bin86-0.16.20-fix_lilo_build.patch 3488 SHA256 bc735c292880c523e8f2af847852953898faa5b4670fab1012c2114bac472398 SHA512 f307438ced09e34ce5c552f808a9d1ae09bb9bbaceee4e1e07021f810470dfb07d21a30d1447295b2d023ccf56f158f4b7f3d80d478b1d7e3e4b79b13b8e760c WHIRLPOOL 1a12bf35237324cf374496e1032bb6a54aeb5e160934ee185494783fcb93d0616e544ab222ed6a37b3b269377cef72ebcc1a2159ad29c5b4984360cd9b3d6902
 DIST bin86-0.16.20.tar.gz 154107 SHA256 00dcf75f75080b4a51d137f14fe787d8144d12fff0448e08fe696e8909780437 SHA512 c567ad5f9241d9ed768410f988266d4ff952fd4767d033552b100a2643db69ee9d4b5929a1b40c3018db7037b0efc7b47db84fa1f561bc39f01e640b1a3bacfc WHIRLPOOL 028be86ee91f47768837b35b917eaa0ff0231b900a052e15ec3e30574ba76693d8699a186bcef5d4b580a445c152334bc33028b32be60b33c369fb7f12331514
 EBUILD bin86-0.16.17.ebuild 1012 SHA256 3e58664d4a5526113000fffd42b0a5e757da904f7345a61fa3a01f64d7744781 SHA512 dbb5732b82af0bc84a2350ca4af127b33d74a4acc3a0c9cc2f4b9e02ddba43cda7c4cab5178d2c0cce7b1839eed69ebc17f6d9b1963ba6495d0fa2ab6ea7f8d9 WHIRLPOOL dc2de261865fe18327eccd7e21a591d60b0016b223b5f28ce041fada577ec7e7294559e9f76c138404b123002091c7831975eac48a1d33fa19ab7d34799ea7b7
 EBUILD bin86-0.16.18.ebuild 937 SHA256 566a8acb1b51e110e5ffbb7da9b88c78317f6b34a1da5bbcbf17de39e326b286 SHA512 437baa99c2d7c25ac2545f4b09327ac82b275344e82f7a72ffd16d9e7c8460953b07142d6916ab06ab8486c4f768474336ac4d88d2acab0d57f9c9740ff04558 WHIRLPOOL 46d70852a6250787518a8bae99029db098b20fb79f7d4f96b8e8de88cd484c5693427d179ea6a5577069d6d9b02b6dd05b8c9e2f1e2d1773a3e8a034f2bb7a86
 EBUILD bin86-0.16.19.ebuild 955 SHA256 646eace2cfb79a9b9bddb0959aee0d8f835f0ccb3ce1a708085debdb9bf6eb35 SHA512 16e347886fdc03f49078cda63740c449842f75def4c3634981ae767a49fe29341a51ab28b5cd69234ac066384794ed202b9eb4956be6bdcce2ea4997b3850fb2 WHIRLPOOL ca92fe8c0be2fb75cf669e635b7f70f40299d57c07f785f42707716ff8b7574e7f22ccc03e8d24c15a8dd5cecdc36718dff774f32265430d188114ed2b622e98
-EBUILD bin86-0.16.20-r1.ebuild 972 SHA256 7fdc8f1d3e86edc26643e839ce8d3f422a4867defbc9efd299638bd6bc3c024a SHA512 77652442eeca0c3ce8bf05c4b4a2455193762b6a17178e4eee58f167e738e85ae25ec7ff3338793b5bdc8cc177f7b9b44249ba81049605b12205e5df4dd19a15 WHIRLPOOL 546f015a0f4cb2f02f10ce16dfda8ce95490c72889fce5521ea034a5df80e440c90c4e659224f9f08b002c3c9e87191503fec2c5da9391808b9e5a966c7f174c
-MISC ChangeLog 4299 SHA256 0b3158a1b27a146b56c9f174b5ddbe8c5112249b3b884737da74115b261ec1b5 SHA512 9b997112b4c3ea2fef4c2262b40c13654a1298e91fe8a7d36323cf58c754a72f7000ec98d831e043d9a91c51237aa3ffee63abb3aa982aef1dac8e7ee52d1533 WHIRLPOOL 1be420dec0f9065f33c9f104dc17e29327eb2e3a42c38e4b7d7238613062aa46bcac39e0cf1eca1bfc678e2662d7ef4c83c31436e1d4af0df850c7cd649b45ae
+EBUILD bin86-0.16.20-r2.ebuild 1084 SHA256 4461f2304236a15ac0deeb64ea7b5e23fe12d6f0982f3666e7bc95ec764066af SHA512 a67170facecb9f2359826c408d449d467c1675cdc577b338d04258319c6043fc564b0fd8dc2fca8a84141a30bbdc1bf7bc0077d38e6159f5d7cafcc0aa90d694 WHIRLPOOL ca330aa3d1eba9fbfe97657f29badbb6a63b3532d4ea1526682c5e36b1e6bef00024e46df742f93f81ca16a09a7ee766f93d7305613adbbd3d1ef97ea054790b
+MISC ChangeLog 4514 SHA256 e6e449935e64fdd6cf7354fa954767a9487517b4abf7e33db462d2ce7d03de89 SHA512 559fc59612c381100b4d5bea403a8fb40134b4023fe9a714986bb1b313758a55fb43a190a52426b300605c9d244c4599825aeea9f1e614d38b39363e28fd2a61 WHIRLPOOL 8a549d84f13080c3b524c97ca161b1106ccd855f6ac2fcc2d379fa2019c7772caa5296718ce08324da059b52464ddbf138aded8a785cecd4d0429d5556b95813
 MISC metadata.xml 319 SHA256 1ccfe2384962ce56aa526105e30acd99af6ddfd361a67e2dfe7367a56a69e3d4 SHA512 5fe63911211427ce913c754d545745cdfd32b7a911b1a683f51851572c03c72e5c7298d0ecf6b31737bf749b08fb1750d994034173160b505c77cdd80e0449c6 WHIRLPOOL 2269f48062db5bf98210b417466f1349d3898c3660c870a2761a96e6f69f8091c44d0e3a8fba43dea0b6f59bbe500b6e9be3638e468f2c7dfb99054776839bf6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSplhGAAoJEJOE+m71LUu6b9YP/39lbryuhQHCL03sdia2ykzP
-Xhe+XeNdIV5MBWAFywhnZxZ8RY0MurLeSLWyJ3kApjX9xWwZfj3PCe265WZPZ6Dz
-gFjpfi76+a0BCsrdVLV6axv9igtyJsXb970Yg2A9KHVvRULp49hZstsYdjXddGmQ
-I5IihUckYcmDT3w0TeUNcwIQcjRh192PX3q3vbw6rIA5B1B6RN1Uj1rDyUZKrJvv
-1Ddkbmd46R4h8sFy1qrLK1PtZvDTjoVvWuDPmra/3xB7XXgf32r78+w3IyT6VL09
-F5Ao1mfcCfP4yBKBSWoIP0Bf0ciQYqs6qB9Vc1gsxQCBj27SkHGquWj0go/fF693
-sNEPutjOV1bgaRPDdmFu7iBh0jHGkNNRBAhH1xUVBSPB3OUXM3CK7N1HxER/XZfY
-5toomz/MFcbP0LBDUCR6RomezgXx92fW8epL2m7zaGHC0asLb9zKF5Mca0pOBK2v
-D5Uu0Xz3nCgNqPim2Izkq1e69PI3K+2GYn42gHVcArAcE1K14WSIEKZsIhQGA8O8
-q72EJgAocBV6GQrDkpLm5DzszQnmm2BG2r15v+Yb7dv/9aBL3fAsTgiPdNbYFCfo
-RW4B12WD85FyqcvA/Wi0rMeBAW2t4b4uPA36V5VAckQ9/fvL5X8WE9wt5j+VV231
-DAJdTOy5eCvkGHSwDxZw
-=qD/t
+iQIcBAEBCAAGBQJSxRdDAAoJEPiazRVxLXTFuh0P/3cai47fIGSvP7kBghcKSYBH
+D4CtD15iBguob3+qoLeXbS+Vh6ztDFVO8pnZih3sMHNMoBXNcyRyuC1xyYtqubhg
+Z7c/H0eVlFQYNwMwEHe4VVx0lETzpb8DLfXQCXfJB9BXJ6yoS5TekxT0Lk19vKtI
+TJ0Ts0XrnTaQTXIhD4kkNpvFeBFxjraAnqQifriXMzfkHH19h4IX1PvGLUJiO5jJ
+Zaa6B1xsCw2+BzDUUdPWPG0NF66JKLihJAaxSiAi6j6EYpeq50iaba6mACFulz2v
+9nU/f4SLlwpttR+PJGOA5npkwwpArkxiIP/59oueW5Q/56lI9GrQCxSeHak29UfT
++3XeRxf8yxlKEw3M+2YEckjKSmlHua0XK+njlhVq+p/b5nZnJYF74CrTr92z6Xur
+H63YcFosPZ8Mv6rjbsUuVaOrDeF+bH7fuffBjPSzEb3G0AUL6DEqxh3eDiqbrVmK
+US7E8lu6S4vNusaPJ9fyeAsN3C/OsFsrewZAQjcsfK0eI72dOId2KLDywDli1Yyz
+r6rB3PjGYFIL6pdyg2xdUPEjy0EvzQj0wc16O8SFueDbHDjI14DSEoTafV6UK+xM
+irZn1Xv1Hd2Wj2S1l0RVPAWz7o/S9c6/VtLLrV0HSxEleNuern5dcCJkdW5K7sXU
+WBGStO8K3iVhSUOkMRJ6
+=m4/m
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/bin86/bin86-0.16.20-r1.ebuild b/sys-devel/bin86/bin86-0.16.20-r2.ebuild
index 7fe01ad70a33..54229f9fd101 100644
--- a/sys-devel/bin86/bin86-0.16.20-r1.ebuild
+++ b/sys-devel/bin86/bin86-0.16.20-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bin86/bin86-0.16.20-r1.ebuild,v 1.1 2013/12/09 23:51:56 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bin86/bin86-0.16.20-r2.ebuild,v 1.1 2014/01/02 07:37:38 polynomial-c Exp $
 
 EAPI="5"
 
@@ -8,7 +8,8 @@ inherit toolchain-funcs eutils
 
 DESCRIPTION="Assembler and loader used to create kernel bootsector"
 HOMEPAGE="http://v3.sk/~lkundrak/dev86/"
-SRC_URI="http://v3.sk/~lkundrak/dev86/${P}.tar.gz"
+SRC_URI="http://v3.sk/~lkundrak/dev86/${P}.tar.gz
+	https://github.com/lkundrak/dev86/commit/2c95336f19eeff761ecb858c5a2a58484bb3ceeb.patch -> ${PN}-0.16.20-fix_lilo_build.patch"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -23,8 +24,8 @@ src_prepare() {
 		-e "/^CFLAGS/s:=.*:=${CFLAGS} -D_POSIX_SOURCE ${CPPFLAGS}:" \
 		-e "/^LDFLAGS/s:=.*:=${LDFLAGS}:" \
 		Makefile || die
-	epatch "${FILESDIR}"/${PN}-0.16.17-amd64-build.patch
-	epatch "${FILESDIR}"/${PN}-0.16.20-remove-seg-ss-check.patch
+	epatch "${FILESDIR}"/${PN}-0.16.17-amd64-build.patch \
+		"${DISTDIR}"/${P}-fix_lilo_build.patch
 	tc-export CC
 }