Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 376263 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-9 / +6 lines)
Line  Link Here
0
-- Ice-3.4.1.ebuild
0
++ Ice-3.4.2.ebuild
Lines 10-16 Link Here
10
RUBY_OPTIONAL="yes"
10
RUBY_OPTIONAL="yes"
11
USE_RUBY="ruby18"
11
USE_RUBY="ruby18"
12
12
13
inherit toolchain-funcs versionator python mono ruby-ng
13
inherit toolchain-funcs versionator python mono ruby-ng db-use
14
14
15
DESCRIPTION="ICE middleware C++ library and generator tools"
15
DESCRIPTION="ICE middleware C++ library and generator tools"
16
HOMEPAGE="http://www.zeroc.com/"
16
HOMEPAGE="http://www.zeroc.com/"
Lines 24-30 Link Here
24
RDEPEND=">=dev-libs/expat-2.0.1
24
RDEPEND=">=dev-libs/expat-2.0.1
25
	>=app-arch/bzip2-1.0.5
25
	>=app-arch/bzip2-1.0.5
26
	>=dev-libs/openssl-0.9.8o
26
	>=dev-libs/openssl-0.9.8o
27
	>=sys-libs/db-4.8.30:4.8[-nocxx]
27
	>=sys-libs/db-4.8.30[-nocxx]
28
	~dev-cpp/libmcpp-2.7.2
28
	~dev-cpp/libmcpp-2.7.2
29
	ruby? ( $(ruby_implementation_depend ruby18) )
29
	ruby? ( $(ruby_implementation_depend ruby18) )
30
	mono? ( dev-lang/mono )
30
	mono? ( dev-lang/mono )
Lines 55-64 Link Here
55
}
55
}
56
56
57
src_prepare() {
57
src_prepare() {
58
#	if tc-is-cross-compiler ; then
58
	epatch "${FILESDIR}"/${PN}-3.4.1-db5.patch
59
#		export CROSS_COMPILE=yes
60
#		epatch "${FILESDIR}/${P}-cross-compile.patch"
61
#	fi
62
59
63
	sed -i \
60
	sed -i \
64
		-e 's|\(install_docdir[[:space:]]*\):=|\1?=|' \
61
		-e 's|\(install_docdir[[:space:]]*\):=|\1?=|' \
Lines 101-113 Link Here
101
	use ncurses && OPTIONS="${MAKE_RULES} USE_READLINE=yes" || MAKE_RULES="${MAKE_RULES} USE_READLINE=no"
98
	use ncurses && OPTIONS="${MAKE_RULES} USE_READLINE=yes" || MAKE_RULES="${MAKE_RULES} USE_READLINE=no"
102
	use debug && OPTIONS"${MAKE_RULES} OPTIMIZE=no" || MAKE_RULES="${MAKE_RULES} OPTIMIZE=yes"
99
	use debug && OPTIONS"${MAKE_RULES} OPTIMIZE=no" || MAKE_RULES="${MAKE_RULES} OPTIMIZE=yes"
103
100
104
	MAKE_RULES="${MAKE_RULES} DB_FLAGS=-I/usr/include/db4.8"
101
	MAKE_RULES="${MAKE_RULES} DB_FLAGS=-I$(db_includedir)"
105
	sed -i \
102
	sed -i \
106
		-e "s|c++|$(tc-getCXX)|" \
103
		-e "s|c++|$(tc-getCXX)|" \
107
		-e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \
104
		-e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \
108
		-e "s|\(CXXFLAGS[[:space:]]*=\)|\1 ${CXXFLAGS}|" \
105
		-e "s|\(CXXFLAGS[[:space:]]*=\)|\1 ${CXXFLAGS}|" \
109
		-e "s|\(LDFLAGS[[:space:]]*=\)|\1 ${LDFLAGS}|" \
106
		-e "s|\(LDFLAGS[[:space:]]*=\)|\1 ${LDFLAGS}|" \
110
		-e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-4.8|" \
107
		-e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-$(db_findver sys-libs/db)|" \
111
		cpp/config/Make.rules{,.Linux} py/config/Make.rules || die "sed failed"
108
		cpp/config/Make.rules{,.Linux} py/config/Make.rules || die "sed failed"
112
109
113
	if use python ; then
110
	if use python ; then

Return to bug 376263