[x11-plugins/cd-plugins-old] Version bump to 3.0.0; add ~x86 wrt bug #412543c10.

6 files changed, 224 insertions, 4 deletions

diff --git a/x11-plugins/cd-plugins-old/ChangeLog b/x11-plugins/cd-plugins-old/ChangeLog
index ab1094a..8badf3b 100644
--- a/x11-plugins/cd-plugins-old/ChangeLog
+++ b/x11-plugins/cd-plugins-old/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*cd-plugins-old-3.0.0 (29 Apr 2012)
+
+  29 Apr 2012; Dustin Polke <DuPol@gmx.de> cd-plugins-old-2.4.0.2.ebuild,
+  +cd-plugins-old-3.0.0.ebuild, +files/cd-plugins-old-3.0.0-CMakeLists.txt,
+  metadata.xml:
+  Version bump to 3.0.0; add ~x86 wrt bug #412543c10.
+
   27 Apr 2012; Dustin Polke <DuPol@gmx.de> cd-plugins-old-2.4.0.2.ebuild:
   Restructure dependencies and loose glib dependency again.
 
diff --git a/x11-plugins/cd-plugins-old/Manifest b/x11-plugins/cd-plugins-old/Manifest
index 72c39aa..ea4ee91 100644
--- a/x11-plugins/cd-plugins-old/Manifest
+++ b/x11-plugins/cd-plugins-old/Manifest
@@ -1,6 +1,9 @@
 AUX cd-plugins-old-2.4.0-CMakeLists.txt 5655 RMD160 75381a8ae18bc0a06a14bf173cda81a1e9ddfa6a SHA1 05387ec8de736abc0c4aaeed6d436ee984a961bc SHA256 10ed72934bbfcc9d6739820b16d411a78936d5e303e880482930d24fd2805093
+AUX cd-plugins-old-3.0.0-CMakeLists.txt 6211 RMD160 b961aafc682dcd77b64d3912d6c1bbe3d06712b5 SHA1 cb8609da984cf19311b927b95c2467332a688d01 SHA256 5a7cc72b1ae9ff40ac28a14f772e086e4da3d208ef3926acdac24d537b8e7cc4
 AUX cd-plugins-old-fix-wifi-script.patch 392 RMD160 213f9b349a85e4d1fd2e0ad0e14ece9fb931242f SHA1 e31a62fd238e6c161a68e5d2e629e7220595e045 SHA256 2c15d1d91b63a01710f516990921f63cd6250d82f7e1836bb897b46d3d4d397f
 DIST cairo-dock-plugins-2.4.0~2.tar.gz 6039150 RMD160 9f53cd22bf341b7f1b7ee5d308150c4f1dde5100 SHA1 0989556b79e245094d40379a6ee17a4a8aa501b3 SHA256 f042fab774351087908f99e5598765b858489a0fc8481e672897887bd6d08230
-EBUILD cd-plugins-old-2.4.0.2.ebuild 1162 RMD160 8bd994dc0c140dab8335da3cba4c286790703652 SHA1 c0918f40b21664efffb672f69cccf98ab08105bc SHA256 3041a5e6e99c43483176ab4d8cbe31aec30277f9a688a852eb7f3b3f1939d1c1
-MISC ChangeLog 1635 RMD160 b3dc284a23439151032f479650786f89366f4b9c SHA1 4a9492102de7ff89b335de52729f46175874506e SHA256 cbb481ac0e5e5615072be59029839f2e476f5f3c21a6089a0d7d771ce1b68c95
-MISC metadata.xml 486 RMD160 2ed40b37c111ce9dbe8872d9a1461de271c63642 SHA1 51e7875d80ea2e168f4f15f3e449ac2c34a88366 SHA256 6a65492bbbaebef2f64884b124ef3415da9f2d3f45a7ee49a681f49a93d74486
+DIST cairo-dock-plugins-3.0.0.tar.gz 6230574 RMD160 6c1358627768303ed386f62328ff598a77c9617f SHA1 448f4c9300f0652e16d5a41afabd8ea6e4dd9338 SHA256 8040f0a7865592436b57bc1d867f0ee001ae45350255aafe4786a80fc9a981ef
+EBUILD cd-plugins-old-2.4.0.2.ebuild 1167 RMD160 65f364b3c68201a976039b4be1e523980a43bc98 SHA1 885492c0508cde9368312fb67ec2a61e428bc9c6 SHA256 4f0597be8682174342e1b0c202a09498ab67a08280715b8cfb59b6fa070af0dc
+EBUILD cd-plugins-old-3.0.0.ebuild 1231 RMD160 abc42d7b88f877c235def785bcc3e8da9913e1fe SHA1 354e158fb49b4df64df8290949bf978cb1e82bbc SHA256 048ff7a099c5de31b057862c79faf7b1f171f2a7e18d71839238a7dc4850509f
+MISC ChangeLog 1893 RMD160 01ebd7aca00a633748f449806004164025caf1a1 SHA1 a818d8a3fd56575db1e1ed4f3af549c373919fda SHA256 6ced136840ebbb662be6d499f50e7a385a04ed891102dd3a4a9339af2e1c98fd
+MISC metadata.xml 551 RMD160 50e9d1a3f54de739b4e542b8ee7d84d2dd2919af SHA1 2ecf4ba95a5c84051ee07d5734baa6932e110ae3 SHA256 8b471de58b155d370e2a0741a6ccf617f60b6a00218e30b3e9888a76f8842916
diff --git a/x11-plugins/cd-plugins-old/cd-plugins-old-2.4.0.2.ebuild b/x11-plugins/cd-plugins-old/cd-plugins-old-2.4.0.2.ebuild
index 5ca2f14..dea8c95 100644
--- a/x11-plugins/cd-plugins-old/cd-plugins-old-2.4.0.2.ebuild
+++ b/x11-plugins/cd-plugins-old/cd-plugins-old-2.4.0.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.glx-dock.org"
 
 LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 ) GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 CD_PLUGIN_IUSE="netspeed wifi"
 IUSE="${CD_PLUGIN_IUSE}"
 REQUIRED_USE="|| ( ${CD_PLUGIN_IUSE} )"
diff --git a/x11-plugins/cd-plugins-old/cd-plugins-old-3.0.0.ebuild b/x11-plugins/cd-plugins-old/cd-plugins-old-3.0.0.ebuild
new file mode 100644
index 0000000..2613f98
--- /dev/null
+++ b/x11-plugins/cd-plugins-old/cd-plugins-old-3.0.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+EAPI="4"
+
+inherit cmake-utils cairo-dock
+
+DESCRIPTION="Official plugins for cairo-dock subject to removal"
+HOMEPAGE="http://www.glx-dock.org"
+
+LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 ) GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+CD_PLUGIN_IUSE="netspeed wifi"
+IUSE="${CD_PLUGIN_IUSE} gtk2"
+REQUIRED_USE="|| ( ${CD_PLUGIN_IUSE} )"
+
+CDP_DEPEND="dev-libs/dbus-glib
+	>=dev-libs/glib-2.22:2
+	dev-libs/libxml2:2
+	gnome-base/librsvg:2
+	sys-apps/dbus
+	x11-libs/cairo
+	~x11-misc/cairo-dock-${PV}[gtk2=]
+	!x11-misc/cairo-dock-plugins
+	!x11-plugins/cairo-dock-plugins
+	!gtk2? ( x11-libs/gtk+:3 )
+	gtk2? ( x11-libs/gtk+:2 )"
+RDEPEND="${CDP_DEPEND}"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	use netspeed && CD_PLUGINS+=( "netspeed" )
+	use wifi && CD_PLUGINS+=( "wifi" )
+}
+
+src_unpack() {
+	cairo-dock_src_unpack
+}
+
+src_prepare() {
+	cairo-dock_src_prepare
+	use wifi && epatch "${FILESDIR}"/${PN}-fix-wifi-script.patch
+}
+
+src_configure() {
+	mycmakeargs+=(
+		"$(cmake-utils_use_enable netspeed NETSPEED)"
+		"$(cmake-utils_use_enable wifi WIFI)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/x11-plugins/cd-plugins-old/files/cd-plugins-old-3.0.0-CMakeLists.txt b/x11-plugins/cd-plugins-old/files/cd-plugins-old-3.0.0-CMakeLists.txt
new file mode 100644
index 0000000..a18ba0d
--- /dev/null
+++ b/x11-plugins/cd-plugins-old/files/cd-plugins-old-3.0.0-CMakeLists.txt
@@ -0,0 +1,154 @@
+########### requirements ###############
+
+cmake_minimum_required (VERSION 2.6)
+find_package (PkgConfig)
+include (CheckLibraryExists)
+include (CheckIncludeFiles)
+include (CheckFunctionExists)
+include (CheckSymbolExists)
+include ("${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/GNUInstallDirs.cmake")
+
+########### project ###############
+
+project ("cairo-dock-plugins")
+set (VERSION "3.0.0")
+
+add_definitions (-std=c99 -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration -Wstrict-prototypes) # removed for stable versions: -Wstrict-prototypes #-Wunreachable-code -Wno-unused-parameter -Wall
+add_definitions (-DGL_GLEXT_PROTOTYPES="1")
+
+############ sources tarball #############
+
+set (CPACK_SOURCE_GENERATOR "TGZ")
+set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${VERSION}")
+set (CPACK_SOURCE_IGNORE_FILES
+	"/build/;/.bzr/;bzrignore$;/misc/;~$;${CPACK_SOURCE_IGNORE_FILES}")
+include (CPack)
+
+add_custom_target(dist
+	COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
+add_custom_target(dist-bzr
+	COMMAND bzr export ${CMAKE_PROJECT_NAME}-${VERSION}.tar.gz
+	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+
+########### global variables ###############
+
+if( WIN32 )
+	message(FATAL_ERROR "Cairo-Dock requires an air-conditioned room. Please close Windows!")
+endif( WIN32 )
+
+set (PACKAGE ${CMAKE_PROJECT_NAME})
+set (GETTEXT_PACKAGE ${PACKAGE})
+
+# get plug-ins install dir
+execute_process(
+    COMMAND pkg-config gldi --variable=pluginsdir  # /usr/lib/cairo-dock # or /usr/lib/x86_64-linux-gnu/cairo-dock
+    OUTPUT_VARIABLE pluginsdir)
+STRING (REGEX REPLACE "\n" "" pluginsdir ${pluginsdir})  # remove the \n
+# get plug-ins data dir
+execute_process(
+    COMMAND pkg-config gldi --variable=pluginsdatadir  # /usr/share/cairo-dock/plug-ins
+    OUTPUT_VARIABLE pluginsdatadir)
+STRING (REGEX REPLACE "\n" "" pluginsdatadir ${pluginsdatadir})
+# get prefix dir
+execute_process(
+    COMMAND pkg-config gldi --variable=prefix  # /usr/share/cairo-dock/plug-ins
+    OUTPUT_VARIABLE prefix)
+STRING (REGEX REPLACE "\n" "" prefix ${prefix})
+# get GTK version (must be the same as the core, as GTK2 and GTK3 can't coexist at runtime)
+execute_process(
+    COMMAND pkg-config gldi --variable=gtkversion  # 2 or 3
+    OUTPUT_VARIABLE gtkversion)
+STRING (REGEX REPLACE "\n" "" gtkversion ${gtkversion})
+# check that version matches with the core
+execute_process(
+    COMMAND pkg-config --modversion gldi  # 2.2.0-3
+    OUTPUT_VARIABLE dock_version)
+STRING (REGEX REPLACE "\n" "" dock_version ${dock_version})
+if (NOT "${dock_version}" STREQUAL "${VERSION}")		# Version
+	if ("${PACKAGEMENT}" STREQUAL "")
+		MESSAGE (FATAL_ERROR "Error : version mismatch with the core : " ${VERSION} <> ${dock_version})
+	else ()
+		MESSAGE (WARNING "Warning : version mismatch with the core : " ${VERSION} <> ${dock_version})
+	endif ()
+endif()
+
+# check that installation dir matches with the core
+GET_FILENAME_COMPONENT(libdir "${pluginsdir}/.." ABSOLUTE)  # /usr/lib # or /usr/lib/x86_64-linux-gnu
+GET_FILENAME_COMPONENT(datadir "${pluginsdatadir}/../.." ABSOLUTE)  # /usr/share
+if (NOT "${CMAKE_INSTALL_PREFIX}" STREQUAL "${prefix}"
+		OR NOT "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" STREQUAL "${libdir}"
+		OR NOT "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}" STREQUAL "${datadir}")
+	message (STATUS "It seems that the current CMAKE_INSTALL_{PREFIX,LIBDIR,DATAROOTDIR} flags are not the same that you have used with the core.")
+	message (STATUS " It will be replaced by this value: ${prefix}")
+	message (WARNING "Plug-ins should be installed in the same directory as the core, that is to say in ${pluginsdir}")
+	set (CMAKE_INSTALL_PREFIX "${prefix}")
+	#set (libdir "${CMAKE_INSTALL_PREFIX}/${libname}/cairo-dock")
+endif()
+
+# set internationalisation
+set (GETTEXT_PLUGINS "cairo-dock-plugins")
+set (localedir "${prefix}/${CMAKE_INSTALL_LOCALEDIR}")
+set (gaugesdir "${datadir}/cairo-dock/gauges")
+
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules/")  # additionnal FindPackage files
+
+########### dependencies ###############
+
+message ("")
+message (STATUS "=====================")
+message (STATUS "Check dependencies...")
+message (STATUS "=====================")
+message ("")
+
+pkg_check_modules ("PACKAGE" REQUIRED "cairo" "librsvg-2.0" "dbus-1" "dbus-glib-1" "libxml-2.0")
+#pkg_check_modules ("PACKAGE" REQUIRED "ig")
+pkg_check_modules ("GLDI" REQUIRED "gldi")  # we don't want to link with gldi, so we check it separately.
+set (PACKAGE_INCLUDE_DIRS "${GLDI_INCLUDE_DIRS}")
+
+add_definitions (-DGTK_DISABLE_DEPRECATED="1")
+
+#############    GLIB    #################
+pkg_check_modules (GLIB glib-2.0)
+	STRING (REGEX REPLACE "\\..*" "" GLIB_MAJOR "${GLIB_VERSION}") # 2.28.3 => 2
+	STRING (REGEX REPLACE "[0-9]*\\.([^ ]+)" "\\1" GLIB_MINOR "${GLIB_VERSION}")  # 2.28.3 => 2.28
+	STRING (REGEX REPLACE "\\.[0-9]*" "" GLIB_MINOR "${GLIB_MINOR}") # 2.28 => 28
+	STRING (REGEX REPLACE ".*\\." "" GLIB_NANO "${GLIB_VERSION}") # 2.28.3 => 3
+	STRING (REGEX REPLACE "-.*" "" GLIB_NANO "${GLIB_NANO}")
+
+############# NETSPEED #################
+if (ENABLE_NETSPEED)
+	message (STATUS "> NetSpeed:")
+	set (GETTEXT_NETSPEED ${GETTEXT_PLUGINS})
+	set (VERSION_NETSPEED "1.2.8")
+	set (PACKAGE_NETSPEED "cd-netspeed")
+	set (netspeeddatadir "${pluginsdatadir}/netspeed")
+	configure_file (${CMAKE_CURRENT_SOURCE_DIR}/netspeed/data/netspeed.conf.in ${CMAKE_CURRENT_BINARY_DIR}/netspeed/data/netspeed.conf)
+	add_subdirectory (netspeed)
+	set (with_netspeed "yes")
+else()
+	set (with_netspeed "no")
+endif()
+
+############# WIFI #################
+if (ENABLE_WIFI)
+	message (STATUS "> WiFi:")
+	set (GETTEXT_WIFI ${GETTEXT_PLUGINS})
+	set (VERSION_WIFI "1.2.10")
+	set (PACKAGE_WIFI "cd-wifi")
+	set (wifidatadir "${pluginsdatadir}/wifi")
+	configure_file (${CMAKE_CURRENT_SOURCE_DIR}/wifi/data/wifi.conf.in ${CMAKE_CURRENT_BINARY_DIR}/wifi/data/wifi.conf)
+	add_subdirectory (wifi)
+	set (with_wifi "yes")
+else()
+	set (with_wifi "no")
+endif()
+
+message ("")
+message (STATUS "===============")
+message (STATUS "Plug-ins build:")
+message (STATUS "===============")
+message ("")
+message (STATUS "Old:")
+message (STATUS " - with Netspeed applet:           ${with_netspeed}")
+message (STATUS " - with Wifi applet:               ${with_wifi}")
+message ("")
diff --git a/x11-plugins/cd-plugins-old/metadata.xml b/x11-plugins/cd-plugins-old/metadata.xml
index 9d530ab..33e8c83 100644
--- a/x11-plugins/cd-plugins-old/metadata.xml
+++ b/x11-plugins/cd-plugins-old/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<use>
+		<flag name="gtk2">Force GTK+2 instead of default GTK+3.</flag>
 		<flag name="netspeed">Enables the Netspeed applet.</flag>
 		<flag name="wifi">Enables the Wifi applet.</flag>
 	</use>