From 24fd814c326e282c4321965c31f341dad77e270d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 8 Jan 2021 11:28:34 +0000 Subject: gentoo resync : 08.01.2021 --- app-emulation/vice/Manifest | 6 +- app-emulation/vice/vice-3.4_p37498.ebuild | 172 ------------------------------ app-emulation/vice/vice-3.4_p38553.ebuild | 4 +- app-emulation/vice/vice-3.5.ebuild | 166 ++++++++++++++++++++++++++++ 4 files changed, 171 insertions(+), 177 deletions(-) delete mode 100644 app-emulation/vice/vice-3.4_p37498.ebuild create mode 100644 app-emulation/vice/vice-3.5.ebuild (limited to 'app-emulation/vice') diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest index 38bf1da34256..d12055331672 100644 --- a/app-emulation/vice/Manifest +++ b/app-emulation/vice/Manifest @@ -1,6 +1,6 @@ AUX vice-pkg-config-3.4_p38553.patch 816 BLAKE2B 58fdde3647c520b12434b221197b91d363a65640fc72df27e991f783c8fbea2b2bf962fca00384fe673a577cc354aa03861482dfadb9de6f6afa91b48b673022 SHA512 cd6b6068a4e3c521bfbcf60986ae770a379d373723e005816ad599a9a199af973f75ef9b8806f486223d2017fa118eb3a814f5efb0e3eea81c7eadeaedc54d90 -DIST vice-emu-code-r37498-trunk-vice.zip 26810776 BLAKE2B 05baa0d123e9a0f1141ef68940455b5abfccde0204d0ffeb0a806212977be6f1f2c777267cad077272f4e09fa3c6adb9e95436adaaee5482b2ce918a3485caeb SHA512 5b4c31e51efc67ac08f6fe9361c42b80115b315fc24c128861341f2eea7567bdbb1761e52bc914df442ed5cc7f2ca7c6b0a2694441d63e63f9f693bcf72c70c0 +DIST vice-3.5.tar.gz 22557578 BLAKE2B 5573951052c2c7b2beb4dd194ad8612c53e484e47a4d935e0dbc880f2f06611252add3631f99c9656f2c941088d0147b0783020ffcc5a29505bab75ef8dc128e SHA512 02f364c1645138cacb461346d44de8f524fb2aba7d980181caf039c46ca9d30db98466e5b0e56e6a41417cd7bbd63d73bf6eb110af1271e23732e320dd1fab70 DIST vice-emu-code-r38553-trunk-vice.zip 27146846 BLAKE2B 5139e4b1e9269c3885313889dffc055298c52152da77e5a824270feb0af6ba61a1726160a6d259e9f8840fefe486cc184f5bfda3ba1797e0359159ccf1e9824f SHA512 c4d3f132bae2980163e74695126e979bd68dddecb17c2eea8227edbb675985d1f04ade665b946a5e3c707bc17e260efb61f57aa141b6ef712385d4d85a68ef86 -EBUILD vice-3.4_p37498.ebuild 4112 BLAKE2B 3e30d925e86759e7d35a05617102975e95ee15cda966645c724b30e72df7ba9233e84fb104e42c527038ccbca03ea9a959aef186d4cec9c5c514fd87a737a88f SHA512 65f9367778d826d487d0f6fea6f6faa3b09e86d6e1e82f526b4fc77739944c64ff1343c4afaceade3ca0f242084dc6d071c872909b060511352dfe6576397001 -EBUILD vice-3.4_p38553.ebuild 4412 BLAKE2B d8c7c9b01a5189916dc555bae8e44a318a090288b8ef5382f59f3feb5693e5217f13a4a5239f8d44f89e04ffe6d9befca9e3d32a610b34dcb95199d8f340cb9b SHA512 3564aa2fe0552fc2d07a59bc3956e4e5545668ba1a35bc0e2d565d463b45f9900cee16d6457800b23b1238f0950b6edab7d0de3b6df7c90dd5cd213ee94d1505 +EBUILD vice-3.4_p38553.ebuild 4410 BLAKE2B ea6539484a88baac8d3d98bbff3c4f589c4bac49c76586496b8453e7b1cfa5c402ff5a1e7a029483da5cf07d78006bc35a3557a67a63230bc85a8b12f3f469d6 SHA512 dd7a3ad05ceb453a71667e0628d8d925b03c864d07c90857d283e5737e0105895222f6bf635c28f0274c005c1f03324dfffef57610b9f32c031b76e2782339eb +EBUILD vice-3.5.ebuild 3988 BLAKE2B 24c714ef41b6767487eeacf1380f9bbaa67cfee2e3b5d899ba050a6e2581f788379ccc39bc051b0c22a9a61d22139ea09282c361a62d2a8eba7b5175d337ec69 SHA512 e97e9b518b396bee62f8edab31de4ae8c2423bdaee100de354f3384b85cd9546ebaff3039a95729de2bf97f9d382f4194e545d9fc46489612e9ada2d59af2fc5 MISC metadata.xml 692 BLAKE2B d9f0e48aab3fb0ed8ccc7b044f561a96cd563eeeabfae63371cf4b3772a8068c2b4191c09d89465402a202496a2aac7234ffab8adbcc4c17be54ab0e0c9d307c SHA512 f7be3c1e6a6394452d3f7aac52b25ba0eeb098841ecac32bbcc92257a7f09430f9a18927234ba166014523eb7b930c66d803d9105025b79ac1dbebed781fec96 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 9053d48c332d..000000000000 --- 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 ac_cv_header_mpg123_h=no - use ogg || export ac_cv_header_vorbis_vorbisfile_h=no - 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 \ - --program-transform-name="${xform}" \ - --disable-sdlui \ - $(multibuild_enable sdl sdlui2) \ - $(multibuild_enable gtk native-gtk3ui) \ - $(use_enable debug debug-gtk3ui) \ - $(multibuild_enable headless headlessui) \ - $(use_enable opengl hwscale) \ - --disable-shared-ffmpeg \ - --disable-static-ffmpeg \ - $(use_enable ffmpeg external-ffmpeg) \ - $(use_enable ethernet) \ - $(use_enable ipv6) \ - $(use_enable parport libieee1284) \ - $(use_enable portaudio) \ - $(use_enable lame) \ - $(use_enable debug) \ - --disable-arch \ - $(use_enable doc pdf-docs) \ - --enable-html-docs \ - $(use_with pulseaudio pulse) \ - $(use_with alsa) \ - $(use_with oss) \ - $(use_with jpeg) \ - $(use_with png) \ - $(use_with gif) \ - $(use_with zlib) -} - -src_compile() { - multibuild_foreach_variant run_in_build_dir emake -} - -src_install() { - multibuild_foreach_variant run_in_build_dir default - dodoc FEEDBACK - - # Delete the bundled fonts. These could be packaged separately but - # they're only for the HTML documentation. - rm -r "${ED}"/usr/share/doc/${PF}/html/fonts/ || die -} diff --git a/app-emulation/vice/vice-3.4_p38553.ebuild b/app-emulation/vice/vice-3.4_p38553.ebuild index 6035ab43a443..17bb3310b2ab 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 )" diff --git a/app-emulation/vice/vice-3.5.ebuild b/app-emulation/vice/vice-3.5.ebuild new file mode 100644 index 000000000000..8bbf1366c06f --- /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 \ + --program-transform-name="${xform}" \ + --disable-arch \ + $(use_enable debug) \ + $(use_enable debug debug-gtk3ui) \ + $(use_enable ffmpeg external-ffmpeg) \ + $(multibuild_enable headless headlessui) \ + --enable-html-docs \ + $(use_enable ethernet) \ + $(use_enable ipv6) \ + $(use_enable lame) \ + $(use_enable parport libieee1284) \ + $(multibuild_enable gtk native-gtk3ui) \ + $(use_enable doc pdf-docs) \ + $(use_enable portaudio) \ + --disable-sdlui \ + $(multibuild_enable sdl sdlui2) \ + --disable-shared-ffmpeg \ + --disable-static-ffmpeg \ + $(multibuild_enable gtk desktop-files) \ + $(use_with alsa) \ + $(use_with gif) \ + $(use_with jpeg) \ + $(use_with oss) \ + $(use_with png) \ + $(use_with pulseaudio pulse) \ + $(use_with zlib) \ + $(use_with mpg123) \ + $(use_with ogg vorbis) \ + $(use_with flac) +} + +src_compile() { + multibuild_foreach_variant run_in_build_dir emake +} + +src_install() { + # Get xdg-desktop-menu to play nicely while doing the install. + dodir /etc/xdg/menus /usr/share/{applications,desktop-directories} + XDG_UTILS_INSTALL_MODE=system \ + XDG_DATA_DIRS="${ED}"/usr/share \ + XDG_CONFIG_DIRS="${ED}"/etc/xdg \ + multibuild_foreach_variant run_in_build_dir default + rm -f "${ED}"/usr/share/applications/*.cache || die + + # Delete the bundled fonts. These could be packaged separately but + # they're only for the HTML documentation. + rm -r "${ED}"/usr/share/doc/${PF}/html/fonts/ || die +} -- cgit v1.2.3