From: Alin Năstac <mrness@gentoo.org>
Date: Sat, 27 Jan 2007 12:50:36 +0000 (+0000)
Subject: ~amd64 (#163567)
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0b876a9e3ab5662ee03c9f4e0114e3a5fbdeda8e;p=gentoo.git

~amd64 (#163567)
Package-Manager: portage-2.1.1-r2
---

diff --git a/dev-util/nsis/ChangeLog b/dev-util/nsis/ChangeLog
index c5d2b507078a..56d52b551f32 100644
--- a/dev-util/nsis/ChangeLog
+++ b/dev-util/nsis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/nsis
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/ChangeLog,v 1.4 2007/01/15 13:25:41 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/ChangeLog,v 1.5 2007/01/27 12:50:36 mrness Exp $
+
+  27 Jan 2007; Alin Năstac <mrness@gentoo.org>
+  +files/nsis-2.23-32bit.patch, nsis-2.23.ebuild:
+  Add ~amd64 keyword, thanks to Roie Marianer <roie@int2001.co.il> (#163567).
 
 *nsis-2.23 (15 Jan 2007)
 
diff --git a/dev-util/nsis/Manifest b/dev-util/nsis/Manifest
index 1783228a2419..66e8aea8e8fd 100644
--- a/dev-util/nsis/Manifest
+++ b/dev-util/nsis/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX nsis-2.21-config.patch 1194 RMD160 d8566d14a2140975d77cbff45efb514ca181c594 SHA1 1c57deb4595697f1a38f5b799770b052083f717d SHA256 1e72da5db091e0462ba14f1e0d69f403ceb95b349624857d9f9d6c9081e56521
 MD5 e3844fa0dd6bd911158131aeafb3ac99 files/nsis-2.21-config.patch 1194
 RMD160 d8566d14a2140975d77cbff45efb514ca181c594 files/nsis-2.21-config.patch 1194
@@ -9,6 +6,10 @@ AUX nsis-2.22-config.patch 1749 RMD160 1afa9858dba01668a958461a9b3f017e4d2216a1
 MD5 6917b9853885b8ebc78455f77e61a430 files/nsis-2.22-config.patch 1749
 RMD160 1afa9858dba01668a958461a9b3f017e4d2216a1 files/nsis-2.22-config.patch 1749
 SHA256 dfec0ee7f328f61acd7c6094510314366b21b0235ae5b2ac8904e828c3d6a0b5 files/nsis-2.22-config.patch 1749
+AUX nsis-2.23-32bit.patch 447 RMD160 708a412d6c9ef83ab329d89d8135eeca05b3eedd SHA1 38794d2d06839f968128508e89cc3e3367d14ea2 SHA256 b2ed9278f37a8bfff7823c5ee5cd69e41ed05090077f258a3f5a7e908be1e481
+MD5 9dd6af6049b23aa353dbb458bd5b3ab0 files/nsis-2.23-32bit.patch 447
+RMD160 708a412d6c9ef83ab329d89d8135eeca05b3eedd files/nsis-2.23-32bit.patch 447
+SHA256 b2ed9278f37a8bfff7823c5ee5cd69e41ed05090077f258a3f5a7e908be1e481 files/nsis-2.23-32bit.patch 447
 AUX nsis-2.23-config.patch 1478 RMD160 d4b90c3b41afef9bfc241e945a320d62b548dd42 SHA1 e8be97f238d087779137856477bb8e641518138c SHA256 0f5474cf400cd8b335e2273c7239059d2f246f7ec02273dc277bfb9698d4f408
 MD5 d801ddd4bbefa4cf4654308ba9758c2a files/nsis-2.23-config.patch 1478
 RMD160 d4b90c3b41afef9bfc241e945a320d62b548dd42 files/nsis-2.23-config.patch 1478
@@ -24,14 +25,14 @@ EBUILD nsis-2.22.ebuild 1110 RMD160 113bdac4dd6e6fac7d5160f17a49ed41bc587821 SHA
 MD5 d97983011e5d89aa396395643053c5c8 nsis-2.22.ebuild 1110
 RMD160 113bdac4dd6e6fac7d5160f17a49ed41bc587821 nsis-2.22.ebuild 1110
 SHA256 31562e2fb25c7366e44fb9b174749bfe0fcfb7167c394119317cfcc6208f33aa nsis-2.22.ebuild 1110
-EBUILD nsis-2.23.ebuild 1222 RMD160 c714a164e49c4c7d65454cea05237e5d361eae59 SHA1 b78e658870925f570d6f8483c6e701867bd0b420 SHA256 ad8c355ee63e2d5d9be54f112e3e2c7ef9cf11f35f26e7c5acfd5f4ab92fbb60
-MD5 1c049ddca26f10a6f49c3d533b5f3c1a nsis-2.23.ebuild 1222
-RMD160 c714a164e49c4c7d65454cea05237e5d361eae59 nsis-2.23.ebuild 1222
-SHA256 ad8c355ee63e2d5d9be54f112e3e2c7ef9cf11f35f26e7c5acfd5f4ab92fbb60 nsis-2.23.ebuild 1222
-MISC ChangeLog 732 RMD160 61ccfa21834798d7db64fa8ff1ba321e483cdc7d SHA1 e5832a24ec110415e1fcc9f8aafc05fc57a6e511 SHA256 1c21542aae574ecd55334ebb7ba165c8972174da88776aa040934510826c6965
-MD5 c1a3701c6273ae8f9b58376594a202d7 ChangeLog 732
-RMD160 61ccfa21834798d7db64fa8ff1ba321e483cdc7d ChangeLog 732
-SHA256 1c21542aae574ecd55334ebb7ba165c8972174da88776aa040934510826c6965 ChangeLog 732
+EBUILD nsis-2.23.ebuild 1364 RMD160 398499c1b95b308ec857c12717270af4df8eac2c SHA1 aecffbb16420fe743de12a3a4dc374272c787b84 SHA256 72bfcea97f9e9c3ab18bb628cc4cc1d6c30b820453840ec1eb2f45a3731348d8
+MD5 571faef59ed60699836e06be9259a79b nsis-2.23.ebuild 1364
+RMD160 398499c1b95b308ec857c12717270af4df8eac2c nsis-2.23.ebuild 1364
+SHA256 72bfcea97f9e9c3ab18bb628cc4cc1d6c30b820453840ec1eb2f45a3731348d8 nsis-2.23.ebuild 1364
+MISC ChangeLog 909 RMD160 b91d325d959507acabfa6cb41852d3b71e632f6a SHA1 c0bc522be41471e1557a954898988c45bf22f5fe SHA256 4521793d7f2c9210a0a74c6408c63287363a376035fc09cc910edc68981cb7f2
+MD5 4e9119a216f17c361b96279a4a2070e7 ChangeLog 909
+RMD160 b91d325d959507acabfa6cb41852d3b71e632f6a ChangeLog 909
+SHA256 4521793d7f2c9210a0a74c6408c63287363a376035fc09cc910edc68981cb7f2 ChangeLog 909
 MISC metadata.xml 888 RMD160 463bc404bb8b97f2d45caa70242a93917e9c7546 SHA1 2e81672e52ba36ac17f9a49d7810099a78a561a4 SHA256 c4c22c4d20fef8ce0d8f6a73b5f694ea92dadc0b923b99b7d29833213cf9dd71
 MD5 3709cdb21dea3e7547b580c7d2283afe metadata.xml 888
 RMD160 463bc404bb8b97f2d45caa70242a93917e9c7546 metadata.xml 888
@@ -45,10 +46,3 @@ SHA256 4b72bef574e2299789d0d924b8d9538cabff13dd8fa67412da9ad374a1cbd6f9 files/di
 MD5 6f9d345bfbe5b9d93ce047603a6f42fe files/digest-nsis-2.23 247
 RMD160 fe3afceed7244884157f5f5f4fcb2c17c7141eda files/digest-nsis-2.23 247
 SHA256 c6b33efbd27194c2ed35672e16caa1ea085eb3571451952850d7c0a761cc558a files/digest-nsis-2.23 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFq4D+JnxX6mF440QRAtSMAKDIncfqv+kk6SendEnpGjEAnGBDDwCfSkxW
-+edSOTS9iOIQeLrwx5CtR9I=
-=gNXh
------END PGP SIGNATURE-----
diff --git a/dev-util/nsis/files/nsis-2.23-32bit.patch b/dev-util/nsis/files/nsis-2.23-32bit.patch
new file mode 100644
index 000000000000..24e942b7347f
--- /dev/null
+++ b/dev-util/nsis/files/nsis-2.23-32bit.patch
@@ -0,0 +1,12 @@
+diff -Nru nsis-2.23-src.orig/SCons/Config/gnu nsis-2.23-src/SCons/Config/gnu
+--- nsis-2.23-src.orig/SCons/Config/gnu	2007-01-27 14:20:12.000000000 +0200
++++ nsis-2.23-src/SCons/Config/gnu	2007-01-27 14:21:56.000000000 +0200
+@@ -56,6 +56,8 @@
+ 
+ if defenv['DEBUG']:
+ 	defenv.Append(CCFLAGS = '-g')
++defenv.Append(CCFLAGS = '-m32')             # 32-bit host
++defenv.Append(LINKFLAGS = '-m32')           # 32-bit host
+ 
+ ### stub environment
+ 
diff --git a/dev-util/nsis/nsis-2.23.ebuild b/dev-util/nsis/nsis-2.23.ebuild
index 83e77d8827f3..3944a8f49fa5 100644
--- a/dev-util/nsis/nsis-2.23.ebuild
+++ b/dev-util/nsis/nsis-2.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/nsis-2.23.ebuild,v 1.1 2007/01/15 12:39:37 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/nsis-2.23.ebuild,v 1.2 2007/01/27 12:50:36 mrness Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=dev-util/scons-0.96.93"
@@ -31,6 +31,8 @@ src_unpack() {
 
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-config.patch
+	#makensis code is not portable on 64-bit arches so we compile 32-bit executables 
+	use amd64 && epatch "${FILESDIR}"/${P}-32bit.patch
 }
 
 src_compile() {