Revision bump. EAPI 5. Use virtualx for tests. Slotted all dependencies; added swt and test? ( dev-java/ant-junit:0 ) dependency, the latter fixes tests together with setting the test classpath. Renamed src_prepare to java_prepare such that the preparation from the Java eclasses runs. Dropped dependency on class files from build.xml as well as parts that are unnecessary for Linux packaging, including fetching of dependencies. Made use of EANT_GENTOO_CLASSPATH and EANT_TEST_GENTOO_CLASSPATH and build.xml rewriting to simplify java_prepare. Replaced src_compile by EANT_BUILD_TARGET and EANT_DOC_TARGET. Reordered and shortened src_install, moved categories from sed to make_desktop_entry call. Sorted variables. Removed redundancy. Fixing up of dependencies fixes bug #480652 filed by Heiko Baums and Nils Kneuper. Removal of dependency fetching from build.xml fixes bug #451788 filed by Diego Elio Pettenò (flameeyes). Next steps should be unbundling as well as bumping more dependencies (filed bug #480922 for this purpose), perhaps best done as part of the next version bump.

(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

3 files changed, 671 insertions, 2 deletions

diff --git a/media-tv/tvbrowser/ChangeLog b/media-tv/tvbrowser/ChangeLog
index 902b271030d5..53399ea370ca 100644
--- a/media-tv/tvbrowser/ChangeLog
+++ b/media-tv/tvbrowser/ChangeLog
@@ -1,6 +1,26 @@
 # 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.36 2012/11/12 21:38:13 johu Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.37 2013/08/13 20:58:08 tomwij Exp $
+
+*tvbrowser-3.2.1-r1 (13 Aug 2013)
+
+  13 Aug 2013; Tom Wijsman <TomWij@gentoo.org> +files/tvbrowser-3.2.1-build.xml,
+  +tvbrowser-3.2.1-r1.ebuild, metadata.xml:
+  Revision bump. EAPI 5. Use virtualx for tests. Slotted all dependencies; added
+  swt and test? ( dev-java/ant-junit:0 ) dependency, the latter fixes tests
+  together with setting the test classpath. Renamed src_prepare to java_prepare
+  such that the preparation from the Java eclasses runs. Dropped dependency on
+  class files from build.xml as well as parts that are unnecessary for Linux
+  packaging, including fetching of dependencies. Made use of
+  EANT_GENTOO_CLASSPATH and EANT_TEST_GENTOO_CLASSPATH and build.xml rewriting
+  to simplify java_prepare. Replaced src_compile by EANT_BUILD_TARGET and
+  EANT_DOC_TARGET. Reordered and shortened src_install, moved categories from
+  sed to make_desktop_entry call. Sorted variables. Removed redundancy. Fixing
+  up of dependencies fixes bug #480652 filed by Heiko Baums and Nils Kneuper.
+  Removal of dependency fetching from build.xml fixes bug #451788 filed by Diego
+  Elio Pettenò (flameeyes). Next steps should be unbundling as well as bumping
+  more dependencies (filed bug #480922 for this purpose), perhaps best done as
+  part of the next version bump.
 
 *tvbrowser-3.2.1 (12 Nov 2012)
 
diff --git a/media-tv/tvbrowser/files/tvbrowser-3.2.1-build.xml b/media-tv/tvbrowser/files/tvbrowser-3.2.1-build.xml
new file mode 100644
index 000000000000..a26bcc4d69ed
--- /dev/null
+++ b/media-tv/tvbrowser/files/tvbrowser-3.2.1-build.xml
@@ -0,0 +1,480 @@
+<?xml version="1.0"?>

+<!--

+ | Ant build script for the TV-Browser project.

+ |

+ | TV-Browser

+ | Copyright (C) 04-2003 Martin Oberhauser (martin@tvbrowser.org)

+ |

+ | This program is free software; you can redistribute it and/or

+ | modify it under the terms of the GNU General Public License

+ | as published by the Free Software Foundation; either version 2

+ | of the License, or (at your option) any later version.

+ |

+ | This program 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 for more details.

+ |

+ | You should have received a copy of the GNU General Public License

+ | along with this program; if not, write to the Free Software

+ | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

+ |

+ | CVS information:

+ |  $RCSfile: tvbrowser-3.2.1-build.xml,v $

+ |   $Source: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/files/tvbrowser-3.2.1-build.xml,v $

+ |     $Date: 2013/08/13 20:58:08 $

+ |   $Author: tomwij $

+ | $Revision: 1.1 $

+ |

+ | Author: Til Schneider, www.murfman.de

+ | 

+ | Modified by Gentoo Developers for Gentoo Linux packaging purposes.

+ +-->

+<project name="TV-Browser" default="targets" basedir=".">

+

+

+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

+  |

+  |  The properties and paths

+  |

+   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->

+

+  <property environment="env"/>

+  <property file="build.properties"/>

+  <property name="programname" value="TV-Browser"/>

+  <property name="programname.file" value="tvbrowser"/>

+  <property name="classes.dir" value="classes"/>

+  <property name="lib.dir" value="lib"/>

+  <property name="txt.dir" value="txt"/>

+  <property name="src.dir" value="src"/>

+  <property name="test.src.dir" value="test/src"/>

+  <property name="test.classes.dir" value="test/classes"/>

+  <property name="doc.dir" value="doc"/>

+  <property name="doc.header" value="${programname} ${tvbrowser.version} API"/>

+  <property name="doc.title" value="API documentation for ${programname} ${tvbrowser.version}"/>

+  <property name="doc.bottom" value="${programname} ${tvbrowser.version}, Copyright (C) 2004-2008 TV-Browser Team (dev@tvbrowser.org)"/>

+

+  <property name="runtime.dir" value="runtime"/>

+  <property name="tvbrowser-default.runtime.dir" value="${runtime.dir}/tvbrowser_default"/>

+

+  <property name="tvbrowser-win.runtime.dir" value="${runtime.dir}/tvbrowser_win"/>

+  <property name="tvbrowser-linux.runtime.dir" value="${runtime.dir}/tvbrowser_linux"/>

+  <property name="tvbrowser-transportable.runtime.dir" value="${runtime.dir}/tvbrowser_transportable"/>

+  <property name="tvbrowser-nightly.runtime.dir" value="${runtime.dir}/tvbrowser_nightly"/>

+  <property name="tvbrowser-mac.runtime.dir" value="${runtime.dir}/tvbrowser_mac"/>

+  <property name="themepacks.dir" value="themepacks"/>

+  <property name="personas.dir" value="personas"/>

+

+  <property name="deployment.dir" value="deployment" />

+  <property name="win.dir" value="${deployment.dir}/win"/>

+  <property name="linux.dir" value="${deployment.dir}/linux"/>

+  <property name="x11.dir" value="${deployment.dir}/x11"/>

+  <property name="installer.dir" value="${win.dir}/installer"/>

+  <property name="package-lists.dir" value="${txt.dir}/package-lists"/>

+  <property name="public.dir" value="public"/>

+

+  <path id="sourcepath">

+    <pathelement location="${src.dir}"/>

+  </path>

+

+  <path id="classpath">

+    <pathelement location="${classes.dir}"/>

+    <fileset dir="${lib.dir}">

+      <include name="*.jar"/>

+      <exclude name="ant.jar"/>

+    </fileset>

+  </path>

+

+  <path id="docpath">

+    <path refid="sourcepath"/>

+  </path>

+

+  <path id="ant-deb.classpath">

+	 <fileset dir="${deployment.dir}/linux/ant-deb-task" includes="*.jar"/>

+  </path>

+	

+  <path id="ant-rpm.classpath">

+	 <fileset dir="${deployment.dir}/linux/redline-rpm" includes="*.jar"/>

+  </path>

+

+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

+|

+|  Display all targets

+|

+- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->

+

+  <target name="targets" description="lists all the available public targets">

+    <echo message="usage: build [target]"/>

+    <echo message=""/>

+    <echo message="main targets:"/>

+    <echo message="============="/>

+    <echo message="  targets               Shows this list of targets."/>

+    <echo message="  dump-info             Dumps some information (VM-Version...)."/>

+    <echo message="  public-default        Creates platform-independent binaries"/>

+  	<echo message="  public-linux          Creates binaries for Linux platforms"/>

+  	<echo message="  public-nightly        Creates platform-independent binaries for nightly transportable version of TV-Browser (without platform dependent starters)"/>

+    <echo message="  public-src            Creates a .zip file containing the full source code of TV-Browser"/>

+    <echo message="  public-doc            Generates the JavaDoc documentation."/>

+  	<echo message="  release-packages      Generates all packages needed for a TV-Browser release (without Mac version, works only under Windows)."/>

+    <echo message=""/>

+    <echo message="further targets:"/>

+    <echo message="================"/>

+    <echo message="  clean                 Deletes all class files, runtime directories and temporary files."/>

+    <echo message="  clean-runtime         Deletes the runtime directory."/>

+    <echo message="  make-default          Compiles the platform independent source code."/>

+    <echo message="  make-linux            Compiles the source code for linux platforms."/>

+    <echo message="  runtime-default       Creates the platform independent runtime directory" />

+    <echo message="  runtime-linux         Creates a runtime directory for linux platforms" />

+    <echo message="  test                  Runs the JUnit tests."/>

+  </target>

+

+

+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

+   |

+   |  Clean tasks: remove files

+   |

+    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->

+

+

+  <!-- Deletes the runtime director -->

+  <target name="clean">

+    <delete dir="${classes.dir}"/>

+    <delete dir="${test.classes.dir}"/>

+  </target>

+

+

+  <!-- Deletes the classes and the runtime directory. -->

+  <target name="clean-default" depends="clean">

+    <delete dir="${tvbrowser-default.runtime.dir}"/>

+  </target>

+

+  <!-- Deletes the classes and the runtime directory. -->

+  <target name="clean-transportable" depends="clean">

+	<delete dir="${tvbrowser-transportable.runtime.dir}"/>

+  </target>

+

+  <!-- Deletes the classes and the runtime directory. -->

+  <target name="clean-win" depends="clean">

+    <delete dir="${tvbrowser-win.runtime.dir}"/>

+  </target>

+

+  <!-- Deletes the classes and the runtime directory. -->

+  <target name="clean-linux" depends="clean">

+    <delete dir="${tvbrowser-linux.runtime.dir}"/>

+  </target>

+

+  <!-- Deletes the classes and the runtime directory. -->

+  <target name="clean-mac" depends="clean">

+    <delete dir="${tvbrowser-mac.runtime.dir}"/>

+  </target>

+

+  <target name="clean-all" depends="clean-mac, clean-linux, clean-win, clean-default">

+    <delete dir="${public.dir}"/>

+  </target>

+

+

+

+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

+|

+|  Make tasks: compile the source code

+|

+- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->

+  <target name="copy-resources">

+    <copy todir="${classes.dir}">

+      <fileset dir="${src.dir}" includes="**/*.gif"/>

+      <fileset dir="${src.dir}" includes="**/*.jpg"/>

+      <fileset dir="${src.dir}" includes="**/*.png"/>

+      <fileset dir="${src.dir}" includes="**/*.dtd"/>

+      <fileset dir="${src.dir}" includes="**/*.properties"/>

+      <fileset dir="${src.dir}" includes="**/*.theme"/>

+      <fileset dir="${src.dir}" includes="**/*.csv"/>

+    </copy>

+  </target>

+

+  <!-- Compiles the platform independent source code -->

+  <target name="make-default" depends="copy-resources">

+    <echo message="Compiling the source code ... "/>

+    <mkdir dir="${classes.dir}"/>

+    <javac destdir="${classes.dir}" debug="${debug}" deprecation="true" encoding="UTF-8" target="1.6" source="1.6">

+      <src>

+        <path refid="sourcepath"/>

+      </src>

+      <classpath>

+        <path refid="classpath"/>

+      </classpath>

+      <exclude name="**/macosx/*"/>

+    </javac>

+

+

+  </target>

+

+

+  <!-- Compiles the source code for windows platforms -->

+  <target name="make-win" depends="make-default">

+

+  </target>

+

+

+  <!-- Compiles the source code for linux platforms -->

+  <target name="make-linux" depends="make-default">

+

+  </target>

+	

+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

+   |

+   |  Runtime tasks: create runtime folders for the specified platform

+   |

+    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->

+

+  <target name="mkdirs">

+    <!-- Make the TV-Browser runtime -->

+    <delete dir="${tvbrowser-default.runtime.dir}"/>

+    <mkdir dir="${tvbrowser-default.runtime.dir}"/>

+		<mkdir dir="${tvbrowser-default.runtime.dir}/plugins"/>  	

+  </target>

+	

+  <!-- Creates the platform independent runtime folder -->

+  <target name="runtime" depends="clean-default, make-default, mkdirs">

+    <echo message="Creating the jars ..."/>

+

+    <!-- Pack the tvbrowser.jar -->

+    <jar jarfile="${tvbrowser-default.runtime.dir}/tvbrowser.jar"

+         compress="true"

+         index="true">

+      <manifest>

+        <attribute name="Main-Class" value="tvbrowser.TVBrowser"/>

+      	<attribute name="SplashScreen-Image" value="splash.png"/>

+      </manifest>

+      <fileset dir="${classes.dir}" includes="tvbrowser/**"/>

+      <fileset dir="${classes.dir}" includes="devplugin/**"/>

+      <fileset dir="${classes.dir}" includes="tvdataservice/**"/>

+      <fileset dir="${classes.dir}" includes="util/**"/>

+      <fileset dir="${classes.dir}" includes="com/**"/>

+      <fileset dir="${classes.dir}/imgs" includes="splash.png"/>

+    </jar>

+

+    <!-- Copy the other stuff -->

+    <echo message="Copying the images and all the other stuff ..."/>

+    <mkdir dir="${tvbrowser-default.runtime.dir}/imgs"/>

+    <copy todir="${tvbrowser-default.runtime.dir}/imgs">

+      <fileset dir="${classes.dir}/imgs" excludes="splash.png"/>

+    </copy>

+

+    <copy todir="${tvbrowser-default.runtime.dir}/imgs">

+	    <fileset dir="./images/additional">

+		    <include name="*.ico"/>

+	    </fileset>

+    </copy>

+  	

+  	<mkdir dir="${tvbrowser-default.runtime.dir}/personas"/>

+    <copy todir="${tvbrowser-default.runtime.dir}/personas">

+	    <fileset dir="./personas"/>

+	</copy>

+    <copy todir="${tvbrowser-default.runtime.dir}">

+      <fileset dir="${txt.dir}" includes="LICENSE.txt"/>

+      <fileset dir="${txt.dir}" includes="COPYRIGHT.txt"/>

+      <fileset dir="${deployment.dir}/common" includes="**" />

+      <!--    <fileset dir="${txt.dir}" includes="website.url"/>          -->

+      <!--    <fileset dir="${txt.dir}" includes="default.properties"/>   -->

+      <!--    <fileset dir="${txt.dir}" includes="osx.properties"/>       -->

+      <!--    <fileset dir="${txt.dir}" includes="windows.properties"/>   -->

+      <!--    <fileset dir="${txt.dir}" includes="tvbrowser.sh"/>         -->

+    </copy>

+

+    <!-- Themepacks -->

+    <mkdir dir="${tvbrowser-default.runtime.dir}/themepacks"/>

+    <copy todir="${tvbrowser-default.runtime.dir}/themepacks">

+      <fileset dir="themepacks"/>

+    </copy>

+

+    <!-- Icon-Themes -->

+    <mkdir dir="${tvbrowser-default.runtime.dir}/icons"/>

+

+  	<zip destfile="${tvbrowser-default.runtime.dir}/icons/Tango.zip">

+  		<zipfileset dir="images/themes/tango"></zipfileset>

+  	</zip>

+  	<zip destfile="${tvbrowser-default.runtime.dir}/icons/CrystalClear.zip">

+  		<zipfileset dir="images/themes/CrystalClear"></zipfileset>

+  	</zip>

+  </target>

+

+

+  <!-- Creates the default runtime folder (platform independent) -->

+  <target name="runtime-default" depends="clean-default, make-default, runtime, test">

+  </target>

+

+  <!-- Creates the runtime folder for linux platforms -->

+  <target name="runtime-linux" depends="clean-linux, make-linux, runtime">

+    <delete dir="${tvbrowser-linux.runtime.dir}"/>

+    <mkdir dir="${tvbrowser-linux.runtime.dir}"/>

+    <copy todir="${tvbrowser-linux.runtime.dir}">

+      <fileset dir="${tvbrowser-default.runtime.dir}"/>

+      <fileset dir="${deployment.dir}" includes="linux.properties"/>

+      <fileset dir="${linux.dir}" includes="tvbrowser.sh"/>

+     <!-- <fileset dir="${linux.dir}" includes="tvbrowser.desktop"/>-->

+    </copy>

+   	<chmod perm="u+x" file="${tvbrowser-linux.runtime.dir}/tvbrowser.sh"/>

+  </target>

+

+  <target name="release-packages" depends="public-linux, public-default, public-doc, public-src"/>

+

+  <!-- Creates the release binaries (.zip) for the platform independent TV-Browser version -->

+  <target name="public-default" depends="runtime-default" description="creates platform-independent binaries">

+    <mkdir dir="${public.dir}"/>

+

+    <zip destfile="${public.dir}/tvbrowser_${tvbrowser.version}_bin.zip">

+      <zipfileset prefix="tvbrowser-${tvbrowser.version}"

+                  dir="${tvbrowser-default.runtime.dir}"/>

+    </zip>

+  </target>

+

+  <target name="clean-public">

+  	<delete>

+  		<fileset dir="${public.dir}" includes="**/*"/>

+  	</delete>

+  </target>

+	

+  <target name="public-nightly" depends="clean-public" description="Creates platform-independent binaries for nightly transportable version of TV-Browser (without platform dependent starters)">

+  	<mkdir dir="${public.dir}"/>

+

+    <tstamp>

+      <format property="TODAY" pattern="yyyy-MM-dd"/>

+    </tstamp>

+

+  	<echo file="${tvbrowser-transportable.runtime.dir}/NIGHTLY_VALUES" append="false">${TODAY}-nightly</echo>

+

+	<zip destfile="${public.dir}/tvbrowser_${tvbrowser.version}_${TODAY}_nightly_bin_transportable.zip">

+		<zipfileset prefix="tvbrowser-nightly-transportable" dir="${tvbrowser-transportable.runtime.dir}"/>

+	</zip>

+

+  </target>

+

+  <!-- Creates the release binaries (.tar.gz) for linux platforms -->

+  <target name="public-linux" depends="runtime-linux" description="Creates binaries for Linux platforms">

+    <mkdir dir="${public.dir}"/>

+

+    <tar tarfile="${public.dir}/tvbrowser_${tvbrowser.version}_bin.tar.gz" compression="gzip">

+      <tarfileset dir="${tvbrowser-linux.runtime.dir}" prefix="tvbrowser-${tvbrowser.version}" excludes="**/tvbrowser.sh"/>

+   	  <tarfileset dir="${tvbrowser-linux.runtime.dir}"

+    	              prefix="tvbrowser-${tvbrowser.version}"

+				 mode="755" includes="**/tvbrowser.sh" />

+    </tar>

+

+  </target>

+

+  <!--

+    | Does the JUnit tests.

+    |

+    | If this target does not work, copy the file "junit.jar" from the directory "lib"

+    | in your ANT_HOME/lib directory. (ANT_HOME/lib is on my machine "/usr/share/ant/lib")

+    +-->

+  <target name="test" depends="make-default">

+	<echo>${ant.version}. JUnit4 tests will only work with Ant>=1.7</echo>

+  	<mkdir dir="${test.classes.dir}"/>

+    <javac destdir="${test.classes.dir}" debug="${debug}" deprecation="true" encoding="UTF-8" target="1.5" source="1.5">

+      <src>

+        <path path="${test.src.dir}"/>

+      </src>

+      <classpath>

+        <path refid="classpath"/>

+      </classpath>

+    </javac>

+

+    <copy todir="${test.classes.dir}">

+      <fileset dir="${test.src.dir}" includes="**/*.gif"/>

+      <fileset dir="${test.src.dir}" includes="**/*.jpg"/>

+      <fileset dir="${test.src.dir}" includes="**/*.png"/>

+      <fileset dir="${test.src.dir}" includes="**/*.dtd"/>

+      <fileset dir="${test.src.dir}" includes="**/*.properties"/>

+      <fileset dir="${test.src.dir}" includes="**/*.theme"/>

+      <fileset dir="${test.src.dir}" includes="**/*.txt"/>

+    </copy>

+

+

+    <junit haltonfailure="yes" fork="no" >

+      <classpath>

+        <path refid="classpath"/>

+        <path path="${test.classes.dir}"/>

+      </classpath>

+

+      <formatter type="brief" usefile="false"/>

+

+      <batchtest>

+        <fileset dir="${test.src.dir}">

+          <include name="**/*Test.java"/>

+        </fileset>

+      </batchtest>

+    </junit>

+  </target>

+

+

+  <!--

+  | Generates the JavaDoc documentation.

+  +-->

+  <target name="public-doc" description="Generates the JavaDoc documentation">

+    <echo message="Generating JavaDoc documentation ..." />

+    <delete dir="${doc.dir}"/>

+    <mkdir dir="${doc.dir}"/>

+    <javadoc packagenames="*"

+             sourcepathref="docpath"

+             classpathref="classpath"

+             destdir="${doc.dir}"

+             doctitle="${doc.title}"

+             windowtitle="${doc.title}"

+             additionalparam="-breakiterator"

+             header="${doc.header}"

+             bottom="${doc.bottom}"

+             access="package"

+             failonerror="true"

+    		 encoding="UTF-8"

+    	     charset="UTF-8" 

+  	         docencoding="UTF-8">

+      <link offline="true"

+            href="${java-api-location}"

+            packagelistLoc="${package-lists.dir}/jdk/"/>

+    </javadoc>

+

+

+    <zip destfile="${public.dir}/tvbrowser_${tvbrowser.version}_doc.zip">

+      <zipfileset prefix="tvbrowser_v${tvbrowser.version}/doc"

+                  dir="${doc.dir}"/>

+    </zip>

+

+  </target>

+

+  <!--

+   | Dump some information.

+   +-->

+  <target name="dump-info">

+    <echo message="JAVA_HOME=${env.JAVA_HOME}" />

+    <echo message="java.vm.info=${java.vm.info}" />

+    <echo message="java.vm.name=${java.vm.name}" />

+    <echo message="java.vm.vendor=${java.vm.vendor}" />

+    <echo message="java.vm.version=${java.vm.version}" />

+    <echo message="os.arch=${os.arch}" />

+    <echo message="os.name=${os.name}" />

+    <echo message="os.version=${os.version}" />

+    <echo message="file.encoding=${file.encoding}" />

+    <echo message="user.language=${user.language}" />

+  </target>

+

+

+

+

+  <target name="public-src" description="Creates a .zip file containing the full source code of TV-Browser">

+    <mkdir dir="${public.dir}"/>

+    <zip destfile="${public.dir}/tvbrowser_${tvbrowser.version}_src.zip">

+      <zipfileset prefix="tvbrowser-${tvbrowser.version}"

+                  dir=".">

+

+        <exclude name="${classes.dir}/**" />

+        <exclude name="${public.dir}/**" />

+        <exclude name="${runtime.dir}/**" />

+

+      </zipfileset>

+    </zip>

+  </target>

+

+	<target name="public-tvdatakit"></target>

+

+</project>

diff --git a/media-tv/tvbrowser/tvbrowser-3.2.1-r1.ebuild b/media-tv/tvbrowser/tvbrowser-3.2.1-r1.ebuild
new file mode 100644
index 000000000000..f86889e56d46
--- /dev/null
+++ b/media-tv/tvbrowser/tvbrowser-3.2.1-r1.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2013 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.1 2013/08/13 20:58:08 tomwij Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 flag-o-matic virtualx
+
+tp_base="http://javootoo.l2fprod.com/plaf/skinlf/themepacks"
+tvp_base="http://tvbrowser.org/downloads"
+
+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? (
+	${tp_base}/BeOSthemepack.zip
+	${tp_base}/amarachthemepack.zip
+	${tp_base}/aquathemepack.zip
+	${tp_base}/architectBluethemepack.zip
+	${tp_base}/architectOlivethemepack.zip
+	${tp_base}/b0sumiErgothempack.zip
+	${tp_base}/b0sumithemepack.zip
+	${tp_base}/bbjthemepack.zip
+	${tp_base}/beigeazulthemepack.zip
+	${tp_base}/beosthemepack.zip
+	${tp_base}/blueMetalthemepack.zip
+	${tp_base}/blueTurquesathemepack.zip
+	${tp_base}/cellshadedthemepack.zip
+	${tp_base}/chaNinja-Bluethemepack.zip
+	${tp_base}/coronaHthemepack.zip
+	${tp_base}/cougarthemepack.zip
+	${tp_base}/crystal2themepack.zip
+	${tp_base}/fatalEthemepack.zip
+	${tp_base}/gfxOasisthemepack.zip
+	${tp_base}/gorillathemepack.zip
+	${tp_base}/hmmXPBluethemepack.zip
+	${tp_base}/hmmXPMonoBluethemepack.zip
+	${tp_base}/iBarthemepack.zip
+	${tp_base}/macosthemepack.zip
+	${tp_base}/midnightthemepack.zip
+	${tp_base}/mmMagra-Xthemepack.zip
+	${tp_base}/modernthemepack.zip
+	${tp_base}/oliveGreenLunaXPthemepack.zip
+	${tp_base}/opusLunaSilverthemepack.zip
+	${tp_base}/opusOSBluethemepack.zip
+	${tp_base}/opusOSDeepthemepack.zip
+	${tp_base}/opusOSOlivethemepack.zip
+	${tp_base}/quickSilverRthemepack.zip
+	${tp_base}/roueBluethemepack.zip
+	${tp_base}/roueBrownthemepack.zip
+	${tp_base}/roueGreenthemepack.zip
+	${tp_base}/royalInspiratthemepack.zip
+	${tp_base}/silverLunaXPthemepack.zip
+	${tp_base}/solunaRthemepack.zip
+	${tp_base}/tigerGraphitethemepack.zip
+	${tp_base}/tigerthemepack.zip
+	${tp_base}/toxicthemepack.zip
+	${tp_base}/underlingthemepack.zip
+	${tp_base}/whistlerthemepack.zip
+	${tp_base}/xplunathemepack.zip
+
+	${tvp_base}/noia.zip
+	${tvp_base}/nuvola.zip
+	${tvp_base}/tulliana.zip
+	${tvp_base}/tango_without_heart.zip
+)"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-3"
+
+IUSE="themes"
+
+COMMON_DEP="dev-java/bsh:0
+	dev-java/commons-codec:0
+	dev-java/commons-lang:2.1
+	dev-java/commons-net:0
+	dev-java/jakarta-oro:2.0
+	dev-java/jgoodies-forms:0
+	dev-java/jgoodies-looks:2.0
+	dev-java/l2fprod-common:0
+	dev-java/log4j:0
+	dev-java/skinlf:0
+	dev-java/stax:0
+	dev-java/swt:4.2
+	dev-java/xalan:0
+	x11-libs/libXt:0
+	x11-libs/libSM:0
+	x11-libs/libICE:0
+	x11-libs/libXext:0
+	x11-libs/libXtst:0
+	x11-libs/libX11:0
+	x11-libs/libXau:0
+	x11-libs/libXdmcp:0
+"
+
+DEPEND="${COMMON_DEP}
+	app-arch/unzip:0
+	>=virtual/jdk-1.6
+	test? ( dev-java/junit:0 dev-java/ant-junit:0 )
+"
+
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.6
+"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die "Failed to replace build.xml."
+
+	local error="Failed to unbundle or remove libraries or classes."
+	pushd lib > /dev/null
+		rm -v bsh-*.jar commons*.jar jgoodies*.jar l2fprod-common-tasks*.jar \
+			skinlf*.jar stax*.jar || die ${error}
+	popd > /dev/null
+
+	find deployment -name '*.jar' -exec rm -v {} \; || die ${error}
+	find . -name '*.class' -exec rm -v {} \; || die ${error}
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="bsh,commons-codec,commons-lang-2.1,jgoodies-forms,jgoodies-looks-2.0,l2fprod-common,skinlf"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},ant-junit,junit"
+
+EANT_BUILD_TARGET="runtime-linux"
+EANT_DOC_TARGET="public-doc"
+
+src_test() {
+	VIRTUALX_COMMAND="java-pkg-2_src_test" virtualmake
+}
+
+src_install() {
+	pushd runtime/${PN}_linux > /dev/null
+		java-pkg_dojar ${PN}.jar
+
+		local todir="${JAVA_PKG_SHAREPATH}"
+
+		cp -a {imgs,icons,plugins} "${D}/${todir}" || die "Failed to copy directories."
+		cp linux.properties "${D}/${todir}" || die "Failed to copy linux.properties."
+
+		insinto "${todir}/themepacks"
+		doins themepacks/themepack.zip
+
+		if use themes ; then
+			pushd "${DISTDIR}" > /dev/null
+				doins *pack.zip
+
+				insinto "${todir}/icons"
+				doins noia.zip nuvola.zip tulliana.zip tango_without_heart.zip
+			popd > /dev/null
+		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 "AudioVideo;TV;Video"
+	popd > /dev/null
+
+	java-pkg_dojar lib/{htmlparser-1.6.jar,jRegistryKey-1.4.5.jar,opencsv-2.3.jar}
+	java-pkg_dojar lib/{quaqua-7.3.4.jar,substance-6.1.jar,texhyphj-1.1.jar,trident-1.3.jar}
+
+	use source && java-pkg_dosrc src
+	use doc && java-pkg_dojavadoc doc
+}