Merge updates from master

9 files changed, 50 insertions, 26 deletions

diff --git a/app-portage/gentoopm/gentoopm-9999.ebuild b/app-portage/gentoopm/gentoopm-9999.ebuild
index 00ffce28a599..a1bcef5a3b31 100644
--- a/app-portage/gentoopm/gentoopm-9999.ebuild
+++ b/app-portage/gentoopm/gentoopm-9999.ebuild
@@ -2,41 +2,38 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
 
-inherit distutils-r1
-
-#if LIVE
-HOMEPAGE="https://github.com/mgorny/gentoopm.git"
-inherit git-r3
-#endif
+EGIT_REPO_URI="https://github.com/mgorny/gentoopm.git"
+inherit distutils-r1 git-r3
 
 DESCRIPTION="A common interface to Gentoo package managers"
 HOMEPAGE="https://github.com/mgorny/gentoopm/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+SRC_URI=""
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS=""
 IUSE="doc"
 
-RDEPEND="|| (
-		sys-apps/pkgcore
+RDEPEND="
+	|| (
+		sys-apps/pkgcore[${PYTHON_USEDEP}]
 		>=sys-apps/portage-2.1.10.3[${PYTHON_USEDEP}]
-		>=sys-apps/paludis-0.64.2[python-bindings] )"
-DEPEND="doc? ( dev-python/epydoc )"
+		>=sys-apps/paludis-2.6.0[python,${PYTHON_USEDEP}] )"
+DEPEND="doc? ( dev-python/epydoc[$(python_gen_usedep python2_7)] )"
 PDEPEND="app-eselect/eselect-package-manager"
 
-#if LIVE
-KEYWORDS=
-SRC_URI=
-#endif
+REQUIRED_USE="doc? ( $(python_gen_useflags python2_7) )"
+
+src_configure() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2_7 )
+	distutils-r1_src_configure
+}
 
 python_compile_all() {
-	if use doc; then
-		esetup.py doc
-	fi
+	use doc && esetup.py doc
 }
 
 python_test() {
diff --git a/dev-python/snakeoil/snakeoil-9999.ebuild b/dev-python/snakeoil/snakeoil-9999.ebuild
index f82c7fde625d..af9cbb04b486 100644
--- a/dev-python/snakeoil/snakeoil-9999.ebuild
+++ b/dev-python/snakeoil/snakeoil-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
@@ -20,8 +20,10 @@ HOMEPAGE="https://github.com/pkgcore/snakeoil"
 
 LICENSE="BSD"
 SLOT="0"
+IUSE="test"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
 
 python_configure_all() {
 	# disable snakeoil 2to3 caching
diff --git a/dev-util/cmake/cmake-3.7.0.ebuild b/dev-util/cmake/cmake-3.7.0-r1.ebuild
index ab23f3b37039..ab23f3b37039 100644
--- a/dev-util/cmake/cmake-3.7.0.ebuild
+++ b/dev-util/cmake/cmake-3.7.0-r1.ebuild
diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch
index 2a83ff7abb69..5f9c26658f31 100644
--- a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch
+++ b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch
@@ -7,7 +7,7 @@ index bffa9fb..8fc90ee 100644
    )
  
 +# Gentoo portage requires that you use exactly the given python version
-+if (CMAKE_BUILD_TYPE STREQUAL Gentoo)
++if (CMAKE_GENTOO_BUILD OR CMAKE_BUILD_TYPE STREQUAL Gentoo)
 +    execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
 +                    OUTPUT_VARIABLE _Gentoo_Python_VERSION)
 +    list(FIND _Python_VERSIONS "${_Gentoo_Python_VERSION}" _Gentoo_Python_INDEX)
diff --git a/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch b/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch
index 3abb2e4065e8..bb3ca9580ad9 100644
--- a/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch
+++ b/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch
@@ -5,7 +5,7 @@
      set(_PYTHON_FIND_OTHER_VERSIONS ${_PYTHON3_VERSIONS} ${_PYTHON2_VERSIONS} ${_PYTHON1_VERSIONS})
  endif()
 +
-+if (CMAKE_BUILD_TYPE STREQUAL Gentoo)
++if (CMAKE_GENTOO_BUILD OR CMAKE_BUILD_TYPE STREQUAL Gentoo)
 +    set(_Python_NAMES python)
 +endif()
 +
@@ -17,7 +17,7 @@
  
  # Search for newest python version if python executable isn't found
 -if(NOT PYTHON_EXECUTABLE)
-+if(NOT PYTHON_EXECUTABLE AND NOT CMAKE_BUILD_TYPE STREQUAL Gentoo)
++if(NOT PYTHON_EXECUTABLE AND NOT (CMAKE_GENTOO_BUILD OR CMAKE_BUILD_TYPE STREQUAL Gentoo))
      foreach(_CURRENT_VERSION IN LISTS _Python_VERSIONS)
        set(_Python_NAMES python${_CURRENT_VERSION})
        if(WIN32)
diff --git a/dev-util/cmake/files/cmake-3.5.2-FindQt4.patch b/dev-util/cmake/files/cmake-3.5.2-FindQt4.patch
index 845fc6e75d85..2f2764d30cf6 100644
--- a/dev-util/cmake/files/cmake-3.5.2-FindQt4.patch
+++ b/dev-util/cmake/files/cmake-3.5.2-FindQt4.patch
@@ -23,7 +23,7 @@ Gentoo-bug: 547222
 -    PATH_SUFFIXES bin
 -    DOC "The qmake executable for the Qt installation to use"
 -  )
-+  if(CMAKE_BUILD_TYPE STREQUAL Gentoo)
++  if(CMAKE_GENTOO_BUILD OR CMAKE_BUILD_TYPE STREQUAL Gentoo)
 +    find_program(QT_QMAKE_EXECUTABLE NAMES ${QMAKE_NAME}
 +      PATHS
 +        $ENV{EPREFIX}/usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index bf78cc30a880..b21435b1782d 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -593,11 +593,25 @@ enable_cmake-utils_src_configure() {
 	local common_config=${BUILD_DIR}/gentoo_common_config.cmake
 	local libdir=$(get_libdir)
 	cat > "${common_config}" <<- _EOF_ || die
+		SET (CMAKE_GENTOO_BUILD ON CACHE BOOL "Indicate Gentoo package build")
 		SET (LIB_SUFFIX ${libdir/lib} CACHE STRING "library path suffix" FORCE)
 		SET (CMAKE_INSTALL_LIBDIR ${libdir} CACHE PATH "Output directory for libraries")
 	_EOF_
 	[[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}"
 
+	# Wipe the default optimization flags out of CMake
+	if [[ ${CMAKE_BUILD_TYPE} != Gentoo ]] && ! has "${EAPI}" 2 3 4 5; then
+		cat >> ${common_config} <<- _EOF_ || die
+			SET (CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+			SET (CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+			SET (CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+			SET (CMAKE_EXE_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+			SET (CMAKE_MODULE_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+			SET (CMAKE_SHARED_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+			SET (CMAKE_STATIC_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+		_EOF_
+	fi
+
 	# Convert mycmakeargs to an array, for backwards compatibility
 	# Make the array a local variable since <=portage-2.1.6.x does not
 	# support global arrays (see bug #297255).
diff --git a/x11-misc/xmobar/files/xmobar-0.24.3-noxpm.patch b/x11-misc/xmobar/files/xmobar-0.24.3-noxpm.patch
new file mode 100644
index 000000000000..8f4da6b78847
--- /dev/null
+++ b/x11-misc/xmobar/files/xmobar-0.24.3-noxpm.patch
@@ -0,0 +1,9 @@
+diff --git a/xmobar.cabal b/xmobar.cabal
+index f6a6dae..8a17579 100644
+--- a/xmobar.cabal
++++ b/xmobar.cabal
+@@ -89,3 +89,3 @@ executable xmobar
+       Xmobar, Actions, Bitmap, Config, Parsers, Commands, Localize,
+-      XUtil, XPMFile, StatFS, Runnable, ColorCache, Window, Signal,
++      XUtil, StatFS, Runnable, ColorCache, Window, Signal,
+       Environment,
diff --git a/x11-misc/xmobar/xmobar-0.24.3.ebuild b/x11-misc/xmobar/xmobar-0.24.3.ebuild
index 2440311da365..dcd9f32aa67f 100644
--- a/x11-misc/xmobar/xmobar-0.24.3.ebuild
+++ b/x11-misc/xmobar/xmobar-0.24.3.ebuild
@@ -48,6 +48,8 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.18.1.3
 "
 
+PATCHES=("${FILESDIR}"/${P}-noxpm.patch)
+
 src_prepare() {
 	default
 	# xmobar is an idle multithreaded program