From 1173ad5704ce725916e0c332416aff326d850d06 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 29 Mar 2018 16:53:27 +0100 Subject: gentoo resync : 29.03.2018 --- app-emulation/Manifest.gz | Bin 19001 -> 19000 bytes app-emulation/libvirt/Manifest | 2 - app-emulation/libvirt/libvirt-4.0.0.ebuild | 386 --------------------- app-emulation/vice/Manifest | 13 +- .../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 --------- app-emulation/vice/vice-3.1.ebuild | 2 +- 13 files changed, 2 insertions(+), 1355 deletions(-) delete mode 100644 app-emulation/libvirt/libvirt-4.0.0.ebuild delete mode 100644 app-emulation/vice/files/vice-2.4.22-autotools.patch delete mode 100644 app-emulation/vice/files/vice-2.4.27-autotools.patch delete mode 100644 app-emulation/vice/files/vice-31580-ffmpeg-build.patch delete mode 100644 app-emulation/vice/vice-2.4.22.ebuild delete mode 100644 app-emulation/vice/vice-2.4.27-r2.ebuild delete mode 100644 app-emulation/vice/vice-2.4.27-r3.ebuild delete mode 100644 app-emulation/vice/vice-2.4.27.ebuild delete mode 100644 app-emulation/vice/vice-2.4.31.ebuild (limited to 'app-emulation') diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz index 0db603e6f300..26205dad3b8a 100644 Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest index ba6c93cda23c..7bb81946e8dc 100644 --- a/app-emulation/libvirt/Manifest +++ b/app-emulation/libvirt/Manifest @@ -16,9 +16,7 @@ AUX libvirtd.service.conf 401 BLAKE2B edd74238f9639ead1d776142e6231d87f39cb6670e AUX libvirtd.tmpfiles.conf 36 BLAKE2B fa0e1dac4117dcb2a2e826c82c4c63e20156db47abf4088167484f1f3149a4998840cf1aba745621851d7e2653df5c7f7268d8d61be3a3731ea053a88f35c13b SHA512 2b1c3c64dd6fa03d8c2ae24e7ce4aa7d754913214542a68a4e99f10fbc251fd23ee26e297a957d7b4b70eec8ef028c41fc915da3a85fbbd16143bb92d1de3aed AUX virtlockd.init-r1 570 BLAKE2B 734d582d867b79649f863504fcd7c87fe3c59569b56b0996a6229d6eebadc9d4c356c10bbcf5637483fbc930d0c50233da4fffa357d423029b3828b7a3be56de SHA512 65a05d406200da9a534df5caa1b9cb2af97f0b03f64e6b4157322975fa754f59ae74fff9ec8301a6c0510e4b75e2b72a78cddf004a76109e18c375e83527cee5 AUX virtlogd.init-r1 569 BLAKE2B 20df60c23cee575577592d41d1a9913923255633d12de789c036e6085f9e7b4360e017155c61e3688332b493a0e96ffca55753bcc67a33bb877539b80eef81fe SHA512 0a3e083e742f9e0d8206ab9a48c63bbd395bdc24e5551e2cbeddffa3fb576a817b73dbafe646c392a35c354d6b65426a9b6f3ce3dcafc30077715e90684968c1 -DIST libvirt-4.0.0.tar.xz 15002248 BLAKE2B 066794909d02be04a7d70ebd5e6d423736fdaf95b7521edd47ef19f9bec4f16d6d3e64117356394ce5916761ad77d5afab84ace2f4828c1f97373d0053b6924b SHA512 c99ea305f427859eb070b5f0c43de48645a5c53a2aa8efc60f54f278ec3fa0b504307861309e1852f8d7bff4436afe00c859aac27691366a0c36c91341cea7a1 DIST libvirt-4.1.0.tar.xz 15046956 BLAKE2B e5d4fb47d6308b2f74d464b8a4b236fcda96ca71357847ce7bc9c787e89111ed99538e9f7815287d14af24db1bc774012682843edc1e067cdf710e82d0b349c9 SHA512 62d1a228adf3270cc6defe3cbf92dac8c4ce2c434c4d97219571ccef799a4f6304cfd1ba9938338356641285f53ac71145d7b398523021c5ea1dc8e3d49cf894 -EBUILD libvirt-4.0.0.ebuild 9805 BLAKE2B a536f30f0022c60a9dba1773c8986f72393a87540d4145d0ac9c8cf5474a489dd4c07d72b8582167e85b609ba6c909a3a56769436ae8f0b5bb84689dfad703b3 SHA512 3d895d85af06bddfa8e74517890d936a53651acb45a86af15f58c7190d97853afa3eaa0cd50b0799a1bb053d925ef78107f797cb06e5df4815844a90edf81a41 EBUILD libvirt-4.1.0-r3.ebuild 9685 BLAKE2B eb830bf532808d54fc1e23638dc50d3a877e0a43c641172d0f5c4b0cbda1e87590fef45991b88f4d533303287dea5971e90cdfdbe391e8a4cf1c32843d1b1ece SHA512 3bea50c850d1490a73f562ff87f435a14b4259dcad59134c39d8cb2a29264d4490c5e10eebf18114b665eff716e53aa7fb30c94b41eca73a311e2baf742d7d85 EBUILD libvirt-4.1.0.ebuild 9678 BLAKE2B 4b2a697630bcda1b28eaf9d43c8f441fe905e7612da11502a2ef5452b733f15ffd2b47d47a8afbfe1cfa956a780abe354dca43ff2a5d85a6123c7b92c87ccbea SHA512 0fbe6b67c6c74fac74bbcc91451c18d1cdbcd52424352570c96f32972fdd6b0d9bc5f46a265b1e26afa432c69e9c4d9e41dae85dea4ec56ba3e1e121ccec58b6 EBUILD libvirt-9999.ebuild 9845 BLAKE2B 6088d0682f657ce4b8137c7dbe28f325eb3814519383958cc558db8a0e8433d4f3c73a688174d6c9bf02d67d5f1e23f8951093d67288d24e89ce13a7d907cec7 SHA512 a895edde185daea93df3e1ffcd193724c796b72ee7eb6a8f4054c894ae8b14a91b45018eb0b0ee2b039d74a47be31ee95188fc0766552605d8bcdec6bc04b568 diff --git a/app-emulation/libvirt/libvirt-4.0.0.ebuild b/app-emulation/libvirt/libvirt-4.0.0.ebuild deleted file mode 100644 index 954c95e4157d..000000000000 --- a/app-emulation/libvirt/libvirt-4.0.0.ebuild +++ /dev/null @@ -1,386 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils user linux-info systemd readme.gentoo-r1 bash-completion-r1 - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="git://libvirt.org/libvirt.git" - SRC_URI="" - KEYWORDS="" - SLOT="0" -else - # Versions with 4 numbers are stable updates: - if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then - SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.xz" - else - SRC_URI="http://libvirt.org/sources/${P}.tar.xz" - fi - KEYWORDS="amd64 ~arm64 x86" - SLOT="0/${PV}" -fi - -DESCRIPTION="C toolkit to manipulate virtual machines" -HOMEPAGE="http://www.libvirt.org/" -LICENSE="LGPL-2.1" -IUSE=" - apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm - libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit - +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network - wireshark-plugins xen zeroconf zfs -" - -REQUIRED_USE=" - firewalld? ( virt-network ) - libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) - lxc? ( caps libvirtd ) - openvz? ( libvirtd ) - policykit? ( dbus ) - qemu? ( libvirtd ) - uml? ( libvirtd ) - vepa? ( macvtap ) - virt-network? ( libvirtd ) - virtualbox? ( libvirtd ) - xen? ( libvirtd )" - -# gettext.sh command is used by the libvirt command wrappers, and it's -# non-optional, so put it into RDEPEND. -# We can use both libnl:1.1 and libnl:3, but if you have both installed, the -# package will use 3 by default. Since we don't have slot pinning in an API, -# we must go with the most recent -RDEPEND=" - app-misc/scrub - dev-libs/libgcrypt:0 - dev-libs/libnl:3 - >=dev-libs/libxml2-2.7.6 - || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) - >=net-libs/gnutls-1.0.25:0= - net-libs/libssh2 - net-libs/libtirpc - net-libs/rpcsvc-proto - >=net-misc/curl-7.18.0 - sys-apps/dmidecode - >=sys-apps/util-linux-2.17 - sys-devel/gettext - sys-libs/ncurses:0= - sys-libs/readline:= - apparmor? ( sys-libs/libapparmor ) - audit? ( sys-process/audit ) - caps? ( sys-libs/libcap-ng ) - dbus? ( sys-apps/dbus ) - firewalld? ( net-firewall/firewalld ) - fuse? ( >=sys-fs/fuse-2.8.6:= ) - glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) - iscsi? ( sys-block/open-iscsi ) - libssh? ( net-libs/libssh ) - lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) - nfs? ( net-fs/nfs-utils ) - numa? ( - >sys-process/numactl-2.0.2 - sys-process/numad - ) - parted? ( - >=sys-block/parted-1.8[device-mapper] - sys-fs/lvm2[-device-mapper-only(-)] - ) - pcap? ( >=net-libs/libpcap-1.0.0 ) - policykit? ( >=sys-auth/polkit-0.9 ) - qemu? ( - >=app-emulation/qemu-0.13.0 - dev-libs/yajl - ) - rbd? ( sys-cluster/ceph ) - sasl? ( dev-libs/cyrus-sasl ) - selinux? ( >=sys-libs/libselinux-2.0.85 ) - virt-network? ( - net-dns/dnsmasq[script] - net-firewall/ebtables - >=net-firewall/iptables-1.4.10[ipv6] - net-misc/radvd - sys-apps/iproute2[-minimal] - ) - virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) - wireshark-plugins? ( net-analyzer/wireshark:= ) - xen? ( - app-emulation/xen - app-emulation/xen-tools:= - ) - udev? ( - virtual/udev - >=x11-libs/libpciaccess-0.10.9 - ) - zeroconf? ( >=net-dns/avahi-0.6[dbus] ) - zfs? ( sys-fs/zfs )" - -DEPEND="${RDEPEND} - app-text/xhtml1 - dev-lang/perl - dev-libs/libxslt - dev-perl/XML-XPath - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-1.3.0-do_not_use_sysconf.patch - "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch - "${FILESDIR}"/${PN}-3.10.0-r2-fix_paths_for_apparmor.patch - "${FILESDIR}"/${PN}-1.3.4-glibc-2.23.patch - "${FILESDIR}"/${PN}-3.1.0-musl-fix-includes.patch # bug #609488 - "${FILESDIR}"/${PN}-4.0.0-bash_completion_bugfixes.patch # bug #644632 -) - -pkg_setup() { - if use qemu; then - enewgroup qemu 77 - enewuser qemu 77 -1 -1 "qemu,kvm" - fi - - use policykit && enewgroup libvirt - - # Check kernel configuration: - CONFIG_CHECK="" - use fuse && CONFIG_CHECK+=" - ~FUSE_FS" - - use lvm && CONFIG_CHECK+=" - ~BLK_DEV_DM - ~DM_MULTIPATH - ~DM_SNAPSHOT" - - use lxc && CONFIG_CHECK+=" - ~BLK_CGROUP - ~CGROUP_CPUACCT - ~CGROUP_DEVICE - ~CGROUP_FREEZER - ~CGROUP_NET_PRIO - ~CGROUP_PERF - ~CGROUPS - ~CGROUP_SCHED - ~CPUSETS - ~IPC_NS - ~MACVLAN - ~NAMESPACES - ~NET_CLS_CGROUP - ~NET_NS - ~PID_NS - ~POSIX_MQUEUE - ~SECURITYFS - ~USER_NS - ~UTS_NS - ~VETH - ~!GRKERNSEC_CHROOT_MOUNT - ~!GRKERNSEC_CHROOT_DOUBLE - ~!GRKERNSEC_CHROOT_PIVOT - ~!GRKERNSEC_CHROOT_CHMOD - ~!GRKERNSEC_CHROOT_CAPS" - - kernel_is lt 4 7 && use lxc && CONFIG_CHECK+=" - ~DEVPTS_MULTIPLE_INSTANCES" - - use macvtap && CONFIG_CHECK+=" - ~MACVTAP" - - use virt-network && CONFIG_CHECK+=" - ~BRIDGE_EBT_MARK_T - ~BRIDGE_NF_EBTABLES - ~NETFILTER_ADVANCED - ~NETFILTER_XT_CONNMARK - ~NETFILTER_XT_MARK - ~NETFILTER_XT_TARGET_CHECKSUM" - # Bandwidth Limiting Support - use virt-network && CONFIG_CHECK+=" - ~BRIDGE_EBT_T_NAT - ~NET_ACT_POLICE - ~NET_CLS_FW - ~NET_CLS_U32 - ~NET_SCH_HTB - ~NET_SCH_INGRESS - ~NET_SCH_SFQ" - - # Handle specific kernel versions for different features - kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR" - if kernel_is ge 3 6; then - CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP " - kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM " - fi - - ERROR_USER_NS="Optional depending on LXC configuration." - - if [[ -n ${CONFIG_CHECK} ]]; then - linux-info_pkg_setup - fi -} - -src_prepare() { - touch "${S}/.mailmap" - - default - - if [[ ${PV} = *9999* ]]; then - # git checkouts require bootstrapping to create the configure script. - # Additionally the submodules must be cloned to the right locations - # bug #377279 - ./bootstrap || die "bootstrap failed" - ( - git submodule status | sed 's/^[ +-]//;s/ .*//' - git hash-object bootstrap.conf - ) >.git-module-status - fi - - # Tweak the init script: - cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die - sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ - -e "s/USE_FLAG_AVAHI/$(usex zeroconf 'use avahi-daemon' '')/" \ - -e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \ - -e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \ - -i "${S}/libvirtd.init" || die "sed failed" - - eautoreconf -} - -src_configure() { - local myeconfargs=( - $(use_with apparmor) - $(use_with apparmor apparmor-profiles) - $(use_with audit) - $(use_with caps capng) - $(use_with dbus) - $(use_with firewalld) - $(use_with fuse) - $(use_with glusterfs) - $(use_with glusterfs storage-gluster) - $(use_with iscsi storage-iscsi) - $(use_with libvirtd) - $(use_with libssh) - $(use_with lvm storage-lvm) - $(use_with lvm storage-mpath) - $(use_with lxc) - $(use_with macvtap) - $(use_enable nls) - $(use_with numa numactl) - $(use_with numa numad) - $(use_with openvz) - $(use_with parted storage-disk) - $(use_with pcap libpcap) - $(use_with phyp) - $(use_with policykit polkit) - $(use_with qemu) - $(use_with qemu yajl) - $(use_with rbd storage-rbd) - $(use_with sasl) - $(use_with selinux) - $(use_with udev) - $(use_with uml) - $(use_with vepa virtualport) - $(use_with virt-network network) - $(use_with wireshark-plugins wireshark-dissector) - $(use_with xen) - $(use_with xen xen-inotify) - $(use_with xen libxl) - $(use_with zeroconf avahi) - $(use_with zfs storage-zfs) - - --without-hal - --without-netcf - --without-sanlock - --without-xenapi - - --with-esx - --with-init-script=systemd - --with-qemu-group=$(usex caps qemu root) - --with-qemu-user=$(usex caps qemu root) - --with-remote - --with-storage-fs - --with-vmware - - --disable-static - --disable-werror - - --with-html-subdir=${PF}/html - --localstatedir=/var - ) - - if use virtualbox && has_version app-emulation/virtualbox-ose; then - myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ ) - else - myeconfargs+=( $(use_with virtualbox vbox) ) - fi - - econf "${myeconfargs[@]}" - - if [[ ${PV} = *9999* ]]; then - # Restore gnulib's config.sub and config.guess - # bug #377279 - (cd .gnulib && git reset --hard > /dev/null) - fi -} - -src_test() { - cd "${BUILD_DIR}" - - # remove problematic tests, bug #591416, bug #591418 - sed -i -e 's#commandtest$(EXEEXT) # #' \ - -e 's#virfirewalltest$(EXEEXT) # #' \ - -e 's#nwfilterebiptablestest$(EXEEXT) # #' \ - -e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \ - tests/Makefile - - export VIR_TEST_DEBUG=1 - HOME="${T}" emake check || die "tests failed" -} - -src_install() { - emake DESTDIR="${D}" \ - SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install - - find "${D}" -name '*.la' -delete || die - - # Remove bogus, empty directories. They are either not used, or - # libvirtd is able to create them on demand - rm -rf "${D}"/etc/sysconfig - rm -rf "${D}"/var/cache - rm -rf "${D}"/var/run - rm -rf "${D}"/var/log - - use libvirtd || return 0 - # From here, only libvirtd-related instructions, be warned! - - systemd_install_serviced \ - "${FILESDIR}"/libvirtd.service.conf libvirtd.service - - systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf - - newinitd "${S}/libvirtd.init" libvirtd || die - newinitd "${FILESDIR}/libvirt-guests.init-r2" libvirt-guests || die - newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die - newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die - - newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die - newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die - - newbashcomp "${S}/tools/bash-completion/vsh" vsh - bashcomp_alias vsh virsh virt-admin - - DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2") - DISABLE_AUTOFORMATTING=true - readme.gentoo_create_doc -} - -pkg_preinst() { - # we only ever want to generate this once - if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then - rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml - fi -} - -pkg_postinst() { - if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then - touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml - fi - - use libvirtd || return 0 - # From here, only libvirtd-related instructions, be warned! - - readme.gentoo_print_elog -} diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest index 0eb04ae5eadb..498447f26c64 100644 --- a/app-emulation/vice/Manifest +++ b/app-emulation/vice/Manifest @@ -1,14 +1,3 @@ -AUX vice-2.4.22-autotools.patch 353 BLAKE2B 01b25d40ad4dd621e32896b0c7f30715fcf0ea7cce8bffdb742caf241ebb0ed7c7d0d40c2cea852640f8b0e4d84bac1d5a87653c9641a33acd8f177a39130c80 SHA512 10ba3f9f9c0e69f34ea3ab361b198826b7055586e2dade320a60c1a1e429797d2eaf1554b1e9fde63f8ddb23bd4a9b8fb24d3f9692433b6b6d043d09761924d3 -AUX vice-2.4.27-autotools.patch 353 BLAKE2B 01b25d40ad4dd621e32896b0c7f30715fcf0ea7cce8bffdb742caf241ebb0ed7c7d0d40c2cea852640f8b0e4d84bac1d5a87653c9641a33acd8f177a39130c80 SHA512 10ba3f9f9c0e69f34ea3ab361b198826b7055586e2dade320a60c1a1e429797d2eaf1554b1e9fde63f8ddb23bd4a9b8fb24d3f9692433b6b6d043d09761924d3 -AUX vice-31580-ffmpeg-build.patch 2635 BLAKE2B 43a5954851c6c082ddb4073768839708f517999068218e134a2cab57f0c8c6e935d9e988745650e84b386efe738d0710b6a2b9ed7ea419248dd3aa65988192f6 SHA512 fcacbe49c0d7768f1c40b76ac7afdb2ac16f651220e7a2005b0f2c28fa47a7aa466ecf4cf8d7ef43dde6d24d3d2472e70126619a8b25c7e2c9340225c897a3c3 -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 -EBUILD vice-2.4.22.ebuild 4081 BLAKE2B aac80c7a5dd694f4dcdee8f4d594d84efc767f9715a299411fee645f848c823b5fbfa842c9c6fd6d1500d62d0a80d3ff9ba645500a9ddbcedc59a00d1cd12ae5 SHA512 0903ceb493b762870ed5f41af0fba9414f630918141c1f5b536b6998d74a9724ae29f2a02c3dad086595b08c4a22ab108511f9949d81498f82da890f4e315701 -EBUILD vice-2.4.27-r2.ebuild 4203 BLAKE2B c1306597f4b419f8e2ed1018b97578a43199fc538cc747c72e7b7cc7cdc92bad51459808d9e927cb08b682e3382643d6dc46ccabf9233d3a95f38a1ca2056fdd SHA512 934c4c6982f1147da237aa781c712b47935e354db95da715bc67f1a95ec2cbe72ac533300fc4e068b1362ab8c8da58d8df5b3823402dd3aa49e2f6d7ee49a5d8 -EBUILD vice-2.4.27-r3.ebuild 4143 BLAKE2B 77043ad81622a50338d5ec02d694eb2dbb3cbbffa4ba92b0fabd9ab52f6ed3918583e171248c04b37dc52f9657fe5bdc9ffde7a4202d853f77a2746377f4cac2 SHA512 6b93a2eb3f2f32360c53837d46623e833ab779f76e1404a23db9d37b46e01c310e1ab2c6de9291ec4c6bdd838ea1fe44f7a6d8c1f70c1dfde8f6917a880c5c5c -EBUILD vice-2.4.27.ebuild 4083 BLAKE2B a1b6abba0b61203fc1e6177959d718307749ec3822826c66527c6929818398e0ad53494f50351477129800e34476dd564da02ddfd429bd35558b20f164c74f31 SHA512 d4e50dd2be23db39ac35d21ee9436032535f2d1dfcd4b6f9587df34ee9291a6fbe4378a19288f5b4661bf821841be3ca7f62c80c97c3f402ca37dfe7f34780b5 -EBUILD vice-2.4.31.ebuild 4069 BLAKE2B a375533a7015241359b32032b070b702b888c2232179fe2d411cc3d6163741a6ea7b8019cb9aefe0402fb3e9e83de0fb128898e9d74ef8e55c29b8d8f271b727 SHA512 f358edb6361d839e1f9d68f0f828f392e43e3c99ff9804ca03723f7a73f6b61f67309796a789c3bc4633283f333b0151453ab4b022c1f0c602babc4d698e8975 -EBUILD vice-3.1.ebuild 4121 BLAKE2B ef5b46774f42ec79bf328595cc4af7906ae0ce56722b19629921f4ccd4f36c171f8fa3db20e22e3e01c8510a0f8839e13693b6adb01ab5f685afd6fdbdd8b0b8 SHA512 7285b0dd716f17e425ecd7ca5dfec8d4ba73c0acb10df4b1f1a467a761ff94fb6685862e9090bb3f5842098e90c31bb9cb9f1013f87c4a00b8fa3ce1e6b51d22 +EBUILD vice-3.1.ebuild 4120 BLAKE2B 9c18944f0c940d84450ed8062c36a3c93ac202796e7a598af4185f4f4cb9473cc45eefde1196f0b8222b63eeb0d612cdf4628b71605cb0c6a10850c7528f409f SHA512 7c536e58183f9ba0cbab58bcdbe9cf3ac6ffe623932079ff1c19b3079342ade398477b3fea9b6fcc113cbda81edd73425f7530980b787f4db541487568dd3e97 MISC metadata.xml 646 BLAKE2B 94f3652c8e4217e34415b84f35b468febdefb688fe85b5b0b2ddafa0b3739bc36fbfaab12e4100df1cad3c5b4cd823b4af260811110da4410c09d32596ac7f43 SHA512 1d641f0e1ba5962aa7b9e230c20ade01595aed9f853be25ec4d5022aff22cbd75414a41fbf64427bf5a27485057ee3e767521561f396a5bf70ffa3e1da31739f 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 7bebd2800ef6..000000000000 --- 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 7bebd2800ef6..000000000000 --- 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 82dc3421218a..000000000000 --- 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 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.22.ebuild b/app-emulation/vice/vice-2.4.22.ebuild deleted file mode 100644 index d03e3365e83d..000000000000 --- a/app-emulation/vice/vice-2.4.22.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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 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 "${FILESDIR}"/${P}-autotools.patch - 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:$(games_get_libdir)/${PN}:" \ - man/vice.1 \ - $(grep -rl --exclude="*texi" /usr/local/lib doc) || die - sed -i \ - -e "/VICEDIR=/s:=.*:=\"$(games_get_libdir)/${PN}\";:" \ - configure.ac || die - sed -i \ - -e "s:\(#define LIBDIR \).*:\1\"$(games_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 use gtk2 || use gtk3 ; then - if use gtk ; then - use vte || append-libs -lX11 - fi - gui_arg+=" $(use_enable gtk gnomeui)" - #gui_arg+=" $(use_enable gtk3 gnomeui3)" - gui_arg+=" $(use_enable Xaw3d xaw3d)" - - # --with-readline is forced to avoid using the embedded copy - # don't try to actually run fc-cache (bug #280976) - FCCACHE=/bin/true \ - PKG_CONFIG=$(tc-getPKG_CONFIG) \ - egamesconf \ - --enable-parsid \ - --with-resid \ - --with-readline \ - --without-arts \ - --without-midas \ - $(use_enable ethernet) \ - $(use_enable ffmpeg) \ - $(use_enable ffmpeg external-ffmpeg) \ - $(use_enable fullscreen) \ - $(use_enable ipv6) \ - $(use_enable lame) \ - $(use_enable nls) \ - $(use_enable vte) \ - $(use_with png) \ - $(use_with threads uithreads) \ - $(use_with zlib) \ - ${gui_arg} \ - ${snd_arg} \ - --disable-option-checking - # --disable-option-checking has to be last -} - -src_install() { - DOCS="AUTHORS ChangeLog FEEDBACK README" \ - default - prepgamesdirs -} diff --git a/app-emulation/vice/vice-2.4.27-r2.ebuild b/app-emulation/vice/vice-2.4.27-r2.ebuild deleted file mode 100644 index 3ebd21b27ddc..000000000000 --- a/app-emulation/vice/vice-2.4.27-r2.ebuild +++ /dev/null @@ -1,179 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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 ~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 )" - -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//' \ - 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 -lX11 if vte doesn't pull it in. - #if use gtk2 || use gtk3 ; then - if use gtk ; then - use vte || append-libs -lX11 - fi - gui_arg+=" $(use_enable gtk gnomeui)" - #gui_arg+=" $(use_enable gtk3 gnomeui3)" - gui_arg+=" $(use_enable Xaw3d xaw3d)" - - # --with-readline is forced to avoid using the embedded copy - # don't try to actually run fc-cache (bug #280976) - FCCACHE=/bin/true \ - PKG_CONFIG=$(tc-getPKG_CONFIG) \ - econf \ - --enable-parsid \ - --with-resid \ - --with-readline \ - --without-arts \ - --without-midas \ - $(use_enable ethernet) \ - $(use_enable ffmpeg) \ - $(use_enable ffmpeg external-ffmpeg) \ - $(use_enable fullscreen) \ - $(use_enable ipv6) \ - $(use_enable lame) \ - $(use_enable nls) \ - $(use_enable vte) \ - $(use_with png) \ - $(use_with threads uithreads) \ - $(use_with zlib) \ - ${gui_arg} \ - ${snd_arg} \ - --disable-option-checking - # --disable-option-checking has to be last -} - -src_install() { - DOCS="FEEDBACK" - default -} diff --git a/app-emulation/vice/vice-2.4.27-r3.ebuild b/app-emulation/vice/vice-2.4.27-r3.ebuild deleted file mode 100644 index be11e99dd48b..000000000000 --- a/app-emulation/vice/vice-2.4.27-r3.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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 ~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)" - - 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 use gtk2 || use gtk3 ; then - if use gtk ; then - use vte || append-libs -lX11 - fi - gui_arg+=" $(use_enable gtk gnomeui)" - #gui_arg+=" $(use_enable gtk3 gnomeui3)" - gui_arg+=" $(use_enable Xaw3d xaw3d)" - - # --with-readline is forced to avoid using the embedded copy - # don't try to actually run fc-cache (bug #280976) - FCCACHE=/bin/true \ - PKG_CONFIG=$(tc-getPKG_CONFIG) \ - econf \ - --enable-parsid \ - --with-resid \ - --with-readline \ - --without-arts \ - --without-midas \ - $(use_enable ethernet) \ - $(use_enable ffmpeg) \ - $(use_enable ffmpeg external-ffmpeg) \ - $(use_enable fullscreen) \ - $(use_enable ipv6) \ - $(use_enable lame) \ - $(use_enable nls) \ - $(use_enable vte) \ - $(use_with png) \ - $(use_with threads uithreads) \ - $(use_with zlib) \ - ${gui_arg} \ - ${snd_arg} \ - --disable-option-checking - # --disable-option-checking has to be last -} - -src_install() { - DOCS="FEEDBACK" - default -} diff --git a/app-emulation/vice/vice-2.4.27.ebuild b/app-emulation/vice/vice-2.4.27.ebuild deleted file mode 100644 index fa039a364155..000000000000 --- a/app-emulation/vice/vice-2.4.27.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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 ~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 "${FILESDIR}"/${P}-autotools.patch - 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:$(games_get_libdir)/${PN}:" \ - man/vice.1 \ - $(grep -rl --exclude="*texi" /usr/local/lib doc) || die - sed -i \ - -e "/VICEDIR=/s:=.*:=\"$(games_get_libdir)/${PN}\";:" \ - configure.ac || die - sed -i \ - -e "s:\(#define LIBDIR \).*:\1\"$(games_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 use gtk2 || use gtk3 ; then - if use gtk ; then - use vte || append-libs -lX11 - fi - gui_arg+=" $(use_enable gtk gnomeui)" - #gui_arg+=" $(use_enable gtk3 gnomeui3)" - gui_arg+=" $(use_enable Xaw3d xaw3d)" - - # --with-readline is forced to avoid using the embedded copy - # don't try to actually run fc-cache (bug #280976) - FCCACHE=/bin/true \ - PKG_CONFIG=$(tc-getPKG_CONFIG) \ - egamesconf \ - --enable-parsid \ - --with-resid \ - --with-readline \ - --without-arts \ - --without-midas \ - $(use_enable ethernet) \ - $(use_enable ffmpeg) \ - $(use_enable ffmpeg external-ffmpeg) \ - $(use_enable fullscreen) \ - $(use_enable ipv6) \ - $(use_enable lame) \ - $(use_enable nls) \ - $(use_enable vte) \ - $(use_with png) \ - $(use_with threads uithreads) \ - $(use_with zlib) \ - ${gui_arg} \ - ${snd_arg} \ - --disable-option-checking - # --disable-option-checking has to be last -} - -src_install() { - DOCS="AUTHORS ChangeLog FEEDBACK README" \ - default - prepgamesdirs -} diff --git a/app-emulation/vice/vice-2.4.31.ebuild b/app-emulation/vice/vice-2.4.31.ebuild deleted file mode 100644 index f36bb6969d3d..000000000000 --- a/app-emulation/vice/vice-2.4.31.ebuild +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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 ~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 -lX11 if vte doesn't pull it in. - #if use gtk2 || use gtk3 ; then - if use gtk ; then - use vte || append-libs -lX11 - fi - gui_arg+=" $(use_enable gtk gnomeui)" - #gui_arg+=" $(use_enable gtk3 gnomeui3)" - gui_arg+=" $(use_enable Xaw3d xaw3d)" - - # --with-readline is forced to avoid using the embedded copy - # don't try to actually run fc-cache (bug #280976) - FCCACHE=/bin/true \ - PKG_CONFIG=$(tc-getPKG_CONFIG) \ - econf \ - --enable-parsid \ - --with-resid \ - --with-readline \ - --without-arts \ - --without-midas \ - $(use_enable ethernet) \ - $(use_enable ffmpeg) \ - $(use_enable ffmpeg external-ffmpeg) \ - $(use_enable fullscreen) \ - $(use_enable ipv6) \ - $(use_enable lame) \ - $(use_enable nls) \ - $(use_enable vte) \ - $(use_with png) \ - $(use_with threads uithreads) \ - $(use_with zlib) \ - ${gui_arg} \ - ${snd_arg} \ - --disable-option-checking - # --disable-option-checking has to be last -} - -src_install() { - DOCS="FEEDBACK" - default -} diff --git a/app-emulation/vice/vice-3.1.ebuild b/app-emulation/vice/vice-3.1.ebuild index 9e458ecfe413..cc4fb987e508 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. -- cgit v1.2.3