From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 70F72138A7E for ; Sun, 23 Oct 2016 17:47:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BAC21E0762; Sun, 23 Oct 2016 17:47:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 95EBEE0762 for ; Sun, 23 Oct 2016 17:47:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4E506341657 for ; Mon, 24 Oct 2016 09:04:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0EB0833D for ; Sun, 23 Oct 2016 17:47:14 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1477244827.f0c1fce8a87ce8fefb1301a2015afb0d850dc079.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/quazip/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/quazip/Manifest dev-libs/quazip/quazip-0.7.2.ebuild X-VCS-Directories: dev-libs/quazip/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: f0c1fce8a87ce8fefb1301a2015afb0d850dc079 X-VCS-Branch: master Date: Sun, 23 Oct 2016 17:47:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 39e25450-8993-44a9-82bb-25f7c55a5ff4 X-Archives-Hash: 90f56382872aa93e4f42d9338cdb776e commit: f0c1fce8a87ce8fefb1301a2015afb0d850dc079 Author: Andreas Sturmlechner gmail com> AuthorDate: Sat Oct 22 15:29:39 2016 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Oct 23 17:47:07 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0c1fce8 dev-libs/quazip: 0.7.2 version bump, switch to cmake, multibuild Tests need qmake and only work with Qt4. Gentoo-bug: 558634 Closes: https://github.com/gentoo/gentoo/pull/2636 Signed-off-by: David Seifert gentoo.org> dev-libs/quazip/Manifest | 1 + dev-libs/quazip/quazip-0.7.2.ebuild | 89 +++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+) diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest index b33dc66..eb64000 100644 --- a/dev-libs/quazip/Manifest +++ b/dev-libs/quazip/Manifest @@ -1 +1,2 @@ DIST quazip-0.7.1.tar.gz 390629 SHA256 78c984103555c51e6f7ef52e3a2128e2beb9896871b2cc4d4dbd4d64bff132de SHA512 58e044019505075aa89f112672c04c54875d98b353ac5a39b6eb3e1f08ea27bd9900126d902c282b87910e4bae5ab9da79942b9add7a5535625c187331445acc WHIRLPOOL bf683e90fd58ae4d94d72f4b4530754eb1944df03adccd4e0302fe7ec82afe07fd54c9d6975ba4f1b30e3d14928fbcc6c987ec612deeb6b66be9c86c5e5d9787 +DIST quazip-0.7.2.tar.gz 466915 SHA256 91d827fbcafd099ae814cc18a8dd3bb709da6b8a27c918ee1c6c03b3f29440f4 SHA512 669efb01edefee084ae755728aa2392bf160331fb13db62b7fac5e91bd45c29bb824a41ec63dd4a74c4a9780848d3308c0dcdb503f907a0fcccfbe969c291dd0 WHIRLPOOL 512661cab59eb2bda5e3a45ee800577bc2b8d3016a4076ca253b64de627098b4e2f62e20397dfe7a2f72aeaad7abdda8f1027e109ce1e8b6d6bfe117456600fb diff --git a/dev-libs/quazip/quazip-0.7.2.ebuild b/dev-libs/quazip/quazip-0.7.2.ebuild new file mode 100644 index 00000000..f05b2fe --- /dev/null +++ b/dev-libs/quazip/quazip-0.7.2.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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 +}