summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kde-base/kdelibs/ChangeLog7
-rw-r--r--kde-base/kdelibs/Manifest12
-rw-r--r--kde-base/kdelibs/kdelibs-4.2.1-r4.ebuild8
-rw-r--r--kde-base/kdelibs/kdelibs-4.2.2.ebuild18
-rw-r--r--kde-base/kdelibs/kdelibs-4.2.67.ebuild13
-rw-r--r--kde-base/kdelibs/kdelibs-9999.ebuild13
-rw-r--r--kde-base/kdelibs/metadata.xml1
7 files changed, 29 insertions, 43 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 377f16e6458..f673d20face 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 29 Mar 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+ metadata.xml, kdelibs-4.2.1-r4.ebuild, kdelibs-4.2.2.ebuild,
+ kdelibs-4.2.67.ebuild, kdelibs-9999.ebuild:
+ No way, let alpha/sparc team handle webkit issues, better not split plasna
+ from kdelibs and create new maintenance nightmare (and looking for
+ associations with opengl USE flag)
+
28 Mar 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
metadata.xml, kdelibs-4.2.2.ebuild, kdelibs-4.2.67.ebuild,
kdelibs-9999.ebuild:
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 96bddf5a6ca..e41631287d9 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -14,9 +14,9 @@ AUX kdelibs-4.2.1-qt4.5.patch 19805 RMD160 4a266bdbe3d9dcc088f7abbffc2b46714d572
DIST kdelibs-4.2.1.tar.bz2 10049614 RMD160 8099366677a4d238d8cfa18862f74c4fafa49ef7 SHA1 d2214b9864b64e4a8382a9f593d082c801c58571 SHA256 25ee5be213c4f1ccaf6f19a1a2375c3b23f6e2b4602a45542758e58782a0864d
DIST kdelibs-4.2.2.tar.bz2 10051587 RMD160 98227bc896bf484833f48bec5638a4bf38e903c5 SHA1 0517cabd5fb2121897d2029ebf46f12f9373fa64 SHA256 634f4806fde8a9f37341548430bef3c1d7b63e2b722c740c7360d35d7dff3f8f
DIST kdelibs-4.2.67.tar.lzma 8402560 RMD160 ade0e15ead2d8f8cd5cc05a319cdb43ceb58b740 SHA1 74e04c462aa646759a0bf908f87b7ebaaeb1ec68 SHA256 9b3ecec821e4742c9bfae111b360c5b05e2ce18193571e65175ea6b5deec2a93
-EBUILD kdelibs-4.2.1-r4.ebuild 7412 RMD160 bde0242651cd88c82c96bd023982de35a5981531 SHA1 e8b584f031f7aaf05ccd0a91a52e5930ada2e9cb SHA256 3ef89da7793e6c19c5fa7e271a20b51530db0d3e7fba85f89c0a00c63f900238
-EBUILD kdelibs-4.2.2.ebuild 7259 RMD160 c064e3097a73fe90cba7c21d068a0482ce9ef9bf SHA1 a453a21c447bdf5627f936de684fc8b334fe8825 SHA256 f2650aff98b073e5e6dab15a7da8f2f269dd522ca503a78b72078234f309d519
-EBUILD kdelibs-4.2.67.ebuild 6748 RMD160 373da1a29acfefd592c45f842ad9969637095bf2 SHA1 507aa8fb7ab836d18db5fcf3b7dcacbc779a94de SHA256 e6943cb0f5fd151f19c2dcf2a00f42c0718e712baac9b8ea33fbd475fda5414a
-EBUILD kdelibs-9999.ebuild 6737 RMD160 0df93fe73eafb260234be4826ae55a8cbf66581c SHA1 7c74c5c4756a23ca0b24bf35c7912fd7e5df3d75 SHA256 866db3b69183ece8af07a4961ec576458f22853252e51b554490e728cd39ad1b
-MISC ChangeLog 13739 RMD160 4ca68d31ab5f8a300adfc10df9d6a2c8a5c64162 SHA1 f5ae992b7862431e3e99d9979886ab35cf1829cc SHA256 b198acd55c91bc4321602ff8a1effcf18da32d396f8f2fd88cf11c145b5771e4
-MISC metadata.xml 326 RMD160 340a86daa935afbe480ce867feb1a2caeac3573d SHA1 425782f2cb21e439a09cf8a1fbb0f82b546fccc2 SHA256 804d71fd6933ba89ecbfa5313be288b6b0f1bf364ed720f691d99f53d8bac22d
+EBUILD kdelibs-4.2.1-r4.ebuild 7278 RMD160 f0e5e3f2a43d48d653a90765ca4075a4b329dd7d SHA1 4970115df92ed98c27a6e463bff3e4de81882c21 SHA256 303eeddaaf01d3de7d8509038c6e0027c4b4e49b13fb11b80f4543f6eb440663
+EBUILD kdelibs-4.2.2.ebuild 6911 RMD160 e8022e7cb0b49ae75fc21fec03ea3e4ceeee3390 SHA1 ddbdfeb2a291fe34c0150328b8050e8809260aa4 SHA256 d9d56b756e0ad731576f97368c673fa85541dae9d9daef871f83ca0d9247376b
+EBUILD kdelibs-4.2.67.ebuild 6506 RMD160 7054524fd4641c6e4f7bca40eaa44274385c6815 SHA1 a08616315a3c685c1659974e52d1408650de491e SHA256 b30e249e60e8db15989035c01e650e0873da55196a2c08013a6d9f92d9e5f128
+EBUILD kdelibs-9999.ebuild 6495 RMD160 ef20fda81988a40f9caf9ec4a3eb0b8e928acdf1 SHA1 ecf524b9dc379b6a01b7c7bd8111eff07f9b2595 SHA256 a4fd718a59d757d5a64e0b9d634ff7d85561314401d56f340a4439df4daaedae
+MISC ChangeLog 14096 RMD160 87fbc734bfb61217383b4ed52ca0df74a0654c43 SHA1 ef7313fae60005284ac48e2dc57369df206be4b2 SHA256 6544a3ae54e038e37c52291dfff39121137723ef44caeac63335986b4dbb1b21
+MISC metadata.xml 241 RMD160 e23ea97bfdc981201294af826fc0f315ebc0c663 SHA1 65e562c9b76e5c338c984bdd9dd5f1026013c0d3 SHA256 3f6cec1e375ad99ac2929f89e8fbe74237333497106dfc52c36af0aa5629b139
diff --git a/kde-base/kdelibs/kdelibs-4.2.1-r4.ebuild b/kde-base/kdelibs/kdelibs-4.2.1-r4.ebuild
index 855670c07db..ed451c1d3da 100644
--- a/kde-base/kdelibs/kdelibs-4.2.1-r4.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.2.1-r4.ebuild
@@ -1,6 +1,6 @@
# 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-4.2.1-r3.ebuild,v 1.2 2009/03/26 21:54:05 jmbsvicetto Exp $
+# $Header: $
EAPI="2"
@@ -13,13 +13,14 @@ DESCRIPTION="KDE libraries needed by all KDE programs."
HOMEPAGE="http://www.kde.org/"
KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+LICENSE="LGPL-2.1"
IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam jpeg2k kerberos
mmx nls openexr +semantic-desktop spell sse sse2 ssl zeroconf"
-LICENSE="LGPL-2.1"
+
RESTRICT="test"
COMMONDEPEND="
- >=app-misc/strigi-0.6.3[qt4,dbus]
+ >=app-misc/strigi-0.6.3[dbus,qt4]
dev-libs/libpcre
dev-libs/libxml2
dev-libs/libxslt
@@ -58,7 +59,6 @@ COMMONDEPEND="
media-libs/openexr
media-libs/ilmbase
)
- opengl? ( virtual/opengl )
semantic-desktop? ( >=dev-libs/soprano-2.2.2[dbus] )
spell? (
app-dicts/aspell-en
diff --git a/kde-base/kdelibs/kdelibs-4.2.2.ebuild b/kde-base/kdelibs/kdelibs-4.2.2.ebuild
index debe0017ce0..4da647deb43 100644
--- a/kde-base/kdelibs/kdelibs-4.2.2.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.2.2.ebuild
@@ -1,19 +1,22 @@
# 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-4.2.1-r3.ebuild,v 1.1 2009/03/23 04:37:11 jmbsvicetto Exp $
+# $Header: $
EAPI="2"
CPPUNIT_REQUIRED="optional"
+OPENGL_REQUIRED="optional"
+WEBKIT_REQUIRED="always"
inherit kde4-base fdo-mime
DESCRIPTION="KDE libraries needed by all KDE programs."
HOMEPAGE="http://www.kde.org/"
KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam jpeg2k kerberos
-mmx nls opengl openexr +plasma +semantic-desktop spell sse sse2 ssl zeroconf"
LICENSE="LGPL-2.1"
+IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam jpeg2k kerberos
+mmx nls openexr +semantic-desktop spell sse sse2 ssl zeroconf"
+
RESTRICT="test"
COMMONDEPEND="
@@ -56,10 +59,6 @@ COMMONDEPEND="
media-libs/openexr
media-libs/ilmbase
)
- plasma? (
- x11-libs/qt-webkit:4
- opengl? ( x11-libs/qt-opengl:4 )
- )
semantic-desktop? ( >=dev-libs/soprano-2.2.2[dbus] )
spell? (
app-dicts/aspell-en
@@ -121,10 +120,6 @@ src_prepare() {
CMakeLists.txt \
|| die "Failed to make ACL disabled even when present in system."
- sed -i -e 's/add_subdirectory([[:space:]]plasma[[:space:]])/macro_optional_add_subdirectory( plasma )/' \
- CMakeLists.txt \
- || die "Failed to make libplasma optional."
-
kde4-base_src_prepare
}
@@ -160,7 +155,6 @@ src_configure() {
$(cmake-utils_use_with nls Libintl)
$(cmake-utils_use_with openexr OpenEXR)
$(cmake-utils_use_with opengl OpenGL)
- $(cmake-utils_use_build plasma)
$(cmake-utils_use_with semantic-desktop Soprano)
$(cmake-utils_use_with spell ASPELL)
$(cmake-utils_use_with spell ENCHANT)
diff --git a/kde-base/kdelibs/kdelibs-4.2.67.ebuild b/kde-base/kdelibs/kdelibs-4.2.67.ebuild
index e3d9611c1d0..993edb3e0ab 100644
--- a/kde-base/kdelibs/kdelibs-4.2.67.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.2.67.ebuild
@@ -5,6 +5,8 @@
EAPI="2"
CPPUNIT_REQUIRED="optional"
+OPENGL_REQUIRED="optional"
+WEBKIT_REQUIRED="always"
inherit kde4-base fdo-mime
DESCRIPTION="KDE libraries needed by all KDE programs."
@@ -13,7 +15,7 @@ HOMEPAGE="http://www.kde.org/"
KEYWORDS="~amd64 ~x86"
LICENSE="LGPL-2.1"
IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam jpeg2k kerberos
-mmx nls opengl openexr +plasma +semantic-desktop spell sse sse2 ssl zeroconf"
+mmx nls openexr +semantic-desktop spell sse sse2 ssl zeroconf"
RESTRICT="test"
@@ -56,10 +58,6 @@ COMMONDEPEND="
media-libs/openexr
media-libs/ilmbase
)
- plasma? (
- x11-libs/qt-webkit:4
- opengl? ( x11-libs/qt-opengl:4 )
- )
semantic-desktop? ( >=dev-libs/soprano-2.2.2[dbus] )
spell? (
app-dicts/aspell-en
@@ -111,10 +109,6 @@ src_prepare() {
CMakeLists.txt \
|| die "Failed to make ACL disabled even when present in system."
- sed -i -e 's/add_subdirectory([[:space:]]plasma[[:space:]])/macro_optional_add_subdirectory( plasma )/' \
- CMakeLists.txt \
- || die "Failed to make libplasma optional."
-
kde4-base_src_prepare
}
@@ -150,7 +144,6 @@ src_configure() {
$(cmake-utils_use_with nls Libintl)
$(cmake-utils_use_with openexr OpenEXR)
$(cmake-utils_use_with opengl OpenGL)
- $(cmake-utils_use_build plasma)
$(cmake-utils_use_with semantic-desktop Soprano)
$(cmake-utils_use_with spell ASPELL)
$(cmake-utils_use_with spell ENCHANT)
diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild
index de35d5f5296..215d574db0d 100644
--- a/kde-base/kdelibs/kdelibs-9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-9999.ebuild
@@ -5,6 +5,8 @@
EAPI="2"
CPPUNIT_REQUIRED="optional"
+OPENGL_REQUIRED="optional"
+WEBKIT_REQUIRED="always"
inherit kde4-base fdo-mime
DESCRIPTION="KDE libraries needed by all KDE programs."
@@ -13,7 +15,7 @@ HOMEPAGE="http://www.kde.org/"
KEYWORDS=""
LICENSE="LGPL-2.1"
IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam jpeg2k kerberos
-mmx nls opengl openexr +plasma +semantic-desktop spell sse sse2 ssl zeroconf"
+mmx nls openexr +semantic-desktop spell sse sse2 ssl zeroconf"
RESTRICT="test"
@@ -56,10 +58,6 @@ COMMONDEPEND="
media-libs/openexr
media-libs/ilmbase
)
- plasma? (
- x11-libs/qt-webkit:4
- opengl? ( x11-libs/qt-opengl:4 )
- )
semantic-desktop? ( >=dev-libs/soprano-2.2.2[dbus] )
spell? (
app-dicts/aspell-en
@@ -111,10 +109,6 @@ src_prepare() {
CMakeLists.txt \
|| die "Failed to make ACL disabled even when present in system."
- sed -i -e 's/add_subdirectory([[:space:]]plasma[[:space:]])/macro_optional_add_subdirectory( plasma )/' \
- CMakeLists.txt \
- || die "Failed to make libplasma optional."
-
kde4-base_src_prepare
}
@@ -150,7 +144,6 @@ src_configure() {
$(cmake-utils_use_with nls Libintl)
$(cmake-utils_use_with openexr OpenEXR)
$(cmake-utils_use_with opengl OpenGL)
- $(cmake-utils_use_build plasma)
$(cmake-utils_use_with semantic-desktop Soprano)
$(cmake-utils_use_with spell ASPELL)
$(cmake-utils_use_with spell ENCHANT)
diff --git a/kde-base/kdelibs/metadata.xml b/kde-base/kdelibs/metadata.xml
index 70b8173e9b5..33b621a89af 100644
--- a/kde-base/kdelibs/metadata.xml
+++ b/kde-base/kdelibs/metadata.xml
@@ -4,6 +4,5 @@
<herd>kde</herd>
<use>
<flag name="opengl">Enable OpenGL support for Plasma (GLApplet)</flag>
- <flag name="plasma">Enable building of libplasma (required for KDE4 desktop)</flag>
</use>
</pkgmetadata>