Version bump

Package-Manager: portage-2.1.1-r2

diff --git a/dev-util/nsis/ChangeLog b/dev-util/nsis/ChangeLog
index 6d78bee36e255b52f90b90affb2f87d8721023f2..f00d838d3467ae32fb55c3f51f175eab01a63546 100644 (file)
--- 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/Manifest b/dev-util/nsis/Manifest
index 1422ae6d93546591f811431fe47b45f64d16742f..df61a00af6030edcdd6d1962a1027e1685c6ca0f 100644 (file)
--- a/dev-util/nsis/Manifest
+++ b/dev-util/nsis/Manifest
@@ -1,30 +1,32 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX nsis-2.21-config.patch 1194 RMD160 d8566d14a2140975d77cbff45efb514ca181c594 SHA1 1c57deb4595697f1a38f5b799770b052083f717d SHA256 1e72da5db091e0462ba14f1e0d69f403ceb95b349624857d9f9d6c9081e56521
 MD5 e3844fa0dd6bd911158131aeafb3ac99 files/nsis-2.21-config.patch 1194
 RMD160 d8566d14a2140975d77cbff45efb514ca181c594 files/nsis-2.21-config.patch 1194
 SHA256 1e72da5db091e0462ba14f1e0d69f403ceb95b349624857d9f9d6c9081e56521 files/nsis-2.21-config.patch 1194
+AUX nsis-2.22-config.patch 1749 RMD160 1afa9858dba01668a958461a9b3f017e4d2216a1 SHA1 215c11452392d6b13de3117bbe5daabf0048b75a SHA256 dfec0ee7f328f61acd7c6094510314366b21b0235ae5b2ac8904e828c3d6a0b5
+MD5 6917b9853885b8ebc78455f77e61a430 files/nsis-2.22-config.patch 1749
+RMD160 1afa9858dba01668a958461a9b3f017e4d2216a1 files/nsis-2.22-config.patch 1749
+SHA256 dfec0ee7f328f61acd7c6094510314366b21b0235ae5b2ac8904e828c3d6a0b5 files/nsis-2.22-config.patch 1749
 DIST nsis-2.21-src.tar.bz2 1599766 RMD160 99367f3551651eea6c73cd25c938355b9f7e5261 SHA1 ade7a2be95d1d217baa0a22388fc99df5bc6175a SHA256 db8a814c9ffa1723f797751fa145e45106421ad846c654db45cb30dabbfd76a3
+DIST nsis-2.22-src.tar.bz2 1603505 RMD160 6c7294d1c5b1ccb6922ba345e5e47e74741fcf44 SHA1 5ef9f6694fd29cf3d1f4148e78451fc8228892db SHA256 4df89ea7d3d5055b0a1ffedb79ad8e2bec04a58f5174da4c86f9ef5a6bc620dc
 EBUILD nsis-2.21.ebuild 1112 RMD160 0c2c8c0b49f95b9fb81c0d762c06809257095e36 SHA1 405dbf270d873f74743d421d948b67ab6d1bf0ad SHA256 01121fb79401ccff7afe7921de0e868671d2182566e69480c3d794c352b30c9e
 MD5 0328999caed9b1d937323a7c33b6bc9e nsis-2.21.ebuild 1112
 RMD160 0c2c8c0b49f95b9fb81c0d762c06809257095e36 nsis-2.21.ebuild 1112
 SHA256 01121fb79401ccff7afe7921de0e868671d2182566e69480c3d794c352b30c9e nsis-2.21.ebuild 1112
-MISC ChangeLog 426 RMD160 844d4d7b914b32c3e0131488d6b7392c382c2195 SHA1 afc2379aca69953b2d30cb9ff3ed1257cfc0a898 SHA256 f7c6dc0e06fdb1905b07241ff647fc29b8626e86bcfabd04726bc6eebf064097
-MD5 6fbf7aa9b6a57176ddb1beeef066e71e ChangeLog 426
-RMD160 844d4d7b914b32c3e0131488d6b7392c382c2195 ChangeLog 426
-SHA256 f7c6dc0e06fdb1905b07241ff647fc29b8626e86bcfabd04726bc6eebf064097 ChangeLog 426
-MISC metadata.xml 886 RMD160 44fb9af2adde98f141627084c7ef985575389f25 SHA1 c810b62863d8e08fbe449d3008c1f61504756e09 SHA256 d753c7bbc173578d5c7be5fdafa7a62a6fda4ccb8593f99f70749b0cbff29393
-MD5 9fcaa5a1e121a42ef1e473c68ded9faa metadata.xml 886
-RMD160 44fb9af2adde98f141627084c7ef985575389f25 metadata.xml 886
-SHA256 d753c7bbc173578d5c7be5fdafa7a62a6fda4ccb8593f99f70749b0cbff29393 metadata.xml 886
+EBUILD nsis-2.22.ebuild 1110 RMD160 113bdac4dd6e6fac7d5160f17a49ed41bc587821 SHA1 85aea01f5fb34d302870c45e81738f2a15905fce SHA256 31562e2fb25c7366e44fb9b174749bfe0fcfb7167c394119317cfcc6208f33aa
+MD5 d97983011e5d89aa396395643053c5c8 nsis-2.22.ebuild 1110
+RMD160 113bdac4dd6e6fac7d5160f17a49ed41bc587821 nsis-2.22.ebuild 1110
+SHA256 31562e2fb25c7366e44fb9b174749bfe0fcfb7167c394119317cfcc6208f33aa nsis-2.22.ebuild 1110
+MISC ChangeLog 578 RMD160 6c5abe96f1aa7ee6ad45aad4fbf57bd0024d9daa SHA1 8283198077b7fe19b46983a989f92d9883ec45da SHA256 17fd4c6939e1353ce632333bfbb30593b31c4ccd5e87572b587989aad5ad94e4
+MD5 cd34e39d0927740987db9625ca07828b ChangeLog 578
+RMD160 6c5abe96f1aa7ee6ad45aad4fbf57bd0024d9daa ChangeLog 578
+SHA256 17fd4c6939e1353ce632333bfbb30593b31c4ccd5e87572b587989aad5ad94e4 ChangeLog 578
+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 df8df3eee3764db329e1a21ae15b29b8 files/digest-nsis-2.21 247
 RMD160 8a14039ece277f01b9e4fa973fdcaabe3b2b8222 files/digest-nsis-2.21 247
 SHA256 e3d18a1d49d444eaa0d286795166015a0ba64da7a7d5c717c5f5c94598533d6a files/digest-nsis-2.21 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFarLeI1lqEGTUzyQRAgVxAJ9UjKLOIh9vfIP09na9QU7eGj4EewCgzG14
-ALuy3MFxPyTDwJqt9g4quvI=
-=Ny4H
------END PGP SIGNATURE-----
+MD5 3805cc4c1893e1d7c264c8fb2863dbd9 files/digest-nsis-2.22 247
+RMD160 2bc489bd3a29600af930c31bbc2b653de3c1da19 files/digest-nsis-2.22 247
+SHA256 4b72bef574e2299789d0d924b8d9538cabff13dd8fa67412da9ad374a1cbd6f9 files/digest-nsis-2.22 247

diff --git a/dev-util/nsis/files/digest-nsis-2.22 b/dev-util/nsis/files/digest-nsis-2.22
new file mode 100644 (file)
index 0000000..62f7186
--- /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 (file)
index 0000000..88c5fdc
--- /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 @@
+ \r
+ Import('BuildPlugin env')\r
+ \r
+-if float(env['MSVS_VERSION'].replace('Exp','')) >= 8.0:\r
+-      files += ['Source/mathcrtmt.lib']\r
+-else:\r
+-      files += ['Source/mathcrt.lib']\r
++files += ['Source/mathcrtmt.lib']\r
+ \r
+ BuildPlugin(target, files, libs, examples, docs, nodeflib = False, flags = ['$CPP_FLAG'])\r
+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']:\r
+       stub_env.Append(LINKFLAGS = '-s')               # strip\r
+ stub_env.Append(LINKFLAGS = '-mwindows')          # build windows executables\r
++stub_env.Append(LINKFLAGS = '-L/usr/mingw32/usr/lib')\r
+ stub_env.Append(LINKFLAGS = '$NODEFLIBS_FLAG')    # no standard libraries\r
+ stub_env.Append(LINKFLAGS = '$ALIGN_FLAG')        # 512 bytes align\r
+ stub_env.Append(LINKFLAGS = '-Wl,-e,_WinMain@16') # entry point\r
+@@ -83,8 +84,6 @@
+ \r
+ conf = FlagsConfigure(makensis_env)\r
+ conf.CheckLinkFlag('$MAP_FLAG')                   # generate map file\r
+-if not defenv['DEBUG']:\r
+-      TestStrip(conf)                                 # strip\r
+ conf.Finish()\r
+ \r
+ ### plugin environment\r
+@@ -112,8 +111,6 @@
+ \r
+ conf = FlagsConfigure(cp_util_env)\r
+ conf.CheckLinkFlag('$MAP_FLAG')                   # generate map file\r
+-if not defenv['DEBUG']:\r
+-      TestStrip(conf)                                 # strip\r
+ conf.Finish()\r
+ \r
+ ### util environment\r

diff --git a/dev-util/nsis/metadata.xml b/dev-util/nsis/metadata.xml
index ba2f06479df511cc2c35b2287666c5a03feb37cb..dfb4d2d072a6f4c786886879ef8ad24875f8207b 100644 (file)
--- 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 (file)
index 0000000..bc32882
--- /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
+}