From: Pacho Ramos <pacho@gentoo.org>
Date: Sat, 15 Oct 2011 22:00:56 +0000 (+0000)
Subject: Drop DEPRECATED flags, bug #387173; remove old.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=147670d81c2816f9bcb4063fe0b59a25d389b456;p=gentoo.git

Drop DEPRECATED flags, bug #387173; remove old.

Package-Manager: portage-2.1.10.27/cvs/Linux x86_64
---

diff --git a/media-libs/clutter-gtk/ChangeLog b/media-libs/clutter-gtk/ChangeLog
index 60767cb1d437..dc7ea330e423 100644
--- a/media-libs/clutter-gtk/ChangeLog
+++ b/media-libs/clutter-gtk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/clutter-gtk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gtk/ChangeLog,v 1.23 2011/09/27 12:46:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gtk/ChangeLog,v 1.24 2011/10/15 22:00:56 pacho Exp $
+
+  15 Oct 2011; Pacho Ramos <pacho@gentoo.org> clutter-gtk-0.10.8.ebuild,
+  -clutter-gtk-1.0.2.ebuild:
+  Drop DEPRECATED flags, bug #387173; remove old.
 
 *clutter-gtk-1.0.4 (27 Sep 2011)
 
diff --git a/media-libs/clutter-gtk/clutter-gtk-0.10.8.ebuild b/media-libs/clutter-gtk/clutter-gtk-0.10.8.ebuild
index 8a96b2103340..dba48f10edd3 100644
--- a/media-libs/clutter-gtk/clutter-gtk-0.10.8.ebuild
+++ b/media-libs/clutter-gtk/clutter-gtk-0.10.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gtk/clutter-gtk-0.10.8.ebuild,v 1.9 2011/03/22 20:12:53 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gtk/clutter-gtk-0.10.8.ebuild,v 1.10 2011/10/15 22:00:56 pacho Exp $
 
 EAPI="2"
 
@@ -36,5 +36,9 @@ src_prepare() {
 	# Fix build with USE=introspection, bug #350061
 	epatch "${FILESDIR}/${PN}-0.10.8-fix-introspection-build.patch"
 
+	# Drop DEPRECATED flags, bug #387173
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
+		clutter-gtk/Makefile.am || die
+
 	eautoreconf
 }
diff --git a/media-libs/clutter-gtk/clutter-gtk-1.0.2.ebuild b/media-libs/clutter-gtk/clutter-gtk-1.0.2.ebuild
deleted file mode 100644
index 4a85df1ea54b..000000000000
--- a/media-libs/clutter-gtk/clutter-gtk-1.0.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gtk/clutter-gtk-1.0.2.ebuild,v 1.1 2011/07/30 16:49:39 pacho Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-CLUTTER_LA_PUNT="yes"
-
-# inherit clutter after gnome2 so that defaults aren't overriden
-inherit gnome2 clutter gnome.org
-
-DESCRIPTION="Clutter-GTK - GTK+3 Integration library for Clutter"
-
-SLOT="1.0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="doc examples +introspection"
-
-# XXX: Needs gtk with X support (!directfb)
-RDEPEND="
-	>=x11-libs/gtk+-3:3[introspection?]
-	>=media-libs/clutter-1.4:1.0[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=sys-devel/gettext-0.18
-	doc? ( >=dev-util/gtk-doc-1.14 )"
-
-pkg_setup() {
-	DOCS="NEWS README"
-	EXAMPLES="examples/{*.c,redhand.png}"
-	G2CONF="${G2CONF}
-		--with-flavour=x11
-		--enable-maintainer-flags=no
-		$(use_enable introspection)"
-}