gentoo resync : 29.10.2017

5 files changed, 102 insertions, 69 deletions

diff --git a/gnome-extra/gnome-commander/Manifest b/gnome-extra/gnome-commander/Manifest
index 1ad6b493dcb5..497faf227dbc 100644
--- a/gnome-extra/gnome-commander/Manifest
+++ b/gnome-extra/gnome-commander/Manifest
@@ -1,9 +1,11 @@
-DIST gnome-commander-1.4.8.tar.xz 6374144 SHA256 7124e9c45d934b0fba95e6721715d07a251e1e2e054d614a3145ad587340de86 SHA512 1b4a6980bff62ce454d6e0952941bacb078c157d5b6a12ee917a849ada89d9d02bb90e92e01eaf6ee4c0487c35251a9591de9cf340c6c2c3f16a2dd853bb6798 WHIRLPOOL 48a01ba8c5f89025b73dc15826cd9bf87ad094a5775bc82861034b37d094b3725c5cc54032ad968d54ca6e9db014d2dd9de4217fa3bd8d5cad1028a4be8cdae0
 DIST gnome-commander-1.6.1.tar.xz 6550308 SHA256 9f796c65b17e7d3a125e8298638d16d3b0ba7ea155371d7b8d413e7f8b4aeee0 SHA512 717e8bb560c6c7e6505cfee1d9ab12f7b3d5c2f8131b9eaf8b15e13aa71dad85574b14ae6f3a42dae42d8a6a291d33cd71db5a4155184bec4f66e3db8b2daab0 WHIRLPOOL 7569ec3bf275754022a19830871bde6139363c1a3d2e1792cff678cee79674d7a6022ba8fa678f9e48a79bebcf36acfd08c75db4f9e3c457e668a2e68c88c1f0
 DIST gnome-commander-1.6.3.tar.xz 6653164 SHA256 9ac8b0041b0b2648252d461776e2be65e87f2fc52b027815c8c93c9b448f7cb5 SHA512 92f138c3cff1b88b967340f945bfa58c5840fb3db806943b4d4eb87211fea10de01a8a365de6ca2b18cb0503bd850e758c3a37fe604b5402481c03e953e94dd3 WHIRLPOOL 6f907a807b0a72e09456216f734b5a10213498c1d06d9b08a0d783035fa83433d8c8959f8c4946ce9ddba0aa2435cc742a8cb038a2d1679ae2c72a1539137307
-EBUILD gnome-commander-1.4.8.ebuild 1571 SHA256 72c350d75112980191c294363f244cc070c6dee1cc7e8faeb9bb23c757780d00 SHA512 2c3ab2d3fc0759e121f2714ed7f2eb6e27d90193dc5e1a317df6ea162be906716ba96a7df142d2bbaba693fcf55c1e76e8754bdfce36219ea98fce005d112eea WHIRLPOOL 149b99e83abfd7b7d7b297b6916a27b2e4c2958df8cb46ba6379e55685d84691f10a734ffa6ef6360c234281e4db7aa6d1ee94321de2be15a9dfbcbd61715da6
+DIST gnome-commander-1.6.4.tar.xz 6678752 SHA256 d1c5de5245a4852f8aa86e5283530674ec3fc3a5312bd89305c9934718b90b3d SHA512 00fcf86025b69a38e68b2c69977ffe54e8b00028176163ce746824a73faed55eeff2fe37eea2e191fd0e7fc1901e2ed701938c3fdfabe9e9b8bdaaec152df0e0 WHIRLPOOL b42e6d1ea2b7eb0d7d51c9f4c9686f62761c0aecea04e71a2580f3dbf3bdd3f292345b621570e8d0f59af3aef7833f4550d577c057be131fe99aa0c96be1700b
+DIST gnome-commander-1.8.0.tar.xz 7433656 SHA256 d0e73077fe22ae1e00d93f0112e0e019cf40b15419dfa82e51c9d5f30849946b SHA512 0023528301812431bffde4c0d314d07d2399d450604bf88426078cfbeed5ee286f16ad0037f85c2b281e9037fd0c622aa92a4a5be055c198d9bdbd3d211c197d WHIRLPOOL ae31ba7cd24c8cab4c3ec991005ac89ef3852f503d7312998ee4ee2e73e7afc5fc7f62cf4edae58e3a2ea6f9ca1f3882ffb287e87c24964a096dd1177266dc0f
 EBUILD gnome-commander-1.6.1.ebuild 1646 SHA256 e59b269903e8340a0b708f5f913d9958efe41e4accd9e18d20706c70ad5e51b0 SHA512 d20e75f3636b5f38de32bdd91a59cf7c32990618540ac4cdb26dab691211eafd2cb4dc8a15321a03a08ce0bc1bd539ab45eeef9642192f5c5bef4f1cc7843535 WHIRLPOOL 0a0c83401c7aec2746567f0f0c2f22088eb12fb1d2e6166f606e728f9bd1c6f23d5a1a78fdf4ed169676c43547f504414a22d7fc1e18e6acde496d5179357906
 EBUILD gnome-commander-1.6.3.ebuild 1691 SHA256 2624126c3a72f555a4c1a545eb49ece78761c8012334e973900d0d05814742ae SHA512 ef168d556e78ad00f2ef05b506c90bb6e5df8434d12113d686e5f07c81b82da3eb59a6c65fb8f3d8bf36e24d3cecce45c4d14cdc285f282ec99e109ba95ad7d7 WHIRLPOOL f3fa820e28bc8c9e33157bd0c17b5e73a6b1bfbee5e0aa28c6a6420f38c0952a1de2eeeb7019efd5a39982279053a370d3cc26eda989f5cf23d67f015a06a5d7
+EBUILD gnome-commander-1.6.4.ebuild 1689 SHA256 f55853a090757e665b7b5b5a3920db4cce1693e4101a1a5eab00454c3b938697 SHA512 f0e82260e869ad2058e29556fed7f3f98e057bb95831c9f869160e5a1ffe14255bad9379278781725ab772b2653ace2d8d1a4144b821abb9fed1ef621c61202f WHIRLPOOL 65f927c93bf8b6bdf9aeb225219d099a4af17ad03a67e7b5c49c2c406188c857cbcc94b3d49f821b63af64a828bafb8d4bbe1759a09c302dd62077a180de8ce2
+EBUILD gnome-commander-1.8.0.ebuild 1687 SHA256 71f9168dcc46fa9f4d555809ed6cee2f2ab64b6b59295e665e979904770ea29d SHA512 6f52c86cf37b6e02ca4c6c5f51007f58f77b30ff7638f5454b4e6ee292649604ddfda4dc6936d3638943a0a0e8dfbbf91a1b1de8007bc568452226f951e9915a WHIRLPOOL 66063123f2fd794c404715d6a50de24e4a43727157a1a9d31b77775d0d463ccf0930315ba1df6017735e8840030cbda847d2f226a5e69225a437e296fe495c7c
 MISC ChangeLog 3831 SHA256 5c3b045347cad2ed53bd423202644193e72240d4e0b08adc146952bc6fdc36c4 SHA512 05b984dd6ef2703ba860eeb9c9fe886f3cd2feefcc69c1aa2301376a8b9c11a58a21fadcaee4cbbeef845e42b598eda7afd9f255490021754bb965b750e806d5 WHIRLPOOL 47e0a5a4069dd42fb1179ad182bde7d8abe3343f013cd46af8163b278933a48ce4b57384cb5426a6c4b918423788f6778f9161fff140f2f0262773aa45de48cd
 MISC ChangeLog-2015 1828 SHA256 ea6bae077957a1ab13f05b4d995e2f6d092e52afb5bea0c6cb7506a89756b984 SHA512 4d3306ffa4c81d8e272ace46edf8cb9c05457d58842945ab6a23424e593980c8f1e01fc5a6f2c8b7c927d29b99fea48ce2224f295676130e4cb35d200f84969e WHIRLPOOL 1fa534e6ecbedf7818df911c71ab1b908ea4ba9148c2e8eb22ed10e9a966acfb41f5c1be0978301dd1a28e7ab8c9eb7ef20d82d24fc2cc8ce2c1d48cc88c1952
 MISC metadata.xml 1341 SHA256 2a1e6e8e32c933cb9c7c93825e54324fba873f5225ccf418269097addf1bbf63 SHA512 d3f4147f6cc33421f3a4fe4dc44db301daebe435c31e94523f8470733de5f5b5a4873fbf1a7e7a2be18a89012a6686d704bfb7a384999372932b4896f1f25a4d WHIRLPOOL 4e0c9d599576fee4611f83e9635755e8f124510dd71bf31cec5debd9005f8a4c6095b50b6018192efa36011854dfd1fc7ffc051cce926c815fb01b59eab1208b
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.4.8.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.6.4.ebuild
index c812765380d9..b6b77a79acf5 100644
--- a/gnome-extra/gnome-commander/gnome-commander-1.4.8.ebuild
+++ b/gnome-extra/gnome-commander/gnome-commander-1.6.4.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
+GNOME2_LA_PUNT="yes"
 
 inherit eutils gnome2 python-single-r1
 
@@ -12,48 +13,54 @@ HOMEPAGE="http://gcmd.github.io/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="chm doc exif gsf pdf python taglib"
+KEYWORDS="~amd64 ~x86"
+IUSE="chm exif gsf pdf python taglib samba test +unique"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="app-text/gnome-doc-utils
-	>=dev-libs/glib-2.6.0:2
-	>=dev-libs/libunique-0.9.3:1
+RDEPEND="
+	app-text/gnome-doc-utils
+	>=dev-libs/glib-2.44.0:2
+	unique? ( >=dev-libs/libunique-0.9.3:1 )
 	gnome-base/gnome-keyring
 	>=gnome-base/gnome-vfs-2.0.0
 	>=gnome-base/libgnome-2.0.0
 	>=gnome-base/libgnomeui-2.4.0
 	>=x11-libs/gtk+-2.8.0:2
 	chm? ( dev-libs/chmlib )
-	doc? ( app-text/scrollkeeper )
 	exif? ( >=media-gfx/exiv2-0.14 )
 	gsf? ( >=gnome-extra/libgsf-1.12.0 )
+	samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] )
 	pdf? ( >=app-text/poppler-0.18 )
 	python? (
-		${PYTHON_DEPS}
-		>=dev-python/gnome-vfs-python-2.0.0
+			${PYTHON_DEPS}
+			>=dev-python/gnome-vfs-python-2.0.0
 	)
-	taglib? ( >=media-libs/taglib-1.4 )"
-DEPEND="${RDEPEND}
+	taglib? ( >=media-libs/taglib-1.4 )
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35.0
 	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
+	virtual/pkgconfig
+	test? ( >=dev-cpp/gtest-1.7.0 )
+"
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
 src_configure() {
-	G2CONF="$(use_enable doc scrollkeeper)
-		$(use_enable python)
-		$(use_with chm libchm)
-		$(use_with exif exiv2)
-		$(use_with gsf libgsf)
-		$(use_with taglib)
-		$(use_with pdf poppler)"
-	gnome2_src_configure
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable python) \
+		$(use_with chm libchm) \
+		$(use_with exif exiv2) \
+		$(use_with gsf libgsf) \
+		$(use_with pdf poppler) \
+		$(use_with samba) \
+		$(use_with taglib) \
+		$(use_with unique)
 }
 
 pkg_postinst() {
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.8.0.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.8.0.ebuild
new file mode 100644
index 000000000000..f384e8bbb34e
--- /dev/null
+++ b/gnome-extra/gnome-commander/gnome-commander-1.8.0.ebuild
@@ -0,0 +1,69 @@
+# 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} )
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 python-single-r1
+
+DESCRIPTION="A graphical, full featured, twin-panel file manager"
+HOMEPAGE="http://gcmd.github.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="chm exif gsf pdf python taglib samba test +unique"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	app-text/yelp-tools
+	>=dev-libs/glib-2.44.0:2
+	unique? ( >=dev-libs/libunique-0.9.3:1 )
+	gnome-base/gnome-keyring
+	>=gnome-base/gnome-vfs-2.0.0
+	>=gnome-base/libgnome-2.0.0
+	>=gnome-base/libgnomeui-2.4.0
+	>=x11-libs/gtk+-2.18.0:2
+	chm? ( dev-libs/chmlib )
+	exif? ( >=media-gfx/exiv2-0.14 )
+	gsf? ( >=gnome-extra/libgsf-1.12.0 )
+	samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] )
+	pdf? ( >=app-text/poppler-0.18 )
+	python? (
+            ${PYTHON_DEPS}
+            >=dev-python/gnome-vfs-python-2.0.0
+	)
+	taglib? ( >=media-libs/taglib-1.4 )
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/gtk-doc-am
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( >=dev-cpp/gtest-1.7.0 )
+"
+
+pkg_setup() {
+       use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable python) \
+		$(use_with chm libchm) \
+		$(use_with exif exiv2) \
+		$(use_with gsf libgsf) \
+		$(use_with pdf poppler) \
+		$(use_with samba) \
+		$(use_with taglib) \
+		$(use_with unique)
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	has_version dev-util/meld || elog "You need dev-util/meld to synchronize files and directories."
+	has_version gnome-extra/yelp || elog "You need gnome-extra/yelp to view the docs."
+}
diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest
index 268f18a8fb8f..a3d7a4e07784 100644
--- a/gnome-extra/gtkhtml/Manifest
+++ b/gnome-extra/gtkhtml/Manifest
@@ -1,7 +1,5 @@
 DIST gtkhtml-4.10.0.tar.xz 1050628 SHA256 ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3 SHA512 efb159f902a910abd259cf38a86894a363dfd6b632aaad5ca88baf278780e653a2efc783ae48d9e4239f9fbfcbab15a5f343b60c910166d04e6663d4e34843e0 WHIRLPOOL 2c4e2bbb97d31b751ebd05a9f2e898ac1ce5242826d025978f878e9a6e3266aff32e6256f42eb05007d3a9c13f05347029b9c9d4a67eb78789762a7163cd1d33
-DIST gtkhtml-4.8.5.tar.xz 1049900 SHA256 2ff5bbec4d8e7eca66a36f7e3863a104e098ce9b58e6d0374de7cb80c3d93e8d SHA512 c35d67b22254570a92739c73a610230659a2ac63ab5e5a135a634655e679b39ad876cdf6abec4adabd0a9ba9ef87834745d03c7e0c005372bfe5485adff5ade3 WHIRLPOOL 665ab2d5319f3824ac26328b012bce0419b0c031b982ed0ef380679f8966f485c2813c2ea0e3a56688c610e1e3fc663592ab7c16cd546292c88254dd9e716d61
 EBUILD gtkhtml-4.10.0.ebuild 967 SHA256 865dc18d499976a84d65a7186da7462218d40c289a3926fee5f4cd9b6a755439 SHA512 ebe33d0bf84e225175dc740cca9e02960f8bb18d7943a91d4ad8c10d320beeb0edb76d18572a2fcf337c92af0217660aa33c7f26ff84b0f1463d167d096cd752 WHIRLPOOL 3335d5ca22bcea261531b820a6d3def4f441b3746bc1c06d71c5ecefdc3331f43f66a8af03448c5c7994426bd6e755f44dcb531742e29e3df3136a2d3dd88b73
-EBUILD gtkhtml-4.8.5.ebuild 967 SHA256 865dc18d499976a84d65a7186da7462218d40c289a3926fee5f4cd9b6a755439 SHA512 ebe33d0bf84e225175dc740cca9e02960f8bb18d7943a91d4ad8c10d320beeb0edb76d18572a2fcf337c92af0217660aa33c7f26ff84b0f1463d167d096cd752 WHIRLPOOL 3335d5ca22bcea261531b820a6d3def4f441b3746bc1c06d71c5ecefdc3331f43f66a8af03448c5c7994426bd6e755f44dcb531742e29e3df3136a2d3dd88b73
 MISC ChangeLog 2896 SHA256 f11cd7515c4f06829f50272516eee890b901083b0fd9f46a8261b827f70a7b0e SHA512 9f978f5af349656445822df997f3776526764f91cf8a728cfa1c11a1451116d5c010dccf2ca1c7d5531d8970382c14190ab7318cd85b0559e52b7c9938ec0f70 WHIRLPOOL f1d743e2aeb3a459df0fdf9e40adac0a663a0c8504ebc060fcf38eeaf469ad257ade74e3e38669be341592039551e4dc034ca27c456e0308f2e570f737638486
 MISC ChangeLog-2015 41783 SHA256 91ee8492259861641456944871361c9059eaf70a69808a8cc8365e75776b1594 SHA512 a9d3b218bd7aa8e5b58e6bed6b06c1d0269b718bef77775f7f1b0299327404b162059d5ac2f8b93a2a35b4f82ee964dbc880dbe8129fa382c86bfd2919d9cf93 WHIRLPOOL 9630f192b8d9272e4f634a376d98f5a8e35d3dd96cbac66fa183f3cf0fb8abe58a4742c5d8311ead8094b9acc1191b880fbf670da55a318a6df8efa62c1c8044
 MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.8.5.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.8.5.ebuild
deleted file mode 100644
index 2020a0d68e8d..000000000000
--- a/gnome-extra/gtkhtml/gtkhtml-4.8.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Lightweight HTML rendering/printing/editing engine"
-HOMEPAGE="https://git.gnome.org/browse/gtkhtml"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="4.0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-# orbit is referenced in configure, but is not used anywhere else
-RDEPEND="
-	>=x11-libs/gtk+-3.2:3
-	>=x11-libs/cairo-1.10:=
-	x11-libs/pango
-	>=app-text/enchant-1.1.7:=
-	gnome-base/gsettings-desktop-schemas
-	>=app-text/iso-codes-0.49
-	>=net-libs/libsoup-2.26.0:2.4
-"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	sys-devel/gettext
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure --disable-static
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Don't collide with 3.14 slot
-	mv "${ED}"/usr/bin/gtkhtml-editor-test{,-${SLOT}} || die
-}