gentoo resync : 31.10.2017

2 files changed, 0 insertions, 93 deletions

diff --git a/dev-qt/qtdemo/Manifest b/dev-qt/qtdemo/Manifest
index 6870e2cf4b3d..636d518acdea 100644
--- a/dev-qt/qtdemo/Manifest
+++ b/dev-qt/qtdemo/Manifest
@@ -1,7 +1,5 @@
 AUX qtdemo-4.6-plugandpaint.patch 609 SHA256 e7c8fccf933dfee061b2960b5754e4835e7cb87c0e36166d3b11d69632732215 SHA512 e547e34d501bf29e0c5f17765f7355b330ab7533fef25ae97e55469d700ee929b36f885e5596b34e2406e63d7fb9fa200e509d4e517473597d3ceffccb7b94b2 WHIRLPOOL 4ea022a82d5580613fdf47b4eb3f0a174c7ce542e79df5b191403c6120195018f136bcd1c325a7718f810d847b40b14b511eb718e8902528fb5694177385ddff
-DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-EBUILD qtdemo-4.8.6-r1.ebuild 2545 SHA256 72810fe1fdfc2e3abed9e7734946520445244f3b67970da51651f235c4b9896f SHA512 e68f33d50aba1ffccc54faba7dfd4dea5c07a8770b8cf0e347a018c627376ce1b0040a84e91d3619820aa274d954a86cb30815eb4e6c782b3aae013dfa52da4f WHIRLPOOL 02881d8d6327ff806c018ef399ec3f3a411c118e0a8938788b48cd71693a5f9c9d54abd12612142c96a34ec863ac1e8e366a5d0aed9f92ebcc13a300d1f0692e
 EBUILD qtdemo-4.8.7.ebuild 2539 SHA256 90ee84e270e4c4f531dee42d84e8e2bccf627bccf1e9098e038547c07a183c45 SHA512 cd0c4c7a142189168a21a475d2333d4c95e5ef9e94777380a413d9dc289fbe0808d216307cca689653aaf95be4a4fdd3f5bc5dbdf4e1afc5fe08f7ef186bb2bb WHIRLPOOL c9df3f652fc70e8d6e2a525929af73f358bf3b2848d5c96d0485809a14eb8db8e5faad0833e219686b5da5591cb4bb63c8266a13067a721160577ebc1826169c
 MISC ChangeLog 3017 SHA256 f9f1a66f8102cc258956794e33a72a4bedbc6be6eb375ad7fc4757c0fc7abf64 SHA512 d347e82ad891783798c49c15ad99b90302c6d50b6321a23b45441a29de318a43e29452de28318694a2ae7578618b5cbab0a868b07b346e4cd0cbf597963fad08 WHIRLPOOL 5e49379cdb80c5960cb85c6e6f25036b8b2ee7d017f9f1b001ae4a54830400d671f1d6f3f2296d5c16c0d7792fccdd457242107c62c9ba86742ab735f30eee3b
 MISC ChangeLog-2015 15723 SHA256 12e6c8f97c928f18d0c6818b83c4648908a18db44c5e64eaccaf9550fea3c131 SHA512 ffbb2c4eccbe6661211bc64896bd4dc36c034f126818ee97337e1639a7b34e91f84c45930ca0751a95984f2a68747d5a10f049622eafc24f56f07d1feb3b5041 WHIRLPOOL 5611b1823523d224df0e941869ea174f34218d61918eb0f8cad2e4168f4dee6c7eec0f5d60dc97f3d41c8b01b99fe4249d661b808fab8a72c44ebeffa0f74a86
diff --git a/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild b/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild
deleted file mode 100644
index a49456b792d0..000000000000
--- a/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-build-multilib
-
-DESCRIPTION="Demonstration module and examples for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="arm ppc ppc64"
-else
-	KEYWORDS="amd64 arm ppc ppc64 x86"
-fi
-
-IUSE="dbus declarative multimedia opengl phonon webkit xmlpatterns"
-
-DEPEND="
-	~dev-qt/designer-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qthelp-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtsql-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtsvg-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qttest-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-	declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?,${MULTILIB_USEDEP}] )
-	multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-	opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-	phonon? ( media-libs/phonon[qt4] )
-	webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-	xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.6-plugandpaint.patch"
-)
-
-QT4_TARGET_DIRECTORIES="
-	demos
-	examples"
-
-src_prepare() {
-	qt4-build-multilib_src_prepare
-
-	# Array mapping USE flags to subdirs
-	local flags_subdirs_map=(
-		'dbus'
-		'declarative:declarative'
-		'multimedia:spectrum'
-		'opengl:boxes|glhypnotizer'
-		'phonon:mediaplayer'
-		'webkit:browser'
-		'xmlpatterns'
-	)
-
-	# Disable unwanted examples/demos
-	for flag in "${flags_subdirs_map[@]}"; do
-		if ! use ${flag%:*}; then
-			einfo "Disabling ${flag%:*} examples"
-			sed -i -e "/SUBDIRS += ${flag%:*}/d" \
-				examples/examples.pro || die
-
-			if [[ ${flag} == *:* ]]; then
-				einfo "Disabling ${flag%:*} demos"
-				sed -i -re "/SUBDIRS \+= demos_(${flag#*:})/d" \
-					demos/demos.pro || die
-			fi
-		fi
-	done
-
-	# Remove bogus dependency on qt3support (bug 510042)
-	sed -i -e 's/contains(QT_CONFIG, qt3support)://' \
-		examples/graphicsview/graphicsview.pro || die
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(qt_use dbus)
-		$(qt_use declarative)
-		$(qt_use multimedia) -no-audio-backend
-		$(qt_use opengl)
-		-no-openvg
-		$(qt_native_use phonon) -no-phonon-backend
-		$(qt_use webkit)
-		$(qt_use xmlpatterns)
-	)
-	qt4_multilib_src_configure
-}