Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 672184
Collapse All | Expand All

(-)/usr/portage/media-gfx/zbar/zbar-0.20.1.ebuild (-11 / +8 lines)
Lines 86-92 Link Here
86
		-i configure.ac || die
86
		-i configure.ac || die
87
	sed "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
87
	sed "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
88
		-i java/Makefile.am || die
88
		-i java/Makefile.am || die
89
	# Always include QT header files, so multilib_check_headers doesn't complain
90
	sed -e '/if HAVE_QT/,/endif/{ /if HAVE_QT/d; /endif/d; }' \
91
		-i include/Makefile.am.inc || die
89
	eautoreconf
92
	eautoreconf
93
94
	# Out of source builds doesn't work properly
95
	multilib_copy_sources
90
}
96
}
91
97
92
multilib_src_configure() {
98
multilib_src_configure() {
Lines 97-102 Link Here
97
		$(multilib_native_use_with graphicsmagick graphicsmagick)
103
		$(multilib_native_use_with graphicsmagick graphicsmagick)
98
		$(multilib_native_use_with imagemagick)
104
		$(multilib_native_use_with imagemagick)
99
		$(multilib_native_use_with java)
105
		$(multilib_native_use_with java)
106
		$(multilib_native_use_with qt5 qt)
107
		$(multilib_native_use_with qt5)
100
		$(use_with jpeg)
108
		$(use_with jpeg)
101
		$(multilib_native_use_with python python2)
109
		$(multilib_native_use_with python python2)
102
		$(use_enable static-libs static)
110
		$(use_enable static-libs static)
Lines 117-137 Link Here
117
				java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar)
125
				java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar)
118
			fi
126
			fi
119
		fi
127
		fi
120
		if use qt5; then
121
			myeconfargs+=(
122
				$(use_with qt5 qt)
123
				$(use_with qt5)
124
			)
125
		else
126
			myeconfargs+=( --without-qt )
127
		fi
128
	fi
128
	fi
129
129
130
	ECONF_SOURCE=${S} \
130
	ECONF_SOURCE=${S} \
131
		econf "${myeconfargs[@]}"
131
		econf "${myeconfargs[@]}"
132
133
	# work-around out-of-source build issue
134
	mkdir gtk pygtk qt test || die
135
}
132
}
136
133
137
src_test() {
134
src_test() {

Return to bug 672184