From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1JH6dk-0005Te-Bv for garchives@archives.gentoo.org; Tue, 22 Jan 2008 00:05:20 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 89D3FE0651; Tue, 22 Jan 2008 00:05:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2CDF0E0651 for ; Tue, 22 Jan 2008 00:05:18 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 8DE6964EB4 for ; Tue, 22 Jan 2008 00:05:17 +0000 (UTC) Received: from caster by stork.gentoo.org with local (Exim 4.68) (envelope-from ) id 1JH6df-00088V-Pa for gentoo-commits@lists.gentoo.org; Tue, 22 Jan 2008 00:05:15 +0000 From: "Vlastimil Babka (caster)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, caster@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in media-tv/tvbrowser: ChangeLog tvbrowser-2.6.3.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog tvbrowser-2.6.3.ebuild X-VCS-Directories: media-tv/tvbrowser X-VCS-Committer: caster X-VCS-Committer-Name: Vlastimil Babka Content-Type: text/plain; charset=utf8 Message-Id: Sender: Vlastimil Babka Date: Tue, 22 Jan 2008 00:05:15 +0000 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: c6ceb950-087f-4707-823e-18affdc3f6bd X-Archives-Hash: f3068cae561c4f19a5aaf3a14b6165fe caster 08/01/22 00:05:15 Modified: ChangeLog Added: tvbrowser-2.6.3.ebuild Log: Version bump, bug #197703. Prevent absorbing dependencies in tvbrowser'= s jars. Use system skinlf again, remove some unneeded deps. (Portage version: 2.1.4) Revision Changes Path 1.27 media-tv/tvbrowser/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-tv/tvbrowser= /ChangeLog?rev=3D1.27&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-tv/tvbrowser= /ChangeLog?rev=3D1.27&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-tv/tvbrowser= /ChangeLog?r1=3D1.26&r2=3D1.27 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- ChangeLog 13 Jan 2008 21:19:35 -0000 1.26 +++ ChangeLog 22 Jan 2008 00:05:15 -0000 1.27 @@ -1,6 +1,12 @@ # ChangeLog for media-tv/tvbrowser # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.26 2= 008/01/13 21:19:35 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.27 2= 008/01/22 00:05:15 caster Exp $ + +*tvbrowser-2.6.3 (22 Jan 2008) + + 22 Jan 2008; Vlastimil Babka +tvbrowser-2.6.3.ebui= ld: + Version bump, bug #197703. Prevent absorbing dependencies in tvbrowser= 's + jars. Use system skinlf again, remove some unneeded deps. =20 13 Jan 2008; Joerg Bornkessel files/tvbrowser-2.6._Localizer.patch: 1.1 media-tv/tvbrowser/tvbrowser-2.6.3.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-tv/tvbrowser= /tvbrowser-2.6.3.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-tv/tvbrowser= /tvbrowser-2.6.3.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: tvbrowser-2.6.3.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-2.6.3.ebu= ild,v 1.1 2008/01/22 00:05:15 caster Exp $ JAVA_PKG_IUSE=3D"doc source" inherit eutils java-pkg-2 java-ant-2 autotools flag-o-matic DESCRIPTION=3D"Themeable and easy to use TV Guide - written in Java" HOMEPAGE=3D"http://www.tvbrowser.org/" SRC_URI=3D"mirror://sourceforge/${PN}/${P}-src.zip themes? ( http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/midnightthemep= ack.zip http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/roueBrowntheme= pack.zip http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/roueBluethemep= ack.zip http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/roueGreentheme= pack.zip http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/blueTurquesath= emepack.zip http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/gorillathemepa= ck.zip http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/BeOSthemepack.= zip http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/crystal2themep= ack.zip http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/opusOSDeepthem= epack.zip http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/chaNinja-Bluet= hemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/amarachthemepa= ck.zip http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/quickSilverRth= emepack.zip http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/gfxOasisthemep= ack.zip http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/underlingtheme= pack.zip http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/coronaHthemepa= ck.zip http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/cougarthemepac= k.zip http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/royalInspiratt= hemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/tigerthemepack= .zip http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/mmMagra-Xtheme= pack.zip http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/iBarthemepack.= zip http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/solunaRthemepa= ck.zip http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/fatalEthemepac= k.zip http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/blueMetaltheme= pack.zip http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/b0sumithemepac= k.zip http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/b0sumiErgothem= pack.zip http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/oliveGreenLuna= XPthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/silverLunaXPth= emepack.zip http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/architectBluet= hemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/architectOlive= themepack.zip http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/hmmXPBluetheme= pack.zip http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/hmmXPMonoBluet= hemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/tigerGraphitet= hemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/opusOSBluethem= epack.zip http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/opusOSOlivethe= mepack.zip http://javootoo.l2fprod.com/plaf/skinlf/t-packs/themepacks/opusLunaSilver= themepack.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=3D"0" KEYWORDS=3D"~x86 ~amd64" COMMON_DEP=3D"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/junit dev-java/commons-codec dev-java/commons-net >=3Ddev-java/jgoodies-forms-1.1.0 >=3Ddev-java/jgoodies-looks-2.0 dev-java/bsh dev-java/l2fprod-common >=3Ddev-java/jakarta-oro-2.0 dev-java/skinlf" DEPEND=3D">=3Dvirtual/jdk-1.5 app-arch/unzip ${COMMON_DEP}" RDEPEND=3D">=3Dvirtual/jre-1.5 ${COMMON_DEP}" LICENSE=3D"GPL-2" IUSE=3D"themes" src_unpack() { unpack ${P}-src.zip cd "${S}" epatch "${FILESDIR}/tvbrowser-2.5-makefiles.patch" # fix bug #170363 epatch "${FILESDIR}/tvbrowser-2.6._Localizer.patch" # now that's a rather nasty trick that removes exactly the lines that un= jar # 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 local J_ARCH case "${ARCH}" in x86) J_ARCH=3Di386 ;; amd64) J_ARCH=3Damd64 ;; *) die "not supported arch for this ebuild" ;; esac sed -i "${S}"/deployment/x11/src/Makefile.am \ -e "s:/lib/i386/:/lib/${J_ARCH}/:" || die # who knows what were those for rm -v "${S}"/tvdatakit/workspace/lib/*.jar || die cd "${S}"/lib || die rm -v junit.jar commons-net-1.4.1.jar forms-1.1.0.jar looks-2.1.4.jar \ bsh-2.0b4.jar l2fprod-common-tasks.jar jakarta-oro-2.0.8.jar skinlf.jar= \ commons-codec-1.3.jar || die # missing dependencies commons-compress, TVAnytimeAPI, jRegistryKey, gda= ta-calendar, gdata-client and jcom # 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 ex= ecuted on linux anyway java-pkg_jar-from junit,commons-codec,commons-net,jgoodies-forms,jgoodie= s-looks-2.0,bsh,l2fprod-common,skinlf # Fails to create javadocs without this mkdir "${S}/public" || die # fix bug #170364 cd "${S}/deployment/x11" chmod u+x configure rm src/libDesktopIndicator.so # converting to unix line-endings edos2unix missing depcomp eautoreconf } src_compile() { eant runtime-linux $(use_doc public-doc) # second part: DesktopIndicator cd "${S}/deployment/x11" append-flags -fPIC econf || die "econf failed" emake || die "emake failed" } 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.ja= r,gdata-calendar-1.0.jar,gdata-client-1.0.jar,gdata-core-1.0.jar} local todir=3D"${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_doso "${S}/deployment/x11/src/libDesktopIndicator.so" java-pkg_dolauncher "tvbrowser" \ --main tvbrowser.TVBrowser \ --pwd ${todir} \ --java_args " -Dpropertiesfile=3D${todir}/linux.properties" make_desktop_entry ${PN} "TV Browser" /usr/share/tvbrowser/imgs/tvbrowse= r128.png } --=20 gentoo-commits@lists.gentoo.org mailing list