Version bump. Readd -m32 compiler flag on amd64.

Package-Manager: portage-2.1.2.12

6 files changed, 123 insertions, 103 deletions

diff --git a/dev-util/nsis/ChangeLog b/dev-util/nsis/ChangeLog
index 739d0dd5d5e9..3950d223dde7 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.12 2007/07/27 08:35:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/ChangeLog,v 1.13 2007/09/01 20:04:44 mrness Exp $
+
+*nsis-2.30 (01 Sep 2007)
+
+  01 Sep 2007; Alin Năstac <mrness@gentoo.org> -nsis-2.27.ebuild,
+  +nsis-2.30.ebuild:
+  Version bump. Readd -m32 compiler flag on amd64.
 
 *nsis-2.29 (27 Jul 2007)
 
diff --git a/dev-util/nsis/Manifest b/dev-util/nsis/Manifest
index eed609252315..e7dc0706147e 100644
--- a/dev-util/nsis/Manifest
+++ b/dev-util/nsis/Manifest
@@ -1,13 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST nsis-2.27-src.tar.bz2 1450223 RMD160 42eba66dc53e7dccda934e9e16a478e5b6fb6ad0 SHA1 1f899af4d1dc4969dc7c470c0d54765ea10c4c35 SHA256 22d1f981ba1da13c6c9fa722656668c6971f2efa858e81a16e4f9959ea54f5e8
 DIST nsis-2.28-src.tar.bz2 1445137 RMD160 c1188a3163da4c732ddd6577d36e9f3abfa5d63a SHA1 e3e5fdcd610e089b70a6d05fbb46bab0b342078f SHA256 256fcfdc1392488d8e5ec8415e1e8dff35195b5d3967507dcbf93b30fa23bc02
 DIST nsis-2.29-src.tar.bz2 1453149 RMD160 c17f5cc950790b0504a5c5e799e1eea658a70301 SHA1 4e89a572f701c8e44c887d156f0b84f779b3bac7 SHA256 b27c4db9b0ef064f1b9ae191fc209c84645560d5912ef3b9138392321c41d44d
-EBUILD nsis-2.27.ebuild 2372 RMD160 01df8db36ed0291cc6d78b4facf7c4702b91e702 SHA1 1a99cd7448898cd80e864aa19a2fd2851fe7b7c4 SHA256 8762eae7db8ce13752f47bba1c071cf568f1d68da49e1f502ab727b80a32e74f
-MD5 db5c27725cf075bcea35787ad981c5b0 nsis-2.27.ebuild 2372
-RMD160 01df8db36ed0291cc6d78b4facf7c4702b91e702 nsis-2.27.ebuild 2372
-SHA256 8762eae7db8ce13752f47bba1c071cf568f1d68da49e1f502ab727b80a32e74f nsis-2.27.ebuild 2372
+DIST nsis-2.30-src.tar.bz2 1465234 RMD160 0aac2c2c8b851c926269eb9bd63e9942f045db8b SHA1 3ee0f62182b5ed81dfc695081a1f88447e5df517 SHA256 9a225817f1ffc01e9a470d3bb49ee5c1ef1471e0142f888e1d3cdb051f9a142d
 EBUILD nsis-2.28.ebuild 2334 RMD160 10400afa8cccc62756f05a34729e7f3ceb59d508 SHA1 100897c6fe8cc6f4d8cdddc214eb0e411af353ec SHA256 1a163518665be319d9a075f672dfccaf2449baaf7f428afa01629e98013dda15
 MD5 359eba68c383cd125a378149c64aa968 nsis-2.28.ebuild 2334
 RMD160 10400afa8cccc62756f05a34729e7f3ceb59d508 nsis-2.28.ebuild 2334
@@ -16,27 +12,31 @@ EBUILD nsis-2.29.ebuild 2301 RMD160 e8bbaef579c55ba8ade5a5711159d39fa18d505c SHA
 MD5 4d3255b4bc7d3dc8c2d1dd6978a50fe0 nsis-2.29.ebuild 2301
 RMD160 e8bbaef579c55ba8ade5a5711159d39fa18d505c nsis-2.29.ebuild 2301
 SHA256 c0c6510af921720834e3d809c3a85fd3df378d5381a211a56bb2bc3d40526f88 nsis-2.29.ebuild 2301
-MISC ChangeLog 2130 RMD160 a172f737d2104a9a85f323abcfcd6b72968fc1cf SHA1 02581c8a2140f3c5f63bf792f8c888713eaa90ae SHA256 0255f78e5a96c0d0d0ca3ac688de452b743ef98f0083ddfb205ced12feee5bbf
-MD5 eba19fe43b7d810a1df48fe848189fba ChangeLog 2130
-RMD160 a172f737d2104a9a85f323abcfcd6b72968fc1cf ChangeLog 2130
-SHA256 0255f78e5a96c0d0d0ca3ac688de452b743ef98f0083ddfb205ced12feee5bbf ChangeLog 2130
+EBUILD nsis-2.30.ebuild 2428 RMD160 9902b6d524e52c9c33313474396f8bc08a30eb05 SHA1 36c9f853e50795cd19b8e3021f7d2e50909ea8cb SHA256 75025e560a55083b47e944b802f7e347d4918dafb3f6af658ce9a39f4b2342dc
+MD5 74e5e470b49646c80ca9b493050e9997 nsis-2.30.ebuild 2428
+RMD160 9902b6d524e52c9c33313474396f8bc08a30eb05 nsis-2.30.ebuild 2428
+SHA256 75025e560a55083b47e944b802f7e347d4918dafb3f6af658ce9a39f4b2342dc nsis-2.30.ebuild 2428
+MISC ChangeLog 2296 RMD160 75c4f02db10c699a3d2b09d69b7c130d298262af SHA1 0a2bc5aa947dd3c42654ba5bde2d814797b47204 SHA256 10cf03ac0e04655320b0ae9d7200d90dc955fb39599f9cd3fd3c36778d161b09
+MD5 142c6dc04c2fe7d9c7cb54c5c0376de2 ChangeLog 2296
+RMD160 75c4f02db10c699a3d2b09d69b7c130d298262af ChangeLog 2296
+SHA256 10cf03ac0e04655320b0ae9d7200d90dc955fb39599f9cd3fd3c36778d161b09 ChangeLog 2296
 MISC metadata.xml 888 RMD160 463bc404bb8b97f2d45caa70242a93917e9c7546 SHA1 2e81672e52ba36ac17f9a49d7810099a78a561a4 SHA256 c4c22c4d20fef8ce0d8f6a73b5f694ea92dadc0b923b99b7d29833213cf9dd71
 MD5 3709cdb21dea3e7547b580c7d2283afe metadata.xml 888
 RMD160 463bc404bb8b97f2d45caa70242a93917e9c7546 metadata.xml 888
 SHA256 c4c22c4d20fef8ce0d8f6a73b5f694ea92dadc0b923b99b7d29833213cf9dd71 metadata.xml 888
-MD5 51191db8f84bb403031fa9a9475757dc files/digest-nsis-2.27 247
-RMD160 9440f09763dda9107898c48fffef13918ba10771 files/digest-nsis-2.27 247
-SHA256 ad625ace7cdd46d3c5b300ecb555cf1a08f0313fbe0c9ff530791e43ecb407ee files/digest-nsis-2.27 247
 MD5 d7a9f2d1509b208f48347c3dd366a9f7 files/digest-nsis-2.28 247
 RMD160 026be1908756313e38538bbf21c5859f1e5443c1 files/digest-nsis-2.28 247
 SHA256 a5de5f776d5890cce48e1f08bf54374882e2bd23de96781ceb29d9f470c9eae4 files/digest-nsis-2.28 247
 MD5 55802e37cfe8f3aec100630a64254884 files/digest-nsis-2.29 247
 RMD160 8bea43048e42cfe190c43c0648d68abe2da4f440 files/digest-nsis-2.29 247
 SHA256 1ae1b5fd60f0b9146dda9cd1923a246de0807c1065248b45117c13b3de713a30 files/digest-nsis-2.29 247
+MD5 aee7b6d8bac0f28fd601b2f78f602874 files/digest-nsis-2.30 247
+RMD160 e18c5d579885917015e2b446336dd184a3416508 files/digest-nsis-2.30 247
+SHA256 915ce2e25d03d2a8e6330422da182bd901da923702259bb96c31303b8d020b25 files/digest-nsis-2.30 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
+Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFGquaop/wUKkr7RBoRAq5MAJ41tSfWGUC6JUDJULZO/+ovwBqCGgCfQmA8
-ofyXkboP/f2iZPnltXmQMAU=
-=Aja8
+iD8DBQFG2cXnVSA5X31g7/gRAoTdAJ99z0Z5W+trftD1CQfg9b4ig+QTrgCffAux
+WiH/RCivWd7r1PNbHHNYkok=
+=NxWh
 -----END PGP SIGNATURE-----
diff --git a/dev-util/nsis/files/digest-nsis-2.27 b/dev-util/nsis/files/digest-nsis-2.27
deleted file mode 100644
index 429a13bd24b1..000000000000
--- a/dev-util/nsis/files/digest-nsis-2.27
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a33b58b8f6f5b6bffe6af06e43d06c85 nsis-2.27-src.tar.bz2 1450223
-RMD160 42eba66dc53e7dccda934e9e16a478e5b6fb6ad0 nsis-2.27-src.tar.bz2 1450223
-SHA256 22d1f981ba1da13c6c9fa722656668c6971f2efa858e81a16e4f9959ea54f5e8 nsis-2.27-src.tar.bz2 1450223
diff --git a/dev-util/nsis/files/digest-nsis-2.30 b/dev-util/nsis/files/digest-nsis-2.30
new file mode 100644
index 000000000000..a20b86da1429
--- /dev/null
+++ b/dev-util/nsis/files/digest-nsis-2.30
@@ -0,0 +1,3 @@
+MD5 3dc0ff5b8cf52fc81309b60900d41090 nsis-2.30-src.tar.bz2 1465234
+RMD160 0aac2c2c8b851c926269eb9bd63e9942f045db8b nsis-2.30-src.tar.bz2 1465234
+SHA256 9a225817f1ffc01e9a470d3bb49ee5c1ef1471e0142f888e1d3cdb051f9a142d nsis-2.30-src.tar.bz2 1465234
diff --git a/dev-util/nsis/nsis-2.27.ebuild b/dev-util/nsis/nsis-2.27.ebuild
deleted file mode 100644
index 87b8c6d2cf6d..000000000000
--- a/dev-util/nsis/nsis-2.27.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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.27.ebuild,v 1.2 2007/05/29 13:29:02 mrness Exp $
-
-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 ~x86"
-IUSE="config-log"
-
-DEPEND=">=dev-util/scons-0.96.93"
-
-S="${WORKDIR}"/${P}-src
-
-pkg_setup() {
-	local mingw32_variants="mingw32 i686-mingw32 i586-mingw32 i486-mingw32 i386-mingw32"
-	local i
-	for i in ${mingw32_variants} ; do
-		type -p ${i}-gcc && return 0
-	done
-
-	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() {
-	local opts="VERSION=${PV} DEBUG=no STRIP=no"
-	if use config-log ; then
-		opts="${opts} NSIS_CONFIG_LOG=yes"
-	fi
-	if use amd64; then
-		# Some part of the code cannot be compiled on 64-bit arches
-		opts="${opts} APPEND_CCFLAGS=-m32 APPEND_LINKFLAGS=-m32"
-	fi
-
-	echo ${opts}
-}
-
-src_compile() {
-	# Try next version without SKIPUTILS
-	scons PREFIX=/usr PREFIX_CONF=/etc PREFIX_DOC="/usr/share/doc/${P}" PREFIX_DEST="${D}" \
-		SKIPPLUGINS=System SKIPUTILS="NSIS Menu" \
-		$(get_additional_options) || die "scons failed"
-}
-
-src_install() {
-	# Try next version without SKIPUTILS
-	scons PREFIX=/usr PREFIX_CONF=/etc PREFIX_DOC="/usr/share/doc/${P}" PREFIX_DEST="${D}" \
-		SKIPPLUGINS=System SKIPUTILS="NSIS Menu" \
-		$(get_additional_options) install || die "scons install failed"
-
-	fperms -R go-w,a-x,a+X /usr/share/${PN}/ /usr/share/doc/${P}/ /etc/nsisconf.nsh
-
-	# Always strip Windows binaries; no point in having Windows debug info
-	local mingw32_variants="mingw32 i686-mingw32 i586-mingw32 i486-mingw32 i386-mingw32"
-	local STRIP_PROG
-	local STRIP_FLAGS="--strip-unneeded"
-	for i in ${mingw32_variants} ; do
-		if type -p ${i}-strip ; then
-			STRIP_PROG=${i}-strip
-			break;
-		fi
-	done
-
-	echo
-	echo "strip: ${STRIP_PROG} ${STRIP_FLAGS}"
-
-	cd "${D}"
-	local FILE
-	for FILE in $(find -iregex '.*\.\(dll\|exe\)$' | sed 's:^\./::') ; do
-		echo "   ${FILE}"
-		${STRIP_PROG} ${STRIP_FLAGS} "${FILE}"
-	done
-}
diff --git a/dev-util/nsis/nsis-2.30.ebuild b/dev-util/nsis/nsis-2.30.ebuild
new file mode 100644
index 000000000000..30151b39046c
--- /dev/null
+++ b/dev-util/nsis/nsis-2.30.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.30.ebuild,v 1.1 2007/09/01 20:04:44 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
+}