From 56901640ee17c14e5c6fa0905872e5f1d575c805 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 15 Jul 2015 08:34:03 +0300 Subject: [PATCH] Sync with portage [Wed Jul 15 08:34:02 MSK 2015]. --- ..._alpha.ebuild => bash-4.4_alpha-r1.ebuild} | 4 +- .../bash/files/bash-4.4-optimize-fork.patch | 16 + dev-games/openscenegraph/Manifest | 1 - .../files/openscenegraph-3.0.1-cmake.patch | 293 ------------- .../openscenegraph-3.0.1-libav-0.7.patch | 22 - .../files/openscenegraph-3.0.1-libav-9.patch | 284 ------------- .../openscenegraph-3.0.1-xinelib12x.patch | 19 - ....ebuild => openscenegraph-3.2.1-r1.ebuild} | 54 ++- dev-lang/php/php-5.5.26.ebuild | 4 +- dev-lang/php/php-5.6.10.ebuild | 4 +- dev-libs/cloog/cloog-0.18.3.ebuild | 9 +- .../cloog/files/cloog-0.18.3-isl-0.15.patch | 85 ++++ dev-libs/crypto++/crypto++-5.6.2-r2.ebuild | 4 +- dev-libs/nspr/nspr-4.10.8.ebuild | 4 +- dev-libs/nss/nss-3.19.2.ebuild | 4 +- .../keystonemiddleware-1.5.2.ebuild | 4 +- dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild | 8 +- dev-ruby/redcloth/redcloth-4.2.9-r3.ebuild | 4 +- dev-util/kdevelop-qmljs/Manifest | 1 + .../kdevelop-qmljs-1.7.0.ebuild | 28 ++ dev-util/kdevelop-qmljs/metadata.xml | 5 + mail-client/sylpheed/sylpheed-3.4.2.ebuild | 4 +- mail-filter/opendmarc/metadata.xml | 4 + mail-filter/opendmarc/opendmarc-1.3.0.ebuild | 12 +- media-gfx/iscan-data/Manifest | 1 + .../iscan-data/iscan-data-1.36.0.1.ebuild | 47 +++ .../cinelerra/cinelerra-20140710.ebuild | 5 +- .../files/cinelerra-nofindobject.patch | 16 + metadata/dtd/timestamp.chk | 2 +- metadata/glsa/timestamp.chk | 2 +- .../{bash-4.4_alpha => bash-4.4_alpha-r1} | 2 +- .../dev-games/openscenegraph-3.0.1-r1 | 13 - .../dev-games/openscenegraph-3.2.1-r1 | 14 + metadata/md5-cache/dev-lang/php-5.5.26 | 4 +- metadata/md5-cache/dev-lang/php-5.6.10 | 4 +- metadata/md5-cache/dev-libs/cloog-0.18.3 | 4 +- metadata/md5-cache/dev-libs/crypto++-5.6.2-r2 | 4 +- metadata/md5-cache/dev-libs/nspr-4.10.8 | 4 +- metadata/md5-cache/dev-libs/nss-3.19.2 | 4 +- .../dev-python/keystonemiddleware-1.5.2 | 2 +- metadata/md5-cache/dev-qt/qtwebkit-5.4.2 | 2 +- metadata/md5-cache/dev-ruby/redcloth-4.2.9-r3 | 4 +- .../md5-cache/dev-util/kdevelop-qmljs-1.7.0 | 13 + metadata/md5-cache/mail-client/sylpheed-3.4.2 | 4 +- .../md5-cache/mail-filter/opendmarc-1.3.0 | 5 +- .../md5-cache/media-gfx/iscan-data-1.36.0.1 | 12 + .../md5-cache/media-video/cinelerra-20140710 | 2 +- metadata/md5-cache/net-analyzer/cacti-0.8.8e | 4 +- metadata/md5-cache/net-dns/bind-9.10.2_p2 | 4 +- .../md5-cache/net-dns/bind-tools-9.10.2_p2 | 4 +- metadata/md5-cache/net-misc/curl-7.43.0 | 4 +- metadata/md5-cache/net-misc/ntp-4.2.8_p3 | 4 +- metadata/md5-cache/net-print/cups-2.0.3 | 4 +- .../md5-cache/net-print/cups-filters-1.0.71 | 2 +- metadata/md5-cache/net-proxy/squid-3.5.6 | 4 +- .../md5-cache/net-wireless/hostapd-2.4-r3 | 13 + .../net-wireless/wpa_supplicant-2.4-r4 | 14 + metadata/md5-cache/sys-apps/less-478 | 4 +- metadata/md5-cache/sys-auth/polkit-0.113 | 4 +- metadata/md5-cache/sys-libs/pam-1.2.1 | 4 +- .../{thermald-1.4.2 => thermald-1.4.2-r1} | 2 +- .../www-plugins/freshplayerplugin-0.2.3 | 13 - .../www-plugins/freshplayerplugin-0.3.1 | 13 + metadata/news/timestamp.chk | 2 +- metadata/timestamp | 2 +- metadata/timestamp.chk | 2 +- metadata/timestamp.x | 2 +- net-analyzer/cacti/cacti-0.8.8e.ebuild | 4 +- net-analyzer/icinga2/files/icinga2.confd | 1 + .../bind-tools/bind-tools-9.10.2_p2.ebuild | 4 +- net-dns/bind/bind-9.10.2_p2.ebuild | 4 +- net-misc/curl/curl-7.43.0.ebuild | 4 +- net-misc/ntp/ntp-4.2.8_p3.ebuild | 4 +- .../cups-filters/cups-filters-1.0.71.ebuild | 4 +- .../cups-filters-1.0.71-poppler0340.patch | 38 ++ net-print/cups/cups-2.0.3.ebuild | 4 +- net-proxy/squid/squid-3.5.6.ebuild | 4 +- ...oid-misaligned-read-of-an-NDEF-field.patch | 29 ++ ...length-validation-in-NDEF-record-par.patch | 61 +++ net-wireless/hostapd/hostapd-2.4-r3.ebuild | 224 ++++++++++ ...oid-misaligned-read-of-an-NDEF-field.patch | 29 ++ ...length-validation-in-NDEF-record-par.patch | 61 +++ .../wpa_supplicant-2.4-r4.ebuild | 387 ++++++++++++++++++ profiles/use.local.desc | 1 + sys-apps/less/less-478.ebuild | 4 +- sys-auth/polkit/polkit-0.113.ebuild | 4 +- sys-libs/pam/pam-1.2.1.ebuild | 4 +- .../files/thermald-1.4.2-terminate-r1.patch | 65 +++ .../files/thermald-1.4.2-terminate.patch | 34 -- ...-1.4.2.ebuild => thermald-1.4.2-r1.ebuild} | 4 +- www-plugins/freshplayerplugin/Manifest | 2 +- .../files/with-pulseaudio-cmake.patch | 27 -- ....ebuild => freshplayerplugin-0.3.1.ebuild} | 22 +- 93 files changed, 1349 insertions(+), 832 deletions(-) rename app-shells/bash/{bash-4.4_alpha.ebuild => bash-4.4_alpha-r1.ebuild} (98%) create mode 100644 app-shells/bash/files/bash-4.4-optimize-fork.patch delete mode 100644 dev-games/openscenegraph/files/openscenegraph-3.0.1-cmake.patch delete mode 100644 dev-games/openscenegraph/files/openscenegraph-3.0.1-libav-0.7.patch delete mode 100644 dev-games/openscenegraph/files/openscenegraph-3.0.1-libav-9.patch delete mode 100644 dev-games/openscenegraph/files/openscenegraph-3.0.1-xinelib12x.patch rename dev-games/openscenegraph/{openscenegraph-3.0.1-r1.ebuild => openscenegraph-3.2.1-r1.ebuild} (74%) create mode 100644 dev-libs/cloog/files/cloog-0.18.3-isl-0.15.patch create mode 100644 dev-util/kdevelop-qmljs/Manifest create mode 100644 dev-util/kdevelop-qmljs/kdevelop-qmljs-1.7.0.ebuild create mode 100644 dev-util/kdevelop-qmljs/metadata.xml create mode 100644 media-gfx/iscan-data/iscan-data-1.36.0.1.ebuild create mode 100644 media-video/cinelerra/files/cinelerra-nofindobject.patch rename metadata/md5-cache/app-shells/{bash-4.4_alpha => bash-4.4_alpha-r1} (95%) delete mode 100644 metadata/md5-cache/dev-games/openscenegraph-3.0.1-r1 create mode 100644 metadata/md5-cache/dev-games/openscenegraph-3.2.1-r1 create mode 100644 metadata/md5-cache/dev-util/kdevelop-qmljs-1.7.0 create mode 100644 metadata/md5-cache/media-gfx/iscan-data-1.36.0.1 create mode 100644 metadata/md5-cache/net-wireless/hostapd-2.4-r3 create mode 100644 metadata/md5-cache/net-wireless/wpa_supplicant-2.4-r4 rename metadata/md5-cache/sys-power/{thermald-1.4.2 => thermald-1.4.2-r1} (95%) delete mode 100644 metadata/md5-cache/www-plugins/freshplayerplugin-0.2.3 create mode 100644 metadata/md5-cache/www-plugins/freshplayerplugin-0.3.1 create mode 100644 net-print/cups-filters/files/cups-filters-1.0.71-poppler0340.patch create mode 100644 net-wireless/hostapd/files/2015-5/0001-NFC-Avoid-misaligned-read-of-an-NDEF-field.patch create mode 100644 net-wireless/hostapd/files/2015-5/0002-NFC-Fix-payload-length-validation-in-NDEF-record-par.patch create mode 100644 net-wireless/hostapd/hostapd-2.4-r3.ebuild create mode 100644 net-wireless/wpa_supplicant/files/2015-5/0001-NFC-Avoid-misaligned-read-of-an-NDEF-field.patch create mode 100644 net-wireless/wpa_supplicant/files/2015-5/0002-NFC-Fix-payload-length-validation-in-NDEF-record-par.patch create mode 100644 net-wireless/wpa_supplicant/wpa_supplicant-2.4-r4.ebuild create mode 100644 sys-power/thermald/files/thermald-1.4.2-terminate-r1.patch delete mode 100644 sys-power/thermald/files/thermald-1.4.2-terminate.patch rename sys-power/thermald/{thermald-1.4.2.ebuild => thermald-1.4.2-r1.ebuild} (91%) delete mode 100644 www-plugins/freshplayerplugin/files/with-pulseaudio-cmake.patch rename www-plugins/freshplayerplugin/{freshplayerplugin-0.2.3.ebuild => freshplayerplugin-0.3.1.ebuild} (72%) diff --git a/app-shells/bash/bash-4.4_alpha.ebuild b/app-shells/bash/bash-4.4_alpha-r1.ebuild similarity index 98% rename from app-shells/bash/bash-4.4_alpha.ebuild rename to app-shells/bash/bash-4.4_alpha-r1.ebuild index 508490d8c17b..d83e0409ed65 100644 --- a/app-shells/bash/bash-4.4_alpha.ebuild +++ b/app-shells/bash/bash-4.4_alpha-r1.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-shells/bash/bash-4.4_alpha.ebuild,v 1.1 2015/07/13 04:30:45 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.4_alpha-r1.ebuild,v 1.1 2015/07/15 04:29:14 vapier Exp $ EAPI="5" @@ -85,6 +85,8 @@ src_prepare() { sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die touch -r . doc/* + epatch "${FILESDIR}"/${PN}-4.4-optimize-fork.patch + epatch_user } diff --git a/app-shells/bash/files/bash-4.4-optimize-fork.patch b/app-shells/bash/files/bash-4.4-optimize-fork.patch new file mode 100644 index 000000000000..98e83be12f8e --- /dev/null +++ b/app-shells/bash/files/bash-4.4-optimize-fork.patch @@ -0,0 +1,16 @@ +https://lists.gnu.org/archive/html/bug-bash/2015-07/msg00060.html + +*** ../bash-4.4-alpha/execute_cmd.c 2015-06-12 17:29:18.000000000 -0400 +--- execute_cmd.c 2015-07-14 08:59:22.000000000 -0400 +*************** +*** 2630,2638 **** + if (ignore_return && second) + second->flags |= CMD_IGNORE_RETURN; +- if (should_suppress_fork (second)) +- { +- second->flags |= CMD_NO_FORK; +- second->value.Simple->flags |= CMD_NO_FORK; +- } + + exec_result = execute_command (second); +--- 2630,2633 ---- diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest index 1408e30d0f95..c4dd9df1a3ec 100644 --- a/dev-games/openscenegraph/Manifest +++ b/dev-games/openscenegraph/Manifest @@ -1,2 +1 @@ -DIST OpenSceneGraph-3.0.1.zip 6780282 SHA256 0c1103574b0a5a27c7d68d43454f1bf9c0cea114a583c42637bc8eb47b1d8296 SHA512 5fbfe9070721f055349a27516c9a20195070d13ab562e0c5109cc1f1d46dfaf09778152a14f5815b72728d315cb80b2d7bab747bfd9be58aea22d600c2c97912 WHIRLPOOL e3e24e2b36fd59a823d43864e7123d3683a8b2ef4e09cae17895d4b15eb4321bdd112cd59a734e1e55924cc9af52198c6152797bd73ab33a91bf17936232a7b0 DIST OpenSceneGraph-3.2.1.zip 7219212 SHA256 d9ae72263d0191855b0f804d93c586d489f119aca0499292acc09bb0fa0b3e6d SHA512 f7bd9aedd3a1f48094a0ad95d267c2f2c946b042f7459d6b33e6038a4b16aeda9cfd69f339ea0a2a478dadadf1875313a4132564b8fcade5ad93511ecd8c1a9e WHIRLPOOL ef47a41a316fae86341cdebecaeceb41cf56b5f11fdf93e8218bb9aa9eaa28fc2fc9122efbeb8dce69fa01d8c8b6a2460fab69190714ca53abfa5d347a0ae1bc diff --git a/dev-games/openscenegraph/files/openscenegraph-3.0.1-cmake.patch b/dev-games/openscenegraph/files/openscenegraph-3.0.1-cmake.patch deleted file mode 100644 index 9cc4f4e103c6..000000000000 --- a/dev-games/openscenegraph/files/openscenegraph-3.0.1-cmake.patch +++ /dev/null @@ -1,293 +0,0 @@ -diff -ruN OpenSceneGraph-3.0.1/CMakeLists.txt new/CMakeLists.txt ---- OpenSceneGraph-3.0.1/CMakeLists.txt 2011-07-31 09:50:34.000000000 +0200 -+++ new/CMakeLists.txt 2014-02-11 23:12:54.360448879 +0100 -@@ -421,6 +421,7 @@ - - # INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}") - -+INCLUDE(MacroOptionalFindPackage) - - ################################################################################ - # Set Version Info resource file -@@ -450,30 +451,30 @@ - ANDROID_3RD_PARTY() - ELSE() - # Common to all platforms except android: -- FIND_PACKAGE(FreeType) -- FIND_PACKAGE(Inventor) -- FIND_PACKAGE(Jasper) -- FIND_PACKAGE(OpenEXR) -- FIND_PACKAGE(COLLADA) -- FIND_PACKAGE(FBX) -- FIND_PACKAGE(ZLIB) -- FIND_PACKAGE(Xine) -- FIND_PACKAGE(OpenVRML) -- FIND_PACKAGE(Performer) -- FIND_PACKAGE(GDAL) -- FIND_PACKAGE(CURL) -- FIND_PACKAGE(ITK) -- FIND_PACKAGE(LibVNCServer) -- FIND_PACKAGE(OurDCMTK) -- FIND_PACKAGE(OpenAL) -- FIND_PACKAGE(FFmpeg) -+MACRO_OPTIONAL_FIND_PACKAGE(FreeType) -+MACRO_OPTIONAL_FIND_PACKAGE(Inventor) -+MACRO_OPTIONAL_FIND_PACKAGE(Jasper) -+MACRO_OPTIONAL_FIND_PACKAGE(OpenEXR) -+MACRO_OPTIONAL_FIND_PACKAGE(COLLADA) -+MACRO_OPTIONAL_FIND_PACKAGE(FBX) -+MACRO_OPTIONAL_FIND_PACKAGE(ZLIB) -+MACRO_OPTIONAL_FIND_PACKAGE(Xine) -+MACRO_OPTIONAL_FIND_PACKAGE(OpenVRML) -+MACRO_OPTIONAL_FIND_PACKAGE(Performer) -+MACRO_OPTIONAL_FIND_PACKAGE(GDAL) -+MACRO_OPTIONAL_FIND_PACKAGE(CURL) -+MACRO_OPTIONAL_FIND_PACKAGE(ITK) -+MACRO_OPTIONAL_FIND_PACKAGE(LibVNCServer) -+MACRO_OPTIONAL_FIND_PACKAGE(OurDCMTK) -+MACRO_OPTIONAL_FIND_PACKAGE(OpenAL) -+MACRO_OPTIONAL_FIND_PACKAGE(FFmpeg) - FIND_PACKAGE(DirectShow) -- FIND_PACKAGE(SDL) -- FIND_PACKAGE(Poppler-glib) -- FIND_PACKAGE(RSVG) -- FIND_PACKAGE(GtkGl) -+MACRO_OPTIONAL_FIND_PACKAGE(SDL) -+MACRO_OPTIONAL_FIND_PACKAGE(Poppler-glib) -+MACRO_OPTIONAL_FIND_PACKAGE(RSVG) -+MACRO_OPTIONAL_FIND_PACKAGE(GtkGl) - FIND_PACKAGE(DirectInput) -- FIND_PACKAGE(NVTT) -+MACRO_OPTIONAL_FIND_PACKAGE(NVTT) - ENDIF() - - # Include macro utilities here -@@ -485,17 +486,17 @@ - IF (DESIRED_QT_VERSION) - - IF (DESIRED_QT_VERSION MATCHES 4) -- FIND_PACKAGE(Qt4) -+ MACRO_OPTIONAL_FIND_PACKAGE(Qt4) - ELSE() -- FIND_PACKAGE(Qt3) -+ MACRO_OPTIONAL_FIND_PACKAGE(Qt3) - ENDIF() - - ELSE() - -- FIND_PACKAGE(Qt4) -+ MACRO_OPTIONAL_FIND_PACKAGE(Qt4) - - IF (NOT QT4_FOUND) -- FIND_PACKAGE(Qt3) -+ MACRO_OPTIONAL_FIND_PACKAGE(Qt3) - ENDIF() - - ENDIF() -@@ -504,12 +505,12 @@ - IF (BUILD_OSG_EXAMPLES AND NOT ANDROID) - - -- FIND_PACKAGE(FLTK) -- FIND_PACKAGE(GLUT) -- FIND_PACKAGE(FOX) -+ MACRO_OPTIONAL_FIND_PACKAGE(FLTK) -+ MACRO_OPTIONAL_FIND_PACKAGE(GLUT) -+ MACRO_OPTIONAL_FIND_PACKAGE(FOX) - - SET(wxWidgets_USE_LIBS base core gl net) -- FIND_PACKAGE(wxWidgets) -+ MACRO_OPTIONAL_FIND_PACKAGE(wxWidgets) - - ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID) - -@@ -530,10 +531,10 @@ - # can use Quicktime. - IF(NOT ANDROID) - IF(NOT APPLE) -- FIND_PACKAGE(GIFLIB) -- FIND_PACKAGE(JPEG) -- FIND_PACKAGE(PNG) -- FIND_PACKAGE(TIFF) -+ MACRO_OPTIONAL_FIND_PACKAGE(GIFLIB) -+ MACRO_OPTIONAL_FIND_PACKAGE(JPEG) -+ MACRO_OPTIONAL_FIND_PACKAGE(PNG) -+ MACRO_OPTIONAL_FIND_PACKAGE(TIFF) - - # QuickTime is required for OS X, but optional for Windows. - IF(WIN32) -@@ -586,15 +587,7 @@ - SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG") - ENDIF() - --IF(UNIX AND NOT WIN32 AND NOT APPLE) -- IF(CMAKE_SIZEOF_VOID_P MATCHES "8") -- SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement") -- MARK_AS_ADVANCED(LIB_POSTFIX) -- ENDIF() --ENDIF() --IF(NOT DEFINED LIB_POSTFIX) -- SET(LIB_POSTFIX "") --ENDIF() -+SET(LIB_POSTFIX ${LIB_SUFFIX}) - - # Here we apparantly do some funky stuff with making the bin/ and lib/ - # folders which is probably needed to work around a very old CMake bug? -@@ -884,7 +877,7 @@ - ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY - ) - #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc) -- INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc) -+ INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION ${GENTOO_DOCDIR} COMPONENT openscenegraph-doc) - - # now set up openthreads documentation generation - IF(BUILD_REF_DOCS_TAGFILE) -@@ -900,7 +893,7 @@ - ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY - ) - #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc) -- INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc COMPONENT openthreads-doc) -+ INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION ${GENTOO_DOCDIR} COMPONENT openthreads-doc) - - # Process our other doxyfiles but don't create targets for these - CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile -diff -ruN OpenSceneGraph-3.0.1/CMakeModules/COPYING-CMAKE-SCRIPTS new/CMakeModules/COPYING-CMAKE-SCRIPTS ---- OpenSceneGraph-3.0.1/CMakeModules/COPYING-CMAKE-SCRIPTS 1970-01-01 01:00:00.000000000 +0100 -+++ new/CMakeModules/COPYING-CMAKE-SCRIPTS 2014-02-11 23:12:31.241449702 +0100 -@@ -0,0 +1,22 @@ -+Redistribution and use in source and binary forms, with or without -+modification, are permitted provided that the following conditions -+are met: -+ -+1. Redistributions of source code must retain the copyright -+ notice, this list of conditions and the following disclaimer. -+2. Redistributions in binary form must reproduce the copyright -+ notice, this list of conditions and the following disclaimer in the -+ documentation and/or other materials provided with the distribution. -+3. The name of the author may not be used to endorse or promote products -+ derived from this software without specific prior written permission. -+ -+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -diff -ruN OpenSceneGraph-3.0.1/CMakeModules/FindFLTK.cmake new/CMakeModules/FindFLTK.cmake ---- OpenSceneGraph-3.0.1/CMakeModules/FindFLTK.cmake 2010-11-11 17:51:46.000000000 +0100 -+++ new/CMakeModules/FindFLTK.cmake 1970-01-01 01:00:00.000000000 +0100 -@@ -1,52 +0,0 @@ --# Locate FLTK --# This module defines --# FLTK_LIBRARY --# FLTK_FOUND, if false, do not try to link to gdal --# FLTK_INCLUDE_DIR, where to find the headers --# --# $FLTK_DIR is an environment variable that would --# correspond to the ./configure --prefix=$FLTK_DIR --# --# Created by Robert Osfield. -- --FIND_PATH(FLTK_INCLUDE_DIR Fl/Fl.H Fl/Fl.h -- $ENV{FLTK_DIR}/include -- $ENV{FLTK_DIR} -- ~/Library/Frameworks -- /Library/Frameworks -- /usr/local/include -- /usr/include -- /sw/include # Fink -- /opt/local/include # DarwinPorts -- /opt/csw/include # Blastwave -- /opt/include -- /usr/freeware/include --) -- --MACRO(FIND_FLTK_LIBRARY MYLIBRARY MYLIBRARYNAME) -- -- FIND_LIBRARY(${MYLIBRARY} -- NAMES ${MYLIBRARYNAME} -- PATHS -- $ENV{FLTK_DIR}/lib -- $ENV{FLTK_DIR} -- ~/Library/Frameworks -- /Library/Frameworks -- /usr/local/lib -- /usr/lib -- /sw/lib -- /opt/local/lib -- /opt/csw/lib -- /opt/lib -- /usr/freeware/lib64 -- ) -- --ENDMACRO(FIND_FLTK_LIBRARY LIBRARY LIBRARYNAME) -- --FIND_FLTK_LIBRARY(FLTK_LIBRARY fltk) --FIND_FLTK_LIBRARY(FLTK_GL_LIBRARY fltk_gl) -- --SET(FLTK_FOUND "NO") --IF(FLTK_LIBRARY AND FLTK_INCLUDE_DIR) -- SET(FLTK_FOUND "YES") --ENDIF(FLTK_LIBRARY AND FLTK_INCLUDE_DIR) -diff -ruN OpenSceneGraph-3.0.1/CMakeModules/MacroOptionalFindPackage.cmake new/CMakeModules/MacroOptionalFindPackage.cmake ---- OpenSceneGraph-3.0.1/CMakeModules/MacroOptionalFindPackage.cmake 1970-01-01 01:00:00.000000000 +0100 -+++ new/CMakeModules/MacroOptionalFindPackage.cmake 2014-02-11 23:12:31.256449701 +0100 -@@ -0,0 +1,28 @@ -+# - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION() -+# MACRO_OPTIONAL_FIND_PACKAGE( [QUIT] ) -+# This macro is a combination of OPTION() and FIND_PACKAGE(), it -+# works like FIND_PACKAGE(), but additionally it automatically creates -+# an option name WITH_, which can be disabled via the cmake GUI. -+# or via -DWITH_=OFF -+# The standard _FOUND variables can be used in the same way -+# as when using the normal FIND_PACKAGE() -+ -+# Copyright (c) 2006, Alexander Neundorf, -+# -+# Redistribution and use is allowed according to the terms of the BSD license. -+# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -+ -+ -+macro (MACRO_OPTIONAL_FIND_PACKAGE _name ) -+ option(WITH_${_name} "Search for ${_name} package" ON) -+ if (WITH_${_name}) -+ find_package(${_name} ${ARGN}) -+ else (WITH_${_name}) -+ set(${_name}_FOUND) -+ set(${_name}_INCLUDE_DIR) -+ set(${_name}_INCLUDES) -+ set(${_name}_LIBRARY) -+ set(${_name}_LIBRARIES) -+ endif (WITH_${_name}) -+endmacro (MACRO_OPTIONAL_FIND_PACKAGE) -+ -diff -ruN OpenSceneGraph-3.0.1/CMakeModules/OsgMacroUtils.cmake new/CMakeModules/OsgMacroUtils.cmake ---- OpenSceneGraph-3.0.1/CMakeModules/OsgMacroUtils.cmake 2011-04-21 19:16:27.000000000 +0200 -+++ new/CMakeModules/OsgMacroUtils.cmake 2014-02-11 23:12:31.280449700 +0100 -@@ -445,9 +445,9 @@ - SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES FOLDER "Examples") - - IF(APPLE) -- INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin ) -+ INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin BUNDLE DESTINATION bin) - ELSE(APPLE) -- INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples ) -+ INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin COMPONENT openscenegraph-examples ) - ENDIF(APPLE) - - ENDMACRO(SETUP_EXAMPLE) -diff -ruN OpenSceneGraph-3.0.1/examples/osgviewerFLTK/CMakeLists.txt new/examples/osgviewerFLTK/CMakeLists.txt ---- OpenSceneGraph-3.0.1/examples/osgviewerFLTK/CMakeLists.txt 2007-06-25 10:35:06.000000000 +0200 -+++ new/examples/osgviewerFLTK/CMakeLists.txt 2014-02-11 23:12:31.331449698 +0100 -@@ -1,6 +1,6 @@ - SET(TARGET_SRC osgviewerFLTK.cpp ) - --SET(TARGET_EXTERNAL_LIBRARIES ${FLTK_LIBRARY} ${FLTK_GL_LIBRARY}) -+SET(TARGET_EXTERNAL_LIBRARIES ${FLTK_BASE_LIBRARY} ${FLTK_GL_LIBRARY}) - - INCLUDE_DIRECTORIES(${FLTK_INCLUDE_DIR} ) - diff --git a/dev-games/openscenegraph/files/openscenegraph-3.0.1-libav-0.7.patch b/dev-games/openscenegraph/files/openscenegraph-3.0.1-libav-0.7.patch deleted file mode 100644 index 4748cd48c807..000000000000 --- a/dev-games/openscenegraph/files/openscenegraph-3.0.1-libav-0.7.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ruN OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp my/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp ---- OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp 2011-06-17 10:41:56.000000000 +0200 -+++ my/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp 2011-11-17 19:44:33.194607494 +0100 -@@ -9,12 +9,13 @@ - #define FF_API_OLD_SAMPLE_FMT 0 - #include // for error codes defined in avformat.h - #include --#include --#include --#include -+#include -+#include -+#include -+#include - --#ifdef USE_SWSCALE -- #include -+#ifdef USE_SWSCALE -+ #include - #endif - - } diff --git a/dev-games/openscenegraph/files/openscenegraph-3.0.1-libav-9.patch b/dev-games/openscenegraph/files/openscenegraph-3.0.1-libav-9.patch deleted file mode 100644 index 018570f02dd5..000000000000 --- a/dev-games/openscenegraph/files/openscenegraph-3.0.1-libav-9.patch +++ /dev/null @@ -1,284 +0,0 @@ -Patch by lu_zero -https://bugs.gentoo.org/show_bug.cgi?id=439606 -upstream svn rev. 13335 contains similar changes. -no need to upstream this patch. - -diff -burN OpenSceneGraph-3.0.1.old//CMakeModules/FindFFmpeg.cmake OpenSceneGraph-3.0.1/CMakeModules/FindFFmpeg.cmake ---- OpenSceneGraph-3.0.1.old//CMakeModules/FindFFmpeg.cmake 2011-04-19 13:40:22.000000000 +0200 -+++ OpenSceneGraph-3.0.1/CMakeModules/FindFFmpeg.cmake 2012-11-22 13:59:28.303401170 +0100 -@@ -131,20 +131,16 @@ - SET(FFMPEG_FOUND "YES") - - SET(FFMPEG_INCLUDE_DIRS -- ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS} ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS}/libavformat -- ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS} ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS}/libavdevice -- ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS} ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS}/libavcodec -- ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS} ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS}/libavutil -+ ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS} -+ ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS} -+ ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS} -+ ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS} - ) - - IF (FFMPEG_STDINT_INCLUDE_DIR) - SET(FFMPEG_INCLUDE_DIRS - ${FFMPEG_INCLUDE_DIRS} - ${FFMPEG_STDINT_INCLUDE_DIR} -- ${FFMPEG_STDINT_INCLUDE_DIR}/libavformat -- ${FFMPEG_STDINT_INCLUDE_DIR}/libavdevice -- ${FFMPEG_STDINT_INCLUDE_DIR}/libavcodec -- ${FFMPEG_STDINT_INCLUDE_DIR}/libavutil - ) - ENDIF() - -diff -burN OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp ---- OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp 2011-04-19 13:40:22.000000000 +0200 -+++ OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp 2012-11-22 15:03:53.668601596 +0100 -@@ -89,7 +89,7 @@ - // m_context->flags |= CODEC_FLAG_TRUNCATED; - - // Open codec -- if (avcodec_open(m_context, p_codec) < 0) -+ if (avcodec_open2(m_context, p_codec, NULL) < 0) - throw std::runtime_error("avcodec_open() failed"); - } - -Binary files OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/.FFmpegDecoderAudio.cpp.swp and OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/.FFmpegDecoderAudio.cpp.swp differ -diff -burN OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegDecoder.cpp OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp ---- OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegDecoder.cpp 2011-07-15 12:25:12.000000000 +0200 -+++ OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp 2012-11-22 15:59:39.569775078 +0100 -@@ -64,21 +64,12 @@ - - OSG_NOTICE<<"Attempting to stream "<getFormat() : 0); -- AVFormatParameters* av_params = (parameters ? parameters->getFormatParameter() : 0); -- if (av_open_input_file(&p_format_context, filename.c_str(), av_format, 0, av_params) !=0 ) -+ AVDictionary* av_options = (parameters ? parameters->getOptions() : NULL); -+ if (avformat_open_input(&p_format_context, filename.c_str(), av_format, &av_options) !=0 ) - throw std::runtime_error("av_open_input_file() failed"); - } - - m_format_context.reset(p_format_context); - - // Retrieve stream info -- if (av_find_stream_info(p_format_context) < 0) -+ if (avformat_find_stream_info(p_format_context, NULL) < 0) - throw std::runtime_error("av_find_stream_info() failed"); - - m_duration = double(m_format_context->duration) / AV_TIME_BASE; -@@ -134,7 +125,7 @@ - m_clocks.reset(m_start); - - // Dump info to stderr -- dump_format(p_format_context, 0, filename.c_str(), false); -+ av_dump_format(p_format_context, 0, filename.c_str(), false); - - // Find and open the first video and audio streams (note that audio stream is optional and only opened if possible) - -@@ -292,7 +283,7 @@ - // Read the next frame packet - if (av_read_frame(m_format_context.get(), &packet) < 0) - { -- if (url_ferror(m_format_context->pb) == 0) -+ if (m_format_context->pb->eof_reached == 0) - end_of_stream = true; - else - throw std::runtime_error("av_read_frame() failed"); -Binary files OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/.FFmpegDecoder.cpp.swp and OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/.FFmpegDecoder.cpp.swp differ -diff -burN OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegDecoder.hpp OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegDecoder.hpp ---- OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegDecoder.hpp 2011-04-19 13:40:22.000000000 +0200 -+++ OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegDecoder.hpp 2012-11-22 15:59:18.895774005 +0100 -@@ -46,8 +46,8 @@ - { - if (_ptr) - { -- OSG_NOTICE<<"Calling av_close_input_file("<<_ptr<<")"<timestamp; -- else return HUGE_VAL; -+ return HUGE_VAL; - } - - inline double FFmpegDecoder::duration() const -diff -burN OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp ---- OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp 2011-04-19 13:40:22.000000000 +0200 -+++ OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp 2012-11-22 16:01:30.906780849 +0100 -@@ -83,7 +83,7 @@ - m_context = stream->codec; - - // Trust the video size given at this point -- // (avcodec_open seems to sometimes return a 0x0 size) -+ // (avcodec_open2 seems to sometimes return a 0x0 size) - m_width = m_context->width; - m_height = m_context->height; - findAspectRatio(); -@@ -105,8 +105,8 @@ - // m_context->flags |= CODEC_FLAG_TRUNCATED; - - // Open codec -- if (avcodec_open(m_context, m_codec) < 0) -- throw std::runtime_error("avcodec_open() failed"); -+ if (avcodec_open2(m_context, m_codec, NULL) < 0) -+ throw std::runtime_error("avcodec_open2() failed"); - - // Allocate video frame - m_frame.reset(avcodec_alloc_frame()); -Binary files OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/.FFmpegDecoderVideo.cpp.swp and OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/.FFmpegDecoderVideo.cpp.swp differ -diff -burN OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegParameters.cpp OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegParameters.cpp ---- OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegParameters.cpp 2011-07-15 12:25:12.000000000 +0200 -+++ OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegParameters.cpp 2012-11-22 17:20:09.019025477 +0100 -@@ -8,7 +8,7 @@ - #if LIBAVCODEC_VERSION_MAJOR >= 53 - extern "C" - { -- #include -+ #include - } - #define av_parse_video_frame_size av_parse_video_size - #define av_parse_video_frame_rate av_parse_video_rate -@@ -19,7 +19,7 @@ - - extern "C" - { -- #include -+ #include - } - - inline PixelFormat osg_av_get_pix_fmt(const char *name) { return av_get_pix_fmt(name); } -@@ -34,14 +34,15 @@ - - - FFmpegParameters::FFmpegParameters() : -- m_format(0) --{ -- memset(&m_parameters, 0, sizeof(m_parameters)); --} -+ m_format(0), -+ m_options(NULL) -+{} - - - FFmpegParameters::~FFmpegParameters() --{} -+{ -+ av_dict_free(&m_options); -+} - - - void FFmpegParameters::parse(const std::string& name, const std::string& value) -@@ -59,40 +60,19 @@ - } - else if (name == "pixel_format") - { -- m_parameters.pix_fmt = osg_av_get_pix_fmt(value.c_str()); -+ av_dict_set(&m_options, "pixel_format", value.c_str(), 0); - } - else if (name == "frame_size") - { -- int frame_width = 0, frame_height = 0; -- if (av_parse_video_frame_size(&frame_width, &frame_height, value.c_str()) < 0) -- { -- OSG_NOTICE<<"Failed to apply frame size: "<> audio_sample_rate; -- m_parameters.sample_rate = audio_sample_rate; -+ av_dict_set(&m_options, "sample_rate", value.c_str(), 0); - } - } - -diff -burN OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegParameters.hpp OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegParameters.hpp ---- OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegParameters.hpp 2011-04-19 13:40:22.000000000 +0200 -+++ OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegParameters.hpp 2012-11-22 15:23:27.490662455 +0100 -@@ -21,14 +21,14 @@ - bool isFormatAvailable() const { return m_format!=NULL; } - - AVInputFormat* getFormat() { return m_format; } -- AVFormatParameters* getFormatParameter() { return &m_parameters; } -+ AVDictionary* getOptions() { return m_options; } - - void parse(const std::string& name, const std::string& value); - - protected: - - AVInputFormat* m_format; -- AVFormatParameters m_parameters; -+ AVDictionary* m_options; - }; - - diff --git a/dev-games/openscenegraph/files/openscenegraph-3.0.1-xinelib12x.patch b/dev-games/openscenegraph/files/openscenegraph-3.0.1-xinelib12x.patch deleted file mode 100644 index a69a6604e003..000000000000 --- a/dev-games/openscenegraph/files/openscenegraph-3.0.1-xinelib12x.patch +++ /dev/null @@ -1,19 +0,0 @@ -http://bugs.gentoo.org/397643 - ---- src/osgPlugins/xine/video_out_rgb.c -+++ src/osgPlugins/xine/video_out_rgb.c -@@ -2769,8 +2769,14 @@ init_class(xine_t* xine, void* vo_visual - clear(rgb_class, sizeof(rgbout_class_t)); - - rgb_class->driver_class.open_plugin = open_plugin; -+#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) - rgb_class->driver_class.get_identifier = get_identifier; - rgb_class->driver_class.get_description = get_description; -+#else -+ rgb_class->driver_class.identifier = get_identifier(NULL); -+ rgb_class->driver_class.description = get_description(NULL); -+#endif -+ - rgb_class->driver_class.dispose = dispose_class; - - return(rgb_class); diff --git a/dev-games/openscenegraph/openscenegraph-3.0.1-r1.ebuild b/dev-games/openscenegraph/openscenegraph-3.2.1-r1.ebuild similarity index 74% rename from dev-games/openscenegraph/openscenegraph-3.0.1-r1.ebuild rename to dev-games/openscenegraph/openscenegraph-3.2.1-r1.ebuild index a52371802ebf..9ffe903f0357 100644 --- a/dev-games/openscenegraph/openscenegraph-3.0.1-r1.ebuild +++ b/dev-games/openscenegraph/openscenegraph-3.2.1-r1.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-games/openscenegraph/openscenegraph-3.0.1-r1.ebuild,v 1.5 2014/08/20 23:47:19 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/openscenegraph-3.2.1-r1.ebuild,v 1.1 2015/07/14 17:30:59 reavertm Exp $ EAPI=5 @@ -11,33 +11,33 @@ MY_P=${MY_PN}-${PV} DESCRIPTION="Open source high performance 3D graphics toolkit" HOMEPAGE="http://www.openscenegraph.org/projects/osg/" -SRC_URI="http://www.openscenegraph.org/downloads/stable_releases/${MY_P}/source/${MY_P}.zip" +SRC_URI="http://www.openscenegraph.org/downloads/developer_releases/${MY_P}.zip" LICENSE="wxWinLL-3 LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="curl debug doc examples ffmpeg fltk fox gdal gif glut gtk jpeg jpeg2k -openexr openinventor osgapps pdf png qt4 sdl svg tiff truetype vnc wxwidgets +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="asio curl debug doc examples ffmpeg fltk fox gdal gif glut gtk jpeg jpeg2k +openexr openinventor osgapps pdf png qt4 qt5 sdl svg tiff truetype vnc wxwidgets xine xrandr zlib" -# NOTE: OpenAL (support missing) -# TODO: COLLADA, FBX, ITK, OpenVRML, Performer, DCMTK +REQUIRED_USE=" + qt4? ( !qt5 ) + qt5? ( !qt4 ) +" + +# TODO: COLLADA, FBX, GTA, ITK, OpenVRML, Performer, DCMTK RDEPEND=" x11-libs/libSM x11-libs/libXext virtual/glu virtual/opengl + asio? ( dev-cpp/asio ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) gtk? ( x11-libs/gtkglext ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-qt/qtopengl:4 - ) sdl? ( media-libs/libsdl ) wxwidgets? ( x11-libs/wxGTK[opengl,X] ) ) @@ -53,6 +53,17 @@ RDEPEND=" openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0 ) + qt4? ( + dev-qt/qtcore:4 + dev-qt/qtgui:4 + dev-qt/qtopengl:4 + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + dev-qt/qtwidgets:5 + ) svg? ( gnome-base/librsvg x11-libs/cairo @@ -77,10 +88,7 @@ S=${WORKDIR}/${MY_P} DOCS=(AUTHORS.txt ChangeLog NEWS.txt) PATCHES=( - "${FILESDIR}"/${PN}-3.0.1-cmake.patch - "${FILESDIR}"/${PN}-3.0.1-libav-0.7.patch - "${FILESDIR}"/${PN}-3.0.1-xinelib12x.patch - "${FILESDIR}"/${PN}-3.0.1-libav-9.patch + "${FILESDIR}"/${PN}-3.2.1-cmake.patch ) src_configure() { @@ -95,8 +103,8 @@ src_configure() { mycmakeargs=( -DDYNAMIC_OPENSCENEGRAPH=ON -DWITH_ITK=OFF - -DWITH_OpenAL=OFF # Commented out in buildsystem -DGENTOO_DOCDIR="/usr/share/doc/${PF}" + $(cmake-utils_use_with asio) $(cmake-utils_use_with curl) $(cmake-utils_use_build doc DOCUMENTATION) $(cmake-utils_use_build osgapps OSG_APPLICATIONS) @@ -114,17 +122,23 @@ src_configure() { $(cmake-utils_use_with openinventor Inventor) $(cmake-utils_use_with pdf Poppler-glib) $(cmake-utils_use_with png) - $(cmake-utils_use_with qt4) $(cmake-utils_use_with sdl) $(cmake-utils_use_with svg rsvg) $(cmake-utils_use_with tiff) - $(cmake-utils_use_with truetype FreeType) + $(cmake-utils_use_with truetype Freetype) $(cmake-utils_use_with vnc LibVNCServer) $(cmake-utils_use_with wxwidgets wxWidgets) $(cmake-utils_use_with xine) $(cmake-utils_use xrandr OSGVIEWER_USE_XRANDR) $(cmake-utils_use_with zlib) ) + if use qt4; then + mycmakeargs+=( -DOSG_USE_QT=ON -DDESIRED_QT_VERSION=4 ) + elif use qt5; then + mycmakeargs+=( -DOSG_USE_QT=ON -DDESIRED_QT_VERSION=5 ) + else + mycmakeargs+=( -DOSG_USE_QT=OFF ) + fi cmake-utils_src_configure } diff --git a/dev-lang/php/php-5.5.26.ebuild b/dev-lang/php/php-5.5.26.ebuild index cb17aaa23c47..1914454a52da 100644 --- a/dev-lang/php/php-5.5.26.ebuild +++ b/dev-lang/php/php-5.5.26.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.26.ebuild,v 1.4 2015/07/12 07:33:06 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.26.ebuild,v 1.5 2015/07/14 18:13:36 klausman Exp $ EAPI=5 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" function php_get_uri () { diff --git a/dev-lang/php/php-5.6.10.ebuild b/dev-lang/php/php-5.6.10.ebuild index 0795ee4ec937..9ff3c15da1d2 100644 --- a/dev-lang/php/php-5.6.10.ebuild +++ b/dev-lang/php/php-5.6.10.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.6.10.ebuild,v 1.4 2015/07/12 07:33:06 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.6.10.ebuild,v 1.5 2015/07/14 18:15:11 klausman Exp $ EAPI=5 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" function php_get_uri () { diff --git a/dev-libs/cloog/cloog-0.18.3.ebuild b/dev-libs/cloog/cloog-0.18.3.ebuild index 40eecd46073e..9388ae991bc6 100644 --- a/dev-libs/cloog/cloog-0.18.3.ebuild +++ b/dev-libs/cloog/cloog-0.18.3.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-libs/cloog/cloog-0.18.3.ebuild,v 1.3 2015/03/17 05:29:23 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/cloog/cloog-0.18.3.ebuild,v 1.4 2015/07/15 03:32:39 vapier Exp $ EAPI="5" @@ -22,7 +22,7 @@ SLOT="0/4" IUSE="static-libs" RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}] - >=dev-libs/isl-0.14:0/14[${MULTILIB_USEDEP}] + >=dev-libs/isl-0.14:0=[${MULTILIB_USEDEP}] !dev-libs/cloog-ppl" DEPEND="${DEPEND} virtual/pkgconfig" @@ -38,6 +38,11 @@ src_prepare() { # sed to avoid eautoreconf sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die fi + + epatch "${FILESDIR}"/${P}-isl-0.15.patch + + # Make sure we always use the system isl. + rm -rf isl } multilib_src_configure() { diff --git a/dev-libs/cloog/files/cloog-0.18.3-isl-0.15.patch b/dev-libs/cloog/files/cloog-0.18.3-isl-0.15.patch new file mode 100644 index 000000000000..e28afddd48d7 --- /dev/null +++ b/dev-libs/cloog/files/cloog-0.18.3-isl-0.15.patch @@ -0,0 +1,85 @@ +add support for isl-0.15+ + +--- a/source/isl/domain.c ++++ b/source/isl/domain.c +@@ -68,25 +68,39 @@ + void cloog_domain_print_constraints(FILE *foo, CloogDomain *domain, + int print_number) + { ++ isl_printer *printer; + isl_basic_set *bset; + isl_set *set = isl_set_from_cloog_domain(domain); + +- if (print_number) +- isl_set_print(set, foo, 0, ISL_FORMAT_EXT_POLYLIB); +- else { ++ printer = isl_printer_to_file(isl_set_get_ctx(set), foo); ++ printer = isl_printer_set_indent(printer, 0); ++ printer = isl_printer_set_prefix(printer, NULL); ++ printer = isl_printer_set_suffix(printer, NULL); ++ ++ if (print_number) { ++ printer = isl_printer_set_output_format(printer, ISL_FORMAT_EXT_POLYLIB); ++ printer = isl_printer_print_set(printer, set); ++ } else { + assert(isl_set_n_basic_set(set) == 1); + bset = isl_set_copy_basic_set(set); +- isl_basic_set_print(bset, foo, +- 0, NULL, NULL, ISL_FORMAT_POLYLIB); ++ printer = isl_printer_set_output_format(printer, ISL_FORMAT_POLYLIB); ++ isl_printer_print_basic_set(printer, bset); + isl_basic_set_free(bset); + } ++ ++ isl_printer_free(printer); + } + + + void cloog_scattering_print_constraints(FILE *foo, CloogScattering *scattering) + { ++ isl_printer *printer; + isl_map *map = isl_map_from_cloog_scattering(scattering); +- isl_map_print(map, foo, 0, ISL_FORMAT_EXT_POLYLIB); ++ printer = isl_printer_to_file(isl_map_get_ctx(map), foo); ++ printer = isl_printer_set_indent(printer, 0); ++ printer = isl_printer_set_output_format(printer, ISL_FORMAT_EXT_POLYLIB); ++ printer = isl_printer_print_map(printer, map); ++ isl_printer_free(printer); + } + + +@@ -343,6 +357,7 @@ + void cloog_domain_print_structure(FILE *file, CloogDomain *domain, int level, + const char *name) + { ++ isl_printer *printer; + int i ; + isl_set *set = isl_set_from_cloog_domain(domain); + +@@ -358,7 +373,11 @@ + for (i = 0; i < level+1; ++i) + fprintf(file, "|\t"); + +- isl_set_print(set, file, 0, ISL_FORMAT_ISL); ++ printer = isl_printer_to_file(isl_set_get_ctx(set), file); ++ printer = isl_printer_set_indent(printer, 0); ++ printer = isl_printer_set_output_format(printer, ISL_FORMAT_EXT_POLYLIB); ++ printer = isl_printer_print_set(printer, set); ++ isl_printer_free(printer); + + fprintf(file, "\n"); + } + +https://groups.google.com/d/msg/isl-development/362AYAibze4/STY799KhdHMJ + +--- a/source/isl/constraints.c ++++ a/source/isl/constraints.c +@@ -438,6 +438,8 @@ + } + + ++/* Newer isl doesn't declare this in the headers, but it still exports the symbol ... */ ++extern struct isl_basic_set *isl_basic_set_dup(struct isl_basic_set *bset); + + /** + * cloog_constraint_set_copy function: diff --git a/dev-libs/crypto++/crypto++-5.6.2-r2.ebuild b/dev-libs/crypto++/crypto++-5.6.2-r2.ebuild index 1f878790708d..db7a9d92bba6 100644 --- a/dev-libs/crypto++/crypto++-5.6.2-r2.ebuild +++ b/dev-libs/crypto++/crypto++-5.6.2-r2.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-libs/crypto++/crypto++-5.6.2-r2.ebuild,v 1.4 2015/07/10 06:59:04 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/crypto++-5.6.2-r2.ebuild,v 1.5 2015/07/14 18:53:54 klausman Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/cryptopp/cryptopp${PV//.}.zip" LICENSE="Boost-1.0" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ppc ppc64 ~sparc x86 ~x64-macos" +KEYWORDS="alpha amd64 ~arm hppa ~ppc ppc64 ~sparc x86 ~x64-macos" IUSE="static-libs" DEPEND="app-arch/unzip diff --git a/dev-libs/nspr/nspr-4.10.8.ebuild b/dev-libs/nspr/nspr-4.10.8.ebuild index 51468395c582..326b1670c060 100644 --- a/dev-libs/nspr/nspr-4.10.8.ebuild +++ b/dev-libs/nspr/nspr-4.10.8.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-libs/nspr/nspr-4.10.8.ebuild,v 1.5 2015/07/09 05:50:04 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.8.ebuild,v 1.6 2015/07/14 15:30:02 klausman Exp $ EAPI=5 WANT_AUTOCONF="2.5" @@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="debug" RDEPEND=" diff --git a/dev-libs/nss/nss-3.19.2.ebuild b/dev-libs/nss/nss-3.19.2.ebuild index 08164155c5fc..468001190820 100644 --- a/dev-libs/nss/nss-3.19.2.ebuild +++ b/dev-libs/nss/nss-3.19.2.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-libs/nss/nss-3.19.2.ebuild,v 1.4 2015/07/09 05:50:06 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.19.2.ebuild,v 1.5 2015/07/14 15:29:53 klausman Exp $ EAPI=5 inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal @@ -19,7 +19,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME} LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="+cacert +nss-pem utils" CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]" diff --git a/dev-python/keystonemiddleware/keystonemiddleware-1.5.2.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-1.5.2.ebuild index a076e21017d3..e456a5ddd9c5 100644 --- a/dev-python/keystonemiddleware/keystonemiddleware-1.5.2.ebuild +++ b/dev-python/keystonemiddleware/keystonemiddleware-1.5.2.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/keystonemiddleware/keystonemiddleware-1.5.2.ebuild,v 1.1 2015/06/29 16:47:57 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/keystonemiddleware/keystonemiddleware-1.5.2.ebuild,v 1.2 2015/07/15 02:46:41 prometheanfire Exp $ EAPI=5 #PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) @@ -66,7 +66,7 @@ RDEPEND=">=dev-python/Babel-1.3[${PYTHON_USEDEP}] >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]" PATCHES=( -"${FILESDIR}/cve-2015-1852-master-keystonemiddleware.patch" + ) python_compile_all() { diff --git a/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild b/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild index 429c9c21562f..e2a25ce7b1c9 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.4.2.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-qt/qtwebkit/qtwebkit-5.4.2.ebuild,v 1.1 2015/06/17 15:24:04 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild,v 1.2 2015/07/15 01:37:03 pesa Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) @@ -70,6 +70,12 @@ src_prepare() { # ensure bundled library cannot be used rm -r Source/ThirdParty/leveldb || die + # bug 466216 + sed -i -e '/CONFIG +=/s/rpath//' \ + Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \ + Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf \ + || die + if use gstreamer010; then epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch" elif ! use gstreamer; then diff --git a/dev-ruby/redcloth/redcloth-4.2.9-r3.ebuild b/dev-ruby/redcloth/redcloth-4.2.9-r3.ebuild index c95b32dda0e6..4bbb4ac841c5 100644 --- a/dev-ruby/redcloth/redcloth-4.2.9-r3.ebuild +++ b/dev-ruby/redcloth/redcloth-4.2.9-r3.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-ruby/redcloth/redcloth-4.2.9-r3.ebuild,v 1.5 2015/07/11 07:50:46 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/redcloth/redcloth-4.2.9-r3.ebuild,v 1.6 2015/07/14 15:46:49 klausman Exp $ EAPI=5 @@ -28,7 +28,7 @@ RUBY_S="${GITHUB_USER}-${PN}-*" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" DEPEND+=" dev-util/ragel" diff --git a/dev-util/kdevelop-qmljs/Manifest b/dev-util/kdevelop-qmljs/Manifest new file mode 100644 index 000000000000..ae35ab5736ab --- /dev/null +++ b/dev-util/kdevelop-qmljs/Manifest @@ -0,0 +1 @@ +DIST kdev-qmljs-1.7.0.tar.xz 245968 SHA256 70927785de7791335eda43b55ef7742af7915425823d5f70b97edac1828681e1 SHA512 844f6dbf7f9f30a5361556edb7d7872250bb9999846b156465785d013c5be162e019019c364832d87f034c1d4ffdbf9f7ef5a1c7b54d676739776bdef1b13940 WHIRLPOOL 63fd36d00c966bdc6e957f004656d63bdc01f1f070a55d90130cb9f55398263526e08b2d6f2524aeb2dbcf15972463fc0bb2dade236c71a8feaacbd46e82e6d1 diff --git a/dev-util/kdevelop-qmljs/kdevelop-qmljs-1.7.0.ebuild b/dev-util/kdevelop-qmljs/kdevelop-qmljs-1.7.0.ebuild new file mode 100644 index 000000000000..a8c4cc4c7bd5 --- /dev/null +++ b/dev-util/kdevelop-qmljs/kdevelop-qmljs-1.7.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-qmljs/kdevelop-qmljs-1.7.0.ebuild,v 1.1 2015/07/14 20:52:52 johu Exp $ + +EAPI=5 + +KDEBASE="kdevelop" +KMNAME="kdev-qmljs" +KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl it kk nb nds nl pl +pt pt_BR ru sl sv uk zh_CN zh_TW" +MY_P="${KMNAME}-${PV}" + +inherit kde4-base + +DESCRIPTION="QML and javascrip plugin for KDevelop 4" +LICENSE="GPL-2 LGPL-2" +IUSE="debug" +SRC_URI="mirror://kde/stable/kdevelop/${KMNAME}/${PV}/src/${MY_P}.tar.xz" +KEYWORDS="~amd64 ~x86" + +S=${WORKDIR}/${MY_P} + +DEPEND=" + >=dev-util/kdevplatform-${PV}:4 +" +RDEPEND="${DEPEND} + dev-util/kdevelop:4 +" diff --git a/dev-util/kdevelop-qmljs/metadata.xml b/dev-util/kdevelop-qmljs/metadata.xml new file mode 100644 index 000000000000..a23f444b67d6 --- /dev/null +++ b/dev-util/kdevelop-qmljs/metadata.xml @@ -0,0 +1,5 @@ + + + + kde + diff --git a/mail-client/sylpheed/sylpheed-3.4.2.ebuild b/mail-client/sylpheed/sylpheed-3.4.2.ebuild index 3a99303ef0c9..1b0e6dcdf68d 100644 --- a/mail-client/sylpheed/sylpheed-3.4.2.ebuild +++ b/mail-client/sylpheed/sylpheed-3.4.2.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/mail-client/sylpheed/sylpheed-3.4.2.ebuild,v 1.4 2015/07/14 10:37:14 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-3.4.2.ebuild,v 1.5 2015/07/14 15:02:17 klausman Exp $ EAPI="5" @@ -12,7 +12,7 @@ SRC_URI="http://${PN}.sraoss.jp/${PN}/v${PV%.*}/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd" IUSE="crypt ipv6 ldap nls oniguruma pda spell ssl xface" CDEPEND="x11-libs/gtk+:2 diff --git a/mail-filter/opendmarc/metadata.xml b/mail-filter/opendmarc/metadata.xml index 7f6848f49a8d..628816488210 100644 --- a/mail-filter/opendmarc/metadata.xml +++ b/mail-filter/opendmarc/metadata.xml @@ -8,4 +8,8 @@ opendmarc + + Use the mail-filter/libspf2 + for Sender Policy Framework checking + diff --git a/mail-filter/opendmarc/opendmarc-1.3.0.ebuild b/mail-filter/opendmarc/opendmarc-1.3.0.ebuild index a253826cc13f..6df88a175b74 100644 --- a/mail-filter/opendmarc/opendmarc-1.3.0.ebuild +++ b/mail-filter/opendmarc/opendmarc-1.3.0.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/mail-filter/opendmarc/opendmarc-1.3.0.ebuild,v 1.1 2014/09/02 08:47:19 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendmarc/opendmarc-1.3.0.ebuild,v 1.2 2015/07/14 17:06:29 grobian Exp $ EAPI=5 @@ -13,12 +13,13 @@ SRC_URI="mirror://sourceforge/opendmarc/${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~x86 ~x86-fbsd" -IUSE="" +IUSE="spf" DEPEND="dev-perl/DBI || ( mail-filter/libmilter mail-mta/sendmail )" RDEPEND="${DEPEND} - dev-perl/Switch" + dev-perl/Switch + spf? ( mail-filter/libspf2 )" pkg_setup() { enewgroup milter @@ -28,7 +29,8 @@ pkg_setup() { src_configure() { econf \ --docdir="${EPREFIX}"/usr/share/doc/${PF} \ - --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html + --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ + $(use_with spf) } src_install() { diff --git a/media-gfx/iscan-data/Manifest b/media-gfx/iscan-data/Manifest index a316681f7bc5..ec4f92ad79ce 100644 --- a/media-gfx/iscan-data/Manifest +++ b/media-gfx/iscan-data/Manifest @@ -1 +1,2 @@ DIST iscan-data_1.22.0-1.tar.gz 96626 SHA256 e6ef1c275488d907869f48eb7889d9a01e564ea4b39e291e90843feb59e92ef8 SHA512 2adc6c125045803ffd269abab4f58d6d1c87ebd4c959985e6689d0b2e7f5a84fb1956d0e559c35b1704a1e330bc639e668c37f718c871e076a7ccf6c35562e6f WHIRLPOOL f4b7aaf68396c54295b40999653b4f1f8777d154e38ff1612a2458c2449570a6213fd41abeb13d6d06cba09828f8f35d485a6cce7303e8657a7ce87887657cc2 +DIST iscan-data_1.36.0-1.tar.gz 100218 SHA256 3a0a0075d0f7fcb0f482cbde2e74c9f6bee64268db32a4e6f470f1a6069117ba SHA512 a9711264c852dd4bdcdb10c1153f725a111bd74b03705c99265b6692bf47236c6e4f5e7e4813991eb5991deb198adeee272c8c3eb53da641ba189d923916d3cb WHIRLPOOL 5fc6bc042c7ee587e00b47f46f7b3ae3eba8646ac8c66ea5a1641d616f54fe75e7a1285b7146a4bba0e75bb88dae8c4478cefc270f6bf07e89f67b6ec3141f02 diff --git a/media-gfx/iscan-data/iscan-data-1.36.0.1.ebuild b/media-gfx/iscan-data/iscan-data-1.36.0.1.ebuild new file mode 100644 index 000000000000..5044961d8b7b --- /dev/null +++ b/media-gfx/iscan-data/iscan-data-1.36.0.1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan-data/iscan-data-1.36.0.1.ebuild,v 1.1 2015/07/14 15:48:30 idella4 Exp $ + +EAPI=5 + +inherit eutils versionator udev multilib + +MY_PV="$(get_version_component_range 1-3)" +MY_PVR="$(replace_version_separator 3 -)" + +DESCRIPTION="Image Scan! for Linux data files" +HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX" +# Use a gentoo hosted url since upstream uses a session based url that causes the +# files to no longer be available after the session expires. +SRC_URI="http://dev.gentoo.org/~idella4/tarballs//${PN}_${MY_PVR}.tar.gz" +LICENSE="GPL-2" +SLOT="0" + +KEYWORDS="~amd64 ~x86" +IUSE="udev" + +DEPEND="udev? ( + dev-libs/libxslt + media-gfx/sane-backends + )" +RDEPEND="" + +S="${WORKDIR}/${PN}-${MY_PV}" + +DOCS=( NEWS SUPPORTED-DEVICES KNOWN-PROBLEMS ) + +src_install() { + ewarn ""; ewarn "Some profiles automatically enable udev which will cause install to fail" + ewarn "if media-gfx/sane-backends is not already installed."; ewarn "" + default + + if use udev; then + # create udev rules + local rulesdir=$(get_udevdir)/rules.d + dodir ${rulesdir} + "${D}usr/$(get_libdir)/iscan-data/make-policy-file" \ + --force --mode udev \ + -d "${D}usr/share/iscan-data/epkowa.desc" \ + -o "${D}${rulesdir}/99-iscan.rules" || die + fi +} diff --git a/media-video/cinelerra/cinelerra-20140710.ebuild b/media-video/cinelerra/cinelerra-20140710.ebuild index bb46c737a19b..ff5834c67bc2 100644 --- a/media-video/cinelerra/cinelerra-20140710.ebuild +++ b/media-video/cinelerra/cinelerra-20140710.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/media-video/cinelerra/cinelerra-20140710.ebuild,v 1.3 2015/02/08 16:21:49 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-20140710.ebuild,v 1.4 2015/07/14 17:04:01 aballier Exp $ EAPI=5 inherit autotools eutils multilib flag-o-matic @@ -61,7 +61,8 @@ src_prepare() { "${FILESDIR}"/${P}-underlinking.patch \ "${FILESDIR}"/${P}-ffmpeg-0.11.patch \ "${FILESDIR}"/${PN}-libav9.patch \ - "${FILESDIR}"/${PN}-pngtoh.patch + "${FILESDIR}"/${PN}-pngtoh.patch \ + "${FILESDIR}"/${PN}-nofindobject.patch if has_version '>=media-video/ffmpeg-2' ; then epatch "${FILESDIR}"/${PN}-ffmpeg2.patch diff --git a/media-video/cinelerra/files/cinelerra-nofindobject.patch b/media-video/cinelerra/files/cinelerra-nofindobject.patch new file mode 100644 index 000000000000..99acf2b643c7 --- /dev/null +++ b/media-video/cinelerra/files/cinelerra-nofindobject.patch @@ -0,0 +1,16 @@ +Depends on features removed in opencv3. +https://bugs.gentoo.org/show_bug.cgi?id=554516 + +Index: cinelerra-20140710/configure.ac +=================================================================== +--- cinelerra-20140710.orig/configure.ac ++++ cinelerra-20140710/configure.ac +@@ -317,7 +317,7 @@ fi + AC_DEFINE_UNQUOTED(HAVE_OPENCV_SURF, $HAVE_OPENCV_SURF, + [define if SURF support is compiled into opencv]) + if test "x$opencv" = "xyes" && test "x$opencvh" = "xyes" ; then +- enable_findobject=ok ++ enable_findobject=no + fi + AM_CONDITIONAL(ENABLE_FINDOBJECT,test "x$enable_findobject" = "xok") + ############## END OF MISC LIBRARIES diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk index cec22d07d3a7..1de96e0c40c3 100644 --- a/metadata/dtd/timestamp.chk +++ b/metadata/dtd/timestamp.chk @@ -1 +1 @@ -Tue, 14 Jul 2015 15:06:56 +0000 +Wed, 15 Jul 2015 04:36:51 +0000 diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk index cec22d07d3a7..1de96e0c40c3 100644 --- a/metadata/glsa/timestamp.chk +++ b/metadata/glsa/timestamp.chk @@ -1 +1 @@ -Tue, 14 Jul 2015 15:06:56 +0000 +Wed, 15 Jul 2015 04:36:51 +0000 diff --git a/metadata/md5-cache/app-shells/bash-4.4_alpha b/metadata/md5-cache/app-shells/bash-4.4_alpha-r1 similarity index 95% rename from metadata/md5-cache/app-shells/bash-4.4_alpha rename to metadata/md5-cache/app-shells/bash-4.4_alpha-r1 index bfeb654946f7..3ececfe7f98e 100644 --- a/metadata/md5-cache/app-shells/bash-4.4_alpha +++ b/metadata/md5-cache/app-shells/bash-4.4_alpha-r1 @@ -9,4 +9,4 @@ RDEPEND=>=sys-libs/ncurses-5.2-r2:= readline? ( >=sys-libs/readline-7.0_alpha:0= SLOT=0 SRC_URI=ftp://ftp.cwru.edu/pub/bash/bash-4.4-alpha.tar.gz _eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=c7fb95cf8643d1cc072a109dc02fefd1 +_md5_=cb384ce1b9b5a290219e1cbab6841e52 diff --git a/metadata/md5-cache/dev-games/openscenegraph-3.0.1-r1 b/metadata/md5-cache/dev-games/openscenegraph-3.0.1-r1 deleted file mode 100644 index 03350c2bfa36..000000000000 --- a/metadata/md5-cache/dev-games/openscenegraph-3.0.1-r1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=x11-libs/libSM x11-libs/libXext virtual/glu virtual/opengl curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) gtk? ( x11-libs/gtkglext ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 ) sdl? ( media-libs/libsdl ) wxwidgets? ( x11-libs/wxGTK[opengl,X] ) ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) openexr? ( media-libs/ilmbase media-libs/openexr ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0 ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xine? ( media-libs/xine-lib ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib ) app-arch/unzip virtual/pkgconfig x11-proto/xextproto doc? ( app-doc/doxygen ) xrandr? ( x11-proto/randrproto ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) -DESCRIPTION=Open source high performance 3D graphics toolkit -EAPI=5 -HOMEPAGE=http://www.openscenegraph.org/projects/osg/ -IUSE=curl debug doc examples ffmpeg fltk fox gdal gif glut gtk jpeg jpeg2k openexr openinventor osgapps pdf png qt4 sdl svg tiff truetype vnc wxwidgets xine xrandr zlib -KEYWORDS=amd64 ppc x86 -LICENSE=wxWinLL-3 LGPL-2.1 -RDEPEND=x11-libs/libSM x11-libs/libXext virtual/glu virtual/opengl curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) gtk? ( x11-libs/gtkglext ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 ) sdl? ( media-libs/libsdl ) wxwidgets? ( x11-libs/wxGTK[opengl,X] ) ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) openexr? ( media-libs/ilmbase media-libs/openexr ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0 ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xine? ( media-libs/xine-lib ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib ) -SLOT=0 -SRC_URI=http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.0.1/source/OpenSceneGraph-3.0.1.zip -_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 wxwidgets 6d6eec2685256d35511e7b6d5461bec9 -_md5_=10c3017acd091413e469e152bbfbb5ee diff --git a/metadata/md5-cache/dev-games/openscenegraph-3.2.1-r1 b/metadata/md5-cache/dev-games/openscenegraph-3.2.1-r1 new file mode 100644 index 000000000000..a6d95f6c549e --- /dev/null +++ b/metadata/md5-cache/dev-games/openscenegraph-3.2.1-r1 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=x11-libs/libSM x11-libs/libXext virtual/glu virtual/opengl asio? ( dev-cpp/asio ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) gtk? ( x11-libs/gtkglext ) sdl? ( media-libs/libsdl ) wxwidgets? ( x11-libs/wxGTK[opengl,X] ) ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) openexr? ( media-libs/ilmbase media-libs/openexr ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xine? ( media-libs/xine-lib ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib ) app-arch/unzip virtual/pkgconfig x11-proto/xextproto doc? ( app-doc/doxygen ) xrandr? ( x11-proto/randrproto ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) +DESCRIPTION=Open source high performance 3D graphics toolkit +EAPI=5 +HOMEPAGE=http://www.openscenegraph.org/projects/osg/ +IUSE=asio curl debug doc examples ffmpeg fltk fox gdal gif glut gtk jpeg jpeg2k openexr openinventor osgapps pdf png qt4 qt5 sdl svg tiff truetype vnc wxwidgets xine xrandr zlib +KEYWORDS=~amd64 ~ppc ~x86 +LICENSE=wxWinLL-3 LGPL-2.1 +RDEPEND=x11-libs/libSM x11-libs/libXext virtual/glu virtual/opengl asio? ( dev-cpp/asio ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) gtk? ( x11-libs/gtkglext ) sdl? ( media-libs/libsdl ) wxwidgets? ( x11-libs/wxGTK[opengl,X] ) ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) openexr? ( media-libs/ilmbase media-libs/openexr ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xine? ( media-libs/xine-lib ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib ) +REQUIRED_USE=qt4? ( !qt5 ) qt5? ( !qt4 ) +SLOT=0 +SRC_URI=http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-3.2.1.zip +_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 wxwidgets 6d6eec2685256d35511e7b6d5461bec9 +_md5_=f90de01db8c858d628e7faefaf2a7717 diff --git a/metadata/md5-cache/dev-lang/php-5.5.26 b/metadata/md5-cache/dev-lang/php-5.5.26 index 3024f43a1498..744425181b24 100644 --- a/metadata/md5-cache/dev-lang/php-5.5.26 +++ b/metadata/md5-cache/dev-lang/php-5.5.26 @@ -4,11 +4,11 @@ DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and EAPI=5 HOMEPAGE=http://php.net/ IUSE=embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl debug enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql libmysqlclient mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib apache2 -KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos +KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos LICENSE=PHP-3 RDEPEND=>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) ) apache2? ( =www-servers/apache-2* ) REQUIRED_USE=truetype? ( gd ) vpx? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) ) SLOT=5.5 SRC_URI=http://www.php.net/distributions/php-5.5.26.tar.bz2 _eclasses_=apache-module 5c4c90da2d68c2dc8391666824f1293c autotools a9597abac7226d89ad9d010abeef6cfb db-use 82d0e62839f20e1e0d5a2259abd5316f depend.apache 1a38534d3f755d1ab1d92ce120bd7dbd eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=4ccdfc6a3bcf770a98f015363686a5b7 +_md5_=03677a22245407f3aa0874ef4b8790c5 diff --git a/metadata/md5-cache/dev-lang/php-5.6.10 b/metadata/md5-cache/dev-lang/php-5.6.10 index 8ea046f1e894..5930ff9f0c02 100644 --- a/metadata/md5-cache/dev-lang/php-5.6.10 +++ b/metadata/md5-cache/dev-lang/php-5.6.10 @@ -4,11 +4,11 @@ DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and EAPI=5 HOMEPAGE=http://php.net/ IUSE=embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl debug enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql libmysqlclient mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib apache2 -KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos +KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos LICENSE=PHP-3 RDEPEND=>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) ) apache2? ( =www-servers/apache-2* ) REQUIRED_USE=truetype? ( gd ) vpx? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) ) SLOT=5.6 SRC_URI=http://www.php.net/distributions/php-5.6.10.tar.bz2 _eclasses_=apache-module 5c4c90da2d68c2dc8391666824f1293c autotools a9597abac7226d89ad9d010abeef6cfb db-use 82d0e62839f20e1e0d5a2259abd5316f depend.apache 1a38534d3f755d1ab1d92ce120bd7dbd eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=c530a5dfa6490f340cdc541e6ae12760 +_md5_=ccb9f2c1df719d16a87439b23fdb8272 diff --git a/metadata/md5-cache/dev-libs/cloog-0.18.3 b/metadata/md5-cache/dev-libs/cloog-0.18.3 index e25da375fd08..c6abb9228a46 100644 --- a/metadata/md5-cache/dev-libs/cloog-0.18.3 +++ b/metadata/md5-cache/dev-libs/cloog-0.18.3 @@ -6,8 +6,8 @@ HOMEPAGE=http://www.bastoul.net/cloog/ IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd LICENSE=LGPL-2.1 -RDEPEND=>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/isl-0.14:0/14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !dev-libs/cloog-ppl +RDEPEND=>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/isl-0.14:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !dev-libs/cloog-ppl SLOT=0/4 SRC_URI=http://www.bastoul.net/cloog/pages/download/cloog-0.18.3.tar.gz _eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multilib-build e733e978b7fa70607cc221fd9c070db6 multilib-minimal 13dd976916c35a1e2c8d170e840c7018 toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=0dd889a2f52180f1f7cce9c78c4f07df +_md5_=96a3336735ec9b594787bd0c19c20342 diff --git a/metadata/md5-cache/dev-libs/crypto++-5.6.2-r2 b/metadata/md5-cache/dev-libs/crypto++-5.6.2-r2 index 7b4e0b24c898..df3ad44f5c18 100644 --- a/metadata/md5-cache/dev-libs/crypto++-5.6.2-r2 +++ b/metadata/md5-cache/dev-libs/crypto++-5.6.2-r2 @@ -4,9 +4,9 @@ DESCRIPTION=C++ class library of cryptographic schemes EAPI=5 HOMEPAGE=http://cryptopp.com IUSE=static-libs -KEYWORDS=~alpha amd64 ~arm hppa ~ppc ppc64 ~sparc x86 ~x64-macos +KEYWORDS=alpha amd64 ~arm hppa ~ppc ppc64 ~sparc x86 ~x64-macos LICENSE=Boost-1.0 SLOT=0 SRC_URI=mirror://sourceforge/cryptopp/cryptopp562.zip _eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=9ed4a13a33d7f3d90d194ebf01b47b7d +_md5_=5757b9ed350ac964e5d34dab5139fc73 diff --git a/metadata/md5-cache/dev-libs/nspr-4.10.8 b/metadata/md5-cache/dev-libs/nspr-4.10.8 index 9c35b0e154ff..1f291332a8e3 100644 --- a/metadata/md5-cache/dev-libs/nspr-4.10.8 +++ b/metadata/md5-cache/dev-libs/nspr-4.10.8 @@ -4,10 +4,10 @@ DESCRIPTION=Netscape Portable Runtime EAPI=5 HOMEPAGE=http://www.mozilla.org/projects/nspr/ IUSE=debug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris +KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 ) RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r12 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) SLOT=0 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.10.8/src/nspr-4.10.8.tar.gz _eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multilib-build e733e978b7fa70607cc221fd9c070db6 multilib-minimal 13dd976916c35a1e2c8d170e840c7018 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=650ddaab4616865a0962af6d865e9e94 +_md5_=47bb7315fd73c3f0c6861c1e41eeb61a diff --git a/metadata/md5-cache/dev-libs/nss-3.19.2 b/metadata/md5-cache/dev-libs/nss-3.19.2 index eeaec1f863b3..b88dac7f52da 100644 --- a/metadata/md5-cache/dev-libs/nss-3.19.2 +++ b/metadata/md5-cache/dev-libs/nss-3.19.2 @@ -4,11 +4,11 @@ DESCRIPTION=Mozilla's Network Security Services library that implements PKI supp EAPI=5 HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/ IUSE=+cacert +nss-pem utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris +KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 ) RDEPEND=>=dev-libs/nspr-4.10.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r12 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) RESTRICT=test SLOT=0 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_19_2_RTM/src/nss-3.19.2.tar.gz cacert? ( http://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch ) nss-pem? ( https://git.fedorahosted.org/cgit/nss-pem.git/snapshot/nss-pem-015ae754dd9f6fbcd7e52030ec9732eb27fc06a8.tar.bz2 ) _eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multilib-build e733e978b7fa70607cc221fd9c070db6 multilib-minimal 13dd976916c35a1e2c8d170e840c7018 toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=8b9370e00e6311e33b7761fc6098e94e +_md5_=fb9cc5fe1ff4c07a0e1ae41c8bfad27e diff --git a/metadata/md5-cache/dev-python/keystonemiddleware-1.5.2 b/metadata/md5-cache/dev-python/keystonemiddleware-1.5.2 index 3bb6b4c9e3f0..dab8c5e26450 100644 --- a/metadata/md5-cache/dev-python/keystonemiddleware-1.5.2 +++ b/metadata/md5-cache/dev-python/keystonemiddleware-1.5.2 @@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 ) SLOT=0 SRC_URI=mirror://pypi/k/keystonemiddleware/keystonemiddleware-1.5.2.tar.gz _eclasses_=distutils-r1 8fd6db5e1c80bd7c6d640bce0413569e eutils 9fb270e417e0e83d64ca52586c4a79de multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 23846c6ba39f6655e2027001eeed8e81 python-utils-r1 ae9becb5d45344c01939c3f57df0d3fd toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=5ea4e7027c035e3a56e31be88015ea5b +_md5_=7a4868ac4f032d3ee719bcc85471b94d diff --git a/metadata/md5-cache/dev-qt/qtwebkit-5.4.2 b/metadata/md5-cache/dev-qt/qtwebkit-5.4.2 index 81453543a3b0..6fa7e0d4b49c 100644 --- a/metadata/md5-cache/dev-qt/qtwebkit-5.4.2 +++ b/metadata/md5-cache/dev-qt/qtwebkit-5.4.2 @@ -12,4 +12,4 @@ RESTRICT=mirror test SLOT=5 SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qtwebkit-opensource-src-5.4.2.tar.xz _eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 python-any-r1 4756de53ea4d40471a582e898815a5c8 python-utils-r1 ae9becb5d45344c01939c3f57df0d3fd qt5-build a6644bdd0f4c09576fc95ae7fdf1c649 toolchain-funcs 42408102d713fbad60ca21349865edb4 virtualx 73cfc129b4b9ba23aed1abb10c825d86 -_md5_=b8a5d01cabccb75a56748c3b5fc97ee7 +_md5_=46983a4a6b104b0c718bfee981aaf8cb diff --git a/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r3 b/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r3 index fe2b2a9c873c..435e3fb6bf18 100644 --- a/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r3 +++ b/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r3 @@ -4,11 +4,11 @@ DESCRIPTION=A module for using Textile in Ruby EAPI=5 HOMEPAGE=http://redcloth.org/ IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test -KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris LICENSE=MIT RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ) SLOT=0 SRC_URI=https://github.com/jgarber/redcloth/tarball/v4.2.9 -> RedCloth-git-4.2.9.tgz _eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 ruby-fakegem 59aa129a3b9dc9e6225a0622860d2f54 ruby-ng a1c75617b3482d513ad41d1aea8dbf8f ruby-utils a74e21a353442acf697b6c82e7df6df8 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=6ec0e328c60e932f009dbb2f15f4d019 +_md5_=4f7891014548efd35a11bdb8c70f20ae diff --git a/metadata/md5-cache/dev-util/kdevelop-qmljs-1.7.0 b/metadata/md5-cache/dev-util/kdevelop-qmljs-1.7.0 new file mode 100644 index 000000000000..25f7910ce0da --- /dev/null +++ b/metadata/md5-cache/dev-util/kdevelop-qmljs-1.7.0 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack +DEPEND=>=dev-util/kdevplatform-1.7.0:4 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=] >=dev-util/kdevplatform-1.0.0:4 +DESCRIPTION=QML and javascrip plugin for KDevelop 4 +EAPI=5 +HOMEPAGE=http://www.kdevelop.org/ +IUSE=debug linguas_bs linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_gl linguas_it linguas_kk linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sl linguas_sv linguas_uk linguas_zh_CN linguas_zh_TW aqua +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-2 LGPL-2 +RDEPEND=>=dev-util/kdevplatform-1.7.0:4 dev-util/kdevelop:4 kde-apps/oxygen-icons linguas_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_kk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_kk(+)] ) linguas_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=] >=dev-util/kdevplatform-1.0.0:4 +SLOT=4 +SRC_URI=mirror://kde/stable/kdevelop/kdev-qmljs/1.7.0/src/kdev-qmljs-1.7.0.tar.xz +_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 559feb798976aacd15eeb289dbcdc11c kde4-functions 99e770658f27aaf2c8a5850af7598b18 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86 +_md5_=011663f1fdff812159560b32eebd4c64 diff --git a/metadata/md5-cache/mail-client/sylpheed-3.4.2 b/metadata/md5-cache/mail-client/sylpheed-3.4.2 index 7b231f1c6c52..44e5540bee4e 100644 --- a/metadata/md5-cache/mail-client/sylpheed-3.4.2 +++ b/metadata/md5-cache/mail-client/sylpheed-3.4.2 @@ -4,10 +4,10 @@ DESCRIPTION=A lightweight email client and newsreader EAPI=5 HOMEPAGE=http://sylpheed.sraoss.jp/ IUSE=crypt ipv6 ldap nls oniguruma pda spell ssl xface -KEYWORDS=~alpha amd64 hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd +KEYWORDS=alpha amd64 hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd LICENSE=GPL-2 LGPL-2.1 RDEPEND=x11-libs/gtk+:2 crypt? ( app-crypt/gpgme ) ldap? ( net-nds/openldap ) nls? ( sys-devel/gettext ) oniguruma? ( dev-libs/oniguruma ) pda? ( app-pda/jpilot ) spell? ( app-text/gtkspell:2 ) ssl? ( dev-libs/openssl ) app-misc/mime-types net-misc/curl SLOT=0 SRC_URI=http://sylpheed.sraoss.jp/sylpheed/v3.4/sylpheed-3.4.2.tar.bz2 _eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=cca4e2ad29b7d5df8aca840c04cc368c +_md5_=b0c29320aae9bacaef43b21baf6044da diff --git a/metadata/md5-cache/mail-filter/opendmarc-1.3.0 b/metadata/md5-cache/mail-filter/opendmarc-1.3.0 index 4db538b4a7b0..04febe3eb341 100644 --- a/metadata/md5-cache/mail-filter/opendmarc-1.3.0 +++ b/metadata/md5-cache/mail-filter/opendmarc-1.3.0 @@ -3,10 +3,11 @@ DEPEND=dev-perl/DBI || ( mail-filter/libmilter mail-mta/sendmail ) DESCRIPTION=Open source DMARC implementation EAPI=5 HOMEPAGE=http://www.trusteddomain.org/opendmarc/ +IUSE=spf KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~x86 ~x86-fbsd LICENSE=BSD -RDEPEND=dev-perl/DBI || ( mail-filter/libmilter mail-mta/sendmail ) dev-perl/Switch +RDEPEND=dev-perl/DBI || ( mail-filter/libmilter mail-mta/sendmail ) dev-perl/Switch spf? ( mail-filter/libspf2 ) SLOT=0 SRC_URI=mirror://sourceforge/opendmarc/opendmarc-1.3.0.tar.gz _eclasses_=user f54e098dd38ba1c0847a13e685b87747 -_md5_=0f2bf498901bb3d8e55837bd9d2beaf2 +_md5_=93434f8805f65d7c66cde6341c2c477b diff --git a/metadata/md5-cache/media-gfx/iscan-data-1.36.0.1 b/metadata/md5-cache/media-gfx/iscan-data-1.36.0.1 new file mode 100644 index 000000000000..cb244963e8bb --- /dev/null +++ b/metadata/md5-cache/media-gfx/iscan-data-1.36.0.1 @@ -0,0 +1,12 @@ +DEFINED_PHASES=install +DEPEND=udev? ( dev-libs/libxslt media-gfx/sane-backends ) virtual/pkgconfig +DESCRIPTION=Image Scan! for Linux data files +EAPI=5 +HOMEPAGE=http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX +IUSE=udev +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-2 +SLOT=0 +SRC_URI=http://dev.gentoo.org/~idella4/tarballs//iscan-data_1.36.0-1.tar.gz +_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 udev da001465a2e939c93f7ae16947ce3438 versionator cd0bcdb170807e4a1984115e9d53a26f +_md5_=b2a94679bd498c17088b9c1f8c555e12 diff --git a/metadata/md5-cache/media-video/cinelerra-20140710 b/metadata/md5-cache/media-video/cinelerra-20140710 index c0f5b328bf36..0b9078b663db 100644 --- a/metadata/md5-cache/media-video/cinelerra-20140710 +++ b/metadata/md5-cache/media-video/cinelerra-20140710 @@ -10,4 +10,4 @@ RDEPEND=media-libs/a52dec:= media-libs/faac:= media-libs/faad2:= >=media-libs/fr SLOT=0 SRC_URI=http://dev.gentoo.org/~ssuominen/cinelerra-20140710.tar.xz _eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=49faefcfbfaa6413f442fc31b807f435 +_md5_=6cbe7909040cafba7bb1849df20f96de diff --git a/metadata/md5-cache/net-analyzer/cacti-0.8.8e b/metadata/md5-cache/net-analyzer/cacti-0.8.8e index a52dd9122f09..af576904ff46 100644 --- a/metadata/md5-cache/net-analyzer/cacti-0.8.8e +++ b/metadata/md5-cache/net-analyzer/cacti-0.8.8e @@ -4,10 +4,10 @@ DESCRIPTION=Cacti is a complete frontend to rrdtool EAPI=5 HOMEPAGE=http://www.cacti.net/ IUSE=snmp doc vhosts -KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86 +KEYWORDS=alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86 LICENSE=GPL-2 RDEPEND=dev-lang/php[cli,mysql,session,sockets,xml] dev-php/adodb net-analyzer/rrdtool[graph] virtual/cron virtual/mysql snmp? ( >=net-analyzer/net-snmp-5.2.0 ) >=app-admin/webapp-config-1.50.15 SLOT=0.8.8e SRC_URI=http://www.cacti.net/downloads/cacti-0.8.8e.tar.gz _eclasses_=depend.php 4400a239a11e94cd350b6b6f27d203e8 eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 webapp 094698bf1c7a5b1acd3184e94f484017 -_md5_=9610dc547ada32303484f99e6569e87b +_md5_=b0117b7e126009066ab23a5c4cdbabe4 diff --git a/metadata/md5-cache/net-dns/bind-9.10.2_p2 b/metadata/md5-cache/net-dns/bind-9.10.2_p2 index a49403cb1744..426f6454acfc 100644 --- a/metadata/md5-cache/net-dns/bind-9.10.2_p2 +++ b/metadata/md5-cache/net-dns/bind-9.10.2_p2 @@ -4,7 +4,7 @@ DESCRIPTION=BIND - Berkeley Internet Name Domain - Name Server EAPI=5 HOMEPAGE=http://www.isc.org/software/bind IUSE=berkdb +caps dlz doc filter-aaaa fixed-rrset geoip gost gssapi idn ipv6 json ldap mysql nslint odbc postgres python rpz seccomp selinux ssl static-libs +threads urandom xml python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 -KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris LICENSE=GPL-2 ISC BSD BSD-2 HPND JNIC openssl RDEPEND=ssl? ( dev-libs/openssl:0[-bindist] ) mysql? ( >=virtual/mysql-4.0 ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) idn? ( net-dns/idnkit ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) seccomp? ( sys-libs/libseccomp ) json? ( dev-libs/json-c ) selinux? ( sec-policy/selinux-bind ) || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz !threads ) odbc? ( dlz ) ldap? ( dlz ) gost? ( ssl ) threads? ( caps ) @@ -12,4 +12,4 @@ RESTRICT=test SLOT=0 SRC_URI=ftp://ftp.isc.org/isc/bind9/9.10.2-P2/bind-9.10.2-P2.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 ) _eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb db-use 82d0e62839f20e1e0d5a2259abd5316f eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 python-r1 23846c6ba39f6655e2027001eeed8e81 python-utils-r1 ae9becb5d45344c01939c3f57df0d3fd systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=038b42880dcc14eca0d71cf29bba0d47 +_md5_=090b9b92d29758b96bb90c4170a796cb diff --git a/metadata/md5-cache/net-dns/bind-tools-9.10.2_p2 b/metadata/md5-cache/net-dns/bind-tools-9.10.2_p2 index 905359d767e0..e7bb077c4c9f 100644 --- a/metadata/md5-cache/net-dns/bind-tools-9.10.2_p2 +++ b/metadata/md5-cache/net-dns/bind-tools-9.10.2_p2 @@ -4,7 +4,7 @@ DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen EAPI=5 HOMEPAGE=http://www.isc.org/software/bind IUSE=doc gost gssapi idn ipv6 readline seccomp ssl urandom xml -KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris LICENSE=ISC BSD BSD-2 HPND JNIC RSA openssl RDEPEND=ssl? ( dev-libs/openssl:0 ) gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline:0= ) seccomp? ( sys-libs/libseccomp ) !=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( curl_ssl_axtls? ( >=net-libs/axtls-1.4.9-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3.2.15[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-2.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ( =net-libs/gnutls-2.12*[nettle,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-2.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( >=dev-libs/openssl-1.0.1h-r2[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_nss? ( >=dev-libs/nss-3.15.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_polarssl? ( >=net-libs/polarssl-1.3.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( >=net-dns/libidn-1.28[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( >=net-dns/c-ares-1.10.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh2-1.4.3[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r13 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_axtls curl_ssl_gnutls curl_ssl_openssl curl_ssl_nss curl_ssl_polarssl curl_ssl_winssl ) ) @@ -12,4 +12,4 @@ RESTRICT=test SLOT=0 SRC_URI=http://curl.haxx.se/download/curl-7.43.0.tar.bz2 _eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multilib-build e733e978b7fa70607cc221fd9c070db6 multilib-minimal 13dd976916c35a1e2c8d170e840c7018 prefix 21058c21ca48453d771df15500873ede toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=4660b3f5525608e22102418d4bb57557 +_md5_=2d5b36dac249b67b5fe852f907efb0b3 diff --git a/metadata/md5-cache/net-misc/ntp-4.2.8_p3 b/metadata/md5-cache/net-misc/ntp-4.2.8_p3 index c17ce07b8719..07eefe4ed0ad 100644 --- a/metadata/md5-cache/net-misc/ntp-4.2.8_p3 +++ b/metadata/md5-cache/net-misc/ntp-4.2.8_p3 @@ -4,11 +4,11 @@ DESCRIPTION=Network Time Protocol suite/programs EAPI=5 HOMEPAGE=http://www.ntp.org/ IUSE=caps debug ipv6 openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf -KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint +KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint LICENSE=HPND BSD ISC PDEPEND=openntpd? ( net-misc/openntpd ) RDEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !openntpd? ( !net-misc/openntpd ) snmp? ( net-analyzer/net-snmp ) ssl? ( dev-libs/openssl:0= ) parse-clocks? ( net-misc/pps-tools ) selinux? ( sec-policy/selinux-ntp ) vim-syntax? ( app-vim/ntp-syntax ) SLOT=0 SRC_URI=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p3.tar.gz mirror://gentoo/ntp-4.2.8p3-manpages.tar.bz2 _eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 user f54e098dd38ba1c0847a13e685b87747 -_md5_=f2dd0d28cd8c1d0534d00baac0b359d5 +_md5_=cbc9229477581a744b929dedf5db0cec diff --git a/metadata/md5-cache/net-print/cups-2.0.3 b/metadata/md5-cache/net-print/cups-2.0.3 index 75e2af972520..ad0694f7ea7b 100644 --- a/metadata/md5-cache/net-print/cups-2.0.3 +++ b/metadata/md5-cache/net-print/cups-2.0.3 @@ -4,7 +4,7 @@ DESCRIPTION=The Common Unix Printing System EAPI=5 HOMEPAGE=http://www.cups.org/ IUSE=acl dbus debug java kerberos lprng-compat pam python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf +linguas_ca +linguas_cs +linguas_de +linguas_es +linguas_fr +linguas_it +linguas_ja +linguas_pt_BR +linguas_ru abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7 elibc_FreeBSD java -KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint +KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint LICENSE=GPL-2 PDEPEND=app-text/ghostscript-gpl[cups] app-text/poppler[utils] >=net-print/cups-filters-1.0.43 RDEPEND=app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6 ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !lprng-compat? ( !net-print/lprng ) pam? ( virtual/pam ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) ssl? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) selinux? ( sec-policy/selinux-cups ) java? ( >=dev-java/java-config-2.2.0 ) @@ -13,4 +13,4 @@ RESTRICT=test SLOT=0 SRC_URI=http://www.cups.org/software/2.0.3/cups-2.0.3-source.tar.bz2 _eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 java-pkg-opt-2 f9bbbe5092225a2059aa9e6a3a2b52f1 java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc libtool 52d0e17251d04645ffaa61bfdd858944 linux-info 8cbc678e083c23e4ad546ca6509cf304 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multilib-build e733e978b7fa70607cc221fd9c070db6 multilib-minimal 13dd976916c35a1e2c8d170e840c7018 pam aa1ebb3ab720ea04dbbdd6eaaf9554ed python-single-r1 351da1aa73960a282591217fb57c1bb8 python-utils-r1 ae9becb5d45344c01939c3f57df0d3fd systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=b963cfa956d50bb3e5caeb5dbb01a5b3 +_md5_=bd2d5414090099dc2934150329682b35 diff --git a/metadata/md5-cache/net-print/cups-filters-1.0.71 b/metadata/md5-cache/net-print/cups-filters-1.0.71 index 38f875018a60..7d102f04dc49 100644 --- a/metadata/md5-cache/net-print/cups-filters-1.0.71 +++ b/metadata/md5-cache/net-print/cups-filters-1.0.71 @@ -10,4 +10,4 @@ RDEPEND=>=app-text/ghostscript-gpl-9.09 app-text/poppler:=[cxx,jpeg?,lcms,tiff?, SLOT=0 SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.0.71.tar.xz _eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module 9ff260c452d420630500e700913be8d8 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 unpacker f300a7ca9131b1024a79762e8edd3c52 -_md5_=ab8ffb42e34e233b0df552392b455107 +_md5_=048987f01bb458c2c14e384a71665e4c diff --git a/metadata/md5-cache/net-proxy/squid-3.5.6 b/metadata/md5-cache/net-proxy/squid-3.5.6 index 810ff66dd915..f9da5d95950a 100644 --- a/metadata/md5-cache/net-proxy/squid-3.5.6 +++ b/metadata/md5-cache/net-proxy/squid-3.5.6 @@ -4,11 +4,11 @@ DESCRIPTION=A full-featured web proxy cache EAPI=5 HOMEPAGE=http://www.squid-cache.org/ IUSE=caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap esi ssl-crtd mysql postgres sqlite qos tproxy +htcp +wccp +wccpv2 pf-transparent ipf-transparent kqueue elibc_uclibc kernel_linux -KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd +KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd LICENSE=GPL-2 RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/openssl:* dev-libs/nettle >=net-libs/gnutls-3.1.5 ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4:* dev-lang/perl dev-libs/libltdl:0 samba? ( net-fs/samba ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) selinux? ( sec-policy/selinux-squid ) sqlite? ( dev-perl/DBD-SQLite ) !<=sci-biology/meme-4.8.1-r1 REQUIRED_USE=tproxy? ( caps ) qos? ( caps ) SLOT=0 SRC_URI=http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.6.tar.xz _eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 libtool 52d0e17251d04645ffaa61bfdd858944 linux-info 8cbc678e083c23e4ad546ca6509cf304 multilib 62927b3db3a589b0806255f3a002d5d3 pam aa1ebb3ab720ea04dbbdd6eaaf9554ed toolchain-funcs 42408102d713fbad60ca21349865edb4 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=11d58cb901fe141afe0cd6d2baf6629e +_md5_=571d23d1b2d486c4055bd2e76150cc6b diff --git a/metadata/md5-cache/net-wireless/hostapd-2.4-r3 b/metadata/md5-cache/net-wireless/hostapd-2.4-r3 new file mode 100644 index 000000000000..be12e15fcca1 --- /dev/null +++ b/metadata/md5-cache/net-wireless/hostapd-2.4-r3 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst prepare +DEPEND=ssl? ( dev-libs/openssl[-bindist] ) kernel_linux? ( dev-libs/libnl:3 crda? ( net-wireless/crda ) ) netlink? ( net-libs/libnfnetlink ) sqlite? ( >=dev-db/sqlite-3 ) virtual/pkgconfig +DESCRIPTION=IEEE 802.11 wireless LAN Host AP daemon +EAPI=4 +HOMEPAGE=http://hostap.epitest.fi +IUSE=ipv6 logwatch netlink sqlite +ssl +wps +crda +KEYWORDS=~amd64 ~arm ~mips ~ppc ~x86 +LICENSE=|| ( GPL-2 BSD ) +RDEPEND=ssl? ( dev-libs/openssl[-bindist] ) kernel_linux? ( dev-libs/libnl:3 crda? ( net-wireless/crda ) ) netlink? ( net-libs/libnfnetlink ) sqlite? ( >=dev-db/sqlite-3 ) +SLOT=0 +SRC_URI=http://hostap.epitest.fi/releases/hostapd-2.4.tar.gz +_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 +_md5_=913eeb4c08407a473c9a3da13447a166 diff --git a/metadata/md5-cache/net-wireless/wpa_supplicant-2.4-r4 b/metadata/md5-cache/net-wireless/wpa_supplicant-2.4-r4 new file mode 100644 index 000000000000..d6c7399adc33 --- /dev/null +++ b/metadata/md5-cache/net-wireless/wpa_supplicant-2.4-r4 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst prepare setup unpack +DEPEND=dbus? ( sys-apps/dbus ) kernel_linux? ( eap-sim? ( sys-apps/pcsc-lite ) dev-libs/libnl:3 net-wireless/crda ) !kernel_linux? ( net-libs/libpcap ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 ) readline? ( sys-libs/ncurses sys-libs/readline:0 ) ssl? ( dev-libs/openssl:0 ) !ssl? ( gnutls? ( net-libs/gnutls ) ) !ssl? ( !gnutls? ( dev-libs/libtommath ) ) virtual/pkgconfig virtual/pkgconfig +DESCRIPTION=IEEE 802.1X/WPA supplicant for secure wireless transfers +EAPI=5 +HOMEPAGE=http://hostap.epitest.fi/wpa_supplicant/ +IUSE=ap dbus gnutls eap-sim fasteap +hs2-0 p2p ps3 qt4 readline selinux smartcard ssl tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd +LICENSE=|| ( GPL-2 BSD ) +RDEPEND=dbus? ( sys-apps/dbus ) kernel_linux? ( eap-sim? ( sys-apps/pcsc-lite ) dev-libs/libnl:3 net-wireless/crda ) !kernel_linux? ( net-libs/libpcap ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 ) readline? ( sys-libs/ncurses sys-libs/readline:0 ) ssl? ( dev-libs/openssl:0 ) !ssl? ( gnutls? ( net-libs/gnutls ) ) !ssl? ( !gnutls? ( dev-libs/libtommath ) ) selinux? ( sec-policy/selinux-networkmanager ) +REQUIRED_USE=fasteap? ( !gnutls !ssl ) smartcard? ( ssl ) +SLOT=0 +SRC_URI=http://hostap.epitest.fi/releases/wpa_supplicant-2.4.tar.gz +_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 qmake-utils 4ce40e37ef0e28425a7159b0353be026 qt4-r2 7199e3db5b5908325487d379c6f67cf0 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 +_md5_=53eb99d39fa079a2120cd245cf887f62 diff --git a/metadata/md5-cache/sys-apps/less-478 b/metadata/md5-cache/sys-apps/less-478 index b912767d2a08..b290f5488d24 100644 --- a/metadata/md5-cache/sys-apps/less-478 +++ b/metadata/md5-cache/sys-apps/less-478 @@ -4,10 +4,10 @@ DESCRIPTION=Excellent text file viewer EAPI=4 HOMEPAGE=http://www.greenwoodsoftware.com/less/ IUSE=pcre unicode -KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris LICENSE=|| ( GPL-3 BSD-2 ) RDEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2 pcre? ( dev-libs/libpcre ) SLOT=0 SRC_URI=http://www.greenwoodsoftware.com/less/less-478.tar.gz http://www-zeuthen.desy.de/~friebel/unix/less/code2color -> code2color-0.2 _eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=63bd5768921e7c5386c9cbd0d6279348 +_md5_=83216b13ce46b9c5c883705bea10260a diff --git a/metadata/md5-cache/sys-auth/polkit-0.113 b/metadata/md5-cache/sys-auth/polkit-0.113 index fae8691dbfab..4324169021d4 100644 --- a/metadata/md5-cache/sys-auth/polkit-0.113 +++ b/metadata/md5-cache/sys-auth/polkit-0.113 @@ -4,11 +4,11 @@ DESCRIPTION=Policy framework for controlling privileges for system-wide services EAPI=5 HOMEPAGE=http://www.freedesktop.org/wiki/Software/polkit IUSE=examples gtk +introspection jit kde nls pam selinux systemd test -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 +KEYWORDS=alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 LICENSE=LGPL-2 PDEPEND=gtk? ( || ( >=gnome-extra/polkit-gnome-0.105 lxde-base/lxpolkit ) ) kde? ( || ( kde-plasma/polkit-kde-agent sys-auth/polkit-kde-agent ) ) !systemd? ( sys-auth/consolekit[policykit] ) RDEPEND=dev-lang/spidermonkey:0/mozjs185[-debug] >=dev-libs/glib-2.32:2 >=dev-libs/expat-2:= introspection? ( >=dev-libs/gobject-introspection-1:= ) pam? ( sys-auth/pambase virtual/pam ) systemd? ( sys-apps/systemd:0= ) selinux? ( sec-policy/selinux-policykit ) SLOT=0 SRC_URI=http://www.freedesktop.org/software/polkit/releases/polkit-0.113.tar.gz _eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 pam aa1ebb3ab720ea04dbbdd6eaaf9554ed pax-utils dfe060cb70d89757fde5c1ff8405e950 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 user f54e098dd38ba1c0847a13e685b87747 -_md5_=0a7490450af9629a3941092ee480ad24 +_md5_=0c0faae0db269962fb44578e33d3107e diff --git a/metadata/md5-cache/sys-libs/pam-1.2.1 b/metadata/md5-cache/sys-libs/pam-1.2.1 index 56397eb21a85..5c2f78d2fd7f 100644 --- a/metadata/md5-cache/sys-libs/pam-1.2.1 +++ b/metadata/md5-cache/sys-libs/pam-1.2.1 @@ -4,11 +4,11 @@ DESCRIPTION=Linux-PAM (Pluggable Authentication Modules) EAPI=5 HOMEPAGE=http://www.linux-pam.org/ https://fedorahosted.org/linux-pam/ IUSE=audit berkdb cracklib debug nis nls +pie selinux test vim-syntax abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux +KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux LICENSE=|| ( BSD GPL-2 ) PDEPEND=sys-auth/pambase vim-syntax? ( app-vim/pam-syntax ) RDEPEND=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cracklib? ( >=sys-libs/cracklib-2.9.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) audit? ( >=sys-process/audit-2.2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) berkdb? ( >=sys-libs/db-4.8.30-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nis? ( >=net-libs/libtirpc-0.2.4-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ! thermald-1.4.2.tar.gz _eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb autotools-utils dbce0f7913bd240fdf0ef428149855c0 eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=14ea5bc20f398761632045d6dfaae60c +_md5_=815723314e219d063ed6f1cd7f76903f diff --git a/metadata/md5-cache/www-plugins/freshplayerplugin-0.2.3 b/metadata/md5-cache/www-plugins/freshplayerplugin-0.2.3 deleted file mode 100644 index a225d10b8c93..000000000000 --- a/metadata/md5-cache/www-plugins/freshplayerplugin-0.2.3 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=dev-libs/glib:2= dev-libs/libconfig:= dev-libs/libevent:=[threads] dev-libs/openssl:0= media-libs/alsa-lib:= media-libs/freetype:2= media-libs/mesa:=[egl,gles2] x11-libs/gtk+:2= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:=[X] pulseaudio? ( media-sound/pulseaudio ) dev-util/ragel virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.8 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) -DESCRIPTION=PPAPI-host NPAPI-plugin adapter for flashplayer in npapi based browsers -EAPI=5 -HOMEPAGE=https://github.com/i-rinat/freshplayerplugin -IUSE=pulseaudio -KEYWORDS=~amd64 ~x86 -LICENSE=MIT -RDEPEND=dev-libs/glib:2= dev-libs/libconfig:= dev-libs/libevent:=[threads] dev-libs/openssl:0= media-libs/alsa-lib:= media-libs/freetype:2= media-libs/mesa:=[egl,gles2] x11-libs/gtk+:2= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:=[X] pulseaudio? ( media-sound/pulseaudio ) || ( www-plugins/chrome-binary-plugins[flash] www-client/google-chrome www-client/google-chrome-beta www-client/google-chrome-unstable ) -SLOT=0 -SRC_URI=https://github.com/i-rinat/freshplayerplugin/archive/v0.2.3.tar.gz -> freshplayerplugin-0.2.3.tar.gz -_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=0ac7afe72c0dd61e5cbc3b054b9bb92d diff --git a/metadata/md5-cache/www-plugins/freshplayerplugin-0.3.1 b/metadata/md5-cache/www-plugins/freshplayerplugin-0.3.1 new file mode 100644 index 000000000000..bac410991f32 --- /dev/null +++ b/metadata/md5-cache/www-plugins/freshplayerplugin-0.3.1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=dev-libs/glib:2= dev-libs/libconfig:= dev-libs/libevent:=[threads] dev-libs/openssl:0= media-libs/alsa-lib:= media-libs/freetype:2= media-libs/libv4l:0= media-libs/mesa:=[egl,gles2] x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:=[X] jack? ( media-sound/jack ) pulseaudio? ( media-sound/pulseaudio ) !gtk3? ( x11-libs/gtk+:2= ) gtk3? ( x11-libs/gtk+:3= ) vaapi? ( x11-libs/libva x11-libs/libvdpau ) dev-util/ragel virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.8 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) +DESCRIPTION=PPAPI-host NPAPI-plugin adapter for flashplayer in npapi based browsers +EAPI=5 +HOMEPAGE=https://github.com/i-rinat/freshplayerplugin +IUSE=gtk3 jack pulseaudio vaapi +KEYWORDS=~amd64 ~x86 +LICENSE=MIT +RDEPEND=dev-libs/glib:2= dev-libs/libconfig:= dev-libs/libevent:=[threads] dev-libs/openssl:0= media-libs/alsa-lib:= media-libs/freetype:2= media-libs/libv4l:0= media-libs/mesa:=[egl,gles2] x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:=[X] jack? ( media-sound/jack ) pulseaudio? ( media-sound/pulseaudio ) !gtk3? ( x11-libs/gtk+:2= ) gtk3? ( x11-libs/gtk+:3= ) vaapi? ( x11-libs/libva x11-libs/libvdpau ) || ( www-plugins/chrome-binary-plugins[flash] www-client/google-chrome www-client/google-chrome-beta www-client/google-chrome-unstable ) +SLOT=0 +SRC_URI=https://github.com/i-rinat/freshplayerplugin/archive/v0.3.1.tar.gz -> freshplayerplugin-0.3.1.tar.gz +_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 +_md5_=6cd0af98685e9fb8a0fcdd703e87d302 diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk index 2a2240fe75d0..4973d6c7f768 100644 --- a/metadata/news/timestamp.chk +++ b/metadata/news/timestamp.chk @@ -1 +1 @@ -Tue, 14 Jul 2015 15:06:59 +0000 +Wed, 15 Jul 2015 04:36:55 +0000 diff --git a/metadata/timestamp b/metadata/timestamp index 20f24bf32318..45d54db5ee79 100644 --- a/metadata/timestamp +++ b/metadata/timestamp @@ -1 +1 @@ -Tue Jul 14 15:06:56 UTC 2015 +Wed Jul 15 04:36:51 UTC 2015 diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk index a4be1ffaf18a..42486c246c19 100644 --- a/metadata/timestamp.chk +++ b/metadata/timestamp.chk @@ -1 +1 @@ -Tue, 14 Jul 2015 15:30:01 +0000 +Wed, 15 Jul 2015 05:00:01 +0000 diff --git a/metadata/timestamp.x b/metadata/timestamp.x index 231a3e244289..743b73fefdd9 100644 --- a/metadata/timestamp.x +++ b/metadata/timestamp.x @@ -1 +1 @@ -1436886301 Tue 14 Jul 2015 03:05:01 PM UTC +1436934901 Wed 15 Jul 2015 04:35:01 AM UTC diff --git a/net-analyzer/cacti/cacti-0.8.8e.ebuild b/net-analyzer/cacti/cacti-0.8.8e.ebuild index dfa5b84d64db..b261f684478b 100644 --- a/net-analyzer/cacti/cacti-0.8.8e.ebuild +++ b/net-analyzer/cacti/cacti-0.8.8e.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/net-analyzer/cacti/cacti-0.8.8e.ebuild,v 1.3 2015/07/14 10:37:03 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.8e.ebuild,v 1.4 2015/07/14 20:59:14 klausman Exp $ EAPI=5 @@ -14,7 +14,7 @@ HOMEPAGE="http://www.cacti.net/" SRC_URI="http://www.cacti.net/downloads/${MY_P}.tar.gz" LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86" +KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86" IUSE="snmp doc" need_httpd diff --git a/net-analyzer/icinga2/files/icinga2.confd b/net-analyzer/icinga2/files/icinga2.confd index d30940a1f8c4..5bfd8d72f04b 100644 --- a/net-analyzer/icinga2/files/icinga2.confd +++ b/net-analyzer/icinga2/files/icinga2.confd @@ -1,3 +1,4 @@ ICINGA2_ERROR_LOG=/var/log/icinga2/error.log ICINGA2_STARTUP_LOG=/var/log/icinga2/startup.log ICINGA2_LOG=/var/log/icinga2/icinga2.log +ICINGA2_RUN_DIR=/run/icinga2 diff --git a/net-dns/bind-tools/bind-tools-9.10.2_p2.ebuild b/net-dns/bind-tools/bind-tools-9.10.2_p2.ebuild index 59991c30b078..743f5b068d90 100644 --- a/net-dns/bind-tools/bind-tools-9.10.2_p2.ebuild +++ b/net-dns/bind-tools/bind-tools-9.10.2_p2.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/net-dns/bind-tools/bind-tools-9.10.2_p2.ebuild,v 1.4 2015/07/11 19:00:37 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/bind-tools-9.10.2_p2.ebuild,v 1.5 2015/07/14 19:19:12 klausman Exp $ EAPI="5" @@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz" LICENSE="ISC BSD BSD-2 HPND JNIC RSA openssl" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc gost gssapi idn ipv6 readline seccomp ssl urandom xml" # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 diff --git a/net-dns/bind/bind-9.10.2_p2.ebuild b/net-dns/bind/bind-9.10.2_p2.ebuild index 913a9c98f267..80c6c5629f31 100644 --- a/net-dns/bind/bind-9.10.2_p2.ebuild +++ b/net-dns/bind/bind-9.10.2_p2.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/net-dns/bind/bind-9.10.2_p2.ebuild,v 1.4 2015/07/11 18:59:49 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.10.2_p2.ebuild,v 1.5 2015/07/14 19:19:01 klausman Exp $ # Re dlz/mysql and threads, needs to be verified.. # MySQL uses thread local storage in its C api. Thus MySQL @@ -39,7 +39,7 @@ SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz LICENSE="GPL-2 ISC BSD BSD-2 HPND JNIC openssl" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="berkdb +caps dlz doc filter-aaaa fixed-rrset geoip gost gssapi idn ipv6 json ldap mysql nslint odbc postgres python rpz seccomp selinux ssl static-libs +threads urandom xml" diff --git a/net-misc/curl/curl-7.43.0.ebuild b/net-misc/curl/curl-7.43.0.ebuild index 258d4d7e3257..cb3e4ec16d96 100644 --- a/net-misc/curl/curl-7.43.0.ebuild +++ b/net-misc/curl/curl-7.43.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/net-misc/curl/curl-7.43.0.ebuild,v 1.7 2015/07/05 20:38:02 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.43.0.ebuild,v 1.8 2015/07/14 18:25:29 klausman Exp $ EAPI="5" @@ -12,7 +12,7 @@ SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2" LICENSE="MIT" 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 ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads" IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl" IUSE+=" elibc_Winnt" diff --git a/net-misc/ntp/ntp-4.2.8_p3.ebuild b/net-misc/ntp/ntp-4.2.8_p3.ebuild index c96cbfd68a15..2a626c4efd08 100644 --- a/net-misc/ntp/ntp-4.2.8_p3.ebuild +++ b/net-misc/ntp/ntp-4.2.8_p3.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/net-misc/ntp/ntp-4.2.8_p3.ebuild,v 1.6 2015/07/14 07:33:11 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.8_p3.ebuild,v 1.7 2015/07/14 18:36:21 klausman Exp $ EAPI="5" @@ -14,7 +14,7 @@ SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar LICENSE="HPND BSD ISC" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint" +KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint" IUSE="caps debug ipv6 openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf" CDEPEND="readline? ( >=sys-libs/readline-4.1:0= ) diff --git a/net-print/cups-filters/cups-filters-1.0.71.ebuild b/net-print/cups-filters/cups-filters-1.0.71.ebuild index e854883736f8..9f84adf0b8de 100644 --- a/net-print/cups-filters/cups-filters-1.0.71.ebuild +++ b/net-print/cups-filters/cups-filters-1.0.71.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/net-print/cups-filters/cups-filters-1.0.71.ebuild,v 1.5 2015/07/09 18:23:07 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.71.ebuild,v 1.6 2015/07/14 17:08:24 dilfridge Exp $ EAPI=5 @@ -44,6 +44,8 @@ RDEPEND=" " DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}/${PN}-1.0.71-poppler0340.patch" ) + src_prepare() { base_src_prepare sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die diff --git a/net-print/cups-filters/files/cups-filters-1.0.71-poppler0340.patch b/net-print/cups-filters/files/cups-filters-1.0.71-poppler0340.patch new file mode 100644 index 000000000000..ac0cae3bc7a6 --- /dev/null +++ b/net-print/cups-filters/files/cups-filters-1.0.71-poppler0340.patch @@ -0,0 +1,38 @@ +Hack to make this build against poppler-0.34. Just disables color management in some places. +We should probably find a better solution. dilfridge@gentoo.org + + +diff -ruN cups-filters-1.0.71.orig/filter/pdftoopvp/OPVPOutputDev.cxx cups-filters-1.0.71/filter/pdftoopvp/OPVPOutputDev.cxx +--- cups-filters-1.0.71.orig/filter/pdftoopvp/OPVPOutputDev.cxx 2015-06-26 17:45:26.000000000 +0200 ++++ cups-filters-1.0.71/filter/pdftoopvp/OPVPOutputDev.cxx 2015-07-14 19:02:51.666737621 +0200 +@@ -1812,9 +1812,15 @@ + maskSplash->drawImage(&imageSrc, &imgMaskData, + splashModeMono8, gFalse, maskWidth, maskHeight, mat); + #else ++#if POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR <= 33 + maskSplash->drawImage(&imageSrc, &imgMaskData, + splashModeMono8, gFalse, maskWidth, maskHeight, + mat,gFalse); ++#else ++ maskSplash->drawImage(&imageSrc, NULL, &imgMaskData, ++ splashModeMono8, gFalse, maskWidth, maskHeight, ++ mat,gFalse); ++#endif + #endif + delete imgMaskData.imgStr; + maskStr->close(); +diff -ruN cups-filters-1.0.71.orig/filter/pdftoopvp/oprs/OPRS.cxx cups-filters-1.0.71/filter/pdftoopvp/oprs/OPRS.cxx +--- cups-filters-1.0.71.orig/filter/pdftoopvp/oprs/OPRS.cxx 2015-06-26 17:45:26.000000000 +0200 ++++ cups-filters-1.0.71/filter/pdftoopvp/oprs/OPRS.cxx 2015-07-14 19:00:20.655740720 +0200 +@@ -241,7 +241,11 @@ + #if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2)) + return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat); + #else ++#if POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR <= 33 + return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat,gFalse); ++#else ++ return splash->drawImage(src,NULL,srcData,srcMode,srcAlpha,w,h,mat,gFalse); ++#endif + #endif + } else { + return opvpSplash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat); diff --git a/net-print/cups/cups-2.0.3.ebuild b/net-print/cups/cups-2.0.3.ebuild index 9200511b6a11..98bb7199c93b 100644 --- a/net-print/cups/cups-2.0.3.ebuild +++ b/net-print/cups/cups-2.0.3.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/net-print/cups/cups-2.0.3.ebuild,v 1.4 2015/07/09 18:15:12 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-2.0.3.ebuild,v 1.5 2015/07/14 16:18:13 klausman Exp $ EAPI=5 @@ -23,7 +23,7 @@ if [[ ${PV} == *9999 ]]; then fi else SRC_URI="http://www.cups.org/software/${MY_PV}/${MY_P}-source.tar.bz2" - KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint" + KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint" fi DESCRIPTION="The Common Unix Printing System" diff --git a/net-proxy/squid/squid-3.5.6.ebuild b/net-proxy/squid/squid-3.5.6.ebuild index 73d20c5b285a..edd5b7510c21 100644 --- a/net-proxy/squid/squid-3.5.6.ebuild +++ b/net-proxy/squid/squid-3.5.6.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/net-proxy/squid/squid-3.5.6.ebuild,v 1.4 2015/07/11 20:10:09 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.5.6.ebuild,v 1.5 2015/07/14 19:50:35 klausman Exp $ EAPI=5 inherit autotools eutils linux-info pam toolchain-funcs user versionator @@ -11,7 +11,7 @@ SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd" IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \ ecap esi ssl-crtd \ mysql postgres sqlite \ diff --git a/net-wireless/hostapd/files/2015-5/0001-NFC-Avoid-misaligned-read-of-an-NDEF-field.patch b/net-wireless/hostapd/files/2015-5/0001-NFC-Avoid-misaligned-read-of-an-NDEF-field.patch new file mode 100644 index 000000000000..d03eb484fc28 --- /dev/null +++ b/net-wireless/hostapd/files/2015-5/0001-NFC-Avoid-misaligned-read-of-an-NDEF-field.patch @@ -0,0 +1,29 @@ +From fc880b11ed70ff9dcf8be48621f75d354cc5094d Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Tue, 7 Jul 2015 15:33:55 +0300 +Subject: [PATCH] NFC: Avoid misaligned read of an NDEF field + +The 32-bit version of payload length field may not be 32-bit aligned in +the message buffer, so use WPA_GET_BE32() to read it instead of ntohl(). + +Signed-off-by: Jouni Malinen +--- + src/wps/ndef.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/wps/ndef.c b/src/wps/ndef.c +index 8d1ce1e..5604b0a 100644 +--- a/src/wps/ndef.c ++++ b/src/wps/ndef.c +@@ -47,7 +47,7 @@ static int ndef_parse_record(const u8 *data, u32 size, + } else { + if (size < 6) + return -1; +- record->payload_length = ntohl(*(u32 *)pos); ++ record->payload_length = WPA_GET_BE32(pos); + pos += sizeof(u32); + } + +-- +1.7.9.5 + diff --git a/net-wireless/hostapd/files/2015-5/0002-NFC-Fix-payload-length-validation-in-NDEF-record-par.patch b/net-wireless/hostapd/files/2015-5/0002-NFC-Fix-payload-length-validation-in-NDEF-record-par.patch new file mode 100644 index 000000000000..1f624c8dad46 --- /dev/null +++ b/net-wireless/hostapd/files/2015-5/0002-NFC-Fix-payload-length-validation-in-NDEF-record-par.patch @@ -0,0 +1,61 @@ +From df9079e72760ceb7ebe7fb11538200c516bdd886 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Tue, 7 Jul 2015 21:57:28 +0300 +Subject: [PATCH] NFC: Fix payload length validation in NDEF record parser + +It was possible for the 32-bit record->total_length value to end up +wrapping around due to integer overflow if the longer form of payload +length field is used and record->payload_length gets a value close to +2^32. This could result in ndef_parse_record() accepting a too large +payload length value and the record type filter reading up to about 20 +bytes beyond the end of the buffer and potentially killing the process. +This could also result in an attempt to allocate close to 2^32 bytes of +heap memory and if that were to succeed, a buffer read overflow of the +same length which would most likely result in the process termination. +In case of record->total_length ending up getting the value 0, there +would be no buffer read overflow, but record parsing would result in an +infinite loop in ndef_parse_records(). + +Any of these error cases could potentially be used for denial of service +attacks over NFC by using a malformed NDEF record on an NFC Tag or +sending them during NFC connection handover if the application providing +the NDEF message to hostapd/wpa_supplicant did no validation of the +received records. While such validation is likely done in the NFC stack +that needs to parse the NFC messages before further processing, +hostapd/wpa_supplicant better be prepared for any data being included +here. + +Fix this by validating record->payload_length value in a way that +detects integer overflow. (CID 122668) + +Signed-off-by: Jouni Malinen +--- + src/wps/ndef.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/wps/ndef.c b/src/wps/ndef.c +index 5604b0a..50d018f 100644 +--- a/src/wps/ndef.c ++++ b/src/wps/ndef.c +@@ -48,6 +48,8 @@ static int ndef_parse_record(const u8 *data, u32 size, + if (size < 6) + return -1; + record->payload_length = WPA_GET_BE32(pos); ++ if (record->payload_length > size - 6) ++ return -1; + pos += sizeof(u32); + } + +@@ -68,7 +70,8 @@ static int ndef_parse_record(const u8 *data, u32 size, + pos += record->payload_length; + + record->total_length = pos - data; +- if (record->total_length > size) ++ if (record->total_length > size || ++ record->total_length < record->payload_length) + return -1; + return 0; + } +-- +1.9.1 + diff --git a/net-wireless/hostapd/hostapd-2.4-r3.ebuild b/net-wireless/hostapd/hostapd-2.4-r3.ebuild new file mode 100644 index 000000000000..65815170ec7e --- /dev/null +++ b/net-wireless/hostapd/hostapd-2.4-r3.ebuild @@ -0,0 +1,224 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-2.4-r3.ebuild,v 1.1 2015/07/14 19:36:35 gurligebis Exp $ + +EAPI="4" + +inherit toolchain-funcs eutils systemd + +DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon" +HOMEPAGE="http://hostap.epitest.fi" +SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz" + +LICENSE="|| ( GPL-2 BSD )" +SLOT="0" +KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86" +IUSE="ipv6 logwatch netlink sqlite +ssl +wps +crda" + +DEPEND="ssl? ( dev-libs/openssl[-bindist] ) + kernel_linux? ( + dev-libs/libnl:3 + crda? ( net-wireless/crda ) + ) + netlink? ( net-libs/libnfnetlink ) + sqlite? ( >=dev-db/sqlite-3 )" + +RDEPEND="${DEPEND}" + +S="${S}/${PN}" + +src_prepare() { + cd .. + + # bug (548744) + epatch "${FILESDIR}/2015-2/0001-WPS-Fix-HTTP-chunked-transfer-encoding-parser.patch" + epatch "${FILESDIR}/2015-3/0001-AP-WMM-Fix-integer-underflow-in-WMM-Action-frame-par.patch" + epatch "${FILESDIR}/2015-4/0001-EAP-pwd-peer-Fix-payload-length-validation-for-Commi.patch" + epatch "${FILESDIR}/2015-4/0002-EAP-pwd-server-Fix-payload-length-validation-for-Com.patch" + epatch "${FILESDIR}/2015-4/0003-EAP-pwd-peer-Fix-Total-Length-parsing-for-fragment-r.patch" + epatch "${FILESDIR}/2015-4/0004-EAP-pwd-server-Fix-Total-Length-parsing-for-fragment.patch" + epatch "${FILESDIR}/2015-4/0005-EAP-pwd-peer-Fix-asymmetric-fragmentation-behavior.patch" + + # bug (554862) + epatch "${FILESDIR}/2015-5/0001-NFC-Avoid-misaligned-read-of-an-NDEF-field.patch" + epatch "${FILESDIR}/2015-5/0002-NFC-Fix-payload-length-validation-in-NDEF-record-par.patch" + + cd "${PN}" + + epatch "${FILESDIR}/${PN}-hlr_auc_gw-openssl.patch" + + sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \ + "${S}/hostapd.conf" || die +} + +src_configure() { + local CONFIG="${S}/.config" + + # toolchain setup + echo "CC = $(tc-getCC)" > ${CONFIG} + + # EAP authentication methods + echo "CONFIG_EAP=y" >> ${CONFIG} + echo "CONFIG_ERP=y" >> ${CONFIG} + echo "CONFIG_EAP_MD5=y" >> ${CONFIG} + + if use ssl; then + # SSL authentication methods + echo "CONFIG_EAP_FAST=y" >> ${CONFIG} + echo "CONFIG_EAP_TLS=y" >> ${CONFIG} + echo "CONFIG_EAP_TTLS=y" >> ${CONFIG} + echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG} + echo "CONFIG_EAP_PEAP=y" >> ${CONFIG} + echo "CONFIG_TLSV11=y" >> ${CONFIG} + echo "CONFIG_TLSV12=y" >> ${CONFIG} + fi + + if use wps; then + # Enable Wi-Fi Protected Setup + echo "CONFIG_WPS=y" >> ${CONFIG} + echo "CONFIG_WPS2=y" >> ${CONFIG} + echo "CONFIG_WPS_UPNP=y" >> ${CONFIG} + echo "CONFIG_WPS_NFC=y" >> ${CONFIG} + einfo "Enabling Wi-Fi Protected Setup support" + fi + + echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG} + echo "CONFIG_EAP_TNC=y" >> ${CONFIG} + echo "CONFIG_EAP_GTC=y" >> ${CONFIG} + echo "CONFIG_EAP_SIM=y" >> ${CONFIG} + echo "CONFIG_EAP_AKA=y" >> ${CONFIG} + echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG} + echo "CONFIG_EAP_EKE=y" >> ${CONFIG} + echo "CONFIG_EAP_PAX=y" >> ${CONFIG} + echo "CONFIG_EAP_PSK=y" >> ${CONFIG} + echo "CONFIG_EAP_SAKE=y" >> ${CONFIG} + echo "CONFIG_EAP_GPSK=y" >> ${CONFIG} + echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG} + echo "CONFIG_EAP_PWD=y" >> ${CONFIG} + + einfo "Enabling drivers: " + + # drivers + echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG} + einfo " HostAP driver enabled" + echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG} + einfo " Wired driver enabled" + echo "CONFIG_DRIVER_PRISM54=y" >> ${CONFIG} + einfo " Prism54 driver enabled" + echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG} + einfo " None driver enabled" + + einfo " nl80211 driver enabled" + echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG} + + # misc + echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG} + echo "CONFIG_PKCS12=y" >> ${CONFIG} + echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG} + echo "CONFIG_IAPP=y" >> ${CONFIG} + echo "CONFIG_IEEE80211R=y" >> ${CONFIG} + echo "CONFIG_IEEE80211W=y" >> ${CONFIG} + echo "CONFIG_IEEE80211N=y" >> ${CONFIG} + echo "CONFIG_IEEE80211AC=y" >> ${CONFIG} + echo "CONFIG_PEERKEY=y" >> ${CONFIG} + echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG} + echo "CONFIG_INTERWORKING=y" >> ${CONFIG} + echo "CONFIG_FULL_DYNAMIC_VLAN=y" >> ${CONFIG} + echo "CONFIG_HS20=y" >> ${CONFIG} + echo "CONFIG_WNM=y" >> ${CONFIG} + echo "CONFIG_ACS=y" >> ${CONFIG} + + if use netlink; then + # Netlink support + echo "CONFIG_VLAN_NETLINK=y" >> ${CONFIG} + fi + + if use ipv6; then + # IPv6 support + echo "CONFIG_IPV6=y" >> ${CONFIG} + fi + + if use sqlite; then + # Sqlite support + echo "CONFIG_SQLITE=y" >> ${CONFIG} + fi + + # If we are using libnl 2.0 and above, enable support for it + # Removed for now, since the 3.2 version is broken, and we don't + # support it. + if has_version ">=dev-libs/libnl-3.2"; then + echo "CONFIG_LIBNL32=y" >> .config + fi + + # TODO: Add support for BSD drivers + + default_src_configure +} + +src_compile() { + emake V=1 + + if use ssl; then + emake V=1 nt_password_hash + emake V=1 hlr_auc_gw + fi +} + +src_install() { + insinto /etc/${PN} + doins ${PN}.{conf,accept,deny,eap_user,radius_clients,sim_db,wpa_psk} + + fperms -R 600 /etc/${PN} + + dosbin ${PN} + dobin ${PN}_cli + + use ssl && dobin nt_password_hash hlr_auc_gw + + newinitd "${FILESDIR}"/${PN}-init.d ${PN} + newconfd "${FILESDIR}"/${PN}-conf.d ${PN} + systemd_dounit "${FILESDIR}"/${PN}.service + + doman ${PN}{.8,_cli.1} + + dodoc ChangeLog README + use wps && dodoc README-WPS + + docinto examples + dodoc wired.conf + + if use logwatch; then + insinto /etc/log.d/conf/services/ + doins logwatch/${PN}.conf + + exeinto /etc/log.d/scripts/services/ + doexe logwatch/${PN} + fi +} + +pkg_postinst() { + einfo + einfo "If you are running openRC you need to follow this instructions:" + einfo "In order to use ${PN} you need to set up your wireless card" + einfo "for master mode in /etc/conf.d/net and then start" + einfo "/etc/init.d/${PN}." + einfo + einfo "Example configuration:" + einfo + einfo "config_wlan0=( \"192.168.1.1/24\" )" + einfo "channel_wlan0=\"6\"" + einfo "essid_wlan0=\"test\"" + einfo "mode_wlan0=\"master\"" + einfo + #if [ -e "${KV_DIR}"/net/mac80211 ]; then + # einfo "This package now compiles against the headers installed by" + # einfo "the kernel source for the mac80211 driver. You should " + # einfo "re-emerge ${PN} after upgrading your kernel source." + #fi + + if use wps; then + einfo "You have enabled Wi-Fi Protected Setup support, please" + einfo "read the README-WPS file in /usr/share/doc/${P}" + einfo "for info on how to use WPS" + fi +} diff --git a/net-wireless/wpa_supplicant/files/2015-5/0001-NFC-Avoid-misaligned-read-of-an-NDEF-field.patch b/net-wireless/wpa_supplicant/files/2015-5/0001-NFC-Avoid-misaligned-read-of-an-NDEF-field.patch new file mode 100644 index 000000000000..d03eb484fc28 --- /dev/null +++ b/net-wireless/wpa_supplicant/files/2015-5/0001-NFC-Avoid-misaligned-read-of-an-NDEF-field.patch @@ -0,0 +1,29 @@ +From fc880b11ed70ff9dcf8be48621f75d354cc5094d Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Tue, 7 Jul 2015 15:33:55 +0300 +Subject: [PATCH] NFC: Avoid misaligned read of an NDEF field + +The 32-bit version of payload length field may not be 32-bit aligned in +the message buffer, so use WPA_GET_BE32() to read it instead of ntohl(). + +Signed-off-by: Jouni Malinen +--- + src/wps/ndef.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/wps/ndef.c b/src/wps/ndef.c +index 8d1ce1e..5604b0a 100644 +--- a/src/wps/ndef.c ++++ b/src/wps/ndef.c +@@ -47,7 +47,7 @@ static int ndef_parse_record(const u8 *data, u32 size, + } else { + if (size < 6) + return -1; +- record->payload_length = ntohl(*(u32 *)pos); ++ record->payload_length = WPA_GET_BE32(pos); + pos += sizeof(u32); + } + +-- +1.7.9.5 + diff --git a/net-wireless/wpa_supplicant/files/2015-5/0002-NFC-Fix-payload-length-validation-in-NDEF-record-par.patch b/net-wireless/wpa_supplicant/files/2015-5/0002-NFC-Fix-payload-length-validation-in-NDEF-record-par.patch new file mode 100644 index 000000000000..1f624c8dad46 --- /dev/null +++ b/net-wireless/wpa_supplicant/files/2015-5/0002-NFC-Fix-payload-length-validation-in-NDEF-record-par.patch @@ -0,0 +1,61 @@ +From df9079e72760ceb7ebe7fb11538200c516bdd886 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Tue, 7 Jul 2015 21:57:28 +0300 +Subject: [PATCH] NFC: Fix payload length validation in NDEF record parser + +It was possible for the 32-bit record->total_length value to end up +wrapping around due to integer overflow if the longer form of payload +length field is used and record->payload_length gets a value close to +2^32. This could result in ndef_parse_record() accepting a too large +payload length value and the record type filter reading up to about 20 +bytes beyond the end of the buffer and potentially killing the process. +This could also result in an attempt to allocate close to 2^32 bytes of +heap memory and if that were to succeed, a buffer read overflow of the +same length which would most likely result in the process termination. +In case of record->total_length ending up getting the value 0, there +would be no buffer read overflow, but record parsing would result in an +infinite loop in ndef_parse_records(). + +Any of these error cases could potentially be used for denial of service +attacks over NFC by using a malformed NDEF record on an NFC Tag or +sending them during NFC connection handover if the application providing +the NDEF message to hostapd/wpa_supplicant did no validation of the +received records. While such validation is likely done in the NFC stack +that needs to parse the NFC messages before further processing, +hostapd/wpa_supplicant better be prepared for any data being included +here. + +Fix this by validating record->payload_length value in a way that +detects integer overflow. (CID 122668) + +Signed-off-by: Jouni Malinen +--- + src/wps/ndef.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/wps/ndef.c b/src/wps/ndef.c +index 5604b0a..50d018f 100644 +--- a/src/wps/ndef.c ++++ b/src/wps/ndef.c +@@ -48,6 +48,8 @@ static int ndef_parse_record(const u8 *data, u32 size, + if (size < 6) + return -1; + record->payload_length = WPA_GET_BE32(pos); ++ if (record->payload_length > size - 6) ++ return -1; + pos += sizeof(u32); + } + +@@ -68,7 +70,8 @@ static int ndef_parse_record(const u8 *data, u32 size, + pos += record->payload_length; + + record->total_length = pos - data; +- if (record->total_length > size) ++ if (record->total_length > size || ++ record->total_length < record->payload_length) + return -1; + return 0; + } +-- +1.9.1 + diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.4-r4.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.4-r4.ebuild new file mode 100644 index 000000000000..fdaaf9fde1b9 --- /dev/null +++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.4-r4.ebuild @@ -0,0 +1,387 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-2.4-r4.ebuild,v 1.1 2015/07/14 19:42:57 gurligebis Exp $ + +EAPI=5 + +inherit eutils toolchain-funcs qt4-r2 systemd multilib + +DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers" +HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/" +SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz" +LICENSE="|| ( GPL-2 BSD )" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="ap dbus gnutls eap-sim fasteap +hs2-0 p2p ps3 qt4 readline selinux smartcard ssl tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD" +REQUIRED_USE="fasteap? ( !gnutls !ssl ) smartcard? ( ssl )" + +CDEPEND="dbus? ( sys-apps/dbus ) + kernel_linux? ( + eap-sim? ( sys-apps/pcsc-lite ) + dev-libs/libnl:3 + net-wireless/crda + ) + !kernel_linux? ( net-libs/libpcap ) + qt4? ( + dev-qt/qtcore:4 + dev-qt/qtgui:4 + dev-qt/qtsvg:4 + ) + readline? ( + sys-libs/ncurses + sys-libs/readline:0 + ) + ssl? ( dev-libs/openssl:0 ) + !ssl? ( gnutls? ( net-libs/gnutls ) ) + !ssl? ( !gnutls? ( dev-libs/libtommath ) ) +" +DEPEND="${CDEPEND} + virtual/pkgconfig +" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-networkmanager ) +" + +S="${WORKDIR}/${P}/${PN}" + +Kconfig_style_config() { + #param 1 is CONFIG_* item + #param 2 is what to set it = to, defaulting in y + CONFIG_PARAM="${CONFIG_HEADER:-CONFIG_}$1" + setting="${2:-y}" + + if [ ! $setting = n ]; then + #first remove any leading "# " if $2 is not n + sed -i "/^# *$CONFIG_PARAM=/s/^# *//" .config || echo "Kconfig_style_config error uncommenting $CONFIG_PARAM" + #set item = $setting (defaulting to y) + sed -i "/^$CONFIG_PARAM/s/=.*/=$setting/" .config || echo "Kconfig_style_config error setting $CONFIG_PARAM=$setting" + else + #ensure item commented out + sed -i "/^$CONFIG_PARAM/s/$CONFIG_PARAM/# $CONFIG_PARAM/" .config || echo "Kconfig_style_config error commenting $CONFIG_PARAM" + fi +} + +pkg_setup() { + if use gnutls && use ssl ; then + elog "You have both 'gnutls' and 'ssl' USE flags enabled: defaulting to USE=\"ssl\"" + fi +} + +src_prepare() { + # net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD + sed -i \ + -e "s:\(#include \):#include \n\1:" \ + ../src/l2_packet/l2_packet_freebsd.c || die + + # People seem to take the example configuration file too literally (bug #102361) + sed -i \ + -e "s:^\(opensc_engine_path\):#\1:" \ + -e "s:^\(pkcs11_engine_path\):#\1:" \ + -e "s:^\(pkcs11_module_path\):#\1:" \ + wpa_supplicant.conf || die + + # Change configuration to match Gentoo locations (bug #143750) + sed -i \ + -e "s:/usr/lib/opensc:/usr/$(get_libdir):" \ + -e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \ + wpa_supplicant.conf || die + + if use dbus; then + epatch "${FILESDIR}/${P}-dbus-path-fix.patch" + fi + + # systemd entries to D-Bus service files (bug #372877) + echo 'SystemdService=wpa_supplicant.service' \ + | tee -a dbus/*.service >/dev/null || die + + cd "${WORKDIR}/${P}" + + if use wimax; then + # generate-libeap-peer.patch comes before + # fix-undefined-reference-to-random_get_bytes.patch + epatch "${FILESDIR}/${P}-generate-libeap-peer.patch" + + # multilib-strict fix (bug #373685) + sed -e "s/\/usr\/lib/\/usr\/$(get_libdir)/" -i src/eap_peer/Makefile + fi + + # bug (548742) + epatch "${FILESDIR}/2015-1/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch" + epatch "${FILESDIR}/2015-2/0001-WPS-Fix-HTTP-chunked-transfer-encoding-parser.patch" + epatch "${FILESDIR}/2015-3/0001-AP-WMM-Fix-integer-underflow-in-WMM-Action-frame-par.patch" + epatch "${FILESDIR}/2015-4/0001-EAP-pwd-peer-Fix-payload-length-validation-for-Commi.patch" + epatch "${FILESDIR}/2015-4/0002-EAP-pwd-server-Fix-payload-length-validation-for-Com.patch" + epatch "${FILESDIR}/2015-4/0003-EAP-pwd-peer-Fix-Total-Length-parsing-for-fragment-r.patch" + epatch "${FILESDIR}/2015-4/0004-EAP-pwd-server-Fix-Total-Length-parsing-for-fragment.patch" + epatch "${FILESDIR}/2015-4/0005-EAP-pwd-peer-Fix-asymmetric-fragmentation-behavior.patch" + + # bug (554860) + epatch "${FILESDIR}/2015-5/0001-NFC-Avoid-misaligned-read-of-an-NDEF-field.patch" + epatch "${FILESDIR}/2015-5/0002-NFC-Fix-payload-length-validation-in-NDEF-record-par.patch" + + # bug (320097) + epatch "${FILESDIR}/${P}-do-not-call-dbus-functions-with-NULL-path.patch" + + # TODO - NEED TESTING TO SEE IF STILL NEEDED, NOT COMPATIBLE WITH 1.0 OUT OF THE BOX, + # SO WOULD BE NICE TO JUST DROP IT, IF IT IS NOT NEEDED. + # bug (374089) + #epatch "${FILESDIR}/${P}-dbus-WPAIE-fix.patch" +} + +src_configure() { + # Toolchain setup + tc-export CC + + cp defconfig .config + + # Basic setup + Kconfig_style_config CTRL_IFACE + Kconfig_style_config BACKEND file + Kconfig_style_config IBSS_RSN + Kconfig_style_config IEEE80211W + Kconfig_style_config IEEE80211R + + # Basic authentication methods + # NOTE: we don't set GPSK or SAKE as they conflict + # with the below options + Kconfig_style_config EAP_GTC + Kconfig_style_config EAP_MD5 + Kconfig_style_config EAP_OTP + Kconfig_style_config EAP_PAX + Kconfig_style_config EAP_PSK + Kconfig_style_config EAP_TLV + Kconfig_style_config EAP_EXE + Kconfig_style_config IEEE8021X_EAPOL + Kconfig_style_config PKCS12 + Kconfig_style_config PEERKEY + Kconfig_style_config EAP_LEAP + Kconfig_style_config EAP_MSCHAPV2 + Kconfig_style_config EAP_PEAP + Kconfig_style_config EAP_TLS + Kconfig_style_config EAP_TTLS + + # Enabling background scanning. + Kconfig_style_config BGSCAN_SIMPLE + Kconfig_style_config BGSCAN_LEARN + + if use dbus ; then + Kconfig_style_config CTRL_IFACE_DBUS + Kconfig_style_config CTRL_IFACE_DBUS_NEW + Kconfig_style_config CTRL_IFACE_DBUS_INTRO + fi + + # Enable support for writing debug info to a log file and syslog. + Kconfig_style_config DEBUG_FILE + Kconfig_style_config DEBUG_SYSLOG + + if use hs2-0 ; then + Kconfig_style_config INTERWORKING + Kconfig_style_config HS20 + fi + + if use uncommon-eap-types; then + Kconfig_style_config EAP_GPSK + Kconfig_style_config EAP_SAKE + Kconfig_style_config EAP_GPSK_SHA256 + Kconfig_style_config EAP_IKEV2 + Kconfig_style_config EAP_EKE + fi + + if use eap-sim ; then + # Smart card authentication + Kconfig_style_config EAP_SIM + Kconfig_style_config EAP_AKA + Kconfig_style_config EAP_AKA_PRIME + Kconfig_style_config PCSC + fi + + if use fasteap ; then + Kconfig_style_config EAP_FAST + fi + + if use readline ; then + # readline/history support for wpa_cli + Kconfig_style_config READLINE + else + #internal line edit mode for wpa_cli + Kconfig_style_config WPA_CLI_EDIT + fi + + # SSL authentication methods + if use ssl ; then + Kconfig_style_config TLS openssl + elif use gnutls ; then + Kconfig_style_config TLS gnutls + Kconfig_style_config GNUTLS_EXTRA + else + Kconfig_style_config TLS internal + fi + + if use smartcard ; then + Kconfig_style_config SMARTCARD + fi + + if use tdls ; then + Kconfig_style_config TDLS + fi + + if use kernel_linux ; then + # Linux specific drivers + Kconfig_style_config DRIVER_ATMEL + Kconfig_style_config DRIVER_HOSTAP + Kconfig_style_config DRIVER_IPW + Kconfig_style_config DRIVER_NL80211 + Kconfig_style_config DRIVER_RALINK + Kconfig_style_config DRIVER_WEXT + Kconfig_style_config DRIVER_WIRED + + if use ps3 ; then + Kconfig_style_config DRIVER_PS3 + fi + + elif use kernel_FreeBSD ; then + # FreeBSD specific driver + Kconfig_style_config DRIVER_BSD + fi + + # Wi-Fi Protected Setup (WPS) + if use wps ; then + Kconfig_style_config WPS + Kconfig_style_config WPS2 + # USB Flash Drive + Kconfig_style_config WPS_UFD + # External Registrar + Kconfig_style_config WPS_ER + # Universal Plug'n'Play + Kconfig_style_config WPS_UPNP + # Near Field Communication + Kconfig_style_config WPS_NFC + fi + + # Wi-Fi Direct (WiDi) + if use p2p ; then + Kconfig_style_config P2P + Kconfig_style_config WIFI_DISPLAY + fi + + # Access Point Mode + if use ap ; then + Kconfig_style_config AP + fi + + # Enable mitigation against certain attacks against TKIP + Kconfig_style_config DELAYED_MIC_ERROR_REPORT + + # If we are using libnl 2.0 and above, enable support for it + # Bug 382159 + # Removed for now, since the 3.2 version is broken, and we don't + # support it. + if has_version ">=dev-libs/libnl-3.2"; then + Kconfig_style_config LIBNL32 + fi + + if use qt4 ; then + pushd "${S}"/wpa_gui-qt4 > /dev/null + eqmake4 wpa_gui.pro + popd > /dev/null + fi +} + +src_compile() { + einfo "Building wpa_supplicant" + emake V=1 BINDIR=/usr/sbin + + if use wimax; then + emake -C ../src/eap_peer clean + emake -C ../src/eap_peer + fi + + if use qt4 ; then + pushd "${S}"/wpa_gui-qt4 > /dev/null + einfo "Building wpa_gui" + emake + popd > /dev/null + fi +} + +src_install() { + dosbin wpa_supplicant + dobin wpa_cli wpa_passphrase + + # baselayout-1 compat + if has_version "=sys-apps/openrc-0.5.0"; then + newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant + newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant + fi + + exeinto /etc/wpa_supplicant/ + newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh + + dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \ + wpa_supplicant.conf + + newdoc .config build-config + + doman doc/docbook/*.{5,8} + + if use qt4 ; then + into /usr + dobin wpa_gui-qt4/wpa_gui + doicon wpa_gui-qt4/icons/wpa_gui.svg + make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" "wpa_gui" "Qt;Network;" + fi + + use wimax && emake DESTDIR="${D}" -C ../src/eap_peer install + + if use dbus ; then + pushd "${S}"/dbus > /dev/null + insinto /etc/dbus-1/system.d + newins dbus-wpa_supplicant.conf wpa_supplicant.conf + insinto /usr/share/dbus-1/system-services + doins fi.epitest.hostap.WPASupplicant.service fi.w1.wpa_supplicant1.service + popd > /dev/null + + # This unit relies on dbus support, bug 538600. + systemd_dounit systemd/wpa_supplicant.service + fi + + systemd_dounit "systemd/wpa_supplicant@.service" + systemd_dounit "systemd/wpa_supplicant-nl80211@.service" + systemd_dounit "systemd/wpa_supplicant-wired@.service" +} + +pkg_postinst() { + elog "If this is a clean installation of wpa_supplicant, you" + elog "have to create a configuration file named" + elog "/etc/wpa_supplicant/wpa_supplicant.conf" + elog + elog "An example configuration file is available for reference in" + elog "/usr/share/doc/${PF}/" + + if [[ -e ${ROOT}etc/wpa_supplicant.conf ]] ; then + echo + ewarn "WARNING: your old configuration file ${ROOT}etc/wpa_supplicant.conf" + ewarn "needs to be moved to ${ROOT}etc/wpa_supplicant/wpa_supplicant.conf" + fi + + # Mea culpa, feel free to remove that after some time --mgorny. + local fn + for fn in wpa_supplicant{,@wlan0}.service; do + if [[ -e "${ROOT}"/etc/systemd/system/network.target.wants/${fn} ]] + then + ebegin "Moving ${fn} to multi-user.target" + mv "${ROOT}"/etc/systemd/system/network.target.wants/${fn} \ + "${ROOT}"/etc/systemd/system/multi-user.target.wants/ + eend ${?} \ + "Please try to re-enable ${fn}" + fi + done +} diff --git a/profiles/use.local.desc b/profiles/use.local.desc index 72f599a3fee3..82733883db8e 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -3424,6 +3424,7 @@ mail-filter/opendkim:opendbx - Use opendbx backend to facilitate dataset driven mail-filter/opendkim:poll - Use poll() instead of select() for the provided asynchronous resolver library. mail-filter/opendkim:sasl - Used to authenticate to a LDAP server in various ways if required. mail-filter/opendkim:unbound - Use the unbound dnssec library to perform DKIM DNS queries. +mail-filter/opendmarc:spf - Use the mail-filter/libspf2 for Sender Policy Framework checking mail-filter/opensmtpd-extras:filter-clamav - filter for scanning with app-antivirus/clamav mail-filter/opensmtpd-extras:filter-dkim-signer - filter for adding DKIM signatures to outgoing messages mail-filter/opensmtpd-extras:filter-dnsbl - filter for checking hosts against the DNS black lists diff --git a/sys-apps/less/less-478.ebuild b/sys-apps/less/less-478.ebuild index 9321af1a04ae..5df7a4bc28cc 100644 --- a/sys-apps/less/less-478.ebuild +++ b/sys-apps/less/less-478.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/sys-apps/less/less-478.ebuild,v 1.6 2015/07/09 17:05:42 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-478.ebuild,v 1.7 2015/07/14 18:39:54 klausman Exp $ EAPI="4" @@ -15,7 +15,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz LICENSE="|| ( GPL-3 BSD-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 ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="pcre unicode" DEPEND=">=app-misc/editor-wrapper-3 diff --git a/sys-auth/polkit/polkit-0.113.ebuild b/sys-auth/polkit/polkit-0.113.ebuild index d742cce195d2..52aa621cdbef 100644 --- a/sys-auth/polkit/polkit-0.113.ebuild +++ b/sys-auth/polkit/polkit-0.113.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/sys-auth/polkit/polkit-0.113.ebuild,v 1.1 2015/07/04 13:26:52 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.113.ebuild,v 1.2 2015/07/14 16:17:55 klausman Exp $ EAPI=5 inherit eutils multilib pam pax-utils systemd user @@ -11,7 +11,7 @@ SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz" LICENSE="LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" IUSE="examples gtk +introspection jit kde nls pam selinux systemd test" CDEPEND=" diff --git a/sys-libs/pam/pam-1.2.1.ebuild b/sys-libs/pam/pam-1.2.1.ebuild index a2d91b872126..c94f262479e9 100644 --- a/sys-libs/pam/pam-1.2.1.ebuild +++ b/sys-libs/pam/pam-1.2.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/sys-libs/pam/pam-1.2.1.ebuild,v 1.3 2015/07/14 06:18:52 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.2.1.ebuild,v 1.4 2015/07/14 18:25:24 klausman Exp $ EAPI=5 @@ -16,7 +16,7 @@ SRC_URI="http://www.linux-pam.org/library/${MY_P}.tar.bz2 LICENSE="|| ( BSD GPL-2 )" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux" +KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux" IUSE="audit berkdb cracklib debug nis nls +pie selinux test vim-syntax" RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) diff --git a/sys-power/thermald/files/thermald-1.4.2-terminate-r1.patch b/sys-power/thermald/files/thermald-1.4.2-terminate-r1.patch new file mode 100644 index 000000000000..96ba91ffe5ec --- /dev/null +++ b/sys-power/thermald/files/thermald-1.4.2-terminate-r1.patch @@ -0,0 +1,65 @@ +commit 14bf458675a735975c6b9bf7394682e93398a8e0 +Author: Srinivas Pandruvada +Date: Tue Jul 14 17:46:45 2015 -0700 + + Fix regression in exit via dbus message + + Terminate via dbus terminate message is broken. Fixed this. + Thanks to Yixun Lan for finding this. + +diff --git a/src/main.cpp b/src/main.cpp +index 2cf4864..d692cf3 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -50,7 +50,7 @@ + #define TD_DIST_VERSION PACKAGE_VERSION + #endif + +-extern int thd_dbus_server_init(); ++extern int thd_dbus_server_init(void (*exit_handler)(int)); + + // Default log level + static int thd_log_level = G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL +@@ -263,7 +263,7 @@ int main(int argc, char *argv[]) { + } + + if (dbus_enable) +- thd_dbus_server_init(); ++ thd_dbus_server_init(sig_int_handler); + + if (!no_daemon) { + printf("Ready to serve requests: Daemonizing.. %d\n", thd_daemonize); +diff --git a/src/thd_dbus_interface.cpp b/src/thd_dbus_interface.cpp +index 021bce2..7926101 100644 +--- a/src/thd_dbus_interface.cpp ++++ b/src/thd_dbus_interface.cpp +@@ -187,8 +187,12 @@ gboolean thd_dbus_interface_get_current_preference(PrefObject *obj, + return TRUE; + } + ++void (*thd_dbus_exit_callback)(int); + gboolean thd_dbus_interface_terminate(PrefObject *obj, GError **error) { + thd_engine->thd_engine_terminate(); ++ if (thd_dbus_exit_callback) ++ thd_dbus_exit_callback(0); ++ + return TRUE; + } + +@@ -561,13 +565,15 @@ gboolean thd_dbus_interface_get_sensor_temperature(PrefObject *obj, int index, + } + + // Setup dbus server +-int thd_dbus_server_init() { ++int thd_dbus_server_init(void (*exit_handler)(int)) { + DBusGConnection *bus; + DBusGProxy *bus_proxy; + GError *error = NULL; + guint result; + PrefObject *value_obj; + ++ thd_dbus_exit_callback = exit_handler; ++ + bus = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error); + if (error != NULL) { + thd_log_error("Couldn't connect to session bus: %s:\n", error->message); diff --git a/sys-power/thermald/files/thermald-1.4.2-terminate.patch b/sys-power/thermald/files/thermald-1.4.2-terminate.patch deleted file mode 100644 index a988514a4b5d..000000000000 --- a/sys-power/thermald/files/thermald-1.4.2-terminate.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/src/main.cpp b/src/main.cpp -index 2cf4864..49489d2 100644 ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -129,6 +129,11 @@ bool check_thermald_running() { - return false; - } - -+void thd_main_quit(void) { -+ if (g_main_loop) -+ g_main_loop_quit(g_main_loop); -+} -+ - // SIGTERM & SIGINT handler - void sig_int_handler(int signum) { - thd_engine->thd_engine_terminate(); -diff --git a/src/thd_engine.cpp b/src/thd_engine.cpp -index c7352ac..4fc5ad6 100644 ---- a/src/thd_engine.cpp -+++ b/src/thd_engine.cpp -@@ -348,10 +348,13 @@ void cthd_engine::process_pref_change() { - } - } - -+extern void thd_main_quit(void); - void cthd_engine::thd_engine_terminate() { - send_message(TERMINATE, 0, NULL); - sleep(1); - process_terminate(); -+ -+ thd_main_quit(); - } - - int cthd_engine::thd_engine_set_user_max_temp(const char *zone_type, diff --git a/sys-power/thermald/thermald-1.4.2.ebuild b/sys-power/thermald/thermald-1.4.2-r1.ebuild similarity index 91% rename from sys-power/thermald/thermald-1.4.2.ebuild rename to sys-power/thermald/thermald-1.4.2-r1.ebuild index e77a6fd4a3a8..d4241817e1ae 100644 --- a/sys-power/thermald/thermald-1.4.2.ebuild +++ b/sys-power/thermald/thermald-1.4.2-r1.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/sys-power/thermald/thermald-1.4.2.ebuild,v 1.1 2015/07/14 10:21:10 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/thermald/thermald-1.4.2-r1.ebuild,v 1.1 2015/07/15 04:20:40 dlan Exp $ EAPI=5 @@ -28,7 +28,7 @@ RDEPEND="${CDEPEND}" DOCS=( thermal_daemon_usage.txt README.txt ) PATCHES=( - "${FILESDIR}/${P}-terminate.patch" + "${FILESDIR}/${P}-terminate-r1.patch" ) src_configure() { diff --git a/www-plugins/freshplayerplugin/Manifest b/www-plugins/freshplayerplugin/Manifest index abb3729a81ec..9a98bf273fd3 100644 --- a/www-plugins/freshplayerplugin/Manifest +++ b/www-plugins/freshplayerplugin/Manifest @@ -1,3 +1,3 @@ -DIST freshplayerplugin-0.2.3.tar.gz 402126 SHA256 b28ae17dec274aa6eb819d496088efbc503aa6bfba09192e2f08200ecf66d10b SHA512 bc2ee4377103d7d56d40ebed19cff0dd4acdb7a810225381d9d49874ca3925cb5c72f9ca576f2b9e58a4374fe546d99a0bc97c9c95eb3d44e08fe68e1310bf51 WHIRLPOOL 5180f9709ae6bd691c1df8daaf03b91aa80ab1a5e0b1c562919dd179f8252a5ae8bfe6fdc98bde1d4fff88098045a06e6cdabc66ab95604e70c9a084e2bc085d DIST freshplayerplugin-0.2.4.tar.gz 490685 SHA256 e071c811778577f44331edcd418472fc392effd416c0750cbf384a30c9269163 SHA512 b16bfb90554ce2355a10d2a81fe611a9c15e8e945b39d0d2e1d954e87ea0ba849206785187cd4b52f523e560ee28e9a6728ec58244d41000050d59d13d96e7c4 WHIRLPOOL 21f6b66bbee6ea13c6708316281bfb963fe73e8104d5db202a0241ff7c46553ffeac4736f7b66d94a7c12e94c4a38336e4ba56dfccee3481e85da856dde5631f DIST freshplayerplugin-0.3.0.tar.gz 2706001 SHA256 ca0281884874f010243496567e9f6717dfea5fdf0406ee39260d234fd57f247e SHA512 5e72131959a119805dcee9fd8d7e5eda0a2100de34eba75643adab7543ec5120babce2b824f8813763da83927c599c14db5ef93ab8ae83a7ea4b942ca4746445 WHIRLPOOL 7cc4867034a0374640e36378665ffa831ea164610b3bb57f607e3f9648e6dc609ee6196a11c781b8f4f138e22e7e9689b2f642258110e088d4eb17e9f820b47f +DIST freshplayerplugin-0.3.1.tar.gz 2711793 SHA256 4ed582896fff618d8025dd51bbf2fae0c5e36e2875065acc536b2c76befb593c SHA512 78e87548ecd758ad9ff0dab59b1b2f68b8b9a639ff19de08046a7090ab51d87f0e4c879b1b0075151ff17642d50ff937e199733c55c4a9cff94599fd98eae9de WHIRLPOOL d8be949cc9a2087d8f62fcfb4a1786d68574a5ec52dccc45da06df9838ee84e8dd4d7f3c3f86703e428df1b3f4d6d75c1e87d0809d3f78550a16ed278d51b211 diff --git a/www-plugins/freshplayerplugin/files/with-pulseaudio-cmake.patch b/www-plugins/freshplayerplugin/files/with-pulseaudio-cmake.patch deleted file mode 100644 index 22bad5728292..000000000000 --- a/www-plugins/freshplayerplugin/files/with-pulseaudio-cmake.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -aurN a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2015-02-15 17:05:40.000000000 -0500 -+++ b/CMakeLists.txt 2015-03-10 19:33:48.519110012 -0400 -@@ -45,12 +45,18 @@ - openssl - REQUIRED) - --pkg_check_modules(PULSEAUDIO libpulse) -+OPTION(WITH_PULSEAUDIO "Enable pulseaudio support" ON) - --if (${PULSEAUDIO_FOUND}) -- add_definitions(-DHAVE_PULSEAUDIO=1) -- set(HAVE_PULSEAUDIO 1) --endif() -+IF(WITH_PULSEAUDIO) -+ pkg_check_modules(PULSEAUDIO libpulse) -+ -+ if (${PULSEAUDIO_FOUND}) -+ add_definitions(-DHAVE_PULSEAUDIO=1) -+ set(HAVE_PULSEAUDIO 1) -+ else() -+ MESSAGE(FATAL_ERROR "PulseAudio not found") -+ endif() -+ENDIF(WITH_PULSEAUDIO) - - include_directories(${REQ_INCLUDE_DIRS}) - add_definitions(${REQ_CFLAGS_OTHER}) diff --git a/www-plugins/freshplayerplugin/freshplayerplugin-0.2.3.ebuild b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.1.ebuild similarity index 72% rename from www-plugins/freshplayerplugin/freshplayerplugin-0.2.3.ebuild rename to www-plugins/freshplayerplugin/freshplayerplugin-0.3.1.ebuild index f3ddc5e8fdbd..d13aae06cc69 100644 --- a/www-plugins/freshplayerplugin/freshplayerplugin-0.2.3.ebuild +++ b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.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/www-plugins/freshplayerplugin/freshplayerplugin-0.2.3.ebuild,v 1.1 2015/03/11 01:13:44 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/freshplayerplugin/freshplayerplugin-0.3.1.ebuild,v 1.1 2015/07/14 23:57:18 grknight Exp $ EAPI=5 @@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/i-rinat/freshplayerplugin" DESCRIPTION="PPAPI-host NPAPI-plugin adapter for flashplayer in npapi based browsers" SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" SLOT=0 -IUSE="pulseaudio" +IUSE="gtk3 jack pulseaudio vaapi" KEYWORDS="~amd64 ~x86" @@ -24,12 +24,18 @@ CDEPEND=" dev-libs/openssl:0= media-libs/alsa-lib:= media-libs/freetype:2= + media-libs/libv4l:0= media-libs/mesa:=[egl,gles2] - x11-libs/gtk+:2= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:=[X] + jack? ( media-sound/jack ) pulseaudio? ( media-sound/pulseaudio ) + !gtk3? ( x11-libs/gtk+:2= ) + gtk3? ( x11-libs/gtk+:3= ) + vaapi? ( x11-libs/libva + x11-libs/libvdpau + ) " DEPEND="${CDEPEND} @@ -45,10 +51,16 @@ RDEPEND="${CDEPEND} ) " -PATCHES=( "${FILESDIR}/with-pulseaudio-cmake.patch" ) +PATCHES=( "${FILESDIR}/0.2.4-cmake.patch" ) src_configure() { - mycmakeargs=( $(cmake-utils_use_with pulseaudio PULSEAUDIO) ) + mycmakeargs=( + $(cmake-utils_use_with jack JACK) + $(cmake-utils_use_with pulseaudio PULSEAUDIO) + -DWITH_GTK=$(usex gtk3 3 2) + -DCMAKE_SKIP_RPATH=1 + -DWITH_HWDEC=$(usex vaapi 1 0) + ) cmake-utils_src_configure }