Sync with portage [Fri Aug 25 09:21:51 MSK 2017].

app-admin/ansible/ansible-2.3.2.0-r1.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_5 )
 
 inherit distutils-r1 eutils versionator
 

app-admin/ansible/ansible-9999.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_5 )
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
 
 inherit distutils-r1 git-r3
 

app-admin/entr/Manifest

@@ -1 +1,2 @@
 DIST entr-3.7.tar.gz 23326 SHA256 94efd50c8f7e9d569060d5deebf366c3565e81e814ab332b973d7298fa8ea22f SHA512 a1687ec2da99f65fba3f668e41345ba76cb8c87cc2343d98c0dcc0ac0dedeb40cd8b5fd9aa3eba1dee8add94585de939864633bf0020cea1043699019dfa15fe WHIRLPOOL 1a9077a3cd8939bcea49c42e2a85eb094840942bdd23f6911c32c9d3184f742d06666e12c3d53c5e99026c82a20612bce8fd9441ccb27eddb68b61196a79fee8
+DIST entr-3.8.tar.gz 24251 SHA256 ebb1e793d948db76481f081011bf1dad8b4449e067f4e5fe68176191f84b26bd SHA512 8530a40eefc78571f3a2ab09f63d25d880167ec2d76e0c32fb25dce40e22b3f9f3b5f27874c1b95480206628e314298f001a4c0b487485ac88f2996002b41a2a WHIRLPOOL 27ccd2d4be2758c765ccf834df45b53db8ca7a0de1c880dee5183f37e6838b1a2764801b33b4ecbb4ec890b97b90c720aba0dbc66d37c4dc943ffb61b21af320

app-admin/entr/entr-3.8.ebuild

@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Run arbitrary commands when files change"
+HOMEPAGE="http://entrproject.org"
+SRC_URI="http://entrproject.org/code/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	mv eradman-* "${P}" || die
+}
+
+src_configure() {
+	sh configure || die
+	sed -i -e 's#\(^PREFIX \).*#\1\?= /usr#' Makefile.bsd || die
+}

app-admin/sudo/Manifest

@@ -1,2 +1,2 @@
 DIST sudo-1.8.20p2.tar.gz 2930769 SHA256 bd42ae1059e935f795c69ea97b3de09fe9410a58a74b5d5e6836eb5067a445d9 SHA512 8bf67e687f7a84605fdef8d547b5cd661141b6c8fd25820c33c7e37e97ca7f21f564c3bae691f8a8cd08df7d80338e36a8f06bb5086cc104509d71d6ab1bceda WHIRLPOOL 4e9b6ddaba8cdb4d82358e01252136af56ae50f656f9802285471c7c1e5c831d26aa07cb78205f63ea6098f98846911938681a89256afe5419372039d0e4e792
-DIST sudo-1.8.21rc1.tar.gz 2976277 SHA256 c51c2e784a9471551d41d1cdd6e66cbce844ebbd4293e8b02c34e81901143f17 SHA512 6be684f410da05d40f4dfb9beceb94527f0f16dc3a69430f67ccdd33457451ad7064d0390e4114dcfe97137ce0c1c55a18fcafc46496515ad451259826335b47 WHIRLPOOL c6b166198f343934d03c447763351a0ae24dc138cd95f388f8b944d0a8388251aec5c9038305ea6f617738d048bc2ba6db9878550d5bb8de4ce8e577543fa160
+DIST sudo-1.8.21.tar.gz 2973939 SHA256 126e9214613e842e19a02658f060186fe6a5927948679d64895b17ed933bb523 SHA512 f3e4a39b6d5a58bc94e1d8ce997460fc317abd7ff8dce75c23a37668cba96ff3edbac76580b4d8bfec585013c6ff30b004d9eda6fe775700abe54ba9eaa9f31f WHIRLPOOL 7add1abf9badc68ec7ef10d99cd6c57cd6d279a66e342ad544f511e7f0c8d59bc1ddbf7d5d7cc91b72fe71d23d3f3005e5b60df1d0f6e2bf08c2b12745d093c2

app-arch/unrar/unrar-5.5.8.ebuild

@@ -14,7 +14,7 @@ SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="unRAR"
 # subslot = soname version
 SLOT="0/5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"

app-arch/xarchiver/Manifest

@@ -1,3 +1,4 @@
 DIST xarchiver-0.5.4.10.tar.gz 1011648 SHA256 bb452d8ef4eabb52ab1313b3867156ea5030b75f9e59c59c7ef487c8db9dbea4 SHA512 847ac018d0fb8b4531d0751ba5f32e902e8e8bcc66399e1f083e56605e22ccf5f7ac9b883aee7df1ab0d01db98878c6ed784c08051b4ab8f164f959d370844a1 WHIRLPOOL b733cd4fed3d2735b2d84ddd6210fc511574239c8824ad790045e7794a4d4a9ad8185fd04d444646d70a19b26f1584f89b107cf2ae889b5f67b023214e480ddd
+DIST xarchiver-0.5.4.11_p20170629.tar.gz 1052723 SHA256 2dabd6f5d96c5d886d9a5ed7d299cfc43d1fef88be37d1d298a78c4c01a63b45 SHA512 e63e9ddd98c5ec5708b74e993cb1901835c133e220ba95aa5a07cca01660fab5894533c57b39223db6155e2fc0ea014ce6eede853ebaf067de27f1e77c5e023f WHIRLPOOL 3516a976e6d5e161a1313d1e10d207e8344c26a0570fdd1cb1a271410bcf9ad2cab1fbce057f419e5e41833a56ff6995649a67abc47322a20f1de8f8e194035b
 DIST xarchiver-0.5.4.8.tar.gz 987648 SHA256 0947dce52538876d31e18ab89270f5eb52fba2c21ce877a4d56cdb5de5048e81 SHA512 d3be46b87c9475bfde2a3449511a08b1abef3d90b0b2c0e1165e093fa54210dbc2182b986a55e12e11bed67b516732f498c8038b360df3f697603befc2a4a8b3 WHIRLPOOL ba602771a06adfda1dc5a8cf1323deb339159b9399a54f4e47d42d0e56601eb93769bb2ac58bcd39f09ceaf7de9f837d4ec91eae150d1a12fda64e509d08a273
 DIST xarchiver-0.5.4.tar.bz2 1003045 SHA256 e63fa73979fcc56efe8cca9095fd915d31a1714ce9676246b8626f164e452ef4 SHA512 3b767c2601d94104e2fc72aa8d168afa5a154b5747a9b0518d1c348417e56e4c19d872a0029fb78decc897e0f3bc9573e17d0317b85f584e7275b0e519f5f30d WHIRLPOOL 3f5a277b05147daf29db0be26718ed51fa0bb6d2416ee41cdd8ce6c54bc66064fc5f313af39a32b428997f906c9fd4d1a0b8d60fe5d2d867b1137960b0cbe4d1

app-arch/xarchiver/xarchiver-0.5.4.11_p20170629.ebuild

@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2-utils xdg-utils
+
+MY_COMMIT=79a73d46b782cf8bb93d058d00d2cb81a9b3df8a
+DESCRIPTION="A GTK+ archive manager that can be used with Thunar"
+HOMEPAGE="https://github.com/ib/xarchiver"
+SRC_URI="https://github.com/ib/xarchiver/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND=">=dev-libs/glib-2:=
+	x11-libs/gtk+:3="
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xml-dtd
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxml2
+		dev-libs/libxslt
+	)"
+
+S="${WORKDIR}"/${PN}-${MY_COMMIT}
+
+src_prepare() {
+	sed -e '/COPYING/d' -e '/NEWS/d' -i doc/Makefile.am || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable doc)
+	)
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+
+	elog "You need external programs for some formats, including:"
+	elog "7zip - app-arch/p7zip"
+	elog "arj - app-arch/unarj app-arch/arj"
+	elog "lha - app-arch/lha"
+	elog "lzop - app-arch/lzop"
+	elog "rar - app-arch/unrar app-arch/rar"
+	elog "zip - app-arch/unzip app-arch/zip"
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}

app-backup/fsarchiver/Manifest

@@ -1,4 +1,2 @@
-DIST fsarchiver-0.6.19.tar.gz 244972 SHA256 9ba4d3262059a0cb108de564340d947a4d75d34ba3b8e35a767d543afbf24dbb SHA512 28c2b7c59fcdedd47c5451867540696e1859d954259670419df01fb94b626f169a2ff97b9eb96caaba69421ff2560cebbd6c7743b2a89172591f0747716a0471 WHIRLPOOL 78200870521adb927b042e3ada778ebb552f84c0164cf628fa5214f84f42a853fe71871d2ee27a6c485fa1db3c229002e52c6f11e58ef9766b38df6723e93f24
-DIST fsarchiver-0.6.24.tar.gz 261942 SHA256 535401b71b905ebf268bf45a24456d50cc5584c77119d93bf692b6a10c51cee3 SHA512 5c6338426f74625b5be3da4c0b5419e55a123dbdf2669198eeae902dff6b136f004f3279e805ec46ec283293088fb25eb1caaa202b853c9e0c254c7786bf12a4 WHIRLPOOL 0a8df7bdddb636d72036ce3a779f5fee7a9204e71471c42a03500e5a21b2b915df809e5b4bb2b94bc9402208fe5e304a21ced303d028564b12fd9696e05f8426
-DIST fsarchiver-0.8.0.tar.gz 264741 SHA256 68e98e51faa44abd593342503073cbce5f8ff74f87ecd45dfa45f68ad5e0a362 SHA512 3007ffa47c6399987f06cd53e30a1bbe9784703b97dd7383c5aa0a505bb64c94c89095f5b821ddebfb1eb76361babf08f0b64ab4a39ce3cc3f2f9a6f02f71fae WHIRLPOOL ab221d38787fdb5e9e0325acc98e5a24acece718719b41465681cdc539f366dd27287fe8677163cb61cb33f8abfb59cdc210ab059ea06622358825bba79b029c
 DIST fsarchiver-0.8.1.tar.gz 265048 SHA256 f21dc8f66a67e949c836f3316862db0619f14cf8971ba37342c0ae6e11e625f8 SHA512 17133392b0678b88552ae356bc199a8a5a8a88d3c8878b593b36acdc0f9dc3869f87475cc1a36d0df752e3bc3df8c9c0641954f675aaf60da4f1b0862dec1bc6 WHIRLPOOL 190450d064ed509f731c0104623e237ccca1f04d4cde3cae23d14a34bfc0ae567062bd081cb1523655d82ae62a1add99afa75260db815db96a0a145962bd8154
+DIST fsarchiver-0.8.2.tar.gz 296486 SHA256 e08ef19c6c64f0c756f7506427994a407ed243bd671c5c9cbcdf17349df00ee6 SHA512 e7b5b5dcd44be57d2d8a2639a54d8ef9c8bf9fde39ed3ca317c7cc124e1735a88db4a2be937b890c582eb4881926c8d50cdf940d13c0f97f9b8276f2b0a9319c WHIRLPOOL 8575388e86c13ae90d60eeb109b019c334d76e98b1e2f4ab3d8cd679b688bf18103d3af639da8f6da1b157311e506a74a53c1782a0f49554a6ef3f562195109f

app-backup/fsarchiver/fsarchiver-0.6.19.ebuild

@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools eutils
-
-DESCRIPTION="Flexible filesystem archiver for backup and deployment tool"
-HOMEPAGE="http://www.fsarchiver.org"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug lzma lzo static"
-
-DEPEND="dev-libs/libgcrypt:0
-	>=sys-fs/e2fsprogs-1.41.4
-	lzma? ( >=app-arch/xz-utils-4.999.9_beta )
-	lzo? ( >=dev-libs/lzo-2.02 )
-	static? ( lzma? ( app-arch/xz-utils[static-libs] ) )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e 's/^\([a-z]*_CFLAGS.*\)-ggdb/\1/' src/Makefile.am || die "seding
-	failed"
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable lzma) \
-	$(use_enable lzo) \
-	$(use_enable static) \
-	$(use_enable debug devel)
-}

app-backup/fsarchiver/fsarchiver-0.8.0.ebuild

@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Flexible filesystem archiver for backup and deployment tool"
-HOMEPAGE="http://www.fsarchiver.org"
-SRC_URI="https://github.com/fdupoux/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug lzma lzo static"
-
-DEPEND="dev-libs/libgcrypt:0=
-	>=sys-fs/e2fsprogs-1.41.4
-	lzma? ( >=app-arch/xz-utils-4.999.9_beta )
-	lzo? ( >=dev-libs/lzo-2.02 )
-	static? ( lzma? ( app-arch/xz-utils[static-libs] ) )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -i -e 's/^\([a-z]*_CFLAGS.*\)-ggdb/\1/' src/Makefile.am \
-		|| die "seding failed"
-	eautoreconf
-}
-
-src_configure() {
-	myeconfargs=(
-		$(use_enable lzma)
-		$(use_enable lzo)
-		$(use_enable static)
-		$(use_enable debug devel)
-	)
-	econf "${myeconfargs[@]}"
-}

app-backup/fsarchiver/fsarchiver-0.6.24.ebuild → app-backup/fsarchiver/fsarchiver-0.8.2.ebuild

@@ -29,7 +29,7 @@ src_prepare() {
 }
 
 src_configure() {
-	myeconfargs=(
+	local myeconfargs=(
 		$(use_enable lzma)
 		$(use_enable lzo)
 		$(use_enable static)

app-crypt/acme/Manifest

@@ -1,3 +1,4 @@
 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 letsencrypt-0.1.0.tar.gz 524821 SHA256 1c1ac7b41e5e0fc0e41a7ef159ac9147a4aafff54453d57b519eb05bf52ade14 SHA512 6a786290362741ac97dcb4b59bc4cba56f3e8b5193bbc10be19086d462f76e6124259c42bac36afe9eb818f4bb9edec34f8e2a02bd8c855e3b35404f4ee81f96 WHIRLPOOL cdc41a3466de54ab8ddfeedea9935205d78383028769dcfbc876be0c2ef80c2d14f5d0e4a9c56a751163718f5ababb07848822989a060de7031ea8ebdf6424a0

app-crypt/acme/acme-0.17.0.ebuild

@@ -0,0 +1,38 @@
+# 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/certbot-apache/Manifest

@@ -1 +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

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

@@ -0,0 +1,38 @@
+# 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/metadata.xml

@@ -1,7 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">certbot/certbot</remote-id>
 	</upstream>

app-crypt/certbot-nginx/Manifest

@@ -1 +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

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

@@ -0,0 +1,34 @@
+# 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/Manifest

@@ -1 +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

app-crypt/certbot/certbot-0.17.0.ebuild

@@ -0,0 +1,52 @@
+# 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-emulation/flannel/Manifest

@@ -1,26 +1 @@
-DIST ansicolor-a422bbe96644373c5753384a59d678f7d261ff10.tar.gz 7319 SHA256 5a240c42b5dfa34065d0aef36c1735682306d2175bf9ccb89e3b6be0e174df2f SHA512 adaab239eb195bc9b8394fc228b4ea6554c0c7e52a9d0fd8b80a7408302ac4cdcc072b1219e69d9db1c6791680077f6730e8ffe41208006a426247b2d135efea WHIRLPOOL 346cec6eacc39e96d9e98e6be69d4f658bef9c66c1dcfcf83fde997e43ca46ac10d8abcea94180515952799e0be01edea8d8202e17c87a42245c8da701e2fb3d
-DIST beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz 10593 SHA256 d80f6864af88af9a4f726d3a0ccaea30a3dd2a7c0ea3a79ab92a9987598bd9f0 SHA512 ecac8d361b4695b1fc32a9aaf9e0785201d1bebbf270226540e2c3fe193ad21f4fe8aed4e01937bd1e7273ca394455ca6fd7cf29418710f279cbb8eb92939e32 WHIRLPOOL 787aad3e28076b51c4904b3aaf8f01a69ce69988dc3e518c97b1a79ec8496f88b4e25ec25e89ae290935c748b3f8033f98906627ebfe2e0f6c9e489f5bffd7d6
-DIST bolt-1.3.0.tar.gz 80322 SHA256 e417fccc1186dcf8807e3b2a7afb31bad31faf2ca383d203002a7d783c872f13 SHA512 51b72f82cf055ab1b47ca51c16c9f3cd1293de4596e1294db83f348d7da62ee2230fc94cb11347483f81783e23e5763424f697a4d028050fb434e0455dd06934 WHIRLPOOL a079999c027ae0cf2031beeb6a6c98917153ed4bf85de306f0192c8ec60ebe8c8bdfcff5f2bb6586f261d4cfce8809cb056225a3ed7256d059adb2ea211cfd6f
-DIST flannel-0.5.5.tar.gz 592235 SHA256 dbbcb08c0e70713b0c920387a9967e5b30ef833c8118c847edbbca4f68ff0562 SHA512 5300583752fbfa0da3c1a066268a7441271c02a0304213cc854c252727b5035db4a51a4747ad54db3c741b6f623363c99920a5bf2292c59dc3dc4d653b366f83 WHIRLPOOL c97b7ece323309343fef40b36a826b420f3be5df61ac7bb9ae4faa48802c395be886b8a6740765779e2023a5bdbffde21dda1934179e4e284204aa821275e645
-DIST flannel-0.6.2.tar.gz 9239397 SHA256 40c315ee78e50b97d2e48e5c32e2d07690b7361fe1ca09efe16d3edda4bc7e33 SHA512 6bee7edfc5ba13ff9b157ca79ea4abf1c2575a4a0c7b92279d297d395dfe411fd5a01c9b94fd182868bbb5a2a77e2e01e8f7e726b04e875e5b46c4ce8ac2c3a5 WHIRLPOOL 3f9cb2824c91b393edb77c5ebcf0dd1717bf7841a803b871dcf7595fdcb839b88af1e2894e809cb920da309afa8075a8d6980d6c15b1b7d9d0b3552eea4fc77a
 DIST flannel-0.8.0.tar.gz 8089967 SHA256 8905f1706b649db8c9852ddd0d559ff8c1844886278455b8ff0c22b909b1e059 SHA512 8d3693d95f67ab273c68671d0b2ab76dd3761868bb956cb14c171525bbefab8223d202f2356de249e1add1bbac89f995367a6d5c1b8e1358bebaa317b4f0a2fc WHIRLPOOL c6c2d4cc2f864b2e3271933a99d5ae8b4ef08c12b7e5cca771ca86c4902a4f2469cee990c46b5a40337a89b52c44d17cebcd56be77b502c2fedc371aad299be1
-DIST go-crypto-b2fa06b6af4b7c9bfeb8569ab7b17f04550717bf.tar.gz 1298465 SHA256 423a29190851ee1a1a0b4d7539ff725f7de9f0fb9a3d3d76a491025a6ee7b492 SHA512 8721402dc0a3486cfe9898e83d686307af13995d1edb4b21c58a3c3e3d13abe5fb9860270ca9f721be6147338c2f54d66489d2f5c7cc45dbfa98c7d678d00ce3 WHIRLPOOL c215c893a5cf7ad93d014f544f97c8d14317edc63a0000858058d571848c765caac458c146c1a00077eb149ae54ea3bff4d42de1bcdf005697f7db8af18a4917
-DIST go-semver-0.2.0.tar.gz 8474 SHA256 0f15084aee23324e12e5e4542c9f7b0c809d7207b0e90829d1554b234cd8dd4a SHA512 93cf037a5994fe42d890e26a7547f56593ce4e6b8e149ba4f8437226b0d06a7b948b67c1d5a96d1389baa837cc046220f389a695c999a089b5f30a051bf92a38 WHIRLPOOL 3463ff0f01f86787105fb185cb3fcd4fc578823d010387e09a1b17c8ace1dbea134077b7b29bfe07dae6404425eaff3d3c9919597eb4b40c0adc8321a718d9b4
-DIST go-systemd-13.tar.gz 49200 SHA256 5bad52a1e16b17038f86d336ac3c5aefbde9074f6f0aaa677dc866c0582de783 SHA512 a53e2ed6b418ea04dbf4e0ba36590ea64c3453b09f0bc7431c20970cd25c12797b5ce80c95c69e2ba85e62d5aa804d71217edbefd6c9e847ba1b192432159cd2 WHIRLPOOL abc1fa6760239da574fb9bbc22c0bd9a9233ca11642caf503d4d2c266ee02d436413bfe3d8be40963af8afd6a6b436ce2bb0498bf31cc27632d6f1a4eaa09cf4
-DIST go-text-a8b38433e35b65ba247bb267317037dee1b70cea.tar.gz 4274499 SHA256 95176ca61248a9cad5b15770437bbc32cf0588c3f4c4aa832dc188aae2bca331 SHA512 65a3a39402575dfd5e14da599c4037a82c2fe3a2a488a18a214cfc15eb202db4ad538c533115326eb0969a037936ef05176d28acce1d02caadc2b00233195f23 WHIRLPOOL 7d867805f66d25ce433d297ca6937bebe3ee476f05febb486d3b731b77dd9e920f51cc0e756add8614097096e8af05dac68476f8643def1812fb5d68c2e805c4
-DIST go-tools-0_pre20160220.tar.gz 1827046 SHA256 395190b159e918204f67dee0b8f08f55d14cf59b83aa79cdb69c75de71c8d99a SHA512 95c9deb9b01b2f294818fcc847e457ab313d5831a839bf9cfeb1a00a0efd833de3fdfd3ecfe7ecfa2dd236ffcf963e73205d7b5b25fa41ab51c7601dc632bce1 WHIRLPOOL 48737d871487e693040b448e799d89f8461e6dc60ee12cc21fe874d9897b9721397986aa947af3bcbc2e514422e3c27147a5d2fe21b4fb7593c91e1fb267e424
-DIST go-yaml-v1-9f9df34309c04878acc86042b16630b0f696e1de.tar.gz 60069 SHA256 e2288c906f0ab336623286e32732a3f22aa91d126d226e89579a70761fe59462 SHA512 bdfb36f7dd8923e1a5ccca1d37e8fec835e44c9f6e9538d7ae82b24cd8384903115a0ce8c10e1b60ee252fb2aaf7f6e03daeece3958ba800ccbf66970a556e25 WHIRLPOOL 17fc5dbd5f8d005b653886884fbdf204e8105d2d45a54f5b09da707ff969be4d60a3f69e0791adec6ae1a816eb68a59d4e4d4850e3efe665dcad4d498808bd12
-DIST godbus-4.0.0.tar.gz 46128 SHA256 2b40e749786260a053785be29ff12e6ddd618762ccaafdfbe4a6e07f3d2a6e66 SHA512 908c7a309d160512d54f53bda64123e421aad4771e9c2d5f8cccac63d8ea6026958dc9bc269d923e485318c925a34f168450bb7b5f9e048eddab2d02441dc6c1 WHIRLPOOL c036ebeb90deaed41fc7cd3514872561deab55de4e82dcc2611db4a3f037a7073eedfa02f681d49aadb025be8e495c5bf64ac17e258cf59505ff4834a4064833
-DIST gogo-protobuf-0.3.tar.gz 2116795 SHA256 82222a5ad3bdc53fb60851df05acc16e7578932984c78e32abd05cb610127308 SHA512 57e1b1715d4811800da8cf9f2c72d202deae622d89715d7eff2ff0c406a0ea3778c187443abb17b072ae6fe57382844807f103837032759dab5420c860b99fb8 WHIRLPOOL 2c900a93d698d946949e8ef830c9940ea43c8faaf667eec7ec99ad58f46e5de9e59e43182d675f419196caacb08af2a49e63146998c5ccbef379c3920997511f
-DIST golang_protobuf_extensions-1.0.0.tar.gz 9586 SHA256 65fd58d98a7e79fa491808e9bf8315799eff2dae3d4c203dda25560861294115 SHA512 3113c91a71ca691bc77f922ee5f42b574ad3180b7395de22dfba65ad9022fee7addb059593654082912790cd904c40ee46356ec8ec6ba68a0ef8ec4928ad524f WHIRLPOOL 4c704c72ecbec824b555f0743c60ceae4fe9785592870738abe8d678b04f482e80745845748bcacbb1fd2375b703095ddcfef827909ee8bf885eb4899c7031fb
-DIST google-btree-925471ac9e2131377a91e1595defec898166fe49.tar.gz 12725 SHA256 d42d402ea1e9006343f8634c5262f21b5d04a996f4175eb881bf98195259c15b SHA512 16b23b56b7e99ef19b1e8251b646f13be1bac0f41df8077d80235434c1c3f187fec3782667eb7ff022442915ffeca1b28ff18b410bd7c6cb9db29a72beb168c9 WHIRLPOOL cecd0059bb70156eb5da511124bd2ab5b0fe3c95b043309597fd940c9cdcc48869db6b2a3e1e0e82147fbd4804ba89416302eaaa971d42032ac50d9d7a8f057c
-DIST grpc-go-1.0.3.tar.gz 219647 SHA256 66907ab449a06b4c99ee4626befa56e7f615984495ea1bcb7497aa41d75209cc SHA512 348c1875b6f44d7debbf0be975c2f7bee1fd0695d5f5695204213f311e76cc390035f640615650e26632b54172cb2a627132c7f8295342ed7edf82ad38dc21a7 WHIRLPOOL 09dc9d4465b34bf70f19b6bdcc5ac4bd02e45fdb098038537866c77b7c3e54b9790b20c394d2a4c06fa15fb25347f6c5dbf5c38c138a97ab6dab3414efa2a3f0
-DIST gucumber-71608e2f6e76fd4da5b09a376aeec7a5c0b5edbc.tar.gz 15171 SHA256 553c8ffe459bb9630bb332ff0e8949c1cfe3110afd1c854d1cd4a49f36102dc5 SHA512 79ef7a44c88f73a16fae1dceb6f585b2dc9cbd9f0ab6fab2bfab29801b99dba37ede7faec44f5a706a3a67a4bf7176d1f3ee66ba9d21b25bceb3c42ab167734a WHIRLPOOL a4de8d4278a08b5066307df0a0f29568d3785fae990bd9ef58e11eae1782e0172bf00abe7743f8cd5c88b37446142bc9e6ec6d7e34b5d8e1d7a2382ebe60d14d
-DIST probing-07dd2e8dfe18522e9c447ba95f2fe95262f63bb2.tar.gz 3392 SHA256 f39628be86bce6366598ffcf26ec19b40766cb3f7b471137f89043ff8a6ed400 SHA512 ff0527ca5802db42a9a7d2a5a47c9b0fa2c05b1ce1c96fa460946e511ed01a3cec8a4d7e1bd7092d49162e0b1b81528056de17d4e4dfe572117ce8a576f55e75 WHIRLPOOL a154180ff95305ab678a9d49c894c35f378858ac65b538592417e6f69e0a8c4a2d238a444ec2aa203270315120267446c7a4833bb1d9dc8f206e0e0533df259a
-DIST prometheus-client_golang-0.8.0.tar.gz 75593 SHA256 88b0040393276116f848de5bdd636717d339667273cfc45a4edda40b5e5682bd SHA512 a8319ff9d727932ee0824e96d41dbc11d63e1106c1494915c74eeffe2c85eec846e3a3a673054d0a23436baf0f019c98b300afbe18a8bba1c9f48c61a95a2ef7 WHIRLPOOL a78564991aa5b47e2b096b413c928e13e794c880849e0cbe40cb33cfc3f0d1544e8987d0378dfb437aad9c884adbd4f60c38df3c89c37ca834052723a8f2824c
-DIST prometheus-client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz 54855 SHA256 d29d75de6645bd67452df27cda2e4a09848161f9ecacc62b1c1818d0a701cff9 SHA512 9d4d52142888edff091f23496aad70ab2924dff3a27930cb6df81c5452ca897b9d61eff74fbd092372ecb4bb005b4d362ea6b0602e1764ea4f2a30e23048a81d WHIRLPOOL 54a1085567a2081b70f975c9be620f15de025673cb0f5c75163867924f7e48a64b68ae4e7a8c57a0e50b2fbf78806a797a12870e4ab65a767db7532e04e26dfc
-DIST prometheus-common-85637ea67b04b5c3bb25e671dacded2977f8f9f6.tar.gz 58003 SHA256 40c4a038460fc9f8350eb41dd7252d819e14addccfd29f24b29c3cbad7c802ea SHA512 1c734a62b730c7e02e7d67957badf1bedafa7ba0c7ae60f64b8bf8d07b9a77eda871580c2140eab1e73af0170f949238281c554e1146f40ebf13c5d653de883b WHIRLPOOL 7c83d48a4f3dfec618291f3e108e62c003eb11a56e272addfadda9df642449b6e38f28b2803630e40e911a39ea852bd538e9cf76c412f3e820235e99253f19ce
-DIST prometheus-procfs-abf152e5f3e97f2fafac028d2cc06c1feb87ffa5.tar.gz 18528 SHA256 027259e1cbd08c9e6496c344f5ef7d8ca4428e17895584e41634b26134d94a4b SHA512 6935f6befb8fb98104f89a6e345b18801f5339789c0fa202bba535c7a5ac70eb79fa399d85a8133f96af2e67b3e7dac3ad5edc41b5b5e8c0a3abacd8ecb933d6 WHIRLPOOL e2652a8b3bfbeb31e57efec570a96542f6347e9bf74f63d793df04b19d6eb021bc023531883c52d8b8387c517077f24939586a87ec413274664231cdbde26cf3
-DIST speakeasy-675b82c74c0ed12283ee81ba8a534c8982c07b85.tar.gz 6935 SHA256 e43955064b69e3467cbdc47653a3361c80afac23274e3d7fd39bf328bfc0777e SHA512 562ad51d0fe1f90b5f3c3849f3e0f15e4964a4e69ebb1ebb2e93a51c38647833a18d54fa100c96962dcc5d58d61915442d2e05a74edef70d4c8e27fba9b8962d WHIRLPOOL de274371de0b16c689342e7689e62ed925821e052bf54f810d7e1a3c4343dd674d82ec92ea543bfcca8d92228bb4633e04fab45abdbcf2c8a27e55f27087a8f2
-DIST stretchr-testify-1.1.4.tar.gz 83325 SHA256 f7a244ad38ee484296e8969356209e0d9fb35bd790f69fc5e7758b4e2a9e1874 SHA512 cf7195490a409c816c60f063ba71fe1f4933dfa66e7ef640b2d3bbec5d32e8387a604d7eddb1240b50168aed4c5cb7c952a0cd59831e4edc54f5db96d792dbfa WHIRLPOOL 3c705fe5287cb0583dfc2d78726c32d770e48fc4ede7f67dc7e0156f19da6faabbfaed87d9d0283244bd493fcebb4157b8e5a3c1f9e5bbb7d67ac4b36103469d
-DIST urfave-cli-1.18.1.tar.gz 46188 SHA256 0c1e88c6d8f565aaa1c19e5e724136b5049f897369f9918eb4aa14db22c157ad SHA512 48938d02df330e5eacc6fca600892a7b2660fd6f9f0dba69658e6261d57365571952fbc5ca0554aa80260e584b312c603f90f20899d730557fbd4d67fc2d5fd1 WHIRLPOOL 50b8fd6df907dce25366fe41bd142dba244220681969c8ef5a05ceead66ccc701ece783268efff7cfa4f2adaf45347b20c8699d37ccec7a1a297dbfa8e8b20c8

app-emulation/flannel/flannel-0.5.5.ebuild

@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit systemd user
-
-KEYWORDS="~amd64"
-DESCRIPTION="An etcd backed network fabric for containers"
-GO_PN="github.com/coreos/flannel"
-HOMEPAGE="https://${GO_PN}"
-SRC_URI="https://${GO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.4:="
-RDEPEND=""
-
-src_prepare() {
-	local line
-	sed -e 's:go build:[[ ${0##*/} == test ]] || \0 -v -x:' -i build || die
-	sed -e 's:go test:\0 -v:' -i test || die
-
-	# remote_test.go:98: GetNetworkConfig failed: Get http://127.0.0.1:9999/v1/_/config: dial tcp 127.0.0.1:9999: getsockopt: connection refused
-	sed -e 's:^func TestRemote:func _TestRemote:' -i remote/remote_test.go || die
-}
-
-src_compile() {
-	"${BASH}" -ex ./build || die 'Build failed'
-}
-
-src_test() {
-	"${BASH}" -ex ./test || die 'Tests failed'
-}
-
-src_install() {
-	dobin bin/*
-	exeinto /usr/libexec/flannel
-	doexe dist/mk-docker-opts.sh
-	insinto /etc/systemd/system/docker.service.d
-	newins "${FILESDIR}/flannel-docker.conf" flannel.conf
-	systemd_newtmpfilesd "${FILESDIR}/flannel.tmpfilesd" flannel.conf
-	systemd_dounit "${FILESDIR}/flanneld.service"
-}

app-emulation/flannel/flannel-0.6.2.ebuild

@@ -1,134 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user
-
-KEYWORDS="~amd64"
-DESCRIPTION="An etcd backed network fabric for containers"
-EGO_PN="github.com/coreos/flannel/..."
-HOMEPAGE="https://${EGO_PN%/*}"
-SRC_URI="https://${EGO_PN%/*}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/golang/tools/archive/ee8cb08bfe4453a27a4bd7c86a917800d339c5ac.tar.gz -> go-tools-0_pre20160220.tar.gz
-	https://github.com/golang/crypto/archive/b2fa06b6af4b7c9bfeb8569ab7b17f04550717bf.tar.gz -> go-crypto-b2fa06b6af4b7c9bfeb8569ab7b17f04550717bf.tar.gz
-	https://github.com/golang/text/archive/a8b38433e35b65ba247bb267317037dee1b70cea.tar.gz -> go-text-a8b38433e35b65ba247bb267317037dee1b70cea.tar.gz
-	https://github.com/gucumber/gucumber/archive/71608e2f6e76fd4da5b09a376aeec7a5c0b5edbc.tar.gz -> gucumber-71608e2f6e76fd4da5b09a376aeec7a5c0b5edbc.tar.gz
-	https://github.com/shiena/ansicolor/archive/a422bbe96644373c5753384a59d678f7d261ff10.tar.gz -> ansicolor-a422bbe96644373c5753384a59d678f7d261ff10.tar.gz
-	https://github.com/stretchr/testify/archive/v1.1.4.tar.gz -> stretchr-testify-1.1.4.tar.gz
-	https://github.com/boltdb/bolt/archive/v1.3.0.tar.gz -> bolt-1.3.0.tar.gz
-	https://github.com/coreos/go-semver/archive/v0.2.0.tar.gz -> go-semver-0.2.0.tar.gz
-	https://github.com/coreos/go-systemd/archive/v13.tar.gz -> go-systemd-13.tar.gz
-	https://github.com/gogo/protobuf/archive/v0.3.tar.gz -> gogo-protobuf-0.3.tar.gz
-	https://github.com/google/btree/archive/925471ac9e2131377a91e1595defec898166fe49.tar.gz -> google-btree-925471ac9e2131377a91e1595defec898166fe49.tar.gz
-	https://github.com/prometheus/client_golang/archive/v0.8.0.tar.gz -> prometheus-client_golang-0.8.0.tar.gz
-	https://github.com/prometheus/client_model/archive/fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz -> prometheus-client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz
-	https://github.com/prometheus/common/archive/85637ea67b04b5c3bb25e671dacded2977f8f9f6.tar.gz -> prometheus-common-85637ea67b04b5c3bb25e671dacded2977f8f9f6.tar.gz
-	https://github.com/prometheus/procfs/archive/abf152e5f3e97f2fafac028d2cc06c1feb87ffa5.tar.gz -> prometheus-procfs-abf152e5f3e97f2fafac028d2cc06c1feb87ffa5.tar.gz
-	https://github.com/beorn7/perks/archive/4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz -> beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz
-	https://github.com/matttproud/golang_protobuf_extensions/archive/v1.0.0.tar.gz -> golang_protobuf_extensions-1.0.0.tar.gz
-	https://github.com/xiang90/probing/archive/07dd2e8dfe18522e9c447ba95f2fe95262f63bb2.tar.gz -> probing-07dd2e8dfe18522e9c447ba95f2fe95262f63bb2.tar.gz
-	https://github.com/bgentry/speakeasy/archive/675b82c74c0ed12283ee81ba8a534c8982c07b85.tar.gz -> speakeasy-675b82c74c0ed12283ee81ba8a534c8982c07b85.tar.gz
-	https://github.com/grpc/grpc-go/archive/v1.0.3.tar.gz -> grpc-go-1.0.3.tar.gz
-	https://github.com/urfave/cli/archive/v1.18.1.tar.gz -> urfave-cli-1.18.1.tar.gz
-	https://github.com/godbus/dbus/archive/v4.0.0.tar.gz -> godbus-4.0.0.tar.gz
-	https://github.com/go-yaml/yaml/archive/9f9df34309c04878acc86042b16630b0f696e1de.tar.gz -> go-yaml-v1-9f9df34309c04878acc86042b16630b0f696e1de.tar.gz
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.6:="
-RDEPEND=""
-
-get_archive_go_package() {
-	local archive=${1} uri x
-	for x in ${SRC_URI}; do
-		if [[ ${x} == http* ]]; then
-			uri=${x}
-		elif [[ ${x} == ${archive} ]]; then
-			break
-		fi
-	done
-	uri=${uri#https://}
-	uri=${uri%/archive/*}
-	case ${uri} in
-		*/golang/crypto|*/golang/net|*/golang/oauth2|*/golang/text|*/golang/tools)
-			echo ${uri/github.com\/golang/golang.org\/x}
-			;;
-		github.com/grpc/grpc-go)
-			echo google.golang.org/grpc
-			;;
-		github.com/GoogleCloudPlatform/google-cloud-go)
-			echo "google.golang.org/cloud|gcloud-golang"
-			;;
-		github.com/go-yaml/yaml)
-			echo "gopkg.in/yaml.v1|yaml"
-			;;
-		*)
-			echo ${uri}
-			;;
-	esac
-}
-
-unpack_go_packages() {
-	local go_package x
-	# Unpack packages to appropriate locations for GOPATH
-	for x in ${A}; do
-		unpack ${x}
-		if [[ ${x} == *.tar.gz ]]; then
-			go_package=$(get_archive_go_package ${x})
-			x=${go_package##*|}
-			go_package=${go_package%|*}
-			mkdir -p src/${go_package%/*}
-			[[ ${x} == ${go_package} ]] && x=${go_package##*/}
-			mv ${x}-* src/${go_package} || die
-		fi
-	done
-}
-
-src_unpack() {
-	mkdir "${S}" || die
-	cd "${S}" || die
-	unpack_go_packages
-}
-
-src_prepare() {
-	eapply_user
-	grep -rlZ "github\\.com/lsegal/gucumber" "${S}" | \
-		xargs -0 sed -e "s:github\\.com/lsegal/gucumber:github\\.com/gucumber/gucumber:g" -i || die
-	grep -rlZ "github\\.com/codegangsta/cli" "${S}" | \
-		xargs -0 sed -e "s:github\\.com/codegangsta/cli:github\\.com/urfave/cli:g" -i || die
-	local x
-	while read x; do
-		x=${x#${S}/src/${EGO_PN%/*}/vendor/}
-		[[ -d ${S}/src/${x} ]] && continue
-		ln -s "${S}/src/${EGO_PN%/*}/vendor/${x}" "${S}/src/${x}" || die
-	done < <(find "${S}/src/${EGO_PN%/*}/vendor" -type d -mindepth 1 -maxdepth 3)
-	sed -e "s:^var Version =.*:var Version = \"${PV}\":" \
-		-i "${S}/src/${EGO_PN%/*}/version/version.go" || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}/${P}" \
-		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}"
-	[[ -x bin/${PN} ]] || die
-}
-
-src_test() {
-	GOPATH="${WORKDIR}/${P}" \
-		go test -v -work -x "${EGO_PN}" || die
-}
-
-src_install() {
-	newbin "${S}/bin/${PN}" ${PN}d
-	cd "${S}/src/${EGO_PN%/*}" || die
-	exeinto /usr/libexec/flannel
-	doexe dist/mk-docker-opts.sh
-	insinto /etc/systemd/system/docker.service.d
-	newins "${FILESDIR}/flannel-docker.conf" flannel.conf
-	systemd_newtmpfilesd "${FILESDIR}/flannel.tmpfilesd" flannel.conf
-	systemd_dounit "${FILESDIR}/flanneld.service"
-	dodoc README.md
-}

app-emulation/flannel/flannel-0.8.0.ebuild

@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-vcs-snapshot systemd user
-
-KEYWORDS="~amd64"
-DESCRIPTION="An etcd backed network fabric for containers"
-EGO_PN="github.com/coreos/flannel"
-HOMEPAGE="https://github.com/coreos/flannel"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -e "s:^var Version =.*:var Version = \"${PV}\":" \
-		-i "${S}/src/${EGO_PN}/version/version.go" || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}/${P}" \
-		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}"
-	[[ -x bin/${PN} ]] || die
-}
-
-src_test() {
-	GOPATH="${WORKDIR}/${P}" \
-		go test -v -work -x "${EGO_PN}" || die
-}
-
-src_install() {
-	newbin "bin/${PN}" ${PN}d
-	cd "src/${EGO_PN}" || die
-	exeinto /usr/libexec/flannel
-	doexe dist/mk-docker-opts.sh
-	insinto /etc/systemd/system/docker.service.d
-	newins "${FILESDIR}/flannel-docker.conf" flannel.conf
-	systemd_newtmpfilesd "${FILESDIR}/flannel.tmpfilesd" flannel.conf
-	systemd_dounit "${FILESDIR}/flanneld.service"
-	dodoc README.md
-}

app-misc/detachtty/detachtty-9-r1.ebuild

@@ -24,6 +24,6 @@ src_compile() {
 src_install() {
 	dobin "${PN}" attachtty
 	doman "${PN}.1"
-	dosym /usr/share/man/man1/detachtty.1 /usr/share/man/man1/attachtty.1
+	dosym detachtty.1 /usr/share/man/man1/attachtty.1
 	einstalldocs
 }

app-misc/detachtty/detachtty-9.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit toolchain-funcs
@@ -21,6 +21,6 @@ src_compile() {
 src_install() {
 	dobin detachtty attachtty || die
 	doman detachtty.1 || die
-	dosym /usr/share/man/man1/detachtty.1 /usr/share/man/man1/attachtty.1
+	dosym detachtty.1 /usr/share/man/man1/attachtty.1
 	dodoc INSTALL README || die
 }

app-misc/misterhouse/misterhouse-2.103-r1.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
 
 DESCRIPTION="Mister House, an open source home automation program with X10 support"
@@ -34,7 +34,7 @@ src_install() {
 	for a in "${S}"/docs/*; do
 		dodoc ${a}
 	done
-	dosym /usr/share/doc/${PF} /opt/misterhouse/docs
+	dosym ../../usr/share/doc/${PF} /opt/misterhouse/docs
 	cp -r "${S}/lib" "${D}/opt/misterhouse"
 	cp -r "${S}/sounds" "${D}/opt/misterhouse"
 	cp -r "${S}/web" "${D}/opt/misterhouse"

app-misc/misterhouse/misterhouse-2.105-r1.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"
@@ -36,7 +36,7 @@ src_install() {
 	for a in "${S}"/docs/*; do
 		dodoc ${a} || die
 	done
-	dosym /usr/share/doc/${PF} /opt/misterhouse/docs
+	dosym ../../usr/share/doc/${PF} /opt/misterhouse/docs
 	cp -r "${S}/lib" "${D}/opt/misterhouse" || die
 	cp -r "${S}/sounds" "${D}/opt/misterhouse" || die
 	cp -r "${S}/web" "${D}/opt/misterhouse" || die

app-misc/razertool/razertool-0.0.7-r4.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=6
@@ -51,7 +51,7 @@ src_install() {
 	newins razertool.rules.example 90-razertool.rules
 
 	# Icon and desktop entry
-	dosym /usr/share/${PN}/pixmaps/${PN}-icon.png /usr/share/pixmaps/${PN}-icon.png
+	dosym ../razertool/pixmaps/razertool-icon.png /usr/share/pixmaps/razertool-icon.png
 	make_desktop_entry "razertool-gtk" "RazerTool" ${PN}-icon "GTK;Settings;HardwareSettings"
 }
 

app-misc/rox-filer/rox-filer-2.11.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
 
 EAPI=5
@@ -49,21 +49,21 @@ src_install() {
 
 	newbin ROX-Filer rox
 
-	dosym /usr/share/rox/ROX/MIME/text-x-{diff,patch}.png
-	dosym /usr/share/rox/ROX/MIME/application-x-font-{afm,type1}.png
-	dosym /usr/share/rox/ROX/MIME/application-xml{,-dtd}.png
-	dosym /usr/share/rox/ROX/MIME/application-xml{,-external-parsed-entity}.png
-	dosym /usr/share/rox/ROX/MIME/application-{,rdf+}xml.png
-	dosym /usr/share/rox/ROX/MIME/application-x{ml,-xbel}.png
-	dosym /usr/share/rox/ROX/MIME/application-{x-shell,java}script.png
-	dosym /usr/share/rox/ROX/MIME/application-x-{bzip,xz}-compressed-tar.png
-	dosym /usr/share/rox/ROX/MIME/application-x-{bzip,lzma}-compressed-tar.png
-	dosym /usr/share/rox/ROX/MIME/application-x-{bzip-compressed-tar,lzo}.png
-	dosym /usr/share/rox/ROX/MIME/application-x-{bzip,xz}.png
-	dosym /usr/share/rox/ROX/MIME/application-x-{gzip,lzma}.png
-	dosym /usr/share/rox/ROX/MIME/application-{msword,rtf}.png
+	dosym text-x-diff.png /usr/share/rox/ROX/MIME/text-x-patch.png
+	dosym application-x-font-afm.png /usr/share/rox/ROX/MIME/application-x-font-type1.png
+	dosym application-xml.png /usr/share/rox/ROX/MIME/application-xml-dtd.png
+	dosym application-xml.png /usr/share/rox/ROX/MIME/application-xml-external-parsed-entity.png
+	dosym application-xml.png /usr/share/rox/ROX/MIME/application-rdf+xml.png
+	dosym application-xml.png /usr/share/rox/ROX/MIME/application-x-xbel.png
+	dosym application-x-shellscript.png /usr/share/rox/ROX/MIME/application-javascript.png
+	dosym application-x-bzip-compressed-tar.png /usr/share/rox/ROX/MIME/application-x-xz-compressed-tar.png
+	dosym application-x-bzip-compressed-tar.png /usr/share/rox/ROX/MIME/application-x-lzma-compressed-tar.png
+	dosym application-x-bzip-compressed-tar.png /usr/share/rox/ROX/MIME/application-x-lzo.png
+	dosym application-x-bzip.png /usr/share/rox/ROX/MIME/application-x-xz.png
+	dosym application-x-gzip.png /usr/share/rox/ROX/MIME/application-x-lzma.png
+	dosym application-msword.png /usr/share/rox/ROX/MIME/application-rtf.png
 
-	dosym /usr/share/rox/.DirIcon /usr/share/pixmaps/rox.png
+	dosym ../rox/.DirIcon /usr/share/pixmaps/rox.png
 
 	insinto /usr/share/applications
 	doins   "${FILESDIR}"/rox.desktop

app-misc/taskd/taskd-1.1.0-r1.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
@@ -57,7 +57,7 @@ src_install() {
 	insinto /etc/taskd
 	doins "${FILESDIR}"/config
 
-	dosym /etc/taskd/config /var/lib/taskd/config
+	dosym ../../../etc/taskd/config /var/lib/taskd/config
 
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}"/taskd.logrotate taskd

app-misc/tracker/tracker-1.10.5.ebuild

@@ -218,12 +218,12 @@ src_install() {
 
 	# Manually symlink extensions for {firefox,thunderbird}-bin
 	if use firefox-bookmarks; then
-		dosym /usr/share/xul-ext/trackerfox \
+		dosym ../../../share/xul-ext/trackerfox \
 			/usr/$(get_libdir)/firefox-bin/extensions/trackerfox@bustany.org
 	fi
 
 	if use thunderbird; then
-		dosym /usr/share/xul-ext/trackerbird \
+		dosym ../../../share/xul-ext/trackerbird \
 			/usr/$(get_libdir)/thunderbird-bin/extensions/trackerbird@bustany.org
 	fi
 }

app-misc/tracker/tracker-1.12.2.ebuild

@@ -219,12 +219,12 @@ src_install() {
 
 	# Manually symlink extensions for {firefox,thunderbird}-bin
 	if use firefox-bookmarks; then
-		dosym /usr/share/xul-ext/trackerfox \
+		dosym ../../../share/xul-ext/trackerfox \
 			/usr/$(get_libdir)/firefox-bin/extensions/trackerfox@bustany.org
 	fi
 
 	if use thunderbird; then
-		dosym /usr/share/xul-ext/trackerbird \
+		dosym ../../../share/xul-ext/trackerbird \
 			/usr/$(get_libdir)/thunderbird-bin/extensions/trackerbird@bustany.org
 	fi
 }

app-office/lyx/lyx-2.0.8.1-r1.ebuild

@@ -136,8 +136,8 @@ src_install() {
 	python_fix_shebang "${ED}"/usr/share/${PN}
 
 	if use hunspell ; then
-		dosym /usr/share/myspell /usr/share/lyx/dicts
-		dosym /usr/share/myspell /usr/share/lyx/thes
+		dosym ../myspell /usr/share/lyx/dicts
+		dosym ../myspell /usr/share/lyx/thes
 	fi
 }
 

app-office/lyx/lyx-2.1.5-r1.ebuild

@@ -135,8 +135,8 @@ src_install() {
 	python_fix_shebang "${ED}"/usr/share/${PN}
 
 	if use hunspell ; then
-		dosym /usr/share/myspell /usr/share/lyx/dicts
-		dosym /usr/share/myspell /usr/share/lyx/thes
+		dosym ../myspell /usr/share/lyx/dicts
+		dosym ../myspell /usr/share/lyx/thes
 	fi
 }
 

app-office/lyx/lyx-2.2.2-r1.ebuild

@@ -149,8 +149,8 @@ src_install() {
 	python_fix_shebang "${ED}"/usr/share/${PN}
 
 	if use hunspell ; then
-		dosym /usr/share/myspell /usr/share/lyx/dicts
-		dosym /usr/share/myspell /usr/share/lyx/thes
+		dosym ../myspell /usr/share/lyx/dicts
+		dosym ../myspell /usr/share/lyx/thes
 	fi
 }
 

app-office/lyx/lyx-2.2.3-r1.ebuild

@@ -153,8 +153,8 @@ src_install() {
 	python_fix_shebang "${ED}"/usr/share/${PN}
 
 	if use hunspell ; then
-		dosym /usr/share/myspell /usr/share/lyx/dicts
-		dosym /usr/share/myspell /usr/share/lyx/thes
+		dosym ../myspell /usr/share/lyx/dicts
+		dosym ../myspell /usr/share/lyx/thes
 	fi
 }
 

app-office/lyx/lyx-2.2.3.ebuild

@@ -149,8 +149,8 @@ src_install() {
 	python_fix_shebang "${ED}"/usr/share/${PN}
 
 	if use hunspell ; then
-		dosym /usr/share/myspell /usr/share/lyx/dicts
-		dosym /usr/share/myspell /usr/share/lyx/thes
+		dosym ../myspell /usr/share/lyx/dicts
+		dosym ../myspell /usr/share/lyx/thes
 	fi
 }
 

app-office/scribus/scribus-9999.ebuild

@@ -8,7 +8,7 @@ PYTHON_REQ_USE="tk?"
 CMAKE_MAKEFILE_GENERATOR=ninja
 CMAKE_MIN_VERSION=3.2.0
 
-inherit cmake-utils eutils fdo-mime flag-o-matic gnome2 multilib python-single-r1
+inherit cmake-utils eutils fdo-mime flag-o-matic gnome2 multilib python-single-r1 subversion
 
 DESCRIPTION="Desktop publishing (DTP) and layout program"
 HOMEPAGE="http://www.scribus.net/"

app-portage/smart-live-rebuild/Manifest

@@ -1,3 +1,2 @@
-DIST smart-live-rebuild-1.3.3.tar.bz2 16270 SHA256 7ec74e796695dfb8ee34c3172b6abe20d77d5523679cc3890f02e06384eb716a SHA512 e06105e7cca91151e37b501de258ddce15ccd3afb356391485bbbe37021cea6fe6a04140b29526547cf52503fc9272c15e621b84deba2e04cde07539b61268f2 WHIRLPOOL 6bdb5415b477b334d47c9046816251f7f7bae1731d49b93e7b67baee12aaa7355d3a6602a5fc804b6372bc777eceaf4e225e252c6c1d0e23d1277564c16967d6
 DIST smart-live-rebuild-1.3.4.1.tar.bz2 15980 SHA256 dd1e780937322a4cdee5a8f9af48d24283bda203e40167d02c7bb18924a4335f SHA512 65b864532e662d0fa032962673c2c2d6c1e21c557c82e295591086aea22de90ca9fed0e90bb0da0f6926ab19176a04ab41ee80c88dd8c5c05c3751c30ca39a92 WHIRLPOOL 329ea91bba103c6b2728905dac33532030d2c0ae802deb19056b1719bec6d85bd9b9a039cad4b3add92620c003cc573c797080cb2e02f09e670a0475439904be
-DIST smart-live-rebuild-1.3.4.tar.bz2 16022 SHA256 1d949b91a925faaae70b46c88b5af8d4b72a1a435abd85845dd8adadae5f3d92 SHA512 4dc50b226b8bd2dc2ce8f7d41eccff2d788cc5c4caa779d22a40d53a491726153419c6678e3bac764238cf9e7adf0dc4c1631a4e11df9b88deb0f9dc7c0e7cd7 WHIRLPOOL 39d8732aee4b09b464e45e990e26ce49989280e0734f27fccdbb5044b0a1d983a9e1cf25529a650feb7faab13ec63c1c116e535897c6c2845af0efcc1a8f079b
+DIST smart-live-rebuild-1.3.5.tar.bz2 16004 SHA256 f7d304bb00ec32ab48bb3062a89896dbd0df344e010e91ea40417d162f5ad881 SHA512 46933334c8c46a056c837e60a5d8aed30a35b1ddd20d7c0f03e813f6cac11cc2dc9469674b1e9c23d94c9ebc474e5eacc7aa0e8f82492554a7f49b438ed740d2 WHIRLPOOL d9a5ab93057cc3070f46fec49eee0c71237481a8e3dc84a9de40df5eb78d2fe3617b5fd1f82c04b24e9bfaef81de0883d0c8696c00ff8e7a685f175e30783370

app-portage/smart-live-rebuild/metadata.xml

@@ -16,7 +16,7 @@
 			<email>mgorny@gentoo.org</email>
 			<name>Michał Górny</name>
 		</maintainer>
-		<bugs-to>https://bitbucket.org/mgorny/smart-live-rebuild/issues/</bugs-to>
-		<remote-id type="bitbucket">mgorny/smart-live-rebuild</remote-id>
+		<bugs-to>https://github.com/mgorny/smart-live-rebuild/issues/</bugs-to>
+		<remote-id type="github">mgorny/smart-live-rebuild</remote-id>
 	</upstream>
 </pkgmetadata>

app-portage/smart-live-rebuild/smart-live-rebuild-1.3.3.ebuild

@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Check live packages for updates and emerge them as necessary"
-HOMEPAGE="https://bitbucket.org/mgorny/smart-live-rebuild/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=app-portage/gentoopm-0.2.1[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON}" setup.py test || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/portage
-	newins smart-live-rebuild.conf{.example,}
-	insinto /usr/share/portage/config/sets
-	newins sets.conf.example ${PN}.conf
-}

app-portage/smart-live-rebuild/smart-live-rebuild-1.3.4.1.ebuild

@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Check live packages for updates and emerge them as necessary"
-HOMEPAGE="https://bitbucket.org/mgorny/smart-live-rebuild/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://github.com/mgorny/smart-live-rebuild/"
+SRC_URI="https://github.com/mgorny/smart-live-rebuild/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"

app-portage/smart-live-rebuild/smart-live-rebuild-1.3.4.ebuild → app-portage/smart-live-rebuild/smart-live-rebuild-1.3.5.ebuild

@@ -1,22 +1,25 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1
 
 DESCRIPTION="Check live packages for updates and emerge them as necessary"
-HOMEPAGE="https://bitbucket.org/mgorny/smart-live-rebuild/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://github.com/mgorny/smart-live-rebuild/"
+SRC_URI="https://github.com/mgorny/smart-live-rebuild/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 arm ~mips ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~mips ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=app-portage/gentoopm-0.2.1[${PYTHON_USEDEP}]"
 
+# Tests need to be fixed
+RESTRICT=test
+
 python_test() {
 	esetup.py test
 }
@@ -27,5 +30,5 @@ python_install_all() {
 	insinto /etc/portage
 	newins smart-live-rebuild.conf{.example,}
 	insinto /usr/share/portage/config/sets
-	newins sets.conf.example ${PN}.conf
+	newins sets.conf.example smart-live-rebuild.conf
 }

app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild

@@ -1,32 +1,23 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
-inherit distutils-r1
-
-#if LIVE
-EGIT_REPO_URI="https://bitbucket.org/mgorny/${PN}.git"
-inherit git-r3
-#endif
+EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
+inherit distutils-r1 git-r3
 
 DESCRIPTION="Check live packages for updates and emerge them as necessary"
-HOMEPAGE="https://bitbucket.org/mgorny/smart-live-rebuild/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://github.com/mgorny/smart-live-rebuild/"
+SRC_URI=""
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86 ~x86-fbsd"
+KEYWORDS=""
 IUSE=""
 
 RDEPEND=">=app-portage/gentoopm-0.2.1[${PYTHON_USEDEP}]"
 
-#if LIVE
-KEYWORDS=
-SRC_URI=
-#endif
-
 python_test() {
 	esetup.py test
 }
@@ -37,5 +28,5 @@ python_install_all() {
 	insinto /etc/portage
 	newins smart-live-rebuild.conf{.example,}
 	insinto /usr/share/portage/config/sets
-	newins sets.conf.example ${PN}.conf
+	newins sets.conf.example smart-live-rebuild.conf
 }

app-shells/tcsh/tcsh-6.20.00.ebuild

@@ -97,5 +97,5 @@ src_install() {
 		"${CONFDIR}"/csh.login
 
 	# bug #119703: add csh -> tcsh symlink
-	dosym /bin/tcsh /bin/csh
+	dosym tcsh /bin/csh
 }

app-text/fbreader/fbreader-0.99.4-r2.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
@@ -84,5 +84,5 @@ src_compile() {
 
 src_install() {
 	default
-	dosym /usr/bin/FBReader /usr/bin/fbreader
+	dosym FBReader /usr/bin/fbreader
 }

app-text/ghostscript-gpl/ghostscript-gpl-9.20-r1.ebuild

@@ -237,7 +237,7 @@ src_install() {
 	done
 
 	# install the CMaps from poppler-data properly, bug #409361
-	dosym /usr/share/poppler/cMaps /usr/share/ghostscript/${PVM}/Resource/CMap
+	dosym ../../../poppler/cMaps /usr/share/ghostscript/${PVM}/Resource/CMap
 
 	use static-libs || prune_libtool_files --all
 

app-text/ghostscript-gpl/ghostscript-gpl-9.20-r2.ebuild

@@ -236,7 +236,7 @@ src_install() {
 	done
 
 	# install the CMaps from poppler-data properly, bug #409361
-	dosym "${EPREFIX}/usr/share/poppler/cMaps" "/usr/share/ghostscript/${PVM}/Resource/CMap"
+	dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PVM}/Resource/CMap"
 
 	use static-libs || find "${ED}" -name '*.la' -delete
 

app-text/ghostscript-gpl/ghostscript-gpl-9.21.ebuild

@@ -196,7 +196,7 @@ src_install() {
 	done
 
 	# install the CMaps from poppler-data properly, bug #409361
-	dosym "${EPREFIX}/usr/share/poppler/cMaps" "/usr/share/ghostscript/${PVM}/Resource/CMap"
+	dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PVM}/Resource/CMap"
 
 	use static-libs || find "${ED}" -name '*.la' -delete
 

app-text/qpdf/Manifest

@@ -1,3 +1,4 @@
 DIST qpdf-5.1.1.tar.gz 7662701 SHA256 95d355d8fa5e1c677e04d884161de94f5438bf3bdc1638498796b042bad4a726 SHA512 236132290694730d7de08635560435d34ae44f4edbc1b887e494f2ee183271331827226e7e29e539d25d5a2ca1dd5815a387c46edc0b6fd898436bbb674d9993 WHIRLPOOL 66eee10dc5163f1e53afcbd02b71bab73598c28ebb9b005c26af4e58396fd693af7ed76a17fd0c29819b0fa08a71ea0158c76bfa0b0d452a78bb357277644459
 DIST qpdf-5.1.3.tar.gz 7681578 SHA256 d5164bdad3afc381568dbe8e1509a4a6a911d4d077f1fc20b9866ef8fad901d3 SHA512 676cc6db27dcbcdece21cb427c6aae14646389f4000ff111feee8fdbbb03fe715035e5236a08db4137f275a09ed0dda5c80afbdc5093fe7f56b69a0e335ab73a WHIRLPOOL 96cf06c0da63f9f3f5bccd422875c23e473443a4552de3c23ab9971104876fb5463cb6b7db86faee3aac04bddd9b59391093a7d5840cad801093162561ba459d
 DIST qpdf-6.0.0.tar.gz 8344860 SHA256 a9fdc7e94d38fcd3831f37b6e0fe36492bf79aa6d54f8f66062cf7f9c4155233 SHA512 303e3cc77ddb87b9494e26c35e0b45b42f73692054c56a00f2e4f1922633c6ebb45c8684992cd9bf32f03366fcc4cd7e7ec6fb9432d2dbba6e0b24395909b5bf WHIRLPOOL f9fae783c16a93826f825a8efe1a116cbde00fb19b8b56dbfcad7878557c106c8f7a58945af3002f2a72aa032247008013edce8943a45cca8c186b68bf2b5cd3
+DIST qpdf-7.0.b1.tar.gz 5788093 SHA256 823ebfefee19b8e4c131866a5e5f403422a95e8a7f75df188ee1a20584cf408e SHA512 1df7f7a242ae6e4f7ad9b7b4a465103c880f6df073032591d4b9a684c8505f5b671ba58f489740eac63e4cab01e8540ba3c66dddc66c303e6e47a641fcd5b866 WHIRLPOOL d24f3def935ecb04eb0d04f5c2fc3b35a69d2b144082a0c7cff8aab16191f6b37829fb79aea3561e01d4d7a201d2b5e1288ea91933bc59b1d94b74db0e8e849a

app-text/qpdf/qpdf-7.0_beta1.ebuild

@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV="${PV/_beta/.b}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
+HOMEPAGE="http://qpdf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qpdf/${MY_P}.tar.gz"
+
+LICENSE="Artistic-2"
+
+# subslot = libqpdf soname version
+SLOT="0/18"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+IUSE="doc examples perl static-libs test"
+
+CDEPEND="
+	sys-libs/zlib
+"
+DEPEND="${CDEPEND}
+	test? (
+		sys-apps/diffutils
+		media-libs/tiff
+		app-text/ghostscript-gpl[tiff]
+	)
+"
+# Only need perl for the installed tools.
+RDEPEND="${CDEPEND}
+	perl? ( >=dev-lang/perl-5.8 )
+"
+
+DOCS=( ChangeLog README.md TODO )
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	CONFIG_SHELL=/bin/bash econf \
+		$(use_enable static-libs static) \
+		$(use_enable test test-compare-images)
+}
+
+src_install() {
+	default
+
+	if ! use perl ; then
+		rm "${ED}"/usr/bin/fix-qdf || die
+		rm "${ED}"/usr/share/man/man1/fix-qdf.1 || die
+	fi
+
+	if use examples ; then
+		dobin examples/build/.libs/*
+	fi
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}

app-text/t1utils/t1utils-1.41.ebuild → app-text/t1utils/t1utils-1.41-r1.ebuild

@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-IUSE=""
+EAPI=6
 
 DESCRIPTION="Type 1 Font utilities"
 SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
@@ -9,12 +9,10 @@ HOMEPAGE="http://www.lcdf.org/type/#t1utils"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="BSD"
+IUSE=""
 
 DEPEND=""
 RDEPEND="${DEPEND}
 	!<media-libs/freetype-1.4_pre20080316"
 
-src_install () {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc NEWS README
-}
+DOCS=( NEWS.md README.md )

app-text/xdvik/xdvik-22.87.03.ebuild

@@ -80,7 +80,7 @@ src_install() {
 
 	emake DESTDIR="${D}" install
 
-	dosym /usr/share/texmf-dist/xdvi/XDvi /usr/share/X11/app-defaults/XDvi
+	dosym ../../texmf-dist/xdvi/XDvi /usr/share/X11/app-defaults/XDvi
 
 	dodoc BUGS FAQ README.*
 

dev-cpp/gstreamermm/gstreamermm-1.8.0.ebuild

@@ -24,6 +24,7 @@ RDEPEND="
 	>=dev-libs/libsigc++-2:2
 "
 DEPEND="${RDEPEND}
+	dev-cpp/mm-common
 	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen
@@ -35,8 +36,8 @@ DEPEND="${RDEPEND}
 		>=media-libs/gst-plugins-good-${PV}:1.0
 		>=media-plugins/gst-plugins-jpeg-${PV}:1.0 )
 "
-#   dev-cpp/mm-common"
-# eautoreconf needs mm-common
+# eautoreconf:
+#	dev-cpp/mm-common
 
 # Installs reference docs into /usr/share/doc/gstreamermm-1.0/
 # but that's okay, because the rest of dev-cpp/*mm stuff does the same

dev-db/etcd/Manifest

@@ -3,3 +3,4 @@ DIST etcd-3.0.17.tar.gz 2208002 SHA256 c56c68a8cd5d120a51432f3a79a2c19082a682449
 DIST etcd-3.1.10.tar.gz 2532936 SHA256 22b25185571cf72409d35e28b9f15ea12cef02cffb552bc4efb7b74ffb62c0e7 SHA512 feb0745c2377248f9ad62359fbd6c2f0b3afbd94f89919963edf56965c98b5666f7b24fcf698599b35483b89b773dcbd647696eabc0436db6a88c68dbfc6dd6b WHIRLPOOL 0c922f1114753e126063689ebe722db59dace7715f7631ec6ca2f92438c405d9184bdebe277f2b808f5194bf2cf42904180bc7b80da051941ee3db2620b82ab7
 DIST etcd-3.2.4.tar.gz 2882024 SHA256 e0ba8e9a0f0cc9631eadfcd4def78649d22e76e2f5b3d21b378466b306708d8b SHA512 57fed2229a3d8a395bd5f797a51e2489d8e10f86ae68925e176c3ce3b2068d3c895d280cf5b51ab84b5973970536eeb645a584d729c7ec29b890aacab4c36d2c WHIRLPOOL 8d88d9cdf90c0622566e09a831b4a739e26c7f72dfa7fb8095ed5317034d3f981e677e5f5d809a7c3bfa68892cc69d590d08a6bd341fb2c097797488ef7a2686
 DIST etcd-3.2.5.tar.gz 2887261 SHA256 dcb183ebc4a09aec24d33179253f930ef35e23ad51ed1324c14e55b049edf3f9 SHA512 189d254603672479b03bf1392694ddcbec876143b6c0726ec7b31f594e6939c0010d04d3ce706992f736983df9463bd920ba5b7157c2207f956f676fc913b489 WHIRLPOOL 4fa40cfb41dc0118f5b6153f34548824e281e80b06c3444b361216c3210249e4e2e5270b979a8db7827eacb2a0c9782d0dc88b3c3097fcda5ba033fe6fce2a20
+DIST etcd-3.2.6.tar.gz 2886557 SHA256 23ab4016bf0a057d36461cee001dc5b38d0d757fa5d9e8226833687dab06faa2 SHA512 3e26bc12cafbead201b41d7f25e247f24b3480ebcc76e94f2ae4e12e573a973b60e28f36fa012d1f7bc21edc670fd8910b33cd7e9f30c3a809a6f186af3ffc9d WHIRLPOOL 203833459801b18bd000bc1420f3ab14a7de601b3c18798c2537b75a510e720e5408424388bb7d643014a0de9870213533661bfad487ae30846969fdfa8efdf8

dev-db/etcd/etcd-3.2.6.ebuild

@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user systemd golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+EGO_PN="github.com/coreos/etcd"
+DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
+HOMEPAGE="https://github.com/coreos/etcd"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc"
+DEPEND=">=dev-lang/go-1.8:="
+RDEPEND="!dev-db/etcdctl"
+
+src_prepare() {
+	default
+	sed -e 's|GIT_SHA=.*|GIT_SHA=v${PV}|'\
+		-i "${S}"/src/${EGO_PN}/build || die
+}
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+src_compile() {
+	export GOPATH=${S}
+	pushd src/${EGO_PN} || die
+	./build || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	insinto /etc/${PN}
+	doins "${FILESDIR}/${PN}.conf"
+	dobin bin/*
+	dodoc README.md
+	use doc && dodoc -r Documentation
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	dodir /var/lib/${PN}
+	fowners ${PN}:${PN} /var/lib/${PN}
+	fperms 755 /var/lib/${PN}
+	dodir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	fperms 755 /var/log/${PN}
+	popd || die
+}
+
+src_test() {
+	pushd src/${EGO_PN} || die
+	./test || die
+	popd || die
+}

dev-db/mysql-connector-c++/Manifest

@@ -1,3 +1,4 @@
 DIST mysql-connector-c++-1.1.3.tar.gz 496226 SHA256 4b1516f183f29c011c1677d5a9b174d0f5c3b761d2e8056e79690c55c01ea690 SHA512 c03a4ae25e9d189a5114ab630bef6edaefd1aee809dbb1ec26b765f5e84b93fbe17e5f7357a4fe2a95c179cd2028b676151df4baf4e3da7515543ecc0834afd7 WHIRLPOOL 5f04231cec63de16c2a076143b2e0409544ebdf600d7423f63c8c2db45f1b63048e1da108a9f374dda6b6ff0d4c13b509190390e797f4674e14284acbaa9e2e5
 DIST mysql-connector-c++-1.1.6.tar.gz 522236 SHA256 ad710b3900cae3be94656825aa70319cf7a96e1ad46bf93e07275f3606f69447 SHA512 e940b6ee090f792bad8acbbfa3dacd46310ac40c7993c4097eeebb6be4b792d3f1856574e603a71e2795773db97169f47c9ed76a127654472370c726bcb291c7 WHIRLPOOL b3027423cf2e250f1fd7340b58ff5ff55ce771c91cc435e37cddd156f681621206438b6329a49df760dce660ef983b3cf3e5060af527668de64ed06e69830d12
 DIST mysql-connector-c++-1.1.8.tar.gz 528954 SHA256 85ff10bd056128562f92b440eb27766cfcd558b474bfddc1153f7dd8feb5f963 SHA512 c3ab5c1e805598d557a449c44f77ce44cc110e5b529075e38b4f775d3726ebd16a2155f61e47a378a375a9d9362d1520334ea25376636151ddd087291aafd85d WHIRLPOOL 6cb88c3b28a8b0bf072b97c55c8b24de016e8bc5f4d66dce7597cfee2f6c2e83fc88f5d1203df60b3425af5881834635ab3f2053bea6a4c16c7eb73be1f3950c
+DIST mysql-connector-c++-1.1.9.tar.gz 508255 SHA256 3e31847a69a4e5c113b7c483731317ec4533858e3195d3a85026a0e2f509d2e4 SHA512 ec4d6cb7f21d52e786de3bff951e65ea5ad7391ba097b599d0094d3e8356cf17f700dee618e38e79d7a9e562684a6c51cca95fb8e2e225942766d33f8d0a5646 WHIRLPOOL b8dbd1f12a6efac5e337c85ff9f32b53a0185af9ae4fd281d4c2e3f68749dabf0e361f775f3bbea44699b8d686a277ea123cb22b6b11ff6222d84b5e111bb74d

dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.8-fix-mariadb.patch

@@ -5,7 +5,7 @@ diff -aurN a/driver/mysql_connection.cpp b/driver/mysql_connection.cpp
      proxy->get_character_set_info(&cs);
      *(static_cast<int *>(optionValue)) = cs.mbmaxlen;
    /* mysql_get_option() was added in mysql 5.7.3 version */
-+#ifndef MARIADB_BASE_VERSION
++#if !defined( MARIADB_BASE_VERSION ) && !defined ( MARIADB_VERSION_ID )
    } else if ( proxy->get_server_version() >= 50703 ) {
      try {
        if (GET_CONN_OPTION(optionName, optionValue, intOptions)) {
@@ -21,7 +21,7 @@ diff -aurN a/driver/mysql_connection.cpp b/driver/mysql_connection.cpp
      MY_CHARSET_INFO cs;
      proxy->get_character_set_info(&cs);
      return cs.dir ? sql::SQLString(cs.dir) : "";
-+#ifndef MARIADB_BASE_VERSION
++#if !defined( MARIADB_BASE_VERSION ) && !defined ( MARIADB_VERSION_ID )
    } else if ( proxy->get_server_version() >= 50703 ) {
      const char* optionValue= NULL;
      if (GET_CONN_OPTION(optionName, &optionValue, stringOptions)) {
@@ -39,7 +39,7 @@ diff -aurN a/driver/nativeapi/libmysql_static_proxy.cpp b/driver/nativeapi/libmy
  LibmysqlStaticProxy::get_option(MYSQL * mysql, enum mysql_option option, const void *arg)
  {
 -#if MYSQL_VERSION_ID >= 50703
-+#if MYSQL_VERSION_ID >= 50703 && !defined( MARIADB_BASE_VERSION )
++#if MYSQL_VERSION_ID >= 50703 && !defined( MARIADB_BASE_VERSION ) && !defined ( MARIADB_VERSION_ID )
  	if (::mysql_get_option(mysql, option, arg)) {
  		throw sql::InvalidArgumentException("Unsupported option provided to mysql_get_option()");
  	} else {

dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9.ebuild

@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
+HOMEPAGE="http://dev.mysql.com/downloads/connector/cpp/"
+URI_DIR="Connector-C++"
+SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug examples gcov static-libs"
+
+DEPEND="virtual/libmysqlclient:=
+	dev-libs/boost:=
+	dev-libs/openssl:0=
+	!<dev-db/mysql-connector-c-6.1.8"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.6-fix-cmake.patch"
+	"${FILESDIR}/${PN}-1.1.8-fix-mariadb.patch"
+)
+
+src_configure() {
+	# native lib/wrapper needs this!
+	append-flags "-fno-strict-aliasing"
+
+	local mycmakeargs=(
+		-DMYSQLCPPCONN_BUILD_EXAMPLES=OFF
+		-DMYSQLCPPCONN_ICU_ENABLE=OFF
+		-DUSE_MYSQLCPPCONN_TRACE_ENABLE=$(usex debug ON OFF)
+		-DUSE_MYSQLCPPCONN_GCOV_ENABLE=$(usex gcov ON OFF)
+		-DINSTALL_DOCS="/usr/share/doc/${PF}"
+		-DMYSQL_CXX_LINKAGE=0
+		-DMYSQL_INCLUDE_DIR=$(mysql_config --variable=pkgincludedir)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# static lib has wrong name so we need to rename it
+	if use static-libs; then
+		mv "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a \
+			"${ED}"/usr/$(get_libdir)/libmysqlcppconn.a || die
+	else
+		rm -f "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a
+	fi
+
+	# examples
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins "${S}"/examples/*
+	fi
+}

dev-libs/libgit2-glib/libgit2-glib-0.26.0-r1.ebuild

@@ -20,8 +20,9 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # Specify libgit2 dependency with subslot because libgit2 upstream has a habit