Stable on x86. Version bump.

Package-Manager: portage-2.1.3.19

5 files changed, 128 insertions, 14 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/Manifest b/dev-util/nsis/Manifest
index 6559d3b19bf5..a98ec7b0a54a 100644
--- a/dev-util/nsis/Manifest
+++ b/dev-util/nsis/Manifest
@@ -3,18 +3,23 @@ Hash: SHA1
 
 DIST nsis-2.30-src.tar.bz2 1465234 RMD160 0aac2c2c8b851c926269eb9bd63e9942f045db8b SHA1 3ee0f62182b5ed81dfc695081a1f88447e5df517 SHA256 9a225817f1ffc01e9a470d3bb49ee5c1ef1471e0142f888e1d3cdb051f9a142d
 DIST nsis-2.31-src.tar.bz2 1464687 RMD160 36784fefd32a3491e2dfd307563d86a289dead9a SHA1 ca0fee9c6fd37de9b49473f9c56115e4b580ef80 SHA256 ebe74f550f62a33c5ddc574d689b6f1ed76f1ab7189623ce1f4b33d2b74190a9
+DIST nsis-2.33-src.tar.bz2 1480437 RMD160 352737f514a8cef6bad3617687352cdc8ba3449d SHA1 0c205a6abba466a849e5ead1f40cf153f99b06fb SHA256 18f6023e2b43c3402b306b81f615baf687ba2b710be1838c4d99732ff37ae32e
 EBUILD nsis-2.30.ebuild 2427 RMD160 cd90a47ec4e2f23aa529c30297ac89382eaae49e SHA1 539ba0644ac4c20e344450db1c94aa90eb3adafe SHA256 72c75d363c0d4d7e4be912d323721fa32c98719aba5dd9ddf78bbe6ad3272a79
 MD5 849e0a474179180244bab1de08d87964 nsis-2.30.ebuild 2427
 RMD160 cd90a47ec4e2f23aa529c30297ac89382eaae49e nsis-2.30.ebuild 2427
 SHA256 72c75d363c0d4d7e4be912d323721fa32c98719aba5dd9ddf78bbe6ad3272a79 nsis-2.30.ebuild 2427
-EBUILD nsis-2.31.ebuild 2428 RMD160 61e8ca9d84a7cffb8683928208ff728649965712 SHA1 ef6797cdb12013541dc2bd9a56cab1eab1803050 SHA256 fc7f0d7025e77f1b12ed872d94d6db629c1d6cac54d0e323371d73bb22788865
-MD5 ad3ae02d52f2a13acde7ede9a5342467 nsis-2.31.ebuild 2428
-RMD160 61e8ca9d84a7cffb8683928208ff728649965712 nsis-2.31.ebuild 2428
-SHA256 fc7f0d7025e77f1b12ed872d94d6db629c1d6cac54d0e323371d73bb22788865 nsis-2.31.ebuild 2428
-MISC ChangeLog 2505 RMD160 461605771cd434d991035cba9b80ab69890c4954 SHA1 8d46c8a947dcee858c1ce738fd9391e7183171e5 SHA256 ad953f158f78afd0cdb42b7ed00a312035b61fd1b3b38eaa31ae444804ac24a7
-MD5 fdf313d5fff93e33c425d4a7c76ac9bc ChangeLog 2505
-RMD160 461605771cd434d991035cba9b80ab69890c4954 ChangeLog 2505
-SHA256 ad953f158f78afd0cdb42b7ed00a312035b61fd1b3b38eaa31ae444804ac24a7 ChangeLog 2505
+EBUILD nsis-2.31.ebuild 2427 RMD160 e62d5a7522863d39d8c179ea0d058006bc5ac8a9 SHA1 1d98883633a534f1303e1a1ba256e04d99293acb SHA256 8217872254684bcf973d3bd288d674e616cd7f1ce833959dbf1d2135d8df1179
+MD5 acb433f4871ab7a8507910b18e31fd3c nsis-2.31.ebuild 2427
+RMD160 e62d5a7522863d39d8c179ea0d058006bc5ac8a9 nsis-2.31.ebuild 2427
+SHA256 8217872254684bcf973d3bd288d674e616cd7f1ce833959dbf1d2135d8df1179 nsis-2.31.ebuild 2427
+EBUILD nsis-2.33.ebuild 2428 RMD160 4dbc02a793b2bb55d14f5f90baed37dd3431b040 SHA1 1f99f2a9bc0f72ab1124f3194ead9dd085bf224d SHA256 d89269acbe0691f81c64f3ce16364f852a54ed5798f5b7d8f654a3e251270926
+MD5 c5c99535220aa06c6142f39a858f7c84 nsis-2.33.ebuild 2428
+RMD160 4dbc02a793b2bb55d14f5f90baed37dd3431b040 nsis-2.33.ebuild 2428
+SHA256 d89269acbe0691f81c64f3ce16364f852a54ed5798f5b7d8f654a3e251270926 nsis-2.33.ebuild 2428
+MISC ChangeLog 2650 RMD160 ced8a2dbc591e819dfc4f54a7787f9a3438f2e79 SHA1 b0321b1c34967b39670f820fb724c95f49826169 SHA256 5957a2ca328ff58b3bd3cb5a207fe7da04eb649c6e1f04fd516a9da238aef960
+MD5 51e811cc2877faa9df634fc6ec0c3b8c ChangeLog 2650
+RMD160 ced8a2dbc591e819dfc4f54a7787f9a3438f2e79 ChangeLog 2650
+SHA256 5957a2ca328ff58b3bd3cb5a207fe7da04eb649c6e1f04fd516a9da238aef960 ChangeLog 2650
 MISC metadata.xml 888 RMD160 463bc404bb8b97f2d45caa70242a93917e9c7546 SHA1 2e81672e52ba36ac17f9a49d7810099a78a561a4 SHA256 c4c22c4d20fef8ce0d8f6a73b5f694ea92dadc0b923b99b7d29833213cf9dd71
 MD5 3709cdb21dea3e7547b580c7d2283afe metadata.xml 888
 RMD160 463bc404bb8b97f2d45caa70242a93917e9c7546 metadata.xml 888
@@ -25,10 +30,13 @@ SHA256 915ce2e25d03d2a8e6330422da182bd901da923702259bb96c31303b8d020b25 files/di
 MD5 d7c3723054d56ede98b93d40cb12d7e7 files/digest-nsis-2.31 247
 RMD160 83b6540ff738f0c5f72edda1958022f129547a05 files/digest-nsis-2.31 247
 SHA256 43ee66d72b578ec8a833d5018658ba95ab2bac3d56ce5566674bded9981f090d files/digest-nsis-2.31 247
+MD5 5a8ee2784e54c1973cdf2de7caeda348 files/digest-nsis-2.33 247
+RMD160 72fa537bbcb1bd1441a37e584ce6a521db765316 files/digest-nsis-2.33 247
+SHA256 588f03abc196d350ca1de1c40c0587b53d70a35e7fc0b45e89174af6c49a7167 files/digest-nsis-2.33 247
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHHSVoVSA5X31g7/gRAm9+AJ9nvuyN3dcNJdpIlxVHxSdx9nSJlwCfQUW1
-lFREUXI/gD/Qwe0WJKqqk5I=
-=JycM
+iD8DBQFHVV7gVSA5X31g7/gRAl4uAJ9D5f57tPvuBx8ivttPFpWlKew/HQCgomPz
+vbEkCWyjJgtjs5lYsXjyErI=
+=SeAR
 -----END PGP SIGNATURE-----
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
+}