summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--kde-base/kdelibs/ChangeLog6
-rw-r--r--kde-base/kdelibs/Manifest10
-rw-r--r--kde-base/kdelibs/kdelibs-4.2.2.ebuild17
-rw-r--r--kde-base/kdelibs/kdelibs-4.2.67.ebuild14
-rw-r--r--kde-base/kdelibs/kdelibs-9999.ebuild14
-rw-r--r--kde-base/kdelibs/metadata.xml4
6 files changed, 46 insertions, 19 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index dcb94802f48..377f16e6458 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -3,6 +3,12 @@
# $Header: $
28 Mar 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+ metadata.xml, kdelibs-4.2.2.ebuild, kdelibs-4.2.67.ebuild,
+ kdelibs-9999.ebuild:
+ plasma is now optional USE flag in kdelibs, pull opengl only for plasma as
+ well
+
+ 28 Mar 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+files/kdelibs-4.2-fixx11h.h.patch, +kdelibs-4.2.1-r4.ebuild,
kdelibs-4.2.2.ebuild:
This time really fixing bug 263823
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 8016b24ae3f..96bddf5a6ca 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -15,8 +15,8 @@ DIST kdelibs-4.2.1.tar.bz2 10049614 RMD160 8099366677a4d238d8cfa18862f74c4fafa49
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 7096 RMD160 97ad3f6cd0afcf3d8018c57965f1ef4c1dda9f17 SHA1 23c565303776e5cd9e7a9fa7429c0b688d7fc510 SHA256 3c3c8a10694021c3b36aa27feac2632d52750ac9b5b2bf444b18ca6da763112b
-EBUILD kdelibs-4.2.67.ebuild 6534 RMD160 e8dcaf77b531361dfe6460bbb5593fe0ab845237 SHA1 82117e9c689d0c113f8b7802945f7fa8a0806f4b SHA256 4fa7c821cbb7e860576b75a45f147e4ff08b45d7237762b1d2af0baeebee6863
-EBUILD kdelibs-9999.ebuild 6523 RMD160 68cee2b60a84ecfded1f800251e2dd8fc2f1954d SHA1 05bef0d05024c7741f5939187d4cd906ea07961c SHA256 4a04adbf95aa2dcccd86682db45ebe63af188221d9a67e4d6688db8bfdb730fb
-MISC ChangeLog 13506 RMD160 1c13856cc54ef54c0e8c60c89c133021baf90ed0 SHA1 d9e24f14b696a62a8b217448fbde79e32fe6fff5 SHA256 f4badf4a0398db76e162e6f2168436cc888c00cdb44a6ce92961ec071dd2467a
-MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+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
diff --git a/kde-base/kdelibs/kdelibs-4.2.2.ebuild b/kde-base/kdelibs/kdelibs-4.2.2.ebuild
index b7e30a6aa70..debe0017ce0 100644
--- a/kde-base/kdelibs/kdelibs-4.2.2.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.2.2.ebuild
@@ -5,8 +5,6 @@
EAPI="2"
CPPUNIT_REQUIRED="optional"
-OPENGL_REQUIRED="optional"
-WEBKIT_REQUIRED="optional"
inherit kde4-base fdo-mime
DESCRIPTION="KDE libraries needed by all KDE programs."
@@ -14,12 +12,12 @@ 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 openexr plasma +semantic-desktop spell sse sse2 ssl zeroconf"
+mmx nls opengl openexr +plasma +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,8 +56,10 @@ COMMONDEPEND="
media-libs/openexr
media-libs/ilmbase
)
- opengl? ( virtual/opengl )
- plasma? ( >=x11-base/xorg-server-1.5.2 )
+ 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,6 +121,10 @@ 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
}
@@ -156,6 +160,7 @@ 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 0885ca4feab..e3d9611c1d0 100644
--- a/kde-base/kdelibs/kdelibs-4.2.67.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.2.67.ebuild
@@ -5,8 +5,6 @@
EAPI="2"
CPPUNIT_REQUIRED="optional"
-OPENGL_REQUIRED="optional"
-WEBKIT_REQUIRED="always"
inherit kde4-base fdo-mime
DESCRIPTION="KDE libraries needed by all KDE programs."
@@ -15,7 +13,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 openexr +semantic-desktop spell sse sse2 ssl zeroconf"
+mmx nls opengl openexr +plasma +semantic-desktop spell sse sse2 ssl zeroconf"
RESTRICT="test"
@@ -58,7 +56,10 @@ COMMONDEPEND="
media-libs/openexr
media-libs/ilmbase
)
- opengl? ( virtual/opengl )
+ 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
@@ -110,6 +111,10 @@ 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
}
@@ -145,6 +150,7 @@ 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 c6a90943d4f..de35d5f5296 100644
--- a/kde-base/kdelibs/kdelibs-9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-9999.ebuild
@@ -5,8 +5,6 @@
EAPI="2"
CPPUNIT_REQUIRED="optional"
-OPENGL_REQUIRED="optional"
-WEBKIT_REQUIRED="always"
inherit kde4-base fdo-mime
DESCRIPTION="KDE libraries needed by all KDE programs."
@@ -15,7 +13,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 openexr +semantic-desktop spell sse sse2 ssl zeroconf"
+mmx nls opengl openexr +plasma +semantic-desktop spell sse sse2 ssl zeroconf"
RESTRICT="test"
@@ -58,7 +56,10 @@ COMMONDEPEND="
media-libs/openexr
media-libs/ilmbase
)
- opengl? ( virtual/opengl )
+ 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
@@ -110,6 +111,10 @@ 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
}
@@ -145,6 +150,7 @@ 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 8d1e86a9cef..70b8173e9b5 100644
--- a/kde-base/kdelibs/metadata.xml
+++ b/kde-base/kdelibs/metadata.xml
@@ -2,4 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<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>
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-10 01:48:19 +0000