From fb68bba1f0227eb362b9438dc7956a901d433d9a Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Wed, 6 Apr 2011 14:19:31 +0000 Subject: KDE SC 4.6.2 version bump. Drop 4.6.{0,1} and 4.5.5. This is our stable candidate so test and test more. Force due to some unmet deps. Filled as bug #362305. (Portage version: 2.2.0_alpha29/cvs/Linux x86_64, RepoMan options: --force) --- kde-base/kdepimlibs/ChangeLog | 9 +++- kde-base/kdepimlibs/kdepimlibs-4.5.5.ebuild | 71 ---------------------------- kde-base/kdepimlibs/kdepimlibs-4.6.0.ebuild | 71 ---------------------------- kde-base/kdepimlibs/kdepimlibs-4.6.1.ebuild | 72 ----------------------------- kde-base/kdepimlibs/kdepimlibs-4.6.2.ebuild | 72 +++++++++++++++++++++++++++++ 5 files changed, 80 insertions(+), 215 deletions(-) delete mode 100644 kde-base/kdepimlibs/kdepimlibs-4.5.5.ebuild delete mode 100644 kde-base/kdepimlibs/kdepimlibs-4.6.0.ebuild delete mode 100644 kde-base/kdepimlibs/kdepimlibs-4.6.1.ebuild create mode 100644 kde-base/kdepimlibs/kdepimlibs-4.6.2.ebuild (limited to 'kde-base/kdepimlibs') diff --git a/kde-base/kdepimlibs/ChangeLog b/kde-base/kdepimlibs/ChangeLog index 7dd022ceaa10..913f4e79419b 100644 --- a/kde-base/kdepimlibs/ChangeLog +++ b/kde-base/kdepimlibs/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for kde-base/kdepimlibs # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/ChangeLog,v 1.92 2011/03/26 17:15:48 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/ChangeLog,v 1.93 2011/04/06 14:19:01 scarabeus Exp $ + +*kdepimlibs-4.6.2 (06 Apr 2011) + + 06 Apr 2011; Tomáš Chvátal + -kdepimlibs-4.5.5.ebuild, -kdepimlibs-4.6.0.ebuild, -kdepimlibs-4.6.1.ebuild, + +kdepimlibs-4.6.2.ebuild: + Version bump KDE SC 4.6.2 26 Mar 2011; Andreas K. Huettel kdepimlibs-4.4.5.ebuild, kdepimlibs-4.5.5.ebuild, kdepimlibs-4.6.0.ebuild, diff --git a/kde-base/kdepimlibs/kdepimlibs-4.5.5.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.5.5.ebuild deleted file mode 100644 index 6c06643a5858..000000000000 --- a/kde-base/kdepimlibs/kdepimlibs-4.5.5.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.5.5.ebuild,v 1.2 2011/03/26 17:15:48 dilfridge Exp $ - -EAPI="3" - -KDE_HANDBOOK="optional" -CPPUNIT_REQUIRED="optional" -inherit kde4-base - -DESCRIPTION="Common library for KDE PIM apps." -HOMEPAGE="http://www.kde.org/" - -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -LICENSE="LGPL-2.1" -IUSE="debug ldap semantic-desktop" - -# some akonadi tests timeout, that probaly needs more work as its ~700 tests -RESTRICT="test" - -DEPEND=" - >=app-crypt/gpgme-1.1.6 - >=dev-libs/boost-1.35.0-r5 - dev-libs/libgpg-error - >=dev-libs/libical-0.43 - dev-libs/cyrus-sasl - semantic-desktop? ( - >=app-office/akonadi-server-1.3.60 - $(add_kdebase_dep kdelibs 'semantic-desktop') - media-libs/phonon - x11-misc/shared-mime-info - ) - ldap? ( net-nds/openldap ) -" -RDEPEND="${DEPEND}" - -# libakonadi-kcal moved here from akonadi in 4.3.86 -add_blocker akonadi '<4.3.86' -# @since 4.3 - libkholidays is in kdepimlibs now -add_blocker libkholidays -# @since 4.4 - kontactinterfaces is in kdepimlibs now -add_blocker kontactinterfaces - -src_prepare() { - kde4-base_src_prepare - - # Disable hardcoded checks - sed -r -e '/find_package\((Akonadi|SharedDesktopOntologies|Soprano|Nepomuk)/{/macro_optional_/!s/find/macro_optional_&/}' \ - -e '/macro_log_feature\((Akonadi|SHAREDDESKTOPONTOLOGIES|Soprano|Nepomuk)_FOUND/s/ TRUE / FALSE /' \ - -e '/add_subdirectory\((akonadi|mailtransport)/{/macro_optional_/!s/add/macro_optional_&/}' \ - -i CMakeLists.txt || die - if ! use semantic-desktop; then - sed -e '/include(SopranoAddOntology)/s/^/#DISABLED /' \ - -i CMakeLists.txt || die - # More reliable than -DBUILD_akonadi=OFF - rm -r akonadi mailtransport || die - fi -} - -src_configure() { - mycmakeargs=( - $(cmake-utils_use_build handbook doc) - $(cmake-utils_use_with ldap) - $(cmake-utils_use_with semantic-desktop Akonadi) - $(cmake-utils_use_with semantic-desktop SharedDesktopOntologies) - $(cmake-utils_use_with semantic-desktop Soprano) - $(cmake-utils_use_with semantic-desktop Nepomuk) - ) - - kde4-base_src_configure -} diff --git a/kde-base/kdepimlibs/kdepimlibs-4.6.0.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.6.0.ebuild deleted file mode 100644 index c9d370348a15..000000000000 --- a/kde-base/kdepimlibs/kdepimlibs-4.6.0.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.6.0.ebuild,v 1.3 2011/03/26 17:15:48 dilfridge Exp $ - -EAPI="3" - -KDE_HANDBOOK="optional" -CPPUNIT_REQUIRED="optional" -inherit kde4-base - -DESCRIPTION="Common library for KDE PIM apps." -HOMEPAGE="http://www.kde.org/" - -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -LICENSE="LGPL-2.1" -IUSE="debug ldap semantic-desktop" - -# some akonadi tests timeout, that probaly needs more work as its ~700 tests -RESTRICT="test" - -DEPEND=" - >=app-crypt/gpgme-1.1.7 - >=dev-libs/boost-1.35.0-r5 - dev-libs/libgpg-error - >=dev-libs/libical-0.43 - dev-libs/cyrus-sasl - semantic-desktop? ( - >=app-office/akonadi-server-1.4.52 - $(add_kdebase_dep kdelibs 'semantic-desktop') - media-libs/phonon - x11-misc/shared-mime-info - ) - ldap? ( net-nds/openldap ) -" -RDEPEND="${DEPEND}" - -# libakonadi-kcal moved here from akonadi in 4.3.86 -add_blocker akonadi '<4.3.86' -# @since 4.3 - libkholidays is in kdepimlibs now -add_blocker libkholidays -# @since 4.4 - kontactinterfaces is in kdepimlibs now -add_blocker kontactinterfaces - -src_prepare() { - kde4-base_src_prepare - - # Disable hardcoded checks - sed -r -e '/find_package\((Akonadi|SharedDesktopOntologies|Soprano|Nepomuk)/{/macro_optional_/!s/find/macro_optional_&/}' \ - -e '/macro_log_feature\((Akonadi|SHAREDDESKTOPONTOLOGIES|Soprano|Nepomuk)_FOUND/s/ TRUE / FALSE /' \ - -e '/add_subdirectory\((akonadi|mailtransport)/{/macro_optional_/!s/add/macro_optional_&/}' \ - -i CMakeLists.txt || die - if ! use semantic-desktop; then - sed -e '/include(SopranoAddOntology)/s/^/#DISABLED /' \ - -i CMakeLists.txt || die - # More reliable than -DBUILD_akonadi=OFF - rm -r akonadi mailtransport || die - fi -} - -src_configure() { - mycmakeargs=( - $(cmake-utils_use_build handbook doc) - $(cmake-utils_use_with ldap) - $(cmake-utils_use_with semantic-desktop Akonadi) - $(cmake-utils_use_with semantic-desktop SharedDesktopOntologies) - $(cmake-utils_use_with semantic-desktop Soprano) - $(cmake-utils_use_with semantic-desktop Nepomuk) - ) - - kde4-base_src_configure -} diff --git a/kde-base/kdepimlibs/kdepimlibs-4.6.1.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.6.1.ebuild deleted file mode 100644 index 535f0e020c2b..000000000000 --- a/kde-base/kdepimlibs/kdepimlibs-4.6.1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.6.1.ebuild,v 1.2 2011/03/26 17:15:48 dilfridge Exp $ - -EAPI=3 - -KDE_HANDBOOK="optional" -CPPUNIT_REQUIRED="optional" -KDE_SCM="git" -inherit kde4-base - -DESCRIPTION="Common library for KDE PIM apps." -HOMEPAGE="http://www.kde.org/" - -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -LICENSE="LGPL-2.1" -IUSE="debug ldap semantic-desktop" - -# some akonadi tests timeout, that probaly needs more work as its ~700 tests -RESTRICT="test" - -DEPEND=" - >=app-crypt/gpgme-1.1.6 - >=dev-libs/boost-1.35.0-r5 - dev-libs/libgpg-error - >=dev-libs/libical-0.43 - dev-libs/cyrus-sasl - semantic-desktop? ( - >=app-office/akonadi-server-1.4.52 - $(add_kdebase_dep kdelibs 'semantic-desktop') - media-libs/phonon - x11-misc/shared-mime-info - ) - ldap? ( net-nds/openldap ) -" -RDEPEND="${DEPEND}" - -# libakonadi-kcal moved here from akonadi in 4.3.86 -add_blocker akonadi '<4.3.86' -# @since 4.3 - libkholidays is in kdepimlibs now -add_blocker libkholidays -# @since 4.4 - kontactinterfaces is in kdepimlibs now -add_blocker kontactinterfaces - -src_prepare() { - kde4-base_src_prepare - - # Disable hardcoded checks - sed -r -e '/find_package\((Akonadi|SharedDesktopOntologies|Soprano|Nepomuk)/{/macro_optional_/!s/find/macro_optional_&/}' \ - -e '/macro_log_feature\((Akonadi|SHAREDDESKTOPONTOLOGIES|Soprano|Nepomuk)_FOUND/s/ TRUE / FALSE /' \ - -e '/add_subdirectory\((akonadi|mailtransport)/{/macro_optional_/!s/add/macro_optional_&/}' \ - -i CMakeLists.txt || die - if ! use semantic-desktop; then - sed -e '/include(SopranoAddOntology)/s/^/#DISABLED /' \ - -i CMakeLists.txt || die - # More reliable than -DBUILD_akonadi=OFF - rm -r akonadi mailtransport || die - fi -} - -src_configure() { - mycmakeargs=( - $(cmake-utils_use_build handbook doc) - $(cmake-utils_use_with ldap) - $(cmake-utils_use_with semantic-desktop Akonadi) - $(cmake-utils_use_with semantic-desktop SharedDesktopOntologies) - $(cmake-utils_use_with semantic-desktop Soprano) - $(cmake-utils_use_with semantic-desktop Nepomuk) - ) - - kde4-base_src_configure -} diff --git a/kde-base/kdepimlibs/kdepimlibs-4.6.2.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.6.2.ebuild new file mode 100644 index 000000000000..d26cdb468ecd --- /dev/null +++ b/kde-base/kdepimlibs/kdepimlibs-4.6.2.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.6.2.ebuild,v 1.1 2011/04/06 14:19:01 scarabeus Exp $ + +EAPI=3 + +KDE_HANDBOOK="optional" +CPPUNIT_REQUIRED="optional" +KDE_SCM="git" +inherit kde4-base + +DESCRIPTION="Common library for KDE PIM apps." +HOMEPAGE="http://www.kde.org/" + +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +LICENSE="LGPL-2.1" +IUSE="debug ldap semantic-desktop" + +# some akonadi tests timeout, that probaly needs more work as its ~700 tests +RESTRICT="test" + +DEPEND=" + >=app-crypt/gpgme-1.1.6 + >=dev-libs/boost-1.35.0-r5 + dev-libs/libgpg-error + >=dev-libs/libical-0.43 + dev-libs/cyrus-sasl + semantic-desktop? ( + >=app-office/akonadi-server-1.4.52 + $(add_kdebase_dep kdelibs 'semantic-desktop') + media-libs/phonon + x11-misc/shared-mime-info + ) + ldap? ( net-nds/openldap ) +" +RDEPEND="${DEPEND}" + +# libakonadi-kcal moved here from akonadi in 4.3.86 +add_blocker akonadi '<4.3.86' +# @since 4.3 - libkholidays is in kdepimlibs now +add_blocker libkholidays +# @since 4.4 - kontactinterfaces is in kdepimlibs now +add_blocker kontactinterfaces + +src_prepare() { + kde4-base_src_prepare + + # Disable hardcoded checks + sed -r -e '/find_package\((Akonadi|SharedDesktopOntologies|Soprano|Nepomuk)/{/macro_optional_/!s/find/macro_optional_&/}' \ + -e '/macro_log_feature\((Akonadi|SHAREDDESKTOPONTOLOGIES|Soprano|Nepomuk)_FOUND/s/ TRUE / FALSE /' \ + -e '/add_subdirectory\((akonadi|mailtransport)/{/macro_optional_/!s/add/macro_optional_&/}' \ + -i CMakeLists.txt || die + if ! use semantic-desktop; then + sed -e '/include(SopranoAddOntology)/s/^/#DISABLED /' \ + -i CMakeLists.txt || die + # More reliable than -DBUILD_akonadi=OFF + rm -r akonadi mailtransport || die + fi +} + +src_configure() { + mycmakeargs=( + $(cmake-utils_use_build handbook doc) + $(cmake-utils_use_with ldap) + $(cmake-utils_use_with semantic-desktop Akonadi) + $(cmake-utils_use_with semantic-desktop SharedDesktopOntologies) + $(cmake-utils_use_with semantic-desktop Soprano) + $(cmake-utils_use_with semantic-desktop Nepomuk) + ) + + kde4-base_src_configure +} -- cgit v1.2.3-65-gdbad