From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on finch.gentoo.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=DATE_IN_PAST_24_48,DMARC_NONE, INVALID_DATE,MAILING_LIST_MULTI autolearn=no autolearn_force=no version=4.0.0 Received: from two.fidnet.com ([205.216.200.52] helo=mail.fidnet.com) by cvs.gentoo.org with smtp (Exim 3.30 #1) id 15yoOZ-00028z-00 for gentoo-dev@cvs.gentoo.org; Tue, 30 Oct 2001 22:58:35 -0700 Received: (qmail 21533 invoked from network); 31 Oct 2001 05:58:27 -0000 Received: from unknown (HELO dialup-mo-95-198.stjames.fidnet.com) (216.229.95.198) by 0 with SMTP; 31 Oct 2001 05:58:27 -0000 Subject: Re: [gentoo-dev] dev-lang/python-2.0-r5 From: "Tod M. Neidt" To: gentoo-dev mailing list In-Reply-To: <20011028174208.1b194351.lordjoe@bigfoot.com> References: <20011028174208.1b194351.lordjoe@bigfoot.com> Content-Type: multipart/mixed; boundary="=-w1ebuhxyvRu5kIDkLzuQ" X-Mailer: Evolution/0.15 (Preview Release) Message-Id: <1004486573.598.7.camel@Q.neidt.net> Mime-Version: 1.0 Sender: gentoo-dev-admin@cvs.gentoo.org Errors-To: gentoo-dev-admin@cvs.gentoo.org X-BeenThere: gentoo-dev@cvs.gentoo.org X-Mailman-Version: 2.0 Precedence: bulk Reply-To: gentoo-dev@cvs.gentoo.org List-Help: List-Post: List-Subscribe: , List-Id: Gentoo Linux development list List-Unsubscribe: , List-Archive: Date: Tue Oct 30 22:59:01 2001 X-Original-Date: 31 Oct 2001 00:02:51 +0000 X-Archives-Salt: 0a09fd3c-7149-445b-9be7-cd21b3b3cb7b X-Archives-Hash: d078dd382497be42347d13b4de1a2ebd --=-w1ebuhxyvRu5kIDkLzuQ Content-Type: text/plain Content-Transfer-Encoding: 7bit Hi! Please find a patch that makes the python-2.0-r5.ebuild independent of the tcl-tk version, i.e. no hard coded version number. This is done by grep-ing the tcl and tk header files. Also, is their a reason that tcl-tk-8.4 is masked. I have been using 8.4 with python-2.0 for well over 6 months. I also rebuilt python-2.0 with the patch mentioned above with tcl-tk-8.4 already merged. /usr/bin/idle.py pops right up. Comments welcome tod On Mon, 2001-10-29 at 01:42, Joe Bormolini wrote: > dev-lang/python-2.0-r5.ebuild > Line 48: s:#[[:blank:]]*-ltk8.0 -ltcl8.0:-ltk8.4 -ltcl8.4: > > the ebuild actually depends on >=dev-lang/tcl-tk-8.0 if tcltk is in USE yet a note above says the dep is =dev-lang/tcl-tk > > tcl-tk-8.4 is in package.mask listed as being incompatible with python, but the python ebuild tries to compile with -ltk8.4 and -ltcl8.4 no matter what version of tcl-tk is installed. Something needs to be fixed here :p > > --lordjoe > > _______________________________________________ > gentoo-dev mailing list > gentoo-dev@cvs.gentoo.org > http://cvs.gentoo.org/mailman/listinfo/gentoo-dev > --=-w1ebuhxyvRu5kIDkLzuQ Content-Type: text/plain Content-Disposition: attachment; filename=python-2.0-r5-tcl-tk.patch Content-Transfer-Encoding: 7bit --- /usr/portage/dev-lang/python/python-2.0-r5.ebuild Sat Oct 20 16:08:33 2001 +++ ./python-2.0-r5.ebuild Tue Oct 30 23:38:41 2001 @@ -41,11 +41,23 @@ #Need to automate tk and tcl version determination if [ "`use tcltk`" ] then + +#Determine tcl version by greping tcl.h +#Probably don't need same for tk, but play it safe + local tcl_version + local tk_version + + tcl_version=$(grep TCL_VERSION /usr/include/tcl.h | \ + sed -e 's/.*\([0-9]\.[0-9]\).*/\1/') + + tk_version=$(grep TK_VERSION /usr/include/tk.h | \ + sed -e 's/.*\([0-9]\.[0-9]\).*/\1/') + sed -e 's:# _tkinter:_tkinter:' \ -e 's:#[[:blank:]]*-I/usr/local/include:-I/usr/include:' \ -e 's:#[[:blank:]]*-I/usr/X11R6/include:-I/usr/X11R6/include:' \ -e 's:#[[:blank:]]*-L/usr/local/lib:-L/usr/lib:' \ - -e 's:#[[:blank:]]*-ltk8.0 -ltcl8.0:-ltk8.4 -ltcl8.4:' \ + -e 's:#[[:blank:]]*-ltk8.0 -ltcl8.0:-ltk'${tk_version}' -ltcl'${tcl_version}':' \ -e 's:#[[:blank:]]*-L/usr/X11R6/lib:-L/usr/X11R6/lib:' \ -e 's:#[[:blank:]]-lX11:-lX11:' \ Setup.in > Setup.new --=-w1ebuhxyvRu5kIDkLzuQ--