Version bump. Readd -m32 compiler flag on amd64.

(Portage version: 2.1.2.12)

5 files changed, 107 insertions, 87 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/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
+}