From b1935a076cda684e1e28449e0eec30d927c978b5 Mon Sep 17 00:00:00 2001 From: Alin Năstac Date: Wed, 18 Apr 2007 21:18:26 +0000 Subject: Remove old version. Version bump. (Portage version: 2.1.2.2) --- dev-util/nsis/ChangeLog | 9 +++++- dev-util/nsis/files/digest-nsis-2.23 | 3 -- dev-util/nsis/files/digest-nsis-2.25 | 3 ++ dev-util/nsis/files/nsis-2.23-32bit.patch | 12 ------- dev-util/nsis/files/nsis-2.23-config.patch | 38 ---------------------- dev-util/nsis/nsis-2.23.ebuild | 47 --------------------------- dev-util/nsis/nsis-2.25.ebuild | 51 ++++++++++++++++++++++++++++++ 7 files changed, 62 insertions(+), 101 deletions(-) delete mode 100644 dev-util/nsis/files/digest-nsis-2.23 create mode 100644 dev-util/nsis/files/digest-nsis-2.25 delete mode 100644 dev-util/nsis/files/nsis-2.23-32bit.patch delete mode 100644 dev-util/nsis/files/nsis-2.23-config.patch delete mode 100644 dev-util/nsis/nsis-2.23.ebuild create mode 100644 dev-util/nsis/nsis-2.25.ebuild (limited to 'dev-util/nsis') diff --git a/dev-util/nsis/ChangeLog b/dev-util/nsis/ChangeLog index cdaaa4b14bb7..bc685cffc233 100644 --- a/dev-util/nsis/ChangeLog +++ b/dev-util/nsis/ChangeLog @@ -1,6 +1,13 @@ # 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.7 2007/03/11 09:59:23 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/ChangeLog,v 1.8 2007/04/18 21:18:26 mrness Exp $ + +*nsis-2.25 (18 Apr 2007) + + 18 Apr 2007; Alin Năstac + -files/nsis-2.23-32bit.patch, -files/nsis-2.23-config.patch, + -nsis-2.23.ebuild, +nsis-2.25.ebuild: + Remove old version. Version bump. *nsis-2.24 (11 Mar 2007) diff --git a/dev-util/nsis/files/digest-nsis-2.23 b/dev-util/nsis/files/digest-nsis-2.23 deleted file mode 100644 index f2868ce4663d..000000000000 --- a/dev-util/nsis/files/digest-nsis-2.23 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 5f947798a2013e3f4796817cc133e0c2 nsis-2.23-src.tar.bz2 1604427 -RMD160 a80fd5b8e5984e8a0f3acbd8717e4c363d20fe19 nsis-2.23-src.tar.bz2 1604427 -SHA256 cf76014e34c54b5c3797ba36747f735cd2d95052a9e04960233d3233e6ad6bdf nsis-2.23-src.tar.bz2 1604427 diff --git a/dev-util/nsis/files/digest-nsis-2.25 b/dev-util/nsis/files/digest-nsis-2.25 new file mode 100644 index 000000000000..88d136322c18 --- /dev/null +++ b/dev-util/nsis/files/digest-nsis-2.25 @@ -0,0 +1,3 @@ +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/nsis-2.23-32bit.patch b/dev-util/nsis/files/nsis-2.23-32bit.patch deleted file mode 100644 index 24e942b7347f..000000000000 --- a/dev-util/nsis/files/nsis-2.23-32bit.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru nsis-2.23-src.orig/SCons/Config/gnu nsis-2.23-src/SCons/Config/gnu ---- nsis-2.23-src.orig/SCons/Config/gnu 2007-01-27 14:20:12.000000000 +0200 -+++ nsis-2.23-src/SCons/Config/gnu 2007-01-27 14:21:56.000000000 +0200 -@@ -56,6 +56,8 @@ - - if defenv['DEBUG']: - defenv.Append(CCFLAGS = '-g') -+defenv.Append(CCFLAGS = '-m32') # 32-bit host -+defenv.Append(LINKFLAGS = '-m32') # 32-bit host - - ### stub environment - diff --git a/dev-util/nsis/files/nsis-2.23-config.patch b/dev-util/nsis/files/nsis-2.23-config.patch deleted file mode 100644 index 72fe3646c9b0..000000000000 --- a/dev-util/nsis/files/nsis-2.23-config.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -Nru nsis-2.23-src.orig/SCons/Config/gnu nsis-2.23-src/SCons/Config/gnu ---- nsis-2.23-src.orig/SCons/Config/gnu 2006-11-11 15:04:17.000000000 +0200 -+++ nsis-2.23-src/SCons/Config/gnu 2007-01-15 15:18:20.000000000 +0200 -@@ -30,6 +30,8 @@ - defenv['ALIGN_FLAG'] = '-Wl,--file-alignment,512' - defenv['CPP_REQUIRES_STDLIB'] = 1 - defenv['SUBSYS_CON'] = '-Wl,--subsystem,console' -+defenv.Append(CFLAGS = '-fno-strict-aliasing') -+defenv.Append(CPPFLAGS = '-fno-strict-aliasing') - - ### helper functions - -@@ -68,6 +70,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 +86,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 +113,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/nsis-2.23.ebuild b/dev-util/nsis/nsis-2.23.ebuild deleted file mode 100644 index 3944a8f49fa5..000000000000 --- a/dev-util/nsis/nsis-2.23.ebuild +++ /dev/null @@ -1,47 +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.23.ebuild,v 1.2 2007/01/27 12:50:36 mrness 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="~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_unpack() { - unpack ${A} - - cd "${S}" - epatch "${FILESDIR}"/${P}-config.patch - #makensis code is not portable on 64-bit arches so we compile 32-bit executables - use amd64 && epatch "${FILESDIR}"/${P}-32bit.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 -} diff --git a/dev-util/nsis/nsis-2.25.ebuild b/dev-util/nsis/nsis-2.25.ebuild new file mode 100644 index 000000000000..5c0c8166defa --- /dev/null +++ b/dev-util/nsis/nsis-2.25.ebuild @@ -0,0 +1,51 @@ +# 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 +} -- cgit v1.2.3-65-gdbad