diff --git a/app-admin/eselect-bashcomp/metadata.xml b/app-admin/eselect-bashcomp/metadata.xml
index 4c9cb193914a..dc5dc4fc2cc8 100644
--- a/app-admin/eselect-bashcomp/metadata.xml
+++ b/app-admin/eselect-bashcomp/metadata.xml
@@ -1,7 +1,5 @@
-
- eselect@gentoo.org
-
+eselect
diff --git a/app-admin/eselect-opencl/eselect-opencl-1.1.0-r3.ebuild b/app-admin/eselect-opencl/eselect-opencl-1.1.0-r3.ebuild
new file mode 100644
index 000000000000..8a5df9f4ae07
--- /dev/null
+++ b/app-admin/eselect-opencl/eselect-opencl-1.1.0-r3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opencl/eselect-opencl-1.1.0-r3.ebuild,v 1.1 2014/07/14 02:52:20 patrick Exp $
+
+EAPI=4
+
+inherit multilib
+
+DESCRIPTION="Utility to change the OpenCL implementation being used"
+HOMEPAGE="http://www.gentoo.org/"
+
+# Source:
+# http://www.khronos.org/registry/cl/api/${CL_ABI}/opencl.h
+# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_platform.h
+# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl.h
+# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_ext.h
+# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_gl.h
+# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_gl_ext.h
+# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl.hpp
+
+# Using copy by Mario Kicherer #496418
+
+#MIRROR="http://dev.gentoo.org/~xarthisius/distfiles/"
+SRC_URI="https://github.com/anyc/opencl-headers/archive/opencl-headers-1.2.tar.gz
+ http://dev.gentoo.org/~xarthisius/distfiles/${P}-r1.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="app-arch/xz-utils"
+RDEPEND=">=app-admin/eselect-1.2.4"
+
+pkg_postinst() {
+ local impl="$(eselect opencl show)"
+ if [[ -n "${impl}" && "${impl}" != '(none)' ]] ; then
+ eselect opencl set "${impl}"
+ fi
+}
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ doins opencl.eselect
+ #doman opencl.eselect.5
+
+ local headers=( opencl.h cl_platform.h cl.h cl_ext.h cl_gl.h cl_gl_ext.h cl.hpp )
+
+ # We install all versions of OpenCL headers
+ cd "${WORKDIR}/opencl-headers-opencl-headers-1.2"
+ for CL_ABI in 1.0 1.1 1.2; do
+ mkdir -p "${D}/usr/$(get_libdir)/OpenCL/global/include/CL-${CL_ABI}"
+ for f in ${headers[@]}; do
+ cp OpenCL-${CL_ABI}/${f} "${D}/usr/$(get_libdir)/OpenCL/global/include/CL-${CL_ABI}/${f}"
+ done
+ done
+ # Create symlinks to newest. Maybe this should be switchable?
+ for f in ${headers[@]}; do
+ dosym "${D}/usr/$(get_libdir)/OpenCL/global/include/CL-1.1/${f}" "/usr/$(get_libdir)/OpenCL/global/include/CL/${f}"
+ done
+}
diff --git a/app-admin/eselect-package-manager/metadata.xml b/app-admin/eselect-package-manager/metadata.xml
index 4c9cb193914a..dc5dc4fc2cc8 100644
--- a/app-admin/eselect-package-manager/metadata.xml
+++ b/app-admin/eselect-package-manager/metadata.xml
@@ -1,7 +1,5 @@
-
- eselect@gentoo.org
-
+eselect
diff --git a/app-admin/eselect/metadata.xml b/app-admin/eselect/metadata.xml
index 4c9cb193914a..dc5dc4fc2cc8 100644
--- a/app-admin/eselect/metadata.xml
+++ b/app-admin/eselect/metadata.xml
@@ -1,7 +1,5 @@
-
- eselect@gentoo.org
-
+eselect
diff --git a/app-admin/monit/monit-5.8.ebuild b/app-admin/monit/monit-5.8.ebuild
index 639c30be19c4..38a2e70c03bd 100644
--- a/app-admin/monit/monit-5.8.ebuild
+++ b/app-admin/monit/monit-5.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/monit-5.8.ebuild,v 1.2 2014/07/08 14:34:53 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/monit-5.8.ebuild,v 1.3 2014/07/13 10:03:53 ago Exp $
EAPI="2"
inherit systemd
@@ -11,7 +11,7 @@ SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ppc ~x86 ~amd64-linux"
IUSE="pam ssl"
RDEPEND="ssl? ( dev-libs/openssl )"
diff --git a/app-admin/ulogd/ulogd-2.0.3.ebuild b/app-admin/ulogd/ulogd-2.0.3.ebuild
index 9807f2c7c89f..0cb56a2efb2c 100644
--- a/app-admin/ulogd/ulogd-2.0.3.ebuild
+++ b/app-admin/ulogd/ulogd-2.0.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-2.0.3.ebuild,v 1.3 2014/07/08 09:51:14 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-2.0.3.ebuild,v 1.4 2014/07/13 10:01:07 ago Exp $
EAPI="5"
@@ -14,7 +14,7 @@ SRC_URI="http://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc x86"
+KEYWORDS="amd64 ~ia64 ppc x86"
IUSE="dbi doc mysql nfacct +nfct +nflog pcap postgres sqlite"
RDEPEND="net-firewall/iptables
diff --git a/app-backup/duply/Manifest b/app-backup/duply/Manifest
index 594e527ef05a..e44c97d9701d 100644
--- a/app-backup/duply/Manifest
+++ b/app-backup/duply/Manifest
@@ -1,2 +1,3 @@
DIST duply_1.7.3.tgz 34684 SHA256 e0ae298b06125bb6665a3f4822828d36e9f56c93755b45e2240fd1643e7f05d3 SHA512 e71d4bd03828a47cb7b5af164d9f49c911a837c1a016efe8832a56f9ec9913a5237bee0c89cd4a1aece6db454873e8c39e70224ab4c725e7a5ce5eae73e556ff WHIRLPOOL 6881a80c62537ed77e877fbe9c6700aa16e4efe14d4d851c12c31411f2c332ef7d79f85a6815aafbc57e27e6a397d9fa54360e7783bd12435e961b1f4f211bde
DIST duply_1.7.4.tgz 34887 SHA256 2bbcd6e55fcaa7ae2c416a6ce2d3ae0bc219dd05049d8708ff0e79a3349599e7 SHA512 82b722af95d48e231c6540254fe659fc2ed2cdee5ebde3b1f7b192feac0b88ae44c834dde34417324ae0113bf5f8d621602f9587d1356347d606892da7b46405 WHIRLPOOL 6fbe7e1524feb482b796b2db5d39d7276f291f7107ea26db735716f3cbfedd9613b450dd2f06907a54b156d82140584ece2e58a850bca82fe2a7831cac90cc8b
+DIST duply_1.8.0.tgz 35252 SHA256 6642d812a741186d2e995289a682ba5f45149127f957da4c8ebd54fb5ac1f5e5 SHA512 8bb10fc98c44ce325f738fea8b46fd7c03132b681d1e98f8efc2e0b985b895a255a884ce5c99fcb9d1591fb37b5a7f2994ec309ef5ca9b9d2116816641d05d9b WHIRLPOOL 5281b624261aa586a8fc156ea498c3ab3579ccf47588af47d0c0678610b960cb29390359e5870e9817a7ac459e47eebc1fa555d1f1aae29d0cb4ad96914310e0
diff --git a/app-backup/duply/duply-1.8.0.ebuild b/app-backup/duply/duply-1.8.0.ebuild
new file mode 100644
index 000000000000..82e8e78e38ed
--- /dev/null
+++ b/app-backup/duply/duply-1.8.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/duply/duply-1.8.0.ebuild,v 1.1 2014/07/13 16:02:43 jlec Exp $
+
+EAPI="5"
+
+inherit readme.gentoo
+
+DESCRIPTION="A shell frontend for duplicity"
+HOMEPAGE="http://duply.net"
+SRC_URI="mirror://sourceforge/ftplicity/${PN}_${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-text/txt2man"
+RDEPEND="app-backup/duplicity"
+
+S=${WORKDIR}/${PN}_${PV}
+
+DOC_CONTENTS="
+If you use ${PN} at the first time please have a
+look at the the usage help text \"${PN} usage\"
+for further information."
+
+src_install() {
+ dobin ${PN}
+ ./${PN} txt2man > ${PN}.1
+ doman ${PN}.1
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
diff --git a/app-emacs/auctex/auctex-11.87-r1.ebuild b/app-emacs/auctex/auctex-11.87-r1.ebuild
index dc72b019c7e2..aebdcf414537 100644
--- a/app-emacs/auctex/auctex-11.87-r1.ebuild
+++ b/app-emacs/auctex/auctex-11.87-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/auctex-11.87-r1.ebuild,v 1.2 2014/07/08 14:50:24 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/auctex-11.87-r1.ebuild,v 1.3 2014/07/13 09:52:51 ago Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3+ FDL-1.3+"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE="preview-latex"
DEPEND="virtual/latex-base
diff --git a/app-emacs/eselect-mode/metadata.xml b/app-emacs/eselect-mode/metadata.xml
index 5a2011c5e490..b2c96c69ba47 100644
--- a/app-emacs/eselect-mode/metadata.xml
+++ b/app-emacs/eselect-mode/metadata.xml
@@ -1,8 +1,6 @@
+eselect
emacs
-
- eselect@gentoo.org
-
diff --git a/app-misc/linux-logo/linux-logo-5.11-r3.ebuild b/app-misc/linux-logo/linux-logo-5.11-r3.ebuild
index 163e182bb568..0bfbf7a3f60c 100644
--- a/app-misc/linux-logo/linux-logo-5.11-r3.ebuild
+++ b/app-misc/linux-logo/linux-logo-5.11-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/linux-logo/linux-logo-5.11-r3.ebuild,v 1.4 2014/06/24 08:53:57 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/linux-logo/linux-logo-5.11-r3.ebuild,v 1.5 2014/07/13 10:00:14 ago Exp $
EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 hppa ~ia64 ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="nls"
RDEPEND="nls? ( virtual/libintl )"
diff --git a/app-misc/strigi/files/strigi-0.7.8-libav10.patch b/app-misc/strigi/files/strigi-0.7.8-libav10.patch
new file mode 100644
index 000000000000..b38763ff29c0
--- /dev/null
+++ b/app-misc/strigi/files/strigi-0.7.8-libav10.patch
@@ -0,0 +1,16 @@
+Index: strigi-0.7.8/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp
+===================================================================
+--- strigi-0.7.8.orig/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp 2013-02-05 21:34:52.000000000 +0000
++++ strigi-0.7.8/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp 2014-02-28 21:45:10.570587443 +0000
+@@ -481,9 +481,9 @@
+ outs << codec.height;
+ ar.addTriplet(streamuri, heightPropertyName, outs.str());
+ }
+- if (stream.r_frame_rate.num && stream.r_frame_rate.den) {
++ if (stream.avg_frame_rate.num && stream.avg_frame_rate.den) {
+ ostringstream outs;
+- outs << stream.r_frame_rate.num / stream.r_frame_rate.den;
++ outs << stream.avg_frame_rate.num / stream.avg_frame_rate.den;
+ ar.addTriplet(streamuri, frameRatePropertyName, outs.str());
+ }
+ if (codec.pix_fmt != PIX_FMT_NONE) {}//FIXME pixel format
diff --git a/app-misc/strigi/strigi-0.7.8-r1.ebuild b/app-misc/strigi/strigi-0.7.8-r1.ebuild
new file mode 100644
index 000000000000..761c0cce6234
--- /dev/null
+++ b/app-misc/strigi/strigi-0.7.8-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.7.8-r1.ebuild,v 1.1 2014/07/13 11:50:06 johu Exp $
+
+EAPI=5
+
+if [[ "${PV}" != "9999" ]]; then
+ SRC_URI="http://www.vandenoever.info/software/strigi/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+else
+ EGIT_REPO_URI=( "git://anongit.kde.org/strigi" )
+ GIT_ECLASS="git-r3"
+ KEYWORDS=""
+fi
+
+inherit cmake-utils ${GIT_ECLASS}
+
+DESCRIPTION="Fast crawling desktop search engine with Qt4 GUI"
+HOMEPAGE="https://projects.kde.org/projects/kdesupport/strigi/strigi"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="clucene +dbus debug exif fam ffmpeg inotify log +qt4 test"
+
+RDEPEND="
+ app-arch/bzip2
+ dev-libs/libxml2:2
+ sys-libs/zlib
+ virtual/libiconv
+ clucene? ( >=dev-cpp/clucene-0.9.21[-debug] )
+ dbus? (
+ sys-apps/dbus
+ qt4? ( dev-qt/qtdbus:4 )
+ )
+ exif? ( media-gfx/exiv2:= )
+ fam? ( virtual/fam )
+ ffmpeg? ( virtual/ffmpeg )
+ log? ( >=dev-libs/log4cxx-0.10.0 )
+ qt4? (
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ )
+"
+DEPEND="${RDEPEND}
+ test? ( dev-util/cppunit )
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-gcc-4.8.patch"
+ "${FILESDIR}/${P}-libav10.patch"
+)
+
+if [[ ${PV} == 9999 ]] ; then
+ src_unpack() {
+ git config --global url."git://anongit.kde.org/".insteadOf "kde:" || die
+ git-r3_src_unpack
+ pushd "${S}" > /dev/null || die
+ git submodule foreach git checkout master || die
+ popd > /dev/null || die
+ }
+fi
+
+src_configure() {
+ # Enabled: POLLING (only reliable way to check for files changed.)
+ # Disabled: xine - recommended upstream to keep it this way
+ local mycmakeargs=(
+ -DENABLE_POLLING=ON
+ -DFORCE_DEPS=ON
+ -DENABLE_REGENERATEXSD=OFF
+ -DENABLE_XINE=OFF
+ $(cmake-utils_use_enable clucene CLUCENE)
+ $(cmake-utils_use_enable clucene CLUCENE_NG)
+ $(cmake-utils_use_enable dbus)
+ $(cmake-utils_use_enable exif EXIV2)
+ $(cmake-utils_use_enable fam)
+ $(cmake-utils_use_enable ffmpeg)
+ $(cmake-utils_use_enable inotify)
+ $(cmake-utils_use_enable log LOG4CXX)
+ $(cmake-utils_use_enable qt4)
+ $(cmake-utils_use_find_package test CPPUNIT)
+ )
+
+ if use qt4; then
+ mycmakeargs+=( -DENABLE_DBUS=ON )
+ fi
+
+ cmake-utils_src_configure
+}
+
+pkg_postinst() {
+ if ! use clucene ; then
+ elog "Because you didn't enable the clucene backend, strigi may not be functional."
+ elog "If you intend to use standalone strigi indexer (not needed for KDE),"
+ elog "be sure to reinstall app-misc/strigi with the clucene USE flag enabled."
+ fi
+}
diff --git a/app-misc/tmux/tmux-1.9a.ebuild b/app-misc/tmux/tmux-1.9a.ebuild
index e78278c3ee71..d6cf336aaaae 100644
--- a/app-misc/tmux/tmux-1.9a.ebuild
+++ b/app-misc/tmux/tmux-1.9a.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-1.9a.ebuild,v 1.6 2014/06/24 17:07:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-1.9a.ebuild,v 1.7 2014/07/13 09:51:02 ago Exp $
EAPI=5
AUTOTOOLS_AUTORECONF=true
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/tmux/${P}.tar.gz"
LICENSE="ISC"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-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 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="debug selinux vim-syntax"
COMMON_DEPEND="
diff --git a/app-misc/vifm/vifm-0.7.6.ebuild b/app-misc/vifm/vifm-0.7.6.ebuild
index ed1002a3d40c..70de11d9cd1c 100644
--- a/app-misc/vifm/vifm-0.7.6.ebuild
+++ b/app-misc/vifm/vifm-0.7.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/vifm/vifm-0.7.6.ebuild,v 1.1 2014/01/18 00:40:31 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/vifm/vifm-0.7.6.ebuild,v 1.2 2014/07/13 10:07:22 ago Exp $
EAPI=5
inherit base vim-doc
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/vifm/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~s390 ~x86"
+KEYWORDS="~amd64 ppc ~s390 ~x86"
IUSE="X developer +extended-keys gtk +magic vim vim-syntax"
DEPEND="
diff --git a/app-office/scribus/scribus-1.4.3.ebuild b/app-office/scribus/scribus-1.4.3.ebuild
index 238269c6b65d..3c4d61a2ac89 100644
--- a/app-office/scribus/scribus-1.4.3.ebuild
+++ b/app-office/scribus/scribus-1.4.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.3.ebuild,v 1.5 2014/06/24 17:06:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.3.ebuild,v 1.6 2014/07/13 09:50:21 ago Exp $
EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 hppa ppc ~ppc64 ~sparc x86"
IUSE="cairo debug examples hunspell +minimal +pdf scripts templates tk"
# a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a}
diff --git a/app-office/texmacs/texmacs-1.0.7.21.ebuild b/app-office/texmacs/texmacs-1.0.7.21.ebuild
index 864824ce9cba..6d58f7affb94 100644
--- a/app-office/texmacs/texmacs-1.0.7.21.ebuild
+++ b/app-office/texmacs/texmacs-1.0.7.21.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.7.21.ebuild,v 1.3 2014/07/05 18:02:29 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.7.21.ebuild,v 1.4 2014/07/13 09:50:43 ago Exp $
EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/${MY_P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
IUSE="imlib jpeg netpbm qt4 svg spell"
-KEYWORDS="~alpha amd64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
RDEPEND="
app-text/ghostscript-gpl
diff --git a/app-portage/elogviewer/elogviewer-2.1-r1.ebuild b/app-portage/elogviewer/elogviewer-2.1-r1.ebuild
index db6c53669644..58fe416ea60b 100644
--- a/app-portage/elogviewer/elogviewer-2.1-r1.ebuild
+++ b/app-portage/elogviewer/elogviewer-2.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/elogviewer/elogviewer-2.1-r1.ebuild,v 1.2 2014/07/06 12:31:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/elogviewer/elogviewer-2.1-r1.ebuild,v 1.4 2014/07/13 10:54:45 zlogene Exp $
EAPI="5"
PYTHON_COMPAT=(python{2_6,2_7,3_1,3_2,3_3})
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
IUSE=""
RDEPEND="
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 5a855746e27c..481e401617dd 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,3 +1,2 @@
DIST poppler-0.24.5.tar.xz 1512476 SHA256 a2654910100c923c44e366242495e226db2798254f2fa2781138867348759f84 SHA512 dfb40f7d864614f4ad7e8729334931c4b40c48c0dc3d7a8c33b14134cf13c61f8a562cc790a08bee4a43c2c29e587a9d26330437858d465e18ceafd69521250c WHIRLPOOL 066924beb46e58c2906a3b278e617438bd966e2b7bd884e110949f0d149d2cca0bf6326f2fa8c99e3a2c0f2d3cb3f145c8eeee4f060d17e3dded501ef8ec7f33
-DIST poppler-0.26.1.tar.xz 1592884 SHA256 c8c959c3f605a17ed21e2cfec2d9379be5e0c801db4edad5e7b2e44a6cef214c SHA512 5012bd4df931d86fd856a961819a7dd15162efa106518eeb8677edd9a21a62cfeff593a24e57181dfaacbd9e91e8bf782f2199d147c5a5398042ee055feab14d WHIRLPOOL 251481b53a180c1856b5860c6520a531547370454e78d0547afd8646c29a0de67bb2d25bf96ce27a0b976ac2539472f5ae7e53a03eb3a0f739f64a86697cb794
DIST poppler-0.26.2.tar.xz 1592696 SHA256 1dd9963a82eba00b7a8c9f57a7d1d787be22f5e6cb0aead5dfe602775d0d9526 SHA512 1c8aa7a71b7f818a40fa3f886b54c627a600183a3d8b5b6e98439e1d3c7f5a1c7f0f6f8f5d685e9e19c539a2e11c5781de93f9032c88609e5b6eb32ee596ed9a WHIRLPOOL 85429392b904bd8ff7eb002f8858dfddd98fa53019934971e38117a46a1fbd9e7960e389f3e348ea484d1a9407abacc23be284f10481fc5882dda900fa50554e
diff --git a/app-text/poppler/poppler-0.26.1.ebuild b/app-text/poppler/poppler-0.26.1.ebuild
deleted file mode 100644
index becb8eeaf85c..000000000000
--- a/app-text/poppler/poppler-0.26.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.26.1.ebuild,v 1.1 2014/05/23 22:49:52 dilfridge Exp $
-
-EAPI=5
-
-inherit cmake-utils toolchain-funcs
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="http://poppler.freedesktop.org/"
-SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0/46"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-COMMON_DEPEND="
- >=media-libs/fontconfig-2.6.0
- >=media-libs/freetype-2.3.9
- sys-libs/zlib
- cairo? (
- dev-libs/glib:2
- >=x11-libs/cairo-1.10.0
- introspection? ( >=dev-libs/gobject-introspection-1.32.1 )
- )
- curl? ( net-misc/curl )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/openjpeg:0 )
- lcms? ( media-libs/lcms:2 )
- png? ( media-libs/libpng:0= )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtxml:5
- )
- tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
- cjk? ( >=app-text/poppler-data-0.4.4 )
-"
-
-DOCS=(AUTHORS NEWS README README-XPDF TODO)
-
-PATCHES=( "${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch" )
-
-src_configure() {
- # this is needed for multilib, see bug 459394
- local ft_libdir ft_includedir
- ft_libdir="$($(tc-getPKG_CONFIG) freetype2 --variable=libdir)"
- ft_includedir="$($(tc-getPKG_CONFIG) freetype2 --variable=includedir)"
- export FREETYPE_DIR="${ft_libdir}:${ft_includedir%/include}"
- einfo "Detected FreeType at ${FREETYPE_DIR}"
-
- mycmakeargs=(
- -DBUILD_GTK_TESTS=OFF
- -DBUILD_QT4_TESTS=OFF
- -DBUILD_QT5_TESTS=OFF
- -DBUILD_CPP_TESTS=OFF
- -DENABLE_SPLASH=ON
- -DENABLE_ZLIB=ON
- -DENABLE_XPDF_HEADERS=ON
- $(cmake-utils_use_enable curl LIBCURL)
- $(cmake-utils_use_enable cxx CPP)
- $(cmake-utils_use_enable jpeg2k LIBOPENJPEG)
- $(cmake-utils_use_enable utils)
- $(cmake-utils_use_with cairo)
- $(cmake-utils_use_with introspection GObjectIntrospection)
- $(cmake-utils_use_with jpeg)
- $(cmake-utils_use_with png)
- $(cmake-utils_use_with qt4)
- $(cmake-utils_use_find_package qt5 Qt5Core)
- $(cmake-utils_use_with tiff)
- )
- if use lcms; then
- mycmakeargs+=(-DENABLE_CMS=lcms2)
- else
- mycmakeargs+=(-DENABLE_CMS=)
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use cairo && use doc; then
- # For now install gtk-doc there
- insinto /usr/share/gtk-doc/html/poppler
- doins -r "${S}"/glib/reference/html/*
- fi
-}
diff --git a/app-text/poppler/poppler-0.26.2.ebuild b/app-text/poppler/poppler-0.26.2.ebuild
index f2e6056bf8f0..681080b41f13 100644
--- a/app-text/poppler/poppler-0.26.2.ebuild
+++ b/app-text/poppler/poppler-0.26.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.26.2.ebuild,v 1.1 2014/06/22 18:57:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.26.2.ebuild,v 1.2 2014/07/13 10:39:44 johu Exp $
EAPI=5
@@ -63,14 +63,7 @@ DOCS=(AUTHORS NEWS README README-XPDF TODO)
PATCHES=( "${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch" )
src_configure() {
- # this is needed for multilib, see bug 459394
- local ft_libdir ft_includedir
- ft_libdir="$($(tc-getPKG_CONFIG) freetype2 --variable=libdir)"
- ft_includedir="$($(tc-getPKG_CONFIG) freetype2 --variable=includedir)"
- export FREETYPE_DIR="${ft_libdir}:${ft_includedir%/include}"
- einfo "Detected FreeType at ${FREETYPE_DIR}"
-
- mycmakeargs=(
+ local mycmakeargs=(
-DBUILD_GTK_TESTS=OFF
-DBUILD_QT4_TESTS=OFF
-DBUILD_QT5_TESTS=OFF
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 4fb7d83fcb47..3e0770aafde7 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-9999.ebuild,v 1.1 2014/06/22 18:57:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-9999.ebuild,v 1.2 2014/07/13 10:39:44 johu Exp $
EAPI=5
@@ -63,14 +63,7 @@ DOCS=(AUTHORS NEWS README README-XPDF TODO)
PATCHES=( "${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch" )
src_configure() {
- # this is needed for multilib, see bug 459394
- local ft_libdir ft_includedir
- ft_libdir="$($(tc-getPKG_CONFIG) freetype2 --variable=libdir)"
- ft_includedir="$($(tc-getPKG_CONFIG) freetype2 --variable=includedir)"
- export FREETYPE_DIR="${ft_libdir}:${ft_includedir%/include}"
- einfo "Detected FreeType at ${FREETYPE_DIR}"
-
- mycmakeargs=(
+ local mycmakeargs=(
-DBUILD_GTK_TESTS=OFF
-DBUILD_QT4_TESTS=OFF
-DBUILD_QT5_TESTS=OFF
diff --git a/app-text/tree/tree-1.7.0.ebuild b/app-text/tree/tree-1.7.0.ebuild
index 45bb4ced18b6..1abaaf26134e 100644
--- a/app-text/tree/tree-1.7.0.ebuild
+++ b/app-text/tree/tree-1.7.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tree/tree-1.7.0.ebuild,v 1.5 2014/07/12 17:48:08 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tree/tree-1.7.0.ebuild,v 1.6 2014/07/13 10:10:28 ago Exp $
EAPI=5
inherit toolchain-funcs flag-o-matic bash-completion-r1
@@ -11,7 +11,7 @@ SRC_URI="ftp://mama.indstate.edu/linux/tree/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE=""
RDEPEND="!=sci-biology/meme-4.8.1"
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index f64228163d4d..c1e9fee7c7b2 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -1 +1,2 @@
DIST zathura-0.2.7.tar.gz 145007 SHA256 ef43be7705612937d095bfbe719a03503bf7e45493ea9409cb43a45cf96f0daf SHA512 7e6a5f54a4d49e5e81f993619a4497d202958f047f71d26b19682326a3c191e643e6db5efa69ae8ba4de332191bbd226c3dc79d6e63986fdae7faded17666725 WHIRLPOOL 77bbe78ee955f3936395127ec62216e1231a83260a0567e899ffe8891497104f75a6699df1e5dfa8d59b55bf07a8d153b2bb0d61c3140a97b47b3439f11e3bb8
+DIST zathura-0.2.9.tar.gz 196690 SHA256 2c071d403ec9348b839567b2897850bf29d9c24c85982b5509a1a429a72ee09f SHA512 be72a5845ed0e4f09d54c608fc8373757d0d8dbf6f3d9be1a4ee671be22cec31e8eda2e8591c007e80df30059938b3480f5e7f035a115bd58e8dd05972296503 WHIRLPOOL 4c436fc9a78ea797d1e094baa04755c5cd8e3470371ad15296eab0b346c8a4ea5018c10240d5f9f1647995f2e645665aad3c867a67d1281fb3b843375af448ee
diff --git a/app-text/zathura/zathura-0.2.9.ebuild b/app-text/zathura/zathura-0.2.9.ebuild
new file mode 100644
index 000000000000..06d9238237f3
--- /dev/null
+++ b/app-text/zathura/zathura-0.2.9.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura/zathura-0.2.9.ebuild,v 1.1 2014/07/13 16:25:58 ssuominen Exp $
+
+EAPI=5
+
+inherit eutils fdo-mime multilib toolchain-funcs virtualx
+[[ ${PV} == 9999* ]] && inherit git-2
+
+DESCRIPTION="A highly customizable and functional document viewer"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+if ! [[ ${PV} == 9999* ]]; then
+SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz"
+fi
+EGIT_REPO_URI="git://git.pwmt.org/${PN}.git"
+EGIT_BRANCH="develop"
+
+LICENSE="ZLIB"
+SLOT="0"
+if ! [[ ${PV} == 9999* ]]; then
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+else
+KEYWORDS=""
+fi
+IUSE="+magic sqlite test"
+
+RDEPEND=">=dev-libs/girara-0.2.2:3=
+ >=dev-libs/glib-2.28:2=
+ x11-libs/cairo:=
+ >=x11-libs/gtk+-3.2:3
+ magic? ( sys-apps/file:= )
+ sqlite? ( dev-db/sqlite:3= )"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ virtual/pkgconfig
+ test? ( dev-libs/check )"
+
+pkg_setup() {
+ myzathuraconf=(
+ WITH_MAGIC=$(usex magic 1 0)
+ WITH_SQLITE=$(usex sqlite 1 0)
+ PREFIX="${EPREFIX}"/usr
+ LIBDIR='${PREFIX}'/$(get_libdir)
+ CC="$(tc-getCC)"
+ SFLAGS=''
+ VERBOSE=1
+ DESTDIR="${D}"
+ )
+}
+
+src_compile() {
+ emake "${myzathuraconf[@]}"
+}
+
+src_test() {
+ Xemake "${myzathuraconf[@]}" test
+}
+
+src_install() {
+ emake "${myzathuraconf[@]}" install
+ dodoc AUTHORS
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+}
diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild
index b2fae331e3c5..72c587abe93e 100644
--- a/app-text/zathura/zathura-9999.ebuild
+++ b/app-text/zathura/zathura-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/zathura/zathura-9999.ebuild,v 1.5 2014/05/07 15:00:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura/zathura-9999.ebuild,v 1.6 2014/07/13 16:25:58 ssuominen Exp $
EAPI=5
@@ -22,9 +22,9 @@ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
else
KEYWORDS=""
fi
-IUSE="+doc +magic sqlite test"
+IUSE="+magic sqlite test"
-RDEPEND=">=dev-libs/girara-0.2.1:3=
+RDEPEND=">=dev-libs/girara-0.2.2:3=
>=dev-libs/glib-2.28:2=
x11-libs/cairo:=
>=x11-libs/gtk+-3.2:3
@@ -33,7 +33,6 @@ RDEPEND=">=dev-libs/girara-0.2.1:3=
DEPEND="${RDEPEND}
sys-devel/gettext
virtual/pkgconfig
- doc? ( dev-python/docutils )
test? ( dev-libs/check )"
pkg_setup() {
@@ -42,7 +41,6 @@ pkg_setup() {
WITH_SQLITE=$(usex sqlite 1 0)
PREFIX="${EPREFIX}"/usr
LIBDIR='${PREFIX}'/$(get_libdir)
- RSTTOMAN="$(use doc && type -P rst2man.py)"
CC="$(tc-getCC)"
SFLAGS=''
VERBOSE=1
diff --git a/dev-ada/asis-gcc/asis-gcc-3.4.6.ebuild b/dev-ada/asis-gcc/asis-gcc-3.4.6.ebuild
index f3f19d62c87f..9f3bd798611f 100644
--- a/dev-ada/asis-gcc/asis-gcc-3.4.6.ebuild
+++ b/dev-ada/asis-gcc/asis-gcc-3.4.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-3.4.6.ebuild,v 1.11 2012/04/10 12:44:27 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-3.4.6.ebuild,v 1.12 2014/07/13 16:23:26 ulm Exp $
inherit eutils flag-o-matic gnatbuild
@@ -41,7 +41,7 @@ My_BINPATH=${BINPATH/${PN}/${Gnat_Name}}
My_DATAPATH=${DATAPATH/${PN}/${Gnat_Name}}
pkg_setup() {
- currGnat=$(eselect --no-color gnat show | grep "gnat-" | awk '{ print $1 }')
+ currGnat=$(eselect gnat show | grep "gnat-" | awk '{ print $1 }')
if [[ "${currGnat}" != "${CTARGET}-${Gnat_Name}-${SLOT}" ]]; then
echo
eerror "The active gnat profile does not correspond to the selected"
diff --git a/dev-ada/asis-gcc/asis-gcc-4.1.2-r1.ebuild b/dev-ada/asis-gcc/asis-gcc-4.1.2-r1.ebuild
index 158ab701a07f..5d53b403f7ad 100644
--- a/dev-ada/asis-gcc/asis-gcc-4.1.2-r1.ebuild
+++ b/dev-ada/asis-gcc/asis-gcc-4.1.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-4.1.2-r1.ebuild,v 1.8 2012/04/10 12:44:27 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-4.1.2-r1.ebuild,v 1.9 2014/07/13 16:23:26 ulm Exp $
inherit eutils flag-o-matic gnatbuild
@@ -39,7 +39,7 @@ My_BINPATH=${BINPATH/${PN}/${Gnat_Name}}
My_DATAPATH=${DATAPATH/${PN}/${Gnat_Name}}
pkg_setup() {
- local currGnat=$(eselect --no-color gnat show | grep "gnat-" | awk '{ print $1 }')
+ local currGnat=$(eselect gnat show | grep "gnat-" | awk '{ print $1 }')
if [[ "${currGnat}" != "${CTARGET}-${Gnat_Name}-${SLOT}" ]]; then
echo
eerror "The active gnat profile does not correspond to the selected"
diff --git a/dev-ada/asis-gcc/asis-gcc-4.1.2.ebuild b/dev-ada/asis-gcc/asis-gcc-4.1.2.ebuild
index 4d6b8c5e0ff3..8f49813aa0d7 100644
--- a/dev-ada/asis-gcc/asis-gcc-4.1.2.ebuild
+++ b/dev-ada/asis-gcc/asis-gcc-4.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-4.1.2.ebuild,v 1.6 2012/04/10 12:44:27 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-4.1.2.ebuild,v 1.7 2014/07/13 16:23:26 ulm Exp $
inherit eutils flag-o-matic gnatbuild
@@ -35,7 +35,7 @@ QA_EXECSTACK="usr/lib/gnat-gcc/*/${SLOT}/adalib/libasis-4.1.so
replace-flags -O3 -O2
pkg_setup() {
- currGnat=$(eselect --no-color gnat show | grep "gnat-" | awk '{ print $1 }')
+ currGnat=$(eselect gnat show | grep "gnat-" | awk '{ print $1 }')
if [[ "${currGnat}" != "${CTARGET}-${Gnat_Name}-${SLOT}" ]]; then
echo
eerror "The active gnat profile does not correspond to the selected"
diff --git a/dev-ada/asis-gcc/asis-gcc-4.2.2.ebuild b/dev-ada/asis-gcc/asis-gcc-4.2.2.ebuild
index 9f993f3c3a38..9eaba4d8d0ce 100644
--- a/dev-ada/asis-gcc/asis-gcc-4.2.2.ebuild
+++ b/dev-ada/asis-gcc/asis-gcc-4.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-4.2.2.ebuild,v 1.5 2012/04/10 12:44:27 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-4.2.2.ebuild,v 1.6 2014/07/13 16:23:26 ulm Exp $
inherit eutils flag-o-matic gnatbuild multilib
@@ -40,7 +40,7 @@ My_BINPATH=${BINPATH/${PN}/${Gnat_Name}}
My_DATAPATH=${DATAPATH/${PN}/${Gnat_Name}}
pkg_setup() {
- local currGnat=$(eselect --no-color gnat show | grep "gnat-" | awk '{ print $1 }')
+ local currGnat=$(eselect gnat show | grep "gnat-" | awk '{ print $1 }')
if [[ "${currGnat}" != "${CTARGET}-${Gnat_Name}-${SLOT}" ]]; then
echo
eerror "The active gnat profile does not correspond to the selected"
diff --git a/dev-ada/asis-gcc/asis-gcc-4.3.0_pre132166.ebuild b/dev-ada/asis-gcc/asis-gcc-4.3.0_pre132166.ebuild
index d957c0bf47e6..fdc1ecb686f1 100644
--- a/dev-ada/asis-gcc/asis-gcc-4.3.0_pre132166.ebuild
+++ b/dev-ada/asis-gcc/asis-gcc-4.3.0_pre132166.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-4.3.0_pre132166.ebuild,v 1.5 2012/04/10 12:44:27 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-4.3.0_pre132166.ebuild,v 1.6 2014/07/13 16:23:26 ulm Exp $
inherit eutils flag-o-matic gnatbuild multilib
@@ -40,7 +40,7 @@ My_BINPATH=${BINPATH/${PN}/${Gnat_Name}}
My_DATAPATH=${DATAPATH/${PN}/${Gnat_Name}}
pkg_setup() {
- local currGnat=$(eselect --no-color gnat show | grep "gnat-" | awk '{ print $1 }')
+ local currGnat=$(eselect gnat show | grep "gnat-" | awk '{ print $1 }')
if [[ "${currGnat}" != "${CTARGET}-${Gnat_Name}-${SLOT}" ]]; then
echo
eerror "The active gnat profile does not correspond to the selected"
diff --git a/dev-ada/asis-gcc/asis-gcc-4.3.1-r1.ebuild b/dev-ada/asis-gcc/asis-gcc-4.3.1-r1.ebuild
index ae33e9b68b79..c678f1de59dc 100644
--- a/dev-ada/asis-gcc/asis-gcc-4.3.1-r1.ebuild
+++ b/dev-ada/asis-gcc/asis-gcc-4.3.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-4.3.1-r1.ebuild,v 1.2 2012/06/14 11:38:14 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-4.3.1-r1.ebuild,v 1.3 2014/07/13 16:23:26 ulm Exp $
inherit eutils flag-o-matic gnatbuild
@@ -35,7 +35,7 @@ DATAPATH=${DATAPATH/${PN}/${Gnat_Name}}
# ${LIBPATH:1}/adalib/libasis-${ACT_Ver}.so"
pkg_setup() {
- currGnat=$(eselect --no-color gnat show | grep "gnat-" | awk '{ print $1 }')
+ currGnat=$(eselect gnat show | grep "gnat-" | awk '{ print $1 }')
if [[ "${currGnat}" != "${CTARGET}-${Gnat_Name}-${SLOT}" ]]; then
echo
eerror "The active gnat profile does not correspond to the selected"
diff --git a/dev-ada/asis-gcc/asis-gcc-4.3.1.ebuild b/dev-ada/asis-gcc/asis-gcc-4.3.1.ebuild
index 0a0ce7bb976f..384807da1fb9 100644
--- a/dev-ada/asis-gcc/asis-gcc-4.3.1.ebuild
+++ b/dev-ada/asis-gcc/asis-gcc-4.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-4.3.1.ebuild,v 1.1 2012/04/19 13:30:42 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-4.3.1.ebuild,v 1.2 2014/07/13 16:23:26 ulm Exp $
inherit eutils flag-o-matic gnatbuild
@@ -35,7 +35,7 @@ DATAPATH=${DATAPATH/${PN}/${Gnat_Name}}
# ${LIBPATH:1}/adalib/libasis-${ACT_Ver}.so"
pkg_setup() {
- currGnat=$(eselect --no-color gnat show | grep "gnat-" | awk '{ print $1 }')
+ currGnat=$(eselect gnat show | grep "gnat-" | awk '{ print $1 }')
if [[ "${currGnat}" != "${CTARGET}-${Gnat_Name}-${SLOT}" ]]; then
echo
eerror "The active gnat profile does not correspond to the selected"
diff --git a/dev-ada/asis-gcc/asis-gcc-4.4.ebuild b/dev-ada/asis-gcc/asis-gcc-4.4.ebuild
index c0e80df5d302..6b00692763de 100644
--- a/dev-ada/asis-gcc/asis-gcc-4.4.ebuild
+++ b/dev-ada/asis-gcc/asis-gcc-4.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-4.4.ebuild,v 1.2 2012/06/14 13:08:30 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-4.4.ebuild,v 1.3 2014/07/13 16:23:26 ulm Exp $
inherit eutils flag-o-matic gnatbuild
@@ -35,7 +35,7 @@ DATAPATH=${DATAPATH/${PN}/${Gnat_Name}}
# ${LIBPATH:1}/adalib/libasis-${ACT_Ver}.so"
pkg_setup() {
- currGnat=$(eselect --no-color gnat show | grep "gnat-" | awk '{ print $1 }')
+ currGnat=$(eselect gnat show | grep "gnat-" | awk '{ print $1 }')
if [[ "${currGnat}" != "${CTARGET}-${Gnat_Name}-${SLOT}" ]]; then
echo
eerror "The active gnat profile does not correspond to the selected"
diff --git a/dev-ada/asis-gpl/asis-gpl-3.4.6.2006.ebuild b/dev-ada/asis-gpl/asis-gpl-3.4.6.2006.ebuild
index 622d3984bc67..d4b74930cc42 100644
--- a/dev-ada/asis-gpl/asis-gpl-3.4.6.2006.ebuild
+++ b/dev-ada/asis-gpl/asis-gpl-3.4.6.2006.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gpl/asis-gpl-3.4.6.2006.ebuild,v 1.6 2008/05/17 19:19:06 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gpl/asis-gpl-3.4.6.2006.ebuild,v 1.7 2014/07/13 16:26:07 ulm Exp $
inherit eutils flag-o-matic gnatbuild
@@ -26,7 +26,7 @@ S="${WORKDIR}/asis-${ACT_Ver}"
replace-flags -O3 -O2
pkg_setup() {
- currGnat=$(eselect --no-color gnat show | grep "gnat-" | awk '{ print $1 }')
+ currGnat=$(eselect gnat show | grep "gnat-" | awk '{ print $1 }')
if [[ "${currGnat}" != "${CTARGET}-${Gnat_Name}-${SLOT}" ]]; then
echo
eerror "The active gnat profile does not correspond to the selected"
diff --git a/dev-ada/asis-gpl/asis-gpl-4.1.3.2007-r1.ebuild b/dev-ada/asis-gpl/asis-gpl-4.1.3.2007-r1.ebuild
index 6c0eccef8825..4fccf8c284a5 100644
--- a/dev-ada/asis-gpl/asis-gpl-4.1.3.2007-r1.ebuild
+++ b/dev-ada/asis-gpl/asis-gpl-4.1.3.2007-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gpl/asis-gpl-4.1.3.2007-r1.ebuild,v 1.3 2008/05/17 19:19:06 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gpl/asis-gpl-4.1.3.2007-r1.ebuild,v 1.4 2014/07/13 16:26:07 ulm Exp $
inherit eutils flag-o-matic gnatbuild
@@ -35,7 +35,7 @@ QA_EXECSTACK="${BINPATH:1}/*
${LIBPATH:1}/adalib/libasis-${ACT_Ver}.so"
pkg_setup() {
- currGnat=$(eselect --no-color gnat show | grep "gnat-" | awk '{ print $1 }')
+ currGnat=$(eselect gnat show | grep "gnat-" | awk '{ print $1 }')
if [[ "${currGnat}" != "${CTARGET}-${Gnat_Name}-${SLOT}" ]]; then
echo
eerror "The active gnat profile does not correspond to the selected"
diff --git a/dev-ada/asis-gpl/asis-gpl-4.1.3.2007-r2.ebuild b/dev-ada/asis-gpl/asis-gpl-4.1.3.2007-r2.ebuild
index 794ddb95d99d..33922866d894 100644
--- a/dev-ada/asis-gpl/asis-gpl-4.1.3.2007-r2.ebuild
+++ b/dev-ada/asis-gpl/asis-gpl-4.1.3.2007-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gpl/asis-gpl-4.1.3.2007-r2.ebuild,v 1.3 2008/05/17 19:19:06 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gpl/asis-gpl-4.1.3.2007-r2.ebuild,v 1.4 2014/07/13 16:26:07 ulm Exp $
inherit eutils flag-o-matic gnatbuild
@@ -35,7 +35,7 @@ QA_EXECSTACK="${BINPATH:1}/*
${LIBPATH:1}/adalib/libasis-${ACT_Ver}.so"
pkg_setup() {
- currGnat=$(eselect --no-color gnat show | grep "gnat-" | awk '{ print $1 }')
+ currGnat=$(eselect gnat show | grep "gnat-" | awk '{ print $1 }')
if [[ "${currGnat}" != "${CTARGET}-${Gnat_Name}-${SLOT}" ]]; then
echo
eerror "The active gnat profile does not correspond to the selected"
diff --git a/dev-ada/asis-gpl/asis-gpl-4.1.3.2008-r1.ebuild b/dev-ada/asis-gpl/asis-gpl-4.1.3.2008-r1.ebuild
index 577ce520fff1..d34cf1c2e690 100644
--- a/dev-ada/asis-gpl/asis-gpl-4.1.3.2008-r1.ebuild
+++ b/dev-ada/asis-gpl/asis-gpl-4.1.3.2008-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gpl/asis-gpl-4.1.3.2008-r1.ebuild,v 1.1 2008/08/19 11:56:54 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gpl/asis-gpl-4.1.3.2008-r1.ebuild,v 1.2 2014/07/13 16:26:07 ulm Exp $
# NOTE: gnat-gpl-2007 and 2008 have "incompatible bugs"
# so, we separate asis following the separation of gnat
@@ -39,7 +39,7 @@ QA_EXECSTACK="${BINPATH:1}/*
${LIBPATH:1}/adalib/libasis-${ACT_Ver}.so"
pkg_setup() {
- currGnat=$(eselect --no-color gnat show | grep "gnat-" | awk '{ print $1 }')
+ currGnat=$(eselect gnat show | grep "gnat-" | awk '{ print $1 }')
if [[ "${currGnat}" != "${CTARGET}-${Gnat_Name}-${SLOT}" ]]; then
echo
eerror "The active gnat profile does not correspond to the selected"
diff --git a/dev-ada/asis-gpl/asis-gpl-4.1.3.2008.ebuild b/dev-ada/asis-gpl/asis-gpl-4.1.3.2008.ebuild
index c56b2dc02513..34310ce7aee2 100644
--- a/dev-ada/asis-gpl/asis-gpl-4.1.3.2008.ebuild
+++ b/dev-ada/asis-gpl/asis-gpl-4.1.3.2008.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gpl/asis-gpl-4.1.3.2008.ebuild,v 1.2 2008/08/23 20:15:54 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gpl/asis-gpl-4.1.3.2008.ebuild,v 1.3 2014/07/13 16:26:07 ulm Exp $
inherit eutils flag-o-matic gnatbuild
@@ -35,7 +35,7 @@ QA_EXECSTACK="${BINPATH:1}/*
${LIBPATH:1}/adalib/libasis-${ACT_Ver}.so"
pkg_setup() {
- currGnat=$(eselect --no-color gnat show | grep "gnat-" | awk '{ print $1 }')
+ currGnat=$(eselect gnat show | grep "gnat-" | awk '{ print $1 }')
if [[ "${currGnat}" != "${CTARGET}-${Gnat_Name}-${SLOT}" ]]; then
echo
eerror "The active gnat profile does not correspond to the selected"
diff --git a/dev-cpp/gflags/Manifest b/dev-cpp/gflags/Manifest
index 53ecc78abe3e..23b2ea9b609e 100644
--- a/dev-cpp/gflags/Manifest
+++ b/dev-cpp/gflags/Manifest
@@ -1 +1,2 @@
DIST gflags-2.0.tar.gz 513739 SHA256 ce4a5d3419f27a080bd68966e5cd9507bfa09d14341e07b78a1778a7a172d7d7 SHA512 ba7061d5d57fcadb53ef70f846caacc44c319552e7dd6b05def38f961d3d89f4023e4eda95845efb399f3e94f24f75bdadfc67b22e29bccc94e46de8db501b83 WHIRLPOOL a86acb21e91bdcaebd6b6c97079ae147c7549c6db29a5c8ebf1917b9ae8703523efef285837d328702d64aaa83bd4810e1ecae65dc58eb12379ab2f0300dd19e
+DIST gflags-2.1.1.tar.gz 102015 SHA256 432edece8102fc141c2e3381e2eb5eabb1ce7614851cc96bdec4715105086238 SHA512 18d1a0a1271f12f0e87447e3a9d6810f531f5b190d84274465add5a928c189caac911ec2592422895961ab3c0c7566ff50c0c22f71d185ac3413c54bdbfb00ef WHIRLPOOL 608dc62262d8b4a0451dd3493b02fd35ad5214f1793f173ca5d93e631e15b59cc4557b2a2f9f5e67f72c2ad0d6cd343648b113bf4701fd8f6c3f5d949ac41813
diff --git a/dev-cpp/gflags/gflags-2.1.1.ebuild b/dev-cpp/gflags/gflags-2.1.1.ebuild
new file mode 100644
index 000000000000..874628962f9a
--- /dev/null
+++ b/dev-cpp/gflags/gflags-2.1.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gflags/gflags-2.1.1.ebuild,v 1.1 2014/07/14 03:34:01 patrick Exp $
+
+EAPI="5"
+
+inherit cmake-multilib multilib-minimal
+
+DESCRIPTION="Google's C++ argument parsing library"
+HOMEPAGE="http://code.google.com/p/gflags/"
+SRC_URI="https://github.com/schuhschuh/gflags/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+multilib_src_install_all() {
+ rm -rf "${ED}"/usr/share/doc
+ dodoc {AUTHORS,ChangeLog,NEWS,README}.txt
+ dohtml doc/*
+}
diff --git a/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r1.ebuild b/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r1.ebuild
index bd578dd81f5d..55ca73b2fa24 100644
--- a/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r1.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r1.ebuild,v 1.7 2014/07/07 12:25:25 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r1.ebuild,v 1.9 2014/07/13 13:06:52 zlogene Exp $
EAPI="5"
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.mono-project.com"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2"
IUSE="cairo"
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.60.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.60.ebuild
index f574de9e78cb..1e51e0fa4e01 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.60.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.60.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.60.ebuild,v 1.1 2014/05/28 19:07:30 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.60.ebuild,v 1.5 2014/07/13 14:12:47 ago Exp $
EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="${ORIG_NAME}"
LICENSE="oracle-java-documentation-7"
SLOT="1.7"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE=""
DEPEND="app-arch/unzip"
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.60.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.60.ebuild
index 20582d80e39a..41d1cf5290e0 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.60.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.60.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.60.ebuild,v 1.2 2014/06/03 00:11:07 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.60.ebuild,v 1.4 2014/07/13 14:10:53 ago Exp $
EAPI="5"
@@ -60,7 +60,7 @@ SRC_URI+=" jce? ( ${JCE_FILE} )"
LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
SLOT="1.7"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+X alsa aqua derby doc examples +fontconfig jce nsplugin pax_kernel source"
RESTRICT="fetch strip"
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.60.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.60.ebuild
index 4ee6ba1f53d4..6594c547a784 100644
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.60.ebuild
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.60.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.60.ebuild,v 1.1 2014/05/28 19:07:26 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.60.ebuild,v 1.3 2014/07/13 14:10:56 ago Exp $
EAPI="5"
@@ -28,7 +28,7 @@ SRC_URI="
LICENSE="Oracle-BCLA-JavaSE"
SLOT="1.7"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="X alsa fontconfig jce nsplugin pax_kernel"
RESTRICT="fetch strip"
diff --git a/dev-lang/swi-prolog/swi-prolog-6.6.4.ebuild b/dev-lang/swi-prolog/swi-prolog-6.6.4.ebuild
index 339d20cf6441..303b5bec4972 100644
--- a/dev-lang/swi-prolog/swi-prolog-6.6.4.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-6.6.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-6.6.4.ebuild,v 1.3 2014/07/10 11:05:14 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-6.6.4.ebuild,v 1.4 2014/07/13 10:02:48 ago Exp $
EAPI=4
@@ -15,7 +15,7 @@ SRC_URI="http://www.swi-prolog.org/download/stable/src/pl-${PV}.tar.gz
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="archive debug doc +gmp hardened java minimal odbc +readline ssl static-libs test zlib X"
RDEPEND="sys-libs/ncurses
diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest
index c0d438061ba9..d8a34a42d009 100644
--- a/dev-libs/girara/Manifest
+++ b/dev-libs/girara/Manifest
@@ -1 +1,2 @@
DIST girara-0.2.0.tar.gz 66130 SHA256 d14b54cb04d81ba3b84ad41c5e68951d250b455d0862add1c987e3af9e2e174d SHA512 00ab1f6881c5afcd03835049b60536f2330f391e56d9ef6555c57716bf95e53d06cc4b2416ed09c816658f97a982c606a9bb9981754cbad654ddeb5c54b471b2 WHIRLPOOL f02900a5a717b40a682e012b59e227d8e8ad3f0dcc2f4c927e10789923ea6c0d6d2e423a0075bd0d8ec4442029ff8bcede2c1a338f8fdbab2f56d639fd7db0cb
+DIST girara-0.2.2.tar.gz 72553 SHA256 6382dfdf1cc7ddfedf3d1ece5a7f07590c49b4932184ee8dec6d2bd121e66653 SHA512 216f737843523542697f995c08792adfaa0961414b7002d9b2740cc54f6fc94e61cbf06d5a71fa3e56637ad7594fe8c7cf5abb96784ff492c8305c2a7848ec8d WHIRLPOOL 4301b58585a11df21de19ca01b5a2f6c894e607106113860b3b562da1e986cb558ee6a062e40ea3b4a20d9b224a9289683c4098c30619edfa8cce3f82a2b0221
diff --git a/dev-libs/girara/girara-0.2.2.ebuild b/dev-libs/girara/girara-0.2.2.ebuild
new file mode 100644
index 000000000000..4a58144ad6b4
--- /dev/null
+++ b/dev-libs/girara/girara-0.2.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/girara/girara-0.2.2.ebuild,v 1.1 2014/07/13 16:22:34 ssuominen Exp $
+
+EAPI=5
+
+inherit multilib toolchain-funcs
+[[ ${PV} == 9999* ]] && inherit git-2
+
+DESCRIPTION="A library that implements a user interface that focuses on simplicity and minimalism"
+HOMEPAGE="http://pwmt.org/projects/girara/"
+if ! [[ ${PV} == 9999* ]]; then
+SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz"
+fi
+EGIT_REPO_URI="git://git.pwmt.org/${PN}.git"
+EGIT_BRANCH="develop"
+
+LICENSE="ZLIB"
+SLOT="3"
+if ! [[ ${PV} == 9999* ]]; then
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+else
+KEYWORDS=""
+fi
+IUSE="libnotify static-libs"
+
+RDEPEND=">=dev-libs/glib-2.28
+ >=x11-libs/gtk+-3.2:3
+ !<${CATEGORY}/${PN}-0.1.6
+ libnotify? ( >=x11-libs/libnotify-0.7 )"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+pkg_setup() {
+ mygiraraconf=(
+ WITH_LIBNOTIFY=$(usex libnotify 1 0)
+ PREFIX="${EPREFIX}"/usr
+ LIBDIR='${PREFIX}'/$(get_libdir)
+ CC="$(tc-getCC)"
+ SFLAGS=''
+ VERBOSE=1
+ DESTDIR="${D}"
+ )
+}
+
+src_prepare() {
+ # Remove 'static' and 'install-static' targets
+ if ! use static-libs; then
+ sed -i \
+ -e '/^${PROJECT}:/s:static::' \
+ -e '/^install:/s:install-static::' \
+ Makefile || die
+ fi
+}
+
+src_compile() {
+ emake "${mygiraraconf[@]}"
+}
+
+src_install() {
+ emake "${mygiraraconf[@]}" install
+ dodoc AUTHORS
+}
diff --git a/dev-libs/girara/girara-9999.ebuild b/dev-libs/girara/girara-9999.ebuild
index d02d8e3f24f6..113a4be9bf67 100644
--- a/dev-libs/girara/girara-9999.ebuild
+++ b/dev-libs/girara/girara-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/girara/girara-9999.ebuild,v 1.1 2014/05/07 15:05:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/girara/girara-9999.ebuild,v 1.2 2014/07/13 16:22:34 ssuominen Exp $
EAPI=5
@@ -22,17 +22,19 @@ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
else
KEYWORDS=""
fi
-IUSE="static-libs"
+IUSE="libnotify static-libs"
RDEPEND=">=dev-libs/glib-2.28
>=x11-libs/gtk+-3.2:3
- !<${CATEGORY}/${PN}-0.1.6"
+ !<${CATEGORY}/${PN}-0.1.6
+ libnotify? ( >=x11-libs/libnotify-0.7 )"
DEPEND="${RDEPEND}
sys-devel/gettext
virtual/pkgconfig"
pkg_setup() {
mygiraraconf=(
+ WITH_LIBNOTIFY=$(usex libnotify 1 0)
PREFIX="${EPREFIX}"/usr
LIBDIR='${PREFIX}'/$(get_libdir)
CC="$(tc-getCC)"
diff --git a/dev-libs/libgpg-error/libgpg-error-1.13.ebuild b/dev-libs/libgpg-error/libgpg-error-1.13.ebuild
index 5727e19e5972..449e19e8668a 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.13.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.13.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgpg-error/libgpg-error-1.13.ebuild,v 1.1 2014/07/12 09:06:58 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgpg-error/libgpg-error-1.13.ebuild,v 1.2 2014/07/13 06:01:16 alonbl Exp $
EAPI=5
@@ -26,6 +26,9 @@ DEPEND="${RDEPEND}
MULTILIB_CHOST_TOOLS=(
/usr/bin/gpg-error-config
)
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/gpg-error.h
+)
src_prepare() {
epatch_user
diff --git a/dev-libs/libpcre/libpcre-8.35.ebuild b/dev-libs/libpcre/libpcre-8.35.ebuild
index e0bb3dbcec97..dcb39fddd4f5 100644
--- a/dev-libs/libpcre/libpcre-8.35.ebuild
+++ b/dev-libs/libpcre/libpcre-8.35.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.35.ebuild,v 1.9 2014/07/11 21:06:01 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.35.ebuild,v 1.10 2014/07/13 09:55:25 ago Exp $
EAPI="4"
@@ -19,7 +19,7 @@ fi
LICENSE="BSD"
SLOT="3"
-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 ~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 ~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="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
REQUIRED_USE="readline? ( !libedit )
libedit? ( !readline )"
diff --git a/dev-libs/udis86/udis86-1.7-r2.ebuild b/dev-libs/udis86/udis86-1.7-r2.ebuild
index a07e7cb01996..7572e56156fb 100644
--- a/dev-libs/udis86/udis86-1.7-r2.ebuild
+++ b/dev-libs/udis86/udis86-1.7-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/udis86/udis86-1.7-r2.ebuild,v 1.5 2014/07/02 07:57:04 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/udis86/udis86-1.7-r2.ebuild,v 1.6 2014/07/13 09:59:40 ago Exp $
EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~hppa ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="test"
DEPEND="test? (
diff --git a/dev-perl/Gentoo-PerlMod-Version/Gentoo-PerlMod-Version-0.6.0.ebuild b/dev-perl/Gentoo-PerlMod-Version/Gentoo-PerlMod-Version-0.6.0.ebuild
index 24d6cfa03cca..084a7e358036 100644
--- a/dev-perl/Gentoo-PerlMod-Version/Gentoo-PerlMod-Version-0.6.0.ebuild
+++ b/dev-perl/Gentoo-PerlMod-Version/Gentoo-PerlMod-Version-0.6.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Gentoo-PerlMod-Version/Gentoo-PerlMod-Version-0.6.0.ebuild,v 1.2 2014/05/14 20:26:06 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Gentoo-PerlMod-Version/Gentoo-PerlMod-Version-0.6.0.ebuild,v 1.3 2014/07/13 18:09:48 zlogene Exp $
EAPI=4
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Convert arbitrary Perl Modules' versions into normalised Gentoo versions"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~x86"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Net-SSLeay/Manifest b/dev-perl/Net-SSLeay/Manifest
index 82ba8f683500..26c9a6712aa8 100644
--- a/dev-perl/Net-SSLeay/Manifest
+++ b/dev-perl/Net-SSLeay/Manifest
@@ -1,2 +1,3 @@
DIST Net-SSLeay-1.55.tar.gz 394657 SHA256 8cd5f09722e07b4e436102cb3a4b93623d753c171665ca9752c3b39a62ea3a79 SHA512 204928a95937b31216008986692ef96370ab6623c9238b69a10452db40ce0b1d50d97813c53eca6debb5f605afa946fd4a468fd32fa63572c275ce0ad33ab855 WHIRLPOOL bdbe27149c4e3f041c6a10da78f7513d8e5b602159f83a2e93047c0f6079d60f1d0d6d23d0211a7e20bdb8aa35b96b87dfbf733e5199b5b9ca2ab7b6308b51e8
DIST Net-SSLeay-1.58.tar.gz 399353 SHA256 0bdc50c19df545eb2f9e434458ee2b54e97b109315dafb476044b9039e783f56 SHA512 88d768ac5b8dc3dbbfe2715ed91fc4dd887febcc31316e06e40a875de98db95ca87452ad02df7ee74063c0ba9a171bbef02679577e4d219fcea1b21cf0399761 WHIRLPOOL 04a5c6423d35d4415ef03f2bcda945efff580d5081695e83b8be8349ab1c3c9f79651874ad75e81709eb2d94473815fbee0ede8812e0417767af5bfa2af59820
+DIST Net-SSLeay-1.64.tar.gz 411886 SHA256 9354e6b153d571ad612a211ce9732980944adb581997801f4643cda6e12d80b2 SHA512 cf469b6d7fdea853682d1d2e34be71948f75d2d5ca7ce1222be15f707843f0683cf348bff50f010ea55522904ea22a84e0a688fdbba70a5e6f6d28ebd2bf0de4 WHIRLPOOL c487a44edb2793957fd39491028e0946265c40de627c31e24326e8fbb3aa7fd9a8b153dda4c006e9bfb19bda2233aae76f3a39c9ef3e552ab3cb49b2c012a62d
diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.640.0.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.640.0.ebuild
new file mode 100644
index 000000000000..08b479109f98
--- /dev/null
+++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.640.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-SSLeay/Net-SSLeay-1.640.0.ebuild,v 1.1 2014/07/13 18:13:06 zlogene Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=MIKEM
+MODULE_VERSION=1.64
+inherit multilib perl-module
+
+DESCRIPTION="Net::SSLeay module for perl"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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=""
+
+RDEPEND="dev-libs/openssl"
+DEPEND="${RDEPEND}"
+# test? ( dev-perl/Test-Exception
+# dev-perl/Test-Warn
+# dev-perl/Test-NoWarnings )"
+
+#SRC_TEST=do
+
+export OPTIMIZE="$CFLAGS"
+export OPENSSL_PREFIX=${EPREFIX}/usr
+
+src_prepare() {
+ sed -i \
+ -e "/\$opts->{optimize} = '-O2 -g';/d" \
+ -e "s,\"\$prefix/lib\",\"\$prefix/$(get_libdir)\"," \
+ inc/Module/Install/PRIVATE/Net/SSLeay.pm || die
+ perl-module_src_prepare
+}
diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest
index a2a30c70cb3d..dc005485c5e3 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1,2 +1,3 @@
DIST 2.2.0.tar.gz 251829 SHA256 b8453879b475837ca32d0d43d4b36bb0b6f217d6546ef3890a2bc0d03e19c2ca SHA512 bec38cb529a90cce8ed3ad458efaabc9dc614694492f03b722ffda24e73e3a0786d06c51c79535de42a3e8bd52a194c520755579e6488dcd6499cd7cabef9ce2 WHIRLPOOL fbd61c7e8bf15dc1d44947c885a4b5729eb6b4e07d325b83a6d08cf4c43850eb60dc497777a37dcee99ab1068f859d974cec865fc49e3385b786fdbf8ba469cc
DIST 2.2.4.tar.gz 283710 SHA256 6c4f915fc5b76a5ac5aade7f134eb00a56c80e236738930e724e731af8475194 SHA512 980df76d1faf3ab982f905c1a6934eb19a98b460ed58327df141bf2ff84cf155e809b735ce446d0feb7462fcf03a835dce56e2a549f60d9954b010d5c0cebd18 WHIRLPOOL 190a14b05ed242488024eb413bd2d9d66baddc1c65ec1852a541693e0290f7d6b4e1bfb789ff027a443a924b57d1a56dea1b846a7d523a5338082d97ed6a941b
+DIST 2.2.5.tar.gz 290931 SHA256 c58245d96ed12aea03b90778078014a733f6a0b078e260c30ab32b339c28f888 SHA512 91938071acff3ace02dec2a421727937c6799d914a254ff2fc95bca068544169c79a02914fd0ab8c8e36f530c72c59a8123b971d280187bc9692cdcb52b9e3f9 WHIRLPOOL cebf8a0506099b2da0a48f8df7f8c82f5004f3861757c16a6a7d70a2844d592cf6338e5a67d36333fbc3398ebef415ea6728128f8ef63ecc0ddf37dbf4c8d884
diff --git a/dev-python/peewee/peewee-2.2.5.ebuild b/dev-python/peewee/peewee-2.2.5.ebuild
new file mode 100644
index 000000000000..122b4dd38bc4
--- /dev/null
+++ b/dev-python/peewee/peewee-2.2.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/peewee/peewee-2.2.5.ebuild,v 1.1 2014/07/13 15:00:17 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Small python ORM"
+HOMEPAGE="https://github.com/coleifer/peewee/"
+SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/apsw[${PYTHON_USEDEP}]
+ dev-python/psycopg[${PYTHON_USEDEP}]
+ dev-python/django[${PYTHON_USEDEP}]
+ )"
+# Req'd to ensure a unique tmp.db for each python impl running the testsuite.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ "${PYTHON}" ./runtests.py || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+ use examples && local EXAMPLES=( example/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/pycountry/Manifest b/dev-python/pycountry/Manifest
index 82ac8c1a03d0..2b6ff6dd7b38 100644
--- a/dev-python/pycountry/Manifest
+++ b/dev-python/pycountry/Manifest
@@ -2,3 +2,4 @@ DIST pycountry-1.3.zip 7895245 SHA256 96392022f6bd036f3c5143af36ecfc62d62c99ded0
DIST pycountry-1.4.zip 7911812 SHA256 c8e8dd244ad32bc1dbb55565b83f9277d0e0ad423c190844acd7e4b9831c3652 SHA512 59e6741f8c4a92412391ea672f6dc3778d87fcc38a5f37615bb60c8d022990425cdd8c04724c8eac1d503f11fea68a21989cd24fed060fe3efbdbeb7ef9177be WHIRLPOOL 36dc5829cb78014a67eae1db11cd1c4880ad108346acc75f9507fb5cf6cfd6e30423229c917081e9d76af6581396d7afce13a7585e7f16991a072646229f71ca
DIST pycountry-1.5.tar.gz 7384714 SHA256 11c014150120d51ebbb2a116698ad608c9e24e4f36c1aa64e94c1d5e0cbb799a SHA512 525b3ae2bef40bdf4c88978fffa0d95fec22a6e03dea259c84a980b36406a14667cad4bc1613b736a512835e9823fa2fdf73d80913d4dffbd2c53caa42f372ba WHIRLPOOL 8609147ec714175b5998e17737ef1e6deb92b221f0a207e8568bf34f8cb4b31ef9a597017a64159cc21333611bd303929776ef1bd74a9558e53b71053741ae8d
DIST pycountry-1.6.zip 8014680 SHA256 160d49120bca85282f1ab841181d83d38f68331d113cef12d66708ff6b786262 SHA512 c5e4d773925d4b9ad1c0ef4c403907be0ffa526bb3d77ef568639c60ab2c9ab82d78e75dbbe3e52c063562df6b0f63569599de3b32311b8eb937b838d816e90b WHIRLPOOL c65e712ff86fac077560ba18d61fe869be99b8aeb01502bbad8bd84bb36c7aa1280b4f782c65081d4d46a7730efb09e5760d03c77107be20020088dc288870ce
+DIST pycountry-1.8.zip 8138837 SHA256 ee2dbc157f21fc570e7a833180f8ae38ffbdee85af2c537b72d207af45dac5e1 SHA512 4f9fa21cbe58f5d6153eb112282a959a6638629e32ad686e0eb020174abc879b41857abf2704da19d5687e0335b30e1f153db1c95f53db32957293b2a795a80e WHIRLPOOL c44af37e0e62c5daac6e4b6232fb8dddd49b6dc6420e3bc05c4d864c56dabcd3d4f19367c66a0b4f0044a5d566f3156e2d9d6030e58ad7ee6e5a9010156776de
diff --git a/dev-python/pycountry/pycountry-1.8.ebuild b/dev-python/pycountry/pycountry-1.8.ebuild
new file mode 100644
index 000000000000..6957b6ad2ab8
--- /dev/null
+++ b/dev-python/pycountry/pycountry-1.8.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycountry/pycountry-1.8.ebuild,v 1.1 2014/07/13 07:56:16 idella4 Exp $
+
+EAPI=5
+# pypy pending actioning of bug filed upstream
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="ISO country, subdivision, language, currency and script definitions and their translations"
+HOMEPAGE="http://pypi.python.org/pypi/pycountry"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE="test"
+
+DEPEND="app-arch/unzip
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+DISTUTILS_IN_SOURCE_BUILD=1
+DOCS=( HISTORY.txt README TODO.txt )
+
+python_test() {
+ # https://bitbucket.org/techtonik/pycountry/issue/8/test_locales-pycountry-015-pypy
+ # and STILL
+ pushd "${BUILD_DIR}"/lib > /dev/null
+ if [[ "${EPYTHON}" == pypy ]]; then
+ sed -e 's:test_locales:_&:' -i pycountry/tests/test_general.py || die
+ fi
+ py.test ${PN}/tests/test_general.py || die
+ popd > /dev/null
+}
diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index 61821cedc616..dadab60f6c72 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -1,5 +1,6 @@
DIST pypy-2.0.2-src.tar.bz2 14819848 SHA256 1991c90d6b98e2408b3790d4b57b71ec1c69346328b8321505ce8f6ab4544c3c SHA512 5b8b56194dff468dd249dea0014fadafb791eb69858ffae0b9c7638f087df277a84ddadc7d5b0fdb48a12ca8e6b70eb95cb5b7a5f56fe8fe3396820b814ecfd7 WHIRLPOOL bb1f71e0b2d3e145edcb1baa17b0a13c09f5229cf1b0532edbb3d0d5c87ef39543c0ef6b9dc7ce2778c4a3336d4a1580fce9cf960f82b72ddfed02e06d10d8af
DIST pypy-2.2.1-src.tar.bz2 14439822 SHA256 252045187e443656a2beb412dadac9296e8fe8db0f75a66ed5265db58c35035f SHA512 68b52c5b1a9b96593aa1dd38ad0b1b7b282852008e3ae3c488a5e19ab2bede68e2b40afdb79d85a4ab21cb1da6647b8b958fcefe34c99a1f6cbc1a19d695d3b6 WHIRLPOOL 6eca63959d8ee5663f868daaaac32ad1180b07e2f8b63d839652902095a098ffbfa29c6f83451733270a4b2f73b65450cb3b80a878b9dd1ec71089bfff11e9f6
+DIST pypy-2.3.1-src.tar.bz2 15225332 SHA256 3fd10d97c0177c33ed358a78eb26f5bf1f91b266af853564b1a9d8c310a1e439 SHA512 86aab86c5f413cdd6a56680915605de5c1416255b43a8dce1b4dcf8f1febdb3275076a4a9c7de30002387d59e4171a52da2528436eb205d8d947de7edd049c65 WHIRLPOOL c78d41240f1803d9461f797fd0ef647a40a6990a4e3a504e80a0eaaf460d052bb60fe6240cacdb3ee8737500c9c7f418b1d55c619d01ac7b73aace3d82157aa6
DIST pypy-bin-2.0.2-amd64+bzip2+jit+ncurses+shadowstack.tar.xz 9652340 SHA256 100c1119fe08c47d1a15ca6c98b91c510f41c670d87526fb392e3b292d791ac3 SHA512 ac8d91e740fc8a49860ec47717b160a59ac68807aabd8ddc3a578682d6d75d3ddd47bc5e8b7db6e2be0af5f9414596831372225ab657194ba72d22c2360f98c0 WHIRLPOOL 5dc07128fc8db9df062053803a2792eb6f3795cf2cdef5d011a594c73a158bb4061fcd862c39eb074805f0b4e46d0846708f3fd0fdf3464b02cbe8efa406bb1f
DIST pypy-bin-2.0.2-amd64+bzip2+jit+ncurses.tar.xz 10469416 SHA256 4f8a64d8cc679b8ba6751fc47307df679bca2658848d009c8c724682c76fbf0a SHA512 1d1bedc80d12982074a09516674bee71e57bac9b2b9dac1d9834295edb3b8fb79c0e93de708eef0dbf232dd198a4a728b09a9f86ab5dabad8a293072446b2a2b WHIRLPOOL 08753da5e1e6361bd21b03813cb4482164cc2933d8bf2a2d7443379b1be1b6ac0b87fde571af8519e7fa9e14893bb570799ad6dae02ba42a936dc4d964b0e821
DIST pypy-bin-2.0.2-amd64+bzip2+ncurses.tar.xz 6527192 SHA256 ff2ac88da94978388b20d54b0a2add839facc5e605c54cc7bfd96faa088ec266 SHA512 58b9e6acc9038b4aeccadf0f1dd257b320cca8e536edd2835c0d9b95f27268b3b71e3af59daa4033580f2fc43f590205e1ed6de2fe475c60cf00c1a781ad1f86 WHIRLPOOL b5410e2b7a0816dffb64b32169be82193820c345d5b4000dc3fd8f827ce82a783fe62605efc0be7794d38dbdeb59d68cf0ac46c62f24f4a8025a2506739db4d1
@@ -14,3 +15,10 @@ DIST pypy-bin-2.2.1-r1-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz 7789720 SHA
DIST pypy-bin-2.2.1-r1-x86+bzip2+jit+ncurses+sse2.tar.xz 8981480 SHA256 e965e343bf5e43c2f21e1bb9317a22f06ebc07c57127ffdb6ed5a9768a834e0e SHA512 1731aa4db600fb5cf79f17607a0e68321c5be5d969acafa249708e9b91a3f4b5fcde96a64c85f2fbd8977ccae288e3e9b31531dbdf090bc816a783c06b983b5b WHIRLPOOL ed03fbe804127b33b853df19a7462b40931826cb906e60f645737bc7df17870132e8a68bfbe55e6c7a79fc971e2c93e63e6e897da6ff29da0aa1c0998c848f51
DIST pypy-bin-2.2.1-r1-x86+bzip2+ncurses+sse2.tar.xz 5179532 SHA256 2cc4e6208303ed64a09e9769a866523217dadfb81322ea0dc931e6d4f2cd757c SHA512 3bd1b3a45c60461294eee63d25f4f71c93289d5aa18193585a478dae343fd2930cf3f2ce0ef001fa33b3a6c77abc26842e4941f0573ed163c8a60feb0fe6ff51 WHIRLPOOL 536a6dfbc6f11fb8e3d3f3fab232263e4731ec97cc3eca4c952042c747b30f761821bc4ddf7c7e896d9692d555a5b5fcb6057f3c3c31e8f8cd6bc9edbbd88503
DIST pypy-bin-2.2.1-r1-x86+bzip2+ncurses.tar.xz 5179732 SHA256 2889b1b3e0af8d7a763f9d237295ab181c9661c0f57d26e799c71d28df388714 SHA512 ce34e0cb0d362381ce6ba8fab84a55463d2c4cc0834df550e0823b6ec97d762386d382ba1a7a5e039ef531070bfa27ed76c88326a48f948cb9f82af78fda2391 WHIRLPOOL e6cc06898e967010d30d225a4ca59b70080da3763e0ad153211719bc99fd707ac8ee8d28ee2c286f87404439424ab59ecf7332162658f0b4cb0a3efbac35f54c
+DIST pypy-bin-2.3.1-r1-amd64+bzip2+jit+ncurses+shadowstack.tar.xz 10724632 SHA256 e897fce8057d6ffd8a8f66ddd3736d82c4edae9e30bf0622b5695c083a5f249d SHA512 b3b9ccb63bf2922c734874d745a40c49d5af1e9d9a3a1188c31040fef20faf4fdc00ac1be90ed35848e09bf86dfe5552a720b7c5c4d845777fc85479b515dac6 WHIRLPOOL 583864f5923dc0e0ee59e2397d1ed0f7ecd027605470bb2462f70b40338167f932a235fc40bf0b7349d9facdb7b1a07d86ff46ccc296acc3bb0f21cf7f8709e9
+DIST pypy-bin-2.3.1-r1-amd64+bzip2+jit+ncurses.tar.xz 12234132 SHA256 2169569b4f85869607d4ba7fa57852f954815a9bbb344da4fa842fbc59e4081a SHA512 7484fa22d79dfb1970c926fa27579184f3a38548d8072c49f239f31a8dc5549786776c27c0aa28583736f144e16ea0edb6fb8be81c0e394af783c6916e775cc1 WHIRLPOOL 3b1124526531cbf86e503933e8294ad7d11cb0993c1d103c59ced46830323e7e7c540194a13880d46b730e7b6498b1b48a1a902766948d28379ccf1020f05f35
+DIST pypy-bin-2.3.1-r1-amd64+bzip2+ncurses.tar.xz 6893836 SHA256 e547e1c5674e53e955373f44ab2ef7ef81f0f3f27240070e634c72b666428456 SHA512 5cb35f6a88aea9e92a8bbbdd873235e8b0b5bcce52d749dd80f68ddb7127eae27122ece74e13c4a2360a0dd65449fa7207a5279f0195732946f7ce8f8aa54142 WHIRLPOOL 4eaa864a456fc29a3731801901f93b62b559eb1bd5867f790840f8f8de1c98fa63bc17bd3dec0f9de82d8f639c2ecf8d3831555503c0089a727ff820c525b24a
+DIST pypy-bin-2.3.1-r1-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz 9114380 SHA256 9e30512444e889236d2bf762a2378da4a79e9b7c055e525a786380fa6fe391c4 SHA512 1175552bd4abde9bc71ef212c3f817f12e5c1815afe02b43d2834e2ae1cdc358d90701f8db667feabdd13009a955a12fabbe88fa441c12cc02fba4757c84056d WHIRLPOOL db927c10627fade821891fda8333ebcb3b0ead64df6bb38ec7482a5aaa8eff3a2b3b4ee0734c541431dcc7492f24424f42a54d48dc3bbd2d26d669ada776d626
+DIST pypy-bin-2.3.1-r1-x86+bzip2+jit+ncurses+sse2.tar.xz 10074824 SHA256 1a15019bf2c1bff57833c0061e2074e48222142919d32b5e8349f5fc2d2a7dc9 SHA512 a99e880e08ecb0cb802ad78f4c6b20017710875503a1fb73bc3e8c5a7710bbbe1d2d3f57f129b4e815fb9576a5dd92731eccd485915f9f036a227aeaecc8a270 WHIRLPOOL 193e0b219e7398a4937d092684447d633dfc66dfbff5c174280bed6b0e31d4230c6c9847de6fed0ddebfa96e9e76aa5edffb0899542c0cabfc688ad24b9c24ce
+DIST pypy-bin-2.3.1-r1-x86+bzip2+ncurses+sse2.tar.xz 5996472 SHA256 cefe34845216e5d7f5a51e318c5449aad867987044849e61fda0ce5486e68c5f SHA512 df07645f87d29b75da9f9d2213922562b4059ebad23da43d8d0eecc3e5fb95feef990e76e54c2dd86712a253db41d64a70d464f9ff7d8e1fa72aae648c888b92 WHIRLPOOL d806f691fc0200b9d470e6508c4217203892ccc7f2f34045952ce111b2a8ec2027d14e6030cee22c3681817b8f6d66ada49fdb62b32a583751494fd605b08dc5
+DIST pypy-bin-2.3.1-r1-x86+bzip2+ncurses.tar.xz 6025904 SHA256 e8aa0fa467daca78cb0231339d3267ecc396faf7b7b992b160bb65f76b65ba19 SHA512 291d11f2cf9115601dcec95876975d694cffe6b8d156ef91463d17d0de26b13d9ad0d773fdf4f126a9a24fc5fe41dc254df36a51e0f1dd8c1c5fa81155d128f2 WHIRLPOOL 98a8e68fdfea8be8efdd2445aa449f3d32731eb6ab2727454e4c0474025316ce43dfbd0bb2fab3cff698401994c76444133e95df3590894cc733f97f3f541539
diff --git a/dev-python/pypy-bin/files/2.3-21_all_distutils_c++.patch b/dev-python/pypy-bin/files/2.3-21_all_distutils_c++.patch
new file mode 100644
index 000000000000..2787360c15be
--- /dev/null
+++ b/dev-python/pypy-bin/files/2.3-21_all_distutils_c++.patch
@@ -0,0 +1,321 @@
+http://bugs.python.org/issue1222585
+
+--- Lib/distutils/cygwinccompiler.py
++++ Lib/distutils/cygwinccompiler.py
+@@ -117,8 +117,10 @@
+ # dllwrap 2.10.90 is buggy
+ if self.ld_version >= "2.10.90":
+ self.linker_dll = "gcc"
++ self.linker_dll_cxx = "g++"
+ else:
+ self.linker_dll = "dllwrap"
++ self.linker_dll_cxx = "dllwrap"
+
+ # ld_version >= "2.13" support -shared so use it instead of
+ # -mdll -static
+@@ -132,9 +134,13 @@
+ self.set_executables(compiler='gcc -mcygwin -O -Wall',
+ compiler_so='gcc -mcygwin -mdll -O -Wall',
+ compiler_cxx='g++ -mcygwin -O -Wall',
++ compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
+ linker_exe='gcc -mcygwin',
+ linker_so=('%s -mcygwin %s' %
+- (self.linker_dll, shared_option)))
++ (self.linker_dll, shared_option)),
++ linker_exe_cxx='g++ -mcygwin',
++ linker_so_cxx=('%s -mcygwin %s' %
++ (self.linker_dll_cxx, shared_option)))
+
+ # cygwin and mingw32 need different sets of libraries
+ if self.gcc_version == "2.91.57":
+@@ -160,8 +166,12 @@
+ raise CompileError, msg
+ else: # for other files use the C-compiler
+ try:
+- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+- extra_postargs)
++ if self.detect_language(src) == 'c++':
++ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++ extra_postargs)
++ else:
++ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++ extra_postargs)
+ except DistutilsExecError, msg:
+ raise CompileError, msg
+
+@@ -327,9 +337,14 @@
+ self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin,
+ compiler_so='gcc%s -mdll -O -Wall' % no_cygwin,
+ compiler_cxx='g++%s -O -Wall' % no_cygwin,
++ compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin,
+ linker_exe='gcc%s' % no_cygwin,
+ linker_so='%s%s %s %s'
+ % (self.linker_dll, no_cygwin,
++ shared_option, entry_point),
++ linker_exe_cxx='g++%s' % no_cygwin,
++ linker_so_cxx='%s%s %s %s'
++ % (self.linker_dll_cxx, no_cygwin,
+ shared_option, entry_point))
+ # Maybe we should also append -mthreads, but then the finished
+ # dlls need another dll (mingwm10.dll see Mingw32 docs)
+--- Lib/distutils/emxccompiler.py
++++ Lib/distutils/emxccompiler.py
+@@ -65,8 +65,12 @@
+ # XXX optimization, warnings etc. should be customizable.
+ self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+ compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++ compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++ compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+ linker_exe='gcc -Zomf -Zmt -Zcrtdll',
+- linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')
++ linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll',
++ linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll',
++ linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll')
+
+ # want the gcc library statically linked (so that we don't have
+ # to distribute a version dependent on the compiler we have)
+@@ -83,8 +87,12 @@
+ raise CompileError, msg
+ else: # for other files use the C-compiler
+ try:
+- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+- extra_postargs)
++ if self.detect_language(src) == 'c++':
++ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++ extra_postargs)
++ else:
++ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++ extra_postargs)
+ except DistutilsExecError, msg:
+ raise CompileError, msg
+
+--- Lib/distutils/sysconfig_cpython.py
++++ Lib/distutils/sysconfig_cpython.py
+@@ -170,10 +170,12 @@
+ _osx_support.customize_compiler(_config_vars)
+ _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+
+- (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
+- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+- 'CCSHARED', 'LDSHARED', 'SO', 'AR',
+- 'ARFLAGS')
++ (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
++ get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++ 'SO', 'AR', 'ARFLAGS')
++
++ cflags = ''
++ cxxflags = ''
+
+ if 'CC' in os.environ:
+ newcc = os.environ['CC']
+@@ -188,19 +190,27 @@
+ cxx = os.environ['CXX']
+ if 'LDSHARED' in os.environ:
+ ldshared = os.environ['LDSHARED']
++ if 'LDCXXSHARED' in os.environ:
++ ldcxxshared = os.environ['LDCXXSHARED']
+ if 'CPP' in os.environ:
+ cpp = os.environ['CPP']
+ else:
+ cpp = cc + " -E" # not always
+ if 'LDFLAGS' in os.environ:
+ ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+ if 'CFLAGS' in os.environ:
+- cflags = opt + ' ' + os.environ['CFLAGS']
++ cflags = os.environ['CFLAGS']
+ ldshared = ldshared + ' ' + os.environ['CFLAGS']
++ if 'CXXFLAGS' in os.environ:
++ cxxflags = os.environ['CXXFLAGS']
++ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+ if 'CPPFLAGS' in os.environ:
+ cpp = cpp + ' ' + os.environ['CPPFLAGS']
+ cflags = cflags + ' ' + os.environ['CPPFLAGS']
++ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+ ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+ if 'AR' in os.environ:
+ ar = os.environ['AR']
+ if 'ARFLAGS' in os.environ:
+@@ -209,13 +219,17 @@
+ archiver = ar + ' ' + ar_flags
+
+ cc_cmd = cc + ' ' + cflags
++ cxx_cmd = cxx + ' ' + cxxflags
+ compiler.set_executables(
+ preprocessor=cpp,
+ compiler=cc_cmd,
+ compiler_so=cc_cmd + ' ' + ccshared,
+- compiler_cxx=cxx,
++ compiler_cxx=cxx_cmd,
++ compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+ linker_so=ldshared,
+ linker_exe=cc,
++ linker_so_cxx=ldcxxshared,
++ linker_exe_cxx=cxx,
+ archiver=archiver)
+
+ compiler.shared_lib_extension = so_ext
+--- Lib/distutils/unixccompiler.py
++++ Lib/distutils/unixccompiler.py
+@@ -55,14 +55,17 @@
+ # are pretty generic; they will probably have to be set by an outsider
+ # (eg. using information discovered by the sysconfig about building
+ # Python extensions).
+- executables = {'preprocessor' : None,
+- 'compiler' : ["cc"],
+- 'compiler_so' : ["cc"],
+- 'compiler_cxx' : ["cc"],
+- 'linker_so' : ["cc", "-shared"],
+- 'linker_exe' : ["cc"],
+- 'archiver' : ["ar", "-cr"],
+- 'ranlib' : None,
++ executables = {'preprocessor' : None,
++ 'compiler' : ["cc"],
++ 'compiler_so' : ["cc"],
++ 'compiler_cxx' : ["c++"],
++ 'compiler_so_cxx' : ["c++"],
++ 'linker_so' : ["cc", "-shared"],
++ 'linker_exe' : ["cc"],
++ 'linker_so_cxx' : ["c++", "-shared"],
++ 'linker_exe_cxx' : ["c++"],
++ 'archiver' : ["ar", "-cr"],
++ 'ranlib' : None,
+ }
+
+ if sys.platform[:6] == "darwin":
+@@ -112,12 +115,19 @@
+
+ def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+ compiler_so = self.compiler_so
++ compiler_so_cxx = self.compiler_so_cxx
+ if sys.platform == 'darwin':
+ compiler_so = _osx_support.compiler_fixup(compiler_so,
+ cc_args + extra_postargs)
++ compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
++ cc_args + extra_postargs)
+ try:
+- self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+- extra_postargs)
++ if self.detect_language(src) == 'c++':
++ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
++ extra_postargs)
++ else:
++ self.spawn(compiler_so + cc_args + [src, '-o', obj] +
++ extra_postargs)
+ except DistutilsExecError, msg:
+ raise CompileError, msg
+
+@@ -174,23 +184,16 @@
+ ld_args.extend(extra_postargs)
+ self.mkpath(os.path.dirname(output_filename))
+ try:
+- if target_desc == CCompiler.EXECUTABLE:
+- linker = self.linker_exe[:]
++ if target_lang == "c++":
++ if target_desc == CCompiler.EXECUTABLE:
++ linker = self.linker_exe_cxx[:]
++ else:
++ linker = self.linker_so_cxx[:]
+ else:
+- linker = self.linker_so[:]
+- if target_lang == "c++" and self.compiler_cxx:
+- # skip over environment variable settings if /usr/bin/env
+- # is used to set up the linker's environment.
+- # This is needed on OSX. Note: this assumes that the
+- # normal and C++ compiler have the same environment
+- # settings.
+- i = 0
+- if os.path.basename(linker[0]) == "env":
+- i = 1
+- while '=' in linker[i]:
+- i = i + 1
+-
+- linker[i] = self.compiler_cxx[i]
++ if target_desc == CCompiler.EXECUTABLE:
++ linker = self.linker_exe[:]
++ else:
++ linker = self.linker_so[:]
+
+ if sys.platform == 'darwin':
+ linker = _osx_support.compiler_fixup(linker, ld_args)
+--- Lib/_osx_support.py
++++ Lib/_osx_support.py
+@@ -14,13 +14,13 @@
+ # configuration variables that may contain universal build flags,
+ # like "-arch" or "-isdkroot", that may need customization for
+ # the user environment
+-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
+- 'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
+- 'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
+- 'PY_CORE_CFLAGS')
++_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
++ 'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
++ 'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
++ 'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
+
+ # configuration variables that may contain compiler calls
+-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
++_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
+
+ # prefix added to original configuration variable names
+ _INITPRE = '_OSX_SUPPORT_INITIAL_'
+--- a/distutils/sysconfig_pypy.py
++++ b/distutils/sysconfig_pypy.py
+@@ -123,7 +123,55 @@
+ optional C speedup components.
+ """
+ if compiler.compiler_type == "unix":
+- compiler.compiler_so.extend(['-O2', '-fPIC', '-Wimplicit'])
++ cc = ' '.join(compiler.compiler)
++ cxx = ' '.join(compiler.compiler_cxx)
++ ldshared = ' '.join(compiler.linker_so)
++ ldcxxshared = ' '.join(compiler.linker_so_cxx)
++
++ cflags = ''
++ cxxflags = ''
++ ccshared = '-fPIC'
++
++ if 'CC' in os.environ:
++ cc = os.environ['CC']
++ if 'CXX' in os.environ:
++ cxx = os.environ['CXX']
++ if 'LDSHARED' in os.environ:
++ ldshared = os.environ['LDSHARED']
++ if 'LDCXXSHARED' in os.environ:
++ ldcxxshared = os.environ['LDCXXSHARED']
++ if 'CPP' in os.environ:
++ cpp = os.environ['CPP']
++ else:
++ cpp = cc + " -E" # not always
++ if 'LDFLAGS' in os.environ:
++ ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
++ if 'CFLAGS' in os.environ:
++ cflags = os.environ['CFLAGS']
++ ldshared = ldshared + ' ' + os.environ['CFLAGS']
++ if 'CXXFLAGS' in os.environ:
++ cxxflags = os.environ['CXXFLAGS']
++ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
++ if 'CPPFLAGS' in os.environ:
++ cpp = cpp + ' ' + os.environ['CPPFLAGS']
++ cflags = cflags + ' ' + os.environ['CPPFLAGS']
++ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
++ ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
++
++ cc_cmd = cc + ' ' + cflags
++ cxx_cmd = cxx + ' ' + cxxflags
++ compiler.set_executables(
++ preprocessor=cpp,
++ compiler=cc_cmd,
++ compiler_so=cc_cmd + ' ' + ccshared,
++ compiler_cxx=cxx_cmd,
++ compiler_so_cxx=cxx_cmd + ' ' + ccshared,
++ linker_so=ldshared,
++ linker_exe=cc,
++ linker_so_cxx=ldcxxshared,
++ linker_exe_cxx=cxx)
+ compiler.shared_lib_extension = get_config_var('SO')
+ if "CPPFLAGS" in os.environ:
+ cppflags = shlex.split(os.environ["CPPFLAGS"])
diff --git a/dev-python/pypy/pypy-2.3.ebuild b/dev-python/pypy-bin/pypy-bin-2.3.1.ebuild
similarity index 50%
rename from dev-python/pypy/pypy-2.3.ebuild
rename to dev-python/pypy-bin/pypy-bin-2.3.1.ebuild
index 4158d377aa25..673e6fc6659c 100644
--- a/dev-python/pypy/pypy-2.3.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-2.3.1.ebuild
@@ -1,51 +1,88 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.3.ebuild,v 1.3 2014/07/06 13:18:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/pypy-bin-2.3.1.ebuild,v 1.1 2014/07/12 21:27:07 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 pypy pypy2_0 )
-inherit check-reqs eutils multilib multiprocessing pax-utils \
- python-any-r1 toolchain-funcs vcs-snapshot versionator
+inherit eutils multilib pax-utils python-any-r1 vcs-snapshot versionator
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
+BINHOST="http://pypy.aliceinwire.net/pypy-bin/"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language (binary package)"
HOMEPAGE="http://pypy.org/"
-SRC_URI="https://www.bitbucket.org/pypy/pypy/downloads/${P}-src.tar.bz2"
+SRC_URI="https://www.bitbucket.org/pypy/pypy/downloads/pypy-${PV}-src.tar.bz2
+ amd64? (
+ jit? ( shadowstack? (
+ ${BINHOST}/${P}-amd64+bzip2+jit+ncurses+shadowstack.tar.xz
+ -> ${P}-r1-amd64+bzip2+jit+ncurses+shadowstack.tar.xz
+ ) )
+ jit? ( !shadowstack? (
+ ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.xz
+ -> ${P}-r1-amd64+bzip2+jit+ncurses.tar.xz
+ ) )
+ !jit? ( !shadowstack? (
+ ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.xz
+ -> ${P}-r1-amd64+bzip2+ncurses.tar.xz
+ ) )
+ )
+ x86? (
+ sse2? (
+ jit? ( shadowstack? (
+ ${BINHOST}/${P}-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz
+ -> ${P}-r1-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz
+ ) )
+ jit? ( !shadowstack? (
+ ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.xz
+ -> ${P}-r1-x86+bzip2+jit+ncurses+sse2.tar.xz
+ ) )
+ !jit? ( !shadowstack? (
+ ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.xz
+ -> ${P}-r1-x86+bzip2+ncurses+sse2.tar.xz
+ ) )
+ )
+ !sse2? (
+ !jit? ( !shadowstack? (
+ ${BINHOST}/${P}-x86+bzip2+ncurses.tar.xz
+ -> ${P}-r1-x86+bzip2+ncurses.tar.xz
+ ) )
+ )
+ )"
+
+# Supported variants
+REQUIRED_USE="!jit? ( !shadowstack )
+ x86? ( !sse2? ( !jit !shadowstack ) )"
LICENSE="MIT"
SLOT="0/$(get_version_component_range 1-2 ${PV})"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 doc +jit ncurses sandbox shadowstack sqlite sse2 tk"
-
-RDEPEND=">=sys-libs/zlib-1.1.3
- virtual/libffi
- virtual/libintl
- dev-libs/expat
- dev-libs/openssl
- bzip2? ( app-arch/bzip2 )
- ncurses? ( sys-libs/ncurses )
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +jit shadowstack sqlite sse2 test tk"
+
+# yep, world would be easier if people started filling subslots...
+RDEPEND="
+ app-arch/bzip2:0
+ dev-libs/expat:0
+ dev-libs/libffi:0
+ dev-libs/openssl:0
+ sys-libs/glibc:2.2
+ sys-libs/ncurses:5
+ sys-libs/zlib:0
sqlite? ( dev-db/sqlite:3 )
tk? (
dev-lang/tk:0
dev-tcltk/tix
)
- !dev-python/pypy-bin:0"
-DEPEND="${RDEPEND}
- doc? ( dev-python/sphinx )
- ${PYTHON_DEPS}"
+ !dev-python/pypy:0"
+DEPEND="app-arch/xz-utils
+ doc? ( ${PYTHON_DEPS}
+ dev-python/sphinx )
+ test? ( ${RDEPEND} )"
PDEPEND="app-admin/python-updater"
-S="${WORKDIR}/${P}-src"
-
-pkg_pretend() {
- CHECKREQS_MEMORY="2G"
- use amd64 && CHECKREQS_MEMORY="4G"
- check-reqs_pkg_pretend
-}
+S=${WORKDIR}/pypy-${PV}-src
pkg_setup() {
- pkg_pretend
- python-any-r1_pkg_setup
+ use doc && python-any-r1_pkg_setup
}
src_prepare() {
@@ -60,61 +97,14 @@ src_prepare() {
}
src_compile() {
- tc-export CC
-
- local jit_backend
- if use jit; then
- jit_backend='--jit-backend='
-
- # We only need the explicit sse2 switch for x86.
- # On other arches we can rely on autodetection which uses
- # compiler macros. Plus, --jit-backend= doesn't accept all
- # the modern values...
-
- if use x86; then
- if use sse2; then
- jit_backend+=x86
- else
- jit_backend+=x86-without-sse2
- fi
- else
- jit_backend+=auto
- fi
- fi
-
- local args=(
- $(usex jit -Ojit -O2)
- $(usex shadowstack --gcrootfinder=shadowstack '')
- $(usex sandbox --sandbox '')
-
- ${jit_backend}
- --make-jobs=$(makeopts_jobs)
-
- pypy/goal/targetpypystandalone
- )
-
- # Avoid linking against libraries disabled by use flags
- local opts=(
- bzip2:bz2
- ncurses:_minimal_curses
- )
-
- local opt
- for opt in "${opts[@]}"; do
- local flag=${opt%:*}
- local mod=${opt#*:}
-
- args+=(
- $(usex ${flag} --withmod --withoutmod)-${mod}
- )
- done
-
- set -- "${PYTHON}" rpython/bin/rpython --batch "${args[@]}"
- echo -e "\033[1m${@}\033[0m"
- "${@}" || die "compile error"
+ # Tadaam! PyPy compiled!
+ mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
+ mv "${WORKDIR}"/${P}*/include/*.h include/ || die
+ mv pypy/module/cpyext/include/*.h include/ || die
use doc && emake -C pypy/doc/ html
- pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
+ #needed even without jit :( also needed in both compile and install phases
+ pax-mark m pypy-c
}
src_test() {
@@ -127,10 +117,11 @@ src_test() {
src_install() {
einfo "Installing PyPy ..."
insinto "/usr/$(get_libdir)/pypy"
- doins -r include lib_pypy lib-python pypy-c
- fperms a+x ${INSDESTTREE}/pypy-c
- pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
+ doins -r include lib_pypy lib-python pypy-c libpypy-c.so
+ fperms a+x ${INSDESTTREE}/pypy-c ${INSDESTTREE}/libpypy-c.so
+ pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" "${ED%/}${INSDESTTREE}/libpypy-c.so"
dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
+ dosym ../$(get_libdir)/pypy/libpypy-c.so /usr/$(get_libdir)/libpypy-c.so
dodoc README.rst
if ! use sqlite; then
@@ -151,6 +142,7 @@ src_install() {
python_export pypy EPYTHON PYTHON PYTHON_SITEDIR
local PYTHON=${ED%/}${INSDESTTREE}/pypy-c
+ local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
echo "EPYTHON='${EPYTHON}'" > epython.py
python_domodule epython.py
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 4f33ee53c9a5..0f33b57809ee 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,4 +1,3 @@
DIST pypy-2.0.2-src.tar.bz2 14819848 SHA256 1991c90d6b98e2408b3790d4b57b71ec1c69346328b8321505ce8f6ab4544c3c SHA512 5b8b56194dff468dd249dea0014fadafb791eb69858ffae0b9c7638f087df277a84ddadc7d5b0fdb48a12ca8e6b70eb95cb5b7a5f56fe8fe3396820b814ecfd7 WHIRLPOOL bb1f71e0b2d3e145edcb1baa17b0a13c09f5229cf1b0532edbb3d0d5c87ef39543c0ef6b9dc7ce2778c4a3336d4a1580fce9cf960f82b72ddfed02e06d10d8af
DIST pypy-2.2.1-src.tar.bz2 14439822 SHA256 252045187e443656a2beb412dadac9296e8fe8db0f75a66ed5265db58c35035f SHA512 68b52c5b1a9b96593aa1dd38ad0b1b7b282852008e3ae3c488a5e19ab2bede68e2b40afdb79d85a4ab21cb1da6647b8b958fcefe34c99a1f6cbc1a19d695d3b6 WHIRLPOOL 6eca63959d8ee5663f868daaaac32ad1180b07e2f8b63d839652902095a098ffbfa29c6f83451733270a4b2f73b65450cb3b80a878b9dd1ec71089bfff11e9f6
-DIST pypy-2.3-src.tar.bz2 14658373 SHA256 be2c271e7f9d7c0059a551ba1501713c00336e551e7f13107f0f34c721d95b0c SHA512 fbbe8fb06abdee9e0cd330ebeb6ea4769d3d0bf1271f84ed5b8fc94558b72abda677f17ef2c743160b823287cf901aefb139a7eb56f5252e082d525a0806f33c WHIRLPOOL f0f771c0c9e91fedbcac97ad0e9f318c379c6d343af2450f98f9000b032867eea89a53fff0895f48da22a4327a24440319fe7efddb56d24a80b8e4aedfa0c91d
DIST pypy-2.3.1-src.tar.bz2 15225332 SHA256 3fd10d97c0177c33ed358a78eb26f5bf1f91b266af853564b1a9d8c310a1e439 SHA512 86aab86c5f413cdd6a56680915605de5c1416255b43a8dce1b4dcf8f1febdb3275076a4a9c7de30002387d59e4171a52da2528436eb205d8d947de7edd049c65 WHIRLPOOL c78d41240f1803d9461f797fd0ef647a40a6990a4e3a504e80a0eaaf460d052bb60fe6240cacdb3ee8737500c9c7f418b1d55c619d01ac7b73aace3d82157aa6
diff --git a/dev-python/pypy/pypy-2.3.1.ebuild b/dev-python/pypy/pypy-2.3.1.ebuild
index 78cd246f638a..b12f1d0af7fa 100644
--- a/dev-python/pypy/pypy-2.3.1.ebuild
+++ b/dev-python/pypy/pypy-2.3.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.3.1.ebuild,v 1.1 2014/06/18 23:37:41 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.3.1.ebuild,v 1.2 2014/07/12 21:31:08 mgorny Exp $
EAPI=5
@@ -133,7 +133,6 @@ src_install() {
pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" "${ED%/}${INSDESTTREE}/libpypy-c.so"
dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
dosym ../$(get_libdir)/pypy/libpypy-c.so /usr/$(get_libdir)/libpypy-c.so
- einfo "pax-mark 2 done"
dodoc README.rst
if ! use sqlite; then
@@ -154,7 +153,7 @@ src_install() {
python_export pypy EPYTHON PYTHON PYTHON_SITEDIR
local PYTHON=${ED%/}${INSDESTTREE}/pypy-c
- export LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
+ local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
echo "EPYTHON='${EPYTHON}'" > epython.py
python_domodule epython.py
diff --git a/dev-python/zsi/zsi-2.1_alpha1-r1.ebuild b/dev-python/zsi/zsi-2.1_alpha1-r1.ebuild
index c7a928480c68..8cdcf88d0ef2 100644
--- a/dev-python/zsi/zsi-2.1_alpha1-r1.ebuild
+++ b/dev-python/zsi/zsi-2.1_alpha1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/zsi/zsi-2.1_alpha1-r1.ebuild,v 1.6 2014/06/16 08:42:41 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/zsi/zsi-2.1_alpha1-r1.ebuild,v 1.7 2014/07/13 09:57:47 ago Exp $
EAPI=5
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/pywebsvcs/${MY_P}.tar.gz"
LICENSE="BSD MIT"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
IUSE="doc examples twisted"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-ruby/rb-gsl/Manifest b/dev-ruby/rb-gsl/Manifest
index 5d90a31982e7..c0b776a3c377 100644
--- a/dev-ruby/rb-gsl/Manifest
+++ b/dev-ruby/rb-gsl/Manifest
@@ -1,2 +1,3 @@
DIST rb-gsl-1.15.3.1.gem 611840 SHA256 56bda6faba85ba1e1142acee114e676d8e0778f951784c2d1c4a4bdb36ae4ecc SHA512 7c57923ac4858f95cb47f12778cbc6eca3149a8af58c81f535d7c5d24302d78fe359ea2eba5999a41a8ba48378abd7fb69587f62310eb9bdaf4e6ec76b7e00f6 WHIRLPOOL e976c2df65136f64b128e3466735377905d964863c0443949098902d09c083b165d805c4da481308c141c36dbeccd11260fa78319c7329f2981182534619adb0
DIST rb-gsl-1.16.0.1.gem 589824 SHA256 5a171bf1fc84fab3c723f9682961f37c12d83c26f5975173079bf5cf75688683 SHA512 47caf27546e3054be9cef14bd062752c8d1d52b4118f5faa1f98cec688601cdd75eaca4fb43d4711547e61eef8ca5397d32b7320631fa1c9cb0a1225dcaead20 WHIRLPOOL d01638a9fb0900c31dd15c9a0f78978c927484c17b03b50989e11c8794974ec7ced61b908745b5c5bd0140bdf64c5b61974530fc492262bcac8c444b34a4c760
+DIST rb-gsl-1.16.0.2.gem 589312 SHA256 53e6db6f357284b6238c6293dac4f3b3c724055bc8c72549e8a6a3d277293f44 SHA512 a0b31ba681060aac56d8be5f667fcebf5dfe4b4cd010b5a12e83b3be5209cdbe3fb515a1ce43928920b7d28804d5ca0061c3160d31fdf4e03f5b06aa064a5ed8 WHIRLPOOL ec5d5579630c265a4fde6591225a73f4b917b207d1a6dd01836925ff57a499a68f954e52e061c06e0a7e9d1aecc8a9414baea8f22199d867d07cc4fe57a8c7f6
diff --git a/dev-ruby/rb-gsl/rb-gsl-1.16.0.2.ebuild b/dev-ruby/rb-gsl/rb-gsl-1.16.0.2.ebuild
new file mode 100644
index 000000000000..d7a95cf37ca6
--- /dev/null
+++ b/dev-ruby/rb-gsl/rb-gsl-1.16.0.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rb-gsl/rb-gsl-1.16.0.2.ebuild,v 1.1 2014/07/13 07:11:25 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+inherit ruby-fakegem multilib
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="ChangeLog README"
+
+RUBY_FAKEGEM_TASK_TEST="test:libs"
+DESCRIPTION="Ruby interface to GNU Scientific Library"
+HOMEPAGE="https://github.com/david-macmahon/rb-gsl"
+#SRC_URI="https://github.com/david-macmahon/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+DEPEND+=" sci-libs/gsl"
+RDEPEND+=" sci-libs/gsl"
+
+RUBY_S="${PN}-${P}"
+
+ruby_add_rdepend "dev-ruby/narray"
+
+each_ruby_prepare() {
+ sed -i -e '/$CPPFLAGS =/a \$LDFLAGS = " -L#{narray_config} -l:narray.so "+$LDFLAGS' -e 's/src/lib/' ext/gsl/extconf.rb || die
+}
+
+each_ruby_configure() {
+ ${RUBY} -Cext/gsl extconf.rb || die
+}
+
+each_ruby_compile() {
+ emake -Cext/gsl V=1
+ cp ext/gsl/*$(get_modname) lib/gsl || die
+}
+
+each_ruby_test() {
+ ${RUBY} -S testrb -Ilib -Itest test/*.rb test/*/*.rb || die
+}
diff --git a/dev-ruby/rubygems/rubygems-2.0.14-r1.ebuild b/dev-ruby/rubygems/rubygems-2.0.14-r1.ebuild
index 03cb84c71a8d..ee0cee561b88 100644
--- a/dev-ruby/rubygems/rubygems-2.0.14-r1.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.0.14-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-2.0.14-r1.ebuild,v 1.4 2014/07/05 09:11:46 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-2.0.14-r1.ebuild,v 1.5 2014/07/13 16:12:02 mrueg Exp $
EAPI=5
@@ -121,7 +121,7 @@ all_ruby_install() {
pkg_postinst() {
if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
- eselect ruby set $(eselect --brief --no-color ruby show | head -n1)
+ eselect ruby set $(eselect --brief ruby show | head -n1)
fi
ewarn
diff --git a/dev-ruby/rubygems/rubygems-2.0.14.ebuild b/dev-ruby/rubygems/rubygems-2.0.14.ebuild
index f5e3b9ac6004..34ab510c25ab 100644
--- a/dev-ruby/rubygems/rubygems-2.0.14.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.0.14.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-2.0.14.ebuild,v 1.13 2014/07/05 09:11:46 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-2.0.14.ebuild,v 1.14 2014/07/13 16:12:02 mrueg Exp $
EAPI=5
@@ -121,7 +121,7 @@ all_ruby_install() {
pkg_postinst() {
if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
- eselect ruby set $(eselect --brief --no-color ruby show | head -n1)
+ eselect ruby set $(eselect --brief ruby show | head -n1)
fi
ewarn
diff --git a/dev-ruby/rubygems/rubygems-2.0.3.ebuild b/dev-ruby/rubygems/rubygems-2.0.3.ebuild
index 9d42e71304e5..4860a77489aa 100644
--- a/dev-ruby/rubygems/rubygems-2.0.3.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.0.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-2.0.3.ebuild,v 1.14 2014/07/05 09:11:46 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-2.0.3.ebuild,v 1.15 2014/07/13 16:12:02 mrueg Exp $
EAPI=5
@@ -128,7 +128,7 @@ all_ruby_install() {
pkg_postinst() {
if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
- eselect ruby set $(eselect --brief --no-color ruby show | head -n1)
+ eselect ruby set $(eselect --brief ruby show | head -n1)
fi
ewarn
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 0610b90f8022..8cb098b3c62a 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,4 +1 @@
-DIST cmake-2.8.10.2.tar.gz 5768373 SHA256 ce524fb39da06ee6d47534bbcec6e0b50422e18b62abc4781a4ba72ea2910eb1 SHA512 e79759f4429977bb4292c9dc8a9d216ca7c21dca5fefce1fa223d7847a1128c8a3a11e1b6adaac40b2f30e0d6f504508a2845f888a319acc29c2ef6beff55df2 WHIRLPOOL f7327282d352ec04afb6349abc74aa3205ceb57efcb013650f18025e36010a27ca28725cd06e29e7bc5ff3196a4c8abeafcb733fba9c6bcc02159a5c6b8e90eb
-DIST cmake-2.8.11.2.tar.gz 5887016 SHA256 b32acb483afdd14339941c6e4ec25f633d916a7a472653a0b00838771a6c0562 SHA512 05ac2293300bf15fdcf98f07dfa7b9862b117cd0d6f7e30c1995ecb8a3bfd94e2b7e778caaa05bc46bd88eca5afe7f6be38b1904275a9a2aeae562bfdbaeec94 WHIRLPOOL 28365c3d091eb41fdbd428d3f9de37ed547c68415bd726874587af1cefd81ed6dce8255527dbee9d3019a65cf1b1416b9f09dfb744befba4c1428da8f88e3907
-DIST cmake-2.8.12.1.tar.gz 6068021 SHA256 fa28c12791d64c36ba6b6cb062a4b4bd4223053f6b9ea501b1bdbdf4d5df3a67 SHA512 91b07b33208fa66228b05a940422a99569ab8a0d8132de24b0ab19fc2f7a1f0697701234a5a374fb5884f0b48f693e917c284011f1c9ec9b94e82e06b70d9b7d WHIRLPOOL 674c07f82be6096723a0f772c3cac5224083507b7771ec887c527a0e84c11c9e5d25528b1b60ca20db67d08c01b2fdddebf07f3560f35c19cb057ffba2a65907
DIST cmake-2.8.12.2.tar.gz 6068231 SHA256 8c6574e9afabcb9fc66f463bb1f2f051958d86c85c37fccf067eb1a44a120e5e SHA512 a0fe8f6305052ba7894a7d58aa30f97b4be1f52eb7de650273a704929a6fbe81c7cebfa6e68a18c9e7d62f7ed02c944f74c2974da9aacc70e2cb186e0a1be44d WHIRLPOOL 3635651a59a93c661db4df8c248e35bfd8a9869eb74faa33fa6d56c12039ef7bb37756fd4c55fb107a9b7c38d2616dc43eb41acc0c565cfad4a24db99c361c29
diff --git a/dev-util/cmake/cmake-2.8.10.2-r2.ebuild b/dev-util/cmake/cmake-2.8.10.2-r2.ebuild
deleted file mode 100644
index 7c5cbe55037d..000000000000
--- a/dev-util/cmake/cmake-2.8.10.2-r2.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.10.2-r2.ebuild,v 1.14 2014/06/10 00:25:30 vapier Exp $
-
-EAPI=5
-
-CMAKE_REMOVE_MODULES="no"
-inherit elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz"
-
-LICENSE="CMake"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="emacs ncurses qt4 vim-syntax"
-
-DEPEND="
- >=app-arch/libarchive-2.8.0:=
- >=dev-libs/expat-2.0.1
- >=net-misc/curl-7.20.0-r1[ssl]
- sys-libs/zlib
- virtual/pkgconfig
- ncurses? ( sys-libs/ncurses )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
-"
-RDEPEND="${DEPEND}
- emacs? ( virtual/emacs )
- vim-syntax? (
- || (
- app-editors/vim
- app-editors/gvim
- )
- )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-VIMFILE="${PN}.vim"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
- "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
- "${FILESDIR}"/${PN}-2.8.0-darwin-default-install_name.patch
- "${FILESDIR}"/${PN}-2.8.7-FindBLAS.patch
- "${FILESDIR}"/${PN}-2.8.7-FindBoost-python.patch
- "${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch
- "${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch
- "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
- "${FILESDIR}"/${PN}-2.8.10-darwin-isysroot.patch
- "${FILESDIR}"/${PN}-2.8.10-desktop.patch
- "${FILESDIR}"/${PN}-2.8.10-libform.patch
- "${FILESDIR}"/${PN}-2.8.10-more-no_host_paths.patch
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
- "${FILESDIR}"/${PN}-2.8.10.2-implicit-include.patch
- "${FILESDIR}"/${PN}-2.8.10.2-FindImageMagick.patch
-)
-
-cmake_src_bootstrap() {
- # Cleanup args to extract only JOBS.
- # Because bootstrap does not know anything else.
- echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
- if [ $? -eq 0 ]; then
- par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
- par_arg="--parallel=${par_arg}"
- else
- par_arg="--parallel=1"
- fi
-
- tc-export CC CXX LD
-
- # bootstrap script isn't exactly /bin/sh compatible
- ${CONFIG_SHELL:-sh} ./bootstrap \
- --prefix="${T}/cmakestrap/" \
- ${par_arg} \
- || die "Bootstrap failed"
-}
-
-cmake_src_test() {
- # fix OutDir test
- # this is altered thanks to our eclass
- sed -i -e 's:#IGNORE ::g' "${S}"/Tests/OutDir/CMakeLists.txt || die
-
- pushd "${CMAKE_BUILD_DIR}" > /dev/null
-
- local ctestargs
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
- # Excluded tests:
- # BootstrapTest: we actualy bootstrap it every time so why test it.
- # CTest.updatecvs, which fails to commit as root
- # Qt4Deploy, which tries to break sandbox and ignores prefix
- # TestUpload, which requires network access
- "${CMAKE_BUILD_DIR}"/bin/ctest ${ctestargs} \
- -E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \
- || die "Tests failed"
-
- popd > /dev/null
-}
-
-pkg_setup() {
- # bug 387227
- addpredict /proc/self/coredump_filter
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # disable running of cmake in boostrap command
- sed -i \
- -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
- bootstrap || die "sed failed"
-
- # Add gcc libs to the default link paths
- sed -i \
- -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
- -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
- Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
- cmake_src_bootstrap
-}
-
-src_configure() {
- # make things work with gentoo java setup
- # in case java-config cannot be run, the variable just becomes unset
- # per bug #315229
- export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null)
-
- local mycmakeargs=(
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
- -DCMAKE_DOC_DIR=/share/doc/${PF}
- -DCMAKE_MAN_DIR=/share/man
- -DCMAKE_DATA_DIR=/share/${PN}
- $(cmake-utils_use_build ncurses CursesDialog)
- $(cmake-utils_use_build qt4 QtDialog)
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- use emacs && elisp-compile Docs/cmake-mode.el
-}
-
-src_test() {
- VIRTUALX_COMMAND="cmake_src_test" virtualmake
-}
-
-src_install() {
- cmake-utils_src_install
- if use emacs; then
- elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins Docs/cmake-syntax.vim
-
- insinto /usr/share/vim/vimfiles/indent
- doins Docs/cmake-indent.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/${VIMFILE}"
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/cmake-2.8.11.2.ebuild b/dev-util/cmake/cmake-2.8.11.2.ebuild
deleted file mode 100644
index c0348bd97c0b..000000000000
--- a/dev-util/cmake/cmake-2.8.11.2.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.11.2.ebuild,v 1.10 2014/06/10 00:26:03 vapier Exp $
-
-EAPI=5
-
-CMAKE_REMOVE_MODULES="no"
-inherit elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="emacs ncurses qt4 qt5 vim-syntax"
-
-REQUIRED_USE="?? ( qt4 qt5 )"
-
-DEPEND="
- >=app-arch/libarchive-2.8.0:=
- >=dev-libs/expat-2.0.1
- >=net-misc/curl-7.20.0-r1[ssl]
- sys-libs/zlib
- virtual/pkgconfig
- ncurses? ( sys-libs/ncurses )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
-"
-RDEPEND="${DEPEND}
- emacs? ( virtual/emacs )
- vim-syntax? (
- || (
- app-editors/vim
- app-editors/gvim
- )
- )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-VIMFILE="${PN}.vim"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
- "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
- "${FILESDIR}"/${PN}-2.8.0-darwin-default-install_name.patch
- "${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch
- "${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch
- "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
- "${FILESDIR}"/${PN}-2.8.10-darwin-isysroot.patch
- "${FILESDIR}"/${PN}-2.8.10-desktop.patch
- "${FILESDIR}"/${PN}-2.8.10-libform.patch
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
- "${FILESDIR}"/${PN}-2.8.11-FindBLAS.patch
- "${FILESDIR}"/${PN}-2.8.11-FindBoost-python.patch
- "${FILESDIR}"/${PN}-2.8.11-FindImageMagick.patch
- "${FILESDIR}"/${PN}-2.8.11-more-no_host_paths.patch
- "${FILESDIR}"/${PN}-2.8.11.2-hppa-bootstrap.patch
-)
-
-cmake_src_bootstrap() {
- # Cleanup args to extract only JOBS.
- # Because bootstrap does not know anything else.
- echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
- if [ $? -eq 0 ]; then
- par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
- par_arg="--parallel=${par_arg}"
- else
- par_arg="--parallel=1"
- fi
-
- tc-export CC CXX LD
-
- # bootstrap script isn't exactly /bin/sh compatible
- ${CONFIG_SHELL:-sh} ./bootstrap \
- --prefix="${T}/cmakestrap/" \
- ${par_arg} \
- || die "Bootstrap failed"
-}
-
-cmake_src_test() {
- # fix OutDir and SelectLibraryConfigurations tests
- # these are altered thanks to our eclass
- sed -i -e 's:#IGNORE ::g' \
- "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
- || die
-
- pushd "${CMAKE_BUILD_DIR}" > /dev/null
-
- local ctestargs
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
- # Excluded tests:
- # BootstrapTest: we actualy bootstrap it every time so why test it.
- # CTest.updatecvs, which fails to commit as root
- # Qt4Deploy, which tries to break sandbox and ignores prefix
- # TestUpload, which requires network access
- "${CMAKE_BUILD_DIR}"/bin/ctest ${ctestargs} \
- -E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \
- || die "Tests failed"
-
- popd > /dev/null
-}
-
-pkg_setup() {
- # bug 387227
- addpredict /proc/self/coredump_filter
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # disable running of cmake in boostrap command
- sed -i \
- -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
- bootstrap || die "sed failed"
-
- # Add gcc libs to the default link paths
- sed -i \
- -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
- -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
- Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
- cmake_src_bootstrap
-}
-
-src_configure() {
- # make things work with gentoo java setup
- # in case java-config cannot be run, the variable just becomes unset
- # per bug #315229
- export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null)
-
- local mycmakeargs=(
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
- -DCMAKE_DOC_DIR=/share/doc/${PF}
- -DCMAKE_MAN_DIR=/share/man
- -DCMAKE_DATA_DIR=/share/${PN}
- $(cmake-utils_use_build ncurses CursesDialog)
- )
-
- if use qt4 || use qt5 ; then
- mycmakeargs+=(
- -DBUILD_QtDialog=ON
- $(cmake-utils_use_find_package qt5 Qt5Widgets)
- )
- fi
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- use emacs && elisp-compile Docs/cmake-mode.el
-}
-
-src_test() {
- VIRTUALX_COMMAND="cmake_src_test" virtualmake
-}
-
-src_install() {
- cmake-utils_src_install
- if use emacs; then
- elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins Docs/cmake-syntax.vim
-
- insinto /usr/share/vim/vimfiles/indent
- doins Docs/cmake-indent.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/${VIMFILE}"
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/cmake-2.8.12.1-r4.ebuild b/dev-util/cmake/cmake-2.8.12.1-r4.ebuild
deleted file mode 100644
index a83fc771efb3..000000000000
--- a/dev-util/cmake/cmake-2.8.12.1-r4.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.12.1-r4.ebuild,v 1.2 2014/06/10 00:25:30 vapier Exp $
-
-EAPI=5
-
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="emacs ncurses qt4 qt5"
-
-REQUIRED_USE="?? ( qt4 qt5 )"
-
-DEPEND="
- >=app-arch/libarchive-2.8.0:=
- >=dev-libs/expat-2.0.1
- >=net-misc/curl-7.20.0-r1[ssl]
- sys-libs/zlib
- virtual/pkgconfig
- ncurses? ( sys-libs/ncurses )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
-"
-RDEPEND="${DEPEND}
- emacs? ( virtual/emacs )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
- "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
- "${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch
- "${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch
- "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
- "${FILESDIR}"/${PN}-2.8.10-darwin-isysroot.patch
- "${FILESDIR}"/${PN}-2.8.10-desktop.patch
- "${FILESDIR}"/${PN}-2.8.10-libform.patch
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
- "${FILESDIR}"/${PN}-2.8.11-FindBLAS.patch
- "${FILESDIR}"/${PN}-2.8.11-FindBoost-python.patch
- "${FILESDIR}"/${PN}-2.8.11-more-no_host_paths.patch
- "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
- "${FILESDIR}"/${PN}-2.8.12.1-FindFreetype.patch
-)
-
-cmake_src_bootstrap() {
- # Cleanup args to extract only JOBS.
- # Because bootstrap does not know anything else.
- echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
- if [ $? -eq 0 ]; then
- par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
- par_arg="--parallel=${par_arg}"
- else
- par_arg="--parallel=1"
- fi
-
- # execinfo.h on Solaris isn't quite what it is on Darwin
- if [[ ${CHOST} == *-solaris* ]] ; then
- sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
- fi
-
- tc-export CC CXX LD
-
- # bootstrap script isn't exactly /bin/sh compatible
- ${CONFIG_SHELL:-sh} ./bootstrap \
- --prefix="${T}/cmakestrap/" \
- ${par_arg} \
- || die "Bootstrap failed"
-}
-
-cmake_src_test() {
- # fix OutDir and SelectLibraryConfigurations tests
- # these are altered thanks to our eclass
- sed -i -e 's:#IGNORE ::g' \
- "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
- || die
-
- pushd "${BUILD_DIR}" > /dev/null
-
- local ctestargs
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
- # Excluded tests:
- # BootstrapTest: we actualy bootstrap it every time so why test it.
- # CTest.updatecvs, which fails to commit as root
- # Qt4Deploy, which tries to break sandbox and ignores prefix
- # TestUpload, which requires network access
- "${BUILD_DIR}"/bin/ctest ${ctestargs} \
- -E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \
- || die "Tests failed"
-
- popd > /dev/null
-}
-
-pkg_setup() {
- # bug 387227
- addpredict /proc/self/coredump_filter
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # disable running of cmake in boostrap command
- sed -i \
- -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
- bootstrap || die "sed failed"
-
- # Add gcc libs to the default link paths
- sed -i \
- -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
- -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
- Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
- cmake_src_bootstrap
-}
-
-src_configure() {
- # make things work with gentoo java setup
- # in case java-config cannot be run, the variable just becomes unset
- # per bug #315229
- export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null)
-
- local mycmakeargs=(
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
- -DCMAKE_DOC_DIR=/share/doc/${PF}
- -DCMAKE_MAN_DIR=/share/man
- -DCMAKE_DATA_DIR=/share/${PN}
- $(cmake-utils_use_build ncurses CursesDialog)
- )
-
- if use qt4 || use qt5 ; then
- mycmakeargs+=(
- -DBUILD_QtDialog=ON
- $(cmake-utils_use_find_package qt5 Qt5Widgets)
- )
- fi
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- use emacs && elisp-compile Docs/cmake-mode.el
-}
-
-src_test() {
- VIRTUALX_COMMAND="cmake_src_test" virtualmake
-}
-
-src_install() {
- cmake-utils_src_install
- if use emacs; then
- elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-
- insinto /usr/share/vim/vimfiles/syntax
- doins Docs/cmake-syntax.vim
-
- insinto /usr/share/vim/vimfiles/indent
- doins Docs/cmake-indent.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/${PN}.vim"
-
- dobashcomp Docs/bash-completion/{${PN},ctest,cpack}
- rm -rf "${D}/usr/share/cmake/completions" || die
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/cmake-2.8.12.2-r1.ebuild b/dev-util/cmake/cmake-2.8.12.2-r1.ebuild
index 0294ee6b8705..d3f6dae353c5 100644
--- a/dev-util/cmake/cmake-2.8.12.2-r1.ebuild
+++ b/dev-util/cmake/cmake-2.8.12.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.12.2-r1.ebuild,v 1.3 2014/06/10 00:25:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.12.2-r1.ebuild,v 1.6 2014/07/14 00:00:19 jer Exp $
EAPI=5
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.cmake.org/"
SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
LICENSE="CMake"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~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 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE="emacs ncurses qt4 qt5"
diff --git a/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch b/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch
deleted file mode 100644
index 4ef0c7b4b6fa..000000000000
--- a/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-The install_name of a library can be compared to the ELF soname, setting
-it to just the library name (libx.1.dylib) is not sufficient on Mach-O,
-as it uses full paths. Most apps have no clue about that, so they don't
-do something like http://www.cmake.org/pipermail/cmake/2006-June/009758.html
-
-Provide a sane default that will allow merging most cmake-based
-packages. If this location is not correct, Portage's QA checks will
-catch that.
-
---- Source/cmTarget.cxx
-+++ Source/cmTarget.cxx
-@@ -974,7 +974,7 @@
- this->Makefile->IsOn("MINGW"));
-
- // Setup default property values.
-- this->SetPropertyDefault("INSTALL_NAME_DIR", "");
-+ this->SetPropertyDefault("INSTALL_NAME_DIR", "${CMAKE_INSTALL_PREFIX}/lib");
- this->SetPropertyDefault("INSTALL_RPATH", "");
- this->SetPropertyDefault("INSTALL_RPATH_USE_LINK_PATH", "OFF");
- this->SetPropertyDefault("SKIP_BUILD_RPATH", "OFF");
diff --git a/dev-util/cmake/files/cmake-2.8.10-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.10-more-no_host_paths.patch
deleted file mode 100644
index 88927a3238b9..000000000000
--- a/dev-util/cmake/files/cmake-2.8.10-more-no_host_paths.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From 65571942d4f19d508174f6f89aeaac5ffe380a6e Mon Sep 17 00:00:00 2001
-From: Michael Palimaka
-Date: Tue, 6 Nov 2012 23:35:34 +1100
-Subject: [PATCH] Set some proper paths to make cmake find our tools.
-
-The ebuild now adds an extra / at the end of $EPREFIX so that it is
-never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains
-correct)
-
-Original patch by Heiko Przybyl.
-Updated by Chris Reffett (cmake-2.8.8)
-Updated by Johannes Huber (cmake-2.8.9)
-Updated by Michael Palimaka (cmake-2.8.10)
----
- Modules/Platform/Darwin.cmake | 12 +++++++----
- Modules/Platform/UnixPaths.cmake | 43 ++++++++++++++++++++--------------------
- 2 files changed, 29 insertions(+), 26 deletions(-)
-
-diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
-index a401762..775e547 100644
---- a/Modules/Platform/Darwin.cmake
-+++ b/Modules/Platform/Darwin.cmake
-@@ -251,24 +251,28 @@ set(CMAKE_CXX_CREATE_MACOSX_FRAMEWORK
- " -o ")
-
-
--# default to searching for frameworks first
-+# default to searching for frameworks last
- if(NOT DEFINED CMAKE_FIND_FRAMEWORK)
-- set(CMAKE_FIND_FRAMEWORK FIRST)
-+ set(CMAKE_FIND_FRAMEWORK LAST)
- endif()
- # set up the default search directories for frameworks
- set(CMAKE_SYSTEM_FRAMEWORK_PATH
-+ @GENTOO_PORTAGE_EPREFIX@Frameworks
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib
- ~/Library/Frameworks
- /Library/Frameworks
- /Network/Library/Frameworks
- /System/Library/Frameworks)
-
--# default to searching for application bundles first
-+# default to searching for application bundles last
- if(NOT DEFINED CMAKE_FIND_APPBUNDLE)
-- set(CMAKE_FIND_APPBUNDLE FIRST)
-+ set(CMAKE_FIND_APPBUNDLE LAST)
- endif()
- # set up the default search directories for application bundles
- set(_apps_paths)
- foreach(_path
-+ @GENTOO_PORTAGE_EPREFIX@Applications
-+ @GENTOO_PORTAGE_EPREFIX@usr/bin
- "~/Applications"
- "/Applications"
- "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+
-diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
-index ccb2663..0501d53 100644
---- a/Modules/Platform/UnixPaths.cmake
-+++ b/Modules/Platform/UnixPaths.cmake
-@@ -33,6 +33,7 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
- # search types.
- list(APPEND CMAKE_SYSTEM_PREFIX_PATH
- # Standard
-+ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@
- /usr/local /usr /
-
- # CMake install location
-@@ -44,43 +45,41 @@ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
-
- # List common include file locations not under the common prefixes.
- list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
-- # Windows API on Cygwin
-- /usr/include/w32api
--
-- # X11
-- /usr/X11R6/include /usr/include/X11
--
-- # Other
-- /usr/pkg/include
-- /opt/csw/include /opt/include
-- /usr/openwin/include
-+ @GENTOO_PORTAGE_EPREFIX@usr/include
- )
-
- list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
-- # Windows API on Cygwin
-- /usr/lib/w32api
--
-- # X11
-- /usr/X11R6/lib /usr/lib/X11
--
-- # Other
-- /usr/pkg/lib
-- /opt/csw/lib /opt/lib
-- /usr/openwin/lib
-+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc
-+ @GENTOO_PORTAGE_GCCLIBDIR@
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib64
-+ @GENTOO_PORTAGE_EPREFIX@usr/libx32
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib32
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib
-+ @GENTOO_PORTAGE_EPREFIX@lib
- )
-
- list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
-- /usr/pkg/bin
-+ @GENTOO_PORTAGE_EPREFIX@usr/bin
-+ @GENTOO_PORTAGE_EPREFIX@bin
- )
-
- list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
-- /lib /usr/lib /usr/lib32 /usr/lib64
-+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc
-+ @GENTOO_PORTAGE_GCCLIBDIR@
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib64
-+ @GENTOO_PORTAGE_EPREFIX@usr/libx32
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib32
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib
-+ @GENTOO_PORTAGE_EPREFIX@lib
-+ /lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32
- )
-
- list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
-+ @GENTOO_PORTAGE_EPREFIX@usr/include
- /usr/include
- )
- list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
-+ @GENTOO_PORTAGE_EPREFIX@usr/include
- /usr/include
- )
-
---
-1.8.0
-
diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindImageMagick.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindImageMagick.patch
deleted file mode 100644
index 6a79a58d70c7..000000000000
--- a/dev-util/cmake/files/cmake-2.8.10.2-FindImageMagick.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-http://bugs.gentoo.org/465898
-
---- Modules/FindImageMagick.cmake
-+++ Modules/FindImageMagick.cmake
-@@ -81,7 +81,7 @@
- ${ImageMagick_INCLUDE_DIRS}
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include"
- PATH_SUFFIXES
-- ImageMagick
-+ ImageMagick ImageMagick-6
- DOC "Path to the ImageMagick include dir."
- )
- find_library(ImageMagick_${component}_LIBRARY
-@@ -147,17 +147,17 @@
- )
- if(component STREQUAL "Magick++")
- FIND_IMAGEMAGICK_API(Magick++ Magick++.h
-- Magick++ CORE_RL_Magick++_
-+ Magick++ CORE_RL_Magick++_ Magick++.Q8 Magick++-Q8 Magick++.Q8HDRI Magick++-Q8HDRI Magick++.Q16 Magick++-Q16 Magick++.Q16HDRI Magick++-Q16HDRI Magick++.Q32 Magick++-Q32 Magick++.Q32HDRI Magick++-Q32HDRI Magick++.Q64 Magick++-Q64 Magick++.Q64HDRI Magick++-Q64HDRI Magick++-6.Q8 Magick++-6-Q8 Magick++-6.Q8HDRI Magick++-6-Q8HDRI Magick++-6.Q16 Magick++-6-Q16 Magick++-6.Q16HDRI Magick++-6-Q16HDRI Magick++-6.Q32 Magick++-6-Q32 Magick++-6.Q32HDRI Magick++-6-Q32HDRI Magick++-6.Q64 Magick++-6-Q64 Magick++-6.Q64HDRI Magick++-6-Q64HDRI
- )
- list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY)
- elseif(component STREQUAL "MagickWand")
- FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h
-- Wand MagickWand CORE_RL_wand_
-+ Wand MagickWand CORE_RL_wand_ MagickWand.Q8 MagickWand-Q8 MagickWand.Q8HDRI MagickWand-Q8HDRI MagickWand.Q16 MagickWand-Q16 MagickWand.Q16HDRI MagickWand-Q16HDRI MagickWand.Q32 MagickWand-Q32 MagickWand.Q32HDRI MagickWand-Q32HDRI MagickWand.Q64 MagickWand-Q64 MagickWand.Q64HDRI MagickWand-Q64HDRI MagickWand-6.Q8 MagickWand-6-Q8 MagickWand-6.Q8HDRI MagickWand-6-Q8HDRI MagickWand-6.Q16 MagickWand-6-Q16 MagickWand-6.Q16HDRI MagickWand-6-Q16HDRI MagickWand-6.Q32 MagickWand-6-Q32 MagickWand-6.Q32HDRI MagickWand-6-Q32HDRI MagickWand-6.Q64 MagickWand-6-Q64 MagickWand-6.Q64HDRI MagickWand-6-Q64HDRI
- )
- list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY)
- elseif(component STREQUAL "MagickCore")
- FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h
-- Magick MagickCore CORE_RL_magick_
-+ Magick MagickCore CORE_RL_magick_ MagickCore.Q8 MagickCore-Q8 MagickCore.Q8HDRI MagickCore-Q8HDRI MagickCore.Q16 MagickCore-Q16 MagickCore.Q16HDRI MagickCore-Q16HDRI MagickCore.Q32 MagickCore-Q32 MagickCore.Q32HDRI MagickCore-Q32HDRI MagickCore.Q64 MagickCore-Q64 MagickCore.Q64HDRI MagickCore-Q64HDRI MagickCore-6.Q8 MagickCore-6-Q8 MagickCore-6.Q8HDRI MagickCore-6-Q8HDRI MagickCore-6.Q16 MagickCore-6-Q16 MagickCore-6.Q16HDRI MagickCore-6-Q16HDRI MagickCore-6.Q32 MagickCore-6-Q32 MagickCore-6.Q32HDRI MagickCore-6-Q32HDRI MagickCore-6.Q64 MagickCore-6-Q64 MagickCore-6.Q64HDRI MagickCore-6-Q64HDRI
- )
- list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY)
- else()
diff --git a/dev-util/cmake/files/cmake-2.8.10.2-implicit-include.patch b/dev-util/cmake/files/cmake-2.8.10.2-implicit-include.patch
deleted file mode 100644
index f0ea5e814617..000000000000
--- a/dev-util/cmake/files/cmake-2.8.10.2-implicit-include.patch
+++ /dev/null
@@ -1,139 +0,0 @@
---- a/Source/cmLocalGenerator.cxx
-+++ b/Source/cmLocalGenerator.cxx
-@@ -1329,7 +1329,9 @@ std::string cmLocalGenerator::GetIncludeFlags(
- void cmLocalGenerator::GetIncludeDirectories(std::vector& dirs,
- cmGeneratorTarget* target,
- const char* lang,
-- const char *config)
-+ const char *config,
-+ bool stripImplicitInclDirs
-+ )
- {
- // Need to decide whether to automatically include the source and
- // binary directories at the beginning of the include path.
-@@ -1404,18 +1406,21 @@ void cmLocalGenerator::GetIncludeDirectories(std::vector& dirs,
- return;
- }
-
-- // Load implicit include directories for this language.
-- std::string impDirVar = "CMAKE_";
-- impDirVar += lang;
-- impDirVar += "_IMPLICIT_INCLUDE_DIRECTORIES";
-- if(const char* value = this->Makefile->GetDefinition(impDirVar.c_str()))
-+ if (stripImplicitInclDirs)
- {
-- std::vector impDirVec;
-- cmSystemTools::ExpandListArgument(value, impDirVec);
-- for(std::vector::const_iterator i = impDirVec.begin();
-- i != impDirVec.end(); ++i)
-+ // Load implicit include directories for this language.
-+ std::string impDirVar = "CMAKE_";
-+ impDirVar += lang;
-+ impDirVar += "_IMPLICIT_INCLUDE_DIRECTORIES";
-+ if(const char* value = this->Makefile->GetDefinition(impDirVar.c_str()))
- {
-- emitted.insert(*i);
-+ std::vector impDirVec;
-+ cmSystemTools::ExpandListArgument(value, impDirVec);
-+ for(std::vector::const_iterator i = impDirVec.begin();
-+ i != impDirVec.end(); ++i)
-+ {
-+ emitted.insert(*i);
-+ }
- }
- }
-
---- a/Source/cmLocalGenerator.h
-+++ b/Source/cmLocalGenerator.h
-@@ -212,7 +212,8 @@ public:
- /** Get the include flags for the current makefile and language. */
- void GetIncludeDirectories(std::vector& dirs,
- cmGeneratorTarget* target,
-- const char* lang = "C", const char *config = 0);
-+ const char* lang = "C", const char *config = 0,
-+ bool stripImplicitInclDirs = true);
-
- /** Compute the language used to compile the given source file. */
- const char* GetSourceFileLanguage(const cmSourceFile& source);
---- a/Source/cmQtAutomoc.cxx
-+++ b/Source/cmQtAutomoc.cxx
-@@ -212,36 +212,11 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
- }
-
-
-- const char* qtIncDir = 0;
-- const char* qtCoreIncDir = 0;
--
-- // check whether ${QT_INCLUDE_DIR} is part of the implicit include dirs,
-- // see http://public.kitware.com/Bug/view.php?id=13667
-- bool qtIncludeDirMayHaveBeenRemoved = false;
-- if (makefile->IsSet("QT_INCLUDE_DIR"))
-- {
-- qtIncDir = makefile->GetDefinition("QT_INCLUDE_DIR");
-- std::string s =
-- makefile->GetSafeDefinition("CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES");
-- std::vector implIncDirs;
-- cmSystemTools::ExpandListArgument(s, implIncDirs);
-- if (std::find(implIncDirs.begin(), implIncDirs.end(),std::string(qtIncDir))
-- != implIncDirs.end())
-- {
-- qtIncludeDirMayHaveBeenRemoved = true;
-- if (makefile->IsSet("QT_QTCORE_INCLUDE_DIR"))
-- {
-- qtCoreIncDir = makefile->GetDefinition("QT_QTCORE_INCLUDE_DIR");
-- }
-- }
-- }
--
-- bool haveQtCoreIncDir = false;
-- bool haveQtIncDir = false;
--
- std::vector includeDirs;
- cmGeneratorTarget gtgt(target);
-- localGen->GetIncludeDirectories(includeDirs, >gt, "CXX");
-+ // Get the include dirs for this target, without stripping the implicit
-+ // include dirs off, see http://public.kitware.com/Bug/view.php?id=13667
-+ localGen->GetIncludeDirectories(includeDirs, >gt, "CXX", 0, false);
- std::string _moc_incs = "";
- const char* sep = "";
- for(std::vector::const_iterator incDirIt = includeDirs.begin();
-@@ -251,37 +226,6 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
- _moc_incs += sep;
- sep = ";";
- _moc_incs += *incDirIt;
--
-- if (qtIncludeDirMayHaveBeenRemoved && qtCoreIncDir && qtIncDir) // #13667
-- {
-- if (*incDirIt == qtIncDir)
-- {
-- haveQtIncDir = true;
-- qtIncludeDirMayHaveBeenRemoved = false; // it's here, i.e. not removed
-- }
-- if (*incDirIt == qtCoreIncDir)
-- {
-- haveQtCoreIncDir = true;
-- }
-- }
-- }
--
-- // Some projects (kdelibs, phonon) query the compiler for its default
-- // include search dirs, and add those to
-- // CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES.
-- // These may include e.g./usr/lib/qt/include . This is typically also part
-- // of ${QT_INCLUDES}. If this directory is then contained in the implicit
-- // include dirs, it is removed from the include dirs returned from the
-- // target above. So we add ${QT_INCLUDE_DIR} manually for moc if we detected
-- // that ${QT_QTCORE_INCLUDE_DIR} is among the include dirs (there shouldn't
-- // be a way to use Qt4 without using ${QT_QTCORE_INCLUDE_DIR} I think.
-- // See #13646 and #13667.
-- if (qtIncludeDirMayHaveBeenRemoved && qtCoreIncDir && qtIncDir
-- && (haveQtCoreIncDir == true) && (haveQtIncDir == false))
-- {
-- _moc_incs += sep;
-- sep = ";";
-- _moc_incs += qtIncDir;
- }
-
- const char* tmp = target->GetProperty("COMPILE_DEFINITIONS");
---
-1.7.0
diff --git a/dev-util/cmake/files/cmake-2.8.11-FindImageMagick.patch b/dev-util/cmake/files/cmake-2.8.11-FindImageMagick.patch
deleted file mode 100644
index f5b70c1f47f2..000000000000
--- a/dev-util/cmake/files/cmake-2.8.11-FindImageMagick.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=465898
-
---- Modules/FindImageMagick.cmake
-+++ Modules/FindImageMagick.cmake
-@@ -81,7 +81,7 @@
- ${ImageMagick_INCLUDE_DIRS}
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include"
- PATH_SUFFIXES
-- ImageMagick
-+ ImageMagick ImageMagick-6
- DOC "Path to the ImageMagick include dir."
- )
- find_library(ImageMagick_${component}_LIBRARY
-@@ -147,17 +147,17 @@
- )
- if(component STREQUAL "Magick++")
- FIND_IMAGEMAGICK_API(Magick++ Magick++.h
-- Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8
-+ Magick++ CORE_RL_Magick++_ Magick++.Q8 Magick++-Q8 Magick++.Q8HDRI Magick++-Q8HDRI Magick++.Q16 Magick++-Q16 Magick++.Q16HDRI Magick++-Q16HDRI Magick++.Q32 Magick++-Q32 Magick++.Q32HDRI Magick++-Q32HDRI Magick++.Q64 Magick++-Q64 Magick++.Q64HDRI Magick++-Q64HDRI Magick++-6.Q8 Magick++-6-Q8 Magick++-6.Q8HDRI Magick++-6-Q8HDRI Magick++-6.Q16 Magick++-6-Q16 Magick++-6.Q16HDRI Magick++-6-Q16HDRI Magick++-6.Q32 Magick++-6-Q32 Magick++-6.Q32HDRI Magick++-6-Q32HDRI Magick++-6.Q64 Magick++-6-Q64 Magick++-6.Q64HDRI Magick++-6-Q64HDRI
- )
- list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY)
- elseif(component STREQUAL "MagickWand")
- FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h
-- Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8
-+ Wand MagickWand CORE_RL_wand_ MagickWand.Q8 MagickWand-Q8 MagickWand.Q8HDRI MagickWand-Q8HDRI MagickWand.Q16 MagickWand-Q16 MagickWand.Q16HDRI MagickWand-Q16HDRI MagickWand.Q32 MagickWand-Q32 MagickWand.Q32HDRI MagickWand-Q32HDRI MagickWand.Q64 MagickWand-Q64 MagickWand.Q64HDRI MagickWand-Q64HDRI MagickWand-6.Q8 MagickWand-6-Q8 MagickWand-6.Q8HDRI MagickWand-6-Q8HDRI MagickWand-6.Q16 MagickWand-6-Q16 MagickWand-6.Q16HDRI MagickWand-6-Q16HDRI MagickWand-6.Q32 MagickWand-6-Q32 MagickWand-6.Q32HDRI MagickWand-6-Q32HDRI MagickWand-6.Q64 MagickWand-6-Q64 MagickWand-6.Q64HDRI MagickWand-6-Q64HDRI
- )
- list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY)
- elseif(component STREQUAL "MagickCore")
- FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h
-- Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8
-+ Magick MagickCore CORE_RL_magick_ MagickCore.Q8 MagickCore-Q8 MagickCore.Q8HDRI MagickCore-Q8HDRI MagickCore.Q16 MagickCore-Q16 MagickCore.Q16HDRI MagickCore-Q16HDRI MagickCore.Q32 MagickCore-Q32 MagickCore.Q32HDRI MagickCore-Q32HDRI MagickCore.Q64 MagickCore-Q64 MagickCore.Q64HDRI MagickCore-Q64HDRI MagickCore-6.Q8 MagickCore-6-Q8 MagickCore-6.Q8HDRI MagickCore-6-Q8HDRI MagickCore-6.Q16 MagickCore-6-Q16 MagickCore-6.Q16HDRI MagickCore-6-Q16HDRI MagickCore-6.Q32 MagickCore-6-Q32 MagickCore-6.Q32HDRI MagickCore-6-Q32HDRI MagickCore-6.Q64 MagickCore-6-Q64 MagickCore-6.Q64HDRI MagickCore-6-Q64HDRI
- )
- list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY)
- else()
diff --git a/dev-util/cmake/files/cmake-2.8.11.2-hppa-bootstrap.patch b/dev-util/cmake/files/cmake-2.8.11.2-hppa-bootstrap.patch
deleted file mode 100644
index 9928e148882f..000000000000
--- a/dev-util/cmake/files/cmake-2.8.11.2-hppa-bootstrap.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/CompileFlags.cmake
-+++ b/CompileFlags.cmake
-@@ -66,5 +66,5 @@
- # avoid binutils problem with large binaries, e.g. when building CMake in debug mode
- # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230
- if (CMAKE_SYSTEM_NAME STREQUAL Linux AND CMAKE_SYSTEM_PROCESSOR STREQUAL parisc)
-- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text.*")
-+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text._*")
- endif ()
---- a/bootstrap
-+++ b/bootstrap
-@@ -691,7 +691,7 @@
- # avoid binutils problem with large binaries, e.g. when building CMake in debug mode
- # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230
- if ${cmake_machine_parisc}; then
-- cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text.*"
-+ cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text._*"
- fi
- fi
-
diff --git a/dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch b/dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch
deleted file mode 100644
index a91214c1a90a..000000000000
--- a/dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ruN cmake-2.8.7.orig/Modules/FindBLAS.cmake cmake-2.8.7/Modules/FindBLAS.cmake
---- cmake-2.8.7.orig/Modules/FindBLAS.cmake 2011-12-30 17:49:56.000000000 +0100
-+++ cmake-2.8.7/Modules/FindBLAS.cmake 2012-03-08 05:38:47.000000000 +0100
-@@ -1,3 +1,9 @@
-+#
-+# Version modified for Gentoo Linux
-+# If a valid PkgConfig configuration for blas is found, this overrides and cancels
-+# all further checks.
-+#
-+
- # - Find BLAS library
- # This module finds an installed fortran library that implements the BLAS
- # linear-algebra interface (see http://www.netlib.org/blas/).
-@@ -39,6 +45,24 @@
- # (To distribute this file outside of CMake, substitute the full
- # License text for the above reference.)
-
-+#
-+# first, try PkgConfig
-+#
-+find_package(PkgConfig REQUIRED)
-+pkg_check_modules(PC_BLAS blas)
-+if(PC_BLAS_FOUND)
-+ foreach(PC_LIB ${PC_BLAS_LIBRARIES})
-+ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_BLAS_LIBRARY_DIRS} )
-+ if (NOT ${PC_LIB}_LIBRARY)
-+ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_BLAS_LIBRARY_DIRS}")
-+ endif (NOT ${PC_LIB}_LIBRARY)
-+ list(APPEND BLAS_LIBRARIES ${${PC_LIB}_LIBRARY})
-+ endforeach(PC_LIB)
-+ find_package_handle_standard_args(BLAS DEFAULT_MSG BLAS_LIBRARIES)
-+ mark_as_advanced(BLAS_LIBRARIES)
-+else(PC_BLAS_FOUND)
-+message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.")
-+
- include(CheckFunctionExists)
- include(CheckFortranFunctionExists)
-
-@@ -622,3 +646,6 @@
- endif(BLA_F95)
-
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
-+
-+endif(PC_BLAS_FOUND)
-+
diff --git a/dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch b/dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch
deleted file mode 100644
index edaa91ffdb09..000000000000
--- a/dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- Modules/FindBoost.cmake
-+++ Modules/FindBoost.cmake
-@@ -953,6 +953,11 @@
- set( _boost_docstring_release "Boost ${COMPONENT} library (release)")
- set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)")
-
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+ # CPython-specific version of _PYTHON_ABI_EXTRACTION_COMMAND variable from python.eclass.
-+ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_abi)
-+ endif()
-+
- #
- # Find RELEASE libraries
- #
-@@ -962,6 +967,14 @@
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
- ${Boost_LIB_PREFIX}boost_${COMPONENT} )
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+ list(APPEND _boost_RELEASE_NAMES
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi} )
-+ endif()
- if(_boost_STATIC_RUNTIME_WORKAROUND)
- set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
- list(APPEND _boost_RELEASE_NAMES
-@@ -969,6 +982,13 @@
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+ list(APPEND _boost_RELEASE_NAMES
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
-+ endif()
- endif()
- if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
- _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES})
-@@ -994,6 +1014,15 @@
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}
- ${Boost_LIB_PREFIX}boost_${COMPONENT} )
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+ list(APPEND _boost_DEBUG_NAMES
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi} )
-+ endif()
- if(_boost_STATIC_RUNTIME_WORKAROUND)
- set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
- list(APPEND _boost_DEBUG_NAMES
-@@ -1001,6 +1030,13 @@
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+ list(APPEND _boost_DEBUG_NAMES
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
-+ endif()
- endif()
- if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
- _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES})
diff --git a/dev-util/cppunit/cppunit-1.13.2-r2.ebuild b/dev-util/cppunit/cppunit-1.13.2-r2.ebuild
index e04fea12f6bd..a0465cecf979 100644
--- a/dev-util/cppunit/cppunit-1.13.2-r2.ebuild
+++ b/dev-util/cppunit/cppunit-1.13.2-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cppunit/cppunit-1.13.2-r2.ebuild,v 1.3 2014/07/12 12:24:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppunit/cppunit-1.13.2-r2.ebuild,v 1.4 2014/07/12 21:57:54 tgall Exp $
EAPI=5
@@ -16,7 +16,7 @@ LICENSE="LGPL-2.1"
SLOT="0"
# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
[[ ${PV} = 9999 ]] || \
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc examples static-libs"
RDEPEND=""
diff --git a/dev-util/pkgconf/pkgconf-0.9.3-r1.ebuild b/dev-util/pkgconf/pkgconf-0.9.3-r1.ebuild
index 0003b0bf2488..523080ae0050 100644
--- a/dev-util/pkgconf/pkgconf-0.9.3-r1.ebuild
+++ b/dev-util/pkgconf/pkgconf-0.9.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconf/pkgconf-0.9.3-r1.ebuild,v 1.1 2014/03/30 09:16:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconf/pkgconf-0.9.3-r1.ebuild,v 1.2 2014/07/13 17:51:17 vapier Exp $
EAPI=5
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
else
inherit eutils multilib-minimal
SRC_URI="http://tortois.es/~nenolod/distfiles/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
+ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
fi
DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
diff --git a/dev-util/pkgconfig/pkgconfig-0.28-r1.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r1.ebuild
index d5f7b0dd800b..16c4373c92a7 100644
--- a/dev-util/pkgconfig/pkgconfig-0.28-r1.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.28-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28-r1.ebuild,v 1.7 2014/07/09 10:22:25 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28-r1.ebuild,v 1.9 2014/07/13 09:53:13 ago Exp $
EAPI=5
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="git://anongit.freedesktop.org/pkg-config"
inherit autotools git-2
else
- 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"
SRC_URI="http://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
fi
diff --git a/dev-vcs/stgit/stgit-0.16-r2.ebuild b/dev-vcs/stgit/stgit-0.16-r2.ebuild
index b1da65c3ff8a..18fa47ebc90e 100644
--- a/dev-vcs/stgit/stgit-0.16-r2.ebuild
+++ b/dev-vcs/stgit/stgit-0.16-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/stgit/stgit-0.16-r2.ebuild,v 1.4 2014/06/16 09:55:41 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/stgit/stgit-0.16-r2.ebuild,v 1.5 2014/07/13 09:58:03 ago Exp $
EAPI="5"
@@ -15,7 +15,7 @@ SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="doc"
RDEPEND=">=dev-vcs/git-1.6.3.3"
diff --git a/dev-vcs/subversion/subversion-1.8.9.ebuild b/dev-vcs/subversion/subversion-1.8.9.ebuild
index c4196f999e79..45c27bb0e714 100644
--- a/dev-vcs/subversion/subversion-1.8.9.ebuild
+++ b/dev-vcs/subversion/subversion-1.8.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.9.ebuild,v 1.4 2014/07/06 17:45:19 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.9.ebuild,v 1.5 2014/07/13 22:14:34 tgall Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="Subversion GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kde nls perl python ruby sasl test vim-syntax"
COMMON_DEPEND=">=dev-db/sqlite-3.7.12
diff --git a/eclass/gnatbuild.eclass b/eclass/gnatbuild.eclass
index 64d708291665..1370f66689bd 100644
--- a/eclass/gnatbuild.eclass
+++ b/eclass/gnatbuild.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.60 2013/11/25 07:06:23 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.61 2014/07/13 16:19:33 ulm Exp $
#
# Authors: George Shapovalov
# Steve Arnold
@@ -213,7 +213,7 @@ should_we_eselect_gnat() {
# if the current config is invalid, we definitely want a new one
# Note: due to bash quirkiness, the following must not be 1 line
local curr_config
- curr_config=$(eselect --no-color gnat show | grep ${CTARGET} | awk '{ print $1 }') || return 0
+ curr_config=$(eselect gnat show | grep ${CTARGET} | awk '{ print $1 }') || return 0
[[ -z ${curr_config} ]] && return 0
# The logic is basically "try to keep the same profile if possible"
diff --git a/eclass/udev.eclass b/eclass/udev.eclass
index 3032b9718feb..c81bee5e9917 100644
--- a/eclass/udev.eclass
+++ b/eclass/udev.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/udev.eclass,v 1.11 2013/03/24 15:52:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/udev.eclass,v 1.12 2014/07/13 19:33:09 ssuominen Exp $
# @ECLASS: udev.eclass
# @MAINTAINER:
@@ -13,9 +13,8 @@
# @CODE
# inherit udev
#
-# # In this example 196 is the first version with udev.bin hwdb database,
-# # and we also link against libgudev
-# RDEPEND=">=virtual/udev-196[hwdb,gudev]"
+# # Example of the eclass usage:
+# RDEPEND="virtual/udev"
# DEPEND="${RDEPEND}"
#
# src_configure() {
diff --git a/mail-filter/razor/razor-2.85-r1.ebuild b/mail-filter/razor/razor-2.85-r1.ebuild
deleted file mode 100644
index 3f784e73c595..000000000000
--- a/mail-filter/razor/razor-2.85-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/razor/razor-2.85-r1.ebuild,v 1.9 2012/03/25 15:01:01 armin76 Exp $
-
-inherit perl-app
-
-MY_PN="razor-agents"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Vipul's Razor is a distributed, collaborative spam detection and filtering network"
-HOMEPAGE="http://razor.sourceforge.net/"
-SRC_URI="mirror://sourceforge/razor/${MY_P}.tar.bz2"
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-
-RDEPEND="dev-perl/Net-DNS
- virtual/perl-net-ping
- virtual/perl-Time-HiRes
- || ( virtual/perl-Digest-SHA dev-perl/Digest-SHA1 )
- dev-perl/URI
- dev-perl/Digest-Nilsimsa"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.85-use-sha-not-sha1.patch"
- "${FILESDIR}/${PN}-2.85-cosmetic-pv-fix.patch"
- )
-
-S=${WORKDIR}/${MY_P}
-
-pkg_postinst() {
- elog
- elog "Run 'razor-admin -create' to create a default config file in your"
- elog "home directory under /home/user/.razor. (Remember to change user to"
- elog "your username from root before running razor-admin)"
- elog
- elog "Razor v2 requires reporters to be registered so their reputations can"
- elog "be computed over time and they can participate in the revocation"
- elog "mechanism. Registration is done with razor-admin -register. It has to be"
- elog "manually invoked in either of the following ways:"
- elog
- elog "To register user foo with 's1kr3t' as password: "
- elog
- elog "razor-admin -register -user=foo -pass=s1kr3t"
- elog
- elog "To register with an email address and have the password assigned:"
- elog
- elog "razor-admin -register -user=foo@bar.com "
- elog
- elog "To have both (random) username and password assgined: "
- elog
- elog "razor-admin -register "
- elog
- elog "razor-admin -register negotiates a registration with the Nomination Server"
- elog "and writes the identity information in"
- elog "/home/user/.razor/identity-username, or /etc/razor/identity-username"
- elog "when invoked as root."
- elog
- elog "You can edit razor-agent.conf to change the defaults. Config options"
- elog "and their values are defined in the razor-agent.conf(5) manpage."
- elog
- elog "The next step is to integrate razor-check, razor-report and"
- elog "razor-revoke in your mail system. If you are running Razor v1, the"
- elog "change will be transparent, new versions of razor agents will overwrite"
- elog "the old ones. You would still need to plugin razor-revoke in your MUA,"
- elog "since it's a new addition in Razor v2. If you are not running Razor v1,"
- elog "refer to manpages of razor-check(1), razor-report(1), and"
- elog "razor-revoke(1) for integration instructions."
- elog
-}
diff --git a/media-libs/giflib/giflib-4.1.6-r3.ebuild b/media-libs/giflib/giflib-4.1.6-r3.ebuild
index d140312ad319..c2141c227913 100644
--- a/media-libs/giflib/giflib-4.1.6-r3.ebuild
+++ b/media-libs/giflib/giflib-4.1.6-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-4.1.6-r3.ebuild,v 1.2 2014/07/09 10:16:59 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-4.1.6-r3.ebuild,v 1.4 2014/07/13 21:23:55 tgall Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/giflib/${P}.tar.bz2"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~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 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="rle static-libs X"
RDEPEND="
diff --git a/media-libs/prison/prison-1.1.1.ebuild b/media-libs/prison/prison-1.1.1.ebuild
index 60211b4e7d23..cc3efda65416 100644
--- a/media-libs/prison/prison-1.1.1.ebuild
+++ b/media-libs/prison/prison-1.1.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/prison/prison-1.1.1.ebuild,v 1.3 2014/07/10 21:11:57 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/prison/prison-1.1.1.ebuild,v 1.4 2014/07/13 10:04:54 ago Exp $
EAPI=5
@@ -11,7 +11,7 @@ HOMEPAGE="https://projects.kde.org/projects/kdesupport/prison"
SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd"
SLOT="4"
IUSE="debug"
diff --git a/media-libs/taglib/taglib-1.9.1-r2.ebuild b/media-libs/taglib/taglib-1.9.1-r2.ebuild
index 321361019df5..d7b4bffc9dc9 100644
--- a/media-libs/taglib/taglib-1.9.1-r2.ebuild
+++ b/media-libs/taglib/taglib-1.9.1-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/taglib/taglib-1.9.1-r2.ebuild,v 1.2 2014/07/12 12:25:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/taglib/taglib-1.9.1-r2.ebuild,v 1.3 2014/07/13 03:46:49 tgall Exp $
EAPI=5
@@ -11,7 +11,7 @@ HOMEPAGE="http://developer.kde.org/~wheeler/taglib.html"
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1 MPL-1.1"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
SLOT="0"
IUSE="+asf debug examples +mp4 test"
diff --git a/media-plugins/vdr-burn/vdr-burn-0.2.2.ebuild b/media-plugins/vdr-burn/vdr-burn-0.2.2.ebuild
index d7a63ddc21c9..06e31547d4e5 100644
--- a/media-plugins/vdr-burn/vdr-burn-0.2.2.ebuild
+++ b/media-plugins/vdr-burn/vdr-burn-0.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/vdr-burn-0.2.2.ebuild,v 1.1 2013/03/31 10:54:45 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/vdr-burn-0.2.2.ebuild,v 1.2 2014/07/13 10:26:57 hd_brummy Exp $
EAPI="5"
@@ -53,6 +53,11 @@ src_prepare() {
sed -i Makefile -e 's:DEFINES += -DTTXT_SUBTITLES:#DEFINES += -DTTXT_SUBTITLES:'
+ if has_version ">=media-video/vdr-2.1.2"; then
+ sed -e "s#VideoDirectory#cVideoDirectory::Name\(\)#" \
+ -i jobs.c
+ fi
+
fix_vdr_libsi_include scanner.c
}
diff --git a/media-video/kaffeine/kaffeine-1.2.2-r1.ebuild b/media-video/kaffeine/kaffeine-1.2.2-r1.ebuild
index 31f265c864ad..45a3c34b1c4e 100644
--- a/media-video/kaffeine/kaffeine-1.2.2-r1.ebuild
+++ b/media-video/kaffeine/kaffeine-1.2.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-1.2.2-r1.ebuild,v 1.3 2014/06/27 17:06:40 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-1.2.2-r1.ebuild,v 1.4 2014/07/13 10:05:14 ago Exp $
EAPI=5
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2 FDL-1.2"
SLOT="4"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
IUSE="debug"
DEPEND="
diff --git a/media-video/kaffeine/kaffeine-1.2.2.ebuild b/media-video/kaffeine/kaffeine-1.2.2.ebuild
deleted file mode 100644
index cfab32821a67..000000000000
--- a/media-video/kaffeine/kaffeine-1.2.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-1.2.2.ebuild,v 1.8 2013/05/10 09:28:15 abcd Exp $
-
-EAPI=4
-
-KDE_LINGUAS="ar ast be bg ca ca@valencia cs da de el en_GB eo es et fi fr ga gl hr hu
- it ja km ko ku lt mai nb nds nl nn pa pl pt pt_BR ro ru se sk sr@ijekavian
- sr@ijekavianlatin sr@latin sv th tr uk zh_CN zh_TW"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="A media player for KDE with digital TV support"
-HOMEPAGE="http://kaffeine.kde.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="4"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug"
-
-DEPEND="
- x11-libs/libXScrnSaver
- dev-qt/qtsql:4[sqlite]
- >=media-libs/xine-lib-1.1.18.1
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( Changelog NOTES )
-
-PATCHES=( "${FILESDIR}/${PN}-1.2.2-gcc4.7.patch" )
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_build debug DEBUG_MODULE)
- )
-
- kde4-base_src_configure
-}
diff --git a/media-video/mplayer2/files/mplayer2-2.0_p20131009_support_libav10.patch b/media-video/mplayer2/files/mplayer2-2.0_p20131009_support_libav10.patch
new file mode 100644
index 000000000000..6b60f62bf064
--- /dev/null
+++ b/media-video/mplayer2/files/mplayer2-2.0_p20131009_support_libav10.patch
@@ -0,0 +1,163 @@
+Description: Fix compilation against libav10
+ Patch based on work by Anton Khirnov, rebasing on mplayer2 revision
+ 2c378c7 allowed great simplification.
+Author: Reinhard Tartler
+Origin: debian
+Bug-Debian: http://bugs.debian.org/739337
+Last-Update: 2014-03-08
+
+--- mplayer2-2.0-728-g2c378c7.orig/Makefile
++++ mplayer2-2.0-728-g2c378c7/Makefile
+@@ -301,7 +301,6 @@ SRCS_COMMON = asxparser.c \
+ libmpcodecs/vf_ilpack.c \
+ libmpcodecs/vf_ivtc.c \
+ libmpcodecs/vf_kerndeint.c \
+- libmpcodecs/vf_lavc.c \
+ libmpcodecs/vf_lavcdeint.c \
+ libmpcodecs/vf_mirror.c \
+ libmpcodecs/vf_noformat.c \
+--- mplayer2-2.0-728-g2c378c7.orig/screenshot.c
++++ mplayer2-2.0-728-g2c378c7/screenshot.c
+@@ -82,6 +82,7 @@ static int write_png(screenshot_ctx *ctx
+ FILE *fp = NULL;
+ void *outbuffer = NULL;
+ int success = 0;
++ int got_output;
+
+ struct AVCodec *png_codec = avcodec_find_encoder(AV_CODEC_ID_PNG);
+ AVCodecContext *avctx = NULL;
+@@ -104,10 +105,8 @@ static int write_png(screenshot_ctx *ctx
+ goto error_exit;
+ }
+
++ AVPacket pkt = { 0 };
+ size_t outbuffer_size = image->width * image->height * 3 * 2;
+- outbuffer = malloc(outbuffer_size);
+- if (!outbuffer)
+- goto error_exit;
+
+ AVFrame *pic = ctx->pic;
+ avcodec_get_frame_defaults(pic);
+@@ -115,8 +114,8 @@ static int write_png(screenshot_ctx *ctx
+ pic->data[n] = image->planes[n];
+ pic->linesize[n] = image->stride[n];
+ }
+- int size = avcodec_encode_video(avctx, outbuffer, outbuffer_size, pic);
+- if (size < 1)
++ int ret = avcodec_encode_video2(avctx, &pkt, pic, &got_output);
++ if (ret < 0 || !got_output)
+ goto error_exit;
+
+ fp = fopen(fname, "wb");
+@@ -126,8 +125,9 @@ static int write_png(screenshot_ctx *ctx
+ goto error_exit;
+ }
+
+- fwrite(outbuffer, size, 1, fp);
++ fwrite(pkt.data, pkt.size, 1, fp);
+ fflush(fp);
++ av_free_packet(&pkt);
+
+ if (ferror(fp))
+ goto error_exit;
+@@ -139,7 +139,6 @@ error_exit:
+ av_free(avctx);
+ if (fp)
+ fclose(fp);
+- free(outbuffer);
+ return success;
+ }
+
+--- mplayer2-2.0-728-g2c378c7.orig/libmpcodecs/vf.c
++++ mplayer2-2.0-728-g2c378c7/libmpcodecs/vf.c
+@@ -48,7 +48,7 @@ extern const vf_info_t vf_info_flip;
+ extern const vf_info_t vf_info_rotate;
+ extern const vf_info_t vf_info_mirror;
+ extern const vf_info_t vf_info_palette;
+-extern const vf_info_t vf_info_lavc;
++//extern const vf_info_t vf_info_lavc;
+ extern const vf_info_t vf_info_dvbscale;
+ extern const vf_info_t vf_info_cropdetect;
+ extern const vf_info_t vf_info_test;
+@@ -131,7 +131,7 @@ static const vf_info_t *const filter_lis
+ #ifdef CONFIG_LIBPOSTPROC
+ &vf_info_pp,
+ #endif
+- &vf_info_lavc,
++ //&vf_info_lavc,
+ &vf_info_lavcdeint,
+ &vf_info_screenshot,
+ &vf_info_fspp,
+--- mplayer2-2.0-728-g2c378c7.orig/libvo/vo_png.c
++++ mplayer2-2.0-728-g2c378c7/libvo/vo_png.c
+@@ -52,8 +52,6 @@ static int z_compression;
+ static int framenum;
+ static int use_alpha;
+ static AVCodecContext *avctx;
+-static uint8_t *outbuffer;
+-int outbuffer_size;
+
+ static int
+ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
+@@ -87,9 +85,10 @@ config(uint32_t width, uint32_t height,
+
+
+ static uint32_t draw_image(mp_image_t* mpi){
++ AVPacket pkt = { 0 };
+ AVFrame pic;
+ int buffersize;
+- int res;
++ int res, got_output;
+ char buf[100];
+ FILE *outfile;
+
+@@ -105,22 +104,18 @@ static uint32_t draw_image(mp_image_t* m
+
+ pic.data[0] = mpi->planes[0];
+ pic.linesize[0] = mpi->stride[0];
+- buffersize = mpi->w * mpi->h * 8;
+- if (outbuffer_size < buffersize) {
+- av_freep(&outbuffer);
+- outbuffer = av_malloc(buffersize);
+- outbuffer_size = buffersize;
+- }
+- res = avcodec_encode_video(avctx, outbuffer, outbuffer_size, &pic);
+
+- if(res < 0){
++ res = avcodec_encode_video2(avctx, &pkt, &pic, &got_output);
++
++ if(res < 0 || !got_output){
+ mp_msg(MSGT_VO,MSGL_WARN, "[VO_PNG] Error in create_png.\n");
+ fclose(outfile);
+ return 1;
+ }
+
+- fwrite(outbuffer, res, 1, outfile);
++ fwrite(pkt.data, pkt.size, 1, outfile);
+ fclose(outfile);
++ av_free_packet(&pkt);
+
+ return VO_TRUE;
+ }
+@@ -157,8 +152,6 @@ static void uninit(void)
+ if (avctx)
+ avcodec_close(avctx);
+ av_freep(&avctx);
+- av_freep(&outbuffer);
+- outbuffer_size = 0;
+ }
+
+ static void check_events(void){}
+--- mplayer2-2.0-728-g2c378c7.orig/libmpdemux/demux_lavf.c
++++ mplayer2-2.0-728-g2c378c7/libmpdemux/demux_lavf.c
+@@ -422,8 +422,8 @@ static void handle_stream(demuxer_t *dem
+ * heuristic makes up works with subtitles in practice.
+ */
+ double fps;
+- if (st->r_frame_rate.num)
+- fps = av_q2d(st->r_frame_rate);
++ if (st->avg_frame_rate.num)
++ fps = av_q2d(st->avg_frame_rate);
+ else
+ fps = 1.0 / FFMAX(av_q2d(st->time_base),
+ av_q2d(st->codec->time_base) *
diff --git a/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild b/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild
index d752899ac103..4431130e0679 100644
--- a/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild
+++ b/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild,v 1.2 2014/06/09 19:27:56 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild,v 1.3 2014/07/13 19:56:14 tomwij Exp $
EAPI=5
@@ -164,6 +164,7 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}/${PN}-py2compat.patch"
+ epatch "${FILESDIR}/${P}_support_libav10.patch"
epatch_user
# fix path to bash executable in configure scripts
diff --git a/media-video/mpv/mpv-0.3.10.ebuild b/media-video/mpv/mpv-0.3.10.ebuild
index dcd5678bb463..e947eab52dff 100644
--- a/media-video/mpv/mpv-0.3.10.ebuild
+++ b/media-video/mpv/mpv-0.3.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.3.10.ebuild,v 1.2 2014/07/08 18:16:27 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.3.10.ebuild,v 1.3 2014/07/13 09:52:33 ago Exp $
EAPI=5
@@ -20,7 +20,7 @@ SRC_URI+=" https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="GPL-2"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
IUSE="+alsa bluray bs2b +cdio -doc-pdf dvb +dvd dvdnav +enca encode +iconv jack -joystick
jpeg ladspa lcms +libass libcaca libguess lirc lua luajit +mpg123 -openal +opengl
oss portaudio +postproc pulseaudio pvr +quvi -radio samba sdl selinux +shm v4l vaapi vcd vdpau
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index dbfc38995eb2..2c84d32a1335 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 12 Jul 2014 20:37:00 +0000
+Mon, 14 Jul 2014 04:07:01 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 074504cb09e6..2c84d32a1335 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 12 Jul 2014 20:37:01 +0000
+Mon, 14 Jul 2014 04:07:01 +0000
diff --git a/metadata/herds.xml b/metadata/herds.xml
index 117ce8c8b098..48080b7d639f 100644
--- a/metadata/herds.xml
+++ b/metadata/herds.xml
@@ -20,7 +20,7 @@
always a description without a lang attribute. Also there are no overlapping
descriptions allowed (multiple description tags with the same language)
- $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/metastructure/herds/herds.xml,v 1.1109 2014/07/05 11:01:25 zlogene Exp $
+ $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/metastructure/herds/herds.xml,v 1.1111 2014/07/13 17:31:10 ulm Exp $
-->
@@ -1364,7 +1364,7 @@
Tim Harder
- ssuominen@gentoo.org>
+ ssuominen@gentoo.org
Samuli Suominen
@@ -2263,6 +2263,12 @@
Manuel Rüger
+
+ eselect
+ eselect@gentoo.org
+ Gentoo eselect project
+ /proj/en/eselect/index.xml
+
+ sysadmin
diff --git a/sys-block/megactl/Manifest b/sys-block/megactl/Manifest
new file mode 100644
index 000000000000..65af2ba804f0
--- /dev/null
+++ b/sys-block/megactl/Manifest
@@ -0,0 +1 @@
+DIST megactl-0.4.1.tar.gz 179173 SHA256 d7aee98035c97a1ff098450192f073565c4f2355079763f6dc6202be121720e8 SHA512 65a97f03fbe1c76375d2e16016c1e57c7e4544bfd7185b13a330560819caf48ecad8e9f1feb1d448b45d4f862abf2799868bd357d120019a709088c90b58ac92 WHIRLPOOL 61094c1cec453b5ee4a2e0f72d95d6e0ce0dacb3b6d56f6dca51e13fdd70f969021eb4f39934c29dd6124f1768896076cb495e8a2397bae521bd387db3badf21
diff --git a/sys-block/megactl/files/megactl-0.4.1-Makefile.patch b/sys-block/megactl/files/megactl-0.4.1-Makefile.patch
new file mode 100644
index 000000000000..f1ee2f9bb2a4
--- /dev/null
+++ b/sys-block/megactl/files/megactl-0.4.1-Makefile.patch
@@ -0,0 +1,26 @@
+diff -urN megactl-0.4.1.orig/src/Makefile megactl-0.4.1/src/Makefile
+--- megactl-0.4.1.orig/src/Makefile 2007-08-21 09:19:53.000000000 +0200
++++ megactl-0.4.1/src/Makefile 2009-11-21 12:30:44.242501898 +0100
+@@ -1,11 +1,17 @@
+
+-SRCS= megactl.c adapter.c megaioctl.c megatrace.c callinfo.c dumpbytes.c logpage.c ntrim.c
++SRCS= megactl.c adapter.c megaioctl.c callinfo.c dumpbytes.c logpage.c ntrim.c
+ INC= -I./schily -Iincludes-hack
+ HDRS= mega.h adapter.h megaioctl.h callinfo.h logpage.h dumpbytes.h
+-ARCH= -m32
+-CFLAGS= -g -Wall $(INC) $(ARCH)
+-LDFLAGS= -g $(ARCH)
+-PROGRAMS= megactl megasasctl megatrace
++ARCH?= -m32
++CFLAGS?= -g -Wall
++CFLAGS+= $(INC) $(ARCH)
++LDFLAGS?= -g
++LDFLAGS+= $(ARCH)
++PROGRAMS= megactl megasasctl
++ifeq ($(ARCH),-m32)
++PROGRAMS+= megatrace
++SRCS+= megatrace.c
++endif
+
+ all: $(PROGRAMS)
+
diff --git a/sys-block/megactl/files/megactl-0.4.1.patch b/sys-block/megactl/files/megactl-0.4.1.patch
new file mode 100644
index 000000000000..3d857c9c1c57
--- /dev/null
+++ b/sys-block/megactl/files/megactl-0.4.1.patch
@@ -0,0 +1,21 @@
+diff -urN megactl-0.4.1.orig/src/megatrace.c megactl-0.4.1/src/megatrace.c
+--- megactl-0.4.1.orig/src/megatrace.c 2007-08-21 09:19:53.000000000 +0200
++++ megactl-0.4.1/src/megatrace.c 2008-02-10 21:27:24.416919438 +0100
+@@ -49,7 +49,7 @@
+ #include
+ #include
+ #include
+-#include
++#include
+ #include
+ #include
+ #include
+@@ -250,7 +250,7 @@
+ len = sizeof buf;
+
+ if (printregs)
+- fprintf (stderr, " ebx=%08lx ecx=%08lx edx=%08lx esi=%08lx edi=%08lx ebp=%08lx eax=%08lx ds=%04x __ds=%04x es=%04x __es=%04x fs=%04x __fs=%04x gs=%04x __gs=%04x orig_eax=%08lx eip=%08lx cs=%04x __cs=%04x eflags=%08lx esp=%08lx ss=%04x __ss=%04x\n", r.ebx, r.ecx, r.edx, r.esi, r.edi, r.ebp, r.eax, r.ds, r.__ds, r.es, r.__es, r.fs, r.__fs, r.gs, r.__gs, r.orig_eax, r.eip, r.cs, r.__cs, r.eflags, r.esp, r.ss, r.__ss);
++ fprintf (stderr, " ebx=%08lx ecx=%08lx edx=%08lx esi=%08lx edi=%08lx ebp=%08lx eax=%08lx xds=%08lx xes=%08lx xfs=%08lx xgs=%08lx orig_eax=%08lx eip=%08lx xcs=%08lx eflags=%08lx esp=%08lx xss=%08lx\n", r.ebx, r.ecx, r.edx, r.esi, r.edi, r.ebp, r.eax, r.xds, r.xes, r.xfs, r.xgs, r.orig_eax, r.eip, r.xcs, r.eflags, r.esp, r.xss);
+
+ copyout (buf, len, pid, r.edx);
+
diff --git a/sys-block/megactl/megactl-0.4.1-r1.ebuild b/sys-block/megactl/megactl-0.4.1-r1.ebuild
new file mode 100644
index 000000000000..cddafa27ccea
--- /dev/null
+++ b/sys-block/megactl/megactl-0.4.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/megactl/megactl-0.4.1-r1.ebuild,v 1.3 2014/07/14 00:52:23 robbat2 Exp $
+
+EAPI=2
+
+inherit eutils
+
+IUSE=""
+DESCRIPTION="LSI MegaRAID control utility"
+HOMEPAGE="http://sourceforge.net/projects/megactl/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}.patch
+ epatch "${FILESDIR}"/${P}-Makefile.patch
+}
+
+src_compile() {
+ cd src
+ use x86 && MY_MAKEOPTS="ARCH=-m32"
+ use amd64 && MY_MAKEOPTS="ARCH=-m64"
+ emake ${MY_MAKEOPTS} || die "make failed"
+}
+
+src_install() {
+ cd src
+ dosbin megactl megasasctl
+ use x86 && dosbin megatrace
+ use amd64 && ewarn "megatrace was not installed because it does not compile on amd64"
+ dodoc megarpt megasasrpt ../README
+}
diff --git a/sys-block/megactl/metadata.xml b/sys-block/megactl/metadata.xml
new file mode 100644
index 000000000000..7cef94fb7225
--- /dev/null
+++ b/sys-block/megactl/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ sysadmin
+
+This project is a small collection of programs for examining configuration and
+status of LSI megaraid adapters, especially Dell PERC RAID adapters, and
+attached storage devices.
+
+
diff --git a/sys-block/partitionmanager/Manifest b/sys-block/partitionmanager/Manifest
index 9a28466a3284..6fda70ab8df4 100644
--- a/sys-block/partitionmanager/Manifest
+++ b/sys-block/partitionmanager/Manifest
@@ -1 +1,2 @@
DIST partitionmanager-1.0.3_p20130623.tar.xz 209320 SHA256 257c30ed05f7ff542cddaab3652b99ae227cf84af5ad2b05fad31e635db851dd SHA512 be1253bc952dcdf6c8d19443b77662501d40cd7c61704e77ef9e7766fa639d2f433918c9093278ce24313904a53ffeb488dfd0b68ae67550ef5783ff462da54a WHIRLPOOL 295c48e51312ca4dd92b0711ca51606eb3fac34526b42a4437d768db28f1a9d838cb7ddb73e83ae63a242246a21f4c10fc344efcee3ecdca1d1ff474386ff908
+DIST partitionmanager-1.1.0.tar.xz 1747260 SHA256 30ac75f85bb61e6ec9b6f5d80dee4a2c8501a0a0c62997f6d734e63459802cc8 SHA512 9e35777ae54f46ea585fd7ea7295c63531bca0a9bd53bf967f1e58219a63bb3c8d198785a9f5c7ddde6ae93f40b7be04ecf16598065b775e8e013686db7be6be WHIRLPOOL 86e426c741719d8c48e39d1567f6aa2664ae7e5ad5982793d348adb675c6e779bff8873e2ed3af088712a45e930713ef54e963f5c61eb7b3101ce14978cc96a2
diff --git a/sys-block/partitionmanager/partitionmanager-1.1.0.ebuild b/sys-block/partitionmanager/partitionmanager-1.1.0.ebuild
new file mode 100644
index 000000000000..e786994db6e3
--- /dev/null
+++ b/sys-block/partitionmanager/partitionmanager-1.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/partitionmanager/partitionmanager-1.1.0.ebuild,v 1.1 2014/07/13 12:26:58 johu Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KDE_LINGUAS="ar bg bs ca ca@valencia cs da de el en_GB es et fr gl it lt nb nds
+nl pa pl pt pt_BR ro ru sk sl sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr
+uk zh_CN zh_TW"
+inherit kde4-base
+
+DESCRIPTION="KDE utility for management of partitions and file systems"
+HOMEPAGE="http://partitionman.sourceforge.net/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="debug"
+
+RDEPEND="
+ dev-libs/libatasmart
+ >=sys-block/parted-3
+ sys-apps/util-linux
+"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_UDISKS2=ON
+ )
+
+ kde4-base_src_configure
+}
diff --git a/sys-cluster/neutron/neutron-2014.1.1.ebuild b/sys-cluster/neutron/neutron-2014.1.1.ebuild
index ac731b653899..e95f06f9a702 100644
--- a/sys-cluster/neutron/neutron-2014.1.1.ebuild
+++ b/sys-cluster/neutron/neutron-2014.1.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2014.1.1.ebuild,v 1.2 2014/07/06 12:56:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2014.1.1.ebuild,v 1.3 2014/07/13 03:40:50 idella4 Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
@@ -54,7 +54,7 @@ RDEPEND="dev-python/paste[${PYTHON_USEDEP}]
>=dev-python/python-neutronclient-2.3.4[${PYTHON_USEDEP}]
<=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}]
>=dev-python/sqlalchemy-0.7.8[${PYTHON_USEDEP}]
- =dev-python/psycopg-2[${PYTHON_USEDEP}] )
sqlite? ( dev-db/sqlite )
@@ -73,6 +73,7 @@ RDEPEND="dev-python/paste[${PYTHON_USEDEP}]
PATCHES=(
"${FILESDIR}/sphinx_mapping.patch"
+ "${FILESDIR}/"2014.1-CVE-2014-4167.patch
)
pkg_setup() {
diff --git a/sys-cluster/neutron/neutron-2014.1.9999.ebuild b/sys-cluster/neutron/neutron-2014.1.9999.ebuild
index d99ce83f848f..d8c3be52f51f 100644
--- a/sys-cluster/neutron/neutron-2014.1.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2014.1.9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2014.1.9999.ebuild,v 1.3 2014/07/06 12:56:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2014.1.9999.ebuild,v 1.4 2014/07/13 03:40:50 idella4 Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
@@ -55,11 +55,11 @@ RDEPEND="dev-python/paste[${PYTHON_USEDEP}]
>=dev-python/python-neutronclient-2.3.4[${PYTHON_USEDEP}]
<=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}]
sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}]
- =dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}]
- =dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}]
- =dev-python/webob-1.2.3[${PYTHON_USEDEP}]
>=dev-python/python-keystoneclient-0.7.0[${PYTHON_USEDEP}]
>=dev-python/alembic-0.4.1[${PYTHON_USEDEP}]
diff --git a/sys-cluster/neutron/neutron-9999.ebuild b/sys-cluster/neutron/neutron-9999.ebuild
index a0e26cb7f3d9..b022385ddac0 100644
--- a/sys-cluster/neutron/neutron-9999.ebuild
+++ b/sys-cluster/neutron/neutron-9999.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-9999.ebuild,v 1.10 2014/07/06 12:56:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-9999.ebuild,v 1.11 2014/07/13 03:40:50 idella4 Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
inherit distutils-r1 git-2 user
-#restricted due to packages missing and bad depends in the test ==webob-1.0.8
+#restricted due to packages missing and bad depends in the test ==webob-1.0.8
RESTRICT="test"
DESCRIPTION="A virtual network service for Openstack."
HOMEPAGE="https://launchpad.net/neutron"
@@ -52,11 +52,14 @@ RDEPEND=">=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
<=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}]
dev-python/pyudev[${PYTHON_USEDEP}]
sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}]
- =dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}]
- =dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}]
- =dev-python/webob-1.2[${PYTHON_USEDEP}]
>=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
+ proxy-maintainers
dev-zero@gentoo.org
Tiziano Müller
diff --git a/x11-misc/treeline/files/treeline-1.2.3-nocompile.patch b/x11-misc/treeline/files/treeline-1.2.3-nocompile.patch
index 297a926d9091..764859f1e415 100644
--- a/x11-misc/treeline/files/treeline-1.2.3-nocompile.patch
+++ b/x11-misc/treeline/files/treeline-1.2.3-nocompile.patch
@@ -1,5 +1,5 @@
---- install.py.orig 2009-06-06 19:21:00.000000000 +0200
-+++ install.py 2009-06-06 19:26:28.000000000 +0200
+--- a/install.py
++++ b/install.py
@@ -230,7 +230,8 @@
pythonBuildDir = os.path.join(buildRoot, pythonPrefixDir[1:])
diff --git a/x11-misc/treeline/treeline-1.4.1-r1.ebuild b/x11-misc/treeline/treeline-1.4.1-r1.ebuild
index ca7701e14f48..6663b294d918 100644
--- a/x11-misc/treeline/treeline-1.4.1-r1.ebuild
+++ b/x11-misc/treeline/treeline-1.4.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/treeline/treeline-1.4.1-r1.ebuild,v 1.4 2014/06/16 22:06:39 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/treeline/treeline-1.4.1-r1.ebuild,v 1.5 2014/07/13 10:06:09 ago Exp $
EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
TLLINGUAS=( de fr )
IUSE+=" ${TLLINGUAS[@]/#/linguas_}"
diff --git a/x11-misc/treeline/treeline-1.4.1.ebuild b/x11-misc/treeline/treeline-1.4.1.ebuild
deleted file mode 100644
index 8df62dfbd198..000000000000
--- a/x11-misc/treeline/treeline-1.4.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/treeline/treeline-1.4.1.ebuild,v 1.4 2013/03/12 18:30:25 ago Exp $
-
-EAPI="2"
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="xml"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit eutils python
-
-DESCRIPTION="TreeLine is a structured information storage program."
-HOMEPAGE="http://treeline.bellz.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="spell"
-
-LANGS="de fr"
-for lang in ${LANGS}; do
- IUSE="${IUSE} linguas_${lang}"
- SRC_URI="${SRC_URI} linguas_${lang}? ( mirror://sourceforge/${PN}/${PN}-i18n-${PV}a.tar.gz )"
-done
-
-DEPEND="spell? ( app-text/aspell )
- dev-python/PyQt4[X]"
-RDEPEND="${DEPEND}"
-RESTRICT_PYTHON_ABIS="3.*"
-
-S="${WORKDIR}/TreeLine"
-
-src_unpack() {
- unpack ${P}.tar.gz
- for lang in ${LANGS}; do
- if use linguas_${lang}; then
- tar xozf "${DISTDIR}"/${PN}-i18n-${PV}a.tar.gz \
- TreeLine/doc/{readme_${lang}.trl,README_${lang}.html} \
- TreeLine/translations/{treeline_${lang}.{qm,ts},qt_${lang}.{qm,ts}} || die
- fi
- done
-}
-
-src_prepare() {
- # Let's leave compiling to python_mod_optimize().
- epatch "${FILESDIR}"/${PN}-1.2.3-nocompile.patch
-
- rm doc/LICENSE || die
-
- python_copy_sources
-
- preparation() {
- # install into proper python site-packages dir
- sed -i "s;prefixDir, 'lib;'$(python_get_sitedir);" install.py || die
- }
- python_execute_function -s preparation
-}
-
-src_install() {
- installation() {
- "$(PYTHON)" install.py -x -p /usr/ -d /usr/share/doc/${PF} -b "${D}"
- }
- python_execute_function -s installation
-}
-
-pkg_postinst() {
- python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
- python_mod_cleanup ${PN}
-}
diff --git a/x11-wm/pekwm/pekwm-0.1.17.ebuild b/x11-wm/pekwm/pekwm-0.1.17.ebuild
index 31db449e5f64..7561a11ec319 100644
--- a/x11-wm/pekwm/pekwm-0.1.17.ebuild
+++ b/x11-wm/pekwm/pekwm-0.1.17.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/pekwm/pekwm-0.1.17.ebuild,v 1.4 2014/06/14 10:42:24 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/pekwm/pekwm-0.1.17.ebuild,v 1.5 2014/07/13 10:03:11 ago Exp $
EAPI=5
inherit eutils
@@ -14,7 +14,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~mips ppc ~sparc x86 ~x86-fbsd"
IUSE="contrib debug themes truetype xinerama"
RDEPEND="
diff --git a/x11-wm/sawfish/sawfish-1.9.1-r2.ebuild b/x11-wm/sawfish/sawfish-1.9.1-r2.ebuild
index 8bba052882e1..a590ffb7ddfb 100644
--- a/x11-wm/sawfish/sawfish-1.9.1-r2.ebuild
+++ b/x11-wm/sawfish/sawfish-1.9.1-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.9.1-r2.ebuild,v 1.4 2014/06/23 14:02:37 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.9.1-r2.ebuild,v 1.5 2014/07/13 09:59:57 ago Exp $
EAPI=5
inherit eutils elisp-common
@@ -11,7 +11,7 @@ SRC_URI="http://download.tuxfamily.org/sawfish/${P}.tar.xz"
LICENSE="GPL-2 Artistic-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
IUSE="emacs nls xinerama"
RDEPEND="emacs? ( virtual/emacs !app-emacs/sawfish )