diff options
author | V3n3RiX <venerix@koprulu.sector> | 2021-10-30 19:43:03 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2021-10-30 19:43:03 +0100 |
commit | 162945d2a91899b637bbb9e163b406350de12906 (patch) | |
tree | 49cc2cc66f724a7c6f033f93aaba4ae3be1f2259 /app-emulation/vice | |
parent | f660c6de84558324d784218831d8f0782ee41e2e (diff) |
gentoo resync : 30.10.2021
Diffstat (limited to 'app-emulation/vice')
-rw-r--r-- | app-emulation/vice/Manifest | 3 | ||||
-rw-r--r-- | app-emulation/vice/files/vice-pkg-config-3.4_p38553.patch | 29 | ||||
-rw-r--r-- | app-emulation/vice/vice-3.4_p38553.ebuild | 185 |
3 files changed, 0 insertions, 217 deletions
diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest index 6d9b2857d93e..702efbe20e83 100644 --- a/app-emulation/vice/Manifest +++ b/app-emulation/vice/Manifest @@ -1,6 +1,3 @@ -AUX vice-pkg-config-3.4_p38553.patch 816 BLAKE2B 58fdde3647c520b12434b221197b91d363a65640fc72df27e991f783c8fbea2b2bf962fca00384fe673a577cc354aa03861482dfadb9de6f6afa91b48b673022 SHA512 cd6b6068a4e3c521bfbcf60986ae770a379d373723e005816ad599a9a199af973f75ef9b8806f486223d2017fa118eb3a814f5efb0e3eea81c7eadeaedc54d90 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_p38553.ebuild 4410 BLAKE2B ea6539484a88baac8d3d98bbff3c4f589c4bac49c76586496b8453e7b1cfa5c402ff5a1e7a029483da5cf07d78006bc35a3557a67a63230bc85a8b12f3f469d6 SHA512 dd7a3ad05ceb453a71667e0628d8d925b03c864d07c90857d283e5737e0105895222f6bf635c28f0274c005c1f03324dfffef57610b9f32c031b76e2782339eb EBUILD vice-3.5-r1.ebuild 4077 BLAKE2B cf446708e7d2b3b84db74d7e59557a9cd078ea28cc3e3f3ec2024a14865f0ed5b8157a968bf9a53cb08c1c88c7ca1bb4937ec4b3c568fe70e9107619a5dd4942 SHA512 e207be81ee7ecd8f4049e69befd6171bcae1758538a34704e538d7903141c28b7a179c9ab2b3afddfeaabb3d410f31261f1cd525113a612d90e736c8f8f027ae MISC metadata.xml 785 BLAKE2B 1dc59c7b40fda968680e97b1ad83e741faf223143bbc1ab2d523e37312badd3a3aaedc3bbffbd158531c74ae73dab1bb1ee03666a081eb17d819dc9e0b783ee2 SHA512 b483d325702723d1395bca771d215709fc68b6ca8309c4297c6a668d5940502c9c8d5d4149e1f52b8fd6d5062cf04b2e3d7046ecfc0555d2703b064e329af283 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 557c0a927318..000000000000 --- 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 17bb3310b2ab..000000000000 --- 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? ( x11-misc/xdg-utils ) -" - -S="${WORKDIR}/${MY_P}" -ECONF_SOURCE="${S}" - -PATCHES=( - "${FILESDIR}"/vice-pkg-config-${PV}.patch -) - -src_prepare() { - default - - # Delete some bundled libraries. - rm -r src/lib/lib{ffmpeg,lame,x264} || 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 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 opengl hwscale) \ - $(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 - 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 -} |