diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2010-01-03 19:02:40 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2010-01-03 19:02:40 +0000 |
| commit | 83e245e7442ea0904fc363c87d5f6ab08ea2a40a (patch) | |
| tree | 2e4cf4e52d1a8fa1675bb800057d08b3646d65d5 /media-sound | |
| parent | Patch the wrapper instead of relying on the user environment being up to date... (diff) | |
| download | historical-83e245e7442ea0904fc363c87d5f6ab08ea2a40a.tar.gz historical-83e245e7442ea0904fc363c87d5f6ab08ea2a40a.tar.bz2 historical-83e245e7442ea0904fc363c87d5f6ab08ea2a40a.zip | |
Fix building. Fixes bug #290536.
Package-Manager: portage-2.2_rc59/cvs/Linux i686
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/jtagger/ChangeLog | 7 | ||||
| -rw-r--r-- | media-sound/jtagger/Manifest | 14 | ||||
| -rw-r--r-- | media-sound/jtagger/jtagger-1.0.ebuild | 19 |
3 files changed, 27 insertions, 13 deletions
diff --git a/media-sound/jtagger/ChangeLog b/media-sound/jtagger/ChangeLog index 33f63479b616..9da92c2b7b28 100644 --- a/media-sound/jtagger/ChangeLog +++ b/media-sound/jtagger/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-sound/jtagger -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/jtagger/ChangeLog,v 1.14 2009/05/17 20:28:01 serkan Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/jtagger/ChangeLog,v 1.15 2010/01/03 19:02:40 betelgeuse Exp $ + + 03 Jan 2010; Petteri Räty <betelgeuse@gentoo.org> jtagger-1.0.ebuild: + Fix building. Fixes bug #290536. 17 May 2009; Serkan Kaba <serkan@gentoo.org> jtagger-1.0_pre20080428.ebuild: diff --git a/media-sound/jtagger/Manifest b/media-sound/jtagger/Manifest index ae6e37b25d19..1ed47a98b47a 100644 --- a/media-sound/jtagger/Manifest +++ b/media-sound/jtagger/Manifest @@ -1,7 +1,17 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX jtagger-2008.04.28-override-annotation.patch 15214 RMD160 48729165306836a67263a50b7530829aaac9fedc SHA1 5a283eeb0ee1a39e08820f012948c6581e4a8d23 SHA256 6f00ad6063ad487a77fe48e806f6dde72d03fbef960fa4218b54f3583ba1d42e DIST jtagger-1.0.zip 458575 RMD160 baecb029be9eaccacacf591efac6f88594077de8 SHA1 4084e51fbae7de21b149d9cdc60e1e8b7b1ad8ca SHA256 9cce80aeb2129cc04900c30f66558400aacb4c107376ef3b99dc8652e2457933 DIST jtagger-2008.04.28.zip 490783 RMD160 9dfc0cdf5c8b847b05d8dccfd5ed4595a51eed64 SHA1 894c0cfc222527d31f0c9f7c99e8a7b52daece59 SHA256 9a48c0df3087740d370fa3d637db9343f4a6014109a667b76814546af49d470f -EBUILD jtagger-1.0.ebuild 1676 RMD160 f999d8f3eea78d6ef40287fa7d4f8d2c3225ce64 SHA1 9a17d42b770f455924fdf21a634468d955e41924 SHA256 a7b76c32feca89079df5466a65c7a3c236ee3d00152301928d3723c381874e33 +EBUILD jtagger-1.0.ebuild 1657 RMD160 132d521d5253448f04345fe43c751cc34575dedd SHA1 a974041bc9e91fc3fc3031b3432031862895a389 SHA256 0cdbb3a3ed8b7da1d2de18df7d471f1142c55198b10e4fd02b0e342cacc3a8ce EBUILD jtagger-1.0_pre20080428.ebuild 2224 RMD160 57e6562d91937a4b372da68394a82b9d2caed805 SHA1 32341751818f7839bda3ecd065059107c1e67de1 SHA256 c066cd44c734702e8d7197c8a1b18b8cff8ee7e760ec4d53278c06cd907cc8ab -MISC ChangeLog 2372 RMD160 633c38c944974c9e8943c4999c614c8d32d7f1f3 SHA1 cfe158084f7b4be3213488dac776e7dc2195ae13 SHA256 00287550a5c2507c3c3283e658cb761a16d765c79be5f7c3f2e30ea2125a5bce +MISC ChangeLog 2485 RMD160 0e8b28dac1c4fc0f417c5f9385b50528920e1ba1 SHA1 82c52c484e318b19ee2b395857e6f93c7ed93bc5 SHA256 fb1fa672ae9bbba0563ba9f8a1a048ac63867d788d4cac97ca789473628c2482 MISC metadata.xml 484 RMD160 d9472cb6ed8a6a55359acd9108b24b8d54f55db5 SHA1 82a3b8e9bf67536cb8a459665436fb89b904be87 SHA256 e75acc709e582d5711ddadc0b03eff6a40326d6274fe1094205904a097e2f08a +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.13 (GNU/Linux) + +iEYEARECAAYFAktA6e0ACgkQcxLzpIGCsLRTJACfRFTINvyaVw8c26lUIVncVUOg +KqUAoJTkNA3/ffhltfWsMteShqxU434Y +=DKeH +-----END PGP SIGNATURE----- diff --git a/media-sound/jtagger/jtagger-1.0.ebuild b/media-sound/jtagger/jtagger-1.0.ebuild index 2125c63b2b06..41b5c800354d 100644 --- a/media-sound/jtagger/jtagger-1.0.ebuild +++ b/media-sound/jtagger/jtagger-1.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/jtagger/jtagger-1.0.ebuild,v 1.2 2009/08/03 13:06:56 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/jtagger/jtagger-1.0.ebuild,v 1.3 2010/01/03 19:02:40 betelgeuse Exp $ EAPI="2" JAVA_PKG_IUSE="source test" @@ -24,15 +24,17 @@ DEPEND="${COMMON_DEP} >=virtual/jdk-1.5 app-arch/unzip" +S="${S}/src" + src_unpack() { - mkdir -p "${S}/src" || die - cd "${S}/src" || die + mkdir -p "${S}" || die + cd "${S}" || die unpack ${A} unzip -q ${PN}.jar || die } -src_prepare() { +java_prepare() { # Fix for bug #231571 comment #2. This removes real @Override annotations but safer. sed -i -e "s/@Override//g" $(find . -name "*.java") || die "failed fixing for Java 5." @@ -43,7 +45,6 @@ src_prepare() { src_compile() { local classpath="$(java-pkg_getjars jid3,jlayer)" - cd "${S}/src" find . -name '*.java' > sources.list ejavac -encoding latin1 -cp "${classpath}" @sources.list @@ -53,11 +54,11 @@ src_compile() { } src_install() { - java-pkg_dojar src/${PN}.jar + java-pkg_dojar ${PN}.jar java-pkg_dolauncher jtagger --main com.googlepages.dronten.jtagger.JTagger - use source && java-pkg_dosrc src/com + use source && java-pkg_dosrc com - newicon src/com/googlepages/dronten/jtagger/resource/jTagger.icon.png ${PN}.png + newicon com/googlepages/dronten/jtagger/resource/jTagger.icon.png ${PN}.png make_desktop_entry jtagger "jTagger MP3 tag editor" } |