From 8b4ace9c50842c5b83401ea7b179dcab940387e1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 23 Sep 2020 10:22:15 +0100 Subject: gentoo resync : 23.09.2020 --- gnome-extra/libgda/Manifest | 6 +- gnome-extra/libgda/libgda-5.2.8-r1.ebuild | 29 ++---- gnome-extra/libgda/libgda-5.2.9.ebuild | 150 ++++++++++++++++++++++++++++++ gnome-extra/libgda/metadata.xml | 1 - 4 files changed, 160 insertions(+), 26 deletions(-) create mode 100644 gnome-extra/libgda/libgda-5.2.9.ebuild (limited to 'gnome-extra/libgda') diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest index ba9e4ecc6f33..97bee11cda75 100644 --- a/gnome-extra/libgda/Manifest +++ b/gnome-extra/libgda/Manifest @@ -3,5 +3,7 @@ AUX libgda-4.99.1-gda-browser-doc-collision.patch 914 BLAKE2B a8dc2b9359aaf3f749 AUX libgda-5.2.4-format-security.patch 1003 BLAKE2B 7b8727e080b0a82645a4f9cdbe718a814b22fd8939d613dc6100b85ce589cf1cd8760a1d515c8ffb7221ff83ce09abbc841ab6a05520c3a804c4eeefe1588359 SHA512 b723fff823b4de0ed79883d8b2c9e44e3ae26bac919992afe2eb055aaac972ee188bc28865497e3b6b0e613e8b7977061151e489fef31c99b5ce783928e9f42f AUX libgda-5.2.4-jre18.patch 450 BLAKE2B 1ce265d157bab47f94cc4ffcc620813efd0683a78b516e5b8ecb90f0d3d69b6b6daff7b30c2ec24842d6726804787d06e8b5858a75beb7c4b41d6cf4304d0f0f SHA512 4280b18ac16a1831aac433a2dc64f0713f8668b31d18465877861e0c0e2dd5eb2bc2aa70cdf0d742da4b6c48f2b7ec7bd7f109de99436f84c5d155c2dc4fed94 DIST libgda-5.2.8.tar.xz 12506208 BLAKE2B 7174aa862f04ec6c73fe98560914ee307afe75b9713adad70fa7dedf97fd4ddb79c98ad1e9a8919218f7453014d8e71e42730e168fae7c6ca0dc58ae99b0558e SHA512 6512d08df072dfc10837b71b2369ab538fa8bf0cdac51ecbb738a138f5b765f030fc7a88b14232eaab2724af8e749898da146bb63969983d3bcfeb11bc22aece -EBUILD libgda-5.2.8-r1.ebuild 5065 BLAKE2B 4fefa8955dcc4b8871b4f76785980f02724d5361a7145919b04755322ed3461e3dff07e776764940d567ab59a226ad2a8cfd1206393a4c9ac08cad2c7b31b18a SHA512 71ec8f0466157191404cc17c3dfc90b28910bf0b45c07c64fa7a0d0be011d3af9b75cc535f5155da76da9b85c04011489c426f411ae75904d1ff3377468e8895 -MISC metadata.xml 759 BLAKE2B ce4b021f5697460110c6d976231579b4299875991f28fad526ce29b83da1db248d0be46eb83e1f2704c3aa997b1a7f4546f901410ee1751dbd2d03718fc2e935 SHA512 aa0bce4d0262948dc57ce220d453a92dd957db925dc381a362055e5a5d09479cf3954e1bc19966cca21ab0e4d9e41f8611242bcf9f3fe1051388c5a8094c851e +DIST libgda-5.2.9.tar.xz 12619160 BLAKE2B b82c304f6054a1de24b72e688fc03a7a9b416f14f47c95087c4901b7bce0ea5c642667feb14f1701bc62403359c752f3f5b121a697316340829af64b83fb7980 SHA512 a28324533298d42aacfce5d9f3d699314ddb5d5fe7e492433dbbe4232fb310b798d312ac08dffd4f4ebef5ceea3c6c49ef3c679ab97b5e9d1f64e3fed50b2231 +EBUILD libgda-5.2.8-r1.ebuild 4660 BLAKE2B aad027fbb20b3000fbde445391f5cbd477ac4846081715aab11bf6f8c471dc7271f2818df7ff535ed79af002de7d2f553be1f7a21cc45e7d153a36ff0cd2c30d SHA512 e917df80718a0c2f9d709b352927ef91351779e71e5e875c41f62c5e96f9bc14d4c9c629ffbe8c226804c7cd0e1e8b890f6d549e0e385b9a9b3c2443c72f3712 +EBUILD libgda-5.2.9.ebuild 4477 BLAKE2B 40e2aa28e436423192117e2cd8ea926c9762e38bf71ba5b7fdebe845cbf2361c00e2b500c8080ea0d70a69bc70f9bbfbe9b3b92b953a1cd3fb7ffb4555275467 SHA512 f80cbe24dc52a8d75fc3b365eb6a0aaf0521b4d0c330a9d8cb7ca7e1169f12956ac257fc8d04931bc96461c5b48ecb2f13ff5d2adb9310641adfc517cb8452cb +MISC metadata.xml 682 BLAKE2B fe3f182ba64c3616542f5a03b2df9441f4eb020ab5a274907d53a04ae694c792b01b7262b1ea82162a89cf85428fe2f69c43b194775be932c379928f4e717985 SHA512 e4fc584c8234b923dffeb6af9968146cae4b319b49234be50d4aca144c326d786aaa82c17f330bab16a691036b2392acda0987c0f26993b1dc1a130e9aea3eeb diff --git a/gnome-extra/libgda/libgda-5.2.8-r1.ebuild b/gnome-extra/libgda/libgda-5.2.8-r1.ebuild index c6837a81f02e..082aba06ff1d 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/libgda-5.2.9.ebuild b/gnome-extra/libgda/libgda-5.2.9.ebuild new file mode 100644 index 000000000000..73305fd1f2fd --- /dev/null +++ b/gnome-extra/libgda/libgda-5.2.9.ebuild @@ -0,0 +1,150 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" +GNOME2_EAUTORECONF="yes" +VALA_USE_DEPEND="vapigen" + +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 sourceview ssl vala" +REQUIRED_USE=" + canvas? ( gtk ) + graphviz? ( gtk ) + sourceview? ( gtk ) + vala? ( introspection ) +" +# firebird license is not GPL compatible + +SLOT="5/4" # subslot = libgda-5.0 soname version +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +RDEPEND=" + app-text/iso-codes + >=dev-libs/glib-2.32:2 + >=dev-libs/libxml2-2 + dev-libs/libxslt + sys-libs/readline:0= + sys-libs/ncurses:0= + berkdb? ( sys-libs/db:* ) + firebird? ( dev-db/firebird ) + gnome-keyring? ( app-crypt/libsecret ) + gtk? ( + >=x11-libs/gtk+-3.0.0:3 + canvas? ( x11-libs/goocanvas:2.0= ) + sourceview? ( x11-libs/gtksourceview:3.0 ) + graphviz? ( media-gfx/graphviz ) + ) + http? ( >=net-libs/libsoup-2.24:2.4 ) + introspection? ( >=dev-libs/gobject-introspection-1.30:= ) + json? ( dev-libs/json-glib ) + ldap? ( net-nds/openldap:= ) + mdb? ( >app-office/mdbtools-0.5:= ) + mysql? ( dev-db/mysql-connector-c:0= ) + postgres? ( dev-db/postgresql:= ) + ssl? ( dev-libs/openssl:0= ) + >=dev-db/sqlite-3.10.2:3= + vala? ( dev-libs/libgee:0.8 ) +" + +# java dep shouldn't rely on slots, bug #450004 +# TODO: libgee shouldn't be needed at build with USE=-vala, but needs build system fixes - bug 674066 +DEPEND="${RDEPEND} + dev-libs/libgee:0.8 + app-text/yelp-tools + dev-util/glib-utils + dev-util/gtk-doc-am + >=dev-util/intltool-0.40.6 + virtual/pkgconfig + java? ( >=virtual/jdk-1.6 ) + vala? ( $(vala_depend) ) +" + +# FIXME: lots of tests failing. Check if they still fail in 5.1.2 +# firebird support bindist-restricted because it is not GPL compatible +RESTRICT=" + test + firebird? ( bindist ) +" + +pkg_setup() { + java-pkg-opt-2_pkg_setup +} + +src_prepare() { + use berkdb && append-cppflags "-I$(db_includedir)" + + # 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" + eapply "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch" + # Move files with mv (since epatch can't handle rename diffs) and + # update pre-generated gtk-doc files (for non-git versions of libgda) + local f + for f in tools/browser/doc/gda-browser* ; do + mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed" + done + for f in tools/browser/doc/html/gda-browser.devhelp* ; do + sed -e 's:name="gda-browser":name="gda-browser-5.0":' \ + -i ${f} || die "sed ${f} failed" + mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed" + done + for f in control-center/data/*_gda-control-center.png ; do + mv ${f} ${f/_gda-control-center.png/_gda-control-center-5.0.png} || + die "mv ${f} failed" + done + + gnome2_src_prepare + java-pkg-opt-2_src_prepare + use vala && vala_src_prepare +} + +src_configure() { + # Upstream broken configure handling for UI library introspection and vala bindings if passing a choice with use_enable - https://gitlab.gnome.org/GNOME/libgda/issues/158 + # But if we don't pass an explicit choice, it behaves as we need (only enable them if --enable-ui AND the appropriate --enable-introspection or --enable-vala) + gnome2_src_configure \ + --with-help \ + --disable-default-binary \ + --disable-static \ + --enable-system-sqlite \ + $(use_with berkdb bdb /usr) \ + $(use_with canvas goocanvas) \ + $(use_enable debug) \ + $(use_with firebird firebird /usr) \ + $(use_with gnome-keyring libsecret) \ + $(use_with graphviz) \ + $(use_with gtk ui) \ + $(use_with http libsoup) \ + $(use_enable introspection) \ + "$(use_with java java $JAVA_HOME)" \ + $(use_enable json) \ + $(use_with ldap) \ + --with-ldap-libdir-name="$(get_libdir)" \ + $(use_with mdb mdb /usr) \ + $(use_with mysql mysql /usr) \ + $(use_with oci8 oracle) \ + $(use_with postgres postgres /usr) \ + $(use_enable ssl crypto) \ + $(use_with sourceview gtksourceview) \ + $(use_enable vala) +} + +pkg_preinst() { + gnome2_pkg_preinst + java-pkg-opt-2_pkg_preinst +} + +src_install() { + gnome2_src_install + # Use new location + mv "${ED}"/usr/share/appdata "${ED}"/usr/share/metainfo || die +} diff --git a/gnome-extra/libgda/metadata.xml b/gnome-extra/libgda/metadata.xml index c72a40986ea2..8e5194e79e31 100644 --- a/gnome-extra/libgda/metadata.xml +++ b/gnome-extra/libgda/metadata.xml @@ -10,7 +10,6 @@ Enable embedded net-libs/libsoup based server Enable support for JSON format Enable support for Microsoft Access database using app-office/mdbtools - Install tools for generating graphical reports Enable support for x11-libs/gtksourceview -- cgit v1.2.3