[gentoo-commits] gentoo-x86 commit in app-crypt/qca: qca-2.0.1-r1.ebuild ChangeLog qca-2.0.0-r2.ebuild

[Ben de Groot (yngwin)]

yngwin      09/04/26 15:32:25

  Modified:             qca-2.0.1-r1.ebuild ChangeLog qca-2.0.0-r2.ebuild
  Log:
  Fix qt dep, move 2.0.1 to eapi-2 with use dep
  (Portage version: 2.2_rc28/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  app-crypt/qca/qca-2.0.1-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/qca/qca-2.0.1-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/qca/qca-2.0.1-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/qca/qca-2.0.1-r1.ebuild?r1=1.1&r2=1.2

Index: qca-2.0.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-2.0.1-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qca-2.0.1-r1.ebuild	6 Sep 2008 00:16:21 -0000	1.1
+++ qca-2.0.1-r1.ebuild	26 Apr 2009 15:32:25 -0000	1.2
@@ -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 @@
 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 @@
 		|| die "configure failed"
 
 	eqmake4 ${PN}.pro
+}
+
+src_compile() {
 	emake || die "emake failed"
 }
 



1.60                 app-crypt/qca/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/qca/ChangeLog?rev=1.60&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/qca/ChangeLog?rev=1.60&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/qca/ChangeLog?r1=1.59&r2=1.60

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- ChangeLog	2 Dec 2008 23:15:17 -0000	1.59
+++ ChangeLog	26 Apr 2009 15:32:25 -0000	1.60
@@ -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@g.o> 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@g.o> qca-1.0-r3.ebuild:
   stable ppc64, bug 238000



1.18                 app-crypt/qca/qca-2.0.0-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/qca/qca-2.0.0-r2.ebuild?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/qca/qca-2.0.0-r2.ebuild?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/qca/qca-2.0.0-r2.ebuild?r1=1.17&r2=1.18

Index: qca-2.0.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-2.0.0-r2.ebuild,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- qca-2.0.0-r2.ebuild	20 Sep 2008 10:02:31 -0000	1.17
+++ qca-2.0.0-r2.ebuild	26 Apr 2009 15:32:25 -0000	1.18
@@ -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 @@
 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() {