From f2815679aba721a8f0ec174b2c0ac0d0a1f11de5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alin=20N=C4=83stac?= Date: Wed, 18 Apr 2007 21:18:26 +0000 Subject: [PATCH] Remove old version. Version bump. Package-Manager: portage-2.1.2.2 --- dev-util/nsis/ChangeLog | 9 ++++- dev-util/nsis/Manifest | 38 ++++++++----------- 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 ------------------- .../{nsis-2.23.ebuild => nsis-2.25.ebuild} | 36 ++++++++++-------- 7 files changed, 46 insertions(+), 93 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 rename dev-util/nsis/{nsis-2.23.ebuild => nsis-2.25.ebuild} (53%) 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/Manifest b/dev-util/nsis/Manifest index dd111189d3c3..78fad972bdf5 100644 --- a/dev-util/nsis/Manifest +++ b/dev-util/nsis/Manifest @@ -1,46 +1,38 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX nsis-2.23-32bit.patch 447 RMD160 708a412d6c9ef83ab329d89d8135eeca05b3eedd SHA1 38794d2d06839f968128508e89cc3e3367d14ea2 SHA256 b2ed9278f37a8bfff7823c5ee5cd69e41ed05090077f258a3f5a7e908be1e481 -MD5 9dd6af6049b23aa353dbb458bd5b3ab0 files/nsis-2.23-32bit.patch 447 -RMD160 708a412d6c9ef83ab329d89d8135eeca05b3eedd files/nsis-2.23-32bit.patch 447 -SHA256 b2ed9278f37a8bfff7823c5ee5cd69e41ed05090077f258a3f5a7e908be1e481 files/nsis-2.23-32bit.patch 447 -AUX nsis-2.23-config.patch 1478 RMD160 d4b90c3b41afef9bfc241e945a320d62b548dd42 SHA1 e8be97f238d087779137856477bb8e641518138c SHA256 0f5474cf400cd8b335e2273c7239059d2f246f7ec02273dc277bfb9698d4f408 -MD5 d801ddd4bbefa4cf4654308ba9758c2a files/nsis-2.23-config.patch 1478 -RMD160 d4b90c3b41afef9bfc241e945a320d62b548dd42 files/nsis-2.23-config.patch 1478 -SHA256 0f5474cf400cd8b335e2273c7239059d2f246f7ec02273dc277bfb9698d4f408 files/nsis-2.23-config.patch 1478 AUX nsis-2.24-no-strict-aliasing.patch 597 RMD160 e62f584312f56e1690cc60d017da14328275f7f6 SHA1 95d7efb5493d3808d194beac0e2b878e8a6ca5e7 SHA256 19b3f5b1fa1d695ef10b19efc7c208e053b169c17286a7080600856b9291cc60 MD5 cbe619c1aa439f43404630455796e654 files/nsis-2.24-no-strict-aliasing.patch 597 RMD160 e62f584312f56e1690cc60d017da14328275f7f6 files/nsis-2.24-no-strict-aliasing.patch 597 SHA256 19b3f5b1fa1d695ef10b19efc7c208e053b169c17286a7080600856b9291cc60 files/nsis-2.24-no-strict-aliasing.patch 597 -DIST nsis-2.23-src.tar.bz2 1604427 RMD160 a80fd5b8e5984e8a0f3acbd8717e4c363d20fe19 SHA1 bb5da7eb6fb1dcbb2ad992914e4d94700c461d91 SHA256 cf76014e34c54b5c3797ba36747f735cd2d95052a9e04960233d3233e6ad6bdf DIST nsis-2.24-src.tar.bz2 1613342 RMD160 ed78f01dfaf4c1438e04311fa943302507ed74d9 SHA1 ec964bc7fcf00842febcf1d395a2a5bd7c1ad17c SHA256 46cafddcdb3a08fe60ff4976be568af17eb36b420547807acd295e09b42af040 -EBUILD nsis-2.23.ebuild 1364 RMD160 398499c1b95b308ec857c12717270af4df8eac2c SHA1 aecffbb16420fe743de12a3a4dc374272c787b84 SHA256 72bfcea97f9e9c3ab18bb628cc4cc1d6c30b820453840ec1eb2f45a3731348d8 -MD5 571faef59ed60699836e06be9259a79b nsis-2.23.ebuild 1364 -RMD160 398499c1b95b308ec857c12717270af4df8eac2c nsis-2.23.ebuild 1364 -SHA256 72bfcea97f9e9c3ab18bb628cc4cc1d6c30b820453840ec1eb2f45a3731348d8 nsis-2.23.ebuild 1364 +DIST nsis-2.25-src.tar.bz2 1358330 RMD160 a8d40348d14b095e3cd176bf62160cfb52b4940d SHA1 e39b839e0d1823324a9a997f06d83b6c7684c083 SHA256 0089357c39b0733cc2f2719cfcdfa86fb75ce5c53ee60cdce6883ed6bd52222e EBUILD nsis-2.24.ebuild 1790 RMD160 f966d9ae3966902ab622c28fe4413714467c0ead SHA1 b032715ab96862ea4ab1e1a1ec814e35ce48b39e SHA256 3bedb12f78e5e9a720a4b37dc282d7f2444e9f6932318692f76b281cfebb7048 MD5 6a832d223c5b1c2fe22f532a23863dc2 nsis-2.24.ebuild 1790 RMD160 f966d9ae3966902ab622c28fe4413714467c0ead nsis-2.24.ebuild 1790 SHA256 3bedb12f78e5e9a720a4b37dc282d7f2444e9f6932318692f76b281cfebb7048 nsis-2.24.ebuild 1790 -MISC ChangeLog 1231 RMD160 5f53c5a1ae1dd6c7a04b7941c88b2c5d2e7b0a07 SHA1 c38f72b576ac760b779cb566f1304a625aaa0c20 SHA256 41236f750e814af72cede396af72c7a6a877b4603e4e8f15ad2d61adb0db7038 -MD5 db219669cc1e59b6445d6065160397cd ChangeLog 1231 -RMD160 5f53c5a1ae1dd6c7a04b7941c88b2c5d2e7b0a07 ChangeLog 1231 -SHA256 41236f750e814af72cede396af72c7a6a877b4603e4e8f15ad2d61adb0db7038 ChangeLog 1231 +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 +MISC ChangeLog 1445 RMD160 023c94e5943ccc8407f7b74937e271f0f65012f7 SHA1 c86e89ea1a3f50271c6381385d42871443a87c97 SHA256 2131cab4cf4a4152822d2b166bb049f432adc409a518bd62441769a4d49f340e +MD5 f52f9163737b17b1c6690cc64f6ceff1 ChangeLog 1445 +RMD160 023c94e5943ccc8407f7b74937e271f0f65012f7 ChangeLog 1445 +SHA256 2131cab4cf4a4152822d2b166bb049f432adc409a518bd62441769a4d49f340e ChangeLog 1445 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 6f9d345bfbe5b9d93ce047603a6f42fe files/digest-nsis-2.23 247 -RMD160 fe3afceed7244884157f5f5f4fcb2c17c7141eda files/digest-nsis-2.23 247 -SHA256 c6b33efbd27194c2ed35672e16caa1ea085eb3571451952850d7c0a761cc558a files/digest-nsis-2.23 247 MD5 ddf50ffcdeaa3e567bed83f144d07b96 files/digest-nsis-2.24 247 RMD160 cb2cecd0af44712449f2744653cce81393911097 files/digest-nsis-2.24 247 SHA256 393bef1399210212b1d7b162a9b5084398e527e0a98ff64bbb7bbd773b62a53b files/digest-nsis-2.24 247 +MD5 730ab7aeb0f36344571ae59166e03a78 files/digest-nsis-2.25 247 +RMD160 195973011b68229195d5881f7d554c4a3cf85dff files/digest-nsis-2.25 247 +SHA256 5a5ea6e170f5fe585d2f054ebf081f588722b8ec23c42f09ffa206cd0bdebbd0 files/digest-nsis-2.25 247 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFF89h1JnxX6mF440QRAs6wAJ9f81aJjNFYeREFntbRwRAnyFYuqgCfUKvx -6Mzyxat7JEAdibqCZYYhdrE= -=EK+A +iD8DBQFGJosuJnxX6mF440QRAneHAJ9m4CclvCvKt5uLWXOSKUxa68CzOwCbBfKl +jRpxgbSfiWBofIc2b2QnAR4= +=hvUO -----END PGP SIGNATURE----- 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.25.ebuild similarity index 53% rename from dev-util/nsis/nsis-2.23.ebuild rename to dev-util/nsis/nsis-2.25.ebuild index 3944a8f49fa5..5c0c8166defa 100644 --- a/dev-util/nsis/nsis-2.23.ebuild +++ b/dev-util/nsis/nsis-2.25.ebuild @@ -1,8 +1,6 @@ # 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 +# $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/" @@ -26,22 +24,28 @@ pkg_setup() { 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" + # 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() { - scons PREFIX=/usr PREFIX_CONF=/etc PREFIX_DOC="/usr/share/doc/${P}" \ - PREFIX_DEST="${D}" SKIPPLUGINS=System install || die "scons install failed" + # 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 } -- 2.26.2