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

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

5 files changed, 212 insertions, 15 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/Manifest b/dev-python/gdl-python/Manifest
index 0cdb1a145865..c47c66cee492 100644
--- a/dev-python/gdl-python/Manifest
+++ b/dev-python/gdl-python/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gdl-python-2.19.1-gdlapi-removal.patch 3324 RMD160 d089035ea3589be52eeb9221bfb07ce10532a69b SHA1 1694fe3699a1a21014314820f15fa1a439618a1a SHA256 805f5eb8c63607560a1ce8b9016413086fd5da49a544ce754088238fdc2e4db8
 AUX gdl-python-2.19.1-gdlicons.patch 446 RMD160 c618285e44f4e6c0b1c9f21c41089ce2be2de0bf SHA1 693afa5d6f3d4b602ba5cdb0962be35109a3e116 SHA256 dcec718872c51d7e1ae86f998f4e8274b0324ce8845028b8e407ce0b16c8d9e3
 DIST gnome-python-extras-2.19.1-split.patch.gz 2372 RMD160 b8585c0ae6b2e5308c397a596089204e14a6d4f7 SHA1 6235ea983e30cccf28d7ca6ee35e46708c68a511 SHA256 749de35005b788e9f49e463ded51fbcda3f39900014f92eef77b305bf729ddd1
 DIST gnome-python-extras-2.19.1.tar.bz2 361721 RMD160 1dd556def13b6cd10ef9a3a747e73ea38ee70e62 SHA1 f97303aa92c300050818ac8a01d0bc0657b2a9e3 SHA256 c5f74f4c46dbb379d119d6f74ca4a47653af251bea176dc7a0ecacccb88339f0
-EBUILD gdl-python-2.19.1-r1.ebuild 1172 RMD160 7e75aea6b5e930b5283243f28c30d2ffd21782a0 SHA1 5506b37360bcfed7f5f1942170a7db6f2c40cf0c SHA256 430c5d85c7c607ac680abe8a5ba3bb32a7f3af3b81249085a428bcec4995e743
+EBUILD gdl-python-2.19.1-r1.ebuild 880 RMD160 da51381f7b464ed7e74878eacf3af65186760238 SHA1 dacf14f64b9966c119a8c0c8f00290944c626b72 SHA256 add08180491742bf5718a4b1092d2c6b737e42c3d02937e63b9f12139a48b553
+EBUILD gdl-python-2.19.1-r2.ebuild 965 RMD160 a7b576d17df2052cf440f434f95efcf5826e050b SHA1 38ba10f1240f0af7c348b09d3993350d46d0c7fe SHA256 b93bd8748492583dbba5898814cfb306a2612d8b09f1388d5b00e42f0252f100
 EBUILD gdl-python-2.19.1.ebuild 1075 RMD160 aff1817b7fd01d202bbeb4bf1444013d65a0c648 SHA1 847706098d080e1aa5f2fef1defc83f79e20124b SHA256 b227960081a395f8762dfb0fb1fabb457f80b5af9d59a43f0adfd6e8c01288ea
-MISC ChangeLog 2692 RMD160 510aa93baae0f8ed045536ca8d11486e5c9d01aa SHA1 26b75c3e059c2ab3d9e6ae2086e7badc1eb67be6 SHA256 f31c5c67c34226b26f4e5aa910e490a87920d15143b8eec705f13d83b72c9337
+MISC ChangeLog 3043 RMD160 c04ffc67ecd5c8ad4055a251b2a505d787ada2c5 SHA1 11d67a544cd77d30705ccde7f3a09443210fe461 SHA256 d5a97b6ad32f34ae885a6430f04d10b9e064028036cd170ce5320f483d7e21b0
 MISC metadata.xml 178 RMD160 52828e1ca616ad731f2ab1ed2890d6d3a7cc8043 SHA1 a42d68a6c263ea8d8cbb678548e209aa9642a74e SHA256 aeea09173ed30175422e4f951e369e1882919be3d56e655468e5d4bffea0fc3c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkrqmYYACgkQ1fmVwcYIWAZilwCgqCl1LWzFIAnsWit+iF5bRcXa
+RGMAoM8Z+3yRFZD3hVn7nh0wCGOq3Z4B
+=gR8y
+-----END PGP SIGNATURE-----
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"
+}