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

Collapse All | Expand All

(-)grass-6.4.4.ebuild.orig (-6 / +14 lines)
Lines 1-7 Link Here
1
EAPI="5-progress"
1
EAPI="5"
2
PYTHON_ABI_TYPE="single"
2
PYTHON_ABI_TYPE="single"
3
PYTHON_DEPEND="python? ( <<>> )"
3
PYTHON_DEPEND="python? 2:2.7"
4
PYTHON_RESTRICTED_ABIS="3.* *-jython *-pypy"
4
PYTHON_RESTRICTED_ABIS="2.[456] 3.* *-jython *-pypy"
5
WANT_AUTOCONF="2.1"
5
WANT_AUTOCONF="2.1"
6
6
7
inherit eutils gnome2 multilib python versionator wxwidgets autotools
7
inherit eutils gnome2 multilib python versionator wxwidgets autotools
Lines 16-22 Link Here
16
16
17
LICENSE="GPL-2"
17
LICENSE="GPL-2"
18
SLOT="6"
18
SLOT="6"
19
KEYWORDS="*"
19
KEYWORDS="~amd64 ~x86"
20
IUSE="+X +cairo cxx ffmpeg fftw gmath jpeg motif mysql nls odbc opengl png postgres python readline sqlite +tiff truetype +wxwidgets"
20
IUSE="+X +cairo cxx ffmpeg fftw gmath jpeg motif mysql nls odbc opengl png postgres python readline sqlite +tiff truetype +wxwidgets"
21
21
22
RDEPEND="
22
RDEPEND="
Lines 45-51 Link Here
45
	sqlite? ( dev-db/sqlite:3 )
45
	sqlite? ( dev-db/sqlite:3 )
46
	tiff? ( media-libs/tiff )
46
	tiff? ( media-libs/tiff )
47
	truetype? ( media-libs/freetype:2 )
47
	truetype? ( media-libs/freetype:2 )
48
	wxwidgets? ( $(python_abi_depend "=dev-python/numpy-1.8.2-r1000" ">=dev-python/wxpython-2.8.10.1[cairo,opengl?]") )
48
	wxwidgets? (
49
		>=dev-python/numpy-1.8.2
50
		>=dev-python/wxpython-2.8.10.1[cairo,opengl?]
51
	)
49
	X? (
52
	X? (
50
		x11-libs/libICE
53
		x11-libs/libICE
51
		x11-libs/libSM
54
		x11-libs/libSM
Lines 113-119 Link Here
113
		fi
116
		fi
114
	fi
117
	fi
115
118
116
	python_pkg_setup
119
	if use python; then
120
		python_set_active_version 2
121
		python_pkg_setup
122
	fi
117
}
123
}
118
124
119
src_prepare() {
125
src_prepare() {
Lines 181-186 Link Here
181
		$(use_with odbc) \
187
		$(use_with odbc) \
182
		$(use_with png) \
188
		$(use_with png) \
183
		$(use_with postgres) \
189
		$(use_with postgres) \
190
		--with-postgres-includes=/usr/include/postgresql \
191
		--with-postgres-libs=/usr/$(get_libdir)/postgresql \
184
		$(use_with python) \
192
		$(use_with python) \
185
		$(use_with readline) \
193
		$(use_with readline) \
186
		$(use_with sqlite) \
194
		$(use_with sqlite) \

Return to bug 466388