summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarty E. Plummer <hanetzer@startmail.com>2018-04-08 16:00:08 -0500
committerJames Le Cuirot <chewi@gentoo.org>2018-04-08 22:59:36 +0100
commit935303706906f96d41ac75da3f0ac2dd24b12faf (patch)
tree72455ea708cfebd5cff40cda0dc3880b7b5fe859 /dev-lang/scala/scala-2.12.1.ebuild
parentsys-libs/slang-2.3.2: arm64 stable (bug #651302) (diff)
downloadgentoo-935303706906f96d41ac75da3f0ac2dd24b12faf.tar.gz
gentoo-935303706906f96d41ac75da3f0ac2dd24b12faf.tar.bz2
gentoo-935303706906f96d41ac75da3f0ac2dd24b12faf.zip
dev-lang/scala: clean duplicate patches
Package-Manager: Portage-2.3.28, Repoman-2.3.9 Closes: https://github.com/gentoo/gentoo/pull/7900
Diffstat (limited to 'dev-lang/scala/scala-2.12.1.ebuild')
-rw-r--r--dev-lang/scala/scala-2.12.1.ebuild4
1 files changed, 2 insertions, 2 deletions
diff --git a/dev-lang/scala/scala-2.12.1.ebuild b/dev-lang/scala/scala-2.12.1.ebuild
index 38b815fd3f62..f38b2a17af21 100644
--- a/dev-lang/scala/scala-2.12.1.ebuild
+++ b/dev-lang/scala/scala-2.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -134,7 +134,7 @@ src_prepare() {
cp -p "${DISTDIR}/${g}" "${S}/${j#${BURI}/*/}" || die
done
# gentoo patch (by gienah) to stop it calling git log in the build
- eapply "${FILESDIR}/${P}-no-git.patch"
+ eapply "${FILESDIR}/${PN}-2.12.1-no-git.patch"
# https://issues.scala-lang.org/browse/SI-10098
eapply "${FILESDIR}/${PN}-2.12.1-runner-script.patch"