From: Patrice Clement Date: Tue, 24 Mar 2015 18:27:59 +0000 (+0000) Subject: Version bump. Fix bug 543272. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1c1a4fe06906ee6f54cea4ada75d774c3346a5bf;p=gentoo.git Version bump. Fix bug 543272. Signed-off-by: monsieurp@gentoo.org Package-Manager: portage-2.2.14/cvs/Linux i686 Manifest-Sign-Key: 0x93491BB8 --- diff --git a/media-tv/tvbrowser/ChangeLog b/media-tv/tvbrowser/ChangeLog index b8d05d91ed0f..facdc88fa8c4 100644 --- a/media-tv/tvbrowser/ChangeLog +++ b/media-tv/tvbrowser/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-tv/tvbrowser -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.42 2014/08/10 21:03:19 slyfox Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.43 2015/03/24 18:27:47 monsieurp Exp $ + +*tvbrowser-3.4.1.0 (24 Mar 2015) + + 24 Mar 2015; Patrice Clement + +files/3.4.1.0-build.xml.patch, +files/3.4.1.0-remove-registrykey.patch, + +tvbrowser-3.4.1.0.ebuild, tvbrowser-3.2.1-r1.ebuild, tvbrowser-3.4.ebuild: + Version bump. Fix bug 543272. 10 Aug 2014; Sergei Trofimovich tvbrowser-3.2.1-r1.ebuild, tvbrowser-3.4.ebuild: diff --git a/media-tv/tvbrowser/Manifest b/media-tv/tvbrowser/Manifest index a8d97b29d05d..7216c5c6431f 100644 --- a/media-tv/tvbrowser/Manifest +++ b/media-tv/tvbrowser/Manifest @@ -3,6 +3,8 @@ Hash: SHA256 AUX 3.4-build.xml.patch 6215 SHA256 ad594afa3e70a9fc33d0b3d04c93c0a0509badf9a30df65b2eca4fd905fb33e3 SHA512 5f6f5c3eac6e5d9953a2e05d8010f1815c3e7f907a777903e986f25509199bcd2764eb1a74dc63417ab961a658429ec393a092ccba4a9763a1fbe9e8a2d57baf WHIRLPOOL a1249e73b8bcc201a187a1cb9bc2e7325fb84dcc09f6c6d93e88d17e726dac3d420bc36457a9f267bd22cb1ab9031e91cc2a0b4cd7dbe321cccd586ee702c59c AUX 3.4-remove-registrykey.patch 7804 SHA256 b6994b0195e87019784017a6ce2f6f30d63b76b50b9a967b4fa8c06f63292a26 SHA512 ef8679879fb40134728df7874a6c5c2513b8db77171953d947211e64b1d9622e2268a2b8632654ae110f37e5169496aa1133c91eaab73e2fbf8a2e67fbff6825 WHIRLPOOL eaeb4493ea81e8232a966f085dae162085bb681b94d632ad0534b56143a6dda45f83d90a57b3ea0f34b0f92f446db9c06411f5bde9c615a923286f5632b5f9b7 +AUX 3.4.1.0-build.xml.patch 4723 SHA256 1f9d9f9f7f6b079b1e6c9fe05946b28a143963eaba113e50d1fda47d0a828dff SHA512 0954f2a1284e87b2115eb2889194c77702cb9d3426f3a3cf8661799a5e556b3c3b250e14c7365bcddde51d94cfc9dde0f9fbed1ca85c13b7d75a4d0b103985c6 WHIRLPOOL de7e7358ebd8af81bc28b0b63578be13212be0f6a20dad0008bc70744e7c0d6cc34964bd6272fe507b3db3331a97191466c21ea5e195a3677e47abe76e108b41 +AUX 3.4.1.0-remove-registrykey.patch 7364 SHA256 c7e082a01dd3893075a43c7d20bc456b741dc295dcc468063dc5c0917bf9cab8 SHA512 cb9807818a3019fe4579bbcea6bdcc9a1fd230452cb3b0521bc29d3b35c36f7522efdf50b057e8d377ece5201f9035537e0cd39c7ebb992d8cfa8af6d8ad3a53 WHIRLPOOL 1caa949d1d81fa9686f4df13f20f57efd025f828cf79798156942ebdab3163fd4a3437f8465a771d346e2b821a08e965b62e703dfcf4d91c8f6c1df729ffe10d AUX tvbrowser-3.2.1-build.xml 18963 SHA256 4aec3da44baf4828e1a80bffdfe9bf8d0893d0706679c9efac6ddbe38d80e2ba SHA512 ca689670b19f0d7daf469fef6e12df760a077e3d8fd2d3b638659f30769e5d18d8fa4157b72203a70101bbeb1a9815c6289c5611b556c2543217b42390e31d60 WHIRLPOOL 9dae92cdcc0fcd5da270b184d7b9b001c711ebf6ff27e2b7e170236f10a254bd92c9d4d58816841599abbfb7ed6edbafa5d55c1f6fc7b02223830fa0d40093bd DIST BeOSthemepack.zip 39412 SHA256 ec2acb46a77f38a9750ede23ab573b2c2773bedd37fa1ac7bbaa0bdc74982574 SHA512 479d9180cf8678cb555a86ecc80d19f0f615f7c2f5807acf550d117cfda44155ca80315f51f67c17799b71f9768e9988919d23bfd38abce0887195f30ecb97c3 WHIRLPOOL 430f961de95389f7b503da63fdb01881dad4a54f4799d99917336eff0b167f11b7d6287bc10618292255a93665e498b04d57e6e40526b8688bd3e09f94ea6959 DIST amarachthemepack.zip 53700 SHA256 80bbe3df2c3e44f26bb390994e271264bcc71ff581527039bf677fa38df4a547 SHA512 da0a082dea2abccec47137ef1db54a57b1becfbf0fc1b99fe41c0f60c254f1963dfde032bd622d034a3abde4ead1c2aa00f3ea2d872859ad384168ebe8fd1c52 WHIRLPOOL d748b611c12a3dcfb148282cad27626c802f70b260ac20397548625c3803e821ba0fb0d0a0157c53d72462dc8179d03cecc701c22b72da5130690ff42f1db1e1 @@ -51,18 +53,24 @@ DIST tigerthemepack.zip 77856 SHA256 55002367d55ffe7953e5e059d9357ce6d9111bbba30 DIST toxicthemepack.zip 68233 SHA256 a3d6c2311f8a35381c8aa3ac9b7bead5ba81b00a47d4e4bd27b5e38de6322600 SHA512 350f091bd67b2c78a4c69936bce9d7f922c1b57f3711f173d4763856a6f60ba0f284a3cb63fbfe810381d6ea6d21afe14fec13fb6e2efb526c28d1d79501bf02 WHIRLPOOL 3b0bb5d288714014d6635cb6fe86fdb284d80698f95eb750c7fbd86b7de611f08fc59a7d656e1ed5a64b15e8e11401e24af0dcda3d53de14af2368085de04007 DIST tulliana.zip 258520 SHA256 d9a7670c3933757f58bc6913433b6f00e984c0cbff17eaf59076d951ac195a88 SHA512 96ae1835892763e70dd02b2739837063a57318b32a106556415037e8e0688db4d8caa9e7c50495ad6dbfc6ed9499b08af10956c164f5435bde2942b90ddb291a WHIRLPOOL 57e2052bca12b0fcb7eb889d6b51d775d74a6f4cd3cd1b638ffd06fb74a3336e26a7c6626ddcbcd204342d1c7f71614cdc8247a4aa245f17eef9997075be5135 DIST tvbrowser_3.2.1_src.zip 17580308 SHA256 21edb1920d0603465caaa970c879b3fb19b56e485053555e54c694c80e8b2c8f SHA512 7ad27e0f0a3471fa9c1a7ceaba8896079295b3bbc757dc56f93391bb34a8802220cc4269776d1a18330e53482bc1255d1467d68a63ef2c42596af60d52983bbe WHIRLPOOL 0cb639119e88dec53484d562d6f68f0bfdd43c30f5b90a5b636f6702e1b8949c753f0df7e8f79f228163395901df30da9edac2b7c3c193af487b19f04ae43cb5 +DIST tvbrowser_3.4.1.0_src.zip 14256785 SHA256 e9079d4bb8a2b823770c3590662fa5bf9575b3ab7985201faa17dba01130248d SHA512 ec95898449209863ecb800db8395436be8946c30947ef25075caebe03db27c0393451a25f123d99b5d1ed82638920fa5102d4c1b16ddfdd9fd316f19de75d07a WHIRLPOOL aea5673ef79c0d962e01176ad59fa5174529d87db9efed044c85400df6d6897ce4053a0514e03e1a4bf01dac63a76d62206c0cbd4fec3dddb7b1dc4228fca6db DIST tvbrowser_3.4_src.zip 13991299 SHA256 841065b189c027074e94a44df4bd3e9e87a4bc5b21e73245715255dd68876bc9 SHA512 9bd3e510805714bde1474fbb2e76353d801962f309933d666ad489fd5d6a50c5dfbeb4a8a037a253153fd89172bb89ad0b008418b4cac837d04c16012e909ef9 WHIRLPOOL 87e1d4c60501cc63db9cebc9ffcb35abdb689c0fa6006eae8bb2b32e4f840cb84820b6d65168935be974c1b9799ad7ba56835d185bdea635c643c8e54ea0a405 DIST underlingthemepack.zip 59786 SHA256 67dfd8757162dce375e02c250403a7184b64fbd1c1eb754a11373467ff96eb44 SHA512 d123c6ddb8db820a6d825e36433d31505b88e5e5578d0e368d639c3817893e9300d85bcd7a16a7a7329e962bf87919fad250d87e3759ceb32db6ffc1d6290c0a WHIRLPOOL 15bcccc7704389dfdde629dee895ecb37ac56ae89680b3e8629fd8539fef0a0c9218cdfa4969b2a1b8c841e4b3b5f0164e6cec395f43ab9c3c409ba5bc6b4f8c DIST whistlerthemepack.zip 32206 SHA256 0d8e5fab4cc148d35610f11061ddc7cd8eb23116919d99c8c673c1956ae6711e SHA512 1d9969fa436b7065db57f06ccd6ffb6b3c395a3ca4f976b9eb69445de9f63bfb55755e832269b3192365b5c30fb953998ca95d2b16e7c8bd06d78d8a42703a3c WHIRLPOOL 2724a0d005876a976a701c69509b701957edabd919b6e3d1a2cdfce1827a9a198de64a3f402af79004dee5db212f3732dde4e799d3e5016bcc95f993c18be362 DIST xplunathemepack.zip 63343 SHA256 c8a2328597e0b05866919a2c925baf39dad294d1feade9d28cf4cf01722b95ee SHA512 79698db5fc4dfdcf85d96f595227679c4bc593d7f8e89923a3af0243ebeb0cb0a101bc48821f37f736298406c564f0332ab7eed5748a4efb092acd95827b4a06 WHIRLPOOL 784531315de55bb917b9451b0c9dd84f8a6a297594f8742743ed64a3702d9833c83104b422874c972e1d92b8a971ddaf2ac4bd8670054e40c2c908a8eb2bbe72 -EBUILD tvbrowser-3.2.1-r1.ebuild 4827 SHA256 c4f7b8f21408065ad9f913acf4faaf086013091aa9e5330a5e224438f4095bec SHA512 4092f2c257bc70f67097fdda32640e9d5a1e886738da47ec47fcab89068d99687b0416e3ccdd7c7c63f90a55a6e79f32093f7e5103e20ee056666930cc648c04 WHIRLPOOL 57699bff2d1b2861f4a79d417e95f0135a8fbd202ccbabe4fe7f0c25852c57f6597c428747e61617f689ae696f349df0cb9d6f8fd145f34dd7509bdf603b7201 -EBUILD tvbrowser-3.4.ebuild 2397 SHA256 4d768cc7a2c1d3354ca34fb9b452cbbf01ca8e9532ea46f1301f80fb76f42e6d SHA512 48d0f55fd849e6ead2ab57c65dcec7df36cbf2a1af9f0cdd648cecf414858deb65470e14aae5eae374f50bcb5d2c6a82753723dda7639f29ae418f297827378f WHIRLPOOL a6ea27af876fc8ad8d3d4c321e5feeea52cbb5732d156bc5e426ba62f9420b298c3156b4cf514ef2a54df96710cd7fa68e2b2bba90e53a2e6a812480a7e404d9 -MISC ChangeLog 9040 SHA256 68806fb7c0144a4b793d69c79318f0a9a37d9541abf40e8ee54a59420bc45a63 SHA512 88d3cd1648f81df84b71e26bc1bda1bf6a5e14faf404e66286a140dcea616983b99ef8433ea2e7c9f49fdf34f424e0d268ca284a73e21740f9129a486a2aaddf WHIRLPOOL ede4472e7203a60b0d6bdd3e2e6be2d31b9fa127450937d8e29d84398754fc9e2479775af3a2c12748e6034bf3ad1466d308f3b1f7e493e46f2fd938603d6dcd +EBUILD tvbrowser-3.2.1-r1.ebuild 4830 SHA256 c64680050ae310af637e2ba73fd1c075e53dd1e55a405347849296daa2d5797f SHA512 bcf5eca8160434709aa14cd5bcd6fbc8a22bf4cc4183acd751098f98fb29d8deb947cf193066fe644087c4e36cbb60e870df6e4ec0868e4ce79d7cb09a6dee0a WHIRLPOOL 7f627a4fce575291a800ffe85b26f66c9fbed62cefd710486deb74d450057c36ceb3438a4a103c5a3b82a4a52c0be4f077ae117447eb9cbfc8767a4c3560d2d9 +EBUILD tvbrowser-3.4.1.0.ebuild 2449 SHA256 525e3ccbcc340a4a0b9265c0ef9fb905ef0734d9a83fd86ca1b338e144835df9 SHA512 2d61a9ec13319dc9682d964083b0118d8f4a5253d0189a096cacc4717c2f5a79c2d909746aad89f4bdab36440fcadd410379ae3a3e1a8b45cb16635907798a57 WHIRLPOOL 5a83e669b97d963be14283c853e0c9a9eb7e4743ac7adf286f4affb7b08669cac169aabc4da8f0bc09d9a43e4ba24e5438834f059b560b487f10c9bee93f153b +EBUILD tvbrowser-3.4.ebuild 2400 SHA256 02cf981cdec5dedeb301105b83efe472da9cd8f7baf9ce4a923d72569f4271d9 SHA512 59bfd149aa4b634bb2a49aad31d437bff5b72fb1c84cf291b49e640d272bfe2448a110f50b3902218ccca9a7aee94d409e1543688a2b042b92620ac503bc1c28 WHIRLPOOL 28c288150986ad0e60ce2e9d740b30c7cf52e776d0f25f830386102c5e53cac126edc3527816b754be47031128995ed08161e806f0d4b03f8f47fce449141ee2 +MISC ChangeLog 9317 SHA256 4e4444056da0fd1256e650e3e2b81ec5b150681d10996dd4490fc8968a6c68e0 SHA512 4b66aebdfcb5d6b122f8c1576eca88b48ae75e111cf0a715dba2e1ca6ff38fdc247d073d665af8d3a8039ae8a310a7098030968052a2445f8e168169d7deecd0 WHIRLPOOL ba395b0e721c417ebe74f7cd9d6ab6e594dbf9acaac4bf857cce695a686e4e0b29fc217f5d6ddd6c5b4567da3b340c01d51f13b5049814ca33b267637e29b190 MISC metadata.xml 331 SHA256 b83ec9363b78ed1ef4a32b5574eda0010c788c5279a99ccf9195a54ee00ca144 SHA512 aa0f19787bb49ef1de1cdae1796d3eaa2aef0a04ffe41d73efb4e07aea07747f65e6aee5c3e73196b30ebf03349c864db8dd67979ccd5b7aeb8a9cd4d521b6b6 WHIRLPOOL b16fe04a90df7e0b0c0e406bca63370f2c16057904bd75e8ed47d6164d9cfabfff66f0c9507256f1b9376614e2a9ab2f3a3d1e636fc801105c0f0bc84afd1770 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlPn3hcACgkQcaHudmEf86q9oQCeP8cr9lpR2ZDf1DjWgN4a22ES -6hEAn1o7EsOHBMpgYuoY63/loBPd4ObU -=bZpq +iQEcBAEBCAAGBQJVEay5AAoJEJGRpfGTSRu4YXkIALI1WUCcMlaOA+4/7c+glhNW +gJGwbDv6lUUdX5DTN33+7flDXuVYn32V+q38Z1RZNuBGN/PSLr3ZchwueMK3qKxd +cb9tiSeo90HZdRHLShLhJsJqTzwxia6P5k6Q861mCUEf2Up0Z3x0AKzrLdhHCHwz +ET+B4tfy6r5yg2CIiH+cMEFqQf9rG4V7Qnzw3k7bCNgqYCBIPJjvRXvGlHWwOzEh +8RnUmKFxDikcfKMUfNy7kkdO1N8v2Kycgz+vUWUO3vz7Y8DHBZ9FsyrTnEkwveJz +VgdrdgP6sl0P5R4JOfM40kVIYNaCzoTGuq3fKwdcBukWI9jwBrpsqXhtajCshyw= +=YroL -----END PGP SIGNATURE----- diff --git a/media-tv/tvbrowser/files/3.4.1.0-build.xml.patch b/media-tv/tvbrowser/files/3.4.1.0-build.xml.patch new file mode 100644 index 000000000000..570bff32db76 --- /dev/null +++ b/media-tv/tvbrowser/files/3.4.1.0-build.xml.patch @@ -0,0 +1,109 @@ +--- build.xml.orig 2015-03-24 17:34:18.753531031 +0000 ++++ build.xml 2015-03-24 17:38:48.013509290 +0000 +@@ -105,32 +105,6 @@ + | Task definitions + | + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + ++ + + + + + ++ + + + +@@ -431,7 +409,9 @@ + + + ++ + + + +@@ -555,6 +535,7 @@ + + + ++ + + + +@@ -752,6 +734,7 @@ + + + ++ + + + diff --git a/media-tv/tvbrowser/files/3.4.1.0-remove-registrykey.patch b/media-tv/tvbrowser/files/3.4.1.0-remove-registrykey.patch new file mode 100644 index 000000000000..2c52ddada29a --- /dev/null +++ b/media-tv/tvbrowser/files/3.4.1.0-remove-registrykey.patch @@ -0,0 +1,150 @@ +--- src/tvbrowser/TVBrowser.java.orig 2015-03-24 17:41:56.811494046 +0000 ++++ src/tvbrowser/TVBrowser.java 2015-03-24 17:43:30.625486471 +0000 +@@ -113,9 +113,6 @@ + import util.ui.UIThreadRunner; + import util.ui.UiUtilities; + import util.ui.textcomponentpopup.TextComponentPopupEventQueue; +-import ca.beq.util.win32.registry.RegistryKey; +-import ca.beq.util.win32.registry.RegistryValue; +-import ca.beq.util.win32.registry.RootKey; + + import com.jgoodies.looks.LookUtils; + import com.l2fprod.gui.plaf.skin.SkinLookAndFeel; +@@ -567,77 +564,6 @@ + public void run() { + ChannelList.completeChannelLoading(); + initializeAutomaticDownload(); +- if (Launch.isOsWindowsNtBranch()) { +- try { +- RegistryKey desktopSettings = new RegistryKey( +- RootKey.HKEY_CURRENT_USER, "Control Panel\\Desktop"); +- RegistryValue autoEnd = desktopSettings +- .getValue("AutoEndTasks"); +- +- if (autoEnd.getData().equals("1")) { +- RegistryValue killWait = desktopSettings +- .getValue("WaitToKillAppTimeout"); +- +- int i = Integer.parseInt(killWait.getData().toString()); +- +- if (i < 5000) { +- JOptionPane pane = new JOptionPane(); +- +- String cancel = mLocalizer.msg("registryCancel", +- "Close TV-Browser"); +- String dontDoIt = mLocalizer.msg("registryJumpOver", +- "Not this time"); +- +- pane.setOptions(new String[] { +- Localizer.getLocalization(Localizer.I18N_OK), dontDoIt, +- cancel }); +- pane.setOptionType(JOptionPane.YES_NO_CANCEL_OPTION); +- pane.setMessageType(JOptionPane.WARNING_MESSAGE); +- pane +- .setMessage(mLocalizer +- .msg( +- "registryWarning", +- "The fast shutdown of Windows is activated.\nThe timeout to wait for before Windows is closing an application is too short,\nto give TV-Browser enough time to save all settings.\n\nThe setting hasn't the default value. It was changed by a tool or by you.\nTV-Browser will now try to change the timeout.\n\nIf you don't want to change this timeout select 'Not this time' or 'Close TV-Browser'.")); +- +- pane.setInitialValue(mLocalizer.msg("registryCancel", +- "Close TV-Browser")); +- +- JDialog d = pane.createDialog(UiUtilities +- .getLastModalChildOf(mainFrame), UIManager +- .getString("OptionPane.messageDialogTitle")); +- d.setModal(true); +- UiUtilities.centerAndShow(d); +- +- if (pane.getValue() == null +- || pane.getValue().equals(cancel)) { +- mainFrame.quit(); +- } else if (!pane.getValue().equals(dontDoIt)) { +- try { +- killWait.setData("5000"); +- desktopSettings.setValue(killWait); +- JOptionPane +- .showMessageDialog( +- UiUtilities.getLastModalChildOf(mainFrame), +- mLocalizer +- .msg("registryChanged", +- "The timeout was changed successfully.\nPlease reboot Windows!")); +- } catch (Exception registySetting) { +- JOptionPane +- .showMessageDialog( +- UiUtilities.getLastModalChildOf(mainFrame), +- mLocalizer +- .msg( +- "registryNotChanged", +- "The Registry value couldn't be changed. Maybe you haven't the right to do it.
If it is so contact you Administrator and let him do it for you.

The following description is for experts. If you change or delete the wrong value in the Registry you could destroy your Windows installation.

To get no warning on TV-Browser start the Registry value WaitToKillAppTimeout in the Registry path
HKEY_CURRENT_USER\\Control Panel\\Desktop have to be at least 5000 or the value for AutoEndTasks in the same path have to be 0."), +- Localizer.getLocalization(Localizer.I18N_ERROR), +- JOptionPane.ERROR_MESSAGE); +- } +- } +- } +- } +- } catch (Throwable registry) { +- } +- } + + if (currentVersion != null + && currentVersion.compareTo(new Version(2, 71, false)) < 0) { +--- src/tvbrowser/ui/settings/StartupSettingsTab.java.orig 2015-03-24 17:51:54.418445794 +0000 ++++ src/tvbrowser/ui/settings/StartupSettingsTab.java 2015-03-24 17:52:23.370443456 +0000 +@@ -50,8 +50,6 @@ + import tvbrowser.ui.mainframe.PeriodItem; + import util.ui.Localizer; + import util.ui.UiUtilities; +-import ca.beq.util.win32.registry.RegistryKey; +-import ca.beq.util.win32.registry.RootKey; + + import com.jgoodies.forms.builder.PanelBuilder; + import com.jgoodies.forms.factories.Borders; +@@ -163,41 +161,6 @@ + .getBoolean()); + mSettingsPn.add(mShowStartScreenChB, cc.xy(2, ++y)); + +- if (System.getProperty("os.name").toLowerCase().startsWith("windows") && !TVBrowser.isTransportable()) { +- layout.insertRow(++y, RowSpec.decode("1dlu")); +- layout.insertRow(++y, RowSpec.decode("pref")); +- +- try { +- RegistryKey shellFolders = new RegistryKey(RootKey.HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders"); +- String path = shellFolders.getValue("Startup").getData().toString(); +- +- if(path == null || path.length() < 1 || !(new File(path)).isDirectory()) { +- throw new Exception(); +- } +- +- mLinkFileFile = new File(path,"TV-Browser.url"); +- +- try { +- mLinkFile = new LinkFile(mLinkFileFile); +- +- if(mLinkFileFile.isFile()) { +- try { +- if (!mLinkFile.hasTarget((new File("tvbrowser.exe")).getAbsoluteFile())) { +- createLink(mLinkFile); +- } +- }catch(Exception linkException) { +- mLinkFileFile.delete(); +- } +- } +- }catch(FileNotFoundException fe) {} +- +- mAutostartWithWindows = new JCheckBox(mLocalizer.msg("autostart","Start TV-Browser with Windows"), +- mLinkFileFile.isFile()); +- +- mSettingsPn.add(mAutostartWithWindows, cc.xy(2, y)); +- } catch (Throwable e) {e.printStackTrace();} +- } +- + y++; + + mSettingsPn.add(createRefreshPanel(), cc.xyw(1,++y,5)); +@@ -513,4 +476,4 @@ + return new File(mTarget).equals(file); + } + } +-} +\ No newline at end of file ++} diff --git a/media-tv/tvbrowser/tvbrowser-3.2.1-r1.ebuild b/media-tv/tvbrowser/tvbrowser-3.2.1-r1.ebuild index f266216ac4b2..eb6e1c8b14f5 100644 --- a/media-tv/tvbrowser/tvbrowser-3.2.1-r1.ebuild +++ b/media-tv/tvbrowser/tvbrowser-3.2.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-3.2.1-r1.ebuild,v 1.2 2014/08/10 21:03:19 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-3.2.1-r1.ebuild,v 1.3 2015/03/24 18:27:47 monsieurp Exp $ EAPI="5" diff --git a/media-tv/tvbrowser/tvbrowser-3.4.1.0.ebuild b/media-tv/tvbrowser/tvbrowser-3.4.1.0.ebuild new file mode 100644 index 000000000000..4a4b5dfcd0b5 --- /dev/null +++ b/media-tv/tvbrowser/tvbrowser-3.4.1.0.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-3.4.1.0.ebuild,v 1.1 2015/03/24 18:27:47 monsieurp Exp $ + +EAPI="5" + +JAVA_PKG_IUSE="doc source test" + +inherit java-pkg-2 java-ant-2 + +DESCRIPTION="Themeable and easy to use TV Guide - written in Java" +HOMEPAGE="http://www.tvbrowser.org/" +SRC_URI="mirror://sourceforge/${PN}/${P/-/_}_src.zip" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +LICENSE="GPL-3" +IUSE="" + +COMMON_DEP="dev-java/bsh:0 + dev-java/commons-codec:0 + dev-java/commons-lang:3.1 + dev-java/commons-net:0 + dev-java/jakarta-oro:2.0 + dev-java/jgoodies-common:1.8 + dev-java/jgoodies-forms:1.8 + dev-java/jgoodies-looks:2.6 + dev-java/l2fprod-common:0 + dev-java/htmlparser-org:0 + dev-java/log4j:0 + dev-java/skinlf:0 + dev-java/stax:0 + dev-java/xalan:0 + dev-java/opencsv:0 + dev-java/texhyphj:0 + dev-java/trident:0 + 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" +RDEPEND="${COMMON_DEP} + >=virtual/jre-1.6" + +java_prepare() { + epatch "${FILESDIR}"/${PV}-*.patch + #epatch "${FILESDIR}"/${PV}-build.xml.patch + + rm -v lib/{bsh-,commons,jgoodies,l2fprod-common-tasks,skinlf,stax,htmlparser,opencsv,trident,texhyphj,jRegistryKey}*.jar + + find deployment -name '*.jar' -delete || die + find . -name '*.class' -delete || die +} + +JAVA_ANT_REWRITE_CLASSPATH="true" +EANT_GENTOO_CLASSPATH="bsh + commons-codec + commons-lang-3.1 + jgoodies-common-1.8 + jgoodies-forms-1.8 + jgoodies-looks-2.6 + l2fprod-common + skinlf + htmlparser-org + opencsv + texhyphj" +EANT_BUILD_TARGET="runtime-linux" +EANT_DOC_TARGET="public-doc" + +src_install() { + java-pkg_dojar runtime/${PN}_linux/${PN}.jar + java-pkg_dojar lib/substance-6.1.jar + java-pkg_register-dependency trident,opencsv + + insinto /usr/share/${PN} + doins -r runtime/${PN}_linux/{imgs,icons,plugins,infothemes} + doins runtime/${PN}_linux/linux.properties + + insinto /usr/share/${PN}/themepacks + doins themepacks/themepack.zip + + java-pkg_dolauncher "tvbrowser" \ + --main tvbrowser.TVBrowser \ + --pwd /usr/share/${PN} \ + --java_args " -Dpropertiesfile=/usr/share/${PN}/linux.properties" + + make_desktop_entry ${PN} "TV-Browser" \ + /usr/share/tvbrowser/imgs/tvbrowser128.png "AudioVideo;TV;Video" + + use source && java-pkg_dosrc src/* + use doc && java-pkg_dojavadoc doc +} diff --git a/media-tv/tvbrowser/tvbrowser-3.4.ebuild b/media-tv/tvbrowser/tvbrowser-3.4.ebuild index bb0ee87993ed..56ab3197c0ad 100644 --- a/media-tv/tvbrowser/tvbrowser-3.4.ebuild +++ b/media-tv/tvbrowser/tvbrowser-3.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-3.4.ebuild,v 1.2 2014/08/10 21:03:19 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-3.4.ebuild,v 1.3 2015/03/24 18:27:47 monsieurp Exp $ EAPI="5"