summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen de Groot <yngwin@gentoo.org>2009-04-26 15:32:25 +0000
committerBen de Groot <yngwin@gentoo.org>2009-04-26 15:32:25 +0000
commit77aabc60ee11bf3d33f16009069fec3ddf5a06df (patch)
tree85c8e45c5d4eefb0070f72fac0908d748c07aec6
parentkeyworded ~arch for ppc, bug 267052 (diff)
downloadhistorical-77aabc60ee11bf3d33f16009069fec3ddf5a06df.tar.gz
historical-77aabc60ee11bf3d33f16009069fec3ddf5a06df.tar.bz2
historical-77aabc60ee11bf3d33f16009069fec3ddf5a06df.zip
Fix qt dep, move 2.0.1 to eapi-2 with use dep
Package-Manager: portage-2.2_rc28/cvs/Linux x86_64
-rw-r--r--app-crypt/qca/ChangeLog7
-rw-r--r--app-crypt/qca/Manifest6
-rw-r--r--app-crypt/qca/qca-2.0.0-r2.ebuild10
-rw-r--r--app-crypt/qca/qca-2.0.1-r1.ebuild31
4 files changed, 21 insertions, 33 deletions
diff --git a/app-crypt/qca/ChangeLog b/app-crypt/qca/ChangeLog
index 98381b86bd7c..bb710476f203 100644
--- a/app-crypt/qca/ChangeLog
+++ b/app-crypt/qca/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-crypt/qca
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.59 2008/12/02 23:15:17 ranger Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.60 2009/04/26 15:32:25 yngwin Exp $
+
+ 26 Apr 2009; Ben de Groot <yngwin@gentoo.org> qca-2.0.0-r2, qca-2.0.1-r1:
+ Fix qt dep, move 2.0.1 to eapi-2 with use dep
02 Dec 2008; Brent Baude <ranger@gentoo.org> qca-1.0-r3.ebuild:
stable ppc64, bug 238000
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 0f5bed99c329..3254c72a16b3 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -7,7 +7,7 @@ DIST qca-2.0.0.tar.bz2 5106520 RMD160 256ca518fea507d03b67c0f5d26ba2ac7b3db517 S
DIST qca-2.0.1.tar.bz2 1925152 RMD160 8c0cc0f81deefe987f9b81631693dc3dc4026fd3 SHA1 0be2f8e677063ddd7c6f22c67375811ac7e15aab SHA256 e1d10f9ef1286f3f129661f3bd6b18161843e0c5cb54fb8956aaecd8b78d41e6
EBUILD qca-1.0-r2.ebuild 1085 RMD160 5a069215836f0981758c76792a76e08cd85e6b89 SHA1 04730d097c74daf6ac40e31fc563a8a86fac9a59 SHA256 5d606aa0213bff891fdd308505a4784855c9e02f5d0623df9ee2db602bb96eac
EBUILD qca-1.0-r3.ebuild 1359 RMD160 ad5344c3ef85b7453f1d4898341aa0f03e3d19da SHA1 e9e6c30da0e0c550db21f09b937fbc9cdace2e86 SHA256 1d840266250e93113f82f4760e0a9ba7984147c2b5e8f9c1499078687fc35d8a
-EBUILD qca-2.0.0-r2.ebuild 2315 RMD160 51fefde7951724818c4776bc40c4d133184a4320 SHA1 a2c5388ecad1fae14bf52103a40bdca0ef4f56f2 SHA256 5b9cf8b6e070cebc1a8c939604e43066c3001749729208fecb2499eb678a92e6
-EBUILD qca-2.0.1-r1.ebuild 2199 RMD160 d923ba621027838915ba3db31eef4b80a1d113df SHA1 8df925dec8f2d38e141b4aa93d31b8f509510d60 SHA256 b120fadddd175553eb1a702be4d319c26950f8ac844971be51cfdb20a6357c2a
-MISC ChangeLog 6971 RMD160 2efda6d2f6c86b025fccf632ce69691aec1b0862 SHA1 195dd3bc4bacccc6c0e5ec42e9becd11ce061c61 SHA256 77cb97abd91c5a76f2e6bfee0de1f8cdee50ad2b3a81c73442373823aabe6a88
+EBUILD qca-2.0.0-r2.ebuild 2281 RMD160 d74baeee388c4416134da622cc5a6cfd260e6688 SHA1 ceda8e5d874857a8dedb385fa3745abe1c012693 SHA256 be026cbb13c25ebd5723c57cf6994671090b5d1c65b16a575fc378c0bdf0a6b3
+EBUILD qca-2.0.1-r1.ebuild 1570 RMD160 64bf81c0be5b8abc88dec13437b9271977d802ba SHA1 5a0cf465f6bb6d1d47e34feb71d903c0e1baf5eb SHA256 74e88e019b0acde39fdc5b5e47521282d2fcfd02bed3903267065a0c1e6c8bb0
+MISC ChangeLog 7096 RMD160 3e0d064cdae7147ebd556320c4baf85dca578045 SHA1 b083e6e7a02e91217d2f077597a30f8252f5874c SHA256 2bf44b57934ae6093c449e6067ea97469ee59b3c2b1fc1239889944ce96d1b89
MISC metadata.xml 192 RMD160 421d4665996ea38fdfc756e2da700603abe17ec7 SHA1 c32af4b790776c36b524e5f2e2dca587c9cd3351 SHA256 e585d77a075b30463ad28cc89374f9ef2876636bca95a23321b824e0122aa6fd
diff --git a/app-crypt/qca/qca-2.0.0-r2.ebuild b/app-crypt/qca/qca-2.0.0-r2.ebuild
index 415350278f40..7055befe552c 100644
--- a/app-crypt/qca/qca-2.0.0-r2.ebuild
+++ b/app-crypt/qca/qca-2.0.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-2.0.0-r2.ebuild,v 1.17 2008/09/20 10:02:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-2.0.0-r2.ebuild,v 1.18 2009/04/26 15:32:25 yngwin Exp $
EAPI="1"
@@ -16,10 +16,8 @@ KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
IUSE="debug doc examples"
RESTRICT="test"
-DEPEND="
- !<app-crypt/qca-1.0-r3
- || ( x11-libs/qt-core:4
- >=x11-libs/qt-4.2.0:4 )"
+DEPEND="!<app-crypt/qca-1.0-r3
+ x11-libs/qt-core:4"
RDEPEND="${DEPEND}"
pkg_setup() {
diff --git a/app-crypt/qca/qca-2.0.1-r1.ebuild b/app-crypt/qca/qca-2.0.1-r1.ebuild
index 560fd5b46d77..0cbf0518197f 100644
--- a/app-crypt/qca/qca-2.0.1-r1.ebuild
+++ b/app-crypt/qca/qca-2.0.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-2.0.1-r1.ebuild,v 1.1 2008/09/06 00:16:21 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-2.0.1-r1.ebuild,v 1.2 2009/04/26 15:32:25 yngwin Exp $
-EAPI="1"
+EAPI="2"
inherit eutils multilib qt4
@@ -17,30 +17,14 @@ IUSE="debug doc examples"
RESTRICT="test"
DEPEND="!<app-crypt/qca-1.0-r3
- || ( x11-libs/qt-core:4
- >=x11-libs/qt-4.2.0:4 )"
+ x11-libs/qt-core:4[debug=]"
RDEPEND="${DEPEND}"
-pkg_setup() {
- if use debug; then
- if has_version "<x11-libs/qt-4.4.0_alpha1:4" && ! built_with_use x11-libs/qt:4 debug; then
- eerror "You are trying to compile ${PN} with USE=\"debug\""
- eerror "while x11-libs/qt:4 is built without this particular flag."
- die "Rebuild x11-libs/qt:4 with USE=\"debug\"."
- elif has_version "x11-libs/qt-core:4" && ! built_with_use x11-libs/qt-core:4 debug; then
- eerror "You are trying to compile ${PN} with USE=\"debug\""
- eerror "while x11-libs/qt-core:4 is built without this particular flag."
- die "Rebuild x11-libs/qt-core:4 with USE=\"debug\"."
- fi
- fi
-}
-
-src_unpack() {
- unpack ${A}
+src_prepare() {
epatch "${FILESDIR}"/${P}-pcfilespath.patch
}
-src_compile() {
+src_configure() {
_libdir=$(get_libdir)
local myconf
use debug && myconf="--debug" || myconf="--release"
@@ -57,6 +41,9 @@ src_compile() {
|| die "configure failed"
eqmake4 ${PN}.pro
+}
+
+src_compile() {
emake || die "emake failed"
}