Install Gentoo specific fontconfig properties file. #390663

Add missing dependency on pkgconfig. #391987
Add use flag X and cjk to install expected fonts. #349916
Add use flag source and install src.zip conditionally.
Add use flag jbootstrap and make bootstrap optional where possible.
Remove use flag xrender and require libXrender for icedtea:6, icedtea:7 does this already. #382867
Use @SLOT@ substitution in set_java_env.
Prefixify.

Package-Manager: portage-2.1.10.37/cvs/Linux x86_64

7 files changed, 1066 insertions, 11 deletions

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 8a61969e199c..78a2105f1a62 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for dev-java/icedtea
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.55 2011/11/25 18:19:47 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.56 2011/11/28 15:29:59 sera Exp $
+
+*icedtea-7.2.0-r2 (28 Nov 2011)
+*icedtea-6.1.10.4-r2 (28 Nov 2011)
+
+  28 Nov 2011; Ralph Sennhauser <sera@gentoo.org> +icedtea-6.1.10.4-r2.ebuild,
+  +icedtea-7.2.0-r2.ebuild, +files/fontconfig.Gentoo.properties.src,
+  files/icedtea.env, metadata.xml:
+  Install Gentoo specific fontconfig properties file. #390663
+  Add missing dependency on pkgconfig. #391987
+  Add use flag X and cjk to install expected fonts. #349916
+  Add use flag source and install src.zip conditionally.
+  Add use flag jbootstrap and make bootstrap optional where possible.
+  Remove use flag xrender and require libXrender for icedtea:6, icedtea:7 does
+  this already. #382867
+  Use @SLOT@ substitution in set_java_env.
+  Prefixify.
 
   25 Nov 2011; Vlastimil Babka <caster@gentoo.org> ChangeLog:
   Restore Changelog truncated by mistake, bug #391253.
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index f652071fde61..53bcf170088e 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,5 +1,6 @@
+AUX fontconfig.Gentoo.properties.src 15602 RMD160 d5ae1cb403072b630c126a908d14b5b462e1514f SHA1 04af30bfae3decf6fdb51187a07bf75fb04a83f0 SHA256 d48a9b43d82f45425464e985955f3f3700738a98c0dc97ab7577230ca11fe647
 AUX generate-cacerts.pl 11051 RMD160 9b874c62ffa0afe16353f1e7b32f124f1d31356f SHA1 65e55b84506ecf14711db0996eccf3cfba2fe9e3 SHA256 6ee6fb155e3fa85d0a7e9015b53ebd55948c6599d100fdb69b574b6d11f73433
-AUX icedtea.env 1014 RMD160 566c46cd11c9d9b18d600702b1d4857cacc824ec SHA1 fb2439f39863088b5525102946d154fc54f14c08 SHA256 63d0c03dce0d546bcd9f52ebf7abb56e61f9acaeb659c9fbf19fec315a0cf5ae
+AUX icedtea.env 1074 RMD160 6806fd80d619c54f6ab50255c12ee2a9920ad72f SHA1 4ddbddd4464fcf11fad45426ba0430818747249d SHA256 b4ad677dede5c06785db6540d51a9dbe6401e894f03857f5b14dbf6bdf9a33a8
 DIST 0a76e5390e68.tar.gz 128547 RMD160 ea975ce953ec0eb5751ea2aee8d3dc98da6933ff SHA1 9fc523399df6a8736ce540f7d7f0412188eb8b51 SHA256 bb47d452a61ed154fad98fda35f93e6e0f3328632ef2cf0afa1d95cd6264071e
 DIST 2054526dd141.tar.gz 43372283 RMD160 8dc2e49901a76819b1ea4f19df2d0a826e8cc323 SHA1 ea2662295c3c248f932df56a13993c4efdc78397 SHA256 4cd94391909ca86d2a5e25e3378c8fde1b1368076577fc58fed57097932750e1
 DIST 4d9e4fb8af09.tar.gz 1446705 RMD160 47c78ad3fa6ae5b70438e3bf3560f86fd60a08ae SHA1 435c9064ab69c970068f116da1abc78d66978283 SHA256 9579b9f47c45d4e6f4eb080a7a27886163691a77c193d83423389cb87656aec5
@@ -15,7 +16,8 @@ DIST jdk6-jaf-b20.zip 71243 RMD160 40b49d12c39b7010ee917eb671f3c38cd16f271c SHA1
 DIST jdk6-jaxws-b20.zip 5513069 RMD160 47b2d4fe528d770391e8926299df45cc6f68e9b5 SHA1 08366a70c9e2baa516afc77bb69f9e108e906aa9 SHA256 0c460583898b968a58bf88eb53f90a0e34369e2562d65fb3a143512dfcaeb3eb
 DIST openjdk-6-src-b22-28_feb_2011.tar.gz 45279689 RMD160 2b8f92cdb4d7dd3eb3cbb800a73e1666ee4bf5b1 SHA1 65a60153adbc8bc47fb95bb2b588a9a0b8701c95 SHA256 14a097d45b8c040e984be164a8cefbf22040a9ad57474fe87dd8cf2d0b08328b
 EBUILD icedtea-6.1.10.4-r1.ebuild 9804 RMD160 b7de7c4ac7647af1ba1fcd146a9c04ec565ccf03 SHA1 e9ee85077138583b0079666801c17ee560729138 SHA256 e44ad3485c00e59c015f40b1e33ca327fd8f98b9ce3625799ea1daed24018afc
+EBUILD icedtea-6.1.10.4-r2.ebuild 10458 RMD160 2b187dfacb02eee4eccd95e4b14307719f41e046 SHA1 c331c72b9699955e7de24bf8ad90de17af060910 SHA256 9ffe67c06a5a8afbb5c8b23e7cc6f5c9ac132ede30b6500a263aeb48132259c2
 EBUILD icedtea-7.2.0-r1.ebuild 10801 RMD160 c9ff94b4bfea1a7fa93457a4be2fb90fc24c5823 SHA1 e4bf6bf1fe1d1db7eb5fd963ed3600c9725fa0c1 SHA256 eb9e2c4e0bdd19cac0d903356f3a673b7ab68cef38cbf68423cba858b534c9fa
-MISC ChangeLog 10612 RMD160 4a1316898edfb7e0a10502307b7c0339a6294fe0 SHA1 512c2072b823521f65508c1c7a85db0bc9eea2b3 SHA256 d531f4866131e295021acfdd22f1fa32d9d8c5e95b663585a215d779edf541b8
-MISC ChangeLog.old 10021 RMD160 f9773d34c62cf2e0d84b23a2dc2a2c105f2c1002 SHA1 65edc128353f7a25676fa76a556a4f824f41e229 SHA256 7cc7f1c334601a295ec70dee70aae3ca2367d6a7737723408202fb2a240e4aa5
-MISC metadata.xml 1567 RMD160 7cb547ff92d8896cdbb0dd53aa682fe31d027b4e SHA1 c42d533a391f98fa303b591a4ba1471e0de94b7c SHA256 596df17fd33825a2abb567685bda63f6ff56cbfa616911199855e3fac8bec5e4
+EBUILD icedtea-7.2.0-r2.ebuild 11502 RMD160 f610645dbe8a6c2828730cf08cc88fcb16c6755a SHA1 bfff69d1d821f4e92bb8d4996b951103d81279a2 SHA256 2fa6ff0b5bcfb0cbd4ca77dca6a8e23408f29fe41da1c45f655cc8021d47ec87
+MISC ChangeLog 11317 RMD160 0e11bc57ed226890d96a943d4f8f5540e72af28d SHA1 34ebfa12e4168df842f8a6a9f893554661766713 SHA256 fa3a53d129994758ad6515b60fcb703393de0834715ace28f128947a97ca2549
+MISC metadata.xml 1666 RMD160 8bb7c36fd279fafb30242ae9a73954bb2b3dcd3e SHA1 b6319b3a6827660243d38e1acd1b4a0573672e4b SHA256 5159ef9ac29ef8440267dbecdb00b792c6ba4d4a1be869721f721f6c6dcc303e
diff --git a/dev-java/icedtea/files/fontconfig.Gentoo.properties.src b/dev-java/icedtea/files/fontconfig.Gentoo.properties.src
new file mode 100644
index 000000000000..86718026c063
--- /dev/null
+++ b/dev-java/icedtea/files/fontconfig.Gentoo.properties.src
@@ -0,0 +1,385 @@
+#
+# 
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# Version
+
+version=1
+
+# Component Font Mappings
+
+dialog.plain.latin-1=DejaVu Sans
+dialog.plain.japanese-x0208=Sazanami Gothic
+dialog.plain.korean=Baekmuk Gulim
+dialog.plain.chinese-big5=AR PL ShanHeiSun Uni
+dialog.plain.chinese-gb18030=AR PL ShanHeiSun Uni
+dialog.plain.bengali=Lohit Bengali
+dialog.plain.gujarati=Lohit Gujarati
+dialog.plain.hindi=Lohit Hindi
+dialog.plain.malayalam=Lohit Malayalam
+dialog.plain.oriya=Lohit Oriya
+dialog.plain.punjabi=Lohit Punjabi
+dialog.plain.tamil=Lohit Tamil
+dialog.plain.telugu=Lohit Telugu
+dialog.plain.sinhala=LKLUG
+
+dialog.bold.latin-1=DejaVu Sans Bold
+dialog.bold.japanese-x0208=Sazanami Gothic
+dialog.bold.korean=Baekmuk Gulim
+dialog.bold.chinese-big5=AR PL ShanHeiSun Uni
+dialog.bold.chinese-gb18030=AR PL ShanHeiSun Uni
+dialog.bold.bengali=Lohit Bengali
+dialog.bold.gujarati=Lohit Gujarati
+dialog.bold.hindi=Lohit Hindi
+dialog.bold.malayalam=Lohit Malayalam
+dialog.bold.oriya=Lohit Oriya
+dialog.bold.punjabi=Lohit Punjabi
+dialog.bold.tamil=Lohit Tamil
+dialog.bold.telugu=Lohit Telugu
+dialog.bold.sinhala=LKLUG
+
+dialog.italic.latin-1=DejaVu Sans Oblique
+dialog.italic.japanese-x0208=Sazanami Gothic
+dialog.italic.korean=Baekmuk Gulim
+dialog.italic.chinese-big5=AR PL ShanHeiSun Uni
+dialog.italic.chinese-gb18030=AR PL ShanHeiSun Uni
+dialog.italic.bengali=Lohit Bengali
+dialog.italic.gujarati=Lohit Gujarati
+dialog.italic.hindi=Lohit Hindi
+dialog.italic.malayalam=Lohit Malayalam
+dialog.italic.oriya=Lohit Oriya
+dialog.italic.punjabi=Lohit Punjabi
+dialog.italic.tamil=Lohit Tamil
+dialog.italic.telugu=Lohit Telugu
+dialog.italic.sinhala=LKLUG
+
+dialog.bolditalic.latin-1=DejaVu Sans Bold Oblique
+dialog.bolditalic.japanese-x0208=Sazanami Gothic
+dialog.bolditalic.korean=Baekmuk Gulim
+dialog.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
+dialog.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
+dialog.bolditalic.bengali=Lohit Bengali
+dialog.bolditalic.gujarati=Lohit Gujarati
+dialog.bolditalic.hindi=Lohit Hindi
+dialog.bolditalic.malayalam=Lohit Malayalam
+dialog.bolditalic.oriya=Lohit Oriya
+dialog.bolditalic.punjabi=Lohit Punjabi
+dialog.bolditalic.tamil=Lohit Tamil
+dialog.bolditalic.telugu=Lohit Telugu
+dialog.bolditalic.sinhala=LKLUG
+
+sansserif.plain.latin-1=DejaVu Sans
+sansserif.plain.japanese-x0208=Sazanami Gothic
+sansserif.plain.korean=Baekmuk Gulim
+sansserif.plain.chinese-big5=AR PL ShanHeiSun Uni
+sansserif.plain.chinese-gb18030=AR PL ShanHeiSun Uni
+sansserif.plain.bengali=Lohit Bengali
+sansserif.plain.gujarati=Lohit Gujarati
+sansserif.plain.hindi=Lohit Hindi
+sansserif.plain.malayalam=Lohit Malayalam
+sansserif.plain.oriya=Lohit Oriya
+sansserif.plain.punjabi=Lohit Punjabi
+sansserif.plain.tamil=Lohit Tamil
+sansserif.plain.telugu=Lohit Telugu
+sansserif.plain.sinhala=LKLUG
+
+sansserif.bold.latin-1=DejaVu Sans Bold
+sansserif.bold.japanese-x0208=Sazanami Gothic
+sansserif.bold.korean=Baekmuk Gulim
+sansserif.bold.chinese-big5=AR PL ShanHeiSun Uni
+sansserif.bold.chinese-gb18030=AR PL ShanHeiSun Uni
+sansserif.bold.bengali=Lohit Bengali
+sansserif.bold.gujarati=Lohit Gujarati
+sansserif.bold.hindi=Lohit Hindi
+sansserif.bold.malayalam=Lohit Malayalam
+sansserif.bold.oriya=Lohit Oriya
+sansserif.bold.punjabi=Lohit Punjabi
+sansserif.bold.tamil=Lohit Tamil
+sansserif.bold.telugu=Lohit Telugu
+sansserif.bold.sinhala=LKLUG
+
+sansserif.italic.latin-1=DejaVu Sans Oblique
+sansserif.italic.japanese-x0208=Sazanami Gothic
+sansserif.italic.korean=Baekmuk Gulim
+sansserif.italic.chinese-big5=AR PL ShanHeiSun Uni
+sansserif.italic.chinese-gb18030=AR PL ShanHeiSun Uni
+sansserif.italic.bengali=Lohit Bengali
+sansserif.italic.gujarati=Lohit Gujarati
+sansserif.italic.hindi=Lohit Hindi
+sansserif.italic.malayalam=Lohit Malayalam
+sansserif.italic.oriya=Lohit Oriya
+sansserif.italic.punjabi=Lohit Punjabi
+sansserif.italic.tamil=Lohit Tamil
+sansserif.italic.telugu=Lohit Telugu
+sansserif.italic.sinhala=LKLUG
+
+sansserif.bolditalic.latin-1=DejaVu Sans Bold Oblique
+sansserif.bolditalic.japanese-x0208=Sazanami Gothic
+sansserif.bolditalic.korean=Baekmuk Gulim
+sansserif.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
+sansserif.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
+sansserif.bolditalic.bengali=Lohit Bengali
+sansserif.bolditalic.gujarati=Lohit Gujarati
+sansserif.bolditalic.hindi=Lohit Hindi
+sansserif.bolditalic.malayalam=Lohit Malayalam
+sansserif.bolditalic.oriya=Lohit Oriya
+sansserif.bolditalic.punjabi=Lohit Punjabi
+sansserif.bolditalic.tamil=Lohit Tamil
+sansserif.bolditalic.telugu=Lohit Telugu
+sansserif.bolditalic.sinhala=LKLUG
+
+serif.plain.latin-1=DejaVu Serif
+serif.plain.japanese-x0208=Sazanami Mincho
+serif.plain.korean=Baekmuk Batang
+serif.plain.chinese-big5=AR PL ZenKai Uni
+serif.plain.chinese-gb18030=AR PL ZenKai Uni
+serif.plain.bengali=Lohit Bengali
+serif.plain.gujarati=Lohit Gujarati
+serif.plain.hindi=Lohit Hindi
+serif.plain.malayalam=Lohit Malayalam
+serif.plain.oriya=Lohit Oriya
+serif.plain.punjabi=Lohit Punjabi
+serif.plain.tamil=Lohit Tamil
+serif.plain.telugu=Lohit Telugu
+serif.plain.sinhala=LKLUG
+
+serif.bold.latin-1=DejaVu Serif Bold
+serif.bold.japanese-x0208=Sazanami Mincho
+serif.bold.korean=Baekmuk Batang
+serif.bold.chinese-big5=AR PL ZenKai Uni
+serif.bold.chinese-gb18030=AR PL ZenKai Uni
+serif.bold.bengali=Lohit Bengali
+serif.bold.gujarati=Lohit Gujarati
+serif.bold.hindi=Lohit Hindi
+serif.bold.malayalam=Lohit Malayalam
+serif.bold.oriya=Lohit Oriya
+serif.bold.punjabi=Lohit Punjabi
+serif.bold.tamil=Lohit Tamil
+serif.bold.telugu=Lohit Telugu
+serif.bold.sinhala=LKLUG
+
+serif.italic.latin-1=DejaVu Serif Oblique
+serif.italic.japanese-x0208=Sazanami Mincho
+serif.italic.korean=Baekmuk Batang
+serif.italic.chinese-big5=AR PL ZenKai Uni
+serif.italic.chinese-gb18030=AR PL ZenKai Uni
+serif.italic.bengali=Lohit Bengali
+serif.italic.gujarati=Lohit Gujarati
+serif.italic.hindi=Lohit Hindi
+serif.italic.malayalam=Lohit Malayalam
+serif.italic.oriya=Lohit Oriya
+serif.italic.punjabi=Lohit Punjabi
+serif.italic.tamil=Lohit Tamil
+serif.italic.telugu=Lohit Telugu
+serif.italic.sinhala=LKLUG
+
+serif.bolditalic.latin-1=DejaVu Serif Bold Oblique
+serif.bolditalic.japanese-x0208=Sazanami Mincho
+serif.bolditalic.korean=Baekmuk Batang
+serif.bolditalic.chinese-big5=AR PL ZenKai Uni
+serif.bolditalic.chinese-gb18030=AR PL ZenKai Uni
+serif.bolditalic.bengali=Lohit Bengali
+serif.bolditalic.gujarati=Lohit Gujarati
+serif.bolditalic.hindi=Lohit Hindi
+serif.bolditalic.malayalam=Lohit Malayalam
+serif.bolditalic.oriya=Lohit Oriya
+serif.bolditalic.punjabi=Lohit Punjabi
+serif.bolditalic.tamil=Lohit Tamil
+serif.bolditalic.telugu=Lohit Telugu
+serif.bolditalic.sinhala=LKLUG
+
+monospaced.plain.latin-1=DejaVu Sans Mono
+monospaced.plain.japanese-x0208=Sazanami Gothic
+monospaced.plain.korean=Baekmuk Gulim
+monospaced.plain.chinese-big5=AR PL ShanHeiSun Uni
+monospaced.plain.chinese-gb18030=AR PL ShanHeiSun Uni
+monospaced.plain.bengali=Lohit Bengali
+monospaced.plain.gujarati=Lohit Gujarati
+monospaced.plain.hindi=Lohit Hindi
+monospaced.plain.malayalam=Lohit Malayalam
+monospaced.plain.oriya=Lohit Oriya
+monospaced.plain.punjabi=Lohit Punjabi
+monospaced.plain.tamil=Lohit Tamil
+monospaced.plain.telugu=Lohit Telugu
+monospaced.plain.sinhala=LKLUG
+
+monospaced.bold.latin-1=DejaVu Sans Mono Bold
+monospaced.bold.japanese-x0208=Sazanami Gothic
+monospaced.bold.korean=Baekmuk Gulim
+monospaced.bold.chinese-big5=AR PL ShanHeiSun Uni
+monospaced.bold.chinese-gb18030=AR PL ShanHeiSun Uni
+monospaced.bold.bengali=Lohit Bengali
+monospaced.bold.gujarati=Lohit Gujarati
+monospaced.bold.hindi=Lohit Hindi
+monospaced.bold.malayalam=Lohit Malayalam
+monospaced.bold.oriya=Lohit Oriya
+monospaced.bold.punjabi=Lohit Punjabi
+monospaced.bold.tamil=Lohit Tamil
+monospaced.bold.telugu=Lohit Telugu
+monospaced.bold.sinhala=LKLUG
+
+monospaced.italic.latin-1=DejaVu Sans Mono Oblique
+monospaced.italic.japanese-x0208=Sazanami Gothic
+monospaced.italic.korean=Baekmuk Gulim
+monospaced.italic.chinese-big5=AR PL ShanHeiSun Uni
+monospaced.italic.chinese-gb18030=AR PL ShanHeiSun Uni
+monospaced.italic.bengali=Lohit Bengali
+monospaced.italic.gujarati=Lohit Gujarati
+monospaced.italic.hindi=Lohit Hindi
+monospaced.italic.malayalam=Lohit Malayalam
+monospaced.italic.oriya=Lohit Oriya
+monospaced.italic.punjabi=Lohit Punjabi
+monospaced.italic.tamil=Lohit Tamil
+monospaced.italic.telugu=Lohit Telugu
+monospaced.italic.sinhala=LKLUG
+
+monospaced.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique
+monospaced.bolditalic.japanese-x0208=Sazanami Gothic
+monospaced.bolditalic.korean=Baekmuk Gulim
+monospaced.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
+monospaced.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
+monospaced.bolditalic.bengali=Lohit Bengali
+monospaced.bolditalic.gujarati=Lohit Gujarati
+monospaced.bolditalic.hindi=Lohit Hindi
+monospaced.bolditalic.malayalam=Lohit Malayalam
+monospaced.bolditalic.oriya=Lohit Oriya
+monospaced.bolditalic.punjabi=Lohit Punjabi
+monospaced.bolditalic.tamil=Lohit Tamil
+monospaced.bolditalic.telugu=Lohit Telugu
+monospaced.bolditalic.sinhala=LKLUG
+
+dialoginput.plain.latin-1=DejaVu Sans Mono
+dialoginput.plain.japanese-x0208=Sazanami Gothic
+dialoginput.plain.korean=Baekmuk Gulim
+dialoginput.plain.chinese-big5=AR PL ShanHeiSun Uni
+dialoginput.plain.chinese-gb18030=AR PL ShanHeiSun Uni
+dialoginput.plain.bengali=Lohit Bengali
+dialoginput.plain.gujarati=Lohit Gujarati
+dialoginput.plain.hindi=Lohit Hindi
+dialoginput.plain.malayalam=Lohit Malayalam
+dialoginput.plain.oriya=Lohit Oriya
+dialoginput.plain.punjabi=Lohit Punjabi
+dialoginput.plain.tamil=Lohit Tamil
+dialoginput.plain.telugu=Lohit Telugu
+dialoginput.plain.sinhala=LKLUG
+
+dialoginput.bold.latin-1=DejaVu Sans Mono Bold
+dialoginput.bold.japanese-x0208=Sazanami Gothic
+dialoginput.bold.korean=Baekmuk Gulim
+dialoginput.bold.chinese-big5=AR PL ShanHeiSun Uni
+dialoginput.bold.chinese-gb18030=AR PL ShanHeiSun Uni
+dialoginput.bold.bengali=Lohit Bengali
+dialoginput.bold.gujarati=Lohit Gujarati
+dialoginput.bold.hindi=Lohit Hindi
+dialoginput.bold.malayalam=Lohit Malayalam
+dialoginput.bold.oriya=Lohit Oriya
+dialoginput.bold.punjabi=Lohit Punjabi
+dialoginput.bold.tamil=Lohit Tamil
+dialoginput.bold.telugu=Lohit Telugu
+dialoginput.bold.sinhala=LKLUG
+
+dialoginput.italic.latin-1=DejaVu Sans Mono Oblique
+dialoginput.italic.japanese-x0208=Sazanami Gothic
+dialoginput.italic.korean=Baekmuk Gulim
+dialoginput.italic.chinese-big5=AR PL ShanHeiSun Uni
+dialoginput.italic.chinese-gb18030=AR PL ShanHeiSun Uni
+dialoginput.italic.bengali=Lohit Bengali
+dialoginput.italic.gujarati=Lohit Gujarati
+dialoginput.italic.hindi=Lohit Hindi
+dialoginput.italic.malayalam=Lohit Malayalam
+dialoginput.italic.oriya=Lohit Oriya
+dialoginput.italic.punjabi=Lohit Punjabi
+dialoginput.italic.tamil=Lohit Tamil
+dialoginput.italic.telugu=Lohit Telugu
+dialoginput.italic.sinhala=LKLUG
+
+dialoginput.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique
+dialoginput.bolditalic.japanese-x0208=Sazanami Gothic
+dialoginput.bolditalic.korean=Baekmuk Gulim
+dialoginput.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
+dialoginput.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
+dialoginput.bolditalic.bengali=Lohit Bengali
+dialoginput.bolditalic.gujarati=Lohit Gujarati
+dialoginput.bolditalic.hindi=Lohit Hindi
+dialoginput.bolditalic.malayalam=Lohit Malayalam
+dialoginput.bolditalic.oriya=Lohit Oriya
+dialoginput.bolditalic.punjabi=Lohit Punjabi
+dialoginput.bolditalic.tamil=Lohit Tamil
+dialoginput.bolditalic.telugu=Lohit Telugu
+dialoginput.bolditalic.sinhala=LKLUG
+
+# Search Sequences
+
+sequence.allfonts=latin-1
+sequence.allfonts.Big5=chinese-big5,latin-1
+sequence.allfonts.x-euc-jp-linux=japanese-x0208,latin-1
+sequence.allfonts.EUC-KR=korean,latin-1
+sequence.allfonts.GB18030=chinese-gb18030,latin-1
+sequence.fallback=chinese-big5,chinese-gb18030,japanese-x0208,korean,bengali,gujarati,hindi,oriya,punjabi,malayalam,tamil,telugu,sinhala
+
+# Font File Names
+
+# media-fonts/dejavu
+filename.DejaVu_Sans=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSans.ttf
+filename.DejaVu_Sans_Bold=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf
+filename.DejaVu_Sans_Oblique=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSans-Oblique.ttf
+filename.DejaVu_Sans_Bold_Oblique=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSans-BoldOblique.ttf
+
+filename.DejaVu_Sans_Mono=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSansMono.ttf
+filename.DejaVu_Sans_Mono_Bold=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf
+filename.DejaVu_Sans_Mono_Oblique=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSansMono-Oblique.ttf
+filename.DejaVu_Sans_Mono_Bold_Oblique=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSansMono-BoldOblique.ttf
+
+filename.DejaVu_Serif=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSerif.ttf
+filename.DejaVu_Serif_Bold=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSerif-Bold.ttf
+filename.DejaVu_Serif_Oblique=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSerif-Oblique.ttf
+filename.DejaVu_Serif_Bold_Oblique=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSerif-BoldOblique.ttf
+
+# media-fonts/sazanami
+filename.Sazanami_Gothic=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/sazanami/sazanami-gothic.ttf
+filename.Sazanami_Mincho=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/sazanami/sazanami-mincho.ttf
+
+# media-fonts/arphicfonts
+filename.AR_PL_ShanHeiSun_Uni=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/uming.ttc
+filename.AR_PL_ZenKai_Uni=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/ukai.ttc
+
+# media-fonts/baekmuk-fonts
+filename.Baekmuk_Gulim=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/baekmuk-fonts/gulim.ttf
+filename.Baekmuk_Batang=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/baekmuk-fonts/batang.ttf
+
+# media-fonts/lohit-fonts
+filename.Lohit_Bengali=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/indic/lohit_bn.ttf
+filename.Lohit_Gujarati=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/indic/lohit_gu.ttf
+filename.Lohit_Hindi=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/indic/lohit_hi.ttf
+filename.Lohit_Kannda=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/indic/lohit_kn.ttf
+filename.Lohit_Malayalam=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/indic/lohit_ml.ttf
+filename.Lohit_Oriya=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/indic/lohit_or.ttf
+filename.Lohit_Punjabi=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/indic/lohit_pa.ttf
+filename.Lohit_Tamil=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/indic/lohit_ta.ttf
+filename.Lohit_Telugu=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/indic/lohit_te.ttf
+
+# media-fonts/lklug
+filename.LKLUG=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/lklug/lklug.ttf
+
diff --git a/dev-java/icedtea/files/icedtea.env b/dev-java/icedtea/files/icedtea.env
index 70cdef6831e0..2381b0312df0 100644
--- a/dev-java/icedtea/files/icedtea.env
+++ b/dev-java/icedtea/files/icedtea.env
@@ -1,15 +1,15 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/files/icedtea.env,v 1.2 2011/02/02 00:06:07 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/files/icedtea.env,v 1.3 2011/11/28 15:29:59 sera Exp $
 
-VERSION="OpenJDK@SLOT@/IcedTea@SLOT@ @PV@"
-JAVA_HOME=/usr/@LIBDIR@/icedtea@SLOT@
-JDK_HOME=/usr/@LIBDIR@/icedtea@SLOT@
-JAVAC=${JAVA_HOME}/bin/javac
+VERSION="IcedTea JDK @PV@"
+JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/icedtea@SLOT@"
+JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/icedtea@SLOT@"
+JAVAC="${JAVA_HOME}/bin/javac"
 PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
 ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
 LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
-MANPATH="/usr/@LIBDIR@/icedtea@SLOT@/man"
+MANPATH="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/icedtea@SLOT@/man"
 PROVIDES_TYPE="JDK JRE"
 PROVIDES_VERSION="1.@SLOT@"
 # Taken from sun.boot.class.path property
diff --git a/dev-java/icedtea/icedtea-6.1.10.4-r2.ebuild b/dev-java/icedtea/icedtea-6.1.10.4-r2.ebuild
new file mode 100644
index 000000000000..c4ff9ef69be8
--- /dev/null
+++ b/dev-java/icedtea/icedtea-6.1.10.4-r2.ebuild
@@ -0,0 +1,313 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r2.ebuild,v 1.1 2011/11/28 15:29:59 sera Exp $
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+# *********************************************************
+# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
+# *********************************************************
+
+EAPI="4"
+
+inherit java-pkg-2 java-vm-2 pax-utils prefix versionator
+
+LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
+SLOT="6"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="A harness to build the OpenJDK using Free Software build tools and dependencies"
+ICEDTEA_VER="$(get_version_component_range 2-4)"
+ICEDTEA_PKG=icedtea${SLOT}-${ICEDTEA_VER}
+OPENJDK_BUILD="22"
+OPENJDK_DATE="28_feb_2011"
+OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz"
+JAXP_TARBALL="jaxp144_01.zip"
+JAXWS_TARBALL="jdk6-jaxws-b20.zip"
+JAF_TARBALL="jdk6-jaf-b20.zip"
+HOTSPOT_TARBALL="f0f676c5a2c6.tar.gz"
+SRC_URI="http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
+		 http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL}
+		 http://icedtea.classpath.org/download/drops/${JAXWS_TARBALL}
+		 http://icedtea.classpath.org/download/drops/${JAF_TARBALL}
+		 http://icedtea.classpath.org/download/drops/${JAXP_TARBALL}
+		 hs20? ( http://hg.openjdk.java.net/hsx/hsx20/master/archive/${HOTSPOT_TARBALL} )"
+HOMEPAGE="http://icedtea.classpath.org"
+S=${WORKDIR}/${ICEDTEA_PKG}
+
+# Missing options:
+# shark - needs adding
+IUSE="X debug cjk doc examples +hs20 javascript +jbootstrap nio2 +nsplugin +nss pulseaudio +source systemtap +webstart"
+
+# JTReg doesn't pass at present
+RESTRICT="test"
+
+# media-fonts/lklug needs ppc ppc64 keywords, needs adding to use cjk
+RDEPEND="!dev-java/icedtea6
+	>=media-libs/alsa-lib-1.0
+	>=media-libs/freetype-2.3.5
+	>=media-libs/giflib-4.1.6
+	>=media-libs/libpng-1.2
+	>=net-print/cups-1.2.12
+	>=sys-libs/zlib-1.2.3
+	virtual/jpeg
+	>=x11-libs/gtk+-2.8:2
+	>=x11-libs/libX11-1.1.3
+	>=x11-libs/libXau-1.0.3
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXi-1.1.3
+	>=x11-libs/libXinerama-1.0.2
+	>=x11-libs/libXp-1.0.0
+	>=x11-libs/libXrender-0.9.4
+	>=x11-libs/libXtst-1.0.3
+	x11-proto/inputproto
+	x11-proto/xineramaproto
+	X? (
+	 	media-fonts/dejavu
+		cjk? (
+			media-fonts/arphicfonts
+			media-fonts/baekmuk-fonts
+			media-fonts/lohit-fonts
+			media-fonts/sazanami
+		)
+	)
+	javascript? ( dev-java/rhino:1.6 )
+	nss? ( >=dev-libs/nss-3.12.5-r1 )
+	ppc64? ( virtual/libffi )
+	ppc? ( virtual/libffi )
+	pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
+	systemtap? ( >=dev-util/systemtap-1 )"
+
+# Additional dependencies for building:
+#   zip: extract OpenJDK tarball, and needed by configure
+#   xalan/xerces: automatic code generation (also needed for Ant 1.8.0 to work properly)
+#   ant, ecj, jdk: required to build Java code
+# Only ant-core-1.7.1-r2 and later contain a version of Ant that
+# properly respects environment variables, if the build
+# sets some environment variables.
+#   ca-certificates, perl and openssl are used for the cacerts keystore generation
+#   xext headers have two variants depending on version - bug #288855
+DEPEND="${RDEPEND}
+	|| (
+		( >=dev-java/gcj-jdk-4.3 >=app-admin/eselect-ecj-0.5-r1 )
+		dev-java/icedtea-bin:6
+		dev-java/icedtea:${SLOT}
+	)
+	app-arch/zip
+	dev-util/pkgconfig
+	>=dev-java/xalan-2.7.0:0
+	>=dev-java/xerces-2.9.1:2
+	>=dev-java/ant-core-1.7.1-r2
+	dev-java/ant-nodeps
+	app-misc/ca-certificates
+	dev-lang/perl
+	dev-libs/openssl
+	>=x11-libs/libXext-1.1.1
+	>=x11-proto/xextproto-7.1.1
+	x11-proto/xproto
+	sys-apps/lsb-release
+	app-arch/cpio"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:6 )
+	nsplugin? ( dev-java/icedtea-web:6[nsplugin] )"
+
+# a bit of hack so the VM switching is triggered without causing dependency troubles
+JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.5"
+JAVA_PKG_WANT_SOURCE="1.5"
+JAVA_PKG_WANT_TARGET="1.5"
+
+pkg_setup() {
+	if use nsplugin && ! use webstart ; then
+		elog "Note that the nsplugin flag implies the webstart flag. Enable it to remove this message."
+	fi
+
+	[[ "${MERGE_TYPE}" == "binary" ]] && return #258423
+
+	# icedtea doesn't like some locales. #330433 #389717
+	export LANG="C" LC_ALL="C"
+
+	# quite a hack since java-config does not provide a way for a package
+	# to limit supported VM's for building and their preferred order
+	if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
+		einfo "Honoring user-set JAVA_PKG_FORCE_VM"
+	elif has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then
+		JAVA_PKG_FORCE_VM="icedtea6"
+	elif has_version ">dev-java/icedtea-6.1.10.4:${SLOT}"; then
+		JAVA_PKG_FORCE_VM="icedtea-6"
+	elif has_version "<dev-java/icedtea-bin-6.1.10.4:6"; then
+		JAVA_PKG_FORCE_VM="icedtea6-bin"
+	elif has_version ">=dev-java/icedtea-bin-6.1.10.4:6"; then
+		JAVA_PKG_FORCE_VM="icedtea-bin-6"
+	elif has_version dev-java/gcj-jdk; then
+		JAVA_PKG_FORCE_VM="gcj-jdk"
+	else
+		die "Unable to find a supported VM for building"
+	fi
+
+	einfo "Forced vm ${JAVA_PKG_FORCE_VM}"
+	java-vm-2_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${ICEDTEA_PKG}.tar.gz
+}
+
+unset_vars() {
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+}
+
+src_configure() {
+	local config procs rhino_jar
+	local vm=$(java-pkg_get-current-vm)
+
+	# IcedTea6 can't be built using IcedTea7; its class files are too new
+	if has "${vm}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6; then
+		if host-is-pax; then
+			if use jbootstrap; then
+				einfo "We can't currently bootstrap with a PaX enabled kernel :("
+				einfo "bootstrap forced off, ignoring use jbootstrap"
+			fi
+			config="${config} --disable-bootstrap"
+		else
+			config="${config} $(use_enable jbootstrap bootstrap)"
+		fi
+	elif has "${vm}" gcj-jdk; then
+		if host-is-pax; then
+			eerror "Can't currently bootstrap IcedTea using gcj-jdk or cacao on a PaX enabled host"
+			eerror "Sorry for the inconvenience"
+			die "Use an existing IcedTea build instead or disable PaX on the host"
+		fi
+		if ! use jbootstrap; then
+			einfo "bootstrap forced on for ${vm}, ignoring use jbootstrap"
+		fi
+		# For other 1.5 JDKs e.g. GCJ
+		config="${config} --with-ecj-jar=${EPREFIX}/usr/share/eclipse-ecj/ecj.jar"
+	else
+		eerror "IcedTea${SLOT} must be built with either a JDK based on GNU Classpath or an existing build of IcedTea${SLOT}."
+		die "Install a GNU Classpath JDK (gcj-jdk)"
+	fi
+
+	# OpenJDK-specific parallelism support. Bug #389791, #337827
+	# Implementation modified from waf-utils.eclass
+	# Note that "-j" is converted to "-j1" as the system doesn't support --load-average
+	local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
+	config="${config} --with-parallel-jobs=${procs}";
+	einfo "Configuring using --with-parallel-jobs=${procs}"
+
+	if need_zero ; then
+		config="${config} --enable-zero"
+	else
+		config="${config} --disable-zero"
+	fi
+
+	if use javascript ; then
+		rhino_jar=$(java-pkg_getjar rhino:1.6 js.jar);
+	fi
+
+	if use hs20 ; then
+		config="${config} --with-hotspot-build=hs20 --with-hotspot-src-zip=${DISTDIR}/${HOTSPOT_TARBALL}"
+	fi
+
+	unset_vars
+
+	econf ${config} \
+		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
+		--with-jaxp-drop-zip="${DISTDIR}/${JAXP_TARBALL}" \
+		--with-jaxws-drop-zip="${DISTDIR}/${JAXWS_TARBALL}" \
+		--with-jaf-drop-zip="${DISTDIR}/${JAF_TARBALL}" \
+		--with-jdk-home="$(java-config -O)" \
+		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
+		$(use_enable !debug optimizations) \
+		$(use_enable doc docs) \
+		$(use_with javascript rhino ${rhino_jar}) \
+		--disable-cacao \
+		--disable-jamvm \
+		$(use_enable pulseaudio pulse-java) \
+		--enable-xrender \
+		$(use_enable systemtap) \
+		$(use_enable nio2) \
+		$(use_enable nss)
+}
+
+src_compile() {
+	# Newer versions of Gentoo's ant add
+	# an environment variable so it works properly...
+	export ANT_RESPECT_JAVA_HOME=TRUE
+
+	# ant -diagnostics in Ant 1.8.0 fails without these
+	# otherwise we try to load the least that's needed to avoid possible classpath collisions
+	export ANT_TASKS="xerces-2 xalan ant-nodeps"
+
+	emake
+}
+
+src_install() {
+	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+	local ddest="${ED}/${dest}"
+	dodir "${dest}"
+
+	dodoc README NEWS AUTHORS THANKYOU
+	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
+
+	cd openjdk.build/j2sdk-image || die
+
+	# doins can't handle symlinks.
+	cp -vRP bin include jre lib man "${ddest}" || die
+
+	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
+
+	if use doc; then
+		# java-pkg_dohtml needed for package-list #302654
+		java-pkg_dohtml -r ../docs/* || die
+	fi
+
+	if use examples; then
+		dodir "${dest}/share";
+		cp -vRP demo sample "${ddest}/share/" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	# Fix the permissions.
+	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
+
+	# Needs to be done before generating cacerts
+	java-vm_set-pax-markings "${ddest}"
+
+	# We need to generate keystore - bug #273306
+	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
+	mkdir "${T}/certgen" && cd "${T}/certgen" || die
+	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
+	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
+		openssl x509 -text -in "${c}" >> all.crt || die
+	done
+	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
+	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
+	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
+
+	# Bug 390663
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
+	eprefixify "${T}"/fontconfig.Gentoo.properties
+	insinto "${dest}"/jre/lib
+	doins "${T}"/fontconfig.Gentoo.properties
+
+	set_java_env "${FILESDIR}/icedtea.env"
+}
+
+need_zero() {
+	! use amd64 && ! use x86 && ! use sparc
+}
+
+pkg_preinst() {
+	if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then
+		# portage would preserve the symlink otherwise, related to bug #384397
+		rm -f "${EROOT}/usr/lib/jvm/icedtea6"
+		elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*"
+		elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1"
+		elog "If you had icedtea6 as system VM, the change should be automatic, however"
+		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
+		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
+	fi
+}
diff --git a/dev-java/icedtea/icedtea-7.2.0-r2.ebuild b/dev-java/icedtea/icedtea-7.2.0-r2.ebuild
new file mode 100644
index 000000000000..2d4d5b424e35
--- /dev/null
+++ b/dev-java/icedtea/icedtea-7.2.0-r2.ebuild
@@ -0,0 +1,338 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r2.ebuild,v 1.1 2011/11/28 15:29:59 sera Exp $
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+# *********************************************************
+# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
+# *********************************************************
+
+EAPI="4"
+
+inherit java-pkg-2 java-vm-2 pax-utils prefix versionator
+
+LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
+SLOT="7"
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
+ICEDTEA_VER="$(get_version_component_range 2-3)"
+ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
+OPENJDK_TARBALL="0a76e5390e68.tar.gz"
+CORBA_TARBALL="4d9e4fb8af09.tar.gz"
+HOTSPOT_TARBALL="b28ae681bae0.tar.gz"
+JAXP_TARBALL="948e734135ea.tar.gz"
+JAXWS_TARBALL="a2ebfdc9db7e.tar.gz"
+JDK_TARBALL="2054526dd141.tar.gz"
+LANGTOOLS_TARBALL="9b85f1265346.tar.gz"
+SRC_URI="http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
+		 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/archive/${OPENJDK_TARBALL}
+		 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/corba/archive/${CORBA_TARBALL}
+		 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/jaxp/archive/${JAXP_TARBALL}
+		 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/jaxws/archive/${JAXWS_TARBALL}
+		 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/jdk/archive/${JDK_TARBALL}
+		 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/hotspot/archive/${HOTSPOT_TARBALL}
+		 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/langtools/archive/${LANGTOOLS_TARBALL}"
+HOMEPAGE="http://icedtea.classpath.org"
+S=${WORKDIR}/${ICEDTEA_PKG}
+
+# Missing options:
+# shark - needs adding
+IUSE="X debug cjk doc examples javascript +jbootstrap +nsplugin pulseaudio +source systemtap +webstart"
+
+RDEPEND="!dev-java/icedtea:0
+	>=dev-libs/glib-2.26
+	>=media-libs/alsa-lib-1.0
+	media-libs/fontconfig
+	>=media-libs/freetype-2.3.5
+	>=media-libs/giflib-4.1.6
+	media-libs/lcms:2
+	>=media-libs/libpng-1.2
+	>=net-print/cups-1.2.12
+	sys-apps/attr
+	>=sys-libs/zlib-1.2.3
+	virtual/jpeg
+	>=x11-libs/gtk+-2.8:2
+	>=x11-libs/libX11-1.1.3
+	>=x11-libs/libXau-1.0.3
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXext-1.1.1
+	>=x11-libs/libXi-1.1.3
+	>=x11-libs/libXinerama-1.0.2
+	>=x11-libs/libXp-1.0.0
+	>=x11-libs/libXrender-0.9.4
+	>=x11-libs/libXtst-1.0.3
+	x11-proto/inputproto
+	x11-proto/xineramaproto
+	X? (
+	 	media-fonts/dejavu
+		cjk? (
+			media-fonts/arphicfonts
+			media-fonts/baekmuk-fonts
+			media-fonts/lklug
+			media-fonts/lohit-fonts
+			media-fonts/sazanami
+		)
+	)
+	javascript? ( dev-java/rhino:1.6 )
+	ppc64? ( virtual/libffi )
+	ppc? ( virtual/libffi )
+	pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
+	systemtap? ( >=dev-util/systemtap-1 )"
+
+# Additional dependencies for building:
+#   zip: extract OpenJDK tarball, and needed by configure
+#   ant, ecj, jdk: required to build Java code
+# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
+# ca-certificates, perl and openssl are used for the cacerts keystore generation
+# xext headers have two variants depending on version - bug #288855
+# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
+DEPEND="${RDEPEND}
+	|| (
+		>=dev-java/gcj-jdk-4.3
+		dev-java/icedtea-bin:7
+		dev-java/icedtea-bin:6
+		dev-java/icedtea:7
+		dev-java/icedtea:6
+	)
+	app-arch/zip
+	dev-util/pkgconfig
+	>=dev-libs/libxslt-1.1.26
+	>=x11-proto/xextproto-7.1.1
+	x11-proto/xproto
+	>=dev-java/ant-core-1.8.1
+	dev-java/ant-nodeps
+	app-misc/ca-certificates
+	dev-lang/perl
+	dev-libs/openssl
+	sys-apps/lsb-release
+	app-arch/cpio"
+#	 || ( >=sys-devel/autoconf-2.65:2.5 <sys-devel/autoconf-2.64:2.5 )"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:7 )
+	nsplugin? ( dev-java/icedtea-web:7[nsplugin] )"
+
+# a bit of hack so the VM switching is triggered without causing dependency troubles
+JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.5"
+JAVA_PKG_WANT_SOURCE="1.5"
+JAVA_PKG_WANT_TARGET="1.5"
+
+pkg_setup() {
+	if use nsplugin && ! use webstart ; then
+		elog "Note that the nsplugin flag implies the webstart flag. Enable it to remove this message."
+	fi
+
+	[[ "${MERGE_TYPE}" == "binary" ]] && return #258423
+
+	# icedtea doesn't like some locales. #330433 #389717
+	export LANG="C" LC_ALL="C"
+
+	# quite a hack since java-config does not provide a way for a package
+	# to limit supported VM's for building and their preferred order
+	if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
+		einfo "Honoring user-set JAVA_PKG_FORCE_VM"
+	elif has_version "<=dev-java/icedtea-7.2.0:7"; then
+		JAVA_PKG_FORCE_VM="icedtea7"
+	elif has_version ">dev-java/icedtea-7.2.0:7"; then
+		JAVA_PKG_FORCE_VM="icedtea-7"
+	elif has_version "dev-java/icedtea-bin:7"; then
+		JAVA_PKG_FORCE_VM="icedtea-bin-7"
+	elif has_version "<=dev-java/icedtea-6.1.10.4:6"; then
+		JAVA_PKG_FORCE_VM="icedtea6"
+	elif has_version ">dev-java/icedtea-6.1.10.4:6"; then
+		JAVA_PKG_FORCE_VM="icedtea-6"
+	elif has_version "<dev-java/icedtea-bin-6.1.10.4:6"; then
+		JAVA_PKG_FORCE_VM="icedtea6-bin"
+	elif has_version ">=dev-java/icedtea-bin-6.1.10.4:6"; then
+		JAVA_PKG_FORCE_VM="icedtea-bin-6"
+	elif has_version dev-java/gcj-jdk; then
+		JAVA_PKG_FORCE_VM="gcj-jdk"
+	else
+		die "Unable to find a supported VM for building"
+	fi
+
+	einfo "Forced vm ${JAVA_PKG_FORCE_VM}"
+	java-vm-2_pkg_setup
+	java-pkg-2_pkg_setup
+
+	# without this, access violation is thrown
+	addpredict "/proc/self/coredump_filter"
+}
+
+src_unpack() {
+	unpack ${ICEDTEA_PKG}.tar.gz
+}
+
+java_prepare() {
+	# Fix non bootstrap builds with PaX enabled kernels. Bug #389751
+	# Move applying test_gamma.patch to before creating boot copy.
+	if host-is-pax; then
+		sed -i -e 's|patches/boot/test_gamma.patch||' Makefile.in || die
+		sed -i -e 's|openjdk-boot|openjdk|g' patches/boot/test_gamma.patch || die
+		export DISTRIBUTION_PATCHES=patches/boot/test_gamma.patch
+	fi
+}
+
+unset_vars() {
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+}
+
+src_configure() {
+	local config procs rhino_jar
+	local vm=$(java-pkg_get-current-vm)
+
+	if has "${vm}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6; then
+		if use jbootstrap; then
+			einfo "We can't currently bootstrap with a IcedTea6 JVM :("
+			einfo "bootstrap forced off, ignoring use jbootstrap"
+		fi
+		config="${config} --disable-bootstrap"
+	elif has "${vm}" icedtea7 icedtea-7 icedtea-bin-7; then
+		if host-is-pax; then
+			if use jbootstrap; then
+				einfo "We can't currently bootstrap with a PaX enabled kernel :("
+				einfo "bootstrap forced off, ignoring use jbootstrap"
+			fi
+			config="${config} --disable-bootstrap"
+		else
+			config="${config} $(use_enable jbootstrap bootstrap)"
+		fi
+	elif has "${vm}" gcj-jdk; then
+		if host-is-pax; then
+			eerror "Can't currently bootstrap IcedTea using gcj-jdk or cacao on a PaX enabled host"
+			eerror "Sorry for the inconvenience"
+			die "Use an existing IcedTea build instead or disable PaX on the host"
+		fi
+		if ! use jbootstrap; then
+			einfo "bootstrap forced on for ${vm}, ignoring use jbootstrap"
+		fi
+	else
+		eerror "IcedTea must be built with either a JDK based on GNU Classpath or an existing build of IcedTea."
+		die "Install a GNU Classpath JDK (gcj-jdk)"
+	fi
+
+	# OpenJDK-specific parallelism support. Bug #389791, #337827
+	# Implementation modified from waf-utils.eclass
+	# Note that "-j" is converted to "-j1" as the system doesn't support --load-average
+	local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
+	config="${config} --with-parallel-jobs=${procs}";
+	einfo "Configuring using --with-parallel-jobs=${procs}"
+
+	if need_zero ; then
+		config="${config} --enable-zero"
+	else
+		config="${config} --disable-zero"
+	fi
+
+	if use javascript ; then
+		rhino_jar=$(java-pkg_getjar rhino:1.6 js.jar);
+	fi
+
+	unset_vars
+
+	econf ${config} \
+		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
+		--with-corba-src-zip="${DISTDIR}/${CORBA_TARBALL}" \
+		--with-jaxp-src-zip="${DISTDIR}/${JAXP_TARBALL}" \
+		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_TARBALL}" \
+		--with-jdk-src-zip="${DISTDIR}/${JDK_TARBALL}" \
+		--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_TARBALL}" \
+		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_TARBALL}" \
+		--with-jdk-home="$(java-config -O)" \
+		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
+		--disable-jdk-tests \
+		$(use_enable !debug optimizations) \
+		$(use_enable doc docs) \
+		$(use_with javascript rhino ${rhino_jar}) \
+		--disable-cacao \
+		--disable-jamvm \
+		$(use_enable pulseaudio pulse-java) \
+		$(use_enable systemtap)
+}
+
+src_compile() {
+	# Newer versions of Gentoo's ant add
+	# an environment variable so it works properly...
+	export ANT_RESPECT_JAVA_HOME=TRUE
+
+	# We try to load the least that's needed to avoid possible classpath collisions
+	export ANT_TASKS="ant-nodeps"
+
+	emake -j 1
+}
+
+src_install() {
+	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+	local ddest="${ED}/${dest}"
+	dodir "${dest}"
+
+	dodoc README NEWS AUTHORS
+	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
+
+	cd openjdk.build/j2sdk-image || die
+
+	# Don't hide classes
+	rm lib/ct.sym || die
+
+	# doins can't handle symlinks.
+	cp -vRP bin include jre lib man "${ddest}" || die
+
+	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
+
+	if use doc; then
+		# java-pkg_dohtml needed for package-list #302654
+		java-pkg_dohtml -r ../docs/* || die
+	fi
+
+	if use examples; then
+		dodir "${dest}/share";
+		cp -vRP demo sample "${ddest}/share/" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	# Fix the permissions.
+	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
+
+	# Needs to be done before generating cacerts
+	java-vm_set-pax-markings "${ddest}"
+
+	# We need to generate keystore - bug #273306
+	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
+	mkdir "${T}/certgen" && cd "${T}/certgen" || die
+	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
+	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
+		openssl x509 -text -in "${c}" >> all.crt || die
+	done
+	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
+	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
+	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
+
+	# OpenJDK7 should be able to use fontconfig instead, but wont hurt to
+	# install it anyway. Bug 390663
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
+	eprefixify "${T}"/fontconfig.Gentoo.properties
+	insinto "${dest}"/jre/lib
+	doins "${T}"/fontconfig.Gentoo.properties
+
+	set_java_env "${FILESDIR}/icedtea.env"
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+need_zero() {
+	! use amd64 && ! use x86 && ! use sparc
+}
+
+pkg_preinst() {
+	if has_version "<=dev-java/icedtea-7.2.0:7"; then
+		# portage would preserve the symlink otherwise, related to bug #384397
+		rm -f "${EROOT}/usr/lib/jvm/icedtea7"
+		elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*"
+		elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1"
+		elog "If you had icedtea7 as system VM, the change should be automatic, however"
+		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
+		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
+	fi
+}
diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
index f74067e046cd..8d52e07117fc 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -17,6 +17,7 @@
   <flag name="cacao">Use the CACAO virtual machine instead of HotSpot on x86, amd64 or SPARC architectures.</flag>
   <flag name="hs20">Use the new version of HotSpot (20).</flag>
   <flag name="jamvm">Use the JamVM virtual machine instead of HotSpot.</flag>
+  <flag name="jbootstrap">If possible, recompile the final IcedTea executables with itself.</flag>
   <flag name="nio2">Enable backport of NIO2 to OpenJDK6.</flag>
   <flag name="nss">Enable NSS security provider support.</flag>
   <flag name="nsplugin">Enable browser plugin (NPPlugin), requires also the webstart flag to be enabled.</flag>