--- /usr/portage/app-crypt/qca-ossl/qca-ossl-2.0.0_beta3.ebuild 2008-10-03 18:35:26.000000000 -0400 +++ qca-ossl-2.0.0_beta3.ebuild 2008-12-08 21:09:46.000000000 -0500 @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-ossl/qca-ossl-2.0.0_beta3.ebuild,v 1.14 2008/10/03 22:29:30 loki_val Exp $ +EAPI=2 inherit base eutils qt4 MY_P="${P/_/-}" @@ -16,7 +17,7 @@ SLOT="2" KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd" IUSE="debug" -DEPEND=">=app-crypt/qca-${QCA_VER} +DEPEND=">=app-crypt/qca-${QCA_VER}[debug?] >=dev-libs/openssl-0.9.6" RDEPEND="${DEPEND}" @@ -24,21 +25,7 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}/${PN}-openssl-0.9.8i.patch" ) -pkg_setup() { - if use debug && ! built_with_use ">=app-crypt/qca-${QCA_VER}" debug; then - echo - eerror "You are trying to compile ${PN} with USE=\"debug\"" - eerror "while qca is built without this flag. It will not work." - echo - eerror "Possible solutions to this problem are:" - eerror "a) install ${PN} without debug USE flag" - eerror "b) re-emerge qca with debug USE flag" - echo - die "can't emerge ${PN} with debug USE flag" - fi -} - -src_compile() { +src_configure() { # cannot use econf because of non-standard configure script ./configure \ --qtdir=/usr \ @@ -48,7 +35,6 @@ src_compile() { eqmake4 ${PN}.pro sed -i -e '/strip/d' Makefile || die "sed failed" - emake || die "emake failed" } src_install() {