Add prefix support, revbump due to otherwise unresolvable USE deps

(Portage version: -svn/cvs/Linux i686)

3 files changed, 11 insertions, 38 deletions

diff --git a/x11-libs/qt-xmlpatterns/ChangeLog b/x11-libs/qt-xmlpatterns/ChangeLog
index f115b2b25a71..39fc10d9b0c7 100644
--- a/x11-libs/qt-xmlpatterns/ChangeLog
+++ b/x11-libs/qt-xmlpatterns/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/qt-xmlpatterns
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/ChangeLog,v 1.54 2009/12/03 17:25:18 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/ChangeLog,v 1.55 2009/12/25 15:47:32 abcd Exp $
+
+*qt-xmlpatterns-4.6.0-r1 (25 Dec 2009)
+
+  25 Dec 2009; Jonathan Callen <abcd@gentoo.org>
+  -qt-xmlpatterns-4.5.3.ebuild, -qt-xmlpatterns-4.6.0.ebuild,
+  +qt-xmlpatterns-4.6.0-r1.ebuild:
+  Add prefix support, revbump due to otherwise unresolvable USE deps
 
   03 Dec 2009; Alex Alexander <wired@gentoo.org>
   +files/qt-4.6-nolibx11.diff, qt-xmlpatterns-4.6.0.ebuild:
diff --git a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.5.3.ebuild b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.5.3.ebuild
deleted file mode 100644
index de8c93bb93f7..000000000000
--- a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.5.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.5.3.ebuild,v 1.2 2009/10/29 11:29:08 fauli Exp $
-
-EAPI="2"
-inherit qt4-build
-
-DESCRIPTION="The patternist module for the Qt toolkit"
-SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="~x11-libs/qt-core-${PV}[debug=]"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="src/xmlpatterns tools/xmlpatterns"
-QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-include/QtCore
-include/QtNetwork
-include/QtXmlPatterns
-src/network/
-src/corelib/"
-
-QCONFIG_ADD="xmlpatterns"
-QCONFIG_DEFINE="QT_XMLPATTERNS"
-
-PATCHES=(
-	"${FILESDIR}/qt-4.5-nolibx11.diff"
-)
-
-src_configure() {
-	myconf="${myconf} -xmlpatterns"
-	qt4-build_src_configure
-}
diff --git a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.0.ebuild b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.0-r1.ebuild
index 9bbbe84461f8..5850ca4f5a5a 100644
--- a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.0.ebuild
+++ b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.0-r1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.0.ebuild,v 1.2 2009/12/03 17:25:18 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.0-r1.ebuild,v 1.1 2009/12/25 15:47:32 abcd Exp $
 
 EAPI="2"
 inherit qt4-build
 
 DESCRIPTION="The patternist module for the Qt toolkit"
 SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
-DEPEND="~x11-libs/qt-core-${PV}[debug=]"
+DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=]"
 RDEPEND="${DEPEND}"
 
 QT4_TARGET_DIRECTORIES="src/xmlpatterns tools/xmlpatterns"