Sync with portage [Thu Nov 2 08:40:35 MSK 2017].

app-admin/augeas/augeas-1.9.0.ebuild

@@ -11,7 +11,7 @@ SRC_URI="http://download.augeas.net/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="static-libs test"
 
 RDEPEND="

app-admin/mcollective/Manifest

@@ -1,2 +1,3 @@
 DIST mcollective-2.11.2.tar.gz 1516590 SHA256 aa3664d5ba2d4d20e448c374c315c91d55b5bb43918a04092747a4052bc3f969 SHA512 1dc393fa1a09c5151b64b84086ef9af934feeebd2700a00cc4c84696fa2a25d90a410a373b553198f5fda6e1e36808ffb8dc38edcb15bb9e4253998aa7504439 WHIRLPOOL f808d4f9ffbf733842dd29f8e0548b90a4705f8b502dcc62509380b013d69de786204025490d4fb67d657e5c6597fb0d3ffdac2724e8dbca6347511ef50be54a
 DIST mcollective-2.11.3.tar.gz 1516665 SHA256 b9080779fa56c2b77a3f37404b3ac933183e0b0940e6086b0060be2c44aa38d3 SHA512 f5e26dff03f7a671db5de12acba1ce726c8d57fb99831ddbb258da5ba297ade31ea991840fa63cb1ba261281f7f6167a8492c8764a13cc332202ccb9c88d79b8 WHIRLPOOL 69e384489c8138aecc0c404dc9a08e5d92e09deab05a43ab4781b77506f4fe6f3bbd1a9ec9399a59e8a7c89d3462d3062d73a50fae490215628826c2794bd9ff
+DIST mcollective-2.11.4.tar.gz 1517194 SHA256 2bf8425a50023744e28f26efd64931d6383b216e9918e1df49276bc5477e4493 SHA512 56af0a8b64ff75351f3448396f8a7cbba603869cdbfa7a97dde5a820e2e287c84e410a77469a3ce01f398858f5c6570c9e3542e372eaa00e3f54e68e3c1ce63b WHIRLPOOL 4e6bed8bbfbd9bf08c3380891321dd2fb673ffd4408acdd0e63c14ca3896d07014f6b034814f98ba89b52818522d49f4ad95d114cb940966ae13409f16ce9365

app-admin/mcollective/mcollective-2.11.4.ebuild

@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby21 ruby22 ruby23"
+
+inherit ruby-ng
+
+DESCRIPTION="Framework to build server orchestration or parallel job execution
+systems"
+HOMEPAGE="https://docs.puppet.com/mcollective/"
+SRC_URI="https://github.com/puppetlabs/marionette-collective/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/all/marionette-collective-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +client"
+
+DEPEND=""
+RDEPEND="dev-ruby/stomp"
+
+src_compile() {
+	einfo "nothing to compile"
+}
+
+each_ruby_install() {
+	cd "marionette-collective-${PV}"
+	doruby -r lib/*
+	insinto /usr/share/mcollective
+	use client && dosbin bin/mco
+	dosbin bin/mcollectived
+	if use doc ; then
+		dohtml -r doc/*
+		insinto /usr/share/doc/${P}/ext
+		doins -r ext/*
+	fi
+	newinitd "${FILESDIR}"/mcollectived.initd mcollectived
+	insinto /etc/mcollective
+	cd etc
+	for cfg in *.dist ; do
+		newins "${cfg}" "${cfg%%.dist}"
+		sed -i -e "s:^libdir.*:libdir = /usr/share/mcollective/plugins:" \
+			"${D}"/etc/mcollective/${cfg%%.dist} || die "sed failed"
+	done
+	insinto /etc/mcollective/plugin.d
+}
+
+pkg_postinst() {
+	einfo "Mcollective requires a stomp server installed and functioning before"
+	einfo "you can use it. The recommended server to use is ActiveMQ [1] but"
+	einfo "any other stomp compatible server should work."
+	einfo
+	einfo "It is recommended you read the \'getting started\' guide [2] if this"
+	einfo "is a new installation"
+	einfo
+	einfo "[1] https://activemq.apache.org/"
+	einfo "[2] https://code.google.com/p/mcollective/wiki/GettingStarted"
+}

app-admin/sshguard/Manifest

@@ -1,3 +1,4 @@
 DIST sshguard-1.7.1.tar.gz 832220 SHA256 2e527589c9b33219222d827dff63974229d044de945729aa47271c4a29aaa195 SHA512 205f45f0f1260ebf2a1efabe5b4391b23c219f37df096383d87c220e7392cf58827a4e509be65287bac5b2af49fa0fc390775e1472cff4fb28f2323821f00fd1 WHIRLPOOL 2810c8c77d623dd21baace30bcd4c20efe1f7544e0db3a8abe84ca823e4cc391ecde072d56e63e10c2a490d1417e18fcd9cae16692ac72fffbf216a23036798e
 DIST sshguard-2.0.0.tar.gz 886995 SHA256 e87c6c4a6dddf06f440ea76464eb6197869c0293f0a60ffa51f8a6a0d7b0cb06 SHA512 c9f7ef4b8d4b1ecbcee33b95e013c51f37b4a05226c6cd1f3c85006c83a32cf555644069d529a7317dcf6616f86a399d7338a5a414238de05bd41dc3005488e4 WHIRLPOOL 9ee1dc00c8f5571b3f36575e793a263dd70fa61f23c52bb446df5ffcddae981adbf7eb3c9dd6ad3894c1e434293297ab4894537a697df6282678ff5ebb5c3af9
 DIST sshguard-2.0.99.tar.gz 1110725 SHA256 189b99b582ac70e2130402493b205b3608893301b49cedec84aa36c80ae2a308 SHA512 776a241b7af9a4afb048c99791202c0bf0f5130e265116a0f049853f8eb3d108e056c75f9dc009cf93a0dffe8d34b18b6fddc63febd54cc35bb6e71d6d2e77bb WHIRLPOOL 7905324d09974790412d16f3da775fb03f76cb0e4802268e78fd09e59c1586c290a3b70b820b833ebb9f7f9e0184bd1c91784d38036c36a65f5796f998529ba9
+DIST sshguard-2.1.0.tar.gz 1117466 SHA256 21252a4834ad8408df384ee4ddf468624aa9de9cead5afde1c77380a48cf028a SHA512 0a75e9d1a8c9c010c767a49e96e88db4a92aae8d428deebcff1ce8befa36b77cb1937f2fcb2a4e2a3e86d47896a8405265eb30ee7a603fc18a3ee117d646b119 WHIRLPOOL 35b44288ae78740b8c3f52ae1851ca0058bc9b3f33de61b7cb06690b970b60ce61d009b38fb91a543a12e0dbf3526ab7e448722d0446ebd51a2af2abf02aedb0

app-admin/sshguard/sshguard-2.1.0.ebuild

@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="protects hosts from brute force attacks against ssh"
+HOMEPAGE="http://sshguard.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+
+DEPEND="
+	sys-devel/flex
+"
+RDEPEND="
+	virtual/logger
+"
+DOCS=(
+	CHANGELOG.rst
+	CONTRIBUTING.rst
+	README.rst
+	examples/net.sshguard.plist
+	examples/sshguard.service
+	examples/whitelistfile.example
+)
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+	insinto /etc
+	newins examples/sshguard.conf.sample sshguard.conf
+}

app-backup/obnam/obnam-1.19.1.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
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://git.liw.fi/cgi-bin/cgit/cgit.cgi/obnam/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}

app-backup/obnam/obnam-1.21.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
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://git.liw.fi/cgi-bin/cgit/cgit.cgi/obnam/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}

app-backup/obnam/obnam-1.22.ebuild

@@ -14,7 +14,7 @@ SRC_URI="http://git.liw.fi/cgi-bin/cgit/cgit.cgi/obnam/snapshot/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}

app-crypt/acme/Manifest

@@ -1,6 +1,2 @@
-DIST certbot-0.15.0.tar.gz 942788 SHA256 87d306b1c013b472b8f548b38ccc476c125816435bb3b99e932fed09ac777296 SHA512 e884b34985a1128ce94d6b2be77af6ee86ded8b870e066f3f4bc22f78501f3f0a51060edcf75a11cd31dd525388adb8ccc4e2da0068b5b75be131d0fb0ca6844 WHIRLPOOL 01b172e8c7ac5d3678ee608b36d93f23943bf17f1e9c593cc1af3febcf0549b03961e69e537f099643dd9ee268497f76c2c18d8fa7a1d45753bc50e670375317
-DIST certbot-0.16.0.tar.gz 992700 SHA256 9abac759d7d72b520693ff806479e87609059a1546bb6ea26416267ebeedd25b SHA512 4cb6ec06c6ec71cd6886a716100f269de3922f17a582c8c20ec40327b65e1c16347a5b33d44131e56a7667233ebba88ff36a4e854beedd13e848897ba09a7e64 WHIRLPOOL 34dae0b20d472b4020986d0768ea6757c977fa4626666a9f81711007c051e76f9ad60f5a3bc77c768975e71a791f20e5ca2bb6f2fc41d809ebe2541129c975ef
-DIST certbot-0.17.0.tar.gz 1036099 SHA256 ed4334dce166bf38ecc7218449efda3798d62c7e2934a71702c0dc3d78eccdd1 SHA512 57fa830d19173eacdbb17242a3c446d9414f02e09fab6ccd41c82b15156bc103ec358ff3d515e94881fcf6438f6acfe449eee9bb3108df41f7b8f2395500b549 WHIRLPOOL cbfffc3866ffed3e0c702ac686768e879c7f1306a62dc050aab05e5a207b4f77a4acae9ca8f3ce973a6691d98838a488ab6335aa0692dd2b28a99c8aecff232d
 DIST certbot-0.18.2.tar.gz 1044019 SHA256 c8a94e3e2dfa8efa379912a8dc67f561cf6daf7d8e13dbb76b40a38cfb40c08d SHA512 30dea063cf8d4bd714a40c1a82a7f4aab51e3a7d4de0d5f9a923f95badb2881562562c4a198da6a4c3cd1db7f9e2d124c2def70f3a245faca0040438586bf6a4 WHIRLPOOL 79105ea9d54fdd42dbb4327dd3afa7beb80e5a13eef0a1d3236f5150b42281b299a06391a93372c80a04f0bd962565522e3ddd239cd4d2186e32262fedf97481
 DIST certbot-0.19.0.tar.gz 1061557 SHA256 164b496cc111f19619da1eac9e3fe03baac5ad5a97c2fa19eeffe07273c4b723 SHA512 d29c9e2041171f2574bf2ee9ff7442b80b261a03f9e82e4dd40aad0617730aca6bff17fcc728496bda4133f86a4894cf21d083dacb0d0df2dec11d23e4e1541b WHIRLPOOL 203f00121dfc95136821dcbe224419b02f4f03aa1bfaf1d5516baa7f3e43aa898f30488026a18ffb27d238c5603892df8fca059d0670993f6b72b27af7ac82a1
-DIST letsencrypt-0.1.0.tar.gz 524821 SHA256 1c1ac7b41e5e0fc0e41a7ef159ac9147a4aafff54453d57b519eb05bf52ade14 SHA512 6a786290362741ac97dcb4b59bc4cba56f3e8b5193bbc10be19086d462f76e6124259c42bac36afe9eb818f4bb9edec34f8e2a02bd8c855e3b35404f4ee81f96 WHIRLPOOL cdc41a3466de54ab8ddfeedea9935205d78383028769dcfbc876be0c2ef80c2d14f5d0e4a9c56a751163718f5ababb07848822989a060de7031ea8ebdf6424a0

app-crypt/acme/acme-0.1.0.ebuild

@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=(python{2_7,3_4,3_5})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/letsencrypt/letsencrypt.git"
-	inherit git-r3
-	KEYWORDS=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/letsencrypt/letsencrypt/archive/v${PV}.tar.gz -> letsencrypt-${PV}.tar.gz"
-	KEYWORDS="~amd64"
-	S=${WORKDIR}/letsencrypt-${PV}/acme
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of the ACME protocol"
-HOMEPAGE="https://github.com/letsencrypt/letsencrypt 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/ndg-httpsclient-0.4[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.15[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests -w ${PN} || die
-}

app-crypt/acme/acme-0.15.0.ebuild

@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-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.10[${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-0.16.0.ebuild

@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-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.10[${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-0.17.0.ebuild

@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-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.10[${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-0.19.0.ebuild

@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~ppc64 x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 

app-crypt/acme/acme-9999.ebuild

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

app-crypt/certbot-apache/Manifest

@@ -1,4 +1,2 @@
-DIST certbot-0.15.0.tar.gz 942788 SHA256 87d306b1c013b472b8f548b38ccc476c125816435bb3b99e932fed09ac777296 SHA512 e884b34985a1128ce94d6b2be77af6ee86ded8b870e066f3f4bc22f78501f3f0a51060edcf75a11cd31dd525388adb8ccc4e2da0068b5b75be131d0fb0ca6844 WHIRLPOOL 01b172e8c7ac5d3678ee608b36d93f23943bf17f1e9c593cc1af3febcf0549b03961e69e537f099643dd9ee268497f76c2c18d8fa7a1d45753bc50e670375317
-DIST certbot-0.17.0.tar.gz 1036099 SHA256 ed4334dce166bf38ecc7218449efda3798d62c7e2934a71702c0dc3d78eccdd1 SHA512 57fa830d19173eacdbb17242a3c446d9414f02e09fab6ccd41c82b15156bc103ec358ff3d515e94881fcf6438f6acfe449eee9bb3108df41f7b8f2395500b549 WHIRLPOOL cbfffc3866ffed3e0c702ac686768e879c7f1306a62dc050aab05e5a207b4f77a4acae9ca8f3ce973a6691d98838a488ab6335aa0692dd2b28a99c8aecff232d
 DIST certbot-0.18.2.tar.gz 1044019 SHA256 c8a94e3e2dfa8efa379912a8dc67f561cf6daf7d8e13dbb76b40a38cfb40c08d SHA512 30dea063cf8d4bd714a40c1a82a7f4aab51e3a7d4de0d5f9a923f95badb2881562562c4a198da6a4c3cd1db7f9e2d124c2def70f3a245faca0040438586bf6a4 WHIRLPOOL 79105ea9d54fdd42dbb4327dd3afa7beb80e5a13eef0a1d3236f5150b42281b299a06391a93372c80a04f0bd962565522e3ddd239cd4d2186e32262fedf97481
 DIST certbot-0.19.0.tar.gz 1061557 SHA256 164b496cc111f19619da1eac9e3fe03baac5ad5a97c2fa19eeffe07273c4b723 SHA512 d29c9e2041171f2574bf2ee9ff7442b80b261a03f9e82e4dd40aad0617730aca6bff17fcc728496bda4133f86a4894cf21d083dacb0d0df2dec11d23e4e1541b WHIRLPOOL 203f00121dfc95136821dcbe224419b02f4f03aa1bfaf1d5516baa7f3e43aa898f30488026a18ffb27d238c5603892df8fca059d0670993f6b72b27af7ac82a1

app-crypt/certbot-apache/certbot-apache-0.15.0.ebuild

@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-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/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="~amd64"
-	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="~app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	~app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/python-augeas[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-	dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests || die
-}

app-crypt/certbot-apache/certbot-apache-0.17.0.ebuild

@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-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/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="~amd64"
-	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="~app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	~app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/python-augeas[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-	dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests || die
-}

app-crypt/certbot-apache/certbot-apache-0.19.0.ebuild

@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 

app-crypt/certbot-nginx/Manifest

@@ -1,4 +1,2 @@
-DIST certbot-0.15.0.tar.gz 942788 SHA256 87d306b1c013b472b8f548b38ccc476c125816435bb3b99e932fed09ac777296 SHA512 e884b34985a1128ce94d6b2be77af6ee86ded8b870e066f3f4bc22f78501f3f0a51060edcf75a11cd31dd525388adb8ccc4e2da0068b5b75be131d0fb0ca6844 WHIRLPOOL 01b172e8c7ac5d3678ee608b36d93f23943bf17f1e9c593cc1af3febcf0549b03961e69e537f099643dd9ee268497f76c2c18d8fa7a1d45753bc50e670375317
-DIST certbot-0.17.0.tar.gz 1036099 SHA256 ed4334dce166bf38ecc7218449efda3798d62c7e2934a71702c0dc3d78eccdd1 SHA512 57fa830d19173eacdbb17242a3c446d9414f02e09fab6ccd41c82b15156bc103ec358ff3d515e94881fcf6438f6acfe449eee9bb3108df41f7b8f2395500b549 WHIRLPOOL cbfffc3866ffed3e0c702ac686768e879c7f1306a62dc050aab05e5a207b4f77a4acae9ca8f3ce973a6691d98838a488ab6335aa0692dd2b28a99c8aecff232d
 DIST certbot-0.18.2.tar.gz 1044019 SHA256 c8a94e3e2dfa8efa379912a8dc67f561cf6daf7d8e13dbb76b40a38cfb40c08d SHA512 30dea063cf8d4bd714a40c1a82a7f4aab51e3a7d4de0d5f9a923f95badb2881562562c4a198da6a4c3cd1db7f9e2d124c2def70f3a245faca0040438586bf6a4 WHIRLPOOL 79105ea9d54fdd42dbb4327dd3afa7beb80e5a13eef0a1d3236f5150b42281b299a06391a93372c80a04f0bd962565522e3ddd239cd4d2186e32262fedf97481
 DIST certbot-0.19.0.tar.gz 1061557 SHA256 164b496cc111f19619da1eac9e3fe03baac5ad5a97c2fa19eeffe07273c4b723 SHA512 d29c9e2041171f2574bf2ee9ff7442b80b261a03f9e82e4dd40aad0617730aca6bff17fcc728496bda4133f86a4894cf21d083dacb0d0df2dec11d23e4e1541b WHIRLPOOL 203f00121dfc95136821dcbe224419b02f4f03aa1bfaf1d5516baa7f3e43aa898f30488026a18ffb27d238c5603892df8fca059d0670993f6b72b27af7ac82a1

app-crypt/certbot-nginx/certbot-nginx-0.15.0.ebuild

@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-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/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-CDEPEND=">=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	~app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	~app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"

app-crypt/certbot-nginx/certbot-nginx-0.17.0.ebuild

@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-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/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-CDEPEND=">=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	~app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	~app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"

app-crypt/certbot-nginx/certbot-nginx-0.19.0.ebuild

@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi
 

app-crypt/certbot/Manifest

@@ -1,4 +1,2 @@
-DIST certbot-0.15.0.tar.gz 942788 SHA256 87d306b1c013b472b8f548b38ccc476c125816435bb3b99e932fed09ac777296 SHA512 e884b34985a1128ce94d6b2be77af6ee86ded8b870e066f3f4bc22f78501f3f0a51060edcf75a11cd31dd525388adb8ccc4e2da0068b5b75be131d0fb0ca6844 WHIRLPOOL 01b172e8c7ac5d3678ee608b36d93f23943bf17f1e9c593cc1af3febcf0549b03961e69e537f099643dd9ee268497f76c2c18d8fa7a1d45753bc50e670375317
-DIST certbot-0.17.0.tar.gz 1036099 SHA256 ed4334dce166bf38ecc7218449efda3798d62c7e2934a71702c0dc3d78eccdd1 SHA512 57fa830d19173eacdbb17242a3c446d9414f02e09fab6ccd41c82b15156bc103ec358ff3d515e94881fcf6438f6acfe449eee9bb3108df41f7b8f2395500b549 WHIRLPOOL cbfffc3866ffed3e0c702ac686768e879c7f1306a62dc050aab05e5a207b4f77a4acae9ca8f3ce973a6691d98838a488ab6335aa0692dd2b28a99c8aecff232d
 DIST certbot-0.18.2.tar.gz 1044019 SHA256 c8a94e3e2dfa8efa379912a8dc67f561cf6daf7d8e13dbb76b40a38cfb40c08d SHA512 30dea063cf8d4bd714a40c1a82a7f4aab51e3a7d4de0d5f9a923f95badb2881562562c4a198da6a4c3cd1db7f9e2d124c2def70f3a245faca0040438586bf6a4 WHIRLPOOL 79105ea9d54fdd42dbb4327dd3afa7beb80e5a13eef0a1d3236f5150b42281b299a06391a93372c80a04f0bd962565522e3ddd239cd4d2186e32262fedf97481
 DIST certbot-0.19.0.tar.gz 1061557 SHA256 164b496cc111f19619da1eac9e3fe03baac5ad5a97c2fa19eeffe07273c4b723 SHA512 d29c9e2041171f2574bf2ee9ff7442b80b261a03f9e82e4dd40aad0617730aca6bff17fcc728496bda4133f86a4894cf21d083dacb0d0df2dec11d23e4e1541b WHIRLPOOL 203f00121dfc95136821dcbe224419b02f4f03aa1bfaf1d5516baa7f3e43aa898f30488026a18ffb27d238c5603892df8fca059d0670993f6b72b27af7ac82a1

app-crypt/certbot/certbot-0.15.0.ebuild

@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-CDEPEND=">=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	~app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.2[${PYTHON_USEDEP}]
-	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	test? (
-		>=dev-python/astroid-1.3.5[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pep8[${PYTHON_USEDEP}]
-		>=dev-python/pylint-1.4.2[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests -v ${PN} || die
-}

app-crypt/certbot/certbot-0.17.0.ebuild

@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-CDEPEND=">=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	~app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.2[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	test? (
-		>=dev-python/astroid-1.3.5[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/ipdb[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/pylint-1.4.2[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests -v ${PN} || die
-}

app-crypt/certbot/certbot-0.19.0.ebuild

@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~ppc64 x86"
 fi
 
 inherit distutils-r1

app-crypt/certbot/certbot-9999.ebuild

@@ -28,21 +28,21 @@ RDEPEND="
 	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
 	dev-python/configobj[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-1.2[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
 	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
 	dev-python/pyopenssl[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]"
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
 DEPEND="
 	${CDEPEND}
 	test? (
 		>=dev-python/astroid-1.3.5[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/ipdb[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pep8[${PYTHON_USEDEP}]
 		>=dev-python/pylint-1.4.2[${PYTHON_USEDEP}]
 		dev-python/wheel[${PYTHON_USEDEP}]
 	)"

app-dicts/gnome-dictionary/Manifest

@@ -1,3 +1,2 @@
-DIST gnome-dictionary-3.18.1.tar.xz 864460 SHA256 92cf2d519335b125018468c22405499fdb320e4446201c7b0f55f1a441bf05cc SHA512 efe4d1f8810bf218bae4d393be1d26938ed3a814ed22fb96c0bded5f874c32229b215351b08462eef1c92b756640a3d4e1c0f5ea1ee49f67e519bcf0d53aba74 WHIRLPOOL c20c73504e8ce0745170ec21296191d14770f252c80b208e4ac08659f80d2ece79cd2d408b4e3bdee992475a67be2ec77f4c16e501e8bbbebe8c0a95c3911e7b
 DIST gnome-dictionary-3.20.0.tar.xz 871916 SHA256 efb36377d46eff9291d3b8fec37baab2355f9dc8bc7edb791b6a625574716121 SHA512 9be2564b5bf543e80afdb946c16b16e2daf6c31875e352b7c2d7e34436791fc9470eadb42eba3a4c1893e2f2568e6bb88d19ea4a0b8dbb2eca2dd4c95aeaf229 WHIRLPOOL 4c22c0b2f7f668f5efc3857ba4bf33808d52a524b4d8ccbe1ac91839daff97d7271cf5f8196c0fbaa47266bb83f9f0705c83d1fe5949f633bfa50269554e057f
 DIST gnome-dictionary-3.24.0.tar.xz 878756 SHA256 41e7064a0cfab18e881a95ce9f1712ee5c9f426904b16f3bc04c35ebd1bbd9f2 SHA512 1c31149b02978a1840563941767e3ce2be4f6a5e790eb9126c0f0c50d932987f46447fe3bac0e2eb8ce87be1521d13e56d8a14e86407e367a6dd76cd5a77de30 WHIRLPOOL 3daf0e1efcf0783e6ad0d97877ff41037df0c257f60e95920d7dd1948a0f1c495964ee96497c826814d2e5a77a350da5eb0e5b6a49127065abd1264490f35010

app-dicts/gnome-dictionary/gnome-dictionary-3.18.1.ebuild

@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit gnome2
-
-DESCRIPTION="Dictionary utility for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Dictionary"
-
-LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
-SLOT="0/9" # subslot = suffix of libgdict-1.0.so
-IUSE="+introspection ipv6"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.39:2[dbus]
-	x11-libs/cairo:=
-	>=x11-libs/gtk+-3.14:3
-	x11-libs/pango
-	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gsettings-desktop-schemas
-	!<gnome-extra/gnome-utils-3.4
-"
-# ${PN} was part of gnome-utils before 3.4
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-doc-am-1.15
-	>=dev-util/intltool-0.40
-	dev-util/itstool
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		$(use_enable ipv6)
-}

app-emulation/vmware-modules/files/271-3.10-00-userns.patch

@@ -1,41 +0,0 @@
-correctly initializes UID/GID values
-gets UID correctly in light of user namespace API
-origionally from https://462666.bugs.gentoo.org/attachment.cgi?id=342888
-
---- a/vmblock-only/linux/inode.c   2013-03-20 17:37:48.000000000 +0100
-+++ b/vmblock-only/linux/inode.c   2013-03-20 17:41:22.000000000 +0100
-@@ -135,7 +135,8 @@
-    inode->i_size = INODE_TO_IINFO(inode)->nameLen;
-    inode->i_version = 1;
-    inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
--   inode->i_uid = inode->i_gid = 0;
-+   inode->i_uid = GLOBAL_ROOT_UID;
-+   inode->i_gid = GLOBAL_ROOT_GID;
-    inode->i_op = &LinkInodeOps;
- 
-    d_add(dentry, inode);
-
---- a/vmci-only/linux/driver.c    2013-03-20 17:57:35.000000000 +0100
-+++ b/vmci-only/linux/driver.c    2013-03-20 17:57:43.000000000 +0100
-@@ -740,7 +740,7 @@
-          goto init_release;
-       }
- 
--      user = current_uid();
-+      user = from_kuid(current_user_ns(), current_uid());
-       retval = VMCIContext_InitContext(initBlock.cid, initBlock.flags,
-                                        0 /* Unused */, vmciLinux->userVersion,
-                                        &user, &vmciLinux->context);
-
---- a/vsock-only/linux/af_vsock.c 2013-03-20 18:01:48.000000000 +0100
-+++ b/vsock-only/linux/af_vsock.c 2013-03-20 18:01:58.000000000 +0100
-@@ -2866,7 +2866,7 @@
-       vsk->connectTimeout = psk->connectTimeout;
-    } else {
-       vsk->trusted = capable(CAP_NET_ADMIN);
--      vsk->owner = current_uid();
-+      vsk->owner = from_kuid(current_user_ns(), current_uid());
-       vsk->queuePairSize = VSOCK_DEFAULT_QP_SIZE;
-       vsk->queuePairMinSize = VSOCK_DEFAULT_QP_SIZE_MIN;
-       vsk->queuePairMaxSize = VSOCK_DEFAULT_QP_SIZE_MAX;
-

app-emulation/vmware-modules/files/271-3.10-01-create_proc_entry.patch

@@ -1,28 +0,0 @@
-uses the new proc_create function to create /proc entries
-instead of create_proc_entry which was deprecated: 
-https://lkml.org/lkml/2013/4/11/215
-
---- a/vmblock-only/linux/control.c	2013-05-21 19:21:19.165750556 +0200
-+++ b/vmblock-only/linux/control.c	2013-05-21 19:22:18.363747723 +0200
-@@ -208,9 +208,10 @@
-    VMBlockSetProcEntryOwner(controlProcMountpoint);
- 
-    /* Create /proc/fs/vmblock/dev */
--   controlProcEntry = create_proc_entry(VMBLOCK_CONTROL_DEVNAME,
--                                        VMBLOCK_CONTROL_MODE,
--                                        controlProcDirEntry);
-+   controlProcEntry = proc_create(VMBLOCK_CONTROL_DEVNAME,
-+                                  VMBLOCK_CONTROL_MODE,
-+                                  controlProcDirEntry,
-+                                  &ControlFileOps);
-    if (!controlProcEntry) {
-       Warning("SetupProcDevice: could not create " VMBLOCK_DEVICE "\n");
-       remove_proc_entry(VMBLOCK_CONTROL_MOUNTPOINT, controlProcDirEntry);
-@@ -218,7 +219,6 @@
-       return -EINVAL;
-    }
- 
--   controlProcEntry->proc_fops = &ControlFileOps;
-    return 0;
- }
- 

app-emulation/vmware-modules/files/271-3.10-02-getname.patch

@@ -1,24 +0,0 @@
-uses __getname/__putname instead of getname. getname was deprecated
-the new code calls __getname (which really is a specific type of 
-memory allocator, then copies the string safely from user space
-into the allocated buffer
-
---- vmblock-only/linux/control.c	2014-03-15 15:28:40.871076076 +0100
-+++ vmblock-only/linux/control.c.new	2014-03-15 15:29:15.079074439 +0100
-@@ -279,11 +279,17 @@
-    int i;
-    int retval;
- 
--   name = getname(buf);
-+   name = __getname();
-    if (IS_ERR(name)) {
-       return PTR_ERR(name);
-    }
- 
-+   i = strncpy_from_user(name, buf, PATH_MAX);
-+   if (i < 0 || i == PATH_MAX) {
-+      __putname(name);
-+      return -EINVAL;
-+   }
-+
-    for (i = strlen(name) - 1; i >= 0 && name[i] == '/'; i--) {

app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch

@@ -1,89 +0,0 @@
-undefines DEPRECATED which is unfortunately also defined (as a string)
-in <linux/printk.h>. Realistically, this macro isn't even used, so this
-doesn't matter much. But it hushes some very loud warnings.
-
-diff -rupN vmblock-only/shared/vm_assert.h vmblock-only.new/shared/vm_assert.h
---- vmblock-only/shared/vm_assert.h	2014-10-09 21:50:54.221159088 -0400
-+++ vmblock-only.new/shared/vm_assert.h	2014-10-09 21:53:04.612166156 -0400
-@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
- #define LOG_ONCE(_s) DO_ONCE(Log _s)
- 
- #ifdef VMX86_DEVEL
-+   #undef DEPRECATED
-    #define DEPRECATED(_fix) DO_ONCE(                                        \
-                                Warning("%s:%d: %s is DEPRECATED; %s\n",     \
-                                           __FILE__, __LINE__, __FUNCTION__, \
-                                           _fix))
- #else
-+   #undef DEPRECATED
-    #define DEPRECATED(_fix) do {} while (0)
- #endif
- 
-diff -rupN vmci-only/shared/vm_assert.h vmci-only.new/shared/vm_assert.h
---- vmci-only/shared/vm_assert.h	2014-10-09 21:50:54.222159088 -0400
-+++ vmci-only.new/shared/vm_assert.h	2014-10-09 21:52:52.348165492 -0400
-@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
- #define LOG_ONCE(_s) DO_ONCE(Log _s)
- 
- #ifdef VMX86_DEVEL
-+   #undef DEPRECATED
-    #define DEPRECATED(_fix) DO_ONCE(                                        \
-                                Warning("%s:%d: %s is DEPRECATED; %s\n",     \
-                                           __FILE__, __LINE__, __FUNCTION__, \
-                                           _fix))
- #else
-+   #undef DEPRECATED
-    #define DEPRECATED(_fix) do {} while (0)
- #endif
- 
-diff -rupN vmmon-only/include/vm_assert.h vmmon-only.new/include/vm_assert.h
---- vmmon-only/include/vm_assert.h	2014-10-09 21:50:54.222159088 -0400
-+++ vmmon-only.new/include/vm_assert.h	2014-10-09 21:52:36.877164653 -0400
-@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
- #define LOG_ONCE(_s) DO_ONCE(Log _s)
- 
- #ifdef VMX86_DEVEL
-+   #undef DEPRECATED
-    #define DEPRECATED(_fix) DO_ONCE(                                        \
-                                Warning("%s:%d: %s is DEPRECATED; %s\n",     \
-                                           __FILE__, __LINE__, __FUNCTION__, \
-                                           _fix))
- #else
-+   #undef DEPRECATED
-    #define DEPRECATED(_fix) do {} while (0)
- #endif
- 
-diff -rupN vmnet-only/vm_assert.h vmnet-only.new/vm_assert.h
---- vmnet-only/vm_assert.h	2014-10-09 21:50:54.222159088 -0400
-+++ vmnet-only.new/vm_assert.h	2014-10-09 21:52:57.736165784 -0400
-@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
- #define LOG_ONCE(_s) DO_ONCE(Log _s)
- 
- #ifdef VMX86_DEVEL
-+   #undef DEPRECATED
-    #define DEPRECATED(_fix) DO_ONCE(                                        \
-                                Warning("%s:%d: %s is DEPRECATED; %s\n",     \
-                                           __FILE__, __LINE__, __FUNCTION__, \
-                                           _fix))
- #else
-+   #undef DEPRECATED
-    #define DEPRECATED(_fix) do {} while (0)
- #endif
- 
-diff -rupN vsock-only/shared/vm_assert.h vsock-only.new/shared/vm_assert.h
---- vsock-only/shared/vm_assert.h	2014-10-09 21:50:54.222159088 -0400
-+++ vsock-only.new/shared/vm_assert.h	2014-10-09 21:52:45.352165112 -0400
-@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
- #define LOG_ONCE(_s) DO_ONCE(Log _s)
- 
- #ifdef VMX86_DEVEL
-+   #undef DEPRECATED
-    #define DEPRECATED(_fix) DO_ONCE(                                        \
-                                Warning("%s:%d: %s is DEPRECATED; %s\n",     \
-                                           __FILE__, __LINE__, __FUNCTION__, \
-                                           _fix))
- #else
-+   #undef DEPRECATED
-    #define DEPRECATED(_fix) do {} while (0)
- #endif
- 

app-emulation/vmware-modules/files/271-3.10-04-unused-typedef.patch

@@ -1,115 +0,0 @@
-hushes warnings about unused typedefs which are part of the "static assert"
-technique that the code uses. We simply add an "__attribute__((unused)) to each of them
-
---- vmblock-only/shared/vm_assert.h	2014-10-07 22:43:39.519402467 -0400
-+++ vmblock-only/shared/vm_assert.h	2014-10-07 22:48:01.346409957 -0400
-@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou
- #define ASSERT_ON_COMPILE(e) \
-    do { \
-       enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \
--      typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
-+      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
-    } while (0)
- 
- 
---- vmci-only/shared/vm_assert.h	2014-10-07 22:43:39.519402467 -0400
-+++ vmci-only/shared/vm_assert.h	2014-10-07 22:47:51.829409685 -0400
-@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou
- #define ASSERT_ON_COMPILE(e) \
-    do { \
-       enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \
--      typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
-+      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
-    } while (0)
- 
- 
---- vmmon-only/include/vm_assert.h	2014-10-07 22:43:39.520402467 -0400
-+++ vmmon-only/include/vm_assert.h	2014-10-07 22:47:39.246409325 -0400
-@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou
- #define ASSERT_ON_COMPILE(e) \
-    do { \
-       enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \
--      typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
-+      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
-    } while (0)
- 
- 
---- vmnet-only/vm_assert.h	2014-10-07 22:43:39.520402467 -0400
-+++ vmnet-only/vm_assert.h	2014-10-07 22:47:55.804409799 -0400
-@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou
- #define ASSERT_ON_COMPILE(e) \
-    do { \
-       enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \
--      typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
-+      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
-    } while (0)
- 
- 
---- vsock-only/shared/vm_assert.h	2014-10-07 22:47:11.595408534 -0400
-+++ vsock-only/shared/vm_assert.h	2014-10-07 22:45:55.715406363 -0400
-@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou
- #define ASSERT_ON_COMPILE(e) \
-    do { \
-       enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \
--      typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
-+      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
-    } while (0)
- 
- 
---- vsock-only/shared/vm_atomic.h	2013-11-05 23:33:27.000000000 -0500
-+++ vsock-only/shared/vm_atomic.h	2014-10-07 22:53:06.024418673 -0400
-@@ -2394,7 +2394,7 @@ Atomic_TestBit64(Atomic_uint64 *var, //
-                                       && 8 * sizeof (out) == size             \
-                                       && 8 * sizeof (cast) == size            \
-                                          ? 1 : -1 };                          \
--      typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
-+      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
-    }                                                                          \
-                                                                               \
-                                                                               \
---- vmci-only/shared/vm_atomic.h	2013-11-05 23:33:27.000000000 -0500
-+++ vmci-only/shared/vm_atomic.h	2014-10-07 22:53:24.873419213 -0400
-@@ -2394,7 +2394,7 @@ Atomic_TestBit64(Atomic_uint64 *var, //
-                                       && 8 * sizeof (out) == size             \
-                                       && 8 * sizeof (cast) == size            \
-                                          ? 1 : -1 };                          \
--      typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
-+      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
-    }                                                                          \
-                                                                               \
-                                                                               \
-
---- vmblock-only/shared/vm_atomic.h	2013-11-05 23:33:27.000000000 -0500
-+++ vmblock-only/shared/vm_atomic.h	2014-10-07 22:53:31.073419390 -0400
-@@ -2394,7 +2394,7 @@ Atomic_TestBit64(Atomic_uint64 *var, //
-                                       && 8 * sizeof (out) == size             \
-                                       && 8 * sizeof (cast) == size            \
-                                          ? 1 : -1 };                          \
--      typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
-+      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
-    }                                                                          \
-                                                                               \
-
---- vmnet-only/vm_atomic.h	2013-11-06 00:40:52.000000000 -0500
-+++ vmnet-only/vm_atomic.h	2014-10-07 23:04:50.637438831 -0400
-@@ -2394,7 +2394,7 @@ Atomic_TestBit64(Atomic_uint64 *var, //
-                                       && 8 * sizeof (out) == size             \
-                                       && 8 * sizeof (cast) == size            \
-                                          ? 1 : -1 };                          \
--      typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
-+      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
-    }                                                                          \
-                                                                               \
-                                                                               \
-																			   
---- vmmon-only/include/vm_atomic.h   2013-11-06 00:40:52.000000000 -0500
-+++ vmmon-only/include/vm_atomic.h   2014-10-07 23:04:50.637438831 -0400
-@@ -2394,7 +2394,7 @@ Atomic_TestBit64(Atomic_uint64 *var, //
-                                       && 8 * sizeof (out) == size             \
-                                       && 8 * sizeof (cast) == size            \
-                                          ? 1 : -1 };                          \
--      typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
-+      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
-    }                                                                          \
-                                                                               \
-                                                                               \

app-emulation/vmware-modules/files/271-3.10-05-dentry.patch

@@ -1,34 +0,0 @@
-starting with kernel 3.6, d_revalidate takes an unsigned int "flags"
-as the second argument, not a nameidata pointer! see fs/namei.c 
-for implementation
-
-diff -Naur vmblock-only/linux/dentry.c vmblock-only/linux/dentry.c
---- vmblock-only/linux/dentry.c	2013-11-05 23:33:26.000000000 -0500
-+++ vmblock-only/linux/dentry.c	2014-04-26 10:58:03.062635343 -0400
-@@ -32,7 +32,7 @@
- #include "block.h"
- 
- 
--static int DentryOpRevalidate(struct dentry *dentry, struct nameidata *nd);
-+static int DentryOpRevalidate(struct dentry *dentry, unsigned int flags);
- 
- struct dentry_operations LinkDentryOps = {
-    .d_revalidate = DentryOpRevalidate,
-@@ -60,7 +60,7 @@
- 
- static int
- DentryOpRevalidate(struct dentry *dentry,  // IN: dentry revalidating
--                   struct nameidata *nd)   // IN: lookup flags & intent
-+                   unsigned int flags)   // IN: lookup flags & intent
- {
-    VMBlockInodeInfo *iinfo;
-    struct nameidata actualNd;
-@@ -101,7 +101,7 @@
-    if (actualDentry &&
-        actualDentry->d_op &&
-        actualDentry->d_op->d_revalidate) {
--      return actualDentry->d_op->d_revalidate(actualDentry, nd);
-+      return actualDentry->d_op->d_revalidate(actualDentry, flags);
-    }
- 
-    if (compat_path_lookup(iinfo->name, 0, &actualNd)) {

app-emulation/vmware-modules/files/271-3.10-06-inode.patch

@@ -1,36 +0,0 @@
-starting with kernel 3.6, d_revalidate takes an unsigned int "flags"
-as the second argument, not a nameidata pointer! see fs/namei.c 
-for implementation. Also changing vfs_follow_link to nd_set_link.
-See: https://lkml.org/lkml/2013/9/9/236
-
-diff -Naur vmblock-only/linux/inode.c vmblock-only/linux/inode.c
---- vmblock-only/linux/inode.c	2013-11-05 23:33:26.000000000 -0500
-+++ vmblock-only/linux/inode.c	2014-04-26 10:58:03.063635343 -0400
-@@ -36,7 +36,7 @@
- 
- /* Inode operations */
- static struct dentry *InodeOpLookup(struct inode *dir,
--                                    struct dentry *dentry, struct nameidata *nd);
-+                                    struct dentry *dentry, unsigned int flags);
- static int InodeOpReadlink(struct dentry *dentry, char __user *buffer, int buflen);
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
- static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
-@@ -75,7 +75,7 @@
- static struct dentry *
- InodeOpLookup(struct inode *dir,      // IN: parent directory's inode
-               struct dentry *dentry,  // IN: dentry to lookup
--              struct nameidata *nd)   // IN: lookup intent and information
-+              unsigned int flags)   // IN: lookup intent and information
- {
-    char *filename;
-    struct inode *inode;
-@@ -221,7 +221,8 @@
-       goto out;
-    }
- 
--   ret = vfs_follow_link(nd, iinfo->name);
-+   nd_set_link(nd, iinfo->name);
-+   ret = 0;
- 
- out:
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)

app-emulation/vmware-modules/files/271-3.10-07-hub.patch

@@ -1,26 +0,0 @@
-fixes a bug where sizeof was being used on a pointer when they clearly
-meant to use the size of the array referred to. Fortunately, the amount is
-always smaller than the actual size of the buffer, so likely not a security issue
-(and was fixed in vmware-workstaiton 10
-
-diff -rupN vmnet-only/hub.c vmnet-only.new/hub.c
---- vmnet-only/hub.c	2013-11-06 00:40:52.000000000 -0500
-+++ vmnet-only.new/hub.c	2014-10-07 18:45:34.403918680 -0400
-@@ -129,7 +129,7 @@ VNetHubFindHubByID(uint8 idNum[VNET_PVN_
- {
-    VNetHub *currHub = vnetHub;
-    while (currHub && (currHub->hubType != HUB_TYPE_PVN ||
--		      memcmp(idNum, currHub->id.pvnID, sizeof idNum))) {
-+		      memcmp(idNum, currHub->id.pvnID, VNET_PVN_ID_LEN))) {
-       currHub = currHub->next;
-    }
-    return currHub;
-@@ -312,7 +312,7 @@ VNetHubAlloc(Bool allocPvn, // IN: TRUE
- 
-       if (allocPvn) {
- 	 hub->hubType = HUB_TYPE_PVN;
--	 memcpy(hub->id.pvnID, id, sizeof id);
-+	 memcpy(hub->id.pvnID, id, VNET_PVN_ID_LEN);
- 	 ++pvnInstance;
-       } else {
- 	 hub->hubType = HUB_TYPE_VNET;

app-emulation/vmware-modules/files/271-3.10.0.patch

@@ -1,809 +0,0 @@
---- a/vmnet-only/bridge.c
-+++ b/vmnet-only/bridge.c
-@@ -105,8 +105,6 @@ static Bool VNetBridgeCycleDetect(VNetJack *this, int generation);
- static Bool VNetBridgeIsDeviceWireless(struct net_device *dev);
- static void VNetBridgePortsChanged(VNetJack *this);
- static int  VNetBridgeIsBridged(VNetJack *this);
--static int  VNetBridgeProcRead(char *page, char **start, off_t off,
--                               int count, int *eof, void *data);
- static void VNetBridgeComputeHeaderPosIPv6(struct sk_buff *skb);
- static PacketStatus VNetCallSMACFunc(struct SMACState *state,
-                                      struct sk_buff **skb, void *startOfData,
-@@ -225,6 +223,53 @@ VNetBridgeDevCompatible(VNetBridge *bridge,      // IN: Bridge
- /*
-  *----------------------------------------------------------------------
-  *
-+ * VNetBridgeProcShow --
-+ *
-+ *      Callback for read operation on this bridge entry in vnets proc fs.
-+ *
-+ * Results:
-+ *      Length of read operation.
-+ *
-+ * Side effects:
-+ *      None.
-+ *
-+ *----------------------------------------------------------------------
-+ */
-+
-+int
-+VNetBridgeProcShow(struct seq_file *seqf, // IN/OUT: buffer to write into
-+                   void    *data)   // IN: client data - pointer to bridge
-+{
-+   VNetBridge *bridge = (VNetBridge*)data;
-+
-+   if (!bridge) {
-+      return 0;
-+   }
-+
-+   VNetPrintPort(&bridge->port, seqf);
-+
-+   seq_printf(seqf, "dev %s ", bridge->name);
-+
-+   seq_printf(seqf, "\n");
-+
-+   return 0;
-+}
-+
-+static int proc_bridge_open(struct inode *inode, struct file *file)
-+{
-+       return single_open(file, VNetBridgeProcShow, PDE_DATA(inode));
-+}
-+
-+static const struct file_operations proc_bridge_fops = {
-+       .open           = proc_bridge_open,
-+       .read           = seq_read,
-+       .llseek         = seq_lseek,
-+       .release        = seq_release,
-+};
-+
-+/*
-+ *----------------------------------------------------------------------
-+ *
-  * VNetBridge_Create --
-  *
-  *      Creates a bridge. Allocates struct, allocates internal device,
-@@ -319,17 +364,14 @@ VNetBridge_Create(const char *devName, // IN:  name of device (e.g., "eth0")
-     * Make proc entry for this jack.
-     */
- 
--   retval = VNetProc_MakeEntry(bridge->port.jack.name, S_IFREG,
--                               &bridge->port.jack.procEntry);
-+   retval = VNetProc_MakeEntryOps(bridge->port.jack.name, S_IFREG,
-+                               &bridge->port.jack.procEntry, &proc_bridge_fops, bridge);
-    if (retval) {
-       if (retval == -ENXIO) {
-          bridge->port.jack.procEntry = NULL;
-       } else {
-          goto out;
-       }
--   } else {
--      bridge->port.jack.procEntry->read_proc = VNetBridgeProcRead;
--      bridge->port.jack.procEntry->data = bridge;
-    }
- 
-    /*
-@@ -1719,45 +1761,3 @@ VNetBridgeReceiveFromDev(struct sk_buff *skb,         // IN: packet to receive
-    return 0;
- }
- 
--
--/*
-- *----------------------------------------------------------------------
-- *
-- * VNetBridgeProcRead --
-- *
-- *      Callback for read operation on this bridge entry in vnets proc fs.
-- *
-- * Results:
-- *      Length of read operation.
-- *
-- * Side effects:
-- *      None.
-- *
-- *----------------------------------------------------------------------
-- */
--
--int
--VNetBridgeProcRead(char    *page,   // IN/OUT: buffer to write into
--                   char   **start,  // OUT: 0 if file < 4k, else offset into page
--                   off_t    off,    // IN: (unused) offset of read into the file
--                   int      count,  // IN: (unused) maximum number of bytes to read
--                   int     *eof,    // OUT: TRUE if there is nothing more to read
--                   void    *data)   // IN: client data - pointer to bridge
--{
--   VNetBridge *bridge = (VNetBridge*)data;
--   int len = 0;
--
--   if (!bridge) {
--      return len;
--   }
--
--   len += VNetPrintPort(&bridge->port, page+len);
--
--   len += sprintf(page+len, "dev %s ", bridge->name);
--
--   len += sprintf(page+len, "\n");
--
--   *start = 0;
--   *eof   = 1;
--   return len;
--}
---- a/vmnet-only/driver.c
-+++ b/vmnet-only/driver.c
-@@ -1785,21 +1785,17 @@ VNetSetMACUnique(VNetPort *port,            // IN:
-  *----------------------------------------------------------------------
-  */
- 
--int
-+void
- VNetPrintJack(const VNetJack *jack, // IN: jack
--              char           *buf)  // OUT: info about jack
-+              struct seq_file *seqf)  // OUT: info about jack
- {
--   int len = 0;
--
-    read_lock(&vnetPeerLock);
-    if (!jack->peer) {
--      len += sprintf(buf+len, "connected not ");
-+      seq_printf(seqf, "connected not ");
-    } else {
--      len += sprintf(buf+len, "connected %s ", jack->peer->name);
-+      seq_printf(seqf, "connected %s ", jack->peer->name);
-    }
-    read_unlock(&vnetPeerLock);
--
--   return len;
- }
- 
- 
-@@ -1819,52 +1815,48 @@ VNetPrintJack(const VNetJack *jack, // IN: jack
-  *----------------------------------------------------------------------
-  */
- 
--int
-+void
- VNetPrintPort(const VNetPort *port, // IN: port
--              char           *buf)  // OUT: info about port
-+              struct seq_file *seqf)  // OUT: info about port
- {
--   int len = 0;
-+   VNetPrintJack(&port->jack, seqf);
- 
--   len += VNetPrintJack(&port->jack, buf+len);
--
--   len += sprintf(buf+len, "mac %02x:%02x:%02x:%02x:%02x:%02x ",
-+   seq_printf(seqf, "mac %02x:%02x:%02x:%02x:%02x:%02x ",
-                   port->paddr[0], port->paddr[1], port->paddr[2],
-                   port->paddr[3], port->paddr[4], port->paddr[5]);
- 
--   len += sprintf(buf+len, "ladrf %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x ",
-+   seq_printf(seqf, "ladrf %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x ",
-                   port->ladrf[0], port->ladrf[1], port->ladrf[2],
-                   port->ladrf[3], port->ladrf[4], port->ladrf[5],
-                   port->ladrf[6], port->ladrf[7]);
- 
--   len += sprintf(buf+len, "flags IFF_RUNNING");
-+   seq_printf(seqf, "flags IFF_RUNNING");
- 
-    if (port->flags & IFF_UP) {
--      len += sprintf(buf+len, ",IFF_UP");
-+      seq_printf(seqf, ",IFF_UP");
-    }
- 
-    if (port->flags & IFF_BROADCAST) {
--      len += sprintf(buf+len, ",IFF_BROADCAST");
-+      seq_printf(seqf, ",IFF_BROADCAST");
-    }
- 
-    if (port->flags & IFF_DEBUG) {
--      len += sprintf(buf+len, ",IFF_DEBUG");
-+      seq_printf(seqf, ",IFF_DEBUG");
-    }
- 
-    if (port->flags & IFF_PROMISC) {
--      len += sprintf(buf+len, ",IFF_PROMISC");
-+      seq_printf(seqf, ",IFF_PROMISC");
-    }
- 
-    if (port->flags & IFF_MULTICAST) {
--      len += sprintf(buf+len, ",IFF_MULTICAST");
-+      seq_printf(seqf, ",IFF_MULTICAST");
-    }
- 
-    if (port->flags & IFF_ALLMULTI) {
--      len += sprintf(buf+len, ",IFF_ALLMULTI");
-+      seq_printf(seqf, ",IFF_ALLMULTI");
-    }
- 
--   len += sprintf(buf+len, " ");
--
--   return len;
-+   seq_printf(seqf, " ");
- }
- 
- 
---- a/vmnet-only/hub.c
-+++ b/vmnet-only/hub.c
-@@ -25,6 +25,7 @@
- #include <linux/sched.h>
- #include <linux/slab.h>
- #include <linux/poll.h>
-+#include <linux/seq_file.h>
- 
- #include <linux/netdevice.h>
- #include <linux/etherdevice.h>
-@@ -71,8 +72,6 @@ static void VNetHubReceive(VNetJack *this, struct sk_buff *skb);
- static Bool VNetHubCycleDetect(VNetJack *this, int generation);
- static void VNetHubPortsChanged(VNetJack *this);
- static int  VNetHubIsBridged(VNetJack *this);
--static int  VNetHubProcRead(char *page, char **start, off_t off,
--                            int count, int *eof, void *data);
- 
- static VNetHub *vnetHub;
- static DEFINE_SPINLOCK(vnetHubLock);
-@@ -241,6 +240,53 @@ VNetHub_AllocPvn(uint8 id[]) // IN: the PVN ID to alloc on
- /*
-  *----------------------------------------------------------------------
-  *
-+ * VNetHubProcShow --
-+ *
-+ *      Callback for read operation on hub entry in vnets proc fs.
-+ *
-+ * Results:
-+ *      Length of read operation.
-+ *
-+ * Side effects:
-+ *      None.
-+ *
-+ *----------------------------------------------------------------------
-+ */
-+
-+int
-+VNetHubProcShow(struct seq_file  *seqf,   // IN/OUT: buffer to write into
-+                void    *data)   // IN: client data - not used
-+{
-+   VNetJack *jack = (VNetJack*)data;
-+   VNetHub *hub;
-+
-+   if (!jack || !jack->private) {
-+      return 0;
-+   }
-+   hub = (VNetHub*)jack->private;
-+
-+   VNetPrintJack(jack, seqf);
-+
-+   seq_printf(seqf, "tx %u ", hub->stats[jack->index].tx);
-+   seq_printf(seqf, "\n");
-+   return 0;
-+}
-+
-+static int proc_hub_open(struct inode *inode, struct file *file)
-+{
-+       return single_open(file, VNetHubProcShow, PDE_DATA(inode));
-+}
-+
-+static const struct file_operations proc_hub_fops = {
-+       .open           = proc_hub_open,
-+       .read           = seq_read,
-+       .llseek         = seq_lseek,
-+       .release        = seq_release,
-+};
-+
-+/*
-+ *----------------------------------------------------------------------
-+ *
-  * VNetHubAlloc --
-  *
-  *      Allocate a jack on this hub.
-@@ -354,7 +400,7 @@ VNetHubAlloc(Bool allocPvn, // IN: TRUE for PVN, FALSE for vnet
-           * Make proc entry for this jack.
-           */
- 
--         retval = VNetProc_MakeEntry(jack->name, S_IFREG, &jack->procEntry);
-+         retval = VNetProc_MakeEntryOps(jack->name, S_IFREG, &jack->procEntry, &proc_hub_fops, jack);
-          if (retval) {
-             if (retval == -ENXIO) {
-                jack->procEntry = NULL;
-@@ -362,9 +408,6 @@ VNetHubAlloc(Bool allocPvn, // IN: TRUE for PVN, FALSE for vnet
- 	       hub->used[i] = FALSE;
-                return NULL;
-             }
--         } else {
--            jack->procEntry->read_proc = VNetHubProcRead;
--            jack->procEntry->data = jack;
-          }
- 
-          /*
-@@ -686,46 +729,3 @@ VNetHubIsBridged(VNetJack *this)
- }
- 
- 
--/*
-- *----------------------------------------------------------------------
-- *
-- * VNetHubProcRead --
-- *
-- *      Callback for read operation on hub entry in vnets proc fs.
-- *
-- * Results:
-- *      Length of read operation.
-- *
-- * Side effects:
-- *      None.
-- *
-- *----------------------------------------------------------------------
-- */
--
--int
--VNetHubProcRead(char    *page,   // IN/OUT: buffer to write into
--                char   **start,  // OUT: 0 if file < 4k, else offset into page
--                off_t    off,    // IN: offset of read into the file
--                int      count,  // IN: maximum number of bytes to read
--                int     *eof,    // OUT: TRUE if there is nothing more to read
--                void    *data)   // IN: client data - not used
--{
--   VNetJack *jack = (VNetJack*)data;
--   VNetHub *hub;
--   int len = 0;
--
--   if (!jack || !jack->private) {
--      return len;
--   }
--   hub = (VNetHub*)jack->private;
--
--   len += VNetPrintJack(jack, page+len);
--
--   len += sprintf(page+len, "tx %u ", hub->stats[jack->index].tx);
--
--   len += sprintf(page+len, "\n");
--
--   *start = 0;
--   *eof   = 1;
--   return len;
--}
---- a/vmnet-only/netif.c
-+++ b/vmnet-only/netif.c
-@@ -62,8 +62,6 @@ static int  VNetNetifStartXmit(struct sk_buff *skb, struct net_device *dev);
- static struct net_device_stats *VNetNetifGetStats(struct net_device *dev);
- static int  VNetNetifSetMAC(struct net_device *dev, void *addr);
- static void VNetNetifSetMulticast(struct net_device *dev);
--static int  VNetNetIfProcRead(char *page, char **start, off_t off,
--                              int count, int *eof, void *data);
- 
- /*
-  *----------------------------------------------------------------------
-@@ -116,6 +114,53 @@ VNetNetIfSetup(struct net_device *dev)  // IN:
- 
- }
- 
-+/*
-+ *----------------------------------------------------------------------
-+ *
-+ * VNetNetIfProcShow --
-+ *
-+ *      Callback for read operation on this netif entry in vnets proc fs.
-+ *
-+ * Results: 
-+ *      Length of read operation.
-+ *
-+ * Side effects:
-+ *      None.
-+ *
-+ *----------------------------------------------------------------------
-+ */
-+
-+int
-+VNetNetIfProcShow(struct seq_file *seqf, // IN/OUT: buffer to write into
-+                  void   *data)  // IN: client data
-+{
-+   VNetNetIF *netIf = data; 
-+   
-+   if (!netIf) {
-+      return 0;
-+   }
-+   
-+   VNetPrintPort(&netIf->port, seqf);
-+
-+   seq_printf(seqf, "dev %s ", netIf->dev->name);
-+   
-+   seq_printf(seqf, "\n");
-+
-+   return 0;
-+}
-+
-+static int proc_netif_open(struct inode *inode, struct file *file)
-+{
-+       return single_open(file, VNetNetIfProcShow, PDE_DATA(inode));
-+}
-+
-+static const struct file_operations proc_netif_fops = {
-+       .open           = proc_netif_open,
-+       .read           = seq_read,
-+       .llseek         = seq_lseek,
-+       .release        = seq_release,
-+};
-+
- 
- /*
-  *----------------------------------------------------------------------
-@@ -180,16 +225,13 @@ VNetNetIf_Create(char *devName,  // IN:
-     * Make proc entry for this jack.
-     */
- 
--   retval = VNetProc_MakeEntry(netIf->port.jack.name, S_IFREG,
--                               &netIf->port.jack.procEntry);
-+   retval = VNetProc_MakeEntryOps(netIf->port.jack.name, S_IFREG,
-+                               &netIf->port.jack.procEntry, &proc_netif_fops, netIf);
-    if (retval) {
-       netIf->port.jack.procEntry = NULL;
-       if (retval != -ENXIO) {
-          goto outFreeDev;
-       }