summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-05-13 09:57:43 +0200
committerTomas Chvatal <scarabeus@gentoo.org>2009-05-13 09:57:43 +0200
commit72de0a2c5d75e714022079a350b39da84ce6602d (patch)
treed732e6ea783e55b1970815624acafe8a5b24e226
parentd416702d355a688dc5782fe34183c3eca838d5c4 (diff)
downloadkde-72de0a2c5d75e714022079a350b39da84ce6602d.tar.gz
kde-72de0a2c5d75e714022079a350b39da84ce6602d.tar.bz2
kde-72de0a2c5d75e714022079a350b39da84ce6602d.zip
Revert "[kde-base/libkworkspace] Update cmake loader for kdebase-workspace includes"
This reverts commit 4fa7036ebcb6c7cd898318613846bb0d29218710.
-rw-r--r--kde-base/libkworkspace/Manifest9
-rw-r--r--kde-base/libkworkspace/files/KDE4WorkspaceLibraryTargets.cmake32
-rw-r--r--kde-base/libkworkspace/libkworkspace-4.2.3-r1.ebuild31
-rw-r--r--kde-base/libkworkspace/libkworkspace-4.2.85.ebuild11
-rw-r--r--kde-base/libkworkspace/libkworkspace-4.2.9999.ebuild11
-rw-r--r--kde-base/libkworkspace/libkworkspace-9999.ebuild11
6 files changed, 3 insertions, 102 deletions
diff --git a/kde-base/libkworkspace/Manifest b/kde-base/libkworkspace/Manifest
index ea7ebf8b9d8..d1c1a3013ff 100644
--- a/kde-base/libkworkspace/Manifest
+++ b/kde-base/libkworkspace/Manifest
@@ -1,9 +1,6 @@
-AUX KDE4WorkspaceLibraryTargets.cmake 1114 RMD160 b8242a14c4192a6ee009a26c1bf5d795ead88711 SHA1 30164c643889517e8522af6f97e171db4126f777 SHA256 6c145e45e3736496e51399d606c2d6909ad7b59316e5d7a98bac236f36e8e17f
-DIST kdebase-workspace-4.2.3.tar.bz2 50801994 RMD160 6f3576fc61261f13b75b94d90606bf61d6b000f6 SHA1 0c92579c651c5a08ff6440762eb5c2ad9d5bc0ad SHA256 e281f9fb63391a162378dcddd4ed8327d8438d1ff4b261adb22c01a89b56aff3
DIST kdebase-workspace-4.2.85.tar.bz2 51520831 RMD160 ea8c1fcb5dab13fa4fd3c68a3887704e326aff46 SHA1 c4e2de0dad0b5b5c7f096f5622abe737af2412f2 SHA256 c650c3f1a4e4929e010cfde3d82516083050518d6410fd51c9c3f59c8d4efdc0
-EBUILD libkworkspace-4.2.3-r1.ebuild 820 RMD160 1e5566ddb28b5fd0caded16f622aa7b14d3e0396 SHA1 6f2db415195a0bf5ffafcaa1582b32066f58f40f SHA256 df7635abb4a917b1fc7e8e192aab19055e1db4bc5f296ab8871d987499775d8b
-EBUILD libkworkspace-4.2.85.ebuild 912 RMD160 e84980cb4161f67e2788e0b6de1327dec442879d SHA1 f5cbcd227bdc20171990322c3dd11f146a122881 SHA256 0ad5ea67172c574ea73fab141e5fd1ad13f30ff1615af2d3d35277a10a6f7edd
-EBUILD libkworkspace-4.2.9999.ebuild 775 RMD160 f76d9f9db441d93f49cb179c61d51b8d11601b56 SHA1 3136ea041d3bf6381425da40d3e8543ae2cff480 SHA256 695c96af3baa3123453d17e6fe79a979df42bdd565bc0a2e82f7feed1103524d
-EBUILD libkworkspace-9999.ebuild 901 RMD160 ef14b945937c3781d043131b6b26a374b3b7b737 SHA1 85f62643b4d5ef38e63ea620b99ea84637d3aa98 SHA256 1c0af94bf71a720f8884b4374347ab61510aac417777cfb3b151e738a5bfb9ba
+EBUILD libkworkspace-4.2.85.ebuild 627 RMD160 dd78fe0baded87e94480ab3ff8e73474aa6f7ed8 SHA1 8800b833545efa85ac4d57c10b6b2cab1ddfcbdc SHA256 0c013315dce6c7fbb3fa3bfbbfc2b6745017dfaaabcaa8fd44019336ccf91a43
+EBUILD libkworkspace-4.2.9999.ebuild 496 RMD160 a981a27f8d3769b996860ebe1acfbb2d723384bf SHA1 39f8e73e8990c51c56231bddf28f91fdf759a3a6 SHA256 9080a8c362b79778d75b6be66fc36ebd11c0f06cea2ce659abd8aa2481420918
+EBUILD libkworkspace-9999.ebuild 616 RMD160 b3589b5a3eb9977f5ba7253c104b27a519046133 SHA1 ff4c25f2b06160b02311cac76961302523593c1e SHA256 0e0ec6563bcfe4f1b9d11cf5c6e719eb51af67850d37e5e49b3627ead9ee4862
MISC ChangeLog 7972 RMD160 c00e1230f1d083ffd95f435a9e819335769931b5 SHA1 7e0c0165c4da2457c52df7266e0539832e94ba02 SHA256 c66d0dc20eff69f9260ecaa3884d2cd2e34d868e8fbda0e05f505c9f95fa32b6
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/libkworkspace/files/KDE4WorkspaceLibraryTargets.cmake b/kde-base/libkworkspace/files/KDE4WorkspaceLibraryTargets.cmake
deleted file mode 100644
index 2cb9bc0971b..00000000000
--- a/kde-base/libkworkspace/files/KDE4WorkspaceLibraryTargets.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
-# Generated by CMake 2.6-patch 4
-
-IF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5)
- MESSAGE(FATAL_ERROR "CMake >= 2.6.0 required")
-ENDIF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5)
-CMAKE_POLICY(PUSH)
-CMAKE_POLICY(VERSION 2.6)
-#----------------------------------------------------------------
-# Generated CMake target import file.
-#----------------------------------------------------------------
-
-# Commands may need to know the format version.
-SET(CMAKE_IMPORT_FILE_VERSION 1)
-
-# Create imported target KDE4Workspace__kworkspace
-ADD_LIBRARY(KDE4Workspace__kworkspace SHARED IMPORTED)
-GET_FILENAME_COMPONENT(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-# Include library additions
-FILE(GLOB INCLUDE_FILES "${_DIR}/librarydefs`-*.cmake")
-FOREACH(f ${INCLUDE_FILES})
- INCLUDE(${f})
-ENDFOREACH(f)
-
-# Load information for each installed configuration.
-FILE(GLOB CONFIG_FILES "${_DIR}/KDE4WorkspaceLibraryTargets-*.cmake")
-FOREACH(f ${CONFIG_FILES})
- INCLUDE(${f})
-ENDFOREACH(f)
-
-# Commands beyond this point should not need to know the version.
-SET(CMAKE_IMPORT_FILE_VERSION)
-CMAKE_POLICY(POP)
diff --git a/kde-base/libkworkspace/libkworkspace-4.2.3-r1.ebuild b/kde-base/libkworkspace/libkworkspace-4.2.3-r1.ebuild
deleted file mode 100644
index 8bc43d681f6..00000000000
--- a/kde-base/libkworkspace/libkworkspace-4.2.3-r1.ebuild
+++ /dev/null
@@ -1,31 +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/libkworkspace/libkworkspace-4.2.3.ebuild,v 1.2 2009/05/09 15:26:00 scarabeus Exp $
-
-EAPI="2"
-
-KMNAME="kdebase-workspace"
-KMMODULE="libs/kworkspace"
-inherit kde4-meta
-
-DESCRIPTION="A library for KDE desktop applications"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="debug"
-
-KMEXTRACTONLY="
- ksmserver/org.kde.KSMServerInterface.xml
- kwin/org.kde.KWin.xml
-"
-
-KMSAVELIBS="true"
-
-src_install() {
- kde4-meta_src_install
-
- # workspace library hack
- cd "${D}/${KDEDIR}/$(get_libdir)/cmake/"
- targ=`find ./ -name KDE4WorkspaceLibraryTargets.cmake`
- cd ${targ/\/*/}
- cp "${FILESDIR}"/KDE4WorkspaceLibraryTargets.cmake \
- ./ || die "library target copy failed"
-}
diff --git a/kde-base/libkworkspace/libkworkspace-4.2.85.ebuild b/kde-base/libkworkspace/libkworkspace-4.2.85.ebuild
index e22348cba2b..f87cba3a758 100644
--- a/kde-base/libkworkspace/libkworkspace-4.2.85.ebuild
+++ b/kde-base/libkworkspace/libkworkspace-4.2.85.ebuild
@@ -25,14 +25,3 @@ src_prepare() {
kde4-meta_src_prepare
}
-
-src_install() {
- kde4-meta_src_install
-
- # workspace library hack
- cd "${D}/${KDEDIR}/$(get_libdir)/cmake/"
- local targ=`find ./ -name KDE4WorkspaceLibraryTargets.cmake`
- cd ${targ/\/*/}
- cp "${FILESDIR}"/KDE4WorkspaceLibraryTargets.cmake \
- ./ || die "library target copy failed"
-}
diff --git a/kde-base/libkworkspace/libkworkspace-4.2.9999.ebuild b/kde-base/libkworkspace/libkworkspace-4.2.9999.ebuild
index 06306edefd2..9bd1a2df5f7 100644
--- a/kde-base/libkworkspace/libkworkspace-4.2.9999.ebuild
+++ b/kde-base/libkworkspace/libkworkspace-4.2.9999.ebuild
@@ -18,14 +18,3 @@ KMEXTRACTONLY="
"
KMSAVELIBS="true"
-
-src_install() {
- kde4-meta_src_install
-
- # workspace library hack
- cd "${D}/${KDEDIR}/$(get_libdir)/cmake/"
- targ=`find ./ -name KDE4WorkspaceLibraryTargets.cmake`
- cd ${targ/\/*/}
- cp "${FILESDIR}"/KDE4WorkspaceLibraryTargets.cmake \
- ./ || die "library target copy failed"
-}
diff --git a/kde-base/libkworkspace/libkworkspace-9999.ebuild b/kde-base/libkworkspace/libkworkspace-9999.ebuild
index 0390654683d..4bf97df3146 100644
--- a/kde-base/libkworkspace/libkworkspace-9999.ebuild
+++ b/kde-base/libkworkspace/libkworkspace-9999.ebuild
@@ -25,14 +25,3 @@ src_prepare() {
kde4-meta_src_prepare
}
-
-src_install() {
- kde4-meta_src_install
-
- # workspace library hack
- cd "${D}/${KDEDIR}/$(get_libdir)/cmake/"
- local targ=`find ./ -name KDE4WorkspaceLibraryTargets.cmake`
- cd ${targ/\/*/}
- cp "${FILESDIR}"/KDE4WorkspaceLibraryTargets.cmake \
- ./ || die "library target copy failed"
-}