Version bump and include ExDLL plugin.

Package-Manager: portage-2.2_rc55/cvs/Linux x86_64

3 files changed, 119 insertions, 12 deletions

diff --git a/dev-util/nsis/ChangeLog b/dev-util/nsis/ChangeLog
index 80ee8cac21f8..85e08ad23647 100644
--- a/dev-util/nsis/ChangeLog
+++ b/dev-util/nsis/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/nsis
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/ChangeLog,v 1.34 2009/11/03 00:15:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/ChangeLog,v 1.35 2009/12/17 12:30:56 vapier Exp $
+
+*nsis-2.46 (17 Dec 2009)
+
+  17 Dec 2009; Mike Frysinger <vapier@gentoo.org> +nsis-2.46.ebuild:
+  Version bump and include ExDLL plugin.
 
   03 Nov 2009; Mike Frysinger <vapier@gentoo.org> nsis-2.45.ebuild:
   Mark amd64 stable.
diff --git a/dev-util/nsis/Manifest b/dev-util/nsis/Manifest
index 60660661e207..a7e9b3cbbb38 100644
--- a/dev-util/nsis/Manifest
+++ b/dev-util/nsis/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST nsis-2.45-src.tar.bz2 1502316 RMD160 c5b1abdac37892b3f49455fa42d44c030dc451b7 SHA1 ce02adf68dbedc798615ffb212d27a9b03d5defb SHA256 e46c7fdce27df79d1a20eab56b68e293aa5f45f9329c43014a39ceac226fc8cd
+DIST nsis-2.46-src.tar.bz2 1499014 RMD160 df41017b871521ed115e4fbbe2902806ffd7d6ee SHA1 2cc9bff130031a0b1d76b01ec0a9136cdf5992ce SHA256 f5f9e5e22505e44b25aea14fe17871c1ed324c1f3cc7a753ef591f76c9e8a1ae
 EBUILD nsis-2.45.ebuild 2575 RMD160 ee32350b9a503161ec253d3e5184ed75764da9b9 SHA1 6ed47546439ac4b215bc36b8748c437eeab2851a SHA256 8fe8a07467fe5be63a6ab141aa5641f6a89ee2c77a379b21eaa33b8803c3cbb0
-MISC ChangeLog 4798 RMD160 9d94bcff20987801da785f7e84af6efee1b428ee SHA1 1813cb4c1d0c64858cdbb38d5716175bbbbdd3d8 SHA256 b54edc19d9647f67009cc0c8a177109c10bdb75d63bf7f04e97d57fdbaa1c36a
+EBUILD nsis-2.46.ebuild 2827 RMD160 82e89151da44d4d24456b8676a8286b32d9c335d SHA1 1e430fd9038d044d2c00e6e5aa217a87100ca6fa SHA256 9f249efedbf53531dacc3ce530b6c55d7a1296460490365e9c99698053c288e9
+MISC ChangeLog 4935 RMD160 d5d429691d51ae7a9cf6e3afbdaa665170b9d04a SHA1 afc03756d69b8050f2b01d8ca385f37653999d20 SHA256 453fff81f966ffbb97e7e230abada65d58fba866ccc5a13f63d5390b7b41b7f8
 MISC metadata.xml 1021 RMD160 c9b9397531d7746bd130b7e6bb8518856fbb0bf2 SHA1 963e2f0aa0460d34f11a340f9009737a038f850e SHA256 5e8a160781bf146a415ad63300f83c069121c6963913ac5efdcc8dc61e4483c4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
-
-iEYEARECAAYFAkrvdmUACgkQlPl3HsVfCDqT4QCffV1JMOHXT1ei7C0kBbeqnjsC
-7bgAnRdeUbTOIMWp5F9N1X13eD8xsE6G
-=muT0
------END PGP SIGNATURE-----
diff --git a/dev-util/nsis/nsis-2.46.ebuild b/dev-util/nsis/nsis-2.46.ebuild
new file mode 100644
index 000000000000..f5f378e7107f
--- /dev/null
+++ b/dev-util/nsis/nsis-2.46.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/nsis-2.46.ebuild,v 1.1 2009/12/17 12:30:56 vapier Exp $
+
+EAPI="2"
+mingw32_variants=$(echo {,i{6,5,4,3}86-{,pc-}}mingw32)
+
+DESCRIPTION="Nullsoft Scriptable Install System"
+HOMEPAGE="http://nsis.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
+
+LICENSE="as-is"
+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}-gcc > /dev/null && echo ${i} && return
+	done
+}
+
+pkg_setup() {
+	[[ -n $(mingw_CTARGET) ]] && return 0
+
+	local i
+	eerror "Before you could emerge nsis, you need to install mingw32."
+	eerror "Run the following command:"
+	eerror "  emerge crossdev"
+	eerror "then run _one_ of the following commands:"
+	for i in ${mingw32_variants} ; do
+		eerror "  crossdev ${i}"
+	done
+	die "mingw32 is needed"
+}
+
+src_prepare() {
+	# 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
+	# remove the following line when nsis bug 1753070 will be fixed
+	use amd64 && echo APPEND_CCFLAGS=-m32 APPEND_LINKFLAGS=-m32
+
+	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
+}
+
+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
+}