From: Mark Wright Date: Thu, 15 Jan 2015 12:36:34 +0000 (+0000) Subject: Thanks to Martin Walch for reporting, fix Bug 532694 - dev-lang/scala-2.11*: some... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d39b7fbc055f786fd003701b60544334862bc327;p=gentoo.git Thanks to Martin Walch for reporting, fix Bug 532694 - dev-lang/scala-2.11*: some scala-* libraries are missing the ".jar" ending. Drop old versions. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x618E971F --- diff --git a/dev-lang/scala/ChangeLog b/dev-lang/scala/ChangeLog index d156582c439f..ab2209bcf6aa 100644 --- a/dev-lang/scala/ChangeLog +++ b/dev-lang/scala/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-lang/scala -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.43 2014/11/28 00:09:10 gienah Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.44 2015/01/15 12:36:21 gienah Exp $ + + 15 Jan 2015; Mark Wright -scala-2.10.2.ebuild, + -scala-2.9.0.1.ebuild, -scala-2.9.1.ebuild, scala-2.11.1.ebuild, + scala-2.11.2.ebuild, scala-2.11.4.ebuild: + Thanks to Martin Walch for reporting, fix Bug 532694 - dev-lang/scala-2.11*: + some scala-* libraries are missing the ".jar" ending. Drop old versions. 28 Nov 2014; Mark Wright +files/scala-2.11.4-no-git.patch: Thanks to Juergen Rose for reporting, fix Bug 530836 - dev-lang/scala-2.11.4 - diff --git a/dev-lang/scala/Manifest b/dev-lang/scala/Manifest index 8c6e84478e70..d3af5a1d4605 100644 --- a/dev-lang/scala/Manifest +++ b/dev-lang/scala/Manifest @@ -125,10 +125,6 @@ DIST scala-2.11.4-nest.jar 2920 SHA256 3c7cf1a1b9fe9ad2abf3bfcedaa17a976c72f4bcc DIST scala-2.11.4-push.jar 8886289 SHA256 58eb2b8c501bbff0e78074a058e3fc160012a80952c1cc96ed301d8a08d7e98d SHA512 b5539d381c8978ac57fc4258696e4cb552f47917178152b38b5683e42ed60da4d9da198a0344652f201541a71f92afd2ac8b3c3d3ec5266a8c222e9661d8a06a WHIRLPOOL 8fa6522a0fd9939f4ffd443b55e7a5adbb93a9dc5cbad569ccecd6be77ecd259eadbdb16c2c7eab6d9f175fbf33746faf9c41cf4d1050e7f576b86119301e126 DIST scala-2.11.4-vizant.jar 15910 SHA256 a54e19093725d0d085544553246e48607c1e6ab65575ae0ff721b788118461d6 SHA512 4464d7349016f4999199e227e8eaf7bb3ef6b7e38ad0e8e710faad55df2e1243d99b53b9a789a1ffd3c39aef0d979dffc543f4691feae68cfa743e51bcf61390 WHIRLPOOL 1b957b8b850f79309c3577a2dcac52a620fa54f810f242a02c52bbcee1cc9c5818785baa7db8e2b82b850bcb56b528c4dd07cdfad2f991c0025293ca02c0dc99 DIST scala-2.11.4.tar.gz 5789309 SHA256 3c9af3b0cf7528f2ceacb316c3e96eee8c63d2e635a8143c8dbb8d5206a5a834 SHA512 e7646ed8d40eca6d91757d257e9301836bdc6676dfe5bbb4b059af7a08496fbc99d243f3f087e507d026a9c41e2452ecf72ea5e4e1babbb7119065d8bc710056 WHIRLPOOL ab8f272054a6d2776e4857f705d4de7ffded979e1628e7a290d28bd3cb8451aa72defc53e31e1eaa7e72f55b0f72fd5469226d1c35cb583b6bc2dd7fb0ff2e84 -DIST scala-2.9.0.1-gentoo-binary.tar.bz2 33234044 SHA256 e44fbdace22ecf09aad8d10975c42758cc94e7d3caef9a30fe921b05188b8282 SHA512 1499ac0c2cc916ae0108dd3560e769e40441622580cbbeb32aa37048e6818499d3240f6045f4adeacf7e86a8d45582ea548bb37acc2070d12a2f15f9a25f722c WHIRLPOOL 03548a939001427f024e218c686dd859d94e73ecabeae6462c9e6e451457621be9bdb46c91c43653eacc7892bfbffcd37fb2a3421a8a9c25aae18d9297eeba01 -DIST scala-2.9.0.1.tar.xz 29707920 SHA256 97e0d2262e4df8f936c70670849299deba69e981f783250d819733e52dbe7f96 SHA512 be1ab7589125b994e6512b38d7e5fe4c07e9f2c614ee41662a75ac4c8666faefa46e525681fbca9509b1d1db86c51f25d1a98ac67739de077b3a54adb4baf441 WHIRLPOOL 05abba93be924972d8acf76b720feb0534af0650d05bc71a7439242314c16b66c03eca05c6b00d229725239d1bbb01d1a7fd1470284c2bccac5cf0e78e930b4b -DIST scala-2.9.1-gentoo-binary.tar.bz2 33266793 SHA256 b118c285ba6655974a647a5a82e3e655487e55aff6a5b89ddf5295595d6c822a SHA512 08b9354cdc542e52b4cab2b5e67131757f635a1da8118d5c8dd015f49d9f84f1647a60a9ff5936e49441fbec71596fc8616aa494ca9cc9da851acd3ab1b5210e WHIRLPOOL 47561a90d5af3c93e17ff1cb5c9f601deb1156303a7c0ec53c43838e3f62a229e1a5c10c108fb29fdfab4d3e4c8160b02147ec3d9656ff5567b50bc75cfa00b0 -DIST scala-2.9.1.tar.xz 29728644 SHA256 4bbb439b2830560cd034eaf143357cb195b8bcd986e38749341ce541cbfa8e6a SHA512 875e6a522c867b0eec527ca11603c1b7027ab7d12d6f9b7d5f5be62cbff5a5e1f02771a02de8af838554f3b302d91cb2eeaaeed7c79fc6944913afaedc10c18e WHIRLPOOL a5268414b06c9dfd02626f346d947cfd2a0f1dc4d4009ace1a84129e6d3cf9f10b6a52852ebe4aea3ccd4160fb68af2251c5b50ad063b824cd5349bad2b54347 DIST scala-2.9.2-gentoo-binary.tar.bz2 32370003 SHA256 43e07596f28e723cf1e2d41ed95c312af8422059de8c229d18eadb46d487c9ca SHA512 b0873dbe5d93b1665372c44f9473e1d4616f5347c26e0950cf2366b08e1f68069b1c527bda7bfcecb8af4afeaa1c9cae7d324d36509d5f2072e725310fd1cc7b WHIRLPOOL ffcba39e9f04eccadc16bda8770e42f2725fcf21172f7f6798f3849282c276d3671c93e0eaeb4a0a46a73a815cb31300302354f8e99ce888a5687739ab0f50f8 DIST scala-2.9.2.tar.gz 38434121 SHA256 1b931103051f4f6b2f8788ac6f5392b5f29e1109e97f0e19340ff6185fbab4ad SHA512 c8ce17728976c506c90d2eec792904d39a16d35d153914a7c936e43e530f20d8cdf494287187c513393e2db7837b8ec9d417c56f6bb47be3b0501f2a57f52b63 WHIRLPOOL 08774dd06a6814a33a21643a0af361310ca8aae649968d4d411a3ffba32e855d320f052bda0707db356c01e1f4e1c1b0cafd67881d1666d046ad8934084e7635 DIST scala-compiler-src.jar 2462738 SHA256 ca43298237583dfd362ab4d773ef0f791a075d9187ecf30cc8ee4f4b7ae12e76 SHA512 a71eab8ada2fd23aa1408577dc3bde28847484643618a752ab68bbe5c8a4ef19ad852ace6f44c8e66668e6b6098de8b0cb3eb8d0c4674ed332562463b43a8a38 WHIRLPOOL 8cc711357fe2b393c1e28a3ebd0249fb633c1135c6c4d8819c6ab14081c9fbbb4c1e0a6b84eb9a5711c9874814e54676905da90a1d8d6c5e28213e189bb0f37b @@ -141,21 +137,18 @@ DIST scalacheck.jar 763570 SHA256 96814bea5818186086473da5c657191d03145649eee0c3 DIST scalatest.jar 1827900 SHA256 43869b4171972901bce5a89b1ba8b8474c7e75538321dcdfb41e37d089edbac8 SHA512 2d77d1239d544d572660d8b2a8355bf7a03137a3d05d41b5f2ab214edab05ef038d3e05082d5adafe16b6cda41440c075f49a130c3c7ff053c6d8844000d2f2b WHIRLPOOL 68d804ab21f3caa0e459d8d8b1c926b6f69140cb64a96b72d95605f9f04845510cd47b369b3d73d5e944912fa2f0d06cfb02c75f89087d8f27effbdfa4d9ccd1 DIST vizant.jar 15910 SHA256 a54e19093725d0d085544553246e48607c1e6ab65575ae0ff721b788118461d6 SHA512 4464d7349016f4999199e227e8eaf7bb3ef6b7e38ad0e8e710faad55df2e1243d99b53b9a789a1ffd3c39aef0d979dffc543f4691feae68cfa743e51bcf61390 WHIRLPOOL 1b957b8b850f79309c3577a2dcac52a620fa54f810f242a02c52bbcee1cc9c5818785baa7db8e2b82b850bcb56b528c4dd07cdfad2f991c0025293ca02c0dc99 EBUILD scala-2.10.2-r1.ebuild 8549 SHA256 469d65299edb517545f1af2769a6c76b8eaa5da2f1f0fc0f7a8379fd0192c6c3 SHA512 d6a465f872b71f9fc729bdf4d4bab4e84c54a52c6efe681cf25368ae4f67f6b06517ccf279ca186e8a08e5160741a1e1505e972825131554fdc566ed14c23e3a WHIRLPOOL d86bd45e5922e49bf77c5c543de3448a87d6a7f337fef9a52edf2b1816eb1edba0434819525e4746fd8f8ec4530c3c45bca476b8fff71c8349d2e48f9dd5db3f -EBUILD scala-2.10.2.ebuild 8497 SHA256 f124567a162ac34ebe2fab041c8cc8dd7cb2383e2fa186b5b02ffe4287b47d94 SHA512 6efde5fee8653752982a099ec9bc4b8d8edad5123e534ea76a8cfe44577719a8cb224ec8e031d3517f7cf9631c6fd2890351dc015ca9c33e5b2fcafced6b1795 WHIRLPOOL 1268e2184073f78e1ae7833df8ca9fee40a986972f222994c54e74876e56369d54cfdebec27cfb3af4841d9f41916ed4f23f171ca34a57c7f4157e6b1b82a89e EBUILD scala-2.10.3.ebuild 8380 SHA256 cb2e3dbd1b9388a979876c33a1b6671c25e9018e8ed3bc66d50b96ddb48f9258 SHA512 8c67d0c74dd9ea5402cc5fb3f4c629962bd5a43d7a5711f90457838e79ac6edc03bd6678d8ed584cc1db8943f00f34226558e1a7b51d727e9f654b8a69f9b9ea WHIRLPOOL 934419b4bad0af723a2d500a17d53cb23df9280e5c427f53fb641fb639765f472f0f18f4c7956366dfbeaf8b83ac346232362184e6a59968b80bf27128a30ed6 EBUILD scala-2.10.4.ebuild 9000 SHA256 a7d77d6204a08301ef1ad3c989ba2aed31754360cd2aeddfef4708d43d63488c SHA512 096482891a53eafcdf64db6e57de7d82f55b8a2f468fac34adf296df3443b8d69cf2ed550ea84187c7ae4f730cf5ec47b3c82ca2497cd490bf8fa958213eca63 WHIRLPOOL 9b93bdeb2d23bcdfe00817827189e3facaff5ac950eae5d8cb9b677839e3a1112695ddabf9fcf6334c8649b664cdc5fdb5f8f297376217c751eb6f22e7f84c3c -EBUILD scala-2.11.1.ebuild 7600 SHA256 d7757802ecca88f1a8560813fab332327a25ad9d16c767f9d67d8793a3345a83 SHA512 41ba84af5b9b665c523d8cd4e7ad6812c0c622b0d1037e5dcd919e5c92ad5380e07d12aa93036b134599e647c4d0f03e6738e41025b45bf3204f66a9937fe5e5 WHIRLPOOL 7770818c11496ac9911210cdcb71d12b07e75f0be54024f5ca8c98b9e72b9181b8d4188a46fb81e843c3681bb280704e04b11d9e99841483d398cfd90228d734 -EBUILD scala-2.11.2.ebuild 7685 SHA256 ed731fec280b8f886633356d0cf609770d79937f307fab930c4d96a72d7f0c5d SHA512 a6a6cac3f9a0d577f1e541ea4749e73522283c9c6e18ecb45fcf1888969f9b3db3e85830a5c70c0890b29b8b62e5b69841bc282fc2b0e2897a4e88edff59a763 WHIRLPOOL 8baa3ab5c15e812ca1c033b47001e4c94d3c2e49c492a5d25303593932c353b7b97afd6062122c2de2e967dfc0029e4e80e5ef09dd321433afefcce12eb9e154 -EBUILD scala-2.11.4.ebuild 7649 SHA256 7ff76b64e6f5183ff125e7ee44f674f1a0a94e145afcc46731596e47ee091825 SHA512 39fcd707cbe7e419951afdbfb9b8ffe949a9b6a572d061e260a8dad57da23e7cd34bb0f05d8573f675f51c3833280b6f863f3a50b69b2797ed4e9d15108c0627 WHIRLPOOL b9a9cbfceed7974d1a64882c58134394481b723dca5e81b0465e3c2cc2be6aec903f9dd3cd5103d209bdf001bab1d8724e90042b821486c2729a4436c8f7f5c0 -EBUILD scala-2.9.0.1.ebuild 3889 SHA256 4193799a5ee6b63411c20a99c4d7422d5a596d795236a508fe536a316ac2013d SHA512 924bcd7d1f180b57607579e265fa945ac80c7bb18ecf394c432c21e62dee970c868651363eaa3f49465c1d6334df8314c77761ea46e1f9d1f43b2b7537108ded WHIRLPOOL bb2ec1cc4015241fb91b4612cde5f1b36c10aadc5f44390bbf2b579f6044fad112c6794504d84d2aca565843271951aeb37a3230e314d9bec458ee4841bdf03c -EBUILD scala-2.9.1.ebuild 3902 SHA256 5850b0694255b672412d830f6bcabda4eb3506ad78a5cd6fc58c974606024fcb SHA512 e11f585934b7e51439b9a033b74a6f20dd090dcab6956838c0fcb85b00e81e980aa7496dfa20b2c9fdd1247838323e9d3392f391716dec320a5e4deaa70f1c45 WHIRLPOOL aa1de98a6582bc466b60445deb44363aa3d1a392dce18419c2524375aaec0f60263a24ed8e15ef8f3c8fc00f87172dc017cdec1d3edb69681906c646dc81903e +EBUILD scala-2.11.1.ebuild 7587 SHA256 6bfd182d7450a60575527328dcae059865ced45cbc054e7179ba094031b18920 SHA512 6d2d541c91b4454909a620c65e9f05291866e3e0df7ce28c5e0f6382ca06b35d5f056d200939ab61bedaa333fd8d183662e3f813b6a03c8761d7b30b6276f27e WHIRLPOOL 69ef90cea9aa28bdb0f5c46c4840a0c88df5b1e6c052df91054a7b9725dd533e3bae416c535b6fc3de50957f010047abc8225a448354cac21260965723f5dd48 +EBUILD scala-2.11.2.ebuild 7672 SHA256 93c93197139b8b98088862704e95924df0e72e993bd8f075aaffc4da431bb71e SHA512 ca28d807ded77cae0a1214ca772a89a53e262c854decc1813e096a022aeb4a751ca0be7863db48880dac932d9e0ff6a5fa13f7f82262431dbe834f4d7b7f8eeb WHIRLPOOL b6c8464e1d7dc9c9ff56129261af38cff9713a5eeb58f9bc9550d500d134cec703449fa41c014900e95590c4f829f8c6230cdb1ed83c97fa426e90f6bb6b3a79 +EBUILD scala-2.11.4.ebuild 7636 SHA256 610cefe145c0bd9739caa1ac48e2a916b6c5fa350c2a6ac8758c16434fd401c6 SHA512 4386ef5b8ebf46167ef6545d61019c3589928ab29f54ab3d29b2efcf8b5e935a3bed78d80b664be1e9ae3f7969d3ae7599932b25cb096656fcf8535e80a55230 WHIRLPOOL 0a3fdad1a64350f0b5b273dff0571e120f3ab43bb3be203e21a4ef1fea8292fdceaeb991ab775dee3caebfa2a4fb07625456d2dabd24d8df4c37eaca1c5fe459 EBUILD scala-2.9.2.ebuild 3962 SHA256 e810798955120343c29b7e92fbca46c0da311472533a23cb7a2e85e408111259 SHA512 6109c0722859a29910525cfbeae2ea665f50931e05268e2891e3bd56665d71a6a697fdb1fc8e6038df0359bace8ae9d80358f2742edb995bcd3cf388e25d5264 WHIRLPOOL 29ec1f92755b0894077db0f24bb4bffc6ad5915b203b4786deb59b7fa86ece7ae7ffc6f18c2540f9cb72e6a627c495ab5fd79273b38173d9293eb43db48d57c2 -MISC ChangeLog 9487 SHA256 c6c4c3894da727b19037289d58e83010d27d65a0266254a68985c0fa3c324767 SHA512 b4fa09b1e0f555a244cd6a4f7188504e256c9a306ec3af3ec8ef0eff66f12e37b62e1496c72db159e10b818616712ffa06efe78c64d21efd6d03c771eb21de50 WHIRLPOOL ed4f95eda6308534abdb1921bb84052dcd4123935712a6564e64d9b125055ae5960f529275caff4ce33b352542bfd429283cf6b44c298580a1833fd151f24380 +MISC ChangeLog 9822 SHA256 03c1c4596fbdb8c5920623cd12ef4eb31cabf5e2f08e961fbea0055f22367145 SHA512 b1e737ee10a35e37d59318bd2f4f8b535e237738be5809b88b1eba18a2ddf39b71c0ad72f363521f290df7634b6af734a828c402660c67b161fb2462e0797e0b WHIRLPOOL 20932f0848327272cd7f7b30c3765e0301b686730f5e909387f59a2f2b9ebb5af77d9c187c8d9ce24877da837dcee57151e0acc75ef018e7f2c5f95346b420d4 MISC metadata.xml 317 SHA256 9ec2b0918811b14be0850dabea428b6b976e7eae70e97f281f85533d4e66bc94 SHA512 38504fb1d7acf7cf794ab67864c2f4ef99d569d9981753415dc6bfe3128bcf31568f0134d56f115644e1dafc18d32c9d51de252cb49de842ea2a32d71225c088 WHIRLPOOL 4e11d4be40d7f37a3b775e5a89f901a8c44d4291411f98783669b3129e671294d103e45dbabef350cc4469aaef2567d3fc9fb27f99ed476cd07a416a4ede71a1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlR3vS4ACgkQoBEVQmGOlx+8kQD/YYuAeowl0OxFCVjSRE4d9wu7 -rW/jWYIQakjjGfymwp4A+gMURn+blRYcf3maaBlFFTAlu2Aa9F0ZpOE/v1epzqeK -=175i +iF4EAREIAAYFAlS3tE8ACgkQoBEVQmGOlx/GaAD/XpsbNx7i1fEvkAxv3Nesqix5 +oNzt1hd61r65Oxs+GcwBAN+eUKjp/Vtzg7f/6Hhg2wre9H7IWQ4yxMPB8fWfT/ew +=nY8B -----END PGP SIGNATURE----- diff --git a/dev-lang/scala/scala-2.10.2.ebuild b/dev-lang/scala/scala-2.10.2.ebuild deleted file mode 100644 index 5ac46399c8dd..000000000000 --- a/dev-lang/scala/scala-2.10.2.ebuild +++ /dev/null @@ -1,241 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.10.2.ebuild,v 1.3 2014/02/12 13:46:58 gienah Exp $ - -EAPI="5" -JAVA_PKG_IUSE="doc examples source" -WANT_ANT_TASKS="ant-nodeps" -EANT_TEST_TARGET="test.suite" -inherit eutils check-reqs java-pkg-2 java-ant-2 versionator - -MY_P="${PN}-sources-${PV}" - -# creating the binary: -# JAVA_PKG_FORCE_VM="$available-1.6" USE="doc examples source" ebuild scala-*.ebuild compile -# cd $WORDKIR -# fix dist/latest link. -# tar -cjf $DISTDIR/scala-$PN-gentoo-binary.tar.bz2 ${MY_P}/dists ${MY_P}/docs/TODO - -# in the pullJarFiles function in tools/binary-repo-lib.sh it executes find commands -# to search for .desired.sha1 files, which contain sha1 hashes that are appended -# to ${BURI} along with the subdirectory and filename to form the list of jar files -# listed in SRC_URI. - -BURI="http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap" - -declare -a JURI=(${BURI}/8bdac1cdd60b73ff7e12fd2b556355fa10343e2d/lib/scala-library-src.jar \ - ${BURI}/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar \ - ${BURI}/d48cb950ceded82a5e0ffae8ef2c68d0923ed00c/lib/msil.jar \ - ${BURI}/d229f4c91ea8ab1a81559b5803efd9b0b1632f0b/lib/scala-reflect-src.jar \ - ${BURI}/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar \ - ${BURI}/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar \ - ${BURI}/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar \ - ${BURI}/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar \ - ${BURI}/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar \ - ${BURI}/cfa3ee21f76cd5c115bd3bc070a3b401587bafb5/lib/scala-compiler-src.jar \ - ${BURI}/1e0e39fae15b42e85998740511ec5a3830e26243/lib/scala-library.jar \ - ${BURI}/8acc87f222210b4a5eb2675477602fc1759e7684/lib/fjbg.jar \ - ${BURI}/288f47dbe1002653e030fd25ca500b9ffe1ebd64/lib/scala-reflect.jar \ - ${BURI}/a5261e70728c1847639e2b47d953441d0b217bcb/lib/jline.jar \ - ${BURI}/d54b99f215d4d42b3f0b3489fbb1081270700992/lib/scala-compiler.jar \ - ${BURI}/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar \ - ${BURI}/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar \ - ${BURI}/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar \ - ${BURI}/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar \ - ${BURI}/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar \ - ${BURI}/b6f4dbb29f0c2ec1eba682414f60d52fea84f703/test/files/lib/scalacheck.jar \ - ${BURI}/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar \ - ${BURI}/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar \ - ${BURI}/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar) - -DESCRIPTION="The Scala Programming Language" -HOMEPAGE="http://www.scala-lang.org/" -SRC_URI="!binary? -( https://github.com/scala/scala/archive/v${PV}.tar.gz -> ${P}.tar.gz - ${JURI[@]} - http://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz -)" -# binary? ( http://dev.gentoo.org/~ali_bush/distfiles/${P}-gentoo-binary.tar.bz2 )" -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos" -IUSE="binary emacs" - -COMMON_DEP="dev-java/ant-core - dev-java/bndlib - dev-java/hawtjni-runtime - dev-java/junit:4" -DEPEND="${COMMON_DEP} - >=virtual/jdk-1.6.0 - /dev/null - # other jars are needed for bootstrap - #rm -v jline.jar ant/ant-contrib.jar #cldcapi10.jar midpapi10.jar msil.jar *.dll || die - rm -v ant/ant-contrib.jar || die - java-pkg_jar-from --into ant --build-only ant-contrib - popd &> /dev/null - fi -} - -src_compile() { - if ! use binary; then - #unset ANT_OPTS as this is set in the build.xml - #sets -X type variables which might come back to bite me - unset ANT_OPTS - - # reported in bugzilla that multiple launches use less resources - # https://bugs.gentoo.org/show_bug.cgi?id=282023 - eant all.clean - eant -Djavac.args="-encoding UTF-8" -Djava6.home=${JAVA_HOME} \ - newlibs newforkjoin build-opt - eant dist.done - else - einfo "Skipping compilation, USE=binary is set." - fi -} - -src_test() { - eant test.suite || die "Some tests aren't passed" -} - -#scala_launcher() { -# local SCALADIR="/usr/share/${PN}" -# local bcp="${SCALADIR}/lib/scala-library.jar" -# java-pkg_dolauncher "${1}" --main "${2}" \ -# --java_args "-Xmx256M -Xms32M -Dscala.home=${SCALADIR} -Denv.emacs=${EMACS}" -#} - -src_install() { - cd dists/latest || die - - local SCALADIR="/usr/share/${PN}/" - - exeinto "${SCALADIR}/bin" - doexe $(find bin/ -type f ! -iname '*.bat') - - #sources are .scala so no use for java-pkg_dosrc - if use source; then - dodir "${SCALADIR}/src" - insinto "${SCALADIR}/src" - doins src/*-src.jar - fi - - java-pkg_dojar lib/*.jar - - doman man/man1/*.1 || die - - #docs and examples are not contained in the binary tgz anymore - if ! use binary; then - local docdir="doc/${PN}-devel-docs" - dodoc doc/README ../../docs/TODO || die - if use doc; then - java-pkg_dojavadoc "${docdir}/api" - dohtml -r "${docdir}/tools" || die - fi - - use examples && java-pkg_doexamples "${docdir}/examples" - fi - - dodir /usr/bin - for b in $(find bin/ -type f ! -iname '*.bat'); do - #pushd "${D}/usr/bin" &>/dev/null - local _name=$(basename "${b}") - dosym "/usr/share/${JAVA_PKG_NAME}/bin/${_name}" "/usr/bin/${_name}" - #popd &>/dev/null - done - #scala_launcher fsc scala.tools.nsc.CompileClient - #scala_launcher scala scala.tools.nsc.MainGenericRunner - #scala_launcher scalac scala.tools.nsc.Main - #scala_launcher scaladoc scala.tools.nsc.ScalaDoc - #scala_launcher scalap scala.tools.scalap.Main -} diff --git a/dev-lang/scala/scala-2.9.1.ebuild b/dev-lang/scala/scala-2.9.1.ebuild deleted file mode 100644 index 929c43311e5c..000000000000 --- a/dev-lang/scala/scala-2.9.1.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.9.1.ebuild,v 1.3 2012/01/31 09:22:41 ali_bush Exp $ - -EAPI="3" -JAVA_PKG_IUSE="doc examples source" -WANT_ANT_TASKS="ant-nodeps" -inherit eutils check-reqs java-pkg-2 java-ant-2 versionator - -MY_P="${P}.final-sources" - -# creating the binary: -# JAVA_PKG_FORCE_VM="$available-1.5" USE="doc examples source" ebuild scala-*.ebuild compile -# cd $WORDKIR -# fix dist/latest link. -# tar -cjf $DISTDIR/scala-$PN-gentoo-binary.tar.bz2 ${MY_P}/dists ${MY_P}/docs/TODO - -DESCRIPTION="The Scala Programming Language" -HOMEPAGE="http://www.scala-lang.org/" -SRC_URI="!binary? ( ${HOMEPAGE}downloads/distrib/files/${MY_P}.txz -> ${P}.tar.xz ) - binary? ( http://dev.gentoo.org/~ali_bush/distfiles/${P}-gentoo-binary.tar.bz2 )" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="binary emacs" -# one fails with 1.7, two with 1.4 (blackdown) -#RESTRICT="test" - -DEPEND="virtual/jdk:1.6 - java-virtuals/jdk-with-com-sun - !binary? ( - dev-java/ant-contrib:0 - ) - app-arch/xz-utils" -RDEPEND=">=virtual/jre-1.6 - !dev-java/scala-bin" - -PDEPEND="emacs? ( app-emacs/scala-mode )" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - java-pkg-2_pkg_setup - - if ! use binary; then - debug-print "Checking for sufficient physical RAM" - - ewarn "This package can fail to build with memory allocation errors in some cases." - ewarn "If you are unable to build from sources, please try USE=binary" - ewarn "for this package. See bug #181390 for more information." - - CHECKREQS_MEMORY="1532M" - - check-reqs_pkg_setup - fi -} - -java_prepare() { - if ! use binary; then - pushd lib &> /dev/null - # other jars are needed for bootstrap - #rm -v jline.jar ant/ant-contrib.jar #cldcapi10.jar midpapi10.jar msil.jar *.dll || die - rm -v ant/ant-contrib.jar || die - java-pkg_jar-from --into ant --build-only ant-contrib - popd &> /dev/null - fi -} - -src_compile() { - if ! use binary; then - #unset ANT_OPTS as this is set in the build.xml - #sets -X type variables which might come back to bite me - unset ANT_OPTS - - # reported in bugzilla that multiple launches use less resources - # https://bugs.gentoo.org/show_bug.cgi?id=282023 - eant all.clean - eant -Djavac.args="-encoding UTF-8" -Djava6.home=${JAVA_HOME} \ - newlibs newforkjoin build-opt - eant dist.done - else - einfo "Skipping compilation, USE=binary is set." - fi -} - -src_test() { - eant test.suite || die "Some tests aren't passed" -} - -#scala_launcher() { -# local SCALADIR="/usr/share/${PN}" -# local bcp="${SCALADIR}/lib/scala-library.jar" -# java-pkg_dolauncher "${1}" --main "${2}" \ -# --java_args "-Xmx256M -Xms32M -Dscala.home=${SCALADIR} -Denv.emacs=${EMACS}" -#} - -src_install() { - cd dists/latest || die - - local SCALADIR="/usr/share/${PN}/" - - exeinto "${SCALADIR}/bin" - doexe $(find bin/ -type f ! -iname '*.bat') - - #sources are .scala so no use for java-pkg_dosrc - if use source; then - dodir "${SCALADIR}/src" - insinto "${SCALADIR}/src" - doins src/*-src.jar - fi - - java-pkg_dojar lib/*.jar - - doman man/man1/*.1 || die - - #docs and examples are not contained in the binary tgz anymore - if ! use binary; then - local docdir="doc/${PN}-devel-docs" - dodoc doc/README ../../docs/TODO || die - if use doc; then - java-pkg_dojavadoc "${docdir}/api" - dohtml -r "${docdir}/tools" || die - fi - - use examples && java-pkg_doexamples "${docdir}/examples" - fi - - dodir /usr/bin - for b in $(find bin/ -type f ! -iname '*.bat'); do - #pushd "${D}/usr/bin" &>/dev/null - local _name=$(basename "${b}") - dosym "/usr/share/${JAVA_PKG_NAME}/bin/${_name}" "/usr/bin/${_name}" - #popd &>/dev/null - done - #scala_launcher fsc scala.tools.nsc.CompileClient - #scala_launcher scala scala.tools.nsc.MainGenericRunner - #scala_launcher scalac scala.tools.nsc.Main - #scala_launcher scaladoc scala.tools.nsc.ScalaDoc - #scala_launcher scalap scala.tools.scalap.Main -}