Remove obsolete versions. Version bump. Strip Windows binaries.

Package-Manager: portage-2.1.2.2

diff --git a/dev-util/nsis/ChangeLog b/dev-util/nsis/ChangeLog
index cb4c9da9f8ac93a90f5eec8c395ab0ccfb0cc0a7..cdaaa4b14bb74ac1d45ffc73915299bf9789ce79 100644 (file)
--- a/dev-util/nsis/ChangeLog
+++ b/dev-util/nsis/ChangeLog
@@ -1,6 +1,14 @@
 # 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.6 2007/01/27 12:54:47 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/ChangeLog,v 1.7 2007/03/11 09:59:23 mrness Exp $
+
+*nsis-2.24 (11 Mar 2007)
+
+  11 Mar 2007; Alin Năstac <mrness@gentoo.org>
+  -files/nsis-2.21-config.patch, -files/nsis-2.22-config.patch,
+  +files/nsis-2.24-no-strict-aliasing.patch, -nsis-2.21.ebuild,
+  -nsis-2.22.ebuild, +nsis-2.24.ebuild:
+  Remove obsolete versions. Version bump. Strip Windows binaries.
 
   27 Jan 2007; Alin Năstac <mrness@gentoo.org>
   +files/nsis-2.23-32bit.patch, nsis-2.23.ebuild:

diff --git a/dev-util/nsis/Manifest b/dev-util/nsis/Manifest
index d06041246ea3a6a566e3aeec5bc9ef310033be1c..11616669ea30357835be034c6713ea9948788676 100644 (file)
--- a/dev-util/nsis/Manifest
+++ b/dev-util/nsis/Manifest
@@ -1,14 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX nsis-2.21-config.patch 1194 RMD160 d8566d14a2140975d77cbff45efb514ca181c594 SHA1 1c57deb4595697f1a38f5b799770b052083f717d SHA256 1e72da5db091e0462ba14f1e0d69f403ceb95b349624857d9f9d6c9081e56521
-MD5 e3844fa0dd6bd911158131aeafb3ac99 files/nsis-2.21-config.patch 1194
-RMD160 d8566d14a2140975d77cbff45efb514ca181c594 files/nsis-2.21-config.patch 1194
-SHA256 1e72da5db091e0462ba14f1e0d69f403ceb95b349624857d9f9d6c9081e56521 files/nsis-2.21-config.patch 1194
-AUX nsis-2.22-config.patch 1749 RMD160 1afa9858dba01668a958461a9b3f017e4d2216a1 SHA1 215c11452392d6b13de3117bbe5daabf0048b75a SHA256 dfec0ee7f328f61acd7c6094510314366b21b0235ae5b2ac8904e828c3d6a0b5
-MD5 6917b9853885b8ebc78455f77e61a430 files/nsis-2.22-config.patch 1749
-RMD160 1afa9858dba01668a958461a9b3f017e4d2216a1 files/nsis-2.22-config.patch 1749
-SHA256 dfec0ee7f328f61acd7c6094510314366b21b0235ae5b2ac8904e828c3d6a0b5 files/nsis-2.22-config.patch 1749
 AUX nsis-2.23-32bit.patch 447 RMD160 708a412d6c9ef83ab329d89d8135eeca05b3eedd SHA1 38794d2d06839f968128508e89cc3e3367d14ea2 SHA256 b2ed9278f37a8bfff7823c5ee5cd69e41ed05090077f258a3f5a7e908be1e481
 MD5 9dd6af6049b23aa353dbb458bd5b3ab0 files/nsis-2.23-32bit.patch 447
 RMD160 708a412d6c9ef83ab329d89d8135eeca05b3eedd files/nsis-2.23-32bit.patch 447
@@ -17,42 +9,38 @@ AUX nsis-2.23-config.patch 1478 RMD160 d4b90c3b41afef9bfc241e945a320d62b548dd42
 MD5 d801ddd4bbefa4cf4654308ba9758c2a files/nsis-2.23-config.patch 1478
 RMD160 d4b90c3b41afef9bfc241e945a320d62b548dd42 files/nsis-2.23-config.patch 1478
 SHA256 0f5474cf400cd8b335e2273c7239059d2f246f7ec02273dc277bfb9698d4f408 files/nsis-2.23-config.patch 1478
-DIST nsis-2.21-src.tar.bz2 1599766 RMD160 99367f3551651eea6c73cd25c938355b9f7e5261 SHA1 ade7a2be95d1d217baa0a22388fc99df5bc6175a SHA256 db8a814c9ffa1723f797751fa145e45106421ad846c654db45cb30dabbfd76a3
-DIST nsis-2.22-src.tar.bz2 1603505 RMD160 6c7294d1c5b1ccb6922ba345e5e47e74741fcf44 SHA1 5ef9f6694fd29cf3d1f4148e78451fc8228892db SHA256 4df89ea7d3d5055b0a1ffedb79ad8e2bec04a58f5174da4c86f9ef5a6bc620dc
+AUX nsis-2.24-no-strict-aliasing.patch 597 RMD160 e62f584312f56e1690cc60d017da14328275f7f6 SHA1 95d7efb5493d3808d194beac0e2b878e8a6ca5e7 SHA256 19b3f5b1fa1d695ef10b19efc7c208e053b169c17286a7080600856b9291cc60
+MD5 cbe619c1aa439f43404630455796e654 files/nsis-2.24-no-strict-aliasing.patch 597
+RMD160 e62f584312f56e1690cc60d017da14328275f7f6 files/nsis-2.24-no-strict-aliasing.patch 597
+SHA256 19b3f5b1fa1d695ef10b19efc7c208e053b169c17286a7080600856b9291cc60 files/nsis-2.24-no-strict-aliasing.patch 597
 DIST nsis-2.23-src.tar.bz2 1604427 RMD160 a80fd5b8e5984e8a0f3acbd8717e4c363d20fe19 SHA1 bb5da7eb6fb1dcbb2ad992914e4d94700c461d91 SHA256 cf76014e34c54b5c3797ba36747f735cd2d95052a9e04960233d3233e6ad6bdf
-EBUILD nsis-2.21.ebuild 1112 RMD160 0c2c8c0b49f95b9fb81c0d762c06809257095e36 SHA1 405dbf270d873f74743d421d948b67ab6d1bf0ad SHA256 01121fb79401ccff7afe7921de0e868671d2182566e69480c3d794c352b30c9e
-MD5 0328999caed9b1d937323a7c33b6bc9e nsis-2.21.ebuild 1112
-RMD160 0c2c8c0b49f95b9fb81c0d762c06809257095e36 nsis-2.21.ebuild 1112
-SHA256 01121fb79401ccff7afe7921de0e868671d2182566e69480c3d794c352b30c9e nsis-2.21.ebuild 1112
-EBUILD nsis-2.22.ebuild 1110 RMD160 113bdac4dd6e6fac7d5160f17a49ed41bc587821 SHA1 85aea01f5fb34d302870c45e81738f2a15905fce SHA256 31562e2fb25c7366e44fb9b174749bfe0fcfb7167c394119317cfcc6208f33aa
-MD5 d97983011e5d89aa396395643053c5c8 nsis-2.22.ebuild 1110
-RMD160 113bdac4dd6e6fac7d5160f17a49ed41bc587821 nsis-2.22.ebuild 1110
-SHA256 31562e2fb25c7366e44fb9b174749bfe0fcfb7167c394119317cfcc6208f33aa nsis-2.22.ebuild 1110
+DIST nsis-2.24-src.tar.bz2 1613342 RMD160 ed78f01dfaf4c1438e04311fa943302507ed74d9 SHA1 ec964bc7fcf00842febcf1d395a2a5bd7c1ad17c SHA256 46cafddcdb3a08fe60ff4976be568af17eb36b420547807acd295e09b42af040
 EBUILD nsis-2.23.ebuild 1364 RMD160 398499c1b95b308ec857c12717270af4df8eac2c SHA1 aecffbb16420fe743de12a3a4dc374272c787b84 SHA256 72bfcea97f9e9c3ab18bb628cc4cc1d6c30b820453840ec1eb2f45a3731348d8
 MD5 571faef59ed60699836e06be9259a79b nsis-2.23.ebuild 1364
 RMD160 398499c1b95b308ec857c12717270af4df8eac2c nsis-2.23.ebuild 1364
 SHA256 72bfcea97f9e9c3ab18bb628cc4cc1d6c30b820453840ec1eb2f45a3731348d8 nsis-2.23.ebuild 1364
-MISC ChangeLog 922 RMD160 1a9618190217e65b7e0969f8abecfc0f8c0cd0fb SHA1 6f6242e95922e34fd8d1ffa1e36dd2e1ecd904bb SHA256 318111cdbaa8b9b9702584f237d9c40e9c7da0f4481e2584f98a618f7dbe4962
-MD5 5c5d209e04d1b8c6bdad2ff814cc1ee8 ChangeLog 922
-RMD160 1a9618190217e65b7e0969f8abecfc0f8c0cd0fb ChangeLog 922
-SHA256 318111cdbaa8b9b9702584f237d9c40e9c7da0f4481e2584f98a618f7dbe4962 ChangeLog 922
+EBUILD nsis-2.24.ebuild 1802 RMD160 3611c785cd6797b34502de3887088144ac46ae8c SHA1 0a796e37f560b67b9fe59fdd7706fcdc20e3768d SHA256 12bea1b6237ee4b45e61724fa7cb1e480e3c0a98fc444f2a0fc2e0a09f4f6168
+MD5 1775e3a1deb24651d4ce43af16ec4057 nsis-2.24.ebuild 1802
+RMD160 3611c785cd6797b34502de3887088144ac46ae8c nsis-2.24.ebuild 1802
+SHA256 12bea1b6237ee4b45e61724fa7cb1e480e3c0a98fc444f2a0fc2e0a09f4f6168 nsis-2.24.ebuild 1802
+MISC ChangeLog 1231 RMD160 5f53c5a1ae1dd6c7a04b7941c88b2c5d2e7b0a07 SHA1 c38f72b576ac760b779cb566f1304a625aaa0c20 SHA256 41236f750e814af72cede396af72c7a6a877b4603e4e8f15ad2d61adb0db7038
+MD5 db219669cc1e59b6445d6065160397cd ChangeLog 1231
+RMD160 5f53c5a1ae1dd6c7a04b7941c88b2c5d2e7b0a07 ChangeLog 1231
+SHA256 41236f750e814af72cede396af72c7a6a877b4603e4e8f15ad2d61adb0db7038 ChangeLog 1231
 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 df8df3eee3764db329e1a21ae15b29b8 files/digest-nsis-2.21 247
-RMD160 8a14039ece277f01b9e4fa973fdcaabe3b2b8222 files/digest-nsis-2.21 247
-SHA256 e3d18a1d49d444eaa0d286795166015a0ba64da7a7d5c717c5f5c94598533d6a files/digest-nsis-2.21 247
-MD5 3805cc4c1893e1d7c264c8fb2863dbd9 files/digest-nsis-2.22 247
-RMD160 2bc489bd3a29600af930c31bbc2b653de3c1da19 files/digest-nsis-2.22 247
-SHA256 4b72bef574e2299789d0d924b8d9538cabff13dd8fa67412da9ad374a1cbd6f9 files/digest-nsis-2.22 247
 MD5 6f9d345bfbe5b9d93ce047603a6f42fe files/digest-nsis-2.23 247
 RMD160 fe3afceed7244884157f5f5f4fcb2c17c7141eda files/digest-nsis-2.23 247
 SHA256 c6b33efbd27194c2ed35672e16caa1ea085eb3571451952850d7c0a761cc558a files/digest-nsis-2.23 247
+MD5 ddf50ffcdeaa3e567bed83f144d07b96 files/digest-nsis-2.24 247
+RMD160 cb2cecd0af44712449f2744653cce81393911097 files/digest-nsis-2.24 247
+SHA256 393bef1399210212b1d7b162a9b5084398e527e0a98ff64bbb7bbd773b62a53b files/digest-nsis-2.24 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFu0ujJnxX6mF440QRAt5bAJ9P5MIPIDzph1g/Eq568Jt29cfRmACeIBrx
-bBFqgkoMlnd716lGTqWyp58=
-=9jsc
+iD8DBQFF89MRJnxX6mF440QRAizWAJ9PTO6JyZOM+L99FMFbTKCEhwlmEgCgk46r
+zHS+OtA52edoMnB0vxDsSVk=
+=J3dM
 -----END PGP SIGNATURE-----

diff --git a/dev-util/nsis/files/digest-nsis-2.21 b/dev-util/nsis/files/digest-nsis-2.21
deleted file mode 100644 (file)
index 7b9d23c..0000000
--- a/dev-util/nsis/files/digest-nsis-2.21
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1308c5841e4fafa5834114057209fbee nsis-2.21-src.tar.bz2 1599766
-RMD160 99367f3551651eea6c73cd25c938355b9f7e5261 nsis-2.21-src.tar.bz2 1599766
-SHA256 db8a814c9ffa1723f797751fa145e45106421ad846c654db45cb30dabbfd76a3 nsis-2.21-src.tar.bz2 1599766

diff --git a/dev-util/nsis/files/digest-nsis-2.22 b/dev-util/nsis/files/digest-nsis-2.22
deleted file mode 100644 (file)
index 62f7186..0000000
--- a/dev-util/nsis/files/digest-nsis-2.22
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 dfa6e8587cb691ddbb244f447dbc4476 nsis-2.22-src.tar.bz2 1603505
-RMD160 6c7294d1c5b1ccb6922ba345e5e47e74741fcf44 nsis-2.22-src.tar.bz2 1603505
-SHA256 4df89ea7d3d5055b0a1ffedb79ad8e2bec04a58f5174da4c86f9ef5a6bc620dc nsis-2.22-src.tar.bz2 1603505

diff --git a/dev-util/nsis/files/digest-nsis-2.24 b/dev-util/nsis/files/digest-nsis-2.24
new file mode 100644 (file)
index 0000000..5360ca1
--- /dev/null
+++ b/dev-util/nsis/files/digest-nsis-2.24
@@ -0,0 +1,3 @@
+MD5 5056ec9fa7394842483c9a1142d7a41e nsis-2.24-src.tar.bz2 1613342
+RMD160 ed78f01dfaf4c1438e04311fa943302507ed74d9 nsis-2.24-src.tar.bz2 1613342
+SHA256 46cafddcdb3a08fe60ff4976be568af17eb36b420547807acd295e09b42af040 nsis-2.24-src.tar.bz2 1613342

diff --git a/dev-util/nsis/files/nsis-2.21-config.patch b/dev-util/nsis/files/nsis-2.21-config.patch
deleted file mode 100644 (file)
index 84e9e14..0000000
--- a/dev-util/nsis/files/nsis-2.21-config.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Nru nsis-2.21-src.orig/SCons/Config/gnu nsis-2.21-src/SCons/Config/gnu
---- nsis-2.21-src.orig/SCons/Config/gnu        2006-11-25 14:02:55.000000000 +0200
-+++ nsis-2.21-src/SCons/Config/gnu     2006-11-25 14:03:40.000000000 +0200
-@@ -68,6 +68,7 @@
- if not defenv['DEBUG']:\r
-       stub_env.Append(LINKFLAGS = '-s')               # strip\r
- stub_env.Append(LINKFLAGS = '-mwindows')          # build windows executables\r
-+stub_env.Append(LINKFLAGS = '-L/usr/mingw32/usr/lib')\r
- stub_env.Append(LINKFLAGS = '$NODEFLIBS_FLAG')    # no standard libraries\r
- stub_env.Append(LINKFLAGS = '$ALIGN_FLAG')        # 512 bytes align\r
- stub_env.Append(LINKFLAGS = '-Wl,-e,_WinMain@16') # entry point\r
-@@ -83,8 +84,6 @@
- \r
- conf = FlagsConfigure(makensis_env)\r
- conf.CheckLinkFlag('$MAP_FLAG')                   # generate map file\r
--if not defenv['DEBUG']:\r
--      TestStrip(conf)                                 # strip\r
- conf.Finish()\r
- \r
- ### plugin environment\r
-@@ -112,8 +111,6 @@
- \r
- conf = FlagsConfigure(cp_util_env)\r
- conf.CheckLinkFlag('$MAP_FLAG')                   # generate map file\r
--if not defenv['DEBUG']:\r
--      TestStrip(conf)                                 # strip\r
- conf.Finish()\r
- \r
- ### util environment\r

diff --git a/dev-util/nsis/files/nsis-2.22-config.patch b/dev-util/nsis/files/nsis-2.22-config.patch
deleted file mode 100644 (file)
index 88c5fdc..0000000
--- a/dev-util/nsis/files/nsis-2.22-config.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -ru nsis-2.22-src~/Contrib/Math/SConscript nsis-2.22-src/Contrib/Math/SConscript
---- nsis-2.22-src~/Contrib/Math/SConscript     2006-12-29 23:45:50.000000000 +0100
-+++ nsis-2.22-src/Contrib/Math/SConscript      2006-12-29 23:55:03.000000000 +0100
-@@ -23,9 +23,6 @@
- \r
- Import('BuildPlugin env')\r
- \r
--if float(env['MSVS_VERSION'].replace('Exp','')) >= 8.0:\r
--      files += ['Source/mathcrtmt.lib']\r
--else:\r
--      files += ['Source/mathcrt.lib']\r
-+files += ['Source/mathcrtmt.lib']\r
- \r
- BuildPlugin(target, files, libs, examples, docs, nodeflib = False, flags = ['$CPP_FLAG'])\r
-diff -ru nsis-2.22-src~/SCons/Config/gnu nsis-2.22-src/SCons/Config/gnu
---- nsis-2.22-src~/SCons/Config/gnu    2006-12-29 23:45:50.000000000 +0100
-+++ nsis-2.22-src/SCons/Config/gnu     2006-12-29 23:46:22.000000000 +0100
-@@ -68,6 +68,7 @@
- if not defenv['DEBUG']:\r
-       stub_env.Append(LINKFLAGS = '-s')               # strip\r
- stub_env.Append(LINKFLAGS = '-mwindows')          # build windows executables\r
-+stub_env.Append(LINKFLAGS = '-L/usr/mingw32/usr/lib')\r
- stub_env.Append(LINKFLAGS = '$NODEFLIBS_FLAG')    # no standard libraries\r
- stub_env.Append(LINKFLAGS = '$ALIGN_FLAG')        # 512 bytes align\r
- stub_env.Append(LINKFLAGS = '-Wl,-e,_WinMain@16') # entry point\r
-@@ -83,8 +84,6 @@
- \r
- conf = FlagsConfigure(makensis_env)\r
- conf.CheckLinkFlag('$MAP_FLAG')                   # generate map file\r
--if not defenv['DEBUG']:\r
--      TestStrip(conf)                                 # strip\r
- conf.Finish()\r
- \r
- ### plugin environment\r
-@@ -112,8 +111,6 @@
- \r
- conf = FlagsConfigure(cp_util_env)\r
- conf.CheckLinkFlag('$MAP_FLAG')                   # generate map file\r
--if not defenv['DEBUG']:\r
--      TestStrip(conf)                                 # strip\r
- conf.Finish()\r
- \r
- ### util environment\r

diff --git a/dev-util/nsis/files/nsis-2.24-no-strict-aliasing.patch b/dev-util/nsis/files/nsis-2.24-no-strict-aliasing.patch
new file mode 100644 (file)
index 0000000..927c7e9
--- /dev/null
+++ b/dev-util/nsis/files/nsis-2.24-no-strict-aliasing.patch
@@ -0,0 +1,11 @@
+diff -Nru nsis-2.24-src.orig/SCons/Config/gnu nsis-2.24-src/SCons/Config/gnu
+--- nsis-2.24-src.orig/SCons/Config/gnu        2007-03-11 10:52:57.000000000 +0200
++++ nsis-2.24-src/SCons/Config/gnu     2007-03-11 10:54:11.000000000 +0200
+@@ -113,6 +113,7 @@
+ if not defenv['DEBUG']:\r
+       cp_util_env.Append(CCFLAGS = '-O2')             # optimize\r
+ cp_util_env.Append(CCFLAGS = '-Wall')             # all warnings\r
++cp_util_env.Append(CCFLAGS = '-fno-strict-aliasing') # not safe for strict aliasing\r
+ \r
+ conf = FlagsConfigure(cp_util_env)\r
+ conf.CheckLinkFlag('$MAP_FLAG')                   # generate map file\r

diff --git a/dev-util/nsis/nsis-2.21.ebuild b/dev-util/nsis/nsis-2.21.ebuild
deleted file mode 100644 (file)
index 5c2f448..0000000
--- a/dev-util/nsis/nsis-2.21.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/nsis-2.21.ebuild,v 1.2 2006/11/25 12:58:16 mrness Exp $
-
-inherit eutils
-
-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="~x86"
-IUSE=""
-
-DEPEND=">=dev-util/scons-0.96.91"
-
-S="${WORKDIR}"/${P}-src
-
-pkg_setup() {
-       if ! has_version cross-mingw32/gcc; then
-               eerror "cross-mingw32/gcc is needed"
-               die "emerge crossdev && crossdev mingw32"
-       fi
-}
-
-src_unpack() {
-       unpack ${A}
-
-       cd "${S}"
-       epatch "${FILESDIR}"/${P}-config.patch
-}
-
-src_compile() {
-       scons PREFIX=/usr PREFIX_CONF=/etc PREFIX_DOC="/usr/share/doc/${P}" \
-               PREFIX_DEST="${D}" SKIPPLUGINS=System || die "scons failed"
-}
-
-src_install() {
-       scons PREFIX=/usr PREFIX_CONF=/etc PREFIX_DOC="/usr/share/doc/${P}" \
-               PREFIX_DEST="${D}" SKIPPLUGINS=System install || die "scons install failed"
-       fperms -R go-w,a-x,a+X /usr/share/${PN}/ /usr/share/doc/${P}/ /etc/nsisconf.nsh
-}

diff --git a/dev-util/nsis/nsis-2.22.ebuild b/dev-util/nsis/nsis-2.22.ebuild
deleted file mode 100644 (file)
index bc32882..0000000
--- a/dev-util/nsis/nsis-2.22.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/nsis-2.22.ebuild,v 1.1 2006/12/29 23:04:49 cedk Exp $
-
-inherit eutils
-
-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="~x86"
-IUSE=""
-
-DEPEND=">=dev-util/scons-0.96.93"
-
-S="${WORKDIR}"/${P}-src
-
-pkg_setup() {
-       if ! has_version cross-mingw32/gcc; then
-               eerror "cross-mingw32/gcc is needed"
-               die "emerge crossdev && crossdev mingw32"
-       fi
-}
-
-src_unpack() {
-       unpack ${A}
-
-       cd "${S}"
-       epatch "${FILESDIR}"/${P}-config.patch
-}
-
-src_compile() {
-       scons PREFIX=/usr PREFIX_CONF=/etc PREFIX_DOC="/usr/share/doc/${P}" \
-               PREFIX_DEST="${D}" SKIPPLUGINS=System || die "scons failed"
-}
-
-src_install() {
-       scons PREFIX=/usr PREFIX_CONF=/etc PREFIX_DOC="/usr/share/doc/${P}" \
-               PREFIX_DEST="${D}" SKIPPLUGINS=System install || die "scons install failed"
-       fperms -R go-w,a-x,a+X /usr/share/${PN}/ /usr/share/doc/${P}/ /etc/nsisconf.nsh
-}

diff --git a/dev-util/nsis/nsis-2.24.ebuild b/dev-util/nsis/nsis-2.24.ebuild
new file mode 100644 (file)
index 0000000..e1cedd9
--- /dev/null
+++ b/dev-util/nsis/nsis-2.24.ebuild
@@ -0,0 +1,64 @@
+# 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.24.ebuild,v 1.1 2007/03/11 09:59:23 mrness Exp $
+
+inherit eutils
+
+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() {
+       if ! has_version cross-mingw32/gcc; then
+               eerror "Before you could emerge nsis, you need to install mingw32."
+               eerror "Run the following command:"
+               eerror "  emerge crossdev && crossdev mingw32"
+               die "cross-mingw32/gcc is needed"
+       fi
+}
+
+src_unpack() {
+       unpack ${A}
+
+       epatch "${FILESDIR}"/${P}-no-strict-aliasing.patch
+}
+
+src_compile() {
+       scons PREFIX=/usr PREFIX_CONF=/etc PREFIX_DOC="/usr/share/doc/${P}" PREFIX_DEST="${D}" \
+               SKIPPLUGINS=System VERSION=${PV} STRIP=no || die "scons failed"
+}
+
+src_install() {
+       scons PREFIX=/usr PREFIX_CONF=/etc PREFIX_DOC="/usr/share/doc/${P}" PREFIX_DEST="${D}" \
+               SKIPPLUGINS=System VERSION=${PV} STRIP=no install || die "scons install failed"
+
+       fperms -R go-w,a-x,a+X /usr/share/${PN}/ /usr/share/doc/${P}/ /etc/nsisconf.nsh
+
+       # Strip Windows binaries
+       if ! hasq nostrip ${FEATURES} ; then
+               local STRIP_FLAGS=${PORTAGE_STRIP_FLAGS:---strip-unneeded}
+               echo
+               echo "strip: mingw32-strip $STRIP_FLAGS"
+
+               cd "${D}"
+               local FILE
+               for FILE in $(find -iregex '.*\.\(dll\|exe\)$' | sed 's:^\./::') ; do
+                       if [[ "${FILE##*\/}" = "NSIS.exe" ]]; then
+                               # This program is distributed binary with nothing strippable in it
+                               # Avoid "File in wrong format" error
+                               continue
+                       fi
+                       echo "   ${FILE}"
+                       mingw32-strip ${STRIP_FLAGS} "${FILE}"
+               done
+       fi
+}