Browse Source

Sync with portage [Wed May 13 21:45:15 MSK 2015].

mhiretskiy
root 7 years ago
parent
commit
4d2bc2153e
  1. 1
      app-accessibility/brltty/Manifest
  2. 185
      app-accessibility/brltty/brltty-5.0-r3.ebuild
  3. 56
      app-accessibility/brltty/files/brltty-5.0-fix-ldflags.patch
  4. 12
      app-accessibility/brltty/files/brltty-5.0-respect-AR.patch
  5. 28
      app-accessibility/brltty/files/brltty-5.0-udev.patch
  6. 2
      app-cdr/k3b/Manifest
  7. 96
      app-cdr/k3b/files/k3b-2.0.2-ffmpeg.patch
  8. 19
      app-cdr/k3b/files/k3b-2.0.2-ffmpeg2.patch
  9. 22
      app-cdr/k3b/files/k3b-2.0.2-libav9.patch
  10. 22
      app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch
  11. 114
      app-cdr/k3b/k3b-2.0.2-r4.ebuild
  12. 106
      app-cdr/k3b/k3b-2.0.2_p20140225.ebuild
  13. 2
      app-crypt/gnupg/Manifest
  14. 130
      app-crypt/gnupg/files/gnupg-2.1.1-misc-cve.patch
  15. 29
      app-crypt/gnupg/files/gnupg-2.1.3-dirmngr-Fix-segfault-in-ldap-engine.patch
  16. 246
      app-crypt/gnupg/files/gnupg-2.1.3-dirmngr-no-ldap.patch
  17. 73
      app-crypt/gnupg/files/gnupg-2.1.3-gpg-fix-null-segv.patch
  18. 13
      app-crypt/gnupg/gnupg-2.1.4.ebuild
  19. 2
      app-crypt/seahorse/Manifest
  20. 65
      app-crypt/seahorse/seahorse-3.12.2.ebuild
  21. 65
      app-crypt/seahorse/seahorse-3.14.0.ebuild
  22. 3
      app-crypt/seahorse/seahorse-3.14.1.ebuild
  23. 1
      dev-games/ogre/Manifest
  24. 21
      dev-games/ogre/files/ogre-1.8.1-flags.patch
  25. 22
      dev-games/ogre/files/ogre-1.8.1-gles2.patch
  26. 77
      dev-games/ogre/files/ogre-1.8.1-threading.patch
  27. 97
      dev-games/ogre/ogre-1.8.1.ebuild
  28. 6
      dev-java/slf4j-api/slf4j-api-1.7.7.ebuild
  29. 6
      dev-libs/isl/files/isl-0.07-gdb-autoload-dir.patch
  30. 2
      dev-libs/libqzeitgeist/metadata.xml
  31. 7
      dev-python/ipython/ipython-3.1.0.ebuild
  32. 3
      dev-util/glade/Manifest
  33. 46
      dev-util/glade/files/glade-3.12.1-doc-version.patch
  34. 71
      dev-util/glade/files/glade-3.16.1-underlinking.patch
  35. 95
      dev-util/glade/glade-3.16.1.ebuild
  36. 95
      dev-util/glade/glade-3.18.2.ebuild
  37. 52
      dev-util/glade/glade-3.8.4.ebuild
  38. 3
      dev-util/glade/glade-3.8.5.ebuild
  39. 2
      dev-util/glade/metadata.xml
  40. 2
      dev-util/rbtools/Manifest
  41. 26
      dev-util/rbtools/rbtools-0.6.3.ebuild
  42. 29
      dev-util/rbtools/rbtools-0.7.2.ebuild
  43. 1
      games-arcade/performous/Manifest
  44. 155
      games-arcade/performous/files/performous-0.7.0-cmake.patch
  45. 18
      games-arcade/performous/files/performous-0.7.0-desktop.patch
  46. 40
      games-arcade/performous/files/performous-0.7.0-freetype.patch
  47. 29
      games-arcade/performous/files/performous-0.7.0-gentoo.patch
  48. 41
      games-arcade/performous/files/performous-0.7.0-libav.patch
  49. 15
      games-arcade/performous/files/performous-0.7.0-linguas.patch
  50. 102
      games-arcade/performous/performous-0.7.0-r1.ebuild
  51. 106
      games-arcade/performous/performous-0.7.0.ebuild
  52. 1
      games-misc/nyancat/Manifest
  53. 25
      games-misc/nyancat/nyancat-0_pre20120302.ebuild
  54. 1
      games-simulation/openttd/Manifest
  55. 42
      games-simulation/openttd/files/openttd-1.4.4-cflags.patch
  56. 31
      games-simulation/openttd/files/openttd-1.4.4-freetype.patch
  57. 179
      games-simulation/openttd/openttd-1.4.4.ebuild
  58. 28
      games-strategy/megaglest/files/megaglest-3.11.1-cmake.patch
  59. 28
      games-strategy/megaglest/files/megaglest-3.9.1-cmake.patch
  60. 5
      games-strategy/megaglest/megaglest-3.11.1.ebuild
  61. 1
      games-strategy/wesnoth/Manifest
  62. 118
      games-strategy/wesnoth/wesnoth-1.12.1.ebuild
  63. 4
      games-strategy/wesnoth/wesnoth-1.12.2.ebuild
  64. 2
      games-util/nml/Manifest
  65. 6
      games-util/nml/nml-0.4.0.ebuild
  66. 10
      games-util/nml/nml-0.4.1.ebuild
  67. 1
      kde-misc/plasma-nm/Manifest
  68. 20
      kde-misc/plasma-nm/files/plasma-nm-0.9.3.4-missing-include.patch
  69. 50
      kde-misc/plasma-nm/plasma-nm-0.9.3.4.ebuild
  70. 1
      mail-filter/opendkim/Manifest
  71. 196
      mail-filter/opendkim/opendkim-2.10.3.ebuild
  72. 6
      media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.16-r1.ebuild
  73. 2
      metadata/dtd/timestamp.chk
  74. 2
      metadata/glsa/timestamp.chk
  75. 14
      metadata/md5-cache/app-accessibility/brltty-5.0-r3
  76. 14
      metadata/md5-cache/app-cdr/k3b-2.0.2-r4
  77. 14
      metadata/md5-cache/app-cdr/k3b-2.0.2_p20140225
  78. 4
      metadata/md5-cache/app-crypt/gnupg-2.1.4
  79. 13
      metadata/md5-cache/app-crypt/seahorse-3.12.2
  80. 13
      metadata/md5-cache/app-crypt/seahorse-3.14.0
  81. 6
      metadata/md5-cache/app-crypt/seahorse-3.14.1
  82. 15
      metadata/md5-cache/dev-games/ogre-1.8.1
  83. 4
      metadata/md5-cache/dev-java/slf4j-api-1.7.7
  84. 4
      metadata/md5-cache/dev-python/ipython-3.1.0
  85. 14
      metadata/md5-cache/dev-util/glade-3.16.1
  86. 14
      metadata/md5-cache/dev-util/glade-3.18.2
  87. 14
      metadata/md5-cache/dev-util/glade-3.8.4
  88. 4
      metadata/md5-cache/dev-util/glade-3.8.5
  89. 14
      metadata/md5-cache/dev-util/rbtools-0.6.3
  90. 14
      metadata/md5-cache/dev-util/rbtools-0.7.2
  91. 13
      metadata/md5-cache/games-arcade/performous-0.7.0
  92. 13
      metadata/md5-cache/games-arcade/performous-0.7.0-r1
  93. 11
      metadata/md5-cache/games-misc/nyancat-0_pre20120302
  94. 15
      metadata/md5-cache/games-simulation/openttd-1.4.4
  95. 2
      metadata/md5-cache/games-strategy/megaglest-3.11.1
  96. 13
      metadata/md5-cache/games-strategy/wesnoth-1.12.1
  97. 6
      metadata/md5-cache/games-strategy/wesnoth-1.12.2
  98. 14
      metadata/md5-cache/games-util/nml-0.3.1
  99. 8
      metadata/md5-cache/games-util/nml-0.4.0
  100. 14
      metadata/md5-cache/games-util/nml-0.4.1

1
app-accessibility/brltty/Manifest

@ -1,2 +1 @@
DIST brltty-5.0.tar.xz 2213768 SHA256 e3613fa2e8c3450d7e7bee7107235344c474dc310af5adcc19761f361e8c8b92 SHA512 2a66f2fcf0ada9a499450e14c11efe2cffd1e9b465755aab60093f383c596d4f4f3be0651e6559df143fc1547a5d5be24caf485596cb8ad691b029de110f8dcc WHIRLPOOL 3f36f036f5eb6479e9c42cc79eead215d7133cfb6d2c4de3e4eaa6f776299d021c7830e32c914b7cb7686bd4d31902c0762d309702ef686ab7b37aff6ee4161a
DIST brltty-5.2.tar.xz 2532684 SHA256 f1293940317a675d0eaeaf3f363bbfe4bfaa5225c2116123a61ce2d3c71943f7 SHA512 8e16701e9c9d776c76e3ad0cb4319b2753295fea229bd3f60cb0dffc0b6946037e6f98daafae873238c4eff90d4b8ddb697b7d425e700c5a098aba8fed9eed3f WHIRLPOOL 33fcf326be381309f2baa3f59807145a0ca3a614f32b0b27e4b76af1c1f46f6459f7be1d629002538588ce71ab017b52bfc642fc06aa2c3f883aba272e61f20e

185
app-accessibility/brltty/brltty-5.0-r3.ebuild

@ -1,185 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-5.0-r3.ebuild,v 1.12 2015/04/08 07:30:36 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
FINDLIB_USE="ocaml"
inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
autotools udev systemd python-r1
DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind person"
HOMEPAGE="http://mielke.cc/brltty/"
SRC_URI="http://mielke.cc/brltty/archive/${P}.tar.xz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 x86"
IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
java +midi ncurses nls ocaml +pcm python usb +speech
tcl X"
REQUIRED_USE="doc? ( api )
java? ( api )
ocaml? ( api )
python? ( api )
tcl? ( api )"
COMMON_DEP="bluetooth? ( net-wireless/bluez )
gpm? ( >=sys-libs/gpm-1.20 )
iconv? ( virtual/libiconv )
icu? ( dev-libs/icu:= )
python? ( ${PYTHON_DEPS} )
ncurses? ( sys-libs/ncurses )
nls? ( virtual/libintl )
tcl? ( >=dev-lang/tcl-8.4.15:0= )
usb? ( virtual/libusb:0 )
X? ( x11-libs/libXaw )"
DEPEND="virtual/pkgconfig
java? ( >=virtual/jdk-1.4 )
python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] )
${COMMON_DEP}"
RDEPEND="java? ( >=virtual/jre-1.4 )
${COMMON_DEP}"
src_prepare() {
epatch "${FILESDIR}"/${P}-fix-ldflags.patch \
"${FILESDIR}"/${P}-udev.patch \
"${FILESDIR}"/${P}-respect-AR.patch
java-pkg-opt-2_src_prepare
# The code runs `pkg-config` directly instead of locating a suitable
# pkg-config wrapper (or respecting $PKG_CONFIG).
sed -i \
-e 's/\<pkg-config\>/${PKG_CONFIG:-pkg-config}/' \
aclocal.m4 configure.ac || die
# We run eautoconf instead of using eautoreconf because brltty uses
# a custom build system that uses autoconf without the rest of the
# autotools.
eautoconf
python_copy_sources
}
src_configure() {
tc-export AR LD PKG_CONFIG
# override prefix in order to install into /
# braille terminal needs to be available as soon in the boot process as
# possible
# Also override localstatedir so that the lib/brltty directory is installed
# correctly.
# Disable stripping since we do that ourselves.
local myconf=(
--prefix=/
--localedir=/usr/share/locale
--includedir=/usr/include
--localstatedir=/var
--disable-stripping
--with-install-root="${D}"
--with-writable-directory="/run/brltty"
$(use_enable api)
$(use_with beeper beep-package)
$(use_enable contracted-braille)
$(use_with fm fm-package)
$(use_enable gpm)
$(use_enable iconv)
$(use_enable icu)
$(use_enable java java-bindings)
$(use_with midi midi-package)
$(use_enable nls i18n)
$(use_enable ocaml ocaml-bindings)
$(use_with pcm pcm-package)
$(use_enable speech speech-support)
$(use_enable tcl tcl-bindings)
$(use_enable X x)
$(use_with bluetooth bluetooth-package)
$(use_with ncurses curses)
$(use_with usb usb-package) )
econf "${myconf[@]}"
if use python; then
myconf+=( $(use_enable python python-bindings ) )
python_configure() {
econf "${myconf[@]}"
}
python_foreach_impl run_in_build_dir python_configure
fi
}
src_compile() {
local JAVAC_CONF=""
local OUR_JNI_FLAGS=""
if use java; then
OUR_JNI_FLAGS="$(java-pkg_get-jni-cflags)"
JAVAC_CONF="${JAVAC} -encoding UTF-8 $(java-pkg_javac-args)"
fi
emake JAVA_JNI_FLAGS="${OUR_JNI_FLAGS}" JAVAC="${JAVAC_CONF}"
if use python; then
python_build() {
cd "Bindings/Python" || die
emake
}
python_foreach_impl run_in_build_dir python_build
fi
}
src_install() {
if use ocaml; then
findlib_src_preinst
fi
emake OCAML_LDCONF= install
if use python; then
python_install() {
cd "Bindings/Python" || die
emake install
}
python_foreach_impl run_in_build_dir python_install
fi
if use java; then
# make install puts the _java.so there, and no it's not $(get_libdir)
rm -rf "${D}/usr/lib/java"
java-pkg_doso Bindings/Java/libbrlapi_java.so
java-pkg_dojar Bindings/Java/brlapi.jar
fi
insinto /etc
doins Documents/brltty.conf
udev_newrules Autostart/Udev/udev.rules 70-brltty.rules
newinitd "${FILESDIR}"/brltty.rc brltty
systemd_dounit Autostart/Systemd/brltty.service
systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
libdir="$(get_libdir)"
mkdir -p "${D}"/usr/${libdir}/
mv "${D}"/${libdir}/*.a "${D}"/usr/${libdir}/
gen_usr_ldscript libbrlapi.so
cd Documents
mv Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt
mv Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt
mv Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt
dodoc CONTRIBUTORS ChangeLog HISTORY README* TODO BRLTTY-*.txt
dohtml -r Manual-BRLTTY
if use doc; then
dohtml -r Manual-BrlAPI
dodoc BrlAPI-*.txt
fi
}
pkg_postinst() {
elog
elog please be sure "${ROOT}"etc/brltty.conf is correct for your system.
elog
elog To make brltty start on boot, type this command as root:
elog
elog rc-update add brltty boot
}

56
app-accessibility/brltty/files/brltty-5.0-fix-ldflags.patch

@ -1,56 +0,0 @@
--- a/configure.ac
+++ b/configure.ac
@@ -377,7 +377,7 @@
case "${host_os}"
in
linux*|gnu*|openbsd*|freebsd*|kfreebsd*|netbsd*|*qnx*|cygwin*|mingw*|elf*)
- brltty_mkmod_ld_make="-shared"
+ brltty_mkmod_ld_make="-shared ${LDFLAGS}"
;;
solaris*)
brltty_mkmod_ld_make="-G"
@@ -404,7 +404,7 @@
esac
if test "${GCC}" = "yes"
then
- brltty_cv_prog_mkmod="\$(CC) ${brltty_mkmod_gcc_make=-shared} BRLTTY_OPTIONS_LD2CC([${brltty_mkmod_ld_options}]) -o"
+ brltty_cv_prog_mkmod="\$(CC) ${brltty_mkmod_gcc_make=-shared} ${LDFLAGS} BRLTTY_OPTIONS_LD2CC([${brltty_mkmod_ld_options}]) -o"
else
brltty_cv_prog_mkmod="\$(LD) ${brltty_mkmod_ld_make} ${brltty_mkmod_ld_options} -o"
fi])
@@ -414,7 +414,7 @@
case "${host_os}"
in
linux*|gnu*|openbsd*|freebsd*|kfreebsd*|netbsd*|*qnx*|elf*)
- brltty_mklib_ld_make="-shared"
+ brltty_mklib_ld_make="-shared ${LDFLAGS}"
brltty_mklib_ld_options="-soname"
;;
solaris*)
@@ -449,7 +449,7 @@
esac
if test "${GCC}" = "yes"
then
- brltty_cv_prog_mklib="\$(CC) ${brltty_mklib_gcc_make=-shared} BRLTTY_OPTIONS_LD2CC([${brltty_mklib_ld_options+${brltty_mklib_ld_options} <name>}]) -o"
+ brltty_cv_prog_mklib="\$(CC) ${brltty_mklib_gcc_make=-shared} ${LDFLAGS} BRLTTY_OPTIONS_LD2CC([${brltty_mklib_ld_options+${brltty_mklib_ld_options} <name>}]) -o"
else
brltty_cv_prog_mklib="\$(LD) ${brltty_mklib_ld_make} ${brltty_mklib_ld_options+${brltty_mklib_ld_options} <name>} -o"
fi])
--- a/Bindings/OCaml/Makefile.in
+++ b/Bindings/OCaml/Makefile.in
@@ -55,13 +55,13 @@
all : $(OCAML_FILES)
$(OCAML_CLIBS) : brlapi_stubs.$O brlapi
- $(OCAMLMKLIB) $(API_LDFLAGS) -oc $(OCAML_LIB)_stubs brlapi_stubs.$O
+ $(OCAMLMKLIB) -ldopt "$(LDFLAGS)" $(API_LDFLAGS) -oc $(OCAML_LIB)_stubs brlapi_stubs.$O
$(OCAML_BCLIB) : $(OCAML_CLIBS) brlapi.cmo
$(OCAMLC) -a $(OCAMLMKLIB_FLAGS) -o $(OCAML_LIB).cma brlapi.cmo
$(OCAML_NCLIB) : $(OCAML_CLIBS) brlapi.cmx
- $(OCAMLMKLIB) $(OCAMLMKLIBOPT_FLAGS) -o $(OCAML_LIB) brlapi.cmx
+ $(OCAMLMKLIB) -ldopt "$(LDFLAGS)" $(OCAMLMKLIBOPT_FLAGS) -o $(OCAML_LIB) brlapi.cmx
brlapi.cmi: brlapi.mli
$(OCAMLC) -o $@ -c brlapi.mli

12
app-accessibility/brltty/files/brltty-5.0-respect-AR.patch

@ -1,12 +0,0 @@
diff -Naur brltty-4.5/Programs/Makefile.in brltty-4.5-new/Programs/Makefile.in
--- brltty-4.5/Programs/Makefile.in 2013-03-27 15:51:35.000000000 -0700
+++ brltty-4.5-new/Programs/Makefile.in 2013-09-19 14:57:56.268106076 -0700
@@ -387,7 +387,7 @@
[ ! -f lib.def ] || mv lib.def $(API_DEF)
$(API_ARC): $(API_OBJS)
- ar rc $@ $(API_OBJS)
+ $(AR) rc $@ $(API_OBJS)
$(RANLIB) $@
brlapi_client.$O:

28
app-accessibility/brltty/files/brltty-5.0-udev.patch

@ -1,28 +0,0 @@
diff -Naur brltty-5.0/Autostart/Udev/udev.rules brltty-5.0.new/Autostart/Udev/udev.rules
--- brltty-5.0/Autostart/Udev/udev.rules 2014-01-27 10:39:20.000000000 -0800
+++ brltty-5.0.new/Autostart/Udev/udev.rules 2014-02-09 04:24:08.146802299 -0800
@@ -174,20 +174,22 @@
# FreedomScientific [Focus Blue]
ENV{PRODUCT}=="f4e/114/*", ENV{BRLTTY_BRAILLE_DRIVER}="fs", GOTO="brltty_usb_run"
+# Seika rules are commented out, because they conflict with USB-to-serial
+# converters.
# Device: 10C4:EA60
# Generic Identifier
# Vendor: Cygnal Integrated Products, Inc.
# Product: CP210x UART Bridge / myAVR mySmartUSB light
# BrailleMemo [all models]
# Seika [Braille Display]
-ENV{PRODUCT}=="10c4/ea60/*", ENV{BRLTTY_BRAILLE_DRIVER}="mm,sk", GOTO="brltty_usb_run"
+#ENV{PRODUCT}=="10c4/ea60/*", ENV{BRLTTY_BRAILLE_DRIVER}="mm,sk", GOTO="brltty_usb_run"
# Device: 10C4:EA80
# Generic Identifier
# Vendor: Cygnal Integrated Products, Inc.
# Product: CP210x UART Bridge
# Seika [Note Taker]
-ENV{PRODUCT}=="10c4/ea80/*", ENV{BRLTTY_BRAILLE_DRIVER}="sk", GOTO="brltty_usb_run"
+#ENV{PRODUCT}=="10c4/ea80/*", ENV{BRLTTY_BRAILLE_DRIVER}="sk", GOTO="brltty_usb_run"
# Device: 1C71:C005
# HumanWare [all models]

2
app-cdr/k3b/Manifest

@ -1,3 +1 @@
DIST k3b-2.0.2.tar.bz2 12833321 SHA256 af176f29c1d2339c4648d461476227cb07bcd0c75056f2a4006f253e3ef5b7cd SHA512 e0a3d357decf7120a67d391d2311aaa5992f42cddbd20c5dc67f3d0e2ce15d6c53c0978cf2de6c09b96d57d273bca915fbbc0ca28547d708e2db20c795b86aa9 WHIRLPOOL 0dc975344962c98c20f9a03e3fb9225499668bed206ed61ea58b17ebe4594c2f71e237cdfc94e84a85e08b585cad6d1eee1415b129e998da3664d0544218a171
DIST k3b-2.0.2_p20140225.tar.xz 6297620 SHA256 562ea4335babd018e46d1d2bcc7567320ca8a888fb03562d4c14222dc2b68c33 SHA512 8d3450b4df42df9eef619b8ba05258e9e98d1197be4472f6b19d467c8c1d91436aacbf59d36c773d6576f3b179601dccff4cae695a73fada3504410c7f26af35 WHIRLPOOL e5d5bd692423027f40c7e6ff0ef7d27a518e95402f09988e7b8417bcb2dda9b9cdb187c033c006f27c3dac9fe34e3ba0e5d85e26c4ddd2fcb82a1065f4b58ad7
DIST k3b-2.0.3a.tar.xz 9864468 SHA256 2d0bb2746802c1d3ad7ddd10e29234cf2053074f376feb200306a5570c39c081 SHA512 008d69f3d60dfcd39c787c8fb0b50cdf7b29f1cf551c2c0aa0b6e995ec9d67b26edcb0670d5cd428afcc4e2a60c9e6170a9316b90978dfcc3693d27db98e7472 WHIRLPOOL 5cc63f7355ead8585295c6be8909a07fb0f34df77c8feff14c42daffc52679e27fbb28f1b1912c1bdf22e9c79b4369b2af6f3f8592f25af0f401a59e2b3a2c50

96
app-cdr/k3b/files/k3b-2.0.2-ffmpeg.patch

@ -1,96 +0,0 @@
commit 61ca30beb978f68e72257408777c6433f33129bd
Author: Michal Malek <michalm@jabster.pl>
Date: Sun Aug 28 20:18:53 2011 +0200
Fixed compilation with new FFMPEG
BUG: 274817
FIXED-IN: 2.0.3
diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
index 0ad59fc..0c5f366 100644
--- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
@@ -109,7 +109,13 @@ bool K3bFFMpegFile::open()
#else
::AVCodecContext* codecContext = d->formatContext->streams[0]->codec;
#endif
- if( codecContext->codec_type != CODEC_TYPE_AUDIO ) {
+ if( codecContext->codec_type !=
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
+ AVMEDIA_TYPE_AUDIO)
+#else
+ CODEC_TYPE_AUDIO)
+#endif
+ {
kDebug() << "(K3bFFMpegFile) not a simple audio stream: " << m_filename;
return false;
}
@@ -225,8 +231,11 @@ QString K3bFFMpegFile::typeComment() const
QString K3bFFMpegFile::title() const
{
// FIXME: is this UTF8 or something??
- if( d->formatContext->title[0] != '\0' )
- return QString::fromLocal8Bit( d->formatContext->title );
+ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "TITLE", NULL, 0 );
+ if( ade == NULL )
+ return QString();
+ if( ade->value != '\0' )
+ return QString::fromLocal8Bit( ade->value );
else
return QString();
}
@@ -235,8 +244,11 @@ QString K3bFFMpegFile::title() const
QString K3bFFMpegFile::author() const
{
// FIXME: is this UTF8 or something??
- if( d->formatContext->author[0] != '\0' )
- return QString::fromLocal8Bit( d->formatContext->author );
+ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "ARTIST", NULL, 0 );
+ if( ade == NULL )
+ return QString();
+ if( ade->value != '\0' )
+ return QString::fromLocal8Bit( ade->value );
else
return QString();
}
@@ -245,8 +257,11 @@ QString K3bFFMpegFile::author() const
QString K3bFFMpegFile::comment() const
{
// FIXME: is this UTF8 or something??
- if( d->formatContext->comment[0] != '\0' )
- return QString::fromLocal8Bit( d->formatContext->comment );
+ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "COMMENT", NULL, 0 );
+ if( ade == NULL )
+ return QString();
+ if( ade->value != '\0' )
+ return QString::fromLocal8Bit( ade->value );
else
return QString();
}
@@ -309,8 +324,13 @@ int K3bFFMpegFile::fillOutputBuffer()
#if LIBAVCODEC_VERSION_MAJOR < 52
int len = ::avcodec_decode_audio(
#else
+ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
+ int len = ::avcodec_decode_audio3(
+ #else
int len = ::avcodec_decode_audio2(
+ #endif
#endif
+
#ifdef FFMPEG_BUILD_PRE_4629
&d->formatContext->streams[0]->codec,
#else
@@ -318,7 +338,11 @@ int K3bFFMpegFile::fillOutputBuffer()
#endif
(short*)d->alignedOutputBuffer,
&d->outputBufferSize,
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
+ &d->packet );
+#else
d->packetData, d->packetSize );
+#endif
if( d->packetSize <= 0 || len < 0 )
::av_free_packet( &d->packet );

19
app-cdr/k3b/files/k3b-2.0.2-ffmpeg2.patch

@ -1,19 +0,0 @@
https://bugs.gentoo.org/show_bug.cgi?id=476494
A better patch using avcodec_decode_audio4 will be needed but for now this
fixes the problem.
Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
===================================================================
--- k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
@@ -37,6 +37,9 @@ extern "C" {
#include <klocale.h>
+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
+#define AVCODEC_MAX_AUDIO_FRAME_SIZE (192000 * 4)
+#endif
#if LIBAVFORMAT_BUILD < 4629
#define FFMPEG_BUILD_PRE_4629

22
app-cdr/k3b/files/k3b-2.0.2-libav9.patch

@ -1,22 +0,0 @@
Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
===================================================================
--- k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2013-04-22 17:46:13.523959500 +0200
+++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2013-04-22 18:40:49.890007513 +0200
@@ -95,7 +95,7 @@ bool K3bFFMpegFile::open()
}
// analyze the streams
- ::av_find_stream_info( d->formatContext );
+ ::avformat_find_stream_info( d->formatContext, 0 );
// we only handle files containing one audio stream
if( d->formatContext->nb_streams != 1 ) {
@@ -129,7 +129,7 @@ bool K3bFFMpegFile::open()
// open the codec on our context
kDebug() << "(K3bFFMpegFile) found codec for " << m_filename;
- if( ::avcodec_open( codecContext, d->codec ) < 0 ) {
+ if( ::avcodec_open2( codecContext, d->codec, 0 ) < 0 ) {
kDebug() << "(K3bFFMpegDecoderFactory) could not open codec.";
return false;
}

22
app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch

@ -1,22 +0,0 @@
Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
===================================================================
--- k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
@@ -88,7 +88,7 @@ bool K3bFFMpegFile::open()
close();
// open the file
- int err = ::av_open_input_file( &d->formatContext, m_filename.toLocal8Bit(), 0, 0, 0 );
+ int err = ::avformat_open_input( &d->formatContext, m_filename.toLocal8Bit(), 0, NULL);
if( err < 0 ) {
kDebug() << "(K3bFFMpegFile) unable to open " << m_filename << " with error " << err;
return false;
@@ -143,7 +143,7 @@ bool K3bFFMpegFile::open()
}
// dump some debugging info
- ::dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
+ ::av_dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
return true;
}

114
app-cdr/k3b/k3b-2.0.2-r4.ebuild

@ -1,114 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.2-r4.ebuild,v 1.8 2014/04/26 11:29:46 johu Exp $
EAPI=5
MULTIMEDIA_REQUIRED="always"
WEBKIT_REQUIRED="always"
KDE_HANDBOOK="optional"
KDE_SCM="git"
# Translations are only in the tarballs, not in the git repo
if [[ ${PV} != *9999* ]]; then
KDE_LINGUAS="ast be bg ca ca@valencia cs csb da de el en_GB eo es et eu fi fr ga
gl he hi hne hr hu is it ja km ko ku lt mai nb nds nl nn oc pa pl pt pt_BR ro ru
se sk sl sv th tr uk zh_CN zh_TW"
SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.bz2"
DOCS=( FAQ PERMISSIONS README )
S=${WORKDIR}/${P/_*}
else
DOCS=( FAQ.txt PERMISSIONS.txt README.txt )
fi
inherit kde4-base
DESCRIPTION="The CD/DVD Kreator for KDE"
HOMEPAGE="http://www.k3b.org/"
LICENSE="GPL-2 FDL-1.2"
SLOT="4"
KEYWORDS="amd64 ~ppc x86"
IUSE="debug dvd emovix encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis"
DEPEND="
$(add_kdebase_dep libkcddb)
media-libs/libsamplerate
dvd? ( media-libs/libdvdread )
ffmpeg? ( virtual/ffmpeg )
flac? ( >=media-libs/flac-1.2[cxx] )
mp3? ( media-sound/lame )
mad? ( media-libs/libmad )
musepack? ( >=media-sound/musepack-tools-444 )
sndfile? ( media-libs/libsndfile )
taglib? ( >=media-libs/taglib-1.5 )
vorbis? ( media-libs/libvorbis )
"
RDEPEND="${DEPEND}
$(add_kdebase_dep kdelibs 'udev,udisks(+)')
app-cdr/cdrdao
media-sound/cdparanoia
virtual/cdrtools
dvd? (
>=app-cdr/dvd+rw-tools-7
encode? ( media-video/transcode[dvd] )
)
emovix? ( media-video/emovix )
sox? ( media-sound/sox )
vcd? ( media-video/vcdimager )
"
DOCS+=( ChangeLog )
PATCHES=(
"${FILESDIR}/${P}-ffmpeg.patch"
"${FILESDIR}/${P}-libavformat54.patch"
"${FILESDIR}/${P}-libav9.patch"
"${FILESDIR}/${P}-ffmpeg2.patch"
)
REQUIRED_USE="
mp3? ( encode )
sox? ( encode )
"
src_configure() {
mycmakeargs=(
-DK3B_BUILD_API_DOCS=OFF
-DK3B_BUILD_K3BSETUP=OFF
-DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
-DK3B_ENABLE_HAL_SUPPORT=OFF
-DK3B_ENABLE_MUSICBRAINZ=OFF
$(cmake-utils_use debug K3B_DEBUG)
$(cmake-utils_use dvd K3B_ENABLE_DVD_RIPPING)
$(cmake-utils_use encode K3B_BUILD_EXTERNAL_ENCODER_PLUGIN)
$(cmake-utils_use ffmpeg K3B_BUILD_FFMPEG_DECODER_PLUGIN)
$(cmake-utils_use flac K3B_BUILD_FLAC_DECODER_PLUGIN)
$(cmake-utils_use mp3 K3B_BUILD_LAME_ENCODER_PLUGIN)
$(cmake-utils_use mad K3B_BUILD_MAD_DECODER_PLUGIN)
$(cmake-utils_use musepack K3B_BUILD_MUSE_DECODER_PLUGIN)
$(cmake-utils_use sndfile K3B_BUILD_SNDFILE_DECODER_PLUGIN)
$(cmake-utils_use sox K3B_BUILD_SOX_ENCODER_PLUGIN)
$(cmake-utils_use taglib K3B_ENABLE_TAGLIB)
$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_DECODER_PLUGIN)
$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN)
)
kde4-base_src_configure
}
pkg_postinst() {
kde4-base_pkg_postinst
echo
elog "We don't install k3bsetup anymore because Gentoo doesn't need it."
elog "If you get warnings on start-up, uncheck the \"Check system"
elog "configuration\" option in the \"Misc\" settings window."
echo
local group=cdrom
use kernel_linux || group=operator
elog "Make sure you have proper read/write permissions on the cdrom device(s)."
elog "Usually, it is sufficient to be in the ${group} group."
echo
}

106
app-cdr/k3b/k3b-2.0.2_p20140225.ebuild

@ -1,106 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.2_p20140225.ebuild,v 1.1 2014/02/25 16:53:57 creffett Exp $
EAPI=5
MULTIMEDIA_REQUIRED="always"
WEBKIT_REQUIRED="always"
KDE_HANDBOOK="optional"
KDE_SCM="git"
# Translations are not available, since this is a snapshot
#KDE_LINGUAS="ast be bg ca ca@valencia cs csb da de el en_GB eo es et eu fi fr ga
#gl he hi hne hr hu is it ja km ko ku lt mai nb nds nl nn oc pa pl pt pt_BR ro ru
#se sk sl sv th tr uk zh_CN zh_TW"
SRC_URI="http://dev.gentoo.org/~creffett/distfiles/${P}.tar.xz"
DOCS=( FAQ.txt PERMISSIONS.txt README.txt )
inherit kde4-base
DESCRIPTION="The CD/DVD Kreator for KDE"
HOMEPAGE="http://www.k3b.org/"
LICENSE="GPL-2 FDL-1.2"
SLOT="4"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="debug dvd emovix encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis"
DEPEND="
$(add_kdebase_dep libkcddb)
media-libs/libsamplerate
dvd? ( media-libs/libdvdread )
ffmpeg? ( virtual/ffmpeg )
flac? ( >=media-libs/flac-1.2[cxx] )
mp3? ( media-sound/lame )
mad? ( media-libs/libmad )
musepack? ( >=media-sound/musepack-tools-444 )
sndfile? ( media-libs/libsndfile )
taglib? ( >=media-libs/taglib-1.5 )
vorbis? ( media-libs/libvorbis )
"
RDEPEND="${DEPEND}
$(add_kdebase_dep kdelibs 'udev,udisks(+)')
app-cdr/cdrdao
media-sound/cdparanoia
virtual/cdrtools
dvd? (
>=app-cdr/dvd+rw-tools-7
encode? ( media-video/transcode[dvd] )
)
emovix? ( media-video/emovix )
sox? ( media-sound/sox )
vcd? ( media-video/vcdimager )
"
DOCS+=( ChangeLog )
PATCHES=(
"${FILESDIR}/${PN}-2.0.2-ffmpeg2.patch"
)
REQUIRED_USE="
mp3? ( encode )
sox? ( encode )
"
src_configure() {
mycmakeargs=(
-DK3B_BUILD_API_DOCS=OFF
-DK3B_BUILD_K3BSETUP=OFF
-DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
-DK3B_ENABLE_HAL_SUPPORT=OFF
-DK3B_ENABLE_MUSICBRAINZ=OFF
$(cmake-utils_use debug K3B_DEBUG)
$(cmake-utils_use dvd K3B_ENABLE_DVD_RIPPING)
$(cmake-utils_use encode K3B_BUILD_EXTERNAL_ENCODER_PLUGIN)
$(cmake-utils_use ffmpeg K3B_BUILD_FFMPEG_DECODER_PLUGIN)
$(cmake-utils_use flac K3B_BUILD_FLAC_DECODER_PLUGIN)
$(cmake-utils_use mp3 K3B_BUILD_LAME_ENCODER_PLUGIN)
$(cmake-utils_use mad K3B_BUILD_MAD_DECODER_PLUGIN)
$(cmake-utils_use musepack K3B_BUILD_MUSE_DECODER_PLUGIN)
$(cmake-utils_use sndfile K3B_BUILD_SNDFILE_DECODER_PLUGIN)
$(cmake-utils_use sox K3B_BUILD_SOX_ENCODER_PLUGIN)
$(cmake-utils_use taglib K3B_ENABLE_TAGLIB)
$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_DECODER_PLUGIN)
$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN)
)
kde4-base_src_configure
}
pkg_postinst() {
kde4-base_pkg_postinst
echo
elog "We don't install k3bsetup anymore because Gentoo doesn't need it."
elog "If you get warnings on start-up, uncheck the \"Check system"
elog "configuration\" option in the \"Misc\" settings window."
echo
local group=cdrom
use kernel_linux || group=operator
elog "Make sure you have proper read/write permissions on the cdrom device(s)."
elog "Usually, it is sufficient to be in the ${group} group."
echo
}

2
app-crypt/gnupg/Manifest

@ -1,4 +1,4 @@
DIST gnupg-1.4.19.tar.bz2 3713811 SHA256 7f09319d044b0f6ee71fe3587bb873be701723ac0952cff5069046a78de8fd86 SHA512 cce2a83efb05f963ad0f8afd04999cc852889d46b4cad4cf399a37fd6e69f0911a5ccaa0192cb891a941cfa93125349b481efa789a127e3c0aa2c5ba53672741 WHIRLPOOL 14eaddca0981f05757aa0751b9563837efd3f5943a422d5f29e0de94eb6233b85b8848a1f4816ab7e897d6e656c7c08705115d53ed89f554604ffd2009c3c39f
DIST gnupg-2.0.26.tar.bz2 4303384 SHA256 7758e30dc382ae7a7167ed41b7f936aa50af5ea2d6fccdef663b5b750b65b8e0 SHA512 5dd23baaac764fd48abd235ed52a85a2c7fd68b98fcde45c0f294ddb3b5629e8b1bd894585fbed4e6a6cb2bc4a5552c098c3cf1a849fffa469424fd0a4fee726 WHIRLPOOL 8d9b30337957f6bfeddea29116d862ef0c0ddd06d59bc2799db236b91b2c6767aad6f37f2166fc431c5d9454eb41f49f3e261bc38d0e89361f0c467f4591cd5a
DIST gnupg-2.0.27.tar.bz2 4424679 SHA256 57646d3e4b919fa1e5c8f1c0cf5fe1215333041c493a5ebc4b8f2978dbe930f2 SHA512 b05e75f5ef9881df9472818743c175cfe3254088086f36dc0fcf3d34e61f648f1775d90d404f6c622561df5066d972aadbf99ea8ec1290e5d7f7310f4ef2989e WHIRLPOOL abb353b20655002a0957e38d2b889fb5e6a47ba7b7546e1c70fc1f97cf42deeca8f2b061678983f3a160210f4eaf7529441246df1f9f1d875f5cc090456fdfb7
DIST gnupg-2.1.3.tar.bz2 4875813 SHA256 213e7fb0d74bb4e53a2d3153f309ddc077528f2cfffa2af85f2a20cc7875c8ed SHA512 dfa462c490102f6924314aaba44af8492b3825f1431732ad4ac739124077c5ed85bc26b83e72d7b974a4008e7e9be5fa33eb7523c174e3e5291367f28d845de8 WHIRLPOOL e6fade4dfdcdf590b8bc793daf5f00f8feb1e537b1a28c87a98b2e364f171e6c9ae615e6e7742504097df71e636be894d8c95fad5f3f699f93071c73af3726ef
DIST gnupg-2.1.4.tar.bz2 4885653 SHA256 64127eedd868510f2bccccb22c507a4878ffa07495db16a0f976c67f56426cb0 SHA512 57cabe1c00b830d383790d346b2ac6aafe1df5c71728b3a6e7e9164d0ace7e9638c7c6c01849946fbff671ea8f76d9ec3ea8878419c80cbc70c918e98e955310 WHIRLPOOL 2990169789708c5b2c47c2b4bf64fcc62c1bf0e093ad1991e2975e9a8da3be76142482cf7a29afc9965d9f08aabb8244fabfbe92a9d4d772fb400f6d41ca1ab4

130
app-crypt/gnupg/files/gnupg-2.1.1-misc-cve.patch

@ -1,130 +0,0 @@
From ed8383c618e124cfa708c9ee87563fcdf2f4649c Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Fri, 19 Dec 2014 18:53:34 -0500
Subject: [PATCH] sm: Avoid double-free on iconv failure
* sm/minip12.c: (p12_build) if jnlib_iconv_open fails, avoid
double-free of pwbuf.
--
Observed by Joshua Rogers <honey@internot.info>, who proposed a
slightly different fix.
Debian-Bug-Id: 773472
Added fix at a second place - wk.
---
sm/minip12.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/sm/minip12.c b/sm/minip12.c
index 01b91b7..ca4d248 100644
--- a/sm/minip12.c
+++ b/sm/minip12.c
@@ -2422,6 +2422,7 @@ p12_build (gcry_mpi_t *kparms, const void *cert, size_t certlen,
" requested charset '%s': %s\n",
charset, strerror (errno));
gcry_free (pwbuf);
+ pwbuf = NULL;
goto failure;
}
@@ -2436,6 +2437,7 @@ p12_build (gcry_mpi_t *kparms, const void *cert, size_t certlen,
" requested charset '%s': %s\n",
charset, strerror (errno));
gcry_free (pwbuf);
+ pwbuf = NULL;
jnlib_iconv_close (cd);
goto failure;
}
--
1.7.10.4
From b0b3803e8c2959dd67ca96debc54b5c6464f0d41 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Fri, 19 Dec 2014 18:07:55 -0500
Subject: [PATCH] scd: Avoid double-free on error condition in scd
* scd/command.c (cmd_readkey): avoid double-free of cert
--
When ksba_cert_new() fails, cert will be double-freed.
Debian-Bug-Id: 773471
Original patch changed by wk to do the free only at leave.
---
scd/command.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/scd/command.c b/scd/command.c
index dd4191f..1cc580a 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -804,10 +804,8 @@ cmd_readkey (assuan_context_t ctx, char *line)
rc = ksba_cert_new (&kc);
if (rc)
- {
- xfree (cert);
- goto leave;
- }
+ goto leave;
+
rc = ksba_cert_init_from_mem (kc, cert, ncert);
if (rc)
{
--
1.7.10.4
From abd5f6752d693b7f313c19604f0723ecec4d39a6 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Mon, 22 Dec 2014 12:16:46 +0100
Subject: [PATCH] dirmngr,gpgsm: Return NULL on fail
* dirmngr/ldapserver.c (ldapserver_parse_one): Set SERVER to NULL.
* sm/gpgsm.c (parse_keyserver_line): Ditto.
--
Reported-by: Joshua Rogers <git@internot.info>
"If something inside the ldapserver_parse_one function failed,
'server' would be freed, then returned, leading to a
use-after-free. This code is likely copied from sm/gpgsm.c, which
was also susceptible to this bug."
Signed-off-by: Werner Koch <wk@gnupg.org>
---
dirmngr/ldapserver.c | 1 +
sm/gpgsm.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/dirmngr/ldapserver.c b/dirmngr/ldapserver.c
index 20a574c..5808c5b 100644
--- a/dirmngr/ldapserver.c
+++ b/dirmngr/ldapserver.c
@@ -125,6 +125,7 @@ ldapserver_parse_one (char *line,
{
log_info (_("%s:%u: skipping this line\n"), filename, lineno);
ldapserver_list_free (server);
+ server = NULL;
}
return server;
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 3398d17..72bceb4 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -862,6 +862,7 @@ parse_keyserver_line (char *line,
{
log_info (_("%s:%u: skipping this line\n"), filename, lineno);
keyserver_list_free (server);
+ server = NULL;
}
return server;
--
1.7.10.4

29
app-crypt/gnupg/files/gnupg-2.1.3-dirmngr-Fix-segfault-in-ldap-engine.patch

@ -1,29 +0,0 @@
From c3216513bf12cdeec154b6430a50ef6dfd271ee6 Mon Sep 17 00:00:00 2001
From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
Date: Sun, 12 Apr 2015 01:11:07 +0200
Subject: [PATCH] dirmngr: Fix segfault in ldap engine
(ks-engine-ldap.c) Fix segfault caused by missing check whether uri is
initialized
---
dirmngr/ks-engine-ldap.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/dirmngr/ks-engine-ldap.c b/dirmngr/ks-engine-ldap.c
index aefd12a..4497025 100644
--- a/dirmngr/ks-engine-ldap.c
+++ b/dirmngr/ks-engine-ldap.c
@@ -306,7 +306,9 @@ ks_ldap_help (ctrl_t ctrl, parsed_uri_t uri)
"Supported methods: search, get, put\n";
gpg_error_t err;
- if (strcmp (uri->scheme, "ldap") == 0
+ if(!uri)
+ err = ks_print_help (ctrl, " ldap");
+ else if (strcmp (uri->scheme, "ldap") == 0
|| strcmp (uri->scheme, "ldaps") == 0
|| strcmp (uri->scheme, "ldapi") == 0)
err = ks_print_help (ctrl, data);
--
2.3.0

246
app-crypt/gnupg/files/gnupg-2.1.3-dirmngr-no-ldap.patch

@ -1,246 +0,0 @@
From 5cde5bf37339cdeb0bd0a33d39477382eafebede Mon Sep 17 00:00:00 2001
From: "Neal H. Walfield" <neal@g10code.com>
Date: Mon, 13 Apr 2015 12:02:40 +0200
Subject: [PATCH 1/1] dirmngr: If LDAP is not enable, don't build the LDAP
bits.
* dirmngr/Makefile.am (dirmngr_SOURCES): Only include
ks-engine-ldap.c, ldap-parse-uri.c and ldap-parse-uri.h if USE_LDAP
is TRUE.
(module_tests): Only add t-ldap-parse-uri if USE_LDAP is TRUE.
* dirmngr/ks-action.c: Only include "ldap-parse-uri.h" if USE_LDAP is
TRUE.
(ks_action_help): Don't invoke LDAP functionality if USE_LDAP is not
TRUE.
(ks_action_search): Likewise.
(ks_action_get): Likewise.
(ks_action_put): Likewise.
* dirmngr/server.c: Only include "ldap-parse-uri.h" if USE_LDAP is
TRUE.
(cmd_keyserver): Don't invoke LDAP functionality if USE_LDAP is not
TRUE.
--
Signed-off-by: Neal H. Walfield <neal@g10code.com>
GnuPG-bug-id: 1949
---
dirmngr/Makefile.am | 14 ++++++----
dirmngr/ks-action.c | 76 ++++++++++++++++++++++++++++++++++++++---------------
dirmngr/server.c | 10 +++++--
3 files changed, 72 insertions(+), 28 deletions(-)
diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am
index a8b1c52..c5713a7 100644
--- a/dirmngr/Makefile.am
+++ b/dirmngr/Makefile.am
@@ -62,13 +62,12 @@ dirmngr_SOURCES = dirmngr.c dirmngr.h server.c crlcache.c crlfetch.c \
cdb.h cdblib.c misc.c dirmngr-err.h \
ocsp.c ocsp.h validate.c validate.h \
ks-action.c ks-action.h ks-engine.h \
- ks-engine-hkp.c ks-engine-http.c ks-engine-finger.c ks-engine-kdns.c \
- ks-engine-ldap.c \
- ldap-parse-uri.c ldap-parse-uri.h
+ ks-engine-hkp.c ks-engine-http.c ks-engine-finger.c ks-engine-kdns.c
if USE_LDAP
dirmngr_SOURCES += ldapserver.h ldapserver.c ldap.c w32-ldap-help.h \
- ldap-wrapper.h $(ldap_url) $(extraldap_src)
+ ldap-wrapper.h ldap-parse-uri.c ldap-parse-uri.h \
+ ks-engine-ldap.c $(ldap_url) $(extraldap_src)
ldaplibs = $(LDAPLIBS)
else
ldaplibs =
@@ -114,7 +113,12 @@ t_common_ldadd = $(libcommontls) $(libcommon) no-libgcrypt.o \
$(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) \
$(DNSLIBS) $(LIBINTL) $(LIBICONV)
-module_tests = t-ldap-parse-uri
+module_tests =
+
+if USE_LDAP
+module_tests += t-ldap-parse-uri
+endif
+
t_ldap_parse_uri_SOURCES = \
t-ldap-parse-uri.c ldap-parse-uri.c ldap-parse-uri.h \
$(ldap_url) $(t_common_src)
diff --git a/dirmngr/ks-action.c b/dirmngr/ks-action.c
index c76aaaa..dd4516a 100644
--- a/dirmngr/ks-action.c
+++ b/dirmngr/ks-action.c
@@ -30,7 +30,9 @@
#include "misc.h"
#include "ks-engine.h"
#include "ks-action.h"
-#include "ldap-parse-uri.h"
+#if USE_LDAP
+# include "ldap-parse-uri.h"
+#endif
/* Called by the engine's help functions to print the actual help. */
gpg_error_t
@@ -73,10 +75,14 @@ ks_action_help (ctrl_t ctrl, const char *url)
}
else
{
+#if USE_LDAP
if (ldap_uri_p (url))
err = ldap_parse_uri (&parsed_uri, url);
else
- err = http_parse_uri (&parsed_uri, url, 1);
+#endif
+ {
+ err = http_parse_uri (&parsed_uri, url, 1);
+ }
if (err)
return err;
@@ -90,8 +96,10 @@ ks_action_help (ctrl_t ctrl, const char *url)
err = ks_finger_help (ctrl, parsed_uri);
if (!err)
err = ks_kdns_help (ctrl, parsed_uri);
+#if USE_LDAP
if (!err)
err = ks_ldap_help (ctrl, parsed_uri);
+#endif
if (!parsed_uri)
ks_print_help (ctrl,
@@ -151,16 +159,23 @@ ks_action_search (ctrl_t ctrl, uri_item_t keyservers,
for (uri = keyservers; !err && uri; uri = uri->next)
{
int is_http = uri->parsed_uri->is_http;
- int is_ldap = (strcmp (uri->parsed_uri->scheme, "ldap") == 0
- || strcmp (uri->parsed_uri->scheme, "ldaps") == 0
- || strcmp (uri->parsed_uri->scheme, "ldapi") == 0);
+ int is_ldap = 0;
+#if USE_LDAP
+ is_ldap = (strcmp (uri->parsed_uri->scheme, "ldap") == 0
+ || strcmp (uri->parsed_uri->scheme, "ldaps") == 0
+ || strcmp (uri->parsed_uri->scheme, "ldapi") == 0);
+#endif
if (is_http || is_ldap)
{
any_server = 1;
- if (is_http)
- err = ks_hkp_search (ctrl, uri->parsed_uri, patterns->d, &infp);
- else if (is_ldap)
+#if USE_LDAP
+ if (is_ldap)
err = ks_ldap_search (ctrl, uri->parsed_uri, patterns->d, &infp);
+ else
+#endif
+ {
+ err = ks_hkp_search (ctrl, uri->parsed_uri, patterns->d, &infp);
+ }
if (!err)
{
@@ -203,18 +218,27 @@ ks_action_get (ctrl_t ctrl, uri_item_t keyservers,
for (uri = keyservers; !err && uri; uri = uri->next)
{
int is_http = uri->parsed_uri->is_http;
- int is_ldap = (strcmp (uri->parsed_uri->scheme, "ldap") == 0
- || strcmp (uri->parsed_uri->scheme, "ldaps") == 0
- || strcmp (uri->parsed_uri->scheme, "ldapi") == 0);
+ int is_ldap = 0;
+
+#if USE_LDAP
+ is_ldap = (strcmp (uri->parsed_uri->scheme, "ldap") == 0
+ || strcmp (uri->parsed_uri->scheme, "ldaps") == 0
+ || strcmp (uri->parsed_uri->scheme, "ldapi") == 0);
+#endif
+
if (is_http || is_ldap)
{
any_server = 1;
for (sl = patterns; !err && sl; sl = sl->next)
{
- if (is_http)
- err = ks_hkp_get (ctrl, uri->parsed_uri, sl->d, &infp);
- else
+#if USE_LDAP
+ if (is_ldap)
err = ks_ldap_get (ctrl, uri->parsed_uri, sl->d, &infp);
+ else
+#endif
+ {
+ err = ks_hkp_get (ctrl, uri->parsed_uri, sl->d, &infp);
+ }
if (err)
{
@@ -322,22 +346,32 @@ ks_action_put (ctrl_t ctrl, uri_item_t keyservers,
int any_server = 0;
uri_item_t uri;
+ (void) info;
+ (void) infolen;
+
for (uri = keyservers; !err && uri; uri = uri->next)
{
int is_http = uri->parsed_uri->is_http;
- int is_ldap = (strcmp (uri->parsed_uri->scheme, "ldap") == 0
- || strcmp (uri->parsed_uri->scheme, "ldaps") == 0
- || strcmp (uri->parsed_uri->scheme, "ldapi") == 0);
+ int is_ldap = 0;
+
+#if USE_LDAP
+ is_ldap = (strcmp (uri->parsed_uri->scheme, "ldap") == 0
+ || strcmp (uri->parsed_uri->scheme, "ldaps") == 0
+ || strcmp (uri->parsed_uri->scheme, "ldapi") == 0);
+#endif
if (is_http || is_ldap)
{
any_server = 1;
- if (is_http)
- err = ks_hkp_put (ctrl, uri->parsed_uri, data, datalen);
- else
+#if USE_LDAP
+ if (is_ldap)
err = ks_ldap_put (ctrl, uri->parsed_uri, data, datalen,
info, infolen);
-
+ else
+#endif
+ {
+ err = ks_hkp_put (ctrl, uri->parsed_uri, data, datalen);
+ }
if (err)
{
first_err = err;
diff --git a/dirmngr/server.c b/dirmngr/server.c
index 506b137..3e6d99d 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -48,7 +48,9 @@
#endif
#include "ks-action.h"
#include "ks-engine.h" /* (ks_hkp_print_hosttable) */
-#include "ldap-parse-uri.h"
+#if USE_LDAP
+# include "ldap-parse-uri.h"
+#endif
/* To avoid DoS attacks we limit the size of a certificate to
something reasonable. */
@@ -1530,10 +1532,14 @@ cmd_keyserver (assuan_context_t ctx, char *line)
item->parsed_uri = NULL;
strcpy (item->uri, line);
+#if USE_LDAP
if (ldap_uri_p (item->uri))
err = ldap_parse_uri (&item->parsed_uri, line);
else
- err = http_parse_uri (&item->parsed_uri, line, 1);
+#endif
+ {
+ err = http_parse_uri (&item->parsed_uri, line, 1);
+ }
if (err)
{
xfree (item);
--
2.1.4

73
app-crypt/gnupg/files/gnupg-2.1.3-gpg-fix-null-segv.patch

@ -1,73 +0,0 @@
From 25fce93ba19d997e234a674d5cc98df82c5b5496 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Mon, 13 Apr 2015 11:44:10 +0200
Subject: [PATCH] gpg: Fix NULL-segv due to invalid imported data.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
* g10/free-packet.c (my_mpi_copy): New.
(copy_public_key, copy_signature): Use instead of mpi_copy.
--
Reported-by: Hanno Böck
Signed-off-by: Werner Koch <wk@gnupg.org>
---
g10/free-packet.c | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/g10/free-packet.c b/g10/free-packet.c
index 99e7404..49d54f4 100644
--- a/g10/free-packet.c
+++ b/g10/free-packet.c
@@ -31,6 +31,20 @@
#include "options.h"
+/* This is mpi_copy with a fix for opaque MPIs which store a NULL
+ pointer. This will also be fixed in Libggcrypt 1.7.0. */
+static gcry_mpi_t
+my_mpi_copy (gcry_mpi_t a)
+{
+ if (a
+ && gcry_mpi_get_flag (a, GCRYMPI_FLAG_OPAQUE)
+ && !gcry_mpi_get_opaque (a, NULL))
+ return NULL;
+
+ return gcry_mpi_copy (a);
+}
+
+
void
free_symkey_enc( PKT_symkey_enc *enc )
{
@@ -190,11 +204,11 @@ copy_public_key (PKT_public_key *d, PKT_public_key *s)
n = pubkey_get_npkey (s->pubkey_algo);
i = 0;
if (!n)
- d->pkey[i++] = mpi_copy (s->pkey[0]);
+ d->pkey[i++] = my_mpi_copy (s->pkey[0]);
else
{
for (; i < n; i++ )
- d->pkey[i] = mpi_copy( s->pkey[i] );
+ d->pkey[i] = my_mpi_copy (s->pkey[i]);
}
for (; i < PUBKEY_MAX_NSKEY; i++)
d->pkey[i] = NULL;
@@ -237,10 +251,10 @@ copy_signature( PKT_signature *d, PKT_signature *s )
memcpy( d, s, sizeof *d );
n = pubkey_get_nsig( s->pubkey_algo );
if( !n )
- d->data[0] = mpi_copy(s->data[0]);
+ d->data[0] = my_mpi_copy(s->data[0]);
else {
for(i=0; i < n; i++ )
- d->data[i] = mpi_copy( s->data[i] );
+ d->data[i] = my_mpi_copy( s->data[i] );
}
d->pka_info = s->pka_info? cp_pka_info (s->pka_info) : NULL;
d->hashed = cp_subpktarea (s->hashed);
--
2.1.4

13
app-crypt/gnupg/gnupg-2.1.3-r3.ebuild → app-crypt/gnupg/gnupg-2.1.4.ebuild

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.1.3-r3.ebuild,v 1.3 2015/04/26 12:51:31 blueness Exp $
# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.1.4.ebuild,v 1.1 2015/05/13 15:16:48 k_f Exp $
EAPI="5"
@ -60,11 +60,7 @@ S="${WORKDIR}/${MY_P}"
src_prepare() {
epatch "${FILESDIR}/${PN}-2.0.17-gpgsm-gencert.patch"
epatch "${FILESDIR}/${P}-dirmngr-Fix-segfault-in-ldap-engine.patch"
epatch "${FILESDIR}/${P}-dirmngr-no-ldap.patch"
epatch "${FILESDIR}/${P}-gpg-fix-null-segv.patch"
epatch_user
eautoreconf
}
src_configure() {
@ -103,13 +99,6 @@ src_configure() {
$(use_enable nls) \
$(use_with readline) \
CC_FOR_BUILD="$(tc-getBUILD_CC)"
# Due to the LDAP patch specific to 2.1.3 is causing an eautoreconf
# it shows up as being a developer version and with "unknown" suffix
# we remove this explicitly for the 2.1.3 release as it does not contain
# unstable code
sed -i "s/#define IS_DEVELOPMENT_VERSION 1//" config.h || die
sed -i "s/2.1.3-unknown/2.1.3/" config.h || die
}
src_compile() {

2
app-crypt/seahorse/Manifest

@ -1,3 +1 @@
DIST seahorse-3.12.2.tar.xz 1398292 SHA256 5e6fb25373fd4490e181e2fa0f5cacf99b78b2f6caa5d91c9c605900fb5f3839 SHA512 016c87f1a356d3d0ac57931e139c20c67b4e36832d9a8947ff39bfc040d970ea25bfd8573624dbb3ebcec05db0803667d42afb2cb15a09d0ec8199dcc5543796 WHIRLPOOL 7cd023d0d90b23c3a39a776a872dc2ba218dbcf73670561ff94f397a97ec5dd97baece8e956d810dfb6613acf82d20b93f398ca7e5af54af1a78b67e6901d6f4
DIST seahorse-3.14.0.tar.xz 1450280 SHA256 2ea22830f5af1a11fadbdd8da6b34513410f2c371d9ec75fbf9b9b2d9177fc8a SHA512 2d40f9f2a60bcebf23c1b573f9585251af64e8bec64898e25f6dec8cd7dbd6c559bc51c47b9a7ef2e4a83ffa1328c9721ccb0e7863b03707b35725e5baabc3b5 WHIRLPOOL 700c2311a94f9ade51a2581cdf9829a177bb100fedafb321fa3b9febc6988340bb4c56f62fee8637b572d7955e6d270f44d43986df52d632eecca175f36f3b1e
DIST seahorse-3.14.1.tar.xz 1504128 SHA256 092a890982fa594da8a384f156b961392f69ce5d9518a9801035e6deb1f05e93 SHA512 1147ea601c1cb17dd1606d02f86261b0381dfdab14329fee7d68bd635420fec98174b2509b09c68216918bd9ca31f22ea538fa34cae1a8e0f4c44714b9693c0f WHIRLPOOL 208c841a28b8c7c0916c02e1a68eaa7c74681c5a3b8e0be30f65a4da953cefd9bb94d57373640513b68de9b204e9d1fc65429bf5dca0344336390068fe4a47e1

65
app-crypt/seahorse/seahorse-3.12.2.ebuild

@ -1,65 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.12.2.ebuild,v 1.4 2014/12/30 11:41:23 pacho Exp $
EAPI="5"
GCONF_DEBUG="yes"
inherit gnome2
DESCRIPTION="A GNOME application for managing encryption keys"
HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
LICENSE="GPL-2+ FDL-1.1+"
SLOT="0"
IUSE="avahi debug ldap"
KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
COMMON_DEPEND="
>=app-crypt/gcr-3.11.91:=
>=dev-libs/glib-2.10:2
>=x11-libs/gtk+-3.4:3
>=app-crypt/libsecret-0.16
>=net-libs/libsoup-2.33.92:2.4
x11-misc/shared-mime-info
net-misc/openssh
>=app-crypt/gpgme-1
>=app-crypt/gnupg-1.4
avahi? ( >=net-dns/avahi-0.6:= )
ldap? ( net-nds/openldap:= )
"
DEPEND="${COMMON_DEPEND}
>=dev-util/intltool-0.35
sys-devel/gettext
virtual/pkgconfig
"
# Need seahorse-plugins git snapshot
RDEPEND="${COMMON_DEPEND}
!<app-crypt/seahorse-plugins-2.91.0_pre20110114
"
src_prepare() {
# FIXME: Do not mess with CFLAGS with USE="debug"
sed -e '/CFLAGS="$CFLAGS -g/d' \
-e '/CFLAGS="$CFLAGS -O0/d' \
-i configure.ac configure || die "sed 1 failed"
gnome2_src_prepare
}
src_configure() {
# bindir is needed due to bad macro expansion in desktop file, bug #508610
gnome2_src_configure \
--bindir=/usr/bin \
--enable-pgp \
--enable-ssh \
--enable-pkcs11 \
--enable-hkp \
$(use_enable avahi sharing) \
$(use_enable debug) \
$(use_enable ldap) \
ITSTOOL=$(type -P true) \
VALAC=$(type -P true)
}

65
app-crypt/seahorse/seahorse-3.14.0.ebuild

@ -1,65 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.14.0.ebuild,v 1.2 2014/12/30 11:41:23 pacho Exp $
EAPI="5"
GCONF_DEBUG="yes"
inherit gnome2
DESCRIPTION="A GNOME application for managing encryption keys"
HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
LICENSE="GPL-2+ FDL-1.1+"
SLOT="0"
IUSE="avahi debug ldap"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
COMMON_DEPEND="
>=app-crypt/gcr-3.11.91:=
>=dev-libs/glib-2.10:2
>=x11-libs/gtk+-3.4:3
>=app-crypt/libsecret-0.16
>=net-libs/libsoup-2.33.92:2.4
x11-misc/shared-mime-info
net-misc/openssh
>=app-crypt/gpgme-1
>=app-crypt/gnupg-1.4
avahi? ( >=net-dns/avahi-0.6:= )
ldap? ( net-nds/openldap:= )
"
DEPEND="${COMMON_DEPEND}
>=dev-util/intltool-0.35
sys-devel/gettext
virtual/pkgconfig
"
# Need seahorse-plugins git snapshot
RDEPEND="${COMMON_DEPEND}
!<app-crypt/seahorse-plugins-2.91.0_pre20110114
"
src_prepare() {
# FIXME: Do not mess with CFLAGS with USE="debug"
sed -e '/CFLAGS="$CFLAGS -g/d' \
-e '/CFLAGS="$CFLAGS -O0/d' \
-i configure.ac configure || die "sed 1 failed"
gnome2_src_prepare
}
src_configure() {
# bindir is needed due to bad macro expansion in desktop file, bug #508610
gnome2_src_configure \
--bindir=/usr/bin \
--enable-pgp \
--enable-ssh \
--enable-pkcs11 \
--enable-hkp \
$(use_enable avahi sharing) \
$(use_enable debug) \
$(use_enable ldap) \
ITSTOOL=$(type -P true) \
VALAC=$(type -P true)
}

3
app-crypt/seahorse/seahorse-3.14.1.ebuild

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.14.1.ebuild,v 1.3 2015/03/15 13:14:23 pacho Exp $
# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.14.1.ebuild,v 1.4 2015/05/13 16:54:49 pacho Exp $
EAPI="5"
GCONF_DEBUG="no"
@ -26,6 +26,7 @@ COMMON_DEPEND="
net-misc/openssh
>=app-crypt/gpgme-1
>=app-crypt/gnupg-1.4
<app-crypt/gnupg-2.1
ldap? ( net-nds/openldap:= )
zeroconf? ( >=net-dns/avahi-0.6:= )

1
dev-games/ogre/Manifest

@ -1,2 +1 @@
DIST ogre-1.9.0.tar.bz2 128098305 SHA256 3072df52b2bed2a1b52e969f140ae9a4373ec931029d3eaa032e7c609a91ef82 SHA512 b1ea93d80ac0978a7c228460a6714f8d17797450efd5af6765c9fa4402e9060a8ef3a700d2757593a3016fdc32276722c8f4a5d9889a3e2eb424f16162a52bde WHIRLPOOL 625cc09ba5a76757b47764c41583584f538eb9561e5bfd546192e06da504aa3924d7070a7dfbe420c4db3edf5870baf5e8b77cc611aa4185806508f79302d6cd
DIST ogre_src_v1-8-1.tar.bz2 88619968 SHA256 da908ac934265d25e378d336d648327afe569a758ef262029acd357d506f6aab SHA512 0bbce593e5a9ebf51e3cb53661f6447d99ae28a53365d7f518c6d408216690527ef7552385160cff8d5c3ef15d3ab5c2520ef2c1f51fda5541d5d4dca4663ae2 WHIRLPOOL 7325effb6421710ff0e21ab0e29443404fed151cc2aeaf481c597fd098278bb6223b9e2115abbd175f305e909491766c2d7b871b028d5b46f8028269b25c161d

21
dev-games/ogre/files/ogre-1.8.1-flags.patch

@ -1,21 +0,0 @@
From: Julian Ospald <hasufell@gentoo.org>
Date: Wed May 30 13:45:46 UTC 2012
Subject: build system
remove pre-set flags
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -97,12 +97,6 @@
if (OGRE_GCC_HAS_SSE)
add_definitions(-msse)
endif ()
- # This is a set of sensible warnings that provide meaningful output
- set(OGRE_WARNING_FLAGS "-Wno-deprecated -Wall -Wctor-dtor-privacy -Winit-self -Wno-overloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter -pedantic -Wshadow -Wno-missing-field-initializers -Wno-long-long")
- if (NOT APPLE)
- set(OGRE_WARNING_FLAGS "${OGRE_WARNING_FLAGS} -Wno-unused-but-set-parameter")
- endif ()
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OGRE_WARNING_FLAGS}")
endif ()
if (MSVC)
if (CMAKE_BUILD_TOOL STREQUAL "nmake")

22
dev-games/ogre/files/ogre-1.8.1-gles2.patch

@ -1,22 +0,0 @@
https://bitbucket.org/sinbad/ogre/commits/6e2e797877491fa9bea169e063a9663834977d8e
--- RenderSystems/GLES2/src/GLSLES/src/OgreGLSLESProgramPipeline.cpp
+++ RenderSystems/GLES2/src/GLSLES/src/OgreGLSLESProgramPipeline.cpp
@@ -138,7 +138,7 @@
GLint binaryLength = 0;
#if GL_OES_get_program_binary
- glGetProgramiv(mGLHandle, GL_PROGRAM_BINARY_LENGTH_OES, &binaryLength);
+ glGetProgramiv(mGLProgramHandle, GL_PROGRAM_BINARY_LENGTH_OES, &binaryLength);
GL_CHECK_ERROR;
#endif
@@ -148,7 +148,7 @@
#if GL_OES_get_program_binary
// Get binary
- glGetProgramBinaryOES(mGLHandle, binaryLength, NULL, (GLenum *)newMicrocode->getPtr(), newMicrocode->getPtr() + sizeof(GLenum));
+ glGetProgramBinaryOES(mGLProgramHandle, binaryLength, NULL, (GLenum *)newMicrocode->getPtr(), newMicrocode->getPtr() + sizeof(GLenum));
GL_CHECK_ERROR;
#endif

77
dev-games/ogre/files/ogre-1.8.1-threading.patch

@ -1,77 +0,0 @@
http://www.ogre3d.org/mantis/view.php?id=425
--- ogre_src_v1-7-4/OgreMain/include/OgreAtomicWrappers.h
+++ ogre_src_v1-7-4/OgreMain/include/OgreAtomicWrappers.h
@@ -31,6 +31,7 @@
#include <signal.h>
#include "OgrePrerequisites.h"
#include "OgreException.h"
+#include "Threading/OgreThreadHeaders.h"
namespace Ogre {
--- ogre_src_v1-7-4/OgreMain/include/OgreCommon.h
+++ ogre_src_v1-7-4/OgreMain/include/OgreCommon.h
@@ -42,6 +42,8 @@
# pragma GCC visibility pop
#endif
+#include "Threading/OgreThreadHeaders.h"
+
namespace Ogre {
/** \addtogroup Core
* @{
--- ogre_src_v1-7-4/OgreMain/include/OgreConvexBody.h
+++ ogre_src_v1-7-4/OgreMain/include/OgreConvexBody.h
@@ -31,6 +31,7 @@
#include "OgrePrerequisites.h"
#include "OgrePolygon.h"
+#include "Threading/OgreThreadHeaders.h"
namespace Ogre
@@ -58,9 +59,7 @@
// Static 'free list' of polygons to save reallocation, shared between all bodies
static PolygonList msFreePolygons;
-#if OGRE_THREAD_SUPPORT
OGRE_STATIC_MUTEX(msFreePolygonsMutex)
-#endif
public:
ConvexBody();
--- ogre_src_v1-7-4/OgreMain/include/OgreLog.h
+++ ogre_src_v1-7-4/OgreMain/include/OgreLog.h
@@ -32,6 +32,8 @@
#include "OgrePrerequisites.h"
#include "OgreString.h"
+#include "Threading/OgreThreadHeaders.h"
+
namespace Ogre {
/** \addtogroup Core
--- ogre_src_v1-7-4/OgreMain/include/OgreSharedPtr.h
+++ ogre_src_v1-7-4/OgreMain/include/OgreSharedPtr.h
@@ -30,6 +30,8 @@
#include "OgrePrerequisites.h"
+#include "Threading/OgreThreadHeaders.h"
+
namespace Ogre {
/** \addtogroup Core
* @{
--- ogre_src_v1-7-4/OgreMain/src/OgreConvexBody.cpp
+++ ogre_src_v1-7-4/OgreMain/src/OgreConvexBody.cpp
@@ -44,9 +44,7 @@
// Statics
//-----------------------------------------------------------------------
ConvexBody::PolygonList ConvexBody::msFreePolygons;
-#if OGRE_THREAD_SUPPORT
OGRE_STATIC_MUTEX_INSTANCE(ConvexBody::msFreePolygonsMutex)
-#endif
//-----------------------------------------------------------------------
void ConvexBody::_initialisePool()
{

97
dev-games/ogre/ogre-1.8.1.ebuild

@ -1,97 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.8.1.ebuild,v 1.7 2014/03/08 23:22:37 hasufell Exp $
EAPI=5
CMAKE_REMOVE_MODULES="yes"
CMAKE_REMOVE_MODULES_LIST="FindFreetype"
inherit eutils cmake-utils
MY_PV=${PV//./-}
DESCRIPTION="Object-oriented Graphics Rendering Engine"
HOMEPAGE="http://www.ogre3d.org/"
SRC_URI="mirror://sourceforge/${PN}/${PN}_src_v${MY_PV}.tar.bz2"
LICENSE="MIT"
SLOT="0/1.8.1"
KEYWORDS="amd64 x86"
IUSE="+boost cg doc double-precision examples +freeimage gles2 ois +opengl poco profile tbb threads tools +zip"
REQUIRED_USE="threads? ( || ( boost poco tbb ) )"
RESTRICT="test" #139905
RDEPEND="media-libs/freetype:2
virtual/opengl
virtual/glu
x11-libs/libX11
x11-libs/libXaw
x11-libs/libXrandr
x11-libs/libXt
boost? ( dev-libs/boost )
cg? ( media-gfx/nvidia-cg-toolkit )
freeimage? ( media-libs/freeimage )
gles2? ( || ( <media-libs/mesa-8.0.0[gles] >=media-libs/mesa-8.0.0[gles2] ) )
ois? ( dev-games/ois )
threads? (
poco? ( dev-libs/poco )
tbb? ( dev-cpp/tbb )
)
zip? ( sys-libs/zlib dev-libs/zziplib )"
# gles1 currently broken wrt bug #418201
DEPEND="${RDEPEND}
x11-proto/xf86vidmodeproto
virtual/pkgconfig
doc? ( app-doc/doxygen )"
S=${WORKDIR}/${PN}_src_v${MY_PV}
src_prepare() {
epatch \
"${FILESDIR}"/${P}-threading.patch \
"${FILESDIR}"/${P}-flags.patch \
"${FILESDIR}"/${P}-gles2.patch
sed -i \
-e "s:share/OGRE/docs:share/doc/${PF}:" \
Docs/CMakeLists.txt || die
# Stupid build system hardcodes release names
sed -i \
-e '/CONFIGURATIONS/s:CONFIGURATIONS.*::' \
CMake/Utils/OgreConfigTargets.cmake || die
}
src_configure() {
local mycmakeargs=(
-DOGRE_FULL_RPATH=NO
$(cmake-utils_use boost OGRE_USE_BOOST)
$(cmake-utils_use cg OGRE_BUILD_PLUGIN_CG)
$(cmake-utils_use doc OGRE_INSTALL_DOCS)
$(cmake-utils_use double-precision OGRE_CONFIG_DOUBLE)
$(cmake-utils_use examples OGRE_INSTALL_SAMPLES)
$(cmake-utils_use freeimage OGRE_CONFIG_ENABLE_FREEIMAGE)
$(cmake-utils_use opengl OGRE_BUILD_RENDERSYSTEM_GL)
-DOGRE_BUILD_RENDERSYSTEM_GLES=OFF
$(cmake-utils_use gles2 OGRE_BUILD_RENDERSYSTEM_GLES2)
$(cmake-utils_use profile OGRE_PROFILING)
$(cmake-utils_use examples OGRE_BUILD_SAMPLES)
-DOGRE_BUILD_TESTS=FALSE
$(usex threads "-DOGRE_CONFIG_THREADS=2" "-DOGRE_CONFIG_THREADS=0")
$(cmake-utils_use tools OGRE_BUILD_TOOLS)
$(cmake-utils_use zip OGRE_CONFIG_ENABLE_ZIP)
)
if use threads ; then
local f
for f in boost poco tbb ; do
use ${f} || continue
mycmakeargs+=( -DOGRE_CONFIG_THREAD_PROVIDER=${f} )
break
done
fi
cmake-utils_src_configure
}
src_install() {
cmake-utils_src_install
docinto examples
dodoc "${CMAKE_BUILD_DIR}"/bin/*.cfg
}

6
dev-java/slf4j-api/slf4j-api-1.7.7.ebuild

@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/slf4j-api/slf4j-api-1.7.7.ebuild,v 1.1 2014/04/25 06:01:13 radhermit Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-java/slf4j-api/slf4j-api-1.7.7.ebuild,v 1.2 2015/05/13 14:18:58 monsieurp Exp $
EAPI=5
JAVA_PKG_IUSE="doc source"
@ -21,7 +21,7 @@ DEPEND=">=virtual/jdk-1.5
app-arch/unzip
test? (
dev-java/junit:4
dev-java/ant-junit4:0
dev-java/ant-junit:0
)"
S="${WORKDIR}/${P/-api/}/${PN}"

6
dev-libs/isl/files/isl-0.07-gdb-autoload-dir.patch

@ -9,9 +9,9 @@ Install python module into gdb auto-load directory.
- $(DESTDIR)$(libdir)/$$libisl-gdb.py; \
- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"; \
- $(INSTALL_DATA) $(srcdir)/isl.py $(DESTDIR)$(libdir)/$$libisl-gdb.py; esac
+ $(DESTDIR)usr/share/gdb/auto-load$(libdir)/$$libisl-gdb.py; \
+ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)usr/share/gdb/auto-load$(libdir)"; \
+ $(INSTALL_DATA) $(srcdir)/isl.py $(DESTDIR)usr/share/gdb/auto-load$(libdir)/$$libisl-gdb.py; esac
+ $(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)/$$libisl-gdb.py; \
+ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)"; \
+ $(INSTALL_DATA) $(srcdir)/isl.py $(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)/$$libisl-gdb.py; esac
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.

2
dev-libs/libqzeitgeist/metadata.xml

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>kde</herd>
<herd>kde</herd>
</pkgmetadata>

7
dev-python/ipython/ipython-3.1.0.ebuild

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-3.1.0.ebuild,v 1.1 2015/04/04 18:12:08 jlec Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-3.1.0.ebuild,v 1.2 2015/05/13 15:16:36 jlec Exp $
EAPI=5
@ -53,8 +53,9 @@ RDEPEND="${CDEPEND}
)
qt4? (
|| (
dev-python/PyQt4[${PYTHON_USEDEP}]
dev-python/pyside[${PYTHON_USEDEP}]
dev-python/PyQt4[${PYTHON_USEDEP},svg]
dev-python/PyQt5[${PYTHON_USEDEP},svg]
dev-python/pyside[${PYTHON_USEDEP},svg]
)
dev-python/pygments[${PYTHON_USEDEP}]
>=dev-python/pyzmq-13[${PYTHON_USEDEP}] )"

3
dev-util/glade/Manifest

@ -1,5 +1,2 @@
DIST glade-3.16.1.tar.xz 3080072 SHA256 994ac258bc100d3907ed40a2880c3144f13997b324477253e812d59f2716523f SHA512 daa67dd44a6e0ab1e2ed2fd8e389de40c0d6f516765b564563422e0210fe50185e485d2ed7d3e79b96589dccdfc089c8ee058cfc52a79ba1d478e61098af334e WHIRLPOOL 47d15ac37a15d3d37591aaee0eb62320ae7c78bffae20f6aaf37aa7a09f3adf01e86c6d1ad97ca546db48af3e6d0eac8866941cd7ccf37461b85ac672aea9fca
DIST glade-3.18.2.tar.xz 3256200 SHA256 a2fd77e64e8d6c4d6cbd7f365b5b3a4a06b04f749c90acbdf7a09538b2a021fc SHA512 5bf3ec211ccf84802307ccb8615df6c622a8c3132f247ec3b93c379608ae1c778ac7ca515a51b30769b7d7fe29525c11f0b513665cb4dea9b5b33ccf834b9b57 WHIRLPOOL 878171679c14354c4252f648ca074a4d1ab4dbdcacb2f374b457e531e03ad8abf05f24b1f251f26ccdb047727738d6ab16c7d028283d5f40884f0ac3a4b562d6
DIST glade-3.18.3.tar.xz 3266400 SHA256 ecdbce46e7fbfecd463be840b94fbf54d83723b3ebe075414cfd225ddab66452 SHA512 6e98d6ba98118fde4066f983024818528ac8c82d176896e2c5c62a19094377df4bf4c6b4edd028cd72bf8744c807c28a930e467f2a23670537b02af327b683f8 WHIRLPOOL 4e1e86b86216739007b3524464a5fcaf07c66ba5adc36a3c497c0c411401fffc6345db2722a1b0f85d1e1e13c920553014e4eac3bdbbd2dcc7ddbd8ac7cb41a3
DIST glade3-3.8.4.tar.xz 2305876 SHA256 c7ae0775b96a400cf43be738b2f836663a505b1458255df9ce83a340057e3d08 SHA512 dead9b9788002eecca6f8413c999471b957a8c482d770a0a2288c207c86a69e0a011164114ea9d2da60641be9cb205e3f1be7838998566a585aa3b121d316ef5 WHIRLPOOL 0fc377d71367c084a32b5b77fdbdfb82a8c8192faa94a65660c461900fedb01fd68751cb4511af926f6dc18d3e4c0f4743e68207c725b133d61a6f066a30ffd9
DIST glade3-3.8.5.tar.xz 2322076 SHA256 58a5f6e4df4028230ddecc74c564808b7ec4471b1925058e29304f778b6b2735 SHA512 722a33f1a1ec3baa785bf3c6f7f5ec2cbe7cf6fe44c9c26d33728de16f2856cbb1ace0cd38c5b5356081e326666cc82fd00f2b6af53bd06bb832079610042985 WHIRLPOOL 672c38822dd04e43e2a3c6642fa34e9e485172d943a0abd5e16f7f378f73bc9126768955d9aad431960f5966be8edaa26a755ca28e2644a790c111e0b6c0142d

46
dev-util/glade/files/glade-3.12.1-doc-version.patch

@ -1,46 +0,0 @@
From e3e91245e730f0532e913fde910054f464085241 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Sun, 6 May 2012 22:40:47 -0400
Subject: [PATCH] Version glade documentation
Rename gnome help files to prevent collision with other versions.
Avoid loading glade-3.8's devhelp files.
---
help/Makefile.am | 5 ++++-
src/glade-window.c | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)