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

Package-Manager: portage-2.1.3.9

8 files changed, 36 insertions, 121 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/Manifest b/dev-util/nsis/Manifest
index e7dc0706147e..6559d3b19bf5 100644
--- a/dev-util/nsis/Manifest
+++ b/dev-util/nsis/Manifest
@@ -1,42 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST nsis-2.28-src.tar.bz2 1445137 RMD160 c1188a3163da4c732ddd6577d36e9f3abfa5d63a SHA1 e3e5fdcd610e089b70a6d05fbb46bab0b342078f SHA256 256fcfdc1392488d8e5ec8415e1e8dff35195b5d3967507dcbf93b30fa23bc02
-DIST nsis-2.29-src.tar.bz2 1453149 RMD160 c17f5cc950790b0504a5c5e799e1eea658a70301 SHA1 4e89a572f701c8e44c887d156f0b84f779b3bac7 SHA256 b27c4db9b0ef064f1b9ae191fc209c84645560d5912ef3b9138392321c41d44d
 DIST nsis-2.30-src.tar.bz2 1465234 RMD160 0aac2c2c8b851c926269eb9bd63e9942f045db8b SHA1 3ee0f62182b5ed81dfc695081a1f88447e5df517 SHA256 9a225817f1ffc01e9a470d3bb49ee5c1ef1471e0142f888e1d3cdb051f9a142d
-EBUILD nsis-2.28.ebuild 2334 RMD160 10400afa8cccc62756f05a34729e7f3ceb59d508 SHA1 100897c6fe8cc6f4d8cdddc214eb0e411af353ec SHA256 1a163518665be319d9a075f672dfccaf2449baaf7f428afa01629e98013dda15
-MD5 359eba68c383cd125a378149c64aa968 nsis-2.28.ebuild 2334
-RMD160 10400afa8cccc62756f05a34729e7f3ceb59d508 nsis-2.28.ebuild 2334
-SHA256 1a163518665be319d9a075f672dfccaf2449baaf7f428afa01629e98013dda15 nsis-2.28.ebuild 2334
-EBUILD nsis-2.29.ebuild 2301 RMD160 e8bbaef579c55ba8ade5a5711159d39fa18d505c SHA1 d72e897f558efdc440a32a65a5d82f4dcd33e18f SHA256 c0c6510af921720834e3d809c3a85fd3df378d5381a211a56bb2bc3d40526f88
-MD5 4d3255b4bc7d3dc8c2d1dd6978a50fe0 nsis-2.29.ebuild 2301
-RMD160 e8bbaef579c55ba8ade5a5711159d39fa18d505c nsis-2.29.ebuild 2301
-SHA256 c0c6510af921720834e3d809c3a85fd3df378d5381a211a56bb2bc3d40526f88 nsis-2.29.ebuild 2301
-EBUILD nsis-2.30.ebuild 2428 RMD160 9902b6d524e52c9c33313474396f8bc08a30eb05 SHA1 36c9f853e50795cd19b8e3021f7d2e50909ea8cb SHA256 75025e560a55083b47e944b802f7e347d4918dafb3f6af658ce9a39f4b2342dc
-MD5 74e5e470b49646c80ca9b493050e9997 nsis-2.30.ebuild 2428
-RMD160 9902b6d524e52c9c33313474396f8bc08a30eb05 nsis-2.30.ebuild 2428
-SHA256 75025e560a55083b47e944b802f7e347d4918dafb3f6af658ce9a39f4b2342dc nsis-2.30.ebuild 2428
-MISC ChangeLog 2296 RMD160 75c4f02db10c699a3d2b09d69b7c130d298262af SHA1 0a2bc5aa947dd3c42654ba5bde2d814797b47204 SHA256 10cf03ac0e04655320b0ae9d7200d90dc955fb39599f9cd3fd3c36778d161b09
-MD5 142c6dc04c2fe7d9c7cb54c5c0376de2 ChangeLog 2296
-RMD160 75c4f02db10c699a3d2b09d69b7c130d298262af ChangeLog 2296
-SHA256 10cf03ac0e04655320b0ae9d7200d90dc955fb39599f9cd3fd3c36778d161b09 ChangeLog 2296
+DIST nsis-2.31-src.tar.bz2 1464687 RMD160 36784fefd32a3491e2dfd307563d86a289dead9a SHA1 ca0fee9c6fd37de9b49473f9c56115e4b580ef80 SHA256 ebe74f550f62a33c5ddc574d689b6f1ed76f1ab7189623ce1f4b33d2b74190a9
+EBUILD nsis-2.30.ebuild 2427 RMD160 cd90a47ec4e2f23aa529c30297ac89382eaae49e SHA1 539ba0644ac4c20e344450db1c94aa90eb3adafe SHA256 72c75d363c0d4d7e4be912d323721fa32c98719aba5dd9ddf78bbe6ad3272a79
+MD5 849e0a474179180244bab1de08d87964 nsis-2.30.ebuild 2427
+RMD160 cd90a47ec4e2f23aa529c30297ac89382eaae49e nsis-2.30.ebuild 2427
+SHA256 72c75d363c0d4d7e4be912d323721fa32c98719aba5dd9ddf78bbe6ad3272a79 nsis-2.30.ebuild 2427
+EBUILD nsis-2.31.ebuild 2428 RMD160 61e8ca9d84a7cffb8683928208ff728649965712 SHA1 ef6797cdb12013541dc2bd9a56cab1eab1803050 SHA256 fc7f0d7025e77f1b12ed872d94d6db629c1d6cac54d0e323371d73bb22788865
+MD5 ad3ae02d52f2a13acde7ede9a5342467 nsis-2.31.ebuild 2428
+RMD160 61e8ca9d84a7cffb8683928208ff728649965712 nsis-2.31.ebuild 2428
+SHA256 fc7f0d7025e77f1b12ed872d94d6db629c1d6cac54d0e323371d73bb22788865 nsis-2.31.ebuild 2428
+MISC ChangeLog 2505 RMD160 461605771cd434d991035cba9b80ab69890c4954 SHA1 8d46c8a947dcee858c1ce738fd9391e7183171e5 SHA256 ad953f158f78afd0cdb42b7ed00a312035b61fd1b3b38eaa31ae444804ac24a7
+MD5 fdf313d5fff93e33c425d4a7c76ac9bc ChangeLog 2505
+RMD160 461605771cd434d991035cba9b80ab69890c4954 ChangeLog 2505
+SHA256 ad953f158f78afd0cdb42b7ed00a312035b61fd1b3b38eaa31ae444804ac24a7 ChangeLog 2505
 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 d7a9f2d1509b208f48347c3dd366a9f7 files/digest-nsis-2.28 247
-RMD160 026be1908756313e38538bbf21c5859f1e5443c1 files/digest-nsis-2.28 247
-SHA256 a5de5f776d5890cce48e1f08bf54374882e2bd23de96781ceb29d9f470c9eae4 files/digest-nsis-2.28 247
-MD5 55802e37cfe8f3aec100630a64254884 files/digest-nsis-2.29 247
-RMD160 8bea43048e42cfe190c43c0648d68abe2da4f440 files/digest-nsis-2.29 247
-SHA256 1ae1b5fd60f0b9146dda9cd1923a246de0807c1065248b45117c13b3de713a30 files/digest-nsis-2.29 247
 MD5 aee7b6d8bac0f28fd601b2f78f602874 files/digest-nsis-2.30 247
 RMD160 e18c5d579885917015e2b446336dd184a3416508 files/digest-nsis-2.30 247
 SHA256 915ce2e25d03d2a8e6330422da182bd901da923702259bb96c31303b8d020b25 files/digest-nsis-2.30 247
+MD5 d7c3723054d56ede98b93d40cb12d7e7 files/digest-nsis-2.31 247
+RMD160 83b6540ff738f0c5f72edda1958022f129547a05 files/digest-nsis-2.31 247
+SHA256 43ee66d72b578ec8a833d5018658ba95ab2bac3d56ce5566674bded9981f090d files/digest-nsis-2.31 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG2cXnVSA5X31g7/gRAoTdAJ99z0Z5W+trftD1CQfg9b4ig+QTrgCffAux
-WiH/RCivWd7r1PNbHHNYkok=
-=NxWh
+iD8DBQFHHSVoVSA5X31g7/gRAm9+AJ9nvuyN3dcNJdpIlxVHxSdx9nSJlwCfQUW1
+lFREUXI/gD/Qwe0WJKqqk5I=
+=JycM
 -----END PGP SIGNATURE-----
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)