Version bump.

Package-Manager: portage-2.2_pre5

4 files changed, 129 insertions, 6 deletions

diff --git a/dev-util/nsis/ChangeLog b/dev-util/nsis/ChangeLog
index 2678b556e24e..ee8d2e0c2bc4 100644
--- a/dev-util/nsis/ChangeLog
+++ b/dev-util/nsis/ChangeLog
@@ -1,6 +1,11 @@
 # 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.16 2007/12/30 08:30:35 mrness Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/ChangeLog,v 1.17 2008/04/20 09:32:59 vapier Exp $
+
+*nsis-2.36 (20 Apr 2008)
+
+  20 Apr 2008; Mike Frysinger <vapier@gentoo.org> +nsis-2.36.ebuild:
+  Version bump.
 
 *nsis-2.34 (30 Dec 2007)
 
diff --git a/dev-util/nsis/Manifest b/dev-util/nsis/Manifest
index 89926554ccc8..1203892f4fcb 100644
--- a/dev-util/nsis/Manifest
+++ b/dev-util/nsis/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST nsis-2.31-src.tar.bz2 1464687 RMD160 36784fefd32a3491e2dfd307563d86a289dead9a SHA1 ca0fee9c6fd37de9b49473f9c56115e4b580ef80 SHA256 ebe74f550f62a33c5ddc574d689b6f1ed76f1ab7189623ce1f4b33d2b74190a9
 DIST nsis-2.33-src.tar.bz2 1480437 RMD160 352737f514a8cef6bad3617687352cdc8ba3449d SHA1 0c205a6abba466a849e5ead1f40cf153f99b06fb SHA256 18f6023e2b43c3402b306b81f615baf687ba2b710be1838c4d99732ff37ae32e
-DIST nsis-2.34-src.tar.bz2 1480868 RMD160 774b23cff063a917293e92a9208c70935e35bb56 SHA1 62cf6bbf4e86b201d5a2a947d308a1428d8f510b SHA256 95de9f479311532a0e5e933c67fa6c32eb63a4aae4b486aea9c7be49f8295d60
+DIST nsis-2.34-src.tar.bz2 980640 RMD160 02ee72481855693c1102a0b66f5a596217a8962a SHA1 0b709ea8184039aafe9890c1826de12092cd8686 SHA256 4207a128e5c8ce177514d6514daebc8dec166ce06b78eae8349171fdf980c4b4
+DIST nsis-2.36-src.tar.bz2 1492683 RMD160 382023a47be091c3cb17c53bcdf4fb049fd02969 SHA1 adc93f971c9ab2be5385506d0e67b416e10c49e3 SHA256 24e6ce80cd2b03807fec55da27d507992ad6c56fd9ca217e1b62a8b86087d4c5
 EBUILD nsis-2.31.ebuild 2427 RMD160 e62d5a7522863d39d8c179ea0d058006bc5ac8a9 SHA1 1d98883633a534f1303e1a1ba256e04d99293acb SHA256 8217872254684bcf973d3bd288d674e616cd7f1ce833959dbf1d2135d8df1179
 EBUILD nsis-2.33.ebuild 2427 RMD160 ff3c5b91b12a0f762b16f4d4ee52da371afbebb7 SHA1 5c4ef23d1016d9c244c3ef3b4e2ec0c0908db4e1 SHA256 33b9fd502a8dec7f8be3465f80dcb850193140d2784f0e6e0722bbddcbaa96e1
 EBUILD nsis-2.34.ebuild 2389 RMD160 f46d73d09a3915301de6cc8dbbc26dc7dbe57a0d SHA1 75f12176cf8c003ebf011fcb476fa9aff34cd09d SHA256 bb04da546daa356596e29bf81b9cbb987542692454e22d8d12a6ac5c9ba6edc1
-MISC ChangeLog 2834 RMD160 6c547db2619227f3e1960776ee38048704783853 SHA1 71c7e4d6860edbb3e543e6c1865931b6691c5ac1 SHA256 79cb80f782c00816d37c09ae04dc8b250dc113557d0e3376877b54cdd3b2e2e6
+EBUILD nsis-2.36.ebuild 2389 RMD160 ae2bad2f375201ed02d9849403fb16018556fdc7 SHA1 ee6e753f4d4be59144e0783c1d73571f3176c61b SHA256 80835f1ffadaa20cac431f6b183cbb42535ed4869fd1ac446733d670b25c70a7
+MISC ChangeLog 2946 RMD160 38adc5da6eca8e65471eeddebc3f314fe2542039 SHA1 c1c4e78a8cca50767d262fc1dc05cc5297a3ef3e SHA256 8bcf668ae6dec8802539ef32ed58c5faf94d054557770b24a2ebb4fe29522372
 MISC metadata.xml 888 RMD160 463bc404bb8b97f2d45caa70242a93917e9c7546 SHA1 2e81672e52ba36ac17f9a49d7810099a78a561a4 SHA256 c4c22c4d20fef8ce0d8f6a73b5f694ea92dadc0b923b99b7d29833213cf9dd71
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFICw3Rj9hvisErhMIRAixBAJwNyVTZ4WVT2S7R9nEP0hPc7ibnNACfUAZK
+cln2SoJZEG2qeyKBtDbiSYc=
+=H0DR
+-----END PGP SIGNATURE-----
diff --git a/dev-util/nsis/nsis-2.36.ebuild b/dev-util/nsis/nsis-2.36.ebuild
new file mode 100644
index 000000000000..b816f8dce153
--- /dev/null
+++ b/dev-util/nsis/nsis-2.36.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/nsis-2.36.ebuild,v 1.1 2008/04/20 09:32:59 vapier Exp $
+
+mingw32_variants=$(eval echo {,i{6,5,4,3}86-}mingw32)
+
+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 ~ppc ~x86"
+IUSE="bzip2 config-log zlib"
+
+# NSIS Menu uses wxwindows but it's all broken, so disable for now
+#	wxwindows? ( x11-libs/wxGTK )
+RDEPEND="bzip2? ( app-arch/bzip2 )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	>=dev-util/scons-0.96.93"
+
+S=${WORKDIR}/${P}-src
+
+mingw_CTARGET() {
+	local i
+	for i in ${mingw32_variants} ; do
+		type -P ${i}-gcc > /dev/null && echo ${i} && return
+	done
+}
+
+pkg_setup() {
+	[[ -n $(mingw_CTARGET) ]] && return 0
+
+	local i
+	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() {
+	echo \
+		PREFIX=/usr \
+		PREFIX_CONF=/etc \
+		PREFIX_DOC=/usr/share/doc/${PF} \
+		PREFIX_DEST=\"${D}\" \
+		VERSION=${PV} \
+		DEBUG=no \
+		STRIP=no
+	echo \
+		SKIPSTUBS=\"$(use zlib || echo zlib) $(use bzip2 || echo bzip2)\" \
+		SKIPUTILS=\"NSIS Menu\"
+	use config-log && echo NSIS_CONFIG_LOG=yes
+	# remove the following line when nsis bug 1753070 will be fixed
+	use amd64 && echo APPEND_CCFLAGS=-m32 APPEND_LINKFLAGS=-m32
+}
+
+do_scons() {
+	local cmd=$1
+	eval set -- $(get_additional_options)
+	echo scons $(get_additional_options) ${cmd}
+	scons "$@" ${cmd}
+}
+
+src_compile() {
+	do_scons || die "scons failed"
+}
+
+src_install() {
+	do_scons install || die "scons failed"
+
+	fperms -R go-w,a-x,a+X /usr/share/${PN}/ /usr/share/doc/${PF}/ /etc/nsisconf.nsh
+
+	src_strip_win32
+}
+
+src_strip_win32() {
+	# need to strip win32 binaries ourselves ... should fold this
+	# back in to prepstrip at some point
+	local STRIP_PROG=$(mingw_CTARGET)-strip
+	local STRIP_FLAGS="--strip-unneeded"
+
+	echo
+	echo "strip: ${STRIP_PROG} ${STRIP_FLAGS}"
+	local FILE
+	for FILE in $(find "${D}" -iregex '.*\.\(dll\|exe\)$') ; do
+		echo "   ${FILE#${D}}"
+		${STRIP_PROG} ${STRIP_FLAGS} "${FILE}"
+	done
+}
diff --git a/dev-util/xxdiff/Manifest b/dev-util/xxdiff/Manifest
index 70cfc88b829e..5ffafd725a44 100644
--- a/dev-util/xxdiff/Manifest
+++ b/dev-util/xxdiff/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX kdesupport.patch 588 RMD160 e074c1e222915db5a73db9bd183133bb3abed78e SHA1 600cb81828f908791de77a2821a1af0f9f388b99 SHA256 c64273cf6b4368547f5539fa12eb6c40077d625a2a3342b925437ad0c636cbb2
+AUX xxdiff-3.2-gcc43.patch 469 RMD160 07e8a831384146ed08870e96ca1c7a1e21f5df98 SHA1 faa0b0a329d1b2c7981c4e38246e5778c2acf600 SHA256 a707fa685bcc094dce8e7b577ca5396b52b1463fbbcc294e711e88d8696c9b8a
 AUX xxdiff-3.2-kdesupport.patch 492 RMD160 ebaa92902e28f5370b29f1d964e87783b7d28f52 SHA1 3a6a112a6f2bcd203e41ac41dadd2bb852db1258 SHA256 36e8276f74941a71a72ab2b73c542ce57e5a33211731029e2f39ed8605b89a50
 DIST xxdiff-3.2.tar.bz2 1341967 RMD160 12e7527f39713b925f05b687c2ad8b60459bb670 SHA1 ab2848fd9279f55b5db270f319ad4791154ecf82 SHA256 965534bab462aea8aacb6c35c0683c1079f06d055ff13820584ac862134db2b8
-EBUILD xxdiff-3.2-r1.ebuild 1987 RMD160 5c5c3737d34e21e6c38532e28c30c39b0b5a3f8c SHA1 329978d9df1ebdc14afdde82e3fb4cafe9986a0d SHA256 243c2af28a018c37703ffbf4291add10c3fd8cf83e039b84318c75cc69c8dda3
-MISC ChangeLog 6119 RMD160 723b0f79fe9c59f71b24fe8a696998bccbb33dab SHA1 e8c256df1081439259b8e3b0deeb64b0be2061d6 SHA256 678257f969066585af62ca4c1f2abe9a69ef18c58a214d4cd554772184589d3b
+EBUILD xxdiff-3.2-r1.ebuild 2042 RMD160 2b476def62dd642e3b7d3785d6ebc0c1dfebe2dc SHA1 fbeeaa6135ece4b265eb506269f4ab00a138d6ae SHA256 91ec2e432c5e5754789235eac7af7f760a8d91f13130da98a0d24feb69084751
+MISC ChangeLog 6300 RMD160 3c1b0a37e3ac9f7758cf42ab2103ec78bca3175e SHA1 28d1365e24a9b67822f27b527cd5ad1f9cf6d4ff SHA256 6f552d89cfbaae96f46d7774ae1d03d2d924143cac21b232c3796c5faa601bcf
 MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFICw7Nj9hvisErhMIRAkKrAJ9vaYLMjQySl2hPMwZnA1x9aZaICwCfTsl5
+8c96SeQf/Y6nBQOs7xfK/NM=
+=TlHX
+-----END PGP SIGNATURE-----