[x11-misc/caito-dock-plugins] Version bump to 2.2.0-4.

4 files changed, 129 insertions, 1 deletions

diff --git a/x11-misc/cairo-dock-plugins/ChangeLog b/x11-misc/cairo-dock-plugins/ChangeLog
index 09d5306..32d9be3 100644
--- a/x11-misc/cairo-dock-plugins/ChangeLog
+++ b/x11-misc/cairo-dock-plugins/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header$
 
+*cairo-dock-plugins-2.2.0_p4 (20 Dec 2010)
+
+  20 Dec 2010; Dustin Polke <dustin.polke@uni-siegen.de>
+  +cairo-dock-plugins-2.2.0_p4.ebuild,
+  +files/cairo-dock-plugins-2.2.0_p4-CMakeLists.patch:
+  Version bump to 2.2.0-4. Converted from autotools to CMAKE.
+
 *cairo-dock-plugins-2.1.3_p9 (23 Apr 2010)
 
   23 Apr 2010; Dustin Polke <dustin.polke@uni-siegen.de>
diff --git a/x11-misc/cairo-dock-plugins/Manifest b/x11-misc/cairo-dock-plugins/Manifest
index 8d2da1e..d2dce94 100644
--- a/x11-misc/cairo-dock-plugins/Manifest
+++ b/x11-misc/cairo-dock-plugins/Manifest
@@ -1,6 +1,9 @@
+AUX cairo-dock-plugins-2.2.0_p4-CMakeLists.patch 572 RMD160 bdd4b410ed9589b68aca723b40f7d60a2651997a SHA1 7dc5527bdc16c97dee33eacbfcde3327d3ade2ca SHA256 2627cdb03fdfefe7a7645499d6c63f71a5d7a66671e10856a5c21fc8ef576d12
 DIST cairo-dock-plugins-2.1.3-8.tar.gz 5997971 RMD160 d6dbbd093783e6065fd5c640e1e94bbf37f56ffc SHA1 67ae9780b72ff5b9ae37099746ecef97cb1c5861 SHA256 0ca8c000186cbefc5578a4ac8205ac6d88edba464586dfb3ad400e86cc3537aa
 DIST cairo-dock-plugins-2.1.3-9.tar.gz 6003152 RMD160 903d2c53b99c4de8f315de436cfd19d0f3629cd7 SHA1 6b6615eccb8cca2c1dd8e382ac45ade2bc57802a SHA256 3f0ea85dbeef7fe817439ed77a4bd19a435f6e1ed7207688f0d699e77a801b7a
+DIST cairo-dock-plugins-2.2.0-4.tar.gz 5533523 RMD160 33e6ad6831e66d9da5ad313210913f9d81138502 SHA1 1873ae26a1d90f8ac3cfde665536eca5dab7645f SHA256 e8905dc6f397c89b53b6e6a15489bf4d78e19427bd95e01f7c1b3df21a564ce2
 EBUILD cairo-dock-plugins-2.1.3_p8.ebuild 3457 RMD160 469c5bf7fb779df5a3e59850a4a6322cf1e2fb6e SHA1 88fa936945bb9ea797b2af11bf34b089000b36e1 SHA256 d1b55abeafef288a92f607f8b676ca849b31a289f6cbc0bcdbccfe6a84425483
 EBUILD cairo-dock-plugins-2.1.3_p9.ebuild 3457 RMD160 469c5bf7fb779df5a3e59850a4a6322cf1e2fb6e SHA1 88fa936945bb9ea797b2af11bf34b089000b36e1 SHA256 d1b55abeafef288a92f607f8b676ca849b31a289f6cbc0bcdbccfe6a84425483
-MISC ChangeLog 633 RMD160 a9f4dd38559617167167682b611cd5ef0b73be2d SHA1 b0f300c1cde36214fdbbdfbe90ce3a0673377eae SHA256 05944863e7821ed14b4cd5a23597e5aa0c72dda7e4844eada6223437dc427c6d
+EBUILD cairo-dock-plugins-2.2.0_p4.ebuild 2967 RMD160 e1683ac202278b0655fc6c600fc542eef700cabf SHA1 31f25f0aa00b0c67a6af1ec7e9da94d2b6bc8d2c SHA256 9d61391488879e7dbe67eb5f7c7a1d9595e94d2b20299fb0aa9cdf81fa47e00c
+MISC ChangeLog 891 RMD160 859e9f342756758c16af728a174a0a868f8aeb45 SHA1 36cbfc4eb949af89708f888d127e5792bb1d7ebd SHA256 2aa534c7a41f368abbc0ca0f40e70a1fa17c8351c147533d0f63b8f00be88e8b
 MISC metadata.xml 1680 RMD160 9f539bf7f76a38221942d17053db0d3e3e61da19 SHA1 3351fa8b9189437745b30a9af1abe2c4d2a8e8df SHA256 3ed56086c493157beae0df60dbee722f3ae58f9c4d1ebe3db42558e99df833e7
diff --git a/x11-misc/cairo-dock-plugins/cairo-dock-plugins-2.2.0_p4.ebuild b/x11-misc/cairo-dock-plugins/cairo-dock-plugins-2.2.0_p4.ebuild
new file mode 100644
index 0000000..b8aa9a7
--- /dev/null
+++ b/x11-misc/cairo-dock-plugins/cairo-dock-plugins-2.2.0_p4.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit cmake-utils versionator
+
+MY_P=${PN}-${PV/_p/-}
+MY_PV_MAJ_MIN=$(get_version_component_range 1-2)
+MY_PV_MAJ_MIN_MIC=$(get_version_component_range 1-3)
+
+DESCRIPTION="Official plugins for cairo-dock"
+HOMEPAGE="http://www.glx-dock.org"
+SRC_URI="http://launchpad.net/cairo-dock-plug-ins/${MY_PV_MAJ_MIN}/${MY_PV_MAJ_MIN_MIC}/+download/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="alsa doncky exif gmenu gnome ical kde mail network-monitor old-gnome
+	remote-control scoobydo status-notifier terminal webkit xfce xgamma
+	xklavier xrandr"
+
+#compiz dnd2share exif mail network-monitor nls
+#	powermanager rssreader rhythmbox terminal tomboy wifi
+#	xgamma xklavier"
+
+RDEPEND="dev-libs/dbus-glib
+	dev-libs/glib:2
+	dev-libs/libxml2
+	gnome-base/librsvg
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/gtkglext
+	~x11-misc/cairo-dock-${PV}
+	alsa? ( media-libs/alsa-lib )
+	exif? ( media-libs/libexif )
+	gmenu? ( gnome-base/gnome-menus )
+	gnome? ( >=dev-libs/glib-2.22 )
+	ical? ( dev-libs/libical )
+	kde? ( >=dev-libs/glib-2.22 )
+	mail? ( net-libs/libetpan )
+	old-gnome? (
+		gnome-base/gnome-vfs
+		gnome-base/libgnomeui
+	)
+	status-notifier? ( dev-libs/libdbusmenu[gtk] )
+	terminal? ( x11-libs/vte )
+	webkit? ( >=net-libs/webkit-gtk-1.0 )
+	xfce? (
+		xfce-base/thunar
+		>=dev-libs/glib-2.22
+	)
+	xgamma? ( x11-libs/libXxf86vm )
+	xklavier? ( x11-libs/libxklavier )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	dev-util/pkgconfig"
+
+S="${WORKDIR}"/${MY_P}
+
+#pkg_setup() {
+#	if use gio; then
+#		if ! use gmenu; then
+#			ewarn "gio requires gmenu, implicitly added"
+#		fi
+#	fi
+#}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-CMakeLists.patch"
+
+	mycmakeargs=( "-DCMAKE_VERBOSE_MAKEFILE=TRUE" )
+}
+
+src_configure() {
+	mycmakeargs+=(
+		"$(cmake-utils_use_enable alsa ALSA_MIXER)"
+		"$(cmake-utils_use_enable doncky DONCKY)"
+		"$(cmake-utils_use_with exif EXIF)"
+		"$(cmake-utils_use_enable gmenu GMENU)"
+		"$(cmake-utils_use_enable gnome GNOME_INTEGRATION)"
+		"$(cmake-utils_use_with	ical ICAL)"
+		"$(cmake-utils_use_with	mail MAIL)"
+		"$(cmake-utils_use_enable kde KDE_INTEGRATION)"
+		"$(cmake-utils_use_enable network-monitor NETWORK_MONITOR)"
+		"$(cmake-utils_use_enable old-gnome OLD_GNOME_INTEGRATION)"
+		"$(cmake-utils_use_enable remote-control REMOTE_CONTROL)"
+		"$(cmake-utils_use_enable scoobydo SCOOBY_DO)"
+		"$(cmake-utils_use_enable status-notifier STATUS_NOTIFIER)"
+		"$(cmake-utils_use_enable terminal TERMINAL)"
+		"$(cmake-utils_use_enable webkit WEBKIT)"
+		"$(cmake-utils_use_enable xfce XFCE_INTEGRATION)"
+		"$(cmake-utils_use_enable xgamma XGAMMA)"
+		"$(cmake-utils_use_with	xklavier XKLAVIER)"
+		"$(cmake-utils_use_with	xrandr XRANDR)"
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	elog "The applets 'Cpusage', 'Ram-meter' and 'Nvidia' are merged now into"
+	elog "'System-Monitor' applet."
+}
diff --git a/x11-misc/cairo-dock-plugins/files/cairo-dock-plugins-2.2.0_p4-CMakeLists.patch b/x11-misc/cairo-dock-plugins/files/cairo-dock-plugins-2.2.0_p4-CMakeLists.patch
new file mode 100644
index 0000000..78c067e
--- /dev/null
+++ b/x11-misc/cairo-dock-plugins/files/cairo-dock-plugins-2.2.0_p4-CMakeLists.patch
@@ -0,0 +1,12 @@
+--- cairo-dock-plugins-2.2.0-4/CMakeLists.txt.old	2010-12-19 20:30:58.842676171 +0100
++++ cairo-dock-plugins-2.2.0-4/CMakeLists.txt	2010-12-19 20:31:23.578676102 +0100
+@@ -13,9 +13,6 @@ project ("cairo-dock-plugins")
+ set (VERSION "2.2.0-4")
+ 
+ add_definitions (-std=c99 -Wstrict-prototypes -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration) #-Wunreachable-code -Wno-unused-parameter -Wall
+-if (NOT ${CMAKE_BUILD_TYPE})
+-	add_definitions (-O3)
+-endif()
+ add_definitions (-DGL_GLEXT_PROTOTYPES="1")
+ 
+ ############ sources tarball #############