From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 F32F9138331 for ; Sat, 13 Jan 2018 22:17:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2AF4EE093D; Sat, 13 Jan 2018 22:17:41 +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 EE06EE093D for ; Sat, 13 Jan 2018 22:17:40 +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 8A0CE335C62 for ; Sat, 13 Jan 2018 22:17:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D62D41B7 for ; Sat, 13 Jan 2018 22:17:37 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1515881837.9da917d8e4fdf15ddae409534ea7c4bc29e6115c.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/vbam/vbam-9999.ebuild X-VCS-Directories: games-emulation/vbam/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 9da917d8e4fdf15ddae409534ea7c4bc29e6115c X-VCS-Branch: master Date: Sat, 13 Jan 2018 22:17:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8beca327-fb66-40e8-b650-ff7eeae6b19e X-Archives-Hash: 1557be2edc07ea027b924b3163228fa9 commit: 9da917d8e4fdf15ddae409534ea7c4bc29e6115c Author: Nado troglodyte be> AuthorDate: Fri Jan 12 22:36:25 2018 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Jan 13 22:17:17 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9da917d8 games-emulation/vbam: 9999 update to new requirements from upstream * switch from fdo-mime to xdg-utils * add missing REQUIRED_USE constraints * remove gtk port as it is no longer supported by upstream * remove cairo support for the same reason Closes: https://bugs.gentoo.org/638300 Package-Manager: Portage-2.3.19, Repoman-2.3.6 Closes: https://github.com/gentoo/gentoo/pull/6847 games-emulation/vbam/vbam-9999.ebuild | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-9999.ebuild index 0af06c4e2c8..357c9489310 100644 --- a/games-emulation/vbam/vbam-9999.ebuild +++ b/games-emulation/vbam/vbam-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 WX_GTK_VER="3.0" -inherit cmake-utils wxwidgets gnome2-utils fdo-mime eutils +inherit cmake-utils wxwidgets gnome2-utils eutils xdg-utils if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git" @@ -18,8 +18,8 @@ HOMEPAGE="https://github.com/visualboyadvance-m/visualboyadvance-m" LICENSE="GPL-2" SLOT="0" -IUSE="cairo ffmpeg gtk link lirc nls openal +sdl wxwidgets" -REQUIRED_USE="|| ( sdl gtk wxwidgets )" +IUSE="ffmpeg link lirc nls openal +sdl wxwidgets" +REQUIRED_USE="openal? ( wxwidgets ) || ( sdl wxwidgets )" RDEPEND=">=media-libs/libpng-1.4:0= media-libs/libsdl2[joystick] @@ -28,13 +28,9 @@ RDEPEND=">=media-libs/libpng-1.4:0= virtual/glu virtual/opengl ffmpeg? ( virtual/ffmpeg[-libav] ) - gtk? ( >=dev-cpp/glibmm-2.4.0:2 - >=dev-cpp/gtkmm-2.4.0:2.4 - >=dev-cpp/gtkglextmm-1.2.0 ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) wxwidgets? ( - cairo? ( x11-libs/cairo ) openal? ( media-libs/openal ) x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )" @@ -48,15 +44,13 @@ src_prepare() { default # fix desktop file QA warnings - edos2unix src/gtk/gvbam.desktop src/wx/wxvbam.desktop + edos2unix src/wx/wxvbam.desktop } src_configure() { use wxwidgets && setup-wxwidgets local mycmakeargs=( - -DENABLE_CAIRO=$(usex cairo) -DENABLE_FFMPEG=$(usex ffmpeg) - -DENABLE_GTK=$(usex gtk) -DENABLE_LINK=$(usex link) -DENABLE_LIRC=$(usex lirc) -DENABLE_NLS=$(usex nls) @@ -79,28 +73,27 @@ src_install() { if use sdl ; then dodoc doc/ReadMe.SDL.txt - doman src/debian/vbam.1 + doman src/debian/vbam.6 fi - use wxwidgets && doman src/debian/wxvbam.1 - use gtk && doman src/debian/gvbam.1 + use wxwidgets && doman src/debian/visualboyadvance-m.6 } pkg_preinst() { - if use gtk || use wxwidgets ; then + if use wxwidgets ; then gnome2_icon_savelist fi } pkg_postinst() { - if use gtk || use wxwidgets ; then + if use wxwidgets ; then gnome2_icon_cache_update + xdg_desktop_database_update fi - use gtk && fdo-mime_desktop_database_update } pkg_postrm() { - if use gtk || use wxwidgets ; then + if use wxwidgets ; then gnome2_icon_cache_update + xdg_desktop_database_update fi - use gtk && fdo-mime_desktop_database_update }