Version bump.

Package-Manager: portage-2.1.4.4

3 files changed, 128 insertions, 2 deletions

diff --git a/dev-util/nsis/ChangeLog b/dev-util/nsis/ChangeLog
index 80af38421a68..b1f84cb859ec 100644
--- a/dev-util/nsis/ChangeLog
+++ b/dev-util/nsis/ChangeLog
@@ -1,6 +1,11 @@
 # 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.24 2008/08/22 03:33:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/ChangeLog,v 1.25 2008/10/19 12:15:43 mrness Exp $
+
+*nsis-2.40 (19 Oct 2008)
+
+  19 Oct 2008; Alin Năstac <mrness@gentoo.org> +nsis-2.40.ebuild:
+  Version bump.
 
   22 Aug 2008; Mike Frysinger <vapier@gentoo.org> nsis-2.39.ebuild:
   Add USE=doc to disable generation/installation of extraneous docs.
diff --git a/dev-util/nsis/Manifest b/dev-util/nsis/Manifest
index a18296549e45..cce274b973fe 100644
--- a/dev-util/nsis/Manifest
+++ b/dev-util/nsis/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
@@ -6,10 +9,20 @@ DIST nsis-2.37-src.tar.bz2 1470086 RMD160 06cfcbf39e11889bae87fb634086a72349639c
 DIST nsis-2.37.zip 2270453 RMD160 9377b63b47d9b22c192626317d00160a8c6a86e6 SHA1 d4061ecd52452c913fc57be8ac69b109c7738cc8 SHA256 64c07e7b5da4f474a3d80ef35e62a03a69db6c2bd0215b4582e8eb562efae1d6
 DIST nsis-2.39-src.tar.bz2 1474305 RMD160 0aac0bd3ca2a676d6fe95fe34c7ffe68e4ff7c47 SHA1 325b43edf1bc7fb6f291797fbadaed1ae7150023 SHA256 d0d69e8781c7eb16f4fd1195e4650c4aeff70e8138f2536d9fe0d8635a61c096
 DIST nsis-2.39.zip 2277754 RMD160 6862d3f71cf4268c2d5b89d7285146cae4e29fb4 SHA1 1bd494adf19a02e3f3386dbbebc47fff80f3d72c SHA256 4b46060d6fbe2b6d6ab6eb9c79d327439fe89ac288969c18a428250c9b377391
+DIST nsis-2.40-src.tar.bz2 1474838 RMD160 4eab2eeb129fe25c2c1e8275b0fe4373eee00ae6 SHA1 23ebc2992ac9882cbdfc4370432c917373d2576f SHA256 08bd499eb4cc0af18531f3ff2196f7b1f33de43d4cd5e2e859190103251752b3
+DIST nsis-2.40.zip 2279673 RMD160 bd877ff571665e5a5073c3ceecb77c056fa93909 SHA1 7196b3c692f7496f73a3a34e27179f531a668a83 SHA256 52726c024ed098f6d7e282a52aebfcea9d179541f293451232d48c6869511511
 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 2581 RMD160 979e7213f1e0cff122bb7c4f013939d5b954f74d SHA1 1c2a7833fccbd7fc9db77cbd45d906ef79de234e SHA256 67c83a1ec7da8ba2a8137e9846dea530f574a20f70ec74463680f43442797bb5
 EBUILD nsis-2.39.ebuild 2783 RMD160 81ecf4e959f6bbedf20eea3daa02f780006e6c58 SHA1 8aef74573653edee761365501187b7f8916391f3 SHA256 9396cd97ba3886b8784a4919e58af15ed2bdc8d0e8c5d18d15158df7887553d7
-MISC ChangeLog 3746 RMD160 95c2018e083377817651853be840021884eaa417 SHA1 b11556cd822e7c03db7835f08d5d2783ecc96534 SHA256 16ba24e0952a64c8c559a7a20a160a15905428ba9e85b38a46cacfa634f783e9
+EBUILD nsis-2.40.ebuild 2783 RMD160 0d3fad4bd904a5d6b1d1f3a1d055accbb44a7392 SHA1 ce6fa4202c43af0e0b0e400868cd8f3a6c586be2 SHA256 61c96ef413f340106222eea03e5739bd235ddfab0ef3fb90c568e17071bf5445
+MISC ChangeLog 3856 RMD160 3dc307686568cc81b9c2c780b74c4567993348f2 SHA1 895c98808e80cf8ee761f7a2f1ee89606673b658 SHA256 5f7092fe275878603a4078d74aa7e212661fc47df555a173b66c97370a1c91ca
 MISC metadata.xml 1157 RMD160 eb19bc8603ab6c3c7e142d1b823336c2ac301d8a SHA1 170711b27c9c64bcd2ded29c0392479057bce47e SHA256 d168b9239f6fb744bf21c6276cd3ee71f3ff4e2ac91ff3b43e7d8ce4d2cee917
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkj7JPsACgkQPrHvTlXvhtsM2gCeINg16zQaHhKG1aCjwUoWHVs2
+zokAnjmhMVDB2Aw/hwQY6EOYYfVA0dz1
+=UJ89
+-----END PGP SIGNATURE-----
diff --git a/dev-util/nsis/nsis-2.40.ebuild b/dev-util/nsis/nsis-2.40.ebuild
new file mode 100644
index 000000000000..3bb21db5d875
--- /dev/null
+++ b/dev-util/nsis/nsis-2.40.ebuild
@@ -0,0 +1,108 @@
+# 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.40.ebuild,v 1.1 2008/10/19 12:15:43 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
+	prebuilt-system? ( mirror://sourceforge/${PN}/${P}.zip )"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="bzip2 config-log doc prebuilt-system 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.98"
+
+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"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# a dirty but effective way of killing generated docs
+	use doc || echo > Docs/src/SConscript
+}
+
+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)\" \
+		SKIPUTILS=\"NSIS Menu\"
+	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"
+	if use prebuilt-system ; then
+		insinto /usr/share/nsis/Plugins
+		doins "${WORKDIR}"/${P}/Plugins/System.dll || die
+	fi
+	use doc || rm -rf "${D}"/usr/share/doc/${PF}/{Docs,Examples}
+
+	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
+}