[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Arthur Zamarin]

commit: 026ef6e009d24b17141a99e713d9e19ed9ef56ae
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jan 28 19:59:55 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jan 28 19:59:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=026ef6e0

app-emulation/vice: Stabilize 3.8-r1 x86, #922750

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-emulation/vice/vice-3.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/vice/vice-3.8-r1.ebuild 
b/app-emulation/vice/vice-3.8-r1.ebuild
index dd1908d5bfc8..36f76ca6a6e3 100644
--- a/app-emulation/vice/vice-3.8-r1.ebuild
+++ b/app-emulation/vice/vice-3.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="
alsa curl debug doc ethernet flac gif +gtk headless lame mpg123
ogg openmp oss parport pci png portaudio pulseaudio sdl

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Sam James]

commit: ab7249ba60a450d3abb4ac4c4bc30fb73c6baaaf
Author: Sam James  gentoo  org>
AuthorDate: Tue Jan 23 16:39:23 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 23 16:39:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab7249ba

app-emulation/vice: Stabilize 3.8-r1 amd64, #922750

Signed-off-by: Sam James  gentoo.org>

 app-emulation/vice/vice-3.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/vice/vice-3.8-r1.ebuild 
b/app-emulation/vice/vice-3.8-r1.ebuild
index 762dcd51d720..dd1908d5bfc8 100644
--- a/app-emulation/vice/vice-3.8-r1.ebuild
+++ b/app-emulation/vice/vice-3.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="
alsa curl debug doc ethernet flac gif +gtk headless lame mpg123
ogg openmp oss parport pci png portaudio pulseaudio sdl

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Ionen Wolkens]

commit: 545eb882e70db1dc373bc71f211f461ffc2f33fd
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Jan  5 10:21:15 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Jan  5 10:25:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=545eb882

app-emulation/vice: revert mpg123 changes

Ended up updating it while bumping, but situation been changing
so let's just keep it as-is for now.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/vice/{vice-3.8.ebuild => vice-3.8-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/vice/vice-3.8.ebuild 
b/app-emulation/vice/vice-3.8-r1.ebuild
similarity index 97%
rename from app-emulation/vice/vice-3.8.ebuild
rename to app-emulation/vice/vice-3.8-r1.ebuild
index 9d9694f87608..def4ab4e7450 100644
--- a/app-emulation/vice/vice-3.8.ebuild
+++ b/app-emulation/vice/vice-3.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,7 +42,7 @@ RDEPEND="
x11-libs/pango
)
lame? ( media-sound/lame )
-   mpg123? ( || ( media-libs/libmpg123 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Ionen Wolkens]

commit: 47ee1f4e656be2d3148cfa7fce84ce9d575a6c53
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Dec 26 13:20:58 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Dec 26 14:38:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47ee1f4e

app-emulation/vice: add 3.8

bug #834359: This version deprecates the old (library-based) ffmpeg
support that is still broken with >=ffmpeg-5, so simply disable it.
Apparently has new support for using the ffmpeg executable (untested).

bug #914964: Caused by the new USE=egl-only on media-libs/glew which
disables X support, so depend on [-egl-only(-)].

Switch to hard requiring zlib, could already only be disabled for
non-gtk builds and then USE="sdl -gtk -zlib' fails to build. Not
really worth worrying about unless someone wants this.

Closes: https://bugs.gentoo.org/834359
Closes: https://bugs.gentoo.org/914964
Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/vice/Manifest|   1 +
 app-emulation/vice/vice-3.8.ebuild | 186 +
 2 files changed, 187 insertions(+)

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index f1119a62e026..7e9092173201 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1 +1,2 @@
 DIST vice-3.7.1.tar.gz 13444946 BLAKE2B 
64ac82c118cd1e515d7677d3f60d3b19dbf19319d8505321c46c2adb92414193784a036e2f6fa0ce5f55f1e4f425f45026ce152ee866b72ad6557531faaf5797
 SHA512 
80f81dd4d163cc5030eee2908b274bce4f3f21a3adb6d01559f4695d58b27ebc7b7570d8896718dfe74b2f2e4983ed3f9c4919b6e81934063d344b543b081f30
+DIST vice-3.8.tar.gz 13564021 BLAKE2B 
709fd6eda874de542e5770a328b0c0308d04f755e3bf1fceba5147156eb894a95ce6f14e9f8848ca6992d4f958082f83a198d2176c1fe54e87027c7dfac8849c
 SHA512 
fe644667736c32386b62af53314a95bf510c75d476eaab14b4c37693f2f57d6815126ab3db2f0cb11300c1a4a07c29b3f25210800ce97a673a0460ab59d0ebba

diff --git a/app-emulation/vice/vice-3.8.ebuild 
b/app-emulation/vice/vice-3.8.ebuild
new file mode 100644
index ..9d9694f87608
--- /dev/null
+++ b/app-emulation/vice/vice-3.8.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multibuild toolchain-funcs xdg
+
+DESCRIPTION="Versatile Commodore Emulator"
+HOMEPAGE="https://vice-emu.sourceforge.io/;
+SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="
+   alsa curl debug doc ethernet flac gif +gtk headless lame mpg123
+   ogg openmp oss parport pci png portaudio pulseaudio sdl
+"
+REQUIRED_USE="|| ( gtk headless sdl )"
+
+RDEPEND="
+   sys-libs/zlib:=
+   virtual/libintl
+   alsa? ( media-libs/alsa-lib )
+   curl? ( net-misc/curl )
+   ethernet? (
+   net-libs/libpcap
+   sys-libs/libcap
+   )
+   flac? ( media-libs/flac:= )
+   gif? ( media-libs/giflib:= )
+   gtk? (
+   >=app-accessibility/at-spi2-core-2.46:2
+   dev-libs/glib:2
+   media-libs/fontconfig:1.0
+   media-libs/glew:0=[-egl-only(-)]
+   media-libs/libglvnd[X]
+   x11-libs/cairo
+   x11-libs/gdk-pixbuf:2
+   x11-libs/gtk+:3[X]
+   x11-libs/libX11
+   x11-libs/pango
+   )
+   lame? ( media-sound/lame )
+   mpg123? ( || ( media-libs/libmpg123  1 )) &&
+   xform="/^x/s/\$/.${MULTIBUILD_VARIANT}/"
+
+   vice-multi_enable() {
+   if [[ ${MULTIBUILD_VARIANT} == ${1} ]]; then
+   echo --enable-${2}
+   else
+   echo --disable-${2}
+   fi
+   }
+
+   local econfargs=(
+   --program-transform-name="${xform}"
+   $(vice-multi_enable gtk desktop-files)
+   $(vice-multi_enable gtk gtk3ui)
+   $(vice-multi_enable headless headlessui)
+   $(vice-multi_enable sdl sdl2ui)
+   $(usex debug $(vice-multi_enable gtk debug-gtk3ui) 
--disable-debug-gtk3ui)
+   $(use_enable debug)
+   $(use_enable doc pdf-docs)
+   $(use_enable ethernet)
+   $(use_enable openmp)
+   $(use_enable parport parsid)
+   $(use_with alsa)
+   $(use_with curl libcurl)
+   $(use_with flac)
+   $(use_with gif)
+   $(use_with lame)
+   $(use_with lame static-lame) # disables dlopen, uses shared 
still
+   $(use_with mpg123)
+   $(use_with ogg vorbis)
+   $(use_with oss)
+   $(use_with parport libieee1284)
+   $(use_with png)
+   $(use_with portaudio)
+   $(use_with pulseaudio pulse)
+   $(usex alsa --enable-midi $(use_enable oss midi))
+   $(usev !pci 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Andreas Sturmlechner]

commit: c947cf7926ead27718e6e2f62d2b86df523196b4
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jun 11 06:53:30 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jun 11 10:43:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c947cf79

app-emulation/vice: Drop obsolete media-sound/pulseaudio alt. dep

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-emulation/vice/vice-3.7.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/vice/vice-3.7.1.ebuild 
b/app-emulation/vice/vice-3.7.1.ebuild
index d969df0c0f68..f42fed404314 100644
--- a/app-emulation/vice/vice-3.7.1.ebuild
+++ b/app-emulation/vice/vice-3.7.1.ebuild
@@ -54,7 +54,7 @@ RDEPEND="
pci? ( sys-apps/pciutils )
png? ( media-libs/libpng:= )
portaudio? ( media-libs/portaudio )
-   pulseaudio? ( || ( media-libs/libpulse media-sound/pulseaudio ) )
+   pulseaudio? ( media-libs/libpulse )
sdl? (
media-libs/libsdl2[video]
media-libs/sdl2-image

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Ionen Wolkens]

commit: c12a4779c3d173ccf62270c2b1a333e82e0cdb47
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Jan 30 18:55:11 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Jan 30 19:11:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c12a4779

app-emulation/vice: drop 3.6.1-r2

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/vice/Manifest |   1 -
 app-emulation/vice/metadata.xml |   1 -
 app-emulation/vice/vice-3.6.1-r2.ebuild | 193 
 3 files changed, 195 deletions(-)

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 253f1141e157..f1119a62e026 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,2 +1 @@
-DIST vice-3.6.1.tar.gz 11454300 BLAKE2B 
129171380f3bd23d579dc29a96419446169cf9a98d2fec82951fa192914846053d213a19b395c9ca30596859cce35bcfea0de0c0a7461c45cb38511a546ca4b2
 SHA512 
9aeb1c84dc71976d12a9907d60c637ec4cc938aad103340b70a13906bbf2bebab579edc78221c7fba47f0750be3f9ded947200b42fcfc8a9169fb4bb9f288cb7
 DIST vice-3.7.1.tar.gz 13444946 BLAKE2B 
64ac82c118cd1e515d7677d3f60d3b19dbf19319d8505321c46c2adb92414193784a036e2f6fa0ce5f55f1e4f425f45026ce152ee866b72ad6557531faaf5797
 SHA512 
80f81dd4d163cc5030eee2908b274bce4f3f21a3adb6d01559f4695d58b27ebc7b7570d8896718dfe74b2f2e4983ed3f9c4919b6e81934063d344b543b081f30

diff --git a/app-emulation/vice/metadata.xml b/app-emulation/vice/metadata.xml
index 426920c37ba3..28b3dc71db21 100644
--- a/app-emulation/vice/metadata.xml
+++ b/app-emulation/vice/metadata.xml
@@ -6,7 +6,6 @@
Gentoo Games Project


-   Enable 65xx CPU history support (may 
decrease performance)
Enable ethernet emulation
Include the headless variant of the 
emulator
Enable mp3@64 cartridge support

diff --git a/app-emulation/vice/vice-3.6.1-r2.ebuild 
b/app-emulation/vice/vice-3.6.1-r2.ebuild
deleted file mode 100644
index 42bc7e5822b6..
--- a/app-emulation/vice/vice-3.6.1-r2.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multibuild toolchain-funcs xdg
-
-DESCRIPTION="The Versatile Commodore Emulator"
-HOMEPAGE="https://vice-emu.sourceforge.io/;
-SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="
-   alsa cpuhistory debug doc ethernet ffmpeg flac gif +gtk headless jpeg
-   lame mpg123 ogg openmp oss parport pci png portaudio pulseaudio sdl 
zlib"
-REQUIRED_USE="
-   || ( gtk headless sdl )
-   gtk? ( zlib )"
-
-# ffmpeg/lame are loaded by dlopen(), keeping := to rebuild with same headers
-# see bug #834359 for the ffmpeg upper bound
-RDEPEND="
-   virtual/libintl
-   alsa? ( media-libs/alsa-lib )
-   ethernet? (
-   net-libs/libpcap
-   sys-libs/libcap
-   )
-   ffmpeg? (  1 )) &&
-   xform="/^x/s/\$/.${MULTIBUILD_VARIANT}/"
-
-   vice-multi_enable() {
-   if [[ ${MULTIBUILD_VARIANT} == ${1} ]]; then
-   echo --enable-${2}
-   else
-   echo --disable-${2}
-   fi
-   }
-
-   local econfargs=(
-   --program-transform-name="${xform}"
-   $(vice-multi_enable gtk desktop-files)
-   $(vice-multi_enable gtk native-gtk3ui)
-   $(vice-multi_enable headless headlessui)
-   $(vice-multi_enable sdl sdlui2)
-   $(usex debug $(vice-multi_enable gtk debug-gtk3ui) 
--disable-debug-gtk3ui)
-   $(use_enable cpuhistory)
-   $(use_enable debug)
-   $(use_enable doc pdf-docs)
-   $(use_enable ethernet)
-   $(use_enable ffmpeg external-ffmpeg)
-   $(use_enable lame)
-   $(use_enable openmp)
-   $(use_enable parport libieee1284)
-   $(use_enable portaudio)
-   $(use_with alsa)
-   $(use_with flac)
-   $(use_with gif)
-   $(use_with jpeg)
-   $(use_with mpg123)
-   $(use_with ogg vorbis)
-   $(use_with oss)
-   $(use_with png)
-   $(use_with pulseaudio pulse)
-   $(use_with zlib)
-   $(usex alsa --enable-midi $(use_enable oss midi))
-   $(usev !pci ac_cv_header_pci_pci_h=no)
-   --disable-arch
-   --disable-sdlui
-   ac_cv_lib_ungif_EGifPutLine=no # ensure use giflib, not ungif
-
-   # $(use_with curl libcurl) # new in 3.6 but is a unused 
placeholder
-   # --enable-io-simulation # likewise
-   )
-
-   econf "${econfargs[@]}"
-}
-
-src_compile() {
-   multibuild_foreach_variant run_in_build_dir emake
-}
-

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Ionen Wolkens]

commit: 320297ba27de455d27e91b8108789f9b05ab566f
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Jan 26 12:24:09 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Jan 26 15:12:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=320297ba

app-emulation/vice: stabilize 3.7.1 for amd64, x86

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/vice/vice-3.7.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/vice/vice-3.7.1.ebuild 
b/app-emulation/vice/vice-3.7.1.ebuild
index f091da7b7b74..d969df0c0f68 100644
--- a/app-emulation/vice/vice-3.7.1.ebuild
+++ b/app-emulation/vice/vice-3.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="
alsa debug doc ethernet ffmpeg flac gif +gtk headless lame mpg123
ogg openmp oss parport pci png portaudio pulseaudio sdl zlib"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Ionen Wolkens]

commit: a2b5587ff4950188448a8a0c6df1d72f7271309f
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Dec 29 16:04:15 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Dec 29 20:28:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2b5587f

app-emulation/vice: drop 3.7

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/vice/Manifest|   1 -
 app-emulation/vice/vice-3.7.ebuild | 189 -
 2 files changed, 190 deletions(-)

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index d250f3984db3..253f1141e157 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,3 +1,2 @@
 DIST vice-3.6.1.tar.gz 11454300 BLAKE2B 
129171380f3bd23d579dc29a96419446169cf9a98d2fec82951fa192914846053d213a19b395c9ca30596859cce35bcfea0de0c0a7461c45cb38511a546ca4b2
 SHA512 
9aeb1c84dc71976d12a9907d60c637ec4cc938aad103340b70a13906bbf2bebab579edc78221c7fba47f0750be3f9ded947200b42fcfc8a9169fb4bb9f288cb7
 DIST vice-3.7.1.tar.gz 13444946 BLAKE2B 
64ac82c118cd1e515d7677d3f60d3b19dbf19319d8505321c46c2adb92414193784a036e2f6fa0ce5f55f1e4f425f45026ce152ee866b72ad6557531faaf5797
 SHA512 
80f81dd4d163cc5030eee2908b274bce4f3f21a3adb6d01559f4695d58b27ebc7b7570d8896718dfe74b2f2e4983ed3f9c4919b6e81934063d344b543b081f30
-DIST vice-3.7.tar.gz 13442624 BLAKE2B 
1723db7370e4fbc84148edc6b29f8ad08b153272a8306083add2e412659d7c2178e03372cffde4a3674368b8c4ed6ffd43e37bda158ec97969b400a351e47f7b
 SHA512 
d86157880925070198b482292fa93a98280932824f723df2e62e2b7f7c54f924047bad46d18340ed6e0ce9fc9a786a6cc88f6a1e8433046ab9dec8a638c26b13

diff --git a/app-emulation/vice/vice-3.7.ebuild 
b/app-emulation/vice/vice-3.7.ebuild
deleted file mode 100644
index f091da7b7b74..
--- a/app-emulation/vice/vice-3.7.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multibuild toolchain-funcs xdg
-
-DESCRIPTION="Versatile Commodore Emulator"
-HOMEPAGE="https://vice-emu.sourceforge.io/;
-SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="
-   alsa debug doc ethernet ffmpeg flac gif +gtk headless lame mpg123
-   ogg openmp oss parport pci png portaudio pulseaudio sdl zlib"
-REQUIRED_USE="
-   || ( gtk headless sdl )
-   gtk? ( zlib )"
-
-# ffmpeg/lame are loaded by dlopen(), keeping := to rebuild with same headers
-# (see bug #834359 for the ffmpeg upper bound)
-RDEPEND="
-   virtual/libintl
-   alsa? ( media-libs/alsa-lib )
-   ethernet? (
-   net-libs/libpcap
-   sys-libs/libcap
-   )
-   ffmpeg? ( =app-accessibility/at-spi2-core-2.46:2
-   dev-libs/glib:2
-   media-libs/fontconfig:1.0
-   media-libs/glew:0=
-   sys-libs/readline:=
-   virtual/opengl
-   x11-libs/cairo
-   x11-libs/gdk-pixbuf:2
-   x11-libs/gtk+:3[X]
-   x11-libs/libX11
-   x11-libs/pango
-   )
-   lame? ( media-sound/lame )
-   mpg123? ( media-sound/mpg123 )
-   ogg? (
-   media-libs/libogg
-   media-libs/libvorbis
-   )
-   parport? ( sys-libs/libieee1284 )
-   pci? ( sys-apps/pciutils )
-   png? ( media-libs/libpng:= )
-   portaudio? ( media-libs/portaudio )
-   pulseaudio? ( || ( media-libs/libpulse media-sound/pulseaudio ) )
-   sdl? (
-   media-libs/libsdl2[video]
-   media-libs/sdl2-image
-   sys-libs/readline:=
-   )
-   zlib? ( sys-libs/zlib:= )"
-DEPEND="
-   ${RDEPEND}
-   x11-base/xorg-proto"
-BDEPEND="
-   app-arch/unzip
-   app-text/dos2unix
-   dev-embedded/xa
-   dev-lang/perl
-   sys-apps/texinfo
-   sys-devel/flex
-   sys-devel/gettext
-   virtual/pkgconfig
-   app-alternatives/yacc
-   doc? ( virtual/texi2dvi )
-   gtk? ( x11-misc/xdg-utils )"
-
-pkg_pretend() {
-   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-   default
-
-   # Strip the predefined C(XX)FLAGS.
-   sed -i -r 's:(VICE_C(XX)?FLAGS=)"[^$]+":\1:' configure || die
-
-   MULTIBUILD_VARIANTS=(
-   $(usev gtk)
-   $(usev headless)
-   $(usev sdl)
-   )
-
-   # Debug build currently broken without copy sources.
-   multibuild_copy_sources
-}
-
-src_configure() {
-   tc-export AR
-
-   multibuild_foreach_variant run_in_build_dir multibuild_src_configure
-}
-
-multibuild_src_configure() {
-   # Append ".variant" to x* programs if building multiple variants.
-   local xform
-   (( ${#MULTIBUILD_VARIANTS[@]} > 1 )) &&
-   

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Ionen Wolkens]

commit: 38531ad6598d88264a238301e39efd9bc663eba4
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Dec 28 12:12:34 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Dec 28 12:17:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38531ad6

app-emulation/vice: add 3.7.1

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/vice/Manifest  |   1 +
 app-emulation/vice/vice-3.7.1.ebuild | 189 +++
 2 files changed, 190 insertions(+)

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 6f0b856e1933..d250f3984db3 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,2 +1,3 @@
 DIST vice-3.6.1.tar.gz 11454300 BLAKE2B 
129171380f3bd23d579dc29a96419446169cf9a98d2fec82951fa192914846053d213a19b395c9ca30596859cce35bcfea0de0c0a7461c45cb38511a546ca4b2
 SHA512 
9aeb1c84dc71976d12a9907d60c637ec4cc938aad103340b70a13906bbf2bebab579edc78221c7fba47f0750be3f9ded947200b42fcfc8a9169fb4bb9f288cb7
+DIST vice-3.7.1.tar.gz 13444946 BLAKE2B 
64ac82c118cd1e515d7677d3f60d3b19dbf19319d8505321c46c2adb92414193784a036e2f6fa0ce5f55f1e4f425f45026ce152ee866b72ad6557531faaf5797
 SHA512 
80f81dd4d163cc5030eee2908b274bce4f3f21a3adb6d01559f4695d58b27ebc7b7570d8896718dfe74b2f2e4983ed3f9c4919b6e81934063d344b543b081f30
 DIST vice-3.7.tar.gz 13442624 BLAKE2B 
1723db7370e4fbc84148edc6b29f8ad08b153272a8306083add2e412659d7c2178e03372cffde4a3674368b8c4ed6ffd43e37bda158ec97969b400a351e47f7b
 SHA512 
d86157880925070198b482292fa93a98280932824f723df2e62e2b7f7c54f924047bad46d18340ed6e0ce9fc9a786a6cc88f6a1e8433046ab9dec8a638c26b13

diff --git a/app-emulation/vice/vice-3.7.1.ebuild 
b/app-emulation/vice/vice-3.7.1.ebuild
new file mode 100644
index ..f091da7b7b74
--- /dev/null
+++ b/app-emulation/vice/vice-3.7.1.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multibuild toolchain-funcs xdg
+
+DESCRIPTION="Versatile Commodore Emulator"
+HOMEPAGE="https://vice-emu.sourceforge.io/;
+SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="
+   alsa debug doc ethernet ffmpeg flac gif +gtk headless lame mpg123
+   ogg openmp oss parport pci png portaudio pulseaudio sdl zlib"
+REQUIRED_USE="
+   || ( gtk headless sdl )
+   gtk? ( zlib )"
+
+# ffmpeg/lame are loaded by dlopen(), keeping := to rebuild with same headers
+# (see bug #834359 for the ffmpeg upper bound)
+RDEPEND="
+   virtual/libintl
+   alsa? ( media-libs/alsa-lib )
+   ethernet? (
+   net-libs/libpcap
+   sys-libs/libcap
+   )
+   ffmpeg? ( =app-accessibility/at-spi2-core-2.46:2
+   dev-libs/glib:2
+   media-libs/fontconfig:1.0
+   media-libs/glew:0=
+   sys-libs/readline:=
+   virtual/opengl
+   x11-libs/cairo
+   x11-libs/gdk-pixbuf:2
+   x11-libs/gtk+:3[X]
+   x11-libs/libX11
+   x11-libs/pango
+   )
+   lame? ( media-sound/lame )
+   mpg123? ( media-sound/mpg123 )
+   ogg? (
+   media-libs/libogg
+   media-libs/libvorbis
+   )
+   parport? ( sys-libs/libieee1284 )
+   pci? ( sys-apps/pciutils )
+   png? ( media-libs/libpng:= )
+   portaudio? ( media-libs/portaudio )
+   pulseaudio? ( || ( media-libs/libpulse media-sound/pulseaudio ) )
+   sdl? (
+   media-libs/libsdl2[video]
+   media-libs/sdl2-image
+   sys-libs/readline:=
+   )
+   zlib? ( sys-libs/zlib:= )"
+DEPEND="
+   ${RDEPEND}
+   x11-base/xorg-proto"
+BDEPEND="
+   app-arch/unzip
+   app-text/dos2unix
+   dev-embedded/xa
+   dev-lang/perl
+   sys-apps/texinfo
+   sys-devel/flex
+   sys-devel/gettext
+   virtual/pkgconfig
+   app-alternatives/yacc
+   doc? ( virtual/texi2dvi )
+   gtk? ( x11-misc/xdg-utils )"
+
+pkg_pretend() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+   default
+
+   # Strip the predefined C(XX)FLAGS.
+   sed -i -r 's:(VICE_C(XX)?FLAGS=)"[^$]+":\1:' configure || die
+
+   MULTIBUILD_VARIANTS=(
+   $(usev gtk)
+   $(usev headless)
+   $(usev sdl)
+   )
+
+   # Debug build currently broken without copy sources.
+   multibuild_copy_sources
+}
+
+src_configure() {
+   tc-export AR
+
+   multibuild_foreach_variant run_in_build_dir multibuild_src_configure
+}
+
+multibuild_src_configure() {
+   # Append ".variant" to x* programs if building multiple variants.
+   local xform
+   (( ${#MULTIBUILD_VARIANTS[@]} > 1 )) &&
+   

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Ionen Wolkens]

commit: c3fcffdf3e1a9c54fba9f664c6f11bb194f9986e
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Dec 26 11:07:07 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Dec 26 13:32:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3fcffdf

app-emulation/vice: add 3.7

ebuild changes:
- drop IUSE=cpuhistory, new upstream default is enabled and just
  going with that (no deps, and impact should be minimal)
- drop IUSE=jpeg, upstream removed support
- drop --disable-static QA, not an issue with current portage and
  just harmless noise if still using an older one
- replace deprecated atk dep
- adjust for renamed configure options
(may be some oversights given a lot of noise in build system changes).

Upstream disabled catweasel/parsid/ssi2001 by default leaving only
hardsid enabled out of this group. Given rather obscure, left disabled
for now with the exception of parsid enabled with USE=parport. If
someone use/know these and feel may make sense to enable with USE=pci,
parport, or their own USE please file a bug.

wrt bug #834359, unfortunately still broken and upstream instead
added an explicit check:
configure: error: ffmpeg version is not compatible. Use 4.x
So keeping the https://bugs.gentoo.org/834359
Closes: https://bugs.gentoo.org/854537
Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/vice/Manifest|   1 +
 app-emulation/vice/vice-3.7.ebuild | 189 +
 2 files changed, 190 insertions(+)

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index ffc8aa7514d5..6f0b856e1933 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1 +1,2 @@
 DIST vice-3.6.1.tar.gz 11454300 BLAKE2B 
129171380f3bd23d579dc29a96419446169cf9a98d2fec82951fa192914846053d213a19b395c9ca30596859cce35bcfea0de0c0a7461c45cb38511a546ca4b2
 SHA512 
9aeb1c84dc71976d12a9907d60c637ec4cc938aad103340b70a13906bbf2bebab579edc78221c7fba47f0750be3f9ded947200b42fcfc8a9169fb4bb9f288cb7
+DIST vice-3.7.tar.gz 13442624 BLAKE2B 
1723db7370e4fbc84148edc6b29f8ad08b153272a8306083add2e412659d7c2178e03372cffde4a3674368b8c4ed6ffd43e37bda158ec97969b400a351e47f7b
 SHA512 
d86157880925070198b482292fa93a98280932824f723df2e62e2b7f7c54f924047bad46d18340ed6e0ce9fc9a786a6cc88f6a1e8433046ab9dec8a638c26b13

diff --git a/app-emulation/vice/vice-3.7.ebuild 
b/app-emulation/vice/vice-3.7.ebuild
new file mode 100644
index ..f091da7b7b74
--- /dev/null
+++ b/app-emulation/vice/vice-3.7.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multibuild toolchain-funcs xdg
+
+DESCRIPTION="Versatile Commodore Emulator"
+HOMEPAGE="https://vice-emu.sourceforge.io/;
+SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="
+   alsa debug doc ethernet ffmpeg flac gif +gtk headless lame mpg123
+   ogg openmp oss parport pci png portaudio pulseaudio sdl zlib"
+REQUIRED_USE="
+   || ( gtk headless sdl )
+   gtk? ( zlib )"
+
+# ffmpeg/lame are loaded by dlopen(), keeping := to rebuild with same headers
+# (see bug #834359 for the ffmpeg upper bound)
+RDEPEND="
+   virtual/libintl
+   alsa? ( media-libs/alsa-lib )
+   ethernet? (
+   net-libs/libpcap
+   sys-libs/libcap
+   )
+   ffmpeg? ( =app-accessibility/at-spi2-core-2.46:2
+   dev-libs/glib:2
+   media-libs/fontconfig:1.0
+   media-libs/glew:0=
+   sys-libs/readline:=
+   virtual/opengl
+   x11-libs/cairo
+   x11-libs/gdk-pixbuf:2
+   x11-libs/gtk+:3[X]
+   x11-libs/libX11
+   x11-libs/pango
+   )
+   lame? ( media-sound/lame )
+   mpg123? ( media-sound/mpg123 )
+   ogg? (
+   media-libs/libogg
+   media-libs/libvorbis
+   )
+   parport? ( sys-libs/libieee1284 )
+   pci? ( sys-apps/pciutils )
+   png? ( media-libs/libpng:= )
+   portaudio? ( media-libs/portaudio )
+   pulseaudio? ( || ( media-libs/libpulse media-sound/pulseaudio ) )
+   sdl? (
+   media-libs/libsdl2[video]
+   media-libs/sdl2-image
+   sys-libs/readline:=
+   )
+   zlib? ( sys-libs/zlib:= )"
+DEPEND="
+   ${RDEPEND}
+   x11-base/xorg-proto"
+BDEPEND="
+   app-arch/unzip
+   app-text/dos2unix
+   dev-embedded/xa
+   dev-lang/perl
+   sys-apps/texinfo
+   sys-devel/flex
+   sys-devel/gettext
+   virtual/pkgconfig
+   app-alternatives/yacc
+   doc? ( virtual/texi2dvi )
+   gtk? ( x11-misc/xdg-utils )"
+
+pkg_pretend() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Sam James]

commit: 07b733276117038b6c23d1fb89bd48571c49aded
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 29 19:41:29 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 29 19:41:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07b73327

app-emulation/vice: Keyword 3.6.1-r2 arm, #861008

Signed-off-by: Sam James  gentoo.org>

 app-emulation/vice/vice-3.6.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/vice/vice-3.6.1-r2.ebuild 
b/app-emulation/vice/vice-3.6.1-r2.ebuild
index 2374e9497e2d..a6f84bd6d1b2 100644
--- a/app-emulation/vice/vice-3.6.1-r2.ebuild
+++ b/app-emulation/vice/vice-3.6.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="
alsa cpuhistory debug doc ethernet ffmpeg flac gif +gtk headless jpeg
lame mpg123 ogg openmp oss parport pci png portaudio pulseaudio sdl 
zlib"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Arthur Zamarin]

commit: 6e8dcf3e290ca1b0cb86f3ec3ee61c8ff5ffc924
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jul 29 17:52:33 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jul 29 17:52:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e8dcf3e

app-emulation/vice: Keyword 3.6.1-r1 arm64, #861008

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-emulation/vice/vice-3.6.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/vice/vice-3.6.1-r1.ebuild 
b/app-emulation/vice/vice-3.6.1-r1.ebuild
index 3c1ee81f612c..062c915c58a2 100644
--- a/app-emulation/vice/vice-3.6.1-r1.ebuild
+++ b/app-emulation/vice/vice-3.6.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="
alsa cpuhistory debug doc ethernet ffmpeg flac gif +gtk headless jpeg
lame mpg123 ogg openmp oss parport pci png portaudio pulseaudio sdl 
zlib"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Ionen Wolkens]

commit: 03617de53c60d511577d5f5a63043fc0f405f897
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Jul 26 01:09:38 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Jul 26 01:38:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03617de5

app-emulation/vice: EAPI7->8

Been meaning to clean this up after realizing could use QA_ for
--disable-static. Also update jpeg/pulseaudio deps while revbumping.
Trivial so straight-to-stable'ing.

Signed-off-by: Ionen Wolkens  gentoo.org>

 .../vice/{vice-3.6.1.ebuild => vice-3.6.1-r1.ebuild} | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app-emulation/vice/vice-3.6.1.ebuild 
b/app-emulation/vice/vice-3.6.1-r1.ebuild
similarity index 94%
rename from app-emulation/vice/vice-3.6.1.ebuild
rename to app-emulation/vice/vice-3.6.1-r1.ebuild
index dcefe70a8de1..3c1ee81f612c 100644
--- a/app-emulation/vice/vice-3.6.1.ebuild
+++ b/app-emulation/vice/vice-3.6.1-r1.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# --enable-static-lame triggers bug #814380 with EAPI-8, could work
-# around but staying EAPI-7 for now unless there's some urgency
-EAPI=7
+EAPI=8
 
 inherit multibuild toolchain-funcs xdg
 
@@ -46,7 +44,7 @@ RDEPEND="
x11-libs/libX11
x11-libs/pango
)
-   jpeg? ( virtual/jpeg )
+   jpeg? ( media-libs/libjpeg-turbo:= )
lame? ( media-sound/lame )
mpg123? ( media-sound/mpg123 )
ogg? (
@@ -57,7 +55,7 @@ RDEPEND="
pci? ( sys-apps/pciutils )
png? ( media-libs/libpng:= )
portaudio? ( media-libs/portaudio )
-   pulseaudio? ( media-sound/pulseaudio )
+   pulseaudio? ( || ( media-libs/libpulse media-sound/pulseaudio ) )
sdl? (
media-libs/libsdl2[video]
media-libs/sdl2-image
@@ -80,6 +78,8 @@ BDEPEND="
doc? ( virtual/texi2dvi )
gtk? ( x11-misc/xdg-utils )"
 
+QA_CONFIGURE_OPTIONS="--disable-static" #814380
+
 pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
@@ -151,7 +151,7 @@ multibuild_src_configure() {
$(use_with pulseaudio pulse)
$(use_with zlib)
$(usex alsa --enable-midi $(use_enable oss midi))
-   $(usex pci '' ac_cv_header_pci_pci_h=no)
+   $(usev !pci ac_cv_header_pci_pci_h=no)
--disable-arch
--disable-sdlui
ac_cv_lib_ungif_EGifPutLine=no # ensure use giflib, not ungif

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Ionen Wolkens]

commit: 976c56bc20456ecd63ea64a046c7940dedbf26c8
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Feb 28 10:56:05 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Feb 28 11:26:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=976c56bc

app-emulation/vice: depend on https://bugs.gentoo.org/834359
Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/vice/vice-3.6.1.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-emulation/vice/vice-3.6.1.ebuild 
b/app-emulation/vice/vice-3.6.1.ebuild
index 08ab94f0564e..dcefe70a8de1 100644
--- a/app-emulation/vice/vice-3.6.1.ebuild
+++ b/app-emulation/vice/vice-3.6.1.ebuild
@@ -22,6 +22,7 @@ REQUIRED_USE="
gtk? ( zlib )"
 
 # ffmpeg/lame are loaded by dlopen(), keeping := to rebuild with same headers
+# see bug #834359 for the ffmpeg upper bound
 RDEPEND="
virtual/libintl
alsa? ( media-libs/alsa-lib )
@@ -29,7 +30,7 @@ RDEPEND="
net-libs/libpcap
sys-libs/libcap
)
-   ffmpeg? ( media-video/ffmpeg:= )
+   ffmpeg? ( 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Ionen Wolkens]

commit: 7773cc122a9fbd0fa23c41c6be39c3804f27a4d1
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Feb  5 22:25:48 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Feb  5 23:37:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7773cc12

app-emulation/vice: drop 3.5-r1, 3.6

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/vice/Manifest   |   2 -
 app-emulation/vice/vice-3.5-r1.ebuild | 176 ---
 app-emulation/vice/vice-3.6.ebuild| 193 --
 3 files changed, 371 deletions(-)

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 85a4736dd3bd..ffc8aa7514d5 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,3 +1 @@
-DIST vice-3.5.tar.gz 22557578 BLAKE2B 
5573951052c2c7b2beb4dd194ad8612c53e484e47a4d935e0dbc880f2f06611252add3631f99c9656f2c941088d0147b0783020ffcc5a29505bab75ef8dc128e
 SHA512 
02f364c1645138cacb461346d44de8f524fb2aba7d980181caf039c46ca9d30db98466e5b0e56e6a41417cd7bbd63d73bf6eb110af1271e23732e320dd1fab70
 DIST vice-3.6.1.tar.gz 11454300 BLAKE2B 
129171380f3bd23d579dc29a96419446169cf9a98d2fec82951fa192914846053d213a19b395c9ca30596859cce35bcfea0de0c0a7461c45cb38511a546ca4b2
 SHA512 
9aeb1c84dc71976d12a9907d60c637ec4cc938aad103340b70a13906bbf2bebab579edc78221c7fba47f0750be3f9ded947200b42fcfc8a9169fb4bb9f288cb7
-DIST vice-3.6.tar.gz 11389599 BLAKE2B 
6ebf0a235f059cd4b4a6408e32657babfb1d8bd15c101764ea05224830caf1f53807434b7556ea2aa494e7fcc8f8f19b44e9202572679e76f0a147f52941575a
 SHA512 
4e17ccf6b57a26cb439549fe0e9097045aaf78b3a291df8b47e16bf54c585194d38961a7d17d0c1c9e76e6e2aea7aa6e513cfcdbe9802363f2d885e9fb50bee9

diff --git a/app-emulation/vice/vice-3.5-r1.ebuild 
b/app-emulation/vice/vice-3.5-r1.ebuild
deleted file mode 100644
index feb7dc528716..
--- a/app-emulation/vice/vice-3.5-r1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multibuild toolchain-funcs xdg
-
-DESCRIPTION="The Versatile Commodore Emulator"
-HOMEPAGE="https://vice-emu.sourceforge.io/;
-SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="
-   alsa cpuhistory debug doc ethernet ffmpeg flac gif +gtk headless jpeg
-   lame mpg123 ogg oss parport pci png portaudio pulseaudio sdl zlib"
-REQUIRED_USE="
-   || ( gtk headless sdl )
-   gtk? ( zlib )"
-
-RDEPEND="
-   sys-libs/readline:=
-   virtual/libintl
-   alsa? ( media-libs/alsa-lib )
-   ethernet? (
-   net-libs/libnet:1.1
-   net-libs/libpcap
-   )
-   ffmpeg? ( media-video/ffmpeg:= )
-   flac? ( media-libs/flac )
-   gif? ( media-libs/giflib:= )
-   gtk? (
-   dev-libs/atk
-   dev-libs/glib:2
-   media-libs/fontconfig:1.0
-   media-libs/glew:0=
-   virtual/opengl
-   x11-libs/cairo
-   x11-libs/gdk-pixbuf:2
-   x11-libs/gtk+:3[X]
-   x11-libs/libX11
-   x11-libs/pango
-   )
-   jpeg? ( virtual/jpeg )
-   lame? ( media-sound/lame )
-   mpg123? ( media-sound/mpg123 )
-   ogg? (
-   media-libs/libogg
-   media-libs/libvorbis
-   )
-   parport? ( sys-libs/libieee1284 )
-   pci? ( sys-apps/pciutils )
-   png? ( media-libs/libpng:= )
-   portaudio? ( media-libs/portaudio )
-   pulseaudio? ( media-sound/pulseaudio )
-   sdl? (
-   media-libs/libsdl2[video]
-   media-libs/sdl2-image
-   )
-   zlib? ( sys-libs/zlib:= )"
-DEPEND="
-   ${RDEPEND}
-   x11-base/xorg-proto"
-BDEPEND="
-   app-arch/unzip
-   app-text/dos2unix
-   dev-embedded/xa
-   dev-lang/perl
-   sys-apps/texinfo
-   sys-devel/flex
-   sys-devel/gettext
-   virtual/pkgconfig
-   virtual/yacc
-   doc? ( virtual/texi2dvi )
-   gtk? ( x11-misc/xdg-utils )"
-
-src_prepare() {
-   default
-
-   # Delete some bundled libraries.
-   rm -r src/lib/lib{ffmpeg,lame,x264} || die
-
-   # Strip the predefined C(XX)FLAGS.
-   sed -i -r 's:(VICE_C(XX)?FLAGS=)"[^$]+":\1:' configure || die
-
-   MULTIBUILD_VARIANTS=(
-   $(usev gtk)
-   $(usev headless)
-   $(usev sdl)
-   )
-
-   # Debug build currently broken without copy sources.
-   multibuild_copy_sources
-}
-
-src_configure() {
-   tc-export AR
-
-   multibuild_foreach_variant run_in_build_dir multibuild_src_configure
-}
-
-multibuild_src_configure() {
-   # Append ".variant" to x* programs if building multiple variants.
-   local xform
-   if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
-   xform="/^x/s/\$/.${MULTIBUILD_VARIANT}/"
-   fi
-
-   

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Ionen Wolkens]

commit: 1bf34cc3616f7ee1e1a63d4b109c40276d155397
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Feb  3 11:13:28 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Feb  3 11:16:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bf34cc3

app-emulation/vice: stabilize 3.6.1 for amd64, x86

Simple bugfix release.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/vice/vice-3.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/vice/vice-3.6.1.ebuild 
b/app-emulation/vice/vice-3.6.1.ebuild
index f5a55faac561..08ab94f0564e 100644
--- a/app-emulation/vice/vice-3.6.1.ebuild
+++ b/app-emulation/vice/vice-3.6.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="
alsa cpuhistory debug doc ethernet ffmpeg flac gif +gtk headless jpeg
lame mpg123 ogg openmp oss parport pci png portaudio pulseaudio sdl 
zlib"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Ionen Wolkens]

commit: ced2f03b4bc24c98196a69c8f45ac1ebac50c2ef
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Jan 26 03:05:31 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Jan 26 03:23:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ced2f03b

app-emulation/vice: add 3.6.1

Should've went with this bugfix release for next stable,
giving it a few days and will fast stable. Nothing major
but fixes some regressions/annoyance introduced in 3.6.0.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/vice/Manifest  |   1 +
 app-emulation/vice/vice-3.6.1.ebuild | 192 +++
 2 files changed, 193 insertions(+)

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 2a9c3ab60ae6..85a4736dd3bd 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,2 +1,3 @@
 DIST vice-3.5.tar.gz 22557578 BLAKE2B 
5573951052c2c7b2beb4dd194ad8612c53e484e47a4d935e0dbc880f2f06611252add3631f99c9656f2c941088d0147b0783020ffcc5a29505bab75ef8dc128e
 SHA512 
02f364c1645138cacb461346d44de8f524fb2aba7d980181caf039c46ca9d30db98466e5b0e56e6a41417cd7bbd63d73bf6eb110af1271e23732e320dd1fab70
+DIST vice-3.6.1.tar.gz 11454300 BLAKE2B 
129171380f3bd23d579dc29a96419446169cf9a98d2fec82951fa192914846053d213a19b395c9ca30596859cce35bcfea0de0c0a7461c45cb38511a546ca4b2
 SHA512 
9aeb1c84dc71976d12a9907d60c637ec4cc938aad103340b70a13906bbf2bebab579edc78221c7fba47f0750be3f9ded947200b42fcfc8a9169fb4bb9f288cb7
 DIST vice-3.6.tar.gz 11389599 BLAKE2B 
6ebf0a235f059cd4b4a6408e32657babfb1d8bd15c101764ea05224830caf1f53807434b7556ea2aa494e7fcc8f8f19b44e9202572679e76f0a147f52941575a
 SHA512 
4e17ccf6b57a26cb439549fe0e9097045aaf78b3a291df8b47e16bf54c585194d38961a7d17d0c1c9e76e6e2aea7aa6e513cfcdbe9802363f2d885e9fb50bee9

diff --git a/app-emulation/vice/vice-3.6.1.ebuild 
b/app-emulation/vice/vice-3.6.1.ebuild
new file mode 100644
index ..f5a55faac561
--- /dev/null
+++ b/app-emulation/vice/vice-3.6.1.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# --enable-static-lame triggers bug #814380 with EAPI-8, could work
+# around but staying EAPI-7 for now unless there's some urgency
+EAPI=7
+
+inherit multibuild toolchain-funcs xdg
+
+DESCRIPTION="The Versatile Commodore Emulator"
+HOMEPAGE="https://vice-emu.sourceforge.io/;
+SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="
+   alsa cpuhistory debug doc ethernet ffmpeg flac gif +gtk headless jpeg
+   lame mpg123 ogg openmp oss parport pci png portaudio pulseaudio sdl 
zlib"
+REQUIRED_USE="
+   || ( gtk headless sdl )
+   gtk? ( zlib )"
+
+# ffmpeg/lame are loaded by dlopen(), keeping := to rebuild with same headers
+RDEPEND="
+   virtual/libintl
+   alsa? ( media-libs/alsa-lib )
+   ethernet? (
+   net-libs/libpcap
+   sys-libs/libcap
+   )
+   ffmpeg? ( media-video/ffmpeg:= )
+   flac? ( media-libs/flac )
+   gif? ( media-libs/giflib:= )
+   gtk? (
+   dev-libs/atk
+   dev-libs/glib:2
+   media-libs/fontconfig:1.0
+   media-libs/glew:0=
+   sys-libs/readline:=
+   virtual/opengl
+   x11-libs/cairo
+   x11-libs/gdk-pixbuf:2
+   x11-libs/gtk+:3[X]
+   x11-libs/libX11
+   x11-libs/pango
+   )
+   jpeg? ( virtual/jpeg )
+   lame? ( media-sound/lame )
+   mpg123? ( media-sound/mpg123 )
+   ogg? (
+   media-libs/libogg
+   media-libs/libvorbis
+   )
+   parport? ( sys-libs/libieee1284 )
+   pci? ( sys-apps/pciutils )
+   png? ( media-libs/libpng:= )
+   portaudio? ( media-libs/portaudio )
+   pulseaudio? ( media-sound/pulseaudio )
+   sdl? (
+   media-libs/libsdl2[video]
+   media-libs/sdl2-image
+   sys-libs/readline:=
+   )
+   zlib? ( sys-libs/zlib:= )"
+DEPEND="
+   ${RDEPEND}
+   x11-base/xorg-proto"
+BDEPEND="
+   app-arch/unzip
+   app-text/dos2unix
+   dev-embedded/xa
+   dev-lang/perl
+   sys-apps/texinfo
+   sys-devel/flex
+   sys-devel/gettext
+   virtual/pkgconfig
+   virtual/yacc
+   doc? ( virtual/texi2dvi )
+   gtk? ( x11-misc/xdg-utils )"
+
+pkg_pretend() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+   default
+
+   # Strip the predefined C(XX)FLAGS.
+   sed -i -r 's:(VICE_C(XX)?FLAGS=)"[^$]+":\1:' configure || die
+
+   MULTIBUILD_VARIANTS=(
+   $(usev gtk)
+   $(usev headless)
+   $(usev sdl)
+   )
+
+   # Debug build currently broken without 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Ionen Wolkens]

commit: 17d2de4ae99f84f6160f7cfade7f373d948ba997
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Jan 25 23:19:29 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Jan 26 00:57:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17d2de4a

app-emulation/vice: stabilize 3.6 for amd64, x86

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/vice/vice-3.6.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/vice/vice-3.6.ebuild 
b/app-emulation/vice/vice-3.6.ebuild
index d438d6439750..bd83effcd4fd 100644
--- a/app-emulation/vice/vice-3.6.ebuild
+++ b/app-emulation/vice/vice-3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # --enable-static-lame triggers bug #814380 with EAPI-8, could work
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}.0"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="
alsa cpuhistory debug doc ethernet ffmpeg flac gif +gtk headless jpeg
lame mpg123 ogg openmp oss parport pci png portaudio pulseaudio sdl 
zlib"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Ionen Wolkens]

commit: 2cdbb76393f878af29230df16d20b1ba91286531
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Dec 26 19:34:23 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Dec 26 23:39:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cdbb763

app-emulation/vice: add 3.6

Upstream removed ffmpeg/lame bundled libs, they were already
unused here but options to disable them are now unnecessary.

Adds new IUSE=openmp, and new dep on libcap for IUSE=ethernet.

html docs' Makefile.am no longer sets html files to be installed,
but, while don't need the full website, the user manual is
worthwhile so install it anyway alongside the new vim syntax files.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/vice/Manifest|   1 +
 app-emulation/vice/vice-3.6.ebuild | 193 +
 2 files changed, 194 insertions(+)

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index a40919df8c44..2a9c3ab60ae6 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1 +1,2 @@
 DIST vice-3.5.tar.gz 22557578 BLAKE2B 
5573951052c2c7b2beb4dd194ad8612c53e484e47a4d935e0dbc880f2f06611252add3631f99c9656f2c941088d0147b0783020ffcc5a29505bab75ef8dc128e
 SHA512 
02f364c1645138cacb461346d44de8f524fb2aba7d980181caf039c46ca9d30db98466e5b0e56e6a41417cd7bbd63d73bf6eb110af1271e23732e320dd1fab70
+DIST vice-3.6.tar.gz 11389599 BLAKE2B 
6ebf0a235f059cd4b4a6408e32657babfb1d8bd15c101764ea05224830caf1f53807434b7556ea2aa494e7fcc8f8f19b44e9202572679e76f0a147f52941575a
 SHA512 
4e17ccf6b57a26cb439549fe0e9097045aaf78b3a291df8b47e16bf54c585194d38961a7d17d0c1c9e76e6e2aea7aa6e513cfcdbe9802363f2d885e9fb50bee9

diff --git a/app-emulation/vice/vice-3.6.ebuild 
b/app-emulation/vice/vice-3.6.ebuild
new file mode 100644
index ..d438d6439750
--- /dev/null
+++ b/app-emulation/vice/vice-3.6.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# --enable-static-lame triggers bug #814380 with EAPI-8, could work
+# around but staying EAPI-7 for now unless there's some urgency
+EAPI=7
+
+inherit multibuild toolchain-funcs xdg
+
+DESCRIPTION="The Versatile Commodore Emulator"
+HOMEPAGE="https://vice-emu.sourceforge.io/;
+SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
+S="${WORKDIR}/${P}.0"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="
+   alsa cpuhistory debug doc ethernet ffmpeg flac gif +gtk headless jpeg
+   lame mpg123 ogg openmp oss parport pci png portaudio pulseaudio sdl 
zlib"
+REQUIRED_USE="
+   || ( gtk headless sdl )
+   gtk? ( zlib )"
+
+# ffmpeg/lame are loaded by dlopen(), keeping := to rebuild with same headers
+RDEPEND="
+   virtual/libintl
+   alsa? ( media-libs/alsa-lib )
+   ethernet? (
+   net-libs/libpcap
+   sys-libs/libcap
+   )
+   ffmpeg? ( media-video/ffmpeg:= )
+   flac? ( media-libs/flac )
+   gif? ( media-libs/giflib:= )
+   gtk? (
+   dev-libs/atk
+   dev-libs/glib:2
+   media-libs/fontconfig:1.0
+   media-libs/glew:0=
+   sys-libs/readline:=
+   virtual/opengl
+   x11-libs/cairo
+   x11-libs/gdk-pixbuf:2
+   x11-libs/gtk+:3[X]
+   x11-libs/libX11
+   x11-libs/pango
+   )
+   jpeg? ( virtual/jpeg )
+   lame? ( media-sound/lame )
+   mpg123? ( media-sound/mpg123 )
+   ogg? (
+   media-libs/libogg
+   media-libs/libvorbis
+   )
+   parport? ( sys-libs/libieee1284 )
+   pci? ( sys-apps/pciutils )
+   png? ( media-libs/libpng:= )
+   portaudio? ( media-libs/portaudio )
+   pulseaudio? ( media-sound/pulseaudio )
+   sdl? (
+   media-libs/libsdl2[video]
+   media-libs/sdl2-image
+   sys-libs/readline:=
+   )
+   zlib? ( sys-libs/zlib:= )"
+DEPEND="
+   ${RDEPEND}
+   x11-base/xorg-proto"
+BDEPEND="
+   app-arch/unzip
+   app-text/dos2unix
+   dev-embedded/xa
+   dev-lang/perl
+   sys-apps/texinfo
+   sys-devel/flex
+   sys-devel/gettext
+   virtual/pkgconfig
+   virtual/yacc
+   doc? ( virtual/texi2dvi )
+   gtk? ( x11-misc/xdg-utils )"
+
+pkg_pretend() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+   default
+
+   # Strip the predefined C(XX)FLAGS.
+   sed -i -r 's:(VICE_C(XX)?FLAGS=)"[^$]+":\1:' configure || die
+
+   MULTIBUILD_VARIANTS=(
+   $(usev gtk)
+   $(usev headless)
+   $(usev sdl)
+   )
+
+   # Debug build currently broken without copy sources.
+   multibuild_copy_sources
+}
+
+src_configure() {
+   tc-export AR
+

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/files/, app-emulation/vice/

[Ionen Wolkens]

commit: 467c3fb39b6c659d40f3b39a3e024310ea96aaed
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Oct 30 10:59:51 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Oct 30 11:11:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=467c3fb3

app-emulation/vice: drop 3.4_p38553

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/vice/Manifest|   1 -
 .../vice/files/vice-pkg-config-3.4_p38553.patch|  29 
 app-emulation/vice/vice-3.4_p38553.ebuild  | 185 -
 3 files changed, 215 deletions(-)

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 6d59125ff4d..a40919df8c4 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,2 +1 @@
 DIST vice-3.5.tar.gz 22557578 BLAKE2B 
5573951052c2c7b2beb4dd194ad8612c53e484e47a4d935e0dbc880f2f06611252add3631f99c9656f2c941088d0147b0783020ffcc5a29505bab75ef8dc128e
 SHA512 
02f364c1645138cacb461346d44de8f524fb2aba7d980181caf039c46ca9d30db98466e5b0e56e6a41417cd7bbd63d73bf6eb110af1271e23732e320dd1fab70
-DIST vice-emu-code-r38553-trunk-vice.zip 27146846 BLAKE2B 
5139e4b1e9269c3885313889dffc055298c52152da77e5a824270feb0af6ba61a1726160a6d259e9f8840fefe486cc184f5bfda3ba1797e0359159ccf1e9824f
 SHA512 
c4d3f132bae2980163e74695126e979bd68dddecb17c2eea8227edbb675985d1f04ade665b946a5e3c707bc17e260efb61f57aa141b6ef712385d4d85a68ef86

diff --git a/app-emulation/vice/files/vice-pkg-config-3.4_p38553.patch 
b/app-emulation/vice/files/vice-pkg-config-3.4_p38553.patch
deleted file mode 100644
index 557c0a92731..000
--- a/app-emulation/vice/files/vice-pkg-config-3.4_p38553.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://sourceforge.net/p/vice-emu/patches/218/
-
-Index: configure.ac
-===
 a/configure.ac (revision 38502)
-+++ b/configure.ac (working copy)
-@@ -1275,6 +1275,14 @@
-   fi
- 
-   if test x"$found_sdl2" != "xyes"; then
-+PKG_CHECK_MODULES(SDL2, sdl2, [
-+  use_sdl_prefix=no
-+  use_sdl2_prefix=no
-+  found_sdl2=yes
-+  VICE_CFLAGS="$VICE_CFLAGS $SDL2_CFLAGS"
-+  VICE_CXXFLAGS="$VICE_CXXFLAGS $SDL2_CFLAGS"
-+  LIBS="$LIBS $SDL2_LIBS"
-+], [
- dnl Check for sdl2-config
- if test x"$sdl2_config" != "xno"; then
-   user_CFLAGS="$CFLAGS"
-@@ -1311,6 +1319,7 @@
-   CFLAGS="$user_CFLAGS"
-   CXXFLAGS="$user_CXXFLAGS"
- fi
-+])
-   fi
- 
-   dnl fail if SDL2 ui was requested, otherwise restore flags and continue

diff --git a/app-emulation/vice/vice-3.4_p38553.ebuild 
b/app-emulation/vice/vice-3.4_p38553.ebuild
deleted file mode 100644
index 17bb3310b2a..000
--- a/app-emulation/vice/vice-3.4_p38553.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multibuild xdg
-
-MY_P="vice-emu-code-r${PV##*_p}-trunk-vice"
-
-DESCRIPTION="The Versatile Commodore Emulator"
-HOMEPAGE="https://vice-emu.sourceforge.io/;
-#SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
-SRC_URI="https://sourceforge.net/code-snapshots/svn/v/vi/vice-emu/code/${MY_P}.zip;
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame 
mpg123 ogg oss +opengl parport pci png portaudio pulseaudio sdl zlib"
-REQUIRED_USE="|| ( gtk headless sdl ) gtk? ( zlib )"
-
-RDEPEND="
-   sys-libs/readline:0=
-   virtual/libintl
-   alsa? ( media-libs/alsa-lib )
-   ethernet? (
-   >=net-libs/libpcap-0.9.8
-   >=net-libs/libnet-1.1.2.1:1.1
-   )
-   ffmpeg? ( media-video/ffmpeg:= )
-   flac? ( media-libs/flac )
-   gif? ( media-libs/giflib:= )
-   gtk? (
-   dev-libs/glib:2
-   media-libs/fontconfig:1.0
-   x11-libs/cairo
-   x11-libs/gtk+:3
-   x11-libs/pango
-   opengl? (
-   media-libs/glew:0=
-   virtual/opengl
-   )
-   )
-   jpeg? ( virtual/jpeg )
-   lame? ( media-sound/lame )
-   mpg123? ( media-sound/mpg123 )
-   ogg? (
-media-libs/libogg
-media-libs/libvorbis
-   )
-   parport? ( sys-libs/libieee1284 )
-   pci? ( sys-apps/pciutils )
-   png? ( media-libs/libpng:0= )
-   portaudio? ( media-libs/portaudio )
-   pulseaudio? ( media-sound/pulseaudio )
-   sdl? ( media-libs/libsdl2[video] )
-   zlib? ( sys-libs/zlib )
-"
-
-DEPEND="
-   ${RDEPEND}
-   x11-base/xorg-proto
-"
-
-BDEPEND="
-   app-arch/unzip
-   app-text/dos2unix
-   dev-embedded/xa
-   dev-lang/perl
-   sys-apps/texinfo
-   sys-devel/flex
-   sys-devel/gettext
-   virtual/pkgconfig
-   virtual/yacc
-   doc? ( virtual/texi2dvi )
-   gtk? ( 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Ionen Wolkens]

commit: 316360f6d66ebbe5f103fd4cb7c2f3db985cd3dc
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Oct 11 15:03:02 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Oct 11 18:21:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=316360f6

app-emulation/vice: stabilize 3.5-r1 for amd64, x86

Closes: https://bugs.gentoo.org/814962
Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/vice/vice-3.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/vice/vice-3.5-r1.ebuild 
b/app-emulation/vice/vice-3.5-r1.ebuild
index 625f1bce3a1..feb7dc52871 100644
--- a/app-emulation/vice/vice-3.5-r1.ebuild
+++ b/app-emulation/vice/vice-3.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="
alsa cpuhistory debug doc ethernet ffmpeg flac gif +gtk headless jpeg
lame mpg123 ogg oss parport pci png portaudio pulseaudio sdl zlib"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Ionen Wolkens]

commit: 3b47efb343930139d4eb48eeea969c02988b503e
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Oct  3 09:16:32 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Oct  3 11:17:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b47efb3

app-emulation/vice: enable midi support, tighten deps

Midi support can work either through alsa or oss,
so enable if one of these is set (no extra deps).

While revbumping for this, adjusted deps a bit
(notably fails to build without [X] on gtk+:3).

Also removed IUSE=ipv6 (enabled by default).

Not moving to EAPI-8 yet given econf tries to pass
an unrecognized --disable-static (bug #814380)

Closes: https://bugs.gentoo.org/815913
Signed-off-by: Ionen Wolkens  gentoo.org>

 .../vice/{vice-3.5.ebuild => vice-3.5-r1.ebuild}   | 58 +++---
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/app-emulation/vice/vice-3.5.ebuild 
b/app-emulation/vice/vice-3.5-r1.ebuild
similarity index 82%
rename from app-emulation/vice/vice-3.5.ebuild
rename to app-emulation/vice/vice-3.5-r1.ebuild
index 4518b5ff92f..625f1bce3a1 100644
--- a/app-emulation/vice/vice-3.5.ebuild
+++ b/app-emulation/vice/vice-3.5-r1.ebuild
@@ -13,31 +13,33 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="
-   alsa cpuhistory debug doc ethernet ffmpeg flac gif +gtk headless
-   ipv6 jpeg lame mpg123 ogg oss parport pci png portaudio pulseaudio
-   sdl zlib"
+   alsa cpuhistory debug doc ethernet ffmpeg flac gif +gtk headless jpeg
+   lame mpg123 ogg oss parport pci png portaudio pulseaudio sdl zlib"
 REQUIRED_USE="
|| ( gtk headless sdl )
gtk? ( zlib )"
 
 RDEPEND="
-   sys-libs/readline:0=
+   sys-libs/readline:=
virtual/libintl
alsa? ( media-libs/alsa-lib )
ethernet? (
-   >=net-libs/libnet-1.1.2.1:1.1
-   >=net-libs/libpcap-0.9.8
+   net-libs/libnet:1.1
+   net-libs/libpcap
)
ffmpeg? ( media-video/ffmpeg:= )
flac? ( media-libs/flac )
gif? ( media-libs/giflib:= )
gtk? (
+   dev-libs/atk
dev-libs/glib:2
media-libs/fontconfig:1.0
media-libs/glew:0=
virtual/opengl
x11-libs/cairo
-   x11-libs/gtk+:3
+   x11-libs/gdk-pixbuf:2
+   x11-libs/gtk+:3[X]
+   x11-libs/libX11
x11-libs/pango
)
jpeg? ( virtual/jpeg )
@@ -49,14 +51,14 @@ RDEPEND="
)
parport? ( sys-libs/libieee1284 )
pci? ( sys-apps/pciutils )
-   png? ( media-libs/libpng:0= )
+   png? ( media-libs/libpng:= )
portaudio? ( media-libs/portaudio )
pulseaudio? ( media-sound/pulseaudio )
sdl? (
media-libs/libsdl2[video]
media-libs/sdl2-image
)
-   zlib? ( sys-libs/zlib )"
+   zlib? ( sys-libs/zlib:= )"
 DEPEND="
${RDEPEND}
x11-base/xorg-proto"
@@ -98,14 +100,6 @@ src_configure() {
multibuild_foreach_variant run_in_build_dir multibuild_src_configure
 }
 
-multibuild_enable() {
-   if [[ ${MULTIBUILD_VARIANT} == ${1} ]]; then
-   echo --enable-${2}
-   else
-   echo --disable-${2}
-   fi
-}
-
 multibuild_src_configure() {
# Append ".variant" to x* programs if building multiple variants.
local xform
@@ -113,20 +107,26 @@ multibuild_src_configure() {
xform="/^x/s/\$/.${MULTIBUILD_VARIANT}/"
fi
 
+   vice-multi_enable() {
+   if [[ ${MULTIBUILD_VARIANT} == ${1} ]]; then
+   echo --enable-${2}
+   else
+   echo --disable-${2}
+   fi
+   }
+
local econfargs=(
--program-transform-name="${xform}"
-   $(multibuild_enable gtk desktop-files)
-   $(multibuild_enable gtk native-gtk3ui)
-   $(multibuild_enable headless headlessui)
-   $(multibuild_enable sdl sdlui2)
-
+   $(vice-multi_enable gtk desktop-files)
+   $(vice-multi_enable gtk native-gtk3ui)
+   $(vice-multi_enable headless headlessui)
+   $(vice-multi_enable sdl sdlui2)
$(use_enable cpuhistory)
$(use_enable debug debug-gtk3ui)
$(use_enable debug)
$(use_enable doc pdf-docs)
$(use_enable ethernet)
$(use_enable ffmpeg external-ffmpeg)
-   $(use_enable ipv6)
$(use_enable lame)
$(use_enable parport libieee1284)
$(use_enable portaudio)
@@ -140,18 +140,16 @@ multibuild_src_configure() {
$(use_with png)
$(use_with pulseaudio pulse)
$(use_with zlib)
+   $(usex alsa --enable-midi $(use_enable oss midi))

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Ionen Wolkens]

commit: 1da3c10cc574473121a60893967c541c01f7cf2e
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Jun 22 01:58:56 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Jun 22 05:41:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1da3c10c

app-emulation/vice: add cpuhistory flag, tidy ebuild

Also fixed USE=debug and a configure-stage direct AR call.

Thanks-to: Vedran Vrbanc
Closes: https://bugs.gentoo.org/782571
Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/vice/metadata.xml|   1 +
 app-emulation/vice/vice-3.5.ebuild | 131 -
 2 files changed, 71 insertions(+), 61 deletions(-)

diff --git a/app-emulation/vice/metadata.xml b/app-emulation/vice/metadata.xml
index 2294b11c8d0..331360dc216 100644
--- a/app-emulation/vice/metadata.xml
+++ b/app-emulation/vice/metadata.xml
@@ -6,6 +6,7 @@
Gentoo Games Project


+   Enable 65xx CPU history support (may 
decrease performance)
Enable ethernet emulation
Include the headless variant of the 
emulator
Enable mp3@64 cartridge support

diff --git a/app-emulation/vice/vice-3.5.ebuild 
b/app-emulation/vice/vice-3.5.ebuild
index a24aa963357..4518b5ff92f 100644
--- a/app-emulation/vice/vice-3.5.ebuild
+++ b/app-emulation/vice/vice-3.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multibuild xdg
+inherit multibuild toolchain-funcs xdg
 
 DESCRIPTION="The Versatile Commodore Emulator"
 HOMEPAGE="https://vice-emu.sourceforge.io/;
@@ -12,16 +12,21 @@ SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame 
mpg123 ogg oss parport pci png portaudio pulseaudio sdl zlib"
-REQUIRED_USE="|| ( gtk headless sdl ) gtk? ( zlib )"
+IUSE="
+   alsa cpuhistory debug doc ethernet ffmpeg flac gif +gtk headless
+   ipv6 jpeg lame mpg123 ogg oss parport pci png portaudio pulseaudio
+   sdl zlib"
+REQUIRED_USE="
+   || ( gtk headless sdl )
+   gtk? ( zlib )"
 
 RDEPEND="
sys-libs/readline:0=
virtual/libintl
alsa? ( media-libs/alsa-lib )
ethernet? (
-   >=net-libs/libpcap-0.9.8
>=net-libs/libnet-1.1.2.1:1.1
+   >=net-libs/libpcap-0.9.8
)
ffmpeg? ( media-video/ffmpeg:= )
flac? ( media-libs/flac )
@@ -30,17 +35,17 @@ RDEPEND="
dev-libs/glib:2
media-libs/fontconfig:1.0
media-libs/glew:0=
+   virtual/opengl
x11-libs/cairo
x11-libs/gtk+:3
x11-libs/pango
-   virtual/opengl
)
jpeg? ( virtual/jpeg )
lame? ( media-sound/lame )
mpg123? ( media-sound/mpg123 )
ogg? (
-media-libs/libogg
-media-libs/libvorbis
+   media-libs/libogg
+   media-libs/libvorbis
)
parport? ( sys-libs/libieee1284 )
pci? ( sys-apps/pciutils )
@@ -51,14 +56,10 @@ RDEPEND="
media-libs/libsdl2[video]
media-libs/sdl2-image
)
-   zlib? ( sys-libs/zlib )
-"
-
+   zlib? ( sys-libs/zlib )"
 DEPEND="
${RDEPEND}
-   x11-base/xorg-proto
-"
-
+   x11-base/xorg-proto"
 BDEPEND="
app-arch/unzip
app-text/dos2unix
@@ -70,10 +71,7 @@ BDEPEND="
virtual/pkgconfig
virtual/yacc
doc? ( virtual/texi2dvi )
-   gtk? ( x11-misc/xdg-utils )
-"
-
-ECONF_SOURCE="${S}"
+   gtk? ( x11-misc/xdg-utils )"
 
 src_prepare() {
default
@@ -83,71 +81,80 @@ src_prepare() {
 
# Strip the predefined C(XX)FLAGS.
sed -i -r 's:(VICE_C(XX)?FLAGS=)"[^$]+":\1:' configure || die
-}
 
-src_configure() {
MULTIBUILD_VARIANTS=(
$(usev gtk)
$(usev headless)
$(usev sdl)
)
 
+   # Debug build currently broken without copy sources.
+   multibuild_copy_sources
+}
+
+src_configure() {
+   tc-export AR
+
multibuild_foreach_variant run_in_build_dir multibuild_src_configure
 }
 
 multibuild_enable() {
-   if [[ ${MULTIBUILD_VARIANT} == $1 ]]; then
-   printf -- "--enable-%s\n" "$2"
+   if [[ ${MULTIBUILD_VARIANT} == ${1} ]]; then
+   echo --enable-${2}
else
-   printf -- "--disable-%s\n" "$2"
+   echo --disable-${2}
fi
 }
 
 multibuild_src_configure() {
-   # Some dependencies lack configure options so prevent them becoming
-   # automagic by using configure cache variables.
-   use pci || export ac_cv_header_pci_pci_h=no
-
-   # Ensure we use giflib, not ungif.
-   export ac_cv_lib_ungif_EGifPutLine=no
-
# Append ".variant" to x* programs if building multiple variants.
+   local xform
if [[ 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Sam James]

commit: 962669a6ce8895201cd8081acfe995b4c7d219d3
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan  9 03:09:40 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan  9 03:09:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=962669a6

app-emulation/vice: add sdl2-image dep

Closes: https://bugs.gentoo.org/764530
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 app-emulation/vice/vice-3.5.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-emulation/vice/vice-3.5.ebuild 
b/app-emulation/vice/vice-3.5.ebuild
index 8bbf1366c06..a24aa963357 100644
--- a/app-emulation/vice/vice-3.5.ebuild
+++ b/app-emulation/vice/vice-3.5.ebuild
@@ -47,7 +47,10 @@ RDEPEND="
png? ( media-libs/libpng:0= )
portaudio? ( media-libs/portaudio )
pulseaudio? ( media-sound/pulseaudio )
-   sdl? ( media-libs/libsdl2[video] )
+   sdl? (
+   media-libs/libsdl2[video]
+   media-libs/sdl2-image
+   )
zlib? ( sys-libs/zlib )
 "
 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[James Le Cuirot]

commit: 901063aa932d2d1cb1ed9215b30d782b093f4478
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Jan  7 16:28:06 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Jan  7 16:28:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=901063aa

app-emulation/vice: Version bump to 3.5

This fixes building against musl.

Closes: https://bugs.gentoo.org/761529
Closes: https://bugs.gentoo.org/764218
Package-Manager: Portage-3.0.12, Repoman-3.0.1
Signed-off-by: James Le Cuirot  gentoo.org>

 app-emulation/vice/Manifest|   1 +
 app-emulation/vice/vice-3.5.ebuild | 166 +
 2 files changed, 167 insertions(+)

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 793bfbd5c65..6d59125ff4d 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1 +1,2 @@
+DIST vice-3.5.tar.gz 22557578 BLAKE2B 
5573951052c2c7b2beb4dd194ad8612c53e484e47a4d935e0dbc880f2f06611252add3631f99c9656f2c941088d0147b0783020ffcc5a29505bab75ef8dc128e
 SHA512 
02f364c1645138cacb461346d44de8f524fb2aba7d980181caf039c46ca9d30db98466e5b0e56e6a41417cd7bbd63d73bf6eb110af1271e23732e320dd1fab70
 DIST vice-emu-code-r38553-trunk-vice.zip 27146846 BLAKE2B 
5139e4b1e9269c3885313889dffc055298c52152da77e5a824270feb0af6ba61a1726160a6d259e9f8840fefe486cc184f5bfda3ba1797e0359159ccf1e9824f
 SHA512 
c4d3f132bae2980163e74695126e979bd68dddecb17c2eea8227edbb675985d1f04ade665b946a5e3c707bc17e260efb61f57aa141b6ef712385d4d85a68ef86

diff --git a/app-emulation/vice/vice-3.5.ebuild 
b/app-emulation/vice/vice-3.5.ebuild
new file mode 100644
index 000..8bbf1366c06
--- /dev/null
+++ b/app-emulation/vice/vice-3.5.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multibuild xdg
+
+DESCRIPTION="The Versatile Commodore Emulator"
+HOMEPAGE="https://vice-emu.sourceforge.io/;
+SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame 
mpg123 ogg oss parport pci png portaudio pulseaudio sdl zlib"
+REQUIRED_USE="|| ( gtk headless sdl ) gtk? ( zlib )"
+
+RDEPEND="
+   sys-libs/readline:0=
+   virtual/libintl
+   alsa? ( media-libs/alsa-lib )
+   ethernet? (
+   >=net-libs/libpcap-0.9.8
+   >=net-libs/libnet-1.1.2.1:1.1
+   )
+   ffmpeg? ( media-video/ffmpeg:= )
+   flac? ( media-libs/flac )
+   gif? ( media-libs/giflib:= )
+   gtk? (
+   dev-libs/glib:2
+   media-libs/fontconfig:1.0
+   media-libs/glew:0=
+   x11-libs/cairo
+   x11-libs/gtk+:3
+   x11-libs/pango
+   virtual/opengl
+   )
+   jpeg? ( virtual/jpeg )
+   lame? ( media-sound/lame )
+   mpg123? ( media-sound/mpg123 )
+   ogg? (
+media-libs/libogg
+media-libs/libvorbis
+   )
+   parport? ( sys-libs/libieee1284 )
+   pci? ( sys-apps/pciutils )
+   png? ( media-libs/libpng:0= )
+   portaudio? ( media-libs/portaudio )
+   pulseaudio? ( media-sound/pulseaudio )
+   sdl? ( media-libs/libsdl2[video] )
+   zlib? ( sys-libs/zlib )
+"
+
+DEPEND="
+   ${RDEPEND}
+   x11-base/xorg-proto
+"
+
+BDEPEND="
+   app-arch/unzip
+   app-text/dos2unix
+   dev-embedded/xa
+   dev-lang/perl
+   sys-apps/texinfo
+   sys-devel/flex
+   sys-devel/gettext
+   virtual/pkgconfig
+   virtual/yacc
+   doc? ( virtual/texi2dvi )
+   gtk? ( x11-misc/xdg-utils )
+"
+
+ECONF_SOURCE="${S}"
+
+src_prepare() {
+   default
+
+   # Delete some bundled libraries.
+   rm -r src/lib/lib{ffmpeg,lame,x264} || die
+
+   # Strip the predefined C(XX)FLAGS.
+   sed -i -r 's:(VICE_C(XX)?FLAGS=)"[^$]+":\1:' configure || die
+}
+
+src_configure() {
+   MULTIBUILD_VARIANTS=(
+   $(usev gtk)
+   $(usev headless)
+   $(usev sdl)
+   )
+
+   multibuild_foreach_variant run_in_build_dir multibuild_src_configure
+}
+
+multibuild_enable() {
+   if [[ ${MULTIBUILD_VARIANT} == $1 ]]; then
+   printf -- "--enable-%s\n" "$2"
+   else
+   printf -- "--disable-%s\n" "$2"
+   fi
+}
+
+multibuild_src_configure() {
+   # Some dependencies lack configure options so prevent them becoming
+   # automagic by using configure cache variables.
+   use pci || export ac_cv_header_pci_pci_h=no
+
+   # Ensure we use giflib, not ungif.
+   export ac_cv_lib_ungif_EGifPutLine=no
+
+   # Append ".variant" to x* programs if building multiple variants.
+   if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
+   xform="/^x/s/\$/.${MULTIBUILD_VARIANT}/"
+   else
+   unset xform
+   fi
+
+   econf \
+ 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Sam James]

commit: 1428709b6c7bf14c0c8532ae82784055e0df406c
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan  7 11:26:41 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan  7 11:33:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1428709b

app-emulation/vice: cleanup old

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 app-emulation/vice/Manifest   |   1 -
 app-emulation/vice/vice-3.4_p37498.ebuild | 172 --
 2 files changed, 173 deletions(-)

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 5c23e52b7bf..793bfbd5c65 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,2 +1 @@
-DIST vice-emu-code-r37498-trunk-vice.zip 26810776 BLAKE2B 
05baa0d123e9a0f1141ef68940455b5abfccde0204d0ffeb0a806212977be6f1f2c777267cad077272f4e09fa3c6adb9e95436adaaee5482b2ce918a3485caeb
 SHA512 
5b4c31e51efc67ac08f6fe9361c42b80115b315fc24c128861341f2eea7567bdbb1761e52bc914df442ed5cc7f2ca7c6b0a2694441d63e63f9f693bcf72c70c0
 DIST vice-emu-code-r38553-trunk-vice.zip 27146846 BLAKE2B 
5139e4b1e9269c3885313889dffc055298c52152da77e5a824270feb0af6ba61a1726160a6d259e9f8840fefe486cc184f5bfda3ba1797e0359159ccf1e9824f
 SHA512 
c4d3f132bae2980163e74695126e979bd68dddecb17c2eea8227edbb675985d1f04ade665b946a5e3c707bc17e260efb61f57aa141b6ef712385d4d85a68ef86

diff --git a/app-emulation/vice/vice-3.4_p37498.ebuild 
b/app-emulation/vice/vice-3.4_p37498.ebuild
deleted file mode 100644
index 9053d48c332..000
--- a/app-emulation/vice/vice-3.4_p37498.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multibuild
-
-MY_P="vice-emu-code-r${PV##*_p}-trunk-vice"
-
-DESCRIPTION="The Versatile Commodore Emulator"
-HOMEPAGE="https://vice-emu.sourceforge.io/;
-#SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
-SRC_URI="https://sourceforge.net/code-snapshots/svn/v/vi/vice-emu/code/${MY_P}.zip;
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame 
mpg123 ogg oss +opengl parport pci png portaudio pulseaudio sdl zlib"
-REQUIRED_USE="|| ( gtk headless sdl ) gtk? ( zlib )"
-
-RDEPEND="
-   sys-libs/readline:0=
-   virtual/libintl
-   alsa? ( media-libs/alsa-lib )
-   ethernet? (
-   >=net-libs/libpcap-0.9.8
-   >=net-libs/libnet-1.1.2.1:1.1
-   )
-   ffmpeg? ( media-video/ffmpeg:= )
-   flac? ( media-libs/flac )
-   gif? ( media-libs/giflib:= )
-   gtk? (
-   dev-libs/glib:2
-   media-libs/fontconfig:1.0
-   x11-libs/gtk+:3
-   opengl? (
-   media-libs/glew:0=
-   virtual/opengl
-   )
-   )
-   jpeg? ( virtual/jpeg )
-   lame? ( media-sound/lame )
-   mpg123? ( media-sound/mpg123 )
-   ogg? (
-media-libs/libogg
-media-libs/libvorbis
-   )
-   parport? ( sys-libs/libieee1284 )
-   pci? ( sys-apps/pciutils )
-   png? ( media-libs/libpng:0= )
-   portaudio? ( media-libs/portaudio )
-   pulseaudio? ( media-sound/pulseaudio )
-   sdl? ( media-libs/libsdl2[video] )
-   zlib? ( sys-libs/zlib )
-"
-
-DEPEND="
-   ${RDEPEND}
-   x11-base/xorg-proto
-"
-
-BDEPEND="
-   app-arch/unzip
-   dev-embedded/xa
-   dev-lang/perl
-   sys-apps/texinfo
-   sys-devel/flex
-   sys-devel/gettext
-   virtual/pkgconfig
-   virtual/yacc
-   doc? ( virtual/texi2dvi )
-"
-
-S="${WORKDIR}/${MY_P}"
-ECONF_SOURCE="${S}"
-
-src_prepare() {
-   default
-
-   # Delete some bundled libraries.
-   rm -r src/lib/lib{ffmpeg,lame,x264} || die
-
-   sed "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g" < configure.proto > 
configure.ac || die
-
-   local DIR
-   for DIR in src/resid src/resid-dtv .; do
-   pushd "${DIR}" || die
-   AT_NO_RECURSIVE=1 eautoreconf
-   popd || die
-   done
-
-   # Strip the predefined C(XX)FLAGS.
-   sed -i -r 's:(VICE_C(XX)?FLAGS=)"[^$]+":\1:' configure || die
-}
-
-src_configure() {
-   MULTIBUILD_VARIANTS=(
-   $(usev gtk)
-   $(usev headless)
-   $(usev sdl)
-   )
-
-   multibuild_foreach_variant run_in_build_dir multibuild_src_configure
-}
-
-multibuild_enable() {
-   if [[ ${MULTIBUILD_VARIANT} == $1 ]]; then
-   printf -- "--enable-%s\n" "$2"
-   else
-   printf -- "--disable-%s\n" "$2"
-   fi
-}
-
-multibuild_src_configure() {
-   # Some dependencies lack configure options so prevent them becoming
-   # automagic by using configure cache variables.
-   use flac || export ac_cv_header_FLAC_stream_decoder_h=no
-   use mpg123 || export 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Sam James]

commit: 56bec0c5662285f8a4a75df7d181a9e088b7614a
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan  7 05:08:39 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan  7 05:08:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56bec0c5

app-emulation/vice: Stabilize 3.4_p38553 x86, #764128

Signed-off-by: Sam James  gentoo.org>

 app-emulation/vice/vice-3.4_p38553.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/vice/vice-3.4_p38553.ebuild 
b/app-emulation/vice/vice-3.4_p38553.ebuild
index 74f05c1f06f..17bb3310b2a 100644
--- a/app-emulation/vice/vice-3.4_p38553.ebuild
+++ b/app-emulation/vice/vice-3.4_p38553.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://sourceforge.net/code-snapshots/svn/v/vi/vice-emu/code/${MY_P}.z
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame 
mpg123 ogg oss +opengl parport pci png portaudio pulseaudio sdl zlib"
 REQUIRED_USE="|| ( gtk headless sdl ) gtk? ( zlib )"
 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Sam James]

commit: 6a736bb0ac76a3623ec3aaf13bfe61f6117c9a40
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan  7 00:52:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan  7 00:58:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a736bb0

app-emulation/vice: Stabilize 3.4_p38553 amd64, #764128

Signed-off-by: Sam James  gentoo.org>

 app-emulation/vice/vice-3.4_p38553.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/vice/vice-3.4_p38553.ebuild 
b/app-emulation/vice/vice-3.4_p38553.ebuild
index 6035ab43a44..74f05c1f06f 100644
--- a/app-emulation/vice/vice-3.4_p38553.ebuild
+++ b/app-emulation/vice/vice-3.4_p38553.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ 
SRC_URI="https://sourceforge.net/code-snapshots/svn/v/vi/vice-emu/code/${MY_P}.z
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame 
mpg123 ogg oss +opengl parport pci png portaudio pulseaudio sdl zlib"
 REQUIRED_USE="|| ( gtk headless sdl ) gtk? ( zlib )"
 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[James Le Cuirot]

commit: 66cb1534de0d3c03378c4a6b78bc68a86d40a175
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Sep 26 17:32:42 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Sep 26 17:32:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66cb1534

app-emulation/vice: Add missing x11-misc/xdg-utils dependency

Closes: https://bugs.gentoo.org/744835
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: James Le Cuirot  gentoo.org>

 app-emulation/vice/vice-3.4_p38553.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-emulation/vice/vice-3.4_p38553.ebuild 
b/app-emulation/vice/vice-3.4_p38553.ebuild
index 0c04ce33e08..6035ab43a44 100644
--- a/app-emulation/vice/vice-3.4_p38553.ebuild
+++ b/app-emulation/vice/vice-3.4_p38553.ebuild
@@ -72,6 +72,7 @@ BDEPEND="
virtual/pkgconfig
virtual/yacc
doc? ( virtual/texi2dvi )
+   gtk? ( x11-misc/xdg-utils )
 "
 
 S="${WORKDIR}/${MY_P}"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[James Le Cuirot]

commit: 2be25088bc6821daeb1d01aab76494a29fd6d0e3
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri Sep 18 20:43:23 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Sep 18 20:43:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2be25088

app-emulation/vice: Add missing dos2unix dependency

Closes: https://bugs.gentoo.org/743178
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: James Le Cuirot  gentoo.org>

 app-emulation/vice/vice-3.4_p38553.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-emulation/vice/vice-3.4_p38553.ebuild 
b/app-emulation/vice/vice-3.4_p38553.ebuild
index 825c3d61a1c..0c04ce33e08 100644
--- a/app-emulation/vice/vice-3.4_p38553.ebuild
+++ b/app-emulation/vice/vice-3.4_p38553.ebuild
@@ -63,6 +63,7 @@ DEPEND="
 
 BDEPEND="
app-arch/unzip
+   app-text/dos2unix
dev-embedded/xa
dev-lang/perl
sys-apps/texinfo

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/files/, app-emulation/vice/

[James Le Cuirot]

commit: 633ba8dd6e962cce120e36c8b7de882f291bd0b7
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Sep 17 16:25:33 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Sep 17 16:27:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=633ba8dd

app-emulation/vice: Bump 3.4 to rev 38553

This now adds desktop icons.

Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: James Le Cuirot  gentoo.org>

 app-emulation/vice/Manifest|   1 +
 .../vice/files/vice-pkg-config-3.4_p38553.patch|  29 
 app-emulation/vice/vice-3.4_p38553.ebuild  | 183 +
 3 files changed, 213 insertions(+)

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index a4b74f25b8c..98153090bff 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,2 +1,3 @@
 DIST vice-emu-code-r37498-trunk-vice.zip 26810776 BLAKE2B 
05baa0d123e9a0f1141ef68940455b5abfccde0204d0ffeb0a806212977be6f1f2c777267cad077272f4e09fa3c6adb9e95436adaaee5482b2ce918a3485caeb
 SHA512 
5b4c31e51efc67ac08f6fe9361c42b80115b315fc24c128861341f2eea7567bdbb1761e52bc914df442ed5cc7f2ca7c6b0a2694441d63e63f9f693bcf72c70c0
 DIST vice-emu-code-r37605-trunk-vice.zip 26854864 BLAKE2B 
771728b69cb38492d086d199fcb56d19f14738bc6b5c3f0b1c9c6ffb07db0d2c2a3d631ed9f32a2abf0159d4e3e0d144c04e6ba13c22ce619ea1090f89b7b5cc
 SHA512 
975c342d5ee7f72cc775bee711fed77fb6ce00bc15eef13403b9f3a457ac589d0089bcdf452507605bbf11d8806fceec94729becf1ef3fe66f6074854684d998
+DIST vice-emu-code-r38553-trunk-vice.zip 27146846 BLAKE2B 
5139e4b1e9269c3885313889dffc055298c52152da77e5a824270feb0af6ba61a1726160a6d259e9f8840fefe486cc184f5bfda3ba1797e0359159ccf1e9824f
 SHA512 
c4d3f132bae2980163e74695126e979bd68dddecb17c2eea8227edbb675985d1f04ade665b946a5e3c707bc17e260efb61f57aa141b6ef712385d4d85a68ef86

diff --git a/app-emulation/vice/files/vice-pkg-config-3.4_p38553.patch 
b/app-emulation/vice/files/vice-pkg-config-3.4_p38553.patch
new file mode 100644
index 000..557c0a92731
--- /dev/null
+++ b/app-emulation/vice/files/vice-pkg-config-3.4_p38553.patch
@@ -0,0 +1,29 @@
+https://sourceforge.net/p/vice-emu/patches/218/
+
+Index: configure.ac
+===
+--- a/configure.ac (revision 38502)
 b/configure.ac (working copy)
+@@ -1275,6 +1275,14 @@
+   fi
+ 
+   if test x"$found_sdl2" != "xyes"; then
++PKG_CHECK_MODULES(SDL2, sdl2, [
++  use_sdl_prefix=no
++  use_sdl2_prefix=no
++  found_sdl2=yes
++  VICE_CFLAGS="$VICE_CFLAGS $SDL2_CFLAGS"
++  VICE_CXXFLAGS="$VICE_CXXFLAGS $SDL2_CFLAGS"
++  LIBS="$LIBS $SDL2_LIBS"
++], [
+ dnl Check for sdl2-config
+ if test x"$sdl2_config" != "xno"; then
+   user_CFLAGS="$CFLAGS"
+@@ -1311,6 +1319,7 @@
+   CFLAGS="$user_CFLAGS"
+   CXXFLAGS="$user_CXXFLAGS"
+ fi
++])
+   fi
+ 
+   dnl fail if SDL2 ui was requested, otherwise restore flags and continue

diff --git a/app-emulation/vice/vice-3.4_p38553.ebuild 
b/app-emulation/vice/vice-3.4_p38553.ebuild
new file mode 100644
index 000..825c3d61a1c
--- /dev/null
+++ b/app-emulation/vice/vice-3.4_p38553.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multibuild xdg
+
+MY_P="vice-emu-code-r${PV##*_p}-trunk-vice"
+
+DESCRIPTION="The Versatile Commodore Emulator"
+HOMEPAGE="https://vice-emu.sourceforge.io/;
+#SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
+SRC_URI="https://sourceforge.net/code-snapshots/svn/v/vi/vice-emu/code/${MY_P}.zip;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame 
mpg123 ogg oss +opengl parport pci png portaudio pulseaudio sdl zlib"
+REQUIRED_USE="|| ( gtk headless sdl ) gtk? ( zlib )"
+
+RDEPEND="
+   sys-libs/readline:0=
+   virtual/libintl
+   alsa? ( media-libs/alsa-lib )
+   ethernet? (
+   >=net-libs/libpcap-0.9.8
+   >=net-libs/libnet-1.1.2.1:1.1
+   )
+   ffmpeg? ( media-video/ffmpeg:= )
+   flac? ( media-libs/flac )
+   gif? ( media-libs/giflib:= )
+   gtk? (
+   dev-libs/glib:2
+   media-libs/fontconfig:1.0
+   x11-libs/cairo
+   x11-libs/gtk+:3
+   x11-libs/pango
+   opengl? (
+   media-libs/glew:0=
+   virtual/opengl
+   )
+   )
+   jpeg? ( virtual/jpeg )
+   lame? ( media-sound/lame )
+   mpg123? ( media-sound/mpg123 )
+   ogg? (
+media-libs/libogg
+media-libs/libvorbis
+   )
+   parport? ( sys-libs/libieee1284 )
+   pci? ( sys-apps/pciutils )
+   png? ( media-libs/libpng:0= )
+   portaudio? ( media-libs/portaudio )
+   pulseaudio? ( media-sound/pulseaudio 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/files/, app-emulation/vice/

[James Le Cuirot]

commit: ea829542dbcaef08f523fb4a9fd863ec3408519e
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Sep 17 16:26:39 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Sep 17 16:27:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea829542

app-emulation/vice: Drop old 3.4_p37605

Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: James Le Cuirot  gentoo.org>

 app-emulation/vice/Manifest|   1 -
 app-emulation/vice/files/vice-pkg-config.patch |  29 
 app-emulation/vice/vice-3.4_p37605.ebuild  | 176 -
 3 files changed, 206 deletions(-)

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 98153090bff..5c23e52b7bf 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,3 +1,2 @@
 DIST vice-emu-code-r37498-trunk-vice.zip 26810776 BLAKE2B 
05baa0d123e9a0f1141ef68940455b5abfccde0204d0ffeb0a806212977be6f1f2c777267cad077272f4e09fa3c6adb9e95436adaaee5482b2ce918a3485caeb
 SHA512 
5b4c31e51efc67ac08f6fe9361c42b80115b315fc24c128861341f2eea7567bdbb1761e52bc914df442ed5cc7f2ca7c6b0a2694441d63e63f9f693bcf72c70c0
-DIST vice-emu-code-r37605-trunk-vice.zip 26854864 BLAKE2B 
771728b69cb38492d086d199fcb56d19f14738bc6b5c3f0b1c9c6ffb07db0d2c2a3d631ed9f32a2abf0159d4e3e0d144c04e6ba13c22ce619ea1090f89b7b5cc
 SHA512 
975c342d5ee7f72cc775bee711fed77fb6ce00bc15eef13403b9f3a457ac589d0089bcdf452507605bbf11d8806fceec94729becf1ef3fe66f6074854684d998
 DIST vice-emu-code-r38553-trunk-vice.zip 27146846 BLAKE2B 
5139e4b1e9269c3885313889dffc055298c52152da77e5a824270feb0af6ba61a1726160a6d259e9f8840fefe486cc184f5bfda3ba1797e0359159ccf1e9824f
 SHA512 
c4d3f132bae2980163e74695126e979bd68dddecb17c2eea8227edbb675985d1f04ade665b946a5e3c707bc17e260efb61f57aa141b6ef712385d4d85a68ef86

diff --git a/app-emulation/vice/files/vice-pkg-config.patch 
b/app-emulation/vice/files/vice-pkg-config.patch
deleted file mode 100644
index d29eff252fb..000
--- a/app-emulation/vice/files/vice-pkg-config.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://sourceforge.net/p/vice-emu/patches/218/
-
-Index: configure.proto
-===
 a/configure.proto  (revision 37525)
-+++ b/configure.proto  (working copy)
-@@ -1275,6 +1275,14 @@
-   fi
- 
-   if test x"$found_sdl2" != "xyes"; then
-+PKG_CHECK_MODULES(SDL2, sdl2, [
-+  use_sdl_prefix=no
-+  use_sdl2_prefix=no
-+  found_sdl2=yes
-+  VICE_CFLAGS="$VICE_CFLAGS $SDL2_CFLAGS"
-+  VICE_CXXFLAGS="$VICE_CXXFLAGS $SDL2_CFLAGS"
-+  LIBS="$LIBS $SDL2_LIBS"
-+], [
- dnl Check for sdl2-config
- if test x"$sdl2_config" != "xno"; then
-   user_CFLAGS="$CFLAGS"
-@@ -1311,6 +1319,7 @@
-   CFLAGS="$user_CFLAGS"
-   CXXFLAGS="$user_CXXFLAGS"
- fi
-+])
-   fi
- 
-   dnl fail if SDL2 ui was requested, otherwise restore flags and continue

diff --git a/app-emulation/vice/vice-3.4_p37605.ebuild 
b/app-emulation/vice/vice-3.4_p37605.ebuild
deleted file mode 100644
index 23c94697352..000
--- a/app-emulation/vice/vice-3.4_p37605.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multibuild
-
-MY_P="vice-emu-code-r${PV##*_p}-trunk-vice"
-
-DESCRIPTION="The Versatile Commodore Emulator"
-HOMEPAGE="https://vice-emu.sourceforge.io/;
-#SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
-SRC_URI="https://sourceforge.net/code-snapshots/svn/v/vi/vice-emu/code/${MY_P}.zip;
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame 
mpg123 ogg oss +opengl parport pci png portaudio pulseaudio sdl zlib"
-REQUIRED_USE="|| ( gtk headless sdl ) gtk? ( zlib )"
-
-RDEPEND="
-   sys-libs/readline:0=
-   virtual/libintl
-   alsa? ( media-libs/alsa-lib )
-   ethernet? (
-   >=net-libs/libpcap-0.9.8
-   >=net-libs/libnet-1.1.2.1:1.1
-   )
-   ffmpeg? ( media-video/ffmpeg:= )
-   flac? ( media-libs/flac )
-   gif? ( media-libs/giflib:= )
-   gtk? (
-   dev-libs/glib:2
-   media-libs/fontconfig:1.0
-   x11-libs/gtk+:3
-   opengl? (
-   media-libs/glew:0=
-   virtual/opengl
-   )
-   )
-   jpeg? ( virtual/jpeg )
-   lame? ( media-sound/lame )
-   mpg123? ( media-sound/mpg123 )
-   ogg? (
-media-libs/libogg
-media-libs/libvorbis
-   )
-   parport? ( sys-libs/libieee1284 )
-   pci? ( sys-apps/pciutils )
-   png? ( media-libs/libpng:0= )
-   portaudio? ( media-libs/portaudio )
-   pulseaudio? ( media-sound/pulseaudio )
-   sdl? ( media-libs/libsdl2[video] )
-   zlib? ( sys-libs/zlib )
-"
-
-DEPEND="
-   ${RDEPEND}
-   

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[James Le Cuirot]

commit: 31277ab9c9027cc705d901ef74264ef2ac914dba
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Jun 14 13:43:21 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Jun 14 19:41:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31277ab9

app-emulation/vice: update homepage and use https

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16239
Signed-off-by: James Le Cuirot  gentoo.org>

 app-emulation/vice/vice-3.4_p37498.ebuild | 2 +-
 app-emulation/vice/vice-3.4_p37605.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/vice/vice-3.4_p37498.ebuild 
b/app-emulation/vice/vice-3.4_p37498.ebuild
index f14dee2dee4..9053d48c332 100644
--- a/app-emulation/vice/vice-3.4_p37498.ebuild
+++ b/app-emulation/vice/vice-3.4_p37498.ebuild
@@ -8,7 +8,7 @@ inherit autotools multibuild
 MY_P="vice-emu-code-r${PV##*_p}-trunk-vice"
 
 DESCRIPTION="The Versatile Commodore Emulator"
-HOMEPAGE="http://vice-emu.sourceforge.net/;
+HOMEPAGE="https://vice-emu.sourceforge.io/;
 #SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
 
SRC_URI="https://sourceforge.net/code-snapshots/svn/v/vi/vice-emu/code/${MY_P}.zip;
 

diff --git a/app-emulation/vice/vice-3.4_p37605.ebuild 
b/app-emulation/vice/vice-3.4_p37605.ebuild
index c77734211e9..23c94697352 100644
--- a/app-emulation/vice/vice-3.4_p37605.ebuild
+++ b/app-emulation/vice/vice-3.4_p37605.ebuild
@@ -8,7 +8,7 @@ inherit autotools multibuild
 MY_P="vice-emu-code-r${PV##*_p}-trunk-vice"
 
 DESCRIPTION="The Versatile Commodore Emulator"
-HOMEPAGE="http://vice-emu.sourceforge.net/;
+HOMEPAGE="https://vice-emu.sourceforge.io/;
 #SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
 
SRC_URI="https://sourceforge.net/code-snapshots/svn/v/vi/vice-emu/code/${MY_P}.zip;
 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Mikle Kolyada]

commit: b485d2b35dab59326257fbd451414d7e14de7276
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Apr 25 17:30:14 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Apr 25 17:30:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b485d2b3

app-emulation/vice: migrate from libav

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada  gentoo.org>

 app-emulation/vice/vice-3.4_p37498.ebuild | 7 ++-
 app-emulation/vice/vice-3.4_p37605.ebuild | 7 ++-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/app-emulation/vice/vice-3.4_p37498.ebuild 
b/app-emulation/vice/vice-3.4_p37498.ebuild
index 9e9f6f6462e..f14dee2dee4 100644
--- a/app-emulation/vice/vice-3.4_p37498.ebuild
+++ b/app-emulation/vice/vice-3.4_p37498.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://sourceforge.net/code-snapshots/svn/v/vi/vice-emu/code/${MY_P}.z
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame 
libav mpg123 ogg oss +opengl parport pci png portaudio pulseaudio sdl zlib"
+IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame 
mpg123 ogg oss +opengl parport pci png portaudio pulseaudio sdl zlib"
 REQUIRED_USE="|| ( gtk headless sdl ) gtk? ( zlib )"
 
 RDEPEND="
@@ -26,10 +26,7 @@ RDEPEND="
>=net-libs/libpcap-0.9.8
>=net-libs/libnet-1.1.2.1:1.1
)
-   ffmpeg? (
-   libav? ( media-video/libav:= )
-   !libav? ( media-video/ffmpeg:= )
-   )
+   ffmpeg? ( media-video/ffmpeg:= )
flac? ( media-libs/flac )
gif? ( media-libs/giflib:= )
gtk? (

diff --git a/app-emulation/vice/vice-3.4_p37605.ebuild 
b/app-emulation/vice/vice-3.4_p37605.ebuild
index 46da7890406..c77734211e9 100644
--- a/app-emulation/vice/vice-3.4_p37605.ebuild
+++ b/app-emulation/vice/vice-3.4_p37605.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://sourceforge.net/code-snapshots/svn/v/vi/vice-emu/code/${MY_P}.z
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame 
libav mpg123 ogg oss +opengl parport pci png portaudio pulseaudio sdl zlib"
+IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame 
mpg123 ogg oss +opengl parport pci png portaudio pulseaudio sdl zlib"
 REQUIRED_USE="|| ( gtk headless sdl ) gtk? ( zlib )"
 
 RDEPEND="
@@ -26,10 +26,7 @@ RDEPEND="
>=net-libs/libpcap-0.9.8
>=net-libs/libnet-1.1.2.1:1.1
)
-   ffmpeg? (
-   libav? ( media-video/libav:= )
-   !libav? ( media-video/ffmpeg:= )
-   )
+   ffmpeg? ( media-video/ffmpeg:= )
flac? ( media-libs/flac )
gif? ( media-libs/giflib:= )
gtk? (

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/files/, app-emulation/vice/

[James Le Cuirot]

commit: 8687928d6af65a41eef0fda0f92cd3953563bff0
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Apr 14 13:19:24 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Apr 14 13:21:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8687928d

app-emulation/vice: Drop old 3.1

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: James Le Cuirot  gentoo.org>

 app-emulation/vice/Manifest|   1 -
 .../vice/files/vice-2.4.27-autotools.patch |  11 --
 app-emulation/vice/files/vice-3.1-ffmpeg4.patch|  74 -
 app-emulation/vice/metadata.xml|   3 -
 app-emulation/vice/vice-3.1.ebuild | 171 -
 5 files changed, 260 deletions(-)

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 5aaf0e57602..a4b74f25b8c 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,3 +1,2 @@
-DIST vice-3.1.tar.gz 30714226 BLAKE2B 
75c2cce5294dad5b954cd23b623b6b4610c8142a09aef05dbefed6b3e6b268077d375e644dde6a057682d41ab9cf15e93a9f4a9359bfa0d1567d6d1862053a0e
 SHA512 
bc02a3597a17dadb37c487e6942192c0e9dc1a7d4e440fbf0dc8a165dbb2dee60ddf157697a020d2780ddef56a0a67802768d5c6d117b9cf5cdc124de45bc579
 DIST vice-emu-code-r37498-trunk-vice.zip 26810776 BLAKE2B 
05baa0d123e9a0f1141ef68940455b5abfccde0204d0ffeb0a806212977be6f1f2c777267cad077272f4e09fa3c6adb9e95436adaaee5482b2ce918a3485caeb
 SHA512 
5b4c31e51efc67ac08f6fe9361c42b80115b315fc24c128861341f2eea7567bdbb1761e52bc914df442ed5cc7f2ca7c6b0a2694441d63e63f9f693bcf72c70c0
 DIST vice-emu-code-r37605-trunk-vice.zip 26854864 BLAKE2B 
771728b69cb38492d086d199fcb56d19f14738bc6b5c3f0b1c9c6ffb07db0d2c2a3d631ed9f32a2abf0159d4e3e0d144c04e6ba13c22ce619ea1090f89b7b5cc
 SHA512 
975c342d5ee7f72cc775bee711fed77fb6ce00bc15eef13403b9f3a457ac589d0089bcdf452507605bbf11d8806fceec94729becf1ef3fe66f6074854684d998

diff --git a/app-emulation/vice/files/vice-2.4.27-autotools.patch 
b/app-emulation/vice/files/vice-2.4.27-autotools.patch
deleted file mode 100644
index 7bebd2800ef..000
--- a/app-emulation/vice/files/vice-2.4.27-autotools.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 vice-2.4.7.orig/configure.ac
-+++ vice-2.4.7/configure.ac
-@@ -124,7 +118,7 @@
- AC_SUBST(VICE_VERSION)
- 
- AM_INIT_AUTOMAKE(vice, $VICE_VERSION)
--AM_CONFIG_HEADER(src/config.h)
-+AC_CONFIG_HEADERS(src/config.h)
- 
- if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then
-   VERSION_RC=$VICE_VERSION_MAJOR","$VICE_VERSION_MINOR",0,0"

diff --git a/app-emulation/vice/files/vice-3.1-ffmpeg4.patch 
b/app-emulation/vice/files/vice-3.1-ffmpeg4.patch
deleted file mode 100644
index d232ee22337..000
--- a/app-emulation/vice/files/vice-3.1-ffmpeg4.patch
+++ /dev/null
@@ -1,74 +0,0 @@
 a/src/gfxoutputdrv/ffmpegdrv.c
-+++ b/src/gfxoutputdrv/ffmpegdrv.c
-@@ -46,6 +46,13 @@
- #include "util.h"
- #include "soundmovie.h"
- 
-+/** \brief  Helper macro to determine ffmpeg version
-+ */
-+#if (LIBAVCODEC_VERSION_MAJOR >= 58) && (LIBAVCODEC_VERSION_MINOR >= 18)
-+# define HAVE_FFMPEG4
-+#endif
-+
-+
- static gfxoutputdrv_codec_t avi_audio_codeclist[] = {
- { AV_CODEC_ID_MP2, "MP2" },
- { AV_CODEC_ID_MP3, "MP3" },
-@@ -354,7 +361,11 @@
- }
- 
- audio_is_open = 1;
-+#ifdef HAVE_FFMPEG4
-+if (c->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) {
-+#else
- if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) {
-+#endif
- audio_inbuf_samples = 1;
- } else {
- audio_inbuf_samples = c->frame_size;
-@@ -447,8 +458,13 @@
- audio_st.samples_count = 0;
- 
- /* Some formats want stream headers to be separate. */
--if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER)
-+if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER) {
-+#ifdef HAVE_FFMPEG4
-+c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-+#else
- c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+#endif
-+}
- 
- /* create resampler context */
- #ifndef HAVE_FFMPEG_AVRESAMPLE
-@@ -781,7 +797,11 @@
- 
- /* Some formats want stream headers to be separate. */
- if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER) {
-+#ifdef HAVE_FFMPEG4
-+c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-+#else
- c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+#endif
- }
- 
- if (audio_init_done) {
-@@ -961,6 +981,7 @@
- 
- video_st.frame->pts = video_st.next_pts++;
- 
-+#ifdef AVFMT_RAWPICTURE
- if (ffmpegdrv_oc->oformat->flags & AVFMT_RAWPICTURE) {
- AVPacket pkt;
- VICE_P_AV_INIT_PACKET();
-@@ -971,7 +992,9 @@
- pkt.pts = pkt.dts = video_st.frame->pts;
- 
- ret = VICE_P_AV_INTERLEAVED_WRITE_FRAME(ffmpegdrv_oc, );
--} else {
-+} else
-+#endif
-+{
- AVPacket pkt = { 0 };
- int got_packet;
- 

diff --git a/app-emulation/vice/metadata.xml b/app-emulation/vice/metadata.xml
index 8ff137c8c20..2294b11c8d0 100644
--- 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Agostino Sarubbo]

commit: 716c826b35b8c8028fa9dd40a8981a59cb4e17bb
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Apr 14 12:31:44 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Apr 14 12:31:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=716c826b

app-emulation/vice: x86 stable wrt bug #716288

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-emulation/vice/vice-3.4_p37498.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/vice/vice-3.4_p37498.ebuild 
b/app-emulation/vice/vice-3.4_p37498.ebuild
index 2971e5b5d0a..9e9f6f6462e 100644
--- a/app-emulation/vice/vice-3.4_p37498.ebuild
+++ b/app-emulation/vice/vice-3.4_p37498.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://sourceforge.net/code-snapshots/svn/v/vi/vice-emu/code/${MY_P}.z
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame 
libav mpg123 ogg oss +opengl parport pci png portaudio pulseaudio sdl zlib"
 REQUIRED_USE="|| ( gtk headless sdl ) gtk? ( zlib )"
 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Agostino Sarubbo]

commit: 3df26779ab492ec312a8226daca4c84bdc5e94eb
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Apr  8 10:57:46 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Apr  8 10:57:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3df26779

app-emulation/vice: amd64 stable wrt bug #716288

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-emulation/vice/vice-3.4_p37498.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/vice/vice-3.4_p37498.ebuild 
b/app-emulation/vice/vice-3.4_p37498.ebuild
index e23e6deb107..2971e5b5d0a 100644
--- a/app-emulation/vice/vice-3.4_p37498.ebuild
+++ b/app-emulation/vice/vice-3.4_p37498.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://sourceforge.net/code-snapshots/svn/v/vi/vice-emu/code/${MY_P}.z
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame 
libav mpg123 ogg oss +opengl parport pci png portaudio pulseaudio sdl zlib"
 REQUIRED_USE="|| ( gtk headless sdl ) gtk? ( zlib )"
 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/, app-emulation/vice/files/

[James Le Cuirot]

commit: 64eba6176be0318351a64c50fa588d957948bf13
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Apr  5 21:46:14 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Apr  5 22:04:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64eba617

app-emulation/vice: Bump 3.4 to rev 37605, add SDL2 pkg-config patch

This includes GCC 10 fixes.

Closes: https://bugs.gentoo.org/710990
Package-Manager: Portage-2.3.96, Repoman-2.3.20
Signed-off-by: James Le Cuirot  gentoo.org>

 app-emulation/vice/Manifest|   1 +
 app-emulation/vice/files/vice-pkg-config.patch |  29 
 app-emulation/vice/vice-3.4_p37605.ebuild  | 179 +
 3 files changed, 209 insertions(+)

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index fbe27e05301..5aaf0e57602 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,2 +1,3 @@
 DIST vice-3.1.tar.gz 30714226 BLAKE2B 
75c2cce5294dad5b954cd23b623b6b4610c8142a09aef05dbefed6b3e6b268077d375e644dde6a057682d41ab9cf15e93a9f4a9359bfa0d1567d6d1862053a0e
 SHA512 
bc02a3597a17dadb37c487e6942192c0e9dc1a7d4e440fbf0dc8a165dbb2dee60ddf157697a020d2780ddef56a0a67802768d5c6d117b9cf5cdc124de45bc579
 DIST vice-emu-code-r37498-trunk-vice.zip 26810776 BLAKE2B 
05baa0d123e9a0f1141ef68940455b5abfccde0204d0ffeb0a806212977be6f1f2c777267cad077272f4e09fa3c6adb9e95436adaaee5482b2ce918a3485caeb
 SHA512 
5b4c31e51efc67ac08f6fe9361c42b80115b315fc24c128861341f2eea7567bdbb1761e52bc914df442ed5cc7f2ca7c6b0a2694441d63e63f9f693bcf72c70c0
+DIST vice-emu-code-r37605-trunk-vice.zip 26854864 BLAKE2B 
771728b69cb38492d086d199fcb56d19f14738bc6b5c3f0b1c9c6ffb07db0d2c2a3d631ed9f32a2abf0159d4e3e0d144c04e6ba13c22ce619ea1090f89b7b5cc
 SHA512 
975c342d5ee7f72cc775bee711fed77fb6ce00bc15eef13403b9f3a457ac589d0089bcdf452507605bbf11d8806fceec94729becf1ef3fe66f6074854684d998

diff --git a/app-emulation/vice/files/vice-pkg-config.patch 
b/app-emulation/vice/files/vice-pkg-config.patch
new file mode 100644
index 000..d29eff252fb
--- /dev/null
+++ b/app-emulation/vice/files/vice-pkg-config.patch
@@ -0,0 +1,29 @@
+https://sourceforge.net/p/vice-emu/patches/218/
+
+Index: configure.proto
+===
+--- a/configure.proto  (revision 37525)
 b/configure.proto  (working copy)
+@@ -1275,6 +1275,14 @@
+   fi
+ 
+   if test x"$found_sdl2" != "xyes"; then
++PKG_CHECK_MODULES(SDL2, sdl2, [
++  use_sdl_prefix=no
++  use_sdl2_prefix=no
++  found_sdl2=yes
++  VICE_CFLAGS="$VICE_CFLAGS $SDL2_CFLAGS"
++  VICE_CXXFLAGS="$VICE_CXXFLAGS $SDL2_CFLAGS"
++  LIBS="$LIBS $SDL2_LIBS"
++], [
+ dnl Check for sdl2-config
+ if test x"$sdl2_config" != "xno"; then
+   user_CFLAGS="$CFLAGS"
+@@ -1311,6 +1319,7 @@
+   CFLAGS="$user_CFLAGS"
+   CXXFLAGS="$user_CXXFLAGS"
+ fi
++])
+   fi
+ 
+   dnl fail if SDL2 ui was requested, otherwise restore flags and continue

diff --git a/app-emulation/vice/vice-3.4_p37605.ebuild 
b/app-emulation/vice/vice-3.4_p37605.ebuild
new file mode 100644
index 000..46da7890406
--- /dev/null
+++ b/app-emulation/vice/vice-3.4_p37605.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multibuild
+
+MY_P="vice-emu-code-r${PV##*_p}-trunk-vice"
+
+DESCRIPTION="The Versatile Commodore Emulator"
+HOMEPAGE="http://vice-emu.sourceforge.net/;
+#SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
+SRC_URI="https://sourceforge.net/code-snapshots/svn/v/vi/vice-emu/code/${MY_P}.zip;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame 
libav mpg123 ogg oss +opengl parport pci png portaudio pulseaudio sdl zlib"
+REQUIRED_USE="|| ( gtk headless sdl ) gtk? ( zlib )"
+
+RDEPEND="
+   sys-libs/readline:0=
+   virtual/libintl
+   alsa? ( media-libs/alsa-lib )
+   ethernet? (
+   >=net-libs/libpcap-0.9.8
+   >=net-libs/libnet-1.1.2.1:1.1
+   )
+   ffmpeg? (
+   libav? ( media-video/libav:= )
+   !libav? ( media-video/ffmpeg:= )
+   )
+   flac? ( media-libs/flac )
+   gif? ( media-libs/giflib:= )
+   gtk? (
+   dev-libs/glib:2
+   media-libs/fontconfig:1.0
+   x11-libs/gtk+:3
+   opengl? (
+   media-libs/glew:0=
+   virtual/opengl
+   )
+   )
+   jpeg? ( virtual/jpeg )
+   lame? ( media-sound/lame )
+   mpg123? ( media-sound/mpg123 )
+   ogg? (
+media-libs/libogg
+media-libs/libvorbis
+   )
+   parport? ( sys-libs/libieee1284 )
+   pci? ( sys-apps/pciutils )
+   png? ( media-libs/libpng:0= )
+   portaudio? ( media-libs/portaudio )
+   

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[David Seifert]

commit: 2e20167d2d5ea81bd52b6e3d298346edcddd61b0
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb 22 22:21:39 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 22 22:21:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e20167d

app-emulation/vice: Canonical variable order

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: David Seifert  gentoo.org>

 app-emulation/vice/vice-3.4_p37498.ebuild | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app-emulation/vice/vice-3.4_p37498.ebuild 
b/app-emulation/vice/vice-3.4_p37498.ebuild
index 9d913fec427..e23e6deb107 100644
--- a/app-emulation/vice/vice-3.4_p37498.ebuild
+++ b/app-emulation/vice/vice-3.4_p37498.ebuild
@@ -5,12 +5,13 @@ EAPI=7
 
 inherit autotools multibuild
 
+MY_P="vice-emu-code-r${PV##*_p}-trunk-vice"
+
 DESCRIPTION="The Versatile Commodore Emulator"
 HOMEPAGE="http://vice-emu.sourceforge.net/;
-MY_P="vice-emu-code-r${PV##*_p}-trunk-vice"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="https://sourceforge.net/code-snapshots/svn/v/vi/vice-emu/code/${MY_P}.zip;
 #SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
+SRC_URI="https://sourceforge.net/code-snapshots/svn/v/vi/vice-emu/code/${MY_P}.zip;
+
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -73,6 +74,7 @@ BDEPEND="
doc? ( virtual/texi2dvi )
 "
 
+S="${WORKDIR}/${MY_P}"
 ECONF_SOURCE="${S}"
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[James Le Cuirot]

commit: c2dac17fd6d6844839eaa6b77e234b09804f6ee0
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Feb 22 22:07:07 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Feb 22 22:09:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2dac17f

app-emulation/vice: Bump to post 3.4 snapshot with multiple variants

The ebuild has been almost entirely rewritten. Many missing
dependencies have been added. Multiple variants for GTK, SDL, and
headless can now be installed simultaneously.

Closes: https://bugs.gentoo.org/656722
Closes: https://github.com/gentoo/gentoo/pull/13504
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: James Le Cuirot  gentoo.org>

 app-emulation/vice/Manifest   |   1 +
 app-emulation/vice/metadata.xml   |   4 +
 app-emulation/vice/vice-3.4_p37498.ebuild | 173 ++
 3 files changed, 178 insertions(+)

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index cf78f5afb3d..fbe27e05301 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1 +1,2 @@
 DIST vice-3.1.tar.gz 30714226 BLAKE2B 
75c2cce5294dad5b954cd23b623b6b4610c8142a09aef05dbefed6b3e6b268077d375e644dde6a057682d41ab9cf15e93a9f4a9359bfa0d1567d6d1862053a0e
 SHA512 
bc02a3597a17dadb37c487e6942192c0e9dc1a7d4e440fbf0dc8a165dbb2dee60ddf157697a020d2780ddef56a0a67802768d5c6d117b9cf5cdc124de45bc579
+DIST vice-emu-code-r37498-trunk-vice.zip 26810776 BLAKE2B 
05baa0d123e9a0f1141ef68940455b5abfccde0204d0ffeb0a806212977be6f1f2c777267cad077272f4e09fa3c6adb9e95436adaaee5482b2ce918a3485caeb
 SHA512 
5b4c31e51efc67ac08f6fe9361c42b80115b315fc24c128861341f2eea7567bdbb1761e52bc914df442ed5cc7f2ca7c6b0a2694441d63e63f9f693bcf72c70c0

diff --git a/app-emulation/vice/metadata.xml b/app-emulation/vice/metadata.xml
index ff9234728a4..8ff137c8c20 100644
--- a/app-emulation/vice/metadata.xml
+++ b/app-emulation/vice/metadata.xml
@@ -8,6 +8,10 @@

Enable ethernet emulation
Enable the ability to run 
fullscreen
+   Include the headless variant of the 
emulator
+   Enable mp3@64 cartridge support
+   Enable parallel port SID support
+   Enable PCI device discovery using 
sys-apps/pciutils
Use media-libs/libsdl for 
sound support
Enable support for x11-libs/vte in 
the GTK+ interface


diff --git a/app-emulation/vice/vice-3.4_p37498.ebuild 
b/app-emulation/vice/vice-3.4_p37498.ebuild
new file mode 100644
index 000..9d913fec427
--- /dev/null
+++ b/app-emulation/vice/vice-3.4_p37498.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multibuild
+
+DESCRIPTION="The Versatile Commodore Emulator"
+HOMEPAGE="http://vice-emu.sourceforge.net/;
+MY_P="vice-emu-code-r${PV##*_p}-trunk-vice"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="https://sourceforge.net/code-snapshots/svn/v/vi/vice-emu/code/${MY_P}.zip;
+#SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame 
libav mpg123 ogg oss +opengl parport pci png portaudio pulseaudio sdl zlib"
+REQUIRED_USE="|| ( gtk headless sdl ) gtk? ( zlib )"
+
+RDEPEND="
+   sys-libs/readline:0=
+   virtual/libintl
+   alsa? ( media-libs/alsa-lib )
+   ethernet? (
+   >=net-libs/libpcap-0.9.8
+   >=net-libs/libnet-1.1.2.1:1.1
+   )
+   ffmpeg? (
+   libav? ( media-video/libav:= )
+   !libav? ( media-video/ffmpeg:= )
+   )
+   flac? ( media-libs/flac )
+   gif? ( media-libs/giflib:= )
+   gtk? (
+   dev-libs/glib:2
+   media-libs/fontconfig:1.0
+   x11-libs/gtk+:3
+   opengl? (
+   media-libs/glew:0=
+   virtual/opengl
+   )
+   )
+   jpeg? ( virtual/jpeg )
+   lame? ( media-sound/lame )
+   mpg123? ( media-sound/mpg123 )
+   ogg? (
+media-libs/libogg
+media-libs/libvorbis
+   )
+   parport? ( sys-libs/libieee1284 )
+   pci? ( sys-apps/pciutils )
+   png? ( media-libs/libpng:0= )
+   portaudio? ( media-libs/portaudio )
+   pulseaudio? ( media-sound/pulseaudio )
+   sdl? ( media-libs/libsdl2[video] )
+   zlib? ( sys-libs/zlib )
+"
+
+DEPEND="
+   ${RDEPEND}
+   x11-base/xorg-proto
+"
+
+BDEPEND="
+   app-arch/unzip
+   dev-embedded/xa
+   dev-lang/perl
+   sys-apps/texinfo
+   sys-devel/flex
+   sys-devel/gettext
+   virtual/pkgconfig
+   virtual/yacc
+   doc? ( virtual/texi2dvi )
+"
+
+ECONF_SOURCE="${S}"
+
+src_prepare() {
+   default
+
+   # Delete some bundled libraries.
+   rm -r 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/files/, app-emulation/vice/

[Andreas Sturmlechner]

commit: 1b6961ef0347393ca69eb7e03a3cc07d316d36b2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Nov 29 21:46:13 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Nov 29 22:04:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b6961ef

app-emulation/vice: Fix build with ffmpeg-4

Rename PATCH to PATCHES (again!) and restore missing patch.

Thanks-to: Adam Jones  eidolon.org.uk>
Closes: https://bugs.gentoo.org/670620
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../vice/files/vice-2.4.27-autotools.patch | 11 
 app-emulation/vice/files/vice-3.1-ffmpeg4.patch| 74 ++
 app-emulation/vice/vice-3.1.ebuild |  7 +-
 3 files changed, 89 insertions(+), 3 deletions(-)

diff --git a/app-emulation/vice/files/vice-2.4.27-autotools.patch 
b/app-emulation/vice/files/vice-2.4.27-autotools.patch
new file mode 100644
index 000..7bebd2800ef
--- /dev/null
+++ b/app-emulation/vice/files/vice-2.4.27-autotools.patch
@@ -0,0 +1,11 @@
+--- vice-2.4.7.orig/configure.ac
 vice-2.4.7/configure.ac
+@@ -124,7 +118,7 @@
+ AC_SUBST(VICE_VERSION)
+ 
+ AM_INIT_AUTOMAKE(vice, $VICE_VERSION)
+-AM_CONFIG_HEADER(src/config.h)
++AC_CONFIG_HEADERS(src/config.h)
+ 
+ if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then
+   VERSION_RC=$VICE_VERSION_MAJOR","$VICE_VERSION_MINOR",0,0"

diff --git a/app-emulation/vice/files/vice-3.1-ffmpeg4.patch 
b/app-emulation/vice/files/vice-3.1-ffmpeg4.patch
new file mode 100644
index 000..d232ee22337
--- /dev/null
+++ b/app-emulation/vice/files/vice-3.1-ffmpeg4.patch
@@ -0,0 +1,74 @@
+--- a/src/gfxoutputdrv/ffmpegdrv.c
 b/src/gfxoutputdrv/ffmpegdrv.c
+@@ -46,6 +46,13 @@
+ #include "util.h"
+ #include "soundmovie.h"
+ 
++/** \brief  Helper macro to determine ffmpeg version
++ */
++#if (LIBAVCODEC_VERSION_MAJOR >= 58) && (LIBAVCODEC_VERSION_MINOR >= 18)
++# define HAVE_FFMPEG4
++#endif
++
++
+ static gfxoutputdrv_codec_t avi_audio_codeclist[] = {
+ { AV_CODEC_ID_MP2, "MP2" },
+ { AV_CODEC_ID_MP3, "MP3" },
+@@ -354,7 +361,11 @@
+ }
+ 
+ audio_is_open = 1;
++#ifdef HAVE_FFMPEG4
++if (c->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) {
++#else
+ if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) {
++#endif
+ audio_inbuf_samples = 1;
+ } else {
+ audio_inbuf_samples = c->frame_size;
+@@ -447,8 +458,13 @@
+ audio_st.samples_count = 0;
+ 
+ /* Some formats want stream headers to be separate. */
+-if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER)
++if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER) {
++#ifdef HAVE_FFMPEG4
++c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
++#else
+ c->flags |= CODEC_FLAG_GLOBAL_HEADER;
++#endif
++}
+ 
+ /* create resampler context */
+ #ifndef HAVE_FFMPEG_AVRESAMPLE
+@@ -781,7 +797,11 @@
+ 
+ /* Some formats want stream headers to be separate. */
+ if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER) {
++#ifdef HAVE_FFMPEG4
++c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
++#else
+ c->flags |= CODEC_FLAG_GLOBAL_HEADER;
++#endif
+ }
+ 
+ if (audio_init_done) {
+@@ -961,6 +981,7 @@
+ 
+ video_st.frame->pts = video_st.next_pts++;
+ 
++#ifdef AVFMT_RAWPICTURE
+ if (ffmpegdrv_oc->oformat->flags & AVFMT_RAWPICTURE) {
+ AVPacket pkt;
+ VICE_P_AV_INIT_PACKET();
+@@ -971,7 +992,9 @@
+ pkt.pts = pkt.dts = video_st.frame->pts;
+ 
+ ret = VICE_P_AV_INTERLEAVED_WRITE_FRAME(ffmpegdrv_oc, );
+-} else {
++} else
++#endif
++{
+ AVPacket pkt = { 0 };
+ int got_packet;
+ 

diff --git a/app-emulation/vice/vice-3.1.ebuild 
b/app-emulation/vice/vice-3.1.ebuild
index 6fe9e2623e2..d7267e2b207 100644
--- a/app-emulation/vice/vice-3.1.ebuild
+++ b/app-emulation/vice/vice-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -85,8 +85,9 @@ DEPEND="${RDEPEND}
)
)"
 
-PATCH=(
-   "${FILESDIR}"/${P}-autotools.patch
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.4.27-autotools.patch
+   "${FILESDIR}"/${P}-ffmpeg4.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Andreas Sturmlechner]

commit: 63b971281356305f04ecdd476156cf6968fe30dd
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Nov 29 22:02:47 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Nov 29 22:04:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63b97128

app-emulation/vice: Sort USE, DEPENDs

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-emulation/vice/vice-3.1.ebuild | 49 ++
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/app-emulation/vice/vice-3.1.ebuild 
b/app-emulation/vice/vice-3.1.ebuild
index d7267e2b207..e5b69137fe9 100644
--- a/app-emulation/vice/vice-3.1.ebuild
+++ b/app-emulation/vice/vice-3.1.ebuild
@@ -5,34 +5,30 @@ EAPI=6
 
 inherit autotools flag-o-matic toolchain-funcs
 
-DESCRIPTION="The Versatile Commodore 8-bit Emulator"
+DESCRIPTION="Versatile Commodore 8-bit Emulator"
 HOMEPAGE="http://vice-emu.sourceforge.net/;
 SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="Xaw3d alsa ethernet ffmpeg fullscreen +gtk ipv6 lame libav nls oss png 
pulseaudio sdl +sdlsound threads vte zlib"
+IUSE="alsa ethernet ffmpeg fullscreen +gtk ipv6 lame libav nls oss png 
pulseaudio sdl +sdlsound threads vte Xaw3d zlib"
 
 # upstream says gtk3 and sdl2 shouldn't be exposed yet.
 #REQUIRED_USE="?? ( gtk2 gtk3 sdl )"
 REQUIRED_USE="?? ( gtk sdl )"
 
-GTK_COMMON="
-   x11-libs/pango
-   x11-libs/cairo"
 #  gtk3? (
+#  x11-libs/cairo
 #  x11-libs/gtk+:3
+#  x11-libs/pango
 #  vte? ( x11-libs/vte:2.90 )
-#  ${GTK_COMMON}
 #  )
 RDEPEND="
+   media-libs/giflib
virtual/jpeg:0
virtual/opengl
-   media-libs/giflib
alsa? ( media-libs/alsa-lib )
-   pulseaudio? ( media-sound/pulseaudio )
-   sdlsound? ( media-libs/libsdl[sound] )
ethernet? (
>=net-libs/libpcap-0.9.8
>=net-libs/libnet-1.1.2.1:1.1
@@ -41,17 +37,22 @@ RDEPEND="
libav? ( media-video/libav:= )
!libav? ( media-video/ffmpeg:= )
)
+   gtk? (
+   x11-libs/cairo
+   x11-libs/gtk+:2
+   x11-libs/gtkglext
+   x11-libs/pango
+   vte? ( x11-libs/vte:0 )
+   )
lame? ( media-sound/lame )
nls? ( virtual/libintl )
png? ( media-libs/libpng:0= )
-   zlib? ( sys-libs/zlib:= )
-   sdl? (
-   media-libs/libsdl[joystick,video]
-   )
+   pulseaudio? ( media-sound/pulseaudio )
+   sdl? ( media-libs/libsdl[joystick,video] )
!sdl? (
+   sys-libs/readline:0=
x11-libs/libX11
x11-libs/libXext
-   sys-libs/readline:0=
fullscreen? (
x11-libs/libXrandr
x11-libs/libXxf86vm
@@ -65,25 +66,21 @@ RDEPEND="
!Xaw3d? ( x11-libs/libXaw )
)
)
-   gtk? (
-   x11-libs/gtk+:2
-   x11-libs/gtkglext
-   ${GTK_COMMON}
-   vte? ( x11-libs/vte:0 )
-   )"
+   sdlsound? ( media-libs/libsdl[sound] )
+   zlib? ( sys-libs/zlib )
+"
 DEPEND="${RDEPEND}
-   virtual/pkgconfig
+   media-libs/fontconfig
x11-apps/bdftopcf
x11-apps/mkfontdir
x11-base/xorg-proto
-   media-libs/fontconfig
+   virtual/pkgconfig
nls? ( sys-devel/gettext )
-   !sdl? (
-   !gtk? (
+   !gtk? ( !sdl? (
x11-libs/libICE
x11-libs/libSM
-   )
-   )"
+   ) )
+"
 
 PATCHES=(
"${FILESDIR}"/${PN}-2.4.27-autotools.patch

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Pacho Ramos]

commit: f275ac88075dd304791e9daad15bae61c5d9c2ec
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed Mar 28 18:32:14 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed Mar 28 18:32:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f275ac88

app-emulation/vice: amd64 stable, bug #648890

Package-Manager: Portage-2.3.26, Repoman-2.3.7

 app-emulation/vice/vice-3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/vice/vice-3.1.ebuild 
b/app-emulation/vice/vice-3.1.ebuild
index 9e458ecfe41..cc4fb987e50 100644
--- a/app-emulation/vice/vice-3.1.ebuild
+++ b/app-emulation/vice/vice-3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="Xaw3d alsa ethernet ffmpeg fullscreen +gtk ipv6 lame libav nls oss png 
pulseaudio sdl +sdlsound threads vte zlib"
 
 # upstream says gtk3 and sdl2 shouldn't be exposed yet.

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/, app-emulation/vice/files/

[Pacho Ramos]

commit: 2d4843bd31a8d55d4594e8d167226d35c4c34cfd
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed Mar 28 18:35:01 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed Mar 28 18:35:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d4843bd

app-emulation/vice: Drop old

Package-Manager: Portage-2.3.26, Repoman-2.3.7

 app-emulation/vice/Manifest|   3 -
 .../vice/files/vice-2.4.22-autotools.patch |  11 --
 .../vice/files/vice-2.4.27-autotools.patch |  11 --
 .../vice/files/vice-31580-ffmpeg-build.patch   |  64 
 app-emulation/vice/vice-2.4.22.ebuild  | 169 ---
 app-emulation/vice/vice-2.4.27-r2.ebuild   | 179 -
 app-emulation/vice/vice-2.4.27-r3.ebuild   | 178 
 app-emulation/vice/vice-2.4.27.ebuild  | 169 ---
 app-emulation/vice/vice-2.4.31.ebuild  | 173 
 9 files changed, 957 deletions(-)

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index ff495dc9e4d..cf78f5afb3d 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,4 +1 @@
-DIST vice-2.4.22.tar.gz 25180343 BLAKE2B 
9c48539b0ec1604a196211819c43c7cdba970cee404b64fbaa1957bb8167ae9f7f108ba0f54ef0ef82314331694dfc5f6bca0d569ee940d6531ed49cd7bb2ffa
 SHA512 
b43e609ae2f43717d10e079d3b8ac284e5c4920ed222c7502e9a7b75dfe32784628031ae6cf8672c8d9d50576fb714cecdd1a9292bf53477f4bbd52c10403975
-DIST vice-2.4.27.tar.gz 25561665 BLAKE2B 
36e8460ef1e4aed9f83caf2b46924766d6830368c947ddfee68ecf992685f950db9e433238b61c34691dadb719ede4e9c5cc7104279e06140e347b04eb8a97a3
 SHA512 
589b9892f3180db6f169e74b863171f08567045862f2f47cac73ef946e81d55dcde5373fc910cfd1659238669f12ee6ad934c7143c87fad736cda77479439bec
-DIST vice-2.4.31.tar.gz 25898329 BLAKE2B 
113be451d322f21488f23711ce971ff7a83538d3dfd516138fec84f27e4933025bbba8cbbc627111aadad437ab7805491286760b4fe9db915307922d00dba27f
 SHA512 
eebd25fb808b1837ea8d76b1399d3d7ed80a66ae206ea3e0d51fe0fb9df21f3bfeb3fbe353c1022e02754987116e33d4c6888e61448b3250ebefbbfe1b854e94
 DIST vice-3.1.tar.gz 30714226 BLAKE2B 
75c2cce5294dad5b954cd23b623b6b4610c8142a09aef05dbefed6b3e6b268077d375e644dde6a057682d41ab9cf15e93a9f4a9359bfa0d1567d6d1862053a0e
 SHA512 
bc02a3597a17dadb37c487e6942192c0e9dc1a7d4e440fbf0dc8a165dbb2dee60ddf157697a020d2780ddef56a0a67802768d5c6d117b9cf5cdc124de45bc579

diff --git a/app-emulation/vice/files/vice-2.4.22-autotools.patch 
b/app-emulation/vice/files/vice-2.4.22-autotools.patch
deleted file mode 100644
index 7bebd2800ef..000
--- a/app-emulation/vice/files/vice-2.4.22-autotools.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 vice-2.4.7.orig/configure.ac
-+++ vice-2.4.7/configure.ac
-@@ -124,7 +118,7 @@
- AC_SUBST(VICE_VERSION)
- 
- AM_INIT_AUTOMAKE(vice, $VICE_VERSION)
--AM_CONFIG_HEADER(src/config.h)
-+AC_CONFIG_HEADERS(src/config.h)
- 
- if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then
-   VERSION_RC=$VICE_VERSION_MAJOR","$VICE_VERSION_MINOR",0,0"

diff --git a/app-emulation/vice/files/vice-2.4.27-autotools.patch 
b/app-emulation/vice/files/vice-2.4.27-autotools.patch
deleted file mode 100644
index 7bebd2800ef..000
--- a/app-emulation/vice/files/vice-2.4.27-autotools.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 vice-2.4.7.orig/configure.ac
-+++ vice-2.4.7/configure.ac
-@@ -124,7 +118,7 @@
- AC_SUBST(VICE_VERSION)
- 
- AM_INIT_AUTOMAKE(vice, $VICE_VERSION)
--AM_CONFIG_HEADER(src/config.h)
-+AC_CONFIG_HEADERS(src/config.h)
- 
- if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then
-   VERSION_RC=$VICE_VERSION_MAJOR","$VICE_VERSION_MINOR",0,0"

diff --git a/app-emulation/vice/files/vice-31580-ffmpeg-build.patch 
b/app-emulation/vice/files/vice-31580-ffmpeg-build.patch
deleted file mode 100644
index 82dc3421218..000
--- a/app-emulation/vice/files/vice-31580-ffmpeg-build.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-# Patch to fix compiling with ffmpeg-3.
-# Backported from: https://sourceforge.net/p/vice-emu/code/31580/
-
 /src/gfxoutputdrv/ffmpeglib.h
-+++ /src/gfxoutputdrv/ffmpeglib.h
-@@ -76,6 +76,14 @@
- #define AVCodecID  CodecID
- #endif
-
-+#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(55,17,103)
-+#define VICE_AV_PIX_FMT_RGB24 PIX_FMT_RGB24
-+#define VICE_AV_PixelFormat PixelFormat
-+#else
-+#define VICE_AV_PIX_FMT_RGB24 AV_PIX_FMT_RGB24
-+#define VICE_AV_PixelFormat AVPixelFormat
-+#endif
-+
- /* avcodec fucntions */
- typedef void(*av_init_packet_t)(AVPacket *pkt);
- typedef int(*avcodec_open2_t)(AVCodecContext*, AVCodec*, AVDictionary **);
-@@ -118,7 +126,7 @@
-
- /* swscale functions */
- typedef struct SwsContext * (*sws_getContext_t)(int srcW, int srcH,
--enum PixelFormat srcFormat, 
int dstW, int dstH, enum PixelFormat dstFormat,
-+enum VICE_AV_PixelFormat 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[David Seifert]

commit: 11759cdb4a93c6a94926e6dc46505a7ef0ece010
Author: David Seifert  gentoo  org>
AuthorDate: Sun Jan 21 10:19:20 2018 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Jan 21 10:19:20 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11759cdb

app-emulation/vice: Version bump to 3.1

Closes: https://bugs.gentoo.org/606534
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-emulation/vice/Manifest|   1 +
 app-emulation/vice/vice-3.1.ebuild | 178 +
 2 files changed, 179 insertions(+)

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 6e784a30e2b..ff495dc9e4d 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,3 +1,4 @@
 DIST vice-2.4.22.tar.gz 25180343 BLAKE2B 
9c48539b0ec1604a196211819c43c7cdba970cee404b64fbaa1957bb8167ae9f7f108ba0f54ef0ef82314331694dfc5f6bca0d569ee940d6531ed49cd7bb2ffa
 SHA512 
b43e609ae2f43717d10e079d3b8ac284e5c4920ed222c7502e9a7b75dfe32784628031ae6cf8672c8d9d50576fb714cecdd1a9292bf53477f4bbd52c10403975
 DIST vice-2.4.27.tar.gz 25561665 BLAKE2B 
36e8460ef1e4aed9f83caf2b46924766d6830368c947ddfee68ecf992685f950db9e433238b61c34691dadb719ede4e9c5cc7104279e06140e347b04eb8a97a3
 SHA512 
589b9892f3180db6f169e74b863171f08567045862f2f47cac73ef946e81d55dcde5373fc910cfd1659238669f12ee6ad934c7143c87fad736cda77479439bec
 DIST vice-2.4.31.tar.gz 25898329 BLAKE2B 
113be451d322f21488f23711ce971ff7a83538d3dfd516138fec84f27e4933025bbba8cbbc627111aadad437ab7805491286760b4fe9db915307922d00dba27f
 SHA512 
eebd25fb808b1837ea8d76b1399d3d7ed80a66ae206ea3e0d51fe0fb9df21f3bfeb3fbe353c1022e02754987116e33d4c6888e61448b3250ebefbbfe1b854e94
+DIST vice-3.1.tar.gz 30714226 BLAKE2B 
75c2cce5294dad5b954cd23b623b6b4610c8142a09aef05dbefed6b3e6b268077d375e644dde6a057682d41ab9cf15e93a9f4a9359bfa0d1567d6d1862053a0e
 SHA512 
bc02a3597a17dadb37c487e6942192c0e9dc1a7d4e440fbf0dc8a165dbb2dee60ddf157697a020d2780ddef56a0a67802768d5c6d117b9cf5cdc124de45bc579

diff --git a/app-emulation/vice/vice-3.1.ebuild 
b/app-emulation/vice/vice-3.1.ebuild
new file mode 100644
index 000..113100eec80
--- /dev/null
+++ b/app-emulation/vice/vice-3.1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic toolchain-funcs
+
+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+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="Xaw3d alsa ethernet ffmpeg fullscreen +gtk ipv6 lame libav nls oss png 
pulseaudio sdl +sdlsound threads vte zlib"
+
+# upstream says gtk3 and sdl2 shouldn't be exposed yet.
+#REQUIRED_USE="?? ( gtk2 gtk3 sdl )"
+REQUIRED_USE="?? ( gtk sdl )"
+
+GTK_COMMON="
+   x11-libs/pango
+   x11-libs/cairo"
+#  gtk3? (
+#  x11-libs/gtk+:3
+#  vte? ( x11-libs/vte:2.90 )
+#  ${GTK_COMMON}
+#  )
+RDEPEND="
+   virtual/jpeg:0
+   virtual/opengl
+   media-libs/giflib
+   alsa? ( media-libs/alsa-lib )
+   pulseaudio? ( media-sound/pulseaudio )
+   sdlsound? ( media-libs/libsdl[sound] )
+   ethernet? (
+   >=net-libs/libpcap-0.9.8
+   >=net-libs/libnet-1.1.2.1:1.1
+   )
+   ffmpeg? (
+   libav? ( media-video/libav:= )
+   !libav? ( media-video/ffmpeg:= )
+   )
+   lame? ( media-sound/lame )
+   nls? ( virtual/libintl )
+   png? ( media-libs/libpng:0= )
+   zlib? ( sys-libs/zlib:= )
+   sdl? (
+   media-libs/libsdl[joystick,video]
+   )
+   !sdl? (
+   x11-libs/libX11
+   x11-libs/libXext
+   sys-libs/readline:0=
+   fullscreen? (
+   x11-libs/libXrandr
+   x11-libs/libXxf86vm
+   )
+   !gtk? (
+   x11-libs/libXmu
+   x11-libs/libXpm
+   x11-libs/libXt
+   x11-libs/libXv
+   Xaw3d? ( x11-libs/libXaw3d )
+   !Xaw3d? ( x11-libs/libXaw )
+   )
+   )
+   gtk? (
+   x11-libs/gtk+:2
+   x11-libs/gtkglext
+   ${GTK_COMMON}
+   vte? ( x11-libs/vte:0 )
+   )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   x11-apps/bdftopcf
+   x11-apps/mkfontdir
+   x11-proto/xproto
+   x11-proto/xextproto
+   media-libs/fontconfig
+   x11-proto/videoproto
+   nls? ( sys-devel/gettext )
+   !sdl? (
+   fullscreen? (
+   x11-proto/xf86vidmodeproto
+   )
+   !gtk? (
+   x11-libs/libICE
+   x11-libs/libSM
+   )
+   )"
+
+PATCH=(
+   "${FILESDIR}"/${P}-autotools.patch
+)

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Ulrich Müller]

commit: 16845d7b93af7042c05a34a1b0fefa71738d6972
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Dec 10 08:40:41 2017 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Dec 10 09:26:52 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16845d7b

app-emulation/vice: Update Manifest hashes.

 app-emulation/vice/Manifest | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 6220b7c80c5..6e784a30e2b 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,3 +1,3 @@
-DIST vice-2.4.22.tar.gz 25180343 SHA256 
767e00eb9dbd1a9bcc6db8b4cd1697b8bc744b1d507bbac930975ee130378d9d SHA512 
b43e609ae2f43717d10e079d3b8ac284e5c4920ed222c7502e9a7b75dfe32784628031ae6cf8672c8d9d50576fb714cecdd1a9292bf53477f4bbd52c10403975
 WHIRLPOOL 
580de25d739585c0316c91aba44bb17b2cd4cc19f162e3c5e53b8a7a9e3f694e8c5d8d549b232259d5c9ed077549410b220169a3c026ebad55bc7c537922be81
-DIST vice-2.4.27.tar.gz 25561665 SHA256 
ce8b8649308b38f5245490c9df13230d075d3e571b538807d4ca8dd1d53e0b47 SHA512 
589b9892f3180db6f169e74b863171f08567045862f2f47cac73ef946e81d55dcde5373fc910cfd1659238669f12ee6ad934c7143c87fad736cda77479439bec
 WHIRLPOOL 
44633477e9ec5bf6b950efa6743647304770a44d58c624b623c992d09735446c79185ca410af60768554b62c0db4675e99c9db1a25c49b3b861860d00a298406
-DIST vice-2.4.31.tar.gz 25898329 SHA256 
4c38685de5f492463cf1b0a570909bfba0dc5c2ffab3218081b630a47118f4a5 SHA512 
eebd25fb808b1837ea8d76b1399d3d7ed80a66ae206ea3e0d51fe0fb9df21f3bfeb3fbe353c1022e02754987116e33d4c6888e61448b3250ebefbbfe1b854e94
 WHIRLPOOL 
0c0b57f452d3299050811874988ac9909f970ae4230b2268ee8285bfb358c8f58702141059b973d862eb4b7d7e5084d77b62b13b5b7a10e8718864b790f00500
+DIST vice-2.4.22.tar.gz 25180343 BLAKE2B 
9c48539b0ec1604a196211819c43c7cdba970cee404b64fbaa1957bb8167ae9f7f108ba0f54ef0ef82314331694dfc5f6bca0d569ee940d6531ed49cd7bb2ffa
 SHA512 
b43e609ae2f43717d10e079d3b8ac284e5c4920ed222c7502e9a7b75dfe32784628031ae6cf8672c8d9d50576fb714cecdd1a9292bf53477f4bbd52c10403975
+DIST vice-2.4.27.tar.gz 25561665 BLAKE2B 
36e8460ef1e4aed9f83caf2b46924766d6830368c947ddfee68ecf992685f950db9e433238b61c34691dadb719ede4e9c5cc7104279e06140e347b04eb8a97a3
 SHA512 
589b9892f3180db6f169e74b863171f08567045862f2f47cac73ef946e81d55dcde5373fc910cfd1659238669f12ee6ad934c7143c87fad736cda77479439bec
+DIST vice-2.4.31.tar.gz 25898329 BLAKE2B 
113be451d322f21488f23711ce971ff7a83538d3dfd516138fec84f27e4933025bbba8cbbc627111aadad437ab7805491286760b4fe9db915307922d00dba27f
 SHA512 
eebd25fb808b1837ea8d76b1399d3d7ed80a66ae206ea3e0d51fe0fb9df21f3bfeb3fbe353c1022e02754987116e33d4c6888e61448b3250ebefbbfe1b854e94

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/, app-emulation/vice/files/

[David Seifert]

commit: ace68147247dbdbe28003b6ec89614f3d4787c39
Author: Jimi Huotari  gentoo  org>
AuthorDate: Sun Nov  6 10:40:08 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Jan 26 22:50:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ace68147

app-emulation/vice: Fix compiling with '>=media-video/ffmpeg-3'.

Add a patch to allow compiling '2.4.27-r2' with 'ffmpeg-3' installed.
Backported from: https://sourceforge.net/p/vice-emu/code/31580/

Also change 'PATCH' to 'PATCHES'.

Package-Manager: portage-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/2759

 .../vice/files/vice-31580-ffmpeg-build.patch   | 64 ++
 app-emulation/vice/vice-2.4.27-r2.ebuild   |  8 ++-
 2 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/app-emulation/vice/files/vice-31580-ffmpeg-build.patch 
b/app-emulation/vice/files/vice-31580-ffmpeg-build.patch
new file mode 100644
index ..82dc342
--- /dev/null
+++ b/app-emulation/vice/files/vice-31580-ffmpeg-build.patch
@@ -0,0 +1,64 @@
+# Patch to fix compiling with ffmpeg-3.
+# Backported from: https://sourceforge.net/p/vice-emu/code/31580/
+
+--- /src/gfxoutputdrv/ffmpeglib.h
 /src/gfxoutputdrv/ffmpeglib.h
+@@ -76,6 +76,14 @@
+ #define AVCodecID  CodecID
+ #endif
+
++#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(55,17,103)
++#define VICE_AV_PIX_FMT_RGB24 PIX_FMT_RGB24
++#define VICE_AV_PixelFormat PixelFormat
++#else
++#define VICE_AV_PIX_FMT_RGB24 AV_PIX_FMT_RGB24
++#define VICE_AV_PixelFormat AVPixelFormat
++#endif
++
+ /* avcodec fucntions */
+ typedef void(*av_init_packet_t)(AVPacket *pkt);
+ typedef int(*avcodec_open2_t)(AVCodecContext*, AVCodec*, AVDictionary **);
+@@ -118,7 +126,7 @@
+
+ /* swscale functions */
+ typedef struct SwsContext * (*sws_getContext_t)(int srcW, int srcH,
+-enum PixelFormat srcFormat, 
int dstW, int dstH, enum PixelFormat dstFormat,
++enum VICE_AV_PixelFormat 
srcFormat, int dstW, int dstH, enum VICE_AV_PixelFormat dstFormat,
+ int flags, SwsFilter 
*srcFilter, SwsFilter *dstFilter, double *param);
+ typedef void (*sws_freeContext_t)(struct SwsContext *swsContext);
+ typedef int (*sws_scale_t)(struct SwsContext *context, uint8_t* srcSlice[],
+
+--- /src/gfxoutputdrv/ffmpegdrv.c
 /src/gfxoutputdrv/ffmpegdrv.c
+@@ -671,8 +671,8 @@
+picture is needed too. It is then converted to the required
+output format */
+ video_st.tmp_frame = NULL;
+-if (c->pix_fmt != PIX_FMT_RGB24) {
+-video_st.tmp_frame = ffmpegdrv_alloc_picture(PIX_FMT_RGB24, c->width, 
c->height);
++if (c->pix_fmt != VICE_AV_PIX_FMT_RGB24) {
++video_st.tmp_frame = ffmpegdrv_alloc_picture(VICE_AV_PIX_FMT_RGB24, 
c->width, c->height);
+ if (!video_st.tmp_frame) {
+ log_debug("ffmpegdrv: could not allocate temporary picture");
+ return -1;
+@@ -769,9 +769,9 @@
+
+ #ifdef HAVE_FFMPEG_SWSCALE
+ /* setup scaler */
+-if (c->pix_fmt != PIX_FMT_RGB24) {
++if (c->pix_fmt != VICE_AV_PIX_FMT_RGB24) {
+ sws_ctx = VICE_P_SWS_GETCONTEXT
+-  (video_width, video_height, PIX_FMT_RGB24,
++  (video_width, video_height, VICE_AV_PIX_FMT_RGB24,
+   video_width, video_height, c->pix_fmt,
+   SWS_BICUBIC,
+   NULL, NULL, NULL);
+@@ -948,7 +948,7 @@
+
+ c = video_st.st->codec;
+
+-if (c->pix_fmt != PIX_FMT_RGB24) {
++if (c->pix_fmt != VICE_AV_PIX_FMT_RGB24) {
+ ffmpegdrv_fill_rgb_image(screenshot, video_st.tmp_frame);
+
+ if (sws_ctx != NULL) {

diff --git a/app-emulation/vice/vice-2.4.27-r2.ebuild 
b/app-emulation/vice/vice-2.4.27-r2.ebuild
index 2782d0f..0791ebb 100644
--- a/app-emulation/vice/vice-2.4.27-r2.ebuild
+++ b/app-emulation/vice/vice-2.4.27-r2.ebuild
@@ -85,12 +85,18 @@ DEPEND="${RDEPEND}
x11-proto/videoproto
nls? ( sys-devel/gettext )"
 
-PATCH=(
+PATCHES=(
"${FILESDIR}"/${P}-autotools.patch
 )
#"${FILESDIR}"/vice_rath.txt
 
 src_prepare() {
+   if use ffmpeg && has_version ">=media-video/ffmpeg-3" ; then
+   PATCHES+=(
+   "${FILESDIR}"/${PN}-31580-ffmpeg-build.patch
+   )
+   fi
+
default
sed -i \
-e 's/building//' \

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[David Seifert]

commit: a9882d481a4808f6e56bb2b2fcd36f4682d8010f
Author: Jimi Huotari  gentoo  org>
AuthorDate: Thu Jan 26 22:48:17 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Jan 26 22:48:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9882d48

app-emulation/vice: Version bump to 2.4.31.

Package-Manager: portage-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/2643

 app-emulation/vice/Manifest   |   1 +
 app-emulation/vice/vice-2.4.31.ebuild | 174 ++
 2 files changed, 175 insertions(+)

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index dde8136..6220b7c 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,2 +1,3 @@
 DIST vice-2.4.22.tar.gz 25180343 SHA256 
767e00eb9dbd1a9bcc6db8b4cd1697b8bc744b1d507bbac930975ee130378d9d SHA512 
b43e609ae2f43717d10e079d3b8ac284e5c4920ed222c7502e9a7b75dfe32784628031ae6cf8672c8d9d50576fb714cecdd1a9292bf53477f4bbd52c10403975
 WHIRLPOOL 
580de25d739585c0316c91aba44bb17b2cd4cc19f162e3c5e53b8a7a9e3f694e8c5d8d549b232259d5c9ed077549410b220169a3c026ebad55bc7c537922be81
 DIST vice-2.4.27.tar.gz 25561665 SHA256 
ce8b8649308b38f5245490c9df13230d075d3e571b538807d4ca8dd1d53e0b47 SHA512 
589b9892f3180db6f169e74b863171f08567045862f2f47cac73ef946e81d55dcde5373fc910cfd1659238669f12ee6ad934c7143c87fad736cda77479439bec
 WHIRLPOOL 
44633477e9ec5bf6b950efa6743647304770a44d58c624b623c992d09735446c79185ca410af60768554b62c0db4675e99c9db1a25c49b3b861860d00a298406
+DIST vice-2.4.31.tar.gz 25898329 SHA256 
4c38685de5f492463cf1b0a570909bfba0dc5c2ffab3218081b630a47118f4a5 SHA512 
eebd25fb808b1837ea8d76b1399d3d7ed80a66ae206ea3e0d51fe0fb9df21f3bfeb3fbe353c1022e02754987116e33d4c6888e61448b3250ebefbbfe1b854e94
 WHIRLPOOL 
0c0b57f452d3299050811874988ac9909f970ae4230b2268ee8285bfb358c8f58702141059b973d862eb4b7d7e5084d77b62b13b5b7a10e8718864b790f00500

diff --git a/app-emulation/vice/vice-2.4.31.ebuild 
b/app-emulation/vice/vice-2.4.31.ebuild
new file mode 100644
index ..2782d0f
--- /dev/null
+++ b/app-emulation/vice/vice-2.4.31.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools eutils toolchain-funcs flag-o-matic
+
+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+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="Xaw3d alsa ethernet ffmpeg fullscreen +gtk ipv6 lame nls oss png 
pulseaudio sdl +sdlsound threads vte zlib"
+
+# upstream says gtk3 and sdl2 shouldn't be exposed yet.
+#REQUIRED_USE="?? ( gtk2 gtk3 sdl )"
+REQUIRED_USE="?? ( gtk sdl )"
+
+GTK_COMMON="
+   x11-libs/pango
+   x11-libs/cairo"
+#  gtk3? (
+#  x11-libs/gtk+:3
+#  vte? ( x11-libs/vte:2.90 )
+#  ${GTK_COMMON}
+#  )
+RDEPEND="
+   virtual/jpeg:0
+   virtual/opengl
+   media-libs/giflib
+   alsa? ( media-libs/alsa-lib )
+   pulseaudio? ( media-sound/pulseaudio )
+   sdlsound? ( media-libs/libsdl[sound] )
+   ethernet? (
+   >=net-libs/libpcap-0.9.8
+   >=net-libs/libnet-1.1.2.1:1.1
+   )
+   ffmpeg? ( virtual/ffmpeg )
+   lame? ( media-sound/lame )
+   nls? ( virtual/libintl )
+   png? ( media-libs/libpng:0 )
+   zlib? ( sys-libs/zlib )
+   sdl? (
+   media-libs/libsdl[joystick,video]
+   )
+   !sdl? (
+   fullscreen? (
+   x11-libs/libXrandr
+   x11-libs/libXxf86vm )
+   x11-libs/libX11
+   x11-libs/libXext
+   sys-libs/readline:0
+   )
+   gtk? (
+   x11-libs/gtk+:2
+   vte? ( x11-libs/vte:0 )
+   x11-libs/gtkglext
+   ${GTK_COMMON}
+   )
+   !sdl? ( !gtk? (
+   x11-libs/libXmu
+   x11-libs/libXpm
+   x11-libs/libXt
+   x11-libs/libXv
+   Xaw3d? ( x11-libs/libXaw3d )
+   !Xaw3d? ( x11-libs/libXaw )
+   ) )
+   "
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   !sdl? (
+   fullscreen? ( x11-proto/xf86vidmodeproto )
+   !gtk? (
+   x11-libs/libICE
+   x11-libs/libSM
+   )
+   )
+   x11-apps/bdftopcf
+   x11-apps/mkfontdir
+   x11-proto/xproto
+   x11-proto/xextproto
+   media-libs/fontconfig
+   x11-proto/videoproto
+   nls? ( sys-devel/gettext )"
+
+PATCH=(
+   "${FILESDIR}"/${P}-autotools.patch
+)
+   #"${FILESDIR}"/vice_rath.txt
+
+src_prepare() {
+   default
+   sed -i \
+   -e 's/building//' \
+   doc/Makefile.am || die
+   sed -i \
+   -e "/^docdir =/s:=.*:=/usr/share/doc/${PF}:" \
+   

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Austin English]

commit: aeb5bb41a2f58175517f818979dd1d6fe7f53ff2
Author: Austin English  gentoo  org>
AuthorDate: Tue Nov 15 19:48:47 2016 +
Commit: Austin English  gentoo  org>
CommitDate: Thu Jan 19 01:10:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aeb5bb41

app-emulation/vice: call xdg_environment_reset() in src_prepare() to avoid 
sandbox violations

Gentoo-Bug: https://bugs.gentoo.org/599576

Package-Manager: portage-2.3.2

 app-emulation/vice/vice-2.4.27-r3.ebuild | 179 +++
 1 file changed, 179 insertions(+)

diff --git a/app-emulation/vice/vice-2.4.27-r3.ebuild 
b/app-emulation/vice/vice-2.4.27-r3.ebuild
new file mode 100644
index ..610845f
--- /dev/null
+++ b/app-emulation/vice/vice-2.4.27-r3.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools eutils toolchain-funcs flag-o-matic xdg-utils
+
+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+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="Xaw3d alsa ethernet ffmpeg fullscreen +gtk ipv6 lame nls oss png 
pulseaudio sdl +sdlsound threads vte zlib"
+
+# upstream says gtk3 and sdl2 shouldn't be exposed yet.
+#REQUIRED_USE="?? ( gtk2 gtk3 sdl )"
+REQUIRED_USE="?? ( gtk sdl )"
+
+GTK_COMMON="
+   x11-libs/pango
+   x11-libs/cairo"
+#  gtk3? (
+#  x11-libs/gtk+:3
+#  vte? ( x11-libs/vte:2.90 )
+#  ${GTK_COMMON}
+#  )
+
+RDEPEND="
+   virtual/jpeg:0
+   virtual/opengl
+   media-libs/giflib
+   alsa? ( media-libs/alsa-lib )
+   pulseaudio? ( media-sound/pulseaudio )
+   sdlsound? ( media-libs/libsdl[sound] )
+   ethernet? (
+   >=net-libs/libpcap-0.9.8
+   >=net-libs/libnet-1.1.2.1:1.1
+   )
+   ffmpeg? ( virtual/ffmpeg )
+   lame? ( media-sound/lame )
+   nls? ( virtual/libintl )
+   png? ( media-libs/libpng:0 )
+   zlib? ( sys-libs/zlib )
+   sdl? (
+   media-libs/libsdl[joystick,video]
+   )
+   !sdl? (
+   fullscreen? (
+   x11-libs/libXrandr
+   x11-libs/libXxf86vm )
+   x11-libs/libX11
+   x11-libs/libXext
+   sys-libs/readline:0
+   )
+   gtk? (
+   x11-libs/gtk+:2
+   vte? ( x11-libs/vte:0 )
+   x11-libs/gtkglext
+   ${GTK_COMMON}
+   )
+   !sdl? ( !gtk? (
+   x11-libs/libXmu
+   x11-libs/libXpm
+   x11-libs/libXt
+   x11-libs/libXv
+   Xaw3d? ( x11-libs/libXaw3d )
+   !Xaw3d? ( x11-libs/libXaw )
+   ) )
+   "
+
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   !sdl? (
+   fullscreen? ( x11-proto/xf86vidmodeproto )
+   !gtk? (
+   x11-libs/libICE
+   x11-libs/libSM
+   )
+   )
+   x11-apps/bdftopcf
+   x11-apps/mkfontdir
+   x11-proto/xproto
+   x11-proto/xextproto
+   media-libs/fontconfig
+   x11-proto/videoproto
+   nls? ( sys-devel/gettext )"
+
+PATCH=(
+   "${FILESDIR}"/${P}-autotools.patch
+)
+   #"${FILESDIR}"/vice_rath.txt
+
+src_prepare() {
+   # See https://bugs.gentoo.org/599576
+   xdg_environment_reset
+
+   default
+   sed -i \
+   -e 's/building//' \
+   doc/Makefile.am || die
+   sed -i \
+   -e "/^docdir =/s:=.*:=/usr/share/doc/${PF}:" \
+   doc/Makefile.am \
+   doc/readmes/Makefile.am || die
+   sed -i \
+   -e "/^docdir =/s:=.*:=/usr/share/doc/${PF}/html:" \
+   doc/html/Makefile.am || die
+   sed -i \
+   -e "s:/usr/local/lib/VICE:/usr/$(get_libdir)/${PN}:" \
+   man/vice.1 \
+   $(grep -rl --exclude="*texi" /usr/local/lib doc) || die
+   sed -i \
+   -e "/VICEDIR=/s:=.*:=\"/usr/$(get_libdir)/${PN}\";:" \
+   configure.ac || die
+   sed -i \
+   -e "s:\(#define LIBDIR \).*:\1\"/usr/$(get_libdir)/${PN}\":" \
+   -e "s:\(#define DOCDIR \).*:\1\"/usr/share/doc/${PF}\":" \
+   src/arch/unix/archdep.h \
+   src/arch/sdl/archdep_unix.h || die
+   rm -rf src/lib/{libffmpeg,liblame} || die
+   sed -i \
+   -e '/SUBDIRS/s/libffmpeg//;' \
+   -e '/SUBDIRS/s/liblame//;' \
+   src/lib/Makefile.am || die
+   AT_NO_RECURSIVE=1 eautoreconf
+}
+
+src_configure() {
+   local gui_arg snd_arg
+
+   snd_arg+=" $(use_with alsa)"
+   snd_arg+=" $(use_with oss)"
+   snd_arg+=" $(use_with pulseaudio pulse)"
+   snd_arg+=" $(use_with sdlsound)"
+
+   

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Austin English]

commit: df09dd0461d4bcdab5da03d452e7ee8bb402535c
Author: Austin English  gentoo  org>
AuthorDate: Fri Oct 14 17:48:09 2016 +
Commit: Austin English  gentoo  org>
CommitDate: Fri Oct 14 17:49:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df09dd04

app-emulation/vice: ensure that libraries are installed to /usr/lib64

Gentoo-Bug: https://bugs.gentoo.org/595968

Package-Manager: portage-2.3.0

 app-emulation/vice/vice-2.4.27-r2.ebuild | 174 +++
 1 file changed, 174 insertions(+)

diff --git a/app-emulation/vice/vice-2.4.27-r2.ebuild 
b/app-emulation/vice/vice-2.4.27-r2.ebuild
new file mode 100644
index ..2782d0f
--- /dev/null
+++ b/app-emulation/vice/vice-2.4.27-r2.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools eutils toolchain-funcs flag-o-matic
+
+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+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="Xaw3d alsa ethernet ffmpeg fullscreen +gtk ipv6 lame nls oss png 
pulseaudio sdl +sdlsound threads vte zlib"
+
+# upstream says gtk3 and sdl2 shouldn't be exposed yet.
+#REQUIRED_USE="?? ( gtk2 gtk3 sdl )"
+REQUIRED_USE="?? ( gtk sdl )"
+
+GTK_COMMON="
+   x11-libs/pango
+   x11-libs/cairo"
+#  gtk3? (
+#  x11-libs/gtk+:3
+#  vte? ( x11-libs/vte:2.90 )
+#  ${GTK_COMMON}
+#  )
+RDEPEND="
+   virtual/jpeg:0
+   virtual/opengl
+   media-libs/giflib
+   alsa? ( media-libs/alsa-lib )
+   pulseaudio? ( media-sound/pulseaudio )
+   sdlsound? ( media-libs/libsdl[sound] )
+   ethernet? (
+   >=net-libs/libpcap-0.9.8
+   >=net-libs/libnet-1.1.2.1:1.1
+   )
+   ffmpeg? ( virtual/ffmpeg )
+   lame? ( media-sound/lame )
+   nls? ( virtual/libintl )
+   png? ( media-libs/libpng:0 )
+   zlib? ( sys-libs/zlib )
+   sdl? (
+   media-libs/libsdl[joystick,video]
+   )
+   !sdl? (
+   fullscreen? (
+   x11-libs/libXrandr
+   x11-libs/libXxf86vm )
+   x11-libs/libX11
+   x11-libs/libXext
+   sys-libs/readline:0
+   )
+   gtk? (
+   x11-libs/gtk+:2
+   vte? ( x11-libs/vte:0 )
+   x11-libs/gtkglext
+   ${GTK_COMMON}
+   )
+   !sdl? ( !gtk? (
+   x11-libs/libXmu
+   x11-libs/libXpm
+   x11-libs/libXt
+   x11-libs/libXv
+   Xaw3d? ( x11-libs/libXaw3d )
+   !Xaw3d? ( x11-libs/libXaw )
+   ) )
+   "
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   !sdl? (
+   fullscreen? ( x11-proto/xf86vidmodeproto )
+   !gtk? (
+   x11-libs/libICE
+   x11-libs/libSM
+   )
+   )
+   x11-apps/bdftopcf
+   x11-apps/mkfontdir
+   x11-proto/xproto
+   x11-proto/xextproto
+   media-libs/fontconfig
+   x11-proto/videoproto
+   nls? ( sys-devel/gettext )"
+
+PATCH=(
+   "${FILESDIR}"/${P}-autotools.patch
+)
+   #"${FILESDIR}"/vice_rath.txt
+
+src_prepare() {
+   default
+   sed -i \
+   -e 's/building//' \
+   doc/Makefile.am || die
+   sed -i \
+   -e "/^docdir =/s:=.*:=/usr/share/doc/${PF}:" \
+   doc/Makefile.am \
+   doc/readmes/Makefile.am || die
+   sed -i \
+   -e "/^docdir =/s:=.*:=/usr/share/doc/${PF}/html:" \
+   doc/html/Makefile.am || die
+   sed -i \
+   -e "s:/usr/local/lib/VICE:/usr/$(get_libdir)/${PN}:" \
+   man/vice.1 \
+   $(grep -rl --exclude="*texi" /usr/local/lib doc) || die
+   sed -i \
+   -e "/VICEDIR=/s:=.*:=\"/usr/$(get_libdir)/${PN}\";:" \
+   configure.ac || die
+   sed -i \
+   -e "s:\(#define LIBDIR \).*:\1\"/usr/$(get_libdir)/${PN}\":" \
+   -e "s:\(#define DOCDIR \).*:\1\"/usr/share/doc/${PF}\":" \
+   src/arch/unix/archdep.h \
+   src/arch/sdl/archdep_unix.h || die
+   rm -rf src/lib/{libffmpeg,liblame} || die
+   sed -i \
+   -e '/SUBDIRS/s/libffmpeg//;' \
+   -e '/SUBDIRS/s/liblame//;' \
+   src/lib/Makefile.am || die
+   AT_NO_RECURSIVE=1 eautoreconf
+}
+
+src_configure() {
+   local gui_arg snd_arg
+
+   snd_arg+=" $(use_with alsa)"
+   snd_arg+=" $(use_with oss)"
+   snd_arg+=" $(use_with pulseaudio pulse)"
+   snd_arg+=" $(use_with sdlsound)"
+
+   gui_arg+=" $(use_enable sdl sdlui)"
+   # The gtk UI code has raw calls to XOpenDisplay and
+   # is missing 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Austin English]

commit: 35e39f7b4bfb0a96dbd40eee6e5b4fb913bc4656
Author: Austin English  gentoo  org>
AuthorDate: Fri Oct 14 17:49:00 2016 +
Commit: Austin English  gentoo  org>
CommitDate: Fri Oct 14 17:49:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35e39f7b

app-emulation/vice: remove broken vice-2.4.27-r1, superseded by vice-2.4.27-r2

Package-Manager: portage-2.3.0

 app-emulation/vice/vice-2.4.27-r1.ebuild | 174 ---
 1 file changed, 174 deletions(-)

diff --git a/app-emulation/vice/vice-2.4.27-r1.ebuild 
b/app-emulation/vice/vice-2.4.27-r1.ebuild
deleted file mode 100644
index ee4aa0b..
--- a/app-emulation/vice/vice-2.4.27-r1.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit autotools eutils toolchain-funcs flag-o-matic
-
-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+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="Xaw3d alsa ethernet ffmpeg fullscreen +gtk ipv6 lame nls oss png 
pulseaudio sdl +sdlsound threads vte zlib"
-
-# upstream says gtk3 and sdl2 shouldn't be exposed yet.
-#REQUIRED_USE="?? ( gtk2 gtk3 sdl )"
-REQUIRED_USE="?? ( gtk sdl )"
-
-GTK_COMMON="
-   x11-libs/pango
-   x11-libs/cairo"
-#  gtk3? (
-#  x11-libs/gtk+:3
-#  vte? ( x11-libs/vte:2.90 )
-#  ${GTK_COMMON}
-#  )
-RDEPEND="
-   virtual/jpeg:0
-   virtual/opengl
-   media-libs/giflib
-   alsa? ( media-libs/alsa-lib )
-   pulseaudio? ( media-sound/pulseaudio )
-   sdlsound? ( media-libs/libsdl[sound] )
-   ethernet? (
-   >=net-libs/libpcap-0.9.8
-   >=net-libs/libnet-1.1.2.1:1.1
-   )
-   ffmpeg? ( virtual/ffmpeg )
-   lame? ( media-sound/lame )
-   nls? ( virtual/libintl )
-   png? ( media-libs/libpng:0 )
-   zlib? ( sys-libs/zlib )
-   sdl? (
-   media-libs/libsdl[joystick,video]
-   )
-   !sdl? (
-   fullscreen? (
-   x11-libs/libXrandr
-   x11-libs/libXxf86vm )
-   x11-libs/libX11
-   x11-libs/libXext
-   sys-libs/readline:0
-   )
-   gtk? (
-   x11-libs/gtk+:2
-   vte? ( x11-libs/vte:0 )
-   x11-libs/gtkglext
-   ${GTK_COMMON}
-   )
-   !sdl? ( !gtk? (
-   x11-libs/libXmu
-   x11-libs/libXpm
-   x11-libs/libXt
-   x11-libs/libXv
-   Xaw3d? ( x11-libs/libXaw3d )
-   !Xaw3d? ( x11-libs/libXaw )
-   ) )
-   "
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   !sdl? (
-   fullscreen? ( x11-proto/xf86vidmodeproto )
-   !gtk? (
-   x11-libs/libICE
-   x11-libs/libSM
-   )
-   )
-   x11-apps/bdftopcf
-   x11-apps/mkfontdir
-   x11-proto/xproto
-   x11-proto/xextproto
-   media-libs/fontconfig
-   x11-proto/videoproto
-   nls? ( sys-devel/gettext )"
-
-PATCH=(
-   "${FILESDIR}"/${P}-autotools.patch
-)
-   #"${FILESDIR}"/vice_rath.txt
-
-src_prepare() {
-   default
-   sed -i \
-   -e 's/building//' \
-   doc/Makefile.am || die
-   sed -i \
-   -e "/^docdir =/s:=.*:=/usr/share/doc/${PF}:" \
-   doc/Makefile.am \
-   doc/readmes/Makefile.am || die
-   sed -i \
-   -e "/^docdir =/s:=.*:=/usr/share/doc/${PF}/html:" \
-   doc/html/Makefile.am || die
-   sed -i \
-   -e "s:/usr/local/lib/VICE:/$(get_libdir)/${PN}:" \
-   man/vice.1 \
-   $(grep -rl --exclude="*texi" /usr/local/lib doc) || die
-   sed -i \
-   -e "/VICEDIR=/s:=.*:=\"/$(get_libdir)/${PN}\";:" \
-   configure.ac || die
-   sed -i \
-   -e "s:\(#define LIBDIR \).*:\1\"$(get_libdir)/${PN}\":" \
-   -e "s:\(#define DOCDIR \).*:\1\"/usr/share/doc/${PF}\":" \
-   src/arch/unix/archdep.h \
-   src/arch/sdl/archdep_unix.h || die
-   rm -rf src/lib/{libffmpeg,liblame} || die
-   sed -i \
-   -e '/SUBDIRS/s/libffmpeg//;' \
-   -e '/SUBDIRS/s/liblame//;' \
-   src/lib/Makefile.am || die
-   AT_NO_RECURSIVE=1 eautoreconf
-}
-
-src_configure() {
-   local gui_arg snd_arg
-
-   snd_arg+=" $(use_with alsa)"
-   snd_arg+=" $(use_with oss)"
-   snd_arg+=" $(use_with pulseaudio pulse)"
-   snd_arg+=" $(use_with sdlsound)"
-
-   gui_arg+=" $(use_enable sdl sdlui)"
-   # The gtk UI code has raw calls to XOpenDisplay and
-   # is missing -lX11 if vte doesn't pull it in.
-   #if 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/files/, app-emulation/vice/

[Michael Sterrett]

commit: 1e3077b1095f1187c6ab1fb78d57102cf7781f30
Author: Michael Sterrett  gentoo  org>
AuthorDate: Mon May 30 20:00:53 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Mon May 30 20:01:09 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e3077b1

app-emulation/vice: version bump

Package-Manager: portage-2.2.28

 app-emulation/vice/Manifest|   1 +
 .../vice/files/vice-2.4.27-autotools.patch |  11 ++
 app-emulation/vice/vice-2.4.27.ebuild  | 170 +
 3 files changed, 182 insertions(+)

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 64ad041..dde8136 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1 +1,2 @@
 DIST vice-2.4.22.tar.gz 25180343 SHA256 
767e00eb9dbd1a9bcc6db8b4cd1697b8bc744b1d507bbac930975ee130378d9d SHA512 
b43e609ae2f43717d10e079d3b8ac284e5c4920ed222c7502e9a7b75dfe32784628031ae6cf8672c8d9d50576fb714cecdd1a9292bf53477f4bbd52c10403975
 WHIRLPOOL 
580de25d739585c0316c91aba44bb17b2cd4cc19f162e3c5e53b8a7a9e3f694e8c5d8d549b232259d5c9ed077549410b220169a3c026ebad55bc7c537922be81
+DIST vice-2.4.27.tar.gz 25561665 SHA256 
ce8b8649308b38f5245490c9df13230d075d3e571b538807d4ca8dd1d53e0b47 SHA512 
589b9892f3180db6f169e74b863171f08567045862f2f47cac73ef946e81d55dcde5373fc910cfd1659238669f12ee6ad934c7143c87fad736cda77479439bec
 WHIRLPOOL 
44633477e9ec5bf6b950efa6743647304770a44d58c624b623c992d09735446c79185ca410af60768554b62c0db4675e99c9db1a25c49b3b861860d00a298406

diff --git a/app-emulation/vice/files/vice-2.4.27-autotools.patch 
b/app-emulation/vice/files/vice-2.4.27-autotools.patch
new file mode 100644
index 000..7bebd28
--- /dev/null
+++ b/app-emulation/vice/files/vice-2.4.27-autotools.patch
@@ -0,0 +1,11 @@
+--- vice-2.4.7.orig/configure.ac
 vice-2.4.7/configure.ac
+@@ -124,7 +118,7 @@
+ AC_SUBST(VICE_VERSION)
+ 
+ AM_INIT_AUTOMAKE(vice, $VICE_VERSION)
+-AM_CONFIG_HEADER(src/config.h)
++AC_CONFIG_HEADERS(src/config.h)
+ 
+ if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then
+   VERSION_RC=$VICE_VERSION_MAJOR","$VICE_VERSION_MINOR",0,0"

diff --git a/app-emulation/vice/vice-2.4.27.ebuild 
b/app-emulation/vice/vice-2.4.27.ebuild
new file mode 100644
index 000..f70e449
--- /dev/null
+++ b/app-emulation/vice/vice-2.4.27.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+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+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="Xaw3d alsa ethernet ffmpeg fullscreen +gtk ipv6 lame nls oss png 
pulseaudio sdl +sdlsound threads vte zlib"
+
+# upstream says gtk3 and sdl2 shouldn't be exposed yet.
+#REQUIRED_USE="?? ( gtk2 gtk3 sdl )"
+REQUIRED_USE="?? ( gtk sdl )"
+
+GTK_COMMON="
+   x11-libs/pango
+   x11-libs/cairo"
+#  gtk3? (
+#  x11-libs/gtk+:3
+#  vte? ( x11-libs/vte:2.90 )
+#  ${GTK_COMMON}
+#  )
+RDEPEND="
+   virtual/jpeg:0
+   virtual/opengl
+   media-libs/giflib
+   alsa? ( media-libs/alsa-lib )
+   pulseaudio? ( media-sound/pulseaudio )
+   sdlsound? ( media-libs/libsdl[sound] )
+   ethernet? (
+   >=net-libs/libpcap-0.9.8
+   >=net-libs/libnet-1.1.2.1:1.1
+   )
+   ffmpeg? ( virtual/ffmpeg )
+   lame? ( media-sound/lame )
+   nls? ( virtual/libintl )
+   png? ( media-libs/libpng:0 )
+   zlib? ( sys-libs/zlib )
+   sdl? (
+   media-libs/libsdl[joystick,video]
+   )
+   !sdl? (
+   fullscreen? (
+   x11-libs/libXrandr
+   x11-libs/libXxf86vm )
+   x11-libs/libX11
+   x11-libs/libXext
+   sys-libs/readline:0
+   )
+   gtk? (
+   x11-libs/gtk+:2
+   vte? ( x11-libs/vte:0 )
+   x11-libs/gtkglext
+   ${GTK_COMMON}
+   )
+   !sdl? ( !gtk? (
+   x11-libs/libXmu
+   x11-libs/libXpm
+   x11-libs/libXt
+   x11-libs/libXv
+   Xaw3d? ( x11-libs/libXaw3d )
+   !Xaw3d? ( x11-libs/libXaw )
+   ) )
+   "
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   !sdl? (
+   fullscreen? ( x11-proto/xf86vidmodeproto )
+   !gtk? (
+   x11-libs/libICE
+   x11-libs/libSM
+   )
+   )
+   x11-apps/bdftopcf
+   x11-apps/mkfontdir
+   x11-proto/xproto
+   x11-proto/xextproto
+   media-libs/fontconfig
+   x11-proto/videoproto
+   nls? ( sys-devel/gettext )"
+
+src_prepare() {
+   epatch 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/files/, app-emulation/vice/

[Michael Sterrett]

commit: b8f5a3c2770d2d3f96a27d846c73c3072d3abbc3
Author: Michael Sterrett  gentoo  org>
AuthorDate: Tue Dec 29 05:15:03 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Tue Dec 29 07:40:54 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8f5a3c2

old

Package-Manager: portage-2.2.24

 app-emulation/vice/Manifest|   1 -
 .../vice/files/vice-2.4.20-autotools.patch |  11 --
 app-emulation/vice/files/vice-2.4.20-format.patch  |  20 ---
 .../vice/files/vice-2.4.20-xf86extensions.patch|  15 --
 app-emulation/vice/vice-2.4.20.ebuild  | 173 -
 5 files changed, 220 deletions(-)

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 4e11019..64ad041 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,2 +1 @@
-DIST vice-2.4.20.tar.gz 25156408 SHA256 
e5d3d125940f0fafe409aabeec9de4e3ae8d9c19a731aa7ec6a57f6d2b897c5f SHA512 
a27b1672ca356d0e8f2890c91e449b78ef76512f6d81bdf25350b90c1f472d57ae6d23646d0176c5544c47d81023aa3deb172e3a02eeb0022ea32a13311b5a76
 WHIRLPOOL 
5f25bfa72ade54dbe09699b5932df2c37017c3993daba048eb09f723a4351300b6722cf06ceb264202459051780a775f45b787b6ea60db78560d5c65da684541
 DIST vice-2.4.22.tar.gz 25180343 SHA256 
767e00eb9dbd1a9bcc6db8b4cd1697b8bc744b1d507bbac930975ee130378d9d SHA512 
b43e609ae2f43717d10e079d3b8ac284e5c4920ed222c7502e9a7b75dfe32784628031ae6cf8672c8d9d50576fb714cecdd1a9292bf53477f4bbd52c10403975
 WHIRLPOOL 
580de25d739585c0316c91aba44bb17b2cd4cc19f162e3c5e53b8a7a9e3f694e8c5d8d549b232259d5c9ed077549410b220169a3c026ebad55bc7c537922be81

diff --git a/app-emulation/vice/files/vice-2.4.20-autotools.patch 
b/app-emulation/vice/files/vice-2.4.20-autotools.patch
deleted file mode 100644
index 7bebd28..000
--- a/app-emulation/vice/files/vice-2.4.20-autotools.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 vice-2.4.7.orig/configure.ac
-+++ vice-2.4.7/configure.ac
-@@ -124,7 +118,7 @@
- AC_SUBST(VICE_VERSION)
- 
- AM_INIT_AUTOMAKE(vice, $VICE_VERSION)
--AM_CONFIG_HEADER(src/config.h)
-+AC_CONFIG_HEADERS(src/config.h)
- 
- if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then
-   VERSION_RC=$VICE_VERSION_MAJOR","$VICE_VERSION_MINOR",0,0"

diff --git a/app-emulation/vice/files/vice-2.4.20-format.patch 
b/app-emulation/vice/files/vice-2.4.20-format.patch
deleted file mode 100644
index 1c782fd..000
--- a/app-emulation/vice/files/vice-2.4.20-format.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 src/main.c.old 2015-10-19 17:25:07.549164652 +0200
-+++ src/main.c 2015-10-19 17:25:33.106694706 +0200
-@@ -227,7 +227,7 @@
- for (i = 0; core_team[i].name; i++) {
- n += strlen(core_team[i].name);
- if (n > 74) {
--log_message(LOG_DEFAULT, tmp);
-+log_message(LOG_DEFAULT, "%s", tmp);
- n = 0; *tmp = 0;
- }
- strcat(tmp, core_team[i].name);
-@@ -235,7 +235,7 @@
- strcat(tmp, ", ");
- } else {
- strcat(tmp, ".");
--log_message(LOG_DEFAULT, tmp);
-+log_message(LOG_DEFAULT, "%s", tmp);
- }
- }
- lib_free(tmp);

diff --git a/app-emulation/vice/files/vice-2.4.20-xf86extensions.patch 
b/app-emulation/vice/files/vice-2.4.20-xf86extensions.patch
deleted file mode 100644
index 357d686..000
--- a/app-emulation/vice/files/vice-2.4.20-xf86extensions.patch
+++ /dev/null
@@ -1,15 +0,0 @@
 a/trunk/vice/src/arch/unix/x11/gnome/x11ui.c
-+++ b/trunk/vice/src/arch/unix/x11/gnome/x11ui.c
-@@ -102,9 +102,10 @@
- #include "ui-threads.h"
- #endif
- 
--#ifdef USE_XF86_EXTENSIONS
-+#if defined(USE_XF86_EXTENSIONS) || !defined(HAVE_VTE)
- #include 
- #endif
-+
- #include "x11ui.h"
- 
- #ifdef DEBUG_X11UI
-

diff --git a/app-emulation/vice/vice-2.4.20.ebuild 
b/app-emulation/vice/vice-2.4.20.ebuild
deleted file mode 100644
index 1ee7dc6..000
--- a/app-emulation/vice/vice-2.4.20.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-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+"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="Xaw3d alsa ethernet ffmpeg fullscreen +gtk2 ipv6 lame nls oss png 
pulseaudio sdl +sdlsound threads vte zlib"
-
-# upstream says gtk3 and sdl2 shouldn't be exposed yet.
-#REQUIRED_USE="?? ( gtk2 gtk3 sdl )"
-REQUIRED_USE="?? ( gtk2 sdl )"
-
-GTK_COMMON="
-   x11-libs/pango
-   x11-libs/cairo"
-#  gtk3? (
-#  x11-libs/gtk+:3
-#  vte? ( x11-libs/vte:2.90 )
-#  ${GTK_COMMON}
-#  )
-RDEPEND="
-   virtual/jpeg:0
-   virtual/opengl
-   media-libs/giflib
-   alsa? ( media-libs/alsa-lib )
-   pulseaudio? 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Michael Sterrett]

commit: 32f2b30e00e103919a7c30410b78fdcf8965bc63
Author: Michael Sterrett  gentoo  org>
AuthorDate: Tue Dec 29 05:15:38 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Tue Dec 29 07:40:55 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32f2b30e

clean unused use flag

Package-Manager: portage-2.2.24

 app-emulation/vice/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-emulation/vice/metadata.xml b/app-emulation/vice/metadata.xml
index 672d48a..d1b9f8b 100644
--- a/app-emulation/vice/metadata.xml
+++ b/app-emulation/vice/metadata.xml
@@ -5,7 +5,6 @@

Enable ethernet emulation
Enable the ability to run 
fullscreen
-   Use GTK+2 for GUI instead of GTK+3
Use media-libs/libsdl for 
sound support
Enable support for x11-libs/vte in 
the GTK+ interface

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Agostino Sarubbo]

commit: 27c73a1664805323491fb096cc4de04316f130ee
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Dec 14 14:11:20 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Dec 14 14:11:20 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27c73a16

app-emulation/vice: amd64 stable wrt bug #568078

Package-Manager: portage-2.2.24
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-emulation/vice/vice-2.4.22.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/vice/vice-2.4.22.ebuild 
b/app-emulation/vice/vice-2.4.22.ebuild
index a186624..a0138be 100644
--- a/app-emulation/vice/vice-2.4.22.ebuild
+++ b/app-emulation/vice/vice-2.4.22.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
 IUSE="Xaw3d alsa ethernet ffmpeg fullscreen +gtk ipv6 lame nls oss png 
pulseaudio sdl +sdlsound threads vte zlib"
 
 # upstream says gtk3 and sdl2 shouldn't be exposed yet.

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/files/, app-emulation/vice/

[Michael Sterrett]

commit: 79181c4192325a722f4c01aa987e152e1efbff96
Author: Michael Sterrett  gentoo  org>
AuthorDate: Thu Nov 12 04:06:55 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Thu Nov 12 04:06:55 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79181c41

restore mistakenly removed stable ebuild (bug #565442)

Package-Manager: portage-2.2.20.1

 app-emulation/vice/Manifest|   1 +
 .../vice/files/vice-2.4.20-autotools.patch |  11 ++
 app-emulation/vice/files/vice-2.4.20-format.patch  |  20 +++
 .../vice/files/vice-2.4.20-xf86extensions.patch|  15 ++
 app-emulation/vice/metadata.xml|   1 +
 app-emulation/vice/vice-2.4.20.ebuild  | 173 +
 6 files changed, 221 insertions(+)

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 7c68c74..2180a63 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,2 +1,3 @@
+DIST vice-2.4.20.tar.gz 25156408 SHA256 
e5d3d125940f0fafe409aabeec9de4e3ae8d9c19a731aa7ec6a57f6d2b897c5f SHA512 
a27b1672ca356d0e8f2890c91e449b78ef76512f6d81bdf25350b90c1f472d57ae6d23646d0176c5544c47d81023aa3deb172e3a02eeb0022ea32a13311b5a76
 WHIRLPOOL 
5f25bfa72ade54dbe09699b5932df2c37017c3993daba048eb09f723a4351300b6722cf06ceb264202459051780a775f45b787b6ea60db78560d5c65da684541
 DIST vice-2.4.22.tar.gz 25180343 SHA256 
767e00eb9dbd1a9bcc6db8b4cd1697b8bc744b1d507bbac930975ee130378d9d SHA512 
b43e609ae2f43717d10e079d3b8ac284e5c4920ed222c7502e9a7b75dfe32784628031ae6cf8672c8d9d50576fb714cecdd1a9292bf53477f4bbd52c10403975
 WHIRLPOOL 
580de25d739585c0316c91aba44bb17b2cd4cc19f162e3c5e53b8a7a9e3f694e8c5d8d549b232259d5c9ed077549410b220169a3c026ebad55bc7c537922be81
 DIST vice-2.4.tar.gz 13656511 SHA256 
ff8b8d5f0f497d1f8e75b95bbc4204993a789284a08a8a59ba727ad81dcace10 SHA512 
ad197fc35eb80c9738b7f4f551d350dbb4440c7c8103e5d472b7f7ea5106c1356e9d6e3f481552a028a313129ef233833d3147e03f6f00b9890229d5708e3ebb
 WHIRLPOOL 
80f89f7c144fe1ef2305e109049b49e47dfa4af9b69d0d848bf7b06bd0f2d210669acece363b550abad1c50f53dd45a30397eb1bfacfaa443c9e865c686d0823

diff --git a/app-emulation/vice/files/vice-2.4.20-autotools.patch 
b/app-emulation/vice/files/vice-2.4.20-autotools.patch
new file mode 100644
index 000..7bebd28
--- /dev/null
+++ b/app-emulation/vice/files/vice-2.4.20-autotools.patch
@@ -0,0 +1,11 @@
+--- vice-2.4.7.orig/configure.ac
 vice-2.4.7/configure.ac
+@@ -124,7 +118,7 @@
+ AC_SUBST(VICE_VERSION)
+ 
+ AM_INIT_AUTOMAKE(vice, $VICE_VERSION)
+-AM_CONFIG_HEADER(src/config.h)
++AC_CONFIG_HEADERS(src/config.h)
+ 
+ if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then
+   VERSION_RC=$VICE_VERSION_MAJOR","$VICE_VERSION_MINOR",0,0"

diff --git a/app-emulation/vice/files/vice-2.4.20-format.patch 
b/app-emulation/vice/files/vice-2.4.20-format.patch
new file mode 100644
index 000..1c782fd
--- /dev/null
+++ b/app-emulation/vice/files/vice-2.4.20-format.patch
@@ -0,0 +1,20 @@
+--- src/main.c.old 2015-10-19 17:25:07.549164652 +0200
 src/main.c 2015-10-19 17:25:33.106694706 +0200
+@@ -227,7 +227,7 @@
+ for (i = 0; core_team[i].name; i++) {
+ n += strlen(core_team[i].name);
+ if (n > 74) {
+-log_message(LOG_DEFAULT, tmp);
++log_message(LOG_DEFAULT, "%s", tmp);
+ n = 0; *tmp = 0;
+ }
+ strcat(tmp, core_team[i].name);
+@@ -235,7 +235,7 @@
+ strcat(tmp, ", ");
+ } else {
+ strcat(tmp, ".");
+-log_message(LOG_DEFAULT, tmp);
++log_message(LOG_DEFAULT, "%s", tmp);
+ }
+ }
+ lib_free(tmp);

diff --git a/app-emulation/vice/files/vice-2.4.20-xf86extensions.patch 
b/app-emulation/vice/files/vice-2.4.20-xf86extensions.patch
new file mode 100644
index 000..357d686
--- /dev/null
+++ b/app-emulation/vice/files/vice-2.4.20-xf86extensions.patch
@@ -0,0 +1,15 @@
+--- a/trunk/vice/src/arch/unix/x11/gnome/x11ui.c
 b/trunk/vice/src/arch/unix/x11/gnome/x11ui.c
+@@ -102,9 +102,10 @@
+ #include "ui-threads.h"
+ #endif
+ 
+-#ifdef USE_XF86_EXTENSIONS
++#if defined(USE_XF86_EXTENSIONS) || !defined(HAVE_VTE)
+ #include 
+ #endif
++
+ #include "x11ui.h"
+ 
+ #ifdef DEBUG_X11UI
+

diff --git a/app-emulation/vice/metadata.xml b/app-emulation/vice/metadata.xml
index 242aab2..9364cf9 100644
--- a/app-emulation/vice/metadata.xml
+++ b/app-emulation/vice/metadata.xml
@@ -5,6 +5,7 @@

Enable ethernet emulation
Enable the ability to run 
fullscreen
+   Use GTK+2 for GUI instead of GTK+3
Enable extra monitor features
Use media-libs/libsdl for 
sound support
Enable support for x11-libs/vte in 
the GTK+ interface

diff --git a/app-emulation/vice/vice-2.4.20.ebuild 
b/app-emulation/vice/vice-2.4.20.ebuild
new file mode 100644
index 000..1ee7dc6
--- /dev/null
+++ 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Michael Sterrett]

commit: 6f5db7efa1af1837c0eece788e7d1bfcec0c9f33
Author: Michael Sterrett  gentoo  org>
AuthorDate: Thu Nov 12 06:51:17 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Thu Nov 12 06:51:30 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f5db7ef

add readline slot dep

Package-Manager: portage-2.2.20.1

 app-emulation/vice/vice-2.4.22.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/vice/vice-2.4.22.ebuild 
b/app-emulation/vice/vice-2.4.22.ebuild
index 407949c..a186624 100644
--- a/app-emulation/vice/vice-2.4.22.ebuild
+++ b/app-emulation/vice/vice-2.4.22.ebuild
@@ -51,7 +51,7 @@ RDEPEND="
x11-libs/libXxf86vm )
x11-libs/libX11
x11-libs/libXext
-   sys-libs/readline
+   sys-libs/readline:0
)
gtk? (
x11-libs/gtk+:2

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/, app-emulation/vice/files/

[Michael Sterrett]

commit: c41c56e371b9d37548ad78b7a4127c668971c2b3
Author: Michael Sterrett  gentoo  org>
AuthorDate: Tue Nov 10 08:01:44 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Tue Nov 10 08:02:04 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c41c56e3

version bump; clean old

Package-Manager: portage-2.2.20.1

 app-emulation/vice/Manifest |  2 +-
 app-emulation/vice/files/vice-2.4.20-format.patch   | 20 
 .../vice/files/vice-2.4.20-xf86extensions.patch | 15 ---
 ...-autotools.patch => vice-2.4.22-autotools.patch} |  0
 app-emulation/vice/metadata.xml |  1 -
 .../vice/{vice-2.4.20.ebuild => vice-2.4.22.ebuild} | 21 +
 6 files changed, 10 insertions(+), 49 deletions(-)

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index bb31cd0..7c68c74 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,2 +1,2 @@
-DIST vice-2.4.20.tar.gz 25156408 SHA256 
e5d3d125940f0fafe409aabeec9de4e3ae8d9c19a731aa7ec6a57f6d2b897c5f SHA512 
a27b1672ca356d0e8f2890c91e449b78ef76512f6d81bdf25350b90c1f472d57ae6d23646d0176c5544c47d81023aa3deb172e3a02eeb0022ea32a13311b5a76
 WHIRLPOOL 
5f25bfa72ade54dbe09699b5932df2c37017c3993daba048eb09f723a4351300b6722cf06ceb264202459051780a775f45b787b6ea60db78560d5c65da684541
+DIST vice-2.4.22.tar.gz 25180343 SHA256 
767e00eb9dbd1a9bcc6db8b4cd1697b8bc744b1d507bbac930975ee130378d9d SHA512 
b43e609ae2f43717d10e079d3b8ac284e5c4920ed222c7502e9a7b75dfe32784628031ae6cf8672c8d9d50576fb714cecdd1a9292bf53477f4bbd52c10403975
 WHIRLPOOL 
580de25d739585c0316c91aba44bb17b2cd4cc19f162e3c5e53b8a7a9e3f694e8c5d8d549b232259d5c9ed077549410b220169a3c026ebad55bc7c537922be81
 DIST vice-2.4.tar.gz 13656511 SHA256 
ff8b8d5f0f497d1f8e75b95bbc4204993a789284a08a8a59ba727ad81dcace10 SHA512 
ad197fc35eb80c9738b7f4f551d350dbb4440c7c8103e5d472b7f7ea5106c1356e9d6e3f481552a028a313129ef233833d3147e03f6f00b9890229d5708e3ebb
 WHIRLPOOL 
80f89f7c144fe1ef2305e109049b49e47dfa4af9b69d0d848bf7b06bd0f2d210669acece363b550abad1c50f53dd45a30397eb1bfacfaa443c9e865c686d0823

diff --git a/app-emulation/vice/files/vice-2.4.20-format.patch 
b/app-emulation/vice/files/vice-2.4.20-format.patch
deleted file mode 100644
index 1c782fd..000
--- a/app-emulation/vice/files/vice-2.4.20-format.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 src/main.c.old 2015-10-19 17:25:07.549164652 +0200
-+++ src/main.c 2015-10-19 17:25:33.106694706 +0200
-@@ -227,7 +227,7 @@
- for (i = 0; core_team[i].name; i++) {
- n += strlen(core_team[i].name);
- if (n > 74) {
--log_message(LOG_DEFAULT, tmp);
-+log_message(LOG_DEFAULT, "%s", tmp);
- n = 0; *tmp = 0;
- }
- strcat(tmp, core_team[i].name);
-@@ -235,7 +235,7 @@
- strcat(tmp, ", ");
- } else {
- strcat(tmp, ".");
--log_message(LOG_DEFAULT, tmp);
-+log_message(LOG_DEFAULT, "%s", tmp);
- }
- }
- lib_free(tmp);

diff --git a/app-emulation/vice/files/vice-2.4.20-xf86extensions.patch 
b/app-emulation/vice/files/vice-2.4.20-xf86extensions.patch
deleted file mode 100644
index 357d686..000
--- a/app-emulation/vice/files/vice-2.4.20-xf86extensions.patch
+++ /dev/null
@@ -1,15 +0,0 @@
 a/trunk/vice/src/arch/unix/x11/gnome/x11ui.c
-+++ b/trunk/vice/src/arch/unix/x11/gnome/x11ui.c
-@@ -102,9 +102,10 @@
- #include "ui-threads.h"
- #endif
- 
--#ifdef USE_XF86_EXTENSIONS
-+#if defined(USE_XF86_EXTENSIONS) || !defined(HAVE_VTE)
- #include 
- #endif
-+
- #include "x11ui.h"
- 
- #ifdef DEBUG_X11UI
-

diff --git a/app-emulation/vice/files/vice-2.4.20-autotools.patch 
b/app-emulation/vice/files/vice-2.4.22-autotools.patch
similarity index 100%
rename from app-emulation/vice/files/vice-2.4.20-autotools.patch
rename to app-emulation/vice/files/vice-2.4.22-autotools.patch

diff --git a/app-emulation/vice/metadata.xml b/app-emulation/vice/metadata.xml
index 9364cf9..242aab2 100644
--- a/app-emulation/vice/metadata.xml
+++ b/app-emulation/vice/metadata.xml
@@ -5,7 +5,6 @@

Enable ethernet emulation
Enable the ability to run 
fullscreen
-   Use GTK+2 for GUI instead of GTK+3
Enable extra monitor features
Use media-libs/libsdl for 
sound support
Enable support for x11-libs/vte in 
the GTK+ interface

diff --git a/app-emulation/vice/vice-2.4.20.ebuild 
b/app-emulation/vice/vice-2.4.22.ebuild
similarity index 90%
rename from app-emulation/vice/vice-2.4.20.ebuild
rename to app-emulation/vice/vice-2.4.22.ebuild
index 1ee7dc6..407949c 100644
--- a/app-emulation/vice/vice-2.4.20.ebuild
+++ b/app-emulation/vice/vice-2.4.22.ebuild
@@ -11,12 +11,12 @@ SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="Xaw3d alsa ethernet ffmpeg fullscreen 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/, app-emulation/vice/files/

[Alfredo Tupone]

commit: 28c4db4acc36d174c11bdd0c4a1a2b342510568c
Author: Tupone Alfredo  gentoo  org>
AuthorDate: Mon Oct 19 15:35:39 2015 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Mon Oct 19 15:36:16 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28c4db4a

app-emulation/vice: Fix format-security Bug #560838

Package-Manager: portage-2.2.20.1

 app-emulation/vice/files/vice-2.4.20-format.patch | 20 
 app-emulation/vice/vice-2.4.20.ebuild |  1 +
 2 files changed, 21 insertions(+)

diff --git a/app-emulation/vice/files/vice-2.4.20-format.patch 
b/app-emulation/vice/files/vice-2.4.20-format.patch
new file mode 100644
index 000..1c782fd
--- /dev/null
+++ b/app-emulation/vice/files/vice-2.4.20-format.patch
@@ -0,0 +1,20 @@
+--- src/main.c.old 2015-10-19 17:25:07.549164652 +0200
 src/main.c 2015-10-19 17:25:33.106694706 +0200
+@@ -227,7 +227,7 @@
+ for (i = 0; core_team[i].name; i++) {
+ n += strlen(core_team[i].name);
+ if (n > 74) {
+-log_message(LOG_DEFAULT, tmp);
++log_message(LOG_DEFAULT, "%s", tmp);
+ n = 0; *tmp = 0;
+ }
+ strcat(tmp, core_team[i].name);
+@@ -235,7 +235,7 @@
+ strcat(tmp, ", ");
+ } else {
+ strcat(tmp, ".");
+-log_message(LOG_DEFAULT, tmp);
++log_message(LOG_DEFAULT, "%s", tmp);
+ }
+ }
+ lib_free(tmp);

diff --git a/app-emulation/vice/vice-2.4.20.ebuild 
b/app-emulation/vice/vice-2.4.20.ebuild
index 7bf5976..1ee7dc6 100644
--- a/app-emulation/vice/vice-2.4.20.ebuild
+++ b/app-emulation/vice/vice-2.4.20.ebuild
@@ -88,6 +88,7 @@ DEPEND="${RDEPEND}
 src_prepare() {
epatch \
"${FILESDIR}"/${P}-autotools.patch \
+   "${FILESDIR}"/${P}-format.patch \
"${FILESDIR}"/${P}-xf86extensions.patch
sed -i \
-e 's/building//' \

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Agostino Sarubbo]

commit: 8e90127fb27bf9764bbb69e5df9acb20c3dbc337
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Sep 22 08:55:57 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Sep 22 08:57:19 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e90127f

app-emulation/vice: ppc stable wrt bug #560226

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="ppc"

 app-emulation/vice/vice-2.4.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/vice/vice-2.4.20.ebuild 
b/app-emulation/vice/vice-2.4.20.ebuild
index 5f68ece..7bf5976 100644
--- a/app-emulation/vice/vice-2.4.20.ebuild
+++ b/app-emulation/vice/vice-2.4.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="Xaw3d alsa ethernet ffmpeg fullscreen +gtk2 ipv6 lame nls oss png 
pulseaudio sdl +sdlsound threads vte zlib"
 
 # upstream says gtk3 and sdl2 shouldn't be exposed yet.

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

[Agostino Sarubbo]

commit: a8b09db8c3c3b8d6863abd507b547e5f7b756edb
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Sep 19 13:30:07 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Sep 19 13:30:07 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8b09db8

app-emulation/vice: amd64 stable wrt bug #560226

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"

 app-emulation/vice/vice-2.4.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/vice/vice-2.4.20.ebuild 
b/app-emulation/vice/vice-2.4.20.ebuild
index d4bb166..f1f5be2 100644
--- a/app-emulation/vice/vice-2.4.20.ebuild
+++ b/app-emulation/vice/vice-2.4.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
 IUSE="Xaw3d alsa ethernet ffmpeg fullscreen +gtk2 ipv6 lame nls oss png 
pulseaudio sdl +sdlsound threads vte zlib"
 
 # upstream says gtk3 and sdl2 shouldn't be exposed yet.