diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2019-11-09 22:45:48 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2019-11-09 22:45:48 +0100 |
| commit | 76ad450a167f1d2bb681422818b4925684b168ac (patch) | |
| tree | 859ee17bce059da404048b97aa2f53eb2847bef6 /media-sound/entagged-tageditor | |
| parent | net-misc/jrdesktop: Bump to EAPI 7 (diff) | |
| download | gentoo-76ad450a167f1d2bb681422818b4925684b168ac.tar.gz gentoo-76ad450a167f1d2bb681422818b4925684b168ac.tar.bz2 gentoo-76ad450a167f1d2bb681422818b4925684b168ac.zip | |
media-sound/entagged-tageditor: Bump to EAPI 7
Closes: https://bugs.gentoo.org/697270
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'media-sound/entagged-tageditor')
| -rw-r--r-- | media-sound/entagged-tageditor/entagged-tageditor-0.35.ebuild | 20 | ||||
| -rw-r--r-- | media-sound/entagged-tageditor/files/entagged-tageditor-0.35-buildfixes.patch | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/media-sound/entagged-tageditor/entagged-tageditor-0.35.ebuild b/media-sound/entagged-tageditor/entagged-tageditor-0.35.ebuild index e5316f528a5a..1113fa708d1e 100644 --- a/media-sound/entagged-tageditor/entagged-tageditor-0.35.ebuild +++ b/media-sound/entagged-tageditor/entagged-tageditor-0.35.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=0 +EAPI=7 -inherit eutils java-pkg-2 java-ant-2 +inherit desktop java-pkg-2 java-ant-2 DESCRIPTION="Open-source audiofile tagger" HOMEPAGE="http://entagged.sourceforge.net/" SRC_URI="mirror://gentoo/${P}.tar.gz" -LICENSE="|| ( GPL-2 LGPL-2.1 )" +LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" KEYWORDS="~amd64" IUSE="" @@ -17,23 +17,23 @@ IUSE="" S="${WORKDIR}" RDEPEND=">=virtual/jre-1.5 - dev-java/squareness-jlf - dev-db/hsqldb" + dev-java/squareness-jlf:0 + dev-db/hsqldb:0" DEPEND=">=virtual/jdk-1.5 - dev-db/hsqldb" + dev-db/hsqldb:0" EANT_BUILD_XML="entagged/build.xml" EANT_BUILD_TARGET="build" -src_unpack() { - unpack ${A} +src_prepare() { + java-pkg-2_src_prepare mkdir -p test/entagged/junit || die mv entagged/entagged/junit test/entagged || die rm entagged/*.jar || die java-pkg_jarfrom hsqldb hsqldb.jar entagged/hsqldb.jar cd entagged || die - epatch "${FILESDIR}"/${P}-buildfixes.patch + eapply "${FILESDIR}"/${P}-buildfixes.patch } src_install() { diff --git a/media-sound/entagged-tageditor/files/entagged-tageditor-0.35-buildfixes.patch b/media-sound/entagged-tageditor/files/entagged-tageditor-0.35-buildfixes.patch index 7b470e2dbeb5..709b16b32a58 100644 --- a/media-sound/entagged-tageditor/files/entagged-tageditor-0.35-buildfixes.patch +++ b/media-sound/entagged-tageditor/files/entagged-tageditor-0.35-buildfixes.patch @@ -1,5 +1,5 @@ ---- build.xml 2007-03-23 16:25:25.000000000 +0200 -+++ build.xml.fixed 2007-09-01 09:20:44.000000000 +0300 +--- a/build.xml 2007-03-23 16:25:25.000000000 +0200 ++++ b/build.xml 2007-09-01 09:20:44.000000000 +0300 @@ -30,7 +30,7 @@ <property name="entagged_dir" location="."/>
<property name="entagged_base_dir" location=".."/>
|