gentoo resync : 02.03.2018

4 files changed, 2 insertions, 191 deletions

diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index cefb5212de0f..f6e6dad7b86c 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1,6 +1,3 @@
-DIST quazip-0.7.2.tar.gz 466915 BLAKE2B fe96398e86e9066ddeea09d225b775371fc72479291f4cdefa9b5657adb2646e42b7cfbc2de920c4a4cdd024e9dcf1dfc12f30caec8f78494b1c7128847ca66d SHA512 669efb01edefee084ae755728aa2392bf160331fb13db62b7fac5e91bd45c29bb824a41ec63dd4a74c4a9780848d3308c0dcdb503f907a0fcccfbe969c291dd0
 DIST quazip-0.7.3.tar.gz 439536 BLAKE2B 7b91d12f14e060f3554e6d9b4041aef56f269c3e5cc3a4e67eaa415cf990f474da8581a248037d2b741117c5f83c514f3dc4e30310dccc954cf363435acfc4c6 SHA512 d4b55bd040e47e97e7bd5d080399ae4aa5fbc4985d6ab5979b468abc852c91b2e3e5d35af90d4b4de3bb01ea9135d0247473d6eab0413392b1c8567dc799a9fe
-EBUILD quazip-0.7.2-r1.ebuild 1958 BLAKE2B ea1a623974ca241edb1469a86d0fd2eb2fa6a322181fbba395ab27bcc02675d6e4e5cae62ac71a934e7ac1e60537d26a96c15e768f814548b74000805dabc8bc SHA512 219c47ea0e5b592fe85221016c2e21268ea7344769c4dcd186c18dba2cb56d0be1506df294f7dd1ea19ed8b11a10672889a6df17214de8b80189804b50983325
-EBUILD quazip-0.7.3-r1.ebuild 1154 BLAKE2B c1c45f4a97bb7fa6f2980545671e5a7d817427d9dc3474520f3def7abde126cf923631f50c683cb06a3e9020ed4dd8e04036bdf03271400a1aff7955f70ce006 SHA512 78278431d09a703aa53b2a69304daaba0d2231178e88f3ef3a864685f612a21eb11f61312aa6dfc574f98d97121ac2d1b3b2b5abb353f1ca20aa4298a8fb8444
-EBUILD quazip-0.7.3.ebuild 1987 BLAKE2B ebafb8141b72be86b4f961accf68f492c6d6a2f8988f4a59dc6c9587189b7e87dfba405b11d3a5a9a242b1235038b61a5d20c62dd0552821ff5c47bb73221eda SHA512 31e5a19d6fb9f3dfaf6dca1f1114974b56794b9776c0648b921e435378edfdfc35712f79272933ae025f3aae1b86649cf7f27fa94d40f8df4143d1bb876bb2ed
+EBUILD quazip-0.7.3-r1.ebuild 1152 BLAKE2B abbf0e5b16ce4fb813f159983efca585c14cc68a60847d038b52ef3a71ea17f8964a9e3d78522ed8b2106c8813ba31590db7d16bc0d2ee4838e88c4f90e60130 SHA512 88d7e2e454419f19810ed5a1b4d96a57b9542e120ec7177b1791981686a37f01778d3421aa53694cd85112719d878e4ab3de363ea587b9532ffd10977b1b65ce
 MISC metadata.xml 291 BLAKE2B c82030a8bb517384360ea44225c9c472868d2460ddc9f95f267ef58f8275d7386a87fc7f074995636bf88e056cdf516a3a89500d6d0da09ea97d0d70507eca73 SHA512 4bbb5644633f8430cf5aa8e2e0108154b9480129ebdfcdcd2e3138c550d03d4d4b2d5554ec2a2fcf592375cda4ce4825f59db8921256c491a3216500f8df0a98
diff --git a/dev-libs/quazip/quazip-0.7.2-r1.ebuild b/dev-libs/quazip/quazip-0.7.2-r1.ebuild
deleted file mode 100644
index e5fda1cb8c7b..000000000000
--- a/dev-libs/quazip/quazip-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic multibuild qmake-utils
-
-DESCRIPTION="A simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package"
-HOMEPAGE="http://quazip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="qt4 +qt5 static-libs test"
-
-REQUIRED_USE="|| ( qt4 qt5 )"
-
-RDEPEND="
-	sys-libs/zlib[minizip]
-	qt4? ( dev-qt/qtcore:4 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5
-	)
-"
-DEPEND="${RDEPEND}
-	test? (
-		qt4? ( dev-qt/qttest:4 )
-	)
-"
-
-DOCS=( NEWS.txt README.txt )
-HTML_DOCS=( doc/html/. )
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
-}
-
-src_prepare() {
-	if ! use static-libs ; then
-		sed -e "/^install/ s/quazip_static//" -i quazip/CMakeLists.txt || die
-	fi
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	myconfigure() {
-		local libdir=$(get_libdir)
-		local mycmakeargs=(
-			-DLIB_SUFFIX=${libdir/lib/}
-		)
-		unset libdir
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-			mycmakeargs+=( -DBUILD_WITH_QT4=ON )
-		fi
-		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-			local -x CXXFLAGS="${CXXFLAGS}"
-			append-cxxflags -std=c++11 -fPIC
-			mycmakeargs+=( -DBUILD_WITH_QT4=OFF )
-		fi
-		cmake-utils_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake-utils_src_compile
-}
-
-src_test() {
-	cd "${S}"/qztest || die
-	mytest() {
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-			eqmake4 \
-				LIBS+="-L${WORKDIR}/${P}-qt4"
-			emake
-			LD_LIBRARY_PATH="${WORKDIR}/${P}-qt4" ./qztest || die
-		fi
-	}
-
-	multibuild_foreach_variant mytest
-}
-
-src_install() {
-	multibuild_foreach_variant cmake-utils_src_install
-
-	# compatibility with not yet fixed rdeps (Gentoo bug #598136)
-	if ! use qt4; then
-		dosym libquazip5.so /usr/$(get_libdir)/libquazip.so
-	fi
-}
diff --git a/dev-libs/quazip/quazip-0.7.3-r1.ebuild b/dev-libs/quazip/quazip-0.7.3-r1.ebuild
index 3d21b5e373ec..781a9209c711 100644
--- a/dev-libs/quazip/quazip-0.7.3-r1.ebuild
+++ b/dev-libs/quazip/quazip-0.7.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/dev-libs/quazip/quazip-0.7.3.ebuild b/dev-libs/quazip/quazip-0.7.3.ebuild
deleted file mode 100644
index e3a070a04500..000000000000
--- a/dev-libs/quazip/quazip-0.7.3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic multibuild qmake-utils
-
-DESCRIPTION="A simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package"
-HOMEPAGE="http://quazip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="qt4 +qt5 static-libs test"
-
-REQUIRED_USE="|| ( qt4 qt5 )"
-
-RDEPEND="
-	sys-libs/zlib[minizip]
-	qt4? ( dev-qt/qtcore:4 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5
-	)
-"
-DEPEND="${RDEPEND}
-	test? (
-		qt4? ( dev-qt/qttest:4 )
-	)
-"
-
-DOCS=( NEWS.txt README.txt )
-HTML_DOCS=( doc/html/. )
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
-}
-
-src_prepare() {
-	if ! use static-libs ; then
-		sed -e "/^install/ s/quazip_static//" -i quazip/CMakeLists.txt || die
-	fi
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	myconfigure() {
-		local libdir=$(get_libdir)
-		local mycmakeargs=(
-			-DLIB_SUFFIX=${libdir/lib/}
-		)
-		unset libdir
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-			mycmakeargs+=( -DBUILD_WITH_QT4=ON )
-		fi
-		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-			local -x CXXFLAGS="${CXXFLAGS}"
-			append-cxxflags -std=c++11 -fPIC
-			mycmakeargs+=( -DBUILD_WITH_QT4=OFF )
-		fi
-		cmake-utils_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake-utils_src_compile
-}
-
-src_test() {
-	cd "${S}"/qztest || die
-	mytest() {
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-			eqmake4 \
-				LIBS+="-L${WORKDIR}/${P}-qt4"
-			emake
-			LD_LIBRARY_PATH="${WORKDIR}/${P}-qt4" ./qztest || die
-		fi
-	}
-
-	multibuild_foreach_variant mytest
-}
-
-src_install() {
-	multibuild_foreach_variant cmake-utils_src_install
-
-	# compatibility with not yet fixed rdeps (Gentoo bug #598136)
-	if ! use qt4; then
-		dosym libquazip5.so /usr/$(get_libdir)/libquazip.so
-	fi
-}