support building on 64bit platform, bug#425030

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0xBF20DC51

3 files changed, 127 insertions, 5 deletions

diff --git a/dev-util/nsis/ChangeLog b/dev-util/nsis/ChangeLog
index c61413abc960..e64b6aa91dc4 100644
--- a/dev-util/nsis/ChangeLog
+++ b/dev-util/nsis/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/nsis
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/ChangeLog,v 1.40 2013/06/01 12:14:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/ChangeLog,v 1.41 2013/06/02 00:55:01 alonbl Exp $
+
+*nsis-2.46-r1 (02 Jun 2013)
+
+  02 Jun 2013; Alon Bar-Lev <alonbl@gentoo.org> +nsis-2.46-r1.ebuild,
+  nsis-2.46.ebuild:
+  support building on 64bit platform, bug#425030
 
   01 Jun 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due bug #151880
diff --git a/dev-util/nsis/Manifest b/dev-util/nsis/Manifest
index b13d8ecfdf11..0ed54114ffc5 100644
--- a/dev-util/nsis/Manifest
+++ b/dev-util/nsis/Manifest
@@ -2,14 +2,17 @@
 Hash: SHA256
 
 AUX nsis-2.46-gcc47.patch 357 SHA256 1655c47013e49a5811440ecadb32004b1fddca109f3ce3c50aa78a4e22124e48 SHA512 a560c0318928eb246d42193318b7302e655913f13f8f3ed280e25278259e4b9ddefb84a7017b5496077ef37d7ab6c75c23944a4ccf4a72efaf6b3a0e23bd4e33 WHIRLPOOL 1c48e0630ad68016feac6e654cfc002319d88288f1b457b91e6e5b2c281068f80f115f3a8fa56daa49197bb6de81a05a502e9dd3ab19ac3486538aecbfdfde09
+DIST makensis_64bit.patch 18743 SHA256 df6377f0e21ef585064c3dd999550e1aef9df8c2224833167716a7166d93d22a SHA512 e04e0f6255708490e4fc2929bbfca442b7e59b5f05ea9b10145e556e59317e81452e77f9214df011bc7d6b45c79ce13396e2aeb85ce2d7d48e95721e53340c2b WHIRLPOOL c0b1ab7c12e43f8ff8d4fd543ac0600d76b1d2f870c89b25fd22aaba9215f45893acadbed075a50e9428ae1d29dde971f9772846f2223163e7836c1d952036f3
 DIST nsis-2.46-src.tar.bz2 1499014 SHA256 f5f9e5e22505e44b25aea14fe17871c1ed324c1f3cc7a753ef591f76c9e8a1ae SHA512 8716cf6dc086d8b9eb3c707b3a65790bf2e2b41116243d86243514ec6b2db7c508dedef027863bbd6650b21ca5f94ef7dd6706fe14ddc151c4548ecb15858ee6 WHIRLPOOL d716a7b78b20517dff420f57ff820a5aac4654d77a3a0760ee7512aff12d9abbb8be20da888968b151571363ddc1b8c3b02cc7e51784c95ab5169b8a1ab424e3
+DIST nsis_w64-mingw.patch 10378 SHA256 e3fe5f5675ac3562ae67283914f5ecf83f313e9127a406477f04c2aeafd945d5 SHA512 b8f0f7151a53335a5b3bf49ef2a16d805642c43a238afd424541be7d64a1a543ded28479ff503da84591b358f5f71728a815b704a083b94997cfbd5246b6f2b6 WHIRLPOOL a14e5168550974947d4da50747b7dd9893117c0b6dc981bdcd8c0fa053ead8d5a61c8317e18bf9f81a10c2b2efa398c3d40a3da011cc3c3dacef241f5aaa622c
+EBUILD nsis-2.46-r1.ebuild 2969 SHA256 ca49e4f2196ecc9bd8017c24eebb965535988bb915dc6650bd07e2df1bf04b6f SHA512 181ae80e3f8030fdd727d6ce0bafc6879faff206f30e98ed6f789d3e78f3ffc85235361ccf44a562c8c04f86ac7fefb2fbda703b3d9b409b3a90ca56915894c3 WHIRLPOOL 5203ef3ca98aab445f3c9a316df47be6bdbc553b9a0ab2b11e79d657b846fd76b5a6f27a09b32f7554c6d2688619277444acb6851ac6e483fd68fe2927676636
 EBUILD nsis-2.46.ebuild 2897 SHA256 c875eccaa126d266df2c769baf8162f871d73dbdd075b12f6f424472fc6bbf18 SHA512 1571feffba54e28c9fe0babb400bf0ecf5db233ed830b0ea7251732ff4393eac3b8fe174ee8029316661e1dfff5f10edddf2a22c238505e056746e7f45543f97 WHIRLPOOL 0f88d059c1f698948238d4ed59974ec960e54273cab6fcc70ecf8b2cb9bc007ad82de3c53c10af13b5adc5dc390bc584621c6a97768421562f5f71dc9a0acc36
-MISC ChangeLog 5581 SHA256 e81d7a35787b8c39847f6e54b5beed3deb3a87557674877ec1bcbbc27efb8d6b SHA512 1bc61af9f30823e47348085158ae3b4a0bc76e55f9d1eedb4e7182af35b986f2a9824938331e2b8165fe76297f5b9d367546840e0397a65c0e147af945969510 WHIRLPOOL e00246ae3455ba7bf450d87ebb528577d316686d5c0349dff0585d332f14d7a0c8600c2becc30ad68711d2dcdcc28c823878a4b52bde22a8c93785518483b4fd
+MISC ChangeLog 5751 SHA256 2afbe50613b2d0af35fe7ef3d5dd51e8b054207558f20122622269623312c1d1 SHA512 16054899425a8698f13d5c2d62c301c59bb264a4fe99d6e65ebdce0b5e61d076b571150b55dbadf50ed2e3f4b63d8a56673fdd813368a6bb060295cdd25ff365 WHIRLPOOL f4de611a12551a8640bd76b0bbdb1661143729795b2b6ab9d516ac63a8100eb97b2360e0897d1caadfe4f869dbbf621533034e02f3c91aad1ac063ab81daf081
 MISC metadata.xml 883 SHA256 986eab9050a01dd8146bf8d956c5e4b0298054d3f592135653bade4cf8a6eb19 SHA512 28cee7b7069341b298d9111a288f8c7bd60df69adfaaf7706811ae7cd9f3d2be13dec85adfd94d23dafa511fbff0ff699dcec917a5d251a999882d965e0ff61e WHIRLPOOL cd1dc3da64c57e9711cec0b741be2710b1c360a669cd76f3e800d3f7d394607a82f3daf8e370684f67b4aa8584d0b6971e5c1aa10111722308840932a715830e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlGp5bIACgkQCaWpQKGI+9TdNACfX4zMIMmPfA56Y2xwOu/kgsRa
-gZ8An2TyFeX2ezEbcjd77sNyrubDnctz
-=FPsp
+iF4EAREIAAYFAlGql+oACgkQXYk9GL8g3FExbgD9EJGBDobCSFxhCAKd8oMGe3d3
+2yyJOTfQqhz0pSJWJGsBAJZF5ivIZUP5CmeqxZzotHXerMPUHoIXsbnu9xzz8UQ3
+=IE6H
 -----END PGP SIGNATURE-----
diff --git a/dev-util/nsis/nsis-2.46-r1.ebuild b/dev-util/nsis/nsis-2.46-r1.ebuild
new file mode 100644
index 000000000000..e6de2670f63a
--- /dev/null
+++ b/dev-util/nsis/nsis-2.46-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/nsis-2.46-r1.ebuild,v 1.1 2013/06/02 00:55:01 alonbl Exp $
+
+EAPI="5"
+mingw32_variants=$(echo {,i{6,5,4,3}86-{,pc-,w32-,w64-}}mingw32)
+
+inherit eutils
+
+DESCRIPTION="Nullsoft Scriptable Install System"
+HOMEPAGE="http://nsis.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2
+	http://f0rt.users.sourceforge.net/makensis_64bit.patch
+	http://f0rt.users.sourceforge.net/nsis_w64-mingw.patch"
+
+LICENSE="ZLIB BZIP2 CPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="bzip2 config-log doc zlib"
+RESTRICT="strip"
+
+# NSIS Menu uses wxwindows but it's all broken, so disable for now
+#	wxwindows? ( x11-libs/wxGTK )
+RDEPEND="bzip2? ( app-arch/bzip2 )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	>=dev-util/scons-0.98"
+
+S="${WORKDIR}"/${P}-src
+
+mingw_CTARGET() {
+	local i
+	for i in ${mingw32_variants} ; do
+		type -P ${i}-g++ > /dev/null && echo ${i} && return
+	done
+}
+
+pkg_pretend() {
+	[[ -n $(mingw_CTARGET) ]] && return 0
+
+	eerror "Before you could emerge nsis, you need to install mingw"
+	eerror "Run the following commands:"
+	eerror "  emerge crossdev"
+	eerror "  USE='cxx -hardened' crossdev --stable --libc '[latest] -t i686-w64-mingw32"
+	die "mingw is needed"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc47.patch
+	epatch "${DISTDIR}/makensis_64bit.patch"
+	epatch "${DISTDIR}/nsis_w64-mingw.patch"
+
+	# a dirty but effective way of killing generated docs
+	use doc || echo > Docs/src/SConscript
+}
+
+get_additional_options() {
+	echo \
+		PREFIX=/usr \
+		PREFIX_CONF=/etc \
+		PREFIX_DOC=/usr/share/doc/${PF} \
+		PREFIX_DEST=\"${D}\" \
+		VERSION=${PV} \
+		DEBUG=no \
+		STRIP=no
+	echo \
+		SKIPSTUBS=\"$(use zlib || echo zlib) $(use bzip2 || echo bzip2)\" \
+		SKIPUTILS=\"NSIS Menu\"
+	use config-log && echo NSIS_CONFIG_LOG=yes
+
+	local tcpfx=$($(mingw_CTARGET)-gcc -print-file-name=libshell32.a)
+	tcpfx=${tcpfx%/lib/libshell32.a}
+	echo \
+		PREFIX_PLUGINAPI_INC=${tcpfx}/include \
+		PREFIX_PLUGINAPI_LIB=${tcpfx}/lib
+	echo CROSS_W32=$(mingw_CTARGET)-
+}
+
+do_scons() {
+	local cmd=$1
+	eval set -- $(get_additional_options)
+	echo scons $(get_additional_options) ${cmd}
+	scons "$@" ${cmd}
+}
+
+src_compile() {
+	do_scons || die "scons failed"
+}
+
+src_install() {
+	do_scons install || die "scons failed"
+	use doc || rm -rf "${D}"/usr/share/doc/${PF}/{Docs,Examples}
+
+	fperms -R go-w,a-x,a+X /usr/share/${PN}/ /usr/share/doc/${PF}/ /etc/nsisconf.nsh
+
+	env -uRESTRICT prepstrip "${D}/usr/bin"
+	src_strip_win32
+}
+
+src_strip_win32() {
+	# need to strip win32 binaries ourselves ... should fold this
+	# back in to prepstrip at some point
+	local STRIP_PROG=$(mingw_CTARGET)-strip
+	local STRIP_FLAGS="--strip-unneeded"
+
+	echo
+	echo "strip: ${STRIP_PROG} ${STRIP_FLAGS}"
+	local FILE
+	for FILE in $(find "${D}" -iregex '.*\.\(dll\|exe\|a\)$') ; do
+		echo "   /${FILE#${D}}"
+		${STRIP_PROG} ${STRIP_FLAGS} "${FILE}"
+	done
+}