gentoo resync : 18.12.2017

9 files changed, 95 insertions, 57 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 3cbbaf2aa836..240ab2223f4e 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index 4c34342baeb5..4d90b85607a5 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -1,4 +1,6 @@
 AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c524d3c7953d722b3b03d57ad68297fee6757330c1a2d90f36bcfe52d1d9ef4d95b81eeb19109bc8957f671ac40d31573 SHA512 cc9aec06f6acdfdf538de7043f9f753768e0e4c26fa9eef7e52b4e42aa6fd3836185c18ffd51abfc2aa3e6f5b2472e68914112230d2b8856e8a3c61e9d865ecf
 DIST glade-3.20.0.tar.xz 3492928 BLAKE2B bab8682ec83a98f7f405a667e9fc9ad4b0fa334e0f1f3b1ba5bd8e17af1c61c65031ebe2fe56b8321df142f5a4d8dec348793bba0fc3c195c6722d635d52a291 SHA512 58c8da3522c75470f5b42492bddd83f61d828fa2a3fb8a78d15813f6d1f1df22bd808f25ae7228bf2e821bacdcc5665b889bac3ea8364c4dac288f95e817e98a
+DIST glade-3.20.2.tar.xz 3535064 BLAKE2B 33e5e9477556ac5f645cf13658ff1eebdaf046c1bbbcf5ac528c00f9b5f76943ede8140cc6a3b73dc27ed96c363208700031306f19478ba0e9e2fbae8319f500 SHA512 45f850ed4d409aaf11153da45398e7974d7b85235bf5d5043bc11755c3e4d1201f59ed854786162a7414f0521c818982560d4e226f93625b9253dc598793118a
 EBUILD glade-3.20.0.ebuild 2390 BLAKE2B 22cd5f2417192d963cbb2ff1376d9fa4b5eb44aba78f53c233dc5fd159fb93fa2c03096d71a35cd89321dd2d1f28092a503a4fd0f5cc8883da76854d9a470292 SHA512 98673ca19010e2a63c5c7c9c79dbfdb65939324004c7be6d8b846684411af444ef1fc499234296bfff24d5f8e03842781378d6099356af8b6dc236e757bdf047
+EBUILD glade-3.20.2.ebuild 2398 BLAKE2B e647eac6105adaaf6f8831b200e1f5095cedb7ec7129a8c1fefd7992c42747bc0f9f939d72f907838b5cf33ff7d3ce53a02bd305d2f67d62b380363794882045 SHA512 0743e8e2f3216d4f2c79d520ae58d8d521f59b60fa5093568c8714a8eb39e54e1533a2f106cd1e34baf5bc87eb53b1bec9dc7c5c0a18cb4d80e5b1e6bd4f0105
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/glade/glade-3.20.2.ebuild b/dev-util/glade/glade-3.20.2.ebuild
new file mode 100644
index 000000000000..2f8c73bbc2ca
--- /dev/null
+++ b/dev-util/glade/glade-3.20.2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-single-r1 versionator virtualx
+
+DESCRIPTION="A user interface designer for GTK+ and GNOME"
+HOMEPAGE="https://glade.gnome.org/"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+
+IUSE="debug +introspection python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/atk[introspection?]
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/libxml2-2.4.0:2
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2[introspection?]
+	>=x11-libs/gtk+-3.20.0:3[introspection?]
+	x11-libs/pango[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/yelp-tools
+	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/intltool-0.41.0
+	dev-util/itstool
+	virtual/pkgconfig
+
+	dev-libs/gobject-introspection-common
+	gnome-base/gnome-common
+"
+# eautoreconf requires:
+#	dev-libs/gobject-introspection-common
+#	gnome-base/gnome-common
+
+PATCHES=(
+	# To avoid file collison with other slots, rename help module.
+	# Prevent the UI from loading glade:3's gladeui devhelp documentation.
+	"${FILESDIR}"/${PN}-3.14.1-doc-version.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-gladeui \
+		--enable-libtool-lock \
+		$(usex debug --enable-debug ' ') \
+		$(use_enable introspection) \
+		$(use_enable python)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	# modify Name in .desktop file to avoid confusion with other slots
+	sed -e 's:^\(Name.*=Glade\):\1 '$(get_version_component_range 1-2): \
+		-i data/glade.desktop || die "sed of data/glade.desktop failed"
+	# modify name in .devhelp2 file to avoid shadowing with glade:3 docs
+	sed -e 's:name="gladeui":name="gladeui-2":' \
+		-i doc/html/gladeui.devhelp2 || die "sed of gladeui.devhelp2 failed"
+	gnome2_src_install
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if ! has_version dev-util/devhelp ; then
+		elog "You may want to install dev-util/devhelp for integration API"
+		elog "documentation support."
+	fi
+}
diff --git a/dev-util/tmake/Manifest b/dev-util/tmake/Manifest
index 4147c2a3ddb5..be8489dda2d2 100644
--- a/dev-util/tmake/Manifest
+++ b/dev-util/tmake/Manifest
@@ -1,4 +1,3 @@
 DIST tmake-2.12.tar.bz2 47558 BLAKE2B f5c4a590ec6077b12ffa6b37f00adc168d596466fa5ff30622e34b624eb931bef63af47b3c8eaa2d8c844b80d69cfc355adc4f0e965768e28efb31077515f0af SHA512 203a37aca7d391cf8bf7c27d9e5a9825472e9464f745d50b40343f71986ea5a48030372fa858ad5dade0807951f5c413145b9521ee1da416ff4952f8bb845ada
-EBUILD tmake-2.12-r1.ebuild 604 BLAKE2B fcaa07efb85a9bb287fa94de989984312aef781e39fb74a128050acf1dbec3a48a9d10fc16c5a7182cdd4e385765ca459da6ccb961d13d7597cf9886192307ee SHA512 ce72c71b8c7ee1c8bb555bd1b110918f74ab1271c515120233b795cc9e8b619e35e9a61dd12ef8732097086afc00ad9b1d3f2598482d4cf8de1edede255ed538
-EBUILD tmake-2.12.ebuild 606 BLAKE2B d37fed132b654060da9a629151099d3f0407889671192349cab9f61c6498db7e99fdcc20c9769e31122d362d9edd51e69836ba9f7b7ab504e0412ebc61336953 SHA512 fc23d5b01823ea2ca8b86eaae599a01f33edabb79c5d9831ba59bb1ab895eb7274353caf794a40ea234da7e850f7f5b715670b771671cd5d29ae699356b60090
+EBUILD tmake-2.12-r1.ebuild 603 BLAKE2B 43ca0d6c1e8d548d3f44ac8aa1551df477bc35dcc9f5fb7026a29ac89ae1c8009aa51489e279aaca80047fca1d87aff36f4c83e7e4ab19ba101a8c30557dce51 SHA512 58b7ac43992ef84d86592fe645474c60c4442a6fb1d96ae8c8a7a319967f3efcc193dfce5feebbab2f92f2d665fd749dd3e6ce2e148df19f86f44937ef9ba959
 MISC metadata.xml 242 BLAKE2B 5b51e51743b76e23cca3fa6f94f415455bb8f2cffff01037ad7a864d2006ffbe59af69a9bdae6de30050ec49bf966725f36b5e0409ecf7f2ac41981df67c4a87 SHA512 6212facd652d416cf5e57a8607563f29573595984ffd05f5d0ce068fa48d6ad9155cf9fea6308702cc9f6ee36e27d38dd35c13ba3b47a3500c5d6124880b0869
diff --git a/dev-util/tmake/tmake-2.12-r1.ebuild b/dev-util/tmake/tmake-2.12-r1.ebuild
index 3ba97bf561f6..48958d9544cd 100644
--- a/dev-util/tmake/tmake-2.12-r1.ebuild
+++ b/dev-util/tmake/tmake-2.12-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://tmake.sourceforge.net"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/perl-5"
diff --git a/dev-util/tmake/tmake-2.12.ebuild b/dev-util/tmake/tmake-2.12.ebuild
deleted file mode 100644
index 751d77e77003..000000000000
--- a/dev-util/tmake/tmake-2.12.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-DESCRIPTION="A Cross platform Makefile tool"
-SRC_URI="mirror://sourceforge/tmake/${P}.tar.bz2"
-HOMEPAGE="http://tmake.sourceforge.net"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86 ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5"
-
-src_install () {
-	dobin bin/tmake bin/progen
-	dodir /usr/lib/tmake
-	cp -pPRf "${S}"/lib/* "${ED}"/usr/lib/tmake
-	dodoc README
-	dohtml -r doc/*
-	echo "TMAKEPATH=\"${EPREFIX}/usr/lib/tmake/linux-g++\"" > "${T}"/51tmake
-	doenvd "${T}"/51tmake
-}
diff --git a/dev-util/valkyrie/Manifest b/dev-util/valkyrie/Manifest
index 5af143ca8ed8..08faefd3de46 100644
--- a/dev-util/valkyrie/Manifest
+++ b/dev-util/valkyrie/Manifest
@@ -1,6 +1,5 @@
 AUX valkyrie-2.0.0-gcc47.patch 963 BLAKE2B f59186ccad8e4b568fad06bc63f735d87ac67e5ebf9cb2fd47cfc7080ff845c6dc85d72c997f6a00ed24ffbb20b78feb0bf2884e64197add2df9b6b5add8015c SHA512 fac2ad08f7726ce448568e6d6f705e85140d2e4846ff150e7b7a3b2a64bc328fd885e17d62c2a5fac70049bb946e3013471bde35cf2e76b0a55155fc50cf5362
 AUX valkyrie-2.0.0-prefix.patch 329 BLAKE2B 20baef5d99b4c4eaf892309914e55c65aeb100973a4e16625c620760b6d9d4ddc460474d1142a47024ef4532b536ab37b169c3db81910f5c80ab59778e590f7a SHA512 67e98f5251d5d4d7831fca702eef4e639e4909af790387d018af2511e9151d4be0e827035d3f1ac6eb61b1115216943a811b32ada3cb5b45573ae089d5571ca6
 DIST valkyrie-2.0.0.tar.bz2 260690 BLAKE2B 842761f7ad2dfd135e1407d3d13bf3ae81db7f9d2fd6c362c378a65d9476fc2d955be8be56e0701e4b8ccbcd7234236b0752799d8afc46e9c46536ffef925d46 SHA512 435abb17ecad114c3e492fa193e508bad7ca61884bd09bf1bf0b8398c63151d33e571fea927b84f05bc2b647183af441da1550161a6f766db9e9a15d00cfc888
-EBUILD valkyrie-2.0.0-r1.ebuild 529 BLAKE2B 023dbaad817c87834e3363f0661b7b50fb912aa30af7e049e959d3306befdd3a1c71b55d0d0ecbc354a0fbd9b7b0d82f94479385715edaeabfa8790012825bad SHA512 dd049b09d016d54134490e9c354a267a2ed041b7bfd03ef7b6789675ad6eee88f9ebdd4408812815eecca58a28b18b9b84b83e51f1724f80bb682ab08a398e03
-EBUILD valkyrie-2.0.0.ebuild 528 BLAKE2B 202d48ad4c6f76daf3bab3c2a10d1dd4430a8669aff86227b40a99b87337a671dc8b3c1df980559b7954e4f06bf3d23157a39ea8e56204282a7e59e145539e99 SHA512 f799284de3948fcd06736cf0cbc66d17d8923901ab49239d06317446ecb07fd9fadb225184dcb90b6647dc666f9ec44040e0c5a8d9b9341dcd38b13e15597ce3
+EBUILD valkyrie-2.0.0-r1.ebuild 528 BLAKE2B 70d999d96c0d90eb63df756281ca3b855b970f1a54f9a73f509ab08560eae00d1a91a41572319f2af04e36c00be880c39e5c14c908994ca936eb0629bedff889 SHA512 855533f7deebae542b955daeb82c41fbeca984486fcc59180536e9bae58e35a500468d13836803f9dc41a280d21bd3e386f2b3ab499e86a089ee67ef9440ab84
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/dev-util/valkyrie/valkyrie-2.0.0-r1.ebuild b/dev-util/valkyrie/valkyrie-2.0.0-r1.ebuild
index ad327d55dacd..76a94a36b00f 100644
--- a/dev-util/valkyrie/valkyrie-2.0.0-r1.ebuild
+++ b/dev-util/valkyrie/valkyrie-2.0.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=">=dev-util/valgrind-3.6.0
diff --git a/dev-util/valkyrie/valkyrie-2.0.0.ebuild b/dev-util/valkyrie/valkyrie-2.0.0.ebuild
deleted file mode 100644
index 23baa9225410..000000000000
--- a/dev-util/valkyrie/valkyrie-2.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit qt4-r2
-
-DESCRIPTION="Graphical front-end to the Valgrind suite of tools"
-HOMEPAGE="http://www.valgrind.org/"
-SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=dev-util/valgrind-3.6.0
-	dev-qt/qtgui:4
-	dev-qt/qtcore:4"
-RDEPEND="${DEPEND}"
-
-DOCS=( README )
-PATCHES=(
-	"${FILESDIR}"/${P}-prefix.patch
-	"${FILESDIR}"/${P}-gcc47.patch
-)