From: Ingmar Vanhassel Date: Tue, 19 Feb 2008 00:00:46 +0000 (+0000) Subject: Remove monolithic KDE 4.0, bug 209586. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=fab8c071aae11fbd045bfa5e36a7d1c1bb3e3433;p=gentoo.git Remove monolithic KDE 4.0, bug 209586. Package-Manager: portage-2.1.4.4 RepoMan-Options: --force --- diff --git a/kde-base/kdeaccessibility/ChangeLog b/kde-base/kdeaccessibility/ChangeLog index dbeb1cf89cd7..2c5f40e959c7 100644 --- a/kde-base/kdeaccessibility/ChangeLog +++ b/kde-base/kdeaccessibility/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdeaccessibility # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/ChangeLog,v 1.150 2008/02/17 03:13:27 ingmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/ChangeLog,v 1.151 2008/02/18 23:53:10 ingmar Exp $ + + 18 Feb 2008; Ingmar Vanhassel + -kdeaccessibility-4.0.0.ebuild: + Remove monolithic KDE 4.0, bug 209586. 17 Feb 2008; Ingmar Vanhassel -kdeaccessibility-3.5.6.ebuild, -kdeaccessibility-3.5.7.ebuild: diff --git a/kde-base/kdeaccessibility/kdeaccessibility-4.0.0.ebuild b/kde-base/kdeaccessibility/kdeaccessibility-4.0.0.ebuild deleted file mode 100644 index 93c2324df1db..000000000000 --- a/kde-base/kdeaccessibility/kdeaccessibility-4.0.0.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/kdeaccessibility-4.0.0.ebuild,v 1.1 2008/01/17 23:38:26 philantrop Exp $ - -EAPI="1" - -inherit kde4-base - -DESCRIPTION="KDE accessibility module" -HOMEPAGE="http://www.kde.org/" - -KEYWORDS="~amd64 ~x86" -IUSE="debug htmlhandbook alsa ktts" -LICENSE="GPL-2 LGPL-2" - -COMMONDEPEND="ktts? ( alsa? ( >=media-libs/alsa-lib-1.0.14a ) ) - || ( >=kde-base/kdebase-${PV}:${SLOT} - ( >=kde-base/kcmshell-${PV}:${SLOT} - >=kde-base/knotify-${PV}:${SLOT} - >=kde-base/phonon-${PV}:${SLOT} ) )" - -DEPEND="${DEPEND} ${COMMONDEPEND}" - -RDEPEND="${RDEPEND} ${COMMONDEPEND} - ktts? ( app-accessibility/festival - app-accessibility/epos - app-accessibility/freetts ) - app-accessibility/flite" - -src_compile() { - mycmakeargs="${mycmakeargs} - $(cmake-utils_use_with alsa Alsa) - -DKDE4_KTTSD_PHONON=$(use alsa && echo ON || echo OFF) - -DKDE4_KTTSD_ALSA=$(use alsa && echo ON || echo OFF) - $(cmake-utils_use_with ktts Kttsmodule) - -DKDE4_KTTSD_EPOS=ON - -DKDE4_KTTSD_FESTIVAL=ON - -DKDE4_KTTSD_FLITE=ON - -DKDE4_KTTSD_FREETTS=ON - -DKDE4_KTTSD_HADIFIX=OFF" - - kde4-base_src_compile -} diff --git a/kde-base/kdeartwork/ChangeLog b/kde-base/kdeartwork/ChangeLog index c8127d9f0430..c0aefce5e7d6 100644 --- a/kde-base/kdeartwork/ChangeLog +++ b/kde-base/kdeartwork/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdeartwork # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/ChangeLog,v 1.205 2008/02/18 13:10:05 ingmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/ChangeLog,v 1.206 2008/02/18 23:55:06 ingmar Exp $ + + 18 Feb 2008; Ingmar Vanhassel + -kdeartwork-4.0.0.ebuild: + Remove monolithic KDE 4.0, bug 209586. 18 Feb 2008; Ingmar Vanhassel -kdeartwork-3.5.5.ebuild, -kdeartwork-3.5.6.ebuild, diff --git a/kde-base/kdeartwork/kdeartwork-4.0.0.ebuild b/kde-base/kdeartwork/kdeartwork-4.0.0.ebuild deleted file mode 100644 index f8d0e0c35f2f..000000000000 --- a/kde-base/kdeartwork/kdeartwork-4.0.0.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-4.0.0.ebuild,v 1.2 2008/01/18 03:05:58 mr_bones_ Exp $ - -EAPI="1" - -inherit kde4-base - -DESCRIPTION="KDE artwork module" -HOMEPAGE="http://www.kde.org/" - -KEYWORDS="~amd64 ~x86" -IUSE="debug htmlhandbook opengl xscreensaver" -LICENSE="GPL-2 LGPL-2" - -RESTRICT="binchecks strip" - -DEPEND="${DEPEND} - || ( >=kde-base/kdebase-${PV}:${SLOT} - >=kde-base/kscreensaver-${PV}:${SLOT} ) - media-libs/libart_lgpl - opengl? ( virtual/opengl ) - xscreensaver? ( x11-misc/xscreensaver )" -RDEPEND="${DEPEND}" - -pkg_setup() { - if use opengl; then - if has_version kde-base/kscreensaver:${SLOT}; then - KDE4_BUILT_WITH_USE_CHECK=" - kde-base/kscreensaver:${SLOT} opengl" - else - KDE4_BUILT_WITH_USE_CHECK=" - kde-base/kdebase:${SLOT} opengl" - fi - fi - - kde4-base_pkg_setup -} - -src_compile() { - mycmakeargs="${mycmakeargs} - $(cmake-utils_use_with opengl OpenGL) - $(cmake-utils_use_with xscreensaver Xscreensaver)" - - kde4-base_src_compile -} diff --git a/kde-base/kdesdk/ChangeLog b/kde-base/kdesdk/ChangeLog index c79e9b81b7ac..fda877fe79bc 100644 --- a/kde-base/kdesdk/ChangeLog +++ b/kde-base/kdesdk/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/kdesdk # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/ChangeLog,v 1.162 2008/02/18 22:53:47 zlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/ChangeLog,v 1.163 2008/02/18 23:53:04 ingmar Exp $ + + 18 Feb 2008; Ingmar Vanhassel -kdesdk-4.0.0.ebuild: + Remove monolithic KDE 4.0, bug 209586. 18 Feb 2008; Bo Ørsted Andresen kdesdk-3.5.5.ebuild, kdesdk-3.5.8.ebuild, kdesdk-4.0.0.ebuild: diff --git a/kde-base/kdesdk/kdesdk-4.0.0.ebuild b/kde-base/kdesdk/kdesdk-4.0.0.ebuild deleted file mode 100644 index 618822b26e57..000000000000 --- a/kde-base/kdesdk/kdesdk-4.0.0.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-4.0.0.ebuild,v 1.2 2008/02/18 22:53:47 zlin Exp $ - -EAPI="1" - -inherit kde4-base - -DESCRIPTION="KDE SDK: Cervisia, KBabel, KCachegrind, Kompare, Umbrello,..." -HOMEPAGE="http://www.kde.org/" - -KEYWORDS="~amd64 ~x86" -IUSE="debug htmlhandbook subversion" -LICENSE="GPL-2 LGPL-2" - -DEPEND="dev-libs/libxml2 - dev-libs/libxslt - || ( >=kde-base/plasma-${PV}:${SLOT} - >=kde-base/kdebase-${PV}:${SLOT} ) - subversion? ( dev-libs/apr dev-util/subversion )" -RDEPEND="${DEPEND} - dev-util/cvs - media-gfx/graphviz" - -pkg_setup() { - if use subversion ; then - if ldd /usr/bin/svn | grep -q libapr-0 \ - && ! has_version dev-libs/apr:0; - then - eerror "Subversion has been built against =dev-libs/apr-0*, but no matching version is installed." - die "Please rebuild dev-util/subversion." - fi - if ldd /usr/bin/svn | grep -q libapr-1 \ - && ! has_version dev-libs/apr:1; - then - eerror "Subversion has been built against =dev-libs/apr-1*, but no matching version is installed." - die "Please rebuild dev-util/subversion." - fi - fi - - kde4svn_pkg_setup -} - -src_compile() { - mycmakeargs="${mycmakeargs} - $(cmake-utils_use_with subversion SVN)" - - if use subversion; then - if ldd /usr/bin/svn | grep -q libapr-0; then - mycmakeargs="${mycmakeargs} -DAPRCONFIG_EXECUTABLE=/usr/bin/apr-config" - else - mycmakeargs="${mycmakeargs} -DAPRCONFIG_EXECUTABLE=/usr/bin/apr-1-config" - fi - fi - - kde4-base_src_compile -} - -pkg_postinst() { - kde4-base_pkg_postinst - - echo - elog "To make full use of ${PN} you should emerge >=dev-util/valgrind-3.2.0 and/or" - elog "dev-util/oprofile." - echo -} diff --git a/kde-base/kdetoys/ChangeLog b/kde-base/kdetoys/ChangeLog index 935eaaa149e3..79c43dc1a6c1 100644 --- a/kde-base/kdetoys/ChangeLog +++ b/kde-base/kdetoys/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/kdetoys # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/ChangeLog,v 1.193 2008/02/17 02:06:43 ingmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/ChangeLog,v 1.194 2008/02/19 00:00:46 ingmar Exp $ + + 18 Feb 2008; Ingmar Vanhassel -kdetoys-4.0.0.ebuild: + Remove monolithic KDE 4.0, bug 209586. 16 Feb 2008; Ingmar Vanhassel -kdetoys-3.5.6.ebuild, -kdetoys-3.5.7.ebuild: diff --git a/kde-base/kdetoys/kdetoys-4.0.0.ebuild b/kde-base/kdetoys/kdetoys-4.0.0.ebuild deleted file mode 100644 index fd85a816b4e9..000000000000 --- a/kde-base/kdetoys/kdetoys-4.0.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/kdetoys-4.0.0.ebuild,v 1.1 2008/01/17 23:55:50 philantrop Exp $ - -EAPI="1" - -inherit kde4-base - -DESCRIPTION="KDE toys module" -HOMEPAGE="http://www.kde.org/" - -KEYWORDS="~amd64 ~x86" -IUSE="debug htmlhandbook" -LICENSE="GPL-2 LGPL-2" - -RESTRICT="test" - -COMMON_DEPEND=">=app-misc/strigi-0.5.7 - || ( >=kde-base/kdebase-${PV}:${SLOT} - ( >=kde-base/kscreensaver-${PV}:${SLOT} >=kde-base/plasma-${PV}:${SLOT} ) )" -DEPEND="${DEPEND} ${COMMON_DEPEND}" -RDEPEND="${RDEPEND} ${COMMON_DEPEND}" - -src_compile() { - mycmakeargs="${mycmakeargs} - -DWITH_Plasma=ON" - - kde4-base_src_compile -} diff --git a/kde-base/kdeutils/ChangeLog b/kde-base/kdeutils/ChangeLog index e1ccf64786e0..986c15d20e25 100644 --- a/kde-base/kdeutils/ChangeLog +++ b/kde-base/kdeutils/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/kdeutils # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.224 2008/02/17 02:12:35 ingmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.225 2008/02/18 23:59:12 ingmar Exp $ + + 18 Feb 2008; Ingmar Vanhassel -kdeutils-4.0.0.ebuild: + Remove monolithic KDE 4.0, bug 209586. 16 Feb 2008; Ingmar Vanhassel -kdeutils-3.5.6.ebuild, -kdeutils-3.5.7.ebuild, -kdeutils-3.5.7-r1.ebuild, -kdeutils-3.5.8.ebuild: diff --git a/kde-base/kdeutils/kdeutils-4.0.0.ebuild b/kde-base/kdeutils/kdeutils-4.0.0.ebuild deleted file mode 100644 index 56e4ec6c1c00..000000000000 --- a/kde-base/kdeutils/kdeutils-4.0.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-4.0.0.ebuild,v 1.1 2008/01/17 23:56:29 philantrop Exp $ - -EAPI="1" -inherit kde4-base - -DESCRIPTION="KDE utilities." -HOMEPAGE="http://www.kde.org/" - -KEYWORDS="~amd64 ~x86" -IUSE="debug archive crypt htmlhandbook python tpctl xscreensaver zip" -LICENSE="GPL-2 LGPL-2" - -COMMON_DEPEND=">=kde-base/kdebase-${PV}:${SLOT} - dev-libs/gmp - tpctl? ( app-laptop/tpctl ) - python? ( dev-lang/python ) - archive? ( app-arch/libarchive ) - zip? ( >=dev-libs/libzip-0.8 ) - x11-libs/libXtst" -RDEPEND="${COMMON_DEPEND} - crypt? ( app-crypt/gnupg ) - virtual/ssh" -DEPEND="${COMMON_DEPEND} - kernel_linux? ( virtual/os-headers ) - xscreensaver? ( x11-libs/libXScrnSaver ) - x11-libs/libX11 - x11-proto/xproto" - -src_compile() { - # Disabling xmms support: not in portage. - mycmakeargs="${mycmakeargs} -DWITH_Xmms=OFF - $(cmake-utils_use_with archive LibArchive) - $(cmake-utils_use_with tpctl TPCTL) - $(cmake-utils_use_with python PythonLibs) - $(cmake-utils_use_with zip LibZip)" - - kde4-base_src_configure - - # Ok, this is a really ugly hack but it's needed if superkaramba is built - # with Python because src_compile would fail with undefined symbols from - # libdl and libutil. If you bump this, please try commenting this out. -# sed -i -e "s:-Wl,-rpath:-ldl -lutil -Wl,-rpath:" \ -# ./superkaramba/src/CMakeFiles/superkaramba.dir/link.txt || die "Python hack failed." - - kde4-base_src_make -} - -src_test() { - pushd "${WORKDIR}"/${PN}_build/kcalc/knumber/tests > /dev/null - emake knumbertest && \ - ./knumbertest.shell || die "Tests failed." - popd > /dev/null -}