Ebuild cleanup.

Package-Manager: portage-2.1.2.2

diff --git a/media-tv/tvbrowser/ChangeLog b/media-tv/tvbrowser/ChangeLog
index 6982e601da7af9085076a62b2bd4aa69b50276e2..44f4580f1d210819bbb7e0c140dcf6dd534e105c 100644 (file)
--- a/media-tv/tvbrowser/ChangeLog
+++ b/media-tv/tvbrowser/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-tv/tvbrowser
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.12 2007/03/27 13:46:50 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.13 2007/03/27 19:20:51 betelgeuse Exp $
+
+  27 Mar 2007; Petteri Räty <betelgeuse@gentoo.org> tvbrowser-2.5.2.ebuild:
+  Ebuild cleanup.
 
 *tvbrowser-2.5.2 (27 Mar 2007)
 

diff --git a/media-tv/tvbrowser/Manifest b/media-tv/tvbrowser/Manifest
index 1fe8939a4ebed1c45f286c0cc7420bfa949f6d56..cfc674edeb32e23d7dbe96a841708df9ed5eb0ef 100644 (file)
--- a/media-tv/tvbrowser/Manifest
+++ b/media-tv/tvbrowser/Manifest
@@ -50,18 +50,18 @@ EBUILD tvbrowser-2.5-r1.ebuild 3458 RMD160 878d3d0b015711d358e5af61fed86a1fd87f7
 MD5 ef7313a5be60b01fd2ddffbc102c4081 tvbrowser-2.5-r1.ebuild 3458
 RMD160 878d3d0b015711d358e5af61fed86a1fd87f7777 tvbrowser-2.5-r1.ebuild 3458
 SHA256 a0bbf99459751560f42b3d556a05f67669ca0c10adf72859b5446a4b7689c281 tvbrowser-2.5-r1.ebuild 3458
-EBUILD tvbrowser-2.5.2.ebuild 3672 RMD160 44966ef30377164fb36462b08067af05d1e16cfc SHA1 899e6fd88d2ee1a0c3d87f09d1d9ae65d8cf4ba7 SHA256 8e2f9d9bb5b0f28b2dcaf22c5711b0d24c32143fefc5a0dff6853ba163279be7
-MD5 faf7a90e7da309e8964b61a1f585a2cb tvbrowser-2.5.2.ebuild 3672
-RMD160 44966ef30377164fb36462b08067af05d1e16cfc tvbrowser-2.5.2.ebuild 3672
-SHA256 8e2f9d9bb5b0f28b2dcaf22c5711b0d24c32143fefc5a0dff6853ba163279be7 tvbrowser-2.5.2.ebuild 3672
+EBUILD tvbrowser-2.5.2.ebuild 3529 RMD160 228dacdc208404672eb4b0b9220af010476902b9 SHA1 7d8d8136db7d19b8faa6af1e87700f1304af297f SHA256 ae141cb0d05f21c6c3740583712fe1fadbe2625750d797d05daaa0bfd96f4c52
+MD5 fa0a2e25b8c055cf36ada7499ef4907d tvbrowser-2.5.2.ebuild 3529
+RMD160 228dacdc208404672eb4b0b9220af010476902b9 tvbrowser-2.5.2.ebuild 3529
+SHA256 ae141cb0d05f21c6c3740583712fe1fadbe2625750d797d05daaa0bfd96f4c52 tvbrowser-2.5.2.ebuild 3529
 EBUILD tvbrowser-2.5.ebuild 3269 RMD160 7f99c310e0eddbc87b938c1ea2dc8ce9a8ecf442 SHA1 31a6b72048a5a9af4aec04f39a466a70abe3e72b SHA256 ed13f112b24db4e19c7940fd6d7ca08a02316c96d04a9309792190640fc2753e
 MD5 be7b8235f127b19374bb91e024c5dd8b tvbrowser-2.5.ebuild 3269
 RMD160 7f99c310e0eddbc87b938c1ea2dc8ce9a8ecf442 tvbrowser-2.5.ebuild 3269
 SHA256 ed13f112b24db4e19c7940fd6d7ca08a02316c96d04a9309792190640fc2753e tvbrowser-2.5.ebuild 3269
-MISC ChangeLog 2862 RMD160 941f1cff2230727ccc6893099955e0b69c48debe SHA1 6ee7861941c1990eb2cf6bf35256b2768d15cfad SHA256 c14c1e8af8f1c5d134b039f8a287624052c41c5f3e1cc084b10c09eb89711d64
-MD5 dbe45cf85983ae20c9cb7542e4c7ca3f ChangeLog 2862
-RMD160 941f1cff2230727ccc6893099955e0b69c48debe ChangeLog 2862
-SHA256 c14c1e8af8f1c5d134b039f8a287624052c41c5f3e1cc084b10c09eb89711d64 ChangeLog 2862
+MISC ChangeLog 2964 RMD160 2e65806554c8ab11bb05986343c6ccc105841a7a SHA1 899b328199fda0c9592a4ffc0fa31cbb5621e029 SHA256 15c685658e5d804ef22b0dccec928f68c41e4f423e9adb92c373bcfa88c13789
+MD5 d7449d6d936f35631e31c8cc52b76534 ChangeLog 2964
+RMD160 2e65806554c8ab11bb05986343c6ccc105841a7a ChangeLog 2964
+SHA256 15c685658e5d804ef22b0dccec928f68c41e4f423e9adb92c373bcfa88c13789 ChangeLog 2964
 MISC metadata.xml 395 RMD160 a22f8ae33da65ccc0ff251b07c15adafd6c1e615 SHA1 5589ca30d70f5334e2003b17f7594d4a283a280b SHA256 d51789b8a015ccbfd70a9b6ba7ca2e8e5022d9d67e008a96f7920fe93f16ff88
 MD5 4c44116c92d8282ca90875480b20a362 metadata.xml 395
 RMD160 a22f8ae33da65ccc0ff251b07c15adafd6c1e615 metadata.xml 395
@@ -84,7 +84,7 @@ SHA256 9077f1ef73f1d1d33ce47076a7b20c0931242be1e69101dfbd1ed13f3e3d9cb9 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGCSBZt2vP6XvVdOcRAiWBAJ9Aijv/XiatBa7Rcxbm93zVMkKTzACgvo17
-ZZymc0pmdfU/cV7Dp/HWRqQ=
-=8NxV
+iD8DBQFGCW6fcxLzpIGCsLQRAnfbAJ90mcHThRe4FF8+SMmxBUzTeg/aQgCePx6Z
+rspLV8rrhtUcM8glDgc72M4=
+=ithE
 -----END PGP SIGNATURE-----

diff --git a/media-tv/tvbrowser/tvbrowser-2.5.2.ebuild b/media-tv/tvbrowser/tvbrowser-2.5.2.ebuild
index 4f6a02cac8d70477e1533540e42ac59d4e53ac39..98ef7c71c35839ec214f2e4db4177acca3b77597 100644 (file)
--- a/media-tv/tvbrowser/tvbrowser-2.5.2.ebuild
+++ b/media-tv/tvbrowser/tvbrowser-2.5.2.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-2.5.2.ebuild,v 1.1 2007/03/27 13:46:50 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-2.5.2.ebuild,v 1.2 2007/03/27 19:20:51 betelgeuse Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
+JAVA_PKG_IUSE="doc source"
 
 inherit eutils java-pkg-2 java-ant-2 autotools flag-o-matic
 
@@ -17,18 +18,16 @@ KEYWORDS="~x86 ~amd64"
 
 # missing dependencies commons-compress, TVAnytimeAPI, jRegistryKey , gdata-calendar, gdata-client and jcom
 
-RDEPEND="|| ( ( x11-libs/libXt
-                       x11-libs/libSM
-                       x11-libs/libICE
-                       x11-libs/libXext
-                       x11-libs/libXtst
-                       x11-libs/libX11
-                       x11-libs/libXau
-                       x11-libs/libXdmcp
-               )
-               virtual/x11
-       )
+RDEPEND="
        >=virtual/jre-1.5
+       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-net
        >=dev-java/jgoodies-forms-1.0.7
@@ -41,32 +40,30 @@ RDEPEND="|| ( ( x11-libs/libXt
 
 DEPEND=">=virtual/jdk-1.5
        ${RDEPEND}
-       >=dev-java/ant-core-1.5.4
-       app-arch/unzip
-       source? ( app-arch/zip )"
+       app-arch/unzip"
 
 LICENSE="GPL-2"
 
-IUSE="doc themes source"
+IUSE="themes"
 
 src_unpack() {
        unpack ${P}-src.zip
 
-       cd ${S}
-       epatch ${FILESDIR}/tvbrowser-2.5-makefiles.patch
-       epatch ${FILESDIR}/${P}_noWin32.patch
-       epatch ${FILESDIR}/${P}_buildxml.patch
+       cd "${S}"
+       epatch "${FILESDIR}/tvbrowser-2.5-makefiles.patch"
+       epatch "${FILESDIR}/${P}_noWin32.patch"
+       epatch "${FILESDIR}/${P}_buildxml.patch"
 
        #fix bug #170363
-       epatch ${FILESDIR}/tvbrowser-2.5_Localizer.patch
+       epatch "${FILESDIR}/tvbrowser-2.5_Localizer.patch"
 
        # missing commons-compress, gdata-calendar, gdata-client
-       rm -r ${S}/src/calendarexportplugin
-       rm -r ${S}/src/bbcbackstagedataservice
+       rm -r "${S}/src/calendarexportplugin"
+       rm -r "${S}/src/bbcbackstagedataservice"
 
        #we don't need this stuff
-       rm -r ${S}/deployment/win
-       rm -r ${S}/deployment/macosx
+       rm -r "${S}/deployment/win"
+       rm -r "${S}/deployment/macosx"
 
        local J_ARCH
        case "${ARCH}" in
@@ -75,17 +72,17 @@ src_unpack() {
                *) die "not supported arch for this ebuild" ;;
        esac
 
-       sed -i ${S}/deployment/x11/src/Makefile.am \
+       sed -i "${S}/deployment/x11/src/Makefile.am" \
                -e "s-/lib/i386/-/lib/${J_ARCH}/-"
 
-       cd ${S}/tvdatakit/workspace/lib
-       rm *.jar
+       cd "${S}/tvdatakit/workspace/lib"
+       rm -v *.jar || die
 
        java-pkg_jar-from poi
        java-pkg_jar-from xerces-2
 
-       cd ${S}/lib
-       rm *.jar
+       cd "${S}/lib"
+       rm -v *.jar || die
 
        java-pkg_jar-from junit
        java-pkg_jar-from commons-net
@@ -95,10 +92,13 @@ src_unpack() {
        java-pkg_jar-from skinlf
        java-pkg_jar-from l2fprod-common l2fprod-common-tasks.jar
 
+       # Fails to create javadocs without this
+       mkdir "${S}/public"
+
        #fix bug #170364
-       cd ${S}/deployment/x11
+       cd "${S}/deployment/x11"
        chmod u+x configure
-       rm src/libDesktopIndicator.so
+       rm src/libDesktopIndicator.so || die
 
        # converting to unix line-endings
        edos2unix missing depcomp
@@ -107,14 +107,10 @@ src_unpack() {
 }
 
 src_compile() {
-       local antflags="runtime-linux"
-       use doc && antflags="${antflags} public-doc"
-       cd ${S}
-       mkdir public
-       eant ${antflags}
+       eant runtime-linux $(use_doc public-doc)
 
        # second part: DesktopIndicator
-       cd ${S}/deployment/x11
+       cd "${S}/deployment/x11"
        append-flags -fPIC
        econf || die "econf failed"
        emake || die "emake failed"
@@ -122,30 +118,27 @@ src_compile() {
 
 src_install() {
        use source && java-pkg_dosrc src/*
-       use doc && java-pkg_dohtml -r doc/*
-       cd runtime/${PN}_linux
+       use doc && java-pkg_dojavadoc doc
+       cd runtime/${PN}_linux || die
 
        java-pkg_dojar ${PN}.jar
 
-       local todir="/usr/share/${PN}"
-       if [ ${SLOT}q != "0q" ] ; then
-               todir="${todir}-${SLOT}"
-       fi
+       local todir="${JAVA_PKG_SHAREPATH}"
 
-       cp -a imgs ${D}/${todir}
-       cp -a icons ${D}/${todir}
-       cp -a plugins ${D}/${todir}
-       cp linux.properties ${D}/${todir}
+       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 "/usr/share/${PN}/themepacks"
-       doins themepacks/themepack.zip
+       insinto "${todir}/themepacks"
+       doins themepacks/themepack.zip || die
 
        if use themes; then
-               cd "${D}/usr/share/${PN}/themepacks"
+               cd "${D}/${todir}/themepacks"
                unpack allthemepacks.zip
        fi
 
-       java-pkg_doso ${S}/deployment/x11/src/libDesktopIndicator.so
+       java-pkg_doso "${S}/deployment/x11/src/libDesktopIndicator.so"
 
        java-pkg_dolauncher "tvbrowser" \
                --jar ${todir}/lib/tvbrowser.jar \
@@ -153,8 +146,3 @@ src_install() {
                --java_args " -Dpropertiesfile=${todir}/linux.properties"
 }
 
-pkg_postinst() {
-       elog
-       elog "If you want Systray you have to use a jre >= 1.5 !"
-       elog
-}