Sync with portage [Wed Dec 26 08:49:47 MSK 2018].

mhiretskiy 1315
root 5 years ago
parent f7109ea9c9
commit 2c5a63e400

Binary file not shown.

Binary file not shown.

@ -1,4 +1,4 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@ -34,7 +34,7 @@ LICENSE="Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exola
|| ( BSD GPL-2+ ) gSOAP libpng tsm"
SLOT="0"
KEYWORDS="~amd64 -*"
KEYWORDS="-* ~amd64"
IUSE="acl java +tsm_cit +tsm_hw"
QA_PREBUILT="*"
@ -54,7 +54,7 @@ DEPEND=""
RDEPEND="
dev-libs/expat
dev-libs/libxml2
=sys-fs/fuse-2*
sys-fs/fuse:0
acl? ( sys-apps/acl )
java? ( >=virtual/jre-1.7 )
"

Binary file not shown.

@ -1,4 +1,4 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@ -11,7 +11,7 @@ SRC_URI="http://pop-club.hp.infoseek.co.jp/emacs/emacs-wget/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="alpha amd64 ppc ppc64 x86"
KEYWORDS="alpha amd64 ppc ppc64 ~sparc x86"
IUSE="l10n_ja"
RDEPEND=">=net-misc/wget-1.8.2"

@ -1,4 +1,4 @@
# Copyright 1999-2014 Gentoo Foundation
# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@ -11,6 +11,6 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="amd64 ppc x86"
KEYWORDS="amd64 ppc ~sparc x86"
SITEFILE="50${PN}-gentoo.el"

@ -1,4 +1,4 @@
# Copyright 1999-2014 Gentoo Foundation
# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="amd64 ppc ~s390 x86"
KEYWORDS="amd64 ppc ~s390 ~sparc x86"
SITEFILE="50${PN}-gentoo.el"

Binary file not shown.

@ -1,2 +1,3 @@
DIST libvirt-4.10.0.tar.xz 14841188 BLAKE2B b52f2ed1c4c65930339a6b6fc9e7b034c7661edc0defdd78642f305b97332c33247bfc552efc43aa75a8d360c0d721d1a58a22fa7a016e7cf14ee2219d70a762 SHA512 a4f97aed6299c7954518ab88738ab781cee0755bfd64094a44468f77f99cac5eb2bc74ecd6aec90177317606ebd073292f5b5d0056054d1d94973fa938589fbd
DIST libvirt-4.5.0.tar.xz 14743956 BLAKE2B 930852765104b1b22744df0ec4f1c74d89bc0fda80852978f7c857943858cc45eed9b74a3d42668f872540be2637f26c4d9d7859594847e58e6fb4cd33350130 SHA512 26710c7e5219f007524e9f93a642e55e4e8ea197afa6b2ca6a4b67b7028313f4b0d82924ee9a1e91ff688a4d2b53f89f3655fbeef0fa99a34f8418f37d787984
DIST libvirt-4.9.0.tar.xz 14744184 BLAKE2B 03ddefc8f505c8688ad506b81ea9b37ee085e4c9c429834c6b6f338981bfc3c6034a5455a79feca604fb36e658de766ee6104aeed690c682ae596d10eb5632a9 SHA512 3cfada940f9de6cc4b0504e089f41aa03d9986f0163344dd3b3ab8e6c4eb556a56996dc8f24bca913b036862c75b256628ea9ab7674ef0a57b87f47c58689e90

@ -0,0 +1,14 @@
diff --git a/examples/apparmor/usr.lib.libvirt.virt-aa-helper b/examples/apparmor/usr.lib.libvirt.virt-aa-helper
index de94368..5fbae27 100644
--- a/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+++ b/examples/apparmor/usr.lib.libvirt.virt-aa-helper
@@ -39,6 +39,9 @@ profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper {
/etc/apparmor.d/libvirt/* r,
/etc/apparmor.d/libvirt/libvirt-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]* rw,
+ # Gentoo specific path for uefi firmware
+ /usr/share/edk2-ovmf/* r,
+
# for backingstore -- allow access to non-hidden files in @{HOME} as well
# as storage pools
audit deny @{HOME}/.* mrwkl,

@ -0,0 +1,387 @@
# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{4,5,6,7} )
inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd user
if [[ ${PV} = *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://libvirt.org/git/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="https://libvirt.org/sources/stable_updates/${P}.tar.xz"
else
SRC_URI="https://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/gnu-netcat-0.7.1-r3
>=net-analyzer/netcat-110-r9
>=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-1.5.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-4.6.0
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}
${PYTHON_DEPS}
app-text/xhtml1
dev-lang/perl
dev-libs/libxslt
dev-perl/XML-XPath
virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${PN}-4.5.0-do_not_use_sysconf.patch
"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
"${FILESDIR}"/${PN}-4.10.0-fix_apparmor_rules.patch
)
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
~IP_NF_TARGET_REJECT
~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 libxl)
$(use_with zeroconf avahi)
$(use_with zfs storage-zfs)
--without-hal
--without-netcf
--without-sanlock
--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
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-r3" 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
}

Binary file not shown.

@ -1,3 +1,3 @@
DIST ruby.eselect-20161226.xz 1900 BLAKE2B 698f004e548924ca7c58dfceccc3d21029d6460d21dd67e4466e3a8c4bfdc3a7976c51754ba376c5acbbec7c1146368b532f1cda079f8b5f6f86b7b08c700214 SHA512 69cf17e42d9908fdfc9b08a3ca2c1f406a5968fc1c22663cc4b2388ad29d3bdb8aec4f0210ce9d5c118514aea81a4465a299347dd702f859ba8660fcb3882f17
DIST ruby.eselect-20170723.xz 1972 BLAKE2B 338f9fbb81ebe3c0fdcab77ab12cabd6aa334ac3bf64352cd801c8088d7c3ac4c452e647addc98497d104df24f7934d8cdd8b0008e4f52fb27306a80411f793b SHA512 9c0614bc7e2ce9811466f257035d74622a96db8d44aa0908414fbac7d4142c34350257b08ace7371901e46cc0c9a38c3f2acae3caea4fb354ccc37b8c919b48f
DIST ruby.eselect-20171225.xz 1972 BLAKE2B 919a5d3847fd38dd86352623dca38523a323b0450f3fb2f04c5fb426e905431a6ef2e221c7221b67b9c4a989253ef2cda70a1dd2df710eb9331234bcefcc0dd6 SHA512 3398de77c5a836119f52980d26702c891af1bc7f83596829591d268cb252843242c2e00c42e10cfe3468a4b92e47e6d551108d21d1e322edda7e4756a1b5ad86
DIST ruby.eselect-20181225.xz 1972 BLAKE2B 548da25e755c4956cc84fc8828db260a74dd0f96863c840d77c852eac101bb4d836fe22b2f927ad3b324b120b26d6b4b28b83881be8ca987b873b7edf806a04a SHA512 4075c6e6e58cb1d13c7779f0a9c7ad2f04edb93e6b870753d9991a10bffd780f46b18567cd47e9f888a939b180ecac07e76dc8ad9d50b344d1cca55db36d9b26

@ -1,22 +0,0 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
DESCRIPTION="Manages multiple Ruby versions"
HOMEPAGE="https://www.gentoo.org"
SRC_URI="https://dev.gentoo.org/~flameeyes/ruby-team/ruby.eselect-${PVR}.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=app-admin/eselect-1.0.2"
S=${WORKDIR}
src_install() {
insinto /usr/share/eselect/modules
newins "${WORKDIR}/ruby.eselect-${PVR}" ruby.eselect || die
}

@ -0,0 +1,22 @@
# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
DESCRIPTION="Manages multiple Ruby versions"
HOMEPAGE="https://www.gentoo.org"
SRC_URI="https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-${PVR}.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=app-admin/eselect-1.0.2"
S=${WORKDIR}
src_install() {
insinto /usr/share/eselect/modules
newins "${WORKDIR}/ruby.eselect-${PVR}" ruby.eselect || die
}

@ -1,4 +1,4 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@ -9,7 +9,7 @@ SRC_URI="https://github.com/jauhien/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~arm64 x86"
KEYWORDS="amd64 ~arm64 ~ppc64 x86"
RDEPEND="app-admin/eselect"

Binary file not shown.

@ -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
# The Debian ca-certificates package merely takes the CA database as it exists
@ -33,10 +33,10 @@ inherit eutils python-any-r1
if [[ ${PV} == *.* ]] ; then
# Compile from source ourselves.
PRECOMPILED=false
inherit versionator
inherit eapi7-ver
DEB_VER=$(get_version_component_range 1)
NSS_VER=$(get_version_component_range 2-)
DEB_VER=$(ver_cut 1)
NSS_VER=$(ver_cut 2-)
RTM_NAME="NSS_${NSS_VER//./_}_RTM"
else
# Debian precompiled version.

@ -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
# The Debian ca-certificates package merely takes the CA database as it exists
@ -33,10 +33,10 @@ inherit eutils python-any-r1
if [[ ${PV} == *.* ]] ; then
# Compile from source ourselves.
PRECOMPILED=false
inherit versionator
inherit eapi7-ver
DEB_VER=$(get_version_component_range 1)
NSS_VER=$(get_version_component_range 2-)
DEB_VER=$(ver_cut 1)
NSS_VER=$(ver_cut 2-)
RTM_NAME="NSS_${NSS_VER//./_}_RTM"
else
# Debian precompiled version.

@ -33,10 +33,10 @@ inherit eutils python-any-r1
if [[ ${PV} == *.* ]] ; then
# Compile from source ourselves.
PRECOMPILED=false
inherit versionator
inherit eapi7-ver
DEB_VER=$(get_version_component_range 1)
NSS_VER=$(get_version_component_range 2-)
DEB_VER=$(ver_cut 1)
NSS_VER=$(ver_cut 2-)
RTM_NAME="NSS_${NSS_VER//./_}_RTM"
else
# Debian precompiled version.

Binary file not shown.

@ -1 +1 @@
DIST krop-0.4.13.5.tar.gz 40079 BLAKE2B 9d3505f7d9cbf0eef4ec7a28928f14940e6c0a2fd4499b6c5896fde7b3f7b8a0b84ddc4f9c7735ee348f89e9924a7b8f69a3d4dbfaa4668ac770a0fe8404d469 SHA512 218eb3e256dabcacc53af62b2e704031bd21bedacf2599c4aed7ee3b3847b35741c921a08137b7b6e7295ddfc7f87f4ffbf9d3fec3fb137d1ce36e3945dc6129
DIST krop-0.5.1.tar.gz 42719 BLAKE2B e0baa3c14d9ce63815615eae004a08af720868d584262901eccbc569852177e07d5df659ea560d7e9cbdc4325daef8c35acd9c200440a8dfd73c19b274d8de37 SHA512 2bfd2a5d762454ab45538707c6f333d2b0947b6b203d6e7bd2d9d0d574d79de8ee6b30d87b17d6afea604456b915f323b855c9c9af5c169c192b0a01634075ca

@ -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
@ -8,9 +8,7 @@ inherit eutils distutils-r1 xdg-utils
DESCRIPTION="A tool to crop PDF files"
HOMEPAGE="http://arminstraub.com/software/krop"
#SRC_URI="http://arminstraub.com/downloads/${PN}/${P}.tar.gz"
SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.gz"
# this is a snapshot of the qt5 branch
SRC_URI="http://arminstraub.com/downloads/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"

@ -0,0 +1,41 @@
# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit desktop distutils-r1 xdg-utils
if [[ ${PV} == 9999 ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/arminstraub/krop.git"
else
SRC_URI="http://arminstraub.com/downloads/${PN}/${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
DESCRIPTION="A tool to crop PDF files"
HOMEPAGE="http://arminstraub.com/software/krop"
LICENSE="GPL-3"
SLOT="0"
IUSE=""
RDEPEND="dev-python/python-poppler-qt5[${PYTHON_USEDEP}]
dev-python/PyPDF2[${PYTHON_USEDEP}]
dev-python/PyQt5[${PYTHON_USEDEP}]"
src_install() {
distutils-r1_src_install
domenu "${WORKDIR}/${P}/${PN}.desktop"
}
pkg_postinst() {
xdg_mimeinfo_database_update
xdg_desktop_database_update
}
pkg_postrm() {
xdg_mimeinfo_database_update
xdg_desktop_database_update
}

@ -11,7 +11,7 @@ if [[ "${PV}" == "9999" ]] ; then
SLOT="0/9999"
else
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0/79" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
fi

Binary file not shown.

@ -17,7 +17,7 @@ HOMEPAGE="https://www.ruby-lang.org/"
SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz"
LICENSE="|| ( Ruby-BSD BSD-2 )"
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 +ssl static-libs tk xemacs"
RDEPEND="

@ -13,7 +13,7 @@ SRC_URI="$(rust_all_arch_uris ${MY_P})"
LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
SLOT="stable"
KEYWORDS="~amd64 ~arm64 ~x86"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
IUSE="clippy cpu_flags_x86_sse2 doc libressl rustfmt"
DEPEND=""

@ -13,7 +13,7 @@ SRC_URI="$(rust_all_arch_uris ${MY_P})"
LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
SLOT="stable"
KEYWORDS="~amd64 ~arm64 ~x86"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
IUSE="clippy cpu_flags_x86_sse2 doc libressl rustfmt"
DEPEND=""

@ -18,7 +18,7 @@ else
SLOT="stable/${ABI_VER}"
MY_P="rustc-${PV}"
SRC="${MY_P}-src.tar.xz"
KEYWORDS="~amd64 ~arm64 ~x86"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
fi
RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).2"

@ -18,7 +18,7 @@ else
SLOT="stable/${ABI_VER}"
MY_P="rustc-${PV}"
SRC="${MY_P}-src.tar.xz"
KEYWORDS="~amd64 ~arm64 ~x86"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
fi
RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).1"

Binary file not shown.

@ -21,7 +21,7 @@ LICENSE="LGPL-2.1+"
SLOT="2"
IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
# Added util-linux multilib dependency to have libmount support (which
# is always turned on on linux systems, unless explicitly disabled, but

@ -0,0 +1,21 @@
https://github.com/openssl/openssl/issues/7679
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -77,8 +77,14 @@
# to. You're welcome.
sub dependmagic {
my $target = shift;
-
- return "$target: build_generated\n\t\$(MAKE) depend && \$(MAKE) _$target\n_$target";
+ my $magic = <<"_____";
+$target: build_generated depend
+ \$(MAKE) _$target
+_$target
+_____
+ # Remove line ending
+ $magic =~ s|\R$||;
+ return $magic;
}
'';
-}

@ -56,6 +56,7 @@ MULTILIB_WRAPPED_HEADERS=(
PATCHES=(
"${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
)
src_prepare() {

@ -10,7 +10,7 @@ SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD-2 GPL-2+"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x64-macos"
KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x64-macos"
IUSE="static-libs"
S="${WORKDIR}/xxHash-${PV}"

Binary file not shown.

@ -1 +1 @@
DIST daemonize-2.4.7.tar.gz 10096 BLAKE2B aeac5b0c0ac3dc0a1a069f3b1bdcc81bc8cc6703c4650ee6b569f6ce9caf6255551655e41a94406b1ff22817ef2f64d7826ad9491cbe1b0591e357141f34f06f SHA512 33c32893916b9bc45949bb4115bc8aee2eacd809535783eb7b07d3d3ee162ea969da5a739078f8b061e89da52e8da468f9d7fe916dd4f9d7dbea7012c2955e9d
DIST daemonize-2.5.0.tar.gz 10126 BLAKE2B 10e13f93825309d48ef67d0725ed53dcca2220b3940b3b81e1e7f29cf7b6d89af40f94488a2398bec74c0f6235ef8b1626871bda4fb33c233a872a9ccea47558 SHA512 c17a14c073e22fc98b3663da207238d183c12e95750f14cddcf90419c51c95ebc36251bb95d0bb4db84a2fb243499329473e7d14172d855d3ee204757a2a1a65

@ -2,3 +2,4 @@ DIST jupyter_console-4.0.3.tar.gz 22090 BLAKE2B feec288328132d2f75ad21e242d7b0bd
DIST jupyter_console-4.1.1.tar.gz 23391 BLAKE2B c22ebebaca3f009f1952d6e2af6c2f552a19626b2f7a51ab760f258d69b10c91cd162cb54d3d6cdf04b04aeff4e538e24ddf5a9ec1907aa2c7927280a5855755 SHA512 40894f41b85c1b823c3d75f33427728717b75e800a08c8a6b17b1c6ca7a6543b2aadc72d7ff131a7633252ac01bb0b0142025d7a53c3f3b7f8d189e6ff14216e
DIST jupyter_console-5.0.0.tar.gz 26119 BLAKE2B 3961a3da26ad9e873a873556115aa4430b24bdd22d9ebab88c3c7b8d72ecfb90926e0b690b23d9bff0bc68f15dd0623cb1e6f1f56ba47b7afe964542a5f8c3b1 SHA512 e31afa5960200feea125b939124b108a0b9dcc914fe2e21b86cd1dc409789cb25a72918a7eb5fcc7bd35c26bfabb71b6426a2cb7b45a8cab58f1d8e4b9bc89de
DIST jupyter_console-5.1.0.tar.gz 26661 BLAKE2B 075035d02fee640ccf9a2a7bd22e5872727380bd54b1fed48bd53f6bee12da8ff3dc5f4ff258d0c03f7260e2b495d8cb313a4b4f49e4eb644f0b15988fe41577 SHA512 208a31886eb58c64541048e1f7ed75fccc888d34177f86dfaf10fb7dcd603130a8b3ecbe23cf4d80a75287b847128425f853715c494d2a7e4b4eed8a31058b5c
DIST jupyter_console-6.0.0.tar.gz 27780 BLAKE2B da2b58461caa987bea0b323cedbc79ff24f31cb928602b8ae6dce1ed615008a8227d7a1bab47364e6d182cfd3bd6f548e355430efc505e7183a391ef26c08375 SHA512 27b333f439733c33062d3baa8b49ff673b10e22cb8c28c688ba604799838e899f93372bd2eaf4a94c97260d6dec043d6aef4421388d77e625b1ec43a3dedfa3f

@ -0,0 +1,53 @@
# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python3_{5,6} )
inherit distutils-r1
DESCRIPTION="A terminal-based console frontend for Jupyter kernels"
HOMEPAGE="http://jupyter.org"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc test"
RDEPEND="
dev-python/ipython[${PYTHON_USEDEP}]
dev-python/ipykernel[${PYTHON_USEDEP}]
dev-python/jupyter_client[${PYTHON_USEDEP}]
>=dev-python/prompt_toolkit-1.0.0[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
test? (
$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
dev-python/pexpect[${PYTHON_USEDEP}]
>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
)
"
python_prepare_all() {
# Prevent un-needed download during build
if use doc; then
sed -e "/^ 'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
fi
distutils-r1_python_prepare_all
}
python_compile_all() {
if use doc; then
emake -C docs html
HTML_DOCS=( docs/_build/html/. )
fi
}
python_test() {
nosetests --with-coverage --cover-package=jupyter_console jupyter_console || die
}

@ -1,2 +1,3 @@
DIST libvirt-python-4.10.0.tar.gz 192707 BLAKE2B b128bdb4e33ce3ee826f30ef06cae080df4da01fdba04a65747ce6f6dbf6b1b4383b2dc010c3cdae9a33c2d9a816f4f5214d8f095aa719056af94f723860a70e SHA512 30fac35ae04c18b340b5173c2a1ccb867147da3673a4b72ad612fb5f03b95ee9259459ef9e11cba4a101e7aef4b71d13e1b79a25eab39899a22c0e8261aba7ac
DIST libvirt-python-4.5.0.tar.gz 190016 BLAKE2B ba3aa68b2de6179cfddaff54bf96fa876959d97e72245ccdad8f9f681641166f5827d5244ae4c18b7a7b90a3201b3a797d30c2436a6ab5fcdbcfd56462348ba4 SHA512 14572225c2f5233aa8cb7257cff94d38effc4d988aac36108ca510dcd442d8c5194d6b25bddb2603bb1e1bc4dcb284f103899ce81063dc6a7994d78beea355ac
DIST libvirt-python-4.9.0.tar.gz 191922 BLAKE2B 272f0827faa7083e4896b34cea81554505e38733313df556d608fbf0e2ab935088ec5d57e9678c7679e172ff99a619939abe8cbd828b49655de70daf11d20efe SHA512 7d1345693c87f11be9dc751212820f4c4a519a467703f0ea2fcafd0e66d39941686cf7c84c2c68e8639889da1bfbc9176a72cf1059c87d76a49b2c74a7b05c0e

@ -0,0 +1,46 @@
# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
MY_P="${P/_rc/-rc}"
inherit distutils-r1
if [[ ${PV} = *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
SRC_URI=""
KEYWORDS=""
RDEPEND="app-emulation/libvirt:=[-python(-)]"
else
SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
KEYWORDS="~amd64 ~arm64 ~x86"
RDEPEND="app-emulation/libvirt:0/${PV}"
fi
S="${WORKDIR}/${P%_rc*}"
DESCRIPTION="libvirt Python bindings"
HOMEPAGE="https://www.libvirt.org"
LICENSE="LGPL-2"
SLOT="0"
IUSE="examples test"
DEPEND="${RDEPEND}
virtual/pkgconfig
test? ( dev-python/lxml[${PYTHON_USEDEP}]
dev-python/nose[${PYTHON_USEDEP}] )"
python_test() {
esetup.py test
}
python_install_all() {
if use examples; then
dodoc -r examples
docompress -x /usr/share/doc/${PF}/examples
fi
distutils-r1_python_install_all
}

@ -1 +1,2 @@
DIST nbsphinx-0.2.14.tar.gz 98368 BLAKE2B 2ce32043fd3371d54b1922f973b9f8b4fc1bd1ace05fb2ee4136ed759454ebc5b3ac34030156d15a72d8e58bd739e7a4bc458e2cb26b8f80e9498df47c857a7a SHA512 263aaf8b466d83215251f6115fa6210bca69537d041336ec23d9caaad06653fe848914c2e01981461fbabb8f5e4881ca11a4a01aaccb07909de6b79e695602d6
DIST nbsphinx-0.4.1.tar.gz 108928 BLAKE2B 449ba009003c1de52057d558039255f80efc2d6979926bbe8757faf21139bdf6f0e7e96280f63ffcc0436f45d83efeb525bca0139018f345025b8dd25202bc12 SHA512 5c37d8cb48c82aa9ae865a27650aaa037cde2c06140672ae1245fd3ceafa3d40b0ccbc37ac67bd1688b228107b97d84fb8eced783d71f79f8da7505883cf2617

@ -0,0 +1,27 @@
# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Jupyter Notebook Tools for Sphinx"
HOMEPAGE="https://github.com/spatialaudio/nbsphinx/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
IUSE=""
RDEPEND="
dev-python/docutils[${PYTHON_USEDEP}]
dev-python/jinja[${PYTHON_USEDEP}]
dev-python/nbconvert[${PYTHON_USEDEP}]
dev-python/nbformat[${PYTHON_USEDEP}]
>=dev-python/sphinx-1.3.2[${PYTHON_USEDEP}]
dev-python/traitlets[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}"

@ -24,7 +24,7 @@ fi
# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
SLOT="0/12"
LICENSE="|| ( GPL-2 GPL-3 SIP )"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="debug doc"
RDEPEND="${PYTHON_DEPS}"

Binary file not shown.

@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/yuki24/did_you_mean"
LICENSE="MIT"
SLOT="2.4"
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
all_ruby_prepare() {

@ -16,7 +16,7 @@ DESCRIPTION="A JSON implementation as a Ruby extension"
HOMEPAGE="https://github.com/flori/json"
LICENSE="Ruby"
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="2"
IUSE=""

@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/evanphx/kpeg"
LICENSE="MIT"
SLOT="1"
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
PATCHES=( "${FILESDIR}/${P}-utf8.patch" )

@ -19,7 +19,7 @@ SRC_URI="https://github.com/ruby/rake/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
DEPEND+=" app-arch/gzip"

@ -1,3 +1,4 @@
DIST rdoc-4.3.0.gem 738816 BLAKE2B f705b4fed5a9a7e3a850cacc17b7df3f8fdeb163938ed7d2d29979337cb24bca4a66695643ecc62f811d8e49a931296e1972d5d13366685315649e0ec44ebef7 SHA512 7ec5c8055262300c159ff2dbca3bcd09e169002acad8602db89086d2b9409a096209a1152dca68c79dcd1b5e3c1fdf55e7f89d82b33fa2ce65c816695350b029
DIST rdoc-5.1.0.tar.gz 702376 BLAKE2B 733d77a341ddad10f5b648b6bb492e0f79daa392e2ca371d38236e4c85a1c409699e35dd3f5bc8bc48551b399603bb0a747cb3c5f7f1fbf4765aabffaad575aa SHA512 cd2ed37e8502a3e9093c88c258ac5e39542a23c3dcaedb9b5eb48ce391a694e5b35fbcfd62f01ec6353ac9c40a4b7043b2ff11bbc403d2e03de9a84c52bcefe7
DIST rdoc-6.0.4.tar.gz 699314 BLAKE2B 37b9c65a55357b9edbf85889c086948a6e80094846434d46e6ffbf17e16eba9e964dc09721f921d5042d6e0c72619fc59d87c8d969490e6af50fddaf49d36556 SHA512 8bf61bda88ea1a85178f5fdd62e87c79c5efd6d6f64d9d8651bbbc37e02da02b7189c7e60e4853a962507cc2ee4c703b6532f28db763202fa24c4b364cee8e28
DIST rdoc-6.1.0.tar.gz 701204 BLAKE2B 5228f7af6b890aa09ddeee899955dada94768a4a4fe6c30ccfabb810dc90420f5a83e1a485b80ddfa81c6eeca9440109a82a3287eb445c28e1c4f30b3cea76bf SHA512 084c6bf8819664ab5f80d3678dbc8936da30f19f8603767d3678b7d504069395c8e074d09b4a188231784fb99213ee0cb2e289632de4126276ddb0233fbcd600

@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/rdoc/rdoc/"
SRC_URI="https://github.com/rdoc/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Ruby MIT"
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""

@ -0,0 +1,91 @@
# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
USE_RUBY="ruby23 ruby24 ruby25"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_DOCDIR="doc"
RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc RI.rdoc TODO.rdoc"
RUBY_FAKEGEM_BINWRAP=""
RUBY_FAKEGEM_BINDIR="exe"
inherit ruby-fakegem eutils
DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
HOMEPAGE="https://github.com/ruby/rdoc/"
SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Ruby MIT"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""
RDEPEND+=">=app-eselect/eselect-ruby-20161226"
ruby_add_bdepend "
>=dev-ruby/kpeg-1.1.0-r1
>dev-ruby/racc-1.4.10
test? (
dev-ruby/bundler
>=dev-ruby/minitest-5.8:5
)"
all_ruby_prepare() {
# Other packages also have use for a nonexistent directory, bug 321059
sed -i -e 's#/nonexistent#/nonexistent_rdoc_tests#g' test/test_rdoc*.rb || die
# Avoid unneeded dependency on bundler, bug 603696
sed -i -e '/bundler/ s:^:#:' \
-e 's/Bundler::GemHelper.gemspec.full_name/"rdoc"/' Rakefile || die
# Remove test that is depending on the locale, which we can't garantuee.
sed -i -e '/def test_encode_with/,/^ end/ s:^:#:' test/test_rdoc_options.rb || die
# Remove test depending on FEATURES=userpriv, bug 361959
sed -i -e '/def test_check_files/,/^ end/ s:^:#:' test/test_rdoc_options.rb || die
# Remove tests for code that is not included and not listed in Manifest.txt
rm -f test/test_rdoc_i18n_{locale,text}.rb \
test/test_rdoc_generator_pot* || die
}
all_ruby_compile() {
all_fakegem_compile
if use doc ; then
ruby -Ilib -S exe/rdoc || die
fi
}
each_ruby_compile() {
${RUBY} -S rake generate || die
}
each_ruby_test() {
${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
}
all_ruby_install() {
all_fakegem_install
for bin in rdoc ri; do
ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
for version in ${USE_RUBY}; do
version=`echo ${version} | cut -c 5-`
if use ruby_targets_ruby${version}; then
ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
sed -i -e "1s/env ruby/ruby${version}/" \
"${ED}/usr/bin/${bin}${version}" || die
fi
done
done
}
pkg_postinst() {
if [[ ! -n $(readlink "${ROOT}"usr/bin/rdoc) ]] ; then
eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
fi
}

@ -1,3 +1,4 @@
DIST rubygems-2.7.6.tgz 852486 BLAKE2B b2c7cf7f2ce5a27beff846d85a3ca2867a4bbadd5bc76af0df76e774c239979bc4b3fac406a65c45444c9f401f92cd1058b45c8b3750c1ee5477cd2b4b513709 SHA512 bc168afc40c974dbc7c37eb5678432ba2ed7469c3f007a159699467ff2cff5205c508237193ee8becaa6eb555b043969cc5f92b2aaa6bf7c958dd7c187e258a7
DIST rubygems-2.7.7.tgz 915847 BLAKE2B a7a2ae2b88d7e6bfc68c298802dd29d6dd0c76573e39a3088ba06b112761059f6bbbe4565e7e7e22fb1121fc597c2139dc8a80ae1555ab15713cb2ebc50f5710 SHA512 f93b7eacf5ef8725c40d618daf9deabc7e9eed74b3b7f13ecd16f89205fe24958e782314c52f8a8fe3205b93e20b830b4fbf7ff8944ff1cf56feb7de2d773252
DIST rubygems-2.7.8.tgz 920781 BLAKE2B a7552177c4bb54f7728e5fec1d7ead19fe8af3253c1f09d1a180ca9a1b853983b66e90b3220b603f13d100029878a4cac834149495e417d0b230d25f361a925d SHA512 3d1cf68377dfcf102028342258aaff5a7257d2d2b34a80508c85aa258d810add46e65a157f902c271b0b7b568c437372d17246e89cd88f8500e47c008d17f1a6
DIST rubygems-3.0.1.tgz 937709 BLAKE2B 23efa0c2a4af48c81877027cc38929320b4c16f5fdc2f7003616e50fa24eaf1895cc9a1786ba91ea42eddee6c85a433edbbcfd06e9f0f04912d045d9bc437c12 SHA512 dc29ad51ec67b1dca82a23973ea92153482788964d0755bdcd3c650116915c461c6e5fb1c826be3ee04a497fec4ac2826904bd406f24611e77cd8c9eaf4d8729

@ -0,0 +1,117 @@
# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
USE_RUBY="ruby23 ruby24 ruby25"
inherit ruby-ng prefix
DESCRIPTION="Centralized Ruby extension management system"
HOMEPAGE="https://rubygems.org/"
LICENSE="GPL-2 || ( Ruby MIT )"
SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE="server test"
PDEPEND="server? ( =dev-ruby/builder-3* )"
ruby_add_bdepend "
test? (
dev-ruby/json
dev-ruby/minitest:5
dev-ruby/rdoc
)"
all_ruby_prepare() {
mkdir -p lib/rubygems/defaults || die
cp "${FILESDIR}/gentoo-defaults.rb" lib/rubygems/defaults/operating_system.rb || die
eprefixify lib/rubygems/defaults/operating_system.rb
# Disable broken tests when changing default values:
sed -i -e '/test_default_path/,/^ end/ s:^:#:' test/rubygems/test_gem.rb || die
sed -i -e '/assert_self_install_permissions/,/^ end/ s/^.*RUBY_INSTALL_NAME.*//' test/rubygems/test_gem.rb || die
# Skip tests for default gems that all fail
sed -i -e '/test_default_gems_use_full_paths/,/^ end/ s:^:#:' test/rubygems/test_gem.rb || die
sed -i -e '/test_execute_ignore_default_gem_verbose/,/^ end/ s:^:#:' test/rubygems/test_gem_commands_cleanup_command.rb || die
sed -i -e '/test_execute_default_gem/,/^ end/ s:^:#:' test/rubygems/test_gem_commands_contents_command.rb test/rubygems/test_gem_commands_pristine_command.rb || die
sed -i -e '/test_execute_\(default_details\|show_default_gems\)/,/^ end/ s:^:#:' test/rubygems/test_gem_commands_query_command.rb || die
sed -i -e '/test_execute_all/,/^ end/ s:^:#:' test/rubygems/test_gem_commands_uninstall_command.rb || die
sed -i -e '/\(test_default_gem\|test_check_executable_overwrite\|test_require_works_after_cleanup\)/,/^ end/ s:^:#:' \
test/rubygems/test_{gem_installer,require}.rb || die
sed -i -e '/test_\(load_default_gem\|default_spec_stub\|self_stubs\)/,/^ end/ s:^:#:' test/rubygems/test_gem_specification.rb || die
sed -i -e '/test_uninstall_default_gem/,/^ end/ s:^:#:' test/rubygems/test_gem_uninstaller.rb || die
rm -f test/rubygems/test_gem_indexer.rb || die
sed -i -e '/test_\(require_when_gem_defined\|realworld_default_gem\)/,/^ end/ s:^:#:' test/rubygems/test_require.rb || die
rm -f test/rubygems/test_gem_commands_setup_command.rb || die
# Avoid tests playing tricks with ruby engine that don't seem to
# work for us.
rm test/rubygems/test_gem_request_set_gem_dependency_api.rb || die
# Avoid test requiring network access
sed -i -e '/test_download_to_cache/askip "requires network access"' test/rubygems/test_gem_remote_fetcher.rb || die
# Avoid test requiring file system permission changes
sed -i -e '/test_traverse_parents_does_not_crash_on_permissions_error/,/^ end/ s:^:#:' test/rubygems/test_gem_util.rb || die
}
each_ruby_compile() {
# Not really a build but...
sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
}
each_ruby_test() {
# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
#unset RUBYOPT
if [[ "${EUID}" -ne "0" ]]; then
RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
-e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
else
ewarn "The userpriv feature must be enabled to run tests, bug 408951."
eerror "Testsuite will not be run."
fi
}
each_ruby_install() {
# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
unset RUBYOPT
export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
pushd lib &>/dev/null
doruby -r *
popd &>/dev/null
local sld=$(ruby_rbconfig_value 'sitelibdir')
insinto "${sld#${EPREFIX}}" # bug #320813
newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb || die
newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:') || die
}
all_ruby_install() {
dodoc History.txt README.md
if use server; then
newinitd "${FILESDIR}/init.d-gem_server2" gem_server || die "newinitd failed"
newconfd "${FILESDIR}/conf.d-gem_server" gem_server || die "newconfd failed"
fi
}
pkg_postinst() {
if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
fi
ewarn
ewarn "To switch between available Ruby profiles, execute as root:"
ewarn "\teselect ruby set ruby(23|24|...)"
ewarn
}

@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/xmlrpc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Ruby"
SLOT="0"
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
ruby_add_bdepend "test? ( dev-ruby/test-unit )"

Binary file not shown.

@ -1 +1,2 @@
DIST cscope-15.8a.tar.gz 601232 BLAKE2B 8c67311059a055af775ba3d42942a557b54c0214751d8756e6a5c19a7a271824004e72c533614015ddcb0ffa4c768f99eb736d441dc8467c5be4824cebf5c15e SHA512 bedba69820eca86420f6c975d1f267de67a457b182a3fe49720a2ae5ea48759c5b5b8db06ed5ffd85173ddf4a0f12ca722e87200dea4a2da7d43c8c711b00318
DIST cscope-15.9.tar.gz 613948 BLAKE2B 66c0c85d0db810e8cd5a286925eeb1026fa4a9e9c3a5a9decd1412188fca43f831949c231acca428b5eeb476662b7ce9f81defcda81759c18027655535b855be SHA512 f3b95da5eb5c036cd39215785990c7cce7ce7b8eda4b18e60792e70d01ffb63809ce32ace310a9aefd88e6761c1609039ccfab0e8e49f81730bc1630babbcb80

@ -0,0 +1,68 @@
# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit autotools elisp-common toolchain-funcs
DESCRIPTION="Interactively examine a C program"
HOMEPAGE="http://cscope.sourceforge.net/"
SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
LICENSE="BSD GPL-2+"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs"
RDEPEND=">=sys-libs/ncurses-5.2:0=
emacs? ( virtual/emacs )"
DEPEND="${RDEPEND}"
BDEPEND="sys-devel/flex
virtual/pkgconfig
virtual/yacc"
SITEFILE="50${PN}-gentoo.el"
src_prepare() {
eapply "${FILESDIR}/${PN}-15.7a-ocs-sysdir.patch" #269305
eapply_user
mv configure.{in,ac} || die
eautoreconf # prevent maintainer mode later on
}
src_configure() {
econf --with-ncurses="${EPREFIX}"/usr
}
src_compile() {
emake CURSES_LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
if use emacs; then
cd "${S}"/contrib/xcscope || die
elisp-compile *.el
fi
}
src_install() {
default
if use emacs; then
cd "${S}"/contrib/xcscope || die
elisp-install ${PN} *.el *.elc
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
dobin cscope-indexer
fi
cd "${S}"/contrib/webcscope || die
docinto webcscope
dodoc INSTALL TODO cgi-lib.pl cscope hilite.c
docinto webcscope/icons
dodoc icons/*.gif
}
pkg_postinst() {
use emacs && elisp-site-regen
}
pkg_postrm() {
use emacs && elisp-site-regen
}

@ -14,7 +14,7 @@ HOMEPAGE="https://www.gtk.org/"
LICENSE="LGPL-2+"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE=""
RDEPEND="${PYTHON_DEPS}"

@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
RDEPEND="${PYTHON_DEPS}
!<dev-libs/glib-2.56.2:2

Binary file not shown.

@ -6,7 +6,7 @@
# gx86-multilib team <multilib@gentoo.org>
# @AUTHOR:
# Author: Michał Górny <mgorny@gentoo.org>
# @SUPPORTED_EAPIS: 6
# @SUPPORTED_EAPIS: 6 7
# @BLURB: cmake-utils wrapper for multilib builds
# @DESCRIPTION:
# The cmake-multilib.eclass provides a glue between cmake-utils.eclass(5)
@ -20,7 +20,7 @@
# phase rather than 'default'.
case ${EAPI:-0} in
6) ;;
[67]) ;;
*) die "EAPI=${EAPI} is not supported" ;;
esac

Binary file not shown.

@ -1 +1,2 @@
DIST SuperTux-v0.5.1-Source.tar.gz 90564367 BLAKE2B ba6549c135655d59ebbbed1431baf30cce1e0fb1bcdaee3dd050732992a02bb4dbd25b5399c83d3a7145f8afd20b3e8f4471007d424d2bc40c906d6121678123 SHA512 1a841cec9b71ff482aa271ec94f0563052ed33c65b26958c15c818f897f184356605a115abb70bdb8302f8cdb6e6107cf336790c3929cbc7e3dc78d31b4e2c8a
DIST SuperTux-v0.6.0-Source.tar.gz 131203604 BLAKE2B 196e2ec328469b8fd373abeca6755207dbfdb8d21ba294f8150abd889f0ea8636ab3132cee94c976b8b768a6965eafe7467f09333ecf59a294405e73a5211c59 SHA512 7e313f1af1131e83ec658fee12803542d59075fa94a0a79a9182382335dc1b10a9f75092562555acf875dd03b15b336b40772fb8cdd81a82fa5802deb51b610b

@ -0,0 +1,11 @@
--- SuperTux-v0.6.0-Source/CMakeLists.txt
+++ SuperTux-v0.6.0-Source/CMakeLists.txt
@@ -846,7 +846,7 @@
install(FILES ${DLLS} DESTINATION ${INSTALL_SUBDIR_BIN})
endif()
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.png ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.ico DESTINATION ".")
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.png DESTINATION ".")
option(PACKAGE_VCREDIST "Package the VCREDIST libraries with the program" OFF)

@ -0,0 +1,11 @@
--- SuperTux-v0.6.0-Source/CMakeLists.txt
+++ SuperTux-v0.6.0-Source/CMakeLists.txt
@@ -895,7 +895,7 @@
install(FILES ${SQUIRREL_LIB_PATH} ${SQSTDLIB_LIB_PATH} ${PHYSFS_LIB_PATH} DESTINATION ${INSTALL_SUBDIR_BIN})
endif()
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/INSTALL.md ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt ${CMAKE_CURRENT_SOURCE_DIR}/NEWS.md DESTINATION ${INSTALL_SUBDIR_DOC})
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/INSTALL.md ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/NEWS.md DESTINATION ${INSTALL_SUBDIR_DOC})
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/credits.stxt DESTINATION ${INSTALL_SUBDIR_SHARE})

@ -0,0 +1,19 @@
--- SuperTux-v0.6.0-Source/CMakeLists.txt
+++ SuperTux-v0.6.0-Source/CMakeLists.txt
@@ -470,7 +470,6 @@
include_directories(${CMAKE_BINARY_DIR}/)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/)
include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/findlocale/)
-include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/obstack/)
include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/sexp-cpp/include/)
include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/SDL_SavePNG/)
@@ -481,7 +480,7 @@
## Build list of sources for supertux binary
-file(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} external/obstack/*.c external/findlocale/findlocale.c)
+file(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} external/findlocale/findlocale.c)
file(GLOB SUPERTUX_SOURCES_CXX RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} src/*/*.cpp src/supertux/menu/*.cpp src/video/sdl/*.cpp src/video/null/*.cpp)
file(GLOB SUPERTUX_RESOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${PROJECT_BINARY_DIR}/tmp/*.rc")

@ -0,0 +1,60 @@
# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
: ${CMAKE_MAKEFILE_GENERATOR:=emake}
inherit cmake-utils flag-o-matic
MY_P="SuperTux-v${PV}-Source"
DESCRIPTION="A game similar to Super Mario Bros."
HOMEPAGE="https://supertux.org/"
SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="debug"
RDEPEND="dev-games/physfs
dev-libs/boost:=
media-libs/glew:=
virtual/opengl
media-libs/libvorbis
media-libs/openal
>=media-libs/libsdl2-2.0.1[joystick,video]
>=media-libs/sdl2-image-2.0.0[png,jpeg]
>=net-misc/curl-7.21.7"
DEPEND="${RDEPEND}
virtual/pkgconfig"
S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/${PN}-0.5.0-tinygettext.patch
"${FILESDIR}"/${PN}-0.6.0-{license,icon,obstack}.patch
)
src_prepare() {
cmake-utils_src_prepare
# This is not a developer release so switch the logo to the non-dev one.
sed -e 's@logo_dev@logo@' \
-i data/images/objects/logo/logo.sprite || die
}
src_configure() {
append-cxxflags -std=c++11
local mycmakeargs=(
-DWERROR=OFF
-DINSTALL_SUBDIR_BIN=bin
-DINSTALL_SUBDIR_DOC=share/doc/${PF}
-DINSTALL_SUBDIR_SHARE=share/${PN}2
-DENABLE_SQDBG="$(usex debug)"
-DENABLE_BOOST_STATIC_LIBS=OFF # bug! Please check if this is still required.
-DUSE_SYSTEM_PHYSFS=ON
)
cmake-utils_src_configure
}

@ -0,0 +1,26 @@
# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
MY_P="0ad-${PV/_/-}"
DESCRIPTION="Data files for 0ad"
HOMEPAGE="https://play0ad.com/"
SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz"
LICENSE="GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
S="${WORKDIR}/${MY_P}"
src_prepare() {
default
rm binaries/data/tools/fontbuilder/fonts/*.txt
}
src_install() {
insinto /usr/share/0ad
doins -r binaries/data/*
}

@ -1 +1,2 @@
DIST 0ad-0.0.23-alpha-unix-data.tar.xz 691973492 BLAKE2B 7dcd36d21ea2c12f314f5a185a0fce57cec33754fbd26ad34c376fb9c7725fe5487e79a3da54249981fe58bf03c39350a871198a4cfb98c3a40eb878c6cc39b6 SHA512 9eae8bbdf83f609a0775261d691435c2924b505499fdf36ac0922b5f0c1d605dae49f257a872153c718d8bad018f6635320ec376418761c0d650bf165765e062
DIST 0ad-0.0.23b-alpha-unix-data.tar.xz 691280800 BLAKE2B 9ee0a1c14adb4fa2a842ad734f67a40af60d063c2f1876a34c49e584017b3fc6894a6be7c6533f15031b118d8a88b40b223decdbc3b8ea95f912271ec56f3a90 SHA512 d0515e44f575737a06f27c75c0a58a5229ead474ae6d48531142015548e5986145f895f95e0fa9209cf9085c7c431f4179ff2e70c1a532f61d1cb62c0a91bcfc

@ -0,0 +1,147 @@
# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
WX_GTK_VER="3.0"
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="threads,ssl"
inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1
MY_P=0ad-${PV/_/-}
DESCRIPTION="A free, real-time strategy game"
HOMEPAGE="https://play0ad.com/"
SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"
LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="editor +lobby nvtt pch test"
RESTRICT="test"
RDEPEND="
dev-libs/boost:=
dev-libs/icu:=
dev-libs/libsodium
dev-libs/libxml2
dev-libs/nspr
~games-strategy/0ad-data-${PV}
media-libs/libpng:0
media-libs/libsdl2[X,opengl,video]
media-libs/libvorbis
media-libs/openal
net-libs/enet:1.3
net-libs/miniupnpc:=
net-misc/curl
sys-libs/zlib
virtual/jpeg:0
virtual/opengl
x11-libs/libX11
x11-libs/libXcursor
editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
lobby? ( >=net-libs/gloox-1.0.20 )
nvtt? ( media-gfx/nvidia-texture-tools )"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
virtual/pkgconfig
test? ( dev-lang/perl )"
S="${WORKDIR}/${MY_P}"
pkg_setup() {
python-any-r1_pkg_setup
use editor && setup-wxwidgets
}
PATCHES=(
"${FILESDIR}"/${PN}-0.0.21_alpha-gentoo.patch
)
src_configure() {
local myconf=(
--with-system-nvtt
--with-system-miniupnpc
--minimal-flags
$(usex nvtt "" "--without-nvtt")
$(usex pch "" "--without-pch")
$(usex test "" "--without-tests")
$(usex editor "--atlas" "")
$(usex lobby "" "--without-lobby")
--collada
--bindir="/usr/bin"
--libdir="/usr/$(get_libdir)"/${PN}
--datadir="/usr/share/${PN}"
)
# stock premake4 does not work, use the shipped one
emake -C "${S}"/build/premake/premake4/build/gmake.unix
# regenerate scripts.c so our patch applies
cd "${S}"/build/premake/premake4 || die
"${S}"/build/premake/premake4/bin/release/premake4 embed || die
# rebuild premake again... this is the most stupid build system
emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
emake -C "${S}"/build/premake/premake4/build/gmake.unix
# run premake to create build scripts
cd "${S}"/build/premake || die
"${S}"/build/premake/premake4/bin/release/premake4 \
--file="premake4.lua" \
--outpath="../workspaces/gcc/" \
--platform=$(usex amd64 "x64" "x32") \
--os=linux \
"${myconf[@]}" \
gmake || die "Premake failed"
}
src_compile() {
tc-export AR
# build bundled and patched spidermonkey
cd libraries/source/spidermonkey || die
JOBS="${MAKEOPTS}" ./build.sh || die
cd "${S}" || die
# build 3rd party fcollada
emake -C libraries/source/fcollada/src
# build 0ad
emake -C build/workspaces/gcc verbose=1
}
src_test() {
cd binaries/system || die
./test -libdir "${S}/binaries/system" || die "test phase failed"
}
src_install() {
newbin binaries/system/pyrogenesis 0ad
use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
insinto /usr/share/${PN}
doins -r binaries/data/l10n
exeinto /usr/$(get_libdir)/${PN}
doexe binaries/system/libCollada.so
doexe libraries/source/spidermonkey/lib/*.so
use editor && doexe binaries/system/libAtlasUI.so
dodoc binaries/system/readme.txt
doicon -s 128 build/resources/${PN}.png
make_desktop_entry ${PN}
}
pkg_preinst() {
gnome2_icon_savelist
}
pkg_postinst() {
gnome2_icon_cache_update
}
pkg_postrm() {
gnome2_icon_cache_update
}

@ -1 +1,2 @@
DIST 0ad-0.0.23-alpha-unix-build.tar.xz 31907988 BLAKE2B 567b9e1b5cd653206194e042f4f0859cd4f9afe75d52d3f480a328b76fdcdd746254502fbf284f790b4932c912ff31453bbc8c986c879ad76baa3d2a5db802c9 SHA512 4a1c86b19e0d8ec7d9b8bf75428df0255f95e7f991f419734f9b6ddc288a537405a34c5d7081f1a97475155c49013af85dee5c0265c35c7dbc003b46637a03d7
DIST 0ad-0.0.23b-alpha-unix-build.tar.xz 31922812 BLAKE2B db7d6bf1a2bb084870b914cf974bfdb19812ff6f9391e5bc5213ae215fc670b77bd4508a5432aa3e47bf327bd37d4bb14961ab3332b165b53327c3f01a935ac1 SHA512 82934313c46c4fd89e3841d5bbf901904abbd2108e9749529d7282bd24ac53b9e6878681c06e6019f4d8ec0e425c28300b0aafc9610a66a331777ffb58ed6135

Binary file not shown.

Binary file not shown.

@ -0,0 +1,33 @@
From 3110457f72f70b2d283c1ad2f27b91b95d75d92f Mon Sep 17 00:00:00 2001
From: Christian Hergert <chergert@redhat.com>
Date: Wed, 18 Jul 2018 19:31:17 -0700
Subject: [PATCH] housekeeping: fix improper notify_notification_close() usage
notify_notification_close() expects that a parameter will be available for
the error location, which could be a dangling pointer in a register or
on the stack in the case of some architectures.
This was caught by GNOME/glib#1425 which allows us to check proper type
parameters.
---
plugins/housekeeping/gsd-disk-space.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/plugins/housekeeping/gsd-disk-space.c b/plugins/housekeeping/gsd-disk-space.c
index 0ae40193..0eee94ea 100644
--- a/plugins/housekeeping/gsd-disk-space.c
+++ b/plugins/housekeeping/gsd-disk-space.c
@@ -1017,7 +1017,9 @@ gsd_ldsm_clean (void)
g_clear_object (&ldsm_monitor);
g_clear_object (&settings);
g_clear_object (&privacy_settings);
- g_clear_pointer (&notification, notify_notification_close);
+ /* NotifyNotification::closed callback will drop reference */
+ if (notification != NULL)
+ notify_notification_close (notification, NULL);
g_slist_free_full (ignore_paths, g_free);
ignore_paths = NULL;
}
--
2.17.0

@ -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
@ -103,6 +103,7 @@ PATCHES=(
# Reduce memory usage by using a fake CSS theme instead of full Adwaita for GTK+ needing plugins; requires eautoreconf
# Fix build system to require gudev with wayland, bug #627966
"${WORKDIR}"/patches/
"${FILESDIR}"/glib-2.58-compat.patch
)
python_check_deps() {

@ -98,6 +98,7 @@ PATCHES=(
# Allow specifying udevrulesdir via configure, bug 509484; requires eautoreconf
# Fix build system to require gudev with wayland, bug #627966; requires eautoreconf
"${WORKDIR}"/patches/
"${FILESDIR}"/glib-2.58-compat.patch # included in 3.29.1+, might be backported to 3.28 too
)
python_check_deps() {

Binary file not shown.

@ -0,0 +1,58 @@
From b48ecb5712037027e6385515c9eced7fabfc3dc3 Mon Sep 17 00:00:00 2001
From: "Martin T. H. Sandsmark" <martin.sandsmark@kde.org>
Date: Mon, 10 Dec 2018 10:09:35 -0500
Subject: fix cursor when anti aliasing is enabled
Summary:
When there is a margin of 1 pixel, but some of the anti-aliasing
"blur" leaks to 0,0. so it is fixed with a full update() (e. g. when
it regains focus), but not when just some content updates in the
window. Without this it draws outside the content rect, most
visible as a vertical line if the cursor is completely to the left and
then moves.
Reviewers: #konsole, hindenburg
Reviewed By: #konsole, hindenburg
Subscribers: pbraun, konsole-devel, #konsole
Tags: #konsole
Differential Revision: https://phabricator.kde.org/D17414
(cherry picked from commit e7085310d6d594823d0ed491fa8bdbd99dec4932)
---
src/TerminalDisplay.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
index 6e8b262..64c831c 100644
--- a/src/TerminalDisplay.cpp
+++ b/src/TerminalDisplay.cpp
@@ -933,7 +933,7 @@ void TerminalDisplay::drawCursor(QPainter& painter,
// shift rectangle top down one pixel to leave some space
// between top and bottom
- QRect cursorRect = rect.adjusted(0, 1, 0, 0);
+ QRectF cursorRect = rect.adjusted(0, 1, 0, 0);
QColor cursorColor = _cursorColor.isValid() ? _cursorColor : foregroundColor;
painter.setPen(cursorColor);
@@ -942,10 +942,10 @@ void TerminalDisplay::drawCursor(QPainter& painter,
// draw the cursor outline, adjusting the area so that
// it is draw entirely inside 'rect'
int penWidth = qMax(1, painter.pen().width());
- painter.drawRect(cursorRect.adjusted(penWidth / 2,
- penWidth / 2,
- - penWidth / 2 - penWidth % 2,
- - penWidth / 2 - penWidth % 2));
+ painter.drawRect(cursorRect.adjusted(penWidth / 2 + 0.5,
+ penWidth / 2 + 0.5,
+ - penWidth / 2 - penWidth % 2 + 0.5,
+ - penWidth / 2 - penWidth % 2 + 0.5));
// draw the cursor body only when the widget has focus
if (hasFocus()) {
--
cgit v1.1

@ -48,7 +48,10 @@ DEPEND="
"
RDEPEND="${DEPEND}"
PATCHES=( "${FILESDIR}/${P}-fix-drawing-box-chars.patch" ) # fixed in 18.12.1
PATCHES=(
"${FILESDIR}/${P}-fix-drawing-box-chars.patch" # fixed in 18.12.1
"${FILESDIR}/${P}-fix-cursor.patch" # fixed in 18.12.1
)
src_configure() {
local mycmakeargs=(

@ -19,7 +19,6 @@ DEPEND="
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep kdewebkit)
$(add_frameworks_dep kemoticons)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)

@ -0,0 +1,253 @@
From 27c6834e4e984c34a55fad313c26fe08d9dd35b0 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
Date: Tue, 25 Dec 2018 16:52:26 +0100
Subject: [PATCH] Fix building against exiv2-0.27
Summary:
Copied FindLibExiv2.cmake from ECM 5.53.0 until we raise min version.
Bumped cmake to 3.7 minimum for VERSION_GREATER_EQUAL.
Test Plan: Tested build with exiv2-0.26 and 0.27
Reviewers: #kde_applications, cgilles
Subscribers: heikobecker
Differential Revision: https://phabricator.kde.org/D17799
---
CMakeLists.txt | 36 ++++----
cmake/modules/FindExiv2.cmake | 80 ------------------
cmake/modules/FindLibExiv2.cmake | 115 ++++++++++++++++++++++++++
cmake/templates/libkexiv2.pc.cmake.in | 2 +-
config-kexiv2.h.cmake | 4 +
src/CMakeLists.txt | 3 +-
src/kexiv2.cpp | 2 +-
src/kexiv2.h | 1 +
src/kexiv2_p.cpp | 17 +---
src/kexiv2_p.h | 1 +
src/kexiv2exif.cpp | 4 +
11 files changed, 147 insertions(+), 118 deletions(-)
delete mode 100644 cmake/modules/FindExiv2.cmake
create mode 100644 cmake/modules/FindLibExiv2.cmake
create mode 100644 config-kexiv2.h.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d13ef27..fcda905 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,14 +4,14 @@
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-set(CMAKE_MIN_VERSION "3.0.0")
+set(CMAKE_MIN_VERSION "3.7.0")
set(ECM_MIN_VERSION "1.1.0")
set(REQUIRED_QT_VERSION "5.2.0")
set(EXIV2_MIN_VERSION "0.24")
cmake_minimum_required(VERSION ${CMAKE_MIN_VERSION})
-project(libkexiv2)
+project(libkexiv2 VERSION "5.0.0")
message(STATUS "----------------------------------------------------------------------------------")
message(STATUS "Starting CMake configuration for: ${PROJECT_NAME}")
@@ -47,18 +47,12 @@ message(STATUS "Starting CMake configuration for: ${PROJECT_NAME}")
# 2.4.0 => 11.3.0 - Add new method to access on text edit widget from AltLangStrEdit
# 5.0.0 => 15.0.0 (Released with KDE 5.x)
-# Library API version
-set(KEXIV2_LIB_MAJOR_VERSION "5")
-set(KEXIV2_LIB_MINOR_VERSION "0")
-set(KEXIV2_LIB_PATCH_VERSION "0")
-
# Library ABI version used by linker.
# For details : http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
set(KEXIV2_LIB_SO_CUR_VERSION "15")
set(KEXIV2_LIB_SO_REV_VERSION "0")
set(KEXIV2_LIB_SO_AGE_VERSION "0")
-set(LIBKEXIV2_LIB_VERSION "${KEXIV2_LIB_MAJOR_VERSION}.${KEXIV2_LIB_MINOR_VERSION}.${KEXIV2_LIB_PATCH_VERSION}")
set(LIBKEXIV2_SO_VERSION "${KEXIV2_LIB_SO_CUR_VERSION}.${KEXIV2_LIB_SO_REV_VERSION}.${KEXIV2_LIB_SO_AGE_VERSION}")
############## ECM setup ######################
@@ -77,6 +71,13 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(GenerateExportHeader)
include(FeatureSummary)
+ecm_setup_version(${libkexiv2_VERSION}
+ VARIABLE_PREFIX KEXIV2
+ VERSION_HEADER "src/libkexiv2_version.h"
+ PACKAGE_VERSION_FILE "KF5KExiv2ConfigVersion.cmake"
+ SOVERSION ${LIBKEXIV2_SO_VERSION}
+)
+
############## Find Packages ###################
find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS
@@ -84,20 +85,13 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS
Gui
)
-find_package(Exiv2 ${EXIV2_MIN_VERSION} REQUIRED)
-set_package_properties("Exiv2" PROPERTIES
- DESCRIPTION "Required to build libkexiv2"
- URL "http://www.exiv2.org"
- TYPE RECOMMENDED
- PURPOSE "Library to manage image metadata"
-)
+find_package(LibExiv2 ${EXIV2_MIN_VERSION} REQUIRED)
-ecm_setup_version(${LIBKEXIV2_LIB_VERSION}
- VARIABLE_PREFIX KEXIV2
- VERSION_HEADER "src/libkexiv2_version.h"
- PACKAGE_VERSION_FILE "KF5KExiv2ConfigVersion.cmake"
- SOVERSION ${LIBKEXIV2_SO_VERSION}
-)
+if (LibExiv2_VERSION VERSION_GREATER_EQUAL "0.27")
+ set(HAVE_LIBEXIV2_0_27 TRUE)
+endif()
+
+configure_file(config-kexiv2.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kexiv2.h)
############## Targets #########################
diff --git a/cmake/templates/libkexiv2.pc.cmake.in b/cmake/templates/libkexiv2.pc.cmake.in
index 1df60df..e80e0ec 100644
--- a/cmake/templates/libkexiv2.pc.cmake.in
+++ b/cmake/templates/libkexiv2.pc.cmake.in
@@ -7,6 +7,6 @@ Name: ${PROJECT_NAME}
Description: A C++ library to manipulate EXIF/IPTC/XMP metadata using Exiv2 library.
URL: https://cgit.kde.org/libkexiv2.git/
Requires:
-Version: ${KEXIV2_LIB_VERSION_STRING}
+Version: ${libkexiv2_VERSION}
Libs: -L${LIB_INSTALL_DIR} -lkexiv2
Cflags: -I${INCLUDE_INSTALL_DIR}
diff --git a/config-kexiv2.h.cmake b/config-kexiv2.h.cmake
new file mode 100644
index 0000000..40992bd
--- /dev/null
+++ b/config-kexiv2.h.cmake
@@ -0,0 +1,4 @@
+/* config-kexiv2.h. Generated by cmake from config-kexiv2.h.cmake */
+
+/* Defined if we have libexiv2 >= 0.27 */
+#cmakedefine HAVE_LIBEXIV2_0_27
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2b2df03..8ac18f5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,7 +6,6 @@
kde_enable_exceptions()
-include_directories(${EXIV2_INCLUDE_DIR})
include_directories(${CMAKE_CURRENT_BINARY_DIR}/..)
add_definitions(${EXIV2_DEFINITIONS})
@@ -55,7 +54,7 @@ target_include_directories(KF5KExiv2 INTERFACE
target_link_libraries(KF5KExiv2
PRIVATE
- ${EXIV2_LIBRARIES}
+ LibExiv2::LibExiv2
PUBLIC
Qt5::Core
Qt5::Gui
diff --git a/src/kexiv2.cpp b/src/kexiv2.cpp
index 04c4aa4..b7bbc1a 100644
--- a/src/kexiv2.cpp
+++ b/src/kexiv2.cpp
@@ -153,7 +153,7 @@ QString KExiv2::Exiv2Version()
// Since 0.14.0 release, we can extract run-time version of Exiv2.
// else we return make version.
- return QString::fromLatin1(Exiv2::version());
+ return QString::fromStdString(Exiv2::versionString());
}
QString KExiv2::version()
diff --git a/src/kexiv2.h b/src/kexiv2.h
index bebddb5..02a5c9c 100644
--- a/src/kexiv2.h
+++ b/src/kexiv2.h
@@ -51,6 +51,7 @@
#include "libkexiv2_export.h"
#include "kexiv2data.h"
+#include "../config-kexiv2.h"
namespace KExiv2Iface
{
diff --git a/src/kexiv2_p.cpp b/src/kexiv2_p.cpp
index cb6b134..2a287ab 100644
--- a/src/kexiv2_p.cpp
+++ b/src/kexiv2_p.cpp
@@ -124,19 +124,15 @@ bool KExiv2::Private::saveToFile(const QFileInfo& finfo) const
QStringList rawTiffBasedSupported, rawTiffBasedNotSupported;
- // Raw files supported by Exiv2 0.21
+ // Raw files supported by Exiv2 0.23
rawTiffBasedSupported << QString::fromLatin1("dng")
<< QString::fromLatin1("nef")
<< QString::fromLatin1("pef")
<< QString::fromLatin1("orf")
- << QString::fromLatin1("srw");
+ << QString::fromLatin1("srw")
+ << QString::fromLatin1("cr2");
- if (Exiv2::testVersion(0,23,0))
- {
- rawTiffBasedSupported << QString::fromLatin1("cr2");
- }
-
- // Raw files not supported by Exiv2 0.21
+ // Raw files not supported by Exiv2 0.23
rawTiffBasedNotSupported << QString::fromLatin1("3fr")
<< QString::fromLatin1("arw")
<< QString::fromLatin1("dcr")
@@ -149,11 +145,6 @@ bool KExiv2::Private::saveToFile(const QFileInfo& finfo) const
<< QString::fromLatin1("srf")
<< QString::fromLatin1("rw2");
- if (!Exiv2::testVersion(0,23,0))
- {
- rawTiffBasedNotSupported << QString::fromLatin1("cr2");
- }
-
QString ext = finfo.suffix().toLower();
if (!writeRawFiles && (rawTiffBasedSupported.contains(ext) || rawTiffBasedNotSupported.contains(ext)) )
diff --git a/src/kexiv2_p.h b/src/kexiv2_p.h
index ddf8f6d..c73fbbf 100644
--- a/src/kexiv2_p.h
+++ b/src/kexiv2_p.h
@@ -71,6 +71,7 @@
#include <exiv2/properties.hpp>
#include <exiv2/types.hpp>
#include <exiv2/exif.hpp>
+#include <exiv2/exiv2.hpp>
#include <exiv2/xmpsidecar.hpp>
// Check if Exiv2 support XMP
diff --git a/src/kexiv2exif.cpp b/src/kexiv2exif.cpp
index 11c8948..3093b70 100644
--- a/src/kexiv2exif.cpp
+++ b/src/kexiv2exif.cpp
@@ -987,7 +987,11 @@ bool KExiv2::setTiffThumbnail(const QImage& thumbImage, bool setProgramName) con
if (pos == d->exifMetadata().end() || pos->count() != 1 || pos->toLong() != 0)
{
+#ifdef HAVE_LIBEXIV2_0_27
+ throw Exiv2::Error(Exiv2::kerErrorMessage, "Exif.Image.NewSubfileType missing or not set as main image");
+#else
throw Exiv2::Error(1, "Exif.Image.NewSubfileType missing or not set as main image");
+#endif
}
// Remove sub-IFD tags
--
2.20.1

@ -3,6 +3,7 @@
EAPI=6
FRAMEWORKS_MINIMAL="5.53.0"
KDE_BLOCK_SLOT4="false"
inherit kde5
@ -16,3 +17,5 @@ DEPEND="
>=media-gfx/exiv2-0.25:=[xmp=]
"
RDEPEND="${DEPEND}"
PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" )

Binary file not shown.

@ -0,0 +1,27 @@
From 26620aef0bd6d01b543e7523dd15dddc1bb871df Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <ossi@kde.org>
Date: Mon, 24 Dec 2018 14:43:23 +0100
Subject: use soft rlimit for number of open handles
systemd 240 bumped the hard limit from the previous 4k (?) to 1G, which
makes kdeinit essentially lock up at startup.
to get around that, use the soft limit, which matches fd_setsize (1k).
---
src/kdeinit/kinit.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp
index 748bfca..02ab794 100644
--- a/src/kdeinit/kinit.cpp
+++ b/src/kdeinit/kinit.cpp
@@ -165,7 +165,7 @@ static void cleanup_fds()
int maxfd = FD_SETSIZE;
struct rlimit rl;
if (getrlimit(RLIMIT_NOFILE, &rl) == 0) {
- maxfd = rl.rlim_max;
+ maxfd = rl.rlim_cur;
}
for (int fd = 3; fd < maxfd; ++fd) {
#if KDEINIT_OOM_PROTECT
--
cgit v1.1

@ -33,6 +33,8 @@ DEPEND="${RDEPEND}
X? ( x11-base/xorg-proto )
"
PATCHES=( "${FILESDIR}/${P}-systemd-240-soft-rlimit.patch" )
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package caps Libcap)

Binary file not shown.

@ -0,0 +1,188 @@
From ec90823494f5ec9bb2e8098f44209f383ef8c22a Mon Sep 17 00:00:00 2001
From: Heiko Becker <heirecka@exherbo.org>
Date: Tue, 20 Nov 2018 18:24:29 +0100
Subject: Use #cmakedefine01 instead of macro_bool_to_01
---
CMakeLists.txt | 13 +++++--------
config-krename.h.cmake | 10 +++++-----
3 files changed, 10 insertions(+), 33 deletions(-)
delete mode 100644 cmake/modules/MacroBoolTo01.cmake
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,13 +80,10 @@ set_package_properties(Freetype PROPERTIES
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
-
-# Update configuration
-include(MacroBoolTo01)
-macro_bool_to_01(TAGLIB_FOUND HAVE_TAGLIB)
-macro_bool_to_01(EXIV2_FOUND HAVE_EXIV2)
-macro_bool_to_01(PoDoFo_FOUND HAVE_PODOFO)
-macro_bool_to_01(FREETYPE_FOUND HAVE_FREETYPE)
+set(HAVE_TAGLIB ${TAGLIB_FOUND})
+set(HAVE_EXIV2 ${LibExiv2_FOUND})
+set(HAVE_PODOFO ${PoDoFo_FOUND})
+set(HAVE_FREETYPE ${FREETYPE_FOUND})
configure_file(config-krename.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-krename.h)
# Directories
--- a/config-krename.h.cmake
+++ b/config-krename.h.cmake
@@ -1,15 +1,15 @@
/* config.h. Generated by cmake from config.h.cmake */
/* have TagLib */
-#define HAVE_TAGLIB ${HAVE_TAGLIB}
+#cmakedefine01 HAVE_TAGLIB
/* have Exiv2 */
-#define HAVE_EXIV2 ${HAVE_EXIV2}
+#cmakedefine01 HAVE_EXIV2
/* have PoDoFo */
-#define HAVE_PODOFO ${HAVE_PODOFO}
+#cmakedefine01 HAVE_PODOFO
/* have Freetype */
-#define HAVE_FREETYPE ${HAVE_FREETYPE}
+#cmakedefine01 HAVE_FREETYPE
-#define VERSION "${KRENAME_VERSION}"
+#define VERSION "${krename_VERSION}"
--
cgit v1.1
From b22de9135ba2a5abdbd2b275a60933a50f074010 Mon Sep 17 00:00:00 2001
From: Heiko Becker <heirecka@exherbo.org>
Date: Tue, 20 Nov 2018 18:26:47 +0100
Subject: Fix building against exiv2-0.27
One neeeded part is to copy over the new FindLibExiv2 module from
ECM which has not appeared in a release yet (it will with 5.53.0).
I'll probably add that version as a requirement and remove the copy
again in the near future.
The other part includes raising the cmake version requirement to
3.7.0, which was released over 2 years ago. (The version comparison
could be easily solved differently and less elegantly, but let's see
if people with ancient cmakes complain).
---
CMakeLists.txt | 15 ++---
config-krename.h.cmake | 3 +
src/CMakeLists.txt | 8 +--
src/exiv2plugin.cpp | 8 ++-
6 files changed, 137 insertions(+), 91 deletions(-)
delete mode 100644 cmake/modules/FindExiv2.cmake
create mode 100644 cmake/modules/FindLibExiv2.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,5 @@
-project(krename)
-cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.7)
+
+project(krename VERSION "5.0.0")
@@ -39,10 +40,6 @@ add_definitions(
-DQT_STRICT_ITERATORS
)
-set(KRENAME_VERSION "5.0.0")
-
-include(FindGettext)
-
# Find taglib
set(TAGLIB_MIN_VERSION "1.5")
find_package(Taglib ${TAGLIB_MIN_VERSION})
@@ -58,11 +55,12 @@ set_package_properties(Taglib PROPERTIES
TYPE OPTIONAL)
# Find exiv2
-find_package(Exiv2 0.13) # AccessMode was added in 0.13
-set_package_properties(Exiv2 PROPERTIES
- DESCRIPTION "A library to access image metadata"
- URL "http://www.exiv2.org"
- TYPE OPTIONAL)
+find_package(LibExiv2 0.13) # AccessMode was added in 0.13
+set_package_properties(LibExiv2 PROPERTIES TYPE OPTIONAL)
+
+if (LibExiv2_VERSION VERSION_GREATER_EQUAL "0.27")
+ set(HAVE_LIBEXIV2_0_27 TRUE)
+endif()
# Find podofo
find_package(PoDoFo)
--- a/config-krename.h.cmake
+++ b/config-krename.h.cmake
@@ -6,6 +6,9 @@
/* have Exiv2 */
#cmakedefine01 HAVE_EXIV2
+/* Defined if we have libexiv2 >= 0.27 */
+#cmakedefine HAVE_LIBEXIV2_0_27
+
/* have PoDoFo */
#cmakedefine01 HAVE_PODOFO
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -23,7 +23,7 @@ if(FREETYPE_FOUND)
include_directories(${FREETYPE_INCLUDE_DIRS})
endif()
-add_definitions(${TAGLIB_CFLAGS} ${EXIV2_CFLAGS})
+add_definitions(${TAGLIB_CFLAGS})
# Exiv2 needs exceptions
kde_enable_exceptions()
@@ -67,7 +67,7 @@ set(krename_SRCS
snumplugin.cpp
)
-if(EXIV2_FOUND)
+if(LibExiv2_FOUND)
set(krename_SRCS ${krename_SRCS}
exiv2plugin.cpp
)
@@ -137,9 +137,9 @@ if(TAGLIB_FOUND)
${TAGLIB_LIBRARIES}
)
endif()
-if(EXIV2_FOUND)
+if(LibExiv2_FOUND)
target_link_libraries(krename
- ${EXIV2_LIBRARIES}
+ LibExiv2::LibExiv2
)
endif()
if(PoDoFo_FOUND)
--- a/src/exiv2plugin.cpp
+++ b/src/exiv2plugin.cpp
@@ -17,13 +17,19 @@
#include "exiv2plugin.h"
+#include "../config-krename.h"
+
#include <KLocalizedString>
#include <exiv2/error.hpp>
#include <exiv2/exif.hpp>
#include <exiv2/image.hpp>
#include <exiv2/iptc.hpp>
-#include <exiv2/xmp.hpp>
+#ifdef HAVE_LIBEXIV2_0_27
+ #include <exiv2/xmp_exiv2.hpp>
+#else
+ #include <exiv2/xmp.hpp>
+#endif
#include <exiv2/tags.hpp>
#include "batchrenamer.h"
--
cgit v1.1

@ -0,0 +1,55 @@
# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
FRAMEWORKS_MINIMAL="5.53.0"
KDE_TEST="true"
inherit kde5
DESCRIPTION="Powerful batch file renamer"
HOMEPAGE="http://www.krename.net/"
SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86"
IUSE="exif pdf taglib truetype"
DEPEND="
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kcrash)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)
$(add_frameworks_dep kio)
$(add_frameworks_dep kitemviews)
$(add_frameworks_dep kjobwidgets)
$(add_frameworks_dep kjs)
$(add_frameworks_dep kservice)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
$(add_qt_dep qtgui)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
exif? ( media-gfx/exiv2:= )
pdf? ( app-text/podofo )
taglib? ( media-libs/taglib )
truetype? ( media-libs/freetype:2 )
"
RDEPEND="${DEPEND}
!kde-misc/krename:4
"
PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" )
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package exif LibExiv2)
$(cmake-utils_use_find_package taglib Taglib)
$(cmake-utils_use_find_package pdf PoDoFo)
$(cmake-utils_use_find_package truetype Freetype)
)
kde5_src_configure
}

Binary file not shown.

@ -1,3 +1,4 @@
DIST cone-0.92.tar.bz2 3774451 BLAKE2B 3686ca90249f38c0be83138bf310802f5a5ea1e0694abef5ec9311a00e9c81692abf2148cf23640932ba1fe0c49ea6738689189c618412e985b02a45dba9c7a4 SHA512 8d764ed3cb2a22caff21d11beff74131fdbbe0f66dbf1a40293f62862e9af7a472840ff00a069df10143f7154c2db85ac5421999476516f27b8f090e5c1232fc
DIST cone-0.95.tar.bz2 3748331 BLAKE2B 9461cc28afb255e7ca4080e4c876f5391e916c493b6596b0bfc0ec2d0cedb837d10cbd6904cd49b0b425e5edddd42c123b952725339b7388fb5a2debd72c04c1 SHA512 545d17286b937eb33b5fa14c36a480eea0146802f6c8a36e55987206b125bac55b25ab79a4c833ffa1fdcdbe56b2949acd5c8bdfd27c900bf64d5e738677ef4a
DIST cone-0.96.tar.bz2 3752115 BLAKE2B d4548083f86adc096534750e69db648d24fc5b643961041df04257d71f4e8af2c3456948f9227e652d2bdc80f65948bf8b543c3eba738187e17d6d9f5c424e28 SHA512 6bdc8ac1a8ae8345bb09eb03857cf5db2c55ac57e3f76726a7371fd763a4265f02dbda7bcbf03090d3004bc800a5bb42a328ead900ff71609246aaa4a314609e
DIST cone-1.0.tar.bz2 3793288 BLAKE2B e2c8aa91adfff77d3f0207a3caca5d13ebae8c9455402c296a98364708acd3d4138ea4642044b2dfe396eaef18c3b90ebf0ef3702bc73351a4317219a4c28863 SHA512 6fc30158cebed62b0598787d53e1936b50a32b6590266e93dbacbd63371d4fa8e43ffe95e0f4ee51991e2d892b26c1531b563203e45108815f05a091b7051161

@ -5,7 +5,7 @@ EAPI=5
inherit eutils autotools
DESCRIPTION="CONE: COnsole News reader and Emailer"
HOMEPAGE="http://www.courier-mta.org/cone/"
HOMEPAGE="https://www.courier-mta.org/cone/"
SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
LICENSE="GPL-3"

@ -5,7 +5,7 @@ EAPI=6
inherit eutils autotools
DESCRIPTION="CONE: COnsole News reader and Emailer"
HOMEPAGE="http://www.courier-mta.org/cone/"
HOMEPAGE="https://www.courier-mta.org/cone/"
SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
LICENSE="GPL-3"

@ -5,7 +5,7 @@ EAPI=6
inherit eutils autotools
DESCRIPTION="CONE: COnsole News reader and Emailer"
HOMEPAGE="http://www.courier-mta.org/cone/"
HOMEPAGE="https://www.courier-mta.org/cone/"
SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
LICENSE="GPL-3"

@ -0,0 +1,73 @@
# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit autotools
DESCRIPTION="CONE: COnsole News reader and Emailer"
HOMEPAGE="https://www.courier-mta.org/cone/"
SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
IUSE="crypt fam gnutls idn ipv6 ldap spell"
RDEPEND="
dev-libs/libxml2
sys-libs/ncurses:0=
>=net-libs/courier-unicode-2
spell? ( app-text/aspell )
crypt? ( >=app-crypt/gnupg-1.0.4 )
fam? ( virtual/fam )
gnutls? (
net-libs/gnutls:0=
dev-libs/libgcrypt:0=
dev-libs/libgpg-error
)
!gnutls? ( >=dev-libs/openssl-0.9.6:0= )
idn? ( net-dns/libidn:0= )
ipv6? ( net-dns/libidn:0= )
ldap? ( net-nds/openldap )"
DEPEND="${RDEPEND}
dev-lang/perl"
PATCHES=( "${FILESDIR}"/${P}-no-spelling.patch )
DOCS=( AUTHORS ChangeLog INSTALL NEWS README )
src_prepare() {
default
# move local macro to m4 and run eautoreconf
mkdir "${S}"/m4 || die
sed -n -e '/# AC_PROG_SYSCONFTOOL/,+33 p' "${S}"/aclocal.m4 > m4/sysconftool.m4 || die
sed -i -e '/^SUBDIRS/i ACLOCAL_AMFLAGS = -I m4' "${S}"/Makefile.am || die
eautoreconf
}
src_configure() {
local myeconfargs=(
--with-notice=unicode
--with-spellcheck=$(usex spell aspell none)
$(use_with ldap ldapaddressbook)
$(use_with gnutls)
$(use_with idn libidn)
$(use_with ipv6)
)
econf "${myeconfargs[@]}"
}
src_install() {
default
emake DESTDIR="${D}" install-configure
}
pkg_postinst() {
if [[ ${REPLACING_VERSIONS} ]]; then
elog "See the \"Upgrading from version 0.96 and earlier\" section in"
elog "${EROOT}/usr/share/doc/${PF}/INSTALL for information on updating"
elog "older installs."
fi
}

@ -0,0 +1,46 @@
Allow spellchecking support to be disabled.
--- cone-1.0/cone/configure.ac
+++ cone-1.0/cone/configure.ac
@@ -183,8 +183,10 @@
ALLSPELLOBJ='spellcheckerPspell.$(OBJEXT)'" $ALLSPELLOBJ"
fi
-AC_ARG_WITH(spellcheck, [ --with-spellcheck=pspell Use pspell for spell checking
- --with-spellcheck=aspell Use aspell for spell checking], [
+AC_ARG_WITH(spellcheck, [
+ --with-spellcheck=pspell Use pspell for spell checking
+ --with-spellcheck=aspell Use aspell for spell checking
+ --with-spellcheck=none Disable spell checking], [
case "$withval" in
pspell)
@@ -200,6 +202,10 @@
AC_MSG_ERROR(aspell library not found)
fi
;;
+none)
+ PSPELL="none"
+ ASPELL="none"
+ ;;
*)
AC_MSG_ERROR(Invalid --with-spellcheck option)
;;
@@ -232,10 +238,13 @@
SPELL_OBJ='spellcheckerPspell.$(OBJEXT)'
SPELL_LIB='-lpspell'
else
- AC_MSG_WARN(---------------------------------------------------------------)
- AC_MSG_WARN(Neither pspell nor aspell was found -- disabling spell checking)
- AC_MSG_WARN(---------------------------------------------------------------)
- sleep 5
+ if test "$ASPELL" != "none" && test "$PSPELL" != "none"
+ then
+ AC_MSG_WARN(---------------------------------------------------------------)
+ AC_MSG_WARN(Neither pspell nor aspell was found -- disabling spell checking)
+ AC_MSG_WARN(---------------------------------------------------------------)
+ sleep 5
+ fi
SPELL_OBJ='spellcheckerNone.$(OBJEXT)'
SPELL_LIB=''
fi

Binary file not shown.

@ -1,3 +1,4 @@
DIST maildrop-2.8.3.tar.bz2 1992695 BLAKE2B be17fa1ac38f8a54670e40f2b4207c2ee5e8976f20e29c6a528ccf50a716c8b4aedb0546a9722f1147573afd9d43f8a8caa59aec8bf9069ef833226cb2ea0562 SHA512 25168945764eda5c74641e205e3c784ca2ae27c15a5a6ddfe7a1c7b238cd6c3d5b0a3f7ce8b405b578d067f6f2aae5d7d6110da8bc89f91ac1c7fdc224ffd054
DIST maildrop-2.8.5.tar.bz2 2072987 BLAKE2B e067e0ef77f850fd9ce97584893dd5301a7a91fcebea02351da8b22d3d7f0b74f3809cdc3874b29117a62d5c496962f72a5254470cd5f92b787b80d066f1fec1 SHA512 c04120af29ee8e72aeabd211301c5052fe4a2dc0f337074e1fa57b8adb9652512cd744e0bba3894a8b0e3b21a3511bbf4a4f045faec3536edb8be0f8bdc84cf5
DIST maildrop-2.9.0.tar.bz2 2075698 BLAKE2B 2a918214e471a4a54aa7e0412e062ca85ac3ce4757bf4642fb0c0a9776a7c1b1bc417ef426c9bd7767d99b9d783085bf6c67f402ea43b0e7eba10c82d98b5619 SHA512 366a04d1e6e10ef1c824fbb5dfe406ff74fe17b80a46619fd8aa8cde3b4fef9a10b4ed3cc6329ed04632582d58104aaf16134c6dc82e17917b82fb6f18316dd6
DIST maildrop-3.0.0.tar.bz2 2091018 BLAKE2B 3c8e3ae5c2c2f636b0223e2bafadcb88bf34be63c792a177febac5c41ccd50cab04755f14a26731c38a35531abea1faa70d4af5587a6e68a21735f050f2d46d8 SHA512 1f1e1682ec7c2d0c1f2e71059f186d9a9d3118194b1e558d3a6e5826721fb14a661f4d75df42ce2626430ac072b50e723b563ae00c1ebdeb4da96abfeb534eff

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save