Version bump, fix compilation with gdl-2.28, bug #290522. Remove built_with_use since it is useless with corresponding gdl versions, bug #289028.

(Portage version: 2.2_rc46/cvs/Linux x86_64)

4 files changed, 198 insertions, 13 deletions

diff --git a/dev-python/gdl-python/ChangeLog b/dev-python/gdl-python/ChangeLog
index f39dcf6e1a23..5e044d417102 100644
--- a/dev-python/gdl-python/ChangeLog
+++ b/dev-python/gdl-python/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/gdl-python
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gdl-python/ChangeLog,v 1.19 2009/09/27 13:50:54 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gdl-python/ChangeLog,v 1.20 2009/10/30 07:44:43 eva Exp $
+
+*gdl-python-2.19.1-r2 (30 Oct 2009)
+
+  30 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  gdl-python-2.19.1-r1.ebuild, +gdl-python-2.19.1-r2.ebuild,
+  +files/gdl-python-2.19.1-gdlapi-removal.patch:
+  Version bump, fix compilation with gdl-2.28, bug #290522. Remove
+  built_with_use since it is useless with corresponding gdl versions, bug
+  #289028.
 
   27 Sep 2009; nixnut <nixnut@gentoo.org> gdl-python-2.19.1-r1.ebuild:
   ppc stable #268359
diff --git a/dev-python/gdl-python/files/gdl-python-2.19.1-gdlapi-removal.patch b/dev-python/gdl-python/files/gdl-python-2.19.1-gdlapi-removal.patch
new file mode 100644
index 000000000000..a3a9a2eeb568
--- /dev/null
+++ b/dev-python/gdl-python/files/gdl-python-2.19.1-gdlapi-removal.patch
@@ -0,0 +1,152 @@
+# Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-python-extras/+bug/389728
+# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=584126
+# Patch: http://bugzilla.gnome.org/attachment.cgi?id=135508&action=view
+# Description: Latest gdl removed some API from the public API and now the python bindings fail to compile.
+
+
+Index: gnome-python-extras-2.25.3/gdl/gdl.defs
+===================================================================
+--- gnome-python-extras-2.25.3.orig/gdl/gdl.defs	2009-06-25 01:12:34.660704973 +0200
++++ gnome-python-extras-2.25.3/gdl/gdl.defs	2009-06-25 01:12:46.804700100 +0200
+@@ -46,13 +46,6 @@
+   (gtype-id "GDL_TYPE_DOCK_ITEM")
+ )
+ 
+-(define-object DockNotebook
+-  (in-module "Gdl")
+-  (parent "GdlDockItem")
+-  (c-name "GdlDockNotebook")
+-  (gtype-id "GDL_TYPE_DOCK_NOTEBOOK")
+-)
+-
+ (define-object Dock
+   (in-module "Gdl")
+   (parent "GdlDockObject")
+@@ -60,13 +53,6 @@
+   (gtype-id "GDL_TYPE_DOCK")
+ )
+ 
+-(define-object DockPaned
+-  (in-module "Gdl")
+-  (parent "GdlDockItem")
+-  (c-name "GdlDockPaned")
+-  (gtype-id "GDL_TYPE_DOCK_PANED")
+-)
+-
+ (define-object DockPlaceholder
+   (in-module "Gdl")
+   (parent "GdlDockObject")
+@@ -74,12 +60,6 @@
+   (gtype-id "GDL_TYPE_DOCK_PLACEHOLDER")
+ )
+ 
+-(define-object DockTablabel
+-  (in-module "Gdl")
+-  (parent "GtkBin")
+-  (c-name "GdlDockTablabel")
+-  (gtype-id "GDL_TYPE_DOCK_TABLABEL")
+-)
+ 
+ (ifdef HAVE_GDL_0_7
+ 
+@@ -570,18 +570,6 @@
+   (return-type "gboolean")
+ )
+ 
+-(define-method get_ui
+-  (of-object "GdlDockLayout")
+-  (c-name "gdl_dock_layout_get_ui")
+-  (return-type "GtkWidget*")
+-)
+-
+-(define-method get_items_ui
+-  (of-object "GdlDockLayout")
+-  (c-name "gdl_dock_layout_get_items_ui")
+-  (return-type "GtkWidget*")
+-)
+-
+ (define-method get_layouts_ui
+   (of-object "GdlDockLayout")
+   (c-name "gdl_dock_layout_get_layouts_ui")
+@@ -682,21 +662,6 @@
+ 
+ 
+ 
+-;; From gdl-dock-notebook.h
+-
+-(define-function gdl_dock_notebook_new
+-  (c-name "gdl_dock_notebook_new")
+-  (is-constructor-of "GdlDockNotebook")
+-  (return-type "GtkWidget*")
+-)
+-
+-(define-function gdl_dock_notebook_get_type
+-  (c-name "gdl_dock_notebook_get_type")
+-  (return-type "GType")
+-)
+-
+-
+-
+ ;; From gdl-dock-object.h
+ 
+ (define-function gdl_dock_object_get_type
+@@ -848,24 +813,6 @@
+ 
+ 
+ 
+-;; From gdl-dock-paned.h
+-
+-(define-function gdl_dock_paned_get_type
+-  (c-name "gdl_dock_paned_get_type")
+-  (return-type "GType")
+-)
+-
+-(define-function gdl_dock_paned_new
+-  (c-name "gdl_dock_paned_new")
+-  (is-constructor-of "GdlDockPaned")
+-  (return-type "GtkWidget*")
+-  (properties
+-    '("orientation")
+-  )
+-)
+-
+-
+-
+ ;; From gdl-dock-placeholder.h
+ 
+ (define-function gdl_dock_placeholder_get_type
+@@ -896,34 +843,6 @@
+ 
+ 
+ 
+-;; From gdl-dock-tablabel.h
+-
+-(define-function gdl_dock_tablabel_new
+-  (c-name "gdl_dock_tablabel_new")
+-  (is-constructor-of "GdlDockTablabel")
+-  (return-type "GtkWidget*")
+-  (properties
+-    '("item")
+-  )
+-)
+-
+-(define-function gdl_dock_tablabel_get_type
+-  (c-name "gdl_dock_tablabel_get_type")
+-  (return-type "GType")
+-)
+-
+-(define-method activate
+-  (of-object "GdlDockTablabel")
+-  (c-name "gdl_dock_tablabel_activate")
+-  (return-type "none")
+-)
+-
+-(define-method deactivate
+-  (of-object "GdlDockTablabel")
+-  (c-name "gdl_dock_tablabel_deactivate")
+-  (return-type "none")
+-)
+-
+ ;; From gdl-icons.h
+ 
+ (ifdef HAVE_GDL_0_7
diff --git a/dev-python/gdl-python/gdl-python-2.19.1-r1.ebuild b/dev-python/gdl-python/gdl-python-2.19.1-r1.ebuild
index 139ccdb684c6..dac7588bb227 100644
--- a/dev-python/gdl-python/gdl-python-2.19.1-r1.ebuild
+++ b/dev-python/gdl-python/gdl-python-2.19.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gdl-python/gdl-python-2.19.1-r1.ebuild,v 1.10 2009/09/27 13:50:54 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gdl-python/gdl-python-2.19.1-r1.ebuild,v 1.11 2009/10/30 07:44:43 eva Exp $
 
 G_PY_PN="gnome-python-extras"
 
@@ -21,17 +21,6 @@ DEPEND="${RDEPEND}"
 
 EXAMPLES="examples/gdl/*"
 
-pkg_setup() {
-	# we need gdl-gnome
-	if ! built_with_use --missing true dev-libs/gdl gnome; then
-		eerror "If you want to build ${PN} you need to build dev-libs/gdl with"
-		eerror "the the 'gnome' USE flag."
-		die "gdl must be built with USE='gnome'"
-	fi
-
-	gnome-python-common_pkg_setup
-}
-
 src_unpack() {
 	gnome-python-common_src_unpack
 
diff --git a/dev-python/gdl-python/gdl-python-2.19.1-r2.ebuild b/dev-python/gdl-python/gdl-python-2.19.1-r2.ebuild
new file mode 100644
index 000000000000..49bc02e1bff1
--- /dev/null
+++ b/dev-python/gdl-python/gdl-python-2.19.1-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gdl-python/gdl-python-2.19.1-r2.ebuild,v 1.1 2009/10/30 07:44:43 eva Exp $
+
+G_PY_PN="gnome-python-extras"
+
+inherit gnome-python-common
+
+PVP="$(get_version_component_range 1-2)"
+SRC_URI="mirror://gnome/sources/${G_PY_PN}/${PVP}/${G_PY_PN}-${PV}.tar.bz2
+	mirror://gentoo/${G_PY_PN}-${PV}-split.patch.gz"
+
+DESCRIPTION="Python bindings for GDL"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="examples"
+
+RDEPEND=">=dev-libs/gdl-2.28.0"
+DEPEND="${RDEPEND}"
+
+EXAMPLES="examples/gdl/*"
+
+src_unpack() {
+	gnome-python-common_src_unpack
+
+	epatch "${WORKDIR}/${G_PY_PN}-${PV}-split.patch"
+	eautoreconf
+
+	# Fix build failure with gdl-2.24
+	epatch "${FILESDIR}/${P}-gdlicons.patch"
+
+	# Fix build failure with gdl-2.28
+	epatch "${FILESDIR}/${P}-gdlapi-removal.patch"
+}