Archives
Archives
| From: | "Samuli Suominen (ssuominen)" <ssuominen@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in media-sound/jtagger: jtagger-1.0.ebuild |
| Date: | Mon, 03 Aug 2009 13:06:58 |
| Message-Id: | E1MXxFg-0004H4-2g@stork.gentoo.org |
| 1 | ssuominen 09/08/03 13:06:56 |
| 2 | |
| 3 | Modified: jtagger-1.0.ebuild |
| 4 | Log: |
| 5 | Move sed to src_prepare |
| 6 | (Portage version: 2.2_rc33/cvs/Linux x86_64) |
| 7 | |
| 8 | Revision Changes Path |
| 9 | 1.2 media-sound/jtagger/jtagger-1.0.ebuild |
| 10 | |
| 11 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/jtagger/jtagger-1.0.ebuild?rev=1.2&view=markup |
| 12 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/jtagger/jtagger-1.0.ebuild?rev=1.2&content-type=text/plain |
| 13 | diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/jtagger/jtagger-1.0.ebuild?r1=1.1&r2=1.2 |
| 14 | |
| 15 | Index: jtagger-1.0.ebuild |
| 16 | =================================================================== |
| 17 | RCS file: /var/cvsroot/gentoo-x86/media-sound/jtagger/jtagger-1.0.ebuild,v |
| 18 | retrieving revision 1.1 |
| 19 | retrieving revision 1.2 |
| 20 | diff -u -r1.1 -r1.2 |
| 21 | --- jtagger-1.0.ebuild 16 May 2009 23:06:11 -0000 1.1 |
| 22 | +++ jtagger-1.0.ebuild 3 Aug 2009 13:06:56 -0000 1.2 |
| 23 | @@ -1,9 +1,8 @@ |
| 24 | # Copyright 1999-2009 Gentoo Foundation |
| 25 | # Distributed under the terms of the GNU General Public License v2 |
| 26 | -# $Header: /var/cvsroot/gentoo-x86/media-sound/jtagger/jtagger-1.0.ebuild,v 1.1 2009/05/16 23:06:11 serkan Exp $ |
| 27 | +# $Header: /var/cvsroot/gentoo-x86/media-sound/jtagger/jtagger-1.0.ebuild,v 1.2 2009/08/03 13:06:56 ssuominen Exp $ |
| 28 | |
| 29 | EAPI="2" |
| 30 | - |
| 31 | JAVA_PKG_IUSE="source test" |
| 32 | |
| 33 | inherit eutils java-pkg-2 |
| 34 | @@ -13,16 +12,14 @@ |
| 35 | SRC_URI="http://dronten.googlepages.com/${PN}.zip -> ${P}.zip" |
| 36 | |
| 37 | LICENSE="GPL-3" |
| 38 | +SLOT="0" |
| 39 | KEYWORDS="~amd64 ~x86" |
| 40 | IUSE="" |
| 41 | -SLOT="0" |
| 42 | |
| 43 | -COMMON_DEP=" |
| 44 | - dev-java/jlayer |
| 45 | +COMMON_DEP="dev-java/jlayer |
| 46 | >=dev-java/jid3-0.46-r1" |
| 47 | -RDEPEND=">=virtual/jre-1.5 |
| 48 | - ${COMMON_DEP}" |
| 49 | - |
| 50 | +RDEPEND="${COMMON_DEP} |
| 51 | + >=virtual/jre-1.5" |
| 52 | DEPEND="${COMMON_DEP} |
| 53 | >=virtual/jdk-1.5 |
| 54 | app-arch/unzip" |
| 55 | @@ -33,7 +30,9 @@ |
| 56 | |
| 57 | unpack ${A} |
| 58 | unzip -q ${PN}.jar || die |
| 59 | +} |
| 60 | |
| 61 | +src_prepare() { |
| 62 | # Fix for bug #231571 comment #2. This removes real @Override annotations but safer. |
| 63 | sed -i -e "s/@Override//g" $(find . -name "*.java") || die "failed fixing for Java 5." |