From: Fabian Groffen <grobian@gentoo.org>
Date: Tue, 31 Dec 2019 11:11:56 +0000 (+0100)
Subject: app-admin/cygwin-rebase: add support for x86-cygwin, thanks dreamcaster23
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8061d6bedd5012ffc6820606c26f30f97cd1bd8f;p=gentoo.git

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

As reported via prefix@g.o, i386 target works well.

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

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 9575601c7c86..f80b7c07b4d1 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 9575601c7c86..f80b7c07b4d1 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