Version bump wrt bug #313053. Initial ebuild by Robert Schedel <r.schedel@yahoo.de>, changed by me. Fixes bug #298664 too. Punt jurassic versions.

Package-Manager: portage-2.2.0_alpha85/cvs/Linux i686

5 files changed, 234 insertions, 384 deletions

diff --git a/media-tv/tvbrowser/ChangeLog b/media-tv/tvbrowser/ChangeLog
index 4fdc880285f3..20547327875a 100644
--- a/media-tv/tvbrowser/ChangeLog
+++ b/media-tv/tvbrowser/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-tv/tvbrowser
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.32 2012/01/27 17:01:39 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.33 2012/02/07 23:09:36 johu Exp $
+
+*tvbrowser-3.1 (07 Feb 2012)
+
+  07 Feb 2012; Johannes Huber <johu@gentoo.org> +tvbrowser-3.1.ebuild,
+  -tvbrowser-2.7.1.ebuild, -tvbrowser-2.7.4.ebuild:
+  Version bump wrt bug #313053. Initial ebuild by Robert Schedel
+  <r.schedel@yahoo.de>, changed by me. Fixes bug #298664 too. Punt jurassic
+  versions.
 
   27 Jan 2012; Johannes Huber <johu@gentoo.org> metadata.xml:
   Take package over. Remove proxy maintainer and add myself.
diff --git a/media-tv/tvbrowser/Manifest b/media-tv/tvbrowser/Manifest
index 29464601300f..2094b97caf87 100644
--- a/media-tv/tvbrowser/Manifest
+++ b/media-tv/tvbrowser/Manifest
@@ -2,14 +2,18 @@
 Hash: SHA512
 
 DIST BeOSthemepack.zip 39412 RMD160 a7c49788b51d979146216f01f1dfd265e280ae7c SHA1 f4b0a6534ccc01cd45c4693b7681b5ee43a9226e SHA256 ec2acb46a77f38a9750ede23ab573b2c2773bedd37fa1ac7bbaa0bdc74982574
-DIST CrystalClear.zip 165844 RMD160 a4d51169285510725a8a6060e499ea2b1791798a SHA1 96222f7f8d7dfda0d40282c3068f98f7bd76f172 SHA256 cc86027cc005c1462fcfc3f7a960d2d8af8b27f279736935a6f6b339f96f32d1
 DIST amarachthemepack.zip 53700 RMD160 7bb94ca80f64ef7de07dcefbd322dbdcf8bfbf9c SHA1 d5c32cdeca445eac703fb9018d99b4c2b52cbdda SHA256 80bbe3df2c3e44f26bb390994e271264bcc71ff581527039bf677fa38df4a547
+DIST aquathemepack.zip 90542 RMD160 e08ba691fdcee8f58accd7b369f3984bbd025343 SHA1 18cc88ee628be9d2d85a7b90602e1af83333ab5d SHA256 eabbfc07a3aa6172145c3786d5ec2abe5185daad358718305e9cd920642b4b01
 DIST architectBluethemepack.zip 52161 RMD160 3f3b66c5038d79925d16c0f3efd6298a7994bb89 SHA1 9e0df52d0edd0a25cc19e807caf48e59c94998e9 SHA256 4a6cb351ed88e924fb06a35f3e5a7bfbc01013c2464cb8a2edd0f15a9b7bc39b
 DIST architectOlivethemepack.zip 52265 RMD160 06f9acf9b883b2b3331cf1345bb05c5847a8b402 SHA1 c349fb78901e9bc758e726b8596ea5eb5be8a9f2 SHA256 eafff0696a2db1ee258448689d945d5720faa8e70877f44fb6c8de9847365693
 DIST b0sumiErgothempack.zip 54621 RMD160 5a4502c8f55dedee392c44efee682439b838c166 SHA1 6c193495909379558b2c582437ea2b74009b7a72 SHA256 fedc7995976f35487a8c7acc2712d993e4a328352494ee8899c58d3ddce885f7
 DIST b0sumithemepack.zip 53817 RMD160 597e9068be3c3f9f4c5e4a489e5f28a84174e206 SHA1 e7edbfdb04dfc357bbd8b5052b8b7b3baa8490ab SHA256 ba28a68ef1627ed44c67370645601d0a53ace6c9ed23ae139159d923d48ebc3f
+DIST bbjthemepack.zip 63397 RMD160 b8fdba60f563269d82ebeaa2ab49e5619e9230db SHA1 ea974eb90834e19fffa6691dacfa0c7db018451c SHA256 e6d3900a0486c5bd808df5660329505cde601752ee7058fe2e1efe3cdc3a3ea3
+DIST beigeazulthemepack.zip 81543 RMD160 0c64cf7a096cd41aa8b0a2dfeaaeba7f83bbbcf1 SHA1 825eb538ad0ed90222c5ad8dbab864b386c4b8ed SHA256 185eae63d028f76923f201209d3fdd39222f9df6a73ee7d19b38a859551432e2
+DIST beosthemepack.zip 22851 RMD160 245da1a0a633ca13006f05402887ac2c34d3d6fc SHA1 9c036c9826f03b56daeebab7e27f965775cacb20 SHA256 1a5744c1fdf68e0f6893ef27300de4be57327a532edfe751a808b1ae923815f7
 DIST blueMetalthemepack.zip 67613 RMD160 cf619eab797261fa0fff9bdfac7979ff447f1800 SHA1 bbfb26fb712bbe58d486b1a9ad77fde0c34e37ab SHA256 205d44aa6a6035480c2e062c4b6876fa73545c45b513ec7bf1ce033cbc13336a
 DIST blueTurquesathemepack.zip 62676 RMD160 ef99f0a4c24a06622bf6859d625eb4810140ccf6 SHA1 820484980f1deb87e976b11277ecd494f5e0aa0a SHA256 c3764fe15785e2aa63a5bd86f60d9d992fa8a52262cbc366d9b612286cf5abc3
+DIST cellshadedthemepack.zip 54354 RMD160 409df4b069ac26090437cdd1918e53b8dc06e9a5 SHA1 bcd3620113c211c27ff1b75dba8401f229b2d710 SHA256 bc2d594a4a4dce63b2db91bec7faa1f60398783fe0d26aed40215c004c6d8a24
 DIST chaNinja-Bluethemepack.zip 77692 RMD160 fa49946e4a7b8d61ac40b374c5ca5bdedc392358 SHA1 3e496ad798f7e0581faa9c09cda31d5c7e4ed240 SHA256 927bdc98a4cb1b26c5150f40d6e8825f33d34391b6703da8cc14c246dd8e461f
 DIST coronaHthemepack.zip 82406 RMD160 889f975a118a90d0f396e3740376930a1f9eb9e2 SHA1 b3648a7567fbf95692ee747c1f8f32f133d8a580 SHA256 79f1eab6d2c09c66001404bcb562d4db25edddfd142af2763c63fad6e96c775f
 DIST cougarthemepack.zip 49992 RMD160 36a51618acc152221dbb50a780bafe4a1c4943b8 SHA1 89dd31fc48c7a92faff159f305afff52e0a9e958 SHA256 d3b2b83ab1f149ee6cafe22e5bdb755ce1f46c68be43bdb989d8e9e63102d037
@@ -20,8 +24,10 @@ DIST gorillathemepack.zip 43281 RMD160 4334de74ee1151f7bf7962665e66f5223b030211
 DIST hmmXPBluethemepack.zip 40046 RMD160 4aee28d711a75cb40437d84086e167251c404370 SHA1 9b64a5efd3efd2059b050b88c9cc0873dea29525 SHA256 42c18247445e3d6624b326cee90a81e1977891c8e580b649033a295585a72102
 DIST hmmXPMonoBluethemepack.zip 39815 RMD160 c626bcd94c508c17104ccf6249ebc77886942785 SHA1 905c3d9eede0e07630a66bfa89684e8bf2559ab4 SHA256 7886dcc91c0d692c3d80b0016f89724187a8a90e70d59bfb6c64d9506ece77cb
 DIST iBarthemepack.zip 68829 RMD160 5fcac4ead3a95418e93a9aeee42ffda824053a26 SHA1 aeeb26c036cc0bd1ce9098051f23497da6498b74 SHA256 acf46246336007f161dd396cc92ff17927dc45991ffb8a54c24620493ed65b6b
+DIST macosthemepack.zip 38584 RMD160 25394772b966220b842f8ec9464b0c084513eceb SHA1 78ae3868e633e072550a9a87c80badbc93879305 SHA256 3876e6adffff030bb5dc605c80632cfb3518f8f8d6d3540776c74c2662b14e17
 DIST midnightthemepack.zip 44585 RMD160 6c0bd8becbb75339aeb0b0d99842e71ac44ca786 SHA1 442cd6e30d31b2470c70a11b8a11ca99f9f19ae4 SHA256 b3517806229fabcf5872da7acbe3d0878a710e4cee63908423a384bf5b4f8eed
 DIST mmMagra-Xthemepack.zip 76329 RMD160 be129fd46d4ad951c67006abbe921da3d1bcf96c SHA1 a5c6307306f42583ab53158cd3b5932eec7c3498 SHA256 e6c4062797568f4a1667974529e17d9c50ebc1a1fbcc826f0f536eaf4919ac34
+DIST modernthemepack.zip 97490 RMD160 18ec3de20152d0704412474875164434ff06c0bc SHA1 4603ca92fad6f323049302c4562dd5363b4f216a SHA256 1b64d58c6ef0b00e3b7128bb242ae80da14977f7d54ef24b09102aa212b2ac70
 DIST noia.zip 174721 RMD160 1f8fe9182fdd233171f193a853badc39357787cf SHA1 6a4ec93a7a42bed1c6c354d3472405e73a69c1f3 SHA256 bd6236c8c8cb7c38d667904130417927a154c4201b5373b65260466083fb7a7d
 DIST nuvola.zip 286612 RMD160 6cd196f85faeaf859815ff756b3b79d448aa7b27 SHA1 a1b1cbc2be27e7f61cdb6e1f1d58610d4dd12156 SHA256 8ac40d72387663961062d09dbc749f2b2a865aebca8243bf94cb8d5101e9e894
 DIST oliveGreenLunaXPthemepack.zip 62509 RMD160 ab7472e3e5de7656805c2b72cf71148e47969856 SHA1 65df1e9eeda41258a7702097ec00e13091bb51c3 SHA256 bd71c50b464a5778a3af4c7c0eec18d6917b378a960b1ba7d31dfa272d13ab49
@@ -36,24 +42,26 @@ DIST roueGreenthemepack.zip 48957 RMD160 6b379c243d963fbf9dbcfc07e0b3ab3debb7dc2
 DIST royalInspiratthemepack.zip 50579 RMD160 d1ef2311810a052e8e26761cef01fcd84b67614f SHA1 1f163021399d55d8ea0e604c7e3dfcec2f2bff84 SHA256 fcc9bdb217c78d22fed169e8c3686a652afeff8b46a845832709bea13270eb02
 DIST silverLunaXPthemepack.zip 54618 RMD160 fc2327afc30c4078f962985d3597799680664d9e SHA1 7a47ca33940f4c911a86bae1f26460e878c9e714 SHA256 f53cfa989a023b28337a7794956746de2aae81ab43784360db18b73c29197d52
 DIST solunaRthemepack.zip 59579 RMD160 4003979473972e3458c2f97bacddf39c060e2927 SHA1 3c29eff3924d2259d2d80cd3f5b5ffd186bfce54 SHA256 49a561c657223de888dd390c2011edb1fac1dc6a95543ffc41f70c0fe015a9d8
+DIST tango_without_heart.zip 217125 RMD160 da4639b9650a6b2b4c96ac5ffc5cea0996b2b2e9 SHA1 65382930cf657e8ce99d8fe3ccf044e9be59f130 SHA256 6c7fce9223d1827bea881c2b9901d0e5c8a111e09ebab6e45ec0a9d70b07e9a6
 DIST tigerGraphitethemepack.zip 75611 RMD160 f08763851e3d8fbd98faec03155e99c9ace01b09 SHA1 27af6baee56e3bab77e0d10db3a60f37e9687f2b SHA256 94d2b4978686158a421122dec73b385725b21408c0941984b6f37677c965fb35
 DIST tigerthemepack.zip 77856 RMD160 8b47754c9dcb64eb3912bdbe8fbf29ea64a60b0f SHA1 0986b97499e5be74f25b9c62c31b2ad6d65a4987 SHA256 55002367d55ffe7953e5e059d9357ce6d9111bbba303532b91263ca7ec69dbf5
+DIST toxicthemepack.zip 68233 RMD160 7ffd87063e13ea4533453759928a51a54b41380f SHA1 03d48765d59f3eae126def0ec0ff520748ba1fe6 SHA256 a3d6c2311f8a35381c8aa3ac9b7bead5ba81b00a47d4e4bd27b5e38de6322600
 DIST tulliana.zip 258520 RMD160 98841d289b24cd2f3ab9723970366608bcb61706 SHA1 541b14f51fd604d9efdfccb663420260060a594f SHA256 d9a7670c3933757f58bc6913433b6f00e984c0cbff17eaf59076d951ac195a88
-DIST tvbrowser-2.7.1-src.zip 9549988 RMD160 e02a639a36262a1535cb277212c39fe8240c542c SHA1 1bcf128d0c2891e05adf9b2a9b8e918bbae95032 SHA256 cc735c4663bb9ac40588c225aac90430969a0f2439b1e25581ece8101d490628
-DIST tvbrowser-2.7.4-src.zip 9594660 RMD160 5c2cd3599317896eea563b4103313b104e4618c4 SHA1 02af126677938485338a5ba1e268b2869c6a9368 SHA256 b10849f10e5771bc8eeb24ba4b2e71eefcf6d1339701247211c4e7a70aac3f6d
+DIST tvbrowser_3.1_src.zip 13696157 RMD160 71b94739b2c20dce2b05241f602824a2e24faee5 SHA1 2cee8d7ab23cecec49d9e28856f17dff38540419 SHA256 e168be54b95c93651af9116a98148a5fa4bb6b094df1b727617f1c281cd36ce8
 DIST underlingthemepack.zip 59786 RMD160 7cbc1da5cf5e37c9fe535d6cb369ea3036c79c5e SHA1 cf3aaa4a27bf1eb2ea35d0d7fd62716b3e408f0d SHA256 67dfd8757162dce375e02c250403a7184b64fbd1c1eb754a11373467ff96eb44
-EBUILD tvbrowser-2.7.1.ebuild 7434 RMD160 3364dbebbf114bc988d78fd2b9ce7293e6ed4a86 SHA1 bc857c687ddb67af1a83306948705a869616b964 SHA256 6624e5a5039fba1261af867dfc09e4c8e956d26dfd477d011715e1bb44375d23
-EBUILD tvbrowser-2.7.4.ebuild 7434 RMD160 9177abf3437e3c1ffdf1d24e50e53e091c0f48db SHA1 66fd8c88c9df0796cab901b68c49fb984f42fad9 SHA256 9d75147c62c33c5575d8f20d12e46aebc3ea7eaa60f905531a63a5d2dfad1159
-MISC ChangeLog 6518 RMD160 51a2ac9a3dfdecfc6a14f5eee3a27bd45ceb53ac SHA1 e53cc9b0942aa3a83216d4d7538b79093802bf74 SHA256 9899692afa3c2b5b26076eb2eaa4dacc18847d182f93aa63d4ec3da0aa47f82a
+DIST whistlerthemepack.zip 32206 RMD160 362987575b6df8569dc97f4aecc918092846ed91 SHA1 1621bf7808995f888cdc32c18b63831aa2d67f52 SHA256 0d8e5fab4cc148d35610f11061ddc7cd8eb23116919d99c8c673c1956ae6711e
+DIST xplunathemepack.zip 63343 RMD160 2ad9e15641cf089594c625e339189cc4a0baef57 SHA1 5ba80cfe29f38d931feb29781d2042e05b2380d1 SHA256 c8a2328597e0b05866919a2c925baf39dad294d1feade9d28cf4cf01722b95ee
+EBUILD tvbrowser-3.1.ebuild 7464 RMD160 984cafedc77bda60fc88bbcc45f135d2af706d96 SHA1 f74935fd7a299711cad4875e11c154797dace5e1 SHA256 2d1f889ce7ddbda946894f91b25c69ca261d6bcf49c47756a5996244c2682a0b
+MISC ChangeLog 6825 RMD160 185fedc75704e08b2722a2958c0f359dc1600b9a SHA1 c9d177bb71003ee62a9e01db95f2150b7bda12a4 SHA256 4de1ee02c28dbfbf90b092dca064f31c30ca97827414d7d5df9ddc457b4641f5
 MISC metadata.xml 331 RMD160 af84de6450d69273ac5edf64387143a1cdbca923 SHA1 4208c2695ec6f4a7f1ac8eb2f9a71a68564e36eb SHA256 b83ec9363b78ed1ef4a32b5574eda0010c788c5279a99ccf9195a54ee00ca144
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPItmUAAoJEO+t9ga+3I3ayu8H/2t8RGbYSNc3davA+6KoVcli
-zqEYZqL+PRLR1gZsrV3Q2K+leV1bwjNGzKEKtE4bDHY29dhfe2z9Fg0LNTZEqfi5
-e70S5Z67oI0kvS90VrSdj+N03dKJ311tP9aU4/c7/Yera+4Ox314lAknmYNHauWa
-d9hY5Lyg0czQ2UUaVfnRCj6mo7yJIDgECRjMN09wcv6MQcmdMhqP4Z1vTeY8+ygH
-N6NNIFcsgZGfqfQ+f2jZsijBFe1kaI3ZtAAUPPKrsoSSMIDFGHR/+3gT3XlKBJFx
-OkTZPLrsMA/51iyJvKxouJgqHwM8q1TvI24jTLwylMCJI2kbQb6QEDa9tUkX+GE=
-=IiQe
+iQEcBAEBCgAGBQJPMbA0AAoJEO+t9ga+3I3ay5cIAIr6F089Nam7fWrKPzz20Vdm
+nhC8n1X65/n/n8PrvYO3P5eDFRB8eNyTwEWcaazZ+WsWjMmavr82zswInF0iPndu
+dhYWxm166+IHHRfqBzTKTSp6sxUAGzMXZl4UWR00iBuT1e0mP/AdfxCE2ThiB5hD
+bVYV5QhPnQ5lwMBZkGLwk7nO5g9DncJqyzJsZH38V9ObnUVq/x4amoostfSB5uzc
+baIQsDa41sLsDbQ5dPir6/n31zzE+B5rUDgG6QlMsiPHLSD6JhbnZEqbM+7Jfw2N
+YvIw2IYppxO1rO5+PJ4dSb1xftgOWDRl/aHmTtf7jtlWxamjx70JQvlKgcj5EMQ=
+=ve57
 -----END PGP SIGNATURE-----
diff --git a/media-tv/tvbrowser/tvbrowser-2.7.1.ebuild b/media-tv/tvbrowser/tvbrowser-2.7.1.ebuild
deleted file mode 100644
index bb191317e6c3..000000000000
--- a/media-tv/tvbrowser/tvbrowser-2.7.1.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-2.7.1.ebuild,v 1.3 2009/11/16 10:24:48 zzam Exp $
-
-JAVA_PKG_IUSE="doc source"
-#WANT_ANT_TASKS="ant-junit"
-
-EAPI="1"
-
-inherit eutils java-pkg-2 java-ant-2 flag-o-matic
-
-DESCRIPTION="Themeable and easy to use TV Guide - written in Java"
-HOMEPAGE="http://www.tvbrowser.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip
-themes? (
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/midnightthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/roueBrownthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/roueBluethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/roueGreenthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/blueTurquesathemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/gorillathemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/BeOSthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/crystal2themepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/opusOSDeepthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/chaNinja-Bluethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/amarachthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/quickSilverRthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/gfxOasisthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/underlingthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/coronaHthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/cougarthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/royalInspiratthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/tigerthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/mmMagra-Xthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/iBarthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/solunaRthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/fatalEthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/blueMetalthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/b0sumithemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/b0sumiErgothempack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/oliveGreenLunaXPthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/silverLunaXPthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/architectBluethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/architectOlivethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/hmmXPBluethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/hmmXPMonoBluethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/tigerGraphitethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/opusOSBluethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/opusOSOlivethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/opusLunaSilverthemepack.zip
-http://www.tvbrowser.org/downloads/CrystalClear.zip
-http://www.tvbrowser.org/downloads/noia.zip
-http://www.tvbrowser.org/downloads/nuvola.zip
-http://www.tvbrowser.org/downloads/tulliana.zip
-)"
-
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-COMMON_DEP="x11-libs/libXt
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libXext
-	x11-libs/libXtst
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	>=dev-java/jgoodies-looks-2.0
-	>=dev-java/stax-1.2.0
-	dev-java/bsh
-	dev-java/l2fprod-common
-	>=dev-java/jakarta-oro-2.0
-	dev-java/skinlf
-	>=dev-java/commons-codec-1.3
-	>=dev-java/commons-net-1.4.1
-	>=dev-java/commons-lang-2.4
-	dev-java/lucene:2.3"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-
-LICENSE="GPL-2"
-
-IUSE="themes"
-
-src_unpack() {
-	unpack ${P}-src.zip
-	cd "${S}"
-
-	# now that's a rather nasty trick that removes exactly the lines that unjar
-	# dependencies and include them to tvbrowser's jars
-	# when bumping, check that it doesn't affect lines it shouldn't!
-	sed "/unpacked.dir/d" -i build.xml || die
-
-	# disable running of junit tests, because tvbrowserdataservice.file.ChannelListTest fails always
-	sed -i "${S}"/build.xml -e"s:, test: :"
-
-	cd "${S}"/lib || die
-	rm -v commons-net*.jar commons-lang-*.jar looks*.jar \
-		bsh*.jar l2fprod-common-tasks.jar jakarta-oro*.jar skinlf.jar \
-		commons-codec*.jar lucene-core-*.jar stax-*.jar || die
-
-	# missing dependencies commons-compress, TVAnytimeAPI, jRegistryKey, gdata-calendar,
-	# gdata-client, jcom, xtvd-lib, jgoodies-forms-1.2.0, opencsv and stax-api
-	# use local jar files for these, and also those in deployment
-	# some are win32/mac only, so we will let tvbrowser build against them (no need to patch stuff out of sources)
-	# but won't install the bundled jars, because their codepath won't be executed on linux anyway
-	java-pkg_jar-from commons-lang-2.1,commons-net,commons-codec,lucene-2.3,jgoodies-looks-2.0,bsh,l2fprod-common,skinlf,stax
-
-	# Fails to create javadocs without this
-	mkdir "${S}/public" || die
-}
-
-src_compile() {
-	eant runtime-linux $(use_doc public-doc)
-}
-
-src_install() {
-	use source && java-pkg_dosrc src/*
-	use doc && java-pkg_dojavadoc doc
-	cd runtime/${PN}_linux || die
-
-	java-pkg_dojar ${PN}.jar
-	java-pkg_dojar "${S}"/lib/{TVAnytimeAPI.jar,commons-compress-20050911.jar,gdata-calendar-1.0.jar,gdata-client-1.0.jar,gdata-core-1.0.jar,xtvd-lib-2.0.jar,forms-1.2.0.jar,opencsv-1.8.jar}
-
-	local todir="${JAVA_PKG_SHAREPATH}"
-
-	cp -a imgs "${D}/${todir}" || die
-	cp -a icons "${D}/${todir}" || die
-	cp -a plugins "${D}/${todir}" || die
-	cp linux.properties "${D}/${todir}" || die
-
-	insinto "${todir}/themepacks"
-	doins themepacks/themepack.zip || die
-
-	if use themes; then
-		cd "${DISTDIR}"
-		doins midnightthemepack.zip \
-			roueBrownthemepack.zip \
-			roueBluethemepack.zip \
-			roueGreenthemepack.zip \
-			blueTurquesathemepack.zip \
-			gorillathemepack.zip \
-			BeOSthemepack.zip \
-			crystal2themepack.zip \
-			opusOSDeepthemepack.zip \
-			chaNinja-Bluethemepack.zip \
-			amarachthemepack.zip \
-			quickSilverRthemepack.zip \
-			gfxOasisthemepack.zip \
-			underlingthemepack.zip \
-			coronaHthemepack.zip \
-			cougarthemepack.zip \
-			royalInspiratthemepack.zip \
-			tigerthemepack.zip \
-			mmMagra-Xthemepack.zip \
-			iBarthemepack.zip \
-			solunaRthemepack.zip \
-			fatalEthemepack.zip \
-			blueMetalthemepack.zip \
-			b0sumithemepack.zip \
-			b0sumiErgothempack.zip \
-			oliveGreenLunaXPthemepack.zip \
-			silverLunaXPthemepack.zip \
-			architectBluethemepack.zip \
-			architectOlivethemepack.zip \
-			hmmXPBluethemepack.zip \
-			hmmXPMonoBluethemepack.zip \
-			tigerGraphitethemepack.zip \
-			opusOSBluethemepack.zip \
-			opusOSOlivethemepack.zip \
-			opusLunaSilverthemepack.zip || die
-		insinto "${todir}/icons"
-		doins CrystalClear.zip noia.zip nuvola.zip tulliana.zip || die
-	fi
-
-	java-pkg_dolauncher "tvbrowser" \
-		--main tvbrowser.TVBrowser \
-		--pwd ${todir} \
-		--java_args " -Dpropertiesfile=${todir}/linux.properties"
-
-	make_desktop_entry ${PN} "TV Browser" /usr/share/tvbrowser/imgs/tvbrowser128.png
-}
diff --git a/media-tv/tvbrowser/tvbrowser-2.7.4.ebuild b/media-tv/tvbrowser/tvbrowser-2.7.4.ebuild
deleted file mode 100644
index f45e3dd1054a..000000000000
--- a/media-tv/tvbrowser/tvbrowser-2.7.4.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-2.7.4.ebuild,v 1.1 2009/11/16 10:05:00 zzam Exp $
-
-JAVA_PKG_IUSE="doc source"
-#WANT_ANT_TASKS="ant-junit"
-
-EAPI="1"
-
-inherit eutils java-pkg-2 java-ant-2 flag-o-matic
-
-DESCRIPTION="Themeable and easy to use TV Guide - written in Java"
-HOMEPAGE="http://www.tvbrowser.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip
-themes? (
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/midnightthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/roueBrownthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/roueBluethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/roueGreenthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/blueTurquesathemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/gorillathemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/BeOSthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/crystal2themepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/opusOSDeepthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/chaNinja-Bluethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/amarachthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/quickSilverRthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/gfxOasisthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/underlingthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/coronaHthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/cougarthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/royalInspiratthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/tigerthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/mmMagra-Xthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/iBarthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/solunaRthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/fatalEthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/blueMetalthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/b0sumithemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/b0sumiErgothempack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/oliveGreenLunaXPthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/silverLunaXPthemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/architectBluethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/architectOlivethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/hmmXPBluethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/hmmXPMonoBluethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/tigerGraphitethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/opusOSBluethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/opusOSOlivethemepack.zip
-http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/opusLunaSilverthemepack.zip
-http://www.tvbrowser.org/downloads/CrystalClear.zip
-http://www.tvbrowser.org/downloads/noia.zip
-http://www.tvbrowser.org/downloads/nuvola.zip
-http://www.tvbrowser.org/downloads/tulliana.zip
-)"
-
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-COMMON_DEP="x11-libs/libXt
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libXext
-	x11-libs/libXtst
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	>=dev-java/jgoodies-looks-2.0
-	>=dev-java/stax-1.2.0
-	dev-java/bsh
-	dev-java/l2fprod-common
-	>=dev-java/jakarta-oro-2.0
-	dev-java/skinlf
-	>=dev-java/commons-codec-1.3
-	>=dev-java/commons-net-1.4.1
-	>=dev-java/commons-lang-2.4
-	dev-java/lucene:2.3"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-
-LICENSE="GPL-2"
-
-IUSE="themes"
-
-src_unpack() {
-	unpack ${P}-src.zip
-	cd "${S}"
-
-	# now that's a rather nasty trick that removes exactly the lines that unjar
-	# dependencies and include them to tvbrowser's jars
-	# when bumping, check that it doesn't affect lines it shouldn't!
-	sed "/unpacked.dir/d" -i build.xml || die
-
-	# disable running of junit tests, because tvbrowserdataservice.file.ChannelListTest fails always
-	sed -i "${S}"/build.xml -e"s:, test: :"
-
-	cd "${S}"/lib || die
-	rm -v commons-net*.jar commons-lang-*.jar looks*.jar \
-		bsh*.jar l2fprod-common-tasks.jar jakarta-oro*.jar skinlf.jar \
-		commons-codec*.jar lucene-core-*.jar stax-*.jar || die
-
-	# missing dependencies commons-compress, TVAnytimeAPI, jRegistryKey, gdata-calendar,
-	# gdata-client, jcom, xtvd-lib, jgoodies-forms-1.2.0, opencsv and stax-api
-	# use local jar files for these, and also those in deployment
-	# some are win32/mac only, so we will let tvbrowser build against them (no need to patch stuff out of sources)
-	# but won't install the bundled jars, because their codepath won't be executed on linux anyway
-	java-pkg_jar-from commons-lang-2.1,commons-net,commons-codec,lucene-2.3,jgoodies-looks-2.0,bsh,l2fprod-common,skinlf,stax
-
-	# Fails to create javadocs without this
-	mkdir "${S}/public" || die
-}
-
-src_compile() {
-	eant runtime-linux $(use_doc public-doc)
-}
-
-src_install() {
-	use source && java-pkg_dosrc src/*
-	use doc && java-pkg_dojavadoc doc
-	cd runtime/${PN}_linux || die
-
-	java-pkg_dojar ${PN}.jar
-	java-pkg_dojar "${S}"/lib/{TVAnytimeAPI.jar,commons-compress-20050911.jar,gdata-calendar-1.0.jar,gdata-client-1.0.jar,gdata-core-1.0.jar,xtvd-lib-2.0.jar,forms-1.2.0.jar,opencsv-1.8.jar}
-
-	local todir="${JAVA_PKG_SHAREPATH}"
-
-	cp -a imgs "${D}/${todir}" || die
-	cp -a icons "${D}/${todir}" || die
-	cp -a plugins "${D}/${todir}" || die
-	cp linux.properties "${D}/${todir}" || die
-
-	insinto "${todir}/themepacks"
-	doins themepacks/themepack.zip || die
-
-	if use themes; then
-		cd "${DISTDIR}"
-		doins midnightthemepack.zip \
-			roueBrownthemepack.zip \
-			roueBluethemepack.zip \
-			roueGreenthemepack.zip \
-			blueTurquesathemepack.zip \
-			gorillathemepack.zip \
-			BeOSthemepack.zip \
-			crystal2themepack.zip \
-			opusOSDeepthemepack.zip \
-			chaNinja-Bluethemepack.zip \
-			amarachthemepack.zip \
-			quickSilverRthemepack.zip \
-			gfxOasisthemepack.zip \
-			underlingthemepack.zip \
-			coronaHthemepack.zip \
-			cougarthemepack.zip \
-			royalInspiratthemepack.zip \
-			tigerthemepack.zip \
-			mmMagra-Xthemepack.zip \
-			iBarthemepack.zip \
-			solunaRthemepack.zip \
-			fatalEthemepack.zip \
-			blueMetalthemepack.zip \
-			b0sumithemepack.zip \
-			b0sumiErgothempack.zip \
-			oliveGreenLunaXPthemepack.zip \
-			silverLunaXPthemepack.zip \
-			architectBluethemepack.zip \
-			architectOlivethemepack.zip \
-			hmmXPBluethemepack.zip \
-			hmmXPMonoBluethemepack.zip \
-			tigerGraphitethemepack.zip \
-			opusOSBluethemepack.zip \
-			opusOSOlivethemepack.zip \
-			opusLunaSilverthemepack.zip || die
-		insinto "${todir}/icons"
-		doins CrystalClear.zip noia.zip nuvola.zip tulliana.zip || die
-	fi
-
-	java-pkg_dolauncher "tvbrowser" \
-		--main tvbrowser.TVBrowser \
-		--pwd ${todir} \
-		--java_args " -Dpropertiesfile=${todir}/linux.properties"
-
-	make_desktop_entry ${PN} "TV Browser" /usr/share/tvbrowser/imgs/tvbrowser128.png
-}
diff --git a/media-tv/tvbrowser/tvbrowser-3.1.ebuild b/media-tv/tvbrowser/tvbrowser-3.1.ebuild
new file mode 100644
index 000000000000..bcd5456dc4bf
--- /dev/null
+++ b/media-tv/tvbrowser/tvbrowser-3.1.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-3.1.ebuild,v 1.1 2012/02/07 23:09:36 johu Exp $ 
+
+JAVA_PKG_IUSE="doc source test"
+
+EAPI=4
+
+inherit eutils java-pkg-2 java-ant-2 flag-o-matic
+
+DESCRIPTION="Themeable and easy to use TV Guide - written in Java"
+HOMEPAGE="http://www.tvbrowser.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}_src.zip
+
+themes? (
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/BeOSthemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/amarachthemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/aquathemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/architectBluethemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/architectOlivethemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/b0sumiErgothempack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/b0sumithemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/bbjthemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/beigeazulthemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/beosthemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/blueMetalthemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/blueTurquesathemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/cellshadedthemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/chaNinja-Bluethemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/coronaHthemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/cougarthemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/crystal2themepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/fatalEthemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/gfxOasisthemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/gorillathemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/hmmXPBluethemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/hmmXPMonoBluethemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/iBarthemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/macosthemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/midnightthemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/mmMagra-Xthemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/modernthemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/oliveGreenLunaXPthemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/opusLunaSilverthemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/opusOSBluethemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/opusOSDeepthemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/opusOSOlivethemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/quickSilverRthemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/roueBluethemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/roueBrownthemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/roueGreenthemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/royalInspiratthemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/silverLunaXPthemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/solunaRthemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/tigerGraphitethemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/tigerthemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/toxicthemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/underlingthemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/whistlerthemepack.zip
+	http://javootoo.l2fprod.com/plaf/skinlf/themepacks/xplunathemepack.zip
+
+	http://tvbrowser.org/downloads/noia.zip
+	http://tvbrowser.org/downloads/nuvola.zip
+	http://tvbrowser.org/downloads/tulliana.zip
+	http://tvbrowser.org/downloads/tango_without_heart.zip
+)"
+
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+LICENSE="GPL-3"
+
+IUSE="themes"
+
+COMMON_DEP="dev-java/bsh
+	>=dev-java/commons-codec-1.4
+	>=dev-java/commons-lang-2.4
+	>=dev-java/commons-net-1.4.1
+	>=dev-java/jakarta-oro-2.0.8
+	>=dev-java/jgoodies-forms-1.3.0
+	>=dev-java/jgoodies-looks-2.3.1
+	dev-java/l2fprod-common
+	dev-java/log4j
+	dev-java/skinlf
+	>=dev-java/stax-1.2.0
+	dev-java/xalan
+	x11-libs/libXt
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXext
+	x11-libs/libXtst
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+"
+DEPEND="${COMMON_DEP}
+	app-arch/unzip
+	>=virtual/jdk-1.6
+	test? ( dev-java/junit:0 )
+"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.6
+"
+
+# javac errors about missing junit, lets investigate this later
+RESTRICT="test"
+
+src_prepare() {
+	sed "/unpacked.dir/d" -i build.xml || die
+
+	cd "${S}"/lib || die
+	rm -v bsh-*.jar commons-codec-*.jar commons-lang-*.jar commons-net*.jar \
+		l2fprod-common-tasks-7.3.jar skinlf-6.7.jar stax*.jar \
+		jgoodies-form*.jar jgoodies-looks*.jar || die
+
+	java-pkg_jar-from bsh,commons-codec,commons-lang-2.1,commons-net,jgoodies-forms,l2fprod-common,log4j,jgoodies-looks-2.0,skinlf,stax
+
+	mkdir "${S}/public" || die "failed javadoc dir"
+}
+
+src_compile() {
+	${ANT_OPTS} eant runtime-linux $(use_doc public-doc)
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	use source && java-pkg_dosrc src
+	use doc && java-pkg_dojavadoc doc
+
+	cd runtime/${PN}_linux || die
+
+	java-pkg_dojar ${PN}.jar
+	java-pkg_dojar "${S}"/lib/{guava-r09.jar,htmlparser-1.6.jar,jRegistryKey-1.4.5.jar,jgoodies-common-1.2.1.jar,opencsv-2.3.jar,substance-6.1.jar,texhyphj-1.1.jar,trident-1.3.jar}
+
+	local todir="${JAVA_PKG_SHAREPATH}"
+
+	cp -a imgs "${D}/${todir}" || die
+	cp -a icons "${D}/${todir}" || die
+	cp -a plugins "${D}/${todir}" || die
+	cp linux.properties "${D}/${todir}" || die
+
+	insinto "${todir}/themepacks"
+	doins themepacks/themepack.zip
+
+	if use themes; then
+		cd "${DISTDIR}"
+		doins BeOSthemepack.zip\
+			amarachthemepack.zip\
+			aquathemepack.zip\
+			architectBluethemepack.zip\
+			architectOlivethemepack.zip\
+			b0sumiErgothempack.zip\
+			b0sumithemepack.zip\
+			bbjthemepack.zip\
+			beigeazulthemepack.zip\
+			beosthemepack.zip\
+			blueMetalthemepack.zip\
+			blueTurquesathemepack.zip\
+			cellshadedthemepack.zip\
+			chaNinja-Bluethemepack.zip\
+			coronaHthemepack.zip\
+			cougarthemepack.zip\
+			crystal2themepack.zip\
+			fatalEthemepack.zip\
+			gfxOasisthemepack.zip\
+			gorillathemepack.zip\
+			hmmXPBluethemepack.zip\
+			hmmXPMonoBluethemepack.zip\
+			iBarthemepack.zip\
+			macosthemepack.zip\
+			midnightthemepack.zip\
+			mmMagra-Xthemepack.zip\
+			modernthemepack.zip\
+			oliveGreenLunaXPthemepack.zip\
+			opusLunaSilverthemepack.zip\
+			opusOSBluethemepack.zip\
+			opusOSDeepthemepack.zip\
+			opusOSOlivethemepack.zip\
+			quickSilverRthemepack.zip\
+			roueBluethemepack.zip\
+			roueBrownthemepack.zip\
+			roueGreenthemepack.zip\
+			royalInspiratthemepack.zip\
+			silverLunaXPthemepack.zip\
+			solunaRthemepack.zip\
+			tigerGraphitethemepack.zip\
+			tigerthemepack.zip\
+			toxicthemepack.zip\
+			underlingthemepack.zip\
+			whistlerthemepack.zip\
+			xplunathemepack.zip
+		insinto "${todir}/icons"
+		doins noia.zip nuvola.zip tulliana.zip tango_without_heart.zip
+	fi
+
+	java-pkg_dolauncher "tvbrowser" \
+		--main tvbrowser.TVBrowser \
+		--pwd ${todir} \
+		--java_args " -Dpropertiesfile=${todir}/linux.properties"
+
+	make_desktop_entry ${PN} "TV-Browser" /usr/share/tvbrowser/imgs/tvbrowser128.png
+}