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

Collapse All | Expand All

(-)wxGTK-2.4.1-r1.ebuild.orig (-18 / +26 lines)
Lines 11-28 Link Here
11
KEYWORDS="~x86 ~ppc ~sparc"
11
KEYWORDS="~x86 ~ppc ~sparc"
12
IUSE="nls odbc opengl gtk2"
12
IUSE="nls odbc opengl gtk2"
13
13
14
DEPEND="virtual/x11
14
RDEPEND="virtual/x11
15
	media-libs/netpbm
15
	sys-libs/zlib
16
	media-libs/giflib
17
	media-libs/libpng
16
	media-libs/libpng
18
	media-libs/jpeg
17
	media-libs/jpeg
19
	media-libs/tiff
18
	media-libs/tiff
20
	sys-libs/zlib
21
	odbc? ( dev-db/unixODBC  )
19
	odbc? ( dev-db/unixODBC  )
22
	opengl? ( virtual/opengl )
20
	opengl? ( virtual/opengl )
23
	gtk2? ( >=x11-libs/gtk+-2.0* dev-libs/libunicode ) : ( =x11-libs/gtk+-1.2* )"
21
	gtk2? ( >=x11-libs/gtk+-2.0* ) : ( =x11-libs/gtk+-1.2* )"
22
23
	# Note: gettext is not runtime dependency even if nls? because wxWindows
24
	#       has its own implementation of it
24
25
25
RDEPEND="nls? ( sys-devel/gettext )"
26
DEPEND="${RDEPEND}"
26
27
27
src_unpack() {
28
src_unpack() {
28
	unpack ${A}
29
	unpack ${A}
Lines 33-41 Link Here
33
34
34
src_compile() {
35
src_compile() {
35
	local myconf
36
	local myconf
36
	myconf="--enable-gif --with-libtiff --with-zlib --with-libpng \
37
	myconf=""
37
		--enable-png --with-libjpeg"
38
	
38
39
	#Note: pcx image support enabled by default if found.
39
	#Note: pcx image support enabled by default if found.
40
	#Also, all wxWindows gui features are enabled by default. If you
40
	#Also, all wxWindows gui features are enabled by default. If you
41
	#want to build a smaller library you can disable features by adding
41
	#want to build a smaller library you can disable features by adding
Lines 48-64 Link Here
48
	#       We only use --enable-unicode (if at all) when we use
48
	#       We only use --enable-unicode (if at all) when we use
49
	#       gtk2.
49
	#       gtk2.
50
50
51
   # Note: this ebuild no longer builds wxGTK with --enable-unicode --> commented out,
52
	#       should be restored when this changes
51
53
52
	if [ `use odbc` ] && [ ! `use gtk2` ]; then
54
	#if [ `use odbc` ] && [ ! `use gtk2` ]; then
55
	#	myconf="${myconf} --with-odbc"
56
	#elif [ `use odbc` ] && [ `use gtk2` ]; then
57
	#	ewarn ""
58
	#	einfo "you cannot specify both odbc and gtk2"
59
	#	einfo "Choosing gtk2 over odbc"
60
	#	einfo "re-run with USE=\"-gtk2\" to enable odbc"
61
	#	ewarn ""
62
	#	sleep 5
63
	#	myconf="${myconf} --without-odbc"
64
	#else
65
	#	myconf="${myconf} --without-odbc"
66
	#fi
67
	
68
	if [ `use odbc` ]; then
53
		myconf="${myconf} --with-odbc"
69
		myconf="${myconf} --with-odbc"
54
	elif [ `use odbc` ] && [ `use gtk2` ]; then
55
		ewarn ""
56
		einfo "you cannot specify both odbc and gtk2"
57
		einfo "Choosing gtk2 over odbc"
58
		einfo "re-run with USE=\"-gtk2\" to enable odbc"
59
		ewarn ""
60
		sleep 5
61
		myconf="${myconf} --without-odbc"
62
	else
70
	else
63
		myconf="${myconf} --without-odbc"
71
		myconf="${myconf} --without-odbc"
64
	fi
72
	fi

Return to bug 28684