Underlinking fixed, all src files get compiled, #313255

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 34 insertions, 22 deletions

diff --git a/dev-tcltk/tclpython/ChangeLog b/dev-tcltk/tclpython/ChangeLog
index 80f745d614a7..9a8c2537725b 100644
--- a/dev-tcltk/tclpython/ChangeLog
+++ b/dev-tcltk/tclpython/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tcltk/tclpython
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclpython/ChangeLog,v 1.10 2010/03/31 21:03:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclpython/ChangeLog,v 1.11 2010/04/05 20:16:17 jlec Exp $
+
+  05 Apr 2010; Justin Lecher <jlec@gentoo.org> tclpython-3.1-r1.ebuild,
+  tclpython-4.1-r2.ebuild:
+  Underlinking fixed, all src files get compiled, #313255
 
 *tclpython-4.1-r2 (31 Mar 2010)
 *tclpython-3.1-r1 (31 Mar 2010)
diff --git a/dev-tcltk/tclpython/Manifest b/dev-tcltk/tclpython/Manifest
index 1891f0385c16..a578b94b8485 100644
--- a/dev-tcltk/tclpython/Manifest
+++ b/dev-tcltk/tclpython/Manifest
@@ -3,16 +3,16 @@ Hash: SHA1
 
 DIST tclpython-3.1.tar.gz 6242 RMD160 7c17a924d4b6072b8fe3778336d70a5e36e85002 SHA1 3ddbc18500b6b322dd495b53255bc37cbfdef315 SHA256 b1126363be333352e15d65451cacd36be95b479c4b6c80871f32511cd1914bfe
 DIST tclpython-4.1.tar.bz2 10580 RMD160 20b3d3cdcea9f7313ae39841f4491fbd2bcc2b38 SHA1 ed5e6ccc795d02cd467d8a43046a35629c88f982 SHA256 663e0e9e16875fda8e98fd8c74108475062b5e96dcf7145b46142b16c289db50
-EBUILD tclpython-3.1-r1.ebuild 1064 RMD160 77de019fcd60a10eab7fdff9c71040f5b7f58a6c SHA1 6d6cba4369da2bcd700d26df000363522d7d54cf SHA256 0a41b964c8b7fc3ea97aabe8bf79ca5e96dc26a0b1097ef42a3b4d57834ee041
+EBUILD tclpython-3.1-r1.ebuild 1135 RMD160 9ad335d1087522857ba4feae3d85bcfe2e7a6206 SHA1 84f4a0f568c8495acd7b0b4e931d1ed7431ccc7a SHA256 077db1e85fe35a7729d70ca62ba814fdc20777896b9110efb68775871a36c6c1
 EBUILD tclpython-3.1.ebuild 867 RMD160 20ecb9c8a789f74f537d2697e98ecd49c5b1162e SHA1 34d6f1bdd0508b4602ab8e35fcf6aeea9f60ed30 SHA256 f5dd415a6b92c1e0f5c2c0cbe7fd26a6a69f50325334878dc399f88f5c55058b
 EBUILD tclpython-4.1-r1.ebuild 968 RMD160 e02e3d26a3f7fbb4fb8a7173aad27b0605090646 SHA1 cda7101d8eb4d9e031aef62ed853fbcb7bd4a861 SHA256 610c87d1a88a2862f8c44f009887bb5b7f82066eb233df3f8eb7dce60dfd85e5
-EBUILD tclpython-4.1-r2.ebuild 1065 RMD160 5a0fc8e2cfb161299367169a345ee94789d38ae0 SHA1 f70ac4465cad659425786ba604af7f8e9d17380a SHA256 6ac25c2afcdadd112240788dd060dfe7d44a745089c72e53722e140184b6e1cd
-MISC ChangeLog 1331 RMD160 1489320c488e620b87b229cbc26b5501360ba1d3 SHA1 48865abff0ba560f564c8682114a5a17987cffe1 SHA256 a714bd7fddd3ba90acfa910668fd7948a0e62f1e9581f2266ca49a222880d361
+EBUILD tclpython-4.1-r2.ebuild 1156 RMD160 71f07de85fbcc7f83ec387733a595c515aff37dc SHA1 53d852b02836560cf360c081d9d921517acf5424 SHA256 cbb4a2c2dd73f34db8f7e20f1f5a67542fbc3854759a81f0b8e7fea856ef3673
+MISC ChangeLog 1489 RMD160 e2a8f1beee7943731dfff6a33cea6ce29101c430 SHA1 240669cc035fc9b82f3087051c62ae7cce217444 SHA256 8b9c830fbfeebe50f222e1ed742a0213b5b36c71c01c28840e9ae8f3b583ec4c
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuzuKMACgkQgAnW8HDreRYISgCeNfxjhojh/Qo7Jjlpouh+pbPN
-0W8AoNAGFfds/HT+0iEuC0wYvZI55uBt
-=+vHv
+iEYEARECAAYFAku6RRcACgkQgAnW8HDreRaKZACgzdKXO5KiLQJLCsCQX4l+Szr/
+cMQAoMN177nZDmcaePzxIhouINs63BYh
+=pzw3
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tclpython/tclpython-3.1-r1.ebuild b/dev-tcltk/tclpython/tclpython-3.1-r1.ebuild
index 5e77c4070c6c..ec598446c9a7 100644
--- a/dev-tcltk/tclpython/tclpython-3.1-r1.ebuild
+++ b/dev-tcltk/tclpython/tclpython-3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclpython/tclpython-3.1-r1.ebuild,v 1.1 2010/03/31 21:03:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclpython/tclpython-3.1-r1.ebuild,v 1.2 2010/04/05 20:16:17 jlec Exp $
 
 PYTHON_DEPEND="2"
 
@@ -18,13 +18,18 @@ IUSE=""
 DEPEND=">=dev-lang/tcl-8.4"
 
 src_compile() {
-	einfo \
-		"$(tc-getCC) -shared ${LDFLAGS} -fPIC ${CFLAGS} -o tclpython.so.${PV} \
-		-I$(python_get_includedir) tclpython.c -lpthread -lutil"
+	cfile="tclpython"
+	for src in ${cfile}; do
+		compile="$(tc-getCC) -shared -fPIC ${CFLAGS} -I$(python_get_includedir) -c ${src}.c"
+		einfo "${compile}"
+		eval "${compile}" || die
+	done
 
-	$(tc-getCC) -shared ${LDFLAGS} -fPIC ${CFLAGS} -o tclpython.so.${PV} \
-		-I$(python_get_includedir) tclpython.c -lpthread -lutil \
-		|| die
+	link="$(tc-getCC) -fPIC -shared ${LDFLAGS} -o tclpython.so.${PV} tclpython.o -lpthread -lutil $(python_get_library -l) -ltcl"
+
+	einfo "${link}"
+
+	eval "${link}" || die
 }
 
 src_install() {
diff --git a/dev-tcltk/tclpython/tclpython-4.1-r2.ebuild b/dev-tcltk/tclpython/tclpython-4.1-r2.ebuild
index 28c745a57df9..e726cf25dc8c 100644
--- a/dev-tcltk/tclpython/tclpython-4.1-r2.ebuild
+++ b/dev-tcltk/tclpython/tclpython-4.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclpython/tclpython-4.1-r2.ebuild,v 1.1 2010/03/31 21:03:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclpython/tclpython-4.1-r2.ebuild,v 1.2 2010/04/05 20:16:17 jlec Exp $
 
 PYTHON_DEPEND="2"
 
@@ -18,13 +18,16 @@ IUSE=""
 DEPEND=">=dev-lang/tcl-8.4"
 
 src_compile() {
-	einfo \
-		"$(tc-getCC) -shared ${LDFLAGS} -fPIC ${CFLAGS} -o tclpython.so.${PV} \
-		-I$(python_get_includedir) tclpython.c -lpthread -lutil"
-
-	$(tc-getCC) -shared ${LDFLAGS} -fPIC ${CFLAGS} -o tclpython.so.${PV} \
-		-I$(python_get_includedir) tclpython.c -lpthread -lutil \
-		|| die
+	cfile="tclpython tclthread"
+	for src in ${cfile}; do
+		compile="$(tc-getCC) -shared -fPIC ${CFLAGS} -I$(python_get_includedir) -c ${src}.c"
+		einfo "${compile}"
+		eval "${compile}" || die
+	done
+
+	link="$(tc-getCC) -fPIC -shared ${LDFLAGS} -o tclpython.so.${PV} tclpython.o tclthread.o -lpthread -lutil $(python_get_library -l) -ltcl"
+	einfo "${link}"
+	eval "${link}" || die
 }
 
 src_install() {