diff --git a/app-misc/jot/jot-9.0.ebuild b/app-misc/jot/jot-9.0.ebuild
deleted file mode 100644
index 1ec5228bff2f..000000000000
--- a/app-misc/jot/jot-9.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit rpm
-
-RH_REV=3
-DESCRIPTION="Print out increasing, decreasing, random, or redundant data"
-HOMEPAGE="http://freshmeat.net/projects/bsd-jot/"
-SRC_URI="http://www.mit.edu/afs/athena/system/rhlinux/athena-${PV}/free/SRPMS/athena-${P}-${RH_REV}.src.rpm"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-S="${WORKDIR}/athena-${P}"
-
-src_install() {
- einstall || die
-}
diff --git a/app-misc/mmv/Manifest b/app-misc/mmv/Manifest
index 94adcdd0ada8..f12a8a11e7e2 100644
--- a/app-misc/mmv/Manifest
+++ b/app-misc/mmv/Manifest
@@ -1,3 +1,2 @@
-DIST mmv_1.01b-15.diff.gz 10613 SHA256 9ad3e3d47510f816b4a18bae04ea75913588eec92248182f85dd09bc5ad2df13 SHA512 965db30f8981a973c93dec14348c451604fe37fbd5576d5eb0e38de8cef21e5b6c9a3560e46725b6beaac2d9722cb9a874f7eb2b5e9d9cdf22e67eb367991550 WHIRLPOOL 4374d053e65c05747509b4a3759b3330e45504b8325ae60f6e70ed67317e5a6383adf334f73e05f2a1ef89b884452169e5a437d583ef402bb4001ee544034210
DIST mmv_1.01b-18.debian.tar.gz 13463 SHA256 4af5c83cacb27c7720bf65cac9a4f6c1fe698474a716e2df0fbad9181e6844e7 SHA512 3543aff53c67cab00689d4c8b778447c976a7860a569bd51f74534bec8bd3b67b9e12743bd03bc6fda930748abddd12e16f1965686cbce04bd48bf191fc4127b WHIRLPOOL 57dd2ebb1d075f9479d0466cc39f4cf3ebe3e8457b96a56a0f5d1b63c6ada01ec281fcf5e79220e07256aa1edfb046d8ddf75df8ab6c1ac25ff67074c0760ed2
DIST mmv_1.01b.orig.tar.gz 25656 SHA256 0399c027ea1e51fd607266c1e33573866d4db89f64a74be8b4a1d2d1ff1fdeef SHA512 4bf4e096b930bdde225ba5de761e968af3aed33dc13194b1a1a79078cd27e158b04aae131b5167cf5f844e35355d67359443cd598db22da15a5af06752438917 WHIRLPOOL 318484c12416174535ba6e77929798418943ae521e339a7f68b1b7a488b4058cbe88de019e07b705879597ef04d6c325c15d2869b224827dca6d9519c8772aa5
diff --git a/app-misc/mmv/mmv-1.01b_p15.ebuild b/app-misc/mmv/mmv-1.01b_p15.ebuild
deleted file mode 100644
index ec7fa57ddfe9..000000000000
--- a/app-misc/mmv/mmv-1.01b_p15.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DEB_PATCH_VER=${PV#*_p}
-MY_VER=${PV%_p*}
-
-DESCRIPTION="Move/copy/append/link multiple files according to a set of wildcard patterns"
-HOMEPAGE="http://packages.debian.org/unstable/utils/mmv"
-SRC_URI="
- mirror://debian/pool/main/m/mmv/${PN}_${MY_VER}.orig.tar.gz
- mirror://debian/pool/main/m/mmv/${PN}_${MY_VER}-${DEB_PATCH_VER}.diff.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-S="${WORKDIR}"/${PN}-${MY_VER}.orig
-
-src_prepare() {
- epatch "${DISTDIR}"/${PN}_${MY_VER}-${DEB_PATCH_VER}.diff.gz
-}
-
-src_compile() {
- # i wonder how this works on other platforms if CFLAGS from makefile are
- # overridden, see bug #218082
- [[ ${CHOST} == *-interix* ]] && append-flags -DIS_SYSV -DHAS_RENAME -DHAS_DIRENT
- [[ ${CHOST} == *-interix* ]] || append-lfs-flags
-
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
-}
-
-src_install() {
- dobin mmv || die
- dosym mmv /usr/bin/mcp || die
- dosym mmv /usr/bin/mln || die
- dosym mmv /usr/bin/mad || die
-
- doman mmv.1 || die
- newman mmv.1 mcp.1 || die
- newman mmv.1 mln.1 || die
- newman mmv.1 mad.1 || die
-
- dodoc ANNOUNCE debian/{changelog,control} || die
-}
diff --git a/app-text/talkfilters/talkfilters-2.3.8.ebuild b/app-text/talkfilters/talkfilters-2.3.8.ebuild
deleted file mode 100644
index 31e67a02e1c1..000000000000
--- a/app-text/talkfilters/talkfilters-2.3.8.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="Convert ordinary English text into text that mimics a stereotyped or otherwise humorous dialect"
-HOMEPAGE="http://www.hyperrealm.com/talkfilters/talkfilters.html"
-SRC_URI="http://www.hyperrealm.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ~mips ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
- dodoc AUTHORS ChangeLog README || die
-}
diff --git a/dev-libs/libexplain/Manifest b/dev-libs/libexplain/Manifest
index 844d82d604c3..e78ffb63e620 100644
--- a/dev-libs/libexplain/Manifest
+++ b/dev-libs/libexplain/Manifest
@@ -1,2 +1 @@
-DIST libexplain-1.3.tar.gz 4742321 SHA256 18b76bd95f9476edc627ae3a3414e364e14c7f461df0c7925919fc9bddce643a SHA512 2af805f8f51912ad2d74326df3b6e7f5423a9af68a930c8f765eb839d2348a4c8e176c81eb6c953795764d08faff97d71132e68fcfcf09242575b0eab7b53120 WHIRLPOOL 83258f5432b0eb374c808e8696c99d8b6798dc87887f18582d57d23668d976e81c2e9d0212852153b00a59ca71f3f63b8ddd110759a3e34a79868d97a98aa20a
DIST libexplain-1.4.tar.gz 4770006 SHA256 28863b65eccc74934e237cac41364cb3c1802c36c9e2318ed0417460fee83f80 SHA512 c236732f57d0688fed173c27474a00a39c9ac6d5dfbd22f3b68b5d0fff7a70fb130bcedbeb174767f4fd2c012148025e92635cc8df2b958774a3cfba58e6ff2c WHIRLPOOL ce3131c68d57c3d867960eaf2451d5aed152276c85e0182fee70b6499ebbee29ae0fea6d1a84aaefa927c9b983677953003b1a253e54ab3fc516d2b70dc3a3c1
diff --git a/dev-libs/libexplain/libexplain-1.3.ebuild b/dev-libs/libexplain/libexplain-1.3.ebuild
deleted file mode 100644
index 3dbe8fd2aab3..000000000000
--- a/dev-libs/libexplain/libexplain-1.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils
-
-DESCRIPTION="Library which may be used to explain Unix and Linux system call errors"
-HOMEPAGE="http://libexplain.sourceforge.net/"
-SRC_URI="http://libexplain.sourceforge.net/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-3 LGPL-3"
-IUSE="doc static-libs"
-
-RDEPEND="
- sys-libs/libcap
- >=sys-libs/glibc-2.11
- sys-process/lsof"
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-2.6.35
- app-text/ghostscript-gpl
- sys-apps/groff
-"
-
-DOCS=( README )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.45-configure.patch
-)
-
-src_prepare() {
- # Portage incompatible test
- sed \
- -e '/t0524a/d' \
- -e '/t0363a/d' \
- -i Makefile.in || die
-
- cp "${S}"/etc/configure.ac "${S}" || die
-
- autotools-utils_src_prepare
-}
-
-src_compile() {
- autotools-utils_src_compile
- use doc && autotools-utils_src_compile all-doc
-}
diff --git a/dev-python/doctest-ignore-unicode/Manifest b/dev-python/doctest-ignore-unicode/Manifest
new file mode 100644
index 000000000000..bf20ae21895d
--- /dev/null
+++ b/dev-python/doctest-ignore-unicode/Manifest
@@ -0,0 +1 @@
+DIST doctest-ignore-unicode-0.1.2.tar.gz 2270 SHA256 fc90b2d0846477285c6b67fc4cb4d6f39fcf76d8752f4df0a241486f31512ad5 SHA512 ac88d1cc90b1db21b21b121cddde246314d8a3e399ea0e96f1cd4f7812949cebdd0850566a90d47da01ea159bb8d69c8a73ee05c62cc40d0839d4701f2f330d3 WHIRLPOOL 5769ff459cee4b55d325061158b4b7726c15489bd3acd45ef6028cf10748c2e0f70ebe4f5a99c59a17cbd800a4edf927eec924ed73297bab0b1c5a6edceeb0ea
diff --git a/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild b/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
new file mode 100644
index 000000000000..0231f0b0f3fa
--- /dev/null
+++ b/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Add flag to ignore unicode literal prefixes in doctests"
+HOMEPAGE="https://pypi.python.org/pypi/doctest-ignore-unicode http://github.com/gnublade/doctest-ignore-unicode"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+ dev-python/nose[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ "
diff --git a/dev-python/doctest-ignore-unicode/metadata.xml b/dev-python/doctest-ignore-unicode/metadata.xml
new file mode 100644
index 000000000000..9ff7a6400d92
--- /dev/null
+++ b/dev-python/doctest-ignore-unicode/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+ python
+
+ jlec@gentoo.org
+ Justin Lecher
+
+
+ pxml
+ metagriffin/pxml
+
+
diff --git a/dev-python/networkx/networkx-1.10.ebuild b/dev-python/networkx/networkx-1.10.ebuild
index 95ff6a288d1d..23f88cc5a385 100644
--- a/dev-python/networkx/networkx-1.10.ebuild
+++ b/dev-python/networkx/networkx-1.10.ebuild
@@ -17,7 +17,8 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc examples test"
-COMMON_DEPEND="dev-python/matplotlib[${PYTHON_USEDEP}]
+COMMON_DEPEND="
+ dev-python/matplotlib[${PYTHON_USEDEP}]
sci-libs/scipy[${PYTHON_USEDEP}]"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
@@ -36,7 +37,7 @@ RDEPEND="
>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
examples? (
${COMMON_DEPEND}
- $(python_gen_cond_dep 'dev-python/pygraphviz[${PYTHON_USEDEP}]' python2_7)
+ dev-python/pygraphviz[${PYTHON_USEDEP}]
dev-python/pyparsing[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
)"
diff --git a/dev-python/pygraphviz/Manifest b/dev-python/pygraphviz/Manifest
index 68e8904f10fa..bece6bf1af78 100644
--- a/dev-python/pygraphviz/Manifest
+++ b/dev-python/pygraphviz/Manifest
@@ -1 +1,2 @@
DIST pygraphviz-1.2.tar.gz 90913 SHA256 2e8a82a07dcf006b9558d22c5a6357c012193d4cc681776845e515fffeccc6b3 SHA512 e477af635594c3ba1aa6fa499bc5e60df14e76616a1a777f648e2e96d3953dd3d0b3bae4a92275dac2f7466276cf526ecb8b6a63fd3fbad26ee24b67d76ecfa3 WHIRLPOOL 2757d02b130f326ee2638b78761094de1a841293b6de1d5ea2c89c169cbc8525041e06daef9ded32d7c1ac944ef99293ab67fee6c75a2976283f87725635a4d5
+DIST pygraphviz-1.3.1.tar.gz 103336 SHA256 7c294cbc9d88946be671cc0d8602aac176d8c56695c0a7d871eadea75a958408 SHA512 e1957d7daf7ae9e60873cb6f23ac19a3320b4b10579ab24a2307beb558dad11a8e82e1da528799165b761d944efb4860b7296e3218846f7885f715c396a8e3dc WHIRLPOOL dd4ac48c4e4c05a134a6ba076979f9dc1ea7fab03700208aedf9cd6acf3fb5595a26b3a0f1de8d46a61750dea60a6e31f180719cb51b1e916ecc677dde61a618
diff --git a/dev-python/pygraphviz/files/pygraphviz-1.3.1-docs.patch b/dev-python/pygraphviz/files/pygraphviz-1.3.1-docs.patch
new file mode 100644
index 000000000000..aed5c9075b88
--- /dev/null
+++ b/dev-python/pygraphviz/files/pygraphviz-1.3.1-docs.patch
@@ -0,0 +1,29 @@
+ setup.py | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index fc0a96f..98b7f58 100644
+--- a/setup.py
++++ b/setup.py
+@@ -36,13 +36,6 @@ release.write_versionfile()
+ sys.path.pop(0)
+
+ packages = ["pygraphviz", "pygraphviz.tests"]
+-docdirbase = 'share/doc/pygraphviz-%s' % release.version
+-data = [
+- (docdirbase, glob("*.txt")),
+- (os.path.join(docdirbase, 'examples'), glob("examples/*.py")),
+- (os.path.join(docdirbase, 'examples'), glob("examples/*.dat")),
+- (os.path.join(docdirbase, 'examples'), glob("examples/*.dat.gz")),
+-]
+ package_data = {'': ['*.txt'], }
+
+ if __name__ == "__main__":
+@@ -75,7 +68,6 @@ if __name__ == "__main__":
+ download_url=release.download_url,
+ classifiers=release.classifiers,
+ packages=packages,
+- data_files=data,
+ ext_modules=extension,
+ cmdclass={
+ 'install': AddExtensionInstallCommand,
diff --git a/dev-python/pygraphviz/files/pygraphviz-1.3.1-swig-3.patch b/dev-python/pygraphviz/files/pygraphviz-1.3.1-swig-3.patch
new file mode 100644
index 000000000000..912667e7f5a7
--- /dev/null
+++ b/dev-python/pygraphviz/files/pygraphviz-1.3.1-swig-3.patch
@@ -0,0 +1,23 @@
+ pygraphviz/graphviz.i | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/pygraphviz/graphviz.i b/pygraphviz/graphviz.i
+index 0d9b43b..5f1f6b0 100644
+--- a/pygraphviz/graphviz.i
++++ b/pygraphviz/graphviz.i
+@@ -1,9 +1,9 @@
+-# Copyright (C) 2004-2006 by
+-# Aric Hagberg
+-# Dan Schult
+-# Manos Renieris, http://www.cs.brown.edu/~er/
+-# Distributed with BSD license.
+-# All rights reserved, see LICENSE for details.
++// Copyright (C) 2004-2006 by
++// Aric Hagberg
++// Dan Schult
++// Manos Renieris, http://www.cs.brown.edu/~er/
++// Distributed with BSD license.
++// All rights reserved, see LICENSE for details.
+
+ %module graphviz
+
diff --git a/dev-python/pygraphviz/pygraphviz-1.3.1.ebuild b/dev-python/pygraphviz/pygraphviz-1.3.1.ebuild
new file mode 100644
index 000000000000..376cf2d9dad7
--- /dev/null
+++ b/dev-python/pygraphviz/pygraphviz-1.3.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for the Graphviz Agraph data structure"
+HOMEPAGE="http://networkx.lanl.gov/pygraphviz/ https://pypi.python.org/pypi/pygraphviz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="examples test"
+
+# Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
+RDEPEND="media-gfx/graphviz"
+DEPEND="${RDEPEND}
+ dev-lang/swig:0
+ test? (
+ dev-python/doctest-ignore-unicode[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-docs.patch
+ "${FILESDIR}"/${P}-swig-3.patch
+)
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+ swig -python pygraphviz/graphviz.i || die
+}
+
+python_test() {
+ PYTHONPATH=${PYTHONPATH}:${BUILD_DIR}/lib/pygraphviz \
+ nosetests -c setup.cfg -x -v || die
+}
+
+python_install_all() {
+ use examples && local EXAMPLES=( examples/. )
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-util/shellcheck/Manifest b/dev-util/shellcheck/Manifest
index 20410cfba156..8444267ad6ba 100644
--- a/dev-util/shellcheck/Manifest
+++ b/dev-util/shellcheck/Manifest
@@ -2,4 +2,5 @@ DIST ShellCheck-0.3.5.tar.gz 77173 SHA256 9289fda0b3683f4e7c2c003f875a9e30889736
DIST ShellCheck-0.3.6.tar.gz 82760 SHA256 f19f950b39eba78334cfd044077ce3686fb6defe2c6e593c0def949aa089230c SHA512 53e36770eabb49f2e0e84a508b69805799451ecc3bc6b2013e68b5f701d021d552706dcc027089c92355e833059ce856ae193f320f9dad0d3c60c4c5d9516219 WHIRLPOOL 5e8e50c6fd2a0036c24994029ad2e3f5d08afee888606c5205b10bc93c6882308dbe14c3b050c3edeab6e6554f8f20d312b147f9a52575f0491a36e0e7a7411b
DIST ShellCheck-0.3.7.tar.gz 84069 SHA256 417c90eb4e84da67b66f444ae56eab6c6674f80964a9172e4c494e7ad17b97d7 SHA512 a6835c96bbd81e5dbd84347a264b1492fbd8e4c18ca1c97a7f5d94f18d305abc45c8f994e431672d852db20054ac231511d76c0be451613629420bdc4fb9e286 WHIRLPOOL 75a67c8e388920717fa3567f65261c2242bb415e735181f16ad7068a71713fbef246ef2355887a4ef6f57b68326b269f724b97a874b26e018acd2ac3b52d5401
DIST ShellCheck-0.3.8.tar.gz 86202 SHA256 c185b77166724c06531b3e07b7a8353c0451809a1f60e9f6756d29247853651a SHA512 d131225a9854e7a7d8de030a7267cd21c15a048c75c5fb14edca2aae957d019eb3cf0bbee0ed27ea2449928c0ee64b39e61924501a0243cfac3b20239b62d148 WHIRLPOOL 808718f336be4c16dad9112bba37fb658bb46f06a9af24bfe9e0b1888a24a2936684d7ebba8d0469cc14d8a64ae267bb7380e4ebae6fee0db2f784364a6c8acd
+DIST ShellCheck-0.4.1.tar.gz 94751 SHA256 531af7608dea3f84b14a0d795fb9322c89850235992584d4b7a7b73dc47a3905 SHA512 ebf0b6bc4900a4881de9394a51367eb5639e909e68801885cfa545a26ebdb4c2d6b86d826b9d81306894315a148a0552769b4fb157feae24af9b7040f0e07a57 WHIRLPOOL 66f6b57b277552e7707d891275f61a40015c8abb501187788b8406bf20e51b1ace134c7fbcd6a7d40935651ba8b4969813cac367db7aba2272c8acd1a6452cd7
DIST shellcheck-man-0.3.5.tar.xz 1876 SHA256 5b3f940fd8760676c40787b25b7c950a5ae7fa25e882dea6b11dfeabb1b712ee SHA512 974b7bae0a927151819a14eef2be40d76c2eb50fadfd966bef79908b7faab958ecd42a1584cbe1fb25e2e59f1593d89b8632684d655490c83e246502d9680d26 WHIRLPOOL 622968777ce5387abe6e5f068bff5eb9879d8a990d7680fe2acba1ee89114ec5aca3cf402e579222af2941b0d99b1df95415ad17e9ef973a7b7e74fcd6acbee5
diff --git a/dev-util/shellcheck/shellcheck-0.4.1.ebuild b/dev-util/shellcheck/shellcheck-0.4.1.ebuild
new file mode 100644
index 000000000000..75cfb2afc716
--- /dev/null
+++ b/dev-util/shellcheck/shellcheck-0.4.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+
+inherit haskell-cabal
+
+MY_PN="ShellCheck"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Shell script analysis tool"
+HOMEPAGE="http://www.shellcheck.net/"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-haskell/json:=[profile?]
+ dev-haskell/mtl:=[profile?]
+ dev-haskell/parsec:=[profile?]
+ >=dev-haskell/quickcheck-2.7.4:2=[profile?]
+ dev-haskell/regex-tdfa:=[profile?]
+ dev-haskell/transformers:=[profile?]
+ >=dev-lang/ghc-7.8.4:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.8
+ test? ( >=dev-haskell/cabal-1.20 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_test() {
+ # See bug #537500 for this beauty.
+ runghc Setup.hs test || die 'test suite failed'
+}
+
+src_install() {
+ cabal_src_install
+ doman "${PN}.1"
+}
diff --git a/media-gfx/openscad/openscad-2015.03.ebuild b/media-gfx/openscad/openscad-2015.03.ebuild
index 994c013c07d5..3248a7800708 100644
--- a/media-gfx/openscad/openscad-2015.03.ebuild
+++ b/media-gfx/openscad/openscad-2015.03.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -31,7 +31,7 @@ RDEPEND="${CDEPEND}"
src_prepare() {
#Use our CFLAGS (specifically don't force x86)
- sed -i "s/QMAKE_CXXFLAGS_RELEASE = .*//g" ${PN}.pro
+ sed -i "s/QMAKE_CXXFLAGS_RELEASE = .*//g" ${PN}.pro || die
- sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro
+ sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index ba96abb24274..1639e4401d13 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 07 Sep 2015 06:41:15 +0000
+Mon, 07 Sep 2015 08:41:16 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index ba96abb24274..1639e4401d13 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 07 Sep 2015 06:41:15 +0000
+Mon, 07 Sep 2015 08:41:16 +0000
diff --git a/metadata/md5-cache/app-misc/jot-9.0 b/metadata/md5-cache/app-misc/jot-9.0
deleted file mode 100644
index f3a70a8cba87..000000000000
--- a/metadata/md5-cache/app-misc/jot-9.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=>=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=Print out increasing, decreasing, random, or redundant data
-HOMEPAGE=http://freshmeat.net/projects/bsd-jot/
-KEYWORDS=amd64 ppc x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://www.mit.edu/afs/athena/system/rhlinux/athena-9.0/free/SRPMS/athena-jot-9.0-3.src.rpm
-_eclasses_=eutils 351a78113be5b393c09a2c948701ad36 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 rpm 514a1840ee796656311a029ea952faa9 toolchain-funcs 4b8d3388c0a6e798504e20ba30b49361
-_md5_=a41fbc7b3f5040840b2954a22ddffc4c
diff --git a/metadata/md5-cache/app-misc/mmv-1.01b_p15 b/metadata/md5-cache/app-misc/mmv-1.01b_p15
deleted file mode 100644
index e409af6da358..000000000000
--- a/metadata/md5-cache/app-misc/mmv-1.01b_p15
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Move/copy/append/link multiple files according to a set of wildcard patterns
-EAPI=3
-HOMEPAGE=http://packages.debian.org/unstable/utils/mmv
-KEYWORDS=~alpha amd64 ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=LGPL-2
-SLOT=0
-SRC_URI=mirror://debian/pool/main/m/mmv/mmv_1.01b.orig.tar.gz mirror://debian/pool/main/m/mmv/mmv_1.01b-15.diff.gz
-_eclasses_=eutils 351a78113be5b393c09a2c948701ad36 flag-o-matic 85dc1eac3c64d8141374490ed64122e5 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 4b8d3388c0a6e798504e20ba30b49361
-_md5_=9ee1b097a8f7bc91d347fe5aef943f57
diff --git a/metadata/md5-cache/app-text/talkfilters-2.3.8 b/metadata/md5-cache/app-text/talkfilters-2.3.8
deleted file mode 100644
index 27d8b53235bd..000000000000
--- a/metadata/md5-cache/app-text/talkfilters-2.3.8
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Convert ordinary English text into text that mimics a stereotyped or otherwise humorous dialect
-HOMEPAGE=http://www.hyperrealm.com/talkfilters/talkfilters.html
-KEYWORDS=amd64 hppa ~mips ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.hyperrealm.com/talkfilters/talkfilters-2.3.8.tar.gz
-_md5_=aa87014b09c752cf55ea5e2c312a363d
diff --git a/metadata/md5-cache/dev-libs/libexplain-1.3 b/metadata/md5-cache/dev-libs/libexplain-1.3
deleted file mode 100644
index adb3c34f37bc..000000000000
--- a/metadata/md5-cache/dev-libs/libexplain-1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/libcap >=sys-libs/glibc-2.11 sys-process/lsof >=sys-kernel/linux-headers-2.6.35 app-text/ghostscript-gpl sys-apps/groff !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Library which may be used to explain Unix and Linux system call errors
-EAPI=5
-HOMEPAGE=http://libexplain.sourceforge.net/
-IUSE=doc static-libs
-KEYWORDS=amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3 LGPL-3
-RDEPEND=sys-libs/libcap >=sys-libs/glibc-2.11 sys-process/lsof
-SLOT=0
-SRC_URI=http://libexplain.sourceforge.net/libexplain-1.3.tar.gz
-_eclasses_=autotools 7feb275d850f45095537e76c5aa80494 autotools-utils 0bf099a6e3dfeaf20a7a94504d8dd896 eutils 351a78113be5b393c09a2c948701ad36 libtool 7f78cd7d403808a350c9ae23f5821fb4 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 4b8d3388c0a6e798504e20ba30b49361
-_md5_=7bc4dd33ae3dc7d37e22a1a3c47dc638
diff --git a/metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2 b/metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2
new file mode 100644
index 000000000000..6ac8ae135360
--- /dev/null
+++ b/metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
+DESCRIPTION=Add flag to ignore unicode literal prefixes in doctests
+EAPI=5
+HOMEPAGE=https://pypi.python.org/pypi/doctest-ignore-unicode http://github.com/gnublade/doctest-ignore-unicode
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3 )
+SLOT=0
+SRC_URI=mirror://pypi/d/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.tar.gz
+_eclasses_=distutils-r1 1375d7df3597739c70e997d7508c6f79 eutils 351a78113be5b393c09a2c948701ad36 multibuild ce2c2ede0c914b77f5dfc4e2ff2d0249 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 multiprocessing d769539d9bace6eaca30af23bc2b4dde python-r1 32b376cbb100a3a8083b3a0de023e117 python-utils-r1 39c6b012a0512678e698e712b5b7ecc2 toolchain-funcs 4b8d3388c0a6e798504e20ba30b49361
+_md5_=645c5d034222d1630924f710370e581a
diff --git a/metadata/md5-cache/dev-python/networkx-1.10 b/metadata/md5-cache/dev-python/networkx-1.10
index e88be3f3d2b1..b4f90c7fb8d0 100644
--- a/metadata/md5-cache/dev-python/networkx-1.10
+++ b/metadata/md5-cache/dev-python/networkx-1.10
@@ -6,9 +6,9 @@ HOMEPAGE=http://networkx.github.io/ https://github.com/networkx/networkx
IUSE=doc examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=BSD
-RDEPEND=>=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] examples? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( dev-python/pygraphviz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+RDEPEND=>=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] examples? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pygraphviz[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
SLOT=0
SRC_URI=mirror://pypi/n/networkx/networkx-1.10.tar.gz
_eclasses_=distutils-r1 1375d7df3597739c70e997d7508c6f79 eutils 351a78113be5b393c09a2c948701ad36 multibuild ce2c2ede0c914b77f5dfc4e2ff2d0249 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 multiprocessing d769539d9bace6eaca30af23bc2b4dde python-r1 32b376cbb100a3a8083b3a0de023e117 python-utils-r1 39c6b012a0512678e698e712b5b7ecc2 toolchain-funcs 4b8d3388c0a6e798504e20ba30b49361
-_md5_=cd4f59cb428477c9a8d3b242f1f375ce
+_md5_=d5d463f98d96537ae331b4c300d5014d
diff --git a/metadata/md5-cache/dev-python/pygraphviz-1.3.1 b/metadata/md5-cache/dev-python/pygraphviz-1.3.1
new file mode 100644
index 000000000000..86dcfb6cd850
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pygraphviz-1.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-gfx/graphviz dev-lang/swig:0 test? ( dev-python/doctest-ignore-unicode[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Python wrapper for the Graphviz Agraph data structure
+EAPI=5
+HOMEPAGE=http://networkx.lanl.gov/pygraphviz/ https://pypi.python.org/pypi/pygraphviz
+IUSE=examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=media-gfx/graphviz python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pygraphviz/pygraphviz-1.3.1.tar.gz
+_eclasses_=distutils-r1 1375d7df3597739c70e997d7508c6f79 eutils 351a78113be5b393c09a2c948701ad36 multibuild ce2c2ede0c914b77f5dfc4e2ff2d0249 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 multiprocessing d769539d9bace6eaca30af23bc2b4dde python-r1 32b376cbb100a3a8083b3a0de023e117 python-utils-r1 39c6b012a0512678e698e712b5b7ecc2 toolchain-funcs 4b8d3388c0a6e798504e20ba30b49361
+_md5_=da1478bbdd8fabab71431977d8b1faf1
diff --git a/metadata/md5-cache/dev-util/shellcheck-0.4.1 b/metadata/md5-cache/dev-util/shellcheck-0.4.1
new file mode 100644
index 000000000000..07246d53a371
--- /dev/null
+++ b/metadata/md5-cache/dev-util/shellcheck-0.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/json:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/quickcheck-2.7.4:2=[profile?] dev-haskell/regex-tdfa:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.8.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/cabal-1.20 ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Shell script analysis tool
+EAPI=5
+HOMEPAGE=http://www.shellcheck.net/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-haskell/json:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/quickcheck-2.7.4:2=[profile?] dev-haskell/regex-tdfa:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.8.4:=
+SLOT=0/0.4.1
+SRC_URI=mirror://hackage/packages/archive/ShellCheck/0.4.1/ShellCheck-0.4.1.tar.gz
+_eclasses_=eutils 351a78113be5b393c09a2c948701ad36 ghc-package 6165faf4ae46df43d5a9b0dd28ec8654 haskell-cabal 844d30b2063d113d41e54823109e4325 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 multiprocessing d769539d9bace6eaca30af23bc2b4dde toolchain-funcs 4b8d3388c0a6e798504e20ba30b49361 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=715464c61511924bb77e7603a5f8e511
diff --git a/metadata/md5-cache/media-gfx/openscad-2015.03 b/metadata/md5-cache/media-gfx/openscad-2015.03
index 62c11c757a86..daa470672938 100644
--- a/metadata/md5-cache/media-gfx/openscad-2015.03
+++ b/metadata/md5-cache/media-gfx/openscad-2015.03
@@ -9,4 +9,4 @@ RDEPEND=media-gfx/opencsg sci-mathematics/cgal dev-qt/qtcore:4 dev-qt/qtgui:4 de
SLOT=0
SRC_URI=http://files.openscad.org/openscad-2015.03.src.tar.gz
_eclasses_=base 84d9f879f57a8316ff02be0373a3d6f9 eutils 351a78113be5b393c09a2c948701ad36 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 qmake-utils 05b63bb5c708c5903a9de5c58c8e43c8 qt4-r2 cb2cb5856695b300266b425da70e82d8 toolchain-funcs 4b8d3388c0a6e798504e20ba30b49361
-_md5_=eba76aaca9bad2dc9fbcf6ee542d1b8c
+_md5_=afb3b6498a3dd022c5582b499865b050
diff --git a/metadata/md5-cache/sys-apps/dmidecode-3.0 b/metadata/md5-cache/sys-apps/dmidecode-3.0
new file mode 100644
index 000000000000..70095378acae
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/dmidecode-3.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile postinst prepare
+DESCRIPTION=DMI (Desktop Management Interface) table related utilities
+EAPI=4
+HOMEPAGE=http://www.nongnu.org/dmidecode/
+IUSE=selinux
+KEYWORDS=-* ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=selinux? ( sec-policy/selinux-dmidecode )
+SLOT=0
+SRC_URI=http://savannah.nongnu.org/download/dmidecode/dmidecode-3.0.tar.xz
+_eclasses_=eutils 351a78113be5b393c09a2c948701ad36 flag-o-matic 85dc1eac3c64d8141374490ed64122e5 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 4b8d3388c0a6e798504e20ba30b49361
+_md5_=6edf12444624132e6046581593d29421
diff --git a/metadata/md5-cache/sys-fs/xfsprogs-3.2.2 b/metadata/md5-cache/sys-fs/xfsprogs-3.2.2
deleted file mode 100644
index 7b4d3ee538a5..000000000000
--- a/metadata/md5-cache/sys-fs/xfsprogs-3.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=!static? ( >=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !=sys-apps/util-linux-2.17.2[static-libs(+)] readline? ( sys-libs/readline[static-libs(+)] ) !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) ) readline? ( sys-libs/ncurses[static-libs] ) ) nls? ( sys-devel/gettext )
-DESCRIPTION=xfs filesystem utilities
-EAPI=4
-HOMEPAGE=http://oss.sgi.com/projects/xfs/
-IUSE=libedit nls readline static static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=!static? ( >=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !=sys-apps/util-linux-2.17.2[static-libs(+)]
- readline? ( sys-libs/readline[static-libs(+)] )
- !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- !=xfsprogs-3.2.0
- emake -j1 DIST_ROOT="${ED}" install-{dev,qa}
-
- # handle is for xfsdump, the rest for xfsprogs
- gen_usr_ldscript -a xfs xlog
- # removing unnecessary .la files if not needed
- use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/sys-fs/xfsprogs/xfsprogs-3.2.3.ebuild b/sys-fs/xfsprogs/xfsprogs-4.2.0.ebuild
similarity index 92%
rename from sys-fs/xfsprogs/xfsprogs-3.2.3.ebuild
rename to sys-fs/xfsprogs/xfsprogs-4.2.0.ebuild
index 463f6d33a8f4..bb4bae0aa1e6 100644
--- a/sys-fs/xfsprogs/xfsprogs-3.2.3.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-4.2.0.ebuild
@@ -37,7 +37,7 @@ pkg_setup() {
}
src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.2.2-sharedlibs.patch
+ epatch "${FILESDIR}"/${PN}-4.2.0-sharedlibs.patch
sed -i \
-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
@@ -87,9 +87,7 @@ src_configure() {
}
src_install() {
- emake DIST_ROOT="${ED}" install
- # parallel install fails on these targets for >=xfsprogs-3.2.0
- emake -j1 DIST_ROOT="${ED}" install-{dev,qa}
+ emake DIST_ROOT="${ED}" install{,-dev}
# handle is for xfsdump, the rest for xfsprogs
gen_usr_ldscript -a xfs xlog