From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1085152-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id CA6E5138334
	for <garchives@archives.gentoo.org>; Tue, 23 Apr 2019 01:33:53 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id A2AC1E09D9;
	Tue, 23 Apr 2019 01:33:52 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 74065E09D9
	for <gentoo-commits@lists.gentoo.org>; Tue, 23 Apr 2019 01:33:52 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 5AEAF34219A
	for <gentoo-commits@lists.gentoo.org>; Tue, 23 Apr 2019 01:33:50 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 3575E576
	for <gentoo-commits@lists.gentoo.org>; Tue, 23 Apr 2019 01:33:48 +0000 (UTC)
From: "Aaron Bauman" <bman@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Bauman" <bman@gentoo.org>
Message-ID: <1555983119.87ccc90d30a19a3a95763aa00b6ba480bf30752b.bman@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-libs/gegl/Manifest media-libs/gegl/gegl-0.4.6-r1.ebuild
X-VCS-Directories: media-libs/gegl/
X-VCS-Committer: bman
X-VCS-Committer-Name: Aaron Bauman
X-VCS-Revision: 87ccc90d30a19a3a95763aa00b6ba480bf30752b
X-VCS-Branch: master
Date: Tue, 23 Apr 2019 01:33:48 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: e117a968-69ad-4f00-a31a-b6c0c6378cd2
X-Archives-Hash: 8d2faf2eb123afdf8f6c718ebab4b963

commit:     87ccc90d30a19a3a95763aa00b6ba480bf30752b
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 23 01:31:59 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue Apr 23 01:31:59 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87ccc90d

media-libs/gegl: drop older 0.4.x version due to 2.2* dep.

* This forced dep on 2.2* is causing breakage with enabling the openexr
USE for arm64.

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 media-libs/gegl/Manifest             |   1 -
 media-libs/gegl/gegl-0.4.6-r1.ebuild | 189 -----------------------------------
 2 files changed, 190 deletions(-)

diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 1bd5946385c..635ac554c5b 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -4,5 +4,4 @@ DIST gegl-0.3.26.tar.bz2 6530788 BLAKE2B 1cd1a61737ec94cb30fdf16ca8dcb5667ebaa48
 DIST gegl-0.3.34.tar.bz2 6707964 BLAKE2B 4424a2c218067bd0a77d79c2334528da393350db3062019f3889b8cdb8d222f6e436ccfc845b61fdf425a1634698a7a6963702a29bb1666f515b1395c50dc99f SHA512 a7a394dcce4137d5224163ca324f1585e64d1cc797e77d452ba444afe2bff39aa2e2d5d040d07b394697b75162bc310bc51490a5af80240b26aac14b6e7abe02
 DIST gegl-0.4.12.tar.bz2 7065555 BLAKE2B f0801739e67e6d6ecc88abaed8638c900edd7229d240f63af7cc0bf503cd29b33b84d7e3018c757b0bdb6ee5245f6af595b96decc3916b57debfb46712213577 SHA512 cacf9f5c34357b3939162d0d4712ee2b47298a3e806b55e275cdf5e23f186d436ea1a840b91b1b72b76d450d94674cca217b7c253cd6b52a7d9505b4ad73fde2
 DIST gegl-0.4.14.tar.bz2 7209142 BLAKE2B a056f02c3fa9e075aa62cb8cb0d8183560ac66ffed68072add3ea6afc9da3b47c9854eb4e1799c61f451287b244bee4dfc8942365f556a0e820dd7485b9fc305 SHA512 1fcec83a961c0b9c98487de99d26893f98a5401816fa6d7238af4c645672d0eb0474cdb7251b8ebcd344aff589e8979bee0304b50fcfae9513fdbf8a02068e3b
-DIST gegl-0.4.6.tar.bz2 6931774 BLAKE2B c8fabc8efbcc21a3663c8a3a698e6bc072506a66a21b81e6696c37c81aec1458c695f773c554b6d98c2fd21a3d3ab7fcca4b2f6567ec9d4f94b1e925b9bc9ce5 SHA512 6df34b6e76318a375820bccac6efeb2792c737e47154902fcc08ef93cb45b978992ee263260c99f8e865964d80cd1fac6dc2d6c8e4453174df64a9044b57325e
 DIST gegl-0.4.8.tar.bz2 7017022 BLAKE2B ec934fe6faa0c9328ae8c6476e19e175a8e8082e3d1f59052fb83fad766030ede9dd3464a215d332238277492151d988b17c6d3ac87f3d9cec01797acd259fae SHA512 20d2700cc74bce02e3e1b477f5e4dbd6546bb74625de235baaaa31e24f506930927af53de3d0880c0b16f93a10cec993c58a12adba59dec7dda0e389261799aa

diff --git a/media-libs/gegl/gegl-0.4.6-r1.ebuild b/media-libs/gegl/gegl-0.4.6-r1.ebuild
deleted file mode 100644
index 6e303217ef0..00000000000
--- a/media-libs/gegl/gegl-0.4.6-r1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-# vala and introspection support is broken, bug #468208
-VALA_USE_DEPEND=vapigen
-
-inherit autotools gnome2-utils python-any-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.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
-HOMEPAGE="http://www.gegl.org/"
-
-LICENSE="|| ( GPL-3+ LGPL-3 )"
-SLOT="0.4"
-
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp"
-REQUIRED_USE="
-	svg? ( cairo )
-	vala? ( introspection )
-"
-
-# 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="
-	>=dev-libs/glib-2.44:2
-	dev-libs/json-glib
-	>=media-libs/babl-0.1.54
-	sys-libs/zlib
-	>=x11-libs/gdk-pixbuf-2.32:2
-	x11-libs/pango
-
-	cairo? ( >=x11-libs/cairo-1.12.2 )
-	ffmpeg? (
-		>=media-video/ffmpeg-2.8:0=
-	)
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	virtual/jpeg:0=
-	jpeg2k? ( >=media-libs/jasper-1.900.1:= )
-	lcms? ( >=media-libs/lcms-2.8:2 )
-	lensfun? ( >=media-libs/lensfun-0.2.5 )
-	openexr? ( =media-libs/openexr-2.2*:= )
-	>=media-libs/libpng-1.6.0:0=
-	raw? ( >=media-libs/libraw-0.15.4:0= )
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	svg? ( >=gnome-base/librsvg-2.40.6:2 )
-	tiff? ( >=media-libs/tiff-4:0 )
-	umfpack? ( sci-libs/umfpack )
-	v4l? ( >=media-libs/libv4l-1.0.1 )
-	webp? ( >=media-libs/libwebp-0.5.0:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1
-	>=sys-devel/gettext-0.19.8
-	dev-lang/perl
-	virtual/pkgconfig
-	>=sys-devel/libtool-2.2
-	test? ( ffmpeg? ( media-libs/gexiv2 )
-		introspection? (
-		$(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]') ) )
-	vala? ( $(vala_depend) )
-"
-
-pkg_setup() {
-	use test && use introspection && python-any-r1_pkg_setup
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
-)
-
-src_prepare() {
-	default
-
-	# FIXME: the following should be proper patch sent to upstream
-	# fix OSX loadable module filename extension
-	sed -i -e 's/\.dylib/.bundle/' configure.ac || die
-	# don't require Apple's OpenCL on versions of OSX that don't have it
-	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
-		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
-	fi
-
-	# commit 7c78497b : tests that use gegl.png are broken on non-amd64
-	sed -e '/clones.xml/d' \
-		-e '/composite-transform.xml/d' \
-		-i tests/compositions/Makefile.am || die
-
-	eautoreconf
-
-	gnome2_environment_reset
-
-	use vala && vala_src_prepare
-}
-
-_use_with_both() {
-	if use "$1" && use "$2"; then
-		echo "--with-$3"
-	else
-		echo "--without-$3"
-	fi
-}
-
-src_configure() {
-	# never enable altering of CFLAGS via profile option
-	# libspiro: not in portage main tree
-	# disable documentation as the generating is bit automagic
-	#    if anyone wants to work on it just create bug with patch
-
-	# Also please note that:
-	#
-	#  - Some auto-detections are not patched away since the docs are
-	#    not built (--disable-docs, lack of --enable-gtk-doc) and these
-	#    tools affect re-generation of docs, only
-	#    (e.g. ruby, asciidoc, dot (of graphviz), enscript)
-	#
-	#  - Parameter --with-exiv2 compiles a noinst-app only, no use
-	#    but needed during testing
-	#
-	#  - Parameter --disable-workshop disables any use of Lua, effectivly
-	#
-	#  - 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
-	#
-	#  - There are two checks for dot, one controllable by --with(out)-graphviz
-	#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
-	#
-	#  - mrg is not in tree and gexiv2 support only has effect when mrg support
-	#    is enabled
-	#
-	# So that's why USE="exif graphviz lua v4l" got resolved.  More at:
-	# https://bugs.gentoo.org/show_bug.cgi?id=451136
-	#
-	econf \
-		--disable-docs \
-		--disable-profile \
-		--disable-silent-rules \
-		--disable-workshop \
-		--program-suffix=-${SLOT} \
-		--with-gdk-pixbuf \
-		--with-pango \
-		--without-libspiro \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable debug) \
-		$(use_with cairo) \
-		$(use_with cairo pangocairo) \
-		--without-exiv2 \
-		$(use_with ffmpeg libavformat) \
-		$(_use_with_both ffmpeg test gexiv2) \
-		--without-graphviz \
-		$(use_with jpeg2k jasper) \
-		$(use_with lcms) \
-		$(use_with lensfun) \
-		--without-lua \
-		--without-mrg \
-		$(use_with openexr) \
-		$(use_with raw libraw) \
-		$(use_with sdl) \
-		$(use_with svg librsvg) \
-		$(use_with tiff libtiff) \
-		$(use_with umfpack) \
-		$(use_with v4l libv4l) \
-		$(use_with v4l libv4l2) \
-		$(use_enable introspection) \
-		$(use_with vala) \
-		$(use_with webp)
-}
-
-src_compile() {
-	default
-
-	[[ ${PV} == *9999* ]] && emake ./ChangeLog  # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped."
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}