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.

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

3 files changed, 36 insertions, 10 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/Manifest b/dev-cpp/gtkglextmm/Manifest
index 534ac76ec9c5..dfdec57de2d7 100644
--- a/dev-cpp/gtkglextmm/Manifest
+++ b/dev-cpp/gtkglextmm/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST gtkglextmm-1.2.0.tar.bz2 623815 RMD160 e1e67e8da4307917c08ad989163a403d1374c0ca SHA1 45bcc7a4dac30cf0f9e5012a74b471d60782cd0b SHA256 6cd4bd2a240e5eb1e3a24c5a3ebbf7ed905b522b888439778043fdeb58771fea
-EBUILD gtkglextmm-1.2.0-r1.ebuild 972 RMD160 b181a89ee7edcb3a202c61d43ccee5b9ea10bb92 SHA1 f89ad77342b1882fc243e2bb8eaf8dbea1b38010 SHA256 3fd9f2dd7dc4e1a61d42714b6e072e971e811ac76305758672229abe5d3b72b8
-MISC ChangeLog 3376 RMD160 49061e9572cc63f5e8b40b6bab0961dcedfad6e8 SHA1 9e892facd411ef0be8c40356d6cd37008bd1a380 SHA256 b25b35558de587ae948a1501c84d9e8e8908998783b0eec327a8f85a3310a4c9
+EBUILD gtkglextmm-1.2.0-r1.ebuild 1368 RMD160 f68cf64b826cb0fdf78fd25c7ac630067d2c3fc8 SHA1 fadf37039f232ff76728b560344fa5704ed0e1e5 SHA256 89cee9a5ab0eebb8ab7fecd36b2d2ad2ac2ea87109aee9144666eb39e958caa3
+MISC ChangeLog 3606 RMD160 e113818f0678bbc20dee5eae83f4920aff3d816b SHA1 fade4b71284544bcbc8bc18a3ea9944239f859a3 SHA256 0678256fa499cf5b5c71690ffe36f54305e7ae6ce2e3145b2141d403ded39947
 MISC metadata.xml 161 RMD160 1988530f97a742d78d3f3e99d15625f8a674260a SHA1 b034f3d668b50c57826ead5cfd17fcd2b68d19d6 SHA256 00ba82c241ad7007fe861877db3ae5aeaa967e05f0a6478e6ba9eb60ba31a3b6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk0LKjAACgkQCaWpQKGI+9TF5gCeJPuZLxQsW60r/LGEfkFPWvnd
+GB8AniYdTWHf8WVQmmta/GMUca+MV2sJ
+=4st0
+-----END PGP SIGNATURE-----
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
 }