Cleaned Python ABI specific code, #312217

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

4 files changed, 34 insertions, 17 deletions

diff --git a/dev-tcltk/tclpython/ChangeLog b/dev-tcltk/tclpython/ChangeLog
index 8b5aef2a44c6..751865345f14 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.13 2010/04/21 06:20:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclpython/ChangeLog,v 1.14 2010/12/07 19:43:12 jlec Exp $
+
+  07 Dec 2010; Justin Lecher <jlec@gentoo.org> tclpython-3.1-r1.ebuild,
+  tclpython-4.1-r2.ebuild:
+  Cleaned Python ABI specific code, #312217
 
   21 Apr 2010; Justin Lecher <jlec@gentoo.org> -tclpython-3.1.ebuild,
   -tclpython-4.1-r1.ebuild:
diff --git a/dev-tcltk/tclpython/Manifest b/dev-tcltk/tclpython/Manifest
index 668a642f85d7..efa5ea188646 100644
--- a/dev-tcltk/tclpython/Manifest
+++ b/dev-tcltk/tclpython/Manifest
@@ -3,14 +3,14 @@ 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 1140 RMD160 a1ac7e0c06417703937e87634575ecfd23ce4208 SHA1 699f68f1c9171795a1c3370e889db1fcc4dddd3b SHA256 7f5ee1c163551cd24b9173cac0d23e4bb31d0a61dc36fba0d7630811a41d02f4
-EBUILD tclpython-4.1-r2.ebuild 1156 RMD160 71f07de85fbcc7f83ec387733a595c515aff37dc SHA1 53d852b02836560cf360c081d9d921517acf5424 SHA256 cbb4a2c2dd73f34db8f7e20f1f5a67542fbc3854759a81f0b8e7fea856ef3673
-MISC ChangeLog 1756 RMD160 6637e2eb4a7a55ca7dee4552232d052a1f63a994 SHA1 98ab4f85129139b19db5ee75f6103ff1a9aa17a6 SHA256 66e36e38613a96cb688e6cb7e8fdef5d2b1fbbb5b36e500599742ad95e8e039f
+EBUILD tclpython-3.1-r1.ebuild 1271 RMD160 efb623f1a0252915de9318a22750d6b05547e86f SHA1 001a528d6cc0db316a0c1999952ababaabc390bf SHA256 5e8177da26c897e49543b47268e287bc149d2dc482da2408e197ae97e6fe5af9
+EBUILD tclpython-4.1-r2.ebuild 1294 RMD160 4422f572acc06df52d7602c266d1c079bfe9bddd SHA1 79b283e42e0371ccf7b187c79f5c10848f8e0357 SHA256 8b6613ccd6525cc23ed07e912d3bc8a5b67a00a884bdd54dfb1e6c3ce11c459b
+MISC ChangeLog 1900 RMD160 ab7a944696defb0a34720ca5daf2e805b6d27fc9 SHA1 6fb18fb13f36f01e2032efb2538dbf7971461c47 SHA256 5a85a0e0962225608ad7aca607f3200a96322cafbbbd969d9a6bb14e54eafcaa
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkvOmRgACgkQgAnW8HDreRa5RgCdH4PPrIVS21JwHOeNWz2laUcw
-OoMAn1RKPFP53FoQTquSetfWv9HIpSii
-=lk91
+iEYEARECAAYFAkz+jlgACgkQgAnW8HDreRYivACfVI3ahmG89TMyO0JAFvIO8o4Y
+qNEAnini89NKe4UBR/Kn068A8pgoWrKV
+=55Mx
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tclpython/tclpython-3.1-r1.ebuild b/dev-tcltk/tclpython/tclpython-3.1-r1.ebuild
index 80077dc76119..a4d0711afc86 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.3 2010/04/12 13:37:16 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclpython/tclpython-3.1-r1.ebuild,v 1.4 2010/12/07 19:43:13 jlec Exp $
 
 PYTHON_DEPEND="2"
 
@@ -15,7 +15,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
-DEPEND=">=dev-lang/tcl-8.4"
+DEPEND="dev-lang/tcl"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
 
 src_compile() {
 	cfile="tclpython"
@@ -28,13 +34,13 @@ src_compile() {
 	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() {
-	exeinto /usr/$(get_libdir)/tclpython
-	doexe tclpython.so.${PV} pkgIndex.tcl || die "tcl"
+	insinto /usr/$(get_libdir)/tclpython
+	doins tclpython.so.${PV} pkgIndex.tcl || die "tcl"
+	fperms 775 /usr/$(get_libdir)/tclpython/tclpython.so.${PV}
 	dosym tclpython.so.${PV} /usr/$(get_libdir)/tclpython/tclpython.so || die
 
 	dodoc CHANGES INSTALL README || die
diff --git a/dev-tcltk/tclpython/tclpython-4.1-r2.ebuild b/dev-tcltk/tclpython/tclpython-4.1-r2.ebuild
index e726cf25dc8c..87facdcc61c4 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.2 2010/04/05 20:16:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclpython/tclpython-4.1-r2.ebuild,v 1.3 2010/12/07 19:43:12 jlec Exp $
 
 PYTHON_DEPEND="2"
 
@@ -15,7 +15,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND=">=dev-lang/tcl-8.4"
+DEPEND="dev-lang/tcl"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
 
 src_compile() {
 	cfile="tclpython tclthread"
@@ -31,8 +37,9 @@ src_compile() {
 }
 
 src_install() {
-	exeinto /usr/$(get_libdir)/tclpython
-	doexe tclpython.so.${PV} pkgIndex.tcl || die "tcl"
+	insinto /usr/$(get_libdir)/tclpython
+	doins tclpython.so.${PV} pkgIndex.tcl || die "tcl"
+	fperms 775 /usr/$(get_libdir)/tclpython/tclpython.so.${PV}
 	dosym tclpython.so.${PV} /usr/$(get_libdir)/tclpython/tclpython.so || die
 
 	dodoc CHANGES INSTALL README || die