diff options
| author | Maciej Mrozowski <reavertm@gentoo.org> | 2011-01-07 00:32:11 +0100 |
|---|---|---|
| committer | Maciej Mrozowski <reavertm@gentoo.org> | 2011-01-07 00:32:11 +0100 |
| commit | 11ad60dbb8676cfce8e1145b4be31053eb940f8a (patch) | |
| tree | a8023e1fe049faa603a8a26b3fcb6565b38d2fb0 /kde-base/activitymanager | |
| parent | 02e912cd81275206f75b83c0de9b7d52ed0bc5ec (diff) | |
| parent | 63fc8b1181aaabfe6dfbad592a758574819f17e9 (diff) | |
| download | kde-11ad60dbb8676cfce8e1145b4be31053eb940f8a.tar.gz kde-11ad60dbb8676cfce8e1145b4be31053eb940f8a.tar.bz2 kde-11ad60dbb8676cfce8e1145b4be31053eb940f8a.zip | |
Merge branch 'master' into kde-git
Conflicts:
kde-base/pykde4/Manifest
kde-base/pykde4/pykde4-9999.ebuild
Diffstat (limited to 'kde-base/activitymanager')
| -rw-r--r-- | kde-base/activitymanager/Manifest | 6 | ||||
| -rw-r--r-- | kde-base/activitymanager/activitymanager-4.5.5.ebuild | 16 | ||||
| -rw-r--r-- | kde-base/activitymanager/activitymanager-4.5.95.ebuild (renamed from kde-base/activitymanager/activitymanager-4.5.90.ebuild) | 0 |
3 files changed, 20 insertions, 2 deletions
diff --git a/kde-base/activitymanager/Manifest b/kde-base/activitymanager/Manifest index 96fb3602517..eb92f3af4ab 100644 --- a/kde-base/activitymanager/Manifest +++ b/kde-base/activitymanager/Manifest @@ -1,5 +1,7 @@ -DIST kdebase-runtime-4.5.90.tar.bz2 5833403 RMD160 1f994c29605827c0d817208b1b23016a970d717a SHA1 e285958332e986abda63436e10189afa7367171f SHA256 eb3de48ade9239ba68492bbf1fe6e6e04803304ae9f3143fa9caa26b24ec1f3a -EBUILD activitymanager-4.5.90.ebuild 242 RMD160 8a73b03d671faf875620e92a88e8983e20171ae2 SHA1 74558c74e5d2b0e5db4e2f821b4ee1da19ba261d SHA256 5b8303d4205e6be5298fd629b45b24f0a97e1107f8634830a9329b9b7a909b22 +DIST kdebase-runtime-4.5.5.tar.bz2 5766109 RMD160 dae7b41b4cd7e5c13357b283fe2bf97863e306db SHA1 3827a38727e077a2aef6d63f38e68ec72bd01a84 SHA256 f284bf038051f9187cb7e7ad2786bc6fc9d129dec79554e964fd3b63e2d0e94f +DIST kdebase-runtime-4.5.95.tar.bz2 5824987 RMD160 588c405d81d0c877ef127937e7c8edaf3c3f9e7b SHA1 416fc73fffcfed9c1ac03c96af664cab872eaf6b SHA256 a9c96bd8eceeba2605678ab00a75e6e4120db8ff97bf117bb81e6b03764f9f69 +EBUILD activitymanager-4.5.5.ebuild 369 RMD160 0cdef20d1230282278949e30f34e7d00890b1a4c SHA1 b780116c51f36182c9db53a64bc3de79e9c1a1f3 SHA256 74523fcbcdda1fa5e57ff3197761a42a143fa2a40785e3357ab2029933280a81 +EBUILD activitymanager-4.5.95.ebuild 242 RMD160 8a73b03d671faf875620e92a88e8983e20171ae2 SHA1 74558c74e5d2b0e5db4e2f821b4ee1da19ba261d SHA256 5b8303d4205e6be5298fd629b45b24f0a97e1107f8634830a9329b9b7a909b22 EBUILD activitymanager-4.5.9999.ebuild 317 RMD160 8ad3fcff9debc4c936f0920fe3195381f8457bf8 SHA1 8a779d1d42e8a534837c52893fafa371ac4ac3e1 SHA256 90c0c794c8537ac77d563638d008ce57f04a9f878441c337ba934569f0f13510 EBUILD activitymanager-4.6.9999.ebuild 231 RMD160 5c6e94e6c2ab580884f136b1c8915ca3af8bf273 SHA1 715efb75acb1554923be2c0448931a286d229bd7 SHA256 d806eab73e322875d6120fecf7d5c6aa95e3b617c22a4ddc49c9210e57e67205 EBUILD activitymanager-9999.ebuild 231 RMD160 5c6e94e6c2ab580884f136b1c8915ca3af8bf273 SHA1 715efb75acb1554923be2c0448931a286d229bd7 SHA256 d806eab73e322875d6120fecf7d5c6aa95e3b617c22a4ddc49c9210e57e67205 diff --git a/kde-base/activitymanager/activitymanager-4.5.5.ebuild b/kde-base/activitymanager/activitymanager-4.5.5.ebuild new file mode 100644 index 00000000000..c87f801989e --- /dev/null +++ b/kde-base/activitymanager/activitymanager-4.5.5.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="3" + +KMNAME="kdebase-runtime" +inherit kde4-meta + +DESCRIPTION="Activity manager" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="debug" + +KMEXTRACTONLY=" + nepomuk/services/activities/org.kde.nepomuk.ActivitiesService.xml +" diff --git a/kde-base/activitymanager/activitymanager-4.5.90.ebuild b/kde-base/activitymanager/activitymanager-4.5.95.ebuild index a13bb5db7e2..a13bb5db7e2 100644 --- a/kde-base/activitymanager/activitymanager-4.5.90.ebuild +++ b/kde-base/activitymanager/activitymanager-4.5.95.ebuild |