summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Callen <jcallen@gentoo.org>2009-11-20 18:47:59 +0000
committerJonathan Callen <jcallen@gentoo.org>2009-11-20 18:47:59 +0000
commitffc88de4085e7c22040b40c9fb13217d771bb56e (patch)
tree030439203095397d67d46e34562d18db5caef24b /kde-base
parentVersion bump. (diff)
downloadhistorical-ffc88de4085e7c22040b40c9fb13217d771bb56e.tar.gz
historical-ffc88de4085e7c22040b40c9fb13217d771bb56e.tar.bz2
historical-ffc88de4085e7c22040b40c9fb13217d771bb56e.zip
Switch to EAPI=2 to add a USE dep
Package-Manager: portage--svn/cvs/Linux i686
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kdelibs/ChangeLog5
-rw-r--r--kde-base/kdelibs/Manifest4
-rw-r--r--kde-base/kdelibs/kdelibs-3.5.10-r6.ebuild16
3 files changed, 15 insertions, 10 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index b8acc078f370..3d1ca9e591a6 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for kde-base/kdelibs
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.642 2009/11/11 14:37:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.643 2009/11/20 18:47:59 abcd Exp $
+
+ 20 Nov 2009; Jonathan Callen <abcd@gentoo.org> kdelibs-3.5.10-r6.ebuild:
+ Switch to EAPI=2 to add a USE dep
11 Nov 2009; Samuli Suominen <ssuominen@gentoo.org>
kdelibs-3.5.10-r6.ebuild:
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 9d6402c83435..31d9fdc22c30 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -15,9 +15,9 @@ DIST kdelibs-3.5-patchset-15.tar.bz2 6707 RMD160 55958374bfc4ba27caf573e13337677
DIST kdelibs-3.5.10.tar.bz2 15614607 RMD160 4c960664283c83ebc8e68932ca9044336fcff223 SHA1 c930a25f4419134def55b8466c3a6f737227fb82 SHA256 617e9cb01c70ed4c1b554b373f55deffbd0e12e2cdfeacd7b3d9409372285c72
DIST kdelibs-4.3.1.tar.bz2 10510833 RMD160 25c8d6225813a677d4f1e1006f18b0d5c14f9003 SHA1 511532852caca9302c643fded4013ef1f57d5433 SHA256 a06ff50031cf14ba929ad2868b3f19434b7acfdcfbce75d87db625786fab615d
DIST kdelibs-4.3.3.tar.bz2 10516364 RMD160 3d6a2c971cef12fb2cb9ba64a10200b2cf098043 SHA1 89b55982e007c44835a9da0f540dd57fa096df45 SHA256 bec0b11b9db010fb14e1bc438ef77dd417a429168eb7d14dc5dee50ea23b5fb3
-EBUILD kdelibs-3.5.10-r6.ebuild 7387 RMD160 27002fd94ae26866efa3beace21997d8128aa105 SHA1 25de2bad84d44bc719ce588d713a5ab9113e6e43 SHA256 4299b87c326664e113877d9dea59987fecf01b9a7a11c97a46d0601dc4c975d2
+EBUILD kdelibs-3.5.10-r6.ebuild 7413 RMD160 96f61256653c2e4ff5f691e6009de8e4dbf4f375 SHA1 494a9b1f108f1942f14a1ee059bde6004140dfc8 SHA256 76dd8b09af6455335e9763e8b0c22d16543244987097c6bdc722cbe5692c364c
EBUILD kdelibs-4.3.1-r1.ebuild 6433 RMD160 3f0a829ef8c9c927da8760d367a1c1e9f7d8983d SHA1 5ee2c2e5cfd4b7b3e344dfcc45e484e128b39cdc SHA256 1bf55897439b9f25873fd8d35f8e2f9ccfdbb4f2d13aab61bbd1e96493782a87
EBUILD kdelibs-4.3.1-r2.ebuild 6429 RMD160 e1e0e5698301f1d27cef09a20f18a40815a231d9 SHA1 23675761bdc73b70fd9ae3a98206e3b50097c27b SHA256 c876c4a38c5f6cd77acec396d4bd1e629a3c1c6f30fb72077ae334385ecc3b1f
EBUILD kdelibs-4.3.3.ebuild 6336 RMD160 4be81b879855b3adb0e3eaf920ed29cf7139d602 SHA1 f812720df12ad6928fddecd9827d0c2dfd9190ec SHA256 d308f1bb873858ffaf7f1da730d30e7ad60e60a5ed365ef3368fb362e073815b
-MISC ChangeLog 107641 RMD160 dedddb289e945da017c19855bf05dbda9d406f71 SHA1 c74292fe8b99fbfaed428ba54986a6a1f4aac9dd SHA256 6ec667f968a79bc7d4214d0b3130bee666a1af2eebb0aef7d63a8f874179f284
+MISC ChangeLog 107748 RMD160 e5488bed42787a9b41a141a2e77dbca892f9376a SHA1 c5871bcea43b8aed4484ac3b59ebda0226fa79b5 SHA256 ec1bd80bee4c3e7a0fb54250175611537ceccbfa7bf288a2aced6675de05cea9
MISC metadata.xml 421 RMD160 1ac2a2321b85031d1a7d25ff97fd87fd7376cc12 SHA1 473e157bcd1bfbef6704dbc47fbe86688973e79e SHA256 03af52377b9a607997590a9cda326fa515c4e21207bf33953cb0e67b5831336d
diff --git a/kde-base/kdelibs/kdelibs-3.5.10-r6.ebuild b/kde-base/kdelibs/kdelibs-3.5.10-r6.ebuild
index 61f5a3d4c799..23f240615a0f 100644
--- a/kde-base/kdelibs/kdelibs-3.5.10-r6.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.5.10-r6.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.10-r6.ebuild,v 1.9 2009/11/11 14:37:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.10-r6.ebuild,v 1.10 2009/11/20 18:47:59 abcd Exp $
-EAPI="1"
+EAPI="2"
ARTS_REQUIRED=never
inherit kde flag-o-matic eutils multilib
set-kdedir 3.5
@@ -54,7 +54,7 @@ RDEPEND="
>=sys-apps/portage-2.1.2.11
virtual/ghostscript
x11-libs/libXext
- >=x11-libs/qt-3.3.3:3
+ >=x11-libs/qt-3.3.3:3[doc?]
acl? (
virtual/acl
)
@@ -115,9 +115,7 @@ pkg_setup() {
fi
}
-src_unpack() {
- kde_src_unpack
-
+src_prepare() {
# remove this symlink, bug 264767
rm -f "${WORKDIR}/${P}"/kdeprint/kdeprint
@@ -156,7 +154,7 @@ src_unpack() {
epatch "${FILESDIR}/${P}-khtml.patch"
}
-src_compile() {
+src_configure() {
rm -f "${S}/configure"
myconf="--with-distribution=Gentoo --disable-fast-malloc
@@ -191,6 +189,10 @@ src_compile() {
replace-flags "-O3" "-O2" # see bug #148180
+ kde_src_configure
+}
+
+src_compile() {
kde_src_compile
if use doc; then