Version bump.

Package-Manager: portage-2.2.0_alpha102/cvs/Linux x86_64

5 files changed, 238 insertions, 22 deletions

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index 892b408792f9..f460f0c0b9b5 100644
--- a/sci-geosciences/gpsd/ChangeLog
+++ b/sci-geosciences/gpsd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-geosciences/gpsd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.84 2012/05/21 22:36:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.85 2012/05/21 22:37:12 vapier Exp $
+
+*gpsd-3.5 (21 May 2012)
+
+  21 May 2012; Mike Frysinger <vapier@gentoo.org> +files/gpsd-3.5-clock.patch,
+  +gpsd-3.5.ebuild, gpsd-9999.ebuild:
+  Version bump.
 
   21 May 2012; Mike Frysinger <vapier@gentoo.org> gpsd-3.4.ebuild,
   +files/gpsd-3.4-no-man-gen.patch:
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 273f4612b171..7c30f30dcd80 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -16,35 +16,39 @@ AUX gpsd-3.4-always-install-man-pages.patch 1258 RMD160 e56c42aea2d024a06d78adaf
 AUX gpsd-3.4-cfgetispeed.patch 1975 RMD160 60f509b398b33f4e4437ba22fb42bd2fc2f4fcd4 SHA1 c263053e552f6b8a9303e503c4a7ad5515a30761 SHA256 e6eee311765eab99cfc682939a693ff30066dead6e17e1b60371de01360e9c01
 AUX gpsd-3.4-chrpath.patch 2838 RMD160 946ec7cca14ea87667cdd41092f767b4fe45ec44 SHA1 fd69c0ba2301e84b77f822a29fffea8acef984b0 SHA256 001944b926d9d328d78a0d971ed610e797b49a07d50bb1933b660b5af2a4f948
 AUX gpsd-3.4-gpsmon-lm.patch 980 RMD160 661751e70335bcb21f8e51091e18a115d9428328 SHA1 d411f29a494c20c5b43281cf1e35d4816950544c SHA256 18719b3557cada637ef2ff824d065ffedcc9598ddea0961925dc6fb9571a2eed
+AUX gpsd-3.4-no-man-gen.patch 506 RMD160 b4ac5a9624fe930e65a194c8afad37d7db868add SHA1 8fb51e5468700022a3147705950679ee42469f69 SHA256 3faa5bc64b10cbfb2435b952bad4a0e1f8a37a85501a3859f6da0b838c4e1762
 AUX gpsd-3.4-strptime.patch 688 RMD160 e1ca75c916072bdd5eea196a7925f87bc0fc982c SHA1 c99ec5ba7dcba81223058b64bb92a2d421f79237 SHA256 df6eadfa97cf120c76738f6742c5bec6abbc28fdfe6f25239369cbfdcf8783e6
+AUX gpsd-3.5-clock.patch 1655 RMD160 ddd907c832d0274c624afdd1bf35707d6d26f631 SHA1 77331703848c1b815b14f396e6bbeb0dda3ad760 SHA256 89d1b866cfacb1044a5afe6dc00d588846a31b629fa7cd6b85a5a079bed098c5
 AUX gpsd.conf-2 314 RMD160 e345c8504b020da4b4a0310b59112ba6eb178dce SHA1 d0499491a762e46e7d76854109266b36c1f22c0b SHA256 2d9ab242319f24dac14d53b57b222b288dfbac10cbdf31c9aecbb65cf03c72dc
 AUX gpsd.init-2 861 RMD160 c1d5a0fd107e3f4bc36a936cbae133c39b8828f7 SHA1 cf08caee2826e7b35d00762c475755bd0ae84d12 SHA256 6b6e3b23d95acd7326e3982509302dbef005e143bb46557c573aca1c0e2cb672
 DIST gpsd-2.95.tar.gz 1385681 RMD160 c9e8d3b7ff73c655d65f0f6e329ca7ff241b10f6 SHA1 af1f575c8ec3a2db7a71c35f2296fd339a4a1ff3 SHA256 832343a53921a8371efa540ba57c91dadedda445e571c1beb97c06539ef450ae
 DIST gpsd-2.96bis.tar.gz 1554605 RMD160 ea09b73709627f95470dbd023e5ffc48209fde6a SHA1 cf123255f9ec54d018642cf230cd05826e507a9e SHA256 c6d72565bc06b802c749e69808eb7c6ee165962dc17383971c9001b5e1763690
 DIST gpsd-3.3.tar.gz 1401206 RMD160 73442e2bccac87a7ba4349ec63c443edbf05a131 SHA1 82a2ffe825c30c2152f2696221dbeeb82a4e9dd5 SHA256 1dbc1813f94f7f05fbf3341bf0154bae26903d1fb90c33b63d5458373ea931b9
 DIST gpsd-3.4.tar.gz 1422890 RMD160 f7cddc018b5b6834a097bbefbddb2b0a3844b203 SHA1 b942902479238f8a3eaa1955299d97461e93081a SHA256 79f7de9ead63c7f5d2c9a92e85b5f82e53323c4d451ef8e27ea265ac3ef9a70f
+DIST gpsd-3.5.tar.gz 1436256 RMD160 5d79e9bae1fa9d96c6104ebbec4386fbe1102a9a SHA1 b280012200a72b745b70ed44c635fccc8dc88cfd SHA256 5ebb0b00c49421eb8fbead81342e5ce63e82065e5ff27da586f10e342b999171
 EBUILD gpsd-2.95-r1.ebuild 2674 RMD160 3cfe82ffac9f57d771b6728420d106debd49c22e SHA1 86ba4ecde7158a24c535675036f638c9f6683ecc SHA256 d8e81c1b8b9531fc59ea1c9da7710c76c23802faec8e6d404732ed557058ed7b
 EBUILD gpsd-2.96-r1.ebuild 2840 RMD160 75cc21a587c3ef12bb891f8a2dc7ee30fa7cfb1f SHA1 bdf8663fb324ca8ddbe81b58348d12b6a03174ca SHA256 04bab92bbe716753ff6bcd719fa958e32440e7bcc219c6d409936edda0fed695
 EBUILD gpsd-3.3-r1.ebuild 4271 RMD160 1082fd6fda6c9ee12c5b9ae6c4f8508753906c6a SHA1 9f11ddb5d5d2828a36353421aa05c6e8dda0442a SHA256 faf8236ab66713d04d11a2f4d5cd6d8e62e303e922289ecbb915c9adf0d57108
 EBUILD gpsd-3.3.ebuild 4145 RMD160 454a2da60f501ac74e252c7ea24c974b1fef01df SHA1 71da34e59fbb43815fed0653af9e3290ddef9da7 SHA256 2eea0510ce1e65d67cd65a41a7191bee6f0d0dfdc4eb5a6f218ed61a4bc47186
-EBUILD gpsd-3.4.ebuild 4471 RMD160 f25f77e7f4f375524468c6db616f9acbfee14ea6 SHA1 5edb6cafb9352d0c1b201b1585c4977d33761337 SHA256 da597623a584953d665c53535af9c924c10fa6068a6d329365263ac707d3f9a9
-EBUILD gpsd-9999.ebuild 4366 RMD160 2605ae104703a3f2d46cd2b4d4f49a46956a0666 SHA1 f963d038006146e477bb6af22c6e2b13c8902458 SHA256 9cb8272c6c3cac249a8b446c19a2260386212eec725bf26c626eebdfa5d6024d
-MISC ChangeLog 15230 RMD160 2d2736f0b48528e00435651d64e448b93ed3e01b SHA1 391f99b47529932d30e1d993ce97bd05f9cd9d7e SHA256 59bd2e708e1f06c8537e8f9abdee6da606a09b9707686aa7062a41f342a37b85
+EBUILD gpsd-3.4.ebuild 4520 RMD160 c24b952ac74aac3a654008a0cdd2e79b3ad148dd SHA1 464a72037c5b9d3d6a746d02708e1922ce378a29 SHA256 3a3f9910ed99342f62326cf4f2e59d36b9d4f2868e330fb5c72ad8e8e556ac20
+EBUILD gpsd-3.5.ebuild 4431 RMD160 09d54c080a66b4eb60c140b624c597c17b0afa54 SHA1 265cb3a3da1120a1db68af2453237e81fbb65fd1 SHA256 7d703c80d7e43ff75f3db8006b24491c5de5eaeda0af507789258e91e9197e9b
+EBUILD gpsd-9999.ebuild 4432 RMD160 7e96cfa6124c31d681686894dc239e2045b28f24 SHA1 28b11c523416048e7b10dfd89d98e1180c696ea6 SHA256 425140da3bba06134416578ddd9ce0541f11eb51226a93913f27121dcd2bd0a3
+MISC ChangeLog 15551 RMD160 5c897cea25ec2ceb56e698d7e92600007e0a18ac SHA1 b56b015f9724abb499c968bceb5ff69c0b60ee2c SHA256 e2c662357217b6df3cd03f1b5e6b9b7e8537d7848f082864df65bc0d0212bac7
 MISC metadata.xml 755 RMD160 5b1284e2e50fbcd3f84fa388c3980298d74bfbfd SHA1 de24f0892fb828f2cb8c64aae6a0f7a53cb5239e SHA256 62975e20eaea76bd26e07faaffc0409ff0474fb57b2556040538c4ca4e553d48
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPNEVeAAoJELEHsLL7fEFWpZ0QAJmWjESEpAeg+veNV9omG0nm
-s40QFZVH/jG70neZ3/hnP0TYDhDBq4YQP67jxRx8UC4syCM0ziGKl5jBwvFekMmi
-a4AtINLg3dTsSpR+lyoTYCEXg/aNBdZywvEkEcZYMAaZjfPN5xuznpWQrNTEhrEE
-HfrjlSfcA2YpGpXaQTjX47pkzzJo6GfnewGycy0XIyQlCcZ5P7XmOtgOS3GdTxTS
-hoBVYkxFzpyPEzxRBzasAUp2JK+jiywlM6AOOgdf+k3XPXBfeC0vUbZirBf9yn80
-FWC0cQSYOctN1EicmMgwvPa2IyQuSO3cWy42pp7gP1RCrA55BcNYqGZHtBc4zjes
-KdH286pq/3rY3xPN5eM+2seLRWlyirU2AFitWLSaH0JfE9eqEB3KeefCe5bszi7H
-T+qUPGaE8LD13epwTLcxK1jBEyd+X758zlfgHCrS2pu6C/5qobZe0ySoTKHCJOf3
-L/lu9MO28K92OOA3d6F5+aTyTWzU7Z77ol+c1/18C2vch33je5pP/tc8O/w//W91
-CiPpesJCbc4XGtRegpVmWxhImYnW8nsWxHC8VFeBaa1cSFmZ63DQvF9G8Ajm+fy2
-GEw5zMaff/tfEphAZP/Vtyjxe9X15KTItd5KALSw+KNkfHoe81l8FwsQeEv/zWk+
-203tPe7FCraveIF5TZIK
-=nEn5
+iQIcBAEBAgAGBQJPusPbAAoJELEHsLL7fEFWXTgP+gM2KebaVv4HnoVINsvyLRIg
+p/UtssUdzT51nwh8zFDjAhJ2YU84bYjq3kgunBV7vw5xukTpBN8CVhme201+ThIL
+UOEgJABgkC31uPzNfjen0RrCOd86LqyxboP/W4x8sS54kJxIJj/G2Sz1w9JvAQgk
+Pb8k+G6Cczs+bx9mYfitTLw7Y3qXxz/WTwT4A7MiiRupLW9fKAYH60Z7dV02dCja
+Ie8uApqI1EWIMVy1015zK3fakjGwcxU7Q5jAc0Y5cbXMGEYUV2CcfOJ6xfvgWJpr
+0qmYaFpvUrairnaGgCFQWyx4bNW8O/cCur2w4Amh/+sB8x+8E7g2QorLuRIGmvk4
+P8hDiApFnazadtwI22HtBDdPlcXHjhPsRsveHTP+V0kz9WxJLnntw4qi5KmT5sSK
+HKr5ELO++BiRcocK/R7kmHQicPctSNHPM1TrD+nZiGBHOxXmXA1RiPHS1BT5XGyt
+kh8ik3ReRG044qb1rMr53uoLg6oicxvcnk5/Gk7eV8vUMWdvNVkxFqgnzolwrqou
+SKmOk+H0+qcJbirCETfCix5jh76qB6eO8INQt2nDzC2YKAd5xnyA26Pelt0OPGLM
+38jqRd261mzjm4pDfY1s0sdssmHEAxlu2L4lLtoPqJSXssGGTTASA7Qc3947CssB
+SQefXAJMzofMAC5VVNkj
+=yVRc
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/gpsd/files/gpsd-3.5-clock.patch b/sci-geosciences/gpsd/files/gpsd-3.5-clock.patch
new file mode 100644
index 000000000000..478b12a48194
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.5-clock.patch
@@ -0,0 +1,42 @@
+From f9f9bb6c10102f3d69a7f50e758a3a9256bf8744 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 21 May 2012 16:27:36 -0400
+Subject: [PATCH] fix building with clock_gettime and newer glibc
+
+Building with recent glibc versions fails in gpsutils.c due to missing
+definitions related to clock_gettime.  This is because we define the
+_XOPEN_SOURCE macro, but not to a new enough value.  So set it to a
+recent spec value that satisfies both strptime and clock_gettime.
+
+Example build failure with glibc-2.15:
+gpsutils.c: In function 'timestamp':
+gpsutils.c:299:22: error: storage size of 'ts' isn't known
+gpsutils.c:300:14: warning: implicit declaration of function 'clock_gettime' [-Wimplicit-function-declaration]
+gpsutils.c:300:34: error: 'CLOCK_REALTIME' undeclared (first use in this function)
+gpsutils.c:300:34: note: each undeclared identifier is reported only once for each function it appears in
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ gpsutils.c |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/gpsutils.c b/gpsutils.c
+index 523838a..3b4990a 100644
+--- a/gpsutils.c
++++ b/gpsutils.c
+@@ -5,8 +5,10 @@
+  */
+ 
+ /* The strptime prototype is not provided unless explicitly requested.
+- *  So add the define that POSIX says to to avoid: */
+-#define _XOPEN_SOURCE
++ * We also need to set the value high enough to signal inclusion of
++ * newer features (like clock_gettime).  See the POSIX spec for more info:
++ * http://pubs.opengroup.org/onlinepubs/9699919799/functions/V2_chap02.html#tag_15_02_01_02 */
++#define _XOPEN_SOURCE 600
+ 
+ #include <stdio.h>
+ #include <time.h>
+-- 
+1.7.8.6
+
diff --git a/sci-geosciences/gpsd/gpsd-3.5.ebuild b/sci-geosciences/gpsd/gpsd-3.5.ebuild
new file mode 100644
index 000000000000..66dd7e2984a7
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-3.5.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-3.5.ebuild,v 1.1 2012/05/21 22:37:12 vapier Exp $
+
+EAPI="4"
+
+PYTHON_DEPEND="python? 2:2.6"
+RESTRICT_PYTHON_ABIS="3.*"
+SUPPORT_PYTHON_ABIS="1"
+SCONS_MIN_VERSION="1.2.1"
+
+inherit eutils user multilib distutils scons-utils toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git"
+	inherit git-2
+else
+	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients"
+HOMEPAGE="http://catb.org/gpsd/"
+
+LICENSE="BSD"
+SLOT="0"
+
+GPSD_PROTOCOLS=(
+	ashtech aivdm clientdebug earthmate evermore fv18 garmin
+	garmintxt gpsclock itrax mtk3301 nmea ntrip navcom oceanserver
+	oldstyle oncore rtcm104v2 rtcm104v3 sirf superstar2 timing tsip
+	tripmate tnt ubx
+)
+IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 ncurses ntp python qt4 +shm +sockets test udev usb X"
+REQUIRED_USE="X? ( python )"
+
+RDEPEND="X? ( dev-python/pygtk:2 )
+	ncurses? ( sys-libs/ncurses )
+	bluetooth? ( net-wireless/bluez )
+	usb? ( virtual/libusb:1 )
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)
+	ntp? ( net-misc/ntp )
+	qt4? ( x11-libs/qt-gui )"
+DEPEND="${RDEPEND}
+	test? ( sys-devel/bc )"
+
+# xml packages are for man page generation
+if [[ ${PV} == "9999" ]] ; then
+	DEPEND+="
+		app-text/xmlto
+		=app-text/docbook-xml-dtd-4.1*"
+fi
+
+pkg_setup() {
+	use python && python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.3-ldflags.patch
+	epatch "${FILESDIR}"/${PN}-3.4-chrpath.patch
+	epatch "${FILESDIR}"/${PN}-3.4-always-install-man-pages.patch
+	epatch "${FILESDIR}"/${PN}-3.5-clock.patch
+	epatch "${FILESDIR}"/${PN}-3.4-no-man-gen.patch
+
+	# Avoid useless -L paths to the install dir
+	sed -i \
+		-e '/^env.Prepend(LIBPATH=.installdir(.libdir.).)$/d' \
+		-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
+		SConstruct || die
+
+	# Extract python info out of SConstruct so we can use saner distribute
+	if use python ; then
+		pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
+		local pybins=$(pyvar python_progs)
+		local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct)
+		local packet=$(python -c "${pysrcs}; print(python_extensions['gps/packet'])")
+		local client=$(python -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])")
+		sed \
+			-e "s|@VERSION@|$(pyvar gpsd_version)|" \
+			-e "s|@URL@|$(pyvar website)|" \
+			-e "s|@EMAIL@|$(pyvar devmail)|" \
+			-e "s|@SCRIPTS@|${pybins}|" \
+			-e "s|@GPS_PACKET_SOURCES@|${packet}|" \
+			-e "s|@GPS_CLIENT_SOURCES@|${client}|" \
+			-e "s|@SCRIPTS@|$(pyvar python_progs)|" \
+			"${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
+		distutils_src_prepare
+	fi
+}
+
+src_configure() {
+	myesconsargs=(
+		prefix="${EPREFIX}/usr"
+		libdir="\$prefix/$(get_libdir)"
+		gpsd_user=gpsd
+		gpsd_group=uucp
+		strip=False
+		python=False
+		$(use_scons bluetooth bluez)
+		$(use_scons cxx libgpsmm)
+		$(use_scons debug)
+		$(use_scons dbus dbus_export)
+		$(use_scons ipv6)
+		$(use_scons ncurses)
+		$(use_scons ntp ntpshm)
+		$(use_scons ntp pps)
+		$(use_scons shm shm_export)
+		$(use_scons sockets socket_export)
+		$(use_scons qt4 libQgpsmm)
+		$(use_scons usb)
+	)
+
+	# enable specified protocols
+	local protocol
+	for protocol in ${GPSD_PROTOCOLS[@]} ; do
+		myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) )
+	done
+}
+
+src_compile() {
+	export CHRPATH=
+	tc-export CC CXX PKG_CONFIG
+	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
+	escons
+
+	use python && distutils_src_compile
+}
+
+src_install() {
+	DESTDIR="${D}" escons install $(usex udev udev-install "")
+
+	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
+	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
+
+	if use python ; then
+		distutils_src_install
+		# Delete all X related packages if user doesn't want them
+		if ! use X ; then
+			local p
+			for p in $(grep -Il 'import .*pygtk' *) ; do
+				find "${D}"/usr/bin -name "${p}*" -delete
+			done
+		fi
+	fi
+}
+
+pkg_preinst() {
+	# Run the gpsd daemon as gpsd and group uucp; create it here
+	# as it doesn't seem to be needed during compile/install ...
+	enewuser gpsd -1 -1 -1 "uucp"
+}
+
+pkg_postinst() {
+	use python && distutils_pkg_postinst
+}
+
+pkg_postrm() {
+	use python && distutils_pkg_postrm
+}
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 49a95f9c21b7..64b570cd867e 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v 1.1 2012/02/09 22:14:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v 1.2 2012/05/21 22:37:12 vapier Exp $
 
 EAPI="4"
 
@@ -61,9 +61,10 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.3-ldflags.patch
-	epatch "${FILESDIR}"/${PN}-3.4-strptime.patch
 	epatch "${FILESDIR}"/${PN}-3.4-chrpath.patch
 	epatch "${FILESDIR}"/${PN}-3.4-always-install-man-pages.patch
+	epatch "${FILESDIR}"/${PN}-3.5-clock.patch
+	epatch "${FILESDIR}"/${PN}-3.4-no-man-gen.patch
 
 	# Avoid useless -L paths to the install dir
 	sed -i \
@@ -93,8 +94,8 @@ src_prepare() {
 
 src_configure() {
 	myesconsargs=(
-		prefix=/usr
-		libdir="/$(get_libdir)"
+		prefix="${EPREFIX}/usr"
+		libdir="\$prefix/$(get_libdir)"
 		gpsd_user=gpsd
 		gpsd_group=uucp
 		strip=False