Browse Source

Sync with portage [Mon Nov 7 09:20:52 MSK 2016].

mhiretskiy
root 5 years ago
parent
commit
d1ba0ca146
  1. 1
      app-admin/elektra/Manifest
  2. 14
      app-admin/elektra/elektra-0.8.15.ebuild
  3. 122
      app-admin/elektra/elektra-0.8.16.ebuild
  4. 39
      app-admin/elektra/elektra-9999.ebuild
  5. 20
      app-admin/elektra/files/elektra-0.8.15-gcc-5.4.0.patch
  6. 24
      app-admin/elektra/metadata.xml
  7. 2
      app-admin/glance/glance-13.0.0.ebuild
  8. 2
      app-arch/dpkg/Manifest
  9. 23
      app-arch/dpkg/dpkg-1.18.12.ebuild
  10. 10
      app-arch/dpkg/files/dpkg-1.18.12-dpkg_buildpackage-test.patch
  11. 11
      app-arch/dpkg/files/dpkg-1.18.12-flags.patch
  12. 28
      app-arch/dpkg/files/dpkg-1.18.12-rsyncable.patch
  13. 2
      app-arch/unar/unar-1.10.1.ebuild
  14. 3
      app-crypt/simple-tpm-pk11/Manifest
  15. 37
      app-crypt/simple-tpm-pk11/simple-tpm-pk11-0.04.ebuild
  16. 6
      app-crypt/simple-tpm-pk11/simple-tpm-pk11-0.06.ebuild
  17. 1
      app-doc/kicad-doc/Manifest
  18. 1
      app-doc/kicad-doc/kicad-doc-4.0.1.ebuild
  19. 1
      app-doc/kicad-doc/kicad-doc-4.0.2.ebuild
  20. 73
      app-doc/kicad-doc/kicad-doc-4.0.4.ebuild
  21. 1
      app-emulation/hyperd/Manifest
  22. 50
      app-emulation/hyperd/hyperd-0.7.0.ebuild
  23. 15
      app-emulation/hyperd/metadata.xml
  24. 4
      app-emulation/rkt/metadata.xml
  25. 1
      app-emulation/runv/Manifest
  26. 15
      app-emulation/runv/metadata.xml
  27. 46
      app-emulation/runv/runv-0.7.0.ebuild
  28. 1
      app-misc/khal/Manifest
  29. 44
      app-misc/khal/khal-0.8.3.ebuild
  30. 2
      app-misc/neofetch/Manifest
  31. 21
      app-misc/neofetch/neofetch-1.9.1.ebuild
  32. 289
      app-office/libreoffice/files/libreoffice-5.2-icu58.patch
  33. 2
      app-office/libreoffice/libreoffice-5.1.4.2.ebuild
  34. 2
      app-office/libreoffice/libreoffice-5.2.2.2.ebuild
  35. 3
      app-office/libreoffice/libreoffice-5.2.3.3.ebuild
  36. 3
      app-office/libreoffice/libreoffice-5.2.9999.ebuild
  37. 31
      app-office/scribus/files/scribus-1.5.2-cmake-qt57.patch
  38. 24
      app-office/scribus/files/scribus-1.5.2-cxx-build.patch
  39. 87
      app-office/scribus/files/scribus-1.5.2-gcc6-warn.patch
  40. 21
      app-office/scribus/files/scribus-1.5.2-qt57-build.patch
  41. 41
      app-office/scribus/scribus-1.5.2-r2.ebuild
  42. 2
      app-portage/distpatch/Manifest
  43. 12
      app-portage/distpatch/distpatch-0.1.2.ebuild
  44. 99
      app-portage/eix/eix-0.32.1-r1.ebuild
  45. 73
      app-portage/eix/eix-0.32.1.ebuild
  46. 6
      app-portage/flaggie/flaggie-0.2.1.ebuild
  47. 25
      app-portage/flaggie/flaggie-9999.ebuild
  48. 4
      app-portage/flaggie/metadata.xml
  49. 8
      app-portage/g-octave/files/g-octave-0.4.1-add_cave_support.patch
  50. 4
      app-portage/g-octave/files/g-octave-0.4.1-fix-Makefile.patch
  51. 50
      app-portage/g-octave/g-octave-0.4.1-r5.ebuild
  52. 1
      dev-haskell/mutable-containers/Manifest
  53. 30
      dev-haskell/mutable-containers/mutable-containers-0.3.3.ebuild
  54. 1
      dev-haskell/parsec/Manifest
  55. 30
      dev-haskell/parsec/parsec-3.1.11.ebuild
  56. 1
      dev-haskell/pretty-show/Manifest
  57. 27
      dev-haskell/pretty-show/pretty-show-1.6.12.ebuild
  58. 1
      dev-haskell/psqueues/Manifest
  59. 32
      dev-haskell/psqueues/psqueues-0.2.2.2.ebuild
  60. 39
      dev-haskell/quickcheck-instances/quickcheck-instances-0.3.12-r1.ebuild
  61. 1
      dev-haskell/quickcheck-io/Manifest
  62. 27
      dev-haskell/quickcheck-io/quickcheck-io-0.1.4.ebuild
  63. 1
      dev-haskell/sandi/Manifest
  64. 38
      dev-haskell/sandi/sandi-0.4.0.ebuild
  65. 1
      dev-haskell/scientific/Manifest
  66. 37
      dev-haskell/scientific/scientific-0.3.4.9.ebuild
  67. 1
      dev-haskell/setlocale/Manifest
  68. 25
      dev-haskell/setlocale/setlocale-1.0.0.4.ebuild
  69. 9
      dev-haskell/shellish/files/shellish-0.1.4-ghc-8.patch
  70. 3
      dev-haskell/shellish/shellish-0.1.4.ebuild
  71. 1
      dev-haskell/shelly/Manifest
  72. 47
      dev-haskell/shelly/shelly-1.6.8.1.ebuild
  73. 1
      dev-haskell/simple-sendfile/Manifest
  74. 36
      dev-haskell/simple-sendfile/simple-sendfile-0.2.25.ebuild
  75. 1
      dev-haskell/statistics/Manifest
  76. 43
      dev-haskell/statistics/statistics-0.13.3.0.ebuild
  77. 1
      dev-haskell/stmonadtrans/Manifest
  78. 33
      dev-haskell/stmonadtrans/stmonadtrans-0.3.4.ebuild
  79. 1
      dev-haskell/streaming-commons/Manifest
  80. 34
      dev-haskell/streaming-commons/streaming-commons-0.1.16.ebuild
  81. 1
      dev-haskell/syb-with-class/Manifest
  82. 25
      dev-haskell/syb-with-class/syb-with-class-0.6.1.7.ebuild
  83. 1
      dev-haskell/tasty-golden/Manifest
  84. 33
      dev-haskell/tasty-golden/tasty-golden-2.3.1.1.ebuild
  85. 13
      dev-haskell/tasty-quickcheck/tasty-quickcheck-0.8.4.ebuild
  86. 1
      dev-haskell/tasty-rerun/Manifest
  87. 33
      dev-haskell/tasty-rerun/tasty-rerun-1.1.6.ebuild
  88. 1
      dev-haskell/tasty/Manifest
  89. 34
      dev-haskell/tasty/tasty-0.11.0.4.ebuild
  90. 1
      dev-haskell/test-framework-th-prime/Manifest
  91. 28
      dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.9.ebuild
  92. 1
      dev-haskell/texmath/Manifest
  93. 47
      dev-haskell/texmath/texmath-0.8.6.7.ebuild
  94. 1
      dev-haskell/time-locale-compat/Manifest
  95. 26
      dev-haskell/time-locale-compat/time-locale-compat-0.1.1.3.ebuild
  96. 35
      dev-haskell/timezone-olson/timezone-olson-0.1.7-r1.ebuild
  97. 1
      dev-haskell/timezone-series/Manifest
  98. 25
      dev-haskell/timezone-series/timezone-series-0.1.6.1.ebuild
  99. 1
      dev-haskell/unix-compat/Manifest
  100. 30
      dev-haskell/unix-compat/unix-compat-0.4.2.0.ebuild

1
app-admin/elektra/Manifest

@ -1,3 +1,4 @@
DIST elektra-0.7.1.tar.gz 1347524 SHA256 ff90ae274935eac9c9c5c85ca7e66049be46a31d9ef08bc59a59858a15284c8c SHA512 25ca25e95d1a20a79ba97b094dc9630fb791f6653c2bacec751cc51492202831b7d28ae0786081e6be91581245bda3f5b7e2f3b523f7faa6bfb1d97b3d209684 WHIRLPOOL e90e7c126f2467c8ae29e3cffd5d8a6bfa444dfd38edcc8809d49562825aff8ec6c826139da4a2aa09e38935ee63b48674431c7cc27e2a14d372b2b8270b170d
DIST elektra-0.8.12.tar.gz 2102450 SHA256 562432bea9455a61ff6e6b3263078ea9b26bef2ed177a04b5f9b181d605bc021 SHA512 be01dbeae5cc680973a7c7917f341506106139c7facc3d3f597f31f7aa91065dcee862121b8704d589f4c6dd916a99cadc9b67e2e9604bec2841b1ebafea89ea WHIRLPOOL 6661d9a337aa71fcc9764f127ec4055b3eb1456d60608c80ac8763aee2d680ab8691a16668da8ef694efb09e2415f58bf4e34a4f1f0e9a7498fecf88f56ce9da
DIST elektra-0.8.15.tar.gz 2338297 SHA256 6a406986cecb8d4a44485ced118ee803bc039b0824b72298e123b4dd47eb0b22 SHA512 86a408dd546b33e3b437f92f415de7aee6a235189f9eab0762b3f44ab4c453ee369a53de10a9f5b0df1b446460b12c57c6b8b77c282648ec2a49f2328d9af13d WHIRLPOOL c4f77903f9340c665f4c484c0b700b048358691873031ae5e62e63f0acf9a5fc5efb3c307331712497c59172ad202780280abfa8b717f523fabda73564a0005e
DIST elektra-0.8.16.tar.gz 2405443 SHA256 3cf0624eb027e533192ca9d612618df3d38ec3674c9cd20474f04ff269fad77e SHA512 b225e61379907365a423ea75ec7138e5257bb78c526bb05a1ec21f66a52eb4bad9e6f1eb23209d700670b21b86166497b47c3bc46bc9d45f6d366cd544afc326 WHIRLPOOL 3230dbe2f613b5eee71c01ce7afeac3cca02ffbf45cba7a9300f8f3347d5d4c3baf0f8339ecaaaeb3ca747523229292738f1e94660187c1a9c23b4aaa02f0b6f

14
app-admin/elektra/elektra-0.8.15.ebuild

@ -41,7 +41,10 @@ RESTRICT="test"
MULTILIB_WRAPPED_HEADERS=( /usr/include/elektra/kdbconfig.h )
PATCHES=( "${FILESDIR}/${P}"-conditional-glob-tests.patch )
PATCHES=(
"${FILESDIR}/${P}"-conditional-glob-tests.patch
"${FILESDIR}/${P}"-gcc-5.4.0.patch
)
src_prepare() {
cmake-utils_src_prepare
@ -97,13 +100,12 @@ multilib_src_configure() {
fi
mycmakeargs=(
"-DBUILD_PDF=OFF"
"-DBUILD_SHARED=ON"
"-DPLUGINS=${my_plugins}"
"-DTOOLS=${my_tools}"
"-DLATEX_COMPILER=OFF"
"-DTARGET_CMAKE_FOLDER=share/cmake/Modules"
$(multilib_is_native_abi && cmake-utils_use doc BUILD_DOCUMENTATION \
|| echo -DBUILD_DOCUMENTATION=OFF)
-DBUILD_DOCUMENTATION=$(multilib_is_native_abi && usex doc || echo no)
$(cmake-utils_use static-libs BUILD_STATIC)
$(cmake-utils_use test BUILD_TESTING)
$(cmake-utils_use test ENABLE_TESTING)
@ -114,7 +116,7 @@ multilib_src_configure() {
multilib_src_install_all() {
einfo remove test_data
rm -rvf "${D}/usr/share/${PN}" || die "Failed to remove test_data"
rm -rvf "${ED%/}/usr/share/${PN}" || die "Failed to remove test_data"
einfo remove tool_exec
rm -rvf "${D}/usr/$(get_libdir)/${PN}/tool_exec" || die "Failed to remove tool_exec"
rm -rvf "${ED%/}/usr/$(get_libdir)/${PN}/tool_exec" || die "Failed to remove tool_exec"
}

122
app-admin/elektra/elektra-0.8.16.ebuild

@ -0,0 +1,122 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
inherit cmake-multilib eutils java-pkg-opt-2
DESCRIPTION="Framework to store config parameters in hierarchical key-value pairs"
HOMEPAGE="https://freedesktop.org/wiki/Software/Elektra"
SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
PLUGIN_IUSE="augeas iconv ini java simpleini syslog systemd tcl +uname xml yajl";
IUSE="dbus doc qt5 static-libs test ${PLUGIN_IUSE}"
RDEPEND="dev-libs/libltdl:0[${MULTILIB_USEDEP}]
>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
augeas? ( app-admin/augeas )
dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
java? ( >=virtual/jdk-1.8.0 )
qt5? (
dev-qt/qtdeclarative:5
dev-qt/qtgui:5
dev-qt/qttest:5
dev-qt/qtwidgets:5
)
uname? ( sys-apps/coreutils )
systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] )
yajl? ( >=dev-libs/yajl-1.0.11-r1[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )
test? ( >=dev-cpp/gtest-1.7.0 )"
DOCS=( README.md doc/AUTHORS doc/CODING.md doc/NEWS.md doc/todo/TODO )
# tries to write to user's home directory (and doesn't respect HOME)
RESTRICT="test"
MULTILIB_WRAPPED_HEADERS=( /usr/include/elektra/kdbconfig.h )
PATCHES=(
"${FILESDIR}/${PN}"-0.8.15-conditional-glob-tests.patch
"${FILESDIR}/${PN}"-0.8.15-gcc-5.4.0.patch
)
src_prepare() {
cmake-utils_src_prepare
einfo remove bundled libs
# TODO: Remove bundled inih from src/plugins/ini (add to portage):
# https://code.google.com/p/inih/
rm -rf src/external || die
# move doc files to correct location
sed -e "s/elektra-api/${PF}/" \
-i cmake/ElektraCache.cmake || die
# avoid useless build time, nothing ends up installed
cmake_comment_add_subdirectory benchmarks
cmake_comment_add_subdirectory examples
}
multilib_src_configure() {
local my_plugins="ALL"
if multilib_is_native_abi ; then
use augeas || my_plugins+=";-augeas"
use java || my_plugins+=";-jni"
else
my_plugins+=";-augeas;-jni"
fi
use dbus || my_plugins+=";-dbus"
use iconv || my_plugins+=";-iconv"
use ini || my_plugins+=";-ini" # bundles inih
use simpleini || my_plugins+=";-simpleini"
use syslog || my_plugins+=";-syslog"
use systemd || my_plugins+=";-journald"
use tcl || my_plugins+=";-tcl"
use uname || my_plugins+=";-uname"
use xml || my_plugins+=";-xmltool"
use yajl || my_plugins+=";-yajl"
# Disabling for good (?):
# counter - Only useful for debugging the plugin framework
# doc - Explaining basic makeup of a function //bug #514402
# noresolver - Does not resolve, but can act as one
# template - Template for new plugin written in C
# wresolver - Resolver for non-POSIX, e.g. w32/w64 systems
my_plugins+=";-counter;-doc;-noresolver;-template;-wresolver"
local my_tools
if multilib_is_native_abi ; then
my_tools="kdb"
use qt5 && my_tools+=";qt-gui"
fi
local mycmakeargs=(
-DBUILD_PDF=OFF
-DBUILD_SHARED=ON
-DBUILD_STATIC=$(usex static-libs)
-DBUILD_TESTING=$(usex test)
-DENABLE_TESTING=$(usex test)
-DPLUGINS=${my_plugins}
-DTOOLS=${my_tools}
-DBUILD_DOCUMENTATION=$(multilib_is_native_abi && usex doc || echo no)
-DTARGET_CMAKE_FOLDER=share/cmake/Modules
)
cmake-utils_src_configure
}
multilib_src_install_all() {
einfo remove test_data
rm -rvf "${ED%/}/usr/share/${PN}" || die "Failed to remove test_data"
einfo remove tool_exec
rm -rvf "${ED%/}/usr/$(get_libdir)/${PN}/tool_exec" || die "Failed to remove tool_exec"
}

39
app-admin/elektra/elektra-9999.ebuild

@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
EAPI=6
inherit cmake-multilib eutils java-pkg-opt-2 git-r3
@ -23,10 +23,10 @@ RDEPEND="dev-libs/libltdl:0[${MULTILIB_USEDEP}]
iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
java? ( >=virtual/jdk-1.8.0 )
qt5? (
>=dev-qt/qtdeclarative-5.3:5
>=dev-qt/qtgui-5.3:5
>=dev-qt/qttest-5.3:5
>=dev-qt/qtwidgets-5.3:5
dev-qt/qtdeclarative:5
dev-qt/qtgui:5
dev-qt/qttest:5
dev-qt/qtwidgets:5
)
uname? ( sys-apps/coreutils )
systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] )
@ -56,8 +56,8 @@ src_prepare() {
-i cmake/ElektraCache.cmake || die
# avoid useless build time, nothing ends up installed
comment_add_subdirectory benchmarks
comment_add_subdirectory examples
cmake_comment_add_subdirectory benchmarks
cmake_comment_add_subdirectory examples
}
multilib_src_configure() {
@ -96,17 +96,16 @@ multilib_src_configure() {
use qt5 && my_tools+=";qt-gui"
fi
mycmakeargs=(
"-DBUILD_SHARED=ON"
"-DPLUGINS=${my_plugins}"
"-DTOOLS=${my_tools}"
"-DLATEX_COMPILER=OFF"
"-DTARGET_CMAKE_FOLDER=share/cmake/Modules"
$(multilib_is_native_abi && cmake-utils_use doc BUILD_DOCUMENTATION \
|| echo -DBUILD_DOCUMENTATION=OFF)
$(cmake-utils_use static-libs BUILD_STATIC)
$(cmake-utils_use test BUILD_TESTING)
$(cmake-utils_use test ENABLE_TESTING)
local mycmakeargs=(
-DBUILD_PDF=OFF
-DBUILD_SHARED=ON
-DBUILD_STATIC=$(usex static-libs)
-DBUILD_TESTING=$(usex test)
-DENABLE_TESTING=$(usex test)
-DPLUGINS=${my_plugins}
-DTOOLS=${my_tools}
-DBUILD_DOCUMENTATION=$(multilib_is_native_abi && usex doc || echo no)
-DTARGET_CMAKE_FOLDER=share/cmake/Modules
)
cmake-utils_src_configure
@ -114,7 +113,7 @@ multilib_src_configure() {
multilib_src_install_all() {
einfo remove test_data
rm -rvf "${D}/usr/share/${PN}" || die "Failed to remove test_data"
rm -rvf "${ED%/}/usr/share/${PN}" || die "Failed to remove test_data"
einfo remove tool_exec
rm -rvf "${D}/usr/$(get_libdir)/${PN}/tool_exec" || die "Failed to remove tool_exec"
rm -rvf "${ED%/}/usr/$(get_libdir)/${PN}/tool_exec" || die "Failed to remove tool_exec"
}

20
app-admin/elektra/files/elektra-0.8.15-gcc-5.4.0.patch

@ -0,0 +1,20 @@
commit 05c925972224afd3fa28f34b9a762364a38f6850
Author: Markus Raab <elektra@markus-raab.org>
Date: Tue May 3 14:25:54 2016 +0200
add vector kdbtimer
fix http://build.libelektra.org:8080/job/elektra-gcc-configure-debian/lastFailedBuild/console
diff --git a/src/bindings/cpp/include/kdbtimer.hpp b/src/bindings/cpp/include/kdbtimer.hpp
index ae4c242..b7f731e 100644
--- a/src/bindings/cpp/include/kdbtimer.hpp
+++ b/src/bindings/cpp/include/kdbtimer.hpp
@@ -13,6 +13,7 @@
#include <sstream>
#include <string>
#include <sys/time.h>
+#include <vector>
#ifdef __GNUC__
#define TIMER_NOINLINE __attribute__ ((noinline))

24
app-admin/elektra/metadata.xml

@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>xmw@gentoo.org</email>
<name>Michael Weber</name>
</maintainer>
<use>
<flag name="augeas">Enable plugin for reading and writing configuration files with help from Augeas</flag>
<flag name="ini">Enable new, advanced ini support</flag>
<flag name="gcov">Enable coverage support</flag>
<flag name="simpleini">Enable simpleini support</flag>
<flag name="uname">Enable uname information for the key database</flag>
<flag name="yajl">Enable yajl support</flag>
</use>
<maintainer type="person">
<email>xmw@gentoo.org</email>
<name>Michael Weber</name>
</maintainer>
<use>
<flag name="augeas">Enable plugin for reading and writing configuration files with help from Augeas</flag>
<flag name="gcov">Enable coverage support</flag>
<flag name="ini">Enable new, advanced ini support</flag>
<flag name="simpleini">Enable simpleini support</flag>
<flag name="uname">Enable uname information for the key database</flag>
<flag name="yajl">Enable yajl support</flag>
</use>
</pkgmetadata>

2
app-admin/glance/glance-13.0.0.ebuild

@ -13,7 +13,7 @@ SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
KEYWORDS="amd64 ~arm64 x86"
IUSE="doc mysql postgres +sqlite +swift"
REQUIRED_USE="|| ( mysql postgres sqlite )"

2
app-arch/dpkg/Manifest

@ -1,4 +1,4 @@
DIST dpkg_1.17.26.tar.xz 4410860 SHA256 aa4e758752cdfd7ecb118d7a7d31139a0c090c92aa494aa2e46603006deb1ec8 SHA512 4d2f2a7691dd34d47b62ec1f602d9bab612b151f05362607ec8e31037c4ba0baf5d609c46352240e9806e5781db8df9781e8a0ee9fd24faf54f8b43244a7e538 WHIRLPOOL 56decf0774f2d4405fb0934415c50749230c06fe9112e0ebb4458a8917538c83644eadb885d24350bbf713a6250dd5687956b70d47e22c06cf39ff87cb2d5a23
DIST dpkg_1.17.27.tar.xz 4413092 SHA256 90749c31b9f1fceb46dd9fab5b50de34272efef333cc16d9e144f514fd944bb6 SHA512 6f0229bf6c6b76be22d0baf4af21b1175b5397c4a84eb47f0d02bb93173207cc087015a53a2ed9feb7195d313d447d71a0d7361eb1238377c38f8be4465f8bbd WHIRLPOOL cc8525d391bbb42e399e4a1ecb526db1071122272f7eb1b23bdbbad361dfa0f7af8f1fac867f5fb2028d74171ecd3b175b813b2370b2982b17c1d05b39921455
DIST dpkg_1.18.10.tar.xz 4645448 SHA256 025524da41ba18b183ff11e388eb8686f7cc58ee835ed7d48bd159c46a8b6dc5 SHA512 83188277a703b57fa3b5570765db849f9b20f592237fa9a9f3a7e0b24c292c8cfc5528a049f6ecd85f2598c89521727599b406cd3924b2b8c56f9295b560e279 WHIRLPOOL 8bfb17cbc6598482b27502088a6c878b127edeb4dfe54631f776f0db1a6ea32c776929ca15d2251bfb1be1921f775a49f142bcc9c5689c2c374c383df04744d8
DIST dpkg_1.18.9.tar.xz 4632900 SHA256 86ac4af917e9e75eb9b6c947a0a11439d1de32f72237413f7ddab17f77082093 SHA512 d1253734f7949c6e486920b6b67a4412142747be419d8be83792e2fba1fc9e803e6d0988ae028da9d7d1885176659d5e61b9e69f814a9080ea30c36482a17dd5 WHIRLPOOL 6dbc4aaf3d88741c87a7e99637caae83e4ee314f6dc762782c9f83bba4167e34dd0ee5ffdac0f4ef5944981e6d3e091180935961bf1cb66fc7b825f46cbb8051
DIST dpkg_1.18.12.tar.xz 4486092 SHA256 090be9eb714cb0c942b0e3f2b86763f402d736149521080cc1214c70c9c18c49 SHA512 995d9da0d58c2a8317d1e78cf93dd014e32a4d5dc89d8a0f4a0a8b7e8f116fd108ae7d0bf7ab3526f33a594762e95b937a70f5168479522bc50e7fddd51e1f74 WHIRLPOOL f5f057038c7896d54d4a3a42f5d48fb7130a52591023ce4aae3492ab95ad5374197ed00859b713ca1f0d44cea0e1e24a052b13396b9c7654bb783c2427acb763

23
app-arch/dpkg/dpkg-1.18.9.ebuild → app-arch/dpkg/dpkg-1.18.12.ebuild

@ -39,16 +39,19 @@ DEPEND="
)
"
DOCS=( ChangeLog THANKS TODO )
DOCS=(
ChangeLog
THANKS
TODO
)
PATCHES=(
"${FILESDIR}"/${PN}-1.18.9-strerror.patch
"${FILESDIR}"/${PN}-1.18.12-flags.patch
"${FILESDIR}"/${PN}-1.18.12-rsyncable.patch
"${FILESDIR}"/${PN}-1.18.12-dpkg_buildpackage-test.patch
)
src_prepare() {
# do not expect Debian's gzip --rsyncable extension
eapply "${FILESDIR}"/${PN}-1.17.0-gzip-rsyncable.patch
eapply "${FILESDIR}"/${PN}-1.17.1-flags.patch
eapply "${FILESDIR}"/${PN}-1.18.9-strerror.patch
# Force the use of the running bash for get-version (this file is never
# installed, so no need to worry about hardcoding a temporary bash)
sed -i -e '1c\#!'"${BASH}" get-version || die
@ -67,7 +70,7 @@ src_prepare() {
use nls && strip-linguas -i po
eapply_user
default
eautoreconf
}
@ -99,4 +102,6 @@ src_install() {
keepdir /usr/$(get_libdir)/db/methods/{mnt,floppy,disk}
keepdir /usr/$(get_libdir)/db/{alternatives,info,methods,parts,updates}
prune_libtool_files
}

10
app-arch/dpkg/files/dpkg-1.18.12-dpkg_buildpackage-test.patch

@ -0,0 +1,10 @@
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -238,7 +238,6 @@
t/Dpkg_Source_Package.t \
t/Dpkg_Dist_Files.t \
t/dpkg_source.t \
- t/dpkg_buildpackage.t \
t/merge_changelogs.t \
t/mk.t \
$(nil)

11
app-arch/dpkg/files/dpkg-1.18.12-flags.patch

@ -0,0 +1,11 @@
--- a/configure.ac
+++ b/configure.ac
@@ -182,8 +182,6 @@
# Checks for the build machinery.
AC_DEFINE([LIBDPKG_VOLATILE_API], [1], [Acknowledge the volatility of the API.])
DPKG_COMPILER_WARNINGS
-DPKG_COMPILER_OPTIMIZATIONS
-DPKG_LINKER_OPTIMIZATIONS
DPKG_ARCHITECTURE
AC_DEFINE([PACKAGE_RELEASE], [PACKAGE_VERSION " (" ARCHITECTURE ")"],
[Define the project release information, version and architecture])

28
app-arch/dpkg/files/dpkg-1.18.12-rsyncable.patch

@ -0,0 +1,28 @@
--- a/scripts/Dpkg/Compression.pm
+++ b/scripts/Dpkg/Compression.pm
@@ -81,20 +81,12 @@
};
#
-# XXX: The gzip package in Debian at some point acquired a Debian-specific
-# --rsyncable option via a vendor patch. Which is not present in most of the
-# major distributions, dpkg downstream systems, nor gzip upstream, who have
-# stated they will most probably not accept it because people should be using
-# pigz instead.
+# If gzip supports --rsyncable (version >=1.7 or the Debian patched variant),
+# we use it. Sadly a non-compliant gzip will not complain about the argument
+# when it does not understand it, so we can only print out the usage and infer
+# --rsyncable support from that.
#
-# This option should have never been accepted in dpkg, ever. But removing it
-# now would probably cause demands for tarring and feathering. In addition
-# we cannot use the Dpkg::Vendor logic because that would cause circular
-# module dependencies. The whole affair is pretty disgusting really.
-#
-# Check the perl Config to discern Debian and hopefully derivatives too.
-#
-if ($Config{cf_by} eq 'Debian Project') {
+if (system("gzip --help 2>&1 | grep -q -- --rsyncable") == 0) {
push @{$COMP->{gzip}->{comp_prog}}, '--rsyncable';
}

2
app-arch/unar/unar-1.10.1.ebuild

@ -12,7 +12,7 @@ SRC_URI="https://unarchiver.c3.cx/downloads/${PN}${PV}_src.zip"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64"
KEYWORDS="amd64"
IUSE=""
RDEPEND="gnustep-base/gnustep-base

3
app-crypt/simple-tpm-pk11/Manifest

@ -1,2 +1 @@
DIST simple-tpm-pk11-0.03.tar.gz 25238 SHA256 0059064cb29900f0db8ce6163ef6aee17b2dcd095613c813dd53ad7f597bf141 SHA512 ed8a1d605bb21ae6abec426f32159882fef74ee7cbc7cdfa5b649a9947f10bad2b95354b2445f3f40dbd9d55803f9fc40fca02605d466e995083c7e9ca29bd8e WHIRLPOOL 1887c7d18a333319a99b28157f7d9b3bce83868154cd3496b8aec911d3d61b13678d0a0ceb143c65cb8addf625e68ccb4008d65af55f87b2bff27d0ac6dddd40
DIST simple-tpm-pk11-0.04.tar.gz 26377 SHA256 54f67e08cd0847c1716dd86ceb2748982d226f047de059073c2ffa4cad27c56a SHA512 9023fd580237030e4928fa517739801a06ec673571f13ef365e22e7ebe857fa0be5e6d2004663e0b8287ff7a741f163d0f5e1bc28d7c0300b32fc6af0176d275 WHIRLPOOL 0227adcb41ab3f54f9e23fd3f4d6a4cc1ebe92354d2544a92317b2d7f7f690cb7a163402954957ed5cbb10cff75f3b38441033b7395724a3b46c15f5465d51d6
DIST simple-tpm-pk11-0.06.tar.gz 28993 SHA256 8ecdb2a64e046e04bb18d464fd15332c99be82084eb2bd3d340a5ff0e738dcea SHA512 72df0637cefdb0d81f741480cdfe24ac0d6a05a93d729f5e2180adf49b5d7ddb0b60d8c6f7d5e79a67bf4cea202067390c8d4532c906273408f7de4fcc5e66e8 WHIRLPOOL a98c2bf72f3b7f454b47e3ef0a72c069a9c35af8a02fa1b3963f017b3ea483f3fd62f3c4360d094620d723e7e1c5da2fc68430c7229d10fc3513af238c5c3f10

37
app-crypt/simple-tpm-pk11/simple-tpm-pk11-0.04.ebuild

@ -1,37 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit autotools eutils
DESCRIPTION="Simple PKCS11 provider for TPM chips"
HOMEPAGE="https://github.com/ThomasHabets/simple-tpm-pk11"
LICENSE="Apache-2.0"
SLOT="0"
if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="https://github.com/ThomasHabets/${PN}.git"
inherit git-r3
KEYWORDS=""
else
SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
fi
IUSE="libressl"
RESTRICT="test" # needs to communicate with the TPM and gtest is all broken
DEPEND="app-crypt/tpm-tools[pkcs11]
dev-libs/opencryptoki[tpm]
app-crypt/trousers
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )"
RDEPEND="${DEPEND}
net-misc/openssh[-X509]"
src_prepare() {
epatch_user
eautoreconf
}

6
app-crypt/simple-tpm-pk11/simple-tpm-pk11-0.03.ebuild → app-crypt/simple-tpm-pk11/simple-tpm-pk11-0.06.ebuild

@ -2,9 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
EAPI=6
inherit autotools eutils
inherit autotools
DESCRIPTION="Simple PKCS11 provider for TPM chips"
HOMEPAGE="https://github.com/ThomasHabets/simple-tpm-pk11"
@ -32,6 +32,6 @@ RDEPEND="${DEPEND}
net-misc/openssh[-X509]"
src_prepare() {
epatch_user
eapply_user
eautoreconf
}

1
app-doc/kicad-doc/Manifest

@ -1,2 +1,3 @@
DIST kicad-doc-4.0.1.tar.gz 23365382 SHA256 be8dc4bddb89869996956d3d1421584c5a8197282997902e22fda888a8d433bb SHA512 ae57a9c29f3cd4b3d85d4b7d7bc940957c33b0e1c1404b82c8a9261695c0670866cb4a95ab7ad5c35b1faa6fbd3969f277467fa7d33e38e728a3dd9b65203021 WHIRLPOOL d9834312a0a315bf1d5dca048999d5adcb2ee60c42a41d8266522ad6c0ca49ec7bad5c9bad322b6d73c41c9f24cb1f4088d6889c6a51abf4671271dd7ec8af9d
DIST kicad-doc-4.0.2.tar.gz 23365338 SHA256 4a475b3831f9a54a20dc94631cada3e305ede23345a6b4059077ac6900f3d35a SHA512 8cf2ff11141d3a5319d3b17a13648903518aaf0625802762df875550dd5811515e8a65d7414859624a18402cc6289ec70247a6c1f235081768ee344ec42c3b35 WHIRLPOOL f0279935fd823c62a6545afab6c2916173a72b5c881f71d8118ef897972e2d9de2c567944689a70aeeb4bae9b4938f636e9c526d0fd838bb42b8e2b4b4d23b4f
DIST kicad-doc-4.0.4.tar.gz 33705865 SHA256 5564217076641926a2523d4dc66e78810de2fe4b5bd4d2f0ba40a522203c4d27 SHA512 97a45ebbd11ab7f92eff1409bc03512b7685fb4a85dd1d87675e92742cc6672a1332c5fe8d63577eba93ed976af1bb4acaa461dbada5e4695a161cefa82c9ff4 WHIRLPOOL be03128787fc9461e9220845a42acd6d7a6bac5adfdc3106365e8c46e7bd185b6a25857b66c91d444a13a03184fb3a260d04d156768304bddb577ce8e776676a

1
app-doc/kicad-doc/kicad-doc-4.0.1.ebuild

@ -21,6 +21,7 @@ done
DEPEND=">=app-text/asciidoc-8.6.9
app-text/dblatex
app-text/texlive:=[l10n_en?,l10n_fr?,l10n_it?,l10n_ja?,l10n_nl?,l10n_pl?]
>=app-text/po4a-0.45
>=sys-devel/gettext-0.18
dev-util/source-highlight

1
app-doc/kicad-doc/kicad-doc-4.0.2.ebuild

@ -21,6 +21,7 @@ done
DEPEND=">=app-text/asciidoc-8.6.9
app-text/dblatex
app-text/texlive:=[l10n_en?,l10n_fr?,l10n_it?,l10n_ja?,l10n_nl?,l10n_pl?]
>=app-text/po4a-0.45
>=sys-devel/gettext-0.18
dev-util/source-highlight

73
app-doc/kicad-doc/kicad-doc-4.0.4.ebuild

@ -0,0 +1,73 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit cmake-utils
DESCRIPTION="Electronic Schematic and PCB design tools manuals"
HOMEPAGE="http://www.kicad-pcb.org/"
SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
SLOT="0"
KEYWORDS="~amd64"
IUSE="html pdf"
LANGS="en fr it ja nl pl"
for lang in ${LANGS}; do
IUSE+=" l10n_${lang}"
done
unset lang
DEPEND=">=app-text/asciidoc-8.6.9
app-text/dblatex
app-text/texlive:=[l10n_en?,l10n_fr?,l10n_it?,l10n_ja?,l10n_nl?,l10n_pl?]
>=app-text/po4a-0.45
>=sys-devel/gettext-0.18
dev-util/source-highlight
dev-perl/Unicode-LineBreak
l10n_ja? ( media-fonts/vlgothic )"
RDEPEND=""
src_prepare() {
DOCPATH="KICAD_DOC_INSTALL_PATH share/doc/kicad"
sed "s|${DOCPATH}|${DOCPATH}-${PV}|g" -i CMakeLists.txt || die "sed failed"
}
src_configure() {
local formats=""
local doclang=""
local format lang
# construct format string
for format in html pdf; do
use ${format} && formats+="${format};"
done
if [[ -z ${formats} ]]; then
formats="html;"
ewarn "Neither \"html\" nor \"pdf\" USE flag set, using html."
fi
# find out which language is requested
for lang in ${LANGS}; do
if use l10n_${lang}; then
if [[ -z ${doclang} ]]; then
doclang="${lang}"
else
ewarn "Only one single language can be enabled." \
"Using \"${doclang}\", ignoring \"${lang}\"."
fi
fi
done
if [[ -z ${doclang} ]]; then
doclang="en"
ewarn "No language flag set, falling back to \"en\"."
fi
local mycmakeargs=(
-DBUILD_FORMATS="${formats}"
-DSINGLE_LANGUAGE="${doclang}"
)
cmake-utils_src_configure
}

1
app-emulation/hyperd/Manifest

@ -0,0 +1 @@
DIST hyperd-0.7.0.tar.gz 10885921 SHA256 e79d4e6aebe01d2117e981050ecb88dd24f8a9e45e2fbe1a558bcd1ee5d90b88 SHA512 7fc731b393a6bdf173101ee0a6d0e5a3339c6bb6dc1595fbde5b36df5a674f22e95f599e704925532ca0ee5ca931ebdf9f14bba9ad20b62000aee48408adb73f WHIRLPOOL cf911afabcbd7ec9954ad571d12269cff85fb9a84de81a83b483a002707c6ca2e6e8c43540f08f24ae12ccc5eddddc4280e45d67c3a696cfdd2ee4301458aa3d

50
app-emulation/hyperd/hyperd-0.7.0.ebuild

@ -0,0 +1,50 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
EGO_PN="github.com/hyperhq/hyperd"
inherit autotools systemd golang-vcs-snapshot
DESCRIPTION="Hypervisor-based Runtime for OCI"
HOMEPAGE="https://github.com/hyperhq/hyperd"
SRC_URI="https://github.com/hyperhq/hyperd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64"
IUSE="libvirt xen"
RDEPEND="libvirt? ( >=app-emulation/libvirt-1.2.2 )
xen? ( app-emulation/xen )"
DEPEND="${RDEPEND}"
src_prepare() {
pushd src/${EGO_PN} || die
default
eautoreconf
popd
}
src_configure() {
local myeconfargs=( $(use_with libvirt)
$(use_with xen) )
pushd src/${EGO_PN} || die
econf "${myeconfargs[@]}"
popd
}
src_compile() {
GOPATH="${S}:$(get_golibdir_gopath)" emake -C src/${EGO_PN}
}
src_install() {
dodoc src/${EGO_PN}/README.md
dobin src/${EGO_PN}/hyperd
dobin src/${EGO_PN}/hyperctl
insinto /etc/hyper/
doins src/${EGO_PN}/package/dist/etc/hyper/config
systemd_dounit src/${EGO_PN}/package/dist/lib/systemd/system/hyperd.service
}

15
app-emulation/hyperd/metadata.xml

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mrueg@gentoo.org</email>
<name>Manuel Rüger</name>
</maintainer>
<use>
<flag name="libvirt">Enable support for KVM via libvirt</flag>
<flag name="xen">Enable support for the Xen Hypervisor</flag>
</use>
<upstream>
<remote-id type="github">hyperhq/hyperd</remote-id>
</upstream>
</pkgmetadata>

4
app-emulation/rkt/metadata.xml

@ -18,7 +18,9 @@
<flag name="actool">Install the actool for ACI manipulation</flag>
<flag name="rkt_stage1_coreos">Download and use a prebuilt stage1.aci from CoreOS</flag>
<flag name="rkt_stage1_fly">Build stage1-fly.aci</flag>
<flag name="rkt_stage1_kvm">This flag has been replaced by the rkt_stage1_kvm_* flags</flag>
<flag name="rkt_stage1_kvm" restrict="&lt;app-emulation/rkt-1.15.0">
This flag has been replaced by the rkt_stage1_kvm_* flags
</flag>
<flag name="rkt_stage1_kvm_lkvm">Build stage1-kvm-lkvm.aci</flag>
<flag name="rkt_stage1_kvm_qemu">Build stage1-kvm-qemu.aci</flag>
<flag name="rkt_stage1_src">Build the stage1.aci from source</flag>

1
app-emulation/runv/Manifest

@ -0,0 +1 @@
DIST runv-0.7.0.tar.gz 1143867 SHA256 13107bdcaa2217f870c3b4a18d490984eea1e372947d7e4725aab1166d366697 SHA512 1303d4ca99186d9f5c1db4257acecf1702546a084942cc4c51de8685c6841da45be72c78f32ab38e2addb80dc40fe4d022d0fcae7b7d6b6d62a30f434cea178c WHIRLPOOL a5a7eabeeccab89b5202cad0762f366fd80d6eb52552681124eb636809b28444855561a5849429f78643b14eba576323c7999f2c892caaf5211505e80f72d928

15
app-emulation/runv/metadata.xml

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mrueg@gentoo.org</email>
<name>Manuel Rüger</name>
</maintainer>
<use>
<flag name="libvirt">Enable support for KVM via libvirt</flag>
<flag name="xen">Enable support for the Xen Hypervisor</flag>
</use>
<upstream>
<remote-id type="github">hyperhq/runv</remote-id>
</upstream>
</pkgmetadata>

46
app-emulation/runv/runv-0.7.0.ebuild

@ -0,0 +1,46 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
EGO_PN="github.com/hyperhq/runv"
inherit autotools golang-vcs-snapshot
DESCRIPTION="Hypervisor-based Runtime for OCI"
HOMEPAGE="https://github.com/hyperhq/runv"
SRC_URI="https://github.com/hyperhq/runv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64"
IUSE="libvirt xen"
RDEPEND="libvirt? ( >=app-emulation/libvirt-1.2.2 )
xen? ( app-emulation/xen )"
DEPEND="${RDEPEND}"
src_prepare() {
pushd src/github.com/hyperhq/runv/ || die
default
eautoreconf
popd
}
src_configure() {
local myeconfargs=( $(use_with libvirt)
$(use_with xen) )
pushd src/github.com/hyperhq/runv/ || die
econf "${myeconfargs[@]}"
popd
}
src_compile() {
GOPATH="${S}:$(get_golibdir_gopath)" emake -C src/github.com/hyperhq/runv/
}
src_install() {
dodoc src/${EGO_PN}/README.md
dobin src/${EGO_PN}/runv
}

1
app-misc/khal/Manifest

@ -1,2 +1,3 @@
DIST khal-0.7.0.tar.gz 109801 SHA256 c6b0c81df56133e4592f02d8e9b60702079da2affd1b09ba96358ccd8eec9402 SHA512 cad0bd8c5e869ffb5333e62747f0c5f71ae4a82adf60889922fcc61b4befefd926b0d642fcb8aec471aafc3fab6f042fa4253d381936c229582a8196319a1505 WHIRLPOOL bd265e0c2ff84014ae7b706722e8b850221458ad4c24dd9137321c06048ed1b5442eb93b7d18338a97f201b6e598bef2be3abe375b80f9530306e2617c73cfbd
DIST khal-0.8.1.tar.gz 125681 SHA256 9d352e4aa6256e493d5aea69540f642158bdcab75d2383e1e43506bf89982094 SHA512 01b24b7fb041a78443eb1ede80797ca689c2141bf6bb6b171f49931de7440055c38efc4611c483fe85da90794d074e4d08224ce633878ca2f7b8d66799391033 WHIRLPOOL cbcff5dec339ea97ee7bc83860b4f0c0f75801553e191d5856d30758c95936b2a156cea09ae9bd5a2ea96a3914b454f84ce0123970d1d74693be75caa23cbd27
DIST khal-0.8.3.tar.gz 126656 SHA256 1ec6940a9fbd207c41428b103bac1d1555129b9b4eca2b843c544bd48ac63ee3 SHA512 f49e57a6cc9abfcf8dbc5811c2fe00661fd09a8a6d1a64bae4df5ce9c1d01c6f325adeef68a7b45eed3a34bd797b801c00fcd8fa4fdf378335d5273629f0a165 WHIRLPOOL 20963f12d9419f2421680548a6de22261e4d9c4482f6a28937b4339335b5a4965178bae0624cc5172da98c534603d3cd0ed5337e03c04190195a478b34b4a34f

44
app-misc/khal/khal-0.8.3.ebuild

@ -0,0 +1,44 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="6"
PYTHON_COMPAT=( python3_4 )
PYTHON_REQ_USE="sqlite"
inherit distutils-r1
DESCRIPTION="A CalDAV based calendar"
HOMEPAGE="http://lostpackets.de/khal/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
KEYWORDS="~amd64 ~x86"
SLOT="0"
IUSE="zsh-completion"
RDEPEND=">=dev-python/click-3.2[${PYTHON_USEDEP}]
dev-python/icalendar[${PYTHON_USEDEP}]
dev-python/urwid[${PYTHON_USEDEP}]
dev-python/pyxdg[${PYTHON_USEDEP}]
dev-python/pytz[${PYTHON_USEDEP}]
dev-python/vdirsyncer[${PYTHON_USEDEP}]
dev-python/pkginfo[${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/configobj[${PYTHON_USEDEP}]
>=dev-python/tzlocal-1.0[${PYTHON_USEDEP}]
dev-python/setproctitle[${PYTHON_USEDEP}]
zsh-completion? ( app-shells/zsh )"
DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
DOCS=( AUTHORS.txt CHANGELOG.rst CONTRIBUTING.txt README.rst khal.conf.sample )
src_install() {
distutils-r1_src_install
if use zsh-completion; then
insinto /usr/share/zsh/site-functions
doins misc/__khal
fi
}

2
app-misc/neofetch/Manifest

@ -1,2 +1,2 @@
DIST neofetch-1.8.1.tar.gz 52867 SHA256 dfa1e97f3a91af00da45af1bf3f6a197f545063dba129bd4db839b0139e68e24 SHA512 c89a5c2b01c75fdce66e901d95f19da7e7865bc708426a577b3d11bd383eb7261d1493eb06aa4da59c141bd0d5629a6dbdf1dcf334ea57a86ceab565de627f29 WHIRLPOOL f6de8f24f602298582d61a7932344cb4f3d0ddd197d7c948273f12e911a593059aead4dd598d54331d65aa0d6764386f5e268775dc19c0817b2201c13687af37
DIST neofetch-1.9.tar.gz 57413 SHA256 c9cbe0eeedbceaf9b23f9a1c4e0838e410dc7bdfdeb7fbd10f5eaf377cceff05 SHA512 15b094d2e655ba69a460da0e24cc2527f47a6bbbaa249e87f053708c869fb00d8e7a8ea91e3a614c6702a9396266b975f1c4e9c5aa39a75f6ce3ca06e2d7eb29 WHIRLPOOL 4e788ce093b27b9af1092c4f89174a978f141ca72d0039715a80057d56018a67eb36cdcecf8575b6199c6987a99f1e3b008eb44a10967a6cd9b8d50108f2855b
DIST neofetch-1.9.1.tar.gz 55739 SHA256 d7e30215994968ca861836f9bab9259624688fd50620e7d5af5c8b31da8bd32b SHA512 e5b339549bd5eae726e66369bd9ebae7927117d7fb5af52bdfa54d5bff0793d72ed893ed631999dd492a2044fcc91ffe990ae8113b40fa3d724f5584417defc9 WHIRLPOOL 74f35ede4b3836d4b5485df0a80a1a9fef0d23de637558456dac69bdf7f4a1742f7f2e87e4c0faa99bec5959145ea5cc8e764cde320f1005ec1263c0c808eaac

21
app-misc/neofetch/neofetch-1.9.ebuild → app-misc/neofetch/neofetch-1.9.1.ebuild

@ -1,6 +1,7 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
DESCRIPTION="Simple information system script"
@ -8,16 +9,18 @@ HOMEPAGE="https://github.com/dylanaraps/neofetch"
SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="X"
DEPEND="app-shells/bash:*
DEPEND="
app-shells/bash:*
sys-apps/pciutils"
RDEPEND="${DEPEND}
X? ( x11-apps/xprop
x11-apps/xwininfo
x11-apps/xrandr
www-client/w3m[imlib]
media-libs/imlib2
media-gfx/imagemagick
)"
X? (
x11-apps/xprop
x11-apps/xwininfo
x11-apps/xrandr
www-client/w3m[imlib]
media-libs/imlib2
media-gfx/imagemagick
)"

289
app-office/libreoffice/files/libreoffice-5.2-icu58.patch

@ -0,0 +1,289 @@
From 3e42714c76b1347babfdea0564009d8d82a83af4 Mon Sep 17 00:00:00 2001
From: Eike Rathke <erack@redhat.com>
Date: Wed, 2 Nov 2016 13:07:48 +0100
Subject: [PATCH] upgrade to ICU 58
Change-Id: I4a992447df65b337721a2a2627d974172a14cba5
Reviewed-on: https://gerrit.libreoffice.org/30487
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
---
configure.ac | 2 +-
download.lst | 2 +-
external/icu/icu-ubsan.patch.0 | 11 ------
external/icu/icu4c-warnings.patch | 12 ------
.../source/breakiterator/breakiterator_unicode.cxx | 12 ++++++
i18nutil/source/utility/unicode.cxx | 26 +++++++++++++
include/svx/ucsubset.hrc | 11 ++++++
svx/source/dialog/charmap.cxx | 35 +++++++++++++++++
svx/source/dialog/ucsubset.src | 44 ++++++++++++++++++++++
9 files changed, 130 insertions(+), 25 deletions(-)
diff --git a/configure.ac b/configure.ac
index f06ef8e..66a11a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9136,7 +9136,7 @@ SYSTEM_GENBRK=
SYSTEM_GENCCODE=
SYSTEM_GENCMN=
-ICU_MAJOR=57
+ICU_MAJOR=58
ICU_MINOR=1
ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE"
ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="TRUE"
diff --git a/download.lst b/download.lst
index 4571338..0770a4d 100644
--- a/download.lst
+++ b/download.lst
@@ -62,7 +62,7 @@ export HARFBUZZ_TARBALL := harfbuzz-1.3.2.tar.bz2
export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
export HUNSPELL_TARBALL := 33d370f7fe5a030985e445a5672b2067-hunspell-1.4.1.tar.gz
export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
-export ICU_TARBALL := 976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz
+export ICU_TARBALL := 1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz
export JFREEREPORT_FLOW_ENGINE_TARBALL := ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
export JFREEREPORT_FLUTE_TARBALL := d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
export JFREEREPORT_LIBBASE_TARBALL := eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
diff --git a/external/icu/icu-ubsan.patch.0 b/external/icu/icu-ubsan.patch.0
index 6d1d3bc..8a47242 100644
--- a/external/icu/icu-ubsan.patch.0
+++ b/external/icu/icu-ubsan.patch.0
@@ -151,14 +151,3 @@
length(len), next(subNode) {}
virtual UBool operator==(const Node &other) const;
virtual int32_t markRightEdgesFirst(int32_t edgeNumber);
---- source/common/unifiedcache.h
-+++ source/common/unifiedcache.h
-@@ -139,7 +139,7 @@
- : CacheKey<T>(other), fLoc(other.fLoc) { }
- virtual ~LocaleCacheKey() { }
- virtual int32_t hashCode() const {
-- return 37 *CacheKey<T>::hashCode() + fLoc.hashCode();
-+ return 37U *CacheKey<T>::hashCode() + fLoc.hashCode();
- }
- virtual UBool operator == (const CacheKeyBase &other) const {
- // reflexive
diff --git a/external/icu/icu4c-warnings.patch b/external/icu/icu4c-warnings.patch
index d146093..96608d7 100644
--- a/external/icu/icu4c-warnings.patch
+++ b/external/icu/icu4c-warnings.patch
@@ -8,15 +8,3 @@
} \
}
---- misc/icu/source/common/unicode/utypes.h
-+++ misc/build/icu/source/common/unicode/utypes.h
-@@ -399,7 +399,7 @@
- * some Linux/Unix compilers have problems with defining global new/delete.
- * On Windows, it is _MSC_VER>=1200 for MSVC 6.0 and higher.
- */
--#if defined(__cplusplus) && U_DEBUG && U_OVERRIDE_CXX_ALLOCATION && (_MSC_VER>=1200) && !defined(U_STATIC_IMPLEMENTATION) && (defined(U_COMMON_IMPLEMENTATION) || defined(U_I18N_IMPLEMENTATION) || defined(U_IO_IMPLEMENTATION) || defined(U_LAYOUT_IMPLEMENTATION) || defined(U_LAYOUTEX_IMPLEMENTATION))
-+#if defined(__cplusplus) && U_DEBUG && U_OVERRIDE_CXX_ALLOCATION && defined (_MSC_VER) && (_MSC_VER>=1200) && !defined(U_STATIC_IMPLEMENTATION) && (defined(U_COMMON_IMPLEMENTATION) || defined(U_I18N_IMPLEMENTATION) || defined(U_IO_IMPLEMENTATION) || defined(U_LAYOUT_IMPLEMENTATION) || defined(U_LAYOUTEX_IMPLEMENTATION))
-
- #ifndef U_HIDE_INTERNAL_API
- /**
-
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 3b0b227..76ae209 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -63,10 +63,13 @@ BreakIterator_Unicode::~BreakIterator_Unicode()
class OOoRuleBasedBreakIterator : public RuleBasedBreakIterator
{
public:
+#if (U_ICU_VERSION_MAJOR_NUM < 58)
+ // RuleBasedBreakIterator::setBreakType() is private as of ICU 58.
inline void publicSetBreakType(int32_t type)
{
setBreakType(type);
};
+#endif
OOoRuleBasedBreakIterator(UDataMemory* image,
UErrorCode &status)
: RuleBasedBreakIterator(image, status)
@@ -142,12 +145,21 @@ void SAL_CALL BreakIterator_Unicode::loadICUBreakIterator(const css::lang::Local
}
}
if (rbi) {
+#if (U_ICU_VERSION_MAJOR_NUM < 58)
+ // ICU 58 made RuleBasedBreakIterator::setBreakType() private
+ // instead of protected, so the old workaround of
+ // https://ssl.icu-project.org/trac/ticket/5498
+ // doesn't work anymore. However, they also claim to have fixed
+ // the cause that an initial fBreakType==-1 would lead to an
+ // endless loop under some circumstances.
+ // Let's see ...
switch (rBreakType) {
case LOAD_CHARACTER_BREAKITERATOR: rbi->publicSetBreakType(UBRK_CHARACTER); break;
case LOAD_WORD_BREAKITERATOR: rbi->publicSetBreakType(UBRK_WORD); break;
case LOAD_SENTENCE_BREAKITERATOR: rbi->publicSetBreakType(UBRK_SENTENCE); break;
case LOAD_LINE_BREAKITERATOR: rbi->publicSetBreakType(UBRK_LINE); break;
}
+#endif
icuBI->aBreakIterator = rbi;
}
}
diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx
index bb82bbf..984c5f7 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -957,6 +957,32 @@ OString SAL_CALL unicode::getExemplarLanguageForUScriptCode(UScriptCode eScript)
sRet = "sa-Sidd";
break;
#endif
+#if (U_ICU_VERSION_MAJOR_NUM >= 58)
+ case USCRIPT_ADLAM:
+ sRet = "mis"; // Adlm - Adlam for Fulani, no language code
+ break;
+ case USCRIPT_BHAIKSUKI:
+ sRet = "mis"; // Bhks - Bhaiksuki for some Buddhist texts, no language code
+ break;
+ case USCRIPT_MARCHEN:
+ sRet = "bo-Marc";
+ break;
+ case USCRIPT_NEWA:
+ sRet = "new-Newa";
+ break;
+ case USCRIPT_OSAGE:
+ sRet = "osa-Osge";
+ break;
+ case USCRIPT_HAN_WITH_BOPOMOFO:
+ sRet = "mis"; // Hanb - Han with Bopomofo, zh-Hanb ?
+ break;
+ case USCRIPT_JAMO:
+ sRet = "mis"; // Jamo - Jamo subset of Hangul, ko-Jamo ?
+ break;
+ case USCRIPT_SYMBOLS_EMOJI:
+ sRet = "mis"; // Zsye - Emoji variant
+ break;
+#endif
}
return sRet;
}
diff --git a/include/svx/ucsubset.hrc b/include/svx/ucsubset.hrc
index adf1cf6..1157a7e 100644
--- a/include/svx/ucsubset.hrc
+++ b/include/svx/ucsubset.hrc
@@ -291,6 +291,17 @@
#define RID_SUBSETSTR_OLD_HUNGARIAN (RID_SUBSET_START + 263)
#define RID_SUBSETSTR_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS (RID_SUBSET_START + 264)
#define RID_SUBSETSTR_SUTTON_SIGNWRITING (RID_SUBSET_START + 265)
+#define RID_SUBSETSTR_ADLAM (RID_SUBSET_START + 266)
+#define RID_SUBSETSTR_BHAIKSUKI (RID_SUBSET_START + 267)
+#define RID_SUBSETSTR_CYRILLIC_EXTENDED_C (RID_SUBSET_START + 268)
+#define RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT (RID_SUBSET_START + 269)
+#define RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION (RID_SUBSET_START + 270)
+#define RID_SUBSETSTR_MARCHEN (RID_SUBSET_START + 271)
+#define RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT (RID_SUBSET_START + 272)
+#define RID_SUBSETSTR_NEWA (RID_SUBSET_START + 273)
+#define RID_SUBSETSTR_OSAGE (RID_SUBSET_START + 274)
+#define RID_SUBSETSTR_TANGUT (RID_SUBSET_START + 275)
+#define RID_SUBSETSTR_TANGUT_COMPONENTS (RID_SUBSET_START + 276)
// RID_SUBSET_END (RID_SUBSET_START + 299)
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index bcc7cef..ff201a6 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -1594,6 +1594,41 @@ void SubsetMap::InitList()
aAllSubsets.push_back( Subset( 0x1D800, 0x1DAAF, RID_SUBSETSTR_SUTTON_SIGNWRITING ) );
break;
#endif
+#if (U_ICU_VERSION_MAJOR_NUM >= 58)
+ case UBLOCK_ADLAM:
+ aAllSubsets.push_back( Subset( 0x1E900, 0x1E95F, RID_SUBSETSTR_ADLAM ) );
+ break;
+ case UBLOCK_BHAIKSUKI:
+ aAllSubsets.push_back( Subset( 0x11C00, 0x11C6F, RID_SUBSETSTR_BHAIKSUKI ) );
+ break;
+ case UBLOCK_CYRILLIC_EXTENDED_C:
+ aAllSubsets.push_back( Subset( 0x1C80, 0x1C8F, RID_SUBSETSTR_CYRILLIC_EXTENDED_C ) );
+ break;
+ case UBLOCK_GLAGOLITIC_SUPPLEMENT:
+ aAllSubsets.push_back( Subset( 0x1E000, 0x1E02F, RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT ) );
+ break;
+ case UBLOCK_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION:
+ aAllSubsets.push_back( Subset( 0x16FE0, 0x16FFF, RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION ) );
+ break;
+ case UBLOCK_MARCHEN:
+ aAllSubsets.push_back( Subset( 0x11C70, 0x11CBF, RID_SUBSETSTR_MARCHEN ) );
+ break;
+ case UBLOCK_MONGOLIAN_SUPPLEMENT:
+ aAllSubsets.push_back( Subset( 0x11660, 0x1167F, RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT ) );
+ break;
+ case UBLOCK_NEWA:
+ aAllSubsets.push_back( Subset( 0x11400, 0x1147F, RID_SUBSETSTR_NEWA ) );
+ break;
+ case UBLOCK_OSAGE:
+ aAllSubsets.push_back( Subset( 0x104B0, 0x104FF, RID_SUBSETSTR_OSAGE ) );
+ break;
+ case UBLOCK_TANGUT:
+ aAllSubsets.push_back( Subset( 0x17000, 0x187FF, RID_SUBSETSTR_TANGUT ) );
+ break;
+ case UBLOCK_TANGUT_COMPONENTS:
+ aAllSubsets.push_back( Subset( 0x18800, 0x18AFF, RID_SUBSETSTR_TANGUT_COMPONENTS ) );
+ break;
+#endif
}
diff --git a/svx/source/dialog/ucsubset.src b/svx/source/dialog/ucsubset.src
index 06630cc..a7765c3 100644
--- a/svx/source/dialog/ucsubset.src
+++ b/svx/source/dialog/ucsubset.src
@@ -1079,6 +1079,50 @@ Resource RID_SUBSETMAP
{
Text [ en-US ] = "Sutton Signwriting";
};
+ String RID_SUBSETSTR_ADLAM
+ {
+ Text [ en-US ] = "Adlam";
+ };
+ String RID_SUBSETSTR_BHAIKSUKI
+ {
+ Text [ en-US ] = "Bhaiksuki";
+ };
+ String RID_SUBSETSTR_CYRILLIC_EXTENDED_C
+ {
+ Text [ en-US ] = "Cyrillic Extended-C";
+ };
+ String RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT
+ {
+ Text [ en-US ] = "Glagolitic Supplement";
+ };
+ String RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION
+ {
+ Text [ en-US ] = "Ideographic Symbols and Punctuation";
+ };
+ String RID_SUBSETSTR_MARCHEN
+ {
+ Text [ en-US ] = "Marchen";
+ };
+ String RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT
+ {
+ Text [ en-US ] = "Mongolian Supplement";
+ };
+ String RID_SUBSETSTR_NEWA
+ {
+ Text [ en-US ] = "Newa";
+ };
+ String RID_SUBSETSTR_OSAGE
+ {
+ Text [ en-US ] = "Osage";
+ };
+ String RID_SUBSETSTR_TANGUT
+ {
+ Text [ en-US ] = "Tangut";
+ };
+ String RID_SUBSETSTR_TANGUT_COMPONENTS
+ {
+ Text [ en-US ] = "Tangut Components";
+ };
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--
2.10.2

2
app-office/libreoffice/libreoffice-5.1.4.2.ebuild

@ -111,7 +111,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=dev-libs/boost-1.55:=
dev-libs/expat
dev-libs/hyphen
dev-libs/icu:=
<dev-libs/icu-58:=
=dev-libs/liborcus-0.9*
dev-libs/librevenge
dev-libs/nspr

2
app-office/libreoffice/libreoffice-5.2.2.2.ebuild

@ -109,7 +109,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=dev-libs/boost-1.55:=
dev-libs/expat
dev-libs/hyphen
dev-libs/icu:=
<dev-libs/icu-58:=
=dev-libs/liborcus-0.11*
dev-libs/librevenge
dev-libs/nspr

3
app-office/libreoffice/libreoffice-5.2.3.3.ebuild

@ -240,6 +240,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
"
PATCHES=(
# from master branch
"${FILESDIR}/${PN}-5.2-icu58.patch"
# not upstreamable stuff
"${FILESDIR}/${PN}-5.2-system-pyuno.patch"
)

3
app-office/libreoffice/libreoffice-5.2.9999.ebuild

@ -240,6 +240,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
"
PATCHES=(
# from master branch
"${FILESDIR}/${PN}-5.2-icu58.patch"
# not upstreamable stuff
"${FILESDIR}/${PN}-5.2-system-pyuno.patch"
)

31
app-office/scribus/files/scribus-1.5.2-cmake-qt57.patch

@ -0,0 +1,31 @@
commit 413c8c8a0ded5aa4b0f8d85dbc335082e809f3b2
Author: Craig Bradney <mrb@scribus.info>
Date: Thu Jun 16 20:01:34 2016 +0000
Add better support for C++11/Qt 5.7.0. CMAKE minimum bumped to 3.2
git-svn-id: svn://scribus.net/trunk/Scribus@21377 11d20701-8431-0410-a711-e3c959e3b870
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc1ec57..9e92a38 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,8 +3,9 @@
#Set our CMake minimum version
#Require 2.8.9 for Qt5
+#Require 3.1.0 for Qt 5.7 C++ 11 easy support
#Require 3.2.0 for add_custom_target with byproducts
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9 FATAL_ERROR)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2.0 FATAL_ERROR)
#Pretty colors
SET(CMAKE_COLOR_MAKEFILE ON)
@@ -382,6 +383,7 @@ ADD_DEFINITIONS("-DLIBDIR=\\\"${CMAKE_INSTALL_PREFIX}/${LIBDIR}\\\"")
#C++11 Support
IF(WANT_CPP11)
MESSAGE(STATUS "Enabling C++11 compiler features")
+ set(CMAKE_CXX_STANDARD 11)
ADD_DEFINITIONS("-std=c++11")
ENDIF(WANT_CPP11)

24
app-office/scribus/files/scribus-1.5.2-cxx-build.patch

@ -0,0 +1,24 @@
commit 1a9bdbc7ab793b15e93f1ab29ce06dd69c061f58
Author: Jean Ghali <jghali@libertysurf.fr>
Date: Sat Jun 18 12:49:45 2016 +0000
fix build issue when not compiling with c++11 : std::isinf is c++11 only
git-svn-id: svn://scribus.net/trunk/Scribus@21382 11d20701-8431-0410-a711-e3c959e3b870
diff --git a/scribus/third_party/fparser/fpoptimizer.cc b/scribus/third_party/fparser/fpoptimizer.cc
index 673e1b6..0c1bad5 100644
--- a/scribus/third_party/fparser/fpoptimizer.cc
+++ b/scribus/third_party/fparser/fpoptimizer.cc
@@ -7296,7 +7296,11 @@ namespace FPoptimizer_CodeTree
//if(imm >= 0.0)
{
double new_base_immed = std::pow(base_immed, imm);
+#if __cplusplus < 201103L
+ if(isinf(new_base_immed) || new_base_immed == 0.0)
+#else
if(std::isinf(new_base_immed) || new_base_immed == 0.0)
+#endif
{
// It produced an infinity. Do not change.
break;

87
app-office/scribus/files/scribus-1.5.2-gcc6-warn.patch

@ -0,0 +1,87 @@
commit bb3066704e987210c324ec7f3bfb2c8153d9710e
Author: Jean Ghali <jghali@libertysurf.fr>
Date: Sat Aug 20 12:18:31 2016 +0000
fix a few gcc 6 warnings related to auto_ptr deprecation in c++11 by replacing it with QScopedPointer
git-svn-id: svn://scribus.net/trunk/Scribus@21430 11d20701-8431-0410-a711-e3c959e3b870
diff --git a/scribus/sclistboxpixmap.h b/scribus/sclistboxpixmap.h
index 044d45a..a067b79 100644
--- a/scribus/sclistboxpixmap.h
+++ b/scribus/sclistboxpixmap.h
@@ -13,6 +13,7 @@ for which a new license (GPL+exception) is in place.
#include <QDebug>
#include <QPainter>
#include <QPixmap>
+#include <QScopedPointer>
#include <QVariant>
#include "scguardedptr.h"
@@ -30,19 +31,19 @@ public:
virtual QSize sizeHint (const QStyleOptionViewItem & option, const QModelIndex & index ) const;
virtual void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const;
protected:
- static std::auto_ptr<QPixmap> pmap;
+ static QScopedPointer<QPixmap> pmap;
// The drawPixmap function must not modify pixmap size
virtual void redraw(const QVariant&) const = 0;
};
template<unsigned int pixWidth, unsigned int pixHeight>
-std::auto_ptr<QPixmap> ScListBoxPixmap<pixWidth, pixHeight>::pmap;
+QScopedPointer<QPixmap> ScListBoxPixmap<pixWidth, pixHeight>::pmap;
template<unsigned int pixWidth, unsigned int pixHeight>
ScListBoxPixmap<pixWidth, pixHeight>::ScListBoxPixmap(void) : QAbstractItemDelegate()
{
- if (!pmap.get())
+ if (pmap.isNull())
{
pmap.reset( new QPixmap(pixWidth, pixHeight) );
}
diff --git a/scribus/ui/colorlistbox.cpp b/scribus/ui/colorlistbox.cpp
index 9f3897b..99f280f 100644
--- a/scribus/ui/colorlistbox.cpp
+++ b/scribus/ui/colorlistbox.cpp
@@ -83,7 +83,7 @@ public:
void ColorSmallItemDelegate::redraw(const QVariant& data) const
{
- QPixmap* pPixmap = ScListBoxPixmap<15,15>::pmap.get();
+ QPixmap* pPixmap = ScListBoxPixmap<15,15>::pmap.data();
pPixmap->fill(Qt::transparent);
if (data.canConvert<ColorPixmapValue>())
{
@@ -101,7 +101,7 @@ void ColorSmallItemDelegate::redraw(const QVariant& data) const
void ColorWideItemDelegate::redraw(const QVariant& data) const
{
- QPixmap* pPixmap = ScListBoxPixmap<30,15>::pmap.get();
+ QPixmap* pPixmap = ScListBoxPixmap<30,15>::pmap.data();
pPixmap->fill(Qt::transparent);
if (data.canConvert<ColorPixmapValue>())
{
@@ -134,7 +134,7 @@ void ColorFancyItemDelegate::redraw(const QVariant& data) const
iconsInitialized = true;
}
- QPixmap* pPixmap = ScListBoxPixmap<60,15>::pmap.get();
+ QPixmap* pPixmap = ScListBoxPixmap<60,15>::pmap.data();
pPixmap->fill(Qt::transparent);
if (data.canConvert<ColorPixmapValue>())
diff --git a/scribus/ui/propertiespalette_utils.cpp b/scribus/ui/propertiespalette_utils.cpp
index f76743c..cadbb11 100644
--- a/scribus/ui/propertiespalette_utils.cpp
+++ b/scribus/ui/propertiespalette_utils.cpp
@@ -66,7 +66,7 @@ void LineFormatItemDelegate::redraw(const QVariant& data) const
QColor tmpf;
pmap->fill(Qt::white);
QPainter p;
- p.begin(pmap.get());
+ p.begin(pmap.data());
for (int its = item.m_Line.size()-1; its > -1; its--)
{
const ScColor& col = item.m_doc->PageColors[item.m_Line[its].Color];

21
app-office/scribus/files/scribus-1.5.2-qt57-build.patch

@ -0,0 +1,21 @@
commit ddb5688ae4f4ff40ba1204a413fcf15279b35f2b
Author: Franz Schmid <Franz.Schmid@altmuehlnet.de>
Date: Sat Jun 18 09:14:21 2016 +0000
Compile Fix for compiling with Qt-5.7
git-svn-id: svn://scribus.net/trunk/Scribus@21381 11d20701-8431-0410-a711-e3c959e3b870
diff --git a/scribus/third_party/fparser/fpoptimizer.cc b/scribus/third_party/fparser/fpoptimizer.cc
index ae8c0f6..673e1b6 100644
--- a/scribus/third_party/fparser/fpoptimizer.cc
+++ b/scribus/third_party/fparser/fpoptimizer.cc
@@ -7296,7 +7296,7 @@ namespace FPoptimizer_CodeTree
//if(imm >= 0.0)
{
double new_base_immed = std::pow(base_immed, imm);
- if(isinf(new_base_immed) || new_base_immed == 0.0)
+ if(std::isinf(new_base_immed) || new_base_immed == 0.0)
{
// It produced an infinity. Do not change.
break;

41
app-office/scribus/scribus-1.5.2-r1.ebuild → app-office/scribus/scribus-1.5.2-r2.ebuild

@ -4,11 +4,12 @@
EAPI=6
CMAKE_MIN_VERSION="3.2"
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="tk?"
CMAKE_MAKEFILE_GENERATOR=ninja
inherit cmake-utils fdo-mime flag-o-matic multilib python-single-r1
inherit cmake-utils eutils fdo-mime flag-o-matic multilib python-single-r1
DESCRIPTION="Desktop publishing (DTP) and layout program"
HOMEPAGE="http://www.scribus.net/"
@ -32,8 +33,7 @@ REQUIRED_USE="
COMMON_DEPEND="
${PYTHON_DEPS}
app-text/libmspub
>=app-text/poppler-0.19.0:=
dev-libs/boost
app-text/poppler:=
dev-libs/hyphen
dev-libs/librevenge
dev-libs/libxml2
@ -50,14 +50,14 @@ COMMON_DEPEND="
media-libs/lcms:2
media-libs/libcdr
media-libs/libpagemaker
media-libs/libpng:0
media-libs/libpng:0=
media-libs/libvisio
media-libs/tiff:0
net-print/cups
sys-libs/zlib[minizip]
virtual/jpeg:0=
>=x11-libs/cairo-1.10.0[X,svg]
boost? ( dev-libs/boost )
boost? ( >=dev-libs/boost-1.62:= )
hunspell? ( app-text/hunspell )
graphicsmagick? ( media-gfx/graphicsmagick )
osg? ( dev-games/openscenegraph )
@ -74,11 +74,15 @@ DEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-1.5.0-docdir.patch
"${FILESDIR}"/${P}-fpic.patch
)
"${FILESDIR}"/${P}-cmake-qt57.patch
"${FILESDIR}"/${P}-qt57-build.patch
"${FILESDIR}"/${P}-cxx-build.patch
"${FILESDIR}"/${P}-gcc6-warn.patch
)
src_prepare() {
rm -r codegen/cheetah || die
cat > cmake/modules/FindZLIB.cmake <<- EOF
cat > cmake/modules/FindZLIB.cmake <<- EOF || die
find_package(PkgConfig)
pkg_check_modules(ZLIB minizip zlib)
SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} )
@ -96,9 +100,7 @@ src_prepare() {
-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
-i resources/templates/CMakeLists.txt || die
if has_version ">=dev-qt/qtcore-5.7.0" ; then
append-cxxflags "-std=c++11" #bug 591948
fi
edos2unix scribus/ui/propertiespalette_utils.cpp
cmake-utils_src_prepare
}
@ -133,8 +135,9 @@ src_configure() {
-DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
-DPYTHON_LIBRARY="$(python_get_library_path)"
-DWANT_DISTROBUILD=ON
-DDOCDIR="/usr/share/doc/${PF}/"
-DDOCDIR="${EPREFIX%/}/usr/share/doc/${PF}/"
-DWANT_GUI_LANG="${langs#;};en"
-DWANT_CPP11=ON
-DWITH_PODOFO="$(usex pdf)"
-DWITH_BOOST="$(usex boost)"
-DWANT_GRAPHICSMAGICK="$(usex graphicsmagick)"
@ -156,23 +159,23 @@ src_install() {
for lang in ${IUSE_LINGUAS}; do
if ! use linguas_${lang}; then
_lang=$(translate_lang)
safe_delete "${ED}"/usr/share/man/${_lang}
safe_delete "${ED%/}"/usr/share/man/${_lang}
fi
done
if ! use scripts; then
rm "${ED}"/usr/share/scribus/scripts/*.py || die
rm "${ED%/}"/usr/share/scribus/scripts/*.py || die
elif ! use tk; then
rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
rm "${ED%/}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
fi
use scripts && \
python_fix_shebang "${ED}"/usr/share/scribus/scripts && \
python_optimize "${ED}"/usr/share/scribus/scripts
python_fix_shebang "${ED%/}"/usr/share/scribus/scripts && \
python_optimize "${ED%/}"/usr/share/scribus/scripts
mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
cat >> "${T}"/COPYING <<- EOF
mv "${ED%/}"/usr/share/doc/${PF}/{en,html} || die
ln -sf html "${ED%/}"/usr/share/doc/${PF}/en || die
cat >> "${T}"/COPYING <<- EOF || die
${PN} is licensed under the "${LICENSE}".
Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text.
EOF

2
app-portage/distpatch/Manifest

@ -1 +1 @@
DIST distpatch-0.1.1.tar.gz 19768 SHA256 1a455b14ebef9a6654f08b5280617dcd291e882ff42cd2f28d12b53579594522 SHA512 232a011a7acea42e163a127f640594dd6702aa6c162034be24804c04fc458eab43948c7c5028ee8c49b564ec589564fb80e83ffb9d97c142e3f1c138a25e2739 WHIRLPOOL d6947424d1002b371201a24df6c277afdd81d4282bb91f88eff41777f0cf0a7e7f6ce6b53f688dc27f43bbf9fde8354af705351a119b2af71b8ff4a367e320da
DIST distpatch-0.1.2.tar.gz 19998 SHA256 97452cf226d390c0d4634d4b985040228cc7e22551322ea949ef6c72eb6771a2 SHA512 f4dd08fd69a5b2030e0b912c1153994bcc03f40af65fff185231a220c110d0e7b5a4acf402d116e9dbfef86b13d17036ca563d0fefd89bc62809e1ecc9acf1ed WHIRLPOOL 4577cc6361212b52c4ff7a25a4d50b4b8bccbccb0d2081a61a3dbcfcb7bf0d4b09d8bfddcbc1c8607e30a4dca7d74336386a01d483697acbd7268bd7e454225d

12
app-portage/distpatch/distpatch-0.1.1.ebuild → app-portage/distpatch/distpatch-0.1.2.ebuild

@ -1,18 +1,16 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=3
EAPI=6
PYTHON_DEPEND='*:2.6'
SUPPORT_PYTHON_ABIS=1
RESTRICT_PYTHON_ABIS='2.4 2.5 3.*'
PYTHON_COMPAT=( python2_7 )
inherit distutils
inherit distutils-r1
DESCRIPTION="Distfile Patching Support for Gentoo Linux (tools)"
HOMEPAGE="https://www.gentoo.org/proj/en/infrastructure/distpatch/"
SRC_URI="mirror://github/rafaelmartins/${PN}/${P}.tar.gz"
SRC_URI="https://github.com/rafaelmartins/${PN}/releases/download/v${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"

99
app-portage/eix/eix-0.32.1-r1.ebuild

@ -0,0 +1,99 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
PLOCALES="de ru"
inherit bash-completion-r1 l10n systemd
DESCRIPTION="Search and query ebuilds"
HOMEPAGE="https://github.com/vaeth/eix/"
SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug doc nls sqlite"
BOTHDEPEND="nls? ( virtual/libintl )
sqlite? ( >=dev-db/sqlite-3:= )"
RDEPEND="${BOTHDEPEND}
app-shells/push
app-shells/quoter"
DEPEND="${BOTHDEPEND}
app-arch/xz-utils
nls? ( sys-devel/gettext )"
pkg_setup() {
# remove stale cache file to prevent collisions
local old_cache=${EROOT%/}/var/cache/${PN}
if [[ -f ${old_cache} ]]; then
rm "${old_cache}" || die
fi
}
src_prepare() {
default
sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
}
src_configure() {
local myconf=(
$(use_enable debug paranoicasserts)
$(use_enable nls)
$(use_with doc extra-doc)
$(use_with sqlite)
# default configuration
$(use_with prefix always-accept-keywords)
--with-dep-default
--with-required-use-default
# paths
--with-portage-rootpath="${ROOTPATH}"
--with-eprefix-default="${EPREFIX}"
# build a single executable with symlinks
--disable-separate-binaries
--disable-separate-tools
# used purely to control/disrespect *FLAGS
--disable-debugging
--disable-new_dialect
--disable-optimization
--disable-strong-optimization
--disable-security
--disable-nopie-security
--disable-strong-security
)
econf "${myconf[@]}"
}
src_install() {
default
dobashcomp bash/eix
systemd_dotmpfilesd tmpfiles.d/eix.conf
keepdir /var/cache/eix
}
pkg_postinst() {