diff options
| author |   Cédric Krier <cedk@gentoo.org> | 2006-12-29 23:04:50 +0000 |
|---|---|---|
| committer | Cédric Krier <cedk@gentoo.org> | 2006-12-29 23:04:50 +0000 |
| commit | c6618df5c70405889a4402e30c8ed2a480c866a0 (patch) | |
| tree | dad118bb3919142496a35ad92d1126101d0c93de /dev-util | |
| parent | Version bump. Dropped old version. (diff) | |
| download | gentoo-2-c6618df5c70405889a4402e30c8ed2a480c866a0.tar.gz gentoo-2-c6618df5c70405889a4402e30c8ed2a480c866a0.tar.bz2 gentoo-2-c6618df5c70405889a4402e30c8ed2a480c866a0.zip | |
Version bump
(Portage version: 2.1.1-r2)
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/nsis/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-util/nsis/files/digest-nsis-2.22 | 3 | ||||
| -rw-r--r-- | dev-util/nsis/files/nsis-2.22-config.patch | 43 | ||||
| -rw-r--r-- | dev-util/nsis/metadata.xml | 4 | ||||
| -rw-r--r-- | dev-util/nsis/nsis-2.22.ebuild | 43 |
5 files changed, 98 insertions, 3 deletions
diff --git a/dev-util/nsis/ChangeLog b/dev-util/nsis/ChangeLog index 6d78bee36e25..f00d838d3467 100644 --- a/dev-util/nsis/ChangeLog +++ b/dev-util/nsis/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-util/nsis # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/ChangeLog,v 1.1 2006/11/25 12:49:02 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/ChangeLog,v 1.2 2006/12/29 23:04:49 cedk Exp $ + +*nsis-2.22 (29 Dec 2006) + + 29 Dec 2006; Cedric Krier <cedk@gentoo.org> +files/nsis-2.22-config.patch, + metadata.xml, +nsis-2.22.ebuild: + Version bump *nsis-2.21 (25 Nov 2006) diff --git a/dev-util/nsis/files/digest-nsis-2.22 b/dev-util/nsis/files/digest-nsis-2.22 new file mode 100644 index 000000000000..62f71866caa3 --- /dev/null +++ b/dev-util/nsis/files/digest-nsis-2.22 @@ -0,0 +1,3 @@ +MD5 dfa6e8587cb691ddbb244f447dbc4476 nsis-2.22-src.tar.bz2 1603505 +RMD160 6c7294d1c5b1ccb6922ba345e5e47e74741fcf44 nsis-2.22-src.tar.bz2 1603505 +SHA256 4df89ea7d3d5055b0a1ffedb79ad8e2bec04a58f5174da4c86f9ef5a6bc620dc nsis-2.22-src.tar.bz2 1603505 diff --git a/dev-util/nsis/files/nsis-2.22-config.patch b/dev-util/nsis/files/nsis-2.22-config.patch new file mode 100644 index 000000000000..88c5fdc12c83 --- /dev/null +++ b/dev-util/nsis/files/nsis-2.22-config.patch @@ -0,0 +1,43 @@ +diff -ru nsis-2.22-src~/Contrib/Math/SConscript nsis-2.22-src/Contrib/Math/SConscript +--- nsis-2.22-src~/Contrib/Math/SConscript 2006-12-29 23:45:50.000000000 +0100 ++++ nsis-2.22-src/Contrib/Math/SConscript 2006-12-29 23:55:03.000000000 +0100 +@@ -23,9 +23,6 @@ +
+ Import('BuildPlugin env')
+
+-if float(env['MSVS_VERSION'].replace('Exp','')) >= 8.0:
+- files += ['Source/mathcrtmt.lib']
+-else:
+- files += ['Source/mathcrt.lib']
++files += ['Source/mathcrtmt.lib']
+
+ BuildPlugin(target, files, libs, examples, docs, nodeflib = False, flags = ['$CPP_FLAG'])
+diff -ru nsis-2.22-src~/SCons/Config/gnu nsis-2.22-src/SCons/Config/gnu +--- nsis-2.22-src~/SCons/Config/gnu 2006-12-29 23:45:50.000000000 +0100 ++++ nsis-2.22-src/SCons/Config/gnu 2006-12-29 23:46:22.000000000 +0100 +@@ -68,6 +68,7 @@ + if not defenv['DEBUG']:
+ stub_env.Append(LINKFLAGS = '-s') # strip
+ stub_env.Append(LINKFLAGS = '-mwindows') # build windows executables
++stub_env.Append(LINKFLAGS = '-L/usr/mingw32/usr/lib')
+ stub_env.Append(LINKFLAGS = '$NODEFLIBS_FLAG') # no standard libraries
+ stub_env.Append(LINKFLAGS = '$ALIGN_FLAG') # 512 bytes align
+ stub_env.Append(LINKFLAGS = '-Wl,-e,_WinMain@16') # entry point
+@@ -83,8 +84,6 @@ +
+ conf = FlagsConfigure(makensis_env)
+ conf.CheckLinkFlag('$MAP_FLAG') # generate map file
+-if not defenv['DEBUG']:
+- TestStrip(conf) # strip
+ conf.Finish()
+
+ ### plugin environment
+@@ -112,8 +111,6 @@ +
+ conf = FlagsConfigure(cp_util_env)
+ conf.CheckLinkFlag('$MAP_FLAG') # generate map file
+-if not defenv['DEBUG']:
+- TestStrip(conf) # strip
+ conf.Finish()
+
+ ### util environment
diff --git a/dev-util/nsis/metadata.xml b/dev-util/nsis/metadata.xml index ba2f06479df5..dfb4d2d072a6 100644 --- a/dev-util/nsis/metadata.xml +++ b/dev-util/nsis/metadata.xml @@ -7,8 +7,8 @@ <name>Alin Nastac</name> </maintainer> <maintainer> - <email>cedk@gentoo.org</email> - <name>Cédric Krier</name> + <email>cedk@gentoo.org</email> + <name>Cédric Krier</name> </maintainer> <longdescription> NSIS (Nullsoft Scriptable Install System) is a professional open source diff --git a/dev-util/nsis/nsis-2.22.ebuild b/dev-util/nsis/nsis-2.22.ebuild new file mode 100644 index 000000000000..bc32882fc848 --- /dev/null +++ b/dev-util/nsis/nsis-2.22.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/nsis-2.22.ebuild,v 1.1 2006/12/29 23:04:49 cedk Exp $ + +inherit eutils + +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="~x86" +IUSE="" + +DEPEND=">=dev-util/scons-0.96.93" + +S="${WORKDIR}"/${P}-src + +pkg_setup() { + if ! has_version cross-mingw32/gcc; then + eerror "cross-mingw32/gcc is needed" + die "emerge crossdev && crossdev mingw32" + fi +} + +src_unpack() { + unpack ${A} + + cd "${S}" + epatch "${FILESDIR}"/${P}-config.patch +} + +src_compile() { + scons PREFIX=/usr PREFIX_CONF=/etc PREFIX_DOC="/usr/share/doc/${P}" \ + PREFIX_DEST="${D}" SKIPPLUGINS=System || die "scons failed" +} + +src_install() { + scons PREFIX=/usr PREFIX_CONF=/etc PREFIX_DOC="/usr/share/doc/${P}" \ + PREFIX_DEST="${D}" SKIPPLUGINS=System install || die "scons install failed" + fperms -R go-w,a-x,a+X /usr/share/${PN}/ /usr/share/doc/${P}/ /etc/nsisconf.nsh +} |