dev-util/nsis: version bump

Package-Manager: portage-2.2.28

3 files changed, 152 insertions, 0 deletions

diff --git a/dev-util/nsis/Manifest b/dev-util/nsis/Manifest
index 57990bd10ce4..1124df9c958a 100644
--- a/dev-util/nsis/Manifest
+++ b/dev-util/nsis/Manifest
@@ -1,3 +1,5 @@
 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-2.51-64bit.patch.gz 9376 SHA256 8b82fc9a35c7072fafa416ea4d0a8842c69d343500b7ca4bfe207d7b396c0643 SHA512 3be1a1a6422da219e8abfe5eb177ea818d86dfe6d5cb04a0be3dd80f31866cd95b67b765c6d5976355f363c411b4c88f30fd4eace67addb0f27dfe1a73ba45ac WHIRLPOOL bb1dc183bbef6596409b7765b721811526c2acb61bcc67c25bbccc1922ad45d365d1daea6c7474f3c98fb63c69bf3d54808a6abe0c71702cbfd178bb7bfea11f
+DIST nsis-2.51-src.tar.bz2 1540555 SHA256 43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 SHA512 3019040d84b1afdf398327bbd55cc2ae66336deea200b6506f1d474359056713fbcf51e8a06f32fece81313da35376cd3916341f2cabfa12cefa92f91ecf6f08 WHIRLPOOL 1fad4225791d30ed9f89082aa1ce6eb85e96279c85c6f91859e2cb36b67c2cfaf09ceada57fca41e25489dc5087c3efadb2a10582fdcba73614557356a3474b0
 DIST nsis_w64-mingw.patch 10378 SHA256 e3fe5f5675ac3562ae67283914f5ecf83f313e9127a406477f04c2aeafd945d5 SHA512 b8f0f7151a53335a5b3bf49ef2a16d805642c43a238afd424541be7d64a1a543ded28479ff503da84591b358f5f71728a815b704a083b94997cfbd5246b6f2b6 WHIRLPOOL a14e5168550974947d4da50747b7dd9893117c0b6dc981bdcd8c0fa053ead8d5a61c8317e18bf9f81a10c2b2efa398c3d40a3da011cc3c3dacef241f5aaa622c
diff --git a/dev-util/nsis/files/nsis-2.51-build.patch b/dev-util/nsis/files/nsis-2.51-build.patch
new file mode 100644
index 000000000000..56310354a6a3
--- /dev/null
+++ b/dev-util/nsis/files/nsis-2.51-build.patch
@@ -0,0 +1,39 @@
+From 00a8296688a04ff9414fcaa42429a8bb531cc85b Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sun, 12 Jun 2016 03:46:40 +0300
+Subject: [PATCH 1/2] build: minor fixups for recent scons and gcc
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ SCons/Config/gnu | 2 +-
+ Source/util.h    | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/SCons/Config/gnu b/SCons/Config/gnu
+index 051b425..462105e 100755
+--- a/SCons/Config/gnu
++++ b/SCons/Config/gnu
+@@ -31,7 +31,7 @@ defenv['ALIGN_FLAG'] = '-Wl,--file-alignment,512'
+ defenv['CPP_REQUIRES_STDLIB'] = 1
+ defenv['SUBSYS_CON'] = '-Wl,--subsystem,console'
+ defenv['MSVCRT_FLAG'] = ''
+-defenv['STDCALL'] = '__attribute__((__stdcall__))'
++defenv['STDCALL'] = '"__attribute__((__stdcall__))"'
+ 
+ ### defines
+ 
+diff --git a/Source/util.h b/Source/util.h
+index 8a55302..07de256 100755
+--- a/Source/util.h
++++ b/Source/util.h
+@@ -23,6 +23,7 @@
+ #include "ResourceEditor.h"
+ 
+ #ifndef _WIN32
++#  include <unistd.h>
+ #  include <iconv.h>
+ #  include <stdio.h>
+ #endif
+-- 
+2.7.3
+
diff --git a/dev-util/nsis/nsis-2.51.ebuild b/dev-util/nsis/nsis-2.51.ebuild
new file mode 100644
index 000000000000..dcfc848ac71c
--- /dev/null
+++ b/dev-util/nsis/nsis-2.51.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+	mirror://gentoo/nsis-2.51-64bit.patch.gz"
+
+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 with C++ support"
+	eerror "Run the following commands:"
+	eerror "  emerge crossdev"
+	eerror "  USE='cxx' crossdev --stable --libc '[latest]' -t i686-w64-mingw32"
+	die "mingw is needed"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-build.patch"
+	epatch "${WORKDIR}/${P}-64bit.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
+}