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

[dev-libs/Ice] forgot to push this, also yank py2k from live

Browse Source
This commit is contained in:
Robert Förster
2020-02-05 12:36:25 +01:00
parent 5351dbf3d6
commit 9f08ffcedd
3 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,7 @@
EAPI=7
PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
PYTHON_COMPAT=( python3_{6,7,8} )
RUBY_OPTIONAL="yes"
USE_RUBY="ruby26"
@@ -82,25 +82,25 @@ src_prepare() {
sed -i \
-e 's|-L\$\(libdir\)||' \
cpp/config/Make.rules || die "sed failed"
cpp/config/Make.rules || die
sed -i \
-e 's|-O2 ||g' \
-e 's|-Werror ||g' \
cpp/config/Make.rules.Linux || die "sed failed"
cpp/config/Make.rules.Linux || die
sed -i \
-e 's|install-common||' \
{cpp,csharp,php,python,ruby}/Makefile || die "sed failed"
{cpp,csharp,php,python,ruby}/Makefile || die
sed -i \
-e 's|-f -root|-f -gacdir $(GAC_DIR) -root|' \
csharp/config/Make.rules.cs || die "sed failed"
csharp/config/Make.rules.cs || die
# skip mono tests, bug #498484
sed -i \
-e '/SUBDIRS/s|\ test||' \
csharp/Makefile || die "sed failed"
csharp/Makefile || die
# skip udp test due to multicast
# skip IceGrid/admin bug #649850
@@ -110,17 +110,17 @@ src_prepare() {
# Glacier2/staticFiltering requires network access
sed -i \
-e 's|allTests.py|allTests.py --rfilter=udp --rfilter=IceGrid\/admin --rfilter=IceSSL --rfilter=IceStorm\/single --rfilter=IceStorm\/stress --rfilter=IceUtil\/stacktrace --rfilter=Glacier2\/staticFiltering|' \
cpp/Makefile || die "sed failed"
cpp/Makefile || die
# fails even on unicode locale
sed -i \
-e 's|allTests.py|allTests.py --rfilter=Slice\/unicodePaths|' \
ruby/Makefile || die "sed failed"
ruby/Makefile || die
# fix for x86 IceBox test
sed -i \
-e 's|"32"|""|' \
scripts/TestUtil.py || die "sed failed"
scripts/TestUtil.py || die
}
src_configure() {
@@ -156,7 +156,7 @@ src_configure() {
-e "s|\(CXXFLAGS[[:space:]]*=\)|\1 ${CXXFLAGS}|" \
-e "s|\(LDFLAGS[[:space:]]*=\)|\1 ${LDFLAGS}|" \
-e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-$(db_findver sys-libs/db:${BERKDB_VERSION})|" \
cpp/config/Make.rules{,.Linux} python/config/Make.rules || die "sed failed"
cpp/config/Make.rules{,.Linux} python/config/Make.rules || die
if use python; then
local S="${S}/python"
@@ -174,16 +174,16 @@ src_configure() {
# make it use ruby26 only
sed -i \
-e 's|RUBY = ruby|\026|' \
ruby/config/Make.rules || die "sed failed"
ruby/config/Make.rules || die
sed -i \
-e 's|env ruby|\026|' \
ruby/config/s2rb.rb || die "sed failed"
ruby/config/s2rb.rb || die
sed -i \
-e 's|env ruby|\026|' \
ruby/scripts/slice2rb || die "sed failed"
ruby/scripts/slice2rb || die
sed -i \
-e 's|output.write("ruby|\026|' \
scripts/TestUtil.py || die "sed failed"
scripts/TestUtil.py || die
fi
MAKE_RULES_MONO=(
@@ -323,6 +323,7 @@ src_install() {
install_pythondir="\"${D}/$(python_get_sitedir)\"" \
install_libdir="\"${D}/$(python_get_sitedir)\"" \
install
python_optimize
}
local S="${S}/python"
python_foreach_impl installation