summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/cairo-dock/ChangeLog4
-rw-r--r--x11-misc/cairo-dock/Manifest5
-rw-r--r--x11-misc/cairo-dock/cairo-dock-2.4.0.2.ebuild62
-rw-r--r--x11-misc/cairo-dock/files/cairo-dock-2.4.0.2-CMakeLists.patch22
4 files changed, 5 insertions, 88 deletions
diff --git a/x11-misc/cairo-dock/ChangeLog b/x11-misc/cairo-dock/ChangeLog
index 0a79d2d..4f8ab8c 100644
--- a/x11-misc/cairo-dock/ChangeLog
+++ b/x11-misc/cairo-dock/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header$
+ 23 May 2012; Dustin Polke <DuPol@gmx.de> -cairo-dock-2.4.0.2.ebuild,
+ -files/cairo-dock-2.4.0.2-CMakeLists.patch:
+ Remove old.
+
*cairo-dock-3.0.0 (28 Apr 2012)
28 Apr 2012; Dustin Polke <DuPol@gmx.de> cairo-dock-2.4.0.2.ebuild,
diff --git a/x11-misc/cairo-dock/Manifest b/x11-misc/cairo-dock/Manifest
index ff14cd7..b77b5ad 100644
--- a/x11-misc/cairo-dock/Manifest
+++ b/x11-misc/cairo-dock/Manifest
@@ -1,9 +1,6 @@
-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
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 ChangeLog 2792 RMD160 38a47ea1614df5195c7b866a93d39bae93342cd4 SHA1 d31592e4bab4ce7278664a76b1f9e9eb5f53de98 SHA256 5250d65bf0808dd9fcd88dba7399955723d5d9a52c5c211c8f87172fa8898e88
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
deleted file mode 100644
index 658a6d2..0000000
--- a/x11-misc/cairo-dock/cairo-dock-2.4.0.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-EAPI="3"
-
-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 xcomposite"
-
-RDEPEND="dev-libs/dbus-glib
- dev-libs/libxml2:2
- gnome-base/librsvg:2
- net-misc/curl
- sys-apps/dbus
- x11-libs/cairo
- x11-libs/gtk+:2
- x11-libs/gtkglext
- x11-libs/libXrender
- crypt? ( sys-libs/glibc )
- 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}"/${PN}-3.0.0-glib-2.32.patch
-
- cairo-dock_src_prepare
-}
-
-src_configure() {
- # glitz support has been dropped from recent cairo, so drop it here as well.
- mycmakeargs+=( "-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-2.4.0.2-CMakeLists.patch b/x11-misc/cairo-dock/files/cairo-dock-2.4.0.2-CMakeLists.patch
deleted file mode 100644
index 81dd3a5..0000000
--- a/x11-misc/cairo-dock/files/cairo-dock-2.4.0.2-CMakeLists.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -13,9 +13,6 @@ project ("cairo-dock")
- set (VERSION "2.4.0~2")
-
- add_definitions (-std=c99 -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration) # 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")
-@@ -61,6 +58,9 @@ endif()
- set (includedir ${prefix}/include)
- set (bindir ${prefix}/bin)
-
-+set (CMAKE_SKIP_BUILD_RPATH TRUE)
-+set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-+
- ########### dependencies ###############
-
- pkg_check_modules ("PACKAGE" REQUIRED "gtk+-2.0" "gthread-2.0" "cairo" "librsvg-2.0" "dbus-1" "dbus-glib-1" "libxml-2.0" "gtkglext-1.0" "xrender" "libcurl")