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

Collapse All | Expand All

(-)/usr/portage/x11-libs/qt/qt-3.3.6-r1.ebuild (-3 / +4 lines)
Lines 17-23 Link Here
17
17
18
SLOT="3"
18
SLOT="3"
19
KEYWORDS="alpha ~amd64 ~hppa ~ia64 ~mips ppc ~ppc-macos ppc64 sparc x86 ~x86-fbsd"
19
KEYWORDS="alpha ~amd64 ~hppa ~ia64 ~mips ppc ~ppc-macos ppc64 sparc x86 ~x86-fbsd"
20
IUSE="cups debug doc examples firebird gif ipv6 mysql nas nis odbc opengl postgres sqlite xinerama immqt immqt-bc"
20
IUSE="cups debug doc examples firebird gif ipv6 mng mysql nas nis odbc opengl postgres sqlite xinerama immqt immqt-bc"
21
21
22
DEPEND="|| ( ( x11-libs/libXcursor
22
DEPEND="|| ( ( x11-libs/libXcursor
23
			x11-libs/libXi
23
			x11-libs/libXi
Lines 33-39 Link Here
33
	virtual/xft
33
	virtual/xft
34
	media-libs/libpng
34
	media-libs/libpng
35
	media-libs/jpeg
35
	media-libs/jpeg
36
	media-libs/libmng
36
	mng? ( media-libs/libmng )
37
	>=media-libs/freetype-2
37
	>=media-libs/freetype-2
38
	sys-libs/zlib
38
	sys-libs/zlib
39
	nas? ( >=media-libs/nas-1.5 )
39
	nas? ( >=media-libs/nas-1.5 )
Lines 159-164 Link Here
159
159
160
	# unixODBC support is now a PDEPEND on dev-db/qt-unixODBC; see bug 14178.
160
	# unixODBC support is now a PDEPEND on dev-db/qt-unixODBC; see bug 14178.
161
	use nas		&& myconf="${myconf} -system-nas-sound"
161
	use nas		&& myconf="${myconf} -system-nas-sound"
162
        use mng         && myconf="${myconf} -system-libmng -qt-imgfmt-mng" || myconf="${myconf} -no-imgfmt-mng"
162
	use nis		&& myconf="${myconf} -nis" || myconf="${myconf} -no-nis"
163
	use nis		&& myconf="${myconf} -nis" || myconf="${myconf} -no-nis"
163
	use gif		&& myconf="${myconf} -qt-gif" || myconf="${myconf} -no-gif"
164
	use gif		&& myconf="${myconf} -qt-gif" || myconf="${myconf} -no-gif"
164
	use mysql	&& myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf="${myconf} -no-sql-mysql"
165
	use mysql	&& myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf="${myconf} -no-sql-mysql"
Lines 188-194 Link Here
188
	export LINK="$(tc-getCXX)"
189
	export LINK="$(tc-getCXX)"
189
190
190
	./configure -sm -thread -stl -system-libjpeg -verbose -largefile \
191
	./configure -sm -thread -stl -system-libjpeg -verbose -largefile \
191
		-qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \
192
		-qt-imgfmt-{jpeg,png} -tablet \
192
		-system-libpng -xft -platform ${PLATFORM} -xplatform \
193
		-system-libpng -xft -platform ${PLATFORM} -xplatform \
193
		${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/$(get_libdir) \
194
		${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/$(get_libdir) \
194
		-fast -no-sql-odbc ${myconf} -dlopen-opengl || die
195
		-fast -no-sql-odbc ${myconf} -dlopen-opengl || die

Return to bug 111735