Version bump.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.2 x86_64
RepoMan-Options: --force

3 files changed, 114 insertions, 6 deletions

diff --git a/dev-util/nsis/ChangeLog b/dev-util/nsis/ChangeLog
index f6954de46f3d..41ac1664edea 100644
--- a/dev-util/nsis/ChangeLog
+++ b/dev-util/nsis/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/nsis
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/ChangeLog,v 1.22 2008/06/20 21:01:37 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/ChangeLog,v 1.23 2008/08/22 00:38:15 vapier Exp $
+
+*nsis-2.39 (22 Aug 2008)
+
+  22 Aug 2008; Mike Frysinger <vapier@gentoo.org> +nsis-2.39.ebuild:
+  Version bump.
 
   20 Jun 2008; Alin Năstac <mrness@gentoo.org> -nsis-2.31.ebuild,
   nsis-2.37.ebuild:
diff --git a/dev-util/nsis/Manifest b/dev-util/nsis/Manifest
index a9b5cfc5d86e..89a6c85b4666 100644
--- a/dev-util/nsis/Manifest
+++ b/dev-util/nsis/Manifest
@@ -2,21 +2,24 @@
 Hash: SHA1
 
 DIST nsis-2.33-src.tar.bz2 1480437 RMD160 352737f514a8cef6bad3617687352cdc8ba3449d SHA1 0c205a6abba466a849e5ead1f40cf153f99b06fb SHA256 18f6023e2b43c3402b306b81f615baf687ba2b710be1838c4d99732ff37ae32e
-DIST nsis-2.34-src.tar.bz2 1480868 RMD160 774b23cff063a917293e92a9208c70935e35bb56 SHA1 62cf6bbf4e86b201d5a2a947d308a1428d8f510b SHA256 95de9f479311532a0e5e933c67fa6c32eb63a4aae4b486aea9c7be49f8295d60
+DIST nsis-2.34-src.tar.bz2 980640 RMD160 02ee72481855693c1102a0b66f5a596217a8962a SHA1 0b709ea8184039aafe9890c1826de12092cd8686 SHA256 4207a128e5c8ce177514d6514daebc8dec166ce06b78eae8349171fdf980c4b4
 DIST nsis-2.36-src.tar.bz2 1492683 RMD160 382023a47be091c3cb17c53bcdf4fb049fd02969 SHA1 adc93f971c9ab2be5385506d0e67b416e10c49e3 SHA256 24e6ce80cd2b03807fec55da27d507992ad6c56fd9ca217e1b62a8b86087d4c5
 DIST nsis-2.36.zip 2266372 RMD160 3af90337e8e2235d14be6b56aa5715be04775c9e SHA1 80d428d23a5baf58b995da65d68fbd760e87fc0b SHA256 c7c93d301436639b2e2ea5865595e570384b61ea81579d46401f608f43a02966
 DIST nsis-2.37-src.tar.bz2 1470086 RMD160 06cfcbf39e11889bae87fb634086a72349639cf8 SHA1 5bad6987de86b7a0e6c93a00e7dd572d6c85e7c7 SHA256 7d1238d543d304c2a74b0ff62e4178b895af161c6dcb7e3df9932379662ab6ed
 DIST nsis-2.37.zip 2270453 RMD160 9377b63b47d9b22c192626317d00160a8c6a86e6 SHA1 d4061ecd52452c913fc57be8ac69b109c7738cc8 SHA256 64c07e7b5da4f474a3d80ef35e62a03a69db6c2bd0215b4582e8eb562efae1d6
+DIST nsis-2.39-src.tar.bz2 1474305 RMD160 0aac0bd3ca2a676d6fe95fe34c7ffe68e4ff7c47 SHA1 325b43edf1bc7fb6f291797fbadaed1ae7150023 SHA256 d0d69e8781c7eb16f4fd1195e4650c4aeff70e8138f2536d9fe0d8635a61c096
+DIST nsis-2.39.zip 2277754 RMD160 6862d3f71cf4268c2d5b89d7285146cae4e29fb4 SHA1 1bd494adf19a02e3f3386dbbebc47fff80f3d72c SHA256 4b46060d6fbe2b6d6ab6eb9c79d327439fe89ac288969c18a428250c9b377391
 EBUILD nsis-2.33.ebuild 2427 RMD160 ff3c5b91b12a0f762b16f4d4ee52da371afbebb7 SHA1 5c4ef23d1016d9c244c3ef3b4e2ec0c0908db4e1 SHA256 33b9fd502a8dec7f8be3465f80dcb850193140d2784f0e6e0722bbddcbaa96e1
 EBUILD nsis-2.34.ebuild 2389 RMD160 f46d73d09a3915301de6cc8dbbc26dc7dbe57a0d SHA1 75f12176cf8c003ebf011fcb476fa9aff34cd09d SHA256 bb04da546daa356596e29bf81b9cbb987542692454e22d8d12a6ac5c9ba6edc1
 EBUILD nsis-2.36.ebuild 2584 RMD160 d69894de46af6503a65171fba767f11c1e07f4fe SHA1 169e6b48bb84113ecc73a18a660bd872f301dc51 SHA256 1f41ee5d21ff3ea2da8107090baf49ed6cfbb8405f9b309dea6b447a4a20fce5
 EBUILD nsis-2.37.ebuild 2581 RMD160 979e7213f1e0cff122bb7c4f013939d5b954f74d SHA1 1c2a7833fccbd7fc9db77cbd45d906ef79de234e SHA256 67c83a1ec7da8ba2a8137e9846dea530f574a20f70ec74463680f43442797bb5
-MISC ChangeLog 3496 RMD160 f478f61dd6bed1efc2c83f156fd86f990173cdab SHA1 4ee35da2c4a58ac295ea9143649b8632a511da69 SHA256 634006a1f9a102bda40a62a7f4850952d5461a1dc6fdbbe668378286614f16bd
+EBUILD nsis-2.39.ebuild 2581 RMD160 c83172b33dd6f9a6448a44292ac422f773852397 SHA1 3727b84577efaf790cc161b68c95bf1fa6ba93ae SHA256 173cc7273cd2ac66f28de5203d9214ab6da1a9d3ea9f24a40581daccb4145400
+MISC ChangeLog 3608 RMD160 ef9fb33b50f2a75ef7c1697c5e15f1672edadb9d SHA1 96f8978b0e977ee22e73dba1cf0463bae0d203fe SHA256 959382e0c7f86437522f597f2a75c1511a7f4982174d0986f48260a8ca236040
 MISC metadata.xml 888 RMD160 463bc404bb8b97f2d45caa70242a93917e9c7546 SHA1 2e81672e52ba36ac17f9a49d7810099a78a561a4 SHA256 c4c22c4d20fef8ce0d8f6a73b5f694ea92dadc0b923b99b7d29833213cf9dd71
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiAItsACgkQPrHvTlXvhts+aACdFWhMDx57KXBng8N9en+nKqZR
-J30AoJ7a8Y3kG8DN08ButrIxIHhDDCFu
-=KBC9
+iEYEARECAAYFAkiuCn8ACgkQ67wieSYcaxda0wCg0G9HugnJb4G6t0RvLwluOkqJ
+MisAn3b1q8jEmI9m+d82hVPfR2J9x0/H
+=m2PA
 -----END PGP SIGNATURE-----
diff --git a/dev-util/nsis/nsis-2.39.ebuild b/dev-util/nsis/nsis-2.39.ebuild
new file mode 100644
index 000000000000..deafdaab6797
--- /dev/null
+++ b/dev-util/nsis/nsis-2.39.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/nsis-2.39.ebuild,v 1.1 2008/08/22 00:38:15 vapier Exp $
+
+mingw32_variants=$(eval echo {,i{6,5,4,3}86-}mingw32)
+
+DESCRIPTION="Nullsoft Scriptable Install System"
+HOMEPAGE="http://nsis.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2
+	prebuilt-system? ( mirror://sourceforge/${PN}/${P}.zip )"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="bzip2 config-log prebuilt-system zlib"
+
+# 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"
+}
+
+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
+}
+
+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"
+	if use prebuilt-system ; then
+		insinto /usr/share/nsis/Plugins
+		doins "${WORKDIR}"/${P}/Plugins/System.dll || die
+	fi
+
+	fperms -R go-w,a-x,a+X /usr/share/${PN}/ /usr/share/doc/${PF}/ /etc/nsisconf.nsh
+
+	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\)$') ; do
+		echo "   ${FILE#${D}}"
+		${STRIP_PROG} ${STRIP_FLAGS} "${FILE}"
+	done
+}