gentoo resync : 05.01.2018

3 files changed, 3 insertions, 71 deletions

diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 972f5df730f5..3f5b26c15e30 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -2,9 +2,7 @@ AUX 1.48.6-disable-unittest.patch 854 BLAKE2B ea819adc1a2922093d3f79ecd96ac9f599
 AUX gjs-1.43.3-disable-unittest-1.patch 2128 BLAKE2B 73921b6b0f8b77bb98fdbe79e3a4debbad4577e856fdfba7ef57e22630a71672e6a3e330f3aa561c6c09cc7feb1d2339de4fb136643df5faa322c09179b0e804 SHA512 6fd3134bb5c19c46ee2b1f0d87e8644bc5c7a92e32fd62963fe6051ca49f20affde5f6cfbc134aaea0b7b6a5b9833e946796c689e7ebec56951b805b96cc56f2
 AUX gjs-1.43.3-disable-unittest-2.patch 1119 BLAKE2B 8ab995513b63faee201f84ec45fce226c7e7838f85160342a15e9b283c0020de52d35b43999ddfe9c06ec190e3eab5366665734bd5abe40767510b8ed548f6eb SHA512 a6f8df3c3454a635852b83ad1c3733182f2e7a28874476d1c28fb2edf8a8c0bcd7fece723c2baa43141c0ac252c2450a6b57e73821a991cb0ddd5a49aca62251
 DIST gjs-1.46.0.tar.xz 490812 BLAKE2B d7b71d6c611404d9313cdd19959e2a0cb7f035bbd2528db77ccb0030e685019b756216bfbc64885b3641c14cab2f29110492c87047c3ceb1a627765857b19a95 SHA512 14af40668e95d269ac87556c75cf45680c41bc8246f04c46726d34bd80e9344045c0a510567f156c2c25c1f10dd474dc38bd50581d1b2e5abe0daa0cf570e2bc
-DIST gjs-1.48.6.tar.xz 596964 BLAKE2B 8065075ba66a139a76486df24d9c528959d821b4695ee84b5213d4e6b35bdd052c898112b7fb21981c59c24ea9e15bc79258b6d07457df930e94bcba798e262a SHA512 29d70bbee722bbb58eb95acf1409d5e34930d11ebd9525f3b7d0050a13b72eb50e357df7c2bb9bc2ba147dcfdbc2dfb1f1f7b710347473d05cd484006b6ea256
 DIST gjs-1.48.7.tar.xz 595324 BLAKE2B eac8b5b2f7e909e94e3fb305cac443da3f433047ee07fa8fbd15905890f77d57449c8689867df61f1ac849b8b4bddc089a9b1ddc3aa79d4b3d054226c58fa909 SHA512 b8c58e068eaecfca2fa40cebe209fa8058e603809be4307099a0f3dbd561752a540d587d546ffa74aef0268a111f2b2846a1e0febda1adcefdac8c02e716e2dd
 EBUILD gjs-1.46.0.ebuild 1559 BLAKE2B 8e46f9f4a7f06ed43132e023b25203eef301345e8de0d52183edb25c07b79fc1dec1c2285ea5b4b57b4923092e165901ebba049362cbce73c50a377b4a7e5d0e SHA512 083fd06684cd111f77b35f251c9d1418614550947366e838408daa2f214204d530273a2954304f6e3aba092c8160dec9ae581d7422f033cbf3aaaf72ec99ccae
-EBUILD gjs-1.48.6.ebuild 1587 BLAKE2B 7c8f16d8b2f9c7332914a8f828e938ed2fa8de55ac137ae0c7f1793ffd9c044c8b9c311d4fd3a2815c8970db534d90ba211c9b9b8b876990d0906cec369ec3fe SHA512 1ebb3aa24c7164d00f0179f3ec361642ea2b58b080366e018b374eced5680af0b829be8d9d266677b3a8c32557cba8d9c8a97e933142a0933b54d5ff7a29810f
-EBUILD gjs-1.48.7.ebuild 1556 BLAKE2B 86383650e69cc89919e1a9d235a06f76bffb32a1106ee7b7d36b0342c4101a43d0ad3cb207a52bac90181e3e17110d818284c34068e5b2caf1a5a0bac16aef03 SHA512 ed7eacb397017e527378e22efc7d6573baaadda4176a6e660f1715c2e9887686c9e9400bab29a5537e6f29487718ee6049aed1ea9fcd9174c8efb693a955aa18
+EBUILD gjs-1.48.7.ebuild 1557 BLAKE2B d84d484c54d45e13ec2dcbcf2e40ebd9ed98e79ce21e558d24f87404e3c20b0d2e9f4fca374fb1356c8bd989ce4ba0cbb150809bf1154a65d5ed3edada999fab SHA512 d63ce482e8269a8d7d5a4085864d2fcf710b42ed3bed99b0940a664d3694221e01a7a8dbce611af4fa03e8d1abaf807ce57a0d0a67eee8a391bffb79c8390359
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-libs/gjs/gjs-1.48.6.ebuild b/dev-libs/gjs/gjs-1.48.6.ebuild
deleted file mode 100644
index 782d4047a2a2..000000000000
--- a/dev-libs/gjs/gjs-1.48.6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 pax-utils virtualx
-
-DESCRIPTION="Javascript bindings for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples gtk test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.52.1
-	>=dev-libs/gobject-introspection-1.52.1:=
-
-	sys-libs/readline:0
-	dev-lang/spidermonkey:38
-	virtual/libffi
-	cairo? ( x11-libs/cairo[X] )
-	gtk? ( >=x11-libs/gtk+-3.20:3 )
-"
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-"
-
-PATCHES=(
-	# Disable unittest failing without pt_BR locale, upstream bug #????
-	"${FILESDIR}"/${PV}-disable-unittest.patch
-)
-
-src_configure() {
-	# FIXME: add systemtap/dtrace support, like in glib:2
-	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
-	# XXX: Do NOT enable coverage, completely useless for portage installs
-	gnome2_src_configure \
-		--disable-systemtap \
-		--disable-dtrace \
-		--disable-code-coverage \
-		$(use_with cairo cairo) \
-		$(use_with gtk) \
-		$(use_with test dbus-tests) \
-		$(use_with test xvfb-tests)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	# installation sometimes fails in parallel, bug #???
-	gnome2_src_install -j1
-
-	if use examples; then
-		insinto /usr/share/doc/"${PF}"/examples
-		doins "${S}"/examples/*
-	fi
-
-	# Required for gjs-console to run correctly on PaX systems
-	pax-mark mr "${ED}/usr/bin/gjs-console"
-}
diff --git a/dev-libs/gjs/gjs-1.48.7.ebuild b/dev-libs/gjs/gjs-1.48.7.ebuild
index a1e72ae1d191..cf678c8db0cf 100644
--- a/dev-libs/gjs/gjs-1.48.7.ebuild
+++ b/dev-libs/gjs/gjs-1.48.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ RDEPEND="
 	>=dev-libs/glib-2.52.1
 	>=dev-libs/gobject-introspection-1.52.1:=
 
-	sys-libs/readline:0
+	sys-libs/readline:0=
 	dev-lang/spidermonkey:38
 	virtual/libffi
 	cairo? ( x11-libs/cairo[X] )