From: Markus Ullmann Date: Thu, 30 Nov 2006 20:00:35 +0000 (+0000) Subject: Cleaning up and using improved ebuild from bug #95845 thanks to Sebastien Fabbro X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=382e9baeb20ba10b556e8a263eeb97a84e4b11de;p=gentoo.git Cleaning up and using improved ebuild from bug #95845 thanks to Sebastien Fabbro Package-Manager: portage-2.1.2_rc2-r2 --- diff --git a/dev-tcltk/tclx/Manifest b/dev-tcltk/tclx/Manifest index 2f2159187b43..8e33b31f81d5 100644 --- a/dev-tcltk/tclx/Manifest +++ b/dev-tcltk/tclx/Manifest @@ -1,14 +1,6 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX tclx-8.3-argv.patch 802 RMD160 c72517d6ebe1a87de533753bbb7f6bd4b1f18a2c SHA1 45be40016f4082e32d269a28fcd30f961d765540 SHA256 97ddac1f8df238448b482d05a014946b5d6aa279336b2111fe81e9fe108d9bac -MD5 fa76370803a64a3cf2f0d01a5d1ac3b5 files/tclx-8.3-argv.patch 802 -RMD160 c72517d6ebe1a87de533753bbb7f6bd4b1f18a2c files/tclx-8.3-argv.patch 802 -SHA256 97ddac1f8df238448b482d05a014946b5d6aa279336b2111fe81e9fe108d9bac files/tclx-8.3-argv.patch 802 -AUX tclx-8.3-makecfg.patch 10999 RMD160 5327648103e033563a5747676e41e31f202b51a2 SHA1 cfa1901512df653311723bae5d5f3c1abe8f6e25 SHA256 66c97d5671d7332ae4a2dd0bd465c70c0b35ca691f15d72a291a1a007a6b6ed7 -MD5 92db3525521a7be527aaea89eb2aca51 files/tclx-8.3-makecfg.patch 10999 -RMD160 5327648103e033563a5747676e41e31f202b51a2 files/tclx-8.3-makecfg.patch 10999 -SHA256 66c97d5671d7332ae4a2dd0bd465c70c0b35ca691f15d72a291a1a007a6b6ed7 files/tclx-8.3-makecfg.patch 10999 AUX tclx-8.3-varinit.patch 386 RMD160 4a697796894cd6573573330843c6a9312aa15e0f SHA1 21862a18f92ce64c2bc61ab3c42c4138e45b33e1 SHA256 7415da5026eab39fa272bd2e0b145cc6030f3a32a95fefc72d0ec9977f364cab MD5 f4af4334bd8c05af3b43ee89b4dfb03c files/tclx-8.3-varinit.patch 386 RMD160 4a697796894cd6573573330843c6a9312aa15e0f files/tclx-8.3-varinit.patch 386 @@ -17,46 +9,44 @@ AUX tclx-8.3.5-configure.patch 448 RMD160 59315bde21bc3ce96dfeed15e1d9b19a6a619f MD5 10da4ddaa69eb2eedb883022d1f23961 files/tclx-8.3.5-configure.patch 448 RMD160 59315bde21bc3ce96dfeed15e1d9b19a6a619f28 files/tclx-8.3.5-configure.patch 448 SHA256 01ef10236ee23aaf868c5cd92416ca9e7db1fda103400f63acda0073f56b3dc2 files/tclx-8.3.5-configure.patch 448 -DIST tcl8.4.2-src.tar.gz 3330617 RMD160 840e480c4328c3d981889ec25d29daf90ddc43d6 SHA256 8c580774ec010befb79f7f0517382ecb3369381804da46489e6c7a3c2ebcf52a +AUX tclx-8.4-relid.patch 1262 RMD160 3fa5e4bead6f725c9fb84aa44b8a4c87aecea1cc SHA1 b24406143e3a1ee5fb6fa376f86770a11f9d3072 SHA256 5c3af1c3e2842516049d1b639469c92f621f6ea97821c06b0ad097eb2fdb1e01 +MD5 b27f22f2483110400d34887ba37b826d files/tclx-8.4-relid.patch 1262 +RMD160 3fa5e4bead6f725c9fb84aa44b8a4c87aecea1cc files/tclx-8.4-relid.patch 1262 +SHA256 5c3af1c3e2842516049d1b639469c92f621f6ea97821c06b0ad097eb2fdb1e01 files/tclx-8.4-relid.patch 1262 +AUX tclx-8.4-varinit.patch 399 RMD160 b433cfba4b8e83aa893548a37ef63c094a338df7 SHA1 dfde76f190557869129d94dc8da419f6029846f1 SHA256 3770fea219c9639c53f6380453850e3191b52cc2ff48896aff8658d737df0624 +MD5 a6b4751bf2dca36f6b13370a6d1c386a files/tclx-8.4-varinit.patch 399 +RMD160 b433cfba4b8e83aa893548a37ef63c094a338df7 files/tclx-8.4-varinit.patch 399 +SHA256 3770fea219c9639c53f6380453850e3191b52cc2ff48896aff8658d737df0624 files/tclx-8.4-varinit.patch 399 DIST tcl8.4.6-src.tar.gz 3448711 RMD160 c282a1ce3b71d6b91b0b59fbc323d6ce05cba66f SHA1 d21495ca04419fc3b1594b96b19116040c33a3f0 SHA256 b34feacc62442512b8893de06f3fa05e8686a054fe684fb0b848bbdfad782f78 DIST tclx8.3.5-src.tar.gz 434281 RMD160 b501c1c48b54950ea7fb6d3d6d27ef3e7d58c5a5 SHA1 74092449684d11dd73a4cb91fa3e1442e9e21d47 SHA256 4db028f303908b29b15cb2b97731f87a46a39cd65ab76219b9576f045d0b06ad -DIST tclx8.3.tar.gz 450328 RMD160 729b608f346d1852c6581032d42bcd2fa6531435 SHA256 96f6e6e01fb6139f9268a06dafcbf15518300335051a5f40f64ac84a328a8bc3 DIST tclx8.4.tar.bz2 313595 RMD160 96c10fdebfe97f4d2c59b61d1116ca0b3efddf7b SHA1 f75c0b6c77748fc0a6183e25984f8202268d1b78 SHA256 257591f9dffc21cf3ed541a9ef81a3ff5dd739dff5cebb70c4cec7010e2def66 -DIST tk8.4.2-src.tar.gz 3155987 RMD160 52d7a386fe2e06b1251f3ff6358d9ec32c04e3a1 SHA256 11b90629809cd34e5cd162264271919e2586cf53f0d7d7f773c2e2bfbf72c5a3 DIST tk8.4.6-src.tar.gz 3230760 RMD160 e619afbe971730e94a2c180853ed1ac0166dcffa SHA1 a0b2f364be20c3e312d1ba582d3a1b4b4b1d4d88 SHA256 e93c2ce25059c355ec78b500f01ee1628d534e2f6e81bd95e39b8363c0711bb5 -EBUILD tclx-8.3-r1.ebuild 2066 RMD160 923638f157c8c9c43dd71a4e7f063460f231280b SHA1 20b889f683f6a7ad67d0537288281d5fc2136960 SHA256 dff4b239ab6e8e54df94436cb649eab6ed1cd33f9385f25edd86367ba042e890 -MD5 ff82d7d817aa50146140a2a5c062e690 tclx-8.3-r1.ebuild 2066 -RMD160 923638f157c8c9c43dd71a4e7f063460f231280b tclx-8.3-r1.ebuild 2066 -SHA256 dff4b239ab6e8e54df94436cb649eab6ed1cd33f9385f25edd86367ba042e890 tclx-8.3-r1.ebuild 2066 EBUILD tclx-8.3.5.ebuild 1980 RMD160 ff3aba331bf5a66a19f4cea7ff951eee9356e845 SHA1 b43a6cd8a92666b75ba29a8f0630fad3ed197aa7 SHA256 740006de0ecf877355e6b6bc8b92ad7375fff428bef56ce71d8a3b1841dee5ce MD5 02161107b2e482f79f97d1414093c1a5 tclx-8.3.5.ebuild 1980 RMD160 ff3aba331bf5a66a19f4cea7ff951eee9356e845 tclx-8.3.5.ebuild 1980 SHA256 740006de0ecf877355e6b6bc8b92ad7375fff428bef56ce71d8a3b1841dee5ce tclx-8.3.5.ebuild 1980 -EBUILD tclx-8.4.ebuild 1777 RMD160 8ecb23d7f7204041e5d99a4c3e6f35a0bd2b8e62 SHA1 78425a2d6a435f6bb1bc4cc630ec5ee534812823 SHA256 9c2dc6fbe036ff45f17e2e9465417b26419c5d8293ef4f95c1b02ed55acee3a9 -MD5 b0b4a04543ff53b2c9cfc0b8c3f48f6a tclx-8.4.ebuild 1777 -RMD160 8ecb23d7f7204041e5d99a4c3e6f35a0bd2b8e62 tclx-8.4.ebuild 1777 -SHA256 9c2dc6fbe036ff45f17e2e9465417b26419c5d8293ef4f95c1b02ed55acee3a9 tclx-8.4.ebuild 1777 -MISC ChangeLog 4154 RMD160 af952b8f792033e3288afaaae39276729ef00df0 SHA1 feff061a09848e6c05d1e95219f68d03f6575828 SHA256 b6afdb465742aa880ced3abca7dc6d85b12207d966f0392763583554f2c8ec19 -MD5 0430227919c299519294035cfb7931e6 ChangeLog 4154 -RMD160 af952b8f792033e3288afaaae39276729ef00df0 ChangeLog 4154 -SHA256 b6afdb465742aa880ced3abca7dc6d85b12207d966f0392763583554f2c8ec19 ChangeLog 4154 +EBUILD tclx-8.4-r1.ebuild 893 RMD160 e375c238f63ad050d8993267f80d48e58de60671 SHA1 ccab534a1ebba08c6f4f9e2f837a151e695fb940 SHA256 e927e219fa50da32f68cfdeff50b9f6e8ba65f182202e0c18e342ec63b06d06b +MD5 586848fb9825b3941a92ac6e70480489 tclx-8.4-r1.ebuild 893 +RMD160 e375c238f63ad050d8993267f80d48e58de60671 tclx-8.4-r1.ebuild 893 +SHA256 e927e219fa50da32f68cfdeff50b9f6e8ba65f182202e0c18e342ec63b06d06b tclx-8.4-r1.ebuild 893 +MISC ChangeLog 4500 RMD160 f1e551dfbaee5d4568114fdad8a755112f8604ee SHA1 3cc30c733add8ec9f46bf2396f2719abb2b0f0d2 SHA256 d73aeafe28048bd20fbe12c2a423ddcb82a268b03899f41b01aff96aef238c1f +MD5 16779ece224efdbb71e71d130ff083fe ChangeLog 4500 +RMD160 f1e551dfbaee5d4568114fdad8a755112f8604ee ChangeLog 4500 +SHA256 d73aeafe28048bd20fbe12c2a423ddcb82a268b03899f41b01aff96aef238c1f ChangeLog 4500 MISC metadata.xml 425 RMD160 e228c917c6a30690e8f8f9607036f441d6a1210c SHA1 71f9166f6262809784e926d44a78faaa99a68ea0 SHA256 869bce48c0a21c79321e1fb631b9998ddfb1b89fb9b4f5907b7b03ff0bcfed40 MD5 f5b0ef6b661f916a64e16551d15708b6 metadata.xml 425 RMD160 e228c917c6a30690e8f8f9607036f441d6a1210c metadata.xml 425 SHA256 869bce48c0a21c79321e1fb631b9998ddfb1b89fb9b4f5907b7b03ff0bcfed40 metadata.xml 425 -MD5 7b9980dbdd33eac76e62ea1c76261b2d files/digest-tclx-8.3-r1 702 -RMD160 2e360a1d823235f5ea554977e8824c9fd50b893a files/digest-tclx-8.3-r1 702 -SHA256 c4ca15f0554043b6da69a458bdcfe17590891f5f3359e7eb0ea39a43412ba905 files/digest-tclx-8.3-r1 702 MD5 c8225ec31cc33e6416206e7ac02b4723 files/digest-tclx-8.3.5 720 RMD160 fa02fd88f468c81a4a68603e9527182e62c5bc0a files/digest-tclx-8.3.5 720 SHA256 11530dc4745f4cc1c287dbb0d1dd3d06d0384edc880d387671e9ce38f944e93c files/digest-tclx-8.3.5 720 -MD5 e99a395ec978e100be56d825ee450b25 files/digest-tclx-8.4 705 -RMD160 7a9a81779a52be1bbdf50cde563a7f3e0b88aefb files/digest-tclx-8.4 705 -SHA256 280234a6199e50fed7fcc5d9ef6caf2774313adaf52810a5bf3518f654212eb8 files/digest-tclx-8.4 705 +MD5 a1b7c8578e88c1ec3c957fb0a0c44ffb files/digest-tclx-8.4-r1 226 +RMD160 209291ee93c6f73a5ddea003375fee56f921ff8a files/digest-tclx-8.4-r1 226 +SHA256 6648bb012acb38df501f75e808e52e7c28a08023d9ba3fabe31b882c70b3cc86 files/digest-tclx-8.4-r1 226 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFSPcdz974XjDVpbkRAqC/AJ9WzPXuNNEsLLnyT9Xrq1H6xNZCAQCguQrB -JcVcDW/0tRmr9QbFdqNByWg= -=+jnf +iD8DBQFFbzg0z974XjDVpbkRAkiyAKDRKh3WzOM7MbjaDzi/Mem6/BFiZwCbB/bH +7XkCw2mHoWCw1N1C6labkYY= +=LBYs -----END PGP SIGNATURE----- diff --git a/dev-tcltk/tclx/files/digest-tclx-8.3-r1 b/dev-tcltk/tclx/files/digest-tclx-8.3-r1 deleted file mode 100644 index 511476b033e5..000000000000 --- a/dev-tcltk/tclx/files/digest-tclx-8.3-r1 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 4be55d8ebfcc9773407537445edd2ae1 tcl8.4.2-src.tar.gz 3330617 -RMD160 840e480c4328c3d981889ec25d29daf90ddc43d6 tcl8.4.2-src.tar.gz 3330617 -SHA256 8c580774ec010befb79f7f0517382ecb3369381804da46489e6c7a3c2ebcf52a tcl8.4.2-src.tar.gz 3330617 -MD5 deb98c29eb8fc1b43cc60198105ce24b tclx8.3.tar.gz 450328 -RMD160 729b608f346d1852c6581032d42bcd2fa6531435 tclx8.3.tar.gz 450328 -SHA256 96f6e6e01fb6139f9268a06dafcbf15518300335051a5f40f64ac84a328a8bc3 tclx8.3.tar.gz 450328 -MD5 04812fcdf6b50bfe89b7d44db3f33f19 tk8.4.2-src.tar.gz 3155987 -RMD160 52d7a386fe2e06b1251f3ff6358d9ec32c04e3a1 tk8.4.2-src.tar.gz 3155987 -SHA256 11b90629809cd34e5cd162264271919e2586cf53f0d7d7f773c2e2bfbf72c5a3 tk8.4.2-src.tar.gz 3155987 diff --git a/dev-tcltk/tclx/files/digest-tclx-8.4 b/dev-tcltk/tclx/files/digest-tclx-8.4 deleted file mode 100644 index aec1562db7cc..000000000000 --- a/dev-tcltk/tclx/files/digest-tclx-8.4 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 9009a92dc648775fb8a9b0789b995756 tcl8.4.6-src.tar.gz 3448711 -RMD160 c282a1ce3b71d6b91b0b59fbc323d6ce05cba66f tcl8.4.6-src.tar.gz 3448711 -SHA256 b34feacc62442512b8893de06f3fa05e8686a054fe684fb0b848bbdfad782f78 tcl8.4.6-src.tar.gz 3448711 -MD5 395c2fbe35e1723570b005161b9fc8f8 tclx8.4.tar.bz2 313595 -RMD160 96c10fdebfe97f4d2c59b61d1116ca0b3efddf7b tclx8.4.tar.bz2 313595 -SHA256 257591f9dffc21cf3ed541a9ef81a3ff5dd739dff5cebb70c4cec7010e2def66 tclx8.4.tar.bz2 313595 -MD5 24b7774d54c1c568cabe16f3498ddccd tk8.4.6-src.tar.gz 3230760 -RMD160 e619afbe971730e94a2c180853ed1ac0166dcffa tk8.4.6-src.tar.gz 3230760 -SHA256 e93c2ce25059c355ec78b500f01ee1628d534e2f6e81bd95e39b8363c0711bb5 tk8.4.6-src.tar.gz 3230760 diff --git a/dev-tcltk/tclx/files/tclx-8.3-argv.patch b/dev-tcltk/tclx/files/tclx-8.3-argv.patch deleted file mode 100644 index 32f20fea057b..000000000000 --- a/dev-tcltk/tclx/files/tclx-8.3-argv.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- tclx8.3/tk/generic/tkXshell.c.argv Mon Aug 28 23:58:00 2000 -+++ tclx8.3/tk/generic/tkXshell.c Thu Jul 19 17:24:27 2001 -@@ -190,12 +190,13 @@ - fileName = NULL; - argi = 1; - while ((argi < argc) && (argv[argi][0] == '-')) { -- argi++; - if (STREQU(argv[argi], "--")) { -- break; /* end of options */ -+ argi++; -+ break; /* end of options */ - } else if (!STREQU(argv[argi], "-sync")) { -- argi++; /* takes an argument */ -+ argi++; /* takes an argument */ - } -+ argi++; - } - /* Parse out file name, if supplied. */ - if (argi < argc) { -@@ -210,7 +211,7 @@ - while (argi < argc) { - argv[i++] = argv[argi++]; - } -- argc = i+1; -+ argc = i; - } - #else - /* - diff --git a/dev-tcltk/tclx/files/tclx-8.3-makecfg.patch b/dev-tcltk/tclx/files/tclx-8.3-makecfg.patch deleted file mode 100644 index 93c3028a8a25..000000000000 --- a/dev-tcltk/tclx/files/tclx-8.3-makecfg.patch +++ /dev/null @@ -1,317 +0,0 @@ ---- tclx8.3/unix/Common.mk.in.makecfg Mon Aug 28 23:58:00 2000 -+++ tclx8.3/unix/Common.mk.in Tue Aug 7 23:54:14 2001 -@@ -37,7 +37,7 @@ - # Programs and options used by build - # - CC = @CC@ --CFLAGS = @CFLAGS@ @TCL_CFLAGS_WARNING@ @TCL_EXTRA_CFLAGS@ -+CFLAGS = -O2 @TCL_EXTRA_CFLAGS@ -fPIC - SYSCFLAGS = @SYSCFLAGS@ - RANLIB = @RANLIB@ - AR = ar -@@ -72,6 +72,13 @@ - bldbasedir = @bldbasedir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ -+libdir = @exec_prefix@/lib -+ -+# Path to use at runtime to refer to LIB_INSTALL_DIR: -+LIB_RUNTIME_DIR = -+ -+# Directory in which to install the .a or .so binary. -+LIB_INSTALL_DIR = - - TCLX_PREFIX="${prefix}" - TCLX_EXEC_PREFIX="${exec_prefix}" -@@ -82,7 +89,7 @@ - # TclX configuration information determined by configure. - # - TKX_BUILD = @TKX_BUILD@ --TCLX_DEFS = @DEFS@ -+TCLX_DEFS = -DSTDC_HEADERS=1 -DNDEBUG=1 -DRETSIGTYPE=void - TCLX_LIBS = @TCLX_LIBS@ - - #------------------------------------------------------------------------------ -@@ -91,13 +98,13 @@ - TCL_STLIB_NAME = @TCL_STLIB_NAME@ - TK_STLIB_NAME = @TK_STLIB_NAME@ - --TCLX_SHLIB_NAME = @TCLX_SHLIB_NAME@ --TCLX_STLIB_NAME = @TCLX_STLIB_NAME@ --TCLX_LIB_NAME = @TCLX_LIB_NAME@ -- --TKX_SHLIB_NAME = @TKX_SHLIB_NAME@ --TKX_STLIB_NAME = @TKX_STLIB_NAME@ --TKX_LIB_NAME = @TKX_LIB_NAME@ -+TCLX_SHLIB_NAME = libtclx.so -+TCLX_STLIB_NAME = libtclx${DBGX}.a -+TCLX_LIB_NAME = libtclx.so -+ -+TKX_SHLIB_NAME = libtkx.so -+TKX_STLIB_NAME = libtkx${DBGX}.a -+TKX_LIB_NAME = libtkx.so - - #------------------------------------------------------------------------------ - # Compiler flag to use when generating shared object files. Unixware cc will -@@ -108,8 +115,8 @@ - #------------------------------------------------------------------------------ - # Linker arguments to pick up TclX libraries. - # --TCLX_BUILD_LIB_SPEC = @TCLX_BUILD_LIB_SPEC@ --TKX_BUILD_LIB_SPEC = @TKX_BUILD_LIB_SPEC@ -+TCLX_BUILD_LIB_SPEC = -L${TCLX_UNIX_SRC_DIR} -ltclx -+TKX_BUILD_LIB_SPEC = -L${TKX_UNIX_SRC_DIR} -ltkx - - #------------------------------------------------------------------------------ - # Configuration information from tclConfig.sh. ---- tclx8.3/tcl/unix/Makefile.in.makecfg Mon Aug 28 23:58:00 2000 -+++ tclx8.3/tcl/unix/Makefile.in Wed Aug 8 16:45:51 2001 -@@ -67,24 +67,24 @@ - - GENERIC_SOBJS = \ - @TCLX_BUILD_DUMMY_STANDALONE@ \ -- tclXbsearch@SHOBJ_SUFFIX@ tclXchmod@SHOBJ_SUFFIX@ \ -- tclXcmdInit@SHOBJ_SUFFIX@ tclXcmdloop@SHOBJ_SUFFIX@ \ -- tclXdebug@SHOBJ_SUFFIX@ tclXdup@SHOBJ_SUFFIX@ \ -- tclXfcntl@SHOBJ_SUFFIX@ tclXfilecmds@SHOBJ_SUFFIX@ \ -- tclXfilescan@SHOBJ_SUFFIX@ tclXflock@SHOBJ_SUFFIX@ \ -- tclXfstat@SHOBJ_SUFFIX@ tclXgeneral@SHOBJ_SUFFIX@ \ -- tclXhandles@SHOBJ_SUFFIX@ tclXunixId@SHOBJ_SUFFIX@ \ -- tclXinit@SHOBJ_SUFFIX@ tclXkeylist@SHOBJ_SUFFIX@ \ -- tclXlib@SHOBJ_SUFFIX@ tclXlist@SHOBJ_SUFFIX@ \ -- tclXmath@SHOBJ_SUFFIX@ tclXmsgcat@SHOBJ_SUFFIX@ \ -- tclXlibInit@SHOBJ_SUFFIX@ tclXprocess@SHOBJ_SUFFIX@ \ -- tclXprofile@SHOBJ_SUFFIX@ \ -- tclXselect@SHOBJ_SUFFIX@ tclXunixSock@SHOBJ_SUFFIX@ \ -- tclXsignal@SHOBJ_SUFFIX@ tclXshell@SHOBJ_SUFFIX@ \ -- tclXstring@SHOBJ_SUFFIX@ tclXsocket@SHOBJ_SUFFIX@ \ -- tclXunixCmds@SHOBJ_SUFFIX@ tclXutil@SHOBJ_SUFFIX@ \ -- tclXunixOS@SHOBJ_SUFFIX@ tclXoscmds@SHOBJ_SUFFIX@ \ -- tclXunixDup@SHOBJ_SUFFIX@ tclXlgets@SHOBJ_SUFFIX@ -+ tclXbsearch.o tclXchmod.o \ -+ tclXcmdInit.o tclXcmdloop.o \ -+ tclXdebug.o tclXdup.o \ -+ tclXfcntl.o tclXfilecmds.o \ -+ tclXfilescan.o tclXflock.o \ -+ tclXfstat.o tclXgeneral.o \ -+ tclXhandles.o tclXunixId.o \ -+ tclXinit.o tclXkeylist.o \ -+ tclXlib.o tclXlist.o \ -+ tclXmath.o tclXmsgcat.o \ -+ tclXlibInit.o tclXprocess.o \ -+ tclXprofile.o \ -+ tclXselect.o tclXunixSock.o \ -+ tclXsignal.o tclXshell.o \ -+ tclXstring.o tclXsocket.o \ -+ tclXunixCmds.o tclXutil.o \ -+ tclXunixOS.o tclXoscmds.o \ -+ tclXunixDup.o tclXlgets.o - - COMPAT_OBJS = @LIBOBJS@ - -@@ -121,7 +121,7 @@ - stringfile.o tcllib.o fmath.o buildhelp.o \ - buildidx.o autoload.o tclx.o - --HELP_DIR = @HELP_DIR@/tcl -+HELP_DIR = ${srcbasedir}/tcl/help - - TEST_OBJS = tclTest.o tclTestObj.o tclUnixTest.o tclXtest.o \ - tclThreadTest.o tclXunixTest.o -@@ -146,15 +146,15 @@ - - standalone: tcl.standalone tclXtest.standalone hello - --tcl: tclXAppInit.o @TCLX_SHLIB_BUILD_REF@ @TCLX_STLIB_BUILD_REF@ Makefile -+tcl: tclXAppInit.o libtclx.so libtclx.so.0 libtclx${DBGX}.a Makefile - ${CC} ${LD_SWITCHES} tclXAppInit.o ${ALL_LIBS} \ - -o $@ || (rm -f $@; exit 1) - --tcl.static: tclXAppInit.o @TCLX_STLIB_BUILD_REF@ Makefile -+tcl.static: tclXAppInit.o libtclx${DBGX}.a Makefile - ${CC} ${LD_SWITCHES} tclXAppInit.o ${STATIC_LIBS} \ - -o $@ || (rm -f $@; exit 1) - --tcl.standalone: tclXAppInitSA.o @TCLX_STLIB_BUILD_REF@ Makefile -+tcl.standalone: tclXAppInitSA.o libtclx${DBGX}.a Makefile - ${CC} ${LD_SWITCHES} tclXAppInitSA.o ${STATIC_LIBS} \ - -o $@ || (rm -f $@; exit 1) - -@@ -162,12 +162,12 @@ - ${AR} cr ${TCLX_STLIB_NAME} ${OBJS} - ${RANLIB} ${TCLX_STLIB_NAME} - --@TCLX_SHLIB_BUILD_TARGET@: ${SOBJS} -+libtclx.so.0: ${SOBJS} - rm -f ${TCLX_SHLIB_NAME} -- PATH=${TCL_UNIX_DIR}:${PATH}; export PATH; \ -- TCL_LIBRARY=${TCL_UNIX_DIR}/../library; export TCL_LIBRARY; \ -- LD_LIBRARY_PATH=${TCL_UNIX_DIR}:${LD_LIBRARY_PATH}; export LD_LIBRARY_PATH; \ -- ${TCL_SHLIB_LD} -o ${TCLX_SHLIB_NAME} ${SOBJS} ${TCL_SHLIB_LD_LIBS} -+ ${CC} -pipe -shared -Wl,-soname,$@ -o $@ ${SOBJS} ${TCL_SHLIB_LD_LIBS} -L${TCL_UNIX_DIR} -ltcl -+ -+libtclx.so: libtclx.so.0 -+ ln -sf $< $@ - - hello: hello.c - ${CC} ${LD_SWITCHES} -o $@ hello.c ${STATIC_LIBS} -@@ -311,9 +311,9 @@ - BUILDHELP=@BUILDHELP@ - buildhelp: tcl tcl.tndx - rm -rf ${HELP_DIR} help help.tmp -- if test ! -d @HELP_DIR@ ; then \ -- mkdir @HELP_DIR@ ; \ -- fi -+# if test ! -d ${HELP_DIR} ; then \ -+# mkdir ${HELP_DIR} ; \ -+# fi - mkdir ${HELP_DIR} - ${BLDMANHELP} ${TCL_SRC_DIR}/doc ${TCLX_TOOLS_SRC_DIR}/tclmanpages \ - ${HELP_DIR} Tcl.brf -@@ -349,7 +349,8 @@ - fi - ${INSTCOPY} tclxConfig.sh ${INSTALL_ROOT}${TCLX_INST_LIB} - if test "@SHARED_BUILD@" = "1"; then \ -- ${INSTCOPY} ${TCLX_SHLIB_NAME} ${INSTALL_ROOT}${TCLX_INST_LIB} ;\ -+ ${INSTCOPY} libtclx.so.0 ${INSTALL_ROOT}${TCLX_INST_LIB} ;\ -+ cp -fd libtclx.so ${INSTALL_ROOT}${TCLX_INST_LIB} ;\ - ${INSTCOPY} pkgIndex.tcl ${INSTALL_ROOT}${TCLX_EXEC_RUNTIME} ;\ - fi - ---- tclx8.3/tk/unix/Makefile.in.makecfg Mon Aug 28 23:58:00 2000 -+++ tclx8.3/tk/unix/Makefile.in Wed Aug 8 17:27:07 2001 -@@ -72,7 +72,7 @@ - LIBTCLX = ../../tcl/unix/${TCLX_STLIB_NAME} - TCL = ../../tcl/unix/tcl - --HELP_DIR = @HELP_DIR@/tk -+HELP_DIR = ${srcbasedir}/tk/help - - TEST_OBJS = tkTest.o tkSquare.o tclThreadTest.o tkXunixTest.o - -@@ -95,27 +95,28 @@ - - standalone: wishx.standalone tktest.standalone hello - --wishx: tkXAppInit.o @TKX_SHLIB_BUILD_REF@ @TKX_STLIB_BUILD_REF@ ${TCL} Makefile -+wishx: tkXAppInit.o libtkx.so.0 libtkx.so libtkx${DBGX}.a ${TCL} Makefile - ${CC} ${LD_SWITCHES} tkXAppInit.o ${ALL_LIBS} \ - -o $@ || (rm -f $@; exit 1) - --wishx.static: tkXAppInit.o ${TKX_STLIB_NAME} ${LIBTCLX} Makefile -+wishx.static: tkXAppInit.o libtkx${DBGX}.a ${LIBTCLX} Makefile - ${CC} ${LD_SWITCHES} tkXAppInit.o ${STATIC_LIBS} -o $@ || \ - (rm -f $@; exit 1) - --wishx.standalone: tkXAppInitSA.o ${TKX_STLIB_NAME} ${LIBTCLX} Makefile -+wishx.standalone: tkXAppInitSA.o libtkx${DBGX}.a ${LIBTCLX} Makefile - ${CC} ${LD_SWITCHES} tkXAppInitSA.o ${STATIC_LIBS} -o $@ || \ - (rm -f $@; exit 1) - --${TKX_STLIB_NAME}: ${OBJS} -- ${AR} cr ${TKX_STLIB_NAME} ${OBJS} -- ${RANLIB} ${TKX_STLIB_NAME} -+libtkx${DBGX}.a: ${OBJS} -+ ${AR} cr $@ ${OBJS} -+ ${RANLIB} $@ - --@TKX_SHLIB_BUILD_TARGET@: ${SOBJS} -+libtkx.so.0: ${SOBJS} - rm -f ${TKX_SHLIB_NAME} -- ${TCL_SHLIB_LD} -o ${TKX_SHLIB_NAME} ${SOBJS} \ -- ${TK_BUILD_STUB_LIB_SPEC} ${TCLX_BUILD_LIB_SPEC} \ -- ${TCL_BUILD_STUB_LIB_SPEC} ${TCL_SHLIB_LD_LIBS} -+ ${CC} -pipe -shared -Wl,-soname,$@ -o $@ ${SOBJS} ${TCL_SHLIB_LD_LIBS} -L${TCL_UNIX_DIR} -ltcl -L${TK_UNIX_DIR} -ltk ${TCLX_BUILD_LIB_SPEC} -+ -+libtkx.so: libtkx.so.0 -+ ln -sf $< $@ - - hello: hello.c - ${CC} ${LD_SWITCHES} -o $@ hello.c ${STATIC_LIBS} -@@ -157,15 +158,15 @@ - # Generate the test program. - # - --tktest: ${TEST_OBJS} @TKX_SHLIB_BUILD_REF@ @TKX_STLIB_BUILD_REF@ ${TCL} -+tktest: ${TEST_OBJS} libtkx.so.0 libtkx.so libtkx${DBGX}.a ${TCL} - ${CC} ${LD_SWITCHES} ${TEST_OBJS} ${ALL_LIBS} \ - -o $@ || (rm -f $@; exit 1) - --tktest.static: ${TEST_OBJS} @TKX_STLIB_BUILD_REF@ ${TCL} -+tktest.static: ${TEST_OBJS} libtkx${DBGX}.a ${TCL} - ${CC} ${LD_SWITCHES} ${TEST_OBJS} ${STATIC_LIBS} \ - -o $@ || (rm -f $@; exit 1) - --tktest.standalone: ${TEST_SAOBJS} @TKX_STLIB_BUILD_REF@ ${TCL} -+tktest.standalone: ${TEST_SAOBJS} libtkx${DBGX}.a ${TCL} - ${CC} ${LD_SWITCHES} ${TEST_SAOBJS} ${STATIC_LIBS} \ - -o $@ || (rm -f $@; exit 1) - -@@ -203,9 +204,9 @@ - BUILDHELP=@BUILDHELP@ - buildhelp: - rm -rf ${HELP_DIR} help help.tmp -- if test ! -d @HELP_DIR@ ; then \ -- mkdir @HELP_DIR@ ;\ -- fi -+# if test ! -d ${HELP_DIR} ; then \ -+# mkdir ${HELP_DIR} ;\ -+# fi - mkdir ${HELP_DIR} - ${BLDMANHELP} ${TK_SRC_DIR}/doc ${TCLX_TOOLS_SRC_DIR}/tkmanpages \ - ${HELP_DIR} Tk.brf -@@ -237,7 +238,8 @@ - fi - ${INSTCOPY} tkxConfig.sh ${INSTALL_ROOT}${TKX_INST_LIB} - if test "@SHARED_BUILD@" = "1"; then \ -- ${INSTCOPY} ${TKX_SHLIB_NAME} ${INSTALL_ROOT}${TKX_INST_LIB} ;\ -+ ${INSTCOPY} libtkx.so.0 ${INSTALL_ROOT}${TKX_INST_LIB} ;\ -+ cp -df libtkx.so ${INSTALL_ROOT}${TKX_INST_LIB} ;\ - ${INSTCOPY} pkgIndex.tcl ${INSTALL_ROOT}${TKX_EXEC_RUNTIME} ;\ - fi - ${INSTCOPY} tclhelp ${INSTALL_ROOT}${TKX_INST_BIN} ---- tclx8.3/tcl/unix/tclxConfig.sh.in.makecfg Mon Aug 28 23:58:00 2000 -+++ tclx8.3/tcl/unix/tclxConfig.sh.in Wed Aug 8 17:36:05 2001 -@@ -18,7 +18,7 @@ - # - # Defines for cpp. - # --TCLX_DEFS='@DEFS@' -+TCLX_DEFS=' -DSTDC_HEADERS=1 -DNDEBUG=1 -DRETSIGTYPE=void ' - - # - # Additional libraries added by TclX. -@@ -35,12 +35,12 @@ - # String to pass to linker to pick up the TclX library from its - # installed directory. - # --TCLX_LIB_SPEC='@TCLX_LIB_SPEC@' -+TCLX_LIB_SPEC='-ltclx' - - # - # Search flags that specify how to find the TclX shared libraries at run time - # on some systems. - # --TCLX_LD_SEARCH_FLAGS='@TCLX_LD_SEARCH_FLAGS@' -+TCLX_LD_SEARCH_FLAGS='' - - ---- tclx8.3/tk/unix/tkxConfig.sh.in.makecfg Mon Aug 28 23:58:00 2000 -+++ tclx8.3/tk/unix/tkxConfig.sh.in Wed Aug 8 17:39:35 2001 -@@ -19,7 +19,7 @@ - # - # Defines for cpp. - # --TKX_DEFS='@DEFS@' -+TKX_DEFS=' -DSTDC_HEADERS=1 -DNDEBUG=1 -DRETSIGTYPE=void ' - - # - # Additional libraries added by TclX. -@@ -36,6 +36,6 @@ - # String to pass to linker to pick up the TclX library from its - # installed directory. - # --TKX_LIB_SPEC='@TKX_LIB_SPEC@' -+TKX_LIB_SPEC='-ltkx' - - diff --git a/dev-tcltk/tclx/tclx-8.3-r1.ebuild b/dev-tcltk/tclx/tclx-8.3-r1.ebuild deleted file mode 100644 index 3d5bb0c92b0b..000000000000 --- a/dev-tcltk/tclx/tclx-8.3-r1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclx/tclx-8.3-r1.ebuild,v 1.15 2006/11/01 19:35:43 jokey Exp $ - -inherit flag-o-matic eutils - -IUSE="X" - -DESCRIPTION="A set of extensions to TCL" -HOMEPAGE="http://www.neosoft.com/TclX/" -SRC_URI="ftp://ftp.slackware.com/pub/slackware/slackware-8.1/source/tcl/tclx/${PN}${PV}.tar.gz - ftp://ftp.scriptics.com/pub/tcl/tcl8_4/tcl8.4.2-src.tar.gz - ftp://ftp.scriptics.com/pub/tcl/tcl8_4/tk8.4.2-src.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 ~ppc ~sparc ~x86" - -DEPEND=">=dev-lang/tcl-8.4.2 - X? ( >=dev-lang/tk-8.4.2 )" - -S=${WORKDIR}/${PN}${PV} - -# Not necessary ! see BUG #55238 -# Danny van Dyk 2004/08/30 -# [ $ARCH = alpha ] && append-flags -fPIC -# [ "${ARCH}" = "amd64" ] && append-flags -fPIC - -src_unpack() { - ewarn "" - ewarn "Your compile WILL fail if you are upgrading from" - ewarn "a previous version of tclx." - ewarn "" - ewarn "emerge unmerge tclx" - ewarn "BEFORE upgrading to a newer version" - ewarn "" - ewarn "You have been warned :)" - ewarn "" - epause 5 - - unpack ${A} ; cd ${S} - epatch ${FILESDIR}/${P}-makecfg.patch - epatch ${FILESDIR}/${P}-argv.patch - epatch ${FILESDIR}/${P}-varinit.patch -} - -src_compile() { - # we have to configure and build tcl before we can do tclx - cd ${WORKDIR}/tcl8.4.2/unix - econf || die "econf failed" - emake CFLAGS="${CFLAGS}" || die "emake in tcl/unix failed" - - local myconf="--with-tcl=${WORKDIR}/tcl8.4.2/unix --enable-shared" - - if use X ; then - # configure and build tk - cd ${WORKDIR}/tk8.4.2/unix - econf || die "econf failed" - emake CFLAGS="${CFLAGS}" || die - myconf="${myconf} --with-tk=${WORKDIR}/tk8.4.2/unix" - else - myconf="${myconf} --enable-tk=no" - fi - - # configure and build tclx - cd ${S}/unix - econf ${myconf} || die "econf failed" - make CFLAGS="${CFLAGS}" || die -} - -src_install() { - echo "installing tclx" - cd ${S}/unix - make INSTALL_ROOT=${D} install - cd ${S} - dodoc CHANGES README TO-DO doc/CONVERSION-NOTES - doman doc/*.[n3] -} diff --git a/dev-tcltk/tclx/tclx-8.4.ebuild b/dev-tcltk/tclx/tclx-8.4.ebuild deleted file mode 100644 index 374890e83294..000000000000 --- a/dev-tcltk/tclx/tclx-8.4.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclx/tclx-8.4.ebuild,v 1.1 2006/11/01 19:35:43 jokey Exp $ - -inherit flag-o-matic eutils - -MY_P=${PN}${PV} -DESCRIPTION="A set of extensions to TCL" -HOMEPAGE="http://tclx.sourceforge.net" -SRC_URI="mirror://sourceforge/tclx/${MY_P}.tar.bz2 - ftp://ftp.scriptics.com/pub/tcl/tcl8_4/tcl8.4.6-src.tar.gz - ftp://ftp.scriptics.com/pub/tcl/tcl8_4/tk8.4.6-src.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" -IUSE="X" - -DEPEND=">=dev-lang/tcl-8.4.6 - X? ( >=dev-lang/tk-8.4.6 )" - -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${MY_P} - -src_unpack() { - unpack ${A} - - # Fix bug[s] in configure script #119619 - local d - local srcdirs - srcdirs="tcl8.4.6/unix tk8.4.6/unix tclx8.4" - - for d in $srcdirs; do - ebegin "Fixing ${d}/configure" - cd ${WORKDIR}/${d} - sed -i -e "/relid'/s/relid'/relid/" configure || die "sed failed to fix - configure scripts" - eend $? - done -} - -src_compile() { - # we have to configure and build tcl before we can do tclx - cd "${WORKDIR}"/tcl8.4.6/unix - econf - emake CFLAGS="${CFLAGS}" || die "emake in tcl/unix failed" - - local myconf="--with-tcl=${WORKDIR}/tcl8.4.6/unix --enable-shared" - - if use X ; then - # configure and build tk - cd ${WORKDIR}/tk8.4.6/unix - econf - emake CFLAGS="${CFLAGS}" || die "emake X failed" - myconf="${myconf} --with-tk=${WORKDIR}/tk8.4.6/unix" - else - myconf="${myconf} --enable-tk=no" - fi - - # configure and build tclx - cd "${S}" - - # we're only building a lib, so it's safe here - append-flags -fPIC - - econf ${myconf} - emake CFLAGS="${CFLAGS}" || die "emake tclx failed" -} - -src_install() { - cd "${S}" - emake DESTDIR="${D}" install || die - dodoc README - doman doc/*.[n3] -}