Sync with portage [Wed Feb 8 09:21:42 MSK 2017].

app-admin/grubconfig/grubconfig-1.28-r1.ebuild

@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit multilib
-
-DESCRIPTION="Simple Tool to configure Grub-Bootloader"
-HOMEPAGE="https://web.archive.org/web/20100410042718/http://www.tux.org/pub/people/kent-robotti/looplinux"
-SRC_URI="http://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-DEPEND=">=dev-util/dialog-0.7"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e "s:/usr/lib/grub:/$(get_libdir)/grub:g" \
-		grubconfig || die
-}
-
-src_install() {
-	dosbin grubconfig || die
-	dodoc README
-}

app-admin/mktwpol/Manifest

@@ -1,2 +1,2 @@
-DIST mktwpol-0.2.4.tar.gz 53431 SHA256 b484f52f1b11834914e7c187f8a0778dad59bb90b5652005a565ed0ffb1c9d77 SHA512 b8fcb8c18e1aa44f0e1198e1f4f5a7a1cfc8705d169e6fccbc7c40f6bf87552be7ae35c03073fb7b64d859835843721a2639c8fbd0af4d067c2f472903fed124 WHIRLPOOL c2cd1b238fa237242057896e3fbc587ce5d6836cb9f44bb998ca6da229f868fd1eb00485747043f315756e16a2c36c0960b11df22fe6543e69e25c376bfe2a87
 DIST mktwpol-0.2.5.tar.gz 54627 SHA256 3d1a06fedd2ff7fc02180ea12bdda64f2d9b952bdeeef77408dcdc17fc4f57cb SHA512 2c9a6b6573b7922f63e992f107fb95251f35bacd38a7ceccffb438be257c2a577e0ed34bb21f063d263f31d7725360db7df5e0235331d3a465304447e35f2fab WHIRLPOOL a5a64326900686e9d7d3d2a1c2b0baed9dbfe2ec35cba020d17193d83ce958b0c7964b317268f71af428ab967309710bf232b4cb2aa23cc67b276e2b49e1ebf7
+DIST mktwpol-0.2.6.tar.gz 55328 SHA256 e1adfe151d4bf98eb28d4f4c6cd9303ec9e2cf3a8c5efc3f4fa9fc38a2ac62b7 SHA512 58d739bf789f7e25678adb19cc2d05bf98920d4f42a761f2c1fc45c72ac9080def9f2533f63c10dfea50f5d8428f7d4a19760a38dcc34bff9aaeb6fdd7e89434 WHIRLPOOL 33170e4fa54e99644a32977637fd2d47ee6739150cd70a2e381cb2ecba89b2fe20bcf6b8566f607a2dc45d725feb0ec7db63beb13903373461feefb158f9bcde

app-admin/mktwpol/mktwpol-0.2.4.ebuild → app-admin/mktwpol/mktwpol-0.2.6.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 DESCRIPTION="Bash scripts to install tripwire and generate tripwire policy files"
 HOMEPAGE="https://sourceforge.net/projects/mktwpol"
@@ -10,19 +10,16 @@ SRC_URI="mirror://sourceforge/mktwpol/${P}.tar.gz"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="app-admin/tripwire"
 
 src_prepare() {
+	default
 	sed -i -e 's|/usr/local|/usr|' Makefile || die
 }
 
-src_install() {
-	emake DESTDIR="${D}" install
-}
-
 pkg_postinst() {
 	elog
 	elog "Installation and setup of tripwire ..."

app-arch/dpkg/Manifest

@@ -1,4 +1,3 @@
 DIST dpkg_1.17.26.tar.xz 4410860 SHA256 aa4e758752cdfd7ecb118d7a7d31139a0c090c92aa494aa2e46603006deb1ec8 SHA512 4d2f2a7691dd34d47b62ec1f602d9bab612b151f05362607ec8e31037c4ba0baf5d609c46352240e9806e5781db8df9781e8a0ee9fd24faf54f8b43244a7e538 WHIRLPOOL 56decf0774f2d4405fb0934415c50749230c06fe9112e0ebb4458a8917538c83644eadb885d24350bbf713a6250dd5687956b70d47e22c06cf39ff87cb2d5a23
-DIST dpkg_1.17.27.tar.xz 4413092 SHA256 90749c31b9f1fceb46dd9fab5b50de34272efef333cc16d9e144f514fd944bb6 SHA512 6f0229bf6c6b76be22d0baf4af21b1175b5397c4a84eb47f0d02bb93173207cc087015a53a2ed9feb7195d313d447d71a0d7361eb1238377c38f8be4465f8bbd WHIRLPOOL cc8525d391bbb42e399e4a1ecb526db1071122272f7eb1b23bdbbad361dfa0f7af8f1fac867f5fb2028d74171ecd3b175b813b2370b2982b17c1d05b39921455
-DIST dpkg_1.18.15.tar.xz 4494820 SHA256 aee936653b9c39403160c0a331ee7934563fbfa4e1f5adbc14a289c803cda371 SHA512 63b5853013868e89ab0d6c98d23fd704c189854bd08b771d10e8c906010421c58d23e79bc513d4034f90e6d91db04ff82c33312444f24392301802789684eb73 WHIRLPOOL fd74d3febcfa0a654267ba6dc68703e392d8c92ba633512a1cf4cea4e4438638eeb4104714be808c816f9f0904511bd7db1c260180c03b69c9bc0b9a514d2810
 DIST dpkg_1.18.18.tar.xz 4501988 SHA256 c88b61e3d4660500753142689e8ddbeff1c731f29549f3338e6975f655936ff5 SHA512 7682c8ac523ff710acd6742b9a884ed8ec8537e3b38496f871f112fdfd2f874af6d676cfef2d31d2474c5637df043838c814ef4038097b009cf06b3d4e66029c WHIRLPOOL aabdc0df8e07fc5190e3bfa3ee29537b655410f739f5c7930086aba8e30745aceccbe671963b045d74acb2ace704a846b650c83c8fb515abbbccf5d71d70dde8
+DIST dpkg_1.18.22.tar.xz 4520088 SHA256 eaf2ae88eae71f164167f75e9229af87fa9451bc58966fdec40db265b146ad69 SHA512 c4653b92d3b3ab3051e1cbe7abb757f75b8ab902a54dcd6e2379115d3f36ae7c5d6e0a00f34a3cec1a96484dc708197061824dd81e465d8627e726bfc48eb2b4 WHIRLPOOL e8478df090141a2cb0de745ee643c8f387a80aefe52d13d94e5c0385155a8efb1ae395ed2edbb6db09660b527232a7ca90e91adec433ca4f91af40cbfad7847d

app-arch/dpkg/dpkg-1.17.27.ebuild

@@ -1,98 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils multilib autotools toolchain-funcs
-
-DESCRIPTION="Package maintenance system for Debian"
-HOMEPAGE="http://packages.qa.debian.org/dpkg"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
-IUSE="+bzip2 +lzma nls selinux test unicode +update-alternatives +zlib"
-
-RDEPEND="
-	>=dev-lang/perl-5.6.0:=
-	dev-perl/TimeDate
-	>=sys-libs/ncurses-5.2-r7
-	bzip2? ( app-arch/bzip2 )
-	lzma? ( app-arch/xz-utils )
-	selinux? ( sys-libs/libselinux )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-"
-DEPEND="
-	${RDEPEND}
-	app-arch/xz-utils
-	sys-devel/flex
-	virtual/pkgconfig
-	nls? (
-		app-text/po4a
-		>=sys-devel/gettext-0.18.2
-	)
-	test? (
-		dev-perl/DateTime-Format-DateParse
-		dev-perl/IO-String
-		dev-perl/Test-Pod
-		virtual/perl-Test-Harness
-	)
-"
-
-DOCS=( ChangeLog THANKS TODO )
-
-src_prepare() {
-	# do not expect Debian's gzip --rsyncable extension
-	epatch "${FILESDIR}"/${PN}-1.17.0-gzip-rsyncable.patch
-
-	epatch "${FILESDIR}"/${PN}-1.17.1-flags.patch
-
-	# Force the use of the running bash for get-version (this file is never
-	# installed, so no need to worry about hardcoding a temporary bash)
-	sed -i -e '1c\#!'"${BASH}" get-version || die
-
-	if [[ ${CHOST} == mips64*-linux-gnu ]] ; then
-		# Debian targets use custom full tuples.  Map the default one
-		# based on the ABI we're using.
-		local abi
-		if [[ ${ABI} == "n64" ]] ; then
-			abi="mips64"
-		else
-			abi="mipsn32"
-		fi
-		printf "gnu-linux-mips64 ${abi}\ngnu-linux-mips64el ${abi}el\n" >> triplettable
-	fi
-
-	use nls && strip-linguas -i po
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	econf \
-		$(use_enable nls) \
-		$(use_enable unicode) \
-		$(use_enable update-alternatives) \
-		$(use_with bzip2 bz2) \
-		$(use_with lzma liblzma) \
-		$(use_with selinux) \
-		$(use_with zlib) \
-		--disable-compiler-warnings \
-		--disable-dselect \
-		--disable-silent-rules \
-		--disable-start-stop-daemon \
-		--localstatedir="${EPREFIX}"/var
-}
-
-src_compile() {
-	emake AR=$(tc-getAR)
-}
-
-src_install() {
-	default
-
-	keepdir /usr/$(get_libdir)/db/methods/{mnt,floppy,disk}
-	keepdir /usr/$(get_libdir)/db/{alternatives,info,methods,parts,updates}
-}

app-arch/dpkg/files/dpkg-1.18.9-strerror.patch

@@ -1,11 +0,0 @@
---- a/lib/dpkg/path-remove.c
-+++ b/lib/dpkg/path-remove.c
-@@ -28,6 +28,8 @@
- #include <errno.h>
- #include <unistd.h>
- 
-+#include <string.h> /* strerror() */
-+
- #include <dpkg/i18n.h>
- #include <dpkg/dpkg.h>
- #include <dpkg/path.h>

app-backup/backupninja/backupninja-1.0.1.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit autotools
 
@@ -16,13 +16,12 @@ SRC_URI="https://labs.riseup.net/code/attachments/download/${NODE_NUMBER}/${P}.t
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-DEPEND="dev-util/dialog"
-RDEPEND="${DEPEND}"
+RDEPEND="dev-util/dialog"
 
 DOCS=( AUTHORS FAQ TODO README NEWS )
 
 src_prepare() {
+	default
 	eautoreconf
 }

app-benchmarks/httperf/httperf-0.9.1_p20161228.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_COMMIT_HASH}.tar.gz -> ${P}
 
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~mips ~x86 ~amd64-linux ~x64-macos"
 IUSE="debug libressl idleconn"
 
 RDEPEND="!libressl? ( dev-libs/openssl:0= )

app-cdr/burncdda/burncdda-1.8.0.ebuild

@@ -1,7 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+EAPI=6
+
 DESCRIPTION="Console app for copying burning audio cds"
 HOMEPAGE="http://www.thenktor.homepage.t-online.de/burncdda"
 SRC_URI="http://www.thenktor.homepage.t-online.de/burncdda/download/${P}.tar.gz"
@@ -11,24 +13,28 @@ SLOT="0"
 KEYWORDS="~amd64 ppc ~sparc x86"
 IUSE="flac mp3 vorbis"
 
-DEPEND="dev-util/dialog
+RDEPEND="
 	app-cdr/cdrdao
+	dev-util/dialog
+	media-sound/normalize
+	media-sound/sox
 	virtual/cdrtools
-	mp3? ( media-sound/mpg123
-		media-sound/mp3_check )
-	vorbis? ( media-sound/vorbis-tools )
 	flac? ( media-libs/flac )
-	media-sound/normalize
-	media-sound/sox"
+	mp3? (
+		media-sound/mpg123
+		media-sound/mp3_check
+	)
+	vorbis? ( media-sound/vorbis-tools )
+"
 
 src_install() {
-	dobin ${PN} || die "dobin failed."
+	dobin ${PN}
 
 	insinto /usr/lib/${PN}
-	doins *.func || die "doins failed."
+	doins *.func
 
 	insinto /etc
-	doins ${PN}.conf || die "doins failed."
+	doins ${PN}.conf
 
 	dodoc CHANGELOG
 	doman burncdda.1.gz

app-crypt/acme/Manifest

@@ -1,2 +1,3 @@
 DIST certbot-0.10.1.tar.gz 823669 SHA256 c91b5fddb50dfd46545c12c1e96d1bb5e2794652c11421a6f5d9dad2bbca4d52 SHA512 4e45280b9cb6db3f8dcecfbf0cf64c990ea58d8607ed1aea9853c7248f8830301cc8685126eeb0d0c2ef0e23298c9070b291110d733e72867967bc9506900702 WHIRLPOOL ae08a9236adf69915c4a141106aa104563b1298f9fd3a32491ed8c45fddc9f32243154ba5bde9af7a8b74a95a1d2b7d337e4cbcc37f35ba997a7a50eb2f15200
+DIST certbot-0.11.1.tar.gz 817693 SHA256 89c45639746a79a22e32d86dbf9352cda1a4ea218aa1433d3aa61d90c715f52c SHA512 77ab66be8e9e16c3588f9a822db553c3ba8caf5bda91a810c0bccfd2bed144ccab06dae33551df474dba05a679045dc02966bc6f8facecdcba3f00c7b9773f0a WHIRLPOOL 5514e471ef9f7fd75321da7828927c34bec757bcd0c7477814da953286f6a0a414b5cf5969243df41100f172bb2f0b451019f7e1130123a2fac9fcd88a0abd99
 DIST letsencrypt-0.1.0.tar.gz 524821 SHA256 1c1ac7b41e5e0fc0e41a7ef159ac9147a4aafff54453d57b519eb05bf52ade14 SHA512 6a786290362741ac97dcb4b59bc4cba56f3e8b5193bbc10be19086d462f76e6124259c42bac36afe9eb818f4bb9edec34f8e2a02bd8c855e3b35404f4ee81f96 WHIRLPOOL cdc41a3466de54ab8ddfeedea9935205d78383028769dcfbc876be0c2ef80c2d14f5d0e4a9c56a751163718f5ababb07848822989a060de7031ea8ebdf6424a0

app-crypt/acme/acme-0.11.1.ebuild

@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S=${WORKDIR}/certbot-${PV}/acme
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+RDEPEND=">=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.4.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests -w ${PN} || die
+}

app-crypt/acme/acme-9999.ebuild

@@ -30,8 +30,7 @@ RDEPEND=">=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.4.1[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	virtual/python-dnspython"
+	dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )
 	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
 

app-emacs/dash/dash-2.13.0.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/magnars/dash.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/${PN}.el-${PV}"
 SITEFILE="50${PN}-gentoo.el"

app-emacs/magit/magit-2.9.0.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/magit/magit/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/${P}/lisp"
 SITEFILE="50${PN}-gentoo.el"

app-emacs/with-editor/with-editor-2.5.8.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/magit/with-editor/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 
 SITEFILE="50${PN}-gentoo.el"
 ELISP_TEXINFO="*.texi"

app-emulation/cloud-init/cloud-init-0.7.6_p1212-r1.ebuild

@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+BZRTGZ=1
+
+inherit distutils-r1 eutils multilib systemd
+
+DESCRIPTION="EC2 initialisation magic"
+HOMEPAGE="https://launchpad.net/cloud-init"
+if [ "x$BZRTGZ" != x1 ]; then
+	SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+else
+	# Launchpad does not provide consistent checksums https://bugs.launchpad.net/launchpad/+bug/1576338
+	# SRC_URI="http://bazaar.launchpad.net/~${PN}-dev/${PN}/trunk/tarball/${PV/*_p} -> ${P}.tar.gz"
+	SRC_URI="mirror://gentoo/${P}.tar.gz http://dev.gentoo.org/~robbat2/distfiles/${P}.tar.gz"
+	S="${WORKDIR}/~cloud-init-dev/cloud-init/trunk/"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="
+	dev-python/cheetah[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	dev-python/oauth[${PYTHON_USEDEP}]
+	dev-python/prettytable[${PYTHON_USEDEP}]
+	dev-python/pyserial[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${CDEPEND}
+		>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
+		dev-python/mocker[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		~dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
+		dev-python/pyflakes[${PYTHON_USEDEP}]
+		sys-apps/iproute2
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	sys-fs/growpart
+	virtual/logger
+"
+
+PATCHES=( "${FILESDIR}/cloud-init-0.7.6_p1212-gentoo.patch" )
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	emake test
+}
+
+python_install() {
+	distutils-r1_python_install "--init-system=sysvinit_openrc"
+}
+
+python_install_all() {
+	keepdir /etc/cloud
+
+	distutils-r1_python_install_all
+	chmod +x "${D}"/etc/init.d/* || die
+
+	insinto /etc/cloud/templates
+	doins "${FILESDIR}/hosts.gentoo.tmpl"
+	insinto /etc/cloud
+	doins "${FILESDIR}/cloud.cfg"
+}

app-eselect/eselect-java/eselect-java-0.3.0.ebuild

@@ -12,7 +12,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="

app-laptop/thinkfan/thinkfan-0.9.3.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="atasmart"
 
 DEPEND="atasmart? ( dev-libs/libatasmart )"

app-misc/zygrib/files/zygrib-8.0.1-libs.patch

@@ -15,6 +15,6 @@
  
 -LIBS += -lbz2 -lz -lproj -lnova -Lqwt-6.1.3/lib/ -lqwt
 +LIBS += -lbz2 -lz -lproj -lnova -lqwt6-qt5
- LIBS +=  -Lg2clib -lg2c -lpng -ljasper  # respect order!
+ LIBS +=  -Lg2clib -lg2c -lpng   # respect order!
  
  # ----------------------------------------------------

app-misc/zygrib/zygrib-8.0.1.ebuild

@@ -46,6 +46,7 @@ src_prepare() {
 	sed -i "/QWTDIR/d" Makefile
 	#use jpeg2k || sed -i '/^DEFS=/ s/-DUSE_JPEG2000//' src/g2clib/makefile
 	sed -i '/^DEFS=/ s/-DUSE_JPEG2000//' src/g2clib/makefile
+	sed -i '/^LIBS +=/ s/-ljasper//' src/zyGrib.pro
 	epatch "${FILESDIR}/${P}-libs.patch"
 	default
 }

app-mobilephone/gammu/gammu-1.36.8.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,19 +15,25 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="bluetooth curl dbi debug irda mysql nls postgres usb"
 
-# TODO: figure out a way to disable gudev
-RDEPEND="dev-libs/glib:2=
+COMMON_DEPEND="
+	dev-libs/glib:2=
 	virtual/libgudev:=
 	bluetooth? ( net-wireless/bluez:= )
 	curl? ( net-misc/curl:= )
 	dbi? ( >=dev-db/libdbi-0.8.3:= )
 	mysql? ( virtual/mysql:= )
-	postgres? ( dev-db/postgresql:=[server] )
+	postgres? ( dev-db/postgresql:= )
 	usb? ( virtual/libusb:1= )
-	dev-util/dialog"
-DEPEND="${RDEPEND}
+"
+DEPEND="
+	${COMMON_DEPEND}
 	irda? ( virtual/os-headers )
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-util/dialog
+"
 
 # sys-devel/gettext is needed for creating .mo files
 # Supported languages and translated documentation

app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r1.ebuild

@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ruby"
 
 RDEPEND=">=app-text/build-docbook-catalog-1.1

app-text/dvisvgm/Manifest

@@ -1,4 +1,5 @@
 DIST dvisvgm-1.10.tar.gz 831654 SHA256 339f4dcef0916c1daaf1b65d966737279464ec6858b28fda7196d8030d7f3735 SHA512 2d3cb2e6b36d6a3b996347b6031f67bb89bc76d2bf0244347e512e66333536638caf855d9856771b10245387abae99a06d4c6fe33def814cae639810b4cfe906 WHIRLPOOL 398e5378ce6e84768b73f7d6e9776eb177619de785a70d8fa416fecb275903e49c065ec23d78881eede9d4944525ecfba44d34a5d1b74b87dc1ef6ecf127b869
 DIST dvisvgm-1.8.1.tar.gz 706270 SHA256 6832e3f4b43fa0b96333c1857012e70a83f059b0d222239936e1d6fa3b62cc08 SHA512 6ca3f0e4ff28fa59d14dd5891b205db850bb8c91531e6bcda05a3e6bb7e2bca9d71eaca4bf408577cd756277e8f3b6be12e5b3102fb848b329f66b7a9eda0270 WHIRLPOOL 0bd6e23c2df1499f4d106d007ff995bbbeb70482bc0087ff3acfcb921085f24ac66374ee949f00ccc6ee56c104880a4a58ad365df0a5ce91c65409a3a3c097bc
 DIST dvisvgm-2.0.4.tar.gz 2163747 SHA256 3553e3b0bd5936c10f2b16c97e2c4f8cc79908d4effb3ef1d598d30b1fec39b2 SHA512 fc1207505936d5e22a8d70e8d0778454d516131995c4feb494b8b427addb549012c77ceec95206be3c6ec394008f779cf879ace9b4e1bf364940049bfdc00b69 WHIRLPOOL d9b3a0a3c49d2b1ccd503e2de800603dd47c363af0c89ce328235f6ae1871499b3c400b9d77398b256ebd768b11b8948a29bd40a928df4fecc16828275ed369e
+DIST dvisvgm-2.1.1.tar.gz 2318231 SHA256 90f7a276a3fd2e0585faa356164145b936e69463317c4255a994b56b3ea00c33 SHA512 27fac78faf8eba9d8b51fda6add1973f720eae20ae16953acf985002539f447ef3b839dd7e5619d402048a46b193c9376cdd4e71896a083336e20fd99eb385b9 WHIRLPOOL 3fce984969534818d687d4ed1085fa62cdf7eb913bb1a6e172e4202cf600d77f5dfa85cf4c09cc26a53513c14946c970ef17f67472143b843803fbd62447077a
 DIST dvisvgm-2.1.tar.gz 2303827 SHA256 4ae8f128cd1f1f1018623255e7160187ac24929bb1f940ba9cf993a2a3115bae SHA512 744fa6ed4ec64f8688caade785c6cc0488b42fe22434874070b9f8788ac6b468349e98b320bc70d4db3035e73f143de503aeabbe266516f6b4cd167eedbe8540 WHIRLPOOL 708aeea12657a2b0739d01aaffdfc49fb570223c9764f4073ada6168c169735019639cd260278711b4b722274f1de70044a0fb4cefc085b539ab8f6692c4b815

app-text/dvisvgm/dvisvgm-2.1.1.ebuild

@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Converts DVI files to SVG"
+HOMEPAGE="http://dvisvgm.bplaced.net/"
+SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+# Tests don't work from $WORKDIR: kpathsea tries to search in relative
+# directories from where the binary is executed.
+# We cannot really use absolute paths in the kpathsea configuration since that
+# would make it harder for prefix installs.
+RESTRICT="test"
+
+RDEPEND="virtual/tex-base
+	app-text/ghostscript-gpl
+	>=media-gfx/potrace-1.10-r1
+	media-libs/freetype:2
+	dev-libs/kpathsea
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	app-text/xmlto
+	app-text/asciidoc
+	dev-libs/libxslt
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )"
+
+src_configure() {
+	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
+	default
+}

app-text/podofo/Manifest

@@ -2,3 +2,4 @@ DIST podofo-0.9.2-freetype251.patch 1106 SHA256 324889c99eccafb5e4732d65d3254534
 DIST podofo-0.9.2.tar.gz 1092131 SHA256 465191618c57da9ae9230e7919e1985a242ddc7d1045cfdb6fb066140ed0a3f3 SHA512 e0bda743b192edfd42f381498edc56f30e6d89f45e7abd2b4351e15fd672a432d07f067ab8ed5cf378b0ecbab6d98abb32c22c1ce860c0021e31235fc5683a21 WHIRLPOOL f22c5ec0c3de1ef661198e8c94b2ac9faab88c6b12ebe27da14642c6eaed154f2e1fbf4f404807d7e33f895ffb64663eb7e403ec8a9e0f87b32e3470b7f5acfb
 DIST podofo-0.9.3.tar.gz 1135095 SHA256 ec261e31e89dce45b1a31be61e9c6bb250532e631a02d68ec5bb849ef0a222d8 SHA512 c9a8076821502225d3ecf5a7e79ef2ebd7b9cc3e7d0902eabff33325b124109a1f5038f57b83e3fad0d82cff9cd557a9ed177adc7c176064085070aebcd7602d WHIRLPOOL 44268efd48d6ab35fecf31e3ff773f6d9fcca091026f423ccffbe8afdb09fff9446eed8c64db9a4482695d6e4f4ae4585d7e51036197f619a7c304df1a8de8c2
 DIST podofo-0.9.4.tar.gz 1147939 SHA256 ccdf505fcb4904617e728b15729da8700ff38442c1dd2f24fbd52934287ff859 SHA512 2f675757d76ccfe2472358b04dc4cd55e2cf00ae447731af75645c7091a338b6d91dcd4b16240b305cdbb02384ddcd38048c0e3f1700185347d4e1eb5df9ee39 WHIRLPOOL 9461b288fe515eff96333d73c670cd4f464e0c43121968f4fc76418c4f2d7a9dfd9600eb315c52995a30c99d90d7c4249bd64a4c9b300e60b509ddc8c1143679
+DIST podofo-0.9.5.tar.gz 1160799 SHA256 854981cb897ebc14bac854ea0f25305372261a48a205363fe1c61659ba7b5304 SHA512 d13b30bfebc89b809173cd2251eed1f15dfa90abb58371bfdce875797d40663923571824ad2b0b1d97aa1be212bdbb710c3a0439bc05bed7022b8eb75ca74705 WHIRLPOOL 41ad1a1a7992bc186bd2c8b77b38479b47094b00631ee8e5990745ae88e554a1b34557637e3c4b86959ec071019d33ab11bda394c8181ab21b6df2f7b09a44b7

app-text/podofo/podofo-0.9.5.ebuild

@@ -0,0 +1,134 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit cmake-utils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="PoDoFo is a C++ library to work with the PDF file format"
+HOMEPAGE="https://sourceforge.net/projects/podofo/"
+SRC_URI="mirror://sourceforge/podofo/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+boost idn libressl debug test"
+
+RDEPEND="dev-lang/lua:=
+	idn? ( net-dns/libidn:= )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	media-libs/fontconfig:=
+	media-libs/freetype:2=
+	virtual/jpeg:0=
+	media-libs/libpng:0=
+	media-libs/tiff:0=
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	boost? ( dev-util/boost-build )
+	test? ( dev-util/cppunit )"
+
+DOCS="AUTHORS ChangeLog TODO"
+
+src_prepare() {
+	local x sed_args
+
+	# bug 556962
+	sed -i -e 's|Decrypt( pEncryptedBuffer, nOutputLen, pDecryptedBuffer, m_lLen );|Decrypt( pEncryptedBuffer, (pdf_long)nOutputLen, pDecryptedBuffer, (pdf_long\&)m_lLen );|' \
+		test/unit/EncryptTest.cpp || die
+
+	sed -i \
+		-e "s:LIBDIRNAME \"lib\":LIBDIRNAME \"$(get_libdir)\":" \
+		-e "s:LIBIDN_FOUND:HAVE_LIBIDN:g" \
+		CMakeLists.txt || die
+
+	# Use pkg-config to find headers for bug #459404.
+	sed_args=
+	for x in $($(tc-getPKG_CONFIG) --cflags freetype2) ; do
+		[[ ${x} == -I* ]] || continue
+		x=${x#-I}
+		if [[ -f ${x}/ft2build.h ]] ; then
+			sed_args+=" -e s:/usr/include/\\r\$:${x}:"
+		elif [[ -f ${x}/freetype/config/ftheader.h ]] ; then
+			sed_args+=" -e s:/usr/include/freetype2\\r\$:${x}:"
+		fi
+	done
+	[[ -n ${sed_args} ]] && \
+		{ sed -i ${sed_args} cmake/modules/FindFREETYPE.cmake || die; }
+
+	# Bug #439784: Add missing unistd include for close() and unlink().
+	sed -i 's:^#include <stdio.h>$:#include <unistd.h>\n\0:' -i \
+		test/unit/TestUtils.cpp || die
+
+	# TODO: fix these test cases
+	# ColorTest.cpp:62:Assertion
+	# Test name: ColorTest::testDefaultConstructor
+	# expected exception not thrown
+	# - Expected: PdfError
+	sed -e 's:CPPUNIT_TEST( testDefaultConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testGreyConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testRGBConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testCMYKConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testColorSeparationAllConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testColorSeparationNoneConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testColorSeparationConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testColorCieLabConstructor ://\0:' \
+		-i test/unit/ColorTest.h || die
+
+	# ColorTest.cpp:42:Assertion
+	# Test name: ColorTest::testHexNames
+	# assertion failed
+	# - Expression: static_cast<int>(rgb.GetGreen() * 255.0) == 0x0A
+	sed -e 's:CPPUNIT_TEST( testHexNames ://\0:' \
+		-i test/unit/ColorTest.h || die
+
+	# Bug #352125: test failure, depending on installed fonts
+	# ##Failure Location unknown## : Error
+	# Test name: FontTest::testFonts
+	# uncaught exception of type PoDoFo::PdfError
+	# - ePdfError_UnsupportedFontFormat
+	sed -e 's:CPPUNIT_TEST( testFonts ://\0:' \
+		-i test/unit/FontTest.h || die
+
+	# Test name: EncodingTest::testDifferencesEncoding
+	# equality assertion failed
+	# - Expected: 1
+	# - Actual  : 0
+	sed -e 's:CPPUNIT_TEST( testDifferencesEncoding ://\0:' \
+		-i test/unit/EncodingTest.h || die
+
+	# Bug #407015: fix to compile with Lua 5.2
+	if has_version '>=dev-lang/lua-5.2' ; then
+		sed -e 's: lua_open(: luaL_newstate(:' \
+			-e 's: luaL_getn(: lua_rawlen(:' -i \
+			tools/podofocolor/luaconverter.cpp \
+			tools/podofoimpose/planreader_lua.cpp || die
+	fi
+	eapply_user
+}
+
+src_configure() {
+
+	# Bug #381359: undefined reference to `PoDoFo::PdfVariant::DelayedLoadImpl()'
+	filter-flags -fvisibility-inlines-hidden
+
+	mycmakeargs+=(
+		"-DPODOFO_BUILD_SHARED=1"
+		"-DPODOFO_HAVE_JPEG_LIB=1"
+		"-DPODOFO_HAVE_PNG_LIB=1"
+		"-DPODOFO_HAVE_TIFF_LIB=1"
+		"-DWANT_FONTCONFIG=1"
+		"-DUSE_STLPORT=0"
+		-DWANT_BOOST=$(usex boost ON OFF)
+		-DHAVE_LIBIDN=$(usex idn ON OFF)
+		-DHAVE_CPPUNIT=$(usex test ON OFF)
+		)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cd "${CMAKE_BUILD_DIR}"/test/unit
+	./podofo-test --selftest || die "self test failed"
+}

dev-haskell/frown/Manifest

@@ -1,2 +1 @@
-DIST frown-0.6.1.tar.gz 1291807 SHA256 bfb5a7a84527624a605342cf739ebbef078a25721ca5af4fb7998590d76a9c05 SHA512 015f65afabde7061318bbd66c79ad064a44774afd9bcf161c842984128679f24c1e91e7de067a14833bd4b69d51906d825e453a02b9c0dd38b13b2a7432a9693 WHIRLPOOL fde918658a1664222b4b37953efabcdbf074c9280c898a39ca1ed0a08b740e2304760a2f08d6c1953f35cfb00a2cbb76690731c4e1a11ac591be93ac620658eb
 DIST frown-0.6.2.3.tar.gz 1269219 SHA256 fcca75244343a976a397f7d50687a80d41192e9eaa47d77799d11892f5fe400c SHA512 a9166dd723db2836214704f1837b9629af03bc1aa5bdeed8a58eedca7a91140ba21db8d7be2884bc13b9f35346704329980bec44d253fa53c33f71e68160a963 WHIRLPOOL 3f8dcbb9506a720cd5951ac65912f77da94c2dcd914a266da9171d06d5dd9864b03782ced69dcfbc7090d84c4d6dc2da2e782a3cff0369c9d0499dce7f0ad13d

dev-haskell/frown/files/frown-0.6.1-ghc-7.10.patch

@@ -1,139 +0,0 @@
-diff --git a/Base.lhs b/Base.lhs
-index c26e048..46c68de 100644
---- a/Base.lhs
-+++ b/Base.lhs
-@@ -38,3 +38,4 @@
- > import Prettier
--> import Control.Monad                  (  MonadPlus(..)  )
-+> import Control.Applicative
-+> import Control.Monad
- > import System.IO
-@@ -117,2 +118,9 @@ A simple exception monad.
- 
-+> instance Functor Result where
-+>     fmap  = liftM
-+
-+> instance Applicative Result where
-+>     pure  = return
-+>     (<*>) = ap  -- defined in Control.Monad
-+
- > instance Monad Result where
-@@ -123,2 +131,6 @@ A simple exception monad.
- 
-+> instance Alternative Result where
-+>     (<|>) = mplus
-+>     empty = mzero
-+
- > instance MonadPlus Result where
-diff --git a/Compact.lhs b/Compact.lhs
-index 6886a6a..84f125c 100644
---- a/Compact.lhs
-+++ b/Compact.lhs
-@@ -54,3 +54,3 @@
- > import Data.Maybe
--> import Prelude                hiding (  lookup  )
-+> import Prelude                hiding (  lookup, (<$>)  )
- 
-diff --git a/Convert.lhs b/Convert.lhs
-index 01d2c32..d31f437 100644
---- a/Convert.lhs
-+++ b/Convert.lhs
-@@ -50,2 +50,3 @@
- > import Control.Monad
-+> import Control.Applicative
- > import System.IO                     hiding (  isEOF  )
-@@ -235,2 +235,9 @@ Writer monad for collecting multiple error messages.
- 
-+> instance Functor (Writer w) where
-+>     fmap  = liftM
-+
-+> instance Applicative (Writer w) where
-+>     pure  = return
-+>     (<*>) = ap  -- defined in Control.Monad
-+
- > instance Monad (Writer w) where
-diff --git a/GParser2.hs b/GParser2.hs
-index 0cb4c21..1597acc 100644
---- a/GParser2.hs
-+++ b/GParser2.hs
-@@ -41,2 +41,5 @@
-   where
-+  import Prelude hiding ((<$>))
-+  import Control.Applicative hiding ((<$>))
-+  import Control.Monad hiding ( guard )
-   import Lexer2
-@@ -2130,3 +2133,10 @@
-                                                          -> m Answer) }
-- 
-+
-+  instance (Monad m) => Functor (Lex m) where
-+      fmap  = liftM
-+
-+  instance (Monad m) => Applicative (Lex m) where
-+      pure  = return
-+      (<*>) = ap  -- defined in Control.Monad
-+
-   instance (Monad m) => Monad (Lex m) where
-diff --git a/GParser2.lg b/GParser2.lg
-index e036f8f..800e245 100644
---- a/GParser2.lg
-+++ b/GParser2.lg
-@@ -41,2 +41,5 @@ Compile me with
- > where
-+> import Prelude hiding ((<$>))
-+> import Control.Applicative hiding ((<$>))
-+> import Control.Monad hiding ( guard )
- > import Lexer2
-@@ -354,2 +357,10 @@ A continuation-based state monad.
- >
-+
-+> instance (Monad m) => Functor (Lex m) where
-+>     fmap  = liftM
-+
-+> instance (Monad m) => Applicative (Lex m) where
-+>     pure  = return
-+>     (<*>) = ap  -- defined in Control.Monad
-+
- > instance (Monad m) => Monad (Lex m) where
-diff --git a/GVStack.lhs b/GVStack.lhs
-index acb5d96..3869493 100644
---- a/GVStack.lhs
-+++ b/GVStack.lhs
-@@ -51,3 +51,3 @@
- > import Data.List                   (  maximumBy  )
--> import Prelude                hiding (  lookup  )
-+> import Prelude                hiding (  lookup, (<$>)  )
- 
-diff --git a/Lib/OrdUniqListSet.lhs b/Lib/OrdUniqListSet.lhs
-index ddb8629..decf65d 100644
---- a/Lib/OrdUniqListSet.lhs
-+++ b/Lib/OrdUniqListSet.lhs
-@@ -63,2 +63,3 @@
- > import Control.Monad
-+> import Control.Applicative (Applicative, pure, (<*>))
- 
-@@ -114,2 +114,6 @@ Yes, \tr{Set} is a functor and a monad.
- >
-+> instance Applicative Set where
-+>     pure  = return
-+>     (<*>) = ap  -- defined in Control.Monad
-+>
- > instance Monad Set where
-diff --git a/Stackless.lhs b/Stackless.lhs
-index 2fb1a97..dac8ef5 100644
---- a/Stackless.lhs
-+++ b/Stackless.lhs
-@@ -53,3 +53,3 @@
- > import Control.Monad
--> import Prelude                hiding (  lookup  )
-+> import Prelude                hiding (  lookup, (<$>)  )
- 
-diff --git a/Standard.lhs b/Standard.lhs
-index 9fb5305..c3fcbb0 100644
---- a/Standard.lhs
-+++ b/Standard.lhs
-@@ -52,3 +52,3 @@
- > import Data.Maybe
--> import Prelude                hiding (  lookup  )
-+> import Prelude                hiding (  lookup, (<$>)  )
- 

dev-haskell/frown/files/frown-0.6.1-ghc74.patch

@@ -1,396 +0,0 @@
-diff --git a/Base.lhs b/Base.lhs
-index bbd9df5..c26e048 100644
---- a/Base.lhs
-+++ b/Base.lhs
-@@ -36,9 +36,9 @@
- > where
- >
- > import Prettier
--> import Monad                  (  MonadPlus(..)  )
--> import IO
--> import System
-+> import Control.Monad                  (  MonadPlus(..)  )
-+> import System.IO
-+> import System.Exit
- 
- %-------------------------------------------------------------------------------
- \subsection{List utilities}
-diff --git a/Case.lhs b/Case.lhs
-index 6558614..cbe87c0 100644
---- a/Case.lhs
-+++ b/Case.lhs
-@@ -45,10 +45,10 @@
- > import MergeSort
- > import Base
- > import Options
--> import Maybe
--> import IO
--> import Monad
--> import List                   (  partition  )
-+> import Data.Maybe
-+> import System.IO
-+> import Control.Monad
-+> import Data.List                   (  partition  )
- > import Prelude                hiding (  lookup  )
- 
- %-------------------------------=  --------------------------------------------
-@@ -347,4 +347,4 @@ More lookahead.
- > actions'                      :: Symbol -> Past -> Past
- > actions' x (Node es ts)       =  Node [ a{ future = f } | a <- es
- >                                                         , Just f <- [lookup (future a) x] ]
-->                                       [ (e, actions' x t) | (e, t) <- ts ]
-\ No newline at end of file
-+>                                       [ (e, actions' x t) | (e, t) <- ts ]
-diff --git a/Compact.lhs b/Compact.lhs
-index f878a06..6886a6a 100644
---- a/Compact.lhs
-+++ b/Compact.lhs
-@@ -49,9 +49,9 @@
- > import Base
- > import Generate
- > import MergeSort
--> import Char
--> import IO
--> import Maybe
-+> import Data.Char
-+> import System.IO
-+> import Data.Maybe
- > import Prelude                hiding (  lookup  )
- 
- %-------------------------------=  --------------------------------------------
-@@ -444,4 +444,4 @@ Names.
- 
- >     wrap s                    =  prefix opts ++ s ++ suffix opts
- >     wrap_var s                =  var (wrap s)
-->     wrap_con s                =  con (wrap s)
-\ No newline at end of file
-+>     wrap_con s                =  con (wrap s)
-diff --git a/Convert.lhs b/Convert.lhs
-index 6b7d836..01d2c32 100644
---- a/Convert.lhs
-+++ b/Convert.lhs
-@@ -42,13 +42,13 @@
- > import OrdUniqListSet         (  Set, MinView(Empty, Min)  ) -- for nhc98
- > import Atom                   hiding (  string  )
- > import Haskell                hiding (  Empty, Decl, guard  )
--> import Maybe
--> import List
-+> import Data.Maybe
-+> import Data.List
- > import Base
- > import Prettier               hiding (  concat, intersperse  )
- > import qualified Prettier as PP
--> import Monad
--> import IO                     hiding (  isEOF  )
-+> import Control.Monad
-+> import System.IO                     hiding (  isEOF  )
- > import Options
- 
- > newEOF                        :: Ident
-@@ -361,4 +361,4 @@ Instance of a rule scheme.
- >           | terminal w        =  w
- >           | otherwise         =  case lookup w bindings of
- >                                      Just w' -> w' { attributes = attributes w }
-->                                      Nothing -> updateArgs w (map substitute (arguments w))
-\ No newline at end of file
-+>                                      Nothing -> updateArgs w (map substitute (arguments w))
-diff --git a/GParser2.hs b/GParser2.hs
-index 9d04100..0cb4c21 100644
---- a/GParser2.hs
-+++ b/GParser2.hs
-@@ -47,9 +47,9 @@
-   import qualified Base
-   import Prettier               (  Pretty  )
-   import Options
--  import Char
--  import List
--  import IO
-+  import Data.Char              hiding (  isSymbol  )
-+  import Data.List
-+  import System.IO
- 
- 
- 
-@@ -2258,4 +2258,4 @@
-       where verb                =  verbose opts
-  
-   run                           :: (Monad m) => Lex m Answer -> (String -> m Answer)
--  run parser inp                =  unLex parser (\a _ _ _ _ -> return a) False inp 1 (take 1 (lines inp))
-\ No newline at end of file
-+  run parser inp                =  unLex parser (\a _ _ _ _ -> return a) False inp 1 (take 1 (lines inp))
-diff --git a/GVStack.lhs b/GVStack.lhs
-index f5968ad..acb5d96 100644
---- a/GVStack.lhs
-+++ b/GVStack.lhs
-@@ -45,10 +45,10 @@
- > import Options
- > import Base
- > import Generate
--> import IO
--> import Monad
--> import Char
--> import List                   (  maximumBy  )
-+> import System.IO
-+> import Control.Monad
-+> import Data.Char
-+> import Data.List                   (  maximumBy  )
- > import Prelude                hiding (  lookup  )
- 
- %-------------------------------=  --------------------------------------------
-diff --git a/Generate.lhs b/Generate.lhs
-index 74d7335..3b7284f 100644
---- a/Generate.lhs
-+++ b/Generate.lhs
-@@ -43,7 +43,7 @@
- > import OrdUniqListSet         (  Set  )
- > import Base
- > --import Char                   (  toLower, toUpper  )
--> import List                   (  intersperse  )
-+> import Data.List                   (  intersperse  )
- 
- Symbols.
- 
-diff --git a/Haskell.lhs b/Haskell.lhs
-index aba2831..74f7bec 100644
---- a/Haskell.lhs
-+++ b/Haskell.lhs
-@@ -35,7 +35,7 @@
- > import Atom                   hiding (  string  )
- > import qualified Atom
- > import Prettier
--> import Char
-+> import Data.Char
- > import Prelude                hiding (  concat  )
- 
- %-------------------------------=  --------------------------------------------
-diff --git a/LR0.lhs b/LR0.lhs
-index 0a16123..60bb002 100644
---- a/LR0.lhs
-+++ b/LR0.lhs
-@@ -45,7 +45,7 @@
- > import Base                   hiding (  list  )
- > import qualified Base
- > import Prelude                hiding (  null  )
--> import IO
-+> import System.IO
- > import Options
- 
- %-------------------------------=  --------------------------------------------
-@@ -269,4 +269,4 @@ State |0| is the error or trap state and the goto state for start
- productions such as |Start# : Start, EOF;|.
- 
- > errorState                    :: State
--> errorState                    =  State 0 (Set.empty :\/ Set.empty)
-\ No newline at end of file
-+> errorState                    =  State 0 (Set.empty :\/ Set.empty)
-diff --git a/Lexer2.lhs b/Lexer2.lhs
-index af55186..3bb1e33 100644
---- a/Lexer2.lhs
-+++ b/Lexer2.lhs
-@@ -35,9 +35,9 @@
- > module Lexer2
- > where
- > import Prelude
--> import Char
--> import IO
--> import Monad
-+> import Data.Char
-+> import System.IO
-+> import Control.Monad
- > import Base
- > import Options
- 
-@@ -156,4 +156,4 @@
- 
- > isSymbol, isIdChar	        :: Char -> Bool
- > isSymbol c			=  c `elem` "!@#$%&*+./<=>?\\^|:-~"
--> isIdChar c			=  isAlphaNum c || c `elem` "_'"
-\ No newline at end of file
-+> isIdChar c			=  isAlphaNum c || c `elem` "_'"
-diff --git a/Lib/OrdUniqListFM.lhs b/Lib/OrdUniqListFM.lhs
-index 1419028..4e2eea5 100644
---- a/Lib/OrdUniqListFM.lhs
-+++ b/Lib/OrdUniqListFM.lhs
-@@ -64,8 +64,8 @@
- > import qualified OrdUniqList as OUL
- > import MergeSort		(  mergeSort  )
- > import Prettier               hiding (  empty  )
--> import qualified List
--> import Maybe                  (  fromMaybe  )
-+> import qualified Data.List as List
-+> import Data.Maybe                  (  fromMaybe  )
- 
- > infixl 9  !
- > infixl 9  //
-@@ -292,4 +292,4 @@ The list argument of |fromList_C| need not be functional.
- @prefixLookup@ returns the list of all completions of the given list.
- 
-  prefixLookup			:: Ord a => FM [a] b -> [a] -> [([a], b)]
-- prefixLookup (FM f) s		=  [ b | Assoc b@(a, _)<-f, s `isPrefixOf` a ]
-\ No newline at end of file
-+ prefixLookup (FM f) s		=  [ b | Assoc b@(a, _)<-f, s `isPrefixOf` a ]
-diff --git a/Lib/OrdUniqListSet.lhs b/Lib/OrdUniqListSet.lhs
-index 66eba10..ddb8629 100644
---- a/Lib/OrdUniqListSet.lhs
-+++ b/Lib/OrdUniqListSet.lhs
-@@ -59,8 +59,8 @@
- > import qualified Prelude
- > import qualified OrdUniqList as OUL
- > import Prettier               hiding (  empty  )
--> import qualified List
--> import Monad
-+> import qualified Data.List as List
-+> import Control.Monad
- 
- %-------------------------------------------------------------------------------
- \subsection{Type definitions and instance declarations}
-diff --git a/Lookahead.lhs b/Lookahead.lhs
-index ba23a5d..5c0fb31 100644
---- a/Lookahead.lhs
-+++ b/Lookahead.lhs
-@@ -42,9 +42,9 @@
- > import qualified Prettier as PP
- > import Base
- > import Options
--> import IO
--> import Maybe
--> import Monad                  (  when  )
-+> import System.IO
-+> import Data.Maybe
-+> import Control.Monad                  (  when  )
- 
- %-------------------------------=  --------------------------------------------
- \section{Grouping of actions}
-diff --git a/Main.lhs b/Main.lhs
-index b9b2a2e..98af968 100644
---- a/Main.lhs
-+++ b/Main.lhs
-@@ -53,11 +53,12 @@ Compile me with
- > import Prettier               hiding (  string, concat  )
- > import qualified Prettier as PP
- > import qualified SearchTree as ST
--> import Monad                  (  when  )
--> import Directory
--> import IO
--> import System
-+> import Control.Monad                  (  when  )
-+> import System.Directory
- > import System.Console.GetOpt
-+> import System.Exit
-+> import System.Environment
-+> import System.IO
- 
- %-------------------------------=  --------------------------------------------
- \section{The main program}
-@@ -689,4 +690,4 @@ o  Introduce abbreviations for patterns (as in Happy):
-                                  | let add op = ADDOP (op :: Addop)
-                                  | let id  s  = IDENT (s :: String);
- 
--   |add op| serves as an abbreviation for |ADDOP op|.
-\ No newline at end of file
-+   |add op| serves as an abbreviation for |ADDOP op|.
-diff --git a/Options.lhs b/Options.lhs
-index a0e559f..ece780d 100644
---- a/Options.lhs
-+++ b/Options.lhs
-@@ -33,8 +33,8 @@
- > where
- > import Base
- > import System.Console.GetOpt
--> import Char
--> import IO
-+> import Data.Char
-+> import System.IO
- 
- %-------------------------------=  --------------------------------------------
- \section{Command line options}
-@@ -149,4 +149,4 @@
- >   | otherwise                 =  Signature False
- 
- > (<<)                          :: String -> String -> Bool
--> s << t                        =  map toLower s `isPrefix` map toLower t
-\ No newline at end of file
-+> s << t                        =  map toLower s `isPrefix` map toLower t
-diff --git a/SearchTree.lhs b/SearchTree.lhs
-index 85755d4..d1c58ba 100644
---- a/SearchTree.lhs
-+++ b/SearchTree.lhs
-@@ -32,7 +32,7 @@
- >                               ,  length, lookup, unsafeLookup  )
- > where
- > import MergeSort		(  mergeSortBy  )
--> import Maybe                  (  fromMaybe  )
-+> import Data.Maybe                  (  fromMaybe  )
- > import Prelude                hiding (  length, lookup  )
- > import qualified Prelude
- 
-@@ -99,4 +99,4 @@ Lookup.
- 
- 
- > unsafeLookup                  :: (Ord a, Show a) => FM a v -> a -> v
--> unsafeLookup fm a             =  fromMaybe (error ("unsafeLookup: key not found: " ++ show a)) (lookup fm a)
-\ No newline at end of file
-+> unsafeLookup fm a             =  fromMaybe (error ("unsafeLookup: key not found: " ++ show a)) (lookup fm a)
-diff --git a/Stackless.lhs b/Stackless.lhs
-index 106b8f3..2fb1a97 100644
---- a/Stackless.lhs
-+++ b/Stackless.lhs
-@@ -47,10 +47,10 @@
- > import Base
- > import Generate
- > import MergeSort
--> import Char
--> import Maybe
--> import IO
--> import Monad
-+> import Data.Char
-+> import Data.Maybe
-+> import System.IO
-+> import Control.Monad
- > import Prelude                hiding (  lookup  )
- 
- Characteristics.
-@@ -311,4 +311,4 @@ Names.
- 
- >     wrap s                    =  prefix opts ++ s ++ suffix opts
- >     wrap_var s                =  var (wrap s)
-->     wrap_con s                =  con (wrap s)
-\ No newline at end of file
-+>     wrap_con s                =  con (wrap s)
-diff --git a/Standard.lhs b/Standard.lhs
-index 18bce59..9fb5305 100644
---- a/Standard.lhs
-+++ b/Standard.lhs
-@@ -47,9 +47,9 @@
- > import Options
- > import Base
- > import Generate
--> import Char
--> import IO
--> import Maybe
-+> import Data.Char
-+> import System.IO
-+> import Data.Maybe
- > import Prelude                hiding (  lookup  )
- 
- Characteristics.
-@@ -293,4 +293,4 @@ Names.
- 
- >     wrap s                    =  prefix opts ++ s ++ suffix opts
- >     wrap_var s                =  var (wrap s)
-->     wrap_con s                =  con (wrap s)
-\ No newline at end of file
-+>     wrap_con s                =  con (wrap s)
-diff --git a/frown.cabal b/frown.cabal
-index 19448ed..5a44fdf 100644
---- a/frown.cabal
-+++ b/frown.cabal
-@@ -2,7 +2,7 @@ Name:			Frown
- Version:		0.6
- License:		GPL
- Author:			Ralf Hinze
--Build-Depends:		base, haskell98
-+Build-Depends:		base, directory
- Synopsis:		A parser generator for Haskell
- 
- Executable:		frown

dev-haskell/frown/frown-0.6.1-r1.ebuild

@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="A parser generator for Haskell"
-HOMEPAGE="http://www.informatik.uni-bonn.de/~ralf/frown/"
-SRC_URI="http://www.informatik.uni-bonn.de/~ralf/frown/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.2.2"
-RDEPEND=""
-
-S="${WORKDIR}/Frown-${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-ghc74.patch"
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-}
-
-src_install() {
-	cabal_src_install
-	dohtml -r Manual/html
-	dodoc COPYRIGHT Manual/Manual.ps
-}

dev-haskell/frown/frown-0.6.2.3.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=

dev-java/laf-plugin/Manifest

@@ -1 +1,2 @@
 DIST laf-plugin-0.2-src.tar.bz2 13799 SHA256 e2252f74efbaa1f0c32a475c320283e614932e3af2d98a65462bf0e1f8cc00ba SHA512 91ac3f9f5ebfcd70e7cc76f2e028e9578c6113a848b0ccdc6b001fff006bf5aaa12af08b1752851693d218d4b2d7d053f62461481e49d5a0bde21e5a7d086331 WHIRLPOOL 6aaea36bbcc22eca1704185faf866fba1b723cd3d6ff02197f28287ded67fc43bb4c2f9cbe8a2dce9e82eaa88774b1fdb4c66e54cdc4f09ad946718641cb1334
+DIST laf-plugin-1.1.jar 8105 SHA256 2b7919c502906983307b556284d6e86df2034b69ebf3394f303490e99936500d SHA512 2ca265d23ac95e5d194e4905ead4c975cb8739a0aa30096c028d2f6467b148de2ac0ff71c6730752a666eee53551867d9d8c852d25238a873fbd4bd994cf80c0 WHIRLPOOL cda35e80834745d00ab2e1a3f3531ecc0e5cf4b140c5a167b86ffd213ccf9cdf0bb76d4582ec1745d738fbccd5fa81e1267e6f54a7a330521cd78fb6897d6e3d

dev-java/laf-plugin/laf-plugin-1.1.ebuild

@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A generic plugin framework for look-and-feels"
+HOMEPAGE="http://laf-plugin.dev.java.net/"
+SRC_URI="https://repo1.maven.org/maven2/net/java/dev/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="
+	dev-java/nanoxml:0"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	${CDEPEND}"
+
+RDEPEND="
+	>=virtual/jre-1.6
+	${CDEPEND}"
+
+JAVA_GENTOO_CLASSPATH="nanoxml"
+
+java_prepare() {
+	java-pkg_clean
+}
+
+src_install() {
+	java-pkg-simple_src_install
+}

dev-libs/libuv/Manifest

@@ -1,2 +1 @@
 DIST libuv-1.10.2.tar.gz 1074184 SHA256 2d740a2adea0f1a19058626f55a076ac41a4ac1f95d4e57cae0c8a634a6cd63b SHA512 5d9a7c483c3504e10e17c29297d72dee1572dc657d261229cc68efe63cb3abb59f7e7768885ce3eb06f22691e73323158c06dcce29000c81e35ff9888853f080 WHIRLPOOL 19948da35acc1252de9633dbd30cb951eb07bf51c0f63b65d8716b87d9cbf7184814e1e44363e40bc8e55976256812eaef0583f0ab2f0d3a6ae0068e7349f034
-DIST libuv-1.8.0.tar.gz 1048022 SHA256 906e1a5c673c95cb261adeacdb7308a65b4a8f7c9c50d85f3021364951fa9cde SHA512 51d5940873a771278c24a697f0da5c9cb7f42c192daa14254cff9309af600a1b343f1f39272f88d4cd0158f7b15bc966fb7e0b67b9590295fe4d9f0a7c6572b4 WHIRLPOOL ce9c49d5ba646458daa60e3f935d2f53483570d6dc34a8515c875115377929271bbc113c4c382054e9b1dbe4c04e04c2381f90d0776d69b064fb72169b6b4060

dev-libs/libuv/libuv-1.8.0.ebuild

@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils multilib-minimal
-
-DESCRIPTION="Cross-platform asychronous I/O"
-HOMEPAGE="https://github.com/libuv/libuv"
-SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD BSD-2 ISC MIT"
-SLOT="0/1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="static-libs"
-RESTRICT="test"
-
-DEPEND="sys-devel/libtool
-	virtual/pkgconfig[${MULTILIB_USEDEP}]"
-
-src_prepare() {
-	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
-		> m4/libuv-extra-automake-flags.m4 || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		cc_cv_cflags__g=no \
-		$(use_enable static-libs static)
-}
-
-multilib_src_test() {
-	mkdir "${BUILD_DIR}"/test || die
-	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
-	default
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}

dev-libs/libwacom/Manifest

@@ -1,4 +1,3 @@
-DIST libwacom-0.11.tar.bz2 424554 SHA256 995f192e53f09444b79b66986227ebbac477520956363dededa19af3d8746284 SHA512 465f1ea9354bcba7d1c5d9fe146192b7ba1593973690718b2584b4786feb434f672556e7eed799761f96a37fe79bd14ae33ab7695d3ce9d5214cf9bc5b26eecc WHIRLPOOL 7f29b09a9bdee0d9cb2f5712414bdbcccf1b2a31a387020de2c1f911411934a3ae61a1d430b40e3402282fbc60e0d184b82c1cd524e43c8417d678f27063f607
 DIST libwacom-0.18.tar.bz2 445524 SHA256 71bfa2a8d10ec2f2ada852aed816724a9af4713cbe0cf8559877b7fa56a7b722 SHA512 68258fbcada5c96e581d1386ca863a80ef979d2f0022de4bcc52d82d0f49c43d4c3c602ea088c1c16128c4aabb3b867f518d4d94335b7757eba6cf7e8c8b950d WHIRLPOOL 7c152b2846ee81cce256218df5fabbbb2fb2e103e6c30c905dd40c09e65a789719dc38f5b1a058caa792c2993552ea58c03b8c4d8d26be395531f601ef406e9e
-DIST libwacom-0.19.tar.bz2 457692 SHA256 620d88cd85d118107c69db094c07284ead2342048cc0e9a5f16eb951a8b855ff SHA512 05a441e73367d0ab4306d17fd65d6a0583e3233a4bc49090cf8c68053d6462ad6e1f56e65358c175c76a17b5e801e03ed659bd29745f7f829b7217cb5f1a0e0b WHIRLPOOL 4fa271925fd60788253b716111b73261deab1911c1dfe019e523b63c30dbcc11d077009d265835bc6e8033a325d60da6f99e877d57e1eeb7c8d7f0ab2f924509
 DIST libwacom-0.22.tar.bz2 462995 SHA256 97c19c216cbf4a2c54a5fc4f80d5a363bfa732500f0831a345bbc8ab385720c0 SHA512 c259d13e9d0c344cfa828a351442909d4a4c67d500c54b508d1e92369dca5ac3288dfde00da24a0d3312113e58d527a018a8d8c2679c8e19bf1a982e19e499c7 WHIRLPOOL dd525220381e9b9a0f7e527e601869dea1d1674980a34681d6609704d4354d3f61c07c037ee990eee4f5d4f7e2d1dad822ea8385ad1820de679c68ada16e95af
+DIST libwacom-0.23.tar.bz2 473700 SHA256 a08ac59ff26dbdf5888a6ad7bd97a66741807cda6bb1c7e7f299a555129c3162 SHA512 6aa5419933d92926b8af17d01e812fcfa8727875e5a0bdf30125526cb1007ea41213b089f5f1ee0f20069d49efb7f95beabe82bf975a808b00d58aca7cd618c6 WHIRLPOOL 72848eb918fd6c52f87fe7b31da8711832ddff334b887af1e981cf61f40825ed1d3147167c3bceec2046c6549b1039aaaf5c42284fac1ef9475c76e64a881b58

dev-libs/libwacom/libwacom-0.11.ebuild

@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils udev
-
-DESCRIPTION="Library for identifying Wacom tablets and their model-specific features"
-HOMEPAGE="http://linuxwacom.sourceforge.net/"
-SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-IUSE="doc static-libs"
-
-RDEPEND="
-	dev-libs/glib:2
-	virtual/libgudev:=
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	if ! use doc; then
-		sed -e 's:^\(SUBDIRS = .* \)doc:\1:' -i Makefile.in || die
-	fi
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	local udevdir="$(get_udevdir)"
-	dodir "${udevdir}/rules.d"
-	# generate-udev-rules must be run from inside tools directory
-	pushd tools > /dev/null
-	./generate-udev-rules > "${ED}/${udevdir}/rules.d/65-libwacom.rules" ||
-		die "generating udev rules failed"
-	popd > /dev/null
-	use doc && dohtml -r doc/html/*
-	prune_libtool_files
-}

dev-libs/libwacom/libwacom-0.19.ebuild → dev-libs/libwacom/libwacom-0.23.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 

dev-libs/nss/Manifest

@@ -1,3 +1,4 @@
 DIST nss-3.28.1.tar.gz 7451477 SHA256 58cc0c05c0ed9523e6d820bea74f513538f48c87aac931876e3d3775de1a82ad SHA512 f10c8e404741fafe5e5772dc754ff4503ec1826942db5fbc13b99155fcac50f29e1405dd249b69a27f27ebcfef73849b1f0f636a2076ab761384e8a0ed9a2b8b WHIRLPOOL e1a6b9886759159294c4d8e47e693a2e790703e368ede18425c9a9130df72ac56a6e717cb794607c7bcfc68c82df9aec8771bc74e729f5bbd70fdcd8ce0fed3b
+DIST nss-3.29.tar.gz 7477439 SHA256 ee19ebfe7b012dedb71f04a55dd06fa26f8dce435e5980531c790bd42673c6fa SHA512 0f4dd026b6b32122d8cafa92fa37199b0678f8fef75e375446eddd0cc6ddda1a796e3222caa8bb01b3633911899394d0cb1e4d392880438f68c8ef7290dcb4fa WHIRLPOOL 5d3243bcc5c78e1b13b463e935bb5f700d0ed32eb22b01ccda17cb475725230f73f3711227a2175add4e96e0353aaf484ff10b0186cf4a453dfa215c24b8147c
 DIST nss-cacert-class1-class3.patch 22950 SHA256 6bba29cee34276e2ca6436dabedfeba2b61fb46668c5d5ceabf0c871574649bf SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0 WHIRLPOOL 1246223b01292604e5609bb9c580f092dc5937bf8c98f6891b099e8bab960e03612b6617e30a55d6ff8817d88f190e03812fe8f89f84f25c20970493dc2f7700
 DIST nss-pem-20160329.tar.xz 27732 SHA256 6c13c342e7a9fe34b585556099beca33c3078b3df3e11b72827fb70232ac1443 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2 WHIRLPOOL 16fb714fab29e44f7a15fa1928a0f4c1a770f0847b8da97816e29a3b124dee782cffe2357648c445f4d29081f349571b6fffe48c5bc725c7c2dde491f3e0e836

dev-libs/nss/nss-3.29.ebuild

@@ -0,0 +1,339 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.13.1"
+RTM_NAME="NSS_${PV//./_}_RTM"
+# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
+PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116"
+PEM_P="${PN}-pem-20160329"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
+SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+	cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )
+	nss-pem? ( https://dev.gentoo.org/~polynomial-c/${PEM_P}.tar.xz )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="cacert +nss-pem utils"
+CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
+DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+	${CDEPEND}"
+RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+	${CDEPEND}
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r12
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nss-config
+)
+
+PATCHES=(
+	# Custom changes for gentoo
+	"${FILESDIR}/${PN}-3.28-gentoo-fixups.patch"
+	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
+	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+)
+
+src_unpack() {
+	unpack ${A}
+	if use nss-pem ; then
+		mv "${PN}"/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
+	fi
+}
+
+src_prepare() {
+	if use nss-pem ; then
+		PATCHES+=(
+			"${FILESDIR}/${PN}-3.21-enable-pem.patch"
+		)
+	fi
+	if use cacert ; then #521462
+		PATCHES+=(
+			"${DISTDIR}/${PN}-cacert-class1-class3.patch"
+		)
+	fi
+
+	default
+
+	pushd coreconf >/dev/null || die
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+	popd >/dev/null || die
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		config/Makefile || die
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then