[x11-misc/cairo-dock] Fix repoman complaint about metadata; drop old.

5 files changed, 13 insertions, 93 deletions

diff --git a/x11-misc/cairo-dock/ChangeLog b/x11-misc/cairo-dock/ChangeLog
index ab4515e..671c763 100644
--- a/x11-misc/cairo-dock/ChangeLog
+++ b/x11-misc/cairo-dock/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for x11-misc/cairo-dock
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
 # $Header$
 
+  01 Feb 2017; Dustin Polke <DuPol@gmx.de> -cairo-dock-3.0.0.ebuild,
+  -files/cairo-dock-3.0.0-glib-2.32.patch, metadata.xml:
+  Fix repoman complaint about metadata; drop old.
+
   14 Oct 2015; Dustin Polke <DuPol@gmx.de> cairo-dock-3.0.0.ebuild,
   cairo-dock-3.0.1.ebuild:
   Define location where to look for plugins.
diff --git a/x11-misc/cairo-dock/Manifest b/x11-misc/cairo-dock/Manifest
index 477f598..b014356 100644
--- a/x11-misc/cairo-dock/Manifest
+++ b/x11-misc/cairo-dock/Manifest
@@ -1,2 +1 @@
-DIST cairo-dock-3.0.0.tar.gz 2325081 SHA256 bef0794405f86bc397c4c077e48cb8e6df8f256f1c530e76aebd8612251a9b82
 DIST cairo-dock-3.0.1.tar.gz 2325714 SHA256 5f3b916b7b91e25c9c905d0a3a5b62a977c531cf05b2dbf390238448514689bb SHA512 1aed9ca70ee87ef95e458cd7545c4e78719053b45c5ca3fc89f366aa8b27c359103faf13f7b188a1049c03243bf87d04ac2dff1efc0764d1e5466758cdd7bae9 WHIRLPOOL 678da3b88ebd3ad56cb2a3fdc1f3a78abd079a60709a03fac935f6b8b2c4d9fa8a175b07156ffec7d2ecd181586f0333daef11d7b0c97fe10eb1f042c5f9819f
diff --git a/x11-misc/cairo-dock/cairo-dock-3.0.0.ebuild b/x11-misc/cairo-dock/cairo-dock-3.0.0.ebuild
deleted file mode 100644
index cb7f385..0000000
--- a/x11-misc/cairo-dock/cairo-dock-3.0.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="4"
-
-CD_LANGS="ar be bn ca cs cy de el eo es et eu fi fo fr gl hu id it ja ko nb nl
-	oc pl pt_BR pt ro ru sk sl sr sv tr uk vi zh_CN zh_TW"
-
-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
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-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"
-		"-DCMAKE_INSTALL_LIBDIR="${EPREFIX}"/usr/$(get_libdir)" )
-	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-glib-2.32.patch b/x11-misc/cairo-dock/files/cairo-dock-3.0.0-glib-2.32.patch
deleted file mode 100644
index acf99f3..0000000
--- a/x11-misc/cairo-dock/files/cairo-dock-3.0.0-glib-2.32.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gldit/cairo-dock-keybinder.h.orig
-+++ src/gldit/cairo-dock-keybinder.h
-@@ -31,7 +31,7 @@
- #ifndef __CD_KEY_BINDER_H__
- #define __CD_KEY_BINDER_H__
- 
--#include <glib/gtypes.h>
-+#include <glib.h>
- #include "cairo-dock-struct.h"
- #include "cairo-dock-manager.h"
- 
diff --git a/x11-misc/cairo-dock/metadata.xml b/x11-misc/cairo-dock/metadata.xml
index 156b250..ce8d6f1 100644
--- a/x11-misc/cairo-dock/metadata.xml
+++ b/x11-misc/cairo-dock/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <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>
-		<name>Dustin Polke</name>
-	</maintainer>
+<use>
+	<flag name="crypt">Enables support for crypted passwords.</flag>
+	<flag name="gtk2">Force GTK+2 instead of default GTK+3.</flag>
+</use>
+<maintainer type="person">
+	<email>DuPol@gmx.de</email>
+	<name>Dustin Polke</name>
+</maintainer>
 </pkgmetadata>