Search for all mingw32 variants. Force -m32 on amd64 (some code is broken on amd64). Version bump.

Package-Manager: portage-2.1.2.7

4 files changed, 103 insertions, 9 deletions

diff --git a/dev-util/nsis/ChangeLog b/dev-util/nsis/ChangeLog
index bc685cffc233..d1f9797c91d6 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.8 2007/04/18 21:18:26 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/ChangeLog,v 1.9 2007/05/25 11:04:13 mrness Exp $
+
+*nsis-2.27 (25 May 2007)
+
+  25 May 2007; Alin Năstac <mrness@gentoo.org> +nsis-2.27.ebuild:
+  Search for all mingw32 variants. Force -m32 on amd64 (some code is broken on
+  amd64). Version bump.
 
 *nsis-2.25 (18 Apr 2007)
 
diff --git a/dev-util/nsis/Manifest b/dev-util/nsis/Manifest
index 78fad972bdf5..30833329ed9b 100644
--- a/dev-util/nsis/Manifest
+++ b/dev-util/nsis/Manifest
@@ -7,6 +7,7 @@ RMD160 e62f584312f56e1690cc60d017da14328275f7f6 files/nsis-2.24-no-strict-aliasi
 SHA256 19b3f5b1fa1d695ef10b19efc7c208e053b169c17286a7080600856b9291cc60 files/nsis-2.24-no-strict-aliasing.patch 597
 DIST nsis-2.24-src.tar.bz2 1613342 RMD160 ed78f01dfaf4c1438e04311fa943302507ed74d9 SHA1 ec964bc7fcf00842febcf1d395a2a5bd7c1ad17c SHA256 46cafddcdb3a08fe60ff4976be568af17eb36b420547807acd295e09b42af040
 DIST nsis-2.25-src.tar.bz2 1358330 RMD160 a8d40348d14b095e3cd176bf62160cfb52b4940d SHA1 e39b839e0d1823324a9a997f06d83b6c7684c083 SHA256 0089357c39b0733cc2f2719cfcdfa86fb75ce5c53ee60cdce6883ed6bd52222e
+DIST nsis-2.27-src.tar.bz2 1450223 RMD160 42eba66dc53e7dccda934e9e16a478e5b6fb6ad0 SHA1 1f899af4d1dc4969dc7c470c0d54765ea10c4c35 SHA256 22d1f981ba1da13c6c9fa722656668c6971f2efa858e81a16e4f9959ea54f5e8
 EBUILD nsis-2.24.ebuild 1790 RMD160 f966d9ae3966902ab622c28fe4413714467c0ead SHA1 b032715ab96862ea4ab1e1a1ec814e35ce48b39e SHA256 3bedb12f78e5e9a720a4b37dc282d7f2444e9f6932318692f76b281cfebb7048
 MD5 6a832d223c5b1c2fe22f532a23863dc2 nsis-2.24.ebuild 1790
 RMD160 f966d9ae3966902ab622c28fe4413714467c0ead nsis-2.24.ebuild 1790
@@ -15,10 +16,14 @@ EBUILD nsis-2.25.ebuild 1638 RMD160 fddff303ab0e21886ddcb58bc84a486530b87d38 SHA
 MD5 c83febc2826722800341d2585975491b nsis-2.25.ebuild 1638
 RMD160 fddff303ab0e21886ddcb58bc84a486530b87d38 nsis-2.25.ebuild 1638
 SHA256 638a776528fc85f4fe3861ec925e6e31f73b90878607c4b5c32e58da473bede5 nsis-2.25.ebuild 1638
-MISC ChangeLog 1445 RMD160 023c94e5943ccc8407f7b74937e271f0f65012f7 SHA1 c86e89ea1a3f50271c6381385d42871443a87c97 SHA256 2131cab4cf4a4152822d2b166bb049f432adc409a518bd62441769a4d49f340e
-MD5 f52f9163737b17b1c6690cc64f6ceff1 ChangeLog 1445
-RMD160 023c94e5943ccc8407f7b74937e271f0f65012f7 ChangeLog 1445
-SHA256 2131cab4cf4a4152822d2b166bb049f432adc409a518bd62441769a4d49f340e ChangeLog 1445
+EBUILD nsis-2.27.ebuild 2270 RMD160 e9593266b8cfc6c7bd3de0f2ca2a4037affc13cf SHA1 43cb616f83fd1e23211401336ace9dc78cd9b005 SHA256 09a9974e9b7e8d80f1a86b7016f0697b4e9d76c77d61836b481acd8896ff0a64
+MD5 3437acff8037e8a9a2be4dbc3ec3ca79 nsis-2.27.ebuild 2270
+RMD160 e9593266b8cfc6c7bd3de0f2ca2a4037affc13cf nsis-2.27.ebuild 2270
+SHA256 09a9974e9b7e8d80f1a86b7016f0697b4e9d76c77d61836b481acd8896ff0a64 nsis-2.27.ebuild 2270
+MISC ChangeLog 1642 RMD160 fa620457282e025ea47dede52ff5d45e5776e0c7 SHA1 e74d8455eb8bc0838e3e4b95a46c8551c5f6ef04 SHA256 5568571c41cc8c0fc667fe0f9aad247be128f461e5374b39cd51b2b524514247
+MD5 2c3699d38c42952445ebc360ef90e236 ChangeLog 1642
+RMD160 fa620457282e025ea47dede52ff5d45e5776e0c7 ChangeLog 1642
+SHA256 5568571c41cc8c0fc667fe0f9aad247be128f461e5374b39cd51b2b524514247 ChangeLog 1642
 MISC metadata.xml 888 RMD160 463bc404bb8b97f2d45caa70242a93917e9c7546 SHA1 2e81672e52ba36ac17f9a49d7810099a78a561a4 SHA256 c4c22c4d20fef8ce0d8f6a73b5f694ea92dadc0b923b99b7d29833213cf9dd71
 MD5 3709cdb21dea3e7547b580c7d2283afe metadata.xml 888
 RMD160 463bc404bb8b97f2d45caa70242a93917e9c7546 metadata.xml 888
@@ -29,10 +34,13 @@ SHA256 393bef1399210212b1d7b162a9b5084398e527e0a98ff64bbb7bbd773b62a53b files/di
 MD5 730ab7aeb0f36344571ae59166e03a78 files/digest-nsis-2.25 247
 RMD160 195973011b68229195d5881f7d554c4a3cf85dff files/digest-nsis-2.25 247
 SHA256 5a5ea6e170f5fe585d2f054ebf081f588722b8ec23c42f09ffa206cd0bdebbd0 files/digest-nsis-2.25 247
+MD5 51191db8f84bb403031fa9a9475757dc files/digest-nsis-2.27 247
+RMD160 9440f09763dda9107898c48fffef13918ba10771 files/digest-nsis-2.27 247
+SHA256 ad625ace7cdd46d3c5b300ecb555cf1a08f0313fbe0c9ff530791e43ecb407ee files/digest-nsis-2.27 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGJosuJnxX6mF440QRAneHAJ9m4CclvCvKt5uLWXOSKUxa68CzOwCbBfKl
-jRpxgbSfiWBofIc2b2QnAR4=
-=hvUO
+iD8DBQFGVsK9JnxX6mF440QRApt+AKC88uN1j4YDfI1qZdy27rXEnT1BuACg8EGR
+JJGOVL1ziSH4rOJDCL2SdgM=
+=96mX
 -----END PGP SIGNATURE-----
diff --git a/dev-util/nsis/files/digest-nsis-2.27 b/dev-util/nsis/files/digest-nsis-2.27
new file mode 100644
index 000000000000..429a13bd24b1
--- /dev/null
+++ b/dev-util/nsis/files/digest-nsis-2.27
@@ -0,0 +1,3 @@
+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/nsis-2.27.ebuild b/dev-util/nsis/nsis-2.27.ebuild
new file mode 100644
index 000000000000..f9801938aa2a
--- /dev/null
+++ b/dev-util/nsis/nsis-2.27.ebuild
@@ -0,0 +1,77 @@
+# 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.1 2007/05/25 11:04:13 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=""
+
+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_arch_options() {
+	if use amd64; then
+		# Some part of the code cannot be compiled on 64-bit arches
+		echo APPEND_CCFLAGS=-m32 APPEND_LINKFLAGS=-m32
+	fi
+}
+
+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" VERSION=${PV} DEBUG=no STRIP=no \
+		$(get_arch_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" VERSION=${PV} DEBUG=no STRIP=no \
+		$(get_arch_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
+}