[gentoo-commits] repo/gentoo:master commit in: sys-devel/bin86/

2023-11-16 Thread Sam James 
commit: 7253bef41058531d9f1f230a496bd962f1ae4eb9
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 17 04:05:13 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 17 04:05:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7253bef4

sys-devel/bin86: Stabilize 0.16.21-r2 amd64, #917360

Signed-off-by: Sam James  gentoo.org>

 sys-devel/bin86/bin86-0.16.21-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/bin86/bin86-0.16.21-r2.ebuild 
b/sys-devel/bin86/bin86-0.16.21-r2.ebuild
index ec61c436cb97..c7be6fd8af00 100644
--- a/sys-devel/bin86/bin86-0.16.21-r2.ebuild
+++ b/sys-devel/bin86/bin86-0.16.21-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://v3.sk/~lkundrak/dev86/${P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 PATCHES=( "${FILESDIR}"/${PN}-0.16.21-amd64-build.patch
  "${FILESDIR}"/${PN}-0.16.21-fix-build-for-clang16.patch

[gentoo-commits] repo/gentoo:master commit in: sys-devel/bin86/

2023-11-16 Thread Sam James 
commit: c64ddbb6db35b3d53c6975549888e95454ce7772
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 17 04:05:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 17 04:05:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c64ddbb6

sys-devel/bin86: Stabilize 0.16.21-r2 x86, #917360

Signed-off-by: Sam James  gentoo.org>

 sys-devel/bin86/bin86-0.16.21-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/bin86/bin86-0.16.21-r2.ebuild 
b/sys-devel/bin86/bin86-0.16.21-r2.ebuild
index 4cabadfd2b2a..ec61c436cb97 100644
--- a/sys-devel/bin86/bin86-0.16.21-r2.ebuild
+++ b/sys-devel/bin86/bin86-0.16.21-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://v3.sk/~lkundrak/dev86/${P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 PATCHES=( "${FILESDIR}"/${PN}-0.16.21-amd64-build.patch
  "${FILESDIR}"/${PN}-0.16.21-fix-build-for-clang16.patch

[gentoo-commits] repo/gentoo:master commit in: sys-devel/bin86/files/, sys-devel/bin86/

2023-10-12 Thread Viorel Munteanu 
commit: 4a2d34eadca55500af9f0ec0b3a8ab78fde9b080
Author: Pascal Jäger  leimstift  de>
AuthorDate: Fri Sep 15 08:22:00 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Thu Oct 12 12:06:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a2d34ea

sys-devel/bin86: fix implicit int declarations

Closes: https://bugs.gentoo.org/880797
Signed-off-by: Pascal Jäger  leimstift.de>
Closes: https://github.com/gentoo/gentoo/pull/32795
Signed-off-by: Viorel Munteanu  gentoo.org>

 sys-devel/bin86/bin86-0.16.21-r2.ebuild|  36 +
 .../bin86-0.16.21-fix-build-for-clang16.patch  | 145 +
 2 files changed, 181 insertions(+)

diff --git a/sys-devel/bin86/bin86-0.16.21-r2.ebuild 
b/sys-devel/bin86/bin86-0.16.21-r2.ebuild
new file mode 100644
index ..4cabadfd2b2a
--- /dev/null
+++ b/sys-devel/bin86/bin86-0.16.21-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit toolchain-funcs
+
+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;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.16.21-amd64-build.patch
+ "${FILESDIR}"/${PN}-0.16.21-fix-build-for-clang16.patch
+)
+
+src_prepare() {
+   use elibc_musl && CPPFLAGS="${CPPFLAGS} -U__linux__"
+   sed -i \
+   -e '/^PREFIX/s|=.*|=$(DESTDIR)/usr|' \
+   -e '/^MANDIR/s|)/man/man1|)/share/man/man1|' \
+   -e '/^INSTALL_OPTS/s|-s||' \
+   -e "/^CFLAGS/s|=.*|=${CFLAGS} -D_POSIX_SOURCE ${CPPFLAGS}|" \
+   -e "/^LDFLAGS/s|=.*|=${LDFLAGS}|" \
+   Makefile || die
+   tc-export CC
+   default
+}
+
+src_install() {
+   dodir /usr/bin /usr/share/man/man1
+   default
+}

diff --git a/sys-devel/bin86/files/bin86-0.16.21-fix-build-for-clang16.patch 
b/sys-devel/bin86/files/bin86-0.16.21-fix-build-for-clang16.patch
new file mode 100644
index ..9b821ca35850
--- /dev/null
+++ b/sys-devel/bin86/files/bin86-0.16.21-fix-build-for-clang16.patch
@@ -0,0 +1,145 @@
+Subject: [PATCH] fix build for clang 16
+
+clang 16 does not allow implicit int in function declarations
+
+Bug: https://bugs.gentoo.org/880797
+Upstream PR: https://github.com/lkundrak/dev86/pull/26
+
+Signed-off-by: Pascal Jäger 
+---
+ ld/catimage.c | 32 +++-
+ ld/objchop.c  | 16 
+ 2 files changed, 27 insertions(+), 21 deletions(-)
+
+diff --git a/ld/catimage.c b/ld/catimage.c
+index 1f5e160..47161b9 100644
+--- a/ld/catimage.c
 b/ld/catimage.c
+@@ -24,6 +24,7 @@
+ #ifdef __STDC__
+ #include 
+ #include 
++#include 
+ #endif
+ #include "x86_aout.h"
+ 
+@@ -39,9 +40,14 @@ FILE * ofd;
+ FILE * ifd = 0;
+ struct exec header;
+ 
+-main(argc, argv)
+-int argc;
+-char ** argv;
++void open_obj(char * fname);
++void copy_segment(long out_offset,long in_offset,long length);
++void patch_bin(long file_off, int value);
++void read_symtable(void);
++void fatal(char * str);
++
++int
++main(int argc, char ** argv)
+ {
+long image_offset, text_off;
+int  image_id;
+@@ -100,8 +106,8 @@ char ** argv;
+exit(0);
+ }
+ 
+-open_obj(fname)
+-char * fname;
++void
++open_obj(char * fname)
+ {
+input_file = fname;
+ 
+@@ -117,8 +123,8 @@ char * fname;
+   fatal("Input file has bad magic number");
+ }
+ 
+-copy_segment(out_offset, in_offset, length)
+-long out_offset, in_offset, length;
++void
++copy_segment(long out_offset,long in_offset,long length)
+ {
+char buffer[1024];
+int ssize;
+@@ -143,9 +149,8 @@ long out_offset, in_offset, length;
+}
+ }
+ 
+-patch_bin(file_off, value)
+-long file_off;
+-int value;
++void
++patch_bin(long file_off, int value)
+ {
+char wbuf[4];
+if( file_off > 0 )
+@@ -163,7 +168,8 @@ int value;
+}
+ }
+ 
+-read_symtable()
++void
++read_symtable(void)
+ {
+struct nlist item;
+int nitems;
+@@ -234,8 +240,8 @@ read_symtable()
+}
+ }
+ 
+-fatal(str)
+-char * str;
++void
++fatal(char * str)
+ {
+fprintf(stderr, "catimage:%s: %s\n", input_file, str);
+exit(2);
+diff --git a/ld/objchop.c b/ld/objchop.c
+index c7631c1..495df75 100644
+--- a/ld/objchop.c
 b/ld/objchop.c
+@@ -16,12 +16,13 @@ main()
+ 
+ #else
+ 
++void fatal(char* str);
++void write_file(char *fname, long bsize);
++
+ FILE * ifd;
+ struct exec header;
+ 
+-main(argc, argv)
+-int argc;
+-char ** argv;
++int main(int argc, char** argv)
+ {
+FILE * ofd;
+if( argc != 5 ) fatal("Usage: objchop a.out text.bin data.bin sizes.asm");
+@@ -56,9 +57,8 @@ char ** argv;
+exit(0);
+ }
+ 
+-write_file(fname, bsize)
+-char * fname;
+-long bsize;
++void
++write_file(char *fname, long bsize)
+ {
+char buffer[1024];
+int ssize;
+@@ -81,8 +81,8 @@ long bsize;
+

[gentoo-commits] repo/gentoo:master commit in: sys-devel/bin86/files/

2022-02-21 Thread Ionen Wolkens 
commit: e78eadf0fbf01f15ee543222054bdd603041986d
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon Feb 21 13:38:31 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Feb 22 07:11:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e78eadf0

sys-devel/bin86: remove unused patch

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24298
Signed-off-by: Ionen Wolkens  gentoo.org>

 sys-devel/bin86/files/bin86-0.16.17-amd64-build.patch | 17 -
 1 file changed, 17 deletions(-)

diff --git a/sys-devel/bin86/files/bin86-0.16.17-amd64-build.patch 
b/sys-devel/bin86/files/bin86-0.16.17-amd64-build.patch
deleted file mode 100644
index b494a8b724de..
--- a/sys-devel/bin86/files/bin86-0.16.17-amd64-build.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-This should make it built on other archictectures as well
-
-https://bugs.gentoo.org/428228
-
 ld/x86_aout.h
-+++ ld/x86_aout.h
-@@ -13,7 +13,9 @@
- typedef long Long;
- #define __OUT_OK 1
- #else
--typedef char Long[4];
-+#define __OUT_OK 1
-+#include 
-+typedef int32_t Long;
- #endif
- 
- structexec {  /* a.out header */

[gentoo-commits] repo/gentoo:master commit in: sys-devel/bin86/

2022-02-19 Thread Sam James 
commit: 9f1ff8c0ad1e5f0682a8aedf1fcbfa450c1c65f4
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 20 05:10:27 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 20 05:25:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f1ff8c0

sys-devel/bin86: drop 0.16.21

Signed-off-by: Sam James  gentoo.org>

 sys-devel/bin86/bin86-0.16.21.ebuild | 34 --
 1 file changed, 34 deletions(-)

diff --git a/sys-devel/bin86/bin86-0.16.21.ebuild 
b/sys-devel/bin86/bin86-0.16.21.ebuild
deleted file mode 100644
index b21fcec3bf49..
--- a/sys-devel/bin86/bin86-0.16.21.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs epatch
-
-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;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE=""
-
-src_prepare() {
-   use elibc_musl && CPPFLAGS="${CPPFLAGS} -U__linux__"
-   sed -i \
-   -e '/^PREFIX/s|=.*|=$(DESTDIR)/usr|' \
-   -e '/^MANDIR/s|)/man/man1|)/share/man/man1|' \
-   -e '/^INSTALL_OPTS/s|-s||' \
-   -e "/^CFLAGS/s|=.*|=${CFLAGS} -D_POSIX_SOURCE ${CPPFLAGS}|" \
-   -e "/^LDFLAGS/s|=.*|=${LDFLAGS}|" \
-   Makefile || die
-   epatch "${FILESDIR}"/${PN}-0.16.17-amd64-build.patch
-   eapply_user
-   tc-export CC
-}
-
-src_install() {
-   dodir /usr/bin /usr/share/man/man1
-   default
-}

[gentoo-commits] repo/gentoo:master commit in: sys-devel/bin86/, sys-devel/bin86/files/

2021-12-20 Thread Sam James 
commit: 41f4d81a810cd75a634af1ce792f75f13d7cfa49
Author: Tomáš Mózes  gmail  com>
AuthorDate: Sat Dec 18 01:01:18 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 21 01:50:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41f4d81a

sys-devel/bin86: update to EAPI 8

Signed-off-by: Tomáš Mózes  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23400
Signed-off-by: Sam James  gentoo.org>

 sys-devel/bin86/bin86-0.16.21-r1.ebuild| 34 ++
 .../bin86/files/bin86-0.16.21-amd64-build.patch| 19 
 2 files changed, 53 insertions(+)

diff --git a/sys-devel/bin86/bin86-0.16.21-r1.ebuild 
b/sys-devel/bin86/bin86-0.16.21-r1.ebuild
new file mode 100644
index ..c8aa201710f6
--- /dev/null
+++ b/sys-devel/bin86/bin86-0.16.21-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit toolchain-funcs
+
+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;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+PATCHES="${FILESDIR}"/${PN}-0.16.21-amd64-build.patch
+
+src_prepare() {
+   use elibc_musl && CPPFLAGS="${CPPFLAGS} -U__linux__"
+   sed -i \
+   -e '/^PREFIX/s|=.*|=$(DESTDIR)/usr|' \
+   -e '/^MANDIR/s|)/man/man1|)/share/man/man1|' \
+   -e '/^INSTALL_OPTS/s|-s||' \
+   -e "/^CFLAGS/s|=.*|=${CFLAGS} -D_POSIX_SOURCE ${CPPFLAGS}|" \
+   -e "/^LDFLAGS/s|=.*|=${LDFLAGS}|" \
+   Makefile || die
+   tc-export CC
+   default
+}
+
+src_install() {
+   dodir /usr/bin /usr/share/man/man1
+   default
+}

diff --git a/sys-devel/bin86/files/bin86-0.16.21-amd64-build.patch 
b/sys-devel/bin86/files/bin86-0.16.21-amd64-build.patch
new file mode 100644
index ..9e5a85299fe6
--- /dev/null
+++ b/sys-devel/bin86/files/bin86-0.16.21-amd64-build.patch
@@ -0,0 +1,19 @@
+This should make it built on other archictectures as well
+
+https://bugs.gentoo.org/428228
+
+diff --git a/ld/x86_aout.h b/ld/x86_aout.h
+index 542a70d..a38488d 100644
+--- a/ld/x86_aout.h
 b/ld/x86_aout.h
+@@ -19,7 +19,9 @@ typedef long Long;
+ typedef int32_t Long;
+ #define __OUT_OK 1
+ #else
+-typedef char Long[4];
++#define __OUT_OK 1
++#include 
++typedef int32_t Long;
+ #endif
+ #endif
+

[gentoo-commits] repo/gentoo:master commit in: sys-devel/bin86/

2021-04-18 Thread Andreas Sturmlechner 
commit: 4b77de62487edd2520a14dac58f6bf1f26e99b7e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 18 11:00:18 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 18 17:55:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b77de62

sys-devel/bin86: Drop 0.16.20-r2, EAPI5--

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sys-devel/bin86/Manifest|  2 --
 sys-devel/bin86/bin86-0.16.20-r2.ebuild | 34 -
 2 files changed, 36 deletions(-)

diff --git a/sys-devel/bin86/Manifest b/sys-devel/bin86/Manifest
index 0472fcac8a2..636937dc79f 100644
--- a/sys-devel/bin86/Manifest
+++ b/sys-devel/bin86/Manifest
@@ -1,3 +1 @@
-DIST bin86-0.16.20-fix_lilo_build.patch 3488 BLAKE2B 
1a0f4240156ab36579e2e49fbfb5b4c9f9fc165dcf3b1bc1f6ca770ebf7a6dfde2d1672968522b56f59787c3a2528d7c35b402753470ff3ab92da42b26e80cfa
 SHA512 
f307438ced09e34ce5c552f808a9d1ae09bb9bbaceee4e1e07021f810470dfb07d21a30d1447295b2d023ccf56f158f4b7f3d80d478b1d7e3e4b79b13b8e760c
-DIST bin86-0.16.20.tar.gz 154107 BLAKE2B 
f51a189fed52713d5cdccc880596aea9f6a5dd4a8eb6eabf2ad2600a5da520b3ec765b512261bc6ffe33ce0c9d23c5491c8c34481795d24dcec2c91e04fc5d22
 SHA512 
c567ad5f9241d9ed768410f988266d4ff952fd4767d033552b100a2643db69ee9d4b5929a1b40c3018db7037b0efc7b47db84fa1f561bc39f01e640b1a3bacfc
 DIST bin86-0.16.21.tar.gz 154283 BLAKE2B 
6c88a5cf86623130f6ed45cefb9ee9293df4d0e5712d96a24a6fe84bbe5002869761e9c39bb20c8af74e3fe76cf65632ef43e55d81d0e5cb9212f3cae56a
 SHA512 
e80e06965fbdcf13100aae4690071d01a6efe74aed7ff8f14e5892c6803393a1b5acda1296e0f0e1837dfb73e0edd02e9cccfeabbeabe1b68fa6b6b85ced1f56

diff --git a/sys-devel/bin86/bin86-0.16.20-r2.ebuild 
b/sys-devel/bin86/bin86-0.16.20-r2.ebuild
deleted file mode 100644
index 00a5699a86d..000
--- a/sys-devel/bin86/bin86-0.16.20-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs epatch
-
-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
-   
https://github.com/lkundrak/dev86/commit/2c95336f19eeff761ecb858c5a2a58484bb3ceeb.patch
 -> ${PN}-0.16.20-fix_lilo_build.patch"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-
-src_prepare() {
-   sed -i \
-   -e '/^PREFIX/s|=.*|=$(DESTDIR)/usr|' \
-   -e '/^MANDIR/s|)/man/man1|)/share/man/man1|' \
-   -e '/^INSTALL_OPTS/s|-s||' \
-   -e "/^CFLAGS/s|=.*|=${CFLAGS} -D_POSIX_SOURCE ${CPPFLAGS}|" \
-   -e "/^LDFLAGS/s|=.*|=${LDFLAGS}|" \
-   Makefile || die
-   epatch "${FILESDIR}"/${PN}-0.16.17-amd64-build.patch \
-   "${DISTDIR}"/${P}-fix_lilo_build.patch
-   tc-export CC
-}
-
-src_install() {
-   dodir /usr/bin /usr/share/man/man1
-   default
-}

[gentoo-commits] repo/gentoo:master commit in: sys-devel/bin86/

2021-04-04 Thread Mike Gilbert 
commit: b4f763a9a88a307821e022e7d10220fd5aa6fc22
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Apr  5 01:26:06 2021 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Apr  5 01:26:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4f763a9

sys-devel/bin86: maintainer needed

Signed-off-by: Mike Gilbert  gentoo.org>

 sys-devel/bin86/metadata.xml | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/sys-devel/bin86/metadata.xml b/sys-devel/bin86/metadata.xml
index b6943a7745a..e3d90415dc5 100644
--- a/sys-devel/bin86/metadata.xml
+++ b/sys-devel/bin86/metadata.xml
@@ -1,14 +1,7 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-
-   base-sys...@gentoo.org
-   Gentoo Base System
-
-
+
 
lkundrak/dev86

[gentoo-commits] repo/gentoo:master commit in: sys-devel/bin86/

2021-03-28 Thread Sam James 
commit: e896b332bf5b0849529864cae2165287e636cec8
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 28 07:11:02 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 28 07:11:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e896b332

sys-devel/bin86: Keyword 0.16.21 arm, #600508

Signed-off-by: Sam James  gentoo.org>

 sys-devel/bin86/bin86-0.16.21.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-devel/bin86/bin86-0.16.21.ebuild 
b/sys-devel/bin86/bin86-0.16.21.ebuild
index ad7a6449a56..448c25c7d01 100644
--- a/sys-devel/bin86/bin86-0.16.21.ebuild
+++ b/sys-devel/bin86/bin86-0.16.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="http://v3.sk/~lkundrak/dev86/${P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: sys-devel/bin86/

2020-04-27 Thread Lars Wendler 
commit: 9e7e3d355dd66a695c0f69a511cd9c03c7e08a8a
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Apr 28 05:42:51 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Apr 28 05:42:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e7e3d35

sys-devel/bin86: Don't use colons as sed delimiter

Closes: https://bugs.gentoo.org/710340
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Lars Wendler  gentoo.org>

 sys-devel/bin86/bin86-0.16.20-r2.ebuild | 12 ++--
 sys-devel/bin86/bin86-0.16.21.ebuild| 12 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sys-devel/bin86/bin86-0.16.20-r2.ebuild 
b/sys-devel/bin86/bin86-0.16.20-r2.ebuild
index 9e0088919ee..ae8685567e4 100644
--- a/sys-devel/bin86/bin86-0.16.20-r2.ebuild
+++ b/sys-devel/bin86/bin86-0.16.20-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -17,11 +17,11 @@ IUSE=""
 
 src_prepare() {
sed -i \
-   -e '/^PREFIX/s:=.*:=$(DESTDIR)/usr:' \
-   -e '/^MANDIR/s:)/man/man1:)/share/man/man1:' \
-   -e '/^INSTALL_OPTS/s:-s::' \
-   -e "/^CFLAGS/s:=.*:=${CFLAGS} -D_POSIX_SOURCE ${CPPFLAGS}:" \
-   -e "/^LDFLAGS/s:=.*:=${LDFLAGS}:" \
+   -e '/^PREFIX/s|=.*|=$(DESTDIR)/usr|' \
+   -e '/^MANDIR/s|)/man/man1|)/share/man/man1|' \
+   -e '/^INSTALL_OPTS/s|-s||' \
+   -e "/^CFLAGS/s|=.*|=${CFLAGS} -D_POSIX_SOURCE ${CPPFLAGS}|" \
+   -e "/^LDFLAGS/s|=.*|=${LDFLAGS}|" \
Makefile || die
epatch "${FILESDIR}"/${PN}-0.16.17-amd64-build.patch \
"${DISTDIR}"/${P}-fix_lilo_build.patch

diff --git a/sys-devel/bin86/bin86-0.16.21.ebuild 
b/sys-devel/bin86/bin86-0.16.21.ebuild
index 3e67dfb8467..ad7a6449a56 100644
--- a/sys-devel/bin86/bin86-0.16.21.ebuild
+++ b/sys-devel/bin86/bin86-0.16.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -17,11 +17,11 @@ IUSE=""
 src_prepare() {
use elibc_musl && CPPFLAGS="${CPPFLAGS} -U__linux__"
sed -i \
-   -e '/^PREFIX/s:=.*:=$(DESTDIR)/usr:' \
-   -e '/^MANDIR/s:)/man/man1:)/share/man/man1:' \
-   -e '/^INSTALL_OPTS/s:-s::' \
-   -e "/^CFLAGS/s:=.*:=${CFLAGS} -D_POSIX_SOURCE ${CPPFLAGS}:" \
-   -e "/^LDFLAGS/s:=.*:=${LDFLAGS}:" \
+   -e '/^PREFIX/s|=.*|=$(DESTDIR)/usr|' \
+   -e '/^MANDIR/s|)/man/man1|)/share/man/man1|' \
+   -e '/^INSTALL_OPTS/s|-s||' \
+   -e "/^CFLAGS/s|=.*|=${CFLAGS} -D_POSIX_SOURCE ${CPPFLAGS}|" \
+   -e "/^LDFLAGS/s|=.*|=${LDFLAGS}|" \
Makefile || die
epatch "${FILESDIR}"/${PN}-0.16.17-amd64-build.patch
eapply_user

[gentoo-commits] repo/gentoo:master commit in: sys-devel/bin86/

2017-12-24 Thread Anthony G. Basile 
commit: b7dabea6d086f59e1d1b899709cb62bc2a4ddab9
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sun Dec 24 14:44:17 2017 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sun Dec 24 14:44:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7dabea6

sys-devel/bin86: fix build on x86 musl, bump to EAPI=6

ld/bindef.h uses brain-dead #ifdef logic in deciding whether
to include  on x86.  By undefining __linux__ we fix
this on musl systems.

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 sys-devel/bin86/bin86-0.16.21.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys-devel/bin86/bin86-0.16.21.ebuild 
b/sys-devel/bin86/bin86-0.16.21.ebuild
index 3c587b03ca5..189d5bc75ed 100644
--- a/sys-devel/bin86/bin86-0.16.21.ebuild
+++ b/sys-devel/bin86/bin86-0.16.21.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 inherit toolchain-funcs eutils
 
@@ -15,6 +15,7 @@ KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 src_prepare() {
+   use elibc_musl && CPPFLAGS="${CPPFLAGS} -U__linux__"
sed -i \
-e '/^PREFIX/s:=.*:=$(DESTDIR)/usr:' \
-e '/^MANDIR/s:)/man/man1:)/share/man/man1:' \
@@ -23,6 +24,7 @@ src_prepare() {
-e "/^LDFLAGS/s:=.*:=${LDFLAGS}:" \
Makefile || die
epatch "${FILESDIR}"/${PN}-0.16.17-amd64-build.patch
+   eapply_user
tc-export CC
 }

[gentoo-commits] repo/gentoo:master commit in: sys-devel/bin86/files/

2017-02-04 Thread David Seifert 
commit: 1cbca701e8460f8ced5309ae337f191380c884c6
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Fri Feb  3 15:23:14 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb  4 21:20:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cbca701

sys-devel/bin86: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/3791

 sys-devel/bin86/files/bin86-0.16.18-headers.patch  | 34 --
 .../files/bin86-0.16.20-remove-seg-ss-check.patch  | 22 --
 2 files changed, 56 deletions(-)

diff --git a/sys-devel/bin86/files/bin86-0.16.18-headers.patch 
b/sys-devel/bin86/files/bin86-0.16.18-headers.patch
deleted file mode 100644
index 16c9fa1..
--- a/sys-devel/bin86/files/bin86-0.16.18-headers.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-fix implicit function decl warnings
-
-by David J Cozatt
-
 bin86-0.16.18/ld/catimage.c
-+++ bin86-0.16.18/ld/catimage.c
-@@ -21,6 +21,8 @@
-  */
- 
- #include 
-+#include 
-+#include 
- #include "x86_aout.h"
- 
- #ifndef __OUT_OK
 bin86-0.16.18/ld/dumps.c   
-+++ bin86-0.16.18/ld/dumps.c
-@@ -6,6 +6,7 @@
- #include "obj.h"
- #include "type.h"
- #include "globvar.h"
-+#include 
- 
- /* print list of modules and whether they are loaded */
- 
 bin86-0.16.18/ld/objchop.c 
-+++ bin86-0.16.18/ld/objchop.c 
-@@ -1,5 +1,6 @@
- 
- #include 
-+#include 
- #include "x86_aout.h"
- 
- #ifndef __OUT_OK

diff --git a/sys-devel/bin86/files/bin86-0.16.20-remove-seg-ss-check.patch 
b/sys-devel/bin86/files/bin86-0.16.20-remove-seg-ss-check.patch
deleted file mode 100644
index 146b42f..
--- a/sys-devel/bin86/files/bin86-0.16.20-remove-seg-ss-check.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-This check leads to false positives for lilo.  We disable it.
-
-From: Anthony G. Basile 
-
-diff -Naur bin86-0.16.20.orig/as/assemble.c bin86-0.16.20/as/assemble.c
 bin86-0.16.20.orig/as/assemble.c   2013-10-29 11:45:37.0 -0400
-+++ bin86-0.16.20/as/assemble.c2013-12-09 18:43:45.018184693 -0500
-@@ -325,12 +325,14 @@
- /* We handle "rep[ne]" refix as separate instruction; check if it's valid 
*/
- if (prevop == 0xF2 && (opcode&0xF6) != 0xA6)/* REPNE CMPS/SCAS */
- error (REPNE_STRING);
-+#if 0
- if (prevop == 0xF3 && !((opcode&0xFC) == 0x6C ||/* REP INS/OUTS */
- (opcode&0xFC) == 0xA4 ||/* REP MOVS/CMPS */
- (opcode&0xFC) == 0xAC ||/* REP SCAS/LODS */
- (opcode&0xFE) == 0xAA)) /* REP STOS */
- error (REP_STRING);
- #endif
-+#endif
- routine = rout_table[symptr->value_reg_or_op.op.routine];
- getsym();
- (*routine)();