summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2010-10-20 20:32:35 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2010-10-20 20:32:35 +0000
commit48434c1e857eb93de41f402f0e87138d89e8fc4d (patch)
treebc49f4d298b6b2eca3c27d87e1702f950bf5a66c /app-office/kpresenter
parentCleanup (diff)
downloadgentoo-2-48434c1e857eb93de41f402f0e87138d89e8fc4d.tar.gz
gentoo-2-48434c1e857eb93de41f402f0e87138d89e8fc4d.tar.bz2
gentoo-2-48434c1e857eb93de41f402f0e87138d89e8fc4d.zip
Cleanup; add blocker for >=qt-4.7 (does not build)
(Portage version: 2.1.9.20/cvs/Linux x86_64)
Diffstat (limited to 'app-office/kpresenter')
-rw-r--r--app-office/kpresenter/ChangeLog6
-rw-r--r--app-office/kpresenter/kpresenter-2.1.1.ebuild22
-rw-r--r--app-office/kpresenter/kpresenter-2.1.2.ebuild7
3 files changed, 9 insertions, 26 deletions
diff --git a/app-office/kpresenter/ChangeLog b/app-office/kpresenter/ChangeLog
index a19861abb5e2..b57406a185dc 100644
--- a/app-office/kpresenter/ChangeLog
+++ b/app-office/kpresenter/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/kpresenter
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/ChangeLog,v 1.101 2010/10/15 21:48:07 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/ChangeLog,v 1.102 2010/10/20 20:32:35 dilfridge Exp $
+
+ 20 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
+ -kpresenter-2.1.1.ebuild, kpresenter-2.1.2.ebuild:
+ Cleanup; add blocker for >=qt-4.7 (does not build)
15 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
kpresenter-2.2.2.ebuild:
diff --git a/app-office/kpresenter/kpresenter-2.1.1.ebuild b/app-office/kpresenter/kpresenter-2.1.1.ebuild
deleted file mode 100644
index 71376aa32f41..000000000000
--- a/app-office/kpresenter/kpresenter-2.1.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/kpresenter-2.1.1.ebuild,v 1.2 2010/06/21 13:56:13 ssuominen Exp $
-
-EAPI="2"
-
-KMNAME="koffice"
-KMMODULE="${PN}"
-inherit kde4-meta
-
-DESCRIPTION="KOffice presentation program."
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/boost-1.35.0"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="libs/"
-KMEXTRA="filters/${KMMODULE}/"
-
-KMLOADLIBS="koffice-libs"
diff --git a/app-office/kpresenter/kpresenter-2.1.2.ebuild b/app-office/kpresenter/kpresenter-2.1.2.ebuild
index 86f13d417663..a8b65c36b769 100644
--- a/app-office/kpresenter/kpresenter-2.1.2.ebuild
+++ b/app-office/kpresenter/kpresenter-2.1.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/kpresenter-2.1.2.ebuild,v 1.2 2010/06/21 13:56:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/kpresenter-2.1.2.ebuild,v 1.3 2010/10/20 20:32:35 dilfridge Exp $
EAPI="2"
@@ -10,10 +10,11 @@ inherit kde4-meta
DESCRIPTION="KOffice presentation program."
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~ppc ~ppc64"
IUSE=""
-DEPEND=">=dev-libs/boost-1.35.0"
+DEPEND=">=dev-libs/boost-1.35.0
+ !>=x11-libs/qt-core-4.7.0"
RDEPEND="${DEPEND}"
KMEXTRACTONLY="libs/"