Fix scons dependency (#228313). Remove obsolete version.

Package-Manager: portage-2.1.4.4

4 files changed, 13 insertions, 108 deletions

diff --git a/dev-util/nsis/ChangeLog b/dev-util/nsis/ChangeLog
index c99c4cc66720..f6954de46f3d 100644
--- a/dev-util/nsis/ChangeLog
+++ b/dev-util/nsis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/nsis
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/ChangeLog,v 1.21 2008/06/06 12:43:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/ChangeLog,v 1.22 2008/06/20 21:01:37 mrness Exp $
+
+  20 Jun 2008; Alin Năstac <mrness@gentoo.org> -nsis-2.31.ebuild,
+  nsis-2.37.ebuild:
+  Fix scons dependency (#228313). Remove obsolete version.
 
   05 Jun 2008; Mike Frysinger <vapier@gentoo.org> nsis-2.36.ebuild,
   nsis-2.37.ebuild:
diff --git a/dev-util/nsis/Manifest b/dev-util/nsis/Manifest
index 8c5c21ee1045..4a4dc7de4ad6 100644
--- a/dev-util/nsis/Manifest
+++ b/dev-util/nsis/Manifest
@@ -1,24 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST nsis-2.31-src.tar.bz2 1464687 RMD160 36784fefd32a3491e2dfd307563d86a289dead9a SHA1 ca0fee9c6fd37de9b49473f9c56115e4b580ef80 SHA256 ebe74f550f62a33c5ddc574d689b6f1ed76f1ab7189623ce1f4b33d2b74190a9
 DIST nsis-2.33-src.tar.bz2 1480437 RMD160 352737f514a8cef6bad3617687352cdc8ba3449d SHA1 0c205a6abba466a849e5ead1f40cf153f99b06fb SHA256 18f6023e2b43c3402b306b81f615baf687ba2b710be1838c4d99732ff37ae32e
 DIST nsis-2.34-src.tar.bz2 980640 RMD160 02ee72481855693c1102a0b66f5a596217a8962a SHA1 0b709ea8184039aafe9890c1826de12092cd8686 SHA256 4207a128e5c8ce177514d6514daebc8dec166ce06b78eae8349171fdf980c4b4
 DIST nsis-2.36-src.tar.bz2 1492683 RMD160 382023a47be091c3cb17c53bcdf4fb049fd02969 SHA1 adc93f971c9ab2be5385506d0e67b416e10c49e3 SHA256 24e6ce80cd2b03807fec55da27d507992ad6c56fd9ca217e1b62a8b86087d4c5
 DIST nsis-2.36.zip 2266372 RMD160 3af90337e8e2235d14be6b56aa5715be04775c9e SHA1 80d428d23a5baf58b995da65d68fbd760e87fc0b SHA256 c7c93d301436639b2e2ea5865595e570384b61ea81579d46401f608f43a02966
 DIST nsis-2.37-src.tar.bz2 1470086 RMD160 06cfcbf39e11889bae87fb634086a72349639cf8 SHA1 5bad6987de86b7a0e6c93a00e7dd572d6c85e7c7 SHA256 7d1238d543d304c2a74b0ff62e4178b895af161c6dcb7e3df9932379662ab6ed
 DIST nsis-2.37.zip 2270453 RMD160 9377b63b47d9b22c192626317d00160a8c6a86e6 SHA1 d4061ecd52452c913fc57be8ac69b109c7738cc8 SHA256 64c07e7b5da4f474a3d80ef35e62a03a69db6c2bd0215b4582e8eb562efae1d6
-EBUILD nsis-2.31.ebuild 2427 RMD160 e62d5a7522863d39d8c179ea0d058006bc5ac8a9 SHA1 1d98883633a534f1303e1a1ba256e04d99293acb SHA256 8217872254684bcf973d3bd288d674e616cd7f1ce833959dbf1d2135d8df1179
 EBUILD nsis-2.33.ebuild 2427 RMD160 ff3c5b91b12a0f762b16f4d4ee52da371afbebb7 SHA1 5c4ef23d1016d9c244c3ef3b4e2ec0c0908db4e1 SHA256 33b9fd502a8dec7f8be3465f80dcb850193140d2784f0e6e0722bbddcbaa96e1
 EBUILD nsis-2.34.ebuild 2389 RMD160 f46d73d09a3915301de6cc8dbbc26dc7dbe57a0d SHA1 75f12176cf8c003ebf011fcb476fa9aff34cd09d SHA256 bb04da546daa356596e29bf81b9cbb987542692454e22d8d12a6ac5c9ba6edc1
 EBUILD nsis-2.36.ebuild 2584 RMD160 d69894de46af6503a65171fba767f11c1e07f4fe SHA1 169e6b48bb84113ecc73a18a660bd872f301dc51 SHA256 1f41ee5d21ff3ea2da8107090baf49ed6cfbb8405f9b309dea6b447a4a20fce5
-EBUILD nsis-2.37.ebuild 2584 RMD160 2caaf7df0f6b1c17a9313749ea8341b4c5bcf800 SHA1 2f452b0c52daac215a83d038e96b8c19386ad89f SHA256 1f39dee65e11cfe876c88bf6e85699c1ecc09e11dc214df860de93d333a17aa0
-MISC ChangeLog 3349 RMD160 5b79ee656fd09d9f4555c7fae96c864ac33c9944 SHA1 8afbdd0eeb84065bd0b7b87ddda3145fb80bf373 SHA256 48d65fbc74b04410c67a9acbcb0ebea0c770ba09bebaa5e3abb901b9f418c631
+EBUILD nsis-2.37.ebuild 2581 RMD160 979e7213f1e0cff122bb7c4f013939d5b954f74d SHA1 1c2a7833fccbd7fc9db77cbd45d906ef79de234e SHA256 67c83a1ec7da8ba2a8137e9846dea530f574a20f70ec74463680f43442797bb5
+MISC ChangeLog 3496 RMD160 f478f61dd6bed1efc2c83f156fd86f990173cdab SHA1 4ee35da2c4a58ac295ea9143649b8632a511da69 SHA256 634006a1f9a102bda40a62a7f4850952d5461a1dc6fdbbe668378286614f16bd
 MISC metadata.xml 888 RMD160 463bc404bb8b97f2d45caa70242a93917e9c7546 SHA1 2e81672e52ba36ac17f9a49d7810099a78a561a4 SHA256 c4c22c4d20fef8ce0d8f6a73b5f694ea92dadc0b923b99b7d29833213cf9dd71
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFISTEFj9hvisErhMIRAmX6AJ0eoJBx54AE86/bSXEnfmfotk/TmwCfYZ4Q
-xdG4iMIoR0Gwy27UEnOY/E4=
-=iuf7
+iEYEARECAAYFAkhcGwQACgkQ+fWpoTWIA9FsVgCeLzGJAYuetvwh3kfrlK+tnvP3
+R44An3/DVGI6sfhaYyJMt8X+eh9fRkdn
+=G9rz
 -----END PGP SIGNATURE-----
diff --git a/dev-util/nsis/nsis-2.31.ebuild b/dev-util/nsis/nsis-2.31.ebuild
deleted file mode 100644
index 9e6cbde038aa..000000000000
--- a/dev-util/nsis/nsis-2.31.ebuild
+++ /dev/null
@@ -1,97 +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.31.ebuild,v 1.2 2007/12/04 14:06:13 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
-}
diff --git a/dev-util/nsis/nsis-2.37.ebuild b/dev-util/nsis/nsis-2.37.ebuild
index 977456880d37..127f2fe7ff22 100644
--- a/dev-util/nsis/nsis-2.37.ebuild
+++ b/dev-util/nsis/nsis-2.37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/nsis-2.37.ebuild,v 1.2 2008/06/05 16:23:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/nsis-2.37.ebuild,v 1.3 2008/06/20 21:01:37 mrness Exp $
 
 mingw32_variants=$(eval echo {,i{6,5,4,3}86-}mingw32)
 
@@ -19,7 +19,7 @@ IUSE="bzip2 config-log prebuilt-system zlib"
 RDEPEND="bzip2? ( app-arch/bzip2 )
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
-	>=dev-util/scons-0.96.93"
+	>=dev-util/scons-0.98"
 
 S=${WORKDIR}/${P}-src