Remove obsolete versions. Version bump. Strip Windows binaries.

(Portage version: 2.1.2.2)

10 files changed, 87 insertions, 165 deletions

diff --git a/dev-util/nsis/ChangeLog b/dev-util/nsis/ChangeLog
index cb4c9da9f8ac..cdaaa4b14bb7 100644
--- 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/files/digest-nsis-2.21 b/dev-util/nsis/files/digest-nsis-2.21
deleted file mode 100644
index 7b9d23c5bde5..000000000000
--- 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
index 62f71866caa3..000000000000
--- 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
index 000000000000..5360ca1f4654
--- /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
index 84e9e142a06f..000000000000
--- 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']:

- 	stub_env.Append(LINKFLAGS = '-s')               # strip

- stub_env.Append(LINKFLAGS = '-mwindows')          # build windows executables

-+stub_env.Append(LINKFLAGS = '-L/usr/mingw32/usr/lib')

- stub_env.Append(LINKFLAGS = '$NODEFLIBS_FLAG')    # no standard libraries

- stub_env.Append(LINKFLAGS = '$ALIGN_FLAG')        # 512 bytes align

- stub_env.Append(LINKFLAGS = '-Wl,-e,_WinMain@16') # entry point

-@@ -83,8 +84,6 @@
- 

- conf = FlagsConfigure(makensis_env)

- conf.CheckLinkFlag('$MAP_FLAG')                   # generate map file

--if not defenv['DEBUG']:

--	TestStrip(conf)                                 # strip

- conf.Finish()

- 

- ### plugin environment

-@@ -112,8 +111,6 @@
- 

- conf = FlagsConfigure(cp_util_env)

- conf.CheckLinkFlag('$MAP_FLAG')                   # generate map file

--if not defenv['DEBUG']:

--	TestStrip(conf)                                 # strip

- conf.Finish()

- 

- ### util environment

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
index 88c5fdc12c83..000000000000
--- 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 @@
- 

- Import('BuildPlugin env')

- 

--if float(env['MSVS_VERSION'].replace('Exp','')) >= 8.0:

--	files += ['Source/mathcrtmt.lib']

--else:

--	files += ['Source/mathcrt.lib']

-+files += ['Source/mathcrtmt.lib']

- 

- BuildPlugin(target, files, libs, examples, docs, nodeflib = False, flags = ['$CPP_FLAG'])

-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']:

- 	stub_env.Append(LINKFLAGS = '-s')               # strip

- stub_env.Append(LINKFLAGS = '-mwindows')          # build windows executables

-+stub_env.Append(LINKFLAGS = '-L/usr/mingw32/usr/lib')

- stub_env.Append(LINKFLAGS = '$NODEFLIBS_FLAG')    # no standard libraries

- stub_env.Append(LINKFLAGS = '$ALIGN_FLAG')        # 512 bytes align

- stub_env.Append(LINKFLAGS = '-Wl,-e,_WinMain@16') # entry point

-@@ -83,8 +84,6 @@
- 

- conf = FlagsConfigure(makensis_env)

- conf.CheckLinkFlag('$MAP_FLAG')                   # generate map file

--if not defenv['DEBUG']:

--	TestStrip(conf)                                 # strip

- conf.Finish()

- 

- ### plugin environment

-@@ -112,8 +111,6 @@
- 

- conf = FlagsConfigure(cp_util_env)

- conf.CheckLinkFlag('$MAP_FLAG')                   # generate map file

--if not defenv['DEBUG']:

--	TestStrip(conf)                                 # strip

- conf.Finish()

- 

- ### util environment

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
index 000000000000..927c7e9c49c9
--- /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']:

+ 	cp_util_env.Append(CCFLAGS = '-O2')             # optimize

+ cp_util_env.Append(CCFLAGS = '-Wall')             # all warnings

++cp_util_env.Append(CCFLAGS = '-fno-strict-aliasing') # not safe for strict aliasing

+ 

+ conf = FlagsConfigure(cp_util_env)

+ conf.CheckLinkFlag('$MAP_FLAG')                   # generate map file

diff --git a/dev-util/nsis/nsis-2.21.ebuild b/dev-util/nsis/nsis-2.21.ebuild
deleted file mode 100644
index 5c2f4484d716..000000000000
--- 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
index bc32882fc848..000000000000
--- 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
index 000000000000..e1cedd9ef14c
--- /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
+}