Add USE=prebuilt-system to install the MSVC-compiled System.dll to workaround the System::Call issue with GCC.

Package-Manager: portage-2.2_pre5.spank.spunk

3 files changed, 19 insertions, 9 deletions

diff --git a/dev-util/nsis/ChangeLog b/dev-util/nsis/ChangeLog
index 545a1cf0c02c..281013dec192 100644
--- a/dev-util/nsis/ChangeLog
+++ b/dev-util/nsis/ChangeLog
@@ -1,6 +1,10 @@
 # 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.19 2008/06/03 00:49:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/ChangeLog,v 1.20 2008/06/05 16:23:48 vapier Exp $
+
+  05 Jun 2008; Mike Frysinger <vapier@gentoo.org> nsis-2.37.ebuild:
+  Add USE=prebuilt-system to install the MSVC-compiled System.dll to
+  workaround the System::Call issue with GCC.
 
 *nsis-2.37 (03 Jun 2008)
 
diff --git a/dev-util/nsis/Manifest b/dev-util/nsis/Manifest
index 127cf70140ea..a625c3ec1d28 100644
--- a/dev-util/nsis/Manifest
+++ b/dev-util/nsis/Manifest
@@ -6,17 +6,18 @@ DIST nsis-2.33-src.tar.bz2 1480437 RMD160 352737f514a8cef6bad3617687352cdc8ba344
 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.37-src.tar.bz2 1470086 RMD160 06cfcbf39e11889bae87fb634086a72349639cf8 SHA1 5bad6987de86b7a0e6c93a00e7dd572d6c85e7c7 SHA256 7d1238d543d304c2a74b0ff62e4178b895af161c6dcb7e3df9932379662ab6ed
+DIST nsis-2.37.zip 2270453 RMD160 9377b63b47d9b22c192626317d00160a8c6a86e6 SHA1 d4061ecd52452c913fc57be8ac69b109c7738cc8 SHA256 64c07e7b5da4f474a3d80ef35e62a03a69db6c2bd0215b4582e8eb562efae1d6
 EBUILD nsis-2.31.ebuild 2427 RMD160 e62d5a7522863d39d8c179ea0d058006bc5ac8a9 SHA1 1d98883633a534f1303e1a1ba256e04d99293acb SHA256 8217872254684bcf973d3bd288d674e616cd7f1ce833959dbf1d2135d8df1179
 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 2389 RMD160 ae2bad2f375201ed02d9849403fb16018556fdc7 SHA1 ee6e753f4d4be59144e0783c1d73571f3176c61b SHA256 80835f1ffadaa20cac431f6b183cbb42535ed4869fd1ac446733d670b25c70a7
-EBUILD nsis-2.37.ebuild 2389 RMD160 10c23a171ad27fd5638065ec30996db1e18a09d1 SHA1 97a5e62d770099f4d8f837bbde2010914cc8820b SHA256 7649e58514f8d49141488c3e0412a8c20bc08f4eb8fa75cf935444142933dae8
-MISC ChangeLog 3145 RMD160 75f471e0db88f366fe4617140586ae00b0d3f25c SHA1 ce2d5f534786ab303bc64b3ea8dbc6580c6c9179 SHA256 fbfaa159817338535b39ab9451e7a104f1093d422258675bf1497f1ff12d02fc
+EBUILD nsis-2.37.ebuild 2584 RMD160 2caaf7df0f6b1c17a9313749ea8341b4c5bcf800 SHA1 2f452b0c52daac215a83d038e96b8c19386ad89f SHA256 1f39dee65e11cfe876c88bf6e85699c1ecc09e11dc214df860de93d333a17aa0
+MISC ChangeLog 3329 RMD160 5ffe5bc76f3f03203725d9cca732e14fc14a4013 SHA1 61ee6232a03ec5c10fa8271faa4886b37fd0eb60 SHA256 963156725a5b6074b06a0d14979eab9e7ba590045f82ad8afc5b7cfcace613b2
 MISC metadata.xml 888 RMD160 463bc404bb8b97f2d45caa70242a93917e9c7546 SHA1 2e81672e52ba36ac17f9a49d7810099a78a561a4 SHA256 c4c22c4d20fef8ce0d8f6a73b5f694ea92dadc0b923b99b7d29833213cf9dd71
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFIRJU7j9hvisErhMIRAuFuAKDEBmvvzUwuMYns92SPtIMZ6sOlOgCgrW0/
-3bdVLfHkz3nbH/EmEpuErIc=
-=S4Lu
+iD8DBQFISBMZj9hvisErhMIRAtiHAJ9L1D0Drr4kI4J/ymHBFQpcl9kpAgCg7kFk
+66mY/zN3iyrckwgAfkxITlc=
+=lXZe
 -----END PGP SIGNATURE-----
diff --git a/dev-util/nsis/nsis-2.37.ebuild b/dev-util/nsis/nsis-2.37.ebuild
index 109a2e757ab8..977456880d37 100644
--- a/dev-util/nsis/nsis-2.37.ebuild
+++ b/dev-util/nsis/nsis-2.37.ebuild
@@ -1,17 +1,18 @@
 # 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.37.ebuild,v 1.1 2008/06/03 00:49:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/nsis-2.37.ebuild,v 1.2 2008/06/05 16:23:48 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"
+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 zlib"
+IUSE="bzip2 config-log prebuilt-system zlib"
 
 # NSIS Menu uses wxwindows but it's all broken, so disable for now
 #	wxwindows? ( x11-libs/wxGTK )
@@ -73,6 +74,10 @@ src_compile() {
 
 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