Fixed bug #212135.

Package-Manager: portage-2.1.4.4

6 files changed, 46 insertions, 30 deletions

diff --git a/dev-libs/newt/ChangeLog b/dev-libs/newt/ChangeLog
index c12b002d7eca..d4db5b2e275b 100644
--- a/dev-libs/newt/ChangeLog
+++ b/dev-libs/newt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/newt
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/ChangeLog,v 1.40 2008/02/15 20:26:08 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/ChangeLog,v 1.41 2008/03/03 09:11:33 xmerlin Exp $
+
+  03 Mar 2008; Christian Zoffoli <xmerlin@gentoo.org> newt-0.52.2.ebuild,
+  newt-0.52.7.ebuild:
+  Fixed bug #212135, thanks to Chris Slycord <cslycord@gmail.com>.
 
   15 Feb 2008; Samuli Suominen <drac@gentoo.org> newt-0.52.2.ebuild:
   Tested with slang-2.
diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest
index 54253174a69f..c68402cc54ea 100644
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX newt-0.51.4-fix-wstrlen-for-non-utf8-strings.patch 266 RMD160 e4d6e663febfd5781267fec5db373e629700467f SHA1 4e3bacf0880fc221f26dd003adaa632abc35c86c SHA256 23af6c0ba7e968c37dc036fdb9341d3e5122a4d21edea69995e944921448be18
 AUX newt-0.51.6-assorted-fixes.patch 2794 RMD160 a5c4aee71f56524afe06e363d871ee2803b9410c SHA1 d4af3262835f948d1938137c5693066d55a47625 SHA256 346a2158573e2bff6587d62b31b26c476f53827f00f9eac0c9bac361d7b7d1b0
 AUX newt-0.51.6-do-not-ignore-EARLY-events-in-listbox--and-allow-textbox-to-take-focus.patch 645 RMD160 67e04c4ba98e67c7216fcf1a3169939b29839c25 SHA1 e4e81acd14784572bc794e353f43b9d37b70f4a8 SHA256 b0590b06a77516a4c72c24123a92fea05e2c66f8ea81ebee81a5a7996bdbfa27
@@ -17,9 +20,16 @@ AUX newt-gpm-fix.diff 177 RMD160 454f9c72c883f0e59113a31e90d1ad1dacd0a13b SHA1 6
 DIST newt-0.51.6.tar.gz 155739 RMD160 88832ca74fa06ef30739c33e5c75b232b2b149e2 SHA1 6dc9dc3375f0d066187f829719856877342ec3c7 SHA256 b80f265cd204e03fe9f793ab5750269eec71caf9253d2df04792425d22a49375
 DIST newt-0.52.2-9.src.rpm 283433 RMD160 5e33ff2ea5da7e602d0b91287c578bf77c1f6e5b SHA1 eda1f3e1cfb7bed791654fa931c8e6d8904e11d1 SHA256 c28b81fd0464e9e8888c3e79a0fd5485cdfb4f2bb8327af373321735a7e9035b
 DIST newt-0.52.7.tar.gz 167996 RMD160 7f028bdedd0244a9e5f490c6c03e58fdd5825b6f SHA1 eea3b6106f9833fa0799f199a05a714acf78af54 SHA256 e93be06b8833b53c954287e8e084ff38682492bcb94143219e31e41cdd37a930
-EBUILD newt-0.51.6-r1.ebuild 1988 RMD160 ae4a59fd0118bacd9d2730ba5b0825ef7a3457ae SHA1 6476e12753d126b78439252949f8476945ad15b6 SHA256 2789cb80edd6e971fbd2fef74d3d510c7dfe9167ec85138e5635bebb757d7350
-EBUILD newt-0.51.6-r2.ebuild 2152 RMD160 7fb6687dada31536ad2339980709e4056033b48b SHA1 6dbd6730ea2b57b8850d98a0a7912781887b4f67 SHA256 a73ac3d0d8ed9517c61dc9f97854e03c8a8f54ad45f6b0c524b7f60831a1fc55
-EBUILD newt-0.52.2.ebuild 2212 RMD160 6877d2b931c5efc2cbb46c155766758dc4948799 SHA1 e0199885447315ceeafad4d04b7b346cef52bcf3 SHA256 a3a7dec88d2f25ade24a48e340d1236d128f75379d4f35c083c39b344aeabfc2
-EBUILD newt-0.52.7.ebuild 1636 RMD160 061f55b1c9bedf70dbbbdbb7091a23086405b37d SHA1 6b6faf0498cef5a46c5cf5b6d9200ecea29b3a2c SHA256 815f452f6c6848dd62bffaa9b0ab279b95a09b70748a5ac22ac023fc3f712956
-MISC ChangeLog 6243 RMD160 3eda7e148c4be3d948963c26e2e8995f49b2cfe2 SHA1 8258d59f83d01434095fea32919e0a0e06822ee7 SHA256 44a333b5ba317cb3ad1c853231b880ff6ee0ad95f9d6606b92892a5dc6d66661
+EBUILD newt-0.51.6-r1.ebuild 1996 RMD160 8933e2695cd0a5ffc972f26896c43d69f33664d8 SHA1 8086eba6ff4c50efbfebba0c428ec91cb1422ae1 SHA256 25eface8823cb1ee9412d12e42703a70601a94b64f87949f1aa0787c754c1aa3
+EBUILD newt-0.51.6-r2.ebuild 2164 RMD160 b86ef865177f6143eedbf0bfb0809abd8c88f466 SHA1 055cdd2bbc636d73fae17ee39693074a046ead03 SHA256 00ac55db1b44dce822134a1e6d90666d72451f7958918af79404c0eea3478ede
+EBUILD newt-0.52.2.ebuild 2236 RMD160 e8b3ed81a4924872a102c088895aabe9b821a156 SHA1 ea6f17401c40f0fa1939802a03cb5e783019496e SHA256 e36661882d2bd67b5ae68fcb80416501c7a02cb6b4a0b9bd723e8555c19cd324
+EBUILD newt-0.52.7.ebuild 1660 RMD160 90ff03a34d943ed37378576025aff007c9232f64 SHA1 2bc45ca261184423c29d75fcfe665b30d1c40da1 SHA256 4e6d0f9ce5222ac5e8b49b349b79802aa9d37580b98cbe51f7456acf54f5a9f3
+MISC ChangeLog 6410 RMD160 f130e55c3c6c2e4d4564a9cff704502d41efd34d SHA1 612e39c2e881345129691b513a9161f3112b348a SHA256 f9debac6206aa412a8cf9f0a467434fe2e78b86a234dcde59e465e0b67b7118c
 MISC metadata.xml 296 RMD160 d7a28e6b51fad1a08df2463a91ca67a01f1532cb SHA1 18c4543ffb5a19f961b1fb3a93f9dfb778ec4aec SHA256 f459d90a4ac8a519720141bb9fe29415d65805b03d8288537150350aef1abc3e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHy8DOgMUyd/cdjWsRAiesAJ9m5tLfN6+uJiy+f6rKiKA70hhcCgCZARDU
+Th+NMLnnEOt5BnfIWtbjOj0=
+=9RRj
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/newt/newt-0.51.6-r1.ebuild b/dev-libs/newt/newt-0.51.6-r1.ebuild
index bb3f8b0d66b1..cc812fc2c621 100644
--- a/dev-libs/newt/newt-0.51.6-r1.ebuild
+++ b/dev-libs/newt/newt-0.51.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/newt-0.51.6-r1.ebuild,v 1.6 2008/01/15 16:13:35 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/newt-0.51.6-r1.ebuild,v 1.7 2008/03/03 09:11:33 xmerlin Exp $
 
 inherit python toolchain-funcs eutils flag-o-matic
 
@@ -22,27 +22,27 @@ DEPEND="=sys-libs/slang-1*
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	epatch ${FILESDIR}/newt-gpm-fix.diff || die
-	epatch ${FILESDIR}/newt-0.51.4-fix-wstrlen-for-non-utf8-strings.patch || die
-	epatch ${FILESDIR}/${PN}-${PV}-newttextbox-memoryleak.patch || die
+	epatch "${FILESDIR}"/newt-gpm-fix.diff || die
+	epatch "${FILESDIR}"/newt-0.51.4-fix-wstrlen-for-non-utf8-strings.patch || die
+	epatch "${FILESDIR}"/${PN}-${PV}-newttextbox-memoryleak.patch || die
 
 	# bug 73850
 	if use elibc_uclibc; then
-		sed -i -e 's:-lslang:-lslang -lncurses:g' ${S}/Makefile.in
+		sed -i -e 's:-lslang:-lslang -lncurses:g' "${S}"/Makefile.in
 	fi
 
 	# use the correct compiler...
 	sed -i \
 		-e 's:gcc:$(CC):g' \
 		-e "s:\(libdir =\).*:\1 \$(prefix)/$(get_libdir):g" \
-		${S}/Makefile.in || die "sed failed"
+		"${S}"/Makefile.in || die "sed failed"
 
 	# avoid make cleaning up some intermediate files
 	# as it would rebuild them during install :-(
-	echo >>${S}/Makefile.in
-	echo '$(LIBNEWT): $(LIBOBJS)' >>${S}/Makefile.in
+	echo >>"${S}"/Makefile.in
+	echo '$(LIBNEWT): $(LIBOBJS)' >>"${S}"/Makefile.in
 }
 
 src_compile() {
@@ -62,6 +62,6 @@ src_install () {
 	# if it fails, that means something in src_compile() didn't build properly
 	# not parallel safe
 	emake -j1 prefix="${D}/usr" PYTHONVERS="python${PYVER}" RPM_OPT_FLAGS="ERROR" install || die "make install failed"
-	dodoc CHANGES COPYING peanuts.py popcorn.py tutorial.sgml
+	dodoc CHANGES peanuts.py popcorn.py tutorial.sgml
 	dosym libnewt.so.${PV} /usr/$(get_libdir)/libnewt.so.0.51
 }
diff --git a/dev-libs/newt/newt-0.51.6-r2.ebuild b/dev-libs/newt/newt-0.51.6-r2.ebuild
index 8def055a8132..f5bc7a252e59 100644
--- a/dev-libs/newt/newt-0.51.6-r2.ebuild
+++ b/dev-libs/newt/newt-0.51.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/newt-0.51.6-r2.ebuild,v 1.4 2008/01/15 16:13:35 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/newt-0.51.6-r2.ebuild,v 1.5 2008/03/03 09:11:33 xmerlin Exp $
 
 inherit python toolchain-funcs eutils flag-o-matic
 
@@ -22,29 +22,29 @@ DEPEND="=sys-libs/slang-1*
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	epatch ${FILESDIR}/newt-gpm-fix.diff || die
-	epatch ${FILESDIR}/newt-0.51.4-fix-wstrlen-for-non-utf8-strings.patch || die
-	epatch ${FILESDIR}/${P}-newttextbox-memoryleak.patch || die
-	epatch ${FILESDIR}/${P}-assorted-fixes.patch || die
-	epatch ${FILESDIR}/${P}-do-not-ignore-EARLY-events-in-listbox--and-allow-textbox-to-take-focus.patch || die
+	epatch "${FILESDIR}"/newt-gpm-fix.diff || die
+	epatch "${FILESDIR}"/newt-0.51.4-fix-wstrlen-for-non-utf8-strings.patch || die
+	epatch "${FILESDIR}"/${P}-newttextbox-memoryleak.patch || die
+	epatch "${FILESDIR}"/${P}-assorted-fixes.patch || die
+	epatch "${FILESDIR}"/${P}-do-not-ignore-EARLY-events-in-listbox--and-allow-textbox-to-take-focus.patch || die
 
 	# bug 73850
 	if use elibc_uclibc; then
-		sed -i -e 's:-lslang:-lslang -lncurses:g' ${S}/Makefile.in
+		sed -i -e 's:-lslang:-lslang -lncurses:g' "${S}"/Makefile.in
 	fi
 
 	# use the correct compiler...
 	sed -i \
 		-e 's:gcc:$(CC):g' \
 		-e "s:\(libdir =\).*:\1 \$(prefix)/$(get_libdir):g" \
-		${S}/Makefile.in || die "sed failed"
+		"${S}"/Makefile.in || die "sed failed"
 
 	# avoid make cleaning up some intermediate files
 	# as it would rebuild them during install :-(
-	echo >>${S}/Makefile.in
-	echo '$(LIBNEWT): $(LIBOBJS)' >>${S}/Makefile.in
+	echo >>"${S}"/Makefile.in
+	echo '$(LIBNEWT): $(LIBOBJS)' >>"${S}"/Makefile.in
 }
 
 src_compile() {
@@ -64,6 +64,6 @@ src_install () {
 	# if it fails, that means something in src_compile() didn't build properly
 	# not parallel safe
 	emake -j1 prefix="${D}/usr" PYTHONVERS="python${PYVER}" RPM_OPT_FLAGS="ERROR" install || die "make install failed"
-	dodoc CHANGES COPYING peanuts.py popcorn.py tutorial.sgml
+	dodoc CHANGES peanuts.py popcorn.py tutorial.sgml
 	dosym libnewt.so.${PV} /usr/$(get_libdir)/libnewt.so.0.51
 }
diff --git a/dev-libs/newt/newt-0.52.2.ebuild b/dev-libs/newt/newt-0.52.2.ebuild
index 2beed48604ce..8e541d6550cc 100644
--- a/dev-libs/newt/newt-0.52.2.ebuild
+++ b/dev-libs/newt/newt-0.52.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/newt-0.52.2.ebuild,v 1.12 2008/02/15 20:26:08 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/newt-0.52.2.ebuild,v 1.13 2008/03/03 09:11:33 xmerlin Exp $
 
 inherit python toolchain-funcs eutils rpm
 
@@ -59,6 +59,7 @@ src_compile() {
 
 	# not parallel safe
 	emake \
+		CC="$(tc-getCC)" \
 		PYTHONVERS="python${PYVER}" \
 		RPM_OPT_FLAGS="${CFLAGS}" \
 		|| die "emake failed"
diff --git a/dev-libs/newt/newt-0.52.7.ebuild b/dev-libs/newt/newt-0.52.7.ebuild
index 6faaabb235c8..1a6346faba5a 100644
--- a/dev-libs/newt/newt-0.52.7.ebuild
+++ b/dev-libs/newt/newt-0.52.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/newt-0.52.7.ebuild,v 1.5 2008/02/09 11:23:00 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/newt-0.52.7.ebuild,v 1.6 2008/03/03 09:11:33 xmerlin Exp $
 
 inherit python toolchain-funcs eutils rpm
 
@@ -46,6 +46,7 @@ src_compile() {
 
 	# not parallel safe
 	emake \
+		CC="$(tc-getCC)" \
 		PYTHONVERS="python${PYVER}" \
 		RPM_OPT_FLAGS="${CFLAGS}" \
 		|| die "emake failed"