Remove active deprecation definitions, bug #308973.

Package-Manager: portage-2.2_rc65/cvs/Linux x86_64

diff --git a/x11-libs/gtkglext/ChangeLog b/x11-libs/gtkglext/ChangeLog
index e7cf6d8e711d6e56d591e0467d9d1135387c592d..bbfa9ab1cd83247986b2b4745d7580cf5f2613b8 100644 (file)
--- a/x11-libs/gtkglext/ChangeLog
+++ b/x11-libs/gtkglext/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/gtkglext
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglext/ChangeLog,v 1.66 2009/05/05 16:14:30 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglext/ChangeLog,v 1.67 2010/03/14 22:31:49 eva Exp $
+
+  14 Mar 2010; Gilles Dartiguelongue <eva@gentoo.org> gtkglext-1.2.0.ebuild:
+  Remove active deprecation definitions, bug #308973.
 
   05 May 2009; Samuli Suominen <ssuominen@gentoo.org> gtkglext-1.2.0.ebuild:
   Move to EAPI2 and remove USE doc which didn't do anything since the

diff --git a/x11-libs/gtkglext/Manifest b/x11-libs/gtkglext/Manifest
index 003206ebac4fd548710fdeab7964159be55e5e36..82bc9e8fbd9b3d6432b7c4609d9bf08b4cf4c368 100644 (file)
--- a/x11-libs/gtkglext/Manifest
+++ b/x11-libs/gtkglext/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST gtkglext-1.2.0.tar.bz2 703821 RMD160 c731df1b4f0bf2ccb213fe489d2c2d08910d4c77 SHA1 d84c9472af3438fbce84189613e5370b97d9d1e7 SHA256 16bd736074f6b14180f206b7e91263fc721b49912ea3258ab5f094cfa5497f51
-EBUILD gtkglext-1.2.0.ebuild 685 RMD160 efb6b9145ee4049c43ca50b27c892590d01dbbbe SHA1 2c1a2de548e3a32dd9e3de2cea45c04a4a35842a SHA256 d48985a62842f0237663df63e83006e95b626a98be7a0c520066acc0e2e02dc5
-MISC ChangeLog 8131 RMD160 e78ccc3bff172ebff9db6d69a39fe5b91050853f SHA1 d0d83076ec94b7d137a4f8f8bd3435960ff0dc3b SHA256 82ea44586b752da36955adcb17aedb2fb9d9276d097a8bb2e41ddf439b65cc37
+EBUILD gtkglext-1.2.0.ebuild 1048 RMD160 8b7526f4a52ab4509206e6b467ce7da368e4bdc0 SHA1 c968edea1d2d58a81d57b533b0245f442fbfafa1 SHA256 8793cf7b40616fb898512d238cf3cbafc299b436ed9d3ae311a89dde855b5abd
+MISC ChangeLog 8257 RMD160 9a9c6fe83c50f761c3fb7d635cfb949e70bb4ff7 SHA1 9ccd017c4421509069595a10b0c369fbc7baea68 SHA256 028ea7b78b08393d78b5a80de539a8d44b25f69c3bf200511fa3f2edd2acbfa3
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkudY9sACgkQ1fmVwcYIWAZuswCeNRJwMjCCflCKc9eySStbYki5
+fnAAn2mfLMtIFBgfoOZgN+4GNtV9jyTp
+=5Kjk
+-----END PGP SIGNATURE-----

diff --git a/x11-libs/gtkglext/gtkglext-1.2.0.ebuild b/x11-libs/gtkglext/gtkglext-1.2.0.ebuild
index 547c3b180fe46e1e301d84af9f661c542fd6c878..6137353a20136318a9f0b137d943dc10684efea8 100644 (file)
--- a/x11-libs/gtkglext/gtkglext-1.2.0.ebuild
+++ b/x11-libs/gtkglext/gtkglext-1.2.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglext/gtkglext-1.2.0.ebuild,v 1.18 2009/05/05 16:14:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglext/gtkglext-1.2.0.ebuild,v 1.19 2010/03/14 22:31:49 eva Exp $
+
+EAPI="2"
 
-EAPI=2
 inherit gnome2
 
 DESCRIPTION="GL extensions for Gtk+ 2.0"
@@ -23,3 +24,16 @@ DEPEND="${RDEPEND}
        dev-util/pkgconfig"
 
 DOCS="AUTHORS ChangeLog* NEWS README TODO"
+
+src_prepare() {
+       gnome2_src_prepare
+
+       # Remove development knobs, bug #308973
+       sed -i 's:-D\(G.*DISABLE_DEPRECATED\):-D__\1__:g' \
+               examples/Makefile.am examples/Makefile.in \
+               gdk/Makefile.am gdk/Makefile.in \
+               gdk/win32/Makefile.am gdk/win32/Makefile.in \
+               gdk/x11/Makefile.am gdk/x11/Makefile.in \
+               gtk/Makefile.am gtk/Makefile.in \
+               || die "sed failed"
+}