[gentoo-commits] proj/gnome:master commit in: dev-libs/gdl/

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     1d0fff72c562723fff9a0909e4418005c08d8061
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 20 23:05:35 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Nov 20 23:07:08 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1d0fff72

dev-libs/gdl: 3.8.1 → 3.10.0

---
 .../gdl/{gdl-9999.ebuild => gdl-3.10.0.ebuild}     | 24 ++++------------------
 dev-libs/gdl/gdl-9999.ebuild                       |  9 +++-----
 2 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/dev-libs/gdl/gdl-9999.ebuild b/dev-libs/gdl/gdl-3.10.0.ebuild
similarity index 55%
copy from dev-libs/gdl/gdl-9999.ebuild
copy to dev-libs/gdl/gdl-3.10.0.ebuild
index a57c8d3..72632b7 100644
--- a/dev-libs/gdl/gdl-9999.ebuild
+++ b/dev-libs/gdl/gdl-3.10.0.ebuild
@@ -1,28 +1,19 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
 
 inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="GNOME docking library"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="https://developer.gnome.org/gdl/"
 
 LICENSE="LGPL-2.1+"
 SLOT="3/5" # subslot = libgdl-3 soname version
 IUSE="+introspection"
-if [[ ${PV} = 9999 ]]; then
-	IUSE="${IUSE} doc"
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-fi
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 RDEPEND="
 	dev-libs/glib:2
@@ -36,14 +27,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		doc? ( >=dev-util/gtk-doc-1.4 )"
-fi
-
 src_configure() {
 	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-	G2CONF="${G2CONF}
-		$(use_enable introspection)"
-	gnome2_src_configure
+	gnome2_src_configure $(use_enable introspection)
 }

diff --git a/dev-libs/gdl/gdl-9999.ebuild b/dev-libs/gdl/gdl-9999.ebuild
index a57c8d3..6d2a4e2 100644
--- a/dev-libs/gdl/gdl-9999.ebuild
+++ b/dev-libs/gdl/gdl-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 if [[ ${PV} = 9999 ]]; then
@@ -12,7 +11,7 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 DESCRIPTION="GNOME docking library"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="https://developer.gnome.org/gdl/"
 
 LICENSE="LGPL-2.1+"
 SLOT="3/5" # subslot = libgdl-3 soname version
@@ -43,7 +42,5 @@ fi
 
 src_configure() {
 	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-	G2CONF="${G2CONF}
-		$(use_enable introspection)"
-	gnome2_src_configure
+	gnome2_src_configure $(use_enable introspection)
 }