Version bump. Add System.dll to the list of installed plugins.

Package-Manager: portage-2.1.2.7

6 files changed, 108 insertions, 70 deletions

diff --git a/dev-util/nsis/ChangeLog b/dev-util/nsis/ChangeLog
index b5030b3f192b..f7b3a63be4f4 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.10 2007/05/29 13:29:02 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/ChangeLog,v 1.11 2007/06/19 20:08:20 mrness Exp $
+
+*nsis-2.28 (19 Jun 2007)
+
+  19 Jun 2007; Alin Năstac <mrness@gentoo.org> -nsis-2.25.ebuild,
+  +nsis-2.28.ebuild:
+  Version bump. Add System.dll to the list of installed plugins.
 
   29 May 2007; Alin Năstac <mrness@gentoo.org>
   -files/nsis-2.24-no-strict-aliasing.patch, -nsis-2.24.ebuild,
diff --git a/dev-util/nsis/Manifest b/dev-util/nsis/Manifest
index f157ddf4cc10..9f81bf9e9aff 100644
--- a/dev-util/nsis/Manifest
+++ b/dev-util/nsis/Manifest
@@ -1,34 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST nsis-2.25-src.tar.bz2 1358330 RMD160 a8d40348d14b095e3cd176bf62160cfb52b4940d SHA1 e39b839e0d1823324a9a997f06d83b6c7684c083 SHA256 0089357c39b0733cc2f2719cfcdfa86fb75ce5c53ee60cdce6883ed6bd52222e
 DIST nsis-2.27-src.tar.bz2 1450223 RMD160 42eba66dc53e7dccda934e9e16a478e5b6fb6ad0 SHA1 1f899af4d1dc4969dc7c470c0d54765ea10c4c35 SHA256 22d1f981ba1da13c6c9fa722656668c6971f2efa858e81a16e4f9959ea54f5e8
-EBUILD nsis-2.25.ebuild 1638 RMD160 fddff303ab0e21886ddcb58bc84a486530b87d38 SHA1 55e51bd8828077891fcdccd1ffe1b82050c9cb9d SHA256 638a776528fc85f4fe3861ec925e6e31f73b90878607c4b5c32e58da473bede5
-MD5 c83febc2826722800341d2585975491b nsis-2.25.ebuild 1638
-RMD160 fddff303ab0e21886ddcb58bc84a486530b87d38 nsis-2.25.ebuild 1638
-SHA256 638a776528fc85f4fe3861ec925e6e31f73b90878607c4b5c32e58da473bede5 nsis-2.25.ebuild 1638
+DIST nsis-2.28-src.tar.bz2 1445137 RMD160 c1188a3163da4c732ddd6577d36e9f3abfa5d63a SHA1 e3e5fdcd610e089b70a6d05fbb46bab0b342078f SHA256 256fcfdc1392488d8e5ec8415e1e8dff35195b5d3967507dcbf93b30fa23bc02
 EBUILD nsis-2.27.ebuild 2372 RMD160 01df8db36ed0291cc6d78b4facf7c4702b91e702 SHA1 1a99cd7448898cd80e864aa19a2fd2851fe7b7c4 SHA256 8762eae7db8ce13752f47bba1c071cf568f1d68da49e1f502ab727b80a32e74f
 MD5 db5c27725cf075bcea35787ad981c5b0 nsis-2.27.ebuild 2372
 RMD160 01df8db36ed0291cc6d78b4facf7c4702b91e702 nsis-2.27.ebuild 2372
 SHA256 8762eae7db8ce13752f47bba1c071cf568f1d68da49e1f502ab727b80a32e74f nsis-2.27.ebuild 2372
-MISC ChangeLog 1838 RMD160 c8d4a691647ee10e84c669ff0f0e1cfb5af15048 SHA1 1bd427251fec55b400e94f883f95da941d8ee81c SHA256 430a9bdc5732d2f05731b8379d73490bec85d59e0c8fcce7406cbc431b9be662
-MD5 5c2eb852bcfead98901ba12f02e1c6ac ChangeLog 1838
-RMD160 c8d4a691647ee10e84c669ff0f0e1cfb5af15048 ChangeLog 1838
-SHA256 430a9bdc5732d2f05731b8379d73490bec85d59e0c8fcce7406cbc431b9be662 ChangeLog 1838
+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
+MISC ChangeLog 2018 RMD160 4ff0d805c4ec82ee9e82dd0b9bf0949b762ee515 SHA1 945e018a2a4abd0e1bbbe612a142b03e99864718 SHA256 c3d3628743ee86b2e78fd3dc68f9cea8dfc123e1d75251b78e6a012ba90598e5
+MD5 49246cc70821c2fba597dad9498f1795 ChangeLog 2018
+RMD160 4ff0d805c4ec82ee9e82dd0b9bf0949b762ee515 ChangeLog 2018
+SHA256 c3d3628743ee86b2e78fd3dc68f9cea8dfc123e1d75251b78e6a012ba90598e5 ChangeLog 2018
 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 730ab7aeb0f36344571ae59166e03a78 files/digest-nsis-2.25 247
-RMD160 195973011b68229195d5881f7d554c4a3cf85dff files/digest-nsis-2.25 247
-SHA256 5a5ea6e170f5fe585d2f054ebf081f588722b8ec23c42f09ffa206cd0bdebbd0 files/digest-nsis-2.25 247
 MD5 51191db8f84bb403031fa9a9475757dc files/digest-nsis-2.27 247
 RMD160 9440f09763dda9107898c48fffef13918ba10771 files/digest-nsis-2.27 247
 SHA256 ad625ace7cdd46d3c5b300ecb555cf1a08f0313fbe0c9ff530791e43ecb407ee files/digest-nsis-2.27 247
+MD5 d7a9f2d1509b208f48347c3dd366a9f7 files/digest-nsis-2.28 247
+RMD160 026be1908756313e38538bbf21c5859f1e5443c1 files/digest-nsis-2.28 247
+SHA256 a5de5f776d5890cce48e1f08bf54374882e2bd23de96781ceb29d9f470c9eae4 files/digest-nsis-2.28 247
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGXCqpJnxX6mF440QRAmiPAKDCA6v7yweEEprYzld1KWuX7xsiagCgoOGj
-EiB8Cdd7t1prcNqjCQTJhv4=
-=rTxR
+iD8DBQFGeDfAJnxX6mF440QRAsH1AKDvrhfkX0JYV1+WM1LcqUeczt9Z8wCg7V7+
+cpKUsOa6DxUT/2OnD5PSkA4=
+=zoKi
 -----END PGP SIGNATURE-----
diff --git a/dev-util/nsis/files/digest-nsis-2.25 b/dev-util/nsis/files/digest-nsis-2.25
deleted file mode 100644
index 88d136322c18..000000000000
--- a/dev-util/nsis/files/digest-nsis-2.25
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ca0f255cacf00bec851ace3ca8affd4b nsis-2.25-src.tar.bz2 1358330
-RMD160 a8d40348d14b095e3cd176bf62160cfb52b4940d nsis-2.25-src.tar.bz2 1358330
-SHA256 0089357c39b0733cc2f2719cfcdfa86fb75ce5c53ee60cdce6883ed6bd52222e nsis-2.25-src.tar.bz2 1358330
diff --git a/dev-util/nsis/files/digest-nsis-2.28 b/dev-util/nsis/files/digest-nsis-2.28
new file mode 100644
index 000000000000..7ad30fc852de
--- /dev/null
+++ b/dev-util/nsis/files/digest-nsis-2.28
@@ -0,0 +1,3 @@
+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/nsis-2.25.ebuild b/dev-util/nsis/nsis-2.25.ebuild
deleted file mode 100644
index 5c0c8166defa..000000000000
--- a/dev-util/nsis/nsis-2.25.ebuild
+++ /dev/null
@@ -1,51 +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.25.ebuild,v 1.1 2007/04/18 21:18:26 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=""
-
-DEPEND=">=dev-util/scons-0.96.93"
-
-S="${WORKDIR}"/${P}-src
-
-pkg_setup() {
-	if ! has_version cross-mingw32/gcc; then
-		eerror "Before you could emerge nsis, you need to install mingw32."
-		eerror "Run the following command:"
-		eerror "  emerge crossdev && crossdev mingw32"
-		die "cross-mingw32/gcc is needed"
-	fi
-}
-
-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" VERSION=${PV} DEBUG=no STRIP=no || 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" VERSION=${PV} DEBUG=no STRIP=no 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 STRIP_FLAGS="--strip-unneeded"
-	echo
-	echo "strip: mingw32-strip ${STRIP_FLAGS}"
-
-	cd "${D}"
-	local FILE
-	for FILE in $(find -iregex '.*\.\(dll\|exe\)$' | sed 's:^\./::') ; do
-		echo "   ${FILE}"
-		mingw32-strip ${STRIP_FLAGS} "${FILE}"
-	done
-}
diff --git a/dev-util/nsis/nsis-2.28.ebuild b/dev-util/nsis/nsis-2.28.ebuild
new file mode 100644
index 000000000000..e8fda53df480
--- /dev/null
+++ b/dev-util/nsis/nsis-2.28.ebuild
@@ -0,0 +1,83 @@
+# 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
+}