summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2014-01-02 07:37:38 +0000
committerLars Wendler <polynomial-c@gentoo.org>2014-01-02 07:37:38 +0000
commitf89c5dc9402597c86970ac9d6c808e32279b56ec (patch)
tree44e8eac095f664ec105a179bc99c4101309d1f89 /sys-devel/bin86
parentAdd alpha keyword that did not get included in a version bump. (diff)
downloadgentoo-2-f89c5dc9402597c86970ac9d6c808e32279b56ec.tar.gz
gentoo-2-f89c5dc9402597c86970ac9d6c808e32279b56ec.tar.bz2
gentoo-2-f89c5dc9402597c86970ac9d6c808e32279b56ec.zip
Revbump to add upstream fix for lilo build breakage (bug #491828)
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'sys-devel/bin86')
-rw-r--r--sys-devel/bin86/ChangeLog10
-rw-r--r--sys-devel/bin86/bin86-0.16.20-r2.ebuild (renamed from sys-devel/bin86/bin86-0.16.20-r1.ebuild)11
2 files changed, 14 insertions, 7 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/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
}