From 0767ba590d5710edb65d0e0042643b96e177495b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 6 Apr 2015 11:14:49 +0000 Subject: [PATCH] Fix build with tcl-8.6, bug #452034. Drop old. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xEFB4464E! --- sci-electronics/gnetman/ChangeLog | 8 +++- sci-electronics/gnetman/Manifest | 45 +++++++++---------- .../gnetman-0.0.1_pre20110124-tcl86.patch | 20 +++++++++ .../gnetman/gnetman-0.0.1_pre20041222.ebuild | 21 --------- .../gnetman-0.0.1_pre20060522-r2.ebuild | 41 ----------------- .../gnetman/gnetman-0.0.1_pre20110124.ebuild | 8 +++- 6 files changed, 54 insertions(+), 89 deletions(-) create mode 100644 sci-electronics/gnetman/files/gnetman-0.0.1_pre20110124-tcl86.patch delete mode 100644 sci-electronics/gnetman/gnetman-0.0.1_pre20041222.ebuild delete mode 100644 sci-electronics/gnetman/gnetman-0.0.1_pre20060522-r2.ebuild diff --git a/sci-electronics/gnetman/ChangeLog b/sci-electronics/gnetman/ChangeLog index 544c5a60746c..4fd2dac01e51 100644 --- a/sci-electronics/gnetman/ChangeLog +++ b/sci-electronics/gnetman/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-electronics/gnetman # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gnetman/ChangeLog,v 1.14 2015/03/25 16:54:29 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gnetman/ChangeLog,v 1.15 2015/04/06 11:14:48 mgorny Exp $ + + 06 Apr 2015; Michał Górny + +files/gnetman-0.0.1_pre20110124-tcl86.patch, + -gnetman-0.0.1_pre20041222.ebuild, -gnetman-0.0.1_pre20060522-r2.ebuild, + gnetman-0.0.1_pre20110124.ebuild: + Fix build with tcl-8.6, bug #452034. Drop old. 25 Mar 2015; Justin Lecher gnetman-0.0.1_pre20041222.ebuild, gnetman-0.0.1_pre20060522-r2.ebuild, gnetman-0.0.1_pre20110124.ebuild: diff --git a/sci-electronics/gnetman/Manifest b/sci-electronics/gnetman/Manifest index 23655c8ae6bd..d6d977e8083c 100644 --- a/sci-electronics/gnetman/Manifest +++ b/sci-electronics/gnetman/Manifest @@ -1,30 +1,27 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 -DIST gnetman-0.0.1_pre20110124.tar.gz 500308 SHA256 ee1d5ac7165813405ee1c31fe6058c0b22b796decd14c0f1af27bf76fef5103d -DIST gnetman-22Dec04.tar.gz 725945 SHA256 81f2938a7ff1c4c619ea313c3209c6759df30cfeff8afec31a2d12344af54b90 -DIST gnetman-22May06.tar.gz 758274 SHA256 53ffbc1fb2479a5a0a205b2b330502a44474f7b9c993a43ca07c5e848ca8af82 -EBUILD gnetman-0.0.1_pre20041222.ebuild 552 SHA256 62a857cf90169eb83df715246cd5b11d69f0c7bebecb371860c9ff966532463c SHA512 ccc4b4b83e547393ff9cb46bf1744adcdbeafea45c717ccda5fa412854d4405998fa87ba633615e2362900efe8ccf55d62cb5b768fb329e093a8176d7696f569 WHIRLPOOL db70b6d436bf1e96539153e8047782a8dae5589746bad1a6eddc468bdf5cfeba6962fd4532774184dfb984aef90721fd66eee62b0aedbe27494961d0bd4d33c3 -EBUILD gnetman-0.0.1_pre20060522-r2.ebuild 1057 SHA256 f546185f838d54fd9b2cc351ef4c97952b84975c9e606a9e1e43f9e7c4b45a2d SHA512 9e2bc7624a9e519cfc35e0d7fd5d4c6101efdd71a002fd18ebd404c58e5843a72b10da1ea507aea9da095403251c8094aeafe4c1157c1aa79b0b4b34db22a201 WHIRLPOOL 08aad2f902f39ae12a8761ba5a4f4b5f6af3fefbfce28291ae22e7e9999de9ae7c5e2c00f0b3379d02f2ee5765ba581375ed478e500c8464c85fb4fbe9e8463f -EBUILD gnetman-0.0.1_pre20110124.ebuild 1115 SHA256 ba005adfd07bf056846ae2efc64258f864f6bddb34214ad2f5c5715269d64d07 SHA512 009c9375180f95efde9a5939aeaf40410b2b71db1466b7035c3c2f87de64b6f56f6d2fb80254e505e93094e7a56f1c912ed3c40a5959ba52848dc896042fd498 WHIRLPOOL 7c7d59329776dbba926e1cbcd37c558cbfcfce4a52f0eb35f508b6840362c8adebfc1790a03ac6cdbca4b7aa72b2a3ecaf3012dae4731f7c1c9c7afec02e76e5 -MISC ChangeLog 2367 SHA256 76eb2e7b20910808bc4a3f681332b68b36fd4a278245e7363f089517481636ab SHA512 d3b4351fcd7f2b58d649fd016f8e067eee6e9c20d53dcc9b7951db630b623c8f3802db9fdc9a0bfafe98553baee8e822d9a06879cea2652dca794a85d60f24f2 WHIRLPOOL 983619aa705b6ba9ed92621820d0a614c311d3f8d4b69d94303ebd448d766ec06140896713de608dca2fffed5b1840dcc6d7332280e176d1928e0b6d28567e18 +AUX gnetman-0.0.1_pre20110124-tcl86.patch 791 SHA256 ac84da200d29a17567dea2c05594181dfab818a36bdc7234c28891c6f6ce160f SHA512 42e036a4bbcd3520435d741036f88a775a0fd69ef2af889d529d7b240eb2ac0580b97ec0c41c929122debcb09e16645ac098659cb16b8aed06f87faf1b2b26f2 WHIRLPOOL 3ebdbcd48eb00fdabe82526f455e61354bf38e6c3bd5824b40de04a1fc8df630df8d91ea5a1ff4642e58cf50db066e73f22fe44b2a49fbef5b609bae1d819b9a +DIST gnetman-0.0.1_pre20110124.tar.gz 500308 SHA256 ee1d5ac7165813405ee1c31fe6058c0b22b796decd14c0f1af27bf76fef5103d SHA512 d872bf3d4967c201a16e6b625a2003771bb7b33e8af3127a06f445429f575d32451e4ce3cc0f34389cc047b2d0cf2e3ef8afff63b1bf362184e2a5859bbb09f2 WHIRLPOOL 69807934df4e6f52f777ae426cd5258e2d2bed3d9ca25fd144b55c701bcb0f8143df50f3bd92f6668f22bc1e65198d21f6d8272548d391a73504155e9b5561aa +EBUILD gnetman-0.0.1_pre20110124.ebuild 1223 SHA256 ed4124ef07294d59a8689382b12f5519831cd4520ab31e581650ad7565cfc4c8 SHA512 486d5eb3fb2a955a946d0d6342fddeb7d449047340e5cd7f45a72bc7f8892fe3795d276008975c7035a925b438d09b4c1cbd98ad24345bb24b6149f7a2bd1f9f WHIRLPOOL e10f7fe685e2a5bc9457be251d3251af46347642e5ca3392f6272c6ead2ebb4a06c8703b402f8660912f1b1bf4c07b54d493740c72c0486405a7dc1b8702ca76 +MISC ChangeLog 2628 SHA256 2443c7932112bcf4e81188b5aca11b046c9399deab4d9c02bf60f7ab973e36b6 SHA512 d3a8447b287b0c2a7288cc9fb0d530a108ef112ef0ba1ebbd61fbcc8752dd51b45186b65d1e6d3c3f20ccb9e78880f25d46e4511610346144a98f8d7682e61e3 WHIRLPOOL b02d541b567c2cf19117d39aefc8843f04db457795648e637ca3a5de2928c73811c11261ab5b322a9cb26e925abe66a9214d0f70ad7fb06a1710c0bd1785a5a9 MISC metadata.xml 493 SHA256 ba746107fd9b758e214a13c105b9d6c4a6bf9dcc3c90d560e7ebe1ad90060e88 SHA512 2e5265213673413522bcedc1e627b75ce7101098ae3e23ed7198cb1f1a0877428a189851f01a6487d8d65fdd5a1cbf377dee7cf08f4459af01bef232c5937ac3 WHIRLPOOL b3ab4e8bc52cc1e2bac4c27976d939b48107f7b3c4741b93a68b3dc424409238026d575f64a1cd9334a8c6c982a01c5114f807f1f929e034b20b963c58d3a24f -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0 +Version: GnuPG v2 -iQJ8BAEBCgBmBQJVEuhGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC -OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirgZ4QAJIEXns+kRvtTHf8OcmMVrhT -p49zJN6Q236QdADPVhhwJymTucOKqF39UkjiZv+LdHOITC1GHnN+73VPQ/N/Dc3N -cu0D3uw1pb/QGTO2S3q5k96LXuaRphiu6SwEhHFzb10ph3h3gnv4VbjBRTIIUTPB -IZCOC1Utn9hnMaN4H1qcGMvKlCWUPmxzNbXhL3Q9GRsEorL23c20I3Xg5Nu6GrXT -rdS4Ms79fpeTKOWDeaUCetcNt6YAAoBToQKiGu5Ep4kLcPWCX0wnNUCk0wv5vg2o -BbDZRZG0SIJbFKKG+LotWoRomNMgQjcBU1JkyGd9WU0e8DiLQh7bXf958VZqLZfE -gb4bUO5TeHAwm0OW1K4NkYivDu4gDxyvKR/GV4HatngTuTMWo4m8nRMJZw/ffJVy -798rEHAYr30utAyGBJL63YSpfLbFfSpc+6mmuOu3STI+F4Sd5p3lNJ8UHg7a3t41 -P1GqMKuMO85wxtH8/7UlCb6y2j9csB7JRFrXrSsaY9qWITBP5rEApuBU9xGmuuxV -MxEfda1JjtNFLtbn9kRRVQ7GEJswdmQfoq//oadm7uaRXM+rN5kdUYyIdMvQqhxx -g3IE8tyMCaBww75NmaxW7ZtZ8Sge7Gr2G9L5cGP87UX6ojuExCTIRFb5NKACPh0Z -ftxcZv4wlU0K59hLb1S3 -=0BJh +iQJ8BAEBCABmBQJVImqpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZORJsQANPjw2HmEokE6QyR2HvQo4rC +matw+nmOuldLAxvsCuNf9OKZy58kFcEgXkzK/2TNfRVoqbzDoPBzcqgH7jE83bck +ZMwUjo82D9Uw42kfIzO+MpZ4SpOAfTWY7qSBZi6EheZu6vy80cKSh8vfiPv8ZZ+y +izfgG5adMjhFUOe5566w+tGhLGFuBNQJj8BGnpema5AGpIGGKCzKnZgzqniqfoDM +gKtgRh7+OQ0GI4VM56qJ+lEBARH9kV9ptcBZq7MN01mjgVaGYQJUKR6QwgdnPSNZ +j0ILbFluGMMYP0gA40UsDDLJWjnokR3pOUyzgogpOKTN8jw20YEgikkE8P7kctqb +RTJaNhbmbjunln872AercfivvzASZoMuRlXcYpGHGWUb58cRLBb/dgMSTHST8hPC +rA0Rogj0j9mXnmrIDfqqqZacbHd7gr26KE4zDZga3O2vL+u8AEY+iKJZEba+Ccss +NqMJgga4+hUK8ueLKpDi8ehfgNf+FPqm4PJTo4iTzEipTrby2mNkTPGjlxN296lO +Z60LNue/LlETPcS0AohAOcgiNwjBWjpLSYfdtdRm9/dRCkjmQHwUG9eAq5NRSy8m +0GmAguL5dsImvrDAW71WEZZP9Hl7spZJmdGflvdKLhikggC+alGYfSLEiOaT1VHc +aLnOG8tZRFU9FYE9Ol7f +=gYYP -----END PGP SIGNATURE----- diff --git a/sci-electronics/gnetman/files/gnetman-0.0.1_pre20110124-tcl86.patch b/sci-electronics/gnetman/files/gnetman-0.0.1_pre20110124-tcl86.patch new file mode 100644 index 000000000000..fdb6573990f4 --- /dev/null +++ b/sci-electronics/gnetman/files/gnetman-0.0.1_pre20110124-tcl86.patch @@ -0,0 +1,20 @@ +--- gnetman-0.0.1_pre20110124_orig/src/tcl/tclwrap.c 2012-05-25 07:44:51.000000000 +0200 ++++ gnetman-0.0.1_pre20110124/src/tcl/tclwrap.c 2013-02-24 12:58:51.000000000 +0100 +@@ -46,7 +46,7 @@ + result = Tcl_EvalFile(interp, (char *)fileName) == TCL_OK; + if (!result) { + utWarning("Tcl error in file %s, line %d: %s", fileName, +- interp->errorLine, interp->result); ++ Tcl_GetErrorLine(interp), Tcl_GetStringResult(interp)); + } + return result; + } +@@ -75,7 +75,7 @@ + commandLine[xChar] = '\0'; + result = Tcl_Eval(interp, commandLine); + if (result == TCL_ERROR) { +- utWarning("Tcl error: %s", interp->result); ++ utWarning("Tcl error: %s", Tcl_GetStringResult(interp)); + } + } while (result != TCL_RETURN); + return true; diff --git a/sci-electronics/gnetman/gnetman-0.0.1_pre20041222.ebuild b/sci-electronics/gnetman/gnetman-0.0.1_pre20041222.ebuild deleted file mode 100644 index e8ca7a8ceaa0..000000000000 --- a/sci-electronics/gnetman/gnetman-0.0.1_pre20041222.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gnetman/gnetman-0.0.1_pre20041222.ebuild,v 1.5 2015/03/25 16:54:29 jlec Exp $ - -EAPI=4 - -MY_PV="22Dec04" - -DESCRIPTION="A GNU Netlist Manipulation Library" -HOMEPAGE="http://www.viasic.com/opensource/" -SRC_URI="http://www.viasic.com/opensource/gnetman-${MY_PV}.tar.gz" - -IUSE="" -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="ppc ~x86" - -DEPEND="dev-lang/tk:0" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${PN}-${MY_PV}" diff --git a/sci-electronics/gnetman/gnetman-0.0.1_pre20060522-r2.ebuild b/sci-electronics/gnetman/gnetman-0.0.1_pre20060522-r2.ebuild deleted file mode 100644 index 76604e77e5d0..000000000000 --- a/sci-electronics/gnetman/gnetman-0.0.1_pre20060522-r2.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gnetman/gnetman-0.0.1_pre20060522-r2.ebuild,v 1.4 2015/03/25 16:54:29 jlec Exp $ - -EAPI=4 - -MY_P="${PN}-22May06" - -DESCRIPTION="A GNU Netlist Manipulation Library" -HOMEPAGE="http://sourceforge.net/projects/gnetman/ - http://www.viasic.com/opensource/" -SRC_URI="http://www.viasic.com/opensource/${MY_P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -IUSE="doc examples" -KEYWORDS="~amd64 ~ppc ~x86" - -S="${WORKDIR}/${MY_P}" - -DEPEND=" - dev-lang/tk:0 - sci-electronics/geda" -RDEPEND="${DEPEND}" - -src_prepare() { - sed -i -e 's/ sym / /' Makefile.in || die "sed failed" - if use examples ; then - sed -i -e "s:gEDA/sch/gnetman:doc/${PF}/examples:" \ - sch/Makefile.in || die "sed failed" - sed -i -e "s:gEDA/examples/gnetman:doc/${PF}/examples:" \ - test/Makefile.in || die "sed failed" - else - sed -i -e 's/ sch test//' Makefile.in || die "sed failed" - fi -} - -src_install () { - default - use doc && dodoc doc/*.{html,jpg} -} diff --git a/sci-electronics/gnetman/gnetman-0.0.1_pre20110124.ebuild b/sci-electronics/gnetman/gnetman-0.0.1_pre20110124.ebuild index 4fa8b8f7d537..6394b7c09a9f 100644 --- a/sci-electronics/gnetman/gnetman-0.0.1_pre20110124.ebuild +++ b/sci-electronics/gnetman/gnetman-0.0.1_pre20110124.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gnetman/gnetman-0.0.1_pre20110124.ebuild,v 1.2 2015/03/25 16:54:29 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gnetman/gnetman-0.0.1_pre20110124.ebuild,v 1.3 2015/04/06 11:14:48 mgorny Exp $ EAPI=4 -inherit toolchain-funcs +inherit eutils toolchain-funcs DESCRIPTION="A GNU Netlist Manipulation Library" HOMEPAGE="http://sourceforge.net/projects/gnetman/" @@ -30,6 +30,10 @@ src_prepare() { -e '/^$(TARGET):/,+3s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \ -i configure || die tc-export CC + + cd ../.. || die + # fix build issues with tcl-8.6, #452034 + epatch "${FILESDIR}/${P}-tcl86.patch" } src_install () { -- 2.26.2