[gentoo-commits] repo/gentoo:master commit in: app-admin/cygwin-rebase/

[Fabian Groffen]

commit:     8061d6bedd5012ffc6820606c26f30f97cd1bd8f
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 31 11:11:56 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Dec 31 11:11:56 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8061d6be

app-admin/cygwin-rebase: add support for x86-cygwin, thanks dreamcaster23

As reported via prefix <AT> g.o, i386 target works well.

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 app-admin/cygwin-rebase/cygwin-rebase-4.4.4.ebuild | 6 +++++-
 app-admin/cygwin-rebase/cygwin-rebase-9999.ebuild  | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app-admin/cygwin-rebase/cygwin-rebase-4.4.4.ebuild 
b/app-admin/cygwin-rebase/cygwin-rebase-4.4.4.ebuild
index 9575601c7c8..f80b7c07b4d 100644
--- a/app-admin/cygwin-rebase/cygwin-rebase-4.4.4.ebuild
+++ b/app-admin/cygwin-rebase/cygwin-rebase-4.4.4.ebuild
@@ -31,7 +31,7 @@ else
                
https://github.com/haubi/cygwin-rebase/compare/rebase-${MY_PV}...rebase-${MY_PV}_merge-files-flag-0.patch
 -> ${P}_merge-files-flag-0.patch
        "
        PATCHES=( "${DISTDIR}/${P}_merge-files-flag-0.patch" )
-       KEYWORDS="-* ~x64-cygwin"
+       KEYWORDS="-* ~x64-cygwin ~x86-cygwin"
 fi
 
 DEPEND=""
@@ -60,6 +60,10 @@ pkg_preinst() {
        local rebasedb
        local baseaddr
        case ${CHOST} in
+       i686-*-cygwin*)
+               rebasedb=/etc/rebase.db.i386
+               baseaddr=0x70000000
+               ;;
        x86_64-*-cygwin*)
                rebasedb=/etc/rebase.db.x86_64
                baseaddr=0x1000000000

diff --git a/app-admin/cygwin-rebase/cygwin-rebase-9999.ebuild 
b/app-admin/cygwin-rebase/cygwin-rebase-9999.ebuild
index 9575601c7c8..f80b7c07b4d 100644
--- a/app-admin/cygwin-rebase/cygwin-rebase-9999.ebuild
+++ b/app-admin/cygwin-rebase/cygwin-rebase-9999.ebuild
@@ -31,7 +31,7 @@ else
                
https://github.com/haubi/cygwin-rebase/compare/rebase-${MY_PV}...rebase-${MY_PV}_merge-files-flag-0.patch
 -> ${P}_merge-files-flag-0.patch
        "
        PATCHES=( "${DISTDIR}/${P}_merge-files-flag-0.patch" )
-       KEYWORDS="-* ~x64-cygwin"
+       KEYWORDS="-* ~x64-cygwin ~x86-cygwin"
 fi
 
 DEPEND=""
@@ -60,6 +60,10 @@ pkg_preinst() {
        local rebasedb
        local baseaddr
        case ${CHOST} in
+       i686-*-cygwin*)
+               rebasedb=/etc/rebase.db.i386
+               baseaddr=0x70000000
+               ;;
        x86_64-*-cygwin*)
                rebasedb=/etc/rebase.db.x86_64
                baseaddr=0x1000000000