commit: 3d21434377c899a88314572b42fd8c81e607c72e Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Sat Jul 27 19:46:06 2019 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Sun Jul 28 06:42:03 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d214343
dev-lang/vala: bump to 0.44.6 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> dev-lang/vala/Manifest | 1 + ...valadoc-doclets-data-parallel-installable.patch | 207 +++++++++++++++++++++ dev-lang/vala/vala-0.44.6.ebuild | 51 +++++ 3 files changed, 259 insertions(+) diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest index f83231ae110..5c945584811 100644 --- a/dev-lang/vala/Manifest +++ b/dev-lang/vala/Manifest @@ -3,3 +3,4 @@ DIST vala-0.36.19.tar.xz 2909240 BLAKE2B 8b41ab516a6e5c9eef6e4f5590cfa49892e69a8 DIST vala-0.40.14.tar.xz 3398668 BLAKE2B 6df1e47439000e1a49dda4d58651b7039737a2648563fc4e09d679bf63d968d9dafcc9ab5e371ca450bab70163f9fb1fb30ffa75451940f9a1518d7fb3a5ebf1 SHA512 0387bbcf35055f2b4a8f790370847bcc12a92d7969d9ed583b0630be8b637a9e28895508da9cdfab8baf97ad5fdc9249bf82e31e6c1ee19d0026f5061c027db8 DIST vala-0.40.15.tar.xz 3406020 BLAKE2B aaa2967a140fae94b4609f4b54f2e37c71fe79453cb3ea30568ee018d2227d1c45061440ad632bcfc53650fbe4dba2f062d8095f95936623a49efb5e97f2c2bb SHA512 abb918b00afab7a85586f9bd26b78be87e19b725752cbb77dd428da2e6241b1f3d4aaa70e3e6daf6f373562d02f1ff8016e6c9107e2bf088d9b84334adecdda2 DIST vala-0.42.7.tar.xz 3362192 BLAKE2B 59f76d43f4bf80f75681c386cb30c4686bf93444bcd371900b134e0338ab865cf61d4cfd35facfff47c78075c384028cbcbd318eb927444f15862f7a28bccaa1 SHA512 d9044b126c91f3b1835a7182a054464339e4e2e52e63df90f43d2d5d9cba06fd6bb7eed5f6aa4d502f43f0a1232610d39d244952cfca54f63eb019e764899eca +DIST vala-0.44.6.tar.xz 3354452 BLAKE2B 7fb8946b55a73a582e4bf7fc15ca129bbd8c766e665dab15671466fac62bb19481fdda5476263d6689e36a63f6fb2c095c10e2ce7cb8f8cf33b38f691d2f86aa SHA512 7b0fa6da3b7ecfe5d6731e64a7803e3dde38e843c269e7bd0d9d92dbbba2823bd17689bceec3e2ee6cf8f7884a5e1e11e1699e98808a32fef2167221bdc7b8a2 diff --git a/dev-lang/vala/files/0.44-valadoc-doclets-data-parallel-installable.patch b/dev-lang/vala/files/0.44-valadoc-doclets-data-parallel-installable.patch new file mode 100644 index 00000000000..8ab9e4401e9 --- /dev/null +++ b/dev-lang/vala/files/0.44-valadoc-doclets-data-parallel-installable.patch @@ -0,0 +1,207 @@ +From 543a835b7027e7f79d1fe882cbd06137b6c6aa3b Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <[email protected]> +Date: Sat, 27 Jul 2019 20:20:45 +0300 +Subject: [PATCH] build: Make valadoc doclets & data parallel installable + +--- + libvaladoc/Makefile.am | 7 ++++++- + valadoc/Makefile.am | 7 ++++++- + valadoc/doclets/devhelp/Makefile.am | 11 ++++++++--- + valadoc/doclets/gtkdoc/Makefile.am | 11 ++++++++--- + valadoc/doclets/html/Makefile.am | 11 ++++++++--- + valadoc/icons/Makefile.am | 4 ++++ + valadoc/tests/Makefile.am | 7 ++++++- + 7 files changed, 46 insertions(+), 12 deletions(-) + +diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am +index 0ad42cb32..e8e6704ac 100644 +--- a/libvaladoc/Makefile.am ++++ b/libvaladoc/Makefile.am +@@ -4,7 +4,6 @@ NULL = + + AM_CFLAGS = \ + -DG_LOG_DOMAIN=\"valadoc\" \ +- -DPACKAGE_VALADOC_LIBDIR=\"$(libdir)/valadoc\" \ + -DPACKAGE_VERSION=\"$(VERSION)\" \ + $(COVERAGE_CFLAGS) \ + $(LIBGVC_CFLAGS) \ +@@ -16,6 +15,12 @@ AM_CFLAGS = \ + -I$(top_srcdir)/codegen \ + $(NULL) + ++if ENABLE_UNVERSIONED ++AM_CFLAGS += -DPACKAGE_VALADOC_LIBDIR=\"$(libdir)/valadoc\" ++else ++AM_CFLAGS += -DPACKAGE_VALADOC_LIBDIR=\"$(libdir)/valadoc@PACKAGE_SUFFIX@\" ++endif ++ + AM_VALAFLAGS = \ + $(NULL) + +diff --git a/valadoc/Makefile.am b/valadoc/Makefile.am +index 26028f5e3..60712cf00 100644 +--- a/valadoc/Makefile.am ++++ b/valadoc/Makefile.am +@@ -10,7 +10,6 @@ SUBDIRS = \ + + AM_CFLAGS = \ + -DG_LOG_DOMAIN=\"valadoc\" \ +- -DPACKAGE_VALADOC_LIBDIR=\"$(libdir)/valadoc\" \ + -DPACKAGE_VERSION=\"$(VERSION)\" \ + -I$(top_srcdir)/libvaladoc/ \ + -I$(top_srcdir)/gee \ +@@ -23,6 +22,12 @@ AM_CFLAGS = \ + $(LIBGVC_CFLAGS) \ + $(NULL) + ++if ENABLE_UNVERSIONED ++AM_CFLAGS += -DPACKAGE_VALADOC_LIBDIR=\"$(libdir)/valadoc\" ++else ++AM_CFLAGS += -DPACKAGE_VALADOC_LIBDIR=\"$(libdir)/valadoc@PACKAGE_SUFFIX@\" ++endif ++ + BUILT_SOURCES = valadoc.vala.stamp + + bin_PROGRAMS = valadoc +diff --git a/valadoc/doclets/devhelp/Makefile.am b/valadoc/doclets/devhelp/Makefile.am +index b151eb371..435e87235 100644 +--- a/valadoc/doclets/devhelp/Makefile.am ++++ b/valadoc/doclets/devhelp/Makefile.am +@@ -4,7 +4,6 @@ NULL = + + AM_CFLAGS = \ + -DG_LOG_DOMAIN=\"valadoc-devhelp\" \ +- -DPACKAGE_VALADOC_ICONDIR=\"$(datadir)/valadoc/icons/\" \ + -I$(top_srcdir)/gee/ \ + -I$(top_srcdir)/vala/ \ + -I$(top_srcdir)/libvaladoc/ \ +@@ -13,12 +12,18 @@ AM_CFLAGS = \ + $(LIBGVC_CFLAGS) \ + $(NULL) + ++if ENABLE_UNVERSIONED ++AM_CFLAGS += -DPACKAGE_VALADOC_ICONDIR=\"$(datadir)/valadoc/icons/\" ++docletdir = $(libdir)/valadoc/doclets/devhelp ++else ++AM_CFLAGS += -DPACKAGE_VALADOC_ICONDIR=\"$(datadir)/valadoc@PACKAGE_SUFFIX@/icons/\" ++docletdir = $(libdir)/valadoc@PACKAGE_SUFFIX@/doclets/devhelp ++endif ++ + BUILT_SOURCES = libdoclet.vala.stamp + + doclet_LTLIBRARIES = libdoclet.la + +-docletdir = $(libdir)/valadoc/doclets/devhelp +- + libdoclet_la_LDFLAGS = -module -avoid-version -no-undefined + + libdoclet_la_VALASOURCES = \ +diff --git a/valadoc/doclets/gtkdoc/Makefile.am b/valadoc/doclets/gtkdoc/Makefile.am +index 74d3c5702..0ee8695bd 100644 +--- a/valadoc/doclets/gtkdoc/Makefile.am ++++ b/valadoc/doclets/gtkdoc/Makefile.am +@@ -4,7 +4,6 @@ NULL = + + AM_CFLAGS = \ + -DG_LOG_DOMAIN=\"valadoc-gtkdoc\" \ +- -DPACKAGE_VALADOC_ICONDIR=\"$(datadir)/valadoc/icons/\" \ + -I$(top_srcdir)/gee/ \ + -I$(top_srcdir)/vala/ \ + -I$(top_srcdir)/libvaladoc/ \ +@@ -13,12 +12,18 @@ AM_CFLAGS = \ + $(LIBGVC_CFLAGS) \ + $(NULL) + ++if ENABLE_UNVERSIONED ++AM_CFLAGS += -DPACKAGE_VALADOC_ICONDIR=\"$(datadir)/valadoc/icons/\" ++docletdir = $(libdir)/valadoc/doclets/gtkdoc ++else ++AM_CFLAGS += -DPACKAGE_VALADOC_ICONDIR=\"$(datadir)/valadoc@PACKAGE_SUFFIX@/icons/\" ++docletdir = $(libdir)/valadoc@PACKAGE_SUFFIX@/doclets/gtkdoc ++endif ++ + BUILT_SOURCES = libdoclet.vala.stamp + + doclet_LTLIBRARIES = libdoclet.la + +-docletdir = $(libdir)/valadoc/doclets/gtkdoc +- + libdoclet_la_LDFLAGS = -module -avoid-version -no-undefined + + libdoclet_la_VALASOURCES = \ +diff --git a/valadoc/doclets/html/Makefile.am b/valadoc/doclets/html/Makefile.am +index 7541cc3f8..7ceebe4fa 100644 +--- a/valadoc/doclets/html/Makefile.am ++++ b/valadoc/doclets/html/Makefile.am +@@ -4,7 +4,6 @@ NULL = + + AM_CFLAGS = \ + -DG_LOG_DOMAIN=\"valadoc-html\" \ +- -DPACKAGE_VALADOC_ICONDIR=\"$(datadir)/valadoc/icons/\" \ + -I$(top_srcdir)/gee/ \ + -I$(top_srcdir)/vala/ \ + -I$(top_srcdir)/libvaladoc/ \ +@@ -13,12 +12,18 @@ AM_CFLAGS = \ + $(LIBGVC_CFLAGS) \ + $(NULL) + ++if ENABLE_UNVERSIONED ++AM_CFLAGS += -DPACKAGE_VALADOC_ICONDIR=\"$(datadir)/valadoc/icons/\" ++docletdir = $(libdir)/valadoc/doclets/html ++else ++AM_CFLAGS += -DPACKAGE_VALADOC_ICONDIR=\"$(datadir)/valadoc@PACKAGE_SUFFIX@/icons/\" ++docletdir = $(libdir)/valadoc@PACKAGE_SUFFIX@/doclets/html ++endif ++ + BUILT_SOURCES = libdoclet.vala.stamp + + doclet_LTLIBRARIES = libdoclet.la + +-docletdir = $(libdir)/valadoc/doclets/html +- + libdoclet_la_LDFLAGS = -module -avoid-version -no-undefined + + libdoclet_la_VALASOURCES = \ +diff --git a/valadoc/icons/Makefile.am b/valadoc/icons/Makefile.am +index 454bdba7c..668956f3b 100644 +--- a/valadoc/icons/Makefile.am ++++ b/valadoc/icons/Makefile.am +@@ -1,6 +1,10 @@ + NULL = + ++if ENABLE_UNVERSIONED + iconsdir = $(datadir)/valadoc/icons ++else ++iconsdir = $(datadir)/valadoc@PACKAGE_SUFFIX@/icons ++endif + + dist_icons_DATA = \ + abstractclass.png \ +diff --git a/valadoc/tests/Makefile.am b/valadoc/tests/Makefile.am +index b49de43cb..b32615b50 100644 +--- a/valadoc/tests/Makefile.am ++++ b/valadoc/tests/Makefile.am +@@ -22,7 +22,6 @@ check-TESTS: $(TESTS) + G_DEBUG=fatal_warnings $(builddir)/driver + + AM_CFLAGS = \ +- -DPACKAGE_VALADOC_LIBDIR=\"$(libdir)/valadoc\" \ + -DPACKAGE_VERSION=\"$(VERSION)\" \ + -DTOP_SRC_DIR=\"$(abs_top_srcdir)\" \ + -I$(top_srcdir)/libvaladoc/ \ +@@ -36,6 +35,12 @@ AM_CFLAGS = \ + $(LIBGVC_CFLAGS) \ + $(NULL) + ++if ENABLE_UNVERSIONED ++AM_CFLAGS += -DPACKAGE_VALADOC_LIBDIR=\"$(libdir)/valadoc\" ++else ++AM_CFLAGS += -DPACKAGE_VALADOC_LIBDIR=\"$(libdir)/valadoc@PACKAGE_SUFFIX@\" ++endif ++ + BUILT_SOURCES = driver.vala.stamp + + check_PROGRAMS = driver +-- +2.20.1 + diff --git a/dev-lang/vala/vala-0.44.6.ebuild b/dev-lang/vala/vala-0.44.6.ebuild new file mode 100644 index 00000000000..41ffdd44333 --- /dev/null +++ b/dev-lang/vala/vala-0.44.6.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_EAUTORECONF="yes" + +inherit gnome2 + +DESCRIPTION="Compiler for the GObject type system" +HOMEPAGE="https://wiki.gnome.org/Projects/Vala"; + +LICENSE="LGPL-2.1+" +SLOT="0.44" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux" +IUSE="test valadoc" + +RDEPEND=" + >=dev-libs/glib-2.40.0:2 + >=dev-libs/vala-common-${PV} + valadoc? ( >=media-gfx/graphviz-2.16 ) +" +DEPEND="${RDEPEND} + !${CATEGORY}/${PN}:0 + dev-libs/libxslt + sys-devel/flex + virtual/pkgconfig + virtual/yacc + test? ( + dev-libs/dbus-glib + >=dev-libs/glib-2.26:2 + dev-libs/gobject-introspection ) +" + +PATCHES=( + # Add missing bits to make valadoc parallel installable + "${FILESDIR}"/0.44-valadoc-doclets-data-parallel-installable.patch +) + +src_configure() { + # weasyprint enables generation of PDF from HTML + gnome2_src_configure \ + --disable-unversioned \ + $(use_enable valadoc) \ + VALAC=: \ + WEASYPRINT=: +} + +src_install() { + default + find "${D}" -name "*.la" -delete || die +}
