[x11-misc/cairo-dock] Version bump to 3.0.0; add ~x86 wrt bug #412543c10.

6 files changed, 167 insertions, 6 deletions

diff --git a/x11-misc/cairo-dock/ChangeLog b/x11-misc/cairo-dock/ChangeLog
index e9f98fc..0a79d2d 100644
--- a/x11-misc/cairo-dock/ChangeLog
+++ b/x11-misc/cairo-dock/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header$
 
+*cairo-dock-3.0.0 (28 Apr 2012)
+
+  28 Apr 2012; Dustin Polke <DuPol@gmx.de> cairo-dock-2.4.0.2.ebuild,
+  +cairo-dock-3.0.0.ebuild, +files/cairo-dock-3.0.0-CMakeLists.patch,
+  metadata.xml:
+  Version bump to 3.0.0; add ~x86 (bug #412543c10).
+
   27 Apr 2012; Dustin Polke <DuPol@gmx.de> cairo-dock-2.4.0.2.ebuild,
   +files/cairo-dock-3.0.0-glib-2.32.patch:
   Fix bug #412543 properly.
diff --git a/x11-misc/cairo-dock/Manifest b/x11-misc/cairo-dock/Manifest
index 40fffa9..ff14cd7 100644
--- a/x11-misc/cairo-dock/Manifest
+++ b/x11-misc/cairo-dock/Manifest
@@ -1,6 +1,9 @@
 AUX cairo-dock-2.4.0.2-CMakeLists.patch 920 RMD160 1d6e90f9c25b926baee745b5360499458f950cc7 SHA1 d27c85db52a5ca0128dcef4ae70f5b59d6a01f0e SHA256 2b05658a1a792f434c73bf6e3bd2497cb3d3739dcb71904abb345274f896dbca
+AUX cairo-dock-3.0.0-CMakeLists.patch 3456 RMD160 b8d852a04a99647cbd7eee2b93d4dd571c1502a1 SHA1 6d94ebc6b641d116f2d2e053fbc6cbf4e9102ae9 SHA256 36b2fad2141c672de4789ba238dbff8c85a4f9f677db9c06b335a7edf8ab77e1
 AUX cairo-dock-3.0.0-glib-2.32.patch 269 RMD160 a1b2eec2c97c5aa0d579cd870a906de043b27be6 SHA1 adf9e127b3badcb82208eb43e7df394ffd914fc8 SHA256 534b733516a54591c77ad205828f175638144aa5919ba9588dc28be33e5e9d4c
 DIST cairo-dock-2.4.0~2.tar.gz 2281677 RMD160 662810cf0bf67be75cde36bb6c31c150abebc391 SHA1 140670d97985a8a623bc126fa86eed00e7b5a69e SHA256 8087e68c174d06dcd62bb9acfdd54cc534cc09ddbfffcc0f9cfac967d882123c
-EBUILD cairo-dock-2.4.0.2.ebuild 1631 RMD160 4d898da53f85b7bdd346dc7ecca6ed1f207bf878 SHA1 233c9b77d2455327b4ec1385b690600643d6e38e SHA256 f8576ca02f57fdc382bc0f1e627d0dde0adb7fd1859f5e22e2611c38fedbf5af
-MISC ChangeLog 2418 RMD160 43f3a7be2e0f4123ac034a92189ab71e143b4079 SHA1 4cb3e50d8fa921c4fa59d5665bb4bfdbce28c1fc SHA256 d10e2d7650d53ff94af5cecf5cc3055e565e25772b1589e24f44fff30f5eed0a
-MISC metadata.xml 308 RMD160 79d749e0dffaadcd3a6c847685667c091f84be9e SHA1 83bb112def89ea01141a290ee0aa35d0e8e234a7 SHA256 d0a98132500de114eb79d47d9781698fba00909d75029405bfae63b234e090da
+DIST cairo-dock-3.0.0.tar.gz 2325081 RMD160 5d04384132f9c97e6b87a402ee519c59fb4dd478 SHA1 2b6f961e0ac13a44e733ae6a19f61f7fe2e8a859 SHA256 bef0794405f86bc397c4c077e48cb8e6df8f256f1c530e76aebd8612251a9b82
+EBUILD cairo-dock-2.4.0.2.ebuild 1650 RMD160 3a0ac78eba193552622ef70930adae5dc24e552b SHA1 956ac414f51f436fa6a86de73714068819d3c885 SHA256 0e52c5124a87c6b52b7feff4b620b3772d1a075bc2d4953620aa2e221e9e3f4d
+EBUILD cairo-dock-3.0.0.ebuild 1766 RMD160 4975d2ab751d508d2a46f50729274e42ddfbfcea SHA1 0b50bd8b53767c3f853d54a9d9dbb19dc1e94192 SHA256 5ef2d868282723d0e6d3467b9ac50e5a4d8271e8cbe9e207e2d2cc6595546b62
+MISC ChangeLog 2660 RMD160 1e214113266f7ef45671d48cdad80d7ee5093465 SHA1 7bc11b62bf63ab5e5b1c010a32b81455120ec5cd SHA256 6e1956f439a6023799f5a011a130e8cc350f64593ffb9d1a4381fbcf3948f28f
+MISC metadata.xml 373 RMD160 d6247f069db26911344704fa7d557bc75ce90b7b SHA1 b1fa4d5f21098784644342d152266b3d14d09e78 SHA256 93f8268ab9f0bacc379127cdbdd4d4fba7de3975f7311f6ed5f67fed0083b973
diff --git a/x11-misc/cairo-dock/cairo-dock-2.4.0.2.ebuild b/x11-misc/cairo-dock/cairo-dock-2.4.0.2.ebuild
index 992431f..658a6d2 100644
--- a/x11-misc/cairo-dock/cairo-dock-2.4.0.2.ebuild
+++ b/x11-misc/cairo-dock/cairo-dock-2.4.0.2.ebuild
@@ -10,11 +10,10 @@ HOMEPAGE="http://www.glx-dock.org"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="crypt xcomposite"
 
-RDEPEND="
-	dev-libs/dbus-glib
+RDEPEND="dev-libs/dbus-glib
 	dev-libs/libxml2:2
 	gnome-base/librsvg:2
 	net-misc/curl
@@ -36,7 +35,9 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
 src_prepare() {
+	# bug #412543
 	epatch "${FILESDIR}"/${PN}-3.0.0-glib-2.32.patch
+
 	cairo-dock_src_prepare
 }
 
diff --git a/x11-misc/cairo-dock/cairo-dock-3.0.0.ebuild b/x11-misc/cairo-dock/cairo-dock-3.0.0.ebuild
new file mode 100644
index 0000000..e3183ad
--- /dev/null
+++ b/x11-misc/cairo-dock/cairo-dock-3.0.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+EAPI="4"
+
+inherit cmake-utils eutils cairo-dock
+
+DESCRIPTION="Cairo-dock is a fast, responsive, Mac OS X-like dock."
+HOMEPAGE="http://www.glx-dock.org"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="crypt gtk2 xcomposite"
+
+RDEPEND="dev-libs/dbus-glib
+	dev-libs/glib:2
+	dev-libs/libxml2:2
+	gnome-base/librsvg:2
+	media-libs/mesa
+	net-misc/curl
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/libXrender
+	x11-libs/pango
+	crypt? ( sys-libs/glibc )
+	!gtk2? ( x11-libs/gtk+:3 )
+	gtk2? ( x11-libs/gtk+:2 )
+	xcomposite? (
+		x11-libs/libXcomposite
+		x11-libs/libXinerama
+		x11-libs/libXtst
+	)"
+
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig
+	sys-devel/gettext"
+
+src_prepare() {
+	# bug #412543
+	epatch "${FILESDIR}"/${P}-glib-2.32.patch
+
+	cairo-dock_src_prepare
+}
+
+src_configure() {
+	mycmakeargs+=(
+		"$(cmake-utils_use_with crypt CRYPT)"
+		"$(cmake-utils_use_with gtk2 GTK2)"
+		"$(cmake-utils_use_with xcomposite XEXTEND)"
+		"-DENABLE_GLITZ=OFF" )
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	elog "Additional plugins are available to extend the functionality"
+	elog "of Cairo-Dock. It is recommended to install at least"
+	elog "x11-misc/cairo-dock-plugins-core."
+	elog
+	elog "Cairo-Dock is an app that draws on a RGBA GLX visual."
+	elog "Some users have noticed that if the dock is launched,"
+	elog "severals qt4-based applications could crash, like skype or vlc."
+	elog "If you have this problem, add the following line into your bashrc:"
+	echo
+	elog "alias vlc='export XLIB_SKIP_ARGB_VISUALS=1; vlc; unset XLIB_SKIP_ARGB_VISUALS'"
+	elog "see http://www.qtforum.org/article/26669/qt4-mess-up-the-opengl-context.html for more details."
+}
diff --git a/x11-misc/cairo-dock/files/cairo-dock-3.0.0-CMakeLists.patch b/x11-misc/cairo-dock/files/cairo-dock-3.0.0-CMakeLists.patch
new file mode 100644
index 0000000..460ebc2
--- /dev/null
+++ b/x11-misc/cairo-dock/files/cairo-dock-3.0.0-CMakeLists.patch
@@ -0,0 +1,81 @@
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -14,9 +14,6 @@ project ("cairo-dock")
+ 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 
+-if (NOT ${CMAKE_BUILD_TYPE})
+-	add_definitions (-O3)
+-endif()
+ add_definitions (-DGL_GLEXT_PROTOTYPES="1")
+ add_definitions (-DCAIRO_DOCK_DEFAULT_ICON_NAME="default-icon.svg")
+ add_definitions (-DCAIRO_DOCK_ICON="cairo-dock.svg")
+@@ -55,39 +52,33 @@ set (mandir "${prefix}/${CMAKE_INSTALL_M
+ 
+ set (VERSION_HELP "0.9.991") # needed to parse Help.conf.in
+ 
+-if( CMAKE_SIZEOF_VOID_P EQUAL 8 AND "${FORCE_LIB64}" STREQUAL "yes")  # 64bits and force install in lib64
+-	set (libdir "${prefix}/lib64")
+-else()
+-	set (libdir "${prefix}/${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX}")  # (...)/lib
+-endif()
++set (libdir "${prefix}/${CMAKE_INSTALL_LIBDIR}")  # (...)/lib
+ 
+ set (includedir "${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")  # (...)/include
+ set (bindir "${prefix}/${CMAKE_INSTALL_BINDIR}")  # (...)/bin
+ 
++set (CMAKE_SKIP_BUILD_RPATH TRUE)
++set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
++
+ ########### dependencies ###############
+ 
+ set (packages_required "gthread-2.0 cairo librsvg-2.0 dbus-1 dbus-glib-1 libxml-2.0 xrender gl glu pangox libcurl")  # for the .pc
+ STRING (REGEX REPLACE " " ";" packages_required_semicolon ${packages_required})  # replace blank space by semicolon => to have more details if a package is missing
+ pkg_check_modules ("PACKAGE" REQUIRED "${packages_required_semicolon}")
+ 
+-set (xextend_required "xtst xcomposite xinerama")  # for the .pc
+-STRING (REGEX REPLACE " " ";" xextend_required_semicolon ${xextend_required})
+-pkg_check_modules ("XEXTEND" "${xextend_required_semicolon}")
+-if (${XEXTEND_FOUND})
++if (WITH_XEXTEND)
++	set (xextend_required "xtst xcomposite xinerama")  # for the .pc
++	STRING (REGEX REPLACE " " ";" xextend_required_semicolon ${xextend_required})
++	pkg_check_modules ("XEXTEND" REQUIRED "${xextend_required_semicolon}")
+ 	set (HAVE_XEXTEND 1)
+-else()
+-	set (xextend_required)
+ endif()
+ 
+-if (NOT "${force-gtk2}" STREQUAL "yes")  # by default, we use GTK+3 except if we force the use of GTK+2
+-	set (gtk_required "gtk+-3.0")  # for the .pc
+-	pkg_check_modules ("GTK" "${gtk_required}")  # the check is not set as 'required' because we can use GTK+2 if GTK+3 isn't available
+-endif()
+-
+-if (NOT "${GTK_FOUND}")
++if (WITH_GTK2) # by default, we use GTK+3 except if we force the use of GTK+2
+ 	set (gtk_required "gtk+-2.0")  # for the .pc
+-	pkg_check_modules ("GTK" REQUIRED "${gtk_required}")  # the check is requiered this time because we need GTK anyway.
++else()
++	set (gtk_required "gtk+-3.0")  # for the .pc
+ endif()
++pkg_check_modules ("GTK" REQUIRED "${gtk_required}") 
+ 
+ STRING (REGEX REPLACE "\\..*" "" GTK_MAJOR "${GTK_VERSION}")
+ 
+@@ -95,9 +86,13 @@ add_definitions (-DGTK_DISABLE_DEPRECATE
+ # add_definitions (-DG_DISABLE_DEPRECATED="1")
+ 
+ # We use crypt(3) which may be in libc, or in libcrypt (eg FreeBSD)
+-check_library_exists (crypt encrypt "" HAVE_LIBCRYPT)
+-if (${HAVE_LIBCRYPT})
+-	set (LIBCRYPT_LIBS "-lcrypt")
++if (WITH_CRYPT)
++	check_library_exists (crypt encrypt "" HAVE_LIBCRYPT)
++	if (${HAVE_LIBCRYPT})
++		set (LIBCRYPT_LIBS "-lcrypt")
++	else()
++		MESSAGE (FATAL_ERROR "crypt not found!")
++	endif()
+ endif()
+ 
+ check_include_files ("math.h" HAVE_MATH_H)
diff --git a/x11-misc/cairo-dock/metadata.xml b/x11-misc/cairo-dock/metadata.xml
index 6e08138..156b250 100644
--- a/x11-misc/cairo-dock/metadata.xml
+++ b/x11-misc/cairo-dock/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<use>
 		<flag name="crypt">Enables support for crypted passwords.</flag>
+		<flag name="gtk2">Force GTK+2 instead of default GTK+3.</flag>
 	</use>
 	<maintainer>
 		<email>DuPol@gmx.de</email>