media-libs/gegl: {0.4.18,9999} fix USE="introspection" dependencies

USE="test ffmpeg" don't require media-libs/gexiv2 as there is internal test check of presence of this package in system while there is no USE flag to handle gexiv2 build option. USE="introspection" now handles oly the meson "introspection" option without switchon "pygobject" meson option (used now only for tests) so dev-python/pygobject:3 dependency is moved to DEPEND test?(). Dependencies and build options are sorted. pkg_setup() is removed as unesseccery. Closes: https://bugs.gentoo.org/699522 Signed-off-by: Sergey Torokhov <[email protected]> Signed-off-by: Joonas Niilola <[email protected]>
johu · Dec 8, 2019 · d4733e1 · d4733e1
1 parent 1a5157a
commit d4733e1
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 70 deletions.
diff --git a/media-libs/gegl/gegl-0.4.18.ebuild b/media-libs/gegl/gegl-0.4.18.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 # vala and introspection support is broken, bug #468208
 VALA_USE_DEPEND=vapigen
 
-inherit meson gnome2-utils python-any-r1 vala
+inherit meson gnome2-utils python-r1 vala
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -24,21 +24,27 @@ HOMEPAGE="http://www.gegl.org/"
 LICENSE="|| ( GPL-3+ LGPL-3 )"
 SLOT="0.4"
 
-IUSE="cairo debug ffmpeg introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
+IUSE="cairo debug ffmpeg +introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
 REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
 	svg? ( cairo )
+	test? ( introspection )
 	vala? ( introspection )
 "
 
+RESTRICT="!test? ( test )"
+
 # NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
 #       so there is no chance to support libav right now (Gentoo bug #567638)
 #       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
 RDEPEND="
+	${PYTHON_DEPS}
 	>=dev-libs/glib-2.44:2
 	>=dev-libs/json-glib-1.2.6
 	>=media-libs/babl-0.1.72[introspection?]
 	media-libs/libnsgif
 	>=media-libs/libpng-1.6.0:0=
+	>=sys-libs/zlib-1.2.0
 	virtual/jpeg:0=
 	>=x11-libs/gdk-pixbuf-2.32:2
 	>=x11-libs/pango-1.38.0
@@ -59,19 +65,16 @@ RDEPEND="
 	umfpack? ( sci-libs/umfpack )
 	v4l? ( >=media-libs/libv4l-1.0.1 )
 	webp? ( >=media-libs/libwebp-0.5.0:= )
-	>=sys-libs/zlib-1.2.0
 "
-DEPEND="${RDEPEND}
+
+DEPEND="
+	${RDEPEND}
 	dev-lang/perl
 	>=dev-util/gtk-doc-am-1
 	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
 	>=sys-devel/libtool-2.2
-	test? ( ffmpeg? ( media-libs/gexiv2 )
-		introspection? (
-			$(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]')
-		)
-	)
+	virtual/pkgconfig
+	test? ( >=dev-python/pygobject-3.2[${PYTHON_USEDEP}] )
 	vala? ( $(vala_depend) )
 "
 
@@ -83,10 +86,6 @@ PATCHES=(
 	"${FILESDIR}"/${P}-meson_cpu_detection.patch
 )
 
-pkg_setup() {
-	use test && use introspection && python-any-r1_pkg_setup
-}
-
 src_prepare() {
 	default
 
@@ -107,46 +106,45 @@ src_prepare() {
 
 src_configure() {
 	local emesonargs=(
-		# disable documentation as the generating is bit automagic
+		#  - Disable documentation as the generating is bit automagic
 		#    if anyone wants to work on it just create bug with patch
 		-Ddocs=false
-		#  - Parameter -Dworkshop=false disables any use of Lua, effectivly
-		-Dworkshop=false
-		$(meson_use introspection)
-
 		-Dexiv2=disabled
 		-Dgdk-pixbuf=enabled
 		-Dgexiv2=disabled
 		#  - There are two checks for dot, one controllable by --with(out)-graphviz
 		#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
 		-Dgraphviz=disabled
 		-Djasper=disabled
-		$(meson_feature lcms)
-		$(meson_feature lensfun)
-		$(meson_feature ffmpeg libav)
 		-Dlibjpeg=enabled
 		-Dlibpng=enabled
-		$(meson_feature raw libraw)
-		$(meson_feature svg librsvg)
-		# libspiro: not in portage main tree
+		#  - libspiro: not in portage main tree
 		-Dlibspiro=disabled
-		$(meson_feature tiff libtiff)
-		#  - v4l support does not work with our media-libs/libv4l-0.8.9,
-		#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
-		$(meson_feature v4l libv4l)
-		$(meson_feature v4l libv4l2)
 		-Dlua=disabled
 		-Dmrg=disabled
-		$(meson_feature openexr)
-		$(meson_feature cairo)
 		-Dpango=enabled
+		-Dsdl2=disabled
+		#  - Parameter -Dworkshop=false disables any use of Lua, effectivly
+		-Dworkshop=false
+		$(meson_feature cairo)
 		$(meson_feature cairo pangocairo)
-		$(meson_feature introspection pygobject)
+		$(meson_feature ffmpeg libav)
+		$(meson_feature lcms)
+		$(meson_feature lensfun)
+		$(meson_feature openexr)
+		$(meson_feature raw libraw)
 		$(meson_feature sdl sdl1)
-		-Dsdl2=disabled
+		$(meson_feature svg librsvg)
+		$(meson_feature test pygobject)
+		$(meson_feature tiff libtiff)
 		$(meson_feature umfpack)
+		#  - v4l support does not work with our media-libs/libv4l-0.8.9,
+		#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
+		$(meson_feature v4l libv4l)
+		$(meson_feature v4l libv4l2)
 		$(meson_feature vala vapigen)
 		$(meson_feature webp)
+		$(meson_use introspection)
 	)
 	meson_src_configure
 }
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
@@ -7,15 +7,15 @@ PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 # vala and introspection support is broken, bug #468208
 VALA_USE_DEPEND=vapigen
 
-inherit meson gnome2-utils python-any-r1 vala
+inherit meson gnome2-utils python-r1 vala
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
@@ -24,21 +24,27 @@ HOMEPAGE="http://www.gegl.org/"
 LICENSE="|| ( GPL-3+ LGPL-3 )"
 SLOT="0.4"
 
-IUSE="cairo debug ffmpeg introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
+IUSE="cairo debug ffmpeg +introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
 REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
 	svg? ( cairo )
+	test? ( introspection )
 	vala? ( introspection )
 "
 
+RESTRICT="!test? ( test )"
+
 # NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
 #       so there is no chance to support libav right now (Gentoo bug #567638)
 #       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
 RDEPEND="
+	${PYTHON_DEPS}
 	>=dev-libs/glib-2.44:2
 	>=dev-libs/json-glib-1.2.6
 	>=media-libs/babl-0.1.72[introspection?]
 	media-libs/libnsgif
 	>=media-libs/libpng-1.6.0:0=
+	>=sys-libs/zlib-1.2.0
 	virtual/jpeg:0=
 	>=x11-libs/gdk-pixbuf-2.32:2
 	>=x11-libs/pango-1.38.0
@@ -59,19 +65,16 @@ RDEPEND="
 	umfpack? ( sci-libs/umfpack )
 	v4l? ( >=media-libs/libv4l-1.0.1 )
 	webp? ( >=media-libs/libwebp-0.5.0:= )
-	>=sys-libs/zlib-1.2.0
 "
-DEPEND="${RDEPEND}
+
+DEPEND="
+	${RDEPEND}
 	dev-lang/perl
 	>=dev-util/gtk-doc-am-1
 	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
 	>=sys-devel/libtool-2.2
-	test? ( ffmpeg? ( media-libs/gexiv2 )
-		introspection? (
-			$(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]')
-		)
-	)
+	virtual/pkgconfig
+	test? ( >=dev-python/pygobject-3.2[${PYTHON_USEDEP}] )
 	vala? ( $(vala_depend) )
 "
 
@@ -82,10 +85,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.4.18-program-suffix.patch
 )
 
-pkg_setup() {
-	use test && use introspection && python-any-r1_pkg_setup
-}
-
 src_prepare() {
 	default
 
@@ -106,46 +105,45 @@ src_prepare() {
 
 src_configure() {
 	local emesonargs=(
-		# disable documentation as the generating is bit automagic
+		#  - Disable documentation as the generating is bit automagic
 		#    if anyone wants to work on it just create bug with patch
 		-Ddocs=false
-		#  - Parameter -Dworkshop=false disables any use of Lua, effectivly
-		-Dworkshop=false
-		$(meson_use introspection)
-
 		-Dexiv2=disabled
 		-Dgdk-pixbuf=enabled
 		-Dgexiv2=disabled
 		#  - There are two checks for dot, one controllable by --with(out)-graphviz
 		#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
 		-Dgraphviz=disabled
 		-Djasper=disabled
-		$(meson_feature lcms)
-		$(meson_feature lensfun)
-		$(meson_feature ffmpeg libav)
 		-Dlibjpeg=enabled
 		-Dlibpng=enabled
-		$(meson_feature raw libraw)
-		$(meson_feature svg librsvg)
-		# libspiro: not in portage main tree
+		#  - libspiro: not in portage main tree
 		-Dlibspiro=disabled
-		$(meson_feature tiff libtiff)
-		#  - v4l support does not work with our media-libs/libv4l-0.8.9,
-		#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
-		$(meson_feature v4l libv4l)
-		$(meson_feature v4l libv4l2)
 		-Dlua=disabled
 		-Dmrg=disabled
-		$(meson_feature openexr)
-		$(meson_feature cairo)
 		-Dpango=enabled
+		-Dsdl2=disabled
+		#  - Parameter -Dworkshop=false disables any use of Lua, effectivly
+		-Dworkshop=false
+		$(meson_feature cairo)
 		$(meson_feature cairo pangocairo)
-		$(meson_feature introspection pygobject)
+		$(meson_feature ffmpeg libav)
+		$(meson_feature lcms)
+		$(meson_feature lensfun)
+		$(meson_feature openexr)
+		$(meson_feature raw libraw)
 		$(meson_feature sdl sdl1)
-		-Dsdl2=disabled
+		$(meson_feature svg librsvg)
+		$(meson_feature test pygobject)
+		$(meson_feature tiff libtiff)
 		$(meson_feature umfpack)
+		#  - v4l support does not work with our media-libs/libv4l-0.8.9,
+		#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
+		$(meson_feature v4l libv4l)
+		$(meson_feature v4l libv4l2)
 		$(meson_feature vala vapigen)
 		$(meson_feature webp)
+		$(meson_use introspection)
 	)
 	meson_src_configure
 }
diff --git a/media-libs/gegl/metadata.xml b/media-libs/gegl/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>[email protected]</email>
+		<name>Sergey Torokhov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>[email protected]</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="lensfun">Enable support for <pkg>media-libs/lensfun</pkg>.</flag>
 		<flag name="umfpack">Enable sparse solving via <pkg>sci-libs/umfpack</pkg>.</flag>