[gentoo-commits] gentoo-x86 commit in dev-util/nsis: ChangeLog nsis-2.31.ebuild nsis-2.33.ebuild

[Alin Nastac (mrness)]

mrness      07/12/04 14:06:13

  Modified:             ChangeLog nsis-2.31.ebuild
  Added:                nsis-2.33.ebuild
  Log:
  Stable on x86. Version bump.
  (Portage version: 2.1.3.19)

Revision  Changes    Path
1.15                 dev-util/nsis/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/nsis/ChangeLog?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/nsis/ChangeLog?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/nsis/ChangeLog?r1=1.14&r2=1.15

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/nsis/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ChangeLog	22 Oct 2007 22:34:09 -0000	1.14
+++ ChangeLog	4 Dec 2007 14:06:13 -0000	1.15
@@ -1,6 +1,12 @@
 # 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.14 2007/10/22 22:34:09 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/ChangeLog,v 1.15 2007/12/04 14:06:13 mrness Exp $
+
+*nsis-2.33 (04 Dec 2007)
+
+  04 Dec 2007; Alin Năstac <mrness@g.o> nsis-2.31.ebuild,
+  +nsis-2.33.ebuild:
+  Stable on x86. Version bump.
 
 *nsis-2.31 (22 Oct 2007)
 



1.2                  dev-util/nsis/nsis-2.31.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/nsis/nsis-2.31.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/nsis/nsis-2.31.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/nsis/nsis-2.31.ebuild?r1=1.1&r2=1.2

Index: nsis-2.31.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/nsis/nsis-2.31.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nsis-2.31.ebuild	22 Oct 2007 22:34:09 -0000	1.1
+++ nsis-2.31.ebuild	4 Dec 2007 14:06:13 -0000	1.2
@@ -1,6 +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.31.ebuild,v 1.1 2007/10/22 22:34:09 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/nsis-2.31.ebuild,v 1.2 2007/12/04 14:06:13 mrness Exp $
 
 mingw32_variants=$(eval echo {,i{6,5,4,3}86-}mingw32)
 
@@ -10,7 +10,7 @@
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="bzip2 config-log zlib"
 
 # NSIS Menu uses wxwindows but it's all broken, so disable for now



1.1                  dev-util/nsis/nsis-2.33.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/nsis/nsis-2.33.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/nsis/nsis-2.33.ebuild?rev=1.1&content-type=text/plain

Index: nsis-2.33.ebuild
===================================================================
# 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.33.ebuild,v 1.1 2007/12/04 14:06:13 mrness 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)\" \
		SKIPPLUGINS=\"\" \
		SKIPUTILS=\"NSIS Menu\" \
		SKIPMISC=\"\"
	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
}



-- 
gentoo-commits@g.o mailing list