Remove old versions. Mark stable on x86. Version bump.

(Portage version: 2.1.3.9)

7 files changed, 16 insertions, 93 deletions

diff --git a/dev-util/nsis/ChangeLog b/dev-util/nsis/ChangeLog
index 3950d223dde7..edb7e02854f3 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.13 2007/09/01 20:04:44 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/ChangeLog,v 1.14 2007/10/22 22:34:09 mrness Exp $
+
+*nsis-2.31 (22 Oct 2007)
+
+  22 Oct 2007; Alin Năstac <mrness@gentoo.org> -nsis-2.28.ebuild,
+  -nsis-2.29.ebuild, nsis-2.30.ebuild, +nsis-2.31.ebuild:
+  Remove old versions. Mark stable on x86. Version bump.
 
 *nsis-2.30 (01 Sep 2007)
 
diff --git a/dev-util/nsis/files/digest-nsis-2.28 b/dev-util/nsis/files/digest-nsis-2.28
deleted file mode 100644
index 7ad30fc852de..000000000000
--- a/dev-util/nsis/files/digest-nsis-2.28
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7d2fc02289ff13fb688464bbccef11b6 nsis-2.28-src.tar.bz2 1445137
-RMD160 c1188a3163da4c732ddd6577d36e9f3abfa5d63a nsis-2.28-src.tar.bz2 1445137
-SHA256 256fcfdc1392488d8e5ec8415e1e8dff35195b5d3967507dcbf93b30fa23bc02 nsis-2.28-src.tar.bz2 1445137
diff --git a/dev-util/nsis/files/digest-nsis-2.29 b/dev-util/nsis/files/digest-nsis-2.29
deleted file mode 100644
index a14f978532ea..000000000000
--- a/dev-util/nsis/files/digest-nsis-2.29
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b62ac91286891fdd692591480fef97be nsis-2.29-src.tar.bz2 1453149
-RMD160 c17f5cc950790b0504a5c5e799e1eea658a70301 nsis-2.29-src.tar.bz2 1453149
-SHA256 b27c4db9b0ef064f1b9ae191fc209c84645560d5912ef3b9138392321c41d44d nsis-2.29-src.tar.bz2 1453149
diff --git a/dev-util/nsis/files/digest-nsis-2.31 b/dev-util/nsis/files/digest-nsis-2.31
new file mode 100644
index 000000000000..0c49959bf61e
--- /dev/null
+++ b/dev-util/nsis/files/digest-nsis-2.31
@@ -0,0 +1,3 @@
+MD5 a7f557efa88ecbc0c166b35dd5fbd2b2 nsis-2.31-src.tar.bz2 1464687
+RMD160 36784fefd32a3491e2dfd307563d86a289dead9a nsis-2.31-src.tar.bz2 1464687
+SHA256 ebe74f550f62a33c5ddc574d689b6f1ed76f1ab7189623ce1f4b33d2b74190a9 nsis-2.31-src.tar.bz2 1464687
diff --git a/dev-util/nsis/nsis-2.28.ebuild b/dev-util/nsis/nsis-2.28.ebuild
deleted file mode 100644
index e8fda53df480..000000000000
--- a/dev-util/nsis/nsis-2.28.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.28.ebuild,v 1.1 2007/06/19 20:08:20 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}" \
-		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}" \
-		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
index 30151b39046c..1153ce5945f3 100644
--- a/dev-util/nsis/nsis-2.30.ebuild
+++ b/dev-util/nsis/nsis-2.30.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/nsis-2.30.ebuild,v 1.2 2007/10/22 22:34:09 mrness Exp $
 
 mingw32_variants=$(eval echo {,i{6,5,4,3}86-}mingw32)
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="bzip2 config-log zlib"
 
 # NSIS Menu uses wxwindows but it's all broken, so disable for now
diff --git a/dev-util/nsis/nsis-2.29.ebuild b/dev-util/nsis/nsis-2.31.ebuild
index f71f306da97b..8b4080149f24 100644
--- a/dev-util/nsis/nsis-2.29.ebuild
+++ b/dev-util/nsis/nsis-2.31.ebuild
@@ -1,6 +1,6 @@
 # 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.29.ebuild,v 1.2 2007/07/28 06:46:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/nsis-2.31.ebuild,v 1.1 2007/10/22 22:34:09 mrness Exp $
 
 mingw32_variants=$(eval echo {,i{6,5,4,3}86-}mingw32)
 
@@ -58,7 +58,10 @@ get_additional_options() {
 		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)