Dessa/gentoo
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

[dev-libs/Ice] try getting tests to work without having to eselect the right ruby version

Browse Source
This commit is contained in:
Robert Förster 2016-04-17 22:31:32 +02:00
parent 09a6973e2d
commit f6ca3c290d
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dev-libs/Ice/Ice-3.6.2.ebuild
View File

@ -63,14 +63,6 @@ REQUIRED_USE="php_namespaces? ( php )"
S="${WORKDIR}/${P/I/i}" S="${WORKDIR}/${P/I/i}"
PHP_EXT_S="${S}/php" PHP_EXT_S="${S}/php"
pkg_setup() {
if use test && use ruby && [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr -d ' ' )* ]]; then
eerror "/usr/bin/ruby is currently not included in Ice's ruby targets: ${RUBY_TARGETS}."
eerror "Please update it via `eselect ruby`"
die
fi
}
src_unpack() { src_unpack() {
# prevent ruby-ng.eclass from messing with src_unpack # prevent ruby-ng.eclass from messing with src_unpack
default default
@ -189,6 +181,9 @@ src_configure() {
sed -i \ sed -i \
-e 's|env ruby|\023|' \ -e 's|env ruby|\023|' \
ruby/scripts/slice2rb || die "sed failed" ruby/scripts/slice2rb || die "sed failed"
sed -i \
-e 's|output.write\(\"ruby|\023|' \
scripts/TestUtil.py || die "sed failed"
fi fi
MAKE_RULES_CS="GACINSTALL=yes GAC_ROOT=\"${ED}/usr/$(get_libdir)\" GAC_DIR=${EPREFIX}/usr/$(get_libdir) MAKE_RULES_CS="GACINSTALL=yes GAC_ROOT=\"${ED}/usr/$(get_libdir)\" GAC_DIR=${EPREFIX}/usr/$(get_libdir)

11
dev-libs/Ice/Ice-3.6.9999.ebuild
View File

@ -68,14 +68,6 @@ REQUIRED_USE="php_namespaces? ( php )"
S="${WORKDIR}/${PN}" S="${WORKDIR}/${PN}"
PHP_EXT_S="${S}/php" PHP_EXT_S="${S}/php"
pkg_setup() {
if use test && use ruby && [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr -d ' ' )* ]]; then
eerror "/usr/bin/ruby is currently not included in Ice's ruby targets: ${RUBY_TARGETS}."
eerror "Please update it via `eselect ruby`"
die
fi
}
src_unpack() { src_unpack() {
# prevent ruby-ng.eclass from messing with src_unpack # prevent ruby-ng.eclass from messing with src_unpack
git-r3_src_unpack git-r3_src_unpack
@ -194,6 +186,9 @@ src_configure() {
sed -i \ sed -i \
-e 's|env ruby|\023|' \ -e 's|env ruby|\023|' \
ruby/scripts/slice2rb || die "sed failed" ruby/scripts/slice2rb || die "sed failed"
sed -i \
-e 's|output.write\(\"ruby|\023|' \
scripts/TestUtil.py || die "sed failed"
fi fi
MAKE_RULES_CS="GACINSTALL=yes GAC_ROOT=\"${ED}/usr/$(get_libdir)\" GAC_DIR=${EPREFIX}/usr/$(get_libdir) MAKE_RULES_CS="GACINSTALL=yes GAC_ROOT=\"${ED}/usr/$(get_libdir)\" GAC_DIR=${EPREFIX}/usr/$(get_libdir)