[x11-misc/cairo-dock] Drop glitz support which has been dropped by cairo upstream, bump to EAPI3 and drop old.

5 files changed, 15 insertions, 153 deletions

diff --git a/x11-misc/cairo-dock/ChangeLog b/x11-misc/cairo-dock/ChangeLog
index fac6816..58586eb 100644
--- a/x11-misc/cairo-dock/ChangeLog
+++ b/x11-misc/cairo-dock/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for x11-misc/cairo-dock
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header$
 
+  13 Feb 2011; Dustin Polke <dustin.polke@uni-siegen.de>
+  -cairo-dock-2.1.3_p8.ebuild, -cairo-dock-2.1.3_p9.ebuild,
+  cairo-dock-2.2.0_p4.ebuild, metadata.xml:
+  Drop glitz support which has been dropped by cairo upstream and bump to
+  EAPI3; drop old.
+
 *cairo-dock-2.2.0_p4 (20 Dec 2010)
 
   20 Dec 2010; Dustin Polke <dustin.polke@uni-siegen.de>
diff --git a/x11-misc/cairo-dock/Manifest b/x11-misc/cairo-dock/Manifest
index f49b8b4..aa1cce6 100644
--- a/x11-misc/cairo-dock/Manifest
+++ b/x11-misc/cairo-dock/Manifest
@@ -1,9 +1,5 @@
 AUX cairo-dock-2.2.0_p4-CMakeLists.patch 935 RMD160 a6641754355b074d69269abf92f0eef69b7dda0c SHA1 c6b79f25d7266777eab4918b6bd429687b672fab SHA256 c6e224bbc8640987ac46fc8e20b25518a5938fc3b0dada17aa8bdc7ca0d483a6
-DIST cairo-dock-2.1.3-8.tar.gz 2480130 RMD160 75220f9ed03bd9442a2385f5a470ac23f56bd354 SHA1 0c74bdc08b77a9f071670d5afdf8c142d245a27f SHA256 1f18418998b7fb49ae2ed653b466ee477e5a1fd9196aed68407d796b2ea7e1c2
-DIST cairo-dock-2.1.3-9.tar.gz 2480328 RMD160 09091b84b229b157d94c91abf9898735871e3c8d SHA1 5253dec08f6db90f46df8b84e4d31fba8697d37f SHA256 0629ffc55a5c075daa74908627ad5a69315c3af22051458ec9489ed64d382ae5
 DIST cairo-dock-2.2.0-4.tar.gz 2335519 RMD160 23d0917e5b0c49790b7b5f266d40b837af555bd2 SHA1 4edc1d4f71d71b5c7cf295bdcc4b40bc016bc54e SHA256 dc2de939e8fe8bb2b020d7c12c106114f321a104ea41d3538fbc1fce2fadff95
-EBUILD cairo-dock-2.1.3_p8.ebuild 1888 RMD160 b303d87b619427bd34f91054a8c4741ca2a4c86b SHA1 856cf71ee87de3a63c5aa56d87ba49cbe00172a5 SHA256 809aa77be93d6b92f23bd47ddfe0bd01e670ca63a415a7069b8554d10b98462b
-EBUILD cairo-dock-2.1.3_p9.ebuild 1888 RMD160 b303d87b619427bd34f91054a8c4741ca2a4c86b SHA1 856cf71ee87de3a63c5aa56d87ba49cbe00172a5 SHA256 809aa77be93d6b92f23bd47ddfe0bd01e670ca63a415a7069b8554d10b98462b
-EBUILD cairo-dock-2.2.0_p4.ebuild 1748 RMD160 262783d04d0ddb88d63af45ac850f9d04f032001 SHA1 9ebfac4b981e499a822e892036bb8355e2fb41b9 SHA256 51c782cf2f6dfefc548a573f5040ededf9fbfa112b6f6efcdfe835f01a86cca8
-MISC ChangeLog 818 RMD160 4d6cd3327d0e46dbfc0b3c80c521c0bb482b0edf SHA1 25b2697b50779a2a8f9d83fe3eac0f57e679e958 SHA256 9c0c50dbb162b525e5e291b7ef51318545cb9c551dc0b6f37ec47b93231f1e87
-MISC metadata.xml 431 RMD160 e893b7cce5c516109caf1d4955d53bf2b54406c6 SHA1 cc3785d77d8e5b5ed12115ac59c74f5d31de8918 SHA256 d569a14b8209b65eebff096b12ddfc9f5f133dad477a8d0a27bb850e96347051
+EBUILD cairo-dock-2.2.0_p4.ebuild 1767 RMD160 63bfffb62ff74a39a470c59c12817c449b11b152 SHA1 10af074a32bf3049542f8abaae167bab3c66235f SHA256 881add92274f412c5cbe26f51d75a1c20738180fb84603d42f2f2dc830baea2d
+MISC ChangeLog 1073 RMD160 efe545fcd8d4e2048636fb26823d8ca0770013c1 SHA1 467182349a87485d964716fe4dbc02ba8d3314eb SHA256 1065cdcb37d809356c491bf0c623e948938da75118e6e1efa16cac1fe291168a
+MISC metadata.xml 355 RMD160 d209d8404843a4194f3275b191a331557c574f64 SHA1 b8f9fad8f3fddbeebcd197c99d3090c005edae15 SHA256 b62702d10983ff670fc6fa0e612af97a10af27baf52eca5f2fe4da5faab73136
diff --git a/x11-misc/cairo-dock/cairo-dock-2.1.3_p8.ebuild b/x11-misc/cairo-dock/cairo-dock-2.1.3_p8.ebuild
deleted file mode 100644
index bf2c0fe..0000000
--- a/x11-misc/cairo-dock/cairo-dock-2.1.3_p8.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit 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="Cairo-dock is a fast, responsive, Mac OS X-like dock."
-HOMEPAGE="http://www.glx-dock.org"
-SRC_URI="http://launchpad.net/cairo-dock-core/${MY_PV_MAJ_MIN}/${MY_PV_MAJ_MIN_MIC}/+download/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="glitz nls xcomposite"
-
-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-libs/libXrender
-	glitz? ( media-libs/glitz )
-	xcomposite? (
-		x11-libs/libXcomposite
-		x11-libs/libXinerama
-		x11-libs/libXtst
-	)"
-
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	# Hardcoded CFLAGS are bad
-	sed -e '/-O3\\$/d;/-g -ggdb\\$/d' -i src/Makefile.in || \
-		die "sedding ${S}/src/Makefile.in failed"
-	# Fix po/POTFILES.in
-	find "${S}/src" -name *.c > "${S}/po/POTFILES.in" || \
-		die "Fixing ${S}/po/POTFILES.in failed"
-}
-
-src_configure() {
-	econf $(use_enable glitz) $(use_enable xcomposite xextend) $(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
-
-pkg_postinst() {
-	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/cairo-dock-2.1.3_p9.ebuild b/x11-misc/cairo-dock/cairo-dock-2.1.3_p9.ebuild
deleted file mode 100644
index bf2c0fe..0000000
--- a/x11-misc/cairo-dock/cairo-dock-2.1.3_p9.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit 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="Cairo-dock is a fast, responsive, Mac OS X-like dock."
-HOMEPAGE="http://www.glx-dock.org"
-SRC_URI="http://launchpad.net/cairo-dock-core/${MY_PV_MAJ_MIN}/${MY_PV_MAJ_MIN_MIC}/+download/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="glitz nls xcomposite"
-
-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-libs/libXrender
-	glitz? ( media-libs/glitz )
-	xcomposite? (
-		x11-libs/libXcomposite
-		x11-libs/libXinerama
-		x11-libs/libXtst
-	)"
-
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	# Hardcoded CFLAGS are bad
-	sed -e '/-O3\\$/d;/-g -ggdb\\$/d' -i src/Makefile.in || \
-		die "sedding ${S}/src/Makefile.in failed"
-	# Fix po/POTFILES.in
-	find "${S}/src" -name *.c > "${S}/po/POTFILES.in" || \
-		die "Fixing ${S}/po/POTFILES.in failed"
-}
-
-src_configure() {
-	econf $(use_enable glitz) $(use_enable xcomposite xextend) $(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
-
-pkg_postinst() {
-	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/cairo-dock-2.2.0_p4.ebuild b/x11-misc/cairo-dock/cairo-dock-2.2.0_p4.ebuild
index 6a1a832..67b1355 100644
--- a/x11-misc/cairo-dock/cairo-dock-2.2.0_p4.ebuild
+++ b/x11-misc/cairo-dock/cairo-dock-2.2.0_p4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="3"
 
 inherit cmake-utils eutils versionator
 
@@ -17,7 +17,7 @@ SRC_URI="http://launchpad.net/cairo-dock-core/${MY_PV_MAJ_MIN}/${MY_PV_MAJ_MIN_M
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="crypt glitz xcomposite"
+IUSE="crypt xcomposite"
 
 RDEPEND="dev-libs/dbus-glib
 	dev-libs/glib:2
@@ -29,7 +29,6 @@ RDEPEND="dev-libs/dbus-glib
 	x11-libs/gtkglext
 	x11-libs/libXrender
 	crypt? ( sys-libs/glibc )
-	glitz? ( x11-libs/cairo[glitz] )
 	xcomposite? (
 		x11-libs/libXcomposite
 		x11-libs/libXinerama
@@ -51,7 +50,8 @@ src_prepare() {
 }
 
 src_configure() {
-	mycmakeargs+=( "$(cmake-utils_use_enable glitz GLITZ)" )
+	# glitz support has been dropped from recent cairo, so drop it here as well.
+	mycmakeargs+=( "-DENABLE_GLITZ=OFF" )
 	cmake-utils_src_configure
 }