Stable on x86. Version bump.

(Portage version: 2.1.3.19)

4 files changed, 109 insertions, 3 deletions

diff --git a/dev-util/nsis/ChangeLog b/dev-util/nsis/ChangeLog
index edb7e02854f3..8da00d3fb124 100644
--- a/dev-util/nsis/ChangeLog
+++ b/dev-util/nsis/ChangeLog
@@ -1,6 +1,12 @@
 # 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.14 2007/10/22 22:34:09 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/ChangeLog,v 1.15 2007/12/04 14:06:13 mrness Exp $
+
+*nsis-2.33 (04 Dec 2007)
+
+  04 Dec 2007; Alin Năstac <mrness@gentoo.org> nsis-2.31.ebuild,
+  +nsis-2.33.ebuild:
+  Stable on x86. Version bump.
 
 *nsis-2.31 (22 Oct 2007)
 
diff --git a/dev-util/nsis/files/digest-nsis-2.33 b/dev-util/nsis/files/digest-nsis-2.33
new file mode 100644
index 000000000000..737d06398ba8
--- /dev/null
+++ b/dev-util/nsis/files/digest-nsis-2.33
@@ -0,0 +1,3 @@
+MD5 119f93e5afe6d4da9e5c82b755320d44 nsis-2.33-src.tar.bz2 1480437
+RMD160 352737f514a8cef6bad3617687352cdc8ba3449d nsis-2.33-src.tar.bz2 1480437
+SHA256 18f6023e2b43c3402b306b81f615baf687ba2b710be1838c4d99732ff37ae32e nsis-2.33-src.tar.bz2 1480437
diff --git a/dev-util/nsis/nsis-2.31.ebuild b/dev-util/nsis/nsis-2.31.ebuild
index 8b4080149f24..9e6cbde038aa 100644
--- a/dev-util/nsis/nsis-2.31.ebuild
+++ b/dev-util/nsis/nsis-2.31.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.31.ebuild,v 1.1 2007/10/22 22:34:09 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/nsis-2.31.ebuild,v 1.2 2007/12/04 14:06:13 mrness Exp $
 
 mingw32_variants=$(eval echo {,i{6,5,4,3}86-}mingw32)
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="bzip2 config-log zlib"
 
 # NSIS Menu uses wxwindows but it's all broken, so disable for now
diff --git a/dev-util/nsis/nsis-2.33.ebuild b/dev-util/nsis/nsis-2.33.ebuild
new file mode 100644
index 000000000000..1039db8cdddc
--- /dev/null
+++ b/dev-util/nsis/nsis-2.33.ebuild
@@ -0,0 +1,97 @@
+# 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.33.ebuild,v 1.1 2007/12/04 14:06:13 mrness 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"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="bzip2 config-log 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.96.93"
+
+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)\" \
+		SKIPPLUGINS=\"\" \
+		SKIPUTILS=\"NSIS Menu\" \
+		SKIPMISC=\"\"
+	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"
+
+	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
+}