Remove -D.*DISABLE_DEPRECATED cflags, bug #342905 (by Thomas Kister and Diego Elio Pettenò); bump to eapi3 to force gtk+2 related SLOTs, update homepage.

(Portage version: 2.1.9.25/cvs/Linux x86_64)

2 files changed, 24 insertions, 8 deletions

diff --git a/dev-cpp/gtkglextmm/ChangeLog b/dev-cpp/gtkglextmm/ChangeLog
index 84270e9c033a..a38af0736566 100644
--- a/dev-cpp/gtkglextmm/ChangeLog
+++ b/dev-cpp/gtkglextmm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-cpp/gtkglextmm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkglextmm/ChangeLog,v 1.20 2010/09/17 10:51:38 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkglextmm/ChangeLog,v 1.21 2010/12/17 09:15:22 pacho Exp $
+
+  17 Dec 2010; Pacho Ramos <pacho@gentoo.org> gtkglextmm-1.2.0-r1.ebuild:
+  Remove -D.*DISABLE_DEPRECATED cflags, bug #342905 (by Thomas Kister and Diego
+  Elio Pettenò); bump to eapi3 to force gtk+2 related SLOTs, update homepage.
 
   17 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   gtkglextmm-1.2.0-r1.ebuild:
diff --git a/dev-cpp/gtkglextmm/gtkglextmm-1.2.0-r1.ebuild b/dev-cpp/gtkglextmm/gtkglextmm-1.2.0-r1.ebuild
index cc0322e1c544..7c3ddd6852d7 100644
--- a/dev-cpp/gtkglextmm/gtkglextmm-1.2.0-r1.ebuild
+++ b/dev-cpp/gtkglextmm/gtkglextmm-1.2.0-r1.ebuild
@@ -1,11 +1,14 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkglextmm/gtkglextmm-1.2.0-r1.ebuild,v 1.5 2010/09/17 10:51:38 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkglextmm/gtkglextmm-1.2.0-r1.ebuild,v 1.6 2010/12/17 09:15:22 pacho Exp $
+
+EAPI="3"
+GCONF_DEBUG="yes"
 
 inherit gnome2
 
 DESCRIPTION="C++ bindings for gtkglext"
-HOMEPAGE="http://gtkglext.sourceforge.net/"
+HOMEPAGE="http://projects.gnome.org/gtkglext/"
 SRC_URI="mirror://sourceforge/gtkglext/${P}.tar.bz2"
 
 KEYWORDS="amd64 ppc x86"
@@ -15,8 +18,8 @@ LICENSE="GPL-2 LGPL-2.1"
 
 RDEPEND=">=x11-libs/gtkglext-1
 	>=dev-libs/libsigc++-2.0
-	>=dev-cpp/glibmm-2.4
-	>=dev-cpp/gtkmm-2.4
+	>=dev-cpp/glibmm-2.4:2
+	>=dev-cpp/gtkmm-2.4:2.4
 	virtual/opengl"
 
 DEPEND="${RDEPEND}
@@ -24,16 +27,25 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog* NEWS README TODO"
 
-src_unpack() {
-	gnome2_src_unpack
+src_prepare() {
+	gnome2_src_prepare
 
 	# Remove docs from SUBDIRS so that docs are not installed, as
 	# we handle it in src_install.
 	sed -i -e 's|^\(SUBDIRS =.*\)docs\(.*\)|\1\2|' Makefile.in || \
 		die "sed Makefile.in failed"
+
+	# Remove -D.*DISABLE_DEPRECATED cflags, bug #342905
+	find . -iname 'Makefile.am' -exec \
+		sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 1 failed"
+	# Do Makefile.in after Makefile.am to avoid automake maintainer-mode
+	find . -iname 'Makefile.in' -exec \
+		sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 2 failed"
 }
 
 src_install() {
 	gnome2_src_install
-	use doc && dohtml -r docs/reference/html/*
+	if use doc; then
+		dohtml -r docs/reference/html/* || die
+	fi
 }