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

(-)qt-3.3.5.ebuild.old (-7 / +10 lines)
Lines 17-28 Link Here
17
17
18
SLOT="3"
18
SLOT="3"
19
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
19
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
20
IUSE="cups debug doc examples firebird gif ipv6 mysql nas odbc opengl postgres sqlite xinerama zlib immqt immqt-bc"
20
IUSE="jpeg png mng cups debug doc examples firebird gif ipv6 mysql nas odbc opengl postgres sqlite xinerama zlib immqt immqt-bc"
21
21
22
DEPEND="virtual/x11 virtual/xft
22
DEPEND="virtual/x11 virtual/xft
23
	media-libs/libpng
23
        png? ( media-libs/libpng )
24
	media-libs/jpeg
24
	jpeg? ( media-libs/jpeg )
25
	media-libs/libmng
25
	mng? ( media-libs/libmng )
26
	>=media-libs/freetype-2
26
	>=media-libs/freetype-2
27
	nas? ( >=media-libs/nas-1.5 )
27
	nas? ( >=media-libs/nas-1.5 )
28
	mysql? ( dev-db/mysql )
28
	mysql? ( dev-db/mysql )
Lines 153-158 Link Here
153
	use immqt-bc	&& myconf="${myconf} -inputmethod"
153
	use immqt-bc	&& myconf="${myconf} -inputmethod"
154
	use immqt	&& myconf="${myconf} -inputmethod -inputmethod-ext"
154
	use immqt	&& myconf="${myconf} -inputmethod -inputmethod-ext"
155
155
156
	use jpeg	&& myconf="${myconf} -qt-imgfmt-jpeg -system-libjpeg"  || myconf="${myconf} -no-imgfmt-jpeg"
157
	use png		&& myconf="${myconf} -qt-imgfmt-png  -system-libpng"   || myconf="${myconf} -no-imgfmt-png"
158
	use mng		&& myconf="${myconf} -qt-imgfmt-mng  -system-libmng"   || myconf="${myconf} -no-imgfmt-mng"
159
156
	if use ppc-macos ; then
160
	if use ppc-macos ; then
157
		myconf="${myconf} -no-sql-ibase -no-sql-mysql -no-sql-psql -no-cups -lresolv -shared"
161
		myconf="${myconf} -no-sql-ibase -no-sql-mysql -no-sql-psql -no-cups -lresolv -shared"
158
		myconf="${myconf} -I/usr/X11R6/include -L/usr/X11R6/lib"
162
		myconf="${myconf} -I/usr/X11R6/include -L/usr/X11R6/lib"
Lines 162-170 Link Here
162
166
163
	export YACC='byacc -d'
167
	export YACC='byacc -d'
164
168
165
	./configure -sm -thread -stl -system-libjpeg -verbose -largefile \
169
	./configure -sm -thread -stl -verbose -largefile \
166
		-qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \
170
		-tablet -xft -platform ${PLATFORM} -xplatform \
167
		-system-libpng -xft -platform ${PLATFORM} -xplatform \
168
		${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/$(get_libdir) \
171
		${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/$(get_libdir) \
169
		-fast -no-sql-odbc ${myconf} -dlopen-opengl || die
172
		-fast -no-sql-odbc ${myconf} -dlopen-opengl || die
170
173

Return to bug 111735