rework gui selection and deps; add more use flags

Package-Manager: portage-2.2.14/cvs/Linux x86_64

diff --git a/app-emulation/vice/ChangeLog b/app-emulation/vice/ChangeLog
index ae36d98d87bc9be492c0d5f5d5ec08415b99f063..76397c9bed89e186380e524a29ebde2426df1bdb 100644 (file)
--- a/app-emulation/vice/ChangeLog
+++ b/app-emulation/vice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/vice
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.97 2015/02/05 03:17:04 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.98 2015/02/11 03:05:43 mr_bones_ Exp $
+
+*vice-2.4.16-r1 (11 Feb 2015)
+
+  11 Feb 2015; Michael Sterrett <mr_bones_@gentoo.org> +vice-2.4.16-r1.ebuild,
+  -vice-2.4.16.ebuild, metadata.xml:
+  rework gui selection and deps; add more use flags
 
 *vice-2.4.16 (05 Feb 2015)
 

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 12bc1a71e9297f1181d84e2d82e9667f447c0a20..fb7616cc7270ecf066600c1d30a0cac6c9bc624c 100644 (file)
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -5,7 +5,7 @@ AUX vice-2.4-ffmpeg-1.patch 6037 SHA256 0f3247c009f64e3e911748ce44b86ff6c2e899d8
 AUX vice-2.4.16-autotools.patch 353 SHA256 5d9232698424a6c98ed27e3206fb46a12093666e42dd6a59b21fd362923e9511 SHA512 10ba3f9f9c0e69f34ea3ab361b198826b7055586e2dade320a60c1a1e429797d2eaf1554b1e9fde63f8ddb23bd4a9b8fb24d3f9692433b6b6d043d09761924d3 WHIRLPOOL cad09cca9eb43298168ff4c8f3c5acd52e56aeee1a3db63f91906c5f4dc440f230d3e2e68c039759fbea0e5d7bb54adec58c2c14fe4be41a75e69c1a0fe35ab6
 DIST vice-2.4.16.tar.gz 14779876 SHA256 90a5d6cbfa621ecb67b5bff43030bf5d5da5fee2c1933efe44ad036c3945d4ec SHA512 0f6cda3233f43c98bc14153144f0ebf41f4dc452446a842985f0ec235232580121a1b580ab834aa54fbfb15f610316764948e4db56b93bcfbfbb4320b5089ec0 WHIRLPOOL 079367e36f2358ebe233de25ed29dfa2d21a52dfbc6c3bc880ebbe3f89b6b409ed0f778aac2dc89418bd07cdf819a5bf70b98156a3dd5c7364228efee8235022
 DIST vice-2.4.tar.gz 13656511 SHA256 ff8b8d5f0f497d1f8e75b95bbc4204993a789284a08a8a59ba727ad81dcace10 SHA512 ad197fc35eb80c9738b7f4f551d350dbb4440c7c8103e5d472b7f7ea5106c1356e9d6e3f481552a028a313129ef233833d3147e03f6f00b9890229d5708e3ebb WHIRLPOOL 80f89f7c144fe1ef2305e109049b49e47dfa4af9b69d0d848bf7b06bd0f2d210669acece363b550abad1c50f53dd45a30397eb1bfacfaa443c9e865c686d0823
-EBUILD vice-2.4.16.ebuild 3181 SHA256 0ea85cdfac4c24351c630cde332c37145a9218156e5f0462f3e78db8422f8439 SHA512 f58b2ff3402354e4b04f6e2b0a072e25162d9944c76c8baf9f19ee9e4cf0937f549895fda64b655c0aff5bf145bc1b5de1768e37e1acbd5b70feed1d92f09309 WHIRLPOOL 9faff684b610d35ccfb73668dc0c723bc7bbcef3ec20be0647b622f43cba30d07a83a7ddbdba1632daf9ee788a79c9f735ec3e531a81888011719f40b84f0da9
+EBUILD vice-2.4.16-r1.ebuild 3714 SHA256 b697d5d5bf0642c99a0e398001ec82946f3e60e89440216a49fd1af0bba11a5b SHA512 25f7eb1858ab2f7c571f40d451e9cc955ca193fac4abb53cd0cd1607aa8fabed1de7204f58bf2e9a13d6081b00089c023e6069a79cfa0949dc43cb43ac0cb3d1 WHIRLPOOL 33e5668d5ba70ae6d9dc724f9ef0fb74ddd328d3cb8fc6b36c3c510e08894285eae39dbf37218b4f73299f5a5b2d723dc9a3525a5d5058845d49cc288d32b2af
 EBUILD vice-2.4.ebuild 3034 SHA256 f13eeb0f0e005c01706fabd03d0f7fa87da6fe6d3a4062d9a4df8cd09b89d7df SHA512 bdc3e192548a739636fb45db3fc84b9a94219e21518475fd667ad03cf1a547b51a569bd793b0289278183fbba07e4f7f143d7e343a000ee5733de76aaaa86f02 WHIRLPOOL 2acf927c307445a501ab6364f086d84ff0b1bb0247b586efc7c88b3535ec58f6dde298cc8ef2633327ec03baae41bb2e5cf1db41c49861819828fb1e27a71c6c
-MISC ChangeLog 13080 SHA256 08b336bbb68bf1f86bf0a624c58b0bff368f0c8b30a6b98d1a8d1535d26c57c4 SHA512 6fb43690458bf6c3644fcad1606476f94d5c90e0aeda5cfc78465e5983ad80ff8b4cabd5652b064fa77a6f7d79ac6feeb2ab671e6fddcd404b876500d20f4b26 WHIRLPOOL ab35dbce4be2a87ddd4eb05c52be246b29e642a0338652104f773b245b2b18ea28c80e4156e1790fd84089dfc42b589599bff7a15892f4cd5dd9516744de83aa
-MISC metadata.xml 355 SHA256 74dd1a42d4949ea4d7e8f1267fb2b6d0f63b8cee0f1aa2cb9278f674192edb1f SHA512 d0086c4b840f65a1dd594060b7ff5be4e3e04c0eca662e709c3cded434d1987c480a77e522d629daa3d50b49975d68a242098cf03d5b661c4fe7539ed5490ac7 WHIRLPOOL f650bb60ecb985f5428f27feb87dccf4addf7c09818cb09b704bb2c71b7c974a5938843835898812ee322330d64e37e4fd3cd57c16f21faf4271483826db2cfb
+MISC ChangeLog 13280 SHA256 f6885d2ef34cab7d2faec2a4e2c65d5bdded00e1e38fa1849626d4d207297c94 SHA512 b0b493a02d03a5e217506878d79844185fee14a6b7712dc1c2aa27ce19df0072bc488ea1946aba98fd3e7854689fa1df726dd9b69f20c93ffd2ee8a476e86847 WHIRLPOOL cbf9dfcb102ddae51535f26d73b7cfd7d27f8d11157389056d70c731687d88e200a3282fd460da9e9ae43907127550914315a04b53729314982829c145525f39
+MISC metadata.xml 567 SHA256 b6ed95d99dbba801fed1f2b96bf20539f1c488cebd9e1cdb00a7566e094d8d10 SHA512 570bc143c416c8287f1b29b217acd5b0bacee5f2d7c5f54abc13738bedfb626b3945586661affc25c2c4959101ba05a9abd0e8f6e4fefa2b99b78facfd41cc41 WHIRLPOOL 52e20e267c7aaef5da39d2341475848f810f4b7d9a703077f3134c511348ae5dbdf6ec8bb94480f93b12174eec2263a2e652a0878d9093d2356bce1a04c8e819

diff --git a/app-emulation/vice/metadata.xml b/app-emulation/vice/metadata.xml
index 84683fd48630bb369b9bbe154bda53d3b4cbfa3b..89baadf5a73b2ba62c3a46e0d8470899b12f8b3a 100644 (file)
--- a/app-emulation/vice/metadata.xml
+++ b/app-emulation/vice/metadata.xml
@@ -3,8 +3,11 @@
 <pkgmetadata>
 <herd>games</herd>
 <use>
+       <flag name="fullscreen">Enable the ability to run fullscreen</flag>
+       <flag name="gtk3">Use GTK+3 instead of GTK+2</flag>
        <flag name='ethernet'>Enable ethernet emulation</flag>
        <flag name='memmap'>Enable extra monitor features</flag>
+       <flag name='vte'>Enable support for <pkg>x11-libs/vte</pkg> in the GTK+ interface</flag>
        <flag name='xrandr'>Enable support for the X xrandr extension</flag>
 </use>
 </pkgmetadata>

diff --git a/app-emulation/vice/vice-2.4.16.ebuild b/app-emulation/vice/vice-2.4.16-r1.ebuild
similarity index 52%
rename from app-emulation/vice/vice-2.4.16.ebuild
rename to app-emulation/vice/vice-2.4.16-r1.ebuild
index 4e983b9263ea52512438a1b9871f3059b6bab0d0..a1822c0979bb8c19bf155b16d5fb04e17b4e7927 100644 (file)
--- a/app-emulation/vice/vice-2.4.16.ebuild
+++ b/app-emulation/vice/vice-2.4.16-r1.ebuild
@@ -1,67 +1,87 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-2.4.16.ebuild,v 1.1 2015/02/05 03:17:04 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-2.4.16-r1.ebuild,v 1.1 2015/02/11 03:05:43 mr_bones_ Exp $
 
 EAPI=5
-inherit autotools eutils toolchain-funcs games
+inherit autotools eutils toolchain-funcs flag-o-matic games
 
 DESCRIPTION="The Versatile Commodore 8-bit Emulator"
 HOMEPAGE="http://vice-emu.sourceforge.net/"
 SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="Xaw3d alsa gnome nls png readline sdl ipv6 memmap ethernet oss zlib X gif jpeg xv dga xrandr ffmpeg lame pulseaudio"
+IUSE="Xaw3d alsa ethernet ffmpeg fullscreen gtk gtk3 ipv6 lame nls oss png pulseaudio readline sdl threads vte zlib"
 
 RDEPEND="
-       x11-libs/libX11
-       x11-libs/libXext
-       x11-libs/libXpm
-       x11-libs/libICE
-       x11-libs/libSM
-       x11-libs/libXt
-       x11-libs/libXxf86vm
-       x11-apps/xset
-       Xaw3d? ( x11-libs/libXaw3d )
-       !Xaw3d? ( !gnome? ( x11-libs/libXaw ) )
+       virtual/jpeg
+       virtual/opengl
+       media-libs/giflib
        alsa? ( media-libs/alsa-lib )
-       gnome? (
-               x11-libs/gtk+:2
-               x11-libs/vte:0
-               dev-libs/atk
-               x11-libs/pango
-       )
-       lame? ( media-sound/lame )
-       ffmpeg? ( virtual/ffmpeg )
        ethernet? (
            >=net-libs/libpcap-0.9.8
            >=net-libs/libnet-1.1.2.1
        )
+       ffmpeg? ( virtual/ffmpeg )
+       lame? ( media-sound/lame )
        nls? ( virtual/libintl )
        png? ( media-libs/libpng:0 )
-       readline? ( sys-libs/readline )
-       sdl? ( media-libs/libsdl[sound] )
-       gif? ( media-libs/giflib )
-       jpeg? ( virtual/jpeg )
-       xv? ( x11-libs/libXv )
-       dga? ( x11-libs/libXxf86dga )
-       xrandr? ( x11-libs/libXrandr )"
+       zlib? ( sys-libs/zlib )
+       sdl? (
+               media-libs/libsdl[joystick,sound,video]
+       )
+       !sdl? (
+               x11-libs/libX11
+               x11-libs/libXext
+               fullscreen? (
+                       x11-libs/libXrandr
+                       x11-libs/libXxf86vm )
+               readline? ( sys-libs/readline )
+               gtk? (
+                       !gtk3? (
+                               x11-libs/gtk+:2
+                               vte? ( x11-libs/vte:0 )
+                       )
+                       gtk3? (
+                               x11-libs/gtk+:3
+                               vte? ( x11-libs/vte:2.90 )
+                       )
+                       x11-libs/pango
+                       x11-libs/cairo
+                       x11-libs/gtkglext
+               )
+               !gtk? (
+                       x11-libs/libX11
+                       x11-libs/libXmu
+                       x11-libs/libXpm
+                       x11-libs/libXt
+                       x11-libs/libXv
+                       sys-libs/readline
+                       Xaw3d? ( x11-libs/libXaw3d )
+                       !Xaw3d? ( x11-libs/libXaw )
+               )
+       )"
 DEPEND="${RDEPEND}
        virtual/pkgconfig
-       x11-apps/bdftopcf
-       x11-apps/mkfontdir
-       x11-proto/xproto
-       x11-proto/xf86vidmodeproto
-       x11-proto/xextproto
-       media-libs/fontconfig
-       dga? ( x11-proto/xf86dgaproto )
-       xv? ( x11-proto/videoproto )
+       !sdl? (
+               !gtk? (
+                       x11-libs/libICE
+                       x11-libs/libSM
+               )
+               x11-apps/bdftopcf
+               x11-apps/mkfontdir
+               x11-proto/xproto
+               fullscreen? ( x11-proto/xf86vidmodeproto )
+               x11-proto/xextproto
+               media-libs/fontconfig
+               x11-proto/videoproto
+       )
        nls? ( sys-devel/gettext )"
 
 pkg_pretend() {
-       if use gnome && use sdl ; then
-               eerror "gnome and sdl USE flags can't both be set.  Pick one and mask the other one in /etc/portage/package.use"
+       if use gtk || use gtk3 && use sdl ; then
+               eerror "gtk (2 or 3) and sdl USE flags can't both be set.  Pick one and mask the other one in /etc/portage/package.use"
                die "Please pick one gui option."
        fi
 }
@@ -86,32 +106,46 @@ src_prepare() {
 }
 
 src_configure() {
+       local gui_arg
+
+       if use sdl ; then
+               gui_arg="--enable-sdlui"
+       elif use gtk || use gtk3 ; then
+               # The gtk UI code has raw calls to XOpenDisplay and
+               # is missing -lX11 if vte doesn't pull it in.
+               if ! use vte ; then
+                       append-libs -lX11
+               fi
+               gui_arg="--enable-gnomeui"
+               if use gtk3 ; then
+                       gui_arg="--enable-gnomeui3"
+               fi
+       fi
        # don't try to actually run fc-cache (bug #280976)
        FCCACHE=/bin/true \
        PKG_CONFIG=$(tc-getPKG_CONFIG) \
        egamesconf \
-               --enable-fullscreen \
                --enable-parsid \
                --with-resid \
                --without-arts \
                --without-midas \
+               $(use_enable ethernet) \
                $(use_enable ffmpeg) \
+               $(use_enable fullscreen) \
+               $(use_enable ipv6) \
                $(use_enable lame) \
-               $(use_enable gnome gnomeui) \
                $(use_enable nls) \
+               $(use_enable vte) \
                $(use_with Xaw3d xaw3d) \
                $(use_with alsa) \
-               $(use_with pulseaudio pulse) \
+               $(use_with oss) \
                $(use_with png) \
+               $(use_with pulseaudio pulse) \
                $(use_with readline) \
                $(use_with sdl sdlsound) \
-               $(use_enable sdl sdlui) \
-               $(use_enable ipv6) \
-               $(use oss || echo --without-oss) \
-               $(use_enable memmap) \
-               $(use_enable ethernet) \
+               $(use_with threads uithreads) \
                $(use_with zlib) \
-               $(use_with X x) \
+               ${gui_arg} \
                --disable-option-checking
                # --disable-option-checking has to be last
 }