From 626e36c56b5ffa2c25fffe85819ec50585dca788 Mon Sep 17 00:00:00 2001 From: "John Ratliff (jdratlif)" Date: Fri, 16 Apr 2010 15:22:32 +0000 Subject: media-tv/kmttg: Version bump for kmttg svn path=/sunrise/; revision=10461 --- media-tv/kmttg/ChangeLog | 4 ++++ media-tv/kmttg/Manifest | 8 +++---- media-tv/kmttg/files/kmttg-settings.patch | 35 ++++++++++++++-------------- media-tv/kmttg/kmttg-0.7g.ebuild | 38 ------------------------------- media-tv/kmttg/kmttg-0.7j.ebuild | 38 +++++++++++++++++++++++++++++++ 5 files changed, 64 insertions(+), 59 deletions(-) delete mode 100644 media-tv/kmttg/kmttg-0.7g.ebuild create mode 100644 media-tv/kmttg/kmttg-0.7j.ebuild (limited to 'media-tv') diff --git a/media-tv/kmttg/ChangeLog b/media-tv/kmttg/ChangeLog index 01f21c2e5..c336e52de 100644 --- a/media-tv/kmttg/ChangeLog +++ b/media-tv/kmttg/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 16 Apr 2010; John Ratliff (jdratlif) + -kmttg-0.7g.ebuild, +kmttg-0.7j.ebuild, files/kmttg-settings.patch: + Version bump for kmttg. + 07 Jan 2010; John Ratliff -kmttg-0.7e.ebuild, +kmttg-0.7g.ebuild: Version bump for kmttg diff --git a/media-tv/kmttg/Manifest b/media-tv/kmttg/Manifest index 7ec19ac6d..4b5062e06 100644 --- a/media-tv/kmttg/Manifest +++ b/media-tv/kmttg/Manifest @@ -1,5 +1,5 @@ -AUX kmttg-settings.patch 1787 RMD160 6e01bfc9614881e8c2601c7958004155e41dcd60 SHA1 9acd8e03c3563516881893fd9a0380c503e727fa SHA256 26dcb0b29bbb1a950e24dd36f0a39359d4052c5dbe91faaf18a1b3d2fd1b315e -DIST kmttg-0.7g.tar.bz2 1079399 RMD160 18c14e759610bdcb8e4759a5a1cb1319ccc4cccd SHA1 f010d46b9956116eebee18d64fab1e7a56e92169 SHA256 07f618a081dd6f9c1ac92e1f27226f5d820836fdc052be148c89c861e0d0d700 -EBUILD kmttg-0.7g.ebuild 885 RMD160 f510045564e5319779dfca6197f1977a2ed6dec6 SHA1 9800602f512243424d9e911c700440c3e46ab3a6 SHA256 0a0b00b66c55846dbaea75616a1b307d54634ef6e70f9565cd6c5d5ccfaaa0bc -MISC ChangeLog 779 RMD160 2bd1d52541e82dbfa2075798a951c7801b407d7e SHA1 ee94a753a4c158720e80642e316b797ceba22bb5 SHA256 df6830cb9f110039740c6f67af50bd936247a92debc6b76758117f6caf31fbe0 +AUX kmttg-settings.patch 1841 RMD160 eb2aab476c67e8257704101b8e77e4dfb2082284 SHA1 759d7a306b32fb2999447fbe1c5b908bbfd2b423 SHA256 933d7f712368ddf4a346a7e1c7562e820e7efab3062ff2b85e7ab9b7caa77b0f +DIST kmttg-0.7j.tar.bz2 1083647 RMD160 50d21eabd7a12d8621b17a0189aa4abb4e004f0d SHA1 dd705cabcd49cb84242b18d2f970dec91f65117c SHA256 edf4c93f673e7e84b2ff443993467d217efc7ae515b494647ebae5e2fc2d2d11 +EBUILD kmttg-0.7j.ebuild 885 RMD160 1cb6ce4ea7c99341c890f1aa8ae3ae4c3b997e3c SHA1 f9145a421e8161cf3cae9ba12fb24050609b72fa SHA256 74dd01bfe896b7ee89d9a11dff2d77b6316e93744451115b451e3cf43083a945 +MISC ChangeLog 943 RMD160 a4ec9d89b1926f860fe8e836a090b4bdd1bd4328 SHA1 e58b83b20382478d65d427127ca65fb738fba2d4 SHA256 deffae432a04f4b5e9c52416de0affd1d9356d58291417ebffb3ab8fa406ae15 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/media-tv/kmttg/files/kmttg-settings.patch b/media-tv/kmttg/files/kmttg-settings.patch index 681e2f435..6e01c4360 100644 --- a/media-tv/kmttg/files/kmttg-settings.patch +++ b/media-tv/kmttg/files/kmttg-settings.patch @@ -1,14 +1,17 @@ -diff -ur kmttg-0.6k-original/src/com/tivo/kmttg/main/config.java kmttg-0.6k/src/com/tivo/kmttg/main/config.java ---- kmttg-0.6k-original/src/com/tivo/kmttg/main/config.java 2009-09-04 02:32:36.000000000 -0400 -+++ kmttg-0.6k/src/com/tivo/kmttg/main/config.java 2009-09-06 01:22:33.005185340 -0400 -@@ -299,23 +299,30 @@ +diff -ur kmttg-0.7j_old/src/com/tivo/kmttg/main/config.java kmttg-0.7j/src/com/tivo/kmttg/main/config.java +--- kmttg-0.7j_old/src/com/tivo/kmttg/main/config.java 2010-03-29 14:30:14.000000000 -0400 ++++ kmttg-0.7j/src/com/tivo/kmttg/main/config.java 2010-04-16 01:13:16.415035507 -0400 +@@ -326,25 +326,23 @@ + if ( ! file.isDir(tmpDir) ) { + tmpDir = programDir; } - } - -+ // multi-user settings patch for SVN r497 +- } ++ } ++ ++ // multi-user settings patch for SVN r1020 + String settingsDir = System.getProperty("user.home") + s + ".kmttg"; + (new File(settingsDir)).mkdir(); -+ + // Try and get MAK from ~/.tivodecode_mak String result = getMakFromFile(); if (result != null) MAK = result; @@ -19,20 +22,18 @@ diff -ur kmttg-0.6k-original/src/com/tivo/kmttg/main/config.java kmttg-0.6k/src/ - autoLog = programDir + s + "auto.log"; - autoHistory = programDir + s + "auto.history"; - encProfDir = programDir + s + "encode"; +- +- // File to store/restore GUI settings +- gui_settings = programDir + s + ".kmttg_settings"; +- if (file.isDir(System.getProperty("user.home"))) { +- // Centralize this non-critical file instead of localizing it +- gui_settings = System.getProperty("user.home") + s + ".kmttg_settings"; +- } + configIni = settingsDir + s + "config.ini"; + autoIni = settingsDir + s + "auto.ini"; + autoLog = settingsDir + s + "auto.log"; + autoHistory = settingsDir + s + "auto.history"; + encProfDir = "/usr/share/kmttg/encode"; // gentoo ebuild hack!! - - // File to store/restore GUI settings -+ /* - gui_settings = programDir + s + ".kmttg_settings"; - if (file.isDir(System.getProperty("user.home"))) { - // Centralize this non-critical file instead of localizing it - gui_settings = System.getProperty("user.home") + s + ".kmttg_settings"; - } -+ */ + gui_settings = settingsDir + s + "kmttg_settings"; // Non-executable defaults diff --git a/media-tv/kmttg/kmttg-0.7g.ebuild b/media-tv/kmttg/kmttg-0.7g.ebuild deleted file mode 100644 index 9dc68b418..000000000 --- a/media-tv/kmttg/kmttg-0.7g.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" -JAVA_PKG_IUSE="source" - -inherit eutils java-pkg-2 java-ant-2 - -DESCRIPTION="A free multi-platform replacement for the TiVo Desktop software." -HOMEPAGE="http://code.google.com/p/kmttg/" -SRC_URI="http://omploader.org/vMzY3ZQ/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="encode" - -RDEPEND="encode? ( media-video/ffmpeg ) - media-video/tivodecode - net-misc/curl - >=virtual/jre-1.5" -DEPEND=">=virtual/jdk-1.5" - -src_prepare() { - java-pkg-2_src_prepare - epatch "${FILESDIR}/${PN}-settings.patch" -} - -src_install() { - java-pkg_dojar release/kmttg.jar - java-pkg_dolauncher kmttg --java_args "-Djava.net.preferIPv4Stack=true -Xmx256m" - - insinto /usr/share/${PN}/encode - doins release/encode/*.enc || die - - use source && java-pkg_dosrc src/com -} diff --git a/media-tv/kmttg/kmttg-0.7j.ebuild b/media-tv/kmttg/kmttg-0.7j.ebuild new file mode 100644 index 000000000..c89bd572b --- /dev/null +++ b/media-tv/kmttg/kmttg-0.7j.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" +JAVA_PKG_IUSE="source" + +inherit eutils java-pkg-2 java-ant-2 + +DESCRIPTION="A free multi-platform replacement for the TiVo Desktop software." +HOMEPAGE="http://code.google.com/p/kmttg/" +SRC_URI="http://omploader.org/vNDYxOQ/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="encode" + +RDEPEND="encode? ( media-video/ffmpeg ) + media-video/tivodecode + net-misc/curl + >=virtual/jre-1.5" +DEPEND=">=virtual/jdk-1.5" + +src_prepare() { + java-pkg-2_src_prepare + epatch "${FILESDIR}/${PN}-settings.patch" +} + +src_install() { + java-pkg_dojar release/kmttg.jar + java-pkg_dolauncher kmttg --java_args "-Djava.net.preferIPv4Stack=true -Xmx256m" + + insinto /usr/share/${PN}/encode + doins release/encode/*.enc || die + + use source && java-pkg_dosrc src/com +} -- cgit v1.2.3-65-gdbad