diff options
author | Jonathan Callen <abcd@gentoo.org> | 2010-01-13 18:44:41 +0000 |
---|---|---|
committer | Jonathan Callen <abcd@gentoo.org> | 2010-01-13 18:44:41 +0000 |
commit | 86fdd51813d02b05fb3d63b557ce0de262645842 (patch) | |
tree | 87d7e973b9e6470df07b50ba6b8c9abab8daceac /app-crypt/qca | |
parent | Enable support for JRuby. (diff) | |
download | gentoo-2-86fdd51813d02b05fb3d63b557ce0de262645842.tar.gz gentoo-2-86fdd51813d02b05fb3d63b557ce0de262645842.tar.bz2 gentoo-2-86fdd51813d02b05fb3d63b557ce0de262645842.zip |
Add initial USE=aqua support, fix rpaths for prefix
(Portage version: -svn/cvs/Linux i686)
Diffstat (limited to 'app-crypt/qca')
-rw-r--r-- | app-crypt/qca/ChangeLog | 7 | ||||
-rw-r--r-- | app-crypt/qca/qca-2.0.2-r2.ebuild | 19 |
2 files changed, 21 insertions, 5 deletions
diff --git a/app-crypt/qca/ChangeLog b/app-crypt/qca/ChangeLog index d4146dfe685a..7f6fcec380b4 100644 --- a/app-crypt/qca/ChangeLog +++ b/app-crypt/qca/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-crypt/qca -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.80 2009/12/29 18:10:42 armin76 Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.81 2010/01/13 18:44:41 abcd Exp $ + + 13 Jan 2010; Jonathan Callen <abcd@gentoo.org> qca-2.0.2-r2.ebuild: + Add initial USE=aqua support, fix rpaths for prefix 29 Dec 2009; Raúl Porcel <armin76@gentoo.org> qca-2.0.2-r2.ebuild: Add ~arm wrt #288000 diff --git a/app-crypt/qca/qca-2.0.2-r2.ebuild b/app-crypt/qca/qca-2.0.2-r2.ebuild index 7040132cb9a8..fb7105cf8a52 100644 --- a/app-crypt/qca/qca-2.0.2-r2.ebuild +++ b/app-crypt/qca/qca-2.0.2-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-2.0.2-r2.ebuild,v 1.11 2009/12/29 18:10:42 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-2.0.2-r2.ebuild,v 1.12 2010/01/13 18:44:41 abcd Exp $ EAPI="2" @@ -13,7 +13,7 @@ SRC_URI="http://delta.affinix.com/download/${PN}/${PV%.*}/${P}.tar.bz2" LICENSE="LGPL-2" SLOT="2" KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="debug doc examples" +IUSE="aqua debug doc examples" RESTRICT="test" DEPEND="x11-libs/qt-core:4[debug?]" @@ -23,6 +23,10 @@ RDEPEND="${DEPEND} src_prepare() { epatch "${FILESDIR}"/${P}-pcfilespath.patch + + use aqua && sed -i \ + -e "s|QMAKE_LFLAGS_SONAME =.*|QMAKE_LFLAGS_SONAME = -Wl,-install_name,|g" \ + src/src.pro } src_configure() { @@ -30,6 +34,9 @@ src_configure() { _libdir=$(get_libdir) + # Ensure proper rpath + export EXTRA_QMAKE_RPATH="${EPREFIX}/usr/${_libdir}/qca2" + ./configure \ --prefix="${EPREFIX}"/usr \ --qtdir="${EPREFIX}"/usr \ @@ -39,6 +46,7 @@ src_configure() { --no-separate-debug-info \ --disable-tests \ --$(use debug && echo debug || echo release) \ + --no-framework \ || die "configure failed" eqmake4 @@ -61,4 +69,9 @@ src_install() { insinto /usr/share/doc/${PF}/ doins -r "${S}"/examples || die "Failed to install examples" fi + + # add the proper rpath for packages that do CONFIG += crypto + echo "QMAKE_RPATHDIR += \"${EPREFIX}/usr/${_libdir}/qca2\"" >> \ + "${D%/}${EPREFIX}/usr/share/qt4/mkspecs/features/crypto.prf" \ + || die "failed to add rpath to crypto.prf" } |