diff options
| -rw-r--r-- | dev-lang/vala/Manifest | 1 | ||||
| -rw-r--r-- | dev-lang/vala/files/0.44-valadoc-doclets-data-parallel-installable.patch | 207 | ||||
| -rw-r--r-- | dev-lang/vala/vala-0.44.11.ebuild | 52 | ||||
| -rw-r--r-- | eclass/vala.eclass | 9 |
4 files changed, 4 insertions, 265 deletions
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest index 9927e6e98bff..55ef007b0b3f 100644 --- a/dev-lang/vala/Manifest +++ b/dev-lang/vala/Manifest @@ -1,4 +1,3 @@ -DIST vala-0.44.11.tar.xz 3370248 BLAKE2B c111b6175e6339148e30bedc77f62a9ef3ec912ad0621c9303fc5dba31694173b49ccc433d3681303d64a1e442ed9b7b064f27931369cb13fa028bfc25ffa3c9 SHA512 6111699039ed37084426d7603b82dfa9bd497c66ba7353ee22e8541bf15a2cbb634d315593c093f18c20bac877ae34884e5b570cd25237ce12aa73e941c4c540 DIST vala-0.46.13.tar.xz 3434196 BLAKE2B 49b7e0b776e185653c1b8c00747a150ceb42cf89006fd55d37e3efd0824dace379d2c72cdb45d481b0545d0b4b37299bc6161b2d083d3221d2d8d8ca7c10d6dc SHA512 6d8d1acebf4706346d5dc986f5c900cfda929ca59ca3f3907cff56892a496bf524b1f74032ac6c8587b236a473124e15c6f83f949636e28141a55c8abeddf004 DIST vala-0.48.18.tar.xz 3519484 BLAKE2B 26581cd4b2ead9272fc032d085a4c49d47bc65d4f71c161b22f2efd6382d5a7b5204e6b7de8aac0a1d311b2c2fb7e3edd5894e7e14f34378bb69532c206832eb SHA512 fcafc44e62d6d8e724a8190a5c8bebf74c561eb355a2074ab6e29ff3abb73a6a553096991e8f3ad9c7656193b9ea9033d7cbe44fefaedfef4e2f70021155122d DIST vala-0.48.19.tar.xz 3524984 BLAKE2B aa688481b433b74e6b5d8b66dff073eb6669f1c10ff45b273769bfce3d8a5965894cbf026411f02076666bd4ae99e66d3d0dae019b17156ddff02992152ba654 SHA512 4dcd15ce55ad0328d3f99ff4fb2b5632f67b3d1e1fa585f30c0a76a2a2bb91c973bc8bfd66b69d5d6258e7fdb3037514de3d6004a3a559d9e73e90454847d711 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 deleted file mode 100644 index 8ab9e4401e90..000000000000 --- a/dev-lang/vala/files/0.44-valadoc-doclets-data-parallel-installable.patch +++ /dev/null @@ -1,207 +0,0 @@ -From 543a835b7027e7f79d1fe882cbd06137b6c6aa3b Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <leio@gentoo.org> -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.11.ebuild b/dev-lang/vala/vala-0.44.11.ebuild deleted file mode 100644 index 6494a3728ab4..000000000000 --- a/dev-lang/vala/vala-0.44.11.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2021 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 sparc x86 ~x86-linux" -IUSE="test valadoc" -RESTRICT="!test? ( test )" - -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 -} diff --git a/eclass/vala.eclass b/eclass/vala.eclass index c7ee9fe3648d..677520748c62 100644 --- a/eclass/vala.eclass +++ b/eclass/vala.eclass @@ -28,8 +28,8 @@ _VALA_ECLASS=1 # @ECLASS-VARIABLE: VALA_MIN_API_VERSION # @DESCRIPTION: -# Minimum vala API version (e.g. 0.44). -VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.44} +# Minimum vala API version (e.g. 0.46). +VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.46} # @ECLASS-VARIABLE: VALA_MAX_API_VERSION # @DESCRIPTION: @@ -52,12 +52,11 @@ vala_api_versions() { local minimal_supported_minor_version minor_version # Dependency atoms are not generated for Vala versions older than 0.${minimal_supported_minor_version}. - minimal_supported_minor_version="44" + minimal_supported_minor_version="46" for ((minor_version = ${VALA_MAX_API_VERSION#*.}; minor_version >= ${VALA_MIN_API_VERSION#*.}; minor_version = minor_version - 2)); do - # 0.38 was never in main tree; remove the special case once minimal_supported_minor_version >= 40 # 0.42 is EOL and removed from tree; remove special case once minimal_support_minor_version >= 44 - if ((minor_version >= minimal_supported_minor_version)) && ((minor_version != 38)) && ((minor_version != 42)); then + if ((minor_version >= minimal_supported_minor_version)) && ((minor_version != 42)); then echo "0.${minor_version}" fi done |