commit: 0270bffe2ae5306985b7156c374422754a18865d Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Sat Sep 19 20:04:09 2020 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Sat Sep 19 20:04:18 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0270bffe
gnome-extra/libgda: Drop USE reports to kill python2 Closes: https://bugs.gentoo.org/735344 Package-Manager: Portage-3.0.7, Repoman-3.0.1 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> gnome-extra/libgda/libgda-5.2.8-r1.ebuild | 29 ++++++----------------------- gnome-extra/libgda/metadata.xml | 1 - 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/gnome-extra/libgda/libgda-5.2.8-r1.ebuild b/gnome-extra/libgda/libgda-5.2.8-r1.ebuild index c6837a81f02..082aba06ff1 100644 --- a/gnome-extra/libgda/libgda-5.2.8-r1.ebuild +++ b/gnome-extra/libgda/libgda-5.2.8-r1.ebuild @@ -4,18 +4,16 @@ EAPI=6 GNOME2_LA_PUNT="yes" GNOME2_EAUTORECONF="yes" -PYTHON_COMPAT=( python2_7 ) VALA_USE_DEPEND="vapigen" -inherit db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python-single-r1 vala +inherit db-use eutils flag-o-matic gnome2 java-pkg-opt-2 vala DESCRIPTION="GNOME database access library" HOMEPAGE="https://www.gnome-db.org/"; LICENSE="GPL-2+ LGPL-2+" -IUSE="berkdb canvas debug firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres reports sourceview ssl vala" +IUSE="berkdb canvas debug firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl vala" REQUIRED_USE=" - reports? ( ${PYTHON_REQUIRED_USE} ) canvas? ( gtk ) graphviz? ( gtk ) sourceview? ( gtk ) @@ -49,10 +47,6 @@ RDEPEND=" mdb? ( >app-office/mdbtools-0.5:= ) mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:= ) - reports? ( - ${PYTHON_DEPS} - dev-java/fop - dev-python/reportlab ) ssl? ( dev-libs/openssl:0= ) >=dev-db/sqlite-3.10.2:3= vala? ( dev-libs/libgee:0.8 ) @@ -81,7 +75,6 @@ RESTRICT=" pkg_setup() { java-pkg-opt-2_pkg_setup - use reports && python-single-r1_pkg_setup } src_prepare() { @@ -90,10 +83,10 @@ src_prepare() { use berkdb && append-cppflags "-I$(db_includedir)" - use reports || - sed -e '/SUBDIRS =/ s/trml2html//' \ - -e '/SUBDIRS =/ s/trml2pdf//' \ - -i libgda-report/RML/Makefile.{am,in} || die + # They need python2 + sed -e '/SUBDIRS =/ s/trml2html//' \ + -e '/SUBDIRS =/ s/trml2pdf//' \ + -i libgda-report/RML/Makefile.{am,in} || die # Prevent file collisions with libgda:4 eapply "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch" @@ -157,13 +150,3 @@ pkg_preinst() { gnome2_pkg_preinst java-pkg-opt-2_pkg_preinst } - -src_install() { - gnome2_src_install - if use reports; then - for t in trml2{html,pdf}; do - python_scriptinto /usr/share/libgda-5.0/gda_${t} - python_doscript libgda-report/RML/${t}/${t}.py - done - fi -} diff --git a/gnome-extra/libgda/metadata.xml b/gnome-extra/libgda/metadata.xml index c72a40986ea..8e5194e79e3 100644 --- a/gnome-extra/libgda/metadata.xml +++ b/gnome-extra/libgda/metadata.xml @@ -10,7 +10,6 @@ <flag name="http">Enable embedded <pkg>net-libs/libsoup</pkg> based server</flag> <flag name="json">Enable support for JSON format</flag> <flag name="mdb">Enable support for Microsoft Access database using <pkg>app-office/mdbtools</pkg></flag> - <flag name="reports">Install tools for generating graphical reports</flag> <flag name="sourceview">Enable support for <pkg>x11-libs/gtksourceview</pkg></flag> </use> </pkgmetadata>
