From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RtpHy-0003EN-CO for garchives@archives.gentoo.org; Sat, 04 Feb 2012 23:45:02 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 15CF7E0022; Sat, 4 Feb 2012 23:44:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B5295E0022 for ; Sat, 4 Feb 2012 23:44:54 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7BFA91B4016 for ; Sat, 4 Feb 2012 23:44:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id C5AC180042 for ; Sat, 4 Feb 2012 23:44:52 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: Subject: [gentoo-commits] dev/johu:master commit in: media-tv/tvbrowser/ X-VCS-Repository: dev/johu X-VCS-Files: media-tv/tvbrowser/tvbrowser-3.1.ebuild media-tv/tvbrowser/tvbrowser-9999.ebuild X-VCS-Directories: media-tv/tvbrowser/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: d96367a7e18e1b695a9b8d681f7f9b56aeca46fe Date: Sat, 4 Feb 2012 23:44:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 652a4973-ca31-4976-917c-97245f4b20aa X-Archives-Hash: 939a998127999ec05f0cebb57f51cdb7 commit: d96367a7e18e1b695a9b8d681f7f9b56aeca46fe Author: Johannes Huber gentoo org> AuthorDate: Sat Feb 4 23:48:44 2012 +0000 Commit: Johannes Huber gentoo org> CommitDate: Sat Feb 4 23:48:44 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/johu.git;a=3Dc= ommit;h=3Dd96367a7 [media-tv/tvbrowser] EAPI 4, header up2date. (Portage version: 2.2.0_alpha84/git/Linux i686, unsigned Manifest commit) --- media-tv/tvbrowser/tvbrowser-3.1.ebuild | 133 +++++++++++++-----------= ----- media-tv/tvbrowser/tvbrowser-9999.ebuild | 114 +++++++++++++-----------= -- 2 files changed, 116 insertions(+), 131 deletions(-) diff --git a/media-tv/tvbrowser/tvbrowser-3.1.ebuild b/media-tv/tvbrowser= /tvbrowser-3.1.ebuild index 5989cea..48f723b 100644 --- a/media-tv/tvbrowser/tvbrowser-3.1.ebuild +++ b/media-tv/tvbrowser/tvbrowser-3.1.ebuild @@ -1,12 +1,10 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $=20 =20 -# TODO enable testing through FEATURES - JAVA_PKG_IUSE=3D"doc source" =20 -EAPI=3D"1" +EAPI=3D4 =20 inherit eutils java-pkg-2 java-ant-2 flag-o-matic =20 @@ -18,56 +16,56 @@ MY_P=3D${PN}_${PV} SRC_URI=3D"mirror://sourceforge/${PN}/${MY_P}_src.zip =20 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/architectBluethemepac= k.zip -http://javootoo.l2fprod.com/plaf/skinlf/themepacks/architectOlivethemepa= ck.zip -http://javootoo.l2fprod.com/plaf/skinlf/themepacks/b0sumiErgothempack.zi= p -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.zi= p -http://javootoo.l2fprod.com/plaf/skinlf/themepacks/beosthemepack.zip -http://javootoo.l2fprod.com/plaf/skinlf/themepacks/blueMetalthemepack.zi= p -http://javootoo.l2fprod.com/plaf/skinlf/themepacks/blueTurquesathemepack= .zip -http://javootoo.l2fprod.com/plaf/skinlf/themepacks/cellshadedthemepack.z= ip -http://javootoo.l2fprod.com/plaf/skinlf/themepacks/chaNinja-Bluethemepac= k.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.zi= p -http://javootoo.l2fprod.com/plaf/skinlf/themepacks/hmmXPMonoBluethemepac= k.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.zi= p -http://javootoo.l2fprod.com/plaf/skinlf/themepacks/modernthemepack.zip -http://javootoo.l2fprod.com/plaf/skinlf/themepacks/oliveGreenLunaXPtheme= pack.zip -http://javootoo.l2fprod.com/plaf/skinlf/themepacks/opusLunaSilverthemepa= ck.zip -http://javootoo.l2fprod.com/plaf/skinlf/themepacks/opusOSBluethemepack.z= ip -http://javootoo.l2fprod.com/plaf/skinlf/themepacks/opusOSDeepthemepack.z= ip -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.zi= p -http://javootoo.l2fprod.com/plaf/skinlf/themepacks/roueGreenthemepack.zi= p -http://javootoo.l2fprod.com/plaf/skinlf/themepacks/royalInspiratthemepac= k.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/tigerGraphitethemepac= k.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.zi= p -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 + 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/architectBluethemepa= ck.zip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/architectOlivethemep= ack.zip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/b0sumiErgothempack.z= ip + 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.z= ip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/beosthemepack.zip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/blueMetalthemepack.z= ip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/blueTurquesathemepac= k.zip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/cellshadedthemepack.= zip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/chaNinja-Bluethemepa= ck.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.zi= p + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/fatalEthemepack.zip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/gfxOasisthemepack.zi= p + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/gorillathemepack.zip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/hmmXPBluethemepack.z= ip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/hmmXPMonoBluethemepa= ck.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.zi= p + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/mmMagra-Xthemepack.z= ip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/modernthemepack.zip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/oliveGreenLunaXPthem= epack.zip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/opusLunaSilverthemep= ack.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/quickSilverRthemepac= k.zip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/roueBluethemepack.zi= p + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/roueBrownthemepack.z= ip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/roueGreenthemepack.z= ip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/royalInspiratthemepa= ck.zip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/silverLunaXPthemepac= k.zip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/solunaRthemepack.zip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/tigerGraphitethemepa= ck.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.z= ip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/whistlerthemepack.zi= p + 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 )" =20 SLOT=3D"0" @@ -76,16 +74,6 @@ LICENSE=3D"GPL-3" =20 IUSE=3D"themes" =20 -# - upstream uses stax-api-1.0.1/stax-1.2.0 .. using dev-java/stax-1.2.0 -# here (has stax-api/stax-dev) but seems ok -# - upstream uses dev-java/commons-lang-2.5 .. only 2.4 available here b= ut -# looks OK so far -# - upstream uses dev-java/commons-net-2.2 .. only 1.4.1 available here = but -# looks OK so far -# - upstream uses jgoodies-forms-1.4.0 .. only jgoodies-forms-1.3.0 here= , but -# looks OK so far -# - upstrean uses jgoodies-looks-2.4.0 .. only jgoodies-looks-2.3.1 here= , but=20 -# looks OK so far COMMON_DEP=3D"x11-libs/libXt x11-libs/libSM x11-libs/libICE @@ -105,7 +93,6 @@ COMMON_DEP=3D"x11-libs/libXt >=3Ddev-java/jgoodies-looks-2.3.1 dev-java/skinlf >=3Ddev-java/stax-1.2.0" -# TODO enable testing # test? ( dev-java/junit ) DEPEND=3D">=3Dvirtual/jdk-1.6 app-arch/unzip @@ -114,10 +101,8 @@ RDEPEND=3D">=3Dvirtual/jre-1.6 ${COMMON_DEP}" =20 S=3D"${WORKDIR}/${MY_P/_/-}" -src_unpack() { - unpack ${MY_P}_src.zip - cd "${S}" || die =20 +src_prepare() { # now that's a rather nasty trick that removes exactly the lines that u= njar # dependencies and include them to tvbrowser's jars # when bumping, check that it doesn't affect lines it shouldn't! @@ -132,8 +117,10 @@ src_unpack() { # TODO update this comment, it's not up to date # missing dependencies htmlparser jRegistryKey opencsv texhyphj # 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 e= xecuted on linux anyway + # 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 bsh,commons-codec,commons-lang-2.1,commons-net,jgoodi= es-forms,l2fprod-common,log4j,jgoodies-looks-2.0,skinlf,stax =20 # Fails to create javadocs without this @@ -165,7 +152,7 @@ src_install() { cp linux.properties "${D}/${todir}" || die =20 insinto "${todir}/themepacks" - doins themepacks/themepack.zip || die + doins themepacks/themepack.zip =20 if use themes; then cd "${DISTDIR}" @@ -213,9 +200,9 @@ src_install() { toxicthemepack.zip\ underlingthemepack.zip\ whistlerthemepack.zip\ - xplunathemepack.zip || die + xplunathemepack.zip insinto "${todir}/icons" - doins noia.zip nuvola.zip tulliana.zip tango_without_heart.zip || die + doins noia.zip nuvola.zip tulliana.zip tango_without_heart.zip fi =20 java-pkg_dolauncher "tvbrowser" \ diff --git a/media-tv/tvbrowser/tvbrowser-9999.ebuild b/media-tv/tvbrowse= r/tvbrowser-9999.ebuild index d0e9a51..692040d 100644 --- a/media-tv/tvbrowser/tvbrowser-9999.ebuild +++ b/media-tv/tvbrowser/tvbrowser-9999.ebuild @@ -1,66 +1,66 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ =20 JAVA_PKG_IUSE=3D"doc source" #WANT_ANT_TASKS=3D"ant-junit" =20 -EAPI=3D"1" +EAPI=3D4 =20 inherit eutils java-pkg-2 java-ant-2 flag-o-matic subversion =20 DESCRIPTION=3D"Themeable and easy to use TV Guide - written in Java" HOMEPAGE=3D"http://www.tvbrowser.org/" SRC_URI=3D"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/architectBluethemepac= k.zip -http://javootoo.l2fprod.com/plaf/skinlf/themepacks/architectOlivethemepa= ck.zip -http://javootoo.l2fprod.com/plaf/skinlf/themepacks/b0sumiErgothempack.zi= p -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.zi= p -http://javootoo.l2fprod.com/plaf/skinlf/themepacks/beosthemepack.zip -http://javootoo.l2fprod.com/plaf/skinlf/themepacks/blueMetalthemepack.zi= p -http://javootoo.l2fprod.com/plaf/skinlf/themepacks/blueTurquesathemepack= .zip -http://javootoo.l2fprod.com/plaf/skinlf/themepacks/cellshadedthemepack.z= ip -http://javootoo.l2fprod.com/plaf/skinlf/themepacks/chaNinja-Bluethemepac= k.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.zi= p -http://javootoo.l2fprod.com/plaf/skinlf/themepacks/hmmXPMonoBluethemepac= k.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.zi= p -http://javootoo.l2fprod.com/plaf/skinlf/themepacks/modernthemepack.zip -http://javootoo.l2fprod.com/plaf/skinlf/themepacks/oliveGreenLunaXPtheme= pack.zip -http://javootoo.l2fprod.com/plaf/skinlf/themepacks/opusLunaSilverthemepa= ck.zip -http://javootoo.l2fprod.com/plaf/skinlf/themepacks/opusOSBluethemepack.z= ip -http://javootoo.l2fprod.com/plaf/skinlf/themepacks/opusOSDeepthemepack.z= ip -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.zi= p -http://javootoo.l2fprod.com/plaf/skinlf/themepacks/roueGreenthemepack.zi= p -http://javootoo.l2fprod.com/plaf/skinlf/themepacks/royalInspiratthemepac= k.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/tigerGraphitethemepac= k.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.zi= p -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 + 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/architectBluethemepa= ck.zip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/architectOlivethemep= ack.zip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/b0sumiErgothempack.z= ip + 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.z= ip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/beosthemepack.zip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/blueMetalthemepack.z= ip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/blueTurquesathemepac= k.zip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/cellshadedthemepack.= zip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/chaNinja-Bluethemepa= ck.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.zi= p + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/fatalEthemepack.zip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/gfxOasisthemepack.zi= p + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/gorillathemepack.zip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/hmmXPBluethemepack.z= ip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/hmmXPMonoBluethemepa= ck.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.zi= p + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/mmMagra-Xthemepack.z= ip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/modernthemepack.zip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/oliveGreenLunaXPthem= epack.zip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/opusLunaSilverthemep= ack.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/quickSilverRthemepac= k.zip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/roueBluethemepack.zi= p + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/roueBrownthemepack.z= ip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/roueGreenthemepack.z= ip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/royalInspiratthemepa= ck.zip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/silverLunaXPthemepac= k.zip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/solunaRthemepack.zip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/tigerGraphitethemepa= ck.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.z= ip + http://javootoo.l2fprod.com/plaf/skinlf/themepacks/whistlerthemepack.zi= p + 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 )" =20 ESVN_REPO_URI=3D"https://tvbrowser.svn.sourceforge.net/svnroot/tvbrowser= /trunk/tvbrowser" @@ -102,9 +102,7 @@ LICENSE=3D"GPL-2" =20 IUSE=3D"themes" =20 -src_unpack() { - subversion_src_unpack - +src_prepare() { # now that's a rather nasty trick that removes exactly the lines that u= njar # dependencies and include them to tvbrowser's jars # when bumping, check that it doesn't affect lines it shouldn't! @@ -149,7 +147,7 @@ src_install() { cp linux.properties "${D}/${todir}" || die =20 insinto "${todir}/themepacks" - doins themepacks/themepack.zip || die + doins themepacks/themepack.zip =20 if use themes; then cd "${DISTDIR}" @@ -197,9 +195,9 @@ src_install() { toxicthemepack.zip\ underlingthemepack.zip\ whistlerthemepack.zip\ - xplunathemepack.zip || die + xplunathemepack.zip insinto "${todir}/icons" - doins noia.zip nuvola.zip tulliana.zip tango_without_heart.zip || die + doins noia.zip nuvola.zip tulliana.zip tango_without_heart.zip fi =20 java-pkg_dolauncher "tvbrowser" \ @@ -207,5 +205,5 @@ src_install() { --pwd ${todir} \ --java_args " -Dpropertiesfile=3D${todir}/linux.properties" =20 - make_desktop_entry ${PN} "TV Browser" /usr/share/tvbrowser/imgs/tvbrows= er128.png + make_desktop_entry ${PN} "TV-Browser" /usr/share/tvbrowser/imgs/tvbrows= er128.png }