* [gentoo-commits] dev/dilfridge:master commit in: kde-misc/kcollectd/, kde-misc/kcollectd/files/
@ 2011-08-20 23:07 Andreas Hüttel
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Hüttel @ 2011-08-20 23:07 UTC (permalink / raw
To: gentoo-commits
commit: 1c0baf38dbbb2be6df5bf74c72cc69ddfe94ff12
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sat Aug 20 23:07:19 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Aug 20 23:07:19 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=1c0baf38
Resync with main tree
(Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
---
kde-misc/kcollectd/ChangeLog | 4 ++
kde-misc/kcollectd/Manifest | 35 ++++++++++---------
.../kcollectd/files/kcollectd-0.9-cflags.patch | 10 ++++++
kde-misc/kcollectd/kcollectd-0.9.ebuild | 19 ++++-------
4 files changed, 39 insertions(+), 29 deletions(-)
diff --git a/kde-misc/kcollectd/ChangeLog b/kde-misc/kcollectd/ChangeLog
index 6decf3b..f78d1b7 100644
--- a/kde-misc/kcollectd/ChangeLog
+++ b/kde-misc/kcollectd/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 20 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> kcollectd-0.9.ebuild,
+ +files/kcollectd-0.9-cflags.patch:
+ Resync with main tree
+
01 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
kcollectd-0.9.ebuild:
Resync with tree
diff --git a/kde-misc/kcollectd/Manifest b/kde-misc/kcollectd/Manifest
index 9ddb154..dbd7ce9 100644
--- a/kde-misc/kcollectd/Manifest
+++ b/kde-misc/kcollectd/Manifest
@@ -1,24 +1,25 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
+AUX kcollectd-0.9-cflags.patch 465 RMD160 7d631bf422e13c2f410e646485b1e8b71b90efa7 SHA1 e96e9de714e32ae20081d1fc1c7cfee635390ee9 SHA256 26fe20680d3f38fb22413ef8bc41b3ad275f6be5b6ecba13b32294995484274a
DIST kcollectd-0.9.tar.gz 97132 RMD160 ad94fe7c7ca3342cc054d2d3c148f1a1df3285ae SHA1 9f6083276553902c09eabfd5fe2f2481f5f6fcd4 SHA256 d2d4cb9d8d1c0eb7695c3567c6f40d33fdf1655d63038cb0b170af2fadd2a3b1
-EBUILD kcollectd-0.9.ebuild 1121 RMD160 9702a068f6dce4dda06b6214187b5751c59d9547 SHA1 65121821686e3e57a1a333d4acdc0eed6d7a722b SHA256 3c6f647b4288cb2fa21ce33c2224d5dcbe4ee54c1b3b984288e2782f1a496b9c
-MISC ChangeLog 1204 RMD160 95568848f26a25ab0e374e3daa43a57ea4d7d5bd SHA1 9b272438e46b0c4278d4b38d544272718050188e SHA256 8feb9883ef9a8728cbe5bf52910e06bf70564df4928d18ddbd334b195c913f29
+EBUILD kcollectd-0.9.ebuild 954 RMD160 ba3c60556a04bad39123992558d66e7bd12f2460 SHA1 f05d0556724f003856a8489e8445e4f11aa8095e SHA256 4f05ded86c79aa931f8ece4b6e3b610a6b7f15805cf5959fc9ec08d0aa6b093a
+MISC ChangeLog 1345 RMD160 61f570a8500644f06e3fad192551fbfa9c770f06 SHA1 0db01815769cdd358f7cc27621877e17c36d39ed SHA256 424c51049f1bcf42b5931caf72441d5c4948363282597a932bbf7b75e62d9c3a
MISC metadata.xml 228 RMD160 e49b64024365c32abf0972afab4491d6e7b5b678 SHA1 8481262578cdf1afa7e9054def19f0a00b328ac9 SHA256 c1d05a4723b93939d65fa0ac2fd857ab1282763036921e56e3dd49911063b218
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBAgAGBQJNSFrzAAoJENwGBM22xffeN48P/0mBhBkmTAYEwtF3H6v0jKVk
-A0JKzQ/ChsxkVQDggO/CBvyhJf/P3XKIQaoklB59VX8wbinR2HjN1lddFWo/WJmM
-SJ8k5nqLcT0CSTry4mwc0Jui1PjjQ7QKnIKTFyqhog+8KdR4MRL0RwbaZsEZrrHU
-ilyafTIkwRiv0pdR0iEIMRq1Hb5bB+86eShM2DA453bm7kRlpmksrGnZ7FQBaHv0
-CY3foQCb6Bz96q+x0ZlGqW2F8G3SlryE9KQjzVonxT3ZjpQbFfKvwoaFDHiXpM4V
-i7CPFz1PP9PZbMkgdBjXRUt0Vkpr+Q6dQ1lPBP7FD3CZhoFZlMRDg7wY3eDd+VUs
-XeE0hECbkf6dUsIOhUB1ndI+J+Skk0uXSwIDQm1MFaOeEhcM82hVCxYi61dD06Nv
-RpUWI5j9Us4ytPfQbEp4qhvlLVMwa6c96GZuyfzfZP69N2PDKlhhXyjojkbzRU2H
-2lrsCH5c6Lwtjo8Q6y/hNbiKg8LA+FTV8VhocxlNmObOL0bNEhNfdirxAtFQvaZp
-CU6Nf11bfI0BbZpcs3q+sFCUa4XFtqFcnXTIKe18caBi4hmFhmTb2XVFHN82oJsU
-2Q13ohMiwV+Z09GyaGPQ3VSg/c6Ns8VTvUqKV+LRScn0vtoISV6SqgBhces/cBGX
-jVo0hNFtCUy87p9YYsyG
-=zOJT
+iQIcBAEBCgAGBQJOUD4nAAoJENwGBM22xffeSBkP/jD3nmHauE9OrpTxuWbZOFaN
+JQpb8tTvM4cO1qxgltlQddUA1+/Li5jCKUFxE+4c9i9VlLCYwM325GN+1QFS5Mis
+tl7lYjZ7zcwsW17BgxOPkxtzAqr31t8v3svEgqHcX+GdcZlMlQCAcGCyj4utopKf
+960W4mIKgirXoBc02clhJ+DAcvMGmtW+A5KekfmfgBPpa1DT/syKkfFwqZzi4RLu
+1kMva77WTccz1zt/LQEzmO7DeFqw9Js6O9pEQWHwM/hSatij4oVFIOAXiWuRpXfm
++nJyO1xUcpK5zfsaMQCesbxU1B6cXseEoL6ACV2AyIkjeVPYN4ft1t2f0h9hEimC
+SH5rGdSmpTZP/RewY+pAhl2+Xd2xo4a0FqU1eP7LiuBKikz/blsINbFRFmyeW9kK
+l1oNiGGg8zc3TrfExBETjCSFFstk8JOsKP1fwCfiPCv4a8PGVhjw97YZqqoDLqfD
+smVPZ1qgOebAYNW4ofeO0aBkkpKy3D0D8GsHGrfBPVH4H/6dWGkN2CSbfw3UXGhn
+rN88jeaRMVmOpElMAKhu5ta7H2StgWCVOTz8B0IY37CmgAQ6xgqBshJZl7JYwBQi
+G8Qlx+vTSdsuqEb5UNaZiV5q0coMcDX6qS7NmJv3TXE5XAmUT1KIlGIWFo9l9LxK
+q4MaBDd487TZ6gEgwrS/
+=TaGj
-----END PGP SIGNATURE-----
diff --git a/kde-misc/kcollectd/files/kcollectd-0.9-cflags.patch b/kde-misc/kcollectd/files/kcollectd-0.9-cflags.patch
new file mode 100644
index 0000000..702c588
--- /dev/null
+++ b/kde-misc/kcollectd/files/kcollectd-0.9-cflags.patch
@@ -0,0 +1,10 @@
+diff -ruN kcollectd-0.9.orig/kcollectd/CMakeLists.txt kcollectd-0.9/kcollectd/CMakeLists.txt
+--- kcollectd-0.9.orig/kcollectd/CMakeLists.txt 2009-11-30 22:01:54.000000000 +0100
++++ kcollectd-0.9/kcollectd/CMakeLists.txt 2011-04-24 15:35:21.596229942 +0200
+@@ -1,5 +1,5 @@
+
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAG} ${KDE4_ENABLE_EXCEPTIONS}")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
+
+ find_package(Boost COMPONENTS filesystem system)
+
diff --git a/kde-misc/kcollectd/kcollectd-0.9.ebuild b/kde-misc/kcollectd/kcollectd-0.9.ebuild
index 46f27b8..a767263 100644
--- a/kde-misc/kcollectd/kcollectd-0.9.ebuild
+++ b/kde-misc/kcollectd/kcollectd-0.9.ebuild
@@ -1,11 +1,10 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kcollectd/kcollectd-0.9.ebuild,v 1.6 2011/01/29 21:15:46 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kcollectd/kcollectd-0.9.ebuild,v 1.9 2011/04/29 13:59:41 scarabeus Exp $
-EAPI=3
+EAPI=4
-KDE_LINGUAS="de"
-inherit fdo-mime kde4-base
+inherit fdo-mime kde4-base flag-o-matic
DESCRIPTION="Simple KDE-based live data viewer for collectd"
HOMEPAGE="http://www.forwiss.uni-passau.de/~berberic/Linux/kcollectd.html"
@@ -21,15 +20,11 @@ DEPEND="dev-libs/boost
RDEPEND="${DEPEND}
|| ( app-admin/collectd[collectd_plugins_rrdtool] app-admin/collectd[collectd_plugins_rrdcached] )"
-src_prepare() {
- # Working around the eclass linguas magic is way more complicated than just
- # force-enabling de. The files are organized differently here, and when the eclass
- # removes de.po, the build fails...
+PATCHES=( "${FILESDIR}/${P}-cflags.patch" )
- local olduse=${USE}
- USE+=" linguas_de"
- kde4-base_src_prepare
- USE=${olduse}
+src_configure() {
+ append-flags -DBOOST_FILESYSTEM_VERSION=2
+ kde4-base_src_configure
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: kde-misc/kcollectd/, kde-misc/kcollectd/files/
@ 2012-01-08 15:36 Andreas Hüttel
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Hüttel @ 2012-01-08 15:36 UTC (permalink / raw
To: gentoo-commits
commit: 2a9cf7db18109cb7674aa3682cb98c728fc698c9
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sun Jan 8 15:33:28 2012 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Jan 8 15:37:02 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=2a9cf7db
[kde-misc/kcollectd] Not needed here anymore
---
kde-misc/kcollectd/ChangeLog | 40 --------------------
kde-misc/kcollectd/Manifest | 25 ------------
.../kcollectd/files/kcollectd-0.9-cflags.patch | 10 -----
kde-misc/kcollectd/kcollectd-0.9.ebuild | 34 -----------------
kde-misc/kcollectd/metadata.xml | 8 ----
5 files changed, 0 insertions(+), 117 deletions(-)
diff --git a/kde-misc/kcollectd/ChangeLog b/kde-misc/kcollectd/ChangeLog
deleted file mode 100644
index f78d1b7..0000000
--- a/kde-misc/kcollectd/ChangeLog
+++ /dev/null
@@ -1,40 +0,0 @@
-# ChangeLog for kde-misc/kcollectd
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
- 20 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> kcollectd-0.9.ebuild,
- +files/kcollectd-0.9-cflags.patch:
- Resync with main tree
-
- 01 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- kcollectd-0.9.ebuild:
- Resync with tree
-
- 24 Dec 2010; Andreas K. Huettel <dilfridge@gentoo.org>
- kcollectd-0.9.ebuild:
- Added rebuild of fdo mime / desktop database
-
- 14 Dec 2010; Andreas K. Huettel <dilfridge@gentoo.org>
- kcollectd-0.9.ebuild:
- Removed DTD magic as it is in the eclass now; fixed linguas workaround
-
- 25 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
- kcollectd-0.9.ebuild:
- Inserted workaround for build failure whenever LINGUAS does not contain de
- (bug 341495)
-
- 21 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
- kcollectd-0.9.ebuild:
- Manually applied DTD fix
-
- 14 Feb 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
- -kcollectd-0.8.2.ebuild, +kcollectd-0.9.ebuild:
- Version bump.
-
- 31 Jan 2010; Markos Chandras <hwoarang@gentoo.org> kcollectd-0.8.2.ebuild:
- Remove useless blank line
-
- 12 Jan 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
- +kcollectd-0.8.2.ebuild, +metadata.xml:
- New application, see bug 300771. Thanks to hwoarang for reviewing.
-
diff --git a/kde-misc/kcollectd/Manifest b/kde-misc/kcollectd/Manifest
deleted file mode 100644
index dbd7ce9..0000000
--- a/kde-misc/kcollectd/Manifest
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-AUX kcollectd-0.9-cflags.patch 465 RMD160 7d631bf422e13c2f410e646485b1e8b71b90efa7 SHA1 e96e9de714e32ae20081d1fc1c7cfee635390ee9 SHA256 26fe20680d3f38fb22413ef8bc41b3ad275f6be5b6ecba13b32294995484274a
-DIST kcollectd-0.9.tar.gz 97132 RMD160 ad94fe7c7ca3342cc054d2d3c148f1a1df3285ae SHA1 9f6083276553902c09eabfd5fe2f2481f5f6fcd4 SHA256 d2d4cb9d8d1c0eb7695c3567c6f40d33fdf1655d63038cb0b170af2fadd2a3b1
-EBUILD kcollectd-0.9.ebuild 954 RMD160 ba3c60556a04bad39123992558d66e7bd12f2460 SHA1 f05d0556724f003856a8489e8445e4f11aa8095e SHA256 4f05ded86c79aa931f8ece4b6e3b610a6b7f15805cf5959fc9ec08d0aa6b093a
-MISC ChangeLog 1345 RMD160 61f570a8500644f06e3fad192551fbfa9c770f06 SHA1 0db01815769cdd358f7cc27621877e17c36d39ed SHA256 424c51049f1bcf42b5931caf72441d5c4948363282597a932bbf7b75e62d9c3a
-MISC metadata.xml 228 RMD160 e49b64024365c32abf0972afab4491d6e7b5b678 SHA1 8481262578cdf1afa7e9054def19f0a00b328ac9 SHA256 c1d05a4723b93939d65fa0ac2fd857ab1282763036921e56e3dd49911063b218
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJOUD4nAAoJENwGBM22xffeSBkP/jD3nmHauE9OrpTxuWbZOFaN
-JQpb8tTvM4cO1qxgltlQddUA1+/Li5jCKUFxE+4c9i9VlLCYwM325GN+1QFS5Mis
-tl7lYjZ7zcwsW17BgxOPkxtzAqr31t8v3svEgqHcX+GdcZlMlQCAcGCyj4utopKf
-960W4mIKgirXoBc02clhJ+DAcvMGmtW+A5KekfmfgBPpa1DT/syKkfFwqZzi4RLu
-1kMva77WTccz1zt/LQEzmO7DeFqw9Js6O9pEQWHwM/hSatij4oVFIOAXiWuRpXfm
-+nJyO1xUcpK5zfsaMQCesbxU1B6cXseEoL6ACV2AyIkjeVPYN4ft1t2f0h9hEimC
-SH5rGdSmpTZP/RewY+pAhl2+Xd2xo4a0FqU1eP7LiuBKikz/blsINbFRFmyeW9kK
-l1oNiGGg8zc3TrfExBETjCSFFstk8JOsKP1fwCfiPCv4a8PGVhjw97YZqqoDLqfD
-smVPZ1qgOebAYNW4ofeO0aBkkpKy3D0D8GsHGrfBPVH4H/6dWGkN2CSbfw3UXGhn
-rN88jeaRMVmOpElMAKhu5ta7H2StgWCVOTz8B0IY37CmgAQ6xgqBshJZl7JYwBQi
-G8Qlx+vTSdsuqEb5UNaZiV5q0coMcDX6qS7NmJv3TXE5XAmUT1KIlGIWFo9l9LxK
-q4MaBDd487TZ6gEgwrS/
-=TaGj
------END PGP SIGNATURE-----
diff --git a/kde-misc/kcollectd/files/kcollectd-0.9-cflags.patch b/kde-misc/kcollectd/files/kcollectd-0.9-cflags.patch
deleted file mode 100644
index 702c588..0000000
--- a/kde-misc/kcollectd/files/kcollectd-0.9-cflags.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -ruN kcollectd-0.9.orig/kcollectd/CMakeLists.txt kcollectd-0.9/kcollectd/CMakeLists.txt
---- kcollectd-0.9.orig/kcollectd/CMakeLists.txt 2009-11-30 22:01:54.000000000 +0100
-+++ kcollectd-0.9/kcollectd/CMakeLists.txt 2011-04-24 15:35:21.596229942 +0200
-@@ -1,5 +1,5 @@
-
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAG} ${KDE4_ENABLE_EXCEPTIONS}")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
-
- find_package(Boost COMPONENTS filesystem system)
-
diff --git a/kde-misc/kcollectd/kcollectd-0.9.ebuild b/kde-misc/kcollectd/kcollectd-0.9.ebuild
deleted file mode 100644
index a767263..0000000
--- a/kde-misc/kcollectd/kcollectd-0.9.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kcollectd/kcollectd-0.9.ebuild,v 1.9 2011/04/29 13:59:41 scarabeus Exp $
-
-EAPI=4
-
-inherit fdo-mime kde4-base flag-o-matic
-
-DESCRIPTION="Simple KDE-based live data viewer for collectd"
-HOMEPAGE="http://www.forwiss.uni-passau.de/~berberic/Linux/kcollectd.html"
-SRC_URI="http://www.forwiss.uni-passau.de/~berberic/Linux/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/boost
- net-analyzer/rrdtool"
-RDEPEND="${DEPEND}
- || ( app-admin/collectd[collectd_plugins_rrdtool] app-admin/collectd[collectd_plugins_rrdcached] )"
-
-PATCHES=( "${FILESDIR}/${P}-cflags.patch" )
-
-src_configure() {
- append-flags -DBOOST_FILESYSTEM_VERSION=2
- kde4-base_src_configure
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
-}
diff --git a/kde-misc/kcollectd/metadata.xml b/kde-misc/kcollectd/metadata.xml
deleted file mode 100644
index 89ed3af..0000000
--- a/kde-misc/kcollectd/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>no-herd</herd>
- <maintainer>
- <email>dilfridge@gentoo.org</email>
- </maintainer>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-01-08 15:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-08 15:36 [gentoo-commits] dev/dilfridge:master commit in: kde-misc/kcollectd/, kde-misc/kcollectd/files/ Andreas Hüttel
-- strict thread matches above, loose matches on Subject: below --
2011-08-20 23:07 Andreas Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox