gienah 14/10/06 05:51:40
Modified: scala-2.11.2.ebuild scala-2.11.1.ebuild ChangeLog
Log:
Bug 517166 - dev-lang/scala-2.11.1 - Unable to resolve artifact: Missing:
biz.aQute:bnd:jar:1.50.0. Thanks to Christian Strahl for reporting, mkaama for
helping. sed the build.xml to add in a localRepository pointing to
$WORKDIR/.m2/repository, and sed all of the artifact:dependencies to configure
them to use this localRepository. The localRepository is provided with the
${P}-maven-deps.tar.gz file.
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with
key 618E971F)
Revision Changes Path
1.2 dev-lang/scala/scala-2.11.2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/scala/scala-2.11.2.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/scala/scala-2.11.2.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/scala/scala-2.11.2.ebuild?r1=1.1&r2=1.2
Index: scala-2.11.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.11.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scala-2.11.2.ebuild 4 Oct 2014 12:14:50 -0000 1.1
+++ scala-2.11.2.ebuild 6 Oct 2014 05:51:40 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.11.2.ebuild,v 1.1
2014/10/04 12:14:50 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.11.2.ebuild,v 1.2
2014/10/06 05:51:40 gienah Exp $
EAPI="5"
@@ -13,7 +13,7 @@
MY_P="${PN}-sources-${PV}"
# creating the binary:
-# JAVA_PKG_FORCE_VM="$available-1.8" USE="doc source" ebuild scala-*.ebuild
compile
+# JAVA_PKG_FORCE_VM="$available-1.7" USE="doc source" ebuild scala-*.ebuild
compile
# cd $WORDKIR
# tar -cjf scala-2.11.2-gentoo-binary.tar.bz2 scala-2.11.2/build/pack/bin \
# scala-2.11.2/build/pack/lib/ scala-2.11.2/build/pack/man \
@@ -56,6 +56,7 @@
SRC_URI="!binary?
( https://github.com/scala/scala/archive/v${PV}.tar.gz -> ${P}.tar.gz
${JURI[@]}
+ http://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz
)
binary? ( http://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.bz2
)"
@@ -66,9 +67,7 @@
IUSE="binary emacs"
COMMON_DEP="dev-java/ant-core:0
- dev-java/bndlib:0
- dev-java/hawtjni-runtime:0
- dev-java/junit:4"
+ dev-java/hawtjni-runtime:0"
DEPEND="${COMMON_DEP}
java-virtuals/jdk-with-com-sun:0
@@ -118,7 +117,7 @@
}
java_prepare() {
- java-pkg_getjars ant-core,bndlib,hawtjni-runtime,junit-4
+ java-pkg_getjars ant-core,hawtjni-runtime
if ! use binary; then
local a
@@ -135,9 +134,15 @@
epatch "${FILESDIR}/${P}-no-git.patch"
# Note: to bump scala, some things to try are:
# 1. update all the sha1s in JURI
- # 2. try emerge scala. Check if it downloads more stuff in
src_compile to ${WORDIR}/.m2
- # 3. If it does download more stuff to ${WORDIR}/.m2, then
there was some stuff to handle that in
- # the scala-2.10.3 ebuild.
+ # 2. remove the
http://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI
+ # 3. try emerge scala. Check if it downloads more stuff in
src_compile to ${WORDIR}/.m2
+ # or /var/tmp/portage/.m2 or /root/.m2
+ # 4. tar up all the .m2 junk into ${P}-maven-deps.tar.gz and
add it to SRC_URI.
+ sed -e "s@\(<mkdir
dir=\"\)\${user.home}\(/.m2/repository\"/>\)@\1${WORKDIR}\2\n
<artifact:localRepository id=\"localrepo\" path=\"${WORKDIR}/.m2/repository\"
/>@" \
+ -e "s@\${user.home}/.m2@${WORKDIR}/.m2@g" \
+ -e 's@\(<artifact:dependencies .*>\)@\1\n
<localRepository refid="localrepo" />@g' \
+ -i "${S}/build.xml" \
+ || die "Could not change location of .m2 maven download
directory in ${S}/build.xml"
fi
}
1.2 dev-lang/scala/scala-2.11.1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/scala/scala-2.11.1.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/scala/scala-2.11.1.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/scala/scala-2.11.1.ebuild?r1=1.1&r2=1.2
Index: scala-2.11.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.11.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scala-2.11.1.ebuild 8 Jul 2014 15:17:10 -0000 1.1
+++ scala-2.11.1.ebuild 6 Oct 2014 05:51:40 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.11.1.ebuild,v 1.1
2014/07/08 15:17:10 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.11.1.ebuild,v 1.2
2014/10/06 05:51:40 gienah Exp $
EAPI="5"
@@ -56,6 +56,7 @@
SRC_URI="!binary?
( https://github.com/scala/scala/archive/v${PV}.tar.gz -> ${P}.tar.gz
${JURI[@]}
+ http://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz
)
binary? ( http://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.bz2
)"
@@ -66,9 +67,7 @@
IUSE="binary emacs"
COMMON_DEP="dev-java/ant-core:0
- dev-java/bndlib:0
- dev-java/hawtjni-runtime:0
- dev-java/junit:4"
+ dev-java/hawtjni-runtime:0"
DEPEND="${COMMON_DEP}
java-virtuals/jdk-with-com-sun:0
@@ -118,7 +117,7 @@
}
java_prepare() {
- java-pkg_getjars ant-core,bndlib,hawtjni-runtime,junit-4
+ java-pkg_getjars ant-core,hawtjni-runtime
if ! use binary; then
local a
@@ -135,9 +134,15 @@
epatch "${FILESDIR}/${P}-no-git.patch"
# Note: to bump scala, some things to try are:
# 1. update all the sha1s in JURI
- # 2. try emerge scala. Check if it downloads more stuff in
src_compile to ${WORDIR}/.m2
- # 3. If it does download more stuff to ${WORDIR}/.m2, then
there was some stuff to handle that in
- # the scala-2.10.3 ebuild.
+ # 2. remove the
http://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI
+ # 3. try emerge scala. Check if it downloads more stuff in
src_compile to ${WORDIR}/.m2
+ # or /var/tmp/portage/.m2 or /root/.m2
+ # 4. tar up all the .m2 junk into ${P}-maven-deps.tar.gz and
add it to SRC_URI.
+ sed -e "s@\(<mkdir
dir=\"\)\${user.home}\(/.m2/repository\"/>\)@\1${WORKDIR}\2\n
<artifact:localRepository id=\"localrepo\" path=\"${WORKDIR}/.m2/repository\"
/>@" \
+ -e "s@\${user.home}/.m2@${WORKDIR}/.m2@g" \
+ -e 's@\(<artifact:dependencies .*>\)@\1\n
<localRepository refid="localrepo" />@g' \
+ -i "${S}/build.xml" \
+ || die "Could not change location of .m2 maven download
directory in ${S}/build.xml"
fi
}
1.40 dev-lang/scala/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/scala/ChangeLog?rev=1.40&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/scala/ChangeLog?rev=1.40&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/scala/ChangeLog?r1=1.39&r2=1.40
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ChangeLog 6 Oct 2014 03:26:42 -0000 1.39
+++ ChangeLog 6 Oct 2014 05:51:40 -0000 1.40
@@ -1,6 +1,15 @@
# ChangeLog for dev-lang/scala
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.39 2014/10/06
03:26:42 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.40 2014/10/06
05:51:40 gienah Exp $
+
+ 06 Oct 2014; Mark Wright <gie...@gentoo.org> scala-2.11.1.ebuild,
+ scala-2.11.2.ebuild:
+ Bug 517166 - dev-lang/scala-2.11.1 - Unable to resolve artifact: Missing:
+ biz.aQute:bnd:jar:1.50.0. Thanks to Christian Strahl for reporting, mkaama
for
+ helping. sed the build.xml to add in a localRepository pointing to
+ $WORKDIR/.m2/repository, and sed all of the artifact:dependencies to
configure
+ them to use this localRepository. The localRepository is provided with the
${P
+ }-maven-deps.tar.gz file.
06 Oct 2014; Mark Wright <gie...@gentoo.org>
-files/scala-2.10.3-maven-deps.patch, scala-2.10.3.ebuild,
