[gentoo-commits] dev/eva:master commit in: dev-db/glom/

[Gilles Dartiguelongue]

commit:     d35af96c728bead45285118d3eee542ad3137f13
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 19:49:53 2015 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 19:59:20 2015 +0000
URL:        https://gitweb.gentoo.org/dev/eva.git/commit/?id=d35af96c

dev-db/glom: version bump to 1.30

Ebuild is still broken, just a bit less.

 dev-db/glom/Manifest           |  8 ++---
 dev-db/glom/glom-1.20.0.ebuild | 56 -----------------------------------
 dev-db/glom/glom-1.30.0.ebuild | 67 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 71 insertions(+), 60 deletions(-)

diff --git a/dev-db/glom/Manifest b/dev-db/glom/Manifest
index d1322d5..971ae72 100644
--- a/dev-db/glom/Manifest
+++ b/dev-db/glom/Manifest
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-DIST glom-1.20.0.tar.xz 6401828 SHA256 047ce7bd6e5a0214f6f49cad15cc0ee1d2e8eeb61462e094328ed32676c15e5b
+DIST glom-1.30.0.tar.xz 7800056 SHA256 219dac37aa12a2219ed99828269faddc86af8118444602158c5cf594cd3b8cf0 SHA512 68f52122adea17e1ed631e186462b422c6b17fa7eb800cac0f0fac1007e0c38d5bd1fb2cf519b76f842b95c6367b92c1b2a79ecb4de7e2afb3256c2ca94f43c6 WHIRLPOOL 6902983e682afbf45032d0e2ea6c6c50890d17244d162b891f1882d89aac298b24ee90708602c1dfca2501f721898c6f6e152e84d38a4aa6ef8debe2fa44cee1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREKAAYFAlY5PHoACgkQ1fmVwcYIWAZxDwCgzI77yIxjUmEhA+pelfXkgLa4
-0j0Ani4i8cXMN8e3J44dsCfUEA2BMnVA
-=esKv
+iEYEAREKAAYFAlZUv2IACgkQ1fmVwcYIWAacqwCeNZFXVXXCig9xzCZi8EmGHKPg
+3UoAn2couWXbP1GUjKimcDRDH6ve26Ie
+=axvc
 -----END PGP SIGNATURE-----

diff --git a/dev-db/glom/glom-1.20.0.ebuild b/dev-db/glom/glom-1.20.0.ebuild
deleted file mode 100644
index b45500f..0000000
--- a/dev-db/glom/glom-1.20.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-GCONF_DEBUG="no"
-PYTHON_DEPEND="2:2.4"
-
-inherit gnome2 python
-
-DESCRIPTION="User-friendly database application"
-HOMEPAGE="http://www.glom.org/wiki/index.php?title=Glom"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="postgres sqlite"
-
-RDEPEND="
-	>=dev-libs/glib-2.24:2
-	>=dev-cpp/glibmm-2
-	>=dev-cpp/libxmlpp-2.23.1
-	>=dev-libs/libxslt-1.1.10
-	>=dev-python/pygobject-2.29:3
-	>=dev-cpp/libgdamm-4.99.6:5
-	gnome-extra/libgda:5[postgres?]
-	dev-cpp/gtkmm:3.0
-	>=net-libs/libepc-0.4
-	>=dev-cpp/goocanvasmm-1.90.8:2.0
-	>=app-text/evince-3.0
-	app-text/iso-codes
-	>=dev-cpp/gtksourceviewmm-3:3.0
-	dev-libs/boost[python]
-	postgres? ( dev-db/postgresql-server )
-"
-# FIXME: is postgres-server really needed ?
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	>=sys-devel/gettext-0.17
-	>=app-text/gnome-doc-utils-0.9
-	dev-python/sphinx
-"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-update-mime-database
-		--disable-scrollkeeper
-		--disable-client-only
-		--enable-glom-ui
-		$(use_enable sqlite)
-		$(use_enable postgres postgresql)"
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-	python_set_active_version 2
-	python_pkg_setup
-}

diff --git a/dev-db/glom/glom-1.30.0.ebuild b/dev-db/glom/glom-1.30.0.ebuild
new file mode 100644
index 0000000..14e2c0c
--- /dev/null
+++ b/dev-db/glom/glom-1.30.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python3_4 )
+
+inherit gnome2 python-r1
+
+DESCRIPTION="User-friendly database application"
+HOMEPAGE="http://www.glom.org"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="mysql postgres"
+
+RDEPEND="
+	>=app-arch/libarchive-3
+	>=dev-libs/glib-2.24:2
+	>=dev-cpp/glibmm-2.46.1
+	>=dev-cpp/libxmlpp-2.24
+	>=dev-libs/libxslt-1.1.10
+	>=dev-python/pygobject-2.29:3
+	>=dev-cpp/libgdamm-4.99.10:5
+	>=gnome-extra/libgda-5.2.1:5[postgres?,mysql?]
+	>=dev-cpp/gtkmm-3.18:3.0
+	>=net-libs/libepc-0.4
+	>=dev-cpp/goocanvasmm-1.90.11:2.0
+	>=app-text/evince-3.0
+	app-text/iso-codes
+	>=dev-cpp/gtksourceviewmm-3.18:3.0
+	dev-libs/boost[python]
+	>=x11-libs/goocanvas-2.0.1
+	mysql? ( dev-db/mysql )
+	postgres? ( dev-db/postgresql:= )
+"
+# FIXME: is postgres-server really needed ?
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.35
+	>=sys-devel/gettext-0.17
+	dev-python/sphinx
+"
+
+# FIXME: needs gcc with c++11 support
+
+pkg_setup() {
+	python-r1_pkg_setup
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-update-mime-database \
+		--disable-scrollkeeper \
+		--disable-client-only \
+		--enable-glom-ui \
+		--enable-sqlite \
+		$(use_enable mysql) \
+		$(use_enable postgres postgresql)
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+	gnome2_src_install
+}