Require bsh[bsf] for building. Fixes bug #426280 by Helmut Jarausch. Also raise jdk deps to 1.6 per sera's testing.

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

4 files changed, 29 insertions, 37 deletions

diff --git a/app-editors/jedit/ChangeLog b/app-editors/jedit/ChangeLog
index 333c7f120b7b..a7357a4c024a 100644
--- a/app-editors/jedit/ChangeLog
+++ b/app-editors/jedit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/jedit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/ChangeLog,v 1.101 2012/07/12 11:25:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/ChangeLog,v 1.102 2012/07/13 12:10:13 caster Exp $
+
+  13 Jul 2012; Vlastimil Babka <caster@gentoo.org> jedit-4.5.2.ebuild:
+  Require bsh[bsf] for building. Fixes bug #426280 by Helmut Jarausch. Also
+  raise jdk deps to 1.6 per sera's testing.
 
   12 Jul 2012; Agostino Sarubbo <ago@gentoo.org> jedit-4.4.2-r1.ebuild:
   Stable for amd64, wrt bug #426218
diff --git a/app-editors/jedit/Manifest b/app-editors/jedit/Manifest
index a0d2f0503ecd..05eb2090f1b8 100644
--- a/app-editors/jedit/Manifest
+++ b/app-editors/jedit/Manifest
@@ -1,23 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 DIST jedit4.3.2source.tar.bz2 2062221 SHA256 9ca0a5fe3d5fc01320ea5dfbc01a6a2b9f3e757076580e22e0426928296bbd77 SHA512 471fa64ec0e60a39b3e63af8d790e088960d4b81d5eb07cb7f0bbf7a2db31c3d4956024d1f7491eafcc08215e04a13fb92c20b13f5ee9025e7acc2301fabf192 WHIRLPOOL 3a6526b8a56a463b014bb2850c23d8e24dcc1819a73feb75c15d01260224d98902b83ff265149ed040f53591f26ac92bc14c9b0ca4c2b2c7dc2922f4916dcd1f
 DIST jedit4.4.2source.tar.bz2 2017706 SHA256 5e9ad9c32871b77ef0b9fe46dcfcea57ec52558d36113b7280194a33430b8ceb SHA512 76bfa29d3f33fc20e8699e038f364867b037c7227be3cb02f566fdd5b282d737c7a83623fb771578309c6c44545d1aea9441530b6020b1741a3221da63e8e7ad WHIRLPOOL 53d95c5c28a068a3a1ff17edf15ef961ffa545b264c420f49c7b9bb1427a71f87cebab1a702515d7c6d26c14fc645b0b6c282205817cc56a9c9edb8746194c81
 DIST jedit4.5.2source.tar.bz2 2065612 SHA256 a582301142fdbd6d81446c2720a13a5d705ec8ecebb87537a0ff49d8718242e1 SHA512 1c817f8e0442b90dd9aa71365e450a799be8d82786b10ba8fabfc603d65a4717b485042cd73758934c914508f291c915ed373cc46a6e49386025544e29682654 WHIRLPOOL 780d722789d63a60c8d5ddc6e52a8f02133b4779cce7f9a8881457839644909f8a7995215841ee9220a8364ffdba321cd9125ef773b9ee292439495f9d3782f4
 EBUILD jedit-4.3.2.ebuild 2512 SHA256 5c7e1903a84b76aa9a2945fd473a6422c8d7aede18a6c019a6b0e0a9ff6c2c0d SHA512 c237a69248b861947fccecded34983cb8b99f730123c36e5c851f86091a4a575fb4522e860029cf1814f3911729010f2aa51b08d5686eef99b855ebe68fe22b5 WHIRLPOOL bcab7b9a7b9441d0cdda6b87f1953d183db60faf68d93a206ec887ddf2dd73d49233c691e83f6181638b425f26828688d548466580ede02d2ff95d35e22cedee
 EBUILD jedit-4.4.2-r1.ebuild 2537 SHA256 6f76db7207bf80d0f345b1ff8dfc3cf973db549c04456c509810ae3c29ca5c3b SHA512 d379d413c19a66b2a26f625ea6858acb8a9e172f4dee425cc7fd8e5e0229506b5d409903436dca1c2e8c5a7762fab80602f200b68bc1793270778c52bffc4607 WHIRLPOOL e7a4269fe2f3db83b146ec9b3294df9e30086eafad56165827b165e32084595d3017a515b765460083250b929491178a3160b6c8e13c53bb2fefbdd313cc751d
 EBUILD jedit-4.4.2.ebuild 2515 SHA256 743baf05d045d1f0f7d1b31e0f1466a599a35d5350e7e1fe594d206094040e22 SHA512 382113dd733effb106df95b9d826c459e2c14efadc8158afdf532f70e06be55886d8333969535351af8692ad7d1a26881e82da61463acd91e863840587f0e129 WHIRLPOOL 4a67c61ae8816c63e2e699a934697b8a9e0cc407cf006e69f7078ea4879ff2a79bfed7ab6913883672cb258531dfaa3c95751f40069a0dc5094eb3bb632bdfa5
-EBUILD jedit-4.5.2.ebuild 2731 SHA256 ff9ce37c96393e33db68958f3e6a9b69f2579e4367b1f7e6d54fd6917fbff66a SHA512 5bee74131653e3c9ed6e8e273c947b32e42ed393e9a350bb77d5fb422d50c4d4a62b21f46405d4a3f210cc76504182547ae6d4fe50285a20b9a03a5657d7b032 WHIRLPOOL ff97d1ed37f94979e56d6c3cd7faad95d1bbc2c9dd22a6a7e6c5c94bc82cc2bd89a9c5dccaceffa26e60a1b3c2151105596cf5cbb8aa84d4fdf386445e86c3a3
-MISC ChangeLog 14105 SHA256 6a7dc8b13a4b7cc39196dfb89ce2d9cf1f3c52168fe0849c70d303fcc9efc849 SHA512 d20b1869d074628b124bc001b3cfdc78213b21bc7fe95cfcdfbb63116445819881d69aa6b94d2dafaa44cbf4e72ef427e40b4439a98441cac6a82a857332049b WHIRLPOOL 46435a6c66338bc745ad3f7c43fc05b980312bec89ec9fa9bf5c3f816e672fd108362cdc2a9f444b20db0cbe96369a3ac26e24ebd1701f6741c427f1f1765f78
+EBUILD jedit-4.5.2.ebuild 2736 SHA256 fd034b55612ea0725243a1b44132a59dbd0f0721f837bed921ea4d406747cbc3 SHA512 3fa3bc28a668a7c538ae2bdea05bca8dedbfbd461f02e113043787ec1d6cc742a1cde3d502d71f537f129e471dec166571fa27d44db8ac8a6bcaac4fbc6d5321 WHIRLPOOL 9759f50794086b9755c20ceb67658ab8739dba1beb1ed1712ef2a0f08e292373f60e3ecc2b5b2072c0edfe8d1f8aeaa9140bb4fd334422c8ab7a942b3556685e
+MISC ChangeLog 14300 SHA256 a15e1d657962ed996d0637a0a76467516e3df35f3db4ed0b3d39cb56c4ff28bd SHA512 2c19574ffdc18d196ace2fc11d8a9a88ed0d397eca9208cefc7128840a9ef741c24659a38dd46b3eb06f314d76b87bb7818536d55f0c79ff473a4ab8d260e62e WHIRLPOOL cb2f5baffbfe6fbd4d7eb3cc39e8b4e0add9f5e5285c150743665e3f863ac00139ddf6b6b3a89300b91a5a5cb47ad061fb2e125eb96da488838d15fb498aec66
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCgAGBQJP/rQhAAoJEOTDgjZ80txdYEkH/2QZU3uB2nTqeMD9uf4+kL4O
-XZyebI5YRbcEK73nIIrUYeVcEEP1+uZF3nWag4Bcmz0gKN9OsiFu+raEX3thrqKz
-OzKjsgUCAIbL3jWtqTvSmOP6CJtSpgBx6Co7r/5yva3Pnmz4BIxg486qCjO4CGPu
-p56trV/m9keqTcZaZpksBf2erPPTUw7ymT6cZr96bdEE2sNnoA3hu5FQyRnFiVcD
-0GZGMEPmXd/CHzR1tHkq2aIaOsB1giZJ1nSRXDHXB6n6fF683YdmWMba8XRCAglD
-2qs+UzuJ4Gl5hAvh6o23uWQpAbaZEhD6s/6Q17sS2alhXuj3r3aeI6wxsZ7A1gM=
-=lgRc
------END PGP SIGNATURE-----
diff --git a/app-editors/jedit/jedit-4.5.2.ebuild b/app-editors/jedit/jedit-4.5.2.ebuild
index 96816a285c38..eceaaa6c0915 100644
--- a/app-editors/jedit/jedit-4.5.2.ebuild
+++ b/app-editors/jedit/jedit-4.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.5.2.ebuild,v 1.1 2012/07/11 21:59:59 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.5.2.ebuild,v 1.2 2012/07/13 12:10:13 caster Exp $
 
 EAPI=4
 
@@ -19,17 +19,17 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	>=virtual/jre-1.5"
+	>=virtual/jre-1.6"
 # Fails to build docs with jdk7 #411371
 DEPEND="
-	>=virtual/jdk-1.5
+	>=virtual/jdk-1.6
 	doc? (
 		virtual/jdk:1.6
 		=app-text/docbook-xml-dtd-4.3*
 		>=app-text/docbook-xsl-stylesheets-1.65.1
 		dev-libs/libxslt
 	)
-	dev-java/bsh"
+	dev-java/bsh[bsf]"
 
 S="${WORKDIR}/jEdit"
 
diff --git a/app-editors/zile/Manifest b/app-editors/zile/Manifest
index 3777022e5af0..042fccedf426 100644
--- a/app-editors/zile/Manifest
+++ b/app-editors/zile/Manifest
@@ -1,29 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX zile-2.3.24-userhome.patch 980 SHA256 68c7fa25fa7e6e0f9b5240f0824a9148edce6289870d281c9ecb99e421451541 SHA512 b1d0e4453771d36efe6547d9c30c807af0a05866bd728a94d30f25b8e9248d880a02143c5d1d9b47fa7a5cab9174804feeb3cc0f2956474c948349581d7a25e7 WHIRLPOOL 369b4d1205ed5acb7717d94df69cde61dc6d2735798ccc3945eb44433bf0ec03f93652c0d259f418c3d376c28bdcca01eb6f3396a3ed4e3ab2dd37e39e203cc6
 DIST zile-2.3.24.tar.gz 953962 SHA256 218bb2af414c6a168101656631a5b2da92f20a965895e1006658cc658b0b7e89 SHA512 8361f42436ae9ca150f09d830096b7a3fb0089d58bffe5ad7538b5ec5cd4e0e50085213e938db1a95e2922db845d1d2f36841a65fe1b9b72f60cd930dd8f09b9 WHIRLPOOL 37aae22305abdc2c2b86c8f6b43dcb7621464213ac375ec2fde767d99f79ddba08216c392c5500a71175f30762fe57e786f94305ff03947e413d5291cfafa934
 DIST zile-2.4.6.tar.gz 1257698 SHA256 d8a8e6b4624084902a9a6b91cbd6c64a970c0d5bbef79acb6bacb7abf05c607d SHA512 89e6948ee136c09029419ea87b5d9e62f6b30851bdee190775bb70880aa4dd5fec117e1bc2b0fc4dfd5f64fc201a5ce8d8718035ad47c7a8b00b040a9e53e467 WHIRLPOOL a36f60c6f5f7508e9da8677c992e8ccd2074ee8f6cae519075b26c4a1e7609b43a69e5fd8c0bef0bbfc224545e40cc7cbbae56b1bd317ac64177cbe846cbb9a2
 DIST zile-2.4.7.tar.gz 1254385 SHA256 8cf532fe48b5ca09e2cf67abf7abe33642eb7af4e7cd8bd1eb90137d96c467aa SHA512 eba58cd1c5eee6e4cf7e17aa56fc3682ac14d68eab6e72591fe0a1dd582b1d217717f6b31206fb70fbda8628251e5daded95c1bb688bcff6eb8dc6984ecd75d6 WHIRLPOOL fac86881b596ce753f3e073e630e57d52346bdaee1a2a27fec36053860944dc8b95e91d8a2c6f4afb809244bbfb7cdec60820aaad4fdbe59bdac4341874c9f1c
-EBUILD zile-2.3.24-r1.ebuild 1058 SHA256 6d75157f6fc7de5f1aa9adcdebd4c1b65c785ff963e3f87adce1a246173ac39d SHA512 aa50acab039854c9def9b1f1b65b1edc2fdb3f0ecbccee2fdba85dd09723e73ff9ec35935acbb2912495b7b83abfca8872fab865c16ba2c975e1c15e6595487a WHIRLPOOL d57a338b384922d5fcc9387280802268a2e33a98ade4fc566fdd2dceba4361ff6f2f82df4722000047d8a241cfff9b9bc2048c6ae688619e182a73eb31a55397
+DIST zile-2.4.8.tar.gz 1184855 SHA256 b793f4e064e3cdcac2f72a42b168c5cc0da6f7d078b8aac458b7d3cbacf7bc49 SHA512 53740400cf80ccd2106919688cfb7d60e6779e7666f555ea7ef3e4fe07620c13aafaa86a5ac766a288493012a46e5dff0b7640847a6b24206eb913668d34b491 WHIRLPOOL dd3d5ff7bcba89faf6c2545cc833d0e6592e87de0956063f479b92055dd1aca05252579fb140a02e8df4d88e00261bc0b88f6285eea5eae096660cd01c132afc
+EBUILD zile-2.3.24-r1.ebuild 1046 SHA256 dedc752a7c62b469454d23722f6c1d7ff611211356ad3dcf9b83e28afab44b47 SHA512 00610bed2bead3f821315133fc7b484560edcb5a71e78e9e8cc35a1df52228766282cde0a3d5413368d7c0c5661a13288c6edc424fd2b7eda4b9ae7f63718173 WHIRLPOOL d93d7e6a2c1ff26e3454d4bf45d76886f8a5593f2c083f8516e6478d2da230b65a4facf1c5cc9e6cff2713c3a4928d77b9701971315f90f6af066a11b9fb13d3
 EBUILD zile-2.4.6.ebuild 979 SHA256 ac86ed46a3cb00a0fc4c16c1e7940259b1ca0b6d32d96a485ff12264063b4bc8 SHA512 a36d16653d595f97b6692fd717a0fb2e46bcfa75917207b9df867126d15b36ad9947cf1ddca373abe6c57afbceff126bf485944468e601903b0405eebb7324a4 WHIRLPOOL 86cfeea9b4f7bd8d22704b41fa93d259b1c88c51992dcc4bd16dce099e4f1239a4c58935148274aaa7a87d461e243828898a7c261d8c8deb09acdbe877700286
 EBUILD zile-2.4.7.ebuild 982 SHA256 1fb6010588bc68ecd81dfce68435f4e550323cae94deaab7f3b43b53f10774d3 SHA512 2ebb1cbf3999962bd4497d870d7e8cced9197382c65ab8945dc84916d31ecee106ef995cb954e41d584e4967785d7b0956f6ceb3ade29150cb80f6a0d790ba8b WHIRLPOOL e8face82e96fb9b6263bec23558bcf531bccb8222e0fe130cc2076417722c40a8e4fb2a3c3aba095b21789d926d082b9513c3ad492d57ffedcb9271921db123e
-MISC ChangeLog 21199 SHA256 9b902adaf17437ab145aa488a3cf7e64cc72b1892136c153b2d22477382f2401 SHA512 d5ab02c39057bcd08fd21a121071afa0eb181a70bdff267da9f4d98fcb35a2e71190fa949f2c7972535b41e076596b2f2a7d5685f309fdba0ac7998b24ce8ab9 WHIRLPOOL ca08785d47c5243f48752cd746940322ff88fdea63560c3ff1cbcd3dd7dcc4d6d0beb8a600e22816cdd8bebfd7458799cf2e6278c280c49db67f570f2f5f5223
+EBUILD zile-2.4.8.ebuild 982 SHA256 67f089f125eabd09b7513f548bd272ada41e8f48683f0f30d741538b4ba97f70 SHA512 5bd8bcb8caa5699fb56b859ba528d687d3469ed325e279c78cd853517b0601fac054e4efa9a8b554f87732ee0e0fbdae6ac0c6057cca62d197d15fde4022abca WHIRLPOOL 569a7c824e0bfa1ad57190d8b799511ddb8dcd3b3d5106d6ebaf850898809fb48d9e74e47f054b6521596958099611442975fac1e83b5f5bb5353233d02d6848
+MISC ChangeLog 21325 SHA256 d10938e5ef1b553dd5a84d578228178103009ae491332915a7732adeabc7790b SHA512 dfbbac6eedea9ef70331369ab97c8983622353cff204bd2d5fb613fa05fa235f8ab88a43df1c51c544cea36b4bdb69794722561196b4c02415a2a10124d81a81 WHIRLPOOL b51f092090208ffc076f8ba4e9ae44b20ba83f0757e62edbd167d307e594bbfc284e5a60109fd9b76ecb9d7486ccefb846a33a49eb2eebc85b8cfe51868f3480
 MISC metadata.xml 545 SHA256 301c943f7ac78de9705192c968070ae68d4b42ea75b9e2909886623bafe7338b SHA512 e7dd95f1add4e7070e9bdf75ec7b77e8608a6a63143c3404b07724594493128cc5116511f72c0664f9090441d675097bea73e707a466fb5a868769b353bd5be1 WHIRLPOOL a67a9845893b9dfd0467e5c87ce52c641683b773951477855648f83808e8d7142f2d0d3293ded7d0d2b0097f48197a0bc92080b58707cd21c87f6e42e8c96893
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP9eg0AAoJEDxpGckxwJCBUVsQAKmvW4704xaja2yvYpalcfgK
-P1bzv/x7BI9psB0VVwKeLvKV4LzRSnH54QEritl8kXf+vB+hJ90XAdNexUJhIk1y
-zaLJmCOUSLsiVJW6HiSoBAXKzf9bdI3Zq/oMf5vwEGx3jcgy37qZD5VTnN9EmX91
-IJRIj7WiWgtCSiwIeXN6bB/+hEzG8i0+3PR4+qRzD4cXqmXNLEq2mRTH+WcUkcgP
-bWKjq+V5nq13NpCPB1ZZj8PNC/o2c8N2M73Fclyz0Kjeu0wLAYnYhGin1oWJBVHH
-dWLZimA2OGMEsWnljQoyBQt4gGfZPsCqiQZ/JDJTfi0EEtn9oPYlpV+iIyZA3A8t
-+o5OUPrbKM3z7SGJ6yrNNjoq2Y2FsQk1fClICaFx1tP70DkOEuZc8mnizKpr59XS
-a50Ji6+Ud0Ds346fclwP3oxFzUvh0eIkjKwJDKKtm2a8agfsPvqrLfeYkqQqmxBd
-kGzB5e2nYjqE48KeY/knilOZaUEcU0TlO6hs+gC7OoMM+ZVW+w6sADSyW9vOI05J
-m5SvuuWer/sljljQLtnQWzOYCJWiKMOpvh7guRnQnRcPoBtO5gEPtZokP5FnzV9F
-exgueK1C5v8pAY2UXeVqqrCA6zaBac+zMvGaC6kzKUA+1VbtmxOpaTzonM0HurHK
-Yb4rm1cLZFTv4Xl5kS0Y
-=eODX
+iQIcBAEBCAAGBQJQABJSAAoJEDxpGckxwJCB3V8P/j1mRKjqiSfqtIMPffy0Mgx7
+zWLYx1OjRkIB2DkgLdRU1EsfLskXX3SViqm1PveT5Oj03z1sfXrqovdTo8gLwf9Y
+j68PS5k6wZOol81o30ady1Qsmh11TU5sfjsuEu3On1b8n9qdU/n3Vg1VRqjcRSSl
+q5KwZ8zsx+XELCD69IGDpaXj3HPaRy6p4u/mfrcsNmWpytBKWClLw6mDOS4/uUEt
+xIoLl1BLGbk6uor1U2x8H2/a8Ggd/3Kfndb7g4pcHucXrSFT3iiY8uKO2GumsMLN
+efY06h+gVFgGCZf2fLtgjqIh88x1uvl/E5y4NXnCOxWcXq5E5L94kS6lQbWX3khF
+0q0Zd1gMUw5sRrTzJrGdA90MGj2YOegsFQecskzfGd2XX+vSMfn2kIFgemYn+zb9
+u8BLrm7wOOIfzqQD5P7DyYu7jRvKcQ18S96ruX9JnoGo4SlmHpzcOF/3ci44V/0t
+1ntYTkaq4KxmvGAh1J5LYu1qrxMJw/Kst9dqj+FOvgcijhgWnqFZTvrETIxB1MDz
+S5ZMfDzBu9Y6DB5Tc4tcEd7WNjL4PpHU618iIrPEBmSuPu2z5BR1wZ0p2Fe/uoHm
+FJI2gwZLJiyX4NG9pedXpsp5fB2LaR/nVd+LjUGfO6PU3f1MgcvPQ9tmn7PfpsYC
+FhloQ7KHJekw5enHxsNg
+=EXX5
 -----END PGP SIGNATURE-----