From 362f7faae068ff6789470155ef579058378cd8e4 Mon Sep 17 00:00:00 2001 From: atratsevskiy Date: Mon, 13 Apr 2009 03:38:35 +0000 Subject: [PATCH] git-svn-id: http://svn.calculate.ru/overlay@1214 c91db197-33c1-4113-bf15-f8a5c547ca64 --- kde-base/kdelibs/Manifest | 9 - .../kdelibs/files/4.1.3-cmake-config.patch | 45 ---- .../files/kdelibs-4.1.1-cmake-modules.patch | 69 ------ .../files/kdelibs-4.1.3-klockfile_unix.patch | 13 -- .../files/kdelibs-4.1.4-klockfile_unix.patch | 16 -- kde-base/kdelibs/kdelibs-4.1.3-r9.ebuild | 212 ------------------ kde-base/kdelibs/kdelibs-4.1.3.ebuild | 202 ----------------- kde-base/kdelibs/kdelibs-4.1.4-r9.ebuild | 208 ----------------- 8 files changed, 774 deletions(-) delete mode 100644 kde-base/kdelibs/Manifest delete mode 100644 kde-base/kdelibs/files/4.1.3-cmake-config.patch delete mode 100644 kde-base/kdelibs/files/kdelibs-4.1.1-cmake-modules.patch delete mode 100644 kde-base/kdelibs/files/kdelibs-4.1.3-klockfile_unix.patch delete mode 100644 kde-base/kdelibs/files/kdelibs-4.1.4-klockfile_unix.patch delete mode 100644 kde-base/kdelibs/kdelibs-4.1.3-r9.ebuild delete mode 100644 kde-base/kdelibs/kdelibs-4.1.3.ebuild delete mode 100644 kde-base/kdelibs/kdelibs-4.1.4-r9.ebuild diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest deleted file mode 100644 index 69c8cf580..000000000 --- a/kde-base/kdelibs/Manifest +++ /dev/null @@ -1,9 +0,0 @@ -AUX 4.1.3-cmake-config.patch 2356 RMD160 14f14e29038735ef105893d53cf1b3771e54ee22 SHA1 e69d8449c52df48408401e62b2acba4a6d60bd7f SHA256 06f7513ebb6d9a0507191f81ddf93f7abd47a4c2a300be22756a16425f9f1904 -AUX kdelibs-4.1.1-cmake-modules.patch 2905 RMD160 d7043d4153927ab655c4d7630389024983c6b95a SHA1 9d232044bf51f98656a48092082a5aafcb9d4699 SHA256 8836e0c8267054b2dedcf1c879e57bde67ff83c1b824337dec81d96a3d69754e -AUX kdelibs-4.1.3-klockfile_unix.patch 750 RMD160 17cc56717a475d2e3aeef36f319772307dae40f1 SHA1 b7f142d7f74853be8f6bf655e85da5960c1a316a SHA256 3b35e78ab49aa54936c651800b1feb125d3d9ffae60ad22827feb4c7f44fbadb -AUX kdelibs-4.1.4-klockfile_unix.patch 989 RMD160 0e32b0523be6047fe8a75124aba53716adf7e10c SHA1 a75dcfd1fa572bdf5c701cf106a0f28d4fce64a0 SHA256 07cec8f925d9b13e7fc59183ab6647f6f683026c6d82b9a42793fb5294343d46 -DIST kdelibs-4.1.3.tar.bz2 9123311 RMD160 da0135091efc8fb695cfd6a0492882b8c8672489 SHA1 718e597bd592da709fadefc5e304bb41c9e7b86a SHA256 67740ea7cd1176952aa19983d46471ac5042c1d47c5c626a3c360a1a07a334c8 -DIST kdelibs-4.1.4.tar.bz2 9118858 RMD160 5dcced5c71e990255feff221146ab9bc58f9c65f SHA1 ba7704fd2db207cfda616ce5e1424306f1ebf2c3 SHA256 e98891cfaec6d60e361ed8630c0ecaf019bb4d497f984574ee76963236f43360 -EBUILD kdelibs-4.1.3-r9.ebuild 6050 RMD160 fec89b35164175fd485b4d97f3bfc6b2f64d915d SHA1 63b2714bf91b7629d50d4837646d6913f459fe09 SHA256 3a2170ec7985accce54c93ebaa6062ea895271fd43a55810010936e2d7e901d2 -EBUILD kdelibs-4.1.3.ebuild 5913 RMD160 2382b9ec7b56ba9b6a6d71335e18925667ad7a88 SHA1 181b7991a58afb1b0d7ac6ff2030e27edaf3b656 SHA256 4ba9fc61fe071557779b29437868f03f2fd214ff3b0021fd5541260a1bec7ee2 -EBUILD kdelibs-4.1.4-r9.ebuild 5952 RMD160 cc56e2dd953f50eb49397dc9fd4d112d28048500 SHA1 62ac2508d59be8644c46f71af5ea804467a6ccb9 SHA256 c358bdc3bd054cf31139783e8f65cf4555746571814ba9b242463db32c1e3263 diff --git a/kde-base/kdelibs/files/4.1.3-cmake-config.patch b/kde-base/kdelibs/files/4.1.3-cmake-config.patch deleted file mode 100644 index af6d7f6f0..000000000 --- a/kde-base/kdelibs/files/4.1.3-cmake-config.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- cmake/modules/FindKDE4Internal.cmake.old 2008-11-06 00:48:03.000000000 +0100 -+++ cmake/modules/FindKDE4Internal.cmake 2008-11-06 00:49:11.000000000 +0100 -@@ -953,19 +953,16 @@ - - - if (CMAKE_COMPILER_IS_GNUCXX) -- if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.5) -- set (CMAKE_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES} "Debugfull") -- endif("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.5) - - set (KDE4_ENABLE_EXCEPTIONS -fexceptions) - # Select flags. - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") -- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG") -+ set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -DQT_NO_DEBUG") - set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline") - set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline") - set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") - set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g") -- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG") -+ set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG -DQT_NO_DEBUG") - set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline") - set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline") - set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") -@@ -1064,18 +1061,14 @@ - - if (CMAKE_C_COMPILER MATCHES "icc") - -- if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.5) -- set (CMAKE_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES} "Debugfull") -- endif("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.5) -- - set (KDE4_ENABLE_EXCEPTIONS -fexceptions) - # Select flags. - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") -- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG") -+ set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -DQT_NO_DEBUG") - set(CMAKE_CXX_FLAGS_DEBUG "-O2 -g -fno-inline -noalign") - set(CMAKE_CXX_FLAGS_DEBUGFULL "-g -fno-inline -noalign") - set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g") -- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG") -+ set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG -DQT_NO_DEBUG") - set(CMAKE_C_FLAGS_DEBUG "-O2 -g -fno-inline -noalign") - set(CMAKE_C_FLAGS_DEBUGFULL "-g -fno-inline -noalign") - diff --git a/kde-base/kdelibs/files/kdelibs-4.1.1-cmake-modules.patch b/kde-base/kdelibs/files/kdelibs-4.1.1-cmake-modules.patch deleted file mode 100644 index 95d792887..000000000 --- a/kde-base/kdelibs/files/kdelibs-4.1.1-cmake-modules.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -Naur a/cmake/modules/FindKdcraw.cmake b/cmake/modules/FindKdcraw.cmake ---- a/cmake/modules/FindKdcraw.cmake 2008-05-21 13:06:10.000000000 +0200 -+++ b/cmake/modules/FindKdcraw.cmake 2008-09-22 16:33:42.000000000 +0200 -@@ -69,14 +69,22 @@ - if(KDCRAW_VERSION_GOOD_FOUND) - set(KDCRAW_DEFINITIONS "${_KDCRAWCflags}") - -+ # first try pkgconfig dir, fallback to cmake defaults - FIND_PATH(KDCRAW_INCLUDE_DIR libkdcraw/version.h -+ PATHS - ${_KDCRAWIncDir} -+ ${KDE4_INCLUDE_DIR} -+ NO_DEFAULT_PATH - ) -+ FIND_PATH(KDCRAW_INCLUDE_DIR libkdcraw/version.h) - - FIND_LIBRARY(KDCRAW_LIBRARIES NAMES kdcraw - PATHS - ${_KDCRAWLinkDir} -+ ${KDE4_LIB_DIR} -+ NO_DEFAULT_PATH - ) -+ FIND_LIBRARY(KDCRAW_LIBRARIES NAMES kdcraw) - - if (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES) - set(KDCRAW_FOUND TRUE) -diff -Naur a/cmake/modules/FindKexiv2.cmake b/cmake/modules/FindKexiv2.cmake ---- a/cmake/modules/FindKexiv2.cmake 2008-05-21 13:06:10.000000000 +0200 -+++ b/cmake/modules/FindKexiv2.cmake 2008-09-22 16:32:47.000000000 +0200 -@@ -68,14 +68,22 @@ - if(KEXIV2_VERSION_GOOD_FOUND) - set(KEXIV2_DEFINITIONS "${_KEXIV2Cflags}") - -+ # first try specific paths, use cmake defaults as fallback - FIND_PATH(KEXIV2_INCLUDE_DIR libkexiv2/version.h -+ PATHS - ${_KEXIV2IncDir} -+ ${KDE4_INCLUDE_DIR} -+ NO_DEFAULT_PATH - ) -+ FIND_PATH(KEXIV2_INCLUDE_DIR libkexiv2/version.h) - - FIND_LIBRARY(KEXIV2_LIBRARIES NAMES kexiv2 - PATHS - ${_KEXIV2LinkDir} -+ ${KDE4_LIB_DIR} -+ NO_DEFAULT_PATH - ) -+ FIND_LIBRARY(KEXIV2_LIBRARIES NAMES kexiv2) - - if (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) - set(KEXIV2_FOUND TRUE) -diff -Naur a/cmake/modules/FindKipi.cmake b/cmake/modules/FindKipi.cmake ---- a/cmake/modules/FindKipi.cmake 2008-05-21 13:06:10.000000000 +0200 -+++ b/cmake/modules/FindKipi.cmake 2008-09-22 16:21:37.000000000 +0200 -@@ -68,8 +68,11 @@ - if(KIPI_VERSION_GOOD_FOUND) - set(KIPI_DEFINITIONS ${_KIPICflags}) - -- find_path(KIPI_INCLUDE_DIR NAMES libkipi/version.h PATHS ${KDE4_INCLUDE_DIR} ${_KIPIIncDir}) -- find_library(KIPI_LIBRARIES NAMES kipi PATHS ${KDE4_LIB_DIR} ${_KIPILinkDir}) -+ # as suggested by cmake documentation, first try specific path, then default to searching everything else -+ find_path(KIPI_INCLUDE_DIR NAMES libkipi/version.h PATHS ${_KIPIIncDir} ${KDE4_INCLUDE_DIR} NO_DEFAULT_PATH) -+ find_path(KIPI_INCLUDE_DIR NAMES libkipi/version.h) -+ find_library(KIPI_LIBRARIES NAMES kipi PATHS ${_KIPILinkDir} ${KDE4_LIB_DIR} NO_DEFAULT_PATH) -+ find_library(KIPI_LIBRARIES NAMES kipi) - - if (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES) - set(KIPI_FOUND TRUE) diff --git a/kde-base/kdelibs/files/kdelibs-4.1.3-klockfile_unix.patch b/kde-base/kdelibs/files/kdelibs-4.1.3-klockfile_unix.patch deleted file mode 100644 index 9afc05fd1..000000000 --- a/kde-base/kdelibs/files/kdelibs-4.1.3-klockfile_unix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- kdecore/io/klockfile_unix.cpp (revision 861152) -+++ kdecore/io/klockfile_unix.cpp (working copy) -@@ -173,7 +173,9 @@ static KLockFile::LockResult lockFile(co - if (st_buf != st_buf2 || S_ISLNK(st_buf.st_mode) || S_ISLNK(st_buf2.st_mode)) - { - // SMBFS supports hardlinks by copying the file, as a result the above test will always fail -- if ((st_buf.st_nlink == 1) && (st_buf2.st_nlink == 1) && (st_buf.st_ino != st_buf2.st_ino)) -+ if ( (((st_buf.st_nlink == 1) && (st_buf2.st_nlink == 1)) || -+ ((st_buf.st_nlink == 2) && (st_buf2.st_nlink == 2))) // DF: for #156759, but no idea why -+ && (st_buf.st_ino != st_buf2.st_ino)) - { - linkCountSupport = testLinkCountSupport(uniqueName); - if (!linkCountSupport) diff --git a/kde-base/kdelibs/files/kdelibs-4.1.4-klockfile_unix.patch b/kde-base/kdelibs/files/kdelibs-4.1.4-klockfile_unix.patch deleted file mode 100644 index 59774f5a9..000000000 --- a/kde-base/kdelibs/files/kdelibs-4.1.4-klockfile_unix.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -uNr kdelibs-4.1.4.orig/kdecore/io/klockfile_unix.cpp kdelibs-4.1.4/kdecore/io/klockfile_unix.cpp ---- kdelibs-4.1.4.orig/kdecore/io/klockfile_unix.cpp 2009-01-07 02:37:47.000000000 +0300 -+++ kdelibs-4.1.4/kdecore/io/klockfile_unix.cpp 2009-01-20 11:51:42.000000000 +0300 -@@ -173,8 +174,11 @@ - if (st_buf != st_buf2 || S_ISLNK(st_buf.st_mode) || S_ISLNK(st_buf2.st_mode)) - { - // SMBFS supports hardlinks by copying the file, as a result the above test will always fail -- if ((st_buf.st_nlink == 1) && (st_buf2.st_nlink == 1) && (st_buf.st_ino != st_buf2.st_ino)) -+ if ( (((st_buf.st_nlink == 1) && (st_buf2.st_nlink == 1)) || -+ ((st_buf.st_nlink == 2) && (st_buf2.st_nlink == 2))) // DF: for #156759, but no idea why -+ && (st_buf.st_ino != st_buf2.st_ino)) - { -+ - linkCountSupport = testLinkCountSupport(uniqueName); - if (!linkCountSupport) - return KLockFile::LockOK; // Link count support is missing... assume everything is OK. diff --git a/kde-base/kdelibs/kdelibs-4.1.3-r9.ebuild b/kde-base/kdelibs/kdelibs-4.1.3-r9.ebuild deleted file mode 100644 index d3cdd1cea..000000000 --- a/kde-base/kdelibs/kdelibs-4.1.3-r9.ebuild +++ /dev/null @@ -1,212 +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/kdelibs/kdelibs-4.1.3-r1.ebuild,v 1.2 2008/11/16 05:04:28 vapier Exp $ - -EAPI="2" - -CPPUNIT_REQUIRED="optional" -OPENGL_REQUIRED="optional" -inherit kde4-base fdo-mime - -DESCRIPTION="KDE libraries needed by all KDE programs." -HOMEPAGE="http://www.kde.org/" - -SLOT="4.1" - -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam htmlhandbook jpeg2k -kerberos mmx nls openexr +semantic-desktop spell sse sse2 ssl zeroconf" -LICENSE="LGPL-2.1" -RESTRICT="test" - -COMMONDEPEND=" - !=app-misc/strigi-0.5.9 - >=dev-libs/libxml2-2.6.6 - >=dev-libs/libxslt-1.1.17 - media-libs/fontconfig - >=media-libs/freetype-2 - media-libs/giflib - media-libs/jpeg - media-libs/libpng - >=media-sound/phonon-4.2.0 - >=sys-apps/dbus-0.91[X] - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXcursor - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXft - x11-libs/libXpm - x11-libs/libXrender - x11-libs/libXtst - >=x11-misc/shared-mime-info-0.20 - acl? ( kernel_linux? ( sys-apps/acl ) ) - alsa? ( >=media-libs/alsa-lib-1.0.14a[midi] ) - fam? ( virtual/fam ) - jpeg2k? ( media-libs/jasper ) - kerberos? ( virtual/krb5 ) - nls? ( virtual/libintl ) - openexr? ( >=media-libs/openexr-1.2.2-r2 media-libs/ilmbase ) - opengl? ( virtual/opengl ) - >=dev-libs/libpcre-4.5 - semantic-desktop? ( >=dev-libs/soprano-2.1 ) - spell? ( app-text/aspell app-dicts/aspell-en app-text/enchant ) - ssl? ( >=dev-libs/openssl-0.9.7d ) - zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] - !bindist? ( net-misc/mDNSResponder ) ) ) -" - -DEPEND="${COMMONDEPEND} - doc? ( app-doc/doxygen ) - sys-devel/gettext -" - -RDEPEND="${COMMONDEPEND} - x11-apps/rgb - x11-apps/iceauth -" - -# adding patch (klockfile_unix) for correcting bug N156759 (cifs and .lock files) -PATCHES=( "${FILESDIR}/${PN}-4.1.1-cmake-modules.patch" - "${FILESDIR}/${PV}-cmake-config.patch" - "${FILESDIR}/${P}-klockfile_unix.patch" ) - -src_configure() { - if use zeroconf; then - if has_version net-dns/avahi; then - mycmakeargs="${mycmakeargs} -DWITH_Avahi=ON -DWITH_DNSSD=OFF" - elif has_version net-misc/mDNSResponder; then - mycmakeargs="${mycmakeargs} -DWITH_Avahi=OFF -DWITH_DNSSD=ON" - else - die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found." - fi - fi - if use kdeprefix; then - HME=".kde${SLOT}" - else - HME=".kde4" - fi - mycmakeargs="${mycmakeargs} - -DWITH_HSPELL=OFF - -DKDE_DEFAULT_HOME=${HME} - $(cmake-utils_has 3dnow X86_3DNOW) - $(cmake-utils_has altivec PPC_ALTIVEC) - $(cmake-utils_has mmx X86_MMX) - $(cmake-utils_has sse X86_SSE) - $(cmake-utils_has sse2 X86_SSE2) - $(cmake-utils_use_with acl ACL) - $(cmake-utils_use_with alsa Alsa) - $(cmake-utils_use_with bzip2 BZip2) - $(cmake-utils_use_with fam FAM) - $(cmake-utils_use_with jpeg2k Jasper) - $(cmake-utils_use_with kerberos GSSAPI) - $(cmake-utils_use_with nls Libintl) - $(cmake-utils_use_with openexr OpenEXR) - $(cmake-utils_use_with opengl OpenGL) - $(cmake-utils_use_with semantic-desktop Soprano) - $(cmake-utils_use_with spell ASPELL) - $(cmake-utils_use_with spell ENCHANT) - $(cmake-utils_use_with ssl OpenSSL) - " - kde4-base_src_configure -} - -src_compile() { - kde4-base_src_compile - - # The building of apidox is not managed anymore by the build system - if use doc; then - einfo "Building API documentation" - cd "${S}"/doc/api/ - ./doxygen.sh "${S}" || die "APIDOX generation failed" - fi -} - -src_install() { - kde4-base_src_install - - if use doc; then - einfo "Installing API documentation. This could take a bit of time." - cd "${S}"/doc/api/ - docinto /HTML/en/kdelibs-apidox - dohtml -r ${P}-apidocs/* || die "Install phase of KDE4 API Documentation failed" - fi - - dodir /etc/env.d - dodir /etc/revdep-rebuild - - # List all the multilib libdirs - local _libdir _libdirs - for _libdir in $(get_all_libdirs); do - _libdirs="${_libdirs}:${PREFIX}/${_libdir}" - done - _libdirs=${_libdirs#:} - - if use kdeprefix; then - cat <<-EOF > "${T}"/43kdepaths-${SLOT} # number goes down with version -PATH="${PREFIX}/bin" -ROOTPATH="${PREFIX}/sbin:${PREFIX}/bin" -LDPATH="${_libdirs}" -MANPATH="${PREFIX}/share/man" -CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config" -#KDE_IS_PRELINKED=1 -XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share" -COLON_SEPARATED="XDG_DATA_DIRS" -EOF - doenvd "${T}"/43kdepaths-${SLOT} - - # make sure 'source /etc/profile' doesn't hose the PATH - dodir /etc/profile.d - cat <<-'EOF' > "${D}"/etc/profile.d/44kdereorderpaths-${SLOT}.sh -if [ -n "${KDEDIR}" ]; then - export PATH=${KDEDIR}/bin:$(echo ${PATH} | sed "s#${KDEDIR}/s\?bin:##g") - export ROOTPATH=${KDEDIR}/sbin:${KDEDIR}/bin:$(echo ${PATH} | sed "s#${KDEDIR}/s\?bin:##g") -fi -EOF - - cat <<-EOF > "${D}/etc/revdep-rebuild/50-kde-${SLOT}" -SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*" -EOF - else # Much simpler for the FHS compliant -kdeprefix install - cat <<-EOF > "${T}"/43kdepaths # number goes down with version -CONFIG_PROTECT="/usr/share/config" -#KDE_IS_PRELINKED=1 -XDG_DATA_DIRS="/usr/share:/usr/local/share" -COLON_SEPARATED="XDG_DATA_DIRS" - EOF - doenvd "${T}"/43kdepaths - fi - # Ensure that the correct permissions are set on ${PREFIX}/share/config - chmod 755 "${D}"/"${PREFIX}"/share/config -} - -pkg_postinst() { - fdo-mime_mime_database_update - - if use zeroconf; then - echo - elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon" - elog "is running. Make sure also that multicast dns lookups are enabled by editing" - elog "the 'hosts:' line in /etc/nsswitch.conf to include 'mdns', e.g.:" - elog " hosts: files mdns dns" - echo - fi - - kde4-base_pkg_postinst -} - -pkg_postrm() { - fdo-mime_mime_database_update - - kde4-base_pkg_postrm -} diff --git a/kde-base/kdelibs/kdelibs-4.1.3.ebuild b/kde-base/kdelibs/kdelibs-4.1.3.ebuild deleted file mode 100644 index 00bc553d5..000000000 --- a/kde-base/kdelibs/kdelibs-4.1.3.ebuild +++ /dev/null @@ -1,202 +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/kdelibs/kdelibs-4.1.3.ebuild,v 1.1 2008/11/09 02:16:44 scarabeus Exp $ - -EAPI="2" - -CPPUNIT_REQUIRED="optional" -OPENGL_REQUIRED="optional" -inherit kde4-base - -DESCRIPTION="KDE libraries needed by all KDE programs." -HOMEPAGE="http://www.kde.org/" - -KEYWORDS="~amd64 ~x86" -IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam htmlhandbook jpeg2k -kerberos mmx nls openexr +semantic-desktop spell sse sse2 ssl zeroconf" -LICENSE="LGPL-2.1" -RESTRICT="test" - -COMMONDEPEND=" - !=app-misc/strigi-0.5.9 - >=dev-libs/libxml2-2.6.6 - >=dev-libs/libxslt-1.1.17 - media-libs/fontconfig - >=media-libs/freetype-2 - media-libs/giflib - media-libs/jpeg - media-libs/libpng - >=media-sound/phonon-4.2.0 - >=sys-apps/dbus-0.91[X] - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXcursor - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXft - x11-libs/libXpm - x11-libs/libXrender - x11-libs/libXtst - >=x11-misc/shared-mime-info-0.20 - acl? ( kernel_linux? ( sys-apps/acl ) ) - alsa? ( >=media-libs/alsa-lib-1.0.14a[midi] ) - fam? ( virtual/fam ) - jpeg2k? ( media-libs/jasper ) - kerberos? ( virtual/krb5 ) - nls? ( virtual/libintl ) - openexr? ( >=media-libs/openexr-1.2.2-r2 media-libs/ilmbase ) - opengl? ( virtual/opengl ) - >=dev-libs/libpcre-4.5 - semantic-desktop? ( >=dev-libs/soprano-2.1 ) - spell? ( app-text/aspell app-dicts/aspell-en app-text/enchant ) - ssl? ( >=dev-libs/openssl-0.9.7d ) - zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] - !bindist? ( net-misc/mDNSResponder ) ) ) -" - -DEPEND="${COMMONDEPEND} - doc? ( app-doc/doxygen ) - sys-devel/gettext -" - -RDEPEND="${COMMONDEPEND} - x11-apps/rgb - x11-apps/iceauth -" - -# adding patch (klockfile_unix) for correcting bug N156759 (cifs and .lock files) -PATCHES=( "${FILESDIR}/${PN}-4.1.1-cmake-modules.patch" - "${FILESDIR}/${PV}-cmake-config.patch" - "${FILESDIR}/${P}-klockfile_unix.patch" ) - -src_configure() { - if use zeroconf; then - if has_version net-dns/avahi; then - mycmakeargs="${mycmakeargs} -DWITH_Avahi=ON -DWITH_DNSSD=OFF" - elif has_version net-misc/mDNSResponder; then - mycmakeargs="${mycmakeargs} -DWITH_Avahi=OFF -DWITH_DNSSD=ON" - else - die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found." - fi - fi - if use kdeprefix; then - HME=".kde${SLOT}" - else - HME=".kde4" - fi - mycmakeargs="${mycmakeargs} - -DWITH_HSPELL=OFF - -DKDE_DEFAULT_HOME=${HME} - $(cmake-utils_has 3dnow X86_3DNOW) - $(cmake-utils_has altivec PPC_ALTIVEC) - $(cmake-utils_has mmx X86_MMX) - $(cmake-utils_has sse X86_SSE) - $(cmake-utils_has sse2 X86_SSE2) - $(cmake-utils_use_with acl ACL) - $(cmake-utils_use_with alsa Alsa) - $(cmake-utils_use_with bzip2 BZip2) - $(cmake-utils_use_with fam FAM) - $(cmake-utils_use_with jpeg2k Jasper) - $(cmake-utils_use_with kerberos GSSAPI) - $(cmake-utils_use_with nls Libintl) - $(cmake-utils_use_with openexr OpenEXR) - $(cmake-utils_use_with opengl OpenGL) - $(cmake-utils_use_with semantic-desktop Soprano) - $(cmake-utils_use_with spell ASPELL) - $(cmake-utils_use_with spell ENCHANT) - $(cmake-utils_use_with ssl OpenSSL) - " - kde4-base_src_configure -} - -src_compile() { - kde4-base_src_compile - - # The building of apidox is not managed anymore by the build system - if use doc; then - einfo "Building API documentation" - cd "${S}"/doc/api/ - ./doxygen.sh "${S}" || die "APIDOX generation failed" - fi -} - -src_install() { - kde4-base_src_install - - if use doc; then - einfo "Installing API documentation. This could take a bit of time." - cd "${S}"/doc/api/ - docinto /HTML/en/kdelibs-apidox - dohtml -r ${P}-apidocs/* || die "Install phase of KDE4 API Documentation failed" - fi - - dodir /etc/env.d - dodir /etc/revdep-rebuild - - # List all the multilib libdirs - local _libdir _libdirs - for _libdir in $(get_all_libdirs); do - _libdirs="${_libdirs}:${PREFIX}/${_libdir}" - done - _libdirs=${_libdirs#:} - - if use kdeprefix; then - cat <<-EOF > "${T}"/43kdepaths-${SLOT} # number goes down with version -PATH="${PREFIX}/bin" -ROOTPATH="${PREFIX}/sbin:${PREFIX}/bin" -LDPATH="${_libdirs}" -MANPATH="${PREFIX}/share/man" -CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config" -#KDE_IS_PRELINKED=1 -XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share" -COLON_SEPARATED="XDG_DATA_DIRS" -EOF - doenvd "${T}"/43kdepaths-${SLOT} - - # make sure 'source /etc/profile' doesn't hose the PATH - dodir /etc/profile.d - cat <<-'EOF' > "${D}"/etc/profile.d/44kdereorderpaths-${SLOT}.sh -if [ -n "${KDEDIR}" ]; then - export PATH=${KDEDIR}/bin:$(echo ${PATH} | sed "s#${KDEDIR}/s\?bin:##g") - export ROOTPATH=${KDEDIR}/sbin:${KDEDIR}/bin:$(echo ${PATH} | sed "s#${KDEDIR}/s\?bin:##g") -fi -EOF - - cat <<-EOF > "${D}/etc/revdep-rebuild/50-kde-${SLOT}" -SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*" -EOF - else # Much simpler for the FHS compliant -kdeprefix install - cat <<-EOF > "${T}"/43kdepaths # number goes down with version -CONFIG_PROTECT="/usr/share/config" -#KDE_IS_PRELINKED=1 -XDG_DATA_DIRS="/usr/share:/usr/local/share" -COLON_SEPARATED="XDG_DATA_DIRS" - EOF - doenvd "${T}"/43kdepaths - fi - # Ensure that the correct permissions are set on ${PREFIX}/share/config - chmod 755 "${D}"/"${PREFIX}"/share/config -} - -pkg_postinst() { - if use zeroconf; then - echo - elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon" - elog "is running. Make sure also that multicast dns lookups are enabled by editing" - elog "the 'hosts:' line in /etc/nsswitch.conf to include 'mdns', e.g.:" - elog " hosts: files mdns dns" - echo - fi - - kde4-base_pkg_postinst -} diff --git a/kde-base/kdelibs/kdelibs-4.1.4-r9.ebuild b/kde-base/kdelibs/kdelibs-4.1.4-r9.ebuild deleted file mode 100644 index 62bf0a9af..000000000 --- a/kde-base/kdelibs/kdelibs-4.1.4-r9.ebuild +++ /dev/null @@ -1,208 +0,0 @@ -# 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.1.4.ebuild,v 1.1 2009/01/13 21:41:04 alexxy Exp $ - -EAPI="2" - -CPPUNIT_REQUIRED="optional" -OPENGL_REQUIRED="optional" -inherit kde4-base fdo-mime - -DESCRIPTION="KDE libraries needed by all KDE programs." -HOMEPAGE="http://www.kde.org/" - -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam htmlhandbook jpeg2k -kerberos mmx nls openexr +semantic-desktop spell sse sse2 ssl zeroconf" -LICENSE="LGPL-2.1" -RESTRICT="test" - -COMMONDEPEND=" - !=app-misc/strigi-0.5.9 - >=dev-libs/libxml2-2.6.6 - >=dev-libs/libxslt-1.1.17 - media-libs/fontconfig - >=media-libs/freetype-2 - media-libs/giflib - media-libs/jpeg - media-libs/libpng - >=media-sound/phonon-4.2.0 - >=sys-apps/dbus-0.91[X] - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXcursor - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXft - x11-libs/libXpm - x11-libs/libXrender - x11-libs/libXtst - >=x11-misc/shared-mime-info-0.20 - acl? ( kernel_linux? ( sys-apps/acl ) ) - alsa? ( >=media-libs/alsa-lib-1.0.14a[midi] ) - fam? ( virtual/fam ) - jpeg2k? ( media-libs/jasper ) - kerberos? ( virtual/krb5 ) - nls? ( virtual/libintl ) - openexr? ( >=media-libs/openexr-1.2.2-r2 media-libs/ilmbase ) - opengl? ( virtual/opengl ) - >=dev-libs/libpcre-4.5 - semantic-desktop? ( >=dev-libs/soprano-2.1 ) - spell? ( app-text/aspell app-dicts/aspell-en app-text/enchant ) - ssl? ( >=dev-libs/openssl-0.9.7d ) - zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] - !bindist? ( net-misc/mDNSResponder ) ) ) -" - -DEPEND="${COMMONDEPEND} - doc? ( app-doc/doxygen ) - sys-devel/gettext -" - -RDEPEND="${COMMONDEPEND} - x11-apps/rgb - x11-apps/iceauth -" - -PATCHES=( "${FILESDIR}/${PN}-4.1.1-cmake-modules.patch" "${FILESDIR}/4.1.3-cmake-config.patch" - "${FILESDIR}/${P}-klockfile_unix.patch" ) - -src_configure() { - if use zeroconf; then - if has_version net-dns/avahi; then - mycmakeargs="${mycmakeargs} -DWITH_Avahi=ON -DWITH_DNSSD=OFF" - elif has_version net-misc/mDNSResponder; then - mycmakeargs="${mycmakeargs} -DWITH_Avahi=OFF -DWITH_DNSSD=ON" - else - die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found." - fi - fi - if use kdeprefix; then - HME=".kde${SLOT}" - else - HME=".kde4" - fi - mycmakeargs="${mycmakeargs} - -DWITH_HSPELL=OFF - -DKDE_DEFAULT_HOME=${HME} - $(cmake-utils_has 3dnow X86_3DNOW) - $(cmake-utils_has altivec PPC_ALTIVEC) - $(cmake-utils_has mmx X86_MMX) - $(cmake-utils_has sse X86_SSE) - $(cmake-utils_has sse2 X86_SSE2) - $(cmake-utils_use_with acl ACL) - $(cmake-utils_use_with alsa Alsa) - $(cmake-utils_use_with bzip2 BZip2) - $(cmake-utils_use_with fam FAM) - $(cmake-utils_use_with jpeg2k Jasper) - $(cmake-utils_use_with kerberos GSSAPI) - $(cmake-utils_use_with nls Libintl) - $(cmake-utils_use_with openexr OpenEXR) - $(cmake-utils_use_with opengl OpenGL) - $(cmake-utils_use_with semantic-desktop Soprano) - $(cmake-utils_use_with spell ASPELL) - $(cmake-utils_use_with spell ENCHANT) - $(cmake-utils_use_with ssl OpenSSL) - " - kde4-base_src_configure -} - -src_compile() { - kde4-base_src_compile - - # The building of apidox is not managed anymore by the build system - if use doc; then - einfo "Building API documentation" - cd "${S}"/doc/api/ - ./doxygen.sh "${S}" || die "APIDOX generation failed" - fi -} - -src_install() { - kde4-base_src_install - - if use doc; then - einfo "Installing API documentation. This could take a bit of time." - cd "${S}"/doc/api/ - docinto /HTML/en/kdelibs-apidox - dohtml -r ${P}-apidocs/* || die "Install phase of KDE4 API Documentation failed" - fi - - dodir /etc/env.d - dodir /etc/revdep-rebuild - - # List all the multilib libdirs - local _libdir _libdirs - for _libdir in $(get_all_libdirs); do - _libdirs="${_libdirs}:${PREFIX}/${_libdir}" - done - _libdirs=${_libdirs#:} - - if use kdeprefix; then - cat <<-EOF > "${T}"/43kdepaths-${SLOT} # number goes down with version -PATH="${PREFIX}/bin" -ROOTPATH="${PREFIX}/sbin:${PREFIX}/bin" -LDPATH="${_libdirs}" -MANPATH="${PREFIX}/share/man" -CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config" -#KDE_IS_PRELINKED=1 -XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share" -COLON_SEPARATED="XDG_DATA_DIRS" -EOF - doenvd "${T}"/43kdepaths-${SLOT} - - # make sure 'source /etc/profile' doesn't hose the PATH - dodir /etc/profile.d - cat <<-'EOF' > "${D}"/etc/profile.d/44kdereorderpaths-${SLOT}.sh -if [ -n "${KDEDIR}" ]; then - export PATH=${KDEDIR}/bin:$(echo ${PATH} | sed "s#${KDEDIR}/s\?bin:##g") - export ROOTPATH=${KDEDIR}/sbin:${KDEDIR}/bin:$(echo ${PATH} | sed "s#${KDEDIR}/s\?bin:##g") -fi -EOF - - cat <<-EOF > "${D}/etc/revdep-rebuild/50-kde-${SLOT}" -SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*" -EOF - else # Much simpler for the FHS compliant -kdeprefix install - cat <<-EOF > "${T}"/43kdepaths # number goes down with version -CONFIG_PROTECT="/usr/share/config" -#KDE_IS_PRELINKED=1 -XDG_DATA_DIRS="/usr/share:/usr/local/share" -COLON_SEPARATED="XDG_DATA_DIRS" - EOF - doenvd "${T}"/43kdepaths - fi - # Ensure that the correct permissions are set on ${PREFIX}/share/config - chmod 755 "${D}"/"${PREFIX}"/share/config -} - -pkg_postinst() { - fdo-mime_mime_database_update - - if use zeroconf; then - echo - elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon" - elog "is running. Make sure also that multicast dns lookups are enabled by editing" - elog "the 'hosts:' line in /etc/nsswitch.conf to include 'mdns', e.g.:" - elog " hosts: files mdns dns" - echo - fi - - kde4-base_pkg_postinst -} - -pkg_postrm() { - fdo-mime_mime_database_update - - kde4-base_pkg_postrm -}