Modernize ebuild. Add a dependency on glu to stable revisions, and avoid linking to libGLU in testing (bug #452976, thanks to Diego Elio Pettenò). Update license and homepage.

(Portage version: 2.2.0_alpha158/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

4 files changed, 80 insertions, 19 deletions

diff --git a/x11-libs/gtkglarea/ChangeLog b/x11-libs/gtkglarea/ChangeLog
index 2df44c9edab3..f14c786030c6 100644
--- a/x11-libs/gtkglarea/ChangeLog
+++ b/x11-libs/gtkglarea/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-libs/gtkglarea
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglarea/ChangeLog,v 1.47 2012/05/05 03:52:26 jdhore Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglarea/ChangeLog,v 1.48 2013/01/21 19:28:54 tetromino Exp $
+
+*gtkglarea-2.0.1-r1 (21 Jan 2013)
+
+  21 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gtkglarea-1.2.3-r1.ebuild, gtkglarea-2.0.1.ebuild,
+  +gtkglarea-2.0.1-r1.ebuild:
+  Modernize ebuild. Add a dependency on glu to stable revisions, and avoid
+  linking to libGLU in testing (bug #452976, thanks to Diego Elio Pettenò).
+  Update license and homepage.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> gtkglarea-2.0.1.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/x11-libs/gtkglarea/gtkglarea-1.2.3-r1.ebuild b/x11-libs/gtkglarea/gtkglarea-1.2.3-r1.ebuild
index ae9092c316b4..3e1d9c5325a6 100644
--- a/x11-libs/gtkglarea/gtkglarea-1.2.3-r1.ebuild
+++ b/x11-libs/gtkglarea/gtkglarea-1.2.3-r1.ebuild
@@ -1,21 +1,22 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglarea/gtkglarea-1.2.3-r1.ebuild,v 1.27 2010/09/17 11:16:19 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglarea/gtkglarea-1.2.3-r1.ebuild,v 1.28 2013/01/21 19:28:54 tetromino Exp $
 
 inherit eutils multilib autotools
 
 # GTKGLArea has been abandoned by the author. We'll continue to mirror the
 # source on Gentoo mirrors.
-DESCRIPTION="GL Extentions for gtk+"
-HOMEPAGE="http://www.student.oulu.fi/~jlof/gtkglarea/"
+DESCRIPTION="OpenGL canvas and context provider for GTK+"
+HOMEPAGE="http://www.mono-project.com/GtkGLArea"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="LGPL-2+ GPL-2+" # examples are GPL-2+, library is LGPL-2+
 SLOT="1"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc sh sparc x86"
 IUSE=""
 
 RDEPEND="=x11-libs/gtk+-1.2*
+	virtual/glu
 	virtual/opengl"
 DEPEND="${RDEPEND}"
 
diff --git a/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild b/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..2280747fd325
--- /dev/null
+++ b/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild,v 1.1 2013/01/21 19:28:54 tetromino Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit gnome2
+
+DESCRIPTION="OpenGL canvas and context provider for GTK+"
+HOMEPAGE="http://www.mono-project.com/GtkGLArea"
+
+LICENSE="LGPL-2+ GPL-2+" # examples are GPL-2+, library is LGPL-2+
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+RDEPEND=">=x11-libs/gtk+-2.0.3:2
+	virtual/opengl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	# Do not build examples
+	sed "s:\(SUBDIRS.*\)examples:\1:" -i Makefile.am Makefile.in || die "sed 1 failed"
+	# -lGLU is only needed for building examples. Avoid autoreconf.
+	sed -e 's: -lGLU::' -i configure || die "sed 2 failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure --disable-static
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog NEWS README* docs/*.txt"
+	gnome2_src_install
+
+	if use examples; then
+		cd "${S}"/examples
+		insinto /usr/share/doc/${PF}/examples
+		doins *.c *.h *.lwo README || die "doins failed"
+	fi
+}
diff --git a/x11-libs/gtkglarea/gtkglarea-2.0.1.ebuild b/x11-libs/gtkglarea/gtkglarea-2.0.1.ebuild
index 56d5220419ab..0ea6a25a15ba 100644
--- a/x11-libs/gtkglarea/gtkglarea-2.0.1.ebuild
+++ b/x11-libs/gtkglarea/gtkglarea-2.0.1.ebuild
@@ -1,37 +1,41 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglarea/gtkglarea-2.0.1.ebuild,v 1.11 2012/05/05 03:52:26 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglarea/gtkglarea-2.0.1.ebuild,v 1.12 2013/01/21 19:28:54 tetromino Exp $
+
+EAPI="5"
 
-EAPI="2"
 GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
 
 inherit gnome2
 
-DESCRIPTION="GL extensions for gtk+"
-HOMEPAGE="http://www.gnome.org/"
+DESCRIPTION="OpenGL canvas and context provider for GTK+"
+HOMEPAGE="http://www.mono-project.com/GtkGLArea"
 
-LICENSE="GPL-2 LGPL-2.1"
+LICENSE="LGPL-2+ GPL-2+" # examples are GPL-2+, library is LGPL-2+
 SLOT="2"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND=">=x11-libs/gtk+-2.0.3:2
+	virtual/glu
 	virtual/opengl"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-DOCS="AUTHORS ChangeLog NEWS README* docs/*.txt"
+src_prepare() {
+	# Do not build examples
+	sed "s:\(SUBDIRS.*\)examples:\1:" -i Makefile.am Makefile.in || die "sed 1 failed"
 
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-static"
+	gnome2_src_prepare
 }
 
-src_prepare() {
-	# Do not build examples
-	sed "s:\(SUBDIRS.*\)examples:\1:" -i Makefile.am Makefile.in || die "sed failed"
+src_configure() {
+	gnome2_src_configure --disable-static
 }
 
 src_install() {
+	DOCS="AUTHORS ChangeLog NEWS README* docs/*.txt"
 	gnome2_src_install
 
 	if use examples; then