From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/entagged-tageditor/, media-sound/entagged-tageditor/files/
Date: Sat, 9 Nov 2019 21:53:55 +0000 (UTC) [thread overview]
Message-ID: <1573335948.76ad450a167f1d2bb681422818b4925684b168ac.mgorny@gentoo> (raw)
commit: 76ad450a167f1d2bb681422818b4925684b168ac
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 9 21:45:48 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Nov 9 21:45:48 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76ad450a
media-sound/entagged-tageditor: Bump to EAPI 7
Closes: https://bugs.gentoo.org/697270
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../entagged-tageditor-0.35.ebuild | 20 ++++++++++----------
.../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 e5316f528a5..1113fa708d1 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 7b470e2dbeb..709b16b32a5 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=".."/>
reply other threads:[~2019-11-10 10:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1573335948.76ad450a167f1d2bb681422818b4925684b168ac.mgorny@gentoo \
--to=mgorny@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox